From 9acc95acbe73700404acaceb591e9f1854e6e3eb Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 2 Apr 2023 02:15:26 +0200
Subject: [PATCH 001/106] ncurses-6.4-20230401.patch

---
 NEWS                             |  6 ++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 misc/terminfo.src                | 31 +++++++++++-----
 ncurses/base/lib_mouse.c         | 63 +++++++++++++++++++++++---------
 ncurses/curses.priv.h            |  4 +-
 ncurses/win32con/win32_driver.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 +-
 14 files changed, 95 insertions(+), 47 deletions(-)

diff --git a/NEWS b/NEWS
index bc5be49f3..f3b7e0c2d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3919 2023/03/12 00:14:16 tom Exp $
+-- $Id: NEWS,v 1.3923 2023/04/01 23:29:48 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230401
+	+ modify experimental Windows driver to work with xterm mouse protocol.
+	+ remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef).
+
 20230311
 	+ improve manpage description for addch versus unctrl format used for
 	  non-printable characters.
diff --git a/VERSION b/VERSION
index 2565b033f..34c01e4d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230311
+5:0:10	6.4	20230401
diff --git a/dist.mk b/dist.mk
index e8161fec0..d0c7cd8b8 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1530 2023/03/11 12:02:16 tom Exp $
+# $Id: dist.mk,v 1.1533 2023/04/01 11:05:21 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230311
+NCURSES_PATCH = 20230401
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 557662156..61b24111f 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1052 $
-#	$Date: 2023/01/28 23:21:43 $
+#	$Revision: 1.1056 $
+#	$Date: 2023/04/01 23:24: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
@@ -4622,6 +4622,16 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+,
 # Windows Terminal (Preview)
 # https://github.com/microsoft/terminal
 #
+# Windows 10 22H2 (also Windows 11)
+# Version 1.16.10261.0
+#
+# - Windows Terminal #1553: "Feature Request:  Mouse/Touch/Pointer Bindings
+#   (like middle-click paste, right-click context menu, etc.)", compare to
+#   https://learn.microsoft.com/en-us/windows/console/mouse-event-record-str
+#   This appears to be related to a problem with its implementation of the
+#   Console API; the mouse does not work in a "Command Window" (e.g., as used
+#   in the ncurses MinGW driver), although escape sequences work.
+#
 # Windows 10 21H1
 # Version 1.9.1942.0
 #
@@ -7985,10 +7995,10 @@ foot+base|foot base fragment,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
 	cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m,
-	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z,
-	oc=\E]104\E\\, op=\E[39;49m, 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>,
+	is2=\E[!p\E[4l\E>, kbs=^?, kcbt=\E[Z, oc=\E]104\E\\,
+	op=\E[39;49m, 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[4l\E>,
 	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
@@ -27776,13 +27786,13 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ correct PS vs PE names in bracketed+paste (report by Bram Moolenaar)
 #	  -TD
 #
-# 2022-01-07
+# 2023-01-07
 #	+ add comment to bracketed+paste explaining that vim patch 9.0.1117 is
 #	  needed for use with the updated xterm descriptions (suggested by Bram
 #	  Moolenaar).
 #	+ add RV report+version (suggested by Bram Moolenaar).
 #
-# 2022-01-14
+# 2023-01-14
 #	+ change RV to XR/xr, to avoid conflict with pre-existing usage in vim,
 #	  to use RV/rv to denote DA2 and its response (discussion with Bram
 #	  Moolenaar) -TD
@@ -27790,8 +27800,11 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  of terminals which may support focus in/out -TD
 #	+ use xterm+focus in xterm-p370 and tmux -TD
 #
-# 2022-01-28
+# 2023-01-28
 #	+ document XF, kxIN and kxOUT -TD
 #	+ add note on sun/wscons/cmdtool/shelltool -TD
 #
+# 2023-04-01
+#	+ remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef).
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index f4151b815..319a276ae 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.197 2022/08/13 14:13:12 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.198 2023/03/25 23:27:28 tom Exp $")
 
 #include <tic.h>
 
@@ -380,7 +380,7 @@ handle_sysmouse(int sig GCC_UNUSED)
 }
 #endif /* USE_SYSMOUSE */
 
-#ifndef USE_TERM_DRIVER
+#if !defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)
 #define xterm_kmous "\033[M"
 
 static void
@@ -442,6 +442,9 @@ init_xterm_mouse(SCREEN *sp)
 static void
 enable_xterm_mouse(SCREEN *sp, int enable)
 {
+    TPUTS_TRACE(enable
+		? "xterm mouse initialization"
+		: "xterm mouse deinitialization");
 #if USE_EMX_MOUSE
     sp->_emxmouse_activated = enable;
 #else
@@ -450,6 +453,18 @@ enable_xterm_mouse(SCREEN *sp, int enable)
     sp->_mouse_active = enable;
 }
 
+#if defined(USE_TERM_DRIVER)
+static void
+enable_win32_mouse(SCREEN *sp, int enable)
+{
+#if defined(EXP_WIN32_DRIVER)
+    enable_xterm_mouse(sp, enable);
+#else
+    sp->_mouse_active = enable;
+#endif
+}
+#endif
+
 #if USE_GPM_SUPPORT
 static bool
 allow_gpm_mouse(SCREEN *sp GCC_UNUSED)
@@ -741,7 +756,8 @@ initialize_mousetype(SCREEN *sp)
 
 #ifdef USE_TERM_DRIVER
     CallDriver(sp, td_initmouse);
-#else
+#endif
+#if !defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)
     /* we know how to recognize mouse events under "xterm" */
     if (NonEmpty(key_mouse)) {
 	init_xterm_mouse(sp);
@@ -760,13 +776,15 @@ _nc_mouse_init(SCREEN *sp)
 {
     bool result = FALSE;
 
+    T((T_CALLED("_nc_mouse_init(%p)"), sp));
+
     if (sp != 0) {
 	if (!sp->_mouse_initialized) {
 	    int i;
 
 	    sp->_mouse_initialized = TRUE;
 
-	    TR(MY_TRACE, ("_nc_mouse_init() called"));
+	    TR(MY_TRACE, ("set _mouse_initialized"));
 
 	    sp->_mouse_eventp = FirstEV(sp);
 	    for (i = 0; i < EV_MAX; i++)
@@ -774,11 +792,11 @@ _nc_mouse_init(SCREEN *sp)
 
 	    initialize_mousetype(sp);
 
-	    T(("_nc_mouse_init() set mousetype to %d", sp->_mouse_type));
+	    T(("set _mouse_type to %d", sp->_mouse_type));
 	}
 	result = sp->_mouse_initialized;
     }
-    return result;
+    returnCode(result);
 }
 
 /*
@@ -1388,11 +1406,14 @@ _nc_mouse_inline(SCREEN *sp)
 static void
 mouse_activate(SCREEN *sp, int on)
 {
+    T((T_CALLED("mouse_activate(%p,%s)"),
+       (void *) SP_PARM, on ? "on" : "off"));
+
     if (!on && !sp->_mouse_initialized)
-	return;
+	returnVoid;
 
     if (!_nc_mouse_init(sp))
-	return;
+	returnVoid;
 
     if (on) {
 	sp->_mouse_bstate = 0;
@@ -1401,7 +1422,6 @@ mouse_activate(SCREEN *sp, int on)
 #if NCURSES_EXT_FUNCS
 	    NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on);
 #endif
-	    TPUTS_TRACE("xterm mouse initialization");
 	    enable_xterm_mouse(sp, 1);
 	    break;
 #if USE_GPM_SUPPORT
@@ -1420,25 +1440,28 @@ mouse_activate(SCREEN *sp, int on)
 #endif
 #ifdef USE_TERM_DRIVER
 	case M_TERM_DRIVER:
-	    sp->_mouse_active = TRUE;
+	    enable_win32_mouse(sp, TRUE);
 	    break;
 #endif
 	case M_NONE:
-	    return;
+	    returnVoid;
+	default:
+	    T(("unexpected mouse mode"));
+	    break;
 	}
 	/* Make runtime binding to cut down on object size of applications that
 	 * do not use the mouse (e.g., 'clear').
 	 */
-	sp->_mouse_event = _nc_mouse_event;
+	/* *INDENT-EQLS* */
+	sp->_mouse_event  = _nc_mouse_event;
 	sp->_mouse_inline = _nc_mouse_inline;
-	sp->_mouse_parse = _nc_mouse_parse;
+	sp->_mouse_parse  = _nc_mouse_parse;
 	sp->_mouse_resume = _nc_mouse_resume;
-	sp->_mouse_wrap = _nc_mouse_wrap;
+	sp->_mouse_wrap   = _nc_mouse_wrap;
     } else {
 
 	switch (sp->_mouse_type) {
 	case M_XTERM:
-	    TPUTS_TRACE("xterm mouse deinitialization");
 	    enable_xterm_mouse(sp, 0);
 	    break;
 #if USE_GPM_SUPPORT
@@ -1454,14 +1477,18 @@ mouse_activate(SCREEN *sp, int on)
 #endif
 #ifdef USE_TERM_DRIVER
 	case M_TERM_DRIVER:
-	    sp->_mouse_active = FALSE;
+	    enable_win32_mouse(sp, FALSE);
 	    break;
 #endif
 	case M_NONE:
-	    return;
+	    returnVoid;
+	default:
+	    T(("unexpected mouse mode"));
+	    break;
 	}
     }
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+    returnVoid;
 }
 
 /**************************************************************************
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index b0ab21bf1..3aa480d95 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.660 2023/02/25 21:24:20 tom Exp $
+ * $Id: curses.priv.h,v 1.661 2023/03/25 23:12:24 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1657,7 +1657,7 @@ typedef void VoidFunc(void);
 #define returnMMask(code)	TRACE_RETURN_SP(code,mmask_t)
 #define returnPtr(code)		TRACE_RETURN1(code,ptr)
 #define returnSP(code)		TRACE_RETURN1(code,sp)
-#define returnVoid		T((T_RETURN(""))); return
+#define returnVoid		{ T((T_RETURN(""))); return; }
 #define returnVoidPtr(code)	TRACE_RETURN1(code,void_ptr)
 #define returnWin(code)		TRACE_RETURN1(code,win)
 
diff --git a/ncurses/win32con/win32_driver.c b/ncurses/win32con/win32_driver.c
index 45aadf2f5..67b816259 100644
--- a/ncurses/win32con/win32_driver.c
+++ b/ncurses/win32con/win32_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #define CUR TerminalType(my_term).
 
-MODULE_ID("$Id: win32_driver.c,v 1.2 2020/11/21 23:35:56 tom Exp $")
+MODULE_ID("$Id: win32_driver.c,v 1.3 2023/03/25 14:08:36 tom Exp $")
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 #define EXP_OPTIMIZE 0
@@ -924,11 +924,14 @@ wcon_initmouse(TERMINAL_CONTROL_BLOCK * TCB)
 {
     SCREEN *sp;
 
+    T((T_CALLED("win32con::wcon_initmouse(%p)"), TCB));
+
     if (validateConsoleHandle()) {
 	SetSP();
 
 	sp->_mouse_type = M_TERM_DRIVER;
     }
+    returnVoid;
 }
 
 static int
@@ -939,6 +942,7 @@ wcon_testmouse(TERMINAL_CONTROL_BLOCK * TCB,
     int rc = 0;
     SCREEN *sp;
 
+    T((T_CALLED("win32con::wcon_testmouse(%p)"), TCB));
     if (validateConsoleHandle()) {
 	SetSP();
 
@@ -953,7 +957,7 @@ wcon_testmouse(TERMINAL_CONTROL_BLOCK * TCB,
 	}
     }
 
-    return rc;
+    returnCode(rc);
 }
 
 static int
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 858f4c869..dfdd01257 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230311) unstable; urgency=low
+ncurses6 (6.4+20230401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Mar 2023 13:16:04 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 858f4c869..dfdd01257 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230311) unstable; urgency=low
+ncurses6 (6.4+20230401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Mar 2023 13:16:04 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a38471b0c..b0b297ccd 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230311) unstable; urgency=low
+ncurses6 (6.4+20230401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Mar 2023 13:16:04 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 6b00844d0..917556e82 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.569 2023/03/05 18:16:04 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.572 2023/04/01 11:05:21 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0311"
+!define VERSION_MMDD  "0401"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0fdb06148..793497497 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230311
+Release: 20230401
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index aa4ca9dc4..cbc0cb6bd 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230311
+Release: 20230401
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 56c5bf023..0403832b0 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230311
+Release: 20230401
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From bfc2026a6d82603dcfd84570d15334a7c3662bfc Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 9 Apr 2023 02:08:25 +0200
Subject: [PATCH 002/106] ncurses-6.4-20230408.patch

---
 NEWS                                  |  15 ++-
 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_termcap.3x.html     | 141 +++++++++++++++-----------
 doc/html/man/curs_terminfo.3x.html    |  41 +++++++-
 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              |   2 +-
 doc/html/man/tset.1.html              |   2 +-
 man/curs_termcap.3x                   |  26 ++++-
 man/curs_terminfo.3x                  |  41 +++++++-
 misc/terminfo.src                     |   9 +-
 ncurses/tinfo/lib_tgoto.c             |  14 ++-
 ncurses/tinfo/lib_tparm.c             | 120 +++++++++++++++++++---
 ncurses/tinfo/read_entry.c            |   7 +-
 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                           |  10 +-
 progs/tparm_type.c                    |  13 ++-
 progs/tparm_type.h                    |   6 +-
 progs/tput.c                          |  61 +++++++++--
 38 files changed, 427 insertions(+), 137 deletions(-)

diff --git a/NEWS b/NEWS
index f3b7e0c2d..964fb6438 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3923 2023/04/01 23:29:48 tom Exp $
+-- $Id: NEWS,v 1.3929 2023/04/08 22:24:09 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,19 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230408
+	+ document limitations of tparm, and error-returns in curs_terminfo.3x
+	+ document limitations of tgoto, and error-returns in curs_termcap.3x
+	+ add xterm+focus to alacritty+common (patch by Christian Duerr).
+	+ add "-v" option to tput, to show warnings.
+	> improve checks for malformed terminfo data (report/analysis by
+	  Jonathan Bar Or, Michael Pearse, Emanuele Cozzi).
+	  + make the parameter type/count checks in _nc_tiparm() more stringent
+	  + update tgoto() to account for _nc_tiparm() changes
+	  + add checks in tparm() and tiparm() for misuse of string parameters
+	  + add special cases in tput to handle extensions Cs/Ms parameters
+	  + ignore compiled-terminfo where the array sizes exceed the standard
+
 20230401
 	+ modify experimental Windows driver to work with xterm mouse protocol.
 	+ remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef).
diff --git a/VERSION b/VERSION
index 34c01e4d7..78269eabb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230401
+5:0:10	6.4	20230408
diff --git a/dist.mk b/dist.mk
index d0c7cd8b8..99a74f8c5 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1533 2023/04/01 11:05:21 tom Exp $
+# $Id: dist.mk,v 1.1534 2023/04/08 13:33:20 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230401
+NCURSES_PATCH = 20230408
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index b699b0b5a..fe563fe21 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1   User Commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index d7c30af43..2c914951a 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 30ec20523..243d57ed3 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>xterm(1)</STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 9cd555ec4..32699b3c4 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.56 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_termcap.3x,v 1.57 2023/04/08 21:43:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -148,27 +148,32 @@ <H1 class="no-header">curs_termcap 3x</H1>
            first parameter is merely a placeholder.
 
        <STRONG>o</STRONG>   Normally the ncurses library is compiled with terminfo support.  In
-           that case, <STRONG>tgoto</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> (a more capable formatter).
+           that  case, <STRONG>tgoto</STRONG> uses an internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> (a more ca-
+           pable formatter).
 
-           However,  <STRONG>tparm</STRONG>  is not a <EM>termcap</EM> feature, and portable <EM>termcap</EM> ap-
+           With terminfo support, <STRONG>tgoto</STRONG> is able to use some  of  the  terminfo
+           features,  but  not all.  In particular, it allows only numeric pa-
+           rameters; <STRONG>tparm</STRONG> supports string parameters.
+
+           However, <STRONG>tparm</STRONG> is not a <EM>termcap</EM> feature, and portable  <EM>termcap</EM>  ap-
            plications should not rely upon its availability.
 
-       The <STRONG>tputs</STRONG> routine is described on the  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>  manual  page.
+       The  <STRONG>tputs</STRONG>  routine  is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> manual page.
        It can retrieve capabilities by either termcap or terminfo name.
 
 
 </PRE><H3><a name="h3-Global-Variables">Global Variables</a></H3><PRE>
-       The  variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the terminfo entry's
+       The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the terminfo  entry's
        data for <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG> and <STRONG>backspace_if_not_bs</STRONG>, respectively.  <STRONG>UP</STRONG>
-       is  not used by ncurses.  <STRONG>PC</STRONG> is used in the <STRONG>tdelay_output</STRONG> function.  <STRONG>BC</STRONG>
-       is used in the <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set by  ncurses
+       is not used by ncurses.  <STRONG>PC</STRONG> is used in the <STRONG>tdelay_output</STRONG> function.   <STRONG>BC</STRONG>
+       is  used in the <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set by ncurses
        in a system-specific coding to reflect the terminal speed.
 
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
-       The  termcap  functions  provide  no  means for freeing memory, because
-       legacy termcap implementations used only the buffer areas  provided  by
-       the  caller  via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused in ter-
+       The termcap functions provide no  means  for  freeing  memory,  because
+       legacy  termcap  implementations used only the buffer areas provided by
+       the caller via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused  in  ter-
        minfo.
 
        On the other hand, terminfo allocates memory.  It uses <STRONG>setupterm</STRONG> to re-
@@ -178,41 +183,55 @@ <H1 class="no-header">curs_termcap 3x</H1>
             <STRONG>del_curterm(cur_term);</STRONG>
 
 
-       to free this memory, but  there  is  an  additional  complication  with
-       ncurses.   It uses a fixed-size <EM>pool</EM> of storage locations, one per set-
-       ting of the <STRONG>TERM</STRONG> variable when <STRONG>tgetent</STRONG> is called.  The  <STRONG>screen(1)</STRONG>  pro-
+       to  free  this  memory,  but  there  is an additional complication with
+       ncurses.  It uses a fixed-size <EM>pool</EM> of storage locations, one per  set-
+       ting  of  the <STRONG>TERM</STRONG> variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG> pro-
        gram relies upon this arrangement, to improve its performance.
 
-       An  application  which  uses only the low-level termcap functions could
+       An application which uses only the low-level  termcap  functions  could
        free the memory using <STRONG>del_curterm</STRONG>, because the pool is freed using oth-
        er functions (see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except  where  explicitly noted, routines that return an integer return
-       <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 only specifies "an  integer  value  other
+       Except where explicitly noted, routines that return an  integer  return
+       <STRONG>ERR</STRONG>  upon  failure  and <STRONG>OK</STRONG> (SVr4 only specifies "an integer value other
        than <STRONG>ERR</STRONG>") upon successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
+       A few special cases apply:
+
+       <STRONG>o</STRONG>   If the terminal database has not been initialized, these return  an
+           error.
+
+       <STRONG>o</STRONG>   The  calls  with  a  string  parameter  (<STRONG>tgoto</STRONG>, <STRONG>tputs</STRONG>) check if the
+           string is null, or cancelled.  Those return an error.
+
+       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with string parameters is an er-
+           ror.
+
+       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with no parameters, or more than
+           two is an error.
+
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       If  you  call <STRONG>tgetstr</STRONG> to fetch <STRONG>ca</STRONG> or any other parameterized string, be
-       aware that it will be returned in terminfo notation, not the older  and
+       If you call <STRONG>tgetstr</STRONG> to fetch <STRONG>ca</STRONG> or any other parameterized  string,  be
+       aware  that it will be returned in terminfo notation, not the older and
        not-quite-compatible termcap notation.  This will not cause problems if
-       all you do with it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand  terminfo-
-       style  strings as terminfo.  (The <STRONG>tgoto</STRONG> function, if configured to sup-
-       port termcap, will check if the  string  is  indeed  terminfo-style  by
-       looking  for  "%p"  parameters or "$&lt;..&gt;" delays, and invoke a termcap-
+       all  you do with it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand terminfo-
+       style strings as terminfo.  (The <STRONG>tgoto</STRONG> function, if configured to  sup-
+       port  termcap,  will  check  if  the string is indeed terminfo-style by
+       looking for "%p" parameters or "$&lt;..&gt;" delays, and  invoke  a  termcap-
        style parser if the string does not appear to be terminfo).
 
-       Because terminfo conventions for representing padding in  string  capa-
+       Because  terminfo  conventions for representing padding in string capa-
        bilities differ from termcap's, users can be surprised:
 
        <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a terminfo system will put out a literal "50" rather
            than busy-waiting for 50 milliseconds.
 
-       <STRONG>o</STRONG>   However, if ncurses is configured to support termcap, it  may  also
+       <STRONG>o</STRONG>   However,  if  ncurses is configured to support termcap, it may also
            have been configured to support the BSD-style padding.
 
            In that case, <STRONG>tputs</STRONG> inspects strings passed to it, looking for dig-
@@ -221,9 +240,9 @@ <H1 class="no-header">curs_termcap 3x</H1>
            <STRONG>tputs("50")</STRONG> in a termcap system may wait for 50 milliseconds rather
            than put out a literal "50"
 
-       Note  that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> string.  One
-       consequence of this is that termcap applications  assume  <STRONG>me</STRONG>  (terminfo
-       <STRONG>sgr0</STRONG>)  does not reset the alternate character set.  This implementation
+       Note that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> string.   One
+       consequence  of  this  is that termcap applications assume <STRONG>me</STRONG> (terminfo
+       <STRONG>sgr0</STRONG>) does not reset the alternate character set.  This  implementation
        checks for, and modifies the data shown to the termcap interface to ac-
        commodate termcap's limitation in this respect.
 
@@ -231,22 +250,22 @@ <H1 class="no-header">curs_termcap 3x</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
-       These  functions  are  provided for supporting legacy applications, and
+       These functions are provided for supporting  legacy  applications,  and
        should not be used in new programs:
 
        <STRONG>o</STRONG>   The XSI Curses standard, Issue 4 describes these functions.  Howev-
-           er,  they  are  marked TO BE WITHDRAWN and may be removed in future
+           er, they are marked TO BE WITHDRAWN and may be  removed  in  future
            versions.
 
        <STRONG>o</STRONG>   X/Open Curses, Issue 5 (December 2007) marked the termcap interface
            (along with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
 
-       Neither  the  XSI Curses standard nor the SVr4 man pages documented the
-       return values of <STRONG>tgetent</STRONG> correctly, though all three were in  fact  re-
-       turned  ever  since SVr1.  In particular, an omission in the XSI Curses
-       documentation has been misinterpreted to mean that <STRONG>tgetent</STRONG>  returns  <STRONG>OK</STRONG>
-       or  <STRONG>ERR</STRONG>.  Because the purpose of these functions is to provide compati-
-       bility with the <EM>termcap</EM> library, that is a defect in XCurses, Issue  4,
+       Neither the XSI Curses standard nor the SVr4 man pages  documented  the
+       return  values  of <STRONG>tgetent</STRONG> correctly, though all three were in fact re-
+       turned ever since SVr1.  In particular, an omission in the  XSI  Curses
+       documentation  has  been misinterpreted to mean that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG>
+       or <STRONG>ERR</STRONG>.  Because the purpose of these functions is to provide  compati-
+       bility  with the <EM>termcap</EM> library, that is a defect in XCurses, Issue 4,
        Version 2 rather than in ncurses.
 
 
@@ -254,68 +273,68 @@ <H1 class="no-header">curs_termcap 3x</H1>
        External variables are provided for support of certain termcap applica-
        tions.  However, termcap applications' use of those variables is poorly
        documented, e.g., not distinguishing between input and output.  In par-
-       ticular, some applications are reported to declare  and/or  modify  <STRONG>os-</STRONG>
+       ticular,  some  applications  are reported to declare and/or modify <STRONG>os-</STRONG>
        <STRONG>peed</STRONG>.
 
-       The  comment that only the first two characters of the <STRONG>id</STRONG> parameter are
+       The comment that only the first two characters of the <STRONG>id</STRONG> parameter  are
        used escapes many application developers.  The original BSD 4.2 termcap
        library (and historical relics thereof) did not require a trailing null
-       NUL on the parameter name passed  to  <STRONG>tgetstr</STRONG>,  <STRONG>tgetnum</STRONG>  and  <STRONG>tgetflag</STRONG>.
-       Some  applications  assume  that the termcap interface does not require
+       NUL  on  the  parameter  name  passed to <STRONG>tgetstr</STRONG>, <STRONG>tgetnum</STRONG> and <STRONG>tgetflag</STRONG>.
+       Some applications assume that the termcap interface  does  not  require
        the trailing NUL for the parameter name.  Taking into account these is-
        sues:
 
-       <STRONG>o</STRONG>   As  a  special  case,  <STRONG>tgetflag</STRONG>  matched against a single-character
-           identifier provided that was at the end of  the  terminal  descrip-
+       <STRONG>o</STRONG>   As a special case,  <STRONG>tgetflag</STRONG>  matched  against  a  single-character
+           identifier  provided  that  was at the end of the terminal descrip-
            tion.  You should not rely upon this behavior in portable programs.
-           This implementation disallows matches against single-character  ca-
+           This  implementation disallows matches against single-character ca-
            pability names.
 
-       <STRONG>o</STRONG>   This  implementation  disallows  matches  by  the termcap interface
+       <STRONG>o</STRONG>   This implementation disallows  matches  by  the  termcap  interface
            against extended capability names which are longer than two charac-
            ters.
 
        The BSD termcap function <STRONG>tgetent</STRONG> returns the text of a termcap entry in
-       the buffer passed as an argument.  This library  (like  other  terminfo
+       the  buffer  passed  as an argument.  This library (like other terminfo
        implementations) does not store terminal descriptions as text.  It sets
        the buffer contents to a null-terminated string.
 
 
 </PRE><H3><a name="h3-Other-Compatibility">Other Compatibility</a></H3><PRE>
-       This library includes a termcap.h header, for compatibility with  other
-       implementations.   But  the header is rarely used because the other im-
+       This  library includes a termcap.h header, for compatibility with other
+       implementations.  But the header is rarely used because the  other  im-
        plementations are not strictly compatible.
 
        The original BSD termcap (through 4.3BSD) had no header file which gave
        function prototypes, because that was a feature of ANSI C.  BSD termcap
-       was written several years before C was  standardized.   However,  there
+       was  written  several  years before C was standardized.  However, there
        were two different termcap.h header files in the BSD sources:
 
-       <STRONG>o</STRONG>   One  was used internally by the <STRONG>jove</STRONG> editor in 2BSD through 4.4BSD.
+       <STRONG>o</STRONG>   One was used internally by the <STRONG>jove</STRONG> editor in 2BSD through  4.4BSD.
            It defined global symbols for the termcap variables which it used.
 
-       <STRONG>o</STRONG>   The other appeared in 4.4BSD Lite Release 2 (mid-1993) as  part  of
+       <STRONG>o</STRONG>   The  other  appeared in 4.4BSD Lite Release 2 (mid-1993) as part of
            <EM>libedit</EM> (also known as the <EM>editline</EM> library).  The CSRG source his-
-           tory shows that this was added in  mid-1992.   The  <EM>libedit</EM>  header
-           file  was used internally, as a convenience for compiling the <EM>edit-</EM>
+           tory  shows  that  this  was added in mid-1992.  The <EM>libedit</EM> header
+           file was used internally, as a convenience for compiling the  <EM>edit-</EM>
            <EM>line</EM> library.  It declared function prototypes, but no global vari-
            ables.
 
-       The  header  file from <EM>libedit</EM> was added to NetBSD's termcap library in
+       The header file from <EM>libedit</EM> was added to NetBSD's termcap  library  in
        mid-1994.
 
-       Meanwhile, GNU termcap was under development, starting  in  1990.   The
-       first  release  (termcap 1.0) in 1991 included a termcap.h header.  The
-       second release (termcap 1.1) in September 1992 modified the  header  to
+       Meanwhile,  GNU  termcap  was under development, starting in 1990.  The
+       first release (termcap 1.0) in 1991 included a termcap.h  header.   The
+       second  release  (termcap 1.1) in September 1992 modified the header to
        use <STRONG>const</STRONG> for the function prototypes in the header where one would ex-
-       pect the parameters to be read-only.  This was a difference versus  the
-       original  BSD  termcap.   The prototype for <STRONG>tputs</STRONG> also differed, but in
+       pect  the parameters to be read-only.  This was a difference versus the
+       original BSD termcap.  The prototype for <STRONG>tputs</STRONG> also  differed,  but  in
        that instance, it was <EM>libedit</EM> which differed from BSD termcap.
 
        A copy of GNU termcap 1.3 was bundled with <EM>bash</EM> in mid-1993, to support
        the <STRONG>readline(3)</STRONG> library.
 
-       A  termcap.h  file was provided in ncurses 1.8.1 (November 1993).  That
+       A termcap.h file was provided in ncurses 1.8.1 (November  1993).   That
        reflected influence by <STRONG>emacs(1)</STRONG> (rather than <STRONG>jove(1)</STRONG>) and GNU termcap:
 
        <STRONG>o</STRONG>   it provided declarations for a few global symbols used by <STRONG>emacs</STRONG>
@@ -325,8 +344,8 @@ <H1 class="no-header">curs_termcap 3x</H1>
        <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG> (a GNU termcap feature) was provided.
 
        Later (in mid-1996) the <STRONG>tparam</STRONG> function was removed from ncurses.  As a
-       result,  there are differences between any of the four implementations,
-       which must be taken into account by programs which can  work  with  all
+       result, there are differences between any of the four  implementations,
+       which  must  be  taken into account by programs which can work with all
        termcap library interfaces.
 
 
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index c50d7db33..480cafceb 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.82 2022/06/04 22:47:05 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.83 2023/04/08 22:54:21 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -83,6 +83,9 @@ <H1 class="no-header">curs_terminfo 3x</H1>
        <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
 
        <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+            <EM>or</EM>
+       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>long</STRONG> <EM>p1</EM> <EM>...</EM> <STRONG>long</STRONG> <EM>p9</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
        <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
 
@@ -398,6 +401,11 @@ <H1 class="no-header">curs_terminfo 3x</H1>
                the initial windows (stdscr, curscr, newscr).  Other error con-
                ditions are documented above.
 
+          <STRONG>tparm</STRONG>
+               returns a null if the capability would require  unexpected  pa-
+               rameters,  e.g., too many, too few, or incorrect types (strings
+               where integers are expected, or vice versa).
+
           <STRONG>tputs</STRONG>
                returns an error if the string parameter is null.  It does  not
                detect  I/O errors: X/Open states that <STRONG>tputs</STRONG> ignores the return
@@ -466,7 +474,6 @@ <H1 class="no-header">curs_terminfo 3x</H1>
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        -------------------------------------------
        tigetflag   get boolean entry for given <EM>id</EM>
-
        tigetnum    get numeric entry for given <EM>id</EM>
        tigetstr    get string entry for given <EM>id</EM>
 
@@ -568,6 +575,34 @@ <H1 class="no-header">curs_terminfo 3x</H1>
            In  response  to review comments by Thomas E. Dickey, X/Open Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
 
+           While <STRONG>tiparm</STRONG> is always provided in ncurses, the older form is  only
+           available  as  a build-time configuration option.  If not specially
+           configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
+
+       Both forms of <STRONG>tparm</STRONG> have drawbacks:
+
+       <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
+           nine on each call is awkward.
+
+           Using  <STRONG>long</STRONG>  for the numeric parameter type is a workaround to make
+           the parameter use the same amount of stack as a pointer.  That  ap-
+           proach  dates  back  to  the  mid-1980s,  before C was standarized.
+           Since then, there is a standard (and pointers are not  required  to
+           fit in a long).
+
+       <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
+           such as <STRONG>tiparm</STRONG> can be a problem, in particular for  string  parame-
+           ters.  However, only a few terminfo capabilities use string parame-
+           ters (e.g., the ones used for programmable function keys).
+
+           The ncurses library checks usage of these capabilities, and returns
+           an  error  if  the capability mishandles string parameters.  But it
+           cannot check if a calling program provides  strings  in  the  right
+           places for the <STRONG>tparm</STRONG> calls.
+
+           The  <STRONG><A HREF="tput.3x.html">tput(3x)</A></STRONG>  program  checks its use of these capabilities with a
+           table, so that it calls <STRONG>tparm</STRONG> correctly.
+
 
 </PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE>
        If configured to use the terminal-driver, e.g., for the MinGW port,
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index baaadbd25..9551b458e 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index f43fda340..bb5957a5d 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 37a5797a7..1ab520712 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 8ffaa3dbf..8f4641bf9 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 8cfe515be..9cf27bf54 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 27bfb037c..9cd27f500 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index a9e1976a3..0fd84723d 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 5eb352470..228e17d8c 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index d5ad0da33..88986bf79 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 0fa0e3cb3..6c12f0370 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 430675c5c..388596240 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index c4916439b..ee2316408 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index efb6a1898..19396d91b 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -391,7 +391,7 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230311).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
 
 
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index e073d940c..1630658d1 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.56 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_termcap.3x,v 1.57 2023/04/08 21:43:01 tom Exp $
 .TH curs_termcap 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -173,7 +173,13 @@ It does this also for calls requiring only a single parameter.
 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(3X) (a more capable formatter).
+In that case, \fBtgoto\fP uses an internal version of
+\fBtparm\fP(3X) (a more capable formatter).
+.IP
+With terminfo support, \fBtgoto\fP is able to use some of the terminfo
+features, but not all.
+In particular, it allows only numeric parameters;
+\fBtparm\fP supports string parameters.
 .IP
 However, \fBtparm\fP is not a \fItermcap\fP feature,
 and portable \fItermcap\fP applications should not rely upon its availability.
@@ -229,6 +235,20 @@ routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
 completion.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
+.PP
+A few special cases apply:
+.bP
+If the terminal database has not been initialized,
+these return an error.
+.bP
+The calls with a string parameter (\fBtgoto\fP, \fBtputs\fP)
+check if the string is null, or cancelled.
+Those return an error.
+.bP
+A call to \fBtgoto\fP using a capability with string parameters is an error.
+.bP
+A call to \fBtgoto\fP using a capability with no parameters,
+or more than two is an error.
 .SH BUGS
 If you call \fBtgetstr\fP to fetch \fBca\fP or any other parameterized string,
 be aware that it will be returned in terminfo notation, not the older and
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 00ae1349d..5ea01ee65 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.82 2022/06/04 22:47:05 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.83 2023/04/08 22:54:21 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -86,6 +86,10 @@
 .sp
 \fBchar *tparm(const char *\fIstr\fB, ...);\fR
 .br
+	\fIor\fP
+.br
+\fBchar *tparm(const char *\fIstr\fB, long \fIp1 ... \fBlong \fIp9\fB);\fR
+.sp
 \fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
 .br
 \fBint putp(const char *\fIstr\fB);\fR
@@ -463,6 +467,11 @@ if it cannot allocate enough memory, or
 create the initial windows (stdscr, curscr, newscr).
 Other error conditions are documented above.
 .TP 5
+\fBtparm\fP
+returns a null if the capability would require unexpected parameters,
+e.g., too many, too few, or incorrect types
+(strings where integers are expected, or vice versa).
+.TP 5
 \fBtputs\fP
 returns an error if the string parameter is null.
 It does not detect I/O errors:
@@ -663,6 +672,34 @@ zeroes are fine for this purpose.
 .IP
 In response to review comments by Thomas E. Dickey,
 X/Open Curses Issue 7 proposed the \fBtiparm\fP function in mid-2009.
+.IP
+While \fBtiparm\fP is always provided in ncurses,
+the older form is only available as a build-time configuration option.
+If not specially configured, \fBtparm\fP is the same as \fBtiparm\fP.
+.PP
+Both forms of \fBtparm\fP have drawbacks:
+.bP
+Most of the calls to \fBtparm\fP use only one or two parameters.
+Passing nine on each call is awkward.
+.IP
+Using \fBlong\fP for the numeric parameter type is a workaround
+to make the parameter use the same amount of stack as a pointer.
+That approach dates back to the mid-1980s, before C was standarized.
+Since then, there is a standard
+(and pointers are not required to fit in a long).
+.bP
+Providing the right number of parameters for a variadic function
+such as \fBtiparm\fP can be a problem, in particular for string parameters.
+However, only a few terminfo capabilities use string parameters
+(e.g., the ones used for programmable function keys).
+.IP
+The ncurses library checks usage of these capabilities,
+and returns an error if the capability mishandles string parameters.
+But it cannot check if a calling program provides strings in the right
+places for the \fBtparm\fP calls.
+.IP
+The \fBtput\fR(3X) program checks its use of these capabilities with a table,
+so that it calls \fBtparm\fP correctly.
 .SS Special TERM treatment
 .PP
 If configured to use the terminal-driver,
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 61b24111f..e00a7f6b3 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1056 $
-#	$Date: 2023/04/01 23:24:35 $
+#	$Revision: 1.1057 $
+#	$Date: 2023/04/08 21:08:00 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -7791,7 +7791,7 @@ alacritty+common|base fragment for alacritty,
 	use=xterm-basic, use=xterm+app, use=ansi+rep,
 	use=xterm+tmux, use=ecma+strikeout, use=xterm+sl-twm,
 	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
-	use=xterm+pcf2, use=bracketed+paste,
+	use=xterm+pcf2, use=bracketed+paste, use=xterm+focus,
 
 #### Kitty
 # https://github.com/kovidgoyal/kitty
@@ -27807,4 +27807,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-04-01
 #	+ remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef).
 #
+# 2023-04-08
+#	+ add xterm+focus to alacritty+common (patch by Christian Duerr).
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 9cf5e100c..084a322fe 100644
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 2000-2008,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <termcap.h>
 
-MODULE_ID("$Id: lib_tgoto.c,v 1.21 2020/05/27 23:55:56 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.22 2023/04/08 13:48:58 tom Exp $")
 
 #if !PURE_TERMINFO
 static bool
@@ -207,6 +207,14 @@ tgoto(const char *string, int x, int y)
 	result = tgoto_internal(string, x, y);
     else
 #endif
-	result = TIPARM_2(string, y, x);
+    if ((result = TIPARM_2(string, y, x)) == NULL) {
+	/*
+	 * Because termcap did not provide a more general solution such as
+	 * tparm(), it was necessary to handle single-parameter capabilities
+	 * using tgoto().  The internal _nc_tiparm() function returns a NULL
+	 * for that case; retry for the single-parameter case.
+	 */
+	result = TIPARM_1(string, y);
+    }
     returnPtr(result);
 }
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index d9bdfd8fa..8988a3d45 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.141 2023/04/08 18:24:18 tom Exp $")
 
 /*
  *	char *
@@ -1086,6 +1086,64 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data)
     return (TPS(out_buff));
 }
 
+#ifdef CUR
+/*
+ * Only a few standard capabilities accept string parameters.  The others that
+ * are parameterized accept only numeric parameters.
+ */
+static bool
+check_string_caps(TPARM_DATA *data, const char *string)
+{
+    bool result = FALSE;
+
+#define CHECK_CAP(name) (VALID_STRING(name) && !strcmp(name, string))
+
+    /*
+     * Disallow string parameters unless we can check them against a terminal
+     * description.
+     */
+    if (cur_term != NULL) {
+	int want_type = 0;
+
+	if (CHECK_CAP(pkey_key))
+	    want_type = 2;	/* function key #1, type string #2 */
+	else if (CHECK_CAP(pkey_local))
+	    want_type = 2;	/* function key #1, execute string #2 */
+	else if (CHECK_CAP(pkey_xmit))
+	    want_type = 2;	/* function key #1, transmit string #2 */
+	else if (CHECK_CAP(plab_norm))
+	    want_type = 2;	/* label #1, show string #2 */
+	else if (CHECK_CAP(pkey_plab))
+	    want_type = 6;	/* function key #1, type string #2, show string #3 */
+#if NCURSES_XNAMES
+	else {
+	    char *check;
+
+	    check = tigetstr("Cs");
+	    if (CHECK_CAP(check))
+		want_type = 1;	/* style #1 */
+
+	    check = tigetstr("Ms");
+	    if (CHECK_CAP(check))
+		want_type = 3;	/* storage unit #1, content #2 */
+	}
+#endif
+
+	if (want_type == data->tparm_type) {
+	    result = TRUE;
+	} else {
+	    T(("unexpected string-parameter"));
+	}
+    }
+    return result;
+}
+
+#define ValidCap() (myData.tparm_type == 0 || \
+		    check_string_caps(&myData, string))
+#else
+#define ValidCap() 1
+#endif
+
 #if NCURSES_TPARM_VARARGS
 
 NCURSES_EXPORT(char *)
@@ -1100,7 +1158,7 @@ tparm(const char *string, ...)
     tps->tname = "tparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
 	va_list ap;
 
 	va_start(ap, string);
@@ -1135,7 +1193,7 @@ tparm(const char *string,
     tps->tname = "tparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
 
 	myData.param[0] = a1;
 	myData.param[1] = a2;
@@ -1166,7 +1224,7 @@ tiparm(const char *string, ...)
     tps->tname = "tiparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
 	va_list ap;
 
 	va_start(ap, string);
@@ -1179,7 +1237,25 @@ tiparm(const char *string, ...)
 }
 
 /*
- * The internal-use flavor ensures that the parameters are numbers, not strings
+ * The internal-use flavor ensures that parameters are numbers, not strings.
+ * In addition to ensuring that they are numbers, it ensures that the parameter
+ * count is consistent with intended usage.
+ *
+ * Unlike the general-purpose tparm/tiparm, these internal calls are fairly
+ * well defined:
+ *
+ * expected == 0 - not applicable
+ * expected == 1 - set color, or vertical/horizontal addressing
+ * expected == 2 - cursor addressing
+ * expected == 4 - initialize color or color pair
+ * expected == 9 - set attributes
+ *
+ * Only for the last case (set attributes) should a parameter be optional.
+ * Also, a capability which calls for more parameters than expected should be
+ * ignored.
+ *
+ * Return a null if the parameter-checks fail.  Otherwise, return a pointer to
+ * the formatted capability string.
  */
 NCURSES_EXPORT(char *)
 _nc_tiparm(int expected, const char *string, ...)
@@ -1189,22 +1265,36 @@ _nc_tiparm(int expected, const char *string, ...)
     char *result = NULL;
 
     _nc_tparm_err = 0;
+    T((T_CALLED("_nc_tiparm(%d, %s, ...)"), expected, _nc_visbuf(string)));
 #ifdef TRACE
     tps->tname = "_nc_tiparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK
-	&& myData.num_actual <= expected
-	&& myData.tparm_type == 0) {
-	va_list ap;
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
+	if (myData.num_actual == 0) {
+	    T(("missing parameter%s, expected %s%d",
+	       expected > 1 ? "s" : "",
+	       expected == 9 ? "up to " : "",
+	       expected));
+	} else if (myData.num_actual > expected) {
+	    T(("too many parameters, have %d, expected %d",
+	       myData.num_actual,
+	       expected));
+	} else if (expected != 9 && myData.num_actual != expected) {
+	    T(("expected %d parameters, have %d",
+	       myData.num_actual,
+	       expected));
+	} else {
+	    va_list ap;
 
-	va_start(ap, string);
-	tparm_copy_valist(&myData, FALSE, ap);
-	va_end(ap);
+	    va_start(ap, string);
+	    tparm_copy_valist(&myData, FALSE, ap);
+	    va_end(ap);
 
-	result = tparam_internal(tps, string, &myData);
+	    result = tparam_internal(tps, string, &myData);
+	}
     }
-    return result;
+    returnPtr(result);
 }
 
 /*
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 2b1875edf..9c6e9b0e8 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.164 2022/05/08 00:11:44 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.165 2023/04/08 20:14:49 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -323,6 +323,9 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 	|| bool_count < 0
 	|| num_count < 0
 	|| str_count < 0
+	|| bool_count > BOOLCOUNT
+	|| num_count > NUMCOUNT
+	|| str_count > STRCOUNT
 	|| str_size < 0) {
 	returnDB(TGETENT_NO);
     }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index dfdd01257..2ef8ef4b0 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230401) unstable; urgency=low
+ncurses6 (6.4+20230408) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index dfdd01257..2ef8ef4b0 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230401) unstable; urgency=low
+ncurses6 (6.4+20230408) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index b0b297ccd..9ffc90be0 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230401) unstable; urgency=low
+ncurses6 (6.4+20230408) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Apr 2023 07:05:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 917556e82..f7bebfa14 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.572 2023/04/01 11:05:21 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.573 2023/04/06 20:24:50 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0401"
+!define VERSION_MMDD  "0408"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 793497497..0a48057e0 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230401
+Release: 20230408
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index cbc0cb6bd..fc90af333 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230401
+Release: 20230408
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 0403832b0..f1d073d14 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230401
+Release: 20230408
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tic.c b/progs/tic.c
index 93a0b4916..7ae616777 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.320 2022/09/17 18:55:28 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.321 2023/04/08 15:51:57 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -2270,9 +2270,15 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
 
     _nc_reset_tparm(NULL);
     switch (actual) {
+    case Str:
+	result = TPARM_1(value, strings[1]);
+	break;
     case Num_Str:
 	result = TPARM_2(value, numbers[1], strings[2]);
 	break;
+    case Str_Str:
+	result = TPARM_2(value, strings[1], strings[2]);
+	break;
     case Num_Str_Str:
 	result = TPARM_3(value, numbers[1], strings[2], strings[3]);
 	break;
diff --git a/progs/tparm_type.c b/progs/tparm_type.c
index 3da4a0774..4fed96a53 100644
--- a/progs/tparm_type.c
+++ b/progs/tparm_type.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2014,2015 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include <tparm_type.h>
 
-MODULE_ID("$Id: tparm_type.c,v 1.4 2020/10/24 17:30:32 tom Exp $")
+MODULE_ID("$Id: tparm_type.c,v 1.5 2023/04/08 15:57:01 tom Exp $")
 
 /*
  * Lookup the type of call we should make to tparm().  This ignores the actual
@@ -47,6 +47,7 @@ tparm_type(const char *name)
     	{code, {longname} }, \
 	{code, {ti} }, \
 	{code, {tc} }
+#define XD(code, onlyname) TD(code, onlyname, onlyname, onlyname)
     TParams result = Numbers;
     /* *INDENT-OFF* */
     static const struct {
@@ -58,6 +59,10 @@ tparm_type(const char *name)
 	TD(Num_Str,	"pkey_xmit",	"pfx",		"px"),
 	TD(Num_Str,	"plab_norm",	"pln",		"pn"),
 	TD(Num_Str_Str, "pkey_plab",	"pfxl",		"xl"),
+#if NCURSES_XNAMES
+	XD(Str,		"Cs"),
+	XD(Str_Str,	"Ms"),
+#endif
     };
     /* *INDENT-ON* */
 
@@ -80,12 +85,16 @@ guess_tparm_type(int nparam, char **p_is_s)
     case 1:
 	if (!p_is_s[0])
 	    result = Numbers;
+	if (p_is_s[0])
+	    result = Str;
 	break;
     case 2:
 	if (!p_is_s[0] && !p_is_s[1])
 	    result = Numbers;
 	if (!p_is_s[0] && p_is_s[1])
 	    result = Num_Str;
+	if (p_is_s[0] && p_is_s[1])
+	    result = Str_Str;
 	break;
     case 3:
 	if (!p_is_s[0] && !p_is_s[1] && !p_is_s[2])
diff --git a/progs/tparm_type.h b/progs/tparm_type.h
index 7c102a309..2f7bd0771 100644
--- a/progs/tparm_type.h
+++ b/progs/tparm_type.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2014 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: tparm_type.h,v 1.3 2020/10/24 17:11:33 tom Exp $
+ * $Id: tparm_type.h,v 1.4 2023/04/08 15:41:20 tom Exp $
  *
  * determine expected/actual number of parameters to setup for tparm
  */
@@ -45,8 +45,10 @@
 typedef enum {
     Other = -1
     ,Numbers = 0
+    ,Str
     ,Num_Str
     ,Num_Str_Str
+    ,Str_Str
 } TParams;
 
 extern TParams tparm_type(const char *name);
diff --git a/progs/tput.c b/progs/tput.c
index 4cd0c5baa..41508b727 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,12 +47,15 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.99 2022/02/26 23:19:31 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.102 2023/04/08 16:26:36 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
 const char *_nc_progname = "tput";
 
+static bool opt_v = FALSE;	/* quiet, do not show warnings */
+static bool opt_x = FALSE;	/* clear scrollback if possible */
+
 static bool is_init = FALSE;
 static bool is_reset = FALSE;
 static bool is_clear = FALSE;
@@ -81,6 +84,7 @@ usage(const char *optstring)
 	KEEP("  -S <<       read commands from standard input")
 	KEEP("  -T TERM     use this instead of $TERM")
 	KEEP("  -V          print curses-version")
+	KEEP("  -v          verbose, show warnings")
 	KEEP("  -x          do not try to clear scrollback")
 	KEEP("")
 	KEEP("Commands:")
@@ -148,7 +152,7 @@ exit_code(int token, int value)
  * Returns nonzero on error.
  */
 static int
-tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used)
+tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 {
     NCURSES_CONST char *name;
     char *s;
@@ -231,7 +235,9 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used)
     } else if (VALID_STRING(s)) {
 	if (argc > 1) {
 	    int k;
+	    int narg;
 	    int analyzed;
+	    int provided;
 	    int popcount;
 	    long numbers[1 + NUM_PARM];
 	    char *strings[1 + NUM_PARM];
@@ -271,14 +277,45 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used)
 
 	    popcount = 0;
 	    _nc_reset_tparm(NULL);
+	    /*
+	     * Count the number of numeric parameters which are provided.
+	     */
+	    provided = 0;
+	    for (narg = 1; narg < argc; ++narg) {
+		char *ending = NULL;
+		long check = strtol(argv[narg], &ending, 10);
+		if (check < 0 || ending == argv[narg] || *ending != '\0')
+		    break;
+		provided = narg;
+	    }
 	    switch (paramType) {
+	    case Str:
+		s = TPARM_1(s, strings[1]);
+		analyzed = 1;
+		if (provided == 0 && argc >= 1)
+		    provided++;
+		break;
+	    case Str_Str:
+		s = TPARM_2(s, strings[1], strings[2]);
+		analyzed = 2;
+		if (provided == 0 && argc >= 1)
+		    provided++;
+		if (provided == 1 && argc >= 2)
+		    provided++;
+		break;
 	    case Num_Str:
 		s = TPARM_2(s, numbers[1], strings[2]);
 		analyzed = 2;
+		if (provided == 1 && argc >= 2)
+		    provided++;
 		break;
 	    case Num_Str_Str:
 		s = TPARM_3(s, numbers[1], strings[2], strings[3]);
 		analyzed = 3;
+		if (provided == 1 && argc >= 2)
+		    provided++;
+		if (provided == 2 && argc >= 3)
+		    provided++;
 		break;
 	    case Numbers:
 		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
@@ -316,7 +353,13 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used)
 	    if (analyzed < popcount) {
 		analyzed = popcount;
 	    }
-	    *used += analyzed;
+	    if (opt_v && (analyzed != provided)) {
+		fprintf(stderr, "%s: %s parameters for \"%s\"\n",
+			_nc_progname,
+			(analyzed < provided ? "extra" : "missing"),
+			argv[0]);
+	    }
+	    *used += provided;
 	}
 
 	/* use putp() in order to perform padding */
@@ -339,7 +382,6 @@ main(int argc, char **argv)
     int used;
     TTY old_settings;
     TTY tty_settings;
-    bool opt_x = FALSE;		/* clear scrollback if possible */
     bool is_alias;
     bool need_tty;
 
@@ -348,7 +390,7 @@ main(int argc, char **argv)
 
     term = getenv("TERM");
 
-    while ((c = getopt(argc, argv, is_alias ? "T:Vx" : "ST:Vx")) != -1) {
+    while ((c = getopt(argc, argv, is_alias ? "T:Vvx" : "ST:Vvx")) != -1) {
 	switch (c) {
 	case 'S':
 	    cmdline = FALSE;
@@ -361,6 +403,9 @@ main(int argc, char **argv)
 	case 'V':
 	    puts(curses_version());
 	    ExitProgram(EXIT_SUCCESS);
+	case 'v':		/* verbose */
+	    opt_v = TRUE;
+	    break;
 	case 'x':		/* do not try to clear scrollback */
 	    opt_x = TRUE;
 	    break;
@@ -404,7 +449,7 @@ main(int argc, char **argv)
 	    usage(NULL);
 	while (argc > 0) {
 	    tty_settings = old_settings;
-	    code = tput_cmd(fd, &tty_settings, opt_x, argc, argv, &used);
+	    code = tput_cmd(fd, &tty_settings, argc, argv, &used);
 	    if (code != 0)
 		break;
 	    argc -= used;
@@ -439,7 +484,7 @@ main(int argc, char **argv)
 	while (argnum > 0) {
 	    int code;
 	    tty_settings = old_settings;
-	    code = tput_cmd(fd, &tty_settings, opt_x, argnum, argnow, &used);
+	    code = tput_cmd(fd, &tty_settings, argnum, argnow, &used);
 	    if (code != 0) {
 		if (result == 0)
 		    result = ErrSystem(0);	/* will return value >4 */

From b9091deeb6fec8aec6ade20555df448c84881588 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 16 Apr 2023 01:45:32 +0200
Subject: [PATCH 003/106] ncurses-6.4-20230415.patch

---
 Ada95/aclocal.m4                   |  26 +-
 Ada95/configure                    |  10 +-
 NEWS                               |  13 +-
 VERSION                            |   2 +-
 aclocal.m4                         |  20 +-
 configure                          |  14 +-
 configure.in                       |   6 +-
 dist.mk                            |   4 +-
 doc/html/man/clear.1.html          |   6 +-
 doc/html/man/curs_terminfo.3x.html |   6 +-
 include/ncurses_defs               |   3 +-
 man/clear.1                        |   8 +-
 man/curs_terminfo.3x               |   4 +-
 ncurses/tinfo/lib_tparm.c          |  36 +-
 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/aclocal.m4                    |  26 +-
 test/configure                     | 869 +++++++++++++++--------------
 test/configure.in                  |   3 +-
 test/test.priv.h                   |  13 +-
 test/test_tparm.c                  | 162 ++++--
 26 files changed, 709 insertions(+), 544 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 76367b001..289bd73b5 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.201 2023/02/25 13:45:56 tom Exp $
+dnl $Id: aclocal.m4,v 1.202 2023/04/15 20:02:10 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1533,7 +1533,7 @@ rm -rf ./conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36
+dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13
 dnl --------------
 dnl Find version of gcc, and (because icc/clang pretend to be gcc without being
 dnl compatible), attempt to determine if icc/clang is actually used.
@@ -1542,7 +1542,7 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	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.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
@@ -5045,7 +5045,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25
+dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -5054,6 +5054,18 @@ dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
+dnl
+dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the
+dnl implementation predefines it, because X/Open and most implementations agree
+dnl that the latter is a legacy or "aligned" value.
+dnl
+dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns
+dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly.
+dnl
+dnl References:
+dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html
+dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
+dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
 AC_DEFUN([CF_XOPEN_SOURCE],[
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([CF_POSIX_VISIBLE])
@@ -5093,7 +5105,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -5145,8 +5157,8 @@ case "$host_os" in
 	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	if test "$cf_cv_xopen_source" = no ; then
+		CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE)
 		AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
 			AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
 			CPPFLAGS="$cf_save_xopen_cppflags"])
diff --git a/Ada95/configure b/Ada95/configure
index 64aefa5e3..7d87aaf95 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1853,7 +1853,7 @@ GCC_VERSION=none
 if test "$GCC" = yes ; then
 	echo "$as_me:1854: 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.].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	echo "$as_me:1858: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
@@ -12475,7 +12475,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
@@ -13795,10 +13795,10 @@ fi
 fi # cf_cv_posix_visible
 
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+	if test "$cf_cv_xopen_source" = no ; then
+		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:13801: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:13801: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
 #line 13804 "configure"
diff --git a/NEWS b/NEWS
index 964fb6438..12e667426 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3929 2023/04/08 22:24:09 tom Exp $
+-- $Id: NEWS,v 1.3932 2023/04/15 20:08:13 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,17 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230415
+	+ configure script fixes:
+	  + fix copy/paste error in configure option --disable-root-access
+	    (report/patch by Sven Joachim).
+	  + modify CF_XOPEN_SOURCE macro's amend default case to avoid
+	    undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined.
+	+ modify test_tparm to account for extended capabilities.
+	+ add checks in tparm() and tiparm() for misuse of numeric parameters,
+	  overlooked in 20230408.
+	+ fix errata in clear.1 and curs_terminfo.3x
+
 20230408
 	+ document limitations of tparm, and error-returns in curs_terminfo.3x
 	+ document limitations of tgoto, and error-returns in curs_termcap.3x
diff --git a/VERSION b/VERSION
index 78269eabb..971b570ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230408
+5:0:10	6.4	20230415
diff --git a/aclocal.m4 b/aclocal.m4
index 9a53f26b0..afeaccbb6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1037 2023/03/05 19:30:13 tom Exp $
+dnl $Id: aclocal.m4,v 1.1038 2023/04/15 20:03:39 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -9940,7 +9940,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 65 updated: 2023/03/05 13:14:56
+dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -9949,6 +9949,18 @@ dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
+dnl
+dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the
+dnl implementation predefines it, because X/Open and most implementations agree
+dnl that the latter is a legacy or "aligned" value.
+dnl
+dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns
+dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly.
+dnl
+dnl References:
+dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html
+dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
+dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
 AC_DEFUN([CF_XOPEN_SOURCE],[
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([CF_POSIX_VISIBLE])
@@ -10040,8 +10052,8 @@ case "$host_os" in
 	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	if test "$cf_cv_xopen_source" = no ; then
+		CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE)
 		AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
 			AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
 			CPPFLAGS="$cf_save_xopen_cppflags"])
diff --git a/configure b/configure
index 412e5af2a..ae0559ae9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.757 .
+# From configure.in Revision: 1.758 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -9936,9 +9936,9 @@ EOF
 echo "$as_me:9936: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
-# Check whether --enable-root-environ or --disable-root-environ was given.
-if test "${enable_root_environ+set}" = set; then
-  enableval="$enable_root_environ"
+# Check whether --enable-root-access or --disable-root-access was given.
+if test "${enable_root_access+set}" = set; then
+  enableval="$enable_root_access"
   with_root_access=$enableval
 else
   with_root_access=yes
@@ -11738,10 +11738,10 @@ fi
 fi # cf_cv_posix_visible
 
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+	if test "$cf_cv_xopen_source" = no ; then
+		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
 #line 11747 "configure"
diff --git a/configure.in b/configure.in
index c332e0455..34a40c4fd 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.757 2023/02/25 19:50:10 tom Exp $
+dnl $Id: configure.in,v 1.758 2023/04/15 20:06:19 Sven.Joachim Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.757 $)
+AC_REVISION($Revision: 1.758 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -875,7 +875,7 @@ AC_MSG_RESULT($with_root_environ)
 test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root is allowed to use ncurses environment])
 
 AC_MSG_CHECKING(if you want to permit setuid programs to access all files)
-AC_ARG_ENABLE(root-environ,
+AC_ARG_ENABLE(root-access,
 	[  --disable-root-access   restrict file-access when running setuid],
 	[with_root_access=$enableval],
 	[with_root_access=yes])
diff --git a/dist.mk b/dist.mk
index 99a74f8c5..5278cadc4 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1534 2023/04/08 13:33:20 tom Exp $
+# $Id: dist.mk,v 1.1535 2023/04/15 11:55:57 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230408
+NCURSES_PATCH = 20230415
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 243d57ed3..bcf59102e 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.27 2022/02/12 20:07:29 tom Exp @
+  * @Id: clear.1,v 1.29 2023/04/09 08:28:00 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -148,7 +148,7 @@ <H1 class="no-header">clear 1</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>xterm(1)</STRONG>.
+       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
 
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 480cafceb..7b0d1198d 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.83 2023/04/08 22:54:21 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.84 2023/04/09 08:13:16 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -600,8 +600,8 @@ <H1 class="no-header">curs_terminfo 3x</H1>
            cannot check if a calling program provides  strings  in  the  right
            places for the <STRONG>tparm</STRONG> calls.
 
-           The  <STRONG><A HREF="tput.3x.html">tput(3x)</A></STRONG>  program  checks its use of these capabilities with a
-           table, so that it calls <STRONG>tparm</STRONG> correctly.
+           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of these capabilities with a ta-
+           ble, so that it calls <STRONG>tparm</STRONG> correctly.
 
 
 </PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE>
diff --git a/include/ncurses_defs b/include/ncurses_defs
index 1b1c70e26..e744878b4 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.103 2023/02/25 15:51:21 tom Exp $
+# $Id: ncurses_defs,v 1.104 2023/04/15 19:33:17 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -225,6 +225,7 @@ HAVE_WRESIZE
 HAVE_WSYNCDOWN	1
 HAVE__DOSCAN
 HAVE__TRACEF
+HAVE__NC_TPARM_ANALYZE 1
 MIXEDCASE_FILENAMES
 NCURSES_CHAR_EQ
 NCURSES_EXPANDED
diff --git a/man/clear.1 b/man/clear.1
index 3ee012a3f..9748fdd5a 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.27 2022/02/12 20:07:29 tom Exp $
+.\" $Id: clear.1,v 1.29 2023/04/09 08:28:00 tom Exp $
 .TH @CLEAR@ 1 ""
 .\" these would be fallbacks for DS/DE,
 .\" but groff changed the meaning of the macros.
@@ -157,7 +157,9 @@ 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@\fP(1), \fBterminfo\fP(\*n), \fBxterm\fP(1).
+\fB@TPUT@\fP(1),
+\fBxterm\fP(1),
+\fBterminfo\fP(\*n).
 .PP
 This describes \fBncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 5ea01ee65..dfb27629b 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.83 2023/04/08 22:54:21 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.84 2023/04/09 08:13:16 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -698,7 +698,7 @@ and returns an error if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
 places for the \fBtparm\fP calls.
 .IP
-The \fBtput\fR(3X) program checks its use of these capabilities with a table,
+The \fB@TPUT@\fR(1) program checks its use of these capabilities with a table,
 so that it calls \fBtparm\fP correctly.
 .SS Special TERM treatment
 .PP
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 8988a3d45..8f63c567a 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.141 2023/04/08 18:24:18 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.142 2023/04/14 00:29:31 tom Exp $")
 
 /*
  *	char *
@@ -1271,7 +1271,39 @@ _nc_tiparm(int expected, const char *string, ...)
 #endif /* TRACE */
 
     if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
-	if (myData.num_actual == 0) {
+#ifdef CUR
+	if (myData.num_actual != expected && cur_term != NULL) {
+	    int needed = expected;
+	    if (CHECK_CAP(to_status_line)) {
+		needed = 0;	/* allow for xterm's status line */
+	    } else if (CHECK_CAP(set_a_background)) {
+		needed = 0;	/* allow for monochrome fakers */
+	    } else if (CHECK_CAP(set_a_foreground)) {
+		needed = 0;
+	    } else if (CHECK_CAP(set_background)) {
+		needed = 0;
+	    } else if (CHECK_CAP(set_foreground)) {
+		needed = 0;
+	    }
+#if NCURSES_XNAMES
+	    else {
+		char *check;
+
+		check = tigetstr("xm");
+		if (CHECK_CAP(check)) {
+		    needed = 3;
+		}
+		check = tigetstr("S0");
+		if (CHECK_CAP(check)) {
+		    needed = 0;	/* used in screen-base */
+		}
+	    }
+#endif
+	    if (myData.num_actual >= needed && myData.num_actual <= expected)
+		expected = myData.num_actual;
+	}
+#endif
+	if (myData.num_actual == 0 && expected) {
 	    T(("missing parameter%s, expected %s%d",
 	       expected > 1 ? "s" : "",
 	       expected == 9 ? "up to " : "",
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2ef8ef4b0..78570ae07 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230408) unstable; urgency=low
+ncurses6 (6.4+20230415) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2ef8ef4b0..78570ae07 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230408) unstable; urgency=low
+ncurses6 (6.4+20230415) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9ffc90be0..264d5a31a 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230408) unstable; urgency=low
+ncurses6 (6.4+20230415) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Apr 2023 16:24:50 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f7bebfa14..65348841d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.573 2023/04/06 20:24:50 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.574 2023/04/09 08:24:29 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0408"
+!define VERSION_MMDD  "0415"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0a48057e0..514d02999 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230408
+Release: 20230415
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index fc90af333..37e92259c 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230408
+Release: 20230415
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index f1d073d14..19b154b4f 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230408
+Release: 20230415
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 538ead135..440d99fe7 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.213 2023/02/25 13:45:56 tom Exp $
+dnl $Id: aclocal.m4,v 1.215 2023/04/15 20:01:23 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1852,7 +1852,7 @@ rm -rf ./conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36
+dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13
 dnl --------------
 dnl Find version of gcc, and (because icc/clang pretend to be gcc without being
 dnl compatible), attempt to determine if icc/clang is actually used.
@@ -1861,7 +1861,7 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	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.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
@@ -4381,7 +4381,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25
+dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4390,6 +4390,18 @@ dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
+dnl
+dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the
+dnl implementation predefines it, because X/Open and most implementations agree
+dnl that the latter is a legacy or "aligned" value.
+dnl
+dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns
+dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly.
+dnl
+dnl References:
+dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html
+dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
+dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
 AC_DEFUN([CF_XOPEN_SOURCE],[
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([CF_POSIX_VISIBLE])
@@ -4429,7 +4441,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -4481,8 +4493,8 @@ case "$host_os" in
 	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	if test "$cf_cv_xopen_source" = no ; then
+		CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE)
 		AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
 			AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
 			CPPFLAGS="$cf_save_xopen_cppflags"])
diff --git a/test/configure b/test/configure
index aac2dedde..77ddd0bbc 100755
--- a/test/configure
+++ b/test/configure
@@ -1901,7 +1901,7 @@ GCC_VERSION=none
 if test "$GCC" = yes ; then
 	echo "$as_me:1902: 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.].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	echo "$as_me:1906: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
@@ -4075,7 +4075,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
@@ -5395,10 +5395,10 @@ fi
 fi # cf_cv_posix_visible
 
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+	if test "$cf_cv_xopen_source" = no ; then
+		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5401: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:5401: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
 #line 5404 "configure"
@@ -19434,16 +19434,17 @@ winsdelln \
 winsstr \
 wresize \
 wsyncdown \
+_nc_tparm_analyze \
 _tracef \
 
 do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19443: checking for ${cf_func}" >&5
+	echo "$as_me:19444: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19446: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19447: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19452,7 +19453,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19455 "configure"
+#line 19456 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19485,16 +19486,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19491: \$? = $ac_status" >&5
+  echo "$as_me:19492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19497: \$? = $ac_status" >&5
+  echo "$as_me:19498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19510,7 +19511,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19513: result: $cf_result" >&5
+	echo "$as_me:19514: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19525,10 +19526,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19528: checking for ${cf_func}" >&5
+	echo "$as_me:19529: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19531: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19532: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19537,7 +19538,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19540 "configure"
+#line 19541 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19570,16 +19571,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19576: \$? = $ac_status" >&5
+  echo "$as_me:19577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19582: \$? = $ac_status" >&5
+  echo "$as_me:19583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19595,7 +19596,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19598: result: $cf_result" >&5
+	echo "$as_me:19599: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19619,7 +19620,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19622 "configure"
+#line 19623 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19639,21 +19640,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19645: \$? = $ac_status" >&5
+  echo "$as_me:19646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19651: \$? = $ac_status" >&5
+  echo "$as_me:19652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19656: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19657: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19673,14 +19674,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19676: checking for ncurses extended functions" >&5
+echo "$as_me:19677: 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 19683 "configure"
+#line 19684 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19695,16 +19696,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19701: \$? = $ac_status" >&5
+  echo "$as_me:19702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19707: \$? = $ac_status" >&5
+  echo "$as_me:19708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19712,7 +19713,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19715 "configure"
+#line 19716 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19737,16 +19738,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19743: \$? = $ac_status" >&5
+  echo "$as_me:19744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19749: \$? = $ac_status" >&5
+  echo "$as_me:19750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19760,7 +19761,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19763: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19764: 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
@@ -19774,11 +19775,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19777: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19778: 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 19781 "configure"
+#line 19782 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19791,16 +19792,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19797: \$? = $ac_status" >&5
+  echo "$as_me:19798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19803: \$? = $ac_status" >&5
+  echo "$as_me:19804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19809,7 +19810,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19812 "configure"
+#line 19813 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19822,16 +19823,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19828: \$? = $ac_status" >&5
+  echo "$as_me:19829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19834: \$? = $ac_status" >&5
+  echo "$as_me:19835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19842,7 +19843,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19845: result: $cf_define_xpg5" >&5
+		echo "$as_me:19846: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19851,14 +19852,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19854: checking for wide-character functions" >&5
+	echo "$as_me:19855: 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 19861 "configure"
+#line 19862 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19875,16 +19876,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19881: \$? = $ac_status" >&5
+  echo "$as_me:19882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19887: \$? = $ac_status" >&5
+  echo "$as_me:19888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19895,7 +19896,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19898: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19899: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19916,14 +19917,14 @@ EOF
 
 fi
 
-echo "$as_me:19919: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19920: 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 19926 "configure"
+#line 19927 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19941,16 +19942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19947: \$? = $ac_status" >&5
+  echo "$as_me:19948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19953: \$? = $ac_status" >&5
+  echo "$as_me:19954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -19961,21 +19962,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19964: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:19965: 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:19971: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:19972: 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 19978 "configure"
+#line 19979 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19995,16 +19996,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20001: \$? = $ac_status" >&5
+  echo "$as_me:20002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20007: \$? = $ac_status" >&5
+  echo "$as_me:20008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20016,7 +20017,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20019: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20020: 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
@@ -20025,7 +20026,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20028: checking for openpty in -lutil" >&5
+echo "$as_me:20029: 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
@@ -20033,7 +20034,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20036 "configure"
+#line 20037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20052,16 +20053,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20058: \$? = $ac_status" >&5
+  echo "$as_me:20059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20064: \$? = $ac_status" >&5
+  echo "$as_me:20065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20072,7 +20073,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20075: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20076: 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
@@ -20080,7 +20081,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20083: checking for openpty header" >&5
+echo "$as_me:20084: 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
@@ -20107,7 +20108,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20110 "configure"
+#line 20111 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20124,16 +20125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20130: \$? = $ac_status" >&5
+  echo "$as_me:20131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20136: \$? = $ac_status" >&5
+  echo "$as_me:20137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20151,7 +20152,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20154: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20155: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20185,7 +20186,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20188: checking for function curses_version" >&5
+echo "$as_me:20189: 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
@@ -20195,7 +20196,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20198 "configure"
+#line 20199 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20211,15 +20212,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20217: \$? = $ac_status" >&5
+  echo "$as_me:20218: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20222: \$? = $ac_status" >&5
+  echo "$as_me:20223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20234,14 +20235,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20237: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20238: 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:20244: checking for alternate character set array" >&5
+echo "$as_me:20245: 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
@@ -20251,7 +20252,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20254 "configure"
+#line 20255 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20267,16 +20268,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20273: \$? = $ac_status" >&5
+  echo "$as_me:20274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20279: \$? = $ac_status" >&5
+  echo "$as_me:20280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20287,7 +20288,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20290: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20291: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20297,7 +20298,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20300: checking for wide alternate character set array" >&5
+echo "$as_me:20301: 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
@@ -20307,7 +20308,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20310 "configure"
+#line 20311 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20323,16 +20324,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20329: \$? = $ac_status" >&5
+  echo "$as_me:20330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20335: \$? = $ac_status" >&5
+  echo "$as_me:20336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20343,7 +20344,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20346: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20347: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20351,7 +20352,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20354: checking for wide alternate character constants" >&5
+echo "$as_me:20355: 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
@@ -20361,7 +20362,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20364 "configure"
+#line 20365 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20378,16 +20379,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20384: \$? = $ac_status" >&5
+  echo "$as_me:20385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20390: \$? = $ac_status" >&5
+  echo "$as_me:20391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20397,7 +20398,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20400 "configure"
+#line 20401 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20413,16 +20414,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20419: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20425: \$? = $ac_status" >&5
+  echo "$as_me:20426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20433,7 +20434,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20436: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20437: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20443,10 +20444,10 @@ EOF
 
 fi
 
-echo "$as_me:20446: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20447: 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 20449 "configure"
+#line 20450 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20464,16 +20465,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20470: \$? = $ac_status" >&5
+  echo "$as_me:20471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20476: \$? = $ac_status" >&5
+  echo "$as_me:20477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20482,7 +20483,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20485: result: $cf_result" >&5
+echo "$as_me:20486: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20503,14 +20504,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20506: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20507: 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 20513 "configure"
+#line 20514 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20528,23 +20529,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20534: \$? = $ac_status" >&5
+  echo "$as_me:20535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20540: \$? = $ac_status" >&5
+  echo "$as_me:20541: \$? = $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 20547 "configure"
+#line 20548 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20563,16 +20564,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20569: \$? = $ac_status" >&5
+  echo "$as_me:20570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20575: \$? = $ac_status" >&5
+  echo "$as_me:20576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20584,7 +20585,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20587: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20588: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20607,14 +20608,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20610: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20611: 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 20617 "configure"
+#line 20618 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20632,23 +20633,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20644: \$? = $ac_status" >&5
+  echo "$as_me:20645: \$? = $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 20651 "configure"
+#line 20652 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20667,16 +20668,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20673: \$? = $ac_status" >&5
+  echo "$as_me:20674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20679: \$? = $ac_status" >&5
+  echo "$as_me:20680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20688,7 +20689,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20691: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20692: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20711,14 +20712,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20714: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20715: 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 20721 "configure"
+#line 20722 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20736,23 +20737,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20742: \$? = $ac_status" >&5
+  echo "$as_me:20743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20748: \$? = $ac_status" >&5
+  echo "$as_me:20749: \$? = $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 20755 "configure"
+#line 20756 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20771,16 +20772,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20777: \$? = $ac_status" >&5
+  echo "$as_me:20778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20783: \$? = $ac_status" >&5
+  echo "$as_me:20784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20792,7 +20793,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20795: result: $cf_cv_wint_t" >&5
+echo "$as_me:20796: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20816,10 +20817,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20819: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20820: 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 20822 "configure"
+#line 20823 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20837,16 +20838,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20843: \$? = $ac_status" >&5
+  echo "$as_me:20844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20849: \$? = $ac_status" >&5
+  echo "$as_me:20850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20855,7 +20856,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20858: result: $cf_result" >&5
+echo "$as_me:20859: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20877,10 +20878,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20880: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20881: 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 20883 "configure"
+#line 20884 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20898,16 +20899,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20902: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20904: \$? = $ac_status" >&5
+  echo "$as_me:20905: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20910: \$? = $ac_status" >&5
+  echo "$as_me:20911: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20916,7 +20917,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20919: result: $cf_result" >&5
+echo "$as_me:20920: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20938,10 +20939,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:20941: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20942: 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 20944 "configure"
+#line 20945 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20959,16 +20960,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20965: \$? = $ac_status" >&5
+  echo "$as_me:20966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20971: \$? = $ac_status" >&5
+  echo "$as_me:20972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20977,7 +20978,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20980: result: $cf_result" >&5
+echo "$as_me:20981: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21006,11 +21007,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21009: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21010: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21013 "configure"
+#line 21014 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21043,16 +21044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21049: \$? = $ac_status" >&5
+  echo "$as_me:21050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21055: \$? = $ac_status" >&5
+  echo "$as_me:21056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21062,7 +21063,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21065: result: $cf_result" >&5
+echo "$as_me:21066: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21074,14 +21075,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21077: checking for data $cf_data in library" >&5
+	echo "$as_me:21078: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21084 "configure"
+#line 21085 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21120,16 +21121,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21126: \$? = $ac_status" >&5
+  echo "$as_me:21127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21132: \$? = $ac_status" >&5
+  echo "$as_me:21133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21141,7 +21142,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21144 "configure"
+#line 21145 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21173,15 +21174,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21179: \$? = $ac_status" >&5
+  echo "$as_me:21180: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21184: \$? = $ac_status" >&5
+  echo "$as_me:21185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21193,7 +21194,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21196: result: $cf_result" >&5
+	echo "$as_me:21197: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21210,7 +21211,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21213: checking for X" >&5
+	echo "$as_me:21214: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21314,17 +21315,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21317 "configure"
+#line 21318 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21321: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21327: \$? = $ac_status" >&5
+  echo "$as_me:21328: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21357,7 +21358,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21360 "configure"
+#line 21361 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21369,16 +21370,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21375: \$? = $ac_status" >&5
+  echo "$as_me:21376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21381: \$? = $ac_status" >&5
+  echo "$as_me:21382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21416,7 +21417,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21419: result: $have_x" >&5
+  echo "$as_me:21420: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21426,7 +21427,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21429: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21430: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21453,11 +21454,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21456: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21457: 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 21460 "configure"
+#line 21461 "configure"
 #include "confdefs.h"
 
 int
@@ -21469,16 +21470,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21475: \$? = $ac_status" >&5
+  echo "$as_me:21476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21481: \$? = $ac_status" >&5
+  echo "$as_me:21482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21488,13 +21489,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21491: result: no" >&5
+	echo "$as_me:21492: 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 21497 "configure"
+#line 21498 "configure"
 #include "confdefs.h"
 
 int
@@ -21506,16 +21507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21512: \$? = $ac_status" >&5
+  echo "$as_me:21513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21518: \$? = $ac_status" >&5
+  echo "$as_me:21519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21525,11 +21526,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21528: result: yes" >&5
+	  echo "$as_me:21529: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21532: result: neither works" >&5
+	  echo "$as_me:21533: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21549,7 +21550,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21552 "configure"
+#line 21553 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21568,22 +21569,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21574: \$? = $ac_status" >&5
+  echo "$as_me:21575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21580: \$? = $ac_status" >&5
+  echo "$as_me:21581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21586: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21587: 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
@@ -21591,7 +21592,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21594 "configure"
+#line 21595 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21610,16 +21611,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21616: \$? = $ac_status" >&5
+  echo "$as_me:21617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21622: \$? = $ac_status" >&5
+  echo "$as_me:21623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21630,14 +21631,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21633: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21634: 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:21640: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21641: 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
@@ -21645,7 +21646,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21648 "configure"
+#line 21649 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21664,16 +21665,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21670: \$? = $ac_status" >&5
+  echo "$as_me:21671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21676: \$? = $ac_status" >&5
+  echo "$as_me:21677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21684,7 +21685,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21687: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21688: 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"
@@ -21703,13 +21704,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21706: checking for gethostbyname" >&5
+    echo "$as_me:21707: 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 21712 "configure"
+#line 21713 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21740,16 +21741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21746: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21752: \$? = $ac_status" >&5
+  echo "$as_me:21753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21759,11 +21760,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21762: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21763: 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:21766: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21767: 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
@@ -21771,7 +21772,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21774 "configure"
+#line 21775 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21790,16 +21791,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21796: \$? = $ac_status" >&5
+  echo "$as_me:21797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21802: \$? = $ac_status" >&5
+  echo "$as_me:21803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21810,14 +21811,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21813: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21814: 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:21820: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21821: 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
@@ -21825,7 +21826,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21828 "configure"
+#line 21829 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21844,16 +21845,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21850: \$? = $ac_status" >&5
+  echo "$as_me:21851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21856: \$? = $ac_status" >&5
+  echo "$as_me:21857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21864,7 +21865,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21867: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21868: 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"
@@ -21880,13 +21881,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21883: checking for connect" >&5
+    echo "$as_me:21884: 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 21889 "configure"
+#line 21890 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21917,16 +21918,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21923: \$? = $ac_status" >&5
+  echo "$as_me:21924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:21930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -21936,11 +21937,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21939: result: $ac_cv_func_connect" >&5
+echo "$as_me:21940: 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:21943: checking for connect in -lsocket" >&5
+      echo "$as_me:21944: 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
@@ -21948,7 +21949,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21951 "configure"
+#line 21952 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21967,16 +21968,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21973: \$? = $ac_status" >&5
+  echo "$as_me:21974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21979: \$? = $ac_status" >&5
+  echo "$as_me:21980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -21987,7 +21988,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21990: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:21991: 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"
@@ -21996,13 +21997,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:21999: checking for remove" >&5
+    echo "$as_me:22000: 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 22005 "configure"
+#line 22006 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22033,16 +22034,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:22040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22052,11 +22053,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22055: result: $ac_cv_func_remove" >&5
+echo "$as_me:22056: 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:22059: checking for remove in -lposix" >&5
+      echo "$as_me:22060: 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
@@ -22064,7 +22065,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22067 "configure"
+#line 22068 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22083,16 +22084,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22089: \$? = $ac_status" >&5
+  echo "$as_me:22090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22095: \$? = $ac_status" >&5
+  echo "$as_me:22096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22103,7 +22104,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22106: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22107: 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"
@@ -22112,13 +22113,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22115: checking for shmat" >&5
+    echo "$as_me:22116: 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 22121 "configure"
+#line 22122 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22149,16 +22150,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22155: \$? = $ac_status" >&5
+  echo "$as_me:22156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22161: \$? = $ac_status" >&5
+  echo "$as_me:22162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22168,11 +22169,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22171: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22172: 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:22175: checking for shmat in -lipc" >&5
+      echo "$as_me:22176: 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
@@ -22180,7 +22181,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22183 "configure"
+#line 22184 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22199,16 +22200,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22205: \$? = $ac_status" >&5
+  echo "$as_me:22206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22211: \$? = $ac_status" >&5
+  echo "$as_me:22212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22219,7 +22220,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22222: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22223: 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"
@@ -22237,7 +22238,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22240: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22241: 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
@@ -22245,7 +22246,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22248 "configure"
+#line 22249 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22264,16 +22265,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22270: \$? = $ac_status" >&5
+  echo "$as_me:22271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22276: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22284,7 +22285,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22287: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22288: 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"
@@ -22331,16 +22332,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22334: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22335: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22339: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22340: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22343: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22344: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22379,16 +22380,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22382: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22383: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22387: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22388: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22391: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22392: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22427,23 +22428,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22430: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22431: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22435: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22436: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22439: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22440: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22446: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22447: 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.
@@ -22460,7 +22461,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22463: result: $enable_warnings" >&5
+echo "$as_me:22464: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22483,10 +22484,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22486: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22487: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22489 "${as_me:-configure}"
+#line 22490 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22536,12 +22537,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22539: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22542: \$? = $ac_status" >&5
+  echo "$as_me:22543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22544: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22545: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22619,7 +22620,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22622 "configure"
+#line 22623 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22634,26 +22635,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22640: \$? = $ac_status" >&5
+  echo "$as_me:22641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22646: \$? = $ac_status" >&5
+  echo "$as_me:22647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22649: checking for X11/Xt const-feature" >&5
+echo "$as_me:22650: 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 22656 "configure"
+#line 22657 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -22670,16 +22671,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22676: \$? = $ac_status" >&5
+  echo "$as_me:22677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22682: \$? = $ac_status" >&5
+  echo "$as_me:22683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22694,7 +22695,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22697: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22698: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22723,7 +22724,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22726 "${as_me:-configure}"
+#line 22727 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22739,7 +22740,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22742: checking for $CC warning options..." >&5
+	{ echo "$as_me:22743: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22755,12 +22756,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22758: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22761: \$? = $ac_status" >&5
+  echo "$as_me:22762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22763: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22764: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22768,7 +22769,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22771: checking for $CC warning options..." >&5
+	{ echo "$as_me:22772: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22791,12 +22792,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22794: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22797: \$? = $ac_status" >&5
+  echo "$as_me:22798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22799: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22800: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22804,7 +22805,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22807: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22808: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22814,7 +22815,7 @@ echo "${as_me:-configure}:22807: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22817: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22818: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22831,7 +22832,7 @@ fi
 
 fi
 
-echo "$as_me:22834: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22835: 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.
@@ -22853,7 +22854,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22856: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22857: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22967,23 +22968,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:22970: checking for dmalloc.h" >&5
+	echo "$as_me:22971: 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 22976 "configure"
+#line 22977 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22980: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22981: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:22987: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23002,11 +23003,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23005: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23006: 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:23009: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23010: 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
@@ -23014,7 +23015,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23017 "configure"
+#line 23018 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23033,16 +23034,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23039: \$? = $ac_status" >&5
+  echo "$as_me:23040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23045: \$? = $ac_status" >&5
+  echo "$as_me:23046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23053,7 +23054,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23056: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23057: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23068,7 +23069,7 @@ fi
 
 fi
 
-echo "$as_me:23071: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23072: 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.
@@ -23090,7 +23091,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23093: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23094: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23204,23 +23205,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23207: checking for dbmalloc.h" >&5
+	echo "$as_me:23208: 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 23213 "configure"
+#line 23214 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23217: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23223: \$? = $ac_status" >&5
+  echo "$as_me:23224: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23239,11 +23240,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23242: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23243: 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:23246: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23247: 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
@@ -23251,7 +23252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23254 "configure"
+#line 23255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23270,16 +23271,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23276: \$? = $ac_status" >&5
+  echo "$as_me:23277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23282: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23290,7 +23291,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23293: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23294: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23305,7 +23306,7 @@ fi
 
 fi
 
-echo "$as_me:23308: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23309: 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.
@@ -23327,7 +23328,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23330: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23331: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23440,7 +23441,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23443: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23444: 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.
@@ -23451,7 +23452,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23454: result: $with_no_leaks" >&5
+echo "$as_me:23455: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23469,7 +23470,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23472: checking for an rpath option" >&5
+	echo "$as_me:23473: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23500,12 +23501,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23503: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23504: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23508: checking if we need a space after rpath option" >&5
+		echo "$as_me:23509: 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"
 
@@ -23526,7 +23527,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23529 "configure"
+#line 23530 "configure"
 #include "confdefs.h"
 
 int
@@ -23538,16 +23539,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23544: \$? = $ac_status" >&5
+  echo "$as_me:23545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23550: \$? = $ac_status" >&5
+  echo "$as_me:23551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23557,14 +23558,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23560: result: $cf_rpath_space" >&5
+		echo "$as_me:23561: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23567: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23568: 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.
@@ -23582,22 +23583,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23585: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23586: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23590: checking for updated LDFLAGS" >&5
+echo "$as_me:23591: 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:23593: result: maybe" >&5
+	echo "$as_me:23594: 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:23600: checking for $ac_word" >&5
+echo "$as_me:23601: 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
@@ -23612,7 +23613,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23615: found $ac_dir/$ac_word" >&5
+echo "$as_me:23616: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23620,10 +23621,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23623: result: $cf_ldd_prog" >&5
+  echo "$as_me:23624: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23626: result: no" >&5
+  echo "$as_me:23627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23637,7 +23638,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23640 "configure"
+#line 23641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23649,16 +23650,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23655: \$? = $ac_status" >&5
+  echo "$as_me:23656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23661: \$? = $ac_status" >&5
+  echo "$as_me:23662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23686,7 +23687,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23689: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23698,11 +23699,11 @@ echo "${as_me:-configure}:23689: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23701: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23702: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23705: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23706: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23739,7 +23740,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23742: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23743: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23752,11 +23753,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23755: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23756: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23759: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23760: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23793,7 +23794,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23796: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23806,14 +23807,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23809: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23810: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23813: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23814: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23816: result: no" >&5
+	echo "$as_me:23817: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23903,7 +23904,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23906: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23907: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24084,7 +24085,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24087: error: ambiguous option: $1
+    { { echo "$as_me:24088: 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;}
@@ -24103,7 +24104,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24106: error: unrecognized option: $1
+  -*) { { echo "$as_me:24107: 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;}
@@ -24153,7 +24154,7 @@ do
   "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:24156: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24157: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24461,7 +24462,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24464: creating $ac_file" >&5
+    { echo "$as_me:24465: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24479,7 +24480,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24482: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24483: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24492,7 +24493,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24495: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24496: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24508,7 +24509,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24511: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24512: 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;}
@@ -24517,7 +24518,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24520: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24521: 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;}
@@ -24562,7 +24563,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24565: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24566: 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;}
@@ -24573,7 +24574,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24576: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24577: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24622,7 +24623,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24625: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24626: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24633,7 +24634,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24636: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24637: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24646,7 +24647,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24649: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24650: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24704,7 +24705,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24707: $ac_file is unchanged" >&5
+      { echo "$as_me:24708: $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/test/configure.in b/test/configure.in
index 1af04e047..5d19091a2 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.169 2023/02/18 22:35:55 tom Exp $
+dnl $Id: configure.in,v 1.170 2023/04/15 19:55:36 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -375,6 +375,7 @@ winsdelln \
 winsstr \
 wresize \
 wsyncdown \
+_nc_tparm_analyze \
 _tracef \
 )
 
diff --git a/test/test.priv.h b/test/test.priv.h
index a572b5c25..d0a2a9f71 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.210 2023/02/25 21:26:04 tom Exp $ */
+/* $Id: test.priv.h,v 1.213 2023/04/15 21:44:58 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -379,6 +379,10 @@
 #define NO_LEAKS 0
 #endif
 
+#ifndef HAVE__NC_TPARM_ANALYZE
+#define HAVE__NC_TPARM_ANALYZE 0
+#endif
+
 /*
  * Workaround for HPUX
  */
@@ -744,10 +748,7 @@ static char *version_common(char **argv) { \
 	char *base = argv[0]; \
 	char *leaf = strrchr(base, '/'); \
 	char *result = malloc(strlen(base) + 80); \
-	if (result == NULL) { \
-	    static char unknown[] = "?"; \
-	    result = unknown; \
-	} else { \
+	if (result != NULL) { \
 	    if (leaf++ == NULL) leaf = base; \
 	    sprintf(result, "%.20s: ", leaf); \
 	    format_version(result + strlen(result)); \
@@ -995,7 +996,9 @@ extern int TABSIZE;
 
 #define UChar(c)    ((unsigned char)(c))
 
+#ifndef SIZEOF
 #define SIZEOF(table)	(sizeof(table)/sizeof(table[0]))
+#endif
 
 #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
 #include <nc_alloc.h>
diff --git a/test/test_tparm.c b/test/test_tparm.c
index c242ff683..86828a64a 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,18 +29,35 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.24 2022/12/10 23:23:27 tom Exp $
+ * $Id: test_tparm.c,v 1.30 2023/04/15 22:31:47 tom Exp $
  *
  * Exercise tparm, either for all possible capabilities with fixed parameters,
  * or one capability with all possible parameters.
  *
- * TODO: incorporate tic.h and _nc_tparm_analyze
  * TODO: optionally test tiparm
  * TODO: add checks/logic to handle "%s" in tparm
  */
 #define USE_TINFO
 #include <test.priv.h>
 
+#if NCURSES_XNAMES
+#if HAVE_TERM_ENTRY_H
+#include <term_entry.h>
+#else
+#undef NCURSES_XNAMES
+#define NCURSES_XNAMES 0
+#endif
+#endif
+
+#define GrowArray(array,limit,length) \
+	    if (length + 2 >= limit) { \
+		limit *= 2; \
+		array = typeRealloc(char *, limit, array); \
+		if (array == 0) { \
+		    failed("no memory: " #array); \
+		} \
+	    }
+
 static GCC_NORETURN void failed(const char *);
 
 static void
@@ -119,7 +136,7 @@ relevant(const char *name, const char *value)
 }
 
 static int
-increment(int *all_parms, int *num_parms, int len_parms, int end_parms)
+increment(long *all_parms, int *num_parms, int len_parms, int end_parms)
 {
     int rc = 0;
     int n;
@@ -143,38 +160,82 @@ increment(int *all_parms, int *num_parms, int len_parms, int end_parms)
     return rc;
 }
 
+/* parse the format string to determine which positional parameters
+ * are assumed to be strings.
+ */
+#if HAVE__NC_TPARM_ANALYZE
+extern int _nc_tparm_analyze(TERMINAL *, const char *, char **, int *);
+
+static int
+analyze_format(const char *format, char **p_is_s)
+{
+    int popcount = 0;
+    int analyzed = _nc_tparm_analyze(cur_term, format, p_is_s, &popcount);
+    if (analyzed < popcount) {
+	analyzed = popcount;
+    }
+    return analyzed;
+}
+#else
+/* TODO: make this work without direct use of ncurses internals. */
+static int
+analyze_format(const char *format, char **p_is_s)
+{
+    int n;
+    char *filler = strstr(format, "%s");
+    for (n = 0; n < 9; ++n) {
+	p_is_s[n] = filler;
+    }
+    return n;
+}
+#endif
+
+#define NumStr(n) use_strings[n] \
+ 		  ? (long) (number[n] \
+		     ? string[n] \
+		     : NULL) \
+		  : number[n]
+
 static void
-test_tparm(const char *name, const char *format, int *number)
+test_tparm(const char *name, const char *format, long *number, char **string)
 {
-    char *result = tparm(format,
-			 number[0],
-			 number[1],
-			 number[2],
-			 number[3],
-			 number[4],
-			 number[5],
-			 number[6],
-			 number[7],
-			 number[8]);
+    char *use_strings[9];
+    char *result;
+    int nparam;
+
+    nparam = analyze_format(format, use_strings);
+    result = tparm(format,
+		   NumStr(0),
+		   NumStr(1),
+		   NumStr(2),
+		   NumStr(3),
+		   NumStr(4),
+		   NumStr(5),
+		   NumStr(6),
+		   NumStr(7),
+		   NumStr(8));
     total_tests++;
     if (result != NULL) {
 	tputs(result, 1, output_func);
     } else {
 	total_fails++;
     }
-    if (v_opt > 1)
-	printf(".. %2d = %2d %2d %2d %2d %2d %2d %2d %2d %2d %s\n",
-	       result != 0 ? (int) strlen(result) : -1,
-	       number[0],
-	       number[1],
-	       number[2],
-	       number[3],
-	       number[4],
-	       number[5],
-	       number[6],
-	       number[7],
-	       number[8],
-	       name);
+    if (v_opt > 1) {
+	int n;
+	printf(".. %3d =", result != 0 ? (int) strlen(result) : -1);
+	for (n = 0; n < nparam; ++n) {
+	    if (use_strings[n]) {
+		if (number[n]) {
+		    printf(" \"%s\"", string[n]);
+		} else {
+		    printf("  ?");
+		}
+	    } else {
+		printf(" %2ld", number[n]);
+	    }
+	}
+	printf(" %s\n", name);
+    }
 }
 
 static void
@@ -221,11 +282,12 @@ main(int argc, char *argv[])
     int r_opt = 1;
     char *t_opt = 0;
 
+    int std_caps = 0;		/* predefine items in all_caps[] */
     int len_caps = 0;		/* cur # of items in all_caps[] */
     int max_caps = 10;		/* max # of items in all_caps[] */
     char **all_caps = typeCalloc(char *, max_caps);
 
-    int all_parms[10];		/* workspace for "-a" option */
+    long all_parms[10];		/* workspace for "-a" option */
 
     int len_terms = 0;		/* cur # of items in all_terms[] */
     int max_terms = 10;		/* max # of items in all_terms[] */
@@ -370,13 +432,7 @@ main(int argc, char *argv[])
     if (len_caps == 0) {
 #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
 	for (n = 0; strnames[n] != 0; ++n) {
-	    if (len_caps + 2 >= max_caps) {
-		max_caps *= 2;
-		all_caps = typeRealloc(char *, max_caps, all_caps);
-		if (all_caps == 0) {
-		    failed("no memory: all_caps");
-		}
-	    }
+	    GrowArray(all_caps, max_caps, len_caps);
 	    all_caps[len_caps++] = strdup(strnames[n]);
 	}
 #else
@@ -384,6 +440,7 @@ main(int argc, char *argv[])
 	all_caps[len_caps++] = strdup("sgr");
 #endif
     }
+    std_caps = len_caps;
     all_caps[len_caps] = 0;
     if (v_opt) {
 	printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps));
@@ -394,8 +451,8 @@ main(int argc, char *argv[])
 	}
     }
 
-    cap_name = typeMalloc(char *, len_caps);
-    cap_data = typeMalloc(char *, len_caps);
+    cap_name = typeMalloc(char *, 1 + len_caps);
+    cap_data = typeMalloc(char *, 1 + len_caps);
 
     if (r_opt <= 0)
 	r_opt = 1;
@@ -413,6 +470,16 @@ main(int argc, char *argv[])
 	    if (setupterm(all_terms[t_run], fileno(stdout), &errs) != OK) {
 		printf("** skipping %s (errs:%d)\n", all_terms[t_run], errs);
 	    }
+#if NCURSES_XNAMES
+	    len_caps = std_caps;
+	    if (cur_term) {
+		TERMTYPE *term = (TERMTYPE *) cur_term;
+		for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
+		    GrowArray(all_caps, max_caps, len_caps);
+		    all_caps[len_caps++] = strdup(ExtStrname(term, (int) n, strnames));
+		}
+	    }
+#endif
 
 	    /*
 	     * Most of the capabilities have no parameters, e.g., they are
@@ -430,7 +497,7 @@ main(int argc, char *argv[])
 	    }
 
 	    if (v_opt) {
-		printf("[%d:%d] %d cap%s * %ld param%s \"%s\"\n",
+		printf("[%d:%d] %d paramerized cap%s * %ld test-case%s \"%s\"\n",
 		       r_run + 1, r_opt,
 		       PLURAL(use_caps),
 		       PLURAL(use_parms),
@@ -442,16 +509,27 @@ main(int argc, char *argv[])
 		/* for each combination of values */
 		do {
 		    for (n_run = 0; n_run < use_caps; ++n_run) {
-			test_tparm(cap_name[n_run], cap_data[n_run], all_parms);
+			test_tparm(cap_name[n_run],
+				   cap_data[n_run],
+				   all_parms,
+				   str_parms);
 		    }
 		}
 		while (increment(all_parms, num_parms, len_parms, 0));
 	    } else {
 		/* for the given values */
 		for (n_run = 0; n_run < use_caps; ++n_run) {
-		    test_tparm(cap_name[n_run], cap_data[n_run], all_parms);
+		    test_tparm(cap_name[n_run],
+			       cap_data[n_run],
+			       all_parms,
+			       str_parms);
 		}
 	    }
+#if NCURSES_XNAMES
+	    for (n = std_caps; n < len_caps; ++n) {
+		free(all_caps[n]);
+	    }
+#endif
 	    if (cur_term != 0) {
 		del_curterm(cur_term);
 	    } else {
@@ -470,7 +548,7 @@ main(int argc, char *argv[])
     printf(NUMFORM " printable\n", total_print);
     printf(NUMFORM " total\n", total_nulls + total_ctrls + total_print);
 #if NO_LEAKS
-    for (n = 0; n < len_caps; ++n) {
+    for (n = 0; n < std_caps; ++n) {
 	free(all_caps[n]);
     }
     free(all_caps);

From d856deb63cadd7fc1a42d036d18842a5810b2a8d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Wed, 19 Apr 2023 02:17:23 +0200
Subject: [PATCH 004/106] ncurses-6.4-20230418.patch

---
 INSTALL                          |    4 +-
 NEWS                             |   11 +-
 VERSION                          |    2 +-
 configure                        | 1691 +++++++++++++++---------------
 configure.in                     |    7 +-
 dist.mk                          |    4 +-
 include/nc_access.h              |   11 +-
 include/nc_tparm.h               |    5 +-
 include/ncurses_defs             |    5 +-
 man/curs_termcap.3x              |    6 +-
 ncurses/tinfo/access.c           |   41 +-
 ncurses/tinfo/comp_error.c       |    8 +-
 ncurses/tinfo/lib_tgoto.c        |    6 +-
 ncurses/tinfo/write_entry.c      |    8 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/debian/rules             |    4 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    8 +-
 package/ncursest.spec            |    2 +-
 test/test_mouse.c                |    6 +-
 23 files changed, 941 insertions(+), 906 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5b04c34a3..8555f738d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.240 2023/01/08 00:29:04 tom Exp $
+-- $Id: INSTALL,v 1.241 2023/04/17 08:04:48 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -477,7 +477,7 @@ CONFIGURE OPTIONS:
 
     --disable-root-access
 	Compile with environment restriction, so most file-access is limited
-	when running via a setuid/setgid application.
+	when running as root, or via a setuid/setgid application.
 
     --disable-root-environ
 	Compile with environment restriction, so certain environment variables
diff --git a/NEWS b/NEWS
index 12e667426..9d1440069 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3932 2023/04/15 20:08:13 tom Exp $
+-- $Id: NEWS,v 1.3939 2023/04/18 22:22:09 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230418
+	+ improve checks for limits on privileged execution:
+	  + modify _nc_syserr_abort() to use _nc_env_access(), rather than
+	    only checking root uid.
+	  + use getauxval() when available, to improve setuid/setgid checks.
+	  + modify test packages to disable root access/environ options.
+	+ modify tgoto() to accept no-parameter capabilities, for joe editor
+	  (OpenSUSE #1210485, Gentoo #904263).
+
 20230415
 	+ configure script fixes:
 	  + fix copy/paste error in configure option --disable-root-access
diff --git a/VERSION b/VERSION
index 971b570ea..f6c3c18c3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230415
+5:0:10	6.4	20230418
diff --git a/configure b/configure
index ae0559ae9..fbb416628 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.758 .
+# From configure.in Revision: 1.760 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -20103,6 +20103,7 @@ limits.h \
 locale.h \
 math.h \
 poll.h \
+sys/auxv.h \
 sys/ioctl.h \
 sys/param.h \
 sys/poll.h \
@@ -20114,23 +20115,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20117: checking for $ac_header" >&5
+echo "$as_me:20118: 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 20123 "configure"
+#line 20124 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20133: \$? = $ac_status" >&5
+  echo "$as_me:20134: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20149,7 +20150,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20152: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20153: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20162,23 +20163,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20165: checking for $ac_header" >&5
+echo "$as_me:20166: 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 20171 "configure"
+#line 20172 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20175: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20176: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20181: \$? = $ac_status" >&5
+  echo "$as_me:20182: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20197,7 +20198,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20200: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20201: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20207,7 +20208,7 @@ EOF
 fi
 done
 
-echo "$as_me:20210: checking for header declaring getopt variables" >&5
+echo "$as_me:20211: 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
@@ -20217,7 +20218,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20220 "configure"
+#line 20221 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20230,16 +20231,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20236: \$? = $ac_status" >&5
+  echo "$as_me:20237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20242: \$? = $ac_status" >&5
+  echo "$as_me:20243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20251,7 +20252,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20254: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20255: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20268,14 +20269,14 @@ EOF
 
 fi
 
-echo "$as_me:20271: checking if external environ is declared" >&5
+echo "$as_me:20272: 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 20278 "configure"
+#line 20279 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20288,16 +20289,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20300: \$? = $ac_status" >&5
+  echo "$as_me:20301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20308,7 +20309,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20311: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20312: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20323,14 +20324,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20326: checking if external environ exists" >&5
+echo "$as_me:20327: 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 20333 "configure"
+#line 20334 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20345,16 +20346,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20351: \$? = $ac_status" >&5
+  echo "$as_me:20352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20357: \$? = $ac_status" >&5
+  echo "$as_me:20358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20365,7 +20366,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20368: result: $cf_cv_have_environ" >&5
+echo "$as_me:20369: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20378,13 +20379,13 @@ EOF
 
 fi
 
-echo "$as_me:20381: checking for getenv" >&5
+echo "$as_me:20382: 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 20387 "configure"
+#line 20388 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20415,16 +20416,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20421: \$? = $ac_status" >&5
+  echo "$as_me:20422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20427: \$? = $ac_status" >&5
+  echo "$as_me:20428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20434,19 +20435,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20437: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20438: 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:20443: checking for $ac_func" >&5
+echo "$as_me:20444: 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 20449 "configure"
+#line 20450 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20477,16 +20478,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20483: \$? = $ac_status" >&5
+  echo "$as_me:20484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20489: \$? = $ac_status" >&5
+  echo "$as_me:20490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20496,7 +20497,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20499: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20500: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20506,7 +20507,7 @@ EOF
 fi
 done
 
-echo "$as_me:20509: checking if getenv returns consistent values" >&5
+echo "$as_me:20510: 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
@@ -20516,7 +20517,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20519 "configure"
+#line 20520 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20621,15 +20622,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20627: \$? = $ac_status" >&5
+  echo "$as_me:20628: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20632: \$? = $ac_status" >&5
+  echo "$as_me:20633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20642,7 +20643,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20645: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20646: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20657,18 +20658,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20660: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20661: 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
 
-echo "$as_me:20664: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20665: 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 20671 "configure"
+#line 20672 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20688,16 +20689,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20694: \$? = $ac_status" >&5
+  echo "$as_me:20695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20700: \$? = $ac_status" >&5
+  echo "$as_me:20701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20709,7 +20710,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20712: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20713: 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
@@ -20724,13 +20725,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20727: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20728: 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 20733 "configure"
+#line 20734 "configure"
 #include "confdefs.h"
 
 int
@@ -20788,16 +20789,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20794: \$? = $ac_status" >&5
+  echo "$as_me:20795: \$? = $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:20798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20800: \$? = $ac_status" >&5
+  echo "$as_me:20801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20807,7 +20808,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20810: result: $ac_cv_c_const" >&5
+echo "$as_me:20811: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20817,7 +20818,7 @@ EOF
 
 fi
 
-echo "$as_me:20820: checking for inline" >&5
+echo "$as_me:20821: 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
@@ -20825,7 +20826,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20828 "configure"
+#line 20829 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20834,16 +20835,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20840: \$? = $ac_status" >&5
+  echo "$as_me:20841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20846: \$? = $ac_status" >&5
+  echo "$as_me:20847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20854,7 +20855,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20857: result: $ac_cv_c_inline" >&5
+echo "$as_me:20858: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20880,7 +20881,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20883: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20884: 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
@@ -20889,7 +20890,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20892 "configure"
+#line 20893 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20901,16 +20902,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20907: \$? = $ac_status" >&5
+  echo "$as_me:20908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20913: \$? = $ac_status" >&5
+  echo "$as_me:20914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20922,7 +20923,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20925: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20926: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21028,7 +21029,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21031: checking for signal global datatype" >&5
+echo "$as_me:21032: 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
@@ -21040,7 +21041,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21043 "configure"
+#line 21044 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21064,16 +21065,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21070: \$? = $ac_status" >&5
+  echo "$as_me:21071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21076: \$? = $ac_status" >&5
+  echo "$as_me:21077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21087,7 +21088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21090: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21091: 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 <<EOF
@@ -21096,7 +21097,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21099: checking for type of chtype" >&5
+echo "$as_me:21100: 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
@@ -21106,7 +21107,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21109 "configure"
+#line 21110 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21141,15 +21142,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21147: \$? = $ac_status" >&5
+  echo "$as_me:21148: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21152: \$? = $ac_status" >&5
+  echo "$as_me:21153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21164,7 +21165,7 @@ fi
 
 fi
 
-echo "$as_me:21167: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21168: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21176,14 +21177,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21179: checking if unsigned literals are legal" >&5
+echo "$as_me:21180: 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 21186 "configure"
+#line 21187 "configure"
 #include "confdefs.h"
 
 int
@@ -21195,16 +21196,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21201: \$? = $ac_status" >&5
+  echo "$as_me:21202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21207: \$? = $ac_status" >&5
+  echo "$as_me:21208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21216,7 +21217,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21219: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21220: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21232,14 +21233,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21235: checking if external errno is declared" >&5
+echo "$as_me:21236: 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 21242 "configure"
+#line 21243 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21253,16 +21254,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21256: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21259: \$? = $ac_status" >&5
+  echo "$as_me:21260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21265: \$? = $ac_status" >&5
+  echo "$as_me:21266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21273,7 +21274,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21276: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21277: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21288,14 +21289,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21291: checking if external errno exists" >&5
+echo "$as_me:21292: 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 21298 "configure"
+#line 21299 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21310,16 +21311,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21316: \$? = $ac_status" >&5
+  echo "$as_me:21317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21322: \$? = $ac_status" >&5
+  echo "$as_me:21323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21330,7 +21331,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21333: result: $cf_cv_have_errno" >&5
+echo "$as_me:21334: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21343,7 +21344,7 @@ EOF
 
 fi
 
-echo "$as_me:21346: checking if data-only library module links" >&5
+echo "$as_me:21347: 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
@@ -21351,20 +21352,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21354 "configure"
+#line 21355 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21357: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21360: \$? = $ac_status" >&5
+  echo "$as_me:21361: \$? = $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 <<EOF
-#line 21367 "configure"
+#line 21368 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21377,10 +21378,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21380: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21383: \$? = $ac_status" >&5
+  echo "$as_me:21384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21393,7 +21394,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21396 "configure"
+#line 21397 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21404,15 +21405,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21410: \$? = $ac_status" >&5
+  echo "$as_me:21411: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21415: \$? = $ac_status" >&5
+  echo "$as_me:21416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21427,7 +21428,7 @@ fi
 
 fi
 
-echo "$as_me:21430: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21431: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21441,14 +21442,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21444: checking for clock_gettime" >&5
+echo "$as_me:21445: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21451 "configure"
+#line 21452 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21461,16 +21462,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21467: \$? = $ac_status" >&5
+  echo "$as_me:21468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21473: \$? = $ac_status" >&5
+  echo "$as_me:21474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21481,7 +21482,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21484: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21485: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21492,13 +21493,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21495: checking for gettimeofday" >&5
+echo "$as_me:21496: 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 21501 "configure"
+#line 21502 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21529,16 +21530,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21535: \$? = $ac_status" >&5
+  echo "$as_me:21536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21541: \$? = $ac_status" >&5
+  echo "$as_me:21542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21548,7 +21549,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21551: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21552: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21558,7 +21559,7 @@ EOF
 
 else
 
-echo "$as_me:21561: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21562: 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
@@ -21566,7 +21567,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21569 "configure"
+#line 21570 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21585,16 +21586,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21591: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21597: \$? = $ac_status" >&5
+  echo "$as_me:21598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21605,7 +21606,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21608: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21609: 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
 
@@ -21637,9 +21638,11 @@ fi
 for ac_func in \
 fpathconf \
 getcwd \
+getauxval \
 getegid \
 geteuid \
 getopt \
+getuid \
 issetugid \
 localeconv \
 poll \
@@ -21664,13 +21667,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21667: checking for $ac_func" >&5
+echo "$as_me:21670: 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 21673 "configure"
+#line 21676 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21701,16 +21704,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21707: \$? = $ac_status" >&5
+  echo "$as_me:21710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21713: \$? = $ac_status" >&5
+  echo "$as_me:21716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21720,7 +21723,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21723: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21726: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21730,14 +21733,14 @@ EOF
 fi
 done
 
-echo "$as_me:21733: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21736: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21740 "configure"
+#line 21743 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21752,16 +21755,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21758: \$? = $ac_status" >&5
+  echo "$as_me:21761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21764: \$? = $ac_status" >&5
+  echo "$as_me:21767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21771,7 +21774,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21774: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21777: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21793,7 +21796,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21796: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21799: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21803,7 +21806,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21806 "configure"
+#line 21809 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21816,15 +21819,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21822: \$? = $ac_status" >&5
+  echo "$as_me:21825: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21827: \$? = $ac_status" >&5
+  echo "$as_me:21830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21836,7 +21839,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21839: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21842: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21848,14 +21851,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21851: checking for getttynam" >&5
+	echo "$as_me:21854: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21858 "configure"
+#line 21861 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21867,16 +21870,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21873: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21879: \$? = $ac_status" >&5
+  echo "$as_me:21882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21886,7 +21889,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21889: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21892: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21896,7 +21899,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21899: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21902: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21905,7 +21908,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21908: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21911: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21918,14 +21921,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21921: checking for terminal-capability database functions" >&5
+echo "$as_me:21924: 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 21928 "configure"
+#line 21931 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21945,16 +21948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21951: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21957: \$? = $ac_status" >&5
+  echo "$as_me:21960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -21965,7 +21968,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21968: result: $cf_cv_cgetent" >&5
+echo "$as_me:21971: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -21975,14 +21978,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:21978: checking if cgetent uses const parameter" >&5
+echo "$as_me:21981: 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 21985 "configure"
+#line 21988 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22005,16 +22008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22011: \$? = $ac_status" >&5
+  echo "$as_me:22014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22017: \$? = $ac_status" >&5
+  echo "$as_me:22020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22025,7 +22028,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22028: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22031: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22039,14 +22042,14 @@ fi
 
 fi
 
-echo "$as_me:22042: checking for isascii" >&5
+echo "$as_me:22045: 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 22049 "configure"
+#line 22052 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22058,16 +22061,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22064: \$? = $ac_status" >&5
+  echo "$as_me:22067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22070: \$? = $ac_status" >&5
+  echo "$as_me:22073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22078,7 +22081,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22081: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22084: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22086,10 +22089,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22089: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22092: 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 22092 "configure"
+#line 22095 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22103,16 +22106,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22109: \$? = $ac_status" >&5
+  echo "$as_me:22112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22115: \$? = $ac_status" >&5
+  echo "$as_me:22118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22120,7 +22123,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22123 "configure"
+#line 22126 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22135,16 +22138,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22147: \$? = $ac_status" >&5
+  echo "$as_me:22150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22160,11 +22163,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22163: result: $sigact_bad" >&5
+echo "$as_me:22166: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22167: checking if nanosleep really works" >&5
+echo "$as_me:22170: 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
@@ -22174,7 +22177,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22177 "configure"
+#line 22180 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22200,15 +22203,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22206: \$? = $ac_status" >&5
+  echo "$as_me:22209: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22211: \$? = $ac_status" >&5
+  echo "$as_me:22214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22220,7 +22223,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22223: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22226: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22237,23 +22240,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22240: checking for $ac_header" >&5
+echo "$as_me:22243: 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 22246 "configure"
+#line 22249 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22250: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22253: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22256: \$? = $ac_status" >&5
+  echo "$as_me:22259: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22272,7 +22275,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22278: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22289,10 +22292,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22292: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22295: 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 22295 "configure"
+#line 22298 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22304,16 +22307,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22310: \$? = $ac_status" >&5
+  echo "$as_me:22313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22316: \$? = $ac_status" >&5
+  echo "$as_me:22319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22321,7 +22324,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22324 "configure"
+#line 22327 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22335,16 +22338,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22341: \$? = $ac_status" >&5
+  echo "$as_me:22344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22347: \$? = $ac_status" >&5
+  echo "$as_me:22350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22360,19 +22363,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22363: result: $termios_bad" >&5
+	echo "$as_me:22366: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22368: checking for tcgetattr" >&5
+echo "$as_me:22371: 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 22375 "configure"
+#line 22378 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22400,16 +22403,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22412: \$? = $ac_status" >&5
+  echo "$as_me:22415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22419,21 +22422,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22422: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22425: 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:22429: checking for vsscanf function or workaround" >&5
+echo "$as_me:22432: 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 22436 "configure"
+#line 22439 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22449,16 +22452,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22455: \$? = $ac_status" >&5
+  echo "$as_me:22458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22461: \$? = $ac_status" >&5
+  echo "$as_me:22464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22466,7 +22469,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22469 "configure"
+#line 22472 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22488,16 +22491,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22494: \$? = $ac_status" >&5
+  echo "$as_me:22497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22500: \$? = $ac_status" >&5
+  echo "$as_me:22503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22505,7 +22508,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22508 "configure"
+#line 22511 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22527,16 +22530,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22533: \$? = $ac_status" >&5
+  echo "$as_me:22536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22539: \$? = $ac_status" >&5
+  echo "$as_me:22542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22551,7 +22554,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22554: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22557: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22577,23 +22580,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22580: checking for $ac_header" >&5
+echo "$as_me:22583: 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 22586 "configure"
+#line 22589 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22590: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22593: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22596: \$? = $ac_status" >&5
+  echo "$as_me:22599: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22612,7 +22615,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22615: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22618: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22622,7 +22625,7 @@ EOF
 fi
 done
 
-echo "$as_me:22625: checking for working mkstemp" >&5
+echo "$as_me:22628: 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
@@ -22633,7 +22636,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22636 "configure"
+#line 22639 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22668,15 +22671,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22674: \$? = $ac_status" >&5
+  echo "$as_me:22677: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22679: \$? = $ac_status" >&5
+  echo "$as_me:22682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22691,16 +22694,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22694: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22697: 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:22697: checking for mkstemp" >&5
+	echo "$as_me:22700: 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 22703 "configure"
+#line 22706 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22731,16 +22734,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:22740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22743: \$? = $ac_status" >&5
+  echo "$as_me:22746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22750,7 +22753,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22753: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22756: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22771,21 +22774,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22774: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22777: 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:22777: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22780: 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:22783: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22786: 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 22788 "configure"
+#line 22791 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22802,15 +22805,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22808: \$? = $ac_status" >&5
+  echo "$as_me:22811: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22813: \$? = $ac_status" >&5
+  echo "$as_me:22816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22823,7 +22826,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22826: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22829: 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
 
@@ -22834,13 +22837,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22837: checking for intptr_t" >&5
+echo "$as_me:22840: 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 22843 "configure"
+#line 22846 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22855,16 +22858,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22861: \$? = $ac_status" >&5
+  echo "$as_me:22864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22867: \$? = $ac_status" >&5
+  echo "$as_me:22870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22874,7 +22877,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22877: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22880: 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
   :
@@ -22886,13 +22889,13 @@ EOF
 
 fi
 
-echo "$as_me:22889: checking for ssize_t" >&5
+echo "$as_me:22892: 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 22895 "configure"
+#line 22898 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22907,16 +22910,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22913: \$? = $ac_status" >&5
+  echo "$as_me:22916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22919: \$? = $ac_status" >&5
+  echo "$as_me:22922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -22926,7 +22929,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22929: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22932: 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
   :
@@ -22938,14 +22941,14 @@ EOF
 
 fi
 
-echo "$as_me:22941: checking for type sigaction_t" >&5
+echo "$as_me:22944: 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 22948 "configure"
+#line 22951 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -22958,16 +22961,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22970: \$? = $ac_status" >&5
+  echo "$as_me:22973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -22978,14 +22981,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22981: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22984: 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:22988: checking declaration of size-change" >&5
+echo "$as_me:22991: 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
@@ -23006,7 +23009,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23009 "configure"
+#line 23012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23056,16 +23059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23062: \$? = $ac_status" >&5
+  echo "$as_me:23065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23068: \$? = $ac_status" >&5
+  echo "$as_me:23071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23084,7 +23087,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23087: result: $cf_cv_sizechange" >&5
+echo "$as_me:23090: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23102,13 +23105,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23105: checking for memmove" >&5
+echo "$as_me:23108: 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 23111 "configure"
+#line 23114 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23139,16 +23142,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23145: \$? = $ac_status" >&5
+  echo "$as_me:23148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23151: \$? = $ac_status" >&5
+  echo "$as_me:23154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23158,19 +23161,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23161: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23164: 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:23167: checking for bcopy" >&5
+echo "$as_me:23170: 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 23173 "configure"
+#line 23176 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23201,16 +23204,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23207: \$? = $ac_status" >&5
+  echo "$as_me:23210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23213: \$? = $ac_status" >&5
+  echo "$as_me:23216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23220,11 +23223,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23223: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23226: 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:23227: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23230: 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
@@ -23234,7 +23237,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23237 "configure"
+#line 23240 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23250,15 +23253,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23256: \$? = $ac_status" >&5
+  echo "$as_me:23259: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23261: \$? = $ac_status" >&5
+  echo "$as_me:23264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23271,7 +23274,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23274: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23277: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23298,13 +23301,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23301: checking for $ac_func" >&5
+echo "$as_me:23304: 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 23307 "configure"
+#line 23310 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23335,16 +23338,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23341: \$? = $ac_status" >&5
+  echo "$as_me:23344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23347: \$? = $ac_status" >&5
+  echo "$as_me:23350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23354,7 +23357,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23357: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23360: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23364,7 +23367,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23367: checking if poll really works" >&5
+echo "$as_me:23370: 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
@@ -23374,7 +23377,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23377 "configure"
+#line 23380 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23427,15 +23430,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23433: \$? = $ac_status" >&5
+  echo "$as_me:23436: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23438: \$? = $ac_status" >&5
+  echo "$as_me:23441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23447,21 +23450,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23450: result: $cf_cv_working_poll" >&5
+echo "$as_me:23453: 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:23457: checking for va_copy" >&5
+echo "$as_me:23460: 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 23464 "configure"
+#line 23467 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23478,16 +23481,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23484: \$? = $ac_status" >&5
+  echo "$as_me:23487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23490: \$? = $ac_status" >&5
+  echo "$as_me:23493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23497,7 +23500,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23500: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23503: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23509,14 +23512,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23512: checking for __va_copy" >&5
+echo "$as_me:23515: 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 23519 "configure"
+#line 23522 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23533,16 +23536,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23539: \$? = $ac_status" >&5
+  echo "$as_me:23542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23545: \$? = $ac_status" >&5
+  echo "$as_me:23548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23552,7 +23555,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23555: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23558: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23564,14 +23567,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23567: checking for __builtin_va_copy" >&5
+echo "$as_me:23570: 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 23574 "configure"
+#line 23577 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23588,16 +23591,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23594: \$? = $ac_status" >&5
+  echo "$as_me:23597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23600: \$? = $ac_status" >&5
+  echo "$as_me:23603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23607,7 +23610,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23610: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23613: 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 &&
@@ -23625,14 +23628,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23628: checking if we can simply copy va_list" >&5
+	echo "$as_me:23631: 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 23635 "configure"
+#line 23638 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23649,16 +23652,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23655: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23655: \$? = $ac_status" >&5
+  echo "$as_me:23658: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23661: \$? = $ac_status" >&5
+  echo "$as_me:23664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23668,19 +23671,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23671: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23674: 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:23676: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23679: 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 23683 "configure"
+#line 23686 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23697,16 +23700,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23703: \$? = $ac_status" >&5
+  echo "$as_me:23706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23709: \$? = $ac_status" >&5
+  echo "$as_me:23712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23716,7 +23719,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23719: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23722: 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
@@ -23727,13 +23730,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23730: checking for pid_t" >&5
+echo "$as_me:23733: 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 23736 "configure"
+#line 23739 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23748,16 +23751,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23754: \$? = $ac_status" >&5
+  echo "$as_me:23757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23760: \$? = $ac_status" >&5
+  echo "$as_me:23763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23767,7 +23770,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23770: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23773: 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
   :
@@ -23782,23 +23785,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23785: checking for $ac_header" >&5
+echo "$as_me:23788: 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 23791 "configure"
+#line 23794 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23795: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23801: \$? = $ac_status" >&5
+  echo "$as_me:23804: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23817,7 +23820,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23820: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23823: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23830,13 +23833,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23833: checking for $ac_func" >&5
+echo "$as_me:23836: 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 23839 "configure"
+#line 23842 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23867,16 +23870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23873: \$? = $ac_status" >&5
+  echo "$as_me:23876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23879: \$? = $ac_status" >&5
+  echo "$as_me:23882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23886,7 +23889,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23889: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23892: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23898,7 +23901,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23901: checking for working fork" >&5
+  echo "$as_me:23904: 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
@@ -23921,15 +23924,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23927: \$? = $ac_status" >&5
+  echo "$as_me:23930: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23932: \$? = $ac_status" >&5
+  echo "$as_me:23935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -23941,7 +23944,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23944: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23947: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -23955,12 +23958,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:23958: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23961: 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:23963: checking for working vfork" >&5
+  echo "$as_me:23966: 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
@@ -23969,7 +23972,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23972 "configure"
+#line 23975 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24066,15 +24069,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24072: \$? = $ac_status" >&5
+  echo "$as_me:24075: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24077: \$? = $ac_status" >&5
+  echo "$as_me:24080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24086,13 +24089,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24089: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24092: 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:24095: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24098: 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
 
@@ -24117,7 +24120,7 @@ EOF
 
 fi
 
-echo "$as_me:24120: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24123: 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
@@ -24127,7 +24130,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24130 "configure"
+#line 24133 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24162,15 +24165,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24168: \$? = $ac_status" >&5
+  echo "$as_me:24171: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24173: \$? = $ac_status" >&5
+  echo "$as_me:24176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24183,7 +24186,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24186: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24189: 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
@@ -24192,7 +24195,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24195: checking for openpty in -lutil" >&5
+echo "$as_me:24198: 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
@@ -24200,7 +24203,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24203 "configure"
+#line 24206 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24219,16 +24222,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24225: \$? = $ac_status" >&5
+  echo "$as_me:24228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24231: \$? = $ac_status" >&5
+  echo "$as_me:24234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24239,7 +24242,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24242: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24245: 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
@@ -24247,7 +24250,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24250: checking for openpty header" >&5
+echo "$as_me:24253: 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
@@ -24274,7 +24277,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24277 "configure"
+#line 24280 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24291,16 +24294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24297: \$? = $ac_status" >&5
+  echo "$as_me:24300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24303: \$? = $ac_status" >&5
+  echo "$as_me:24306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24318,7 +24321,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24321: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24324: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24391,7 +24394,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24394 "configure"
+#line 24397 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24403,16 +24406,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24409: \$? = $ac_status" >&5
+  echo "$as_me:24412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24415: \$? = $ac_status" >&5
+  echo "$as_me:24418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24429,7 +24432,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24432: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24435: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24465,7 +24468,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24468: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24471: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24476,7 +24479,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24479: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24482: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24548,7 +24551,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24551 "configure"
+#line 24554 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24560,16 +24563,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24566: \$? = $ac_status" >&5
+  echo "$as_me:24569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24572: \$? = $ac_status" >&5
+  echo "$as_me:24575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24586,7 +24589,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24589: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24592: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24666,7 +24669,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24669: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24672: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24683,23 +24686,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24686: checking for db.h" >&5
+echo "$as_me:24689: 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 24692 "configure"
+#line 24695 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24696: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24699: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24702: \$? = $ac_status" >&5
+  echo "$as_me:24705: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24718,11 +24721,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24721: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24724: 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:24725: checking for version of db" >&5
+echo "$as_me:24728: 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
@@ -24733,10 +24736,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24736: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24739: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24739 "configure"
+#line 24742 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24766,16 +24769,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24772: \$? = $ac_status" >&5
+  echo "$as_me:24775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24778: \$? = $ac_status" >&5
+  echo "$as_me:24781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24789,16 +24792,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24792: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24795: 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:24796: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24799: 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:24801: checking for db libraries" >&5
+echo "$as_me:24804: 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
@@ -24828,10 +24831,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24831: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24834: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24834 "configure"
+#line 24837 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24886,16 +24889,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24892: \$? = $ac_status" >&5
+  echo "$as_me:24895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24898: \$? = $ac_status" >&5
+  echo "$as_me:24901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24915,11 +24918,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24918: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24921: 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:24922: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24925: 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
@@ -24945,7 +24948,7 @@ fi
 
 else
 
-	{ { echo "$as_me:24948: error: Cannot find db.h" >&5
+	{ { echo "$as_me:24951: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -24960,7 +24963,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:24963: checking if we should include stdbool.h" >&5
+echo "$as_me:24966: 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
@@ -24968,7 +24971,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24971 "configure"
+#line 24974 "configure"
 #include "confdefs.h"
 
 int
@@ -24980,23 +24983,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24986: \$? = $ac_status" >&5
+  echo "$as_me:24989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24992: \$? = $ac_status" >&5
+  echo "$as_me:24995: \$? = $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 24999 "configure"
+#line 25002 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25012,16 +25015,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25018: \$? = $ac_status" >&5
+  echo "$as_me:25021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25024: \$? = $ac_status" >&5
+  echo "$as_me:25027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25035,13 +25038,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25038: result: yes" >&5
+then	echo "$as_me:25041: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25040: result: no" >&5
+else	echo "$as_me:25043: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25044: checking for builtin bool type" >&5
+echo "$as_me:25047: 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
@@ -25049,7 +25052,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25052 "configure"
+#line 25055 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25064,16 +25067,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25070: \$? = $ac_status" >&5
+  echo "$as_me:25073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25076: \$? = $ac_status" >&5
+  echo "$as_me:25079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25086,9 +25089,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25089: result: yes" >&5
+then	echo "$as_me:25092: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25091: result: no" >&5
+else	echo "$as_me:25094: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25105,10 +25108,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25108: checking if we already have C++ library" >&5
+	echo "$as_me:25111: 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 25111 "configure"
+#line 25114 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25122,16 +25125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25128: \$? = $ac_status" >&5
+  echo "$as_me:25131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25134: \$? = $ac_status" >&5
+  echo "$as_me:25137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25140,7 +25143,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25143: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25146: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25159,7 +25162,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25162: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25165: 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
@@ -25185,7 +25188,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25188 "configure"
+#line 25191 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25199,16 +25202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25205: \$? = $ac_status" >&5
+  echo "$as_me:25208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25211: \$? = $ac_status" >&5
+  echo "$as_me:25214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25220,7 +25223,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25223: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25226: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25242,7 +25245,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25245: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25248: 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
@@ -25257,15 +25260,15 @@ CF_EOF
 # 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:25260: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25263: \$? = $ac_status" >&5
+  echo "$as_me:25266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25265: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25268: \$? = $ac_status" >&5
+  echo "$as_me:25271: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25276,10 +25279,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25279: result: yes" >&5
+  echo "$as_me:25282: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25282: result: no" >&5
+  echo "$as_me:25285: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25299,7 +25302,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25302: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25305: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25320,7 +25323,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25323 "configure"
+#line 25326 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25334,16 +25337,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25340: \$? = $ac_status" >&5
+  echo "$as_me:25343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25346: \$? = $ac_status" >&5
+  echo "$as_me:25349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25380,7 +25383,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25383 "configure"
+#line 25386 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25394,16 +25397,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25400: \$? = $ac_status" >&5
+  echo "$as_me:25403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25406: \$? = $ac_status" >&5
+  echo "$as_me:25409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25436,7 +25439,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25439: result: $cf_cxx_library" >&5
+	echo "$as_me:25442: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25452,7 +25455,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25455: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25458: 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
@@ -25469,18 +25472,18 @@ do
   # 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 25472 "configure"
+#line 25475 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25477: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25480: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25483: \$? = $ac_status" >&5
+  echo "$as_me:25486: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25503,17 +25506,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25506 "configure"
+#line 25509 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25516: \$? = $ac_status" >&5
+  echo "$as_me:25519: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25550,7 +25553,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25553: result: $CXXCPP" >&5
+echo "$as_me:25556: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25560,18 +25563,18 @@ do
   # 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 25563 "configure"
+#line 25566 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25574: \$? = $ac_status" >&5
+  echo "$as_me:25577: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25594,17 +25597,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25597 "configure"
+#line 25600 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25607: \$? = $ac_status" >&5
+  echo "$as_me:25610: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25632,7 +25635,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25635: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25638: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25647,23 +25650,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25650: checking for $ac_header" >&5
+echo "$as_me:25653: 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 25656 "configure"
+#line 25659 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25660: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25663: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25666: \$? = $ac_status" >&5
+  echo "$as_me:25669: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25682,7 +25685,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25685: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25688: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25695,23 +25698,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25698: checking for $ac_header" >&5
+echo "$as_me:25701: 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 25704 "configure"
+#line 25707 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25708: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25711: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25714: \$? = $ac_status" >&5
+  echo "$as_me:25717: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25730,7 +25733,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25733: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25736: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25741,10 +25744,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25744: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25747: 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 25747 "configure"
+#line 25750 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25761,16 +25764,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25767: \$? = $ac_status" >&5
+  echo "$as_me:25770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25773: \$? = $ac_status" >&5
+  echo "$as_me:25776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25779,7 +25782,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25782: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25785: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25790,7 +25793,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25793: checking if we should include stdbool.h" >&5
+echo "$as_me:25796: 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
@@ -25798,7 +25801,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25801 "configure"
+#line 25804 "configure"
 #include "confdefs.h"
 
 int
@@ -25810,23 +25813,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25816: \$? = $ac_status" >&5
+  echo "$as_me:25819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25822: \$? = $ac_status" >&5
+  echo "$as_me:25825: \$? = $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 25829 "configure"
+#line 25832 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25842,16 +25845,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25848: \$? = $ac_status" >&5
+  echo "$as_me:25851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25854: \$? = $ac_status" >&5
+  echo "$as_me:25857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25865,13 +25868,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25868: result: yes" >&5
+then	echo "$as_me:25871: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25870: result: no" >&5
+else	echo "$as_me:25873: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25874: checking for builtin bool type" >&5
+echo "$as_me:25877: 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
@@ -25879,7 +25882,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25882 "configure"
+#line 25885 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25894,16 +25897,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25900: \$? = $ac_status" >&5
+  echo "$as_me:25903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25906: \$? = $ac_status" >&5
+  echo "$as_me:25909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25916,19 +25919,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25919: result: yes" >&5
+then	echo "$as_me:25922: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25921: result: no" >&5
+else	echo "$as_me:25924: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25925: checking for bool" >&5
+echo "$as_me:25928: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25931 "configure"
+#line 25934 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25963,16 +25966,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25969: \$? = $ac_status" >&5
+  echo "$as_me:25972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25975: \$? = $ac_status" >&5
+  echo "$as_me:25978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -25982,10 +25985,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25985: result: $ac_cv_type_bool" >&5
+echo "$as_me:25988: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:25988: checking size of bool" >&5
+echo "$as_me:25991: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25994,7 +25997,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25997 "configure"
+#line 26000 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26026,21 +26029,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26032: \$? = $ac_status" >&5
+  echo "$as_me:26035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26038: \$? = $ac_status" >&5
+  echo "$as_me:26041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26043 "configure"
+#line 26046 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26072,16 +26075,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26078: \$? = $ac_status" >&5
+  echo "$as_me:26081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26084: \$? = $ac_status" >&5
+  echo "$as_me:26087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26097,7 +26100,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26100 "configure"
+#line 26103 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26129,16 +26132,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26135: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26135: \$? = $ac_status" >&5
+  echo "$as_me:26138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26141: \$? = $ac_status" >&5
+  echo "$as_me:26144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26154,7 +26157,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26157 "configure"
+#line 26160 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26186,16 +26189,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26192: \$? = $ac_status" >&5
+  echo "$as_me:26195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26198: \$? = $ac_status" >&5
+  echo "$as_me:26201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26208,12 +26211,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26211: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26214: 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 26216 "configure"
+#line 26219 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26249,15 +26252,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26255: \$? = $ac_status" >&5
+  echo "$as_me:26258: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26260: \$? = $ac_status" >&5
+  echo "$as_me:26263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26273,13 +26276,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26276: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26279: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26282: checking for type of bool" >&5
+echo "$as_me:26285: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26298,7 +26301,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26301 "configure"
+#line 26304 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26339,15 +26342,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26345: \$? = $ac_status" >&5
+  echo "$as_me:26348: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26350: \$? = $ac_status" >&5
+  echo "$as_me:26353: \$? = $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
@@ -26364,19 +26367,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26367: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26370: 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:26374: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26377: 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:26379: checking for special defines needed for etip.h" >&5
+echo "$as_me:26382: 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"
@@ -26394,7 +26397,7 @@ do
 	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 26397 "configure"
+#line 26400 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26408,16 +26411,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26414: \$? = $ac_status" >&5
+  echo "$as_me:26417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26420: \$? = $ac_status" >&5
+  echo "$as_me:26423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26438,12 +26441,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26441: result: $cf_result" >&5
+echo "$as_me:26444: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26446: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26449: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26460,7 +26463,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26463 "configure"
+#line 26466 "configure"
 #include "confdefs.h"
 
 class base
@@ -26479,15 +26482,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26485: \$? = $ac_status" >&5
+  echo "$as_me:26488: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26490: \$? = $ac_status" >&5
+  echo "$as_me:26493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26506,7 +26509,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26509: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26512: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26515,7 +26518,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26518: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26521: 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
@@ -26532,7 +26535,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26535 "configure"
+#line 26538 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26551,15 +26554,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26557: \$? = $ac_status" >&5
+  echo "$as_me:26560: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26562: \$? = $ac_status" >&5
+  echo "$as_me:26565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26578,7 +26581,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26581: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26584: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26588,7 +26591,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26591: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26594: 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
@@ -26602,7 +26605,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26605 "configure"
+#line 26608 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26646,16 +26649,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26658: \$? = $ac_status" >&5
+  echo "$as_me:26661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26673,7 +26676,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26676: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26679: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26722,13 +26725,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26725: checking for bool" >&5
+echo "$as_me:26728: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26731 "configure"
+#line 26734 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26763,16 +26766,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26769: \$? = $ac_status" >&5
+  echo "$as_me:26772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26775: \$? = $ac_status" >&5
+  echo "$as_me:26778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26782,10 +26785,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26785: result: $ac_cv_type_bool" >&5
+echo "$as_me:26788: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26788: checking size of bool" >&5
+echo "$as_me:26791: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26794,7 +26797,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26797 "configure"
+#line 26800 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26826,21 +26829,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26832: \$? = $ac_status" >&5
+  echo "$as_me:26835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26838: \$? = $ac_status" >&5
+  echo "$as_me:26841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26843 "configure"
+#line 26846 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26872,16 +26875,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26878: \$? = $ac_status" >&5
+  echo "$as_me:26881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26884: \$? = $ac_status" >&5
+  echo "$as_me:26887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26897,7 +26900,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26900 "configure"
+#line 26903 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26929,16 +26932,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26941: \$? = $ac_status" >&5
+  echo "$as_me:26944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26954,7 +26957,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26957 "configure"
+#line 26960 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26986,16 +26989,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26992: \$? = $ac_status" >&5
+  echo "$as_me:26995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26998: \$? = $ac_status" >&5
+  echo "$as_me:27001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27008,12 +27011,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27011: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27014: 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 27016 "configure"
+#line 27019 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27049,15 +27052,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27055: \$? = $ac_status" >&5
+  echo "$as_me:27058: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27060: \$? = $ac_status" >&5
+  echo "$as_me:27063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27073,13 +27076,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27076: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27079: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27082: checking for type of bool" >&5
+echo "$as_me:27085: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27098,7 +27101,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27101 "configure"
+#line 27104 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27139,15 +27142,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27145: \$? = $ac_status" >&5
+  echo "$as_me:27148: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27150: \$? = $ac_status" >&5
+  echo "$as_me:27153: \$? = $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
@@ -27164,26 +27167,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27167: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27170: 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:27174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27177: 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:27180: checking for fallback type of bool" >&5
+			echo "$as_me:27183: 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:27186: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27189: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27212,7 +27215,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27215: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27218: 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
@@ -27229,7 +27232,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27232: checking for $ac_word" >&5
+echo "$as_me:27235: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27246,7 +27249,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27249: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27252: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27258,10 +27261,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27261: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27264: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27264: result: no" >&5
+  echo "$as_me:27267: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27271,7 +27274,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27274: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27277: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27282,7 +27285,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27285: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27288: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27311,7 +27314,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27314: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27317: 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
@@ -27330,10 +27333,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27333: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27336: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27336: result: missing" >&5
+					echo "$as_me:27339: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27346,7 +27349,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27349: checking for gnat version" >&5
+echo "$as_me:27352: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27357,7 +27360,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27360: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27363: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27366,7 +27369,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27369: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27372: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27374,7 +27377,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27377: checking for $ac_word" >&5
+echo "$as_me:27380: 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
@@ -27389,7 +27392,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27392: found $ac_dir/$ac_word" >&5
+echo "$as_me:27395: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27398,20 +27401,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27401: result: $M4_exists" >&5
+  echo "$as_me:27404: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27404: result: no" >&5
+  echo "$as_me:27407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27410: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27413: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27414: checking if GNAT works" >&5
+			echo "$as_me:27417: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27439,7 +27442,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27442: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27445: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27451,7 +27454,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27454: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27457: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27468,10 +27471,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27471: result: $ADAFLAGS" >&5
+	echo "$as_me:27474: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27474: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27477: 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
@@ -27481,11 +27484,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27484: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27487: 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:27488: checking if GNAT supports generics" >&5
+echo "$as_me:27491: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27495,7 +27498,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27498: result: $cf_gnat_generics" >&5
+echo "$as_me:27501: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27507,7 +27510,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27510: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27513: 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
@@ -27555,7 +27558,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27558: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27561: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27568,7 +27571,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27571: checking if GNAT supports project files" >&5
+echo "$as_me:27574: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27631,15 +27634,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27634: result: $cf_gnat_projects" >&5
+echo "$as_me:27637: 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:27640: checking if GNAT supports libraries" >&5
+	echo "$as_me:27643: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27642: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27645: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27659,7 +27662,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27662: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27665: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27671,7 +27674,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27674: checking for ada-compiler" >&5
+echo "$as_me:27677: 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.
@@ -27682,12 +27685,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27685: result: $cf_ada_compiler" >&5
+echo "$as_me:27688: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27690: checking for ada-include" >&5
+echo "$as_me:27693: 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.
@@ -27723,7 +27726,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27726: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27729: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27732,10 +27735,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27735: result: $ADA_INCLUDE" >&5
+echo "$as_me:27738: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27738: checking for ada-objects" >&5
+echo "$as_me:27741: 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.
@@ -27771,7 +27774,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27774: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27777: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27780,10 +27783,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27783: result: $ADA_OBJECTS" >&5
+echo "$as_me:27786: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27786: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27789: 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.
@@ -27793,14 +27796,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27796: result: $with_ada_sharedlib" >&5
+echo "$as_me:27799: 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:27803: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27806: 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
@@ -27820,7 +27823,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27823: checking for ada-libname" >&5
+echo "$as_me:27826: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27836,7 +27839,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27839: result: $ADA_LIBNAME" >&5
+echo "$as_me:27842: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27847,13 +27850,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27850: checking for wchar_t" >&5
+	echo "$as_me:27853: 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 27856 "configure"
+#line 27859 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27868,16 +27871,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27874: \$? = $ac_status" >&5
+  echo "$as_me:27877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27880: \$? = $ac_status" >&5
+  echo "$as_me:27883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27887,10 +27890,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27890: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27893: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27893: checking size of wchar_t" >&5
+echo "$as_me:27896: 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
@@ -27899,7 +27902,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27902 "configure"
+#line 27905 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27911,21 +27914,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27917: \$? = $ac_status" >&5
+  echo "$as_me:27920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27923: \$? = $ac_status" >&5
+  echo "$as_me:27926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27928 "configure"
+#line 27931 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27937,16 +27940,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27943: \$? = $ac_status" >&5
+  echo "$as_me:27946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27949: \$? = $ac_status" >&5
+  echo "$as_me:27952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27962,7 +27965,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27965 "configure"
+#line 27968 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27974,16 +27977,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27980: \$? = $ac_status" >&5
+  echo "$as_me:27983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27986: \$? = $ac_status" >&5
+  echo "$as_me:27989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27999,7 +28002,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28002 "configure"
+#line 28005 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28011,16 +28014,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28017: \$? = $ac_status" >&5
+  echo "$as_me:28020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28023: \$? = $ac_status" >&5
+  echo "$as_me:28026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28033,12 +28036,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28036: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28039: 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 28041 "configure"
+#line 28044 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28054,15 +28057,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28060: \$? = $ac_status" >&5
+  echo "$as_me:28063: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28065: \$? = $ac_status" >&5
+  echo "$as_me:28068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28078,7 +28081,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28081: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28084: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28091,7 +28094,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28094: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28097: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28109,7 +28112,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28112: checking for library subsets" >&5
+echo "$as_me:28115: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28163,7 +28166,7 @@ fi
 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:28166: result: $LIB_SUBSETS" >&5
+echo "$as_me:28169: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28194,7 +28197,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28197: checking default library suffix" >&5
+echo "$as_me:28200: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28205,10 +28208,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28208: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28211: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28211: checking default library-dependency suffix" >&5
+echo "$as_me:28214: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28291,10 +28294,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28294: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28297: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28297: checking default object directory" >&5
+echo "$as_me:28300: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28310,11 +28313,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28313: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28316: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28317: checking c++ library-dependency suffix" >&5
+echo "$as_me:28320: 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++)
@@ -28407,7 +28410,7 @@ else
 	fi
 
 fi
-echo "$as_me:28410: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28413: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28583,19 +28586,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28586: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28589: 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 <<EOF
-#line 28591 "configure"
+#line 28594 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28598: \$? = $ac_status" >&5
+  echo "$as_me:28601: \$? = $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
@@ -28606,10 +28609,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28609 "configure"
+#line 28612 "configure"
 #include "confdefs.h"
 
-#line 28612 "configure"
+#line 28615 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28624,16 +28627,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28630: \$? = $ac_status" >&5
+  echo "$as_me:28633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28636: \$? = $ac_status" >&5
+  echo "$as_me:28639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28656,7 +28659,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28659: result: $cf_ldflags_static" >&5
+	echo "$as_me:28662: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28672,7 +28675,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28675: checking where we will install curses.h" >&5
+echo "$as_me:28678: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28682,7 +28685,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28685: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28688: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28690,7 +28693,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28693: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28696: 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
@@ -28718,7 +28721,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28721: checking for desired basename for form library" >&5
+echo "$as_me:28724: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28738,10 +28741,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28741: result: $FORM_NAME" >&5
+echo "$as_me:28744: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28744: checking for desired basename for menu library" >&5
+echo "$as_me:28747: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28761,10 +28764,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28764: result: $MENU_NAME" >&5
+echo "$as_me:28767: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28767: checking for desired basename for panel library" >&5
+echo "$as_me:28770: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28784,10 +28787,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28787: result: $PANEL_NAME" >&5
+echo "$as_me:28790: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28790: checking for desired basename for cxx library" >&5
+echo "$as_me:28793: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28807,13 +28810,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28810: result: $CXX_NAME" >&5
+echo "$as_me:28813: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28816: checking for src modules" >&5
+echo "$as_me:28819: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28882,7 +28885,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28885: result: $cf_cv_src_modules" >&5
+echo "$as_me:28888: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29043,7 +29046,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29046: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29049: 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//'`
@@ -29054,7 +29057,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29057: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29060: 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
@@ -29070,7 +29073,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29073: result: $PKG_CFLAGS" >&5
+echo "$as_me:29076: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29131,7 +29134,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29134: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29137: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29158,7 +29161,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29161: checking for linker search path" >&5
+echo "$as_me:29164: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29206,7 +29209,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29209: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29212: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29247,7 +29250,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29250: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29253: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29337,7 +29340,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29340: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29343: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29518,7 +29521,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29521: error: ambiguous option: $1
+    { { echo "$as_me:29524: 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;}
@@ -29537,7 +29540,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29540: error: unrecognized option: $1
+  -*) { { echo "$as_me:29543: 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;}
@@ -29667,7 +29670,7 @@ do
   "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:29670: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29673: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30181,7 +30184,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30184: creating $ac_file" >&5
+    { echo "$as_me:30187: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30199,7 +30202,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30202: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30205: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30212,7 +30215,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30215: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30218: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30228,7 +30231,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30231: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30234: 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;}
@@ -30237,7 +30240,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30240: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30243: 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;}
@@ -30282,7 +30285,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30285: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30288: 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;}
@@ -30293,7 +30296,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30296: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30299: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30342,7 +30345,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30345: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30348: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30353,7 +30356,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30356: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30359: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30366,7 +30369,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30369: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30372: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30424,7 +30427,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30427: $ac_file is unchanged" >&5
+      { echo "$as_me:30430: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30811,7 +30814,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30814: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30817: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 34a40c4fd..984f6aa48 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.758 2023/04/15 20:06:19 Sven.Joachim Exp $
+dnl $Id: configure.in,v 1.760 2023/04/18 00:22:49 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.758 $)
+AC_REVISION($Revision: 1.760 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1768,6 +1768,7 @@ limits.h \
 locale.h \
 math.h \
 poll.h \
+sys/auxv.h \
 sys/ioctl.h \
 sys/param.h \
 sys/poll.h \
@@ -1827,9 +1828,11 @@ CF_FUNC_GETTIME
 AC_CHECK_FUNCS( \
 fpathconf \
 getcwd \
+getauxval \
 getegid \
 geteuid \
 getopt \
+getuid \
 issetugid \
 localeconv \
 poll \
diff --git a/dist.mk b/dist.mk
index 5278cadc4..04c58d465 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1535 2023/04/15 11:55:57 tom Exp $
+# $Id: dist.mk,v 1.1537 2023/04/18 00:25:00 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230415
+NCURSES_PATCH = 20230418
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_access.h b/include/nc_access.h
index 2e893aa97..d02aedc08 100644
--- a/include/nc_access.h
+++ b/include/nc_access.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2021 Thomas E. Dickey                                          *
+ * Copyright 2021,2023 Thomas E. Dickey                                     *
  *                                                                          *
  * 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: nc_access.h,v 1.2 2021/07/10 22:07:06 tom Exp $ */
+/* $Id: nc_access.h,v 1.3 2023/04/17 23:29:12 tom Exp $ */
 
 #ifndef NC_ACCESS_included
 #define NC_ACCESS_included 1
@@ -44,16 +44,13 @@ extern "C" {
  * Turn off this symbol to limit access to environment variables when root.
  */
 #ifdef USE_ROOT_ENVIRON
-
 #define use_terminfo_vars() 1
-
 #else
-
 #define use_terminfo_vars() _nc_env_access()
-extern NCURSES_EXPORT(int) _nc_env_access (void);
-
 #endif
 
+extern NCURSES_EXPORT(int) _nc_env_access (void);
+
 /*
  * Turn off this symbol to limit access to files when running setuid.
  */
diff --git a/include/nc_tparm.h b/include/nc_tparm.h
index 943d94760..78170993f 100644
--- a/include/nc_tparm.h
+++ b/include/nc_tparm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey                        2006                    *
  ****************************************************************************/
 
-/* $Id: nc_tparm.h,v 1.11 2020/05/27 23:33:31 tom Exp $ */
+/* $Id: nc_tparm.h,v 1.12 2023/04/16 17:57:28 tom Exp $ */
 
 #ifndef NC_TPARM_included
 #define NC_TPARM_included 1
@@ -78,6 +78,7 @@
 #endif
 
 #ifdef NCURSES_INTERNALS
+#define TIPARM_0(s) _nc_tiparm(0,s)
 #define TIPARM_1(s,a) _nc_tiparm(1,s,a)
 #define TIPARM_2(s,a,b) _nc_tiparm(2,s,a,b)
 #define TIPARM_3(s,a,b,c) _nc_tiparm(3,s,a,b,c)
diff --git a/include/ncurses_defs b/include/ncurses_defs
index e744878b4..8a4185a93 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.104 2023/04/15 19:33:17 tom Exp $
+# $Id: ncurses_defs,v 1.106 2023/04/18 00:20:54 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -71,6 +71,7 @@ HAVE_FCNTL_H
 HAVE_FILTER	1
 HAVE_FORM_H
 HAVE_FPATHCONF
+HAVE_GETAUXVAL
 HAVE_GETBEGX	1
 HAVE_GETCURX	1
 HAVE_GETCWD
@@ -82,6 +83,7 @@ HAVE_GETOPT_H
 HAVE_GETPARX	1
 HAVE_GETTIMEOFDAY
 HAVE_GETTTYNAM
+HAVE_GETUID
 HAVE_GETWIN	1
 HAVE_GPM_H
 HAVE_GPP_BUILTIN_H
@@ -168,6 +170,7 @@ HAVE_STRSTR
 HAVE_SYMLINK
 HAVE_SYSCONF
 HAVE_SYS_BSDTYPES_H
+HAVE_SYS_AUXV_H
 HAVE_SYS_IOCTL_H
 HAVE_SYS_PARAM_H
 HAVE_SYS_POLL_H
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 1630658d1..080b31850 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.57 2023/04/08 21:43:01 tom Exp $
+.\" $Id: curs_termcap.3x,v 1.58 2023/04/16 18:16:40 tom Exp $
 .TH curs_termcap 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -247,8 +247,8 @@ Those return an error.
 .bP
 A call to \fBtgoto\fP using a capability with string parameters is an error.
 .bP
-A call to \fBtgoto\fP using a capability with no parameters,
-or more than two is an error.
+A call to \fBtgoto\fP using a capability with more than two parameters
+is an error.
 .SH BUGS
 If you call \fBtgetstr\fP to fetch \fBca\fP or any other parameterized string,
 be aware that it will be returned in terminfo notation, not the older and
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index a735db26e..edede176b 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,9 +43,16 @@
 #endif
 #endif
 
+#if HAVE_GETAUXVAL && HAVE_SYS_AUXV_H && defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19)
+#include <sys/auxv.h>
+#define USE_GETAUXVAL 1
+#else
+#define USE_GETAUXVAL 0
+#endif
+
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.31 2021/08/29 10:35:17 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.35 2023/04/18 00:18:35 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -177,14 +184,25 @@ _nc_is_file_path(const char *path)
     return result;
 }
 
+#if HAVE_GETEUID && HAVE_GETEGID
+#define is_posix_elevated() \
+	(getuid() != geteuid() \
+	 || getgid() != getegid())
+#else
+#define is_posix_elevated() FALSE
+#endif
+
 #if HAVE_ISSETUGID
 #define is_elevated() issetugid()
-#elif HAVE_GETEUID && HAVE_GETEGID
+#elif USE_GETAUXVAL && defined(AT_SECURE)
 #define is_elevated() \
-	(getuid() != geteuid() \
-	 || getgid() != getegid())
+	(getauxval(AT_SECURE) \
+	 ? TRUE \
+	 : (errno != ENOENT \
+	    ? FALSE \
+	    : is_posix_elevated()))
 #else
-#define is_elevated() FALSE
+#define is_elevated() is_posix_elevated()
 #endif
 
 #if HAVE_SETFSUID
@@ -203,24 +221,25 @@ _nc_is_file_path(const char *path)
 #define resume_elevation()	/* nothing */
 #endif
 
-#ifndef USE_ROOT_ENVIRON
 /*
- * Returns true if we allow application to use environment variables that are
- * used for searching lists of directories, etc.
+ * Returns true if not running as root or setuid.  We use this check to allow
+ * applications to use environment variables that are used for searching lists
+ * of directories, etc.
  */
 NCURSES_EXPORT(int)
 _nc_env_access(void)
 {
     int result = TRUE;
 
+#if HAVE_GETUID && HAVE_GETEUID
     if (is_elevated()) {
 	result = FALSE;
     } else if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) {
 	result = FALSE;
     }
+#endif
     return result;
 }
-#endif /* USE_ROOT_ENVIRON */
 
 #ifndef USE_ROOT_ACCESS
 /*
@@ -257,4 +276,4 @@ _nc_safe_open3(const char *path, int flags, mode_t mode)
 #endif
     return result;
 }
-#endif /* USE_ROOT_ENVIRON */
+#endif /* USE_ROOT_ACCESS */
diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c
index 48f48784d..aa745a6df 100644
--- a/ncurses/tinfo/comp_error.c
+++ b/ncurses/tinfo/comp_error.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_error.c,v 1.40 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: comp_error.c,v 1.42 2023/04/17 08:14:39 tom Exp $")
 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
@@ -148,9 +148,7 @@ _nc_syserr_abort(const char *const fmt, ...)
     /* If we're debugging, try to show where the problem occurred - this
      * will dump core.
      */
-#ifndef USE_ROOT_ENVIRON
-    if (getuid() != ROOT_UID)
-#endif
+    if (_nc_env_access())
 	abort();
 #endif
     /* Dumping core in production code is not a good idea.
diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 084a322fe..58b561fa7 100644
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <termcap.h>
 
-MODULE_ID("$Id: lib_tgoto.c,v 1.22 2023/04/08 13:48:58 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.23 2023/04/16 17:19:40 tom Exp $")
 
 #if !PURE_TERMINFO
 static bool
@@ -214,7 +214,9 @@ tgoto(const char *string, int x, int y)
 	 * using tgoto().  The internal _nc_tiparm() function returns a NULL
 	 * for that case; retry for the single-parameter case.
 	 */
-	result = TIPARM_1(string, y);
+	if ((result = TIPARM_1(string, y)) == NULL) {
+	    result = TIPARM_0(string);
+	}
     }
     returnPtr(result);
 }
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 002b117ce..15a0d8152 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -51,7 +51,7 @@
 #define TRACE_NUM(n)		/* nothing */
 #endif
 
-MODULE_ID("$Id: write_entry.c,v 1.121 2023/03/05 18:45:59 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.122 2023/04/17 08:08:08 tom Exp $")
 
 static int total_written;
 static int total_parts;
@@ -215,11 +215,7 @@ _nc_set_writedir(const char *dir)
     const char *destination;
     char actual[PATH_MAX];
 
-    if (dir == 0
-#ifndef USE_ROOT_ENVIRON
-	&& use_terminfo_vars()
-#endif
-	)
+    if (dir == 0 && use_terminfo_vars())
 	dir = getenv("TERMINFO");
 
     if (dir != 0)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 78570ae07..4ee52de4f 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230415) unstable; urgency=low
+ncurses6 (6.4+20230418) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 78570ae07..4ee52de4f 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230415) unstable; urgency=low
+ncurses6 (6.4+20230418) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 264d5a31a..d96f590a1 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230415) unstable; urgency=low
+ncurses6 (6.4+20230418) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Apr 2023 04:24:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/rules b/package/debian/rules
index 8bd2135d9..a02d45ee5 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.45 2022/10/22 18:35:38 tom Exp $
+# $Id: rules,v 1.46 2023/04/18 07:52:46 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -64,6 +64,8 @@ configure = \
 		--disable-macros  \
 		--disable-overwrite  \
 		--disable-relink \
+		--disable-root-access \
+		--disable-root-environ \
 		--disable-termcap \
 		--enable-hard-tabs \
 		--enable-opaque-curses \
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 65348841d..b52530a1d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.574 2023/04/09 08:24:29 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.577 2023/04/18 00:25:00 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0415"
+!define VERSION_MMDD  "0418"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 514d02999..857b367a8 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230415
+Release: 20230418
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 37e92259c..8be4d131d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230415
+Release: 20230418
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
@@ -69,15 +69,17 @@ This package is used for testing ABI %{MY_ABI}.
 	--disable-leaks \\\
 	--disable-macros  \\\
 	--disable-overwrite  \\\
-	%{_test_relink}  \\\
+	--disable-root-access \\\
+	--disable-root-environ \\\
+	--disable-rpath \\\
 	--disable-termcap \\\
+	%{_test_relink}  \\\
 	--enable-hard-tabs \\\
 	--enable-opaque-curses \\\
 	--enable-opaque-form \\\
 	--enable-opaque-menu \\\
 	--enable-opaque-panel \\\
 	--enable-pc-files \\\
-	--disable-rpath \\\
 	--enable-stdnoreturn \\\
 	--enable-warnings \\\
 	--enable-wgetch-events \\\
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 19b154b4f..c60c4772c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230415
+Release: 20230418
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/test_mouse.c b/test/test_mouse.c
index d6013c740..917910500 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.27 2023/01/07 17:22:42 tom Exp $
+ * $Id: test_mouse.c,v 1.28 2023/04/16 17:36:47 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -63,7 +63,7 @@ raw_loop(void)
 	return 1;
     }
 
-    putp(tparm(xtermcap, 1));
+    putp(tgoto(xtermcap, 1, 1));
     fflush(stdout);
 
     tcsetattr(0, TCSANOW, &tty);
@@ -85,7 +85,7 @@ raw_loop(void)
 	}
     }
 
-    putp(tparm(xtermcap, 0));
+    putp(tgoto(xtermcap, 0, 0));
     fflush(stdout);
     tcsetattr(0, TCSANOW, &old);
     return 0;

From a755551d165a69d0b7be5c17fbbd7f8f3765ebdd Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 24 Apr 2023 02:13:27 +0200
Subject: [PATCH 005/106] ncurses-6.4-20230423.patch

---
 INSTALL                               |   27 +-
 NEWS                                  |   14 +-
 README                                |    7 +-
 VERSION                               |    2 +-
 aclocal.m4                            |   30 +-
 configure                             | 4529 ++++++++++++-------------
 configure.in                          |   37 +-
 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_color.3x.html       |   19 +-
 doc/html/man/curs_termcap.3x.html     |    6 +-
 doc/html/man/curs_terminfo.3x.html    |  138 +-
 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          |   12 +-
 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 +-
 include/MKterm.h.awk.in               |   15 +-
 include/curses.h.in                   |    6 +-
 include/headers                       |    8 +-
 include/nc_access.h                   |    7 +-
 include/ncurses_defs                  |    5 +-
 include/term_entry.h                  |   25 +-
 include/tic.h                         |   37 +-
 man/curs_color.3x                     |   10 +-
 man/curs_terminfo.3x                  |   31 +-
 man/man_db.renames.in                 |    6 +-
 man/ncurses.3x                        |    6 +-
 mk-1st.awk                            |    7 +-
 ncurses/curses.priv.h                 |    8 +-
 ncurses/tinfo/MKcaptab.sh             |    5 +-
 ncurses/tinfo/MKfallback.sh           |    7 +-
 ncurses/tinfo/access.c                |    9 +-
 ncurses/tinfo/alloc_ttype.c           |    7 +-
 ncurses/tinfo/comp_hash.c             |    5 +-
 ncurses/tinfo/free_ttype.c            |    7 +-
 ncurses/tinfo/lib_tparm.c             |   74 +-
 ncurses/tinfo/lib_tputs.c             |    6 +-
 ncurses/tinfo/read_entry.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.map                   |   10 +-
 package/ncurses.spec                  |    2 +-
 package/ncurses.sym                   |    4 +-
 package/ncursest.map                  |   10 +-
 package/ncursest.spec                 |    2 +-
 package/ncursest.sym                  |    4 +-
 package/ncursestw.map                 |   10 +-
 package/ncursestw.sym                 |    4 +-
 package/ncursesw.map                  |   10 +-
 package/ncursesw.sym                  |    4 +-
 test/configure                        |  865 ++---
 test/configure.in                     |    9 +-
 test/picsmap.c                        |   11 +-
 test/test.priv.h                      |   21 +-
 test/test_tparm.c                     |  186 +-
 69 files changed, 3268 insertions(+), 3053 deletions(-)

diff --git a/INSTALL b/INSTALL
index 8555f738d..4c4553a34 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.241 2023/04/17 08:04:48 tom Exp $
+-- $Id: INSTALL,v 1.243 2023/04/22 23:41:54 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -481,9 +481,13 @@ CONFIGURE OPTIONS:
 
     --disable-root-environ
 	Compile with environment restriction, so certain environment variables
-	are not available when running as root, or via a setuid/setgid
-	application.  These are (for example $TERMINFO) those that allow the
-	search path for the terminfo or termcap entry to be customized.
+	are not available when running as root.  These are (for example
+	$TERMINFO) those that allow the search path for the terminfo or termcap
+	entry to be customized.
+
+	Disabling the root environment variables also disables the setuid
+	environment variables by default.  Use the --disable-setuid-environ
+	option to modify this behavior.
 
     --disable-rpath-hack
 	Normally the configure script helps link libraries found in unusual
@@ -498,6 +502,16 @@ CONFIGURE OPTIONS:
     --disable-stripping
 	Do not strip installed executables.
 
+    --disable-setuid-environ
+	Compile with environment restriction, so certain environment variables
+	are not available when running via a setuid/setgid application.  These
+	are (for example $TERMINFO) those that allow the search path for the
+	terminfo or termcap entry to be customized.
+
+	A setuid/setgid application inherits its environment variables from
+	the current user, in contrast to sudo which may limit the environment
+	variables that ncurses uses.
+
     --disable-tic-depends
 	When building shared libraries, normally the tic library is linked to
 	depend upon the ncurses library (or equivalently, on the tinfo-library
@@ -1386,11 +1400,6 @@ CONFIGURE OPTIONS:
 	programs (e.g., tic).  The test applications will still be built if you
 	type "make", though not if you simply do "make install".
 
-    --without-tack
-	Suppress build/install with tack program, if it happens to be
-	in the same build-tree (tack was moved out of the ncurses source-tree
-	in 20070203).
-
     --without-tests
 	Tell the configure script to suppress the build of ncurses' test
 	programs.
diff --git a/NEWS b/NEWS
index 9d1440069..549857d22 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3939 2023/04/18 22:22:09 tom Exp $
+-- $Id: NEWS,v 1.3944 2023/04/23 21:11:05 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,18 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230423
+	+ add tiscan_s() to help applications check formatting capabilities
+	  that would be passed to tiparm_s, etc.
+	+ add tiparm_s() to provide applications a way to tell ncurses what
+	  the expected parameters are for a capability (tmux #3531).
+	+ improve check in lib_tparm.c, ensuring that a char* fits into a
+	  TPARM_ARG.
+	+ add --disable-setuid-environ configure option (request by Sven
+	  Joachim).
+	+ drop compatibility with obsolete versions of tack, e.g., pre-1.08
+	  (Debian #1034549, cf: 20170722).
+
 20230418
 	+ improve checks for limits on privileged execution:
 	  + modify _nc_syserr_abort() to use _nc_env_access(), rather than
diff --git a/README b/README
index 84998f232..4e4e0da07 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2020,2021 Thomas E. Dickey                                      --
+-- Copyright 2020-2021,2023 Thomas E. Dickey                                 --
 -- Copyright 1998-2012,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.29 2021/06/17 21:20:30 tom Exp $
+-- $Id: README,v 1.30 2023/04/22 15:49:24 tom Exp $
 -------------------------------------------------------------------------------
 		README file for the ncurses package
 
@@ -45,8 +45,7 @@ ROADMAP AND PACKAGE OVERVIEW:
 You should be reading this file in a directory called:  ncurses-d.d, where d.d
 is the current version number (see the dist.mk file in this directory for
 that).  There should be a number of subdirectories, including `c++', `form',
-`man', `menu', `misc', `ncurses', `panel', `progs', `test', 'tack' and `Ada95'.
-(The 'tack' program may be distributed separately).
+`man', `menu', `misc', `ncurses', `panel', `progs', `test', and `Ada95'.
 
 A full build/install of this package typically installs several libraries, a
 handful of utilities, and a database hierarchy.  Here is an inventory of the
diff --git a/VERSION b/VERSION
index f6c3c18c3..36526f0bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230418
+5:0:10	6.4	20230423
diff --git a/aclocal.m4 b/aclocal.m4
index afeaccbb6..bc5350e3e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1038 2023/04/15 20:03:39 tom Exp $
+dnl $Id: aclocal.m4,v 1.1040 2023/04/22 15:51:54 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4518,7 +4518,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
 	AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 98 updated: 2023/01/07 16:32:06
+dnl CF_LIB_RULES version: 99 updated: 2023/04/22 11:51:06
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -5029,18 +5029,6 @@ distclean ::
 	rm -rf \${DIRS_TO_MAKE}
 CF_EOF
 
-# Special case: tack's manpage lives in its own directory.
-if test "x$cf_with_manpages" = xyes; then
-if test "x$cf_with_tack" = "xyes"; then
-cat >> Makefile <<CF_EOF
-
-install.man \\
-uninstall.man ::
-	( cd tack && \${MAKE} \${TOP_MFLAGS} \[$]@ )
-CF_EOF
-fi
-fi
-
 dnl If we're installing into a subdirectory of /usr/include, etc., we should
 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
 dnl anything, and will make it more standardized.  It's awkward to decide this
@@ -8056,7 +8044,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRC_MODULES version: 33 updated: 2021/01/01 13:31:04
+dnl CF_SRC_MODULES version: 34 updated: 2023/04/22 11:51:06
 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
@@ -8086,14 +8074,6 @@ for cf_dir in $1
 do
 	if test -f "$srcdir/$cf_dir/modules" ; then
 
-		# We may/may not have tack in the distribution, though the
-		# makefile is.
-		if test "$cf_dir" = tack ; then
-			if test "x$cf_with_tack" != "xyes"; then
-				continue
-			fi
-		fi
-
 		if test -z "$cf_cv_src_modules"; then
 			cf_cv_src_modules=$cf_dir
 		else
@@ -8104,9 +8084,7 @@ do
 		# well.  These are header files that are the same name as their
 		# directory.  Ncurses is the only library that does not follow
 		# that pattern.
-		if test "$cf_dir" = tack ; then
-			continue
-		elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
+		if test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
 			CF_UPPER(cf_have_include,$cf_dir)
 			AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
 			AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
diff --git a/configure b/configure
index fbb416628..4368c8886 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.760 .
+# From configure.in Revision: 1.762 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -723,7 +723,6 @@ Optional Features:
   --disable-db-install    suppress install of terminal database
   --without-manpages      suppress install of manpages
   --without-progs         suppress build/install with programs (e.g., tic)
-  --without-tack          suppress build/install with tack program
   --without-tests         suppress build/install with test-programs
   --without-curses-h      install curses.h as ncurses.h only
   --with-config-suffix=X  suffixes ncursesXX-config file
@@ -786,6 +785,7 @@ Fine-Tuning Your Configuration:
   --disable-home-terminfo drop ~/.terminfo from terminfo search-path
   --disable-root-environ  restrict root use of ncurses environment variables
   --disable-root-access   restrict file-access when running setuid
+  --disable-setuid-environ restrict setuid use of ncurses environment variables
   --enable-symlinks       make tic use symbolic links not hard links
   --enable-broken_linker  compile with broken-linker support code
   --enable-bsdpad         recognize BSD-style prefix padding
@@ -3699,32 +3699,7 @@ fi;
 echo "$as_me:3699: 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}:3706: testing ignoring tack because we are cross-compiling ..." 1>&5
-
-		cf_with_tack=no
-	else
-		echo "$as_me:3710: 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.
-if test "${with_tack+set}" = set; then
-  withval="$with_tack"
-  cf_with_tack=$withval
-else
-  cf_with_tack=$cf_with_progs
-fi;
-		echo "$as_me:3720: result: $cf_with_tack" >&5
-echo "${ECHO_T}$cf_with_tack" >&6
-	fi
-else
-	cf_with_tack=no
-fi
-
-echo "$as_me:3727: checking if you want to build test-programs" >&5
+echo "$as_me:3702: 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.
@@ -3734,10 +3709,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3737: result: $cf_with_tests" >&5
+echo "$as_me:3712: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3740: checking if you wish to install curses.h" >&5
+echo "$as_me:3715: 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.
@@ -3747,12 +3722,11 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3750: result: $with_curses_h" >&5
+echo "$as_me:3725: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
 test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs"
-test "X$cf_with_tack"  != Xno && modules_to_build="$modules_to_build tack"
 modules_to_build="$modules_to_build panel menu form"
 
 test "$program_prefix" != NONE &&
@@ -3772,7 +3746,7 @@ for ac_prog in mawk gawk nawk awk
 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:3775: checking for $ac_word" >&5
+echo "$as_me:3749: 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
@@ -3787,7 +3761,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3790: found $ac_dir/$ac_word" >&5
+echo "$as_me:3764: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3795,17 +3769,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3798: result: $AWK" >&5
+  echo "$as_me:3772: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3801: result: no" >&5
+  echo "$as_me:3775: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3808: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3782: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3821,7 +3795,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3824: checking for a BSD compatible install" >&5
+echo "$as_me:3798: 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
@@ -3870,7 +3844,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3873: result: $INSTALL" >&5
+echo "$as_me:3847: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3895,7 +3869,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3898: checking for $ac_word" >&5
+echo "$as_me:3872: 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
@@ -3910,7 +3884,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3913: found $ac_dir/$ac_word" >&5
+echo "$as_me:3887: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3918,10 +3892,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3921: result: $LINT" >&5
+  echo "$as_me:3895: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3924: result: no" >&5
+  echo "$as_me:3898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3934,18 +3908,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3937: checking whether ln -s works" >&5
+echo "$as_me:3911: 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:3941: result: yes" >&5
+  echo "$as_me:3915: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3944: result: no, using $LN_S" >&5
+  echo "$as_me:3918: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3948: checking if $LN_S -f options work" >&5
+echo "$as_me:3922: 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
@@ -3957,12 +3931,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3960: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3934: 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:3965: checking for long file names" >&5
+echo "$as_me:3939: 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
@@ -4001,7 +3975,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4004: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3978: 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
 
@@ -4020,7 +3994,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4023: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:3997: 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"
@@ -4030,7 +4004,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4033: checking if you want to use pkg-config" >&5
+echo "$as_me:4007: 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.
@@ -4040,7 +4014,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4043: result: $cf_pkg_config" >&5
+echo "$as_me:4017: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4052,7 +4026,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4055: checking for $ac_word" >&5
+echo "$as_me:4029: 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
@@ -4069,7 +4043,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4072: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4046: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4080,10 +4054,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4083: result: $PKG_CONFIG" >&5
+  echo "$as_me:4057: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4086: result: no" >&5
+  echo "$as_me:4060: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4092,7 +4066,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4095: checking for $ac_word" >&5
+echo "$as_me:4069: 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
@@ -4109,7 +4083,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4112: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4086: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4121,10 +4095,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4124: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4098: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4127: result: no" >&5
+  echo "$as_me:4101: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4167,24 +4141,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4170: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4144: 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:4177: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4151: 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:4183: checking for pkg-config library directory" >&5
+	echo "$as_me:4157: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4187: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4161: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4211,7 +4185,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4214: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4188: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4222,16 +4196,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4225: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4199: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4230: result: auto" >&5
+	echo "$as_me:4204: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4234: checking for search-list" >&5
+	echo "$as_me:4208: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4258,11 +4232,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4261: result: $cf_search_path" >&5
+	echo "$as_me:4235: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4265: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4239: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4270,7 +4244,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4273: checking for first directory" >&5
+	echo "$as_me:4247: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4281,7 +4255,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4284: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4258: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4291,7 +4265,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4294: checking for workaround" >&5
+		echo "$as_me:4268: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4314,17 +4288,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4317: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4291: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4324: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4298: 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:4327: checking if we should install .pc files" >&5
+	echo "$as_me:4301: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4335,7 +4309,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4338: result: $enable_pc_files" >&5
+echo "$as_me:4312: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4343,7 +4317,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4346: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4320: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4374,7 +4348,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4377: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4351: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4388,7 +4362,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4391: checking for suffix to add to pc-files" >&5
+	echo "$as_me:4365: 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.
@@ -4403,13 +4377,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4406: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4380: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4412: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4386: 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.
@@ -4419,11 +4393,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4422: result: $enable_mixedcase" >&5
+echo "$as_me:4396: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4426: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4400: 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
@@ -4450,7 +4424,7 @@ else
 fi
 
 fi
-echo "$as_me:4453: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4427: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4469,7 +4443,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4472: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4446: 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
@@ -4489,16 +4463,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4492: result: yes" >&5
+  echo "$as_me:4466: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4496: result: no" >&5
+  echo "$as_me:4470: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4501: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4475: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4553,7 +4527,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4556: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4530: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4564,7 +4538,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4567: checking for $ac_word" >&5
+echo "$as_me:4541: 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
@@ -4579,7 +4553,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4582: found $ac_dir/$ac_word" >&5
+echo "$as_me:4556: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4587,10 +4561,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4590: result: $CTAGS" >&5
+  echo "$as_me:4564: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4593: result: no" >&5
+  echo "$as_me:4567: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4601,7 +4575,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4604: checking for $ac_word" >&5
+echo "$as_me:4578: 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
@@ -4616,7 +4590,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4619: found $ac_dir/$ac_word" >&5
+echo "$as_me:4593: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4624,10 +4598,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4627: result: $ETAGS" >&5
+  echo "$as_me:4601: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4630: result: no" >&5
+  echo "$as_me:4604: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4636,7 +4610,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4639: checking for $ac_word" >&5
+echo "$as_me:4613: 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
@@ -4651,7 +4625,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4654: found $ac_dir/$ac_word" >&5
+echo "$as_me:4628: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4660,17 +4634,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4663: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4637: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4666: result: no" >&5
+  echo "$as_me:4640: 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:4673: checking for $ac_word" >&5
+echo "$as_me:4647: 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
@@ -4685,7 +4659,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4688: found $ac_dir/$ac_word" >&5
+echo "$as_me:4662: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4694,10 +4668,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4697: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4671: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4700: result: no" >&5
+  echo "$as_me:4674: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4717,7 +4691,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4720: checking for makeflags variable" >&5
+echo "$as_me:4694: 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
@@ -4747,7 +4721,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4750: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4724: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4755,13 +4729,13 @@ echo "${as_me:-configure}:4750: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4758: result: $cf_cv_makeflags" >&5
+echo "$as_me:4732: 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:4764: 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_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4776,7 +4750,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4779: found $ac_dir/$ac_word" >&5
+echo "$as_me:4753: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4784,10 +4758,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4787: result: $RANLIB" >&5
+  echo "$as_me:4761: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4790: result: no" >&5
+  echo "$as_me:4764: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4796,7 +4770,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4799: 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_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4811,7 +4785,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4814: found $ac_dir/$ac_word" >&5
+echo "$as_me:4788: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4820,10 +4794,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4823: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4797: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4826: result: no" >&5
+  echo "$as_me:4800: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4835,7 +4809,7 @@ fi
 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:4838: 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_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4850,7 +4824,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4853: found $ac_dir/$ac_word" >&5
+echo "$as_me:4827: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4858,10 +4832,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4861: result: $LD" >&5
+  echo "$as_me:4835: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4864: result: no" >&5
+  echo "$as_me:4838: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4870,7 +4844,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4873: checking for $ac_word" >&5
+echo "$as_me:4847: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4885,7 +4859,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4888: found $ac_dir/$ac_word" >&5
+echo "$as_me:4862: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4894,10 +4868,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4897: result: $ac_ct_LD" >&5
+  echo "$as_me:4871: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4900: result: no" >&5
+  echo "$as_me:4874: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4909,7 +4883,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4912: checking for $ac_word" >&5
+echo "$as_me:4886: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4924,7 +4898,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4927: found $ac_dir/$ac_word" >&5
+echo "$as_me:4901: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4932,10 +4906,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4935: result: $AR" >&5
+  echo "$as_me:4909: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4938: result: no" >&5
+  echo "$as_me:4912: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4944,7 +4918,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4947: checking for $ac_word" >&5
+echo "$as_me:4921: 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
@@ -4959,7 +4933,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4962: found $ac_dir/$ac_word" >&5
+echo "$as_me:4936: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4968,10 +4942,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4971: result: $ac_ct_AR" >&5
+  echo "$as_me:4945: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4974: result: no" >&5
+  echo "$as_me:4948: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4983,7 +4957,7 @@ fi
 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:4986: checking for $ac_word" >&5
+echo "$as_me:4960: 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
@@ -4998,7 +4972,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5001: found $ac_dir/$ac_word" >&5
+echo "$as_me:4975: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5006,10 +4980,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5009: result: $NM" >&5
+  echo "$as_me:4983: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5012: result: no" >&5
+  echo "$as_me:4986: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5018,7 +4992,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5021: checking for $ac_word" >&5
+echo "$as_me:4995: 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
@@ -5033,7 +5007,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5036: found $ac_dir/$ac_word" >&5
+echo "$as_me:5010: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5042,10 +5016,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5045: result: $ac_ct_NM" >&5
+  echo "$as_me:5019: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5048: result: no" >&5
+  echo "$as_me:5022: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5057,7 +5031,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5060: checking for $ac_word" >&5
+echo "$as_me:5034: 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
@@ -5072,7 +5046,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5075: found $ac_dir/$ac_word" >&5
+echo "$as_me:5049: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5080,10 +5054,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5083: result: $AR" >&5
+  echo "$as_me:5057: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5086: result: no" >&5
+  echo "$as_me:5060: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5092,7 +5066,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5095: checking for $ac_word" >&5
+echo "$as_me:5069: 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
@@ -5107,7 +5081,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5110: found $ac_dir/$ac_word" >&5
+echo "$as_me:5084: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5116,10 +5090,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5119: result: $ac_ct_AR" >&5
+  echo "$as_me:5093: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5122: result: no" >&5
+  echo "$as_me:5096: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5128,7 +5102,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5131: checking for options to update archives" >&5
+echo "$as_me:5105: 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
@@ -5165,13 +5139,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5168 "configure"
+#line 5142 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5174: \$? = $ac_status" >&5
+  echo "$as_me:5148: \$? = $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
@@ -5182,7 +5156,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5185: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5159: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5192,7 +5166,7 @@ echo "${as_me:-configure}:5185: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5195: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5169: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5203,7 +5177,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5206: checking if you have specified an install-prefix" >&5
+echo "$as_me:5180: 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.
@@ -5216,7 +5190,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5219: result: $DESTDIR" >&5
+echo "$as_me:5193: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -5251,7 +5225,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5254: checking for $ac_word" >&5
+echo "$as_me:5228: 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
@@ -5266,7 +5240,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5269: found $ac_dir/$ac_word" >&5
+echo "$as_me:5243: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5274,10 +5248,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5277: result: $BUILD_CC" >&5
+  echo "$as_me:5251: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5280: result: no" >&5
+  echo "$as_me:5254: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5286,12 +5260,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5289: checking for native build C compiler" >&5
+	echo "$as_me:5263: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5291: result: $BUILD_CC" >&5
+	echo "$as_me:5265: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5294: checking for native build C preprocessor" >&5
+	echo "$as_me:5268: 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.
@@ -5301,10 +5275,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5304: result: $BUILD_CPP" >&5
+	echo "$as_me:5278: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5307: checking for native build C flags" >&5
+	echo "$as_me:5281: 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.
@@ -5312,10 +5286,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5315: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5289: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5318: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5292: 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.
@@ -5323,10 +5297,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5326: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5300: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5329: checking for native build linker-flags" >&5
+	echo "$as_me:5303: 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.
@@ -5334,10 +5308,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5337: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5311: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5340: checking for native build linker-libraries" >&5
+	echo "$as_me:5314: 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.
@@ -5345,7 +5319,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5348: result: $BUILD_LIBS" >&5
+	echo "$as_me:5322: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5354,7 +5328,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5357: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5331: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5368,7 +5342,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5371 "configure"
+#line 5345 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5378,15 +5352,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5384: \$? = $ac_status" >&5
+  echo "$as_me:5358: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5389: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5401,12 +5375,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5404: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5378: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5409: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5383: 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;}
@@ -5431,7 +5405,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5434: checking if libtool -version-number should be used" >&5
+echo "$as_me:5408: 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.
@@ -5448,7 +5422,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5451: result: $cf_libtool_version" >&5
+echo "$as_me:5425: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5457,25 +5431,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5460: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5434: 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}:5467: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5441: 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}:5474: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5448: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5478: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5452: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5497,7 +5471,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5500: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5474: 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.
@@ -5507,7 +5481,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5510: result: $with_libtool" >&5
+echo "$as_me:5484: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5538,7 +5512,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5541: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5515: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5551,7 +5525,7 @@ esac
   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:5554: checking for $ac_word" >&5
+echo "$as_me:5528: 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
@@ -5566,7 +5540,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5569: found $ac_dir/$ac_word" >&5
+echo "$as_me:5543: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5574,10 +5548,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5577: result: $LIBTOOL" >&5
+  echo "$as_me:5551: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5580: result: no" >&5
+  echo "$as_me:5554: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5590,7 +5564,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5593: checking for $ac_word" >&5
+echo "$as_me:5567: 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
@@ -5605,7 +5579,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5608: found $ac_dir/$ac_word" >&5
+echo "$as_me:5582: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5613,10 +5587,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5616: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5590: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5619: result: no" >&5
+  echo "$as_me:5593: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5647,7 +5621,7 @@ unset LIBTOOL
   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:5650: checking for $ac_word" >&5
+echo "$as_me:5624: 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
@@ -5662,7 +5636,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5665: found $ac_dir/$ac_word" >&5
+echo "$as_me:5639: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5670,10 +5644,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5673: result: $LIBTOOL" >&5
+  echo "$as_me:5647: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5676: result: no" >&5
+  echo "$as_me:5650: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5686,7 +5660,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5689: checking for $ac_word" >&5
+echo "$as_me:5663: 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
@@ -5701,7 +5675,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5704: found $ac_dir/$ac_word" >&5
+echo "$as_me:5678: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5709,10 +5683,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5712: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5686: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5715: result: no" >&5
+  echo "$as_me:5689: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5734,7 +5708,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5737: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5711: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5750,7 +5724,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5753: checking version of $LIBTOOL" >&5
+	echo "$as_me:5727: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5761,7 +5735,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5764: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5738: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5770,18 +5744,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5773: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5747: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5779: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5753: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5784: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5758: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5817,7 +5791,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5820: checking if you want to build shared libraries" >&5
+echo "$as_me:5794: 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.
@@ -5827,11 +5801,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5830: result: $with_shared" >&5
+echo "$as_me:5804: 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:5834: checking if you want to build static libraries" >&5
+echo "$as_me:5808: 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.
@@ -5841,11 +5815,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5844: result: $with_normal" >&5
+echo "$as_me:5818: 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:5848: checking if you want to build debug libraries" >&5
+echo "$as_me:5822: 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.
@@ -5855,11 +5829,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5858: result: $with_debug" >&5
+echo "$as_me:5832: 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:5862: checking if you want to build profiling libraries" >&5
+echo "$as_me:5836: 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.
@@ -5869,7 +5843,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5872: result: $with_profile" >&5
+echo "$as_me:5846: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5877,7 +5851,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5880: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5854: 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.
@@ -5887,26 +5861,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5890: result: $with_shared_cxx" >&5
+echo "$as_me:5864: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5897: checking for specified models" >&5
+echo "$as_me:5871: 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:5901: result: $cf_list_models" >&5
+echo "$as_me:5875: 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:5906: checking for default model" >&5
+echo "$as_me:5880: 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:5909: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5883: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5920,7 +5894,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5923: checking if you want to have a library-prefix" >&5
+echo "$as_me:5897: 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.
@@ -5930,7 +5904,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5933: result: $with_lib_prefix" >&5
+echo "$as_me:5907: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5961,24 +5935,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5964: checking for PATH separator" >&5
+	echo "$as_me:5938: 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:5971: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5945: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5975: checking for ANSI C header files" >&5
+echo "$as_me:5949: 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 5981 "configure"
+#line 5955 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5986,13 +5960,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5989: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5995: \$? = $ac_status" >&5
+  echo "$as_me:5969: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6014,7 +5988,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6017 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6032,7 +6006,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6035 "configure"
+#line 6009 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6053,7 +6027,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6056 "configure"
+#line 6030 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6079,15 +6053,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6085: \$? = $ac_status" >&5
+  echo "$as_me:6059: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6090: \$? = $ac_status" >&5
+  echo "$as_me:6064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6100,7 +6074,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6103: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6077: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6116,28 +6090,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6119: checking for $ac_header" >&5
+echo "$as_me:6093: 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 6125 "configure"
+#line 6099 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6134: \$? = $ac_status" >&5
+  echo "$as_me:6108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6140: \$? = $ac_status" >&5
+  echo "$as_me:6114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6147,7 +6121,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6150: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6124: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6157,13 +6131,13 @@ EOF
 fi
 done
 
-echo "$as_me:6160: checking whether exit is declared" >&5
+echo "$as_me:6134: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6166 "configure"
+#line 6140 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6178,16 +6152,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6184: \$? = $ac_status" >&5
+  echo "$as_me:6158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6190: \$? = $ac_status" >&5
+  echo "$as_me:6164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6197,19 +6171,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6200: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6174: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6206: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6180: 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 6212 "configure"
+#line 6186 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6224,16 +6198,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6230: \$? = $ac_status" >&5
+  echo "$as_me:6204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6236: \$? = $ac_status" >&5
+  echo "$as_me:6210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6243,7 +6217,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6246: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6220: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6256,7 +6230,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6259: checking for opendir in -ldir" >&5
+  echo "$as_me:6233: 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
@@ -6264,7 +6238,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6267 "configure"
+#line 6241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6283,16 +6257,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6289: \$? = $ac_status" >&5
+  echo "$as_me:6263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6295: \$? = $ac_status" >&5
+  echo "$as_me:6269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6303,14 +6277,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6306: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6280: 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:6313: checking for opendir in -lx" >&5
+  echo "$as_me:6287: 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
@@ -6318,7 +6292,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6321 "configure"
+#line 6295 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6337,16 +6311,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6343: \$? = $ac_status" >&5
+  echo "$as_me:6317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6349: \$? = $ac_status" >&5
+  echo "$as_me:6323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6357,7 +6331,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6360: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6334: 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"
@@ -6367,7 +6341,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6370: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6344: 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.
@@ -6377,10 +6351,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6380: result: $with_termlib" >&5
+echo "$as_me:6354: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6383: checking if you want to build a separate tic library" >&5
+echo "$as_me:6357: 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.
@@ -6390,7 +6364,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6393: result: $with_ticlib" >&5
+echo "$as_me:6367: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6403,7 +6377,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6406: checking for default loader flags" >&5
+echo "$as_me:6380: 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=''   ;;
@@ -6412,13 +6386,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6415: result: $LD_MODEL" >&5
+echo "$as_me:6389: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6421: checking if rpath option should be used" >&5
+echo "$as_me:6395: 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.
@@ -6428,10 +6402,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6431: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6405: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6434: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6408: 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.
@@ -6441,7 +6415,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6444: result: $cf_cv_do_relink" >&5
+echo "$as_me:6418: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6452,7 +6426,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6455: checking for an rpath option" >&5
+	echo "$as_me:6429: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6483,12 +6457,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6486: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6460: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6491: checking if we need a space after rpath option" >&5
+		echo "$as_me:6465: 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"
 
@@ -6509,7 +6483,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6512 "configure"
+#line 6486 "configure"
 #include "confdefs.h"
 
 int
@@ -6521,16 +6495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6527: \$? = $ac_status" >&5
+  echo "$as_me:6501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6533: \$? = $ac_status" >&5
+  echo "$as_me:6507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6540,7 +6514,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6543: result: $cf_rpath_space" >&5
+		echo "$as_me:6517: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6562,7 +6536,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6565: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:6539: 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.
@@ -6577,9 +6551,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6580: result: $withval" >&5
+		echo "$as_me:6554: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6582: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6556: 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; }; }
 		;;
@@ -6588,7 +6562,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6591: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6565: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6611,14 +6585,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6614: checking which $CC option to use" >&5
+		echo "$as_me:6588: 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 6621 "configure"
+#line 6595 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6630,16 +6604,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6636: \$? = $ac_status" >&5
+  echo "$as_me:6610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6642: \$? = $ac_status" >&5
+  echo "$as_me:6616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6648,7 +6622,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6651: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6625: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6719,7 +6693,7 @@ CF_EOF
 		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:6722: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6696: 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
@@ -6728,7 +6702,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6731 "configure"
+#line 6705 "configure"
 #include "confdefs.h"
 
 int
@@ -6740,16 +6714,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6746: \$? = $ac_status" >&5
+  echo "$as_me:6720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6752: \$? = $ac_status" >&5
+  echo "$as_me:6726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6760,7 +6734,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6763: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6737: 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"
@@ -7110,7 +7084,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7113 "configure"
+#line 7087 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7122,16 +7096,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7128: \$? = $ac_status" >&5
+  echo "$as_me:7102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7134: \$? = $ac_status" >&5
+  echo "$as_me:7108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7168,7 +7142,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7171: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7145: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7178,7 +7152,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7181 "${as_me:-configure}"
+#line 7155 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7190,18 +7164,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7193: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7167: 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:7195: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7198: \$? = $ac_status" >&5
+  echo "$as_me:7172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7200: result: yes" >&5
+				echo "$as_me:7174: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7204: result: no" >&5
+				echo "$as_me:7178: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7216,17 +7190,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7219: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7193: 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}:7223: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7197: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7229: checking for additional libtool options" >&5
+echo "$as_me:7203: 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.
@@ -7236,7 +7210,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7239: result: $with_libtool_opts" >&5
+echo "$as_me:7213: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7247,7 +7221,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7250: checking if exported-symbols file should be used" >&5
+echo "$as_me:7224: 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.
@@ -7262,7 +7236,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7265: result: $with_export_syms" >&5
+echo "$as_me:7239: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7273,15 +7247,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7276: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7250: 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:7281: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7255: 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 7284 "configure"
+#line 7258 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7293,16 +7267,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7299: \$? = $ac_status" >&5
+  echo "$as_me:7273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7305: \$? = $ac_status" >&5
+  echo "$as_me:7279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7311,18 +7285,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7314: result: $cf_cflags_work" >&5
+		echo "$as_me:7288: 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}:7320: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7294: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7325: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7299: 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.
@@ -7340,18 +7314,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7343: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7317: 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:7348: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7322: 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:7354: result: $with_versioned_syms" >&5
+echo "$as_me:7328: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7367,7 +7341,7 @@ then
 		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}:7370: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7344: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7375,11 +7349,11 @@ echo "${as_me:-configure}:7370: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7378: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7352: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7382: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7356: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7391,7 +7365,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7394: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7368: 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
 
@@ -7428,7 +7402,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7431 "configure"
+#line 7405 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7459,7 +7433,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7462: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7436: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7472,7 +7446,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7475: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7449: 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.
@@ -7482,27 +7456,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7485: result: $with_gpm" >&5
+echo "$as_me:7459: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7489: checking for gpm.h" >&5
+	echo "$as_me:7463: 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 7495 "configure"
+#line 7469 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7505: \$? = $ac_status" >&5
+  echo "$as_me:7479: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7521,7 +7495,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7524: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7498: 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
 
@@ -7532,7 +7506,7 @@ EOF
 		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}:7535: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7509: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7540,7 +7514,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7543: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7517: 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
@@ -7548,7 +7522,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7551 "configure"
+#line 7525 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7567,16 +7541,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7573: \$? = $ac_status" >&5
+  echo "$as_me:7547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7579: \$? = $ac_status" >&5
+  echo "$as_me:7553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7587,18 +7561,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7590: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7564: 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:7597: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7571: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7601: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7575: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7609,7 +7583,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7612: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7586: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7618,7 +7592,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7621: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7595: 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.
@@ -7628,18 +7602,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7631: result: $with_dlsym" >&5
+	echo "$as_me:7605: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7636: checking for dlsym" >&5
+echo "$as_me:7610: 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 7642 "configure"
+#line 7616 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7670,16 +7644,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7676: \$? = $ac_status" >&5
+  echo "$as_me:7650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7682: \$? = $ac_status" >&5
+  echo "$as_me:7656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7689,14 +7663,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7692: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7666: 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:7699: checking for dlsym in -ldl" >&5
+echo "$as_me:7673: 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
@@ -7704,7 +7678,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7707 "configure"
+#line 7681 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7723,16 +7697,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7729: \$? = $ac_status" >&5
+  echo "$as_me:7703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7735: \$? = $ac_status" >&5
+  echo "$as_me:7709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7743,7 +7717,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7746: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7720: 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
 
@@ -7772,10 +7746,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7775: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7749: 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 7778 "configure"
+#line 7752 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7793,16 +7767,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7799: \$? = $ac_status" >&5
+  echo "$as_me:7773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7805: \$? = $ac_status" >&5
+  echo "$as_me:7779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7813,15 +7787,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7816: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7790: 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:7821: result: ok" >&5
+	echo "$as_me:7795: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7824: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7798: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7829,12 +7803,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7832: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7806: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7837: checking for soname of gpm library" >&5
+echo "$as_me:7811: 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
@@ -7868,15 +7842,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7871: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7874: \$? = $ac_status" >&5
+  echo "$as_me:7848: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7876: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7879: \$? = $ac_status" >&5
+  echo "$as_me:7853: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7887,7 +7861,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7890: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7864: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7955,7 +7929,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7958: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7932: 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
@@ -7963,7 +7937,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7966 "configure"
+#line 7940 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7982,16 +7956,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7988: \$? = $ac_status" >&5
+  echo "$as_me:7962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7994: \$? = $ac_status" >&5
+  echo "$as_me:7968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8002,11 +7976,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8005: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7979: 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:8009: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7983: 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
@@ -8030,15 +8004,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8036: \$? = $ac_status" >&5
+  echo "$as_me:8010: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8038: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8041: \$? = $ac_status" >&5
+  echo "$as_me:8015: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8050,11 +8024,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8053: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8027: 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:8057: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8031: 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
 
@@ -8062,7 +8036,7 @@ fi
 
 fi
 
-echo "$as_me:8065: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8039: 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.
@@ -8071,7 +8045,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8074: result: $with_pcre2" >&5
+echo "$as_me:8048: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8082,17 +8056,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8085: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8059: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8091: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8065: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8095: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8069: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8216,7 +8190,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8219: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8193: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8229,7 +8203,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8232: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8206: 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
@@ -8237,7 +8211,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8240 "configure"
+#line 8214 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8256,16 +8230,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8262: \$? = $ac_status" >&5
+  echo "$as_me:8236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8268: \$? = $ac_status" >&5
+  echo "$as_me:8242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8276,7 +8250,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8279: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8253: 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
 
@@ -8297,7 +8271,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8300: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8274: 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
@@ -8305,7 +8279,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8308 "configure"
+#line 8282 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8324,16 +8298,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8330: \$? = $ac_status" >&5
+  echo "$as_me:8304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8336: \$? = $ac_status" >&5
+  echo "$as_me:8310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8344,7 +8318,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8347: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8321: 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
 
@@ -8365,7 +8339,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8368: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8342: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8380,23 +8354,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8383: checking for $ac_header" >&5
+echo "$as_me:8357: 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 8389 "configure"
+#line 8363 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8393: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8399: \$? = $ac_status" >&5
+  echo "$as_me:8373: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8415,7 +8389,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8418: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8428,13 +8402,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8431: checking for $ac_func" >&5
+echo "$as_me:8405: 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 8437 "configure"
+#line 8411 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8465,16 +8439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8471: \$? = $ac_status" >&5
+  echo "$as_me:8445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8477: \$? = $ac_status" >&5
+  echo "$as_me:8451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8484,7 +8458,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8487: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8461: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8498,7 +8472,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8501: checking if you want to use sysmouse" >&5
+echo "$as_me:8475: 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.
@@ -8510,7 +8484,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8513 "configure"
+#line 8487 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8533,16 +8507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8539: \$? = $ac_status" >&5
+  echo "$as_me:8513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8545: \$? = $ac_status" >&5
+  echo "$as_me:8519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8552,7 +8526,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8555: result: $cf_with_sysmouse" >&5
+echo "$as_me:8529: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8562,7 +8536,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8565: checking if you want to disable library suffixes" >&5
+echo "$as_me:8539: 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.
@@ -8579,13 +8553,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8582: result: $disable_lib_suffixes" >&5
+echo "$as_me:8556: 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:8588: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8562: 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.
@@ -8603,22 +8577,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8606: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8580: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8611: checking for updated LDFLAGS" >&5
+echo "$as_me:8585: 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:8614: result: maybe" >&5
+	echo "$as_me:8588: 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:8621: checking for $ac_word" >&5
+echo "$as_me:8595: 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
@@ -8633,7 +8607,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8636: found $ac_dir/$ac_word" >&5
+echo "$as_me:8610: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8641,10 +8615,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8644: result: $cf_ldd_prog" >&5
+  echo "$as_me:8618: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8647: result: no" >&5
+  echo "$as_me:8621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8658,7 +8632,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8661 "configure"
+#line 8635 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8670,16 +8644,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8676: \$? = $ac_status" >&5
+  echo "$as_me:8650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8682: \$? = $ac_status" >&5
+  echo "$as_me:8656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8707,7 +8681,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8710: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8684: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8719,11 +8693,11 @@ echo "${as_me:-configure}:8710: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8722: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8696: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8726: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8700: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8760,7 +8734,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8763: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8737: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8773,11 +8747,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8776: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8750: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8780: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8754: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8814,7 +8788,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8817: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8791: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8827,14 +8801,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8830: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8804: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8834: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8808: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8837: result: no" >&5
+	echo "$as_me:8811: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8848,7 +8822,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8851: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8825: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8865,7 +8839,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8868: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8842: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8873,7 +8847,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8876: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8850: 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=
 
@@ -8892,11 +8866,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8895: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8869: result: $EXTRA_SUFFIX" >&5
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8899: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8873: 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.
@@ -8906,10 +8880,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8909: result: $with_overwrite" >&5
+echo "$as_me:8883: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8912: checking if external terminfo-database is used" >&5
+echo "$as_me:8886: 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.
@@ -8919,7 +8893,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8922: result: $use_database" >&5
+echo "$as_me:8896: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8935,7 +8909,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8938: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8912: 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.
@@ -8943,10 +8917,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8946: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8920: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8949: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8923: 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.
@@ -8956,13 +8930,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8959: result: $with_hashed_db" >&5
+	echo "$as_me:8933: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8965: checking for list of fallback descriptions" >&5
+echo "$as_me:8939: 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.
@@ -8972,7 +8946,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8975: result: $with_fallback" >&5
+echo "$as_me:8949: result: $with_fallback" >&5
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
@@ -8980,7 +8954,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8983: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8957: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8996,7 +8970,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8999: checking for $ac_word" >&5
+echo "$as_me:8973: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9011,7 +8985,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9014: found $ac_dir/$ac_word" >&5
+echo "$as_me:8988: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9019,10 +8993,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9022: result: $TIC" >&5
+  echo "$as_me:8996: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9025: result: no" >&5
+  echo "$as_me:8999: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9031,7 +9005,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9034: checking for $ac_word" >&5
+echo "$as_me:9008: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9046,7 +9020,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9049: found $ac_dir/$ac_word" >&5
+echo "$as_me:9023: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9054,10 +9028,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9057: result: $ac_ct_TIC" >&5
+  echo "$as_me:9031: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9060: result: no" >&5
+  echo "$as_me:9034: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9069,7 +9043,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9072: checking for $ac_word" >&5
+echo "$as_me:9046: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9084,7 +9058,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9087: found $ac_dir/$ac_word" >&5
+echo "$as_me:9061: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9092,10 +9066,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9095: result: $INFOCMP" >&5
+  echo "$as_me:9069: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9098: result: no" >&5
+  echo "$as_me:9072: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9104,7 +9078,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9107: checking for $ac_word" >&5
+echo "$as_me:9081: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9119,7 +9093,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9122: found $ac_dir/$ac_word" >&5
+echo "$as_me:9096: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9127,10 +9101,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9130: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9104: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9133: result: no" >&5
+  echo "$as_me:9107: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9145,10 +9119,10 @@ 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:9148: checking for tic program for fallbacks" >&5
+  echo "$as_me:9122: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9151: result: $TIC" >&5
+		echo "$as_me:9125: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9176,7 +9150,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9179: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9153: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9189,7 +9163,7 @@ 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:9192: checking for $ac_word" >&5
+echo "$as_me:9166: 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
@@ -9206,7 +9180,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9209: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9183: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9217,10 +9191,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9220: result: $TIC" >&5
+  echo "$as_me:9194: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9223: result: no" >&5
+  echo "$as_me:9197: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9279,7 +9253,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9282: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9256: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9294,7 +9268,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9297: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9271: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9303,10 +9277,10 @@ 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:9306: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9280: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9309: result: $INFOCMP" >&5
+		echo "$as_me:9283: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9334,7 +9308,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9337: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9311: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9347,7 +9321,7 @@ 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:9350: checking for $ac_word" >&5
+echo "$as_me:9324: 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
@@ -9364,7 +9338,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9367: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9341: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9375,10 +9349,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9378: result: $INFOCMP" >&5
+  echo "$as_me:9352: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9381: result: no" >&5
+  echo "$as_me:9355: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9437,7 +9411,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9440: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9414: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9452,7 +9426,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9455: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9429: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9462,7 +9436,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9465: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9439: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9470,7 +9444,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9473: checking if you want modern xterm or antique" >&5
+echo "$as_me:9447: 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.
@@ -9484,7 +9458,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9487: result: $with_xterm_new" >&5
+echo "$as_me:9461: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9497,7 +9471,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9500: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9474: 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.
@@ -9518,13 +9492,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9521: result: $with_xterm_kbs" >&5
+echo "$as_me:9495: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9527: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
+	{ echo "$as_me:9501: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;}
 fi
 
@@ -9534,7 +9508,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9537: checking for list of terminfo directories" >&5
+echo "$as_me:9511: 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.
@@ -9574,7 +9548,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9577: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9551: 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; }; }
 	;;
@@ -9597,7 +9571,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9600: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9574: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9606,13 +9580,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9609: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9583: 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:9615: checking for default terminfo directory" >&5
+echo "$as_me:9589: 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.
@@ -9648,7 +9622,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9651: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9625: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9657,7 +9631,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9660: result: $TERMINFO" >&5
+echo "$as_me:9634: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9668,7 +9642,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9671: checking if big-core option selected" >&5
+echo "$as_me:9645: 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.
@@ -9680,7 +9654,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9683 "configure"
+#line 9657 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9694,15 +9668,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9700: \$? = $ac_status" >&5
+  echo "$as_me:9674: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9714,7 +9688,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9717: result: $with_big_core" >&5
+echo "$as_me:9691: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9724,7 +9698,7 @@ EOF
 ### 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:9727: checking if big-strings option selected" >&5
+echo "$as_me:9701: 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.
@@ -9748,14 +9722,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9751: result: $with_big_strings" >&5
+echo "$as_me:9725: 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:9758: checking if you want termcap-fallback support" >&5
+echo "$as_me:9732: 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.
@@ -9765,14 +9739,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9768: result: $with_termcap" >&5
+echo "$as_me:9742: 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:9775: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9749: 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
@@ -9785,13 +9759,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9788: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9762: 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:9794: checking for list of termcap files" >&5
+	echo "$as_me:9768: 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.
@@ -9831,7 +9805,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9834: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9808: 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; }; }
 	;;
@@ -9854,7 +9828,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9857: result: $TERMPATH" >&5
+	echo "$as_me:9831: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9862,7 +9836,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9865: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9839: 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.
@@ -9872,14 +9846,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9875: result: $with_getcap" >&5
+	echo "$as_me:9849: 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:9882: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9856: 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.
@@ -9889,7 +9863,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9892: result: $with_getcap_cache" >&5
+	echo "$as_me:9866: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9899,7 +9873,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9902: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9876: 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.
@@ -9909,14 +9883,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9912: result: $with_home_terminfo" >&5
+echo "$as_me:9886: 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:9919: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9893: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9926,14 +9900,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9929: result: $with_root_environ" >&5
+echo "$as_me:9903: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9936: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9910: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9943,13 +9917,30 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9946: result: $with_root_access" >&5
+echo "$as_me:9920: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
+echo "$as_me:9927: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+
+# Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+if test "${enable_setuid_environ+set}" = set; then
+  enableval="$enable_setuid_environ"
+  with_setuid_environ=$enableval
+else
+  with_setuid_environ=$with_root_environ
+fi;
+echo "$as_me:9937: result: $with_setuid_environ" >&5
+echo "${ECHO_T}$with_setuid_environ" >&6
+test "x$with_setuid_environ" = xyes &&
+cat >>confdefs.h <<\EOF
+#define USE_SETUID_ENVIRON 1
+EOF
+
 ###   Use option --enable-symlinks to make tic use symlinks, not hard links
 ###   to reduce storage requirements for the terminfo database.
 
@@ -9958,23 +9949,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9961: checking for $ac_header" >&5
+echo "$as_me:9952: 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 9967 "configure"
+#line 9958 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9971: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9962: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9977: \$? = $ac_status" >&5
+  echo "$as_me:9968: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9993,7 +9984,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9996: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9987: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10008,13 +9999,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10011: checking for $ac_func" >&5
+echo "$as_me:10002: 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 10017 "configure"
+#line 10008 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10045,16 +10036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10051: \$? = $ac_status" >&5
+  echo "$as_me:10042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10057: \$? = $ac_status" >&5
+  echo "$as_me:10048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10064,7 +10055,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10067: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10058: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10081,13 +10072,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10084: checking for $ac_func" >&5
+echo "$as_me:10075: 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 10090 "configure"
+#line 10081 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10118,16 +10109,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10124: \$? = $ac_status" >&5
+  echo "$as_me:10115: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10130: \$? = $ac_status" >&5
+  echo "$as_me:10121: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10137,7 +10128,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10140: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10131: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10148,7 +10139,7 @@ fi
 done
 
 else
-	echo "$as_me:10151: checking if link/symlink functions work" >&5
+	echo "$as_me:10142: 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
@@ -10161,7 +10152,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10164 "configure"
+#line 10155 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10195,15 +10186,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10201: \$? = $ac_status" >&5
+  echo "$as_me:10192: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10206: \$? = $ac_status" >&5
+  echo "$as_me:10197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10221,7 +10212,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10224: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10215: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10241,7 +10232,7 @@ with_symlinks=no
 # 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:10244: checking if tic should use symbolic links" >&5
+	echo "$as_me:10235: 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.
@@ -10251,21 +10242,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10254: result: $with_symlinks" >&5
+	echo "$as_me:10245: 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:10261: checking if tic should use hard links" >&5
+	echo "$as_me:10252: 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:10268: result: $with_links" >&5
+	echo "$as_me:10259: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10281,7 +10272,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10284: checking if you want broken-linker support code" >&5
+echo "$as_me:10275: 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.
@@ -10291,7 +10282,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10294: result: $with_broken_linker" >&5
+echo "$as_me:10285: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10305,7 +10296,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10308: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10299: 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.
@@ -10315,7 +10306,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10318: result: $with_bsdpad" >&5
+echo "$as_me:10309: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10334,14 +10325,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10337: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10328: 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 10344 "configure"
+#line 10335 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10360,16 +10351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  echo "$as_me:10357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10372: \$? = $ac_status" >&5
+  echo "$as_me:10363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10380,7 +10371,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10383: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10374: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10422,14 +10413,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10425: checking if this is the GNU C library" >&5
+echo "$as_me:10416: 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 10432 "configure"
+#line 10423 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10448,16 +10439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10454: \$? = $ac_status" >&5
+  echo "$as_me:10445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10460: \$? = $ac_status" >&5
+  echo "$as_me:10451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10468,7 +10459,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10471: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10462: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10476,7 +10467,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10479: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10470: 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
@@ -10488,7 +10479,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10491 "configure"
+#line 10482 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10507,16 +10498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10513: \$? = $ac_status" >&5
+  echo "$as_me:10504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10519: \$? = $ac_status" >&5
+  echo "$as_me:10510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10528,12 +10519,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10531: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10522: 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:10536: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10527: 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
@@ -10638,7 +10629,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10641 "configure"
+#line 10632 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10658,16 +10649,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:10655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10670: \$? = $ac_status" >&5
+  echo "$as_me:10661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10678,7 +10669,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10681: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10672: 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
@@ -10687,14 +10678,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10690: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10681: 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 10697 "configure"
+#line 10688 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10709,16 +10700,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10715: \$? = $ac_status" >&5
+  echo "$as_me:10706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:10712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10825,7 +10816,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10828 "configure"
+#line 10819 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10840,16 +10831,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10846: \$? = $ac_status" >&5
+  echo "$as_me:10837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10852: \$? = $ac_status" >&5
+  echo "$as_me:10843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10864,12 +10855,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10867: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10858: 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:10872: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10863: 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
@@ -10879,7 +10870,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10882 "configure"
+#line 10873 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10894,16 +10885,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10900: \$? = $ac_status" >&5
+  echo "$as_me:10891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10906: \$? = $ac_status" >&5
+  echo "$as_me:10897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10914,7 +10905,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10917: result: $cf_cv_default_source" >&5
+echo "$as_me:10908: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10951,16 +10942,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10954: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10945: 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}:10960: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10951: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10963 "configure"
+#line 10954 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10975,16 +10966,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10981: \$? = $ac_status" >&5
+  echo "$as_me:10972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10987: \$? = $ac_status" >&5
+  echo "$as_me:10978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11005,7 +10996,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11008 "configure"
+#line 10999 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11020,16 +11011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11026: \$? = $ac_status" >&5
+  echo "$as_me:11017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11032: \$? = $ac_status" >&5
+  echo "$as_me:11023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11040,7 +11031,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11034: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11048,10 +11039,10 @@ echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11051: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11042: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11054 "configure"
+#line 11045 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11066,16 +11057,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11072: \$? = $ac_status" >&5
+  echo "$as_me:11063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  echo "$as_me:11069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11091,7 +11082,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11094: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11085: 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
@@ -11208,7 +11199,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11211: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11202: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11240,14 +11231,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11243: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11234: 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 11250 "configure"
+#line 11241 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11265,16 +11256,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11271: \$? = $ac_status" >&5
+  echo "$as_me:11262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11277: \$? = $ac_status" >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11286,7 +11277,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11289 "configure"
+#line 11280 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11304,16 +11295,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11310: \$? = $ac_status" >&5
+  echo "$as_me:11301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11316: \$? = $ac_status" >&5
+  echo "$as_me:11307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11328,7 +11319,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11331: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11322: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11488,16 +11479,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11491: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11482: 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}:11497: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11488: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11500 "configure"
+#line 11491 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11512,16 +11503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11524: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11542,7 +11533,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11545 "configure"
+#line 11536 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11557,16 +11548,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11563: \$? = $ac_status" >&5
+  echo "$as_me:11554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11569: \$? = $ac_status" >&5
+  echo "$as_me:11560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11577,7 +11568,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11571: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11585,10 +11576,10 @@ echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11588: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11579: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11591 "configure"
+#line 11582 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11603,16 +11594,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11609: \$? = $ac_status" >&5
+  echo "$as_me:11600: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11615: \$? = $ac_status" >&5
+  echo "$as_me:11606: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11628,7 +11619,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11631: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11622: 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
@@ -11741,10 +11732,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11735: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11747 "configure"
+#line 11738 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11762,23 +11753,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11768: \$? = $ac_status" >&5
+  echo "$as_me:11759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11774: \$? = $ac_status" >&5
+  echo "$as_me:11765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11781: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11772: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11801,7 +11792,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11804: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11795: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11813,7 +11804,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11816: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11807: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11901,7 +11892,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11904: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11895: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11911,7 +11902,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11914: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11905: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11921,7 +11912,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11924: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11915: 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"
@@ -11933,10 +11924,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11936: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11927: 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 11939 "configure"
+#line 11930 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11951,16 +11942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11957: \$? = $ac_status" >&5
+  echo "$as_me:11948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11963: \$? = $ac_status" >&5
+  echo "$as_me:11954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11969,12 +11960,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11972: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11963: 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 11977 "configure"
+#line 11968 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11989,16 +11980,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11995: \$? = $ac_status" >&5
+  echo "$as_me:11986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12001: \$? = $ac_status" >&5
+  echo "$as_me:11992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12009,19 +12000,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12012: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12003: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12017: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12008: 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 12024 "configure"
+#line 12015 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12039,16 +12030,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12045: \$? = $ac_status" >&5
+  echo "$as_me:12036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12051: \$? = $ac_status" >&5
+  echo "$as_me:12042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12060,7 +12051,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12063 "configure"
+#line 12054 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12078,16 +12069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12084: \$? = $ac_status" >&5
+  echo "$as_me:12075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12090: \$? = $ac_status" >&5
+  echo "$as_me:12081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12102,7 +12093,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12105: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12096: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12253,14 +12244,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12256: checking if SIGWINCH is defined" >&5
+echo "$as_me:12247: 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 12263 "configure"
+#line 12254 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12275,23 +12266,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12281: \$? = $ac_status" >&5
+  echo "$as_me:12272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12278: \$? = $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 12294 "configure"
+#line 12285 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12309,16 +12300,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12315: \$? = $ac_status" >&5
+  echo "$as_me:12306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12321: \$? = $ac_status" >&5
+  echo "$as_me:12312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12332,11 +12323,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12335: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12326: 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:12339: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12330: 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
@@ -12347,7 +12338,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12350 "configure"
+#line 12341 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12369,16 +12360,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12375: \$? = $ac_status" >&5
+  echo "$as_me:12366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12381: \$? = $ac_status" >&5
+  echo "$as_me:12372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12392,7 +12383,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12395: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12386: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12402,13 +12393,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12405: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12396: 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 12411 "configure"
+#line 12402 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12422,16 +12413,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12428: \$? = $ac_status" >&5
+  echo "$as_me:12419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12434: \$? = $ac_status" >&5
+  echo "$as_me:12425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12442,7 +12433,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12445: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12436: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12456,7 +12447,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12459: checking if you want wide-character code" >&5
+echo "$as_me:12450: 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.
@@ -12466,7 +12457,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:12469: result: $with_widec" >&5
+echo "$as_me:12460: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12488,7 +12479,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12491: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12482: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12501,23 +12492,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12504: checking for $ac_header" >&5
+echo "$as_me:12495: 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 12510 "configure"
+#line 12501 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12505: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12520: \$? = $ac_status" >&5
+  echo "$as_me:12511: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12536,7 +12527,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12539: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12530: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12546,14 +12537,14 @@ EOF
 fi
 done
 
-echo "$as_me:12549: checking if wchar.h can be used as is" >&5
+echo "$as_me:12540: 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 12556 "configure"
+#line 12547 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12575,16 +12566,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12581: \$? = $ac_status" >&5
+  echo "$as_me:12572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12587: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12594,16 +12585,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12597: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12588: 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:12603: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12594: 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 12606 "configure"
+#line 12597 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12619,16 +12610,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12625: \$? = $ac_status" >&5
+  echo "$as_me:12616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12631: \$? = $ac_status" >&5
+  echo "$as_me:12622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12637,16 +12628,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12640: result: $cf_result" >&5
+echo "$as_me:12631: 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:12646: checking checking for compatible value versus " >&5
+	echo "$as_me:12637: 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 12649 "configure"
+#line 12640 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12662,16 +12653,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
+  echo "$as_me:12659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12674: \$? = $ac_status" >&5
+  echo "$as_me:12665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12680,7 +12671,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12683: result: $cf_result" >&5
+	echo "$as_me:12674: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12690,7 +12681,7 @@ fi
 
 fi
 
-echo "$as_me:12693: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12684: 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
@@ -12761,7 +12752,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12764 "configure"
+#line 12755 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12806,15 +12797,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12812: \$? = $ac_status" >&5
+  echo "$as_me:12803: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12817: \$? = $ac_status" >&5
+  echo "$as_me:12808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12827,7 +12818,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12830: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12821: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12838,13 +12829,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12841: checking for $ac_func" >&5
+echo "$as_me:12832: 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 12847 "configure"
+#line 12838 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12875,16 +12866,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12881: \$? = $ac_status" >&5
+  echo "$as_me:12872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12887: \$? = $ac_status" >&5
+  echo "$as_me:12878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12894,7 +12885,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12897: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12909,23 +12900,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12912: checking for $ac_header" >&5
+echo "$as_me:12903: 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 12918 "configure"
+#line 12909 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12928: \$? = $ac_status" >&5
+  echo "$as_me:12919: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12944,7 +12935,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12938: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12954,7 +12945,7 @@ EOF
 fi
 done
 
-echo "$as_me:12957: checking for multibyte character support" >&5
+echo "$as_me:12948: 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
@@ -12962,7 +12953,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12965 "configure"
+#line 12956 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12979,16 +12970,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12985: \$? = $ac_status" >&5
+  echo "$as_me:12976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12991: \$? = $ac_status" >&5
+  echo "$as_me:12982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13000,12 +12991,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13003: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12994: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13008 "configure"
+#line 12999 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13018,16 +13009,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13024: \$? = $ac_status" >&5
+  echo "$as_me:13015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13030: \$? = $ac_status" >&5
+  echo "$as_me:13021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13041,7 +13032,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13044 "configure"
+#line 13035 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13054,16 +13045,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13060: \$? = $ac_status" >&5
+  echo "$as_me:13051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13066: \$? = $ac_status" >&5
+  echo "$as_me:13057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13080,9 +13071,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13083: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13074: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13085: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13076: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13173,7 +13164,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13167: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13181,7 +13172,7 @@ echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13184 "configure"
+#line 13175 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13194,21 +13185,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13200: \$? = $ac_status" >&5
+  echo "$as_me:13191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13206: \$? = $ac_status" >&5
+  echo "$as_me:13197: \$? = $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}:13211: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13202: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13226,7 +13217,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13229: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13220: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13301,13 +13292,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13304: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13295: 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 13310 "configure"
+#line 13301 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13320,21 +13311,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13326: \$? = $ac_status" >&5
+  echo "$as_me:13317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13332: \$? = $ac_status" >&5
+  echo "$as_me:13323: \$? = $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}:13337: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13328: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13376,7 +13367,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13379: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13370: 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
@@ -13414,7 +13405,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13417 "configure"
+#line 13408 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13426,16 +13417,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13432: \$? = $ac_status" >&5
+  echo "$as_me:13423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13438: \$? = $ac_status" >&5
+  echo "$as_me:13429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13452,7 +13443,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13455: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13446: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13488,7 +13479,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13482: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13520,14 +13511,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13523: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13514: 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 13530 "configure"
+#line 13521 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13545,23 +13536,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13551: \$? = $ac_status" >&5
+  echo "$as_me:13542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13557: \$? = $ac_status" >&5
+  echo "$as_me:13548: \$? = $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 13564 "configure"
+#line 13555 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13580,16 +13571,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13586: \$? = $ac_status" >&5
+  echo "$as_me:13577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13592: \$? = $ac_status" >&5
+  echo "$as_me:13583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13601,7 +13592,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13604: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13595: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13619,14 +13610,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13622: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13613: 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 13629 "configure"
+#line 13620 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13644,23 +13635,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13650: \$? = $ac_status" >&5
+  echo "$as_me:13641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13656: \$? = $ac_status" >&5
+  echo "$as_me:13647: \$? = $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 13663 "configure"
+#line 13654 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13679,16 +13670,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13685: \$? = $ac_status" >&5
+  echo "$as_me:13676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13691: \$? = $ac_status" >&5
+  echo "$as_me:13682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13700,7 +13691,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13703: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13694: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13723,14 +13714,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13726: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13717: 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 13733 "configure"
+#line 13724 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13748,23 +13739,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13754: \$? = $ac_status" >&5
+  echo "$as_me:13745: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13760: \$? = $ac_status" >&5
+  echo "$as_me:13751: \$? = $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 13767 "configure"
+#line 13758 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13783,16 +13774,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13789: \$? = $ac_status" >&5
+  echo "$as_me:13780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13795: \$? = $ac_status" >&5
+  echo "$as_me:13786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13804,7 +13795,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13807: result: $cf_cv_wint_t" >&5
+echo "$as_me:13798: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13836,7 +13827,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13839: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13830: 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.
@@ -13846,7 +13837,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13849: result: $with_lp64" >&5
+echo "$as_me:13840: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13862,7 +13853,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13865: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13856: 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
@@ -13874,7 +13865,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13877 "configure"
+#line 13868 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13894,16 +13885,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13900: \$? = $ac_status" >&5
+  echo "$as_me:13891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13906: \$? = $ac_status" >&5
+  echo "$as_me:13897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13913,16 +13904,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13919: \$? = $ac_status" >&5
+  echo "$as_me:13910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13925: \$? = $ac_status" >&5
+  echo "$as_me:13916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13936,13 +13927,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13939: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13930: 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:13945: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13936: 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
@@ -13950,7 +13941,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13953 "configure"
+#line 13944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13970,16 +13961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:13967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13982: \$? = $ac_status" >&5
+  echo "$as_me:13973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13988,7 +13979,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13991 "configure"
+#line 13982 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14009,16 +14000,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14015: \$? = $ac_status" >&5
+  echo "$as_me:14006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:14012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14029,7 +14020,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14032: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14023: 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
 
@@ -14039,7 +14030,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14042: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14033: 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
@@ -14047,7 +14038,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14050 "configure"
+#line 14041 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14067,16 +14058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14073: \$? = $ac_status" >&5
+  echo "$as_me:14064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14079: \$? = $ac_status" >&5
+  echo "$as_me:14070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14085,7 +14076,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14088 "configure"
+#line 14079 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14106,16 +14097,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14112: \$? = $ac_status" >&5
+  echo "$as_me:14103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14118: \$? = $ac_status" >&5
+  echo "$as_me:14109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14126,7 +14117,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14129: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14120: 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
 
@@ -14139,7 +14130,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14142: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14133: 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
@@ -14147,7 +14138,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14150 "configure"
+#line 14141 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14159,16 +14150,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14165: \$? = $ac_status" >&5
+  echo "$as_me:14156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14171: \$? = $ac_status" >&5
+  echo "$as_me:14162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14177,7 +14168,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14180 "configure"
+#line 14171 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14190,16 +14181,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14196: \$? = $ac_status" >&5
+  echo "$as_me:14187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14202: \$? = $ac_status" >&5
+  echo "$as_me:14193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14210,7 +14201,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14213: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14204: 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
 
@@ -14224,13 +14215,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14227: checking for fseeko" >&5
+echo "$as_me:14218: 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 14233 "configure"
+#line 14224 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14242,16 +14233,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14248: \$? = $ac_status" >&5
+  echo "$as_me:14239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14254: \$? = $ac_status" >&5
+  echo "$as_me:14245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14261,7 +14252,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14264: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14255: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14300,14 +14291,14 @@ fi
 
 	fi
 
-	echo "$as_me:14303: checking whether to use struct dirent64" >&5
+	echo "$as_me:14294: 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 14310 "configure"
+#line 14301 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14330,16 +14321,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14336: \$? = $ac_status" >&5
+  echo "$as_me:14327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14342: \$? = $ac_status" >&5
+  echo "$as_me:14333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14350,7 +14341,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14353: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14344: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14360,7 +14351,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14363: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14354: 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.
@@ -14370,14 +14361,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14373: result: $with_tparm_varargs" >&5
+echo "$as_me:14364: 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:14380: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14371: 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.
@@ -14387,14 +14378,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14390: result: $with_tic_depends" >&5
+echo "$as_me:14381: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14397: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14388: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14406,15 +14397,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14409: result: no" >&5
+	echo "$as_me:14400: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14413: result: yes" >&5
+	echo "$as_me:14404: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14417: checking for X11 rgb file" >&5
+echo "$as_me:14408: 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.
@@ -14478,7 +14469,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14481: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14472: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14486,7 +14477,7 @@ esac
 
 fi
 
-echo "$as_me:14489: result: $RGB_PATH" >&5
+echo "$as_me:14480: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14500,7 +14491,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14503: checking for type of bool" >&5
+echo "$as_me:14494: 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.
@@ -14510,10 +14501,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14513: result: $NCURSES_BOOL" >&5
+echo "$as_me:14504: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14516: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14507: 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.
@@ -14525,15 +14516,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14528: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14519: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14532: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14523: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14536: checking for type of chtype" >&5
+echo "$as_me:14527: 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.
@@ -14543,11 +14534,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14546: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14537: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14550: checking for type of ospeed" >&5
+echo "$as_me:14541: 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.
@@ -14557,11 +14548,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14560: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14551: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14564: checking for type of mmask_t" >&5
+echo "$as_me:14555: 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.
@@ -14571,11 +14562,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14574: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14565: 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:14578: checking for size CCHARW_MAX" >&5
+echo "$as_me:14569: 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.
@@ -14585,16 +14576,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14588: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14579: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14591: checking for signed char" >&5
+echo "$as_me:14582: 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 14597 "configure"
+#line 14588 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14609,16 +14600,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14615: \$? = $ac_status" >&5
+  echo "$as_me:14606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14621: \$? = $ac_status" >&5
+  echo "$as_me:14612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14628,10 +14619,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14631: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14622: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14634: checking size of signed char" >&5
+echo "$as_me:14625: 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
@@ -14640,7 +14631,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14643 "configure"
+#line 14634 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14652,21 +14643,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14658: \$? = $ac_status" >&5
+  echo "$as_me:14649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14664: \$? = $ac_status" >&5
+  echo "$as_me:14655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14669 "configure"
+#line 14660 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14678,16 +14669,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14684: \$? = $ac_status" >&5
+  echo "$as_me:14675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14690: \$? = $ac_status" >&5
+  echo "$as_me:14681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14703,7 +14694,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14706 "configure"
+#line 14697 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14715,16 +14706,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14721: \$? = $ac_status" >&5
+  echo "$as_me:14712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14727: \$? = $ac_status" >&5
+  echo "$as_me:14718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14740,7 +14731,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14743 "configure"
+#line 14734 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14752,16 +14743,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14758: \$? = $ac_status" >&5
+  echo "$as_me:14749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14764: \$? = $ac_status" >&5
+  echo "$as_me:14755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14774,12 +14765,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14777: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14768: 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 14782 "configure"
+#line 14773 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14795,15 +14786,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14801: \$? = $ac_status" >&5
+  echo "$as_me:14792: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14806: \$? = $ac_status" >&5
+  echo "$as_me:14797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14819,7 +14810,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14822: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14813: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14830,7 +14821,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14833: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14824: 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.
@@ -14840,12 +14831,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14843: result: $with_signed_char" >&5
+echo "$as_me:14834: 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:14848: checking for type of tparm args" >&5
+echo "$as_me:14839: 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.
@@ -14855,11 +14846,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14858: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14849: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14862: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14853: 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.
@@ -14869,7 +14860,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14872: result: $with_rcs_ids" >&5
+echo "$as_me:14863: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14878,7 +14869,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14881: checking format of man-pages" >&5
+echo "$as_me:14872: 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.
@@ -14969,10 +14960,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14972: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14963: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14975: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14966: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15011,7 +15002,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15014: checking for manpage renaming" >&5
+echo "$as_me:15005: 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.
@@ -15040,15 +15031,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15043: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15034: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15048: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15039: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15051: checking if manpage aliases will be installed" >&5
+echo "$as_me:15042: 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.
@@ -15059,7 +15050,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15062: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15053: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15073,7 +15064,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15076: checking if manpage symlinks should be used" >&5
+echo "$as_me:15067: 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.
@@ -15086,17 +15077,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15089: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15080: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15095: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15086: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15099: checking for manpage tbl" >&5
+echo "$as_me:15090: 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.
@@ -15107,7 +15098,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15110: result: $MANPAGE_TBL" >&5
+echo "$as_me:15101: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15414,7 +15405,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15417: checking if you want to build with function extensions" >&5
+echo "$as_me:15408: 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.
@@ -15424,7 +15415,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15427: result: $with_ext_funcs" >&5
+echo "$as_me:15418: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15484,7 +15475,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15487: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15478: 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.
@@ -15494,7 +15485,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15497: result: $with_sp_funcs" >&5
+echo "$as_me:15488: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15513,7 +15504,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15516: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15507: 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.
@@ -15523,7 +15514,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15526: result: $with_term_driver" >&5
+echo "$as_me:15517: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15532,19 +15523,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15535: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15526: 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:15540: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15531: 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:15547: checking for extended use of const keyword" >&5
+echo "$as_me:15538: 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.
@@ -15554,7 +15545,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15557: result: $with_ext_const" >&5
+echo "$as_me:15548: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15562,7 +15553,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15565: checking if you want to use extended colors" >&5
+echo "$as_me:15556: 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.
@@ -15572,12 +15563,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15575: result: $with_ext_colors" >&5
+echo "$as_me:15566: 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:15580: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15571: 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)
@@ -15588,7 +15579,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15591: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15582: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15616,7 +15607,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15619: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15610: 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.
@@ -15626,7 +15617,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15629: result: $with_ext_mouse" >&5
+echo "$as_me:15620: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15636,7 +15627,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15639: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15630: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15657,7 +15648,7 @@ case $cf_cv_abi_default in
 esac
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15660: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15651: 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.
@@ -15667,7 +15658,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15670: result: $with_ext_putwin" >&5
+echo "$as_me:15661: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15677,7 +15668,7 @@ EOF
 
 fi
 
-echo "$as_me:15680: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15671: 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.
@@ -15687,7 +15678,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15690: result: $with_no_padding" >&5
+echo "$as_me:15681: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15695,7 +15686,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15698: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15689: 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.
@@ -15705,7 +15696,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15708: result: $with_sigwinch" >&5
+echo "$as_me:15699: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15713,7 +15704,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15716: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15707: 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.
@@ -15723,14 +15714,14 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15726: result: $with_tcap_names" >&5
+echo "$as_me:15717: 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:15733: checking if you want to link with the pthread library" >&5
+echo "$as_me:15724: 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.
@@ -15740,27 +15731,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15743: result: $with_pthread" >&5
+echo "$as_me:15734: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15747: checking for pthread.h" >&5
+	echo "$as_me:15738: 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 15753 "configure"
+#line 15744 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15757: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15748: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15763: \$? = $ac_status" >&5
+  echo "$as_me:15754: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15779,7 +15770,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15782: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15773: 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
 
@@ -15789,7 +15780,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15792: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15783: 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"
 
@@ -15810,7 +15801,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15813 "configure"
+#line 15804 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15827,16 +15818,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15833: \$? = $ac_status" >&5
+  echo "$as_me:15824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15839: \$? = $ac_status" >&5
+  echo "$as_me:15830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15846,7 +15837,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15849: result: $with_pthread" >&5
+	    echo "$as_me:15840: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15874,7 +15865,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15877: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15868: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15884,13 +15875,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15887: checking for pthread_kill" >&5
+	echo "$as_me:15878: 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 15893 "configure"
+#line 15884 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15921,16 +15912,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15927: \$? = $ac_status" >&5
+  echo "$as_me:15918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15933: \$? = $ac_status" >&5
+  echo "$as_me:15924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15940,11 +15931,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15943: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15934: 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:15947: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15938: 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.
@@ -15954,7 +15945,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15957: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15948: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15965,7 +15956,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15968: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15959: 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.
@@ -15975,18 +15966,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15978: result: $use_weak_symbols" >&5
+	echo "$as_me:15969: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15982: checking if $CC supports weak symbols" >&5
+echo "$as_me:15973: 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 15989 "configure"
+#line 15980 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16012,16 +16003,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16018: \$? = $ac_status" >&5
+  echo "$as_me:16009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16024: \$? = $ac_status" >&5
+  echo "$as_me:16015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16032,7 +16023,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16035: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16026: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16082,7 +16073,7 @@ fi
 # 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:16085: checking if you want reentrant code" >&5
+echo "$as_me:16076: 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.
@@ -16092,7 +16083,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16095: result: $with_reentrant" >&5
+echo "$as_me:16086: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16181,7 +16172,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16184: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16175: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16193,7 +16184,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16196: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16187: 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.
@@ -16215,16 +16206,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16218: result: $enable_opaque_curses" >&5
+echo "$as_me:16209: 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:16223: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16214: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16227: checking if you want opaque form-library structures" >&5
+echo "$as_me:16218: 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.
@@ -16234,10 +16225,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16237: result: $enable_opaque_form" >&5
+echo "$as_me:16228: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16240: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16231: 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.
@@ -16247,10 +16238,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16250: result: $enable_opaque_menu" >&5
+echo "$as_me:16241: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16253: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16244: 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.
@@ -16260,7 +16251,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16263: result: $enable_opaque_panel" >&5
+echo "$as_me:16254: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16270,7 +16261,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16273: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16264: 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.
@@ -16280,7 +16271,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16283: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16274: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16293,7 +16284,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16296: checking if you want all development code" >&5
+echo "$as_me:16287: 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.
@@ -16303,11 +16294,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16306: result: $with_develop" >&5
+echo "$as_me:16297: 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:16310: checking if you want hard-tabs code" >&5
+echo "$as_me:16301: 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.
@@ -16317,7 +16308,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16320: result: $enable_hard_tabs" >&5
+echo "$as_me:16311: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16325,7 +16316,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16328: checking if you want limited support for xmc" >&5
+echo "$as_me:16319: 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.
@@ -16335,7 +16326,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16338: result: $enable_xmc_glitch" >&5
+echo "$as_me:16329: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16345,7 +16336,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16348: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16339: 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.
@@ -16355,7 +16346,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16358: result: $with_assumed_color" >&5
+echo "$as_me:16349: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16363,7 +16354,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16366: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16357: 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.
@@ -16373,7 +16364,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16376: result: $with_hashmap" >&5
+echo "$as_me:16367: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16381,7 +16372,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16384: checking if you want colorfgbg code" >&5
+echo "$as_me:16375: 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.
@@ -16391,7 +16382,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16394: result: $with_colorfgbg" >&5
+echo "$as_me:16385: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16399,7 +16390,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16402: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16393: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16409,14 +16400,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16412: result: $cf_with_fvisibility" >&5
+echo "$as_me:16403: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16419: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16410: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16425,7 +16416,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16428 "configure"
+#line 16419 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16441,16 +16432,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16447: \$? = $ac_status" >&5
+  echo "$as_me:16438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16453: \$? = $ac_status" >&5
+  echo "$as_me:16444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16462,7 +16453,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16465: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16456: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16577,7 +16568,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16580: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16571: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16586,7 +16577,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16589 "configure"
+#line 16580 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16602,16 +16593,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16608: \$? = $ac_status" >&5
+  echo "$as_me:16599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16614: \$? = $ac_status" >&5
+  echo "$as_me:16605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16623,7 +16614,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16626: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16617: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16746,7 +16737,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16749: checking if you want interop bindings" >&5
+echo "$as_me:16740: 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.
@@ -16756,13 +16747,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16759: result: $with_exp_interop" >&5
+echo "$as_me:16750: 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:16765: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16756: 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.
@@ -16772,13 +16763,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16775: result: $with_safe_sprintf" >&5
+echo "$as_me:16766: 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:16781: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16772: 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.
@@ -16788,7 +16779,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16791: result: $with_scroll_hints" >&5
+echo "$as_me:16782: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16797,7 +16788,7 @@ EOF
 
 fi
 
-echo "$as_me:16800: checking if you want wgetch-events code" >&5
+echo "$as_me:16791: 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.
@@ -16807,7 +16798,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16810: result: $with_wgetch_events" >&5
+echo "$as_me:16801: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16822,7 +16813,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16825: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16816: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16832,7 +16823,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16835: result: $with_exp_win32" >&5
+	echo "$as_me:16826: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16858,7 +16849,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16861: checking if you want to see long compiling messages" >&5
+echo "$as_me:16852: 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.
@@ -16892,7 +16883,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16895: result: $enableval" >&5
+echo "$as_me:16886: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16905,7 +16896,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16908: checking if you want to install stripped executables" >&5
+echo "$as_me:16899: 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.
@@ -16922,7 +16913,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16925: result: $enable_stripping" >&5
+echo "$as_me:16916: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16933,7 +16924,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16936: checking if install accepts -p option" >&5
+echo "$as_me:16927: 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
@@ -16964,10 +16955,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16967: result: $cf_cv_install_p" >&5
+echo "$as_me:16958: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16970: checking if install needs to be told about ownership" >&5
+echo "$as_me:16961: 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)
@@ -16978,7 +16969,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16981: result: $with_install_o" >&5
+echo "$as_me:16972: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17003,7 +16994,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17006: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:16997: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17020,17 +17011,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17023: result: $enable_stdnoreturn" >&5
+echo "$as_me:17014: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17027: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17018: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17033 "configure"
+#line 17024 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17046,16 +17037,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17052: \$? = $ac_status" >&5
+  echo "$as_me:17043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17058: \$? = $ac_status" >&5
+  echo "$as_me:17049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17066,7 +17057,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17069: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17060: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17122,16 +17113,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17125: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17130: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17121: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17134: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17170,16 +17161,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17173: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17178: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17169: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17182: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17218,23 +17209,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17221: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17226: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17217: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17230: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17237: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17228: 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.
@@ -17251,7 +17242,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17254: result: $enable_warnings" >&5
+echo "$as_me:17245: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17275,7 +17266,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17278 "configure"
+#line 17269 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17290,26 +17281,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17296: \$? = $ac_status" >&5
+  echo "$as_me:17287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17302: \$? = $ac_status" >&5
+  echo "$as_me:17293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17305: checking for X11/Xt const-feature" >&5
+echo "$as_me:17296: 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 17312 "configure"
+#line 17303 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17326,16 +17317,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17332: \$? = $ac_status" >&5
+  echo "$as_me:17323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17338: \$? = $ac_status" >&5
+  echo "$as_me:17329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17350,7 +17341,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17353: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17344: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17379,7 +17370,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17382 "${as_me:-configure}"
+#line 17373 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17395,7 +17386,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17398: checking for $CC warning options..." >&5
+	{ echo "$as_me:17389: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17411,12 +17402,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17414: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17417: \$? = $ac_status" >&5
+  echo "$as_me:17408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17419: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17410: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17424,7 +17415,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17427: checking for $CC warning options..." >&5
+	{ echo "$as_me:17418: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17447,12 +17438,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17450: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17453: \$? = $ac_status" >&5
+  echo "$as_me:17444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17455: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17446: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17460,7 +17451,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17463: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17454: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17470,7 +17461,7 @@ echo "${as_me:-configure}:17463: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17473: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17464: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17503,10 +17494,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17506: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17497: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17509 "${as_me:-configure}"
+#line 17500 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17556,12 +17547,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17559: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17550: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17562: \$? = $ac_status" >&5
+  echo "$as_me:17553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17564: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17555: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17633,12 +17624,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17636: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17627: 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 17641 "configure"
+#line 17632 "configure"
 #include "confdefs.h"
 
 int
@@ -17655,16 +17646,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17661: \$? = $ac_status" >&5
+  echo "$as_me:17652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17667: \$? = $ac_status" >&5
+  echo "$as_me:17658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17675,7 +17666,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17678: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17669: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17684,11 +17675,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17687: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17678: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17691 "configure"
+#line 17682 "configure"
 #include "confdefs.h"
 
 int
@@ -17705,16 +17696,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17711: \$? = $ac_status" >&5
+  echo "$as_me:17702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17717: \$? = $ac_status" >&5
+  echo "$as_me:17708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17724,7 +17715,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17727: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17718: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17733,30 +17724,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17736: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17727: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17743: checking version of $CC" >&5
+	echo "$as_me:17734: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17747: result: $CLANG_VERSION" >&5
+	echo "$as_me:17738: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17754: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17745: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17759 "configure"
+#line 17750 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17770,16 +17761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17776: \$? = $ac_status" >&5
+  echo "$as_me:17767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17782: \$? = $ac_status" >&5
+  echo "$as_me:17773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17790,13 +17781,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17793: result: $cf_clang_optok" >&5
+		echo "$as_me:17784: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17799: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17790: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17813,7 +17804,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17816 "configure"
+#line 17807 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17831,7 +17822,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17834: checking for $CC warning options..." >&5
+	{ echo "$as_me:17825: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17848,12 +17839,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17851: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17854: \$? = $ac_status" >&5
+  echo "$as_me:17845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17856: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17847: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17862,7 +17853,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17865: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17856: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17892,16 +17883,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17895: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17898: \$? = $ac_status" >&5
+  echo "$as_me:17889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17900: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17891: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17904: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17895: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17919,7 +17910,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17922: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17913: 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.
@@ -17929,7 +17920,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:17932: result: $enable_string_hacks" >&5
+echo "$as_me:17923: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -17938,15 +17929,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:17941: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:17932: 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:17943: checking for strlcat" >&5
+	echo "$as_me:17934: 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 17949 "configure"
+#line 17940 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17977,16 +17968,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17983: \$? = $ac_status" >&5
+  echo "$as_me:17974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17989: \$? = $ac_status" >&5
+  echo "$as_me:17980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -17996,7 +17987,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17999: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:17990: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18006,7 +17997,7 @@ EOF
 
 else
 
-		echo "$as_me:18009: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18000: 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
@@ -18014,7 +18005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18017 "configure"
+#line 18008 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18033,16 +18024,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18039: \$? = $ac_status" >&5
+  echo "$as_me:18030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18045: \$? = $ac_status" >&5
+  echo "$as_me:18036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18053,7 +18044,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18056: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18047: 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
 
@@ -18076,23 +18067,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18079: checking for $ac_header" >&5
+echo "$as_me:18070: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18085 "configure"
+#line 18076 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18080: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18095: \$? = $ac_status" >&5
+  echo "$as_me:18086: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18111,7 +18102,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18114: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18132,13 +18123,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18135: checking for $ac_func" >&5
+echo "$as_me:18126: 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 18141 "configure"
+#line 18132 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18169,16 +18160,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18175: \$? = $ac_status" >&5
+  echo "$as_me:18166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18181: \$? = $ac_status" >&5
+  echo "$as_me:18172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18188,7 +18179,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18191: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18182: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18201,7 +18192,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18204: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18195: 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.
@@ -18211,7 +18202,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18214: result: $with_assertions" >&5
+echo "$as_me:18205: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18227,7 +18218,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18230: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18221: 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.
@@ -18249,7 +18240,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18252: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18243: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18363,23 +18354,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18366: checking for dmalloc.h" >&5
+	echo "$as_me:18357: 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 18372 "configure"
+#line 18363 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18376: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18382: \$? = $ac_status" >&5
+  echo "$as_me:18373: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18398,11 +18389,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18401: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18392: 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:18405: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18396: 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
@@ -18410,7 +18401,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18413 "configure"
+#line 18404 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18429,16 +18420,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18435: \$? = $ac_status" >&5
+  echo "$as_me:18426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18441: \$? = $ac_status" >&5
+  echo "$as_me:18432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18449,7 +18440,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18452: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18443: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18464,7 +18455,7 @@ fi
 
 fi
 
-echo "$as_me:18467: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18458: 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.
@@ -18486,7 +18477,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18489: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18480: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18600,23 +18591,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18603: checking for dbmalloc.h" >&5
+	echo "$as_me:18594: 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 18609 "configure"
+#line 18600 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18613: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18619: \$? = $ac_status" >&5
+  echo "$as_me:18610: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18635,11 +18626,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18638: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18629: 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:18642: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18633: 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
@@ -18647,7 +18638,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18650 "configure"
+#line 18641 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18666,16 +18657,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18672: \$? = $ac_status" >&5
+  echo "$as_me:18663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18678: \$? = $ac_status" >&5
+  echo "$as_me:18669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18686,7 +18677,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18689: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18680: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18701,7 +18692,7 @@ fi
 
 fi
 
-echo "$as_me:18704: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18695: 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.
@@ -18723,7 +18714,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18726: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18717: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18836,7 +18827,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18839: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18830: 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.
@@ -18847,7 +18838,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18850: result: $with_no_leaks" >&5
+echo "$as_me:18841: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18899,7 +18890,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18902: checking whether to add trace feature to all models" >&5
+echo "$as_me:18893: 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.
@@ -18909,7 +18900,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18912: result: $cf_with_trace" >&5
+echo "$as_me:18903: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19023,7 +19014,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19026: checking if we want to use GNAT projects" >&5
+echo "$as_me:19017: 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.
@@ -19040,7 +19031,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19043: result: $enable_gnat_projects" >&5
+echo "$as_me:19034: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19053,14 +19044,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19056: checking if ssp library is needed" >&5
+echo "$as_me:19047: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19063 "configure"
+#line 19054 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19077,16 +19068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19083: \$? = $ac_status" >&5
+  echo "$as_me:19074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19089: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19096,7 +19087,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19099 "configure"
+#line 19090 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19113,16 +19104,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19119: \$? = $ac_status" >&5
+  echo "$as_me:19110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19125: \$? = $ac_status" >&5
+  echo "$as_me:19116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19136,7 +19127,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19139: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19130: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19165,14 +19156,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19168: checking if -lm needed for math functions" >&5
+echo "$as_me:19159: 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 19175 "configure"
+#line 19166 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19188,16 +19179,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19182: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19194: \$? = $ac_status" >&5
+  echo "$as_me:19185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19200: \$? = $ac_status" >&5
+  echo "$as_me:19191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19207,7 +19198,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19210: result: $cf_cv_need_libm" >&5
+echo "$as_me:19201: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19215,14 +19206,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19218: checking if -lm is available for math functions" >&5
+	echo "$as_me:19209: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19225 "configure"
+#line 19216 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19238,16 +19229,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19244: \$? = $ac_status" >&5
+  echo "$as_me:19235: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19250: \$? = $ac_status" >&5
+  echo "$as_me:19241: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19257,7 +19248,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19260: result: $cf_cv_have_libm" >&5
+echo "$as_me:19251: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19279,13 +19270,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19282: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19273: 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 19288 "configure"
+#line 19279 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19301,16 +19292,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19307: \$? = $ac_status" >&5
+  echo "$as_me:19298: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19313: \$? = $ac_status" >&5
+  echo "$as_me:19304: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19320,7 +19311,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19323: result: $ac_cv_header_time" >&5
+echo "$as_me:19314: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19335,7 +19326,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19338: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19329: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19343,7 +19334,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19346 "configure"
+#line 19337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19362,16 +19353,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19368: \$? = $ac_status" >&5
+  echo "$as_me:19359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19374: \$? = $ac_status" >&5
+  echo "$as_me:19365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19382,11 +19373,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19385: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19376: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19389: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19380: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19394,7 +19385,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19397 "configure"
+#line 19388 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19413,16 +19404,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19419: \$? = $ac_status" >&5
+  echo "$as_me:19410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19425: \$? = $ac_status" >&5
+  echo "$as_me:19416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19433,7 +19424,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19436: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19427: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19455,7 +19446,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19458: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19449: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19463,7 +19454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19466 "configure"
+#line 19457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19482,16 +19473,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19488: \$? = $ac_status" >&5
+  echo "$as_me:19479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19494: \$? = $ac_status" >&5
+  echo "$as_me:19485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19502,7 +19493,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19505: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19496: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19524,7 +19515,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19527: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19518: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19532,7 +19523,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19535 "configure"
+#line 19526 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19551,16 +19542,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19557: \$? = $ac_status" >&5
+  echo "$as_me:19548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19563: \$? = $ac_status" >&5
+  echo "$as_me:19554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19571,7 +19562,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19574: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19565: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19613,7 +19604,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19616: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19607: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19621,7 +19612,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19624 "configure"
+#line 19615 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19640,16 +19631,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19646: \$? = $ac_status" >&5
+  echo "$as_me:19637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19652: \$? = $ac_status" >&5
+  echo "$as_me:19643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19660,7 +19651,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19663: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19654: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19688,13 +19679,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19691: checking for regcomp" >&5
+	echo "$as_me:19682: 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 19697 "configure"
+#line 19688 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19725,16 +19716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19731: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19737: \$? = $ac_status" >&5
+  echo "$as_me:19728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19744,7 +19735,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19747: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19738: 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
@@ -19753,7 +19744,7 @@ else
 		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:19756: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19747: 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
@@ -19761,7 +19752,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19764 "configure"
+#line 19755 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19780,16 +19771,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:19777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19792: \$? = $ac_status" >&5
+  echo "$as_me:19783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19800,7 +19791,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19803: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19794: 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
 
@@ -19832,13 +19823,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19835: checking for compile" >&5
+	echo "$as_me:19826: 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 19841 "configure"
+#line 19832 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19869,16 +19860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19875: \$? = $ac_status" >&5
+  echo "$as_me:19866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19881: \$? = $ac_status" >&5
+  echo "$as_me:19872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19888,13 +19879,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19891: result: $ac_cv_func_compile" >&5
+echo "$as_me:19882: 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:19897: checking for compile in -lgen" >&5
+		echo "$as_me:19888: 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
@@ -19902,7 +19893,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19905 "configure"
+#line 19896 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19921,16 +19912,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19927: \$? = $ac_status" >&5
+  echo "$as_me:19918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19933: \$? = $ac_status" >&5
+  echo "$as_me:19924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -19941,7 +19932,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19944: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:19935: 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
 
@@ -19969,11 +19960,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:19972: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:19963: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:19976: checking for regular-expression headers" >&5
+echo "$as_me:19967: 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
@@ -19985,7 +19976,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19988 "configure"
+#line 19979 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20002,16 +19993,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20008: \$? = $ac_status" >&5
+  echo "$as_me:19999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20014: \$? = $ac_status" >&5
+  echo "$as_me:20005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20028,7 +20019,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20031 "configure"
+#line 20022 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20048,16 +20039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20054: \$? = $ac_status" >&5
+  echo "$as_me:20045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20060: \$? = $ac_status" >&5
+  echo "$as_me:20051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20073,11 +20064,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20076: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20067: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20080: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20071: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20115,23 +20106,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20118: checking for $ac_header" >&5
+echo "$as_me:20109: 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 20124 "configure"
+#line 20115 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20134: \$? = $ac_status" >&5
+  echo "$as_me:20125: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20150,7 +20141,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20153: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20163,23 +20154,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20166: checking for $ac_header" >&5
+echo "$as_me:20157: 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 20172 "configure"
+#line 20163 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20176: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20167: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20182: \$? = $ac_status" >&5
+  echo "$as_me:20173: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20198,7 +20189,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20201: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20208,7 +20199,7 @@ EOF
 fi
 done
 
-echo "$as_me:20211: checking for header declaring getopt variables" >&5
+echo "$as_me:20202: 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
@@ -20218,7 +20209,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20221 "configure"
+#line 20212 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20231,16 +20222,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20225: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20237: \$? = $ac_status" >&5
+  echo "$as_me:20228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20243: \$? = $ac_status" >&5
+  echo "$as_me:20234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20252,7 +20243,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20255: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20246: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20269,14 +20260,14 @@ EOF
 
 fi
 
-echo "$as_me:20272: checking if external environ is declared" >&5
+echo "$as_me:20263: 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 20279 "configure"
+#line 20270 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20289,16 +20280,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20295: \$? = $ac_status" >&5
+  echo "$as_me:20286: \$? = $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:20289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20301: \$? = $ac_status" >&5
+  echo "$as_me:20292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20309,7 +20300,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20312: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20303: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20324,14 +20315,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20327: checking if external environ exists" >&5
+echo "$as_me:20318: 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 20334 "configure"
+#line 20325 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20346,16 +20337,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20352: \$? = $ac_status" >&5
+  echo "$as_me:20343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20358: \$? = $ac_status" >&5
+  echo "$as_me:20349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20366,7 +20357,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20369: result: $cf_cv_have_environ" >&5
+echo "$as_me:20360: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20379,13 +20370,13 @@ EOF
 
 fi
 
-echo "$as_me:20382: checking for getenv" >&5
+echo "$as_me:20373: 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 20388 "configure"
+#line 20379 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20416,16 +20407,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20422: \$? = $ac_status" >&5
+  echo "$as_me:20413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20428: \$? = $ac_status" >&5
+  echo "$as_me:20419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20435,19 +20426,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20438: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20429: 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:20444: checking for $ac_func" >&5
+echo "$as_me:20435: 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 20450 "configure"
+#line 20441 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20478,16 +20469,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20484: \$? = $ac_status" >&5
+  echo "$as_me:20475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20490: \$? = $ac_status" >&5
+  echo "$as_me:20481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20497,7 +20488,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20500: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20491: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20507,7 +20498,7 @@ EOF
 fi
 done
 
-echo "$as_me:20510: checking if getenv returns consistent values" >&5
+echo "$as_me:20501: 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
@@ -20517,7 +20508,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20520 "configure"
+#line 20511 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20622,15 +20613,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20628: \$? = $ac_status" >&5
+  echo "$as_me:20619: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20633: \$? = $ac_status" >&5
+  echo "$as_me:20624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20643,7 +20634,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20646: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20637: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20658,18 +20649,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20661: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20652: 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
 
-echo "$as_me:20665: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20656: 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 20672 "configure"
+#line 20663 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20689,16 +20680,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20695: \$? = $ac_status" >&5
+  echo "$as_me:20686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20701: \$? = $ac_status" >&5
+  echo "$as_me:20692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20710,7 +20701,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20713: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20704: 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
@@ -20725,13 +20716,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20728: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20719: 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 20734 "configure"
+#line 20725 "configure"
 #include "confdefs.h"
 
 int
@@ -20789,16 +20780,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20795: \$? = $ac_status" >&5
+  echo "$as_me:20786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20801: \$? = $ac_status" >&5
+  echo "$as_me:20792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20808,7 +20799,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20811: result: $ac_cv_c_const" >&5
+echo "$as_me:20802: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20818,7 +20809,7 @@ EOF
 
 fi
 
-echo "$as_me:20821: checking for inline" >&5
+echo "$as_me:20812: 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
@@ -20826,7 +20817,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20829 "configure"
+#line 20820 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20835,16 +20826,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20841: \$? = $ac_status" >&5
+  echo "$as_me:20832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20847: \$? = $ac_status" >&5
+  echo "$as_me:20838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20855,7 +20846,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20858: result: $ac_cv_c_inline" >&5
+echo "$as_me:20849: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20881,7 +20872,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20884: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20875: 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
@@ -20890,7 +20881,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20893 "configure"
+#line 20884 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20902,16 +20893,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20908: \$? = $ac_status" >&5
+  echo "$as_me:20899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20914: \$? = $ac_status" >&5
+  echo "$as_me:20905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20923,7 +20914,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20926: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20917: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21029,7 +21020,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21032: checking for signal global datatype" >&5
+echo "$as_me:21023: 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
@@ -21041,7 +21032,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21044 "configure"
+#line 21035 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21065,16 +21056,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21071: \$? = $ac_status" >&5
+  echo "$as_me:21062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21077: \$? = $ac_status" >&5
+  echo "$as_me:21068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21088,7 +21079,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21091: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21082: 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 <<EOF
@@ -21097,7 +21088,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21100: checking for type of chtype" >&5
+echo "$as_me:21091: 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
@@ -21107,7 +21098,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21110 "configure"
+#line 21101 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21142,15 +21133,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21148: \$? = $ac_status" >&5
+  echo "$as_me:21139: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21153: \$? = $ac_status" >&5
+  echo "$as_me:21144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21165,7 +21156,7 @@ fi
 
 fi
 
-echo "$as_me:21168: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21159: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21177,14 +21168,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21180: checking if unsigned literals are legal" >&5
+echo "$as_me:21171: 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 21187 "configure"
+#line 21178 "configure"
 #include "confdefs.h"
 
 int
@@ -21196,16 +21187,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21202: \$? = $ac_status" >&5
+  echo "$as_me:21193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21208: \$? = $ac_status" >&5
+  echo "$as_me:21199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21217,7 +21208,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21220: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21211: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21233,14 +21224,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21236: checking if external errno is declared" >&5
+echo "$as_me:21227: 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 21243 "configure"
+#line 21234 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21254,16 +21245,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21260: \$? = $ac_status" >&5
+  echo "$as_me:21251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21266: \$? = $ac_status" >&5
+  echo "$as_me:21257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21274,7 +21265,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21277: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21268: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21289,14 +21280,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21292: checking if external errno exists" >&5
+echo "$as_me:21283: 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 21299 "configure"
+#line 21290 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21311,16 +21302,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21317: \$? = $ac_status" >&5
+  echo "$as_me:21308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21323: \$? = $ac_status" >&5
+  echo "$as_me:21314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21331,7 +21322,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21334: result: $cf_cv_have_errno" >&5
+echo "$as_me:21325: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21344,7 +21335,7 @@ EOF
 
 fi
 
-echo "$as_me:21347: checking if data-only library module links" >&5
+echo "$as_me:21338: 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
@@ -21352,20 +21343,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21355 "configure"
+#line 21346 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21358: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21349: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21361: \$? = $ac_status" >&5
+  echo "$as_me:21352: \$? = $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 <<EOF
-#line 21368 "configure"
+#line 21359 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21378,10 +21369,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21381: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21384: \$? = $ac_status" >&5
+  echo "$as_me:21375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21394,7 +21385,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21397 "configure"
+#line 21388 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21405,15 +21396,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21411: \$? = $ac_status" >&5
+  echo "$as_me:21402: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21428,7 +21419,7 @@ fi
 
 fi
 
-echo "$as_me:21431: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21422: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21442,14 +21433,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21445: checking for clock_gettime" >&5
+echo "$as_me:21436: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21452 "configure"
+#line 21443 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21462,16 +21453,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21468: \$? = $ac_status" >&5
+  echo "$as_me:21459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21474: \$? = $ac_status" >&5
+  echo "$as_me:21465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21482,7 +21473,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21485: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21476: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21493,13 +21484,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21496: checking for gettimeofday" >&5
+echo "$as_me:21487: 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 21502 "configure"
+#line 21493 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21530,16 +21521,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21536: \$? = $ac_status" >&5
+  echo "$as_me:21527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:21533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21549,7 +21540,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21552: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21543: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21559,7 +21550,7 @@ EOF
 
 else
 
-echo "$as_me:21562: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21553: 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
@@ -21567,7 +21558,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21570 "configure"
+#line 21561 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21586,16 +21577,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21592: \$? = $ac_status" >&5
+  echo "$as_me:21583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21598: \$? = $ac_status" >&5
+  echo "$as_me:21589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21606,7 +21597,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21609: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21600: 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
 
@@ -21667,13 +21658,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21670: checking for $ac_func" >&5
+echo "$as_me:21661: 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 21676 "configure"
+#line 21667 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21704,16 +21695,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21710: \$? = $ac_status" >&5
+  echo "$as_me:21701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21716: \$? = $ac_status" >&5
+  echo "$as_me:21707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21723,7 +21714,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21726: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21717: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21733,14 +21724,14 @@ EOF
 fi
 done
 
-echo "$as_me:21736: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21727: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21743 "configure"
+#line 21734 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21755,16 +21746,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21761: \$? = $ac_status" >&5
+  echo "$as_me:21752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21767: \$? = $ac_status" >&5
+  echo "$as_me:21758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21774,7 +21765,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21777: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21768: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21796,7 +21787,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21799: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21790: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21806,7 +21797,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21809 "configure"
+#line 21800 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21819,15 +21810,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21825: \$? = $ac_status" >&5
+  echo "$as_me:21816: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21830: \$? = $ac_status" >&5
+  echo "$as_me:21821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21839,7 +21830,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21842: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21833: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21851,14 +21842,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21854: checking for getttynam" >&5
+	echo "$as_me:21845: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21861 "configure"
+#line 21852 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21870,16 +21861,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21876: \$? = $ac_status" >&5
+  echo "$as_me:21867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21882: \$? = $ac_status" >&5
+  echo "$as_me:21873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21889,7 +21880,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21892: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21883: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21899,7 +21890,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21902: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21893: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21908,7 +21899,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21911: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21902: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21921,14 +21912,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21924: checking for terminal-capability database functions" >&5
+echo "$as_me:21915: 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 21931 "configure"
+#line 21922 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21948,16 +21939,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21960: \$? = $ac_status" >&5
+  echo "$as_me:21951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -21968,7 +21959,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21971: result: $cf_cv_cgetent" >&5
+echo "$as_me:21962: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -21978,14 +21969,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:21981: checking if cgetent uses const parameter" >&5
+echo "$as_me:21972: 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 21988 "configure"
+#line 21979 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22008,16 +21999,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22014: \$? = $ac_status" >&5
+  echo "$as_me:22005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22020: \$? = $ac_status" >&5
+  echo "$as_me:22011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22028,7 +22019,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22031: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22022: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22042,14 +22033,14 @@ fi
 
 fi
 
-echo "$as_me:22045: checking for isascii" >&5
+echo "$as_me:22036: 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 22052 "configure"
+#line 22043 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22061,16 +22052,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22067: \$? = $ac_status" >&5
+  echo "$as_me:22058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22073: \$? = $ac_status" >&5
+  echo "$as_me:22064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22081,7 +22072,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22084: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22075: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22089,10 +22080,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22092: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22083: 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 22095 "configure"
+#line 22086 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22106,16 +22097,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22112: \$? = $ac_status" >&5
+  echo "$as_me:22103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22118: \$? = $ac_status" >&5
+  echo "$as_me:22109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22123,7 +22114,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22126 "configure"
+#line 22117 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22138,16 +22129,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22144: \$? = $ac_status" >&5
+  echo "$as_me:22135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22150: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22163,11 +22154,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22166: result: $sigact_bad" >&5
+echo "$as_me:22157: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22170: checking if nanosleep really works" >&5
+echo "$as_me:22161: 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
@@ -22177,7 +22168,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22180 "configure"
+#line 22171 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22203,15 +22194,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22209: \$? = $ac_status" >&5
+  echo "$as_me:22200: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22214: \$? = $ac_status" >&5
+  echo "$as_me:22205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22223,7 +22214,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22226: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22217: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22240,23 +22231,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22243: checking for $ac_header" >&5
+echo "$as_me:22234: 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 22249 "configure"
+#line 22240 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22253: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22244: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22259: \$? = $ac_status" >&5
+  echo "$as_me:22250: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22275,7 +22266,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22278: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22269: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22292,10 +22283,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22295: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22286: 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 22298 "configure"
+#line 22289 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22307,16 +22298,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22313: \$? = $ac_status" >&5
+  echo "$as_me:22304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22319: \$? = $ac_status" >&5
+  echo "$as_me:22310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22324,7 +22315,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22327 "configure"
+#line 22318 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22338,16 +22329,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22344: \$? = $ac_status" >&5
+  echo "$as_me:22335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22350: \$? = $ac_status" >&5
+  echo "$as_me:22341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22363,19 +22354,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22366: result: $termios_bad" >&5
+	echo "$as_me:22357: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22371: checking for tcgetattr" >&5
+echo "$as_me:22362: 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 22378 "configure"
+#line 22369 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22403,16 +22394,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22409: \$? = $ac_status" >&5
+  echo "$as_me:22400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22415: \$? = $ac_status" >&5
+  echo "$as_me:22406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22422,21 +22413,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22425: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22416: 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:22432: checking for vsscanf function or workaround" >&5
+echo "$as_me:22423: 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 22439 "configure"
+#line 22430 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22452,16 +22443,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22458: \$? = $ac_status" >&5
+  echo "$as_me:22449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22464: \$? = $ac_status" >&5
+  echo "$as_me:22455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22469,7 +22460,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22472 "configure"
+#line 22463 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22491,16 +22482,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22497: \$? = $ac_status" >&5
+  echo "$as_me:22488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22503: \$? = $ac_status" >&5
+  echo "$as_me:22494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22508,7 +22499,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22511 "configure"
+#line 22502 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22530,16 +22521,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22536: \$? = $ac_status" >&5
+  echo "$as_me:22527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22542: \$? = $ac_status" >&5
+  echo "$as_me:22533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22554,7 +22545,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22557: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22548: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22580,23 +22571,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22583: checking for $ac_header" >&5
+echo "$as_me:22574: 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 22589 "configure"
+#line 22580 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22593: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22584: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22599: \$? = $ac_status" >&5
+  echo "$as_me:22590: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22615,7 +22606,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22618: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22609: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22625,7 +22616,7 @@ EOF
 fi
 done
 
-echo "$as_me:22628: checking for working mkstemp" >&5
+echo "$as_me:22619: 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
@@ -22636,7 +22627,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22639 "configure"
+#line 22630 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22671,15 +22662,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22677: \$? = $ac_status" >&5
+  echo "$as_me:22668: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22682: \$? = $ac_status" >&5
+  echo "$as_me:22673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22694,16 +22685,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22697: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22688: 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:22700: checking for mkstemp" >&5
+	echo "$as_me:22691: 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 22706 "configure"
+#line 22697 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22734,16 +22725,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22740: \$? = $ac_status" >&5
+  echo "$as_me:22731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22746: \$? = $ac_status" >&5
+  echo "$as_me:22737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22753,7 +22744,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22756: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22747: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22774,21 +22765,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22777: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22768: 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:22780: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22771: 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:22786: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22777: 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 22791 "configure"
+#line 22782 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22805,15 +22796,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22811: \$? = $ac_status" >&5
+  echo "$as_me:22802: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22816: \$? = $ac_status" >&5
+  echo "$as_me:22807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22826,7 +22817,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22829: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22820: 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
 
@@ -22837,13 +22828,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22840: checking for intptr_t" >&5
+echo "$as_me:22831: 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 22846 "configure"
+#line 22837 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22858,16 +22849,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22864: \$? = $ac_status" >&5
+  echo "$as_me:22855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22877,7 +22868,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22880: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22871: 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
   :
@@ -22889,13 +22880,13 @@ EOF
 
 fi
 
-echo "$as_me:22892: checking for ssize_t" >&5
+echo "$as_me:22883: 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 22898 "configure"
+#line 22889 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22910,16 +22901,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22922: \$? = $ac_status" >&5
+  echo "$as_me:22913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -22929,7 +22920,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22932: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22923: 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
   :
@@ -22941,14 +22932,14 @@ EOF
 
 fi
 
-echo "$as_me:22944: checking for type sigaction_t" >&5
+echo "$as_me:22935: 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 22951 "configure"
+#line 22942 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -22961,16 +22952,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22967: \$? = $ac_status" >&5
+  echo "$as_me:22958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22973: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -22981,14 +22972,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22984: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22975: 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:22991: checking declaration of size-change" >&5
+echo "$as_me:22982: 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
@@ -23009,7 +23000,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23012 "configure"
+#line 23003 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23059,16 +23050,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23065: \$? = $ac_status" >&5
+  echo "$as_me:23056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23071: \$? = $ac_status" >&5
+  echo "$as_me:23062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23087,7 +23078,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23090: result: $cf_cv_sizechange" >&5
+echo "$as_me:23081: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23105,13 +23096,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23108: checking for memmove" >&5
+echo "$as_me:23099: 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 23114 "configure"
+#line 23105 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23142,16 +23133,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23148: \$? = $ac_status" >&5
+  echo "$as_me:23139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23154: \$? = $ac_status" >&5
+  echo "$as_me:23145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23161,19 +23152,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23164: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23155: 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:23170: checking for bcopy" >&5
+echo "$as_me:23161: 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 23176 "configure"
+#line 23167 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23204,16 +23195,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23210: \$? = $ac_status" >&5
+  echo "$as_me:23201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23216: \$? = $ac_status" >&5
+  echo "$as_me:23207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23223,11 +23214,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23226: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23217: 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:23230: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23221: 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
@@ -23237,7 +23228,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23240 "configure"
+#line 23231 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23253,15 +23244,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23259: \$? = $ac_status" >&5
+  echo "$as_me:23250: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23264: \$? = $ac_status" >&5
+  echo "$as_me:23255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23274,7 +23265,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23277: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23268: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23301,13 +23292,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23304: checking for $ac_func" >&5
+echo "$as_me:23295: 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 23310 "configure"
+#line 23301 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23338,16 +23329,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23344: \$? = $ac_status" >&5
+  echo "$as_me:23335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23350: \$? = $ac_status" >&5
+  echo "$as_me:23341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23357,7 +23348,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23360: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23351: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23367,7 +23358,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23370: checking if poll really works" >&5
+echo "$as_me:23361: 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
@@ -23377,7 +23368,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23380 "configure"
+#line 23371 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23430,15 +23421,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23436: \$? = $ac_status" >&5
+  echo "$as_me:23427: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23441: \$? = $ac_status" >&5
+  echo "$as_me:23432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23450,21 +23441,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23453: result: $cf_cv_working_poll" >&5
+echo "$as_me:23444: 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:23460: checking for va_copy" >&5
+echo "$as_me:23451: 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 23467 "configure"
+#line 23458 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23481,16 +23472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23487: \$? = $ac_status" >&5
+  echo "$as_me:23478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23493: \$? = $ac_status" >&5
+  echo "$as_me:23484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23500,7 +23491,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23503: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23494: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23512,14 +23503,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23515: checking for __va_copy" >&5
+echo "$as_me:23506: 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 23522 "configure"
+#line 23513 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23536,16 +23527,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23542: \$? = $ac_status" >&5
+  echo "$as_me:23533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23548: \$? = $ac_status" >&5
+  echo "$as_me:23539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23555,7 +23546,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23558: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23549: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23567,14 +23558,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23570: checking for __builtin_va_copy" >&5
+echo "$as_me:23561: 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 23577 "configure"
+#line 23568 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23591,16 +23582,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23597: \$? = $ac_status" >&5
+  echo "$as_me:23588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23603: \$? = $ac_status" >&5
+  echo "$as_me:23594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23610,7 +23601,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23613: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23604: 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 &&
@@ -23628,14 +23619,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23631: checking if we can simply copy va_list" >&5
+	echo "$as_me:23622: 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 23638 "configure"
+#line 23629 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23652,16 +23643,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23658: \$? = $ac_status" >&5
+  echo "$as_me:23649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23664: \$? = $ac_status" >&5
+  echo "$as_me:23655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23671,19 +23662,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23674: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23665: 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:23679: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23670: 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 23686 "configure"
+#line 23677 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23700,16 +23691,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23706: \$? = $ac_status" >&5
+  echo "$as_me:23697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23712: \$? = $ac_status" >&5
+  echo "$as_me:23703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23719,7 +23710,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23722: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23713: 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
@@ -23730,13 +23721,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23733: checking for pid_t" >&5
+echo "$as_me:23724: 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 23739 "configure"
+#line 23730 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23751,16 +23742,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23757: \$? = $ac_status" >&5
+  echo "$as_me:23748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23763: \$? = $ac_status" >&5
+  echo "$as_me:23754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23770,7 +23761,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23773: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23764: 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
   :
@@ -23785,23 +23776,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23788: checking for $ac_header" >&5
+echo "$as_me:23779: 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 23794 "configure"
+#line 23785 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23789: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23804: \$? = $ac_status" >&5
+  echo "$as_me:23795: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23820,7 +23811,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23823: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23814: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23833,13 +23824,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23836: checking for $ac_func" >&5
+echo "$as_me:23827: 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 23842 "configure"
+#line 23833 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23870,16 +23861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23876: \$? = $ac_status" >&5
+  echo "$as_me:23867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23882: \$? = $ac_status" >&5
+  echo "$as_me:23873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23889,7 +23880,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23892: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23883: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23901,7 +23892,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23904: checking for working fork" >&5
+  echo "$as_me:23895: 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
@@ -23924,15 +23915,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23930: \$? = $ac_status" >&5
+  echo "$as_me:23921: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23935: \$? = $ac_status" >&5
+  echo "$as_me:23926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -23944,7 +23935,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23947: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23938: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -23958,12 +23949,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:23961: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23952: 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:23966: checking for working vfork" >&5
+  echo "$as_me:23957: 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
@@ -23972,7 +23963,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23975 "configure"
+#line 23966 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24069,15 +24060,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24075: \$? = $ac_status" >&5
+  echo "$as_me:24066: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24080: \$? = $ac_status" >&5
+  echo "$as_me:24071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24089,13 +24080,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24092: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24083: 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:24098: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24089: 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
 
@@ -24120,7 +24111,7 @@ EOF
 
 fi
 
-echo "$as_me:24123: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24114: 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
@@ -24130,7 +24121,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24133 "configure"
+#line 24124 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24165,15 +24156,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24171: \$? = $ac_status" >&5
+  echo "$as_me:24162: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24176: \$? = $ac_status" >&5
+  echo "$as_me:24167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24186,7 +24177,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24189: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24180: 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
@@ -24195,7 +24186,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24198: checking for openpty in -lutil" >&5
+echo "$as_me:24189: 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
@@ -24203,7 +24194,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24206 "configure"
+#line 24197 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24222,16 +24213,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24228: \$? = $ac_status" >&5
+  echo "$as_me:24219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24234: \$? = $ac_status" >&5
+  echo "$as_me:24225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24242,7 +24233,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24245: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24236: 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
@@ -24250,7 +24241,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24253: checking for openpty header" >&5
+echo "$as_me:24244: 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
@@ -24277,7 +24268,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24280 "configure"
+#line 24271 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24294,16 +24285,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24300: \$? = $ac_status" >&5
+  echo "$as_me:24291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24321,7 +24312,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24324: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24315: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24394,7 +24385,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24397 "configure"
+#line 24388 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24406,16 +24397,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24412: \$? = $ac_status" >&5
+  echo "$as_me:24403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24418: \$? = $ac_status" >&5
+  echo "$as_me:24409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24432,7 +24423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24435: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24426: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24468,7 +24459,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24471: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24462: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24479,7 +24470,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24482: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24473: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24551,7 +24542,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24554 "configure"
+#line 24545 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24563,16 +24554,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24569: \$? = $ac_status" >&5
+  echo "$as_me:24560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24575: \$? = $ac_status" >&5
+  echo "$as_me:24566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24589,7 +24580,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24592: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24583: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24669,7 +24660,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24672: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24663: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24686,23 +24677,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24689: checking for db.h" >&5
+echo "$as_me:24680: 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 24695 "configure"
+#line 24686 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24699: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24690: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24705: \$? = $ac_status" >&5
+  echo "$as_me:24696: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24721,11 +24712,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24724: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24715: 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:24728: checking for version of db" >&5
+echo "$as_me:24719: 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
@@ -24736,10 +24727,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24739: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24730: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24742 "configure"
+#line 24733 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24769,16 +24760,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24775: \$? = $ac_status" >&5
+  echo "$as_me:24766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24781: \$? = $ac_status" >&5
+  echo "$as_me:24772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24792,16 +24783,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24795: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24786: 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:24799: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24790: 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:24804: checking for db libraries" >&5
+echo "$as_me:24795: 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
@@ -24831,10 +24822,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24834: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24825: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24837 "configure"
+#line 24828 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24889,16 +24880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24895: \$? = $ac_status" >&5
+  echo "$as_me:24886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24901: \$? = $ac_status" >&5
+  echo "$as_me:24892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24918,11 +24909,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24921: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24912: 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:24925: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24916: 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
@@ -24948,7 +24939,7 @@ fi
 
 else
 
-	{ { echo "$as_me:24951: error: Cannot find db.h" >&5
+	{ { echo "$as_me:24942: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -24963,7 +24954,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:24966: checking if we should include stdbool.h" >&5
+echo "$as_me:24957: 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
@@ -24971,7 +24962,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24974 "configure"
+#line 24965 "configure"
 #include "confdefs.h"
 
 int
@@ -24983,23 +24974,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24989: \$? = $ac_status" >&5
+  echo "$as_me:24980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24995: \$? = $ac_status" >&5
+  echo "$as_me:24986: \$? = $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 25002 "configure"
+#line 24993 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25015,16 +25006,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25021: \$? = $ac_status" >&5
+  echo "$as_me:25012: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25027: \$? = $ac_status" >&5
+  echo "$as_me:25018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25038,13 +25029,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25041: result: yes" >&5
+then	echo "$as_me:25032: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25043: result: no" >&5
+else	echo "$as_me:25034: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25047: checking for builtin bool type" >&5
+echo "$as_me:25038: 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
@@ -25052,7 +25043,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25055 "configure"
+#line 25046 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25067,16 +25058,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25073: \$? = $ac_status" >&5
+  echo "$as_me:25064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25079: \$? = $ac_status" >&5
+  echo "$as_me:25070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25089,9 +25080,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25092: result: yes" >&5
+then	echo "$as_me:25083: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25094: result: no" >&5
+else	echo "$as_me:25085: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25108,10 +25099,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25111: checking if we already have C++ library" >&5
+	echo "$as_me:25102: 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 25114 "configure"
+#line 25105 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25125,16 +25116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25131: \$? = $ac_status" >&5
+  echo "$as_me:25122: \$? = $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:25125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25137: \$? = $ac_status" >&5
+  echo "$as_me:25128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25143,7 +25134,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25146: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25137: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25162,7 +25153,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25165: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25156: 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
@@ -25188,7 +25179,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25191 "configure"
+#line 25182 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25202,16 +25193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25208: \$? = $ac_status" >&5
+  echo "$as_me:25199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25214: \$? = $ac_status" >&5
+  echo "$as_me:25205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25223,7 +25214,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25226: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25217: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25245,7 +25236,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25248: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25239: 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
@@ -25260,15 +25251,15 @@ CF_EOF
 # 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:25263: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25266: \$? = $ac_status" >&5
+  echo "$as_me:25257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25268: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25271: \$? = $ac_status" >&5
+  echo "$as_me:25262: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25279,10 +25270,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25282: result: yes" >&5
+  echo "$as_me:25273: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25285: result: no" >&5
+  echo "$as_me:25276: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25302,7 +25293,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25305: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25296: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25323,7 +25314,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25326 "configure"
+#line 25317 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25337,16 +25328,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25343: \$? = $ac_status" >&5
+  echo "$as_me:25334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25349: \$? = $ac_status" >&5
+  echo "$as_me:25340: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25383,7 +25374,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25386 "configure"
+#line 25377 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25397,16 +25388,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25391: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25403: \$? = $ac_status" >&5
+  echo "$as_me:25394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25409: \$? = $ac_status" >&5
+  echo "$as_me:25400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25439,7 +25430,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25442: result: $cf_cxx_library" >&5
+	echo "$as_me:25433: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25455,7 +25446,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25458: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25449: 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
@@ -25472,18 +25463,18 @@ do
   # 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 25475 "configure"
+#line 25466 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25480: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25471: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25486: \$? = $ac_status" >&5
+  echo "$as_me:25477: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25506,17 +25497,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25509 "configure"
+#line 25500 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25504: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25519: \$? = $ac_status" >&5
+  echo "$as_me:25510: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25553,7 +25544,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25556: result: $CXXCPP" >&5
+echo "$as_me:25547: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25563,18 +25554,18 @@ do
   # 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 25566 "configure"
+#line 25557 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25562: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25577: \$? = $ac_status" >&5
+  echo "$as_me:25568: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25597,17 +25588,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25600 "configure"
+#line 25591 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25610: \$? = $ac_status" >&5
+  echo "$as_me:25601: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25635,7 +25626,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25638: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25629: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25650,23 +25641,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25653: checking for $ac_header" >&5
+echo "$as_me:25644: 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 25659 "configure"
+#line 25650 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25663: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25669: \$? = $ac_status" >&5
+  echo "$as_me:25660: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25685,7 +25676,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25688: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25679: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25698,23 +25689,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25701: checking for $ac_header" >&5
+echo "$as_me:25692: 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 25707 "configure"
+#line 25698 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25711: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25702: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25717: \$? = $ac_status" >&5
+  echo "$as_me:25708: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25733,7 +25724,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25736: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25727: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25744,10 +25735,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25747: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25738: 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 25750 "configure"
+#line 25741 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25764,16 +25755,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25770: \$? = $ac_status" >&5
+  echo "$as_me:25761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25776: \$? = $ac_status" >&5
+  echo "$as_me:25767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25782,7 +25773,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25785: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25776: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25793,7 +25784,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25796: checking if we should include stdbool.h" >&5
+echo "$as_me:25787: 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
@@ -25801,7 +25792,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25804 "configure"
+#line 25795 "configure"
 #include "confdefs.h"
 
 int
@@ -25813,23 +25804,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25819: \$? = $ac_status" >&5
+  echo "$as_me:25810: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25825: \$? = $ac_status" >&5
+  echo "$as_me:25816: \$? = $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 25832 "configure"
+#line 25823 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25845,16 +25836,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25851: \$? = $ac_status" >&5
+  echo "$as_me:25842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25857: \$? = $ac_status" >&5
+  echo "$as_me:25848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25868,13 +25859,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25871: result: yes" >&5
+then	echo "$as_me:25862: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25873: result: no" >&5
+else	echo "$as_me:25864: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25877: checking for builtin bool type" >&5
+echo "$as_me:25868: 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
@@ -25882,7 +25873,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25885 "configure"
+#line 25876 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25897,16 +25888,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25903: \$? = $ac_status" >&5
+  echo "$as_me:25894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25909: \$? = $ac_status" >&5
+  echo "$as_me:25900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25919,19 +25910,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25922: result: yes" >&5
+then	echo "$as_me:25913: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25924: result: no" >&5
+else	echo "$as_me:25915: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25928: checking for bool" >&5
+echo "$as_me:25919: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25934 "configure"
+#line 25925 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25966,16 +25957,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25972: \$? = $ac_status" >&5
+  echo "$as_me:25963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25978: \$? = $ac_status" >&5
+  echo "$as_me:25969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -25985,10 +25976,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25988: result: $ac_cv_type_bool" >&5
+echo "$as_me:25979: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:25991: checking size of bool" >&5
+echo "$as_me:25982: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25997,7 +25988,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26000 "configure"
+#line 25991 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26029,21 +26020,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26035: \$? = $ac_status" >&5
+  echo "$as_me:26026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26041: \$? = $ac_status" >&5
+  echo "$as_me:26032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26046 "configure"
+#line 26037 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26075,16 +26066,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26081: \$? = $ac_status" >&5
+  echo "$as_me:26072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26087: \$? = $ac_status" >&5
+  echo "$as_me:26078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26100,7 +26091,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26103 "configure"
+#line 26094 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26132,16 +26123,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26138: \$? = $ac_status" >&5
+  echo "$as_me:26129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26144: \$? = $ac_status" >&5
+  echo "$as_me:26135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26157,7 +26148,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26160 "configure"
+#line 26151 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26189,16 +26180,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26195: \$? = $ac_status" >&5
+  echo "$as_me:26186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26201: \$? = $ac_status" >&5
+  echo "$as_me:26192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26211,12 +26202,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26214: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26205: 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 26219 "configure"
+#line 26210 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26252,15 +26243,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26258: \$? = $ac_status" >&5
+  echo "$as_me:26249: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26263: \$? = $ac_status" >&5
+  echo "$as_me:26254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26276,13 +26267,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26279: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26270: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26285: checking for type of bool" >&5
+echo "$as_me:26276: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26301,7 +26292,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26304 "configure"
+#line 26295 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26342,15 +26333,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26348: \$? = $ac_status" >&5
+  echo "$as_me:26339: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26353: \$? = $ac_status" >&5
+  echo "$as_me:26344: \$? = $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
@@ -26367,19 +26358,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26370: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26361: 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:26377: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26368: 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:26382: checking for special defines needed for etip.h" >&5
+echo "$as_me:26373: 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"
@@ -26397,7 +26388,7 @@ do
 	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 26400 "configure"
+#line 26391 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26411,16 +26402,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26414: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26417: \$? = $ac_status" >&5
+  echo "$as_me:26408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26423: \$? = $ac_status" >&5
+  echo "$as_me:26414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26441,12 +26432,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26444: result: $cf_result" >&5
+echo "$as_me:26435: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26449: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26440: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26463,7 +26454,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26466 "configure"
+#line 26457 "configure"
 #include "confdefs.h"
 
 class base
@@ -26482,15 +26473,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26488: \$? = $ac_status" >&5
+  echo "$as_me:26479: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26493: \$? = $ac_status" >&5
+  echo "$as_me:26484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26509,7 +26500,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26512: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26503: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26518,7 +26509,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26521: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26512: 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
@@ -26535,7 +26526,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26538 "configure"
+#line 26529 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26554,15 +26545,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26560: \$? = $ac_status" >&5
+  echo "$as_me:26551: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26565: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26581,7 +26572,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26584: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26575: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26591,7 +26582,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26594: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26585: 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
@@ -26605,7 +26596,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26608 "configure"
+#line 26599 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26649,16 +26640,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26655: \$? = $ac_status" >&5
+  echo "$as_me:26646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26661: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26676,7 +26667,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26679: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26670: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26725,13 +26716,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26728: checking for bool" >&5
+echo "$as_me:26719: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26734 "configure"
+#line 26725 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26766,16 +26757,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26772: \$? = $ac_status" >&5
+  echo "$as_me:26763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26778: \$? = $ac_status" >&5
+  echo "$as_me:26769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26785,10 +26776,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26788: result: $ac_cv_type_bool" >&5
+echo "$as_me:26779: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26791: checking size of bool" >&5
+echo "$as_me:26782: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26797,7 +26788,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26800 "configure"
+#line 26791 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26829,21 +26820,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26835: \$? = $ac_status" >&5
+  echo "$as_me:26826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26841: \$? = $ac_status" >&5
+  echo "$as_me:26832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26846 "configure"
+#line 26837 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26875,16 +26866,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26881: \$? = $ac_status" >&5
+  echo "$as_me:26872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26887: \$? = $ac_status" >&5
+  echo "$as_me:26878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26900,7 +26891,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26903 "configure"
+#line 26894 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26932,16 +26923,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26938: \$? = $ac_status" >&5
+  echo "$as_me:26929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26944: \$? = $ac_status" >&5
+  echo "$as_me:26935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26957,7 +26948,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26960 "configure"
+#line 26951 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26989,16 +26980,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26995: \$? = $ac_status" >&5
+  echo "$as_me:26986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27001: \$? = $ac_status" >&5
+  echo "$as_me:26992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27011,12 +27002,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27014: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27005: 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 27019 "configure"
+#line 27010 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27052,15 +27043,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27058: \$? = $ac_status" >&5
+  echo "$as_me:27049: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27063: \$? = $ac_status" >&5
+  echo "$as_me:27054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27076,13 +27067,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27079: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27070: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27085: checking for type of bool" >&5
+echo "$as_me:27076: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27101,7 +27092,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27104 "configure"
+#line 27095 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27142,15 +27133,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27148: \$? = $ac_status" >&5
+  echo "$as_me:27139: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27153: \$? = $ac_status" >&5
+  echo "$as_me:27144: \$? = $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
@@ -27167,26 +27158,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27170: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27161: 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:27177: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27168: 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:27183: checking for fallback type of bool" >&5
+			echo "$as_me:27174: 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:27189: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27180: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27215,7 +27206,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27218: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27209: 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
@@ -27232,7 +27223,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27235: checking for $ac_word" >&5
+echo "$as_me:27226: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27249,7 +27240,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27252: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27243: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27261,10 +27252,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27264: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27255: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27267: result: no" >&5
+  echo "$as_me:27258: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27274,7 +27265,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27277: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27268: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27285,7 +27276,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27288: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27279: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27314,7 +27305,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27317: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27308: 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
@@ -27333,10 +27324,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27336: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27327: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27339: result: missing" >&5
+					echo "$as_me:27330: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27349,7 +27340,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27352: checking for gnat version" >&5
+echo "$as_me:27343: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27360,7 +27351,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27363: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27354: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27369,7 +27360,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27372: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27363: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27377,7 +27368,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27380: checking for $ac_word" >&5
+echo "$as_me:27371: 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
@@ -27392,7 +27383,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27395: found $ac_dir/$ac_word" >&5
+echo "$as_me:27386: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27401,20 +27392,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27404: result: $M4_exists" >&5
+  echo "$as_me:27395: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27407: result: no" >&5
+  echo "$as_me:27398: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27413: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27404: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27417: checking if GNAT works" >&5
+			echo "$as_me:27408: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27442,7 +27433,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27445: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27436: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27454,7 +27445,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27457: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27448: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27471,10 +27462,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27474: result: $ADAFLAGS" >&5
+	echo "$as_me:27465: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27477: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27468: 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
@@ -27484,11 +27475,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27487: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27478: 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:27491: checking if GNAT supports generics" >&5
+echo "$as_me:27482: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27498,7 +27489,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27501: result: $cf_gnat_generics" >&5
+echo "$as_me:27492: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27510,7 +27501,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27513: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27504: 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
@@ -27558,7 +27549,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27561: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27552: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27571,7 +27562,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27574: checking if GNAT supports project files" >&5
+echo "$as_me:27565: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27634,15 +27625,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27637: result: $cf_gnat_projects" >&5
+echo "$as_me:27628: 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:27643: checking if GNAT supports libraries" >&5
+	echo "$as_me:27634: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27645: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27636: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27662,7 +27653,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27665: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27656: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27674,7 +27665,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27677: checking for ada-compiler" >&5
+echo "$as_me:27668: 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.
@@ -27685,12 +27676,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27688: result: $cf_ada_compiler" >&5
+echo "$as_me:27679: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27693: checking for ada-include" >&5
+echo "$as_me:27684: 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.
@@ -27726,7 +27717,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27729: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27720: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27735,10 +27726,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27738: result: $ADA_INCLUDE" >&5
+echo "$as_me:27729: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27741: checking for ada-objects" >&5
+echo "$as_me:27732: 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.
@@ -27774,7 +27765,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27777: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27768: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27783,10 +27774,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27786: result: $ADA_OBJECTS" >&5
+echo "$as_me:27777: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27789: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27780: 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.
@@ -27796,14 +27787,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27799: result: $with_ada_sharedlib" >&5
+echo "$as_me:27790: 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:27806: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27797: 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
@@ -27823,7 +27814,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27826: checking for ada-libname" >&5
+echo "$as_me:27817: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27839,7 +27830,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27842: result: $ADA_LIBNAME" >&5
+echo "$as_me:27833: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27850,13 +27841,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27853: checking for wchar_t" >&5
+	echo "$as_me:27844: 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 27859 "configure"
+#line 27850 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27871,16 +27862,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27877: \$? = $ac_status" >&5
+  echo "$as_me:27868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27883: \$? = $ac_status" >&5
+  echo "$as_me:27874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27890,10 +27881,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27893: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27884: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27896: checking size of wchar_t" >&5
+echo "$as_me:27887: 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
@@ -27902,7 +27893,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27905 "configure"
+#line 27896 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27914,21 +27905,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27920: \$? = $ac_status" >&5
+  echo "$as_me:27911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27926: \$? = $ac_status" >&5
+  echo "$as_me:27917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27931 "configure"
+#line 27922 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27940,16 +27931,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27946: \$? = $ac_status" >&5
+  echo "$as_me:27937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27952: \$? = $ac_status" >&5
+  echo "$as_me:27943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27965,7 +27956,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27968 "configure"
+#line 27959 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27977,16 +27968,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27983: \$? = $ac_status" >&5
+  echo "$as_me:27974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27989: \$? = $ac_status" >&5
+  echo "$as_me:27980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28002,7 +27993,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28005 "configure"
+#line 27996 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28014,16 +28005,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:28011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28026: \$? = $ac_status" >&5
+  echo "$as_me:28017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28036,12 +28027,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28039: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28030: 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 28044 "configure"
+#line 28035 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28057,15 +28048,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28063: \$? = $ac_status" >&5
+  echo "$as_me:28054: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28068: \$? = $ac_status" >&5
+  echo "$as_me:28059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28081,7 +28072,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28084: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28075: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28094,7 +28085,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28097: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28088: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28112,7 +28103,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28115: checking for library subsets" >&5
+echo "$as_me:28106: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28166,7 +28157,7 @@ fi
 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:28169: result: $LIB_SUBSETS" >&5
+echo "$as_me:28160: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28197,7 +28188,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28200: checking default library suffix" >&5
+echo "$as_me:28191: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28208,10 +28199,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28211: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28202: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28214: checking default library-dependency suffix" >&5
+echo "$as_me:28205: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28294,10 +28285,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28297: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28288: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28300: checking default object directory" >&5
+echo "$as_me:28291: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28313,11 +28304,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28316: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28307: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28320: checking c++ library-dependency suffix" >&5
+echo "$as_me:28311: 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++)
@@ -28410,7 +28401,7 @@ else
 	fi
 
 fi
-echo "$as_me:28413: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28404: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28586,19 +28577,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28589: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28580: 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 <<EOF
-#line 28594 "configure"
+#line 28585 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28598: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28601: \$? = $ac_status" >&5
+  echo "$as_me:28592: \$? = $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
@@ -28609,10 +28600,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28612 "configure"
+#line 28603 "configure"
 #include "confdefs.h"
 
-#line 28615 "configure"
+#line 28606 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28627,16 +28618,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28633: \$? = $ac_status" >&5
+  echo "$as_me:28624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28639: \$? = $ac_status" >&5
+  echo "$as_me:28630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28659,7 +28650,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28662: result: $cf_ldflags_static" >&5
+	echo "$as_me:28653: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28675,7 +28666,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28678: checking where we will install curses.h" >&5
+echo "$as_me:28669: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28685,7 +28676,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28688: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28679: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28693,7 +28684,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28696: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28687: 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
@@ -28710,9 +28701,6 @@ case "$cf_cv_system_name" in
 *)	;;
 esac
 
-# used to separate tack out of the tree
-NCURSES_TREE=
-
 ### predefined stuff for the test programs
 
 cat >>confdefs.h <<\EOF
@@ -28721,7 +28709,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28724: checking for desired basename for form library" >&5
+echo "$as_me:28712: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28741,10 +28729,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28744: result: $FORM_NAME" >&5
+echo "$as_me:28732: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28747: checking for desired basename for menu library" >&5
+echo "$as_me:28735: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28764,10 +28752,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28767: result: $MENU_NAME" >&5
+echo "$as_me:28755: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28770: checking for desired basename for panel library" >&5
+echo "$as_me:28758: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28787,10 +28775,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28790: result: $PANEL_NAME" >&5
+echo "$as_me:28778: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28793: checking for desired basename for cxx library" >&5
+echo "$as_me:28781: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28810,13 +28798,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28813: result: $CXX_NAME" >&5
+echo "$as_me:28801: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28819: checking for src modules" >&5
+echo "$as_me:28807: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28836,14 +28824,6 @@ for cf_dir in $modules_to_build
 do
 	if test -f "$srcdir/$cf_dir/modules" ; then
 
-		# We may/may not have tack in the distribution, though the
-		# makefile is.
-		if test "$cf_dir" = tack ; then
-			if test "x$cf_with_tack" != "xyes"; then
-				continue
-			fi
-		fi
-
 		if test -z "$cf_cv_src_modules"; then
 			cf_cv_src_modules=$cf_dir
 		else
@@ -28854,9 +28834,7 @@ do
 		# well.  These are header files that are the same name as their
 		# directory.  Ncurses is the only library that does not follow
 		# that pattern.
-		if test "$cf_dir" = tack ; then
-			continue
-		elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
+		if test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
 
 cf_have_include=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
@@ -28885,7 +28863,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28888: result: $cf_cv_src_modules" >&5
+echo "$as_me:28866: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29046,7 +29024,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29049: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29027: 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//'`
@@ -29057,7 +29035,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29060: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29038: 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
@@ -29073,7 +29051,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29076: result: $PKG_CFLAGS" >&5
+echo "$as_me:29054: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29134,7 +29112,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29137: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29115: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29161,7 +29139,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29164: checking for linker search path" >&5
+echo "$as_me:29142: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29209,7 +29187,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29212: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29190: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29250,15 +29228,11 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29253: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29231: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
 
-cat >>confdefs.h <<\EOF
-#define HAVE_CURSES_DATA_BOOLNAMES 1
-EOF
-
 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h man/man_db.renames $SUB_MAKEFILES Makefile"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
@@ -29340,7 +29314,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29343: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29317: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29521,7 +29495,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29524: error: ambiguous option: $1
+    { { echo "$as_me:29498: 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;}
@@ -29540,7 +29514,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29543: error: unrecognized option: $1
+  -*) { { echo "$as_me:29517: 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;}
@@ -29670,7 +29644,7 @@ do
   "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:29673: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29647: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30022,7 +29996,6 @@ s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
 s,@TICS_LIST@,$TICS_LIST,;t t
 s,@TINFO_LIST@,$TINFO_LIST,;t t
 s,@SHLIB_LIST@,$SHLIB_LIST,;t t
-s,@NCURSES_TREE@,$NCURSES_TREE,;t t
 s,@FORM_NAME@,$FORM_NAME,;t t
 s,@MENU_NAME@,$MENU_NAME,;t t
 s,@PANEL_NAME@,$PANEL_NAME,;t t
@@ -30184,7 +30157,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30187: creating $ac_file" >&5
+    { echo "$as_me:30160: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30202,7 +30175,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30205: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30178: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30215,7 +30188,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30218: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30191: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30231,7 +30204,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30234: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30207: 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;}
@@ -30240,7 +30213,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30243: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30216: 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;}
@@ -30285,7 +30258,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30288: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30261: 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;}
@@ -30296,7 +30269,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30299: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30272: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30345,7 +30318,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30348: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30321: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30356,7 +30329,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30359: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30332: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30369,7 +30342,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30372: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30345: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30427,7 +30400,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30430: $ac_file is unchanged" >&5
+      { echo "$as_me:30403: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30814,7 +30787,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30817: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30790: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
@@ -31175,18 +31148,6 @@ distclean ::
 	rm -rf \${DIRS_TO_MAKE}
 CF_EOF
 
-# Special case: tack's manpage lives in its own directory.
-if test "x$cf_with_manpages" = xyes; then
-if test "x$cf_with_tack" = "xyes"; then
-cat >> Makefile <<CF_EOF
-
-install.man \\
-uninstall.man ::
-	( cd tack && \${MAKE} \${TOP_MFLAGS} \$@ )
-CF_EOF
-fi
-fi
-
 rm -f headers.sed headers.sh
 
 echo creating headers.sh
diff --git a/configure.in b/configure.in
index 984f6aa48..8a74ab6ee 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.760 2023/04/18 00:22:49 tom Exp $
+dnl $Id: configure.in,v 1.762 2023/04/22 22:16:28 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.760 $)
+AC_REVISION($Revision: 1.762 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -186,22 +186,6 @@ AC_ARG_WITH(progs,
 	[cf_with_progs=yes])
 AC_MSG_RESULT($cf_with_progs)
 
-if test -f "$srcdir/tack/tack.h" ; then
-	if test "x$cross_compiling" = xyes ; then
-		CF_VERBOSE(ignoring tack because we are cross-compiling)
-		cf_with_tack=no
-	else
-		AC_MSG_CHECKING(if you want to build the tack program)
-		AC_ARG_WITH(tack,
-			[  --without-tack          suppress build/install with tack program],
-			[cf_with_tack=$withval],
-			[cf_with_tack=$cf_with_progs])
-		AC_MSG_RESULT($cf_with_tack)
-	fi
-else
-	cf_with_tack=no
-fi
-
 AC_MSG_CHECKING(if you want to build test-programs)
 AC_ARG_WITH(tests,
 	[  --without-tests         suppress build/install with test-programs],
@@ -218,7 +202,6 @@ AC_MSG_RESULT($with_curses_h)
 
 modules_to_build="ncurses"
 test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs"
-test "X$cf_with_tack"  != Xno && modules_to_build="$modules_to_build tack"
 modules_to_build="$modules_to_build panel menu form"
 
 AC_ARG_PROGRAM
@@ -872,7 +855,7 @@ AC_ARG_ENABLE(root-environ,
 	[with_root_environ=$enableval],
 	[with_root_environ=yes])
 AC_MSG_RESULT($with_root_environ)
-test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root is allowed to use ncurses environment])
+test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root/setuid application is allowed to use ncurses environment])
 
 AC_MSG_CHECKING(if you want to permit setuid programs to access all files)
 AC_ARG_ENABLE(root-access,
@@ -882,6 +865,14 @@ AC_ARG_ENABLE(root-access,
 AC_MSG_RESULT($with_root_access)
 test "x$with_root_access" = xyes && AC_DEFINE(USE_ROOT_ACCESS,1,[Define to 1 if setuid is allowed all file-access])
 
+AC_MSG_CHECKING(if you want to permit setuid use of ncurses environment variables)
+AC_ARG_ENABLE(setuid-environ,
+	[  --disable-setuid-environ restrict setuid use of ncurses environment variables],
+	[with_setuid_environ=$enableval],
+	[with_setuid_environ=$with_root_environ])
+AC_MSG_RESULT($with_setuid_environ)
+test "x$with_setuid_environ" = xyes && AC_DEFINE(USE_SETUID_ENVIRON,1,[Define to 1 if setuid/setgid application is allowed to use ncurses environment])
+
 ###   Use option --enable-symlinks to make tic use symlinks, not hard links
 ###   to reduce storage requirements for the terminfo database.
 CF_LINK_FUNCS
@@ -2347,10 +2338,6 @@ AC_SUBST(TICS_LIST)
 AC_SUBST(TINFO_LIST)
 AC_SUBST(SHLIB_LIST)
 
-# used to separate tack out of the tree
-NCURSES_TREE=
-AC_SUBST(NCURSES_TREE)
-
 ### predefined stuff for the test programs
 AC_DEFINE(HAVE_SLK_COLOR,1,[Define to 1 if we have slk_color for test-programs])
 
@@ -2542,8 +2529,6 @@ AC_SUBST(PRIVATE_LIBS)
 # This is used for the *-config script and *.pc data files.
 CF_LD_SEARCHPATH
 
-AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack])
-
 AC_OUTPUT( \
 	include/MKterm.h.awk \
 	include/curses.head:include/curses.h.in \
diff --git a/dist.mk b/dist.mk
index 04c58d465..9968b9c5f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1537 2023/04/18 00:25:00 tom Exp $
+# $Id: dist.mk,v 1.1539 2023/04/23 15:57:14 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230418
+NCURSES_PATCH = 20230423
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index fe563fe21..9be1e15dc 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1   User Commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 2c914951a..ba2a1df9d 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index bcf59102e..33b8311c1 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 15ad17409..0b4b36c15 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.68 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_color.3x,v 1.69 2023/04/23 20:53:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -484,6 +484,14 @@ <H1 class="no-header">curs_color 3x</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+
+</PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
+       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
+       are not found in SVr4 curses, 4.4BSD curses, or any other previous ver-
+       sion of curses.
+
+
+</PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
        This implementation satisfies XSI Curses's minimum maximums for  <STRONG>COLORS</STRONG>
        and <STRONG>COLOR_PAIRS</STRONG>.
 
@@ -556,7 +564,12 @@ <H1 class="no-header">curs_color 3x</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a>
+<ul>
+<li><a href="#h3-Extensions">Extensions</a></li>
+<li><a href="#h3-Standards">Standards</a></li>
+</ul>
+</li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 32699b3c4..44f9b3273 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.57 2023/04/08 21:43:01 tom Exp @
+  * @Id: curs_termcap.3x,v 1.58 2023/04/16 18:16:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -211,8 +211,8 @@ <H1 class="no-header">curs_termcap 3x</H1>
        <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with string parameters is an er-
            ror.
 
-       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with no parameters, or more than
-           two is an error.
+       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with more than two parameters is
+           an error.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 7b0d1198d..e39dcfb26 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.84 2023/04/09 08:13:16 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.85 2023/04/23 20:52:38 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -57,8 +57,9 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>del_curterm</STRONG>, <STRONG>mvcur</STRONG>, <STRONG>putp</STRONG>, <STRONG>restartterm</STRONG>, <STRONG>set_curterm</STRONG>, <STRONG>setupterm</STRONG>,
-       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, <STRONG>tigetstr</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tparm</STRONG>, <STRONG>tputs</STRONG>, <STRONG>vid_attr</STRONG>,
-       <STRONG>vid_puts</STRONG>, <STRONG>vidattr</STRONG>, <STRONG>vidputs</STRONG> - <STRONG>curses</STRONG> interfaces to terminfo database
+       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, <STRONG>tigetstr</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tiparm_s</STRONG>, <STRONG>tiscan_s</STRONG>, <STRONG>tparm</STRONG>,
+       <STRONG>tputs</STRONG>, <STRONG>vid_attr</STRONG>, <STRONG>vid_puts</STRONG>, <STRONG>vidattr</STRONG>, <STRONG>vidputs</STRONG> - <STRONG>curses</STRONG> interfaces to
+       terminfo database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -102,48 +103,52 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
        <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 
+       /* extensions */
+       <STRONG>char</STRONG> <STRONG>*tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tiscan_s(int</STRONG> <STRONG>*</STRONG><EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  low-level  routines must be called by programs that have to deal
+       These low-level routines must be called by programs that have  to  deal
        directly with the <STRONG>terminfo</STRONG> database to handle certain terminal capabil-
        ities, such as programming function keys.  For all other functionality,
        <STRONG>curses</STRONG> routines are more suitable and their use is recommended.
 
-       None of these functions use  (or  are  aware  of)  multibyte  character
+       None  of  these  functions  use  (or  are aware of) multibyte character
        strings such as UTF-8:
 
        <STRONG>o</STRONG>   capability names use the POSIX portable character set
 
-       <STRONG>o</STRONG>   capability  string  values  have  no  associated encoding; they are
+       <STRONG>o</STRONG>   capability string values have  no  associated  encoding;  they  are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        Initially, <STRONG>setupterm</STRONG> should be called.  The high-level curses functions
-       <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
+       <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level  set  of
        terminal-dependent variables [listed in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].
 
-       Applications can use the terminal  capabilities  either  directly  (via
-       header  definitions),  or by special functions.  The header files <STRONG>curs-</STRONG>
-       <STRONG>es.h</STRONG> and <STRONG>term.h</STRONG> should be included (in this order) to get  the  defini-
+       Applications  can  use  the  terminal capabilities either directly (via
+       header definitions), or by special functions.  The header  files  <STRONG>curs-</STRONG>
+       <STRONG>es.h</STRONG>  and  <STRONG>term.h</STRONG> should be included (in this order) to get the defini-
        tions for these strings, numbers, and flags.
 
-       The  <STRONG>terminfo</STRONG>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
+       The <STRONG>terminfo</STRONG> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized  by  <STRONG>setupterm</STRONG>
        as follows:
 
-       <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
+       <STRONG>o</STRONG>   If  <STRONG>use_env(FALSE)</STRONG>  has  been  called, values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG>
            specified in <STRONG>terminfo</STRONG> are used.
 
-       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> exist,
+       <STRONG>o</STRONG>   Otherwise, if the environment variables <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>  exist,
            their values are used.  If these environment variables do not exist
-           and  the program is running in a window, the current window size is
-           used.  Otherwise, if the environment variables do  not  exist,  the
+           and the program is running in a window, the current window size  is
+           used.   Otherwise,  if  the environment variables do not exist, the
            values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <STRONG>terminfo</STRONG> database are
            used.
 
-       Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
-       them.   All  <STRONG>terminfo</STRONG> strings (including the output of <STRONG>tparm</STRONG>) should be
-       printed with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore  the  tty
+       Parameterized  strings  should  be  passed through <STRONG>tparm</STRONG> to instantiate
+       them.  All <STRONG>terminfo</STRONG> strings (including the output of <STRONG>tparm</STRONG>)  should  be
+       printed  with  <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore the tty
        modes before exiting [see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>].
 
        Programs which use cursor addressing should
@@ -154,14 +159,14 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
        Programs which execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call  <STRONG>reset_shell_mode</STRONG>  and output <STRONG>exit_ca_mode</STRONG> before the shell is
+       <STRONG>o</STRONG>   call <STRONG>reset_shell_mode</STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell  is
            called and
 
-       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
+       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning from
            the shell.
 
-       The  <STRONG>setupterm</STRONG> routine reads in the <STRONG>terminfo</STRONG> database, initializing the
-       <STRONG>terminfo</STRONG> structures, but does not  set  up  the  output  virtualization
+       The <STRONG>setupterm</STRONG> routine reads in the <STRONG>terminfo</STRONG> database, initializing  the
+       <STRONG>terminfo</STRONG>  structures,  but  does  not  set up the output virtualization
        structures used by <STRONG>curses</STRONG>.  These are its parameters:
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
@@ -172,24 +177,24 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
           <EM>errret</EM>
                points to an optional location where an error status can be re-
-               turned  to  the  caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
-               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
-               pointed  to by <EM>errret</EM>.  A return value of <STRONG>OK</STRONG> combined with sta-
+               turned to the caller.  If <EM>errret</EM> is not  null,  then  <STRONG>setupterm</STRONG>
+               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
+               pointed to by <EM>errret</EM>.  A return value of <STRONG>OK</STRONG> combined with  sta-
                tus of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>:
 
-               <STRONG>1</STRONG>    means that the terminal is hardcopy, cannot  be  used  for
+               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, cannot be used for
                     curses applications.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the entry is a hardcopy type by
+                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
                     checking the <STRONG>hc</STRONG> (<STRONG>hardcopy</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
-                    a  generic  type, having too little information for curses
+               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
+                    a generic type, having too little information  for  curses
                     applications to run.
 
-                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
+                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
                     checking the <STRONG>gn</STRONG> (<STRONG>generic</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <STRONG>terminfo</STRONG> database could not be found.
@@ -203,59 +208,74 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       The <STRONG>setupterm</STRONG> routine stores its information about the  terminal  in  a
-       <STRONG>TERMINAL</STRONG>  structure  pointed to by the global variable <STRONG>cur_term</STRONG>.  If it
-       detects an error, or decides that the terminal is unsuitable  (hardcopy
-       or  generic),  it discards this information, making it not available to
+       The  <STRONG>setupterm</STRONG>  routine  stores its information about the terminal in a
+       <STRONG>TERMINAL</STRONG> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
+       detects  an error, or decides that the terminal is unsuitable (hardcopy
+       or generic), it discards this information, making it not  available  to
        applications.
 
-       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type,  it  will
-       reuse  the  information.   It maintains only one copy of a given termi-
-       nal's capabilities in memory.  If it is called for  different  terminal
-       types,  <STRONG>setupterm</STRONG>  allocates new storage for each set of terminal capa-
+       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
+       reuse the information.  It maintains only one copy of  a  given  termi-
+       nal's  capabilities  in memory.  If it is called for different terminal
+       types, <STRONG>setupterm</STRONG> allocates new storage for each set of  terminal  capa-
        bilities.
 
-       The <STRONG>set_curterm</STRONG> routine sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes  all  of  the
-       <STRONG>terminfo</STRONG>  boolean,  numeric,  and  string variables use the values from
+       The  <STRONG>set_curterm</STRONG>  routine  sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes all of the
+       <STRONG>terminfo</STRONG> boolean, numeric, and string variables  use  the  values  from
        <EM>nterm</EM>.  It returns the old value of <STRONG>cur_term</STRONG>.
 
-       The <STRONG>del_curterm</STRONG> routine frees the space pointed to by <EM>oterm</EM>  and  makes
+       The  <STRONG>del_curterm</STRONG>  routine frees the space pointed to by <EM>oterm</EM> and makes
        it available for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, refer-
-       ences to any of the <STRONG>terminfo</STRONG> boolean,  numeric,  and  string  variables
-       thereafter  may  refer  to  invalid  memory locations until another <STRONG>se-</STRONG>
+       ences  to  any  of  the <STRONG>terminfo</STRONG> boolean, numeric, and string variables
+       thereafter may refer to invalid  memory  locations  until  another  <STRONG>se-</STRONG>
        <STRONG>tupterm</STRONG> has been called.
 
-       The <STRONG>restartterm</STRONG> routine is similar to  <STRONG>setupterm</STRONG>  and  <STRONG>initscr</STRONG>,  except
+       The  <STRONG>restartterm</STRONG>  routine  is  similar to <STRONG>setupterm</STRONG> and <STRONG>initscr</STRONG>, except
        that it is called after restoring memory to a previous state (for exam-
-       ple, when reloading a game saved as a core  image  dump).   <STRONG>restartterm</STRONG>
-       assumes  that the windows and the input and output options are the same
-       as when memory was saved, but the terminal type and baud  rate  may  be
-       different.   Accordingly,  <STRONG>restartterm</STRONG>  saves  various  tty state bits,
+       ple,  when  reloading  a game saved as a core image dump).  <STRONG>restartterm</STRONG>
+       assumes that the windows and the input and output options are the  same
+       as  when  memory  was saved, but the terminal type and baud rate may be
+       different.  Accordingly, <STRONG>restartterm</STRONG>  saves  various  tty  state  bits,
        calls <STRONG>setupterm</STRONG>, and then restores the bits.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       The <STRONG>tparm</STRONG> routine instantiates the string <EM>str</EM> with  parameters  <EM>pi</EM>.   A
-       pointer  is  returned to the result of <EM>str</EM> with the parameters applied.
-       Application developers should keep in mind these quirks of  the  inter-
+       The  <STRONG>tparm</STRONG>  routine  instantiates the string <EM>str</EM> with parameters <EM>pi</EM>.  A
+       pointer is returned to the result of <EM>str</EM> with the  parameters  applied.
+       Application  developers  should keep in mind these quirks of the inter-
        face:
 
-       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
+       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
            prototype expects <STRONG>long</STRONG> (integer) values.
 
        <STRONG>o</STRONG>   Aside from the <STRONG>set_attributes</STRONG> (<STRONG>sgr</STRONG>) capability, most terminal capa-
            bilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
+       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
+       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG>  is  a  newer  form of <STRONG>tparm</STRONG> which uses <EM>&lt;stdarg.h&gt;</EM> rather than a
+       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG> which uses  <EM>&lt;stdarg.h&gt;</EM>  rather  than  a
        fixed-parameter list.  Its numeric parameters are integers (int) rather
        than longs.
 
+       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
+       consistent  with the terminal description.  Two extensions are provided
+       as alternatives to deal with untrusted data:
+
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
+           <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the curses
+           library how many parameters to expect in the  parameter  list,  and
+           which may be string parameters.
+
+           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
+           to 9) which will be passed as char* rather than numbers.
+
+       <STRONG>o</STRONG>   The extension <STRONG>tiscan_s</STRONG> allows the application to inspect a  format-
+           ting capability to see what the curses library would assume.
+
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
        The  <STRONG>tputs</STRONG>  routine  applies padding information (i.e., by interpreting
@@ -440,6 +460,7 @@ <H1 class="no-header">curs_terminfo 3x</H1>
        mvcur       low level cursor motion
        putp        utility function that uses <STRONG>tputs</STRONG> to send  char-
                    acters via <STRONG>putchar</STRONG>.
+
        resetterm   set tty modes to "out of curses" state
        resetty     reset tty flags to stored value
        saveterm    save current modes as "in curses" state
@@ -515,6 +536,12 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
+</PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
+       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
+       are not found in SVr4 curses, 4.4BSD curses, or any other previous ver-
+       sion of curses.
+
+
 </PRE><H3><a name="h3-Legacy-functions">Legacy functions</a></H3><PRE>
        X/Open notes that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros.
 
@@ -671,6 +698,7 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
+<li><a href="#h3-Extensions">Extensions</a></li>
 <li><a href="#h3-Legacy-functions">Legacy functions</a></li>
 <li><a href="#h3-Legacy-data">Legacy data</a></li>
 <li><a href="#h3-Output-buffering">Output buffering</a></li>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 9551b458e..0cd939680 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index bb5957a5d..b59abd93e 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 1ab520712..32e9d4320 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 8f4641bf9..38c6d3c7b 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 9cf27bf54..15b1d8f2a 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.156 2021/12/25 21:19:26 tom Exp @
+  * @Id: ncurses.3x,v 1.157 2023/04/23 23:17:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -624,6 +624,8 @@ <H1 class="no-header">ncurses 3x</H1>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     tiparm                   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
+                    tiparm_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
+                    tiscan_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
                     touchline                <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     touchwin                 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     tparm                    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
@@ -641,9 +643,9 @@ <H1 class="no-header">ncurses 3x</H1>
                     use_extended_names       <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
                     use_tioctl               <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
+
                     vid_attr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vid_puts                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-
                     vidattr                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vidputs                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vline                    <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -707,9 +709,9 @@ <H1 class="no-header">ncurses 3x</H1>
                     winchstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winnstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winnwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+
                     wins_nwstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     wins_wch                 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
-
                     wins_wstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     winsch                   <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     winsdelln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 9cd27f500..8393f146e 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 0fd84723d..25b330fb9 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 228e17d8c..7573d4f07 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 88986bf79..e540c8f81 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 6c12f0370..9779a01a1 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 388596240..c51a0b845 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index ee2316408..604376cb4 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 19396d91b..f6b5eb20d 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -391,7 +391,7 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230408).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
 
 
 
diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index e79840d99..a93d8e86e 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -26,7 +26,7 @@ BEGIN {
 	lcurl = "{";
 	rcurl = "}";
 	print  "/****************************************************************************"
-	print  " * Copyright 2018-2020,2021 Thomas E. Dickey                                *"
+	print  " * Copyright 2018-2021,2023 Thomas E. Dickey                                *"
 	print  " * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *"
 	print  " *                                                                          *"
 	print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
@@ -60,7 +60,7 @@ BEGIN {
 	print  "/*    and: Thomas E. Dickey                        1995-on                  */"
 	print  "/****************************************************************************/"
 	print  ""
-	print  "/* $Id: MKterm.h.awk.in,v 1.82 2021/09/24 17:02:46 tom Exp $ */"
+	print  "/* $Id: MKterm.h.awk.in,v 1.85 2023/04/23 19:15:36 tom Exp $ */"
 	print  ""
 	print  "/*"
 	print  "**	term.h -- Definition of struct term"
@@ -325,16 +325,11 @@ END {
 	print  "extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);"
 	print  "extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);"
 	print  "extern NCURSES_EXPORT(char *) _nc_tiparm(int, const char *, ...);"
-	print  ""
-	print  "#endif /* NCURSES_INTERNALS */"
-	print  ""
-	print  ""
-	print  "/*"
-	print  " * These entrypoints are used by tack 1.07."
-	print  " */"
 	print  "extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);"
 	print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
 	print  ""
+	print  "#endif /* NCURSES_INTERNALS */"
+	print  ""
 	print  "/*"
 	print  " * Normal entry points"
 	print  " */"
@@ -360,6 +355,8 @@ END {
 	print  "#endif"
 	print  ""
 	print  "extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */"
+	print  "extern NCURSES_EXPORT(char *) tiparm_s (int, int, const char *, ...);	/* special */"
+	print  "extern NCURSES_EXPORT(int) tiscan_s (int *, int *, const char *);	/* special */"
 	print  ""
 	print  "#endif /* __NCURSES_H */"
 	print  ""
diff --git a/include/curses.h.in b/include/curses.h.in
index 6acf2d03f..f599b162c 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.277 2021/09/24 16:07:37 tom Exp $ */
+/* $Id: curses.h.in,v 1.279 2023/04/23 19:15:47 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -896,6 +896,8 @@ extern NCURSES_EXPORT(char *) tparm (const char *, NCURSES_TPARM_ARG,NCURSES_TPA
 #endif
 
 extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
+extern NCURSES_EXPORT(char *) tiparm_s (int, int, const char *, ...);	/* special */
+extern NCURSES_EXPORT(int) tiscan_s (int *, int *, const char *);	/* special */
 
 /*
  * These functions are not in X/Open, but we use them in macro definitions:
diff --git a/include/headers b/include/headers
index 32e33fdbc..e1293b28a 100644
--- a/include/headers
+++ b/include/headers
@@ -1,6 +1,6 @@
-# $Id: headers,v 1.15 2020/08/29 18:51:13 tom Exp $
+# $Id: headers,v 1.16 2023/04/22 12:09:09 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2023 Thomas E. Dickey                                       #
 # Copyright 1998-2012,2013 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -39,11 +39,9 @@ ncurses_dll.h
 term.h
 termcap.h
 
-# Headers used only for tic, other programs using internal interfaces
+# Header used by tack 1.08
 @ ticlib
-$(srcdir)/tic.h
 $(srcdir)/term_entry.h
-$(srcdir)/nc_tparm.h
 
 # Porting
 @ port_win32con
diff --git a/include/nc_access.h b/include/nc_access.h
index d02aedc08..530e47a84 100644
--- a/include/nc_access.h
+++ b/include/nc_access.h
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 
-/* $Id: nc_access.h,v 1.3 2023/04/17 23:29:12 tom Exp $ */
+/* $Id: nc_access.h,v 1.4 2023/04/22 20:32:13 tom Exp $ */
 
 #ifndef NC_ACCESS_included
 #define NC_ACCESS_included 1
@@ -41,9 +41,10 @@ extern "C" {
 #endif
 
 /*
- * Turn off this symbol to limit access to environment variables when root.
+ * Turn off the 'use_terminfo_vars()' symbol to limit access to environment
+ * variables when running with privileges.
  */
-#ifdef USE_ROOT_ENVIRON
+#if defined(USE_ROOT_ENVIRON) && defined(USE_SETUID_ENVIRON)
 #define use_terminfo_vars() 1
 #else
 #define use_terminfo_vars() _nc_env_access()
diff --git a/include/ncurses_defs b/include/ncurses_defs
index 8a4185a93..6beab2f18 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.106 2023/04/18 00:20:54 tom Exp $
+# $Id: ncurses_defs,v 1.108 2023/04/23 19:39:00 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -192,6 +192,9 @@ HAVE_TERM_H	1
 HAVE_TGETENT	1
 HAVE_TIGETNUM	1
 HAVE_TIGETSTR	1
+HAVE_TIPARM	1
+HAVE_TIPARM_S	1
+HAVE_TISCAN_S	1
 HAVE_TIMES
 HAVE_TPUTS_SP
 HAVE_TSEARCH
diff --git a/include/term_entry.h b/include/term_entry.h
index 7425a76b8..24389ad38 100644
--- a/include/term_entry.h
+++ b/include/term_entry.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1998-on                 *
  ****************************************************************************/
 
-/* $Id: term_entry.h,v 1.63 2022/09/24 15:04:59 tom Exp $ */
+/* $Id: term_entry.h,v 1.64 2023/04/22 13:37:14 tom Exp $ */
 
 /*
  *	term_entry.h -- interface to entry-manipulation code
@@ -177,6 +177,7 @@ extern NCURSES_EXPORT(void) _nc_wrap_entry (ENTRY *const, bool);
 extern NCURSES_EXPORT(void) _nc_align_termtype (TERMTYPE2 *, TERMTYPE2 *);
 
 /* free_ttype.c: elementary allocation code */
+extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *);
 extern NCURSES_EXPORT(void) _nc_free_termtype1 (TERMTYPE *);
 extern NCURSES_EXPORT(void) _nc_free_termtype2 (TERMTYPE2 *);
 
@@ -210,26 +211,6 @@ extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
 
 #endif /* NCURSES_INTERNALS */
 
-/*
- * These entrypoints were used by tack before 1.08.
- */
-
-#undef  NCURSES_TACK_1_08
-#ifdef  NCURSES_INTERNALS
-#define NCURSES_TACK_1_08 /* nothing */
-#else
-#define NCURSES_TACK_1_08 GCC_DEPRECATED("upgrade to tack 1.08")
-#endif
-
-/* alloc_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, const TERMTYPE *) NCURSES_TACK_1_08;
-
-/* lib_acs.c */
-extern NCURSES_EXPORT(void) _nc_init_acs (void) NCURSES_TACK_1_08;	/* corresponds to traditional 'init_acs()' */
-
-/* free_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *) NCURSES_TACK_1_08;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/tic.h b/include/tic.h
index 302c06d8a..7569aae9f 100644
--- a/include/tic.h
+++ b/include/tic.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: tic.h,v 1.86 2022/09/17 16:01:45 tom Exp $
+ * $Id: tic.h,v 1.87 2023/04/22 13:37:21 tom Exp $
  *	tic.h - Global variables and structures for the terminfo compiler.
  */
 
@@ -347,6 +347,14 @@ extern NCURSES_EXPORT(const char *) _nc_visbuf2 (int, const char *);
 /* lib_tputs.c */
 extern NCURSES_EXPORT_VAR(int) _nc_nulls_sent;	/* Add one for every null sent */
 
+/* comp_expand.c: expand string into readable form */
+extern NCURSES_EXPORT(char *) _nc_tic_expand (const char *, bool, int);
+
+/* comp_hash.c: name lookup */
+extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
+	(const char *, const HashValue *);
+extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool);
+
 /* comp_main.c: compiler main */
 extern const char * _nc_progname;
 
@@ -361,31 +369,6 @@ extern NCURSES_EXPORT(int) _nc_tic_written (void);
 
 #endif /* NCURSES_INTERNALS */
 
-/*
- * These entrypoints were used by tack before 1.08.
- */
-
-#undef  NCURSES_TACK_1_08
-#ifdef  NCURSES_INTERNALS
-#define NCURSES_TACK_1_08 /* nothing */
-#else
-#define NCURSES_TACK_1_08 GCC_DEPRECATED("upgrade to tack 1.08")
-#endif
-
-/* comp_hash.c: name lookup */
-extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-	(const char *, const HashValue *) NCURSES_TACK_1_08;
-extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool) NCURSES_TACK_1_08;
-
-/* comp_scan.c: lexical analysis */
-extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *) NCURSES_TACK_1_08;
-
-/* comp_expand.c: expand string into readable form */
-extern NCURSES_EXPORT(char *) _nc_tic_expand (const char *, bool, int) NCURSES_TACK_1_08;
-
-/* comp_scan.c: decode string from readable form */
-extern NCURSES_EXPORT(int) _nc_trans_string (char *, char *) NCURSES_TACK_1_08;
-
 #endif /* NCURSES_TERM_ENTRY_H_incl */
 
 #ifdef __cplusplus
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 46d50cc92..92fc81c1f 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.68 2022/02/12 20:06:41 tom Exp $
+.\" $Id: curs_color.3x,v 1.69 2023/04/23 20:53:20 tom Exp $
 .TH curs_color 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -516,6 +516,12 @@ the NetBSD color-pair information is stored in
 the attributes field of \fBcchar_t\fP, limiting the number of color-pairs
 by the size of the bitfield.
 .SH PORTABILITY
+.SS Extensions
+The functions marked as extensions were designed for \fBncurses\fP(3X),
+and are not found in SVr4 curses, 4.4BSD curses,
+or any other previous version of curses.
+.SS Standards
+.PP
 This implementation satisfies XSI Curses's minimum maximums
 for \fBCOLORS\fP and \fBCOLOR_PAIRS\fP.
 .PP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index dfb27629b..4e08bcbcb 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.84 2023/04/09 08:13:16 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.85 2023/04/23 20:52:38 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -51,6 +51,8 @@
 \fBtigetnum\fP,
 \fBtigetstr\fP,
 \fBtiparm\fP,
+\fBtiparm_s\fP,
+\fBtiscan_s\fP,
 \fBtparm\fP,
 \fBtputs\fP,
 \fBvid_attr\fP,
@@ -111,6 +113,12 @@
 \fBchar *tigetstr(const char *\fIcapname\fB);\fR
 .sp
 \fBchar *tiparm(const char *\fIstr\fB, ...);\fR
+.sp
+/* extensions */
+.br
+\fBchar *tiparm_s(int \fIexpected\fB, int \fImask\fB, const char *\fIstr\fB, ...);\fR
+.br
+\fBint tiscan_s(int *\fIexpected\fB, int *\fImask\fB, const char *\fIstr\fB);\fR
 .br
 .fi
 .SH DESCRIPTION
@@ -294,6 +302,22 @@ Use \*(``\\200\*('' where an ASCII NUL is needed in the output.
 \fBtiparm\fP is a newer form of \fBtparm\fP which uses \fI<stdarg.h>\fP
 rather than a fixed-parameter list.
 Its numeric parameters are integers (int) rather than longs.
+.PP
+Both \fBtparm\fP and \fBtiparm\fP assume that the application passes
+parameters consistent with the terminal description.
+Two extensions are provided as alternatives to deal with untrusted data:
+.bP
+\fBtiparm_s\fP is an extension which is a safer formatting function
+than \fBtparm\fR or \fBtiparm\fR,
+because it allows the developer to tell the curses
+library how many parameters to expect in the parameter list,
+and which may be string parameters.
+.IP
+The \fImask\fP parameter has one bit set for each of the parameters
+(up to 9) which will be passed as char* rather than numbers.
+.bP
+The extension \fBtiscan_s\fP allows the application
+to inspect a formatting capability to see what the curses library would assume.
 .\" ***************************************************************************
 .SS Output Functions
 .PP
@@ -609,6 +633,11 @@ but none were documented.
 The functions marked \*(``obsolete\*('' remained in use
 by the Unix \fBvi\fP(1) editor.
 .SH PORTABILITY
+.SS Extensions
+The functions marked as extensions were designed for \fBncurses\fP(3X),
+and are not found in SVr4 curses, 4.4BSD curses,
+or any other previous version of curses.
+.PP
 .SS Legacy functions
 .PP
 X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index fb306e06f..1d12a80ee 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.59 2022/10/22 16:41:43 tom Exp $
+# $Id: man_db.renames.in,v 1.60 2023/04/22 15:49:32 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -172,8 +172,6 @@ user_caps.5			user_caps.5
 wresize.3x			wresize.3ncurses
 #
 # Other:
-tack.1m				tack.1
-#
 getty.1				getty.8
 scanf.3				scanf.3
 ttys.5				ttys.4
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 5fc85a90e..dc308a6ec 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.156 2021/12/25 21:19:26 tom Exp $
+.\" $Id: ncurses.3x,v 1.157 2023/04/23 23:17:26 tom Exp $
 .hy 0
 .TH ncurses 3X ""
 .ie \n(.g .ds `` \(lq
@@ -664,6 +664,8 @@ tigetnum/\fBcurs_terminfo\fP(3X)
 tigetstr/\fBcurs_terminfo\fP(3X)
 timeout/\fBcurs_inopts\fP(3X)
 tiparm/\fBcurs_terminfo\fP(3X)*
+tiparm_s/\fBcurs_terminfo\fP(3X)*
+tiscan_s/\fBcurs_terminfo\fP(3X)*
 touchline/\fBcurs_touch\fP(3X)
 touchwin/\fBcurs_touch\fP(3X)
 tparm/\fBcurs_terminfo\fP(3X)
diff --git a/mk-1st.awk b/mk-1st.awk
index 30638c352..6a5eafab2 100644
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.124 2021/10/15 00:50:05 tom Exp $
+# $Id: mk-1st.awk,v 1.125 2023/04/22 15:49:59 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -354,8 +354,7 @@ BEGIN	{
 		 && ( $1 != "link_test" ) \
 		 && ( $2 == "lib" \
 		   || $2 == "progs" \
-		   || $2 == "c++" \
-		   || $2 == "tack" ))
+		   || $2 == "c++" ))
 		{
 			if ( found == 0 )
 			{
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 3aa480d95..1a74a8110 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.661 2023/03/25 23:12:24 tom Exp $
+ * $Id: curses.priv.h,v 1.663 2023/04/22 15:11:52 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1945,7 +1945,7 @@ extern NCURSES_EXPORT(void) _nc_linedump (void);
 
 /* lib_acs.c */
 extern NCURSES_EXPORT(void) _nc_init_acs (void); /* corresponds to traditional 'init_acs()' */
-extern NCURSES_EXPORT(int)  _nc_msec_cost (const char *const, int);  /* used by 'tack' program */
+extern NCURSES_EXPORT(int)  _nc_msec_cost (const char *const, int);
 
 /* lib_addch.c */
 #if USE_WIDEC_SUPPORT
@@ -2103,6 +2103,7 @@ extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2
 extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
+extern NCURSES_EXPORT(int) _nc_trans_string (char *, char *);
 extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
 extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
 extern NCURSES_EXPORT(void) _nc_flush (void);
@@ -2112,6 +2113,7 @@ extern NCURSES_EXPORT(void) _nc_hash_map (void);
 extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *);
 extern NCURSES_EXPORT(void) _nc_keep_tic_dir (const char *);
 extern NCURSES_EXPORT(void) _nc_make_oldhash (int i);
+extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *);
 extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot);
 extern NCURSES_EXPORT(void) _nc_scroll_optimize (void);
 extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, int);
@@ -2126,6 +2128,8 @@ extern NCURSES_EXPORT(const TERMTYPE2 *) _nc_fallback2 (const char *);
 #define _nc_fallback2(tp) _nc_fallback(tp)
 #endif
 
+NCURSES_EXPORT(void) _nc_copy_termtype(TERMTYPE *, const TERMTYPE *);
+
 #if NCURSES_EXT_NUMBERS
 extern NCURSES_EXPORT(void) _nc_copy_termtype2 (TERMTYPE2 *, const TERMTYPE2 *);
 extern NCURSES_EXPORT(void) _nc_export_termtype2(TERMTYPE *, const TERMTYPE2 *);
diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh
index c800023d1..5f4135028 100644
--- a/ncurses/tinfo/MKcaptab.sh
+++ b/ncurses/tinfo/MKcaptab.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2023 Thomas E. Dickey                                  #
 # Copyright 2007-2010,2011 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -27,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKcaptab.sh,v 1.19 2020/02/02 23:34:34 tom Exp $
+# $Id: MKcaptab.sh,v 1.20 2023/04/22 15:12:57 tom Exp $
 
 if test $# != 0
 then
@@ -153,7 +153,6 @@ _nc_get_table(bool termcap)
     return termcap ? build_names(cap) : build_names(info);
 }
 
-/* entrypoint used by tack 1.07 */
 NCURSES_EXPORT(const HashValue *)
 _nc_get_hash_table(bool termcap)
 {
diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 64c65f197..02b36ed73 100644
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2023 Thomas E. Dickey                                       #
 # Copyright 1998-2019,2020 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -27,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKfallback.sh,v 1.25 2020/08/16 15:58:44 tom Exp $
+# $Id: MKfallback.sh,v 1.26 2023/04/22 15:12:57 tom Exp $
 #
 # MKfallback.sh -- create fallback table for entry reads
 #
@@ -146,9 +146,6 @@ cat <<EOF
 #if NCURSES_EXT_NUMBERS
 #undef _nc_fallback
 
-/*
- * This entrypoint is used by tack 1.07
- */
 NCURSES_EXPORT(const TERMTYPE *)
 _nc_fallback (const char *name)
 {
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index edede176b..6c415acaa 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.35 2023/04/18 00:18:35 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.36 2023/04/22 21:19:56 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -232,12 +232,17 @@ _nc_env_access(void)
     int result = TRUE;
 
 #if HAVE_GETUID && HAVE_GETEUID
+#if !defined(USE_SETUID_ENVIRON)
     if (is_elevated()) {
 	result = FALSE;
-    } else if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) {
+    }
+#endif
+#if !defined(USE_ROOT_ENVIRON)
+    if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) {
 	result = FALSE;
     }
 #endif
+#endif /* HAVE_GETUID && HAVE_GETEUID */
     return result;
 }
 
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 6220c2105..36085e474 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.46 2022/09/17 21:44:35 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.48 2023/04/22 15:50:28 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -665,9 +665,6 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
     DEBUG(2, (T_RETURN("")));
 }
 
-/*
- * This entrypoint is used by tack 1.07
- */
 NCURSES_EXPORT(void)
 _nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src)
 {
diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
index 80755f220..eff60f127 100644
--- a/ncurses/tinfo/comp_hash.c
+++ b/ncurses/tinfo/comp_hash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,13 +45,12 @@
 #include <tic.h>
 #include <hashsize.h>
 
-MODULE_ID("$Id: comp_hash.c,v 1.53 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: comp_hash.c,v 1.54 2023/04/22 15:12:57 tom Exp $")
 
 /*
  * Finds the entry for the given string in the hash table if present.
  * Returns a pointer to the entry in the table or 0 if not found.
  */
-/* entrypoint used by tack 1.07 */
 NCURSES_EXPORT(struct name_table_entry const *)
 _nc_find_entry(const char *string,
 	       const HashValue * hash_table)
diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c
index 9622e0e11..7935152a7 100644
--- a/ncurses/tinfo/free_ttype.c
+++ b/ncurses/tinfo/free_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 1999-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: free_ttype.c,v 1.21 2022/05/28 18:02:33 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.22 2023/04/22 15:12:57 tom Exp $")
 
 static void
 really_free_termtype(TERMTYPE2 *ptr, bool freeStrings)
@@ -66,9 +66,6 @@ really_free_termtype(TERMTYPE2 *ptr, bool freeStrings)
     _nc_free_entry(_nc_head, ptr);
 }
 
-/*
- * This entrypoint was used by tack 1.07; deprecated with ncurses 6.2
- */
 NCURSES_EXPORT(void)
 _nc_free_termtype(TERMTYPE *ptr)
 {
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 8f63c567a..93af83504 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.142 2023/04/14 00:29:31 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.146 2023/04/23 20:57:33 tom Exp $")
 
 /*
  *	char *
@@ -1138,10 +1138,11 @@ check_string_caps(TPARM_DATA *data, const char *string)
     return result;
 }
 
-#define ValidCap() (myData.tparm_type == 0 || \
-		    check_string_caps(&myData, string))
+#define ValidCap(allow_strings) (myData.tparm_type == 0 || \
+				 (allow_strings && \
+				  check_string_caps(&myData, string)))
 #else
-#define ValidCap() 1
+#define ValidCap(allow_strings) 1
 #endif
 
 #if NCURSES_TPARM_VARARGS
@@ -1158,7 +1159,7 @@ tparm(const char *string, ...)
     tps->tname = "tparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(TRUE)) {
 	va_list ap;
 
 	va_start(ap, string);
@@ -1193,7 +1194,9 @@ tparm(const char *string,
     tps->tname = "tparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
+#define string_ok (sizeof(char*) <= sizeof(TPARM_ARG))
+
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(string_ok)) {
 
 	myData.param[0] = a1;
 	myData.param[1] = a2;
@@ -1224,7 +1227,7 @@ tiparm(const char *string, ...)
     tps->tname = "tiparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(TRUE)) {
 	va_list ap;
 
 	va_start(ap, string);
@@ -1236,6 +1239,61 @@ tiparm(const char *string, ...)
     return result;
 }
 
+/*
+ * Use tparm if the formatting string matches the expected number of parameters
+ * counting string-parameters.
+ */
+NCURSES_EXPORT(char *)
+tiparm_s(int num_expected, int tparm_type, const char *string, ...)
+{
+    TPARM_STATE *tps = get_tparm_state(cur_term);
+    TPARM_DATA myData;
+    char *result = NULL;
+
+    _nc_tparm_err = 0;
+#ifdef TRACE
+    tps->tname = "tiparm_s";
+#endif /* TRACE */
+    if (num_expected >= 0 &&
+	num_expected <= 9 &&
+	tparm_type >= 0 &&
+	tparm_type < 7 &&	/* limit to 2 string parameters */
+	tparm_setup(cur_term, string, &myData) == OK &&
+	myData.tparm_type == tparm_type &&
+	myData.num_actual == num_expected) {
+	va_list ap;
+
+	va_start(ap, string);
+	tparm_copy_valist(&myData, FALSE, ap);
+	va_end(ap);
+
+	result = tparam_internal(tps, string, &myData);
+    }
+    return result;
+}
+
+/*
+ * Analyze the formatting string, return the analysis.
+ */
+NCURSES_EXPORT(int)
+tiscan_s(int *num_expected, int *tparm_type, const char *string)
+{
+    TPARM_DATA myData;
+    int result = ERR;
+
+#ifdef TRACE
+    TPARM_STATE *tps = get_tparm_state(cur_term);
+    tps->tname = "tiscan_s";
+#endif /* TRACE */
+
+    if (tparm_setup(cur_term, string, &myData) == OK) {
+	*num_expected = myData.num_actual;
+	*tparm_type = myData.tparm_type;
+	result = OK;
+    }
+    return result;
+}
+
 /*
  * The internal-use flavor ensures that parameters are numbers, not strings.
  * In addition to ensuring that they are numbers, it ensures that the parameter
@@ -1270,7 +1328,7 @@ _nc_tiparm(int expected, const char *string, ...)
     tps->tname = "_nc_tiparm";
 #endif /* TRACE */
 
-    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap()) {
+    if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(FALSE)) {
 #ifdef CUR
 	if (myData.num_actual != expected && cur_term != NULL) {
 	    int needed = expected;
diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 0e52a4015..7aa30f5f6 100644
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,12 +52,12 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.109 2022/07/21 23:26:34 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.110 2023/04/22 15:12:57 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
 
-NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;   /* used by 'tack' program */
+NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;
 
 #if NCURSES_NO_PADDING
 NCURSES_EXPORT(void)
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 9c6e9b0e8..87e422aee 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.165 2023/04/08 20:14:49 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.166 2023/04/22 15:11:52 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -892,9 +892,6 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 }
 
 #if NCURSES_EXT_NUMBERS
-/*
- * This entrypoint is used by tack 1.07
- */
 NCURSES_EXPORT(int)
 _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp)
 {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4ee52de4f..b617c29ab 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230418) unstable; urgency=low
+ncurses6 (6.4+20230423) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4ee52de4f..b617c29ab 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230418) unstable; urgency=low
+ncurses6 (6.4+20230423) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d96f590a1..d84b865d6 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230418) unstable; urgency=low
+ncurses6 (6.4+20230423) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Apr 2023 20:25:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index b52530a1d..36f606a1b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.577 2023/04/18 00:25:00 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.579 2023/04/23 15:57:14 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0418"
+!define VERSION_MMDD  "0423"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 857b367a8..63becfbec 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230418
+Release: 20230423
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.map b/package/ncurses.map
index 7eb1ed1df..5c571fad8 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.55 2021/10/10 15:22:33 tom Exp $
+# $Id: ncurses.map,v 1.56 2023/04/23 23:13:53 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1214,6 +1214,12 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_safe_fopen;
 		_nc_safe_open3;
 		_nc_tiparm;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.4.current {
+	global:
+		tiparm_s;
+		tiscan_s;
 	local:
 		_*;
-} NCURSES_TINFO_6.2.20200212;
+} NCURSES_TINFO_6.2.20211010;
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8be4d131d..105db2500 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230418
+Release: 20230423
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.sym b/package/ncurses.sym
index d2f6fbc1f..072bff6f6 100644
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.37 2021/08/19 23:50:26 tom Exp $
+# $Id: ncurses.sym,v 1.38 2023/04/23 23:09:04 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -782,6 +782,8 @@ tigetstr
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
diff --git a/package/ncursest.map b/package/ncursest.map
index 205265de5..24e2944d6 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.53 2021/10/10 15:22:33 tom Exp $
+# $Id: ncursest.map,v 1.54 2023/04/23 23:13:35 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -493,9 +493,15 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_safe_fopen;
 		_nc_safe_open3;
 		_nc_tiparm;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.4.current {
+	global:
+		tiparm_s;
+		tiscan_s;
 	local:
 		_*;
-} NCURSES_TINFO_6.2.20200212;
+} NCURSES_TINFO_6.2.20211010;
 
 NCURSEST_5.7.20081102 {
 	global:
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c60c4772c..4aa466b45 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230418
+Release: 20230423
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.sym b/package/ncursest.sym
index f50ce3d02..7739f5518 100644
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.41 2021/08/19 23:50:26 tom Exp $
+# $Id: ncursest.sym,v 1.42 2023/04/23 23:09:14 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -781,6 +781,8 @@ tigetstr
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
diff --git a/package/ncursestw.map b/package/ncursestw.map
index f514b97f0..3a33bcfe1 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.56 2021/10/10 15:22:33 tom Exp $
+# $Id: ncursestw.map,v 1.57 2023/04/23 23:13:06 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -501,9 +501,15 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_safe_open3;
 		erasewchar_sp;
 		killwchar_sp;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.4.current {
+	global:
+		tiparm_s;
+		tiscan_s;
 	local:
 		_*;
-} NCURSES_TINFO_6.2.20200212;
+} NCURSES_TINFO_6.2.20211010;
 
 NCURSESTW_5.7.20081102 {
 	global:
diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index 1668f409d..3fe658458 100644
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.41 2021/08/19 23:50:26 tom Exp $
+# $Id: ncursestw.sym,v 1.42 2023/04/23 23:09:23 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -863,6 +863,8 @@ tigetstr
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
diff --git a/package/ncursesw.map b/package/ncursesw.map
index 13e8faf48..df09d336b 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.59 2021/10/10 15:22:33 tom Exp $
+# $Id: ncursesw.map,v 1.60 2023/04/23 23:12:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -495,9 +495,15 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_safe_open3;
 		erasewchar_sp;
 		killwchar_sp;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.4.current {
+	global:
+		tiparm_s;
+		tiscan_s;
 	local:
 		_*;
-} NCURSES_TINFO_6.2.20200212;
+} NCURSES_TINFO_6.2.20211010;
 
 NCURSESW_5.1.20000708 {
 	global:
diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index a17fd7948..205f6708c 100644
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.40 2021/08/19 23:50:26 tom Exp $
+# $Id: ncursesw.sym,v 1.41 2023/04/23 23:09:28 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -859,6 +859,8 @@ tigetstr
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
diff --git a/test/configure b/test/configure
index 77ddd0bbc..3b1d258e9 100755
--- a/test/configure
+++ b/test/configure
@@ -19376,6 +19376,8 @@ EOF
 esac
 
 for cf_func in \
+_nc_tparm_analyze \
+_tracef \
 alloc_pair \
 assume_default_colors \
 chgat \
@@ -19417,6 +19419,9 @@ termname \
 tgetent \
 tigetnum \
 tigetstr \
+tiparm \
+tiparm_s \
+tiscan_s \
 tputs_sp \
 typeahead \
 unget_wch \
@@ -19434,17 +19439,15 @@ winsdelln \
 winsstr \
 wresize \
 wsyncdown \
-_nc_tparm_analyze \
-_tracef \
 
 do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19444: checking for ${cf_func}" >&5
+	echo "$as_me:19447: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19447: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19450: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19453,7 +19456,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19456 "configure"
+#line 19459 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19486,16 +19489,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19492: \$? = $ac_status" >&5
+  echo "$as_me:19495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19498: \$? = $ac_status" >&5
+  echo "$as_me:19501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19511,7 +19514,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19514: result: $cf_result" >&5
+	echo "$as_me:19517: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19526,10 +19529,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19529: checking for ${cf_func}" >&5
+	echo "$as_me:19532: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19532: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19535: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19538,7 +19541,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19541 "configure"
+#line 19544 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19571,16 +19574,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19577: \$? = $ac_status" >&5
+  echo "$as_me:19580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19583: \$? = $ac_status" >&5
+  echo "$as_me:19586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19596,7 +19599,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19599: result: $cf_result" >&5
+	echo "$as_me:19602: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19620,7 +19623,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19623 "configure"
+#line 19626 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19640,21 +19643,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19646: \$? = $ac_status" >&5
+  echo "$as_me:19649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19652: \$? = $ac_status" >&5
+  echo "$as_me:19655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19657: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19660: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19674,14 +19677,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19677: checking for ncurses extended functions" >&5
+echo "$as_me:19680: 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 19684 "configure"
+#line 19687 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19696,16 +19699,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19702: \$? = $ac_status" >&5
+  echo "$as_me:19705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19708: \$? = $ac_status" >&5
+  echo "$as_me:19711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19713,7 +19716,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19716 "configure"
+#line 19719 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19738,16 +19741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19744: \$? = $ac_status" >&5
+  echo "$as_me:19747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19750: \$? = $ac_status" >&5
+  echo "$as_me:19753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19761,7 +19764,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19764: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19767: 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
@@ -19775,11 +19778,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19778: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19781: 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 19782 "configure"
+#line 19785 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19792,16 +19795,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19798: \$? = $ac_status" >&5
+  echo "$as_me:19801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19804: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19810,7 +19813,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19813 "configure"
+#line 19816 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19823,16 +19826,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19829: \$? = $ac_status" >&5
+  echo "$as_me:19832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19835: \$? = $ac_status" >&5
+  echo "$as_me:19838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19843,7 +19846,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19846: result: $cf_define_xpg5" >&5
+		echo "$as_me:19849: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19852,14 +19855,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19855: checking for wide-character functions" >&5
+	echo "$as_me:19858: 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 19862 "configure"
+#line 19865 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19876,16 +19879,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19882: \$? = $ac_status" >&5
+  echo "$as_me:19885: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19888: \$? = $ac_status" >&5
+  echo "$as_me:19891: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19896,7 +19899,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19899: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19902: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19917,14 +19920,14 @@ EOF
 
 fi
 
-echo "$as_me:19920: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19923: 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 19927 "configure"
+#line 19930 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19942,16 +19945,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19948: \$? = $ac_status" >&5
+  echo "$as_me:19951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19954: \$? = $ac_status" >&5
+  echo "$as_me:19957: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -19962,21 +19965,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19965: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:19968: 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:19972: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:19975: 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 19979 "configure"
+#line 19982 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19996,16 +19999,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20002: \$? = $ac_status" >&5
+  echo "$as_me:20005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20008: \$? = $ac_status" >&5
+  echo "$as_me:20011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20017,7 +20020,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20020: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20023: 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
@@ -20026,7 +20029,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20029: checking for openpty in -lutil" >&5
+echo "$as_me:20032: 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
@@ -20034,7 +20037,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20037 "configure"
+#line 20040 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20053,16 +20056,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20059: \$? = $ac_status" >&5
+  echo "$as_me:20062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20065: \$? = $ac_status" >&5
+  echo "$as_me:20068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20073,7 +20076,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20076: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20079: 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
@@ -20081,7 +20084,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20084: checking for openpty header" >&5
+echo "$as_me:20087: 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
@@ -20108,7 +20111,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20111 "configure"
+#line 20114 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20125,16 +20128,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20131: \$? = $ac_status" >&5
+  echo "$as_me:20134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20137: \$? = $ac_status" >&5
+  echo "$as_me:20140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20152,7 +20155,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20155: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20158: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20186,7 +20189,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20189: checking for function curses_version" >&5
+echo "$as_me:20192: 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
@@ -20196,7 +20199,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20199 "configure"
+#line 20202 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20212,15 +20215,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20218: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20218: \$? = $ac_status" >&5
+  echo "$as_me:20221: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20223: \$? = $ac_status" >&5
+  echo "$as_me:20226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20235,14 +20238,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20238: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20241: 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:20245: checking for alternate character set array" >&5
+echo "$as_me:20248: 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
@@ -20252,7 +20255,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20255 "configure"
+#line 20258 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20268,16 +20271,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20274: \$? = $ac_status" >&5
+  echo "$as_me:20277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20280: \$? = $ac_status" >&5
+  echo "$as_me:20283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20288,7 +20291,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20291: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20294: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20298,7 +20301,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20301: checking for wide alternate character set array" >&5
+echo "$as_me:20304: 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
@@ -20308,7 +20311,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20311 "configure"
+#line 20314 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20324,16 +20327,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20330: \$? = $ac_status" >&5
+  echo "$as_me:20333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20336: \$? = $ac_status" >&5
+  echo "$as_me:20339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20344,7 +20347,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20347: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20350: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20352,7 +20355,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20355: checking for wide alternate character constants" >&5
+echo "$as_me:20358: 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
@@ -20362,7 +20365,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20365 "configure"
+#line 20368 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20379,16 +20382,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20385: \$? = $ac_status" >&5
+  echo "$as_me:20388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20391: \$? = $ac_status" >&5
+  echo "$as_me:20394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20398,7 +20401,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20401 "configure"
+#line 20404 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20414,16 +20417,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20420: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20426: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20434,7 +20437,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20437: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20440: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20444,10 +20447,10 @@ EOF
 
 fi
 
-echo "$as_me:20447: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20450: 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 20450 "configure"
+#line 20453 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20465,16 +20468,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20471: \$? = $ac_status" >&5
+  echo "$as_me:20474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20477: \$? = $ac_status" >&5
+  echo "$as_me:20480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20483,7 +20486,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20486: result: $cf_result" >&5
+echo "$as_me:20489: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20504,14 +20507,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20507: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20510: 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 20514 "configure"
+#line 20517 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20529,23 +20532,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20535: \$? = $ac_status" >&5
+  echo "$as_me:20538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20541: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $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 20548 "configure"
+#line 20551 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20564,16 +20567,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20570: \$? = $ac_status" >&5
+  echo "$as_me:20573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20576: \$? = $ac_status" >&5
+  echo "$as_me:20579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20585,7 +20588,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20588: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20591: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20608,14 +20611,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20611: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20614: 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 20618 "configure"
+#line 20621 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20633,23 +20636,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20639: \$? = $ac_status" >&5
+  echo "$as_me:20642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20645: \$? = $ac_status" >&5
+  echo "$as_me:20648: \$? = $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 20652 "configure"
+#line 20655 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20668,16 +20671,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20674: \$? = $ac_status" >&5
+  echo "$as_me:20677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20680: \$? = $ac_status" >&5
+  echo "$as_me:20683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20689,7 +20692,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20692: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20695: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20712,14 +20715,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20715: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20718: 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 20722 "configure"
+#line 20725 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20737,23 +20740,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20743: \$? = $ac_status" >&5
+  echo "$as_me:20746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20749: \$? = $ac_status" >&5
+  echo "$as_me:20752: \$? = $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 20756 "configure"
+#line 20759 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20772,16 +20775,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20778: \$? = $ac_status" >&5
+  echo "$as_me:20781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20784: \$? = $ac_status" >&5
+  echo "$as_me:20787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20793,7 +20796,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20796: result: $cf_cv_wint_t" >&5
+echo "$as_me:20799: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20817,10 +20820,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20820: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20823: 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 20823 "configure"
+#line 20826 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20838,16 +20841,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20844: \$? = $ac_status" >&5
+  echo "$as_me:20847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20850: \$? = $ac_status" >&5
+  echo "$as_me:20853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20856,7 +20859,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20859: result: $cf_result" >&5
+echo "$as_me:20862: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20878,10 +20881,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20881: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20884: 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 20884 "configure"
+#line 20887 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20899,16 +20902,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20905: \$? = $ac_status" >&5
+  echo "$as_me:20908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20911: \$? = $ac_status" >&5
+  echo "$as_me:20914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20917,7 +20920,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20920: result: $cf_result" >&5
+echo "$as_me:20923: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20939,10 +20942,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:20942: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20945: 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 20945 "configure"
+#line 20948 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20960,16 +20963,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20966: \$? = $ac_status" >&5
+  echo "$as_me:20969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20972: \$? = $ac_status" >&5
+  echo "$as_me:20975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20978,7 +20981,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20981: result: $cf_result" >&5
+echo "$as_me:20984: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21007,11 +21010,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21010: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21013: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21014 "configure"
+#line 21017 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21044,16 +21047,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21050: \$? = $ac_status" >&5
+  echo "$as_me:21053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21056: \$? = $ac_status" >&5
+  echo "$as_me:21059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21063,7 +21066,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21066: result: $cf_result" >&5
+echo "$as_me:21069: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21075,14 +21078,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21078: checking for data $cf_data in library" >&5
+	echo "$as_me:21081: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21085 "configure"
+#line 21088 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21121,16 +21124,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21127: \$? = $ac_status" >&5
+  echo "$as_me:21130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21133: \$? = $ac_status" >&5
+  echo "$as_me:21136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21142,7 +21145,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21145 "configure"
+#line 21148 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21174,15 +21177,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21180: \$? = $ac_status" >&5
+  echo "$as_me:21183: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21185: \$? = $ac_status" >&5
+  echo "$as_me:21188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21194,7 +21197,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21197: result: $cf_result" >&5
+	echo "$as_me:21200: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21211,7 +21214,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21214: checking for X" >&5
+	echo "$as_me:21217: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21315,17 +21318,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21318 "configure"
+#line 21321 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21328: \$? = $ac_status" >&5
+  echo "$as_me:21331: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21358,7 +21361,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21361 "configure"
+#line 21364 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21370,16 +21373,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21376: \$? = $ac_status" >&5
+  echo "$as_me:21379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21382: \$? = $ac_status" >&5
+  echo "$as_me:21385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21417,7 +21420,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21420: result: $have_x" >&5
+  echo "$as_me:21423: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21427,7 +21430,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21430: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21433: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21454,11 +21457,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21457: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21460: 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 21461 "configure"
+#line 21464 "configure"
 #include "confdefs.h"
 
 int
@@ -21470,16 +21473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21476: \$? = $ac_status" >&5
+  echo "$as_me:21479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21482: \$? = $ac_status" >&5
+  echo "$as_me:21485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21489,13 +21492,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21492: result: no" >&5
+	echo "$as_me:21495: 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 21498 "configure"
+#line 21501 "configure"
 #include "confdefs.h"
 
 int
@@ -21507,16 +21510,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21513: \$? = $ac_status" >&5
+  echo "$as_me:21516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21519: \$? = $ac_status" >&5
+  echo "$as_me:21522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21526,11 +21529,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21529: result: yes" >&5
+	  echo "$as_me:21532: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21533: result: neither works" >&5
+	  echo "$as_me:21536: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21550,7 +21553,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21553 "configure"
+#line 21556 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21569,22 +21572,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21575: \$? = $ac_status" >&5
+  echo "$as_me:21578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21581: \$? = $ac_status" >&5
+  echo "$as_me:21584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21587: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21590: 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
@@ -21592,7 +21595,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21595 "configure"
+#line 21598 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21611,16 +21614,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21617: \$? = $ac_status" >&5
+  echo "$as_me:21620: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21623: \$? = $ac_status" >&5
+  echo "$as_me:21626: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21631,14 +21634,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21634: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21637: 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:21641: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21644: 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
@@ -21646,7 +21649,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21649 "configure"
+#line 21652 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21665,16 +21668,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21671: \$? = $ac_status" >&5
+  echo "$as_me:21674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21677: \$? = $ac_status" >&5
+  echo "$as_me:21680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21685,7 +21688,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21688: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21691: 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"
@@ -21704,13 +21707,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21707: checking for gethostbyname" >&5
+    echo "$as_me:21710: 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 21713 "configure"
+#line 21716 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21741,16 +21744,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21747: \$? = $ac_status" >&5
+  echo "$as_me:21750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21753: \$? = $ac_status" >&5
+  echo "$as_me:21756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21760,11 +21763,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21763: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21766: 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:21767: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21770: 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
@@ -21772,7 +21775,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21775 "configure"
+#line 21778 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21791,16 +21794,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21797: \$? = $ac_status" >&5
+  echo "$as_me:21800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21803: \$? = $ac_status" >&5
+  echo "$as_me:21806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21811,14 +21814,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21814: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21817: 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:21821: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21824: 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
@@ -21826,7 +21829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21829 "configure"
+#line 21832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21845,16 +21848,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21851: \$? = $ac_status" >&5
+  echo "$as_me:21854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21857: \$? = $ac_status" >&5
+  echo "$as_me:21860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21865,7 +21868,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21868: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21871: 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"
@@ -21881,13 +21884,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21884: checking for connect" >&5
+    echo "$as_me:21887: 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 21890 "configure"
+#line 21893 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21918,16 +21921,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21924: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21930: \$? = $ac_status" >&5
+  echo "$as_me:21933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -21937,11 +21940,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21940: result: $ac_cv_func_connect" >&5
+echo "$as_me:21943: 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:21944: checking for connect in -lsocket" >&5
+      echo "$as_me:21947: 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
@@ -21949,7 +21952,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21952 "configure"
+#line 21955 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21968,16 +21971,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21974: \$? = $ac_status" >&5
+  echo "$as_me:21977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21980: \$? = $ac_status" >&5
+  echo "$as_me:21983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -21988,7 +21991,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21991: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:21994: 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"
@@ -21997,13 +22000,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22000: checking for remove" >&5
+    echo "$as_me:22003: 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 22006 "configure"
+#line 22009 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22034,16 +22037,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22040: \$? = $ac_status" >&5
+  echo "$as_me:22043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22046: \$? = $ac_status" >&5
+  echo "$as_me:22049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22053,11 +22056,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22056: result: $ac_cv_func_remove" >&5
+echo "$as_me:22059: 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:22060: checking for remove in -lposix" >&5
+      echo "$as_me:22063: 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
@@ -22065,7 +22068,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22068 "configure"
+#line 22071 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22084,16 +22087,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22090: \$? = $ac_status" >&5
+  echo "$as_me:22093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22096: \$? = $ac_status" >&5
+  echo "$as_me:22099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22104,7 +22107,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22107: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22110: 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"
@@ -22113,13 +22116,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22116: checking for shmat" >&5
+    echo "$as_me:22119: 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 22122 "configure"
+#line 22125 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22150,16 +22153,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22156: \$? = $ac_status" >&5
+  echo "$as_me:22159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22162: \$? = $ac_status" >&5
+  echo "$as_me:22165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22169,11 +22172,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22172: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22175: 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:22176: checking for shmat in -lipc" >&5
+      echo "$as_me:22179: 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
@@ -22181,7 +22184,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22184 "configure"
+#line 22187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22200,16 +22203,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22206: \$? = $ac_status" >&5
+  echo "$as_me:22209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22212: \$? = $ac_status" >&5
+  echo "$as_me:22215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22220,7 +22223,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22223: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22226: 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"
@@ -22238,7 +22241,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22241: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22244: 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
@@ -22246,7 +22249,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22249 "configure"
+#line 22252 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22265,16 +22268,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22271: \$? = $ac_status" >&5
+  echo "$as_me:22274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22285,7 +22288,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22288: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22291: 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"
@@ -22332,16 +22335,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22335: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22338: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22340: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22343: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22344: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22347: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22380,16 +22383,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22383: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22386: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22388: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22391: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22392: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22395: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22428,23 +22431,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22431: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22434: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22436: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22439: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22440: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22443: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22447: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22450: 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.
@@ -22461,7 +22464,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22464: result: $enable_warnings" >&5
+echo "$as_me:22467: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22484,10 +22487,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22487: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22490: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22490 "${as_me:-configure}"
+#line 22493 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22537,12 +22540,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22540: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22543: \$? = $ac_status" >&5
+  echo "$as_me:22546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22545: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22548: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22620,7 +22623,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22623 "configure"
+#line 22626 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22635,26 +22638,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22641: \$? = $ac_status" >&5
+  echo "$as_me:22644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22647: \$? = $ac_status" >&5
+  echo "$as_me:22650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22650: checking for X11/Xt const-feature" >&5
+echo "$as_me:22653: 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 22657 "configure"
+#line 22660 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -22671,16 +22674,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22677: \$? = $ac_status" >&5
+  echo "$as_me:22680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22683: \$? = $ac_status" >&5
+  echo "$as_me:22686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22695,7 +22698,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22698: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22701: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22724,7 +22727,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22727 "${as_me:-configure}"
+#line 22730 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22740,7 +22743,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22743: checking for $CC warning options..." >&5
+	{ echo "$as_me:22746: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22756,12 +22759,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22759: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22762: \$? = $ac_status" >&5
+  echo "$as_me:22765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22764: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22767: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22769,7 +22772,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22772: checking for $CC warning options..." >&5
+	{ echo "$as_me:22775: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22792,12 +22795,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22795: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22798: \$? = $ac_status" >&5
+  echo "$as_me:22801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22800: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22803: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22805,7 +22808,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22808: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22811: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22815,7 +22818,7 @@ echo "${as_me:-configure}:22808: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22818: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22821: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22832,7 +22835,7 @@ fi
 
 fi
 
-echo "$as_me:22835: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22838: 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.
@@ -22854,7 +22857,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22857: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22860: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22968,23 +22971,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:22971: checking for dmalloc.h" >&5
+	echo "$as_me:22974: 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 22977 "configure"
+#line 22980 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22981: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22984: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22987: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23003,11 +23006,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23006: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23009: 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:23010: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23013: 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
@@ -23015,7 +23018,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23018 "configure"
+#line 23021 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23034,16 +23037,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23040: \$? = $ac_status" >&5
+  echo "$as_me:23043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23046: \$? = $ac_status" >&5
+  echo "$as_me:23049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23054,7 +23057,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23057: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23060: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23069,7 +23072,7 @@ fi
 
 fi
 
-echo "$as_me:23072: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23075: 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.
@@ -23091,7 +23094,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23094: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23097: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23205,23 +23208,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23208: checking for dbmalloc.h" >&5
+	echo "$as_me:23211: 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 23214 "configure"
+#line 23217 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23224: \$? = $ac_status" >&5
+  echo "$as_me:23227: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23240,11 +23243,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23243: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23246: 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:23247: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23250: 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
@@ -23252,7 +23255,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23255 "configure"
+#line 23258 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23271,16 +23274,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23277: \$? = $ac_status" >&5
+  echo "$as_me:23280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23283: \$? = $ac_status" >&5
+  echo "$as_me:23286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23291,7 +23294,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23294: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23297: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23306,7 +23309,7 @@ fi
 
 fi
 
-echo "$as_me:23309: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23312: 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.
@@ -23328,7 +23331,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23331: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23334: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23441,7 +23444,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23444: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23447: 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.
@@ -23452,7 +23455,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23455: result: $with_no_leaks" >&5
+echo "$as_me:23458: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23470,7 +23473,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23473: checking for an rpath option" >&5
+	echo "$as_me:23476: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23501,12 +23504,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23504: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23507: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23509: checking if we need a space after rpath option" >&5
+		echo "$as_me:23512: 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"
 
@@ -23527,7 +23530,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23530 "configure"
+#line 23533 "configure"
 #include "confdefs.h"
 
 int
@@ -23539,16 +23542,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23545: \$? = $ac_status" >&5
+  echo "$as_me:23548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23551: \$? = $ac_status" >&5
+  echo "$as_me:23554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23558,14 +23561,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23561: result: $cf_rpath_space" >&5
+		echo "$as_me:23564: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23568: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23571: 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.
@@ -23583,22 +23586,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23586: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23589: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23591: checking for updated LDFLAGS" >&5
+echo "$as_me:23594: 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:23594: result: maybe" >&5
+	echo "$as_me:23597: 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:23601: checking for $ac_word" >&5
+echo "$as_me:23604: 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
@@ -23613,7 +23616,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23616: found $ac_dir/$ac_word" >&5
+echo "$as_me:23619: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23621,10 +23624,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23624: result: $cf_ldd_prog" >&5
+  echo "$as_me:23627: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23627: result: no" >&5
+  echo "$as_me:23630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23638,7 +23641,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23641 "configure"
+#line 23644 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23650,16 +23653,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23656: \$? = $ac_status" >&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23662: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23687,7 +23690,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23693: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23699,11 +23702,11 @@ echo "${as_me:-configure}:23690: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23702: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23705: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23706: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23709: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23740,7 +23743,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23743: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23746: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23753,11 +23756,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23756: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23759: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23760: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23763: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23794,7 +23797,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23800: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23807,14 +23810,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23810: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23813: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23814: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23817: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23817: result: no" >&5
+	echo "$as_me:23820: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23904,7 +23907,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23907: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23910: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24085,7 +24088,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24088: error: ambiguous option: $1
+    { { echo "$as_me:24091: 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;}
@@ -24104,7 +24107,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24107: error: unrecognized option: $1
+  -*) { { echo "$as_me:24110: 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;}
@@ -24154,7 +24157,7 @@ do
   "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:24157: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24160: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24462,7 +24465,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24465: creating $ac_file" >&5
+    { echo "$as_me:24468: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24480,7 +24483,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24483: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24486: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24493,7 +24496,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24496: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24499: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24509,7 +24512,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24512: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24515: 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;}
@@ -24518,7 +24521,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24521: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24524: 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;}
@@ -24563,7 +24566,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24566: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24569: 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;}
@@ -24574,7 +24577,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24577: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24580: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24623,7 +24626,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24626: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24629: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24634,7 +24637,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24637: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24640: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24647,7 +24650,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24650: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24653: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24705,7 +24708,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24708: $ac_file is unchanged" >&5
+      { echo "$as_me:24711: $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/test/configure.in b/test/configure.in
index 5d19091a2..699436492 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.170 2023/04/15 19:55:36 tom Exp $
+dnl $Id: configure.in,v 1.173 2023/04/23 20:30:38 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -317,6 +317,8 @@ wcstombs \
 fi
 
 CF_CURSES_FUNCS( \
+_nc_tparm_analyze \
+_tracef \
 alloc_pair \
 assume_default_colors \
 chgat \
@@ -358,6 +360,9 @@ termname \
 tgetent \
 tigetnum \
 tigetstr \
+tiparm \
+tiparm_s \
+tiscan_s \
 tputs_sp \
 typeahead \
 unget_wch \
@@ -375,8 +380,6 @@ winsdelln \
 winsstr \
 wresize \
 wsyncdown \
-_nc_tparm_analyze \
-_tracef \
 )
 
 CF_TPUTS_PROTO
diff --git a/test/picsmap.c b/test/picsmap.c
index 04bae9852..b582f3aad 100644
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2017,2018 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.148 2022/12/04 00:40:11 tom Exp $
+ * $Id: picsmap.c,v 1.149 2023/04/23 23:20:37 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -53,13 +53,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#define my_intptr_t	intptr_t
-#else
-#define my_intptr_t	long
-#endif
-
 #if HAVE_TSEARCH
 #include <search.h>
 #endif
diff --git a/test/test.priv.h b/test/test.priv.h
index d0a2a9f71..555c8425b 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.213 2023/04/15 21:44:58 tom Exp $ */
+/* $Id: test.priv.h,v 1.216 2023/04/23 23:38:22 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -303,6 +303,18 @@
 #define HAVE_TIGETSTR 0
 #endif
 
+#ifndef HAVE_TIPARM
+#define HAVE_TIPARM 0
+#endif
+
+#ifndef HAVE_TIPARM_S
+#define HAVE_TIPARM_S 0
+#endif
+
+#ifndef HAVE_TISCAN_S
+#define HAVE_TISCAN_S 0
+#endif
+
 #ifndef HAVE_TPUTS_SP
 #define HAVE_TPUTS_SP 0
 #endif
@@ -475,6 +487,13 @@ extern int optind;
 #include <assert.h>
 #include <ctype.h>
 
+#if HAVE_STDINT_H
+#include <stdint.h>
+#define my_intptr_t	intptr_t
+#else
+#define my_intptr_t	long
+#endif
+
 #if defined(_MSC_VER)
 #undef popen
 #define popen(s,n) _popen(s,n)
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 86828a64a..7b59eee9c 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -29,13 +29,10 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.30 2023/04/15 22:31:47 tom Exp $
+ * $Id: test_tparm.c,v 1.36 2023/04/23 23:20:43 tom Exp $
  *
- * Exercise tparm, either for all possible capabilities with fixed parameters,
- * or one capability with all possible parameters.
- *
- * TODO: optionally test tiparm
- * TODO: add checks/logic to handle "%s" in tparm
+ * Exercise tparm/tiparm, either for all possible capabilities with fixed
+ * parameters, or one capability with specific combinations of parameters.
  */
 #define USE_TINFO
 #include <test.priv.h>
@@ -49,6 +46,8 @@
 #endif
 #endif
 
+#define MAX_PARM 9
+
 #define GrowArray(array,limit,length) \
 	    if (length + 2 >= limit) { \
 		limit *= 2; \
@@ -70,7 +69,9 @@ failed(const char *msg)
 #if HAVE_TIGETSTR
 
 static int a_opt;
+static int i_opt;
 static int p_opt;
+static int s_opt;
 static int v_opt;
 
 /*
@@ -141,8 +142,8 @@ increment(long *all_parms, int *num_parms, int len_parms, int end_parms)
     int rc = 0;
     int n;
 
-    if (len_parms > 9)
-	len_parms = 9;
+    if (len_parms > MAX_PARM)
+	len_parms = MAX_PARM;
 
     if (end_parms < len_parms) {
 	if (all_parms[end_parms]++ >= num_parms[end_parms]) {
@@ -163,27 +164,57 @@ increment(long *all_parms, int *num_parms, int len_parms, int end_parms)
 /* parse the format string to determine which positional parameters
  * are assumed to be strings.
  */
-#if HAVE__NC_TPARM_ANALYZE
+#if HAVE_TISCAN_S
+static int
+analyze_format(const char *format, int *mask, char **p_is_s)
+{
+    int arg_count;
+    int arg_mask;
+    int n;
+    if (tiscan_s(&arg_count, &arg_mask, format) == OK) {
+	*mask = arg_mask;
+	for (n = 0; n < MAX_PARM; ++n) {
+	    static char dummy[1];
+	    p_is_s[n] = (arg_mask & 1) ? dummy : NULL;
+	    arg_mask >>= 1;
+	}
+    } else {
+	*mask = 0;
+	arg_count = 0;
+	for (n = 0; n < MAX_PARM; ++n) {
+	    p_is_s[n] = NULL;
+	}
+    }
+    return arg_count;
+}
+#elif HAVE__NC_TPARM_ANALYZE
 extern int _nc_tparm_analyze(TERMINAL *, const char *, char **, int *);
 
 static int
-analyze_format(const char *format, char **p_is_s)
+analyze_format(const char *format, int *mask, char **p_is_s)
 {
     int popcount = 0;
     int analyzed = _nc_tparm_analyze(cur_term, format, p_is_s, &popcount);
+    int n;
     if (analyzed < popcount) {
 	analyzed = popcount;
     }
+    *mask = 0;
+    for (n = 0; n < MAX_PARM; ++n) {
+	if (p_is_s[n])
+	    *mask |= (1 << n);
+    }
     return analyzed;
 }
 #else
 /* TODO: make this work without direct use of ncurses internals. */
 static int
-analyze_format(const char *format, char **p_is_s)
+analyze_format(const char *format, int *mask, char **p_is_s)
 {
     int n;
     char *filler = strstr(format, "%s");
-    for (n = 0; n < 9; ++n) {
+    *mask = 0;
+    for (n = 0; n < MAX_PARM; ++n) {
 	p_is_s[n] = filler;
     }
     return n;
@@ -191,29 +222,104 @@ analyze_format(const char *format, char **p_is_s)
 #endif
 
 #define NumStr(n) use_strings[n] \
- 		  ? (long) (number[n] \
+ 		  ? (long) (my_intptr_t) (number[n] \
 		     ? string[n] \
 		     : NULL) \
 		  : number[n]
 
+#define NS_0(fmt)	fmt
+#define NS_1(fmt)	NS_0(fmt), NumStr(0)
+#define NS_2(fmt)	NS_1(fmt), NumStr(1)
+#define NS_3(fmt)	NS_2(fmt), NumStr(2)
+#define NS_4(fmt)	NS_3(fmt), NumStr(3)
+#define NS_5(fmt)	NS_4(fmt), NumStr(4)
+#define NS_6(fmt)	NS_5(fmt), NumStr(5)
+#define NS_7(fmt)	NS_6(fmt), NumStr(6)
+#define NS_8(fmt)	NS_7(fmt), NumStr(7)
+#define NS_9(fmt)	NS_8(fmt), NumStr(8)
+
 static void
 test_tparm(const char *name, const char *format, long *number, char **string)
 {
-    char *use_strings[9];
-    char *result;
+    char *use_strings[MAX_PARM];
+    char *result = NULL;
     int nparam;
-
-    nparam = analyze_format(format, use_strings);
-    result = tparm(format,
-		   NumStr(0),
-		   NumStr(1),
-		   NumStr(2),
-		   NumStr(3),
-		   NumStr(4),
-		   NumStr(5),
-		   NumStr(6),
-		   NumStr(7),
-		   NumStr(8));
+    int mask;
+
+    nparam = analyze_format(format, &mask, use_strings);
+#if HAVE_TIPARM_S
+    if (s_opt) {
+	switch (nparam) {
+	case 0:
+	    result = tiparm_s(0, mask, NS_0(format));
+	    break;
+	case 1:
+	    result = tiparm_s(1, mask, NS_1(format));
+	    break;
+	case 2:
+	    result = tiparm_s(2, mask, NS_2(format));
+	    break;
+	case 3:
+	    result = tiparm_s(3, mask, NS_3(format));
+	    break;
+	case 4:
+	    result = tiparm_s(4, mask, NS_4(format));
+	    break;
+	case 5:
+	    result = tiparm_s(5, mask, NS_5(format));
+	    break;
+	case 6:
+	    result = tiparm_s(6, mask, NS_6(format));
+	    break;
+	case 7:
+	    result = tiparm_s(7, mask, NS_7(format));
+	    break;
+	case 8:
+	    result = tiparm_s(8, mask, NS_8(format));
+	    break;
+	case 9:
+	    result = tiparm_s(9, mask, NS_9(format));
+	    break;
+	}
+    } else
+#endif
+#if HAVE_TIPARM
+    if (i_opt) {
+	switch (nparam) {
+	case 0:
+	    result = tiparm(NS_0(format));
+	    break;
+	case 1:
+	    result = tiparm(NS_1(format));
+	    break;
+	case 2:
+	    result = tiparm(NS_2(format));
+	    break;
+	case 3:
+	    result = tiparm(NS_3(format));
+	    break;
+	case 4:
+	    result = tiparm(NS_4(format));
+	    break;
+	case 5:
+	    result = tiparm(NS_5(format));
+	    break;
+	case 6:
+	    result = tiparm(NS_6(format));
+	    break;
+	case 7:
+	    result = tiparm(NS_7(format));
+	    break;
+	case 8:
+	    result = tiparm(NS_8(format));
+	    break;
+	case 9:
+	    result = tiparm(NS_9(format));
+	    break;
+	}
+    } else
+#endif
+	result = tiparm(NS_9(format));
     total_tests++;
     if (result != NULL) {
 	tputs(result, 1, output_func);
@@ -253,8 +359,14 @@ usage(int ok)
 	,"          to read a list from standard-input"
 	," -a       test all combinations of parameters"
 	,"          [value1...] forms a vector of maximum parameter-values."
+#if HAVE_TIPARM
+	," -i       test tiparm rather than tparm"
+#endif
 	," -p       test capabilities with no parameters but having padding"
 	," -r NUM   repeat tests NUM times"
+#if HAVE_TIPARM_S
+	," -s       test tiparm_s rather than tparm"
+#endif
 	," -v       show values and results"
     };
     unsigned n;
@@ -294,6 +406,8 @@ main(int argc, char *argv[])
     char **all_terms = typeCalloc(char *, max_terms);
 
     int use_caps;
+    int max_name = 10;		/* max # of items in cap_name[] */
+    int max_data = 10;		/* max # of items in cap_data[] */
     char **cap_name;
     char **cap_data;
 
@@ -306,7 +420,7 @@ main(int argc, char *argv[])
     if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0)
 	failed("no memory");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "T:apr:v")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) {
 	switch (ch) {
 	case 'T':
 	    t_opt = optarg;
@@ -314,12 +428,22 @@ main(int argc, char *argv[])
 	case 'a':
 	    ++a_opt;
 	    break;
+#if HAVE_TIPARM
+	case 'i':
+	    ++i_opt;
+	    break;
+#endif
 	case 'p':
 	    ++p_opt;
 	    break;
 	case 'r':
 	    r_opt = atoi(optarg);
 	    break;
+#if HAVE_TIPARM_S
+	case 's':
+	    ++s_opt;
+	    break;
+#endif
 	case 'v':
 	    ++v_opt;
 	    break;
@@ -451,8 +575,8 @@ main(int argc, char *argv[])
 	}
     }
 
-    cap_name = typeMalloc(char *, 1 + len_caps);
-    cap_data = typeMalloc(char *, 1 + len_caps);
+    cap_name = typeMalloc(char *, (max_name = 1 + len_caps));
+    cap_data = typeMalloc(char *, (max_data = 1 + len_caps));
 
     if (r_opt <= 0)
 	r_opt = 1;
@@ -476,6 +600,8 @@ main(int argc, char *argv[])
 		TERMTYPE *term = (TERMTYPE *) cur_term;
 		for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
 		    GrowArray(all_caps, max_caps, len_caps);
+		    GrowArray(cap_name, max_name, len_caps);
+		    GrowArray(cap_data, max_data, len_caps);
 		    all_caps[len_caps++] = strdup(ExtStrname(term, (int) n, strnames));
 		}
 	    }

From 0465162ca88befdec9dcf66b8f8ecf93857b3d6c Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Tue, 25 Apr 2023 02:03:30 +0200
Subject: [PATCH 006/106] ncurses-6.4-20230424.patch

---
 NEWS                             |  8 +++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 ncurses/llib-lncurses            | 17 ++++++++++++++++-
 ncurses/llib-lncursest           | 17 ++++++++++++++++-
 ncurses/llib-lncursestw          | 17 ++++++++++++++++-
 ncurses/llib-lncursesw           | 17 ++++++++++++++++-
 ncurses/llib-ltinfo              | 17 ++++++++++++++++-
 ncurses/llib-ltinfot             | 17 ++++++++++++++++-
 ncurses/llib-ltinfotw            | 17 ++++++++++++++++-
 ncurses/llib-ltinfow             | 17 ++++++++++++++++-
 ncurses/tinfo/parse_entry.c      | 27 ++++++++++++++++++---------
 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/README                      | 18 ++++++++++--------
 20 files changed, 177 insertions(+), 40 deletions(-)

diff --git a/NEWS b/NEWS
index 549857d22..c4d2ccac8 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3944 2023/04/23 21:11:05 tom Exp $
+-- $Id: NEWS,v 1.3945 2023/04/24 22:48:50 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230424
+	+ check return value of _nc_save_str(), in special case for tic where
+	  extended capabilities are processed but the terminal description was
+	  not initialized (report by Ziqiao Kong).
+	+ regenerate llib-* files.
+
 20230423
 	+ add tiscan_s() to help applications check formatting capabilities
 	  that would be passed to tiparm_s, etc.
diff --git a/VERSION b/VERSION
index 36526f0bc..32a99945b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230423
+5:0:10	6.4	20230424
diff --git a/dist.mk b/dist.mk
index 9968b9c5f..683355a1a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1539 2023/04/23 15:57:14 tom Exp $
+# $Id: dist.mk,v 1.1540 2023/04/24 22:49:54 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230423
+NCURSES_PATCH = 20230424
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index 211cf3b76..619e15c7e 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -3656,6 +3656,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 1b09d676f..64ebbe14a 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -3741,6 +3741,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 4576e0fc8..1f3b0e4f8 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -4702,6 +4702,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index 127350d2b..f1a10b896 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -4617,6 +4617,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index a5cd7cd35..a25f417e7 100644
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -927,6 +927,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index bd3de8125..0cefd7e3d 100644
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -1003,6 +1003,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw
index 4d35a1e10..1061bf36a 100644
--- a/ncurses/llib-ltinfotw
+++ b/ncurses/llib-ltinfotw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -1025,6 +1025,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow
index db846764b..2819bb9ca 100644
--- a/ncurses/llib-ltinfow
+++ b/ncurses/llib-ltinfow
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -949,6 +949,21 @@ char	*tiparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm_s
+char	*tiparm_s(
+		int	num_expected,
+		int	tparm_type,
+		const char *string,
+		...)
+		{ return(*(char **)0); }
+
+#undef tiscan_s
+int	tiscan_s(
+		int	*num_expected,
+		int	*tparm_type,
+		const char *string)
+		{ return(*(int *)0); }
+
 #undef _nc_tiparm
 char	*_nc_tiparm(
 		int	expected,
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 14bcb67ed..13fef495a 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.107 2022/05/08 00:11:44 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.108 2023/04/24 22:32:33 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type)
 	/* Well, we are given a cancel for a name that we don't recognize */
 	return _nc_extend_names(entryp, name, STRING);
     default:
-	return 0;
+	return NULL;
     }
 
     /* Adjust the 'offset' (insertion-point) to keep the lists of extended
@@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type)
 	for (last = (unsigned) (max - 1); last > tindex; last--)
 
     if (!found) {
+	char *saved;
+
+	if ((saved = _nc_save_str(name)) == NULL)
+	    return NULL;
+
 	switch (token_type) {
 	case BOOLEAN:
 	    tp->ext_Booleans++;
@@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type)
 	TYPE_REALLOC(char *, actual, tp->ext_Names);
 	while (--actual > offset)
 	    tp->ext_Names[actual] = tp->ext_Names[actual - 1];
-	tp->ext_Names[offset] = _nc_save_str(name);
+	tp->ext_Names[offset] = saved;
     }
 
     temp.nte_name = tp->ext_Names[offset];
@@ -364,6 +369,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 	bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0);
 	bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0);
 	if (is_use || is_tc) {
+	    char *saved;
+
 	    if (!VALID_STRING(_nc_curr_token.tk_valstring)
 		|| _nc_curr_token.tk_valstring[0] == '\0') {
 		_nc_warning("missing name for use-clause");
@@ -377,11 +384,13 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 			    _nc_curr_token.tk_valstring);
 		continue;
 	    }
-	    entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring);
-	    entryp->uses[entryp->nuses].line = _nc_curr_line;
-	    entryp->nuses++;
-	    if (entryp->nuses > 1 && is_tc) {
-		BAD_TC_USAGE
+	    if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) {
+		entryp->uses[entryp->nuses].name = saved;
+		entryp->uses[entryp->nuses].line = _nc_curr_line;
+		entryp->nuses++;
+		if (entryp->nuses > 1 && is_tc) {
+		    BAD_TC_USAGE
+		}
 	    }
 	} else {
 	    /* normal token lookup */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b617c29ab..621fe2e1e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230423) unstable; urgency=low
+ncurses6 (6.4+20230424) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b617c29ab..621fe2e1e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230423) unstable; urgency=low
+ncurses6 (6.4+20230424) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d84b865d6..6c9806d8b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230423) unstable; urgency=low
+ncurses6 (6.4+20230424) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Apr 2023 11:57:14 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 36f606a1b..179aff540 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.579 2023/04/23 15:57:14 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.580 2023/04/24 07:48:00 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0423"
+!define VERSION_MMDD  "0424"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 63becfbec..2dcca8bc1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230423
+Release: 20230424
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 105db2500..1c72cc534 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230423
+Release: 20230424
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 4aa466b45..b57053747 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230423
+Release: 20230424
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/README b/test/README
index 7844aa7e3..134c00f54 100644
--- a/test/README
+++ b/test/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2018-2021,2022 Thomas E. Dickey                                 --
+-- Copyright 2018-2022,2023 Thomas E. Dickey                                 --
 -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.77 2022/08/13 23:34:33 tom Exp $
+-- $Id: README,v 1.78 2023/04/24 23:14:45 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -296,8 +296,8 @@ cur_term			test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrt
 curs_set			test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo picsmap rain savescreen tclock testcurs worm xmas
 curs_set_sp			test: sp_tinfo
 curscr				test: demo_panels knight lrtest ncurses popup_msg savescreen tclock
-curses_trace			test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm
-curses_version			test: ncurses progs: clear infocmp tabs tic toe tput tset
+curses_trace			test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm progs: infocmp tic toe
+curses_version			test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs demo_termcap demo_terminfo ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight list_keys lrtest move_field movewindow ncurses newdemo padview pair_content picsmap railroad rain redraw savescreen sp_tinfo tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_arrays test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_sgr test_termattrs test_tparm test_unget_wch test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas progs: clear infocmp tabs tic toe tput tset
 def_prog_mode			test: bs ncurses
 def_prog_mode_sp		test: sp_tinfo
 def_shell_mode			-
@@ -543,7 +543,7 @@ mvwprintw			test: demo_menus demo_panels inch_wide inchs ncurses test_delwin tes
 mvwscanw			test: testcurs
 mvwvline			test: ins_wide inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr
 mvwvline_set			-
-napms				test: demo_panels ditto dots dots_curses dots_mvcur dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset
+napms				test: demo_panels ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset
 napms_sp			test: sp_tinfo
 new_prescr			test: sp_tinfo
 newpad				test: ncurses padview popup_msg testcurs
@@ -686,7 +686,7 @@ tgetnum				test: demo_termcap dots_termcap railroad
 tgetnum_sp			test: sp_tinfo
 tgetstr				test: demo_termcap dots_termcap railroad
 tgetstr_sp			test: sp_tinfo
-tgoto				test: dots_termcap railroad progs: tic
+tgoto				test: dots_termcap railroad test_mouse progs: tic
 tigetflag			test: demo_terminfo savescreen progs: tic tput
 tigetflag_sp			test: sp_tinfo
 tigetnum			test: demo_tabs demo_terminfo dots dots_mvcur ncurses savescreen progs: tput
@@ -694,10 +694,12 @@ tigetnum_sp			test: sp_tinfo
 tigetstr			test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_mouse test_sgr test_tparm testcurs progs: clear_cmd tic tput
 tigetstr_sp			test: sp_tinfo
 timeout				test: filter rain savescreen
-tiparm				-
+tiparm				test: test_tparm
+tiparm_s			test: test_tparm
+tiscan_s			test: test_tparm
 touchline			test: chgat clip_printw insdelln
 touchwin			test: chgat clip_printw demo_menus filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-tparm				test: dots dots_mvcur test_mouse test_sgr test_tparm progs: tic tput
+tparm				test: dots dots_mvcur test_sgr progs: tic tput
 tputs				test: dots dots_mvcur dots_termcap railroad test_tparm test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs
 tputs_sp			test: sp_tinfo
 trace				-

From 942babfda88bc45711b13c0957804e169d6daef0 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 30 Apr 2023 01:31:50 +0200
Subject: [PATCH 007/106] ncurses-6.4-20230429.patch

---
 NEWS                             | 10 +++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +--
 include/nc_access.h              | 14 ++++++-----
 ncurses/base/lib_echo.c          |  8 +++---
 ncurses/base/lib_getch.c         | 26 +++++++++----------
 ncurses/base/lib_getstr.c        | 30 +++++++++-------------
 ncurses/base/lib_nl.c            |  8 +++---
 ncurses/base/lib_restart.c       | 17 ++++++-------
 ncurses/base/lib_screen.c        |  8 +++---
 ncurses/curses.priv.h            | 43 +++++++++++++++++++-------------
 ncurses/tinfo/comp_expand.c      |  5 ++--
 ncurses/tinfo/comp_scan.c        |  6 ++---
 ncurses/tinfo/lib_options.c      |  6 ++---
 ncurses/tinfo/lib_raw.c          | 16 ++++++------
 ncurses/tinfo/read_termcap.c     |  6 ++---
 ncurses/tinfo/write_entry.c      | 30 ++++++++++++++++------
 ncurses/tty/lib_vidattr.c        |  6 +++--
 ncurses/widechar/lib_get_wstr.c  | 30 +++++++++-------------
 ncurses/widechar/lib_vid_attr.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 +-
 test/test_tparm.c                |  4 +--
 28 files changed, 163 insertions(+), 144 deletions(-)

diff --git a/NEWS b/NEWS
index c4d2ccac8..116c22daa 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3945 2023/04/24 22:48:50 tom Exp $
+-- $Id: NEWS,v 1.3948 2023/04/29 20:33:12 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230429
+	+ revise recent change to _nc_write_entry to isolate it to a Cygwin bug
+	  (cf: 20230311)
+	+ amend fix for wgetnstr, wgetn_wstr to use cbreak mode unless raw
+	  mode was set (cf: 20210522).
+	+ fix a few warnings from cppcheck, etc.
+	+ correct copy/paste error in nc_access.h (report by Werner Fink).
+
 20230424
 	+ check return value of _nc_save_str(), in special case for tic where
 	  extended capabilities are processed but the terminal description was
diff --git a/VERSION b/VERSION
index 32a99945b..bfa0c7a3a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230424
+5:0:10	6.4	20230429
diff --git a/dist.mk b/dist.mk
index 683355a1a..ed7d4e182 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1540 2023/04/24 22:49:54 tom Exp $
+# $Id: dist.mk,v 1.1541 2023/04/29 10:21:08 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230424
+NCURSES_PATCH = 20230429
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_access.h b/include/nc_access.h
index 530e47a84..acdf2e0ac 100644
--- a/include/nc_access.h
+++ b/include/nc_access.h
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 
-/* $Id: nc_access.h,v 1.4 2023/04/22 20:32:13 tom Exp $ */
+/* $Id: nc_access.h,v 1.5 2023/04/28 20:04:43 tom Exp $ */
 
 #ifndef NC_ACCESS_included
 #define NC_ACCESS_included 1
@@ -57,15 +57,17 @@ extern NCURSES_EXPORT(int) _nc_env_access (void);
  */
 #ifdef USE_ROOT_ACCESS
 
-#define safe_fopen(name,mode) fopen(name,mode)
+#define safe_fopen(name,mode)       fopen(name,mode)
+#define safe_open2(name,flags)      open(name,flags)
 #define safe_open3(name,flags,mode) open(name,flags,mode)
 
 #else
 
-#define safe_fopen(name,mode) fopen(name,mode)
-#define safe_open3(name,flags,mode) open(name,flags,mode)
-extern NCURSES_EXPORT(FILE *) _nc_safe_fopen (const char *, const char *);
-extern NCURSES_EXPORT(int) _nc_safe_open3 (const char *, int, mode_t);
+#define safe_fopen(name,mode)       _nc_safe_fopen(name,mode)
+#define safe_open2(name,flags)      _nc_safe_open2(name,flags,0)
+#define safe_open3(name,flags,mode) _nc_safe_open3(name,flags,mode)
+extern NCURSES_EXPORT(FILE *)       _nc_safe_fopen (const char *, const char *);
+extern NCURSES_EXPORT(int)          _nc_safe_open3 (const char *, int, mode_t);
 
 #endif
 
diff --git a/ncurses/base/lib_echo.c b/ncurses/base/lib_echo.c
index d8f57f292..de7832f4a 100644
--- a/ncurses/base/lib_echo.c
+++ b/ncurses/base/lib_echo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_echo.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_echo.c,v 1.10 2023/04/29 18:57:12 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
@@ -53,7 +53,7 @@ NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
     T((T_CALLED("echo(%p)"), (void *) SP_PARM));
     if (0 == SP_PARM)
 	returnCode(ERR);
-    SP_PARM->_echo = TRUE;
+    IsEcho(SP_PARM) = TRUE;
     returnCode(OK);
 }
 
@@ -71,7 +71,7 @@ NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
     T((T_CALLED("noecho(%p)"), (void *) SP_PARM));
     if (0 == SP_PARM)
 	returnCode(ERR);
-    SP_PARM->_echo = FALSE;
+    IsEcho(SP_PARM) = FALSE;
     returnCode(OK);
 }
 
diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 831ded9d2..8e4767918 100644
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.145 2022/12/24 22:38:38 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.146 2023/04/29 18:57:12 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -298,8 +298,8 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
     } else
 #endif
 #if USE_KLIBC_KBD
-    if (NC_ISATTY(sp->_ifd) && sp->_cbreak) {
-	ch = _read_kbd(0, 1, !sp->_raw);
+    if (NC_ISATTY(sp->_ifd) && IsCbreak(sp)) {
+	ch = _read_kbd(0, 1, !IsRaw(sp));
 	n = (ch == -1) ? -1 : 1;
 	sp->_extended_key = (ch == 0);
     } else
@@ -308,7 +308,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 #if defined(USE_TERM_DRIVER)
 	int buf;
 # if defined(EXP_WIN32_DRIVER)
-	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) {
+	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp)) {
 	    _nc_set_read_thread(TRUE);
 	    n = _nc_console_read(sp,
 				 _nc_console_handle(sp->_ifd),
@@ -316,7 +316,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 	    _nc_set_read_thread(FALSE);
 	} else
 # elif defined(_NC_WINDOWS)
-	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak)
+	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp))
 	    n = _nc_mingw_console_read(sp,
 				       _nc_get_handle(sp->_ifd),
 				       &buf);
@@ -479,8 +479,8 @@ _nc_wgetch(WINDOW *win,
      */
     if (head == -1 &&
 	!sp->_notty &&
-	!sp->_raw &&
-	!sp->_cbreak &&
+	!IsRaw(sp) &&
+	!IsCbreak(sp) &&
 	!sp->_called_wgetch) {
 	char buf[MAXCOLUMNS], *bufp;
 
@@ -513,13 +513,13 @@ _nc_wgetch(WINDOW *win,
 
     recur_wrefresh(win);
 
-    if (win->_notimeout || (win->_delay >= 0) || (sp->_cbreak > 1)) {
+    if (win->_notimeout || (win->_delay >= 0) || (IsCbreak(sp) > 1)) {
 	if (head == -1) {	/* fifo is empty */
 	    int delay;
 
 	    TR(TRACE_IEVENT, ("timed delay in wgetch()"));
-	    if (sp->_cbreak > 1)
-		delay = (sp->_cbreak - 1) * 100;
+	    if (IsCbreak(sp) > 1)
+		delay = (IsCbreak(sp) - 1) * 100;
 	    else
 		delay = win->_delay;
 
@@ -638,7 +638,7 @@ _nc_wgetch(WINDOW *win,
      * However, we provide the same visual result as Solaris, moving the
      * cursor to the left.
      */
-    if (sp->_echo && !IS_PAD(win)) {
+    if (IsEcho(sp) && !IS_PAD(win)) {
 	chtype backup = (chtype) ((ch == KEY_BACKSPACE) ? '\b' : ch);
 	if (backup < KEY_MIN)
 	    wechochar(win, backup);
@@ -647,7 +647,7 @@ _nc_wgetch(WINDOW *win,
     /*
      * Simulate ICRNL mode
      */
-    if ((ch == '\r') && sp->_nl)
+    if ((ch == '\r') && IsNl(sp))
 	ch = '\n';
 
     /* Strip 8th-bit if so desired.  We do this only for characters that
diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index 8ddf7651a..cac21fc85 100644
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getstr.c,v 1.38 2021/10/23 19:02:39 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.39 2023/04/29 19:00:17 tom Exp $")
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
@@ -78,7 +78,7 @@ wgetnstr_events(WINDOW *win,
 {
     SCREEN *sp = _nc_screen_of(win);
     TTY buf;
-    bool oldnl, oldecho, oldraw, oldcbreak;
+    TTY_FLAGS save_flags;
     char erasec;
     char killc;
     char *oldstr;
@@ -94,13 +94,11 @@ wgetnstr_events(WINDOW *win,
 
     NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx &buf);
 
-    oldnl = sp->_nl;
-    oldecho = sp->_echo;
-    oldraw = sp->_raw;
-    oldcbreak = sp->_cbreak;
+    save_flags = sp->_tty_flags;
     NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
+    if (!save_flags._raw)
+	NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
 
     erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG);
     killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG);
@@ -122,7 +120,7 @@ wgetnstr_events(WINDOW *win,
 	    || ch == '\r'
 	    || ch == KEY_DOWN
 	    || ch == KEY_ENTER) {
-	    if (oldecho == TRUE
+	    if (save_flags._echo == TRUE
 		&& win->_cury == win->_maxy
 		&& win->_scroll)
 		wechochar(win, (chtype) '\n');
@@ -138,18 +136,18 @@ wgetnstr_events(WINDOW *win,
 #endif
 	if (ch == erasec || ch == KEY_LEFT || ch == KEY_BACKSPACE) {
 	    if (str > oldstr) {
-		str = WipeOut(win, y, x, oldstr, str, oldecho);
+		str = WipeOut(win, y, x, oldstr, str, save_flags._echo);
 	    }
 	} else if (ch == killc) {
 	    while (str > oldstr) {
-		str = WipeOut(win, y, x, oldstr, str, oldecho);
+		str = WipeOut(win, y, x, oldstr, str, save_flags._echo);
 	    }
 	} else if (ch >= KEY_MIN
 		   || (str - oldstr >= maxlen)) {
 	    NCURSES_SP_NAME(beep) (NCURSES_SP_ARG);
 	} else {
 	    *str++ = (char) ch;
-	    if (oldecho == TRUE) {
+	    if (save_flags._echo == TRUE) {
 		int oldy = win->_cury;
 		if (waddch(win, (chtype) ch) == ERR) {
 		    /*
@@ -159,7 +157,7 @@ wgetnstr_events(WINDOW *win,
 		     */
 		    win->_flags &= ~_WRAPPED;
 		    waddch(win, (chtype) ' ');
-		    str = WipeOut(win, y, x, oldstr, str, oldecho);
+		    str = WipeOut(win, y, x, oldstr, str, save_flags._echo);
 		    continue;
 		} else if (IS_WRAPPED(win)) {
 		    /*
@@ -190,11 +188,7 @@ wgetnstr_events(WINDOW *win,
     /* Restore with a single I/O call, to fix minor asymmetry between
      * raw/noraw, etc.
      */
-    sp->_nl = oldnl;
-    sp->_echo = oldecho;
-    sp->_raw = oldraw;
-    sp->_cbreak = oldcbreak;
-
+    sp->_tty_flags = save_flags;
     NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
 
     *str = '\0';
diff --git a/ncurses/base/lib_nl.c b/ncurses/base/lib_nl.c
index df07349fc..417b257d0 100644
--- a/ncurses/base/lib_nl.c
+++ b/ncurses/base/lib_nl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_nl.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_nl.c,v 1.14 2023/04/29 18:51:49 tom Exp $")
 
 #ifdef __EMX__
 #include <io.h>
@@ -57,7 +57,7 @@ NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
     T((T_CALLED("nl(%p)"), (void *) SP_PARM));
     if (0 == SP_PARM)
 	returnCode(ERR);
-    SP_PARM->_nl = TRUE;
+    IsNl(SP_PARM) = TRUE;
 #ifdef __EMX__
     _nc_flush();
     _fsetmode(NC_OUTPUT(SP_PARM), "t");
@@ -79,7 +79,7 @@ NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
     T((T_CALLED("nonl(%p)"), (void *) SP_PARM));
     if (0 == SP_PARM)
 	returnCode(ERR);
-    SP_PARM->_nl = FALSE;
+    IsNl(SP_PARM) = FALSE;
 #ifdef __EMX__
     _nc_flush();
     _fsetmode(NC_OUTPUT(SP_PARM), "b");
diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index 81eb36884..0c61cb7ea 100644
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_restart.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.18 2023/04/29 19:01:25 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
@@ -65,31 +65,28 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
     if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
 	result = ERR;
     } else if (SP_PARM != 0) {
-	int saveecho = SP_PARM->_echo;
-	int savecbreak = SP_PARM->_cbreak;
-	int saveraw = SP_PARM->_raw;
-	int savenl = SP_PARM->_nl;
+	TTY_FLAGS save_flags = SP_PARM->_tty_flags;
 
 #ifdef USE_TERM_DRIVER
 	SP_PARM->_term = new_term;
 #endif
-	if (saveecho) {
+	if (save_flags._echo) {
 	    NCURSES_SP_NAME(echo) (NCURSES_SP_ARG);
 	} else {
 	    NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
 	}
 
-	if (savecbreak) {
+	if (save_flags._cbreak) {
 	    NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
 	    NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
-	} else if (saveraw) {
+	} else if (save_flags._raw) {
 	    NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
 	    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
 	} else {
 	    NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
 	    NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
 	}
-	if (savenl) {
+	if (save_flags._nl) {
 	    NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
 	} else {
 	    NCURSES_SP_NAME(nonl) (NCURSES_SP_ARG);
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index 70cf6fd8a..e2647b54e 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.104 2021/10/23 17:12:16 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.105 2023/04/28 20:58:54 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -90,7 +90,6 @@ typedef struct {
 typedef struct {
     const char name[17];
     PARAM_TYPE type;
-    size_t size;
     size_t offset;
 } SCR_PARAMS;
 
@@ -120,8 +119,7 @@ static const SCR_ATTRS scr_attrs[] =
 };
 #undef DATA
 
-#define sizeof2(type,name) sizeof(((type *)0)->name)
-#define DATA(name, type) { { #name }, type, sizeof2(WINDOW, name), offsetof(WINDOW, name) }
+#define DATA(name, type) { { #name }, type, offsetof(WINDOW, name) }
 
 static const SCR_PARAMS scr_params[] =
 {
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 1a74a8110..294ec594c 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.663 2023/04/22 15:11:52 tom Exp $
+ * $Id: curses.priv.h,v 1.664 2023/04/29 19:10:30 tom Exp $
  *
  *	curses.priv.h
  *
@@ -936,6 +936,19 @@ typedef enum {
     ewSuspend
 } ENDWIN;
 
+typedef struct {
+	int		_nl;		/* True if NL -> CR/NL is on	    */
+	int		_raw;		/* True if in raw mode		    */
+	int		_cbreak;	/* 1 if in cbreak mode		    */
+					/* > 1 if in halfdelay mode	    */
+	int		_echo;		/* True if echo on		    */
+} TTY_FLAGS;
+
+#define IsNl(sp)        (sp)->_tty_flags._nl
+#define IsRaw(sp)       (sp)->_tty_flags._raw
+#define IsCbreak(sp)    (sp)->_tty_flags._cbreak
+#define IsEcho(sp)      (sp)->_tty_flags._echo
+
 /*
  * The SCREEN structure.
  */
@@ -986,11 +999,7 @@ typedef struct screen {
 	int		_cursrow;	/* physical cursor row		    */
 	int		_curscol;	/* physical cursor column	    */
 	bool		_notty;		/* true if we cannot switch non-tty */
-	int		_nl;		/* True if NL -> CR/NL is on	    */
-	int		_raw;		/* True if in raw mode		    */
-	int		_cbreak;	/* 1 if in cbreak mode		    */
-					/* > 1 if in halfdelay mode	    */
-	int		_echo;		/* True if echo on		    */
+	TTY_FLAGS	_tty_flags;
 	int		_use_meta;	/* use the meta key?		    */
 	struct _SLK	*_slk;		/* ptr to soft key struct / NULL    */
 	int		slk_format;	/* selected format for this screen  */
@@ -1250,18 +1259,18 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #endif
 
 #define SP_PRE_INIT(sp)                         \
-    sp->_cursrow = -1;                          \
-    sp->_curscol = -1;                          \
-    sp->_nl = TRUE;                             \
-    sp->_raw = FALSE;                           \
-    sp->_cbreak = 0;                            \
-    sp->_echo = TRUE;                           \
-    sp->_fifohead = -1;                         \
-    sp->_endwin = ewSuspend;                    \
-    sp->_cursor = -1;                           \
+    sp->_cursrow           = -1;                \
+    sp->_curscol           = -1;                \
+    IsNl(sp)               = TRUE;              \
+    IsRaw(sp)              = FALSE;             \
+    IsCbreak(sp)           = 0;                 \
+    IsEcho(sp)             = TRUE;              \
+    sp->_fifohead          = -1;                \
+    sp->_endwin            = ewSuspend;         \
+    sp->_cursor            = -1;                \
     SP_INIT_WINDOWLIST(sp);                     \
-    sp->_outch = NCURSES_OUTC_FUNC;             \
-    sp->jump = 0                                \
+    sp->_outch             = NCURSES_OUTC_FUNC; \
+    sp->jump               = 0                  \
 
 /* usually in <limits.h> */
 #ifndef UCHAR_MAX
diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index 724283ce2..e971384f5 100644
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.34 2021/09/04 10:29:15 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.35 2023/04/28 20:59:06 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -129,7 +129,6 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 		    if (dst != 0
 			&& *dst == R_BRACE
 			&& value < 127
-			&& value != '\\'	/* FIXME */
 			&& isprint((int) value)) {
 			ch = (int) value;
 			buffer[bufp++] = S_QUOTE;
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index 71361c508..01c1f8b74 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
-,* Copyright 2020-2021,2022 Thomas E. Dickey                                *
+,* Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.119 2022/08/07 00:20:26 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.120 2023/04/29 19:54:37 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -302,7 +302,7 @@ push_back(int c)
 /* push a character back onto the input stream */
 {
     if (bufptr == bufstart)
-	_nc_syserr_abort("Can't backspace off beginning of line");
+	_nc_syserr_abort("cannot backspace off beginning of line");
     *--bufptr = (char) c;
     _nc_curr_col--;
 }
diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index 017a34aac..6a8bb3948 100644
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_options.c,v 1.82 2021/02/14 00:17:35 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.83 2023/04/29 18:56:12 tom Exp $")
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
@@ -92,7 +92,7 @@ NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
 	returnCode(ERR);
 
     NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
-    SP_PARM->_cbreak = t + 1;
+    IsCbreak(SP_PARM) = t + 1;
     returnCode(OK);
 }
 
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 1e47f3b6f..499fce650 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.26 2020/11/21 22:07:48 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.27 2023/04/29 18:56:30 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -116,8 +116,8 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
 	    KbdSetStatus(&kbdinfo, 0);
 #endif
 	    if (SP_PARM) {
-		SP_PARM->_raw = TRUE;
-		SP_PARM->_cbreak = 1;
+		IsRaw(SP_PARM) = TRUE;
+		IsCbreak(SP_PARM) = 1;
 	    }
 	    termp->Nttyb = buf;
 	}
@@ -163,7 +163,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
 	result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
 	if (result == OK) {
 	    if (SP_PARM) {
-		SP_PARM->_cbreak = 1;
+		IsCbreak(SP_PARM) = 1;
 	    }
 	    termp->Nttyb = buf;
 	}
@@ -255,8 +255,8 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0)
 	    KbdSetStatus(&kbdinfo, 0);
 #endif
 	    if (SP_PARM) {
-		SP_PARM->_raw = FALSE;
-		SP_PARM->_cbreak = 0;
+		IsRaw(SP_PARM) = FALSE;
+		IsCbreak(SP_PARM) = 0;
 	    }
 	    termp->Nttyb = buf;
 	}
@@ -298,7 +298,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0)
 	result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
 	if (result == OK) {
 	    if (SP_PARM) {
-		SP_PARM->_cbreak = 0;
+		IsCbreak(SP_PARM) = 0;
 	    }
 	    termp->Nttyb = buf;
 	}
diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index c9696b70a..9ff2b2bac 100644
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.102 2021/09/04 10:29:15 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.103 2023/04/28 20:59:14 tom Exp $")
 
 #if !PURE_TERMINFO
 
@@ -324,7 +324,7 @@ _nc_getent(
 	    if (fd >= 0) {
 		(void) lseek(fd, (off_t) 0, SEEK_SET);
 	    } else if ((_nc_access(db_array[current], R_OK) < 0)
-		       || (fd = open(db_array[current], O_RDONLY, 0)) < 0) {
+		       || (fd = safe_open2(db_array[current], O_RDONLY)) < 0) {
 		/* No error on unfound file. */
 		if (errno == ENOENT)
 		    continue;
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 15a0d8152..156ce7442 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,6 +42,8 @@
 
 #include <tic.h>
 
+MODULE_ID("$Id: write_entry.c,v 1.126 2023/04/29 20:30:57 tom Exp $")
+
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
 #define TRACE_NUM(n) if (VALID_NUMERIC(Numbers[n])) { \
@@ -51,7 +53,15 @@
 #define TRACE_NUM(n)		/* nothing */
 #endif
 
-MODULE_ID("$Id: write_entry.c,v 1.122 2023/04/17 08:08:08 tom Exp $")
+/*
+ * FIXME: special case to work around Cygwin bug in link(), which updates
+ * the target file's timestamp.
+ */
+#if HAVE_LINK && !USE_SYMLINKS && !MIXEDCASE_FILENAMES && defined(__CYGWIN__)
+#define LINK_TOUCHES 1
+#else
+#define LINK_TOUCHES 0
+#endif
 
 static int total_written;
 static int total_parts;
@@ -77,7 +87,7 @@ write_file(char *filename, TERMTYPE2 *tp)
 
 	if (fp == 0) {
 	    perror(filename);
-	    _nc_syserr_abort("can't open %s/%s", _nc_tic_dir(0), filename);
+	    _nc_syserr_abort("cannot open %s/%s", _nc_tic_dir(0), filename);
 	}
 
 	actual = fwrite(buffer, sizeof(char), (size_t) offset, fp);
@@ -468,10 +478,14 @@ _nc_write_entry(TERMTYPE2 *const tp)
 
 	if (strcmp(filename, linkname) == 0) {
 	    _nc_warning("self-synonym ignored");
-	} else if (stat(linkname, &statbuf) >= 0 &&
-		   statbuf.st_mtime > start_time) {
+	}
+#if !LINK_TOUCHES
+	else if (stat(linkname, &statbuf) >= 0 &&
+		 statbuf.st_mtime < start_time) {
 	    _nc_warning("alias %s multiply defined.", ptr);
-	} else if (_nc_access(linkname, W_OK) == 0)
+	}
+#endif
+	else if (_nc_access(linkname, W_OK) == 0)
 #if HAVE_LINK
 	{
 	    int code;
@@ -510,9 +524,9 @@ _nc_write_entry(TERMTYPE2 *const tp)
 		    write_file(linkname, tp);
 		else {
 #if MIXEDCASE_FILENAMES
-		    _nc_syserr_abort("can't link %s to %s", filename, linkname);
+		    _nc_syserr_abort("cannot link %s to %s", filename, linkname);
 #else
-		    _nc_warning("can't link %s to %s (errno=%d)", filename,
+		    _nc_warning("cannot link %s to %s (errno=%d)", filename,
 				linkname, errno);
 #endif
 		}
@@ -708,7 +722,7 @@ _nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit)
     unsigned last_str = STRWRITE;
 #if NCURSES_EXT_NUMBERS
     bool need_ints = FALSE;
-    size_t (*convert_numbers) (unsigned char *, NCURSES_INT2 *, size_t) = convert_32bit;
+    size_t (*convert_numbers) (unsigned char *, NCURSES_INT2 *, size_t);
 #else
 #define convert_numbers convert_shorts
 #endif
diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 15e7397d5..2c7a0b27b 100644
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -70,7 +70,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vidattr.c,v 1.78 2020/05/27 23:56:32 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.79 2023/04/28 20:59:26 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -249,6 +249,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 		    TurnOff(A_ITALIC, exit_italics_mode);
 		}
 #endif
+		(void) turn_off;
 	    }
 	    PreviousAttr &= ALL_BUT_COLOR;
 	}
@@ -278,6 +279,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 	    } else if (turn_off & A_ITALIC) {
 		TurnOff(A_ITALIC, exit_italics_mode);
 	    }
+	    (void) turn_off;
 	}
 #endif
 	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c
index c4dec5c74..3b3bd522c 100644
--- a/ncurses/widechar/lib_get_wstr.c
+++ b/ncurses/widechar/lib_get_wstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_get_wstr.c,v 1.20 2021/10/23 19:02:59 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.21 2023/04/29 19:02:03 tom Exp $")
 
 static int
 wadd_wint(WINDOW *win, wint_t *src)
@@ -88,7 +88,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 {
     SCREEN *sp = _nc_screen_of(win);
     TTY buf;
-    bool oldnl, oldecho, oldraw, oldcbreak;
+    TTY_FLAGS save_flags;
     wchar_t erasec = 0;
     wchar_t killc = 0;
     wint_t *oldstr = str;
@@ -105,13 +105,11 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 
     _nc_get_tty_mode(&buf);
 
-    oldnl = sp->_nl;
-    oldecho = sp->_echo;
-    oldraw = sp->_raw;
-    oldcbreak = sp->_cbreak;
+    save_flags = sp->_tty_flags;
     NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
+    if (!save_flags._raw)
+	NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
 
     NCURSES_SP_NAME(erasewchar) (NCURSES_SP_ARGx &erasec);
     NCURSES_SP_NAME(killwchar) (NCURSES_SP_ARGx &killc);
@@ -149,7 +147,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 	     * *getn_wstr() with \n should work either way.
 	     */
 	    if (ch == KEY_DOWN || ch == KEY_ENTER) {
-		if (oldecho == TRUE
+		if (save_flags._echo == TRUE
 		    && win->_cury == win->_maxy
 		    && win->_scroll)
 		    wechochar(win, (chtype) '\n');
@@ -157,11 +155,11 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 	    }
 	    if (ch == KEY_LEFT || ch == KEY_BACKSPACE) {
 		if (tmpstr > oldstr) {
-		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho);
+		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo);
 		}
 	    } else if (ch == KEY_EOL) {
 		while (tmpstr > oldstr) {
-		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho);
+		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo);
 		}
 	    } else {
 		beep();
@@ -171,7 +169,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 	} else {
 	    *tmpstr++ = ch;
 	    *tmpstr = 0;
-	    if (oldecho == TRUE) {
+	    if (save_flags._echo == TRUE) {
 		int oldy = win->_cury;
 
 		if (wadd_wint(win, tmpstr - 1) == ERR) {
@@ -181,7 +179,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 		     */
 		    win->_flags &= ~_WRAPPED;
 		    waddch(win, (chtype) ' ');
-		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho);
+		    tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo);
 		    continue;
 		} else if (IS_WRAPPED(win)) {
 		    /*
@@ -211,11 +209,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
     /* Restore with a single I/O call, to fix minor asymmetry between
      * raw/noraw, etc.
      */
-    sp->_nl = oldnl;
-    sp->_echo = oldecho;
-    sp->_raw = oldraw;
-    sp->_cbreak = oldcbreak;
-
+    sp->_tty_flags = save_flags;
     (void) _nc_set_tty_mode(&buf);
 
     *tmpstr = 0;
diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index 2d9531f1b..f108b307d 100644
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 2002-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.30 2020/05/27 23:54:31 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.31 2023/04/28 20:59:34 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -181,6 +181,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 		    TurnOff(A_ITALIC, exit_italics_mode);
 		}
 #endif
+		(void) turn_off;
 	    }
 	    previous_attr &= ALL_BUT_COLOR;
 	    previous_pair = 0;
@@ -212,6 +213,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 	    } else if (turn_off & A_ITALIC) {
 		TurnOff(A_ITALIC, exit_italics_mode);
 	    }
+	    (void) turn_off;
 	}
 #endif
 	SetColorsIf((color_pair != 0) || fix_pair0, previous_attr, previous_pair);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 621fe2e1e..3986480e1 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230424) unstable; urgency=low
+ncurses6 (6.4+20230429) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 621fe2e1e..3986480e1 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230424) unstable; urgency=low
+ncurses6 (6.4+20230429) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 6c9806d8b..dce75f443 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230424) unstable; urgency=low
+ncurses6 (6.4+20230429) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Apr 2023 03:48:00 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 179aff540..e108cf96d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.580 2023/04/24 07:48:00 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.581 2023/04/28 19:23:29 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0424"
+!define VERSION_MMDD  "0429"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 2dcca8bc1..ed9c72997 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230424
+Release: 20230429
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1c72cc534..1c6e41fa1 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230424
+Release: 20230429
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index b57053747..7951e72a6 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230424
+Release: 20230429
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 7b59eee9c..1c4e0d4c2 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.36 2023/04/23 23:20:43 tom Exp $
+ * $Id: test_tparm.c,v 1.37 2023/04/28 23:12:00 tom Exp $
  *
  * Exercise tparm/tiparm, either for all possible capabilities with fixed
  * parameters, or one capability with specific combinations of parameters.
@@ -319,7 +319,7 @@ test_tparm(const char *name, const char *format, long *number, char **string)
 	}
     } else
 #endif
-	result = tiparm(NS_9(format));
+	result = tparm(NS_9(format));
     total_tests++;
     if (result != NULL) {
 	tputs(result, 1, output_func);

From 6b112c68fe9f2fda597a6b41dd000fa7a35f9dff Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 7 May 2023 02:30:47 +0200
Subject: [PATCH 008/106] ncurses-6.4-20230506.patch

---
 NEWS                             |   10 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   13 +-
 configure                        | 2602 +++++++++++++++---------------
 configure.in                     |   22 +-
 dist.mk                          |    4 +-
 include/curses.h.in              |    9 +-
 include/nc_access.h              |    4 +-
 include/ncurses_defs             |    4 +-
 include/ncurses_dll.h.in         |   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 +-
 17 files changed, 1359 insertions(+), 1343 deletions(-)

diff --git a/NEWS b/NEWS
index 116c22daa..4bccc0138 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3948 2023/04/29 20:33:12 tom Exp $
+-- $Id: NEWS,v 1.3950 2023/05/06 20:14:16 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230506
+	> build-fixes related to configure-options and/or platform:
+	  + fix for --enable-fvisibility
+	  + fix for unusual values of --with-rel-version
+	  + fix for unusual values of --with-abi-version
+	  + fix for --disable-tcap-names
+	  + fix for termcap in nc_access.h (report by Werner Fink).
+
 20230429
 	+ revise recent change to _nc_write_entry to isolate it to a Cygwin bug
 	  (cf: 20230311)
diff --git a/VERSION b/VERSION
index bfa0c7a3a..9a951f64e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230429
+5:0:10	6.4	20230506
diff --git a/aclocal.m4 b/aclocal.m4
index bc5350e3e..8b55ab3f4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1040 2023/04/22 15:51:54 tom Exp $
+dnl $Id: aclocal.m4,v 1.1044 2023/05/06 22:18:58 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -6386,15 +6386,15 @@ case ".$with_cflags" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NUMBER_SYNTAX version: 2 updated: 2015/04/17 21:13:04
+dnl CF_NUMBER_SYNTAX version: 3 updated: 2023/05/06 16:14:29
 dnl ----------------
-dnl Check if the given variable is a number.  If not, report an error.
+dnl Check if the given variable is a positive integer.  Report an error if not.
 dnl $1 is the variable
 dnl $2 is the message
 AC_DEFUN([CF_NUMBER_SYNTAX],[
 if test -n "$1" ; then
-  case $1 in
-  ([[0-9]]*)
+  case `echo "$1" | sed -e 's/^[[0-9]]*$/0/g'` in
+  (0)
  	;;
   (*)
 	AC_MSG_ERROR($2 is not a number: $1)
@@ -9610,7 +9610,7 @@ if test "$with_pthread" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
+dnl CF_WITH_REL_VERSION version: 2 updated: 2023/05/06 18:18:18
 dnl -------------------
 dnl Allow library's release-version to be overridden.  Generally this happens when a
 dnl packager has incremented the release-version past that used in the original package,
@@ -9630,6 +9630,7 @@ ifelse($1,,[
 ],[
  $1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
  $1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'`
+ test -n "$1_MINOR" || $1_MINOR=0
  CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version)
  CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version)
 ])
diff --git a/configure b/configure
index 4368c8886..8d803c598 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.762 .
+# From configure.in Revision: 1.764 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -1389,35 +1389,36 @@ fi;
 
  NCURSES_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
  NCURSES_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[^.]*//' -e 's/^\.//' -e 's/\..*//'`
+ test -n "NCURSES_MINOR" || NCURSES_MINOR=0
 
 if test -n "$NCURSES_MAJOR" ; then
-  case $NCURSES_MAJOR in
-  ([0-9]*)
+  case `echo "$NCURSES_MAJOR" | sed -e 's/^[0-9]*$/0/g'` in
+  (0)
  	;;
   (*)
-	{ { echo "$as_me:1398: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1399: 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:1404: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1405: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test -n "$NCURSES_MINOR" ; then
-  case $NCURSES_MINOR in
-  ([0-9]*)
+  case `echo "$NCURSES_MINOR" | sed -e 's/^[0-9]*$/0/g'` in
+  (0)
  	;;
   (*)
-	{ { echo "$as_me:1414: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1415: 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:1420: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1421: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1430,7 +1431,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1433: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1434: 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.*)
@@ -1445,17 +1446,17 @@ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&
 fi;
 
 if test -n "$cf_cv_abi_version" ; then
-  case $cf_cv_abi_version in
-  ([0-9]*)
+  case `echo "$cf_cv_abi_version" | sed -e 's/^[0-9]*$/0/g'` in
+  (0)
  	;;
   (*)
-	{ { echo "$as_me:1452: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1453: 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:1458: error: ABI version value is empty" >&5
+  { { echo "$as_me:1459: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1488,7 +1489,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1491: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1492: 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
@@ -1498,11 +1499,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1501: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1502: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1505: checking build system type" >&5
+echo "$as_me:1506: 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
@@ -1511,23 +1512,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1514: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1515: 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:1518: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1519: 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:1523: result: $ac_cv_build" >&5
+echo "$as_me:1524: 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:1530: checking host system type" >&5
+echo "$as_me:1531: 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
@@ -1536,12 +1537,12 @@ else
 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:1539: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1540: 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:1544: result: $ac_cv_host" >&5
+echo "$as_me:1545: 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/'`
@@ -1549,7 +1550,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1552: checking target system type" >&5
+	echo "$as_me:1553: 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
@@ -1558,12 +1559,12 @@ else
 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:1561: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1562: 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:1566: result: $ac_cv_target" >&5
+echo "$as_me:1567: 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/'`
@@ -1595,13 +1596,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1598: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1599: 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:1602: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1603: 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:1604: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1605: 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
@@ -1609,7 +1610,7 @@ fi
 # 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:1612: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1613: 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
@@ -1620,7 +1621,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1623: checking for fgrep" >&5
+echo "$as_me:1624: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1632,7 +1633,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1635: checking for $ac_word" >&5
+echo "$as_me:1636: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1649,7 +1650,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1652: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1653: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1660,10 +1661,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1663: result: $FGREP" >&5
+  echo "$as_me:1664: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1666: result: no" >&5
+  echo "$as_me:1667: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1671,16 +1672,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1674: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1675: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1679: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1680: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1683: checking for prefix" >&5
+echo "$as_me:1684: 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
@@ -1692,11 +1693,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1695: result: $prefix" >&5
+echo "$as_me:1696: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1699: checking for default include-directory" >&5
+echo "$as_me:1700: 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 \
@@ -1719,7 +1720,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1722: result: $includedir" >&5
+echo "$as_me:1723: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1778,24 +1779,24 @@ if test "${with_abi_altered+set}" = set; then
   withval="$with_abi_altered"
 
 if test -n "$withval" ; then
-  case $withval in
-  ([0-9]*)
+  case `echo "$withval" | sed -e 's/^[0-9]*$/0/g'` in
+  (0)
  	;;
   (*)
-	{ { echo "$as_me:1785: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1786: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1791: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1792: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1798: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1799: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1830,7 +1831,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1833: checking for $ac_word" >&5
+echo "$as_me:1834: 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
@@ -1845,7 +1846,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1848: found $ac_dir/$ac_word" >&5
+echo "$as_me:1849: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1853,10 +1854,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1856: result: $CC" >&5
+  echo "$as_me:1857: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1859: result: no" >&5
+  echo "$as_me:1860: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1869,7 +1870,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1872: checking for $ac_word" >&5
+echo "$as_me:1873: 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
@@ -1884,7 +1885,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1887: found $ac_dir/$ac_word" >&5
+echo "$as_me:1888: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1892,10 +1893,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1895: result: $ac_ct_CC" >&5
+  echo "$as_me:1896: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1898: result: no" >&5
+  echo "$as_me:1899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1905,32 +1906,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1908: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1909: 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:1913:" \
+echo "$as_me:1914:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1916: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1917: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1919: \$? = $ac_status" >&5
+  echo "$as_me:1920: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1921: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1922: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1924: \$? = $ac_status" >&5
+  echo "$as_me:1925: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1926: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1927: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1929: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1933 "configure"
+#line 1934 "configure"
 #include "confdefs.h"
 
 int
@@ -1946,13 +1947,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1949: checking for C compiler default output" >&5
+echo "$as_me:1950: 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:1952: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1953: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1955: \$? = $ac_status" >&5
+  echo "$as_me:1956: \$? = $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
@@ -1975,34 +1976,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1978: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1979: 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:1984: result: $ac_file" >&5
+echo "$as_me:1985: 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:1989: checking whether the C compiler works" >&5
+echo "$as_me:1990: 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:1995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1998: \$? = $ac_status" >&5
+  echo "$as_me:1999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2005: error: cannot run C compiled programs.
+	{ { echo "$as_me:2006: 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;}
@@ -2010,24 +2011,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2013: result: yes" >&5
+echo "$as_me:2014: 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:2020: checking whether we are cross compiling" >&5
+echo "$as_me:2021: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2022: result: $cross_compiling" >&5
+echo "$as_me:2023: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2025: checking for executable suffix" >&5
+echo "$as_me:2026: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2030: \$? = $ac_status" >&5
+  echo "$as_me:2031: \$? = $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
@@ -2043,25 +2044,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2046: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2047: 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:2052: result: $ac_cv_exeext" >&5
+echo "$as_me:2053: 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:2058: checking for object suffix" >&5
+echo "$as_me:2059: 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 2064 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 
 int
@@ -2073,10 +2074,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2079: \$? = $ac_status" >&5
+  echo "$as_me:2080: \$? = $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
@@ -2088,24 +2089,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2091: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2092: 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:2098: result: $ac_cv_objext" >&5
+echo "$as_me:2099: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2102: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2103: 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 2108 "configure"
+#line 2109 "configure"
 #include "confdefs.h"
 
 int
@@ -2120,16 +2121,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2126: \$? = $ac_status" >&5
+  echo "$as_me:2127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2132: \$? = $ac_status" >&5
+  echo "$as_me:2133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2141,19 +2142,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2144: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2145: 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:2150: checking whether $CC accepts -g" >&5
+echo "$as_me:2151: 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 2156 "configure"
+#line 2157 "configure"
 #include "confdefs.h"
 
 int
@@ -2165,16 +2166,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2171: \$? = $ac_status" >&5
+  echo "$as_me:2172: \$? = $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:2175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2177: \$? = $ac_status" >&5
+  echo "$as_me:2178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2184,7 +2185,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2187: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2188: 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
@@ -2211,16 +2212,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2217: \$? = $ac_status" >&5
+  echo "$as_me:2218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2223: \$? = $ac_status" >&5
+  echo "$as_me:2224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2232,7 +2233,7 @@ if { (eval echo "$as_me:2214: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2235 "configure"
+#line 2236 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2245,16 +2246,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2251: \$? = $ac_status" >&5
+  echo "$as_me:2252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2257: \$? = $ac_status" >&5
+  echo "$as_me:2258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2264,7 +2265,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2267 "configure"
+#line 2268 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2276,16 +2277,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2282: \$? = $ac_status" >&5
+  echo "$as_me:2283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2288: \$? = $ac_status" >&5
+  echo "$as_me:2289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2315,11 +2316,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2318: checking version of $CC" >&5
+	echo "$as_me:2319: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2322: result: $GCC_VERSION" >&5
+	echo "$as_me:2323: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2328,12 +2329,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2331: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2332: 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 2336 "configure"
+#line 2337 "configure"
 #include "confdefs.h"
 
 int
@@ -2350,16 +2351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2356: \$? = $ac_status" >&5
+  echo "$as_me:2357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2362: \$? = $ac_status" >&5
+  echo "$as_me:2363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2370,7 +2371,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2373: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2374: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2379,11 +2380,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2382: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2383: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2386 "configure"
+#line 2387 "configure"
 #include "confdefs.h"
 
 int
@@ -2400,16 +2401,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2406: \$? = $ac_status" >&5
+  echo "$as_me:2407: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2412: \$? = $ac_status" >&5
+  echo "$as_me:2413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2419,7 +2420,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2422: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2423: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2428,30 +2429,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2431: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2432: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2438: checking version of $CC" >&5
+	echo "$as_me:2439: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2442: result: $CLANG_VERSION" >&5
+	echo "$as_me:2443: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2449: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2450: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2454 "configure"
+#line 2455 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2465,16 +2466,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2471: \$? = $ac_status" >&5
+  echo "$as_me:2472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2477: \$? = $ac_status" >&5
+  echo "$as_me:2478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2485,13 +2486,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2488: result: $cf_clang_optok" >&5
+		echo "$as_me:2489: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2494: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2495: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2500,7 +2501,7 @@ echo "${as_me:-configure}:2494: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2503: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2504: 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
@@ -2508,7 +2509,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2511 "configure"
+#line 2512 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2555,16 +2556,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2559: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2561: \$? = $ac_status" >&5
+  echo "$as_me:2562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2567: \$? = $ac_status" >&5
+  echo "$as_me:2568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2581,10 +2582,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2584: result: none needed" >&5
+    echo "$as_me:2585: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2587: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2588: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2592,13 +2593,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2595: checking \$CFLAGS variable" >&5
+echo "$as_me:2596: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2599: result: broken" >&5
+	echo "$as_me:2600: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2601: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2602: 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=
@@ -2706,18 +2707,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2709: result: ok" >&5
+	echo "$as_me:2710: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2714: checking \$CC variable" >&5
+echo "$as_me:2715: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2718: result: broken" >&5
+	echo "$as_me:2719: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2720: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2721: 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/[ ]*[ ]-[^ ].*//'`
@@ -2834,19 +2835,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2837: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2838: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2841: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2842: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2845: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2846: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2849: result: ok" >&5
+	echo "$as_me:2850: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2857,7 +2858,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2860: checking how to run the C preprocessor" >&5
+echo "$as_me:2861: 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
@@ -2878,18 +2879,18 @@ do
   # 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 2881 "configure"
+#line 2882 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2886: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2887: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2892: \$? = $ac_status" >&5
+  echo "$as_me:2893: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2912,17 +2913,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2915 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2919: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2920: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2925: \$? = $ac_status" >&5
+  echo "$as_me:2926: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2959,7 +2960,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2962: result: $CPP" >&5
+echo "$as_me:2963: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2969,18 +2970,18 @@ do
   # 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 2972 "configure"
+#line 2973 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2977: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2978: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2983: \$? = $ac_status" >&5
+  echo "$as_me:2984: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3003,17 +3004,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3006 "configure"
+#line 3007 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3010: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3016: \$? = $ac_status" >&5
+  echo "$as_me:3017: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3041,7 +3042,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3044: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3045: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3054,14 +3055,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3057: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3058: 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 3064 "configure"
+#line 3065 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3076,7 +3077,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3079 "configure"
+#line 3080 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3089,14 +3090,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3092: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3093: 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:3099: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3100: 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
@@ -3111,15 +3112,15 @@ CF_EOF
 # 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:3114: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3117: \$? = $ac_status" >&5
+  echo "$as_me:3118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3119: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3122: \$? = $ac_status" >&5
+  echo "$as_me:3123: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3130,10 +3131,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3133: result: yes" >&5
+  echo "$as_me:3134: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3136: result: no" >&5
+  echo "$as_me:3137: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3147,7 +3148,7 @@ else
 	(*) 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:3150: checking for $ac_word" >&5
+echo "$as_me:3151: 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
@@ -3164,7 +3165,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3167: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3168: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3175,10 +3176,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3178: result: $LDCONFIG" >&5
+  echo "$as_me:3179: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3181: result: no" >&5
+  echo "$as_me:3182: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3186,7 +3187,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3189: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3190: 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.
@@ -3196,7 +3197,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3199: result: $cf_with_cxx" >&5
+echo "$as_me:3200: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3214,7 +3215,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3217: checking for $ac_word" >&5
+echo "$as_me:3218: 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
@@ -3229,7 +3230,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3232: found $ac_dir/$ac_word" >&5
+echo "$as_me:3233: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3237,10 +3238,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3240: result: $CXX" >&5
+  echo "$as_me:3241: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3243: result: no" >&5
+  echo "$as_me:3244: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3253,7 +3254,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3256: checking for $ac_word" >&5
+echo "$as_me:3257: 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
@@ -3268,7 +3269,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3271: found $ac_dir/$ac_word" >&5
+echo "$as_me:3272: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3276,10 +3277,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3279: result: $ac_ct_CXX" >&5
+  echo "$as_me:3280: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3282: result: no" >&5
+  echo "$as_me:3283: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3291,32 +3292,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3294:" \
+echo "$as_me:3295:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3297: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3298: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3300: \$? = $ac_status" >&5
+  echo "$as_me:3301: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3302: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3303: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3305: \$? = $ac_status" >&5
+  echo "$as_me:3306: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3307: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3308: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3310: \$? = $ac_status" >&5
+  echo "$as_me:3311: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3313: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3314: 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 3319 "configure"
+#line 3320 "configure"
 #include "confdefs.h"
 
 int
@@ -3331,16 +3332,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3337: \$? = $ac_status" >&5
+  echo "$as_me:3338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3343: \$? = $ac_status" >&5
+  echo "$as_me:3344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3352,19 +3353,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3355: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3356: 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:3361: checking whether $CXX accepts -g" >&5
+echo "$as_me:3362: 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 3367 "configure"
+#line 3368 "configure"
 #include "confdefs.h"
 
 int
@@ -3376,16 +3377,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3382: \$? = $ac_status" >&5
+  echo "$as_me:3383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3388: \$? = $ac_status" >&5
+  echo "$as_me:3389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3395,7 +3396,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3398: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3399: 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
@@ -3422,7 +3423,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3425 "configure"
+#line 3426 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3435,16 +3436,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3441: \$? = $ac_status" >&5
+  echo "$as_me:3442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3447: \$? = $ac_status" >&5
+  echo "$as_me:3448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3454,7 +3455,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3457 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3466,16 +3467,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3472: \$? = $ac_status" >&5
+  echo "$as_me:3473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3478: \$? = $ac_status" >&5
+  echo "$as_me:3479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3509,7 +3510,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3512: checking if $CXX works" >&5
+		echo "$as_me:3513: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3517,7 +3518,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3520 "configure"
+#line 3521 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3534,16 +3535,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3540: \$? = $ac_status" >&5
+  echo "$as_me:3541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3546: \$? = $ac_status" >&5
+  echo "$as_me:3547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3554,11 +3555,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3557: result: $cf_cxx_works" >&5
+		echo "$as_me:3558: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3561: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3562: 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
@@ -3574,7 +3575,7 @@ ac_main_return="return"
 	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:3577: checking for $ac_word" >&5
+echo "$as_me:3578: 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
@@ -3591,7 +3592,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3594: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3595: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3602,17 +3603,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3605: result: $CXX" >&5
+  echo "$as_me:3606: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3608: result: no" >&5
+  echo "$as_me:3609: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3615: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3616: 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="";
 		;;
@@ -3621,7 +3622,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3624: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3625: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3629,7 +3630,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3632: result: $GXX_VERSION" >&5
+	echo "$as_me:3633: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3637,12 +3638,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3640: WARNING: templates do not work" >&5
+	{ echo "$as_me:3641: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3645: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3646: 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.
@@ -3652,15 +3653,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3655: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3656: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3658: checking if you want to build with Ada" >&5
+echo "$as_me:3659: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3660: result: $cf_with_ada" >&5
+echo "$as_me:3661: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3663: checking if you want to install terminal database" >&5
+echo "$as_me:3664: 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.
@@ -3670,10 +3671,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3673: result: $cf_with_db_install" >&5
+echo "$as_me:3674: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3676: checking if you want to install manpages" >&5
+echo "$as_me:3677: 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.
@@ -3683,10 +3684,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3686: result: $cf_with_manpages" >&5
+echo "$as_me:3687: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3689: checking if you want to build programs such as tic" >&5
+echo "$as_me:3690: 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.
@@ -3696,10 +3697,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3699: result: $cf_with_progs" >&5
+echo "$as_me:3700: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3702: checking if you want to build test-programs" >&5
+echo "$as_me:3703: 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.
@@ -3709,10 +3710,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3712: result: $cf_with_tests" >&5
+echo "$as_me:3713: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3715: checking if you wish to install curses.h" >&5
+echo "$as_me:3716: 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.
@@ -3722,7 +3723,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3725: result: $with_curses_h" >&5
+echo "$as_me:3726: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3746,7 +3747,7 @@ for ac_prog in mawk gawk nawk awk
 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:3749: checking for $ac_word" >&5
+echo "$as_me:3750: 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
@@ -3761,7 +3762,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3764: found $ac_dir/$ac_word" >&5
+echo "$as_me:3765: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3769,17 +3770,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3772: result: $AWK" >&5
+  echo "$as_me:3773: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3775: result: no" >&5
+  echo "$as_me:3776: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3782: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3783: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3795,7 +3796,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3798: checking for a BSD compatible install" >&5
+echo "$as_me:3799: 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
@@ -3844,7 +3845,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3847: result: $INSTALL" >&5
+echo "$as_me:3848: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3869,7 +3870,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3872: checking for $ac_word" >&5
+echo "$as_me:3873: 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
@@ -3884,7 +3885,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3887: found $ac_dir/$ac_word" >&5
+echo "$as_me:3888: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3892,10 +3893,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3895: result: $LINT" >&5
+  echo "$as_me:3896: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3898: result: no" >&5
+  echo "$as_me:3899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3908,18 +3909,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3911: checking whether ln -s works" >&5
+echo "$as_me:3912: 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:3915: result: yes" >&5
+  echo "$as_me:3916: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3918: result: no, using $LN_S" >&5
+  echo "$as_me:3919: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3922: checking if $LN_S -f options work" >&5
+echo "$as_me:3923: 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
@@ -3931,12 +3932,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3934: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3935: 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:3939: checking for long file names" >&5
+echo "$as_me:3940: 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
@@ -3975,7 +3976,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3978: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3979: 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
 
@@ -3994,7 +3995,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:3997: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:3998: 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"
@@ -4004,7 +4005,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4007: checking if you want to use pkg-config" >&5
+echo "$as_me:4008: 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.
@@ -4014,7 +4015,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4017: result: $cf_pkg_config" >&5
+echo "$as_me:4018: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4026,7 +4027,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4029: checking for $ac_word" >&5
+echo "$as_me:4030: 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
@@ -4043,7 +4044,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4046: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4047: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4054,10 +4055,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4057: result: $PKG_CONFIG" >&5
+  echo "$as_me:4058: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4060: result: no" >&5
+  echo "$as_me:4061: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4066,7 +4067,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4069: checking for $ac_word" >&5
+echo "$as_me:4070: 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
@@ -4083,7 +4084,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4086: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4087: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4095,10 +4096,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4098: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4099: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4101: result: no" >&5
+  echo "$as_me:4102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4141,24 +4142,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4144: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4145: 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:4151: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4152: 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:4157: checking for pkg-config library directory" >&5
+	echo "$as_me:4158: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4161: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4162: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4185,7 +4186,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4188: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4189: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4196,16 +4197,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4199: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4200: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4204: result: auto" >&5
+	echo "$as_me:4205: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4208: checking for search-list" >&5
+	echo "$as_me:4209: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4232,11 +4233,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4235: result: $cf_search_path" >&5
+	echo "$as_me:4236: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4239: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4240: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4244,7 +4245,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4247: checking for first directory" >&5
+	echo "$as_me:4248: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4255,7 +4256,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4258: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4259: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4265,7 +4266,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4268: checking for workaround" >&5
+		echo "$as_me:4269: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4288,17 +4289,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4291: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4292: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4298: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4299: 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:4301: checking if we should install .pc files" >&5
+	echo "$as_me:4302: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4309,7 +4310,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4312: result: $enable_pc_files" >&5
+echo "$as_me:4313: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4317,7 +4318,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4320: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4321: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4348,7 +4349,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4351: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4352: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4362,7 +4363,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4365: checking for suffix to add to pc-files" >&5
+	echo "$as_me:4366: 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.
@@ -4377,13 +4378,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4380: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4381: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4386: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4387: 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.
@@ -4393,11 +4394,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4396: result: $enable_mixedcase" >&5
+echo "$as_me:4397: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4400: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4401: 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
@@ -4424,7 +4425,7 @@ else
 fi
 
 fi
-echo "$as_me:4427: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4428: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4443,7 +4444,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4446: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4447: 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
@@ -4463,16 +4464,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4466: result: yes" >&5
+  echo "$as_me:4467: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4470: result: no" >&5
+  echo "$as_me:4471: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4475: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4476: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4527,7 +4528,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4530: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4531: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4538,7 +4539,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4541: checking for $ac_word" >&5
+echo "$as_me:4542: 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
@@ -4553,7 +4554,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4556: found $ac_dir/$ac_word" >&5
+echo "$as_me:4557: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4561,10 +4562,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4564: result: $CTAGS" >&5
+  echo "$as_me:4565: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4567: result: no" >&5
+  echo "$as_me:4568: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4575,7 +4576,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4578: checking for $ac_word" >&5
+echo "$as_me:4579: 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
@@ -4590,7 +4591,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4593: found $ac_dir/$ac_word" >&5
+echo "$as_me:4594: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4598,10 +4599,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4601: result: $ETAGS" >&5
+  echo "$as_me:4602: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4604: result: no" >&5
+  echo "$as_me:4605: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4610,7 +4611,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4613: 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_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4625,7 +4626,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4628: found $ac_dir/$ac_word" >&5
+echo "$as_me:4629: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4634,17 +4635,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4637: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4638: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4640: result: no" >&5
+  echo "$as_me:4641: 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:4647: checking for $ac_word" >&5
+echo "$as_me:4648: 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
@@ -4659,7 +4660,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4662: found $ac_dir/$ac_word" >&5
+echo "$as_me:4663: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4668,10 +4669,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4671: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4672: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4674: result: no" >&5
+  echo "$as_me:4675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4691,7 +4692,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4694: checking for makeflags variable" >&5
+echo "$as_me:4695: 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
@@ -4721,7 +4722,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4724: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4725: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4729,13 +4730,13 @@ echo "${as_me:-configure}:4724: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4732: result: $cf_cv_makeflags" >&5
+echo "$as_me:4733: 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:4738: checking for $ac_word" >&5
+echo "$as_me:4739: 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
@@ -4750,7 +4751,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4753: found $ac_dir/$ac_word" >&5
+echo "$as_me:4754: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4758,10 +4759,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4761: result: $RANLIB" >&5
+  echo "$as_me:4762: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4764: result: no" >&5
+  echo "$as_me:4765: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4770,7 +4771,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4773: checking for $ac_word" >&5
+echo "$as_me:4774: 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
@@ -4785,7 +4786,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4788: found $ac_dir/$ac_word" >&5
+echo "$as_me:4789: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4794,10 +4795,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4797: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4798: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4800: result: no" >&5
+  echo "$as_me:4801: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4809,7 +4810,7 @@ fi
 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:4812: checking for $ac_word" >&5
+echo "$as_me:4813: 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
@@ -4824,7 +4825,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4827: found $ac_dir/$ac_word" >&5
+echo "$as_me:4828: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4832,10 +4833,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4835: result: $LD" >&5
+  echo "$as_me:4836: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4838: result: no" >&5
+  echo "$as_me:4839: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4844,7 +4845,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4847: checking for $ac_word" >&5
+echo "$as_me:4848: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4859,7 +4860,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4862: found $ac_dir/$ac_word" >&5
+echo "$as_me:4863: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4868,10 +4869,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4871: result: $ac_ct_LD" >&5
+  echo "$as_me:4872: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4874: result: no" >&5
+  echo "$as_me:4875: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4883,7 +4884,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4886: checking for $ac_word" >&5
+echo "$as_me:4887: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4898,7 +4899,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4901: found $ac_dir/$ac_word" >&5
+echo "$as_me:4902: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4906,10 +4907,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4909: result: $AR" >&5
+  echo "$as_me:4910: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4912: result: no" >&5
+  echo "$as_me:4913: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4918,7 +4919,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4921: checking for $ac_word" >&5
+echo "$as_me:4922: 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
@@ -4933,7 +4934,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4936: found $ac_dir/$ac_word" >&5
+echo "$as_me:4937: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4942,10 +4943,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4945: result: $ac_ct_AR" >&5
+  echo "$as_me:4946: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4948: result: no" >&5
+  echo "$as_me:4949: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4957,7 +4958,7 @@ fi
 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:4960: checking for $ac_word" >&5
+echo "$as_me:4961: 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
@@ -4972,7 +4973,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4975: found $ac_dir/$ac_word" >&5
+echo "$as_me:4976: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4980,10 +4981,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4983: result: $NM" >&5
+  echo "$as_me:4984: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4986: result: no" >&5
+  echo "$as_me:4987: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4992,7 +4993,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:4995: checking for $ac_word" >&5
+echo "$as_me:4996: 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
@@ -5007,7 +5008,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5010: found $ac_dir/$ac_word" >&5
+echo "$as_me:5011: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5016,10 +5017,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5019: result: $ac_ct_NM" >&5
+  echo "$as_me:5020: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5022: result: no" >&5
+  echo "$as_me:5023: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5031,7 +5032,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5034: checking for $ac_word" >&5
+echo "$as_me:5035: 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
@@ -5046,7 +5047,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5049: found $ac_dir/$ac_word" >&5
+echo "$as_me:5050: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5054,10 +5055,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5057: result: $AR" >&5
+  echo "$as_me:5058: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5060: result: no" >&5
+  echo "$as_me:5061: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5066,7 +5067,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5069: checking for $ac_word" >&5
+echo "$as_me:5070: 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
@@ -5081,7 +5082,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5084: found $ac_dir/$ac_word" >&5
+echo "$as_me:5085: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5090,10 +5091,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5093: result: $ac_ct_AR" >&5
+  echo "$as_me:5094: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5096: result: no" >&5
+  echo "$as_me:5097: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5102,7 +5103,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5105: checking for options to update archives" >&5
+echo "$as_me:5106: 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
@@ -5139,13 +5140,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5142 "configure"
+#line 5143 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5145: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5148: \$? = $ac_status" >&5
+  echo "$as_me:5149: \$? = $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
@@ -5156,7 +5157,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5159: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5160: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5166,7 +5167,7 @@ echo "${as_me:-configure}:5159: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5169: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5170: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5177,7 +5178,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5180: checking if you have specified an install-prefix" >&5
+echo "$as_me:5181: 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.
@@ -5190,7 +5191,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5193: result: $DESTDIR" >&5
+echo "$as_me:5194: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -5225,7 +5226,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5228: checking for $ac_word" >&5
+echo "$as_me:5229: 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
@@ -5240,7 +5241,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5243: found $ac_dir/$ac_word" >&5
+echo "$as_me:5244: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5248,10 +5249,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5251: result: $BUILD_CC" >&5
+  echo "$as_me:5252: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5254: result: no" >&5
+  echo "$as_me:5255: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5260,12 +5261,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5263: checking for native build C compiler" >&5
+	echo "$as_me:5264: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5265: result: $BUILD_CC" >&5
+	echo "$as_me:5266: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5268: checking for native build C preprocessor" >&5
+	echo "$as_me:5269: 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.
@@ -5275,10 +5276,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5278: result: $BUILD_CPP" >&5
+	echo "$as_me:5279: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5281: checking for native build C flags" >&5
+	echo "$as_me:5282: 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.
@@ -5286,10 +5287,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5289: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5290: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5292: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5293: 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.
@@ -5297,10 +5298,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5300: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5301: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5303: checking for native build linker-flags" >&5
+	echo "$as_me:5304: 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.
@@ -5308,10 +5309,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5311: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5312: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5314: checking for native build linker-libraries" >&5
+	echo "$as_me:5315: 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.
@@ -5319,7 +5320,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5322: result: $BUILD_LIBS" >&5
+	echo "$as_me:5323: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5328,7 +5329,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5331: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5332: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5342,7 +5343,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5345 "configure"
+#line 5346 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5352,15 +5353,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5358: \$? = $ac_status" >&5
+  echo "$as_me:5359: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5363: \$? = $ac_status" >&5
+  echo "$as_me:5364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5375,12 +5376,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5378: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5379: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5383: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5384: 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;}
@@ -5405,7 +5406,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5408: checking if libtool -version-number should be used" >&5
+echo "$as_me:5409: 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.
@@ -5422,7 +5423,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5425: result: $cf_libtool_version" >&5
+echo "$as_me:5426: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5431,25 +5432,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5434: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5435: 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}:5441: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5442: 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}:5448: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5449: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5452: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5453: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5471,7 +5472,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5474: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5475: 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.
@@ -5481,7 +5482,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5484: result: $with_libtool" >&5
+echo "$as_me:5485: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5512,7 +5513,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5515: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5516: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5525,7 +5526,7 @@ esac
   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:5528: checking for $ac_word" >&5
+echo "$as_me:5529: 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
@@ -5540,7 +5541,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5543: found $ac_dir/$ac_word" >&5
+echo "$as_me:5544: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5548,10 +5549,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5551: result: $LIBTOOL" >&5
+  echo "$as_me:5552: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5554: result: no" >&5
+  echo "$as_me:5555: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5564,7 +5565,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5567: checking for $ac_word" >&5
+echo "$as_me:5568: 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
@@ -5579,7 +5580,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5582: found $ac_dir/$ac_word" >&5
+echo "$as_me:5583: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5587,10 +5588,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5590: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5591: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5593: result: no" >&5
+  echo "$as_me:5594: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5621,7 +5622,7 @@ unset LIBTOOL
   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:5624: checking for $ac_word" >&5
+echo "$as_me:5625: 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
@@ -5636,7 +5637,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5639: found $ac_dir/$ac_word" >&5
+echo "$as_me:5640: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5644,10 +5645,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5647: result: $LIBTOOL" >&5
+  echo "$as_me:5648: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5650: result: no" >&5
+  echo "$as_me:5651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5660,7 +5661,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5663: checking for $ac_word" >&5
+echo "$as_me:5664: 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
@@ -5675,7 +5676,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5678: found $ac_dir/$ac_word" >&5
+echo "$as_me:5679: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5683,10 +5684,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5686: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5687: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5689: result: no" >&5
+  echo "$as_me:5690: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5708,7 +5709,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5711: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5712: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5724,7 +5725,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5727: checking version of $LIBTOOL" >&5
+	echo "$as_me:5728: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5735,7 +5736,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5738: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5739: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5744,18 +5745,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5747: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5748: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5753: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5754: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5758: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5759: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5791,7 +5792,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5794: checking if you want to build shared libraries" >&5
+echo "$as_me:5795: 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.
@@ -5801,11 +5802,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5804: result: $with_shared" >&5
+echo "$as_me:5805: 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:5808: checking if you want to build static libraries" >&5
+echo "$as_me:5809: 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.
@@ -5815,11 +5816,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5818: result: $with_normal" >&5
+echo "$as_me:5819: 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:5822: checking if you want to build debug libraries" >&5
+echo "$as_me:5823: 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.
@@ -5829,11 +5830,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5832: result: $with_debug" >&5
+echo "$as_me:5833: 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:5836: checking if you want to build profiling libraries" >&5
+echo "$as_me:5837: 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.
@@ -5843,7 +5844,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5846: result: $with_profile" >&5
+echo "$as_me:5847: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5851,7 +5852,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5854: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5855: 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.
@@ -5861,26 +5862,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5864: result: $with_shared_cxx" >&5
+echo "$as_me:5865: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5871: checking for specified models" >&5
+echo "$as_me:5872: 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:5875: result: $cf_list_models" >&5
+echo "$as_me:5876: 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:5880: checking for default model" >&5
+echo "$as_me:5881: 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:5883: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5884: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5894,7 +5895,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5897: checking if you want to have a library-prefix" >&5
+echo "$as_me:5898: 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.
@@ -5904,7 +5905,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5907: result: $with_lib_prefix" >&5
+echo "$as_me:5908: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5935,24 +5936,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5938: checking for PATH separator" >&5
+	echo "$as_me:5939: 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:5945: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5946: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5949: checking for ANSI C header files" >&5
+echo "$as_me:5950: 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 5955 "configure"
+#line 5956 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5960,13 +5961,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5969: \$? = $ac_status" >&5
+  echo "$as_me:5970: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5988,7 +5989,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5991 "configure"
+#line 5992 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6006,7 +6007,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6009 "configure"
+#line 6010 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6027,7 +6028,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6030 "configure"
+#line 6031 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6053,15 +6054,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6059: \$? = $ac_status" >&5
+  echo "$as_me:6060: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6064: \$? = $ac_status" >&5
+  echo "$as_me:6065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6074,7 +6075,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6077: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6078: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6090,28 +6091,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6093: checking for $ac_header" >&5
+echo "$as_me:6094: 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 6099 "configure"
+#line 6100 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6108: \$? = $ac_status" >&5
+  echo "$as_me:6109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6114: \$? = $ac_status" >&5
+  echo "$as_me:6115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6121,7 +6122,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6124: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6125: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6131,13 +6132,13 @@ EOF
 fi
 done
 
-echo "$as_me:6134: checking whether exit is declared" >&5
+echo "$as_me:6135: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6140 "configure"
+#line 6141 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6152,16 +6153,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6158: \$? = $ac_status" >&5
+  echo "$as_me:6159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6164: \$? = $ac_status" >&5
+  echo "$as_me:6165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6171,19 +6172,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6174: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6175: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6180: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6181: 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 6186 "configure"
+#line 6187 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6198,16 +6199,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6210: \$? = $ac_status" >&5
+  echo "$as_me:6211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6217,7 +6218,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6220: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6221: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6230,7 +6231,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6233: checking for opendir in -ldir" >&5
+  echo "$as_me:6234: 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
@@ -6238,7 +6239,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6241 "configure"
+#line 6242 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6257,16 +6258,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6263: \$? = $ac_status" >&5
+  echo "$as_me:6264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6269: \$? = $ac_status" >&5
+  echo "$as_me:6270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6277,14 +6278,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6280: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6281: 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:6287: checking for opendir in -lx" >&5
+  echo "$as_me:6288: 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
@@ -6292,7 +6293,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6295 "configure"
+#line 6296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6311,16 +6312,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6317: \$? = $ac_status" >&5
+  echo "$as_me:6318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6323: \$? = $ac_status" >&5
+  echo "$as_me:6324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6331,7 +6332,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6334: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6335: 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"
@@ -6341,7 +6342,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6344: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6345: 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.
@@ -6351,10 +6352,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6354: result: $with_termlib" >&5
+echo "$as_me:6355: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6357: checking if you want to build a separate tic library" >&5
+echo "$as_me:6358: 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.
@@ -6364,7 +6365,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6367: result: $with_ticlib" >&5
+echo "$as_me:6368: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6377,7 +6378,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6380: checking for default loader flags" >&5
+echo "$as_me:6381: 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=''   ;;
@@ -6386,13 +6387,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6389: result: $LD_MODEL" >&5
+echo "$as_me:6390: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6395: checking if rpath option should be used" >&5
+echo "$as_me:6396: 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.
@@ -6402,10 +6403,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6405: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6406: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6408: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6409: 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.
@@ -6415,7 +6416,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6418: result: $cf_cv_do_relink" >&5
+echo "$as_me:6419: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6426,7 +6427,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6429: checking for an rpath option" >&5
+	echo "$as_me:6430: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6457,12 +6458,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6460: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6461: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6465: checking if we need a space after rpath option" >&5
+		echo "$as_me:6466: 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"
 
@@ -6483,7 +6484,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6486 "configure"
+#line 6487 "configure"
 #include "confdefs.h"
 
 int
@@ -6495,16 +6496,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6501: \$? = $ac_status" >&5
+  echo "$as_me:6502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6507: \$? = $ac_status" >&5
+  echo "$as_me:6508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6514,7 +6515,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6517: result: $cf_rpath_space" >&5
+		echo "$as_me:6518: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6536,7 +6537,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6539: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:6540: 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.
@@ -6551,9 +6552,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6554: result: $withval" >&5
+		echo "$as_me:6555: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6556: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6557: 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; }; }
 		;;
@@ -6562,7 +6563,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6565: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6566: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6585,14 +6586,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6588: checking which $CC option to use" >&5
+		echo "$as_me:6589: 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 6595 "configure"
+#line 6596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6604,16 +6605,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6610: \$? = $ac_status" >&5
+  echo "$as_me:6611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6616: \$? = $ac_status" >&5
+  echo "$as_me:6617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6622,7 +6623,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6625: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6626: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6693,7 +6694,7 @@ CF_EOF
 		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:6696: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6697: 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
@@ -6702,7 +6703,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6705 "configure"
+#line 6706 "configure"
 #include "confdefs.h"
 
 int
@@ -6714,16 +6715,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6718: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6720: \$? = $ac_status" >&5
+  echo "$as_me:6721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6726: \$? = $ac_status" >&5
+  echo "$as_me:6727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6734,7 +6735,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6737: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6738: 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"
@@ -7084,7 +7085,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7087 "configure"
+#line 7088 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7096,16 +7097,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7102: \$? = $ac_status" >&5
+  echo "$as_me:7103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7108: \$? = $ac_status" >&5
+  echo "$as_me:7109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7142,7 +7143,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7145: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7146: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7152,7 +7153,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7155 "${as_me:-configure}"
+#line 7156 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7164,18 +7165,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7167: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7168: 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:7169: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7172: \$? = $ac_status" >&5
+  echo "$as_me:7173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7174: result: yes" >&5
+				echo "$as_me:7175: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7178: result: no" >&5
+				echo "$as_me:7179: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7190,17 +7191,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7193: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7194: 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}:7197: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7198: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7203: checking for additional libtool options" >&5
+echo "$as_me:7204: 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.
@@ -7210,7 +7211,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7213: result: $with_libtool_opts" >&5
+echo "$as_me:7214: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7221,7 +7222,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7224: checking if exported-symbols file should be used" >&5
+echo "$as_me:7225: 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.
@@ -7236,7 +7237,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7239: result: $with_export_syms" >&5
+echo "$as_me:7240: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7247,15 +7248,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7250: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7251: 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:7255: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7256: 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 7258 "configure"
+#line 7259 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7267,16 +7268,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7273: \$? = $ac_status" >&5
+  echo "$as_me:7274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7285,18 +7286,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7288: result: $cf_cflags_work" >&5
+		echo "$as_me:7289: 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}:7294: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7295: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7299: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7300: 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.
@@ -7314,18 +7315,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7317: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7318: 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:7322: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7323: 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:7328: result: $with_versioned_syms" >&5
+echo "$as_me:7329: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7341,7 +7342,7 @@ then
 		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}:7344: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7345: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7349,11 +7350,11 @@ echo "${as_me:-configure}:7344: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7352: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7353: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7356: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7357: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7365,7 +7366,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7368: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7369: 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
 
@@ -7402,7 +7403,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7405 "configure"
+#line 7406 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7433,7 +7434,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7436: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7437: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7446,7 +7447,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7449: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7450: 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.
@@ -7456,27 +7457,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7459: result: $with_gpm" >&5
+echo "$as_me:7460: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7463: checking for gpm.h" >&5
+	echo "$as_me:7464: 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 7469 "configure"
+#line 7470 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7474: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7479: \$? = $ac_status" >&5
+  echo "$as_me:7480: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7495,7 +7496,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7498: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7499: 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
 
@@ -7506,7 +7507,7 @@ EOF
 		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}:7509: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7510: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7514,7 +7515,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7517: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7518: 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
@@ -7522,7 +7523,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7525 "configure"
+#line 7526 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7541,16 +7542,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7547: \$? = $ac_status" >&5
+  echo "$as_me:7548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7553: \$? = $ac_status" >&5
+  echo "$as_me:7554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7561,18 +7562,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7564: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7565: 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:7571: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7572: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7575: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7576: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7583,7 +7584,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7586: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7587: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7592,7 +7593,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7595: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7596: 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.
@@ -7602,18 +7603,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7605: result: $with_dlsym" >&5
+	echo "$as_me:7606: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7610: checking for dlsym" >&5
+echo "$as_me:7611: 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 7616 "configure"
+#line 7617 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7644,16 +7645,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7650: \$? = $ac_status" >&5
+  echo "$as_me:7651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7656: \$? = $ac_status" >&5
+  echo "$as_me:7657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7663,14 +7664,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7666: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7667: 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:7673: checking for dlsym in -ldl" >&5
+echo "$as_me:7674: 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
@@ -7678,7 +7679,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7681 "configure"
+#line 7682 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7697,16 +7698,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7704: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7717,7 +7718,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7720: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7721: 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
 
@@ -7746,10 +7747,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7749: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7750: 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 7752 "configure"
+#line 7753 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7767,16 +7768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7773: \$? = $ac_status" >&5
+  echo "$as_me:7774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7779: \$? = $ac_status" >&5
+  echo "$as_me:7780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7787,15 +7788,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7790: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7791: 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:7795: result: ok" >&5
+	echo "$as_me:7796: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7798: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7799: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7803,12 +7804,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7806: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7807: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7811: checking for soname of gpm library" >&5
+echo "$as_me:7812: 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
@@ -7842,15 +7843,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7845: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7848: \$? = $ac_status" >&5
+  echo "$as_me:7849: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7850: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7853: \$? = $ac_status" >&5
+  echo "$as_me:7854: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7861,7 +7862,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7864: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7865: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7929,7 +7930,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7932: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7933: 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
@@ -7937,7 +7938,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7940 "configure"
+#line 7941 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7956,16 +7957,16 @@ Gpm_Wgetch ();
 }
 _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
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7976,11 +7977,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7979: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7980: 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:7983: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7984: 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
@@ -8004,15 +8005,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8007: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8010: \$? = $ac_status" >&5
+  echo "$as_me:8011: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8015: \$? = $ac_status" >&5
+  echo "$as_me:8016: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8024,11 +8025,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8027: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8028: 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:8031: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8032: 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
 
@@ -8036,7 +8037,7 @@ fi
 
 fi
 
-echo "$as_me:8039: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8040: 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.
@@ -8045,7 +8046,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8048: result: $with_pcre2" >&5
+echo "$as_me:8049: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8056,17 +8057,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8059: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8060: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8065: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8066: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8069: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8070: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8190,7 +8191,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8193: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8194: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8203,7 +8204,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8206: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8207: 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
@@ -8211,7 +8212,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8214 "configure"
+#line 8215 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8230,16 +8231,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8236: \$? = $ac_status" >&5
+  echo "$as_me:8237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8250,7 +8251,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8253: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8254: 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
 
@@ -8271,7 +8272,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8274: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8275: 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
@@ -8279,7 +8280,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8282 "configure"
+#line 8283 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8298,16 +8299,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8304: \$? = $ac_status" >&5
+  echo "$as_me:8305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8310: \$? = $ac_status" >&5
+  echo "$as_me:8311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8318,7 +8319,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8321: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8322: 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
 
@@ -8339,7 +8340,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8342: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8343: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8354,23 +8355,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8357: checking for $ac_header" >&5
+echo "$as_me:8358: 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 8363 "configure"
+#line 8364 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8368: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8373: \$? = $ac_status" >&5
+  echo "$as_me:8374: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8389,7 +8390,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8393: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8402,13 +8403,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8405: checking for $ac_func" >&5
+echo "$as_me:8406: 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 8411 "configure"
+#line 8412 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8439,16 +8440,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8445: \$? = $ac_status" >&5
+  echo "$as_me:8446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8451: \$? = $ac_status" >&5
+  echo "$as_me:8452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8458,7 +8459,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8461: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8462: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8472,7 +8473,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8475: checking if you want to use sysmouse" >&5
+echo "$as_me:8476: 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.
@@ -8484,7 +8485,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8487 "configure"
+#line 8488 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8507,16 +8508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8513: \$? = $ac_status" >&5
+  echo "$as_me:8514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8519: \$? = $ac_status" >&5
+  echo "$as_me:8520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8526,7 +8527,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8529: result: $cf_with_sysmouse" >&5
+echo "$as_me:8530: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8536,7 +8537,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8539: checking if you want to disable library suffixes" >&5
+echo "$as_me:8540: 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.
@@ -8553,13 +8554,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8556: result: $disable_lib_suffixes" >&5
+echo "$as_me:8557: 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:8562: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8563: 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.
@@ -8577,22 +8578,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8580: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8581: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8585: checking for updated LDFLAGS" >&5
+echo "$as_me:8586: 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:8588: result: maybe" >&5
+	echo "$as_me:8589: 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:8595: checking for $ac_word" >&5
+echo "$as_me:8596: 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
@@ -8607,7 +8608,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8610: found $ac_dir/$ac_word" >&5
+echo "$as_me:8611: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8615,10 +8616,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8618: result: $cf_ldd_prog" >&5
+  echo "$as_me:8619: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8621: result: no" >&5
+  echo "$as_me:8622: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8632,7 +8633,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8635 "configure"
+#line 8636 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8644,16 +8645,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8650: \$? = $ac_status" >&5
+  echo "$as_me:8651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8656: \$? = $ac_status" >&5
+  echo "$as_me:8657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8681,7 +8682,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8684: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8685: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8693,11 +8694,11 @@ echo "${as_me:-configure}:8684: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8696: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8697: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8700: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8701: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8734,7 +8735,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8737: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8738: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8747,11 +8748,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8750: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8751: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8754: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8755: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8788,7 +8789,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8791: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8792: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8801,14 +8802,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8804: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8805: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8808: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8809: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8811: result: no" >&5
+	echo "$as_me:8812: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8822,7 +8823,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8825: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8826: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8839,7 +8840,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8842: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8843: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8847,7 +8848,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8850: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8851: 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=
 
@@ -8866,11 +8867,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8869: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8870: result: $EXTRA_SUFFIX" >&5
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8873: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8874: 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.
@@ -8880,10 +8881,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8883: result: $with_overwrite" >&5
+echo "$as_me:8884: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8886: checking if external terminfo-database is used" >&5
+echo "$as_me:8887: 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.
@@ -8893,7 +8894,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8896: result: $use_database" >&5
+echo "$as_me:8897: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8909,7 +8910,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8912: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8913: 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.
@@ -8917,10 +8918,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8920: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8921: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8923: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8924: 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.
@@ -8930,13 +8931,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8933: result: $with_hashed_db" >&5
+	echo "$as_me:8934: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8939: checking for list of fallback descriptions" >&5
+echo "$as_me:8940: 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.
@@ -8946,7 +8947,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8949: result: $with_fallback" >&5
+echo "$as_me:8950: result: $with_fallback" >&5
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
@@ -8954,7 +8955,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8957: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8958: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8970,7 +8971,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8973: checking for $ac_word" >&5
+echo "$as_me:8974: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8985,7 +8986,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8988: found $ac_dir/$ac_word" >&5
+echo "$as_me:8989: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8993,10 +8994,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:8996: result: $TIC" >&5
+  echo "$as_me:8997: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:8999: result: no" >&5
+  echo "$as_me:9000: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9005,7 +9006,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9008: checking for $ac_word" >&5
+echo "$as_me:9009: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9020,7 +9021,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9023: found $ac_dir/$ac_word" >&5
+echo "$as_me:9024: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9028,10 +9029,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9031: result: $ac_ct_TIC" >&5
+  echo "$as_me:9032: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9034: result: no" >&5
+  echo "$as_me:9035: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9043,7 +9044,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9046: checking for $ac_word" >&5
+echo "$as_me:9047: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9058,7 +9059,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9061: found $ac_dir/$ac_word" >&5
+echo "$as_me:9062: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9066,10 +9067,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9069: result: $INFOCMP" >&5
+  echo "$as_me:9070: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9072: result: no" >&5
+  echo "$as_me:9073: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9078,7 +9079,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9081: checking for $ac_word" >&5
+echo "$as_me:9082: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9093,7 +9094,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9096: found $ac_dir/$ac_word" >&5
+echo "$as_me:9097: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9101,10 +9102,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9104: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9105: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9107: result: no" >&5
+  echo "$as_me:9108: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9119,10 +9120,10 @@ 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:9122: checking for tic program for fallbacks" >&5
+  echo "$as_me:9123: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9125: result: $TIC" >&5
+		echo "$as_me:9126: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9150,7 +9151,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9153: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9154: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9163,7 +9164,7 @@ 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:9166: checking for $ac_word" >&5
+echo "$as_me:9167: 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
@@ -9180,7 +9181,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9183: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9184: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9191,10 +9192,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9194: result: $TIC" >&5
+  echo "$as_me:9195: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9197: result: no" >&5
+  echo "$as_me:9198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9253,7 +9254,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9256: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9257: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9268,7 +9269,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9271: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9272: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9277,10 +9278,10 @@ 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:9280: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9281: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9283: result: $INFOCMP" >&5
+		echo "$as_me:9284: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9308,7 +9309,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9311: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9312: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9321,7 +9322,7 @@ 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:9324: checking for $ac_word" >&5
+echo "$as_me:9325: 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
@@ -9338,7 +9339,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9341: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9342: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9349,10 +9350,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9352: result: $INFOCMP" >&5
+  echo "$as_me:9353: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9355: result: no" >&5
+  echo "$as_me:9356: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9411,7 +9412,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9414: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9415: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9426,7 +9427,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9429: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9430: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9436,7 +9437,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9439: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9440: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9444,7 +9445,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9447: checking if you want modern xterm or antique" >&5
+echo "$as_me:9448: 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.
@@ -9458,7 +9459,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9461: result: $with_xterm_new" >&5
+echo "$as_me:9462: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9471,7 +9472,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9474: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9475: 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.
@@ -9492,13 +9493,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9495: result: $with_xterm_kbs" >&5
+echo "$as_me:9496: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9501: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
+	{ echo "$as_me:9502: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;}
 fi
 
@@ -9508,7 +9509,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9511: checking for list of terminfo directories" >&5
+echo "$as_me:9512: 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.
@@ -9548,7 +9549,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9551: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9552: 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; }; }
 	;;
@@ -9571,7 +9572,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9574: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9575: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9580,13 +9581,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9583: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9584: 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:9589: checking for default terminfo directory" >&5
+echo "$as_me:9590: 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.
@@ -9622,7 +9623,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9625: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9626: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9631,7 +9632,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9634: result: $TERMINFO" >&5
+echo "$as_me:9635: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9642,7 +9643,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9645: checking if big-core option selected" >&5
+echo "$as_me:9646: 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.
@@ -9654,7 +9655,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9657 "configure"
+#line 9658 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9668,15 +9669,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9674: \$? = $ac_status" >&5
+  echo "$as_me:9675: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9679: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9688,7 +9689,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9691: result: $with_big_core" >&5
+echo "$as_me:9692: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9698,7 +9699,7 @@ EOF
 ### 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:9701: checking if big-strings option selected" >&5
+echo "$as_me:9702: 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.
@@ -9722,14 +9723,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9725: result: $with_big_strings" >&5
+echo "$as_me:9726: 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:9732: checking if you want termcap-fallback support" >&5
+echo "$as_me:9733: 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.
@@ -9739,14 +9740,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9742: result: $with_termcap" >&5
+echo "$as_me:9743: 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:9749: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9750: 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
@@ -9759,13 +9760,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9762: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9763: 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:9768: checking for list of termcap files" >&5
+	echo "$as_me:9769: 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.
@@ -9805,7 +9806,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9808: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9809: 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; }; }
 	;;
@@ -9828,7 +9829,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9831: result: $TERMPATH" >&5
+	echo "$as_me:9832: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9836,7 +9837,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9839: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9840: 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.
@@ -9846,14 +9847,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9849: result: $with_getcap" >&5
+	echo "$as_me:9850: 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:9856: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9857: 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.
@@ -9863,7 +9864,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9866: result: $with_getcap_cache" >&5
+	echo "$as_me:9867: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9873,7 +9874,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9876: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9877: 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.
@@ -9883,14 +9884,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9886: result: $with_home_terminfo" >&5
+echo "$as_me:9887: 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:9893: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9894: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9900,14 +9901,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9903: result: $with_root_environ" >&5
+echo "$as_me:9904: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9910: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9911: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9917,14 +9918,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9920: result: $with_root_access" >&5
+echo "$as_me:9921: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9927: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9928: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9934,7 +9935,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9937: result: $with_setuid_environ" >&5
+echo "$as_me:9938: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9949,23 +9950,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9952: checking for $ac_header" >&5
+echo "$as_me:9953: 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 9958 "configure"
+#line 9959 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9962: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9968: \$? = $ac_status" >&5
+  echo "$as_me:9969: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9984,7 +9985,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9987: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9988: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9999,13 +10000,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10002: checking for $ac_func" >&5
+echo "$as_me:10003: 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 10008 "configure"
+#line 10009 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10036,16 +10037,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10042: \$? = $ac_status" >&5
+  echo "$as_me:10043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10048: \$? = $ac_status" >&5
+  echo "$as_me:10049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10055,7 +10056,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10058: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10059: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10072,13 +10073,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10075: checking for $ac_func" >&5
+echo "$as_me:10076: 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 10081 "configure"
+#line 10082 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10109,16 +10110,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10115: \$? = $ac_status" >&5
+  echo "$as_me:10116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10121: \$? = $ac_status" >&5
+  echo "$as_me:10122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10128,7 +10129,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10131: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10132: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10139,7 +10140,7 @@ fi
 done
 
 else
-	echo "$as_me:10142: checking if link/symlink functions work" >&5
+	echo "$as_me:10143: 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
@@ -10152,7 +10153,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10155 "configure"
+#line 10156 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10186,15 +10187,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10192: \$? = $ac_status" >&5
+  echo "$as_me:10193: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10197: \$? = $ac_status" >&5
+  echo "$as_me:10198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10212,7 +10213,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10215: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10216: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10232,7 +10233,7 @@ with_symlinks=no
 # 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:10235: checking if tic should use symbolic links" >&5
+	echo "$as_me:10236: 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.
@@ -10242,21 +10243,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10245: result: $with_symlinks" >&5
+	echo "$as_me:10246: 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:10252: checking if tic should use hard links" >&5
+	echo "$as_me:10253: 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:10259: result: $with_links" >&5
+	echo "$as_me:10260: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10272,7 +10273,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10275: checking if you want broken-linker support code" >&5
+echo "$as_me:10276: 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.
@@ -10282,7 +10283,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10285: result: $with_broken_linker" >&5
+echo "$as_me:10286: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10296,7 +10297,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10299: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10300: 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.
@@ -10306,7 +10307,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10309: result: $with_bsdpad" >&5
+echo "$as_me:10310: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10325,14 +10326,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10328: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10329: 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 10335 "configure"
+#line 10336 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10351,16 +10352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10357: \$? = $ac_status" >&5
+  echo "$as_me:10358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10363: \$? = $ac_status" >&5
+  echo "$as_me:10364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10371,7 +10372,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10374: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10375: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10413,14 +10414,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10416: checking if this is the GNU C library" >&5
+echo "$as_me:10417: 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 10423 "configure"
+#line 10424 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10439,16 +10440,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10445: \$? = $ac_status" >&5
+  echo "$as_me:10446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10451: \$? = $ac_status" >&5
+  echo "$as_me:10452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10459,7 +10460,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10462: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10463: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10467,7 +10468,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10470: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10471: 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
@@ -10479,7 +10480,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10482 "configure"
+#line 10483 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10498,16 +10499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10504: \$? = $ac_status" >&5
+  echo "$as_me:10505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10510: \$? = $ac_status" >&5
+  echo "$as_me:10511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10519,12 +10520,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10522: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10523: 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:10527: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10528: 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
@@ -10629,7 +10630,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10632 "configure"
+#line 10633 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10649,16 +10650,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10655: \$? = $ac_status" >&5
+  echo "$as_me:10656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10661: \$? = $ac_status" >&5
+  echo "$as_me:10662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10669,7 +10670,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10672: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10673: 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
@@ -10678,14 +10679,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10681: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10682: 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 10688 "configure"
+#line 10689 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10700,16 +10701,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10706: \$? = $ac_status" >&5
+  echo "$as_me:10707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10712: \$? = $ac_status" >&5
+  echo "$as_me:10713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10816,7 +10817,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10819 "configure"
+#line 10820 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10831,16 +10832,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10837: \$? = $ac_status" >&5
+  echo "$as_me:10838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10843: \$? = $ac_status" >&5
+  echo "$as_me:10844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10855,12 +10856,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10858: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10859: 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:10863: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10864: 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
@@ -10870,7 +10871,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10873 "configure"
+#line 10874 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10885,16 +10886,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10891: \$? = $ac_status" >&5
+  echo "$as_me:10892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10897: \$? = $ac_status" >&5
+  echo "$as_me:10898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10905,7 +10906,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10908: result: $cf_cv_default_source" >&5
+echo "$as_me:10909: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10942,16 +10943,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10945: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10946: 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}:10951: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10952: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10954 "configure"
+#line 10955 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10966,16 +10967,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10972: \$? = $ac_status" >&5
+  echo "$as_me:10973: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10978: \$? = $ac_status" >&5
+  echo "$as_me:10979: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -10996,7 +10997,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10999 "configure"
+#line 11000 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11011,16 +11012,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11017: \$? = $ac_status" >&5
+  echo "$as_me:11018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11023: \$? = $ac_status" >&5
+  echo "$as_me:11024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11031,7 +11032,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11034: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11035: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11039,10 +11040,10 @@ echo "${as_me:-configure}:11034: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11042: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11043: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11045 "configure"
+#line 11046 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11057,16 +11058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11063: \$? = $ac_status" >&5
+  echo "$as_me:11064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11069: \$? = $ac_status" >&5
+  echo "$as_me:11070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11082,7 +11083,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11085: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11086: 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
@@ -11199,7 +11200,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11202: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11203: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11231,14 +11232,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11234: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11235: 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 11241 "configure"
+#line 11242 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11256,16 +11257,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11262: \$? = $ac_status" >&5
+  echo "$as_me:11263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11268: \$? = $ac_status" >&5
+  echo "$as_me:11269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11277,7 +11278,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11280 "configure"
+#line 11281 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11295,16 +11296,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11301: \$? = $ac_status" >&5
+  echo "$as_me:11302: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11307: \$? = $ac_status" >&5
+  echo "$as_me:11308: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11319,7 +11320,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11322: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11323: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11479,16 +11480,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11482: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11483: 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}:11488: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11489: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11491 "configure"
+#line 11492 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11503,16 +11504,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11509: \$? = $ac_status" >&5
+  echo "$as_me:11510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11515: \$? = $ac_status" >&5
+  echo "$as_me:11516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11533,7 +11534,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11536 "configure"
+#line 11537 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11548,16 +11549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11554: \$? = $ac_status" >&5
+  echo "$as_me:11555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11560: \$? = $ac_status" >&5
+  echo "$as_me:11561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11568,7 +11569,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11571: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11576,10 +11577,10 @@ echo "${as_me:-configure}:11571: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11579: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11580: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11582 "configure"
+#line 11583 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11594,16 +11595,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11606: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11619,7 +11620,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11622: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11623: 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
@@ -11732,10 +11733,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11735: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11736: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11738 "configure"
+#line 11739 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11753,23 +11754,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11759: \$? = $ac_status" >&5
+  echo "$as_me:11760: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11765: \$? = $ac_status" >&5
+  echo "$as_me:11766: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11772: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11773: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11792,7 +11793,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11795: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11796: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11804,7 +11805,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11807: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11808: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11892,7 +11893,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11895: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11896: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11902,7 +11903,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11905: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11906: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11912,7 +11913,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11915: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11916: 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"
@@ -11924,10 +11925,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11927: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11928: 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 11930 "configure"
+#line 11931 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11942,16 +11943,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11948: \$? = $ac_status" >&5
+  echo "$as_me:11949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11954: \$? = $ac_status" >&5
+  echo "$as_me:11955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11960,12 +11961,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11963: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11964: 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 11968 "configure"
+#line 11969 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11980,16 +11981,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11986: \$? = $ac_status" >&5
+  echo "$as_me:11987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11992: \$? = $ac_status" >&5
+  echo "$as_me:11993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12000,19 +12001,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12003: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12004: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12008: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12009: 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 12015 "configure"
+#line 12016 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12030,16 +12031,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12036: \$? = $ac_status" >&5
+  echo "$as_me:12037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12042: \$? = $ac_status" >&5
+  echo "$as_me:12043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12051,7 +12052,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12054 "configure"
+#line 12055 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12069,16 +12070,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12075: \$? = $ac_status" >&5
+  echo "$as_me:12076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12081: \$? = $ac_status" >&5
+  echo "$as_me:12082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12093,7 +12094,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12096: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12097: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12244,14 +12245,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12247: checking if SIGWINCH is defined" >&5
+echo "$as_me:12248: 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 12254 "configure"
+#line 12255 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12266,23 +12267,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12272: \$? = $ac_status" >&5
+  echo "$as_me:12273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12278: \$? = $ac_status" >&5
+  echo "$as_me:12279: \$? = $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 12285 "configure"
+#line 12286 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12300,16 +12301,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12306: \$? = $ac_status" >&5
+  echo "$as_me:12307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12312: \$? = $ac_status" >&5
+  echo "$as_me:12313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12323,11 +12324,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12326: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12327: 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:12330: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12331: 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
@@ -12338,7 +12339,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12341 "configure"
+#line 12342 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12360,16 +12361,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12366: \$? = $ac_status" >&5
+  echo "$as_me:12367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12372: \$? = $ac_status" >&5
+  echo "$as_me:12373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12383,7 +12384,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12386: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12387: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12393,13 +12394,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12396: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12397: 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 12402 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12413,16 +12414,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12419: \$? = $ac_status" >&5
+  echo "$as_me:12420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12425: \$? = $ac_status" >&5
+  echo "$as_me:12426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12433,7 +12434,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12436: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12437: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12447,7 +12448,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12450: checking if you want wide-character code" >&5
+echo "$as_me:12451: 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.
@@ -12457,7 +12458,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:12460: result: $with_widec" >&5
+echo "$as_me:12461: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12479,7 +12480,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12482: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12483: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12492,23 +12493,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12495: checking for $ac_header" >&5
+echo "$as_me:12496: 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 12501 "configure"
+#line 12502 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12505: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12506: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12511: \$? = $ac_status" >&5
+  echo "$as_me:12512: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12527,7 +12528,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12530: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12531: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12537,14 +12538,14 @@ EOF
 fi
 done
 
-echo "$as_me:12540: checking if wchar.h can be used as is" >&5
+echo "$as_me:12541: 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 12547 "configure"
+#line 12548 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12566,16 +12567,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12572: \$? = $ac_status" >&5
+  echo "$as_me:12573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12585,16 +12586,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12588: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12589: 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:12594: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12595: 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 12597 "configure"
+#line 12598 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12610,16 +12611,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12616: \$? = $ac_status" >&5
+  echo "$as_me:12617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12622: \$? = $ac_status" >&5
+  echo "$as_me:12623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12628,16 +12629,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12631: result: $cf_result" >&5
+echo "$as_me:12632: 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:12637: checking checking for compatible value versus " >&5
+	echo "$as_me:12638: 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 12640 "configure"
+#line 12641 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12653,16 +12654,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12659: \$? = $ac_status" >&5
+  echo "$as_me:12660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12665: \$? = $ac_status" >&5
+  echo "$as_me:12666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12671,7 +12672,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12674: result: $cf_result" >&5
+	echo "$as_me:12675: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12681,7 +12682,7 @@ fi
 
 fi
 
-echo "$as_me:12684: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12685: 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
@@ -12752,7 +12753,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12755 "configure"
+#line 12756 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12797,15 +12798,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12803: \$? = $ac_status" >&5
+  echo "$as_me:12804: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:12809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12818,7 +12819,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12821: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12822: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12829,13 +12830,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12832: checking for $ac_func" >&5
+echo "$as_me:12833: 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 12838 "configure"
+#line 12839 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12866,16 +12867,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12872: \$? = $ac_status" >&5
+  echo "$as_me:12873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12878: \$? = $ac_status" >&5
+  echo "$as_me:12879: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12885,7 +12886,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12889: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12900,23 +12901,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12903: checking for $ac_header" >&5
+echo "$as_me:12904: 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 12909 "configure"
+#line 12910 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12914: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12919: \$? = $ac_status" >&5
+  echo "$as_me:12920: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12935,7 +12936,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12938: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12939: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12945,7 +12946,7 @@ EOF
 fi
 done
 
-echo "$as_me:12948: checking for multibyte character support" >&5
+echo "$as_me:12949: 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
@@ -12953,7 +12954,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12956 "configure"
+#line 12957 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12970,16 +12971,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12976: \$? = $ac_status" >&5
+  echo "$as_me:12977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12982: \$? = $ac_status" >&5
+  echo "$as_me:12983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12991,12 +12992,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:12994: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12995: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12999 "configure"
+#line 13000 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13009,16 +13010,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13015: \$? = $ac_status" >&5
+  echo "$as_me:13016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13021: \$? = $ac_status" >&5
+  echo "$as_me:13022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13032,7 +13033,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13035 "configure"
+#line 13036 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13045,16 +13046,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13051: \$? = $ac_status" >&5
+  echo "$as_me:13052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13057: \$? = $ac_status" >&5
+  echo "$as_me:13058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13071,9 +13072,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13074: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13075: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13076: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13077: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13164,7 +13165,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13167: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13168: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13172,7 +13173,7 @@ echo "${as_me:-configure}:13167: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13175 "configure"
+#line 13176 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13185,21 +13186,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13191: \$? = $ac_status" >&5
+  echo "$as_me:13192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13197: \$? = $ac_status" >&5
+  echo "$as_me:13198: \$? = $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}:13202: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13203: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13217,7 +13218,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13220: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13221: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13292,13 +13293,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13295: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13296: 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 13301 "configure"
+#line 13302 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13311,21 +13312,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13317: \$? = $ac_status" >&5
+  echo "$as_me:13318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13323: \$? = $ac_status" >&5
+  echo "$as_me:13324: \$? = $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}:13328: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13329: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13367,7 +13368,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13370: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13371: 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
@@ -13405,7 +13406,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13408 "configure"
+#line 13409 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13417,16 +13418,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13423: \$? = $ac_status" >&5
+  echo "$as_me:13424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13429: \$? = $ac_status" >&5
+  echo "$as_me:13430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13443,7 +13444,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13446: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13447: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13479,7 +13480,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13482: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13483: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13511,14 +13512,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13514: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13515: 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 13521 "configure"
+#line 13522 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13536,23 +13537,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13542: \$? = $ac_status" >&5
+  echo "$as_me:13543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13548: \$? = $ac_status" >&5
+  echo "$as_me:13549: \$? = $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 13555 "configure"
+#line 13556 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13571,16 +13572,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13577: \$? = $ac_status" >&5
+  echo "$as_me:13578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13583: \$? = $ac_status" >&5
+  echo "$as_me:13584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13592,7 +13593,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13595: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13596: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13610,14 +13611,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13613: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13614: 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 13620 "configure"
+#line 13621 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13635,23 +13636,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13641: \$? = $ac_status" >&5
+  echo "$as_me:13642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13647: \$? = $ac_status" >&5
+  echo "$as_me:13648: \$? = $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 13654 "configure"
+#line 13655 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13670,16 +13671,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13676: \$? = $ac_status" >&5
+  echo "$as_me:13677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13682: \$? = $ac_status" >&5
+  echo "$as_me:13683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13691,7 +13692,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13694: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13695: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13714,14 +13715,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13717: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13718: 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 13724 "configure"
+#line 13725 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13739,23 +13740,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13745: \$? = $ac_status" >&5
+  echo "$as_me:13746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13751: \$? = $ac_status" >&5
+  echo "$as_me:13752: \$? = $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 13758 "configure"
+#line 13759 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13774,16 +13775,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13780: \$? = $ac_status" >&5
+  echo "$as_me:13781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13786: \$? = $ac_status" >&5
+  echo "$as_me:13787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13795,7 +13796,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13798: result: $cf_cv_wint_t" >&5
+echo "$as_me:13799: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13827,7 +13828,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13830: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13831: 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.
@@ -13837,7 +13838,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13840: result: $with_lp64" >&5
+echo "$as_me:13841: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13853,7 +13854,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13856: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13857: 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
@@ -13865,7 +13866,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13868 "configure"
+#line 13869 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13885,16 +13886,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13891: \$? = $ac_status" >&5
+  echo "$as_me:13892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13897: \$? = $ac_status" >&5
+  echo "$as_me:13898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13904,16 +13905,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13910: \$? = $ac_status" >&5
+  echo "$as_me:13911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13916: \$? = $ac_status" >&5
+  echo "$as_me:13917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13927,13 +13928,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13930: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13931: 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:13936: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13937: 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
@@ -13941,7 +13942,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13944 "configure"
+#line 13945 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13961,16 +13962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13967: \$? = $ac_status" >&5
+  echo "$as_me:13968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13973: \$? = $ac_status" >&5
+  echo "$as_me:13974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13979,7 +13980,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13982 "configure"
+#line 13983 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14000,16 +14001,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14006: \$? = $ac_status" >&5
+  echo "$as_me:14007: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14012: \$? = $ac_status" >&5
+  echo "$as_me:14013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14020,7 +14021,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14023: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14024: 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
 
@@ -14030,7 +14031,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14033: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14034: 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
@@ -14038,7 +14039,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14041 "configure"
+#line 14042 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14058,16 +14059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14064: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14070: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14076,7 +14077,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14079 "configure"
+#line 14080 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14097,16 +14098,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14103: \$? = $ac_status" >&5
+  echo "$as_me:14104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14109: \$? = $ac_status" >&5
+  echo "$as_me:14110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14117,7 +14118,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14120: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14121: 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
 
@@ -14130,7 +14131,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14133: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14134: 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
@@ -14138,7 +14139,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14141 "configure"
+#line 14142 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14150,16 +14151,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14156: \$? = $ac_status" >&5
+  echo "$as_me:14157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14162: \$? = $ac_status" >&5
+  echo "$as_me:14163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14168,7 +14169,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14171 "configure"
+#line 14172 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14181,16 +14182,16 @@ return !fseeko;
 }
 _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_sys_largefile_source=1; break
 else
@@ -14201,7 +14202,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14204: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14205: 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
 
@@ -14215,13 +14216,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14218: checking for fseeko" >&5
+echo "$as_me:14219: 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 14224 "configure"
+#line 14225 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14233,16 +14234,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14239: \$? = $ac_status" >&5
+  echo "$as_me:14240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14245: \$? = $ac_status" >&5
+  echo "$as_me:14246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14252,7 +14253,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14255: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14256: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14291,14 +14292,14 @@ fi
 
 	fi
 
-	echo "$as_me:14294: checking whether to use struct dirent64" >&5
+	echo "$as_me:14295: 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 14301 "configure"
+#line 14302 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14321,16 +14322,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14327: \$? = $ac_status" >&5
+  echo "$as_me:14328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14333: \$? = $ac_status" >&5
+  echo "$as_me:14334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14341,7 +14342,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14344: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14345: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14351,7 +14352,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14354: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14355: 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.
@@ -14361,14 +14362,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14364: result: $with_tparm_varargs" >&5
+echo "$as_me:14365: 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:14371: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14372: 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.
@@ -14378,14 +14379,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14381: result: $with_tic_depends" >&5
+echo "$as_me:14382: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14388: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14389: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14397,15 +14398,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14400: result: no" >&5
+	echo "$as_me:14401: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14404: result: yes" >&5
+	echo "$as_me:14405: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14408: checking for X11 rgb file" >&5
+echo "$as_me:14409: 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.
@@ -14469,7 +14470,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14472: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14473: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14477,7 +14478,7 @@ esac
 
 fi
 
-echo "$as_me:14480: result: $RGB_PATH" >&5
+echo "$as_me:14481: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14491,7 +14492,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14494: checking for type of bool" >&5
+echo "$as_me:14495: 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.
@@ -14501,10 +14502,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14504: result: $NCURSES_BOOL" >&5
+echo "$as_me:14505: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14507: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14508: 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.
@@ -14516,15 +14517,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14519: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14520: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14523: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14524: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14527: checking for type of chtype" >&5
+echo "$as_me:14528: 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.
@@ -14534,11 +14535,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14537: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14538: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14541: checking for type of ospeed" >&5
+echo "$as_me:14542: 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.
@@ -14548,11 +14549,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14551: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14552: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14555: checking for type of mmask_t" >&5
+echo "$as_me:14556: 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.
@@ -14562,11 +14563,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14565: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14566: 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:14569: checking for size CCHARW_MAX" >&5
+echo "$as_me:14570: 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.
@@ -14576,16 +14577,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14579: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14580: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14582: checking for signed char" >&5
+echo "$as_me:14583: 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 14588 "configure"
+#line 14589 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14600,16 +14601,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14606: \$? = $ac_status" >&5
+  echo "$as_me:14607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14612: \$? = $ac_status" >&5
+  echo "$as_me:14613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14619,10 +14620,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14622: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14623: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14625: checking size of signed char" >&5
+echo "$as_me:14626: 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
@@ -14631,7 +14632,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14634 "configure"
+#line 14635 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14643,21 +14644,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14649: \$? = $ac_status" >&5
+  echo "$as_me:14650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:14656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14660 "configure"
+#line 14661 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14669,16 +14670,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14675: \$? = $ac_status" >&5
+  echo "$as_me:14676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14681: \$? = $ac_status" >&5
+  echo "$as_me:14682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14694,7 +14695,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14697 "configure"
+#line 14698 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14706,16 +14707,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14712: \$? = $ac_status" >&5
+  echo "$as_me:14713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14718: \$? = $ac_status" >&5
+  echo "$as_me:14719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14731,7 +14732,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14734 "configure"
+#line 14735 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14743,16 +14744,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14749: \$? = $ac_status" >&5
+  echo "$as_me:14750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14755: \$? = $ac_status" >&5
+  echo "$as_me:14756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14765,12 +14766,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14768: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14769: 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 14773 "configure"
+#line 14774 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14786,15 +14787,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14792: \$? = $ac_status" >&5
+  echo "$as_me:14793: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14797: \$? = $ac_status" >&5
+  echo "$as_me:14798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14810,7 +14811,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14813: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14814: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14821,7 +14822,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14824: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14825: 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.
@@ -14831,12 +14832,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14834: result: $with_signed_char" >&5
+echo "$as_me:14835: 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:14839: checking for type of tparm args" >&5
+echo "$as_me:14840: 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.
@@ -14846,11 +14847,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14849: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14850: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14853: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14854: 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.
@@ -14860,7 +14861,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14863: result: $with_rcs_ids" >&5
+echo "$as_me:14864: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14869,7 +14870,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14872: checking format of man-pages" >&5
+echo "$as_me:14873: 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.
@@ -14960,10 +14961,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14963: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14964: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14966: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14967: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15002,7 +15003,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15005: checking for manpage renaming" >&5
+echo "$as_me:15006: 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.
@@ -15031,15 +15032,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15034: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15035: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15039: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15040: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15042: checking if manpage aliases will be installed" >&5
+echo "$as_me:15043: 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.
@@ -15050,7 +15051,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15053: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15054: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15064,7 +15065,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15067: checking if manpage symlinks should be used" >&5
+echo "$as_me:15068: 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.
@@ -15077,17 +15078,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15080: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15081: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15086: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15087: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15090: checking for manpage tbl" >&5
+echo "$as_me:15091: 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.
@@ -15098,7 +15099,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15101: result: $MANPAGE_TBL" >&5
+echo "$as_me:15102: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15405,7 +15406,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15408: checking if you want to build with function extensions" >&5
+echo "$as_me:15409: 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.
@@ -15415,7 +15416,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15418: result: $with_ext_funcs" >&5
+echo "$as_me:15419: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15452,10 +15453,6 @@ cat >>confdefs.h <<\EOF
 #define HAVE_USE_DEFAULT_COLORS 1
 EOF
 
-cat >>confdefs.h <<\EOF
-#define HAVE_USE_EXTENDED_NAMES 1
-EOF
-
 cat >>confdefs.h <<\EOF
 #define HAVE_USE_SCREEN 1
 EOF
@@ -15475,7 +15472,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15478: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15475: 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.
@@ -15485,7 +15482,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15488: result: $with_sp_funcs" >&5
+echo "$as_me:15485: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15504,7 +15501,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15507: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15504: 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.
@@ -15514,7 +15511,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15517: result: $with_term_driver" >&5
+echo "$as_me:15514: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15523,19 +15520,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15526: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15523: 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:15531: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15528: 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:15538: checking for extended use of const keyword" >&5
+echo "$as_me:15535: 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.
@@ -15545,7 +15542,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15548: result: $with_ext_const" >&5
+echo "$as_me:15545: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15553,7 +15550,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15556: checking if you want to use extended colors" >&5
+echo "$as_me:15553: 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.
@@ -15563,12 +15560,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15566: result: $with_ext_colors" >&5
+echo "$as_me:15563: 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:15571: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15568: 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)
@@ -15579,7 +15576,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15582: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15579: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15607,7 +15604,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15610: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15607: 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.
@@ -15617,7 +15614,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15620: result: $with_ext_mouse" >&5
+echo "$as_me:15617: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15627,7 +15624,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15630: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15627: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15635,20 +15632,16 @@ fi
 
 fi
 
-case $cf_cv_abi_default in
-(5)
+if test $cf_cv_abi_default -le 5 ; then
 	NCURSES_MOUSE_VERSION=1
-	;;
-(6)
+elif test $cf_cv_abi_default -le 6 ; then
 	NCURSES_MOUSE_VERSION=2
-	;;
-([789])
+else
 	NCURSES_MOUSE_VERSION=3
-	;;
-esac
+fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15651: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15644: 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.
@@ -15658,7 +15651,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15661: result: $with_ext_putwin" >&5
+echo "$as_me:15654: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15668,7 +15661,7 @@ EOF
 
 fi
 
-echo "$as_me:15671: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15664: 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.
@@ -15678,7 +15671,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15681: result: $with_no_padding" >&5
+echo "$as_me:15674: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15686,7 +15679,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15689: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15682: 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.
@@ -15696,7 +15689,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15699: result: $with_sigwinch" >&5
+echo "$as_me:15692: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15704,7 +15697,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15707: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15700: 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.
@@ -15714,10 +15707,17 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15717: result: $with_tcap_names" >&5
+echo "$as_me:15710: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
-test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+if test "x$with_tcap_names" = xyes; then
+	NCURSES_XNAMES=1
+
+cat >>confdefs.h <<\EOF
+#define NCURSES_XNAMES 1
+EOF
+
+fi
 
 ##############################################################################
 
diff --git a/configure.in b/configure.in
index 8a74ab6ee..097c74271 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.762 2023/04/22 22:16:28 tom Exp $
+dnl $Id: configure.in,v 1.764 2023/05/06 19:40:40 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.762 $)
+AC_REVISION($Revision: 1.764 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1169,7 +1169,6 @@ if test "x$with_ext_funcs" = xyes ; then
 	AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function in test-programs])
 	AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function in test-programs])
 	AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function in test-programs])
-	AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function in test-programs])
 	AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function in test-programs])
 	AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs])
 	AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs])
@@ -1263,17 +1262,13 @@ if test "x$with_ext_mouse" = xyes ; then
 	CF_NCURSES_ABI_6
 fi
 
-case $cf_cv_abi_default in
-(5)
+if test $cf_cv_abi_default -le 5 ; then
 	NCURSES_MOUSE_VERSION=1
-	;;
-(6)
+elif test $cf_cv_abi_default -le 6 ; then
 	NCURSES_MOUSE_VERSION=2
-	;;
-([[789]])
+else
 	NCURSES_MOUSE_VERSION=3
-	;;
-esac
+fi
 
 AC_SUBST(NCURSES_MOUSE_VERSION)
 
@@ -1313,7 +1308,10 @@ AC_ARG_ENABLE(tcap-names,
 	[with_tcap_names=$with_ext_funcs])
 AC_MSG_RESULT($with_tcap_names)
 NCURSES_XNAMES=0
-test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+if test "x$with_tcap_names" = xyes; then
+	NCURSES_XNAMES=1
+	AC_DEFINE(NCURSES_XNAMES,1,[Define to 1 to compile with user-definable terminal capabilities])
+fi
 AC_SUBST(NCURSES_XNAMES)
 
 ##############################################################################
diff --git a/dist.mk b/dist.mk
index ed7d4e182..4b12f5c47 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1541 2023/04/29 10:21:08 tom Exp $
+# $Id: dist.mk,v 1.1542 2023/05/06 10:03:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230429
+NCURSES_PATCH = 20230506
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/curses.h.in b/include/curses.h.in
index f599b162c..36b3de9b1 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.279 2023/04/23 19:15:47 tom Exp $ */
+/* $Id: curses.h.in,v 1.280 2023/05/06 19:19:20 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -949,13 +949,18 @@ extern NCURSES_EXPORT(int) resizeterm (int, int);
 extern NCURSES_EXPORT(int) set_escdelay (int);
 extern NCURSES_EXPORT(int) set_tabsize (int);
 extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
 extern NCURSES_EXPORT(int) use_legacy_coding (int);
 extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
 extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
 extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
 extern NCURSES_EXPORT(void) nofilter(void);
 
+#if @NCURSES_XNAMES@
+#undef  NCURSES_XNAMES
+#define NCURSES_XNAMES @NCURSES_XNAMES@
+extern NCURSES_EXPORT(int) use_extended_names (bool);
+#endif
+
 /*
  * These extensions provide access to information stored in the WINDOW even
  * when NCURSES_OPAQUE is set:
diff --git a/include/nc_access.h b/include/nc_access.h
index acdf2e0ac..1d2fb0a4e 100644
--- a/include/nc_access.h
+++ b/include/nc_access.h
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 
-/* $Id: nc_access.h,v 1.5 2023/04/28 20:04:43 tom Exp $ */
+/* $Id: nc_access.h,v 1.6 2023/05/06 10:54:55 tom Exp $ */
 
 #ifndef NC_ACCESS_included
 #define NC_ACCESS_included 1
@@ -64,7 +64,7 @@ extern NCURSES_EXPORT(int) _nc_env_access (void);
 #else
 
 #define safe_fopen(name,mode)       _nc_safe_fopen(name,mode)
-#define safe_open2(name,flags)      _nc_safe_open2(name,flags,0)
+#define safe_open2(name,flags)      _nc_safe_open3(name,flags,0)
 #define safe_open3(name,flags,mode) _nc_safe_open3(name,flags,mode)
 extern NCURSES_EXPORT(FILE *)       _nc_safe_fopen (const char *, const char *);
 extern NCURSES_EXPORT(int)          _nc_safe_open3 (const char *, int, mode_t);
diff --git a/include/ncurses_defs b/include/ncurses_defs
index 6beab2f18..d2400c335 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.108 2023/04/23 19:39:00 tom Exp $
+# $Id: ncurses_defs,v 1.109 2023/05/06 17:07:27 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -208,7 +208,7 @@ HAVE_UNISTD_H
 HAVE_UNLINK
 HAVE_USE_DEFAULT_COLORS
 HAVE_USE_ENV	1
-HAVE_USE_EXTENDED_NAMES
+HAVE_USE_EXTENDED_NAMES	NCURSES_XNAMES
 HAVE_USE_SCREEN
 HAVE_USE_WINDOW
 HAVE_VFSCANF
diff --git a/include/ncurses_dll.h.in b/include/ncurses_dll.h.in
index 437c54de0..401d47a81 100644
--- a/include/ncurses_dll.h.in
+++ b/include/ncurses_dll.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 2009,2014 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -26,7 +26,7 @@
  * sale, use or other dealings in this Software without prior written       *
  * authorization.                                                           *
  ****************************************************************************/
-/* $Id: ncurses_dll.h.in,v 1.17 2020/09/05 17:58:47 juergen Exp $ */
+/* $Id: ncurses_dll.h.in,v 1.18 2023/05/06 20:12:43 tom Exp $ */
 
 #ifndef NCURSES_DLL_H_incl
 #define NCURSES_DLL_H_incl 1
@@ -92,7 +92,11 @@
 # define NCURSES_API __cdecl
 #else
 # define NCURSES_EXPORT_GENERAL_IMPORT
-# define NCURSES_EXPORT_GENERAL_EXPORT
+# if (__GNUC__ >= 4) && !defined(__cplusplus)
+#   define NCURSES_EXPORT_GENERAL_EXPORT __attribute__((visibility ("default")))
+# else
+#   define NCURSES_EXPORT_GENERAL_EXPORT
+# endif
 # define NCURSES_API /* FIXME: __attribute__ ((cdecl)) is only available on x86 */
 #endif
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 3986480e1..dc57495e6 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230429) unstable; urgency=low
+ncurses6 (6.4+20230506) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 3986480e1..dc57495e6 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230429) unstable; urgency=low
+ncurses6 (6.4+20230506) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index dce75f443..bff1c6335 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230429) unstable; urgency=low
+ncurses6 (6.4+20230506) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Apr 2023 15:23:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e108cf96d..70d078447 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.581 2023/04/28 19:23:29 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.582 2023/05/06 10:03:33 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0429"
+!define VERSION_MMDD  "0506"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ed9c72997..4c0c393ce 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230429
+Release: 20230506
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1c6e41fa1..b8a8e8cea 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230429
+Release: 20230506
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7951e72a6..74d304605 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230429
+Release: 20230506
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 3c5a6cd735db20fba7b78042f633bb29145742a1 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 15 May 2023 01:39:07 +0200
Subject: [PATCH 009/106] ncurses-6.4-20230514.patch

---
 NEWS                             |    8 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   14 +-
 configure                        | 2452 +++++++++++++++---------------
 dist.mk                          |    4 +-
 misc/terminfo.src                |   13 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/debian/rules             |    6 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    2 +-
 package/ncursest.spec            |    2 +-
 14 files changed, 1276 insertions(+), 1245 deletions(-)

diff --git a/NEWS b/NEWS
index 4bccc0138..02e8d9f71 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3950 2023/05/06 20:14:16 tom Exp $
+-- $Id: NEWS,v 1.3953 2023/05/14 22:01:25 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230514
+	+ modify test-package "ncurses6-doc" to use manpage-aliases, which in
+	  turn required a change to the configure script to factor in the
+	  extra-suffix option when deriving alias names.
+	+ add mode 1004 to xterm+sm+1006 from xterm #380 -TD
+
 20230506
 	> build-fixes related to configure-options and/or platform:
 	  + fix for --enable-fvisibility
diff --git a/VERSION b/VERSION
index 9a951f64e..d2f427759 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230506
+5:0:10	6.4	20230514
diff --git a/aclocal.m4 b/aclocal.m4
index 8b55ab3f4..0a0770de5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1044 2023/05/06 22:18:58 tom Exp $
+dnl $Id: aclocal.m4,v 1.1046 2023/05/13 21:42:47 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5844,7 +5844,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 56 updated: 2023/01/21 16:49:25
+dnl CF_MAN_PAGES version: 57 updated: 2023/05/13 19:14:15
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -6064,6 +6064,14 @@ esac
 
 cat >>$cf_edit_man <<CF_EOF
 	suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\`
+	extra_suffix=
+	if test -n "$EXTRA_SUFFIX" ; then
+		case \$cf_target in
+		(*${EXTRA_SUFFIX}\$suffix)
+			extra_suffix="$EXTRA_SUFFIX"
+			;;
+		esac
+	fi
 	if test "\$verb" = installing ; then
 		echo "\$verb \$cf_target"
 		\$INSTALL_DATA \$TMP "\$cf_target"
@@ -6078,6 +6086,7 @@ cat >>$cf_edit_man <<CF_EOF
 					if test "\$section" = 1 ; then
 						cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
 					fi
+					cf_alias="\${cf_alias}\${extra_suffix}"
 
 					if test "$MANPAGE_SYMLINKS" = yes ; then
 						if test -f "\$cf_alias\${suffix}" ; then
@@ -6134,6 +6143,7 @@ cat >>$cf_edit_man <<CF_EOF
 					if test "\$section" = 1 ; then
 						cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
 					fi
+					cf_alias="\${cf_alias}\${extra_suffix}"
 
 					echo ".. \$verb alias \$cf_alias\${suffix}"
 					rm -f "\$cf_alias\${suffix}"
diff --git a/configure b/configure
index 8d803c598..3bf89a6d6 100755
--- a/configure
+++ b/configure
@@ -15309,6 +15309,14 @@ esac
 
 cat >>$cf_edit_man <<CF_EOF
 	suffix=\`basename "\$cf_target" | sed -e 's%^[^.]*%%'\`
+	extra_suffix=
+	if test -n "$EXTRA_SUFFIX" ; then
+		case \$cf_target in
+		(*${EXTRA_SUFFIX}\$suffix)
+			extra_suffix="$EXTRA_SUFFIX"
+			;;
+		esac
+	fi
 	if test "\$verb" = installing ; then
 		echo "\$verb \$cf_target"
 		\$INSTALL_DATA \$TMP "\$cf_target"
@@ -15323,6 +15331,7 @@ cat >>$cf_edit_man <<CF_EOF
 					if test "\$section" = 1 ; then
 						cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
 					fi
+					cf_alias="\${cf_alias}\${extra_suffix}"
 
 					if test "$MANPAGE_SYMLINKS" = yes ; then
 						if test -f "\$cf_alias\${suffix}" ; then
@@ -15379,6 +15388,7 @@ cat >>$cf_edit_man <<CF_EOF
 					if test "\$section" = 1 ; then
 						cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
 					fi
+					cf_alias="\${cf_alias}\${extra_suffix}"
 
 					echo ".. \$verb alias \$cf_alias\${suffix}"
 					rm -f "\$cf_alias\${suffix}"
@@ -15406,7 +15416,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15409: checking if you want to build with function extensions" >&5
+echo "$as_me:15419: 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.
@@ -15416,7 +15426,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15419: result: $with_ext_funcs" >&5
+echo "$as_me:15429: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15472,7 +15482,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15475: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15485: 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.
@@ -15482,7 +15492,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15485: result: $with_sp_funcs" >&5
+echo "$as_me:15495: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15501,7 +15511,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15504: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15514: 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.
@@ -15511,7 +15521,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15514: result: $with_term_driver" >&5
+echo "$as_me:15524: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15520,19 +15530,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15523: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15533: 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:15528: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15538: 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:15535: checking for extended use of const keyword" >&5
+echo "$as_me:15545: 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.
@@ -15542,7 +15552,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15545: result: $with_ext_const" >&5
+echo "$as_me:15555: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15550,7 +15560,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15553: checking if you want to use extended colors" >&5
+echo "$as_me:15563: 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.
@@ -15560,12 +15570,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15563: result: $with_ext_colors" >&5
+echo "$as_me:15573: 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:15568: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15578: 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)
@@ -15576,7 +15586,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15579: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15589: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15604,7 +15614,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15607: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15617: 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.
@@ -15614,7 +15624,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15617: result: $with_ext_mouse" >&5
+echo "$as_me:15627: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15624,7 +15634,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15627: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15637: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15641,7 +15651,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15644: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15654: 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.
@@ -15651,7 +15661,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15654: result: $with_ext_putwin" >&5
+echo "$as_me:15664: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15661,7 +15671,7 @@ EOF
 
 fi
 
-echo "$as_me:15664: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15674: 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.
@@ -15671,7 +15681,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15674: result: $with_no_padding" >&5
+echo "$as_me:15684: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15679,7 +15689,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15682: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15692: 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.
@@ -15689,7 +15699,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15692: result: $with_sigwinch" >&5
+echo "$as_me:15702: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15697,7 +15707,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15700: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15710: 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.
@@ -15707,7 +15717,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15710: result: $with_tcap_names" >&5
+echo "$as_me:15720: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15721,7 +15731,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15724: checking if you want to link with the pthread library" >&5
+echo "$as_me:15734: 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.
@@ -15731,27 +15741,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15734: result: $with_pthread" >&5
+echo "$as_me:15744: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15738: checking for pthread.h" >&5
+	echo "$as_me:15748: 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 15744 "configure"
+#line 15754 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15748: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15758: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15754: \$? = $ac_status" >&5
+  echo "$as_me:15764: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15770,7 +15780,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15773: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15783: 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
 
@@ -15780,7 +15790,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15783: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15793: 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"
 
@@ -15801,7 +15811,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15804 "configure"
+#line 15814 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15818,16 +15828,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15824: \$? = $ac_status" >&5
+  echo "$as_me:15834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15830: \$? = $ac_status" >&5
+  echo "$as_me:15840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15837,7 +15847,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15840: result: $with_pthread" >&5
+	    echo "$as_me:15850: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15865,7 +15875,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15868: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15878: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15875,13 +15885,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15878: checking for pthread_kill" >&5
+	echo "$as_me:15888: 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 15884 "configure"
+#line 15894 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15912,16 +15922,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15918: \$? = $ac_status" >&5
+  echo "$as_me:15928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15924: \$? = $ac_status" >&5
+  echo "$as_me:15934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15931,11 +15941,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15934: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15944: 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:15938: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15948: 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.
@@ -15945,7 +15955,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15948: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15958: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15956,7 +15966,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15959: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15969: 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.
@@ -15966,18 +15976,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15969: result: $use_weak_symbols" >&5
+	echo "$as_me:15979: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15973: checking if $CC supports weak symbols" >&5
+echo "$as_me:15983: 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 15980 "configure"
+#line 15990 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16003,16 +16013,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16009: \$? = $ac_status" >&5
+  echo "$as_me:16019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16015: \$? = $ac_status" >&5
+  echo "$as_me:16025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16023,7 +16033,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16026: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16036: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16073,7 +16083,7 @@ fi
 # 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:16076: checking if you want reentrant code" >&5
+echo "$as_me:16086: 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.
@@ -16083,7 +16093,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16086: result: $with_reentrant" >&5
+echo "$as_me:16096: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16172,7 +16182,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16175: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16185: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16184,7 +16194,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16187: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16197: 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.
@@ -16206,16 +16216,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16209: result: $enable_opaque_curses" >&5
+echo "$as_me:16219: 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:16214: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16224: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16218: checking if you want opaque form-library structures" >&5
+echo "$as_me:16228: 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.
@@ -16225,10 +16235,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16228: result: $enable_opaque_form" >&5
+echo "$as_me:16238: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16231: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16241: 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.
@@ -16238,10 +16248,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16241: result: $enable_opaque_menu" >&5
+echo "$as_me:16251: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16244: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16254: 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.
@@ -16251,7 +16261,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16254: result: $enable_opaque_panel" >&5
+echo "$as_me:16264: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16261,7 +16271,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16264: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16274: 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.
@@ -16271,7 +16281,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16274: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16284: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16284,7 +16294,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16287: checking if you want all development code" >&5
+echo "$as_me:16297: 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.
@@ -16294,11 +16304,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16297: result: $with_develop" >&5
+echo "$as_me:16307: 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:16301: checking if you want hard-tabs code" >&5
+echo "$as_me:16311: 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.
@@ -16308,7 +16318,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16311: result: $enable_hard_tabs" >&5
+echo "$as_me:16321: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16316,7 +16326,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16319: checking if you want limited support for xmc" >&5
+echo "$as_me:16329: 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.
@@ -16326,7 +16336,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16329: result: $enable_xmc_glitch" >&5
+echo "$as_me:16339: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16336,7 +16346,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16339: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16349: 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.
@@ -16346,7 +16356,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16349: result: $with_assumed_color" >&5
+echo "$as_me:16359: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16354,7 +16364,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16357: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16367: 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.
@@ -16364,7 +16374,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16367: result: $with_hashmap" >&5
+echo "$as_me:16377: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16372,7 +16382,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16375: checking if you want colorfgbg code" >&5
+echo "$as_me:16385: 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.
@@ -16382,7 +16392,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16385: result: $with_colorfgbg" >&5
+echo "$as_me:16395: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16390,7 +16400,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16393: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16403: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16400,14 +16410,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16403: result: $cf_with_fvisibility" >&5
+echo "$as_me:16413: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16410: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16420: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16416,7 +16426,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16419 "configure"
+#line 16429 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16432,16 +16442,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16438: \$? = $ac_status" >&5
+  echo "$as_me:16448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16444: \$? = $ac_status" >&5
+  echo "$as_me:16454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16453,7 +16463,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16456: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16466: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16568,7 +16578,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16571: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16581: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16577,7 +16587,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16580 "configure"
+#line 16590 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16593,16 +16603,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16599: \$? = $ac_status" >&5
+  echo "$as_me:16609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16605: \$? = $ac_status" >&5
+  echo "$as_me:16615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16614,7 +16624,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16617: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16627: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16737,7 +16747,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16740: checking if you want interop bindings" >&5
+echo "$as_me:16750: 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.
@@ -16747,13 +16757,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16750: result: $with_exp_interop" >&5
+echo "$as_me:16760: 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:16756: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16766: 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.
@@ -16763,13 +16773,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16766: result: $with_safe_sprintf" >&5
+echo "$as_me:16776: 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:16772: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16782: 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.
@@ -16779,7 +16789,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16782: result: $with_scroll_hints" >&5
+echo "$as_me:16792: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16788,7 +16798,7 @@ EOF
 
 fi
 
-echo "$as_me:16791: checking if you want wgetch-events code" >&5
+echo "$as_me:16801: 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.
@@ -16798,7 +16808,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16801: result: $with_wgetch_events" >&5
+echo "$as_me:16811: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16813,7 +16823,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16816: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16826: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16823,7 +16833,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16826: result: $with_exp_win32" >&5
+	echo "$as_me:16836: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16849,7 +16859,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16852: checking if you want to see long compiling messages" >&5
+echo "$as_me:16862: 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.
@@ -16883,7 +16893,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16886: result: $enableval" >&5
+echo "$as_me:16896: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16896,7 +16906,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16899: checking if you want to install stripped executables" >&5
+echo "$as_me:16909: 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.
@@ -16913,7 +16923,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16916: result: $enable_stripping" >&5
+echo "$as_me:16926: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16924,7 +16934,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16927: checking if install accepts -p option" >&5
+echo "$as_me:16937: 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
@@ -16955,10 +16965,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16958: result: $cf_cv_install_p" >&5
+echo "$as_me:16968: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16961: checking if install needs to be told about ownership" >&5
+echo "$as_me:16971: 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)
@@ -16969,7 +16979,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16972: result: $with_install_o" >&5
+echo "$as_me:16982: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -16994,7 +17004,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:16997: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17007: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17011,17 +17021,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17014: result: $enable_stdnoreturn" >&5
+echo "$as_me:17024: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17018: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17028: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17024 "configure"
+#line 17034 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17037,16 +17047,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17043: \$? = $ac_status" >&5
+  echo "$as_me:17053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17049: \$? = $ac_status" >&5
+  echo "$as_me:17059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17057,7 +17067,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17060: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17070: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17113,16 +17123,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17126: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17121: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17131: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17135: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17161,16 +17171,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17174: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17169: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17179: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17183: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17209,23 +17219,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17222: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17217: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17227: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17231: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17228: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17238: 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.
@@ -17242,7 +17252,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17245: result: $enable_warnings" >&5
+echo "$as_me:17255: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17266,7 +17276,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17269 "configure"
+#line 17279 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17281,26 +17291,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17287: \$? = $ac_status" >&5
+  echo "$as_me:17297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17293: \$? = $ac_status" >&5
+  echo "$as_me:17303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17296: checking for X11/Xt const-feature" >&5
+echo "$as_me:17306: 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 17303 "configure"
+#line 17313 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17317,16 +17327,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17323: \$? = $ac_status" >&5
+  echo "$as_me:17333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17329: \$? = $ac_status" >&5
+  echo "$as_me:17339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17341,7 +17351,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17344: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17354: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17370,7 +17380,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17373 "${as_me:-configure}"
+#line 17383 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17386,7 +17396,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17389: checking for $CC warning options..." >&5
+	{ echo "$as_me:17399: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17402,12 +17412,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17405: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17408: \$? = $ac_status" >&5
+  echo "$as_me:17418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17410: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17420: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17415,7 +17425,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17418: checking for $CC warning options..." >&5
+	{ echo "$as_me:17428: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17438,12 +17448,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17441: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17444: \$? = $ac_status" >&5
+  echo "$as_me:17454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17446: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17456: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17451,7 +17461,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17454: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17464: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17461,7 +17471,7 @@ echo "${as_me:-configure}:17454: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17464: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17474: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17494,10 +17504,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17497: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17507: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17500 "${as_me:-configure}"
+#line 17510 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17547,12 +17557,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17550: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17553: \$? = $ac_status" >&5
+  echo "$as_me:17563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17555: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17565: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17624,12 +17634,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17627: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17637: 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 17632 "configure"
+#line 17642 "configure"
 #include "confdefs.h"
 
 int
@@ -17646,16 +17656,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17652: \$? = $ac_status" >&5
+  echo "$as_me:17662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17658: \$? = $ac_status" >&5
+  echo "$as_me:17668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17666,7 +17676,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17669: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17679: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17675,11 +17685,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17678: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17688: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17682 "configure"
+#line 17692 "configure"
 #include "confdefs.h"
 
 int
@@ -17696,16 +17706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17702: \$? = $ac_status" >&5
+  echo "$as_me:17712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17708: \$? = $ac_status" >&5
+  echo "$as_me:17718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17715,7 +17725,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17718: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17728: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17724,30 +17734,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17727: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17737: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17734: checking version of $CC" >&5
+	echo "$as_me:17744: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17738: result: $CLANG_VERSION" >&5
+	echo "$as_me:17748: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17745: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17755: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17750 "configure"
+#line 17760 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17761,16 +17771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17767: \$? = $ac_status" >&5
+  echo "$as_me:17777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17773: \$? = $ac_status" >&5
+  echo "$as_me:17783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17781,13 +17791,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17784: result: $cf_clang_optok" >&5
+		echo "$as_me:17794: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17790: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17800: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17804,7 +17814,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17807 "configure"
+#line 17817 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17822,7 +17832,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17825: checking for $CC warning options..." >&5
+	{ echo "$as_me:17835: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17839,12 +17849,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17842: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17845: \$? = $ac_status" >&5
+  echo "$as_me:17855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17847: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17857: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17853,7 +17863,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17856: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17866: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17883,16 +17893,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17889: \$? = $ac_status" >&5
+  echo "$as_me:17899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17891: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17901: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17895: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17905: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17910,7 +17920,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17913: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17923: 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.
@@ -17920,7 +17930,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:17923: result: $enable_string_hacks" >&5
+echo "$as_me:17933: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -17929,15 +17939,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:17932: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:17942: 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:17934: checking for strlcat" >&5
+	echo "$as_me:17944: 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 17940 "configure"
+#line 17950 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17968,16 +17978,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17974: \$? = $ac_status" >&5
+  echo "$as_me:17984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17980: \$? = $ac_status" >&5
+  echo "$as_me:17990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -17987,7 +17997,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17990: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18000: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -17997,7 +18007,7 @@ EOF
 
 else
 
-		echo "$as_me:18000: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18010: 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
@@ -18005,7 +18015,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18008 "configure"
+#line 18018 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18024,16 +18034,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18030: \$? = $ac_status" >&5
+  echo "$as_me:18040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18036: \$? = $ac_status" >&5
+  echo "$as_me:18046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18044,7 +18054,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18047: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18057: 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
 
@@ -18067,23 +18077,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18070: checking for $ac_header" >&5
+echo "$as_me:18080: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18076 "configure"
+#line 18086 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18080: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18090: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18086: \$? = $ac_status" >&5
+  echo "$as_me:18096: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18102,7 +18112,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18115: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18123,13 +18133,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18126: checking for $ac_func" >&5
+echo "$as_me:18136: 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 18132 "configure"
+#line 18142 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18160,16 +18170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18166: \$? = $ac_status" >&5
+  echo "$as_me:18176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18172: \$? = $ac_status" >&5
+  echo "$as_me:18182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18179,7 +18189,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18182: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18192: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18192,7 +18202,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18195: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18205: 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.
@@ -18202,7 +18212,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18205: result: $with_assertions" >&5
+echo "$as_me:18215: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18218,7 +18228,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18221: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18231: 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.
@@ -18240,7 +18250,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18243: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18253: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18354,23 +18364,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18357: checking for dmalloc.h" >&5
+	echo "$as_me:18367: 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 18363 "configure"
+#line 18373 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18377: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18373: \$? = $ac_status" >&5
+  echo "$as_me:18383: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18389,11 +18399,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18392: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18402: 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:18396: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18406: 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
@@ -18401,7 +18411,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18404 "configure"
+#line 18414 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18420,16 +18430,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18426: \$? = $ac_status" >&5
+  echo "$as_me:18436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18432: \$? = $ac_status" >&5
+  echo "$as_me:18442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18440,7 +18450,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18443: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18453: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18455,7 +18465,7 @@ fi
 
 fi
 
-echo "$as_me:18458: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18468: 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.
@@ -18477,7 +18487,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18480: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18490: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18591,23 +18601,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18594: checking for dbmalloc.h" >&5
+	echo "$as_me:18604: 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 18600 "configure"
+#line 18610 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18614: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18610: \$? = $ac_status" >&5
+  echo "$as_me:18620: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18626,11 +18636,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18629: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18639: 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:18633: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18643: 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
@@ -18638,7 +18648,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18641 "configure"
+#line 18651 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18657,16 +18667,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18663: \$? = $ac_status" >&5
+  echo "$as_me:18673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18669: \$? = $ac_status" >&5
+  echo "$as_me:18679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18677,7 +18687,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18680: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18690: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18692,7 +18702,7 @@ fi
 
 fi
 
-echo "$as_me:18695: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18705: 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.
@@ -18714,7 +18724,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18717: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18727: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18827,7 +18837,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18830: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18840: 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.
@@ -18838,7 +18848,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18841: result: $with_no_leaks" >&5
+echo "$as_me:18851: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18890,7 +18900,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18893: checking whether to add trace feature to all models" >&5
+echo "$as_me:18903: 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.
@@ -18900,7 +18910,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18903: result: $cf_with_trace" >&5
+echo "$as_me:18913: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19014,7 +19024,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19017: checking if we want to use GNAT projects" >&5
+echo "$as_me:19027: 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.
@@ -19031,7 +19041,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19034: result: $enable_gnat_projects" >&5
+echo "$as_me:19044: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19044,14 +19054,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19047: checking if ssp library is needed" >&5
+echo "$as_me:19057: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19054 "configure"
+#line 19064 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19068,16 +19078,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19074: \$? = $ac_status" >&5
+  echo "$as_me:19084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19080: \$? = $ac_status" >&5
+  echo "$as_me:19090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19087,7 +19097,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19090 "configure"
+#line 19100 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19104,16 +19114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19110: \$? = $ac_status" >&5
+  echo "$as_me:19120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19116: \$? = $ac_status" >&5
+  echo "$as_me:19126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19127,7 +19137,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19130: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19140: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19156,14 +19166,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19159: checking if -lm needed for math functions" >&5
+echo "$as_me:19169: 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 19166 "configure"
+#line 19176 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19179,16 +19189,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19185: \$? = $ac_status" >&5
+  echo "$as_me:19195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19198,7 +19208,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19201: result: $cf_cv_need_libm" >&5
+echo "$as_me:19211: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19206,14 +19216,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19209: checking if -lm is available for math functions" >&5
+	echo "$as_me:19219: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19216 "configure"
+#line 19226 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19229,16 +19239,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19235: \$? = $ac_status" >&5
+  echo "$as_me:19245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19241: \$? = $ac_status" >&5
+  echo "$as_me:19251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19248,7 +19258,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19251: result: $cf_cv_have_libm" >&5
+echo "$as_me:19261: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19270,13 +19280,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19273: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19283: 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 19279 "configure"
+#line 19289 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19292,16 +19302,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19298: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19304: \$? = $ac_status" >&5
+  echo "$as_me:19314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19311,7 +19321,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19314: result: $ac_cv_header_time" >&5
+echo "$as_me:19324: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19326,7 +19336,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19329: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19339: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19334,7 +19344,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19337 "configure"
+#line 19347 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19353,16 +19363,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19359: \$? = $ac_status" >&5
+  echo "$as_me:19369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19365: \$? = $ac_status" >&5
+  echo "$as_me:19375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19373,11 +19383,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19376: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19386: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19380: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19390: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19385,7 +19395,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19388 "configure"
+#line 19398 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19404,16 +19414,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19410: \$? = $ac_status" >&5
+  echo "$as_me:19420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19416: \$? = $ac_status" >&5
+  echo "$as_me:19426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19424,7 +19434,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19427: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19437: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19446,7 +19456,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19449: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19459: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19454,7 +19464,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19457 "configure"
+#line 19467 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19473,16 +19483,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19479: \$? = $ac_status" >&5
+  echo "$as_me:19489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19485: \$? = $ac_status" >&5
+  echo "$as_me:19495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19493,7 +19503,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19496: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19506: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19515,7 +19525,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19518: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19528: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19523,7 +19533,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19526 "configure"
+#line 19536 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19542,16 +19552,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19548: \$? = $ac_status" >&5
+  echo "$as_me:19558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19554: \$? = $ac_status" >&5
+  echo "$as_me:19564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19562,7 +19572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19565: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19575: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19604,7 +19614,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19607: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19617: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19612,7 +19622,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19615 "configure"
+#line 19625 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19631,16 +19641,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19637: \$? = $ac_status" >&5
+  echo "$as_me:19647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19643: \$? = $ac_status" >&5
+  echo "$as_me:19653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19651,7 +19661,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19654: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19664: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19679,13 +19689,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19682: checking for regcomp" >&5
+	echo "$as_me:19692: 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 19688 "configure"
+#line 19698 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19716,16 +19726,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19722: \$? = $ac_status" >&5
+  echo "$as_me:19732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19728: \$? = $ac_status" >&5
+  echo "$as_me:19738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19735,7 +19745,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19738: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19748: 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
@@ -19744,7 +19754,7 @@ else
 		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:19747: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19757: 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
@@ -19752,7 +19762,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19755 "configure"
+#line 19765 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19771,16 +19781,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19791,7 +19801,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19794: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19804: 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
 
@@ -19823,13 +19833,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19826: checking for compile" >&5
+	echo "$as_me:19836: 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 19832 "configure"
+#line 19842 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19860,16 +19870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19866: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19872: \$? = $ac_status" >&5
+  echo "$as_me:19882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19879,13 +19889,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19882: result: $ac_cv_func_compile" >&5
+echo "$as_me:19892: 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:19888: checking for compile in -lgen" >&5
+		echo "$as_me:19898: 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
@@ -19893,7 +19903,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19896 "configure"
+#line 19906 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19912,16 +19922,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19918: \$? = $ac_status" >&5
+  echo "$as_me:19928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19924: \$? = $ac_status" >&5
+  echo "$as_me:19934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -19932,7 +19942,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19935: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:19945: 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
 
@@ -19960,11 +19970,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:19963: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:19973: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:19967: checking for regular-expression headers" >&5
+echo "$as_me:19977: 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
@@ -19976,7 +19986,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19979 "configure"
+#line 19989 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -19993,16 +20003,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19999: \$? = $ac_status" >&5
+  echo "$as_me:20009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20005: \$? = $ac_status" >&5
+  echo "$as_me:20015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20019,7 +20029,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20022 "configure"
+#line 20032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20039,16 +20049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20045: \$? = $ac_status" >&5
+  echo "$as_me:20055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20051: \$? = $ac_status" >&5
+  echo "$as_me:20061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20064,11 +20074,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20067: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20077: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20071: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20081: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20106,23 +20116,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20109: checking for $ac_header" >&5
+echo "$as_me:20119: 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 20115 "configure"
+#line 20125 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20129: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20125: \$? = $ac_status" >&5
+  echo "$as_me:20135: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20141,7 +20151,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20154: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20154,23 +20164,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20157: checking for $ac_header" >&5
+echo "$as_me:20167: 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 20163 "configure"
+#line 20173 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20167: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20177: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20173: \$? = $ac_status" >&5
+  echo "$as_me:20183: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20189,7 +20199,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20202: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20199,7 +20209,7 @@ EOF
 fi
 done
 
-echo "$as_me:20202: checking for header declaring getopt variables" >&5
+echo "$as_me:20212: 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
@@ -20209,7 +20219,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20212 "configure"
+#line 20222 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20222,16 +20232,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20228: \$? = $ac_status" >&5
+  echo "$as_me:20238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20234: \$? = $ac_status" >&5
+  echo "$as_me:20244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20243,7 +20253,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20246: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20256: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20260,14 +20270,14 @@ EOF
 
 fi
 
-echo "$as_me:20263: checking if external environ is declared" >&5
+echo "$as_me:20273: 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 20270 "configure"
+#line 20280 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20280,16 +20290,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20286: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20292: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20300,7 +20310,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20303: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20313: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20315,14 +20325,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20318: checking if external environ exists" >&5
+echo "$as_me:20328: 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 20325 "configure"
+#line 20335 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20337,16 +20347,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20343: \$? = $ac_status" >&5
+  echo "$as_me:20353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20349: \$? = $ac_status" >&5
+  echo "$as_me:20359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20357,7 +20367,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20360: result: $cf_cv_have_environ" >&5
+echo "$as_me:20370: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20370,13 +20380,13 @@ EOF
 
 fi
 
-echo "$as_me:20373: checking for getenv" >&5
+echo "$as_me:20383: 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 20379 "configure"
+#line 20389 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20407,16 +20417,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20413: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20419: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20426,19 +20436,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20429: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20439: 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:20435: checking for $ac_func" >&5
+echo "$as_me:20445: 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 20441 "configure"
+#line 20451 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20469,16 +20479,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20475: \$? = $ac_status" >&5
+  echo "$as_me:20485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20481: \$? = $ac_status" >&5
+  echo "$as_me:20491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20488,7 +20498,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20491: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20501: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20498,7 +20508,7 @@ EOF
 fi
 done
 
-echo "$as_me:20501: checking if getenv returns consistent values" >&5
+echo "$as_me:20511: 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
@@ -20508,7 +20518,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20511 "configure"
+#line 20521 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20613,15 +20623,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20619: \$? = $ac_status" >&5
+  echo "$as_me:20629: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20624: \$? = $ac_status" >&5
+  echo "$as_me:20634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20634,7 +20644,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20637: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20647: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20649,18 +20659,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20652: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20662: 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
 
-echo "$as_me:20656: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20666: 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 20663 "configure"
+#line 20673 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20680,16 +20690,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20686: \$? = $ac_status" >&5
+  echo "$as_me:20696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20692: \$? = $ac_status" >&5
+  echo "$as_me:20702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20701,7 +20711,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20704: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20714: 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
@@ -20716,13 +20726,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20719: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20729: 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 20725 "configure"
+#line 20735 "configure"
 #include "confdefs.h"
 
 int
@@ -20780,16 +20790,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20786: \$? = $ac_status" >&5
+  echo "$as_me:20796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20792: \$? = $ac_status" >&5
+  echo "$as_me:20802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20799,7 +20809,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20802: result: $ac_cv_c_const" >&5
+echo "$as_me:20812: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20809,7 +20819,7 @@ EOF
 
 fi
 
-echo "$as_me:20812: checking for inline" >&5
+echo "$as_me:20822: 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
@@ -20817,7 +20827,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20820 "configure"
+#line 20830 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20826,16 +20836,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20832: \$? = $ac_status" >&5
+  echo "$as_me:20842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20838: \$? = $ac_status" >&5
+  echo "$as_me:20848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20846,7 +20856,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20849: result: $ac_cv_c_inline" >&5
+echo "$as_me:20859: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20872,7 +20882,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20875: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20885: 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
@@ -20881,7 +20891,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20884 "configure"
+#line 20894 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20893,16 +20903,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20899: \$? = $ac_status" >&5
+  echo "$as_me:20909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20905: \$? = $ac_status" >&5
+  echo "$as_me:20915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20914,7 +20924,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20917: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20927: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21020,7 +21030,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21023: checking for signal global datatype" >&5
+echo "$as_me:21033: 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
@@ -21032,7 +21042,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21035 "configure"
+#line 21045 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21056,16 +21066,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21062: \$? = $ac_status" >&5
+  echo "$as_me:21072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21068: \$? = $ac_status" >&5
+  echo "$as_me:21078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21079,7 +21089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21082: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21092: 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 <<EOF
@@ -21088,7 +21098,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21091: checking for type of chtype" >&5
+echo "$as_me:21101: 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
@@ -21098,7 +21108,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21101 "configure"
+#line 21111 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21133,15 +21143,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21139: \$? = $ac_status" >&5
+  echo "$as_me:21149: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21144: \$? = $ac_status" >&5
+  echo "$as_me:21154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21156,7 +21166,7 @@ fi
 
 fi
 
-echo "$as_me:21159: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21169: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21168,14 +21178,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21171: checking if unsigned literals are legal" >&5
+echo "$as_me:21181: 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 21178 "configure"
+#line 21188 "configure"
 #include "confdefs.h"
 
 int
@@ -21187,16 +21197,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21193: \$? = $ac_status" >&5
+  echo "$as_me:21203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21199: \$? = $ac_status" >&5
+  echo "$as_me:21209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21208,7 +21218,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21211: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21221: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21224,14 +21234,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21227: checking if external errno is declared" >&5
+echo "$as_me:21237: 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 21234 "configure"
+#line 21244 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21245,16 +21255,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21258: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21251: \$? = $ac_status" >&5
+  echo "$as_me:21261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21257: \$? = $ac_status" >&5
+  echo "$as_me:21267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21265,7 +21275,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21268: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21278: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21280,14 +21290,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21283: checking if external errno exists" >&5
+echo "$as_me:21293: 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 21290 "configure"
+#line 21300 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21302,16 +21312,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21308: \$? = $ac_status" >&5
+  echo "$as_me:21318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21314: \$? = $ac_status" >&5
+  echo "$as_me:21324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21322,7 +21332,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21325: result: $cf_cv_have_errno" >&5
+echo "$as_me:21335: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21335,7 +21345,7 @@ EOF
 
 fi
 
-echo "$as_me:21338: checking if data-only library module links" >&5
+echo "$as_me:21348: 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
@@ -21343,20 +21353,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21346 "configure"
+#line 21356 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21349: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21352: \$? = $ac_status" >&5
+  echo "$as_me:21362: \$? = $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 <<EOF
-#line 21359 "configure"
+#line 21369 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21369,10 +21379,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21372: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21375: \$? = $ac_status" >&5
+  echo "$as_me:21385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21385,7 +21395,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21388 "configure"
+#line 21398 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21396,15 +21406,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21402: \$? = $ac_status" >&5
+  echo "$as_me:21412: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21407: \$? = $ac_status" >&5
+  echo "$as_me:21417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21419,7 +21429,7 @@ fi
 
 fi
 
-echo "$as_me:21422: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21432: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21433,14 +21443,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21436: checking for clock_gettime" >&5
+echo "$as_me:21446: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21443 "configure"
+#line 21453 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21453,16 +21463,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21459: \$? = $ac_status" >&5
+  echo "$as_me:21469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21465: \$? = $ac_status" >&5
+  echo "$as_me:21475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21473,7 +21483,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21476: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21486: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21484,13 +21494,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21487: checking for gettimeofday" >&5
+echo "$as_me:21497: 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 21493 "configure"
+#line 21503 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21521,16 +21531,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21527: \$? = $ac_status" >&5
+  echo "$as_me:21537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21533: \$? = $ac_status" >&5
+  echo "$as_me:21543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21540,7 +21550,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21543: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21553: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21550,7 +21560,7 @@ EOF
 
 else
 
-echo "$as_me:21553: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21563: 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
@@ -21558,7 +21568,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21561 "configure"
+#line 21571 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21577,16 +21587,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21583: \$? = $ac_status" >&5
+  echo "$as_me:21593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21589: \$? = $ac_status" >&5
+  echo "$as_me:21599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21597,7 +21607,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21600: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21610: 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
 
@@ -21658,13 +21668,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21661: checking for $ac_func" >&5
+echo "$as_me:21671: 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 21667 "configure"
+#line 21677 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21695,16 +21705,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21701: \$? = $ac_status" >&5
+  echo "$as_me:21711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21707: \$? = $ac_status" >&5
+  echo "$as_me:21717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21714,7 +21724,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21717: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21727: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21724,14 +21734,14 @@ EOF
 fi
 done
 
-echo "$as_me:21727: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21737: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21734 "configure"
+#line 21744 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21746,16 +21756,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21752: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21758: \$? = $ac_status" >&5
+  echo "$as_me:21768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21765,7 +21775,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21768: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21778: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21787,7 +21797,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21790: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21800: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21797,7 +21807,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21800 "configure"
+#line 21810 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21810,15 +21820,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21816: \$? = $ac_status" >&5
+  echo "$as_me:21826: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21821: \$? = $ac_status" >&5
+  echo "$as_me:21831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21830,7 +21840,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21833: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21843: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21842,14 +21852,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21845: checking for getttynam" >&5
+	echo "$as_me:21855: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21852 "configure"
+#line 21862 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21861,16 +21871,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21867: \$? = $ac_status" >&5
+  echo "$as_me:21877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21873: \$? = $ac_status" >&5
+  echo "$as_me:21883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21880,7 +21890,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21883: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21893: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21890,7 +21900,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21893: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21903: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21899,7 +21909,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21902: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21912: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21912,14 +21922,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21915: checking for terminal-capability database functions" >&5
+echo "$as_me:21925: 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 21922 "configure"
+#line 21932 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21939,16 +21949,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21945: \$? = $ac_status" >&5
+  echo "$as_me:21955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21951: \$? = $ac_status" >&5
+  echo "$as_me:21961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -21959,7 +21969,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21962: result: $cf_cv_cgetent" >&5
+echo "$as_me:21972: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -21969,14 +21979,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:21972: checking if cgetent uses const parameter" >&5
+echo "$as_me:21982: 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 21979 "configure"
+#line 21989 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -21999,16 +22009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22005: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22011: \$? = $ac_status" >&5
+  echo "$as_me:22021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22019,7 +22029,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22022: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22032: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22033,14 +22043,14 @@ fi
 
 fi
 
-echo "$as_me:22036: checking for isascii" >&5
+echo "$as_me:22046: 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 22043 "configure"
+#line 22053 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22052,16 +22062,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22058: \$? = $ac_status" >&5
+  echo "$as_me:22068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22064: \$? = $ac_status" >&5
+  echo "$as_me:22074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22072,7 +22082,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22075: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22085: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22080,10 +22090,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22083: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22093: 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 22086 "configure"
+#line 22096 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22097,16 +22107,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22103: \$? = $ac_status" >&5
+  echo "$as_me:22113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22109: \$? = $ac_status" >&5
+  echo "$as_me:22119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22114,7 +22124,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22117 "configure"
+#line 22127 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22129,16 +22139,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22135: \$? = $ac_status" >&5
+  echo "$as_me:22145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22154,11 +22164,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22157: result: $sigact_bad" >&5
+echo "$as_me:22167: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22161: checking if nanosleep really works" >&5
+echo "$as_me:22171: 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
@@ -22168,7 +22178,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22171 "configure"
+#line 22181 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22194,15 +22204,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22200: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22205: \$? = $ac_status" >&5
+  echo "$as_me:22215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22214,7 +22224,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22217: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22227: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22231,23 +22241,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22234: checking for $ac_header" >&5
+echo "$as_me:22244: 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 22240 "configure"
+#line 22250 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22244: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22254: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22250: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22266,7 +22276,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22269: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22279: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22283,10 +22293,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22286: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22296: 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 22289 "configure"
+#line 22299 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22298,16 +22308,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22304: \$? = $ac_status" >&5
+  echo "$as_me:22314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22310: \$? = $ac_status" >&5
+  echo "$as_me:22320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22315,7 +22325,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22318 "configure"
+#line 22328 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22329,16 +22339,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22335: \$? = $ac_status" >&5
+  echo "$as_me:22345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22341: \$? = $ac_status" >&5
+  echo "$as_me:22351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22354,19 +22364,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22357: result: $termios_bad" >&5
+	echo "$as_me:22367: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22362: checking for tcgetattr" >&5
+echo "$as_me:22372: 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 22369 "configure"
+#line 22379 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22394,16 +22404,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22400: \$? = $ac_status" >&5
+  echo "$as_me:22410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22413,21 +22423,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22416: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22426: 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:22423: checking for vsscanf function or workaround" >&5
+echo "$as_me:22433: 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 22430 "configure"
+#line 22440 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22443,16 +22453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22449: \$? = $ac_status" >&5
+  echo "$as_me:22459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22455: \$? = $ac_status" >&5
+  echo "$as_me:22465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22460,7 +22470,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22463 "configure"
+#line 22473 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22482,16 +22492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22488: \$? = $ac_status" >&5
+  echo "$as_me:22498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22494: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22499,7 +22509,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22502 "configure"
+#line 22512 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22521,16 +22531,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22527: \$? = $ac_status" >&5
+  echo "$as_me:22537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22533: \$? = $ac_status" >&5
+  echo "$as_me:22543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22545,7 +22555,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22548: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22558: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22571,23 +22581,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22574: checking for $ac_header" >&5
+echo "$as_me:22584: 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 22580 "configure"
+#line 22590 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22584: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22594: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22590: \$? = $ac_status" >&5
+  echo "$as_me:22600: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22606,7 +22616,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22609: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22619: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22616,7 +22626,7 @@ EOF
 fi
 done
 
-echo "$as_me:22619: checking for working mkstemp" >&5
+echo "$as_me:22629: 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
@@ -22627,7 +22637,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22630 "configure"
+#line 22640 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22662,15 +22672,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22678: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22673: \$? = $ac_status" >&5
+  echo "$as_me:22683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22685,16 +22695,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22688: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22698: 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:22691: checking for mkstemp" >&5
+	echo "$as_me:22701: 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 22697 "configure"
+#line 22707 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22725,16 +22735,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22731: \$? = $ac_status" >&5
+  echo "$as_me:22741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:22747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22744,7 +22754,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22747: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22757: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22765,21 +22775,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22768: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22778: 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:22771: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22781: 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:22777: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22787: 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 22782 "configure"
+#line 22792 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22796,15 +22806,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22802: \$? = $ac_status" >&5
+  echo "$as_me:22812: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22807: \$? = $ac_status" >&5
+  echo "$as_me:22817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22817,7 +22827,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22820: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22830: 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
 
@@ -22828,13 +22838,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22831: checking for intptr_t" >&5
+echo "$as_me:22841: 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 22837 "configure"
+#line 22847 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22849,16 +22859,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22855: \$? = $ac_status" >&5
+  echo "$as_me:22865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22861: \$? = $ac_status" >&5
+  echo "$as_me:22871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22868,7 +22878,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22871: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22881: 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
   :
@@ -22880,13 +22890,13 @@ EOF
 
 fi
 
-echo "$as_me:22883: checking for ssize_t" >&5
+echo "$as_me:22893: 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 22889 "configure"
+#line 22899 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22901,16 +22911,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22907: \$? = $ac_status" >&5
+  echo "$as_me:22917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22913: \$? = $ac_status" >&5
+  echo "$as_me:22923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -22920,7 +22930,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22923: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22933: 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
   :
@@ -22932,14 +22942,14 @@ EOF
 
 fi
 
-echo "$as_me:22935: checking for type sigaction_t" >&5
+echo "$as_me:22945: 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 22942 "configure"
+#line 22952 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -22952,16 +22962,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22958: \$? = $ac_status" >&5
+  echo "$as_me:22968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -22972,14 +22982,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22975: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22985: 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:22982: checking declaration of size-change" >&5
+echo "$as_me:22992: 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
@@ -23000,7 +23010,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23003 "configure"
+#line 23013 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23050,16 +23060,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23056: \$? = $ac_status" >&5
+  echo "$as_me:23066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23062: \$? = $ac_status" >&5
+  echo "$as_me:23072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23078,7 +23088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23081: result: $cf_cv_sizechange" >&5
+echo "$as_me:23091: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23096,13 +23106,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23099: checking for memmove" >&5
+echo "$as_me:23109: 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 23105 "configure"
+#line 23115 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23133,16 +23143,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23139: \$? = $ac_status" >&5
+  echo "$as_me:23149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23145: \$? = $ac_status" >&5
+  echo "$as_me:23155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23152,19 +23162,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23155: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23165: 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:23161: checking for bcopy" >&5
+echo "$as_me:23171: 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 23167 "configure"
+#line 23177 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23195,16 +23205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23201: \$? = $ac_status" >&5
+  echo "$as_me:23211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23207: \$? = $ac_status" >&5
+  echo "$as_me:23217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23214,11 +23224,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23217: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23227: 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:23221: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23231: 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
@@ -23228,7 +23238,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23231 "configure"
+#line 23241 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23244,15 +23254,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23250: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23255: \$? = $ac_status" >&5
+  echo "$as_me:23265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23265,7 +23275,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23268: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23278: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23292,13 +23302,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23295: checking for $ac_func" >&5
+echo "$as_me:23305: 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 23301 "configure"
+#line 23311 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23329,16 +23339,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23335: \$? = $ac_status" >&5
+  echo "$as_me:23345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23341: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23348,7 +23358,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23351: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23361: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23358,7 +23368,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23361: checking if poll really works" >&5
+echo "$as_me:23371: 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
@@ -23368,7 +23378,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23371 "configure"
+#line 23381 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23421,15 +23431,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23427: \$? = $ac_status" >&5
+  echo "$as_me:23437: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23432: \$? = $ac_status" >&5
+  echo "$as_me:23442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23441,21 +23451,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23444: result: $cf_cv_working_poll" >&5
+echo "$as_me:23454: 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:23451: checking for va_copy" >&5
+echo "$as_me:23461: 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 23458 "configure"
+#line 23468 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23472,16 +23482,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23478: \$? = $ac_status" >&5
+  echo "$as_me:23488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23484: \$? = $ac_status" >&5
+  echo "$as_me:23494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23491,7 +23501,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23494: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23504: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23503,14 +23513,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23506: checking for __va_copy" >&5
+echo "$as_me:23516: 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 23513 "configure"
+#line 23523 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23527,16 +23537,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23533: \$? = $ac_status" >&5
+  echo "$as_me:23543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23539: \$? = $ac_status" >&5
+  echo "$as_me:23549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23546,7 +23556,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23549: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23559: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23558,14 +23568,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23561: checking for __builtin_va_copy" >&5
+echo "$as_me:23571: 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 23568 "configure"
+#line 23578 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23582,16 +23592,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23588: \$? = $ac_status" >&5
+  echo "$as_me:23598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23594: \$? = $ac_status" >&5
+  echo "$as_me:23604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23601,7 +23611,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23604: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23614: 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 &&
@@ -23619,14 +23629,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23622: checking if we can simply copy va_list" >&5
+	echo "$as_me:23632: 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 23629 "configure"
+#line 23639 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23643,16 +23653,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23649: \$? = $ac_status" >&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23655: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23662,19 +23672,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23665: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23675: 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:23670: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23680: 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 23677 "configure"
+#line 23687 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23691,16 +23701,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23697: \$? = $ac_status" >&5
+  echo "$as_me:23707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23703: \$? = $ac_status" >&5
+  echo "$as_me:23713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23710,7 +23720,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23713: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23723: 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
@@ -23721,13 +23731,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23724: checking for pid_t" >&5
+echo "$as_me:23734: 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 23730 "configure"
+#line 23740 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23742,16 +23752,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23748: \$? = $ac_status" >&5
+  echo "$as_me:23758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23754: \$? = $ac_status" >&5
+  echo "$as_me:23764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23761,7 +23771,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23764: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23774: 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
   :
@@ -23776,23 +23786,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23779: checking for $ac_header" >&5
+echo "$as_me:23789: 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 23785 "configure"
+#line 23795 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23789: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23799: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23795: \$? = $ac_status" >&5
+  echo "$as_me:23805: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23811,7 +23821,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23814: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23824: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23824,13 +23834,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23827: checking for $ac_func" >&5
+echo "$as_me:23837: 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 23833 "configure"
+#line 23843 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23861,16 +23871,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23867: \$? = $ac_status" >&5
+  echo "$as_me:23877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23873: \$? = $ac_status" >&5
+  echo "$as_me:23883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23880,7 +23890,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23883: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23893: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23892,7 +23902,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23895: checking for working fork" >&5
+  echo "$as_me:23905: 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
@@ -23915,15 +23925,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23921: \$? = $ac_status" >&5
+  echo "$as_me:23931: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23926: \$? = $ac_status" >&5
+  echo "$as_me:23936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -23935,7 +23945,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23938: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23948: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -23949,12 +23959,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:23952: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23962: 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:23957: checking for working vfork" >&5
+  echo "$as_me:23967: 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
@@ -23963,7 +23973,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23966 "configure"
+#line 23976 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24060,15 +24070,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24066: \$? = $ac_status" >&5
+  echo "$as_me:24076: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24071: \$? = $ac_status" >&5
+  echo "$as_me:24081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24080,13 +24090,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24083: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24093: 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:24089: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24099: 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
 
@@ -24111,7 +24121,7 @@ EOF
 
 fi
 
-echo "$as_me:24114: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24124: 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
@@ -24121,7 +24131,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24124 "configure"
+#line 24134 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24156,15 +24166,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24172: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24167: \$? = $ac_status" >&5
+  echo "$as_me:24177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24177,7 +24187,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24180: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24190: 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
@@ -24186,7 +24196,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24189: checking for openpty in -lutil" >&5
+echo "$as_me:24199: 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
@@ -24194,7 +24204,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24197 "configure"
+#line 24207 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24213,16 +24223,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24219: \$? = $ac_status" >&5
+  echo "$as_me:24229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24225: \$? = $ac_status" >&5
+  echo "$as_me:24235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24233,7 +24243,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24236: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24246: 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
@@ -24241,7 +24251,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24244: checking for openpty header" >&5
+echo "$as_me:24254: 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
@@ -24268,7 +24278,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24271 "configure"
+#line 24281 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24285,16 +24295,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24291: \$? = $ac_status" >&5
+  echo "$as_me:24301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24297: \$? = $ac_status" >&5
+  echo "$as_me:24307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24312,7 +24322,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24315: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24325: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24385,7 +24395,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24388 "configure"
+#line 24398 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24397,16 +24407,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24403: \$? = $ac_status" >&5
+  echo "$as_me:24413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24409: \$? = $ac_status" >&5
+  echo "$as_me:24419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24423,7 +24433,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24426: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24436: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24459,7 +24469,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24462: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24472: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24470,7 +24480,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24473: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24483: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24542,7 +24552,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24545 "configure"
+#line 24555 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24554,16 +24564,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24560: \$? = $ac_status" >&5
+  echo "$as_me:24570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24566: \$? = $ac_status" >&5
+  echo "$as_me:24576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24580,7 +24590,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24583: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24593: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24660,7 +24670,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24663: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24673: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24677,23 +24687,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24680: checking for db.h" >&5
+echo "$as_me:24690: 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 24686 "configure"
+#line 24696 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24690: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24700: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24696: \$? = $ac_status" >&5
+  echo "$as_me:24706: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24712,11 +24722,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24715: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24725: 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:24719: checking for version of db" >&5
+echo "$as_me:24729: 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
@@ -24727,10 +24737,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24730: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24740: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24733 "configure"
+#line 24743 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24760,16 +24770,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24766: \$? = $ac_status" >&5
+  echo "$as_me:24776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24772: \$? = $ac_status" >&5
+  echo "$as_me:24782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24783,16 +24793,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24786: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24796: 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:24790: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24800: 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:24795: checking for db libraries" >&5
+echo "$as_me:24805: 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
@@ -24822,10 +24832,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24825: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24835: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24828 "configure"
+#line 24838 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24880,16 +24890,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24886: \$? = $ac_status" >&5
+  echo "$as_me:24896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24892: \$? = $ac_status" >&5
+  echo "$as_me:24902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24909,11 +24919,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24912: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24922: 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:24916: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24926: 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
@@ -24939,7 +24949,7 @@ fi
 
 else
 
-	{ { echo "$as_me:24942: error: Cannot find db.h" >&5
+	{ { echo "$as_me:24952: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -24954,7 +24964,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:24957: checking if we should include stdbool.h" >&5
+echo "$as_me:24967: 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
@@ -24962,7 +24972,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24965 "configure"
+#line 24975 "configure"
 #include "confdefs.h"
 
 int
@@ -24974,23 +24984,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24980: \$? = $ac_status" >&5
+  echo "$as_me:24990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24986: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $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 24993 "configure"
+#line 25003 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25006,16 +25016,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25012: \$? = $ac_status" >&5
+  echo "$as_me:25022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25018: \$? = $ac_status" >&5
+  echo "$as_me:25028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25029,13 +25039,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25032: result: yes" >&5
+then	echo "$as_me:25042: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25034: result: no" >&5
+else	echo "$as_me:25044: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25038: checking for builtin bool type" >&5
+echo "$as_me:25048: 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
@@ -25043,7 +25053,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25046 "configure"
+#line 25056 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25058,16 +25068,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25064: \$? = $ac_status" >&5
+  echo "$as_me:25074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25070: \$? = $ac_status" >&5
+  echo "$as_me:25080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25080,9 +25090,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25083: result: yes" >&5
+then	echo "$as_me:25093: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25085: result: no" >&5
+else	echo "$as_me:25095: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25099,10 +25109,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25102: checking if we already have C++ library" >&5
+	echo "$as_me:25112: 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 25105 "configure"
+#line 25115 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25116,16 +25126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25122: \$? = $ac_status" >&5
+  echo "$as_me:25132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25128: \$? = $ac_status" >&5
+  echo "$as_me:25138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25134,7 +25144,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25137: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25147: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25153,7 +25163,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25156: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25166: 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
@@ -25179,7 +25189,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25182 "configure"
+#line 25192 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25193,16 +25203,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25199: \$? = $ac_status" >&5
+  echo "$as_me:25209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25205: \$? = $ac_status" >&5
+  echo "$as_me:25215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25214,7 +25224,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25217: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25227: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25236,7 +25246,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25239: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25249: 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
@@ -25251,15 +25261,15 @@ CF_EOF
 # 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:25254: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25257: \$? = $ac_status" >&5
+  echo "$as_me:25267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25259: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25262: \$? = $ac_status" >&5
+  echo "$as_me:25272: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25270,10 +25280,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25273: result: yes" >&5
+  echo "$as_me:25283: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25276: result: no" >&5
+  echo "$as_me:25286: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25293,7 +25303,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25296: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25306: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25314,7 +25324,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25317 "configure"
+#line 25327 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25328,16 +25338,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25334: \$? = $ac_status" >&5
+  echo "$as_me:25344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25340: \$? = $ac_status" >&5
+  echo "$as_me:25350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25374,7 +25384,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25377 "configure"
+#line 25387 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25388,16 +25398,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25394: \$? = $ac_status" >&5
+  echo "$as_me:25404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25400: \$? = $ac_status" >&5
+  echo "$as_me:25410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25430,7 +25440,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25433: result: $cf_cxx_library" >&5
+	echo "$as_me:25443: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25446,7 +25456,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25449: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25459: 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
@@ -25463,18 +25473,18 @@ do
   # 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 25466 "configure"
+#line 25476 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25471: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25481: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25477: \$? = $ac_status" >&5
+  echo "$as_me:25487: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25497,17 +25507,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25500 "configure"
+#line 25510 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25504: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25510: \$? = $ac_status" >&5
+  echo "$as_me:25520: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25544,7 +25554,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25547: result: $CXXCPP" >&5
+echo "$as_me:25557: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25554,18 +25564,18 @@ do
   # 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 25557 "configure"
+#line 25567 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25562: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25568: \$? = $ac_status" >&5
+  echo "$as_me:25578: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25588,17 +25598,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25591 "configure"
+#line 25601 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25601: \$? = $ac_status" >&5
+  echo "$as_me:25611: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25626,7 +25636,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25629: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25639: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25641,23 +25651,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25644: checking for $ac_header" >&5
+echo "$as_me:25654: 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 25650 "configure"
+#line 25660 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25660: \$? = $ac_status" >&5
+  echo "$as_me:25670: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25676,7 +25686,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25679: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25689: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25689,23 +25699,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25692: checking for $ac_header" >&5
+echo "$as_me:25702: 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 25698 "configure"
+#line 25708 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25702: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25708: \$? = $ac_status" >&5
+  echo "$as_me:25718: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25724,7 +25734,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25727: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25737: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25735,10 +25745,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25738: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25748: 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 25741 "configure"
+#line 25751 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25755,16 +25765,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25761: \$? = $ac_status" >&5
+  echo "$as_me:25771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25767: \$? = $ac_status" >&5
+  echo "$as_me:25777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25773,7 +25783,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25776: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25786: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25784,7 +25794,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25787: checking if we should include stdbool.h" >&5
+echo "$as_me:25797: 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
@@ -25792,7 +25802,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25795 "configure"
+#line 25805 "configure"
 #include "confdefs.h"
 
 int
@@ -25804,23 +25814,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25810: \$? = $ac_status" >&5
+  echo "$as_me:25820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25816: \$? = $ac_status" >&5
+  echo "$as_me:25826: \$? = $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 25823 "configure"
+#line 25833 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25836,16 +25846,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25842: \$? = $ac_status" >&5
+  echo "$as_me:25852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25848: \$? = $ac_status" >&5
+  echo "$as_me:25858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25859,13 +25869,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25862: result: yes" >&5
+then	echo "$as_me:25872: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25864: result: no" >&5
+else	echo "$as_me:25874: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25868: checking for builtin bool type" >&5
+echo "$as_me:25878: 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
@@ -25873,7 +25883,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25876 "configure"
+#line 25886 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25888,16 +25898,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25894: \$? = $ac_status" >&5
+  echo "$as_me:25904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25900: \$? = $ac_status" >&5
+  echo "$as_me:25910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25910,19 +25920,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25913: result: yes" >&5
+then	echo "$as_me:25923: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25915: result: no" >&5
+else	echo "$as_me:25925: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25919: checking for bool" >&5
+echo "$as_me:25929: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25925 "configure"
+#line 25935 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25957,16 +25967,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25963: \$? = $ac_status" >&5
+  echo "$as_me:25973: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25969: \$? = $ac_status" >&5
+  echo "$as_me:25979: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -25976,10 +25986,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25979: result: $ac_cv_type_bool" >&5
+echo "$as_me:25989: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:25982: checking size of bool" >&5
+echo "$as_me:25992: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25988,7 +25998,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25991 "configure"
+#line 26001 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26020,21 +26030,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26032: \$? = $ac_status" >&5
+  echo "$as_me:26042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26037 "configure"
+#line 26047 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26066,16 +26076,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26072: \$? = $ac_status" >&5
+  echo "$as_me:26082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26078: \$? = $ac_status" >&5
+  echo "$as_me:26088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26091,7 +26101,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26094 "configure"
+#line 26104 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26123,16 +26133,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26129: \$? = $ac_status" >&5
+  echo "$as_me:26139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26135: \$? = $ac_status" >&5
+  echo "$as_me:26145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26148,7 +26158,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26151 "configure"
+#line 26161 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26180,16 +26190,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26186: \$? = $ac_status" >&5
+  echo "$as_me:26196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26192: \$? = $ac_status" >&5
+  echo "$as_me:26202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26202,12 +26212,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26205: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26215: 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 26210 "configure"
+#line 26220 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26243,15 +26253,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26249: \$? = $ac_status" >&5
+  echo "$as_me:26259: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26254: \$? = $ac_status" >&5
+  echo "$as_me:26264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26267,13 +26277,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26270: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26280: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26276: checking for type of bool" >&5
+echo "$as_me:26286: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26292,7 +26302,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26295 "configure"
+#line 26305 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26333,15 +26343,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26339: \$? = $ac_status" >&5
+  echo "$as_me:26349: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26344: \$? = $ac_status" >&5
+  echo "$as_me:26354: \$? = $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
@@ -26358,19 +26368,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26361: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26371: 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:26368: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26378: 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:26373: checking for special defines needed for etip.h" >&5
+echo "$as_me:26383: 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"
@@ -26388,7 +26398,7 @@ do
 	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 26391 "configure"
+#line 26401 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26402,16 +26412,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26408: \$? = $ac_status" >&5
+  echo "$as_me:26418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26414: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26432,12 +26442,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26435: result: $cf_result" >&5
+echo "$as_me:26445: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26440: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26450: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26454,7 +26464,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26457 "configure"
+#line 26467 "configure"
 #include "confdefs.h"
 
 class base
@@ -26473,15 +26483,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26479: \$? = $ac_status" >&5
+  echo "$as_me:26489: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26484: \$? = $ac_status" >&5
+  echo "$as_me:26494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26500,7 +26510,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26503: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26513: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26509,7 +26519,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26512: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26522: 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
@@ -26526,7 +26536,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26529 "configure"
+#line 26539 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26545,15 +26555,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26551: \$? = $ac_status" >&5
+  echo "$as_me:26561: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26556: \$? = $ac_status" >&5
+  echo "$as_me:26566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26572,7 +26582,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26575: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26585: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26582,7 +26592,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26585: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26595: 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
@@ -26596,7 +26606,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26599 "configure"
+#line 26609 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26640,16 +26650,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26646: \$? = $ac_status" >&5
+  echo "$as_me:26656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26667,7 +26677,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26670: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26680: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26716,13 +26726,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26719: checking for bool" >&5
+echo "$as_me:26729: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26725 "configure"
+#line 26735 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26757,16 +26767,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26763: \$? = $ac_status" >&5
+  echo "$as_me:26773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26769: \$? = $ac_status" >&5
+  echo "$as_me:26779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26776,10 +26786,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26779: result: $ac_cv_type_bool" >&5
+echo "$as_me:26789: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26782: checking size of bool" >&5
+echo "$as_me:26792: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26788,7 +26798,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26791 "configure"
+#line 26801 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26820,21 +26830,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26826: \$? = $ac_status" >&5
+  echo "$as_me:26836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26832: \$? = $ac_status" >&5
+  echo "$as_me:26842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26837 "configure"
+#line 26847 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26866,16 +26876,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26879: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26872: \$? = $ac_status" >&5
+  echo "$as_me:26882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26878: \$? = $ac_status" >&5
+  echo "$as_me:26888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26891,7 +26901,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26894 "configure"
+#line 26904 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26923,16 +26933,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26929: \$? = $ac_status" >&5
+  echo "$as_me:26939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26948,7 +26958,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26951 "configure"
+#line 26961 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26980,16 +26990,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26986: \$? = $ac_status" >&5
+  echo "$as_me:26996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26992: \$? = $ac_status" >&5
+  echo "$as_me:27002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27002,12 +27012,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27005: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27015: 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 27010 "configure"
+#line 27020 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27043,15 +27053,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27049: \$? = $ac_status" >&5
+  echo "$as_me:27059: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27054: \$? = $ac_status" >&5
+  echo "$as_me:27064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27067,13 +27077,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27070: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27080: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27076: checking for type of bool" >&5
+echo "$as_me:27086: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27092,7 +27102,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27095 "configure"
+#line 27105 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27133,15 +27143,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27139: \$? = $ac_status" >&5
+  echo "$as_me:27149: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27144: \$? = $ac_status" >&5
+  echo "$as_me:27154: \$? = $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
@@ -27158,26 +27168,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27161: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27171: 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:27168: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27178: 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:27174: checking for fallback type of bool" >&5
+			echo "$as_me:27184: 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:27180: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27190: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27206,7 +27216,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27209: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27219: 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
@@ -27223,7 +27233,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27226: checking for $ac_word" >&5
+echo "$as_me:27236: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27240,7 +27250,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27243: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27253: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27252,10 +27262,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27255: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27265: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27258: result: no" >&5
+  echo "$as_me:27268: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27265,7 +27275,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27268: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27278: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27276,7 +27286,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27279: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27289: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27305,7 +27315,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27308: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27318: 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
@@ -27324,10 +27334,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27327: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27337: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27330: result: missing" >&5
+					echo "$as_me:27340: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27340,7 +27350,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27343: checking for gnat version" >&5
+echo "$as_me:27353: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27351,7 +27361,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27354: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27364: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27360,7 +27370,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27363: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27373: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27368,7 +27378,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27371: checking for $ac_word" >&5
+echo "$as_me:27381: 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
@@ -27383,7 +27393,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27386: found $ac_dir/$ac_word" >&5
+echo "$as_me:27396: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27392,20 +27402,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27395: result: $M4_exists" >&5
+  echo "$as_me:27405: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27398: result: no" >&5
+  echo "$as_me:27408: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27404: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27414: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27408: checking if GNAT works" >&5
+			echo "$as_me:27418: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27433,7 +27443,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27436: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27446: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27445,7 +27455,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27448: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27458: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27462,10 +27472,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27465: result: $ADAFLAGS" >&5
+	echo "$as_me:27475: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27468: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27478: 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
@@ -27475,11 +27485,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27478: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27488: 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:27482: checking if GNAT supports generics" >&5
+echo "$as_me:27492: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27489,7 +27499,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27492: result: $cf_gnat_generics" >&5
+echo "$as_me:27502: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27501,7 +27511,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27504: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27514: 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
@@ -27549,7 +27559,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27552: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27562: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27562,7 +27572,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27565: checking if GNAT supports project files" >&5
+echo "$as_me:27575: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27625,15 +27635,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27628: result: $cf_gnat_projects" >&5
+echo "$as_me:27638: 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:27634: checking if GNAT supports libraries" >&5
+	echo "$as_me:27644: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27636: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27646: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27653,7 +27663,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27656: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27666: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27665,7 +27675,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27668: checking for ada-compiler" >&5
+echo "$as_me:27678: 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.
@@ -27676,12 +27686,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27679: result: $cf_ada_compiler" >&5
+echo "$as_me:27689: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27684: checking for ada-include" >&5
+echo "$as_me:27694: 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.
@@ -27717,7 +27727,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27720: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27730: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27726,10 +27736,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27729: result: $ADA_INCLUDE" >&5
+echo "$as_me:27739: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27732: checking for ada-objects" >&5
+echo "$as_me:27742: 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.
@@ -27765,7 +27775,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27768: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27778: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27774,10 +27784,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27777: result: $ADA_OBJECTS" >&5
+echo "$as_me:27787: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27780: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27790: 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.
@@ -27787,14 +27797,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27790: result: $with_ada_sharedlib" >&5
+echo "$as_me:27800: 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:27797: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27807: 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
@@ -27814,7 +27824,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27817: checking for ada-libname" >&5
+echo "$as_me:27827: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27830,7 +27840,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27833: result: $ADA_LIBNAME" >&5
+echo "$as_me:27843: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27841,13 +27851,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27844: checking for wchar_t" >&5
+	echo "$as_me:27854: 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 27850 "configure"
+#line 27860 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27862,16 +27872,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27868: \$? = $ac_status" >&5
+  echo "$as_me:27878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27874: \$? = $ac_status" >&5
+  echo "$as_me:27884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27881,10 +27891,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27884: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27894: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27887: checking size of wchar_t" >&5
+echo "$as_me:27897: 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
@@ -27893,7 +27903,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27896 "configure"
+#line 27906 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27905,21 +27915,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27911: \$? = $ac_status" >&5
+  echo "$as_me:27921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27917: \$? = $ac_status" >&5
+  echo "$as_me:27927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27922 "configure"
+#line 27932 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27931,16 +27941,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27937: \$? = $ac_status" >&5
+  echo "$as_me:27947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27943: \$? = $ac_status" >&5
+  echo "$as_me:27953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27956,7 +27966,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27959 "configure"
+#line 27969 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27968,16 +27978,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27974: \$? = $ac_status" >&5
+  echo "$as_me:27984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27980: \$? = $ac_status" >&5
+  echo "$as_me:27990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27993,7 +28003,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27996 "configure"
+#line 28006 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28005,16 +28015,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28011: \$? = $ac_status" >&5
+  echo "$as_me:28021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28017: \$? = $ac_status" >&5
+  echo "$as_me:28027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28027,12 +28037,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28030: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28040: 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 28035 "configure"
+#line 28045 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28048,15 +28058,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28054: \$? = $ac_status" >&5
+  echo "$as_me:28064: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28059: \$? = $ac_status" >&5
+  echo "$as_me:28069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28072,7 +28082,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28075: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28085: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28085,7 +28095,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28088: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28098: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28103,7 +28113,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28106: checking for library subsets" >&5
+echo "$as_me:28116: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28157,7 +28167,7 @@ fi
 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:28160: result: $LIB_SUBSETS" >&5
+echo "$as_me:28170: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28188,7 +28198,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28191: checking default library suffix" >&5
+echo "$as_me:28201: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28199,10 +28209,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28202: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28212: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28205: checking default library-dependency suffix" >&5
+echo "$as_me:28215: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28285,10 +28295,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28288: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28298: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28291: checking default object directory" >&5
+echo "$as_me:28301: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28304,11 +28314,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28307: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28317: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28311: checking c++ library-dependency suffix" >&5
+echo "$as_me:28321: 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++)
@@ -28401,7 +28411,7 @@ else
 	fi
 
 fi
-echo "$as_me:28404: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28414: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28577,19 +28587,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28580: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28590: 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 <<EOF
-#line 28585 "configure"
+#line 28595 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28589: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28592: \$? = $ac_status" >&5
+  echo "$as_me:28602: \$? = $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
@@ -28600,10 +28610,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28603 "configure"
+#line 28613 "configure"
 #include "confdefs.h"
 
-#line 28606 "configure"
+#line 28616 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28618,16 +28628,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28624: \$? = $ac_status" >&5
+  echo "$as_me:28634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28630: \$? = $ac_status" >&5
+  echo "$as_me:28640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28650,7 +28660,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28653: result: $cf_ldflags_static" >&5
+	echo "$as_me:28663: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28666,7 +28676,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28669: checking where we will install curses.h" >&5
+echo "$as_me:28679: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28676,7 +28686,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28679: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28689: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28684,7 +28694,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28687: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28697: 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
@@ -28709,7 +28719,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28712: checking for desired basename for form library" >&5
+echo "$as_me:28722: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28729,10 +28739,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28732: result: $FORM_NAME" >&5
+echo "$as_me:28742: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28735: checking for desired basename for menu library" >&5
+echo "$as_me:28745: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28752,10 +28762,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28755: result: $MENU_NAME" >&5
+echo "$as_me:28765: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28758: checking for desired basename for panel library" >&5
+echo "$as_me:28768: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28775,10 +28785,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28778: result: $PANEL_NAME" >&5
+echo "$as_me:28788: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28781: checking for desired basename for cxx library" >&5
+echo "$as_me:28791: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28798,13 +28808,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28801: result: $CXX_NAME" >&5
+echo "$as_me:28811: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28807: checking for src modules" >&5
+echo "$as_me:28817: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28863,7 +28873,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28866: result: $cf_cv_src_modules" >&5
+echo "$as_me:28876: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29024,7 +29034,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29027: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29037: 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//'`
@@ -29035,7 +29045,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29038: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29048: 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
@@ -29051,7 +29061,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29054: result: $PKG_CFLAGS" >&5
+echo "$as_me:29064: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29112,7 +29122,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29115: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29125: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29139,7 +29149,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29142: checking for linker search path" >&5
+echo "$as_me:29152: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29187,7 +29197,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29190: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29200: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29228,7 +29238,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29231: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29241: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29314,7 +29324,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29317: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29327: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29495,7 +29505,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29498: error: ambiguous option: $1
+    { { echo "$as_me:29508: 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;}
@@ -29514,7 +29524,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29517: error: unrecognized option: $1
+  -*) { { echo "$as_me:29527: 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;}
@@ -29644,7 +29654,7 @@ do
   "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:29647: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29657: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30157,7 +30167,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30160: creating $ac_file" >&5
+    { echo "$as_me:30170: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30175,7 +30185,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30178: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30188: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30188,7 +30198,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30191: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30201: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30204,7 +30214,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30207: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30217: 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;}
@@ -30213,7 +30223,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30216: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30226: 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;}
@@ -30258,7 +30268,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30261: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30271: 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;}
@@ -30269,7 +30279,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30272: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30282: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30318,7 +30328,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30321: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30331: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30329,7 +30339,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30332: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30342: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30342,7 +30352,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30345: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30355: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30400,7 +30410,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30403: $ac_file is unchanged" >&5
+      { echo "$as_me:30413: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30787,7 +30797,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30790: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30800: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index 4b12f5c47..a1d9f210b 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1542 2023/05/06 10:03:33 tom Exp $
+# $Id: dist.mk,v 1.1544 2023/05/14 22:01:25 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230506
+NCURSES_PATCH = 20230514
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index e00a7f6b3..46070b61c 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1057 $
-#	$Date: 2023/04/08 21:08:00 $
+#	$Revision: 1.1058 $
+#	$Date: 2023/05/08 08:23:18 $
 #
 # 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
@@ -5885,9 +5885,9 @@ xterm-x11hilite|X11 mouse with highlight,
 # "any-event" mouse mode.
 #
 # These building blocks incorporate later features as well:
-# xterm patch #224 (2007/2/11 added private mode 1004, for enabling/disabling
+# xterm patch #224 (2007/2/11) added private mode 1004, for enabling/disabling
 # focus in/out event reporting.
-# xterm patch #277 (2012/01/07 added private mode 1006
+# xterm patch #277 (2012/01/07) added private mode 1006
 
 xterm+sm+1002|xterm any-button mouse,
 	kmous=\E[<, XM=\E[?1006;1004;1002%?%p1%{1}%=%th%el%;,
@@ -5937,7 +5937,7 @@ xterm-1005|xterm UTF-8 mouse,
 # protocol regarding button-releases), I provided the 1006 mode, referring
 # to it as "SGR 1006" since the replies resemble the SGR control string:
 xterm+sm+1006|xterm SGR-mouse (building block),
-	kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;,
+	kmous=\E[<, XM=\E[?1006;1004;1000%?%p1%{1}%=%th%el%;,
 	xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;,
 xterm-1006|xterm SGR-mouse,
 	use=xterm+sm+1006, use=xterm,
@@ -27810,4 +27810,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-04-08
 #	+ add xterm+focus to alacritty+common (patch by Christian Duerr).
 #
+# 2023-05-08
+#	+ add mode 1004 to xterm+sm+1006 from xterm #380 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index dc57495e6..5b1e4ac26 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230506) unstable; urgency=low
+ncurses6 (6.4+20230514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index dc57495e6..5b1e4ac26 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230506) unstable; urgency=low
+ncurses6 (6.4+20230514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bff1c6335..c7393cc80 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230506) unstable; urgency=low
+ncurses6 (6.4+20230514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 May 2023 06:03:33 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/rules b/package/debian/rules
index a02d45ee5..3bcf51147 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.46 2023/04/18 07:52:46 tom Exp $
+# $Id: rules,v 1.48 2023/05/13 23:54:31 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -95,7 +95,8 @@ configure = \
 		--with-xterm-kbs=DEL \
 		--without-ada \
 		--without-debug \
-		--without-manpage-aliases \
+		--with-manpage-aliases \
+		--with-manpage-symlinks \
 		--without-normal
 
 NCURSES6_DIR = $(CURDIR)/debian/ncurses6
@@ -214,6 +215,7 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
 	dh_prep        $(verbose) -pncurses6-doc
 
 	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
+	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
 
 	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 70d078447..c1e73fe05 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.582 2023/05/06 10:03:33 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.584 2023/05/14 22:01:25 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0506"
+!define VERSION_MMDD  "0514"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 4c0c393ce..1ed205760 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230506
+Release: 20230514
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b8a8e8cea..9e4015063 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230506
+Release: 20230514
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 74d304605..9a4376924 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230506
+Release: 20230514
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From b6e7cd973dbd0882406e0ed8e2904f8477a8dcc7 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 20 May 2023 22:02:19 +0200
Subject: [PATCH 010/106] ncurses-6.4-20230520.patch

---
 NEWS                             |  5 ++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 ncurses/curses.priv.h            | 11 ++++++++++-
 ncurses/tinfo/comp_parse.c       |  6 +++---
 ncurses/tinfo/comp_scan.c        |  4 ++--
 ncurses/trace/lib_trace.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 +-
 14 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index 02e8d9f71..9eeeb5727 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3953 2023/05/14 22:01:25 tom Exp $
+-- $Id: NEWS,v 1.3955 2023/05/20 18:39:29 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230520
+	+ fixes for compiler warnings in MinGW environments.
+
 20230514
 	+ modify test-package "ncurses6-doc" to use manpage-aliases, which in
 	  turn required a change to the configure script to factor in the
diff --git a/VERSION b/VERSION
index d2f427759..8a66af02c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230514
+5:0:10	6.4	20230520
diff --git a/dist.mk b/dist.mk
index a1d9f210b..6bfa61d43 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1544 2023/05/14 22:01:25 tom Exp $
+# $Id: dist.mk,v 1.1545 2023/05/20 14:39:41 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230514
+NCURSES_PATCH = 20230520
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 294ec594c..5531c0640 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.664 2023/04/29 19:10:30 tom Exp $
+ * $Id: curses.priv.h,v 1.666 2023/05/20 18:20:39 tom Exp $
  *
  *	curses.priv.h
  *
@@ -141,8 +141,17 @@ extern int errno;
 # endif
 #endif
 
+#if (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0) && (defined(__GNUC__) && (__GNUC__ < 12))
+# undef PRIxPTR		/* gcc bug fixed in 12.x */
+# define PRIxPTR	"lX"
+# define CASTxPTR(n)    (unsigned long)(intptr_t)(n)
+#else
+# define CASTxPTR(n)    (intptr_t)(n)
+#endif
+
 #ifndef PRIxPTR
 # define PRIxPTR	"lx"
+# define CASTxPTR(n)    (long)(n)
 #endif
 
 /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 53bdf8b06..74fba109d 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.131 2022/10/23 13:15:58 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.132 2023/05/20 18:08:48 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -225,7 +225,7 @@ _nc_read_entry_source(FILE *fp, char *buf,
 	  (T_CALLED("_nc_read_entry_source("
 		    "file=%p, buf=%p, literal=%d, silent=%d, hook=%#"
 		    PRIxPTR ")"),
-	   (void *) fp, buf, literal, silent, (intptr_t) hook));
+	   (void *) fp, buf, literal, silent, CASTxPTR(hook)));
 
     if (silent)
 	_nc_suppress_warnings = TRUE;	/* shut the lexer up, too */
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index 01c1f8b74..c4b077de0 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.120 2023/04/29 19:54:37 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.121 2023/05/20 18:33:33 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -311,7 +311,7 @@ static long
 stream_pos(void)
 /* return our current character position in the input stream */
 {
-    return (yyin ? ftell(yyin) : (bufptr ? bufptr - bufstart : 0));
+    return (yyin ? ftell(yyin) : (bufptr ? (long) (bufptr - bufstart) : 0));
 }
 
 static bool
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index effd3c1c1..4b7d39424 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.101 2022/09/17 14:57:02 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.102 2023/05/20 18:09:07 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -267,11 +267,13 @@ _nc_va_tracef(const char *fmt, va_list ap)
 # if USE_WEAK_SYMBOLS
 	if ((pthread_self))
 # endif
+	    fprintf(fp, "%#" PRIxPTR ":",
 #ifdef _NC_WINDOWS
-	    fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p);
+		    CASTxPTR(pthread_self().p)
 #else
-	    fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self());
+		    CASTxPTR(pthread_self())
 #endif
+		);
 #endif
 	if (before || after) {
 	    int n;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 5b1e4ac26..8714f5544 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230514) unstable; urgency=low
+ncurses6 (6.4+20230520) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 5b1e4ac26..8714f5544 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230514) unstable; urgency=low
+ncurses6 (6.4+20230520) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index c7393cc80..6ac664635 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230514) unstable; urgency=low
+ncurses6 (6.4+20230520) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 May 2023 18:01:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index c1e73fe05..1ecb27bf2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.584 2023/05/14 22:01:25 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.585 2023/05/20 14:39:41 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0514"
+!define VERSION_MMDD  "0520"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1ed205760..ae1fe3186 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230514
+Release: 20230520
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 9e4015063..7ad1c6baf 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230514
+Release: 20230520
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9a4376924..13baeff86 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230514
+Release: 20230520
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 225181e104f255e337413aee76b5a38fb98e3a0d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 28 May 2023 00:35:09 +0200
Subject: [PATCH 011/106] ncurses-6.4-20230527.patch

---
 NEWS                             |  5 +-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 ncurses/base/lib_mouse.c         |  4 +-
 ncurses/base/lib_refresh.c       |  6 +-
 ncurses/curses.priv.h            |  8 +--
 ncurses/tinfo/alloc_ttype.c      |  6 +-
 ncurses/tinfo/comp_parse.c       |  7 ++-
 ncurses/tinfo/comp_scan.c        | 23 ++++----
 ncurses/tinfo/entries.c          |  6 +-
 ncurses/tinfo/lib_termcap.c      |  6 +-
 ncurses/tinfo/strings.c          |  6 +-
 ncurses/tinfo/write_entry.c      | 25 ++++----
 ncurses/trace/visbuf.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 +-
 package/ncursest.spec            |  2 +-
 progs/dump_entry.c               |  6 +-
 progs/infocmp.c                  |  6 +-
 progs/tabs.c                     |  8 +--
 progs/tic.c                      | 99 ++++++++++++++++----------------
 test/bs.c                        | 14 +++--
 test/demo_forms.c                |  6 +-
 test/demo_menus.c                |  5 +-
 test/demo_termcap.c              | 19 +++---
 test/demo_terminfo.c             | 19 +++---
 test/echochar.c                  |  6 +-
 test/movewindow.c                |  9 +--
 test/ncurses.c                   | 12 ++--
 test/test_addwstr.c              |  6 +-
 test/test_delwin.c               |  6 +-
 test/test_sgr.c                  |  6 +-
 36 files changed, 192 insertions(+), 173 deletions(-)

diff --git a/NEWS b/NEWS
index 9eeeb5727..81a433adc 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3955 2023/05/20 18:39:29 tom Exp $
+-- $Id: NEWS,v 1.3957 2023/05/27 20:09:50 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230527
+	+ fixes for compiler warnings/cppcheck.
+
 20230520
 	+ fixes for compiler warnings in MinGW environments.
 
diff --git a/VERSION b/VERSION
index 8a66af02c..122a064f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230520
+5:0:10	6.4	20230527
diff --git a/dist.mk b/dist.mk
index 6bfa61d43..82a2f1c55 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1545 2023/05/20 14:39:41 tom Exp $
+# $Id: dist.mk,v 1.1546 2023/05/27 09:18:04 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230520
+NCURSES_PATCH = 20230527
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 319a276ae..b35ac7500 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.198 2023/03/25 23:27:28 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.199 2023/05/27 20:13:10 tom Exp $")
 
 #include <tic.h>
 
@@ -776,7 +776,7 @@ _nc_mouse_init(SCREEN *sp)
 {
     bool result = FALSE;
 
-    T((T_CALLED("_nc_mouse_init(%p)"), sp));
+    T((T_CALLED("_nc_mouse_init(%p)"), (void *)sp));
 
     if (sp != 0) {
 	if (!sp->_mouse_initialized) {
diff --git a/ncurses/base/lib_refresh.c b/ncurses/base/lib_refresh.c
index 4579cbf81..bcaa4624b 100644
--- a/ncurses/base/lib_refresh.c
+++ b/ncurses/base/lib_refresh.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_refresh.c,v 1.47 2021/11/06 22:22:03 tom Exp $")
+MODULE_ID("$Id: lib_refresh.c,v 1.48 2023/05/27 20:13:10 tom Exp $")
 
 NCURSES_EXPORT(int)
 wrefresh(WINDOW *win)
@@ -208,7 +208,6 @@ wnoutrefresh(WINDOW *win)
 	    });
 
 	    if_WIDEC({
-		static cchar_t blank = BLANK;
 		int last_dst = begx + ((last_src < win->_maxx)
 				       ? last_src
 				       : win->_maxx);
@@ -254,6 +253,7 @@ wnoutrefresh(WINDOW *win)
 		 */
 		if (fix_left < dst_col || fix_right > last_dst) {
 		    for (j = fix_left; j <= fix_right; ++j) {
+			static cchar_t blank = BLANK;
 			nline->text[j] = blank;
 			CHANGED_CELL(nline, j);
 		    }
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 5531c0640..2c8729949 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.666 2023/05/20 18:20:39 tom Exp $
+ * $Id: curses.priv.h,v 1.667 2023/05/27 20:13:10 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2080,7 +2080,7 @@ typedef struct {
 /* strings.c */
 extern NCURSES_EXPORT(string_desc *) _nc_str_init (string_desc *, char *, size_t);
 extern NCURSES_EXPORT(string_desc *) _nc_str_null (string_desc *, size_t);
-extern NCURSES_EXPORT(string_desc *) _nc_str_copy (string_desc *, string_desc *);
+extern NCURSES_EXPORT(string_desc *) _nc_str_copy (string_desc *, const string_desc *);
 extern NCURSES_EXPORT(bool) _nc_safe_strcat (string_desc *, const char *);
 extern NCURSES_EXPORT(bool) _nc_safe_strcpy (string_desc *, const char *);
 
@@ -2121,7 +2121,7 @@ extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2
 extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
-extern NCURSES_EXPORT(int) _nc_trans_string (char *, char *);
+extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
 extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
 extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
 extern NCURSES_EXPORT(void) _nc_flush (void);
@@ -2170,7 +2170,7 @@ extern NCURSES_EXPORT(void) _nc_comp_userdefs_leaks(void);
 extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void);
 extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
 extern NCURSES_EXPORT(void) _nc_names_leaks(void);
-extern NCURSES_EXPORT(void) _nc_tgetent_leak(TERMINAL *);
+extern NCURSES_EXPORT(void) _nc_tgetent_leak(const TERMINAL *);
 extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
 #endif
 
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 36085e474..ff32770d0 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.48 2023/04/22 15:50:28 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.49 2023/05/27 20:13:10 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -378,8 +378,8 @@ adjust_cancels(TERMTYPE2 *to, TERMTYPE2 *from)
     int j, k;
 
     DEBUG(3, (T_CALLED("adjust_cancels(%s), from(%s)"),
-	      to ? NonNull(to->term_names) : "?",
-	      from ? NonNull(from->term_names) : "?"));
+	      NonNull(to->term_names),
+	      NonNull(from->term_names)));
     for (j = first; j < last;) {
 	char *name = to->ext_Names[j];
 	int j_str = to->num_Strings - first - to->ext_Strings;
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 74fba109d..4244df4ef 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.132 2023/05/20 18:08:48 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.133 2023/05/27 20:13:10 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -264,8 +264,9 @@ _nc_read_entry_source(FILE *fp, char *buf,
 
     if (_nc_tail) {
 	/* set up the head pointer */
-	for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last)
-	    continue;
+	for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last) {
+	    /* EMPTY */ ;
+	}
 
 	DEBUG(2, ("head = %s", _nc_head->tterm.term_names));
 	DEBUG(2, ("tail = %s", _nc_tail->tterm.term_names));
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index c4b077de0..3ba0835e2 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.121 2023/05/20 18:33:33 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.122 2023/05/27 20:13:10 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -328,9 +328,11 @@ end_of_stream(void)
 static NCURSES_INLINE int
 eat_escaped_newline(int ch)
 {
-    if (ch == '\\')
-	while ((ch = next_char()) == '\n' || iswhite(ch))
-	    continue;
+    if (ch == '\\') {
+	while ((ch = next_char()) == '\n' || iswhite(ch)) {
+	    /* EMPTY */ ;
+	}
+    }
     return ch;
 }
 
@@ -434,7 +436,6 @@ _nc_get_token(bool silent)
     while ((ch = next_char()) == '\n' || iswhite(ch)) {
 	if (ch == '\n')
 	    had_newline = TRUE;
-	continue;
     }
 
     ch = eat_escaped_newline(ch);
@@ -459,8 +460,9 @@ _nc_get_token(bool silent)
 	    dot_flag = TRUE;
 	    DEBUG(8, ("dot-flag set"));
 
-	    while ((ch = next_char()) == '.' || iswhite(ch))
-		continue;
+	    while ((ch = next_char()) == '.' || iswhite(ch)) {
+		/* EMPTY */ ;
+	    }
 	}
 
 	if (ch == EOF) {
@@ -601,8 +603,9 @@ _nc_get_token(bool silent)
 		/* throw away trailing /, *$/ */
 		for (--tok_ptr;
 		     iswhite(*tok_ptr) || *tok_ptr == ',';
-		     tok_ptr--)
-		    continue;
+		     tok_ptr--) {
+		    /* EMPTY */ ;
+		}
 		tok_ptr[1] = '\0';
 	    }
 
@@ -831,7 +834,7 @@ _nc_get_token(bool silent)
  */
 
 NCURSES_EXPORT(int)
-_nc_trans_string(char *ptr, char *last)
+_nc_trans_string(char *ptr, const char *const last)
 {
     int count = 0;
     int number = 0;
diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 8c5e10c00..f47fd3fe9 100644
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: entries.c,v 1.34 2022/08/13 16:57:35 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.35 2023/05/27 20:13:10 tom Exp $")
 
 /****************************************************************************
  *
@@ -65,7 +65,7 @@ NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
 NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
 
 static ENTRY *
-_nc_delink_entry(ENTRY * headp, TERMTYPE2 *tterm)
+_nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm)
 /* delink the allocated storage for the given list entry */
 {
     ENTRY *ep, *last;
diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index 5ce43a3c4..2ece98591 100644
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_termcap.c,v 1.88 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.89 2023/05/27 20:13:10 tom Exp $")
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
@@ -399,7 +399,7 @@ tgetstr(const char *id, char **area)
 #undef CacheInx
 #define CacheInx num
 NCURSES_EXPORT(void)
-_nc_tgetent_leak(TERMINAL *termp)
+_nc_tgetent_leak(const TERMINAL *const termp)
 {
     if (termp != 0) {
 	int num;
diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c
index a1d8beb63..03f59c24e 100644
--- a/ncurses/tinfo/strings.c
+++ b/ncurses/tinfo/strings.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2000-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: strings.c,v 1.10 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: strings.c,v 1.11 2023/05/27 20:13:10 tom Exp $")
 
 /****************************************************************************
  * Useful string functions (especially for mvcur)
@@ -95,7 +95,7 @@ _nc_str_null(string_desc * dst, size_t len)
  * Copy a descriptor
  */
 NCURSES_EXPORT(string_desc *)
-_nc_str_copy(string_desc * dst, string_desc * src)
+_nc_str_copy(string_desc * dst, const string_desc * const src)
 {
     *dst = *src;
     return dst;
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 156ce7442..9de733646 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.126 2023/04/29 20:30:57 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.127 2023/05/27 20:13:10 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -128,18 +128,16 @@ check_writeable(int code)
     char dir[sizeof(LEAF_FMT)];
     char *s = 0;
 
-    if (code == 0 || (s = (strchr) (dirnames, code)) == 0)
+    if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
-
-    if (verified[s - dirnames])
-	return;
-
-    _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
-    if (make_db_root(dir) < 0) {
-	_nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
+    } else if (!verified[s - dirnames]) {
+	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
+	if (make_db_root(dir) < 0) {
+	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
+	} else {
+	    verified[s - dirnames] = TRUE;
+	}
     }
-
-    verified[s - dirnames] = TRUE;
 }
 #endif /* !USE_HASHED_DB */
 
@@ -333,8 +331,9 @@ _nc_write_entry(TERMTYPE2 *const tp)
     if (ptr != name_list) {
 	*ptr = '\0';
 
-	for (ptr = name_list; *ptr != '\0' && *ptr != '|'; ptr++)
-	    continue;
+	for (ptr = name_list; *ptr != '\0' && *ptr != '|'; ptr++) {
+	    /* EMPTY */ ;
+	}
 
 	if (*ptr == '\0')
 	    other_names = ptr;
diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c
index aca8affc4..590e42306 100644
--- a/ncurses/trace/visbuf.c
+++ b/ncurses/trace/visbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2023 Thomas E. Dickey                                *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 #include <tic.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: visbuf.c,v 1.53 2021/02/27 20:07:57 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.54 2023/05/27 20:13:10 tom Exp $")
 
 #define NUM_VISBUFS 4
 
@@ -67,7 +67,9 @@ static const char r_brace[] = StringOf(R_BRACE);
 static char *
 _nc_vischar(char *tp, unsigned c LIMIT_ARG)
 {
-    if (c == '"' || c == '\\') {
+    if (tp == NULL) {
+	return NULL;
+    } else if (c == '"' || c == '\\') {
 	*tp++ = '\\';
 	*tp++ = (char) c;
     } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8714f5544..6c037cd77 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230520) unstable; urgency=low
+ncurses6 (6.4+20230527) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8714f5544..6c037cd77 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230520) unstable; urgency=low
+ncurses6 (6.4+20230527) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 6ac664635..cbf3ddf78 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230520) unstable; urgency=low
+ncurses6 (6.4+20230527) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 May 2023 10:39:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1ecb27bf2..75cc1d876 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.585 2023/05/20 14:39:41 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.586 2023/05/27 09:18:04 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0520"
+!define VERSION_MMDD  "0527"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ae1fe3186..edf591835 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230520
+Release: 20230527
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 7ad1c6baf..f4b2e559a 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230520
+Release: 20230527
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 13baeff86..b218ea6b2 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230520
+Release: 20230527
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index aad715b9c..be332d2e7 100644
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -40,7 +40,7 @@
 #include <termsort.h>		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.195 2023/01/21 21:25:21 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.196 2023/05/27 20:13:10 tom Exp $")
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
@@ -1311,7 +1311,7 @@ fmt_entry(TERMTYPE2 *tterm,
 }
 
 static bool
-kill_string(TERMTYPE2 *tterm, char *cap)
+kill_string(TERMTYPE2 *tterm, const char *const cap)
 {
     unsigned n;
     for (n = 0; n < NUM_STRINGS(tterm); ++n) {
@@ -1693,7 +1693,7 @@ show_entry(void)
 		outbuf.used = (size_t) j;
 	    } else if (!infodump && ch == '\\') {
 		outbuf.used = (size_t) j;
-	    } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) {
+	    } else if (ch == delim && (outbuf.text[j - 1] != '\\')) {
 		outbuf.used = (size_t) (j + 1);
 	    } else {
 		break;
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 171d794dc..ec5e07650 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.156 2022/09/24 10:13:06 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.157 2023/05/27 20:13:10 tom Exp $")
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -158,7 +158,7 @@ no_numeric(int value)
 }
 
 static bool
-no_string(char *value)
+no_string(const char *const value)
 {
     bool result = (value == ABSENT_STRING);
     if (!strcmp(s_absent, s_cancel))
diff --git a/progs/tabs.c b/progs/tabs.c
index 7378d116f..c852eb858 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
 #include <progs.priv.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tabs.c,v 1.51 2022/02/26 22:44:44 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.52 2023/05/27 20:13:10 tom Exp $")
 
 static GCC_NORETURN void usage(void);
 
@@ -183,7 +183,7 @@ decode_tabs(const char *tab_list, int margin)
 }
 
 static void
-print_ruler(int *tab_list, const char *new_line)
+print_ruler(const int *const tab_list, const char *new_line)
 {
     int last = 0;
     int n;
@@ -649,7 +649,7 @@ main(int argc, char *argv[])
 	    /* set tty modes to -ocrnl to allow \r */
 	    if (isatty(STDOUT_FILENO)) {
 		TTY new_settings = tty_settings;
-		new_settings.c_oflag &= (unsigned)~OCRNL;
+		new_settings.c_oflag &= (unsigned) ~OCRNL;
 		update_tty_settings(&tty_settings, &new_settings);
 		change_tty = TRUE;
 		new_line = "\r\n";
diff --git a/progs/tic.c b/progs/tic.c
index 7ae616777..d8052648f 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.321 2023/04/08 15:51:57 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.322 2023/05/27 20:13:10 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -1169,6 +1169,7 @@ check_acs(TERMTYPE2 *tp)
 	char *q;
 
 	memset(mapped, 0, sizeof(mapped));
+	memset(missing, 0, sizeof(missing));
 	for (p = acs_chars; *p != '\0'; p += 2) {
 	    if (p[1] == '\0') {
 		_nc_warning("acsc has odd number of characters");
@@ -1350,8 +1351,7 @@ check_ansi_cursor(char *list[4])
     for (j = 0; j < 4; ++j) {
 	skip[j] = FALSE;
 	for (k = 0; k < j; ++k) {
-	    if (j != k
-		&& !strcmp(list[j], list[k])) {
+	    if (!strcmp(list[j], list[k])) {
 		char *value = _nc_tic_expand(list[k], TRUE, 0);
 		_nc_warning("repeated cursor control %s", value);
 		repeated = TRUE;
@@ -2440,60 +2440,63 @@ static void
 check_infotocap(TERMTYPE2 *tp, int i, const char *value)
 {
     const char *name = ExtStrname(tp, i, strnames);
-    int params = ((i < (int) SIZEOF(parametrized))
-		  ? parametrized[i]
-		  : ((*value == 'k')
-		     ? 0
-		     : has_params(value, FALSE)));
     char *ti_value = NULL;
-    char *tc_value;
-    bool embedded;
 
     assert(SIZEOF(parametrized) == STRCOUNT);
     if (!VALID_STRING(value) || (ti_value = strdup(value)) == NULL) {
 	_nc_warning("tic-expansion of %s failed", name);
-    } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {
-	_nc_warning("tic-conversion of %s failed", name);
-    } else if (params > 0) {
-	int limit = 5;
-	int count;
-	bool first = TRUE;
-
-	if (!strcmp(name, "setf")
-	    || !strcmp(name, "setb")
-	    || !strcmp(name, "setaf")
-	    || !strcmp(name, "setab")) {
-	    if ((limit = max_colors) > 256)
-		limit = 256;
-	}
-	for (count = 0; count < limit; ++count) {
-	    char *ti_check = check_1_infotocap(name, ti_value, count);
-	    char *tc_check = check_1_infotocap(name, tc_value, count);
-
-	    if (strcmp(ti_check, tc_check)) {
-		if (first) {
-		    fprintf(stderr, "check_infotocap(%s)\n", name);
-		    fprintf(stderr, "...ti '%s'\n", _nc_visbuf2(0, ti_value));
-		    fprintf(stderr, "...tc '%s'\n", _nc_visbuf2(0, tc_value));
-		    first = FALSE;
+    } else {
+	char *tc_value;
+	bool embedded;
+	int params = ((i < (int) SIZEOF(parametrized))
+		      ? parametrized[i]
+		      : ((*value == 'k')
+			 ? 0
+			 : has_params(value, FALSE)));
+
+	if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {
+	    _nc_warning("tic-conversion of %s failed", name);
+	} else if (params > 0) {
+	    int limit = 5;
+	    int count;
+	    bool first = TRUE;
+
+	    if (!strcmp(name, "setf")
+		|| !strcmp(name, "setb")
+		|| !strcmp(name, "setaf")
+		|| !strcmp(name, "setab")) {
+		if ((limit = max_colors) > 256)
+		    limit = 256;
+	    }
+	    for (count = 0; count < limit; ++count) {
+		char *ti_check = check_1_infotocap(name, ti_value, count);
+		char *tc_check = check_1_infotocap(name, tc_value, count);
+
+		if (strcmp(ti_check, tc_check)) {
+		    if (first) {
+			fprintf(stderr, "check_infotocap(%s)\n", name);
+			fprintf(stderr, "...ti '%s'\n", _nc_visbuf2(0, ti_value));
+			fprintf(stderr, "...tc '%s'\n", _nc_visbuf2(0, tc_value));
+			first = FALSE;
+		    }
+		    _nc_warning("tparm-conversion of %s(%d) differs between\n\tterminfo %s\n\ttermcap  %s",
+				name, count,
+				_nc_visbuf2(0, ti_check),
+				_nc_visbuf2(1, tc_check));
 		}
-		_nc_warning("tparm-conversion of %s(%d) differs between\n\tterminfo %s\n\ttermcap  %s",
-			    name, count,
-			    _nc_visbuf2(0, ti_check),
-			    _nc_visbuf2(1, tc_check));
+		free(ti_check);
+		free(tc_check);
+	    }
+	} else if (params == 0 && !same_ti_tc(ti_value, tc_value, &embedded)) {
+	    if (embedded) {
+		_nc_warning("termcap equivalent of %s cannot use embedded delay", name);
+	    } else {
+		_nc_warning("tic-conversion of %s changed value\n\tfrom %s\n\tto   %s",
+			    name, ti_value, tc_value);
 	    }
-	    free(ti_check);
-	    free(tc_check);
-	}
-    } else if (params == 0 && !same_ti_tc(ti_value, tc_value, &embedded)) {
-	if (embedded) {
-	    _nc_warning("termcap equivalent of %s cannot use embedded delay", name);
-	} else {
-	    _nc_warning("tic-conversion of %s changed value\n\tfrom %s\n\tto   %s",
-			name, ti_value, tc_value);
 	}
+	free(ti_value);
     }
-    free(ti_value);
 }
 
 static char *
diff --git a/test/bs.c b/test/bs.c
index 3e7733171..c7569cf20 100644
--- a/test/bs.c
+++ b/test/bs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *
- * $Id: bs.c,v 1.78 2022/12/11 00:18:37 tom Exp $
+ * $Id: bs.c,v 1.79 2023/05/27 20:13:10 tom Exp $
  */
 
 #include <test.priv.h>
@@ -898,8 +898,9 @@ sgetc(const char *s)
 	    ch = toupper(ch);
 	if (is_QUIT(ch))
 	    uninitgame(0);
-	for (s1 = s; *s1 && ch != *s1; ++s1)
-	    continue;
+	for (s1 = s; *s1 && ch != *s1; ++s1) {
+	    /* EMPTY */ ;
+	}
 	if (*s1) {
 	    AddCh(ch);
 	    (void) refresh();
@@ -1270,8 +1271,9 @@ main(int argc, char *argv[])
 		    }
 		}
 	    } else
-		while ((turn ? cputurn() : plyturn()) && awinna() == -1)
-		    continue;
+		while ((turn ? cputurn() : plyturn()) && awinna() == -1) {
+		    /* EMPTY */ ;
+		}
 	    turn = OTHER;
 	}
     } while
diff --git a/test/demo_forms.c b/test/demo_forms.c
index 8e8312558..61c4cc720 100644
--- a/test/demo_forms.c
+++ b/test/demo_forms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_forms.c,v 1.61 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_forms.c,v 1.62 2023/05/27 20:13:10 tom Exp $
  *
  * Demonstrate a variety of functions from the form library.
  * Thomas Dickey - 2003/4/26
@@ -242,7 +242,7 @@ show_insert_mode(bool insert_mode)
 #define O_SELECTABLE (O_ACTIVE | O_VISIBLE)
 
 static FIELD *
-another_field(FORM *form, FIELD *field)
+another_field(FORM *form, const FIELD *const field)
 {
     FIELD **f = form_fields(form);
     FIELD *result = 0;
diff --git a/test/demo_menus.c b/test/demo_menus.c
index ab3880cb6..7b0bf3031 100644
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.79 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_menus.c,v 1.80 2023/05/27 20:13:10 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -925,7 +925,6 @@ perform_menus(void)
 	}
 	if (code == E_REQUEST_DENIED)
 	    beep();
-	continue;
     }
 }
 
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 468bd976d..6e2aba700 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.64 2022/12/10 23:22:09 tom Exp $
+ * $Id: demo_termcap.c,v 1.65 2023/05/27 20:13:10 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -105,7 +105,7 @@ static long total_s_values;
 #define EachCapName(n) n = 33; n < 127; ++n
 
 static char *
-make_dbitem(char *p, char *q)
+make_dbitem(const char *const p, const char *const q)
 {
     size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
     char *result = malloc(need);
@@ -404,7 +404,8 @@ typedef enum {
 static void
 parse_description(const char *input_name)
 {
-    static char empty[1];
+    static char empty[1] =
+    {0};
 
     FILE *fp;
     struct stat sb;
@@ -437,11 +438,13 @@ parse_description(const char *input_name)
 	failed("cannot allocate memory for input-file");
     }
 
-    if ((fp = fopen(input_name, "r")) == 0)
+    if ((fp = fopen(input_name, "r")) == 0) {
 	failed("cannot open input-file");
-    len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
-    my_blob[sb.st_size] = '\0';
-    fclose(fp);
+    } else {
+	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
+	my_blob[sb.st_size] = '\0';
+	fclose(fp);
+    }
 
     /*
      * First, get rid of comments and escaped newlines, as well as repeated
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index 1b2d426ca..5e78015c3 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.56 2022/12/10 23:22:09 tom Exp $
+ * $Id: demo_terminfo.c,v 1.57 2023/05/27 20:13:10 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -96,7 +96,7 @@ static long total_s_values;
 #define FNAME(type) "%s %-*s = ", #type, f_opt ? 24 : FCOLS
 
 static char *
-make_dbitem(char *p, char *q)
+make_dbitem(const char *const p, const char *const q)
 {
     size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
     char *result = malloc(need);
@@ -430,7 +430,8 @@ typedef enum {
 static void
 parse_description(const char *input_name)
 {
-    static char empty[1];
+    static char empty[1] =
+    {0};
 
     FILE *fp;
     struct stat sb;
@@ -463,11 +464,13 @@ parse_description(const char *input_name)
 	failed("cannot allocate memory for input-file");
     }
 
-    if ((fp = fopen(input_name, "r")) == 0)
+    if ((fp = fopen(input_name, "r")) == 0) {
 	failed("cannot open input-file");
-    len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
-    my_blob[sb.st_size] = '\0';
-    fclose(fp);
+    } else {
+	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
+	my_blob[sb.st_size] = '\0';
+	fclose(fp);
+    }
 
     /*
      * First, get rid of comments and escaped newlines, as well as repeated
diff --git a/test/echochar.c b/test/echochar.c
index 1d9815744..084970694 100644
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2006-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: echochar.c,v 1.25 2022/12/10 22:28:50 tom Exp $
+ * $Id: echochar.c,v 1.26 2023/05/27 20:13:10 tom Exp $
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
@@ -65,7 +65,7 @@ ranf(void)
 }
 
 static void
-set_color(char *my_pairs, int fg, int bg)
+set_color(const char *const my_pairs, int fg, int bg)
 {
     int pair = (fg * COLORS) + bg;
     if (pair < COLOR_PAIRS) {
diff --git a/test/movewindow.c b/test/movewindow.c
index 7fe7329f9..07797ca67 100644
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2006-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.53 2022/12/10 23:31:31 tom Exp $
+ * $Id: movewindow.c,v 1.54 2023/05/27 20:13:10 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -324,6 +324,7 @@ add_window(WINDOW *parent, WINDOW *child)
 	all_windows = typeRealloc(FRAME, need, all_windows);
 	if (!all_windows)
 	    failed("add_window");
+	have = need;
     }
     all_windows[num_windows].parent = parent;
     all_windows[num_windows].child = child;
@@ -331,7 +332,7 @@ add_window(WINDOW *parent, WINDOW *child)
 }
 
 static int
-window2num(WINDOW *win)
+window2num(const WINDOW *const win)
 {
     int n;
     int result = -1;
@@ -407,7 +408,7 @@ prev_window(WINDOW *win)
 }
 
 static void
-recur_move_window(WINDOW *parent, int dy, int dx)
+recur_move_window(const WINDOW *const parent, int dy, int dx)
 {
     unsigned n;
 
diff --git a/test/ncurses.c b/test/ncurses.c
index fed8b9bef..a402c4c51 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.534 2023/02/25 19:30:27 tom Exp $
+$Id: ncurses.c,v 1.535 2023/05/27 20:13:10 tom Exp $
 
 ***************************************************************************/
 
@@ -770,7 +770,7 @@ slk_repaint(void)
  * Resize both and paint the box in the parent.
  */
 static void
-resize_boxes(unsigned level, WINDOW *win)
+resize_boxes(unsigned level, const WINDOW *const win)
 {
     unsigned n;
     int base = 5;
@@ -1012,7 +1012,7 @@ getch_test(bool recur GCC_UNUSED)
  */
 #if defined(KEY_RESIZE) && HAVE_WRESIZE
 static void
-resize_wide_boxes(unsigned level, WINDOW *win)
+resize_wide_boxes(unsigned level, const WINDOW *const win)
 {
     unsigned n;
     int base = 5;
@@ -6161,7 +6161,6 @@ menu_test(bool recur GCC_UNUSED)
 	    break;
 	if (c == E_REQUEST_DENIED)
 	    beep();
-	continue;
     }
 
     MvPrintw(LINES - 2, 0,
@@ -6329,8 +6328,9 @@ trace_set(bool recur GCC_UNUSED)
 	    set_item_value(*ip, TRUE);
     }
 
-    while (run_trace_menu(m))
-	continue;
+    while (run_trace_menu(m)) {
+	/* EMPTY */ ;
+    }
 
     newtrace = 0;
     for (ip = menu_items(m); *ip; ip++)
diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index aa7bf8574..9e51f49df 100644
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.21 2022/12/10 22:28:50 tom Exp $
+ * $Id: test_addwstr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -114,7 +114,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
 }
 
 static int
-ColOf(wchar_t *buffer, int length, int margin)
+ColOf(const wchar_t *const buffer, int length, int margin)
 {
     int n;
     int result;
diff --git a/test/test_delwin.c b/test/test_delwin.c
index 7a8742518..09ef5c538 100644
--- a/test/test_delwin.c
+++ b/test/test_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2022 Thomas E. Dickey                                          *
+ * Copyright 2022,2023 Thomas E. Dickey                                     *
  *                                                                          *
  * 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 @@
  ****************************************************************************/
 
 /*
- * $Id: test_delwin.c,v 1.4 2022/12/10 22:14:07 tom Exp $
+ * $Id: test_delwin.c,v 1.5 2023/05/27 20:34:51 tom Exp $
  */
 #include <test.priv.h>
 
@@ -123,7 +123,7 @@ main(int argc, char **argv)
 
     show_rc("Deleted parent",
 	    "should fail, it still has a subwindow",
-	    rc = delwin(parent));
+	    delwin(parent));
     next_step(stdscr);
     show_rc("Deleted child1",
 	    "should succeed",
diff --git a/test/test_sgr.c b/test/test_sgr.c
index dbd1caf17..8763dca3c 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.21 2022/12/10 23:23:27 tom Exp $
+ * $Id: test_sgr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -61,7 +61,7 @@ static int db_item;
 static long total_values;
 
 static char *
-make_dbitem(char *p, char *q)
+make_dbitem(const char *const p, const char *const q)
 {
     size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
     char *result = malloc(need);

From 92308c1447242e21371c7f809824b3978bd5bc8e Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 4 Jun 2023 00:04:17 +0200
Subject: [PATCH 012/106] ncurses-6.4-20230603.patch

---
 INSTALL                          |    8 +-
 NEWS                             |   12 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   82 +-
 configure                        | 5099 +++++++++++++++---------------
 dist.mk                          |    4 +-
 ncurses/base/lib_instr.c         |    6 +-
 ncurses/curses.priv.h            |    5 +-
 ncurses/trace/lib_trace.c        |    7 +-
 ncurses/widechar/lib_key_name.c  |   19 +-
 ncurses/widechar/lib_unget_wch.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 +-
 test/testcurs.c                  |   12 +-
 19 files changed, 2724 insertions(+), 2560 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4c4553a34..60bc8eae4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.243 2023/04/22 23:41:54 tom Exp $
+-- $Id: INSTALL,v 1.245 2023/06/03 20:14:17 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -1028,7 +1028,7 @@ CONFIGURE OPTIONS:
 	See also the --enable-getcap option.
 
     --with-infocmp-path[=XXX]
-	Use this option to override the automatic detection of tic in your
+	Use this option to override the automatic detection of infocmp in your
 	$PATH when building fallbacks (see "--with-fallbacks").
 
     --with-install-prefix=XXX
@@ -1236,6 +1236,10 @@ CONFIGURE OPTIONS:
 	This is normally chosen automatically based on the type of system
 	which you are building on.  We use it for testing the configure script.
 
+    --with-strip-program=XXX
+    	When stripping executables during install, use the specified program
+	rather than "strip".
+
     --with-sysmouse
 	use FreeBSD sysmouse interface provide mouse support on the console.
 
diff --git a/NEWS b/NEWS
index 81a433adc..c3506f058 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3957 2023/05/27 20:09:50 tom Exp $
+-- $Id: NEWS,v 1.3959 2023/06/03 20:12:53 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230603
+	+ add configure option --with-strip-program, to override program
+	  chosen by the install program for stripping executables (prompted
+	  by discussion with Aapo Rantalainen).
+	+ fix typo in INSTALL (report/patch by Aapo Rantalainen).
+	+ improve error-checks for isEILSEQ()
+	+ increase MB_CUR_MAX to 16, matching glibc's MB_LEN_MAX.
+	+ corrected mouse mask in test/testcurs.c
+	+ improve thread lock in lib_trace.c
+
 20230527
 	+ fixes for compiler warnings/cppcheck.
 
diff --git a/VERSION b/VERSION
index 122a064f8..b733810af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230527
+5:0:10	6.4	20230603
diff --git a/aclocal.m4 b/aclocal.m4
index 0a0770de5..451a527c6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1046 2023/05/13 21:42:47 tom Exp $
+dnl $Id: aclocal.m4,v 1.1048 2023/06/03 19:19:41 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4003,7 +4003,7 @@ CPPFLAGS="-I. $CPPFLAGS"
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30
 dnl ---------------
 dnl prompt for/fill-in useful install-program options
 AC_DEFUN([CF_INSTALL_OPTS],
@@ -4011,6 +4011,7 @@ AC_DEFUN([CF_INSTALL_OPTS],
 CF_INSTALL_OPT_S
 CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
+CF_INSTALL_OPT_STRIP_PROG
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42
@@ -4097,6 +4098,72 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30
+dnl -------------------------
+dnl Provide an option for overriding the strip program used in install "-s"
+dnl
+dnl coreutils install provides a --strip-program option
+dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use
+dnl STRIP environment variable.  Other versions of install do not support this.
+AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG],
+[
+AC_REQUIRE([CF_INSTALL_OPT_S])
+if test -n "$INSTALL_OPT_S"
+then
+	AC_MSG_CHECKING(if you want to specify strip-program)
+	AC_ARG_WITH(strip-program,
+		[  --with-strip-program=XX specify program to use when stripping in install],
+		[with_strip_program=$withval],
+		[with_strip_program=no])
+	AC_MSG_RESULT($with_strip_program)
+	if test "$with_strip_program" != no
+	then
+		AC_MSG_CHECKING(if strip-program is supported with this installer)
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		AC_MSG_RESULT($check_install_strip)
+		case "$check_install_strip" in
+		(no)
+			AC_MSG_WARN($cf_install_program does not support strip program option)
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "[$]@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			CF_VERBOSE(created $INSTALL)
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
@@ -4518,7 +4585,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
 	AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 99 updated: 2023/04/22 11:51:06
+dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -5025,7 +5092,7 @@ cat >> Makefile <<CF_EOF
 distclean ::
 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
 	rm -f headers.sh headers.sed mk_shared_lib.sh
-	rm -f edit_man.* man_alias.*
+	rm -f edit_man.* man_alias.* *.tmp
 	rm -rf \${DIRS_TO_MAKE}
 CF_EOF
 
@@ -5592,7 +5659,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 17 updated: 2023/01/21 16:49:25
+dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
@@ -5741,6 +5808,11 @@ case "$cf_item" in
 esac
 done
 
+AC_SUBST(cf_manpage_format)
+AC_SUBST(cf_manpage_inboth)
+AC_SUBST(cf_manpage_so_strip)
+AC_SUBST(cf_manpage_compress)
+
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29
diff --git a/configure b/configure
index 3bf89a6d6..3b9179f8c 100755
--- a/configure
+++ b/configure
@@ -851,6 +851,7 @@ Experimental Code:
 Testing/development Options:
   --disable-echo          do not display "compiling" commands
   --disable-stripping     do not strip (debug info) installed executables
+  --with-strip-program=XX specify program to use when stripping in install
   --enable-warnings       test: turn on gcc compiler warnings
   --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics
   --enable-string-hacks   work around bogus compiler/loader warnings
@@ -1070,7 +1071,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1073: loading site script $ac_site_file" >&5
+    { echo "$as_me:1074: 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"
@@ -1081,7 +1082,7 @@ if test -r "$cache_file"; then
   # 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:1084: loading cache $cache_file" >&5
+    { echo "$as_me:1085: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1089,7 +1090,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1092: creating cache $cache_file" >&5
+  { echo "$as_me:1093: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1105,21 +1106,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1108: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1109: 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:1112: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1113: 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:1118: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1119: 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:1120:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1121:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1122:   current value: $ac_new_val" >&5
+        { echo "$as_me:1123:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1138,9 +1139,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1141: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1142: 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:1143: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1144: 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
@@ -1169,10 +1170,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1172: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1173: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1175: \$? = $ac_status" >&5
+  echo "$as_me:1176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1189,7 +1190,7 @@ for ac_prog in ggrep grep
 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:1192: checking for $ac_word" >&5
+echo "$as_me:1193: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1204,7 +1205,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1207: found $ac_dir/$ac_word" >&5
+echo "$as_me:1208: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1212,10 +1213,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1215: result: $GREP" >&5
+  echo "$as_me:1216: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1218: result: no" >&5
+  echo "$as_me:1219: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1223,7 +1224,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1226: checking for egrep" >&5
+echo "$as_me:1227: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1235,7 +1236,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1238: checking for $ac_word" >&5
+echo "$as_me:1239: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1252,7 +1253,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:1255: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1256: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1263,10 +1264,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:1266: result: $EGREP" >&5
+  echo "$as_me:1267: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:1269: result: no" >&5
+  echo "$as_me:1270: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1274,12 +1275,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1277: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1278: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1282: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:1283: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -1290,11 +1291,11 @@ cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_abi_default=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
-echo "$as_me:1293: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+echo "$as_me:1294: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
 
 if test -f "$srcdir/VERSION" ; then
-	echo "$as_me:1297: checking for package version" >&5
+	echo "$as_me:1298: 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...
@@ -1306,39 +1307,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1309: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1310: 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:1314: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1315: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1318: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1319: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1321: checking for package patch date" >&5
+	echo "$as_me:1322: 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:1326: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1327: 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:1333: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1334: 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:1338: result: $VERSION_PATCH" >&5
+	echo "$as_me:1339: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1341: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1342: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1346,19 +1347,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
 
-echo "${as_me:-configure}:1349: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1350: testing ABI VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me:-configure}:1353: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1354: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me:-configure}:1357: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1358: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me:-configure}:1361: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1362: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
 	cf_PACKAGE=NCURSES
 	PACKAGE=ncurses
@@ -1382,7 +1383,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1385: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1386: 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;
@@ -1396,13 +1397,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1399: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1400: 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:1405: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1406: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1412,13 +1413,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1415: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1416: 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:1421: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1422: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1431,7 +1432,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1434: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1435: 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.*)
@@ -1450,13 +1451,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1453: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1454: 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:1459: error: ABI version value is empty" >&5
+  { { echo "$as_me:1460: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1489,7 +1490,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1492: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1493: 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
@@ -1499,11 +1500,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1502: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1503: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1506: checking build system type" >&5
+echo "$as_me:1507: 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
@@ -1512,23 +1513,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1515: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1516: 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:1519: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1520: 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:1524: result: $ac_cv_build" >&5
+echo "$as_me:1525: 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:1531: checking host system type" >&5
+echo "$as_me:1532: 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
@@ -1537,12 +1538,12 @@ else
 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:1540: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1541: 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:1545: result: $ac_cv_host" >&5
+echo "$as_me:1546: 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/'`
@@ -1550,7 +1551,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1553: checking target system type" >&5
+	echo "$as_me:1554: 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
@@ -1559,12 +1560,12 @@ else
 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:1562: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1563: 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:1567: result: $ac_cv_target" >&5
+echo "$as_me:1568: 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/'`
@@ -1596,13 +1597,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1599: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1600: 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:1603: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1604: 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:1605: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1606: 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
@@ -1610,7 +1611,7 @@ fi
 # 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:1613: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1614: 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
@@ -1621,7 +1622,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1624: checking for fgrep" >&5
+echo "$as_me:1625: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1633,7 +1634,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1636: checking for $ac_word" >&5
+echo "$as_me:1637: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1650,7 +1651,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1653: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1654: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1661,10 +1662,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1664: result: $FGREP" >&5
+  echo "$as_me:1665: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1667: result: no" >&5
+  echo "$as_me:1668: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1672,16 +1673,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1675: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1676: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1680: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1681: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1684: checking for prefix" >&5
+echo "$as_me:1685: 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
@@ -1693,11 +1694,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1696: result: $prefix" >&5
+echo "$as_me:1697: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1700: checking for default include-directory" >&5
+echo "$as_me:1701: 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 \
@@ -1720,7 +1721,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1723: result: $includedir" >&5
+echo "$as_me:1724: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1783,20 +1784,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1786: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1787: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1792: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1793: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1799: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1800: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1831,7 +1832,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1834: checking for $ac_word" >&5
+echo "$as_me:1835: 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
@@ -1846,7 +1847,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1849: found $ac_dir/$ac_word" >&5
+echo "$as_me:1850: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1854,10 +1855,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1857: result: $CC" >&5
+  echo "$as_me:1858: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1860: result: no" >&5
+  echo "$as_me:1861: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1870,7 +1871,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1873: checking for $ac_word" >&5
+echo "$as_me:1874: 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
@@ -1885,7 +1886,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1888: found $ac_dir/$ac_word" >&5
+echo "$as_me:1889: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1893,10 +1894,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1896: result: $ac_ct_CC" >&5
+  echo "$as_me:1897: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1899: result: no" >&5
+  echo "$as_me:1900: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1906,32 +1907,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1909: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1910: 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:1914:" \
+echo "$as_me:1915:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1917: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1918: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1920: \$? = $ac_status" >&5
+  echo "$as_me:1921: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1922: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1923: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1925: \$? = $ac_status" >&5
+  echo "$as_me:1926: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1927: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1928: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1930: \$? = $ac_status" >&5
+  echo "$as_me:1931: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1934 "configure"
+#line 1935 "configure"
 #include "confdefs.h"
 
 int
@@ -1947,13 +1948,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1950: checking for C compiler default output" >&5
+echo "$as_me:1951: 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:1953: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1954: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1956: \$? = $ac_status" >&5
+  echo "$as_me:1957: \$? = $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
@@ -1976,34 +1977,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1979: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1980: 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:1985: result: $ac_file" >&5
+echo "$as_me:1986: 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:1990: checking whether the C compiler works" >&5
+echo "$as_me:1991: 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:1996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1999: \$? = $ac_status" >&5
+  echo "$as_me:2000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2006: error: cannot run C compiled programs.
+	{ { echo "$as_me:2007: 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;}
@@ -2011,24 +2012,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2014: result: yes" >&5
+echo "$as_me:2015: 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:2021: checking whether we are cross compiling" >&5
+echo "$as_me:2022: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2023: result: $cross_compiling" >&5
+echo "$as_me:2024: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2026: checking for executable suffix" >&5
+echo "$as_me:2027: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2031: \$? = $ac_status" >&5
+  echo "$as_me:2032: \$? = $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
@@ -2044,25 +2045,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2047: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2048: 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:2053: result: $ac_cv_exeext" >&5
+echo "$as_me:2054: 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:2059: checking for object suffix" >&5
+echo "$as_me:2060: 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 2065 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 
 int
@@ -2074,10 +2075,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2080: \$? = $ac_status" >&5
+  echo "$as_me:2081: \$? = $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
@@ -2089,24 +2090,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2092: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2093: 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:2099: result: $ac_cv_objext" >&5
+echo "$as_me:2100: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2103: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2104: 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 2109 "configure"
+#line 2110 "configure"
 #include "confdefs.h"
 
 int
@@ -2121,16 +2122,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2127: \$? = $ac_status" >&5
+  echo "$as_me:2128: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2133: \$? = $ac_status" >&5
+  echo "$as_me:2134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2142,19 +2143,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2145: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2146: 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:2151: checking whether $CC accepts -g" >&5
+echo "$as_me:2152: 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 2157 "configure"
+#line 2158 "configure"
 #include "confdefs.h"
 
 int
@@ -2166,16 +2167,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2172: \$? = $ac_status" >&5
+  echo "$as_me:2173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2178: \$? = $ac_status" >&5
+  echo "$as_me:2179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2185,7 +2186,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2188: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2189: 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
@@ -2212,16 +2213,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2218: \$? = $ac_status" >&5
+  echo "$as_me:2219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2224: \$? = $ac_status" >&5
+  echo "$as_me:2225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2233,7 +2234,7 @@ if { (eval echo "$as_me:2215: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2236 "configure"
+#line 2237 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2246,16 +2247,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2252: \$? = $ac_status" >&5
+  echo "$as_me:2253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2258: \$? = $ac_status" >&5
+  echo "$as_me:2259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2265,7 +2266,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2268 "configure"
+#line 2269 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2277,16 +2278,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2283: \$? = $ac_status" >&5
+  echo "$as_me:2284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2289: \$? = $ac_status" >&5
+  echo "$as_me:2290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2316,11 +2317,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2319: checking version of $CC" >&5
+	echo "$as_me:2320: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2323: result: $GCC_VERSION" >&5
+	echo "$as_me:2324: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2329,12 +2330,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2332: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2333: 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 2337 "configure"
+#line 2338 "configure"
 #include "confdefs.h"
 
 int
@@ -2351,16 +2352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2357: \$? = $ac_status" >&5
+  echo "$as_me:2358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2363: \$? = $ac_status" >&5
+  echo "$as_me:2364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2371,7 +2372,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2374: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2375: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2380,11 +2381,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2383: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2384: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2387 "configure"
+#line 2388 "configure"
 #include "confdefs.h"
 
 int
@@ -2401,16 +2402,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2407: \$? = $ac_status" >&5
+  echo "$as_me:2408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2413: \$? = $ac_status" >&5
+  echo "$as_me:2414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2420,7 +2421,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2423: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2424: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2429,30 +2430,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2432: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2433: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2439: checking version of $CC" >&5
+	echo "$as_me:2440: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2443: result: $CLANG_VERSION" >&5
+	echo "$as_me:2444: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2450: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2451: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2455 "configure"
+#line 2456 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2466,16 +2467,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2472: \$? = $ac_status" >&5
+  echo "$as_me:2473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2478: \$? = $ac_status" >&5
+  echo "$as_me:2479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2486,13 +2487,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2489: result: $cf_clang_optok" >&5
+		echo "$as_me:2490: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2495: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2496: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2501,7 +2502,7 @@ echo "${as_me:-configure}:2495: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2504: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2505: 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
@@ -2509,7 +2510,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2512 "configure"
+#line 2513 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2556,16 +2557,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2562: \$? = $ac_status" >&5
+  echo "$as_me:2563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2568: \$? = $ac_status" >&5
+  echo "$as_me:2569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2582,10 +2583,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2585: result: none needed" >&5
+    echo "$as_me:2586: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2588: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2589: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2593,13 +2594,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2596: checking \$CFLAGS variable" >&5
+echo "$as_me:2597: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2600: result: broken" >&5
+	echo "$as_me:2601: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2602: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2603: 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=
@@ -2707,18 +2708,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2710: result: ok" >&5
+	echo "$as_me:2711: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2715: checking \$CC variable" >&5
+echo "$as_me:2716: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2719: result: broken" >&5
+	echo "$as_me:2720: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2721: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2722: 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/[ ]*[ ]-[^ ].*//'`
@@ -2835,19 +2836,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2838: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2839: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2842: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2843: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2846: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2847: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2850: result: ok" >&5
+	echo "$as_me:2851: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2858,7 +2859,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2861: checking how to run the C preprocessor" >&5
+echo "$as_me:2862: 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
@@ -2879,18 +2880,18 @@ do
   # 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 2882 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2887: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2893: \$? = $ac_status" >&5
+  echo "$as_me:2894: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2913,17 +2914,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2916 "configure"
+#line 2917 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2920: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2926: \$? = $ac_status" >&5
+  echo "$as_me:2927: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2960,7 +2961,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2963: result: $CPP" >&5
+echo "$as_me:2964: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2970,18 +2971,18 @@ do
   # 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 2973 "configure"
+#line 2974 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2978: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2979: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2984: \$? = $ac_status" >&5
+  echo "$as_me:2985: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3004,17 +3005,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3007 "configure"
+#line 3008 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3012: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3017: \$? = $ac_status" >&5
+  echo "$as_me:3018: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3042,7 +3043,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3045: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3046: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3055,14 +3056,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3058: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3059: 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 3065 "configure"
+#line 3066 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3077,7 +3078,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3080 "configure"
+#line 3081 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3090,14 +3091,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3093: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3094: 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:3100: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3101: 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
@@ -3112,15 +3113,15 @@ CF_EOF
 # 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:3115: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3118: \$? = $ac_status" >&5
+  echo "$as_me:3119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3120: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3123: \$? = $ac_status" >&5
+  echo "$as_me:3124: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3131,10 +3132,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3134: result: yes" >&5
+  echo "$as_me:3135: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3137: result: no" >&5
+  echo "$as_me:3138: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3148,7 +3149,7 @@ else
 	(*) 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:3151: checking for $ac_word" >&5
+echo "$as_me:3152: 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
@@ -3165,7 +3166,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3168: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3169: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3176,10 +3177,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3179: result: $LDCONFIG" >&5
+  echo "$as_me:3180: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3182: result: no" >&5
+  echo "$as_me:3183: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3187,7 +3188,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3190: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3191: 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.
@@ -3197,7 +3198,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3200: result: $cf_with_cxx" >&5
+echo "$as_me:3201: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3215,7 +3216,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3218: checking for $ac_word" >&5
+echo "$as_me:3219: 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
@@ -3230,7 +3231,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3233: found $ac_dir/$ac_word" >&5
+echo "$as_me:3234: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3238,10 +3239,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3241: result: $CXX" >&5
+  echo "$as_me:3242: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3244: result: no" >&5
+  echo "$as_me:3245: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3254,7 +3255,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3257: checking for $ac_word" >&5
+echo "$as_me:3258: 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
@@ -3269,7 +3270,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3272: found $ac_dir/$ac_word" >&5
+echo "$as_me:3273: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3277,10 +3278,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3280: result: $ac_ct_CXX" >&5
+  echo "$as_me:3281: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3283: result: no" >&5
+  echo "$as_me:3284: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3292,32 +3293,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3295:" \
+echo "$as_me:3296:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3298: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3299: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3301: \$? = $ac_status" >&5
+  echo "$as_me:3302: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3303: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3304: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3306: \$? = $ac_status" >&5
+  echo "$as_me:3307: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3308: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3309: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3311: \$? = $ac_status" >&5
+  echo "$as_me:3312: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3314: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3315: 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 3320 "configure"
+#line 3321 "configure"
 #include "confdefs.h"
 
 int
@@ -3332,16 +3333,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3338: \$? = $ac_status" >&5
+  echo "$as_me:3339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3344: \$? = $ac_status" >&5
+  echo "$as_me:3345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3353,19 +3354,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3356: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3357: 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:3362: checking whether $CXX accepts -g" >&5
+echo "$as_me:3363: 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 3368 "configure"
+#line 3369 "configure"
 #include "confdefs.h"
 
 int
@@ -3377,16 +3378,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3383: \$? = $ac_status" >&5
+  echo "$as_me:3384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3389: \$? = $ac_status" >&5
+  echo "$as_me:3390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3396,7 +3397,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3399: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3400: 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
@@ -3423,7 +3424,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3426 "configure"
+#line 3427 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3436,16 +3437,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3442: \$? = $ac_status" >&5
+  echo "$as_me:3443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3448: \$? = $ac_status" >&5
+  echo "$as_me:3449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3455,7 +3456,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3458 "configure"
+#line 3459 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3467,16 +3468,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3473: \$? = $ac_status" >&5
+  echo "$as_me:3474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3479: \$? = $ac_status" >&5
+  echo "$as_me:3480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3510,7 +3511,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3513: checking if $CXX works" >&5
+		echo "$as_me:3514: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3518,7 +3519,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3521 "configure"
+#line 3522 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3535,16 +3536,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3541: \$? = $ac_status" >&5
+  echo "$as_me:3542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3547: \$? = $ac_status" >&5
+  echo "$as_me:3548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3555,11 +3556,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3558: result: $cf_cxx_works" >&5
+		echo "$as_me:3559: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3562: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3563: 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
@@ -3575,7 +3576,7 @@ ac_main_return="return"
 	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:3578: checking for $ac_word" >&5
+echo "$as_me:3579: 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
@@ -3592,7 +3593,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3595: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3596: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3603,17 +3604,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3606: result: $CXX" >&5
+  echo "$as_me:3607: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3609: result: no" >&5
+  echo "$as_me:3610: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3616: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3617: 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="";
 		;;
@@ -3622,7 +3623,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3625: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3626: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3630,7 +3631,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3633: result: $GXX_VERSION" >&5
+	echo "$as_me:3634: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3638,12 +3639,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3641: WARNING: templates do not work" >&5
+	{ echo "$as_me:3642: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3646: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3647: 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.
@@ -3653,15 +3654,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3656: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3657: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3659: checking if you want to build with Ada" >&5
+echo "$as_me:3660: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3661: result: $cf_with_ada" >&5
+echo "$as_me:3662: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3664: checking if you want to install terminal database" >&5
+echo "$as_me:3665: 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.
@@ -3671,10 +3672,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3674: result: $cf_with_db_install" >&5
+echo "$as_me:3675: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3677: checking if you want to install manpages" >&5
+echo "$as_me:3678: 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.
@@ -3684,10 +3685,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3687: result: $cf_with_manpages" >&5
+echo "$as_me:3688: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3690: checking if you want to build programs such as tic" >&5
+echo "$as_me:3691: 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.
@@ -3697,10 +3698,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3700: result: $cf_with_progs" >&5
+echo "$as_me:3701: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3703: checking if you want to build test-programs" >&5
+echo "$as_me:3704: 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.
@@ -3710,10 +3711,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3713: result: $cf_with_tests" >&5
+echo "$as_me:3714: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3716: checking if you wish to install curses.h" >&5
+echo "$as_me:3717: 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.
@@ -3723,7 +3724,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3726: result: $with_curses_h" >&5
+echo "$as_me:3727: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3747,7 +3748,7 @@ for ac_prog in mawk gawk nawk awk
 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:3750: checking for $ac_word" >&5
+echo "$as_me:3751: 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
@@ -3762,7 +3763,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3765: found $ac_dir/$ac_word" >&5
+echo "$as_me:3766: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3770,17 +3771,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3773: result: $AWK" >&5
+  echo "$as_me:3774: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3776: result: no" >&5
+  echo "$as_me:3777: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3783: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3784: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3796,7 +3797,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3799: checking for a BSD compatible install" >&5
+echo "$as_me:3800: 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
@@ -3845,7 +3846,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3848: result: $INSTALL" >&5
+echo "$as_me:3849: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3870,7 +3871,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3873: checking for $ac_word" >&5
+echo "$as_me:3874: 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
@@ -3885,7 +3886,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3888: found $ac_dir/$ac_word" >&5
+echo "$as_me:3889: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3893,10 +3894,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3896: result: $LINT" >&5
+  echo "$as_me:3897: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3899: result: no" >&5
+  echo "$as_me:3900: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3909,18 +3910,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3912: checking whether ln -s works" >&5
+echo "$as_me:3913: 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:3916: result: yes" >&5
+  echo "$as_me:3917: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3919: result: no, using $LN_S" >&5
+  echo "$as_me:3920: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3923: checking if $LN_S -f options work" >&5
+echo "$as_me:3924: 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
@@ -3932,12 +3933,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3935: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3936: 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:3940: checking for long file names" >&5
+echo "$as_me:3941: 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
@@ -3976,7 +3977,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3979: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3980: 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
 
@@ -3995,7 +3996,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:3998: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:3999: 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"
@@ -4005,7 +4006,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4008: checking if you want to use pkg-config" >&5
+echo "$as_me:4009: 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.
@@ -4015,7 +4016,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4018: result: $cf_pkg_config" >&5
+echo "$as_me:4019: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4027,7 +4028,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4030: checking for $ac_word" >&5
+echo "$as_me:4031: 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
@@ -4044,7 +4045,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4047: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4048: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4055,10 +4056,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4058: result: $PKG_CONFIG" >&5
+  echo "$as_me:4059: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4061: result: no" >&5
+  echo "$as_me:4062: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4067,7 +4068,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4070: checking for $ac_word" >&5
+echo "$as_me:4071: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4084,7 +4085,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4087: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4088: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4096,10 +4097,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4099: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4100: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4102: result: no" >&5
+  echo "$as_me:4103: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4142,24 +4143,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4145: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4146: 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:4152: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4153: 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:4158: checking for pkg-config library directory" >&5
+	echo "$as_me:4159: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4162: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4163: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4186,7 +4187,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4189: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4190: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4197,16 +4198,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4200: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4201: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4205: result: auto" >&5
+	echo "$as_me:4206: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4209: checking for search-list" >&5
+	echo "$as_me:4210: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4233,11 +4234,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4236: result: $cf_search_path" >&5
+	echo "$as_me:4237: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4240: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4241: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4245,7 +4246,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4248: checking for first directory" >&5
+	echo "$as_me:4249: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4256,7 +4257,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4259: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4260: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4266,7 +4267,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4269: checking for workaround" >&5
+		echo "$as_me:4270: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4289,17 +4290,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4292: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4293: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4299: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4300: 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:4302: checking if we should install .pc files" >&5
+	echo "$as_me:4303: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4310,7 +4311,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4313: result: $enable_pc_files" >&5
+echo "$as_me:4314: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4318,7 +4319,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4321: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4322: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4349,7 +4350,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4352: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4353: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4363,7 +4364,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4366: checking for suffix to add to pc-files" >&5
+	echo "$as_me:4367: 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.
@@ -4378,13 +4379,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4381: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4382: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4387: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4388: 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.
@@ -4394,11 +4395,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4397: result: $enable_mixedcase" >&5
+echo "$as_me:4398: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4401: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4402: 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
@@ -4425,7 +4426,7 @@ else
 fi
 
 fi
-echo "$as_me:4428: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4429: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4444,7 +4445,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4447: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4448: 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
@@ -4464,16 +4465,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4467: result: yes" >&5
+  echo "$as_me:4468: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4471: result: no" >&5
+  echo "$as_me:4472: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4476: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4477: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4528,7 +4529,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4531: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4532: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4539,7 +4540,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4542: checking for $ac_word" >&5
+echo "$as_me:4543: 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
@@ -4554,7 +4555,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4557: found $ac_dir/$ac_word" >&5
+echo "$as_me:4558: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4562,10 +4563,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4565: result: $CTAGS" >&5
+  echo "$as_me:4566: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4568: result: no" >&5
+  echo "$as_me:4569: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4576,7 +4577,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4579: checking for $ac_word" >&5
+echo "$as_me:4580: 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
@@ -4591,7 +4592,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4594: found $ac_dir/$ac_word" >&5
+echo "$as_me:4595: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4599,10 +4600,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4602: result: $ETAGS" >&5
+  echo "$as_me:4603: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4605: result: no" >&5
+  echo "$as_me:4606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4611,7 +4612,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me: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_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4626,7 +4627,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4629: found $ac_dir/$ac_word" >&5
+echo "$as_me:4630: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4635,17 +4636,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4638: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4639: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4641: result: no" >&5
+  echo "$as_me:4642: 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:4648: checking for $ac_word" >&5
+echo "$as_me:4649: 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
@@ -4660,7 +4661,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4663: found $ac_dir/$ac_word" >&5
+echo "$as_me:4664: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4669,10 +4670,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4672: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4673: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4675: result: no" >&5
+  echo "$as_me:4676: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4692,7 +4693,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4695: checking for makeflags variable" >&5
+echo "$as_me:4696: 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
@@ -4722,7 +4723,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4725: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4726: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4730,13 +4731,13 @@ echo "${as_me:-configure}:4725: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4733: result: $cf_cv_makeflags" >&5
+echo "$as_me:4734: 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:4739: checking for $ac_word" >&5
+echo "$as_me:4740: 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
@@ -4751,7 +4752,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4754: found $ac_dir/$ac_word" >&5
+echo "$as_me:4755: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4759,10 +4760,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4762: result: $RANLIB" >&5
+  echo "$as_me:4763: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4765: result: no" >&5
+  echo "$as_me:4766: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4771,7 +4772,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4774: checking for $ac_word" >&5
+echo "$as_me:4775: 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
@@ -4786,7 +4787,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4789: found $ac_dir/$ac_word" >&5
+echo "$as_me:4790: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4795,10 +4796,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4798: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4799: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4801: result: no" >&5
+  echo "$as_me:4802: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4810,7 +4811,7 @@ fi
 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:4813: checking for $ac_word" >&5
+echo "$as_me:4814: 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
@@ -4825,7 +4826,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4828: found $ac_dir/$ac_word" >&5
+echo "$as_me:4829: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4833,10 +4834,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4836: result: $LD" >&5
+  echo "$as_me:4837: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4839: result: no" >&5
+  echo "$as_me:4840: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4845,7 +4846,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4848: checking for $ac_word" >&5
+echo "$as_me:4849: 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
@@ -4860,7 +4861,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4863: found $ac_dir/$ac_word" >&5
+echo "$as_me:4864: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4869,10 +4870,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4872: result: $ac_ct_LD" >&5
+  echo "$as_me:4873: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4875: result: no" >&5
+  echo "$as_me:4876: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4884,7 +4885,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4887: checking for $ac_word" >&5
+echo "$as_me:4888: 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
@@ -4899,7 +4900,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4902: found $ac_dir/$ac_word" >&5
+echo "$as_me:4903: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4907,10 +4908,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4910: result: $AR" >&5
+  echo "$as_me:4911: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4913: result: no" >&5
+  echo "$as_me:4914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4919,7 +4920,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4922: checking for $ac_word" >&5
+echo "$as_me:4923: 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
@@ -4934,7 +4935,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4937: found $ac_dir/$ac_word" >&5
+echo "$as_me:4938: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4943,10 +4944,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4946: result: $ac_ct_AR" >&5
+  echo "$as_me:4947: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4949: result: no" >&5
+  echo "$as_me:4950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4958,7 +4959,7 @@ fi
 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:4961: checking for $ac_word" >&5
+echo "$as_me:4962: 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
@@ -4973,7 +4974,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4976: found $ac_dir/$ac_word" >&5
+echo "$as_me:4977: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4981,10 +4982,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4984: result: $NM" >&5
+  echo "$as_me:4985: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4987: result: no" >&5
+  echo "$as_me:4988: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4993,7 +4994,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:4996: checking for $ac_word" >&5
+echo "$as_me:4997: 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
@@ -5008,7 +5009,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5011: found $ac_dir/$ac_word" >&5
+echo "$as_me:5012: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5017,10 +5018,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5020: result: $ac_ct_NM" >&5
+  echo "$as_me:5021: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5023: result: no" >&5
+  echo "$as_me:5024: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5032,7 +5033,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5035: checking for $ac_word" >&5
+echo "$as_me:5036: 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
@@ -5047,7 +5048,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5050: found $ac_dir/$ac_word" >&5
+echo "$as_me:5051: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5055,10 +5056,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5058: result: $AR" >&5
+  echo "$as_me:5059: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5061: result: no" >&5
+  echo "$as_me:5062: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5067,7 +5068,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5070: checking for $ac_word" >&5
+echo "$as_me:5071: 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
@@ -5082,7 +5083,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5085: found $ac_dir/$ac_word" >&5
+echo "$as_me:5086: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5091,10 +5092,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5094: result: $ac_ct_AR" >&5
+  echo "$as_me:5095: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5097: result: no" >&5
+  echo "$as_me:5098: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5103,7 +5104,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5106: checking for options to update archives" >&5
+echo "$as_me:5107: 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
@@ -5140,13 +5141,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5143 "configure"
+#line 5144 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5146: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5149: \$? = $ac_status" >&5
+  echo "$as_me:5150: \$? = $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
@@ -5157,7 +5158,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5160: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5161: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5167,7 +5168,7 @@ echo "${as_me:-configure}:5160: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5170: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5171: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5178,7 +5179,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5181: checking if you have specified an install-prefix" >&5
+echo "$as_me:5182: 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.
@@ -5191,7 +5192,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5194: result: $DESTDIR" >&5
+echo "$as_me:5195: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -5226,7 +5227,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5229: checking for $ac_word" >&5
+echo "$as_me:5230: 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
@@ -5241,7 +5242,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5244: found $ac_dir/$ac_word" >&5
+echo "$as_me:5245: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5249,10 +5250,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5252: result: $BUILD_CC" >&5
+  echo "$as_me:5253: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5255: result: no" >&5
+  echo "$as_me:5256: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5261,12 +5262,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5264: checking for native build C compiler" >&5
+	echo "$as_me:5265: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5266: result: $BUILD_CC" >&5
+	echo "$as_me:5267: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5269: checking for native build C preprocessor" >&5
+	echo "$as_me:5270: 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.
@@ -5276,10 +5277,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5279: result: $BUILD_CPP" >&5
+	echo "$as_me:5280: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5282: checking for native build C flags" >&5
+	echo "$as_me:5283: 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.
@@ -5287,10 +5288,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5290: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5291: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5293: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5294: 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.
@@ -5298,10 +5299,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5301: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5302: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5304: checking for native build linker-flags" >&5
+	echo "$as_me:5305: 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.
@@ -5309,10 +5310,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5312: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5313: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5315: checking for native build linker-libraries" >&5
+	echo "$as_me:5316: 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.
@@ -5320,7 +5321,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5323: result: $BUILD_LIBS" >&5
+	echo "$as_me:5324: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5329,7 +5330,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5332: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5333: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5343,7 +5344,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5346 "configure"
+#line 5347 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5353,15 +5354,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5359: \$? = $ac_status" >&5
+  echo "$as_me:5360: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5364: \$? = $ac_status" >&5
+  echo "$as_me:5365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5376,12 +5377,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5379: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5380: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5384: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5385: 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;}
@@ -5406,7 +5407,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5409: checking if libtool -version-number should be used" >&5
+echo "$as_me:5410: 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.
@@ -5423,7 +5424,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5426: result: $cf_libtool_version" >&5
+echo "$as_me:5427: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5432,25 +5433,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5435: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5436: 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}:5442: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5443: 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}:5449: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5450: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5453: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5454: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5472,7 +5473,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5475: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5476: 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.
@@ -5482,7 +5483,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5485: result: $with_libtool" >&5
+echo "$as_me:5486: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5513,7 +5514,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5516: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5517: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5526,7 +5527,7 @@ esac
   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:5529: checking for $ac_word" >&5
+echo "$as_me:5530: 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
@@ -5541,7 +5542,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5544: found $ac_dir/$ac_word" >&5
+echo "$as_me:5545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5549,10 +5550,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5552: result: $LIBTOOL" >&5
+  echo "$as_me:5553: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5555: result: no" >&5
+  echo "$as_me:5556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5565,7 +5566,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5568: checking for $ac_word" >&5
+echo "$as_me:5569: 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
@@ -5580,7 +5581,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5583: found $ac_dir/$ac_word" >&5
+echo "$as_me:5584: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5588,10 +5589,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5591: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5592: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5594: result: no" >&5
+  echo "$as_me:5595: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5622,7 +5623,7 @@ unset LIBTOOL
   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:5625: checking for $ac_word" >&5
+echo "$as_me:5626: 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
@@ -5637,7 +5638,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5640: found $ac_dir/$ac_word" >&5
+echo "$as_me:5641: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5645,10 +5646,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5648: result: $LIBTOOL" >&5
+  echo "$as_me:5649: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5651: result: no" >&5
+  echo "$as_me:5652: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5661,7 +5662,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5664: checking for $ac_word" >&5
+echo "$as_me:5665: 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
@@ -5676,7 +5677,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5679: found $ac_dir/$ac_word" >&5
+echo "$as_me:5680: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5684,10 +5685,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5687: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5688: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5690: result: no" >&5
+  echo "$as_me:5691: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5709,7 +5710,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5712: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5713: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5725,7 +5726,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5728: checking version of $LIBTOOL" >&5
+	echo "$as_me:5729: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5736,7 +5737,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5739: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5740: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5745,18 +5746,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5748: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5749: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5754: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5755: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5759: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5760: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5792,7 +5793,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5795: checking if you want to build shared libraries" >&5
+echo "$as_me:5796: 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.
@@ -5802,11 +5803,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5805: result: $with_shared" >&5
+echo "$as_me:5806: 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:5809: checking if you want to build static libraries" >&5
+echo "$as_me:5810: 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.
@@ -5816,11 +5817,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5819: result: $with_normal" >&5
+echo "$as_me:5820: 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:5823: checking if you want to build debug libraries" >&5
+echo "$as_me:5824: 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.
@@ -5830,11 +5831,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5833: result: $with_debug" >&5
+echo "$as_me:5834: 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:5837: checking if you want to build profiling libraries" >&5
+echo "$as_me:5838: 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.
@@ -5844,7 +5845,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5847: result: $with_profile" >&5
+echo "$as_me:5848: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5852,7 +5853,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5855: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5856: 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.
@@ -5862,26 +5863,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5865: result: $with_shared_cxx" >&5
+echo "$as_me:5866: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5872: checking for specified models" >&5
+echo "$as_me:5873: 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:5876: result: $cf_list_models" >&5
+echo "$as_me:5877: 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:5881: checking for default model" >&5
+echo "$as_me:5882: 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:5884: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5885: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5895,7 +5896,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5898: checking if you want to have a library-prefix" >&5
+echo "$as_me:5899: 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.
@@ -5905,7 +5906,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5908: result: $with_lib_prefix" >&5
+echo "$as_me:5909: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5936,24 +5937,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5939: checking for PATH separator" >&5
+	echo "$as_me:5940: 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:5946: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5947: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5950: checking for ANSI C header files" >&5
+echo "$as_me:5951: 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 5956 "configure"
+#line 5957 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5961,13 +5962,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5965: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5970: \$? = $ac_status" >&5
+  echo "$as_me:5971: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5989,7 +5990,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5992 "configure"
+#line 5993 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6007,7 +6008,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6010 "configure"
+#line 6011 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6028,7 +6029,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6031 "configure"
+#line 6032 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6054,15 +6055,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6060: \$? = $ac_status" >&5
+  echo "$as_me:6061: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6065: \$? = $ac_status" >&5
+  echo "$as_me:6066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6075,7 +6076,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6078: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6079: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6091,28 +6092,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6094: checking for $ac_header" >&5
+echo "$as_me:6095: 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 6100 "configure"
+#line 6101 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6109: \$? = $ac_status" >&5
+  echo "$as_me:6110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6115: \$? = $ac_status" >&5
+  echo "$as_me:6116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6122,7 +6123,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6125: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6126: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6132,13 +6133,13 @@ EOF
 fi
 done
 
-echo "$as_me:6135: checking whether exit is declared" >&5
+echo "$as_me:6136: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6141 "configure"
+#line 6142 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6153,16 +6154,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6159: \$? = $ac_status" >&5
+  echo "$as_me:6160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6165: \$? = $ac_status" >&5
+  echo "$as_me:6166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6172,19 +6173,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6175: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6176: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6181: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6182: 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 6187 "configure"
+#line 6188 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6199,16 +6200,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6205: \$? = $ac_status" >&5
+  echo "$as_me:6206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6211: \$? = $ac_status" >&5
+  echo "$as_me:6212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6218,7 +6219,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6221: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6222: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6231,7 +6232,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6234: checking for opendir in -ldir" >&5
+  echo "$as_me:6235: 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
@@ -6239,7 +6240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6242 "configure"
+#line 6243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6258,16 +6259,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6264: \$? = $ac_status" >&5
+  echo "$as_me:6265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6270: \$? = $ac_status" >&5
+  echo "$as_me:6271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6278,14 +6279,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6281: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6282: 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:6288: checking for opendir in -lx" >&5
+  echo "$as_me:6289: 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
@@ -6293,7 +6294,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6296 "configure"
+#line 6297 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6312,16 +6313,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6318: \$? = $ac_status" >&5
+  echo "$as_me:6319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6324: \$? = $ac_status" >&5
+  echo "$as_me:6325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6332,7 +6333,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6335: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6336: 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"
@@ -6342,7 +6343,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6345: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6346: 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.
@@ -6352,10 +6353,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6355: result: $with_termlib" >&5
+echo "$as_me:6356: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6358: checking if you want to build a separate tic library" >&5
+echo "$as_me:6359: 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.
@@ -6365,7 +6366,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6368: result: $with_ticlib" >&5
+echo "$as_me:6369: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6378,7 +6379,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6381: checking for default loader flags" >&5
+echo "$as_me:6382: 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=''   ;;
@@ -6387,13 +6388,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6390: result: $LD_MODEL" >&5
+echo "$as_me:6391: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6396: checking if rpath option should be used" >&5
+echo "$as_me:6397: 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.
@@ -6403,10 +6404,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6406: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6407: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6409: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6410: 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.
@@ -6416,7 +6417,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6419: result: $cf_cv_do_relink" >&5
+echo "$as_me:6420: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6427,7 +6428,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6430: checking for an rpath option" >&5
+	echo "$as_me:6431: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6458,12 +6459,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6461: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6462: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6466: checking if we need a space after rpath option" >&5
+		echo "$as_me:6467: 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"
 
@@ -6484,7 +6485,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6487 "configure"
+#line 6488 "configure"
 #include "confdefs.h"
 
 int
@@ -6496,16 +6497,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6502: \$? = $ac_status" >&5
+  echo "$as_me:6503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6508: \$? = $ac_status" >&5
+  echo "$as_me:6509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6515,7 +6516,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6518: result: $cf_rpath_space" >&5
+		echo "$as_me:6519: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6537,7 +6538,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6540: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:6541: 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.
@@ -6552,9 +6553,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6555: result: $withval" >&5
+		echo "$as_me:6556: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6557: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6558: 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; }; }
 		;;
@@ -6563,7 +6564,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6566: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6567: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6586,14 +6587,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6589: checking which $CC option to use" >&5
+		echo "$as_me:6590: 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 6596 "configure"
+#line 6597 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6605,16 +6606,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6611: \$? = $ac_status" >&5
+  echo "$as_me:6612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6617: \$? = $ac_status" >&5
+  echo "$as_me:6618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6623,7 +6624,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6626: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6627: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6694,7 +6695,7 @@ CF_EOF
 		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:6697: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6698: 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
@@ -6703,7 +6704,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6706 "configure"
+#line 6707 "configure"
 #include "confdefs.h"
 
 int
@@ -6715,16 +6716,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6721: \$? = $ac_status" >&5
+  echo "$as_me:6722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6727: \$? = $ac_status" >&5
+  echo "$as_me:6728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6735,7 +6736,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6738: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6739: 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"
@@ -7085,7 +7086,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7088 "configure"
+#line 7089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7097,16 +7098,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7103: \$? = $ac_status" >&5
+  echo "$as_me:7104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7109: \$? = $ac_status" >&5
+  echo "$as_me:7110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7143,7 +7144,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7146: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7147: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7153,7 +7154,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7156 "${as_me:-configure}"
+#line 7157 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7165,18 +7166,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7168: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7169: 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:7170: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7173: \$? = $ac_status" >&5
+  echo "$as_me:7174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7175: result: yes" >&5
+				echo "$as_me:7176: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7179: result: no" >&5
+				echo "$as_me:7180: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7191,17 +7192,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7194: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7195: 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}:7198: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7199: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7204: checking for additional libtool options" >&5
+echo "$as_me:7205: 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.
@@ -7211,7 +7212,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7214: result: $with_libtool_opts" >&5
+echo "$as_me:7215: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7222,7 +7223,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7225: checking if exported-symbols file should be used" >&5
+echo "$as_me:7226: 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.
@@ -7237,7 +7238,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7240: result: $with_export_syms" >&5
+echo "$as_me:7241: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7248,15 +7249,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7251: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7252: 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:7256: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7257: 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 7259 "configure"
+#line 7260 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7268,16 +7269,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7274: \$? = $ac_status" >&5
+  echo "$as_me:7275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7280: \$? = $ac_status" >&5
+  echo "$as_me:7281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7286,18 +7287,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7289: result: $cf_cflags_work" >&5
+		echo "$as_me:7290: 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}:7295: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7296: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7300: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7301: 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.
@@ -7315,18 +7316,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7318: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7319: 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:7323: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7324: 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:7329: result: $with_versioned_syms" >&5
+echo "$as_me:7330: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7342,7 +7343,7 @@ then
 		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}:7345: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7346: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7350,11 +7351,11 @@ echo "${as_me:-configure}:7345: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7353: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7354: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7357: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7358: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7366,7 +7367,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7369: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7370: 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
 
@@ -7403,7 +7404,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7406 "configure"
+#line 7407 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7434,7 +7435,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7437: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7438: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7447,7 +7448,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7450: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7451: 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.
@@ -7457,27 +7458,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7460: result: $with_gpm" >&5
+echo "$as_me:7461: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7464: checking for gpm.h" >&5
+	echo "$as_me:7465: 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 7470 "configure"
+#line 7471 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7474: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7475: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7480: \$? = $ac_status" >&5
+  echo "$as_me:7481: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7496,7 +7497,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7499: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7500: 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
 
@@ -7507,7 +7508,7 @@ EOF
 		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}:7510: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7511: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7515,7 +7516,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7518: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7519: 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
@@ -7523,7 +7524,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7526 "configure"
+#line 7527 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7542,16 +7543,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7548: \$? = $ac_status" >&5
+  echo "$as_me:7549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7554: \$? = $ac_status" >&5
+  echo "$as_me:7555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7562,18 +7563,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7565: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7566: 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:7572: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7573: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7576: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7577: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7584,7 +7585,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7587: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7588: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7593,7 +7594,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7596: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7597: 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.
@@ -7603,18 +7604,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7606: result: $with_dlsym" >&5
+	echo "$as_me:7607: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7611: checking for dlsym" >&5
+echo "$as_me:7612: 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 7617 "configure"
+#line 7618 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7645,16 +7646,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7651: \$? = $ac_status" >&5
+  echo "$as_me:7652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7657: \$? = $ac_status" >&5
+  echo "$as_me:7658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7664,14 +7665,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7667: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7668: 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:7674: checking for dlsym in -ldl" >&5
+echo "$as_me:7675: 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
@@ -7679,7 +7680,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7682 "configure"
+#line 7683 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7698,16 +7699,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7704: \$? = $ac_status" >&5
+  echo "$as_me:7705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7710: \$? = $ac_status" >&5
+  echo "$as_me:7711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7718,7 +7719,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7721: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7722: 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
 
@@ -7747,10 +7748,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7750: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7751: 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 7753 "configure"
+#line 7754 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7768,16 +7769,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7774: \$? = $ac_status" >&5
+  echo "$as_me:7775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7780: \$? = $ac_status" >&5
+  echo "$as_me:7781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7788,15 +7789,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7791: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7792: 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:7796: result: ok" >&5
+	echo "$as_me:7797: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7799: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7800: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7804,12 +7805,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7807: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7808: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7812: checking for soname of gpm library" >&5
+echo "$as_me:7813: 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
@@ -7843,15 +7844,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7846: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7849: \$? = $ac_status" >&5
+  echo "$as_me:7850: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7854: \$? = $ac_status" >&5
+  echo "$as_me:7855: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7862,7 +7863,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7865: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7866: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7930,7 +7931,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7933: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7934: 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
@@ -7938,7 +7939,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7941 "configure"
+#line 7942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7957,16 +7958,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7963: \$? = $ac_status" >&5
+  echo "$as_me:7964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7969: \$? = $ac_status" >&5
+  echo "$as_me:7970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7977,11 +7978,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7980: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7981: 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:7984: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7985: 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
@@ -8005,15 +8006,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8008: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8011: \$? = $ac_status" >&5
+  echo "$as_me:8012: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8013: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8016: \$? = $ac_status" >&5
+  echo "$as_me:8017: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8025,11 +8026,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8028: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8029: 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:8032: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8033: 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
 
@@ -8037,7 +8038,7 @@ fi
 
 fi
 
-echo "$as_me:8040: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8041: 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.
@@ -8046,7 +8047,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8049: result: $with_pcre2" >&5
+echo "$as_me:8050: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8057,17 +8058,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8060: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8061: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8066: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8067: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8070: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8071: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8191,7 +8192,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8194: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8195: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8204,7 +8205,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8207: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8208: 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
@@ -8212,7 +8213,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8215 "configure"
+#line 8216 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8231,16 +8232,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8237: \$? = $ac_status" >&5
+  echo "$as_me:8238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8243: \$? = $ac_status" >&5
+  echo "$as_me:8244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8251,7 +8252,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8254: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8255: 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
 
@@ -8272,7 +8273,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8275: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8276: 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
@@ -8280,7 +8281,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8283 "configure"
+#line 8284 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8299,16 +8300,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8305: \$? = $ac_status" >&5
+  echo "$as_me:8306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8311: \$? = $ac_status" >&5
+  echo "$as_me:8312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8319,7 +8320,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8322: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8323: 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
 
@@ -8340,7 +8341,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8343: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8344: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8355,23 +8356,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8358: checking for $ac_header" >&5
+echo "$as_me:8359: 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 8364 "configure"
+#line 8365 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8368: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8374: \$? = $ac_status" >&5
+  echo "$as_me:8375: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8390,7 +8391,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8393: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8394: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8403,13 +8404,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8406: checking for $ac_func" >&5
+echo "$as_me:8407: 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 8412 "configure"
+#line 8413 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8440,16 +8441,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8446: \$? = $ac_status" >&5
+  echo "$as_me:8447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8452: \$? = $ac_status" >&5
+  echo "$as_me:8453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8459,7 +8460,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8462: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8463: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8473,7 +8474,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8476: checking if you want to use sysmouse" >&5
+echo "$as_me:8477: 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.
@@ -8485,7 +8486,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8488 "configure"
+#line 8489 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8508,16 +8509,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8514: \$? = $ac_status" >&5
+  echo "$as_me:8515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8520: \$? = $ac_status" >&5
+  echo "$as_me:8521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8527,7 +8528,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8530: result: $cf_with_sysmouse" >&5
+echo "$as_me:8531: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8537,7 +8538,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8540: checking if you want to disable library suffixes" >&5
+echo "$as_me:8541: 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.
@@ -8554,13 +8555,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8557: result: $disable_lib_suffixes" >&5
+echo "$as_me:8558: 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:8563: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8564: 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.
@@ -8578,22 +8579,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8581: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8582: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8586: checking for updated LDFLAGS" >&5
+echo "$as_me:8587: 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:8589: result: maybe" >&5
+	echo "$as_me:8590: 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:8596: checking for $ac_word" >&5
+echo "$as_me:8597: 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
@@ -8608,7 +8609,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8611: found $ac_dir/$ac_word" >&5
+echo "$as_me:8612: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8616,10 +8617,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8619: result: $cf_ldd_prog" >&5
+  echo "$as_me:8620: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8622: result: no" >&5
+  echo "$as_me:8623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8633,7 +8634,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8636 "configure"
+#line 8637 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8645,16 +8646,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8651: \$? = $ac_status" >&5
+  echo "$as_me:8652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8657: \$? = $ac_status" >&5
+  echo "$as_me:8658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8682,7 +8683,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8685: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8686: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8694,11 +8695,11 @@ echo "${as_me:-configure}:8685: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8697: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8698: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8701: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8702: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8735,7 +8736,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8738: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8739: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8748,11 +8749,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8751: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8752: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8755: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8756: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8789,7 +8790,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8792: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8793: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8802,14 +8803,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8805: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8806: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8809: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8810: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8812: result: no" >&5
+	echo "$as_me:8813: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8823,7 +8824,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8826: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8827: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8840,7 +8841,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8843: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8844: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8848,7 +8849,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8851: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8852: 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=
 
@@ -8867,11 +8868,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8870: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8871: result: $EXTRA_SUFFIX" >&5
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8874: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8875: 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.
@@ -8881,10 +8882,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8884: result: $with_overwrite" >&5
+echo "$as_me:8885: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8887: checking if external terminfo-database is used" >&5
+echo "$as_me:8888: 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.
@@ -8894,7 +8895,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8897: result: $use_database" >&5
+echo "$as_me:8898: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8910,7 +8911,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8913: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8914: 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.
@@ -8918,10 +8919,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8921: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8922: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8924: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8925: 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.
@@ -8931,13 +8932,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8934: result: $with_hashed_db" >&5
+	echo "$as_me:8935: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8940: checking for list of fallback descriptions" >&5
+echo "$as_me:8941: 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.
@@ -8947,7 +8948,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8950: result: $with_fallback" >&5
+echo "$as_me:8951: result: $with_fallback" >&5
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
@@ -8955,7 +8956,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8958: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8959: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8971,7 +8972,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8974: checking for $ac_word" >&5
+echo "$as_me:8975: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8986,7 +8987,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8989: found $ac_dir/$ac_word" >&5
+echo "$as_me:8990: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8994,10 +8995,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:8997: result: $TIC" >&5
+  echo "$as_me:8998: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9000: result: no" >&5
+  echo "$as_me:9001: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9006,7 +9007,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9009: checking for $ac_word" >&5
+echo "$as_me:9010: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9021,7 +9022,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9024: found $ac_dir/$ac_word" >&5
+echo "$as_me:9025: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9029,10 +9030,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9032: result: $ac_ct_TIC" >&5
+  echo "$as_me:9033: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9035: result: no" >&5
+  echo "$as_me:9036: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9044,7 +9045,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9047: checking for $ac_word" >&5
+echo "$as_me:9048: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9059,7 +9060,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9062: found $ac_dir/$ac_word" >&5
+echo "$as_me:9063: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9067,10 +9068,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9070: result: $INFOCMP" >&5
+  echo "$as_me:9071: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9073: result: no" >&5
+  echo "$as_me:9074: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9079,7 +9080,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9082: checking for $ac_word" >&5
+echo "$as_me:9083: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9094,7 +9095,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9097: found $ac_dir/$ac_word" >&5
+echo "$as_me:9098: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9102,10 +9103,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9105: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9106: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9108: result: no" >&5
+  echo "$as_me:9109: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9120,10 +9121,10 @@ 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:9123: checking for tic program for fallbacks" >&5
+  echo "$as_me:9124: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9126: result: $TIC" >&5
+		echo "$as_me:9127: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9151,7 +9152,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9154: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9155: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9164,7 +9165,7 @@ 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:9167: checking for $ac_word" >&5
+echo "$as_me:9168: 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
@@ -9181,7 +9182,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9184: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9185: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9192,10 +9193,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9195: result: $TIC" >&5
+  echo "$as_me:9196: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9198: result: no" >&5
+  echo "$as_me:9199: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9254,7 +9255,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9257: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9258: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9269,7 +9270,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9272: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9273: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9278,10 +9279,10 @@ 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:9281: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9282: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9284: result: $INFOCMP" >&5
+		echo "$as_me:9285: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9309,7 +9310,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9312: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9313: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9322,7 +9323,7 @@ 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:9325: checking for $ac_word" >&5
+echo "$as_me:9326: 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
@@ -9339,7 +9340,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9342: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9343: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9350,10 +9351,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9353: result: $INFOCMP" >&5
+  echo "$as_me:9354: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9356: result: no" >&5
+  echo "$as_me:9357: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9412,7 +9413,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9415: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9416: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9427,7 +9428,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9430: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9431: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9437,7 +9438,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9440: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9441: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9445,7 +9446,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9448: checking if you want modern xterm or antique" >&5
+echo "$as_me:9449: 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.
@@ -9459,7 +9460,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9462: result: $with_xterm_new" >&5
+echo "$as_me:9463: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9472,7 +9473,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9475: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9476: 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.
@@ -9493,13 +9494,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9496: result: $with_xterm_kbs" >&5
+echo "$as_me:9497: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9502: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
+	{ echo "$as_me:9503: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;}
 fi
 
@@ -9509,7 +9510,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9512: checking for list of terminfo directories" >&5
+echo "$as_me:9513: 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.
@@ -9549,7 +9550,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9552: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9553: 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; }; }
 	;;
@@ -9572,7 +9573,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9575: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9576: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9581,13 +9582,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9584: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9585: 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:9590: checking for default terminfo directory" >&5
+echo "$as_me:9591: 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.
@@ -9623,7 +9624,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9626: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9627: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9632,7 +9633,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9635: result: $TERMINFO" >&5
+echo "$as_me:9636: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9643,7 +9644,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9646: checking if big-core option selected" >&5
+echo "$as_me:9647: 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.
@@ -9655,7 +9656,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9658 "configure"
+#line 9659 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9669,15 +9670,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9675: \$? = $ac_status" >&5
+  echo "$as_me:9676: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9680: \$? = $ac_status" >&5
+  echo "$as_me:9681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9689,7 +9690,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9692: result: $with_big_core" >&5
+echo "$as_me:9693: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9699,7 +9700,7 @@ EOF
 ### 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:9702: checking if big-strings option selected" >&5
+echo "$as_me:9703: 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.
@@ -9723,14 +9724,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9726: result: $with_big_strings" >&5
+echo "$as_me:9727: 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:9733: checking if you want termcap-fallback support" >&5
+echo "$as_me:9734: 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.
@@ -9740,14 +9741,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9743: result: $with_termcap" >&5
+echo "$as_me:9744: 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:9750: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9751: 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
@@ -9760,13 +9761,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9763: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9764: 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:9769: checking for list of termcap files" >&5
+	echo "$as_me:9770: 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.
@@ -9806,7 +9807,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9809: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9810: 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; }; }
 	;;
@@ -9829,7 +9830,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9832: result: $TERMPATH" >&5
+	echo "$as_me:9833: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9837,7 +9838,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9840: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9841: 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.
@@ -9847,14 +9848,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9850: result: $with_getcap" >&5
+	echo "$as_me:9851: 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:9857: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9858: 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.
@@ -9864,7 +9865,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9867: result: $with_getcap_cache" >&5
+	echo "$as_me:9868: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9874,7 +9875,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9877: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9878: 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.
@@ -9884,14 +9885,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9887: result: $with_home_terminfo" >&5
+echo "$as_me:9888: 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:9894: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9895: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9901,14 +9902,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9904: result: $with_root_environ" >&5
+echo "$as_me:9905: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9911: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9912: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9918,14 +9919,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9921: result: $with_root_access" >&5
+echo "$as_me:9922: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9928: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9929: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9935,7 +9936,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9938: result: $with_setuid_environ" >&5
+echo "$as_me:9939: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9950,23 +9951,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9953: checking for $ac_header" >&5
+echo "$as_me:9954: 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 9959 "configure"
+#line 9960 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9969: \$? = $ac_status" >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9985,7 +9986,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9988: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9989: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10000,13 +10001,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10003: checking for $ac_func" >&5
+echo "$as_me:10004: 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 10009 "configure"
+#line 10010 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10037,16 +10038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10043: \$? = $ac_status" >&5
+  echo "$as_me:10044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10056,7 +10057,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10059: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10060: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10073,13 +10074,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10076: checking for $ac_func" >&5
+echo "$as_me:10077: 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 10082 "configure"
+#line 10083 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10110,16 +10111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10116: \$? = $ac_status" >&5
+  echo "$as_me:10117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10122: \$? = $ac_status" >&5
+  echo "$as_me:10123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10129,7 +10130,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10132: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10133: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10140,7 +10141,7 @@ fi
 done
 
 else
-	echo "$as_me:10143: checking if link/symlink functions work" >&5
+	echo "$as_me:10144: 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
@@ -10153,7 +10154,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10156 "configure"
+#line 10157 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10187,15 +10188,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10191: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10193: \$? = $ac_status" >&5
+  echo "$as_me:10194: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10198: \$? = $ac_status" >&5
+  echo "$as_me:10199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10213,7 +10214,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10216: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10217: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10233,7 +10234,7 @@ with_symlinks=no
 # 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:10236: checking if tic should use symbolic links" >&5
+	echo "$as_me:10237: 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.
@@ -10243,21 +10244,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10246: result: $with_symlinks" >&5
+	echo "$as_me:10247: 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:10253: checking if tic should use hard links" >&5
+	echo "$as_me:10254: 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:10260: result: $with_links" >&5
+	echo "$as_me:10261: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10273,7 +10274,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10276: checking if you want broken-linker support code" >&5
+echo "$as_me:10277: 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.
@@ -10283,7 +10284,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10286: result: $with_broken_linker" >&5
+echo "$as_me:10287: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10297,7 +10298,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10300: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10301: 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.
@@ -10307,7 +10308,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10310: result: $with_bsdpad" >&5
+echo "$as_me:10311: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10326,14 +10327,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10329: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10330: 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 10336 "configure"
+#line 10337 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10352,16 +10353,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10358: \$? = $ac_status" >&5
+  echo "$as_me:10359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10364: \$? = $ac_status" >&5
+  echo "$as_me:10365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10372,7 +10373,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10375: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10376: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10414,14 +10415,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10417: checking if this is the GNU C library" >&5
+echo "$as_me:10418: 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 10424 "configure"
+#line 10425 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10440,16 +10441,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10446: \$? = $ac_status" >&5
+  echo "$as_me:10447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10452: \$? = $ac_status" >&5
+  echo "$as_me:10453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10460,7 +10461,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10463: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10464: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10468,7 +10469,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10471: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10472: 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
@@ -10480,7 +10481,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10483 "configure"
+#line 10484 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10499,16 +10500,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10505: \$? = $ac_status" >&5
+  echo "$as_me:10506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10511: \$? = $ac_status" >&5
+  echo "$as_me:10512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10520,12 +10521,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10523: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10524: 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:10528: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10529: 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
@@ -10630,7 +10631,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10633 "configure"
+#line 10634 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10650,16 +10651,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10662: \$? = $ac_status" >&5
+  echo "$as_me:10663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10670,7 +10671,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10673: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10674: 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
@@ -10679,14 +10680,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10682: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10683: 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 10689 "configure"
+#line 10690 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10701,16 +10702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10707: \$? = $ac_status" >&5
+  echo "$as_me:10708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10713: \$? = $ac_status" >&5
+  echo "$as_me:10714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10817,7 +10818,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10820 "configure"
+#line 10821 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10832,16 +10833,16 @@ main (void)
 }
 _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
   cf_cv_gnu_source=no
 else
@@ -10856,12 +10857,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10859: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10860: 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:10864: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10865: 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
@@ -10871,7 +10872,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10874 "configure"
+#line 10875 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10886,16 +10887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10892: \$? = $ac_status" >&5
+  echo "$as_me:10893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10898: \$? = $ac_status" >&5
+  echo "$as_me:10899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10906,7 +10907,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10909: result: $cf_cv_default_source" >&5
+echo "$as_me:10910: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10943,16 +10944,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10946: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10947: 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}:10952: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10953: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10955 "configure"
+#line 10956 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10967,16 +10968,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10973: \$? = $ac_status" >&5
+  echo "$as_me:10974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10979: \$? = $ac_status" >&5
+  echo "$as_me:10980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -10997,7 +10998,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11000 "configure"
+#line 11001 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11012,16 +11013,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11018: \$? = $ac_status" >&5
+  echo "$as_me:11019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11024: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11032,7 +11033,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11035: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11036: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11040,10 +11041,10 @@ echo "${as_me:-configure}:11035: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11043: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11044: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11046 "configure"
+#line 11047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11058,16 +11059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11070: \$? = $ac_status" >&5
+  echo "$as_me:11071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11083,7 +11084,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11086: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11087: 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
@@ -11200,7 +11201,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11203: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11204: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11232,14 +11233,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11235: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11236: 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 11242 "configure"
+#line 11243 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11257,16 +11258,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11263: \$? = $ac_status" >&5
+  echo "$as_me:11264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11269: \$? = $ac_status" >&5
+  echo "$as_me:11270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11278,7 +11279,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11281 "configure"
+#line 11282 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11296,16 +11297,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11302: \$? = $ac_status" >&5
+  echo "$as_me:11303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11308: \$? = $ac_status" >&5
+  echo "$as_me:11309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11320,7 +11321,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11323: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11324: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11480,16 +11481,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11483: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11484: 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}:11489: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11490: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11492 "configure"
+#line 11493 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11504,16 +11505,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11510: \$? = $ac_status" >&5
+  echo "$as_me:11511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11516: \$? = $ac_status" >&5
+  echo "$as_me:11517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11534,7 +11535,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11537 "configure"
+#line 11538 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11549,16 +11550,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11555: \$? = $ac_status" >&5
+  echo "$as_me:11556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11561: \$? = $ac_status" >&5
+  echo "$as_me:11562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11569,7 +11570,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11573: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11577,10 +11578,10 @@ echo "${as_me:-configure}:11572: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11580: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11581: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11583 "configure"
+#line 11584 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11595,16 +11596,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11601: \$? = $ac_status" >&5
+  echo "$as_me:11602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11620,7 +11621,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11623: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11624: 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
@@ -11733,10 +11734,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11736: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11737: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11739 "configure"
+#line 11740 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11754,23 +11755,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11760: \$? = $ac_status" >&5
+  echo "$as_me:11761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11766: \$? = $ac_status" >&5
+  echo "$as_me:11767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11773: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11774: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11793,7 +11794,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11796: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11797: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11805,7 +11806,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11808: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11809: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11893,7 +11894,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11896: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11897: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11903,7 +11904,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11906: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11907: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11913,7 +11914,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11916: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11917: 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"
@@ -11925,10 +11926,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11928: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11929: 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 11931 "configure"
+#line 11932 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11943,16 +11944,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11949: \$? = $ac_status" >&5
+  echo "$as_me:11950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11955: \$? = $ac_status" >&5
+  echo "$as_me:11956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11961,12 +11962,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11964: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11965: 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 11969 "configure"
+#line 11970 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11981,16 +11982,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11987: \$? = $ac_status" >&5
+  echo "$as_me:11988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11993: \$? = $ac_status" >&5
+  echo "$as_me:11994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12001,19 +12002,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12004: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12005: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12009: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12010: 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 12016 "configure"
+#line 12017 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12031,16 +12032,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12037: \$? = $ac_status" >&5
+  echo "$as_me:12038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12043: \$? = $ac_status" >&5
+  echo "$as_me:12044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12052,7 +12053,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12055 "configure"
+#line 12056 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12070,16 +12071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12076: \$? = $ac_status" >&5
+  echo "$as_me:12077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12082: \$? = $ac_status" >&5
+  echo "$as_me:12083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12094,7 +12095,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12097: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12098: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12245,14 +12246,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12248: checking if SIGWINCH is defined" >&5
+echo "$as_me:12249: 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 12255 "configure"
+#line 12256 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12267,23 +12268,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12273: \$? = $ac_status" >&5
+  echo "$as_me:12274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12279: \$? = $ac_status" >&5
+  echo "$as_me:12280: \$? = $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 12286 "configure"
+#line 12287 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12301,16 +12302,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12307: \$? = $ac_status" >&5
+  echo "$as_me:12308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12313: \$? = $ac_status" >&5
+  echo "$as_me:12314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12324,11 +12325,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12327: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12328: 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:12331: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12332: 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
@@ -12339,7 +12340,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12342 "configure"
+#line 12343 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12361,16 +12362,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12367: \$? = $ac_status" >&5
+  echo "$as_me:12368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12373: \$? = $ac_status" >&5
+  echo "$as_me:12374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12384,7 +12385,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12387: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12388: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12394,13 +12395,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12397: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12398: 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 12403 "configure"
+#line 12404 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12414,16 +12415,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12426: \$? = $ac_status" >&5
+  echo "$as_me:12427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12434,7 +12435,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12437: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12438: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12448,7 +12449,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12451: checking if you want wide-character code" >&5
+echo "$as_me:12452: 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.
@@ -12458,7 +12459,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:12461: result: $with_widec" >&5
+echo "$as_me:12462: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12480,7 +12481,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12483: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12484: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12493,23 +12494,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12496: checking for $ac_header" >&5
+echo "$as_me:12497: 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 12502 "configure"
+#line 12503 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12506: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12507: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12512: \$? = $ac_status" >&5
+  echo "$as_me:12513: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12528,7 +12529,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12531: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12532: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12538,14 +12539,14 @@ EOF
 fi
 done
 
-echo "$as_me:12541: checking if wchar.h can be used as is" >&5
+echo "$as_me:12542: 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 12548 "configure"
+#line 12549 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12567,16 +12568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12573: \$? = $ac_status" >&5
+  echo "$as_me:12574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12579: \$? = $ac_status" >&5
+  echo "$as_me:12580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12586,16 +12587,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12589: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12590: 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:12595: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12596: 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 12598 "configure"
+#line 12599 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12611,16 +12612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
+  echo "$as_me:12618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12629,16 +12630,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12632: result: $cf_result" >&5
+echo "$as_me:12633: 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:12638: checking checking for compatible value versus " >&5
+	echo "$as_me:12639: 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 12641 "configure"
+#line 12642 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12654,16 +12655,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12660: \$? = $ac_status" >&5
+  echo "$as_me:12661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12666: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12672,7 +12673,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12675: result: $cf_result" >&5
+	echo "$as_me:12676: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12682,7 +12683,7 @@ fi
 
 fi
 
-echo "$as_me:12685: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12686: 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
@@ -12753,7 +12754,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12756 "configure"
+#line 12757 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12798,15 +12799,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12804: \$? = $ac_status" >&5
+  echo "$as_me:12805: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12809: \$? = $ac_status" >&5
+  echo "$as_me:12810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12819,7 +12820,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12822: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12823: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12830,13 +12831,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12833: checking for $ac_func" >&5
+echo "$as_me:12834: 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 12839 "configure"
+#line 12840 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12867,16 +12868,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12873: \$? = $ac_status" >&5
+  echo "$as_me:12874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12879: \$? = $ac_status" >&5
+  echo "$as_me:12880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12886,7 +12887,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12889: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12901,23 +12902,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12904: checking for $ac_header" >&5
+echo "$as_me:12905: 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 12910 "configure"
+#line 12911 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12914: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12915: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12920: \$? = $ac_status" >&5
+  echo "$as_me:12921: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12936,7 +12937,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12939: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12940: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12946,7 +12947,7 @@ EOF
 fi
 done
 
-echo "$as_me:12949: checking for multibyte character support" >&5
+echo "$as_me:12950: 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
@@ -12954,7 +12955,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12957 "configure"
+#line 12958 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12971,16 +12972,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12977: \$? = $ac_status" >&5
+  echo "$as_me:12978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12983: \$? = $ac_status" >&5
+  echo "$as_me:12984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12992,12 +12993,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:12995: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12996: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13000 "configure"
+#line 13001 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13010,16 +13011,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13016: \$? = $ac_status" >&5
+  echo "$as_me:13017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13022: \$? = $ac_status" >&5
+  echo "$as_me:13023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13033,7 +13034,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13036 "configure"
+#line 13037 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13046,16 +13047,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13052: \$? = $ac_status" >&5
+  echo "$as_me:13053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13058: \$? = $ac_status" >&5
+  echo "$as_me:13059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13072,9 +13073,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13075: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13076: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13077: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13078: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13165,7 +13166,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13168: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13169: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13173,7 +13174,7 @@ echo "${as_me:-configure}:13168: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13176 "configure"
+#line 13177 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13186,21 +13187,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13192: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13198: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13203: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13204: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13218,7 +13219,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13221: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13222: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13293,13 +13294,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13296: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13297: 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 13302 "configure"
+#line 13303 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13312,21 +13313,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13318: \$? = $ac_status" >&5
+  echo "$as_me:13319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13324: \$? = $ac_status" >&5
+  echo "$as_me:13325: \$? = $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}:13329: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13330: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13368,7 +13369,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13371: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13372: 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
@@ -13406,7 +13407,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13409 "configure"
+#line 13410 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13418,16 +13419,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13424: \$? = $ac_status" >&5
+  echo "$as_me:13425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13430: \$? = $ac_status" >&5
+  echo "$as_me:13431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13444,7 +13445,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13447: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13448: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13480,7 +13481,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13483: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13484: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13512,14 +13513,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13515: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13516: 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 13522 "configure"
+#line 13523 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13537,23 +13538,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13543: \$? = $ac_status" >&5
+  echo "$as_me:13544: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13549: \$? = $ac_status" >&5
+  echo "$as_me:13550: \$? = $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 13556 "configure"
+#line 13557 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13572,16 +13573,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13578: \$? = $ac_status" >&5
+  echo "$as_me:13579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13584: \$? = $ac_status" >&5
+  echo "$as_me:13585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13593,7 +13594,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13596: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13597: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13611,14 +13612,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13614: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13615: 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 13621 "configure"
+#line 13622 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13636,23 +13637,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13642: \$? = $ac_status" >&5
+  echo "$as_me:13643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:13649: \$? = $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 13655 "configure"
+#line 13656 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13671,16 +13672,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13677: \$? = $ac_status" >&5
+  echo "$as_me:13678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13683: \$? = $ac_status" >&5
+  echo "$as_me:13684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13692,7 +13693,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13695: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13696: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13715,14 +13716,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13718: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13719: 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 13725 "configure"
+#line 13726 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13740,23 +13741,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13746: \$? = $ac_status" >&5
+  echo "$as_me:13747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13752: \$? = $ac_status" >&5
+  echo "$as_me:13753: \$? = $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 13759 "configure"
+#line 13760 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13775,16 +13776,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13781: \$? = $ac_status" >&5
+  echo "$as_me:13782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13787: \$? = $ac_status" >&5
+  echo "$as_me:13788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13796,7 +13797,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13799: result: $cf_cv_wint_t" >&5
+echo "$as_me:13800: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13828,7 +13829,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13831: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13832: 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.
@@ -13838,7 +13839,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13841: result: $with_lp64" >&5
+echo "$as_me:13842: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13854,7 +13855,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13857: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13858: 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
@@ -13866,7 +13867,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13869 "configure"
+#line 13870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13886,16 +13887,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13892: \$? = $ac_status" >&5
+  echo "$as_me:13893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13898: \$? = $ac_status" >&5
+  echo "$as_me:13899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13905,16 +13906,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13911: \$? = $ac_status" >&5
+  echo "$as_me:13912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13917: \$? = $ac_status" >&5
+  echo "$as_me:13918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13928,13 +13929,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13931: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13932: 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:13937: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13938: 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
@@ -13942,7 +13943,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13945 "configure"
+#line 13946 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13962,16 +13963,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13965: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13968: \$? = $ac_status" >&5
+  echo "$as_me:13969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13974: \$? = $ac_status" >&5
+  echo "$as_me:13975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13980,7 +13981,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13983 "configure"
+#line 13984 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14001,16 +14002,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14007: \$? = $ac_status" >&5
+  echo "$as_me:14008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14013: \$? = $ac_status" >&5
+  echo "$as_me:14014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14021,7 +14022,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14024: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14025: 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
 
@@ -14031,7 +14032,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14034: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14035: 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
@@ -14039,7 +14040,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14042 "configure"
+#line 14043 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14059,16 +14060,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14065: \$? = $ac_status" >&5
+  echo "$as_me:14066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14077,7 +14078,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14080 "configure"
+#line 14081 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14098,16 +14099,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14104: \$? = $ac_status" >&5
+  echo "$as_me:14105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14110: \$? = $ac_status" >&5
+  echo "$as_me:14111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14118,7 +14119,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14121: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14122: 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
 
@@ -14131,7 +14132,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14134: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14135: 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
@@ -14139,7 +14140,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14142 "configure"
+#line 14143 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14151,16 +14152,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14157: \$? = $ac_status" >&5
+  echo "$as_me:14158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14163: \$? = $ac_status" >&5
+  echo "$as_me:14164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14169,7 +14170,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14172 "configure"
+#line 14173 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14182,16 +14183,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14188: \$? = $ac_status" >&5
+  echo "$as_me:14189: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14194: \$? = $ac_status" >&5
+  echo "$as_me:14195: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14202,7 +14203,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14205: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14206: 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
 
@@ -14216,13 +14217,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14219: checking for fseeko" >&5
+echo "$as_me:14220: 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 14225 "configure"
+#line 14226 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14234,16 +14235,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14240: \$? = $ac_status" >&5
+  echo "$as_me:14241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14246: \$? = $ac_status" >&5
+  echo "$as_me:14247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14253,7 +14254,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14256: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14257: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14292,14 +14293,14 @@ fi
 
 	fi
 
-	echo "$as_me:14295: checking whether to use struct dirent64" >&5
+	echo "$as_me:14296: 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 14302 "configure"
+#line 14303 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14322,16 +14323,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14328: \$? = $ac_status" >&5
+  echo "$as_me:14329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14334: \$? = $ac_status" >&5
+  echo "$as_me:14335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14342,7 +14343,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14345: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14346: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14352,7 +14353,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14355: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14356: 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.
@@ -14362,14 +14363,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14365: result: $with_tparm_varargs" >&5
+echo "$as_me:14366: 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:14372: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14373: 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.
@@ -14379,14 +14380,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14382: result: $with_tic_depends" >&5
+echo "$as_me:14383: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14389: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14390: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14398,15 +14399,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14401: result: no" >&5
+	echo "$as_me:14402: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14405: result: yes" >&5
+	echo "$as_me:14406: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14409: checking for X11 rgb file" >&5
+echo "$as_me:14410: 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.
@@ -14470,7 +14471,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14473: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14474: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14478,7 +14479,7 @@ esac
 
 fi
 
-echo "$as_me:14481: result: $RGB_PATH" >&5
+echo "$as_me:14482: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14492,7 +14493,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14495: checking for type of bool" >&5
+echo "$as_me:14496: 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.
@@ -14502,10 +14503,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14505: result: $NCURSES_BOOL" >&5
+echo "$as_me:14506: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14508: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14509: 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.
@@ -14517,15 +14518,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14520: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14521: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14524: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14525: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14528: checking for type of chtype" >&5
+echo "$as_me:14529: 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.
@@ -14535,11 +14536,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14538: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14539: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14542: checking for type of ospeed" >&5
+echo "$as_me:14543: 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.
@@ -14549,11 +14550,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14552: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14553: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14556: checking for type of mmask_t" >&5
+echo "$as_me:14557: 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.
@@ -14563,11 +14564,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14566: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14567: 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:14570: checking for size CCHARW_MAX" >&5
+echo "$as_me:14571: 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.
@@ -14577,16 +14578,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14580: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14581: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14583: checking for signed char" >&5
+echo "$as_me:14584: 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 14589 "configure"
+#line 14590 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14601,16 +14602,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14607: \$? = $ac_status" >&5
+  echo "$as_me:14608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14613: \$? = $ac_status" >&5
+  echo "$as_me:14614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14620,10 +14621,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14623: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14624: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14626: checking size of signed char" >&5
+echo "$as_me:14627: 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
@@ -14632,7 +14633,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14635 "configure"
+#line 14636 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14644,21 +14645,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14650: \$? = $ac_status" >&5
+  echo "$as_me:14651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14656: \$? = $ac_status" >&5
+  echo "$as_me:14657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14661 "configure"
+#line 14662 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14670,16 +14671,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14676: \$? = $ac_status" >&5
+  echo "$as_me:14677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14682: \$? = $ac_status" >&5
+  echo "$as_me:14683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14695,7 +14696,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14698 "configure"
+#line 14699 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14707,16 +14708,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14713: \$? = $ac_status" >&5
+  echo "$as_me:14714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14719: \$? = $ac_status" >&5
+  echo "$as_me:14720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14732,7 +14733,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14735 "configure"
+#line 14736 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14744,16 +14745,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14750: \$? = $ac_status" >&5
+  echo "$as_me:14751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14756: \$? = $ac_status" >&5
+  echo "$as_me:14757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14766,12 +14767,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14769: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14770: 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 14774 "configure"
+#line 14775 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14787,15 +14788,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14793: \$? = $ac_status" >&5
+  echo "$as_me:14794: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14798: \$? = $ac_status" >&5
+  echo "$as_me:14799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14811,7 +14812,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14814: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14815: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14822,7 +14823,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14825: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14826: 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.
@@ -14832,12 +14833,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14835: result: $with_signed_char" >&5
+echo "$as_me:14836: 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:14840: checking for type of tparm args" >&5
+echo "$as_me:14841: 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.
@@ -14847,11 +14848,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14850: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14851: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14854: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14855: 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.
@@ -14861,7 +14862,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14864: result: $with_rcs_ids" >&5
+echo "$as_me:14865: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14870,7 +14871,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14873: checking format of man-pages" >&5
+echo "$as_me:14874: 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.
@@ -14961,10 +14962,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14964: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14965: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14967: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14968: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15003,7 +15004,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15006: checking for manpage renaming" >&5
+echo "$as_me:15007: 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.
@@ -15032,15 +15033,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15035: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15036: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15040: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15041: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15043: checking if manpage aliases will be installed" >&5
+echo "$as_me:15044: 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.
@@ -15051,7 +15052,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15054: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15055: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15065,7 +15066,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15068: checking if manpage symlinks should be used" >&5
+echo "$as_me:15069: 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.
@@ -15078,17 +15079,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15081: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15082: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15087: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15088: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15091: checking for manpage tbl" >&5
+echo "$as_me:15092: 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.
@@ -15099,7 +15100,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15102: result: $MANPAGE_TBL" >&5
+echo "$as_me:15103: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15416,7 +15417,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15419: checking if you want to build with function extensions" >&5
+echo "$as_me:15420: 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.
@@ -15426,7 +15427,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15429: result: $with_ext_funcs" >&5
+echo "$as_me:15430: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15482,7 +15483,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15485: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15486: 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.
@@ -15492,7 +15493,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15495: result: $with_sp_funcs" >&5
+echo "$as_me:15496: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15511,7 +15512,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15514: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15515: 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.
@@ -15521,7 +15522,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15524: result: $with_term_driver" >&5
+echo "$as_me:15525: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15530,19 +15531,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15533: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15534: 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:15538: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15539: 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:15545: checking for extended use of const keyword" >&5
+echo "$as_me:15546: 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.
@@ -15552,7 +15553,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15555: result: $with_ext_const" >&5
+echo "$as_me:15556: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15560,7 +15561,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15563: checking if you want to use extended colors" >&5
+echo "$as_me:15564: 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.
@@ -15570,12 +15571,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15573: result: $with_ext_colors" >&5
+echo "$as_me:15574: 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:15578: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15579: 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)
@@ -15586,7 +15587,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15589: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15614,7 +15615,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15617: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15618: 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.
@@ -15624,7 +15625,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15627: result: $with_ext_mouse" >&5
+echo "$as_me:15628: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15634,7 +15635,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15637: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15638: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15651,7 +15652,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15654: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15655: 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.
@@ -15661,7 +15662,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15664: result: $with_ext_putwin" >&5
+echo "$as_me:15665: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15671,7 +15672,7 @@ EOF
 
 fi
 
-echo "$as_me:15674: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15675: 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.
@@ -15681,7 +15682,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15684: result: $with_no_padding" >&5
+echo "$as_me:15685: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15689,7 +15690,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15692: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15693: 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.
@@ -15699,7 +15700,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15702: result: $with_sigwinch" >&5
+echo "$as_me:15703: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15707,7 +15708,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15710: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15711: 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.
@@ -15717,7 +15718,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15720: result: $with_tcap_names" >&5
+echo "$as_me:15721: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15731,7 +15732,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15734: checking if you want to link with the pthread library" >&5
+echo "$as_me:15735: 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.
@@ -15741,27 +15742,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15744: result: $with_pthread" >&5
+echo "$as_me:15745: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15748: checking for pthread.h" >&5
+	echo "$as_me:15749: 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 15754 "configure"
+#line 15755 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15758: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15759: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15764: \$? = $ac_status" >&5
+  echo "$as_me:15765: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15780,7 +15781,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15783: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15784: 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
 
@@ -15790,7 +15791,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15793: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15794: 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"
 
@@ -15811,7 +15812,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15814 "configure"
+#line 15815 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15828,16 +15829,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15834: \$? = $ac_status" >&5
+  echo "$as_me:15835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15840: \$? = $ac_status" >&5
+  echo "$as_me:15841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15847,7 +15848,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15850: result: $with_pthread" >&5
+	    echo "$as_me:15851: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15875,7 +15876,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15878: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15879: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15885,13 +15886,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15888: checking for pthread_kill" >&5
+	echo "$as_me:15889: 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 15894 "configure"
+#line 15895 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15922,16 +15923,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15928: \$? = $ac_status" >&5
+  echo "$as_me:15929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15934: \$? = $ac_status" >&5
+  echo "$as_me:15935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15941,11 +15942,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15944: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15945: 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:15948: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15949: 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.
@@ -15955,7 +15956,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15958: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15959: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15966,7 +15967,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15969: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15970: 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.
@@ -15976,18 +15977,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15979: result: $use_weak_symbols" >&5
+	echo "$as_me:15980: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15983: checking if $CC supports weak symbols" >&5
+echo "$as_me:15984: 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 15990 "configure"
+#line 15991 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16013,16 +16014,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16019: \$? = $ac_status" >&5
+  echo "$as_me:16020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16025: \$? = $ac_status" >&5
+  echo "$as_me:16026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16033,7 +16034,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16036: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16037: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16083,7 +16084,7 @@ fi
 # 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:16086: checking if you want reentrant code" >&5
+echo "$as_me:16087: 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.
@@ -16093,7 +16094,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16096: result: $with_reentrant" >&5
+echo "$as_me:16097: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16182,7 +16183,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16185: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16186: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16194,7 +16195,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16197: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16198: 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.
@@ -16216,16 +16217,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16219: result: $enable_opaque_curses" >&5
+echo "$as_me:16220: 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:16224: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16225: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16228: checking if you want opaque form-library structures" >&5
+echo "$as_me:16229: 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.
@@ -16235,10 +16236,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16238: result: $enable_opaque_form" >&5
+echo "$as_me:16239: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16241: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16242: 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.
@@ -16248,10 +16249,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16251: result: $enable_opaque_menu" >&5
+echo "$as_me:16252: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16254: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16255: 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.
@@ -16261,7 +16262,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16264: result: $enable_opaque_panel" >&5
+echo "$as_me:16265: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16271,7 +16272,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16274: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16275: 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.
@@ -16281,7 +16282,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16284: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16285: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16294,7 +16295,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16297: checking if you want all development code" >&5
+echo "$as_me:16298: 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.
@@ -16304,11 +16305,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16307: result: $with_develop" >&5
+echo "$as_me:16308: 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:16311: checking if you want hard-tabs code" >&5
+echo "$as_me:16312: 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.
@@ -16318,7 +16319,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16321: result: $enable_hard_tabs" >&5
+echo "$as_me:16322: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16326,7 +16327,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16329: checking if you want limited support for xmc" >&5
+echo "$as_me:16330: 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.
@@ -16336,7 +16337,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16339: result: $enable_xmc_glitch" >&5
+echo "$as_me:16340: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16346,7 +16347,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16349: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16350: 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.
@@ -16356,7 +16357,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16359: result: $with_assumed_color" >&5
+echo "$as_me:16360: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16364,7 +16365,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16367: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16368: 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.
@@ -16374,7 +16375,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16377: result: $with_hashmap" >&5
+echo "$as_me:16378: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16382,7 +16383,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16385: checking if you want colorfgbg code" >&5
+echo "$as_me:16386: 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.
@@ -16392,7 +16393,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16395: result: $with_colorfgbg" >&5
+echo "$as_me:16396: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16400,7 +16401,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16403: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16404: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16410,14 +16411,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16413: result: $cf_with_fvisibility" >&5
+echo "$as_me:16414: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16420: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16421: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16426,7 +16427,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16429 "configure"
+#line 16430 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16442,16 +16443,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16448: \$? = $ac_status" >&5
+  echo "$as_me:16449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16454: \$? = $ac_status" >&5
+  echo "$as_me:16455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16463,7 +16464,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16466: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16467: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16578,7 +16579,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16581: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16582: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16587,7 +16588,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16590 "configure"
+#line 16591 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16603,16 +16604,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16609: \$? = $ac_status" >&5
+  echo "$as_me:16610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16615: \$? = $ac_status" >&5
+  echo "$as_me:16616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16624,7 +16625,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16627: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16628: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16747,7 +16748,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16750: checking if you want interop bindings" >&5
+echo "$as_me:16751: 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.
@@ -16757,13 +16758,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16760: result: $with_exp_interop" >&5
+echo "$as_me:16761: 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:16766: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16767: 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.
@@ -16773,13 +16774,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16776: result: $with_safe_sprintf" >&5
+echo "$as_me:16777: 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:16782: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16783: 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.
@@ -16789,7 +16790,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16792: result: $with_scroll_hints" >&5
+echo "$as_me:16793: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16798,7 +16799,7 @@ EOF
 
 fi
 
-echo "$as_me:16801: checking if you want wgetch-events code" >&5
+echo "$as_me:16802: 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.
@@ -16808,7 +16809,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16811: result: $with_wgetch_events" >&5
+echo "$as_me:16812: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16823,7 +16824,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16826: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16827: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16833,7 +16834,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16836: result: $with_exp_win32" >&5
+	echo "$as_me:16837: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16859,7 +16860,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16862: checking if you want to see long compiling messages" >&5
+echo "$as_me:16863: 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.
@@ -16893,7 +16894,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16896: result: $enableval" >&5
+echo "$as_me:16897: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16906,7 +16907,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16909: checking if you want to install stripped executables" >&5
+echo "$as_me:16910: 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.
@@ -16923,7 +16924,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16926: result: $enable_stripping" >&5
+echo "$as_me:16927: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16934,7 +16935,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16937: checking if install accepts -p option" >&5
+echo "$as_me:16938: 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
@@ -16965,10 +16966,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16968: result: $cf_cv_install_p" >&5
+echo "$as_me:16969: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16971: checking if install needs to be told about ownership" >&5
+echo "$as_me:16972: 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)
@@ -16979,7 +16980,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16982: result: $with_install_o" >&5
+echo "$as_me:16983: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -16988,6 +16989,72 @@ else
 	INSTALL_OPT_O=
 fi
 
+if test -n "$INSTALL_OPT_S"
+then
+	echo "$as_me:16994: checking if you want to specify strip-program" >&5
+echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+
+# Check whether --with-strip-program or --without-strip-program was given.
+if test "${with_strip_program+set}" = set; then
+  withval="$with_strip_program"
+  with_strip_program=$withval
+else
+  with_strip_program=no
+fi;
+	echo "$as_me:17004: result: $with_strip_program" >&5
+echo "${ECHO_T}$with_strip_program" >&6
+	if test "$with_strip_program" != no
+	then
+		echo "$as_me:17008: checking if strip-program is supported with this installer" >&5
+echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		echo "$as_me:17029: result: $check_install_strip" >&5
+echo "${ECHO_T}$check_install_strip" >&6
+		case "$check_install_strip" in
+		(no)
+			{ echo "$as_me:17033: WARNING: $cf_install_program does not support strip program option" >&5
+echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "$@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+
+echo "${as_me:-configure}:17048: testing created $INSTALL ..." 1>&5
+
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+
 # If we're avoiding relinking of shared libraries during install, that is to
 # avoid modifying the build-tree.  For the same reason, avoid doing ranlib if
 # the install program has "-p" (for preserving timestamps).
@@ -17004,7 +17071,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17007: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17074: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17021,17 +17088,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17024: result: $enable_stdnoreturn" >&5
+echo "$as_me:17091: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17028: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17095: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17034 "configure"
+#line 17101 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17047,16 +17114,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17053: \$? = $ac_status" >&5
+  echo "$as_me:17120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17059: \$? = $ac_status" >&5
+  echo "$as_me:17126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17067,7 +17134,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17070: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17137: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17123,16 +17190,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17126: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17193: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17131: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17198: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17135: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17171,16 +17238,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17174: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17241: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17179: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17246: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17183: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17250: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17219,23 +17286,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17222: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17289: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17227: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17294: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17231: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17298: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17238: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17305: 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.
@@ -17252,7 +17319,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17255: result: $enable_warnings" >&5
+echo "$as_me:17322: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17276,7 +17343,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17279 "configure"
+#line 17346 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17291,26 +17358,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17297: \$? = $ac_status" >&5
+  echo "$as_me:17364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17303: \$? = $ac_status" >&5
+  echo "$as_me:17370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17306: checking for X11/Xt const-feature" >&5
+echo "$as_me:17373: 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 17313 "configure"
+#line 17380 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17327,16 +17394,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17333: \$? = $ac_status" >&5
+  echo "$as_me:17400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17339: \$? = $ac_status" >&5
+  echo "$as_me:17406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17351,7 +17418,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17354: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17421: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17380,7 +17447,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17383 "${as_me:-configure}"
+#line 17450 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17396,7 +17463,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17399: checking for $CC warning options..." >&5
+	{ echo "$as_me:17466: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17412,12 +17479,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17415: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17418: \$? = $ac_status" >&5
+  echo "$as_me:17485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17420: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17487: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17425,7 +17492,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17428: checking for $CC warning options..." >&5
+	{ echo "$as_me:17495: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17448,12 +17515,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17451: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17454: \$? = $ac_status" >&5
+  echo "$as_me:17521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17456: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17523: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17461,7 +17528,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17464: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17531: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17471,7 +17538,7 @@ echo "${as_me:-configure}:17464: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17474: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17541: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17504,10 +17571,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17507: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17574: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17510 "${as_me:-configure}"
+#line 17577 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17557,12 +17624,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17563: \$? = $ac_status" >&5
+  echo "$as_me:17630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17565: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17632: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17634,12 +17701,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17637: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17704: 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 17642 "configure"
+#line 17709 "configure"
 #include "confdefs.h"
 
 int
@@ -17656,16 +17723,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17662: \$? = $ac_status" >&5
+  echo "$as_me:17729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17668: \$? = $ac_status" >&5
+  echo "$as_me:17735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17676,7 +17743,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17679: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17746: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17685,11 +17752,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17688: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17755: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17692 "configure"
+#line 17759 "configure"
 #include "confdefs.h"
 
 int
@@ -17706,16 +17773,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17712: \$? = $ac_status" >&5
+  echo "$as_me:17779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17718: \$? = $ac_status" >&5
+  echo "$as_me:17785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17725,7 +17792,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17728: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17795: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17734,30 +17801,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17737: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17804: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17744: checking version of $CC" >&5
+	echo "$as_me:17811: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17748: result: $CLANG_VERSION" >&5
+	echo "$as_me:17815: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17755: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17822: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17760 "configure"
+#line 17827 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17771,16 +17838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17777: \$? = $ac_status" >&5
+  echo "$as_me:17844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17783: \$? = $ac_status" >&5
+  echo "$as_me:17850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17791,13 +17858,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17794: result: $cf_clang_optok" >&5
+		echo "$as_me:17861: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17800: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17867: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17814,7 +17881,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17817 "configure"
+#line 17884 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17832,7 +17899,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17835: checking for $CC warning options..." >&5
+	{ echo "$as_me:17902: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17849,12 +17916,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17852: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17855: \$? = $ac_status" >&5
+  echo "$as_me:17922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17857: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17924: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17863,7 +17930,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17866: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17933: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17893,16 +17960,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17896: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17899: \$? = $ac_status" >&5
+  echo "$as_me:17966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17901: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17968: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17905: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17972: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17920,7 +17987,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17923: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17990: 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.
@@ -17930,7 +17997,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:17933: result: $enable_string_hacks" >&5
+echo "$as_me:18000: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -17939,15 +18006,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:17942: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18009: 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:17944: checking for strlcat" >&5
+	echo "$as_me:18011: 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 17950 "configure"
+#line 18017 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17978,16 +18045,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17984: \$? = $ac_status" >&5
+  echo "$as_me:18051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17990: \$? = $ac_status" >&5
+  echo "$as_me:18057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -17997,7 +18064,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18000: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18067: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18007,7 +18074,7 @@ EOF
 
 else
 
-		echo "$as_me:18010: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18077: 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
@@ -18015,7 +18082,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18018 "configure"
+#line 18085 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18034,16 +18101,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18040: \$? = $ac_status" >&5
+  echo "$as_me:18107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18046: \$? = $ac_status" >&5
+  echo "$as_me:18113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18054,7 +18121,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18057: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18124: 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
 
@@ -18077,23 +18144,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18080: checking for $ac_header" >&5
+echo "$as_me:18147: 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 18086 "configure"
+#line 18153 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18090: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18096: \$? = $ac_status" >&5
+  echo "$as_me:18163: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18112,7 +18179,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18115: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18133,13 +18200,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18136: checking for $ac_func" >&5
+echo "$as_me:18203: 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 18142 "configure"
+#line 18209 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18170,16 +18237,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18176: \$? = $ac_status" >&5
+  echo "$as_me:18243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18182: \$? = $ac_status" >&5
+  echo "$as_me:18249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18189,7 +18256,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18192: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18259: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18202,7 +18269,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18205: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18272: 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.
@@ -18212,7 +18279,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18215: result: $with_assertions" >&5
+echo "$as_me:18282: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18228,7 +18295,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18231: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18298: 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.
@@ -18250,7 +18317,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18253: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18320: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18364,23 +18431,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18367: checking for dmalloc.h" >&5
+	echo "$as_me:18434: 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 18373 "configure"
+#line 18440 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18377: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18444: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18383: \$? = $ac_status" >&5
+  echo "$as_me:18450: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18399,11 +18466,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18402: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18469: 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:18406: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18473: 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
@@ -18411,7 +18478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18414 "configure"
+#line 18481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18430,16 +18497,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18436: \$? = $ac_status" >&5
+  echo "$as_me:18503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18442: \$? = $ac_status" >&5
+  echo "$as_me:18509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18450,7 +18517,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18453: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18520: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18465,7 +18532,7 @@ fi
 
 fi
 
-echo "$as_me:18468: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18535: 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.
@@ -18487,7 +18554,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18490: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18557: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18601,23 +18668,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18604: checking for dbmalloc.h" >&5
+	echo "$as_me:18671: 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 18610 "configure"
+#line 18677 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18614: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18681: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18620: \$? = $ac_status" >&5
+  echo "$as_me:18687: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18636,11 +18703,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18639: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18706: 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:18643: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18710: 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
@@ -18648,7 +18715,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18651 "configure"
+#line 18718 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18667,16 +18734,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18673: \$? = $ac_status" >&5
+  echo "$as_me:18740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18679: \$? = $ac_status" >&5
+  echo "$as_me:18746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18687,7 +18754,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18690: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18757: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18702,7 +18769,7 @@ fi
 
 fi
 
-echo "$as_me:18705: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18772: 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.
@@ -18724,7 +18791,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18727: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18794: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18837,7 +18904,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18840: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18907: 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.
@@ -18848,7 +18915,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18851: result: $with_no_leaks" >&5
+echo "$as_me:18918: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18900,7 +18967,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18903: checking whether to add trace feature to all models" >&5
+echo "$as_me:18970: 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.
@@ -18910,7 +18977,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18913: result: $cf_with_trace" >&5
+echo "$as_me:18980: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19024,7 +19091,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19027: checking if we want to use GNAT projects" >&5
+echo "$as_me:19094: 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.
@@ -19041,7 +19108,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19044: result: $enable_gnat_projects" >&5
+echo "$as_me:19111: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19054,14 +19121,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19057: checking if ssp library is needed" >&5
+echo "$as_me:19124: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19064 "configure"
+#line 19131 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19078,16 +19145,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19084: \$? = $ac_status" >&5
+  echo "$as_me:19151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19090: \$? = $ac_status" >&5
+  echo "$as_me:19157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19097,7 +19164,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19100 "configure"
+#line 19167 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19114,16 +19181,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19120: \$? = $ac_status" >&5
+  echo "$as_me:19187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19126: \$? = $ac_status" >&5
+  echo "$as_me:19193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19137,7 +19204,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19140: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19207: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19166,14 +19233,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19169: checking if -lm needed for math functions" >&5
+echo "$as_me:19236: 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 19176 "configure"
+#line 19243 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19189,16 +19256,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19195: \$? = $ac_status" >&5
+  echo "$as_me:19262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19201: \$? = $ac_status" >&5
+  echo "$as_me:19268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19208,7 +19275,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19211: result: $cf_cv_need_libm" >&5
+echo "$as_me:19278: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19216,14 +19283,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19219: checking if -lm is available for math functions" >&5
+	echo "$as_me:19286: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19226 "configure"
+#line 19293 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19239,16 +19306,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19245: \$? = $ac_status" >&5
+  echo "$as_me:19312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19251: \$? = $ac_status" >&5
+  echo "$as_me:19318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19258,7 +19325,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19261: result: $cf_cv_have_libm" >&5
+echo "$as_me:19328: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19280,13 +19347,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19283: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19350: 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 19289 "configure"
+#line 19356 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19302,16 +19369,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19308: \$? = $ac_status" >&5
+  echo "$as_me:19375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19314: \$? = $ac_status" >&5
+  echo "$as_me:19381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19321,7 +19388,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19324: result: $ac_cv_header_time" >&5
+echo "$as_me:19391: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19336,7 +19403,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19339: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19406: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19344,7 +19411,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19347 "configure"
+#line 19414 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19363,16 +19430,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19369: \$? = $ac_status" >&5
+  echo "$as_me:19436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19375: \$? = $ac_status" >&5
+  echo "$as_me:19442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19383,11 +19450,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19386: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19453: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19390: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19457: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19395,7 +19462,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19398 "configure"
+#line 19465 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19414,16 +19481,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19420: \$? = $ac_status" >&5
+  echo "$as_me:19487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19426: \$? = $ac_status" >&5
+  echo "$as_me:19493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19434,7 +19501,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19437: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19504: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19456,7 +19523,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19459: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19526: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19464,7 +19531,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19467 "configure"
+#line 19534 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19483,16 +19550,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19489: \$? = $ac_status" >&5
+  echo "$as_me:19556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19495: \$? = $ac_status" >&5
+  echo "$as_me:19562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19503,7 +19570,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19506: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19573: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19525,7 +19592,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19528: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19595: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19533,7 +19600,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19536 "configure"
+#line 19603 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19552,16 +19619,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19558: \$? = $ac_status" >&5
+  echo "$as_me:19625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19564: \$? = $ac_status" >&5
+  echo "$as_me:19631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19572,7 +19639,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19575: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19642: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19614,7 +19681,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19617: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19684: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19622,7 +19689,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19625 "configure"
+#line 19692 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19641,16 +19708,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19647: \$? = $ac_status" >&5
+  echo "$as_me:19714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19653: \$? = $ac_status" >&5
+  echo "$as_me:19720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19661,7 +19728,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19664: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19731: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19689,13 +19756,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19692: checking for regcomp" >&5
+	echo "$as_me:19759: 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 19698 "configure"
+#line 19765 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19726,16 +19793,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19732: \$? = $ac_status" >&5
+  echo "$as_me:19799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19738: \$? = $ac_status" >&5
+  echo "$as_me:19805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19745,7 +19812,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19748: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19815: 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
@@ -19754,7 +19821,7 @@ else
 		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:19757: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19824: 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
@@ -19762,7 +19829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19765 "configure"
+#line 19832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19781,16 +19848,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19787: \$? = $ac_status" >&5
+  echo "$as_me:19854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19793: \$? = $ac_status" >&5
+  echo "$as_me:19860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19801,7 +19868,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19804: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19871: 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
 
@@ -19833,13 +19900,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19836: checking for compile" >&5
+	echo "$as_me:19903: 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 19842 "configure"
+#line 19909 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19870,16 +19937,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19943: \$? = $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:19946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19882: \$? = $ac_status" >&5
+  echo "$as_me:19949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19889,13 +19956,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19892: result: $ac_cv_func_compile" >&5
+echo "$as_me:19959: 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:19898: checking for compile in -lgen" >&5
+		echo "$as_me:19965: 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
@@ -19903,7 +19970,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19906 "configure"
+#line 19973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19922,16 +19989,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19928: \$? = $ac_status" >&5
+  echo "$as_me:19995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19934: \$? = $ac_status" >&5
+  echo "$as_me:20001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -19942,7 +20009,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19945: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20012: 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
 
@@ -19970,11 +20037,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:19973: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20040: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:19977: checking for regular-expression headers" >&5
+echo "$as_me:20044: 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
@@ -19986,7 +20053,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19989 "configure"
+#line 20056 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20003,16 +20070,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20009: \$? = $ac_status" >&5
+  echo "$as_me:20076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20015: \$? = $ac_status" >&5
+  echo "$as_me:20082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20029,7 +20096,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20032 "configure"
+#line 20099 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20049,16 +20116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20055: \$? = $ac_status" >&5
+  echo "$as_me:20122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20074,11 +20141,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20077: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20144: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20081: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20148: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20116,23 +20183,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20119: checking for $ac_header" >&5
+echo "$as_me:20186: 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 20125 "configure"
+#line 20192 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20129: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20196: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20135: \$? = $ac_status" >&5
+  echo "$as_me:20202: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20151,7 +20218,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20154: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20221: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20164,23 +20231,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20167: checking for $ac_header" >&5
+echo "$as_me:20234: 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 20173 "configure"
+#line 20240 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20177: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20244: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20183: \$? = $ac_status" >&5
+  echo "$as_me:20250: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20199,7 +20266,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20202: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20269: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20209,7 +20276,7 @@ EOF
 fi
 done
 
-echo "$as_me:20212: checking for header declaring getopt variables" >&5
+echo "$as_me:20279: 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
@@ -20219,7 +20286,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20222 "configure"
+#line 20289 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20232,16 +20299,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20238: \$? = $ac_status" >&5
+  echo "$as_me:20305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20244: \$? = $ac_status" >&5
+  echo "$as_me:20311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20253,7 +20320,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20256: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20323: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20270,14 +20337,14 @@ EOF
 
 fi
 
-echo "$as_me:20273: checking if external environ is declared" >&5
+echo "$as_me:20340: 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 20280 "configure"
+#line 20347 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20290,16 +20357,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20296: \$? = $ac_status" >&5
+  echo "$as_me:20363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20302: \$? = $ac_status" >&5
+  echo "$as_me:20369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20310,7 +20377,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20313: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20380: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20325,14 +20392,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20328: checking if external environ exists" >&5
+echo "$as_me:20395: 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 20335 "configure"
+#line 20402 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20347,16 +20414,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20353: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20359: \$? = $ac_status" >&5
+  echo "$as_me:20426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20367,7 +20434,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20370: result: $cf_cv_have_environ" >&5
+echo "$as_me:20437: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20380,13 +20447,13 @@ EOF
 
 fi
 
-echo "$as_me:20383: checking for getenv" >&5
+echo "$as_me:20450: 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 20389 "configure"
+#line 20456 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20417,16 +20484,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20436,19 +20503,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20439: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20506: 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:20445: checking for $ac_func" >&5
+echo "$as_me:20512: 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 20451 "configure"
+#line 20518 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20479,16 +20546,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20485: \$? = $ac_status" >&5
+  echo "$as_me:20552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20498,7 +20565,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20501: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20568: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20508,7 +20575,7 @@ EOF
 fi
 done
 
-echo "$as_me:20511: checking if getenv returns consistent values" >&5
+echo "$as_me:20578: 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
@@ -20518,7 +20585,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20521 "configure"
+#line 20588 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20623,15 +20690,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20693: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20629: \$? = $ac_status" >&5
+  echo "$as_me:20696: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20634: \$? = $ac_status" >&5
+  echo "$as_me:20701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20644,7 +20711,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20647: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20714: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20659,18 +20726,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20662: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20729: 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
 
-echo "$as_me:20666: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20733: 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 20673 "configure"
+#line 20740 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20690,16 +20757,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20696: \$? = $ac_status" >&5
+  echo "$as_me:20763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20702: \$? = $ac_status" >&5
+  echo "$as_me:20769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20711,7 +20778,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20714: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20781: 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
@@ -20726,13 +20793,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20729: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20796: 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 20735 "configure"
+#line 20802 "configure"
 #include "confdefs.h"
 
 int
@@ -20790,16 +20857,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20796: \$? = $ac_status" >&5
+  echo "$as_me:20863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20802: \$? = $ac_status" >&5
+  echo "$as_me:20869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20809,7 +20876,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20812: result: $ac_cv_c_const" >&5
+echo "$as_me:20879: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20819,7 +20886,7 @@ EOF
 
 fi
 
-echo "$as_me:20822: checking for inline" >&5
+echo "$as_me:20889: 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
@@ -20827,7 +20894,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20830 "configure"
+#line 20897 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20836,16 +20903,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20842: \$? = $ac_status" >&5
+  echo "$as_me:20909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20848: \$? = $ac_status" >&5
+  echo "$as_me:20915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20856,7 +20923,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20859: result: $ac_cv_c_inline" >&5
+echo "$as_me:20926: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20882,7 +20949,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20885: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20952: 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
@@ -20891,7 +20958,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20894 "configure"
+#line 20961 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20903,16 +20970,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20909: \$? = $ac_status" >&5
+  echo "$as_me:20976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20915: \$? = $ac_status" >&5
+  echo "$as_me:20982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20924,7 +20991,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20927: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20994: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21030,7 +21097,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21033: checking for signal global datatype" >&5
+echo "$as_me:21100: 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
@@ -21042,7 +21109,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21045 "configure"
+#line 21112 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21066,16 +21133,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21072: \$? = $ac_status" >&5
+  echo "$as_me:21139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21078: \$? = $ac_status" >&5
+  echo "$as_me:21145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21089,7 +21156,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21092: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21159: 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 <<EOF
@@ -21098,7 +21165,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21101: checking for type of chtype" >&5
+echo "$as_me:21168: 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
@@ -21108,7 +21175,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21111 "configure"
+#line 21178 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21143,15 +21210,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21149: \$? = $ac_status" >&5
+  echo "$as_me:21216: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21154: \$? = $ac_status" >&5
+  echo "$as_me:21221: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21166,7 +21233,7 @@ fi
 
 fi
 
-echo "$as_me:21169: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21236: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21178,14 +21245,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21181: checking if unsigned literals are legal" >&5
+echo "$as_me:21248: 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 21188 "configure"
+#line 21255 "configure"
 #include "confdefs.h"
 
 int
@@ -21197,16 +21264,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21203: \$? = $ac_status" >&5
+  echo "$as_me:21270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21209: \$? = $ac_status" >&5
+  echo "$as_me:21276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21218,7 +21285,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21221: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21288: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21234,14 +21301,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21237: checking if external errno is declared" >&5
+echo "$as_me:21304: 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 21244 "configure"
+#line 21311 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21255,16 +21322,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21261: \$? = $ac_status" >&5
+  echo "$as_me:21328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21267: \$? = $ac_status" >&5
+  echo "$as_me:21334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21275,7 +21342,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21278: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21345: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21290,14 +21357,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21293: checking if external errno exists" >&5
+echo "$as_me:21360: 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 21300 "configure"
+#line 21367 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21312,16 +21379,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21318: \$? = $ac_status" >&5
+  echo "$as_me:21385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21324: \$? = $ac_status" >&5
+  echo "$as_me:21391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21332,7 +21399,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21335: result: $cf_cv_have_errno" >&5
+echo "$as_me:21402: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21345,7 +21412,7 @@ EOF
 
 fi
 
-echo "$as_me:21348: checking if data-only library module links" >&5
+echo "$as_me:21415: 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
@@ -21353,20 +21420,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21356 "configure"
+#line 21423 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21359: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:21429: \$? = $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 <<EOF
-#line 21369 "configure"
+#line 21436 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21379,10 +21446,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21382: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21385: \$? = $ac_status" >&5
+  echo "$as_me:21452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21395,7 +21462,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21398 "configure"
+#line 21465 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21406,15 +21473,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21412: \$? = $ac_status" >&5
+  echo "$as_me:21479: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21417: \$? = $ac_status" >&5
+  echo "$as_me:21484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21429,7 +21496,7 @@ fi
 
 fi
 
-echo "$as_me:21432: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21499: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21443,14 +21510,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21446: checking for clock_gettime" >&5
+echo "$as_me:21513: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21453 "configure"
+#line 21520 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21463,16 +21530,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21469: \$? = $ac_status" >&5
+  echo "$as_me:21536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21475: \$? = $ac_status" >&5
+  echo "$as_me:21542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21483,7 +21550,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21486: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21553: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21494,13 +21561,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21497: checking for gettimeofday" >&5
+echo "$as_me:21564: 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 21503 "configure"
+#line 21570 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21531,16 +21598,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21537: \$? = $ac_status" >&5
+  echo "$as_me:21604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21543: \$? = $ac_status" >&5
+  echo "$as_me:21610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21550,7 +21617,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21553: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21620: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21560,7 +21627,7 @@ EOF
 
 else
 
-echo "$as_me:21563: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21630: 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
@@ -21568,7 +21635,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21571 "configure"
+#line 21638 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21587,16 +21654,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21593: \$? = $ac_status" >&5
+  echo "$as_me:21660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21599: \$? = $ac_status" >&5
+  echo "$as_me:21666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21607,7 +21674,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21610: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21677: 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
 
@@ -21668,13 +21735,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21671: checking for $ac_func" >&5
+echo "$as_me:21738: 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 21677 "configure"
+#line 21744 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21705,16 +21772,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21711: \$? = $ac_status" >&5
+  echo "$as_me:21778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21717: \$? = $ac_status" >&5
+  echo "$as_me:21784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21724,7 +21791,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21727: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21794: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21734,14 +21801,14 @@ EOF
 fi
 done
 
-echo "$as_me:21737: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21804: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21744 "configure"
+#line 21811 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21756,16 +21823,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21762: \$? = $ac_status" >&5
+  echo "$as_me:21829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21768: \$? = $ac_status" >&5
+  echo "$as_me:21835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21775,7 +21842,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21778: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21845: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21797,7 +21864,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21800: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21867: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21807,7 +21874,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21810 "configure"
+#line 21877 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21820,15 +21887,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21826: \$? = $ac_status" >&5
+  echo "$as_me:21893: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21831: \$? = $ac_status" >&5
+  echo "$as_me:21898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21840,7 +21907,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21843: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21910: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21852,14 +21919,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21855: checking for getttynam" >&5
+	echo "$as_me:21922: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21862 "configure"
+#line 21929 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21871,16 +21938,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21877: \$? = $ac_status" >&5
+  echo "$as_me:21944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21883: \$? = $ac_status" >&5
+  echo "$as_me:21950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21890,7 +21957,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21893: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21960: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21900,7 +21967,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21903: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21970: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21909,7 +21976,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21912: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21979: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21922,14 +21989,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21925: checking for terminal-capability database functions" >&5
+echo "$as_me:21992: 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 21932 "configure"
+#line 21999 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21949,16 +22016,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21955: \$? = $ac_status" >&5
+  echo "$as_me:22022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21961: \$? = $ac_status" >&5
+  echo "$as_me:22028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -21969,7 +22036,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21972: result: $cf_cv_cgetent" >&5
+echo "$as_me:22039: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -21979,14 +22046,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:21982: checking if cgetent uses const parameter" >&5
+echo "$as_me:22049: 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 21989 "configure"
+#line 22056 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22009,16 +22076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22015: \$? = $ac_status" >&5
+  echo "$as_me:22082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22021: \$? = $ac_status" >&5
+  echo "$as_me:22088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22029,7 +22096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22032: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22099: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22043,14 +22110,14 @@ fi
 
 fi
 
-echo "$as_me:22046: checking for isascii" >&5
+echo "$as_me:22113: 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 22053 "configure"
+#line 22120 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22062,16 +22129,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22068: \$? = $ac_status" >&5
+  echo "$as_me:22135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22074: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22082,7 +22149,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22085: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22152: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22090,10 +22157,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22093: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22160: 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 22096 "configure"
+#line 22163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22107,16 +22174,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22113: \$? = $ac_status" >&5
+  echo "$as_me:22180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22119: \$? = $ac_status" >&5
+  echo "$as_me:22186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22124,7 +22191,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22127 "configure"
+#line 22194 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22139,16 +22206,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22209: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22145: \$? = $ac_status" >&5
+  echo "$as_me:22212: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22151: \$? = $ac_status" >&5
+  echo "$as_me:22218: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22164,11 +22231,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22167: result: $sigact_bad" >&5
+echo "$as_me:22234: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22171: checking if nanosleep really works" >&5
+echo "$as_me:22238: 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
@@ -22178,7 +22245,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22181 "configure"
+#line 22248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22204,15 +22271,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22215: \$? = $ac_status" >&5
+  echo "$as_me:22282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22224,7 +22291,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22227: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22294: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22241,23 +22308,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22244: checking for $ac_header" >&5
+echo "$as_me:22311: 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 22250 "configure"
+#line 22317 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22254: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22321: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22327: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22276,7 +22343,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22279: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22346: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22293,10 +22360,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22296: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22363: 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 22299 "configure"
+#line 22366 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22308,16 +22375,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22314: \$? = $ac_status" >&5
+  echo "$as_me:22381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22320: \$? = $ac_status" >&5
+  echo "$as_me:22387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22325,7 +22392,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22328 "configure"
+#line 22395 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22339,16 +22406,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22345: \$? = $ac_status" >&5
+  echo "$as_me:22412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22351: \$? = $ac_status" >&5
+  echo "$as_me:22418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22364,19 +22431,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22367: result: $termios_bad" >&5
+	echo "$as_me:22434: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22372: checking for tcgetattr" >&5
+echo "$as_me:22439: 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 22379 "configure"
+#line 22446 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22404,16 +22471,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22410: \$? = $ac_status" >&5
+  echo "$as_me:22477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22416: \$? = $ac_status" >&5
+  echo "$as_me:22483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22423,21 +22490,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22426: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22493: 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:22433: checking for vsscanf function or workaround" >&5
+echo "$as_me:22500: 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 22440 "configure"
+#line 22507 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22453,16 +22520,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22459: \$? = $ac_status" >&5
+  echo "$as_me:22526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22465: \$? = $ac_status" >&5
+  echo "$as_me:22532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22470,7 +22537,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22473 "configure"
+#line 22540 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22492,16 +22559,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22562: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22498: \$? = $ac_status" >&5
+  echo "$as_me:22565: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22571: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22509,7 +22576,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22512 "configure"
+#line 22579 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22531,16 +22598,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22537: \$? = $ac_status" >&5
+  echo "$as_me:22604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22543: \$? = $ac_status" >&5
+  echo "$as_me:22610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22555,7 +22622,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22558: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22625: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22581,23 +22648,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22584: checking for $ac_header" >&5
+echo "$as_me:22651: 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 22590 "configure"
+#line 22657 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22594: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22661: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22600: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22616,7 +22683,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22619: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22686: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22626,7 +22693,7 @@ EOF
 fi
 done
 
-echo "$as_me:22629: checking for working mkstemp" >&5
+echo "$as_me:22696: 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
@@ -22637,7 +22704,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22640 "configure"
+#line 22707 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22672,15 +22739,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22678: \$? = $ac_status" >&5
+  echo "$as_me:22745: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22683: \$? = $ac_status" >&5
+  echo "$as_me:22750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22695,16 +22762,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22698: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22765: 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:22701: checking for mkstemp" >&5
+	echo "$as_me:22768: 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 22707 "configure"
+#line 22774 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22735,16 +22802,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22741: \$? = $ac_status" >&5
+  echo "$as_me:22808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22747: \$? = $ac_status" >&5
+  echo "$as_me:22814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22754,7 +22821,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22757: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22824: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22775,21 +22842,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22778: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22845: 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:22781: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22848: 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:22787: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22854: 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 22792 "configure"
+#line 22859 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22806,15 +22873,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22812: \$? = $ac_status" >&5
+  echo "$as_me:22879: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22817: \$? = $ac_status" >&5
+  echo "$as_me:22884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22827,7 +22894,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22830: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22897: 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
 
@@ -22838,13 +22905,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22841: checking for intptr_t" >&5
+echo "$as_me:22908: 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 22847 "configure"
+#line 22914 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22859,16 +22926,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22865: \$? = $ac_status" >&5
+  echo "$as_me:22932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22871: \$? = $ac_status" >&5
+  echo "$as_me:22938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22878,7 +22945,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22881: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22948: 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
   :
@@ -22890,13 +22957,13 @@ EOF
 
 fi
 
-echo "$as_me:22893: checking for ssize_t" >&5
+echo "$as_me:22960: 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 22899 "configure"
+#line 22966 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22911,16 +22978,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22917: \$? = $ac_status" >&5
+  echo "$as_me:22984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22923: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -22930,7 +22997,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22933: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23000: 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
   :
@@ -22942,14 +23009,14 @@ EOF
 
 fi
 
-echo "$as_me:22945: checking for type sigaction_t" >&5
+echo "$as_me:23012: 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 22952 "configure"
+#line 23019 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -22962,16 +23029,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22965: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22968: \$? = $ac_status" >&5
+  echo "$as_me:23035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22974: \$? = $ac_status" >&5
+  echo "$as_me:23041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -22982,14 +23049,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22985: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23052: 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:22992: checking declaration of size-change" >&5
+echo "$as_me:23059: 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
@@ -23010,7 +23077,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23013 "configure"
+#line 23080 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23060,16 +23127,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23066: \$? = $ac_status" >&5
+  echo "$as_me:23133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23072: \$? = $ac_status" >&5
+  echo "$as_me:23139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23088,7 +23155,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23091: result: $cf_cv_sizechange" >&5
+echo "$as_me:23158: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23106,13 +23173,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23109: checking for memmove" >&5
+echo "$as_me:23176: 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 23115 "configure"
+#line 23182 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23143,16 +23210,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23149: \$? = $ac_status" >&5
+  echo "$as_me:23216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23155: \$? = $ac_status" >&5
+  echo "$as_me:23222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23162,19 +23229,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23165: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23232: 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:23171: checking for bcopy" >&5
+echo "$as_me:23238: 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 23177 "configure"
+#line 23244 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23205,16 +23272,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23211: \$? = $ac_status" >&5
+  echo "$as_me:23278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23217: \$? = $ac_status" >&5
+  echo "$as_me:23284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23224,11 +23291,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23227: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23294: 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:23231: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23298: 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
@@ -23238,7 +23305,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23241 "configure"
+#line 23308 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23254,15 +23321,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23260: \$? = $ac_status" >&5
+  echo "$as_me:23327: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23265: \$? = $ac_status" >&5
+  echo "$as_me:23332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23275,7 +23342,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23278: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23345: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23302,13 +23369,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23305: checking for $ac_func" >&5
+echo "$as_me:23372: 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 23311 "configure"
+#line 23378 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23339,16 +23406,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23345: \$? = $ac_status" >&5
+  echo "$as_me:23412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23351: \$? = $ac_status" >&5
+  echo "$as_me:23418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23358,7 +23425,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23361: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23428: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23368,7 +23435,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23371: checking if poll really works" >&5
+echo "$as_me:23438: 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
@@ -23378,7 +23445,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23381 "configure"
+#line 23448 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23431,15 +23498,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23437: \$? = $ac_status" >&5
+  echo "$as_me:23504: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23442: \$? = $ac_status" >&5
+  echo "$as_me:23509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23451,21 +23518,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23454: result: $cf_cv_working_poll" >&5
+echo "$as_me:23521: 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:23461: checking for va_copy" >&5
+echo "$as_me:23528: 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 23468 "configure"
+#line 23535 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23482,16 +23549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23488: \$? = $ac_status" >&5
+  echo "$as_me:23555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23494: \$? = $ac_status" >&5
+  echo "$as_me:23561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23501,7 +23568,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23504: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23571: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23513,14 +23580,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23516: checking for __va_copy" >&5
+echo "$as_me:23583: 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 23523 "configure"
+#line 23590 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23537,16 +23604,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23543: \$? = $ac_status" >&5
+  echo "$as_me:23610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23549: \$? = $ac_status" >&5
+  echo "$as_me:23616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23556,7 +23623,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23559: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23626: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23568,14 +23635,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23571: checking for __builtin_va_copy" >&5
+echo "$as_me:23638: 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 23578 "configure"
+#line 23645 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23592,16 +23659,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23598: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23604: \$? = $ac_status" >&5
+  echo "$as_me:23671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23611,7 +23678,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23614: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23681: 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 &&
@@ -23629,14 +23696,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23632: checking if we can simply copy va_list" >&5
+	echo "$as_me:23699: 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 23639 "configure"
+#line 23706 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23653,16 +23720,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23659: \$? = $ac_status" >&5
+  echo "$as_me:23726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23665: \$? = $ac_status" >&5
+  echo "$as_me:23732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23672,19 +23739,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23675: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23742: 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:23680: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23747: 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 23687 "configure"
+#line 23754 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23701,16 +23768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23707: \$? = $ac_status" >&5
+  echo "$as_me:23774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23713: \$? = $ac_status" >&5
+  echo "$as_me:23780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23720,7 +23787,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23723: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23790: 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
@@ -23731,13 +23798,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23734: checking for pid_t" >&5
+echo "$as_me:23801: 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 23740 "configure"
+#line 23807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23752,16 +23819,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23758: \$? = $ac_status" >&5
+  echo "$as_me:23825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23764: \$? = $ac_status" >&5
+  echo "$as_me:23831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23771,7 +23838,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23774: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23841: 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
   :
@@ -23786,23 +23853,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23789: checking for $ac_header" >&5
+echo "$as_me:23856: 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 23795 "configure"
+#line 23862 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23799: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23866: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23805: \$? = $ac_status" >&5
+  echo "$as_me:23872: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23821,7 +23888,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23824: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23891: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23834,13 +23901,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23837: checking for $ac_func" >&5
+echo "$as_me:23904: 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 23843 "configure"
+#line 23910 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23871,16 +23938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23877: \$? = $ac_status" >&5
+  echo "$as_me:23944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23883: \$? = $ac_status" >&5
+  echo "$as_me:23950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23890,7 +23957,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23893: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23960: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23902,7 +23969,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23905: checking for working fork" >&5
+  echo "$as_me:23972: 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
@@ -23925,15 +23992,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23931: \$? = $ac_status" >&5
+  echo "$as_me:23998: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23936: \$? = $ac_status" >&5
+  echo "$as_me:24003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -23945,7 +24012,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23948: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24015: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -23959,12 +24026,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:23962: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24029: 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:23967: checking for working vfork" >&5
+  echo "$as_me:24034: 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
@@ -23973,7 +24040,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23976 "configure"
+#line 24043 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24070,15 +24137,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24076: \$? = $ac_status" >&5
+  echo "$as_me:24143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24081: \$? = $ac_status" >&5
+  echo "$as_me:24148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24090,13 +24157,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24093: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24160: 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:24099: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24166: 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
 
@@ -24121,7 +24188,7 @@ EOF
 
 fi
 
-echo "$as_me:24124: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24191: 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
@@ -24131,7 +24198,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24134 "configure"
+#line 24201 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24166,15 +24233,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24172: \$? = $ac_status" >&5
+  echo "$as_me:24239: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24177: \$? = $ac_status" >&5
+  echo "$as_me:24244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24187,7 +24254,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24190: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24257: 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
@@ -24196,7 +24263,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24199: checking for openpty in -lutil" >&5
+echo "$as_me:24266: 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
@@ -24204,7 +24271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24207 "configure"
+#line 24274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24223,16 +24290,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24229: \$? = $ac_status" >&5
+  echo "$as_me:24296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24235: \$? = $ac_status" >&5
+  echo "$as_me:24302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24243,7 +24310,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24246: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24313: 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
@@ -24251,7 +24318,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24254: checking for openpty header" >&5
+echo "$as_me:24321: 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
@@ -24278,7 +24345,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24281 "configure"
+#line 24348 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24295,16 +24362,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24301: \$? = $ac_status" >&5
+  echo "$as_me:24368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24307: \$? = $ac_status" >&5
+  echo "$as_me:24374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24322,7 +24389,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24325: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24392: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24395,7 +24462,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24398 "configure"
+#line 24465 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24407,16 +24474,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24413: \$? = $ac_status" >&5
+  echo "$as_me:24480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24419: \$? = $ac_status" >&5
+  echo "$as_me:24486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24433,7 +24500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24436: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24469,7 +24536,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24472: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24539: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24480,7 +24547,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24483: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24550: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24552,7 +24619,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24555 "configure"
+#line 24622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24564,16 +24631,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24570: \$? = $ac_status" >&5
+  echo "$as_me:24637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24576: \$? = $ac_status" >&5
+  echo "$as_me:24643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24590,7 +24657,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24593: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24660: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24670,7 +24737,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24673: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24740: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24687,23 +24754,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24690: checking for db.h" >&5
+echo "$as_me:24757: 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 24696 "configure"
+#line 24763 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24700: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24706: \$? = $ac_status" >&5
+  echo "$as_me:24773: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24722,11 +24789,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24725: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24792: 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:24729: checking for version of db" >&5
+echo "$as_me:24796: 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
@@ -24737,10 +24804,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24740: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24807: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24743 "configure"
+#line 24810 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24770,16 +24837,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24776: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24782: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24793,16 +24860,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24796: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24863: 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:24800: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24867: 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:24805: checking for db libraries" >&5
+echo "$as_me:24872: 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
@@ -24832,10 +24899,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24835: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24902: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24838 "configure"
+#line 24905 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24890,16 +24957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24896: \$? = $ac_status" >&5
+  echo "$as_me:24963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24902: \$? = $ac_status" >&5
+  echo "$as_me:24969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24919,11 +24986,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24922: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24989: 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:24926: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24993: 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
@@ -24949,7 +25016,7 @@ fi
 
 else
 
-	{ { echo "$as_me:24952: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25019: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -24964,7 +25031,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:24967: checking if we should include stdbool.h" >&5
+echo "$as_me:25034: 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
@@ -24972,7 +25039,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24975 "configure"
+#line 25042 "configure"
 #include "confdefs.h"
 
 int
@@ -24984,23 +25051,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24990: \$? = $ac_status" >&5
+  echo "$as_me:25057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24996: \$? = $ac_status" >&5
+  echo "$as_me:25063: \$? = $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 25003 "configure"
+#line 25070 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25016,16 +25083,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25019: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25022: \$? = $ac_status" >&5
+  echo "$as_me:25089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25028: \$? = $ac_status" >&5
+  echo "$as_me:25095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25039,13 +25106,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25042: result: yes" >&5
+then	echo "$as_me:25109: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25044: result: no" >&5
+else	echo "$as_me:25111: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25048: checking for builtin bool type" >&5
+echo "$as_me:25115: 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
@@ -25053,7 +25120,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25056 "configure"
+#line 25123 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25068,16 +25135,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25074: \$? = $ac_status" >&5
+  echo "$as_me:25141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25080: \$? = $ac_status" >&5
+  echo "$as_me:25147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25090,9 +25157,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25093: result: yes" >&5
+then	echo "$as_me:25160: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25095: result: no" >&5
+else	echo "$as_me:25162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25109,10 +25176,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25112: checking if we already have C++ library" >&5
+	echo "$as_me:25179: 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 25115 "configure"
+#line 25182 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25126,16 +25193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25132: \$? = $ac_status" >&5
+  echo "$as_me:25199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25138: \$? = $ac_status" >&5
+  echo "$as_me:25205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25144,7 +25211,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25147: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25214: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25163,7 +25230,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25166: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25233: 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
@@ -25189,7 +25256,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25192 "configure"
+#line 25259 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25203,16 +25270,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25209: \$? = $ac_status" >&5
+  echo "$as_me:25276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25215: \$? = $ac_status" >&5
+  echo "$as_me:25282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25224,7 +25291,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25227: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25294: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25246,7 +25313,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25249: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25316: 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
@@ -25261,15 +25328,15 @@ CF_EOF
 # 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:25264: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25267: \$? = $ac_status" >&5
+  echo "$as_me:25334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25269: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25272: \$? = $ac_status" >&5
+  echo "$as_me:25339: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25280,10 +25347,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25283: result: yes" >&5
+  echo "$as_me:25350: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25286: result: no" >&5
+  echo "$as_me:25353: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25303,7 +25370,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25306: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25373: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25324,7 +25391,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25327 "configure"
+#line 25394 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25338,16 +25405,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25344: \$? = $ac_status" >&5
+  echo "$as_me:25411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25350: \$? = $ac_status" >&5
+  echo "$as_me:25417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25384,7 +25451,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25387 "configure"
+#line 25454 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25398,16 +25465,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25404: \$? = $ac_status" >&5
+  echo "$as_me:25471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25410: \$? = $ac_status" >&5
+  echo "$as_me:25477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25440,7 +25507,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25443: result: $cf_cxx_library" >&5
+	echo "$as_me:25510: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25456,7 +25523,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25459: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25526: 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
@@ -25473,18 +25540,18 @@ do
   # 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 25476 "configure"
+#line 25543 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25481: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25548: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25487: \$? = $ac_status" >&5
+  echo "$as_me:25554: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25507,17 +25574,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25510 "configure"
+#line 25577 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25520: \$? = $ac_status" >&5
+  echo "$as_me:25587: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25554,7 +25621,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25557: result: $CXXCPP" >&5
+echo "$as_me:25624: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25564,18 +25631,18 @@ do
   # 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 25567 "configure"
+#line 25634 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25639: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25578: \$? = $ac_status" >&5
+  echo "$as_me:25645: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25598,17 +25665,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25601 "configure"
+#line 25668 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:25678: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25636,7 +25703,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25639: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25706: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25651,23 +25718,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25654: checking for $ac_header" >&5
+echo "$as_me:25721: 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 25660 "configure"
+#line 25727 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25731: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25670: \$? = $ac_status" >&5
+  echo "$as_me:25737: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25686,7 +25753,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25689: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25756: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25699,23 +25766,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25702: checking for $ac_header" >&5
+echo "$as_me:25769: 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 25708 "configure"
+#line 25775 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25779: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25718: \$? = $ac_status" >&5
+  echo "$as_me:25785: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25734,7 +25801,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25737: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25804: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25745,10 +25812,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25748: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25815: 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 25751 "configure"
+#line 25818 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25765,16 +25832,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25771: \$? = $ac_status" >&5
+  echo "$as_me:25838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25777: \$? = $ac_status" >&5
+  echo "$as_me:25844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25783,7 +25850,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25786: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25853: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25794,7 +25861,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25797: checking if we should include stdbool.h" >&5
+echo "$as_me:25864: 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
@@ -25802,7 +25869,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25805 "configure"
+#line 25872 "configure"
 #include "confdefs.h"
 
 int
@@ -25814,23 +25881,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25820: \$? = $ac_status" >&5
+  echo "$as_me:25887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25826: \$? = $ac_status" >&5
+  echo "$as_me:25893: \$? = $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 25833 "configure"
+#line 25900 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25846,16 +25913,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25852: \$? = $ac_status" >&5
+  echo "$as_me:25919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25858: \$? = $ac_status" >&5
+  echo "$as_me:25925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25869,13 +25936,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25872: result: yes" >&5
+then	echo "$as_me:25939: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25874: result: no" >&5
+else	echo "$as_me:25941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25878: checking for builtin bool type" >&5
+echo "$as_me:25945: 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
@@ -25883,7 +25950,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25886 "configure"
+#line 25953 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25898,16 +25965,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25904: \$? = $ac_status" >&5
+  echo "$as_me:25971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25910: \$? = $ac_status" >&5
+  echo "$as_me:25977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25920,19 +25987,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25923: result: yes" >&5
+then	echo "$as_me:25990: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25925: result: no" >&5
+else	echo "$as_me:25992: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25929: checking for bool" >&5
+echo "$as_me:25996: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25935 "configure"
+#line 26002 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25967,16 +26034,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25973: \$? = $ac_status" >&5
+  echo "$as_me:26040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25979: \$? = $ac_status" >&5
+  echo "$as_me:26046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -25986,10 +26053,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25989: result: $ac_cv_type_bool" >&5
+echo "$as_me:26056: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:25992: checking size of bool" >&5
+echo "$as_me:26059: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25998,7 +26065,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26001 "configure"
+#line 26068 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26030,21 +26097,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26036: \$? = $ac_status" >&5
+  echo "$as_me:26103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26042: \$? = $ac_status" >&5
+  echo "$as_me:26109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26047 "configure"
+#line 26114 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26076,16 +26143,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26082: \$? = $ac_status" >&5
+  echo "$as_me:26149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26088: \$? = $ac_status" >&5
+  echo "$as_me:26155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26101,7 +26168,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26104 "configure"
+#line 26171 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26133,16 +26200,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26139: \$? = $ac_status" >&5
+  echo "$as_me:26206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26145: \$? = $ac_status" >&5
+  echo "$as_me:26212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26158,7 +26225,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26161 "configure"
+#line 26228 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26190,16 +26257,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26196: \$? = $ac_status" >&5
+  echo "$as_me:26263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26202: \$? = $ac_status" >&5
+  echo "$as_me:26269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26212,12 +26279,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26215: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26282: 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 26220 "configure"
+#line 26287 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26253,15 +26320,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26259: \$? = $ac_status" >&5
+  echo "$as_me:26326: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26264: \$? = $ac_status" >&5
+  echo "$as_me:26331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26277,13 +26344,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26280: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26347: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26286: checking for type of bool" >&5
+echo "$as_me:26353: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26302,7 +26369,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26305 "configure"
+#line 26372 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26343,15 +26410,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26349: \$? = $ac_status" >&5
+  echo "$as_me:26416: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26354: \$? = $ac_status" >&5
+  echo "$as_me:26421: \$? = $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
@@ -26368,19 +26435,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26371: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26438: 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:26378: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26445: 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:26383: checking for special defines needed for etip.h" >&5
+echo "$as_me:26450: 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"
@@ -26398,7 +26465,7 @@ do
 	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 26401 "configure"
+#line 26468 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26412,16 +26479,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26418: \$? = $ac_status" >&5
+  echo "$as_me:26485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26424: \$? = $ac_status" >&5
+  echo "$as_me:26491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26442,12 +26509,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26445: result: $cf_result" >&5
+echo "$as_me:26512: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26450: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26517: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26464,7 +26531,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26467 "configure"
+#line 26534 "configure"
 #include "confdefs.h"
 
 class base
@@ -26483,15 +26550,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26489: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26494: \$? = $ac_status" >&5
+  echo "$as_me:26561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26510,7 +26577,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26513: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26580: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26519,7 +26586,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26522: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26589: 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
@@ -26536,7 +26603,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26539 "configure"
+#line 26606 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26555,15 +26622,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26561: \$? = $ac_status" >&5
+  echo "$as_me:26628: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26566: \$? = $ac_status" >&5
+  echo "$as_me:26633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26582,7 +26649,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26585: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26652: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26592,7 +26659,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26595: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26662: 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
@@ -26606,7 +26673,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26609 "configure"
+#line 26676 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26650,16 +26717,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26656: \$? = $ac_status" >&5
+  echo "$as_me:26723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26662: \$? = $ac_status" >&5
+  echo "$as_me:26729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26677,7 +26744,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26680: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26747: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26726,13 +26793,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26729: checking for bool" >&5
+echo "$as_me:26796: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26735 "configure"
+#line 26802 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26767,16 +26834,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26773: \$? = $ac_status" >&5
+  echo "$as_me:26840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26779: \$? = $ac_status" >&5
+  echo "$as_me:26846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26786,10 +26853,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26789: result: $ac_cv_type_bool" >&5
+echo "$as_me:26856: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26792: checking size of bool" >&5
+echo "$as_me:26859: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26798,7 +26865,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26801 "configure"
+#line 26868 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26830,21 +26897,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26836: \$? = $ac_status" >&5
+  echo "$as_me:26903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26842: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26847 "configure"
+#line 26914 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26876,16 +26943,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26882: \$? = $ac_status" >&5
+  echo "$as_me:26949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26888: \$? = $ac_status" >&5
+  echo "$as_me:26955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26901,7 +26968,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26904 "configure"
+#line 26971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26933,16 +27000,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26939: \$? = $ac_status" >&5
+  echo "$as_me:27006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26945: \$? = $ac_status" >&5
+  echo "$as_me:27012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26958,7 +27025,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26961 "configure"
+#line 27028 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26990,16 +27057,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26996: \$? = $ac_status" >&5
+  echo "$as_me:27063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27002: \$? = $ac_status" >&5
+  echo "$as_me:27069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27012,12 +27079,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27015: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27082: 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 27020 "configure"
+#line 27087 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27053,15 +27120,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27059: \$? = $ac_status" >&5
+  echo "$as_me:27126: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27064: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27077,13 +27144,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27080: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27147: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27086: checking for type of bool" >&5
+echo "$as_me:27153: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27102,7 +27169,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27105 "configure"
+#line 27172 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27143,15 +27210,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27149: \$? = $ac_status" >&5
+  echo "$as_me:27216: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27154: \$? = $ac_status" >&5
+  echo "$as_me:27221: \$? = $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
@@ -27168,26 +27235,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27171: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27238: 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:27178: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27245: 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:27184: checking for fallback type of bool" >&5
+			echo "$as_me:27251: 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:27190: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27257: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27216,7 +27283,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27219: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27286: 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
@@ -27233,7 +27300,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27236: checking for $ac_word" >&5
+echo "$as_me:27303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27250,7 +27317,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27253: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27320: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27262,10 +27329,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27265: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27332: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27268: result: no" >&5
+  echo "$as_me:27335: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27275,7 +27342,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27278: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27345: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27286,7 +27353,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27289: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27356: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27315,7 +27382,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27318: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27385: 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
@@ -27334,10 +27401,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27337: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27404: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27340: result: missing" >&5
+					echo "$as_me:27407: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27350,7 +27417,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27353: checking for gnat version" >&5
+echo "$as_me:27420: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27361,7 +27428,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27364: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27431: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27370,7 +27437,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27373: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27440: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27378,7 +27445,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27381: checking for $ac_word" >&5
+echo "$as_me:27448: 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
@@ -27393,7 +27460,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27396: found $ac_dir/$ac_word" >&5
+echo "$as_me:27463: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27402,20 +27469,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27405: result: $M4_exists" >&5
+  echo "$as_me:27472: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27408: result: no" >&5
+  echo "$as_me:27475: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27414: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27481: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27418: checking if GNAT works" >&5
+			echo "$as_me:27485: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27443,7 +27510,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27446: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27513: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27455,7 +27522,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27458: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27525: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27472,10 +27539,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27475: result: $ADAFLAGS" >&5
+	echo "$as_me:27542: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27478: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27545: 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
@@ -27485,11 +27552,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27488: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27555: 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:27492: checking if GNAT supports generics" >&5
+echo "$as_me:27559: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27499,7 +27566,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27502: result: $cf_gnat_generics" >&5
+echo "$as_me:27569: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27511,7 +27578,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27514: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27581: 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
@@ -27559,7 +27626,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27562: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27629: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27572,7 +27639,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27575: checking if GNAT supports project files" >&5
+echo "$as_me:27642: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27635,15 +27702,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27638: result: $cf_gnat_projects" >&5
+echo "$as_me:27705: 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:27644: checking if GNAT supports libraries" >&5
+	echo "$as_me:27711: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27646: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27713: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27663,7 +27730,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27666: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27733: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27675,7 +27742,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27678: checking for ada-compiler" >&5
+echo "$as_me:27745: 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.
@@ -27686,12 +27753,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27689: result: $cf_ada_compiler" >&5
+echo "$as_me:27756: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27694: checking for ada-include" >&5
+echo "$as_me:27761: 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.
@@ -27727,7 +27794,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27730: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27797: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27736,10 +27803,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27739: result: $ADA_INCLUDE" >&5
+echo "$as_me:27806: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27742: checking for ada-objects" >&5
+echo "$as_me:27809: 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.
@@ -27775,7 +27842,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27778: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27845: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27784,10 +27851,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27787: result: $ADA_OBJECTS" >&5
+echo "$as_me:27854: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27790: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27857: 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.
@@ -27797,14 +27864,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27800: result: $with_ada_sharedlib" >&5
+echo "$as_me:27867: 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:27807: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27874: 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
@@ -27824,7 +27891,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27827: checking for ada-libname" >&5
+echo "$as_me:27894: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27840,7 +27907,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27843: result: $ADA_LIBNAME" >&5
+echo "$as_me:27910: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27851,13 +27918,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27854: checking for wchar_t" >&5
+	echo "$as_me:27921: 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 27860 "configure"
+#line 27927 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27872,16 +27939,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27878: \$? = $ac_status" >&5
+  echo "$as_me:27945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27884: \$? = $ac_status" >&5
+  echo "$as_me:27951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27891,10 +27958,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27894: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27961: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27897: checking size of wchar_t" >&5
+echo "$as_me:27964: 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
@@ -27903,7 +27970,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27906 "configure"
+#line 27973 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27915,21 +27982,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27921: \$? = $ac_status" >&5
+  echo "$as_me:27988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27927: \$? = $ac_status" >&5
+  echo "$as_me:27994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27932 "configure"
+#line 27999 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27941,16 +28008,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27947: \$? = $ac_status" >&5
+  echo "$as_me:28014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27953: \$? = $ac_status" >&5
+  echo "$as_me:28020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27966,7 +28033,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27969 "configure"
+#line 28036 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27978,16 +28045,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28048: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27984: \$? = $ac_status" >&5
+  echo "$as_me:28051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27990: \$? = $ac_status" >&5
+  echo "$as_me:28057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28003,7 +28070,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28006 "configure"
+#line 28073 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28015,16 +28082,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28021: \$? = $ac_status" >&5
+  echo "$as_me:28088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28027: \$? = $ac_status" >&5
+  echo "$as_me:28094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28037,12 +28104,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28040: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28107: 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 28045 "configure"
+#line 28112 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28058,15 +28125,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28064: \$? = $ac_status" >&5
+  echo "$as_me:28131: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28069: \$? = $ac_status" >&5
+  echo "$as_me:28136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28082,7 +28149,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28085: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28152: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28095,7 +28162,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28098: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28165: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28113,7 +28180,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28116: checking for library subsets" >&5
+echo "$as_me:28183: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28167,7 +28234,7 @@ fi
 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:28170: result: $LIB_SUBSETS" >&5
+echo "$as_me:28237: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28198,7 +28265,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28201: checking default library suffix" >&5
+echo "$as_me:28268: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28209,10 +28276,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28212: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28279: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28215: checking default library-dependency suffix" >&5
+echo "$as_me:28282: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28295,10 +28362,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28298: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28365: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28301: checking default object directory" >&5
+echo "$as_me:28368: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28314,11 +28381,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28317: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28384: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28321: checking c++ library-dependency suffix" >&5
+echo "$as_me:28388: 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++)
@@ -28411,7 +28478,7 @@ else
 	fi
 
 fi
-echo "$as_me:28414: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28481: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28587,19 +28654,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28590: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28657: 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 <<EOF
-#line 28595 "configure"
+#line 28662 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28602: \$? = $ac_status" >&5
+  echo "$as_me:28669: \$? = $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
@@ -28610,10 +28677,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28613 "configure"
+#line 28680 "configure"
 #include "confdefs.h"
 
-#line 28616 "configure"
+#line 28683 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28628,16 +28695,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28634: \$? = $ac_status" >&5
+  echo "$as_me:28701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28640: \$? = $ac_status" >&5
+  echo "$as_me:28707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28660,7 +28727,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28663: result: $cf_ldflags_static" >&5
+	echo "$as_me:28730: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28676,7 +28743,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28679: checking where we will install curses.h" >&5
+echo "$as_me:28746: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28686,7 +28753,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28689: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28756: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28694,7 +28761,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28697: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28764: 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
@@ -28719,7 +28786,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28722: checking for desired basename for form library" >&5
+echo "$as_me:28789: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28739,10 +28806,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28742: result: $FORM_NAME" >&5
+echo "$as_me:28809: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28745: checking for desired basename for menu library" >&5
+echo "$as_me:28812: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28762,10 +28829,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28765: result: $MENU_NAME" >&5
+echo "$as_me:28832: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28768: checking for desired basename for panel library" >&5
+echo "$as_me:28835: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28785,10 +28852,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28788: result: $PANEL_NAME" >&5
+echo "$as_me:28855: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28791: checking for desired basename for cxx library" >&5
+echo "$as_me:28858: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28808,13 +28875,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28811: result: $CXX_NAME" >&5
+echo "$as_me:28878: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28817: checking for src modules" >&5
+echo "$as_me:28884: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28873,7 +28940,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28876: result: $cf_cv_src_modules" >&5
+echo "$as_me:28943: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29034,7 +29101,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29037: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29104: 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//'`
@@ -29045,7 +29112,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29048: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29115: 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
@@ -29061,7 +29128,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29064: result: $PKG_CFLAGS" >&5
+echo "$as_me:29131: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29122,7 +29189,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29125: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29192: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29149,7 +29216,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29152: checking for linker search path" >&5
+echo "$as_me:29219: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29197,7 +29264,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29200: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29267: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29238,7 +29305,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29241: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29308: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29324,7 +29391,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29327: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29394: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29505,7 +29572,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29508: error: ambiguous option: $1
+    { { echo "$as_me:29575: 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;}
@@ -29524,7 +29591,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29527: error: unrecognized option: $1
+  -*) { { echo "$as_me:29594: 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;}
@@ -29654,7 +29721,7 @@ do
   "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:29657: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29724: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -29905,6 +29972,10 @@ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
 s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t
 s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
 s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t
+s,@cf_manpage_format@,$cf_manpage_format,;t t
+s,@cf_manpage_inboth@,$cf_manpage_inboth,;t t
+s,@cf_manpage_so_strip@,$cf_manpage_so_strip,;t t
+s,@cf_manpage_compress@,$cf_manpage_compress,;t t
 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
 s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
@@ -30167,7 +30238,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30170: creating $ac_file" >&5
+    { echo "$as_me:30241: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30185,7 +30256,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30188: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30259: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30198,7 +30269,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30201: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30272: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30214,7 +30285,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30217: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30288: 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;}
@@ -30223,7 +30294,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30226: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30297: 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;}
@@ -30268,7 +30339,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30271: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30342: 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;}
@@ -30279,7 +30350,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30282: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30353: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30328,7 +30399,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30331: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30402: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30339,7 +30410,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30342: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30413: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30352,7 +30423,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30355: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30426: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30410,7 +30481,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30413: $ac_file is unchanged" >&5
+      { echo "$as_me:30484: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30797,7 +30868,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30800: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30871: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
@@ -31154,7 +31225,7 @@ cat >> Makefile <<CF_EOF
 distclean ::
 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
 	rm -f headers.sh headers.sed mk_shared_lib.sh
-	rm -f edit_man.* man_alias.*
+	rm -f edit_man.* man_alias.* *.tmp
 	rm -rf \${DIRS_TO_MAKE}
 CF_EOF
 
diff --git a/dist.mk b/dist.mk
index 82a2f1c55..abd71b3f0 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1546 2023/05/27 09:18:04 tom Exp $
+# $Id: dist.mk,v 1.1547 2023/06/03 09:47:46 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230527
+NCURSES_PATCH = 20230603
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index b9874b7cc..221ebd290 100644
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.25 2021/04/03 22:24:18 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.26 2023/06/03 12:37:04 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
@@ -83,7 +83,7 @@ winnstr(WINDOW *win, char *str, int n)
 
 			init_mb(state);
 			n3 = wcstombs(0, wch, (size_t) 0);
-			if (!isEILSEQ(n3) && (n3 != 0)) {
+			if (!isEILSEQ(n3) && (n3 != 0) && (n3 <= MB_LEN_MAX)) {
 			    size_t need = n3 + 10 + (size_t) i;
 			    int have = (int) n3 + i;
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 2c8729949..e3151cc8c 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.667 2023/05/27 20:13:10 tom Exp $
+ * $Id: curses.priv.h,v 1.668 2023/06/03 12:33:07 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1362,10 +1362,11 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define TR_PUTC(c)	TR(TRACE_CHARPUT, ("PUTC %#x", UChar(c)))
 
 #ifndef MB_LEN_MAX
-#define MB_LEN_MAX 8 /* should be >= MB_CUR_MAX, but that may be a function */
+#define MB_LEN_MAX 16	/* should be >= MB_CUR_MAX, but that may be a function */
 #endif
 
 #if USE_WIDEC_SUPPORT /* { */
+/* true if the status/errno indicate an illegal multibyte sequence */
 #define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))
 
 #define init_mb(state)	memset(&(state), 0, sizeof(state))
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 4b7d39424..c73ab9040 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.102 2023/05/20 18:09:07 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.103 2023/05/28 14:39:10 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -95,11 +95,12 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 #endif /* TRACE */
 
 #if USE_REENTRANT
-#define Locked(statement) { \
+#define Locked(statement) \
+    do { \
 	_nc_lock_global(tst_tracef); \
 	statement; \
 	_nc_unlock_global(tst_tracef); \
-    }
+    } while (0)
 #else
 #define Locked(statement) statement
 #endif
diff --git a/ncurses/widechar/lib_key_name.c b/ncurses/widechar/lib_key_name.c
index 8acfe7a2f..379bdc2d4 100644
--- a/ncurses/widechar/lib_key_name.c
+++ b/ncurses/widechar/lib_key_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2007-2008,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_key_name.c,v 1.5 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_key_name.c,v 1.6 2023/06/03 12:15:34 tom Exp $")
 
 #define MyData _nc_globals.key_name
 
@@ -46,17 +46,22 @@ key_name(wchar_t c)
     cchar_t my_cchar;
     wchar_t *my_wchars;
     size_t len;
+    NCURSES_CONST char *result = NULL;
 
     memset(&my_cchar, 0, sizeof(my_cchar));
     my_cchar.chars[0] = c;
     my_cchar.chars[1] = L'\0';
 
     my_wchars = wunctrl(&my_cchar);
+    /*
+     * wunctrl() could return a wide character rather than just a "printable"
+     * representation.  Check for that and return a corresponding multibyte
+     * character string.
+     */
     len = wcstombs(MyData, my_wchars, sizeof(MyData) - 1);
-    if (isEILSEQ(len) || (len == 0)) {
-	return 0;
+    if (!isEILSEQ(len) && (len != 0) && (len <= MB_LEN_MAX)) {
+	MyData[len] = '\0';
+	result = MyData;
     }
-
-    MyData[len] = '\0';
-    return MyData;
+    return result;
 }
diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index 4ea26b603..1a81fecc8 100644
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2002-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.18 2023/06/03 12:50:52 tom Exp $")
 
 /*
  * Wrapper for wcrtomb() which obtains the length needed for the given
@@ -60,7 +60,7 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
     } else {
 	result = (int) wcrtomb(target, source, state);
     }
-    if (!isEILSEQ(result) && (result == 0))
+    if (!isEILSEQ(result) && ((result == 0) || (result > MB_LEN_MAX)))
 	result = 1;
     return (size_t) result;
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6c037cd77..3c28287b6 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230527) unstable; urgency=low
+ncurses6 (6.4+20230603) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6c037cd77..3c28287b6 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230527) unstable; urgency=low
+ncurses6 (6.4+20230603) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index cbf3ddf78..d40bb4758 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230527) unstable; urgency=low
+ncurses6 (6.4+20230603) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 May 2023 05:18:04 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 75cc1d876..90b736598 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.586 2023/05/27 09:18:04 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.587 2023/06/03 09:47:46 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0527"
+!define VERSION_MMDD  "0603"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index edf591835..0010626ab 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230527
+Release: 20230603
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f4b2e559a..a36303ae6 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230527
+Release: 20230603
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index b218ea6b2..596dd1cf4 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230527
+Release: 20230603
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/testcurs.c b/test/testcurs.c
index a1dc51acc..750e5a450 100644
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
- * $Id: testcurs.c,v 1.57 2022/12/10 23:35:36 tom Exp $
+ * $Id: testcurs.c,v 1.58 2023/05/28 14:23:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -252,11 +252,11 @@ inputTest(WINDOW *win)
 #ifdef KEY_MOUSE
 	if (c == KEY_MOUSE) {
 #if defined(NCURSES_MOUSE_VERSION)
-#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, 037))
-#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED))
-#define ButtonDouble(n)  ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED))
-#define ButtonTriple(n)  ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED))
-#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED))
+#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, (NCURSES_BUTTON_RELEASED|NCURSES_BUTTON_PRESSED|NCURSES_BUTTON_CLICKED|NCURSES_DOUBLE_CLICKED|NCURSES_TRIPLE_CLICKED|NCURSES_RESERVED_EVENT)))
+#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_PRESSED))
+#define ButtonDouble(n)  ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_DOUBLE_CLICKED))
+#define ButtonTriple(n)  ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_TRIPLE_CLICKED))
+#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_RELEASED))
 	    MEVENT event;
 	    int button = 0;
 

From 4d28634a3ac23d7dc6546348ca1fee2b64fdbbe7 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 10 Jun 2023 20:08:15 +0200
Subject: [PATCH 013/106] ncurses-6.4-20230610.patch

---
 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/curs_initscr.3x.html     |  92 ++++++----
 doc/html/man/curs_terminfo.3x.html    | 135 ++++++++-------
 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              |   2 +-
 doc/html/man/tset.1.html              | 231 +++++++++++++-------------
 man/curs_initscr.3x                   |  39 ++++-
 man/curs_terminfo.3x                  |  23 ++-
 man/manhtml.aliases                   |   8 +-
 man/tset.1                            |   7 +-
 misc/terminfo.src                     |   9 +-
 ncurses/curses.priv.h                 |   4 +-
 ncurses/tinfo/lib_kernel.c            |  46 ++---
 ncurses/tinfo/lib_print.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 +-
 36 files changed, 388 insertions(+), 281 deletions(-)

diff --git a/NEWS b/NEWS
index c3506f058..6ee80b4a2 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3959 2023/06/03 20:12:53 tom Exp $
+-- $Id: NEWS,v 1.3962 2023/06/10 16:51:20 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230610
+	+ improve manpages discussing file descriptors in low-level functions.
+	+ modify flushinp to use file descriptors in SCREEN, rather than from
+	  TERMINAL, and check if they are for a terminal, like SVr4.
+	+ modify mcprint to use file descriptor in SCREEN, for consistency.
+	+ add xterm+focus to foot+base (patch by Daniel Ekloef).
+	+ correct definition of Charable() for non-wide ncurses library (report
+	  and test-case by Zbigniew Baniewski).
+
 20230603
 	+ add configure option --with-strip-program, to override program
 	  chosen by the install program for stripping executables (prompted
diff --git a/VERSION b/VERSION
index b733810af..fe6dfafea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230603
+5:0:10	6.4	20230610
diff --git a/dist.mk b/dist.mk
index abd71b3f0..9cee1be5d 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1547 2023/06/03 09:47:46 tom Exp $
+# $Id: dist.mk,v 1.1548 2023/06/10 10:03:51 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230603
+NCURSES_PATCH = 20230610
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 9be1e15dc..3f16ad174 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1   User Commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index ba2a1df9d..fd7895200 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 33b8311c1..ff76e1269 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 08d21a61d..9d6849559 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.39 2022/07/24 15:46:49 tom Exp @
+  * @Id: curs_initscr.3x,v 1.40 2023/06/10 16:50:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -59,7 +59,7 @@ <H1 class="no-header">curs_initscr 3x</H1>
 
        <STRONG>bool</STRONG> <STRONG>isendwin(void);</STRONG>
 
-       <STRONG>SCREEN</STRONG> <STRONG>*newterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outfd</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>infd</EM><STRONG>);</STRONG>
+       <STRONG>SCREEN</STRONG> <STRONG>*newterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>inf</EM><STRONG>);</STRONG>
        <STRONG>SCREEN</STRONG> <STRONG>*set_term(SCREEN</STRONG> <STRONG>*</STRONG><EM>new</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>delscreen(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
@@ -84,18 +84,24 @@ <H1 class="no-header">curs_initscr 3x</H1>
        routine for each terminal instead of <STRONG>initscr</STRONG>.  A program that needs  to
        inspect capabilities, so it can continue to run in a line-oriented mode
        if the terminal cannot support a screen-oriented  program,  would  also
-       use <STRONG>newterm</STRONG>.  The routine <STRONG>newterm</STRONG> should be called once for each termi-
-       nal.  It returns a variable of type <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> which should be saved as a
-       reference to that terminal.  <STRONG>newterm</STRONG>'s arguments are
+       use <STRONG>newterm</STRONG>.
+
+       The  routine  <STRONG>newterm</STRONG>  should be called once for each terminal.  It re-
+       turns a variable of type <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> which should be saved as a  reference
+       to that terminal.  <STRONG>newterm</STRONG>'s arguments are
 
        <STRONG>o</STRONG>   the <EM>type</EM> of the terminal to be used in place of <STRONG>$TERM</STRONG>,
 
-       <STRONG>o</STRONG>   a file pointer for output to the terminal, and
+       <STRONG>o</STRONG>   an output stream connected to the terminal, and
 
-       <STRONG>o</STRONG>   another file pointer for input from the terminal
+       <STRONG>o</STRONG>   an input stream connected to the terminal
 
        If the <EM>type</EM> parameter is <STRONG>NULL</STRONG>, <STRONG>$TERM</STRONG> will be used.
 
+       The  file  descriptor  of the output stream is passed to <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>,
+       which returns a pointer to a <STRONG>TERMINAL</STRONG> structure.  <STRONG>newterm</STRONG>'s return val-
+       ue holds a pointer to the <STRONG>TERMINAL</STRONG> structure.
+
 
 </PRE><H3><a name="h3-endwin">endwin</a></H3><PRE>
        The  program  must also call <STRONG>endwin</STRONG> for each terminal being used before
@@ -201,38 +207,57 @@ <H1 class="no-header">curs_initscr 3x</H1>
            the SVr4 model, deleting only the standard <STRONG>WINDOW</STRONG> structures.
 
 
+</PRE><H3><a name="h3-High-level-versus-low-level">High-level versus low-level</a></H3><PRE>
+       Different  implementations  may  disagree  regarding  the level of some
+       functions.  For example, <STRONG>SCREEN</STRONG> (returned by <STRONG>newterm</STRONG>) and <STRONG>TERMINAL</STRONG> (re-
+       turned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>) hold file descriptors for the output stream.
+       If an application switches screens using <STRONG>set_term</STRONG>, or  switches  termi-
+       nals  using <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>, applications which use the output file de-
+       scriptor can have different behavior depending on which structure holds
+       the corresponding descriptor.
+
+       For example
+
+       <STRONG>o</STRONG>   NetBSD's  <STRONG><A HREF="curs_termattrs.3x.html">baudrate(3x)</A></STRONG>  function  uses  the descriptor in <STRONG>TERMINAL</STRONG>.
+           <STRONG>ncurses</STRONG> and SVr4 use the descriptor in <STRONG>SCREEN</STRONG>.
+
+       <STRONG>o</STRONG>   NetBSD and <STRONG>ncurses</STRONG> use the descriptor in <STRONG>TERMINAL</STRONG> for terminal  I/O
+           modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
+           uses the descriptor in <STRONG>SCREEN</STRONG>.
+
+
 </PRE><H3><a name="h3-Unset-TERM-Variable">Unset TERM Variable</a></H3><PRE>
-       If  the  TERM variable is missing or empty, <STRONG>initscr</STRONG> uses the value "un-
+       If the TERM variable is missing or empty, <STRONG>initscr</STRONG> uses the  value  "un-
        known", which normally corresponds to a terminal entry with the <EM>generic</EM>
-       (<EM>gn</EM>)  capability.   Generic  entries  are  detected  by  <STRONG>setupterm</STRONG> (see
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>) and cannot be used for full-screen operation.  Other
-       implementations may handle a missing/empty TERM variable differently.
+       (<EM>gn</EM>) capability.  Generic entries are  detected  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  and
+       cannot  be  used  for full-screen operation.  Other implementations may
+       handle a missing/empty TERM variable differently.
 
 
 </PRE><H3><a name="h3-Signal-Handlers">Signal Handlers</a></H3><PRE>
        Quoting from X/Open Curses, section 3.1.1:
 
-            <EM>Curses</EM>  <EM>implementations</EM>  <EM>may</EM>  <EM>provide</EM>  <EM>for</EM> <EM>special</EM> <EM>handling</EM> <EM>of</EM> <EM>the</EM>
-            <STRONG>SIGINT</STRONG><EM>,</EM> <STRONG>SIGQUIT</STRONG>  <EM>and</EM>  <STRONG>SIGTSTP</STRONG>  <EM>signals</EM>  <EM>if</EM>  <EM>their</EM>  <EM>disposition</EM>  <EM>is</EM>
+            <EM>Curses</EM> <EM>implementations</EM> <EM>may</EM> <EM>provide</EM> <EM>for</EM>  <EM>special</EM>  <EM>handling</EM>  <EM>of</EM>  <EM>the</EM>
+            <STRONG>SIGINT</STRONG><EM>,</EM>  <STRONG>SIGQUIT</STRONG>  <EM>and</EM>  <STRONG>SIGTSTP</STRONG>  <EM>signals</EM>  <EM>if</EM>  <EM>their</EM>  <EM>disposition</EM> <EM>is</EM>
             <STRONG>SIG_DFL</STRONG> <EM>at</EM> <EM>the</EM> <EM>time</EM> <STRONG>initscr</STRONG> <EM>is</EM> <EM>called</EM> ...
 
-            <EM>Any</EM>  <EM>special</EM>  <EM>handling</EM>  <EM>for</EM> <EM>these</EM> <EM>signals</EM> <EM>may</EM> <EM>remain</EM> <EM>in</EM> <EM>effect</EM> <EM>for</EM>
+            <EM>Any</EM> <EM>special</EM> <EM>handling</EM> <EM>for</EM> <EM>these</EM> <EM>signals</EM> <EM>may</EM> <EM>remain</EM>  <EM>in</EM>  <EM>effect</EM>  <EM>for</EM>
             <EM>the</EM>  <EM>life</EM>  <EM>of</EM>  <EM>the</EM>  <EM>process</EM>  <EM>or</EM>  <EM>until</EM>  <EM>the</EM>  <EM>process</EM>  <EM>changes</EM>  <EM>the</EM>
             <EM>disposition</EM> <EM>of</EM> <EM>the</EM> <EM>signal.</EM>
 
-            <EM>None</EM>  <EM>of</EM> <EM>the</EM> <EM>Curses</EM> <EM>functions</EM> <EM>are</EM> <EM>required</EM> <EM>to</EM> <EM>be</EM> <EM>safe</EM> <EM>with</EM> <EM>respect</EM>
+            <EM>None</EM> <EM>of</EM> <EM>the</EM> <EM>Curses</EM> <EM>functions</EM> <EM>are</EM> <EM>required</EM> <EM>to</EM> <EM>be</EM> <EM>safe</EM> <EM>with</EM>  <EM>respect</EM>
             <EM>to</EM> <EM>signals</EM> ...
 
-       This implementation establishes signal handlers during  initialization,
+       This  implementation establishes signal handlers during initialization,
        e.g., <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  Applications which must handle these signals
-       should set up the corresponding handlers  <EM>after</EM>  initializing  the  li-
+       should  set  up  the  corresponding handlers <EM>after</EM> initializing the li-
        brary:
 
        <STRONG>SIGINT</STRONG>
-            The  handler  <EM>attempts</EM> to cleanup the screen on exit.  Although it
+            The handler <EM>attempts</EM> to cleanup the screen on exit.   Although  it
             <EM>usually</EM> works as expected, there are limitations:
 
-            <STRONG>o</STRONG>   Walking the <STRONG>SCREEN</STRONG> list is unsafe, since all  list  management
+            <STRONG>o</STRONG>   Walking  the  <STRONG>SCREEN</STRONG> list is unsafe, since all list management
                 is done without any signal blocking.
 
             <STRONG>o</STRONG>   On systems which have <STRONG>REENTRANT</STRONG> turned on, <STRONG>set_term</STRONG> uses func-
@@ -242,29 +267,29 @@ <H1 class="no-header">curs_initscr 3x</H1>
                 library functions which are clearly unsafe.
 
        <STRONG>SIGTERM</STRONG>
-            This  uses  the same handler as <STRONG>SIGINT</STRONG>, with the same limitations.
-            It is not mentioned in X/Open Curses, but  is  more  suitable  for
+            This uses the same handler as <STRONG>SIGINT</STRONG>, with the  same  limitations.
+            It  is  not  mentioned  in X/Open Curses, but is more suitable for
             this purpose than <STRONG>SIGQUIT</STRONG> (which is used in debugging).
 
        <STRONG>SIGTSTP</STRONG>
-            This  handles the <EM>stop</EM> signal, used in job control.  When resuming
-            the process,  this  implementation  discards  pending  input  with
-            <STRONG>flushinput</STRONG>  (see  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>), and repaints the screen assuming
-            that it has been completely altered.  It also  updates  the  saved
+            This handles the <EM>stop</EM> signal, used in job control.  When  resuming
+            the  process,  this  implementation  discards  pending  input with
+            <STRONG>flushinput</STRONG> (see <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>), and repaints the  screen  assuming
+            that  it  has  been completely altered.  It also updates the saved
             terminal modes with <STRONG>def_shell_mode</STRONG> (see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>).
 
        <STRONG>SIGWINCH</STRONG>
-            This  handles  the  window-size  changes which were ignored in the
-            standardization efforts.  The handler sets a  (signal-safe)  vari-
-            able  which  is  later  tested in <STRONG>wgetch</STRONG> (see <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>).  If
-            <STRONG>keypad</STRONG> has been enabled for the corresponding window,  <STRONG>wgetch</STRONG>  re-
-            turns  the  key symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time, <STRONG>wgetch</STRONG> calls
-            <STRONG>resizeterm</STRONG> to adjust the standard screen <STRONG>stdscr</STRONG>, and update  other
+            This handles the window-size changes which  were  ignored  in  the
+            standardization  efforts.   The handler sets a (signal-safe) vari-
+            able which is later tested in  <STRONG>wgetch</STRONG>  (see  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>).   If
+            <STRONG>keypad</STRONG>  has  been enabled for the corresponding window, <STRONG>wgetch</STRONG> re-
+            turns the key symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time,  <STRONG>wgetch</STRONG>  calls
+            <STRONG>resizeterm</STRONG>  to adjust the standard screen <STRONG>stdscr</STRONG>, and update other
             data such as <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>, <STRONG>curs_ter-</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,  <STRONG>curs_ter-</STRONG>
        <STRONG><A HREF="curs_terminfo.3x.html">minfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
@@ -289,6 +314,7 @@ <H1 class="no-header">curs_initscr 3x</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Differences">Differences</a></li>
+<li><a href="#h3-High-level-versus-low-level">High-level versus low-level</a></li>
 <li><a href="#h3-Unset-TERM-Variable">Unset TERM Variable</a></li>
 <li><a href="#h3-Signal-Handlers">Signal Handlers</a></li>
 </ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index e39dcfb26..30284177b 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.85 2023/04/23 20:52:38 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.87 2023/06/10 15:51:45 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -173,29 +173,36 @@ <H1 class="no-header">curs_terminfo 3x</H1>
                environment variable <STRONG>TERM</STRONG> is used.
 
           <EM>filedes</EM>
-               is the file descriptor used for all output.
+               is  the  file  descriptor used for getting and setting terminal
+               I/O modes.
+
+               Higher-level applications use <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> for initializing  the
+               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
+               In curses, the two are  the  same  because  <STRONG>newterm</STRONG>  calls  <STRONG>se-</STRONG>
+               <STRONG>tupterm</STRONG>,  passing  the  file descriptor derived from its output
+               stream parameter.
 
           <EM>errret</EM>
                points to an optional location where an error status can be re-
-               turned to the caller.  If <EM>errret</EM> is not  null,  then  <STRONG>setupterm</STRONG>
-               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
-               pointed to by <EM>errret</EM>.  A return value of <STRONG>OK</STRONG> combined with  sta-
+               turned  to  the  caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
+               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
+               pointed  to by <EM>errret</EM>.  A return value of <STRONG>OK</STRONG> combined with sta-
                tus of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>:
 
-               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, cannot be used for
+               <STRONG>1</STRONG>    means that the terminal is hardcopy, cannot  be  used  for
                     curses applications.
 
-                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
+                    <STRONG>setupterm</STRONG>  determines  if  the entry is a hardcopy type by
                     checking the <STRONG>hc</STRONG> (<STRONG>hardcopy</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
-                    a generic type, having too little information  for  curses
+               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
+                    a  generic  type, having too little information for curses
                     applications to run.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
-                    checking the <STRONG>gn</STRONG> (<STRONG>generic</STRONG>) capability.
+                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
+                    checking the <STRONG>gn</STRONG> (<STRONG>generic_type</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <STRONG>terminfo</STRONG> database could not be found.
 
@@ -208,121 +215,124 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       The  <STRONG>setupterm</STRONG>  routine  stores its information about the terminal in a
-       <STRONG>TERMINAL</STRONG> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
-       detects  an error, or decides that the terminal is unsuitable (hardcopy
-       or generic), it discards this information, making it not  available  to
+       The <STRONG>setupterm</STRONG> routine stores its information about the  terminal  in  a
+       <STRONG>TERMINAL</STRONG>  structure  pointed to by the global variable <STRONG>cur_term</STRONG>.  If it
+       detects an error, or decides that the terminal is unsuitable  (hardcopy
+       or  generic),  it discards this information, making it not available to
        applications.
 
-       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
-       reuse the information.  It maintains only one copy of  a  given  termi-
-       nal's  capabilities  in memory.  If it is called for different terminal
-       types, <STRONG>setupterm</STRONG> allocates new storage for each set of  terminal  capa-
+       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type,  it  will
+       reuse  the  information.   It maintains only one copy of a given termi-
+       nal's capabilities in memory.  If it is called for  different  terminal
+       types,  <STRONG>setupterm</STRONG>  allocates new storage for each set of terminal capa-
        bilities.
 
-       The  <STRONG>set_curterm</STRONG>  routine  sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes all of the
-       <STRONG>terminfo</STRONG> boolean, numeric, and string variables  use  the  values  from
+       The <STRONG>set_curterm</STRONG> routine sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes  all  of  the
+       <STRONG>terminfo</STRONG>  boolean,  numeric,  and  string variables use the values from
        <EM>nterm</EM>.  It returns the old value of <STRONG>cur_term</STRONG>.
 
-       The  <STRONG>del_curterm</STRONG>  routine frees the space pointed to by <EM>oterm</EM> and makes
+       The <STRONG>del_curterm</STRONG> routine frees the space pointed to by <EM>oterm</EM>  and  makes
        it available for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, refer-
-       ences  to  any  of  the <STRONG>terminfo</STRONG> boolean, numeric, and string variables
-       thereafter may refer to invalid  memory  locations  until  another  <STRONG>se-</STRONG>
+       ences to any of the <STRONG>terminfo</STRONG> boolean,  numeric,  and  string  variables
+       thereafter  may  refer  to  invalid  memory locations until another <STRONG>se-</STRONG>
        <STRONG>tupterm</STRONG> has been called.
 
-       The  <STRONG>restartterm</STRONG>  routine  is  similar to <STRONG>setupterm</STRONG> and <STRONG>initscr</STRONG>, except
+       The <STRONG>restartterm</STRONG> routine is similar to  <STRONG>setupterm</STRONG>  and  <STRONG>initscr</STRONG>,  except
        that it is called after restoring memory to a previous state (for exam-
-       ple,  when  reloading  a game saved as a core image dump).  <STRONG>restartterm</STRONG>
-       assumes that the windows and the input and output options are the  same
-       as  when  memory  was saved, but the terminal type and baud rate may be
-       different.  Accordingly, <STRONG>restartterm</STRONG>  saves  various  tty  state  bits,
+       ple, when reloading a game saved as a core  image  dump).   <STRONG>restartterm</STRONG>
+       assumes  that the windows and the input and output options are the same
+       as when memory was saved, but the terminal type and baud  rate  may  be
+       different.   Accordingly,  <STRONG>restartterm</STRONG>  saves  various  tty state bits,
        calls <STRONG>setupterm</STRONG>, and then restores the bits.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       The  <STRONG>tparm</STRONG>  routine  instantiates the string <EM>str</EM> with parameters <EM>pi</EM>.  A
-       pointer is returned to the result of <EM>str</EM> with the  parameters  applied.
-       Application  developers  should keep in mind these quirks of the inter-
+       The <STRONG>tparm</STRONG> routine instantiates the string <EM>str</EM> with  parameters  <EM>pi</EM>.   A
+       pointer  is  returned to the result of <EM>str</EM> with the parameters applied.
+       Application developers should keep in mind these quirks of  the  inter-
        face:
 
-       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
+       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
            prototype expects <STRONG>long</STRONG> (integer) values.
 
        <STRONG>o</STRONG>   Aside from the <STRONG>set_attributes</STRONG> (<STRONG>sgr</STRONG>) capability, most terminal capa-
            bilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
+       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
+       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG> which uses  <EM>&lt;stdarg.h&gt;</EM>  rather  than  a
+       <STRONG>tiparm</STRONG>  is  a  newer  form of <STRONG>tparm</STRONG> which uses <EM>&lt;stdarg.h&gt;</EM> rather than a
        fixed-parameter list.  Its numeric parameters are integers (int) rather
        than longs.
 
-       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
-       consistent  with the terminal description.  Two extensions are provided
+       Both  <STRONG>tparm</STRONG>  and  <STRONG>tiparm</STRONG>  assume that the application passes parameters
+       consistent with the terminal description.  Two extensions are  provided
        as alternatives to deal with untrusted data:
 
-       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG>  is an extension which is a safer formatting function than
            <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the curses
-           library how many parameters to expect in the  parameter  list,  and
+           library  how  many  parameters to expect in the parameter list, and
            which may be string parameters.
 
-           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
+           The <EM>mask</EM> parameter has one bit set for each of the  parameters  (up
            to 9) which will be passed as char* rather than numbers.
 
-       <STRONG>o</STRONG>   The extension <STRONG>tiscan_s</STRONG> allows the application to inspect a  format-
+       <STRONG>o</STRONG>   The  extension <STRONG>tiscan_s</STRONG> allows the application to inspect a format-
            ting capability to see what the curses library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       The  <STRONG>tputs</STRONG>  routine  applies padding information (i.e., by interpreting
-       marker embedded in the terminfo capability such as  "$&lt;5&gt;"  as  5  mil-
+       The <STRONG>tputs</STRONG> routine applies padding information  (i.e.,  by  interpreting
+       marker  embedded  in  the  terminfo capability such as "$&lt;5&gt;" as 5 mil-
        liseconds) to the string <EM>str</EM> and outputs it:
 
-       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a terminfo string variable or the return
+       <STRONG>o</STRONG>   The <EM>str</EM> parameter must be a terminfo string variable or the  return
            value from <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
 
-           The <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM>  interface,
-           which  happens to share this function name with the <EM>terminfo</EM> inter-
+           The  <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM> interface,
+           which happens to share this function name with the <EM>terminfo</EM>  inter-
            face.
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or 1 if not applicable.
 
-       <STRONG>o</STRONG>   <EM>putc</EM> is a <STRONG>putchar</STRONG>-like routine to which the characters are  passed,
+       <STRONG>o</STRONG>   <EM>putc</EM>  is a <STRONG>putchar</STRONG>-like routine to which the characters are passed,
            one at a time.
 
-       The  <STRONG>putp</STRONG> routine calls <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG> al-
+       The <STRONG>putp</STRONG> routine calls <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG>  al-
        ways goes to <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
-       The <STRONG>vidputs</STRONG> routine displays the string on the terminal  in  the  video
+       The  <STRONG>vidputs</STRONG>  routine  displays the string on the terminal in the video
        attribute mode <EM>attrs</EM>, which is any combination of the attributes listed
-       in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.  The characters are passed to the  <STRONG>putchar</STRONG>-like  routine
+       in  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.   The characters are passed to the <STRONG>putchar</STRONG>-like routine
        <EM>putc</EM>.
 
        The <STRONG>vidattr</STRONG> routine is like the <STRONG>vidputs</STRONG> routine, except that it outputs
        through <STRONG>putchar</STRONG>.
 
-       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines correspond to vidattr  and  vidputs,
-       respectively.   They  use a set of arguments for representing the video
+       The  <STRONG>vid_attr</STRONG>  and <STRONG>vid_puts</STRONG> routines correspond to vidattr and vidputs,
+       respectively.  They use a set of arguments for representing  the  video
        attributes plus color, i.e.,
 
        <STRONG>o</STRONG>   <EM>attrs</EM> of type <STRONG>attr_t</STRONG> for the attributes and
 
        <STRONG>o</STRONG>   <EM>pair</EM> of type <STRONG>short</STRONG> for the color-pair number.
 
-       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines are designed to  use  the  attribute
+       The  <STRONG>vid_attr</STRONG>  and  <STRONG>vid_puts</STRONG> routines are designed to use the attribute
        constants with the <STRONG>WA_</STRONG> prefix.
 
-       X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
-       applications must provide a null pointer for that argument.  As an  ex-
-       tension,  this  implementation  allows  <EM>opts</EM> to be used as a pointer to
+       X/Open Curses reserves the <EM>opts</EM> argument for future  use,  saying  that
+       applications  must provide a null pointer for that argument.  As an ex-
+       tension, this implementation allows <EM>opts</EM> to be used  as  a  pointer  to
        <STRONG>int</STRONG>, which overrides the <EM>pair</EM> (<STRONG>short</STRONG>) argument.
 
-       The <STRONG>mvcur</STRONG> routine provides low-level cursor motion.   It  takes  effect
-       immediately (rather than at the next refresh).
+       The  <STRONG>mvcur</STRONG>  routine  provides low-level cursor motion.  It takes effect
+       immediately (rather than at the next refresh).  Unlike the  other  low-
+       level  output  functions,  which either write to the standard output or
+       pass an output function parameter, <STRONG>mvcur</STRONG> uses an output file descriptor
+       derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
        While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions which do not use the high-
        level curses state, they are declared in <STRONG>&lt;curses.h&gt;</STRONG> because SystemV did
@@ -460,7 +470,6 @@ <H1 class="no-header">curs_terminfo 3x</H1>
        mvcur       low level cursor motion
        putp        utility function that uses <STRONG>tputs</STRONG> to send  char-
                    acters via <STRONG>putchar</STRONG>.
-
        resetterm   set tty modes to "out of curses" state
        resetty     reset tty flags to stored value
        saveterm    save current modes as "in curses" state
@@ -637,6 +646,12 @@ <H1 class="no-header">curs_terminfo 3x</H1>
        <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty TERM variable as  the  special
            value "unknown".
 
+           SVr4 curses uses the special value "dumb".
+
+           The  difference  between  the  two  is  that the former uses the <STRONG>gn</STRONG>
+           (<STRONG>generic_type</STRONG>) terminfo capability, while the latter does  not.   A
+           generic terminal is unsuitable for full-screen applications.
+
        <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
            checking if $TERM is set to "#win32con" or an abbreviation of  that
            string.
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 0cd939680..e3e06b23f 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index b59abd93e..e21bc779b 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 32e9d4320..b0962055c 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 38c6d3c7b..91971f580 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 15b1d8f2a..e618afb95 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 8393f146e..fe6105f32 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 25b330fb9..251062a89 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 7573d4f07..eab405472 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index e540c8f81..fdd06dbf1 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 9779a01a1..883910558 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index c51a0b845..a3828af6b 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 604376cb4..00ff9cfbf 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index f6b5eb20d..510dce1b6 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.62 2022/02/12 20:02:20 tom Exp @
+  * @Id: tset.1,v 1.63 2023/06/10 15:46:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -86,37 +86,38 @@ <H1 class="no-header">tset 1</H1>
        and systems using that convention, <STRONG>getty(1)</STRONG> does this  job  by  setting
        <STRONG>TERM</STRONG> according to the type passed to it by <EM>/etc/inittab</EM>.)
 
-       4. The default terminal type, "unknown".
+       4.  The  default  terminal  type, "unknown", is not suitable for curses
+       applications.
 
-       If  the  terminal  type  was  not specified on the command-line, the <STRONG>-m</STRONG>
+       If the terminal type was not specified  on  the  command-line,  the  <STRONG>-m</STRONG>
        option mappings are then applied (see the section <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG>
-       for  more  information).   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
+       for more information).  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 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,
 
-       <STRONG>o</STRONG>   if  the  "<STRONG>-w</STRONG>"  option  is  enabled,  <STRONG>tset</STRONG> may update the terminal's
+       <STRONG>o</STRONG>   if the "<STRONG>-w</STRONG>" option is  enabled,  <STRONG>tset</STRONG>  may  update  the  terminal's
            window size.
 
-           If the window size cannot be obtained from  the  operating  system,
-           but  the  terminal  description  (or  environment,  e.g., <STRONG>LINES</STRONG> and
-           <STRONG>COLUMNS</STRONG> variables specify this), use  this  to  set  the  operating
+           If  the  window  size cannot be obtained from the operating system,
+           but the terminal  description  (or  environment,  e.g.,  <STRONG>LINES</STRONG>  and
+           <STRONG>COLUMNS</STRONG>  variables  specify  this),  use  this to set the operating
            system's notion of the window size.
 
-       <STRONG>o</STRONG>   if  the  "<STRONG>-c</STRONG>"  option is enabled, the backspace, interrupt and line
+       <STRONG>o</STRONG>   if the "<STRONG>-c</STRONG>" option is enabled, the backspace,  interrupt  and  line
            kill characters (among many other things) are set
 
-       <STRONG>o</STRONG>   unless  the  "<STRONG>-I</STRONG>"  option  is  enabled,  the   terminal   and   tab
-           <EM>initialization</EM>  strings  are sent to the standard error output, and
+       <STRONG>o</STRONG>   unless   the   "<STRONG>-I</STRONG>"   option  is  enabled,  the  terminal  and  tab
+           <EM>initialization</EM> strings are sent to the standard error  output,  and
            <STRONG>tset</STRONG> waits one second (in case a hardware reset was issued).
 
-       <STRONG>o</STRONG>   Finally, if the erase, interrupt  and  line  kill  characters  have
-           changed,  or  are not set to their default values, their values are
+       <STRONG>o</STRONG>   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.
 
 
@@ -132,10 +133,10 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>o</STRONG>   resets any unset special characters to their default values
 
        before doing the terminal initialization described above.  Also, rather
-       than  using  the  terminal <EM>initialization</EM> strings, it uses the terminal
+       than using the terminal <EM>initialization</EM> strings, it  uses  the  terminal
        <EM>reset</EM> strings.
 
-       The <STRONG>reset</STRONG> command is useful after a program dies leaving a terminal  in
+       The  <STRONG>reset</STRONG> command is useful after a program dies leaving a terminal in
        an abnormal state:
 
        <STRONG>o</STRONG>   you may have to type
@@ -143,7 +144,7 @@ <H1 class="no-header">tset 1</H1>
                <EM>&lt;LF&gt;</EM><STRONG>reset</STRONG><EM>&lt;LF&gt;</EM>
 
            (the line-feed character is normally control-J) to get the terminal
-           to work, as carriage-return may no  longer  work  in  the  abnormal
+           to  work,  as  carriage-return  may  no longer work in the abnormal
            state.
 
        <STRONG>o</STRONG>   Also, the terminal will often not echo the command.
@@ -157,7 +158,7 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>-e</STRONG> <EM>ch</EM>
             Set the erase character to <EM>ch</EM>.
 
-       <STRONG>-I</STRONG>   Do  not  send  the  terminal  or tab initialization strings to the
+       <STRONG>-I</STRONG>   Do not send the terminal or  tab  initialization  strings  to  the
             terminal.
 
        <STRONG>-i</STRONG> <EM>ch</EM>
@@ -170,12 +171,12 @@ <H1 class="no-header">tset 1</H1>
             Specify a mapping from a port type to a terminal.  See the section
             <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG> for more information.
 
-       <STRONG>-Q</STRONG>   Do  not  display any values for the erase, interrupt and line kill
-            characters.   Normally  <STRONG>tset</STRONG>  displays  the  values  for   control
+       <STRONG>-Q</STRONG>   Do not display any values for the erase, interrupt and  line  kill
+            characters.    Normally  <STRONG>tset</STRONG>  displays  the  values  for  control
             characters which differ from the system's default values.
 
-       <STRONG>-q</STRONG>   The  terminal  type  is  displayed to the standard output, and the
-            terminal is not initialized in any way.  The option "-" by  itself
+       <STRONG>-q</STRONG>   The terminal type is displayed to the  standard  output,  and  the
+            terminal  is not initialized in any way.  The option "-" by itself
             is equivalent but archaic.
 
        <STRONG>-r</STRONG>   Print the terminal type to the standard error output.
@@ -187,177 +188,177 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
             exits.
 
-       <STRONG>-w</STRONG>   Resize the window to match the  size  deduced  via  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
-            Normally  this  has  no  effect,  unless  <STRONG>setupterm</STRONG> is not able to
+       <STRONG>-w</STRONG>   Resize  the  window  to  match the size deduced via <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
+            Normally this has no effect,  unless  <STRONG>setupterm</STRONG>  is  not  able  to
             detect the window size.
 
-       The arguments for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be  entered  as
-       actual  characters  or by using the "hat" notation, i.e., control-h may
+       The  arguments  for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be entered as
+       actual characters or by using the "hat" notation, i.e.,  control-h  may
        be specified as "^H" or "^h".
 
        If neither <STRONG>-c</STRONG> or <STRONG>-w</STRONG> is given, both options are assumed.
 
 
 </PRE><H2><a name="h2-SETTING-THE-ENVIRONMENT">SETTING THE ENVIRONMENT</a></H2><PRE>
-       It is often desirable to enter the terminal type and information  about
+       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 <STRONG>-s</STRONG> option.
 
-       When the <STRONG>-s</STRONG> option is specified, the commands to enter the  information
-       into  the  shell's  environment are written to the standard output.  If
-       the <STRONG>SHELL</STRONG> environmental variable ends in "csh", the  commands  are  for
-       <STRONG>csh</STRONG>,  otherwise,  they  are  for <STRONG>sh(1)</STRONG>.  Note, the <STRONG>csh</STRONG> commands set and
-       unset the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following  line
-       in  the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the environment
+       When  the <STRONG>-s</STRONG> option is specified, the commands to enter the information
+       into the shell's environment are written to the  standard  output.   If
+       the  <STRONG>SHELL</STRONG>  environmental  variable ends in "csh", the commands are for
+       <STRONG>csh</STRONG>, otherwise, they are for <STRONG>sh(1)</STRONG>.  Note, the  <STRONG>csh</STRONG>  commands  set  and
+       unset  the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following line
+       in the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the  environment
        correctly:
 
            eval `tset -s options ... `
 
 
 </PRE><H2><a name="h2-TERMINAL-TYPE-MAPPING">TERMINAL TYPE MAPPING</a></H2><PRE>
-       When the terminal is not hardwired into  the  system  (or  the  current
-       system  information  is  incorrect)  the terminal type derived from the
-       <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental variable  is  often  something
-       generic  like  <STRONG>network</STRONG>,  <STRONG>dialup</STRONG>,  or  <STRONG>unknown</STRONG>.   When <STRONG>tset</STRONG> is used in a
-       startup script it is often desirable to provide information  about  the
+       When  the  terminal  is  not  hardwired into the system (or the current
+       system information is incorrect) the terminal  type  derived  from  the
+       <EM>/etc/ttys</EM>  file  or  the <STRONG>TERM</STRONG> environmental variable is often something
+       generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>, or <STRONG>unknown</STRONG>.   When  <STRONG>tset</STRONG>  is  used  in  a
+       startup  script  it is often desirable to provide information about the
        type of terminal used on such ports.
 
-       The  <STRONG>-m</STRONG>  options  maps  from some set of conditions to a terminal type,
+       The <STRONG>-m</STRONG> options maps from some set of conditions  to  a  terminal  type,
        that is, to tell <STRONG>tset</STRONG> "If I'm on this port at a particular speed, guess
        that I'm on that kind of terminal".
 
-       The  argument  to  the  <STRONG>-m</STRONG> option consists of an optional port type, an
-       optional operator, an optional baud  rate  specification,  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 "&gt;", "&lt;", "@", and "!"; "&gt;" means
-       greater than, "&lt;" 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 argument to the <STRONG>-m</STRONG> option consists of an  optional  port  type,  an
+       optional  operator,  an  optional  baud rate specification, 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 "&gt;", "&lt;", "@", and  "!";  "&gt;"  means
+       greater  than,  "&lt;" 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 terminal type is a string.
 
-       If  the  terminal  type  is  not  specified on the command line, the <STRONG>-m</STRONG>
-       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
+       If the terminal type is not specified  on  the  command  line,  the  <STRONG>-m</STRONG>
+       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 applicable mapping is used.
 
-       For  example,  consider  the following mapping: <STRONG>dialup&gt;9600:vt100</STRONG>.  The
+       For example, consider the following  mapping:  <STRONG>dialup&gt;9600:vt100</STRONG>.   The
        port type is dialup , the operator is &gt;, the baud rate specification is
        9600, and the terminal type is vt100.  The result of this mapping is to
-       specify that if the terminal type is  <STRONG>dialup</STRONG>,  and  the  baud  rate  is
+       specify  that  if  the  terminal  type  is <STRONG>dialup</STRONG>, and the baud rate is
        greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> 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,  <STRONG>-m</STRONG>  <STRONG>dialup:vt100</STRONG> <STRONG>-m</STRONG> <STRONG>:?xterm</STRONG> will cause any
+       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, <STRONG>-m</STRONG> <STRONG>dialup:vt100</STRONG>  <STRONG>-m</STRONG>  <STRONG>:?xterm</STRONG>  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
+       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 <STRONG>-m</STRONG> option argument.
-       Also, to avoid problems with meta-characters, it is suggested that  the
+       No whitespace characters are  permitted  in  the  <STRONG>-m</STRONG>  option  argument.
+       Also,  to avoid problems with meta-characters, it is suggested that the
        entire <STRONG>-m</STRONG> option argument be placed within single quote characters, and
-       that  <STRONG>csh</STRONG>  users  insert  a  backslash  character  ("\")   before   any
+       that   <STRONG>csh</STRONG>   users  insert  a  backslash  character  ("\")  before  any
        exclamation marks ("!").
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A  <STRONG>reset</STRONG> command appeared in 1BSD (March 1978), written by Kurt Shoens.
-       This program set the <EM>erase</EM> and <EM>kill</EM> characters to <STRONG>^H</STRONG> (backspace) and  <STRONG>@</STRONG>
+       A <STRONG>reset</STRONG> command appeared in 1BSD (March 1978), written by Kurt  Shoens.
+       This  program set the <EM>erase</EM> and <EM>kill</EM> characters to <STRONG>^H</STRONG> (backspace) and <STRONG>@</STRONG>
        respectively.  Mark Horton improved that in 3BSD (October 1979), adding
-       <EM>intr</EM>, <EM>quit</EM>, <EM>start</EM>/<EM>stop</EM> and <EM>eof</EM>  characters  as  well  as  changing  the
-       program  to  avoid  modifying any user settings.  That version of <STRONG>reset</STRONG>
+       <EM>intr</EM>,  <EM>quit</EM>,  <EM>start</EM>/<EM>stop</EM>  and  <EM>eof</EM>  characters  as well as changing the
+       program to avoid modifying any user settings.  That  version  of  <STRONG>reset</STRONG>
        did not use the termcap database.
 
-       A separate <STRONG>tset</STRONG> command was provided in 1BSD by Eric Allman, using  the
-       termcap  database.   Allman's comments in the source code indicate that
+       A  separate <STRONG>tset</STRONG> command was provided in 1BSD by Eric Allman, using the
+       termcap database.  Allman's comments in the source code  indicate  that
        he began work in October 1977, continuing development over the next few
        years.
 
        According to comments in the source code, the <STRONG>tset</STRONG> program was modified
-       in September 1980, to use logic copied from the 3BSD  "reset"  when  it
+       in  September  1980,  to use logic copied from the 3BSD "reset" when it
        was invoked as <STRONG>reset</STRONG>.  This version appeared in 4.1cBSD, late in 1982.
 
        Other developers (e.g., Keith Bostic and Jim Bloom) continued to modify
        <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
 
-       The <STRONG>ncurses</STRONG> implementation was lightly adapted from the 4.4BSD  sources
+       The  <STRONG>ncurses</STRONG> implementation was lightly adapted from the 4.4BSD sources
        for a terminfo environment by Eric S. Raymond &lt;esr@snark.thyrsus.com&gt;.
 
 
 </PRE><H2><a name="h2-COMPATIBILITY">COMPATIBILITY</a></H2><PRE>
-       Neither  IEEE  Std  1003.1/The  Open  Group Base Specifications Issue 7
+       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
        (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
 
-       The AT&amp;T <STRONG>tput</STRONG> utility (AIX, HPUX, Solaris) incorporated  the  terminal-
-       mode  manipulation  as well as termcap-based features such as resetting
-       tabstops from <STRONG>tset</STRONG> in BSD (4.1c),  presumably  with  the  intention  of
-       making  <STRONG>tset</STRONG>  obsolete.   However, each of those systems still provides
-       <STRONG>tset</STRONG>.  In fact, the commonly-used <STRONG>reset</STRONG> utility is always an alias  for
+       The  AT&amp;T  <STRONG>tput</STRONG> utility (AIX, HPUX, Solaris) incorporated the terminal-
+       mode manipulation as well as termcap-based features such  as  resetting
+       tabstops  from  <STRONG>tset</STRONG>  in  BSD  (4.1c), presumably with the intention of
+       making <STRONG>tset</STRONG> obsolete.  However, each of those  systems  still  provides
+       <STRONG>tset</STRONG>.   In fact, the commonly-used <STRONG>reset</STRONG> utility is always an alias for
        <STRONG>tset</STRONG>.
 
-       The   <STRONG>tset</STRONG>   utility   provides  for  backward-compatibility  with  BSD
-       environments (under most modern UNIXes, <STRONG>/etc/inittab</STRONG> and  <STRONG>getty(1)</STRONG>  can
-       set  <STRONG>TERM</STRONG>  appropriately  for each dial-up line; this obviates what was
-       <STRONG>tset</STRONG>'s most important use).  This implementation  behaves  like  4.4BSD
+       The  <STRONG>tset</STRONG>  utility  provides  for   backward-compatibility   with   BSD
+       environments  (under  most modern UNIXes, <STRONG>/etc/inittab</STRONG> and <STRONG>getty(1)</STRONG> can
+       set <STRONG>TERM</STRONG> appropriately for each dial-up line; this  obviates  what  was
+       <STRONG>tset</STRONG>'s  most  important  use).  This implementation behaves like 4.4BSD
        <STRONG>tset</STRONG>, with a few exceptions specified here.
 
-       A  few  options are different because the <STRONG>TERMCAP</STRONG> variable is no longer
+       A few options are different because the <STRONG>TERMCAP</STRONG> variable is  no  longer
        supported under terminfo-based <STRONG>ncurses</STRONG>:
 
-       <STRONG>o</STRONG>   The <STRONG>-S</STRONG> option of BSD <STRONG>tset</STRONG> no  longer  works;  it  prints  an  error
+       <STRONG>o</STRONG>   The  <STRONG>-S</STRONG>  option  of  BSD  <STRONG>tset</STRONG>  no longer works; it prints an error
            message to the standard error and dies.
 
        <STRONG>o</STRONG>   The <STRONG>-s</STRONG> option only sets <STRONG>TERM</STRONG>, not <STRONG>TERMCAP</STRONG>.
 
-       There  was an undocumented 4.4BSD feature that invoking <STRONG>tset</STRONG> via a link
-       named "TSET" (or via  any  other  name  beginning  with  an  upper-case
+       There was an undocumented 4.4BSD feature that invoking <STRONG>tset</STRONG> via a  link
+       named  "TSET"  (or  via  any  other  name  beginning with an upper-case
        letter) set the terminal to use upper-case only.  This feature has been
        omitted.
 
        The <STRONG>-A</STRONG>, <STRONG>-E</STRONG>, <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were deleted from the <STRONG>tset</STRONG> utility in
-       4.4BSD.   None of them were documented in 4.3BSD and all are of limited
-       utility at best.   The  <STRONG>-a</STRONG>,  <STRONG>-d</STRONG>,  and  <STRONG>-p</STRONG>  options  are  similarly  not
-       documented  or  useful,  but  were  retained  as  they  appear to be in
-       widespread use.  It is strongly recommended that  any  usage  of  these
+       4.4BSD.  None of them were documented in 4.3BSD and all are of  limited
+       utility  at  best.   The  <STRONG>-a</STRONG>,  <STRONG>-d</STRONG>,  and  <STRONG>-p</STRONG>  options  are similarly not
+       documented or useful, but  were  retained  as  they  appear  to  be  in
+       widespread  use.   It  is  strongly recommended that any usage of these
        three options be changed to use the <STRONG>-m</STRONG> option instead.  The <STRONG>-a</STRONG>, <STRONG>-d</STRONG>, and
        <STRONG>-p</STRONG> options are therefore omitted from the usage summary above.
 
-       Very old systems, e.g., 3BSD, used a different  terminal  driver  which
-       was  replaced  in  4BSD in the early 1980s.  To accommodate these older
-       systems, the 4BSD <STRONG>tset</STRONG> provided a <STRONG>-n</STRONG> option to  specify  that  the  new
-       terminal  driver  should be used.  This implementation does not provide
+       Very  old  systems,  e.g., 3BSD, used a different terminal driver which
+       was replaced in 4BSD in the early 1980s.  To  accommodate  these  older
+       systems,  the  4BSD  <STRONG>tset</STRONG>  provided a <STRONG>-n</STRONG> option to specify that the new
+       terminal driver should be used.  This implementation does  not  provide
        that choice.
 
-       It is still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG>  options  without
+       It  is  still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options without
        arguments, although it is strongly recommended that such usage be fixed
        to explicitly specify the character.
 
-       As of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies the <STRONG>-Q</STRONG>  option.
+       As  of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies the <STRONG>-Q</STRONG> option.
        Also, the interaction between the - option and the <EM>terminal</EM> argument in
        some historic implementations of <STRONG>tset</STRONG> has been removed.
 
-       The <STRONG>-c</STRONG> and  <STRONG>-w</STRONG>  options  are  not  found  in  earlier  implementations.
+       The  <STRONG>-c</STRONG>  and  <STRONG>-w</STRONG>  options  are  not  found  in earlier implementations.
        However, a different window size-change feature was provided in 4.4BSD.
 
-       <STRONG>o</STRONG>   In  4.4BSD,  <STRONG>tset</STRONG> uses the window size from the termcap description
-           to set the window size if <STRONG>tset</STRONG> is not able  to  obtain  the  window
+       <STRONG>o</STRONG>   In 4.4BSD, <STRONG>tset</STRONG> uses the window size from the  termcap  description
+           to  set  the  window  size if <STRONG>tset</STRONG> is not able to obtain the window
            size from the operating system.
 
        <STRONG>o</STRONG>   In ncurses, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
-           be from the operating system, the  <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>  environment
+           be  from  the  operating  system, the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment
            variables or the terminal description.
 
-       Obtaining  the  window  size from the terminal description is common to
-       both implementations, but considered obsolescent.  Its  only  practical
+       Obtaining the window size from the terminal description  is  common  to
+       both  implementations,  but considered obsolescent.  Its only practical
        use is for hardware terminals.  Generally speaking, a window size would
-       be unset only if there were some problem obtaining the value  from  the
-       operating  system  (and  <STRONG>setupterm</STRONG> would still fail).  For that reason,
-       the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment variables may be useful  for  working
-       around  window-size  problems.   Those  have  the  drawback that if the
-       window is resized, those variables must be recomputed  and  reassigned.
+       be  unset  only if there were some problem obtaining the value from the
+       operating system (and <STRONG>setupterm</STRONG> would still fail).   For  that  reason,
+       the  <STRONG>LINES</STRONG>  and <STRONG>COLUMNS</STRONG> environment variables may be useful for working
+       around window-size problems.  Those  have  the  drawback  that  if  the
+       window  is  resized, those variables must be recomputed and reassigned.
        To do this more easily, use the <STRONG>resize(1)</STRONG> program.
 
 
@@ -365,22 +366,22 @@ <H1 class="no-header">tset 1</H1>
        The <STRONG>tset</STRONG> command uses these environment variables:
 
        SHELL
-            tells  <STRONG>tset</STRONG>  whether  to  initialize  <STRONG>TERM</STRONG>  using  <STRONG>sh(1)</STRONG> or <STRONG>csh(1)</STRONG>
+            tells <STRONG>tset</STRONG> whether  to  initialize  <STRONG>TERM</STRONG>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
             syntax.
 
-       TERM Denotes your terminal  type.   Each  terminal  type  is  distinct,
+       TERM Denotes  your  terminal  type.   Each  terminal  type is distinct,
             though many are similar.
 
        TERMCAP
-            may  denote  the  location of a termcap database.  If it is not an
-            absolute pathname, e.g., begins  with  a  "/",  <STRONG>tset</STRONG>  removes  the
-            variable  from  the  environment  before  looking for the terminal
+            may denote the location of a termcap database.  If it  is  not  an
+            absolute  pathname,  e.g.,  begins  with  a  "/", <STRONG>tset</STRONG> removes the
+            variable from the environment  before  looking  for  the  terminal
             description.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
        /etc/ttys
-            system port name to terminal type mapping database  (BSD  versions
+            system  port  name to terminal type mapping database (BSD versions
             only).
 
        /usr/share/terminfo
@@ -388,10 +389,10 @@ <H1 class="no-header">tset 1</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
+       <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230423).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
 
 
 
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 5e17ead0a..3451991b2 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.39 2022/07/24 15:46:49 tom Exp $
+.\" $Id: curs_initscr.3x,v 1.40 2023/06/10 16:50:22 tom Exp $
 .TH curs_initscr 3X ""
 .de bP
 .ie n  .IP \(bu 4
@@ -57,7 +57,7 @@
 .sp
 \fBbool isendwin(void);\fP
 .sp
-\fBSCREEN *newterm(const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
+\fBSCREEN *newterm(const char *\fItype\fB, FILE *\fIoutf\fB, FILE *\fIinf\fB);\fR
 .br
 \fBSCREEN *set_term(SCREEN *\fInew\fB);\fR
 .br
@@ -88,6 +88,7 @@ A program that needs to inspect capabilities,
 so it can continue to run in a line-oriented mode if the
 terminal cannot support a screen-oriented program, would also use
 \fBnewterm\fP.
+.PP
 The routine \fBnewterm\fP should be called once for each terminal.
 It returns a variable of type \fBSCREEN *\fP which should be saved
 as a reference to that terminal.
@@ -95,11 +96,15 @@ as a reference to that terminal.
 .bP
 the \fItype\fP of the terminal to be used in place of \fB$TERM\fP,
 .bP
-a file pointer for output to the terminal, and
+an output stream connected to the terminal, and
 .bP
-another file pointer for input from the terminal
+an input stream connected to the terminal
 .PP
 If the \fItype\fP parameter is \fBNULL\fP, \fB$TERM\fP will be used.
+.PP
+The file descriptor of the output stream is passed to \fBsetupterm\fP(3X),
+which returns a pointer to a \fBTERMINAL\fP structure.
+\fBnewterm\fP's return value holds a pointer to the \fBTERMINAL\fP structure.
 .SS endwin
 .PP
 The program must also call
@@ -205,14 +210,34 @@ using that information to delete those windows when \fBdelscreen\fP is called.
 NetBSD copied this feature of ncurses in 2001.
 PDCurses follows the SVr4 model,
 deleting only the standard \fBWINDOW\fP structures.
+.SS High-level versus low-level
+Different implementations may disagree regarding the level of some functions.
+For example, \fBSCREEN\fP (returned by \fBnewterm\fP) and
+\fBTERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
+the output stream.
+If an application switches screens using \fBset_term\fR,
+or switches terminals using \fBset_curterm\fP(3X),
+applications which use the output file descriptor can have different
+behavior depending on which structure holds the corresponding descriptor.
+.PP
+For example
+.bP
+NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fBTERMINAL\fP.
+\fBncurses\fP and SVr4 use the descriptor in \fBSCREEN\fP.
+.bP
+NetBSD and \fBncurses\fP use the descriptor in \fBTERMINAL\fP for terminal I/O modes,
+e.g.,
+\fBdef_shell_mode\fP(3X),
+\fBdef_prog_mode\fP(3X).
+SVr4 curses uses the descriptor in \fBSCREEN\fP.
 .SS Unset TERM Variable
 .PP
 If the TERM variable is missing or empty, \fBinitscr\fP uses the
 value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the \fIgeneric\fP
 (\fIgn\fP) capability.
-Generic entries are detected by \fBsetupterm\fP
-(see curs_terminfo(3X)) and cannot be used for full-screen operation.
+Generic entries are detected by \fBsetupterm\fP(3X)
+and cannot be used for full-screen operation.
 Other implementations may handle a missing/empty TERM variable differently.
 .SS Signal Handlers
 .PP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 4e08bcbcb..6b469b16b 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.85 2023/04/23 20:52:38 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.87 2023/06/10 15:51:45 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -201,7 +201,12 @@ is the terminal type, a character string.
 If \fIterm\fP is null, the environment variable \fBTERM\fP is used.
 .TP 5
 \fIfiledes\fP
-is the file descriptor used for all output.
+is the file descriptor used for getting and setting terminal I/O modes.
+.IP
+Higher-level applications use \fBnewterm\fP(3X) for initializing the terminal,
+passing an output \fIstream\fP rather than a \fIdescriptor\fP.
+In curses, the two are the same because \fBnewterm\fP calls \fBsetupterm\fP,
+passing the file descriptor derived from its output stream parameter.
 .TP 5
 \fIerrret\fP
 points to an optional location where an error status can be returned to
@@ -228,7 +233,7 @@ or that it is a generic type,
 having too little information for curses applications to run.
 .IP
 \fBsetupterm\fP determines if the entry is a generic type by
-checking the \fBgn\fP (\fBgeneric\fP) capability.
+checking the \fBgn\fP (\fBgeneric_type\fP) capability.
 .TP 5
 .B \-1
 means that the \fBterminfo\fP database could not be found.
@@ -374,6 +379,10 @@ which overrides the \fIpair\fP (\fBshort\fP) argument.
 .PP
 The \fBmvcur\fP routine provides low-level cursor motion.
 It takes effect immediately (rather than at the next refresh).
+Unlike the other low-level output functions,
+which either write to the standard output or pass an output function parameter,
+\fBmvcur\fP uses an output file descriptor derived from
+the output stream parameter of \fBnewterm\fP(3X).
 .PP
 While \fBputp\fP and \fBmvcur\fP are low-level functions which
 do not use the high-level curses state,
@@ -736,6 +745,14 @@ e.g., for the MinGW port,
 .bP
 \fBsetupterm\fP interprets a missing/empty TERM variable as the
 special value \*(``unknown\*(''.
+.IP
+SVr4 curses uses the 
+special value \*(``dumb\*(''.
+.IP
+The difference between the two is that
+the former uses the \fBgn\fP (\fBgeneric_type\fR) terminfo capability,
+while the latter does not.
+A generic terminal is unsuitable for full-screen applications.
 .bP
 \fBsetupterm\fP allows explicit use of the
 the windows console driver by checking if $TERM is set to
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 1f85bc5c4..4e890838b 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,6 +1,6 @@
-# $Id: manhtml.aliases,v 1.21 2022/11/26 13:57:22 tom Exp $
+# $Id: manhtml.aliases,v 1.22 2023/06/10 17:09:27 tom Exp $
 #***************************************************************************
-# Copyright 2019-2020,2022 Thomas E. Dickey                                *
+# Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,8 +30,11 @@
 # Items in this list will be linked to the corresponding manpages by man2html
 addch(3X)		curs_addch(3X)
 assume_default_colors(3X)	default_colors(3X)
+baudrate(3X)		curs_termattrs(3X)
 clearok(3X)		curs_outopts(3X)
 curs_set(3X)		curs_kernel(3X)
+def_prog_mode(3X)	curs_kernel(3X)
+def_shell_mode(3X)	curs_kernel(3X)
 delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 endwin(3X)		curs_initscr(3X)
@@ -53,6 +56,7 @@ newterm(3X)		curs_initscr(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
+set_curterm(3X)		curs_terminfo(3X)
 set_term(3X)		curs_initscr(3X)
 setcchar(3X)		curs_getcchar(3X)
 setupterm(3X)		curs_terminfo(3X)
diff --git a/man/tset.1 b/man/tset.1
index 860c08759..d43154440 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.62 2022/02/12 20:02:20 tom Exp $
+.\" $Id: tset.1,v 1.63 2023/06/10 15:46:24 tom Exp $
 .TH @TSET@ 1 ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -76,7 +76,8 @@ error output device in the \fI/etc/ttys\fP file.
 \fBgetty\fP(1) does this job by setting
 \fBTERM\fP according to the type passed to it by \fI/etc/inittab\fP.)
 .PP
-4. The default terminal type, \*(``unknown\*(''.
+4. The default terminal type, \*(``unknown\*('',
+is not suitable for curses applications.
 .PP
 If the terminal type was not specified on the command-line, the \fB\-m\fP
 option mappings are then applied (see the section
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 46070b61c..c11f98f52 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1058 $
-#	$Date: 2023/05/08 08:23:18 $
+#	$Revision: 1.1059 $
+#	$Date: 2023/06/05 21:40: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
@@ -8009,7 +8009,7 @@ foot+base|foot base fragment,
 	use=ecma+strikeout, use=xterm+alt+title,
 	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
 	use=xterm+sl-alt, use=bracketed+paste,
-	use=report+version,
+	use=report+version, use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -27813,4 +27813,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-05-08
 #	+ add mode 1004 to xterm+sm+1006 from xterm #380 -TD
 #
+# 2023-06-05
+#	+ add xterm+focus to foot+base (patch by Daniel Ekloef).
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index e3151cc8c..e7146ef7f 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.668 2023/06/03 12:33:07 tom Exp $
+ * $Id: curses.priv.h,v 1.669 2023/06/06 22:31:04 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1498,7 +1498,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define isWidecExt(ch)	(0)
 #define if_WIDEC(code) /* nothing */
 
-#define Charable(ch)	((ch) >= ' ' && (ch) <= '~')
+#define Charable(ch)	(CharOf(ch) >= ' ' && CharOf(ch) <= '~')
 #define L(ch)		ch
 #endif /* } */
 
diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index f7cbaba54..46f652b0a 100644
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_kernel.c,v 1.35 2022/07/28 20:14:51 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.36 2023/06/10 13:29:06 tom Exp $")
 
 #ifdef TERMIOS
 static int
@@ -148,34 +148,40 @@ killchar(void)
 }
 #endif
 
+static void
+flush_input(int fd)
+{
+#ifdef TERMIOS
+    tcflush(fd, TCIFLUSH);
+#else /* !TERMIOS */
+    errno = 0;
+    do {
+#if defined(EXP_WIN32_DRIVER)
+	_nc_console_flush(_nc_console_fd2handle(fd));
+#else
+	ioctl(fd, TIOCFLUSH, 0);
+#endif
+    } while
+	(errno == EINTR);
+#endif
+}
+
 /*
  *	flushinp()
  *
- *	Flush any input on cur_term->Filedes
- *
+ *	Flush any input on tty
  */
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
-    TERMINAL *termp = TerminalOf(SP_PARM);
-
     T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
 
-    if (termp != 0) {
-#ifdef TERMIOS
-	tcflush(termp->Filedes, TCIFLUSH);
-#else
-	errno = 0;
-	do {
-#if defined(EXP_WIN32_DRIVER)
-	    _nc_console_flush(_nc_console_fd2handle(termp->Filedes));
-#else
-	    ioctl(termp->Filedes, TIOCFLUSH, 0);
-#endif
-	} while
-	    (errno == EINTR);
-#endif
+    if (SP_PARM != 0) {
+	if (NC_ISATTY(SP_PARM->_ifd))
+	    flush_input(SP_PARM->_ifd);
+	else if (NC_ISATTY(SP_PARM->_ofd))
+	    flush_input(SP_PARM->_ofd);
 	if (SP_PARM) {
 	    SP_PARM->_fifohead = -1;
 	    SP_PARM->_fifotail = 0;
diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index aa65041c7..e7d8535ef 100644
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_print.c,v 1.30 2021/04/18 14:58:57 tom Exp $")
+MODULE_ID("$Id: lib_print.c,v 1.31 2023/06/10 12:44:41 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
@@ -90,7 +90,7 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
      * data has actually been shipped to the terminal.  If the write(2)
      * operation is truly atomic we're protected from this.
      */
-    result = (int) write(TerminalOf(SP_PARM)->Filedes, mybuf, need);
+    result = (int) write(SP_PARM->_ofd, mybuf, need);
 
     /*
      * By giving up our scheduler slot here we increase the odds that the
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 3c28287b6..8dd20d7f6 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230603) unstable; urgency=low
+ncurses6 (6.4+20230610) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 3c28287b6..8dd20d7f6 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230603) unstable; urgency=low
+ncurses6 (6.4+20230610) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d40bb4758..4fc579042 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230603) unstable; urgency=low
+ncurses6 (6.4+20230610) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Jun 2023 05:47:46 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 90b736598..8768225ab 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.587 2023/06/03 09:47:46 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.588 2023/06/06 22:27:59 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0603"
+!define VERSION_MMDD  "0610"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0010626ab..0ec238193 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230603
+Release: 20230610
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a36303ae6..58ecf2c50 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230603
+Release: 20230610
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 596dd1cf4..a9d32ca7a 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230603
+Release: 20230610
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 693f1a9e4bd4de18ff7f6de5054375ce7bb20fcd Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Thu, 15 Jun 2023 23:24:29 +0200
Subject: [PATCH 014/106] ncurses-6.4-20230615.patch

---
 NEWS                             |  7 +++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 ncurses/tinfo/comp_error.c       | 17 +++++---
 ncurses/tinfo/read_entry.c       | 67 ++++++++++++++++++++++----------
 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 +-
 12 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/NEWS b/NEWS
index 6ee80b4a2..0021d964d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3962 2023/06/10 16:51:20 tom Exp $
+-- $Id: NEWS,v 1.3964 2023/06/15 11:35:35 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230615
+	+ modify _nc_read_file_entry() to show relevant filename in warnings.
+	+ improve checks in convert_string() for corrupt terminfo entry (report
+	  and test-case by Gregory James Duck).
+
 20230610
 	+ improve manpages discussing file descriptors in low-level functions.
 	+ modify flushinp to use file descriptors in SCREEN, rather than from
diff --git a/VERSION b/VERSION
index fe6dfafea..65c2d0738 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230610
+5:0:10	6.4	20230615
diff --git a/dist.mk b/dist.mk
index 9cee1be5d..9d44257ce 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1548 2023/06/10 10:03:51 tom Exp $
+# $Id: dist.mk,v 1.1549 2023/06/15 11:23:36 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230610
+NCURSES_PATCH = 20230615
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c
index aa745a6df..3e6b4022a 100644
--- a/ncurses/tinfo/comp_error.c
+++ b/ncurses/tinfo/comp_error.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_error.c,v 1.42 2023/04/17 08:14:39 tom Exp $")
+MODULE_ID("$Id: comp_error.c,v 1.44 2023/06/15 20:27:02 tom Exp $")
 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
@@ -60,8 +60,15 @@ _nc_get_source(void)
 NCURSES_EXPORT(void)
 _nc_set_source(const char *const name)
 {
-    FreeIfNeeded(SourceName);
-    SourceName = strdup(name);
+    if (name == NULL) {
+	free(SourceName);
+	SourceName = NULL;
+    } else if (SourceName == NULL) {
+	SourceName = strdup(name);
+    } else if (strcmp(name, SourceName)) {
+	free(SourceName);
+	SourceName = strdup(name);
+    }
 }
 
 NCURSES_EXPORT(void)
@@ -95,9 +102,9 @@ static NCURSES_INLINE void
 where_is_problem(void)
 {
     fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?");
-    if (_nc_curr_line >= 0)
+    if (_nc_curr_line > 0)
 	fprintf(stderr, ", line %d", _nc_curr_line);
-    if (_nc_curr_col >= 0)
+    if (_nc_curr_col > 0)
 	fprintf(stderr, ", col %d", _nc_curr_col);
     if (TermType != 0 && TermType[0] != '\0')
 	fprintf(stderr, ", terminal '%s'", TermType);
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 87e422aee..762c6c68c 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.166 2023/04/22 15:11:52 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.169 2023/06/15 20:51:06 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -138,12 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
 }
 #endif
 
-static void
-convert_strings(char *buf, char **Strings, int count, int size, char *table)
+static bool
+convert_strings(char *buf, char **Strings, int count, int size,
+		char *table, bool always)
 {
     int i;
     char *p;
-    bool corrupt = FALSE;
+    bool success = TRUE;
 
     for (i = 0; i < count; i++) {
 	if (IS_NEG1(buf + 2 * i)) {
@@ -159,13 +160,10 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table)
 		TR(TRACE_DATABASE, ("Strings[%d] = %s", i,
 				    _nc_visbuf(Strings[i])));
 	    } else {
-		if (!corrupt) {
-		    corrupt = TRUE;
-		    TR(TRACE_DATABASE,
-		       ("ignore out-of-range index %d to Strings[]", nn));
-		    _nc_warning("corrupt data found in convert_strings");
-		}
-		Strings[i] = ABSENT_STRING;
+		TR(TRACE_DATABASE,
+		   ("found out-of-range index %d to Strings[%d]", nn, i));
+		success = FALSE;
+		break;
 	    }
 	}
 
@@ -175,10 +173,25 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table)
 		if (*p == '\0')
 		    break;
 	    /* if there is no NUL, ignore the string */
-	    if (p >= table + size)
+	    if (p >= table + size) {
 		Strings[i] = ABSENT_STRING;
+	    } else if (p == Strings[i] && always) {
+		TR(TRACE_DATABASE,
+		   ("found empty but required Strings[%d]", i));
+		success = FALSE;
+		break;
+	    }
+	} else if (always) {	/* names are always needed */
+	    TR(TRACE_DATABASE,
+	       ("found invalid but required Strings[%d]", i));
+	    success = FALSE;
+	    break;
 	}
     }
+    if (!success) {
+	_nc_warning("corrupt data found in convert_strings");
+    }
+    return success;
 }
 
 static int
@@ -382,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 	if (Read(string_table, (unsigned) str_size) != str_size) {
 	    returnDB(TGETENT_NO);
 	}
-	convert_strings(buf, ptr->Strings, str_count, str_size, string_table);
+	if (!convert_strings(buf, ptr->Strings, str_count, str_size,
+			     string_table, FALSE)) {
+	    returnDB(TGETENT_NO);
+	}
     }
 #if NCURSES_XNAMES
 
@@ -483,8 +499,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 	       ("Before computing extended-string capabilities "
 		"str_count=%d, ext_str_count=%d",
 		str_count, ext_str_count));
-	    convert_strings(buf, ptr->Strings + str_count, ext_str_count,
-			    ext_str_limit, ptr->ext_str_table);
+	    if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count,
+				 ext_str_limit, ptr->ext_str_table, FALSE)) {
+		returnDB(TGETENT_NO);
+	    }
 	    for (i = ext_str_count - 1; i >= 0; i--) {
 		TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s",
 				    i, i + str_count,
@@ -516,10 +534,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 	    TR(TRACE_DATABASE,
 	       ("ext_NAMES starting @%d in extended_strings, first = %s",
 		base, _nc_visbuf(ptr->ext_str_table + base)));
-	    convert_strings(buf + (2 * ext_str_count),
-			    ptr->ext_Names,
-			    (int) need,
-			    ext_str_limit, ptr->ext_str_table + base);
+	    if (!convert_strings(buf + (2 * ext_str_count),
+				 ptr->ext_Names,
+				 (int) need,
+				 ext_str_limit, ptr->ext_str_table + base,
+				 TRUE)) {
+		returnDB(TGETENT_NO);
+	    }
 	}
 
 	TR(TRACE_DATABASE,
@@ -572,13 +593,17 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
 	int limit;
 	char buffer[MAX_ENTRY_SIZE + 1];
 
-	if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp))
-	    > 0) {
+	limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp);
+	if (limit > 0) {
+	    const char *old_source = _nc_get_source();
 
 	    TR(TRACE_DATABASE, ("read terminfo %s", filename));
+	    if (old_source == NULL)
+		_nc_set_source(filename);
 	    if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) {
 		_nc_free_termtype2(ptr);
 	    }
+	    _nc_set_source(old_source);
 	} else {
 	    code = TGETENT_NO;
 	}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8dd20d7f6..fc6b76783 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230610) unstable; urgency=low
+ncurses6 (6.4+20230615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8dd20d7f6..fc6b76783 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230610) unstable; urgency=low
+ncurses6 (6.4+20230615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 4fc579042..6a67c0c4c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230610) unstable; urgency=low
+ncurses6 (6.4+20230615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 06 Jun 2023 18:27:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 8768225ab..08074018b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.588 2023/06/06 22:27:59 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.589 2023/06/15 11:23:36 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0610"
+!define VERSION_MMDD  "0615"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0ec238193..8872a0454 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230610
+Release: 20230615
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 58ecf2c50..df3eb9f35 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230610
+Release: 20230615
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index a9d32ca7a..9360fcfdf 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230610
+Release: 20230615
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 61c98ded8e9e9e1c08d34031c6b9d20abf52edc5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 17 Jun 2023 23:19:52 +0200
Subject: [PATCH 015/106] ncurses-6.4-20230617.patch

---
 Ada95/samples/ncurses2-trace_set.adb       | 10 +++++-----
 Ada95/samples/sample-menu_demo-aux.adb     |  8 ++++----
 INSTALL                                    |  4 ++--
 NEWS                                       | 10 +++++++---
 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             | 12 ++++++------
 doc/html/man/clear.1.html                  | 12 ++++++------
 doc/html/man/curs_add_wch.3x.html          | 10 +++++-----
 doc/html/man/curs_add_wchstr.3x.html       | 10 +++++-----
 doc/html/man/curs_addch.3x.html            | 10 +++++-----
 doc/html/man/curs_addchstr.3x.html         | 10 +++++-----
 doc/html/man/curs_addstr.3x.html           | 10 +++++-----
 doc/html/man/curs_addwstr.3x.html          | 10 +++++-----
 doc/html/man/curs_attr.3x.html             | 10 +++++-----
 doc/html/man/curs_beep.3x.html             | 10 +++++-----
 doc/html/man/curs_bkgd.3x.html             | 10 +++++-----
 doc/html/man/curs_bkgrnd.3x.html           | 10 +++++-----
 doc/html/man/curs_border.3x.html           | 10 +++++-----
 doc/html/man/curs_border_set.3x.html       | 10 +++++-----
 doc/html/man/curs_clear.3x.html            | 10 +++++-----
 doc/html/man/curs_color.3x.html            | 10 +++++-----
 doc/html/man/curs_delch.3x.html            | 10 +++++-----
 doc/html/man/curs_deleteln.3x.html         | 10 +++++-----
 doc/html/man/curs_extend.3x.html           | 10 +++++-----
 doc/html/man/curs_get_wch.3x.html          | 10 +++++-----
 doc/html/man/curs_get_wstr.3x.html         | 10 +++++-----
 doc/html/man/curs_getcchar.3x.html         | 10 +++++-----
 doc/html/man/curs_getch.3x.html            | 10 +++++-----
 doc/html/man/curs_getstr.3x.html           | 10 +++++-----
 doc/html/man/curs_getyx.3x.html            | 10 +++++-----
 doc/html/man/curs_in_wch.3x.html           | 10 +++++-----
 doc/html/man/curs_in_wchstr.3x.html        | 10 +++++-----
 doc/html/man/curs_inch.3x.html             | 10 +++++-----
 doc/html/man/curs_inchstr.3x.html          | 10 +++++-----
 doc/html/man/curs_initscr.3x.html          | 10 +++++-----
 doc/html/man/curs_inopts.3x.html           | 10 +++++-----
 doc/html/man/curs_ins_wch.3x.html          | 10 +++++-----
 doc/html/man/curs_ins_wstr.3x.html         | 10 +++++-----
 doc/html/man/curs_insch.3x.html            | 10 +++++-----
 doc/html/man/curs_insstr.3x.html           | 10 +++++-----
 doc/html/man/curs_instr.3x.html            | 10 +++++-----
 doc/html/man/curs_inwstr.3x.html           | 10 +++++-----
 doc/html/man/curs_kernel.3x.html           | 10 +++++-----
 doc/html/man/curs_legacy.3x.html           | 10 +++++-----
 doc/html/man/curs_memleaks.3x.html         | 10 +++++-----
 doc/html/man/curs_mouse.3x.html            | 10 +++++-----
 doc/html/man/curs_move.3x.html             | 10 +++++-----
 doc/html/man/curs_opaque.3x.html           | 10 +++++-----
 doc/html/man/curs_outopts.3x.html          | 10 +++++-----
 doc/html/man/curs_overlay.3x.html          | 10 +++++-----
 doc/html/man/curs_pad.3x.html              | 10 +++++-----
 doc/html/man/curs_print.3x.html            | 10 +++++-----
 doc/html/man/curs_printw.3x.html           | 10 +++++-----
 doc/html/man/curs_refresh.3x.html          | 10 +++++-----
 doc/html/man/curs_scanw.3x.html            | 10 +++++-----
 doc/html/man/curs_scr_dump.3x.html         | 10 +++++-----
 doc/html/man/curs_scroll.3x.html           | 10 +++++-----
 doc/html/man/curs_slk.3x.html              | 10 +++++-----
 doc/html/man/curs_sp_funcs.3x.html         | 10 +++++-----
 doc/html/man/curs_termattrs.3x.html        | 10 +++++-----
 doc/html/man/curs_termcap.3x.html          | 10 +++++-----
 doc/html/man/curs_terminfo.3x.html         | 12 ++++++------
 doc/html/man/curs_threads.3x.html          | 10 +++++-----
 doc/html/man/curs_touch.3x.html            | 10 +++++-----
 doc/html/man/curs_trace.3x.html            | 10 +++++-----
 doc/html/man/curs_util.3x.html             | 10 +++++-----
 doc/html/man/curs_variables.3x.html        | 10 +++++-----
 doc/html/man/curs_window.3x.html           | 10 +++++-----
 doc/html/man/default_colors.3x.html        | 10 +++++-----
 doc/html/man/define_key.3x.html            | 10 +++++-----
 doc/html/man/form.3x.html                  | 12 ++++++------
 doc/html/man/form_cursor.3x.html           | 10 +++++-----
 doc/html/man/form_data.3x.html             | 10 +++++-----
 doc/html/man/form_driver.3x.html           | 10 +++++-----
 doc/html/man/form_field.3x.html            | 10 +++++-----
 doc/html/man/form_field_attributes.3x.html | 10 +++++-----
 doc/html/man/form_field_buffer.3x.html     | 10 +++++-----
 doc/html/man/form_field_info.3x.html       | 10 +++++-----
 doc/html/man/form_field_just.3x.html       | 10 +++++-----
 doc/html/man/form_field_new.3x.html        | 10 +++++-----
 doc/html/man/form_field_opts.3x.html       | 10 +++++-----
 doc/html/man/form_field_userptr.3x.html    | 10 +++++-----
 doc/html/man/form_field_validation.3x.html | 10 +++++-----
 doc/html/man/form_fieldtype.3x.html        | 10 +++++-----
 doc/html/man/form_hook.3x.html             | 10 +++++-----
 doc/html/man/form_new.3x.html              | 10 +++++-----
 doc/html/man/form_new_page.3x.html         | 10 +++++-----
 doc/html/man/form_opts.3x.html             | 10 +++++-----
 doc/html/man/form_page.3x.html             | 10 +++++-----
 doc/html/man/form_post.3x.html             | 10 +++++-----
 doc/html/man/form_requestname.3x.html      | 10 +++++-----
 doc/html/man/form_userptr.3x.html          | 10 +++++-----
 doc/html/man/form_variables.3x.html        | 10 +++++-----
 doc/html/man/form_win.3x.html              | 10 +++++-----
 doc/html/man/infocmp.1m.html               | 12 ++++++------
 doc/html/man/infotocap.1m.html             | 12 ++++++------
 doc/html/man/key_defined.3x.html           | 10 +++++-----
 doc/html/man/keybound.3x.html              | 10 +++++-----
 doc/html/man/keyok.3x.html                 | 10 +++++-----
 doc/html/man/legacy_coding.3x.html         | 10 +++++-----
 doc/html/man/menu.3x.html                  | 12 ++++++------
 doc/html/man/menu_attributes.3x.html       | 10 +++++-----
 doc/html/man/menu_cursor.3x.html           | 10 +++++-----
 doc/html/man/menu_driver.3x.html           | 10 +++++-----
 doc/html/man/menu_format.3x.html           | 10 +++++-----
 doc/html/man/menu_hook.3x.html             | 10 +++++-----
 doc/html/man/menu_items.3x.html            | 10 +++++-----
 doc/html/man/menu_mark.3x.html             | 10 +++++-----
 doc/html/man/menu_new.3x.html              | 10 +++++-----
 doc/html/man/menu_opts.3x.html             | 10 +++++-----
 doc/html/man/menu_pattern.3x.html          | 10 +++++-----
 doc/html/man/menu_post.3x.html             | 10 +++++-----
 doc/html/man/menu_requestname.3x.html      | 10 +++++-----
 doc/html/man/menu_spacing.3x.html          | 10 +++++-----
 doc/html/man/menu_userptr.3x.html          | 10 +++++-----
 doc/html/man/menu_win.3x.html              | 10 +++++-----
 doc/html/man/mitem_current.3x.html         | 10 +++++-----
 doc/html/man/mitem_name.3x.html            | 10 +++++-----
 doc/html/man/mitem_new.3x.html             | 10 +++++-----
 doc/html/man/mitem_opts.3x.html            | 10 +++++-----
 doc/html/man/mitem_userptr.3x.html         | 10 +++++-----
 doc/html/man/mitem_value.3x.html           | 10 +++++-----
 doc/html/man/mitem_visible.3x.html         | 10 +++++-----
 doc/html/man/ncurses.3x.html               | 12 ++++++------
 doc/html/man/ncurses6-config.1.html        |  2 +-
 doc/html/man/new_pair.3x.html              | 10 +++++-----
 doc/html/man/panel.3x.html                 | 12 ++++++------
 doc/html/man/resizeterm.3x.html            | 10 +++++-----
 doc/html/man/scr_dump.5.html               | 10 +++++-----
 doc/html/man/tabs.1.html                   | 12 ++++++------
 doc/html/man/term.5.html                   | 10 +++++-----
 doc/html/man/term.7.html                   | 10 +++++-----
 doc/html/man/term_variables.3x.html        | 10 +++++-----
 doc/html/man/terminfo.5.html               |  2 +-
 doc/html/man/tic.1m.html                   | 12 ++++++------
 doc/html/man/toe.1m.html                   | 12 ++++++------
 doc/html/man/tput.1.html                   | 12 ++++++------
 doc/html/man/tset.1.html                   | 12 ++++++------
 doc/html/man/user_caps.5.html              | 10 +++++-----
 doc/html/man/wresize.3x.html               | 10 +++++-----
 man/captoinfo.1m                           |  4 ++--
 man/clear.1                                |  6 +++---
 man/curs_add_wch.3x                        |  4 ++--
 man/curs_add_wchstr.3x                     |  4 ++--
 man/curs_addch.3x                          |  4 ++--
 man/curs_addchstr.3x                       |  4 ++--
 man/curs_addstr.3x                         |  4 ++--
 man/curs_addwstr.3x                        |  4 ++--
 man/curs_attr.3x                           |  6 +++---
 man/curs_beep.3x                           |  4 ++--
 man/curs_bkgd.3x                           |  4 ++--
 man/curs_bkgrnd.3x                         |  4 ++--
 man/curs_border.3x                         |  4 ++--
 man/curs_border_set.3x                     |  4 ++--
 man/curs_clear.3x                          |  4 ++--
 man/curs_color.3x                          |  4 ++--
 man/curs_delch.3x                          |  4 ++--
 man/curs_deleteln.3x                       |  4 ++--
 man/curs_extend.3x                         |  4 ++--
 man/curs_get_wch.3x                        |  4 ++--
 man/curs_get_wstr.3x                       |  4 ++--
 man/curs_getcchar.3x                       |  4 ++--
 man/curs_getch.3x                          |  4 ++--
 man/curs_getstr.3x                         |  4 ++--
 man/curs_getyx.3x                          |  4 ++--
 man/curs_in_wch.3x                         |  4 ++--
 man/curs_in_wchstr.3x                      |  4 ++--
 man/curs_inch.3x                           |  4 ++--
 man/curs_inchstr.3x                        |  4 ++--
 man/curs_initscr.3x                        |  4 ++--
 man/curs_inopts.3x                         |  4 ++--
 man/curs_ins_wch.3x                        |  4 ++--
 man/curs_ins_wstr.3x                       |  4 ++--
 man/curs_insch.3x                          |  4 ++--
 man/curs_insstr.3x                         |  4 ++--
 man/curs_instr.3x                          |  4 ++--
 man/curs_inwstr.3x                         |  4 ++--
 man/curs_kernel.3x                         |  4 ++--
 man/curs_legacy.3x                         |  4 ++--
 man/curs_memleaks.3x                       |  4 ++--
 man/curs_mouse.3x                          |  6 +++---
 man/curs_move.3x                           |  4 ++--
 man/curs_opaque.3x                         |  4 ++--
 man/curs_outopts.3x                        |  4 ++--
 man/curs_overlay.3x                        |  4 ++--
 man/curs_pad.3x                            |  4 ++--
 man/curs_print.3x                          |  4 ++--
 man/curs_printw.3x                         |  4 ++--
 man/curs_refresh.3x                        |  4 ++--
 man/curs_scanw.3x                          |  4 ++--
 man/curs_scr_dump.3x                       |  4 ++--
 man/curs_scroll.3x                         |  4 ++--
 man/curs_slk.3x                            |  4 ++--
 man/curs_sp_funcs.3x                       |  4 ++--
 man/curs_termattrs.3x                      |  4 ++--
 man/curs_termcap.3x                        |  4 ++--
 man/curs_terminfo.3x                       |  6 +++---
 man/curs_threads.3x                        |  4 ++--
 man/curs_touch.3x                          |  4 ++--
 man/curs_trace.3x                          |  4 ++--
 man/curs_util.3x                           |  4 ++--
 man/curs_variables.3x                      |  4 ++--
 man/curs_window.3x                         |  4 ++--
 man/default_colors.3x                      |  4 ++--
 man/define_key.3x                          |  4 ++--
 man/form.3x                                |  4 ++--
 man/form_cursor.3x                         |  4 ++--
 man/form_data.3x                           |  4 ++--
 man/form_driver.3x                         |  4 ++--
 man/form_field.3x                          |  4 ++--
 man/form_field_attributes.3x               |  4 ++--
 man/form_field_buffer.3x                   |  4 ++--
 man/form_field_info.3x                     |  4 ++--
 man/form_field_just.3x                     |  4 ++--
 man/form_field_new.3x                      |  4 ++--
 man/form_field_opts.3x                     |  4 ++--
 man/form_field_userptr.3x                  |  4 ++--
 man/form_field_validation.3x               |  4 ++--
 man/form_fieldtype.3x                      |  4 ++--
 man/form_hook.3x                           |  4 ++--
 man/form_new.3x                            |  4 ++--
 man/form_new_page.3x                       |  4 ++--
 man/form_opts.3x                           |  4 ++--
 man/form_page.3x                           |  4 ++--
 man/form_post.3x                           |  4 ++--
 man/form_requestname.3x                    |  4 ++--
 man/form_userptr.3x                        |  4 ++--
 man/form_variables.3x                      |  4 ++--
 man/form_win.3x                            |  4 ++--
 man/infocmp.1m                             |  6 +++---
 man/infotocap.1m                           |  4 ++--
 man/key_defined.3x                         |  4 ++--
 man/keybound.3x                            |  4 ++--
 man/keyok.3x                               |  4 ++--
 man/legacy_coding.3x                       |  4 ++--
 man/menu.3x                                |  4 ++--
 man/menu_attributes.3x                     |  4 ++--
 man/menu_cursor.3x                         |  4 ++--
 man/menu_driver.3x                         |  4 ++--
 man/menu_format.3x                         |  4 ++--
 man/menu_hook.3x                           |  4 ++--
 man/menu_items.3x                          |  4 ++--
 man/menu_mark.3x                           |  4 ++--
 man/menu_new.3x                            |  4 ++--
 man/menu_opts.3x                           |  4 ++--
 man/menu_pattern.3x                        |  4 ++--
 man/menu_post.3x                           |  4 ++--
 man/menu_requestname.3x                    |  4 ++--
 man/menu_spacing.3x                        |  4 ++--
 man/menu_userptr.3x                        |  4 ++--
 man/menu_win.3x                            |  4 ++--
 man/mitem_current.3x                       |  4 ++--
 man/mitem_name.3x                          |  4 ++--
 man/mitem_new.3x                           |  4 ++--
 man/mitem_opts.3x                          |  4 ++--
 man/mitem_userptr.3x                       |  4 ++--
 man/mitem_value.3x                         |  4 ++--
 man/mitem_visible.3x                       |  4 ++--
 man/ncurses.3x                             |  6 +++---
 man/new_pair.3x                            |  6 +++---
 man/panel.3x                               |  4 ++--
 man/resizeterm.3x                          |  4 ++--
 man/scr_dump.5                             |  6 +++---
 man/tabs.1                                 |  6 +++---
 man/term.5                                 |  6 +++---
 man/term.7                                 |  4 ++--
 man/term_variables.3x                      |  4 ++--
 man/tic.1m                                 |  4 ++--
 man/toe.1m                                 |  6 +++---
 man/tput.1                                 |  4 ++--
 man/tset.1                                 |  4 ++--
 man/user_caps.5                            |  6 +++---
 man/wresize.3x                             |  4 ++--
 ncurses/tinfo/lib_win32util.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/bs.6                                  |  4 ++--
 test/gdc.6                                 |  4 ++--
 286 files changed, 999 insertions(+), 995 deletions(-)

diff --git a/Ada95/samples/ncurses2-trace_set.adb b/Ada95/samples/ncurses2-trace_set.adb
index d2739809d..3b1983daf 100644
--- a/Ada95/samples/ncurses2-trace_set.adb
+++ b/Ada95/samples/ncurses2-trace_set.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2020,2023 Thomas E. Dickey                                     --
 -- Copyright 2000-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.7 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.8 $
+--  $Date: 2023/06/17 17:21:47 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
@@ -121,7 +121,7 @@ procedure ncurses2.trace_set is
        Trace_Attribute_Set'(Character_Calls => True, others => False)),
       (new String'("Termcap_TermInfo"),
        Trace_Attribute_Set'(Termcap_TermInfo => True, others => False)),
-      (new String'("Maximium"),
+      (new String'("Maximum"),
        Trace_Maximum)
       );
 
@@ -353,7 +353,7 @@ procedure ncurses2.trace_set is
          if subset (tlevel,
                     Trace_Maximum)
          then
-            Append (buf, "Maximium");
+            Append (buf, "Maximum");
             Append (buf, ", ");
          end if;
       end if;
diff --git a/Ada95/samples/sample-menu_demo-aux.adb b/Ada95/samples/sample-menu_demo-aux.adb
index f430c88cd..f64e41da8 100644
--- a/Ada95/samples/sample-menu_demo-aux.adb
+++ b/Ada95/samples/sample-menu_demo-aux.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2020,2023 Thomas E. Dickey                                     --
 -- Copyright 1998-2006,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.15 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.16 $
+--  $Date: 2023/06/17 17:21:59 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Characters.Latin_1; use Ada.Characters.Latin_1;
@@ -79,7 +79,7 @@ package body Sample.Menu_Demo.Aux is
 
       --  Calculate horizontal coordinate at the screen center
       X := (Columns - C) / 2;
-      Y := 1;  -- always startin line 1
+      Y := 1;  -- always starting on line 1
 
    end Geometry;
 
diff --git a/INSTALL b/INSTALL
index 60bc8eae4..a4f614933 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.245 2023/06/03 20:14:17 tom Exp $
+-- $Id: INSTALL,v 1.246 2023/06/17 17:18:20 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -444,7 +444,7 @@ CONFIGURE OPTIONS:
 		--with-menu-libname=XXX
 		--with-panel-libname=XXX
 
-	Rather than renaming them abitrarily, a prefix or suffix is
+	Rather than renaming them arbitrarily, a prefix or suffix is
 	recommended.  An "n" prefix provides consistency with ncurses versus
 	curses, i.e.,
 
diff --git a/NEWS b/NEWS
index 0021d964d..b8147e206 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3964 2023/06/15 11:35:35 tom Exp $
+-- $Id: NEWS,v 1.3967 2023/06/17 17:17:42 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230617
+	+ markup manpages with revision information (prompted by discussion
+	  with Bjarni Ingi Gislason).
+
 20230615
 	+ modify _nc_read_file_entry() to show relevant filename in warnings.
 	+ improve checks in convert_string() for corrupt terminfo entry (report
@@ -11186,7 +11190,7 @@ it is not possible to add this information.
 	+ add mgterm terminfo entry from NetBSD, minor adjustments to sun-ss5,
 	  aixterm entries -TD
 	+ modify tack/ansi.c to make it more tolerant of bad ANSI replies.  An
-	  example of an illegal ANSI resonse can be found using Microsoft's
+	  example of an illegal ANSI response can be found using Microsoft's
 	  Telnet client.  A correct display can be found using a VT-4xx
 	  terminal or XFree86 xterm with:
 		XTerm*VT100*decTerminalID:  450
@@ -12080,7 +12084,7 @@ it is not possible to add this information.
 	+ correct a typo in term.7 (Todd C Miller).
 	+ add configure --with-shlib-version option to allow installing shared
 	  libraries named according to release or ABI versions.  This
-	  parameterizes some existing logic in the configure script, and is
+	  parametrizes some existing logic in the configure script, and is
 	  intended for compatibility upgrades on Digital Unix, which used
 	  versioned libraries in ncurses 4.2, but no longer does (cf:  980425).
 	+ resync configure script against autoconf 2.13 + patches
diff --git a/VERSION b/VERSION
index 65c2d0738..efbf785fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230615
+5:0:10	6.4	20230617
diff --git a/dist.mk b/dist.mk
index 9d44257ce..fb55f3aef 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1549 2023/06/15 11:23:36 tom Exp $
+# $Id: dist.mk,v 1.1550 2023/06/17 09:47:23 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230615
+NCURSES_PATCH = 20230617
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/ada/funcs/T.htm b/doc/html/ada/funcs/T.htm
index acedebee2..2534502a5 100644
--- a/doc/html/ada/funcs/T.htm
+++ b/doc/html/ada/funcs/T.htm
@@ -20,8 +20,8 @@ <h2>Functions - T</h2>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_90_16" target="main">tgetnum</a>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_109_16" target="main">tgetstr -  terminal_interface-curses-termcap.adb:109</a>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_130_16" target="main">tgetstr -  terminal_interface-curses-termcap.adb:130</a>
-<li><a href="../terminal_interface-curses-termcap__adb.htm#ref_152_16" target="main">tgoto</a>
 <li><a href="../terminal_interface-curses-termcap__ads.htm#ref_54_13" target="main">TGoto</a>
+<li><a href="../terminal_interface-curses-termcap__adb.htm#ref_152_16" target="main">tgoto</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_70_16" target="main">tigetflag</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_88_16" target="main">tigetstr -  terminal_interface-curses-terminfo.adb:88</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_109_16" target="main">tigetstr -  terminal_interface-curses-terminfo.adb:109</a>
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 3f16ad174..411cfb70b 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1   User Commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fd7895200..a55820611 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.33 2022/02/12 20:07:29 tom Exp @
+  * @Id: captoinfo.1m,v 1.34 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m</TITLE>
+<TITLE>captoinfo 1m 2022-02-12 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m</H1>
+<H1 class="no-header">captoinfo 1m 2022-02-12 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                                                    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+<STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
 
 
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -208,7 +208,7 @@ <H1 class="no-header">captoinfo 1m</H1>
 
 
 
-                                                                 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index ff76e1269..5510e18fe 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.29 2023/04/09 08:28:00 tom Exp @
+  * @Id: clear.1,v 1.31 2023/06/17 17:50:37 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -36,14 +36,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1</TITLE>
+<TITLE>clear 1 2023-06-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1</H1>
+<H1 class="no-header">clear 1 2023-06-17 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                    General Commands Manual                   <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+<STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
 
 
@@ -150,11 +150,11 @@ <H1 class="no-header">clear 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                      <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-06-17                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index dcf0f8ff2..af0d4b3d7 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.32 2023/03/11 20:40:45 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.33 2023/03/11 20:40:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x</TITLE>
+<TITLE>curs_add_wch 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                                              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+<STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
 
 
@@ -290,7 +290,7 @@ <H1 class="no-header">curs_add_wch 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 5e93f68ff..12c9a70d6 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.20 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x</TITLE>
+<TITLE>curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>                                        <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_add_wchstr 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 49fc983aa..d39a37519 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.60 2023/03/11 20:39:26 tom Exp @
+  * @Id: curs_addch.3x,v 1.61 2023/03/11 20:39:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x</TITLE>
+<TITLE>curs_addch 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x</H1>
+<H1 class="no-header">curs_addch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+<STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
 
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 60798eae9..34e81f282 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x</TITLE>
+<TITLE>curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x</H1>
+<H1 class="no-header">curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                                            <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
 
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_addchstr 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 4ce1379bd..5e56ed888 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.27 2023/03/11 20:40:52 tom Exp @
+  * @Id: curs_addstr.3x,v 1.28 2023/03/11 20:40:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x</TITLE>
+<TITLE>curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x</H1>
+<H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                                                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
 
 
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_addstr 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index ce6d21b06..17a11f88f 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x</TITLE>
+<TITLE>curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x</H1>
+<H1 class="no-header">curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                                              <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
 
 
@@ -111,7 +111,7 @@ <H1 class="no-header">curs_addwstr 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 70dc7455b..d637ea1f3 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.72 2022/04/16 19:18:32 tom Exp @
+  * @Id: curs_attr.3x,v 1.74 2023/06/17 17:50:37 tom Exp @
   * ---------------------------------------------------------------------------
   * attr_get
   * .br
@@ -56,14 +56,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x</TITLE>
+<TITLE>curs_attr 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x</H1>
+<H1 class="no-header">curs_attr 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+<STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
@@ -520,7 +520,7 @@ <H1 class="no-header">curs_attr 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-06-17                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 0db95efa2..b2d5f44bf 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.16 2021/12/25 21:41:58 tom Exp @
+  * @Id: curs_beep.3x,v 1.17 2021/12/25 21:41:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x</TITLE>
+<TITLE>curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x</H1>
+<H1 class="no-header">curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+<STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
 
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index d4a6a1d4c..f3394a2ab 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.35 2022/06/25 21:55:45 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.36 2022/06/25 21:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x</TITLE>
+<TITLE>curs_bkgd 3x 2022-06-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x</H1>
+<H1 class="no-header">curs_bkgd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+<STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
 
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2022-06-25                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 87b126cbb..5aa86acb9 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.16 2022/06/25 21:57:59 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.17 2022/06/25 21:57:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x</TITLE>
+<TITLE>curs_bkgrnd 3x 2022-06-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                                                <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+<STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
 
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_bkgrnd 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2022-06-25                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index abb2a4e63..eedb0f883 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.30 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_border.3x,v 1.31 2022/02/12 20:06:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x</TITLE>
+<TITLE>curs_border 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x</H1>
+<H1 class="no-header">curs_border 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                                                <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+<STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
 
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_border 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 589342aef..7a3089469 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.16 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_border_set.3x,v 1.17 2022/02/12 20:06:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x</TITLE>
+<TITLE>curs_border_set 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x</H1>
+<H1 class="no-header">curs_border_set 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>                                        <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+<STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
 
 
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_border_set 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 5162d2784..cc8ea879b 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.27 2022/11/26 16:23:47 tom Exp @
+  * @Id: curs_clear.3x,v 1.28 2022/11/26 16:23:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x</TITLE>
+<TITLE>curs_clear 3x 2022-11-26 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x</H1>
+<H1 class="no-header">curs_clear 3x 2022-11-26 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+<STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
 
 
@@ -140,7 +140,7 @@ <H1 class="no-header">curs_clear 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2022-11-26                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 0b4b36c15..6a826ceb4 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.69 2023/04/23 20:53:20 tom Exp @
+  * @Id: curs_color.3x,v 1.70 2023/04/23 20:53:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x</TITLE>
+<TITLE>curs_color 3x 2023-04-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x</H1>
+<H1 class="no-header">curs_color 3x 2023-04-23 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+<STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
 
 
@@ -524,7 +524,7 @@ <H1 class="no-header">curs_color 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-04-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index dacb4aa57..7a5aa0111 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.18 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_delch.3x,v 1.19 2022/02/12 20:06:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x</TITLE>
+<TITLE>curs_delch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x</H1>
+<H1 class="no-header">curs_delch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+<STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
 
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index a0676f27d..1a2390aca 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.20 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.21 2022/02/12 20:06:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x</TITLE>
+<TITLE>curs_deleteln 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x</H1>
+<H1 class="no-header">curs_deleteln 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                                            <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+<STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
 
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index f3d396ec3..b33ad3af8 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.28 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_extend.3x,v 1.29 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x</TITLE>
+<TITLE>curs_extend 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x</H1>
+<H1 class="no-header">curs_extend 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                                                <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+<STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
 
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 903172b00..65fafefdd 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.17 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.18 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x</TITLE>
+<TITLE>curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x</H1>
+<H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                                              <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+<STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
 
 
@@ -151,7 +151,7 @@ <H1 class="no-header">curs_get_wch 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 4623161f6..9cd7aaa03 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.27 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x</TITLE>
+<TITLE>curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x</H1>
+<H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                                            <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
 
 
@@ -168,7 +168,7 @@ <H1 class="no-header">curs_get_wstr 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index b3f0383b9..ca8a9e411 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.27 2021/12/25 20:35:03 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.28 2021/12/25 20:35:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x</TITLE>
+<TITLE>curs_getcchar 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x</H1>
+<H1 class="no-header">curs_getcchar 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                                            <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+<STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
 
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 5a1afc5c3..c6e0692c9 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.63 2022/02/12 20:07:45 tom Exp @
+  * @Id: curs_getch.3x,v 1.64 2022/02/12 20:07:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x</TITLE>
+<TITLE>curs_getch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x</H1>
+<H1 class="no-header">curs_getch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+<STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
 
 
@@ -383,7 +383,7 @@ <H1 class="no-header">curs_getch 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 97089e22d..b68fe24aa 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.36 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_getstr.3x,v 1.37 2022/02/12 20:07:29 tom Exp @
   * X/Open says also until EOf
   * X/Open says then an EOS is added to the result
   * X/Open doesn't mention n&lt;0
@@ -37,14 +37,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x</TITLE>
+<TITLE>curs_getstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x</H1>
+<H1 class="no-header">curs_getstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                                                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
 
 
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_getstr 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 0f463c589..263f5b12e 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.23 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_getyx.3x,v 1.24 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x</TITLE>
+<TITLE>curs_getyx 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x</H1>
+<H1 class="no-header">curs_getyx 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+<STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
 
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index f1ce0f493..5121de3e6 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.13 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.14 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x</TITLE>
+<TITLE>curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x</H1>
+<H1 class="no-header">curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                                                <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+<STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
@@ -91,7 +91,7 @@ <H1 class="no-header">curs_in_wch 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 957bef234..eec27b648 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.17 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x</TITLE>
+<TITLE>curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>                                          <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_in_wchstr 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index db7a89521..9b44c6b8a 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.28 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inch.3x,v 1.29 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x</TITLE>
+<TITLE>curs_inch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x</H1>
+<H1 class="no-header">curs_inch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+<STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
 
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_inch 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 691a8093d..ab7dd0049 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.24 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x</TITLE>
+<TITLE>curs_inchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x</H1>
+<H1 class="no-header">curs_inchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                                              <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
 
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_inchstr 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 9d6849559..785bb31d0 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.40 2023/06/10 16:50:22 tom Exp @
+  * @Id: curs_initscr.3x,v 1.41 2023/06/10 16:50:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x</TITLE>
+<TITLE>curs_initscr 3x 2023-06-10 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x</H1>
+<H1 class="no-header">curs_initscr 3x 2023-06-10 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                                              <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+<STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
 
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_initscr 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-06-10                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 4bee87ac6..206426578 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.36 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inopts.3x,v 1.37 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x</TITLE>
+<TITLE>curs_inopts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x</H1>
+<H1 class="no-header">curs_inopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                                                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+<STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
 
 
@@ -302,7 +302,7 @@ <H1 class="no-header">curs_inopts 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 883121e82..acc07a26b 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.13 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.14 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x</TITLE>
+<TITLE>curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x</H1>
+<H1 class="no-header">curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                                              <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+<STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
 
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_ins_wch 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index fa4289381..11f6636d0 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.14 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.15 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x</TITLE>
+<TITLE>curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                                            <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
 
 
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_ins_wstr 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 12edc6cd8..020b296a0 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_insch.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x</TITLE>
+<TITLE>curs_insch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x</H1>
+<H1 class="no-header">curs_insch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+<STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
 
 
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_insch 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 2692a5493..529a81808 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.29 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_insstr.3x,v 1.30 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x</TITLE>
+<TITLE>curs_insstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x</H1>
+<H1 class="no-header">curs_insstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                                                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
 
 
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_insstr 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 28be2ba92..9d783757c 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.25 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_instr.3x,v 1.26 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x</TITLE>
+<TITLE>curs_instr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x</H1>
+<H1 class="no-header">curs_instr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+<STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
 
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_instr 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 0d8c3c1e7..830e29e42 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.17 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.18 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x</TITLE>
+<TITLE>curs_inwstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x</H1>
+<H1 class="no-header">curs_inwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                                                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+<STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
 
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_inwstr 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index da6792c6b..558afff68 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_kernel.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x</TITLE>
+<TITLE>curs_kernel 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x</H1>
+<H1 class="no-header">curs_kernel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                                                <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+<STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
 
 
@@ -204,7 +204,7 @@ <H1 class="no-header">curs_kernel 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 5947cdede..acfb8f3f9 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.13 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_legacy.3x,v 1.14 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x</TITLE>
+<TITLE>curs_legacy 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x</H1>
+<H1 class="no-header">curs_legacy 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                                                <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+<STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
 
 
@@ -123,7 +123,7 @@ <H1 class="no-header">curs_legacy 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 7ac7342bf..95ed8cf74 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.15 2022/06/04 23:33:48 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.16 2022/06/04 23:33:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x</TITLE>
+<TITLE>curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x</H1>
+<H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                                            <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+<STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
 
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2022-06-04                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 2228690d5..fb423833e 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.59 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_mouse.3x,v 1.61 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x</TITLE>
+<TITLE>curs_mouse 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x</H1>
+<H1 class="no-header">curs_mouse 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+<STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
 
 
@@ -375,7 +375,7 @@ <H1 class="no-header">curs_mouse 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-06-17                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 8d7d7e467..7aad41aea 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_move.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x</TITLE>
+<TITLE>curs_move 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x</H1>
+<H1 class="no-header">curs_move 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+<STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
 
 
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_move 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 6c1443ca2..363258481 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.19 2023/03/11 20:40:58 tom Exp @
+  * @Id: curs_opaque.3x,v 1.20 2023/03/11 20:40:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x</TITLE>
+<TITLE>curs_opaque 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x</H1>
+<H1 class="no-header">curs_opaque 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                                                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+<STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
 
 
@@ -146,7 +146,7 @@ <H1 class="no-header">curs_opaque 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 5e86a9f41..888111225 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.36 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_outopts.3x,v 1.37 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x</TITLE>
+<TITLE>curs_outopts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x</H1>
+<H1 class="no-header">curs_outopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                                              <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+<STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
@@ -203,7 +203,7 @@ <H1 class="no-header">curs_outopts 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index f87fc8848..a5f820b70 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_overlay.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x</TITLE>
+<TITLE>curs_overlay 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x</H1>
+<H1 class="no-header">curs_overlay 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                                              <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+<STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
 
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 4758d36b8..26a0e627a 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.29 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_pad.3x,v 1.30 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x</TITLE>
+<TITLE>curs_pad 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x</H1>
+<H1 class="no-header">curs_pad 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                                                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+<STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
 
 
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_pad 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 24c62d2e5..f7d4cea14 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.19 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_print.3x,v 1.20 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x</TITLE>
+<TITLE>curs_print 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x</H1>
+<H1 class="no-header">curs_print 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+<STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
 
 
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_print 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 90a016cf7..a9a490e51 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_printw.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x</TITLE>
+<TITLE>curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x</H1>
+<H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                                                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+<STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
 
 
@@ -142,7 +142,7 @@ <H1 class="no-header">curs_printw 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 9a4319569..44705d267 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.26 2023/03/11 20:41:02 tom Exp @
+  * @Id: curs_refresh.3x,v 1.27 2023/03/11 20:41:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x</TITLE>
+<TITLE>curs_refresh 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x</H1>
+<H1 class="no-header">curs_refresh 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                                              <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+<STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 19a8e6550..1fc75d3e1 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_scanw.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x</TITLE>
+<TITLE>curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x</H1>
+<H1 class="no-header">curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+<STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
 
 
@@ -163,7 +163,7 @@ <H1 class="no-header">curs_scanw 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 7f964c92b..3a6332d2d 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.20 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.21 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x</TITLE>
+<TITLE>curs_scr_dump 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x</H1>
+<H1 class="no-header">curs_scr_dump 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                                            <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+<STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
 
 
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 3079d60d7..fc1042090 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.23 2023/03/11 20:41:05 tom Exp @
+  * @Id: curs_scroll.3x,v 1.24 2023/03/11 20:41:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x</TITLE>
+<TITLE>curs_scroll 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x</H1>
+<H1 class="no-header">curs_scroll 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                                                <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+<STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
 
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 84b202d04..0bebf4ba5 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.44 2022/10/29 22:44:14 tom Exp @
+  * @Id: curs_slk.3x,v 1.45 2022/10/29 22:44:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x</TITLE>
+<TITLE>curs_slk 3x 2022-10-29 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x</H1>
+<H1 class="no-header">curs_slk 3x 2022-10-29 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                                                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+<STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
 
 
@@ -309,7 +309,7 @@ <H1 class="no-header">curs_slk 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2022-10-29                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index c726d0ba0..972e74ada 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.27 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.28 2022/02/12 20:05:11 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,14 +37,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x</TITLE>
+<TITLE>curs_sp_funcs 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                                            <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
 
 
@@ -290,7 +290,7 @@ <H1 class="no-header">curs_sp_funcs 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 324373c36..57b2399fe 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.20 2023/03/11 20:41:12 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.21 2023/03/11 20:41:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x</TITLE>
+<TITLE>curs_termattrs 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x</H1>
+<H1 class="no-header">curs_termattrs 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>                                          <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+<STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
 
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 44f9b3273..047904497 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.58 2023/04/16 18:16:40 tom Exp @
+  * @Id: curs_termcap.3x,v 1.59 2023/04/16 18:16:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x</TITLE>
+<TITLE>curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x</H1>
+<H1 class="no-header">curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                                              <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+<STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
 
 
@@ -356,7 +356,7 @@ <H1 class="no-header">curs_termcap 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-04-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 30284177b..48a694b01 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.87 2023/06/10 15:51:45 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.90 2023/06/17 17:23:17 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -43,14 +43,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x</TITLE>
+<TITLE>curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                                            <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+<STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
 
 
@@ -622,7 +622,7 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
            Using  <STRONG>long</STRONG>  for the numeric parameter type is a workaround to make
            the parameter use the same amount of stack as a pointer.  That  ap-
-           proach  dates  back  to  the  mid-1980s,  before C was standarized.
+           proach  dates  back  to  the  mid-1980s, before C was standardized.
            Since then, there is a standard (and pointers are not  required  to
            fit in a long).
 
@@ -688,7 +688,7 @@ <H1 class="no-header">curs_terminfo 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-06-17                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 001c86f0f..407655ce4 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.31 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_threads.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -36,14 +36,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x</TITLE>
+<TITLE>curs_threads 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x</H1>
+<H1 class="no-header">curs_threads 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                                              <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+<STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
 
 
@@ -608,7 +608,7 @@ <H1 class="no-header">curs_threads 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 4c63cb988..f0d5d381f 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.26 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_touch.3x,v 1.27 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x</TITLE>
+<TITLE>curs_touch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x</H1>
+<H1 class="no-header">curs_touch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+<STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
 
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_touch 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index f670c86ce..016d75250 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.25 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_trace.3x,v 1.26 2022/02/12 20:06:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x</TITLE>
+<TITLE>curs_trace 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x</H1>
+<H1 class="no-header">curs_trace 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                                                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+<STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
 
 
@@ -257,7 +257,7 @@ <H1 class="no-header">curs_trace 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index e258d143b..708af2b91 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.66 2023/03/11 20:28:02 tom Exp @
+  * @Id: curs_util.3x,v 1.67 2023/03/11 20:28:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x</TITLE>
+<TITLE>curs_util 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x</H1>
+<H1 class="no-header">curs_util 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                                                    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+<STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
 
 
@@ -361,7 +361,7 @@ <H1 class="no-header">curs_util 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-03-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 1dd822f86..6b944a930 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.17 2021/12/25 21:49:32 tom Exp @
+  * @Id: curs_variables.3x,v 1.18 2021/12/25 21:49:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x</TITLE>
+<TITLE>curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x</H1>
+<H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>                                          <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+<STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
@@ -192,7 +192,7 @@ <H1 class="no-header">curs_variables 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 660ed566f..c545d5fb2 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.28 2022/08/13 23:24:22 tom Exp @
+  * @Id: curs_window.3x,v 1.29 2022/08/13 23:24:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x</TITLE>
+<TITLE>curs_window 3x 2022-08-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x</H1>
+<H1 class="no-header">curs_window 3x 2022-08-13 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                                                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+<STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
 
 
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_window 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2022-08-13                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index 9614eecf1..d81eda1c7 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.35 2022/02/12 20:03:40 tom Exp @
+  * @Id: default_colors.3x,v 1.36 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x</TITLE>
+<TITLE>default_colors 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x</H1>
+<H1 class="no-header">default_colors 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>                                          <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+<STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 4ab7c78db..28a693565 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: define_key.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x</TITLE>
+<TITLE>define_key 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x</H1>
+<H1 class="no-header">define_key 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                                                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+<STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
 
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index e3e06b23f..5caf6f603 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.38 2021/12/25 21:49:32 tom Exp @
+  * @Id: form.3x,v 1.39 2021/12/25 21:49:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x</TITLE>
+<TITLE>form 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x</H1>
+<H1 class="no-header">form 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                                                              <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+<STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
 
 
@@ -248,11 +248,11 @@ <H1 class="no-header">form 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                      <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 5aecefc57..2944bf8e8 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.17 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_cursor.3x,v 1.18 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x</TITLE>
+<TITLE>form_cursor 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x</H1>
+<H1 class="no-header">form_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                                                <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+<STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
 
 
@@ -99,7 +99,7 @@ <H1 class="no-header">form_cursor 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 3c42b4682..f78b82f4e 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.18 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_data.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x</TITLE>
+<TITLE>form_data 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x</H1>
+<H1 class="no-header">form_data 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                                                    <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+<STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
 
 
@@ -86,7 +86,7 @@ <H1 class="no-header">form_data 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index b6420bc31..e38035fd7 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.39 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_driver.3x,v 1.40 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x</TITLE>
+<TITLE>form_driver 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x</H1>
+<H1 class="no-header">form_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                                                <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+<STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
 
 
@@ -279,7 +279,7 @@ <H1 class="no-header">form_driver 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 0f51ef5ae..961491ace 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x</TITLE>
+<TITLE>form_field 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x</H1>
+<H1 class="no-header">form_field 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                                                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+<STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
 
 
@@ -119,7 +119,7 @@ <H1 class="no-header">form_field 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 7996122b5..0993b0b15 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x</TITLE>
+<TITLE>form_field_attributes 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x</H1>
+<H1 class="no-header">form_field_attributes 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>                            <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+<STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
 
 
@@ -113,7 +113,7 @@ <H1 class="no-header">form_field_attributes 3x</H1>
 
 
 
-                                                     <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 1bc00e304..614d7632f 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.30 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.31 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x</TITLE>
+<TITLE>form_field_buffer 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x</H1>
+<H1 class="no-header">form_field_buffer 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>                                    <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+<STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
 
 
@@ -155,7 +155,7 @@ <H1 class="no-header">form_field_buffer 3x</H1>
 
 
 
-                                                         <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index a4852126a..6162b43f9 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_info.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x</TITLE>
+<TITLE>form_field_info 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x</H1>
+<H1 class="no-header">form_field_info 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>                                        <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+<STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
 
 
@@ -112,7 +112,7 @@ <H1 class="no-header">form_field_info 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index c40c6b2a2..fd206c27d 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_just.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x</TITLE>
+<TITLE>form_field_just 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x</H1>
+<H1 class="no-header">form_field_just 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>                                        <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+<STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
 
 
@@ -101,7 +101,7 @@ <H1 class="no-header">form_field_just 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index d52ee9ed5..f7d38efec 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.27 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_new.3x,v 1.28 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x</TITLE>
+<TITLE>form_field_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x</H1>
+<H1 class="no-header">form_field_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>                                          <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+<STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
 
 
@@ -128,7 +128,7 @@ <H1 class="no-header">form_field_new 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 71bc188b2..9f40eba71 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.30 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_opts.3x,v 1.31 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x</TITLE>
+<TITLE>form_field_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x</H1>
+<H1 class="no-header">form_field_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>                                        <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+<STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
 
 
@@ -170,7 +170,7 @@ <H1 class="no-header">form_field_opts 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index bdf4b9f55..203354ab2 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x</TITLE>
+<TITLE>form_field_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x</H1>
+<H1 class="no-header">form_field_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>                                  <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+<STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_field_userptr 3x</H1>
 
 
 
-                                                        <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index c0a0f9e35..3574c0c0e 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.36 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_validation.3x,v 1.37 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x</TITLE>
+<TITLE>form_field_validation 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x</H1>
+<H1 class="no-header">form_field_validation 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>                            <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+<STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
 
 
@@ -224,7 +224,7 @@ <H1 class="no-header">form_field_validation 3x</H1>
 
 
 
-                                                     <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 5e6755355..7ec78479f 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.31 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.32 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x</TITLE>
+<TITLE>form_fieldtype 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x</H1>
+<H1 class="no-header">form_fieldtype 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>                                          <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+<STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
 
 
@@ -189,7 +189,7 @@ <H1 class="no-header">form_fieldtype 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index decd850e0..3ce2368dd 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_hook.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x</TITLE>
+<TITLE>form_hook 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x</H1>
+<H1 class="no-header">form_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                                                    <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+<STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
 
 
@@ -121,7 +121,7 @@ <H1 class="no-header">form_hook 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 1246c4273..199b131d9 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.18 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_new.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x</TITLE>
+<TITLE>form_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x</H1>
+<H1 class="no-header">form_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                                                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+<STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
 
 
@@ -112,7 +112,7 @@ <H1 class="no-header">form_new 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 0db3ac7ee..e9dd5d30c 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_new_page.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x</TITLE>
+<TITLE>form_new_page 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x</H1>
+<H1 class="no-header">form_new_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                                            <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+<STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
 
 
@@ -98,7 +98,7 @@ <H1 class="no-header">form_new_page 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 9fda7453b..8733bb9e1 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_opts.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x</TITLE>
+<TITLE>form_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x</H1>
+<H1 class="no-header">form_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                                                    <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+<STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
 
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_opts 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index b0ab37d82..70c9fc188 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_page.3x,v 1.23 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x</TITLE>
+<TITLE>form_page 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x</H1>
+<H1 class="no-header">form_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                                                    <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+<STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
 
 
@@ -126,7 +126,7 @@ <H1 class="no-header">form_page 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index ebb2f01f1..aee4a7e06 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_post.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x</TITLE>
+<TITLE>form_post 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x</H1>
+<H1 class="no-header">form_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                                                    <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+<STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
 
 
@@ -115,7 +115,7 @@ <H1 class="no-header">form_post 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 37122c6d2..655377e85 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_requestname.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x</TITLE>
+<TITLE>form_requestname 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x</H1>
+<H1 class="no-header">form_requestname 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>                                      <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+<STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
 
 
@@ -101,7 +101,7 @@ <H1 class="no-header">form_requestname 3x</H1>
 
 
 
-                                                          <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index a5033f79f..15f4100ee 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_userptr.3x,v 1.23 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x</TITLE>
+<TITLE>form_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x</H1>
+<H1 class="no-header">form_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                                              <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+<STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_userptr 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index 93d0a0620..5a8e585b0 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_variables.3x,v 1.9 2021/12/25 21:50:36 tom Exp @
+  * @Id: form_variables.3x,v 1.10 2021/12/25 21:50:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x</TITLE>
+<TITLE>form_variables 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x</H1>
+<H1 class="no-header">form_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>                                          <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+<STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
 
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_variables 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 1baf01264..04f2529e1 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_win.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x</TITLE>
+<TITLE>form_win 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x</H1>
+<H1 class="no-header">form_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                                                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+<STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
 
 
@@ -120,7 +120,7 @@ <H1 class="no-header">form_win 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index e21bc779b..a05e36986 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.82 2023/03/05 00:05:39 tom Exp @
+  * @Id: infocmp.1m,v 1.84 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m</TITLE>
+<TITLE>infocmp 1m 2023-06-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m</H1>
+<H1 class="no-header">infocmp 1m 2023-06-17 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                                                        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+<STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
 
 
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -530,7 +530,7 @@ <H1 class="no-header">infocmp 1m</H1>
 
 
 
-                                                                   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-06-17                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index b0962055c..9ca815bc2 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.20 2022/02/12 20:02:20 tom Exp @
+  * @Id: infotocap.1m,v 1.21 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m</TITLE>
+<TITLE>infotocap 1m 2022-02-12 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m</H1>
+<H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                                                    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+<STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
 
 
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -100,7 +100,7 @@ <H1 class="no-header">infotocap 1m</H1>
 
 
 
-                                                                 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index f39d3264a..f09018c56 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.13 2022/02/12 20:03:40 tom Exp @
+  * @Id: key_defined.3x,v 1.14 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x</TITLE>
+<TITLE>key_defined 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x</H1>
+<H1 class="no-header">key_defined 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                                                <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+<STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
 
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index f605c1b10..2f6d6584f 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.14 2022/02/12 20:03:40 tom Exp @
+  * @Id: keybound.3x,v 1.15 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x</TITLE>
+<TITLE>keybound 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x</H1>
+<H1 class="no-header">keybound 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                                                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+<STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
 
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index dbb3f0c1c..df0e4f231 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: keyok.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x</TITLE>
+<TITLE>keyok 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x</H1>
+<H1 class="no-header">keyok 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                                                            <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+<STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
 
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x</H1>
 
 
 
-                                                                     <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index c4aa0965a..8b019b8e4 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.11 2022/02/12 20:07:56 tom Exp @
+  * @Id: legacy_coding.3x,v 1.12 2022/02/12 20:07:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x</TITLE>
+<TITLE>legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x</H1>
+<H1 class="no-header">legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                                            <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+<STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 91971f580..ddf954c2b 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.29 2021/12/25 21:49:32 tom Exp @
+  * @Id: menu.3x,v 1.30 2021/12/25 21:49:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x</TITLE>
+<TITLE>menu 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x</H1>
+<H1 class="no-header">menu 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                                                              <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+<STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
 
 
@@ -223,11 +223,11 @@ <H1 class="no-header">menu 3x</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                      <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2021-12-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 62252e0a8..bbe3dd8d4 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_attributes.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x</TITLE>
+<TITLE>menu_attributes 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x</H1>
+<H1 class="no-header">menu_attributes 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>                                        <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+<STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
 
 
@@ -122,7 +122,7 @@ <H1 class="no-header">menu_attributes 3x</H1>
 
 
 
-                                                           <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 8f28ca1a3..e60edabb2 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.16 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_cursor.3x,v 1.17 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x</TITLE>
+<TITLE>menu_cursor 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x</H1>
+<H1 class="no-header">menu_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                                                <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+<STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
 
 
@@ -99,7 +99,7 @@ <H1 class="no-header">menu_cursor 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index df2fbe819..40ae4e395 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.31 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_driver.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x</TITLE>
+<TITLE>menu_driver 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x</H1>
+<H1 class="no-header">menu_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                                                <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+<STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
 
 
@@ -228,7 +228,7 @@ <H1 class="no-header">menu_driver 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 8b70d0132..824198739 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.21 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_format.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x</TITLE>
+<TITLE>menu_format 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x</H1>
+<H1 class="no-header">menu_format 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                                                <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+<STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
 
 
@@ -112,7 +112,7 @@ <H1 class="no-header">menu_format 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 88bb67d40..b48ac25b4 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.18 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_hook.3x,v 1.19 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x</TITLE>
+<TITLE>menu_hook 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x</H1>
+<H1 class="no-header">menu_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                                                    <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+<STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
 
 
@@ -123,7 +123,7 @@ <H1 class="no-header">menu_hook 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 3e9791a1f..0ef85338b 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.20 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_items.3x,v 1.21 2022/02/12 20:05:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x</TITLE>
+<TITLE>menu_items 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x</H1>
+<H1 class="no-header">menu_items 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                                                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+<STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
 
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_items 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 996069ad8..d1cbe3820 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_mark.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x</TITLE>
+<TITLE>menu_mark 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x</H1>
+<H1 class="no-header">menu_mark 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                                                    <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+<STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
 
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_mark 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index ad6a2b97b..6dd38e630 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x</TITLE>
+<TITLE>menu_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x</H1>
+<H1 class="no-header">menu_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                                                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+<STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
 
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_new 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 208bd6367..2d68dc876 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_opts.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x</TITLE>
+<TITLE>menu_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x</H1>
+<H1 class="no-header">menu_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                                                    <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+<STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
 
 
@@ -134,7 +134,7 @@ <H1 class="no-header">menu_opts 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index cf2f296bf..6013ef4dd 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.24 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_pattern.3x,v 1.25 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x</TITLE>
+<TITLE>menu_pattern 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x</H1>
+<H1 class="no-header">menu_pattern 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                                              <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+<STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
 
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_pattern 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index cc2274bdc..ab6cf088f 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_post.3x,v 1.23 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x</TITLE>
+<TITLE>menu_post 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x</H1>
+<H1 class="no-header">menu_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                                                    <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+<STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
 
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_post 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index ab12977c3..1eac0d2e1 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.18 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_requestname.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x</TITLE>
+<TITLE>menu_requestname 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x</H1>
+<H1 class="no-header">menu_requestname 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>                                      <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+<STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_requestname 3x</H1>
 
 
 
-                                                          <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 45bbabd45..8ec318a1d 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_spacing.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x</TITLE>
+<TITLE>menu_spacing 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x</H1>
+<H1 class="no-header">menu_spacing 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                                              <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+<STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
 
 
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_spacing 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index cc6873c20..3be8c2d8b 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x</TITLE>
+<TITLE>menu_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x</H1>
+<H1 class="no-header">menu_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                                              <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+<STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_userptr 3x</H1>
 
 
 
-                                                              <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 12849d70d..41b13df64 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.18 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_win.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x</TITLE>
+<TITLE>menu_win 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x</H1>
+<H1 class="no-header">menu_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                                                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+<STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
 
 
@@ -120,7 +120,7 @@ <H1 class="no-header">menu_win 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 1e4384279..455f57737 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.23 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_current.3x,v 1.24 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x</TITLE>
+<TITLE>mitem_current 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x</H1>
+<H1 class="no-header">mitem_current 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                                            <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+<STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
 
 
@@ -125,7 +125,7 @@ <H1 class="no-header">mitem_current 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index af84f5511..2a4990f94 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.17 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_name.3x,v 1.18 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x</TITLE>
+<TITLE>mitem_name 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x</H1>
+<H1 class="no-header">mitem_name 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                                                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+<STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
 
 
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_name 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 2e1dcde62..a84f5ddf8 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_new.3x,v 1.23 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x</TITLE>
+<TITLE>mitem_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x</H1>
+<H1 class="no-header">mitem_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                                                    <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+<STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
 
 
@@ -113,7 +113,7 @@ <H1 class="no-header">mitem_new 3x</H1>
 
 
 
-                                                                 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 0cd0ec6af..90b659e95 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_opts.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x</TITLE>
+<TITLE>mitem_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x</H1>
+<H1 class="no-header">mitem_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                                                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+<STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
 
 
@@ -108,7 +108,7 @@ <H1 class="no-header">mitem_opts 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index ee8a3b8fc..13bbba77e 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x</TITLE>
+<TITLE>mitem_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x</H1>
+<H1 class="no-header">mitem_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                                            <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+<STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">mitem_userptr 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 6e1e6ab7a..a3f65e9a5 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.18 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_value.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x</TITLE>
+<TITLE>mitem_value 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x</H1>
+<H1 class="no-header">mitem_value 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                                                <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+<STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
 
 
@@ -99,7 +99,7 @@ <H1 class="no-header">mitem_value 3x</H1>
 
 
 
-                                                               <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index 9c8efbe61..69a4122a6 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.13 2022/02/12 20:03:40 tom Exp @
+  * @Id: mitem_visible.3x,v 1.14 2022/02/12 20:03:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x</TITLE>
+<TITLE>mitem_visible 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x</H1>
+<H1 class="no-header">mitem_visible 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                                            <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+<STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
 
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_visible 3x</H1>
 
 
 
-                                                             <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index e618afb95..05a243b48 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.157 2023/04/23 23:17:26 tom Exp @
+  * @Id: ncurses.3x,v 1.159 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x</TITLE>
+<TITLE>ncurses 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x</H1>
+<H1 class="no-header">ncurses 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                                                        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+<STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
 
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1478,7 +1478,7 @@ <H1 class="no-header">ncurses 3x</H1>
 
 
 
-                                                                   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-06-17                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index fe6105f32..8bd6f0a33 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 524f96cdc..10f58bd9c 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: new_pair.3x,v 1.21 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x</TITLE>
+<TITLE>new_pair 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x</H1>
+<H1 class="no-header">new_pair 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                                                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+<STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
 
 
@@ -164,7 +164,7 @@ <H1 class="no-header">new_pair 3x</H1>
 
 
 
-                                                                  <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-06-17                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 251062a89..80855c2d8 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.42 2022/02/12 20:03:40 tom Exp @
+  * @Id: panel.3x,v 1.43 2022/02/12 20:03:40 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,14 +51,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x</TITLE>
+<TITLE>panel 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x</H1>
+<H1 class="no-header">panel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                                                            <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+<STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
 
 
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -295,7 +295,7 @@ <H1 class="no-header">panel 3x</H1>
 
 
 
-                                                                     <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index ebf6c55cc..86f452116 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.32 2022/02/20 00:32:18 tom Exp @
+  * @Id: resizeterm.3x,v 1.33 2022/02/20 00:32:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x</TITLE>
+<TITLE>resizeterm 3x 2022-02-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x</H1>
+<H1 class="no-header">resizeterm 3x 2022-02-19 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                                                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+<STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
 
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x</H1>
 
 
 
-                                                                <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2022-02-19                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 459a30cc0..30d569332 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.20 2021/12/25 21:13:38 tom Exp @
+  * @Id: scr_dump.5,v 1.22 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5</TITLE>
+<TITLE>scr_dump 5 2023-06-17 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5</H1>
+<H1 class="no-header">scr_dump 5 2023-06-17 ncurses 6.4 File formats</H1>
 <PRE>
-<STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                   File Formats Manual                  <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+<STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
 
 
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5</H1>
 
 
 
-                                                                   <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-06-17                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index eab405472..64f502880 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.35 2021/12/25 19:04:39 tom Exp @
+  * @Id: tabs.1,v 1.37 2023/06/17 17:50:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1</TITLE>
+<TITLE>tabs 1 2023-06-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1</H1>
+<H1 class="no-header">tabs 1 2023-06-17 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                     General Commands Manual                    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+<STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
 
 
@@ -252,11 +252,11 @@ <H1 class="no-header">tabs 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                       <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-06-17                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index ebeee22a8..0a5cb5af8 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.43 2021/12/25 21:28:59 tom Exp @
+  * @Id: term.5,v 1.45 2023/06/17 17:52:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5</TITLE>
+<TITLE>term 5 2023-06-17 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5</H1>
+<H1 class="no-header">term 5 2023-06-17 ncurses 6.4 File formats</H1>
 <PRE>
-<STRONG><A HREF="term.5.html">term(5)</A></STRONG>                       File Formats Manual                      <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+<STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
 
 
@@ -380,7 +380,7 @@ <H1 class="no-header">term 5</H1>
 
 
 
-                                                                       <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-06-17                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 009f67418..44f889e0e 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.31 2021/12/25 17:39:16 tom Exp @
+  * @Id: term.7,v 1.32 2021/12/25 17:39:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7</TITLE>
+<TITLE>term 7 2021-12-25 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7</H1>
+<H1 class="no-header">term 7 2021-12-25 ncurses 6.4 Miscellaneous</H1>
 <PRE>
-<STRONG><A HREF="term.7.html">term(7)</A></STRONG>                Miscellaneous Information Manual                <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+<STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
 
 
@@ -216,7 +216,7 @@ <H1 class="no-header">term 7</H1>
 
 
 
-                                                                       <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2021-12-25                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 4dd4977d8..a62686706 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.17 2023/01/02 12:17:34 tom Exp @
+  * @Id: term_variables.3x,v 1.18 2023/01/02 12:17:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x</TITLE>
+<TITLE>term_variables 3x 2023-01-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x</H1>
+<H1 class="no-header">term_variables 3x 2023-01-02 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>                                          <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+<STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
 
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x</H1>
 
 
 
-                                                            <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-01-02                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index fdd06dbf1..fec8f50f8 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 883910558..1c7a47495 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.84 2022/09/17 19:01:24 tom Exp @
+  * @Id: tic.1m,v 1.85 2022/09/17 19:01:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m</TITLE>
+<TITLE>tic 1m 2022-09-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m</H1>
+<H1 class="no-header">tic 1m 2022-09-17 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                                                                <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+<STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
 
 
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -478,7 +478,7 @@ <H1 class="no-header">tic 1m</H1>
 
 
 
-                                                                       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2022-09-17                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index a3828af6b..22aaddb1a 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.36 2022/02/12 20:02:20 tom Exp @
+  * @Id: toe.1m,v 1.38 2023/06/17 17:52:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m</TITLE>
+<TITLE>toe 1m 2023-06-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m</H1>
+<H1 class="no-header">toe 1m 2023-06-17 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                                                                <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+<STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
 
 
@@ -171,11 +171,11 @@ <H1 class="no-header">toe 1m</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                       <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-06-17                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 00ff9cfbf..010068843 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,21 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.76 2022/02/12 20:02:20 tom Exp @
+  * @Id: tput.1,v 1.77 2022/02/12 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1</TITLE>
+<TITLE>tput 1 2022-02-12 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1</H1>
+<H1 class="no-header">tput 1 2022-02-12 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                     General Commands Manual                    <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+<STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
 
 
@@ -545,11 +545,11 @@ <H1 class="no-header">tput 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2022-02-12                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 510dce1b6..7b3b8cf4d 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.63 2023/06/10 15:46:24 tom Exp @
+  * @Id: tset.1,v 1.64 2023/06/10 15:46:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1</TITLE>
+<TITLE>tset 1 2023-06-10 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1</H1>
+<H1 class="no-header">tset 1 2023-06-10 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                     General Commands Manual                    <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+<STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
 
 
@@ -392,11 +392,11 @@ <H1 class="no-header">tset 1</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230610).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
 
 
 
-                                                                       <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-06-10                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index d99c5397b..e53f30bb9 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.22 2022/07/03 20:01:04 tom Exp @
+  * @Id: user_caps.5,v 1.24 2023/06/17 17:52:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5</TITLE>
+<TITLE>user_caps 5 2023-06-17 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5</H1>
+<H1 class="no-header">user_caps 5 2023-06-17 ncurses 6.4 File formats</H1>
 <PRE>
-<STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                  File Formats Manual                 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+<STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
@@ -393,7 +393,7 @@ <H1 class="no-header">user_caps 5</H1>
 
 
 
-                                                                  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-06-17                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 905a2929d..ffcfc3c5f 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,21 +28,21 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.20 2022/02/12 20:07:29 tom Exp @
+  * @Id: wresize.3x,v 1.21 2022/02/12 20:07:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x</TITLE>
+<TITLE>wresize 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x</H1>
+<H1 class="no-header">wresize 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 <PRE>
-<STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                                                        <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+<STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x</H1>
 
 
 
-                                                                   <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2022-02-12                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index ddf60346f..179355a77 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.33 2022/02/12 20:07:29 tom Exp $
-.TH @CAPTOINFO@ 1M ""
+.\" $Id: captoinfo.1m,v 1.34 2022/02/12 20:07:29 tom Exp $
+.TH @CAPTOINFO@ 1M 2022-02-12 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
diff --git a/man/clear.1 b/man/clear.1
index 9748fdd5a..1e5444d7e 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.29 2023/04/09 08:28:00 tom Exp $
-.TH @CLEAR@ 1 ""
+.\" $Id: clear.1,v 1.31 2023/06/17 17:50:37 tom Exp $
+.TH @CLEAR@ 1 2023-06-17 "ncurses 6.4" "User commands"
 .\" these would be fallbacks for DS/DE,
 .\" but groff changed the meaning of the macros.
 .de NS
@@ -37,7 +37,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 26d82e00b..1ea11f837 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.32 2023/03/11 20:40:45 tom Exp $
-.TH curs_add_wch 3X ""
+.\" $Id: curs_add_wch.3x,v 1.33 2023/03/11 20:40:45 tom Exp $
+.TH curs_add_wch 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 1a1625476..fa58192ec 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp $
-.TH curs_add_wchstr 3X ""
+.\" $Id: curs_add_wchstr.3x,v 1.20 2022/02/12 20:07:29 tom Exp $
+.TH curs_add_wchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 875f47f3c..14c8edd66 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.60 2023/03/11 20:39:26 tom Exp $
-.TH curs_addch 3X ""
+.\" $Id: curs_addch.3x,v 1.61 2023/03/11 20:39:26 tom Exp $
+.TH curs_addch 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index aba4c1317..906b54a36 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp $
-.TH curs_addchstr 3X ""
+.\" $Id: curs_addchstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp $
+.TH curs_addchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index cd8ce48d6..3eac89b6d 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.27 2023/03/11 20:40:52 tom Exp $
-.TH curs_addstr 3X ""
+.\" $Id: curs_addstr.3x,v 1.28 2023/03/11 20:40:52 tom Exp $
+.TH curs_addstr 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 7c3e041cd..2429c2849 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
-.TH curs_addwstr 3X ""
+.\" $Id: curs_addwstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp $
+.TH curs_addwstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index ac448b4ec..d6220ad12 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.72 2022/04/16 19:18:32 tom Exp $
-.TH curs_attr 3X ""
+.\" $Id: curs_attr.3x,v 1.74 2023/06/17 17:50:37 tom Exp $
+.TH curs_attr 3X 2023-06-17 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -40,7 +40,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 4368045ca..be18f910e 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.16 2021/12/25 21:41:58 tom Exp $
-.TH curs_beep 3X ""
+.\" $Id: curs_beep.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
+.TH curs_beep 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbeep\fP, \fBflash\fP \- \fBcurses\fP bell and screen flash routines
 .SH SYNOPSIS
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index f9199ce07..99e3efecf 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.35 2022/06/25 21:55:45 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.36 2022/06/25 21:55:45 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgd 3X ""
+.TH curs_bkgd 3X 2022-06-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbkgdset\fP, \fBwbkgdset\fP,
 \fBbkgd\fP, \fBwbkgd\fP,
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index e64f99418..61bddeae4 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.16 2022/06/25 21:57:59 tom Exp $
+.\" $Id: curs_bkgrnd.3x,v 1.17 2022/06/25 21:57:59 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgrnd 3X ""
+.TH curs_bkgrnd 3X 2022-06-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbkgrnd\fP,
 \fBwbkgrnd\fP,
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 72683b02d..ebae3f16e 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.30 2022/02/12 20:06:41 tom Exp $
-.TH curs_border 3X ""
+.\" $Id: curs_border.3x,v 1.31 2022/02/12 20:06:41 tom Exp $
+.TH curs_border 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 9d79b25cd..ade8b4c03 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.16 2022/02/12 20:06:41 tom Exp $
-.TH curs_border_set 3X ""
+.\" $Id: curs_border_set.3x,v 1.17 2022/02/12 20:06:41 tom Exp $
+.TH curs_border_set 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 36ff2781e..ef30b0bd8 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.27 2022/11/26 16:23:47 tom Exp $
-.TH curs_clear 3X ""
+.\" $Id: curs_clear.3x,v 1.28 2022/11/26 16:23:47 tom Exp $
+.TH curs_clear 3X 2022-11-26 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .de bP
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 92fc81c1f..aa2f0d579 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.69 2023/04/23 20:53:20 tom Exp $
-.TH curs_color 3X ""
+.\" $Id: curs_color.3x,v 1.70 2023/04/23 20:53:20 tom Exp $
+.TH curs_color 3X 2023-04-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 4062f9ed9..b211f8479 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.18 2022/02/12 20:06:41 tom Exp $
-.TH curs_delch 3X ""
+.\" $Id: curs_delch.3x,v 1.19 2022/02/12 20:06:41 tom Exp $
+.TH curs_delch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index c720e05c4..152e216a8 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.20 2022/02/12 20:06:41 tom Exp $
-.TH curs_deleteln 3X ""
+.\" $Id: curs_deleteln.3x,v 1.21 2022/02/12 20:06:41 tom Exp $
+.TH curs_deleteln 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdeleteln\fP,
 \fBwdeleteln\fP,
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 53b896384..8e93848de 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.28 2022/02/12 20:07:29 tom Exp $
-.TH curs_extend 3X ""
+.\" $Id: curs_extend.3x,v 1.29 2022/02/12 20:07:29 tom Exp $
+.TH curs_extend 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 8a31a90aa..be13c902d 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.17 2022/02/12 20:07:29 tom Exp $
-.TH curs_get_wch 3X ""
+.\" $Id: curs_get_wch.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
+.TH curs_get_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .ie \n(.g .ds `` \(lq
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 2c49920fb..2ccf068ad 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp $
-.TH curs_get_wstr 3X ""
+.\" $Id: curs_get_wstr.3x,v 1.27 2022/02/12 20:07:29 tom Exp $
+.TH curs_get_wstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 46d361106..b674a7793 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.27 2021/12/25 20:35:03 tom Exp $
-.TH curs_getcchar 3X ""
+.\" $Id: curs_getcchar.3x,v 1.28 2021/12/25 20:35:03 tom Exp $
+.TH curs_getcchar 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 7894f8756..e65784c06 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.63 2022/02/12 20:07:45 tom Exp $
-.TH curs_getch 3X ""
+.\" $Id: curs_getch.3x,v 1.64 2022/02/12 20:07:45 tom Exp $
+.TH curs_getch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .ie \n(.g .ds `` \(lq
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 80a1c1ab8..ff786f298 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.36 2022/02/12 20:07:29 tom Exp $
-.TH curs_getstr 3X ""
+.\" $Id: curs_getstr.3x,v 1.37 2022/02/12 20:07:29 tom Exp $
+.TH curs_getstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 94ceeb3a7..308f7413a 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.23 2022/02/12 20:07:29 tom Exp $
-.TH curs_getyx 3X ""
+.\" $Id: curs_getyx.3x,v 1.24 2022/02/12 20:07:29 tom Exp $
+.TH curs_getyx 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBgetyx\fP,
 \fBgetparyx\fP,
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index ba2498555..bd009dfc5 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.13 2022/02/12 20:07:29 tom Exp $
-.TH curs_in_wch 3X ""
+.\" $Id: curs_in_wch.3x,v 1.14 2022/02/12 20:07:29 tom Exp $
+.TH curs_in_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 4bcec9484..551f52c27 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.17 2022/02/12 20:07:29 tom Exp $
-.TH curs_in_wchstr 3X ""
+.\" $Id: curs_in_wchstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
+.TH curs_in_wchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 90992fe3e..bb97b321e 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.28 2022/02/12 20:07:29 tom Exp $
-.TH curs_inch 3X ""
+.\" $Id: curs_inch.3x,v 1.29 2022/02/12 20:07:29 tom Exp $
+.TH curs_inch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 2ffa4e32d..9f6c46e29 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.24 2022/02/12 20:07:29 tom Exp $
-.TH curs_inchstr 3X ""
+.\" $Id: curs_inchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp $
+.TH curs_inchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 3451991b2..3404f37e6 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.40 2023/06/10 16:50:22 tom Exp $
-.TH curs_initscr 3X ""
+.\" $Id: curs_initscr.3x,v 1.41 2023/06/10 16:50:22 tom Exp $
+.TH curs_initscr 3X 2023-06-10 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index e0ba270d6..9d6cf80c3 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.36 2022/02/12 20:07:29 tom Exp $
-.TH curs_inopts 3X ""
+.\" $Id: curs_inopts.3x,v 1.37 2022/02/12 20:07:29 tom Exp $
+.TH curs_inopts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 1acd49331..42d284afd 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.13 2022/02/12 20:05:11 tom Exp $
-.TH curs_ins_wch 3X ""
+.\" $Id: curs_ins_wch.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
+.TH curs_ins_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 571997104..e1c145716 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
-.TH curs_ins_wstr 3X ""
+.\" $Id: curs_ins_wstr.3x,v 1.15 2022/02/12 20:05:11 tom Exp $
+.TH curs_ins_wstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 7534c93e4..ef7ff743d 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
-.TH curs_insch 3X ""
+.\" $Id: curs_insch.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
+.TH curs_insch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 44bc6fd28..005d0144b 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.29 2022/02/12 20:05:11 tom Exp $
-.TH curs_insstr 3X ""
+.\" $Id: curs_insstr.3x,v 1.30 2022/02/12 20:05:11 tom Exp $
+.TH curs_insstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 4ab3e540a..2127a737d 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.25 2022/02/12 20:05:11 tom Exp $
-.TH curs_instr 3X ""
+.\" $Id: curs_instr.3x,v 1.26 2022/02/12 20:05:11 tom Exp $
+.TH curs_instr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 3b02feea8..87bad8ed6 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.17 2022/02/12 20:05:11 tom Exp $
-.TH curs_inwstr 3X ""
+.\" $Id: curs_inwstr.3x,v 1.18 2022/02/12 20:05:11 tom Exp $
+.TH curs_inwstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 73dec7b17..fba3dd8d7 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_kernel 3X ""
+.TH curs_kernel 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 02e2c8285..0243cf483 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.13 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_legacy 3X ""
+.TH curs_legacy 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
 .SH SYNOPSIS
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index cea4165fe..1cd1dc921 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.15 2022/06/04 23:33:48 tom Exp $
-.TH curs_memleaks 3X ""
+.\" $Id: curs_memleaks.3x,v 1.16 2022/06/04 23:33:48 tom Exp $
+.TH curs_memleaks 3X 2022-06-04 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 25d692011..ea4fed611 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.59 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.61 2023/06/17 17:50:37 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
@@ -51,7 +51,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_mouse 3X ""
+.TH curs_mouse 3X 2023-06-17 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 059176262..3af0f1ee7 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
-.TH curs_move 3X ""
+.\" $Id: curs_move.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
+.TH curs_move 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 2e57c0e22..1668fac7f 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.19 2023/03/11 20:40:58 tom Exp $
-.TH curs_opaque 3X ""
+.\" $Id: curs_opaque.3x,v 1.20 2023/03/11 20:40:58 tom Exp $
+.TH curs_opaque 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 4f90611bb..767a9253b 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.36 2022/02/12 20:05:11 tom Exp $
-.TH curs_outopts 3X ""
+.\" $Id: curs_outopts.3x,v 1.37 2022/02/12 20:05:11 tom Exp $
+.TH curs_outopts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .de bP
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 9c6561e7a..b352192b7 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
-.TH curs_overlay 3X ""
+.\" $Id: curs_overlay.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
+.TH curs_overlay 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index da25f3b74..ee1d841ea 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.29 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_pad.3x,v 1.30 2022/02/12 20:05:11 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_pad 3X ""
+.TH curs_pad 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 31c7dc46e..bbaeaa901 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.19 2022/02/12 20:05:11 tom Exp $
-.TH curs_print 3X ""
+.\" $Id: curs_print.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
+.TH curs_print 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmcprint\fP \- ship binary data to printer
 .SH SYNOPSIS
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index ee9ea8a37..985fbe25c 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
-.TH curs_printw 3X ""
+.\" $Id: curs_printw.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
+.TH curs_printw 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index c2cd84687..d828a7f3f 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.26 2023/03/11 20:41:02 tom Exp $
-.TH curs_refresh 3X ""
+.\" $Id: curs_refresh.3x,v 1.27 2023/03/11 20:41:02 tom Exp $
+.TH curs_refresh 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index ca78012e6..fe499b4eb 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
-.TH curs_scanw 3X ""
+.\" $Id: curs_scanw.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
+.TH curs_scanw 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 7829fade9..a209e5a7b 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
-.TH curs_scr_dump 3X ""
+.\" $Id: curs_scr_dump.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
+.TH curs_scr_dump 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index ee8288c92..1ef0c8bd0 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.23 2023/03/11 20:41:05 tom Exp $
-.TH curs_scroll 3X ""
+.\" $Id: curs_scroll.3x,v 1.24 2023/03/11 20:41:05 tom Exp $
+.TH curs_scroll 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 0816785e0..7d791b1d7 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.44 2022/10/29 22:44:14 tom Exp $
-.TH curs_slk 3X ""
+.\" $Id: curs_slk.3x,v 1.45 2022/10/29 22:44:14 tom Exp $
+.TH curs_slk 3X 2022-10-29 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 9bfc45787..12403f826 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.27 2022/02/12 20:05:11 tom Exp $
-.TH curs_sp_funcs 3X ""
+.\" $Id: curs_sp_funcs.3x,v 1.28 2022/02/12 20:05:11 tom Exp $
+.TH curs_sp_funcs 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 8f20cde50..57ce1b4ca 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.20 2023/03/11 20:41:12 tom Exp $
-.TH curs_termattrs 3X ""
+.\" $Id: curs_termattrs.3x,v 1.21 2023/03/11 20:41:12 tom Exp $
+.TH curs_termattrs 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbaudrate\fP,
 \fBerasechar\fP,
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 080b31850..b04584e08 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.58 2023/04/16 18:16:40 tom Exp $
-.TH curs_termcap 3X ""
+.\" $Id: curs_termcap.3x,v 1.59 2023/04/16 18:16:40 tom Exp $
+.TH curs_termcap 3X 2023-04-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 6b469b16b..ba4fe0e6d 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.87 2023/06/10 15:51:45 tom Exp $
-.TH curs_terminfo 3X ""
+.\" $Id: curs_terminfo.3x,v 1.90 2023/06/17 17:23:17 tom Exp $
+.TH curs_terminfo 3X 2023-06-17 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -722,7 +722,7 @@ Passing nine on each call is awkward.
 .IP
 Using \fBlong\fP for the numeric parameter type is a workaround
 to make the parameter use the same amount of stack as a pointer.
-That approach dates back to the mid-1980s, before C was standarized.
+That approach dates back to the mid-1980s, before C was standardized.
 Since then, there is a standard
 (and pointers are not required to fit in a long).
 .bP
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 58ace20e4..b45e81173 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.31 2022/02/12 20:05:11 tom Exp $
-.TH curs_threads 3X ""
+.\" $Id: curs_threads.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+.TH curs_threads 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 7b979b2b6..a23825a4f 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.26 2022/02/12 20:05:11 tom Exp $
-.TH curs_touch 3X ""
+.\" $Id: curs_touch.3x,v 1.27 2022/02/12 20:05:11 tom Exp $
+.TH curs_touch 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 02e67394d..26cdc5023 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.25 2022/02/12 20:06:41 tom Exp $
+.\" $Id: curs_trace.3x,v 1.26 2022/02/12 20:06:41 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_trace 3X ""
+.TH curs_trace 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/curs_util.3x b/man/curs_util.3x
index c5d64f200..52e6e276a 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.66 2023/03/11 20:28:02 tom Exp $
-.TH curs_util 3X ""
+.\" $Id: curs_util.3x,v 1.67 2023/03/11 20:28:02 tom Exp $
+.TH curs_util 3X 2023-03-11 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index ad6a5b801..4d5b684a5 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
-.TH curs_variables 3X ""
+.\" $Id: curs_variables.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
+.TH curs_variables 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_window.3x b/man/curs_window.3x
index f37eb5f65..938628028 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.28 2022/08/13 23:24:22 tom Exp $
-.TH curs_window 3X ""
+.\" $Id: curs_window.3x,v 1.29 2022/08/13 23:24:22 tom Exp $
+.TH curs_window 3X 2022-08-13 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 0710a510d..12ca61394 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.35 2022/02/12 20:03:40 tom Exp $
-.TH default_colors 3X ""
+.\" $Id: default_colors.3x,v 1.36 2022/02/12 20:03:40 tom Exp $
+.TH default_colors 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/define_key.3x b/man/define_key.3x
index 1476bb766..f2962d8b9 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH define_key 3X ""
+.\" $Id: define_key.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+.TH define_key 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdefine_key\fP \- define a keycode
 .SH SYNOPSIS
diff --git a/man/form.3x b/man/form.3x
index 5808d1e94..044a1867b 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.38 2021/12/25 21:49:32 tom Exp $
-.TH form 3X ""
+.\" $Id: form.3x,v 1.39 2021/12/25 21:49:32 tom Exp $
+.TH form 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index a2af849d6..0addc11e6 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.17 2022/02/12 20:03:40 tom Exp $
-.TH form_cursor 3X ""
+.\" $Id: form_cursor.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
+.TH form_cursor 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \- position a form window cursor
 .SH SYNOPSIS
diff --git a/man/form_data.3x b/man/form_data.3x
index ac7db7cd5..7b904312d 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
-.TH form_data 3X ""
+.\" $Id: form_data.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+.TH form_data 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \- test for off-screen data in given forms
diff --git a/man/form_driver.3x b/man/form_driver.3x
index ff3a01376..5681bf86e 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.39 2022/02/12 20:03:40 tom Exp $
-.TH form_driver 3X ""
+.\" $Id: form_driver.3x,v 1.40 2022/02/12 20:03:40 tom Exp $
+.TH form_driver 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/form_field.3x b/man/form_field.3x
index c9cfbf2e5..d790504ba 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_field 3X ""
+.\" $Id: form_field.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+.TH form_field 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_field\fP \- make and break connections between fields and forms
 .SH SYNOPSIS
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index 5a90cf8be..968b22336 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_field_attributes 3X ""
+.\" $Id: form_field_attributes.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+.TH form_field_attributes 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 8688b7b6b..4fede081c 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.30 2022/02/12 20:03:40 tom Exp $
-.TH form_field_buffer 3X ""
+.\" $Id: form_field_buffer.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
+.TH form_field_buffer 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index f5d77778e..2c18bc789 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_field_info 3X ""
+.\" $Id: form_field_info.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+.TH form_field_info 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index 8f5efa61e..cf3ccfe6c 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_field_just 3X ""
+.\" $Id: form_field_just.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+.TH form_field_just 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 05d6d03c7..7224622f4 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.27 2022/02/12 20:03:40 tom Exp $
-.TH form_field_new 3X ""
+.\" $Id: form_field_new.3x,v 1.28 2022/02/12 20:03:40 tom Exp $
+.TH form_field_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index e19f6bd91..aee8a96aa 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.30 2022/02/12 20:03:40 tom Exp $
-.TH form_field_opts 3X ""
+.\" $Id: form_field_opts.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
+.TH form_field_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index ae5f75121..4c760673e 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_field_userptr 3X ""
+.\" $Id: form_field_userptr.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+.TH form_field_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \- associate application data with a form field
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index ec68a90f1..51107d858 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.36 2022/02/12 20:03:40 tom Exp $
-.TH form_field_validation 3X ""
+.\" $Id: form_field_validation.3x,v 1.37 2022/02/12 20:03:40 tom Exp $
+.TH form_field_validation 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 7a23bb86d..71221e05b 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -28,12 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.32 2022/02/12 20:03:40 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH form_fieldtype 3X ""
+.TH form_fieldtype 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_fieldtype\fP \- define validation-field types
 .SH SYNOPSIS
diff --git a/man/form_hook.3x b/man/form_hook.3x
index b4f17ed19..733c2f609 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_hook 3X ""
+.\" $Id: form_hook.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+.TH form_hook 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
diff --git a/man/form_new.3x b/man/form_new.3x
index 901d94d58..78f955648 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
-.TH form_new 3X ""
+.\" $Id: form_new.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+.TH form_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \- create and destroy forms
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index fa1660a1e..083d6b4bf 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_new_page 3X ""
+.\" $Id: form_new_page.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+.TH form_new_page 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/form_opts.3x b/man/form_opts.3x
index 75ee62a7d..ebcf5af3e 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_opts 3X ""
+.\" $Id: form_opts.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+.TH form_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
diff --git a/man/form_page.3x b/man/form_page.3x
index 5205859ee..94f29c918 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_page 3X ""
+.\" $Id: form_page.3x,v 1.23 2022/02/12 20:03:40 tom Exp $
+.TH form_page 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \- set and get form page number
 .SH SYNOPSIS
diff --git a/man/form_post.3x b/man/form_post.3x
index 689ab9759..269cb183a 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_post 3X ""
+.\" $Id: form_post.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+.TH form_post 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \- write or erase forms from associated subwindows
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index e26dfd82d..8f73c9007 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_requestname 3X ""
+.\" $Id: form_requestname.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+.TH form_requestname 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \- handle printable form request names
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 47fcc2943..6f41f8bc7 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_userptr 3X ""
+.\" $Id: form_userptr.3x,v 1.23 2022/02/12 20:03:40 tom Exp $
+.TH form_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \- associate application data with a form item
diff --git a/man/form_variables.3x b/man/form_variables.3x
index 5a1712d53..1f97fef47 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_variables.3x,v 1.9 2021/12/25 21:50:36 tom Exp $
-.TH form_variables 3X ""
+.\" $Id: form_variables.3x,v 1.10 2021/12/25 21:50:36 tom Exp $
+.TH form_variables 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/form_win.3x b/man/form_win.3x
index 49c007fc2..11e92f907 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_win 3X ""
+.\" $Id: form_win.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+.TH form_win 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_win\fP \- make and break form window and subwindow associations
 .SH SYNOPSIS
diff --git a/man/infocmp.1m b/man/infocmp.1m
index cdd0806ee..89f5dfbbe 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.82 2023/03/05 00:05:39 tom Exp $
-.TH @INFOCMP@ 1M ""
+.\" $Id: infocmp.1m,v 1.84 2023/06/17 17:50:37 tom Exp $
+.TH @INFOCMP@ 1M 2023-06-17 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -45,7 +45,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 6fa0ad527..12820720d 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.20 2022/02/12 20:02:20 tom Exp $
-.TH @INFOTOCAP@ 1M ""
+.\" $Id: infotocap.1m,v 1.21 2022/02/12 20:02:20 tom Exp $
+.TH @INFOTOCAP@ 1M 2022-02-12 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
diff --git a/man/key_defined.3x b/man/key_defined.3x
index d190c7909..5614e1ce8 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.13 2022/02/12 20:03:40 tom Exp $
-.TH key_defined 3X ""
+.\" $Id: key_defined.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
+.TH key_defined 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBkey_defined\fP \- check if a keycode is defined
 .SH SYNOPSIS
diff --git a/man/keybound.3x b/man/keybound.3x
index a49b9670e..76825c4c0 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
-.TH keybound 3X ""
+.\" $Id: keybound.3x,v 1.15 2022/02/12 20:03:40 tom Exp $
+.TH keybound 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBkeybound\fP \- return definition of keycode
 .SH SYNOPSIS
diff --git a/man/keyok.3x b/man/keyok.3x
index d31d5b1f4..f69c82e62 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH keyok 3X ""
+.\" $Id: keyok.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+.TH keyok 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBkeyok\fP \- enable or disable a keycode
 .SH SYNOPSIS
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 0fbd5c96d..57d88d80a 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.11 2022/02/12 20:07:56 tom Exp $
-.TH legacy_coding 3X ""
+.\" $Id: legacy_coding.3x,v 1.12 2022/02/12 20:07:56 tom Exp $
+.TH legacy_coding 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBuse_legacy_coding\fP \- override locale-encoding checks
 .SH SYNOPSIS
diff --git a/man/menu.3x b/man/menu.3x
index ea16bf6f9..8e099e6dc 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
-.TH menu 3X ""
+.\" $Id: menu.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
+.TH menu 3X 2021-12-25 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 9193c1959..513c07ac4 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
-.TH menu_attributes 3X ""
+.\" $Id: menu_attributes.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
+.TH menu_attributes 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 28b28408e..eeb9665c7 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.16 2022/02/12 20:05:11 tom Exp $
-.TH menu_cursor 3X ""
+.\" $Id: menu_cursor.3x,v 1.17 2022/02/12 20:05:11 tom Exp $
+.TH menu_cursor 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \- position a menu's cursor
 .SH SYNOPSIS
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 706005fa2..585ab287c 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.31 2022/02/12 20:05:11 tom Exp $
-.TH menu_driver 3X ""
+.\" $Id: menu_driver.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+.TH menu_driver 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/menu_format.3x b/man/menu_format.3x
index 7abe94e66..aade628a5 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
-.TH menu_format 3X ""
+.\" $Id: menu_format.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+.TH menu_format 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \- set and get menu sizes
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 661e20dcf..374b31b05 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.18 2022/02/12 20:05:11 tom Exp $
-.TH menu_hook 3X ""
+.\" $Id: menu_hook.3x,v 1.19 2022/02/12 20:05:11 tom Exp $
+.TH menu_hook 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 555498e04..10722bbe3 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
-.TH menu_items 3X ""
+.\" $Id: menu_items.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
+.TH menu_items 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index e69361291..6dc035f92 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH menu_mark 3X ""
+.\" $Id: menu_mark.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
+.TH menu_mark 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \- get and set the menu mark string
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 00e2bc9c4..877994bc3 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH menu_new 3X ""
+.\" $Id: menu_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
+.TH menu_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \- create and destroy menus
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index ca61f1bcf..f2e4e69db 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH menu_opts 3X ""
+.\" $Id: menu_opts.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
+.TH menu_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index faaf6475a..327204054 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.24 2022/02/12 20:02:20 tom Exp $
-.TH menu_pattern 3X ""
+.\" $Id: menu_pattern.3x,v 1.25 2022/02/12 20:02:20 tom Exp $
+.TH menu_pattern 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \- set and get a menu's pattern buffer
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 2d96b5588..31805d0a3 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
-.TH menu_post 3X ""
+.\" $Id: menu_post.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
+.TH menu_post 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \- write or erase menus from associated subwindows
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 5c46f67d2..22f75e886 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
-.TH menu_requestname 3X ""
+.\" $Id: menu_requestname.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
+.TH menu_requestname 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \- handle printable menu request names
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index bc34806c5..7f1aefaae 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
-.TH menu_spacing 3X ""
+.\" $Id: menu_spacing.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
+.TH menu_spacing 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \- set and get spacing between menu items.
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index d0d30bf4c..83e67ef8a 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
-.TH menu_userptr 3X ""
+.\" $Id: menu_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
+.TH menu_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \- associate application data with a menu item
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 7d88e518e..016c53042 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
-.TH menu_win 3X ""
+.\" $Id: menu_win.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
+.TH menu_win 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_win\fP \- make and break menu window and subwindow associations
 .SH SYNOPSIS
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 046404202..ba87410ca 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
-.TH mitem_current 3X ""
+.\" $Id: mitem_current.3x,v 1.24 2022/02/12 20:02:20 tom Exp $
+.TH mitem_current 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_current\fP \- set and get current_menu_item
 .SH SYNOPSIS
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 7023b0277..c96213658 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.17 2022/02/12 20:02:20 tom Exp $
-.TH mitem_name 3X ""
+.\" $Id: mitem_name.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
+.TH mitem_name 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \- get menu item name and description fields
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 7a0178ac6..89882e150 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
-.TH mitem_new 3X ""
+.\" $Id: mitem_new.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
+.TH mitem_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \- create and destroy menu items
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 716584c89..51e33e82c 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
-.TH mitem_opts 3X ""
+.\" $Id: mitem_opts.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
+.TH mitem_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index 1d492c51f..df779da70 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
-.TH mitem_userptr 3X ""
+.\" $Id: mitem_userptr.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
+.TH mitem_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \- associate application data with a menu item
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 0677301f0..7d8123224 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
-.TH mitem_value 3X ""
+.\" $Id: mitem_value.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
+.TH mitem_value 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \- set and get menu item values
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 4fb4e3693..518a460a5 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.13 2022/02/12 20:03:40 tom Exp $
-.TH mitem_visible 3X ""
+.\" $Id: mitem_visible.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
+.TH mitem_visible 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_visible\fP \- check visibility of a menu item
 .SH SYNOPSIS
diff --git a/man/ncurses.3x b/man/ncurses.3x
index dc308a6ec..038083967 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,9 +28,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.157 2023/04/23 23:17:26 tom Exp $
+.\" $Id: ncurses.3x,v 1.159 2023/06/17 17:50:37 tom Exp $
 .hy 0
-.TH ncurses 3X ""
+.TH ncurses 3X 2023-06-17 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -45,7 +45,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/new_pair.3x b/man/new_pair.3x
index ae20dd445..bb49dea44 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH new_pair 3X ""
+.\" $Id: new_pair.3x,v 1.21 2023/06/17 17:50:37 tom Exp $
+.TH new_pair 3X 2023-06-17 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -45,7 +45,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/panel.3x b/man/panel.3x
index f16931ce3..b3d2d44ac 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.42 2022/02/12 20:03:40 tom Exp $
-.TH panel 3X ""
+.\" $Id: panel.3x,v 1.43 2022/02/12 20:03:40 tom Exp $
+.TH panel 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 37094d80c..4d7638982 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.32 2022/02/20 00:32:18 tom Exp $
-.TH resizeterm 3X ""
+.\" $Id: resizeterm.3x,v 1.33 2022/02/20 00:32:18 tom Exp $
+.TH resizeterm 3X 2022-02-19 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index fd2e1a07e..df4f67269 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.20 2021/12/25 21:13:38 tom Exp $
-.TH scr_dump 5
+.\" $Id: scr_dump.5,v 1.22 2023/06/17 17:50:37 tom Exp $
+.TH scr_dump 5 2023-06-17 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/tabs.1 b/man/tabs.1
index 84c6b22e8..498f3fa73 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.35 2021/12/25 19:04:39 tom Exp $
-.TH @TABS@ 1 ""
+.\" $Id: tabs.1,v 1.37 2023/06/17 17:50:37 tom Exp $
+.TH @TABS@ 1 2023-06-17 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -44,7 +44,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/term.5 b/man/term.5
index b21e90f8f..e5dfd8f76 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.43 2021/12/25 21:28:59 tom Exp $
-.TH term 5
+.\" $Id: term.5,v 1.45 2023/06/17 17:52:54 tom Exp $
+.TH term 5 2023-06-17 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/term.7 b/man/term.7
index f3a0e756b..909bbd8cb 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.31 2021/12/25 17:39:16 tom Exp $
-.TH term 7
+.\" $Id: term.7,v 1.32 2021/12/25 17:39:16 tom Exp $
+.TH term 7 2021-12-25 "ncurses 6.4" Miscellaneous
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 826204e64..9a07869b9 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.17 2023/01/02 12:17:34 tom Exp $
-.TH term_variables 3X ""
+.\" $Id: term_variables.3x,v 1.18 2023/01/02 12:17:34 tom Exp $
+.TH term_variables 3X 2023-01-02 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
diff --git a/man/tic.1m b/man/tic.1m
index 17f576fd8..4326a3a88 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.84 2022/09/17 19:01:24 tom Exp $
-.TH @TIC@ 1M ""
+.\" $Id: tic.1m,v 1.85 2022/09/17 19:01:24 tom Exp $
+.TH @TIC@ 1M 2022-09-17 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/toe.1m b/man/toe.1m
index d2c4eb73a..95955c128 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.36 2022/02/12 20:02:20 tom Exp $
-.TH @TOE@ 1M ""
+.\" $Id: toe.1m,v 1.38 2023/06/17 17:52:54 tom Exp $
+.TH @TOE@ 1M 2023-06-17 "ncurses 6.4" "User commands"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -43,7 +43,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/tput.1 b/man/tput.1
index 5d61230db..6889894d8 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.76 2022/02/12 20:02:20 tom Exp $
-.TH @TPUT@ 1 ""
+.\" $Id: tput.1,v 1.77 2022/02/12 20:02:20 tom Exp $
+.TH @TPUT@ 1 2022-02-12 "ncurses 6.4" "User commands"
 .ds d @TERMINFO@
 .ds n 1
 .ie \n(.g .ds `` \(lq
diff --git a/man/tset.1 b/man/tset.1
index d43154440..198a2bc8e 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.63 2023/06/10 15:46:24 tom Exp $
-.TH @TSET@ 1 ""
+.\" $Id: tset.1,v 1.64 2023/06/10 15:46:24 tom Exp $
+.TH @TSET@ 1 2023-06-10 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/user_caps.5 b/man/user_caps.5
index b43e218f3..0dc8b2d3a 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.22 2022/07/03 20:01:04 tom Exp $
-.TH user_caps 5
+.\" $Id: user_caps.5,v 1.24 2023/06/17 17:52:54 tom Exp $
+.TH user_caps 5 2023-06-17 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft CR			\" Courier
 ..
 .de NE
 .fi
diff --git a/man/wresize.3x b/man/wresize.3x
index 1500913b2..f5182e8dc 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.20 2022/02/12 20:07:29 tom Exp $
-.TH wresize 3X ""
+.\" $Id: wresize.3x,v 1.21 2022/02/12 20:07:29 tom Exp $
+.TH wresize 3X 2022-02-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBwresize\fP \- resize a curses window
 .SH SYNOPSIS
diff --git a/ncurses/tinfo/lib_win32util.c b/ncurses/tinfo/lib_win32util.c
index b37c19d78..c67c8ceb9 100644
--- a/ncurses/tinfo/lib_win32util.c
+++ b/ncurses/tinfo/lib_win32util.c
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32util.c,v 1.3 2023/02/25 20:07:48 tom Exp $")
+MODULE_ID("$Id: lib_win32util.c,v 1.4 2023/06/17 17:19:06 tom Exp $")
 
 #ifdef _NC_WINDOWS
 #include <io.h>
@@ -54,7 +54,7 @@ MODULE_ID("$Id: lib_win32util.c,v 1.3 2023/02/25 20:07:48 tom Exp $")
      Pipe and can query the server side of the pipe, looking whether
      or not this is mintty.
      For now we terminate the program if we discover that situation.
-     Althogh in theory it would be possible, to remotely manipulate
+     Although in theory it would be possible, to remotely manipulate
      the terminal state of mintty, this is out of scope for now and
      not worth the significant effort.
  */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fc6b76783..91a849566 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230615) unstable; urgency=low
+ncurses6 (6.4+20230617) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fc6b76783..91a849566 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230615) unstable; urgency=low
+ncurses6 (6.4+20230617) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 6a67c0c4c..95e7bef95 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230615) unstable; urgency=low
+ncurses6 (6.4+20230617) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jun 2023 07:23:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 08074018b..27eeed778 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.589 2023/06/15 11:23:36 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.590 2023/06/17 09:47:23 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0615"
+!define VERSION_MMDD  "0617"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 8872a0454..6f006b0da 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230615
+Release: 20230617
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index df3eb9f35..b3ee64427 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230615
+Release: 20230617
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9360fcfdf..11d3e1d17 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230615
+Release: 20230617
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/bs.6 b/test/bs.6
index 3bb1f10bc..12295a319 100644
--- a/test/bs.6
+++ b/test/bs.6
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: bs.6,v 1.4 2021/06/17 21:20:30 tom Exp $
-.TH BATTLESHIPS 6 "Aug 23, 1989"
+.\" $Id: bs.6,v 1.5 2021/06/17 21:20:30 tom Exp $
+.TH BATTLESHIPS 6 2021-06-17 ncurses-examples Games
 .SH NAME
 bs \- battleships game
 .SH SYNOPSIS
diff --git a/test/gdc.6 b/test/gdc.6
index 383aae57e..bf90b26f8 100644
--- a/test/gdc.6
+++ b/test/gdc.6
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: gdc.6,v 1.5 2020/02/02 23:34:34 tom Exp $
-.TH GDC 6
+.\" $Id: gdc.6,v 1.6 2020/02/02 23:34:34 tom Exp $
+.TH GDC 6 2020-02-02 ncurses-examples Games
 .SH NAME
 gdc \- grand digital clock (curses)
 .SH SYNOPSIS

From ff241b2aa617d26ef2358a11e6d783aceb5a19b5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 25 Jun 2023 02:38:02 +0200
Subject: [PATCH 016/106] ncurses-6.4-20230624.patch

---
 NEWS                             |  5 +-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 ncurses/base/key_defined.c       |  7 ++-
 ncurses/base/tries.c             |  7 ++-
 ncurses/curses.priv.h            | 37 +++++++++----
 ncurses/tinfo/access.c           |  6 +-
 ncurses/tinfo/add_tries.c        |  7 ++-
 ncurses/tinfo/comp_hash.c        | 18 +++---
 ncurses/tinfo/db_iterator.c      | 11 ++--
 ncurses/tinfo/lib_setup.c        |  9 ++-
 ncurses/tinfo/lib_tparm.c        | 31 +++++++----
 ncurses/tinfo/obsolete.c         | 95 +++++++++++++++++++++++++++++++-
 ncurses/tinfo/read_entry.c       |  5 +-
 ncurses/tinfo/read_termcap.c     | 16 +++---
 ncurses/trace/lib_tracedmp.c     |  8 +--
 ncurses/trace/trace_buf.c        | 10 +++-
 ncurses/trace/varargs.c          | 12 ++--
 ncurses/tty/hardscroll.c         | 12 +++-
 ncurses/tty/lib_mvcur.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 +-
 package/ncursest.spec            |  2 +-
 test/demo_defkey.c               |  8 +--
 test/list_keys.c                 | 16 +++++-
 test/sp_tinfo.c                  | 12 ++--
 test/test_setupterm.c            | 13 ++++-
 31 files changed, 268 insertions(+), 113 deletions(-)

diff --git a/NEWS b/NEWS
index b8147e206..dd032a577 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3967 2023/06/17 17:17:42 tom Exp $
+-- $Id: NEWS,v 1.3969 2023/06/24 22:59:35 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230624
+	+ fixes for out-of-memory condition (report by "eaglegai").
+
 20230617
 	+ markup manpages with revision information (prompted by discussion
 	  with Bjarni Ingi Gislason).
diff --git a/VERSION b/VERSION
index efbf785fb..871658747 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230617
+5:0:10	6.4	20230624
diff --git a/dist.mk b/dist.mk
index fb55f3aef..999e34684 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1550 2023/06/17 09:47:23 tom Exp $
+# $Id: dist.mk,v 1.1551 2023/06/24 10:06:22 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230617
+NCURSES_PATCH = 20230624
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/key_defined.c b/ncurses/base/key_defined.c
index 25d5a674e..147e5fe2d 100644
--- a/ncurses/base/key_defined.c
+++ b/ncurses/base/key_defined.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2003-2006,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,8 +32,9 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
+#include <tic.h>
 
-MODULE_ID("$Id: key_defined.c,v 1.10 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: key_defined.c,v 1.11 2023/06/24 15:36:32 tom Exp $")
 
 static int
 find_definition(TRIES * tree, const char *str)
@@ -41,7 +42,7 @@ find_definition(TRIES * tree, const char *str)
     TRIES *ptr;
     int result = OK;
 
-    if (str != 0 && *str != '\0') {
+    if (VALID_STRING(str) && *str != '\0') {
 	for (ptr = tree; ptr != 0; ptr = ptr->sibling) {
 	    if (UChar(*str) == UChar(ptr->ch)) {
 		if (str[1] == '\0' && ptr->child != 0) {
diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index 0f309c213..0f8c0516e 100644
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,8 +39,9 @@
 */
 
 #include <curses.priv.h>
+#include <tic.h>
 
-MODULE_ID("$Id: tries.c,v 1.31 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.32 2023/06/24 15:36:23 tom Exp $")
 
 /*
  * Expand a keycode into the string that it corresponds to, returning null if
@@ -124,7 +125,7 @@ _nc_remove_string(TRIES ** tree, const char *string)
 {
     T((T_CALLED("_nc_remove_string(%p,%s)"), (void *) tree, _nc_visbuf(string)));
 
-    if (string == 0 || *string == 0)
+    if (!VALID_STRING(string) || *string == 0)
 	returnCode(FALSE);
 
     while (*tree != 0) {
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index e7146ef7f..3fd8e0d26 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.669 2023/06/06 22:31:04 tom Exp $
+ * $Id: curses.priv.h,v 1.670 2023/06/24 13:00:26 tom Exp $
  *
  *	curses.priv.h
  *
@@ -574,10 +574,10 @@ extern NCURSES_EXPORT(void)     _nc_set_no_padding(SCREEN *);
 #define SET_SCREEN_PAIR(s,p)	SetPair(SCREEN_ATTRS(s), p)
 
 #if USE_REENTRANT || NCURSES_SP_FUNCS
-NCURSES_EXPORT(int *)        _nc_ptr_Lines (SCREEN *);
-NCURSES_EXPORT(int *)        _nc_ptr_Cols (SCREEN *);
-NCURSES_EXPORT(int *)        _nc_ptr_Tabsize (SCREEN *);
-NCURSES_EXPORT(int *)        _nc_ptr_Escdelay (SCREEN *);
+extern NCURSES_EXPORT(int *)    _nc_ptr_Lines (SCREEN *);
+extern NCURSES_EXPORT(int *)    _nc_ptr_Cols (SCREEN *);
+extern NCURSES_EXPORT(int *)    _nc_ptr_Tabsize (SCREEN *);
+extern NCURSES_EXPORT(int *)    _nc_ptr_Escdelay (SCREEN *);
 #endif
 
 #if USE_REENTRANT
@@ -1540,6 +1540,9 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 
 #define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
 
+#include <nc_alloc.h>
+#include <nc_access.h>
+
 #define FreeIfNeeded(p)  if ((p) != 0) free(p)
 
 /* FreeAndNull() is not a comma-separated expression because some compilers
@@ -1547,8 +1550,18 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
  */
 #define FreeAndNull(p)   do { free(p); p = 0; } while (0)
 
-#include <nc_alloc.h>
-#include <nc_access.h>
+#ifdef EXP_OOM_TESTING
+extern NCURSES_EXPORT(void *)	_nc_oom_malloc(size_t size);
+extern NCURSES_EXPORT(void *)	_nc_oom_calloc(size_t nmemb, size_t size);
+extern NCURSES_EXPORT(void *)	_nc_oom_realloc(void *ptr, size_t size);
+extern NCURSES_EXPORT(void)	_nc_oom_free(void *ptr);
+extern NCURSES_EXPORT(char *)	_nc_oom_strdup(const char *ptr);
+#define malloc(size)		_nc_oom_malloc(size)
+#define calloc(nmemb, size)	_nc_oom_calloc(nmemb, size)
+#define realloc(ptr, size)	_nc_oom_realloc(ptr, size)
+#define free(ptr)		_nc_oom_free(ptr)
+#define strdup(ptr)		_nc_oom_strdup(ptr)
+#endif
 
 /*
  * Use these for tic/infocmp malloc failures.  Generally the ncurses library
@@ -1968,7 +1981,7 @@ extern NCURSES_EXPORT(int)  _nc_msec_cost (const char *const, int);
 
 /* lib_addch.c */
 #if USE_WIDEC_SUPPORT
-NCURSES_EXPORT(int) _nc_build_wch(WINDOW *win, ARG_CH_T ch);
+extern NCURSES_EXPORT(int) _nc_build_wch(WINDOW *win, ARG_CH_T ch);
 #endif
 
 /* lib_addstr.c */
@@ -2147,7 +2160,7 @@ extern NCURSES_EXPORT(const TERMTYPE2 *) _nc_fallback2 (const char *);
 #define _nc_fallback2(tp) _nc_fallback(tp)
 #endif
 
-NCURSES_EXPORT(void) _nc_copy_termtype(TERMTYPE *, const TERMTYPE *);
+extern NCURSES_EXPORT(void) _nc_copy_termtype(TERMTYPE *, const TERMTYPE *);
 
 #if NCURSES_EXT_NUMBERS
 extern NCURSES_EXPORT(void) _nc_copy_termtype2 (TERMTYPE2 *, const TERMTYPE2 *);
@@ -2229,7 +2242,7 @@ extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
 
 #if defined(_NC_WINDOWS) || defined(_NC_MINGW)
 /* see wcwidth.c */
-NCURSES_EXPORT(int) mk_wcwidth(wchar_t);
+extern NCURSES_EXPORT(int) mk_wcwidth(wchar_t);
 #define wcwidth(ucs) _nc_wcwidth(ucs)
 #endif
 
@@ -2621,8 +2634,8 @@ extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype);
 #endif
 
 #ifdef EXP_XTERM_1005
-NCURSES_EXPORT(int) _nc_conv_to_utf8(unsigned char *, unsigned, unsigned);
-NCURSES_EXPORT(int) _nc_conv_to_utf32(unsigned *, const char *, unsigned);
+extern NCURSES_EXPORT(int) _nc_conv_to_utf8(unsigned char *, unsigned, unsigned);
+extern NCURSES_EXPORT(int) _nc_conv_to_utf32(unsigned *, const char *, unsigned);
 #endif
 
 #ifdef __cplusplus
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 6c415acaa..50a5769c3 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.36 2023/04/22 21:19:56 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.37 2023/06/24 21:55:09 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -70,8 +70,8 @@ _nc_rootname(char *path)
     static char *temp;
     char *s;
 
-    temp = strdup(result);
-    result = temp;
+    if ((temp = strdup(result)) != 0)
+	result = temp;
 #if !MIXEDCASE_FILENAMES
     for (s = result; *s != '\0'; ++s) {
 	*s = (char) LOWERCASE(*s);
diff --git a/ncurses/tinfo/add_tries.c b/ncurses/tinfo/add_tries.c
index d41f48830..9d215575f 100644
--- a/ncurses/tinfo/add_tries.c
+++ b/ncurses/tinfo/add_tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,8 +39,9 @@
 */
 
 #include <curses.priv.h>
+#include <tic.h>
 
-MODULE_ID("$Id: add_tries.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: add_tries.c,v 1.13 2023/06/24 15:36:13 tom Exp $")
 
 #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
 #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
@@ -53,7 +54,7 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
 
     T((T_CALLED("_nc_add_to_try(%p, %s, %u)"),
        (void *) *tree, _nc_visbuf(str), code));
-    if (txt == 0 || *txt == '\0' || code == 0)
+    if (!VALID_STRING(str) || *txt == '\0' || code == 0)
 	returnCode(ERR);
 
     if ((*tree) != 0) {
diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
index eff60f127..4b081afa2 100644
--- a/ncurses/tinfo/comp_hash.c
+++ b/ncurses/tinfo/comp_hash.c
@@ -45,7 +45,7 @@
 #include <tic.h>
 #include <hashsize.h>
 
-MODULE_ID("$Id: comp_hash.c,v 1.54 2023/04/22 15:12:57 tom Exp $")
+MODULE_ID("$Id: comp_hash.c,v 1.55 2023/06/24 13:29:43 tom Exp $")
 
 /*
  * Finds the entry for the given string in the hash table if present.
@@ -103,14 +103,16 @@ _nc_find_type_entry(const char *string,
 	&& data->table_data[hashvalue] >= 0) {
 	const struct name_table_entry *const table = _nc_get_table(termcap);
 
-	ptr = table + data->table_data[hashvalue];
-	while (ptr->nte_type != type
-	       || !data->compare_names(ptr->nte_name, string)) {
-	    if (ptr->nte_link < 0) {
-		ptr = 0;
-		break;
+	if (table != NULL) {
+	    ptr = table + data->table_data[hashvalue];
+	    while (ptr->nte_type != type
+		   || !data->compare_names(ptr->nte_name, string)) {
+		if (ptr->nte_link < 0) {
+		    ptr = 0;
+		    break;
+		}
+		ptr = table + (ptr->nte_link + data->table_data[data->table_size]);
 	    }
-	    ptr = table + (ptr->nte_link + data->table_data[data->table_size]);
 	}
     }
 
diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index e69e0f34e..db3872e3f 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.49 2022/04/23 20:03:15 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.50 2023/06/24 21:52:32 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -383,8 +383,11 @@ _nc_first_db(DBDIRS * state, int *offset)
 		 */
 		for (j = 0; my_list[j] != 0; ++j) {
 #ifdef TERMINFO
-		    if (*my_list[j] == '\0')
-			my_list[j] = strdup(TERMINFO);
+		    if (*my_list[j] == '\0') {
+			char *my_copy = strdup(TERMINFO);
+			if (my_copy != 0)
+			    my_list[j] = my_copy;
+		    }
 #endif
 		    trim_formatting(my_list[j]);
 		    for (k = 0; k < j; ++k) {
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index db93a368f..cdc6726c6 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.218 2022/08/13 18:12:22 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.219 2023/06/24 13:25:14 tom Exp $")
 
 /****************************************************************************
  *
@@ -679,10 +679,9 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #endif
     }
     myname = strdup(tname);
-
-    if (strlen(myname) > MAX_NAME_SIZE) {
+    if (myname == NULL || strlen(myname) > MAX_NAME_SIZE) {
 	ret_error(TGETENT_ERR,
-		  "TERM environment must be <= %d characters.\n",
+		  "TERM environment must be 1..%d characters.\n",
 		  MAX_NAME_SIZE,
 		  free(myname));
     }
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 93af83504..0d6d7b3c2 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.146 2023/04/23 20:57:33 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.150 2023/06/24 16:12:52 tom Exp $")
 
 /*
  *	char *
@@ -177,19 +177,21 @@ _nc_free_tparm(TERMINAL *termp)
 #if HAVE_TSEARCH
     if (MyCount != 0) {
 	delete_tparm = typeCalloc(TPARM_DATA *, MyCount);
-	which_tparm = 0;
-	twalk(MyCache, visit_nodes);
-	for (which_tparm = 0; which_tparm < MyCount; ++which_tparm) {
-	    TPARM_DATA *ptr = delete_tparm[which_tparm];
-	    if (ptr != NULL) {
-		tdelete(ptr, &MyCache, cmp_format);
-		free((char *) ptr->format);
-		free(ptr);
+	if (delete_tparm != NULL) {
+	    which_tparm = 0;
+	    twalk(MyCache, visit_nodes);
+	    for (which_tparm = 0; which_tparm < MyCount; ++which_tparm) {
+		TPARM_DATA *ptr = delete_tparm[which_tparm];
+		if (ptr != NULL) {
+		    tdelete(ptr, &MyCache, cmp_format);
+		    free((char *) ptr->format);
+		    free(ptr);
+		}
 	    }
+	    which_tparm = 0;
+	    twalk(MyCache, visit_nodes);
+	    FreeAndNull(delete_tparm);
 	}
-	which_tparm = 0;
-	twalk(MyCache, visit_nodes);
-	FreeAndNull(delete_tparm);
 	MyCount = 0;
 	which_tparm = 0;
     }
@@ -796,6 +798,11 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data)
 
     tparm_trace_call(tps, string, data);
 
+    if (TPS(fmt_buff) == NULL) {
+	T((T_RETURN("<null>")));
+	return NULL;
+    }
+
     while ((cp - string) < (int) len2) {
 	if (*cp != '%') {
 	    save_char(tps, UChar(*cp));
diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c
index 972a9a180..e63f8a868 100644
--- a/ncurses/tinfo/obsolete.c
+++ b/ncurses/tinfo/obsolete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2013-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: obsolete.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: obsolete.c,v 1.9 2023/06/24 22:02:25 tom Exp $")
 
 /*
  * Obsolete entrypoint retained for binary compatibility.
@@ -238,3 +238,94 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit)
 #undef CH
 }
 #endif /* EXP_XTERM_1005 */
+
+#ifdef EXP_OOM_TESTING
+/*
+ * Out-of-memory testing, suitable for checking if initialization (and limited
+ * running) recovers from errors due to insufficient memory.  In practice, this
+ * is unlikely except with artifically constructed tests (or poorly behaved
+ * applications).
+ */
+#undef malloc
+#undef calloc
+#undef realloc
+#undef free
+#undef strdup
+
+static long oom_limit = -1;
+static long oom_count = 0;
+
+static bool
+oom_check(void)
+{
+    static bool initialized = FALSE;
+    static bool triggered = FALSE;
+    bool result = FALSE;
+
+    if (!initialized) {
+	char *env = getenv("NCURSES_OOM_TESTING");
+	initialized = TRUE;
+	if (env != NULL) {
+	    char *check;
+	    oom_limit = strtol(env, &check, 0);
+	    if (check != NULL && *check != '\0')
+		oom_limit = 0;
+	}
+    }
+    if (oom_limit >= 0) {
+	result = (++oom_count > oom_limit);
+	if (result && !triggered) {
+	    triggered = TRUE;
+	    T(("out-of-memory"));
+	}
+    }
+    return result;
+}
+
+NCURSES_EXPORT(void *)
+_nc_oom_malloc(size_t size)
+{
+    char *result = (oom_check()
+		    ? NULL
+		    : malloc(size));
+    T(("oom #%ld malloc(%ld) %p", oom_count, size, result));
+    return result;
+}
+
+NCURSES_EXPORT(void *)
+_nc_oom_calloc(size_t nmemb, size_t size)
+{
+    char *result = (oom_check()
+		    ? NULL
+		    : calloc(nmemb, size));
+    T(("oom #%ld calloc(%ld, %ld) %p", oom_count, nmemb, size, result));
+    return result;
+}
+
+NCURSES_EXPORT(void *)
+_nc_oom_realloc(void *ptr, size_t size)
+{
+    char *result = (oom_check()
+		    ? NULL
+		    : realloc(ptr, size));
+    T(("oom #%ld realloc(%p, %ld) %p", oom_count, ptr, size, result));
+    return result;
+}
+
+NCURSES_EXPORT(void)
+_nc_oom_free(void *ptr)
+{
+    T(("oom #%ld free(%p)", oom_count, ptr));
+    free(ptr);
+}
+
+NCURSES_EXPORT(char *)
+_nc_oom_strdup(const char *ptr)
+{
+    char *result = (oom_check()
+		    ? NULL
+		    : strdup(ptr));
+    T(("oom #%ld strdup(%p) %p", oom_count, ptr, result));
+    return result;
+}
+#endif /* EXP_OOM_TESTING */
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 762c6c68c..3591a5080 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.169 2023/06/15 20:51:06 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.170 2023/06/24 18:09:05 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -803,6 +803,9 @@ _nc_read_tic_entry(char *filename,
 	int reccnt = 0;
 	char *save = strdup(name);
 
+	if (save == 0)
+	    returnDB(code);
+
 	memset(&key, 0, sizeof(key));
 	key.data = save;
 	key.size = strlen(save);
diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index 9ff2b2bac..1a294848b 100644
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.103 2023/04/28 20:59:14 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.104 2023/06/24 21:53:16 tom Exp $")
 
 #if !PURE_TERMINFO
 
@@ -1055,15 +1055,15 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
     if (normal) {		/* normal case */
 	char envhome[PATH_MAX], *h;
 
-	copied = strdup(get_termpath());
-	for (cp = copied; *cp; cp++) {
-	    if (*cp == NCURSES_PATHSEP)
-		*cp = '\0';
-	    else if (cp == copied || cp[-1] == '\0') {
-		ADD_TC(cp, filecount);
+	if ((copied = strdup(get_termpath())) != 0) {
+	    for (cp = copied; *cp; cp++) {
+		if (*cp == NCURSES_PATHSEP)
+		    *cp = '\0';
+		else if (cp == copied || cp[-1] == '\0') {
+		    ADD_TC(cp, filecount);
+		}
 	    }
 	}
-
 #define PRIVATE_CAP "%.*s/.termcap"
 
 	if (use_terminfo_vars() && (h = getenv("HOME")) != NULL && *h != '\0'
diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index 3b7ea0749..529148bb7 100644
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracedmp.c,v 1.36 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.37 2023/06/24 15:49:45 tom Exp $")
 
 #ifdef TRACE
 
@@ -71,9 +71,9 @@ _tracedump(const char *name, WINDOW *win)
     if (++width + 1 > (int) my_length) {
 	my_length = (unsigned) (2 * (width + 1));
 	my_buffer = typeRealloc(char, my_length, my_buffer);
-	if (my_buffer == 0)
-	    return;
     }
+    if (my_buffer == 0)
+	return;
 
     for (n = 0; n <= win->_maxy; ++n) {
 	char *ep = my_buffer;
diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c
index 7e6384b54..91b12e45c 100644
--- a/ncurses/trace/trace_buf.c
+++ b/ncurses/trace/trace_buf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_buf.c,v 1.21 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: trace_buf.c,v 1.22 2023/06/24 13:37:25 tom Exp $")
 
 #ifdef TRACE
 
@@ -104,7 +104,11 @@ _nc_trace_buf(int bufnum, size_t want)
 NCURSES_EXPORT(char *)
 _nc_trace_bufcat(int bufnum, const char *value)
 {
-    char *buffer = _nc_trace_alloc(bufnum, (size_t) 0);
+    char *buffer;
+
+    if (value == NULL)
+	value = "";
+    buffer = _nc_trace_alloc(bufnum, (size_t) 0);
     if (buffer != 0) {
 	size_t have = strlen(buffer);
 	size_t need = strlen(value) + have;
diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c
index 9be5fc254..7b9533bd6 100644
--- a/ncurses/trace/varargs.c
+++ b/ncurses/trace/varargs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 2001-2008,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: varargs.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: varargs.c,v 1.13 2023/06/24 13:41:46 tom Exp $")
 
 #ifdef TRACE
 
@@ -59,18 +59,16 @@ typedef enum {
 NCURSES_EXPORT(char *)
 _nc_varargs(const char *fmt, va_list ap)
 {
-    static char dummy[] = "";
-
     char buffer[BUFSIZ];
     const char *param;
     int n;
 
     if (fmt == 0 || *fmt == '\0')
-	return dummy;
+	return NULL;
     if (MyLength == 0)
 	MyBuffer = typeMalloc(char, MyLength = BUFSIZ);
     if (MyBuffer == 0)
-	return dummy;
+	return NULL;
     *MyBuffer = '\0';
 
     while (*fmt != '\0') {
@@ -185,7 +183,7 @@ _nc_varargs(const char *fmt, va_list ap)
 	}
     }
 
-    return (MyBuffer ? MyBuffer : dummy);
+    return (MyBuffer ? MyBuffer : NULL);
 }
 #else
 EMPTY_MODULE(_nc_varargs)
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index abb21cfdd..d66aa9946 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.54 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.56 2023/06/24 22:55:24 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -204,13 +204,19 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
 	int *new_oldnums = typeRealloc(int,
 				       (size_t) need_lines,
 				       oldnums(SP_PARM));
-	if (!new_oldnums)
+	if (!new_oldnums) {
+	    TR(TRACE_ICALLS, (T_RETURN("")));
 	    return;
+	}
 	oldnums(SP_PARM) = new_oldnums;
 	OLDNUM_SIZE(SP_PARM) = need_lines;
     }
     /* calculate the indices */
     NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_ARG);
+    if (SP_PARM->hashtab_len < screen_lines(SP_PARM)) {
+	TR(TRACE_ICALLS, (T_RETURN("")));
+	return;
+    }
 #endif
 #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
 
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index ba3ee089a..aa3a67c51 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.157 2022/08/20 18:28:58 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.158 2023/06/24 17:34:43 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -675,7 +675,7 @@ relative_move(NCURSES_SP_DCLx
 		 * and the time the structure WANT_CHAR would access has been
 		 * updated.
 		 */
-		if (ovw) {
+		if (ovw && to_y >= 0) {
 		    int i;
 
 		    for (i = 0; i < n; i++) {
@@ -690,7 +690,7 @@ relative_move(NCURSES_SP_DCLx
 			}
 		    }
 		}
-		if (ovw) {
+		if (ovw && to_y >= 0) {
 		    int i;
 
 		    for (i = 0; i < n; i++)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 91a849566..4356b0ebd 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230617) unstable; urgency=low
+ncurses6 (6.4+20230624) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 91a849566..4356b0ebd 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230617) unstable; urgency=low
+ncurses6 (6.4+20230624) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 95e7bef95..8783d4d06 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230617) unstable; urgency=low
+ncurses6 (6.4+20230624) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Jun 2023 05:47:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 27eeed778..7abb61605 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.590 2023/06/17 09:47:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.591 2023/06/24 10:06:22 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0617"
+!define VERSION_MMDD  "0624"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6f006b0da..822402920 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230617
+Release: 20230624
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b3ee64427..8b541eea7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230617
+Release: 20230624
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 11d3e1d17..dc459b777 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230617
+Release: 20230624
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index 44d60dc93..bb8126389 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.33 2022/12/10 23:31:31 tom Exp $
+ * $Id: demo_defkey.c,v 1.34 2023/06/24 15:37:17 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -100,7 +100,7 @@ visible(const char *string)
 {
     char *result = 0;
 
-    if (string != 0 && *string != '\0') {
+    if (VALID_STRING(string) && *string != '\0') {
 	int pass;
 	int n;
 	size_t need = 1;
@@ -185,7 +185,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code)
 {
     char *value = tigetstr(name);
 
-    if (value != 0) {
+    if (VALID_STRING(value)) {
 	const char *prefix = 0;
 
 	if (!(strncmp) (value, "\033[", (size_t) 2)) {
diff --git a/test/list_keys.c b/test/list_keys.c
index ee54b8569..96b02e14f 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.31 2022/12/10 23:23:27 tom Exp $
+ * $Id: list_keys.c,v 1.32 2023/06/24 13:57:11 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -71,6 +71,13 @@ typedef struct {
 #define Type(n) list[n].type
 #define Name(n) list[n].name
 
+static void
+failed(const char *msg)
+{
+    perror(msg);
+    ExitProgram(EXIT_FAILURE);
+}
+
 static const char *
 full_name(const char *name)
 {
@@ -338,8 +345,11 @@ list_keys(TERMINAL **terms, int count)
 	widths1 = (int) strlen(modifier);
 
     for (k = 0; k < count; ++k) {
+	char *value;
 	set_curterm(terms[k]);
-	check = (int) strlen(termname());
+	if ((value = termname()) == NULL)
+	    failed("termname");
+	check = (int) strlen(value);
 	if (widths2 < check)
 	    widths2 = check;
     }
diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c
index d003dfa32..72b20cfb0 100644
--- a/test/sp_tinfo.c
+++ b/test/sp_tinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 /*
- * $Id: sp_tinfo.c,v 1.28 2022/12/10 23:23:27 tom Exp $
+ * $Id: sp_tinfo.c,v 1.29 2023/06/24 14:14:56 tom Exp $
  *
  * TOTO: add option for non-sp-funcs interface
  */
@@ -339,8 +339,12 @@ main(int argc, char *argv[])
     do_stuff(my_out);
     do_stuff(my_err);
 
-    cleanup(my_out);
-    cleanup(my_err);
+    if (my_out != my_err) {
+	cleanup(my_out);
+	cleanup(my_err);
+    } else {
+	cleanup(my_out);
+    }
 
     ExitProgram(EXIT_SUCCESS);
 }
diff --git a/test/test_setupterm.c b/test/test_setupterm.c
index 4e53c2e7c..24d7c46c7 100644
--- a/test/test_setupterm.c
+++ b/test/test_setupterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  * Copyright 2015,2016 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_setupterm.c,v 1.16 2022/12/10 23:23:27 tom Exp $
+ * $Id: test_setupterm.c,v 1.17 2023/06/24 14:19:52 tom Exp $
  *
  * A simple demo of setupterm/restartterm.
  */
@@ -48,6 +48,13 @@ static TERMINAL **saved_terminals;
 static size_t num_saved;
 static size_t max_saved;
 
+static void
+failed(const char *msg)
+{
+    perror(msg);
+    ExitProgram(EXIT_FAILURE);
+}
+
 static void
 finish(int code)
 {
@@ -73,6 +80,8 @@ save_curterm(void)
 	if (num_saved + 1 >= max_saved) {
 	    max_saved += 100;
 	    saved_terminals = typeRealloc(TERMINAL *, max_saved, saved_terminals);
+	    if (saved_terminals == NULL)
+		failed("realloc");
 	}
 	saved_terminals[num_saved++] = cur_term;
     }

From eb929d5ce0ece779f26e9ac82bf86f91a362da65 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 26 Jun 2023 01:46:35 +0200
Subject: [PATCH 017/106] ncurses-6.4-20230625.patch

---
 NEWS                             |  6 +++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 man/make_sed.sh                  |  8 +++----
 ncurses/tinfo/obsolete.c         | 20 ++++++++++-------
 ncurses/tty/hardscroll.c         | 37 +++++++++++++++++++-------------
 ncurses/tty/hashmap.c            |  9 +++++---
 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 +-
 14 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/NEWS b/NEWS
index dd032a577..1e3e9f5de 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3969 2023/06/24 22:59:35 tom Exp $
+-- $Id: NEWS,v 1.3971 2023/06/25 18:16:49 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230625
+	+ adjust man/make_sed.sh to work with dates as the third field of TH.
+	+ fixes for out-of-memory condition (report by "eaglegai").
+
 20230624
 	+ fixes for out-of-memory condition (report by "eaglegai").
 
diff --git a/VERSION b/VERSION
index 871658747..9a883773d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230624
+5:0:10	6.4	20230625
diff --git a/dist.mk b/dist.mk
index 999e34684..184921517 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1551 2023/06/24 10:06:22 tom Exp $
+# $Id: dist.mk,v 1.1552 2023/06/25 09:41:21 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230624
+NCURSES_PATCH = 20230625
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/man/make_sed.sh b/man/make_sed.sh
index 2a290f0b1..2b9ea9f5b 100755
--- a/man/make_sed.sh
+++ b/man/make_sed.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: make_sed.sh,v 1.16 2022/10/01 13:14:07 tom Exp $
+# $Id: make_sed.sh,v 1.17 2023/06/25 18:13:17 tom Exp $
 ##############################################################################
-# Copyright 2020-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2020-2022,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -69,9 +69,9 @@ sed	-e 's/^/s\/\\</' \
 echo "# Do the TH lines"
 sed	-e 's/\//\/TH /' \
 	-e 's/	/ /' \
-	-e 's/	/ ""\/TH /' \
+	-e 's/	/ \/TH /' \
 	-e 's/	/ /' \
-	-e 's/\/$/ ""\//' \
+	-e 's/\/$/ \//' \
 	$UPPER
 
 echo "# Do the embedded references"
diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c
index e63f8a868..869496c28 100644
--- a/ncurses/tinfo/obsolete.c
+++ b/ncurses/tinfo/obsolete.c
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: obsolete.c,v 1.9 2023/06/24 22:02:25 tom Exp $")
+MODULE_ID("$Id: obsolete.c,v 1.10 2023/06/25 16:56:27 tom Exp $")
 
 /*
  * Obsolete entrypoint retained for binary compatibility.
@@ -252,6 +252,8 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit)
 #undef free
 #undef strdup
 
+#define TR_OOM(stmt) T(stmt)
+
 static long oom_limit = -1;
 static long oom_count = 0;
 
@@ -272,11 +274,12 @@ oom_check(void)
 		oom_limit = 0;
 	}
     }
+    ++oom_count;
     if (oom_limit >= 0) {
-	result = (++oom_count > oom_limit);
+	result = (oom_count > oom_limit);
 	if (result && !triggered) {
 	    triggered = TRUE;
-	    T(("out-of-memory"));
+	    TR_OOM(("out-of-memory"));
 	}
     }
     return result;
@@ -288,7 +291,7 @@ _nc_oom_malloc(size_t size)
     char *result = (oom_check()
 		    ? NULL
 		    : malloc(size));
-    T(("oom #%ld malloc(%ld) %p", oom_count, size, result));
+    TR_OOM(("oom #%ld malloc(%ld) %p", oom_count, size, result));
     return result;
 }
 
@@ -298,7 +301,7 @@ _nc_oom_calloc(size_t nmemb, size_t size)
     char *result = (oom_check()
 		    ? NULL
 		    : calloc(nmemb, size));
-    T(("oom #%ld calloc(%ld, %ld) %p", oom_count, nmemb, size, result));
+    TR_OOM(("oom #%ld calloc(%ld, %ld) %p", oom_count, nmemb, size, result));
     return result;
 }
 
@@ -308,14 +311,15 @@ _nc_oom_realloc(void *ptr, size_t size)
     char *result = (oom_check()
 		    ? NULL
 		    : realloc(ptr, size));
-    T(("oom #%ld realloc(%p, %ld) %p", oom_count, ptr, size, result));
+    TR_OOM(("oom #%ld realloc(%p, %ld) %p", oom_count, ptr, size, result));
     return result;
 }
 
 NCURSES_EXPORT(void)
 _nc_oom_free(void *ptr)
 {
-    T(("oom #%ld free(%p)", oom_count, ptr));
+    ++oom_count;
+    TR_OOM(("oom #%ld free(%p)", oom_count, ptr));
     free(ptr);
 }
 
@@ -325,7 +329,7 @@ _nc_oom_strdup(const char *ptr)
     char *result = (oom_check()
 		    ? NULL
 		    : strdup(ptr));
-    T(("oom #%ld strdup(%p) %p", oom_count, ptr, result));
+    TR_OOM(("oom #%ld strdup(%p) %p", oom_count, ptr, result));
     return result;
 }
 #endif /* EXP_OOM_TESTING */
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index d66aa9946..0c194b463 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.56 2023/06/24 22:55:24 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.57 2023/06/25 15:39:32 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -307,20 +307,27 @@ NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0)
 /* dump the state of the real and virtual oldnum fields */
 {
-    char *buf = 0;
-    size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4;
-    (void) SP_PARM;
-
-    if ((buf = typeMalloc(char, want)) != 0) {
-	int n;
-
-	*buf = '\0';
-	for (n = 0; n < screen_lines(SP_PARM); n++)
-	    _nc_SPRINTF(buf + strlen(buf),
-			_nc_SLIMIT(want - strlen(buf))
-			" %02d", OLDNUM(SP_PARM, n));
-	TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf));
-	free(buf);
+    if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
+	char *buf = 0;
+	size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4;
+	(void) SP_PARM;
+
+	if ((buf = typeMalloc(char, want)) != 0) {
+	    int n;
+
+	    *buf = '\0';
+	    for (n = 0; n < screen_lines(SP_PARM); n++) {
+		int number = OLDNUM(SP_PARM, n);
+		if (number >= -99 && number < 999) {
+		    _nc_SPRINTF(buf + strlen(buf),
+				_nc_SLIMIT(want - strlen(buf))
+				" %02d", number);
+		} else {
+		    strcat(buf, " ??");
+		}
+	    }
+	    free(buf);
+	}
     }
 }
 
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 3f124c96c..2ddfaaa29 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2023 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -74,7 +74,7 @@ AUTHOR
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: hashmap.c,v 1.69 2020/05/31 17:50:48 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.70 2023/06/25 17:16:01 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -318,8 +318,11 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
 	if (newhash(SP_PARM) == 0)
 	    newhash(SP_PARM) = typeCalloc(unsigned long,
 					    (size_t) screen_lines(SP_PARM));
-	if (!oldhash(SP_PARM) || !newhash(SP_PARM))
+	if (!oldhash(SP_PARM) || !newhash(SP_PARM)) {
+	    FreeAndNull(oldhash(SP_PARM));
+	    FreeAndNull(newhash(SP_PARM));
 	    return;		/* malloc failure */
+	}
 	for (i = 0; i < screen_lines(SP_PARM); i++) {
 	    newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i));
 	    oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i));
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4356b0ebd..0b91e886f 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230624) unstable; urgency=low
+ncurses6 (6.4+20230625) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4356b0ebd..0b91e886f 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230624) unstable; urgency=low
+ncurses6 (6.4+20230625) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 8783d4d06..f563a3281 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230624) unstable; urgency=low
+ncurses6 (6.4+20230625) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Jun 2023 06:06:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7abb61605..fdadc5a7b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.591 2023/06/24 10:06:22 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.592 2023/06/25 09:41:21 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0624"
+!define VERSION_MMDD  "0625"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 822402920..e6f9b8b44 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230624
+Release: 20230625
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8b541eea7..6ebb0e662 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230624
+Release: 20230625
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index dc459b777..a6e6db089 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230624
+Release: 20230625
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 11b71ffa4587bdff781c100445f732f63a82a8c7 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 2 Jul 2023 02:04:32 +0200
Subject: [PATCH 018/106] ncurses-6.4-20230701.patch

---
 NEWS                                       |  6 ++-
 VERSION                                    |  2 +-
 dist.mk                                    |  4 +-
 doc/html/man/adacurses6-config.1.html      | 12 ++---
 doc/html/man/captoinfo.1m.html             | 12 ++---
 doc/html/man/clear.1.html                  | 10 ++--
 doc/html/man/curs_add_wch.3x.html          |  8 ++--
 doc/html/man/curs_addch.3x.html            |  8 ++--
 doc/html/man/curs_attr.3x.html             | 10 ++--
 doc/html/man/curs_bkgd.3x.html             | 10 ++--
 doc/html/man/curs_bkgrnd.3x.html           | 10 ++--
 doc/html/man/curs_border.3x.html           | 10 ++--
 doc/html/man/curs_border_set.3x.html       | 10 ++--
 doc/html/man/curs_clear.3x.html            | 10 ++--
 doc/html/man/curs_color.3x.html            |  8 ++--
 doc/html/man/curs_delch.3x.html            | 10 ++--
 doc/html/man/curs_deleteln.3x.html         | 10 ++--
 doc/html/man/curs_extend.3x.html           | 10 ++--
 doc/html/man/curs_getcchar.3x.html         | 10 ++--
 doc/html/man/curs_getch.3x.html            | 10 ++--
 doc/html/man/curs_getstr.3x.html           | 10 ++--
 doc/html/man/curs_getyx.3x.html            | 10 ++--
 doc/html/man/curs_inch.3x.html             | 10 ++--
 doc/html/man/curs_inchstr.3x.html          | 10 ++--
 doc/html/man/curs_initscr.3x.html          |  8 ++--
 doc/html/man/curs_inopts.3x.html           | 10 ++--
 doc/html/man/curs_insch.3x.html            | 10 ++--
 doc/html/man/curs_insstr.3x.html           | 10 ++--
 doc/html/man/curs_instr.3x.html            | 10 ++--
 doc/html/man/curs_inwstr.3x.html           | 10 ++--
 doc/html/man/curs_kernel.3x.html           | 10 ++--
 doc/html/man/curs_legacy.3x.html           | 10 ++--
 doc/html/man/curs_mouse.3x.html            | 10 ++--
 doc/html/man/curs_move.3x.html             | 10 ++--
 doc/html/man/curs_opaque.3x.html           |  8 ++--
 doc/html/man/curs_outopts.3x.html          | 10 ++--
 doc/html/man/curs_overlay.3x.html          | 10 ++--
 doc/html/man/curs_pad.3x.html              | 10 ++--
 doc/html/man/curs_refresh.3x.html          |  8 ++--
 doc/html/man/curs_scr_dump.3x.html         | 10 ++--
 doc/html/man/curs_scroll.3x.html           |  8 ++--
 doc/html/man/curs_slk.3x.html              | 10 ++--
 doc/html/man/curs_sp_funcs.3x.html         | 10 ++--
 doc/html/man/curs_termattrs.3x.html        |  8 ++--
 doc/html/man/curs_termcap.3x.html          | 10 ++--
 doc/html/man/curs_terminfo.3x.html         | 10 ++--
 doc/html/man/curs_threads.3x.html          | 10 ++--
 doc/html/man/curs_touch.3x.html            | 10 ++--
 doc/html/man/curs_trace.3x.html            | 10 ++--
 doc/html/man/curs_util.3x.html             |  8 ++--
 doc/html/man/curs_window.3x.html           | 10 ++--
 doc/html/man/form.3x.html                  | 12 ++---
 doc/html/man/form_cursor.3x.html           | 10 ++--
 doc/html/man/form_data.3x.html             | 10 ++--
 doc/html/man/form_driver.3x.html           | 10 ++--
 doc/html/man/form_field.3x.html            | 10 ++--
 doc/html/man/form_field_attributes.3x.html | 10 ++--
 doc/html/man/form_field_buffer.3x.html     | 10 ++--
 doc/html/man/form_field_just.3x.html       | 10 ++--
 doc/html/man/form_field_new.3x.html        | 10 ++--
 doc/html/man/form_field_opts.3x.html       | 10 ++--
 doc/html/man/form_field_validation.3x.html | 10 ++--
 doc/html/man/form_fieldtype.3x.html        | 10 ++--
 doc/html/man/form_hook.3x.html             | 10 ++--
 doc/html/man/form_new.3x.html              | 10 ++--
 doc/html/man/form_new_page.3x.html         | 10 ++--
 doc/html/man/form_opts.3x.html             | 10 ++--
 doc/html/man/form_page.3x.html             | 10 ++--
 doc/html/man/form_post.3x.html             | 10 ++--
 doc/html/man/form_requestname.3x.html      | 10 ++--
 doc/html/man/form_userptr.3x.html          | 10 ++--
 doc/html/man/form_win.3x.html              | 10 ++--
 doc/html/man/infocmp.1m.html               | 10 ++--
 doc/html/man/infotocap.1m.html             |  2 +-
 doc/html/man/menu.3x.html                  | 12 ++---
 doc/html/man/menu_attributes.3x.html       | 10 ++--
 doc/html/man/menu_cursor.3x.html           | 10 ++--
 doc/html/man/menu_driver.3x.html           | 10 ++--
 doc/html/man/menu_format.3x.html           | 10 ++--
 doc/html/man/menu_hook.3x.html             | 10 ++--
 doc/html/man/menu_items.3x.html            | 10 ++--
 doc/html/man/menu_mark.3x.html             | 10 ++--
 doc/html/man/menu_new.3x.html              | 10 ++--
 doc/html/man/menu_opts.3x.html             | 10 ++--
 doc/html/man/menu_pattern.3x.html          | 10 ++--
 doc/html/man/menu_post.3x.html             | 10 ++--
 doc/html/man/menu_requestname.3x.html      | 10 ++--
 doc/html/man/menu_spacing.3x.html          | 10 ++--
 doc/html/man/menu_userptr.3x.html          | 10 ++--
 doc/html/man/menu_win.3x.html              | 10 ++--
 doc/html/man/mitem_current.3x.html         | 10 ++--
 doc/html/man/mitem_name.3x.html            | 10 ++--
 doc/html/man/mitem_new.3x.html             | 10 ++--
 doc/html/man/mitem_opts.3x.html            | 10 ++--
 doc/html/man/mitem_userptr.3x.html         | 10 ++--
 doc/html/man/mitem_value.3x.html           | 10 ++--
 doc/html/man/mitem_visible.3x.html         | 10 ++--
 doc/html/man/ncurses.3x.html               | 10 ++--
 doc/html/man/ncurses6-config.1.html        | 12 ++---
 doc/html/man/new_pair.3x.html              | 10 ++--
 doc/html/man/panel.3x.html                 | 12 ++---
 doc/html/man/resizeterm.3x.html            | 10 ++--
 doc/html/man/scr_dump.5.html               | 10 ++--
 doc/html/man/tabs.1.html                   | 12 ++---
 doc/html/man/term.5.html                   | 13 +++---
 doc/html/man/term.7.html                   | 14 +++---
 doc/html/man/term_variables.3x.html        |  8 ++--
 doc/html/man/terminfo.5.html               | 24 +++++-----
 doc/html/man/tic.1m.html                   | 12 ++---
 doc/html/man/toe.1m.html                   | 12 ++---
 doc/html/man/tput.1.html                   | 12 ++---
 doc/html/man/tset.1.html                   | 10 ++--
 doc/html/man/user_caps.5.html              | 10 ++--
 doc/html/man/wresize.3x.html               | 10 ++--
 man/MKada_config.in                        |  4 +-
 man/MKncu_config.in                        |  4 +-
 man/captoinfo.1m                           |  7 ++-
 man/clear.1                                |  6 +--
 man/curs_add_wch.3x                        | 12 +----
 man/curs_addch.3x                          |  7 +--
 man/curs_attr.3x                           | 11 ++---
 man/curs_bkgd.3x                           | 13 ++----
 man/curs_bkgrnd.3x                         | 13 ++----
 man/curs_border.3x                         |  7 ++-
 man/curs_border_set.3x                     | 12 ++---
 man/curs_clear.3x                          | 10 ++--
 man/curs_color.3x                          | 20 +-------
 man/curs_delch.3x                          |  7 ++-
 man/curs_deleteln.3x                       |  7 ++-
 man/curs_extend.3x                         |  9 ++--
 man/curs_getcchar.3x                       | 12 ++---
 man/curs_getch.3x                          | 11 ++---
 man/curs_getstr.3x                         |  7 ++-
 man/curs_getyx.3x                          |  7 ++-
 man/curs_inch.3x                           |  7 ++-
 man/curs_inchstr.3x                        |  7 ++-
 man/curs_initscr.3x                        | 12 +----
 man/curs_inopts.3x                         | 18 ++------
 man/curs_insch.3x                          |  7 ++-
 man/curs_insstr.3x                         |  7 ++-
 man/curs_instr.3x                          |  7 ++-
 man/curs_inwstr.3x                         |  8 ++--
 man/curs_kernel.3x                         | 15 ++----
 man/curs_legacy.3x                         |  7 ++-
 man/curs_mouse.3x                          | 15 ++----
 man/curs_move.3x                           |  7 ++-
 man/curs_opaque.3x                         |  5 +-
 man/curs_outopts.3x                        | 16 ++-----
 man/curs_overlay.3x                        |  7 ++-
 man/curs_pad.3x                            | 10 ++--
 man/curs_refresh.3x                        |  7 +--
 man/curs_scr_dump.3x                       | 11 ++---
 man/curs_scroll.3x                         |  5 +-
 man/curs_slk.3x                            | 14 ++----
 man/curs_sp_funcs.3x                       |  9 ++--
 man/curs_termattrs.3x                      | 10 +---
 man/curs_termcap.3x                        | 12 ++---
 man/curs_terminfo.3x                       | 24 ++--------
 man/curs_threads.3x                        |  7 ++-
 man/curs_touch.3x                          |  8 ++--
 man/curs_trace.3x                          |  7 ++-
 man/curs_util.3x                           | 19 +-------
 man/curs_window.3x                         | 15 ++----
 man/form.3x                                |  7 ++-
 man/form_cursor.3x                         |  7 ++-
 man/form_data.3x                           |  7 ++-
 man/form_driver.3x                         | 12 ++---
 man/form_field.3x                          |  7 ++-
 man/form_field_attributes.3x               |  7 ++-
 man/form_field_buffer.3x                   |  7 ++-
 man/form_field_just.3x                     |  7 ++-
 man/form_field_new.3x                      |  7 ++-
 man/form_field_opts.3x                     |  7 ++-
 man/form_field_validation.3x               |  8 ++--
 man/form_fieldtype.3x                      | 10 ++--
 man/form_hook.3x                           |  7 ++-
 man/form_new.3x                            |  7 ++-
 man/form_new_page.3x                       |  7 ++-
 man/form_opts.3x                           |  7 ++-
 man/form_page.3x                           |  7 ++-
 man/form_post.3x                           |  7 ++-
 man/form_requestname.3x                    |  7 ++-
 man/form_userptr.3x                        |  7 ++-
 man/form_win.3x                            |  7 ++-
 man/infocmp.1m                             |  7 +--
 man/menu.3x                                |  7 ++-
 man/menu_attributes.3x                     |  7 ++-
 man/menu_cursor.3x                         |  7 ++-
 man/menu_driver.3x                         |  9 ++--
 man/menu_format.3x                         |  7 ++-
 man/menu_hook.3x                           |  7 ++-
 man/menu_items.3x                          |  7 ++-
 man/menu_mark.3x                           |  7 ++-
 man/menu_new.3x                            |  7 ++-
 man/menu_opts.3x                           |  7 ++-
 man/menu_pattern.3x                        |  7 ++-
 man/menu_post.3x                           |  7 ++-
 man/menu_requestname.3x                    |  7 ++-
 man/menu_spacing.3x                        |  7 ++-
 man/menu_userptr.3x                        |  7 ++-
 man/menu_win.3x                            |  7 ++-
 man/mitem_current.3x                       |  7 ++-
 man/mitem_name.3x                          |  7 ++-
 man/mitem_new.3x                           |  7 ++-
 man/mitem_opts.3x                          |  7 ++-
 man/mitem_userptr.3x                       |  7 ++-
 man/mitem_value.3x                         |  7 ++-
 man/mitem_visible.3x                       |  7 ++-
 man/ncurses.3x                             | 33 +-------------
 man/new_pair.3x                            |  7 ++-
 man/panel.3x                               |  9 ++--
 man/resizeterm.3x                          | 11 ++---
 man/scr_dump.5                             | 18 ++------
 man/tabs.1                                 |  8 ++--
 man/term.5                                 | 16 ++-----
 man/term.7                                 | 11 ++---
 man/term_variables.3x                      |  5 +-
 man/terminfo.head                          |  9 ++--
 man/terminfo.tail                          | 53 ++++------------------
 man/tic.1m                                 | 11 ++---
 man/toe.1m                                 |  9 ++--
 man/tput.1                                 |  9 ++--
 man/tset.1                                 |  8 +---
 man/user_caps.5                            | 13 ++----
 man/wresize.3x                             |  7 ++-
 ncurses/tinfo/lib_tparm.c                  |  6 +--
 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                 |  2 +-
 package/ncurses.spec                       |  2 +-
 package/ncursest.spec                      |  2 +-
 progs/toe.c                                |  6 +--
 236 files changed, 917 insertions(+), 1308 deletions(-)

diff --git a/NEWS b/NEWS
index 1e3e9f5de..6b10b50ca 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3971 2023/06/25 18:16:49 tom Exp $
+-- $Id: NEWS,v 1.3973 2023/07/01 17:55:50 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230701
+	+ fix mandoc warnings about unnecessary markup.
+	+ improve parameter check in tparm_setup()
+
 20230625
 	+ adjust man/make_sed.sh to work with dates as the third field of TH.
 	+ fixes for out-of-memory condition (report by "eaglegai").
diff --git a/VERSION b/VERSION
index 9a883773d..07ef1d276 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230625
+5:0:10	6.4	20230701
diff --git a/dist.mk b/dist.mk
index 184921517..430cf4a49 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1552 2023/06/25 09:41:21 tom Exp $
+# $Id: dist.mk,v 1.1553 2023/07/01 09:47:16 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230625
+NCURSES_PATCH = 20230701
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 411cfb70b..3f69e8f95 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.14 2021/12/25 17:39:16 tom Exp @
+  * @Id: MKada_config.in,v 1.15 2021/12/25 17:39:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ADACURSES 1   User Commands</TITLE>
+<TITLE>ADACURSES 1 2021-12-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ADACURSES 1   User Commands</H1>
+<H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG>ADACURSES(1)</STRONG>                     User Commands                    <STRONG>ADACURSES(1)</STRONG>
+<STRONG>ADACURSES(1)</STRONG>                     User commands                    <STRONG>ADACURSES(1)</STRONG>
 
 
 
@@ -126,11 +126,11 @@ <H1 class="no-header">ADACURSES 1   User Commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-                                                                  <STRONG>ADACURSES(1)</STRONG>
+ncurses 6.4                       2021-12-25                      <STRONG>ADACURSES(1)</STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index a55820611..ff52d2a55 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.34 2022/02/12 20:07:29 tom Exp @
+  * @Id: captoinfo.1m,v 1.36 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2022-02-12 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2022-02-12 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -208,7 +208,7 @@ <H1 class="no-header">captoinfo 1m 2022-02-12 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 5510e18fe..0679d3615 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.31 2023/06/17 17:50:37 tom Exp @
+  * @Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -36,12 +36,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-06-17 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-06-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -150,11 +150,11 @@ <H1 class="no-header">clear 1 2023-06-17 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2023-06-17                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-07-01                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index af0d4b3d7..c48e639c3 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.33 2023/03/11 20:40:45 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.36 2023/07/01 14:23:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -290,7 +290,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index d39a37519..a5ec1d2d8 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.61 2023/03/11 20:39:26 tom Exp @
+  * @Id: curs_addch.3x,v 1.64 2023/07/01 14:23:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index d637ea1f3..d47e64457 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.74 2023/06/17 17:50:37 tom Exp @
+  * @Id: curs_attr.3x,v 1.77 2023/07/01 15:43:20 tom Exp @
   * ---------------------------------------------------------------------------
   * attr_get
   * .br
@@ -56,12 +56,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-06-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -520,7 +520,7 @@ <H1 class="no-header">curs_attr 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-17                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index f3394a2ab..e777c1700 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.36 2022/06/25 21:55:45 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.39 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2022-06-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-06-25                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 5aa86acb9..9dd36c1cd 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.17 2022/06/25 21:57:59 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.20 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2022-06-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2022-06-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-06-25                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index eedb0f883..46a97eee0 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.31 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_border.3x,v 1.34 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_border 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 7a3089469..d38f90b53 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.17 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_border_set.3x,v 1.20 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_border_set 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index cc8ea879b..7d86e09a3 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.28 2022/11/26 16:23:47 tom Exp @
+  * @Id: curs_clear.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2022-11-26 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2022-11-26 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -140,7 +140,7 @@ <H1 class="no-header">curs_clear 3x 2022-11-26 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-11-26                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 6a826ceb4..e693b5534 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.70 2023/04/23 20:53:20 tom Exp @
+  * @Id: curs_color.3x,v 1.73 2023/07/01 14:23:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-04-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-04-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -524,7 +524,7 @@ <H1 class="no-header">curs_color 3x 2023-04-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-04-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 7a5aa0111..50da8c585 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.19 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_delch.3x,v 1.22 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 1a2390aca..b78710f2b 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.21 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.24 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index b33ad3af8..296242111 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.29 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_extend.3x,v 1.32 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index ca8a9e411..835bb8413 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.28 2021/12/25 20:35:03 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2021-12-25                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index c6e0692c9..9eb474eb9 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.64 2022/02/12 20:07:45 tom Exp @
+  * @Id: curs_getch.3x,v 1.67 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -383,7 +383,7 @@ <H1 class="no-header">curs_getch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index b68fe24aa..12da6a2b9 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.37 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_getstr.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
   * X/Open says also until EOf
   * X/Open says then an EOS is added to the result
   * X/Open doesn't mention n&lt;0
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_getstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 263f5b12e..e3a541e0b 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.24 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_getyx.3x,v 1.27 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 9b44c6b8a..56bd5c2a3 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.29 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inch.3x,v 1.32 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_inch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index ab7dd0049..42b5f7a9b 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.28 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_inchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 785bb31d0..54c24a5f4 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.41 2023/06/10 16:50:22 tom Exp @
+  * @Id: curs_initscr.3x,v 1.44 2023/07/01 14:25:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-06-10 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-06-10 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_initscr 3x 2023-06-10 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-10                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 206426578..9d8af235e 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.37 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_inopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -302,7 +302,7 @@ <H1 class="no-header">curs_inopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 020b296a0..bd037135b 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_insch.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_insch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 529a81808..04cc818ee 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.30 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_insstr.3x,v 1.33 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_insstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 9d783757c..2a8656918 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.26 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_instr.3x,v 1.29 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_instr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 830e29e42..97f814a48 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.18 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.21 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_inwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 558afff68..0b54ccd38 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_kernel.3x,v 1.36 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -204,7 +204,7 @@ <H1 class="no-header">curs_kernel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index acfb8f3f9..320fd816c 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.14 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_legacy.3x,v 1.17 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -123,7 +123,7 @@ <H1 class="no-header">curs_legacy 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index fb423833e..cf5ce974c 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.61 2023/06/17 17:50:37 tom Exp @
+  * @Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-06-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -375,7 +375,7 @@ <H1 class="no-header">curs_mouse 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-17                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 7aad41aea..78d2f5c6b 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_move.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_move 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 363258481..28d1487ce 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.20 2023/03/11 20:40:58 tom Exp @
+  * @Id: curs_opaque.3x,v 1.23 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -146,7 +146,7 @@ <H1 class="no-header">curs_opaque 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 888111225..dcf87bdc1 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.37 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_outopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -203,7 +203,7 @@ <H1 class="no-header">curs_outopts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index a5f820b70..06bbce878 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_overlay.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 26a0e627a..df83523ac 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.30 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_pad.3x,v 1.33 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_pad 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 44705d267..3a8095e52 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.27 2023/03/11 20:41:02 tom Exp @
+  * @Id: curs_refresh.3x,v 1.30 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 3a6332d2d..7013bb3ef 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.21 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.24 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index fc1042090..59704db03 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.24 2023/03/11 20:41:05 tom Exp @
+  * @Id: curs_scroll.3x,v 1.27 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 0bebf4ba5..06ca45a47 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.45 2022/10/29 22:44:14 tom Exp @
+  * @Id: curs_slk.3x,v 1.48 2023/07/01 15:43:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2022-10-29 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2022-10-29 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -309,7 +309,7 @@ <H1 class="no-header">curs_slk 3x 2022-10-29 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-10-29                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 972e74ada..5d366d708 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.28 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -290,7 +290,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 57b2399fe..a968e2358 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.21 2023/03/11 20:41:12 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.24 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-03-11 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-03-11                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 047904497..d3412b6dc 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.59 2023/04/16 18:16:40 tom Exp @
+  * @Id: curs_termcap.3x,v 1.62 2023/07/01 15:28:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -180,7 +180,7 @@ <H1 class="no-header">curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</H1>
        trieve the data used by <STRONG>tgetent</STRONG> and the functions which return capabil-
        ity values such as <STRONG>tgetstr</STRONG>.  One could use
 
-            <STRONG>del_curterm(cur_term);</STRONG>
+               <STRONG>del_curterm(cur_term);</STRONG>
 
 
        to  free  this  memory,  but  there  is an additional complication with
@@ -356,7 +356,7 @@ <H1 class="no-header">curs_termcap 3x 2023-04-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-04-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 48a694b01..56d6aad17 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.90 2023/06/17 17:23:17 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.93 2023/07/01 15:33:35 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -43,12 +43,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -388,7 +388,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</H1>
        description.  As a side-effect, it sets <STRONG>cur_term</STRONG> to point to this memo-
        ry.  If an application calls
 
-            <STRONG>del_curterm(cur_term);</STRONG>
+               <STRONG>del_curterm(cur_term);</STRONG>
 
        the memory will be freed.
 
@@ -688,7 +688,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-17                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 407655ce4..79cd77fb9 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2021,2022 Thomas E. Dickey                                     *
+  * Copyright 2021-2022,2023 Thomas E. Dickey                                *
   * Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_threads.3x,v 1.35 2023/07/01 15:43:20 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -36,12 +36,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -608,7 +608,7 @@ <H1 class="no-header">curs_threads 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index f0d5d381f..0e258f6ae 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.27 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_touch.3x,v 1.30 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_touch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 016d75250..6bebf735e 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.26 2022/02/12 20:06:41 tom Exp @
+  * @Id: curs_trace.3x,v 1.29 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -257,7 +257,7 @@ <H1 class="no-header">curs_trace 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 708af2b91..05562d34c 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.67 2023/03/11 20:28:02 tom Exp @
+  * @Id: curs_util.3x,v 1.70 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -361,7 +361,7 @@ <H1 class="no-header">curs_util 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index c545d5fb2..59409f858 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.29 2022/08/13 23:24:22 tom Exp @
+  * @Id: curs_window.3x,v 1.32 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2022-08-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2022-08-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_window 3x 2022-08-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-08-13                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 5caf6f603..2a392f4cb 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.39 2021/12/25 21:49:32 tom Exp @
+  * @Id: form.3x,v 1.42 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -248,11 +248,11 @@ <H1 class="no-header">form 3x 2021-12-25 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2021-12-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 2944bf8e8..b3e8a835a 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.18 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_cursor.3x,v 1.21 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">form_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index f78b82f4e..0467ec604 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_data.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">form_data 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index e38035fd7..6b7ceb397 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.40 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_driver.3x,v 1.43 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -279,7 +279,7 @@ <H1 class="no-header">form_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 961491ace..3120bb77b 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">form_field 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 0993b0b15..5ea5cf686 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">form_field_attributes 3x 2022-02-12 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2022-02-12         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 614d7632f..ed9d832db 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.31 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.34 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">form_field_buffer 3x 2022-02-12 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2022-02-12             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index fd206c27d..49a6d570c 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_just.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -101,7 +101,7 @@ <H1 class="no-header">form_field_just 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index f7d38efec..092466134 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.28 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_new.3x,v 1.31 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">form_field_new 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2022-02-12                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 9f40eba71..f7464f9a8 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.31 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_opts.3x,v 1.34 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -170,7 +170,7 @@ <H1 class="no-header">form_field_opts 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 3574c0c0e..64e780bdc 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.37 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_validation.3x,v 1.40 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -224,7 +224,7 @@ <H1 class="no-header">form_field_validation 3x 2022-02-12 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2022-02-12         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 7ec78479f..5283667d8 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.32 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.35 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -189,7 +189,7 @@ <H1 class="no-header">form_fieldtype 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2022-02-12                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 3ce2368dd..85f7a3666 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_hook.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">form_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 199b131d9..02fd96162 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.19 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_new.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">form_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index e9dd5d30c..3f3ccbeea 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_new_page.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">form_new_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 8733bb9e1..c369c1277 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.21 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_opts.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 70c9fc188..4d465e0d6 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.23 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_page.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -126,7 +126,7 @@ <H1 class="no-header">form_page 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index aee4a7e06..694b108ad 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_post.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -115,7 +115,7 @@ <H1 class="no-header">form_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 655377e85..6a897069e 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_requestname.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -101,7 +101,7 @@ <H1 class="no-header">form_requestname 3x 2022-02-12 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2022-02-12              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 15f4100ee..35dc1192f 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.23 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_userptr.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 04f2529e1..c2b0b040c 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_win.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">form_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index a05e36986..d0637e2f8 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.84 2023/06/17 17:50:37 tom Exp @
+  * @Id: infocmp.1m,v 1.86 2023/07/01 14:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-06-17 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-06-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m 2023-06-17 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -530,7 +530,7 @@ <H1 class="no-header">infocmp 1m 2023-06-17 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-06-17                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-07-01                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9ca815bc2..3556c4b9a 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index ddf954c2b..8a5fa325f 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.30 2021/12/25 21:49:32 tom Exp @
+  * @Id: menu.3x,v 1.33 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -223,11 +223,11 @@ <H1 class="no-header">menu 3x 2021-12-25 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2021-12-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index bbe3dd8d4..7361da6f2 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.23 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_attributes.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -122,7 +122,7 @@ <H1 class="no-header">menu_attributes 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index e60edabb2..fa0f7f871 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.17 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_cursor.3x,v 1.20 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">menu_cursor 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 40ae4e395..bb18751d4 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.32 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_driver.3x,v 1.35 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -228,7 +228,7 @@ <H1 class="no-header">menu_driver 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 824198739..ce74e39f0 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.22 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_format.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">menu_format 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index b48ac25b4..de38b3e6f 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.19 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_hook.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -123,7 +123,7 @@ <H1 class="no-header">menu_hook 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 0ef85338b..875a18a99 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.21 2022/02/12 20:05:11 tom Exp @
+  * @Id: menu_items.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_items 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index d1cbe3820..23f07cf7c 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_mark.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_mark 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index 6dd38e630..2a2c9df87 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_new.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 2d68dc876..f0a06a251 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.22 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_opts.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -134,7 +134,7 @@ <H1 class="no-header">menu_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 6013ef4dd..389a4b4d4 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.25 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_pattern.3x,v 1.28 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_pattern 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index ab6cf088f..1ff1d35eb 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.23 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_post.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_post 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 1eac0d2e1..91bc208f8 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_requestname.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_requestname 3x 2022-02-12 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2022-02-12              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 8ec318a1d..13dc2e8ab 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_spacing.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_spacing 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index 3be8c2d8b..996adb1f6 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_userptr.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 41b13df64..7a661c28c 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
+  * @Id: menu_win.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">menu_win 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 455f57737..05ac7266f 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.24 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_current.3x,v 1.27 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">mitem_current 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index 2a4990f94..de34e9a7f 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.18 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_name.3x,v 1.21 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_name 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index a84f5ddf8..6b1605c33 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.23 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_new.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">mitem_new 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 90b659e95..6149faa6d 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.20 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_opts.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">mitem_opts 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index 13bbba77e..b17ccbf2b 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">mitem_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index a3f65e9a5..3b967ab04 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.19 2022/02/12 20:02:20 tom Exp @
+  * @Id: mitem_value.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">mitem_value 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index 69a4122a6..c695443db 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998,2010 Free Software Foundation, Inc.                       *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.14 2022/02/12 20:03:40 tom Exp @
+  * @Id: mitem_visible.3x,v 1.17 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_visible 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 05a243b48..b62cef20e 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.159 2023/06/17 17:50:37 tom Exp @
+  * @Id: ncurses.3x,v 1.162 2023/07/01 15:21:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-06-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-06-17 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1478,7 +1478,7 @@ <H1 class="no-header">ncurses 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-17                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 8bd6f0a33..11401622a 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -27,21 +27,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.6 2021/12/25 17:39:16 tom Exp @
+  * @Id: MKncu_config.in,v 1.7 2021/12/25 17:39:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses6-config 1</TITLE>
+<TITLE>ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses6-config 1</H1>
+<H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>          General Commands Manual         <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
+<STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>               User commands              <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 
 
 
@@ -113,11 +113,11 @@ <H1 class="no-header">ncurses6-config 1</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-                                                            <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
+ncurses 6.4                       2021-12-25                <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 10f58bd9c..08d1bd6fd 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.21 2023/06/17 17:50:37 tom Exp @
+  * @Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-06-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-06-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">new_pair 3x 2023-06-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-06-17                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 80855c2d8..2b4d2d3fe 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.43 2022/02/12 20:03:40 tom Exp @
+  * @Id: panel.3x,v 1.46 2023/07/01 15:46:10 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -295,7 +295,7 @@ <H1 class="no-header">panel 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 86f452116..638d50456 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.33 2022/02/20 00:32:18 tom Exp @
+  * @Id: resizeterm.3x,v 1.36 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2022-02-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2022-02-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2022-02-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-19                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 30d569332..f7cf53c94 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.22 2023/06/17 17:50:37 tom Exp @
+  * @Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-06-17 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-07-01 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-06-17 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-07-01 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-06-17 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-06-17                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-07-01                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 64f502880..dab0b4cb1 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.37 2023/06/17 17:50:37 tom Exp @
+  * @Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-06-17 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-06-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -252,11 +252,11 @@ <H1 class="no-header">tabs 1 2023-06-17 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2023-06-17                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 0a5cb5af8..d7d7cdf37 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.45 2023/06/17 17:52:54 tom Exp @
+  * @Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-06-17 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-07-01 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-06-17 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-07-01 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -316,7 +316,6 @@ <H1 class="no-header">term 5 2023-06-17 ncurses 6.4 File formats</H1>
                    cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
                    home=^^, ind=^J,
 
-
        and a hexadecimal dump of the compiled terminal description:
 
            0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
@@ -362,7 +361,7 @@ <H1 class="no-header">term 5 2023-06-17 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo/*/*  compiled terminal capability database
+       /usr/share/terminfo/*/* compiled terminal capability database
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -380,7 +379,7 @@ <H1 class="no-header">term 5 2023-06-17 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-06-17                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 44f889e0e..7e7980c5b 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.32 2021/12/25 17:39:16 tom Exp @
+  * @Id: term.7,v 1.35 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2021-12-25 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-07-01 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2021-12-25 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-07-01 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -88,14 +88,14 @@ <H1 class="no-header">term 7 2021-12-25 ncurses 6.4 Miscellaneous</H1>
        underneath /usr/share/terminfo.  To browse a list of all terminal names
        recognized by the system, do
 
-            toe | more
+               toe | more
 
        from your shell.   These  capability  files  are  in  a  binary  format
        optimized for retrieval speed (unlike the old text-based <STRONG>termcap</STRONG> format
        they replace); to examine  an  entry,  you  must  use  the  <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
        command.  Invoke it as follows:
 
-            infocmp <EM>entry</EM><STRONG>_</STRONG><EM>name</EM>
+               infocmp <EM>entry</EM><STRONG>_</STRONG><EM>name</EM>
 
        where  <EM>entry</EM><STRONG>_</STRONG><EM>name</EM>  is the name of the type you wish to examine (and the
        name of its capability file  the  subdirectory  of  /usr/share/terminfo
@@ -216,7 +216,7 @@ <H1 class="no-header">term 7 2021-12-25 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2021-12-25                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index a62686706..2546d80d9 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.18 2023/01/02 12:17:34 tom Exp @
+  * @Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-01-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-01-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-01-02 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-01-02                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index fec8f50f8..4efd4a166 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -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 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,10 +32,10 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp @
+  * @Id: terminfo.head,v 1.44 2023/07/01 15:46:56 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.113 2022/12/10 19:51:10 tom Exp @
+  * @Id: terminfo.tail,v 1.116 2023/07/01 15:33:13 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -74,14 +74,14 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5   File Formats</TITLE>
+<TITLE>terminfo 5 2023-07-01 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5   File Formats</H1>
+<H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 <PRE>
-<STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File Formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+<STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -2612,9 +2612,9 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
 
        X/Open Curses does not mention  italics.   Portable  applications  must
        assume  that  numeric  capabilities  are  signed  16-bit  values.  This
-       includes the <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (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
+       includes the <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
+       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
+       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  value  must  be
        specified, even if it is zero.
 
        Different  commercial  ports  of  terminfo and curses support different
@@ -2657,7 +2657,7 @@ <H1 class="no-header">terminfo 5   File Formats</H1>
 
 
 
-                                                                   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-07-01                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 1c7a47495..70f598bce 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.85 2022/09/17 19:01:24 tom Exp @
+  * @Id: tic.1m,v 1.87 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2022-09-17 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2022-09-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m 2022-09-17 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -478,7 +478,7 @@ <H1 class="no-header">tic 1m 2022-09-17 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2022-09-17                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 22aaddb1a..2ec0a7338 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.38 2023/06/17 17:52:54 tom Exp @
+  * @Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-06-17 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-06-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -171,11 +171,11 @@ <H1 class="no-header">toe 1m 2023-06-17 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2023-06-17                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 010068843..49f3d73d5 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.77 2022/02/12 20:02:20 tom Exp @
+  * @Id: tput.1,v 1.79 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2022-02-12 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2022-02-12 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -545,11 +545,11 @@ <H1 class="no-header">tput 1 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2022-02-12                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 7b3b8cf4d..8b54ec2c6 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.64 2023/06/10 15:46:24 tom Exp @
+  * @Id: tset.1,v 1.66 2023/07/01 15:21:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-06-10 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-07-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-06-10 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -392,11 +392,11 @@ <H1 class="no-header">tset 1 2023-06-10 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230617).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
 
 
 
-ncurses 6.4                       2023-06-10                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index e53f30bb9..5ec68523e 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.24 2023/06/17 17:52:54 tom Exp @
+  * @Id: user_caps.5,v 1.27 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-06-17 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-07-01 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-06-17 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-07-01 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -393,7 +393,7 @@ <H1 class="no-header">user_caps 5 2023-06-17 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-06-17                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-07-01                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index ffcfc3c5f..de98a56d5 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.21 2022/02/12 20:07:29 tom Exp @
+  * @Id: wresize.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2023-07-01                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 4552c5dda..a91f0ee04 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,9 +27,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.14 2021/12/25 17:39:16 tom Exp $
+.\" $Id: MKada_config.in,v 1.15 2021/12/25 17:39:16 tom Exp $
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.TH ADACURSES "1" "" "" "User Commands"
+.TH ADACURSES 1 2021-12-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
 .SH SYNOPSIS
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 6abeb4b7d..110bd8b1a 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.6 2021/12/25 17:39:16 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 ""
+.\" $Id: MKncu_config.in,v 1.7 2021/12/25 17:39:16 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2021-12-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \- helper script for ncurses libraries
 .SH SYNOPSIS
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 179355a77..9028adc4b 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.34 2022/02/12 20:07:29 tom Exp $
-.TH @CAPTOINFO@ 1M 2022-02-12 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.36 2023/07/01 15:43:20 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-07-01 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -72,7 +72,6 @@ change the output to \fIwidth\fP characters.
 \*d
 Compiled terminal description database.
 .SH TRANSLATIONS FROM NONSTANDARD CAPABILITIES
-.PP
 Some obsolete nonstandard capabilities will automatically be translated
 into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fP.
 Whenever one of these automatic translations is done, the program
diff --git a/man/clear.1 b/man/clear.1
index 1e5444d7e..830560bda 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.31 2023/06/17 17:50:37 tom Exp $
-.TH @CLEAR@ 1 2023-06-17 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp $
+.TH @CLEAR@ 1 2023-07-01 "ncurses 6.4" "User commands"
 .\" these would be fallbacks for DS/DE,
 .\" but groff changed the meaning of the macros.
 .de NS
@@ -58,7 +58,6 @@
 \fB@CLEAR@\fP \- clear the terminal screen
 .SH SYNOPSIS
 \fB@CLEAR@\fR [\fB\-T\fItype\fR] [\fB\-V\fR] [\fB\-x\fR]
-.br
 .SH DESCRIPTION
 \fB@CLEAR@\fP clears your terminal's screen if this is possible,
 including the terminal's scrollback buffer
@@ -73,7 +72,6 @@ You can redirect the standard output to a file (which prevents
 \fB@CLEAR@\fP from actually clearing the screen),
 and later \fBcat\fP the file to the screen, clearing it at that point.
 .SH OPTIONS
-.PP
 .TP 5
 .B \-T \fItype\fP
 indicates the \fItype\fP of terminal.
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 1ea11f837..e94a5d16e 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.33 2023/03/11 20:40:45 tom Exp $
-.TH curs_add_wch 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.36 2023/07/01 14:23:04 tom Exp $
+.TH curs_add_wch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -45,7 +45,6 @@
 \fBecho_wchar\fP,
 \fBwecho_wchar\fP \- add a complex character and rendition to a \fBcurses\fP window, then advance the cursor
 .SH SYNOPSIS
-.PP
 \fB#include <curses.h>\fP
 .sp
 .B "int add_wch( const cchar_t *\fIwch\fB );"
@@ -59,10 +58,8 @@
 .B "int echo_wchar( const cchar_t *\fIwch\fB );"
 .br
 .B "int wecho_wchar( WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB );"
-.br
 .SH DESCRIPTION
 .SS add_wch
-.PP
 The
 \fBadd_wch\fP,
 \fBwadd_wch\fP,
@@ -91,7 +88,6 @@ If the character part of \fIwch\fP is
 a tab, newline, backspace or other control character,
 the window is updated and the cursor moves as if \fBaddch\fP were called.
 .SS echo_wchar
-.PP
 The \fBecho_wchar\fP
 function is functionally equivalent to a call to
 \fBadd_wch\fP
@@ -209,7 +205,6 @@ U+2501 BOX DRAWINGS HEAVY HORIZONTAL
 .bP
 U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
 .SH RETURN VALUE
-.PP
 All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
 X/Open does not define any error conditions.
@@ -235,7 +230,6 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH NOTES
-.PP
 Note that
 \fBadd_wch\fP,
 \fBmvadd_wch\fP,
@@ -243,7 +237,6 @@ Note that
 \fBecho_wchar\fP
 may be macros.
 .SH PORTABILITY
-.PP
 All of these functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for line-drawing characters apply in the POSIX locale.
 .PP
@@ -324,7 +317,6 @@ Others have suggested these alternatives:
 \[u2612] U+2612 (ballot box with x).
 .SH SEE ALSO
 .na
-.PP
 \fBcurses\fP(3X),
 \fBcurs_addch\fP(3X),
 \fBcurs_attr\fP(3X),
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 14c8edd66..4744ba8ba 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.61 2023/03/11 20:39:26 tom Exp $
-.TH curs_addch 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.64 2023/07/01 14:23:04 tom Exp $
+.TH curs_addch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -117,7 +117,6 @@ using \fBinch\fP(3X) and \fBaddch\fP.)  See the \fBcurs_attr\fP(3X) page for
 values of predefined video attribute constants that can be usefully OR'ed
 into characters.
 .SS Echoing characters
-.PP
 The \fBechochar\fP and \fBwechochar\fP routines are equivalent to a call to
 \fBaddch\fP followed by a call to \fBrefresh\fP(3X), or a call to \fBwaddch\fP
 followed by a call to \fBwrefresh\fP.
@@ -205,7 +204,6 @@ Note that \fBaddch\fP, \fBmvaddch\fP, \fBmvwaddch\fP, and
 All these functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for forms-drawing characters apply in the POSIX locale.
 .SS ACS Symbols
-.LP
 X/Open Curses states that the \fBACS_\fP definitions are \fBchar\fP constants.
 For the wide-character implementation (see \fBcurs_add_wch\fP),
 there are analogous \fBWACS_\fP definitions which are \fBcchar_t\fP constants.
@@ -300,7 +298,6 @@ before attempting call \fBwaddch\fP, and
 .bP
 call \fBwadd_wch\fP for characters which cannot be handled by \fBwaddch\fP.
 .SS TABSIZE
-.LP
 The \fBTABSIZE\fP variable is implemented in SVr4 and other versions of curses,
 but is not part of X/Open curses
 (see \fBcurs_variables\fP(3X) for more details).
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index d6220ad12..21f4365f6 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.74 2023/06/17 17:50:37 tom Exp $
-.TH curs_attr 3X 2023-06-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.77 2023/07/01 15:43:20 tom Exp $
+.TH curs_attr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -144,7 +144,6 @@
 \fBint wstandout(WINDOW *\fIwin\fB);\fR
 .\" ---------------------------------------------------------------------------
 .SH DESCRIPTION
-.PP
 These routines manipulate the current attributes of the named window,
 which then apply to all characters that are written into
 the window with \fBwaddch\fP, \fBwaddstr\fP and \fBwprintw\fP.
@@ -165,7 +164,6 @@ For example,
 \fBattr_set\fP is the \fBstdscr\fP variant of \fBwattr_set\fP.
 .\" ---------------------------------------------------------------------------
 .SS Window attributes
-.PP
 There are two sets of functions:
 .bP
 functions for manipulating the window attributes and color:
@@ -236,7 +234,6 @@ There is no corresponding \fBattrget\fP function as such in X/Open Curses,
 although ncurses provides \fBgetattrs\fP (see curs_legacy(3X)).
 .\" ---------------------------------------------------------------------------
 .SS Change character rendition
-.PP
 The routine \fBchgat\fP changes the attributes of a given number of characters
 starting at the current cursor location of \fBstdscr\fP.
 It does not update
@@ -256,7 +253,6 @@ The routine \fBcolor_set\fP sets the current color of the given window to the
 foreground/background combination described by the color \fIpair\fP parameter.
 .\" ---------------------------------------------------------------------------
 .SS Standout
-.PP
 The routine \fBstandout\fP is
 the same as \fBattron(A_STANDOUT)\fP.
 The routine \fBstandend\fP is the same
@@ -467,7 +463,6 @@ The resulting 4.4BSD curses was replaced by ncurses over the next ten years.
 U/Win is rarely used now.
 .\" ---------------------------------------------------------------------------
 .SH EXTENSIONS
-.PP
 This implementation provides the \fBA_ITALIC\fP attribute for terminals
 which have the \fBenter_italics_mode\fP (\fBsitm\fP)
 and \fBexit_italics_mode\fP (\fBritm\fP) capabilities.
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 99e3efecf..927b009ea 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.36 2022/06/25 21:55:45 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.39 2023/07/01 15:43:20 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgd 3X 2022-06-25 "ncurses 6.4" "Library calls"
+.TH curs_bkgd 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbkgdset\fP, \fBwbkgdset\fP,
 \fBbkgd\fP, \fBwbkgd\fP,
@@ -71,12 +71,10 @@ To the extent possible on a particular terminal,
 the attribute part of the background is displayed
 as the graphic rendition of the character put on the screen.
 .SS bkgd
-.PP
 The \fBbkgd\fP and \fBwbkgd\fP functions
 set the background property of the current or specified window
 and then apply this setting to every character position in that window.
 According to X/Open Curses, it should do this:
-.PP
 .bP
 The rendition of every character on the screen is changed to
 the new background rendition.
@@ -128,11 +126,9 @@ 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\fP function returns the given window's current background
 character/attribute pair.
 .SH RETURN VALUE
-.PP
 These functions are described in the XSI Curses standard, Issue 4.
 It specifies that \fBbkgd\fP and \fBwbkgd\fP return \fBERR\fP on failure,
 but gives no failure conditions.
@@ -149,7 +145,6 @@ The SVr4 curses \fBwrefresh\fP returns the number of characters
 written to the screen during the refresh.
 This implementation does not do that.
 .SH NOTES
-.PP
 Note that \fBbkgdset\fP and \fBbkgd\fP may be macros.
 .PP
 X/Open Curses mentions that the character part of the background must
@@ -157,12 +152,10 @@ be a single-byte value.
 This implementation, like SVr4, checks to ensure that,
 and will reuse the old background character if the check fails.
 .SH PORTABILITY
-.PP
 These functions are described in the XSI Curses standard, Issue 4
 (X/Open Curses).
 .SH SEE ALSO
 .na
-.PP
 \fBcurses\fP(3X),
 \fBcurs_addch\fP(3X),
 \fBcurs_attr\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 61bddeae4..dc0862bfb 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.17 2022/06/25 21:57:59 tom Exp $
+.\" $Id: curs_bkgrnd.3x,v 1.20 2023/07/01 15:43:20 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgrnd 3X 2022-06-25 "ncurses 6.4" "Library calls"
+.TH curs_bkgrnd 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbkgrnd\fP,
 \fBwbkgrnd\fP,
@@ -41,7 +41,6 @@
 \fBgetbkgrnd\fP,
 \fBwgetbkgrnd\fP \- \fBcurses\fP window complex background manipulation routines
 .SH SYNOPSIS
-.PP
 .B #include <curses.h>
 .sp
 \fBint bkgrnd(\fB const cchar_t *\fIwch\fB);\fR
@@ -55,10 +54,8 @@
 \fBint getbkgrnd(cchar_t *\fIwch\fB);\fR
 .br
 \fBint wgetbkgrnd(WINDOW *\fIwin\fB, cchar_t *\fIwch\fB);\fR
-.br
 .SH DESCRIPTION
 .SS bkgrndset
-.PP
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines manipulate the
 background of the named window.
 The window background is a \fBcchar_t\fP consisting of
@@ -79,7 +76,6 @@ To the extent possible on a
 particular terminal, the attribute part of the background is displayed
 as the graphic rendition of the character put on the screen.
 .SS bkgrnd
-.PP
 The \fBbkgrnd\fP and \fBwbkgrnd\fP functions
 set the background property of the current or specified window
 and then apply this setting to every character position in that window:
@@ -90,7 +86,6 @@ the new background rendition.
 Wherever the former background character
 appears, it is changed to the new background character.
 .SS getbkgrnd
-.PP
 The \fBgetbkgrnd\fP function returns the given window's current background
 character/attribute pair via the \fBwch\fP pointer.
 If the given window pointer is null,
@@ -106,7 +101,6 @@ X/Open Curses does not provide details on how the rendition is changed.
 This implementation follows the approach used in SVr4 curses,
 which is explained in the manual page for \fBwbkgd\fP.
 .SH RETURN VALUE
-.PP
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines do not return a value.
 .PP
 Upon successful completion, the other functions return \fBOK\fP.
@@ -116,7 +110,6 @@ A null window pointer is treated as an error.
 .bP
 A null character pointer is treated as an error.
 .SH PORTABILITY
-.PP
 These functions are described in the XSI Curses standard, Issue 4
 (X/Open Curses).
 .SH SEE ALSO
diff --git a/man/curs_border.3x b/man/curs_border.3x
index ebae3f16e..a8fc08110 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.31 2022/02/12 20:06:41 tom Exp $
-.TH curs_border 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.34 2023/07/01 15:43:20 tom Exp $
+.TH curs_border 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -76,7 +76,6 @@
 \fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
 .br
 \fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
 draw a box around the edges of a window.
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index ade8b4c03..b8055d50b 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.17 2022/02/12 20:06:41 tom Exp $
-.TH curs_border_set 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.20 2023/07/01 15:43:20 tom Exp $
+.TH curs_border_set 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -50,7 +50,6 @@
 .ad
 .hy
 .SH SYNOPSIS
-.PP
 \fB#include <curses.h>\fP
 .sp
 \fBint border_set(\fP
@@ -103,9 +102,7 @@
    \fBWINDOW *\fIwin\fR,
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 .SH DESCRIPTION
-.PP
 The
 \fBborder_set\fP
 and
@@ -181,7 +178,6 @@ The
 functions draw a line proceeding toward the last line of the window.
 .br
 .SH NOTES
-.PP
 Note that
 \fBborder_set\fP,
 \fBhline_set\fP,
@@ -191,9 +187,7 @@ Note that
 \fBmvwvline_set\fP, and
 \fBvline_set\fP
 may be macros.
-.br
 .SH RETURN VALUE
-.PP
 Upon successful completion, these functions return
 \fBOK\fP.
 Otherwise, they return
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index ef30b0bd8..71600b28d 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.28 2022/11/26 16:23:47 tom Exp $
-.TH curs_clear 3X 2022-11-26 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
+.TH curs_clear 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .de bP
@@ -64,7 +64,6 @@
 \fBint clrtoeol(void);\fP
 .br
 \fBint wclrtoeol(WINDOW *\fIwin\fB);\fR
-.br
 .SH DESCRIPTION
 .SS erase/werase
 The \fBerase\fP and \fBwerase\fP routines copy blanks to every
@@ -73,19 +72,16 @@ position in the window, clearing the screen.
 Blanks created by erasure have the current background rendition (as set
 by \fBwbkgdset\fP(3X)) merged into them.
 .SS clear/wclear
-.PP
 The \fBclear\fP and \fBwclear\fP routines are like \fBerase\fP and
 \fBwerase\fP, but they also call \fBclearok\fP(3X), so that the screen is
 cleared completely on the next call to \fBwrefresh\fP for that window
 and repainted from scratch.
 .SS clrtobot/wclrtobot
-.PP
 The \fBclrtobot\fP and \fBwclrtobot\fP routines erase from the cursor to the
 end of screen.
 That is, they erase all lines below the cursor in the window.
 Also, the current line to the right of the cursor, inclusive, is erased.
 .SS clrtoeol/wclrtoeol
-.PP
 The \fBclrtoeol\fP and \fBwclrtoeol\fP routines erase the current line
 to the right of the cursor, inclusive, to the end of the current line.
 .SH RETURN VALUE
diff --git a/man/curs_color.3x b/man/curs_color.3x
index aa2f0d579..ffd552341 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.70 2023/04/23 20:53:20 tom Exp $
-.TH curs_color 3X 2023-04-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.73 2023/07/01 14:23:04 tom Exp $
+.TH curs_color 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -93,7 +93,6 @@
 \fBint COLOR_PAIR(int \fIn\fB);\fR
 .br
 \fBPAIR_NUMBER(\fIattrs\fB);\fR
-.br
 .SH DESCRIPTION
 .SS Overview
 \fBcurses\fP supports color attributes on terminals with that capability.
@@ -162,7 +161,6 @@ Those do not combine its parameter with a color pair.
 Consequently those calls use only the window attribute or
 the background character.
 .SH CONSTANTS
-.PP
 In \fB<curses.h>\fP the following macros are defined.
 These are the standard colors (ISO-6429).
 \fBcurses\fP also assumes that \fBCOLOR_BLACK\fP is the default
@@ -259,7 +257,6 @@ Color pair \fB0\fP is assumed to be white on black,
 but is actually whatever the terminal implements before color is initialized.
 It cannot be modified by the application.
 .SS has_colors
-.PP
 The \fBhas_colors\fP routine requires no arguments.
 It returns \fBTRUE\fP if
 the terminal can manipulate colors; otherwise, it returns \fBFALSE\fP.
@@ -267,14 +264,12 @@ This routine facilitates writing terminal-independent programs.
 For example, a programmer can use it to decide
 whether to use color or some other video attribute.
 .SS can_change_color
-.PP
 The \fBcan_change_color\fP routine requires no arguments.
 It returns \fBTRUE\fP if the terminal supports colors
 and can change their definitions;
 other, it returns \fBFALSE\fP.
 This routine facilitates writing terminal-independent programs.
 .SS init_pair
-.PP
 The \fBinit_pair\fP routine changes the definition of a color-pair.
 It takes three arguments:
 the number of the color-pair to be changed, the foreground
@@ -297,7 +292,6 @@ the \fBassume_default_colors\fP(3X) routine, or to specify the use of
 default colors (color number \fB\-1\fP) if you first invoke the
 \fBuse_default_colors\fP(3X) routine.
 .SS init_extended_pair
-.PP
 Because \fBinit_pair\fP uses signed \fBshort\fPs for its parameters,
 that limits color-pairs and color-values
 to 32767 on modern hardware.
@@ -305,7 +299,6 @@ The extension \fBinit_extended_pair\fP uses \fBint\fPs
 for the color-pair and color-value,
 allowing a larger number of colors to be supported.
 .SS init_color
-.PP
 The \fBinit_color\fP routine changes the definition of a color.
 It takes four arguments:
 the number of the color to be changed followed by three RGB values
@@ -322,7 +315,6 @@ When \fBinit_color\fP is used, all
 occurrences of that color on the screen immediately change to the new
 definition.
 .SS init_extended_color
-.PP
 Because \fBinit_color\fP uses signed \fBshort\fPs for its parameters,
 that limits color-values and their red, green, and blue components
 to 32767 on modern hardware.
@@ -331,7 +323,6 @@ for the color value and
 for setting the red, green, and blue components,
 allowing a larger number of colors to be supported.
 .SS color_content
-.PP
 The \fBcolor_content\fP routine gives programmers a way to find the intensity
 of the red, green, and blue (RGB) components in a color.
 It requires four arguments: the color number, and three addresses
@@ -347,7 +338,6 @@ last three arguments are in the range
 \fB0\fP (no component) through \fB1000\fP
 (maximum amount of component), inclusive.
 .SS extended_color_content
-.PP
 Because \fBcolor_content\fP uses signed \fBshort\fPs for its parameters,
 that limits color-values and their red, green, and blue components
 to 32767 on modern hardware.
@@ -356,7 +346,6 @@ for the color value and
 for returning the red, green, and blue components,
 allowing a larger number of colors to be supported.
 .SS pair_content
-.PP
 The \fBpair_content\fP routine allows programmers to find out what colors a
 given color-pair consists of.
 It requires three arguments: the color-pair
@@ -370,7 +359,6 @@ The values that are stored at the addresses pointed
 to by the second and third arguments are in the
 range \fB0\fP through \fBCOLORS\fP, inclusive.
 .SS extended_pair_content
-.PP
 Because \fBpair_content\fP uses signed \fBshort\fPs for its parameters,
 that limits color-pair and color-values to 32767 on modern hardware.
 The extension \fBextended_pair_content\fP uses \fBint\fPs
@@ -378,13 +366,11 @@ for the color pair and
 for returning the foreground and background colors,
 allowing a larger number of colors to be supported.
 .SS reset_color_pairs
-.PP
 The extension \fBreset_color_pairs\fP tells ncurses to discard all
 of the color-pair information which was set with \fBinit_pair\fP.
 It also touches the current- and standard-screens, allowing an application to
 switch color palettes rapidly.
 .SS PAIR_NUMBER
-.PP
 \fBPAIR_NUMBER(\fIattrs\fR) extracts the color
 value from its \fIattrs\fP parameter and returns it as a color pair number.
 .SS COLOR_PAIR
@@ -468,7 +454,6 @@ Paradise and compatibles) do the wrong thing when you try to set a bright
 .bP
 Color RGB values are not settable.
 .SH HISTORY
-.PP
 SVr3.2 introduced color support to curses in 1987.
 .PP
 SVr4 made internal changes,
@@ -521,7 +506,6 @@ The functions marked as extensions were designed for \fBncurses\fP(3X),
 and are not found in SVr4 curses, 4.4BSD curses,
 or any other previous version of curses.
 .SS Standards
-.PP
 This implementation satisfies XSI Curses's minimum maximums
 for \fBCOLORS\fP and \fBCOLOR_PAIRS\fP.
 .PP
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index b211f8479..161647a5f 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.19 2022/02/12 20:06:41 tom Exp $
-.TH curs_delch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_delch.3x,v 1.22 2023/07/01 15:43:20 tom Exp $
+.TH curs_delch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -48,7 +48,6 @@
 \fBint mvdelch(int \fIy\fB, int \fIx\fB);\fR
 .br
 \fBint mvwdelch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 .SH DESCRIPTION
 These routines delete the character under the cursor; all characters to the
 right of the cursor on the same line are moved to the left one position and the
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 152e216a8..f8c6b449f 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.21 2022/02/12 20:06:41 tom Exp $
-.TH curs_deleteln 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.24 2023/07/01 15:43:20 tom Exp $
+.TH curs_deleteln 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdeleteln\fP,
 \fBwdeleteln\fP,
@@ -50,7 +50,6 @@
 \fBint insertln(void);\fP
 .br
 \fBint winsertln(WINDOW *\fIwin\fB);\fR
-.br
 .SH DESCRIPTION
 The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
 cursor in the window; all lines below the current line are moved up one line.
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 8e93848de..3764c23eb 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.29 2022/02/12 20:07:29 tom Exp $
-.TH curs_extend 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.32 2023/07/01 15:43:20 tom Exp $
+.TH curs_extend 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -49,7 +49,6 @@
 These functions are extensions to the curses library
 which do not fit easily into other categories.
 .SS curses_version
-.PP
 Use \fBcurses_version\fP
 to get the version number, including patch level of the library,
 prefixed by \*(``ncurses\*('', e.g.,
@@ -58,7 +57,6 @@ prefixed by \*(``ncurses\*('', e.g.,
 .B ncurses 5.0.19991023
 .RE
 .SS use_extended_names
-.PP
 The \fBuse_extended_names\fP
 function controls whether the calling application
 is able to use user-defined or nonstandard names
@@ -70,7 +68,6 @@ extended terminal definitions.
 However you can disable this feature
 to ensure compatibility with other implementations of curses.
 .SH RETURN VALUE
-.PP
 \fBcurses_version\fP returns a pointer to static memory; you should not free
 this in your application.
 .PP
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index b674a7793..1ebcdb57d 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.28 2021/12/25 20:35:03 tom Exp $
-.TH curs_getcchar 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
+.TH curs_getcchar 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -64,7 +64,6 @@
 .B "        const void *\fIopts\fP );"
 .SH DESCRIPTION
 .SS getcchar
-.PP
 The \fBgetcchar\fP function gets a wide-character string
 and rendition from a \fBcchar_t\fP argument.
 When \fIwch\fP is not a null pointer,
@@ -92,7 +91,6 @@ Does not change the data referenced by
 or
 \fIcolor_pair\fP
 .SS setcchar
-.PP
 The \fBsetcchar\fP function initializes the location pointed to by \fIwcval\fP
 by using:
 .bP
@@ -113,7 +111,6 @@ Additional nonspacing characters are ignored.
 The string may contain a single control character instead.
 In that case, no nonspacing characters are allowed.
 .SH EXTENSIONS
-.PP
 X/Open Curses documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
 This implementation
@@ -129,12 +126,10 @@ if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
 and  used  to  retrieve  the color pair as an \fBint\fP value,
 in addition retrieving it via the standard pointer to \fBshort\fP parameter.
 .SH NOTES
-.PP
 The \fIwcval\fP argument may be a value generated by a call to
 \fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
 If \fIwcval\fP is constructed by any other means, the effect is unspecified.
 .SH RETURN VALUE
-.PP
 When \fIwch\fP is a null pointer,
 \fBgetcchar\fP returns the number of wide characters referenced by
 \fIwcval\fP,
@@ -194,7 +189,6 @@ including using them for ligatures between characters
 Unicode does not limit the (analogous) number of combining characters,
 so some applications may be affected.
 .SH SEE ALSO
-.PP
 Functions:
 \fBcurs_attr\fP(3X),
 \fBcurs_color\fP(3X),
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index e65784c06..75a06663a 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.64 2022/02/12 20:07:45 tom Exp $
-.TH curs_getch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.67 2023/07/01 15:43:20 tom Exp $
+.TH curs_getch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .ie \n(.g .ds `` \(lq
@@ -101,7 +101,6 @@ If the window is not a pad, and it has been moved or modified since the last
 call to \fBwrefresh\fP, \fBwrefresh\fP will be called before another character
 is read.
 .SS Keypad mode
-.PP
 If \fBkeypad\fP is \fBTRUE\fP, and a function key is pressed, the token for
 that function key is returned instead of the raw characters:
 .bP
@@ -136,11 +135,9 @@ Because function keys usually begin with an escape character,
 the terminal may appear to hang in notimeout mode after pressing the escape key
 until another key is pressed.
 .SS Ungetting characters
-.PP
 The \fBungetch\fP routine places \fIch\fP back onto the input queue to be
 returned by the next call to \fBwgetch\fP.
 There is just one input queue for all windows.
-.PP
 .SS Predefined key-codes
 The following special keys are defined in \fB<curses.h>\fP.
 .bP
@@ -281,7 +278,6 @@ because (e.g., with \fBxterm\fP(1) mouse prototocol) ncurses must
 read escape sequences,
 just like a function key.
 .SS Testing key-codes
-.PP
 The \fBhas_key\fP routine takes a key-code value from the above list, and
 returns \fBTRUE\fP or \fBFALSE\fP according to whether
 the current terminal type recognizes a key with that value.
@@ -296,7 +292,6 @@ defines a key-code for a given string (see \fBdefine_key\fP(3X)).
 checks if there is a key-code defined for a given
 string (see \fBkey_defined\fP(3X)).
 .RE
-.PP
 .SH RETURN VALUE
 All routines return the integer \fBERR\fP upon failure and an integer value
 other than \fBERR\fP (\fBOK\fP in the case of \fBungetch\fP) upon successful
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index ff786f298..948f1db34 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.37 2022/02/12 20:07:29 tom Exp $
-.TH curs_getstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
+.TH curs_getstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -68,7 +68,6 @@
 \fBint mvgetnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
 .br
 \fBint mvwgetnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBgetstr\fP is equivalent to a series of calls to \fBgetch\fP,
 until a newline or carriage return is received (the terminating character is
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 308f7413a..ff49c86fb 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.24 2022/02/12 20:07:29 tom Exp $
-.TH curs_getyx 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.27 2023/07/01 15:43:20 tom Exp $
+.TH curs_getyx 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBgetyx\fP,
 \fBgetparyx\fP,
@@ -44,7 +44,6 @@
 \fBvoid getbegyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
 .br
 \fBvoid getmaxyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 .SH DESCRIPTION
 The \fBgetyx\fP macro places the current cursor position of the given window in
 the two integer variables \fIy\fP and \fIx\fP.
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index bb97b321e..aef2c7d9f 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.29 2022/02/12 20:07:29 tom Exp $
-.TH curs_inch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.32 2023/07/01 15:43:20 tom Exp $
+.TH curs_inch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -53,7 +53,6 @@
 \fBchtype mvinch(int \fIy\fB, int \fIx\fB);\fR
 .br
 \fBchtype mvwinch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 .SH DESCRIPTION
 These routines return the character, of type \fBchtype\fP, at the current
 position in the named window.
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 9f6c46e29..c05fe8208 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp $
-.TH curs_inchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.28 2023/07/01 15:43:20 tom Exp $
+.TH curs_inchstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -68,7 +68,6 @@
 \fBint mvwinchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
 .br
 \fBint mvwinchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 These routines return a NULL-terminated array of \fBchtype\fP quantities,
 starting at the current cursor position in the named window and ending at the
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 3404f37e6..bd2b67498 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.41 2023/06/10 16:50:22 tom Exp $
-.TH curs_initscr 3X 2023-06-10 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.44 2023/07/01 14:25:06 tom Exp $
+.TH curs_initscr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -62,7 +62,6 @@
 \fBSCREEN *set_term(SCREEN *\fInew\fB);\fR
 .br
 \fBvoid delscreen(SCREEN* \fIsp\fB);\fR
-.br
 .SH DESCRIPTION
 .SS initscr
 \fBinitscr\fP is normally the first \fBcurses\fP routine to call when
@@ -81,7 +80,6 @@ If errors occur, \fBinitscr\fP writes an appropriate error
 message to standard error and exits;
 otherwise, a pointer is returned to \fBstdscr\fP.
 .SS newterm
-.PP
 A program that outputs to more than one terminal should use the \fBnewterm\fP
 routine for each terminal instead of \fBinitscr\fP.
 A program that needs to inspect capabilities,
@@ -106,7 +104,6 @@ The file descriptor of the output stream is passed to \fBsetupterm\fP(3X),
 which returns a pointer to a \fBTERMINAL\fP structure.
 \fBnewterm\fP's return value holds a pointer to the \fBTERMINAL\fP structure.
 .SS endwin
-.PP
 The program must also call
 \fBendwin\fP for each terminal being used before exiting from \fBcurses\fP.
 If \fBnewterm\fP is called more than once for the same terminal, the first
@@ -131,19 +128,16 @@ restores tty modes (see \fBreset_shell_mode\fP(3X)).
 Calling \fBrefresh\fP(3X) or \fBdoupdate\fP(3X) after a
 temporary escape causes the program to resume visual mode.
 .SS isendwin
-.PP
 The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
 called without any subsequent calls to \fBwrefresh\fP,
 and \fBFALSE\fP otherwise.
 .SS set_term
-.PP
 The \fBset_term\fP routine is used to switch between different terminals.
 The screen reference \fInew\fP becomes the new current terminal.
 The previous terminal is returned by the routine.
 This is the only routine which manipulates \fBSCREEN\fP pointers;
 all other routines affect only the current terminal.
 .SS delscreen
-.PP
 The \fBdelscreen\fP routine frees storage associated with the
 \fBSCREEN\fP data structure.
 The \fBendwin\fP routine does not do
@@ -231,7 +225,6 @@ e.g.,
 \fBdef_prog_mode\fP(3X).
 SVr4 curses uses the descriptor in \fBSCREEN\fP.
 .SS Unset TERM Variable
-.PP
 If the TERM variable is missing or empty, \fBinitscr\fP uses the
 value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the \fIgeneric\fP
@@ -240,7 +233,6 @@ Generic entries are detected by \fBsetupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle a missing/empty TERM variable differently.
 .SS Signal Handlers
-.PP
 Quoting from X/Open Curses, section 3.1.1:
 .RS 5
 .hy 0
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 9d6cf80c3..008edaaf6 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.37 2022/02/12 20:07:29 tom Exp $
-.TH curs_inopts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
+.TH curs_inopts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -128,7 +128,6 @@ Note that \fBcbreak\fP overrides \fBraw\fP.
 discussion of how these routines interact with \fBecho\fP and \fBnoecho\fP.]
 .\"
 .SS echo/noecho
-.PP
 The \fBecho\fP and \fBnoecho\fP routines control whether characters typed by
 the user are echoed by \fBgetch\fP(3X) as they are typed.
 Echoing by the tty
@@ -142,7 +141,6 @@ discussion of how these routines interact with \fBcbreak\fP and
 \fBnocbreak\fP.]
 .\"
 .SS halfdelay
-.PP
 The \fBhalfdelay\fP routine is used for half-delay mode, which is similar to
 \fBcbreak\fP mode in that characters typed by the user are immediately
 available to the program.
@@ -154,7 +152,6 @@ Use \fBnocbreak\fP to leave half-delay
 mode.
 .\"
 .SS intrflush
-.PP
 If the \fBintrflush\fP option is enabled (\fIbf\fP is \fBTRUE\fP), and an
 interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
 the tty driver queue will be flushed, giving the effect of faster response to
@@ -166,7 +163,6 @@ The default for the option is inherited from the tty driver settings.
 The window argument is ignored.
 .\"
 .SS keypad
-.PP
 The \fBkeypad\fP option enables the keypad of the user's terminal.
 If
 enabled (\fIbf\fP is \fBTRUE\fP), the user can press a function key
@@ -183,7 +179,6 @@ called.
 The default value for keypad is \fBFALSE\fP.
 .\"
 .SS meta
-.PP
 Initially, whether the terminal returns 7 or 8 significant bits on
 input depends on the control mode of the tty driver [see \fBtermios\fP(3)].
 To force 8 bits to be returned, invoke \fBmeta\fP(\fIwin\fP,
@@ -201,18 +196,15 @@ If the terminfo capabilities \fBsmm\fP
 \fBFALSE\fP) is called.
 .\"
 .SS nl/nonl
-.PP
 The \fBnl\fP and \fBnonl\fP routines control whether the underlying display
 device translates the return key into newline on input.
 .\"
 .SS nodelay
-.PP
 The \fBnodelay\fP option causes \fBgetch\fP to be a non-blocking call.
 If no input is ready, \fBgetch\fP returns \fBERR\fP.
 If disabled
 (\fIbf\fP is \fBFALSE\fP), \fBgetch\fP waits until a key is pressed.
 .SS notimeout
-.PP
 When interpreting an escape sequence, \fBwgetch\fP(3X) sets a timer
 while waiting for the next character.
 If \fBnotimeout(\fIwin\fR,
@@ -222,7 +214,6 @@ purpose of the timeout is to differentiate between sequences received
 from a function key and those typed by a user.
 .\"
 .SS raw/noraw
-.PP
 The \fBraw\fP and \fBnoraw\fP routines place the terminal into or out of raw
 mode.
 Raw mode is similar to \fBcbreak\fP mode, in that characters typed are
@@ -235,7 +226,6 @@ the BREAK key depends on other bits in the tty driver that are not set by
 \fBcurses\fP.
 .\"
 .SS qiflush/noqiflush
-.PP
 When the \fBnoqiflush\fP routine is used, normal flush of input and
 output queues associated with the \fBINTR\fP, \fBQUIT\fP and
 \fBSUSP\fP characters will not be done [see \fBtermios\fP(3)].
@@ -247,7 +237,6 @@ handler if you want output to continue as though the interrupt
 had not occurred, after the handler exits.
 .\"
 .SS timeout/wtimeout
-.PP
 The \fBtimeout\fP and \fBwtimeout\fP routines set blocking or
 non-blocking read for a given window.
 If \fIdelay\fP is negative,
@@ -263,7 +252,6 @@ plus the additional capability of being able to block for only
 \fIdelay\fP milliseconds (where \fIdelay\fP is positive).
 .\"
 .SS typeahead
-.PP
 The \fBcurses\fP 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,
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index ef7ff743d..d56319581 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
-.TH curs_insch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
+.TH curs_insch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -48,7 +48,6 @@
 \fBint mvinsch(int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
 .br
 \fBint mvwinsch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
-.br
 .SH DESCRIPTION
 These routines insert the character \fIch\fP before the character under the
 cursor.
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 005d0144b..b2b563946 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.30 2022/02/12 20:05:11 tom Exp $
-.TH curs_insstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.33 2023/07/01 15:43:20 tom Exp $
+.TH curs_insstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -60,7 +60,6 @@
 \fBint mvwinsstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
 .br
 \fBint mvwinsnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 These routines insert a character string
 (as many characters as will fit on the line)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 2127a737d..fab97c94f 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.26 2022/02/12 20:05:11 tom Exp $
-.TH curs_instr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.29 2023/07/01 15:43:20 tom Exp $
+.TH curs_instr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -64,7 +64,6 @@
 \fBint mvwinstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
 .br
 \fBint mvwinnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 These routines return a string of characters in \fIstr\fP, extracted starting
 at the current cursor position in the named window.
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 87bad8ed6..7022b91ab 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.18 2022/02/12 20:05:11 tom Exp $
-.TH curs_inwstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.21 2023/07/01 15:43:20 tom Exp $
+.TH curs_inwstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -63,7 +63,6 @@
 \fBint mvwinnwstr(\fBWINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
 .fi
 .SH DESCRIPTION
-.PP
 These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
 extracted starting at the current cursor position in the named window.
 .PP
@@ -76,7 +75,6 @@ been stored at the location referenced by \fIwstr\fP.
 If the size \fIn\fP is not large enough to store a complete complex character,
 an error is generated.
 .SH NOTES
-.PP
 All routines except
 \fBwinnwstr\fP
 may be macros.
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index fba3dd8d7..2f5497835 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.36 2023/07/01 15:43:20 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_kernel 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.TH curs_kernel 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -77,13 +77,11 @@
 \fBint curs_set(int \fIvisibility\fB);\fR
 .br
 \fBint napms(int \fIms\fB);\fR
-.br
 .SH DESCRIPTION
 The following routines give low-level access
 to various \fBcurses\fP capabilities.
 These routines typically are used inside library routines.
 .SS def_prog_mode, def_shell_mode
-.PP
 The \fBdef_prog_mode\fP and \fBdef_shell_mode\fP routines save the
 current terminal modes as the \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*(''
 (not in \fBcurses\fP) state for use by the \fBreset_prog_mode\fP and
@@ -92,7 +90,6 @@ This is done automatically by \fBinitscr\fP.
 There is one such save area for each screen context
 allocated by \fBnewterm\fP.
 .SS reset_prog_mode, reset_shell_mode
-.PP
 The \fBreset_prog_mode\fP and \fBreset_shell_mode\fP routines restore
 the terminal to \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*('' (out of
 \fBcurses\fP) state.
@@ -100,14 +97,12 @@ These are done automatically by \fBendwin\fP(3X) and,
 after an \fBendwin\fP, by \fBdoupdate\fP,
 so they normally are not called.
 .SS resetty, savetty
-.PP
 The \fBresetty\fP and \fBsavetty\fP routines save and restore the
 state of the terminal modes.
 \fBsavetty\fP saves the current state in
 a buffer and \fBresetty\fP restores the state to what it was at the
 last call to \fBsavetty\fP.
 .SS getsyx
-.PP
 The \fBgetsyx\fP routine returns the current coordinates
 of the \fIvirtual screen\fP cursor in \fIy\fP and \fIx\fP.
 If \fBleaveok\fP is currently \fBTRUE\fP, then
@@ -120,7 +115,6 @@ therefore, \fIy\fP and \fIx\fP should be used only as arguments for
 Few applications will use this feature,
 most use \fBgetyx\fP instead.
 .SS setsyx
-.PP
 The \fBsetsyx\fP routine sets
 the \fIvirtual screen\fP cursor to \fIy\fP, \fIx\fP.
 If \fIy\fP and \fIx\fP are both \fB\-1\fP, then
@@ -137,7 +131,6 @@ at the beginning, do its manipulation of its own windows, do a
 Few applications will use this feature,
 most use \fBwmove\fP instead.
 .SS ripoffline
-.PP
 The \fBripoffline\fP routine provides access to the same facility that
 \fBslk_init\fP [see \fBcurs_slk\fP(3X)] uses to reduce the size of the
 screen.
@@ -165,7 +158,6 @@ It is allowable to call \fBwnoutrefresh\fP during the initialization routine.
 \fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
 \fBnewterm\fP.
 .SS curs_set
-.PP
 The \fBcurs_set\fP routine sets the cursor state to invisible,
 normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
 \fB1\fP, or \fB2\fP respectively.
@@ -173,7 +165,6 @@ If the terminal supports the \fIvisibility\fP requested,
 the previous \fIcursor\fP state is returned;
 otherwise, \fBERR\fP is returned.
 .SS napms
-.PP
 The \fBnapms\fP routine is used to sleep for \fIms\fP milliseconds.
 .SH RETURN VALUE
 Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 0243cf483..5eaee7951 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2020,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.17 2023/07/01 15:43:20 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_legacy 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.TH curs_legacy 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
 .SH SYNOPSIS
@@ -55,7 +55,6 @@ curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
 \fBint getparx(const WINDOW *\fIwin\fB);\fR
 .br
 \fBint getpary(const WINDOW *\fIwin\fB);\fR
-.br
 .SH DESCRIPTION
 These legacy functions are simpler to use than the X/Open Curses functions:
 .bP
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index ea4fed611..6d8c87db5 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.61 2023/06/17 17:50:37 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -51,7 +51,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_mouse 3X 2023-06-17 "ncurses 6.4" "Library calls"
+.TH curs_mouse 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -98,7 +98,6 @@ These functions provide an interface to mouse events from
 Mouse events are represented by \fBKEY_MOUSE\fP
 pseudo-key values in the \fBwgetch\fP(3X) input stream.
 .SS mousemask
-.PP
 To make mouse events visible, use the \fBmousemask\fP function.
 This sets the mouse events to be reported.
 By default, no mouse events are reported.
@@ -118,7 +117,6 @@ As a side effect, setting a zero mousemask may turn off the mouse pointer;
 setting a nonzero mask may turn it on.
 Whether this happens is device-dependent.
 .SS Mouse events
-.PP
 Here are the mouse event type masks which may be defined:
 .PP
 .TS
@@ -164,7 +162,6 @@ REPORT_MOUSE_POSITION	report mouse movement
 _
 .TE
 .SS getmouse
-.PP
 Once a class of mouse events has been made visible in a window,
 calling the \fBwgetch\fP function on that window may return
 \fBKEY_MOUSE\fP as an indicator that a mouse event has been queued.
@@ -181,20 +178,17 @@ The corresponding data in the queue is marked invalid.
 A subsequent call to \fBgetmouse\fP will retrieve the next older
 item from the queue.
 .SS ungetmouse
-.PP
 The \fBungetmouse\fP function behaves analogously to \fBungetch\fP.
 It pushes
 a \fBKEY_MOUSE\fP event onto the input queue, and associates with that event
 the given state data and screen-relative character-cell coordinates.
 .SS wenclose
-.PP
 The \fBwenclose\fP function tests whether a given pair of screen-relative
 character-cell coordinates is enclosed by a given window, returning \fBTRUE\fP
 if it is and \fBFALSE\fP otherwise.
 It is useful for determining what subset of
 the screen windows enclose the location of a mouse event.
 .SS wmouse_trafo
-.PP
 The \fBwmouse_trafo\fP function transforms a given pair of coordinates
 from stdscr-relative coordinates
 to coordinates relative to the given window or vice versa.
@@ -226,12 +220,10 @@ The referenced coordinates
 are only replaced by the converted coordinates if the transformation was
 successful.
 .SS mouse_trafo
-.PP
 The \fBmouse_trafo\fP function performs the same translation
 as \fBwmouse_trafo\fP,
 using stdscr for \fIwin\fP.
 .SS mouseinterval
-.PP
 The \fBmouseinterval\fP function sets the maximum time (in thousands of a
 second) that can elapse between press and release events for them to
 be recognized as a click.
@@ -240,7 +232,6 @@ This function returns the previous interval value.
 Use \fBmouseinterval(\-1)\fP to obtain the interval without altering it.
 The default is one sixth of a second.
 .SS has_mouse
-.PP
 The \fBhas_mouse\fP function returns \fBTRUE\fP if the mouse driver has been
 successfully initialized.
 .PP
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 3af0f1ee7..26490809b 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
-.TH curs_move 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_move.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
+.TH curs_move 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -42,7 +42,6 @@
 \fBint move(int \fIy\fB, int \fIx\fB);\fR
 .br
 \fBint wmove(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 .SH DESCRIPTION
 These routines move the cursor associated with the window to line \fIy\fP and
 column \fIx\fP.
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 1668fac7f..ef6a19339 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.20 2023/03/11 20:40:58 tom Exp $
-.TH curs_opaque 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.23 2023/07/01 14:31:54 tom Exp $
+.TH curs_opaque 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -85,7 +85,6 @@
 \fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
 .br
 \fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int *\fIbottom\fB);\fR
-.br
 .SH DESCRIPTION
 This implementation provides functions which return properties
 set in the WINDOW structure, allowing it to be \*(``opaque\*('' if
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 767a9253b..3d12eff4c 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.37 2022/02/12 20:05:11 tom Exp $
-.TH curs_outopts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
+.TH curs_outopts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .de bP
@@ -64,15 +64,12 @@
 \fBint setscrreg(int \fItop\fB, int \fIbot\fB);\fR
 .br
 \fBint wsetscrreg(WINDOW *\fIwin\fB, int \fItop\fB, int \fIbot\fB);\fR
-.br
 .SH DESCRIPTION
-.PP
 These routines set options that change the style of output within
 \fBcurses\fP.
 All options are initially \fBFALSE\fP, unless otherwise stated.
 It is not necessary to turn these options off before calling \fBendwin\fP(3X).
 .SS clearok
-.PP
 If \fBclearok\fP is called with \fBTRUE\fP as argument, the next
 call to \fBwrefresh\fP with this window will clear the screen completely and
 redraw the entire screen from scratch.
@@ -83,7 +80,6 @@ the \fIwin\fP argument to \fBclearok\fP is the global variable \fBcurscr\fP,
 the next call to \fBwrefresh\fP with any window causes the screen to be cleared
 and repainted from scratch.
 .SS idlok
-.PP
 If \fBidlok\fP is called with \fBTRUE\fP as second argument, \fBcurses\fP
 considers using the hardware insert/delete line feature of terminals so
 equipped.
@@ -97,7 +93,6 @@ when used in applications where it is not really needed.
 If insert/delete line
 cannot be used, \fBcurses\fP redraws the changed portions of all lines.
 .SS idcok
-.PP
 If \fBidcok\fP is called with \fBFALSE\fP as second argument, \fBcurses\fP
 no longer considers using the hardware insert/delete character feature of
 terminals so equipped.
@@ -105,7 +100,6 @@ Use of character insert/delete is enabled by default.
 Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
 of character insertion and deletion.
 .SS immedok
-.PP
 If \fBimmedok\fP is called with \fBTRUE as argument\fP, any change
 in the window image, such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
 etc., automatically cause a call to \fBwrefresh\fP.
@@ -113,7 +107,6 @@ However, it may
 degrade performance considerably, due to repeated calls to \fBwrefresh\fP.
 It is disabled by default.
 .SS leaveok
-.PP
 Normally, the hardware cursor is left at the location of the window cursor
 being refreshed.
 The \fBleaveok\fP option allows the cursor to be left
@@ -121,7 +114,6 @@ wherever the update happens to leave it.
 It is useful for applications where
 the cursor is not used, since it reduces the need for cursor motions.
 .SS scrollok
-.PP
 The \fBscrollok\fP option controls what happens when the cursor of a window is
 moved off the edge of the window or scrolling region, either as a result of a
 newline action on the bottom line, or typing the last character of the last
@@ -132,7 +124,6 @@ If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
 (Note that to get the physical scrolling effect on the terminal, it is
 also necessary to call \fBidlok\fP).
 .SS  setscrreg/wsetscrreg
-.PP
 The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
 programmer to set a software scrolling region in a window.
 The \fItop\fP and
@@ -165,7 +156,6 @@ will return an error if the window pointer is null
 .bP
 \fBwsetscrreg\fP
 returns an error if the scrolling region limits extend outside the window.
-.RE
 .PP
 X/Open does not define any error conditions.
 This implementation returns an error
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index b352192b7..334bf4fb4 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
-.TH curs_overlay 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
+.TH curs_overlay 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -56,7 +56,6 @@ to be the same size; only text where the two windows overlap is copied.
 The difference is that \fBoverlay\fP is non-destructive
 (blanks are not copied) whereas \fBoverwrite\fP is destructive.
 .SS copywin
-.PP
 The \fBcopywin\fP routine provides a finer granularity of control over the
 \fBoverlay\fP and \fBoverwrite\fP routines.
 As in the \fBprefresh\fP routine,
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index ee1d841ea..b69484102 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.30 2022/02/12 20:05:11 tom Exp $
+.\" $Id: curs_pad.3x,v 1.33 2023/07/01 15:43:20 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_pad 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.TH curs_pad 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -81,7 +81,6 @@ Note that these
 routines require additional parameters to specify the part of the pad to be
 displayed and the location on the screen to be used for the display.
 .SS subpad
-.PP
 The \fBsubpad\fP routine creates and returns a pointer to a subwindow within a
 pad with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
 Unlike \fBsubwin\fP, which uses screen coordinates, the window is at position
@@ -93,7 +92,6 @@ During the use of this routine, it will often be
 necessary to call \fBtouchwin\fP or \fBtouchline\fP on \fIorig\fP before
 calling \fBprefresh\fP.
 .SS prefresh, pnoutrefresh
-.PP
 The \fBprefresh\fP and \fBpnoutrefresh\fP routines are analogous to
 \fBwrefresh\fP and \fBwnoutrefresh\fP except that they relate to pads instead
 of windows.
@@ -117,7 +115,6 @@ Negative values of
 \fIpminrow\fP, \fIpmincol\fP, \fIsminrow\fP, or \fIsmincol\fP are treated as if
 they were zero.
 .SS pechochar
-.PP
 The \fBpechochar\fP routine is functionally equivalent to a call to \fBaddch\fP
 followed by a call to \fBrefresh\fP(3X),
 a call to \fBwaddch\fP followed by a call
@@ -130,7 +127,6 @@ equivalents.
 In the case of \fBpechochar\fP, the last location of the pad on
 the screen is reused for the arguments to \fBprefresh\fP.
 .SS pecho_wchar
-.PP
 The \fBpecho_wchar\fP function is the analogous wide-character
 form of \fBpechochar\fP.
 It outputs one character to a pad and immediately refreshes the pad.
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index d828a7f3f..aad36e3d5 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.27 2023/03/11 20:41:02 tom Exp $
-.TH curs_refresh 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.30 2023/07/01 14:31:54 tom Exp $
+.TH curs_refresh 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -62,7 +62,6 @@
 \fBint redrawwin(WINDOW *\fIwin\fB);\fR
 .br
 \fBint wredrawln(WINDOW *\fIwin\fB, int \fIbeg_line\fB, int \fInum_lines\fB);\fR
-.br
 .SH DESCRIPTION
 .SS refresh/wrefresh
 The \fBrefresh\fP and \fBwrefresh\fP routines (or \fBwnoutrefresh\fP and
@@ -77,7 +76,6 @@ Unless \fBleaveok\fP(3X) has been
 enabled, the physical cursor of the terminal is left at the location of the
 cursor for that window.
 .SS wnoutrefresh/doupdate
-.PP
 The \fBwnoutrefresh\fP and \fBdoupdate\fP routines allow multiple updates with
 more efficiency than \fBwrefresh\fP alone.
 In addition to all the window
@@ -121,7 +119,6 @@ changed.
 (But see the section on \fBPORTABILITY\fP below for a warning about
 exploiting this behavior.)
 .SS wredrawln/redrawwin
-.PP
 The \fBwredrawln\fP routine indicates to \fBcurses\fP 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).
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index a209e5a7b..ff9d87027 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
-.TH curs_scr_dump 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.24 2023/07/01 15:43:20 tom Exp $
+.TH curs_scr_dump 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -56,21 +56,17 @@
 \fBint scr_init(const char *\fIfilename\fB);\fR
 .br
 \fBint scr_set(const char *\fIfilename\fB);\fR
-.br
 .SH DESCRIPTION
 .SS scr_dump
-.PP
 The \fBscr_dump\fP routine dumps the current contents
 of the \fIvirtual screen\fP
 to the file \fIfilename\fP.
 .SS scr_restore
-.PP
 The \fBscr_restore\fP routine sets the \fIvirtual screen\fP to the contents
 of \fIfilename\fP, which must have been written using \fBscr_dump\fP.
 The next call to \fBdoupdate\fP restores
 the \fIphysical screen\fP to the way it looked in the dump file.
 .SS scr_init
-.PP
 The \fBscr_init\fP routine reads in the contents of \fIfilename\fP and uses
 them to initialize the \fBcurses\fP data structures about what the terminal
 currently has on its screen.
@@ -87,7 +83,6 @@ if the terminfo capabilities \fBrmcup\fP and \fBnrrmc\fP exist, also
 .bP
 if the terminal has been written to since the preceding \fBscr_dump\fP call.
 .SS scr_set
-.PP
 The \fBscr_set\fP routine is a combination of \fBscr_restore\fP and
 \fBscr_init\fP.  It tells the program that the information in \fIfilename\fP is
 what is currently on the screen, and also what the program wants on the screen.
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 1ef0c8bd0..ef0f8277d 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.24 2023/03/11 20:41:05 tom Exp $
-.TH curs_scroll 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.27 2023/07/01 14:31:54 tom Exp $
+.TH curs_scroll 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -49,7 +49,6 @@
 \fBint scrl(int \fIn\fB);\fR
 .br
 \fBint wscrl(WINDOW *\fIwin\fB, int \fIn\fB);\fR
-.br
 .SH DESCRIPTION
 The \fBscroll\fP routine scrolls the window up one line.
 This involves moving
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 7d791b1d7..56324f9a9 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.45 2022/10/29 22:44:14 tom Exp $
-.TH curs_slk 3X 2022-10-29 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.48 2023/07/01 15:43:20 tom Exp $
+.TH curs_slk 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -119,7 +119,6 @@ the bottom of the screen;
 it does not try to use any hardware support for this
 mode.
 .SS Initialization
-.PP
 The \fBslk_init\fP routine must be called before \fBinitscr\fP or \fBnewterm\fP
 is called.
 If \fBinitscr\fP eventually uses a line from \fBstdscr\fP to
@@ -143,7 +142,6 @@ but in addition an index line is generated, helping the user to
 identify the key numbers easily.
 .RE
 .SS Labels
-.PP
 The \fBslk_set\fP routine
 (and the \fBslk_wset\fP routine for the wide-character library)
 has three parameters:
@@ -170,7 +168,6 @@ label.
 The \fBslk_label\fP routine returns the current label for label number
 \fIlabnum\fP, with leading and trailing blanks stripped.
 .SS Screen updates
-.PP
 The \fBslk_refresh\fP and \fBslk_noutrefresh\fP routines correspond to
 the \fBwrefresh\fP and \fBwnoutrefresh\fP routines.
 .PP
@@ -182,7 +179,6 @@ after a \fBslk_clear\fP has been performed.
 The \fBslk_touch\fP routine forces all the soft labels to be output
 the next time a \fBslk_noutrefresh\fP is performed.
 .SS Video attributes
-.PP
 The
 \fBslk_attron\fP, \fBslk_attrset\fP, \fBslk_attroff\fP and \fBslk_attr\fP
 routines correspond to
@@ -192,7 +188,6 @@ the screen.
 The default highlight for soft keys is A_STANDOUT (as in
 System V curses, which does not document this fact).
 .SS Colors
-.PP
 The \fBslk_color\fP routine corresponds to \fBcolor_set\fP.
 It has an effect only
 if soft labels are simulated on the bottom line of the screen.
@@ -273,7 +268,6 @@ X/Open Curses added these:
   slk_color
   slk_wset
 .SH EXTENSIONS
-.PP
 X/Open Curses documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
 This implementation
@@ -320,7 +314,7 @@ Reading the source code (i.e., Illumos):
 .bP
 Soft-key groups are an array of \fIng\fP integers.
 .bP
-In SVr4, \fBslk_init\fP calls \fBslk_start\fP passing a null for \fIgp\fP. 
+In SVr4, \fBslk_init\fP calls \fBslk_start\fP passing a null for \fIgp\fP.
 For this case, \fBslk_start\fP uses the number of groups \fIng\fP
 (3 for the 3-2-3 layout, 2 for the 4-4 layout) which \fBslk_init\fP provided.
 .IP
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 12403f826..d1465a024 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.28 2022/02/12 20:05:11 tom Exp $
-.TH curs_sp_funcs 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
+.TH curs_sp_funcs 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -317,14 +317,12 @@ curs_sp_funcs \- \fBcurses\fP screen-pointer extension
 .sp
 \fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fB, chtype \fIc\fB);\fR
 .ad
-.br
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
 improve the ability to manage multiple screens.
 This feature can be added to any of the configurations supported by ncurses;
 it adds new entrypoints
 without changing the meaning of any of the existing ones.
-.PP
 .\" ***************************************************************************
 .SS IMPROVED FUNCTIONS
 Most of the functions are new versions of existing functions.
@@ -380,7 +378,6 @@ where an \fINCURSES_OUTC\fP is used in the unextended library.
 NCURSES_OUTC
 This is a function-pointer type used for the cases where a function passes
 characters to the output stream, e.g., \fBvidputs\fP(3X).
-.PP
 .SH PORTABILITY
 These routines are specific to ncurses.
 They were not supported on Version 7, BSD or System V implementations.
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 57ce1b4ca..121734736 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.21 2023/03/11 20:41:12 tom Exp $
-.TH curs_termattrs 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.24 2023/07/01 14:31:54 tom Exp $
+.TH curs_termattrs 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbaudrate\fP,
 \fBerasechar\fP,
@@ -73,7 +73,6 @@ The
 number returned is in bits per second, for example \fB9600\fP, and is an
 integer.
 .SS erasechar, erasewchar
-.PP
 The \fBerasechar\fP routine returns the user's current erase character.
 .PP
 The \fBerasewchar\fP routine stores the current erase character
@@ -81,7 +80,6 @@ in the location referenced by \fIch\fP.
 If no erase character has been defined, the routine fails
 and the location referenced by \fIch\fP is not changed.
 .SS has_is, has_il
-.PP
 The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
 character capabilities.
 .PP
@@ -91,7 +89,6 @@ This might
 be used to determine if it would be appropriate to turn on physical
 scrolling using \fBscrollok\fP(3X).
 .SS killchar, killwchar
-.PP
 The \fBkillchar\fP routine returns the user's current line kill character.
 .PP
 The \fBkillwchar\fP routine stores the current line-kill character
@@ -99,7 +96,6 @@ in the location referenced by \fIch\fP.
 If no line-kill character has been defined,
 the routine fails and the location referenced by \fIch\fP is not changed.
 .SS longname
-.PP
 The \fBlongname\fP routine returns a pointer to a static area
 containing a verbose description of the current terminal.
 The maximum
@@ -111,7 +107,6 @@ overwritten by each call to \fBnewterm\fP and is not restored by
 \fBnewterm\fP if \fBlongname\fP is going to be used with multiple
 terminals.
 .SS termattrs, term_attrs
-.PP
 If a given terminal does not support a video attribute that an
 application program is trying to use, \fBcurses\fP may substitute a
 different video attribute for it.
@@ -121,7 +116,6 @@ terminal using \fBA_\fP and \fBWA_\fP constants respectively.
 This information is useful when a \fBcurses\fP program
 needs complete control over the appearance of the screen.
 .SS termname
-.PP
 The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
 .SH RETURN VALUE
 \fBlongname\fP and \fBtermname\fP return \fBNULL\fP on error.
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index b04584e08..f26a536c9 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.59 2023/04/16 18:16:40 tom Exp $
-.TH curs_termcap 3X 2023-04-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.62 2023/07/01 15:28:47 tom Exp $
+.TH curs_termcap 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -77,7 +77,6 @@
 \fBchar *tgoto(const char *\fIcap\fB, int \fIcol\fB, int \fIrow\fB);\fR
 .br
 \fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
-.br
 .SH DESCRIPTION
 These routines are included as a conversion aid for programs that use
 the \fItermcap\fP library.
@@ -87,7 +86,6 @@ Thus, they
 can only be used to query the capabilities of entries for which a
 terminfo entry has been compiled.
 .SS Initialization
-.PP
 The \fBtgetent\fP routine loads the entry for \fIname\fP.
 It returns:
 .RS 3
@@ -119,7 +117,6 @@ description is marked with the \fIgeneric\fP capability,
 or if the terminal description has cursor-addressing.
 .RE
 .SS Capability Values
-.PP
 The \fBtgetflag\fP routine gets the boolean entry for \fIid\fP,
 or zero if it is not available.
 .PP
@@ -153,7 +150,6 @@ Only the first two characters of the \fBid\fP parameter of
 \fBtgetnum\fP and
 \fBtgetstr\fP are compared in lookups.
 .SS Formatting Capabilities
-.PP
 The \fBtgoto\fP routine expands the given capability using the parameters.
 .bP
 Because the capability may have padding characters,
@@ -188,7 +184,6 @@ The \fBtputs\fP routine is described on the \fBcurs_terminfo\fP(3X) manual
 page.
 It can retrieve capabilities by either termcap or terminfo name.
 .SS Global Variables
-.PP
 The variables
 \fBPC\fP,
 \fBUP\fP and
@@ -214,7 +209,7 @@ It uses \fBsetupterm\fP to retrieve the data used by \fBtgetent\fP
 and the functions which return capability values such as \fBtgetstr\fP.
 One could use
 .sp
-	\fBdel_curterm(cur_term);\fP
+        \fBdel_curterm(cur_term);\fP
 .sp
 .PP
 to free this memory, but there is an additional complication with ncurses.
@@ -303,7 +298,6 @@ Because the purpose of these functions is to provide compatibility with
 the \fItermcap\fP library, that is a defect in XCurses, Issue 4, Version 2
 rather than in ncurses.
 .SS Compatibility with BSD Termcap
-.PP
 External variables are provided for support of certain termcap applications.
 However, termcap applications' use of those variables is poorly documented,
 e.g., not distinguishing between input and output.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index ba4fe0e6d..4f89b20b7 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.90 2023/06/17 17:23:17 tom Exp $
-.TH curs_terminfo 3X 2023-06-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.93 2023/07/01 15:33:35 tom Exp $
+.TH curs_terminfo 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -137,7 +137,6 @@ capability names use the POSIX portable character set
 capability string values have no associated encoding;
 they are strings of 8-bit characters.
 .SS Initialization
-.PP
 Initially, \fBsetupterm\fP should be called.
 The high-level curses functions \fBinitscr\fP and
 \fBnewterm\fP call \fBsetupterm\fP to initialize the
@@ -250,7 +249,6 @@ which uses all the defaults and sends the output to \fBstdout\fP.
 .RE
 .\" ***************************************************************************
 .SS The Terminal State
-.PP
 The \fBsetupterm\fP routine stores its information about the terminal
 in a \fBTERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
 If it detects an error,
@@ -286,7 +284,6 @@ Accordingly, \fBrestartterm\fP saves various tty state bits,
 calls \fBsetupterm\fP, and then restores the bits.
 .\" ***************************************************************************
 .SS Formatting Output
-.PP
 The \fBtparm\fP routine instantiates the string \fIstr\fP with
 parameters \fIpi\fP.  A pointer is returned to the result of \fIstr\fP
 with the parameters applied.
@@ -325,7 +322,6 @@ The extension \fBtiscan_s\fP allows the application
 to inspect a formatting capability to see what the curses library would assume.
 .\" ***************************************************************************
 .SS Output Functions
-.PP
 The \fBtputs\fP routine applies padding information
 (i.e., by interpreting marker embedded in the terminfo capability
 such as \*(``$<5>\*('' as 5 milliseconds)
@@ -390,7 +386,6 @@ they are declared in \fB<curses.h>\fP because SystemV did this
 (see \fIHISTORY\fP).
 .\" ***************************************************************************
 .SS Terminal Capability Functions
-.PP
 The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
 the value of the capability corresponding to the \fBterminfo\fP
 \fIcapname\fP passed to them, such as \fBxenl\fP.
@@ -426,7 +421,6 @@ or
 if it is canceled or absent from the terminal description.
 .\" ***************************************************************************
 .SS Terminal Capability Names
-.PP
 These null-terminated arrays contain
 .bP
 the short terminfo names (\*(``codes\*(''),
@@ -451,12 +445,12 @@ description.
 As a side-effect, it sets \fBcur_term\fP to point to this memory.
 If an application calls
 .sp
-	\fBdel_curterm(cur_term);\fP
+        \fBdel_curterm(cur_term);\fP
 .sp
 the memory will be freed.
 .PP
 The formatting functions \fBtparm\fP and \fBtiparm\fP extend the storage
-allocated by \fBsetupterm\fP: 
+allocated by \fBsetupterm\fP:
 .bP
 the \*(``static\*('' terminfo variables [a-z].
 Before ncurses 6.3, those were shared by all screens.
@@ -538,7 +532,6 @@ This implementation provides each of those symbols
 as macros for BSD compatibility,
 .\" ***************************************************************************
 .SH HISTORY
-.PP
 SVr2 introduced the terminfo feature.
 Its programming manual mentioned these low-level functions:
 .TS
@@ -646,16 +639,13 @@ by the Unix \fBvi\fP(1) editor.
 The functions marked as extensions were designed for \fBncurses\fP(3X),
 and are not found in SVr4 curses, 4.4BSD curses,
 or any other previous version of curses.
-.PP
 .SS Legacy functions
-.PP
 X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
 .PP
 The function \fBsetterm\fP is not described by X/Open and must
 be considered non-portable.
 All other functions are as described by X/Open.
 .SS Legacy data
-.PP
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
@@ -666,7 +656,6 @@ X/Open does not specify them.
 Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
 are not stored in the arrays described here.
 .SS Output buffering
-.PP
 Older versions of \fBncurses\fP assumed that the file descriptor passed to
 \fBsetupterm\fP from \fBinitscr\fP or \fBnewterm\fP uses buffered I/O,
 and would write to the corresponding stream.
@@ -684,7 +673,6 @@ The high-level functions in \fBncurses\fP use
 alternate versions of these functions
 using the more reliable buffering scheme.
 .SS Function prototypes
-.PP
 The X/Open Curses prototypes are based on the SVr4 curses header declarations,
 which were defined at the same time the C language was first standardized in
 the late 1980s.
@@ -739,14 +727,13 @@ places for the \fBtparm\fP calls.
 The \fB@TPUT@\fR(1) program checks its use of these capabilities with a table,
 so that it calls \fBtparm\fP correctly.
 .SS Special TERM treatment
-.PP
 If configured to use the terminal-driver,
 e.g., for the MinGW port,
 .bP
 \fBsetupterm\fP interprets a missing/empty TERM variable as the
 special value \*(``unknown\*(''.
 .IP
-SVr4 curses uses the 
+SVr4 curses uses the
 special value \*(``dumb\*(''.
 .IP
 The difference between the two is that
@@ -758,7 +745,6 @@ A generic terminal is unsuitable for full-screen applications.
 the windows console driver by checking if $TERM is set to
 \*(``#win32con\*('' or an abbreviation of that string.
 .SS Other portability issues
-.PP
 In System V Release 4, \fBset_curterm\fP has an \fBint\fP return type and
 returns \fBOK\fP or \fBERR\fP.  We have chosen to implement the X/Open Curses
 semantics.
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index b45e81173..bd8a5c967 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2021,2022 Thomas E. Dickey                                     *
+.\" Copyright 2021-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
-.TH curs_threads 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.35 2023/07/01 15:43:20 tom Exp $
+.TH curs_threads 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -55,7 +55,6 @@
 \fBint use_screen(SCREEN *\fIscr\fB, NCURSES_SCREEN_CB \fIfunc\fB, void *\fIdata\fB);\fR
 .br
 \fBint use_window(WINDOW *\fIwin\fB, NCURSES_WINDOW_CB \fIfunc\fB, void *\fIdata\fB);\fR
-.br
 .SH DESCRIPTION
 This implementation can be configured to provide rudimentary support
 for multi-threaded applications.
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index a23825a4f..e1faa612e 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.27 2022/02/12 20:05:11 tom Exp $
-.TH curs_touch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_touch.3x,v 1.30 2023/07/01 15:46:10 tom Exp $
+.TH curs_touch 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -54,7 +54,6 @@
 \fBbool is_linetouched(WINDOW *\fIwin\fB, int \fIline\fB);\fR
 .br
 \fBbool is_wintouched(WINDOW *\fIwin\fB);\fR
-.br
 .SH DESCRIPTION
 The \fBtouchwin\fP and \fBtouchline\fP routines throw away all
 optimization information about which parts of the window have been
@@ -110,7 +109,6 @@ if the window pointer is null, or
 if the line number is outside the window.
 .RE
 .SH PORTABILITY
-.PP
 These functions were introduced by SVr4.
 The Solaris curses header file,
 for instance, defines both an actual function and macro for each.
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 26cdc5023..5117d3deb 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.26 2022/02/12 20:06:41 tom Exp $
+.\" $Id: curs_trace.3x,v 1.29 2023/07/01 15:46:10 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_trace 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.TH curs_trace 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -218,7 +218,6 @@ use_tioctl
 .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 \fBcurses_trace\fP function.
 Both of these (\fB\-v\fP and \fBcurses_trace\fP)
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 52e6e276a..aee7c4a90 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.67 2023/03/11 20:28:02 tom Exp $
-.TH curs_util 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.70 2023/07/01 14:31:54 tom Exp $
+.TH curs_util 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -81,10 +81,8 @@
 \fBint delay_output(int \fIms\fB);\fR
 .br
 \fBint flushinp(void);\fP
-.br
 .SH DESCRIPTION
 .SS unctrl
-.PP
 The \fBunctrl\fP routine returns a character string which is a printable
 representation of the character \fIc\fP, ignoring attributes.
 Control characters are displayed in the \fB^\fIX\fR notation.
@@ -93,7 +91,6 @@ Printing characters are displayed as is.
 The corresponding \fBwunctrl\fP returns a printable representation of
 a wide character.
 .SS keyname/key_name
-.PP
 The \fBkeyname\fP routine returns a character string
 corresponding to the key \fIc\fP:
 .bP
@@ -124,7 +121,6 @@ to the wide-character value \fIw\fP.
 The two functions do not return the same set of strings;
 the latter returns null where the former would display a meta character.
 .SS filter/nofilter
-.PP
 The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
 \fBnewterm\fP are called.
 Calling \fBfilter\fP causes these changes in initialization:
@@ -152,7 +148,6 @@ using a different value of \fB$TERM\fP.
 The limitation arises because the \fBfilter\fP routine modifies the
 in-memory copy of the terminal information.
 .SS use_env
-.PP
 The \fBuse_env\fP routine, if used,
 should be called before \fBinitscr\fP or
 \fBnewterm\fP are called
@@ -178,7 +173,6 @@ from the operating system or terminal database.
 \fBNcurses\fP also updates the screen size in response to \fBSIGWINCH\fP,
 unless overridden by the \fBLINES\fP or \fBCOLUMNS\fP environment variables,
 .SS use_tioctl
-.PP
 The \fBuse_tioctl\fP routine, if used,
 should be called before \fBinitscr\fP or \fBnewterm\fP are called
 (because those compute the screen size).
@@ -221,7 +215,6 @@ FALSE/FALSE/T{
 T}
 .TE
 .SS putwin/getwin
-.PP
 The \fBputwin\fP routine writes all data associated
 with window (or pad) \fIwin\fP into
 the file to which \fIfilep\fP points.
@@ -250,7 +243,6 @@ If cells in the retrieved window use color pairs which have not been
 created in the application using \fBinit_pair\fP,
 they will not be colored when the window is refreshed.
 .SS delay_output
-.PP
 The \fBdelay_output\fP routine inserts an \fIms\fP millisecond pause
 in output.
 This routine should not be used extensively because
@@ -258,7 +250,6 @@ padding characters are used rather than a CPU pause.
 If no padding character is specified,
 this uses \fBnapms\fP to perform the delay.
 .SS flushinp
-.PP
 The \fBflushinp\fP routine throws away any typeahead that has been typed by the
 user and has not yet been read by the program.
 .SH RETURN VALUE
@@ -280,13 +271,11 @@ returns an error if the associated \fBfwrite\fP calls return an error.
 .RE
 .SH PORTABILITY
 .SS filter
-.PP
 The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
 terms.
 The description here is adapted from the XSI Curses standard (which
 erroneously fails to describe the disabling of \fBcuu\fP).
 .SS keyname
-.PP
 The \fBkeyname\fP function may return the names of user-defined
 string capabilities which are defined in the terminfo entry via the \fB\-x\fP
 option of \fB@TIC@\fP.
@@ -298,13 +287,11 @@ merged from all terminal descriptions which have been loaded.
 The \fBuse_extended_names\fP(3X) function controls whether this data is
 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 \fBncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
 It is recommended that any code depending on \fBncurses\fP extensions
 be conditioned using NCURSES_VERSION.
 .SS putwin/getwin file-format
-.PP
 The \fBputwin\fP and \fBgetwin\fP functions have several issues with
 portability:
 .bP
@@ -335,7 +322,6 @@ Doing that can run into problems mixing block- and buffered-I/O.
 This implementation reduces the problem on writes by flushing the output.
 However, reading from a file written using mixed schemes may not be successful.
 .SS unctrl/wunctrl
-.PP
 The XSI Curses standard, Issue 4 describes these functions.
 It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
 unsuccessful, but does not define any error conditions.
@@ -390,7 +376,6 @@ However, \fBncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
 matching the behavior of SVr4 curses.
 Other implementations may not do that.
 .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
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 938628028..8215a066c 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.29 2022/08/13 23:24:22 tom Exp $
-.TH curs_window 3X 2022-08-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.32 2023/07/01 15:46:10 tom Exp $
+.TH curs_window 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -79,7 +79,6 @@
 \fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
 .br
 \fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
-.br
 .SH DESCRIPTION
 .SS newwin
 Calling \fBnewwin\fP creates and returns a pointer to a new window with the
@@ -125,20 +124,17 @@ wtimeout
 .RE
 .ad
 .SS delwin
-.PP
 Calling \fBdelwin\fP deletes the named window, freeing all memory
 associated with it (it does not actually erase the window's screen
 image).
 Subwindows must be deleted before the main window can be deleted.
 .SS mvwin
-.PP
 Calling \fBmvwin\fP moves the window so that the upper left-hand
 corner is at position (\fIx\fP, \fIy\fP).
 If the move would cause the window to be off the screen,
 it is an error and the window is not moved.
 Moving subwindows is allowed, but should be avoided.
 .SS subwin
-.PP
 Calling \fBsubwin\fP creates and returns a pointer to a new window
 with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
 The window is at position (\fIbegin\fR_\fIy\fP,
@@ -150,7 +146,6 @@ When using this routine, it is necessary to call
 \fBtouchwin\fP or \fBtouchline\fP on \fIorig\fP before calling
 \fBwrefresh\fP on the subwindow.
 .SS derwin
-.PP
 Calling \fBderwin\fP is the same as calling \fBsubwin,\fP except that
 \fIbegin\fR_\fIy\fP and \fIbegin\fR_\fIx\fP are relative to the origin
 of the window \fIorig\fP rather than the screen.
@@ -163,23 +158,19 @@ This routine is used to display different
 parts of the parent window at the same physical position on the
 screen.
 .SS dupwin
-.PP
 Calling \fBdupwin\fP creates an exact duplicate of the window \fIwin\fP.
 .SS wsyncup
-.PP
 Calling \fBwsyncup\fP touches all locations in ancestors of \fIwin\fP that are
 changed in \fIwin\fP.
 If \fBsyncok\fP is called with second argument
 \fBTRUE\fP then \fBwsyncup\fP is called automatically whenever there is a
 change in the window.
 .SS wsyncdown
-.PP
 The \fBwsyncdown\fP routine touches each location in \fIwin\fP that has been
 touched in any of its ancestor windows.
 This routine is called by
 \fBwrefresh\fP, so it should almost never be necessary to call it manually.
 .SS wcursyncup
-.PP
 The routine \fBwcursyncup\fP updates the current cursor position of all the
 ancestors of the window to reflect the current cursor position of the
 window.
diff --git a/man/form.3x b/man/form.3x
index 044a1867b..15feb311b 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.39 2021/12/25 21:49:32 tom Exp $
-.TH form 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.42 2023/07/01 15:46:10 tom Exp $
+.TH form 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,7 +42,6 @@
 \fBform\fP \- curses extension for programming forms
 .SH SYNOPSIS
 \fB#include <form.h>\fP
-.br
 .SH DESCRIPTION
 The \fBform\fP library provides terminal-independent facilities for composing
 form screens on character-cell terminals.
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index 0addc11e6..338fc902f 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,15 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
-.TH form_cursor 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.21 2023/07/01 15:46:10 tom Exp $
+.TH form_cursor 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \- position a form window cursor
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
 \fBint pos_form_cursor(FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBpos_form_cursor\fP restores the cursor to the position required
 for the forms driver to continue processing requests.
diff --git a/man/form_data.3x b/man/form_data.3x
index 7b904312d..ce4287549 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_data 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH form_data 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \- test for off-screen data in given forms
@@ -39,7 +39,6 @@
 \fBbool data_ahead(const FORM *\fIform\fB);\fR
 .br
 \fBbool data_behind(const FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBdata_ahead\fP tests whether there is off-screen data
 ahead in the given form.
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 5681bf86e..3863387c0 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.40 2022/02/12 20:03:40 tom Exp $
-.TH form_driver 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.43 2023/07/01 15:46:10 tom Exp $
+.TH form_driver 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,7 +42,6 @@
 \fBint form_driver(FORM *\fIform\fB, int \fIc\fB);\fR
 .br
 \fBint form_driver_w(FORM *\fIform\fB, int \fIc\fB, wchar_t \fIwch\fB);\fR
-.br
 .SH DESCRIPTION
 .SS form_driver
 Once a form has been posted (displayed), you should funnel input events to it
@@ -59,7 +58,6 @@ checked according to the program's locale settings.
 .bP
 The input is the KEY_MOUSE special key associated with an mouse event.
 .SS form_driver_w
-.PP
 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 \fBget_wch\fP(3X).
@@ -67,7 +65,6 @@ The type must be passed as well,
 to enable the library to determine whether the parameter
 is a wide character or a request.
 .SS Form-driver requests
-.PP
 The form driver requests are as follows:
 .TS
 l l
@@ -147,7 +144,6 @@ 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:
@@ -167,7 +163,6 @@ 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
 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
@@ -215,7 +210,6 @@ If you clicked outside the user window
 or the mouse event could not be translated
 into a form request an \fBE_REQUEST_DENIED\fP is returned.
 .SS Application-defined commands
-.PP
 If the second argument is neither printable nor one of the above
 pre-defined form requests, the driver assumes it is an application-specific
 command and returns \fBE_UNKNOWN_COMMAND\fP.  Application-defined commands
diff --git a/man/form_field.3x b/man/form_field.3x
index d790504ba..3161de5be 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_field 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH form_field 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_field\fP \- make and break connections between fields and forms
 .SH SYNOPSIS
@@ -42,7 +42,6 @@
 \fBint field_count(const FORM *\fIform\fB);\fR
 .br
 \fBint move_field(FIELD *\fIfield\fB, int \fIfrow\fB, int \fIfcol\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_form_fields\fP changes the field pointer array of
 the given \fIform\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index 968b22336..6cae1f373 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_field_attributes 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_attributes.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH form_field_attributes 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -50,7 +50,6 @@
 \fBint set_field_pad(FIELD *\fIfield\fB, int \fIpad\fB);\fR
 .br
 \fBint field_pad(const FIELD *\fIfield\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_field_fore\fP sets the foreground attribute of
 \fIfield\fP. This is the highlight used to display the field contents.  The
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 4fede081c..8a484a1c5 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
-.TH form_field_buffer 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.34 2023/07/01 15:46:10 tom Exp $
+.TH form_field_buffer 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -52,7 +52,6 @@
 \fBbool field_status(const FIELD *\fIfield\fB);\fR
 .sp
 \fBint set_max_field(FIELD *\fIfield\fB, int \fImax\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_field_buffer\fP sets the numbered buffer of the given field
 to contain a given string:
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index cf3ccfe6c..6cd1f327f 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_field_just 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_just.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH form_field_just 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -43,7 +43,6 @@
 \fBint set_field_just(FIELD *\fIfield\fB, int \fIjustification\fB);\fR
 .br
 \fBint field_just(const FIELD *\fIfield\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_field_just\fP sets the justification attribute of
 a field; \fBfield_just\fP returns a field's justification attribute.
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 7224622f4..4c9efcab5 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.28 2022/02/12 20:03:40 tom Exp $
-.TH form_field_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.31 2023/07/01 15:46:10 tom Exp $
+.TH form_field_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
@@ -47,7 +47,6 @@
 \fBFIELD *link_field(FIELD *\fIfield\fB, int \fItoprow\fB, int \fIleftcol\fB);\fR
 .br
 \fBint free_field(FIELD *\fIfield\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBnew_field\fP allocates a new field and initializes it from the
 parameters given: height, width, row of upper-left corner, column of upper-left
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index aee8a96aa..3edac10d3 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
-.TH form_field_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.34 2023/07/01 15:46:10 tom Exp $
+.TH form_field_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
@@ -45,7 +45,6 @@
 \fBint field_opts_on(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
 .br
 \fBint field_opts_off(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_field_opts\fP sets all the given field's option bits (field
 option bits may be logically-OR'ed together).
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 51107d858..f46abec97 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.37 2022/02/12 20:03:40 tom Exp $
-.TH form_field_validation 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.40 2023/07/01 15:46:10 tom Exp $
+.TH form_field_validation 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -63,7 +63,6 @@
 \fBFIELDTYPE *TYPE_REGEXP;\fP
 .br
 \fBFIELDTYPE *TYPE_IPV4;\fP
-.br
 .SH DESCRIPTION
 By default, no validation is done on form fields.
 You can associate a form with with a \fIfield type\fP,
@@ -84,7 +83,6 @@ via arguments which the caller provides when calling \fBset_field_type\fP.
 .PP
 Several field types are predefined by the form library.
 .SS Predefined types
-.PP
 It is possible to set up new programmer-defined field types.
 Field types are implemented via the \fBFIELDTYPE\fP data
 structure, which contains several pointers to functions.
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 71221e05b..730ebc910 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,12 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.32 2022/02/12 20:03:40 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.35 2023/07/01 15:46:10 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH form_fieldtype 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.TH form_fieldtype 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_fieldtype\fP \- define validation-field types
 .SH SYNOPSIS
@@ -82,11 +82,9 @@ This function validates input characters as they are entered.
 The form library passes it the character to be checked
 and a pointer to an argument-block structure.
 .SS free_fieldtype
-.PP
 The \fBfree_fieldtype\fP function
 frees the space allocated for a given validation type by \fBnew_fieldtype\fP.
 .SS set_fieldtype_arg
-.PP
 The function \fBset_fieldtype_arg\fP associates
 three storage-management functions with a field type:
 .TP 5
@@ -109,7 +107,6 @@ In this case, the form library assumes
 that \fImake_arg\fP does not allocate memory but simply loads the
 argument into a single scalar value.
 .SS set_fieldtype_choice
-.PP
 The form driver requests \fBREQ_NEXT_CHOICE\fP and \fBREQ_PREV_CHOICE\fP assume
 that the possible values of a field form an ordered set, and provide the forms
 user with a way to move through the set.
@@ -120,7 +117,6 @@ for the field type.
 These functions take the field pointer and an
 argument-block structure as arguments.
 .SS link_fieldtype
-.PP
 The function \fBlink_fieldtype\fP creates
 a new field type from the two given types.
 They are connected by an logical 'OR'.
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 733c2f609..010d48e18 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_hook 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
+.TH form_hook 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
@@ -50,7 +50,6 @@
 \fBint set_form_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
 .br
 \fBForm_Hook form_term(const FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBform_driver\fP.
diff --git a/man/form_new.3x b/man/form_new.3x
index 78f955648..fae1f0b05 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
-.TH form_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH form_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \- create and destroy forms
@@ -39,7 +39,6 @@
 \fBFORM *new_form(FIELD **\fIfields\fB);\fR
 .br
 \fBint free_form(FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBnew_form\fP creates a new form connected to a specified field
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 083d6b4bf..7f41c2f9b 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_new_page 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_new_page.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH form_new_page 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -43,7 +43,6 @@
 \fBint set_new_page(FIELD *\fIfield\fB, bool \fInew_page_flag\fB);\fR
 .br
 \fBbool new_page(const FIELD *\fIfield\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_new_page\fP sets or resets a flag marking the given field
 as the beginning of a new page on its form.
diff --git a/man/form_opts.3x b/man/form_opts.3x
index ebcf5af3e..f108605ad 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
-.TH form_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH form_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
@@ -45,7 +45,6 @@
 \fBint form_opts_on(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
 .br
 \fBint form_opts_off(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_form_opts\fP sets all the given form's option bits (form
 option bits may be logically-OR'ed together).
diff --git a/man/form_page.3x b/man/form_page.3x
index 94f29c918..36d0b1d87 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.23 2022/02/12 20:03:40 tom Exp $
-.TH form_page 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
+.TH form_page 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \- set and get form page number
 .SH SYNOPSIS
@@ -46,7 +46,6 @@
 \fBint form_page(const FORM *\fIform\fB);\fR
 .sp
 \fBint field_index(const FIELD *\fIfield\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_current_field\fP sets the current field of the given
 form; \fBcurrent_field\fP returns the current field of the given form.
diff --git a/man/form_post.3x b/man/form_post.3x
index 269cb183a..e7e6733fb 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_post 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
+.TH form_post 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \- write or erase forms from associated subwindows
@@ -39,7 +39,6 @@
 \fBint post_form(FORM *\fIform\fB);\fR
 .br
 \fBint unpost_form(FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBpost_form\fP displays a form to its associated subwindow.
 To trigger physical display of the subwindow,
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 8f73c9007..df2245029 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_requestname 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
+.TH form_requestname 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \- handle printable form request names
@@ -39,7 +39,6 @@
 \fBconst char *form_request_name(int \fIrequest\fB);\fR
 .br
 \fBint form_request_by_name(const char *\fIname\fB);\fR
-.br
 .SH DESCRIPTION
 .SS form_request_name
 The function \fBform_request_name\fP returns the printable name of a form
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 6f41f8bc7..d424dc58a 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.23 2022/02/12 20:03:40 tom Exp $
-.TH form_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
+.TH form_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \- associate application data with a form item
@@ -39,7 +39,6 @@
 \fBint set_form_userptr(FORM *\fIform\fB, void *\fIuserptr\fB);\fR
 .br
 \fBvoid* form_userptr(const FORM *\fIform\fB);\fR
-.br
 .SH DESCRIPTION
 Every form and every form item has a field that can be used to hold
 application-specific data (that is, the form-driver code leaves it alone).
diff --git a/man/form_win.3x b/man/form_win.3x
index 11e92f907..ba9e3687c 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_win 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH form_win 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_win\fP \- make and break form window and subwindow associations
 .SH SYNOPSIS
@@ -44,7 +44,6 @@
 \fBWINDOW *form_sub(const FORM *\fIform\fB);\fR
 .sp
 \fBint scale_form(const FORM *\fIform\fB, int *\fIrows\fB, int *\fIcolumns\fB);\fR
-.br
 .SH DESCRIPTION
 Every form has an associated pair of \fBcurses\fP windows.
 The form window
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 89f5dfbbe..c34f2f593 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.84 2023/06/17 17:50:37 tom Exp $
-.TH @INFOCMP@ 1M 2023-06-17 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.86 2023/07/01 14:31:54 tom Exp $
+.TH @INFOCMP@ 1M 2023-07-01 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -85,11 +85,8 @@ t\
 u\
 x\
 \fP]
-.br
       [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fBsubset\fR]
-.br
       [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
-.br
       [\fItermname\fP...]
 .SH DESCRIPTION
 \fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
diff --git a/man/menu.3x b/man/menu.3x
index 8e099e6dc..48a37db37 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
-.TH menu 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.33 2023/07/01 15:46:10 tom Exp $
+.TH menu 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,7 +42,6 @@
 \fBmenu\fP \- curses extension for programming menus
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
-.br
 .SH DESCRIPTION
 The \fBmenu\fP library provides terminal-independent facilities for composing
 menu systems on character-cell terminals.
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 513c07ac4..dac377dd3 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.23 2022/02/12 20:05:11 tom Exp $
-.TH menu_attributes 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_attributes.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
+.TH menu_attributes 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -61,7 +61,6 @@
 \fBint set_menu_pad(MENU *\fImenu\fB, int \fIpad\fB);\fR
 .br
 \fBint menu_pad(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_menu_fore\fP sets the foreground attribute of
 \fImenu\fP. This is the highlight used for selected menu items.
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index eeb9665c7..eea54c6d9 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,15 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.17 2022/02/12 20:05:11 tom Exp $
-.TH menu_cursor 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.20 2023/07/01 15:46:10 tom Exp $
+.TH menu_cursor 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \- position a menu's cursor
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
 \fBint pos_menu_cursor(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBpos_menu_cursor\fP restores the cursor to the current position
 associated with the menu's selected item.
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 585ab287c..7709952ff 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
-.TH menu_driver 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.35 2023/07/01 15:46:10 tom Exp $
+.TH menu_driver 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -39,7 +39,6 @@
 \fB#include <menu.h>\fP
 .sp
 \fBint menu_driver(MENU *\fImenu\fB, int \fIc\fB);\fR
-.br
 .SH DESCRIPTION
 Once a menu has been posted (displayed), you should funnel input events to it
 through \fBmenu_driver\fP.  This routine has three major input cases:
@@ -117,7 +116,6 @@ If there is no such match, \fBmenu_driver\fP returns
 If the second argument is one of the above pre-defined requests, the
 corresponding action is performed.
 .SS MOUSE HANDLING
-.PP
 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
@@ -158,7 +156,6 @@ If you clicked outside the user window
 or the mouse event could not be translated
 into a menu request an \fBE_REQUEST_DENIED\fP is returned.
 .SS APPLICATION-DEFINED COMMANDS
-.PP
 If the second argument is neither printable nor one of the above
 pre-defined menu requests or KEY_MOUSE,
 the drive assumes it is an application-specific
diff --git a/man/menu_format.3x b/man/menu_format.3x
index aade628a5..0d5ab6ae1 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
-.TH menu_format 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH menu_format 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \- set and get menu sizes
@@ -39,7 +39,6 @@
 \fBint set_menu_format(MENU *\fImenu\fB, int \fIrows\fB, int \fIcols\fB);\fR
 .br
 \fBvoid menu_format(const MENU *\fImenu\fB, int *\fIrows\fB, int *\fIcols\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_menu_format\fP sets the maximum display size of the given
 menu.
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 374b31b05..3d0533c60 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.19 2022/02/12 20:05:11 tom Exp $
-.TH menu_hook 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH menu_hook 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \- set hooks for automatic invocation by applications
 .SH SYNOPSIS
@@ -50,7 +50,6 @@
 \fBint set_menu_term(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
 .br
 \fBMenu_Hook menu_term(const MENU *\fImenu);\fR
-.br
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBmenu_driver\fP.
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 10722bbe3..056b22b86 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
-.TH menu_items 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH menu_items 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
@@ -42,7 +42,6 @@
 \fBITEM **menu_items(const MENU *\fImenu\fB);\fR
 .br
 \fBint item_count(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_menu_items\fP changes the item pointer array of the given
 \fImenu\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 6dc035f92..f3afa95ec 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
-.TH menu_mark 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH menu_mark 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \- get and set the menu mark string
@@ -39,7 +39,6 @@
 \fBint set_menu_mark(MENU *\fImenu\fB, const char *\fImark\fB);\fR
 .br
 \fBconst char *menu_mark(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 In order to make menu selections visible on older terminals without
 highlighting or color capability, the menu library marks selected items
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 877994bc3..bd3800a4b 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
-.TH menu_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH menu_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \- create and destroy menus
@@ -39,7 +39,6 @@
 \fBMENU *new_menu(ITEM **\fIitems\fB);\fR
 .br
 \fBint free_menu(MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBnew_menu\fP creates a new menu connected to a specified item
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index f2e4e69db..2ed1a8267 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
-.TH menu_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH menu_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
@@ -45,7 +45,6 @@
 \fBint menu_opts_on(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
 .br
 \fBint menu_opts_off(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index 327204054..1e3c0a878 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.25 2022/02/12 20:02:20 tom Exp $
-.TH menu_pattern 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.28 2023/07/01 15:46:10 tom Exp $
+.TH menu_pattern 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \- set and get a menu's pattern buffer
@@ -38,7 +38,6 @@
 \fBint set_menu_pattern(MENU *\fImenu\fB, const char *\fIpattern\fB);\fR
 .br
 \fBchar *menu_pattern(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 Every menu has an associated pattern match buffer.
 As input events that are
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 31805d0a3..ba618f525 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
-.TH menu_post 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
+.TH menu_post 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \- write or erase menus from associated subwindows
@@ -39,7 +39,6 @@
 \fBint post_menu(MENU *\fImenu\fB);\fR
 .br
 \fBint unpost_menu(MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBpost_menu\fP displays a menu to its associated subwindow.
 To
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 22f75e886..c2ffc617c 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
-.TH menu_requestname 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH menu_requestname 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \- handle printable menu request names
@@ -39,7 +39,6 @@
 \fBconst char *menu_request_name(int \fIrequest\fB);\fR
 .br
 \fBint menu_request_by_name(const char *\fIname\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBmenu_request_name\fP returns the printable name of a menu
 request code.
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 7f1aefaae..8c5ef7474 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH menu_spacing 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH menu_spacing 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \- set and get spacing between menu items.
@@ -45,7 +45,6 @@
                  \fBint* \fIspc_description\fB,\fR
                  \fBint* \fIspc_rows\fB,\fR
                  \fBint* \fIspc_columns\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_menu_spacing\fP sets the spacing information for the menu.
 Its parameter \fBspc_description\fP controls the number of spaces
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 83e67ef8a..36bf47f42 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
-.TH menu_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
+.TH menu_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \- associate application data with a menu item
@@ -39,7 +39,6 @@
 \fBint set_menu_userptr(MENU *\fImenu\fB, void *\fIuserptr\fB);\fR
 .br
 \fBvoid *menu_userptr(const MENU *\fImenu\fB);\fR
-.br
 .SH DESCRIPTION
 Every menu and every menu item has a field that can be used to hold
 application-specific data (that is, the menu-driver code leaves it alone).
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 016c53042..af95f3b2f 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
-.TH menu_win 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH menu_win 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_win\fP \- make and break menu window and subwindow associations
 .SH SYNOPSIS
@@ -44,7 +44,6 @@
 \fBWINDOW *menu_sub(const MENU *\fImenu\fB);\fR
 .sp
 \fBint scale_menu(const MENU *\fImenu, int *\fIrows\fB, int *\fIcolumns);\fR
-.br
 .SH DESCRIPTION
 Every menu has an associated pair of \fBcurses\fP windows.
 The menu window
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index ba87410ca..6cac7496b 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.24 2022/02/12 20:02:20 tom Exp $
-.TH mitem_current 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.27 2023/07/01 15:46:10 tom Exp $
+.TH mitem_current 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_current\fP \- set and get current_menu_item
 .SH SYNOPSIS
@@ -44,7 +44,6 @@
 \fBint top_row(const MENU *\fImenu\fB);\fR
 .sp
 \fBint item_index(const ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_current_item\fP sets the current item (the item on which
 the menu cursor is positioned).
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index c96213658..362a076f3 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
-.TH mitem_name 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.21 2023/07/01 15:46:10 tom Exp $
+.TH mitem_name 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \- get menu item name and description fields
@@ -39,7 +39,6 @@
 \fBconst char *item_name(const ITEM *\fIitem\fB);\fR
 .br
 \fBconst char *item_description(const ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBitem_name\fP returns the name part of the given item.
 .br
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 89882e150..f75553746 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
-.TH mitem_new 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
+.TH mitem_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \- create and destroy menu items
@@ -39,7 +39,6 @@
 \fBITEM *new_item(const char *\fIname\fB, const char *\fIdescription\fB);\fR
 .br
 \fBint free_item(ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBnew_item\fP allocates a new item and initializes it from the
 \fBname\fP and \fBdescription\fP pointers.
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 51e33e82c..485dc9e14 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
-.TH mitem_opts 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
+.TH mitem_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
@@ -45,7 +45,6 @@
 \fBint item_opts_on(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
 .br
 \fBint item_opts_off(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
-.br
 .SH DESCRIPTION
 The function \fBset_item_opts\fP sets all the given item's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index df779da70..76848812a 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH mitem_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH mitem_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \- associate application data with a menu item
@@ -39,7 +39,6 @@
 \fBint set_item_userptr(ITEM *\fIitem\fB, void *\fIuserptr\fB);\fR
 .br
 \fBvoid *item_userptr(const ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 Every menu item has a field that can be used to hold application-specific data
 (that is, the menu-driver code leaves it alone).
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 7d8123224..15751e74a 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
-.TH mitem_value 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
+.TH mitem_value 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \- set and get menu item values
@@ -38,7 +38,6 @@
 \fBint set_item_value(ITEM *\fIitem\fB, bool \fIvalue\fB);\fR
 .br
 \fBbool item_value(const ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 If you turn off the menu option \fBO_ONEVALUE\fP (e.g., with
 \fBset_menu_opts\fP or \fBmenu_opts_off\fP; see \fBmenu_opts\fP(3X)), the menu
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 518a460a5..865a9d9d1 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998,2010 Free Software Foundation, Inc.                       *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,15 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
-.TH mitem_visible 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.17 2023/07/01 15:46:10 tom Exp $
+.TH mitem_visible 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_visible\fP \- check visibility of a menu item
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
 \fBbool item_visible(const ITEM *\fIitem\fB);\fR
-.br
 .SH DESCRIPTION
 A menu item is visible when it is in the portion of a posted menu that
 is mapped onto the screen (if the menu is scrollable, in particular, this
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 038083967..3b697d971 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,9 +28,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.159 2023/06/17 17:50:37 tom Exp $
+.\" $Id: ncurses.3x,v 1.162 2023/07/01 15:21:06 tom Exp $
 .hy 0
-.TH ncurses 3X 2023-06-17 "ncurses 6.4" "Library calls"
+.TH ncurses 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -59,7 +59,6 @@
 \fBncurses\fP \- CRT screen handling and optimization package
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.br
 .SH DESCRIPTION
 The \fBncurses\fP library routines give the user a terminal-independent method
 of updating character screens with reasonable optimization.
@@ -99,7 +98,6 @@ terminal and \fBcurses\fP input and output options; environment query
 routines; color manipulation; use of soft label keys; terminfo capabilities;
 and access to low-level terminal-manipulation routines.
 .SS Initialization
-.PP
 The library uses the locale which the calling program has initialized.
 That is normally done with \fBsetlocale\fP(3):
 .NS
@@ -138,7 +136,6 @@ after the shell environment variable \fBTERM\fP has been exported.
 \fB@TSET@(1)\fP is usually responsible for doing this.
 [See \fBterminfo\fP(\*n) for further details.]
 .SS Datatypes
-.PP
 The \fBncurses\fP library permits manipulation of data structures,
 called \fIwindows\fP, which can be thought of as two-dimensional
 arrays of characters representing all or part of a CRT screen.
@@ -188,7 +185,6 @@ The video attributes, line
 drawing characters, and input values use names, defined in \fB<curses.h>\fP,
 such as \fBA_REVERSE\fP, \fBACS_HLINE\fP, and \fBKEY_LEFT\fP.
 .SS Environment variables
-.PP
 If the environment variables \fBLINES\fP and \fBCOLUMNS\fP are set, or if the
 program is executing in a window environment, line and column information in
 the environment will override information read by \fIterminfo\fP.
@@ -315,7 +311,6 @@ There is a naming convention which relates many of the normal/wide variants:
 a \*(``_w\*('' is inserted into the name.
 For example, \fBwaddch\fP becomes \fBwadd_wch\fP.
 .RE
-.PP
 .\"
 .SS Routine Name Index
 The following table lists the \fBcurses\fP routines provided in
@@ -818,12 +813,10 @@ are provided both as macros and functions.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .SH ENVIRONMENT
-.PP
 The following environment symbols are useful for customizing the
 runtime behavior of the \fBncurses\fP library.
 The most important ones have been already discussed in detail.
 .SS CC command-character
-.PP
 When set, change occurrences of the command_character
 (i.e., the \fBcmdch\fP capability)
 of the loaded terminfo entries to the value of this variable.
@@ -833,7 +826,6 @@ Because this name is also used in development environments to represent
 the C compiler's name, \fBncurses\fP ignores it if it does not happen to
 be a single character.
 .SS BAUDRATE
-.PP
 The debugging library checks this environment variable when the application
 has redirected output to a file.
 The variable's numeric value is used for the baudrate.
@@ -841,7 +833,6 @@ If no value is found, \fBncurses\fP uses 9600.
 This allows testers to construct repeatable test-cases
 that take into account costs that depend on baudrate.
 .SS COLUMNS
-.PP
 Specify the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
@@ -867,7 +858,6 @@ Use the \fBuse_env\fP function to disable all use of external environment
 Use the \fBuse_tioctl\fP function to update \fBCOLUMNS\fP or \fBLINES\fP
 to match the screen size obtained from system calls or the terminal database.
 .SS ESCDELAY
-.PP
 Specifies the total time, in milliseconds, for which ncurses will
 await a character sequence, e.g., a function key.
 The default value, 1000 milliseconds, is enough for most uses.
@@ -899,11 +889,9 @@ $HOME/.termcap
 $HOME/.terminfo
 .NE
 .SS LINES
-.PP
 Like COLUMNS, specify the height of the screen in characters.
 See COLUMNS for a detailed description.
 .SS MOUSE_BUTTONS_123
-.PP
 This applies only to the OS/2 EMX port.
 It specifies the order of buttons on the mouse.
 OS/2 numbers a 3-button mouse inconsistently from other
@@ -920,7 +908,6 @@ This variable lets you customize the mouse.
 The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
 If it is not specified, \fBncurses\fP uses 132.
 .SS NCURSES_ASSUMED_COLORS
-.PP
 Override the compiled-in assumption that the
 terminal's default colors are white-on-black
 (see \fBdefault_colors\fP(3X)).
@@ -941,7 +928,6 @@ mapping coordinates,
 explicitly saving and restoring the original screen contents.
 Setting the environment variable \fBNCGDB\fP has the same effect.
 .SS NCURSES_GPM_TERMS
-.PP
 This applies only to ncurses configured to use the GPM interface.
 .PP
 If present,
@@ -953,20 +939,17 @@ using the built-in support for xterm, etc.
 If the environment variable is absent,
 ncurses will attempt to open GPM if \fBTERM\fP contains \*(``linux\*(''.
 .SS NCURSES_NO_HARD_TABS
-.PP
 \fBNcurses\fP may use tabs as part of the cursor movement optimization.
 In some cases,
 your terminal driver may not handle these properly.
 Set this environment variable to disable the feature.
 You can also adjust your \fBstty\fP(1) settings to avoid the problem.
 .SS NCURSES_NO_MAGIC_COOKIE
-.PP
 Some terminals use a magic-cookie feature which requires special handling
 to make highlighting and other video attributes display properly.
 You can suppress the highlighting entirely for these terminals by
 setting this environment variable.
 .SS NCURSES_NO_PADDING
-.PP
 Most of the terminal descriptions in the terminfo database are written
 for real \*(``hardware\*('' terminals.
 Many people use terminal emulators
@@ -1026,7 +1009,6 @@ As a special case, the low-level calls such as \fBputp\fP still use the
 standard output.
 But high-level curses calls do not.
 .SS NCURSES_NO_UTF8_ACS
-.PP
 During initialization, the \fBncurses\fP library
 checks for special cases where VT100 line-drawing (and the corresponding
 alternate character set capabilities) described in the terminfo are known
@@ -1068,7 +1050,6 @@ The name \*(``U8\*('' is chosen to be two characters,
 to permit it to be used by applications that use ncurses'
 termcap interface.
 .SS NCURSES_TRACE
-.PP
 During initialization, the \fBncurses\fP debugging library
 checks the NCURSES_TRACE environment variable.
 If it is defined, to a numeric value, \fBncurses\fP calls the \fBtrace\fP
@@ -1081,7 +1062,6 @@ file \fBtrace\fP to the current directory.
 .PP
 See \fBcurs_trace\fP(3X) for more information.
 .SS TERM
-.PP
 Denotes your terminal type.
 Each terminal type is distinct, though many are similar.
 .PP
@@ -1111,7 +1091,6 @@ the \fBTERM\fP environment variable exists.
 In either case, setting it directs \fBncurses\fP to ignore
 the usual place for this information, e.g., /etc/termcap.
 .SS TERMINFO
-.PP
 \fBncurses\fP can be configured to read from multiple terminal databases.
 The \fBTERMINFO\fP variable overrides the location for
 the default terminal database.
@@ -1181,9 +1160,7 @@ ncurses library, i.e.,
 @TERMINFO@ (corresponding to the TERMINFO variable)
 .RE
 .RE
-.PP
 .SS TERMINFO_DIRS
-.PP
 Specifies a list of locations to search for terminal descriptions.
 Each location in the list is a terminal database as described in
 the section on the \fBTERMINFO\fP variable.
@@ -1192,7 +1169,6 @@ The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 There is no corresponding feature in System V terminfo;
 it is an extension developed for \fBncurses\fP.
 .SS TERMPATH
-.PP
 If \fBTERMCAP\fP does not hold a file name then \fBncurses\fP checks
 the \fBTERMPATH\fP environment variable.
 This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
@@ -1213,7 +1189,6 @@ setgid permissions:
 $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
 .NE
 .SH ALTERNATE CONFIGURATIONS
-.PP
 Several different configurations are possible,
 depending on the configure script options used when building \fBncurses\fP.
 There are a few main options whose effects are visible to the applications
@@ -1398,7 +1373,6 @@ A small number of local differences (that is, individual differences between
 the XSI Curses and \fBncurses\fP calls) are described in \fBPORTABILITY\fP
 sections of the library man pages.
 .SS Error checking
-.PP
 In many cases, X/Open Curses is vague about error conditions,
 omitting some of the SVr4 documentation.
 .PP
@@ -1411,7 +1385,6 @@ to tell an application which of several possible errors were detected.
 Relying on this (or some other) extension will adversely affect the
 portability of curses applications.
 .SS Extensions versus portability
-.PP
 Most of the extensions provided by ncurses have not been standardized.
 Some have been incorporated into other implementations, such as
 PDCurses or NetBSD curses.
@@ -1446,7 +1419,6 @@ This implementation can also be configured to provide a set of functions which
 improve the ability to manage multiple screens.
 See \fBcurs_sp_funcs\fP(3X) for details.
 .SS Padding differences
-.PP
 In historic curses versions, delays embedded in the capabilities \fBcr\fP,
 \fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
 bits in the UNIX tty driver.
@@ -1550,7 +1522,6 @@ to include <stdarg.h> before <curses.h> because they either
 have allowed for a special type, or (like ncurses) include <stdarg.h>
 directly to provide a portable interface.
 .SH NOTES
-.PP
 If standard output from a \fBncurses\fP program is re-directed to something
 which is not a tty, screen updates will be directed to standard error.
 This was an undocumented feature of AT&T System V Release 3 curses.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index bb49dea44..036a8a298 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.21 2023/06/17 17:50:37 tom Exp $
-.TH new_pair 3X 2023-06-17 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH new_pair 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -141,7 +141,6 @@ Otherwise it returns \-1.
 Marks the given color pair as unused,
 i.e., like color pair 0.
 .SH RETURN VALUE
-.PP
 The \fBalloc_pair\fP function returns a color pair number in the range
 1 through \fBCOLOR_PAIRS\fP\-1, unless it encounters an error updating
 its fast index to the color pair values, preventing it from allocating
diff --git a/man/panel.3x b/man/panel.3x
index b3d2d44ac..58600f028 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.43 2022/02/12 20:03:40 tom Exp $
-.TH panel 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.46 2023/07/01 15:46:10 tom Exp $
+.TH panel 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -228,7 +228,6 @@ In your library list, libpanel.a should be before libncurses.a; that is,
 you should say \*(``\-lpanel \-lncurses\*('', not the other way around
 (which would give a link-error with static libraries).
 .SH PORTABILITY
-.PP
 The panel facility was documented in SVr4.2 in
 \fICharacter User Interface Programming (UNIX SVR4.2)\fP.
 .PP
@@ -256,7 +255,6 @@ NetBSD 8 (2018)
 has a panel library begun by Valery Ushakov in 2015.
 This is based on the AT&T documentation.
 .SH FILES
-.P
 panel.h
 interface for the panels library
 .P
@@ -269,7 +267,6 @@ the panels library itself
 This describes \fBncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SH AUTHOR
-.PP
 Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,
 primarily to assist in porting \fIu386mon\fP to systems without a native
 panels library.
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 4d7638982..3830c92eb 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.33 2022/02/20 00:32:18 tom Exp $
-.TH resizeterm 3X 2022-02-19 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.36 2023/07/01 15:46:10 tom Exp $
+.TH resizeterm 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -48,7 +48,6 @@
 .br
 \fBint resizeterm(int \fIlines\fB, int \fIcolumns\fB);\fR
 .SH DESCRIPTION
-.PP
 This is an extension to the curses library.
 It provides callers with a hook into the \fBncurses\fP data to resize windows,
 primarily for use by programs running in an X Window terminal (e.g., xterm)
@@ -84,14 +83,12 @@ can call \fBresizeterm\fP, but in that case, the library will not
 see \fBSIGWINCH\fP, and proper layout will rely upon the application.
 .SH FUNCTIONS
 .SS resizeterm
-.PP
 The function \fBresizeterm\fP resizes the standard and current windows
 (i.e., \fBstdscr\fP and \fBcurscr\fP)
 to the specified dimensions, and adjusts other bookkeeping data used by
 the \fBncurses\fP library that record the window dimensions
 such as the \fBLINES\fP and \fBCOLS\fP variables.
 .SS resize_term
-.PP
 Most of the work for \fBresizeterm\fP is
 done by the inner function \fBresize_term\fP.
 The outer function \fBresizeterm\fP adds bookkeeping
@@ -116,7 +113,6 @@ then on resizing the window, \fBresize_term\fP will keep the window
 extending to the corresponding limit, regardless of whether the
 screen has shrunk or grown.
 .SS is_term_resized
-.PP
 A support function \fBis_term_resized\fP is provided so that applications
 can check if the \fBresize_term\fP function would modify the window structures.
 It returns \fBTRUE\fP if the windows would be modified,
@@ -161,7 +157,6 @@ the operating system.
 Thus, even if a \fBSIGWINCH\fP is received,
 no screen size change may be recorded.
 .SH PORTABILITY
-.PP
 It is possible to resize the screen with SVr4 curses,
 by
 .bP
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index df4f67269..cd8f741dc 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.22 2023/06/17 17:50:37 tom Exp $
-.TH scr_dump 5 2023-06-17 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp $
+.TH scr_dump 5 2023-07-01 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -56,7 +56,6 @@ scr_dump \- format of curses screen-dumps.
 .SH SYNOPSIS
 .B scr_dump
 .SH DESCRIPTION
-.PP
 The curses library provides applications with the ability to write the
 contents of a window to an external file using \fBscr_dump\fP or \fBputwin\fP,
 and read it back using \fBscr_restore\fP or \fBgetwin\fP.
@@ -65,7 +64,6 @@ The \fBputwin\fP and \fBgetwin\fP functions do the work;
 while \fBscr_dump\fP and \fBscr_restore\fP conveniently save and restore
 the whole screen, i.e., \fBstdscr\fP.
 .SS ncurses6
-.PP
 A longstanding implementation of screen-dump was
 revised with ncurses6 to remedy problems with the earlier approach:
 .bP
@@ -112,7 +110,6 @@ because the library truncates or fills the screen as necessary.
 .bP
 The ncurses6 \fBgetwin\fP reads the legacy screen dumps from ncurses5.
 .SS ncurses5 (legacy)
-.PP
 The screen-dump feature was added to ncurses in June 1995.
 While there were fixes and improvements in succeeding years,
 the basic scheme was unchanged:
@@ -129,11 +126,9 @@ and adjust the \fBWINDOW\fP structure which was read back into memory.
 This is similar to Unix SystemV,
 but does not write a \*(``magic number\*('' to identify the file format.
 .SH PORTABILITY
-.PP
 There is no standard format for \fBputwin\fP.
 This section gives a brief description of the existing formats.
 .SS X/Open Curses
-.PP
 Refer to \fIX/Open Curses, Issue 7\fP (2009).
 .PP
 X/Open's documentation for \fIenhanced curses\fP says only:
@@ -171,7 +166,6 @@ In the foregoing, emphasis was added to \fBunspecified format\fP
 and to \fBXPG4 or to earlier XPG releases\fP,
 for clarity.
 .SS Unix SystemV
-.PP
 Unix SystemV curses identified the file format by writing a
 \*(``magic number\*('' at the beginning of the dump.
 The \fBWINDOW\fP data and the lines of text follow, all in binary form.
@@ -222,7 +216,6 @@ Solaris 10 (13273 bytes)
 .bP
 ncurses5 (12888 bytes)
 .SS Solaris
-.PP
 As noted above, Solaris curses has no magic number corresponding
 to SVr4 curses.
 This is odd since Solaris was the first operating system
@@ -242,7 +235,6 @@ Unlike ncurses6, the contents of the window are written piecemeal,
 with coordinates and attributes for each chunk of text rather
 than writing the whole window from top to bottom.
 .SS PDCurses
-.PP
 PDCurses added support for screen dumps in version 2.7 (2005).
 Like Unix SystemV and ncurses5,
 it writes the \fBWINDOW\fP structure in binary,
@@ -253,7 +245,6 @@ e.g.,
 	\*(``PDC\\001\*(''
 .NE
 .SS NetBSD
-.PP
 As of April 2017, NetBSD curses does
 not support \fBscr_dump\fP and \fBscr_restore\fP
 (or \fBscr_init\fP, \fBscr_set\fP),
@@ -272,7 +263,6 @@ some data for wide-characters referenced by the \fBWINDOW\fP structure, and
 .bP
 finally, lines as done by other implementations.
 .SH EXAMPLE
-.PP
 Given a simple program which writes text to the screen
 (and for the sake of example, limiting the screen-size to 10x20):
 .NS
@@ -415,11 +405,9 @@ Here is the corresponding dump (using \*(``od -t x1\*(''):
 0002371
 .NE
 .SH SEE ALSO
-.PP
 \fBcurs_scr_dump\fP(3X),
 \fBcurs_util\fP(3X).
 .SH AUTHORS
-.PP
 Thomas E. Dickey
 .br
 extended screen-dump format for ncurses 6.0 (2015)
diff --git a/man/tabs.1 b/man/tabs.1
index 498f3fa73..b834615d2 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.37 2023/06/17 17:50:37 tom Exp $
-.TH @TABS@ 1 2023-06-17 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp $
+.TH @TABS@ 1 2023-07-01 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -57,7 +57,6 @@
 .SH SYNOPSIS
 \fB@TABS@\fP [\fIoptions\fP]] \fI[tabstop-list]\fP
 .SH DESCRIPTION
-.PP
 The \fB@TABS@\fP program clears and sets tab-stops on the terminal.
 This uses the terminfo \fBclear_all_tabs\fP and \fBset_tab\fP capabilities.
 If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops.
@@ -213,7 +212,6 @@ on moving the cursor before the current left-margin.
 When setting or resetting the left-margin,
 @TABS@ may reset the right-margin.
 .SH PORTABILITY
-.PP
 \fIIEEE Std 1003.1/The Open Group Base Specifications Issue 7\fP (POSIX.1-2008)
 describes a \fBtabs\fP utility.
 However
diff --git a/man/term.5 b/man/term.5
index e5dfd8f76..97070a184 100644
--- a/man/term.5
+++ b/man/term.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.45 2023/06/17 17:52:54 tom Exp $
-.TH term 5 2023-06-17 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp $
+.TH term 5 2023-07-01 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -262,7 +262,6 @@ described in \fBterm_variables\fP(3X) which associate the long capability
 names with members of a \fBTERMTYPE\fP structure.
 .
 .SS EXTENDED NUMBER FORMAT
-.PP
 On occasion, 16-bit signed integers are not large enough.
 With \fBncurses\fP 6.1, a new format was introduced by making a few changes
 to the legacy format:
@@ -279,7 +278,6 @@ The library uses a similar but hidden data structure \fBTERMTYPE2\fP
 to provide data for the terminfo functions.
 .SH PORTABILITY
 .SS setupterm
-.PP
 Note that it is possible for
 .B setupterm
 to expect a different set of capabilities
@@ -298,7 +296,6 @@ this is why the numbers and sizes are included.
 Also, new capabilities must always be added at the end of the lists
 of boolean, number, and string capabilities.
 .SS Binary format
-.PP
 X/Open Curses does not specify a format for the terminfo database.
 UNIX System V curses used a directory-tree of binary files,
 one per terminal description.
@@ -322,7 +319,6 @@ The format used by the other Unix versions
 can be matched by building ncurses
 with different configuration options.
 .SS Magic codes
-.PP
 The magic number in a binary terminfo file is the first 16-bits (two bytes).
 Besides making it more reliable for the library to check that a file
 is terminfo,
@@ -332,13 +328,11 @@ with 0433, 0435 as screen-dumps (see \fBscr_dump\fP(5)).
 This implementation uses 01036 as a continuation of that sequence,
 but with a different high-order byte to avoid confusion.
 .SS The TERMTYPE structure
-.PP
 Direct access to the \fBTERMTYPE\fP structure is provided for legacy
 applications.
 Portable applications should use the \fBtigetflag\fP and related functions
 described in \fBcurs_terminfo\fP(3X) for reading terminal capabilities.
 .SS Mixed-case terminal names
-.PP
 A small number of terminal descriptions use uppercase characters in
 their names.
 If the underlying filesystem ignores the difference between
@@ -356,7 +350,7 @@ adm3a|lsi adm3a,
         bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J,
         cuf1=^L, cup=\\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
         home=^^, ind=^J,
-.NS
+.NE
 .PP
 and a hexadecimal dump of the compiled terminal description:
 .NS
@@ -400,7 +394,7 @@ Compiled entries are limited to 32768 bytes because offsets into the
 The legacy format could have supported 32768-byte entries,
 but was limited a virtual memory page's 4096 bytes.
 .SH FILES
-\*d/*/*	compiled terminal capability database
+\*d/*/* compiled terminal capability database
 .SH SEE ALSO
 \fBcurses\fP(3X), \fBterminfo\fP(\*n).
 .SH AUTHORS
diff --git a/man/term.7 b/man/term.7
index 909bbd8cb..6b52ce299 100644
--- a/man/term.7
+++ b/man/term.7
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.32 2021/12/25 17:39:16 tom Exp $
-.TH term 7 2021-12-25 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.35 2023/07/01 15:46:10 tom Exp $
+.TH term 7 2023-07-01 "ncurses 6.4" Miscellaneous
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,7 +38,6 @@
 .SH NAME
 term \- conventions for naming terminal types
 .SH DESCRIPTION
-.PP
 The environment variable \fBTERM\fP should normally contain the type name of
 the terminal, console or display-device type you are using.
 This information
@@ -77,7 +76,7 @@ Terminal type descriptions are stored as files of capability data underneath
 \*d.
 To browse a list of all terminal names recognized by the system, do
 .sp
-	@TOE@ | more
+        @TOE@ | more
 .sp
 from your shell.
 These capability files are in a binary format optimized for
@@ -85,7 +84,7 @@ retrieval speed (unlike the old text-based \fBtermcap\fP format they replace);
 to examine an entry, you must use the \fB@INFOCMP@\fP(1M) command.
 Invoke it as follows:
 .sp
-	@INFOCMP@ \fIentry_name\fP
+        @INFOCMP@ \fIentry_name\fP
 .sp
 where \fIentry_name\fP is the name of the type you wish to examine (and the
 name of its capability file the subdirectory of \*d named for its first
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 9a07869b9..76dc5347e 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.18 2023/01/02 12:17:34 tom Exp $
-.TH term_variables 3X 2023-01-02 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp $
+.TH term_variables 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -146,7 +146,6 @@ On initialization of the curses or terminfo interfaces,
 \fBsetupterm\fP(3X) copies the terminal names to the array \fBttytype\fP.
 .\"
 .SS Terminfo Names
-.PP
 In addition to the variables, \fB<term.h>\fP also defines a symbol for each
 terminfo capability \fIlong name\fP.
 These are in terms of the symbol \fBCUR\fP,
diff --git a/man/terminfo.head b/man/terminfo.head
index a17fa7828..7893a3d54 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp $
-.TH terminfo 5 "" "" "File Formats"
+.\" $Id: terminfo.head,v 1.44 2023/07/01 15:46:56 tom Exp $
+.TH terminfo 5 2023-07-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ds n 5
 .ds d @TERMINFO@
 .ie \n(.g .ds `` \(lq
@@ -78,7 +78,6 @@ specifying padding requirements and initialization sequences.
 This manual describes \fBncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SS Terminfo Entry Syntax
-.PP
 Entries in
 .I terminfo
 consist of a sequence of fields:
@@ -157,7 +156,6 @@ l l l.
 .PP
 For more on terminal naming conventions, see the \fBterm\fP(7) manual page.
 .SS Terminfo Capabilities Syntax
-.PP
 The terminfo entry consists of several \fIcapabilities\fP,
 i.e., features that the terminal has,
 or methods for exercising the terminal's features.
@@ -187,7 +185,6 @@ i.e., suppressed from the terminal entry,
 by following its name with \*(``@\*(''
 rather than a capability value.
 .SS Similar Terminals
-.PP
 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
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 6abfda92b..df0079c0c 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.113 2022/12/10 19:51:10 tom Exp $
+.\" $Id: terminfo.tail,v 1.116 2023/07/01 15:33:13 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -129,9 +129,7 @@ or the size of particular delays, and
 string
 capabilities, which give a sequence which can be used to perform particular
 terminal operations.
-.PP
 .SS Types of Capabilities
-.PP
 All capabilities have names.
 For instance, the fact that
 ANSI-standard terminals have
@@ -232,9 +230,7 @@ For example, see the second
 in the example above.
 .br
 .ne 5
-.PP
 .SS Fetching Compiled Descriptions
-.PP
 The \fBncurses\fP 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
@@ -266,7 +262,6 @@ a list of directories (@TERMINFO_DIRS@), and
 the system terminfo directory, \fI\*d\fP (the compiled-in default).
 .RE
 .SS Preparing Descriptions
-.PP
 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
@@ -287,9 +282,7 @@ 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.
-.PP
 .SS Basic Capabilities
-.PP
 The number of columns on each line for the terminal is given by the
 \fBcols\fP numeric capability.
 If the terminal is a \s-1CRT\s0, then the
@@ -421,9 +414,7 @@ while the Lear Siegler \s-1ADM-3\s0 is described as
 .\".in +2
 .ft R
 .fi
-.PP
 .SS Parameterized Strings
-.PP
 Cursor addressing and other strings requiring parameters
 in the terminal are described by a
 parameterized string capability,
@@ -448,7 +439,6 @@ It is noted that more complex operations are often necessary,
 e.g., in the \fBsgr\fP string.
 .PP
 The \fB%\fP encodings have the following meanings:
-.PP
 .TP 5
 \fB%%\fP
 outputs \*(``%\*(''
@@ -513,7 +503,7 @@ Beginning with version 6.3, ncurses stores \fIstatic\fP and \fIdynamic\fP
 variables in the same manner as SVr4.
 .RS
 .bP
-Unlike other implementations, ncurses zeros dynamic variables 
+Unlike other implementations, ncurses zeros dynamic variables
 before the first \fB%g\fP or \fB%P\fP operator.
 .bP
 Like SVr2,
@@ -602,9 +592,7 @@ 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 using the stack.
-.PP
 .SS Cursor Motions
-.PP
 If the terminal has a fast way to home the cursor
 (to very upper left corner of screen) then this can be given as
 \fBhome\fP; similarly a fast way of getting to the lower left-hand corner
@@ -655,7 +643,6 @@ sets the command character to be the one used by terminfo.
 If the \fBsmcup\fP sequence will not restore the screen after an
 \fBrmcup\fP sequence is output (to the state prior to outputting
 \fBrmcup\fP), specify \fBnrrmc\fP.
-.PP
 .SS Margins
 SVr4 (and X/Open Curses)
 list several string capabilities for setting margins.
@@ -676,7 +663,6 @@ line position, and
 parameterized capabilities for setting the top, bottom, left, right margins
 given the number of rows or columns.
 .RE
-.RE
 .PP
 In practice, the categorization into \*(``terminal\*('' and \*(``printer\*(''
 is not suitable:
@@ -753,7 +739,7 @@ When developing an application that uses \fBsmgbp\fP to set the bottom margin,
 both arguments must be given.
 .PP
 Conversely, when only one capability in the pair is set:
-.bP 
+.bP
 If only one of \fBsmglp\fP and \fBsmgrp\fP is set,
 then it is used with two arguments,
 the column number of the left and right margins, in that order.
@@ -782,7 +768,6 @@ The \fBmgc\fP string capability should be defined.
 Applications such as \fBtabs\fP(1) rely upon this to reset all margins.
 .\"
 .SS Area Clears
-.PP
 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 \fBel\fP.
 If the terminal can clear from the beginning of the line to the current
@@ -795,10 +780,8 @@ display, then this should be given as \fBed\fP.
 if a true
 .B ed
 is not available.)
-.PP
 .\"
 .SS Insert/delete line and vertical motions
-.PP
 If the terminal can open a new blank line before the line where the cursor
 is, this should be given as \fBil1\fP; this is done only from the first
 position of a line.
@@ -875,9 +858,7 @@ below, then \fBdb\fP should be given.
 These indicate
 that deleting a line or scrolling may bring non-blank lines up from below
 or that scrolling back with \fBri\fP may bring down non-blank lines.
-.PP
 .SS Insert/Delete Character
-.PP
 There are two basic kinds of intelligent terminals with respect to
 insert/delete character which can be described using
 .I terminfo.
@@ -989,9 +970,7 @@ blanks without moving the cursor)
 can be given as
 .B ech
 with one parameter.
-.PP
 .SS "Highlighting, Underlining, and Visible Bells"
-.PP
 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
@@ -1161,9 +1140,7 @@ If a character overstriking another leaves both characters on the screen,
 specify the capability \fBos\fP.
 If overstrikes are erasable with a blank,
 then this should be indicated by giving \fBeo\fP.
-.PP
 .SS Keypad and Function Keys
-.PP
 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
@@ -1270,9 +1247,7 @@ If there are commands to turn the labels on and off,
 give them in \fBsmln\fP and \fBrmln\fP.
 \fBsmln\fP is normally output after one or more pln
 sequences to make sure that the change becomes visible.
-.PP
 .SS Tabs and Initialization
-.PP
 A few capabilities are used only for tabs:
 .bP
 If the terminal has hardware tabs, the command to advance to the next
@@ -1457,7 +1432,6 @@ use the
 only when the \fBit\fP (\fBinit_tabs\fP) capability
 is set to a value other than \fIeight\fP.
 .SS Delays and Padding
-.PP
 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).
@@ -1485,7 +1459,6 @@ then this can be given as \fBpad\fP.
 Only the first character of the
 .B pad
 string is used.
-.PP
 .SS Status Lines
 Some terminals have an extra \*(``status line\*('' which is not normally used by
 software (and thus not counted in the terminal's \fBlines\fP capability).
@@ -1520,9 +1493,7 @@ etc., work ordinarily in the status line.
 .PP
 The \fBncurses\fP implementation does not yet use any of these capabilities.
 They are documented here in case they ever become important.
-.PP
 .SS Line Graphics
-.PP
 Many terminals have alternate character sets useful for forms-drawing.
 Terminfo and \fBcurses\fP have built-in support
 for most of the drawing characters
@@ -1598,9 +1569,7 @@ to a copy of this table for your terminal, giving the character which
 as the corresponding graphic.
 Then read off the VT100/your terminal
 character pairs right to left in sequence; these become the ACSC string.
-.PP
 .SS Color Handling
-.PP
 The curses library functions \fBinit_pair\fP and \fBinit_color\fP
 manipulate the \fIcolor pairs\fP and \fIcolor values\fP discussed in this
 section
@@ -1761,7 +1730,6 @@ an \fBncv\fP capability of 2.
 .PP
 SVr4 curses does nothing with \fBncv\fP, ncurses recognizes it and optimizes
 the output in favor of colors.
-.PP
 .SS Miscellaneous
 If the terminal requires other than a null (zero) character as a pad, then this
 can be given as pad.
@@ -1868,9 +1836,7 @@ All text, including
 is transparently passed to the printer while an
 .B mc5p
 is in effect.
-.PP
 .SS Glitches and Braindamage
-.PP
 Hazeltine terminals, which do not allow \*(``~\*('' characters to be displayed should
 indicate \fBhz\fP.
 .PP
@@ -1904,9 +1870,7 @@ Note that in older terminfo versions, this capability was called
 .PP
 Other specific terminal problems may be corrected by adding more
 capabilities of the form \fBx\fP\fIx\fP.
-.PP
 .SS Pitfalls of Long Entries
-.PP
 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
@@ -1994,7 +1958,6 @@ 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 and XSI Curses extensions.
 .SH EXTENSIONS
-.PP
 Searching for terminal descriptions in
 \fB$HOME/.terminfo\fP and TERMINFO_DIRS
 is not supported by older implementations.
@@ -2029,11 +1992,11 @@ 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 \fIno_color_video\fP (ncv) capability.
-The 32768 mask value used for italics with ncv can be confused with
-an absent or cancelled ncv.
+This includes the \fIno_color_video\fP (\fBncv\fP) capability.
+The 32768 mask value used for italics with \fBncv\fP can be confused with
+an absent or cancelled \fBncv\fP.
 If italics should work with colors,
-then the ncv value must be specified, even if it is zero.
+then the \fBncv\fP value must be specified, even if it is zero.
 .PP
 Different commercial ports of terminfo and curses support different subsets of
 the XSI Curses standard and (in some cases) different extension sets.
diff --git a/man/tic.1m b/man/tic.1m
index 4326a3a88..fc1b405e0 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.85 2022/09/17 19:01:24 tom Exp $
-.TH @TIC@ 1M 2022-09-17 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.87 2023/07/01 15:46:10 tom Exp $
+.TH @TIC@ 1M 2023-07-01 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -74,7 +74,6 @@ x\
 [\fB\-v\fP[\fIn\fP]]
 [\fB\-w\fP[\fIn\fP]]
 \fIfile\fP
-.br
 .SH DESCRIPTION
 The \fB@TIC@\fP command translates a \fBterminfo\fP file from source
 format into compiled format.
@@ -130,7 +129,6 @@ a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
 the system terminfo database (\fI\*d\fP).
 .SS ALIASES
-.PP
 This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
 usually those are linked to, or copied from this program:
 .bP
@@ -394,7 +392,6 @@ describes the capabilities of a particular terminal.
 If \fIfile\fP is \*(``-\*('', then the data is read from the standard input.
 The \fIfile\fP parameter may also be the path of a character-device.
 .SS PROCESSING
-.PP
 All but one of the capabilities recognized by \fB@TIC@\fP are documented
 in \fBterminfo\fP(\*n).
 The exception is the \fBuse\fP capability.
@@ -422,7 +419,6 @@ Terminal names exceeding the maximum alias length
 will be truncated to the maximum alias length
 and a warning message will be printed.
 .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,
@@ -485,7 +481,6 @@ 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.
diff --git a/man/toe.1m b/man/toe.1m
index 95955c128..63f0053ce 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.38 2023/06/17 17:52:54 tom Exp $
-.TH @TOE@ 1M 2023-06-17 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp $
+.TH @TOE@ 1M 2023-07-01 "ncurses 6.4" "User commands"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -57,9 +57,7 @@
 \fB@TOE@\fP \- table of (terminfo) entries
 .SH SYNOPSIS
 \fB@TOE@\fP [\fB\-v\fP[\fIn\fP]] [\fB\-ahsuUV\fP] \fIfile...\fP
-.br
 .SH DESCRIPTION
-.PP
 With no options,
 \fB@TOE@\fP lists all available terminal types by primary name
 with descriptions.
@@ -123,7 +121,6 @@ If ncurses is built without tracing support, the optional parameter is ignored.
 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:
diff --git a/man/tput.1 b/man/tput.1
index 6889894d8..5ee14d5c0 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.77 2022/02/12 20:02:20 tom Exp $
-.TH @TPUT@ 1 2022-02-12 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.79 2023/07/01 15:46:10 tom Exp $
+.TH @TPUT@ 1 2023-07-01 "ncurses 6.4" "User commands"
 .ds d @TERMINFO@
 .ds n 1
 .ie \n(.g .ds `` \(lq
@@ -56,7 +56,6 @@
 \fB@TPUT@ \-S\fP  \fB<<\fP
 .br
 \fB@TPUT@ \-V\fP
-.br
 .SH DESCRIPTION
 The \fB@TPUT@\fP utility uses the \fBterminfo\fP database to make the
 values of terminal-dependent capabilities and information available to
@@ -273,7 +272,6 @@ same effect as \fB@TPUT@ init\fP.
 Again, you are less likely to use that link because another program
 named \fBinit\fP has a more well-established use.
 .SS Terminal Size
-.PP
 Besides the special commands (e.g., \fBclear\fP),
 @TPUT@ treats certain terminfo capabilities specially:
 \fBlines\fP and \fBcols\fP.
@@ -481,7 +479,6 @@ almost without change,
 Raymond made improvements to the way the command-line parameters
 were handled.
 .SH PORTABILITY
-.PP
 This implementation of \fBtput\fP differs from AT&T \fBtput\fP in
 two important areas:
 .bP
diff --git a/man/tset.1 b/man/tset.1
index 198a2bc8e..92268f67d 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.64 2023/06/10 15:46:24 tom Exp $
-.TH @TSET@ 1 2023-06-10 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.66 2023/07/01 15:21:06 tom Exp $
+.TH @TSET@ 1 2023-07-01 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -116,7 +116,6 @@ 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@\fP, \fB@TSET@\fP sets the terminal
 modes to \*(``sane\*('' values:
 .bP
@@ -145,7 +144,6 @@ 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
 The options are as follows:
 .TP 5
 .B \-c
@@ -284,7 +282,6 @@ entire \fB\-m\fP option argument be placed within single quote characters,
 and that \fBcsh\fP users insert a backslash character (\*(``\e\*('') before
 any exclamation marks (\*(``!\*('').
 .SH HISTORY
-.PP
 A \fBreset\fP command appeared in 1BSD (March 1978), written by Kurt Shoens.
 This program set the \fIerase\fP and \fIkill\fP characters
 to \fB^H\fP (backspace) and \fB@\fP respectively.
@@ -312,7 +309,6 @@ The \fBncurses\fP implementation
 was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
 S. Raymond <esr@snark.thyrsus.com>.
 .SH COMPATIBILITY
-.PP
 Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
 (POSIX.1-2008) nor
 X/Open Curses Issue 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
diff --git a/man/user_caps.5 b/man/user_caps.5
index 0dc8b2d3a..1c8ae3686 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.24 2023/06/17 17:52:54 tom Exp $
-.TH user_caps 5 2023-06-17 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.27 2023/07/01 15:46:10 tom Exp $
+.TH user_caps 5 2023-07-01 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -57,7 +57,6 @@ user_caps \- user-defined terminfo capabilities
 .B @TIC@ -x, @INFOCMP@ -x
 .SH DESCRIPTION
 .SS Background
-.PP
 Before ncurses 5.0,
 terminfo databases used a \fIfixed repertoire\fP of terminal
 capabilities designed for the SVr2 terminal database in 1984,
@@ -188,7 +187,6 @@ Fitting that into termcap's limitation of 2-character names
 would be pointless.
 These extended keys are available only with terminfo.
 .SS Recognized capabilities
-.PP
 The ncurses library uses the user-definable capabilities.
 While the terminfo database may have other extensions,
 ncurses makes explicit checks for these:
@@ -345,7 +343,6 @@ xterm mouse protocols:
 .fi
 .
 .SS Extended key-definitions
-.PP
 Several terminals provide the ability to send distinct strings for
 combinations of modified special keys.
 There is no standard for what those keys can send.
@@ -414,17 +411,14 @@ ask \fBtigetstr\fP(3X) for their values, and
 given the list of values,
 ask \fBkey_defined\fP(3X) for the \fIkey-code\fP which
 would be returned for those keys by \fBwgetch\fP(3X).
-.PP
 .\"
 .SH PORTABILITY
-.PP
 The \*(``\-x\*('' extension feature of \fB@TIC@\fP and \fB@INFOCMP@\fP
 has been adopted in NetBSD curses.
 That implementation stores user-defined capabilities,
 but makes no use of these capabilities itself.
 .\"
 .SH SEE ALSO
-.PP
 \fB@INFOCMP@\fP(1M),
 \fB@TIC@\fP(1M).
 .PP
@@ -439,7 +433,6 @@ provides further information on the \fBxterm\fP(1) features
 which are used in these extended capabilities.
 .\"
 .SH AUTHORS
-.PP
 Thomas E. Dickey
 .br
 beginning with ncurses 5.0 (1999)
diff --git a/man/wresize.3x b/man/wresize.3x
index f5182e8dc..c52970ea4 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.21 2022/02/12 20:07:29 tom Exp $
-.TH wresize 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
+.TH wresize 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBwresize\fP \- resize a curses window
 .SH SYNOPSIS
@@ -55,7 +55,6 @@ simplify the logic of \fBresizeterm\fP.
 The caller must ensure that the window's dimensions fit within the
 actual screen dimensions.
 .SH PORTABILITY
-.PP
 It is not possible to resize windows with SVr4 curses.
 .PP
 This extension of ncurses was introduced in mid-1995.
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 0d6d7b3c2..724009cfe 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.150 2023/06/24 16:12:52 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.151 2023/07/01 14:09:18 tom Exp $")
 
 /*
  *	char *
@@ -607,8 +607,8 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result)
     TPS(out_used) = 0;
     memset(result, 0, sizeof(*result));
 
-    if (string == NULL) {
-	TR(TRACE_CALLS, ("%s: format is null", TPS(tname)));
+    if (!VALID_STRING(string)) {
+	TR(TRACE_CALLS, ("%s: format is invalid", TPS(tname)));
 	rc = ERR;
     } else {
 #if HAVE_TSEARCH
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0b91e886f..72cab5b32 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230625) unstable; urgency=low
+ncurses6 (6.4+20230701) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index e5365f9bd..8c266a93a 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -49,7 +49,7 @@ CONFIG_OPTIONS = \
 	--with-abi-version=$(MY_ABI) \
 	--with-cxx-shared \
 	--with-develop \
-	--with-fallbacks=unknown,rxvt \
+	--with-fallbacks=unknown,ms-terminal,xterm-256color \
 	--with-tic-path=/usr/bin/tic$(MY_ABI) \
 	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
 	--with-shared \
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0b91e886f..72cab5b32 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230625) unstable; urgency=low
+ncurses6 (6.4+20230701) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index d0c4ed8ef..3a79517cf 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -49,7 +49,7 @@ CONFIG_OPTIONS = \
 	--with-abi-version=$(MY_ABI) \
 	--with-cxx-shared \
 	--with-develop \
-	--with-fallbacks=unknown,rxvt \
+	--with-fallbacks=unknown,ms-terminal,xterm-256color \
 	--with-tic-path=/usr/bin/tic$(MY_ABI) \
 	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
 	--with-shared \
diff --git a/package/debian/changelog b/package/debian/changelog
index f563a3281..b346442d1 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230625) unstable; urgency=low
+ncurses6 (6.4+20230701) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2023 05:41:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index fdadc5a7b..46521d3db 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.592 2023/06/25 09:41:21 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.593 2023/07/01 09:47:16 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0625"
+!define VERSION_MMDD  "0701"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e6f9b8b44..66724d7f3 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230625
+Release: 20230701
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 6ebb0e662..5455e0df3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230625
+Release: 20230701
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index a6e6db089..fc20818bd 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230625
+Release: 20230701
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/toe.c b/progs/toe.c
index 7599cfe38..ecbfd53b5 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.88 2022/09/03 23:29:32 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.89 2023/07/01 17:04:46 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -572,7 +572,7 @@ typelist(int eargc, char *eargv[],
 			break;
 		    if (*buffer == '#')
 			continue;
-		    if (isspace(*buffer))
+		    if (isspace(UChar(*buffer)))
 			continue;
 		    show_termcap(i, eargc, buffer, hook);
 		}

From e589d2df501a0f96d00756b36dcccd1ca74bd36e Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 9 Jul 2023 02:33:36 +0200
Subject: [PATCH 019/106] ncurses-6.4-20230708.patch

---
 NEWS                             | 11 ++++-
 VERSION                          |  2 +-
 c++/demo.cc                      |  5 ++-
 dist.mk                          |  4 +-
 misc/terminfo.src                | 69 +++++++++++++++++++-------------
 ncurses/tinfo/write_entry.c      | 46 ++++++++++++---------
 ncurses/win32con/win_driver.c    | 50 +++++++++++++----------
 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 +-
 14 files changed, 124 insertions(+), 85 deletions(-)

diff --git a/NEWS b/NEWS
index 6b10b50ca..7965543cd 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3973 2023/07/01 17:55:50 tom Exp $
+-- $Id: NEWS,v 1.3975 2023/07/09 00:08:03 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230708
+	+ add linux+kbs for terminals which imitate xterm's behavior with
+	  Linux -TD
+	+ modify MinGW driver to return KEY_BACKSPACE when an unmodified
+	  VK_BACK virtual key is entered (prompted by patch by Pavel Fedin,
+	  Savannah #64292).
+	+ disallow using $TERMINFO or $HOME/.terminfo when tic "-o" option is
+	  used (report by Sven Joachim, Debian #1040048).
+
 20230701
 	+ fix mandoc warnings about unnecessary markup.
 	+ improve parameter check in tparm_setup()
diff --git a/VERSION b/VERSION
index 07ef1d276..932e170e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230701
+5:0:10	6.4	20230708
diff --git a/c++/demo.cc b/c++/demo.cc
index 195e98a0d..e184e954f 100644
--- a/c++/demo.cc
+++ b/c++/demo.cc
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *
- * $Id: demo.cc,v 1.50 2021/09/04 10:52:55 tom Exp $
+ * $Id: demo.cc,v 1.51 2023/07/08 12:46:45 tom Exp $
  */
 
 #include "internal.h"
@@ -46,6 +46,7 @@
 
 #if (defined(_WIN32) || defined(_WIN64))
 #undef KEY_EVENT
+#undef sleep
 #define sleep(n) Sleep(n)
 #else
 extern "C" unsigned int sleep(unsigned int);
diff --git a/dist.mk b/dist.mk
index 430cf4a49..d24536892 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1553 2023/07/01 09:47:16 tom Exp $
+# $Id: dist.mk,v 1.1554 2023/07/08 12:03:11 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230701
+NCURSES_PATCH = 20230708
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index c11f98f52..611fe27a5 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1059 $
-#	$Date: 2023/06/05 21:40:20 $
+#	$Revision: 1.1060 $
+#	$Date: 2023/07/09 00:05:04 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -4155,9 +4155,10 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
 #	resize.pl gets no reply, resize.sh needs fix for no reply.
 scrt|securecrt|SecureCRT emulating xterm-256color,
 	bce@, km@, npc,
-	bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=vt220+pcedit,
-	use=xterm+256setaf, use=ecma+index, use=ansi+rep,
-	use=xterm+keypad, use=xterm+pcfkeys, use=xterm-basic,
+	bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=linux+kbs,
+	use=vt220+pcedit, use=xterm+256setaf, use=ecma+index,
+	use=ansi+rep, use=xterm+keypad, use=xterm+pcfkeys,
+	use=xterm-basic,
 
 # Absolute Telnet
 # (eval 2021/02/20)
@@ -4205,7 +4206,7 @@ scrt|securecrt|SecureCRT emulating xterm-256color,
 #	supports 256-colors, including changing palette (ncurses menu d works)
 #	supports UTF-8, but honors VT100 line-drawing
 absolute|Absolute Telnet emulating xterm,
-	kcbt=\E[Z, use=ecma+index, use=ansi+rep,
+	kcbt=\E[Z, use=ecma+index, use=linux+kbs, use=ansi+rep,
 	use=vt220+pcedit, use=xterm+keypad, use=xterm+app,
 	use=xterm+pcf0, use=xterm+256color, use=xterm+x11mouse,
 	use=xterm-basic,
@@ -4417,7 +4418,7 @@ mintty+common|shared capabilities for mintty,
 	rsupm=\E[75m, smm@, smpch=\E[11m, sshm=\E[1:2m,
 	ssubm=\E[74m, ssupm=\E[73m, Rmol=\E[55m, Smol=\E[53m,
 	Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m,
-	opaq=\E[28m, smul2=\E[21m, use=ansi+rep,
+	opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep,
 	use=ecma+strikeout, use=ecma+index, use=vt420+lrmm,
 	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
 	use=ecma+italics, use=xterm-basic, use=bracketed+paste,
@@ -4722,10 +4723,10 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+,
 ms-terminal|Windows10 terminal,
 	npc,
 	cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
-	Cr@, Ms@, use=xterm+256color, use=xterm+pcfkeys,
-	use=ansi+rep, use=xterm+sm+1006, use=ecma+index,
-	use=ecma+italics, use=ecma+strikeout, use=xterm-basic,
-	use=xterm+tmux,
+	Cr@, Ms@, use=linux+kbs, use=xterm+256color,
+	use=xterm+pcfkeys, use=ansi+rep, use=xterm+sm+1006,
+	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+	use=xterm-basic, use=xterm+tmux,
 
 #### Visual Studio
 # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
@@ -4774,9 +4775,10 @@ ms-terminal|Windows10 terminal,
 # - color-palette cannot be changed
 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=ecma+italics, use=xterm-basic, use=bracketed+paste,
+	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs,
+	use=xterm+256setaf, use=ecma+index, use=xterm+sm+1006,
+	use=xterm+pcfkeys, use=ecma+italics, use=xterm-basic,
+	use=bracketed+paste,
 vscode-direct|Visual Studio Code with direct-colors,
 	use=xterm+indirect, use=vscode,
 
@@ -5018,9 +5020,15 @@ xterm-new|modern xterm terminal emulator,
 	use=xterm-p370,
 
 # This fragment is for people who cannot agree on what the backspace key
-# should send.
+# should send.  The ncurses configure script option "--with-xterm-kbs" can
+# set it to BS (standard) or DEL (Linux's notion of "vt220").  xterm provides
+# either, depending on how the pseudoterminals are configured.
 xterm+kbs|fragment for backspace key,
 	kbs=^H,
+
+# Use this fragment for terminals that always use DEL for "backspace".
+linux+kbs|fragment for "backspace" key,
+	kbs=^?,
 #
 # This fragment describes as much of XFree86 xterm's "pc-style" function
 # keys as will fit into terminfo's 60 function keys.
@@ -6114,7 +6122,7 @@ xterms-sun|small (80x24) xterm with sunFunctionKeys true,
 gnome-rh62|GNOME terminal,
 	bce,
 	kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	use=xterm-color,
+	use=linux+kbs, use=xterm-color,
 
 # GNOME Terminal 1.4.0.4 (Redhat 7.2)
 #
@@ -6141,7 +6149,7 @@ gnome-rh72|GNOME Terminal in RedHat 7,
 	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=vt220+cvis,
-	use=xterm-color,
+	use=linux+kbs, use=xterm-color,
 
 # GNOME Terminal 2.0.1 (Redhat 8.0)
 #
@@ -6336,11 +6344,11 @@ xfce|Xfce Terminal,
 hterm|Chromium hterm,
 	npc,
 	U8#1,
-	kcbt=\E[Z, kent=\EOM, nel=\EE, use=xterm+osc104,
-	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
-	use=vt420+lrmm, use=xterm+sm+1006, use=xterm+tmux,
-	use=ecma+italics, use=xterm+pcfkeys, use=xterm-basic,
-	use=bracketed+paste,
+	kcbt=\E[Z, kent=\EOM, nel=\EE, use=linux+kbs,
+	use=xterm+osc104, use=ecma+index, use=ansi+rep,
+	use=ecma+strikeout, use=vt420+lrmm, use=xterm+sm+1006,
+	use=xterm+tmux, use=ecma+italics, use=xterm+pcfkeys,
+	use=xterm-basic, use=bracketed+paste,
 hterm-256color|Chromium hterm with xterm 256-colors,
 	use=xterm+256color2, use=hterm,
 
@@ -6402,7 +6410,8 @@ mgt|Multi GNOME Terminal,
 # or not is debatable).
 kvt|KDE terminal,
 	bce, km@,
-	kdch1=^?, kend=\E[F, khome=\E[H, use=xterm-color,
+	kdch1=^?, kend=\E[F, khome=\E[H, use=linux+kbs,
+	use=xterm-color,
 
 # Konsole 1.0.1 (2001/11/25)
 # (formerly known as kvt)
@@ -7715,8 +7724,8 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0),
 terminology-1.8.1|EFL-based terminal emulator (1.8.1),
 	km@,
 	cvvis@, flash@, initc@, kcbt=\E[Z, rmm@, smm@, Ms@,
-	use=ecma+index, use=xterm+256setaf, use=ansi+rep,
-	use=ecma+strikeout, use=xterm+sm+1006,
+	use=linux+kbs, use=ecma+index, use=xterm+256setaf,
+	use=ansi+rep, use=ecma+strikeout, use=xterm+sm+1006,
 	use=xterm+pcfkeys, use=xterm+tmux, use=vt220+cvis,
 	use=ecma+italics, use=xterm-basic, use=report+version,
 
@@ -8063,9 +8072,9 @@ domterm|DomTerm web client,
 	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=bracketed+paste,
+	sitm@, smkx=\E[?1h, use=linux+kbs, use=xterm+256setaf,
+	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
+	use=xterm-basic, use=bracketed+paste,
 
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
@@ -27816,4 +27825,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-06-05
 #	+ add xterm+focus to foot+base (patch by Daniel Ekloef).
 #
+# 2023-07-08
+#	+ add linux+kbs for terminals which imitate xterm's behavior with
+#	  Linux -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 9de733646..586b1dde9 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.127 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.130 2023/07/08 14:00:24 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -95,12 +95,12 @@ write_file(char *filename, TERMTYPE2 *tp)
 	    int myerr = ferror(fp) ? errno : 0;
 	    if (myerr) {
 		_nc_syserr_abort("error writing %s/%s: %s",
-				 _nc_tic_dir(0),
+				 _nc_tic_dir(NULL),
 				 filename,
 				 strerror(myerr));
 	    } else {
 		_nc_syserr_abort("error writing %s/%s: %u bytes vs actual %lu",
-				 _nc_tic_dir(0),
+				 _nc_tic_dir(NULL),
 				 filename,
 				 offset,
 				 (unsigned long) actual);
@@ -133,7 +133,7 @@ check_writeable(int code)
     } else if (!verified[s - dirnames]) {
 	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
 	if (make_db_root(dir) < 0) {
-	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
+	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir);
 	} else {
 	    verified[s - dirnames] = TRUE;
 	}
@@ -145,7 +145,7 @@ static int
 make_db_path(char *dst, const char *src, size_t limit)
 {
     int rc = -1;
-    const char *top = _nc_tic_dir(0);
+    const char *top = _nc_tic_dir(NULL);
 
     if (src == top || _nc_is_abs_path(src)) {
 	if (strlen(src) + 1 <= limit) {
@@ -222,22 +222,30 @@ _nc_set_writedir(const char *dir)
 {
     const char *destination;
     char actual[PATH_MAX];
+    bool specific = (dir != NULL);
 
-    if (dir == 0 && use_terminfo_vars())
+    if (!specific && use_terminfo_vars())
 	dir = getenv("TERMINFO");
 
-    if (dir != 0)
+    if (dir != NULL)
 	(void) _nc_tic_dir(dir);
 
-    destination = _nc_tic_dir(0);
+    destination = _nc_tic_dir(NULL);
     if (make_db_root(destination) < 0) {
-	char *home = _nc_home_terminfo();
+	bool success = FALSE;
 
-	if (home != 0) {
-	    destination = home;
-	    if (make_db_root(destination) < 0)
-		_nc_err_abort("%s: permission denied (errno %d)",
-			      destination, errno);
+	if (!specific) {
+	    char *home = _nc_home_terminfo();
+
+	    if (home != NULL) {
+		destination = home;
+		if (make_db_root(destination) == 0)
+		    success = TRUE;
+	    }
+	}
+	if (!success) {
+	    _nc_err_abort("%s: permission denied (errno %d)",
+			  destination, errno);
 	}
     }
 
@@ -249,7 +257,7 @@ _nc_set_writedir(const char *dir)
     make_db_path(actual, destination, sizeof(actual));
 #else
     if (chdir(_nc_tic_dir(destination)) < 0
-	|| getcwd(actual, sizeof(actual)) == 0)
+	|| getcwd(actual, sizeof(actual)) == NULL)
 	_nc_err_abort("%s: not a directory", destination);
 #endif
     _nc_keep_tic_dir(actual);
@@ -350,10 +358,10 @@ _nc_write_entry(TERMTYPE2 *const tp)
 
 #if USE_HASHED_DB
     if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
-	DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
+	DB *capdb = _nc_db_open(_nc_tic_dir(NULL), TRUE);
 	DBT key, data;
 
-	if (capdb != 0) {
+	if (capdb != NULL) {
 	    buffer[0] = 0;
 
 	    memset(&key, 0, sizeof(key));
@@ -450,7 +458,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 	if (stat(filename, &statbuf) == -1
 	    || (start_time = statbuf.st_mtime) == 0) {
 	    _nc_syserr_abort("error obtaining time from %s/%s",
-			     _nc_tic_dir(0), filename);
+			     _nc_tic_dir(NULL), filename);
 	}
     }
     while (*other_names != '\0') {
@@ -465,7 +473,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 	    _nc_warning("terminal alias %s too long.", ptr);
 	    continue;
 	}
-	if (strchr(ptr, '/') != 0) {
+	if (strchr(ptr, '/') != NULL) {
 	    _nc_warning("cannot link alias %s.", ptr);
 	    continue;
 	}
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 9822f1258..59da0e860 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -55,7 +55,9 @@
 
 #define CUR TerminalType(my_term).
 
-MODULE_ID("$Id: win_driver.c,v 1.70 2023/02/12 00:31:33 tom Exp $")
+#define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+
+MODULE_ID("$Id: win_driver.c,v 1.71 2023/07/08 19:53:51 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -82,33 +84,34 @@ static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *);
 #define write_screen WriteConsoleOutput
 #define read_screen  ReadConsoleOutput
 #endif
-
+/* *INDENT-OFF* */
 static const LONG keylist[] =
 {
-    GenMap(VK_PRIOR, KEY_PPAGE),
-    GenMap(VK_NEXT, KEY_NPAGE),
-    GenMap(VK_END, KEY_END),
-    GenMap(VK_HOME, KEY_HOME),
-    GenMap(VK_LEFT, KEY_LEFT),
-    GenMap(VK_UP, KEY_UP),
-    GenMap(VK_RIGHT, KEY_RIGHT),
-    GenMap(VK_DOWN, KEY_DOWN),
+    GenMap(VK_PRIOR,  KEY_PPAGE),
+    GenMap(VK_NEXT,   KEY_NPAGE),
+    GenMap(VK_END,    KEY_END),
+    GenMap(VK_HOME,   KEY_HOME),
+    GenMap(VK_LEFT,   KEY_LEFT),
+    GenMap(VK_UP,     KEY_UP),
+    GenMap(VK_RIGHT,  KEY_RIGHT),
+    GenMap(VK_DOWN,   KEY_DOWN),
     GenMap(VK_DELETE, KEY_DC),
     GenMap(VK_INSERT, KEY_IC)
 };
 static const LONG ansi_keys[] =
 {
-    GenMap(VK_PRIOR, 'I'),
-    GenMap(VK_NEXT, 'Q'),
-    GenMap(VK_END, 'O'),
-    GenMap(VK_HOME, 'H'),
-    GenMap(VK_LEFT, 'K'),
-    GenMap(VK_UP, 'H'),
-    GenMap(VK_RIGHT, 'M'),
-    GenMap(VK_DOWN, 'P'),
+    GenMap(VK_PRIOR,  'I'),
+    GenMap(VK_NEXT,   'Q'),
+    GenMap(VK_END,    'O'),
+    GenMap(VK_HOME,   'H'),
+    GenMap(VK_LEFT,   'K'),
+    GenMap(VK_UP,     'H'),
+    GenMap(VK_RIGHT,  'M'),
+    GenMap(VK_DOWN,   'P'),
     GenMap(VK_DELETE, 'S'),
     GenMap(VK_INSERT, 'R')
 };
+/* *INDENT-ON* */
 #define N_INI ((int)array_length(keylist))
 #define FKEYS 24
 #define MAPSIZE (FKEYS + N_INI)
@@ -2126,9 +2129,9 @@ _nc_mingw_console_read(
 		*buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar;
 		vk = inp_rec.Event.KeyEvent.wVirtualKeyCode;
 		/*
-		 * There are 24 virtual function-keys, and typically
-		 * 12 function-keys on a keyboard.  Use the shift-modifier
-		 * to provide the remaining 12 keys.
+		 * There are 24 virtual function-keys (defined in winuser.h),
+		 * and typically 12 function-keys on a keyboard.  Use the
+		 * shift-modifier to provide the remaining keys.
 		 */
 		if (vk >= VK_F1 && vk <= VK_F12) {
 		    if (inp_rec.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) {
@@ -2145,6 +2148,11 @@ _nc_mingw_console_read(
 			ungetch('\0');
 			*buf = AnsiKey(vk);
 		    }
+		} else if (vk == VK_BACK) {
+		    if (!(inp_rec.Event.KeyEvent.dwControlKeyState
+			  & (SHIFT_PRESSED | CONTROL_PRESSED))) {
+			*buf = KEY_BACKSPACE;
+		    }
 		}
 		break;
 	    } else if (inp_rec.EventType == MOUSE_EVENT) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 72cab5b32..fc1907b59 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230701) unstable; urgency=low
+ncurses6 (6.4+20230708) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 72cab5b32..fc1907b59 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230701) unstable; urgency=low
+ncurses6 (6.4+20230708) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index b346442d1..a98efd07b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230701) unstable; urgency=low
+ncurses6 (6.4+20230708) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jul 2023 05:47:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 46521d3db..e35dd5a19 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.593 2023/07/01 09:47:16 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.594 2023/07/08 12:03:11 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0701"
+!define VERSION_MMDD  "0708"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 66724d7f3..0156a4439 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230701
+Release: 20230708
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 5455e0df3..8baf53b8f 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230701
+Release: 20230708
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index fc20818bd..c6b6485c4 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230701
+Release: 20230708
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 9a6452f38bcf18c2381ce8cedab899459bcbb904 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 15 Jul 2023 23:01:12 +0200
Subject: [PATCH 020/106] ncurses-6.4-20230715.patch

---
 NEWS                                    |    8 +-
 VERSION                                 |    2 +-
 dist.mk                                 |    4 +-
 doc/html/NCURSES-Programming-HOWTO.html |    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_add_wch.3x.html       |  141 +--
 doc/html/man/curs_addwstr.3x.html       |   29 +-
 doc/html/man/curs_util.3x.html          |  226 ++---
 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            | 1157 ++++++++++++-----------
 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_add_wch.3x                     |   46 +-
 man/curs_addwstr.3x                     |   19 +-
 man/curs_util.3x                        |   47 +-
 man/manhtml.aliases                     |    4 +-
 man/terminfo.tail                       |   10 +-
 misc/terminfo.src                       |    9 +-
 ncurses/widechar/lib_add_wch.c          |   16 +-
 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 +-
 37 files changed, 949 insertions(+), 823 deletions(-)

diff --git a/NEWS b/NEWS
index 7965543cd..28c678fe9 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3975 2023/07/09 00:08:03 tom Exp $
+-- $Id: NEWS,v 1.3977 2023/07/15 17:58:51 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230715
+	+ correct wadd_wch_literal() when adding a non-spacing character to a
+	  double-width character.
+	+ improve manual page for curs_util.
+	+ improve manual page for wadd_wch().
+
 20230708
 	+ add linux+kbs for terminals which imitate xterm's behavior with
 	  Linux -TD
diff --git a/VERSION b/VERSION
index 932e170e0..4cc28ff51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230708
+5:0:10	6.4	20230715
diff --git a/dist.mk b/dist.mk
index d24536892..f1c63502c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1554 2023/07/08 12:03:11 tom Exp $
+# $Id: dist.mk,v 1.1555 2023/07/15 10:14:48 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230708
+NCURSES_PATCH = 20230715
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/NCURSES-Programming-HOWTO.html b/doc/html/NCURSES-Programming-HOWTO.html
index 2296cdabf..f4680ca37 100644
--- a/doc/html/NCURSES-Programming-HOWTO.html
+++ b/doc/html/NCURSES-Programming-HOWTO.html
@@ -2017,7 +2017,7 @@ <h3 class="SECT2"><a name="ATTRIBDETAILS" id=
     COLOR_PAIR(n)   Color-pair number n 
     </pre>
         <p>The last one is the most colorful one :-) Colors are
-        explained in the <a href="#color" target="_top">next
+        explained in the <a href="#COLOR" target="_top">next
         sections</a>.</p>
 
         <p>We can OR(|) any number of above attributes to get a
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 3f69e8f95..da0b4c803 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index ff52d2a55..d6dadeccf 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 0679d3615..6fbbf7688 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index c48e639c3..36cfcef90 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.36 2023/07/01 14:23:04 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.37 2023/07/15 16:45:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -75,34 +75,44 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   If <EM>wch</EM> refers to a spacing character, then any  previous  character
            at  that  location is removed.  A new character specified by <EM>wch</EM> is
            placed at that location  with  rendition  specified  by  <EM>wch</EM>.   The
-           cursor then advances to the next spacing character on the screen.
+           cursor  then  advances after this spacing character, to prepare for
+           writing the next character on the screen.
 
-       <STRONG>o</STRONG>   If  <EM>wch</EM>  refers to a non-spacing character, all previous characters
-           at that location are preserved.  The non-spacing characters of  <EM>wch</EM>
-           are  added  to  the  spacing  complex  character, and the rendition
-           specified by <EM>wch</EM> is ignored.
+           The newly added spacing character is the base of the active complex
+           character.   Subsequent non-spacing characters can be combined with
+           this base until another spacing character is written to the screen,
+           or the cursor is moved, e.g., using <STRONG>wmove</STRONG>.
 
-       <STRONG>o</STRONG>   If the character part of <EM>wch</EM> is a tab, newline, backspace or  other
+       <STRONG>o</STRONG>   If  <EM>wch</EM>  refers  to  a non-spacing character, it is appended to the
+           active complex character, retaining the previous characters at that
+           location.  The rendition specified by <EM>wch</EM> is ignored.
+
+           The  cursor  is  not advanced after adding a non-spacing character.
+           Subsequent calls to add non-spacing characters will update the same
+           position.
+
+       <STRONG>o</STRONG>   If  the character part of <EM>wch</EM> is a tab, newline, backspace or other
            control character, the window is updated and the cursor moves as if
            <STRONG>addch</STRONG> were called.
 
 
 </PRE><H3><a name="h3-echo_wchar">echo_wchar</a></H3><PRE>
        The <STRONG>echo_wchar</STRONG> function is functionally equivalent to a call to <STRONG>add_wch</STRONG>
-       followed  by  a  call  to  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.   Similarly, the <STRONG>wecho_wchar</STRONG> is
-       functionally equivalent to a call to <STRONG>wadd_wch</STRONG> followed  by  a  call  to
-       <STRONG>wrefresh</STRONG>.   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 *<STRONG>echo</STRONG>*
+       followed by a call  to  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.   Similarly,  the  <STRONG>wecho_wchar</STRONG>  is
+       functionally  equivalent  to  a  call to <STRONG>wadd_wch</STRONG> followed by a call to
+       <STRONG>wrefresh</STRONG>.  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  *<STRONG>echo</STRONG>*
        functions instead of their equivalents.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Like <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>addch_wch</STRONG> accepts symbols which make it simple to  draw
-       lines  and  other  frequently  used  special characters.  These symbols
+       Like  <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>addch_wch</STRONG> 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 <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
        <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>    <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
+
        <STRONG>Name</STRONG>              <STRONG>Default</STRONG>    <STRONG>Default</STRONG>   <STRONG>char</STRONG>    <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
        WACS_BLOCK        0x25ae     #         0       solid square block
@@ -112,7 +122,6 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        WACS_CKBOARD      0x2592     :         a       checker board (stipple)
        WACS_DARROW       0x2193     v         .       arrow pointing down
        WACS_DEGREE       0x00b0     '         f       degree symbol
-
        WACS_DIAMOND      0x25c6     +         `       diamond
        WACS_GEQUAL       0x2265     &gt;         &gt;       greater-than-or-equal-to
        WACS_HLINE        0x2500     -         q       horizontal line
@@ -139,7 +148,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        WACS_URCORNER     0x2510     +         k       upper right-hand corner
        WACS_VLINE        0x2502     |         x       vertical line
 
-       The wide-character configuration of ncurses also  defines  symbols  for
+       The  wide-character  configuration  of ncurses also defines symbols for
        thick lines (<STRONG>acsc</STRONG> "J" to "V"):
 
        <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
@@ -169,14 +178,15 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        WACS_D_LTEE       0x2560    +         F       double tee pointing right
        WACS_D_PLUS       0x256c    +         E       double large plus
        WACS_D_RTEE       0x2563    +         G       double tee pointing left
+
        WACS_D_TTEE       0x2566    +         I       double tee pointing down
        WACS_D_ULCORNER   0x2554    +         C       double upper left corner
        WACS_D_URCORNER   0x2557    +         B       double upper right corner
        WACS_D_VLINE      0x2551    |         Y       double vertical line
 
-       Unicode's  descriptions  for  these  characters  differs  slightly from
-       ncurses, by introducing the term "light"  (along  with  less  important
-       details).   Here are its descriptions for the normal, thick, and double
+       Unicode's descriptions  for  these  characters  differs  slightly  from
+       ncurses,  by  introducing  the  term "light" (along with less important
+       details).  Here are its descriptions for the normal, thick, and  double
        horizontal lines:
 
        <STRONG>o</STRONG>   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
@@ -189,7 +199,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
+       X/Open  does  not  define  any  error  conditions.  This implementation
        returns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
@@ -198,15 +208,15 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        The latter may be due to different causes:
 
-       <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
+       <STRONG>o</STRONG>   If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is not enabled, writing a character  at  the  lower
            right margin succeeds.  However, an error is returned because it is
            not possible to wrap to a new line
 
-       <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
-           sequence of bytes, or if it is not  possible  to  add  all  of  the
+       <STRONG>o</STRONG>   If an error is detected when converting a multibyte character to  a
+           sequence  of  bytes,  or  if  it  is not possible to add all of the
            resulting bytes in the window, an error is returned.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -216,81 +226,101 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       All  of these functions are described in the XSI Curses standard, Issue
-       4.  The defaults specified for line-drawing  characters  apply  in  the
+       All of these functions are described in the XSI Curses standard,  Issue
+       4.   The  defaults  specified  for line-drawing characters apply in the
        POSIX locale.
 
-       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
+
+</PRE><H3><a name="h3-WACS-Symbols">WACS Symbols</a></H3><PRE>
+       X/Open Curses makes it clear that the WACS_ symbols should  be  defined
        as a pointer to <STRONG>cchar_t</STRONG> data, e.g., in the discussion of <STRONG>border_set</STRONG>.  A
        few implementations are problematic:
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
        <STRONG>o</STRONG>   HPUX curses equates some of the <STRONG>ACS_</STRONG> symbols to the analogous <STRONG>WACS_</STRONG>
-           symbols  as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.    The
-           misdefined  symbols  are the arrows and other symbols which are not
+           symbols   as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.   The
+           misdefined symbols are the arrows and other symbols which  are  not
            used for line-drawing.
 
        X/Open Curses does not define symbols for thick- or double-lines.  SVr4
-       curses  implementations  defined their line-drawing symbols in terms of
+       curses implementations defined their line-drawing symbols in  terms  of
        intermediate  symbols.   This  implementation  extends  those  symbols,
        providing new definitions which are not in the SVr4 implementations.
 
-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
-       alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
-       corresponding  line-drawing  characters.  X/Open Curses did not address
-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
-       Existing  implementations  of Unix curses (AIX, HPUX, Solaris) use only
+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
+       corresponding line-drawing characters.  X/Open Curses did  not  address
+       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
+       Existing implementations of Unix curses (AIX, HPUX, Solaris)  use  only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       Ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
+       Ncurses  5.3  (2002)  provided a table of Unicode values to solve these
        problems.  NetBSD curses incorporated that table in 2010.
 
-       In  this  implementation,  the  Unicode  values are used instead of the
+       In this implementation, the Unicode values  are  used  instead  of  the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment  variable  <STRONG>NCURSES_NO_UTF8_ACS</STRONG>.   In contrast, for the same
+       environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>.  In contrast,  for  the  same
        cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> will use
        only the ASCII default values.
 
-       Having  Unicode available does not solve all of the problems with line-
+       Having Unicode available does not solve all of the problems with  line-
        drawing for curses:
 
-       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics  <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>
-           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
+       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
+           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
            the terminal used.
 
-       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
-           terminal  in the early 1980s.  There is no accessible documentation
+       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
+           terminal in the early 1980s.  There is no accessible  documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
-           since  they  lie  outside the BMP and as a result are not generally
+           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+           since they lie outside the BMP and as a result  are  not  generally
            available in terminals.  They are not storm lanterns, in any case.
 
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: &lt;section&gt; U+00A7 (section
-           mark), &lt;Theta&gt; U+0398 (theta), &lt;Phi&gt; U+03A6 (phi),  &lt;delta&gt;  U+03B4
+           mark),  &lt;Theta&gt;  U+0398 (theta), &lt;Phi&gt; U+03A6 (phi), &lt;delta&gt; U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
+</PRE><H3><a name="h3-Complex-Characters">Complex Characters</a></H3><PRE>
+       The  complex  character  type  <STRONG>cchar_t</STRONG>  can  store  more  than one wide
+       character (<STRONG>wchar_t</STRONG>).  The X/Open Curses description  does  not  mention
+       this  possibility,  describing  only  the  cases where <EM>wch</EM> is a spacing
+       character or a non-spacing character.
+
+       This implementation assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>,
+       and in turn that the result
+
+       <STRONG>o</STRONG>   contains at most one spacing character in the beginning of its list
+           of wide characters, and zero or more non-spacing characters or
+
+       <STRONG>o</STRONG>   may hold one non-spacing character.
+
+       In the latter case, ncurses  adds  the  non-spacing  character  to  the
+       active (base) spacing character.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
+       <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-07-15                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -305,7 +335,12 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a>
+<ul>
+<li><a href="#h3-WACS-Symbols">WACS Symbols</a></li>
+<li><a href="#h3-Complex-Characters">Complex Characters</a></li>
+</ul>
+</li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 17a11f88f..f55cbf51a 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.20 2023/07/15 17:11:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -69,22 +69,27 @@ <H1 class="no-header">curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These  functions  write the characters of the (null-terminated) <STRONG>wchar_t</STRONG>
        character string <EM>wstr</EM> on the given window.  It is similar to construct-
-       ing a <STRONG>cchar_t</STRONG> for each wchar_t in the string, then calling <STRONG>wadd_wch</STRONG> for
-       the resulting <STRONG>cchar_t</STRONG>.
+       ing a <STRONG>cchar_t</STRONG> for each <STRONG>wchar_t</STRONG> in the string, then calling <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>
+       for the resulting <STRONG>cchar_t</STRONG>:
+
+       <STRONG>o</STRONG>   spacing and non-spacing characters in the string are processed  one
+           at a time, and
+
+       <STRONG>o</STRONG>   control characters are processed as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
 
        The <EM>mv</EM> functions perform cursor movement once, before writing any char-
        acters.  Thereafter, the cursor is advanced as a side-effect of writing
        to the window.
 
-       The four functions with <EM>n</EM> as the last argument write at most <EM>n</EM>  <STRONG>wchar_t</STRONG>
-       characters,  or  until a terminating null is reached.  If <EM>n</EM> is -1, then
+       The  four functions with <EM>n</EM> as the last argument write at most <EM>n</EM> <STRONG>wchar_t</STRONG>
+       characters, or until a terminating null is reached.  If <EM>n</EM> is  -1,  then
        the entire string will be added.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not define any error conditions.  This  implementation  re-
+       X/Open  does  not define any error conditions.  This implementation re-
        turns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
@@ -93,7 +98,7 @@ <H1 class="no-header">curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the corresponding calls to <STRONG>wadd_wch</STRONG> return an error.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -107,11 +112,11 @@ <H1 class="no-header">curs_addwstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-15                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 05562d34c..6fdfed3fd 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.70 2023/07/01 14:31:54 tom Exp @
+  * @Id: curs_util.3x,v 1.71 2023/07/15 18:01:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -79,23 +79,15 @@ <H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-unctrl">unctrl</a></H3><PRE>
        The <STRONG>unctrl</STRONG> routine returns a character string which is a printable rep-
-       resentation of the character <EM>c</EM>, ignoring attributes.   Control  charac-
-       ters  are  displayed  in the <STRONG>^</STRONG><EM>X</EM> notation.  Printing characters are dis-
-       played as is.
-
-       The corresponding <STRONG>wunctrl</STRONG> returns a printable representation of a  wide
-       character.
-
-
-</PRE><H3><a name="h3-keyname_key_name">keyname/key_name</a></H3><PRE>
-       The <STRONG>keyname</STRONG> routine returns a character string corresponding to the key
-       <EM>c</EM>:
+       resentation of the character <EM>c</EM>:
 
        <STRONG>o</STRONG>   Printable characters are displayed as themselves, e.g., a one-char-
            acter string containing the key.
 
        <STRONG>o</STRONG>   Control characters are displayed in the <STRONG>^</STRONG><EM>X</EM> notation.
 
+       <STRONG>o</STRONG>   Printing characters are displayed as is.
+
        <STRONG>o</STRONG>   DEL (character 127) is displayed as <STRONG>^?</STRONG>.
 
        <STRONG>o</STRONG>   Values  above 128 are either meta characters (if the screen has not
@@ -104,136 +96,152 @@ <H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            In the latter case, the values may not be printable;  this  follows
            the X/Open specification.
 
-       <STRONG>o</STRONG>   Values above 256 may be the names of the names of function keys.
+       The  corresponding <STRONG>wunctrl</STRONG> returns a printable representation of a com-
+       plex character <EM>c</EM>.
+
+       In both <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> the attributes and color associated with the
+       character parameter are ignored.
+
+
+</PRE><H3><a name="h3-keyname_key_name">keyname/key_name</a></H3><PRE>
+       The <STRONG>keyname</STRONG> routine returns a character string corresponding to the key
+       <EM>c</EM>.  Key codes are different from character codes.
+
+       <STRONG>o</STRONG>   Key codes below 256 are characters.  They are displayed using  <STRONG>unc-</STRONG>
+           <STRONG>trl</STRONG>.
+
+       <STRONG>o</STRONG>   Values  above 256 may be the codes for function keys.  The function
+           key name is displayed.
+
+       <STRONG>o</STRONG>   Otherwise (if there is no corresponding name and the key is  not  a
+           character)  the  function returns null, to denote an error.  X/Open
+           also lists an "UNKNOWN KEY" return value,  which  some  implementa-
+           tions return rather than null.
 
-       <STRONG>o</STRONG>   Otherwise  (if there is no corresponding name) the function returns
-           null, to denote an error.  X/Open also lists an "UNKNOWN  KEY"  re-
-           turn value, which some implementations return rather than null.
+       The  corresponding <STRONG>key_name</STRONG> returns a multibyte character string corre-
+       sponding to the wide-character value <EM>w</EM>.  The two functions (<STRONG>keyname</STRONG> and
+       <STRONG>key_name</STRONG>) do not return the same set of strings:
 
-       The  corresponding <STRONG>key_name</STRONG> returns a character string corresponding to
-       the wide-character value <EM>w</EM>.  The two functions do not return  the  same
-       set  of strings; the latter returns null where the former would display
-       a meta character.
+       <STRONG>o</STRONG>   <STRONG>keyname</STRONG> returns null where <STRONG>key_name</STRONG> would display a meta character.
+
+       <STRONG>o</STRONG>   <STRONG>key_name</STRONG> does not return the name of a function key.
 
 
 </PRE><H3><a name="h3-filter_nofilter">filter/nofilter</a></H3><PRE>
-       The <STRONG>filter</STRONG> routine, if used, must be called before <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>
+       The  <STRONG>filter</STRONG>  routine, if used, must be called before <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>
        are called.  Calling <STRONG>filter</STRONG> causes these changes in initialization:
 
        <STRONG>o</STRONG>   <STRONG>LINES</STRONG> is set to 1;
 
-       <STRONG>o</STRONG>   the  capabilities  <STRONG>clear</STRONG>,  <STRONG>cud1</STRONG>,  <STRONG>cud</STRONG>, <STRONG>cup</STRONG>, <STRONG>cuu1</STRONG>, <STRONG>cuu</STRONG>, <STRONG>vpa</STRONG> are dis-
+       <STRONG>o</STRONG>   the capabilities <STRONG>clear</STRONG>, <STRONG>cud1</STRONG>, <STRONG>cud</STRONG>, <STRONG>cup</STRONG>, <STRONG>cuu1</STRONG>,  <STRONG>cuu</STRONG>,  <STRONG>vpa</STRONG>  are  dis-
            abled;
 
        <STRONG>o</STRONG>   the capability <STRONG>ed</STRONG> is disabled if <STRONG>bce</STRONG> is set;
 
        <STRONG>o</STRONG>   and the <STRONG>home</STRONG> string is set to the value of <STRONG>cr</STRONG>.
 
-       The <STRONG>nofilter</STRONG> routine cancels the effect of  a  preceding  <STRONG>filter</STRONG>  call.
-       That  allows  the  caller to initialize a screen on a different device,
-       using a different value of <STRONG>$TERM</STRONG>.  The limitation  arises  because  the
+       The  <STRONG>nofilter</STRONG>  routine  cancels  the effect of a preceding <STRONG>filter</STRONG> call.
+       That allows the caller to initialize a screen on  a  different  device,
+       using  a  different  value of <STRONG>$TERM</STRONG>.  The limitation arises because the
        <STRONG>filter</STRONG> routine modifies the in-memory copy of the terminal information.
 
 
 </PRE><H3><a name="h3-use_env">use_env</a></H3><PRE>
-       The  <STRONG>use_env</STRONG>  routine,  if  used,  should  be  called before <STRONG>initscr</STRONG> or
-       <STRONG>newterm</STRONG> are called (because those compute the screen size).   It  modi-
-       fies  the way <STRONG>ncurses</STRONG> treats environment variables when determining the
+       The <STRONG>use_env</STRONG> routine, if  used,  should  be  called  before  <STRONG>initscr</STRONG>  or
+       <STRONG>newterm</STRONG>  are  called (because those compute the screen size).  It modi-
+       fies the way <STRONG>ncurses</STRONG> treats environment variables when determining  the
        screen size.
 
-       <STRONG>o</STRONG>   Normally <STRONG>ncurses</STRONG> looks first  at  the  terminal  database  for  the
+       <STRONG>o</STRONG>   Normally  <STRONG>ncurses</STRONG>  looks  first  at  the  terminal database for the
            screen size.
 
-           If  <STRONG>use_env</STRONG>  was called with <STRONG>FALSE</STRONG> for parameter, it stops here un-
+           If <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG> for parameter, it stops  here  un-
            less <STRONG>use_tioctl</STRONG> was also called with <STRONG>TRUE</STRONG> for parameter.
 
-       <STRONG>o</STRONG>   Then it asks for the screen size via operating  system  calls.   If
+       <STRONG>o</STRONG>   Then  it  asks  for the screen size via operating system calls.  If
            successful, it overrides the values from the terminal database.
 
-       <STRONG>o</STRONG>   Finally  (unless  <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG> parameter), <STRONG>ncurses</STRONG>
-           examines the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables, using a  value
-           in  those to override the results from the operating system or ter-
+       <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <STRONG>ncurses</STRONG>
+           examines  the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables, using a value
+           in those to override the results from the operating system or  ter-
            minal database.
 
-           <STRONG>Ncurses</STRONG> also updates the screen size in response to  <STRONG>SIGWINCH</STRONG>,  un-
+           <STRONG>Ncurses</STRONG>  also  updates the screen size in response to <STRONG>SIGWINCH</STRONG>, un-
            less overridden by the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables,
 
 
 </PRE><H3><a name="h3-use_tioctl">use_tioctl</a></H3><PRE>
-       The  <STRONG>use_tioctl</STRONG>  routine,  if  used, should be called before <STRONG>initscr</STRONG> or
-       <STRONG>newterm</STRONG> are called (because those  compute  the  screen  size).   After
-       <STRONG>use_tioctl</STRONG>  is  called  with  <STRONG>TRUE</STRONG> as an argument, <STRONG>ncurses</STRONG> modifies the
+       The <STRONG>use_tioctl</STRONG> routine, if used, should be  called  before  <STRONG>initscr</STRONG>  or
+       <STRONG>newterm</STRONG>  are  called  (because  those  compute the screen size).  After
+       <STRONG>use_tioctl</STRONG> is called with <STRONG>TRUE</STRONG> as an  argument,  <STRONG>ncurses</STRONG>  modifies  the
        last step in its computation of screen size as follows:
 
-       <STRONG>o</STRONG>   checks if the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment variables are set to  a
+       <STRONG>o</STRONG>   checks  if the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment variables are set to a
            number greater than zero.
 
-       <STRONG>o</STRONG>   for  each,  <STRONG>ncurses</STRONG>  updates the corresponding environment variable
-           with the value that it has obtained via operating  system  call  or
+       <STRONG>o</STRONG>   for each, <STRONG>ncurses</STRONG> updates the  corresponding  environment  variable
+           with  the  value  that it has obtained via operating system call or
            from the terminal database.
 
-       <STRONG>o</STRONG>   <STRONG>ncurses</STRONG>  re-fetches  the value of the environment variables so that
+       <STRONG>o</STRONG>   <STRONG>ncurses</STRONG> re-fetches the value of the environment variables  so  that
            it is still the environment variables which set the screen size.
 
        The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as summarized here:
 
            <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
            ----------------------------------------------------------------
-
-
-
-           TRUE      FALSE        This is the default  behavior.   <STRONG>ncurses</STRONG>
+           TRUE      FALSE        This  is  the default behavior.  <STRONG>ncurses</STRONG>
                                   uses operating system calls unless over-
                                   ridden by $LINES or $COLUMNS environment
                                   variables.
-           TRUE      TRUE         <STRONG>ncurses</STRONG>   updates  $LINES  and  $COLUMNS
+           TRUE      TRUE         <STRONG>ncurses</STRONG>  updates  $LINES  and   $COLUMNS
                                   based on operating system calls.
            FALSE     TRUE         <STRONG>ncurses</STRONG> ignores $LINES and $COLUMNS, us-
                                   es  operating  system  calls  to  obtain
                                   size.
-           FALSE     FALSE        <STRONG>ncurses</STRONG> relies on the terminal  database
+           FALSE     FALSE        <STRONG>ncurses</STRONG>  relies on the terminal database
                                   to determine size.
 
 
 </PRE><H3><a name="h3-putwin_getwin">putwin/getwin</a></H3><PRE>
-       The  <STRONG>putwin</STRONG> routine writes all data associated with window (or pad) <EM>win</EM>
+       The <STRONG>putwin</STRONG> routine writes all data associated with window (or pad)  <EM>win</EM>
        into the file to which <EM>filep</EM> points.  This information can be later re-
        trieved using the <STRONG>getwin</STRONG> function.
 
-       The  <STRONG>getwin</STRONG>  routine  reads  window  related data stored in the file by
-       <STRONG>putwin</STRONG>.  The routine then creates and initializes a  new  window  using
-       that  data.   It  returns a pointer to the new window.  There are a few
+       The <STRONG>getwin</STRONG> routine reads window related data  stored  in  the  file  by
+       <STRONG>putwin</STRONG>.   The  routine  then creates and initializes a new window using
+       that data.  It returns a pointer to the new window.  There  are  a  few
        caveats:
 
        <STRONG>o</STRONG>   the data written is a copy of the <STRONG>WINDOW</STRONG> structure, and its associ-
-           ated  character cells.  The format differs between the wide-charac-
-           ter (<STRONG>ncursesw</STRONG>) and non-wide (<STRONG>ncurses</STRONG>) libraries.  You can  transfer
+           ated character cells.  The format differs between the  wide-charac-
+           ter  (<STRONG>ncursesw</STRONG>) and non-wide (<STRONG>ncurses</STRONG>) libraries.  You can transfer
            data between the two, however.
 
-       <STRONG>o</STRONG>   the  retrieved  window  is always created as a top-level window (or
+       <STRONG>o</STRONG>   the retrieved window is always created as a  top-level  window  (or
            pad), rather than a subwindow.
 
-       <STRONG>o</STRONG>   the window's character cells contain the color pair <EM>value</EM>, but  not
-           the  actual  color  <EM>numbers</EM>.   If cells in the retrieved window use
-           color pairs which have not been created in  the  application  using
+       <STRONG>o</STRONG>   the  window's character cells contain the color pair <EM>value</EM>, but not
+           the actual color <EM>numbers</EM>.  If cells in  the  retrieved  window  use
+           color  pairs  which  have not been created in the application using
            <STRONG>init_pair</STRONG>, they will not be colored when the window is refreshed.
 
 
 </PRE><H3><a name="h3-delay_output">delay_output</a></H3><PRE>
-       The  <STRONG>delay_output</STRONG>  routine  inserts  an <EM>ms</EM> millisecond pause in output.
-       This routine should not be used extensively because padding  characters
-       are  used  rather  than a CPU pause.  If no padding character is speci-
+       The <STRONG>delay_output</STRONG> routine inserts an <EM>ms</EM>  millisecond  pause  in  output.
+       This  routine should not be used extensively because padding characters
+       are used rather than a CPU pause.  If no padding  character  is  speci-
        fied, this uses <STRONG>napms</STRONG> to perform the delay.
 
 
 </PRE><H3><a name="h3-flushinp">flushinp</a></H3><PRE>
-       The <STRONG>flushinp</STRONG> routine throws away any typeahead that has been  typed  by
+       The  <STRONG>flushinp</STRONG>  routine throws away any typeahead that has been typed by
        the user and has not yet been read by the program.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except  for  <STRONG>flushinp</STRONG>,  routines that return an integer return <STRONG>ERR</STRONG> upon
-       failure and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than  <STRONG>ERR</STRONG>")
+       Except for <STRONG>flushinp</STRONG>, routines that return an integer  return  <STRONG>ERR</STRONG>  upon
+       failure  and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")
        upon successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
@@ -244,77 +252,77 @@ <H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                returns an error if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns  an  error if the associated <STRONG>fwrite</STRONG> calls return an er-
+               returns an error if the associated <STRONG>fwrite</STRONG> calls return  an  er-
                ror.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
-       vaguest  terms.   The  description  here is adapted from the XSI Curses
+       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
+       vaguest terms.  The description here is adapted  from  the  XSI  Curses
        standard (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The <STRONG>keyname</STRONG> function may return the names of user-defined string  capa-
-       bilities  which  are defined in the terminfo entry via the <STRONG>-x</STRONG> option of
+       The  <STRONG>keyname</STRONG> function may return the names of user-defined string capa-
+       bilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option  of
        <STRONG>tic</STRONG>.  This implementation automatically assigns at run-time keycodes to
-       user-defined  strings  which  begin  with  "k".   The keycodes start at
+       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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  controls
-       whether  this  data  is loaded when the terminal description is read by
+       because user-defined codes are merged from  all  terminal  descriptions
+       which  have  been loaded.  The <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function controls
+       whether this data is loaded when the terminal description  is  read  by
        the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter/use_tioctl</a></H3><PRE>
-       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <STRONG>ncurses</STRONG>.   They
-       were  not  supported on Version 7, BSD or System V implementations.  It
-       is recommended that any code depending on <STRONG>ncurses</STRONG> extensions be  condi-
+       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <STRONG>ncurses</STRONG>.  They
+       were not supported on Version 7, BSD or System V  implementations.   It
+       is  recommended that any code depending on <STRONG>ncurses</STRONG> extensions be condi-
        tioned using NCURSES_VERSION.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The  files  written  and read by these functions use an implementa-
+       <STRONG>o</STRONG>   The files written and read by these functions  use  an  implementa-
            tion-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 <STRONG>scr_init</STRONG>, etc.)  originated  with
+           Interestingly enough, according to the copyright dates  in  Solaris
+           source,  the  functions (along with <STRONG>scr_init</STRONG>, etc.) originated with
            the University of California, Berkeley (in 1982) and were later (in
-           1988) incorporated into SVr4.  Oddly, there are no  such  functions
+           1988)  incorporated  into SVr4.  Oddly, there are no such functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <STRONG>WINDOW</STRONG> structure to the
-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
+           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
            older <STRONG>ncurses</STRONG> versions.  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
-           <STRONG>fwrite</STRONG>  and  <STRONG>fread</STRONG>  functions).   Those  that use textual dumps use
+           The  implementations  which  use  binary  dumps  use block-I/O (the
+           <STRONG>fwrite</STRONG> and <STRONG>fread</STRONG> 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.  However, reading from a
+           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.  However, reading from  a
            file written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl/wunctrl</a></H3><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.  It  states
+       The  XSI Curses standard, Issue 4 describes these functions.  It states
        that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but
-       does not define any error conditions.  This implementation  checks  for
+       does  not  define any error conditions.  This implementation checks for
        three cases:
 
-       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
            returns the parameter, i.e., a one-character string with the param-
-           eter  as  the  first  character.  Otherwise, it returns "~@", "~A",
+           eter as the first character.  Otherwise,  it  returns  "~@",  "~A",
            etc., analogous to "^@", "^A", C0 controls.
 
            X/Open Curses does not document whether <STRONG>unctrl</STRONG> can be called before
@@ -325,43 +333,43 @@ <H1 class="no-header">curs_util 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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 conven-
+       compile  time,  showing C1 controls from the upper-128 codes with a "~"
+       prefix rather than "^".  Other implementations have  different  conven-
        tions.  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 printable.  This implementation
-       uses  8  bits  but  does  not modify the string to reflect locale.  The
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller to change  the  output
+       uses 8 bits but does not modify the  string  to  reflect  locale.   The
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  function  allows the caller to change the output
        of <STRONG>unctrl</STRONG>.
 
-       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
-       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"  keys  (codes  in  the  range 128 to 255).  Both <STRONG>use_legacy_cod-</STRONG>
-       <STRONG><A HREF="use_legacy_coding.3x.html">ing(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> succeed only after curses is initialized.   X/Open
-       Curses  does  not  document  the  treatment  of codes 128 to 159.  When
+       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
+       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
+       "meta" keys (codes in the range  128  to  255).   Both  <STRONG>use_legacy_cod-</STRONG>
+       <STRONG><A HREF="use_legacy_coding.3x.html">ing(3x)</A></STRONG>  and <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> 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 <STRONG>keyname</STRONG> is called before initializ-
        ing curses), this implementation returns strings "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <STRONG>ncurses</STRONG>
-       does.  However, <STRONG>ncurses</STRONG>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
+       does.   However,  <STRONG>ncurses</STRONG>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env/use_tioctl</a></H3><PRE>
-       If  <STRONG>ncurses</STRONG>  is  configured  to provide the sp-functions extension, the
-       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
-       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
+       If <STRONG>ncurses</STRONG> is configured to provide  the  sp-functions  extension,  the
+       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
+       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
        <STRONG>use_env</STRONG> is not provided by other implementation of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,  <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>legacy_cod-</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>legacy_cod-</STRONG>
        <STRONG><A HREF="legacy_coding.3x.html">ing(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-07-15                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 2a392f4cb..025c55bbe 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index d0637e2f8..f29a4adb6 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 3556c4b9a..6070b8653 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 8a5fa325f..9567c05c1 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index b62cef20e..17f0d080f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 11401622a..4ffbaed6a 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 2b4d2d3fe..b1b1a4651 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index dab0b4cb1..51b378aec 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 4efd4a166..7376ce679 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.116 2023/07/01 15:33:13 tom Exp @
+  * @Id: terminfo.tail,v 1.119 2023/07/15 19:34:31 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1172,9 +1172,14 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        numbered keys and the handful of special named keys) is best done using
        the longer names available using terminfo.
 
+       The ncurses library uses a few of these user-defined  capabilities,  as
+       described  in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities (including
+       function keys) are described in the terminal database, in  the  section
+       on <EM>NCURSES</EM> <EM>USER-DEFINABLE</EM> <EM>CAPABILITIES</EM>
+
 
 </PRE><H3><a name="h3-A-Sample-Entry">A Sample Entry</a></H3><PRE>
-       The  following  entry,  describing  an   ANSI-standard   terminal,   is
+       The   following   entry,   describing  an  ANSI-standard  terminal,  is
        representative of what a <STRONG>terminfo</STRONG> entry for a modern terminal typically
        looks like.
 
@@ -1209,36 +1214,36 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                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 <EM>terminfo</EM> are of three types:
 
-       <STRONG>o</STRONG>   Boolean capabilities which indicate  that  the  terminal  has  some
+       <STRONG>o</STRONG>   Boolean  capabilities  which  indicate  that  the terminal has some
            particular feature,
 
        <STRONG>o</STRONG>   numeric capabilities giving the size of the terminal or the size of
            particular delays, and
 
-       <STRONG>o</STRONG>   string capabilities, which give a sequence which  can  be  used  to
+       <STRONG>o</STRONG>   string  capabilities,  which  give  a sequence which can be used to
            perform particular terminal operations.
 
 
 </PRE><H3><a name="h3-Types-of-Capabilities">Types of Capabilities</a></H3><PRE>
        All capabilities have names.  For instance, the fact that ANSI-standard
-       terminals have <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return  and  line-
-       feed  when the end of a line is reached) is indicated by the capability
-       <STRONG>am</STRONG>.  Hence the description of ansi includes <STRONG>am</STRONG>.   Numeric  capabilities
-       are  followed  by  the  character  "#" and then a positive value.  Thus
+       terminals  have  <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return and line-
+       feed when the end of a line is reached) is indicated by the  capability
+       <STRONG>am</STRONG>.   Hence  the description of ansi includes <STRONG>am</STRONG>.  Numeric capabilities
+       are followed by the character "#" and  then  a  positive  value.   Thus
        <STRONG>cols</STRONG>, which indicates the number of columns the terminal has, gives the
-       value  "80" for ansi.  Values for numeric capabilities may be specified
-       in decimal, octal or hexadecimal,  using  the  C  programming  language
+       value "80" for ansi.  Values for numeric capabilities may be  specified
+       in  decimal,  octal  or  hexadecimal,  using the C programming language
        conventions (e.g., 255, 0377 and 0xff or 0xFF).
 
-       Finally,  string  valued capabilities, such as <STRONG>el</STRONG> (clear to end of line
-       sequence) are given by the two-character  code,  an  "=",  and  then  a
+       Finally, string valued capabilities, such as <STRONG>el</STRONG> (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
+       A number  of  escape  sequences  are  provided  in  the  string  valued
        capabilities for easy encoding of characters there:
 
        <STRONG>o</STRONG>   Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character,
@@ -1256,9 +1261,9 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            respectively.
 
        X/Open Curses does not say what "appropriate <EM>x</EM>" 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
@@ -1274,141 +1279,141 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   and <STRONG>\0</STRONG> for null.
 
            <STRONG>\0</STRONG> 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 <STRONG>stty(1)</STRONG>.
 
-           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
+           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
            implementations.
 
        Finally, characters may be given as three octal digits after a <STRONG>\</STRONG>.
 
-       A  delay  in  milliseconds  may appear anywhere in a string capability,
-       enclosed in $&lt;..&gt; brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;,  and  padding  characters
+       A delay in milliseconds may appear anywhere  in  a  string  capability,
+       enclosed  in  $&lt;..&gt;  brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;, and padding characters
        are supplied by <STRONG><A HREF="curs_terminfo.3x.html">tputs(3x)</A></STRONG> to provide this delay.
 
-       <STRONG>o</STRONG>   The  delay  must  be  a  number  with  at most one decimal place of
+       <STRONG>o</STRONG>   The delay must be a number  with  at  most  one  decimal  place  of
            precision; it may be followed by suffixes "*" or "/" or both.
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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 <EM>lines</EM> affected.)
 
            Normally, padding is advisory if the device has the <STRONG>xon</STRONG> capability;
            it is used for cost computation but does not trigger delays.
 
-       <STRONG>o</STRONG>   A "/" suffix indicates that the padding is mandatory and  forces  a
+       <STRONG>o</STRONG>   A  "/"  suffix indicates that the padding is mandatory and forces a
            delay of the given number of milliseconds even on devices for which
            <STRONG>xon</STRONG> 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
        <STRONG>ind</STRONG> in the example above.
 
 
 </PRE><H3><a name="h3-Fetching-Compiled-Descriptions">Fetching Compiled Descriptions</a></H3><PRE>
-       The <STRONG>ncurses</STRONG> 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, <STRONG>ncurses</STRONG> eliminates
+       The  <STRONG>ncurses</STRONG>  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,  <STRONG>ncurses</STRONG>  eliminates
        duplicates in its search list.
 
-       <STRONG>o</STRONG>   If the environment variable TERMINFO is set, it is  interpreted  as
+       <STRONG>o</STRONG>   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.
 
-       <STRONG>o</STRONG>   If TERMINFO is not set, <STRONG>ncurses</STRONG> will instead look in the  directory
+       <STRONG>o</STRONG>   If  TERMINFO is not set, <STRONG>ncurses</STRONG> will instead look in the directory
            <STRONG>$HOME/.terminfo</STRONG> for a compiled description.
 
-       <STRONG>o</STRONG>   Next,  if  the  environment  variable TERMINFO_DIRS is set, <STRONG>ncurses</STRONG>
-           will interpret the contents of that variable as a  list  of  colon-
+       <STRONG>o</STRONG>   Next, if the environment variable  TERMINFO_DIRS  is  set,  <STRONG>ncurses</STRONG>
+           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 <EM>/usr/share/terminfo</EM>.
 
        <STRONG>o</STRONG>   Finally, <STRONG>ncurses</STRONG> searches these compiled-in locations:
 
            <STRONG>o</STRONG>   a list of directories (no default value), and
 
-           <STRONG>o</STRONG>   the   system   terminfo   directory,  <EM>/usr/share/terminfo</EM>  (the
+           <STRONG>o</STRONG>   the  system  terminfo   directory,   <EM>/usr/share/terminfo</EM>   (the
                compiled-in default).
 
 
 </PRE><H3><a name="h3-Preparing-Descriptions">Preparing Descriptions</a></H3><PRE>
-       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  <EM>terminfo</EM>  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  <EM>terminfo</EM>  and  to build up a
        description gradually, using partial descriptions with <EM>vi</EM> 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
        <EM>terminfo</EM> 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.
 
 
 </PRE><H3><a name="h3-Basic-Capabilities">Basic Capabilities</a></H3><PRE>
-       The  number  of  columns  on each line for the terminal is given by the
-       <STRONG>cols</STRONG> numeric capability.  If the terminal is a CRT, then the number  of
-       lines  on the screen is given by the <STRONG>lines</STRONG> capability.  If the terminal
-       wraps around to the beginning of the next  line  when  it  reaches  the
-       right  margin,  then it should have the <STRONG>am</STRONG> capability.  If the terminal
-       can clear its screen, leaving the cursor in  the  home  position,  then
-       this  is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the terminal
+       The number of columns on each line for the terminal  is  given  by  the
+       <STRONG>cols</STRONG>  numeric capability.  If the terminal is a CRT, then the number of
+       lines on the screen is given by the <STRONG>lines</STRONG> capability.  If the  terminal
+       wraps  around  to  the  beginning  of the next line when it reaches the
+       right margin, then it should have the <STRONG>am</STRONG> capability.  If  the  terminal
+       can  clear  its  screen,  leaving the cursor in the home position, then
+       this is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the  terminal
        overstrikes (rather than clearing a position when a character is struck
-       over)  then  it  should  have  the <STRONG>os</STRONG> capability.  If the terminal is a
+       over) then it should have the <STRONG>os</STRONG> capability.   If  the  terminal  is  a
        printing terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.  (<STRONG>os</STRONG>
-       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 <STRONG>cr</STRONG>.  (Normally
-       this will be carriage return,  control/M.)   If  there  is  a  code  to
+       this  will  be  carriage  return,  control/M.)   If  there is a code to
        produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
 
        If there is a code to move the cursor one position to the left (such as
-       backspace) that capability should be given as <STRONG>cub1</STRONG>.   Similarly,  codes
-       to  move  to the right, up, and down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and
-       <STRONG>cud1</STRONG>.  These local cursor motions should not alter the text  they  pass
-       over,  for  example,  you  would  not normally use "<STRONG>cuf1</STRONG>= " because the
+       backspace)  that  capability should be given as <STRONG>cub1</STRONG>.  Similarly, codes
+       to move to the right, up, and down should be given as <STRONG>cuf1</STRONG>,  <STRONG>cuu1</STRONG>,  and
+       <STRONG>cud1</STRONG>.   These  local cursor motions should not alter the text they pass
+       over, for example, you would not  normally  use  "<STRONG>cuf1</STRONG>= "  because  the
        space would erase the character moved over.
 
        A very important point here is that the local cursor motions encoded in
-       <EM>terminfo</EM>  are  undefined  at  the left and top edges of a CRT terminal.
+       <EM>terminfo</EM> are undefined at the left and top edges  of  a  CRT  terminal.
        Programs should never attempt to backspace around the left edge, unless
-       <STRONG>bw</STRONG>  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
+       <STRONG>bw</STRONG> 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 <STRONG>ind</STRONG> (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 <STRONG>ri</STRONG> (reverse index) string.  The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG>
        are undefined when not on their respective corners of the screen.
 
-       Parameterized  versions  of  the  scrolling  sequences are <STRONG>indn</STRONG> and <STRONG>rin</STRONG>
-       which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they  take  one
-       parameter,  and scroll that many lines.  They are also undefined except
+       Parameterized versions of the scrolling  sequences  are  <STRONG>indn</STRONG>  and  <STRONG>rin</STRONG>
+       which  have  the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they take one
+       parameter, and scroll that many lines.  They are also undefined  except
        at the appropriate edge of the screen.
 
-       The <STRONG>am</STRONG> 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 <STRONG>cuf1</STRONG> from the last column.  The only local motion  which  is  defined
-       from  the  left  edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge
-       will move to the right edge of the previous row.  If <STRONG>bw</STRONG> is  not  given,
-       the  effect  is undefined.  This is useful for drawing a box around the
+       The  <STRONG>am</STRONG> 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  <STRONG>cuf1</STRONG>  from  the last column.  The only local motion which is defined
+       from the left edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from  the  left  edge
+       will  move  to the right edge of the previous row.  If <STRONG>bw</STRONG> 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 <EM>terminfo</EM> file usually assumes that this is on;
-       i.e., <STRONG>am</STRONG>.  If the terminal has a  command  which  moves  to  the  first
-       column  of  the  next line, that command can be given as <STRONG>nel</STRONG> (newline).
-       It does not matter if the command clears the remainder of  the  current
-       line,  so  if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to
+       automatic margins, the <EM>terminfo</EM> file usually assumes that this  is  on;
+       i.e.,  <STRONG>am</STRONG>.   If  the  terminal  has  a command which moves to the first
+       column of the next line, that command can be given  as  <STRONG>nel</STRONG>  (newline).
+       It  does  not matter if the command clears the remainder of the current
+       line, so if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be  possible  to
        craft a working <STRONG>nel</STRONG> out of one or both of them.
 
        These  capabilities  suffice  to  describe  hard-copy  and  "glass-tty"
@@ -1426,19 +1431,19 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Parameterized-Strings">Parameterized Strings</a></H3><PRE>
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
-       terminal are described  by  a  parameterized  string  capability,  with
-       <EM>printf</EM>-like  escapes  such  as  <EM>%x</EM>  in it.  For example, to address the
-       cursor, the <STRONG>cup</STRONG> 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
+       terminal  are  described  by  a  parameterized  string capability, with
+       <EM>printf</EM>-like escapes such as <EM>%x</EM> in it.   For  example,  to  address  the
+       cursor,  the <STRONG>cup</STRONG> 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 by <STRONG>mrcup</STRONG>.
 
-       The parameter mechanism uses a stack and special <STRONG>%</STRONG> 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
+       The  parameter mechanism uses a stack and special <STRONG>%</STRONG> 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 <STRONG>sgr</STRONG> string.
 
        The <STRONG>%</STRONG> encodings have the following meanings:
@@ -1446,7 +1451,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>%%</STRONG>   outputs "%"
 
        <STRONG>%</STRONG><EM>[[</EM>:<EM>]flags][width[.precision]][</EM><STRONG>doxXs</STRONG><EM>]</EM>
-            as  in  <STRONG>printf(3)</STRONG>,  flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a ":" to allow
+            as in <STRONG>printf(3)</STRONG>, flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a  ":"  to  allow
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
@@ -1469,39 +1474,39 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>%g</STRONG><EM>[A-Z]</EM>
             get static variable <EM>[a-z]</EM> 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 <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact is not
+            not reset between calls to <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact  is  not
             documented in other implementations.  Relying on it will adversely
             impact portability to other implementations:
 
-            <STRONG>o</STRONG>   SVr2  curses  supported <EM>dynamic</EM> variables.  Those are set only
-                by a <STRONG>%P</STRONG> operator.  A <STRONG>%g</STRONG> for a  given  variable  without  first
-                setting  it  with  <STRONG>%P</STRONG> will give unpredictable results, because
-                dynamic variables are an  uninitialized  local  array  on  the
+            <STRONG>o</STRONG>   SVr2 curses supported <EM>dynamic</EM> variables.  Those are  set  only
+                by  a  <STRONG>%P</STRONG>  operator.   A <STRONG>%g</STRONG> for a given variable without first
+                setting it with <STRONG>%P</STRONG> will give  unpredictable  results,  because
+                dynamic  variables  are  an  uninitialized  local array on the
                 stack in the <STRONG>tparm</STRONG> function.
 
-            <STRONG>o</STRONG>   SVr3.2  curses supported <EM>static</EM> variables.  Those are an array
+            <STRONG>o</STRONG>   SVr3.2 curses supported <EM>static</EM> variables.  Those are an  array
                 in the <STRONG>TERMINAL</STRONG> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
                 automatically when the <STRONG>setupterm</STRONG> function allocates the data.
 
             <STRONG>o</STRONG>   SVr4 curses made no further improvements to the <EM>dynamic/static</EM>
                 variable feature.
 
-            <STRONG>o</STRONG>   Solaris XPG4 curses does not distinguish between  <EM>dynamic</EM>  and
-                <EM>static</EM>  variables.  They are the same.  Like SVr4 curses, XPG4
+            <STRONG>o</STRONG>   Solaris  XPG4  curses does not distinguish between <EM>dynamic</EM> and
+                <EM>static</EM> variables.  They are the same.  Like SVr4 curses,  XPG4
                 curses does not initialize these explicitly.
 
-            <STRONG>o</STRONG>   Before version 6.3, ncurses stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
+            <STRONG>o</STRONG>   Before  version  6.3,  ncurses  stores both <EM>dynamic</EM> and <EM>static</EM>
                 variables in persistent storage, initialized to zeros.
 
-            <STRONG>o</STRONG>   Beginning  with version 6.3, ncurses stores <EM>static</EM> and <EM>dynamic</EM>
+            <STRONG>o</STRONG>   Beginning with version 6.3, ncurses stores <EM>static</EM> and  <EM>dynamic</EM>
                 variables in the same manner as SVr4.
 
-                <STRONG>o</STRONG>   Unlike  other  implementations,  ncurses   zeros   dynamic
+                <STRONG>o</STRONG>   Unlike   other   implementations,  ncurses  zeros  dynamic
                     variables before the first <STRONG>%g</STRONG> or <STRONG>%P</STRONG> operator.
 
-                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in ncurses is
+                <STRONG>o</STRONG>   Like SVr2, the scope of dynamic variables  in  ncurses  is
                     within the current call to <STRONG>tparm</STRONG>.  Use static variables if
                     persistent storage is needed.
 
@@ -1531,8 +1536,8 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>%?</STRONG> <EM>expr</EM> <STRONG>%t</STRONG> <EM>thenpart</EM> <STRONG>%e</STRONG> <EM>elsepart</EM> <STRONG>%;</STRONG>
             This forms an if-then-else.  The <STRONG>%e</STRONG> <EM>elsepart</EM> is optional.  Usually
-            the <STRONG>%?</STRONG> <EM>expr</EM> part pushes a value onto the stack,  and  <STRONG>%t</STRONG>  pops  it
-            from  the  stack,  testing if it is nonzero (true).  If it is zero
+            the  <STRONG>%?</STRONG>  <EM>expr</EM>  part  pushes a value onto the stack, and <STRONG>%t</STRONG> pops it
+            from the stack, testing if it is nonzero (true).  If  it  is  zero
             (false), control passes to the <STRONG>%e</STRONG> (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1540,81 +1545,81 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
             where ci are conditions, bi are bodies.
 
-            Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the  structure  of  if-
+            Use  the  <STRONG>-f</STRONG>  option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the structure of if-
             then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can be very complicated when
-            written on one line.  The <STRONG>-f</STRONG> option splits the string  into  lines
+            written  on  one line.  The <STRONG>-f</STRONG> 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}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
+       Binary operations are in postfix form with the operands  in  the  usual
+       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  <STRONG>%P</STRONG> and <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-       sent \E&amp;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    <STRONG>cup</STRONG>    capability    is
+       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
+       sent  \E&amp;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   <STRONG>cup</STRONG>   capability   is
        "cup=6\E&amp;%p2%2dc%p1%2dY".
 
-       The  Microterm ACT-IV needs the current row and column sent preceded by
-       a  <STRONG>^T</STRONG>,  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 (<STRONG>cub1</STRONG>), and to move the cursor up one line on  the
-       screen  (<STRONG>cuu1</STRONG>).   This  is  necessary  because it is not always safe to
-       transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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   <STRONG>^T</STRONG>,   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 (<STRONG>cub1</STRONG>), and to move the cursor up one line on the
+       screen (<STRONG>cuu1</STRONG>).  This is necessary because it  is  not  always  safe  to
+       transmit  <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
-       If  the  terminal has a fast way to home the cursor (to very upper left
-       corner of screen) then this can be given as <STRONG>home</STRONG>; similarly a fast  way
-       of  getting  to the lower left-hand corner can be given as <STRONG>ll</STRONG>; 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 <STRONG>home</STRONG>; similarly a fast way
+       of getting to the lower left-hand corner can be given as <STRONG>ll</STRONG>;  this  may
        involve going up with <STRONG>cuu1</STRONG> from the home position, but a program should
        never do this itself (unless <STRONG>ll</STRONG> 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
+       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 cannot be used for <STRONG>home</STRONG>.)
 
        If the terminal has row or column absolute cursor addressing, these can
-       be given as single  parameter  capabilities  <STRONG>hpa</STRONG>  (horizontal  position
-       absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
-       parameterized local motions (e.g., move <EM>n</EM> spaces to  the  right)  these
-       can  be  given  as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with a single parameter
-       indicating how many spaces to move.  These are primarily useful if  the
+       be  given  as  single  parameter  capabilities <STRONG>hpa</STRONG> (horizontal position
+       absolute) and <STRONG>vpa</STRONG> (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  <STRONG>cup</STRONG>.   If  there   are
+       parameterized  local  motions  (e.g., move <EM>n</EM> spaces to the right) these
+       can be given as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with  a  single  parameter
+       indicating  how many spaces to move.  These are primarily useful if the
        terminal does not have <STRONG>cup</STRONG>, 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 <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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
+       be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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.  This is also used for
-       the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets the command character  to  be  the
-       one  used  by  terminfo.   If  the  <STRONG>smcup</STRONG> sequence will not restore the
-       screen after an <STRONG>rmcup</STRONG>  sequence  is  output  (to  the  state  prior  to
+       the  TEKTRONIX  4025,  where <STRONG>smcup</STRONG> sets the command character to be the
+       one used by terminfo.  If the  <STRONG>smcup</STRONG>  sequence  will  not  restore  the
+       screen  after  an  <STRONG>rmcup</STRONG>  sequence  is  output  (to  the state prior to
        outputting <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       SVr4  (and  X/Open Curses) list several string capabilities for setting
-       margins.  Two were intended for use with  terminals,  and  another  six
+       SVr4 (and X/Open Curses) list several string capabilities  for  setting
+       margins.   Two  were  intended  for use with terminals, and another six
        were intended for use with printers.
 
        <STRONG>o</STRONG>   The two terminal capabilities assume that the terminal may have the
-           capability of setting the left and/or right margin at  the  current
+           capability  of  setting the left and/or right margin at the current
            cursor column position.
 
        <STRONG>o</STRONG>   The printer capabilities assume that the printer may have two types
@@ -1623,31 +1628,31 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
+           <STRONG>o</STRONG>   parameterized capabilities for setting the top,  bottom,  left,
                right margins given the number of rows or columns.
 
-       In practice, the categorization into "terminal" and  "printer"  is  not
+       In  practice,  the  categorization into "terminal" and "printer" is not
        suitable:
 
-       <STRONG>o</STRONG>   The  AT&amp;T  SVr4  terminal  database  uses <STRONG>smgl</STRONG> four times, for AT&amp;T
+       <STRONG>o</STRONG>   The AT&amp;T SVr4 terminal database uses  <STRONG>smgl</STRONG>  four  times,  for  AT&amp;T
            hardware.
 
-           Three of the four are printers.   They  lack  the  ability  to  set
+           Three  of  the  four  are  printers.   They lack the ability to set
            left/right margins by specifying the column.
 
-       <STRONG>o</STRONG>   Other  (non-AT&amp;T) terminals may support margins but using different
+       <STRONG>o</STRONG>   Other (non-AT&amp;T) terminals may support margins but using  different
            assumptions from AT&amp;T.
 
-           For instance, the DEC VT420 supports left/right margins,  but  only
+           For  instance,  the DEC VT420 supports left/right margins, but only
            using a column parameter.  As an added complication, the VT420 uses
-           two settings to fully enable left/right margins (left/right  margin
-           mode,  and  origin  mode).   The  former enables the margins, which
-           causes printed text to wrap  within  margins,  but  the  latter  is
+           two  settings to fully enable left/right margins (left/right margin
+           mode, and origin mode).  The  former  enables  the  margins,  which
+           causes  printed  text  to  wrap  within  margins, but the latter is
            needed to prevent cursor-addressing outside those margins.
 
-       <STRONG>o</STRONG>   Both  DEC  VT420  left/right  margins are set with a single control
+       <STRONG>o</STRONG>   Both DEC VT420 left/right margins are set  with  a  single  control
            sequence.  If either is omitted, the corresponding margin is set to
-           the  left  or  right  edge  of the display (rather than leaving the
+           the left or right edge of the  display  (rather  than  leaving  the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1665,232 +1670,232 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                 smglr      Set both left and right margins to <EM>L</EM> and <EM>R</EM>
                 smgtb      Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
-       When writing an application that uses these  string  capabilities,  the
-       pairs  should be first checked to see if each capability in the pair is
+       When  writing  an  application that uses these string capabilities, the
+       pairs should be first checked to see if each capability in the pair  is
        set or only one is set:
 
-       <STRONG>o</STRONG>   If both <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG>  are  set,  each  is  used  with  a  single
-           argument,  <EM>N</EM>,  that  gives  the column number of the left and right
+       <STRONG>o</STRONG>   If  both  <STRONG>smglp</STRONG>  and  <STRONG>smgrp</STRONG>  are  set,  each  is used with a single
+           argument, <EM>N</EM>, that gives the column number of  the  left  and  right
            margin, respectively.
 
-       <STRONG>o</STRONG>   If both <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> are set, each is used to set  the  top  and
+       <STRONG>o</STRONG>   If  both  <STRONG>smgtp</STRONG>  and <STRONG>smgbp</STRONG> are set, each is used to set the top and
            bottom margin, respectively:
 
            <STRONG>o</STRONG>   <STRONG>smgtp</STRONG> is used with a single argument, <EM>N</EM>, the line number of the
                top margin.
 
-           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG> is used with two arguments, <EM>N</EM> and <EM>M</EM>, that give  the  line
+           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG>  is  used with two arguments, <EM>N</EM> and <EM>M</EM>, that give the line
                number of the bottom margin, the first counting from the top of
-               the page  and  the  second  counting  from  the  bottom.   This
-               accommodates  the two styles of specifying the bottom margin in
+               the  page  and  the  second  counting  from  the  bottom.  This
+               accommodates the two styles of specifying the bottom margin  in
                different manufacturers' printers.
 
-           When designing a terminfo entry for a printer that has  a  settable
-           bottom  margin,  only  the first or second argument should be used,
+           When  designing  a terminfo entry for a printer that has a settable
+           bottom margin, only the first or second argument  should  be  used,
            depending on the printer.  When developing an application that uses
            <STRONG>smgbp</STRONG> to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       <STRONG>o</STRONG>   If  only  one  of  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it is used with two
+       <STRONG>o</STRONG>   If only one of <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it  is  used  with  two
            arguments, the column number of the left and right margins, in that
            order.
 
-       <STRONG>o</STRONG>   Likewise,  if  only  one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then it is used
-           with two arguments that give the top and bottom  margins,  in  that
+       <STRONG>o</STRONG>   Likewise, if only one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then  it  is  used
+           with  two  arguments  that give the top and bottom margins, in that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both left and right or top and bottom margins simultaneously,  only
-           one  capability  in  the  pairs  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG>
+           both  left and right or top and bottom margins simultaneously, only
+           one capability in the pairs <STRONG>smglp</STRONG> and  <STRONG>smgrp</STRONG>  or  <STRONG>smgtp</STRONG>  and  <STRONG>smgbp</STRONG>
            should be defined, leaving the other unset.
 
-       Except for very old terminal descriptions, e.g.,  those  developed  for
-       SVr4,  the  scheme  just  described  should be considered obsolete.  An
+       Except  for  very  old terminal descriptions, e.g., those developed for
+       SVr4, the scheme just described  should  be  considered  obsolete.   An
        improved set of capabilities was added late in the SVr4 releases (<STRONG>smglr</STRONG>
-       and  <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting the
+       and <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting  the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The <STRONG>mgc</STRONG> string capability should  be  defined.   Applications  such  as
+       The  <STRONG>mgc</STRONG>  string  capability  should  be defined.  Applications such as
        <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG> rely upon this to reset all margins.
 
 
 </PRE><H3><a name="h3-Area-Clears">Area Clears</a></H3><PRE>
-       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  <STRONG>el</STRONG>.   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  <STRONG>el1</STRONG>.  If the terminal can clear from the current position to
-       the end of the display, then this should be given as <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  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 <STRONG>el</STRONG>.  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 <STRONG>el1</STRONG>.  If the terminal can clear from the current  position  to
+       the  end  of  the display, then this should be given as <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> 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  <STRONG>ed</STRONG>  is  not
+       a  request  to  delete  a  large  number  of lines, if a true <STRONG>ed</STRONG> is not
        available.)
 
 
 </PRE><H3><a name="h3-Insert_delete-line-and-vertical-motions">Insert/delete line and vertical motions</a></H3><PRE>
-       If  the  terminal  can  open a new blank line before the line where the
-       cursor is, this should be given as <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; 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 <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; this is done only from the  first
        position on the line to be deleted.  Versions of <STRONG>il1</STRONG> and <STRONG>dl1</STRONG> which take
        a single parameter and insert or delete that many lines can be given as
        <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
 
-       If the terminal has a settable scrolling region (like  the  vt100)  the
-       command  to  set  this  can be described with the <STRONG>csr</STRONG> capability, which
+       If  the  terminal  has a settable scrolling region (like the vt100) the
+       command to set this can be described with  the  <STRONG>csr</STRONG>  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 <STRONG>csr</STRONG> on
-       a properly chosen region; the <STRONG>sc</STRONG>  and  <STRONG>rc</STRONG>  (save  and  restore  cursor)
+       It is possible to get the effect of insert or delete line using <STRONG>csr</STRONG>  on
+       a  properly  chosen  region;  the  <STRONG>sc</STRONG>  and <STRONG>rc</STRONG> (save and restore cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string does not move the cursor.  (Note that  the  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  library
-       does   this   synthesis   automatically,   so   you  need  not  compose
+       string  does  not  move the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library
+       does  this  synthesis  automatically,   so   you   need   not   compose
        insert/delete strings for an entry with <STRONG>csr</STRONG>).
 
-       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   however   also   has
+       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  however  also  has
        insert/delete).
 
-       Inserting  lines  at  the  top or bottom of the screen can also be done
-       using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
+       Inserting lines at the top or bottom of the screen  can  also  be  done
+       using  <STRONG>ri</STRONG>  or  <STRONG>ind</STRONG> on many terminals without a true insert/delete line,
        and is often faster even on terminals with those features.
 
-       The  boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
-       of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
-       off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
-       non-destructive.   System  V  and XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
+       The boolean <STRONG>non_dest_scroll_region</STRONG> 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 something to the bottom line, move the cursor to the top
+       of the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data  scrolled
+       off  the  bottom  of the region by the <STRONG>ri</STRONG> re-appears, then scrolling is
+       non-destructive.  System V and XSI Curses expect that  <STRONG>ind</STRONG>,  <STRONG>ri</STRONG>,  <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
-       cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
-       implementation is more  liberal  and  will  do  explicit  erases  after
+       cautions you not to define  <STRONG>csr</STRONG>  unless  this  is  true.   This  <STRONG>curses</STRONG>
+       implementation  is  more  liberal  and  will  do  explicit erases after
        scrolling if <STRONG>ndsrc</STRONG> 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  <STRONG>wind</STRONG>.  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 <STRONG>wind</STRONG>.  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 <STRONG>da</STRONG> capability
-       should  be  given;  if  display  memory  can be retained below, then <STRONG>db</STRONG>
-       should be given.  These indicate that deleting a line or scrolling  may
-       bring  non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG> may
+       should be given; if display memory  can  be  retained  below,  then  <STRONG>db</STRONG>
+       should  be given.  These indicate that deleting a line or scrolling may
+       bring non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG>  may
        bring down non-blank lines.
 
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
-       There are two basic kinds of  intelligent  terminals  with  respect  to
-       insert/delete  character  which  can  be described using <EM>terminfo.</EM>  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
+       There  are  two  basic  kinds  of intelligent terminals with respect to
+       insert/delete character which can be  described  using  <EM>terminfo.</EM>   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 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
-       second  type  of  terminal,  and  should  give the capability <STRONG>in</STRONG>, which
+       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
+       second type of terminal, and  should  give  the  capability  <STRONG>in</STRONG>,  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 <STRONG>smir</STRONG> the sequence to get into insert mode.  Give
-       as <STRONG>rmir</STRONG> the sequence to leave  insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
-       sequence  needed  to  be  sent  just before sending the character to be
-       inserted.  Most terminals with a true insert mode will not  give  <STRONG>ich1</STRONG>;
-       terminals  which  send a sequence to open a screen position should give
+       as  <STRONG>rmir</STRONG>  the  sequence  to  leave  insert  mode.  Now give as <STRONG>ich1</STRONG> any
+       sequence needed to be sent just before  sending  the  character  to  be
+       inserted.   Most  terminals with a true insert mode will not give <STRONG>ich1</STRONG>;
+       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  <STRONG>ich1</STRONG>.
-       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  <STRONG>ich</STRONG>  sequences do not require previous smir, and most smir insert
-       modes do not require <STRONG>ich1</STRONG> before each character.   Therefore,  the  new
-       <STRONG>curses</STRONG>  actually  assumes this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or
-       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> 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 <STRONG>ich1</STRONG>.
+       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 <STRONG>ich</STRONG> sequences do not require previous smir, and most  smir  insert
+       modes  do  not  require <STRONG>ich1</STRONG> before each character.  Therefore, the new
+       <STRONG>curses</STRONG> actually assumes this is the case and uses either  <STRONG>rmir</STRONG>/<STRONG>smir</STRONG>  or
+       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  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 <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in  <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be sent
+       in <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be  sent
        after an insert of a single character may also be given in <STRONG>ip</STRONG>.  If your
-       terminal  needs  both  to be placed into an "insert mode" and a special
-       code to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>  and  <STRONG>ich1</STRONG>
-       can  be  given,  and  both  will be used.  The <STRONG>ich</STRONG> capability, with one
+       terminal needs both to be placed into an "insert mode"  and  a  special
+       code  to  precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> and <STRONG>ich1</STRONG>
+       can be given, and both will be used.   The  <STRONG>ich</STRONG>  capability,  with  one
        parameter, <EM>n</EM>, will repeat the effects of <STRONG>ich1</STRONG> <EM>n</EM> 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 <STRONG>rmp</STRONG>.
 
-       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 <STRONG>mir</STRONG> to  speed  up  inserting  in  this
-       case.   Omitting  <STRONG>mir</STRONG>  will affect only speed.  Some terminals (notably
-       Datamedia's) must not have <STRONG>mir</STRONG> 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 <STRONG>mir</STRONG> to speed up inserting in this
+       case.  Omitting <STRONG>mir</STRONG> will affect only speed.   Some  terminals  (notably
+       Datamedia's)  must  not  have  <STRONG>mir</STRONG> because of the way their insert mode
        works.
 
-       Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
-       one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> and  delete  mode  by  giving
-       <STRONG>smdc</STRONG>  and  <STRONG>rmdc</STRONG>  to  enter  and exit delete mode (any mode the terminal
+       Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
+       one  parameter,  <EM>n</EM>,  to  delete <EM>n</EM> <EM>characters,</EM> and delete mode by giving
+       <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit delete  mode  (any  mode  the  terminal
        needs to be placed in for <STRONG>dch1</STRONG> to work).
 
-       A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
+       A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
 </PRE><H3><a name="h3-Highlighting_-Underlining_-and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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  <EM>standout</EM>  <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, 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 <EM>standout</EM> <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>,  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
        <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as <STRONG>smul</STRONG> and
        <STRONG>rmul</STRONG> 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 <STRONG>uc</STRONG>.
 
-       Other  capabilities  to  enter various highlighting modes include <STRONG>blink</STRONG>
-       (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> (dim or  half-bright)  <STRONG>invis</STRONG>
-       (blanking  or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>
-       (turn off <EM>all</EM> attribute modes) <STRONG>smacs</STRONG>  (enter  alternate  character  set
+       Other capabilities to enter various highlighting  modes  include  <STRONG>blink</STRONG>
+       (blinking)  <STRONG>bold</STRONG>  (bold or extra bright) <STRONG>dim</STRONG> (dim or half-bright) <STRONG>invis</STRONG>
+       (blanking or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video)  <STRONG>sgr0</STRONG>
+       (turn  off  <EM>all</EM>  attribute  modes) <STRONG>smacs</STRONG> (enter alternate character set
        mode) and <STRONG>rmacs</STRONG> (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  <STRONG>sgr</STRONG> (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  <STRONG>sgr</STRONG>, only those for which corresponding
+       If  there  is  a  sequence to set arbitrary combinations of modes, this
+       should be given as <STRONG>sgr</STRONG> (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 <STRONG>sgr</STRONG>,  only  those  for  which  corresponding
        separate attribute commands exist.
 
        For example, the DEC vt220 supports most of the modes:
@@ -1908,17 +1913,17 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                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
-       terminal  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
+       terminal 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
-       output when either p1 or p3 is true, that is,  if  either  standout  or
+       Some sequences are common to  different  modes.   For  example,  ;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 dependencies yields
@@ -1939,54 +1944,54 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            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
+       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
+       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  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> capability, asserting that it  is
+       Terminals   with  the  "magic  cookie"  glitch  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> 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 <STRONG>flash</STRONG>;  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 <STRONG>flash</STRONG>; 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
        <STRONG>cvvis</STRONG>.  If there is a way to make the cursor completely invisible, give
-       that  as  <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which undoes the
+       that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> 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 <STRONG>ul</STRONG>.  If  a  character  overstriking  another
-       leaves  both  characters  on the screen, specify the capability <STRONG>os</STRONG>.  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  <STRONG>ul</STRONG>.  If a character overstriking another
+       leaves both characters on the screen, specify the  capability  <STRONG>os</STRONG>.   If
        overstrikes are erasable with a blank, then this should be indicated by
        giving <STRONG>eo</STRONG>.
 
 
 </PRE><H3><a name="h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></H3><PRE>
-       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
-       to  transmit  or  not  transmit,  give  these  codes  as <STRONG>smkx</STRONG> and <STRONG>rmkx</STRONG>.
+       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
+       to transmit or not  transmit,  give  these  codes  as  <STRONG>smkx</STRONG>  and  <STRONG>rmkx</STRONG>.
        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 <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG>
+       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
+       and home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>  <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG>  and  <STRONG>khome</STRONG>
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes  they  send  can  be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys
-       have labels other than the default f0 through f10, the  labels  can  be
+       codes they send can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG>  <STRONG>kf10</STRONG>.   If  these  keys
+       have  labels  other  than the default f0 through f10, the labels can be
        given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.
 
        The codes transmitted by certain other special keys can be given:
@@ -2025,64 +2030,64 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   <STRONG>khts</STRONG> (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  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,
-       <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.   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 <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>,
+       <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  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 <STRONG>pfkey</STRONG>, <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>.
-       A  string to program screen labels should be specified as <STRONG>pln</STRONG>.  Each of
-       these strings takes two parameters: the function key number to  program
+       A string to program screen labels should be specified as <STRONG>pln</STRONG>.  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 <STRONG>pfkey</STRONG> causes
-       pressing the given key to be the same as  the  user  typing  the  given
-       string;  <STRONG>pfloc</STRONG>  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  <STRONG>pfkey</STRONG>  causes
+       pressing  the  given  key  to  be the same as the user typing the given
+       string; <STRONG>pfloc</STRONG> causes the string to  be  executed  by  the  terminal  in
        local; and <STRONG>pfx</STRONG> causes the string to be transmitted to the computer.
 
-       The capabilities <STRONG>nlab</STRONG>, <STRONG>lw</STRONG> and <STRONG>lh</STRONG>  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  <STRONG>smln</STRONG>  and  <STRONG>rmln</STRONG>.   <STRONG>smln</STRONG>  is
-       normally  output  after one or more pln sequences to make sure that the
+       The  capabilities  <STRONG>nlab</STRONG>,  <STRONG>lw</STRONG>  and  <STRONG>lh</STRONG> 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 <STRONG>smln</STRONG> and <STRONG>rmln</STRONG>.  <STRONG>smln</STRONG> is
+       normally output after one or more pln sequences to make sure  that  the
        change becomes visible.
 
 
 </PRE><H3><a name="h3-Tabs-and-Initialization">Tabs and Initialization</a></H3><PRE>
        A few capabilities are used only for tabs:
 
-       <STRONG>o</STRONG>   If the terminal has hardware tabs, the command to  advance  to  the
+       <STRONG>o</STRONG>   If  the  terminal  has hardware tabs, the command to advance to the
            next tab stop can be given as <STRONG>ht</STRONG> (usually control/I).
 
        <STRONG>o</STRONG>   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as <STRONG>cbt</STRONG>.
 
-           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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> 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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> even if they are present, since
            the user may not have the tab stops properly set.
 
-       <STRONG>o</STRONG>   If  the  terminal has hardware tabs which are initially set every <EM>n</EM>
+       <STRONG>o</STRONG>   If the terminal has hardware tabs which are initially set  every  <EM>n</EM>
            spaces when the terminal is powered up, the numeric parameter <STRONG>it</STRONG> is
            given, showing the number of spaces the tabs are set to.
 
            The <STRONG>it</STRONG> capability is normally used by the <STRONG>tset</STRONG> 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
 
        <STRONG>o</STRONG>   <STRONG>is1</STRONG>, <STRONG>is2</STRONG>, and <STRONG>is3</STRONG>, initialization strings for the terminal,
 
-       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>,  the  path  name  of  a  program to be run to initialize the
+       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>, the path name of a program  to  be  run  to  initialize  the
            terminal,
 
        <STRONG>o</STRONG>   and <STRONG>if</STRONG>, 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 <EM>init</EM> option of the <STRONG>tput</STRONG>  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  <EM>init</EM> option of the <STRONG>tput</STRONG> program, each time the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -2106,34 +2111,34 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
               and finally output
                      <STRONG>is3</STRONG>.
 
-       Most  initialization  is  done with <STRONG>is2</STRONG>.  Special terminal modes can be
-       set up without duplicating strings by putting the common  sequences  in
+       Most initialization is done with <STRONG>is2</STRONG>.  Special terminal  modes  can  be
+       set  up  without duplicating strings by putting the common sequences in
        <STRONG>is2</STRONG> and special cases in <STRONG>is1</STRONG> and <STRONG>is3</STRONG>.
 
-       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 <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
-       and  <STRONG>is3</STRONG>  respectively.   These  strings  are output by <EM>reset</EM> option of
-       <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which  is  used  when
+       and <STRONG>is3</STRONG> respectively.  These strings are  output  by  <EM>reset</EM>  option  of
+       <STRONG>tput</STRONG>,  or  by  the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
        the terminal gets into a wedged state.  Commands are normally placed in
        <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> 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  <STRONG>is2</STRONG>,  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 <STRONG>is2</STRONG>, 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 <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>,  etc.,  in  the  same
-       order  as  the  <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc.  If
-       any of <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are  missing,  the
-       <STRONG>reset</STRONG>   program   falls  back  upon  the  corresponding  initialization
+       The  <STRONG>reset</STRONG>  program  writes  strings including <STRONG>iprog</STRONG>, etc., in the same
+       order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of  <STRONG>is1</STRONG>,  etc.   If
+       any  of  <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are missing, the
+       <STRONG>reset</STRONG>  program  falls  back  upon  the   corresponding   initialization
        capability 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
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (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 <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
-       The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
-       command, although the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>)  provide  different
+       The <STRONG>tput</STRONG> <STRONG>reset</STRONG> command uses the same capability strings  as  the  <STRONG>reset</STRONG>
+       command,  although  the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>) provide different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -2142,78 +2147,78 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every <EM>eight</EM> columns:
 
-           The  only  exception  was  the  AT&amp;T 2300 series, which set tabs to
+           The only exception was the AT&amp;T 2300  series,  which  set  tabs  to
            every <EM>five</EM> columns.
 
-       <STRONG>o</STRONG>   In particular, developers  of  the  hardware  terminals  which  are
-           commonly  used  as  models  for  modern terminal emulators provided
+       <STRONG>o</STRONG>   In  particular,  developers  of  the  hardware  terminals which are
+           commonly used as models  for  modern  terminal  emulators  provided
            documentation demonstrating that <EM>eight</EM> columns were the standard.
 
        <STRONG>o</STRONG>   Because of this, the terminal initialization programs <STRONG>tput</STRONG> and <STRONG>tset</STRONG>
-           use   the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)  capabilities
-           directly only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a  value
+           use  the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)   capabilities
+           directly  only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a value
            other than <EM>eight</EM>.
 
 
 </PRE><H3><a name="h3-Delays-and-Padding">Delays and Padding</a></H3><PRE>
-       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
+       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 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 <STRONG>xon</STRONG>.  This capability suppresses  the  emission  of
-       padding.   You  can  also  set  it  for  memory-mapped  console devices
+       automatically emits ^S back to the host  when  its  input  buffers  are
+       close  to  full),  set <STRONG>xon</STRONG>.  This capability 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 decisions about
+       still be included so that routines  can  make  better  decisions  about
        relative costs, but actual pad characters will not be transmitted.
 
        If <STRONG>pb</STRONG> (padding baud rate) is given, padding is suppressed at baud rates
-       below  the  value  of  <STRONG>pb</STRONG>.  If the entry has no padding baud rate, then
+       below the value of <STRONG>pb</STRONG>.  If the entry has no  padding  baud  rate,  then
        whether padding is emitted or not is completely controlled by <STRONG>xon</STRONG>.
 
-       If the terminal requires other than a null (zero) character as  a  pad,
-       then  this  can  be  given as <STRONG>pad</STRONG>.  Only the first character of the <STRONG>pad</STRONG>
+       If  the  terminal requires other than a null (zero) character as a pad,
+       then this can be given as <STRONG>pad</STRONG>.  Only the first  character  of  the  <STRONG>pad</STRONG>
        string is used.
 
 
 </PRE><H3><a name="h3-Status-Lines">Status Lines</a></H3><PRE>
-       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 <STRONG>lines</STRONG> 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 <STRONG>hs</STRONG> capability.
 
-       Some  terminals  with status lines need special sequences to access the
-       status line.  These may be expressed as a string with single  parameter
-       <STRONG>tsl</STRONG>  which takes the cursor to a given zero-origin column on the status
-       line.  The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen  cursor
+       Some terminals with status lines need special sequences to  access  the
+       status  line.  These may be expressed as a string with single parameter
+       <STRONG>tsl</STRONG> which takes the cursor to a given zero-origin column on the  status
+       line.   The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen cursor
        positions before the last <STRONG>tsl</STRONG>.  You may need to embed the string values
-       of <STRONG>sc</STRONG> (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and  <STRONG>fsl</STRONG>  to
+       of  <STRONG>sc</STRONG>  (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and <STRONG>fsl</STRONG> 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 <STRONG>wsl</STRONG>.
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The  boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
+       The boolean capability <STRONG>eslok</STRONG> specifies  that  escape  sequences,  tabs,
        etc., work ordinarily in the status line.
 
-       The <STRONG>ncurses</STRONG> implementation does not yet use any of these  capabilities.
+       The  <STRONG>ncurses</STRONG> implementation does not yet use any of these capabilities.
        They are documented here in case they ever become important.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Many  terminals have alternate character sets useful for forms-drawing.
-       Terminfo and <STRONG>curses</STRONG> have built-in  support  for  most  of  the  drawing
-       characters  supported  by the VT100, with some characters from the AT&amp;T
-       4410v1 added.  This alternate character set may  be  specified  by  the
+       Many terminals have alternate character sets useful for  forms-drawing.
+       Terminfo  and  <STRONG>curses</STRONG>  have  built-in  support  for most of the drawing
+       characters supported by the VT100, with some characters from  the  AT&amp;T
+       4410v1  added.   This  alternate  character set may be specified by the
        <STRONG>acsc</STRONG> capability.
 
          <STRONG>Glyph</STRONG>                       <STRONG>ACS</STRONG>            <STRONG>Ascii</STRONG>     <STRONG>acsc</STRONG>     <STRONG>acsc</STRONG>
@@ -2221,13 +2226,13 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
          --------------------------------------------------------------------
          arrow pointing right        ACS_RARROW     &gt;         +        0x2b
          arrow pointing left         ACS_LARROW     &lt;         ,        0x2c
-
          arrow pointing up           ACS_UARROW     ^         -        0x2d
          arrow pointing down         ACS_DARROW     v         .        0x2e
          solid square block          ACS_BLOCK      #         0        0x30
          diamond                     ACS_DIAMOND    +         `        0x60
          checker board (stipple)     ACS_CKBOARD    :         a        0x61
          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
@@ -2255,34 +2260,34 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        A few notes apply to the table itself:
 
-       <STRONG>o</STRONG>   X/Open  Curses  incorrectly  states that the mapping for <EM>lantern</EM> is
-           uppercase "I" although Unix implementations use the  lowercase  "i"
+       <STRONG>o</STRONG>   X/Open Curses incorrectly states that the mapping  for  <EM>lantern</EM>  is
+           uppercase  "I"  although Unix implementations use the lowercase "i"
            mapping.
 
-       <STRONG>o</STRONG>   The  DEC  VT100  implemented graphics using the alternate character
-           set feature, temporarily switching <EM>modes</EM> and sending characters  in
-           the  range  0x60  (96)  to 0x7e (126) (the <STRONG>acsc</STRONG> <STRONG>Value</STRONG> column in the
+       <STRONG>o</STRONG>   The DEC VT100 implemented graphics using  the  alternate  character
+           set  feature, temporarily switching <EM>modes</EM> and sending characters in
+           the range 0x60 (96) to 0x7e (126) (the <STRONG>acsc</STRONG>  <STRONG>Value</STRONG>  column  in  the
            table).
 
        <STRONG>o</STRONG>   The AT&amp;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&amp;T terminal: <EM>board</EM> <EM>of</EM> <EM>squares</EM>
-           replaces the VT100 <EM>newline</EM> symbol, while  <EM>lantern</EM>  <EM>symbol</EM>  replaces
+           Some  of  the  characters  within the range do not match the VT100;
+           presumably they were used in the AT&amp;T terminal:  <EM>board</EM>  <EM>of</EM>  <EM>squares</EM>
+           replaces  the  VT100  <EM>newline</EM> symbol, while <EM>lantern</EM> <EM>symbol</EM> replaces
            the VT100 <EM>vertical</EM> <EM>tab</EM> symbol.  The other VT100 symbols for control
-           characters (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) are  not
+           characters  (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) 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  <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG>  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 <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG> 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.
 
 
 </PRE><H3><a name="h3-Color-Handling">Color Handling</a></H3><PRE>
-       The  curses  library  functions <STRONG>init_pair</STRONG> and <STRONG>init_color</STRONG> manipulate the
-       <EM>color</EM>  <EM>pairs</EM>  and  <EM>color</EM>  <EM>values</EM>  discussed  in   this   section   (see
+       The curses library functions <STRONG>init_pair</STRONG> and  <STRONG>init_color</STRONG>  manipulate  the
+       <EM>color</EM>   <EM>pairs</EM>   and   <EM>color</EM>  <EM>values</EM>  discussed  in  this  section  (see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2291,45 +2296,45 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            is usually 8), and can set character-cell foreground and background
            characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color-pairs.
 
-       <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
-           separately  (foreground  and  background  are   not   independently
-           settable).   Up  to  <EM>M</EM> color-pairs may be set up from 2*<EM>M</EM> different
+       <STRONG>o</STRONG>   On HP-like  terminals,  the  user  must  set  each  color  pair  up
+           separately   (foreground   and  background  are  not  independently
+           settable).  Up to <EM>M</EM> color-pairs may be set up  from  2*<EM>M</EM>  different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
-       colors and color-pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
+       numeric capabilities <STRONG>colors</STRONG> and <STRONG>pairs</STRONG> specify the  maximum  numbers  of
+       colors  and  color-pairs  that can be displayed simultaneously.  The <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
-       default values for the terminal.  The <STRONG>oc</STRONG> 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;
+       default  values  for  the terminal.  The <STRONG>oc</STRONG> 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 <STRONG>bce</STRONG>.
 
-       While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
-       inability  of  some  devices  to  set  foreground and background colors
-       independently), there  are  separate  capabilities  for  setting  these
+       While  the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting the
+       inability of some devices  to  set  foreground  and  background  colors
+       independently),  there  are  separate  capabilities  for  setting these
        features:
 
-       <STRONG>o</STRONG>   To   change  the  current  foreground  or  background  color  on  a
-           Tektronix-type terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and  <STRONG>setab</STRONG>
-           (set  ANSI  background)  or  <STRONG>setf</STRONG>  (set  foreground)  and <STRONG>setb</STRONG> (set
+       <STRONG>o</STRONG>   To  change  the  current  foreground  or  background  color  on   a
+           Tektronix-type  terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and <STRONG>setab</STRONG>
+           (set ANSI background)  or  <STRONG>setf</STRONG>  (set  foreground)  and  <STRONG>setb</STRONG>  (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation  describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says that
-           "If the terminal supports ANSI escape sequences to  set  background
-           and   foreground,   they  should  be  coded  as  <STRONG>setaf</STRONG>  and  <STRONG>setab</STRONG>,
+           documentation describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says  that
+           "If  the  terminal supports ANSI escape sequences to set background
+           and  foreground,  they  should  be  coded  as  <STRONG>setaf</STRONG>   and   <STRONG>setab</STRONG>,
            respectively.
 
-       <STRONG>o</STRONG>   If the terminal supports other escape sequences to  set  background
-           and   foreground,   they   should   be  coded  as  <STRONG>setf</STRONG>  and  <STRONG>setb</STRONG>,
-           respectively.  The <STRONG>vidputs</STRONG> and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  functions  use  the
+       <STRONG>o</STRONG>   If  the  terminal supports other escape sequences to set background
+           and  foreground,  they  should  be  coded   as   <STRONG>setf</STRONG>   and   <STRONG>setb</STRONG>,
+           respectively.   The  <STRONG>vidputs</STRONG>  and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> functions use the
            <STRONG>setaf</STRONG> and <STRONG>setab</STRONG> capabilities if they are defined.
 
-       The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
+       The <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single  numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
-       as  follows (the middle column is the symbolic #define available in the
-       header for the <STRONG>curses</STRONG> or <STRONG>ncurses</STRONG> libraries).  The terminal hardware  is
-       free  to  map  these  as  it  likes, but the RGB values indicate normal
+       as follows (the middle column is the symbolic #define available in  the
+       header  for the <STRONG>curses</STRONG> or <STRONG>ncurses</STRONG> libraries).  The terminal hardware is
+       free to map these as it likes,  but  the  RGB  values  indicate  normal
        locations in color space.
 
                     <STRONG>Color</STRONG>       <STRONG>#define</STRONG>       <STRONG>Value</STRONG>       <STRONG>RGB</STRONG>
@@ -2355,32 +2360,32 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                     yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max,max,0
                     white     <STRONG>COLOR_WHITE</STRONG>       7     max,max,max
 
-       It  is  important  to  not  confuse the two sets of color capabilities;
+       It is important to not confuse the  two  sets  of  color  capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On an HP-like terminal, use <STRONG>scp</STRONG> with a color-pair number  parameter  to
+       On  an  HP-like terminal, use <STRONG>scp</STRONG> with a color-pair number parameter to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
 
-       <STRONG>o</STRONG>   On  a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present to
-           indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
+       <STRONG>o</STRONG>   On a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present  to
+           indicate  that colors can be modified.  If so, the <STRONG>initc</STRONG> capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           which  describe the color.  These three parameters default to being
+           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
-           color-pair value.  It will  take  seven  parameters;  a  color-pair
-           number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
-           background and then foreground colors.  These  parameters  must  be
-           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
+       <STRONG>o</STRONG>   On an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing  a
+           color-pair  value.   It  will  take  seven parameters; a color-pair
+           number (0 to <STRONG>max_pairs</STRONG> -  1),  and  two  triples  describing  first
+           background  and  then  foreground colors.  These parameters must be
+           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
            <STRONG>hls</STRONG>.
 
-       On some color terminals,  colors  collide  with  highlights.   You  can
-       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit-mask
-       of  attributes  not  to  be  used  when  colors   are   enabled.    The
+       On  some  color  terminals,  colors  collide  with highlights.  You can
+       register these collisions with the <STRONG>ncv</STRONG> capability.  This is a  bit-mask
+       of   attributes   not   to  be  used  when  colors  are  enabled.   The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
                   <STRONG>Attribute</STRONG>              <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>      <STRONG>Set</STRONG> <STRONG>by</STRONG>
@@ -2401,134 +2406,134 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                   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 <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4  curses does nothing with <STRONG>ncv</STRONG>, ncurses recognizes it and optimizes
+       SVr4 curses does nothing with <STRONG>ncv</STRONG>, ncurses recognizes it and  optimizes
        the output in favor of colors.
 
 
 </PRE><H3><a name="h3-Miscellaneous">Miscellaneous</a></H3><PRE>
-       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 <STRONG>PC</STRONG> variable;
-       though the application may set this value to  something  other  than  a
-       null,  ncurses will test <STRONG>npc</STRONG> first and use napms if the terminal has no
+       npc.  Note that ncurses implements the termcap-compatible <STRONG>PC</STRONG>  variable;
+       though  the  application  may  set this value to something other than a
+       null, ncurses will test <STRONG>npc</STRONG> 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  <STRONG>hu</STRONG>  (half-line  up)  and  <STRONG>hd</STRONG> (half-line down).  This is primarily
-       useful for superscripts and subscripts on hard-copy  terminals.   If  a
+       If  the terminal can move up or down half a line, this can be indicated
+       with <STRONG>hu</STRONG> (half-line up) and <STRONG>hd</STRONG>  (half-line  down).   This  is  primarily
+       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
        hard-copy terminal can eject to the next page (form feed), give this as
        <STRONG>ff</STRONG> (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  <STRONG>rep</STRONG>.
-       The  first  parameter is the character to be repeated and the second 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 <STRONG>rep</STRONG>.
+       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 <STRONG>cmdch</STRONG>.  A prototype command  character
-       is  chosen  which is used in all capabilities.  This character is given
-       in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
+       4025,  this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command character
+       is chosen which is used in all capabilities.  This character  is  given
+       in  the  <STRONG>cmdch</STRONG>  capability to identify it.  The following convention is
        supported on some UNIX systems: The environment is to be searched for a
-       <STRONG>CC</STRONG> variable, and if found, all occurrences of the  prototype  character
+       <STRONG>CC</STRONG>  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 <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and  <EM>network</EM>,  should  include
-       the  <STRONG>gn</STRONG> (generic) capability so that programs can complain that they do
-       not know how to talk to the terminal.  (This capability does not  apply
-       to  <EM>virtual</EM>  terminal  descriptions  for which the escape sequences are
+       Terminal descriptions that do not represent a specific  kind  of  known
+       terminal,  such  as  <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and <EM>network</EM>, should include
+       the <STRONG>gn</STRONG> (generic) capability so that programs can complain that they  do
+       not  know how to talk to the terminal.  (This capability does not apply
+       to <EM>virtual</EM> 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
-       <STRONG>km</STRONG>.  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
+       <STRONG>km</STRONG>.   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 <STRONG>smm</STRONG> and <STRONG>rmm</STRONG>.
 
        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 <STRONG>lm</STRONG>.  A value
+       once, the number of lines of memory can be indicated with <STRONG>lm</STRONG>.  A  value
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
-       Media copy strings which control an auxiliary printer connected to  the
-       terminal  can  be  given as <STRONG>mc0</STRONG>: print the contents of the screen, <STRONG>mc4</STRONG>:
-       turn off the printer, and <STRONG>mc5</STRONG>: 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 <STRONG>mc5p</STRONG> takes one parameter, and
-       leaves the printer on for as  many  characters  as  the  value  of  the
+       Media  copy strings which control an auxiliary printer connected to the
+       terminal can be given as <STRONG>mc0</STRONG>: print the contents of  the  screen,  <STRONG>mc4</STRONG>:
+       turn  off  the printer, and <STRONG>mc5</STRONG>: 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  <STRONG>mc5p</STRONG>  takes  one  parameter,  and
+       leaves  the  printer  on  for  as  many  characters as the value of the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.  All text, including <STRONG>mc4</STRONG>, is transparently passed to  the  printer
+       255.   All  text, including <STRONG>mc4</STRONG>, is transparently passed to the printer
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
 </PRE><H3><a name="h3-Glitches-and-Braindamage">Glitches and Braindamage</a></H3><PRE>
-       Hazeltine  terminals, which do not allow "~" characters to be displayed
+       Hazeltine terminals, which do not allow "~" characters to be  displayed
        should indicate <STRONG>hz</STRONG>.
 
-       Terminals which ignore a line-feed immediately after an <STRONG>am</STRONG>  wrap,  such
+       Terminals  which  ignore a line-feed immediately after an <STRONG>am</STRONG> wrap, such
        as the Concept and vt100, should indicate <STRONG>xenl</STRONG>.
 
-       If  <STRONG>el</STRONG>  is  required  to get rid of standout (instead of merely writing
+       If <STRONG>el</STRONG> is required to get rid of standout  (instead  of  merely  writing
        normal text on top of it), <STRONG>xhp</STRONG> should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should  indicate  <STRONG>xt</STRONG> (destructive tabs).  Note: the variable indicating
-       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
-       teleray_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 necessary to use delete and insert
+       should indicate <STRONG>xt</STRONG> (destructive tabs).  Note: the  variable  indicating
+       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
+       teleray_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 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 <STRONG>xsb</STRONG>, 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 <STRONG>xsb</STRONG>, 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
+       Other  specific  terminal  problems  may  be  corrected  by adding more
        capabilities of the form <STRONG>x</STRONG><EM>x</EM>.
 
 
 </PRE><H3><a name="h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></H3><PRE>
-       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 translations are much more strictly limited
+       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 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 <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> is  searching  for  is,
+       The man pages for 4.3BSD and older versions  of  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2537,88 +2542,88 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   and the application has only allocated a 1k buffer,
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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,
 
-       <STRONG>o</STRONG>   and  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> has to search
+       <STRONG>o</STRONG>   and <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> has  to  search
            the whole termcap file).
 
-       Then <STRONG>tgetent</STRONG> 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
+       Then  <STRONG>tgetent</STRONG>  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.
 
-       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  <STRONG>tgetent</STRONG>  only  does "tc" expansion once it is found the terminal
+       since <STRONG>tgetent</STRONG> 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 <STRONG>ncurses</STRONG> implementation of
-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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 <STRONG>ncurses</STRONG>  implementation  of
+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>  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.
 
 
 </PRE><H3><a name="h3-Binary-Compatibility">Binary Compatibility</a></H3><PRE>
-       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
+       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 and XSI Curses extensions.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching    for   terminal   descriptions   in   <STRONG>$HOME/.terminfo</STRONG>   and
+       Searching   for   terminal   descriptions   in   <STRONG>$HOME/.terminfo</STRONG>    and
        TERMINFO_DIRS is not supported by older implementations.
 
-       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
+       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
-       <STRONG>ncurses</STRONG> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
+       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
+       <STRONG>ncurses</STRONG>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation may need terminfo entries made for <STRONG>ncurses</STRONG> to have  <STRONG>msgr</STRONG>
+       interpretation  may need terminfo entries made for <STRONG>ncurses</STRONG> to have <STRONG>msgr</STRONG>
        turned off.
 
        The <STRONG>ncurses</STRONG> 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 <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
-       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
+       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
+       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
        the documentation for the AT&amp;T 505 terminal.
 
-       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <STRONG>ncurses</STRONG> library wants
-       to interpret it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and  emulators  like
-       xterm  that can return mouse-tracking information in the keyboard-input
+       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <STRONG>ncurses</STRONG>  library  wants
+       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
-       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
-       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
+       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
+       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> 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  cases)  different
+       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, accurate as of October 1995:
 
        <STRONG>o</STRONG>   <STRONG>SVR4,</STRONG> <STRONG>Solaris,</STRONG> <STRONG>ncurses</STRONG> -- These support all SVr4 capabilities.
@@ -2626,16 +2631,16 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   <STRONG>SGI</STRONG> -- Supports the SVr4 set, adds one undocumented extended string
            capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   <STRONG>SVr1,</STRONG> <STRONG>Ultrix</STRONG> -- These  support  a  restricted  subset  of  terminfo
-           capabilities.   The  booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
+       <STRONG>o</STRONG>   <STRONG>SVr1,</STRONG>  <STRONG>Ultrix</STRONG>  --  These  support  a  restricted subset of terminfo
+           capabilities.  The booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>HP/UX</STRONG> -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
-           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
-           through 63, plus <STRONG>plab_norm</STRONG>,  <STRONG>label_on</STRONG>,  and  <STRONG>label_off</STRONG>,  plus  some
+       <STRONG>o</STRONG>   <STRONG>HP/UX</STRONG>  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
+           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
+           through  63,  plus  <STRONG>plab_norm</STRONG>,  <STRONG>label_on</STRONG>,  and <STRONG>label_off</STRONG>, plus some
            incompatible extensions in the string table.
 
-       <STRONG>o</STRONG>   <STRONG>AIX</STRONG>  -- Supports the SVr1 subset, plus function keys 11 through 63,
+       <STRONG>o</STRONG>   <STRONG>AIX</STRONG> -- Supports the SVr1 subset, plus function keys 11 through  63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   <STRONG>OSF</STRONG> -- Supports both the SVr4 set and the AIX extensions.
@@ -2646,8 +2651,8 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,     <STRONG>printf(3)</STRONG>,     <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.     <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 70f598bce..ba2477e82 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 2ec0a7338..b0654826b 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 49f3d73d5..4229f9b39 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 8b54ec2c6..d47008558 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230701).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
 
 
 
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index e94a5d16e..c729c7926 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.36 2023/07/01 14:23:04 tom Exp $
-.TH curs_add_wch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.37 2023/07/15 16:45:14 tom Exp $
+.TH curs_add_wch 3X 2023-07-15 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -75,14 +75,21 @@ If \fIwch\fP refers to a spacing character,
 then any previous character at that location is removed.
 A new character specified by \fIwch\fP is
 placed at that location with rendition specified by \fIwch\fP.
-The cursor then advances to
-the next spacing character on the screen.
+The cursor then advances after this spacing character,
+to prepare for writing the next character on the screen.
+.IP
+The newly added spacing character is the base of the active complex character.
+Subsequent non-spacing characters can be combined with this base
+until another spacing character is written to the screen,
+or the cursor is moved, e.g., using \fBwmove\fP.
 .bP
 If \fIwch\fP refers to a non-spacing character,
-all previous characters at that location are preserved.
-The non-spacing characters of \fIwch\fP
-are added to the spacing complex character,
-and the rendition specified by \fIwch\fP is ignored.
+it is appended to the active complex character,
+retaining the previous characters at that location.
+The rendition specified by \fIwch\fP is ignored.
+.IP
+The cursor is not advanced after adding a non-spacing character.
+Subsequent calls to add non-spacing characters will update the same position.
 .bP
 If the character part of \fIwch\fP is
 a tab, newline, backspace or other control character,
@@ -239,7 +246,7 @@ may be macros.
 .SH PORTABILITY
 All of these functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for line-drawing characters apply in the POSIX locale.
-.PP
+.SS WACS Symbols
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
 a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fP.
 A few implementations are problematic:
@@ -315,12 +322,33 @@ Others have suggested these alternatives:
 \[u2327] U+2327 (x in a rectangle),
 \[u256C] U+256C (forms double vertical and horizontal), and
 \[u2612] U+2612 (ballot box with x).
+.SS Complex Characters
+The complex character type \fBcchar_t\fR
+can store more than one wide character (\fBwchar_t\fR).
+The X/Open Curses description does not mention this possibility,
+describing only the cases where \fIwch\fP is a spacing character
+or a non-spacing character.
+.PP
+This implementation assumes that \fIwch\fP is constructed using
+\fBsetcchar\fP(3X), and in turn that the result
+.bP
+contains at most one spacing character in the beginning of its list of wide
+characters,
+and zero or more non-spacing characters
+or
+.bP
+may hold one non-spacing character.
+.PP
+In the latter case, ncurses adds the non-spacing character to the active
+(base) spacing character.
 .SH SEE ALSO
 .na
+.hy 0
 \fBcurses\fP(3X),
 \fBcurs_addch\fP(3X),
 \fBcurs_attr\fP(3X),
 \fBcurs_clear\fP(3X),
+\fBcurs_getcchar\fP(3X),
 \fBcurs_outopts\fP(3X),
 \fBcurs_refresh\fP(3X),
 \fBputwc\fP(3)
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 2429c2849..072b29bcd 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp $
-.TH curs_addwstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.20 2023/07/15 17:11:59 tom Exp $
+.TH curs_addwstr 3X 2023-07-15 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -74,8 +74,14 @@
 These functions write the characters of the
 (null-terminated) \fBwchar_t\fP character string
 \fIwstr\fP on the given window.
-It is similar to constructing a \fBcchar_t\fP for each wchar_t in the string,
-then calling \fBwadd_wch\fP for the resulting \fBcchar_t\fP.
+It is similar to constructing a \fBcchar_t\fP for
+each \fBwchar_t\fR in the string,
+then calling \fBwadd_wch\fP(3X) for the resulting \fBcchar_t\fP:
+.bP
+spacing and non-spacing characters in the string
+are processed one at a time, and
+.bP
+control characters are processed as in \fBwaddch\fP(3X).
 .PP
 The \fImv\fP functions perform cursor movement once, before writing any
 characters.
@@ -106,4 +112,5 @@ All of these functions except \fBwaddnwstr\fP may be macros.
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fBcurses\fP(3X),
-\fBcurs_add_wch\fP(3X)
+\fBcurs_addch\fP(3X),
+\fBcurs_add_wch\fP(3X).
diff --git a/man/curs_util.3x b/man/curs_util.3x
index aee7c4a90..ba75fe91d 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.70 2023/07/01 14:31:54 tom Exp $
-.TH curs_util 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.71 2023/07/15 18:01:08 tom Exp $
+.TH curs_util 3X 2023-07-15 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -84,21 +84,15 @@
 .SH DESCRIPTION
 .SS unctrl
 The \fBunctrl\fP routine returns a character string which is a printable
-representation of the character \fIc\fP, ignoring attributes.
-Control characters are displayed in the \fB^\fIX\fR notation.
-Printing characters are displayed as is.
-.PP
-The corresponding \fBwunctrl\fP returns a printable representation of
-a wide character.
-.SS keyname/key_name
-The \fBkeyname\fP routine returns a character string
-corresponding to the key \fIc\fP:
+representation of the character \fIc\fP:
 .bP
 Printable characters are displayed as themselves,
 e.g., a one-character string containing the key.
 .bP
 Control characters are displayed in the \fB^\fIX\fR notation.
 .bP
+Printing characters are displayed as is.
+.bP
 DEL (character 127) is displayed as \fB^?\fP.
 .bP
 Values above 128 are either meta characters
@@ -108,18 +102,37 @@ shown in the \fBM\-\fIX\fR notation,
 or are displayed as themselves.
 In the latter case, the values may not be printable;
 this follows the X/Open specification.
+.PP
+The corresponding \fBwunctrl\fP returns a printable representation of
+a complex character \fIc\fP.
+.PP
+In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
+with the character parameter are ignored.
+.SS keyname/key_name
+The \fBkeyname\fP routine returns a character string
+corresponding to the key \fIc\fP.
+Key codes are different from character codes.
+.bP
+Key codes below 256 are characters.
+They are displayed using \fBunctrl\fP.
 .bP
-Values above 256 may be the names of the names of function keys.
+Values above 256 may be the codes for function keys.
+The function key name is displayed.
 .bP
-Otherwise (if there is no corresponding name) the function returns null,
-to denote an error.
+Otherwise (if there is no corresponding name and the key is not a character)
+the function returns null, to denote an error.
 X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
 which some implementations return rather than null.
 .LP
-The corresponding \fBkey_name\fP returns a character string corresponding
+The corresponding \fBkey_name\fP returns
+a multibyte character string corresponding
 to the wide-character value \fIw\fP.
-The two functions do not return the same set of strings;
-the latter returns null where the former would display a meta character.
+The two functions (\fBkeyname\fP and \fBkey_name\fP)
+do not return the same set of strings:
+.bP
+\fBkeyname\fP returns null where \fBkey_name\fP would display a meta character.
+.bP
+\fBkey_name\fP does not return the name of a function key.
 .SS filter/nofilter
 The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
 \fBnewterm\fP are called.
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 4e890838b..006099f81 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.22 2023/06/10 17:09:27 tom Exp $
+# $Id: manhtml.aliases,v 1.23 2023/07/15 18:43:48 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -71,6 +71,8 @@ use_env(3X)		curs_util(3X)
 use_extended_names(3X)	curs_extend(3X)
 use_legacy_coding(3X)	legacy_coding(3X)
 vidputs(3X)		curs_terminfo(3X)
+wadd_wch(3X)		curs_add_wch(3X)
+waddch(3X)		curs_addch(3X)
 wbkgdset(3X)		curs_bkgd(3X)
 wgetch(3X)		curs_getch(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
diff --git a/man/terminfo.tail b/man/terminfo.tail
index df0079c0c..aba4029c2 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.116 2023/07/01 15:33:13 tom Exp $
+.\" $Id: terminfo.tail,v 1.120 2023/07/15 19:46:56 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -72,6 +72,12 @@ limit assumed by termcap implementations and their applications.
 In particular, 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.
+.PP
+The ncurses library uses a few of these user-defined capabilities,
+as described in \fBuser_caps\fR(5).
+Other user-defined capabilities (including function keys) are
+described in the terminal database, in the section on
+.I "NCURSES USER-DEFINABLE CAPABILITIES"
 .
 .SS A Sample Entry
 .
@@ -2033,6 +2039,8 @@ Supports both the SVr4 set and the AIX extensions.
 \*d/?/*
 files containing terminal descriptions
 .SH SEE ALSO
+.na
+.hy 0
 \fB@INFOCMP@\fP(1M),
 \fB@TABS@\fP(1),
 \fB@TIC@\fP(1M),
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 611fe27a5..c1892ca24 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1060 $
-#	$Date: 2023/07/09 00:05:04 $
+#	$Revision: 1.1061 $
+#	$Date: 2023/07/15 12:18: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
@@ -25488,7 +25488,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # differences, noted in
 #	https://invisible-island.net/ncurses/ncurses-netbsd.html
 #
-# ncurses makes explicit checks for a few user-definable capabilities:  AX,
+# ncurses makes explicit checks for a few user-definable capabilities:  AX, E3,
 # RGB, U8, XM, which are documented in the user_caps(5) manual page.
 #
 #### SCREEN Extensions:
@@ -27829,4 +27829,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ add linux+kbs for terminals which imitate xterm's behavior with
 #	  Linux -TD
 #
+# 2023-07-15
+#	+ mention E3 in regard to user_caps(5) -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c
index b817647c6..be1bbb051 100644
--- a/ncurses/widechar/lib_add_wch.c
+++ b/ncurses/widechar/lib_add_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2023 Thomas E. Dickey                                *
  * Copyright 2004-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_add_wch.c,v 1.17 2021/06/17 21:26:02 tom Exp $")
+MODULE_ID("$Id: lib_add_wch.c,v 1.18 2023/07/15 17:34:12 tom Exp $")
 
 /* clone/adapt lib_addch.c */
 static const cchar_t blankchar = NewChar(BLANK_TEXT);
@@ -204,10 +204,16 @@ wadd_wch_literal(WINDOW *win, cchar_t ch)
 	if (len == 0) {		/* non-spacing */
 	    if ((x > 0 && y >= 0)
 		|| (win->_maxx >= 0 && win->_cury >= 1)) {
-		if (x > 0 && y >= 0)
-		    chars = (win->_line[y].text[x - 1].chars);
-		else
+		if (x > 0 && y >= 0) {
+		    for (j = x - 1; j > 0; --j) {
+			if (!isWidecExt(win->_line[y].text[j])) {
+			    break;
+			}
+		    }
+		    chars = (win->_line[y].text[j].chars);
+		} else {
 		    chars = (win->_line[y - 1].text[win->_maxx].chars);
+		}
 		for (i = 0; i < CCHARW_MAX; ++i) {
 		    if (chars[i] == 0) {
 			TR(TRACE_VIRTPUT,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fc1907b59..eccb46902 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230708) unstable; urgency=low
+ncurses6 (6.4+20230715) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fc1907b59..eccb46902 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230708) unstable; urgency=low
+ncurses6 (6.4+20230715) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a98efd07b..4b5759a9c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230708) unstable; urgency=low
+ncurses6 (6.4+20230715) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jul 2023 08:03:11 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e35dd5a19..0fef1f064 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.594 2023/07/08 12:03:11 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.595 2023/07/15 10:14:48 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0708"
+!define VERSION_MMDD  "0715"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0156a4439..8f1e08726 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230708
+Release: 20230715
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8baf53b8f..b14c095a6 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230708
+Release: 20230715
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c6b6485c4..e59589eef 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230708
+Release: 20230715
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 11777aeed303408478c503edeaf899c7b3caddec Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 23 Jul 2023 00:45:46 +0200
Subject: [PATCH 021/106] ncurses-6.4-20230722.patch

---
 INSTALL                          |    5 +-
 NEWS                             |    5 +-
 VERSION                          |    2 +-
 configure                        | 3463 +++++++++++++++---------------
 configure.in                     |   11 +-
 dist.mk                          |    4 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    2 +-
 package/ncursest.spec            |    2 +-
 13 files changed, 1761 insertions(+), 1751 deletions(-)

diff --git a/INSTALL b/INSTALL
index a4f614933..fec266fec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.246 2023/06/17 17:18:20 tom Exp $
+-- $Id: INSTALL,v 1.247 2023/07/22 17:25:24 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -1360,7 +1360,8 @@ CONFIGURE OPTIONS:
     --with-xterm-kbs=XXX
 	Configure xterm's terminfo entries to use either BS (^H, i.e., ASCII
 	backspace) or DEL (^?, or 127).  XXX can be BS (or bs, 8) or DEL
-	(or del, 127).
+	(or del, 127).  If XXX is "auto", the configure script chooses BS or
+	DEL according to platform defaults.
 
 	During installation, the makefile and scripts modifies the "xterm+kbs"
 	terminfo entry to use this setting.
diff --git a/NEWS b/NEWS
index 28c678fe9..96d51f9dd 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3977 2023/07/15 17:58:51 tom Exp $
+-- $Id: NEWS,v 1.3979 2023/07/22 17:26:24 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230722
+	+ add "auto" default for --with-xterm-kbs configure option.
+
 20230715
 	+ correct wadd_wch_literal() when adding a non-spacing character to a
 	  double-width character.
diff --git a/VERSION b/VERSION
index 4cc28ff51..55fbcf355 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230715
+5:0:10	6.4	20230722
diff --git a/configure b/configure
index 3b9179f8c..ef3ecd523 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.764 .
+# From configure.in Revision: 1.765 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -9481,7 +9481,7 @@ if test "${with_xterm_kbs+set}" = set; then
   withval="$with_xterm_kbs"
   with_xterm_kbs=$withval
 else
-  with_xterm_kbs=BS
+  with_xterm_kbs=auto
 fi;
 case x$with_xterm_kbs in
 (xyes|xno|xBS|xbs|x8)
@@ -9490,18 +9490,21 @@ case x$with_xterm_kbs in
 (xDEL|xdel|x127)
 	with_xterm_kbs=DEL
 	;;
+(xauto)
+	with_xterm_kbs=$want_xterm_kbs
+	;;
 (*)
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9497: result: $with_xterm_kbs" >&5
+echo "$as_me:9500: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9503: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
-echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;}
+	{ echo "$as_me:9506: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
 MAKE_TERMINFO=
@@ -9510,7 +9513,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9513: checking for list of terminfo directories" >&5
+echo "$as_me:9516: 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.
@@ -9550,7 +9553,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9553: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9556: 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; }; }
 	;;
@@ -9573,7 +9576,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9576: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9579: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9582,13 +9585,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9585: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9588: 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:9591: checking for default terminfo directory" >&5
+echo "$as_me:9594: 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.
@@ -9624,7 +9627,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9627: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9630: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9633,7 +9636,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9636: result: $TERMINFO" >&5
+echo "$as_me:9639: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9644,7 +9647,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9647: checking if big-core option selected" >&5
+echo "$as_me:9650: 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.
@@ -9656,7 +9659,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9659 "configure"
+#line 9662 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9670,15 +9673,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9676: \$? = $ac_status" >&5
+  echo "$as_me:9679: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9681: \$? = $ac_status" >&5
+  echo "$as_me:9684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9690,7 +9693,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9693: result: $with_big_core" >&5
+echo "$as_me:9696: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9700,7 +9703,7 @@ EOF
 ### 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:9703: checking if big-strings option selected" >&5
+echo "$as_me:9706: 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.
@@ -9724,14 +9727,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9727: result: $with_big_strings" >&5
+echo "$as_me:9730: 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:9734: checking if you want termcap-fallback support" >&5
+echo "$as_me:9737: 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.
@@ -9741,14 +9744,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9744: result: $with_termcap" >&5
+echo "$as_me:9747: 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:9751: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9754: 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
@@ -9761,13 +9764,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9764: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9767: 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:9770: checking for list of termcap files" >&5
+	echo "$as_me:9773: 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.
@@ -9807,7 +9810,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9810: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9813: 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; }; }
 	;;
@@ -9830,7 +9833,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9833: result: $TERMPATH" >&5
+	echo "$as_me:9836: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9838,7 +9841,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9841: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9844: 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.
@@ -9848,14 +9851,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9851: result: $with_getcap" >&5
+	echo "$as_me:9854: 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:9858: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9861: 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.
@@ -9865,7 +9868,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9868: result: $with_getcap_cache" >&5
+	echo "$as_me:9871: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9875,7 +9878,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9878: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9881: 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.
@@ -9885,14 +9888,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9888: result: $with_home_terminfo" >&5
+echo "$as_me:9891: 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:9895: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9898: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9902,14 +9905,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9905: result: $with_root_environ" >&5
+echo "$as_me:9908: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9912: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9915: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9919,14 +9922,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9922: result: $with_root_access" >&5
+echo "$as_me:9925: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9929: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9932: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9936,7 +9939,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9939: result: $with_setuid_environ" >&5
+echo "$as_me:9942: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9951,23 +9954,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9954: checking for $ac_header" >&5
+echo "$as_me:9957: 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 9960 "configure"
+#line 9963 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9967: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:9973: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9986,7 +9989,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9989: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9992: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10001,13 +10004,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10004: checking for $ac_func" >&5
+echo "$as_me:10007: 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 10010 "configure"
+#line 10013 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10038,16 +10041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10044: \$? = $ac_status" >&5
+  echo "$as_me:10047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10050: \$? = $ac_status" >&5
+  echo "$as_me:10053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10057,7 +10060,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10060: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10063: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10074,13 +10077,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10077: checking for $ac_func" >&5
+echo "$as_me:10080: 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 10083 "configure"
+#line 10086 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10111,16 +10114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10117: \$? = $ac_status" >&5
+  echo "$as_me:10120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10123: \$? = $ac_status" >&5
+  echo "$as_me:10126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10130,7 +10133,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10133: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10136: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10141,7 +10144,7 @@ fi
 done
 
 else
-	echo "$as_me:10144: checking if link/symlink functions work" >&5
+	echo "$as_me:10147: 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
@@ -10154,7 +10157,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10157 "configure"
+#line 10160 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10188,15 +10191,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10194: \$? = $ac_status" >&5
+  echo "$as_me:10197: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10199: \$? = $ac_status" >&5
+  echo "$as_me:10202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10214,7 +10217,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10217: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10220: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10234,7 +10237,7 @@ with_symlinks=no
 # 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:10237: checking if tic should use symbolic links" >&5
+	echo "$as_me:10240: 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.
@@ -10244,21 +10247,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10247: result: $with_symlinks" >&5
+	echo "$as_me:10250: 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:10254: checking if tic should use hard links" >&5
+	echo "$as_me:10257: 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:10261: result: $with_links" >&5
+	echo "$as_me:10264: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10274,7 +10277,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10277: checking if you want broken-linker support code" >&5
+echo "$as_me:10280: 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.
@@ -10284,7 +10287,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10287: result: $with_broken_linker" >&5
+echo "$as_me:10290: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10298,7 +10301,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10301: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10304: 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.
@@ -10308,7 +10311,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10311: result: $with_bsdpad" >&5
+echo "$as_me:10314: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10327,14 +10330,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10330: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10333: 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 10337 "configure"
+#line 10340 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10353,16 +10356,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10359: \$? = $ac_status" >&5
+  echo "$as_me:10362: \$? = $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:10365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10365: \$? = $ac_status" >&5
+  echo "$as_me:10368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10373,7 +10376,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10376: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10379: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10415,14 +10418,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10418: checking if this is the GNU C library" >&5
+echo "$as_me:10421: 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 10425 "configure"
+#line 10428 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10441,16 +10444,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10447: \$? = $ac_status" >&5
+  echo "$as_me:10450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10453: \$? = $ac_status" >&5
+  echo "$as_me:10456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10461,7 +10464,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10464: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10467: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10469,7 +10472,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10472: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10475: 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
@@ -10481,7 +10484,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10484 "configure"
+#line 10487 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10500,16 +10503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10506: \$? = $ac_status" >&5
+  echo "$as_me:10509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10512: \$? = $ac_status" >&5
+  echo "$as_me:10515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10521,12 +10524,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10524: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10527: 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:10529: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10532: 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
@@ -10631,7 +10634,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10634 "configure"
+#line 10637 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10651,16 +10654,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10657: \$? = $ac_status" >&5
+  echo "$as_me:10660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10663: \$? = $ac_status" >&5
+  echo "$as_me:10666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10671,7 +10674,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10674: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10677: 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
@@ -10680,14 +10683,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10683: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10686: 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 10690 "configure"
+#line 10693 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10702,16 +10705,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10708: \$? = $ac_status" >&5
+  echo "$as_me:10711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10714: \$? = $ac_status" >&5
+  echo "$as_me:10717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10818,7 +10821,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10821 "configure"
+#line 10824 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10833,16 +10836,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10839: \$? = $ac_status" >&5
+  echo "$as_me:10842: \$? = $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:10845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10845: \$? = $ac_status" >&5
+  echo "$as_me:10848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10857,12 +10860,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10860: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10863: 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:10865: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10868: 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
@@ -10872,7 +10875,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10875 "configure"
+#line 10878 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10887,16 +10890,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10893: \$? = $ac_status" >&5
+  echo "$as_me:10896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10899: \$? = $ac_status" >&5
+  echo "$as_me:10902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10907,7 +10910,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10910: result: $cf_cv_default_source" >&5
+echo "$as_me:10913: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10944,16 +10947,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10947: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10950: 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}:10953: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10956: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10956 "configure"
+#line 10959 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10968,16 +10971,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10974: \$? = $ac_status" >&5
+  echo "$as_me:10977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10980: \$? = $ac_status" >&5
+  echo "$as_me:10983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -10998,7 +11001,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11001 "configure"
+#line 11004 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11013,16 +11016,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11019: \$? = $ac_status" >&5
+  echo "$as_me:11022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11025: \$? = $ac_status" >&5
+  echo "$as_me:11028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11033,7 +11036,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11036: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11039: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11041,10 +11044,10 @@ echo "${as_me:-configure}:11036: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11044: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11047: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11047 "configure"
+#line 11050 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11059,16 +11062,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11065: \$? = $ac_status" >&5
+  echo "$as_me:11068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11071: \$? = $ac_status" >&5
+  echo "$as_me:11074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11084,7 +11087,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11087: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11090: 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
@@ -11201,7 +11204,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11204: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11207: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11233,14 +11236,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11236: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11239: 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 11243 "configure"
+#line 11246 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11258,16 +11261,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11264: \$? = $ac_status" >&5
+  echo "$as_me:11267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11270: \$? = $ac_status" >&5
+  echo "$as_me:11273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11279,7 +11282,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11282 "configure"
+#line 11285 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11297,16 +11300,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11303: \$? = $ac_status" >&5
+  echo "$as_me:11306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11309: \$? = $ac_status" >&5
+  echo "$as_me:11312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11321,7 +11324,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11324: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11327: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11481,16 +11484,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11484: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11487: 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}:11490: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11493: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11493 "configure"
+#line 11496 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11505,16 +11508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11511: \$? = $ac_status" >&5
+  echo "$as_me:11514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11517: \$? = $ac_status" >&5
+  echo "$as_me:11520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11535,7 +11538,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11538 "configure"
+#line 11541 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11550,16 +11553,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11556: \$? = $ac_status" >&5
+  echo "$as_me:11559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11562: \$? = $ac_status" >&5
+  echo "$as_me:11565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11570,7 +11573,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11573: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11576: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11578,10 +11581,10 @@ echo "${as_me:-configure}:11573: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11581: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11584: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11584 "configure"
+#line 11587 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11596,16 +11599,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11602: \$? = $ac_status" >&5
+  echo "$as_me:11605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11608: \$? = $ac_status" >&5
+  echo "$as_me:11611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11621,7 +11624,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11624: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11627: 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
@@ -11734,10 +11737,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11737: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11740: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11740 "configure"
+#line 11743 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11755,23 +11758,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11761: \$? = $ac_status" >&5
+  echo "$as_me:11764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11767: \$? = $ac_status" >&5
+  echo "$as_me:11770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11774: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11777: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11794,7 +11797,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11797: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11800: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11806,7 +11809,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11809: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11812: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11894,7 +11897,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11897: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11900: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11904,7 +11907,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11907: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11910: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11914,7 +11917,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11917: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11920: 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"
@@ -11926,10 +11929,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11929: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11932: 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 11932 "configure"
+#line 11935 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11944,16 +11947,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11950: \$? = $ac_status" >&5
+  echo "$as_me:11953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11956: \$? = $ac_status" >&5
+  echo "$as_me:11959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11962,12 +11965,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11965: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11968: 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 11970 "configure"
+#line 11973 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11982,16 +11985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11988: \$? = $ac_status" >&5
+  echo "$as_me:11991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11994: \$? = $ac_status" >&5
+  echo "$as_me:11997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12002,19 +12005,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12005: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12008: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12010: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12013: 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 12017 "configure"
+#line 12020 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12032,16 +12035,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12038: \$? = $ac_status" >&5
+  echo "$as_me:12041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12044: \$? = $ac_status" >&5
+  echo "$as_me:12047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12053,7 +12056,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12056 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12071,16 +12074,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12077: \$? = $ac_status" >&5
+  echo "$as_me:12080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12083: \$? = $ac_status" >&5
+  echo "$as_me:12086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12095,7 +12098,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12098: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12101: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12246,14 +12249,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12249: checking if SIGWINCH is defined" >&5
+echo "$as_me:12252: 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 12256 "configure"
+#line 12259 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12268,23 +12271,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12274: \$? = $ac_status" >&5
+  echo "$as_me:12277: \$? = $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:12280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12280: \$? = $ac_status" >&5
+  echo "$as_me:12283: \$? = $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 12287 "configure"
+#line 12290 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12302,16 +12305,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12308: \$? = $ac_status" >&5
+  echo "$as_me:12311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12314: \$? = $ac_status" >&5
+  echo "$as_me:12317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12325,11 +12328,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12328: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12331: 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:12332: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12335: 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
@@ -12340,7 +12343,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12343 "configure"
+#line 12346 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12362,16 +12365,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12368: \$? = $ac_status" >&5
+  echo "$as_me:12371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12374: \$? = $ac_status" >&5
+  echo "$as_me:12377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12385,7 +12388,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12388: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12391: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12395,13 +12398,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12398: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12401: 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 12404 "configure"
+#line 12407 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12415,16 +12418,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12421: \$? = $ac_status" >&5
+  echo "$as_me:12424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12427: \$? = $ac_status" >&5
+  echo "$as_me:12430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12435,7 +12438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12438: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12441: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12449,7 +12452,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12452: checking if you want wide-character code" >&5
+echo "$as_me:12455: 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.
@@ -12459,7 +12462,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:12462: result: $with_widec" >&5
+echo "$as_me:12465: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12481,7 +12484,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12484: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12487: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12494,23 +12497,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12497: checking for $ac_header" >&5
+echo "$as_me:12500: 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 12503 "configure"
+#line 12506 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12507: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12513: \$? = $ac_status" >&5
+  echo "$as_me:12516: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12529,7 +12532,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12532: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12539,14 +12542,14 @@ EOF
 fi
 done
 
-echo "$as_me:12542: checking if wchar.h can be used as is" >&5
+echo "$as_me:12545: 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 12549 "configure"
+#line 12552 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12568,16 +12571,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12574: \$? = $ac_status" >&5
+  echo "$as_me:12577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12580: \$? = $ac_status" >&5
+  echo "$as_me:12583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12587,16 +12590,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12590: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12593: 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:12596: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12599: 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 12599 "configure"
+#line 12602 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12612,16 +12615,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12618: \$? = $ac_status" >&5
+  echo "$as_me:12621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12624: \$? = $ac_status" >&5
+  echo "$as_me:12627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12630,16 +12633,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12633: result: $cf_result" >&5
+echo "$as_me:12636: 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:12639: checking checking for compatible value versus " >&5
+	echo "$as_me:12642: 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 12642 "configure"
+#line 12645 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12655,16 +12658,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12661: \$? = $ac_status" >&5
+  echo "$as_me:12664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12667: \$? = $ac_status" >&5
+  echo "$as_me:12670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12673,7 +12676,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12676: result: $cf_result" >&5
+	echo "$as_me:12679: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12683,7 +12686,7 @@ fi
 
 fi
 
-echo "$as_me:12686: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12689: 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
@@ -12754,7 +12757,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12757 "configure"
+#line 12760 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12799,15 +12802,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12805: \$? = $ac_status" >&5
+  echo "$as_me:12808: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12810: \$? = $ac_status" >&5
+  echo "$as_me:12813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12820,7 +12823,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12823: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12826: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12831,13 +12834,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12834: checking for $ac_func" >&5
+echo "$as_me:12837: 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 12840 "configure"
+#line 12843 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12868,16 +12871,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12874: \$? = $ac_status" >&5
+  echo "$as_me:12877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12880: \$? = $ac_status" >&5
+  echo "$as_me:12883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12887,7 +12890,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12893: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12902,23 +12905,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12905: checking for $ac_header" >&5
+echo "$as_me:12908: 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 12911 "configure"
+#line 12914 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12915: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12918: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12921: \$? = $ac_status" >&5
+  echo "$as_me:12924: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12937,7 +12940,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12940: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12943: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12947,7 +12950,7 @@ EOF
 fi
 done
 
-echo "$as_me:12950: checking for multibyte character support" >&5
+echo "$as_me:12953: 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
@@ -12955,7 +12958,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12958 "configure"
+#line 12961 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12972,16 +12975,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12978: \$? = $ac_status" >&5
+  echo "$as_me:12981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12984: \$? = $ac_status" >&5
+  echo "$as_me:12987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12993,12 +12996,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:12996: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12999: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13001 "configure"
+#line 13004 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13011,16 +13014,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13017: \$? = $ac_status" >&5
+  echo "$as_me:13020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13023: \$? = $ac_status" >&5
+  echo "$as_me:13026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13034,7 +13037,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13037 "configure"
+#line 13040 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13047,16 +13050,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13053: \$? = $ac_status" >&5
+  echo "$as_me:13056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13059: \$? = $ac_status" >&5
+  echo "$as_me:13062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13073,9 +13076,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13076: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13079: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13078: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13081: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13166,7 +13169,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13169: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13172: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13174,7 +13177,7 @@ echo "${as_me:-configure}:13169: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13177 "configure"
+#line 13180 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13187,21 +13190,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13193: \$? = $ac_status" >&5
+  echo "$as_me:13196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13199: \$? = $ac_status" >&5
+  echo "$as_me:13202: \$? = $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}:13204: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13207: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13219,7 +13222,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13222: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13225: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13294,13 +13297,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13297: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13300: 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 13303 "configure"
+#line 13306 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13313,21 +13316,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13319: \$? = $ac_status" >&5
+  echo "$as_me:13322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13325: \$? = $ac_status" >&5
+  echo "$as_me:13328: \$? = $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}:13330: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13333: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13369,7 +13372,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13372: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13375: 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
@@ -13407,7 +13410,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13410 "configure"
+#line 13413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13419,16 +13422,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13425: \$? = $ac_status" >&5
+  echo "$as_me:13428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13431: \$? = $ac_status" >&5
+  echo "$as_me:13434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13445,7 +13448,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13448: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13451: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13481,7 +13484,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13484: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13487: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13513,14 +13516,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13516: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13519: 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 13523 "configure"
+#line 13526 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13538,23 +13541,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13544: \$? = $ac_status" >&5
+  echo "$as_me:13547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13550: \$? = $ac_status" >&5
+  echo "$as_me:13553: \$? = $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 13557 "configure"
+#line 13560 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13573,16 +13576,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13579: \$? = $ac_status" >&5
+  echo "$as_me:13582: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13585: \$? = $ac_status" >&5
+  echo "$as_me:13588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13594,7 +13597,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13597: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13600: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13612,14 +13615,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13615: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13618: 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 13622 "configure"
+#line 13625 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13637,23 +13640,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13643: \$? = $ac_status" >&5
+  echo "$as_me:13646: \$? = $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:13649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13649: \$? = $ac_status" >&5
+  echo "$as_me:13652: \$? = $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 13656 "configure"
+#line 13659 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13672,16 +13675,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13678: \$? = $ac_status" >&5
+  echo "$as_me:13681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13684: \$? = $ac_status" >&5
+  echo "$as_me:13687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13693,7 +13696,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13696: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13699: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13716,14 +13719,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13719: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13722: 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 13726 "configure"
+#line 13729 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13741,23 +13744,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13747: \$? = $ac_status" >&5
+  echo "$as_me:13750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13753: \$? = $ac_status" >&5
+  echo "$as_me:13756: \$? = $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 13760 "configure"
+#line 13763 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13776,16 +13779,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13782: \$? = $ac_status" >&5
+  echo "$as_me:13785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13788: \$? = $ac_status" >&5
+  echo "$as_me:13791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13797,7 +13800,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13800: result: $cf_cv_wint_t" >&5
+echo "$as_me:13803: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13829,7 +13832,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13832: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13835: 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.
@@ -13839,7 +13842,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13842: result: $with_lp64" >&5
+echo "$as_me:13845: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13855,7 +13858,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13858: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13861: 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
@@ -13867,7 +13870,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13870 "configure"
+#line 13873 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13887,16 +13890,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13893: \$? = $ac_status" >&5
+  echo "$as_me:13896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13899: \$? = $ac_status" >&5
+  echo "$as_me:13902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13906,16 +13909,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13912: \$? = $ac_status" >&5
+  echo "$as_me:13915: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13918: \$? = $ac_status" >&5
+  echo "$as_me:13921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13929,13 +13932,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13932: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13935: 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:13938: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13941: 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
@@ -13943,7 +13946,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13946 "configure"
+#line 13949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13963,16 +13966,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13969: \$? = $ac_status" >&5
+  echo "$as_me:13972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13975: \$? = $ac_status" >&5
+  echo "$as_me:13978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13981,7 +13984,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13984 "configure"
+#line 13987 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14002,16 +14005,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14008: \$? = $ac_status" >&5
+  echo "$as_me:14011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14014: \$? = $ac_status" >&5
+  echo "$as_me:14017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14022,7 +14025,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14025: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14028: 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
 
@@ -14032,7 +14035,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14035: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14038: 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
@@ -14040,7 +14043,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14043 "configure"
+#line 14046 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14060,16 +14063,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14066: \$? = $ac_status" >&5
+  echo "$as_me:14069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14072: \$? = $ac_status" >&5
+  echo "$as_me:14075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14078,7 +14081,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14081 "configure"
+#line 14084 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14099,16 +14102,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14105: \$? = $ac_status" >&5
+  echo "$as_me:14108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14111: \$? = $ac_status" >&5
+  echo "$as_me:14114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14119,7 +14122,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14122: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14125: 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
 
@@ -14132,7 +14135,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14135: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14138: 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
@@ -14140,7 +14143,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14143 "configure"
+#line 14146 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14152,16 +14155,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14158: \$? = $ac_status" >&5
+  echo "$as_me:14161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14164: \$? = $ac_status" >&5
+  echo "$as_me:14167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14170,7 +14173,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14173 "configure"
+#line 14176 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14183,16 +14186,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14189: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14189: \$? = $ac_status" >&5
+  echo "$as_me:14192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14195: \$? = $ac_status" >&5
+  echo "$as_me:14198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14203,7 +14206,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14206: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14209: 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
 
@@ -14217,13 +14220,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14220: checking for fseeko" >&5
+echo "$as_me:14223: 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 14226 "configure"
+#line 14229 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14235,16 +14238,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14241: \$? = $ac_status" >&5
+  echo "$as_me:14244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14247: \$? = $ac_status" >&5
+  echo "$as_me:14250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14254,7 +14257,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14257: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14260: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14293,14 +14296,14 @@ fi
 
 	fi
 
-	echo "$as_me:14296: checking whether to use struct dirent64" >&5
+	echo "$as_me:14299: 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 14303 "configure"
+#line 14306 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14323,16 +14326,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14326: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14329: \$? = $ac_status" >&5
+  echo "$as_me:14332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14335: \$? = $ac_status" >&5
+  echo "$as_me:14338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14343,7 +14346,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14346: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14349: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14353,7 +14356,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14356: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14359: 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.
@@ -14363,14 +14366,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14366: result: $with_tparm_varargs" >&5
+echo "$as_me:14369: 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:14373: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14376: 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.
@@ -14380,14 +14383,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14383: result: $with_tic_depends" >&5
+echo "$as_me:14386: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14390: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14393: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14399,15 +14402,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14402: result: no" >&5
+	echo "$as_me:14405: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14406: result: yes" >&5
+	echo "$as_me:14409: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14410: checking for X11 rgb file" >&5
+echo "$as_me:14413: 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.
@@ -14471,7 +14474,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14474: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14477: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14479,7 +14482,7 @@ esac
 
 fi
 
-echo "$as_me:14482: result: $RGB_PATH" >&5
+echo "$as_me:14485: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14493,7 +14496,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14496: checking for type of bool" >&5
+echo "$as_me:14499: 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.
@@ -14503,10 +14506,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14506: result: $NCURSES_BOOL" >&5
+echo "$as_me:14509: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14509: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14512: 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.
@@ -14518,15 +14521,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14521: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14524: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14525: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14528: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14529: checking for type of chtype" >&5
+echo "$as_me:14532: 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.
@@ -14536,11 +14539,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14539: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14542: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14543: checking for type of ospeed" >&5
+echo "$as_me:14546: 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.
@@ -14550,11 +14553,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14553: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14556: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14557: checking for type of mmask_t" >&5
+echo "$as_me:14560: 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.
@@ -14564,11 +14567,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14567: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14570: 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:14571: checking for size CCHARW_MAX" >&5
+echo "$as_me:14574: 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.
@@ -14578,16 +14581,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14581: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14584: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14584: checking for signed char" >&5
+echo "$as_me:14587: 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 14590 "configure"
+#line 14593 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14602,16 +14605,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14608: \$? = $ac_status" >&5
+  echo "$as_me:14611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14614: \$? = $ac_status" >&5
+  echo "$as_me:14617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14621,10 +14624,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14624: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14627: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14627: checking size of signed char" >&5
+echo "$as_me:14630: 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
@@ -14633,7 +14636,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14636 "configure"
+#line 14639 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14645,21 +14648,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14651: \$? = $ac_status" >&5
+  echo "$as_me:14654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14657: \$? = $ac_status" >&5
+  echo "$as_me:14660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14662 "configure"
+#line 14665 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14671,16 +14674,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14677: \$? = $ac_status" >&5
+  echo "$as_me:14680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14683: \$? = $ac_status" >&5
+  echo "$as_me:14686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14696,7 +14699,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14699 "configure"
+#line 14702 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14708,16 +14711,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14714: \$? = $ac_status" >&5
+  echo "$as_me:14717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14720: \$? = $ac_status" >&5
+  echo "$as_me:14723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14733,7 +14736,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14736 "configure"
+#line 14739 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14745,16 +14748,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14751: \$? = $ac_status" >&5
+  echo "$as_me:14754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14757: \$? = $ac_status" >&5
+  echo "$as_me:14760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14767,12 +14770,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14770: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14773: 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 14775 "configure"
+#line 14778 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14788,15 +14791,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14794: \$? = $ac_status" >&5
+  echo "$as_me:14797: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14799: \$? = $ac_status" >&5
+  echo "$as_me:14802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14812,7 +14815,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14815: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14818: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14823,7 +14826,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14826: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14829: 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.
@@ -14833,12 +14836,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14836: result: $with_signed_char" >&5
+echo "$as_me:14839: 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:14841: checking for type of tparm args" >&5
+echo "$as_me:14844: 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.
@@ -14848,11 +14851,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14851: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14854: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14855: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14858: 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.
@@ -14862,7 +14865,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14865: result: $with_rcs_ids" >&5
+echo "$as_me:14868: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14871,7 +14874,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14874: checking format of man-pages" >&5
+echo "$as_me:14877: 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.
@@ -14962,10 +14965,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14965: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14968: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14968: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14971: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15004,7 +15007,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15007: checking for manpage renaming" >&5
+echo "$as_me:15010: 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.
@@ -15033,15 +15036,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15036: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15039: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15041: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15044: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15044: checking if manpage aliases will be installed" >&5
+echo "$as_me:15047: 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.
@@ -15052,7 +15055,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15055: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15058: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15066,7 +15069,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15069: checking if manpage symlinks should be used" >&5
+echo "$as_me:15072: 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.
@@ -15079,17 +15082,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15082: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15085: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15088: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15091: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15092: checking for manpage tbl" >&5
+echo "$as_me:15095: 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.
@@ -15100,7 +15103,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15103: result: $MANPAGE_TBL" >&5
+echo "$as_me:15106: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15417,7 +15420,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15420: checking if you want to build with function extensions" >&5
+echo "$as_me:15423: 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.
@@ -15427,7 +15430,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15430: result: $with_ext_funcs" >&5
+echo "$as_me:15433: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15483,7 +15486,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15486: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15489: 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.
@@ -15493,7 +15496,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15496: result: $with_sp_funcs" >&5
+echo "$as_me:15499: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15512,7 +15515,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15515: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15518: 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.
@@ -15522,7 +15525,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15525: result: $with_term_driver" >&5
+echo "$as_me:15528: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15531,19 +15534,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15534: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15537: 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:15539: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15542: 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:15546: checking for extended use of const keyword" >&5
+echo "$as_me:15549: 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.
@@ -15553,7 +15556,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15556: result: $with_ext_const" >&5
+echo "$as_me:15559: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15561,7 +15564,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15564: checking if you want to use extended colors" >&5
+echo "$as_me:15567: 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.
@@ -15571,12 +15574,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15574: result: $with_ext_colors" >&5
+echo "$as_me:15577: 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:15579: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15582: 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)
@@ -15587,7 +15590,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15615,7 +15618,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15618: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15621: 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.
@@ -15625,7 +15628,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15628: result: $with_ext_mouse" >&5
+echo "$as_me:15631: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15635,7 +15638,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15638: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15641: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15652,7 +15655,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15655: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15658: 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.
@@ -15662,7 +15665,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15665: result: $with_ext_putwin" >&5
+echo "$as_me:15668: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15672,7 +15675,7 @@ EOF
 
 fi
 
-echo "$as_me:15675: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15678: 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.
@@ -15682,7 +15685,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15685: result: $with_no_padding" >&5
+echo "$as_me:15688: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15690,7 +15693,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15693: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15696: 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.
@@ -15700,7 +15703,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15703: result: $with_sigwinch" >&5
+echo "$as_me:15706: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15708,7 +15711,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15711: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15714: 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.
@@ -15718,7 +15721,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15721: result: $with_tcap_names" >&5
+echo "$as_me:15724: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15732,7 +15735,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15735: checking if you want to link with the pthread library" >&5
+echo "$as_me:15738: 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.
@@ -15742,27 +15745,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15745: result: $with_pthread" >&5
+echo "$as_me:15748: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15749: checking for pthread.h" >&5
+	echo "$as_me:15752: 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 15755 "configure"
+#line 15758 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15759: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15762: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15765: \$? = $ac_status" >&5
+  echo "$as_me:15768: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15781,7 +15784,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15784: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15787: 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
 
@@ -15791,7 +15794,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15794: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15797: 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"
 
@@ -15812,7 +15815,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15815 "configure"
+#line 15818 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15829,16 +15832,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15835: \$? = $ac_status" >&5
+  echo "$as_me:15838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15841: \$? = $ac_status" >&5
+  echo "$as_me:15844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15848,7 +15851,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15851: result: $with_pthread" >&5
+	    echo "$as_me:15854: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15876,7 +15879,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15879: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15882: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15886,13 +15889,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15889: checking for pthread_kill" >&5
+	echo "$as_me:15892: 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 15895 "configure"
+#line 15898 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15923,16 +15926,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15929: \$? = $ac_status" >&5
+  echo "$as_me:15932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15935: \$? = $ac_status" >&5
+  echo "$as_me:15938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15942,11 +15945,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15945: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15948: 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:15949: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15952: 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.
@@ -15956,7 +15959,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15959: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15962: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15967,7 +15970,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15970: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15973: 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.
@@ -15977,18 +15980,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15980: result: $use_weak_symbols" >&5
+	echo "$as_me:15983: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15984: checking if $CC supports weak symbols" >&5
+echo "$as_me:15987: 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 15991 "configure"
+#line 15994 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16014,16 +16017,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16020: \$? = $ac_status" >&5
+  echo "$as_me:16023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16026: \$? = $ac_status" >&5
+  echo "$as_me:16029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16034,7 +16037,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16037: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16040: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16084,7 +16087,7 @@ fi
 # 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:16087: checking if you want reentrant code" >&5
+echo "$as_me:16090: 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.
@@ -16094,7 +16097,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16097: result: $with_reentrant" >&5
+echo "$as_me:16100: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16183,7 +16186,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16186: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16189: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16195,7 +16198,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16198: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16201: 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.
@@ -16217,16 +16220,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16220: result: $enable_opaque_curses" >&5
+echo "$as_me:16223: 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:16225: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16228: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16229: checking if you want opaque form-library structures" >&5
+echo "$as_me:16232: 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.
@@ -16236,10 +16239,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16239: result: $enable_opaque_form" >&5
+echo "$as_me:16242: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16242: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16245: 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.
@@ -16249,10 +16252,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16252: result: $enable_opaque_menu" >&5
+echo "$as_me:16255: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16255: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16258: 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.
@@ -16262,7 +16265,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16265: result: $enable_opaque_panel" >&5
+echo "$as_me:16268: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16272,7 +16275,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16275: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16278: 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.
@@ -16282,7 +16285,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16285: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16288: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16295,7 +16298,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16298: checking if you want all development code" >&5
+echo "$as_me:16301: 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.
@@ -16305,11 +16308,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16308: result: $with_develop" >&5
+echo "$as_me:16311: 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:16312: checking if you want hard-tabs code" >&5
+echo "$as_me:16315: 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.
@@ -16319,7 +16322,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16322: result: $enable_hard_tabs" >&5
+echo "$as_me:16325: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16327,7 +16330,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16330: checking if you want limited support for xmc" >&5
+echo "$as_me:16333: 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.
@@ -16337,7 +16340,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16340: result: $enable_xmc_glitch" >&5
+echo "$as_me:16343: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16347,7 +16350,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16350: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16353: 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.
@@ -16357,7 +16360,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16360: result: $with_assumed_color" >&5
+echo "$as_me:16363: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16365,7 +16368,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16368: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16371: 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.
@@ -16375,7 +16378,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16378: result: $with_hashmap" >&5
+echo "$as_me:16381: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16383,7 +16386,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16386: checking if you want colorfgbg code" >&5
+echo "$as_me:16389: 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.
@@ -16393,7 +16396,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16396: result: $with_colorfgbg" >&5
+echo "$as_me:16399: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16401,7 +16404,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16404: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16407: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16411,14 +16414,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16414: result: $cf_with_fvisibility" >&5
+echo "$as_me:16417: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16421: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16424: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16427,7 +16430,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16430 "configure"
+#line 16433 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16443,16 +16446,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16449: \$? = $ac_status" >&5
+  echo "$as_me:16452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16455: \$? = $ac_status" >&5
+  echo "$as_me:16458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16464,7 +16467,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16467: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16470: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16579,7 +16582,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16582: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16585: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16588,7 +16591,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16591 "configure"
+#line 16594 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16604,16 +16607,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16610: \$? = $ac_status" >&5
+  echo "$as_me:16613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16616: \$? = $ac_status" >&5
+  echo "$as_me:16619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16625,7 +16628,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16628: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16631: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16748,7 +16751,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16751: checking if you want interop bindings" >&5
+echo "$as_me:16754: 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.
@@ -16758,13 +16761,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16761: result: $with_exp_interop" >&5
+echo "$as_me:16764: 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:16767: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16770: 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.
@@ -16774,13 +16777,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16777: result: $with_safe_sprintf" >&5
+echo "$as_me:16780: 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:16783: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16786: 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.
@@ -16790,7 +16793,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16793: result: $with_scroll_hints" >&5
+echo "$as_me:16796: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16799,7 +16802,7 @@ EOF
 
 fi
 
-echo "$as_me:16802: checking if you want wgetch-events code" >&5
+echo "$as_me:16805: 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.
@@ -16809,7 +16812,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16812: result: $with_wgetch_events" >&5
+echo "$as_me:16815: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16824,7 +16827,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16827: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16830: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16834,7 +16837,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16837: result: $with_exp_win32" >&5
+	echo "$as_me:16840: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16860,7 +16863,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16863: checking if you want to see long compiling messages" >&5
+echo "$as_me:16866: 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.
@@ -16894,7 +16897,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16897: result: $enableval" >&5
+echo "$as_me:16900: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16907,7 +16910,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16910: checking if you want to install stripped executables" >&5
+echo "$as_me:16913: 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.
@@ -16924,7 +16927,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16927: result: $enable_stripping" >&5
+echo "$as_me:16930: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16935,7 +16938,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16938: checking if install accepts -p option" >&5
+echo "$as_me:16941: 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
@@ -16966,10 +16969,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16969: result: $cf_cv_install_p" >&5
+echo "$as_me:16972: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16972: checking if install needs to be told about ownership" >&5
+echo "$as_me:16975: 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)
@@ -16980,7 +16983,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16983: result: $with_install_o" >&5
+echo "$as_me:16986: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -16991,7 +16994,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:16994: checking if you want to specify strip-program" >&5
+	echo "$as_me:16997: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17001,11 +17004,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17004: result: $with_strip_program" >&5
+	echo "$as_me:17007: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17008: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17011: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17026,11 +17029,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17029: result: $check_install_strip" >&5
+		echo "$as_me:17032: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17033: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17036: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17045,7 +17048,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17048: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17051: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17071,7 +17074,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17074: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17077: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17088,17 +17091,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17091: result: $enable_stdnoreturn" >&5
+echo "$as_me:17094: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17095: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17098: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17101 "configure"
+#line 17104 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17114,16 +17117,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17120: \$? = $ac_status" >&5
+  echo "$as_me:17123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17126: \$? = $ac_status" >&5
+  echo "$as_me:17129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17134,7 +17137,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17137: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17140: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17190,16 +17193,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17193: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17196: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17198: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17201: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17205: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17238,16 +17241,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17241: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17244: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17246: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17249: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17250: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17253: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17286,23 +17289,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17289: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17292: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17294: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17297: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17298: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17301: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17305: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17308: 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.
@@ -17319,7 +17322,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17322: result: $enable_warnings" >&5
+echo "$as_me:17325: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17343,7 +17346,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17346 "configure"
+#line 17349 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17358,26 +17361,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17364: \$? = $ac_status" >&5
+  echo "$as_me:17367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17370: \$? = $ac_status" >&5
+  echo "$as_me:17373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17373: checking for X11/Xt const-feature" >&5
+echo "$as_me:17376: 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 17380 "configure"
+#line 17383 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17394,16 +17397,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17400: \$? = $ac_status" >&5
+  echo "$as_me:17403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17406: \$? = $ac_status" >&5
+  echo "$as_me:17409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17418,7 +17421,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17421: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17424: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17447,7 +17450,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17450 "${as_me:-configure}"
+#line 17453 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17463,7 +17466,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17466: checking for $CC warning options..." >&5
+	{ echo "$as_me:17469: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17479,12 +17482,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17482: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17485: \$? = $ac_status" >&5
+  echo "$as_me:17488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17487: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17492,7 +17495,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17495: checking for $CC warning options..." >&5
+	{ echo "$as_me:17498: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17515,12 +17518,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17518: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17521: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17523: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17528,7 +17531,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17531: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17538,7 +17541,7 @@ echo "${as_me:-configure}:17531: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17541: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17571,10 +17574,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17574: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17577 "${as_me:-configure}"
+#line 17580 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17624,12 +17627,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17627: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17630: \$? = $ac_status" >&5
+  echo "$as_me:17633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17632: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17701,12 +17704,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17704: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17707: 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 17709 "configure"
+#line 17712 "configure"
 #include "confdefs.h"
 
 int
@@ -17723,16 +17726,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17729: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17729: \$? = $ac_status" >&5
+  echo "$as_me:17732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17735: \$? = $ac_status" >&5
+  echo "$as_me:17738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17743,7 +17746,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17746: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17749: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17752,11 +17755,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17755: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17758: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17759 "configure"
+#line 17762 "configure"
 #include "confdefs.h"
 
 int
@@ -17773,16 +17776,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17779: \$? = $ac_status" >&5
+  echo "$as_me:17782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17785: \$? = $ac_status" >&5
+  echo "$as_me:17788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17792,7 +17795,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17795: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17798: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17801,30 +17804,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17804: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17807: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17811: checking version of $CC" >&5
+	echo "$as_me:17814: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17815: result: $CLANG_VERSION" >&5
+	echo "$as_me:17818: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17822: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17825: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17827 "configure"
+#line 17830 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17838,16 +17841,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17844: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17850: \$? = $ac_status" >&5
+  echo "$as_me:17853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17858,13 +17861,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17861: result: $cf_clang_optok" >&5
+		echo "$as_me:17864: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17867: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17870: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17881,7 +17884,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17884 "configure"
+#line 17887 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17899,7 +17902,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17902: checking for $CC warning options..." >&5
+	{ echo "$as_me:17905: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17916,12 +17919,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17919: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17922: \$? = $ac_status" >&5
+  echo "$as_me:17925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17924: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17927: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17930,7 +17933,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17933: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17936: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17960,16 +17963,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17963: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17966: \$? = $ac_status" >&5
+  echo "$as_me:17969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17968: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17971: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17972: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17975: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17987,7 +17990,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17990: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17993: 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.
@@ -17997,7 +18000,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18000: result: $enable_string_hacks" >&5
+echo "$as_me:18003: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18006,15 +18009,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18009: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18012: 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:18011: checking for strlcat" >&5
+	echo "$as_me:18014: 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 18017 "configure"
+#line 18020 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18045,16 +18048,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18051: \$? = $ac_status" >&5
+  echo "$as_me:18054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18057: \$? = $ac_status" >&5
+  echo "$as_me:18060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18064,7 +18067,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18067: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18070: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18074,7 +18077,7 @@ EOF
 
 else
 
-		echo "$as_me:18077: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18080: 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
@@ -18082,7 +18085,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18085 "configure"
+#line 18088 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18101,16 +18104,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18107: \$? = $ac_status" >&5
+  echo "$as_me:18110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18113: \$? = $ac_status" >&5
+  echo "$as_me:18116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18121,7 +18124,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18124: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18127: 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
 
@@ -18144,23 +18147,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18147: checking for $ac_header" >&5
+echo "$as_me:18150: 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 18153 "configure"
+#line 18156 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18163: \$? = $ac_status" >&5
+  echo "$as_me:18166: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18179,7 +18182,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18200,13 +18203,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18203: checking for $ac_func" >&5
+echo "$as_me:18206: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18209 "configure"
+#line 18212 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18237,16 +18240,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18243: \$? = $ac_status" >&5
+  echo "$as_me:18246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18249: \$? = $ac_status" >&5
+  echo "$as_me:18252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18256,7 +18259,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18259: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18262: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18269,7 +18272,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18272: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18275: 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.
@@ -18279,7 +18282,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18282: result: $with_assertions" >&5
+echo "$as_me:18285: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18295,7 +18298,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18298: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18301: 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.
@@ -18317,7 +18320,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18320: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18323: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18431,23 +18434,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18434: checking for dmalloc.h" >&5
+	echo "$as_me:18437: 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 18440 "configure"
+#line 18443 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18444: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18447: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18450: \$? = $ac_status" >&5
+  echo "$as_me:18453: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18466,11 +18469,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18469: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18472: 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:18473: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18476: 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
@@ -18478,7 +18481,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18481 "configure"
+#line 18484 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18497,16 +18500,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18503: \$? = $ac_status" >&5
+  echo "$as_me:18506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18509: \$? = $ac_status" >&5
+  echo "$as_me:18512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18517,7 +18520,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18520: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18523: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18532,7 +18535,7 @@ fi
 
 fi
 
-echo "$as_me:18535: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18538: 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.
@@ -18554,7 +18557,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18557: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18560: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18668,23 +18671,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18671: checking for dbmalloc.h" >&5
+	echo "$as_me:18674: 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 18677 "configure"
+#line 18680 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18681: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18684: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18687: \$? = $ac_status" >&5
+  echo "$as_me:18690: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18703,11 +18706,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18706: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18709: 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:18710: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18713: 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
@@ -18715,7 +18718,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18718 "configure"
+#line 18721 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18734,16 +18737,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18740: \$? = $ac_status" >&5
+  echo "$as_me:18743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18746: \$? = $ac_status" >&5
+  echo "$as_me:18749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18754,7 +18757,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18757: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18760: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18769,7 +18772,7 @@ fi
 
 fi
 
-echo "$as_me:18772: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18775: 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.
@@ -18791,7 +18794,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18794: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18797: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18904,7 +18907,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18907: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18910: 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.
@@ -18915,7 +18918,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18918: result: $with_no_leaks" >&5
+echo "$as_me:18921: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18967,7 +18970,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18970: checking whether to add trace feature to all models" >&5
+echo "$as_me:18973: 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.
@@ -18977,7 +18980,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18980: result: $cf_with_trace" >&5
+echo "$as_me:18983: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19091,7 +19094,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19094: checking if we want to use GNAT projects" >&5
+echo "$as_me:19097: 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.
@@ -19108,7 +19111,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19111: result: $enable_gnat_projects" >&5
+echo "$as_me:19114: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19121,14 +19124,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19124: checking if ssp library is needed" >&5
+echo "$as_me:19127: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19131 "configure"
+#line 19134 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19145,16 +19148,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19151: \$? = $ac_status" >&5
+  echo "$as_me:19154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19157: \$? = $ac_status" >&5
+  echo "$as_me:19160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19164,7 +19167,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19167 "configure"
+#line 19170 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19181,16 +19184,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19187: \$? = $ac_status" >&5
+  echo "$as_me:19190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19193: \$? = $ac_status" >&5
+  echo "$as_me:19196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19204,7 +19207,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19207: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19210: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19233,14 +19236,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19236: checking if -lm needed for math functions" >&5
+echo "$as_me:19239: 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 19243 "configure"
+#line 19246 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19256,16 +19259,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19262: \$? = $ac_status" >&5
+  echo "$as_me:19265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19268: \$? = $ac_status" >&5
+  echo "$as_me:19271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19275,7 +19278,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19278: result: $cf_cv_need_libm" >&5
+echo "$as_me:19281: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19283,14 +19286,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19286: checking if -lm is available for math functions" >&5
+	echo "$as_me:19289: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19293 "configure"
+#line 19296 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19306,16 +19309,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19312: \$? = $ac_status" >&5
+  echo "$as_me:19315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19318: \$? = $ac_status" >&5
+  echo "$as_me:19321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19325,7 +19328,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19328: result: $cf_cv_have_libm" >&5
+echo "$as_me:19331: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19347,13 +19350,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19350: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19353: 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 19356 "configure"
+#line 19359 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19369,16 +19372,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19375: \$? = $ac_status" >&5
+  echo "$as_me:19378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19381: \$? = $ac_status" >&5
+  echo "$as_me:19384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19388,7 +19391,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19391: result: $ac_cv_header_time" >&5
+echo "$as_me:19394: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19403,7 +19406,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19406: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19409: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19411,7 +19414,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19414 "configure"
+#line 19417 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19430,16 +19433,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19436: \$? = $ac_status" >&5
+  echo "$as_me:19439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19442: \$? = $ac_status" >&5
+  echo "$as_me:19445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19450,11 +19453,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19453: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19456: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19457: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19460: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19462,7 +19465,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19465 "configure"
+#line 19468 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19481,16 +19484,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19487: \$? = $ac_status" >&5
+  echo "$as_me:19490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19493: \$? = $ac_status" >&5
+  echo "$as_me:19496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19501,7 +19504,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19504: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19507: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19523,7 +19526,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19526: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19529: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19531,7 +19534,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19534 "configure"
+#line 19537 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19550,16 +19553,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19556: \$? = $ac_status" >&5
+  echo "$as_me:19559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19562: \$? = $ac_status" >&5
+  echo "$as_me:19565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19570,7 +19573,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19573: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19576: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19592,7 +19595,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19595: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19598: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19600,7 +19603,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19603 "configure"
+#line 19606 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19619,16 +19622,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19625: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19631: \$? = $ac_status" >&5
+  echo "$as_me:19634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19639,7 +19642,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19642: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19645: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19681,7 +19684,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19684: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19687: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19689,7 +19692,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19692 "configure"
+#line 19695 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19708,16 +19711,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19714: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19714: \$? = $ac_status" >&5
+  echo "$as_me:19717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19720: \$? = $ac_status" >&5
+  echo "$as_me:19723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19728,7 +19731,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19731: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19734: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19756,13 +19759,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19759: checking for regcomp" >&5
+	echo "$as_me:19762: 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 19765 "configure"
+#line 19768 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19793,16 +19796,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19799: \$? = $ac_status" >&5
+  echo "$as_me:19802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19805: \$? = $ac_status" >&5
+  echo "$as_me:19808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19812,7 +19815,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19815: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19818: 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
@@ -19821,7 +19824,7 @@ else
 		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:19824: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19827: 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
@@ -19829,7 +19832,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19832 "configure"
+#line 19835 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19848,16 +19851,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19854: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19854: \$? = $ac_status" >&5
+  echo "$as_me:19857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19860: \$? = $ac_status" >&5
+  echo "$as_me:19863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19868,7 +19871,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19871: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19874: 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
 
@@ -19900,13 +19903,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19903: checking for compile" >&5
+	echo "$as_me:19906: 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 19909 "configure"
+#line 19912 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19937,16 +19940,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19943: \$? = $ac_status" >&5
+  echo "$as_me:19946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19949: \$? = $ac_status" >&5
+  echo "$as_me:19952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19956,13 +19959,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19959: result: $ac_cv_func_compile" >&5
+echo "$as_me:19962: 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:19965: checking for compile in -lgen" >&5
+		echo "$as_me:19968: 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
@@ -19970,7 +19973,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19973 "configure"
+#line 19976 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19989,16 +19992,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19995: \$? = $ac_status" >&5
+  echo "$as_me:19998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20001: \$? = $ac_status" >&5
+  echo "$as_me:20004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20009,7 +20012,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20012: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20015: 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
 
@@ -20037,11 +20040,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20040: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20043: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20044: checking for regular-expression headers" >&5
+echo "$as_me:20047: 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
@@ -20053,7 +20056,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20056 "configure"
+#line 20059 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20070,16 +20073,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20076: \$? = $ac_status" >&5
+  echo "$as_me:20079: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20082: \$? = $ac_status" >&5
+  echo "$as_me:20085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20096,7 +20099,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20099 "configure"
+#line 20102 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20116,16 +20119,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20122: \$? = $ac_status" >&5
+  echo "$as_me:20125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20128: \$? = $ac_status" >&5
+  echo "$as_me:20131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20141,11 +20144,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20144: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20147: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20148: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20151: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20183,23 +20186,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20186: checking for $ac_header" >&5
+echo "$as_me:20189: 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 20192 "configure"
+#line 20195 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20196: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20199: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20202: \$? = $ac_status" >&5
+  echo "$as_me:20205: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20218,7 +20221,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20221: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20224: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20231,23 +20234,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20234: checking for $ac_header" >&5
+echo "$as_me:20237: 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 20240 "configure"
+#line 20243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20244: \"$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:20250: \$? = $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_c_preproc_warn_flag
@@ -20266,7 +20269,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20269: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20276,7 +20279,7 @@ EOF
 fi
 done
 
-echo "$as_me:20279: checking for header declaring getopt variables" >&5
+echo "$as_me:20282: 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
@@ -20286,7 +20289,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20289 "configure"
+#line 20292 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20299,16 +20302,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20305: \$? = $ac_status" >&5
+  echo "$as_me:20308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20311: \$? = $ac_status" >&5
+  echo "$as_me:20314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20320,7 +20323,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20323: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20326: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20337,14 +20340,14 @@ EOF
 
 fi
 
-echo "$as_me:20340: checking if external environ is declared" >&5
+echo "$as_me:20343: 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 20347 "configure"
+#line 20350 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20357,16 +20360,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20363: \$? = $ac_status" >&5
+  echo "$as_me:20366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20369: \$? = $ac_status" >&5
+  echo "$as_me:20372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20377,7 +20380,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20380: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20383: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20392,14 +20395,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20395: checking if external environ exists" >&5
+echo "$as_me:20398: 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 20402 "configure"
+#line 20405 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20414,16 +20417,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20420: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20426: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20434,7 +20437,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20437: result: $cf_cv_have_environ" >&5
+echo "$as_me:20440: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20447,13 +20450,13 @@ EOF
 
 fi
 
-echo "$as_me:20450: checking for getenv" >&5
+echo "$as_me:20453: 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 20456 "configure"
+#line 20459 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20484,16 +20487,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20490: \$? = $ac_status" >&5
+  echo "$as_me:20493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20496: \$? = $ac_status" >&5
+  echo "$as_me:20499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20503,19 +20506,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20506: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20509: 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:20512: checking for $ac_func" >&5
+echo "$as_me:20515: 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 20518 "configure"
+#line 20521 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20546,16 +20549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20552: \$? = $ac_status" >&5
+  echo "$as_me:20555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20558: \$? = $ac_status" >&5
+  echo "$as_me:20561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20565,7 +20568,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20568: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20571: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20575,7 +20578,7 @@ EOF
 fi
 done
 
-echo "$as_me:20578: checking if getenv returns consistent values" >&5
+echo "$as_me:20581: 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
@@ -20585,7 +20588,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20588 "configure"
+#line 20591 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20690,15 +20693,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20696: \$? = $ac_status" >&5
+  echo "$as_me:20699: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20701: \$? = $ac_status" >&5
+  echo "$as_me:20704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20711,7 +20714,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20714: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20717: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20726,18 +20729,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20729: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20732: 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
 
-echo "$as_me:20733: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20736: 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 20740 "configure"
+#line 20743 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20757,16 +20760,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20763: \$? = $ac_status" >&5
+  echo "$as_me:20766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20769: \$? = $ac_status" >&5
+  echo "$as_me:20772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20778,7 +20781,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20781: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20784: 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
@@ -20793,13 +20796,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20796: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20799: 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 20802 "configure"
+#line 20805 "configure"
 #include "confdefs.h"
 
 int
@@ -20857,16 +20860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20863: \$? = $ac_status" >&5
+  echo "$as_me:20866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20869: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20876,7 +20879,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20879: result: $ac_cv_c_const" >&5
+echo "$as_me:20882: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20886,7 +20889,7 @@ EOF
 
 fi
 
-echo "$as_me:20889: checking for inline" >&5
+echo "$as_me:20892: 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
@@ -20894,7 +20897,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20897 "configure"
+#line 20900 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20903,16 +20906,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20909: \$? = $ac_status" >&5
+  echo "$as_me:20912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20915: \$? = $ac_status" >&5
+  echo "$as_me:20918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20923,7 +20926,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20926: result: $ac_cv_c_inline" >&5
+echo "$as_me:20929: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20949,7 +20952,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20952: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20955: 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
@@ -20958,7 +20961,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20961 "configure"
+#line 20964 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20970,16 +20973,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20976: \$? = $ac_status" >&5
+  echo "$as_me:20979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20982: \$? = $ac_status" >&5
+  echo "$as_me:20985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20991,7 +20994,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20994: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20997: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21097,7 +21100,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21100: checking for signal global datatype" >&5
+echo "$as_me:21103: 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
@@ -21109,7 +21112,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21112 "configure"
+#line 21115 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21133,16 +21136,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21139: \$? = $ac_status" >&5
+  echo "$as_me:21142: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21145: \$? = $ac_status" >&5
+  echo "$as_me:21148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21156,7 +21159,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21159: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21162: 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 <<EOF
@@ -21165,7 +21168,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21168: checking for type of chtype" >&5
+echo "$as_me:21171: 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
@@ -21175,7 +21178,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21178 "configure"
+#line 21181 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21210,15 +21213,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21216: \$? = $ac_status" >&5
+  echo "$as_me:21219: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21221: \$? = $ac_status" >&5
+  echo "$as_me:21224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21233,7 +21236,7 @@ fi
 
 fi
 
-echo "$as_me:21236: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21239: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21245,14 +21248,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21248: checking if unsigned literals are legal" >&5
+echo "$as_me:21251: 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 21255 "configure"
+#line 21258 "configure"
 #include "confdefs.h"
 
 int
@@ -21264,16 +21267,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21270: \$? = $ac_status" >&5
+  echo "$as_me:21273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21276: \$? = $ac_status" >&5
+  echo "$as_me:21279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21285,7 +21288,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21288: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21291: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21301,14 +21304,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21304: checking if external errno is declared" >&5
+echo "$as_me:21307: 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 21311 "configure"
+#line 21314 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21322,16 +21325,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21328: \$? = $ac_status" >&5
+  echo "$as_me:21331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21334: \$? = $ac_status" >&5
+  echo "$as_me:21337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21342,7 +21345,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21345: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21348: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21357,14 +21360,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21360: checking if external errno exists" >&5
+echo "$as_me:21363: 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 21367 "configure"
+#line 21370 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21379,16 +21382,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21385: \$? = $ac_status" >&5
+  echo "$as_me:21388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21391: \$? = $ac_status" >&5
+  echo "$as_me:21394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21399,7 +21402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21402: result: $cf_cv_have_errno" >&5
+echo "$as_me:21405: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21412,7 +21415,7 @@ EOF
 
 fi
 
-echo "$as_me:21415: checking if data-only library module links" >&5
+echo "$as_me:21418: 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
@@ -21420,20 +21423,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21423 "configure"
+#line 21426 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21426: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21429: \$? = $ac_status" >&5
+  echo "$as_me:21432: \$? = $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 <<EOF
-#line 21436 "configure"
+#line 21439 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21446,10 +21449,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21449: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21452: \$? = $ac_status" >&5
+  echo "$as_me:21455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21462,7 +21465,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21465 "configure"
+#line 21468 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21473,15 +21476,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21479: \$? = $ac_status" >&5
+  echo "$as_me:21482: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21484: \$? = $ac_status" >&5
+  echo "$as_me:21487: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21496,7 +21499,7 @@ fi
 
 fi
 
-echo "$as_me:21499: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21502: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21510,14 +21513,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21513: checking for clock_gettime" >&5
+echo "$as_me:21516: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21520 "configure"
+#line 21523 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21530,16 +21533,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21536: \$? = $ac_status" >&5
+  echo "$as_me:21539: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:21545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21550,7 +21553,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21553: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21556: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21561,13 +21564,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21564: checking for gettimeofday" >&5
+echo "$as_me:21567: 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 21570 "configure"
+#line 21573 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21598,16 +21601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21604: \$? = $ac_status" >&5
+  echo "$as_me:21607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21610: \$? = $ac_status" >&5
+  echo "$as_me:21613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21617,7 +21620,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21620: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21623: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21627,7 +21630,7 @@ EOF
 
 else
 
-echo "$as_me:21630: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21633: 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
@@ -21635,7 +21638,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21638 "configure"
+#line 21641 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21654,16 +21657,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21660: \$? = $ac_status" >&5
+  echo "$as_me:21663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21666: \$? = $ac_status" >&5
+  echo "$as_me:21669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21674,7 +21677,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21677: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21680: 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
 
@@ -21735,13 +21738,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21738: checking for $ac_func" >&5
+echo "$as_me:21741: 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 21744 "configure"
+#line 21747 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21772,16 +21775,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21778: \$? = $ac_status" >&5
+  echo "$as_me:21781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21784: \$? = $ac_status" >&5
+  echo "$as_me:21787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21791,7 +21794,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21794: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21797: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21801,14 +21804,14 @@ EOF
 fi
 done
 
-echo "$as_me:21804: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21807: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21811 "configure"
+#line 21814 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21823,16 +21826,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21829: \$? = $ac_status" >&5
+  echo "$as_me:21832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21835: \$? = $ac_status" >&5
+  echo "$as_me:21838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21842,7 +21845,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21845: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21848: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21864,7 +21867,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21867: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21870: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21874,7 +21877,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21877 "configure"
+#line 21880 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21887,15 +21890,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21893: \$? = $ac_status" >&5
+  echo "$as_me:21896: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21898: \$? = $ac_status" >&5
+  echo "$as_me:21901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21907,7 +21910,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21910: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21913: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21919,14 +21922,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21922: checking for getttynam" >&5
+	echo "$as_me:21925: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21929 "configure"
+#line 21932 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21938,16 +21941,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21944: \$? = $ac_status" >&5
+  echo "$as_me:21947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21950: \$? = $ac_status" >&5
+  echo "$as_me:21953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21957,7 +21960,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21960: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21963: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21967,7 +21970,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21970: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21973: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21976,7 +21979,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21979: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21982: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21989,14 +21992,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21992: checking for terminal-capability database functions" >&5
+echo "$as_me:21995: 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 21999 "configure"
+#line 22002 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22016,16 +22019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22022: \$? = $ac_status" >&5
+  echo "$as_me:22025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22028: \$? = $ac_status" >&5
+  echo "$as_me:22031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22036,7 +22039,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22039: result: $cf_cv_cgetent" >&5
+echo "$as_me:22042: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22046,14 +22049,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22049: checking if cgetent uses const parameter" >&5
+echo "$as_me:22052: 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 22056 "configure"
+#line 22059 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22076,16 +22079,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22082: \$? = $ac_status" >&5
+  echo "$as_me:22085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22088: \$? = $ac_status" >&5
+  echo "$as_me:22091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22096,7 +22099,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22099: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22102: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22110,14 +22113,14 @@ fi
 
 fi
 
-echo "$as_me:22113: checking for isascii" >&5
+echo "$as_me:22116: 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 22120 "configure"
+#line 22123 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22129,16 +22132,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22135: \$? = $ac_status" >&5
+  echo "$as_me:22138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22149,7 +22152,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22152: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22155: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22157,10 +22160,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22160: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22163: 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 22163 "configure"
+#line 22166 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22174,16 +22177,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22180: \$? = $ac_status" >&5
+  echo "$as_me:22183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22186: \$? = $ac_status" >&5
+  echo "$as_me:22189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22191,7 +22194,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22194 "configure"
+#line 22197 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22206,16 +22209,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22212: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22212: \$? = $ac_status" >&5
+  echo "$as_me:22215: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22218: \$? = $ac_status" >&5
+  echo "$as_me:22221: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22231,11 +22234,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22234: result: $sigact_bad" >&5
+echo "$as_me:22237: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22238: checking if nanosleep really works" >&5
+echo "$as_me:22241: 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
@@ -22245,7 +22248,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22248 "configure"
+#line 22251 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22271,15 +22274,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22280: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22282: \$? = $ac_status" >&5
+  echo "$as_me:22285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22291,7 +22294,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22294: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22297: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22308,23 +22311,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22311: checking for $ac_header" >&5
+echo "$as_me:22314: 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 22317 "configure"
+#line 22320 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22321: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22324: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22327: \$? = $ac_status" >&5
+  echo "$as_me:22330: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22343,7 +22346,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22346: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22360,10 +22363,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22363: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22366: 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 22366 "configure"
+#line 22369 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22375,16 +22378,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22381: \$? = $ac_status" >&5
+  echo "$as_me:22384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22387: \$? = $ac_status" >&5
+  echo "$as_me:22390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22392,7 +22395,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22395 "configure"
+#line 22398 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22406,16 +22409,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22412: \$? = $ac_status" >&5
+  echo "$as_me:22415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22418: \$? = $ac_status" >&5
+  echo "$as_me:22421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22431,19 +22434,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22434: result: $termios_bad" >&5
+	echo "$as_me:22437: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22439: checking for tcgetattr" >&5
+echo "$as_me:22442: 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 22446 "configure"
+#line 22449 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22471,16 +22474,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22477: \$? = $ac_status" >&5
+  echo "$as_me:22480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22483: \$? = $ac_status" >&5
+  echo "$as_me:22486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22490,21 +22493,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22493: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22496: 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:22500: checking for vsscanf function or workaround" >&5
+echo "$as_me:22503: 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 22507 "configure"
+#line 22510 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22520,16 +22523,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22526: \$? = $ac_status" >&5
+  echo "$as_me:22529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22532: \$? = $ac_status" >&5
+  echo "$as_me:22535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22537,7 +22540,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22540 "configure"
+#line 22543 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22559,16 +22562,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22565: \$? = $ac_status" >&5
+  echo "$as_me:22568: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22571: \$? = $ac_status" >&5
+  echo "$as_me:22574: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22576,7 +22579,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22579 "configure"
+#line 22582 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22598,16 +22601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22604: \$? = $ac_status" >&5
+  echo "$as_me:22607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22610: \$? = $ac_status" >&5
+  echo "$as_me:22613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22622,7 +22625,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22625: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22628: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22648,23 +22651,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22651: checking for $ac_header" >&5
+echo "$as_me:22654: 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 22657 "configure"
+#line 22660 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22661: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22667: \$? = $ac_status" >&5
+  echo "$as_me:22670: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22683,7 +22686,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22686: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22689: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22693,7 +22696,7 @@ EOF
 fi
 done
 
-echo "$as_me:22696: checking for working mkstemp" >&5
+echo "$as_me:22699: 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
@@ -22704,7 +22707,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22707 "configure"
+#line 22710 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22739,15 +22742,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22745: \$? = $ac_status" >&5
+  echo "$as_me:22748: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22750: \$? = $ac_status" >&5
+  echo "$as_me:22753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22762,16 +22765,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22765: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22768: 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:22768: checking for mkstemp" >&5
+	echo "$as_me:22771: 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 22774 "configure"
+#line 22777 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22802,16 +22805,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22808: \$? = $ac_status" >&5
+  echo "$as_me:22811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
+  echo "$as_me:22817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22821,7 +22824,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22824: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22827: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22842,21 +22845,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22845: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22848: 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:22848: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22851: 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:22854: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22857: 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 22859 "configure"
+#line 22862 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22873,15 +22876,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22879: \$? = $ac_status" >&5
+  echo "$as_me:22882: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22884: \$? = $ac_status" >&5
+  echo "$as_me:22887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22894,7 +22897,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22897: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22900: 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
 
@@ -22905,13 +22908,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22908: checking for intptr_t" >&5
+echo "$as_me:22911: 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 22914 "configure"
+#line 22917 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22926,16 +22929,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22932: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22932: \$? = $ac_status" >&5
+  echo "$as_me:22935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22938: \$? = $ac_status" >&5
+  echo "$as_me:22941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22945,7 +22948,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22948: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22951: 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
   :
@@ -22957,13 +22960,13 @@ EOF
 
 fi
 
-echo "$as_me:22960: checking for ssize_t" >&5
+echo "$as_me:22963: 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 22966 "configure"
+#line 22969 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22978,16 +22981,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22984: \$? = $ac_status" >&5
+  echo "$as_me:22987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22990: \$? = $ac_status" >&5
+  echo "$as_me:22993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -22997,7 +23000,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23000: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23003: 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
   :
@@ -23009,14 +23012,14 @@ EOF
 
 fi
 
-echo "$as_me:23012: checking for type sigaction_t" >&5
+echo "$as_me:23015: 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 23019 "configure"
+#line 23022 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23029,16 +23032,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23035: \$? = $ac_status" >&5
+  echo "$as_me:23038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23041: \$? = $ac_status" >&5
+  echo "$as_me:23044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23049,14 +23052,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23052: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23055: 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:23059: checking declaration of size-change" >&5
+echo "$as_me:23062: 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
@@ -23077,7 +23080,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23080 "configure"
+#line 23083 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23127,16 +23130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23133: \$? = $ac_status" >&5
+  echo "$as_me:23136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23139: \$? = $ac_status" >&5
+  echo "$as_me:23142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23155,7 +23158,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23158: result: $cf_cv_sizechange" >&5
+echo "$as_me:23161: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23173,13 +23176,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23176: checking for memmove" >&5
+echo "$as_me:23179: 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 23182 "configure"
+#line 23185 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23210,16 +23213,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23216: \$? = $ac_status" >&5
+  echo "$as_me:23219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23222: \$? = $ac_status" >&5
+  echo "$as_me:23225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23229,19 +23232,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23232: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23235: 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:23238: checking for bcopy" >&5
+echo "$as_me:23241: 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 23244 "configure"
+#line 23247 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23272,16 +23275,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23278: \$? = $ac_status" >&5
+  echo "$as_me:23281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23284: \$? = $ac_status" >&5
+  echo "$as_me:23287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23291,11 +23294,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23294: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23297: 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:23298: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23301: 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
@@ -23305,7 +23308,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23308 "configure"
+#line 23311 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23321,15 +23324,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23327: \$? = $ac_status" >&5
+  echo "$as_me:23330: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23332: \$? = $ac_status" >&5
+  echo "$as_me:23335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23342,7 +23345,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23345: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23348: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23369,13 +23372,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23372: checking for $ac_func" >&5
+echo "$as_me:23375: 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 23378 "configure"
+#line 23381 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23406,16 +23409,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23412: \$? = $ac_status" >&5
+  echo "$as_me:23415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23418: \$? = $ac_status" >&5
+  echo "$as_me:23421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23425,7 +23428,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23428: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23431: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23435,7 +23438,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23438: checking if poll really works" >&5
+echo "$as_me:23441: 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
@@ -23445,7 +23448,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23448 "configure"
+#line 23451 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23498,15 +23501,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23504: \$? = $ac_status" >&5
+  echo "$as_me:23507: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23509: \$? = $ac_status" >&5
+  echo "$as_me:23512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23518,21 +23521,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23521: result: $cf_cv_working_poll" >&5
+echo "$as_me:23524: 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:23528: checking for va_copy" >&5
+echo "$as_me:23531: 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 23535 "configure"
+#line 23538 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23549,16 +23552,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23555: \$? = $ac_status" >&5
+  echo "$as_me:23558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23561: \$? = $ac_status" >&5
+  echo "$as_me:23564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23568,7 +23571,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23571: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23574: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23580,14 +23583,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23583: checking for __va_copy" >&5
+echo "$as_me:23586: 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 23590 "configure"
+#line 23593 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23604,16 +23607,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23610: \$? = $ac_status" >&5
+  echo "$as_me:23613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23616: \$? = $ac_status" >&5
+  echo "$as_me:23619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23623,7 +23626,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23626: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23629: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23635,14 +23638,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23638: checking for __builtin_va_copy" >&5
+echo "$as_me:23641: 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 23645 "configure"
+#line 23648 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23659,16 +23662,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23665: \$? = $ac_status" >&5
+  echo "$as_me:23668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23671: \$? = $ac_status" >&5
+  echo "$as_me:23674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23678,7 +23681,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23681: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23684: 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 &&
@@ -23696,14 +23699,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23699: checking if we can simply copy va_list" >&5
+	echo "$as_me:23702: 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 23706 "configure"
+#line 23709 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23720,16 +23723,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23726: \$? = $ac_status" >&5
+  echo "$as_me:23729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23732: \$? = $ac_status" >&5
+  echo "$as_me:23735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23739,19 +23742,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23742: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23745: 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:23747: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23750: 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 23754 "configure"
+#line 23757 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23768,16 +23771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23774: \$? = $ac_status" >&5
+  echo "$as_me:23777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23780: \$? = $ac_status" >&5
+  echo "$as_me:23783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23787,7 +23790,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23790: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23793: 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
@@ -23798,13 +23801,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23801: checking for pid_t" >&5
+echo "$as_me:23804: 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 23807 "configure"
+#line 23810 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23819,16 +23822,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23825: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23825: \$? = $ac_status" >&5
+  echo "$as_me:23828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23831: \$? = $ac_status" >&5
+  echo "$as_me:23834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23838,7 +23841,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23841: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23844: 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
   :
@@ -23853,23 +23856,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23856: checking for $ac_header" >&5
+echo "$as_me:23859: 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 23862 "configure"
+#line 23865 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23866: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23869: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23872: \$? = $ac_status" >&5
+  echo "$as_me:23875: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23888,7 +23891,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23891: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23894: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23901,13 +23904,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23904: checking for $ac_func" >&5
+echo "$as_me:23907: 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 23910 "configure"
+#line 23913 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23938,16 +23941,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23944: \$? = $ac_status" >&5
+  echo "$as_me:23947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23950: \$? = $ac_status" >&5
+  echo "$as_me:23953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23957,7 +23960,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23960: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23963: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23969,7 +23972,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23972: checking for working fork" >&5
+  echo "$as_me:23975: 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
@@ -23992,15 +23995,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23998: \$? = $ac_status" >&5
+  echo "$as_me:24001: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24003: \$? = $ac_status" >&5
+  echo "$as_me:24006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24012,7 +24015,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24015: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24018: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24026,12 +24029,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24029: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24032: 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:24034: checking for working vfork" >&5
+  echo "$as_me:24037: 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
@@ -24040,7 +24043,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24043 "configure"
+#line 24046 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24137,15 +24140,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24143: \$? = $ac_status" >&5
+  echo "$as_me:24146: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24148: \$? = $ac_status" >&5
+  echo "$as_me:24151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24157,13 +24160,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24160: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24163: 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:24166: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24169: 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
 
@@ -24188,7 +24191,7 @@ EOF
 
 fi
 
-echo "$as_me:24191: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24194: 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
@@ -24198,7 +24201,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24201 "configure"
+#line 24204 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24233,15 +24236,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24239: \$? = $ac_status" >&5
+  echo "$as_me:24242: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24244: \$? = $ac_status" >&5
+  echo "$as_me:24247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24254,7 +24257,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24257: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24260: 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
@@ -24263,7 +24266,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24266: checking for openpty in -lutil" >&5
+echo "$as_me:24269: 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
@@ -24271,7 +24274,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24274 "configure"
+#line 24277 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24290,16 +24293,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24296: \$? = $ac_status" >&5
+  echo "$as_me:24299: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24302: \$? = $ac_status" >&5
+  echo "$as_me:24305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24310,7 +24313,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24313: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24316: 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
@@ -24318,7 +24321,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24321: checking for openpty header" >&5
+echo "$as_me:24324: 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
@@ -24345,7 +24348,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24348 "configure"
+#line 24351 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24362,16 +24365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24368: \$? = $ac_status" >&5
+  echo "$as_me:24371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24374: \$? = $ac_status" >&5
+  echo "$as_me:24377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24389,7 +24392,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24392: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24395: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24462,7 +24465,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24465 "configure"
+#line 24468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24474,16 +24477,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24480: \$? = $ac_status" >&5
+  echo "$as_me:24483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24486: \$? = $ac_status" >&5
+  echo "$as_me:24489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24500,7 +24503,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24506: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24536,7 +24539,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24539: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24542: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24547,7 +24550,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24550: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24553: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24619,7 +24622,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24622 "configure"
+#line 24625 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24631,16 +24634,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24637: \$? = $ac_status" >&5
+  echo "$as_me:24640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24643: \$? = $ac_status" >&5
+  echo "$as_me:24646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24657,7 +24660,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24660: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24663: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24737,7 +24740,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24740: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24743: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24754,23 +24757,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24757: checking for db.h" >&5
+echo "$as_me:24760: 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 24763 "configure"
+#line 24766 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24773: \$? = $ac_status" >&5
+  echo "$as_me:24776: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24789,11 +24792,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24792: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24795: 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:24796: checking for version of db" >&5
+echo "$as_me:24799: 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
@@ -24804,10 +24807,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24807: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24810: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24810 "configure"
+#line 24813 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24837,16 +24840,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24843: \$? = $ac_status" >&5
+  echo "$as_me:24846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24849: \$? = $ac_status" >&5
+  echo "$as_me:24852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24860,16 +24863,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24863: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24866: 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:24867: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24870: 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:24872: checking for db libraries" >&5
+echo "$as_me:24875: 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
@@ -24899,10 +24902,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24902: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24905: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24905 "configure"
+#line 24908 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24957,16 +24960,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24963: \$? = $ac_status" >&5
+  echo "$as_me:24966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24969: \$? = $ac_status" >&5
+  echo "$as_me:24972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24986,11 +24989,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24989: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24992: 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:24993: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24996: 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
@@ -25016,7 +25019,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25019: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25022: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25031,7 +25034,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25034: checking if we should include stdbool.h" >&5
+echo "$as_me:25037: 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
@@ -25039,7 +25042,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25042 "configure"
+#line 25045 "configure"
 #include "confdefs.h"
 
 int
@@ -25051,23 +25054,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25057: \$? = $ac_status" >&5
+  echo "$as_me:25060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25063: \$? = $ac_status" >&5
+  echo "$as_me:25066: \$? = $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 25070 "configure"
+#line 25073 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25083,16 +25086,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25089: \$? = $ac_status" >&5
+  echo "$as_me:25092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25095: \$? = $ac_status" >&5
+  echo "$as_me:25098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25106,13 +25109,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25109: result: yes" >&5
+then	echo "$as_me:25112: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25111: result: no" >&5
+else	echo "$as_me:25114: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25115: checking for builtin bool type" >&5
+echo "$as_me:25118: 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
@@ -25120,7 +25123,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25123 "configure"
+#line 25126 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25135,16 +25138,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25141: \$? = $ac_status" >&5
+  echo "$as_me:25144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25147: \$? = $ac_status" >&5
+  echo "$as_me:25150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25157,9 +25160,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25160: result: yes" >&5
+then	echo "$as_me:25163: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25162: result: no" >&5
+else	echo "$as_me:25165: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25176,10 +25179,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25179: checking if we already have C++ library" >&5
+	echo "$as_me:25182: 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 25182 "configure"
+#line 25185 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25193,16 +25196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25199: \$? = $ac_status" >&5
+  echo "$as_me:25202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25205: \$? = $ac_status" >&5
+  echo "$as_me:25208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25211,7 +25214,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25214: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25217: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25230,7 +25233,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25233: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25236: 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
@@ -25256,7 +25259,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25259 "configure"
+#line 25262 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25270,16 +25273,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25276: \$? = $ac_status" >&5
+  echo "$as_me:25279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25282: \$? = $ac_status" >&5
+  echo "$as_me:25285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25291,7 +25294,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25294: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25297: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25313,7 +25316,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25316: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25319: 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
@@ -25328,15 +25331,15 @@ CF_EOF
 # 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:25331: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25334: \$? = $ac_status" >&5
+  echo "$as_me:25337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25336: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25339: \$? = $ac_status" >&5
+  echo "$as_me:25342: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25347,10 +25350,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25350: result: yes" >&5
+  echo "$as_me:25353: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25353: result: no" >&5
+  echo "$as_me:25356: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25370,7 +25373,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25373: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25376: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25391,7 +25394,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25394 "configure"
+#line 25397 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25405,16 +25408,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25411: \$? = $ac_status" >&5
+  echo "$as_me:25414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25417: \$? = $ac_status" >&5
+  echo "$as_me:25420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25451,7 +25454,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25454 "configure"
+#line 25457 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25465,16 +25468,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25471: \$? = $ac_status" >&5
+  echo "$as_me:25474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25477: \$? = $ac_status" >&5
+  echo "$as_me:25480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25507,7 +25510,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25510: result: $cf_cxx_library" >&5
+	echo "$as_me:25513: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25523,7 +25526,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25526: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25529: 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
@@ -25540,18 +25543,18 @@ do
   # 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 25543 "configure"
+#line 25546 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25548: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25551: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25554: \$? = $ac_status" >&5
+  echo "$as_me:25557: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25574,17 +25577,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25577 "configure"
+#line 25580 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25584: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25587: \$? = $ac_status" >&5
+  echo "$as_me:25590: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25621,7 +25624,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25624: result: $CXXCPP" >&5
+echo "$as_me:25627: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25631,18 +25634,18 @@ do
   # 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 25634 "configure"
+#line 25637 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25639: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25642: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25645: \$? = $ac_status" >&5
+  echo "$as_me:25648: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25665,17 +25668,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25668 "configure"
+#line 25671 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25675: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25678: \$? = $ac_status" >&5
+  echo "$as_me:25681: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25703,7 +25706,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25706: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25709: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25718,23 +25721,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25721: checking for $ac_header" >&5
+echo "$as_me:25724: 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 25727 "configure"
+#line 25730 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25731: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25734: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25737: \$? = $ac_status" >&5
+  echo "$as_me:25740: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25753,7 +25756,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25756: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25759: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25766,23 +25769,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25769: checking for $ac_header" >&5
+echo "$as_me:25772: 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 25775 "configure"
+#line 25778 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25779: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25782: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25785: \$? = $ac_status" >&5
+  echo "$as_me:25788: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25801,7 +25804,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25804: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25807: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25812,10 +25815,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25815: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25818: 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 25818 "configure"
+#line 25821 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25832,16 +25835,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25838: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25838: \$? = $ac_status" >&5
+  echo "$as_me:25841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25844: \$? = $ac_status" >&5
+  echo "$as_me:25847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25850,7 +25853,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25853: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25856: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25861,7 +25864,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25864: checking if we should include stdbool.h" >&5
+echo "$as_me:25867: 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
@@ -25869,7 +25872,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25872 "configure"
+#line 25875 "configure"
 #include "confdefs.h"
 
 int
@@ -25881,23 +25884,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25887: \$? = $ac_status" >&5
+  echo "$as_me:25890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25893: \$? = $ac_status" >&5
+  echo "$as_me:25896: \$? = $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 25900 "configure"
+#line 25903 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25913,16 +25916,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25919: \$? = $ac_status" >&5
+  echo "$as_me:25922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25925: \$? = $ac_status" >&5
+  echo "$as_me:25928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25936,13 +25939,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25939: result: yes" >&5
+then	echo "$as_me:25942: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25941: result: no" >&5
+else	echo "$as_me:25944: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25945: checking for builtin bool type" >&5
+echo "$as_me:25948: 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
@@ -25950,7 +25953,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25953 "configure"
+#line 25956 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25965,16 +25968,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25971: \$? = $ac_status" >&5
+  echo "$as_me:25974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25977: \$? = $ac_status" >&5
+  echo "$as_me:25980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25987,19 +25990,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25990: result: yes" >&5
+then	echo "$as_me:25993: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25992: result: no" >&5
+else	echo "$as_me:25995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25996: checking for bool" >&5
+echo "$as_me:25999: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26002 "configure"
+#line 26005 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26034,16 +26037,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26040: \$? = $ac_status" >&5
+  echo "$as_me:26043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26046: \$? = $ac_status" >&5
+  echo "$as_me:26049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26053,10 +26056,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26056: result: $ac_cv_type_bool" >&5
+echo "$as_me:26059: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26059: checking size of bool" >&5
+echo "$as_me:26062: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26065,7 +26068,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26068 "configure"
+#line 26071 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26097,21 +26100,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26109: \$? = $ac_status" >&5
+  echo "$as_me:26112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26114 "configure"
+#line 26117 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26143,16 +26146,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26149: \$? = $ac_status" >&5
+  echo "$as_me:26152: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26155: \$? = $ac_status" >&5
+  echo "$as_me:26158: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26168,7 +26171,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26171 "configure"
+#line 26174 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26200,16 +26203,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26206: \$? = $ac_status" >&5
+  echo "$as_me:26209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26212: \$? = $ac_status" >&5
+  echo "$as_me:26215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26225,7 +26228,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26228 "configure"
+#line 26231 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26257,16 +26260,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26263: \$? = $ac_status" >&5
+  echo "$as_me:26266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26269: \$? = $ac_status" >&5
+  echo "$as_me:26272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26279,12 +26282,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26282: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26285: 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 26287 "configure"
+#line 26290 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26320,15 +26323,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26326: \$? = $ac_status" >&5
+  echo "$as_me:26329: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26331: \$? = $ac_status" >&5
+  echo "$as_me:26334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26344,13 +26347,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26347: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26350: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26353: checking for type of bool" >&5
+echo "$as_me:26356: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26369,7 +26372,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26372 "configure"
+#line 26375 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26410,15 +26413,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26416: \$? = $ac_status" >&5
+  echo "$as_me:26419: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26421: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $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
@@ -26435,19 +26438,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26438: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26441: 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:26445: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26448: 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:26450: checking for special defines needed for etip.h" >&5
+echo "$as_me:26453: 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"
@@ -26465,7 +26468,7 @@ do
 	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 26468 "configure"
+#line 26471 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26479,16 +26482,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26485: \$? = $ac_status" >&5
+  echo "$as_me:26488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26491: \$? = $ac_status" >&5
+  echo "$as_me:26494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26509,12 +26512,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26512: result: $cf_result" >&5
+echo "$as_me:26515: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26517: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26520: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26531,7 +26534,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26534 "configure"
+#line 26537 "configure"
 #include "confdefs.h"
 
 class base
@@ -26550,15 +26553,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26556: \$? = $ac_status" >&5
+  echo "$as_me:26559: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26561: \$? = $ac_status" >&5
+  echo "$as_me:26564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26577,7 +26580,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26580: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26583: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26586,7 +26589,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26589: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26592: 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
@@ -26603,7 +26606,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26606 "configure"
+#line 26609 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26622,15 +26625,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26628: \$? = $ac_status" >&5
+  echo "$as_me:26631: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26633: \$? = $ac_status" >&5
+  echo "$as_me:26636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26649,7 +26652,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26652: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26655: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26659,7 +26662,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26662: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26665: 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
@@ -26673,7 +26676,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26676 "configure"
+#line 26679 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26717,16 +26720,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26723: \$? = $ac_status" >&5
+  echo "$as_me:26726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26729: \$? = $ac_status" >&5
+  echo "$as_me:26732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26744,7 +26747,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26747: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26750: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26793,13 +26796,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26796: checking for bool" >&5
+echo "$as_me:26799: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26802 "configure"
+#line 26805 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26834,16 +26837,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26840: \$? = $ac_status" >&5
+  echo "$as_me:26843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26846: \$? = $ac_status" >&5
+  echo "$as_me:26849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26853,10 +26856,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26856: result: $ac_cv_type_bool" >&5
+echo "$as_me:26859: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26859: checking size of bool" >&5
+echo "$as_me:26862: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26865,7 +26868,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26868 "configure"
+#line 26871 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26897,21 +26900,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26903: \$? = $ac_status" >&5
+  echo "$as_me:26906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26909: \$? = $ac_status" >&5
+  echo "$as_me:26912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26914 "configure"
+#line 26917 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26943,16 +26946,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26949: \$? = $ac_status" >&5
+  echo "$as_me:26952: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26955: \$? = $ac_status" >&5
+  echo "$as_me:26958: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26968,7 +26971,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26971 "configure"
+#line 26974 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27000,16 +27003,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27006: \$? = $ac_status" >&5
+  echo "$as_me:27009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27012: \$? = $ac_status" >&5
+  echo "$as_me:27015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27025,7 +27028,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27028 "configure"
+#line 27031 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27057,16 +27060,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27063: \$? = $ac_status" >&5
+  echo "$as_me:27066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27069: \$? = $ac_status" >&5
+  echo "$as_me:27072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27079,12 +27082,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27082: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27085: 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 27087 "configure"
+#line 27090 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27120,15 +27123,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27126: \$? = $ac_status" >&5
+  echo "$as_me:27129: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27131: \$? = $ac_status" >&5
+  echo "$as_me:27134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27144,13 +27147,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27147: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27150: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27153: checking for type of bool" >&5
+echo "$as_me:27156: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27169,7 +27172,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27172 "configure"
+#line 27175 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27210,15 +27213,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27216: \$? = $ac_status" >&5
+  echo "$as_me:27219: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27221: \$? = $ac_status" >&5
+  echo "$as_me:27224: \$? = $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
@@ -27235,26 +27238,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27238: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27241: 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:27245: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27248: 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:27251: checking for fallback type of bool" >&5
+			echo "$as_me:27254: 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:27257: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27260: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27283,7 +27286,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27286: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27289: 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
@@ -27300,7 +27303,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27303: checking for $ac_word" >&5
+echo "$as_me:27306: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27317,7 +27320,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27320: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27323: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27329,10 +27332,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27332: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27335: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27335: result: no" >&5
+  echo "$as_me:27338: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27342,7 +27345,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27345: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27348: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27353,7 +27356,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27356: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27359: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27382,7 +27385,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27385: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27388: 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
@@ -27401,10 +27404,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27404: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27407: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27407: result: missing" >&5
+					echo "$as_me:27410: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27417,7 +27420,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27420: checking for gnat version" >&5
+echo "$as_me:27423: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27428,7 +27431,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27431: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27434: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27437,7 +27440,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27440: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27443: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27445,7 +27448,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27448: checking for $ac_word" >&5
+echo "$as_me:27451: 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
@@ -27460,7 +27463,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27463: found $ac_dir/$ac_word" >&5
+echo "$as_me:27466: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27469,20 +27472,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27472: result: $M4_exists" >&5
+  echo "$as_me:27475: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27475: result: no" >&5
+  echo "$as_me:27478: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27481: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27484: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27485: checking if GNAT works" >&5
+			echo "$as_me:27488: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27510,7 +27513,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27513: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27516: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27522,7 +27525,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27525: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27528: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27539,10 +27542,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27542: result: $ADAFLAGS" >&5
+	echo "$as_me:27545: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27545: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27548: 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
@@ -27552,11 +27555,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27555: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27558: 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:27559: checking if GNAT supports generics" >&5
+echo "$as_me:27562: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27566,7 +27569,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27569: result: $cf_gnat_generics" >&5
+echo "$as_me:27572: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27578,7 +27581,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27581: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27584: 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
@@ -27626,7 +27629,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27629: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27632: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27639,7 +27642,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27642: checking if GNAT supports project files" >&5
+echo "$as_me:27645: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27702,15 +27705,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27705: result: $cf_gnat_projects" >&5
+echo "$as_me:27708: 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:27711: checking if GNAT supports libraries" >&5
+	echo "$as_me:27714: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27713: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27716: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27730,7 +27733,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27733: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27736: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27742,7 +27745,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27745: checking for ada-compiler" >&5
+echo "$as_me:27748: 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.
@@ -27753,12 +27756,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27756: result: $cf_ada_compiler" >&5
+echo "$as_me:27759: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27761: checking for ada-include" >&5
+echo "$as_me:27764: 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.
@@ -27794,7 +27797,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27797: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27800: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27803,10 +27806,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27806: result: $ADA_INCLUDE" >&5
+echo "$as_me:27809: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27809: checking for ada-objects" >&5
+echo "$as_me:27812: 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.
@@ -27842,7 +27845,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27845: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27848: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27851,10 +27854,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27854: result: $ADA_OBJECTS" >&5
+echo "$as_me:27857: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27857: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27860: 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.
@@ -27864,14 +27867,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27867: result: $with_ada_sharedlib" >&5
+echo "$as_me:27870: 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:27874: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27877: 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
@@ -27891,7 +27894,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27894: checking for ada-libname" >&5
+echo "$as_me:27897: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27907,7 +27910,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27910: result: $ADA_LIBNAME" >&5
+echo "$as_me:27913: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27918,13 +27921,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27921: checking for wchar_t" >&5
+	echo "$as_me:27924: 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 27927 "configure"
+#line 27930 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27939,16 +27942,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27945: \$? = $ac_status" >&5
+  echo "$as_me:27948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27951: \$? = $ac_status" >&5
+  echo "$as_me:27954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27958,10 +27961,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27961: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27964: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27964: checking size of wchar_t" >&5
+echo "$as_me:27967: 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
@@ -27970,7 +27973,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27973 "configure"
+#line 27976 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27982,21 +27985,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27988: \$? = $ac_status" >&5
+  echo "$as_me:27991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27994: \$? = $ac_status" >&5
+  echo "$as_me:27997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27999 "configure"
+#line 28002 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28008,16 +28011,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28014: \$? = $ac_status" >&5
+  echo "$as_me:28017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:28023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28033,7 +28036,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28036 "configure"
+#line 28039 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28045,16 +28048,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28051: \$? = $ac_status" >&5
+  echo "$as_me:28054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28057: \$? = $ac_status" >&5
+  echo "$as_me:28060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28070,7 +28073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28073 "configure"
+#line 28076 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28082,16 +28085,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28088: \$? = $ac_status" >&5
+  echo "$as_me:28091: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28094: \$? = $ac_status" >&5
+  echo "$as_me:28097: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28104,12 +28107,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28107: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28110: 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 28112 "configure"
+#line 28115 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28125,15 +28128,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28131: \$? = $ac_status" >&5
+  echo "$as_me:28134: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28136: \$? = $ac_status" >&5
+  echo "$as_me:28139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28149,7 +28152,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28152: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28155: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28162,7 +28165,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28165: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28168: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28180,7 +28183,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28183: checking for library subsets" >&5
+echo "$as_me:28186: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28234,7 +28237,7 @@ fi
 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:28237: result: $LIB_SUBSETS" >&5
+echo "$as_me:28240: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28265,7 +28268,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28268: checking default library suffix" >&5
+echo "$as_me:28271: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28276,10 +28279,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28279: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28282: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28282: checking default library-dependency suffix" >&5
+echo "$as_me:28285: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28362,10 +28365,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28365: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28368: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28368: checking default object directory" >&5
+echo "$as_me:28371: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28381,11 +28384,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28384: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28387: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28388: checking c++ library-dependency suffix" >&5
+echo "$as_me:28391: 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++)
@@ -28478,7 +28481,7 @@ else
 	fi
 
 fi
-echo "$as_me:28481: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28484: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28654,19 +28657,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28657: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28660: 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 <<EOF
-#line 28662 "configure"
+#line 28665 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28666: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28669: \$? = $ac_status" >&5
+  echo "$as_me:28672: \$? = $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
@@ -28677,10 +28680,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28680 "configure"
+#line 28683 "configure"
 #include "confdefs.h"
 
-#line 28683 "configure"
+#line 28686 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28695,16 +28698,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28701: \$? = $ac_status" >&5
+  echo "$as_me:28704: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28707: \$? = $ac_status" >&5
+  echo "$as_me:28710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28727,7 +28730,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28730: result: $cf_ldflags_static" >&5
+	echo "$as_me:28733: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28743,7 +28746,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28746: checking where we will install curses.h" >&5
+echo "$as_me:28749: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28753,7 +28756,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28756: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28759: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28761,7 +28764,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28764: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28767: 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
@@ -28786,7 +28789,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28789: checking for desired basename for form library" >&5
+echo "$as_me:28792: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28806,10 +28809,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28809: result: $FORM_NAME" >&5
+echo "$as_me:28812: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28812: checking for desired basename for menu library" >&5
+echo "$as_me:28815: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28829,10 +28832,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28832: result: $MENU_NAME" >&5
+echo "$as_me:28835: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28835: checking for desired basename for panel library" >&5
+echo "$as_me:28838: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28852,10 +28855,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28855: result: $PANEL_NAME" >&5
+echo "$as_me:28858: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28858: checking for desired basename for cxx library" >&5
+echo "$as_me:28861: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28875,13 +28878,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28878: result: $CXX_NAME" >&5
+echo "$as_me:28881: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28884: checking for src modules" >&5
+echo "$as_me:28887: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28940,7 +28943,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28943: result: $cf_cv_src_modules" >&5
+echo "$as_me:28946: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29101,7 +29104,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29104: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29107: 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//'`
@@ -29112,7 +29115,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29115: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29118: 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
@@ -29128,7 +29131,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29131: result: $PKG_CFLAGS" >&5
+echo "$as_me:29134: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29189,7 +29192,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29192: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29195: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29216,7 +29219,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29219: checking for linker search path" >&5
+echo "$as_me:29222: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29264,7 +29267,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29267: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29270: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29305,7 +29308,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29308: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29311: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29391,7 +29394,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29394: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29397: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29572,7 +29575,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29575: error: ambiguous option: $1
+    { { echo "$as_me:29578: 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;}
@@ -29591,7 +29594,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29594: error: unrecognized option: $1
+  -*) { { echo "$as_me:29597: 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;}
@@ -29721,7 +29724,7 @@ do
   "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:29724: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29727: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30238,7 +30241,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30241: creating $ac_file" >&5
+    { echo "$as_me:30244: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30256,7 +30259,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30259: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30262: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30269,7 +30272,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30272: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30275: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30285,7 +30288,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30288: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30291: 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;}
@@ -30294,7 +30297,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30297: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30300: 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;}
@@ -30339,7 +30342,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30342: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30345: 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;}
@@ -30350,7 +30353,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30353: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30356: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30399,7 +30402,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30402: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30405: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30410,7 +30413,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30413: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30416: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30423,7 +30426,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30426: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30429: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30481,7 +30484,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30484: $ac_file is unchanged" >&5
+      { echo "$as_me:30487: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30868,7 +30871,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30871: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30874: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 097c74271..4ad552352 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.764 2023/05/06 19:40:40 tom Exp $
+dnl $Id: configure.in,v 1.765 2023/07/22 17:20:35 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.764 $)
+AC_REVISION($Revision: 1.765 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -696,7 +696,7 @@ AC_MSG_CHECKING(if xterm backspace sends BS or DEL)
 AC_ARG_WITH(xterm-kbs,
 	[  --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL],
 	[with_xterm_kbs=$withval],
-	[with_xterm_kbs=BS])
+	[with_xterm_kbs=auto])
 case x$with_xterm_kbs in
 (xyes|xno|xBS|xbs|x8)
 	with_xterm_kbs=BS
@@ -704,6 +704,9 @@ case x$with_xterm_kbs in
 (xDEL|xdel|x127)
 	with_xterm_kbs=DEL
 	;;
+(xauto)
+	with_xterm_kbs=$want_xterm_kbs
+	;;
 (*)
 	with_xterm_kbs=$withval
 	;;
@@ -714,7 +717,7 @@ AC_SUBST(XTERM_KBS)
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	AC_MSG_WARN(expected --with-xterm-kbs=$want_xterm_kbs for $host_os)
+	AC_MSG_WARN([expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs])
 fi
 
 MAKE_TERMINFO=
diff --git a/dist.mk b/dist.mk
index f1c63502c..c1c4a190a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1555 2023/07/15 10:14:48 tom Exp $
+# $Id: dist.mk,v 1.1556 2023/07/22 10:11:10 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230715
+NCURSES_PATCH = 20230722
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index eccb46902..6ce2f33f3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230715) unstable; urgency=low
+ncurses6 (6.4+20230722) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index eccb46902..6ce2f33f3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230715) unstable; urgency=low
+ncurses6 (6.4+20230722) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 4b5759a9c..941fa190f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230715) unstable; urgency=low
+ncurses6 (6.4+20230722) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jul 2023 06:14:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 0fef1f064..e66f9258a 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.595 2023/07/15 10:14:48 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.596 2023/07/22 10:11:10 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0715"
+!define VERSION_MMDD  "0722"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 8f1e08726..e135ed99c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230715
+Release: 20230722
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b14c095a6..f283995e1 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230715
+Release: 20230722
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e59589eef..8f6cb4009 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230715
+Release: 20230722
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 399f036584d7878a65d684cc0eb8c2416ec57417 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 29 Jul 2023 19:21:06 +0200
Subject: [PATCH 022/106] ncurses-6.4-20230729.patch

---
 NEWS                                  |    9 +-
 VERSION                               |    2 +-
 aclocal.m4                            |    5 +-
 configure                             | 2455 +++++++++++++------------
 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    |  114 +-
 doc/html/man/curs_getstr.3x.html      |  156 +-
 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          |    4 +-
 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              |    4 +-
 doc/html/man/toe.1m.html              |    2 +-
 doc/html/man/tput.1.html              |    2 +-
 doc/html/man/tset.1.html              |    2 +-
 man/curs_get_wstr.3x                  |  116 +-
 man/curs_getstr.3x                    |  115 +-
 man/manhtml.aliases                   |    3 +-
 ncurses/tinfo/lib_setup.c             |    8 +-
 ncurses/win32con/win_driver.c         |   19 +-
 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 +-
 35 files changed, 1584 insertions(+), 1484 deletions(-)

diff --git a/NEWS b/NEWS
index 96d51f9dd..84d5c41dc 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3979 2023/07/22 17:26:24 tom Exp $
+-- $Id: NEWS,v 1.3981 2023/07/29 16:35:02 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230729
+	+ improve manpages for wgetnstr() and wget_wnstr().
+	+ modify MinGW configuration to provide for running in MSYS/MSYS2
+	  shells, assuming ConPTY support (patch by Pavel Fedin).
+	+ add assignment in CF_MAN_PAGES to fill in value for TERMINFO_DIRS in
+	  ncurses, terminfo and tic manpages (patch by Sven Joachim).
+
 20230722
 	+ add "auto" default for --with-xterm-kbs configure option.
 
diff --git a/VERSION b/VERSION
index 55fbcf355..bc3b6d018 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230722
+5:0:10	6.4	20230729
diff --git a/aclocal.m4 b/aclocal.m4
index 451a527c6..de4b9fba2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1048 2023/06/03 19:19:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.1050 2023/07/29 00:15:23 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5916,7 +5916,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 57 updated: 2023/05/13 19:14:15
+dnl CF_MAN_PAGES version: 58 updated: 2023/07/28 20:13:29
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -5954,6 +5954,7 @@ NCURSES_PATCH="$NCURSES_PATCH"
 
 NCURSES_OSPEED="$NCURSES_OSPEED"
 TERMINFO="$TERMINFO"
+TERMINFO_DIRS="$TERMINFO_DIRS"
 
 INSTALL="$INSTALL"
 INSTALL_DATA="$INSTALL_DATA"
diff --git a/configure b/configure
index ef3ecd523..eec2f77e2 100755
--- a/configure
+++ b/configure
@@ -15131,6 +15131,7 @@ NCURSES_PATCH="$NCURSES_PATCH"
 
 NCURSES_OSPEED="$NCURSES_OSPEED"
 TERMINFO="$TERMINFO"
+TERMINFO_DIRS="$TERMINFO_DIRS"
 
 INSTALL="$INSTALL"
 INSTALL_DATA="$INSTALL_DATA"
@@ -15420,7 +15421,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15423: checking if you want to build with function extensions" >&5
+echo "$as_me:15424: 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.
@@ -15430,7 +15431,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15433: result: $with_ext_funcs" >&5
+echo "$as_me:15434: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15486,7 +15487,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15489: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15490: 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.
@@ -15496,7 +15497,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15499: result: $with_sp_funcs" >&5
+echo "$as_me:15500: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15515,7 +15516,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15518: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15519: 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.
@@ -15525,7 +15526,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15528: result: $with_term_driver" >&5
+echo "$as_me:15529: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15534,19 +15535,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15537: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15538: 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:15542: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15543: 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:15549: checking for extended use of const keyword" >&5
+echo "$as_me:15550: 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.
@@ -15556,7 +15557,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15559: result: $with_ext_const" >&5
+echo "$as_me:15560: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15564,7 +15565,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15567: checking if you want to use extended colors" >&5
+echo "$as_me:15568: 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.
@@ -15574,12 +15575,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15577: result: $with_ext_colors" >&5
+echo "$as_me:15578: 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:15582: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15583: 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)
@@ -15590,7 +15591,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15594: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15618,7 +15619,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15621: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15622: 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.
@@ -15628,7 +15629,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15631: result: $with_ext_mouse" >&5
+echo "$as_me:15632: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15638,7 +15639,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15641: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15655,7 +15656,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15658: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15659: 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.
@@ -15665,7 +15666,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15668: result: $with_ext_putwin" >&5
+echo "$as_me:15669: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15675,7 +15676,7 @@ EOF
 
 fi
 
-echo "$as_me:15678: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15679: 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.
@@ -15685,7 +15686,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15688: result: $with_no_padding" >&5
+echo "$as_me:15689: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15693,7 +15694,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15696: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15697: 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.
@@ -15703,7 +15704,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15706: result: $with_sigwinch" >&5
+echo "$as_me:15707: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15711,7 +15712,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15714: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15715: 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.
@@ -15721,7 +15722,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15724: result: $with_tcap_names" >&5
+echo "$as_me:15725: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15735,7 +15736,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15738: checking if you want to link with the pthread library" >&5
+echo "$as_me:15739: 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.
@@ -15745,27 +15746,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15748: result: $with_pthread" >&5
+echo "$as_me:15749: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15752: checking for pthread.h" >&5
+	echo "$as_me:15753: 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 15758 "configure"
+#line 15759 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15762: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15768: \$? = $ac_status" >&5
+  echo "$as_me:15769: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15784,7 +15785,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15787: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15788: 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
 
@@ -15794,7 +15795,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15797: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15798: 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"
 
@@ -15815,7 +15816,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15818 "configure"
+#line 15819 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15832,16 +15833,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15838: \$? = $ac_status" >&5
+  echo "$as_me:15839: \$? = $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:15842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15844: \$? = $ac_status" >&5
+  echo "$as_me:15845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15851,7 +15852,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15854: result: $with_pthread" >&5
+	    echo "$as_me:15855: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15879,7 +15880,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15882: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15883: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15889,13 +15890,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15892: checking for pthread_kill" >&5
+	echo "$as_me:15893: 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 15898 "configure"
+#line 15899 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15926,16 +15927,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15932: \$? = $ac_status" >&5
+  echo "$as_me:15933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15938: \$? = $ac_status" >&5
+  echo "$as_me:15939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15945,11 +15946,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15948: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15949: 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:15952: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15953: 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.
@@ -15959,7 +15960,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15962: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15963: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15970,7 +15971,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15973: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15974: 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.
@@ -15980,18 +15981,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15983: result: $use_weak_symbols" >&5
+	echo "$as_me:15984: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15987: checking if $CC supports weak symbols" >&5
+echo "$as_me:15988: 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 15994 "configure"
+#line 15995 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16017,16 +16018,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16023: \$? = $ac_status" >&5
+  echo "$as_me:16024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16029: \$? = $ac_status" >&5
+  echo "$as_me:16030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16037,7 +16038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16040: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16041: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16087,7 +16088,7 @@ fi
 # 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:16090: checking if you want reentrant code" >&5
+echo "$as_me:16091: 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.
@@ -16097,7 +16098,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16100: result: $with_reentrant" >&5
+echo "$as_me:16101: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16186,7 +16187,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16189: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16190: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16198,7 +16199,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16201: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16202: 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.
@@ -16220,16 +16221,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16223: result: $enable_opaque_curses" >&5
+echo "$as_me:16224: 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:16228: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16229: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16232: checking if you want opaque form-library structures" >&5
+echo "$as_me:16233: 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.
@@ -16239,10 +16240,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16242: result: $enable_opaque_form" >&5
+echo "$as_me:16243: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16245: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16246: 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.
@@ -16252,10 +16253,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16255: result: $enable_opaque_menu" >&5
+echo "$as_me:16256: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16258: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16259: 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.
@@ -16265,7 +16266,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16268: result: $enable_opaque_panel" >&5
+echo "$as_me:16269: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16275,7 +16276,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16278: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16279: 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.
@@ -16285,7 +16286,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16288: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16289: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16298,7 +16299,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16301: checking if you want all development code" >&5
+echo "$as_me:16302: 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.
@@ -16308,11 +16309,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16311: result: $with_develop" >&5
+echo "$as_me:16312: 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:16315: checking if you want hard-tabs code" >&5
+echo "$as_me:16316: 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.
@@ -16322,7 +16323,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16325: result: $enable_hard_tabs" >&5
+echo "$as_me:16326: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16330,7 +16331,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16333: checking if you want limited support for xmc" >&5
+echo "$as_me:16334: 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.
@@ -16340,7 +16341,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16343: result: $enable_xmc_glitch" >&5
+echo "$as_me:16344: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16350,7 +16351,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16353: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16354: 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.
@@ -16360,7 +16361,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16363: result: $with_assumed_color" >&5
+echo "$as_me:16364: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16368,7 +16369,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16371: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16372: 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.
@@ -16378,7 +16379,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16381: result: $with_hashmap" >&5
+echo "$as_me:16382: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16386,7 +16387,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16389: checking if you want colorfgbg code" >&5
+echo "$as_me:16390: 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.
@@ -16396,7 +16397,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16399: result: $with_colorfgbg" >&5
+echo "$as_me:16400: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16404,7 +16405,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16407: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16408: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16414,14 +16415,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16417: result: $cf_with_fvisibility" >&5
+echo "$as_me:16418: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16424: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16425: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16430,7 +16431,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16433 "configure"
+#line 16434 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16446,16 +16447,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16452: \$? = $ac_status" >&5
+  echo "$as_me:16453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16458: \$? = $ac_status" >&5
+  echo "$as_me:16459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16467,7 +16468,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16470: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16471: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16582,7 +16583,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16585: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16586: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16591,7 +16592,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16594 "configure"
+#line 16595 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16607,16 +16608,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16613: \$? = $ac_status" >&5
+  echo "$as_me:16614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16619: \$? = $ac_status" >&5
+  echo "$as_me:16620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16628,7 +16629,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16631: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16632: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16751,7 +16752,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16754: checking if you want interop bindings" >&5
+echo "$as_me:16755: 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.
@@ -16761,13 +16762,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16764: result: $with_exp_interop" >&5
+echo "$as_me:16765: 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:16770: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16771: 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.
@@ -16777,13 +16778,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16780: result: $with_safe_sprintf" >&5
+echo "$as_me:16781: 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:16786: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16787: 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.
@@ -16793,7 +16794,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16796: result: $with_scroll_hints" >&5
+echo "$as_me:16797: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16802,7 +16803,7 @@ EOF
 
 fi
 
-echo "$as_me:16805: checking if you want wgetch-events code" >&5
+echo "$as_me:16806: 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.
@@ -16812,7 +16813,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16815: result: $with_wgetch_events" >&5
+echo "$as_me:16816: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16827,7 +16828,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16830: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16831: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16837,7 +16838,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16840: result: $with_exp_win32" >&5
+	echo "$as_me:16841: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16863,7 +16864,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16866: checking if you want to see long compiling messages" >&5
+echo "$as_me:16867: 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.
@@ -16897,7 +16898,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16900: result: $enableval" >&5
+echo "$as_me:16901: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16910,7 +16911,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16913: checking if you want to install stripped executables" >&5
+echo "$as_me:16914: 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.
@@ -16927,7 +16928,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16930: result: $enable_stripping" >&5
+echo "$as_me:16931: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16938,7 +16939,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16941: checking if install accepts -p option" >&5
+echo "$as_me:16942: 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
@@ -16969,10 +16970,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16972: result: $cf_cv_install_p" >&5
+echo "$as_me:16973: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16975: checking if install needs to be told about ownership" >&5
+echo "$as_me:16976: 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)
@@ -16983,7 +16984,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16986: result: $with_install_o" >&5
+echo "$as_me:16987: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -16994,7 +16995,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:16997: checking if you want to specify strip-program" >&5
+	echo "$as_me:16998: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17004,11 +17005,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17007: result: $with_strip_program" >&5
+	echo "$as_me:17008: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17011: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17012: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17029,11 +17030,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17032: result: $check_install_strip" >&5
+		echo "$as_me:17033: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17036: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17037: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17048,7 +17049,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17051: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17052: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17074,7 +17075,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17077: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17078: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17091,17 +17092,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17094: result: $enable_stdnoreturn" >&5
+echo "$as_me:17095: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17098: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17099: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17104 "configure"
+#line 17105 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17117,16 +17118,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17123: \$? = $ac_status" >&5
+  echo "$as_me:17124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17129: \$? = $ac_status" >&5
+  echo "$as_me:17130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17137,7 +17138,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17140: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17141: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17193,16 +17194,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17196: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17197: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17201: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17202: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17205: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17241,16 +17242,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17244: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17245: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17249: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17250: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17253: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17254: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17289,23 +17290,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17292: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17293: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17297: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17298: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17301: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17302: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17308: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17309: 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.
@@ -17322,7 +17323,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17325: result: $enable_warnings" >&5
+echo "$as_me:17326: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17346,7 +17347,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17349 "configure"
+#line 17350 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17361,26 +17362,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17367: \$? = $ac_status" >&5
+  echo "$as_me:17368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17373: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17376: checking for X11/Xt const-feature" >&5
+echo "$as_me:17377: 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 17383 "configure"
+#line 17384 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17397,16 +17398,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17403: \$? = $ac_status" >&5
+  echo "$as_me:17404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17409: \$? = $ac_status" >&5
+  echo "$as_me:17410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17421,7 +17422,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17424: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17425: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17450,7 +17451,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17453 "${as_me:-configure}"
+#line 17454 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17466,7 +17467,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17469: checking for $CC warning options..." >&5
+	{ echo "$as_me:17470: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17482,12 +17483,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17488: \$? = $ac_status" >&5
+  echo "$as_me:17489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17491: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17495,7 +17496,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17498: checking for $CC warning options..." >&5
+	{ echo "$as_me:17499: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17518,12 +17519,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17521: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17524: \$? = $ac_status" >&5
+  echo "$as_me:17525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17527: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17531,7 +17532,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17535: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17541,7 +17542,7 @@ echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17545: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17574,10 +17575,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17578: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17580 "${as_me:-configure}"
+#line 17581 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17627,12 +17628,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17631: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17633: \$? = $ac_status" >&5
+  echo "$as_me:17634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17636: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17704,12 +17705,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17707: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17708: 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 17712 "configure"
+#line 17713 "configure"
 #include "confdefs.h"
 
 int
@@ -17726,16 +17727,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17732: \$? = $ac_status" >&5
+  echo "$as_me:17733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17738: \$? = $ac_status" >&5
+  echo "$as_me:17739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17746,7 +17747,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17749: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17750: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17755,11 +17756,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17758: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17759: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17762 "configure"
+#line 17763 "configure"
 #include "confdefs.h"
 
 int
@@ -17776,16 +17777,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17782: \$? = $ac_status" >&5
+  echo "$as_me:17783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17788: \$? = $ac_status" >&5
+  echo "$as_me:17789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17795,7 +17796,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17798: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17799: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17804,30 +17805,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17807: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17808: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17814: checking version of $CC" >&5
+	echo "$as_me:17815: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17818: result: $CLANG_VERSION" >&5
+	echo "$as_me:17819: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17825: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17826: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17830 "configure"
+#line 17831 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17841,16 +17842,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17847: \$? = $ac_status" >&5
+  echo "$as_me:17848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17853: \$? = $ac_status" >&5
+  echo "$as_me:17854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17861,13 +17862,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17864: result: $cf_clang_optok" >&5
+		echo "$as_me:17865: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17870: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17871: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17884,7 +17885,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17887 "configure"
+#line 17888 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17902,7 +17903,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17905: checking for $CC warning options..." >&5
+	{ echo "$as_me:17906: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17919,12 +17920,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17922: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17925: \$? = $ac_status" >&5
+  echo "$as_me:17926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17927: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17933,7 +17934,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17936: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17937: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17963,16 +17964,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17966: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17969: \$? = $ac_status" >&5
+  echo "$as_me:17970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17971: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17972: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17975: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17976: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17990,7 +17991,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17993: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17994: 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.
@@ -18000,7 +18001,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18003: result: $enable_string_hacks" >&5
+echo "$as_me:18004: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18009,15 +18010,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18012: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18013: 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:18014: checking for strlcat" >&5
+	echo "$as_me:18015: 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 18020 "configure"
+#line 18021 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18048,16 +18049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18054: \$? = $ac_status" >&5
+  echo "$as_me:18055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18060: \$? = $ac_status" >&5
+  echo "$as_me:18061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18067,7 +18068,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18070: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18071: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18077,7 +18078,7 @@ EOF
 
 else
 
-		echo "$as_me:18080: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18081: 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
@@ -18085,7 +18086,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18088 "configure"
+#line 18089 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18104,16 +18105,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18110: \$? = $ac_status" >&5
+  echo "$as_me:18111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18116: \$? = $ac_status" >&5
+  echo "$as_me:18117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18124,7 +18125,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18127: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18128: 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
 
@@ -18147,23 +18148,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18150: checking for $ac_header" >&5
+echo "$as_me:18151: 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 18156 "configure"
+#line 18157 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18161: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18166: \$? = $ac_status" >&5
+  echo "$as_me:18167: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18182,7 +18183,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18186: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18203,13 +18204,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18206: checking for $ac_func" >&5
+echo "$as_me:18207: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18212 "configure"
+#line 18213 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18240,16 +18241,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18246: \$? = $ac_status" >&5
+  echo "$as_me:18247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18259,7 +18260,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18262: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18263: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18272,7 +18273,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18275: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18276: 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.
@@ -18282,7 +18283,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18285: result: $with_assertions" >&5
+echo "$as_me:18286: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18298,7 +18299,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18301: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18302: 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.
@@ -18320,7 +18321,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18323: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18324: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18434,23 +18435,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18437: checking for dmalloc.h" >&5
+	echo "$as_me:18438: 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 18443 "configure"
+#line 18444 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18447: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18448: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18453: \$? = $ac_status" >&5
+  echo "$as_me:18454: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18469,11 +18470,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18472: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18473: 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:18476: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18477: 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
@@ -18481,7 +18482,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18484 "configure"
+#line 18485 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18500,16 +18501,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18506: \$? = $ac_status" >&5
+  echo "$as_me:18507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18512: \$? = $ac_status" >&5
+  echo "$as_me:18513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18520,7 +18521,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18523: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18524: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18535,7 +18536,7 @@ fi
 
 fi
 
-echo "$as_me:18538: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18539: 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.
@@ -18557,7 +18558,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18560: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18561: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18671,23 +18672,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18674: checking for dbmalloc.h" >&5
+	echo "$as_me:18675: 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 18680 "configure"
+#line 18681 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18684: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18685: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18690: \$? = $ac_status" >&5
+  echo "$as_me:18691: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18706,11 +18707,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18709: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18710: 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:18713: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18714: 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
@@ -18718,7 +18719,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18721 "configure"
+#line 18722 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18737,16 +18738,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18743: \$? = $ac_status" >&5
+  echo "$as_me:18744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18749: \$? = $ac_status" >&5
+  echo "$as_me:18750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18757,7 +18758,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18760: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18761: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18772,7 +18773,7 @@ fi
 
 fi
 
-echo "$as_me:18775: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18776: 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.
@@ -18794,7 +18795,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18797: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18798: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18907,7 +18908,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18910: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18911: 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.
@@ -18918,7 +18919,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18921: result: $with_no_leaks" >&5
+echo "$as_me:18922: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18970,7 +18971,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18973: checking whether to add trace feature to all models" >&5
+echo "$as_me:18974: 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.
@@ -18980,7 +18981,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18983: result: $cf_with_trace" >&5
+echo "$as_me:18984: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19094,7 +19095,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19097: checking if we want to use GNAT projects" >&5
+echo "$as_me:19098: 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.
@@ -19111,7 +19112,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19114: result: $enable_gnat_projects" >&5
+echo "$as_me:19115: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19124,14 +19125,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19127: checking if ssp library is needed" >&5
+echo "$as_me:19128: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19134 "configure"
+#line 19135 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19148,16 +19149,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19154: \$? = $ac_status" >&5
+  echo "$as_me:19155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19160: \$? = $ac_status" >&5
+  echo "$as_me:19161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19167,7 +19168,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19170 "configure"
+#line 19171 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19184,16 +19185,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19196: \$? = $ac_status" >&5
+  echo "$as_me:19197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19207,7 +19208,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19210: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19211: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19236,14 +19237,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19239: checking if -lm needed for math functions" >&5
+echo "$as_me:19240: 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 19246 "configure"
+#line 19247 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19259,16 +19260,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19265: \$? = $ac_status" >&5
+  echo "$as_me:19266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19271: \$? = $ac_status" >&5
+  echo "$as_me:19272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19278,7 +19279,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19281: result: $cf_cv_need_libm" >&5
+echo "$as_me:19282: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19286,14 +19287,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19289: checking if -lm is available for math functions" >&5
+	echo "$as_me:19290: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19296 "configure"
+#line 19297 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19309,16 +19310,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19315: \$? = $ac_status" >&5
+  echo "$as_me:19316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19321: \$? = $ac_status" >&5
+  echo "$as_me:19322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19328,7 +19329,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19331: result: $cf_cv_have_libm" >&5
+echo "$as_me:19332: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19350,13 +19351,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19353: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19354: 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 19359 "configure"
+#line 19360 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19372,16 +19373,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19378: \$? = $ac_status" >&5
+  echo "$as_me:19379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19384: \$? = $ac_status" >&5
+  echo "$as_me:19385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19391,7 +19392,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19394: result: $ac_cv_header_time" >&5
+echo "$as_me:19395: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19406,7 +19407,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19409: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19410: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19414,7 +19415,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19417 "configure"
+#line 19418 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19433,16 +19434,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19439: \$? = $ac_status" >&5
+  echo "$as_me:19440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19445: \$? = $ac_status" >&5
+  echo "$as_me:19446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19453,11 +19454,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19456: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19457: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19460: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19461: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19465,7 +19466,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19468 "configure"
+#line 19469 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19484,16 +19485,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19490: \$? = $ac_status" >&5
+  echo "$as_me:19491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19496: \$? = $ac_status" >&5
+  echo "$as_me:19497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19504,7 +19505,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19507: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19508: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19526,7 +19527,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19529: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19530: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19534,7 +19535,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19537 "configure"
+#line 19538 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19553,16 +19554,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19559: \$? = $ac_status" >&5
+  echo "$as_me:19560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19565: \$? = $ac_status" >&5
+  echo "$as_me:19566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19573,7 +19574,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19576: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19577: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19595,7 +19596,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19598: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19599: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19603,7 +19604,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19606 "configure"
+#line 19607 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19622,16 +19623,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19628: \$? = $ac_status" >&5
+  echo "$as_me:19629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19634: \$? = $ac_status" >&5
+  echo "$as_me:19635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19642,7 +19643,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19645: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19646: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19684,7 +19685,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19687: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19688: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19692,7 +19693,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19695 "configure"
+#line 19696 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19711,16 +19712,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19717: \$? = $ac_status" >&5
+  echo "$as_me:19718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19723: \$? = $ac_status" >&5
+  echo "$as_me:19724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19731,7 +19732,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19734: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19735: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19759,13 +19760,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19762: checking for regcomp" >&5
+	echo "$as_me:19763: 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 19768 "configure"
+#line 19769 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19796,16 +19797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19802: \$? = $ac_status" >&5
+  echo "$as_me:19803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19808: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19815,7 +19816,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19818: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19819: 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
@@ -19824,7 +19825,7 @@ else
 		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:19827: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19828: 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
@@ -19832,7 +19833,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19835 "configure"
+#line 19836 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19851,16 +19852,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19857: \$? = $ac_status" >&5
+  echo "$as_me:19858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19863: \$? = $ac_status" >&5
+  echo "$as_me:19864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19871,7 +19872,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19874: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19875: 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
 
@@ -19903,13 +19904,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19906: checking for compile" >&5
+	echo "$as_me:19907: 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 19912 "configure"
+#line 19913 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19940,16 +19941,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19946: \$? = $ac_status" >&5
+  echo "$as_me:19947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19952: \$? = $ac_status" >&5
+  echo "$as_me:19953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19959,13 +19960,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19962: result: $ac_cv_func_compile" >&5
+echo "$as_me:19963: 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:19968: checking for compile in -lgen" >&5
+		echo "$as_me:19969: 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
@@ -19973,7 +19974,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19976 "configure"
+#line 19977 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19992,16 +19993,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19998: \$? = $ac_status" >&5
+  echo "$as_me:19999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20004: \$? = $ac_status" >&5
+  echo "$as_me:20005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20012,7 +20013,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20015: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20016: 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
 
@@ -20040,11 +20041,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20043: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20044: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20047: checking for regular-expression headers" >&5
+echo "$as_me:20048: 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
@@ -20056,7 +20057,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20059 "configure"
+#line 20060 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20073,16 +20074,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20079: \$? = $ac_status" >&5
+  echo "$as_me:20080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20085: \$? = $ac_status" >&5
+  echo "$as_me:20086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20099,7 +20100,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20102 "configure"
+#line 20103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20119,16 +20120,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20125: \$? = $ac_status" >&5
+  echo "$as_me:20126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20131: \$? = $ac_status" >&5
+  echo "$as_me:20132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20144,11 +20145,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20147: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20148: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20151: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20152: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20186,23 +20187,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20189: checking for $ac_header" >&5
+echo "$as_me:20190: 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 20195 "configure"
+#line 20196 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20199: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20200: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20205: \$? = $ac_status" >&5
+  echo "$as_me:20206: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20221,7 +20222,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20224: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20234,23 +20235,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20237: checking for $ac_header" >&5
+echo "$as_me:20238: 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 20243 "configure"
+#line 20244 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20248: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:20254: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20269,7 +20270,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20273: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20279,7 +20280,7 @@ EOF
 fi
 done
 
-echo "$as_me:20282: checking for header declaring getopt variables" >&5
+echo "$as_me:20283: 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
@@ -20289,7 +20290,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20292 "configure"
+#line 20293 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20302,16 +20303,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20308: \$? = $ac_status" >&5
+  echo "$as_me:20309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20314: \$? = $ac_status" >&5
+  echo "$as_me:20315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20323,7 +20324,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20326: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20327: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20340,14 +20341,14 @@ EOF
 
 fi
 
-echo "$as_me:20343: checking if external environ is declared" >&5
+echo "$as_me:20344: 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 20350 "configure"
+#line 20351 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20360,16 +20361,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20366: \$? = $ac_status" >&5
+  echo "$as_me:20367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20372: \$? = $ac_status" >&5
+  echo "$as_me:20373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20380,7 +20381,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20383: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20384: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20395,14 +20396,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20398: checking if external environ exists" >&5
+echo "$as_me:20399: 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 20405 "configure"
+#line 20406 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20417,16 +20418,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20437,7 +20438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20440: result: $cf_cv_have_environ" >&5
+echo "$as_me:20441: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20450,13 +20451,13 @@ EOF
 
 fi
 
-echo "$as_me:20453: checking for getenv" >&5
+echo "$as_me:20454: 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 20459 "configure"
+#line 20460 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20487,16 +20488,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20493: \$? = $ac_status" >&5
+  echo "$as_me:20494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20499: \$? = $ac_status" >&5
+  echo "$as_me:20500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20506,19 +20507,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20509: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20510: 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:20515: checking for $ac_func" >&5
+echo "$as_me:20516: 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 20521 "configure"
+#line 20522 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20549,16 +20550,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20555: \$? = $ac_status" >&5
+  echo "$as_me:20556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20561: \$? = $ac_status" >&5
+  echo "$as_me:20562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20568,7 +20569,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20571: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20572: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20578,7 +20579,7 @@ EOF
 fi
 done
 
-echo "$as_me:20581: checking if getenv returns consistent values" >&5
+echo "$as_me:20582: 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
@@ -20588,7 +20589,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20591 "configure"
+#line 20592 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20693,15 +20694,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20699: \$? = $ac_status" >&5
+  echo "$as_me:20700: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20704: \$? = $ac_status" >&5
+  echo "$as_me:20705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20714,7 +20715,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20717: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20718: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20729,18 +20730,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20732: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20733: 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
 
-echo "$as_me:20736: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20737: 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 20743 "configure"
+#line 20744 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20760,16 +20761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20766: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20772: \$? = $ac_status" >&5
+  echo "$as_me:20773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20781,7 +20782,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20784: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20785: 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
@@ -20796,13 +20797,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20799: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20800: 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 20805 "configure"
+#line 20806 "configure"
 #include "confdefs.h"
 
 int
@@ -20860,16 +20861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20866: \$? = $ac_status" >&5
+  echo "$as_me:20867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20872: \$? = $ac_status" >&5
+  echo "$as_me:20873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20879,7 +20880,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20882: result: $ac_cv_c_const" >&5
+echo "$as_me:20883: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20889,7 +20890,7 @@ EOF
 
 fi
 
-echo "$as_me:20892: checking for inline" >&5
+echo "$as_me:20893: 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
@@ -20897,7 +20898,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20900 "configure"
+#line 20901 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20906,16 +20907,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20912: \$? = $ac_status" >&5
+  echo "$as_me:20913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20918: \$? = $ac_status" >&5
+  echo "$as_me:20919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20926,7 +20927,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20929: result: $ac_cv_c_inline" >&5
+echo "$as_me:20930: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20952,7 +20953,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20955: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20956: 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
@@ -20961,7 +20962,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20964 "configure"
+#line 20965 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20973,16 +20974,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20979: \$? = $ac_status" >&5
+  echo "$as_me:20980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20985: \$? = $ac_status" >&5
+  echo "$as_me:20986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20994,7 +20995,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20997: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20998: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21100,7 +21101,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21103: checking for signal global datatype" >&5
+echo "$as_me:21104: 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
@@ -21112,7 +21113,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21115 "configure"
+#line 21116 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21136,16 +21137,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21140: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21142: \$? = $ac_status" >&5
+  echo "$as_me:21143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21148: \$? = $ac_status" >&5
+  echo "$as_me:21149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21159,7 +21160,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21162: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21163: 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 <<EOF
@@ -21168,7 +21169,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21171: checking for type of chtype" >&5
+echo "$as_me:21172: 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
@@ -21178,7 +21179,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21181 "configure"
+#line 21182 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21213,15 +21214,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21219: \$? = $ac_status" >&5
+  echo "$as_me:21220: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21224: \$? = $ac_status" >&5
+  echo "$as_me:21225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21236,7 +21237,7 @@ fi
 
 fi
 
-echo "$as_me:21239: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21240: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21248,14 +21249,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21251: checking if unsigned literals are legal" >&5
+echo "$as_me:21252: 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 21258 "configure"
+#line 21259 "configure"
 #include "confdefs.h"
 
 int
@@ -21267,16 +21268,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21273: \$? = $ac_status" >&5
+  echo "$as_me:21274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21279: \$? = $ac_status" >&5
+  echo "$as_me:21280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21288,7 +21289,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21291: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21292: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21304,14 +21305,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21307: checking if external errno is declared" >&5
+echo "$as_me:21308: 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 21314 "configure"
+#line 21315 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21325,16 +21326,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21331: \$? = $ac_status" >&5
+  echo "$as_me:21332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21337: \$? = $ac_status" >&5
+  echo "$as_me:21338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21345,7 +21346,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21348: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21349: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21360,14 +21361,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21363: checking if external errno exists" >&5
+echo "$as_me:21364: 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 21370 "configure"
+#line 21371 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21382,16 +21383,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21388: \$? = $ac_status" >&5
+  echo "$as_me:21389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21394: \$? = $ac_status" >&5
+  echo "$as_me:21395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21402,7 +21403,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21405: result: $cf_cv_have_errno" >&5
+echo "$as_me:21406: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21415,7 +21416,7 @@ EOF
 
 fi
 
-echo "$as_me:21418: checking if data-only library module links" >&5
+echo "$as_me:21419: 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
@@ -21423,20 +21424,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21426 "configure"
+#line 21427 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21429: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21432: \$? = $ac_status" >&5
+  echo "$as_me:21433: \$? = $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 <<EOF
-#line 21439 "configure"
+#line 21440 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21449,10 +21450,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21452: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21455: \$? = $ac_status" >&5
+  echo "$as_me:21456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21465,7 +21466,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21468 "configure"
+#line 21469 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21476,15 +21477,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21482: \$? = $ac_status" >&5
+  echo "$as_me:21483: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21487: \$? = $ac_status" >&5
+  echo "$as_me:21488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21499,7 +21500,7 @@ fi
 
 fi
 
-echo "$as_me:21502: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21503: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21513,14 +21514,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21516: checking for clock_gettime" >&5
+echo "$as_me:21517: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21523 "configure"
+#line 21524 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21533,16 +21534,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21539: \$? = $ac_status" >&5
+  echo "$as_me:21540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21545: \$? = $ac_status" >&5
+  echo "$as_me:21546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21553,7 +21554,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21556: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21557: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21564,13 +21565,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21567: checking for gettimeofday" >&5
+echo "$as_me:21568: 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 21573 "configure"
+#line 21574 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21601,16 +21602,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21607: \$? = $ac_status" >&5
+  echo "$as_me:21608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21613: \$? = $ac_status" >&5
+  echo "$as_me:21614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21620,7 +21621,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21623: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21624: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21630,7 +21631,7 @@ EOF
 
 else
 
-echo "$as_me:21633: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21634: 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
@@ -21638,7 +21639,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21641 "configure"
+#line 21642 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21657,16 +21658,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21663: \$? = $ac_status" >&5
+  echo "$as_me:21664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21669: \$? = $ac_status" >&5
+  echo "$as_me:21670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21677,7 +21678,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21680: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21681: 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
 
@@ -21738,13 +21739,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21741: checking for $ac_func" >&5
+echo "$as_me:21742: 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 21747 "configure"
+#line 21748 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21775,16 +21776,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21781: \$? = $ac_status" >&5
+  echo "$as_me:21782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21787: \$? = $ac_status" >&5
+  echo "$as_me:21788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21794,7 +21795,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21797: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21798: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21804,14 +21805,14 @@ EOF
 fi
 done
 
-echo "$as_me:21807: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21808: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21814 "configure"
+#line 21815 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21826,16 +21827,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21832: \$? = $ac_status" >&5
+  echo "$as_me:21833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21838: \$? = $ac_status" >&5
+  echo "$as_me:21839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21845,7 +21846,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21848: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21849: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21867,7 +21868,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21870: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21871: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21877,7 +21878,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21880 "configure"
+#line 21881 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21890,15 +21891,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21896: \$? = $ac_status" >&5
+  echo "$as_me:21897: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21901: \$? = $ac_status" >&5
+  echo "$as_me:21902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21910,7 +21911,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21913: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21914: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21922,14 +21923,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21925: checking for getttynam" >&5
+	echo "$as_me:21926: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21932 "configure"
+#line 21933 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21941,16 +21942,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21947: \$? = $ac_status" >&5
+  echo "$as_me:21948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21953: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21960,7 +21961,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21963: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21964: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21970,7 +21971,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21973: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21974: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21979,7 +21980,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21982: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:21983: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21992,14 +21993,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21995: checking for terminal-capability database functions" >&5
+echo "$as_me:21996: 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 22002 "configure"
+#line 22003 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22019,16 +22020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22025: \$? = $ac_status" >&5
+  echo "$as_me:22026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22031: \$? = $ac_status" >&5
+  echo "$as_me:22032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22039,7 +22040,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22042: result: $cf_cv_cgetent" >&5
+echo "$as_me:22043: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22049,14 +22050,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22052: checking if cgetent uses const parameter" >&5
+echo "$as_me:22053: 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 22059 "configure"
+#line 22060 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22079,16 +22080,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22085: \$? = $ac_status" >&5
+  echo "$as_me:22086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22091: \$? = $ac_status" >&5
+  echo "$as_me:22092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22099,7 +22100,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22102: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22103: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22113,14 +22114,14 @@ fi
 
 fi
 
-echo "$as_me:22116: checking for isascii" >&5
+echo "$as_me:22117: 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 22123 "configure"
+#line 22124 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22132,16 +22133,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22138: \$? = $ac_status" >&5
+  echo "$as_me:22139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22144: \$? = $ac_status" >&5
+  echo "$as_me:22145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22152,7 +22153,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22155: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22156: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22160,10 +22161,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22163: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22164: 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 22166 "configure"
+#line 22167 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22177,16 +22178,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22183: \$? = $ac_status" >&5
+  echo "$as_me:22184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22189: \$? = $ac_status" >&5
+  echo "$as_me:22190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22194,7 +22195,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22197 "configure"
+#line 22198 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22209,16 +22210,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22215: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22221: \$? = $ac_status" >&5
+  echo "$as_me:22222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22234,11 +22235,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22237: result: $sigact_bad" >&5
+echo "$as_me:22238: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22241: checking if nanosleep really works" >&5
+echo "$as_me:22242: 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
@@ -22248,7 +22249,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22251 "configure"
+#line 22252 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22274,15 +22275,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22281: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22285: \$? = $ac_status" >&5
+  echo "$as_me:22286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22294,7 +22295,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22297: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22298: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22311,23 +22312,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22314: checking for $ac_header" >&5
+echo "$as_me:22315: 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 22320 "configure"
+#line 22321 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22324: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22330: \$? = $ac_status" >&5
+  echo "$as_me:22331: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22346,7 +22347,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22363,10 +22364,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22366: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22367: 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 22369 "configure"
+#line 22370 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22378,16 +22379,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22384: \$? = $ac_status" >&5
+  echo "$as_me:22385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22390: \$? = $ac_status" >&5
+  echo "$as_me:22391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22395,7 +22396,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22398 "configure"
+#line 22399 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22409,16 +22410,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22413: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22415: \$? = $ac_status" >&5
+  echo "$as_me:22416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22421: \$? = $ac_status" >&5
+  echo "$as_me:22422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22434,19 +22435,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22437: result: $termios_bad" >&5
+	echo "$as_me:22438: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22442: checking for tcgetattr" >&5
+echo "$as_me:22443: 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 22449 "configure"
+#line 22450 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22474,16 +22475,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22480: \$? = $ac_status" >&5
+  echo "$as_me:22481: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22486: \$? = $ac_status" >&5
+  echo "$as_me:22487: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22493,21 +22494,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22496: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22497: 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:22503: checking for vsscanf function or workaround" >&5
+echo "$as_me:22504: 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 22510 "configure"
+#line 22511 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22523,16 +22524,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22529: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22535: \$? = $ac_status" >&5
+  echo "$as_me:22536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22540,7 +22541,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22543 "configure"
+#line 22544 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22562,16 +22563,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22568: \$? = $ac_status" >&5
+  echo "$as_me:22569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22574: \$? = $ac_status" >&5
+  echo "$as_me:22575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22579,7 +22580,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22582 "configure"
+#line 22583 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22601,16 +22602,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22607: \$? = $ac_status" >&5
+  echo "$as_me:22608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22613: \$? = $ac_status" >&5
+  echo "$as_me:22614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22625,7 +22626,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22628: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22629: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22651,23 +22652,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22654: checking for $ac_header" >&5
+echo "$as_me:22655: 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 22660 "configure"
+#line 22661 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22665: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22670: \$? = $ac_status" >&5
+  echo "$as_me:22671: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22686,7 +22687,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22689: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22690: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22696,7 +22697,7 @@ EOF
 fi
 done
 
-echo "$as_me:22699: checking for working mkstemp" >&5
+echo "$as_me:22700: 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
@@ -22707,7 +22708,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22710 "configure"
+#line 22711 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22742,15 +22743,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22748: \$? = $ac_status" >&5
+  echo "$as_me:22749: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22753: \$? = $ac_status" >&5
+  echo "$as_me:22754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22765,16 +22766,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22768: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22769: 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:22771: checking for mkstemp" >&5
+	echo "$as_me:22772: 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 22777 "configure"
+#line 22778 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22805,16 +22806,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22811: \$? = $ac_status" >&5
+  echo "$as_me:22812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22817: \$? = $ac_status" >&5
+  echo "$as_me:22818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22824,7 +22825,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22827: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22828: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22845,21 +22846,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22848: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22849: 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:22851: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22852: 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:22857: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22858: 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 22862 "configure"
+#line 22863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22876,15 +22877,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22882: \$? = $ac_status" >&5
+  echo "$as_me:22883: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22887: \$? = $ac_status" >&5
+  echo "$as_me:22888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22897,7 +22898,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22900: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22901: 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
 
@@ -22908,13 +22909,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22911: checking for intptr_t" >&5
+echo "$as_me:22912: 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 22917 "configure"
+#line 22918 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22929,16 +22930,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22933: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22935: \$? = $ac_status" >&5
+  echo "$as_me:22936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22941: \$? = $ac_status" >&5
+  echo "$as_me:22942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22948,7 +22949,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22951: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22952: 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
   :
@@ -22960,13 +22961,13 @@ EOF
 
 fi
 
-echo "$as_me:22963: checking for ssize_t" >&5
+echo "$as_me:22964: 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 22969 "configure"
+#line 22970 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22981,16 +22982,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22987: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22993: \$? = $ac_status" >&5
+  echo "$as_me:22994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23000,7 +23001,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23003: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23004: 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
   :
@@ -23012,14 +23013,14 @@ EOF
 
 fi
 
-echo "$as_me:23015: checking for type sigaction_t" >&5
+echo "$as_me:23016: 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 23022 "configure"
+#line 23023 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23032,16 +23033,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23038: \$? = $ac_status" >&5
+  echo "$as_me:23039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23044: \$? = $ac_status" >&5
+  echo "$as_me:23045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23052,14 +23053,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23055: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23056: 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:23062: checking declaration of size-change" >&5
+echo "$as_me:23063: 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
@@ -23080,7 +23081,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23083 "configure"
+#line 23084 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23130,16 +23131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23136: \$? = $ac_status" >&5
+  echo "$as_me:23137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23142: \$? = $ac_status" >&5
+  echo "$as_me:23143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23158,7 +23159,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23161: result: $cf_cv_sizechange" >&5
+echo "$as_me:23162: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23176,13 +23177,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23179: checking for memmove" >&5
+echo "$as_me:23180: 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 23185 "configure"
+#line 23186 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23213,16 +23214,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23219: \$? = $ac_status" >&5
+  echo "$as_me:23220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23225: \$? = $ac_status" >&5
+  echo "$as_me:23226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23232,19 +23233,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23235: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23236: 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:23241: checking for bcopy" >&5
+echo "$as_me:23242: 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 23247 "configure"
+#line 23248 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23275,16 +23276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23281: \$? = $ac_status" >&5
+  echo "$as_me:23282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23287: \$? = $ac_status" >&5
+  echo "$as_me:23288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23294,11 +23295,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23297: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23298: 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:23301: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23302: 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
@@ -23308,7 +23309,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23311 "configure"
+#line 23312 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23324,15 +23325,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23330: \$? = $ac_status" >&5
+  echo "$as_me:23331: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23335: \$? = $ac_status" >&5
+  echo "$as_me:23336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23345,7 +23346,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23348: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23349: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23372,13 +23373,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23375: checking for $ac_func" >&5
+echo "$as_me:23376: 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 23381 "configure"
+#line 23382 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23409,16 +23410,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23415: \$? = $ac_status" >&5
+  echo "$as_me:23416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23421: \$? = $ac_status" >&5
+  echo "$as_me:23422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23428,7 +23429,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23431: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23432: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23438,7 +23439,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23441: checking if poll really works" >&5
+echo "$as_me:23442: 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
@@ -23448,7 +23449,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23451 "configure"
+#line 23452 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23501,15 +23502,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23507: \$? = $ac_status" >&5
+  echo "$as_me:23508: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23512: \$? = $ac_status" >&5
+  echo "$as_me:23513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23521,21 +23522,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23524: result: $cf_cv_working_poll" >&5
+echo "$as_me:23525: 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:23531: checking for va_copy" >&5
+echo "$as_me:23532: 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 23538 "configure"
+#line 23539 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23552,16 +23553,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23558: \$? = $ac_status" >&5
+  echo "$as_me:23559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23564: \$? = $ac_status" >&5
+  echo "$as_me:23565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23571,7 +23572,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23574: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23575: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23583,14 +23584,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23586: checking for __va_copy" >&5
+echo "$as_me:23587: 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 23593 "configure"
+#line 23594 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23607,16 +23608,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23613: \$? = $ac_status" >&5
+  echo "$as_me:23614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23619: \$? = $ac_status" >&5
+  echo "$as_me:23620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23626,7 +23627,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23629: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23630: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23638,14 +23639,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23641: checking for __builtin_va_copy" >&5
+echo "$as_me:23642: 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 23648 "configure"
+#line 23649 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23662,16 +23663,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23668: \$? = $ac_status" >&5
+  echo "$as_me:23669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23674: \$? = $ac_status" >&5
+  echo "$as_me:23675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23681,7 +23682,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23684: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23685: 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 &&
@@ -23699,14 +23700,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23702: checking if we can simply copy va_list" >&5
+	echo "$as_me:23703: 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 23709 "configure"
+#line 23710 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23723,16 +23724,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23729: \$? = $ac_status" >&5
+  echo "$as_me:23730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23735: \$? = $ac_status" >&5
+  echo "$as_me:23736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23742,19 +23743,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23745: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23746: 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:23750: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23751: 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 23757 "configure"
+#line 23758 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23771,16 +23772,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23777: \$? = $ac_status" >&5
+  echo "$as_me:23778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23783: \$? = $ac_status" >&5
+  echo "$as_me:23784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23790,7 +23791,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23793: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23794: 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
@@ -23801,13 +23802,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23804: checking for pid_t" >&5
+echo "$as_me:23805: 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 23810 "configure"
+#line 23811 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23822,16 +23823,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23828: \$? = $ac_status" >&5
+  echo "$as_me:23829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23834: \$? = $ac_status" >&5
+  echo "$as_me:23835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23841,7 +23842,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23844: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23845: 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
   :
@@ -23856,23 +23857,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23859: checking for $ac_header" >&5
+echo "$as_me:23860: 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 23865 "configure"
+#line 23866 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23869: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23870: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23875: \$? = $ac_status" >&5
+  echo "$as_me:23876: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23891,7 +23892,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23894: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23895: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23904,13 +23905,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23907: checking for $ac_func" >&5
+echo "$as_me:23908: 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 23913 "configure"
+#line 23914 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23941,16 +23942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23947: \$? = $ac_status" >&5
+  echo "$as_me:23948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23953: \$? = $ac_status" >&5
+  echo "$as_me:23954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23960,7 +23961,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23963: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23964: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23972,7 +23973,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23975: checking for working fork" >&5
+  echo "$as_me:23976: 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
@@ -23995,15 +23996,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24001: \$? = $ac_status" >&5
+  echo "$as_me:24002: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24006: \$? = $ac_status" >&5
+  echo "$as_me:24007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24015,7 +24016,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24018: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24019: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24029,12 +24030,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24032: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24033: 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:24037: checking for working vfork" >&5
+  echo "$as_me:24038: 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
@@ -24043,7 +24044,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24046 "configure"
+#line 24047 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24140,15 +24141,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24146: \$? = $ac_status" >&5
+  echo "$as_me:24147: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24151: \$? = $ac_status" >&5
+  echo "$as_me:24152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24160,13 +24161,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24163: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24164: 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:24169: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24170: 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
 
@@ -24191,7 +24192,7 @@ EOF
 
 fi
 
-echo "$as_me:24194: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24195: 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
@@ -24201,7 +24202,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24204 "configure"
+#line 24205 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24236,15 +24237,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24242: \$? = $ac_status" >&5
+  echo "$as_me:24243: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24247: \$? = $ac_status" >&5
+  echo "$as_me:24248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24257,7 +24258,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24260: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24261: 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
@@ -24266,7 +24267,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24269: checking for openpty in -lutil" >&5
+echo "$as_me:24270: 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
@@ -24274,7 +24275,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24277 "configure"
+#line 24278 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24293,16 +24294,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24299: \$? = $ac_status" >&5
+  echo "$as_me:24300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24305: \$? = $ac_status" >&5
+  echo "$as_me:24306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24313,7 +24314,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24316: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24317: 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
@@ -24321,7 +24322,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24324: checking for openpty header" >&5
+echo "$as_me:24325: 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
@@ -24348,7 +24349,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24351 "configure"
+#line 24352 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24365,16 +24366,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24371: \$? = $ac_status" >&5
+  echo "$as_me:24372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24377: \$? = $ac_status" >&5
+  echo "$as_me:24378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24392,7 +24393,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24395: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24396: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24465,7 +24466,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24468 "configure"
+#line 24469 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24477,16 +24478,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24483: \$? = $ac_status" >&5
+  echo "$as_me:24484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24489: \$? = $ac_status" >&5
+  echo "$as_me:24490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24503,7 +24504,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24506: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24507: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24539,7 +24540,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24542: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24543: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24550,7 +24551,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24553: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24554: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24622,7 +24623,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24625 "configure"
+#line 24626 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24634,16 +24635,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24640: \$? = $ac_status" >&5
+  echo "$as_me:24641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24646: \$? = $ac_status" >&5
+  echo "$as_me:24647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24660,7 +24661,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24663: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24664: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24740,7 +24741,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24743: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24744: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24757,23 +24758,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24760: checking for db.h" >&5
+echo "$as_me:24761: 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 24766 "configure"
+#line 24767 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24771: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24776: \$? = $ac_status" >&5
+  echo "$as_me:24777: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24792,11 +24793,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24795: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24796: 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:24799: checking for version of db" >&5
+echo "$as_me:24800: 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
@@ -24807,10 +24808,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24810: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24811: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24813 "configure"
+#line 24814 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24840,16 +24841,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24846: \$? = $ac_status" >&5
+  echo "$as_me:24847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24852: \$? = $ac_status" >&5
+  echo "$as_me:24853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24863,16 +24864,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24866: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24867: 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:24870: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24871: 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:24875: checking for db libraries" >&5
+echo "$as_me:24876: 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
@@ -24902,10 +24903,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24905: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24906: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24908 "configure"
+#line 24909 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24960,16 +24961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24966: \$? = $ac_status" >&5
+  echo "$as_me:24967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24972: \$? = $ac_status" >&5
+  echo "$as_me:24973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24989,11 +24990,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24992: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24993: 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:24996: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24997: 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
@@ -25019,7 +25020,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25022: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25023: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25034,7 +25035,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25037: checking if we should include stdbool.h" >&5
+echo "$as_me:25038: 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
@@ -25042,7 +25043,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25045 "configure"
+#line 25046 "configure"
 #include "confdefs.h"
 
 int
@@ -25054,23 +25055,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25060: \$? = $ac_status" >&5
+  echo "$as_me:25061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25066: \$? = $ac_status" >&5
+  echo "$as_me:25067: \$? = $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 25073 "configure"
+#line 25074 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25086,16 +25087,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25090: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25092: \$? = $ac_status" >&5
+  echo "$as_me:25093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25098: \$? = $ac_status" >&5
+  echo "$as_me:25099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25109,13 +25110,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25112: result: yes" >&5
+then	echo "$as_me:25113: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25114: result: no" >&5
+else	echo "$as_me:25115: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25118: checking for builtin bool type" >&5
+echo "$as_me:25119: 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
@@ -25123,7 +25124,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25126 "configure"
+#line 25127 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25138,16 +25139,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25144: \$? = $ac_status" >&5
+  echo "$as_me:25145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25150: \$? = $ac_status" >&5
+  echo "$as_me:25151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25160,9 +25161,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25163: result: yes" >&5
+then	echo "$as_me:25164: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25165: result: no" >&5
+else	echo "$as_me:25166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25179,10 +25180,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25182: checking if we already have C++ library" >&5
+	echo "$as_me:25183: 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 25185 "configure"
+#line 25186 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25196,16 +25197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25202: \$? = $ac_status" >&5
+  echo "$as_me:25203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25208: \$? = $ac_status" >&5
+  echo "$as_me:25209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25214,7 +25215,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25217: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25218: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25233,7 +25234,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25236: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25237: 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
@@ -25259,7 +25260,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25262 "configure"
+#line 25263 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25273,16 +25274,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25279: \$? = $ac_status" >&5
+  echo "$as_me:25280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25285: \$? = $ac_status" >&5
+  echo "$as_me:25286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25294,7 +25295,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25297: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25298: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25316,7 +25317,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25319: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25320: 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
@@ -25331,15 +25332,15 @@ CF_EOF
 # 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:25334: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25337: \$? = $ac_status" >&5
+  echo "$as_me:25338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25339: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25342: \$? = $ac_status" >&5
+  echo "$as_me:25343: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25350,10 +25351,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25353: result: yes" >&5
+  echo "$as_me:25354: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25356: result: no" >&5
+  echo "$as_me:25357: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25373,7 +25374,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25376: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25377: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25394,7 +25395,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25397 "configure"
+#line 25398 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25408,16 +25409,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25414: \$? = $ac_status" >&5
+  echo "$as_me:25415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25420: \$? = $ac_status" >&5
+  echo "$as_me:25421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25454,7 +25455,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25457 "configure"
+#line 25458 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25468,16 +25469,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25474: \$? = $ac_status" >&5
+  echo "$as_me:25475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25480: \$? = $ac_status" >&5
+  echo "$as_me:25481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25510,7 +25511,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25513: result: $cf_cxx_library" >&5
+	echo "$as_me:25514: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25526,7 +25527,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25529: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25530: 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
@@ -25543,18 +25544,18 @@ do
   # 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 25546 "configure"
+#line 25547 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25551: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25552: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25557: \$? = $ac_status" >&5
+  echo "$as_me:25558: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25577,17 +25578,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25580 "configure"
+#line 25581 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25584: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25590: \$? = $ac_status" >&5
+  echo "$as_me:25591: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25624,7 +25625,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25627: result: $CXXCPP" >&5
+echo "$as_me:25628: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25634,18 +25635,18 @@ do
   # 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 25637 "configure"
+#line 25638 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25642: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25643: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25648: \$? = $ac_status" >&5
+  echo "$as_me:25649: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25668,17 +25669,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25671 "configure"
+#line 25672 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25675: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25676: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25681: \$? = $ac_status" >&5
+  echo "$as_me:25682: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25706,7 +25707,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25709: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25710: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25721,23 +25722,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25724: checking for $ac_header" >&5
+echo "$as_me:25725: 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 25730 "configure"
+#line 25731 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25734: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25735: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25740: \$? = $ac_status" >&5
+  echo "$as_me:25741: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25756,7 +25757,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25759: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25760: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25769,23 +25770,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25772: checking for $ac_header" >&5
+echo "$as_me:25773: 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 25778 "configure"
+#line 25779 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25782: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25783: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25788: \$? = $ac_status" >&5
+  echo "$as_me:25789: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25804,7 +25805,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25807: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25808: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25815,10 +25816,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25818: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25819: 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 25821 "configure"
+#line 25822 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25835,16 +25836,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25841: \$? = $ac_status" >&5
+  echo "$as_me:25842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25847: \$? = $ac_status" >&5
+  echo "$as_me:25848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25853,7 +25854,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25856: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25857: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25864,7 +25865,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25867: checking if we should include stdbool.h" >&5
+echo "$as_me:25868: 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
@@ -25872,7 +25873,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25875 "configure"
+#line 25876 "configure"
 #include "confdefs.h"
 
 int
@@ -25884,23 +25885,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25890: \$? = $ac_status" >&5
+  echo "$as_me:25891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25896: \$? = $ac_status" >&5
+  echo "$as_me:25897: \$? = $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 25903 "configure"
+#line 25904 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25916,16 +25917,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25922: \$? = $ac_status" >&5
+  echo "$as_me:25923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25928: \$? = $ac_status" >&5
+  echo "$as_me:25929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25939,13 +25940,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25942: result: yes" >&5
+then	echo "$as_me:25943: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25944: result: no" >&5
+else	echo "$as_me:25945: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25948: checking for builtin bool type" >&5
+echo "$as_me:25949: 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
@@ -25953,7 +25954,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25956 "configure"
+#line 25957 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25968,16 +25969,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25974: \$? = $ac_status" >&5
+  echo "$as_me:25975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25980: \$? = $ac_status" >&5
+  echo "$as_me:25981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25990,19 +25991,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25993: result: yes" >&5
+then	echo "$as_me:25994: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25995: result: no" >&5
+else	echo "$as_me:25996: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25999: checking for bool" >&5
+echo "$as_me:26000: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26005 "configure"
+#line 26006 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26037,16 +26038,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26043: \$? = $ac_status" >&5
+  echo "$as_me:26044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26049: \$? = $ac_status" >&5
+  echo "$as_me:26050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26056,10 +26057,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26059: result: $ac_cv_type_bool" >&5
+echo "$as_me:26060: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26062: checking size of bool" >&5
+echo "$as_me:26063: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26068,7 +26069,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26071 "configure"
+#line 26072 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26100,21 +26101,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26106: \$? = $ac_status" >&5
+  echo "$as_me:26107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26112: \$? = $ac_status" >&5
+  echo "$as_me:26113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26117 "configure"
+#line 26118 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26146,16 +26147,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26152: \$? = $ac_status" >&5
+  echo "$as_me:26153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26158: \$? = $ac_status" >&5
+  echo "$as_me:26159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26171,7 +26172,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26174 "configure"
+#line 26175 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26203,16 +26204,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26209: \$? = $ac_status" >&5
+  echo "$as_me:26210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26215: \$? = $ac_status" >&5
+  echo "$as_me:26216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26228,7 +26229,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26231 "configure"
+#line 26232 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26260,16 +26261,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26266: \$? = $ac_status" >&5
+  echo "$as_me:26267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26272: \$? = $ac_status" >&5
+  echo "$as_me:26273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26282,12 +26283,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26285: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26286: 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 26290 "configure"
+#line 26291 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26323,15 +26324,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26329: \$? = $ac_status" >&5
+  echo "$as_me:26330: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26334: \$? = $ac_status" >&5
+  echo "$as_me:26335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26347,13 +26348,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26350: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26351: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26356: checking for type of bool" >&5
+echo "$as_me:26357: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26372,7 +26373,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26375 "configure"
+#line 26376 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26413,15 +26414,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26419: \$? = $ac_status" >&5
+  echo "$as_me:26420: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26424: \$? = $ac_status" >&5
+  echo "$as_me:26425: \$? = $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
@@ -26438,19 +26439,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26441: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26442: 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:26448: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26449: 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:26453: checking for special defines needed for etip.h" >&5
+echo "$as_me:26454: 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"
@@ -26468,7 +26469,7 @@ do
 	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 26471 "configure"
+#line 26472 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26482,16 +26483,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26488: \$? = $ac_status" >&5
+  echo "$as_me:26489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26494: \$? = $ac_status" >&5
+  echo "$as_me:26495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26512,12 +26513,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26515: result: $cf_result" >&5
+echo "$as_me:26516: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26520: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26521: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26534,7 +26535,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26537 "configure"
+#line 26538 "configure"
 #include "confdefs.h"
 
 class base
@@ -26553,15 +26554,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26559: \$? = $ac_status" >&5
+  echo "$as_me:26560: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26564: \$? = $ac_status" >&5
+  echo "$as_me:26565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26580,7 +26581,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26583: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26584: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26589,7 +26590,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26592: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26593: 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
@@ -26606,7 +26607,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26609 "configure"
+#line 26610 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26625,15 +26626,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26631: \$? = $ac_status" >&5
+  echo "$as_me:26632: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26636: \$? = $ac_status" >&5
+  echo "$as_me:26637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26652,7 +26653,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26655: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26656: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26662,7 +26663,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26665: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26666: 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
@@ -26676,7 +26677,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26679 "configure"
+#line 26680 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26720,16 +26721,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26723: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26726: \$? = $ac_status" >&5
+  echo "$as_me:26727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26732: \$? = $ac_status" >&5
+  echo "$as_me:26733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26747,7 +26748,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26750: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26751: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26796,13 +26797,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26799: checking for bool" >&5
+echo "$as_me:26800: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26805 "configure"
+#line 26806 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26837,16 +26838,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26843: \$? = $ac_status" >&5
+  echo "$as_me:26844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26849: \$? = $ac_status" >&5
+  echo "$as_me:26850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26856,10 +26857,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26859: result: $ac_cv_type_bool" >&5
+echo "$as_me:26860: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26862: checking size of bool" >&5
+echo "$as_me:26863: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26868,7 +26869,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26871 "configure"
+#line 26872 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26900,21 +26901,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26906: \$? = $ac_status" >&5
+  echo "$as_me:26907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26912: \$? = $ac_status" >&5
+  echo "$as_me:26913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26917 "configure"
+#line 26918 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26946,16 +26947,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26952: \$? = $ac_status" >&5
+  echo "$as_me:26953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26958: \$? = $ac_status" >&5
+  echo "$as_me:26959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26971,7 +26972,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26974 "configure"
+#line 26975 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27003,16 +27004,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27009: \$? = $ac_status" >&5
+  echo "$as_me:27010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27015: \$? = $ac_status" >&5
+  echo "$as_me:27016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27028,7 +27029,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27031 "configure"
+#line 27032 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27060,16 +27061,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27066: \$? = $ac_status" >&5
+  echo "$as_me:27067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27072: \$? = $ac_status" >&5
+  echo "$as_me:27073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27082,12 +27083,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27085: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27086: 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 27090 "configure"
+#line 27091 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27123,15 +27124,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27129: \$? = $ac_status" >&5
+  echo "$as_me:27130: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27134: \$? = $ac_status" >&5
+  echo "$as_me:27135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27147,13 +27148,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27150: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27151: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27156: checking for type of bool" >&5
+echo "$as_me:27157: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27172,7 +27173,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27175 "configure"
+#line 27176 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27213,15 +27214,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27219: \$? = $ac_status" >&5
+  echo "$as_me:27220: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27224: \$? = $ac_status" >&5
+  echo "$as_me:27225: \$? = $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
@@ -27238,26 +27239,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27241: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27242: 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:27248: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27249: 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:27254: checking for fallback type of bool" >&5
+			echo "$as_me:27255: 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:27260: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27261: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27286,7 +27287,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27289: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27290: 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
@@ -27303,7 +27304,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27306: checking for $ac_word" >&5
+echo "$as_me:27307: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27320,7 +27321,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27323: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27324: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27332,10 +27333,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27335: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27336: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27338: result: no" >&5
+  echo "$as_me:27339: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27345,7 +27346,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27348: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27349: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27356,7 +27357,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27359: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27360: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27385,7 +27386,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27388: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27389: 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
@@ -27404,10 +27405,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27407: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27408: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27410: result: missing" >&5
+					echo "$as_me:27411: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27420,7 +27421,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27423: checking for gnat version" >&5
+echo "$as_me:27424: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27431,7 +27432,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27434: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27435: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27440,7 +27441,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27443: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27444: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27448,7 +27449,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27451: checking for $ac_word" >&5
+echo "$as_me:27452: 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
@@ -27463,7 +27464,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27466: found $ac_dir/$ac_word" >&5
+echo "$as_me:27467: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27472,20 +27473,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27475: result: $M4_exists" >&5
+  echo "$as_me:27476: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27478: result: no" >&5
+  echo "$as_me:27479: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27484: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27485: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27488: checking if GNAT works" >&5
+			echo "$as_me:27489: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27513,7 +27514,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27516: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27517: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27525,7 +27526,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27528: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27529: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27542,10 +27543,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27545: result: $ADAFLAGS" >&5
+	echo "$as_me:27546: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27548: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27549: 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
@@ -27555,11 +27556,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27558: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27559: 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:27562: checking if GNAT supports generics" >&5
+echo "$as_me:27563: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27569,7 +27570,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27572: result: $cf_gnat_generics" >&5
+echo "$as_me:27573: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27581,7 +27582,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27584: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27585: 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
@@ -27629,7 +27630,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27632: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27633: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27642,7 +27643,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27645: checking if GNAT supports project files" >&5
+echo "$as_me:27646: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27705,15 +27706,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27708: result: $cf_gnat_projects" >&5
+echo "$as_me:27709: 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:27714: checking if GNAT supports libraries" >&5
+	echo "$as_me:27715: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27716: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27717: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27733,7 +27734,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27736: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27737: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27745,7 +27746,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27748: checking for ada-compiler" >&5
+echo "$as_me:27749: 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.
@@ -27756,12 +27757,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27759: result: $cf_ada_compiler" >&5
+echo "$as_me:27760: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27764: checking for ada-include" >&5
+echo "$as_me:27765: 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.
@@ -27797,7 +27798,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27800: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27801: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27806,10 +27807,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27809: result: $ADA_INCLUDE" >&5
+echo "$as_me:27810: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27812: checking for ada-objects" >&5
+echo "$as_me:27813: 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.
@@ -27845,7 +27846,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27848: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27849: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27854,10 +27855,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27857: result: $ADA_OBJECTS" >&5
+echo "$as_me:27858: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27860: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27861: 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.
@@ -27867,14 +27868,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27870: result: $with_ada_sharedlib" >&5
+echo "$as_me:27871: 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:27877: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27878: 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
@@ -27894,7 +27895,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27897: checking for ada-libname" >&5
+echo "$as_me:27898: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27910,7 +27911,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27913: result: $ADA_LIBNAME" >&5
+echo "$as_me:27914: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27921,13 +27922,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27924: checking for wchar_t" >&5
+	echo "$as_me:27925: 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 27930 "configure"
+#line 27931 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27942,16 +27943,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27948: \$? = $ac_status" >&5
+  echo "$as_me:27949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27954: \$? = $ac_status" >&5
+  echo "$as_me:27955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27961,10 +27962,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27964: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27965: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27967: checking size of wchar_t" >&5
+echo "$as_me:27968: 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
@@ -27973,7 +27974,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27976 "configure"
+#line 27977 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27985,21 +27986,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27991: \$? = $ac_status" >&5
+  echo "$as_me:27992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27997: \$? = $ac_status" >&5
+  echo "$as_me:27998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28002 "configure"
+#line 28003 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28011,16 +28012,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28017: \$? = $ac_status" >&5
+  echo "$as_me:28018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28023: \$? = $ac_status" >&5
+  echo "$as_me:28024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28036,7 +28037,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28039 "configure"
+#line 28040 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28048,16 +28049,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28054: \$? = $ac_status" >&5
+  echo "$as_me:28055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28060: \$? = $ac_status" >&5
+  echo "$as_me:28061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28073,7 +28074,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28076 "configure"
+#line 28077 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28085,16 +28086,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28088: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28091: \$? = $ac_status" >&5
+  echo "$as_me:28092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28097: \$? = $ac_status" >&5
+  echo "$as_me:28098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28107,12 +28108,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28110: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28111: 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 28115 "configure"
+#line 28116 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28128,15 +28129,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28134: \$? = $ac_status" >&5
+  echo "$as_me:28135: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28139: \$? = $ac_status" >&5
+  echo "$as_me:28140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28152,7 +28153,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28155: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28156: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28165,7 +28166,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28168: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28169: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28183,7 +28184,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28186: checking for library subsets" >&5
+echo "$as_me:28187: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28237,7 +28238,7 @@ fi
 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:28240: result: $LIB_SUBSETS" >&5
+echo "$as_me:28241: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28268,7 +28269,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28271: checking default library suffix" >&5
+echo "$as_me:28272: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28279,10 +28280,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28282: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28283: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28285: checking default library-dependency suffix" >&5
+echo "$as_me:28286: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28365,10 +28366,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28368: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28369: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28371: checking default object directory" >&5
+echo "$as_me:28372: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28384,11 +28385,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28387: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28388: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28391: checking c++ library-dependency suffix" >&5
+echo "$as_me:28392: 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++)
@@ -28481,7 +28482,7 @@ else
 	fi
 
 fi
-echo "$as_me:28484: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28485: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28657,19 +28658,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28660: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28661: 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 <<EOF
-#line 28665 "configure"
+#line 28666 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28669: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28672: \$? = $ac_status" >&5
+  echo "$as_me:28673: \$? = $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
@@ -28680,10 +28681,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28683 "configure"
+#line 28684 "configure"
 #include "confdefs.h"
 
-#line 28686 "configure"
+#line 28687 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28698,16 +28699,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28704: \$? = $ac_status" >&5
+  echo "$as_me:28705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28710: \$? = $ac_status" >&5
+  echo "$as_me:28711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28730,7 +28731,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28733: result: $cf_ldflags_static" >&5
+	echo "$as_me:28734: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28746,7 +28747,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28749: checking where we will install curses.h" >&5
+echo "$as_me:28750: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28756,7 +28757,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28759: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28760: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28764,7 +28765,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28767: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28768: 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
@@ -28789,7 +28790,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28792: checking for desired basename for form library" >&5
+echo "$as_me:28793: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28809,10 +28810,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28812: result: $FORM_NAME" >&5
+echo "$as_me:28813: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28815: checking for desired basename for menu library" >&5
+echo "$as_me:28816: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28832,10 +28833,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28835: result: $MENU_NAME" >&5
+echo "$as_me:28836: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28838: checking for desired basename for panel library" >&5
+echo "$as_me:28839: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28855,10 +28856,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28858: result: $PANEL_NAME" >&5
+echo "$as_me:28859: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28861: checking for desired basename for cxx library" >&5
+echo "$as_me:28862: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28878,13 +28879,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28881: result: $CXX_NAME" >&5
+echo "$as_me:28882: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28887: checking for src modules" >&5
+echo "$as_me:28888: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28943,7 +28944,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28946: result: $cf_cv_src_modules" >&5
+echo "$as_me:28947: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29104,7 +29105,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29107: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29108: 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//'`
@@ -29115,7 +29116,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29118: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29119: 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
@@ -29131,7 +29132,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29134: result: $PKG_CFLAGS" >&5
+echo "$as_me:29135: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29192,7 +29193,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29195: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29196: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29219,7 +29220,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29222: checking for linker search path" >&5
+echo "$as_me:29223: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29267,7 +29268,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29270: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29271: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29308,7 +29309,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29311: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29312: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29394,7 +29395,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29397: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29398: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29575,7 +29576,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29578: error: ambiguous option: $1
+    { { echo "$as_me:29579: 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;}
@@ -29594,7 +29595,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29597: error: unrecognized option: $1
+  -*) { { echo "$as_me:29598: 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;}
@@ -29724,7 +29725,7 @@ do
   "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:29727: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29728: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30241,7 +30242,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30244: creating $ac_file" >&5
+    { echo "$as_me:30245: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30259,7 +30260,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30262: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30263: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30272,7 +30273,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30275: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30276: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30288,7 +30289,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30291: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30292: 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;}
@@ -30297,7 +30298,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30300: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30301: 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;}
@@ -30342,7 +30343,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30345: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30346: 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;}
@@ -30353,7 +30354,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30356: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30357: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30402,7 +30403,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30405: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30406: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30413,7 +30414,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30416: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30417: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30426,7 +30427,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30429: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30430: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30484,7 +30485,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30487: $ac_file is unchanged" >&5
+      { echo "$as_me:30488: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30871,7 +30872,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30874: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30875: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index c1c4a190a..3db7d42b5 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1556 2023/07/22 10:11:10 tom Exp $
+# $Id: dist.mk,v 1.1557 2023/07/29 10:00:25 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230722
+NCURSES_PATCH = 20230729
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index da0b4c803..257ebb88b 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index d6dadeccf..fdf1acc2d 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 6fbbf7688..07166e614 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 9cd7aaa03..9bf39184a 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.27 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.29 2023/07/29 16:52:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -67,30 +67,42 @@ <H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  effect  of  <STRONG>get_wstr</STRONG> is as though a series of calls to <STRONG><A HREF="curs_get_wch.3x.html">get_wch(3x)</A></STRONG>
-       were made, until a newline, other end-of-line, or end-of-file condition
-       is  processed.  An end-of-file condition is represented by <STRONG>WEOF</STRONG>, as de-
-       fined in <STRONG>&lt;wchar.h&gt;</STRONG>.  The newline and end-of-line conditions are  repre-
-       sented  by  the  <STRONG>\n</STRONG>  <STRONG>wchar_t</STRONG>  value.   In all instances, the end of the
-       string is terminated by a null <STRONG>wchar_t</STRONG>.  The routine  places  resulting
-       values in the area pointed to by <EM>wstr</EM>.
-
-       The  user's  erase and kill characters are interpreted.  If keypad mode
-       is on for the window, <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are  both  considered
-       equivalent to the user's kill character.
-
-       Characters  input  are  echoed  only  if <STRONG>echo</STRONG> is currently on.  In that
-       case, backspace is echoed as deletion of the previous character  (typi-
-       cally a left motion).
+       The  function  <STRONG>wgetn_wstr</STRONG>  is  equivalent  to  a  series  of  calls  to
+       <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> until a newline or carriage return terminates the series:
+
+       <STRONG>o</STRONG>   The terminating character is not included in the returned string.
+
+       <STRONG>o</STRONG>   An end-of-file condition is represented  by  <STRONG>WEOF</STRONG>,  as  defined  in
+           <STRONG>&lt;wchar.h&gt;</STRONG>.
+
+       <STRONG>o</STRONG>   In  all  instances,  the  end of the string is terminated by a null
+           <STRONG>wchar_t</STRONG>.
+
+       <STRONG>o</STRONG>   The function stores the result in the area pointed to by  the  <EM>wstr</EM>
+           parameter.
+
+       <STRONG>o</STRONG>   The function reads at most <EM>n</EM> characters, thus preventing a possible
+           overflow of the input buffer.
+
+           Any attempt to enter more characters (other  than  the  terminating
+           newline or carriage return) causes a beep.
+
+           Function keys also cause a beep and are ignored.
+
+       The user's <EM>erase</EM> and <EM>kill</EM> characters are interpreted:
 
-       The effect of <STRONG>wget_wstr</STRONG> is as though a series of calls to <STRONG>wget_wch</STRONG> were
-       made.
+       <STRONG>o</STRONG>   The  <EM>erase</EM>  character (e.g., <STRONG>^H</STRONG>) erases the character at the end of
+           the buffer, moving the cursor to the left.
 
-       The effect of <STRONG>mvget_wstr</STRONG> is as though a call to <STRONG>move</STRONG> and then a  series
-       of calls to <STRONG>get_wch</STRONG> were made.
+           If <EM>keypad</EM> mode is on for the window, <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
+           both considered equivalent to the user's <EM>erase</EM> character.
 
-       The  effect  of <STRONG>mvwget_wstr</STRONG> is as though a call to <STRONG>wmove</STRONG> and then a se-
-       ries of calls to <STRONG>wget_wch</STRONG> were made.
+       <STRONG>o</STRONG>   The <EM>kill</EM> character (e.g., <STRONG>^U</STRONG>) erases the entire buffer, leaving the
+           cursor at the beginning of the buffer.
+
+       Characters input are echoed only if <STRONG>echo</STRONG>  is  currently  on.   In  that
+       case,  backspace is echoed as deletion of the previous character (typi-
+       cally a left motion).
 
        The <STRONG>getn_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG>, and <STRONG>wgetn_wstr</STRONG> functions  are
        identical to the <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, and <STRONG>wget_wstr</STRONG> func-
@@ -99,25 +111,30 @@ <H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
+
        Using  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to read a line
        that overflows the array pointed to by <STRONG>wstr</STRONG> causes  undefined  results.
        The use of <STRONG>getn_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG>, or <STRONG>wgetn_wstr</STRONG>, respec-
        tively, is recommended.
 
        These functions cannot return <STRONG>KEY_</STRONG> values because there is  no  way  to
-       distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.
-
-       All of these routines except <STRONG>wgetn_wstr</STRONG> may be macros.
+       distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.  may be macros.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  these  functions return <STRONG>OK</STRONG> upon successful completion.  Other-
-       wise, they return <STRONG>ERR</STRONG>.
+       All  of  these  functions return the integer <STRONG>OK</STRONG> upon successful comple-
+       tion.  If unsuccessful, they return <STRONG>ERR</STRONG>.
 
-       Functions using a window parameter return an error if it is null.
+       X/Open defines no error conditions.
 
-              <STRONG>wgetn_wstr</STRONG>
-                   returns an error if the associated call to <STRONG>wget_wch</STRONG> failed.
+       In this implementation, these functions return an error
+
+       <STRONG>o</STRONG>   if the window pointer is null, or
+
+       <STRONG>o</STRONG>   if its timeout expires without having any data.
+
+       <STRONG>o</STRONG>   if the associated call to <STRONG>wget_wch</STRONG> failed.
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -126,40 +143,41 @@ <H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in The Single Unix Specification, Version
-       2.   No  error conditions are defined.  This implementation returns <STRONG>ERR</STRONG>
-       if the window pointer is null, or if the lower-level <STRONG>wget_wch</STRONG> call  re-
-       turns  an <STRONG>ERR</STRONG>.  In the latter case, an <STRONG>ERR</STRONG> return without other data is
-       treated as an end-of-file condition, and the returned array contains  a
-       <STRONG>WEOF</STRONG> followed by a null <STRONG>wchar_t</STRONG>.
+       2.  No error conditions are defined.
+
+       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
+       the lower-level <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter  case,  an
+       <STRONG>ERR</STRONG>  return  without other data is treated as an end-of-file condition,
+       and the returned array contains a <STRONG>WEOF</STRONG> followed by a null <STRONG>wchar_t</STRONG>.
 
        X/Open curses documented these functions to pass an array of <STRONG>wchar_t</STRONG> in
        1997, but that was an error because of this part of the description:
 
               The effect of <STRONG>get_wstr</STRONG> is as though a series of calls to <STRONG>get_wch</STRONG>
-              were  made, until a newline character, end-of-line character, or
+              were made, until a newline character, end-of-line character,  or
               end-of-file character is processed.
 
-       The latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while  <STRONG>wchar_t</STRONG>
-       is  a  unsigned  type.  All of the vendors implement this using <STRONG>wint_t</STRONG>,
+       The  latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while <STRONG>wchar_t</STRONG>
+       is a unsigned type.  All of the vendors implement  this  using  <STRONG>wint_t</STRONG>,
        following the standard.
 
-       X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
+       X/Open  Curses,  Issue 7 (2009) is unclear regarding whether the termi-
        nating <EM>null</EM> <STRONG>wchar_t</STRONG> value is counted in the length parameter <EM>n</EM>.  X/Open
-       Curses, Issue 7 revised the corresponding description  of  <STRONG>wgetnstr</STRONG>  to
+       Curses,  Issue  7  revised the corresponding description of <STRONG>wgetnstr</STRONG> to
        address this issue.  The unrevised description of <STRONG>wget_nwstr</STRONG> 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 <EM>n</EM> is nega-
+       X/Open Curses does not specify what happens if the length  <EM>n</EM>  is  nega-
        tive.
 
-       <STRONG>o</STRONG>   For analogy with <STRONG>wgetnstr</STRONG>, ncurses  6.2  uses  a  limit  (based  on
+       <STRONG>o</STRONG>   For  analogy  with  <STRONG>wgetnstr</STRONG>,  ncurses  6.2  uses a limit (based on
            <STRONG>LINE_MAX</STRONG>).
 
-       <STRONG>o</STRONG>   Some  other  implementations (such as Solaris xcurses) do the same,
+       <STRONG>o</STRONG>   Some other implementations (such as Solaris xcurses) do  the  same,
            while others (PDCurses) do not allow this.
 
-       <STRONG>o</STRONG>   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  <STRONG>-1</STRONG>
+       <STRONG>o</STRONG>   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a <STRONG>-1</STRONG>
            as an indefinite number of characters.
 
 
@@ -168,7 +186,7 @@ <H1 class="no-header">curs_get_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-29                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 12da6a2b9..32d1a2f49 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,22 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
-  * X/Open says also until EOf
-  * X/Open says then an EOS is added to the result
-  * X/Open doesn't mention n&lt;0
+  * @Id: curs_getstr.3x,v 1.41 2023/07/29 16:32:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -69,44 +66,68 @@ <H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The function <STRONG>getstr</STRONG> is equivalent to a series of calls to <STRONG>getch</STRONG>,  until
-       a  newline or carriage return is received (the terminating character is
-       not included in the returned string).  The resulting value is placed in
-       the area pointed to by the character pointer <EM>str</EM>, followed by a NUL.
+       The function <STRONG>wgetnstr</STRONG> is equivalent to a series of calls to <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,
+       until a newline or carriage return terminates the series:
 
-       The  <STRONG>getnstr</STRONG>  function reads from the <EM>stdscr</EM> default window.  The other
-       functions, such as <STRONG>wgetnstr</STRONG>, read from the window given as a parameter.
+       <STRONG>o</STRONG>   The terminating character is not included in the returned string.
 
-       <STRONG>getnstr</STRONG> reads at most <EM>n</EM> characters, thus preventing a possible overflow
-       of  the input buffer.  Any attempt to enter more characters (other than
-       the terminating newline or carriage return) causes  a  beep.   Function
-       keys also cause a beep and are ignored.
+       <STRONG>o</STRONG>   In all instances, the end of the string is terminated by a NUL.
+
+       <STRONG>o</STRONG>   The  function  stores  the result in the area pointed to by the <EM>str</EM>
+           parameter.
+
+       <STRONG>o</STRONG>   The function reads at most <EM>n</EM> characters, thus preventing a possible
+           overflow of the input buffer.
+
+           Any  attempt  to  enter more characters (other than the terminating
+           newline or carriage return) causes a beep.
+
+           Function keys also cause a beep and are ignored.
 
        The user's <EM>erase</EM> and <EM>kill</EM> characters are interpreted:
 
-       <STRONG>o</STRONG>   The  <EM>erase</EM>  character (e.g., <STRONG>^H</STRONG>) erases the character at the end of
+       <STRONG>o</STRONG>   The <EM>erase</EM> character (e.g., <STRONG>^H</STRONG>) erases the character at the  end  of
            the buffer, moving the cursor to the left.
 
            If <EM>keypad</EM> mode is on for the window, <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
-           both considered equivalent to the user's erase character.
+           both considered equivalent to the user's <EM>erase</EM> character.
 
        <STRONG>o</STRONG>   The <EM>kill</EM> character (e.g., <STRONG>^U</STRONG>) erases the entire buffer, leaving the
            cursor at the beginning of the buffer.
 
-       Characters input are echoed only if <STRONG>echo</STRONG>  is  currently  on.   In  that
-       case,  backspace is echoed as deletion of the previous character (typi-
+       Characters  input  are  echoed  only  if <STRONG>echo</STRONG> is currently on.  In that
+       case, backspace is echoed as deletion of the previous character  (typi-
        cally a left motion).
 
+       The  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, and <STRONG>wgetnstr</STRONG> functions are identi-
+       cal to the <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, and <STRONG>wgetstr</STRONG> functions,  respec-
+       tively, except that the <STRONG>*n*</STRONG> versions read at most <EM>n</EM> characters, letting
+       the application prevent overflow of the input buffer.
+
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
+
+       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or <STRONG>wgetstr</STRONG> to read a line that over-
+       flows the array pointed to by <STRONG>str</STRONG> causes undefined results.  The use of
+       <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or <STRONG>wgetnstr</STRONG>,  respectively,  is  recom-
+       mended.
+
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG> (SVr4 speci-
-       fies  only  "an  integer value other than <STRONG>ERR</STRONG>") upon successful comple-
-       tion.
+       All  of  these  functions return the integer <STRONG>OK</STRONG> upon successful comple-
+       tion.  (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")  If  un-
+       successful, they return <STRONG>ERR</STRONG>.
 
        X/Open defines no error conditions.
 
-       In this implementation, these functions return an error if  the  window
-       pointer is null, or if its timeout expires without having any data.
+       In this implementation, these functions return an error
+
+       <STRONG>o</STRONG>   if the window pointer is null, or
+
+       <STRONG>o</STRONG>   if its timeout expires without having any data.
+
+       <STRONG>o</STRONG>   if the associated call to <STRONG>wgetch</STRONG> failed.
 
        This  implementation  provides an extension as well.  If a <STRONG>SIGWINCH</STRONG> in-
        terrupts the function, it will return <STRONG>KEY_RESIZE</STRONG> rather than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.
@@ -116,79 +137,76 @@ <H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        the window pointer is null.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, and <STRONG>mvwgetstr</STRONG> may be macros.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in The Single Unix Specification, Version
+       2.  No error conditions are defined.
 
+       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
+       the lower-level <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call returns an <STRONG>ERR</STRONG>.
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the  XSI  Curses  standard,  Issue  4.
-       They  read  single-byte  characters only.  The standard does not define
-       any error conditions.  This implementation returns <STRONG>ERR</STRONG>  if  the  window
-       pointer is null, or if the lower-level <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call returns an <STRONG>ERR</STRONG>.
-
-       SVr3  and  early  SVr4  curses  implementations did not reject function
-       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
-       function  keys, "home" key, "clear" key, <EM>etc</EM>.) are "interpreted", with-
-       out giving details.  It lied.  In fact, the "character" value  appended
-       to  the  string by those implementations was predictable but not useful
+       SVr3 and early SVr4 curses  implementations  did  not  reject  function
+       keys;  the  SVr4.0  documentation  claimed that "special keys" (such as
+       function keys, "home" key, "clear" key, <EM>etc</EM>.) are "interpreted",  with-
+       out  giving details.  It lied.  In fact, the "character" value appended
+       to the string by those implementations was predictable but  not  useful
        (being, in fact, the low-order eight bits of the key's KEY_ value).
 
-       The functions <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present  but  not
+       The  functions  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present but not
        documented in SVr4.
 
        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM> 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
+       <EM>n</EM>  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
        "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
-       some implementations do, some do not count it:
+       some implementations count it, some do not:
 
-       <STRONG>o</STRONG>   ncurses  6.1  and PDCurses do not count the NUL in the given limit,
+       <STRONG>o</STRONG>   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
            while
 
        <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 
-       <STRONG>o</STRONG>   Solaris xcurses provides both:  its  wide-character  <STRONG>wget_nstr</STRONG>  re-
+       <STRONG>o</STRONG>   Solaris  xcurses  provides  both:  its wide-character <STRONG>wget_nstr</STRONG> re-
            serves a NUL, but its <STRONG>wgetnstr</STRONG> does not count the NUL consistently.
 
        In SVr4 curses, a negative value of <EM>n</EM> tells <STRONG>wgetnstr</STRONG> to assume that the
-       caller's buffer is large enough to hold the result, i.e., to  act  like
-       <STRONG>wgetstr</STRONG>.   X/Open  Curses does not mention this (or anything related to
-       negative or zero values of <EM>n</EM>), however  most  implementations  use  the
+       caller's  buffer  is large enough to hold the result, i.e., to act like
+       <STRONG>wgetstr</STRONG>.  X/Open Curses does not mention this (or anything  related  to
+       negative  or  zero  values  of <EM>n</EM>), however most implementations use the
        feature, with different limits:
 
-       <STRONG>o</STRONG>   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
+       <STRONG>o</STRONG>   Solaris SVr4 curses and PDCurses limit the  result  to  255  bytes.
            Other Unix systems than Solaris are likely to use the same limit.
 
        <STRONG>o</STRONG>   Solaris xcurses limits the result to <STRONG>LINE_MAX</STRONG> bytes.
 
-       <STRONG>o</STRONG>   NetBSD 7 assumes no particular limit for the result  from  <STRONG>wgetstr</STRONG>.
-           However,  it  limits  the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure that it is
+       <STRONG>o</STRONG>   NetBSD  7  assumes no particular limit for the result from <STRONG>wgetstr</STRONG>.
+           However, it limits the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure  that  it  is
            greater than zero.
 
-           A comment in NetBSD's source code states that this is specified  in
+           A  comment in NetBSD's source code states that this is specified in
            SUSv2.
 
-       <STRONG>o</STRONG>   ncurses  (before  6.2)  assumes  no particular limit for the result
-           from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
+       <STRONG>o</STRONG>   ncurses (before 6.2) assumes no particular  limit  for  the  result
+           from  <STRONG>wgetstr</STRONG>,  and  treats  the  <EM>n</EM> parameter of <STRONG>wgetnstr</STRONG> like SVr4
            curses.
 
-       <STRONG>o</STRONG>   ncurses  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
-           which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
-           <STRONG>sysconf</STRONG>  is available, ncurses uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
-           2048 byte limit).  In either case, it reserves a byte for the  ter-
+       <STRONG>o</STRONG>   ncurses 6.2 uses <STRONG>LINE_MAX</STRONG>, or  a  larger  (system-dependent)  value
+           which  the  <STRONG>sysconf</STRONG>  function  may provide.  If neither <STRONG>LINE_MAX</STRONG> or
+           <STRONG>sysconf</STRONG> is available, ncurses uses the POSIX value for <STRONG>LINE_MAX</STRONG>  (a
+           2048  byte limit).  In either case, it reserves a byte for the ter-
            minating NUL.
 
-       Although  <STRONG>getnstr</STRONG>  is equivalent to a series of calls to <STRONG>getch</STRONG>, it also
-       makes changes to the curses modes to allow simple editing of the  input
+       Although <STRONG>getnstr</STRONG> is equivalent to a series of calls to <STRONG>getch</STRONG>,  it  also
+       makes  changes to the curses modes to allow simple editing of the input
        buffer:
 
-       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG>  saves  the  current  value of the <STRONG>nl</STRONG>, <STRONG>echo</STRONG>, <STRONG>raw</STRONG> and <STRONG>cbreak</STRONG>
+       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG> saves the current value of the <STRONG>nl</STRONG>,  <STRONG>echo</STRONG>,  <STRONG>raw</STRONG>  and  <STRONG>cbreak</STRONG>
            modes, and sets <STRONG>nl</STRONG>, <STRONG>noecho</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>cbreak</STRONG>.
 
-           <STRONG>getnstr</STRONG> handles the echoing of characters, rather than  relying  on
+           <STRONG>getnstr</STRONG>  handles  the echoing of characters, rather than relying on
            the caller to set an appropriate mode.
 
-       <STRONG>o</STRONG>   It  also  obtains  the <EM>erase</EM> and <EM>kill</EM> characters from <STRONG>erasechar</STRONG> and
+       <STRONG>o</STRONG>   It also obtains the <EM>erase</EM> and <EM>kill</EM> characters  from  <STRONG>erasechar</STRONG>  and
            <STRONG>killchar</STRONG>, respectively.
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
@@ -196,7 +214,7 @@ <H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        Other implementations differ in their treatment of special characters:
 
        <STRONG>o</STRONG>   While they may set the <EM>echo</EM> mode, other implementations do not mod-
-           ify  the  <EM>raw</EM> mode, They may take the <EM>cbreak</EM> mode set by the caller
+           ify the <EM>raw</EM> mode, They may take the <EM>cbreak</EM> mode set by  the  caller
            into account when deciding whether to handle echoing within <STRONG>getnstr</STRONG>
            or as a side-effect of the <STRONG>getch</STRONG> calls.
 
@@ -204,13 +222,13 @@ <H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            accepting input for <STRONG>getnstr</STRONG>.  That may have been done to make func-
            tion- and cursor-keys work; it is not necessary with ncurses.
 
-           Since  1995, ncurses has provided signal handlers for INTR and QUIT
-           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
-           catch  a  signal  and stop the program, where other implementations
+           Since 1995, ncurses has provided signal handlers for INTR and  QUIT
+           (e.g.,  <STRONG>^C</STRONG>  or  <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> settings, those may
+           catch a signal and stop the program,  where  other  implementations
            allow one to enter those characters in the buffer.
 
        <STRONG>o</STRONG>   Starting in 2021 (ncurses 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
-           and  <STRONG>cbreak</STRONG> for better compatibility with SVr4-curses, e.g., allow-
+           and <STRONG>cbreak</STRONG> for better compatibility with SVr4-curses, e.g.,  allow-
            ing one to enter a <STRONG>^C</STRONG> into the buffer.
 
 
@@ -219,15 +237,15 @@ <H1 class="no-header">curs_getstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-07-29                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 025c55bbe..1ca7eb54d 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index f29a4adb6..d25d957d6 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 6070b8653..c993d880a 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 9567c05c1..e899194b1 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 17f0d080f..769df325e 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1107,7 +1107,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
           <STRONG>o</STRONG>   one  or  more  locations whose names are configured and compiled
               into the ncurses library, i.e.,
 
-             <STRONG>o</STRONG>   no  default  value  (corresponding   to   the   TERMINFO_DIRS
+             <STRONG>o</STRONG>   /usr/share/terminfo  (corresponding  to   the   TERMINFO_DIRS
                  variable)
 
              <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the TERMINFO variable)
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 4ffbaed6a..10c591f99 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index b1b1a4651..9ad908ed5 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 51b378aec..0ce2b742f 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 7376ce679..12f49c4a2 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.119 2023/07/15 19:34:31 tom Exp @
+  * @Id: terminfo.tail,v 1.120 2023/07/15 19:46:56 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1339,7 +1339,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   Finally, <STRONG>ncurses</STRONG> searches these compiled-in locations:
 
-           <STRONG>o</STRONG>   a list of directories (no default value), and
+           <STRONG>o</STRONG>   a list of directories (/usr/share/terminfo), and
 
            <STRONG>o</STRONG>   the  system  terminfo   directory,   <EM>/usr/share/terminfo</EM>   (the
                compiled-in default).
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index ba2477e82..4998a866c 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -101,7 +101,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        <STRONG>o</STRONG>   directories listed in the TERMINFO_DIRS environment variable,
 
-       <STRONG>o</STRONG>   a compiled-in list of directories (no default value), and
+       <STRONG>o</STRONG>   a compiled-in list of directories (/usr/share/terminfo), and
 
        <STRONG>o</STRONG>   the system terminfo database (<EM>/usr/share/terminfo</EM>).
 
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index b0654826b..85a3956ae 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 4229f9b39..d48da4c19 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index d47008558..0e4ec7e13 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230715).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
 
 
 
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 2ccf068ad..9edc42420 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.27 2022/02/12 20:07:29 tom Exp $
-.TH curs_get_wstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.29 2023/07/29 16:52:52 tom Exp $
+.TH curs_get_wstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -71,53 +71,48 @@
 \fBint mvwgetn_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
 .fi
 .SH DESCRIPTION
-The effect of
-\fBget_wstr\fP
-is as though a series of calls
-to
-\fBget_wch\fP(3X)
-were made, until a newline, other end-of-line,
-or end-of-file condition is processed.
+The function
+\fBwgetn_wstr\fP
+is equivalent to a series of calls to
+\fBwget_wch\fP(3X)
+until a newline or carriage return terminates the series:
+.bP
+The terminating character is not included in the returned string.
+.bP
 An end-of-file condition is represented by \fBWEOF\fP,
 as defined in \fB<wchar.h>\fP.
-The newline and end-of-line conditions are represented
-by the \fB\\n\fP \fBwchar_t\fP value.
-In all instances, the end of the string is terminated by a null \fBwchar_t\fP.
-The routine places resulting values in the area pointed to by \fIwstr\fP.
+.bP
+In all instances, the end of the string is terminated
+by a null \fBwchar_t\fP.
+.bP
+The function stores the result in the area pointed to
+by the \fIwstr\fP parameter.
+.bP
+The function reads at most \fIn\fP characters,
+thus preventing a possible overflow of the input buffer.
+.IP
+Any attempt to enter more characters
+(other than the terminating newline or carriage return)
+causes a beep.
+.IP
+Function keys also cause a beep and are ignored.
 .PP
-The user's erase and kill characters are interpreted.
-If keypad
-mode is on for the window, \fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
-are both considered equivalent to the user's kill character.
+The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+.bP
+The \fIerase\fP character (e.g., \fB^H\fP) erases the character
+at the end of the buffer, moving the cursor to the left.
+.IP
+If \fIkeypad\fP mode is on for the window,
+\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
+are both considered equivalent to the user's \fIerase\fP character.
+.bP
+The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
+leaving the cursor at the beginning of the buffer.
 .PP
 Characters input are echoed only if \fBecho\fP is currently on.
 In that case,
-backspace is echoed as deletion of the previous character (typically a left
-motion).
-.PP
-The effect of
-\fBwget_wstr\fP
-is as though a series of
-calls to
-\fBwget_wch\fP
-were made.
-.PP
-The effect of
-\fBmvget_wstr\fP
-is as though a call to
-\fBmove\fP
-and then a series of calls to
-\fBget_wch\fP
-were
-made.
-.PP
-The effect of
-\fBmvwget_wstr\fP
-is as though a call to
-\fBwmove\fP
-and then a series of calls to
-\fBwget_wch\fP
-were made.
+backspace is echoed as deletion of the previous character
+(typically a left motion).
 .PP
 The
 \fBgetn_wstr\fP,
@@ -138,6 +133,10 @@ versions read at most
 characters, letting the application prevent overflow of the
 input buffer.
 .SH NOTES
+Any of these functions other than
+\fBwgetn_wstr\fP
+may be macros.
+.PP
 Using
 \fBget_wstr\fP,
 \fBmvget_wstr\fP,
@@ -152,22 +151,28 @@ The use of
 \fBgetn_wstr\fP,
 \fBmvgetn_wstr\fP,
 \fBmvwgetn_wstr\fP, or
-\fBwgetn_wstr\fP, respectively, is recommended.
+\fBwgetn_wstr\fP,
+respectively, is recommended.
 .PP
 These functions cannot return \fBKEY_\fP values because there
 is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
-.PP
-All of these routines except \fBwgetn_wstr\fP may be macros.
+may be macros.
 .SH RETURN VALUE
-All of these functions return \fBOK\fP upon successful completion.
-Otherwise, they return \fBERR\fP.
+All of these functions return the integer \fBOK\fP upon successful completion.
+If unsuccessful, they return \fBERR\fP.
 .PP
-Functions using a window parameter return an error if it is null.
-.RS
-.TP 5
-\fBwgetn_wstr\fP
-returns an error if the associated call to \fBwget_wch\fP failed.
-.RE
+X/Open defines no error conditions.
+.PP
+In this implementation,
+these functions return an error
+.bP
+if the window pointer is null, or
+.bP
+if its timeout expires without having any data.
+.bP
+if the associated call to
+\fBwget_wch\fP
+failed.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
@@ -175,6 +180,7 @@ or if the window pointer is null.
 .SH PORTABILITY
 These functions are described in The Single Unix Specification, Version 2.
 No error conditions are defined.
+.PP
 This implementation returns \fBERR\fP if the window pointer is null,
 or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
 In the latter case,
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 948f1db34..4901a0255 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
-.TH curs_getstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.41 2023/07/29 16:32:52 tom Exp $
+.TH curs_getstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -69,27 +69,28 @@
 .br
 \fBint mvwgetnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
 .SH DESCRIPTION
-The function \fBgetstr\fP is equivalent to a series of calls to \fBgetch\fP,
-until a newline or carriage return is received (the terminating character is
-not included in the returned string).
-.\" X/Open says also until EOf
-.\" X/Open says then an EOS is added to the result
-.\" X/Open doesn't mention n<0
-The resulting value is placed in the
-area pointed to by the character pointer \fIstr\fP,
-followed by a NUL.
-.PP
-The \fBgetnstr\fP function reads
-from the \fIstdscr\fP default window.
-The other functions, such as \fBwgetnstr\fP,
-read from the window given as a parameter.
-.PP
-\fBgetnstr\fP reads at most \fIn\fP characters, thus preventing a possible
-overflow of the input buffer.
-Any attempt to enter more characters (other
-than the terminating newline or carriage return) causes a beep.
-Function
-keys also cause a beep and are ignored.
+The function
+\fBwgetnstr\fP
+is equivalent to a series of calls to
+\fBwgetch\fP(3X),
+until a newline or carriage return terminates the series:
+.bP
+The terminating character is not included in the returned string.
+.bP
+In all instances, the end of the string is terminated
+by a NUL.
+.bP
+The function stores the result in the area pointed to
+by the \fIstr\fP parameter.
+.bP
+The function reads at most \fIn\fP characters,
+thus preventing a possible overflow of the input buffer.
+.IP
+Any attempt to enter more characters
+(other than the terminating newline or carriage return)
+causes a beep.
+.IP
+Function keys also cause a beep and are ignored.
 .PP
 The user's \fIerase\fP and \fIkill\fP characters are interpreted:
 .bP
@@ -98,26 +99,72 @@ at the end of the buffer, moving the cursor to the left.
 .IP
 If \fIkeypad\fP mode is on for the window,
 \fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
-are both considered equivalent to the user's erase character.
+are both considered equivalent to the user's \fIerase\fP character.
 .bP
 The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
 leaving the cursor at the beginning of the buffer.
 .PP
 Characters input are echoed only if \fBecho\fP is currently on.
 In that case,
-backspace is echoed as deletion of the previous character (typically a left
-motion).
+backspace is echoed as deletion of the previous character
+(typically a left motion).
+.PP
+The
+\fBgetnstr\fP,
+\fBmvgetnstr\fP,
+\fBmvwgetnstr\fP, and
+\fBwgetnstr\fP
+functions are identical
+to the
+\fBgetstr\fP,
+\fBmvgetstr\fP,
+\fBmvwgetstr\fP, and
+\fBwgetstr\fP
+functions, respectively,
+except that the
+\fB*n*\fP
+versions read at most
+\fIn\fP
+characters, letting the application prevent overflow of the
+input buffer.
+.SH NOTES
+Any of these functions other than
+\fBwgetnstr\fP
+may be macros.
+.PP
+Using
+\fBgetstr\fP,
+\fBmvgetstr\fP,
+\fBmvwgetstr\fP, or
+\fBwgetstr\fP
+to read a line that
+overflows the array pointed to by
+\fBstr\fP
+causes undefined
+results.
+The use of
+\fBgetnstr\fP,
+\fBmvgetnstr\fP,
+\fBmvwgetnstr\fP, or
+\fBwgetnstr\fP,
+respectively, is recommended.
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
-specifies only \*(``an integer value other than \fBERR\fP\*('') upon successful
-completion.
+All of these functions return the integer \fBOK\fP upon successful completion.
+(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
+If unsuccessful, they return \fBERR\fP.
 .PP
 X/Open defines no error conditions.
 .PP
 In this implementation,
 these functions return an error
+.bP
 if the window pointer is null, or
+.bP
 if its timeout expires without having any data.
+.bP
+if the associated call to
+\fBwgetch\fP
+failed.
 .PP
 This implementation provides an extension as well.
 If a \fBSIGWINCH\fP interrupts the function, it will return \fBKEY_RESIZE\fP
@@ -126,12 +173,10 @@ rather than \fBOK\fP or \fBERR\fP.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
-.SH NOTES
-Note that \fBgetstr\fP, \fBmvgetstr\fP, and \fBmvwgetstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-They read single-byte characters only.
-The standard does not define any error conditions.
+These functions are described in The Single Unix Specification, Version 2.
+No error conditions are defined.
+.PP
 This implementation returns \fBERR\fP if the window pointer is null,
 or if the lower-level \fBwgetch\fP(3X) call returns an \fBERR\fP.
 .PP
@@ -156,7 +201,7 @@ but did not state whether the terminating NUL is counted in that limit.
 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:
+As of 2018, some implementations count it, some do not:
 .bP
 ncurses 6.1 and PDCurses do not count the NUL in the given limit, while
 .bP
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 006099f81..455edb3b2 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.23 2023/07/15 18:43:48 tom Exp $
+# $Id: manhtml.aliases,v 1.24 2023/07/29 16:47:09 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -74,6 +74,7 @@ vidputs(3X)		curs_terminfo(3X)
 wadd_wch(3X)		curs_add_wch(3X)
 waddch(3X)		curs_addch(3X)
 wbkgdset(3X)		curs_bkgd(3X)
+wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
 wrefresh(3X)		curs_refresh(3X)
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index cdc6726c6..ed93378c6 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.219 2023/06/24 13:25:14 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.221 2023/07/22 20:13:04 tom Exp $")
 
 /****************************************************************************
  *
@@ -763,10 +763,14 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
 #ifdef USE_TERM_DRIVER
 	INIT_TERM_DRIVER();
+	/*
+	 * _nc_get_driver() will call td_CanHandle() for each driver, and win_driver
+	 * needs file descriptor to do the test, so set it before calling.
+	 */
+	termp->Filedes = (short) Filedes;
 	TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 	code = _nc_globals.term_driver(TCB, myname, errret);
 	if (code == OK) {
-	    termp->Filedes = (short) Filedes;
 	    termp->_termname = strdup(myname);
 	} else {
 	    ret_error1(errret ? *errret : TGETENT_ERR,
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 59da0e860..d55bab7d0 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.71 2023/07/08 19:53:51 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.72 2023/07/22 20:13:04 Pavel.Fedin Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -126,7 +126,6 @@ static struct {
     BOOL buffered;
     BOOL window_only;
     BOOL progMode;
-    BOOL isMinTTY;
     BOOL isTermInfoConsole;
     HANDLE out;
     HANDLE inp;
@@ -613,6 +612,12 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
     returnCode(result);
 }
 
+#ifdef __MING32__
+#define SysISATTY(fd) _isatty(fd)
+#else
+#define SysISATTY(fd) isatty(fd)
+#endif
+
 static bool
 wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 	       const char *tname,
@@ -644,6 +649,8 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 	}
     } else if (tname != 0 && stricmp(tname, "unknown") == 0) {
 	code = TRUE;
+    } else if (SysISATTY(TCB->term.Filedes)) {
+	code = TRUE;
     }
 
     /*
@@ -1960,11 +1967,6 @@ _nc_mingw_isatty(int fd)
 {
     int result = 0;
 
-#ifdef __MING32__
-#define SysISATTY(fd) _isatty(fd)
-#else
-#define SysISATTY(fd) isatty(fd)
-#endif
     if (SysISATTY(fd)) {
 	result = 1;
     } else {
@@ -2180,9 +2182,6 @@ InitConsole(void)
 	BOOL b;
 
 	START_TRACE();
-	if (_nc_mingw_isatty(0)) {
-	    CON.isMinTTY = TRUE;
-	}
 
 	for (i = 0; i < (N_INI + FKEYS); i++) {
 	    if (i < N_INI) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6ce2f33f3..9de25e071 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230722) unstable; urgency=low
+ncurses6 (6.4+20230729) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6ce2f33f3..9de25e071 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230722) unstable; urgency=low
+ncurses6 (6.4+20230729) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 941fa190f..ff7295011 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230722) unstable; urgency=low
+ncurses6 (6.4+20230729) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2023 06:11:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e66f9258a..3b3e0bf43 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.596 2023/07/22 10:11:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.597 2023/07/29 10:00:25 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0722"
+!define VERSION_MMDD  "0729"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e135ed99c..686afd263 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230722
+Release: 20230729
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f283995e1..591f803eb 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230722
+Release: 20230729
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 8f6cb4009..c900da854 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230722
+Release: 20230729
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From a77ee85d30464b40fa99e62598ac90c48a2c81a5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 6 Aug 2023 02:30:20 +0200
Subject: [PATCH 023/106] ncurses-6.4-20230805.patch

---
 NEWS                                  |  7 ++++++-
 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_add_wch.3x.html     |  9 ++++----
 doc/html/man/curs_get_wstr.3x.html    | 12 +++++------
 doc/html/man/curs_getstr.3x.html      | 12 +++++------
 doc/html/man/curs_terminfo.3x.html    |  9 ++++----
 doc/html/man/curs_threads.3x.html     |  9 ++++----
 doc/html/man/curs_util.3x.html        | 16 +++++++-------
 doc/html/man/form.3x.html             |  2 +-
 doc/html/man/form_driver.3x.html      |  9 ++++----
 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 +-
 doc/html/man/user_caps.5.html         |  3 ++-
 include/curses.tail                   | 14 ++++++-------
 man/curs_add_wch.3x                   |  5 +++--
 man/curs_get_wstr.3x                  |  8 +++----
 man/curs_getstr.3x                    |  8 +++----
 man/curs_terminfo.3x                  |  5 +++--
 man/curs_threads.3x                   |  5 +++--
 man/curs_util.3x                      | 16 +++++++-------
 man/form_driver.3x                    |  5 +++--
 man/user_caps.5                       |  5 +++--
 ncurses/tinfo/lib_win32con.c          | 30 +++++++--------------------
 ncurses/win32con/win_driver.c         | 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.spec                  |  2 +-
 package/ncursest.spec                 |  2 +-
 45 files changed, 133 insertions(+), 128 deletions(-)

diff --git a/NEWS b/NEWS
index 84d5c41dc..c44cc39b1 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3981 2023/07/29 16:35:02 tom Exp $
+-- $Id: NEWS,v 1.3984 2023/08/06 00:01:18 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230805
+	+ fix a few manpages needing tbl marker, seen by lintian warning.
+	+ fixes for compiler-warnings.
+	+ minor grammatical fix for manpages (Branden Robinson).
+
 20230729
 	+ improve manpages for wgetnstr() and wget_wnstr().
 	+ modify MinGW configuration to provide for running in MSYS/MSYS2
diff --git a/VERSION b/VERSION
index bc3b6d018..e37bff00f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230729
+5:0:10	6.4	20230805
diff --git a/dist.mk b/dist.mk
index 3db7d42b5..917239bd7 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1557 2023/07/29 10:00:25 tom Exp $
+# $Id: dist.mk,v 1.1558 2023/08/05 09:51:18 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230729
+NCURSES_PATCH = 20230805
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 257ebb88b..a5eb91761 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fdf1acc2d..4c9032c2c 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 07166e614..67fb5da5e 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 36cfcef90..bc213e872 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2019-2021,2023 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.37 2023/07/15 16:45:14 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.38 2023/08/06 00:03:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -320,7 +321,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-15                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 9bf39184a..ae0fe1fe4 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.29 2023/07/29 16:52:52 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -130,9 +130,9 @@ <H1 class="no-header">curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 
        In this implementation, these functions return an error
 
-       <STRONG>o</STRONG>   if the window pointer is null, or
+       <STRONG>o</STRONG>   if the window pointer is null,
 
-       <STRONG>o</STRONG>   if its timeout expires without having any data.
+       <STRONG>o</STRONG>   if its timeout expires without having any data, or
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wget_wch</STRONG> failed.
 
@@ -186,7 +186,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-29                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 32d1a2f49..01c347fbd 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.41 2023/07/29 16:32:52 tom Exp @
+  * @Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -123,9 +123,9 @@ <H1 class="no-header">curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 
        In this implementation, these functions return an error
 
-       <STRONG>o</STRONG>   if the window pointer is null, or
+       <STRONG>o</STRONG>   if the window pointer is null,
 
-       <STRONG>o</STRONG>   if its timeout expires without having any data.
+       <STRONG>o</STRONG>   if its timeout expires without having any data, or
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wgetch</STRONG> failed.
 
@@ -237,7 +237,7 @@ <H1 class="no-header">curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-29                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 56d6aad17..c7485aead 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.93 2023/07/01 15:33:35 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.94 2023/08/06 00:03:04 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -43,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -688,7 +689,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 79cd77fb9..94485c358 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2021-2022,2023 Thomas E. Dickey                                *
   * Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.35 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_threads.3x,v 1.36 2023/08/06 00:02:33 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -36,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -608,7 +609,7 @@ <H1 class="no-header">curs_threads 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 6fdfed3fd..362169c2a 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.71 2023/07/15 18:01:08 tom Exp @
+  * @Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -63,10 +63,8 @@ <H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <EM>w</EM><STRONG>);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
-       <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>use_env(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>putwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*getwin(FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
@@ -74,6 +72,10 @@ <H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>delay_output(int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flushinp(void);</STRONG>
 
+       /* extensions */
+       <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
+       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
@@ -359,7 +361,7 @@ <H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
        If <STRONG>ncurses</STRONG> is configured to provide  the  sp-functions  extension,  the
        state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
        <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
-       <STRONG>use_env</STRONG> is not provided by other implementation of curses.
+       <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -369,7 +371,7 @@ <H1 class="no-header">curs_util 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-15                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 1ca7eb54d..6c7df9ef6 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 6b7ceb397..678ade6f6 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.43 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_driver.3x,v 1.44 2023/08/06 00:02:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -279,7 +280,7 @@ <H1 class="no-header">form_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-08-05                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index d25d957d6..539345650 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index c993d880a..9890ab45d 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index e899194b1..00d879b83 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 769df325e..f5bc89b4d 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 10c591f99..1a3ce1dbb 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 9ad908ed5..9914722f9 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 0ce2b742f..59311170a 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 12f49c4a2..28e7be775 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 4998a866c..75446361e 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 85a3956ae..f0ac62924 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index d48da4c19..e7a78cd0a 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 0e4ec7e13..1b1a6d63b 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230729).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 5ec68523e..a939b949d 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
@@ -27,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.27 2023/07/01 15:46:10 tom Exp @
+  * @Id: user_caps.5,v 1.28 2023/08/06 00:00:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/include/curses.tail b/include/curses.tail
index 11514498d..9c9135656 100644
--- a/include/curses.tail
+++ b/include/curses.tail
@@ -1,4 +1,4 @@
-/* $Id: curses.tail,v 1.26 2021/03/20 15:49:25 tom Exp $ */
+/* $Id: curses.tail,v 1.27 2023/08/05 19:43:46 tom Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
@@ -13,12 +13,12 @@
 #define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
 #endif
 
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
+#define	NCURSES_BUTTON_RELEASED	001UL
+#define	NCURSES_BUTTON_PRESSED	002UL
+#define	NCURSES_BUTTON_CLICKED	004UL
+#define	NCURSES_DOUBLE_CLICKED	010UL
+#define	NCURSES_TRIPLE_CLICKED	020UL
+#define	NCURSES_RESERVED_EVENT	040UL
 
 /* event masks */
 #define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index c729c7926..f97ae53b3 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.37 2023/07/15 16:45:14 tom Exp $
-.TH curs_add_wch 3X 2023-07-15 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.38 2023/08/06 00:03:38 tom Exp $
+.TH curs_add_wch 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 9edc42420..2d632522a 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.29 2023/07/29 16:52:52 tom Exp $
-.TH curs_get_wstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp $
+.TH curs_get_wstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -166,9 +166,9 @@ X/Open defines no error conditions.
 In this implementation,
 these functions return an error
 .bP
-if the window pointer is null, or
+if the window pointer is null,
 .bP
-if its timeout expires without having any data.
+if its timeout expires without having any data, or
 .bP
 if the associated call to
 \fBwget_wch\fP
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 4901a0255..b66480330 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.41 2023/07/29 16:32:52 tom Exp $
-.TH curs_getstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp $
+.TH curs_getstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -158,9 +158,9 @@ X/Open defines no error conditions.
 In this implementation,
 these functions return an error
 .bP
-if the window pointer is null, or
+if the window pointer is null,
 .bP
-if its timeout expires without having any data.
+if its timeout expires without having any data, or
 .bP
 if the associated call to
 \fBwgetch\fP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 4f89b20b7..3c3fcdba4 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.93 2023/07/01 15:33:35 tom Exp $
-.TH curs_terminfo 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.94 2023/08/06 00:03:04 tom Exp $
+.TH curs_terminfo 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index bd8a5c967..86f7c236c 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2021-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.35 2023/07/01 15:43:20 tom Exp $
-.TH curs_threads 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.36 2023/08/06 00:02:33 tom Exp $
+.TH curs_threads 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_util.3x b/man/curs_util.3x
index ba75fe91d..12372dd2b 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.71 2023/07/15 18:01:08 tom Exp $
-.TH curs_util 3X 2023-07-15 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp $
+.TH curs_util 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -67,12 +67,8 @@
 \fBconst char *key_name(wchar_t \fIw\fB);\fR
 .sp
 \fBvoid filter(void);\fP
-.br
-\fBvoid nofilter(void);\fP
 .sp
 \fBvoid use_env(bool \fIf\fB);\fR
-.br
-\fBvoid use_tioctl(bool \fIf\fB);\fR
 .sp
 \fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
 .br
@@ -81,6 +77,12 @@
 \fBint delay_output(int \fIms\fB);\fR
 .br
 \fBint flushinp(void);\fP
+.sp
+/* extensions */
+.br
+\fBvoid nofilter(void);\fP
+.br
+\fBvoid use_tioctl(bool \fIf\fB);\fR
 .SH DESCRIPTION
 .SS unctrl
 The \fBunctrl\fP routine returns a character string which is a printable
@@ -394,7 +396,7 @@ 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\fP(3X)).
 This feature of \fBuse_env\fP
-is not provided by other implementation of curses.
+is not provided by other implementations of curses.
 .SH SEE ALSO
 \fBcurses\fP(3X),
 \fBcurs_initscr\fP(3X),
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 3863387c0..bf801c3c1 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.43 2023/07/01 15:46:10 tom Exp $
-.TH form_driver 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.44 2023/08/06 00:02:02 tom Exp $
+.TH form_driver 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/user_caps.5 b/man/user_caps.5
index 1c8ae3686..6430ac40b 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.27 2023/07/01 15:46:10 tom Exp $
-.TH user_caps 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.29 2023/08/06 00:00:22 tom Exp $
+.TH user_caps 5 2023-08-05 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index 49b6cd6a0..2d6857aeb 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -38,7 +38,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.14 2023/08/05 20:44:38 tom Exp $")
 
 #ifdef _NC_WINDOWS
 
@@ -58,19 +58,7 @@ MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $")
 #define read_screen  ReadConsoleOutput
 #endif
 
-static BOOL IsConsoleHandle(HANDLE hdl);
-static bool save_original_screen(void);
-static bool restore_original_screen(void) GCC_UNUSED;
 static bool read_screen_data(void);
-static int Adjust(int milliseconds, int diff);
-static int decode_mouse(SCREEN *sp, int mask);
-static bool handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer);
-static int rkeycompare(const void *el1, const void *el2);
-static int keycompare(const void *el1, const void *el2);
-static int MapKey(WORD vKey);
-static int AnsiKey(WORD vKey);
-
-static ULONGLONG tdiff(FILETIME fstart, FILETIME fend);
 
 #define GenMap(vKey,key) MAKELONG(key, vKey)
 static const LONG keylist[] =
@@ -416,6 +404,7 @@ save_original_screen(void)
     return result;
 }
 
+#if 0
 static bool
 restore_original_screen(void)
 {
@@ -450,6 +439,7 @@ restore_original_screen(void)
     }
     return result;
 }
+#endif
 
 static bool
 read_screen_data(void)
@@ -641,10 +631,10 @@ Adjust(int milliseconds, int diff)
                      FROM_LEFT_4TH_BUTTON_PRESSED | \
                      RIGHTMOST_BUTTON_PRESSED)
 
-static int
+static mmask_t
 decode_mouse(SCREEN *sp, int mask)
 {
-    int result = 0;
+    mmask_t result = 0;
 
     (void) sp;
     assert(sp && console_initialized);
@@ -699,15 +689,11 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer)
 	memset(&work, 0, sizeof(work));
 
 	if (sp->_drv_mouse_new_buttons) {
-	    work.bstate |=
-		(mmask_t) decode_mouse(sp,
-				       sp->_drv_mouse_new_buttons);
+	    work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons);
 	} else {
 	    /* cf: BUTTON_PRESSED, BUTTON_RELEASED */
-	    work.bstate |=
-		(mmask_t) (decode_mouse(sp,
-					sp->_drv_mouse_old_buttons)
-			   >> 1);
+	    work.bstate |= (decode_mouse(sp, sp->_drv_mouse_old_buttons)
+			    >> 1);
 	    result = TRUE;
 	}
 
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index d55bab7d0..2945d8dc1 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.72 2023/07/22 20:13:04 Pavel.Fedin Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.73 2023/08/05 19:02:24 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -1486,10 +1486,10 @@ Adjust(int milliseconds, int diff)
 		     FROM_LEFT_4TH_BUTTON_PRESSED | \
 		     RIGHTMOST_BUTTON_PRESSED)
 
-static int
+static mmask_t
 decode_mouse(SCREEN *sp, int mask)
 {
-    int result = 0;
+    mmask_t result = 0;
 
     (void) sp;
     assert(sp && console_initialized);
@@ -1678,14 +1678,14 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer)
 
 	if (sp->_drv_mouse_new_buttons) {
 
-	    work.bstate |= (mmask_t) decode_mouse(sp, sp->_drv_mouse_new_buttons);
+	    work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons);
 
 	} else {
 
 	    /* cf: BUTTON_PRESSED, BUTTON_RELEASED */
-	    work.bstate |= (mmask_t) (decode_mouse(sp,
-						   sp->_drv_mouse_old_buttons)
-				      >> 1);
+	    work.bstate |= (decode_mouse(sp,
+					 sp->_drv_mouse_old_buttons)
+			    >> 1);
 
 	    result = TRUE;
 	}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9de25e071..65c9e2063 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9de25e071..65c9e2063 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ff7295011..648b9270d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3b3e0bf43..d14a38512 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.597 2023/07/29 10:00:25 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.598 2023/08/05 09:51:18 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0729"
+!define VERSION_MMDD  "0805"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 686afd263..276785390 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 591f803eb..2d0571c3e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c900da854..ecc8372d0 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From a2b08d03931e34d71846202e59a87d96e0cfe3c8 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 13 Aug 2023 00:32:09 +0200
Subject: [PATCH 024/106] ncurses-6.4-20230812.patch

---
 NEWS                                  |   8 +-
 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_bkgrnd.3x.html      |   8 +-
 doc/html/man/curs_inopts.3x.html      | 240 +++++++++++++++-----------
 doc/html/man/curs_sp_funcs.3x.html    |  34 ++--
 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          |  24 +--
 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 +-
 doc/html/man/user_caps.5.html         |   8 +-
 include/curses.h.in                   |  22 ++-
 man/curs_bkgrnd.3x                    |   6 +-
 man/curs_inopts.3x                    |  65 +++++--
 man/curs_sp_funcs.3x                  | 150 +++-------------
 man/ncurses.3x                        |   8 +-
 misc/terminfo.src                     |  25 ++-
 ncurses/llib-lncurses                 |  40 ++++-
 ncurses/llib-lncursest                |  40 ++++-
 ncurses/llib-lncursestw               |  40 ++++-
 ncurses/llib-lncursesw                |  40 ++++-
 ncurses/llib-ltic                     |   4 +-
 ncurses/llib-ltict                    |   4 +-
 ncurses/llib-ltictw                   |   4 +-
 ncurses/llib-lticw                    |   4 +-
 ncurses/llib-ltinfo                   |  38 +++-
 ncurses/llib-ltinfot                  |  38 +++-
 ncurses/llib-ltinfotw                 |  38 +++-
 ncurses/llib-ltinfow                  |  38 +++-
 ncurses/tinfo/lib_raw.c               |  43 ++++-
 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                   |  10 +-
 package/ncurses.spec                  |   2 +-
 package/ncurses.sym                   |  10 +-
 package/ncursest.map                  |  10 +-
 package/ncursest.spec                 |   2 +-
 package/ncursest.sym                  |  10 +-
 package/ncursestw.map                 |  10 +-
 package/ncursestw.sym                 |  10 +-
 package/ncursesw.map                  |  10 +-
 package/ncursesw.sym                  |  10 +-
 test/README                           |  12 +-
 58 files changed, 771 insertions(+), 348 deletions(-)

diff --git a/NEWS b/NEWS
index c44cc39b1..0038b2810 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3984 2023/08/06 00:01:18 tom Exp $
+-- $Id: NEWS,v 1.3986 2023/08/12 20:24:29 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230812
+	+ add/use putty+cursor to reflect amending of modified cursor-keys in
+	  2021 -TD
+	+ add ecma+strikeout to putty -TD
+	+ add functions to query tty-flags in SCREEN (request by Bill Gray).
+
 20230805
 	+ fix a few manpages needing tbl marker, seen by lintian warning.
 	+ fixes for compiler-warnings.
diff --git a/VERSION b/VERSION
index e37bff00f..0c3ff9b17 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230805
+5:0:10	6.4	20230812
diff --git a/dist.mk b/dist.mk
index 917239bd7..129f5b8f0 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1558 2023/08/05 09:51:18 tom Exp $
+# $Id: dist.mk,v 1.1559 2023/08/12 10:51:56 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230805
+NCURSES_PATCH = 20230812
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index a5eb91761..cb8bcf062 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 4c9032c2c..9e479f925 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 67fb5da5e..c0f48fc45 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 9dd36c1cd..1a494d0f8 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.20 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.21 2023/08/12 18:31:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-08-12                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 9d8af235e..36c0e8101 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_inopts.3x,v 1.42 2023/08/12 17:07:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -47,9 +48,10 @@ <H1 class="no-header">curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>cbreak</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>keypad</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>,
-       <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>notimeout</STRONG>, <STRONG>raw</STRONG>, <STRONG>noraw</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>timeout</STRONG>,
-       <STRONG>wtimeout</STRONG>, <STRONG>typeahead</STRONG> - <STRONG>curses</STRONG> input options
+       <STRONG>cbreak</STRONG>, <STRONG>echo</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>is_cbreak</STRONG>, <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, <STRONG>is_raw</STRONG>,
+       <STRONG>keypad</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>noecho</STRONG>, <STRONG>nonl</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>noraw</STRONG>,
+       <STRONG>notimeout</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>raw</STRONG>, <STRONG>timeout</STRONG>, <STRONG>wtimeout</STRONG>, <STRONG>typeahead</STRONG> - <STRONG>curses</STRONG> input
+       options
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -82,227 +84,258 @@ <H1 class="no-header">curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>typeahead(int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
 
+       /* extensions */
+       <STRONG>int</STRONG> <STRONG>is_cbreak(void);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_echo(void);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_nl(void);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_raw(void);</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The <STRONG>ncurses</STRONG> library provides several functions which let an application
-       change the way input from the terminal is handled.   Some  are  global,
+       change  the  way  input from the terminal is handled.  Some are global,
        applying to all windows.  Others apply only to a specific window.  Win-
-       dow-specific settings are not automatically applied to new  or  derived
-       windows.   An  application must apply these to each window, if the same
+       dow-specific  settings  are not automatically applied to new or derived
+       windows.  An application must apply these to each window, if  the  same
        behavior is needed.
 
 
 </PRE><H3><a name="h3-cbreak_nocbreak">cbreak/nocbreak</a></H3><PRE>
-       Normally, the tty driver buffers typed characters until  a  newline  or
-       carriage  return  is typed.  The <STRONG>cbreak</STRONG> routine disables line buffering
+       Normally,  the  tty  driver buffers typed characters until a newline or
+       carriage return is typed.  The <STRONG>cbreak</STRONG> routine disables  line  buffering
        and erase/kill character-processing (interrupt and flow control charac-
-       ters  are  unaffected), making characters typed by the user immediately
+       ters are unaffected), making characters typed by the  user  immediately
        available to the program.  The <STRONG>nocbreak</STRONG> routine returns the terminal to
        normal (cooked) mode.
 
        Initially the terminal may or may not be in <STRONG>cbreak</STRONG> mode, as the mode is
-       inherited; therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG>  explic-
-       itly.   Most  interactive  programs  using  <STRONG>curses</STRONG> set the <STRONG>cbreak</STRONG> mode.
-       Note that <STRONG>cbreak</STRONG> overrides <STRONG>raw</STRONG>.  [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for  a  discussion
+       inherited;  therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explic-
+       itly.  Most interactive programs using  <STRONG>curses</STRONG>  set  the  <STRONG>cbreak</STRONG>  mode.
+       Note  that  <STRONG>cbreak</STRONG> overrides <STRONG>raw</STRONG>.  [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion
        of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
 
 
 </PRE><H3><a name="h3-echo_noecho">echo/noecho</a></H3><PRE>
-       The  <STRONG>echo</STRONG>  and  <STRONG>noecho</STRONG> routines control whether characters typed by the
-       user are echoed by <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG> as they are typed.   Echoing  by  the  tty
-       driver  is  always  disabled,  but  initially <STRONG>getch</STRONG> is in echo mode, so
+       The <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> routines control whether characters  typed  by  the
+       user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG> as they are typed.  Echoing by the tty
+       driver is always disabled, but initially <STRONG>getch</STRONG>  is  in  echo  mode,  so
        characters typed are echoed.  Authors of most interactive programs pre-
-       fer  to do their own echoing in a controlled area of the screen, or not
-       to echo at all, so  they  disable  echoing  by  calling  <STRONG>noecho</STRONG>.   [See
-       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>  for  a  discussion  of how these routines interact with
+       fer to do their own echoing in a controlled area of the screen, or  not
+       to  echo  at  all,  so  they  disable  echoing by calling <STRONG>noecho</STRONG>.  [See
+       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion of how  these  routines  interact  with
        <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.]
 
 
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
-       The <STRONG>halfdelay</STRONG> routine is used for half-delay mode, which is similar  to
+       The  <STRONG>halfdelay</STRONG> routine is used for half-delay mode, which is similar to
        <STRONG>cbreak</STRONG> mode in that characters typed by the user are immediately avail-
        able to the program.  However, after blocking for <EM>tenths</EM> tenths of sec-
-       onds,  <STRONG>ERR</STRONG>  is returned if nothing has been typed.  The value of <EM>tenths</EM>
-       must be a number between 1 and 255.  Use <STRONG>nocbreak</STRONG> to  leave  half-delay
+       onds, <STRONG>ERR</STRONG> is returned if nothing has been typed.  The value  of  <EM>tenths</EM>
+       must  be  a number between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-delay
        mode.
 
 
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
-       If  the  <STRONG>intrflush</STRONG> option is enabled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), and an interrupt key
-       is pressed on the keyboard (interrupt, break, quit), all output in  the
-       tty  driver queue will be flushed, giving the effect of faster response
-       to the interrupt, but causing <STRONG>curses</STRONG> to have the wrong idea of what  is
-       on  the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>) prevents the flush.
-       The default for the option is inherited from the tty  driver  settings.
+       If the <STRONG>intrflush</STRONG> option is enabled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), and an  interrupt  key
+       is  pressed on the keyboard (interrupt, break, quit), all output in the
+       tty driver queue will be flushed, giving the effect of faster  response
+       to  the interrupt, but causing <STRONG>curses</STRONG> to have the wrong idea of what is
+       on the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>) prevents the  flush.
+       The  default  for the option is inherited from the tty driver settings.
        The window argument is ignored.
 
 
 </PRE><H3><a name="h3-keypad">keypad</a></H3><PRE>
-       The  <STRONG>keypad</STRONG>  option  enables the keypad of the user's terminal.  If en-
+       The <STRONG>keypad</STRONG> option enables the keypad of the user's  terminal.   If  en-
        abled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the user can press a function key (such as an arrow
-       key)  and  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  returns a single value representing the function
-       key, as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>curses</STRONG> does not  treat
+       key) and <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> returns a single value  representing  the  function
+       key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>curses</STRONG> does not treat
        function keys specially and the program has to interpret the escape se-
-       quences 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 <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  is  called.
+       quences  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 <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> is called.
        The default value for keypad is <STRONG>FALSE</STRONG>.
 
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
-       Initially,  whether the terminal returns 7 or 8 significant bits on in-
+       Initially, whether the terminal returns 7 or 8 significant bits on  in-
        put depends on the control mode of the tty driver [see <STRONG>termios(3)</STRONG>].  To
-       force  8  bits  to be returned, invoke <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>); this is equiva-
+       force 8 bits to be returned, invoke <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>);  this  is  equiva-
        lent, under POSIX, to setting the CS8 flag on the terminal.  To force 7
        bits to be returned, invoke <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>); this is equivalent, under
-       POSIX, to setting the CS7 flag on the terminal.  The  window  argument,
+       POSIX,  to  setting the CS7 flag on the terminal.  The window argument,
        <EM>win</EM>, is always ignored.  If the terminfo capabilities <STRONG>smm</STRONG> (meta_on) and
-       <STRONG>rmm</STRONG> (meta_off) are defined for the terminal, <STRONG>smm</STRONG> is sent to the  termi-
-       nal  when  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>)  is  called  and <STRONG>rmm</STRONG> is sent when <STRONG>meta</STRONG>(<EM>win</EM>,
+       <STRONG>rmm</STRONG>  (meta_off) are defined for the terminal, <STRONG>smm</STRONG> is sent to the termi-
+       nal when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>) is called  and  <STRONG>rmm</STRONG>  is  sent  when  <STRONG>meta</STRONG>(<EM>win</EM>,
        <STRONG>FALSE</STRONG>) is called.
 
 
 </PRE><H3><a name="h3-nl_nonl">nl/nonl</a></H3><PRE>
-       The <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> routines control whether the underlying display  device
+       The  <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> routines control whether the underlying display device
        translates the return key into newline on input.
 
 
 </PRE><H3><a name="h3-nodelay">nodelay</a></H3><PRE>
        The <STRONG>nodelay</STRONG> option causes <STRONG>getch</STRONG> to be a non-blocking call.  If no input
-       is ready, <STRONG>getch</STRONG> returns <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is  <STRONG>FALSE</STRONG>),  <STRONG>getch</STRONG>  waits
+       is  ready,  <STRONG>getch</STRONG>  returns <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>getch</STRONG> waits
        until a key is pressed.
 
 
 </PRE><H3><a name="h3-notimeout">notimeout</a></H3><PRE>
-       When  interpreting  an  escape  sequence, <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> sets a timer while
-       waiting for the next character.  If  <STRONG>notimeout(</STRONG><EM>win</EM>,  <STRONG>TRUE</STRONG>)  is  called,
-       then  <STRONG>wgetch</STRONG>  does  not  set a timer.  The purpose of the timeout is to
-       differentiate between sequences received from a function key and  those
+       When interpreting an escape sequence, <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  sets  a  timer  while
+       waiting  for  the  next  character.  If <STRONG>notimeout(</STRONG><EM>win</EM>, <STRONG>TRUE</STRONG>) is called,
+       then <STRONG>wgetch</STRONG> does not set a timer.  The purpose of  the  timeout  is  to
+       differentiate  between sequences received from a function key and those
        typed by a user.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw/noraw</a></H3><PRE>
-       The  <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw mode.
-       Raw mode is similar to <STRONG>cbreak</STRONG> mode, in that characters typed are  imme-
-       diately  passed  through to the user program.  The differences are that
-       in raw mode, the interrupt, quit, suspend, and flow control  characters
-       are  all  passed through uninterpreted, instead of generating a signal.
-       The behavior of the BREAK key depends on other bits in the  tty  driver
+       The <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw  mode.
+       Raw  mode is similar to <STRONG>cbreak</STRONG> mode, in that characters typed are imme-
+       diately passed through to the user program.  The differences  are  that
+       in  raw mode, the interrupt, quit, suspend, and flow control characters
+       are all passed through uninterpreted, instead of generating  a  signal.
+       The  behavior  of the BREAK key depends on other bits in the tty driver
        that are not set by <STRONG>curses</STRONG>.
 
 
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush/noqiflush</a></H3><PRE>
-       When  the  <STRONG>noqiflush</STRONG>  routine is used, normal flush of input and output
-       queues associated with the <STRONG>INTR</STRONG>, <STRONG>QUIT</STRONG> and <STRONG>SUSP</STRONG> characters will  not  be
-       done  [see  <STRONG>termios(3)</STRONG>].   When  <STRONG>qiflush</STRONG>  is called, the queues will be
-       flushed when these control characters are read.  You may want  to  call
-       <STRONG>noqiflush</STRONG>  in a signal handler if you want output to continue as though
+       When the <STRONG>noqiflush</STRONG> routine is used, normal flush of  input  and  output
+       queues  associated  with the <STRONG>INTR</STRONG>, <STRONG>QUIT</STRONG> and <STRONG>SUSP</STRONG> characters will not be
+       done [see <STRONG>termios(3)</STRONG>].  When <STRONG>qiflush</STRONG> is  called,  the  queues  will  be
+       flushed  when  these control characters are read.  You may want to call
+       <STRONG>noqiflush</STRONG> in a signal handler if you want output to continue as  though
        the interrupt had not occurred, after the handler exits.
 
 
 </PRE><H3><a name="h3-timeout_wtimeout">timeout/wtimeout</a></H3><PRE>
        The <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> routines set blocking or non-blocking read for
-       a  given  window.   If  <EM>delay</EM> is negative, blocking read is used (i.e.,
-       waits indefinitely for input).  If <EM>delay</EM>  is  zero,  then  non-blocking
+       a given window.  If <EM>delay</EM> is negative, blocking  read  is  used  (i.e.,
+       waits  indefinitely  for  input).   If <EM>delay</EM> is zero, then non-blocking
        read is used (i.e., read returns <STRONG>ERR</STRONG> if no input is waiting).  If <EM>delay</EM>
-       is positive, then read blocks for <EM>delay</EM> milliseconds, and  returns  <STRONG>ERR</STRONG>
-       if  there  is  still  no input.  Hence, these routines provide the same
-       functionality as <STRONG>nodelay</STRONG>, plus the additional capability of being  able
+       is  positive,  then read blocks for <EM>delay</EM> milliseconds, and returns <STRONG>ERR</STRONG>
+       if there is still no input.  Hence, these  routines  provide  the  same
+       functionality  as <STRONG>nodelay</STRONG>, plus the additional capability of being able
        to block for only <EM>delay</EM> milliseconds (where <EM>delay</EM> is positive).
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
        The <STRONG>curses</STRONG> library does "line-breakout optimization" by looking for ty-
        peahead periodically while updating the screen.  If input is found, and
-       it  is  coming  from  a  tty, the current update is postponed until <STRONG>re-</STRONG>
-       <STRONG><A HREF="refresh.3x.html">fresh(3x)</A></STRONG> or <STRONG>doupdate</STRONG> is called again.  This allows faster response  to
-       commands  typed in advance.  Normally, the input FILE pointer passed to
+       it is coming from a tty, the current  update  is  postponed  until  <STRONG>re-</STRONG>
+       <STRONG><A HREF="refresh.3x.html">fresh(3x)</A></STRONG>  or <STRONG>doupdate</STRONG> is called again.  This allows faster response to
+       commands typed in advance.  Normally, the input FILE pointer passed  to
        <STRONG>newterm</STRONG>, or <STRONG>stdin</STRONG> in the case that <STRONG>initscr</STRONG> was used, will be used to do
        this typeahead checking.  The <STRONG>typeahead</STRONG> routine specifies that the file
-       descriptor <EM>fd</EM> is to be used to check for typeahead instead.  If  <EM>fd</EM>  is
+       descriptor  <EM>fd</EM>  is to be used to check for typeahead instead.  If <EM>fd</EM> is
        -1, then no typeahead checking is done.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines  that  return  an  integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG>
+       All routines that return an integer return  <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>
        (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") upon successful
-       completion,  unless  otherwise  noted in the preceding routine descrip-
+       completion, unless otherwise noted in the  preceding  routine  descrip-
        tions.
 
-       X/Open does not define any error conditions.  In  this  implementation,
-       functions  with  a window parameter will return an error if it is null.
+       X/Open  does  not define any error conditions.  In this implementation,
+       functions with a window parameter will return an error if it  is  null.
        Any function will also return an error if the terminal was not initial-
        ized.  Also,
 
-              <STRONG>halfdelay</STRONG>
-                   returns  an  error  if  its  parameter is outside the range
-                   1..255.
+          <STRONG>halfdelay</STRONG>
+               returns an error if its parameter is outside the range 1..255.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       This implementation provides four functions which may be used to detect
+       if the corresponding flags were set or reset:
+
+       <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
+       ----------------------------------
+       is_cbreak   cbreak   nocbreak
+       is_echo     echo     noecho
+       is_nl       nl       nonl
+       is_raw      raw      noraw
+
+       In each case, the function returns
+
+       1    if the flag is set,
+
+       0    if the flag is reset, or
+
+       -1   if the curses library was not initialized.
+
+       These  routines  are  specific  to ncurses.  They were not supported on
+       Version 7, BSD or System V implementations.  It is recommended that any
+       code  depending on ncurses extensions be conditioned using NCURSES_VER-
+       SION.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       Except as noted in the section on extensions, these functions  are  de-
+       scribed in the XSI Curses standard, Issue 4.
 
        The ncurses library obeys the XPG4 standard and the historical practice
-       of  the  AT&amp;T  curses  implementations, in that the echo bit is cleared
-       when curses initializes the terminal state.  BSD curses  differed  from
-       this  slightly;  it left the echo bit on at initialization, but the BSD
-       <STRONG>raw</STRONG> call turned it off as a side-effect.   For  best  portability,  set
-       <STRONG>echo</STRONG>  or <STRONG>noecho</STRONG> explicitly just after initialization, even if your pro-
+       of the AT&amp;T curses implementations, in that the  echo  bit  is  cleared
+       when  curses  initializes the terminal state.  BSD curses differed from
+       this slightly; it left the echo bit on at initialization, but  the  BSD
+       <STRONG>raw</STRONG>  call  turned  it  off as a side-effect.  For best portability, set
+       <STRONG>echo</STRONG> or <STRONG>noecho</STRONG> explicitly just after initialization, even if your  pro-
        gram remains in cooked mode.
 
-       The XSI Curses standard is ambiguous on the  question  of  whether  <STRONG>raw</STRONG>
-       should  disable  the  CRLF translations controlled by <STRONG>nl</STRONG> and <STRONG>nonl</STRONG>.  BSD
-       curses did turn off these translations; AT&amp;T curses (at least  as  late
-       as  SVr1)  did not.  We chose to do so, on the theory that a programmer
-       requesting raw input wants a clean  (ideally  8-bit  clean)  connection
+       The  XSI  Curses  standard  is ambiguous on the question of whether <STRONG>raw</STRONG>
+       should disable the CRLF translations controlled by <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>.   BSD
+       curses  did  turn off these translations; AT&amp;T curses (at least as late
+       as SVr1) did not.  We chose to do so, on the theory that  a  programmer
+       requesting  raw  input  wants  a clean (ideally 8-bit clean) connection
        that the operating system will not alter.
 
        When <STRONG>keypad</STRONG> is first enabled, ncurses loads the key-definitions for the
        current terminal description.  If the terminal description includes ex-
        tended string capabilities, e.g., from using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>, then
-       ncurses also defines keys for the capabilities whose names  begin  with
+       ncurses  also  defines keys for the capabilities whose names begin with
        "k".  The corresponding keycodes are generated and (depending on previ-
-       ous loads of terminal descriptions) may differ from one execution of  a
+       ous  loads of terminal descriptions) may differ from one execution of a
        program to the next.  The generated keycodes are recognized by the <STRONG>key-</STRONG>
-       <STRONG>name</STRONG> function (which will then return a name beginning with "k"  denot-
-       ing  the terminfo capability name rather than "K", used for curses key-
+       <STRONG>name</STRONG>  function (which will then return a name beginning with "k" denot-
+       ing the terminfo capability name rather than "K", used for curses  key-
        names).  On the other hand, an application can use <STRONG>define_key</STRONG> to estab-
        lish a specific keycode for a given string.  This makes it possible for
-       an application to check for  an  extended  capability's  presence  with
+       an  application  to  check  for  an extended capability's presence with
        <STRONG>tigetstr</STRONG>, and reassign the keycode to match its own needs.
 
        Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
-       particular string capability.  Higher-level applications which use  the
-       curses  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
+       particular  string capability.  Higher-level applications which use the
+       curses <STRONG>wgetch</STRONG> and similar functions to return keycodes  rely  upon  the
        order in which the strings are loaded.  If more than one key definition
-       has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
+       has the same string value, then <STRONG>wgetch</STRONG> can  return  only  one  keycode.
        Most curses implementations (including ncurses) load key definitions in
-       the  order  defined  by the array of string capability names.  The last
-       key to be loaded determines the keycode which  will  be  returned.   In
-       ncurses,  you  may  also  have extended capabilities interpreted as key
-       definitions.  These are loaded after the predefined keys, and if a  ca-
+       the order defined by the array of string capability  names.   The  last
+       key  to  be  loaded  determines the keycode which will be returned.  In
+       ncurses, you may also have extended  capabilities  interpreted  as  key
+       definitions.   These are loaded after the predefined keys, and if a ca-
        pability's value is the same as a previously-loaded key definition, the
        later definition is the one used.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>,  <STRONG>nodelay</STRONG>,
+       Note  that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>,
        <STRONG>notimeout</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be macros.
 
-       The  <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> calls follow historical practice in that they
-       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
-       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
+       The <STRONG>noraw</STRONG> and <STRONG>nocbreak</STRONG> calls follow historical practice  in  that  they
+       attempt  to restore to normal ("cooked") mode from raw and cbreak modes
+       respectively.  Mixing raw/noraw and cbreak/nocbreak calls leads to  tty
        driver control states that are hard to predict or understand; it is not
        recommended.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <STRONG>de-</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,   <STRONG>de-</STRONG>
        <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-08-12                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -326,6 +359,7 @@ <H1 class="no-header">curs_inopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 5d366d708..6c9fad96c 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.32 2023/08/12 18:19:13 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -98,80 +98,85 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>init_extended_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>intrflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_cbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
+       <STRONG>int</STRONG> <STRONG>is_echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_raw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>isendwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>key_defined_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>keybound_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
-       <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keyname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG> <STRONG>keyname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>longname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
-
        <STRONG>mmask_t</STRONG> <STRONG>mousemask_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvcur_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>newpad_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
        <STRONG>SCREEN*</STRONG> <STRONG>new_prescr(void);</STRONG>
        <STRONG>SCREEN*</STRONG> <STRONG>newterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outfd</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>infd</EM><STRONG>);</STRONG>
+
        <STRONG>WINDOW*</STRONG> <STRONG>newwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nocbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noecho_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
        <STRONG>void</STRONG> <STRONG>nofilter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nonl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>noqiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noraw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>qiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>raw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>reset_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>resetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resize_term_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resizeterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ripoffline_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>));</STRONG>
        <STRONG>int</STRONG> <STRONG>savetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>scr_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>scr_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>scr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_tabsize_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>cols</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attrset_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attroff_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attron_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>attr_t</STRONG> <STRONG>slk_attr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_clear_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>slk_label_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_noutrefresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>slk_refresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_touch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>start_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>attr_t</STRONG> <STRONG>term_attrs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
        <STRONG>chtype</STRONG> <STRONG>termattrs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>termname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,MEVENT</STRONG> <STRONG>*</STRONG> <STRONG>event);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_legacy_coding_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>level</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_tioctl_sp(SCREEN</STRONG> <STRONG>*</STRONG><EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>vid_attr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>vid_puts_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>vidattr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
@@ -204,6 +209,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>char*</STRONG> <STRONG>tgetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG><EM>area</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>tgoto_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tigetflag_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>tigetnum_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>tigetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        /* may instead use 9 long parameters */
@@ -290,7 +296,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-08-12                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 6c7df9ef6..dbb2da65e 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 539345650..b0955c248 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9890ab45d..5bfc5c5b0 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 00d879b83..64a1bb2d4 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index f5bc89b4d..0dc6d231e 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.162 2023/07/01 15:21:06 tom Exp @
+  * @Id: ncurses.3x,v 1.163 2023/08/12 17:14:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -420,16 +420,20 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     instr                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     intrflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     inwstr                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+                    is_cbreak                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_cleared               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
+                    is_echo                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_idcok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_idlok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_immedok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_keypad                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_leaveok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_linetouched           <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+                    is_nl                    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_nodelay               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_notimeout             <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_pad                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
+                    is_raw                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_scrollok              <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_subwin                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_syncok                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
@@ -441,11 +445,11 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     keybound                 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>*
                     keyname                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     keyok                    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>*
+
                     keypad                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     killchar                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     killwchar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     leaveok                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
-
                     longname                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     mcprint                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>*
                     meta                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -507,11 +511,11 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     mvwaddwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvwchgat                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     mvwdelch                 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+
                     mvwget_wch               <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvwget_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvwgetch                 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     mvwgetn_wstr             <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
-
                     mvwgetnstr               <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvwgetstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvwhline                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -573,11 +577,11 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     restartterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     ripoffline               <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     savetty                  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+
                     scanw                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     scr_dump                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
                     scr_init                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
                     scr_restore              <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
-
                     scr_set                  <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
                     scrl                     <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     scroll                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
@@ -639,11 +643,11 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     ungetmouse               <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
                     untouchwin               <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     use_default_colors       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>*
+
                     use_env                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     use_extended_names       <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
                     use_tioctl               <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
-
                     vid_attr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vid_puts                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vidattr                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
@@ -705,11 +709,11 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                     win_wchnstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     win_wchstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     winch                    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+
                     winchnstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winchstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winnstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winnwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
-
                     wins_nwstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     wins_wch                 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     wins_wstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
@@ -1478,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-08-12                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 1a3ce1dbb..ceb044185 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 9914722f9..5fcd83c75 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 59311170a..2cf5c324a 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 28e7be775..6c84e2509 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 75446361e..183d39968 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index f0ac62924..e8ba732a9 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index e7a78cd0a..0759815da 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 1b1a6d63b..540408a77 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230805).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index a939b949d..3fa4dea2f 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.28 2023/08/06 00:00:22 tom Exp @
+  * @Id: user_caps.5,v 1.29 2023/08/06 00:00:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-07-01 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-08-05 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-07-01 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-08-05 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -394,7 +394,7 @@ <H1 class="no-header">user_caps 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-08-05                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/curses.h.in b/include/curses.h.in
index 36b3de9b1..f5426da18 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.280 2023/05/06 19:19:20 tom Exp $ */
+/* $Id: curses.h.in,v 1.281 2023/08/12 14:20:15 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -927,11 +927,9 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
 #define NCURSES_EXT_FUNCS @NCURSES_PATCH@
 typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
 typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
 extern NCURSES_EXPORT(int) alloc_pair (int, int);
 extern NCURSES_EXPORT(int) assume_default_colors (int, int);
+extern NCURSES_EXPORT(const char *) curses_version (void);
 extern NCURSES_EXPORT(int) define_key (const char *, int);
 extern NCURSES_EXPORT(int) extended_color_content(int, int *, int *, int *);
 extern NCURSES_EXPORT(int) extended_pair_content(int, int *, int *);
@@ -941,8 +939,15 @@ extern NCURSES_EXPORT(int) free_pair (int);
 extern NCURSES_EXPORT(int) get_escdelay (void);
 extern NCURSES_EXPORT(int) init_extended_color(int, int, int, int);
 extern NCURSES_EXPORT(int) init_extended_pair(int, int, int);
+extern NCURSES_EXPORT(int) is_cbreak(void);
+extern NCURSES_EXPORT(int) is_echo(void);
+extern NCURSES_EXPORT(int) is_nl(void);
+extern NCURSES_EXPORT(int) is_raw(void);
+extern NCURSES_EXPORT(bool) is_term_resized (int, int);
 extern NCURSES_EXPORT(int) key_defined (const char *);
+extern NCURSES_EXPORT(char *) keybound (int, int);
 extern NCURSES_EXPORT(int) keyok (int, bool);
+extern NCURSES_EXPORT(void) nofilter(void);
 extern NCURSES_EXPORT(void) reset_color_pairs (void);
 extern NCURSES_EXPORT(int) resize_term (int, int);
 extern NCURSES_EXPORT(int) resizeterm (int, int);
@@ -953,7 +958,6 @@ extern NCURSES_EXPORT(int) use_legacy_coding (int);
 extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
 extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
 extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
 
 #if @NCURSES_XNAMES@
 #undef  NCURSES_XNAMES
@@ -1074,20 +1078,24 @@ extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* impl
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype);	/* implemented:SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */
 #if @NCURSES_EXT_FUNCS@
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(alloc_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_color_content) (SCREEN*, int, int *, int *, int *);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_pair_content) (SCREEN*, int, int *, int *);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_slk_color) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(find_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(free_pair) (SCREEN*, int); /* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_extended_color) (SCREEN*, int, int, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_extended_pair) (SCREEN*, int, int, int);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(is_cbreak) (SCREEN*);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(is_echo) (SCREEN*);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(is_nl) (SCREEN*);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(is_raw) (SCREEN*);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined) (SCREEN*, const char *);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(void) NCURSES_SP_NAME(reset_color_pairs) (SCREEN*); /* implemented:EXT_SP_FUNC */
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index dc0862bfb..95f9b83b3 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,12 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.20 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_bkgrnd.3x,v 1.21 2023/08/12 18:31:54 tom Exp $
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgrnd 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.TH curs_bkgrnd 3X 2023-08-12 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBbkgrnd\fP,
 \fBwbkgrnd\fP,
@@ -41,7 +41,7 @@
 \fBgetbkgrnd\fP,
 \fBwgetbkgrnd\fP \- \fBcurses\fP window complex background manipulation routines
 .SH SYNOPSIS
-.B #include <curses.h>
+\fB#include <curses.h>\fR
 .sp
 \fBint bkgrnd(\fB const cchar_t *\fIwch\fB);\fR
 .br
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 008edaaf6..fa753dbeb 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
-.TH curs_inopts 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.42 2023/08/12 17:07:04 tom Exp $
+.TH curs_inopts 3X 2023-08-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,21 +38,25 @@
 .hy 0
 .SH NAME
 \fBcbreak\fP,
-\fBnocbreak\fP,
 \fBecho\fP,
-\fBnoecho\fP,
 \fBhalfdelay\fP,
 \fBintrflush\fP,
+\fBis_cbreak\fP,
+\fBis_echo\fP,
+\fBis_nl\fP,
+\fBis_raw\fP,
 \fBkeypad\fP,
 \fBmeta\fP,
 \fBnl\fP,
-\fBnonl\fP,
+\fBnocbreak\fP,
 \fBnodelay\fP,
-\fBnotimeout\fP,
-\fBraw\fP,
+\fBnoecho\fP,
+\fBnonl\fP,
+\fBnoqiflush\fP,
 \fBnoraw\fP,
+\fBnotimeout\fP,
 \fBqiflush\fP,
-\fBnoqiflush\fP,
+\fBraw\fP,
 \fBtimeout\fP,
 \fBwtimeout\fP,
 \fBtypeahead\fP \- \fBcurses\fP input options
@@ -97,6 +102,16 @@
 \fBvoid wtimeout(WINDOW *\fIwin\fB, int \fIdelay\fB);\fR
 .sp
 \fBint typeahead(int \fIfd\fB);\fR
+.sp
+/* extensions */
+.br
+\fBint is_cbreak(void);\fP
+.br
+\fBint is_echo(void);\fP
+.br
+\fBint is_nl(void);\fP
+.br
+\fBint is_raw(void);\fP
 .br
 .SH DESCRIPTION
 The \fBncurses\fP library provides several functions which let an application
@@ -277,14 +292,44 @@ In this implementation,
 functions with a window parameter will return an error if it is null.
 Any function will also return an error if the terminal was not initialized.
 Also,
-.RS
+.RS 3
 .TP 5
 \fBhalfdelay\fP
 returns an error
 if its parameter is outside the range 1..255.
 .RE
+.SH EXTENSIONS
+This implementation provides four functions which may be used to detect
+if the corresponding flags were set or reset:
+.TS
+l l l
+_ _ _ _
+l l l .
+\fBQuery\fP	\fBSet\fP	\fBReset\fP
+is_cbreak	cbreak	nocbreak
+is_echo	echo	noecho
+is_nl	nl	nonl
+is_raw	raw	noraw
+.TE
+.PP
+In each case, the function returns
+.TP 5
+1
+if the flag is set,
+.TP 5
+0
+if the flag is reset, or
+.TP 5
+-1
+if the curses library was not initialized.
+.PP
+These routines are specific to ncurses.
+They were not supported on Version 7, BSD or System V implementations.
+It is recommended that any code depending on ncurses extensions
+be conditioned using NCURSES_VERSION.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+Except as noted in the section on extensions,
+these functions are described in the XSI Curses standard, Issue 4.
 .PP
 The ncurses library obeys the XPG4 standard and the historical practice of the
 AT&T curses implementations, in that the echo bit is cleared when curses
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index d1465a024..5aa813d08 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
-.TH curs_sp_funcs 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.32 2023/08/12 18:19:13 tom Exp $
+.TH curs_sp_funcs 3X 2023-08-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,228 +42,135 @@ curs_sp_funcs \- \fBcurses\fP screen-pointer extension
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .nf
+.na
 .sp
 \fBint alloc_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint assume_default_colors_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint baudrate_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint beep_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBbool can_change_color_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint cbreak_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint color_content_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short* \fIr\fB, short* \fIg\fB, short* \fIb\fB);\fR
-.br
 \fBint curs_set_sp(SCREEN* \fIsp\fB, int \fIvisibility\fR);\fR
-.br
 \fBint def_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint def_shell_mode_sp(SCREEN* \fIsp\fB);\fR
 .sp
 \fBint define_key_sp(SCREEN* \fIsp\fB, const char * \fIdefinition\fB, int \fIkeycode\fB);\fR
-.br
 \fBint delay_output_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-.br
 \fBint doupdate_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint echo_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint endwin_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBchar erasechar_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint erasewchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-.br
 \fBint extended_color_content_sp(SCREEN * \fIsp\fB, int \fIcolor\fB, int * \fIr\fB, int * \fIg\fB, int * \fIb\fB);\fR
-.br
 \fBint extended_pair_content_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int * \fIfg\fB, int * \fIbg\fB);\fR
-.br
 \fBint extended_slk_color_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
 .sp
 \fBvoid filter_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint find_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint flash_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint flushinp_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint free_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
-.br
 \fBint get_escdelay_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint getmouse_sp(SCREEN* \fIsp\fB, MEVENT* \fBevent\fB);\fR
-.br
 \fBWINDOW* getwin_sp(SCREEN* \fIsp\fB, FILE* \fIfilep\fB);\fR
-.br
 \fBint halfdelay_sp(SCREEN* \fIsp\fB, int \fItenths\fB);\fR
-.br
 \fBbool has_colors_sp(SCREEN* \fIsp\fB);\fR
 .sp
 \fBbool has_ic_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBbool has_il_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint has_key_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-.br
 \fBbool has_mouse_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint init_color_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
-.br
 \fBint init_extended_color_sp(SCREEN* \fIsp\fB, int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
-.br
 \fBint init_extended_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint init_pair_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short \fIfg\fB, short \fIbg\fB);\fR
-.br
 \fBint intrflush_sp(SCREEN* \fIsp\fB, WINDOW* \fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBbool is_term_resized_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+\fBint is_cbreak_sp(SCREEN* \fIsp\fB);\fR
 .sp
+\fBint is_echo_sp(SCREEN* \fIsp\fB);\fR
+\fBint is_nl_sp(SCREEN* \fIsp\fB);\fR
+\fBint is_raw_sp(SCREEN* \fIsp\fB);\fR
+\fBbool is_term_resized_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
 \fBbool isendwin_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint key_defined_sp(SCREEN* \fIsp\fB, const char *\fIdefinition\fB);\fR
-.br
 \fBchar* keybound_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, int \fIcount\fB);\fR
-.br
-\fBNCURSES_CONST char * keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
-.br
+\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
 \fBint keyok_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, bool \fIenable\fB);\fR
-.br
 \fBchar killchar_sp(SCREEN* \fIsp\fB);\fR
-.br
+.sp
 \fBint killwchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-.br
 \fBchar* longname_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint mcprint_sp(SCREEN* \fIsp\fB, char *\fIdata\fB, int \fIlen\fB);\fR
-.br
 \fBint mouseinterval_sp(SCREEN* \fIsp\fB, int \fIerval\fB);\fR
-.sp
 \fBmmask_t mousemask_sp(SCREEN* \fIsp\fB, mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
-.br
 \fBint mvcur_sp(SCREEN* \fIsp\fB, int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fB, int \fInewcol\fB);\fR
-.br
 \fBint napms_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-.br
 \fBWINDOW* newpad_sp(SCREEN* \fIsp\fB, int \fInrows\fB, int \fIncols\fB);\fR
-.br
 \fBSCREEN* new_prescr(void);\fP
-.br
 \fBSCREEN* newterm_sp(SCREEN* \fIsp\fB, const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
-.br
+.sp
 \fBWINDOW* newwin_sp(SCREEN* \fIsp\fB, int \fInlines\fB, int \fIncols\fB, int \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint nl_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint nocbreak_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint noecho_sp(SCREEN* \fIsp\fB);\fR
-.sp
 \fBvoid nofilter_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint nonl_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBvoid noqiflush_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint noraw_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint pair_content_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short* \fIfg\fB, short* \fIbg\fB);\fR
-.br
 \fBvoid qiflush_sp(SCREEN* \fIsp\fB);\fR
-.br
+.sp
 \fBint raw_sp(SCREEN* \fIsp\fB);\fR
-.br
-\fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fB);\fR
-.br
+\fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
 \fBint reset_shell_mode_sp(SCREEN* \fIsp\fB);\fR
-.sp
 \fBint resetty_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint resize_term_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-.br
 \fBint resizeterm_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-.br
 \fBint ripoffline_sp(SCREEN* \fIsp\fB, int \fIline\fB, int (*\fIinit\fB)(WINDOW* \fIwin\fB, int \fIfmt\fB));\fR
-.br
 \fBint savetty_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint scr_init_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-.br
+.sp
 \fBint scr_restore_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-.br
 \fBint scr_set_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-.br
 \fBint set_escdelay_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-.br
 \fBint set_tabsize_sp(SCREEN* \fIsp\fB, int \fIcols\fB);\fR
-.sp
-\fBint slk_attr_set_sp(SCREEN* \fIsp\fB, const attr_t \fIattrs\fB, short \fIpair\fB, void*\fIopts\fB);\fR
-.br
 \fBint slk_attrset_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-.br
+\fBint slk_attr_set_sp(SCREEN* \fIsp\fB, const attr_t \fIattrs\fB, short \fIpair\fB, void*\fIopts\fB);\fR
 \fBint slk_attroff_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-.br
 \fBint slk_attron_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-.br
 \fBattr_t slk_attr_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint slk_clear_sp(SCREEN* \fIsp\fB);\fR
-.br
+.sp
 \fBint slk_color_sp(SCREEN* \fIsp\fB, short \fIpair\fB);\fR
-.br
 \fBint slk_init_sp(SCREEN* \fIsp\fB, int \fIfmt\fB);\fR
-.br
 \fBchar* slk_label_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB);\fR
-.br
 \fBint slk_noutrefresh_sp(SCREEN* \fIsp\fB);\fR
-.sp
 \fBint slk_refresh_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint slk_restore_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint slk_set_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB, const char * \fIlabel\fB, int \fIfmt\fB);\fR
-.br
 \fBint slk_touch_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint start_color_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBattr_t term_attrs_sp(SCREEN* \fIsp\fB);\fR
-.br
+.sp
 \fBchtype termattrs_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBchar* termname_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBint typeahead_sp(SCREEN* \fIsp\fB, int \fIfd\fB);\fR
-.br
 \fBint unget_wch_sp(SCREEN* \fIsp\fB, const wchar_t \fIwch\fB);\fR
-.sp
 \fBint ungetch_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-.br
 \fBint ungetmouse_sp(SCREEN* \fIsp\fB,MEVENT * \fBevent\fB);\fR
-.br
 \fBint use_default_colors_sp(SCREEN* \fIsp\fB);\fR
-.br
 \fBvoid use_env_sp(SCREEN* \fIsp\fB, bool \fIbf\fB);\fR
-.br
 \fBint use_legacy_coding_sp(SCREEN* \fIsp\fB, int \fIlevel\fB);\fR
-.br
 \fBvoid use_tioctl_sp(SCREEN *\fIsp\fB, bool \fIbf\fB);\fR
-.br
+.sp
 \fBint vid_attr_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB);\fR
-.br
 \fBint vid_puts_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-.br
 \fBint vidattr_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB);\fR
-.br
 \fBint vidputs_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-.br
 \fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fB, cchar_t *\fIch\fB);\fR
+.ad
 .sp
 \fB#include <form.h>\fP
 .sp
@@ -283,35 +190,24 @@ curs_sp_funcs \- \fBcurses\fP screen-pointer extension
 .sp
 \fB#include <term.h>\fP
 .sp
+.na
 \fBint del_curterm_sp(SCREEN* \fIsp\fB, TERMINAL *\fIoterm\fB);\fR
-.br
 \fBint putp_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB);\fR
-.br
 \fBint restartterm_sp(SCREEN* \fIsp\fB, NCURSES_CONST char*\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
-.br
 \fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fB, TERMINAL*\fInterm\fB);\fR
-.br
 \fBint tgetent_sp(SCREEN* \fIsp\fB, char *\fIbp\fB, const char *\fIname\fB);\fR
-.br
 \fBint tgetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.br
 \fBint tgetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.br
 \fBchar* tgetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, char **\fIarea\fB);\fR
-.br
 \fBchar* tgoto_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, int \fIcol\fB, int \fIrow\fB);\fR
-.br
 \fBint tigetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.br
+.sp
 \fBint tigetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.br
 \fBchar* tigetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.br
-\fR/* may instead use 9 long parameters */\fP
-.br
+\fR/* may instead use 9 long parameters */\fR
 \fBchar* tparm_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, ...);\fR
-.br
 \fBint tputs_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, int \fIaffcnt\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
+.ad
 .sp
 \fB#include <unctrl.h>\fP
 .sp
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 3b697d971..011b31408 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,9 +28,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.162 2023/07/01 15:21:06 tom Exp $
+.\" $Id: ncurses.3x,v 1.163 2023/08/12 17:14:08 tom Exp $
 .hy 0
-.TH ncurses 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.TH ncurses 3X 2023-08-12 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -458,16 +458,20 @@ insstr/\fBcurs_insstr\fP(3X)
 instr/\fBcurs_instr\fP(3X)
 intrflush/\fBcurs_inopts\fP(3X)
 inwstr/\fBcurs_inwstr\fP(3X)
+is_cbreak/\fBcurs_inopts\fP(3X)*
 is_cleared/\fBcurs_opaque\fP(3X)*
+is_echo/\fBcurs_inopts\fP(3X)*
 is_idcok/\fBcurs_opaque\fP(3X)*
 is_idlok/\fBcurs_opaque\fP(3X)*
 is_immedok/\fBcurs_opaque\fP(3X)*
 is_keypad/\fBcurs_opaque\fP(3X)*
 is_leaveok/\fBcurs_opaque\fP(3X)*
 is_linetouched/\fBcurs_touch\fP(3X)
+is_nl/\fBcurs_inopts\fP(3X)*
 is_nodelay/\fBcurs_opaque\fP(3X)*
 is_notimeout/\fBcurs_opaque\fP(3X)*
 is_pad/\fBcurs_opaque\fP(3X)*
+is_raw/\fBcurs_inopts\fP(3X)*
 is_scrollok/\fBcurs_opaque\fP(3X)*
 is_subwin/\fBcurs_opaque\fP(3X)*
 is_syncok/\fBcurs_opaque\fP(3X)*
diff --git a/misc/terminfo.src b/misc/terminfo.src
index c1892ca24..56d561242 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1061 $
-#	$Date: 2023/07/15 12:18:12 $
+#	$Revision: 1.1062 $
+#	$Date: 2023/08/12 20:21:29 $
 #
 # 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
@@ -4212,9 +4212,17 @@ absolute|Absolute Telnet emulating xterm,
 	use=xterm-basic,
 
 #### PuTTY
-# PuTTY 0.74 (27 June 2020)
 # http://www.chiark.greenend.org.uk/~sgtatham/putty/
 #
+# PuTTY 0.78 (September 2020, tested 12 August 2023)
+# Testing with tack:
+#	implements cross-out text (shortly after 0.74)
+#	restore kLFT as kLFT5, etc. (mentioned in October 2021)
+#	does not support direct-colors (mentioned in July 2021)
+#
+# PuTTY 0.74 (27 June 2020)
+#	(unchanged)
+#
 # PuTTY 0.73 (September 2019)
 # Testing with tack:
 #	does not implement italics
@@ -4295,6 +4303,12 @@ putty|PuTTY terminal emulator,
 	use=xterm+alt1049, use=xterm+sm+1006, use=putty+fnkeys,
 	use=vt102+enq, use=xterm+sl, use=vt100+fnkeys,
 	use=putty+keypad, use=vt220+cvis, use=bracketed+paste,
+	use=putty+cursor, use=ecma+strikeout,
+# older versions (e.g., before 0.71) of PuTTY used a shift-modifier to toggle
+# between normal- and application-mode for the cursor-keys.  That was dropped,
+# and a few years later (after 0.74) restored as the control-modifier.
+putty+cursor|PuTTY modified cursor-keys,
+	kDN5=\E[B, kLFT5=\E[D, kRIT5=\E[C, kUP5=\E[A,
 putty+keypad|PuTTY numeric keypad,
 	kp1=\EOq, kp2=\EOr, kp3=\EOs, kp4=\EOt, kp5=\EOu, kp6=\EOv,
 	kp7=\EOw, kp8=\EOx, kp9=\EOy, kpADD=\EOl, kpDIV=\EOQ,
@@ -27832,4 +27846,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-07-15
 #	+ mention E3 in regard to user_caps(5) -TD
 #
+# 2023-08-12
+#	+ add/use putty+cursor to reflect amending of modified cursor-keys in
+#	  2021 -TD
+#	+ add ecma+strikeout to putty -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index 619e15c7e..5069c2222 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -3411,6 +3411,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef ttytype
@@ -4121,7 +4157,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
@@ -4347,7 +4383,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 64ebbe14a..7c8bac9c4 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -3466,6 +3466,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef _nc_ttytype
@@ -4242,7 +4278,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
@@ -4468,7 +4504,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 1f3b0e4f8..3aa57eee9 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -4427,6 +4427,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef _nc_ttytype
@@ -5221,7 +5257,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
@@ -5469,7 +5505,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index f1a10b896..dbf535db4 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -4372,6 +4372,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef ttytype
@@ -5100,7 +5136,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
@@ -5348,7 +5384,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-ltic b/ncurses/llib-ltic
index 0037884de..9e87aaeae 100644
--- a/ncurses/llib-ltic
+++ b/ncurses/llib-ltic
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -150,7 +150,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-ltict b/ncurses/llib-ltict
index b9895bcbb..db9090b91 100644
--- a/ncurses/llib-ltict
+++ b/ncurses/llib-ltict
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -150,7 +150,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-ltictw b/ncurses/llib-ltictw
index 2e407fd0f..85db89bce 100644
--- a/ncurses/llib-ltictw
+++ b/ncurses/llib-ltictw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -150,7 +150,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-lticw b/ncurses/llib-lticw
index 2e407fd0f..85db89bce 100644
--- a/ncurses/llib-lticw
+++ b/ncurses/llib-lticw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -150,7 +150,7 @@ int	_nc_get_token(
 #undef _nc_trans_string
 int	_nc_trans_string(
 		char	*ptr,
-		char	*last)
+		const char *const last)
 		{ return(*(int *)0); }
 
 #undef _nc_push_token
diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index a25f417e7..5cfa111a2 100644
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -682,6 +682,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef ttytype
@@ -1390,7 +1426,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 0cefd7e3d..94ca9a7f0 100644
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -728,6 +728,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef _nc_ttytype
@@ -1502,7 +1538,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw
index 1061bf36a..3b21b8765 100644
--- a/ncurses/llib-ltinfotw
+++ b/ncurses/llib-ltinfotw
@@ -750,6 +750,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef _nc_ttytype
@@ -1542,7 +1578,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow
index 2819bb9ca..fd3081807 100644
--- a/ncurses/llib-ltinfow
+++ b/ncurses/llib-ltinfow
@@ -704,6 +704,42 @@ int	intrflush(
 		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
+#undef is_nl_sp
+int	is_nl_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_raw_sp
+int	is_raw_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_cbreak_sp
+int	is_cbreak_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_echo_sp
+int	is_echo_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef is_nl
+int	is_nl(void)
+		{ return(*(int *)0); }
+
+#undef is_raw
+int	is_raw(void)
+		{ return(*(int *)0); }
+
+#undef is_cbreak
+int	is_cbreak(void)
+		{ return(*(int *)0); }
+
+#undef is_echo
+int	is_echo(void)
+		{ return(*(int *)0); }
+
 /* ./tinfo/lib_setup.c */
 
 #undef ttytype
@@ -1430,7 +1466,7 @@ string_desc *_nc_str_null(
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
 		string_desc *dst,
-		string_desc *src)
+		const string_desc *const src)
 		{ return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 499fce650..5f9c645bf 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.27 2023/04/29 18:56:30 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.28 2023/08/12 15:45:07 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -395,3 +395,44 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag)
     return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag);
 }
 #endif
+
+#if NCURSES_EXT_FUNCS
+
+/*
+ * SCREEN is always opaque, but nl/raw/cbreak/echo set properties in it.
+ * As an extension, provide a way to query the properties.
+ *
+ * There are other properties which could be queried, e.g., filter, keypad,
+ * use_env, use_meta, but these particular properties are saved/restored within
+ * the wgetnstr() and wgetn_wstr() functions, which requires that the higher
+ * level curses library knows about the internal state of the lower level
+ * terminfo library.
+ */
+
+#define is_TEST(show,what) \
+    NCURSES_EXPORT(int) \
+    NCURSES_SP_NAME(show) (NCURSES_SP_DCL0) \
+    { \
+	return ((SP_PARM != NULL) ? (what(SP_PARM) ? 1 : 0) : -1); \
+    }
+
+is_TEST(is_nl, IsNl);
+is_TEST(is_raw, IsRaw);
+is_TEST(is_cbreak, IsCbreak);
+is_TEST(is_echo, IsEcho);
+
+#if NCURSES_SP_FUNCS
+#undef is_TEST
+#define is_TEST(show) \
+    NCURSES_EXPORT(int) \
+    show(void) \
+    { \
+	return NCURSES_SP_NAME(show) (CURRENT_SCREEN); \
+    }
+is_TEST(is_nl);
+is_TEST(is_raw);
+is_TEST(is_cbreak);
+is_TEST(is_echo);
+#endif
+
+#endif /* extensions */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 65c9e2063..a711baa2e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230805) unstable; urgency=low
+ncurses6 (6.4+20230812) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 65c9e2063..a711baa2e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230805) unstable; urgency=low
+ncurses6 (6.4+20230812) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 648b9270d..d431ef73d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230805) unstable; urgency=low
+ncurses6 (6.4+20230812) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Aug 2023 05:51:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d14a38512..aa881048d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.598 2023/08/05 09:51:18 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.599 2023/08/12 10:51:56 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0805"
+!define VERSION_MMDD  "0812"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 276785390..c26a200f8 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230805
+Release: 20230812
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.map b/package/ncurses.map
index 5c571fad8..20552d106 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.56 2023/04/23 23:13:53 tom Exp $
+# $Id: ncurses.map,v 1.57 2023/08/12 15:33:35 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1218,6 +1218,14 @@ NCURSES_TINFO_6.2.20211010 {
 
 NCURSES_TINFO_6.4.current {
 	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
 		tiparm_s;
 		tiscan_s;
 	local:
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2d0571c3e..1241a2e1b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230805
+Release: 20230812
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.sym b/package/ncurses.sym
index 072bff6f6..aaa1621fb 100644
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.38 2023/04/23 23:09:04 tom Exp $
+# $Id: ncurses.sym,v 1.39 2023/08/12 15:29:01 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -441,16 +441,24 @@ insstr
 instr
 intrflush
 intrflush_sp
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
diff --git a/package/ncursest.map b/package/ncursest.map
index 24e2944d6..5642c3b43 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.54 2023/04/23 23:13:35 tom Exp $
+# $Id: ncursest.map,v 1.55 2023/08/12 15:33:41 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -497,6 +497,14 @@ NCURSES_TINFO_6.2.20211010 {
 
 NCURSES_TINFO_6.4.current {
 	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
 		tiparm_s;
 		tiscan_s;
 	local:
diff --git a/package/ncursest.spec b/package/ncursest.spec
index ecc8372d0..e51d99d80 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230805
+Release: 20230812
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.sym b/package/ncursest.sym
index 7739f5518..9423d3791 100644
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.42 2023/04/23 23:09:14 tom Exp $
+# $Id: ncursest.sym,v 1.43 2023/08/12 15:28:50 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -450,16 +450,24 @@ insstr
 instr
 intrflush
 intrflush_sp
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
diff --git a/package/ncursestw.map b/package/ncursestw.map
index 3a33bcfe1..9ffde606e 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.57 2023/04/23 23:13:06 tom Exp $
+# $Id: ncursestw.map,v 1.58 2023/08/12 15:33:46 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -505,6 +505,14 @@ NCURSES_TINFO_6.2.20211010 {
 
 NCURSES_TINFO_6.4.current {
 	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
 		tiparm_s;
 		tiscan_s;
 	local:
diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index 3fe658458..b05baecc1 100644
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.42 2023/04/23 23:09:23 tom Exp $
+# $Id: ncursestw.sym,v 1.43 2023/08/12 15:29:11 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -486,16 +486,24 @@ instr
 intrflush
 intrflush_sp
 inwstr
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
diff --git a/package/ncursesw.map b/package/ncursesw.map
index df09d336b..5c484e0ba 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.60 2023/04/23 23:12:24 tom Exp $
+# $Id: ncursesw.map,v 1.61 2023/08/12 15:33:52 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -499,6 +499,14 @@ NCURSES_TINFO_6.2.20211010 {
 
 NCURSES_TINFO_6.4.current {
 	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
 		tiparm_s;
 		tiscan_s;
 	local:
diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index 205f6708c..8ef771f9b 100644
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.41 2023/04/23 23:09:28 tom Exp $
+# $Id: ncursesw.sym,v 1.42 2023/08/12 15:28:30 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -474,16 +474,24 @@ instr
 intrflush
 intrflush_sp
 inwstr
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
diff --git a/test/README b/test/README
index 134c00f54..9d5db7c37 100644
--- a/test/README
+++ b/test/README
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.78 2023/04/24 23:14:45 tom Exp $
+-- $Id: README,v 1.79 2023/08/12 19:07:07 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -415,16 +415,24 @@ instr				test: test_instr
 intrflush			test: demo_forms dup_field move_field movewindow
 intrflush_sp			test: sp_tinfo
 inwstr				test: test_inwstr
+is_cbreak			-
+is_cbreak_sp			-
 is_cleared			test: test_opaque
+is_echo				-
+is_echo_sp			-
 is_idcok			test: test_opaque
 is_idlok			test: test_opaque
 is_immedok			test: test_opaque
 is_keypad			test: ncurses test_opaque
 is_leaveok			test: test_opaque
 is_linetouched			lib: form
+is_nl				-
+is_nl_sp			-
 is_nodelay			test: test_opaque
 is_notimeout			test: test_opaque
 is_pad				test: test_opaque
+is_raw				-
+is_raw_sp			-
 is_scrollok			test: ncurses test_opaque
 is_subwin			test: test_opaque
 is_syncok			test: test_opaque
@@ -699,7 +707,7 @@ tiparm_s			test: test_tparm
 tiscan_s			test: test_tparm
 touchline			test: chgat clip_printw insdelln
 touchwin			test: chgat clip_printw demo_menus filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-tparm				test: dots dots_mvcur test_sgr progs: tic tput
+tparm				test: dots dots_mvcur test_sgr test_tparm progs: tic tput
 tputs				test: dots dots_mvcur dots_termcap railroad test_tparm test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs
 tputs_sp			test: sp_tinfo
 trace				-

From 16f6fb1817b10363cf7632a7fc30d65587211586 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 20 Aug 2023 01:57:51 +0200
Subject: [PATCH 025/106] ncurses-6.4-20230819.patch

---
 NEWS                                  |   9 +-
 VERSION                               |   2 +-
 dist.mk                               |   4 +-
 doc/html/man/adacurses6-config.1.html |  12 +-
 doc/html/man/captoinfo.1m.html        |  10 +-
 doc/html/man/clear.1.html             |   2 +-
 doc/html/man/curs_add_wch.3x.html     |   8 +-
 doc/html/man/curs_addch.3x.html       |   8 +-
 doc/html/man/curs_attr.3x.html        |   8 +-
 doc/html/man/curs_getch.3x.html       | 214 +++++++++++++-------------
 doc/html/man/curs_inch.3x.html        |   8 +-
 doc/html/man/curs_initscr.3x.html     |   8 +-
 doc/html/man/curs_inopts.3x.html      |  10 +-
 doc/html/man/curs_kernel.3x.html      |   8 +-
 doc/html/man/curs_refresh.3x.html     |   8 +-
 doc/html/man/curs_scroll.3x.html      |   8 +-
 doc/html/man/curs_sp_funcs.3x.html    |   8 +-
 doc/html/man/curs_terminfo.3x.html    |   8 +-
 doc/html/man/curs_threads.3x.html     |   8 +-
 doc/html/man/curs_util.3x.html        |   8 +-
 doc/html/man/default_colors.3x.html   |   8 +-
 doc/html/man/form.3x.html             |  10 +-
 doc/html/man/form_driver.3x.html      |   8 +-
 doc/html/man/infocmp.1m.html          | 195 ++++++++++++-----------
 doc/html/man/infotocap.1m.html        |   2 +-
 doc/html/man/menu.3x.html             |  10 +-
 doc/html/man/ncurses.3x.html          |  10 +-
 doc/html/man/ncurses6-config.1.html   |   2 +-
 doc/html/man/panel.3x.html            |   8 +-
 doc/html/man/tabs.1.html              |   2 +-
 doc/html/man/terminfo.5.html          |  81 +++++-----
 doc/html/man/tic.1m.html              |  19 ++-
 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         |   8 +-
 man/MKada_config.in                   |   7 +-
 man/captoinfo.1m                      |   5 +-
 man/curs_add_wch.3x                   |   5 +-
 man/curs_addch.3x                     |   9 +-
 man/curs_attr.3x                      |   6 +-
 man/curs_getch.3x                     |  14 +-
 man/curs_inch.3x                      |   6 +-
 man/curs_initscr.3x                   |   8 +-
 man/curs_inopts.3x                    |  10 +-
 man/curs_kernel.3x                    |   7 +-
 man/curs_refresh.3x                   |  10 +-
 man/curs_scroll.3x                    |   8 +-
 man/curs_sp_funcs.3x                  |   7 +-
 man/curs_terminfo.3x                  |  10 +-
 man/curs_threads.3x                   |   5 +-
 man/curs_util.3x                      |   5 +-
 man/default_colors.3x                 |   7 +-
 man/form.3x                           |   6 +-
 man/form_driver.3x                    |   5 +-
 man/infocmp.1m                        |   9 +-
 man/menu.3x                           |   6 +-
 man/ncurses.3x                        |   9 +-
 man/panel.3x                          |   8 +-
 man/terminfo.tail                     | 109 ++++++++-----
 man/tic.1m                            |  18 ++-
 man/user_caps.5                       |   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 +-
 69 files changed, 567 insertions(+), 488 deletions(-)

diff --git a/NEWS b/NEWS
index 0038b2810..19ea3ad2a 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3986 2023/08/12 20:24:29 tom Exp $
+-- $Id: NEWS,v 1.3988 2023/08/19 21:03:44 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230819
+	+ various manpage-formatting fixes.
+	+ correct formatting of table header in curs_inopts.3x (Branden
+	  Robinson).
+	+ correct manpage description of panel_hidden (report by Benjamin
+	  Mordaunt).
+
 20230812
 	+ add/use putty+cursor to reflect amending of modified cursor-keys in
 	  2021 -TD
diff --git a/VERSION b/VERSION
index 0c3ff9b17..a396dbef5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230812
+5:0:10	6.4	20230819
diff --git a/dist.mk b/dist.mk
index 129f5b8f0..191663fb3 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1559 2023/08/12 10:51:56 tom Exp $
+# $Id: dist.mk,v 1.1560 2023/08/19 10:43:27 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230812
+NCURSES_PATCH = 20230819
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index cb8bcf062..53e0a5cf5 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
   * Copyright 2010-2014,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.15 2021/12/25 17:39:16 tom Exp @
+  * @Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ADACURSES 1 2021-12-25 ncurses 6.4 User commands</TITLE>
+<TITLE>ADACURSES 1 2023-08-19 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG>ADACURSES(1)</STRONG>                     User commands                    <STRONG>ADACURSES(1)</STRONG>
 
@@ -126,11 +126,11 @@ <H1 class="no-header">ADACURSES 1 2021-12-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
-ncurses 6.4                       2021-12-25                      <STRONG>ADACURSES(1)</STRONG>
+ncurses 6.4                       2023-08-19                      <STRONG>ADACURSES(1)</STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 9e479f925..4844d0c4e 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.36 2023/07/01 15:43:20 tom Exp @
+  * @Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -208,7 +208,7 @@ <H1 class="no-header">captoinfo 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-08-19                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index c0f48fc45..8f60a77ee 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index bc213e872..7090c8437 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.38 2023/08/06 00:03:38 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.39 2023/08/19 20:37:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -321,7 +321,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index a5ec1d2d8..62cb52dbd 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.64 2023/07/01 14:23:04 tom Exp @
+  * @Id: curs_addch.3x,v 1.65 2023/08/19 19:45:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index d47e64457..8e3db63e8 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.77 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp @
   * ---------------------------------------------------------------------------
   * attr_get
   * .br
@@ -56,12 +56,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -520,7 +520,7 @@ <H1 class="no-header">curs_attr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 9eb474eb9..f57249c33 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.67 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_getch.3x,v 1.68 2023/08/19 20:45:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -150,112 +150,112 @@ <H1 class="no-header">curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            the  long  terminfo capability names for the keys, and were defined
            long ago, in the 1980s.
 
-                  <STRONG>Name</STRONG>            <STRONG>Key</STRONG> <STRONG>name</STRONG>
-                  -------------------------------------------------
-                  KEY_BREAK       Break key
-                  KEY_DOWN        The four arrow keys ...
-                  KEY_UP
-                  KEY_LEFT
-                  KEY_RIGHT
-                  KEY_HOME        Home key (upward+left arrow)
-                  KEY_BACKSPACE   Backspace
-                  KEY_F0          Function keys; space for 64 keys
-                                  is reserved.
-                  KEY_F(<EM>n</EM>)        For 0 &lt;= <EM>n</EM> &lt;= 63
-                  KEY_DL          Delete line
-                  KEY_IL          Insert line
-                  KEY_DC          Delete character
-                  KEY_IC          Insert char or enter insert mode
-                  KEY_EIC         Exit insert char mode
-                  KEY_CLEAR       Clear screen
-                  KEY_EOS         Clear to end of screen
-                  KEY_EOL         Clear to end of line
-                  KEY_SF          Scroll 1 line forward
-                  KEY_SR          Scroll 1 line backward (reverse)
-                  KEY_NPAGE       Next page
-                  KEY_PPAGE       Previous page
-                  KEY_STAB        Set tab
-                  KEY_CTAB        Clear tab
-                  KEY_CATAB       Clear all tabs
-                  KEY_ENTER       Enter or send
-                  KEY_SRESET      Soft (partial) reset
-                  KEY_RESET       Reset or hard reset
-
-                  KEY_PRINT       Print or copy
-                  KEY_LL          Home down or bottom (lower left)
-                  KEY_A1          Upper left of keypad
-                  KEY_A3          Upper right of keypad
-                  KEY_B2          Center of keypad
-                  KEY_C1          Lower left of keypad
-                  KEY_C3          Lower right of keypad
-                  KEY_BTAB        Back tab key
-                  KEY_BEG         Beg(inning) key
-                  KEY_CANCEL      Cancel key
-                  KEY_CLOSE       Close key
-                  KEY_COMMAND     Cmd (command) key
-                  KEY_COPY        Copy key
-                  KEY_CREATE      Create key
-                  KEY_END         End key
-                  KEY_EXIT        Exit key
-                  KEY_FIND        Find key
-                  KEY_HELP        Help key
-                  KEY_MARK        Mark key
-                  KEY_MESSAGE     Message key
-                  KEY_MOUSE       Mouse event occurred
-                  KEY_MOVE        Move key
-                  KEY_NEXT        Next object key
-                  KEY_OPEN        Open key
-                  KEY_OPTIONS     Options key
-                  KEY_PREVIOUS    Previous object key
-                  KEY_REDO        Redo key
-                  KEY_REFERENCE   Ref(erence) key
-                  KEY_REFRESH     Refresh key
-                  KEY_REPLACE     Replace key
-                  KEY_RESIZE      Screen resized
-                  KEY_RESTART     Restart key
-                  KEY_RESUME      Resume key
-                  KEY_SAVE        Save key
-                  KEY_SBEG        Shifted beginning key
-                  KEY_SCANCEL     Shifted cancel key
-                  KEY_SCOMMAND    Shifted command key
-                  KEY_SCOPY       Shifted copy key
-                  KEY_SCREATE     Shifted create key
-                  KEY_SDC         Shifted delete char key
-                  KEY_SDL         Shifted delete line key
-                  KEY_SELECT      Select key
-                  KEY_SEND        Shifted end key
-                  KEY_SEOL        Shifted clear line key
-                  KEY_SEXIT       Shifted exit key
-                  KEY_SFIND       Shifted find key
-                  KEY_SHELP       Shifted help key
-                  KEY_SHOME       Shifted home key
-                  KEY_SIC         Shifted insert key
-                  KEY_SLEFT       Shifted left arrow key
-                  KEY_SMESSAGE    Shifted message key
-                  KEY_SMOVE       Shifted move key
-                  KEY_SNEXT       Shifted next key
-                  KEY_SOPTIONS    Shifted options key
-                  KEY_SPREVIOUS   Shifted prev key
-                  KEY_SPRINT      Shifted print key
-                  KEY_SREDO       Shifted redo key
-                  KEY_SREPLACE    Shifted replace key
-                  KEY_SRIGHT      Shifted right arrow key
-                  KEY_SRSUME      Shifted resume key
-                  KEY_SSAVE       Shifted save key
-                  KEY_SSUSPEND    Shifted suspend key
-                  KEY_SUNDO       Shifted undo key
-                  KEY_SUSPEND     Suspend key
-                  KEY_UNDO        Undo key
+              <STRONG>Name</STRONG>            <STRONG>Key</STRONG> <STRONG>name</STRONG>
+              -------------------------------------------------
+              KEY_BREAK       Break key
+              KEY_DOWN        The four arrow keys ...
+              KEY_UP
+              KEY_LEFT
+              KEY_RIGHT
+              KEY_HOME        Home key (upward+left arrow)
+              KEY_BACKSPACE   Backspace
+              KEY_F0          Function keys; space for 64 keys
+                              is reserved.
+              KEY_F(<EM>n</EM>)        For 0 &lt;= <EM>n</EM> &lt;= 63
+              KEY_DL          Delete line
+              KEY_IL          Insert line
+              KEY_DC          Delete character
+              KEY_IC          Insert char or enter insert mode
+              KEY_EIC         Exit insert char mode
+              KEY_CLEAR       Clear screen
+              KEY_EOS         Clear to end of screen
+              KEY_EOL         Clear to end of line
+              KEY_SF          Scroll 1 line forward
+              KEY_SR          Scroll 1 line backward (reverse)
+              KEY_NPAGE       Next page
+              KEY_PPAGE       Previous page
+              KEY_STAB        Set tab
+              KEY_CTAB        Clear tab
+              KEY_CATAB       Clear all tabs
+              KEY_ENTER       Enter or send
+              KEY_SRESET      Soft (partial) reset
+              KEY_RESET       Reset or hard reset
+
+              KEY_PRINT       Print or copy
+              KEY_LL          Home down or bottom (lower left)
+              KEY_A1          Upper left of keypad
+              KEY_A3          Upper right of keypad
+              KEY_B2          Center of keypad
+              KEY_C1          Lower left of keypad
+              KEY_C3          Lower right of keypad
+              KEY_BTAB        Back tab key
+              KEY_BEG         Beg(inning) key
+              KEY_CANCEL      Cancel key
+              KEY_CLOSE       Close key
+              KEY_COMMAND     Cmd (command) key
+              KEY_COPY        Copy key
+              KEY_CREATE      Create key
+              KEY_END         End key
+              KEY_EXIT        Exit key
+              KEY_FIND        Find key
+              KEY_HELP        Help key
+              KEY_MARK        Mark key
+              KEY_MESSAGE     Message key
+              KEY_MOUSE       Mouse event occurred
+              KEY_MOVE        Move key
+              KEY_NEXT        Next object key
+              KEY_OPEN        Open key
+              KEY_OPTIONS     Options key
+              KEY_PREVIOUS    Previous object key
+              KEY_REDO        Redo key
+              KEY_REFERENCE   Ref(erence) key
+              KEY_REFRESH     Refresh key
+              KEY_REPLACE     Replace key
+              KEY_RESIZE      Screen resized
+              KEY_RESTART     Restart key
+              KEY_RESUME      Resume key
+              KEY_SAVE        Save key
+              KEY_SBEG        Shifted beginning key
+              KEY_SCANCEL     Shifted cancel key
+              KEY_SCOMMAND    Shifted command key
+              KEY_SCOPY       Shifted copy key
+              KEY_SCREATE     Shifted create key
+              KEY_SDC         Shifted delete char key
+              KEY_SDL         Shifted delete line key
+              KEY_SELECT      Select key
+              KEY_SEND        Shifted end key
+              KEY_SEOL        Shifted clear line key
+              KEY_SEXIT       Shifted exit key
+              KEY_SFIND       Shifted find key
+              KEY_SHELP       Shifted help key
+              KEY_SHOME       Shifted home key
+              KEY_SIC         Shifted insert key
+              KEY_SLEFT       Shifted left arrow key
+              KEY_SMESSAGE    Shifted message key
+              KEY_SMOVE       Shifted move key
+              KEY_SNEXT       Shifted next key
+              KEY_SOPTIONS    Shifted options key
+              KEY_SPREVIOUS   Shifted prev key
+              KEY_SPRINT      Shifted print key
+              KEY_SREDO       Shifted redo key
+              KEY_SREPLACE    Shifted replace key
+              KEY_SRIGHT      Shifted right arrow key
+              KEY_SRSUME      Shifted resume key
+              KEY_SSAVE       Shifted save key
+              KEY_SSUSPEND    Shifted suspend key
+              KEY_SUNDO       Shifted undo key
+              KEY_SUSPEND     Suspend key
+              KEY_UNDO        Undo key
 
        Keypad is arranged like this:
 
-                                +-----+------+-------+
-                                | <STRONG>A1</STRONG>  |  <STRONG>up</STRONG>  |  <STRONG>A3</STRONG>   |
-                                +-----+------+-------+
-                                |<STRONG>left</STRONG> |  <STRONG>B2</STRONG>  | <STRONG>right</STRONG> |
-                                +-----+------+-------+
-                                | <STRONG>C1</STRONG>  | <STRONG>down</STRONG> |  <STRONG>C3</STRONG>   |
-                                +-----+------+-------+
+              +-----+------+-------+
+              | <STRONG>A1</STRONG>  |  <STRONG>up</STRONG>  |  <STRONG>A3</STRONG>   |
+              +-----+------+-------+
+              |<STRONG>left</STRONG> |  <STRONG>B2</STRONG>  | <STRONG>right</STRONG> |
+              +-----+------+-------+
+              | <STRONG>C1</STRONG>  | <STRONG>down</STRONG> |  <STRONG>C3</STRONG>   |
+              +-----+------+-------+
        A few of these predefined values do <EM>not</EM> correspond to a real key:
 
        <STRONG>o</STRONG>   <STRONG>KEY_RESIZE</STRONG>  is  returned when the <STRONG>SIGWINCH</STRONG> signal has been detected
@@ -383,7 +383,7 @@ <H1 class="no-header">curs_getch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 56bd5c2a3..c1b9cbe96 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.32 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_inch.3x,v 1.33 2023/08/19 20:46:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_inch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 54c24a5f4..81d931185 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.44 2023/07/01 14:25:06 tom Exp @
+  * @Id: curs_initscr.3x,v 1.45 2023/08/19 19:46:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_initscr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 36c0e8101..bc86026d1 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.42 2023/08/12 17:07:04 tom Exp @
+  * @Id: curs_inopts.3x,v 1.43 2023/08/19 20:55:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -251,7 +251,7 @@ <H1 class="no-header">curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</H1>
        if the corresponding flags were set or reset:
 
        <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
-       ----------------------------------
+       ------------------------------
        is_cbreak   cbreak   nocbreak
        is_echo     echo     noecho
        is_nl       nl       nonl
@@ -335,7 +335,7 @@ <H1 class="no-header">curs_inopts 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-12                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 0b54ccd38..4ca4a9655 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.36 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_kernel.3x,v 1.37 2023/08/19 19:47:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -204,7 +204,7 @@ <H1 class="no-header">curs_kernel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 3a8095e52..a882addb4 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.30 2023/07/01 14:31:54 tom Exp @
+  * @Id: curs_refresh.3x,v 1.31 2023/08/19 19:47:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 59704db03..341d6dfaa 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.27 2023/07/01 14:31:54 tom Exp @
+  * @Id: curs_scroll.3x,v 1.28 2023/08/19 19:47:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 6c9fad96c..566ff5afb 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.32 2023/08/12 18:19:13 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.33 2023/08/19 19:48:07 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-08-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -296,7 +296,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-12                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index c7485aead..f9009a271 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.94 2023/08/06 00:03:04 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.95 2023/08/19 20:37:54 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -689,7 +689,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 94485c358..3063541a0 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.36 2023/08/06 00:02:33 tom Exp @
+  * @Id: curs_threads.3x,v 1.37 2023/08/19 20:38:10 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -609,7 +609,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 362169c2a..b653bfc25 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp @
+  * @Id: curs_util.3x,v 1.73 2023/08/19 20:38:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -371,7 +371,7 @@ <H1 class="no-header">curs_util 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index d81eda1c7..ae68f47f8 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.36 2022/02/12 20:03:40 tom Exp @
+  * @Id: default_colors.3x,v 1.37 2023/08/19 19:48:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2022-02-12                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index dbb2da65e..6cc7eb8fa 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.42 2023/07/01 15:46:10 tom Exp @
+  * @Id: form.3x,v 1.43 2023/08/19 20:38:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -248,11 +248,11 @@ <H1 class="no-header">form 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
-ncurses 6.4                       2023-07-01                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 678ade6f6..c33be12b2 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.44 2023/08/06 00:02:02 tom Exp @
+  * @Id: form_driver.3x,v 1.45 2023/08/19 20:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -280,7 +280,7 @@ <H1 class="no-header">form_driver 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index b0955c248..51b713050 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.86 2023/07/01 14:31:54 tom Exp @
+  * @Id: infocmp.1m,v 1.87 2023/08/19 20:39:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -302,61 +302,60 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
             Here is a list of the DEC/ANSI special sequences recognized:
 
-                         Action        Meaning
-                         -----------------------------------------
-                         RIS           full reset
-                         SC            save cursor
-                         RC            restore cursor
-                         LL            home-down
-                         RSR           reset scroll region
-                         -----------------------------------------
-                         DECSTR        soft reset (VT320)
-                         S7C1T         7-bit controls (VT220)
-                         -----------------------------------------
-
-                         ISO DEC G0    enable DEC graphics for G0
-                         ISO UK G0     enable UK chars for G0
-                         ISO US G0     enable US chars for G0
-                         ISO DEC G1    enable DEC graphics for G1
-                         ISO UK G1     enable UK chars for G1
-                         ISO US G1     enable US chars for G1
-                         -----------------------------------------
-                         DECPAM        application keypad mode
-                         DECPNM        normal keypad mode
-                         DECANSI       enter ANSI mode
-                         -----------------------------------------
-                         ECMA[+-]AM    keyboard action mode
-                         ECMA[+-]IRM   insert replace mode
-                         ECMA[+-]SRM   send receive mode
-                         ECMA[+-]LNM   linefeed mode
-                         -----------------------------------------
-                         DEC[+-]CKM    application cursor keys
-                         DEC[+-]ANM    set VT52 mode
-                         DEC[+-]COLM   132-column mode
-                         DEC[+-]SCLM   smooth scroll
-                         DEC[+-]SCNM   reverse video mode
-                         DEC[+-]OM     origin mode
-                         DEC[+-]AWM    wraparound mode
-                         DEC[+-]ARM    auto-repeat mode
-
-            It  also  recognizes  a  SGR  action  corresponding  to   ANSI/ISO
-            6429/ECMA  Set  Graphics  Rendition, with the values NORMAL, BOLD,
-            UNDERLINE, BLINK, and REVERSE.  All but  NORMAL  may  be  prefixed
-            with
-
-            <STRONG>o</STRONG>   "+" (turn on) or
-
-            <STRONG>o</STRONG>   "-" (turn off).
-
-            An  SGR0  designates  an  empty  highlight sequence (equivalent to
-            {SGR:NORMAL}).
+                      Action        Meaning
+                      -----------------------------------------
+                      RIS           full reset
+                      SC            save cursor
+                      RC            restore cursor
+                      LL            home-down
+                      RSR           reset scroll region
+                      -----------------------------------------
+                      DECSTR        soft reset (VT320)
+                      S7C1T         7-bit controls (VT220)
+                      -----------------------------------------
+
+                      ISO DEC G0    enable DEC graphics for G0
+                      ISO UK G0     enable UK chars for G0
+                      ISO US G0     enable US chars for G0
+                      ISO DEC G1    enable DEC graphics for G1
+                      ISO UK G1     enable UK chars for G1
+                      ISO US G1     enable US chars for G1
+                      -----------------------------------------
+                      DECPAM        application keypad mode
+                      DECPNM        normal keypad mode
+                      DECANSI       enter ANSI mode
+                      -----------------------------------------
+                      ECMA[+-]AM    keyboard action mode
+                      ECMA[+-]IRM   insert replace mode
+                      ECMA[+-]SRM   send receive mode
+                      ECMA[+-]LNM   linefeed mode
+                      -----------------------------------------
+                      DEC[+-]CKM    application cursor keys
+                      DEC[+-]ANM    set VT52 mode
+                      DEC[+-]COLM   132-column mode
+                      DEC[+-]SCLM   smooth scroll
+                      DEC[+-]SCNM   reverse video mode
+                      DEC[+-]OM     origin mode
+                      DEC[+-]AWM    wraparound mode
+                      DEC[+-]ARM    auto-repeat mode
+
+       It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set
+       Graphics Rendition, with the values NORMAL, BOLD, UNDERLINE, BLINK, and
+       REVERSE.  All but NORMAL may be prefixed with
+
+              <STRONG>o</STRONG>   "+" (turn on) or
+
+              <STRONG>o</STRONG>   "-" (turn off).
+
+              An SGR0 designates an empty highlight  sequence  (equivalent  to
+              {SGR:NORMAL}).
 
        <STRONG>-l</STRONG>   Set output format to terminfo.
 
        <STRONG>-p</STRONG>   Ignore padding specifications when comparing strings.
 
-       <STRONG>-Q</STRONG> <EM>n</EM> Rather than show source  in  terminfo  (text)  format,  print  the
-            compiled  (binary) format in hexadecimal or base64 form, depending
+       <STRONG>-Q</STRONG> <EM>n</EM> Rather  than  show  source  in  terminfo  (text) format, print the
+            compiled (binary) format in hexadecimal or base64 form,  depending
             on the option's value:
 
                1  hexadecimal
@@ -365,39 +364,39 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
                3  hexadecimal and base64
 
-            For example, this prints the compiled terminfo value as  a  string
+            For  example,  this prints the compiled terminfo value as a string
             which could be assigned to the <STRONG>TERMINFO</STRONG> environment variable:
 
                 infocmp -0 -q -Q2
 
        <STRONG>-q</STRONG>   This makes the output a little shorter:
 
-            <STRONG>o</STRONG>   Make  the  comparison listing shorter by omitting subheadings,
+            <STRONG>o</STRONG>   Make the comparison listing shorter by  omitting  subheadings,
                 and using "-" for absent capabilities, "@" for canceled rather
                 than "NULL".
 
-            <STRONG>o</STRONG>   However,   show   differences  between  absent  and  cancelled
+            <STRONG>o</STRONG>   However,  show  differences  between  absent   and   cancelled
                 capabilities.
 
             <STRONG>o</STRONG>   Omit the "Reconstructed from" comment for source listings.
 
        <STRONG>-R</STRONG><EM>subset</EM>
-            Restrict output to a given subset.  This option is  for  use  with
-            archaic  versions of terminfo like those on SVr1, Ultrix, or HP-UX
-            that do not support the full set of SVR4/XSI Curses terminfo;  and
-            variants  such  as AIX that have their own extensions incompatible
+            Restrict  output  to  a given subset.  This option is for use with
+            archaic versions of terminfo like those on SVr1, Ultrix, or  HP-UX
+            that  do not support the full set of SVR4/XSI Curses terminfo; and
+            variants such as AIX that have their own  extensions  incompatible
             with SVr4/XSI.
 
-            <STRONG>o</STRONG>   Available terminfo subsets are  "SVr1",  "Ultrix",  "HP",  and
+            <STRONG>o</STRONG>   Available  terminfo  subsets  are  "SVr1", "Ultrix", "HP", and
                 "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-            <STRONG>o</STRONG>   You  can  also  choose  the  subset  "BSD"  which selects only
+            <STRONG>o</STRONG>   You can also  choose  the  subset  "BSD"  which  selects  only
                 capabilities with termcap equivalents recognized by 4.4BSD.
 
-            <STRONG>o</STRONG>   If you select any other value for <STRONG>-R</STRONG>, it is  the  same  as  no
+            <STRONG>o</STRONG>   If  you  select  any  other value for <STRONG>-R</STRONG>, it is the same as no
                 subset, i.e., all capabilities are used.
 
-            A  few  options  override the subset selected with <STRONG>-R</STRONG>, if they are
+            A few options override the subset selected with <STRONG>-R</STRONG>,  if  they  are
             processed later in the command parameters:
 
             <STRONG>-C</STRONG>   sets the "BSD" subset as a side-effect.
@@ -407,10 +406,10 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
             <STRONG>-r</STRONG>   sets the subset to all capabilities.
 
        <STRONG>-s</STRONG> <EM>[d|i|l|c]</EM>
-            The <STRONG>-s</STRONG> option sorts the fields within each type according  to  the
+            The  <STRONG>-s</STRONG>  option sorts the fields within each type according to the
             argument below:
 
-            <STRONG>d</STRONG>    leave  fields  in  the  order  that  they  are  stored in the
+            <STRONG>d</STRONG>    leave fields in  the  order  that  they  are  stored  in  the
                  <EM>terminfo</EM> database.
 
             <STRONG>i</STRONG>    sort by <EM>terminfo</EM> name.
@@ -419,45 +418,45 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
             <STRONG>c</STRONG>    sort by the <EM>termcap</EM> name.
 
-            If the <STRONG>-s</STRONG> option is not given, the  fields  printed  out  will  be
-            sorted  alphabetically  by  the  <STRONG>terminfo</STRONG>  name  within each type,
-            except in the case of the <STRONG>-C</STRONG> or the <STRONG>-L</STRONG> options,  which  cause  the
-            sorting  to  be  done  by  the <STRONG>termcap</STRONG> name or the long C variable
+            If  the  <STRONG>-s</STRONG>  option  is  not given, the fields printed out will be
+            sorted alphabetically by  the  <STRONG>terminfo</STRONG>  name  within  each  type,
+            except  in  the  case of the <STRONG>-C</STRONG> or the <STRONG>-L</STRONG> options, which cause the
+            sorting to be done by the <STRONG>termcap</STRONG> name  or  the  long  C  variable
             name, respectively.
 
-       <STRONG>-T</STRONG>   eliminates size-restrictions  on  the  generated  text.   This  is
+       <STRONG>-T</STRONG>   eliminates  size-restrictions  on  the  generated  text.   This is
             mainly  useful  for  testing  and  analysis,  since  the  compiled
             descriptions  are  limited  (e.g.,  1023  for  termcap,  4096  for
             terminfo).
 
-       <STRONG>-t</STRONG>   tells  <STRONG>tic</STRONG>  to  discard commented-out capabilities.  Normally when
-            translating from terminfo to termcap, untranslatable  capabilities
+       <STRONG>-t</STRONG>   tells <STRONG>tic</STRONG> to discard commented-out  capabilities.   Normally  when
+            translating  from terminfo to termcap, untranslatable capabilities
             are commented-out.
 
-       <STRONG>-U</STRONG>   tells  <STRONG>infocmp</STRONG>  to  not  post-process  the  data after parsing the
+       <STRONG>-U</STRONG>   tells <STRONG>infocmp</STRONG> to not  post-process  the  data  after  parsing  the
             source  file.   This  feature  helps  when  comparing  the  actual
-            contents  of  two  source  files, since it excludes the inferences
+            contents of two source files, since  it  excludes  the  inferences
             that <STRONG>infocmp</STRONG> makes to fill in missing data.
 
        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
             exits.
 
-       <STRONG>-v</STRONG> <EM>n</EM> prints  out  tracing  information on standard error as the program
+       <STRONG>-v</STRONG> <EM>n</EM> prints out tracing information on standard error  as  the  program
             runs.
 
-            The optional parameter <EM>n</EM> is a number  from  1  to  10,  inclusive,
+            The  optional  parameter  <EM>n</EM>  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
+            is  built  without  tracing  support,  the  optional  parameter is
             ignored.
 
-       <STRONG>-W</STRONG>   By  itself,  the  <STRONG>-w</STRONG>  option  will  not  force  long strings to be
+       <STRONG>-W</STRONG>   By itself, the <STRONG>-w</STRONG>  option  will  not  force  long  strings  to  be
             wrapped.  Use the <STRONG>-W</STRONG> option to do this.
 
        <STRONG>-w</STRONG> <EM>width</EM>
             changes the output to <EM>width</EM> characters.
 
        <STRONG>-x</STRONG>   print information for user-defined capabilities (see <STRONG>user_caps(5)</STRONG>.
-            These  are  extensions  to  the  terminfo  repertoire which can be
+            These are extensions to  the  terminfo  repertoire  which  can  be
             loaded using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>.
 
 
@@ -466,48 +465,48 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Although System V Release 2 provided a  terminfo  library,  it  had  no
+       Although  System  V  Release  2  provided a terminfo library, it had no
        documented tool for decompiling the terminal descriptions.  Tony Hansen
        (AT&amp;T) wrote the first <STRONG>infocmp</STRONG> in early 1984, for System V Release 3.
 
-       Eric Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide  an
-       equivalent  <STRONG>infocmp</STRONG>  for  ncurses.   In  addition,  he  added a few new
+       Eric  Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide an
+       equivalent <STRONG>infocmp</STRONG> for ncurses.   In  addition,  he  added  a  few  new
        features such as:
 
-       <STRONG>o</STRONG>   the  <STRONG>-e</STRONG>  option,  to  support   <EM>fallback</EM>   (compiled-in)   terminal
+       <STRONG>o</STRONG>   the   <STRONG>-e</STRONG>   option,   to  support  <EM>fallback</EM>  (compiled-in)  terminal
            descriptions
 
        <STRONG>o</STRONG>   the <STRONG>-i</STRONG> option, to help with analysis
 
-       Later,  Thomas  Dickey added the <STRONG>-x</STRONG> (user-defined capabilities) option,
-       and the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with  user-defined
+       Later, Thomas Dickey added the <STRONG>-x</STRONG> (user-defined  capabilities)  option,
+       and  the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with user-defined
        capabilities.
 
        For a complete list, see the <EM>EXTENSIONS</EM> section.
 
-       In  2010,  Roy  Marples  provided an <STRONG>infocmp</STRONG> 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 <STRONG>-x</STRONG> option
+       In 2010, Roy Marples provided an <STRONG>infocmp</STRONG> 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  <STRONG>-x</STRONG>  option
        adapted from ncurses.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) provides a description  of  <STRONG>infocmp</STRONG>.   It
+       X/Open  Curses,  Issue  7 (2009) provides a description of <STRONG>infocmp</STRONG>.  It
        does not mention the options used for converting to termcap format.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG>
+       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>
        and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
 
-       SVr4  infocmp  does  not  distinguish  between  absent  and   cancelled
-       capabilities.   Also,  it shows missing integer capabilities as <STRONG>-1</STRONG> (the
+       SVr4   infocmp  does  not  distinguish  between  absent  and  cancelled
+       capabilities.  Also, it shows missing integer capabilities as  <STRONG>-1</STRONG>  (the
        internal   value   used   to   represent   missing   integers).    This
-       implementation  shows  those  as  "NULL",  for consistency with missing
+       implementation shows those as  "NULL",  for  consistency  with  missing
        strings.
 
-       The <STRONG>-r</STRONG> option's notion of "termcap" capabilities is  System  V  Release
-       4's.   Actual  BSD curses versions will have a more restricted set.  To
+       The  <STRONG>-r</STRONG>  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 <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
 
 
@@ -521,7 +520,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -530,7 +529,7 @@ <H1 class="no-header">infocmp 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-07-01                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-08-19                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 5bfc5c5b0..9196cca4c 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 64a1bb2d4..49c614c1c 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.33 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu.3x,v 1.34 2023/08/19 20:39:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -223,11 +223,11 @@ <H1 class="no-header">menu 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
-ncurses 6.4                       2023-07-01                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 0dc6d231e..1d30c32b4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.163 2023/08/12 17:14:08 tom Exp @
+  * @Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-08-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-08-12 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1482,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-12                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index ceb044185..a18183aa1 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 5fcd83c75..8265818e3 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.46 2023/07/01 15:46:10 tom Exp @
+  * @Id: panel.3x,v 1.47 2023/08/19 21:01:21 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -165,8 +165,8 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-panel_hidden">panel_hidden</a></H3><PRE>
-       <STRONG>panel_hidden(</STRONG><EM>pan</EM><STRONG>)</STRONG>  returns <STRONG>TRUE</STRONG> if the panel <EM>pan</EM> is in the panel stack,
-       <STRONG>FALSE</STRONG> if it is not.  If the panel is a null pointer, return <STRONG>ERR</STRONG>.
+       <STRONG>panel_hidden(</STRONG><EM>pan</EM><STRONG>)</STRONG> returns <STRONG>FALSE</STRONG> if the panel <EM>pan</EM> is in the panel stack,
+       <STRONG>TRUE</STRONG> if it is not.  If the panel is a null pointer, return <STRONG>ERR</STRONG>.
 
 
 </PRE><H3><a name="h3-panel_userptr">panel_userptr</a></H3><PRE>
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 2cf5c324a..d5e38ae5a 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 6c84e2509..7f0b6b8e7 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.120 2023/07/15 19:46:56 tom Exp @
+  * @Id: terminfo.tail,v 1.122 2023/08/19 20:14:38 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1236,7 +1236,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        are followed by the character "#" and  then  a  positive  value.   Thus
        <STRONG>cols</STRONG>, which indicates the number of columns the terminal has, gives the
        value "80" for ansi.  Values for numeric capabilities may be  specified
-       in  decimal,  octal  or  hexadecimal,  using the C programming language
+       in  decimal,  octal,  or  hexadecimal, using the C programming language
        conventions (e.g., 255, 0377 and 0xff or 0xFF).
 
        Finally, string valued capabilities, such as <STRONG>el</STRONG> (clear to end  of  line
@@ -1555,28 +1555,31 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        variables are persistent across escape-string evaluations.
 
        Consider the HP2645, which, to get to row 3 and column 12, needs to  be
-       sent  \E&amp;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   <STRONG>cup</STRONG>   capability   is
-       "cup=6\E&amp;%p2%2dc%p1%2dY".
-
-       The Microterm ACT-IV needs the current row and column sent preceded  by
-       a   <STRONG>^T</STRONG>,   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 (<STRONG>cub1</STRONG>), and to move the cursor up one line on the
-       screen (<STRONG>cuu1</STRONG>).  This is necessary because it  is  not  always  safe  to
-       transmit  <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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 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 character.  Then the  same
-       is  done for the second parameter.  More complex arithmetic is possible
-       using the stack.
+       sent  \E&amp;a12c03Y  padded for 6 milliseconds.  The order of the rows and
+       columns is inverted here, and the row and column  are  printed  as  two
+       digits.  The corresponding terminal description is expressed thus:
+              cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
+
+       The  Microterm ACT-IV needs the current row and column sent preceded by
+       a <STRONG>^T</STRONG>, 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
+       (<STRONG>cub1</STRONG>),  and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This
+       is necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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 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
+       character.   Then  the  same  is  done  for the second parameter.  More
+       complex arithmetic is possible using the stack.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
@@ -1892,11 +1895,11 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        If  there  is  a  sequence to set arbitrary combinations of modes, this
        should be given as <STRONG>sgr</STRONG> (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 <STRONG>sgr</STRONG>,  only  those  for  which  corresponding
-       separate attribute commands exist.
+       parameter is either zero (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  <STRONG>sgr</STRONG>,  only  those  for  which
+       corresponding separate attribute commands exist.
 
        For example, the DEC vt220 supports most of the modes:
 
@@ -2232,13 +2235,13 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
          diamond                     ACS_DIAMOND    +         `        0x60
          checker board (stipple)     ACS_CKBOARD    :         a        0x61
          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
          upper left corner           ACS_ULCORNER   +         l        0x6c
+
          lower left corner           ACS_LLCORNER   +         m        0x6d
          large plus or crossover     ACS_PLUS       +         n        0x6e
          scan line 1                 ACS_S1         ~         o        0x6f
@@ -2518,12 +2521,18 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        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 <STRONG>tgetent</STRONG> is searching for is,
-       several bad things can happen.
+       several bad things can happen:
+
+       <STRONG>o</STRONG>   some termcap libraries print a warning message,
+
+       <STRONG>o</STRONG>   some exit if they find an entry that's longer than 1023 bytes,
+
+       <STRONG>o</STRONG>   some neither exit nor warn, doing nothing useful, and
+
+       <STRONG>o</STRONG>   some simply truncate the entries to 1023 bytes.
 
-       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.
+       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
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 183d39968..1cb33aad6 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.87 2023/07/01 15:46:10 tom Exp @
+  * @Id: tic.1m,v 1.88 2023/08/19 20:02:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -226,9 +226,12 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
               archaic  versions of terminfo like those on SVr1, Ultrix, or HP-
               UX that do not support the full set of SVR4/XSI Curses terminfo;
               and  outright  broken  ports  like  AIX  3.x that have their own
-              extensions incompatible with SVr4/XSI.   Available  subsets  are
-              "SVr1",  "Ultrix",  "HP",  "BSD"  and "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for
-              details.
+              extensions incompatible with SVr4/XSI.
+
+              Available subsets are
+              "SVr1", "Ultrix", "HP", "BSD", and "AIX"
+
+              See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
        <STRONG>-r</STRONG>     Force  entry  resolution  (so  there   are   no   remaining   tc
               capabilities)  even  when  doing  translation to termcap format.
@@ -469,7 +472,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -478,7 +481,7 @@ <H1 class="no-header">tic 1m 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-08-19                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index e8ba732a9..52b52614e 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 0759815da..fed44f73e 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 540408a77..6b2c94cea 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230812).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 3fa4dea2f..8fd38a4ac 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.29 2023/08/06 00:00:22 tom Exp @
+  * @Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-08-05 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-08-19 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-08-05 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-08-19 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -394,7 +394,7 @@ <H1 class="no-header">user_caps 5 2023-08-05 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-08-05                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-08-19                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index a91f0ee04..3a2986fa8 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2010-2014,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,9 +27,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.15 2021/12/25 17:39:16 tom Exp $
+.\" $Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp $
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.TH ADACURSES 1 2021-12-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.TH ADACURSES 1 2023-08-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
 .SH SYNOPSIS
@@ -59,7 +59,6 @@ of
 \fB\-\-libs\fP
 that \fBgnatmake\fP expects (see example).
 .SH EXAMPLE
-.PP
 For example, supposing that you want to compile the "Hello World!"
 program for @ADA_LIBNAME@.
 Make a file named "hello.adb":
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 9028adc4b..c5ff2ac4a 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.36 2023/07/01 15:43:20 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-08-19 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -160,6 +160,7 @@ IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
 with the SVr4 format.
 The following AIX extensions are automatically
 translated:
+.PP
 .TS
 c c
 l l.
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index f97ae53b3..43e392447 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.38 2023/08/06 00:03:38 tom Exp $
-.TH curs_add_wch 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.39 2023/08/19 20:37:30 tom Exp $
+.TH curs_add_wch 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -161,6 +161,7 @@ WACS_VLINE	0x2502 	|	x	vertical line
 .PP
 The wide-character configuration of ncurses also defines symbols
 for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
+.PP
 .TS
 l l l l l
 l l l l l
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 4744ba8ba..92e73786a 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.64 2023/07/01 14:23:04 tom Exp $
-.TH curs_addch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.65 2023/08/19 19:45:54 tom Exp $
+.TH curs_addch 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -100,8 +100,9 @@ using the same convention as \fBunctrl\fR(3X):
 .bP
 Control characters are displayed in the \fB^\fIX\fR notation.
 .bP
-Values above 128 are either meta characters (if the screen has not
-been initialized, or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP E parameter),
+Values above 128 are either meta characters
+(if the screen has not been initialized,
+or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP E parameter),
 shown in the \fBM\-\fIX\fR notation, or are displayed as themselves.
 In the latter case, the values may not be printable;
 this follows the X/Open specification.
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 21f4365f6..ca75a2f67 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.77 2023/07/01 15:43:20 tom Exp $
-.TH curs_attr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp $
+.TH curs_attr 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -295,6 +295,7 @@ l l .
 .PP
 These video attributes are supported by \fBattr_on\fP and related functions
 (which also support the attributes recognized by \fBattron\fP, etc.):
+.PP
 .RS
 .TS
 l l
@@ -387,6 +388,7 @@ the format and size of the defined constants
 as well as clues such as the alternate character set implementation.
 A 32-bit library can be used on a 64-bit system,
 but not necessarily the reverse.
+.PP
 .RS
 .TS
 l l l l l l
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 75a06663a..9f84f8c30 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.67 2023/07/01 15:43:20 tom Exp $
-.TH curs_getch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.68 2023/08/19 20:45:12 tom Exp $
+.TH curs_getch 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .ie \n(.g .ds `` \(lq
@@ -151,8 +151,9 @@ misspellings (such as \*(``RSUME\*('' for \*(``resume\*('').
 The names correspond to the long terminfo capability names for the keys,
 and were defined long ago, in the 1980s.
 .PP
+.RS
 .TS
-center tab(/) ;
+tab(/) ;
 l l .
 \fBName\fP/\fBKey\fP \fBname\fP
 _
@@ -253,16 +254,19 @@ KEY_SUNDO/Shifted undo key
 KEY_SUSPEND/Suspend key
 KEY_UNDO/Undo key
 .TE
+.RE
 .PP
 Keypad is arranged like this:
-.br
+.PP
+.RS
 .TS
-center allbox tab(/) ;
+allbox tab(/) ;
 c c c .
 \fBA1\fP/\fBup\fP/\fBA3\fP
 \fBleft\fP/\fBB2\fP/\fBright\fP
 \fBC1\fP/\fBdown\fP/\fBC3\fP
 .TE
+.RE
 .sp
 A few of these predefined values do \fInot\fP correspond to a real key:
 .bP
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index aef2c7d9f..02d2d323b 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.32 2023/07/01 15:43:20 tom Exp $
-.TH curs_inch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.33 2023/08/19 20:46:33 tom Exp $
+.TH curs_inch 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -64,7 +64,7 @@ extract the character or attributes alone.
 .
 .SS Attributes
 The following bit-masks may be AND-ed with characters returned by \fBwinch\fP.
-.
+.PP
 .TS
 l l .
 \fBA_CHARTEXT\fP	Bit-mask to extract character
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index bd2b67498..829a50aeb 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.44 2023/07/01 14:25:06 tom Exp $
-.TH curs_initscr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.45 2023/08/19 19:46:20 tom Exp $
+.TH curs_initscr 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -219,7 +219,9 @@ For example
 NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fBTERMINAL\fP.
 \fBncurses\fP and SVr4 use the descriptor in \fBSCREEN\fP.
 .bP
-NetBSD and \fBncurses\fP use the descriptor in \fBTERMINAL\fP for terminal I/O modes,
+NetBSD and \fBncurses\fP use the descriptor
+in \fBTERMINAL\fP
+for terminal I/O modes,
 e.g.,
 \fBdef_shell_mode\fP(3X),
 \fBdef_prog_mode\fP(3X).
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index fa753dbeb..cbce7ef4a 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.42 2023/08/12 17:07:04 tom Exp $
-.TH curs_inopts 3X 2023-08-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.43 2023/08/19 20:55:23 tom Exp $
+.TH curs_inopts 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -301,11 +301,11 @@ if its parameter is outside the range 1..255.
 .SH EXTENSIONS
 This implementation provides four functions which may be used to detect
 if the corresponding flags were set or reset:
+.PP
 .TS
-l l l
-_ _ _ _
-l l l .
+l l l.
 \fBQuery\fP	\fBSet\fP	\fBReset\fP
+_
 is_cbreak	cbreak	nocbreak
 is_echo	echo	noecho
 is_nl	nl	nonl
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 2f5497835..14c90522b 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.36 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.37 2023/08/19 19:47:16 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_kernel 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.TH curs_kernel 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -83,7 +83,8 @@ to various \fBcurses\fP capabilities.
 These routines typically are used inside library routines.
 .SS def_prog_mode, def_shell_mode
 The \fBdef_prog_mode\fP and \fBdef_shell_mode\fP routines save the
-current terminal modes as the \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*(''
+current terminal modes as the \*(``program\*(''
+(in \fBcurses\fP) or \*(``shell\*(''
 (not in \fBcurses\fP) state for use by the \fBreset_prog_mode\fP and
 \fBreset_shell_mode\fP routines.
 This is done automatically by \fBinitscr\fP.
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index aad36e3d5..90d18ea78 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.30 2023/07/01 14:31:54 tom Exp $
-.TH curs_refresh 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.31 2023/08/19 19:47:40 tom Exp $
+.TH curs_refresh 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -82,9 +82,11 @@ In addition to all the window
 structures, \fBcurses\fP keeps two data structures representing the terminal
 screen:
 .bP
-a \fIphysical screen\fP, describing what is actually on the screen, and
+a \fIphysical screen\fP,
+describing what is actually on the screen, and
 .bP
-a \fIvirtual screen\fP, describing what the programmer wants to have on the screen.
+a \fIvirtual screen\fP,
+describing what the programmer wants to have on the screen.
 .PP
 The routine \fBwrefresh\fP works by
 .bP
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index ef0f8277d..444cb48f3 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.27 2023/07/01 14:31:54 tom Exp $
-.TH curs_scroll 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.28 2023/08/19 19:47:52 tom Exp $
+.TH curs_scroll 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -78,8 +78,8 @@ if scrolling is not enabled in the window, e.g., with \fBscrollok\fP(3X).
 Note that \fBscrl\fP and \fBscroll\fP may be macros.
 .PP
 The SVr4 documentation says that the optimization of physically scrolling
-immediately if the scroll region is the entire screen \*(``is\*('' performed, not
-\*(``may be\*('' performed.
+immediately if the scroll region is the entire screen \*(``is\*('' performed,
+not \*(``may be\*('' performed.
 This implementation deliberately does not guarantee
 that this will occur, to leave open the possibility of smarter
 optimization of multiple scroll actions on the next update.
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 5aa813d08..2cbc587be 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.32 2023/08/12 18:19:13 tom Exp $
-.TH curs_sp_funcs 3X 2023-08-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.33 2023/08/19 19:48:07 tom Exp $
+.TH curs_sp_funcs 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -261,7 +261,8 @@ to make it useful for checking if the extension is provided.
 NCURSES_SP_NAME
 The new functions are named using the macro \fINCURSES_SP_NAME\fP,
 which hides the actual implementation.
-Currently this adds a \*(``_sp\*('' suffix to the name of the unextended function.
+Currently this adds a \*(``_sp\*('' suffix
+to the name of the unextended function.
 This manual page indexes the extensions showing the full name.
 However the proper usage of these functions uses the macro,
 to provide for the possibility of changing the naming convention
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 3c3fcdba4..22ed0777b 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.94 2023/08/06 00:03:04 tom Exp $
-.TH curs_terminfo 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.95 2023/08/19 20:37:54 tom Exp $
+.TH curs_terminfo 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -535,11 +535,11 @@ as macros for BSD compatibility,
 .SH HISTORY
 SVr2 introduced the terminfo feature.
 Its programming manual mentioned these low-level functions:
+.PP
 .TS
-l l
-_ _
 l l.
 \fBFunction\fP	\fBDescription\fP
+_
 fixterm	restore tty to \*(``in curses\*('' state
 gettmode	establish current tty modes
 mvcur	low level cursor motion
@@ -563,6 +563,7 @@ T}
 The programming manual also mentioned
 functions provided for termcap compatibility
 (commenting that they \*(``may go away at a later date\*(''):
+.PP
 .TS
 l l
 _ _
@@ -584,6 +585,7 @@ Early terminfo programs obtained capability values from the
 SVr3 extended terminfo by adding functions to retrieve capability values
 (like the termcap interface),
 and reusing tgoto and tputs:
+.PP
 .TS
 l l
 _ _
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 86f7c236c..153f348d9 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.36 2023/08/06 00:02:33 tom Exp $
-.TH curs_threads 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.37 2023/08/19 20:38:10 tom Exp $
+.TH curs_threads 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -129,6 +129,7 @@ reentrant, i.e., it uses only the data passed as parameters.
 .PP
 This table lists the scope of data used for each symbol in the
 ncurses library when it is configured to support threading:
+.PP
 .TS
 center tab(/);
 l l
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 12372dd2b..4f741350b 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp $
-.TH curs_util 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.73 2023/08/19 20:38:17 tom Exp $
+.TH curs_util 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -207,6 +207,7 @@ it is still the environment variables which set the screen size.
 .PP
 The \fBuse_env\fP and \fBuse_tioctl\fP routines combine as
 summarized here:
+.PP
 .TS
 center tab(/);
 l l l
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 12ca61394..a90947dd6 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.36 2022/02/12 20:03:40 tom Exp $
-.TH default_colors 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.37 2023/08/19 19:48:15 tom Exp $
+.TH default_colors 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -57,7 +57,8 @@ Some applications are designed to work with the default background,
 using colors only for text.
 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,
+These \*(``color ls\*('' programs do not necessarily
+modify the background color,
 typically using only the \fBsetaf\fP terminfo capability to set the
 foreground color.
 Full-screen applications that use default colors can achieve similar
diff --git a/man/form.3x b/man/form.3x
index 15feb311b..ff81a43db 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.42 2023/07/01 15:46:10 tom Exp $
-.TH form 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.43 2023/08/19 20:38:32 tom Exp $
+.TH form 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -80,7 +80,7 @@ The following table lists each \fBform\fP routine and the name of
 the manual page on which it is described.
 Routines flagged with \*(``*\*(''
 are ncurses-specific, not present in SVr4.
-.
+.PP
 .TS
 l l
 l l .
diff --git a/man/form_driver.3x b/man/form_driver.3x
index bf801c3c1..9824f9867 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.44 2023/08/06 00:02:02 tom Exp $
-.TH form_driver 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.45 2023/08/19 20:38:39 tom Exp $
+.TH form_driver 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -67,6 +67,7 @@ to enable the library to determine whether the parameter
 is a wide character or a request.
 .SS Form-driver requests
 The form driver requests are as follows:
+.PP
 .TS
 l l
 _ _
diff --git a/man/infocmp.1m b/man/infocmp.1m
index c34f2f593..960791a8b 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.86 2023/07/01 14:31:54 tom Exp $
-.TH @INFOCMP@ 1M 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.87 2023/08/19 20:39:40 tom Exp $
+.TH @INFOCMP@ 1M 2023-08-19 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -149,7 +149,7 @@ for each of the \fItermnames\fP.
 .SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
 The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
 a source listing for each terminal named.
-.
+.PP
 .TS
 center tab(/) ;
 l l .
@@ -212,7 +212,7 @@ will not necessarily reproduce the original \fBterminfo\fP source.
 .PP
 Some common \fBterminfo\fP parameter sequences, their \fBtermcap\fP
 equivalents, and some terminal types which commonly have such sequences, are:
-.
+.PP
 .TS
 center tab(/) ;
 l c l
@@ -375,6 +375,7 @@ translated into {}-bracketed descriptions.
 .IP
 Here is a list of the DEC/ANSI
 special sequences recognized:
+.PP
 .TS
 center tab(/) ;
 l l
diff --git a/man/menu.3x b/man/menu.3x
index 48a37db37..4b114c48c 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.33 2023/07/01 15:46:10 tom Exp $
-.TH menu 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.34 2023/08/19 20:39:40 tom Exp $
+.TH menu 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -69,7 +69,7 @@ rendering of items already created.
 .
 The following table lists each \fBmenu\fP routine and the name of
 the manual page on which it is described.
-.
+.PP
 .TS
 l l .
 \fBcurses\fP Routine Name	Manual Page Name
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 011b31408..86361f9b1 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,9 +28,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.163 2023/08/12 17:14:08 tom Exp $
+.\" $Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp $
 .hy 0
-.TH ncurses 3X 2023-08-12 "ncurses 6.4" "Library calls"
+.TH ncurses 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -88,8 +88,9 @@ A program using these routines must be linked with the \fB\-lncurses\fP option,
 or (if it has been generated) with the debugging library \fB\-lncurses_g\fP.
 (Your system integrator may also have installed these libraries under
 the names \fB\-lcurses\fP and \fB\-lcurses_g\fP.)
-The ncurses_g library generates trace logs (in a file called \*(``trace\*('' in the
-current directory) that describe curses actions.
+The ncurses_g library generates trace logs
+(in a file called \*(``trace\*('' in the current directory)
+that describe curses actions.
 See also the section on \fBALTERNATE CONFIGURATIONS\fP.
 .PP
 The \fBncurses\fP package supports: overall screen, window and pad
diff --git a/man/panel.3x b/man/panel.3x
index 58600f028..fded6f2c6 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.46 2023/07/01 15:46:10 tom Exp $
-.TH panel 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.48 2023/08/19 21:01:21 tom Exp $
+.TH panel 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -150,8 +150,8 @@ is \fB(PANEL *)0\fP, it returns a pointer to the top panel in the stack.
 .\" ---------
 .SS panel_hidden
 \fBpanel_hidden(\fIpan\fB)\fR
-returns \fBTRUE\fP if the panel \fIpan\fP is in the panel stack,
-\fBFALSE\fP if it is not.
+returns \fBFALSE\fP if the panel \fIpan\fP is in the panel stack,
+\fBTRUE\fP if it is not.
 If the panel is a null pointer, return \fBERR\fP.
 .\" ---------
 .SS panel_userptr
diff --git a/man/terminfo.tail b/man/terminfo.tail
index aba4029c2..1a9e37d67 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.120 2023/07/15 19:46:56 tom Exp $
+.\" $Id: terminfo.tail,v 1.122 2023/08/19 20:14:38 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -143,15 +143,22 @@ ANSI-standard terminals have
 (i.e., an automatic return and line-feed
 when the end of a line is reached) is indicated by the capability \fBam\fP.
 Hence the description of ansi includes \fBam\fP.
-Numeric capabilities are followed by the character \*(``#\*('' and then a positive value.
+Numeric capabilities are followed by the character \*(``#\*(''
+and then a positive value.
 Thus \fBcols\fP, which indicates the number of columns the terminal has,
 gives the value \*(``80\*('' for ansi.
-Values for numeric capabilities may be specified in decimal, octal or hexadecimal,
-using the C programming language conventions (e.g., 255, 0377 and 0xff or 0xFF).
-.PP
-Finally, string valued capabilities, such as \fBel\fP (clear to end of line
-sequence) are given by the two-character code, an \*(``=\*('', and then a string
-ending at the next following \*(``,\*(''.
+Values for numeric capabilities may be specified in
+decimal,
+octal, or
+hexadecimal,
+using the C programming language conventions
+(e.g., 255, 0377 and 0xff or 0xFF).
+.PP
+Finally, string valued capabilities,
+such as \fBel\fP (clear to end of line sequence)
+are given by the two-character code,
+an \*(``=\*('', and then
+a string ending at the next following \*(``,\*(''.
 .PP
 A number of escape sequences are provided in the string valued capabilities
 for easy encoding of characters there:
@@ -212,7 +219,8 @@ 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
-place of precision; it may be followed by suffixes \*(``*\*('' or \*(``/\*('' or both.
+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
@@ -395,7 +403,8 @@ it may still be possible to craft a working
 .B nel
 out of one or both of them.
 .PP
-These capabilities suffice to describe hard-copy and \*(``glass-tty\*('' terminals.
+These capabilities suffice to describe
+hard-copy and \*(``glass-tty\*('' terminals.
 Thus the model 33 teletype is described as
 .PP
 .DT
@@ -449,7 +458,7 @@ The \fB%\fP encodings have the following meanings:
 \fB%%\fP
 outputs \*(``%\*(''
 .TP
-\fB%\fP\fI[[\fP:\fI]flags][width[.precision]][\fP\fBdoxXs\fP\fI]\fP
+\fB%\fI[[\fR:\fI]flags][width[.precision]][\fBdoxXs\fI]\fR
 as in \fBprintf\fP(3), flags are \fI[\-+#]\fP and \fIspace\fP.
 Use a \*(``:\*('' to allow the next character to be a \*(``\-\*('' flag,
 avoiding interpreting \*(``%\-\*('' as an operator.
@@ -460,19 +469,19 @@ print \fIpop()\fP like %c in \fBprintf\fP
 \fB%s\fP
 print \fIpop()\fP like %s in \fBprintf\fP
 .TP
-\fB%p\fP\fI[1\-9]\fP
+\fB%p\fI[1\-9]\fR
 push \fIi\fP'th parameter
 .TP
-\fB%P\fP\fI[a\-z]\fP
+\fB%P\fI[a\-z]\fR
 set dynamic variable \fI[a\-z]\fP to \fIpop()\fP
 .TP
-\fB%g\fP\fI[a\-z]\fP
+\fB%g\fI[a\-z]\fR
 get dynamic variable \fI[a\-z]\fP and push it
 .TP
-\fB%P\fP\fI[A\-Z]\fP
+\fB%P\fI[A\-Z]\fR
 set static variable \fI[a\-z]\fP to \fIpop()\fP
 .TP
-\fB%g\fP\fI[A\-Z]\fP
+\fB%g\fI[A\-Z]\fR
 get static variable \fI[a\-z]\fP and push it
 .IP
 The terms \*(``static\*('' and \*(``dynamic\*('' are misleading.
@@ -520,10 +529,10 @@ Use static variables if persistent storage is needed.
 .RE
 .RE
 .TP
-\fB%\(aq\fP\fIc\fP\fB\(aq\fP
+\fB%\(aq\fIc\fB\(aq\fR
 char constant \fIc\fP
 .TP
-\fB%{\fP\fInn\fP\fB}\fP
+\fB%{\fInn\fB}\fR
 integer constant \fInn\fP
 .TP
 \fB%l\fP
@@ -574,14 +583,19 @@ persistent across escape-string evaluations.
 .PP
 Consider the HP2645, which, to get to row 3 and column 12, needs
 to be sent \eE&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 \fBcup\fP capability is \*(``cup=6\eE&%p2%2dc%p1%2dY\*(''.
+The order of the rows and columns is inverted here,
+and the row and column are printed as two digits.
+The corresponding terminal description is expressed thus:
+.RS
+cup=\eE&a%p2%dc%p1%dY$<6>,
+.RE
 .PP
 The Microterm \s-1ACT-IV\s0 needs the current row and column sent
 preceded by a \fB^T\fP, with the row and column simply encoded in binary,
-\*(``cup=^T%p1%c%p2%c\*(''.
+.RS
+cup=^T%p1%c%p2%c
+.RE
+.PP
 Terminals which use \*(``%c\*('' need to be able to
 backspace the cursor (\fBcub1\fP),
 and to move the cursor up one line on the screen (\fBcuu1\fP).
@@ -592,7 +606,11 @@ tabs are never expanded, so \et is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
 .PP
 A final example is the \s-1LSI ADM\s0-3a, which uses row and column
-offset by a blank character, thus \*(``cup=\eE=%p1%\(aq \(aq%+%c%p2%\(aq \(aq%+%c\*(''.
+offset by a blank character, thus
+.RS
+cup=\eE=%p1%\(aq \(aq%+%c%p2%\(aq \(aq%+%c
+.RE
+.PP
 After sending \*(``\eE=\*('', 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.
@@ -636,7 +654,8 @@ such as the \s-1TEKTRONIX\s+1 4025.
 .PP
 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 \fBsmcup\fP and \fBrmcup\fP.
+the codes to enter and exit this mode can be given
+as \fBsmcup\fP and \fBrmcup\fP.
 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
@@ -1028,7 +1047,8 @@ this should be given as
 .B sgr
 (set attributes),
 taking 9 parameters.
-Each parameter is either 0 or nonzero, as the corresponding attribute is on or off.
+Each parameter is either zero (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.
@@ -1766,7 +1786,8 @@ The first parameter is the character to be repeated and the second
 is the number of times to repeat it.
 Thus, tparm(repeat_char, \(aqx\(aq, 10) is the same as \*(``xxxxxxxxxx\*(''.
 .PP
-If the terminal has a settable command character, such as the \s-1TEKTRONIX\s+1 4025,
+If the terminal has a settable command character,
+such as the \s-1TEKTRONIX\s+1 4025,
 this can be indicated with
 .BR cmdch .
 A prototype command character is chosen which is used in all capabilities.
@@ -1843,7 +1864,8 @@ is transparently passed to the printer while an
 .B mc5p
 is in effect.
 .SS Glitches and Braindamage
-Hazeltine terminals, which do not allow \*(``~\*('' characters to be displayed should
+Hazeltine terminals,
+which do not allow \*(``~\*('' characters to be displayed should
 indicate \fBhz\fP.
 .PP
 Terminals which ignore a line-feed immediately after an \fBam\fP wrap,
@@ -1875,26 +1897,32 @@ Note that in older terminfo versions, this capability was called
 \*(``beehive_glitch\*(''; it is now \*(``no_esc_ctl_c\*(''.
 .PP
 Other specific terminal problems may be corrected by adding more
-capabilities of the form \fBx\fP\fIx\fP.
+capabilities of the form \fBx\fIx\fR.
 .SS Pitfalls of Long Entries
 Long terminfo entries are unlikely to be a problem; to date, no entry has even
 approached terminfo's 4096-byte string-table maximum.
 Unfortunately, the termcap
-translations are much more strictly limited (to 1023 bytes), thus termcap translations
-of long terminfo entries can cause problems.
+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
-is searching for is, several bad things can happen.
+Depending on what the application and the termcap library being used does,
+and where in the termcap file the terminal type that \fBtgetent\fP
+is searching for is, several bad things can happen:
+.bP
+some termcap libraries print a warning message,
+.bP
+some exit if they find an entry that's longer than 1023 bytes,
+.bP
+some neither exit nor warn, doing nothing useful, and
+.bP
+some simply truncate the entries to 1023 bytes.
 .PP
-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.
 .PP
@@ -1927,8 +1955,9 @@ 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
 the whole termcap file).
 .PP
-Then \fBtgetent\fP will overwrite memory, perhaps its stack, and probably core dump
-the program.
+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.
 The results are almost
diff --git a/man/tic.1m b/man/tic.1m
index fc1b405e0..bd2b3b14c 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.87 2023/07/01 15:46:10 tom Exp $
-.TH @TIC@ 1M 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.88 2023/08/19 20:02:20 tom Exp $
+.TH @TIC@ 1M 2023-08-19 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -280,9 +280,17 @@ This option is for use with archaic
 versions of terminfo like those on SVr1, Ultrix, or HP-UX that do not support
 the full set of SVR4/XSI Curses terminfo; and outright broken ports like AIX 3.x
 that have their own extensions incompatible with SVr4/XSI.
-Available subsets
-are \*(``SVr1\*('', \*(``Ultrix\*('', \*(``HP\*('', \*(``BSD\*('' and \*(``AIX\*('';
-see \fBterminfo\fP(\*n) for details.
+.IP
+Available subsets are
+.RS
+\*(``SVr1\*('',
+\*(``Ultrix\*('',
+\*(``HP\*('',
+\*(``BSD\*('', and
+\*(``AIX\*(''
+.RE
+.IP
+See \fBterminfo\fP(\*n) for details.
 .TP
 \fB\-r\fP
 Force entry resolution (so there are no remaining tc capabilities) even
diff --git a/man/user_caps.5 b/man/user_caps.5
index 6430ac40b..8dcfd607c 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.29 2023/08/06 00:00:22 tom Exp $
-.TH user_caps 5 2023-08-05 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp $
+.TH user_caps 5 2023-08-19 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -359,6 +359,7 @@ to find these special keys in the terminal description.
 Starting with the curses convention that \fIkey names\fP begin with \*(``k\*(''
 and that shifted special keys are an uppercase name,
 ncurses' terminal database defines these names to which a suffix is added:
+.PP
 .RS 5
 .TS
 tab(/) ;
@@ -378,6 +379,7 @@ kUP/special form of kcuu1 (cursor-up)
 .RE
 .PP
 These are the suffixes used to denote the modifiers:
+.PP
 .RS 5
 .TS
 tab(/) ;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index a711baa2e..f0df3a34f 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230812) unstable; urgency=low
+ncurses6 (6.4+20230819) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index a711baa2e..f0df3a34f 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230812) unstable; urgency=low
+ncurses6 (6.4+20230819) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d431ef73d..cd6d65247 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230812) unstable; urgency=low
+ncurses6 (6.4+20230819) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Aug 2023 06:51:55 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index aa881048d..b9ab78394 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.599 2023/08/12 10:51:56 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.600 2023/08/19 10:43:27 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0812"
+!define VERSION_MMDD  "0819"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index c26a200f8..21f476ea5 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230812
+Release: 20230819
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1241a2e1b..2624ea9eb 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230812
+Release: 20230819
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e51d99d80..52deb0682 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230812
+Release: 20230819
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From e6c1b28acbc37260ff65953b597a747879c1f65f Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 27 Aug 2023 02:06:59 +0200
Subject: [PATCH 026/106] ncurses-6.4-20230826.patch

---
 NEWS                             |  6 ++-
 VERSION                          |  2 +-
 c++/demo.cc                      |  7 +--
 config.guess                     | 57 +++++++++++++++++----
 config.sub                       | 87 +++++++++++++++++---------------
 dist.mk                          |  4 +-
 ncurses/curses.priv.h            |  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 +-
 package/ncursest.spec            |  2 +-
 14 files changed, 117 insertions(+), 76 deletions(-)

diff --git a/NEWS b/NEWS
index 19ea3ad2a..50c302139 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3988 2023/08/19 21:03:44 tom Exp $
+-- $Id: NEWS,v 1.3990 2023/08/26 22:17:45 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230826
+	+ fixes for compiler-warnings.
+	+ update config.guess, config.sub
+
 20230819
 	+ various manpage-formatting fixes.
 	+ correct formatting of table header in curs_inopts.3x (Branden
diff --git a/VERSION b/VERSION
index a396dbef5..46beeb4ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230819
+5:0:10	6.4	20230826
diff --git a/c++/demo.cc b/c++/demo.cc
index e184e954f..7d300ff38 100644
--- a/c++/demo.cc
+++ b/c++/demo.cc
@@ -36,7 +36,7 @@
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *
- * $Id: demo.cc,v 1.51 2023/07/08 12:46:45 tom Exp $
+ * $Id: demo.cc,v 1.52 2023/08/26 19:14:14 tom Exp $
  */
 
 #include "internal.h"
@@ -169,7 +169,7 @@ class UserData
 //
 // -------------------------------------------------------------------------
 //
-template<class T> class MyAction : public NCursesUserItem<T>
+template<class T> class NCURSES_CXX_IMPEXP MyAction : public NCursesUserItem<UserData>
 {
 public:
   MyAction (const char* p_name,
@@ -186,9 +186,6 @@ template<class T> class MyAction : public NCursesUserItem<T>
   }
 };
 
-template class MyAction<UserData>;
-template class NCURSES_CXX_IMPEXP NCursesUserItem<UserData>;
-
 class QuitItem : public NCursesMenuItem
 {
 public:
diff --git a/config.guess b/config.guess
index a419d8643..b18721393 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2023-07-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -60,13 +60,13 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 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."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -459,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -966,11 +966,37 @@ EOF
 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
 	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
 	;;
+    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+	;;
+    *:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	;;
     *:Minix:*:*)
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
     aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	set_cc_for_build
+	CPU=$UNAME_MACHINE
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __ARM_EABI__
+	    #ifdef __ARM_PCS_VFP
+	    ABI=eabihf
+	    #else
+	    ABI=eabi
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
+	    esac
+	fi
+	GUESS=$CPU-unknown-linux-$LIBCABI
 	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -1036,6 +1062,15 @@ EOF
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
+    kvx:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    kvx:cos:*:*)
+	GUESS=$UNAME_MACHINE-unknown-cos
+	;;
+    kvx:mbr:*:*)
+	GUESS=$UNAME_MACHINE-unknown-mbr
+	;;
     loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
@@ -1191,7 +1226,7 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1332,7 +1367,7 @@ EOF
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;
diff --git a/config.sub b/config.sub
index fbaa37f23..6ae250275 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2023-07-31'
 
 # 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
@@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 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."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -130,7 +130,7 @@ IFS=$saved_IFS
 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
+		echo "Invalid configuration '$1': more than four components" >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -145,7 +145,8 @@ case $1 in
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova*)
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -943,7 +944,7 @@ $basic_machine
 EOF
 		IFS=$saved_IFS
 		;;
-	# We use `pc' rather than `unknown'
+	# We use 'pc' rather than 'unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1075,7 +1076,7 @@ case $cpu-$vendor in
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
 		cpu=i686
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1205,6 +1206,7 @@ case $cpu-$vendor in
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
+			| kvx \
 			| le32 | le64 \
 			| lm32 \
 			| loongarch32 | loongarch64 \
@@ -1213,31 +1215,7 @@ case $cpu-$vendor in
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64eb | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
+			| mips* \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
@@ -1285,7 +1263,7 @@ case $cpu-$vendor in
 				;;
 
 			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
 				exit 1
 				;;
 		esac
@@ -1341,6 +1319,10 @@ EOF
 		kernel=linux
 		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
 		;;
+	managarm*)
+		kernel=managarm
+		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+		;;
 	*)
 		kernel=
 		os=$basic_os
@@ -1728,7 +1710,7 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
+	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1754,7 +1736,7 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* )
+	     | fiwix* | mlibc* | cos* | mbr* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1762,8 +1744,11 @@ case $os in
 		;;
 	none)
 		;;
+	kernel* | msvc* )
+		# Restricted further below
+		;;
 	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
 		exit 1
 		;;
 esac
@@ -1772,14 +1757,30 @@ esac
 # (given a valid OS), if there is a kernel.
 case $kernel-$os in
 	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		   | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
 		;;
 	uclinux-uclibc* )
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+	managarm-mlibc* | managarm-kernel* )
+		;;
+	windows*-gnu* | windows*-msvc*)
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	-kernel* )
+		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	*-kernel* )
+		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
+		exit 1
+		;;
+	*-msvc* )
+		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
 	kfreebsd*-gnu* | kopensolaris*-gnu*)
@@ -1792,11 +1793,15 @@ case $kernel-$os in
 		;;
 	*-eabi* | *-gnueabi*)
 		;;
+	none-coff* | none-elf*)
+		# None (no kernel, i.e. freestanding / bare metal),
+		# can be paired with an output format "OS"
+		;;
 	-*)
 		# Blank kernel with real OS is always fine.
 		;;
 	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
 esac
diff --git a/dist.mk b/dist.mk
index 191663fb3..9694983d7 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1560 2023/08/19 10:43:27 tom Exp $
+# $Id: dist.mk,v 1.1561 2023/08/26 19:29:45 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230819
+NCURSES_PATCH = 20230826
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 3fd8e0d26..1a7fa6087 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.670 2023/06/24 13:00:26 tom Exp $
+ * $Id: curses.priv.h,v 1.671 2023/08/26 19:01:27 tom Exp $
  *
  *	curses.priv.h
  *
@@ -144,14 +144,14 @@ extern int errno;
 #if (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0) && (defined(__GNUC__) && (__GNUC__ < 12))
 # undef PRIxPTR		/* gcc bug fixed in 12.x */
 # define PRIxPTR	"lX"
-# define CASTxPTR(n)    (unsigned long)(intptr_t)(n)
+# define CASTxPTR(n)    (unsigned long)(intptr_t)(void*)(n)
 #else
-# define CASTxPTR(n)    (intptr_t)(n)
+# define CASTxPTR(n)    (intptr_t)(void*)(n)
 #endif
 
 #ifndef PRIxPTR
 # define PRIxPTR	"lx"
-# define CASTxPTR(n)    (long)(n)
+# define CASTxPTR(n)    (long)(void*)(n)
 #endif
 
 /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index f0df3a34f..b2cd5eee5 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230819) unstable; urgency=low
+ncurses6 (6.4+20230826) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index f0df3a34f..b2cd5eee5 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230819) unstable; urgency=low
+ncurses6 (6.4+20230826) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index cd6d65247..ce0399d80 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230819) unstable; urgency=low
+ncurses6 (6.4+20230826) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Aug 2023 06:43:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index b9ab78394..453d23d8d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.600 2023/08/19 10:43:27 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.601 2023/08/26 19:29:45 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0819"
+!define VERSION_MMDD  "0826"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 21f476ea5..6baedf733 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230819
+Release: 20230826
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2624ea9eb..5e987459e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230819
+Release: 20230826
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 52deb0682..2e8e05ae5 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230819
+Release: 20230826
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From c953560935aae0fed56a1ce4ea9a80899666f941 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 3 Sep 2023 01:12:13 +0200
Subject: [PATCH 027/106] ncurses-6.4-20230902.patch

---
 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/form.3x.html             |    2 +-
 doc/html/man/infocmp.1m.html          |  184 ++--
 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            |   10 +-
 doc/html/man/tabs.1.html              |    2 +-
 doc/html/man/terminfo.5.html          | 1108 +++++++++++++------------
 doc/html/man/tic.1m.html              |  273 +++---
 doc/html/man/toe.1m.html              |    2 +-
 doc/html/man/tput.1.html              |    2 +-
 doc/html/man/tset.1.html              |    2 +-
 man/infocmp.1m                        |    9 +-
 man/terminfo.head                     |    4 +-
 man/terminfo.tail                     |   55 +-
 man/tic.1m                            |    7 +-
 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 +-
 30 files changed, 882 insertions(+), 826 deletions(-)

diff --git a/NEWS b/NEWS
index 50c302139..c214db314 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3990 2023/08/26 22:17:45 tom Exp $
+-- $Id: NEWS,v 1.3992 2023/09/02 22:31:36 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230902
+	+ improve description of search rules for terminal descriptions in
+	  terminfo manpage (report by Sven Joachim).
+
 20230826
 	+ fixes for compiler-warnings.
 	+ update config.guess, config.sub
diff --git a/VERSION b/VERSION
index 46beeb4ae..65d711a1d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230826
+5:0:10	6.4	20230902
diff --git a/dist.mk b/dist.mk
index 9694983d7..199153050 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1561 2023/08/26 19:29:45 tom Exp $
+# $Id: dist.mk,v 1.1562 2023/09/02 09:30:01 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230826
+NCURSES_PATCH = 20230902
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 53e0a5cf5..17293d49a 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 4844d0c4e..08f5d51f8 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 8f60a77ee..13877ea65 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 6cc7eb8fa..3a899c2d6 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 51b713050..1551b5b2b 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.87 2023/08/19 20:39:40 tom Exp @
+  * @Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-09-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-09-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -219,18 +219,19 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
        Like  other  <STRONG>ncurses</STRONG>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
        descriptions   in  several  places.   You  can  use  the  <STRONG>TERMINFO</STRONG>  and
        <STRONG>TERMINFO_DIRS</STRONG> environment variables to override the compiled-in default
-       list of places to search (see <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> for details).
+       list  of  places  to  search.   See <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, as well as the <EM>Fetching</EM>
+       <EM>Compiled</EM> <EM>Descriptions</EM> section in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       You  can  also use the options <STRONG>-A</STRONG> and <STRONG>-B</STRONG> to override the list of places
+       You can also use the options <STRONG>-A</STRONG> and <STRONG>-B</STRONG> to override the list  of  places
        to search when comparing terminal descriptions:
 
        <STRONG>o</STRONG>   The <STRONG>-A</STRONG> option sets the location for the first <EM>termname</EM>
 
        <STRONG>o</STRONG>   The <STRONG>-B</STRONG> option sets the location for the other <EM>termnames</EM>.
 
-       Using these options, it is  possible  to  compare  descriptions  for  a
-       terminal  with  the  same name located in two different databases.  For
-       instance, you can use this feature for comparing descriptions  for  the
+       Using  these  options,  it  is  possible  to compare descriptions for a
+       terminal with the same name located in two  different  databases.   For
+       instance,  you  can use this feature for comparing descriptions for the
        same terminal created by different people.
 
 
@@ -238,66 +239,66 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
        <STRONG>-0</STRONG>   causes the fields to be printed on one line, without wrapping.
 
        <STRONG>-1</STRONG>   causes the fields to be printed out one to a line.  Otherwise, the
-            fields will be printed several to a line to a maximum width of  60
+            fields  will be printed several to a line to a maximum width of 60
             characters.
 
-       <STRONG>-a</STRONG>   tells  <STRONG>infocmp</STRONG>  to  retain  commented-out capabilities rather than
-            discarding them.  Capabilities are  commented  by  prefixing  them
+       <STRONG>-a</STRONG>   tells <STRONG>infocmp</STRONG> to retain  commented-out  capabilities  rather  than
+            discarding  them.   Capabilities  are  commented by prefixing them
             with a period.
 
        <STRONG>-D</STRONG>   tells <STRONG>infocmp</STRONG> to print the database locations that it knows about,
             and exit.
 
-       <STRONG>-E</STRONG>   Dump the capabilities of the given terminal as tables,  needed  in
-            the   C   initializer  for  a  TERMTYPE  structure  (the  terminal
-            capability structure in the <STRONG>&lt;term.h&gt;</STRONG>).  This option is useful  for
-            preparing  versions  of  the  curses library hardwired for a given
-            terminal type.  The tables are all declared static, and are  named
-            according  to  the type and the name of the corresponding terminal
+       <STRONG>-E</STRONG>   Dump  the  capabilities of the given terminal as tables, needed in
+            the  C  initializer  for  a  TERMTYPE  structure   (the   terminal
+            capability  structure in the <STRONG>&lt;term.h&gt;</STRONG>).  This option is useful for
+            preparing versions of the curses library  hardwired  for  a  given
+            terminal  type.  The tables are all declared static, and are named
+            according to the type and the name of the  corresponding  terminal
             entry.
 
-            Before ncurses 5.0, the split between the <STRONG>-e</STRONG> and  <STRONG>-E</STRONG>  options  was
-            not  needed;  but  support  for extended names required making the
-            arrays  of  terminal  capabilities  separate  from  the   TERMTYPE
+            Before  ncurses  5.0,  the split between the <STRONG>-e</STRONG> and <STRONG>-E</STRONG> options was
+            not needed; but support for extended  names  required  making  the
+            arrays   of  terminal  capabilities  separate  from  the  TERMTYPE
             structure.
 
        <STRONG>-e</STRONG>   Dump the capabilities of the given terminal as a C initializer for
-            a TERMTYPE structure (the terminal  capability  structure  in  the
-            <STRONG>&lt;term.h&gt;</STRONG>).   This  option  is useful for preparing versions of the
+            a  TERMTYPE  structure  (the  terminal capability structure in the
+            <STRONG>&lt;term.h&gt;</STRONG>).  This option is useful for preparing  versions  of  the
             curses library hardwired for a given terminal type.
 
        <STRONG>-F</STRONG>   compare terminfo files.  This assumes that two following arguments
-            are  filenames.   The  files  are  searched  for  pairwise matches
-            between entries, with two entries considered to match  if  any  of
-            their  names  do.   The  report  printed  to standard output lists
-            entries with no matches in the other file, and entries  with  more
-            than  one match.  For entries with exactly one match it includes a
-            difference report.  Normally, to reduce the volume of the  report,
-            use  references  are  not resolved before looking for differences,
+            are filenames.   The  files  are  searched  for  pairwise  matches
+            between  entries,  with  two entries considered to match if any of
+            their names do.  The  report  printed  to  standard  output  lists
+            entries  with  no matches in the other file, and entries with more
+            than one match.  For entries with exactly one match it includes  a
+            difference  report.  Normally, to reduce the volume of the report,
+            use references are not resolved before  looking  for  differences,
             but resolution can be forced by also specifying <STRONG>-r</STRONG>.
 
-       <STRONG>-f</STRONG>   Display complex terminfo strings which contain  if/then/else/endif
+       <STRONG>-f</STRONG>   Display  complex terminfo strings which contain if/then/else/endif
             expressions indented for readability.
 
-       <STRONG>-G</STRONG>   Display  constant  literals  in  decimal  form  rather  than their
+       <STRONG>-G</STRONG>   Display constant  literals  in  decimal  form  rather  than  their
             character equivalents.
 
-       <STRONG>-g</STRONG>   Display constant character literals in  quoted  form  rather  than
+       <STRONG>-g</STRONG>   Display  constant  character  literals  in quoted form rather than
             their decimal equivalents.
 
-       <STRONG>-i</STRONG>   Analyze  the  initialization (<STRONG>is1</STRONG>, <STRONG>is2</STRONG>, <STRONG>is3</STRONG>), and reset (<STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>,
-            <STRONG>rs3</STRONG>),  strings  in  the  entry,  as  well  as   those   used   for
-            starting/stopping  cursor-positioning  mode (<STRONG>smcup</STRONG>, <STRONG>rmcup</STRONG>) as well
+       <STRONG>-i</STRONG>   Analyze the initialization (<STRONG>is1</STRONG>, <STRONG>is2</STRONG>, <STRONG>is3</STRONG>), and reset  (<STRONG>rs1</STRONG>,  <STRONG>rs2</STRONG>,
+            <STRONG>rs3</STRONG>),   strings   in   the  entry,  as  well  as  those  used  for
+            starting/stopping cursor-positioning mode (<STRONG>smcup</STRONG>, <STRONG>rmcup</STRONG>)  as  well
             as starting/stopping keymap mode (<STRONG>smkx</STRONG>, <STRONG>rmkx</STRONG>).
 
-            For each string, the code tries to  analyze  it  into  actions  in
-            terms  of  the  other capabilities in the entry, certain X3.64/ISO
+            For  each  string,  the  code  tries to analyze it into actions in
+            terms of the other capabilities in the  entry,  certain  X3.64/ISO
             6429/ECMA-48 capabilities, and certain DEC VT-series private modes
-            (the  set  of  recognized  special sequences has been selected for
-            completeness over the existing terminfo  database).   Each  report
-            line  consists  of  the  capability  name, followed by a colon and
-            space, followed by a printable expansion of the capability  string
-            with   sections   matching   recognized  actions  translated  into
+            (the set of recognized special sequences  has  been  selected  for
+            completeness  over  the  existing terminfo database).  Each report
+            line consists of the capability name,  followed  by  a  colon  and
+            space,  followed by a printable expansion of the capability string
+            with  sections  matching  recognized   actions   translated   into
             {}-bracketed descriptions.
 
             Here is a list of the DEC/ANSI special sequences recognized:
@@ -311,9 +312,10 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
                       RSR           reset scroll region
                       -----------------------------------------
                       DECSTR        soft reset (VT320)
+
+
                       S7C1T         7-bit controls (VT220)
                       -----------------------------------------
-
                       ISO DEC G0    enable DEC graphics for G0
                       ISO UK G0     enable UK chars for G0
                       ISO US G0     enable US chars for G0
@@ -347,15 +349,15 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
               <STRONG>o</STRONG>   "-" (turn off).
 
-              An SGR0 designates an empty highlight  sequence  (equivalent  to
+              An  SGR0  designates  an empty highlight sequence (equivalent to
               {SGR:NORMAL}).
 
        <STRONG>-l</STRONG>   Set output format to terminfo.
 
        <STRONG>-p</STRONG>   Ignore padding specifications when comparing strings.
 
-       <STRONG>-Q</STRONG> <EM>n</EM> Rather  than  show  source  in  terminfo  (text) format, print the
-            compiled (binary) format in hexadecimal or base64 form,  depending
+       <STRONG>-Q</STRONG> <EM>n</EM> Rather than show source  in  terminfo  (text)  format,  print  the
+            compiled  (binary) format in hexadecimal or base64 form, depending
             on the option's value:
 
                1  hexadecimal
@@ -364,39 +366,39 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
                3  hexadecimal and base64
 
-            For  example,  this prints the compiled terminfo value as a string
+            For example, this prints the compiled terminfo value as  a  string
             which could be assigned to the <STRONG>TERMINFO</STRONG> environment variable:
 
                 infocmp -0 -q -Q2
 
        <STRONG>-q</STRONG>   This makes the output a little shorter:
 
-            <STRONG>o</STRONG>   Make the comparison listing shorter by  omitting  subheadings,
+            <STRONG>o</STRONG>   Make  the  comparison listing shorter by omitting subheadings,
                 and using "-" for absent capabilities, "@" for canceled rather
                 than "NULL".
 
-            <STRONG>o</STRONG>   However,  show  differences  between  absent   and   cancelled
+            <STRONG>o</STRONG>   However,   show   differences  between  absent  and  cancelled
                 capabilities.
 
             <STRONG>o</STRONG>   Omit the "Reconstructed from" comment for source listings.
 
        <STRONG>-R</STRONG><EM>subset</EM>
-            Restrict  output  to  a given subset.  This option is for use with
-            archaic versions of terminfo like those on SVr1, Ultrix, or  HP-UX
-            that  do not support the full set of SVR4/XSI Curses terminfo; and
-            variants such as AIX that have their own  extensions  incompatible
+            Restrict output to a given subset.  This option is  for  use  with
+            archaic  versions of terminfo like those on SVr1, Ultrix, or HP-UX
+            that do not support the full set of SVR4/XSI Curses terminfo;  and
+            variants  such  as AIX that have their own extensions incompatible
             with SVr4/XSI.
 
-            <STRONG>o</STRONG>   Available  terminfo  subsets  are  "SVr1", "Ultrix", "HP", and
+            <STRONG>o</STRONG>   Available terminfo subsets are  "SVr1",  "Ultrix",  "HP",  and
                 "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-            <STRONG>o</STRONG>   You can also  choose  the  subset  "BSD"  which  selects  only
+            <STRONG>o</STRONG>   You  can  also  choose  the  subset  "BSD"  which selects only
                 capabilities with termcap equivalents recognized by 4.4BSD.
 
-            <STRONG>o</STRONG>   If  you  select  any  other value for <STRONG>-R</STRONG>, it is the same as no
+            <STRONG>o</STRONG>   If you select any other value for <STRONG>-R</STRONG>, it is  the  same  as  no
                 subset, i.e., all capabilities are used.
 
-            A few options override the subset selected with <STRONG>-R</STRONG>,  if  they  are
+            A  few  options  override the subset selected with <STRONG>-R</STRONG>, if they are
             processed later in the command parameters:
 
             <STRONG>-C</STRONG>   sets the "BSD" subset as a side-effect.
@@ -406,10 +408,10 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
             <STRONG>-r</STRONG>   sets the subset to all capabilities.
 
        <STRONG>-s</STRONG> <EM>[d|i|l|c]</EM>
-            The  <STRONG>-s</STRONG>  option sorts the fields within each type according to the
+            The <STRONG>-s</STRONG> option sorts the fields within each type according  to  the
             argument below:
 
-            <STRONG>d</STRONG>    leave fields in  the  order  that  they  are  stored  in  the
+            <STRONG>d</STRONG>    leave  fields  in  the  order  that  they  are  stored in the
                  <EM>terminfo</EM> database.
 
             <STRONG>i</STRONG>    sort by <EM>terminfo</EM> name.
@@ -418,45 +420,45 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
             <STRONG>c</STRONG>    sort by the <EM>termcap</EM> name.
 
-            If  the  <STRONG>-s</STRONG>  option  is  not given, the fields printed out will be
-            sorted alphabetically by  the  <STRONG>terminfo</STRONG>  name  within  each  type,
-            except  in  the  case of the <STRONG>-C</STRONG> or the <STRONG>-L</STRONG> options, which cause the
-            sorting to be done by the <STRONG>termcap</STRONG> name  or  the  long  C  variable
+            If the <STRONG>-s</STRONG> option is not given, the  fields  printed  out  will  be
+            sorted  alphabetically  by  the  <STRONG>terminfo</STRONG>  name  within each type,
+            except in the case of the <STRONG>-C</STRONG> or the <STRONG>-L</STRONG> options,  which  cause  the
+            sorting  to  be  done  by  the <STRONG>termcap</STRONG> name or the long C variable
             name, respectively.
 
-       <STRONG>-T</STRONG>   eliminates  size-restrictions  on  the  generated  text.   This is
+       <STRONG>-T</STRONG>   eliminates size-restrictions  on  the  generated  text.   This  is
             mainly  useful  for  testing  and  analysis,  since  the  compiled
             descriptions  are  limited  (e.g.,  1023  for  termcap,  4096  for
             terminfo).
 
-       <STRONG>-t</STRONG>   tells <STRONG>tic</STRONG> to discard commented-out  capabilities.   Normally  when
-            translating  from terminfo to termcap, untranslatable capabilities
+       <STRONG>-t</STRONG>   tells  <STRONG>tic</STRONG>  to  discard commented-out capabilities.  Normally when
+            translating from terminfo to termcap, untranslatable  capabilities
             are commented-out.
 
-       <STRONG>-U</STRONG>   tells <STRONG>infocmp</STRONG> to not  post-process  the  data  after  parsing  the
+       <STRONG>-U</STRONG>   tells  <STRONG>infocmp</STRONG>  to  not  post-process  the  data after parsing the
             source  file.   This  feature  helps  when  comparing  the  actual
-            contents of two source files, since  it  excludes  the  inferences
+            contents  of  two  source  files, since it excludes the inferences
             that <STRONG>infocmp</STRONG> makes to fill in missing data.
 
        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
             exits.
 
-       <STRONG>-v</STRONG> <EM>n</EM> prints out tracing information on standard error  as  the  program
+       <STRONG>-v</STRONG> <EM>n</EM> prints  out  tracing  information on standard error as the program
             runs.
 
-            The  optional  parameter  <EM>n</EM>  is  a number from 1 to 10, inclusive,
+            The optional parameter <EM>n</EM> 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
+            is built  without  tracing  support,  the  optional  parameter  is
             ignored.
 
-       <STRONG>-W</STRONG>   By itself, the <STRONG>-w</STRONG>  option  will  not  force  long  strings  to  be
+       <STRONG>-W</STRONG>   By  itself,  the  <STRONG>-w</STRONG>  option  will  not  force  long strings to be
             wrapped.  Use the <STRONG>-W</STRONG> option to do this.
 
        <STRONG>-w</STRONG> <EM>width</EM>
             changes the output to <EM>width</EM> characters.
 
        <STRONG>-x</STRONG>   print information for user-defined capabilities (see <STRONG>user_caps(5)</STRONG>.
-            These are extensions to  the  terminfo  repertoire  which  can  be
+            These  are  extensions  to  the  terminfo  repertoire which can be
             loaded using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>.
 
 
@@ -465,48 +467,48 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Although  System  V  Release  2  provided a terminfo library, it had no
+       Although System V Release 2 provided a  terminfo  library,  it  had  no
        documented tool for decompiling the terminal descriptions.  Tony Hansen
        (AT&amp;T) wrote the first <STRONG>infocmp</STRONG> in early 1984, for System V Release 3.
 
-       Eric  Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide an
-       equivalent <STRONG>infocmp</STRONG> for ncurses.   In  addition,  he  added  a  few  new
+       Eric Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide  an
+       equivalent  <STRONG>infocmp</STRONG>  for  ncurses.   In  addition,  he  added a few new
        features such as:
 
-       <STRONG>o</STRONG>   the   <STRONG>-e</STRONG>   option,   to  support  <EM>fallback</EM>  (compiled-in)  terminal
+       <STRONG>o</STRONG>   the  <STRONG>-e</STRONG>  option,  to  support   <EM>fallback</EM>   (compiled-in)   terminal
            descriptions
 
        <STRONG>o</STRONG>   the <STRONG>-i</STRONG> option, to help with analysis
 
-       Later, Thomas Dickey added the <STRONG>-x</STRONG> (user-defined  capabilities)  option,
-       and  the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with user-defined
+       Later,  Thomas  Dickey added the <STRONG>-x</STRONG> (user-defined capabilities) option,
+       and the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with  user-defined
        capabilities.
 
        For a complete list, see the <EM>EXTENSIONS</EM> section.
 
-       In 2010, Roy Marples provided an <STRONG>infocmp</STRONG> 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  <STRONG>-x</STRONG>  option
+       In  2010,  Roy  Marples  provided an <STRONG>infocmp</STRONG> 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 <STRONG>-x</STRONG> option
        adapted from ncurses.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  7 (2009) provides a description of <STRONG>infocmp</STRONG>.  It
+       X/Open Curses, Issue 7 (2009) provides a description  of  <STRONG>infocmp</STRONG>.   It
        does not mention the options used for converting to termcap format.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>
+       The  <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG>
        and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
 
-       SVr4   infocmp  does  not  distinguish  between  absent  and  cancelled
-       capabilities.  Also, it shows missing integer capabilities as  <STRONG>-1</STRONG>  (the
+       SVr4  infocmp  does  not  distinguish  between  absent  and   cancelled
+       capabilities.   Also,  it shows missing integer capabilities as <STRONG>-1</STRONG> (the
        internal   value   used   to   represent   missing   integers).    This
-       implementation shows those as  "NULL",  for  consistency  with  missing
+       implementation  shows  those  as  "NULL",  for consistency with missing
        strings.
 
-       The  <STRONG>-r</STRONG>  option's  notion of "termcap" capabilities is System V Release
-       4's.  Actual BSD curses versions will have a more restricted  set.   To
+       The <STRONG>-r</STRONG> 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 <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
 
 
@@ -520,7 +522,7 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -529,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-08-19                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-09-02                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9196cca4c..1e7824244 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 49c614c1c..17b04645e 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 1d30c32b4..3e0e6d36b 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index a18183aa1..a1cb68030 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 8265818e3..fd0226823 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.47 2023/08/19 21:01:21 tom Exp @
+  * @Id: panel.3x,v 1.48 2023/08/19 21:01:21 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -295,7 +295,7 @@ <H1 class="no-header">panel 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-08-19                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index d5e38ae5a..fc4b89c99 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 7f0b6b8e7..125c85be0 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.44 2023/07/01 15:46:56 tom Exp @
+  * @Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.122 2023/08/19 20:14:38 tom Exp @
+  * @Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -74,12 +74,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-07-01 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-09-02 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1316,104 +1316,123 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-Fetching-Compiled-Descriptions">Fetching Compiled Descriptions</a></H3><PRE>
-       The  <STRONG>ncurses</STRONG>  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,  <STRONG>ncurses</STRONG>  eliminates
-       duplicates in its search list.
+       Terminal  descriptions  in  <STRONG>ncurses</STRONG>  are  stored in terminal databases.
+       These databases, which are found by their pathname, may  be  configured
+       either as directory trees or hashed databases (see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>),
 
-       <STRONG>o</STRONG>   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.
+       The  library  uses  a  compiled-in  list  of  pathnames,  which  can be
+       overridden  by  environment  variables.   Before  starting  to  search,
+       <STRONG>ncurses</STRONG>  checks  the  search list, eliminating duplicates and pathnames
+       where no terminal database is found.  The  <STRONG>ncurses</STRONG>  library  reads  the
+       first description which passes its consistency checks.
 
-       <STRONG>o</STRONG>   If  TERMINFO is not set, <STRONG>ncurses</STRONG> will instead look in the directory
-           <STRONG>$HOME/.terminfo</STRONG> for a compiled description.
+       <STRONG>o</STRONG>   The  environment variable <STRONG>TERMINFO</STRONG> is checked first, for a terminal
+           database containing the terminal description.
 
-       <STRONG>o</STRONG>   Next, if the environment variable  TERMINFO_DIRS  is  set,  <STRONG>ncurses</STRONG>
-           will  interpret  the  contents of that variable as a list of colon-
-           separated directories (or database files) to be searched.
+       <STRONG>o</STRONG>   Next, <STRONG>ncurses</STRONG> looks in <STRONG>$HOME/.terminfo</STRONG> for a compiled description.
 
-           An empty directory name (i.e., if the variable begins or ends  with
-           a  colon, or contains adjacent colons) is interpreted as the system
+           This is an optional feature which may be omitted entirely from  the
+           library,  or  limited  to  prevent  accidental  use  by  privileged
+           applications.
+
+       <STRONG>o</STRONG>   Next, if the environment variable  <STRONG>TERMINFO_DIRS</STRONG>  is  set,  <STRONG>ncurses</STRONG>
+           interprets  the  contents  of  that  variable  as  a list of colon-
+           separated pathnames of terminal databases to be searched.
+
+           An empty pathname (i.e., if the variable  begins  or  ends  with  a
+           colon,  or  contains  adjacent colons) is interpreted as the system
            location <EM>/usr/share/terminfo</EM>.
 
        <STRONG>o</STRONG>   Finally, <STRONG>ncurses</STRONG> searches these compiled-in locations:
 
            <STRONG>o</STRONG>   a list of directories (/usr/share/terminfo), and
 
-           <STRONG>o</STRONG>   the  system  terminfo   directory,   <EM>/usr/share/terminfo</EM>   (the
-               compiled-in default).
+           <STRONG>o</STRONG>   the system terminfo directory, <EM>/usr/share/terminfo</EM>
+
+       The <STRONG>TERMINFO</STRONG> variable can contain a terminal description instead of the
+       pathname  of  a terminal database.  If this variable begins with "hex:"
+       or "b64:" then <STRONG>ncurses</STRONG> reads a terminal description  from  hexadecimal-
+       or  base64-encoded  data,  and  if  that  description  matches the name
+       sought, will use that.  This encoded data can be  set  using  the  "-Q"
+       option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG>.
+
+       The  preceding addresses the usual configuration of <STRONG>ncurses</STRONG>, which uses
+       terminal descriptions prepared in <EM>terminfo</EM> format.   While  <EM>termcap</EM>  is
+       less  expressive,  <STRONG>ncurses</STRONG>  can  also  be  configured  to  read <EM>termcap</EM>
+       descriptions.   In  that  configuration,  it  checks  the  <STRONG>TERMCAP</STRONG>  and
+       <STRONG>TERMPATH</STRONG>  variables  (for  content and search path, respectively) after
+       the system terminal database.
 
 
 </PRE><H3><a name="h3-Preparing-Descriptions">Preparing Descriptions</a></H3><PRE>
-       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  <EM>terminfo</EM>  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  <EM>terminfo</EM>  and  to  build  up  a
        description gradually, using partial descriptions with <EM>vi</EM> 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
        <EM>terminfo</EM> 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.
 
 
 </PRE><H3><a name="h3-Basic-Capabilities">Basic Capabilities</a></H3><PRE>
-       The number of columns on each line for the terminal  is  given  by  the
-       <STRONG>cols</STRONG>  numeric capability.  If the terminal is a CRT, then the number of
-       lines on the screen is given by the <STRONG>lines</STRONG> capability.  If the  terminal
-       wraps  around  to  the  beginning  of the next line when it reaches the
-       right margin, then it should have the <STRONG>am</STRONG> capability.  If  the  terminal
-       can  clear  its  screen,  leaving the cursor in the home position, then
-       this is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the  terminal
+       The  number  of  columns  on each line for the terminal is given by the
+       <STRONG>cols</STRONG> numeric capability.  If the terminal is a CRT, then the number  of
+       lines  on the screen is given by the <STRONG>lines</STRONG> capability.  If the terminal
+       wraps around to the beginning of the next  line  when  it  reaches  the
+       right  margin,  then it should have the <STRONG>am</STRONG> capability.  If the terminal
+       can clear its screen, leaving the cursor in  the  home  position,  then
+       this  is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the terminal
        overstrikes (rather than clearing a position when a character is struck
-       over) then it should have the <STRONG>os</STRONG> capability.   If  the  terminal  is  a
+       over)  then  it  should  have  the <STRONG>os</STRONG> capability.  If the terminal is a
        printing terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.  (<STRONG>os</STRONG>
-       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 <STRONG>cr</STRONG>.  (Normally
-       this  will  be  carriage  return,  control/M.)   If  there is a code to
+       this will be carriage return,  control/M.)   If  there  is  a  code  to
        produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
 
        If there is a code to move the cursor one position to the left (such as
-       backspace)  that  capability should be given as <STRONG>cub1</STRONG>.  Similarly, codes
-       to move to the right, up, and down should be given as <STRONG>cuf1</STRONG>,  <STRONG>cuu1</STRONG>,  and
-       <STRONG>cud1</STRONG>.   These  local cursor motions should not alter the text they pass
-       over, for example, you would not  normally  use  "<STRONG>cuf1</STRONG>= "  because  the
+       backspace) that capability should be given as <STRONG>cub1</STRONG>.   Similarly,  codes
+       to  move  to the right, up, and down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and
+       <STRONG>cud1</STRONG>.  These local cursor motions should not alter the text  they  pass
+       over,  for  example,  you  would  not normally use "<STRONG>cuf1</STRONG>= " because the
        space would erase the character moved over.
 
        A very important point here is that the local cursor motions encoded in
-       <EM>terminfo</EM> are undefined at the left and top edges  of  a  CRT  terminal.
+       <EM>terminfo</EM>  are  undefined  at  the left and top edges of a CRT terminal.
        Programs should never attempt to backspace around the left edge, unless
-       <STRONG>bw</STRONG> 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
+       <STRONG>bw</STRONG>  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 <STRONG>ind</STRONG> (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 <STRONG>ri</STRONG> (reverse index) string.  The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG>
        are undefined when not on their respective corners of the screen.
 
-       Parameterized versions of the scrolling  sequences  are  <STRONG>indn</STRONG>  and  <STRONG>rin</STRONG>
-       which  have  the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they take one
-       parameter, and scroll that many lines.  They are also undefined  except
+       Parameterized  versions  of  the  scrolling  sequences are <STRONG>indn</STRONG> and <STRONG>rin</STRONG>
+       which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they  take  one
+       parameter,  and scroll that many lines.  They are also undefined except
        at the appropriate edge of the screen.
 
-       The  <STRONG>am</STRONG> 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  <STRONG>cuf1</STRONG>  from  the last column.  The only local motion which is defined
-       from the left edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from  the  left  edge
-       will  move  to the right edge of the previous row.  If <STRONG>bw</STRONG> is not given,
-       the effect is undefined.  This is useful for drawing a box  around  the
+       The <STRONG>am</STRONG> 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 <STRONG>cuf1</STRONG> from the last column.  The only local motion  which  is  defined
+       from  the  left  edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge
+       will move to the right edge of the previous row.  If <STRONG>bw</STRONG> 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 <EM>terminfo</EM> file usually assumes that this  is  on;
-       i.e.,  <STRONG>am</STRONG>.   If  the  terminal  has  a command which moves to the first
-       column of the next line, that command can be given  as  <STRONG>nel</STRONG>  (newline).
-       It  does  not matter if the command clears the remainder of the current
-       line, so if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be  possible  to
+       automatic  margins,  the <EM>terminfo</EM> file usually assumes that this is on;
+       i.e., <STRONG>am</STRONG>.  If the terminal has a  command  which  moves  to  the  first
+       column  of  the  next line, that command can be given as <STRONG>nel</STRONG> (newline).
+       It does not matter if the command clears the remainder of  the  current
+       line,  so  if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to
        craft a working <STRONG>nel</STRONG> out of one or both of them.
 
        These  capabilities  suffice  to  describe  hard-copy  and  "glass-tty"
@@ -1431,19 +1450,19 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Parameterized-Strings">Parameterized Strings</a></H3><PRE>
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
-       terminal  are  described  by  a  parameterized  string capability, with
-       <EM>printf</EM>-like escapes such as <EM>%x</EM> in it.   For  example,  to  address  the
-       cursor,  the <STRONG>cup</STRONG> 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
+       terminal are described  by  a  parameterized  string  capability,  with
+       <EM>printf</EM>-like  escapes  such  as  <EM>%x</EM>  in it.  For example, to address the
+       cursor, the <STRONG>cup</STRONG> 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 by <STRONG>mrcup</STRONG>.
 
-       The  parameter mechanism uses a stack and special <STRONG>%</STRONG> 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
+       The parameter mechanism uses a stack and special <STRONG>%</STRONG> 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 <STRONG>sgr</STRONG> string.
 
        The <STRONG>%</STRONG> encodings have the following meanings:
@@ -1451,7 +1470,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>%%</STRONG>   outputs "%"
 
        <STRONG>%</STRONG><EM>[[</EM>:<EM>]flags][width[.precision]][</EM><STRONG>doxXs</STRONG><EM>]</EM>
-            as in <STRONG>printf(3)</STRONG>, flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a  ":"  to  allow
+            as  in  <STRONG>printf(3)</STRONG>,  flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a ":" to allow
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
@@ -1474,39 +1493,39 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>%g</STRONG><EM>[A-Z]</EM>
             get static variable <EM>[a-z]</EM> 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 <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact  is  not
+            not  reset  between calls to <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact is not
             documented in other implementations.  Relying on it will adversely
             impact portability to other implementations:
 
-            <STRONG>o</STRONG>   SVr2 curses supported <EM>dynamic</EM> variables.  Those are  set  only
-                by  a  <STRONG>%P</STRONG>  operator.   A <STRONG>%g</STRONG> for a given variable without first
-                setting it with <STRONG>%P</STRONG> will give  unpredictable  results,  because
-                dynamic  variables  are  an  uninitialized  local array on the
+            <STRONG>o</STRONG>   SVr2  curses  supported <EM>dynamic</EM> variables.  Those are set only
+                by a <STRONG>%P</STRONG> operator.  A <STRONG>%g</STRONG> for a  given  variable  without  first
+                setting  it  with  <STRONG>%P</STRONG> will give unpredictable results, because
+                dynamic variables are an  uninitialized  local  array  on  the
                 stack in the <STRONG>tparm</STRONG> function.
 
-            <STRONG>o</STRONG>   SVr3.2 curses supported <EM>static</EM> variables.  Those are an  array
+            <STRONG>o</STRONG>   SVr3.2  curses supported <EM>static</EM> variables.  Those are an array
                 in the <STRONG>TERMINAL</STRONG> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
                 automatically when the <STRONG>setupterm</STRONG> function allocates the data.
 
             <STRONG>o</STRONG>   SVr4 curses made no further improvements to the <EM>dynamic/static</EM>
                 variable feature.
 
-            <STRONG>o</STRONG>   Solaris  XPG4  curses does not distinguish between <EM>dynamic</EM> and
-                <EM>static</EM> variables.  They are the same.  Like SVr4 curses,  XPG4
+            <STRONG>o</STRONG>   Solaris XPG4 curses does not distinguish between  <EM>dynamic</EM>  and
+                <EM>static</EM>  variables.  They are the same.  Like SVr4 curses, XPG4
                 curses does not initialize these explicitly.
 
-            <STRONG>o</STRONG>   Before  version  6.3,  ncurses  stores both <EM>dynamic</EM> and <EM>static</EM>
+            <STRONG>o</STRONG>   Before version 6.3, ncurses stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
                 variables in persistent storage, initialized to zeros.
 
-            <STRONG>o</STRONG>   Beginning with version 6.3, ncurses stores <EM>static</EM> and  <EM>dynamic</EM>
+            <STRONG>o</STRONG>   Beginning  with version 6.3, ncurses stores <EM>static</EM> and <EM>dynamic</EM>
                 variables in the same manner as SVr4.
 
-                <STRONG>o</STRONG>   Unlike   other   implementations,  ncurses  zeros  dynamic
+                <STRONG>o</STRONG>   Unlike  other  implementations,  ncurses   zeros   dynamic
                     variables before the first <STRONG>%g</STRONG> or <STRONG>%P</STRONG> operator.
 
-                <STRONG>o</STRONG>   Like SVr2, the scope of dynamic variables  in  ncurses  is
+                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in ncurses is
                     within the current call to <STRONG>tparm</STRONG>.  Use static variables if
                     persistent storage is needed.
 
@@ -1536,8 +1555,8 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>%?</STRONG> <EM>expr</EM> <STRONG>%t</STRONG> <EM>thenpart</EM> <STRONG>%e</STRONG> <EM>elsepart</EM> <STRONG>%;</STRONG>
             This forms an if-then-else.  The <STRONG>%e</STRONG> <EM>elsepart</EM> is optional.  Usually
-            the  <STRONG>%?</STRONG>  <EM>expr</EM>  part  pushes a value onto the stack, and <STRONG>%t</STRONG> pops it
-            from the stack, testing if it is nonzero (true).  If  it  is  zero
+            the <STRONG>%?</STRONG> <EM>expr</EM> part pushes a value onto the stack,  and  <STRONG>%t</STRONG>  pops  it
+            from  the  stack,  testing if it is nonzero (true).  If it is zero
             (false), control passes to the <STRONG>%e</STRONG> (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1545,84 +1564,84 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
             where ci are conditions, bi are bodies.
 
-            Use  the  <STRONG>-f</STRONG>  option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the structure of if-
+            Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the  structure  of  if-
             then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can be very complicated when
-            written  on  one line.  The <STRONG>-f</STRONG> option splits the string into lines
+            written on one line.  The <STRONG>-f</STRONG> 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}%-".  <STRONG>%P</STRONG> and <STRONG>%g</STRONG>
+       Binary  operations  are  in postfix form with the operands in the usual
+       order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
-       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
-       sent  \E&amp;a12c03Y  padded for 6 milliseconds.  The order of the rows and
-       columns is inverted here, and the row and column  are  printed  as  two
+       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
+       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the  rows  and
+       columns  is  inverted  here,  and the row and column are printed as two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
 
-       The  Microterm ACT-IV needs the current row and column sent preceded by
+       The Microterm ACT-IV needs the current row and column sent preceded  by
        a <STRONG>^T</STRONG>, 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
-       (<STRONG>cub1</STRONG>),  and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This
+       Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
+       (<STRONG>cub1</STRONG>), and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).   This
        is necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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
+       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  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
+       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
+       character.  Then the same is  done  for  the  second  parameter.   More
        complex arithmetic is possible using the stack.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
-       If the terminal has a fast way to home the cursor (to very  upper  left
-       corner  of screen) then this can be given as <STRONG>home</STRONG>; similarly a fast way
-       of getting to the lower left-hand corner can be given as <STRONG>ll</STRONG>;  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 <STRONG>home</STRONG>; similarly a fast  way
+       of  getting  to the lower left-hand corner can be given as <STRONG>ll</STRONG>; this may
        involve going up with <STRONG>cuu1</STRONG> from the home position, but a program should
        never do this itself (unless <STRONG>ll</STRONG> 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
+       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 cannot be used for <STRONG>home</STRONG>.)
 
        If the terminal has row or column absolute cursor addressing, these can
-       be  given  as  single  parameter  capabilities <STRONG>hpa</STRONG> (horizontal position
-       absolute) and <STRONG>vpa</STRONG> (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  <STRONG>cup</STRONG>.   If  there   are
-       parameterized  local  motions  (e.g., move <EM>n</EM> spaces to the right) these
-       can be given as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with  a  single  parameter
-       indicating  how many spaces to move.  These are primarily useful if the
+       be given as single  parameter  capabilities  <STRONG>hpa</STRONG>  (horizontal  position
+       absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
+       parameterized local motions (e.g., move <EM>n</EM> spaces to  the  right)  these
+       can  be  given  as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with a single parameter
+       indicating how many spaces to move.  These are primarily useful if  the
        terminal does not have <STRONG>cup</STRONG>, 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 <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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
+       be  given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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.  This is also used for
-       the  TEKTRONIX  4025,  where <STRONG>smcup</STRONG> sets the command character to be the
-       one used by terminfo.  If the  <STRONG>smcup</STRONG>  sequence  will  not  restore  the
-       screen  after  an  <STRONG>rmcup</STRONG>  sequence  is  output  (to  the state prior to
+       the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets the command character  to  be  the
+       one  used  by  terminfo.   If  the  <STRONG>smcup</STRONG> sequence will not restore the
+       screen after an <STRONG>rmcup</STRONG>  sequence  is  output  (to  the  state  prior  to
        outputting <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       SVr4 (and X/Open Curses) list several string capabilities  for  setting
-       margins.   Two  were  intended  for use with terminals, and another six
+       SVr4  (and  X/Open Curses) list several string capabilities for setting
+       margins.  Two were intended for use with  terminals,  and  another  six
        were intended for use with printers.
 
        <STRONG>o</STRONG>   The two terminal capabilities assume that the terminal may have the
-           capability  of  setting the left and/or right margin at the current
+           capability of setting the left and/or right margin at  the  current
            cursor column position.
 
        <STRONG>o</STRONG>   The printer capabilities assume that the printer may have two types
@@ -1631,31 +1650,31 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           <STRONG>o</STRONG>   parameterized capabilities for setting the top,  bottom,  left,
+           <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
                right margins given the number of rows or columns.
 
-       In  practice,  the  categorization into "terminal" and "printer" is not
+       In practice, the categorization into "terminal" and  "printer"  is  not
        suitable:
 
-       <STRONG>o</STRONG>   The AT&amp;T SVr4 terminal database uses  <STRONG>smgl</STRONG>  four  times,  for  AT&amp;T
+       <STRONG>o</STRONG>   The  AT&amp;T  SVr4  terminal  database  uses <STRONG>smgl</STRONG> four times, for AT&amp;T
            hardware.
 
-           Three  of  the  four  are  printers.   They lack the ability to set
+           Three of the four are printers.   They  lack  the  ability  to  set
            left/right margins by specifying the column.
 
-       <STRONG>o</STRONG>   Other (non-AT&amp;T) terminals may support margins but using  different
+       <STRONG>o</STRONG>   Other  (non-AT&amp;T) terminals may support margins but using different
            assumptions from AT&amp;T.
 
-           For  instance,  the DEC VT420 supports left/right margins, but only
+           For instance, the DEC VT420 supports left/right margins,  but  only
            using a column parameter.  As an added complication, the VT420 uses
-           two  settings to fully enable left/right margins (left/right margin
-           mode, and origin mode).  The  former  enables  the  margins,  which
-           causes  printed  text  to  wrap  within  margins, but the latter is
+           two settings to fully enable left/right margins (left/right  margin
+           mode,  and  origin  mode).   The  former enables the margins, which
+           causes printed text to wrap  within  margins,  but  the  latter  is
            needed to prevent cursor-addressing outside those margins.
 
-       <STRONG>o</STRONG>   Both DEC VT420 left/right margins are set  with  a  single  control
+       <STRONG>o</STRONG>   Both  DEC  VT420  left/right  margins are set with a single control
            sequence.  If either is omitted, the corresponding margin is set to
-           the left or right edge of the  display  (rather  than  leaving  the
+           the  left  or  right  edge  of the display (rather than leaving the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1673,231 +1692,231 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                 smglr      Set both left and right margins to <EM>L</EM> and <EM>R</EM>
                 smgtb      Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
-       When  writing  an  application that uses these string capabilities, the
-       pairs should be first checked to see if each capability in the pair  is
+       When writing an application that uses these  string  capabilities,  the
+       pairs  should be first checked to see if each capability in the pair is
        set or only one is set:
 
-       <STRONG>o</STRONG>   If  both  <STRONG>smglp</STRONG>  and  <STRONG>smgrp</STRONG>  are  set,  each  is used with a single
-           argument, <EM>N</EM>, that gives the column number of  the  left  and  right
+       <STRONG>o</STRONG>   If both <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG>  are  set,  each  is  used  with  a  single
+           argument,  <EM>N</EM>,  that  gives  the column number of the left and right
            margin, respectively.
 
-       <STRONG>o</STRONG>   If  both  <STRONG>smgtp</STRONG>  and <STRONG>smgbp</STRONG> are set, each is used to set the top and
+       <STRONG>o</STRONG>   If both <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> are set, each is used to set  the  top  and
            bottom margin, respectively:
 
            <STRONG>o</STRONG>   <STRONG>smgtp</STRONG> is used with a single argument, <EM>N</EM>, the line number of the
                top margin.
 
-           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG>  is  used with two arguments, <EM>N</EM> and <EM>M</EM>, that give the line
+           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG> is used with two arguments, <EM>N</EM> and <EM>M</EM>, that give  the  line
                number of the bottom margin, the first counting from the top of
-               the  page  and  the  second  counting  from  the  bottom.  This
-               accommodates the two styles of specifying the bottom margin  in
+               the page  and  the  second  counting  from  the  bottom.   This
+               accommodates  the two styles of specifying the bottom margin in
                different manufacturers' printers.
 
-           When  designing  a terminfo entry for a printer that has a settable
-           bottom margin, only the first or second argument  should  be  used,
+           When designing a terminfo entry for a printer that has  a  settable
+           bottom  margin,  only  the first or second argument should be used,
            depending on the printer.  When developing an application that uses
            <STRONG>smgbp</STRONG> to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       <STRONG>o</STRONG>   If only one of <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it  is  used  with  two
+       <STRONG>o</STRONG>   If  only  one  of  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it is used with two
            arguments, the column number of the left and right margins, in that
            order.
 
-       <STRONG>o</STRONG>   Likewise, if only one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then  it  is  used
-           with  two  arguments  that give the top and bottom margins, in that
+       <STRONG>o</STRONG>   Likewise,  if  only  one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then it is used
+           with two arguments that give the top and bottom  margins,  in  that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both  left and right or top and bottom margins simultaneously, only
-           one capability in the pairs <STRONG>smglp</STRONG> and  <STRONG>smgrp</STRONG>  or  <STRONG>smgtp</STRONG>  and  <STRONG>smgbp</STRONG>
+           both left and right or top and bottom margins simultaneously,  only
+           one  capability  in  the  pairs  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG>
            should be defined, leaving the other unset.
 
-       Except  for  very  old terminal descriptions, e.g., those developed for
-       SVr4, the scheme just described  should  be  considered  obsolete.   An
+       Except for very old terminal descriptions, e.g.,  those  developed  for
+       SVr4,  the  scheme  just  described  should be considered obsolete.  An
        improved set of capabilities was added late in the SVr4 releases (<STRONG>smglr</STRONG>
-       and <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting  the
+       and  <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The  <STRONG>mgc</STRONG>  string  capability  should  be defined.  Applications such as
+       The <STRONG>mgc</STRONG> string capability should  be  defined.   Applications  such  as
        <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG> rely upon this to reset all margins.
 
 
 </PRE><H3><a name="h3-Area-Clears">Area Clears</a></H3><PRE>
-       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 <STRONG>el</STRONG>.  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 <STRONG>el1</STRONG>.  If the terminal can clear from the current  position  to
-       the  end  of  the display, then this should be given as <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> 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  <STRONG>el</STRONG>.   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  <STRONG>el1</STRONG>.  If the terminal can clear from the current position to
+       the end of the display, then this should be given as <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  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 <STRONG>ed</STRONG> is not
+       a request to delete a large number of  lines,  if  a  true  <STRONG>ed</STRONG>  is  not
        available.)
 
 
 </PRE><H3><a name="h3-Insert_delete-line-and-vertical-motions">Insert/delete line and vertical motions</a></H3><PRE>
-       If the terminal can open a new blank line before  the  line  where  the
-       cursor  is,  this  should  be  given as <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; 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 <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; this is done only from the first
        position on the line to be deleted.  Versions of <STRONG>il1</STRONG> and <STRONG>dl1</STRONG> which take
        a single parameter and insert or delete that many lines can be given as
        <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
 
-       If  the  terminal  has a settable scrolling region (like the vt100) the
-       command to set this can be described with  the  <STRONG>csr</STRONG>  capability,  which
+       If the terminal has a settable scrolling region (like  the  vt100)  the
+       command  to  set  this  can be described with the <STRONG>csr</STRONG> 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 <STRONG>csr</STRONG>  on
-       a  properly  chosen  region;  the  <STRONG>sc</STRONG>  and <STRONG>rc</STRONG> (save and restore cursor)
+       It  is possible to get the effect of insert or delete line using <STRONG>csr</STRONG> on
+       a properly chosen region; the <STRONG>sc</STRONG>  and  <STRONG>rc</STRONG>  (save  and  restore  cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string  does  not  move the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library
-       does  this  synthesis  automatically,   so   you   need   not   compose
+       string does not move the cursor.  (Note that  the  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  library
+       does   this   synthesis   automatically,   so   you  need  not  compose
        insert/delete strings for an entry with <STRONG>csr</STRONG>).
 
-       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  however  also  has
+       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   however   also   has
        insert/delete).
 
-       Inserting lines at the top or bottom of the screen  can  also  be  done
-       using  <STRONG>ri</STRONG>  or  <STRONG>ind</STRONG> on many terminals without a true insert/delete line,
+       Inserting  lines  at  the  top or bottom of the screen can also be done
+       using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
        and is often faster even on terminals with those features.
 
-       The boolean <STRONG>non_dest_scroll_region</STRONG> 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 something to the bottom line, move the cursor to the top
-       of the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data  scrolled
-       off  the  bottom  of the region by the <STRONG>ri</STRONG> re-appears, then scrolling is
-       non-destructive.  System V and XSI Curses expect that  <STRONG>ind</STRONG>,  <STRONG>ri</STRONG>,  <STRONG>indn</STRONG>,
+       The  boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
+       of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
+       off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
+       non-destructive.   System  V  and XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
-       cautions you not to define  <STRONG>csr</STRONG>  unless  this  is  true.   This  <STRONG>curses</STRONG>
-       implementation  is  more  liberal  and  will  do  explicit erases after
+       cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
+       implementation is more  liberal  and  will  do  explicit  erases  after
        scrolling if <STRONG>ndsrc</STRONG> 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 <STRONG>wind</STRONG>.  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  <STRONG>wind</STRONG>.  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 <STRONG>da</STRONG> capability
-       should be given; if display memory  can  be  retained  below,  then  <STRONG>db</STRONG>
-       should  be given.  These indicate that deleting a line or scrolling may
-       bring non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG>  may
+       should  be  given;  if  display  memory  can be retained below, then <STRONG>db</STRONG>
+       should be given.  These indicate that deleting a line or scrolling  may
+       bring  non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG> may
        bring down non-blank lines.
 
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
-       There  are  two  basic  kinds  of intelligent terminals with respect to
-       insert/delete character which can be  described  using  <EM>terminfo.</EM>   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
+       There are two basic kinds of  intelligent  terminals  with  respect  to
+       insert/delete  character  which  can  be described using <EM>terminfo.</EM>  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 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
-       second type of terminal, and  should  give  the  capability  <STRONG>in</STRONG>,  which
+       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
+       second  type  of  terminal,  and  should  give the capability <STRONG>in</STRONG>, 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 <STRONG>smir</STRONG> the sequence to get into insert mode.  Give
-       as  <STRONG>rmir</STRONG>  the  sequence  to  leave  insert  mode.  Now give as <STRONG>ich1</STRONG> any
-       sequence needed to be sent just before  sending  the  character  to  be
-       inserted.   Most  terminals with a true insert mode will not give <STRONG>ich1</STRONG>;
-       terminals which send a sequence to open a screen position  should  give
+       as <STRONG>rmir</STRONG> the sequence to leave  insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
+       sequence  needed  to  be  sent  just before sending the character to be
+       inserted.  Most terminals with a true insert mode will not  give  <STRONG>ich1</STRONG>;
+       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 <STRONG>ich1</STRONG>.
-       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 <STRONG>ich</STRONG> sequences do not require previous smir, and most  smir  insert
-       modes  do  not  require <STRONG>ich1</STRONG> before each character.  Therefore, the new
-       <STRONG>curses</STRONG> actually assumes this is the case and uses either  <STRONG>rmir</STRONG>/<STRONG>smir</STRONG>  or
-       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  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  <STRONG>ich1</STRONG>.
+       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  <STRONG>ich</STRONG>  sequences do not require previous smir, and most smir insert
+       modes do not require <STRONG>ich1</STRONG> before each character.   Therefore,  the  new
+       <STRONG>curses</STRONG>  actually  assumes this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or
+       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> 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 <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be  sent
+       in  <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be sent
        after an insert of a single character may also be given in <STRONG>ip</STRONG>.  If your
-       terminal needs both to be placed into an "insert mode"  and  a  special
-       code  to  precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> and <STRONG>ich1</STRONG>
-       can be given, and both will be used.   The  <STRONG>ich</STRONG>  capability,  with  one
+       terminal  needs  both  to be placed into an "insert mode" and a special
+       code to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>  and  <STRONG>ich1</STRONG>
+       can  be  given,  and  both  will be used.  The <STRONG>ich</STRONG> capability, with one
        parameter, <EM>n</EM>, will repeat the effects of <STRONG>ich1</STRONG> <EM>n</EM> 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 <STRONG>rmp</STRONG>.
 
-       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 <STRONG>mir</STRONG> to speed up inserting in this
-       case.  Omitting <STRONG>mir</STRONG> will affect only speed.   Some  terminals  (notably
-       Datamedia's)  must  not  have  <STRONG>mir</STRONG> 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 <STRONG>mir</STRONG> to  speed  up  inserting  in  this
+       case.   Omitting  <STRONG>mir</STRONG>  will affect only speed.  Some terminals (notably
+       Datamedia's) must not have <STRONG>mir</STRONG> because of the  way  their  insert  mode
        works.
 
-       Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
-       one  parameter,  <EM>n</EM>,  to  delete <EM>n</EM> <EM>characters,</EM> and delete mode by giving
-       <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit delete  mode  (any  mode  the  terminal
+       Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
+       one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> and  delete  mode  by  giving
+       <STRONG>smdc</STRONG>  and  <STRONG>rmdc</STRONG>  to  enter  and exit delete mode (any mode the terminal
        needs to be placed in for <STRONG>dch1</STRONG> to work).
 
-       A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
+       A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
 </PRE><H3><a name="h3-Highlighting_-Underlining_-and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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 <EM>standout</EM> <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>,  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  <EM>standout</EM>  <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, 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
        <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as <STRONG>smul</STRONG> and
        <STRONG>rmul</STRONG> 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 <STRONG>uc</STRONG>.
 
-       Other capabilities to enter various highlighting  modes  include  <STRONG>blink</STRONG>
-       (blinking)  <STRONG>bold</STRONG>  (bold or extra bright) <STRONG>dim</STRONG> (dim or half-bright) <STRONG>invis</STRONG>
-       (blanking or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video)  <STRONG>sgr0</STRONG>
-       (turn  off  <EM>all</EM>  attribute  modes) <STRONG>smacs</STRONG> (enter alternate character set
+       Other  capabilities  to  enter various highlighting modes include <STRONG>blink</STRONG>
+       (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> (dim or  half-bright)  <STRONG>invis</STRONG>
+       (blanking  or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>
+       (turn off <EM>all</EM> attribute modes) <STRONG>smacs</STRONG>  (enter  alternate  character  set
        mode) and <STRONG>rmacs</STRONG> (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 <STRONG>sgr</STRONG> (set attributes),  taking  9  parameters.   Each
+       If there is a sequence to set arbitrary  combinations  of  modes,  this
+       should  be  given  as  <STRONG>sgr</STRONG> (set attributes), taking 9 parameters.  Each
        parameter is either zero (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.
+       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  <STRONG>sgr</STRONG>,  only  those  for  which
        corresponding separate attribute commands exist.
 
@@ -1916,17 +1935,17 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                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
-       terminal 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
+       terminal  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
-       output  when  either  p1  or p3 is true, that is, if either standout or
+       Some  sequences  are  common  to  different  modes.  For example, ;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 dependencies yields
@@ -1947,54 +1966,54 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            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
+       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
+       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  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> capability, asserting that it is
+       Terminals  with  the  "magic  cookie"  glitch  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> 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 <STRONG>flash</STRONG>; 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 <STRONG>flash</STRONG>;  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
        <STRONG>cvvis</STRONG>.  If there is a way to make the cursor completely invisible, give
-       that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which  undoes  the
+       that  as  <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> 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  <STRONG>ul</STRONG>.  If a character overstriking another
-       leaves both characters on the screen, specify the  capability  <STRONG>os</STRONG>.   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 <STRONG>ul</STRONG>.  If  a  character  overstriking  another
+       leaves  both  characters  on the screen, specify the capability <STRONG>os</STRONG>.  If
        overstrikes are erasable with a blank, then this should be indicated by
        giving <STRONG>eo</STRONG>.
 
 
 </PRE><H3><a name="h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></H3><PRE>
-       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
-       to transmit or not  transmit,  give  these  codes  as  <STRONG>smkx</STRONG>  and  <STRONG>rmkx</STRONG>.
+       for example, to the unshifted HP 2621 keys).  If the keypad can be  set
+       to  transmit  or  not  transmit,  give  these  codes  as <STRONG>smkx</STRONG> and <STRONG>rmkx</STRONG>.
        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 <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>  <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG>  and  <STRONG>khome</STRONG>
+       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
+       and  home  keys  can  be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG>
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes they send can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG>  <STRONG>kf10</STRONG>.   If  these  keys
-       have  labels  other  than the default f0 through f10, the labels can be
+       codes  they  send  can  be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys
+       have labels other than the default f0 through f10, the  labels  can  be
        given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.
 
        The codes transmitted by certain other special keys can be given:
@@ -2033,64 +2052,64 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   <STRONG>khts</STRONG> (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 <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>,
-       <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  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  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,
+       <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.   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 <STRONG>pfkey</STRONG>, <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>.
-       A string to program screen labels should be specified as <STRONG>pln</STRONG>.  Each  of
-       these  strings takes two parameters: the function key number to program
+       A  string to program screen labels should be specified as <STRONG>pln</STRONG>.  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  <STRONG>pfkey</STRONG>  causes
-       pressing  the  given  key  to  be the same as the user typing the given
-       string; <STRONG>pfloc</STRONG> 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 <STRONG>pfkey</STRONG> causes
+       pressing the given key to be the same as  the  user  typing  the  given
+       string;  <STRONG>pfloc</STRONG>  causes  the  string  to  be executed by the terminal in
        local; and <STRONG>pfx</STRONG> causes the string to be transmitted to the computer.
 
-       The  capabilities  <STRONG>nlab</STRONG>,  <STRONG>lw</STRONG>  and  <STRONG>lh</STRONG> 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 <STRONG>smln</STRONG> and <STRONG>rmln</STRONG>.  <STRONG>smln</STRONG> is
-       normally output after one or more pln sequences to make sure  that  the
+       The capabilities <STRONG>nlab</STRONG>, <STRONG>lw</STRONG> and <STRONG>lh</STRONG>  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  <STRONG>smln</STRONG>  and  <STRONG>rmln</STRONG>.   <STRONG>smln</STRONG>  is
+       normally  output  after one or more pln sequences to make sure that the
        change becomes visible.
 
 
 </PRE><H3><a name="h3-Tabs-and-Initialization">Tabs and Initialization</a></H3><PRE>
        A few capabilities are used only for tabs:
 
-       <STRONG>o</STRONG>   If  the  terminal  has hardware tabs, the command to advance to the
+       <STRONG>o</STRONG>   If the terminal has hardware tabs, the command to  advance  to  the
            next tab stop can be given as <STRONG>ht</STRONG> (usually control/I).
 
        <STRONG>o</STRONG>   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as <STRONG>cbt</STRONG>.
 
-           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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> 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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> even if they are  present,  since
            the user may not have the tab stops properly set.
 
-       <STRONG>o</STRONG>   If the terminal has hardware tabs which are initially set  every  <EM>n</EM>
+       <STRONG>o</STRONG>   If  the  terminal has hardware tabs which are initially set every <EM>n</EM>
            spaces when the terminal is powered up, the numeric parameter <STRONG>it</STRONG> is
            given, showing the number of spaces the tabs are set to.
 
            The <STRONG>it</STRONG> capability is normally used by the <STRONG>tset</STRONG> 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
 
        <STRONG>o</STRONG>   <STRONG>is1</STRONG>, <STRONG>is2</STRONG>, and <STRONG>is3</STRONG>, initialization strings for the terminal,
 
-       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>, the path name of a program  to  be  run  to  initialize  the
+       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>,  the  path  name  of  a  program to be run to initialize the
            terminal,
 
        <STRONG>o</STRONG>   and <STRONG>if</STRONG>, 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  <EM>init</EM> option of the <STRONG>tput</STRONG> 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 <EM>init</EM> option of the <STRONG>tput</STRONG>  program,  each  time  the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -2114,34 +2133,34 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
               and finally output
                      <STRONG>is3</STRONG>.
 
-       Most initialization is done with <STRONG>is2</STRONG>.  Special terminal  modes  can  be
-       set  up  without duplicating strings by putting the common sequences in
+       Most  initialization  is  done with <STRONG>is2</STRONG>.  Special terminal modes can be
+       set up without duplicating strings by putting the common  sequences  in
        <STRONG>is2</STRONG> and special cases in <STRONG>is1</STRONG> and <STRONG>is3</STRONG>.
 
-       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 <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
-       and <STRONG>is3</STRONG> respectively.  These strings are  output  by  <EM>reset</EM>  option  of
-       <STRONG>tput</STRONG>,  or  by  the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
+       and  <STRONG>is3</STRONG>  respectively.   These  strings  are output by <EM>reset</EM> option of
+       <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which  is  used  when
        the terminal gets into a wedged state.  Commands are normally placed in
        <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> 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 <STRONG>is2</STRONG>, 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  <STRONG>is2</STRONG>,  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  <STRONG>reset</STRONG>  program  writes  strings including <STRONG>iprog</STRONG>, etc., in the same
-       order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of  <STRONG>is1</STRONG>,  etc.   If
-       any  of  <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are missing, the
-       <STRONG>reset</STRONG>  program  falls  back  upon  the   corresponding   initialization
+       The <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>,  etc.,  in  the  same
+       order  as  the  <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc.  If
+       any of <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are  missing,  the
+       <STRONG>reset</STRONG>   program   falls  back  upon  the  corresponding  initialization
        capability 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
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (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 <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
-       The <STRONG>tput</STRONG> <STRONG>reset</STRONG> command uses the same capability strings  as  the  <STRONG>reset</STRONG>
-       command,  although  the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>) provide different
+       The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
+       command, although the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>)  provide  different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -2150,78 +2169,78 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every <EM>eight</EM> columns:
 
-           The only exception was the AT&amp;T 2300  series,  which  set  tabs  to
+           The  only  exception  was  the  AT&amp;T 2300 series, which set tabs to
            every <EM>five</EM> columns.
 
-       <STRONG>o</STRONG>   In  particular,  developers  of  the  hardware  terminals which are
-           commonly used as models  for  modern  terminal  emulators  provided
+       <STRONG>o</STRONG>   In particular, developers  of  the  hardware  terminals  which  are
+           commonly  used  as  models  for  modern terminal emulators provided
            documentation demonstrating that <EM>eight</EM> columns were the standard.
 
        <STRONG>o</STRONG>   Because of this, the terminal initialization programs <STRONG>tput</STRONG> and <STRONG>tset</STRONG>
-           use  the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)   capabilities
-           directly  only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a value
+           use   the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)  capabilities
+           directly only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a  value
            other than <EM>eight</EM>.
 
 
 </PRE><H3><a name="h3-Delays-and-Padding">Delays and Padding</a></H3><PRE>
-       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
+       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 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 <STRONG>xon</STRONG>.  This capability suppresses the emission of
-       padding.  You  can  also  set  it  for  memory-mapped  console  devices
+       automatically  emits  ^S  back  to  the host when its input buffers are
+       close to full), set <STRONG>xon</STRONG>.  This capability 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  decisions  about
+       still  be  included  so  that  routines can make better decisions about
        relative costs, but actual pad characters will not be transmitted.
 
        If <STRONG>pb</STRONG> (padding baud rate) is given, padding is suppressed at baud rates
-       below the value of <STRONG>pb</STRONG>.  If the entry has no  padding  baud  rate,  then
+       below  the  value  of  <STRONG>pb</STRONG>.  If the entry has no padding baud rate, then
        whether padding is emitted or not is completely controlled by <STRONG>xon</STRONG>.
 
-       If  the  terminal requires other than a null (zero) character as a pad,
-       then this can be given as <STRONG>pad</STRONG>.  Only the first  character  of  the  <STRONG>pad</STRONG>
+       If the terminal requires other than a null (zero) character as  a  pad,
+       then  this  can  be  given as <STRONG>pad</STRONG>.  Only the first character of the <STRONG>pad</STRONG>
        string is used.
 
 
 </PRE><H3><a name="h3-Status-Lines">Status Lines</a></H3><PRE>
-       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 <STRONG>lines</STRONG> 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 <STRONG>hs</STRONG> capability.
 
-       Some terminals with status lines need special sequences to  access  the
-       status  line.  These may be expressed as a string with single parameter
-       <STRONG>tsl</STRONG> which takes the cursor to a given zero-origin column on the  status
-       line.   The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen cursor
+       Some  terminals  with status lines need special sequences to access the
+       status line.  These may be expressed as a string with single  parameter
+       <STRONG>tsl</STRONG>  which takes the cursor to a given zero-origin column on the status
+       line.  The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen  cursor
        positions before the last <STRONG>tsl</STRONG>.  You may need to embed the string values
-       of  <STRONG>sc</STRONG>  (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and <STRONG>fsl</STRONG> to
+       of <STRONG>sc</STRONG> (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and  <STRONG>fsl</STRONG>  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 <STRONG>wsl</STRONG>.
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The boolean capability <STRONG>eslok</STRONG> specifies  that  escape  sequences,  tabs,
+       The  boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
        etc., work ordinarily in the status line.
 
-       The  <STRONG>ncurses</STRONG> implementation does not yet use any of these capabilities.
+       The <STRONG>ncurses</STRONG> implementation does not yet use any of these  capabilities.
        They are documented here in case they ever become important.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Many terminals have alternate character sets useful for  forms-drawing.
-       Terminfo  and  <STRONG>curses</STRONG>  have  built-in  support  for most of the drawing
-       characters supported by the VT100, with some characters from  the  AT&amp;T
-       4410v1  added.   This  alternate  character set may be specified by the
+       Many  terminals have alternate character sets useful for forms-drawing.
+       Terminfo and <STRONG>curses</STRONG> have built-in  support  for  most  of  the  drawing
+       characters  supported  by the VT100, with some characters from the AT&amp;T
+       4410v1 added.  This alternate character set may  be  specified  by  the
        <STRONG>acsc</STRONG> capability.
 
          <STRONG>Glyph</STRONG>                       <STRONG>ACS</STRONG>            <STRONG>Ascii</STRONG>     <STRONG>acsc</STRONG>     <STRONG>acsc</STRONG>
@@ -2241,7 +2260,6 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
          lower right corner          ACS_LRCORNER   +         j        0x6a
          upper right corner          ACS_URCORNER   +         k        0x6b
          upper left corner           ACS_ULCORNER   +         l        0x6c
-
          lower left corner           ACS_LLCORNER   +         m        0x6d
          large plus or crossover     ACS_PLUS       +         n        0x6e
          scan line 1                 ACS_S1         ~         o        0x6f
@@ -2263,34 +2281,34 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        A few notes apply to the table itself:
 
-       <STRONG>o</STRONG>   X/Open Curses incorrectly states that the mapping  for  <EM>lantern</EM>  is
-           uppercase  "I"  although Unix implementations use the lowercase "i"
+       <STRONG>o</STRONG>   X/Open  Curses  incorrectly  states that the mapping for <EM>lantern</EM> is
+           uppercase "I" although Unix implementations use the  lowercase  "i"
            mapping.
 
-       <STRONG>o</STRONG>   The DEC VT100 implemented graphics using  the  alternate  character
-           set  feature, temporarily switching <EM>modes</EM> and sending characters in
-           the range 0x60 (96) to 0x7e (126) (the <STRONG>acsc</STRONG>  <STRONG>Value</STRONG>  column  in  the
+       <STRONG>o</STRONG>   The  DEC  VT100  implemented graphics using the alternate character
+           set feature, temporarily switching <EM>modes</EM> and sending characters  in
+           the  range  0x60  (96)  to 0x7e (126) (the <STRONG>acsc</STRONG> <STRONG>Value</STRONG> column in the
            table).
 
        <STRONG>o</STRONG>   The AT&amp;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&amp;T terminal:  <EM>board</EM>  <EM>of</EM>  <EM>squares</EM>
-           replaces  the  VT100  <EM>newline</EM> symbol, while <EM>lantern</EM> <EM>symbol</EM> replaces
+           Some of the characters within the range do  not  match  the  VT100;
+           presumably  they  were  used in the AT&amp;T terminal: <EM>board</EM> <EM>of</EM> <EM>squares</EM>
+           replaces the VT100 <EM>newline</EM> symbol, while  <EM>lantern</EM>  <EM>symbol</EM>  replaces
            the VT100 <EM>vertical</EM> <EM>tab</EM> symbol.  The other VT100 symbols for control
-           characters  (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) are not
+           characters (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) 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 <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG> 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  <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG>  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.
 
 
 </PRE><H3><a name="h3-Color-Handling">Color Handling</a></H3><PRE>
-       The curses library functions <STRONG>init_pair</STRONG> and  <STRONG>init_color</STRONG>  manipulate  the
-       <EM>color</EM>   <EM>pairs</EM>   and   <EM>color</EM>  <EM>values</EM>  discussed  in  this  section  (see
+       The  curses  library  functions <STRONG>init_pair</STRONG> and <STRONG>init_color</STRONG> manipulate the
+       <EM>color</EM>  <EM>pairs</EM>  and  <EM>color</EM>  <EM>values</EM>  discussed  in   this   section   (see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2299,45 +2317,45 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
            is usually 8), and can set character-cell foreground and background
            characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color-pairs.
 
-       <STRONG>o</STRONG>   On HP-like  terminals,  the  user  must  set  each  color  pair  up
-           separately   (foreground   and  background  are  not  independently
-           settable).  Up to <EM>M</EM> color-pairs may be set up  from  2*<EM>M</EM>  different
+       <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
+           separately  (foreground  and  background  are   not   independently
+           settable).   Up  to  <EM>M</EM> color-pairs may be set up from 2*<EM>M</EM> different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric capabilities <STRONG>colors</STRONG> and <STRONG>pairs</STRONG> specify the  maximum  numbers  of
-       colors  and  color-pairs  that can be displayed simultaneously.  The <STRONG>op</STRONG>
+       numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
+       colors and color-pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
-       default  values  for  the terminal.  The <STRONG>oc</STRONG> 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;
+       default values for the terminal.  The <STRONG>oc</STRONG> 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 <STRONG>bce</STRONG>.
 
-       While  the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting the
-       inability of some devices  to  set  foreground  and  background  colors
-       independently),  there  are  separate  capabilities  for  setting these
+       While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
+       inability  of  some  devices  to  set  foreground and background colors
+       independently), there  are  separate  capabilities  for  setting  these
        features:
 
-       <STRONG>o</STRONG>   To  change  the  current  foreground  or  background  color  on   a
-           Tektronix-type  terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and <STRONG>setab</STRONG>
-           (set ANSI background)  or  <STRONG>setf</STRONG>  (set  foreground)  and  <STRONG>setb</STRONG>  (set
+       <STRONG>o</STRONG>   To   change  the  current  foreground  or  background  color  on  a
+           Tektronix-type terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and  <STRONG>setab</STRONG>
+           (set  ANSI  background)  or  <STRONG>setf</STRONG>  (set  foreground)  and <STRONG>setb</STRONG> (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says  that
-           "If  the  terminal supports ANSI escape sequences to set background
-           and  foreground,  they  should  be  coded  as  <STRONG>setaf</STRONG>   and   <STRONG>setab</STRONG>,
+           documentation  describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says that
+           "If the terminal supports ANSI escape sequences to  set  background
+           and   foreground,   they  should  be  coded  as  <STRONG>setaf</STRONG>  and  <STRONG>setab</STRONG>,
            respectively.
 
-       <STRONG>o</STRONG>   If  the  terminal supports other escape sequences to set background
-           and  foreground,  they  should  be  coded   as   <STRONG>setf</STRONG>   and   <STRONG>setb</STRONG>,
-           respectively.   The  <STRONG>vidputs</STRONG>  and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> functions use the
+       <STRONG>o</STRONG>   If the terminal supports other escape sequences to  set  background
+           and   foreground,   they   should   be  coded  as  <STRONG>setf</STRONG>  and  <STRONG>setb</STRONG>,
+           respectively.  The <STRONG>vidputs</STRONG> and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  functions  use  the
            <STRONG>setaf</STRONG> and <STRONG>setab</STRONG> capabilities if they are defined.
 
-       The <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single  numeric
+       The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
-       as follows (the middle column is the symbolic #define available in  the
-       header  for the <STRONG>curses</STRONG> or <STRONG>ncurses</STRONG> libraries).  The terminal hardware is
-       free to map these as it likes,  but  the  RGB  values  indicate  normal
+       as  follows (the middle column is the symbolic #define available in the
+       header for the <STRONG>curses</STRONG> or <STRONG>ncurses</STRONG> libraries).  The terminal hardware  is
+       free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
                     <STRONG>Color</STRONG>       <STRONG>#define</STRONG>       <STRONG>Value</STRONG>       <STRONG>RGB</STRONG>
@@ -2363,32 +2381,32 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                     yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max,max,0
                     white     <STRONG>COLOR_WHITE</STRONG>       7     max,max,max
 
-       It is important to not confuse the  two  sets  of  color  capabilities;
+       It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On  an  HP-like terminal, use <STRONG>scp</STRONG> with a color-pair number parameter to
+       On an HP-like terminal, use <STRONG>scp</STRONG> with a color-pair number  parameter  to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
 
-       <STRONG>o</STRONG>   On a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present  to
-           indicate  that colors can be modified.  If so, the <STRONG>initc</STRONG> capability
+       <STRONG>o</STRONG>   On  a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present to
+           indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           which describe the color.  These three parameters default to  being
+           interpreted  as  RGB  (Red,  Green,  Blue)  values.  If the boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       <STRONG>o</STRONG>   On an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing  a
-           color-pair  value.   It  will  take  seven parameters; a color-pair
-           number (0 to <STRONG>max_pairs</STRONG> -  1),  and  two  triples  describing  first
-           background  and  then  foreground colors.  These parameters must be
-           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
+       <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
+           color-pair value.  It will  take  seven  parameters;  a  color-pair
+           number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
+           background and then foreground colors.  These  parameters  must  be
+           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
            <STRONG>hls</STRONG>.
 
-       On  some  color  terminals,  colors  collide  with highlights.  You can
-       register these collisions with the <STRONG>ncv</STRONG> capability.  This is a  bit-mask
-       of   attributes   not   to  be  used  when  colors  are  enabled.   The
+       On some color terminals,  colors  collide  with  highlights.   You  can
+       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit-mask
+       of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
                   <STRONG>Attribute</STRONG>              <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>      <STRONG>Set</STRONG> <STRONG>by</STRONG>
@@ -2409,118 +2427,118 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
                   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 <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4 curses does nothing with <STRONG>ncv</STRONG>, ncurses recognizes it and  optimizes
+       SVr4  curses does nothing with <STRONG>ncv</STRONG>, ncurses recognizes it and optimizes
        the output in favor of colors.
 
 
 </PRE><H3><a name="h3-Miscellaneous">Miscellaneous</a></H3><PRE>
-       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 <STRONG>PC</STRONG>  variable;
-       though  the  application  may  set this value to something other than a
-       null, ncurses will test <STRONG>npc</STRONG> first and use napms if the terminal has  no
+       npc.   Note that ncurses implements the termcap-compatible <STRONG>PC</STRONG> variable;
+       though the application may set this value to  something  other  than  a
+       null,  ncurses will test <STRONG>npc</STRONG> 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 <STRONG>hu</STRONG> (half-line up) and <STRONG>hd</STRONG>  (half-line  down).   This  is  primarily
-       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
+       If the terminal can move up or down half a line, this can be  indicated
+       with  <STRONG>hu</STRONG>  (half-line  up)  and  <STRONG>hd</STRONG> (half-line down).  This is primarily
+       useful for superscripts and subscripts on hard-copy  terminals.   If  a
        hard-copy terminal can eject to the next page (form feed), give this as
        <STRONG>ff</STRONG> (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 <STRONG>rep</STRONG>.
-       The first parameter is the character to be repeated and the  second  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  <STRONG>rep</STRONG>.
+       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 <STRONG>cmdch</STRONG>.  A prototype command character
-       is chosen which is used in all capabilities.  This character  is  given
-       in  the  <STRONG>cmdch</STRONG>  capability to identify it.  The following convention is
+       4025, this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command  character
+       is  chosen  which is used in all capabilities.  This character is given
+       in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
        supported on some UNIX systems: The environment is to be searched for a
-       <STRONG>CC</STRONG>  variable,  and if found, all occurrences of the prototype character
+       <STRONG>CC</STRONG> 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  <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and <EM>network</EM>, should include
-       the <STRONG>gn</STRONG> (generic) capability so that programs can complain that they  do
-       not  know how to talk to the terminal.  (This capability does not apply
-       to <EM>virtual</EM> terminal descriptions for which  the  escape  sequences  are
+       Terminal  descriptions  that  do not represent a specific kind of known
+       terminal, such as <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and  <EM>network</EM>,  should  include
+       the  <STRONG>gn</STRONG> (generic) capability so that programs can complain that they do
+       not know how to talk to the terminal.  (This capability does not  apply
+       to  <EM>virtual</EM>  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
-       <STRONG>km</STRONG>.   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
+       <STRONG>km</STRONG>.  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 <STRONG>smm</STRONG> and <STRONG>rmm</STRONG>.
 
        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 <STRONG>lm</STRONG>.  A  value
+       once,  the number of lines of memory can be indicated with <STRONG>lm</STRONG>.  A value
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
-       Media  copy strings which control an auxiliary printer connected to the
-       terminal can be given as <STRONG>mc0</STRONG>: print the contents of  the  screen,  <STRONG>mc4</STRONG>:
-       turn  off  the printer, and <STRONG>mc5</STRONG>: 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  <STRONG>mc5p</STRONG>  takes  one  parameter,  and
-       leaves  the  printer  on  for  as  many  characters as the value of the
+       Media copy strings which control an auxiliary printer connected to  the
+       terminal  can  be  given as <STRONG>mc0</STRONG>: print the contents of the screen, <STRONG>mc4</STRONG>:
+       turn off the printer, and <STRONG>mc5</STRONG>: 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 <STRONG>mc5p</STRONG> takes one parameter, and
+       leaves the printer on for as  many  characters  as  the  value  of  the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.   All  text, including <STRONG>mc4</STRONG>, is transparently passed to the printer
+       255.  All text, including <STRONG>mc4</STRONG>, is transparently passed to  the  printer
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
 </PRE><H3><a name="h3-Glitches-and-Braindamage">Glitches and Braindamage</a></H3><PRE>
-       Hazeltine terminals, which do not allow "~" characters to be  displayed
+       Hazeltine  terminals, which do not allow "~" characters to be displayed
        should indicate <STRONG>hz</STRONG>.
 
-       Terminals  which  ignore a line-feed immediately after an <STRONG>am</STRONG> wrap, such
+       Terminals which ignore a line-feed immediately after an <STRONG>am</STRONG>  wrap,  such
        as the Concept and vt100, should indicate <STRONG>xenl</STRONG>.
 
-       If <STRONG>el</STRONG> is required to get rid of standout  (instead  of  merely  writing
+       If  <STRONG>el</STRONG>  is  required  to get rid of standout (instead of merely writing
        normal text on top of it), <STRONG>xhp</STRONG> should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should indicate <STRONG>xt</STRONG> (destructive tabs).  Note: the  variable  indicating
-       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
-       teleray_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 necessary to use  delete  and  insert
+       should  indicate  <STRONG>xt</STRONG> (destructive tabs).  Note: the variable indicating
+       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
+       teleray_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 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 <STRONG>xsb</STRONG>, 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 <STRONG>xsb</STRONG>, 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
+       Other specific terminal  problems  may  be  corrected  by  adding  more
        capabilities of the form <STRONG>x</STRONG><EM>x</EM>.
 
 
 </PRE><H3><a name="h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></H3><PRE>
-       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 translations are much more strictly  limited
+       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 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  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> is searching for is,
+       The  man  pages  for  4.3BSD and older versions of <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> is  searching  for  is,
        several bad things can happen:
 
        <STRONG>o</STRONG>   some termcap libraries print a warning message,
@@ -2534,15 +2552,15 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        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 <STRONG>tgetent</STRONG> strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2551,88 +2569,88 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   and the application has only allocated a 1k buffer,
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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,
 
-       <STRONG>o</STRONG>   and <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> has  to  search
+       <STRONG>o</STRONG>   and  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> has to search
            the whole termcap file).
 
-       Then  <STRONG>tgetent</STRONG>  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
+       Then <STRONG>tgetent</STRONG> 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.
 
-       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 <STRONG>tgetent</STRONG> only does "tc" expansion once it is  found  the  terminal
+       since  <STRONG>tgetent</STRONG>  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 <STRONG>ncurses</STRONG>  implementation  of
-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>  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 <STRONG>ncurses</STRONG> implementation of
+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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.
 
 
 </PRE><H3><a name="h3-Binary-Compatibility">Binary Compatibility</a></H3><PRE>
-       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
+       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 and XSI Curses extensions.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching   for   terminal   descriptions   in   <STRONG>$HOME/.terminfo</STRONG>    and
+       Searching    for   terminal   descriptions   in   <STRONG>$HOME/.terminfo</STRONG>   and
        TERMINFO_DIRS is not supported by older implementations.
 
-       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
+       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
-       <STRONG>ncurses</STRONG>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
+       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
+       <STRONG>ncurses</STRONG> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for <STRONG>ncurses</STRONG> to have <STRONG>msgr</STRONG>
+       interpretation may need terminfo entries made for <STRONG>ncurses</STRONG> to have  <STRONG>msgr</STRONG>
        turned off.
 
        The <STRONG>ncurses</STRONG> 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 <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
-       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
+       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
+       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
        the documentation for the AT&amp;T 505 terminal.
 
-       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <STRONG>ncurses</STRONG>  library  wants
-       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and emulators like
-       xterm that can return mouse-tracking information in the  keyboard-input
+       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <STRONG>ncurses</STRONG> library wants
+       to interpret it as <STRONG>KEY_MOUSE</STRONG>, 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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
-       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
-       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
+       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
+       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  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 cases) different
+       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, accurate as of October 1995:
 
        <STRONG>o</STRONG>   <STRONG>SVR4,</STRONG> <STRONG>Solaris,</STRONG> <STRONG>ncurses</STRONG> -- These support all SVr4 capabilities.
@@ -2640,16 +2658,16 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   <STRONG>SGI</STRONG> -- Supports the SVr4 set, adds one undocumented extended string
            capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   <STRONG>SVr1,</STRONG>  <STRONG>Ultrix</STRONG>  --  These  support  a  restricted subset of terminfo
-           capabilities.  The booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
+       <STRONG>o</STRONG>   <STRONG>SVr1,</STRONG> <STRONG>Ultrix</STRONG> -- These  support  a  restricted  subset  of  terminfo
+           capabilities.   The  booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>HP/UX</STRONG>  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
-           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
-           through  63,  plus  <STRONG>plab_norm</STRONG>,  <STRONG>label_on</STRONG>,  and <STRONG>label_off</STRONG>, plus some
+       <STRONG>o</STRONG>   <STRONG>HP/UX</STRONG> -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
+           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
+           through 63, plus <STRONG>plab_norm</STRONG>,  <STRONG>label_on</STRONG>,  and  <STRONG>label_off</STRONG>,  plus  some
            incompatible extensions in the string table.
 
-       <STRONG>o</STRONG>   <STRONG>AIX</STRONG> -- Supports the SVr1 subset, plus function keys 11 through  63,
+       <STRONG>o</STRONG>   <STRONG>AIX</STRONG>  -- Supports the SVr1 subset, plus function keys 11 through 63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   <STRONG>OSF</STRONG> -- Supports both the SVr4 set and the AIX extensions.
@@ -2671,7 +2689,7 @@ <H1 class="no-header">terminfo 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-07-01                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-09-02                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 1cb33aad6..de76def0f 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.88 2023/08/19 20:02:20 tom Exp @
+  * @Id: tic.1m,v 1.89 2023/09/02 22:29:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-09-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -105,9 +105,12 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
        <STRONG>o</STRONG>   the system terminfo database (<EM>/usr/share/terminfo</EM>).
 
+       The  <EM>Fetching</EM>  <EM>Compiled</EM>  <EM>Descriptions</EM> section in the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> manual
+       goes into further detail.
+
 
 </PRE><H3><a name="h3-ALIASES">ALIASES</a></H3><PRE>
-       This  is the same program as infotocap and captoinfo; usually those are
+       This is the same program as infotocap and captoinfo; usually those  are
        linked to, or copied from this program:
 
        <STRONG>o</STRONG>   When invoked as infotocap, tic sets the <STRONG>-I</STRONG> option.
@@ -120,71 +123,71 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
        <STRONG>-1</STRONG>     restricts the output to a single column
 
-       <STRONG>-a</STRONG>     tells <STRONG>tic</STRONG>  to  retain  commented-out  capabilities  rather  than
-              discarding  them.   Capabilities are commented by prefixing them
-              with a period.  This sets the <STRONG>-x</STRONG> option, because it  treats  the
-              commented-out  entries  as user-defined names.  If the source is
-              termcap, accept the 2-character names  required  by  version  6.
+       <STRONG>-a</STRONG>     tells  <STRONG>tic</STRONG>  to  retain  commented-out  capabilities  rather than
+              discarding them.  Capabilities are commented by  prefixing  them
+              with  a  period.  This sets the <STRONG>-x</STRONG> option, because it treats the
+              commented-out entries as user-defined names.  If the  source  is
+              termcap,  accept  the  2-character  names required by version 6.
               Otherwise these are ignored.
 
-       <STRONG>-C</STRONG>     Force  source translation to termcap format.  Note: this differs
-              from the <STRONG>-C</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> in that  it  does  not  merely
+       <STRONG>-C</STRONG>     Force source translation to termcap format.  Note: this  differs
+              from  the  <STRONG>-C</STRONG>  option  of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> in that it does not merely
               translate capability names, but also translates terminfo strings
-              to termcap format.  Capabilities that are not  translatable  are
-              left  in  the entry under their terminfo names but commented out
-              with two preceding dots.  The actual  format  used  incorporates
-              some  improvements  for escaped characters from terminfo format.
+              to  termcap  format.  Capabilities that are not translatable are
+              left in the entry under their terminfo names but  commented  out
+              with  two  preceding  dots.  The actual format used incorporates
+              some improvements for escaped characters from  terminfo  format.
               For a stricter BSD-compatible translation, add the <STRONG>-K</STRONG> option.
 
-              If this is combined with <STRONG>-c</STRONG>,  <STRONG>tic</STRONG>  makes  additional  checks  to
-              report  cases  where  the  terminfo  values do not have an exact
+              If  this  is  combined  with  <STRONG>-c</STRONG>, <STRONG>tic</STRONG> makes additional checks to
+              report cases where the terminfo values  do  not  have  an  exact
               equivalent in termcap form.  For example:
 
-              <STRONG>o</STRONG>   <STRONG>sgr</STRONG> usually will not  convert,  because  termcap  lacks  the
-                  ability  to  work with more than two parameters, and because
-                  termcap lacks many of the arithmetic/logical operators  used
+              <STRONG>o</STRONG>   <STRONG>sgr</STRONG>  usually  will  not  convert,  because termcap lacks the
+                  ability to work with more than two parameters,  and  because
+                  termcap  lacks many of the arithmetic/logical operators used
                   in terminfo.
 
-              <STRONG>o</STRONG>   capabilities  with more than one delay or with delays before
+              <STRONG>o</STRONG>   capabilities with more than one delay or with delays  before
                   the end of the string will not convert completely.
 
-       <STRONG>-c</STRONG>     tells <STRONG>tic</STRONG> to  only  check  <EM>file</EM>  for  errors,  including  syntax
-              problems  and  bad  use-links.  If you specify <STRONG>-C</STRONG> (<STRONG>-I</STRONG>) with this
-              option, the code will print warnings about entries which,  after
-              use  resolution, are more than 1023 (4096) bytes long.  Due to a
+       <STRONG>-c</STRONG>     tells  <STRONG>tic</STRONG>  to  only  check  <EM>file</EM>  for  errors, including syntax
+              problems and bad use-links.  If you specify <STRONG>-C</STRONG>  (<STRONG>-I</STRONG>)  with  this
+              option,  the code will print warnings about entries which, after
+              use resolution, are more than 1023 (4096) bytes long.  Due to  a
               fixed buffer length in older termcap libraries, as well as buggy
-              checking  for  the  buffer  length  (and  a  documented limit in
+              checking for the  buffer  length  (and  a  documented  limit  in
               terminfo),  these  entries  may  cause  core  dumps  with  other
               implementations.
 
               <STRONG>tic</STRONG>  checks  string  capabilities  to  ensure  that  those  with
-              parameters will be valid expressions.  It does this  check  only
-              for  the predefined string capabilities; those which are defined
+              parameters  will  be valid expressions.  It does this check only
+              for the predefined string capabilities; those which are  defined
               with the <STRONG>-x</STRONG> option are ignored.
 
-       <STRONG>-D</STRONG>     tells <STRONG>tic</STRONG> to print the database locations that it  knows  about,
+       <STRONG>-D</STRONG>     tells  <STRONG>tic</STRONG>  to print the database locations that it knows about,
               and exit.  The first location shown is the one to which it would
-              write compiled terminal descriptions.  If <STRONG>tic</STRONG>  is  not  able  to
+              write  compiled  terminal  descriptions.   If <STRONG>tic</STRONG> is not able to
               find  a  writable  database  location  according  to  the  rules
-              summarized above, it will print a diagnostic and  exit  with  an
+              summarized  above,  it  will print a diagnostic and exit with an
               error rather than printing a list of database locations.
 
        <STRONG>-e</STRONG> <EM>names</EM>
-              Limit  writes  and translations to the following comma-separated
-              list of terminals.  If any name or alias of a  terminal  matches
-              one  of  the  names  in  the  list, the entry will be written or
+              Limit writes and translations to the  following  comma-separated
+              list  of  terminals.  If any name or alias of a terminal matches
+              one of the names in the list,  the  entry  will  be  written  or
               translated as normal.  Otherwise no output will be generated for
-              it.   The  option  value is interpreted as a file containing the
-              list if it contains a '/'.  (Note:  depending  on  how  tic  was
+              it.  The option value is interpreted as a  file  containing  the
+              list  if  it  contains  a  '/'.  (Note: depending on how tic was
               compiled, this option may require <STRONG>-I</STRONG> or <STRONG>-C</STRONG>.)
 
-       <STRONG>-f</STRONG>     Display     complex     terminfo     strings    which    contain
+       <STRONG>-f</STRONG>     Display    complex    terminfo     strings     which     contain
               if/then/else/endif expressions indented for readability.
 
-       <STRONG>-G</STRONG>     Display constant literals in  decimal  form  rather  than  their
+       <STRONG>-G</STRONG>     Display  constant  literals  in  decimal  form rather than their
               character equivalents.
 
-       <STRONG>-g</STRONG>     Display  constant  character literals in quoted form rather than
+       <STRONG>-g</STRONG>     Display constant character literals in quoted form  rather  than
               their decimal equivalents.
 
        <STRONG>-I</STRONG>     Force source translation to terminfo format.
@@ -192,24 +195,24 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
        <STRONG>-K</STRONG>     Suppress some longstanding ncurses extensions to termcap format,
               e.g., "\s" for space.
 
-       <STRONG>-L</STRONG>     Force  source  translation  to  terminfo format using the long C
+       <STRONG>-L</STRONG>     Force source translation to terminfo format  using  the  long  C
               variable names listed in &lt;<STRONG>term.h</STRONG>&gt;
 
        <STRONG>-N</STRONG>     Disable smart defaults.  Normally, when translating from termcap
-              to  terminfo,  the  compiler makes a number of assumptions about
-              the   defaults    of    string    capabilities    <STRONG>reset1_string</STRONG>,
-              <STRONG>carriage_return</STRONG>,  <STRONG>cursor_left</STRONG>, <STRONG>cursor_down</STRONG>, <STRONG>scroll_forward</STRONG>, <STRONG>tab</STRONG>,
+              to terminfo, the compiler makes a number  of  assumptions  about
+              the    defaults    of    string    capabilities   <STRONG>reset1_string</STRONG>,
+              <STRONG>carriage_return</STRONG>, <STRONG>cursor_left</STRONG>, <STRONG>cursor_down</STRONG>, <STRONG>scroll_forward</STRONG>,  <STRONG>tab</STRONG>,
               <STRONG>newline</STRONG>, <STRONG>key_backspace</STRONG>, <STRONG>key_left</STRONG>, and <STRONG>key_down</STRONG>, then attempts to
-              use  obsolete termcap capabilities to deduce correct values.  It
+              use obsolete termcap capabilities to deduce correct values.   It
               also normally suppresses output of obsolete termcap capabilities
-              such  as <STRONG>bs</STRONG>.  This option forces a more literal translation that
+              such as <STRONG>bs</STRONG>.  This option forces a more literal translation  that
               also preserves the obsolete capabilities.
 
-       <STRONG>-o</STRONG><EM>dir</EM>  Write compiled entries to given  database  location.   Overrides
+       <STRONG>-o</STRONG><EM>dir</EM>  Write  compiled  entries  to given database location.  Overrides
               the TERMINFO environment variable.
 
-       <STRONG>-Q</STRONG><EM>n</EM>    Rather  than  show  source  in terminfo (text) format, print the
-              compiled  (binary)  format  in  hexadecimal  or   base64   form,
+       <STRONG>-Q</STRONG><EM>n</EM>    Rather than show source in terminfo  (text)  format,  print  the
+              compiled   (binary)   format  in  hexadecimal  or  base64  form,
               depending on the option's value:
 
                1  hexadecimal
@@ -222,10 +225,10 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
               source.
 
        <STRONG>-R</STRONG><EM>subset</EM>
-              Restrict output to a given subset.  This option is for use  with
-              archaic  versions of terminfo like those on SVr1, Ultrix, or HP-
+              Restrict  output to a given subset.  This option is for use with
+              archaic versions of terminfo like those on SVr1, Ultrix, or  HP-
               UX that do not support the full set of SVR4/XSI Curses terminfo;
-              and  outright  broken  ports  like  AIX  3.x that have their own
+              and outright broken ports like  AIX  3.x  that  have  their  own
               extensions incompatible with SVr4/XSI.
 
               Available subsets are
@@ -233,27 +236,27 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
               See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-       <STRONG>-r</STRONG>     Force  entry  resolution  (so  there   are   no   remaining   tc
-              capabilities)  even  when  doing  translation to termcap format.
-              This may be needed if you are preparing a  termcap  file  for  a
-              termcap  library (such as GNU termcap through version 1.3 or BSD
+       <STRONG>-r</STRONG>     Force   entry   resolution   (so   there  are  no  remaining  tc
+              capabilities) even when doing  translation  to  termcap  format.
+              This  may  be  needed  if you are preparing a termcap file for a
+              termcap library (such as GNU termcap through version 1.3 or  BSD
               termcap  through  4.3BSD)  that  does  not  handle  multiple  tc
               capabilities per entry.
 
-       <STRONG>-s</STRONG>     Summarize  the  compile  by  showing  the database location into
-              which entries are written, and the number of entries  which  are
+       <STRONG>-s</STRONG>     Summarize the compile by  showing  the  database  location  into
+              which  entries  are written, and the number of entries which are
               compiled.
 
-       <STRONG>-T</STRONG>     eliminates  size-restrictions  on  the  generated text.  This is
-              mainly useful for  testing  and  analysis,  since  the  compiled
-              descriptions  are  limited  (e.g.,  1023  for  termcap, 4096 for
+       <STRONG>-T</STRONG>     eliminates size-restrictions on the  generated  text.   This  is
+              mainly  useful  for  testing  and  analysis,  since the compiled
+              descriptions are limited  (e.g.,  1023  for  termcap,  4096  for
               terminfo).
 
-       <STRONG>-t</STRONG>     tells <STRONG>tic</STRONG> to discard commented-out capabilities.  Normally  when
-              translating    from    terminfo   to   termcap,   untranslatable
+       <STRONG>-t</STRONG>     tells  <STRONG>tic</STRONG> to discard commented-out capabilities.  Normally when
+              translating   from   terminfo   to    termcap,    untranslatable
               capabilities are commented-out.
 
-       <STRONG>-U</STRONG>   tells <STRONG>tic</STRONG> to not post-process the data after  parsing  the  source
+       <STRONG>-U</STRONG>   tells  <STRONG>tic</STRONG>  to  not post-process the data after parsing the source
             file.  Normally, it infers data which is commonly missing in older
             terminfo data, or in termcaps.
 
@@ -263,16 +266,16 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
        <STRONG>-v</STRONG><EM>n</EM>  specifies that (verbose) output be written to standard error trace
             information showing <STRONG>tic</STRONG>'s progress.
 
-            The optional parameter <EM>n</EM> is a  number  from  1  to  9,  inclusive,
+            The  optional  parameter  <EM>n</EM>  is  a  number from 1 to 9, inclusive,
             indicating the desired level of detail of information.
 
-            <STRONG>o</STRONG>   If  ncurses  is  built  without  tracing support, the optional
+            <STRONG>o</STRONG>   If ncurses is built  without  tracing  support,  the  optional
                 parameter is ignored.
 
             <STRONG>o</STRONG>   If <EM>n</EM> is omitted, the default level is 1.
 
-            <STRONG>o</STRONG>   If <EM>n</EM> is specified and greater than 1, the level of  detail  is
-                increased,   and   the   output   is   written  (with  tracing
+            <STRONG>o</STRONG>   If  <EM>n</EM>  is specified and greater than 1, the level of detail is
+                increased,  and  the   output   is   written   (with   tracing
                 information) to the "trace" file.
 
             The debug flag levels are as follows:
@@ -295,91 +298,91 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
             9   All values computed in construction of the hash table
 
-       <STRONG>-W</STRONG>   By itself, the <STRONG>-w</STRONG>  option  will  not  force  long  strings  to  be
+       <STRONG>-W</STRONG>   By  itself,  the  <STRONG>-w</STRONG>  option  will  not  force  long strings to be
             wrapped.  Use the <STRONG>-W</STRONG> option to do this.
 
-            If  you specify both <STRONG>-f</STRONG> and <STRONG>-W</STRONG> options, the latter is ignored when
+            If you specify both <STRONG>-f</STRONG> and <STRONG>-W</STRONG> options, the latter is ignored  when
             <STRONG>-f</STRONG> has already split the line.
 
        <STRONG>-w</STRONG><EM>n</EM>  specifies the width of the output.  The parameter is optional.  If
             it is omitted, it defaults to 60.
 
-       <STRONG>-x</STRONG>   Treat  unknown  capabilities  as  user-defined (see <STRONG>user_caps(5)</STRONG>).
-            That is, if you supply  a  capability  name  which  <STRONG>tic</STRONG>  does  not
+       <STRONG>-x</STRONG>   Treat unknown capabilities  as  user-defined  (see  <STRONG>user_caps(5)</STRONG>).
+            That  is,  if  you  supply  a  capability  name which <STRONG>tic</STRONG> does not
             recognize, it will infer its type (boolean, number or string) from
-            the syntax and make an  extended  table  entry  for  that.   User-
-            defined  capability strings whose name begins with "k" are treated
+            the  syntax  and  make  an  extended  table entry for that.  User-
+            defined capability strings whose name begins with "k" are  treated
             as function keys.
 
 
 </PRE><H3><a name="h3-PARAMETERS">PARAMETERS</a></H3><PRE>
-       <EM>file</EM>   contains one or more <STRONG>terminfo</STRONG> terminal  descriptions  in  source
-              format   [see   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].   Each  description  in  the  file
+       <EM>file</EM>   contains  one  or  more <STRONG>terminfo</STRONG> terminal descriptions in source
+              format  [see  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].   Each  description  in   the   file
               describes the capabilities of a particular terminal.
 
-              If <EM>file</EM> is "-", then the data is read from the  standard  input.
+              If  <EM>file</EM>  is "-", then the data is read from the standard input.
               The <EM>file</EM> parameter may also be the path of a character-device.
 
 
 </PRE><H3><a name="h3-PROCESSING">PROCESSING</a></H3><PRE>
-       All  but  one  of  the capabilities recognized by <STRONG>tic</STRONG> are documented in
+       All but one of the capabilities recognized by  <STRONG>tic</STRONG>  are  documented  in
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  The exception is the <STRONG>use</STRONG> capability.
 
        When a <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM> field is discovered in a terminal entry currently
-       being  compiled,  <STRONG>tic</STRONG>  reads  in the binary from <STRONG>/usr/share/terminfo</STRONG> to
-       complete the entry.  (Entries created from <EM>file</EM>  will  be  used  first.
-       <STRONG>tic</STRONG>  duplicates  the  capabilities in <EM>entry</EM>-<EM>name</EM> for the current entry,
+       being compiled, <STRONG>tic</STRONG> reads in the  binary  from  <STRONG>/usr/share/terminfo</STRONG>  to
+       complete  the  entry.   (Entries  created from <EM>file</EM> will be used first.
+       <STRONG>tic</STRONG> duplicates the capabilities in <EM>entry</EM>-<EM>name</EM> for  the  current  entry,
        with the exception of those capabilities that explicitly are defined in
        the current entry.
 
-       When  an  entry, e.g., <STRONG>entry_name_1</STRONG>, contains a <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM> field,
-       any  canceled  capabilities  in  <EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  must  also   appear   in
-       <STRONG>entry_name_1</STRONG>  before  <STRONG>use=</STRONG>  for  these  capabilities  to be canceled in
+       When an entry, e.g., <STRONG>entry_name_1</STRONG>, contains a  <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  field,
+       any   canceled   capabilities  in  <EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  must  also  appear  in
+       <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG> for  these  capabilities  to  be  canceled  in
        <STRONG>entry_name_1</STRONG>.
 
        Total compiled entries cannot exceed 4096 bytes.  The name field cannot
-       exceed  512  bytes.   Terminal names exceeding the maximum alias length
+       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 truncated to the maximum alias length  and  a  warning  message
        will be printed.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       System V Release 2 provided  a  <STRONG>tic</STRONG>  utility.   It  accepted  a  single
-       option:  <STRONG>-v</STRONG>  (optionally  followed  by  a  number).   According to Ross
+       System  V  Release  2  provided  a  <STRONG>tic</STRONG>  utility.  It accepted a single
+       option: <STRONG>-v</STRONG> (optionally  followed  by  a  number).   According  to  Ross
        Ridge's comment in <EM>mytinfo</EM>, this version of <STRONG>tic</STRONG> was unable to represent
        cancelled capabilities.
 
-       System  V  Release 3 provided a different <STRONG>tic</STRONG> utility, written by Pavel
-       Curtis, (originally named "compile" in <EM>pcurses</EM>).  This added an  option
-       <STRONG>-c</STRONG>  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 <EM>pcurses</EM>.  While the program
-       itself was changed  little  as  development  continued  with  System  V
-       Release  4,  the  table  of capabilities grew from 180 (<EM>pcurses</EM>) to 464
+       System V Release 3 provided a different <STRONG>tic</STRONG> utility, written  by  Pavel
+       Curtis,  (originally named "compile" in <EM>pcurses</EM>).  This added an option
+       <STRONG>-c</STRONG> 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 <EM>pcurses</EM>.   While  the  program
+       itself  was  changed  little  as  development  continued  with System V
+       Release 4, the table of capabilities grew from  180  (<EM>pcurses</EM>)  to  464
        (Solaris).
 
-       In early development of ncurses (1993), Zeyd Ben-Halim used  the  table
-       from  <EM>mytinfo</EM>  to  extend  the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG>  (see
+       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
+       from <EM>mytinfo</EM> to extend the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG> (see
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
 
-       Eric  Raymond  incorporated  parts of <EM>mytinfo</EM> into ncurses to implement
-       the termcap-to-terminfo source conversion, and extended that  to  begin
+       Eric Raymond incorporated parts of <EM>mytinfo</EM> 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
+       Thomas  Dickey  completed  that  development over the course of several
        years.
 
-       In  1999,  Thomas  Dickey  added  the <STRONG>-x</STRONG> option to support user-defined
+       In 1999, Thomas Dickey added the  <STRONG>-x</STRONG>  option  to  support  user-defined
        capabilities.
 
-       In 2010, Roy Marples provided a <STRONG>tic</STRONG> program and  terminfo  library  for
-       NetBSD.   That  implementation  adapts  several  features from ncurses,
+       In  2010,  Roy  Marples provided a <STRONG>tic</STRONG> program and terminfo library for
+       NetBSD.  That implementation  adapts  several  features  from  ncurses,
        including <STRONG>tic</STRONG>'s <STRONG>-x</STRONG> option.
 
-       The <STRONG>-c</STRONG> option tells <STRONG>tic</STRONG> to check for problems in  the  terminfo  source
+       The  <STRONG>-c</STRONG>  option  tells <STRONG>tic</STRONG> to check for problems in the terminfo source
        file.  Continued development provides additional checks:
 
        <STRONG>o</STRONG>   <EM>pcurses</EM> had 8 warnings
@@ -394,54 +397,54 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
        The checking done in ncurses' <STRONG>tic</STRONG> 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
+       ensure consistency with the user-defined capabilities.  There  are  527
+       distinct  capabilities  in ncurses' terminal database; 128 of those are
        user-defined.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.  It
-       lists one option: <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is  unexpected.   The  change
-       history  states  that  the  description  is  derived  from True64 UNIX.
-       According to its manual  pages,  that  system  also  supported  the  <STRONG>-v</STRONG>
+       X/Open Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.   It
+       lists  one  option:  <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is unexpected.  The change
+       history states that  the  description  is  derived  from  True64  UNIX.
+       According  to  its  manual  pages,  that  system  also supported the <STRONG>-v</STRONG>
        option.
 
-       Shortly  after  Issue  7  was  released, Tru64 was discontinued.  As of
-       2019, the surviving implementations of <STRONG>tic</STRONG> are  SVr4  (AIX,  HP-UX  and
+       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
+       2019,  the  surviving  implementations  of <STRONG>tic</STRONG> are SVr4 (AIX, HP-UX and
        Solaris), ncurses and NetBSD curses.  The SVr4 <STRONG>tic</STRONG> programs all support
-       the <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's  documentation,
+       the  <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's documentation,
        omitting the <STRONG>-v</STRONG> option.
 
-       The  X/Open  rationale  states  that  some  implementations of <STRONG>tic</STRONG> read
-       terminal descriptions from the standard input if the <EM>file</EM> 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
+       The X/Open rationale states  that  some  implementations  of  <STRONG>tic</STRONG>  read
+       terminal  descriptions from the standard input if the <EM>file</EM> 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.
 
 
 </PRE><H3><a name="h3-COMPATIBILITY">COMPATIBILITY</a></H3><PRE>
-       There is  some  evidence  that  historic  <STRONG>tic</STRONG>  implementations  treated
-       description  fields with no whitespace in them as additional aliases or
-       short names.  This <STRONG>tic</STRONG>  does  not  do  that,  but  it  does  warn  when
+       There  is  some  evidence  that  historic  <STRONG>tic</STRONG>  implementations treated
+       description fields with no whitespace in them as additional aliases  or
+       short  names.   This  <STRONG>tic</STRONG>  does  not  do  that,  but  it does warn when
        description fields may be treated that way and check them for dangerous
        characters.
 
 
 </PRE><H3><a name="h3-EXTENSIONS">EXTENSIONS</a></H3><PRE>
-       Unlike the SVr4 <STRONG>tic</STRONG> 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  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  the  list  of
+       Unlike  the  SVr4 <STRONG>tic</STRONG> 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 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 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 <STRONG>use</STRONG>
+       The SVr4 manual pages are not clear on the  resolution  rules  for  <STRONG>use</STRONG>
        capabilities.   This  implementation  of  <STRONG>tic</STRONG>  will  find  <STRONG>use</STRONG>  targets
-       anywhere  in  the  source  file, or anywhere in the file tree rooted at
-       <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is defined), or  in  the  user's  <EM>$HOME/.terminfo</EM>
-       database  (if  it  exists),  or (finally) anywhere in the system's file
+       anywhere in the source file, or anywhere in the  file  tree  rooted  at
+       <STRONG>TERMINFO</STRONG>  (if  <STRONG>TERMINFO</STRONG>  is  defined), or in the user's <EM>$HOME/.terminfo</EM>
+       database (if it exists), or (finally) anywhere  in  the  system's  file
        tree of compiled entries.
 
-       The error messages from this <STRONG>tic</STRONG> have the same format as  GNU  C  error
+       The  error  messages  from this <STRONG>tic</STRONG> have the same format as GNU C error
        messages, and can be parsed by GNU Emacs's compile facility.
 
        Aside from <STRONG>-c</STRONG> and <STRONG>-v</STRONG>, options are not portable:
@@ -454,12 +457,12 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
            <STRONG>-a</STRONG> <STRONG>-o</STRONG> <STRONG>-x</STRONG>
 
-           and  adds  <STRONG>-S</STRONG>  (a feature which does the same thing as infocmp's <STRONG>-e</STRONG>
+           and adds <STRONG>-S</STRONG> (a feature which does the same thing  as  infocmp's  <STRONG>-e</STRONG>
            and <STRONG>-E</STRONG> options).
 
        The SVr4 <STRONG>-c</STRONG> mode does not 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
        <EM>$HOME/.terminfo</EM> database unless TERMINFO is explicitly set to it.
 
 
@@ -472,7 +475,7 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -481,7 +484,7 @@ <H1 class="no-header">tic 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-08-19                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-09-02                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 52b52614e..8bc33b655 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index fed44f73e..e282a6419 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 6b2c94cea..0fb0c86f3 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230819).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
 
 
 
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 960791a8b..5537a4e8c 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.87 2023/08/19 20:39:40 tom Exp $
-.TH @INFOCMP@ 1M 2023-08-19 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp $
+.TH @INFOCMP@ 1M 2023-09-02 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -274,8 +274,9 @@ were not needed.
 Like other \fBncurses\fP utilities,
 \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).
+to override the compiled-in default list of places to search.
+See \fBcurses\fP(3X), as well as
+the \fIFetching Compiled Descriptions\fP section in \fBterminfo\fR(\*n).
 .PP
 You can also use the options \fB\-A\fP
 and \fB\-B\fP to override the list of places to search
diff --git a/man/terminfo.head b/man/terminfo.head
index 7893a3d54..b04e2df81 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.44 2023/07/01 15:46:56 tom Exp $
-.TH terminfo 5 2023-07-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp $
+.TH terminfo 5 2023-09-02 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ds n 5
 .ds d @TERMINFO@
 .ie \n(.g .ds `` \(lq
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 1a9e37d67..b2715770e 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.122 2023/08/19 20:14:38 tom Exp $
+.\" $Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -245,26 +245,34 @@ in the example above.
 .br
 .ne 5
 .SS Fetching Compiled Descriptions
-The \fBncurses\fP 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
+Terminal descriptions in \fBncurses\fP are stored in terminal databases.
+These databases, which are found by their pathname,
+may be configured either as directory trees or hashed databases
+(see \fBterm\fR(\*n)),
+.PP
+The library uses a compiled-in list of pathnames,
 which can be overridden by environment variables.
 Before starting to search,
-\fBncurses\fP eliminates duplicates in its search list.
+\fBncurses\fP checks the search list,
+eliminating duplicates and pathnames where no terminal database is found.
+The \fBncurses\fP library reads the first description
+which passes its consistency checks.
 .bP
-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.
+The environment variable \fBTERMINFO\fR is checked first, for
+a terminal database containing the terminal description.
 .bP
-If TERMINFO is not set,
-\fBncurses\fP will instead look in the directory \fB$HOME/.terminfo\fP
+Next,
+\fBncurses\fP looks in \fB$HOME/.terminfo\fP
 for a compiled description.
+.IP
+This is an optional feature which may be omitted entirely from
+the library, or limited to prevent accidental use by privileged applications.
 .bP
-Next, if the environment variable TERMINFO_DIRS is set,
-\fBncurses\fP will interpret the contents of that variable
-as a list of colon-separated directories (or database files) to be searched.
+Next, if the environment variable \fBTERMINFO_DIRS\fR is set,
+\fBncurses\fP interprets the contents of that variable
+as a list of colon-separated pathnames of terminal databases to be searched.
 .IP
-An empty directory name (i.e., if the variable begins or ends
+An empty pathname (i.e., if the variable begins or ends
 with a colon, or contains adjacent colons)
 is interpreted as the system location \fI\*d\fP.
 .bP
@@ -273,8 +281,25 @@ Finally, \fBncurses\fP searches these compiled-in locations:
 .bP
 a list of directories (@TERMINFO_DIRS@), and
 .bP
-the system terminfo directory, \fI\*d\fP (the compiled-in default).
+the system terminfo directory, \fI\*d\fP
 .RE
+.PP
+The \fBTERMINFO\fP variable can contain a terminal description instead
+of the pathname of a terminal database.
+If this variable begins with \*(``hex:\*('' or \*(``b64:\*(''
+then \fBncurses\fP reads a terminal description from 
+hexadecimal- or base64-encoded data,
+and if that description matches the name sought, will use that.
+This encoded data can be set using the \*(``\-Q\*('' option of
+\fB@TIC@\fR or \fB@INFOCMP@\fR.
+.PP
+The preceding addresses the usual configuration of \fBncurses\fP,
+which uses terminal descriptions prepared in \fIterminfo\fP format.
+While \fItermcap\fP is less expressive,
+\fBncurses\fP can also be configured to read \fItermcap\fP descriptions.
+In that configuration, it checks the \fBTERMCAP\fP and \fBTERMPATH\fP
+variables (for content and search path, respectively)
+after the system terminal database.
 .SS Preparing Descriptions
 We now outline how to prepare descriptions of terminals.
 The most effective way to prepare a terminal description is by imitating
diff --git a/man/tic.1m b/man/tic.1m
index bd2b3b14c..ce8b00438 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.88 2023/08/19 20:02:20 tom Exp $
-.TH @TIC@ 1M 2023-08-19 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.89 2023/09/02 22:29:35 tom Exp $
+.TH @TIC@ 1M 2023-09-02 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -128,6 +128,9 @@ directories listed in the TERMINFO_DIRS environment variable,
 a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
 the system terminfo database (\fI\*d\fP).
+.PP
+The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(\*n)
+manual goes into further detail.
 .SS ALIASES
 This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
 usually those are linked to, or copied from this program:
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b2cd5eee5..32c47310a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230826) unstable; urgency=low
+ncurses6 (6.4+20230902) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b2cd5eee5..32c47310a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230826) unstable; urgency=low
+ncurses6 (6.4+20230902) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ce0399d80..49bea141e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230826) unstable; urgency=low
+ncurses6 (6.4+20230902) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Aug 2023 15:29:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 453d23d8d..f33f8ac24 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.601 2023/08/26 19:29:45 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.602 2023/09/02 09:30:01 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0826"
+!define VERSION_MMDD  "0902"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6baedf733..7cf2d1c34 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230826
+Release: 20230902
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 5e987459e..8531bc9f2 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230826
+Release: 20230902
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 2e8e05ae5..f32819cc4 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230826
+Release: 20230902
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From a608492729ee8a23c8a536c98b092474f2e49aff Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 10 Sep 2023 02:04:21 +0200
Subject: [PATCH 028/106] ncurses-6.4-20230909.patch

---
 NEWS                                  |   9 +-
 VERSION                               |   2 +-
 dist.mk                               |   4 +-
 doc/html/man/adacurses6-config.1.html |   4 +-
 doc/html/man/captoinfo.1m.html        |  18 +--
 doc/html/man/clear.1.html             |  10 +-
 doc/html/man/curs_attr.3x.html        |   8 +-
 doc/html/man/curs_mouse.3x.html       |   8 +-
 doc/html/man/default_colors.3x.html   |   4 +-
 doc/html/man/form.3x.html             |   2 +-
 doc/html/man/infocmp.1m.html          |  10 +-
 doc/html/man/infotocap.1m.html        |   2 +-
 doc/html/man/menu.3x.html             |   2 +-
 doc/html/man/ncurses.3x.html          |  10 +-
 doc/html/man/ncurses6-config.1.html   |   2 +-
 doc/html/man/new_pair.3x.html         |   8 +-
 doc/html/man/panel.3x.html            |   2 +-
 doc/html/man/scr_dump.5.html          |   8 +-
 doc/html/man/tabs.1.html              |  10 +-
 doc/html/man/term.5.html              |  53 +++---
 doc/html/man/term_variables.3x.html   |   8 +-
 doc/html/man/terminfo.5.html          | 225 +++++++++++++-------------
 doc/html/man/tic.1m.html              |   2 +-
 doc/html/man/toe.1m.html              |  10 +-
 doc/html/man/tput.1.html              |   2 +-
 doc/html/man/tset.1.html              |   2 +-
 doc/html/man/user_caps.5.html         |   8 +-
 man/MKada_config.in                   |  15 +-
 man/captoinfo.1m                      |  24 +--
 man/clear.1                           |  11 +-
 man/curs_attr.3x                      |  11 +-
 man/curs_mouse.3x                     |  11 +-
 man/default_colors.3x                 |   4 +-
 man/infocmp.1m                        |  11 +-
 man/ncurses.3x                        |  15 +-
 man/new_pair.3x                       |  11 +-
 man/scr_dump.5                        |  11 +-
 man/tabs.1                            |  11 +-
 man/term.5                            |  27 ++--
 man/term_variables.3x                 |  11 +-
 man/terminfo.head                     |  24 ++-
 man/terminfo.tail                     | 148 ++++++++---------
 man/toe.1m                            |  11 +-
 man/user_caps.5                       |  18 +--
 misc/ncu2openbsd                      |  22 +--
 ncurses/curses.priv.h                 |   4 +-
 ncurses/tinfo/alloc_entry.c           |  36 +++--
 ncurses/tinfo/alloc_ttype.c           |  24 ++-
 ncurses/tinfo/lib_raw.c               |  20 +--
 ncurses/tty/hardscroll.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 +-
 57 files changed, 517 insertions(+), 422 deletions(-)

diff --git a/NEWS b/NEWS
index c214db314..81fabef58 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3992 2023/09/02 22:31:36 tom Exp $
+-- $Id: NEWS,v 1.3995 2023/09/09 16:45:37 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230909
+	+ improve formatting of manpages (patches by Branden Robinson).
+	> patches by Nicholas Marriott:
+	  + use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c,
+	    overlooked due to compiler changes in recent OpenBSD releases.
+	  + add "-6" option to ncu2openbsd script.
+
 20230902
 	+ improve description of search rules for terminal descriptions in
 	  terminfo manpage (report by Sven Joachim).
diff --git a/VERSION b/VERSION
index 65d711a1d..11d281c49 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230902
+5:0:10	6.4	20230909
diff --git a/dist.mk b/dist.mk
index 199153050..0125602ab 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1562 2023/09/02 09:30:01 tom Exp $
+# $Id: dist.mk,v 1.1563 2023/09/09 12:21:39 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230902
+NCURSES_PATCH = 20230909
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 17293d49a..e649144c1 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp @
+  * @Id: MKada_config.in,v 1.17 2023/09/09 17:06:25 Branden.Robinson Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 08f5d51f8..c5ac5f73c 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp @
+  * @Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-08-19 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -92,8 +92,8 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
        not mistakenly translated a completely unknown  and  random  capability
        and/or syntax error.
 
-       Nonstd   Std    From           Terminfo
-        name    name                 capability
+       <STRONG>Nonstd</STRONG>   <STRONG>Std</STRONG>                   <STRONG>Terminfo</STRONG>
+        <STRONG>name</STRONG>    <STRONG>name</STRONG>   <STRONG>From</STRONG>          <STRONG>capability</STRONG>
        -----------------------------------------------
        BO       mr     AT&amp;T    enter_reverse_mode
        CI       vi     AT&amp;T    cursor_invisible
@@ -129,7 +129,7 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
        forms drawing, designed to take  advantage  of  the  IBM  PC  high-half
        graphics.  They were as follows:
 
-       Cap          Graphic
+       <STRONG>Cap</STRONG>          <STRONG>Graphic</STRONG>
        -----------------------------
        G2    upper left
        G3    lower left
@@ -163,7 +163,7 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
        incompatible with the SVr4 format.  The following  AIX  extensions  are
        automatically translated:
 
-        IBM    XSI
+        <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
        -------------
        ksel    kslt
        kbtab   kcbt
@@ -199,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -208,7 +208,7 @@ <H1 class="no-header">captoinfo 1m 2023-08-19 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-08-19                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-09-09                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 13877ea65..f14e94ba7 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp @
+  * @Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -36,12 +36,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-09-09 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-09-09 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -150,11 +150,11 @@ <H1 class="no-header">clear 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-09-09                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 8e3db63e8..fbb1e131d 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp @
+  * @Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp @
   * ---------------------------------------------------------------------------
   * attr_get
   * .br
@@ -56,12 +56,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -520,7 +520,7 @@ <H1 class="no-header">curs_attr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-09                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index cf5ce974c..78e3ac5b7 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -375,7 +375,7 @@ <H1 class="no-header">curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-09-09                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index ae68f47f8..a489ca81c 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.37 2023/08/19 19:48:15 tom Exp @
+  * @Id: default_colors.3x,v 1.38 2023/08/19 19:48:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 3a899c2d6..f69d0052f 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 1551b5b2b..2abfabee6 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp @
+  * @Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-09-02 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-09-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-09-09 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -522,7 +522,7 @@ <H1 class="no-header">infocmp 1m 2023-09-02 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-09-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-02                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-09-09                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 1e7824244..4b794ec23 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 17b04645e..6022f6ccd 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 3e0e6d36b..9142cfa48 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp @
+  * @Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1482,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-09-09                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index a1cb68030..974aff840 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 08d1bd6fd..d55b3c7e7 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">new_pair 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-09-09                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index fd0226823..972eff351 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index f7cf53c94..f090e2781 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-07-01 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-09-09 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-07-01 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-09-09 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-07-01                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-09-09                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index fc4b89c99..cf8d9ab5b 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp @
+  * @Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-09-09 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-09-09 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -252,11 +252,11 @@ <H1 class="no-header">tabs 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-09-09                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index d7d7cdf37..356b849fb 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp @
+  * @Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-07-01 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-09-09 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-07-01 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-09-09 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -318,29 +318,28 @@ <H1 class="no-header">term 5 2023-07-01 ncurses 6.4 File formats</H1>
 
        and a hexadecimal dump of the compiled terminal description:
 
-           0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
-           0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
-           0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
-           0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
-           0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
-           0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$&lt;1
-           0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  &gt;..=%p1% {32}%+%c
-           0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-           0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
-
+     0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+     0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
+     0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
+     0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
+     0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
+     0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$&lt;1
+     0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  &gt;..=%p1% {32}%+%c
+     0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
+     0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 
 
 </PRE><H2><a name="h2-LIMITS">LIMITS</a></H2><PRE>
@@ -379,7 +378,7 @@ <H1 class="no-header">term 5 2023-07-01 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-09-09                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 2546d80d9..f5acf53b5 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp @
+  * @Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-07-01 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-07-01                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-09                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 125c85be0..1d21b3f55 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp @
+  * @Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,24 +62,23 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp @
+  * @Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp @
   *.in -2
   *.in +2
   *.in -2
   *.in +2
-  *.TH
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-09-02 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-09-09 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -106,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -161,6 +160,7 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
        following suffixes should be used where possible:
 
             <STRONG>Suffix</STRONG>                  <STRONG>Meaning</STRONG>                   <STRONG>Example</STRONG>
+            -------------------------------------------------------------
             -<EM>nn</EM>      Number of lines on the screen            aaa-60
             -<EM>n</EM>p      Number of pages of memory                c100-4p
             -am      With automargins (usually the default)   vt100-am
@@ -285,7 +285,6 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
                   <STRONG>Booleans</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
 
 
-
           auto_left_margin            bw        bw     cub1 wraps from
                                                        column 0 to last
                                                        column
@@ -1679,18 +1678,18 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
 
        These are the margin-related capabilities:
 
-                <STRONG>Name</STRONG>       <STRONG>Description</STRONG>
-                ------------------------------------------------------
-                smgl       Set left margin at current column
-                smgr       Set right margin at current column
-                smgb       Set bottom margin at current line
-                smgt       Set top margin at current line
-                smgbp      Set bottom margin at line <EM>N</EM>
-                smglp      Set left margin at column <EM>N</EM>
-                smgrp      Set right margin at column <EM>N</EM>
-                smgtp      Set top margin at line <EM>N</EM>
-                smglr      Set both left and right margins to <EM>L</EM> and <EM>R</EM>
-                smgtb      Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
+                 <STRONG>Name</STRONG>    <STRONG>Description</STRONG>
+                 ---------------------------------------------------
+                 <STRONG>smgl</STRONG>    Set left margin at current column
+                 <STRONG>smgr</STRONG>    Set right margin at current column
+                 <STRONG>smgb</STRONG>    Set bottom margin at current line
+                 <STRONG>smgt</STRONG>    Set top margin at current line
+                 <STRONG>smgbp</STRONG>   Set bottom margin at line <EM>N</EM>
+                 <STRONG>smglp</STRONG>   Set left margin at column <EM>N</EM>
+                 <STRONG>smgrp</STRONG>   Set right margin at column <EM>N</EM>
+                 <STRONG>smgtp</STRONG>   Set top margin at line <EM>N</EM>
+                 <STRONG>smglr</STRONG>   Set both left and right margins to <EM>L</EM> and <EM>R</EM>
+                 <STRONG>smgtb</STRONG>   Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
        When writing an application that uses these  string  capabilities,  the
        pairs  should be first checked to see if each capability in the pair is
@@ -1922,18 +1921,18 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
 
        For example, the DEC vt220 supports most of the modes:
 
-               <STRONG>tparm</STRONG> <STRONG>parameter</STRONG>      <STRONG>attribute</STRONG>        <STRONG>escape</STRONG> <STRONG>sequence</STRONG>
-
-               none                 none             \E[0m
-               p1                   standout         \E[0;1;7m
-               p2                   underline        \E[0;4m
-               p3                   reverse          \E[0;7m
-               p4                   blink            \E[0;5m
-               p5                   dim              not available
-               p6                   bold             \E[0;1m
-               p7                   invis            \E[0;8m
-               p8                   protect          not used
-               p9                   altcharset       ^O (off) ^N (on)
+                   <STRONG>tparm</STRONG> <STRONG>Parameter</STRONG>   <STRONG>Attribute</STRONG>    <STRONG>Escape</STRONG> <STRONG>Sequence</STRONG>
+                   ------------------------------------------------
+                   none              none         \E[0m
+                   p1                standout     \E[0;1;7m
+                   p2                underline    \E[0;4m
+                   p3                reverse      \E[0;7m
+                   p4                blink        \E[0;5m
+                   p5                dim          not available
+                   p6                bold         \E[0;1m
+                   p7                invis        \E[0;8m
+                   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
@@ -1950,16 +1949,16 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
 
        Writing out the above sequences, along with their dependencies yields
 
-            <STRONG>sequence</STRONG>             <STRONG>when</STRONG> <STRONG>to</STRONG> <STRONG>output</STRONG>      <STRONG>terminfo</STRONG> <STRONG>translation</STRONG>
-
-            \E[0                 always              \E[0
-            ;1                   if p1 or p6         %?%p1%p6%|%t;1%;
-            ;4                   if p2               %?%p2%|%t;4%;
-            ;5                   if p4               %?%p4%|%t;5%;
-            ;7                   if p1 or p3         %?%p1%p3%|%t;7%;
-            ;8                   if p7               %?%p7%|%t;8%;
-            m                    always              m
-            ^N or ^O             if p9 ^N, else ^O   %?%p9%t^N%e^O%;
+                 <STRONG>Sequence</STRONG>   <STRONG>When</STRONG> <STRONG>to</STRONG> <STRONG>Output</STRONG>      <STRONG>terminfo</STRONG> <STRONG>Translation</STRONG>
+                 ----------------------------------------------------
+                 \E[0       always              \E[0
+                 ;1         if p1 or p6         %?%p1%p6%|%t;1%;
+                 ;4         if p2               %?%p2%|%t;4%;
+                 ;5         if p4               %?%p4%|%t;5%;
+                 ;7         if p1 or p3         %?%p1%p3%|%t;7%;
+                 ;8         if p7               %?%p7%|%t;8%;
+                 m          always              m
+                 ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
 
        Putting this all together into the sgr sequence gives:
 
@@ -2243,41 +2242,41 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
        4410v1 added.  This alternate character set may  be  specified  by  the
        <STRONG>acsc</STRONG> capability.
 
-         <STRONG>Glyph</STRONG>                       <STRONG>ACS</STRONG>            <STRONG>Ascii</STRONG>     <STRONG>acsc</STRONG>     <STRONG>acsc</STRONG>
-         <STRONG>Name</STRONG>                        <STRONG>Name</STRONG>           <STRONG>Default</STRONG>   <STRONG>Char</STRONG>     <STRONG>Value</STRONG>
+                                                   <STRONG>ASCII</STRONG>      <STRONG>acsc</STRONG>     <STRONG>acsc</STRONG>
+         <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>                 <STRONG>ACS</STRONG> <STRONG>Name</STRONG>       <STRONG>Fallback</STRONG>   <STRONG>Symbol</STRONG>   <STRONG>Value</STRONG>
          --------------------------------------------------------------------
-         arrow pointing right        ACS_RARROW     &gt;         +        0x2b
-         arrow pointing left         ACS_LARROW     &lt;         ,        0x2c
-         arrow pointing up           ACS_UARROW     ^         -        0x2d
-         arrow pointing down         ACS_DARROW     v         .        0x2e
-         solid square block          ACS_BLOCK      #         0        0x30
-         diamond                     ACS_DIAMOND    +         `        0x60
-         checker board (stipple)     ACS_CKBOARD    :         a        0x61
-         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
-         upper left corner           ACS_ULCORNER   +         l        0x6c
-         lower left corner           ACS_LLCORNER   +         m        0x6d
-         large plus or crossover     ACS_PLUS       +         n        0x6e
-         scan line 1                 ACS_S1         ~         o        0x6f
-         scan line 3                 ACS_S3         -         p        0x70
-         horizontal line             ACS_HLINE      -         q        0x71
-         scan line 7                 ACS_S7         -         r        0x72
-         scan line 9                 ACS_S9         _         s        0x73
-         tee pointing right          ACS_LTEE       +         t        0x74
-         tee pointing left           ACS_RTEE       +         u        0x75
-         tee pointing up             ACS_BTEE       +         v        0x76
-         tee pointing down           ACS_TTEE       +         w        0x77
-         vertical line               ACS_VLINE      |         x        0x78
-         less-than-or-equal-to       ACS_LEQUAL     &lt;         y        0x79
-         greater-than-or-equal-to    ACS_GEQUAL     &gt;         z        0x7a
-         greek pi                    ACS_PI         *         {        0x7b
-         not-equal                   ACS_NEQUAL     !         |        0x7c
-         UK pound sign               ACS_STERLING   f         }        0x7d
-         bullet                      ACS_BULLET     o         ~        0x7e
+         arrow pointing right       <STRONG>ACS_RARROW</STRONG>     &gt;          +        0x2b
+         arrow pointing left        <STRONG>ACS_LARROW</STRONG>     &lt;          ,        0x2c
+         arrow pointing up          <STRONG>ACS_UARROW</STRONG>     ^          -        0x2d
+         arrow pointing down        <STRONG>ACS_DARROW</STRONG>     v          .        0x2e
+         solid square block         <STRONG>ACS_BLOCK</STRONG>      #          0        0x30
+         diamond                    <STRONG>ACS_DIAMOND</STRONG>    +          `        0x60
+         checker board (stipple)    <STRONG>ACS_CKBOARD</STRONG>    :          a        0x61
+         degree symbol              <STRONG>ACS_DEGREE</STRONG>     \          f        0x66
+         plus/minus                 <STRONG>ACS_PLMINUS</STRONG>    #          g        0x67
+         board of squares           <STRONG>ACS_BOARD</STRONG>      #          h        0x68
+         lantern symbol             <STRONG>ACS_LANTERN</STRONG>    #          i        0x69
+         lower right corner         <STRONG>ACS_LRCORNER</STRONG>   +          j        0x6a
+         upper right corner         <STRONG>ACS_URCORNER</STRONG>   +          k        0x6b
+         upper left corner          <STRONG>ACS_ULCORNER</STRONG>   +          l        0x6c
+         lower left corner          <STRONG>ACS_LLCORNER</STRONG>   +          m        0x6d
+         large plus or crossover    <STRONG>ACS_PLUS</STRONG>       +          n        0x6e
+         scan line 1                <STRONG>ACS_S1</STRONG>         ~          o        0x6f
+         scan line 3                <STRONG>ACS_S3</STRONG>         -          p        0x70
+         horizontal line            <STRONG>ACS_HLINE</STRONG>      -          q        0x71
+         scan line 7                <STRONG>ACS_S7</STRONG>         -          r        0x72
+         scan line 9                <STRONG>ACS_S9</STRONG>         _          s        0x73
+         tee pointing right         <STRONG>ACS_LTEE</STRONG>       +          t        0x74
+         tee pointing left          <STRONG>ACS_RTEE</STRONG>       +          u        0x75
+         tee pointing up            <STRONG>ACS_BTEE</STRONG>       +          v        0x76
+         tee pointing down          <STRONG>ACS_TTEE</STRONG>       +          w        0x77
+         vertical line              <STRONG>ACS_VLINE</STRONG>      |          x        0x78
+         less-than-or-equal-to      <STRONG>ACS_LEQUAL</STRONG>     &lt;          y        0x79
+         greater-than-or-equal-to   <STRONG>ACS_GEQUAL</STRONG>     &gt;          z        0x7a
+         greek pi                   <STRONG>ACS_PI</STRONG>         *          {        0x7b
+         not-equal                  <STRONG>ACS_NEQUAL</STRONG>     !          |        0x7c
+         UK pound sign              <STRONG>ACS_STERLING</STRONG>   f          }        0x7d
+         bullet                     <STRONG>ACS_BULLET</STRONG>     o          ~        0x7e
 
        A few notes apply to the table itself:
 
@@ -2358,28 +2357,30 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
        free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
-                    <STRONG>Color</STRONG>       <STRONG>#define</STRONG>       <STRONG>Value</STRONG>       <STRONG>RGB</STRONG>
-                    black     <STRONG>COLOR_BLACK</STRONG>       0     0, 0, 0
-                    red       <STRONG>COLOR_RED</STRONG>         1     max,0,0
-                    green     <STRONG>COLOR_GREEN</STRONG>       2     0,max,0
-                    yellow    <STRONG>COLOR_YELLOW</STRONG>      3     max,max,0
-                    blue      <STRONG>COLOR_BLUE</STRONG>        4     0,0,max
-                    magenta   <STRONG>COLOR_MAGENTA</STRONG>     5     max,0,max
-                    cyan      <STRONG>COLOR_CYAN</STRONG>        6     0,max,max
-                    white     <STRONG>COLOR_WHITE</STRONG>       7     max,max,max
+                    <STRONG>Color</STRONG>      <STRONG>#define</STRONG>       <STRONG>Value</STRONG>        <STRONG>RGB</STRONG>
+                   ------------------------------------------------
+                   black     <STRONG>COLOR_BLACK</STRONG>       0     0,   0,   0
+                   red       <STRONG>COLOR_RED</STRONG>         1     max, 0,   0
+                   green     <STRONG>COLOR_GREEN</STRONG>       2     0,   max, 0
+                   yellow    <STRONG>COLOR_YELLOW</STRONG>      3     max, max, 0
+                   blue      <STRONG>COLOR_BLUE</STRONG>        4     0,   0,   max
+                   magenta   <STRONG>COLOR_MAGENTA</STRONG>     5     max, 0,   max
+                   cyan      <STRONG>COLOR_CYAN</STRONG>        6     0,   max, max
+                   white     <STRONG>COLOR_WHITE</STRONG>       7     max, max, max
 
        The argument values of <STRONG>setf</STRONG>/<STRONG>setb</STRONG> historically correspond to a different
        mapping, i.e.,
 
-                    <STRONG>Color</STRONG>       <STRONG>#define</STRONG>       <STRONG>Value</STRONG>       <STRONG>RGB</STRONG>
-                    black     <STRONG>COLOR_BLACK</STRONG>       0     0, 0, 0
-                    blue      <STRONG>COLOR_BLUE</STRONG>        1     0,0,max
-                    green     <STRONG>COLOR_GREEN</STRONG>       2     0,max,0
-                    cyan      <STRONG>COLOR_CYAN</STRONG>        3     0,max,max
-                    red       <STRONG>COLOR_RED</STRONG>         4     max,0,0
-                    magenta   <STRONG>COLOR_MAGENTA</STRONG>     5     max,0,max
-                    yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max,max,0
-                    white     <STRONG>COLOR_WHITE</STRONG>       7     max,max,max
+                    <STRONG>Color</STRONG>      <STRONG>#define</STRONG>       <STRONG>Value</STRONG>        <STRONG>RGB</STRONG>
+                   ------------------------------------------------
+                   black     <STRONG>COLOR_BLACK</STRONG>       0     0,   0,   0
+                   blue      <STRONG>COLOR_BLUE</STRONG>        1     0,   0,   max
+                   green     <STRONG>COLOR_GREEN</STRONG>       2     0,   max, 0
+                   cyan      <STRONG>COLOR_CYAN</STRONG>        3     0,   max, max
+                   red       <STRONG>COLOR_RED</STRONG>         4     max, 0,   0
+                   magenta   <STRONG>COLOR_MAGENTA</STRONG>     5     max, 0,   max
+                   yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max, max, 0
+                   white     <STRONG>COLOR_WHITE</STRONG>       7     max, max, max
 
        It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
@@ -2409,23 +2410,25 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
        of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
-                  <STRONG>Attribute</STRONG>              <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>      <STRONG>Set</STRONG> <STRONG>by</STRONG>
-                  A_STANDOUT             0     1            sgr
-                  A_UNDERLINE            1     2            sgr
-                  A_REVERSE              2     4            sgr
-                  A_BLINK                3     8            sgr
-                  A_DIM                  4     16           sgr
-                  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
-                  A_LOW                  11    2048         sgr1
-                  A_RIGHT                12    4096         sgr1
-                  A_TOP                  13    8192         sgr1
-                  A_VERTICAL             14    16384        sgr1
-                  A_ITALIC               15    32768        sitm
+                         <STRONG>Attribute</STRONG>     <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>   <STRONG>Set</STRONG> <STRONG>by</STRONG>
+                        --------------------------------------
+                        <STRONG>A_STANDOUT</STRONG>      0         1    <STRONG>sgr</STRONG>
+                        <STRONG>A_UNDERLINE</STRONG>     1         2    <STRONG>sgr</STRONG>
+                        <STRONG>A_REVERSE</STRONG>       2         4    <STRONG>sgr</STRONG>
+                        <STRONG>A_BLINK</STRONG>         3         8    <STRONG>sgr</STRONG>
+                        <STRONG>A_DIM</STRONG>           4        16    <STRONG>sgr</STRONG>
+                        <STRONG>A_BOLD</STRONG>          5        32    <STRONG>sgr</STRONG>
+                        <STRONG>A_INVIS</STRONG>         6        64    <STRONG>sgr</STRONG>
+                        <STRONG>A_PROTECT</STRONG>       7       128    <STRONG>sgr</STRONG>
+                        <STRONG>A_ALTCHARSET</STRONG>    8       256    <STRONG>sgr</STRONG>
+                        <STRONG>A_HORIZONTAL</STRONG>    9       512    <STRONG>sgr1</STRONG>
+                        <STRONG>A_LEFT</STRONG>         10      1024    <STRONG>sgr1</STRONG>
+                        <STRONG>A_LOW</STRONG>          11      2048    <STRONG>sgr1</STRONG>
+                        <STRONG>A_RIGHT</STRONG>        12      4096    <STRONG>sgr1</STRONG>
+                        <STRONG>A_TOP</STRONG>          13      8192    <STRONG>sgr1</STRONG>
+
+                        <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
+                        <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
        For  example, on many IBM PC consoles, the underline attribute collides
        with the foreground color blue and is  not  available  in  color  mode.
@@ -2689,7 +2692,7 @@ <H1 class="no-header">terminfo 5 2023-09-02 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-02                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-09-09                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index de76def0f..433621cc5 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -475,7 +475,7 @@ <H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 8bc33b655..272fecd2f 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp @
+  * @Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-09-09 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -171,11 +171,11 @@ <H1 class="no-header">toe 1m 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-09-09                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index e282a6419..2fcbfb04f 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 0fb0c86f3..138286c77 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230902).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 8fd38a4ac..1ef433212 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp @
+  * @Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-08-19 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-09-09 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-08-19 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-09-09 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -394,7 +394,7 @@ <H1 class="no-header">user_caps 5 2023-08-19 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-08-19                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-09-09                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 3a2986fa8..f1a956a70 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,9 +27,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp $
+.\" $Id: MKada_config.in,v 1.18 2023/09/09 23:32:29 tom Exp $
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.TH ADACURSES 1 2023-08-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.TH ADACURSES 1 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .SH NAME
 adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
 .SH SYNOPSIS
@@ -64,7 +69,7 @@ program for @ADA_LIBNAME@.
 Make a file named "hello.adb":
 .RS
 .nf
-.ft CW
+.ft \*(CW
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
 procedure Hello is
@@ -103,14 +108,14 @@ end Hello;
 .PP
 Then, using
 .RS
-.ft CW
+.ft \*(CW
 gnatmake `adacurses-config --cflags` hello -largs `adacurses-config --libs`
 .ft
 .RE
 .PP
 or (simpler):
 .RS
-.ft CW
+.ft \*(CW
 gnatmake hello `adacurses-config`
 .ft
 .RE
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index c5ff2ac4a..55b43f321 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-08-19 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -79,12 +79,12 @@ will issue an notification to stderr, inviting the user to check that
 it has not mistakenly translated a completely unknown and random
 capability and/or syntax error.
 .PP
-.TS H
-c c c c
-c c c c
-l l l l.
-Nonstd	Std	From	Terminfo
-name	name		capability
+.TS
+cb cb cb cb
+cb cb cb cb
+l  l  l  l .
+Nonstd	Std	\&	Terminfo
+name	name	From	capability
 _
 BO	mr	AT&T	enter_reverse_mode
 CI	vi	AT&T	cursor_invisible
@@ -121,8 +121,8 @@ for forms drawing, designed to take advantage of the IBM PC
 high-half graphics.
 They were as follows:
 .PP
-.TS H
-c c
+.TS
+cb cb
 l l.
 Cap	Graphic
 _
@@ -162,8 +162,8 @@ The following AIX extensions are automatically
 translated:
 .PP
 .TS
-c c
-l l.
+cb cb
+l  l .
 IBM	XSI
 _
 ksel	kslt
diff --git a/man/clear.1 b/man/clear.1
index 830560bda..3498dc7df 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp $
-.TH @CLEAR@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp $
+.TH @CLEAR@ 1 2023-09-09 "ncurses 6.4" "User commands"
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .\" these would be fallbacks for DS/DE,
 .\" but groff changed the meaning of the macros.
 .de NS
@@ -37,7 +42,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index ca75a2f67..0795102ec 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,19 +28,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp $
-.TH curs_attr 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp $
+.TH curs_attr 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 6d8c87db5..731e6e5ed 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,18 +28,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -51,7 +56,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_mouse 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.TH curs_mouse 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/default_colors.3x b/man/default_colors.3x
index a90947dd6..f60740e49 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.37 2023/08/19 19:48:15 tom Exp $
+.\" $Id: default_colors.3x,v 1.38 2023/08/19 19:48:15 tom Exp $
 .TH default_colors 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 5537a4e8c..582cd7ecc 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp $
-.TH @INFOCMP@ 1M 2023-09-02 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp $
+.TH @INFOCMP@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,13 +39,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 86361f9b1..5bd9d5f52 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,13 +28,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp $
+.\" $Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp $
 .hy 0
-.TH ncurses 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.TH ncurses 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,7 +50,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -1036,7 +1041,7 @@ ncurses checks for an extended terminfo capability \fBU8\fP.
 This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
 For example
 .RS 3
-.ft CW
+.ft \*(CW
 .sp
 .nf
 # linux console, if patched to provide working
@@ -1048,7 +1053,7 @@ linux-vt100|linux console with VT100 line-graphics,
 xterm-utf8|xterm relying on UTF-8 line-graphics,
         U8#1, use=xterm,
 .fi
-.ft
+.ft R
 .RE
 .PP
 The name \*(``U8\*('' is chosen to be two characters,
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 036a8a298..38203fd86 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH new_pair 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp $
+.TH new_pair 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,13 +39,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index cd8f741dc..2a2203be5 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,19 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH scr_dump 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp $
+.TH scr_dump 5 2023-09-09 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/tabs.1 b/man/tabs.1
index b834615d2..8b83c1d0d 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp $
-.TH @TABS@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp $
+.TH @TABS@ 1 2023-09-09 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -38,13 +38,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/term.5 b/man/term.5
index 97070a184..d8ba7ac72 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,19 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp $
-.TH term 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp $
+.TH term 5 2023-09-09 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -353,9 +358,12 @@ adm3a|lsi adm3a,
 .NE
 .PP
 and a hexadecimal dump of the compiled terminal description:
-.NS
-.ft CW
-\s-20000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+.PP
+.ie n .in -2n
+.el   .in +4n
+.TS
+lp-1f(\*(CW).
+0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
 0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
 0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
 0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
@@ -376,10 +384,9 @@ and a hexadecimal dump of the compiled terminal description:
 0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
 0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
 0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-0150  00 08 00 0c 00 0b 00 0a  00                       ........ .\s+2
-.ft R
-.NE
-.sp
+0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
+.TE
+.in
 .SH LIMITS
 Some limitations:
 .bP
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 76dc5347e..68028cb09 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,13 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp $
-.TH term_variables 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp $
+.TH term_variables 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .na
 .hy 0
 .SH NAME
@@ -152,7 +157,7 @@ These are in terms of the symbol \fBCUR\fP,
 which is defined
 .PP
 .nf
-.ft CW
+.ft \*(CW
 #define CUR ((TERMTYPE *)(cur_term))->
 .fi
 .ft R
diff --git a/man/terminfo.head b/man/terminfo.head
index b04e2df81..ab24174e9 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,14 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp $
-.TH terminfo 5 2023-09-02 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp $
+.TH terminfo 5 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ds n 5
 .ds d @TERMINFO@
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie \n(.g .ds ^ \(ha
+.el       .ds ^ ^
+.ie \n(.g .ds ~ \(ti
+.el       .ds ~ ~
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,7 +54,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -135,10 +144,11 @@ Thus, a vt100 in 132-column mode would be vt100\-w.
 The following suffixes should be used where possible:
 .PP
 .TS
-center ;
-l c l
-l l l.
-\fBSuffix	Meaning	Example\fP
+center;
+lb cb lb
+l  l  l .
+Suffix	Meaning	Example
+_
 \-\fInn\fP	Number of lines on the screen	aaa\-60
 \-\fIn\fPp	Number of pages of memory	c100\-4p
 \-am	With automargins (usually the default)	vt100\-am
diff --git a/man/terminfo.tail b/man/terminfo.tail
index b2715770e..05c0426af 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp $
+.\" $Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -85,7 +85,7 @@ The following entry, describing an ANSI-standard terminal, is representative
 of what a \fBterminfo\fP entry for a modern terminal typically looks like.
 .PP
 .nf
-.ft CW
+.ft \*(CW
 \s-2ansi|ansi/pc-term compatible with color,
         am, mc5i, mir, msgr,
         colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
@@ -287,7 +287,7 @@ the system terminfo directory, \fI\*d\fP
 The \fBTERMINFO\fP variable can contain a terminal description instead
 of the pathname of a terminal database.
 If this variable begins with \*(``hex:\*('' or \*(``b64:\*(''
-then \fBncurses\fP reads a terminal description from 
+then \fBncurses\fP reads a terminal description from
 hexadecimal- or base64-encoded data,
 and if that description matches the name sought, will use that.
 This encoded data can be set using the \*(``\-Q\*('' option of
@@ -434,7 +434,7 @@ Thus the model 33 teletype is described as
 .PP
 .DT
 .nf
-.ft CW
+.ft \*(CW
 .\".in -2
 \s-133\||\|tty33\||\|tty\||\|model 33 teletype,
         bel=^G, cols#72, cr=^M, cud1=^J, hc, ind=^J, os,\s+1
@@ -446,7 +446,7 @@ while the Lear Siegler \s-1ADM-3\s0 is described as
 .PP
 .DT
 .nf
-.ft CW
+.ft \*(CW
 .\".in -2
 \s-1adm3\||\|3\||\|lsi adm3,
         am, bel=^G, clear=^Z, cols#80, cr=^M, cub1=^H, cud1=^J,
@@ -488,7 +488,7 @@ as in \fBprintf\fP(3), flags are \fI[\-+#]\fP and \fIspace\fP.
 Use a \*(``:\*('' to allow the next character to be a \*(``\-\*('' flag,
 avoiding interpreting \*(``%\-\*('' as an operator.
 .TP
-\f(CW%c\fP
+\f\*(CW%c\fP
 print \fIpop()\fP like %c in \fBprintf\fP
 .TP
 \fB%s\fP
@@ -739,12 +739,13 @@ If either is omitted, the corresponding margin is set to the left or
 right edge of the display (rather than leaving the margin unmodified).
 .PP
 These are the margin-related capabilities:
+.PP
 .TS
 center;
-l l
-_ _
-lw8 lw18.
-\fBName	Description\fP
+lb lb
+lb l .
+Name	Description
+_
 smgl	Set left margin at current column
 smgr	Set right margin at current column
 smgb	Set bottom margin at current line
@@ -1085,19 +1086,18 @@ For example, the DEC vt220 supports most of the modes:
 .PP
 .TS
 center;
-l l l
-l l l
-lw18 lw14 lw18.
-\fBtparm parameter	attribute	escape sequence\fP
-
-none	none	\\E[0m
-p1	standout	\\E[0;1;7m
-p2	underline	\\E[0;4m
-p3	reverse	\\E[0;7m
-p4	blink	\\E[0;5m
+lb lb lb
+l  l  l .
+tparm Parameter	Attribute	Escape Sequence
+_
+none	none	\eE[0m
+p1	standout	\eE[0;1;7m
+p2	underline	\eE[0;4m
+p3	reverse	\eE[0;7m
+p4	blink	\eE[0;5m
 p5	dim	not available
-p6	bold	\\E[0;1m
-p7	invis	\\E[0;8m
+p6	bold	\eE[0;1m
+p7	invis	\eE[0;8m
 p8	protect	not used
 p9	altcharset	^O (off) ^N (on)
 .TE
@@ -1121,12 +1121,10 @@ Writing out the above sequences, along with their dependencies yields
 .ne 11
 .TS
 center;
-l l l
-l l l
-lw18 lw14 lw18.
-\fBsequence	when to output	terminfo translation\fP
-
-.ft CW
+lb lb lb
+l  l  l .
+Sequence	When to Output	terminfo Translation
+_
 \\E[0	always	\\E[0
 ;1	if p1 or p6	%?%p1%p6%|%t;1%;
 ;4	if p2	%?%p2%|%t;4%;
@@ -1134,13 +1132,12 @@ lw18 lw14 lw18.
 ;7	if p1 or p3	%?%p1%p3%|%t;7%;
 ;8	if p7	%?%p7%|%t;8%;
 m	always	m
-^N or ^O	if p9 ^N, else ^O	%?%p9%t^N%e^O%;
-.ft R
+\*^N or \*^O	if p9 \*^N, else \*^O	%?%p9%t\*^N%e\*^O%;
 .TE
 .PP
 Putting this all together into the sgr sequence gives:
 .PP
-.ft CW
+.ft \*(CW
 .nf
     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%;,
@@ -1551,18 +1548,17 @@ for most of 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 \fBacsc\fP capability.
 .PP
-.TS H
-center expand;
-l l l l l
-l l l l l
-_ _ _ _ _
-lw25 lw10 lw6 lw6 lw6.
-.\".TH
-\fBGlyph	ACS	Ascii	acsc	acsc\fP
-\fBName	Name	Default	Char	Value\fP
+.TS
+center;
+lb lb lb lb lb.
+\&	\&	ASCII	acsc	acsc
+Glyph Name	ACS Name	Fallback	Symbol	Value
+_
+.T&
+l  lb l  l  l .
 arrow pointing right	ACS_RARROW	>	+	0x2b
 arrow pointing left	ACS_LARROW	<	,	0x2c
-arrow pointing up	ACS_UARROW	^	\-	0x2d
+arrow pointing up	ACS_UARROW	\*^	\-	0x2d
 arrow pointing down	ACS_DARROW	v	.	0x2e
 solid square block	ACS_BLOCK	#	0	0x30
 diamond         	ACS_DIAMOND	+	`	0x60
@@ -1576,7 +1572,7 @@ upper right corner	ACS_URCORNER	+	k	0x6b
 upper left corner	ACS_ULCORNER	+	l	0x6c
 lower left corner	ACS_LLCORNER	+	m	0x6d
 large plus or crossover	ACS_PLUS	+	n	0x6e
-scan line 1     	ACS_S1  	~	o	0x6f
+scan line 1     	ACS_S1  	\*~	o	0x6f
 scan line 3     	ACS_S3  	\-	p	0x70
 horizontal line 	ACS_HLINE	\-	q	0x71
 scan line 7     	ACS_S7  	\-	r	0x72
@@ -1591,7 +1587,7 @@ greater-than-or-equal-to	ACS_GEQUAL	>	z	0x7a
 greek pi        	ACS_PI	*	{	0x7b
 not-equal       	ACS_NEQUAL	!	|	0x7c
 UK pound sign        	ACS_STERLING	f	}	0x7d
-bullet          	ACS_BULLET	o	~	0x7e
+bullet          	ACS_BULLET	o	\*~	0x7e
 .TE
 .PP
 A few notes apply to the table itself:
@@ -1683,36 +1679,39 @@ The terminal hardware is free to
 map these as it likes, but the RGB values indicate normal locations in color
 space.
 .PP
-.TS H
+.TS
 center;
-l c c c
-l l n l.
-\fBColor	#define 	Value	RGB\fP
-black	\fBCOLOR_BLACK\fP	0	0, 0, 0
-red	\fBCOLOR_RED\ \fP	1	max,0,0
-green	\fBCOLOR_GREEN\fP	2	0,max,0
-yellow	\fBCOLOR_YELLOW\fP	3	max,max,0
-blue	\fBCOLOR_BLUE\fP	4	0,0,max
-magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
-cyan	\fBCOLOR_CYAN\fP	6	0,max,max
-white	\fBCOLOR_WHITE\fP	7	max,max,max
+cb cb cb cb s  s
+l  lb c  l1 l1 l .
+Color	#define 	Value	RGB
+_
+black	COLOR_BLACK	0	0,	0,	0
+red	COLOR_RED	1	max,	0,	0
+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
 .TE
 .PP
 The argument values of \fBsetf\fP/\fBsetb\fP historically correspond to
 a different mapping, i.e.,
-.TS H
+.PP
+.TS
 center;
-l c c c
-l l n l.
-\fBColor	#define 	Value	RGB\fP
-black	\fBCOLOR_BLACK\fP	0	0, 0, 0
-blue	\fBCOLOR_BLUE\fP	1	0,0,max
-green	\fBCOLOR_GREEN\fP	2	0,max,0
-cyan	\fBCOLOR_CYAN\fP	3	0,max,max
-red	\fBCOLOR_RED\ \fP	4	max,0,0
-magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
-yellow	\fBCOLOR_YELLOW\fP	6	max,max,0
-white	\fBCOLOR_WHITE\fP	7	max,max,max
+cb cb cb cb s  s
+l  lb c  l1 l1 l .
+Color	#define 	Value	RGB
+_
+black	COLOR_BLACK	0	0,	0,	0
+blue	COLOR_BLUE	1	0,	0,	max
+green	COLOR_GREEN	2	0,	max,	0
+cyan	COLOR_CYAN	3	0,	max,	max
+red	COLOR_RED	4	max,	0,	0
+magenta	COLOR_MAGENTA	5	max,	0,	max
+yellow	COLOR_YELLOW	6	max,	max,	0
+white	COLOR_WHITE	7	max,	max,	max
 .TE
 .PP
 It is important to not confuse the two sets of color capabilities;
@@ -1753,16 +1752,17 @@ attributes understood by \fBcurses\fP is as follows:
 .PP
 .TS
 center;
-l l l l
-lw20 lw2 lw10 lw10.
-\fBAttribute	Bit	Decimal	Set by\fP
+cb cb cb cb
+lb n  n  lb.
+Attribute	Bit	Decimal	Set by
+_
 A_STANDOUT	0	1	sgr
 A_UNDERLINE	1	2	sgr
 A_REVERSE	2	4	sgr
-A_BLINK   	3	8	sgr
-A_DIM      	4	16	sgr
-A_BOLD    	5	32	sgr
-A_INVIS   	6	64	sgr
+A_BLINK	3	8	sgr
+A_DIM	4	16	sgr
+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
diff --git a/man/toe.1m b/man/toe.1m
index 63f0053ce..f67566b74 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp $
-.TH @TOE@ 1M 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp $
+.TH @TOE@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -37,13 +37,18 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/user_caps.5 b/man/user_caps.5
index 8dcfd607c..0ca74be88 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,26 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp $
-.TH user_caps 5 2023-08-19 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp $
+.TH user_caps 5 2023-09-09 "ncurses 6.4" "File formats"
 .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 CR			\" Courier
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/misc/ncu2openbsd b/misc/ncu2openbsd
index b066a1059..0c3365d76 100755
--- a/misc/ncu2openbsd
+++ b/misc/ncu2openbsd
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
-# $Id: ncu2openbsd,v 1.65 2021/10/03 18:52:22 tom Exp $
+# $Id: ncu2openbsd,v 1.67 2023/09/09 15:59:17 tom Exp $
 # -----------------------------------------------------------------------------
-# Copyright 2021 by Thomas E. Dickey
+# Copyright 2021,2023 by Thomas E. Dickey
 #
 #                         All Rights Reserved
 #
@@ -44,7 +44,7 @@ use File::Temp qw/ tempdir /;
 
 $| = 1;
 
-our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x );
+our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x, $opt_6 );
 our $source_dir;
 our $target_dir;
 our $update_dir;
@@ -1177,12 +1177,12 @@ sub configure_tree() {
     my @search = ( "/usr/share/terminfo", "/usr/local/share/terminfo" );
     my @prefix = ("./configure");
     $prefix[ ++$#prefix ] = "--with-abi-version=5"
-      if ( &patchdate >= 20150502 );
+      if ( &patchdate >= 20150502 && !$opt_6 );
     my @options = (
-        "--with-ospeed=int",    #
-        "--with-shared",        #
-        "--without-normal",     #
-        "--without-debug",      #
+        "--with-ospeed=int",                               #
+        "--with-shared",                                   #
+        "--without-normal",                                #
+        "--without-debug",                                 #
         "--with-terminfo-dirs=" . join( ':', @search ),    #
         "--without-ada",                                   #
         "--disable-hard-tabs",                             #
@@ -1191,7 +1191,8 @@ sub configure_tree() {
         "--enable-bsdpad",                                 #
         "--enable-signed-char",                            #
         "--enable-termcap",                                #
-        "--enable-widec"
+        "--enable-widec",                                  #
+        "--disable-setuid-environ"
     );
     $options[ ++$#options ] = "--with-trace" if ($opt_t);
     $options[ ++$#options ] = "--enable-string-hacks"
@@ -1250,6 +1251,7 @@ sub usage() {
 Usage: ncu2openbsd [options] [sourcetree]
 
 Options:
+  -6       use ABI 6 rather than 5 if available
   -d DST   specify destination (default: /usr/src)
   -n       no-op, do not update destination
   -r       remove update, restore sources from ".orig"
@@ -1261,7 +1263,7 @@ EOF
 }
 
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
-&getopts('d:nrtvx') || &usage();
+&getopts('6d:nrtvx') || &usage();
 $opt_d = "/usr/src" unless ($opt_d);
 &usage() unless ( $#ARGV <= 0 );
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 1a7fa6087..0c09d2635 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.671 2023/08/26 19:01:27 tom Exp $
+ * $Id: curses.priv.h,v 1.672 2023/09/09 23:13:32 tom Exp $
  *
  *	curses.priv.h
  *
@@ -146,7 +146,7 @@ extern int errno;
 # define PRIxPTR	"lX"
 # define CASTxPTR(n)    (unsigned long)(intptr_t)(void*)(n)
 #else
-# define CASTxPTR(n)    (intptr_t)(void*)(n)
+# define CASTxPTR(n)    (intptr_t)(n)
 #endif
 
 #ifndef PRIxPTR
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index d5148ca6c..55f51fb64 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.77 2022/10/15 19:37:33 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.78 2023/09/09 16:06:00 Nicholas.Marriott Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -251,7 +251,7 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     TERMTYPE2 *from = &(source->tterm);
 #if NCURSES_XNAMES
     TERMTYPE2 copy;
-    size_t str_size;
+    size_t str_size, copy_size;
     char *str_table;
 #endif
     unsigned i;
@@ -285,21 +285,27 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
 	if ((str_table = malloc(str_size)) == NULL)
 	    _nc_err_abort(MSG_NO_MEMORY);
 	str_copied = str_table;
-	strcpy(str_copied, to->term_names);
+	_nc_STRCPY(str_copied, to->term_names, str_size);
 	to->term_names = str_copied;
-	str_copied += strlen(str_copied) + 1;
+	copy_size = strlen(str_copied) + 1;
+	str_copied += copy_size;
+	str_size -= copy_size;
 	for_each_string(i, from) {
 	    if (VALID_STRING(from->Strings[i])) {
-		strcpy(str_copied, from->Strings[i]);
+		_nc_STRCPY(str_copied, from->Strings[i], str_size);
 		from->Strings[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	for_each_string(i, to) {
 	    if (VALID_STRING(to->Strings[i])) {
-		strcpy(str_copied, to->Strings[i]);
+		_nc_STRCPY(str_copied, to->Strings[i], str_size);
 		to->Strings[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	free(to->str_table);
@@ -330,16 +336,20 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
 	str_copied = str_table;
 	for (i = 0; i < NUM_EXT_NAMES(from); ++i) {
 	    if (VALID_STRING(from->ext_Names[i])) {
-		strcpy(str_copied, from->ext_Names[i]);
+		_nc_STRCPY(str_copied, from->ext_Names[i], str_size);
 		from->ext_Names[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	for (i = 0; i < NUM_EXT_NAMES(to); ++i) {
 	    if (VALID_STRING(to->ext_Names[i])) {
-		strcpy(str_copied, to->ext_Names[i]);
+		_nc_STRCPY(str_copied, to->ext_Names[i], str_size);
 		to->ext_Names[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	free(to->ext_str_table);
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index ff32770d0..304c1b62f 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.49 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.51 2023/09/09 23:15:53 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -530,6 +530,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
     unsigned i;
     int pass;
     char *new_table;
+    size_t new_table_size;
 #if NCURSES_EXT_NUMBERS
     short *oldptr = 0;
     int *newptr = 0;
@@ -550,19 +551,24 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	   NUM_STRINGS(dst) * sizeof(dst->Strings[0]));
 
     new_table = NULL;
+    new_table_size = 0;
     for (pass = 0; pass < 2; ++pass) {
 	size_t str_size = 0;
 	if (src->term_names != NULL) {
 	    if (pass) {
 		dst->term_names = new_table + str_size;
-		strcpy(dst->term_names + str_size, src->term_names);
+		_nc_STRCPY(dst->term_names + str_size,
+			   src->term_names,
+			   new_table_size - str_size);
 	    }
 	    str_size += strlen(src->term_names) + 1;
 	}
 	for_each_string(i, src) {
 	    if (VALID_STRING(src->Strings[i])) {
 		if (pass) {
-		    strcpy(new_table + str_size, src->Strings[i]);
+		    _nc_STRCPY(new_table + str_size,
+			       src->Strings[i],
+			       new_table_size - str_size);
 		    dst->Strings[i] = new_table + str_size;
 		}
 		str_size += strlen(src->Strings[i]) + 1;
@@ -574,6 +580,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	    ++str_size;
 	    if ((new_table = malloc(str_size)) == NULL)
 		_nc_err_abort(MSG_NO_MEMORY);
+	    new_table_size = str_size;
 	}
     }
 
@@ -626,6 +633,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *));
 
 	new_table = NULL;
+	new_table_size = 0;
 	for (pass = 0; pass < 2; ++pass) {
 	    size_t str_size = 0;
 	    char *raw_data = src->ext_str_table;
@@ -634,7 +642,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 		    size_t skip = strlen(raw_data) + 1;
 		    if (skip != 1) {
 			if (pass) {
-			    strcpy(new_table + str_size, raw_data);
+			    _nc_STRCPY(new_table + str_size,
+				       raw_data,
+				       new_table_size - str_size);
 			}
 			str_size += skip;
 			raw_data += skip;
@@ -644,7 +654,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	    for (i = 0; i < NUM_EXT_NAMES(dst); ++i) {
 		if (VALID_STRING(src->ext_Names[i])) {
 		    if (pass) {
-			strcpy(new_table + str_size, src->ext_Names[i]);
+			_nc_STRCPY(new_table + str_size,
+				   src->ext_Names[i],
+				   new_table_size - str_size);
 			dst->ext_Names[i] = new_table + str_size;
 		    }
 		    str_size += strlen(src->ext_Names[i]) + 1;
@@ -656,12 +668,14 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 		++str_size;
 		if ((new_table = calloc(str_size, 1)) == NULL)
 		    _nc_err_abort(MSG_NO_MEMORY);
+		new_table_size = str_size;
 	    }
 	}
     } else {
 	dst->ext_Names = 0;
     }
 #endif
+    (void) new_table_size;
     DEBUG(2, (T_RETURN("")));
 }
 
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 5f9c645bf..2fcc4dd85 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.28 2023/08/12 15:45:07 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.29 2023/09/09 23:14:48 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -397,6 +397,7 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag)
 #endif
 
 #if NCURSES_EXT_FUNCS
+/* *INDENT-OFF* */
 
 /*
  * SCREEN is always opaque, but nl/raw/cbreak/echo set properties in it.
@@ -416,10 +417,10 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag)
 	return ((SP_PARM != NULL) ? (what(SP_PARM) ? 1 : 0) : -1); \
     }
 
-is_TEST(is_nl, IsNl);
-is_TEST(is_raw, IsRaw);
-is_TEST(is_cbreak, IsCbreak);
-is_TEST(is_echo, IsEcho);
+is_TEST(is_nl, IsNl)
+is_TEST(is_raw, IsRaw)
+is_TEST(is_cbreak, IsCbreak)
+is_TEST(is_echo, IsEcho)
 
 #if NCURSES_SP_FUNCS
 #undef is_TEST
@@ -429,10 +430,11 @@ is_TEST(is_echo, IsEcho);
     { \
 	return NCURSES_SP_NAME(show) (CURRENT_SCREEN); \
     }
-is_TEST(is_nl);
-is_TEST(is_raw);
-is_TEST(is_cbreak);
-is_TEST(is_echo);
+is_TEST(is_nl)
+is_TEST(is_raw)
+is_TEST(is_cbreak)
+is_TEST(is_echo)
 #endif
 
+/* *INDENT-ON* */
 #endif /* extensions */
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 0c194b463..2b1f079e4 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.57 2023/06/25 15:39:32 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.58 2023/09/09 16:04:08 Nicholas.Marriott Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -323,7 +323,7 @@ NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0)
 				_nc_SLIMIT(want - strlen(buf))
 				" %02d", number);
 		} else {
-		    strcat(buf, " ??");
+		    _nc_STRCAT(buf, " ??", want - strlen(buf));
 		}
 	    }
 	    free(buf);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 32c47310a..9c61e9bfb 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 32c47310a..9c61e9bfb 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 49bea141e..daf3cf750 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f33f8ac24..05be5485f 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.602 2023/09/02 09:30:01 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.603 2023/09/09 12:21:39 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0902"
+!define VERSION_MMDD  "0909"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7cf2d1c34..e108cf6f8 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8531bc9f2..b32c89995 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index f32819cc4..e241a4d79 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 076f15e11444db2e41848d51226c9611713f5a3d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 17 Sep 2023 18:21:09 +0200
Subject: [PATCH 029/106] ncurses-6.4-20230917.patch

---
 NEWS                                       |  15 +-
 VERSION                                    |   2 +-
 dist.mk                                    |   4 +-
 doc/html/man/adacurses6-config.1.html      |  12 +-
 doc/html/man/captoinfo.1m.html             |  37 +--
 doc/html/man/clear.1.html                  |  10 +-
 doc/html/man/curs_add_wch.3x.html          | 125 ++++----
 doc/html/man/curs_add_wchstr.3x.html       |  24 +-
 doc/html/man/curs_addch.3x.html            |  12 +-
 doc/html/man/curs_addchstr.3x.html         |  39 ++-
 doc/html/man/curs_addstr.3x.html           |  43 ++-
 doc/html/man/curs_addwstr.3x.html          |  30 +-
 doc/html/man/curs_attr.3x.html             | 156 +++++----
 doc/html/man/curs_beep.3x.html             |  12 +-
 doc/html/man/curs_bkgd.3x.html             |  12 +-
 doc/html/man/curs_bkgrnd.3x.html           |  27 +-
 doc/html/man/curs_border.3x.html           |  42 +--
 doc/html/man/curs_border_set.3x.html       |  26 +-
 doc/html/man/curs_clear.3x.html            |  36 +--
 doc/html/man/curs_color.3x.html            | 295 ++++++++---------
 doc/html/man/curs_delch.3x.html            |  12 +-
 doc/html/man/curs_deleteln.3x.html         |  10 +-
 doc/html/man/curs_extend.3x.html           |  10 +-
 doc/html/man/curs_get_wch.3x.html          |  88 ++---
 doc/html/man/curs_get_wstr.3x.html         |  75 ++---
 doc/html/man/curs_getcchar.3x.html         |  12 +-
 doc/html/man/curs_getch.3x.html            | 157 ++++-----
 doc/html/man/curs_getstr.3x.html           | 125 ++++----
 doc/html/man/curs_getyx.3x.html            |  10 +-
 doc/html/man/curs_in_wch.3x.html           |  14 +-
 doc/html/man/curs_in_wchstr.3x.html        |  28 +-
 doc/html/man/curs_inch.3x.html             |  47 ++-
 doc/html/man/curs_inchstr.3x.html          |  49 ++-
 doc/html/man/curs_initscr.3x.html          | 120 +++----
 doc/html/man/curs_inopts.3x.html           | 199 ++++++------
 doc/html/man/curs_ins_wch.3x.html          |  14 +-
 doc/html/man/curs_ins_wstr.3x.html         |  34 +-
 doc/html/man/curs_insch.3x.html            |  12 +-
 doc/html/man/curs_insstr.3x.html           |  10 +-
 doc/html/man/curs_instr.3x.html            |  10 +-
 doc/html/man/curs_inwstr.3x.html           |  10 +-
 doc/html/man/curs_kernel.3x.html           |  97 +++---
 doc/html/man/curs_legacy.3x.html           |  12 +-
 doc/html/man/curs_memleaks.3x.html         |  36 +--
 doc/html/man/curs_mouse.3x.html            | 102 +++---
 doc/html/man/curs_move.3x.html             |  16 +-
 doc/html/man/curs_opaque.3x.html           |  30 +-
 doc/html/man/curs_outopts.3x.html          | 139 ++++----
 doc/html/man/curs_overlay.3x.html          |  34 +-
 doc/html/man/curs_pad.3x.html              |  82 ++---
 doc/html/man/curs_print.3x.html            |  12 +-
 doc/html/man/curs_printw.3x.html           |  48 +--
 doc/html/man/curs_refresh.3x.html          |  66 ++--
 doc/html/man/curs_scanw.3x.html            |  14 +-
 doc/html/man/curs_scr_dump.3x.html         |  18 +-
 doc/html/man/curs_scroll.3x.html           |  24 +-
 doc/html/man/curs_slk.3x.html              | 142 +++++----
 doc/html/man/curs_sp_funcs.3x.html         |  47 +--
 doc/html/man/curs_termattrs.3x.html        |  10 +-
 doc/html/man/curs_termcap.3x.html          | 172 +++++-----
 doc/html/man/curs_terminfo.3x.html         | 355 +++++++++++----------
 doc/html/man/curs_threads.3x.html          |  69 ++--
 doc/html/man/curs_touch.3x.html            |  57 ++--
 doc/html/man/curs_trace.3x.html            | 100 +++---
 doc/html/man/curs_util.3x.html             | 161 +++++-----
 doc/html/man/curs_variables.3x.html        |  50 +--
 doc/html/man/curs_window.3x.html           |  58 ++--
 doc/html/man/default_colors.3x.html        |   8 +-
 doc/html/man/define_key.3x.html            |  12 +-
 doc/html/man/form.3x.html                  |  10 +-
 doc/html/man/form_cursor.3x.html           |   8 +-
 doc/html/man/form_data.3x.html             |   8 +-
 doc/html/man/form_driver.3x.html           |   8 +-
 doc/html/man/form_field.3x.html            |   8 +-
 doc/html/man/form_field_attributes.3x.html |   8 +-
 doc/html/man/form_field_buffer.3x.html     |   8 +-
 doc/html/man/form_field_info.3x.html       |  10 +-
 doc/html/man/form_field_just.3x.html       |   8 +-
 doc/html/man/form_field_new.3x.html        |   8 +-
 doc/html/man/form_field_opts.3x.html       |   8 +-
 doc/html/man/form_field_userptr.3x.html    |  10 +-
 doc/html/man/form_field_validation.3x.html | 152 +++++----
 doc/html/man/form_fieldtype.3x.html        |   8 +-
 doc/html/man/form_hook.3x.html             |  71 +++--
 doc/html/man/form_new.3x.html              |   8 +-
 doc/html/man/form_new_page.3x.html         |   8 +-
 doc/html/man/form_opts.3x.html             |   8 +-
 doc/html/man/form_page.3x.html             |   8 +-
 doc/html/man/form_post.3x.html             |   8 +-
 doc/html/man/form_requestname.3x.html      |  27 +-
 doc/html/man/form_userptr.3x.html          |   8 +-
 doc/html/man/form_variables.3x.html        |  10 +-
 doc/html/man/form_win.3x.html              |   8 +-
 doc/html/man/infocmp.1m.html               |  10 +-
 doc/html/man/infotocap.1m.html             |  12 +-
 doc/html/man/key_defined.3x.html           |  18 +-
 doc/html/man/keybound.3x.html              |  18 +-
 doc/html/man/keyok.3x.html                 |  18 +-
 doc/html/man/legacy_coding.3x.html         |  12 +-
 doc/html/man/menu.3x.html                  |  10 +-
 doc/html/man/menu_attributes.3x.html       |   8 +-
 doc/html/man/menu_cursor.3x.html           |   8 +-
 doc/html/man/menu_driver.3x.html           |   8 +-
 doc/html/man/menu_format.3x.html           |   8 +-
 doc/html/man/menu_hook.3x.html             |   8 +-
 doc/html/man/menu_items.3x.html            |   8 +-
 doc/html/man/menu_mark.3x.html             |   8 +-
 doc/html/man/menu_new.3x.html              |   8 +-
 doc/html/man/menu_opts.3x.html             |   8 +-
 doc/html/man/menu_pattern.3x.html          |   8 +-
 doc/html/man/menu_post.3x.html             |   8 +-
 doc/html/man/menu_requestname.3x.html      |   8 +-
 doc/html/man/menu_spacing.3x.html          |   8 +-
 doc/html/man/menu_userptr.3x.html          |   8 +-
 doc/html/man/menu_win.3x.html              |   8 +-
 doc/html/man/mitem_current.3x.html         |   8 +-
 doc/html/man/mitem_name.3x.html            |   8 +-
 doc/html/man/mitem_new.3x.html             |   8 +-
 doc/html/man/mitem_opts.3x.html            |   8 +-
 doc/html/man/mitem_userptr.3x.html         |   8 +-
 doc/html/man/mitem_value.3x.html           |   8 +-
 doc/html/man/mitem_visible.3x.html         |   8 +-
 doc/html/man/ncurses.3x.html               |  12 +-
 doc/html/man/ncurses6-config.1.html        |  14 +-
 doc/html/man/new_pair.3x.html              |  73 ++---
 doc/html/man/panel.3x.html                 |  10 +-
 doc/html/man/resizeterm.3x.html            |  12 +-
 doc/html/man/scr_dump.5.html               |  10 +-
 doc/html/man/tabs.1.html                   |  12 +-
 doc/html/man/term.5.html                   |  10 +-
 doc/html/man/term.7.html                   |   9 +-
 doc/html/man/term_variables.3x.html        |  58 ++--
 doc/html/man/terminfo.5.html               |  26 +-
 doc/html/man/tic.1m.html                   |  12 +-
 doc/html/man/toe.1m.html                   |  12 +-
 doc/html/man/tput.1.html                   |  12 +-
 doc/html/man/tset.1.html                   |  12 +-
 doc/html/man/user_caps.5.html              |  10 +-
 doc/html/man/wresize.3x.html               |  10 +-
 man/MKada_config.in                        |   7 +-
 man/MKncu_config.in                        |   9 +-
 man/captoinfo.1m                           |  44 +--
 man/clear.1                                |   7 +-
 man/curs_add_wch.3x                        |  17 +-
 man/curs_add_wchstr.3x                     |  27 +-
 man/curs_addch.3x                          |  17 +-
 man/curs_addchstr.3x                       |  27 +-
 man/curs_addstr.3x                         |  25 +-
 man/curs_addwstr.3x                        |  25 +-
 man/curs_attr.3x                           |  63 ++--
 man/curs_beep.3x                           |  10 +-
 man/curs_bkgd.3x                           |  13 +-
 man/curs_bkgrnd.3x                         |  27 +-
 man/curs_border.3x                         |  31 +-
 man/curs_border_set.3x                     |  31 +-
 man/curs_clear.3x                          |  25 +-
 man/curs_color.3x                          |  37 +--
 man/curs_delch.3x                          |  13 +-
 man/curs_deleteln.3x                       |  17 +-
 man/curs_extend.3x                         |  10 +-
 man/curs_get_wch.3x                        |  21 +-
 man/curs_get_wstr.3x                       |  25 +-
 man/curs_getcchar.3x                       |   9 +-
 man/curs_getch.3x                          |  21 +-
 man/curs_getstr.3x                         |  25 +-
 man/curs_getyx.3x                          |  13 +-
 man/curs_in_wch.3x                         |  15 +-
 man/curs_in_wchstr.3x                      |  27 +-
 man/curs_inch.3x                           |  13 +-
 man/curs_inchstr.3x                        |  25 +-
 man/curs_initscr.3x                        |  47 ++-
 man/curs_inopts.3x                         |  55 ++--
 man/curs_ins_wch.3x                        |  15 +-
 man/curs_ins_wstr.3x                       |  27 +-
 man/curs_insch.3x                          |  13 +-
 man/curs_insstr.3x                         |  21 +-
 man/curs_instr.3x                          |  21 +-
 man/curs_inwstr.3x                         |  21 +-
 man/curs_kernel.3x                         |  37 +--
 man/curs_legacy.3x                         |  15 +-
 man/curs_memleaks.3x                       |  15 +-
 man/curs_mouse.3x                          |  22 +-
 man/curs_move.3x                           |  13 +-
 man/curs_opaque.3x                         |  39 ++-
 man/curs_outopts.3x                        |  25 +-
 man/curs_overlay.3x                        |  15 +-
 man/curs_pad.3x                            |  21 +-
 man/curs_print.3x                          |   9 +-
 man/curs_printw.3x                         |  22 +-
 man/curs_refresh.3x                        |  21 +-
 man/curs_scanw.3x                          |  18 +-
 man/curs_scr_dump.3x                       |  17 +-
 man/curs_scroll.3x                         |  15 +-
 man/curs_slk.3x                            |  49 ++-
 man/curs_sp_funcs.3x                       |  11 +-
 man/curs_termattrs.3x                      |  27 +-
 man/curs_termcap.3x                        |  29 +-
 man/curs_terminfo.3x                       |  45 ++-
 man/curs_threads.3x                        |  11 +-
 man/curs_touch.3x                          |  21 +-
 man/curs_trace.3x                          |  39 +--
 man/curs_util.3x                           |  33 +-
 man/curs_variables.3x                      |  30 +-
 man/curs_window.3x                         |  31 +-
 man/default_colors.3x                      |   9 +-
 man/define_key.3x                          |   9 +-
 man/form.3x                                |   7 +-
 man/form_cursor.3x                         |   7 +-
 man/form_data.3x                           |   7 +-
 man/form_driver.3x                         |   7 +-
 man/form_field.3x                          |   7 +-
 man/form_field_attributes.3x               |   7 +-
 man/form_field_buffer.3x                   |   7 +-
 man/form_field_info.3x                     |   9 +-
 man/form_field_just.3x                     |   7 +-
 man/form_field_new.3x                      |   7 +-
 man/form_field_opts.3x                     |   7 +-
 man/form_field_userptr.3x                  |   9 +-
 man/form_field_validation.3x               |  62 ++--
 man/form_fieldtype.3x                      |   7 +-
 man/form_hook.3x                           |  34 +-
 man/form_new.3x                            |   7 +-
 man/form_new_page.3x                       |   7 +-
 man/form_opts.3x                           |   7 +-
 man/form_page.3x                           |   7 +-
 man/form_post.3x                           |   7 +-
 man/form_requestname.3x                    |   9 +-
 man/form_userptr.3x                        |   7 +-
 man/form_variables.3x                      |  10 +-
 man/form_win.3x                            |   7 +-
 man/infocmp.1m                             |   7 +-
 man/infotocap.1m                           |   9 +-
 man/key_defined.3x                         |  13 +-
 man/keybound.3x                            |  13 +-
 man/keyok.3x                               |  13 +-
 man/legacy_coding.3x                       |   9 +-
 man/manlinks.sed                           |  39 ++-
 man/menu.3x                                |   7 +-
 man/menu_attributes.3x                     |   7 +-
 man/menu_cursor.3x                         |   7 +-
 man/menu_driver.3x                         |   7 +-
 man/menu_format.3x                         |   7 +-
 man/menu_hook.3x                           |   7 +-
 man/menu_items.3x                          |   7 +-
 man/menu_mark.3x                           |   7 +-
 man/menu_new.3x                            |   7 +-
 man/menu_opts.3x                           |   7 +-
 man/menu_pattern.3x                        |   7 +-
 man/menu_post.3x                           |   7 +-
 man/menu_requestname.3x                    |   7 +-
 man/menu_spacing.3x                        |   7 +-
 man/menu_userptr.3x                        |   7 +-
 man/menu_win.3x                            |   7 +-
 man/mitem_current.3x                       |   7 +-
 man/mitem_name.3x                          |   7 +-
 man/mitem_new.3x                           |   7 +-
 man/mitem_opts.3x                          |   7 +-
 man/mitem_userptr.3x                       |   7 +-
 man/mitem_value.3x                         |   7 +-
 man/mitem_visible.3x                       |   7 +-
 man/ncurses.3x                             |   8 +-
 man/new_pair.3x                            |  11 +-
 man/panel.3x                               |   7 +-
 man/resizeterm.3x                          |  11 +-
 man/scr_dump.5                             |   7 +-
 man/tabs.1                                 |   7 +-
 man/term.5                                 |   7 +-
 man/term.7                                 |   8 +-
 man/term_variables.3x                      |  36 +--
 man/terminfo.head                          |   7 +-
 man/terminfo.tail                          |   8 +-
 man/tic.1m                                 |   7 +-
 man/toe.1m                                 |   7 +-
 man/tput.1                                 |   8 +-
 man/tset.1                                 |   8 +-
 man/user_caps.5                            |   7 +-
 man/wresize.3x                             |   7 +-
 menu/m_global.c                            |   8 +-
 ncurses/base/lib_color.c                   |   6 +-
 ncurses/base/lib_overlay.c                 |  16 +-
 ncurses/curses.priv.h                      |  16 +-
 ncurses/doit                               |   1 +
 ncurses/term.priv.h                        |   9 +-
 ncurses/tinfo/alloc_entry.c                |   5 +-
 ncurses/tinfo/init_keytry.c                |   8 +-
 ncurses/tinfo/lib_napms.c                  |   7 +-
 ncurses/tinfo/lib_setup.c                  |  20 +-
 ncurses/tinfo/lib_tparm.c                  |   4 +-
 ncurses/tinfo/lib_tputs.c                  |   5 +-
 ncurses/tinfo/read_entry.c                 |  10 +-
 ncurses/tinfo/tinfo_driver.c               |   8 +-
 ncurses/tinfo/write_entry.c                |   5 +-
 ncurses/tty/hashmap.c                      |   4 +-
 ncurses/tty/lib_mvcur.c                    |  37 ++-
 ncurses/tty/lib_twait.c                    |   6 +-
 ncurses/tty/tty_update.c                   |  18 +-
 ncurses/win32con/win32_driver.c            |   4 +-
 ncurses/win32con/win_driver.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 +-
 progs/doit                                 |  11 +
 306 files changed, 3756 insertions(+), 3696 deletions(-)
 create mode 100644 ncurses/doit
 create mode 100644 progs/doit

diff --git a/NEWS b/NEWS
index 81fabef58..1d64985f8 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3995 2023/09/09 16:45:37 tom Exp $
+-- $Id: NEWS,v 1.4000 2023/09/17 08:34:59 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,8 +46,19 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230917
+	+ improve formatting of manpages (integrated patches by Branden
+	  Robinson).
+	+ correct limit for name-length in write_entry.c (report/testcase by
+	  Luna Saphie Mittelbach).
+	+ limit delays to 30 seconds, i.e., padding delays in terminfo, as well
+	  as napms() and delay_output() functions.
+	+ improve a few pointer-checks.
+	+ improve parsing in _nc_msec_cost, allowing a single decimal point.
+
 20230909
-	+ improve formatting of manpages (patches by Branden Robinson).
+	+ improve formatting of manpages (patches by Branden Robinson), for
+	  captoinfo.1m and terminfo.5
 	> patches by Nicholas Marriott:
 	  + use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c,
 	    overlooked due to compiler changes in recent OpenBSD releases.
diff --git a/VERSION b/VERSION
index 11d281c49..cfa562bbd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230909
+5:0:10	6.4	20230917
diff --git a/dist.mk b/dist.mk
index 0125602ab..af4f6073c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1563 2023/09/09 12:21:39 tom Exp $
+# $Id: dist.mk,v 1.1565 2023/09/17 08:35:40 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230909
+NCURSES_PATCH = 20230917
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index e649144c1..91809abed 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.17 2023/09/09 17:06:25 Branden.Robinson Exp @
+  * @Id: MKada_config.in,v 1.22 2023/09/17 08:29:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ADACURSES 1 2023-08-19 ncurses 6.4 User commands</TITLE>
+<TITLE>ADACURSES 1 2023-09-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ADACURSES 1 2023-09-17 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG>ADACURSES(1)</STRONG>                     User commands                    <STRONG>ADACURSES(1)</STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       adacurses6-config - helper script for AdaCurses libraries
+       <STRONG>adacurses6-config</STRONG> - helper script for AdaCurses libraries
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -126,11 +126,11 @@ <H1 class="no-header">ADACURSES 1 2023-08-19 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-08-19                      <STRONG>ADACURSES(1)</STRONG>
+ncurses 6.4                       2023-09-17                      <STRONG>ADACURSES(1)</STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index c5ac5f73c..3b966d499 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp @
+  * @Id: captoinfo.1m,v 1.44 2023/09/16 23:39:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -52,7 +52,9 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>captoinfo</STRONG> [<STRONG>-v</STRONG><EM>n</EM> <EM>width</EM>]  [<STRONG>-V</STRONG>] [<STRONG>-1</STRONG>] [<STRONG>-w</STRONG> <EM>width</EM>] <EM>file</EM> ...
+       <STRONG>captoinfo</STRONG> [<EM>tic-option</EM>] <EM>file</EM> ...
+
+       <STRONG>captoinfo</STRONG> <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -67,17 +69,9 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
        is  extracted  from  that file.  If the environment variable <STRONG>TERMCAP</STRONG> is
        not set, then the file <STRONG>/usr/share/terminfo</STRONG> is read.
 
-       <STRONG>-v</STRONG>   print out tracing information on standard  error  as  the  program
-            runs.
-
-       <STRONG>-V</STRONG>   print  out the version of the program in use on standard error and
-            exit.
-
-       <STRONG>-1</STRONG>   cause the fields to print out  one  to  a  line.   Otherwise,  the
-            fields  will be printed several to a line to a maximum width of 60
-            characters.
-
-       <STRONG>-w</STRONG>   change the output to <EM>width</EM> characters.
+       This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
+       option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
+       and <STRONG>-x</STRONG>.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -112,13 +106,13 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
        PN       po     XENIX   prtr_off
        PS       pf     XENIX   prtr_on
        PU       kP     XENIX   key_ppage
-
        RT       @8     XENIX   kent
        UP       ku     XENIX   kcuu1
        KA       k;     Tek     key_f10
        KB       F1     Tek     key_f11
        KC       F2     Tek     key_f12
        KD       F3     Tek     key_f13
+
        KE       F4     Tek     key_f14
        KF       F5     Tek     key_f15
        BC       Sb     Tek     set_background
@@ -181,15 +175,12 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       This utility is actually a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, running in  <EM>-I</EM>  mode.   You
-       can use other <STRONG>tic</STRONG> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
-
-       The  verbose option is not identical to SVr4's.  Under SVr4, instead of
+       The verbose option is not identical to SVr4's.  Under SVr4, instead  of
        following the <STRONG>-v</STRONG> with a trace level n, you repeat it n times.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) describes <STRONG>tic</STRONG>  briefly,  but  omits  this
+       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
        program.  SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from
        <STRONG>tic</STRONG>.
 
@@ -199,7 +190,7 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -208,7 +199,7 @@ <H1 class="no-header">captoinfo 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-09                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index f14e94ba7..c3edec046 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp @
+  * @Id: clear.1,v 1.38 2023/09/16 23:39:05 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -36,12 +36,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-09-09 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-09-09 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -150,11 +150,11 @@ <H1 class="no-header">clear 1 2023-09-09 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-09-09                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-09-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 7090c8437..206e45c41 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.39 2023/08/19 20:37:30 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.43 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -49,8 +49,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>add_wch</STRONG>, <STRONG>wadd_wch</STRONG>, <STRONG>mvadd_wch</STRONG>, <STRONG>mvwadd_wch</STRONG>, <STRONG>echo_wchar</STRONG>, <STRONG>wecho_wchar</STRONG> - add
-       a complex character and rendition to a <STRONG>curses</STRONG> window, then advance  the
-       cursor
+       a <EM>curses</EM> complex character to a window and advance the cursor
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -68,53 +67,53 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-add_wch">add_wch</a></H3><PRE>
-       The  <STRONG>add_wch</STRONG>,  <STRONG>wadd_wch</STRONG>,  <STRONG>mvadd_wch</STRONG>,  and  <STRONG>mvwadd_wch</STRONG> functions put the
-       complex character <EM>wch</EM> into the given window at  its  current  position,
-       which  is then advanced.  These functions perform wrapping and special-
+       The <STRONG>add_wch</STRONG>, <STRONG>wadd_wch</STRONG>, <STRONG>mvadd_wch</STRONG>,  and  <STRONG>mvwadd_wch</STRONG>  functions  put  the
+       complex  character  <EM>wch</EM>  into the given window at its current position,
+       which is then advanced.  These functions perform wrapping and  special-
        character processing as follows:
 
-       <STRONG>o</STRONG>   If <EM>wch</EM> refers to a spacing character, then any  previous  character
-           at  that  location is removed.  A new character specified by <EM>wch</EM> is
-           placed at that location  with  rendition  specified  by  <EM>wch</EM>.   The
-           cursor  then  advances after this spacing character, to prepare for
+       <STRONG>o</STRONG>   If  <EM>wch</EM>  refers to a spacing character, then any previous character
+           at that location is removed.  A new character specified by  <EM>wch</EM>  is
+           placed  at  that  location  with  rendition  specified by <EM>wch</EM>.  The
+           cursor then advances after this spacing character, to  prepare  for
            writing the next character on the screen.
 
            The newly added spacing character is the base of the active complex
-           character.   Subsequent non-spacing characters can be combined with
+           character.  Subsequent non-spacing characters can be combined  with
            this base until another spacing character is written to the screen,
            or the cursor is moved, e.g., using <STRONG>wmove</STRONG>.
 
-       <STRONG>o</STRONG>   If  <EM>wch</EM>  refers  to  a non-spacing character, it is appended to the
+       <STRONG>o</STRONG>   If <EM>wch</EM> refers to a non-spacing character, it  is  appended  to  the
            active complex character, retaining the previous characters at that
            location.  The rendition specified by <EM>wch</EM> is ignored.
 
-           The  cursor  is  not advanced after adding a non-spacing character.
+           The cursor is not advanced after adding  a  non-spacing  character.
            Subsequent calls to add non-spacing characters will update the same
            position.
 
-       <STRONG>o</STRONG>   If  the character part of <EM>wch</EM> is a tab, newline, backspace or other
+       <STRONG>o</STRONG>   If the character part of <EM>wch</EM> is a tab, newline, backspace or  other
            control character, the window is updated and the cursor moves as if
            <STRONG>addch</STRONG> were called.
 
 
 </PRE><H3><a name="h3-echo_wchar">echo_wchar</a></H3><PRE>
        The <STRONG>echo_wchar</STRONG> function is functionally equivalent to a call to <STRONG>add_wch</STRONG>
-       followed by a call  to  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.   Similarly,  the  <STRONG>wecho_wchar</STRONG>  is
-       functionally  equivalent  to  a  call to <STRONG>wadd_wch</STRONG> followed by a call to
-       <STRONG>wrefresh</STRONG>.  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  *<STRONG>echo</STRONG>*
+       followed  by  a  call  to  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.   Similarly, the <STRONG>wecho_wchar</STRONG> is
+       functionally equivalent to a call to <STRONG>wadd_wch</STRONG> followed  by  a  call  to
+       <STRONG>wrefresh</STRONG>.   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 *<STRONG>echo</STRONG>*
        functions instead of their equivalents.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Like  <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>addch_wch</STRONG> accepts symbols which make it simple to draw
-       lines and other frequently  used  special  characters.   These  symbols
+       Like <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>addch_wch</STRONG> 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 <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
        <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>    <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
-
        <STRONG>Name</STRONG>              <STRONG>Default</STRONG>    <STRONG>Default</STRONG>   <STRONG>char</STRONG>    <STRONG>Name</STRONG>
+
        ------------------------------------------------------------------------
        WACS_BLOCK        0x25ae     #         0       solid square block
        WACS_BOARD        0x2592     #         h       board of squares
@@ -149,7 +148,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        WACS_URCORNER     0x2510     +         k       upper right-hand corner
        WACS_VLINE        0x2502     |         x       vertical line
 
-       The  wide-character  configuration  of ncurses also defines symbols for
+       The wide-character configuration of ncurses also  defines  symbols  for
        thick lines (<STRONG>acsc</STRONG> "J" to "V"):
 
        <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
@@ -179,15 +178,15 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        WACS_D_LTEE       0x2560    +         F       double tee pointing right
        WACS_D_PLUS       0x256c    +         E       double large plus
        WACS_D_RTEE       0x2563    +         G       double tee pointing left
-
        WACS_D_TTEE       0x2566    +         I       double tee pointing down
+
        WACS_D_ULCORNER   0x2554    +         C       double upper left corner
        WACS_D_URCORNER   0x2557    +         B       double upper right corner
        WACS_D_VLINE      0x2551    |         Y       double vertical line
 
-       Unicode's descriptions  for  these  characters  differs  slightly  from
-       ncurses,  by  introducing  the  term "light" (along with less important
-       details).  Here are its descriptions for the normal, thick, and  double
+       Unicode's  descriptions  for  these  characters  differs  slightly from
+       ncurses, by introducing the term "light"  (along  with  less  important
+       details).   Here are its descriptions for the normal, thick, and double
        horizontal lines:
 
        <STRONG>o</STRONG>   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
@@ -200,7 +199,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
+       X/Open does not  define  any  error  conditions.   This  implementation
        returns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
@@ -209,15 +208,15 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        The latter may be due to different causes:
 
-       <STRONG>o</STRONG>   If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is not enabled, writing a character  at  the  lower
+       <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
            right margin succeeds.  However, an error is returned because it is
            not possible to wrap to a new line
 
-       <STRONG>o</STRONG>   If an error is detected when converting a multibyte character to  a
-           sequence  of  bytes,  or  if  it  is not possible to add all of the
+       <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
+           sequence of bytes, or if it is not  possible  to  add  all  of  the
            resulting bytes in the window, an error is returned.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -227,80 +226,80 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       All of these functions are described in the XSI Curses standard,  Issue
-       4.   The  defaults  specified  for line-drawing characters apply in the
+       All  of these functions are described in the XSI Curses standard, Issue
+       4.  The defaults specified for line-drawing  characters  apply  in  the
        POSIX locale.
 
 
 </PRE><H3><a name="h3-WACS-Symbols">WACS Symbols</a></H3><PRE>
-       X/Open Curses makes it clear that the WACS_ symbols should  be  defined
+       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
        as a pointer to <STRONG>cchar_t</STRONG> data, e.g., in the discussion of <STRONG>border_set</STRONG>.  A
        few implementations are problematic:
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
        <STRONG>o</STRONG>   HPUX curses equates some of the <STRONG>ACS_</STRONG> symbols to the analogous <STRONG>WACS_</STRONG>
-           symbols   as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.   The
-           misdefined symbols are the arrows and other symbols which  are  not
+           symbols  as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.    The
+           misdefined  symbols  are the arrows and other symbols which are not
            used for line-drawing.
 
        X/Open Curses does not define symbols for thick- or double-lines.  SVr4
-       curses implementations defined their line-drawing symbols in  terms  of
+       curses  implementations  defined their line-drawing symbols in terms of
        intermediate  symbols.   This  implementation  extends  those  symbols,
        providing new definitions which are not in the SVr4 implementations.
 
-       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
-       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
-       corresponding line-drawing characters.  X/Open Curses did  not  address
-       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
-       Existing implementations of Unix curses (AIX, HPUX, Solaris)  use  only
+       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+       alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
+       corresponding  line-drawing  characters.  X/Open Curses did not address
+       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
+       Existing  implementations  of Unix curses (AIX, HPUX, Solaris) use only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       Ncurses  5.3  (2002)  provided a table of Unicode values to solve these
+       Ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
        problems.  NetBSD curses incorporated that table in 2010.
 
-       In this implementation, the Unicode values  are  used  instead  of  the
+       In  this  implementation,  the  Unicode  values are used instead of the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>.  In contrast,  for  the  same
+       environment  variable  <STRONG>NCURSES_NO_UTF8_ACS</STRONG>.   In contrast, for the same
        cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> will use
        only the ASCII default values.
 
-       Having Unicode available does not solve all of the problems with  line-
+       Having  Unicode available does not solve all of the problems with line-
        drawing for curses:
 
-       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
-           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
+       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics  <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>
+           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
            the terminal used.
 
-       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
-           terminal in the early 1980s.  There is no accessible  documentation
+       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
+           terminal  in the early 1980s.  There is no accessible documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
-           since they lie outside the BMP and as a result  are  not  generally
+           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+           since  they  lie  outside the BMP and as a result are not generally
            available in terminals.  They are not storm lanterns, in any case.
 
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
+           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: &lt;section&gt; U+00A7 (section
-           mark),  &lt;Theta&gt;  U+0398 (theta), &lt;Phi&gt; U+03A6 (phi), &lt;delta&gt; U+03B4
+           mark), &lt;Theta&gt; U+0398 (theta), &lt;Phi&gt; U+03A6 (phi),  &lt;delta&gt;  U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
 </PRE><H3><a name="h3-Complex-Characters">Complex Characters</a></H3><PRE>
-       The  complex  character  type  <STRONG>cchar_t</STRONG>  can  store  more  than one wide
-       character (<STRONG>wchar_t</STRONG>).  The X/Open Curses description  does  not  mention
-       this  possibility,  describing  only  the  cases where <EM>wch</EM> is a spacing
+       The complex character  type  <STRONG>cchar_t</STRONG>  can  store  more  than  one  wide
+       character  (<STRONG>wchar_t</STRONG>).   The  X/Open Curses description does not mention
+       this possibility, describing only the cases  where  <EM>wch</EM>  is  a  spacing
        character or a non-spacing character.
 
        This implementation assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>,
@@ -311,7 +310,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   may hold one non-spacing character.
 
-       In the latter case, ncurses  adds  the  non-spacing  character  to  the
+       In  the  latter  case,  ncurses  adds  the non-spacing character to the
        active (base) spacing character.
 
 
@@ -321,7 +320,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 12c9a70d6..38faabe01 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.20 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.25 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>add_wchstr</STRONG>, <STRONG>add_wchnstr</STRONG>, <STRONG>wadd_wchstr</STRONG>, <STRONG>wadd_wchnstr</STRONG>, <STRONG>mvadd_wchstr</STRONG>,
-       <STRONG>mvadd_wchnstr</STRONG>, <STRONG>mvwadd_wchstr</STRONG>, <STRONG>mvwadd_wchnstr</STRONG> - add an array of complex
-       characters (and attributes) to a curses window
+       <STRONG>add_wchstr</STRONG>,   <STRONG>add_wchnstr</STRONG>,   <STRONG>wadd_wchstr</STRONG>,  <STRONG>wadd_wchnstr</STRONG>,  <STRONG>mvadd_wchstr</STRONG>,
+       <STRONG>mvadd_wchnstr</STRONG>, <STRONG>mvwadd_wchstr</STRONG>, <STRONG>mvwadd_wchnstr</STRONG> -  add  a  <EM>curses</EM>  complex
+       character string to a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -96,8 +96,8 @@ <H1 class="no-header">curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       X/Open does not  define  any  error  conditions.   This  implementation
+       returns an error if the window pointer is null.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -115,12 +115,12 @@ <H1 class="no-header">curs_add_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>.
 
-       Comparable  functions in the narrow-character (ncurses) library are de-
-       scribed in <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>.
+       Comparable  functions  in  the  narrow-character  (ncurses) library are
+       described in <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 62cb52dbd..bc812c733 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.65 2023/08/19 19:45:54 tom Exp @
+  * @Id: curs_addch.3x,v 1.69 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, <STRONG>echochar</STRONG>, <STRONG>wechochar</STRONG> - add a character
-       (with attributes) to a <STRONG>curses</STRONG> window, then advance the cursor
+       <STRONG>addch</STRONG>,  <STRONG>waddch</STRONG>,  <STRONG>mvaddch</STRONG>,  <STRONG>mvwaddch</STRONG>, <STRONG>echochar</STRONG>, <STRONG>wechochar</STRONG> - add a <EM>curses</EM>
+       character to a window and advance the cursor
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 34e81f282..2abed1c28 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.31 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -47,9 +47,8 @@ <H1 class="no-header">curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addchstr</STRONG>, <STRONG>addchnstr</STRONG>, <STRONG>waddchstr</STRONG>, <STRONG>waddchnstr</STRONG>, <STRONG>mvaddchstr</STRONG>, <STRONG>mvaddchnstr</STRONG>,
-       <STRONG>mvwaddchstr</STRONG>, <STRONG>mvwaddchnstr</STRONG> - add a string of characters (and attributes)
-       to a <STRONG>curses</STRONG> window
+       <STRONG>addchstr</STRONG>,  <STRONG>addchnstr</STRONG>,  <STRONG>waddchstr</STRONG>,  <STRONG>waddchnstr</STRONG>, <STRONG>mvaddchstr</STRONG>, <STRONG>mvaddchnstr</STRONG>,
+       <STRONG>mvwaddchstr</STRONG>, <STRONG>mvwaddchnstr</STRONG> - add a <EM>curses</EM> character string to a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,33 +66,33 @@ <H1 class="no-header">curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  functions copy the (null-terminated) <EM>chstr</EM> array into the window
-       image structure starting at the  current  cursor  position.   The  four
-       functions  with  <EM>n</EM> as the last argument copy at most <EM>n</EM> elements, but no
-       more than will fit on the line.   If  <STRONG>n</STRONG>=<STRONG>-1</STRONG>  then  the  whole  array  is
+       These functions copy the (null-terminated) <EM>chstr</EM> array into the  window
+       image  structure  starting  at  the  current cursor position.  The four
+       functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,  but  no
+       more  than  will  fit  on  the  line.   If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
        copied, to the maximum number of characters that will fit on the line.
 
-       The  window  cursor  is <EM>not</EM> advanced.  These functions work faster than
+       The window cursor is <EM>not</EM> advanced.  These functions  work  faster  than
        <STRONG>waddnstr</STRONG>.  On the other hand:
 
-       <STRONG>o</STRONG>   they do not perform checking (such as for the  newline,  backspace,
+       <STRONG>o</STRONG>   they  do  not perform checking (such as for the newline, backspace,
            or carriage return characters),
 
        <STRONG>o</STRONG>   they do not advance the current cursor position,
 
        <STRONG>o</STRONG>   they do not expand other control characters to ^-escapes, and
 
-       <STRONG>o</STRONG>   they  truncate  the  string  if it crosses the right margin, rather
+       <STRONG>o</STRONG>   they truncate the string if it crosses  the  right  margin,  rather
            than wrapping it around to the new line.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       X/Open  does  not  define  any  error  conditions.  This implementation
+       returns an error if the window pointer is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -109,12 +108,12 @@ <H1 class="no-header">curs_addchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>.
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>.
+       Comparable functions  in  the  wide-character  (ncursesw)  library  are
+       described in <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 5e56ed888..beca3213a 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.28 2023/03/11 20:40:52 tom Exp @
+  * @Id: curs_addstr.3x,v 1.32 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -47,9 +47,8 @@ <H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addstr</STRONG>, <STRONG>addnstr</STRONG>, <STRONG>waddstr</STRONG>, <STRONG>waddnstr</STRONG>, <STRONG>mvaddstr</STRONG>, <STRONG>mvaddnstr</STRONG>, <STRONG>mvwaddstr</STRONG>,
-       <STRONG>mvwaddnstr</STRONG> - add a string of characters to a <STRONG>curses</STRONG> window and advance
-       cursor
+       <STRONG>addstr</STRONG>,  <STRONG>addnstr</STRONG>,  <STRONG>waddstr</STRONG>,  <STRONG>waddnstr</STRONG>,  <STRONG>mvaddstr</STRONG>, <STRONG>mvaddnstr</STRONG>, <STRONG>mvwaddstr</STRONG>,
+       <STRONG>mvwaddnstr</STRONG> - add a string to a <EM>curses</EM> window and advance the cursor
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -68,23 +67,23 @@ <H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These functions write the (null-terminated) character string <EM>str</EM> on the
-       given window.  It is similar to calling <STRONG>waddch</STRONG> once for  each  byte  in
+       given  window.   It  is similar to calling <STRONG>waddch</STRONG> once for each byte in
        the string.
 
-       The <EM>mv</EM> functions perform cursor movement once, before writing any char-
-       acters.  Thereafter, the cursor is advanced as a side-effect of writing
-       to the window.
+       The <EM>mv</EM> functions perform  cursor  movement  once,  before  writing  any
+       characters.   Thereafter,  the  cursor  is advanced as a side-effect of
+       writing to the window.
 
-       The  four  functions with <EM>n</EM> as the last argument write at most <EM>n</EM> bytes,
-       or until a terminating null is reached.  If <EM>n</EM> is -1,  then  the  entire
+       The four functions with <EM>n</EM> as the last argument write at most  <EM>n</EM>  bytes,
+       or  until  a  terminating null is reached.  If <EM>n</EM> is -1, then the entire
        string will be added.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not define any error conditions.  This implementation re-
-       turns an error
+       X/Open does not  define  any  error  conditions.   This  implementation
+       returns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
 
@@ -92,16 +91,16 @@ <H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the corresponding calls to <STRONG>waddch</STRONG> return an error.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.  If an error is returned by the  <STRONG>wmove</STRONG>,  no
+       the  window  pointer is null.  If an error is returned by the <STRONG>wmove</STRONG>, no
        characters are added to the window.
 
-       If  an  error  is  returned  by <STRONG>waddch</STRONG> (e.g., because the window is not
-       large enough, or an illegal byte sequence was detected)  only  part  of
-       the  string  may be added.  Aside from that, there is a special case in
-       <STRONG>waddch</STRONG> where an error may be  returned  after  successfully  writing  a
-       character  to  the  lower-right corner of a window when <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is
+       If an error is returned by <STRONG>waddch</STRONG> (e.g.,  because  the  window  is  not
+       large  enough,  or  an illegal byte sequence was detected) only part of
+       the string may be added.  Aside from that, there is a special  case  in
+       <STRONG>waddch</STRONG>  where  an  error  may  be returned after successfully writing a
+       character to the lower-right corner of a window  when  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is
        disabled.
 
 
@@ -118,7 +117,7 @@ <H1 class="no-header">curs_addstr 3x 2023-03-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-03-11                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index f55cbf51a..767e996fa 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.20 2023/07/15 17:11:59 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.24 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addwstr</STRONG>, <STRONG>addnwstr</STRONG>, <STRONG>waddwstr</STRONG>, <STRONG>waddnwstr</STRONG>, <STRONG>mvaddwstr</STRONG>, <STRONG>mvaddnwstr</STRONG>,
-       <STRONG>mvwaddwstr</STRONG>, <STRONG>mvwaddnwstr</STRONG> - add a string of wide characters to a <STRONG>curses</STRONG>
-       window and advance cursor
+       <STRONG>addwstr</STRONG>,   <STRONG>addnwstr</STRONG>,   <STRONG>waddwstr</STRONG>,   <STRONG>waddnwstr</STRONG>,   <STRONG>mvaddwstr</STRONG>,  <STRONG>mvaddnwstr</STRONG>,
+       <STRONG>mvwaddwstr</STRONG>, <STRONG>mvwaddnwstr</STRONG> - add  a  wide-character  string  to  a  <EM>curses</EM>
+       window and advance the cursor
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -68,18 +68,18 @@ <H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These  functions  write the characters of the (null-terminated) <STRONG>wchar_t</STRONG>
-       character string <EM>wstr</EM> on the given window.  It is similar to construct-
-       ing a <STRONG>cchar_t</STRONG> for each <STRONG>wchar_t</STRONG> in the string, then calling <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>
-       for the resulting <STRONG>cchar_t</STRONG>:
+       character  string  <EM>wstr</EM>  on  the  given  window.   It  is  similar   to
+       constructing  a  <STRONG>cchar_t</STRONG>  for  each <STRONG>wchar_t</STRONG> in the string, then calling
+       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> for the resulting <STRONG>cchar_t</STRONG>:
 
        <STRONG>o</STRONG>   spacing and non-spacing characters in the string are processed  one
            at a time, and
 
        <STRONG>o</STRONG>   control characters are processed as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
 
-       The <EM>mv</EM> functions perform cursor movement once, before writing any char-
-       acters.  Thereafter, the cursor is advanced as a side-effect of writing
-       to the window.
+       The  <EM>mv</EM>  functions  perform  cursor  movement  once, before writing any
+       characters.  Thereafter, the cursor is advanced  as  a  side-effect  of
+       writing to the window.
 
        The  four functions with <EM>n</EM> as the last argument write at most <EM>n</EM> <STRONG>wchar_t</STRONG>
        characters, or until a terminating null is reached.  If <EM>n</EM> is  -1,  then
@@ -89,8 +89,8 @@ <H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not define any error conditions.  This implementation re-
-       turns an error
+       X/Open  does  not  define  any  error  conditions.  This implementation
+       returns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2023-07-15 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-15                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index fbb1e131d..3d6c5941f 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,14 +28,8 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp @
+  * @Id: curs_attr.3x,v 1.84 2023/09/16 23:34:43 tom Exp @
   * ---------------------------------------------------------------------------
-  * attr_get
-  * .br
-  * .br
-  * .br
-  * .br
-  * .br
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -56,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -71,9 +65,9 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>attr_get</STRONG>, <STRONG>wattr_get</STRONG>, <STRONG>attr_set</STRONG>, <STRONG>wattr_set</STRONG>, <STRONG>attr_off</STRONG>, <STRONG>wattr_off</STRONG>, <STRONG>attr_on</STRONG>,
        <STRONG>wattr_on</STRONG>, <STRONG>attroff</STRONG>, <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>chgat</STRONG>,
-       <STRONG>wchgat</STRONG>, <STRONG>mvchgat</STRONG>, <STRONG>mvwchgat</STRONG>, <STRONG>color_set</STRONG>, <STRONG>wcolor_set</STRONG>, <STRONG>standend</STRONG>, <STRONG>wstandend</STRONG>,
-       <STRONG>standout</STRONG>, <STRONG>wstandout</STRONG> - <STRONG>curses</STRONG> character and window attribute control
-       routines
+       <STRONG>wchgat</STRONG>,  <STRONG>mvchgat</STRONG>, <STRONG>mvwchgat</STRONG>, <STRONG>color_set</STRONG>, <STRONG>wcolor_set</STRONG>, <STRONG>standend</STRONG>, <STRONG>wstandend</STRONG>,
+       <STRONG>standout</STRONG>, <STRONG>wstandout</STRONG> -  manipulate  attributes  of  character  cells  in
+       <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -117,14 +111,14 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        These  routines  manipulate the current attributes of the named window,
        which then apply to all characters that are  written  into  the  window
        with  <STRONG>waddch</STRONG>,  <STRONG>waddstr</STRONG>  and  <STRONG>wprintw</STRONG>.  Attributes are a property of the
-       character, and move with the character through any  scrolling  and  in-
-       sert/delete  line/character  operations.   To the extent possible, they
+       character, and move  with  the  character  through  any  scrolling  and
+       insert/delete  line/character operations.  To the extent possible, they
        are displayed as appropriate modifications to the graphic rendition  of
        characters put on the screen.
 
        These  routines do not affect the attributes used when erasing portions
-       of the window.  See <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG> for functions which  modify  the  at-
-       tributes used for erasing and clearing.
+       of the window.   See  <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  for  functions  which  modify  the
+       attributes used for erasing and clearing.
 
        Routines  which  do  not have a <STRONG>WINDOW*</STRONG> parameter apply to <STRONG>stdscr</STRONG>.  For
        example, <STRONG>attr_set</STRONG> is the <STRONG>stdscr</STRONG> variant of <STRONG>wattr_set</STRONG>.
@@ -133,8 +127,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Window-attributes">Window attributes</a></H3><PRE>
        There are two sets of functions:
 
-       <STRONG>o</STRONG>   functions for manipulating the window attributes  and  color:  <STRONG>wat-</STRONG>
-           <STRONG>tr_set</STRONG> and <STRONG>wattr_get</STRONG>.
+       <STRONG>o</STRONG>   functions  for  manipulating  the  window  attributes  and   color:
+           <STRONG>wattr_set</STRONG> and <STRONG>wattr_get</STRONG>.
 
        <STRONG>o</STRONG>   functions  for manipulating only the window attributes (not color):
            <STRONG>wattr_on</STRONG> and <STRONG>wattr_off</STRONG>.
@@ -145,8 +139,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        Use <STRONG>wattr_get</STRONG> to retrieve attributes for the given window.
 
        Use  <STRONG>attr_on</STRONG>  and  <STRONG>wattr_on</STRONG>  to turn on window attributes, i.e., values
-       OR'd together in <EM>attr</EM>, without affecting  other  attributes.   Use  <STRONG>at-</STRONG>
-       <STRONG>tr_off</STRONG>  and  <STRONG>wattr_off</STRONG> to turn off window attributes, again values OR'd
+       OR'd  together  in  <EM>attr</EM>,  without  affecting  other  attributes.   Use
+       <STRONG>attr_off</STRONG> and <STRONG>wattr_off</STRONG> to turn off window attributes, again values OR'd
        together in <EM>attr</EM>, without affecting other attributes.
 
 
@@ -157,11 +151,11 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        because X/Open simply added an underscore (<STRONG>_</STRONG>) for the newer names.
 
        The <STRONG>int</STRONG> datatype used in the legacy routines is treated as if it is the
-       same size as <STRONG>chtype</STRONG> (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It holds the common video at-
-       tributes  (such  as  bold,  reverse),  as well as a few bits for color.
-       Those bits correspond to the <STRONG>A_COLOR</STRONG> symbol.  The <STRONG>COLOR_PAIR</STRONG> macro pro-
-       vides  a value which can be OR'd into the attribute parameter.  For ex-
-       ample, as long as that value fits into the  <STRONG>A_COLOR</STRONG>  mask,  then  these
+       same size as <STRONG>chtype</STRONG> (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It  holds  the  common  video
+       attributes  (such  as  bold, reverse), as well as a few bits for color.
+       Those bits correspond to the  <STRONG>A_COLOR</STRONG>  symbol.   The  <STRONG>COLOR_PAIR</STRONG>  macro
+       provides  a  value which can be OR'd into the attribute parameter.  For
+       example, as long as that value fits into the <STRONG>A_COLOR</STRONG> mask,  then  these
        calls produce similar results:
 
            attrset(A_BOLD | COLOR_PAIR(<EM>pair</EM>));
@@ -180,8 +174,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
            int <EM>output</EM> = PAIR_NUMBER(value);
 
        The <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 curses but  kept
-       in X/Open Curses for the same reason that SVr4 curses kept it: compati-
-       bility.
+       in  X/Open  Curses  for  the  same  reason  that  SVr4  curses kept it:
+       compatibility.
 
        The remaining <STRONG>attr</STRONG>* functions operate exactly  like  the  corresponding
        <STRONG>attr_</STRONG>*  functions,  except  that they take arguments of type <STRONG>int</STRONG> rather
@@ -192,13 +186,13 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Change-character-rendition">Change character rendition</a></H3><PRE>
-       The  routine  <STRONG>chgat</STRONG> changes the attributes of a given number of charac-
-       ters starting at the current cursor location of <STRONG>stdscr</STRONG>.   It  does  not
-       update  the cursor and does not perform wrapping.  A character count of
-       -1 or greater than the remaining  window  width  means  to  change  at-
-       tributes  all the way to the end of the current line.  The <STRONG>wchgat</STRONG> func-
-       tion generalizes this to any window; the <STRONG>mvwchgat</STRONG> function does a  cur-
-       sor move before acting.
+       The  routine  <STRONG>chgat</STRONG>  changes  the  attributes  of  a  given  number  of
+       characters starting at the current cursor location of <STRONG>stdscr</STRONG>.  It  does
+       not update the cursor and does not perform wrapping.  A character count
+       of -1 or greater than  the  remaining  window  width  means  to  change
+       attributes  all  the  way  to  the end of the current line.  The <STRONG>wchgat</STRONG>
+       function generalizes this to any window; the <STRONG>mvwchgat</STRONG> function  does  a
+       cursor move before acting.
 
        In  these  functions, the color <EM>pair</EM> argument is a color-pair index (as
        in the first argument of <STRONG>init_pair</STRONG>, see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>).
@@ -206,8 +200,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Change-window-color">Change window color</a></H3><PRE>
        The routine <STRONG>color_set</STRONG> sets the current color of the given window to the
-       foreground/background  combination  described by the color <EM>pair</EM> parame-
-       ter.
+       foreground/background   combination   described   by   the  color  <EM>pair</EM>
+       parameter.
 
 
 </PRE><H3><a name="h3-Standout">Standout</a></H3><PRE>
@@ -219,8 +213,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   they have well established legacy use, and
 
-       <STRONG>o</STRONG>   there is no ambiguity about the way the attributes  might  be  com-
-           bined with a color pair.
+       <STRONG>o</STRONG>   there is no  ambiguity  about  the  way  the  attributes  might  be
+           combined with a color pair.
 
 
 </PRE><H2><a name="h2-VIDEO-ATTRIBUTES">VIDEO ATTRIBUTES</a></H2><PRE>
@@ -277,9 +271,9 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
-       "wide-characters"  (not  specific to Unicode).  Some of the X/Open dif-
-       ferences from SVr4 curses address the way video attributes can  be  ap-
-       plied  to  wide-characters.   But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
+       "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
+       differences from SVr4 curses address the way video  attributes  can  be
+       applied  to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
        are similar.  SVr4 curses provided the basic features for  manipulating
        video  attributes.  However, earlier versions of curses provided a part
        of these features.
@@ -290,11 +284,11 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        <STRONG>standout</STRONG>  and  <STRONG>standend</STRONG> which were carried along into X/Open Curses due
        to their pervasive use in legacy applications.
 
-       Some terminals in the 1980s  could  support  a  variety  of  video  at-
-       tributes,  although the BSD curses library could do nothing with those.
-       System V (1983) provided an improved curses library.  It defined the <STRONG>A_</STRONG>
-       symbols  for  use  by  applications to manipulate the other attributes.
-       There are few useful references for the chronology.
+       Some  terminals  in  the  1980s  could  support  a  variety  of   video
+       attributes,  although  the  BSD  curses  library  could do nothing with
+       those.  System V  (1983)  provided  an  improved  curses  library.   It
+       defined  the <STRONG>A_</STRONG> symbols for use by applications to manipulate the other
+       attributes.  There are few useful references for the chronology.
 
        Goodheart's book <EM>UNIX</EM> <EM>Curses</EM> <EM>Explained</EM> (1991)  describes  SVr3  (1987),
        commenting on several functions:
@@ -322,9 +316,9 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        This  table  showing  the number of bits for <STRONG>A_COLOR</STRONG> and <STRONG>A_CHARTEXT</STRONG> was
        gleaned from the curses header files for various operating systems  and
        architectures.   The inferred architecture and notes reflect the format
-       and size of the defined constants as well as clues such as  the  alter-
-       nate  character  set implementation.  A 32-bit library can be used on a
-       64-bit system, but not necessarily the reverse.
+       and size of the  defined  constants  as  well  as  clues  such  as  the
+       alternate  character  set implementation.  A 32-bit library can be used
+       on a 64-bit system, but not necessarily the reverse.
 
               <STRONG>Year</STRONG>   <STRONG>System</STRONG>        <STRONG>Arch</STRONG>    <STRONG>Color</STRONG>   <STRONG>Char</STRONG>   <STRONG>Notes</STRONG>
               ----------------------------------------------------------------
@@ -353,11 +347,11 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
           Regarding OSF/1 (and Tru64),
 
-          <STRONG>o</STRONG>   These used 64-bit hardware.  Like ncurses, the OSF/1 curses  in-
-              terface is not customized for 32-bit and 64-bit versions.
+          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
+              interface is not customized for 32-bit and 64-bit versions.
 
-          <STRONG>o</STRONG>   Unlike other systems which evolved from AT&amp;T code, OSF/1 provid-
-              ed a new implementation for X/Open curses.
+          <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
+              provided a new implementation for X/Open curses.
 
           Regarding Solaris,
 
@@ -367,8 +361,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
               Sun's copyright began in 1996.
 
           <STRONG>o</STRONG>   Sun updated the X/Open curses interface after 64-bit support was
-              introduced in 1997, but did not modify the  SVr4  curses  inter-
-              face.
+              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
+              interface.
 
           Regarding U/Win,
 
@@ -398,17 +392,17 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        This implementation provides the <STRONG>A_ITALIC</STRONG> attribute for terminals which
-       have  the  <STRONG>enter_italics_mode</STRONG> (<STRONG>sitm</STRONG>) and <STRONG>exit_italics_mode</STRONG> (<STRONG>ritm</STRONG>) capa-
-       bilities.  Italics are not mentioned in X/Open Curses.  Unlike the oth-
-       er  video attributes, <STRONG>A_ITALIC</STRONG> is unrelated to the <STRONG>set_attributes</STRONG> capa-
-       bilities.  This implementation makes the  assumption  that  <STRONG>exit_attri-</STRONG>
-       <STRONG>bute_mode</STRONG> may also reset italics.
+       have   the   <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and  <STRONG>exit_italics_mode</STRONG>  (<STRONG>ritm</STRONG>)
+       capabilities.  Italics are not mentioned in X/Open Curses.  Unlike  the
+       other  video  attributes,  <STRONG>A_ITALIC</STRONG>  is unrelated to the <STRONG>set_attributes</STRONG>
+       capabilities.   This   implementation   makes   the   assumption   that
+       <STRONG>exit_attribute_mode</STRONG> may also reset italics.
 
        Each  of  the functions added by XSI Curses has a parameter <EM>opts</EM>, which
-       X/Open Curses still (after more than twenty  years)  documents  as  re-
-       served for future use, saying that it should be <STRONG>NULL</STRONG>.  This implementa-
-       tion uses that parameter in ABI 6 for the functions which have a color-
-       pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
+       X/Open Curses  still  (after  more  than  twenty  years)  documents  as
+       reserved  for  future  use,  saying  that  it  should  be  <STRONG>NULL</STRONG>.   This
+       implementation uses that parameter in ABI 6  for  the  functions  which
+       have a color-pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
        <STRONG>o</STRONG>   For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
            if <EM>opts</EM> is set it is treated as a pointer to <STRONG>int</STRONG>, and used  to  set
@@ -436,14 +430,14 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        The XSI Curses standard states that whether the  traditional  functions
        <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG>  can  manipulate  attributes other than <STRONG>A_BLINK</STRONG>,
        <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is  "unspecified".
-       Under  this implementation as well as SVr4 curses, these functions cor-
-       rectly manipulate all  other  highlights  (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
+       Under  this  implementation  as  well  as  SVr4 curses, these functions
+       correctly manipulate all other highlights (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
        <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
 
        XSI Curses added these entry points:
 
-              <STRONG>attr_get</STRONG>, <STRONG>attr_on</STRONG>, <STRONG>attr_off</STRONG>, <STRONG>attr_set</STRONG>, <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, <STRONG>wat-</STRONG>
-              <STRONG>tr_get</STRONG>, <STRONG>wattr_set</STRONG>
+              <STRONG>attr_get</STRONG>,  <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>,  <STRONG>wattr_on</STRONG>,  <STRONG>wattr_off</STRONG>,
+              <STRONG>wattr_get</STRONG>, <STRONG>wattr_set</STRONG>
 
        The new functions are intended to work with a new series  of  highlight
        macros prefixed with <STRONG>WA_</STRONG>.  The older macros have direct counterparts in
@@ -467,12 +461,12 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
            <STRONG>A_</STRONG> and <STRONG>WA_</STRONG>-using functions operates on the  same  current-highlight
            information.
 
-       <STRONG>o</STRONG>   However, in some implementations, those symbols have unrelated val-
-           ues.
+       <STRONG>o</STRONG>   However,  in  some  implementations,  those  symbols have unrelated
+           values.
 
            For example, the Solaris <EM>xpg4</EM> (X/Open) curses declares <STRONG>attr_t</STRONG> to be
-           an unsigned short integer (16-bits), while <STRONG>chtype</STRONG> is a unsigned in-
-           teger (32-bits).  The <STRONG>WA_</STRONG> symbols in this case are  different  from
+           an  unsigned  short  integer  (16-bits), while <STRONG>chtype</STRONG> is a unsigned
+           integer (32-bits).  The <STRONG>WA_</STRONG> symbols in this case are different from
            the  <STRONG>A_</STRONG>  symbols because they are used for a smaller datatype which
            does not represent <STRONG>A_CHARTEXT</STRONG> or <STRONG>A_COLOR</STRONG>.
 
@@ -482,16 +476,16 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   Because ncurses's <STRONG>attr_t</STRONG> can hold a  color  pair  (in  the  <STRONG>A_COLOR</STRONG>
            field),  a  call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may alter the
-           window's color.  If the color pair information in the attribute pa-
-           rameter is zero, no change is made to the window's color.
+           window's color.  If the color pair  information  in  the  attribute
+           parameter is zero, no change is made to the window's color.
 
            This is consistent with SVr4 curses; X/Open Curses does not specify
            this.
 
-       The XSI standard extended conformance level adds new highlights <STRONG>A_HORI-</STRONG>
-       <STRONG>ZONTAL</STRONG>,  <STRONG>A_LEFT</STRONG>,  <STRONG>A_LOW</STRONG>,  <STRONG>A_RIGHT</STRONG>, <STRONG>A_TOP</STRONG>, <STRONG>A_VERTICAL</STRONG> (and corresponding
-       <STRONG>WA_</STRONG> macros for each).  As of August 2013, no  known  terminal  provides
-       these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
+       The  XSI  standard  extended  conformance  level  adds  new  highlights
+       <STRONG>A_HORIZONTAL</STRONG>,   <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>  (and
+       corresponding <STRONG>WA_</STRONG> macros for  each).   As  of  August  2013,  no  known
+       terminal provides these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -503,8 +497,8 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   returns an error if the window pointer is null.
 
-       <STRONG>o</STRONG>   returns an error if the color pair parameter for <STRONG>wcolor_set</STRONG> is out-
-           side the range 0..COLOR_PAIRS-1.
+       <STRONG>o</STRONG>   returns  an  error  if  the  color pair parameter for <STRONG>wcolor_set</STRONG> is
+           outside the range 0..COLOR_PAIRS-1.
 
        <STRONG>o</STRONG>   does not return an error if either of the parameters  of  <STRONG>wattr_get</STRONG>
            used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
@@ -520,7 +514,7 @@ <H1 class="no-header">curs_attr 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-09                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index b2d5f44bf..5f149e773 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.17 2021/12/25 21:41:58 tom Exp @
+  * @Id: curs_beep.3x,v 1.22 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>beep</STRONG>, <STRONG>flash</STRONG> - <STRONG>curses</STRONG> bell and screen flash routines
+       <STRONG>beep</STRONG>, <STRONG>flash</STRONG> - ring the (visual) bell of the terminal with <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2021-12-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2021-12-25                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index e777c1700..789892f28 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.39 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.44 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>bkgdset</STRONG>,  <STRONG>wbkgdset</STRONG>,  <STRONG>bkgd</STRONG>,  <STRONG>wbkgd</STRONG>,  <STRONG>getbkgd</STRONG>  - <STRONG>curses</STRONG> window background
-       manipulation routines
+       <STRONG>bkgdset</STRONG>,  <STRONG>wbkgdset</STRONG>,  <STRONG>bkgd</STRONG>,  <STRONG>wbkgd</STRONG>, <STRONG>getbkgd</STRONG> - manipulate background of a
+       <EM>curses</EM> window of characters
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 1a494d0f8..8c7944069 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.21 2023/08/12 18:31:54 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.27 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -47,15 +47,15 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>bkgrnd</STRONG>,  <STRONG>wbkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, <STRONG>wbkgrndset</STRONG>, <STRONG>getbkgrnd</STRONG>, <STRONG>wgetbkgrnd</STRONG> - <STRONG>curses</STRONG>
-       window complex background manipulation routines
+       <STRONG>bkgrnd</STRONG>,   <STRONG>wbkgrnd</STRONG>,   <STRONG>bkgrndset</STRONG>,  <STRONG>wbkgrndset</STRONG>,  <STRONG>getbkgrnd</STRONG>,  <STRONG>wgetbkgrnd</STRONG>  -
+       manipulate background of a <EM>curses</EM> window of wide characters
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>bkgrnd(</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wbkgrnd(</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>bkgrnd(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wbkgrnd(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>bkgrndset(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>wbkgrndset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
@@ -100,22 +100,23 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-getbkgrnd">getbkgrnd</a></H3><PRE>
        The <STRONG>getbkgrnd</STRONG> function returns the given  window's  current  background
-       character/attribute  pair  via  the  <STRONG>wch</STRONG>  pointer.  If the given window
-       pointer is null, the character is not updated (but no error returned).
+       character/attribute  pair  via  the  <EM>wch</EM>  pointer.  If the given window
+       pointer is null,  the  character  is  not  updated  (but  no  error  is
+       returned).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Note that <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be macros.
 
        X/Open Curses does not provide details on how the rendition is changed.
-       This  implementation follows the approach used in SVr4 curses, which is
+       This implementation follows the approach used in SVr4 curses, which  is
        explained in the manual page for <STRONG>wbkgd</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        The <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> routines do not return a value.
 
-       Upon successful completion, the other functions return <STRONG>OK</STRONG>.   Otherwise,
+       Upon  successful completion, the other functions return <STRONG>OK</STRONG>.  Otherwise,
        they return <STRONG>ERR</STRONG>:
 
        <STRONG>o</STRONG>   A null window pointer is treated as an error.
@@ -124,7 +125,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in  the  XSI Curses standard, Issue 4
+       These functions are described in  the  XSI  Curses  standard,  Issue  4
        (X/Open Curses).
 
 
@@ -133,7 +134,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-08-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-12                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 46a97eee0..8356000f9 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.34 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_border.3x,v 1.38 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>border</STRONG>, <STRONG>wborder</STRONG>, <STRONG>box</STRONG>, <STRONG>hline</STRONG>, <STRONG>whline</STRONG>, <STRONG>vline</STRONG>, <STRONG>wvline</STRONG>, <STRONG>mvhline</STRONG>, <STRONG>mvwhline</STRONG>,
-       <STRONG>mvvline</STRONG>, <STRONG>mvwvline</STRONG> - create <STRONG>curses</STRONG> borders, horizontal and vertical
-       lines
+       <STRONG>border</STRONG>,  <STRONG>wborder</STRONG>, <STRONG>box</STRONG>, <STRONG>hline</STRONG>, <STRONG>whline</STRONG>, <STRONG>vline</STRONG>, <STRONG>wvline</STRONG>, <STRONG>mvhline</STRONG>, <STRONG>mvwhline</STRONG>,
+       <STRONG>mvvline</STRONG>, <STRONG>mvwvline</STRONG> - draw borders  and  lines  in  a  <EM>curses</EM>  window  of
+       characters
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -76,8 +76,8 @@ <H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The  <STRONG>border</STRONG>,  <STRONG>wborder</STRONG> and <STRONG>box</STRONG> routines draw a box around the edges of a
-       window.  Other than the window, each argument is a character  with  at-
-       tributes:
+       window.  Other than the window,  each  argument  is  a  character  with
+       attributes:
 
               <EM>ls</EM> - left side,
               <EM>rs</EM> - right side,
@@ -88,8 +88,8 @@ <H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
               <EM>bl</EM> - bottom left-hand corner, and
               <EM>br</EM> - bottom right-hand corner.
 
-       If  any of these arguments is zero, then the corresponding default val-
-       ues (defined in <STRONG>curses.h</STRONG>) are used instead:
+       If  any  of  these  arguments  is  zero, then the corresponding default
+       values (defined in <STRONG>curses.h</STRONG>) are used instead:
 
               <STRONG>ACS_VLINE</STRONG>,
               <STRONG>ACS_VLINE</STRONG>,
@@ -100,26 +100,26 @@ <H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
               <STRONG>ACS_LLCORNER</STRONG>,
               <STRONG>ACS_LRCORNER</STRONG>.
 
-       <STRONG>box(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>)</STRONG> is a shorthand for  the  following  call:  <STRONG>wbor-</STRONG>
-       <STRONG>der(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0)</STRONG>.
+       <STRONG>box(</STRONG><EM>win</EM><STRONG>,</STRONG>  <EM>verch</EM><STRONG>,</STRONG>  <EM>horch</EM><STRONG>)</STRONG>  is  a  shorthand  for  the  following   call:
+       <STRONG>wborder(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0)</STRONG>.
 
        The  <STRONG>hline</STRONG>  and <STRONG>whline</STRONG> functions draw a horizontal (left to right) line
        using <EM>ch</EM> starting at the current cursor position in  the  window.   The
-       current  cursor position is not changed.  The line is at most <EM>n</EM> charac-
-       ters long, or as many as fit into the window.
+       current  cursor  position  is  not  changed.   The  line  is  at most <EM>n</EM>
+       characters long, or as many as fit into the window.
 
-       The <STRONG>vline</STRONG> and <STRONG>wvline</STRONG> functions draw a vertical (top to bottom) line us-
-       ing <EM>ch</EM> starting at the current cursor position in the window.  The cur-
-       rent cursor position is not changed.  The line is at most <EM>n</EM>  characters
-       long, or as many as fit into the window.
+       The <STRONG>vline</STRONG> and <STRONG>wvline</STRONG> functions draw a vertical  (top  to  bottom)  line
+       using  <EM>ch</EM>  starting  at the current cursor position in the window.  The
+       current cursor position  is  not  changed.   The  line  is  at  most  <EM>n</EM>
+       characters long, or as many as fit into the window.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All  routines return the integer <STRONG>OK</STRONG>.  The SVr4.0 manual says "or a non-
        negative integer if <STRONG>immedok</STRONG> is set", but this appears to be an error.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       X/Open does not  define  any  error  conditions.   This  implementation
+       returns an error if the window pointer is null.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_border 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index d38f90b53..95fdb4b41 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.20 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_border_set.3x,v 1.24 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>border_set</STRONG>, <STRONG>wborder_set</STRONG>, <STRONG>box_set</STRONG>, <STRONG>hline_set</STRONG>, <STRONG>whline_set</STRONG>, <STRONG>mvhline_set</STRONG>,
-       <STRONG>mvwhline_set</STRONG>, <STRONG>vline_set</STRONG>, <STRONG>wvline_set</STRONG>, <STRONG>mvvline_set</STRONG>, <STRONG>mvwvline_set</STRONG> - create
-       <STRONG>curses</STRONG> borders or lines using complex characters and renditions
+       <STRONG>border_set</STRONG>,  <STRONG>wborder_set</STRONG>,  <STRONG>box_set</STRONG>, <STRONG>hline_set</STRONG>, <STRONG>whline_set</STRONG>, <STRONG>mvhline_set</STRONG>,
+       <STRONG>mvwhline_set</STRONG>, <STRONG>vline_set</STRONG>, <STRONG>wvline_set</STRONG>, <STRONG>mvvline_set</STRONG>, <STRONG>mvwvline_set</STRONG>  -  draw
+       borders and lines in a <EM>curses</EM> window of wide characters
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -101,8 +101,8 @@ <H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H
        of the current or specified window.  These functions do not change  the
        cursor position, and do not wrap.
 
-       Other  than  the  window, each argument is a complex character with at-
-       tributes:
+       Other  than  the  window,  each  argument  is  a complex character with
+       attributes:
               <EM>ls</EM> - left side,
               <EM>rs</EM> - right side,
               <EM>ts</EM> - top side,
@@ -112,8 +112,8 @@ <H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H
               <EM>bl</EM> - bottom left-hand corner, and
               <EM>br</EM> - bottom right-hand corner.
 
-       If any of these arguments is zero, then the corresponding default  val-
-       ues (defined in <STRONG>curses.h</STRONG>) are used instead:
+       If any of these arguments  is  zero,  then  the  corresponding  default
+       values (defined in <STRONG>curses.h</STRONG>) are used instead:
               <STRONG>WACS_VLINE</STRONG>,
               <STRONG>WACS_VLINE</STRONG>,
               <STRONG>WACS_HLINE</STRONG>,
@@ -141,8 +141,8 @@ <H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that  <STRONG>border_set</STRONG>,  <STRONG>hline_set</STRONG>,  <STRONG>mvhline_set</STRONG>,  <STRONG>mvvline_set</STRONG>,   <STRONG>mvwh-</STRONG>
-       <STRONG>line_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
+       Note   that   <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,    <STRONG>mvhline_set</STRONG>,    <STRONG>mvvline_set</STRONG>,
+       <STRONG>mvwhline_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_border_set 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-07-01               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 7d86e09a3..3e4c2c261 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_clear.3x,v 1.35 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>erase</STRONG>, <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, <STRONG>wclrtobot</STRONG>, <STRONG>clrtoeol</STRONG>, <STRONG>wclrtoeol</STRONG>
-       - clear all or part of a <STRONG>curses</STRONG> window
+       <STRONG>erase</STRONG>,  <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, <STRONG>wclrtobot</STRONG>, <STRONG>clrtoeol</STRONG>, <STRONG>wclrtoeol</STRONG>
+       - clear all or part of a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -70,8 +70,8 @@ <H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-erase_werase">erase/werase</a></H3><PRE>
-       The <STRONG>erase</STRONG> and <STRONG>werase</STRONG> routines copy blanks to every position in the win-
-       dow, clearing the screen.
+       The <STRONG>erase</STRONG> and <STRONG>werase</STRONG> routines copy blanks  to  every  position  in  the
+       window, clearing the screen.
 
        Blanks created by erasure have the current background rendition (as set
        by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>) merged into them.
@@ -116,19 +116,19 @@ <H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but specifies no
        error conditions.
 
-       The SVr4.0 manual says that these functions could return  "a  non-nega-
-       tive  integer  if <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG> is set", referring to the return-value of
-       <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count of the
-       number of characters written to the terminal.
+       The SVr4.0 manual says  that  these  functions  could  return  "a  non-
+       negative  integer if <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG> is set", referring to the return-value
+       of <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count  of
+       the number of characters written to the terminal.
 
        Some  historic  curses implementations had, as an undocumented feature,
-       the ability to do the equivalent of <STRONG>clearok(...,</STRONG> <STRONG>1)</STRONG>  by  saying  <STRONG>touch-</STRONG>
-       <STRONG>win(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
+       the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
+       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
 
-       This implementation, and others such as Solaris, sets the current posi-
-       tion to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is not doc-
-       umented  in  other  implementations, and may not be true of implementa-
-       tions which were not derived from SVr4 source.
+       This  implementation,  and  others  such  as  Solaris, sets the current
+       position to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is  not
+       documented   in   other   implementations,  and  may  not  be  true  of
+       implementations which were not derived from SVr4 source.
 
        Not obvious from the description, most implementations clear the screen
        after  <STRONG>wclear</STRONG>  even  for  a subwindow or derived window.  If you do not
@@ -140,7 +140,7 @@ <H1 class="no-header">curs_clear 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index e693b5534..e914aedb1 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.73 2023/07/01 14:23:04 tom Exp @
+  * @Id: curs_color.3x,v 1.77 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -47,10 +47,10 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>start_color</STRONG>, <STRONG>has_colors</STRONG>, <STRONG>can_change_color</STRONG>, <STRONG>init_pair</STRONG>, <STRONG>init_color</STRONG>,
-       <STRONG>init_extended_pair</STRONG>, <STRONG>init_extended_color</STRONG>, <STRONG>color_content</STRONG>, <STRONG>pair_content</STRONG>,
-       <STRONG>extended_color_content</STRONG>, <STRONG>extended_pair_content</STRONG>, <STRONG>reset_color_pairs</STRONG>,
-       <STRONG>COLOR_PAIR</STRONG>, <STRONG>PAIR_NUMBER</STRONG> - <STRONG>curses</STRONG> color manipulation routines
+       <STRONG>start_color</STRONG>,   <STRONG>has_colors</STRONG>,   <STRONG>can_change_color</STRONG>,  <STRONG>init_pair</STRONG>,  <STRONG>init_color</STRONG>,
+       <STRONG>init_extended_pair</STRONG>, <STRONG>init_extended_color</STRONG>,  <STRONG>color_content</STRONG>,  <STRONG>pair_content</STRONG>,
+       <STRONG>extended_color_content</STRONG>,    <STRONG>extended_pair_content</STRONG>,    <STRONG>reset_color_pairs</STRONG>,
+       <STRONG>COLOR_PAIR</STRONG>, <STRONG>PAIR_NUMBER</STRONG> - manipulate terminal colors with <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -87,24 +87,24 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        use  these  routines  <STRONG>start_color</STRONG>  must  be called, usually right after
        <STRONG>initscr</STRONG>.  Colors are always used in pairs (referred to as color-pairs).
        A  color-pair  consists  of  a  foreground color (for characters) and a
-       background color (for the blank field on which the characters are  dis-
-       played).   A  programmer  initializes  a  color-pair  with  the routine
+       background color (for the blank  field  on  which  the  characters  are
+       displayed).   A  programmer  initializes  a color-pair with the routine
        <STRONG>init_pair</STRONG>.  After it has been initialized, <STRONG>COLOR_PAIR</STRONG>(<EM>n</EM>) can be used to
        convert the pair to a video attribute.
 
        If  a  terminal is capable of redefining colors, the programmer can use
-       the routine <STRONG>init_color</STRONG> to change the definition of a color.   The  rou-
-       tines  <STRONG>has_colors</STRONG>  and <STRONG>can_change_color</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>, depending
-       on whether the terminal has color capabilities and whether the program-
-       mer can change the colors.  The routine <STRONG>color_content</STRONG> allows a program-
-       mer to extract the amounts of red, green, and  blue  components  in  an
-       initialized  color.   The  routine  <STRONG>pair_content</STRONG> allows a programmer to
-       find out how a given color-pair is currently defined.
+       the routine <STRONG>init_color</STRONG> to  change  the  definition  of  a  color.   The
+       routines   <STRONG>has_colors</STRONG>   and  <STRONG>can_change_color</STRONG>  return  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG>,
+       depending on whether the terminal has color  capabilities  and  whether
+       the programmer can change the colors.  The routine <STRONG>color_content</STRONG> allows
+       a programmer to extract the amounts of red, green, and blue  components
+       in  an initialized color.  The routine <STRONG>pair_content</STRONG> allows a programmer
+       to find out how a given color-pair is currently defined.
 
 
 </PRE><H3><a name="h3-Color-Rendering">Color Rendering</a></H3><PRE>
-       The <STRONG>curses</STRONG> library combines these inputs to produce  the  actual  fore-
-       ground and background colors shown on the screen:
+       The  <STRONG>curses</STRONG>  library  combines  these  inputs  to  produce  the  actual
+       foreground and background colors shown on the screen:
 
        <STRONG>o</STRONG>   per-character video attributes (e.g., via <STRONG>waddch</STRONG>),
 
@@ -112,10 +112,10 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   the background character (e.g., <STRONG>wbkgdset</STRONG>).
 
-       Per-character and window attributes are usually set by a parameter con-
-       taining video attributes including a color pair value.  Some  functions
-       such as <STRONG>wattr_set</STRONG> use a separate parameter which is the color pair num-
-       ber.
+       Per-character  and  window  attributes  are  usually set by a parameter
+       containing  video  attributes  including  a  color  pair  value.   Some
+       functions such as <STRONG>wattr_set</STRONG> use a separate parameter which is the color
+       pair number.
 
        The background character is a special case:  it  includes  a  character
        value, just as if it were passed to <STRONG>waddch</STRONG>.
@@ -135,12 +135,12 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   If the parameter passed to <STRONG>waddch</STRONG> is <EM>not</EM> <EM>blank</EM>, or it does not  use
            the  special  color  pair 0, <STRONG>curses</STRONG> prefers the color pair from the
-           parameter, if it is nonzero.  Otherwise, it tries the window attri-
-           bute next, and finally the background character.
+           parameter, if it  is  nonzero.   Otherwise,  it  tries  the  window
+           attribute next, and finally the background character.
 
-       Some  <STRONG>curses</STRONG>  functions such as <STRONG>wprintw</STRONG> call <STRONG>waddch</STRONG>.  Those do not com-
-       bine its parameter with a color pair.  Consequently those calls use on-
-       ly the window attribute or the background character.
+       Some  <STRONG>curses</STRONG>  functions  such  as  <STRONG>wprintw</STRONG>  call  <STRONG>waddch</STRONG>.  Those do not
+       combine its parameter with a color pair.  Consequently those calls  use
+       only the window attribute or the background character.
 
 
 </PRE><H2><a name="h2-CONSTANTS">CONSTANTS</a></H2><PRE>
@@ -164,8 +164,8 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
-       is initialized by <STRONG>start_color</STRONG> to the maximum number of colors the  ter-
-       minal can support.
+       is initialized by <STRONG>start_color</STRONG> to  the  maximum  number  of  colors  the
+       terminal can support.
 
 
 </PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
@@ -177,12 +177,12 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-start_color">start_color</a></H3><PRE>
        The <STRONG>start_color</STRONG> routine requires no arguments.  It must  be  called  if
-       the  programmer wants to use colors, and before any other color manipu-
-       lation routine is called.  It is good practice  to  call  this  routine
-       right after <STRONG>initscr</STRONG>.  <STRONG>start_color</STRONG> does this:
+       the  programmer  wants  to  use  colors,  and  before  any  other color
+       manipulation routine is called.  It  is  good  practice  to  call  this
+       routine right after <STRONG>initscr</STRONG>.  <STRONG>start_color</STRONG> does this:
 
-       <STRONG>o</STRONG>   It  initializes  two  global variables, <STRONG>COLORS</STRONG> and <STRONG>COLOR_PAIRS</STRONG> (re-
-           spectively defining the maximum number of  colors  and  color-pairs
+       <STRONG>o</STRONG>   It   initializes  two  global  variables,  <STRONG>COLORS</STRONG>  and  <STRONG>COLOR_PAIRS</STRONG>
+           (respectively defining the maximum number of colors and color-pairs
            the terminal can support).
 
        <STRONG>o</STRONG>   It  initializes  the special color pair <STRONG>0</STRONG> to the default foreground
@@ -209,77 +209,77 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            initial eight colors.
 
            <STRONG>start_color</STRONG> does not attempt to set the terminal's color palette to
-           match its built-in table.  An application may use <STRONG>init_color</STRONG> to al-
-           ter the internal table along with the terminal's color.
+           match  its  built-in  table.   An application may use <STRONG>init_color</STRONG> to
+           alter the internal table along with the terminal's color.
 
        These limits apply to color values and  color  pairs.   Values  outside
        these limits are not legal, and may result in a runtime error:
 
-       <STRONG>o</STRONG>   <STRONG>COLORS</STRONG>  corresponds to the terminal database's <STRONG>max_colors</STRONG> capabili-
-           ty, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
+       <STRONG>o</STRONG>   <STRONG>COLORS</STRONG>   corresponds   to   the   terminal   database's  <STRONG>max_colors</STRONG>
+           capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
 
-       <STRONG>o</STRONG>   color values are expected to be in the range <STRONG>0</STRONG> to <STRONG>COLORS-1</STRONG>,  inclu-
-           sive (including <STRONG>0</STRONG> and <STRONG>COLORS-1</STRONG>).
+       <STRONG>o</STRONG>   color values are expected  to  be  in  the  range  <STRONG>0</STRONG>  to  <STRONG>COLORS-1</STRONG>,
+           inclusive (including <STRONG>0</STRONG> and <STRONG>COLORS-1</STRONG>).
 
        <STRONG>o</STRONG>   a  special  color value <STRONG>-1</STRONG> is used in certain extended functions to
            denote the <EM>default</EM> <EM>color</EM> (see <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>).
 
-       <STRONG>o</STRONG>   <STRONG>COLOR_PAIRS</STRONG> corresponds to the terminal database's <STRONG>max_pairs</STRONG>  capa-
-           bility, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
+       <STRONG>o</STRONG>   <STRONG>COLOR_PAIRS</STRONG>  corresponds  to  the  terminal  database's   <STRONG>max_pairs</STRONG>
+           capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
 
-       <STRONG>o</STRONG>   legal color pair values are in the range <STRONG>1</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>, inclu-
-           sive.
+       <STRONG>o</STRONG>   legal  color  pair  values  are  in  the  range <STRONG>1</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>,
+           inclusive.
 
        <STRONG>o</STRONG>   color pair <STRONG>0</STRONG> is special; it denotes "no color".
 
-           Color pair <STRONG>0</STRONG> is assumed to be white on black, but is actually what-
-           ever  the terminal implements before color is initialized.  It can-
-           not be modified by the application.
+           Color pair <STRONG>0</STRONG> is assumed to be  white  on  black,  but  is  actually
+           whatever  the  terminal implements before color is initialized.  It
+           cannot be modified by the application.
 
 
 </PRE><H3><a name="h3-has_colors">has_colors</a></H3><PRE>
        The <STRONG>has_colors</STRONG> routine requires no arguments.  It returns <STRONG>TRUE</STRONG>  if  the
-       terminal can manipulate colors; otherwise, it returns <STRONG>FALSE</STRONG>.  This rou-
-       tine facilitates writing terminal-independent programs.  For example, a
-       programmer  can  use  it  to  decide whether to use color or some other
-       video attribute.
+       terminal  can  manipulate  colors;  otherwise,  it returns <STRONG>FALSE</STRONG>.  This
+       routine  facilitates  writing   terminal-independent   programs.    For
+       example, a programmer can use it to decide whether to use color or some
+       other video attribute.
 
 
 </PRE><H3><a name="h3-can_change_color">can_change_color</a></H3><PRE>
        The <STRONG>can_change_color</STRONG> routine requires no arguments.  It returns <STRONG>TRUE</STRONG> if
        the  terminal  supports colors and can change their definitions; other,
-       it returns <STRONG>FALSE</STRONG>.  This routine facilitates  writing  terminal-indepen-
-       dent programs.
+       it  returns  <STRONG>FALSE</STRONG>.   This  routine   facilitates   writing   terminal-
+       independent programs.
 
 
 </PRE><H3><a name="h3-init_pair">init_pair</a></H3><PRE>
        The <STRONG>init_pair</STRONG> routine changes the definition of a color-pair.  It takes
-       three arguments: the number of the color-pair to be changed, the  fore-
-       ground color number, and the background color number.  For portable ap-
-       plications:
+       three arguments: the number  of  the  color-pair  to  be  changed,  the
+       foreground color number, and the background color number.  For portable
+       applications:
 
        <STRONG>o</STRONG>   The first argument must be a legal color pair  value.   If  default
-           colors are used (see <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>) the upper limit is ad-
-           justed to allow for extra pairs which use a default color in  fore-
-           ground and/or background.
+           colors  are  used  (see  <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>) the upper limit is
+           adjusted to allow for extra pairs which  use  a  default  color  in
+           foreground and/or background.
 
        <STRONG>o</STRONG>   The second and third arguments must be legal color values.
 
        If  the  color-pair was previously initialized, the screen is refreshed
-       and all occurrences of that color-pair are changed to the  new  defini-
-       tion.
+       and  all  occurrences  of  that  color-pair  are  changed  to  the  new
+       definition.
 
-       As  an  extension,  ncurses  allows you to set color pair <STRONG>0</STRONG> via the <STRONG>as-</STRONG>
-       <STRONG><A HREF="assume_default_colors.3x.html">sume_default_colors(3x)</A></STRONG> routine, or to specify the use of default  col-
-       ors  (color  number  <STRONG>-1</STRONG>) if you first invoke the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>
+       As  an  extension,  ncurses  allows  you  to  set  color pair <STRONG>0</STRONG> via the
+       <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG> routine, or to specify  the  use  of  default
+       colors (color number <STRONG>-1</STRONG>) if you first invoke the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>
        routine.
 
 
 </PRE><H3><a name="h3-init_extended_pair">init_extended_pair</a></H3><PRE>
        Because <STRONG>init_pair</STRONG> uses signed <STRONG>short</STRONG>s for its  parameters,  that  limits
-       color-pairs  and  color-values to 32767 on modern hardware.  The exten-
-       sion <STRONG>init_extended_pair</STRONG> uses <STRONG>int</STRONG>s for the color-pair  and  color-value,
-       allowing a larger number of colors to be supported.
+       color-pairs   and  color-values  to  32767  on  modern  hardware.   The
+       extension <STRONG>init_extended_pair</STRONG> uses <STRONG>int</STRONG>s for the  color-pair  and  color-
+       value, allowing a larger number of colors to be supported.
 
 
 </PRE><H3><a name="h3-init_color">init_color</a></H3><PRE>
@@ -300,18 +300,18 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-init_extended_color">init_extended_color</a></H3><PRE>
        Because  <STRONG>init_color</STRONG>  uses signed <STRONG>short</STRONG>s for its parameters, that limits
-       color-values and their red, green, and blue components to 32767 on mod-
-       ern hardware.  The extension <STRONG>init_extended_color</STRONG> uses <STRONG>int</STRONG>s for the col-
-       or value and for setting the red, green, and blue components,  allowing
-       a larger number of colors to be supported.
+       color-values and their red, green, and  blue  components  to  32767  on
+       modern  hardware.   The extension <STRONG>init_extended_color</STRONG> uses <STRONG>int</STRONG>s for the
+       color value and for  setting  the  red,  green,  and  blue  components,
+       allowing a larger number of colors to be supported.
 
 
 </PRE><H3><a name="h3-color_content">color_content</a></H3><PRE>
        The <STRONG>color_content</STRONG> routine gives programmers a way to find the intensity
        of the red, green, and blue (RGB) components in a color.   It  requires
        four  arguments:  the  color  number, and three addresses of <STRONG>short</STRONG>s for
-       storing the information about the amounts of red, green, and blue  com-
-       ponents in the given color.
+       storing the information about the  amounts  of  red,  green,  and  blue
+       components in the given color.
 
        <STRONG>o</STRONG>   The  first  argument  must  be a legal color value, i.e., <STRONG>0</STRONG> through
            <STRONG>COLORS-1</STRONG>, inclusive.
@@ -322,9 +322,9 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-extended_color_content">extended_color_content</a></H3><PRE>
-       Because <STRONG>color_content</STRONG> uses signed <STRONG>short</STRONG>s for its parameters, that  lim-
-       its  color-values and their red, green, and blue components to 32767 on
-       modern hardware.  The extension <STRONG>extended_color_content</STRONG>  uses  <STRONG>int</STRONG>s  for
+       Because <STRONG>color_content</STRONG> uses  signed  <STRONG>short</STRONG>s  for  its  parameters,  that
+       limits  color-values and their red, green, and blue components to 32767
+       on modern hardware.  The extension <STRONG>extended_color_content</STRONG> uses <STRONG>int</STRONG>s for
        the  color value and for returning the red, green, and blue components,
        allowing a larger number of colors to be supported.
 
@@ -338,17 +338,17 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The  first argument must be a legal color value, i.e., in the range
            <STRONG>1</STRONG> through <STRONG>COLOR_PAIRS-1</STRONG>, inclusive.
 
-       <STRONG>o</STRONG>   The values that are stored at the addresses pointed to by the  sec-
-           ond  and  third arguments are in the range <STRONG>0</STRONG> through <STRONG>COLORS</STRONG>, inclu-
-           sive.
+       <STRONG>o</STRONG>   The values that are stored at  the  addresses  pointed  to  by  the
+           second  and  third  arguments  are  in  the range <STRONG>0</STRONG> through <STRONG>COLORS</STRONG>,
+           inclusive.
 
 
 </PRE><H3><a name="h3-extended_pair_content">extended_pair_content</a></H3><PRE>
        Because <STRONG>pair_content</STRONG> uses signed <STRONG>short</STRONG>s for its parameters, that limits
        color-pair and color-values to 32767 on modern hardware.  The extension
        <STRONG>extended_pair_content</STRONG> uses <STRONG>int</STRONG>s for the color pair  and  for  returning
-       the  foreground and background colors, allowing a larger number of col-
-       ors to be supported.
+       the  foreground  and  background  colors,  allowing  a larger number of
+       colors to be supported.
 
 
 </PRE><H3><a name="h3-reset_color_pairs">reset_color_pairs</a></H3><PRE>
@@ -375,27 +375,28 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        The routines <STRONG>can_change_color</STRONG> and <STRONG>has_colors</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
        All other routines return the integer <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG>  (SVr4
-       specifies  only "an integer value other than <STRONG>ERR</STRONG>") upon successful com-
-       pletion.
+       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion.
 
-       X/Open defines no error conditions.  SVr4 does document some error con-
-       ditions which apply in general:
+       X/Open defines no error conditions.   SVr4  does  document  some  error
+       conditions which apply in general:
 
        <STRONG>o</STRONG>   This implementation will return <STRONG>ERR</STRONG> on attempts to use color values
-           outside the range <STRONG>0</STRONG> to <STRONG>COLORS</STRONG>-1 (except for the default colors  ex-
-           tension), or use color pairs outside the range <STRONG>0</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>.
+           outside the range <STRONG>0</STRONG> to <STRONG>COLORS</STRONG>-1  (except  for  the  default  colors
+           extension),   or   use   color   pairs   outside  the  range  <STRONG>0</STRONG>  to
+           <STRONG>COLOR_PAIRS-1</STRONG>.
 
            Color values used in <STRONG>init_color</STRONG> must be in the range <STRONG>0</STRONG> to <STRONG>1000</STRONG>.
 
-           An  error  is  returned  from all functions if the terminal has not
+           An error is returned from all functions if  the  terminal  has  not
            been initialized.
 
-           An error is returned from secondary functions such as <STRONG>init_pair</STRONG>  if
+           An  error is returned from secondary functions such as <STRONG>init_pair</STRONG> if
            <STRONG>start_color</STRONG> was not called.
 
-       <STRONG>o</STRONG>   SVr4  does much the same, except that it returns <STRONG>ERR</STRONG> from <STRONG>pair_con-</STRONG>
-           <STRONG>tent</STRONG> if the pair was not initialized using <STRONG>init_pairs</STRONG>  and  it  re-
-           turns  <STRONG>ERR</STRONG>  from  <STRONG>color_content</STRONG>  if  the  terminal does not support
+       <STRONG>o</STRONG>   SVr4  does  much  the  same,  except  that  it  returns  <STRONG>ERR</STRONG>   from
+           <STRONG>pair_content</STRONG>  if  the pair was not initialized using <STRONG>init_pairs</STRONG> and
+           it returns <STRONG>ERR</STRONG> from <STRONG>color_content</STRONG> if the terminal does not  support
            changing colors.
 
            This implementation does not return <STRONG>ERR</STRONG> for either case.
@@ -404,7 +405,7 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
           <STRONG>init_color</STRONG>
                returns an error if the terminal does not support this feature,
-               e.g.,  if  the  <STRONG>initialize_color</STRONG>  capability is absent from the
+               e.g., if the <STRONG>initialize_color</STRONG> capability  is  absent  from  the
                terminal description.
 
           <STRONG>start_color</STRONG>
@@ -412,28 +413,28 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       In the <STRONG>ncurses</STRONG> implementation, there is  a  separate  color  activation
-       flag,  color palette, color pairs table, and associated <STRONG>COLORS</STRONG> and <STRONG>COL-</STRONG>
-       <STRONG>OR_PAIRS</STRONG> counts for each screen; the <STRONG>start_color</STRONG> function only  affects
-       the current screen.  The SVr4/XSI interface is not really designed with
-       this in mind, and historical implementations may use  a  single  shared
-       color palette.
-
-       Setting  an  implicit  background  color  via a color pair affects only
-       character cells that a character write  operation  explicitly  touches.
-       To  change the background color used when parts of a window are blanked
+       In  the  <STRONG>ncurses</STRONG>  implementation,  there is a separate color activation
+       flag, color palette, color  pairs  table,  and  associated  <STRONG>COLORS</STRONG>  and
+       <STRONG>COLOR_PAIRS</STRONG>  counts  for  each  screen;  the  <STRONG>start_color</STRONG> function only
+       affects the current screen.   The  SVr4/XSI  interface  is  not  really
+       designed  with  this  in mind, and historical implementations may use a
+       single shared color palette.
+
+       Setting an implicit background color via  a  color  pair  affects  only
+       character  cells  that  a character write operation explicitly touches.
+       To change the background color used when parts of a window are  blanked
        by erasing or scrolling operations, see <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>.
 
-       Several caveats apply on older x86 machines  (e.g.,  i386,  i486)  with
+       Several  caveats  apply  on  older x86 machines (e.g., i386, i486) with
        VGA-compatible graphics:
 
-       <STRONG>o</STRONG>   COLOR_YELLOW  is  actually  brown.  To get yellow, use COLOR_YELLOW
+       <STRONG>o</STRONG>   COLOR_YELLOW is actually brown.  To get  yellow,  use  COLOR_YELLOW
            combined with the <STRONG>A_BOLD</STRONG> attribute.
 
-       <STRONG>o</STRONG>   The A_BLINK attribute should in theory cause the background  to  go
+       <STRONG>o</STRONG>   The  A_BLINK  attribute should in theory cause the background to go
            bright.  This often fails to work, and even some cards for which it
-           mostly works (such as the Paradise and compatibles)  do  the  wrong
-           thing  when  you try to set a bright "yellow" background (you get a
+           mostly  works  (such  as the Paradise and compatibles) do the wrong
+           thing when you try to set a bright "yellow" background (you  get  a
            blinking yellow foreground instead).
 
        <STRONG>o</STRONG>   Color RGB values are not settable.
@@ -442,89 +443,89 @@ <H1 class="no-header">curs_color 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        SVr3.2 introduced color support to curses in 1987.
 
-       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
-       state  from  <STRONG>SP</STRONG> (the <STRONG>SCREEN</STRONG> structure) to <STRONG>cur_term</STRONG> (the <STRONG>TERMINAL</STRONG> struc-
-       ture), but provided the same set of library functions.
+       SVr4  made  internal  changes,  e.g.,  moving the storage for the color
+       state  from  <STRONG>SP</STRONG>  (the  <STRONG>SCREEN</STRONG>  structure)  to  <STRONG>cur_term</STRONG>  (the  <STRONG>TERMINAL</STRONG>
+       structure), but provided the same set of library functions.
 
-       SVr4 curses limits the number of color pairs  to  64,  reserving  color
-       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
-       arises because the color pair information is a bitfield in  the  <STRONG>chtype</STRONG>
+       SVr4  curses  limits  the  number of color pairs to 64, reserving color
+       pair zero (0) as the terminal's initial uncolored  state.   This  limit
+       arises  because  the color pair information is a bitfield in the <STRONG>chtype</STRONG>
        data type (denoted by <STRONG>A_COLOR</STRONG>).
 
        Other implementations of curses had different limits:
 
        <STRONG>o</STRONG>   PCCurses (1987-1990) provided for only eight (8) colors.
 
-       <STRONG>o</STRONG>   PDCurses  (1992-present)  inherited the 8-color limitation from PC-
-           Curses, but changed this to 256 in version 2.5 (2001),  along  with
+       <STRONG>o</STRONG>   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+           PCCurses, but changed this to 256 in version 2.5 (2001), along with
            changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
 
        <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
            the character, attributes and color-pair values, allowing increased
-           range  of  color-pairs.   Both  color-pairs and color-values used a
+           range of color-pairs.  Both color-pairs  and  color-values  used  a
            signed <STRONG>short</STRONG>, limiting values to 15 bits.
 
-       <STRONG>o</STRONG>   ncurses (1992-present) uses eight bits for <STRONG>A_COLOR</STRONG> in  <STRONG>chtype</STRONG>  val-
-           ues.
+       <STRONG>o</STRONG>   ncurses  (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in <STRONG>chtype</STRONG>
+           values.
 
-           Version  5.3  provided  a wide-character interface (2002), but left
+           Version 5.3 provided a wide-character interface  (2002),  but  left
            color-pairs as part of the attributes-field.
 
            Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color-pairs
            in the <STRONG>cchar_t</STRONG> values.  When those color-pair values fit in 8 bits,
-           ncurses allows color-pairs to be manipulated via the functions  us-
-           ing <STRONG>chtype</STRONG> values.
+           ncurses  allows  color-pairs  to  be  manipulated via the functions
+           using <STRONG>chtype</STRONG> values.
 
-       <STRONG>o</STRONG>   NetBSD  curses  used  6 bits from 2000 (when colors were first sup-
-           ported) until 2004.  At that point, NetBSD changed to use 10  bits.
-           As of 2021, that size is unchanged.  Like ncurses before version 6,
-           the NetBSD color-pair information is stored in the attributes field
-           of  <STRONG>cchar_t</STRONG>,  limiting the number of color-pairs by the size of the
-           bitfield.
+       <STRONG>o</STRONG>   NetBSD curses used  6  bits  from  2000  (when  colors  were  first
+           supported)  until  2004.   At  that point, NetBSD changed to use 10
+           bits.  As of 2021, that size is  unchanged.   Like  ncurses  before
+           version  6,  the  NetBSD  color-pair  information  is stored in the
+           attributes field of <STRONG>cchar_t</STRONG>, limiting the number of color-pairs  by
+           the size of the bitfield.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
-       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
-       are not found in SVr4 curses, 4.4BSD curses, or any other previous ver-
-       sion of curses.
+       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
+       are not found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous
+       version of curses.
 
 
 </PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
-       This implementation satisfies XSI Curses's minimum maximums for  <STRONG>COLORS</STRONG>
+       This  implementation satisfies XSI Curses's minimum maximums for <STRONG>COLORS</STRONG>
        and <STRONG>COLOR_PAIRS</STRONG>.
 
-       The  <STRONG>init_pair</STRONG>  routine accepts negative values of foreground and back-
-       ground color to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but  only
-       if that routine has been first invoked.
+       The  <STRONG>init_pair</STRONG>  routine  accepts  negative  values  of  foreground  and
+       background  color  to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but
+       only if that routine has been first invoked.
 
        The assumption that <STRONG>COLOR_BLACK</STRONG> is the default background color for all
-       terminals can be modified using  the  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>  exten-
-       sion.
+       terminals   can   be   modified   using  the  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
+       extension.
 
-       This  implementation checks the pointers, e.g., for the values returned
-       by <STRONG>color_content</STRONG> and <STRONG>pair_content</STRONG>, and will treat those as optional pa-
-       rameters when null.
+       This implementation checks the pointers, e.g., for the values  returned
+       by  <STRONG>color_content</STRONG>  and  <STRONG>pair_content</STRONG>,  and will treat those as optional
+       parameters when null.
 
-       X/Open  Curses  does  not  specify a limit for the number of colors and
+       X/Open Curses does not specify a limit for the  number  of  colors  and
        color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
-       for  the  parameters,  it carries over SVr4's implementation detail for
+       for the parameters, it carries over SVr4's  implementation  detail  for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation  provides extended versions of those functions which use
-       <STRONG>short</STRONG> parameters, allowing applications to use larger color- and  pair-
+       implementation provides extended versions of those functions which  use
+       <STRONG>short</STRONG>  parameters, allowing applications to use larger color- and pair-
        numbers.
 
        The <STRONG>reset_color_pairs</STRONG> function is an extension of ncurses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>de-</STRONG>
-       <STRONG><A HREF="default_colors.3x.html">fault_colors(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 50da8c585..5d94c2a61 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.22 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_delch.3x,v 1.26 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>delch</STRONG>, <STRONG>wdelch</STRONG>, <STRONG>mvdelch</STRONG>, <STRONG>mvwdelch</STRONG> - delete character under the cursor in
-       a <STRONG>curses</STRONG> window
+       <STRONG>delch</STRONG>,  <STRONG>wdelch</STRONG>,  <STRONG>mvdelch</STRONG>, <STRONG>mvwdelch</STRONG> - delete the character at the cursor
+       in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index b78710f2b..aa31843b0 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.24 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.28 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>deleteln</STRONG>,  <STRONG>wdeleteln</STRONG>, <STRONG>insdelln</STRONG>, <STRONG>winsdelln</STRONG>, <STRONG>insertln</STRONG>, <STRONG>winsertln</STRONG> - delete
-       and insert lines in a <STRONG>curses</STRONG> window
+       or insert lines in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 296242111..1bcbdaf18 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.32 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_extend.3x,v 1.36 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>curses_version</STRONG>, <STRONG>use_extended_names</STRONG> - miscellaneous curses extensions
+       <STRONG>curses_version</STRONG>, <STRONG>use_extended_names</STRONG> - miscellaneous <EM>curses</EM> extensions
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 65fafefdd..48e000c47 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.18 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.23 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, <STRONG>mvwget_wch</STRONG>, <STRONG>unget_wch</STRONG> - get (or push
-       back) a wide character from curses terminal keyboard
+       <STRONG>get_wch</STRONG>,  <STRONG>wget_wch</STRONG>,  <STRONG>mvget_wch</STRONG>,  <STRONG>mvwget_wch</STRONG>,  <STRONG>unget_wch</STRONG>  - get (or push
+       back) a wide character from <EM>curses</EM> terminal keyboard
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -65,14 +65,14 @@ <H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-wget_wch">wget_wch</a></H3><PRE>
-       The <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions read a char-
-       acter  from  the terminal associated with the current or specified win-
-       dow.  In no-delay mode, if no input is waiting, the value  <STRONG>ERR</STRONG>  is  re-
-       turned.   In delay mode, the program waits until the system passes text
-       through to the program.  Depending on the setting of  <STRONG>cbreak</STRONG>,  this  is
-       after one character (cbreak mode), or after the first newline (nocbreak
-       mode).  In half-delay mode, the program waits until the  user  types  a
-       character or the specified timeout interval has elapsed.
+       The <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>,  <STRONG>mvget_wch</STRONG>,  and  <STRONG>mvwget_wch</STRONG>  functions  read  a
+       character  from  the  terminal associated with the current or specified
+       window.  In no-delay mode, if no input is waiting,  the  value  <STRONG>ERR</STRONG>  is
+       returned.   In  delay  mode,  the program waits until the system passes
+       text through to the program.  Depending on the setting of <STRONG>cbreak</STRONG>,  this
+       is  after  one  character  (cbreak  mode),  or  after the first newline
+       (nocbreak mode).  In half-delay mode, the program waits until the  user
+       types a character or the specified timeout interval has elapsed.
 
        Unless  <STRONG>noecho</STRONG> has been set, these routines echo the character into the
        designated window.
@@ -82,38 +82,40 @@ <H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
        is read.
 
        If <STRONG>keypad</STRONG> is enabled, these functions respond  to  the  pressing  of  a
-       function key by setting the object pointed to by <EM>wch</EM> to the keycode as-
-       signed to the function key, and returning <STRONG>KEY_CODE_YES</STRONG>.  If a character
-       (such  as  escape) that could be the beginning of a function key is re-
-       ceived, curses sets a timer.  If the remainder of the sequence does ar-
-       rive  within  the designated time, curses passes through the character;
-       otherwise, curses returns the function key  value.   For  this  reason,
-       many  terminals  experience a delay between the time a user presses the
-       escape key and the time the escape is returned to the program.
+       function  key  by  setting  the object pointed to by <EM>wch</EM> to the keycode
+       assigned to  the  function  key,  and  returning  <STRONG>KEY_CODE_YES</STRONG>.   If  a
+       character  (such  as  escape) that could be the beginning of a function
+       key is received, curses sets a timer.  If the remainder of the sequence
+       does  arrive  within  the  designated  time,  curses passes through the
+       character; otherwise, curses returns the function key value.  For  this
+       reason,  many  terminals  experience  a  delay  between the time a user
+       presses the escape key and the time  the  escape  is  returned  to  the
+       program.
 
        The keycodes returned by these functions are the same as those returned
        by <STRONG>wgetch</STRONG>:
 
-       <STRONG>o</STRONG>   The  predefined  function  keys  are listed in <STRONG>&lt;curses.h&gt;</STRONG> as macros
-           with values outside the range of 8-bit characters.  Their names be-
-           gin with <STRONG>KEY_</STRONG>.
+       <STRONG>o</STRONG>   The predefined function keys are listed  in  <STRONG>&lt;curses.h&gt;</STRONG>  as  macros
+           with  values  outside  the  range of 8-bit characters.  Their names
+           begin with <STRONG>KEY_</STRONG>.
 
-       <STRONG>o</STRONG>   Other  (user-defined)  function keys which may be defined using <STRONG>de-</STRONG>
-           <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG> have no names, but also are expected  to  have  values
+       <STRONG>o</STRONG>   Other (user-defined) function  keys  which  may  be  defined  using
+           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>  have no names, but also are expected to have values
            outside the range of 8-bit characters.
 
 
 </PRE><H3><a name="h3-unget_wch">unget_wch</a></H3><PRE>
        The <STRONG>unget_wch</STRONG> function pushes the wide character <EM>wch</EM> back onto the head
-       of the input queue, so the wide character is returned by the next  call
-       to  <STRONG>get_wch</STRONG>.  The pushback of one character is guaranteed.  If the pro-
-       gram calls <STRONG>unget_wch</STRONG> too many times  without  an  intervening  call  to
+       of  the input queue, so the wide character is returned by the next call
+       to <STRONG>get_wch</STRONG>.  The pushback of  one  character  is  guaranteed.   If  the
+       program  calls  <STRONG>unget_wch</STRONG> too many times without an intervening call to
        <STRONG>get_wch</STRONG>, the operation may fail.
 
-       Unlike <STRONG>ungetch</STRONG> and <STRONG>wgetch</STRONG>, <STRONG>unget_wch</STRONG> cannot distinguish special charac-
-       ters returned by <STRONG>wget_wch</STRONG> from ordinary characters.  An application can
-       push  special  keys  which it may read via <STRONG>wget_wch</STRONG> by checking for the
-       <STRONG>KEY_CODE_YES</STRONG> result, and using <STRONG>ungetch</STRONG> for those special keys.
+       Unlike  <STRONG>ungetch</STRONG>  and  <STRONG>wgetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish   special
+       characters   returned   by   <STRONG>wget_wch</STRONG>  from  ordinary  characters.   An
+       application can push special keys which it may  read  via  <STRONG>wget_wch</STRONG>  by
+       checking  for  the  <STRONG>KEY_CODE_YES</STRONG>  result,  and  using <STRONG>ungetch</STRONG> for those
+       special keys.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -125,20 +127,20 @@ <H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
        When using <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>,  or  <STRONG>mvwget_wch</STRONG>,  applications
        should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending
-       on the state of the tty driver when each character is typed,  the  pro-
-       gram may produce undesirable results.
+       on the state of the tty  driver  when  each  character  is  typed,  the
+       program may produce undesirable results.
 
        All functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       When <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions successful-
-       ly report the pressing of a function  key,  they  return  <STRONG>KEY_CODE_YES</STRONG>.
-       When they successfully report a wide character, they return <STRONG>OK</STRONG>.  Other-
-       wise, they return <STRONG>ERR</STRONG>.
+       When   <STRONG>get_wch</STRONG>,   <STRONG>wget_wch</STRONG>,   <STRONG>mvget_wch</STRONG>,   and   <STRONG>mvwget_wch</STRONG>   functions
+       successfully report  the  pressing  of  a  function  key,  they  return
+       <STRONG>KEY_CODE_YES</STRONG>.   When  they  successfully  report a wide character, they
+       return <STRONG>OK</STRONG>.  Otherwise, they return <STRONG>ERR</STRONG>.
 
-       Upon successful completion, <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, the func-
-       tion returns <STRONG>ERR</STRONG>.
+       Upon successful  completion,  <STRONG>unget_wch</STRONG>  returns  <STRONG>OK</STRONG>.   Otherwise,  the
+       function returns <STRONG>ERR</STRONG>.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -151,7 +153,7 @@ <H1 class="no-header">curs_get_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index ae0fe1fe4..fcecf4cb7 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.34 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>get_wstr</STRONG>, <STRONG>getn_wstr</STRONG>, <STRONG>wget_wstr</STRONG>, <STRONG>wgetn_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>,
-       <STRONG>mvwget_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG> - get an array of wide characters from a
-       curses terminal keyboard
+       <STRONG>get_wstr</STRONG>,  <STRONG>getn_wstr</STRONG>,  <STRONG>wget_wstr</STRONG>,  <STRONG>wgetn_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>,
+       <STRONG>mvwget_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG> - get a wide-character string from  a  <EM>curses</EM>
+       terminal keyboard
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -101,30 +101,31 @@ <H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
            cursor at the beginning of the buffer.
 
        Characters input are echoed only if <STRONG>echo</STRONG>  is  currently  on.   In  that
-       case,  backspace is echoed as deletion of the previous character (typi-
-       cally a left motion).
+       case,  backspace  is  echoed  as  deletion  of  the  previous character
+       (typically a left motion).
 
        The <STRONG>getn_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG>, and <STRONG>wgetn_wstr</STRONG> functions  are
-       identical to the <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, and <STRONG>wget_wstr</STRONG> func-
-       tions, respectively, except that the <STRONG>*n_*</STRONG> versions read at most <EM>n</EM> char-
-       acters, letting the application prevent overflow of the input buffer.
+       identical  to  the  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>,  and <STRONG>wget_wstr</STRONG>
+       functions, respectively, except that the <STRONG>*n_*</STRONG> versions read at  most  <EM>n</EM>
+       characters,  letting  the  application  prevent  overflow  of the input
+       buffer.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
 
-       Using  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to read a line
-       that overflows the array pointed to by <STRONG>wstr</STRONG> causes  undefined  results.
-       The use of <STRONG>getn_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG>, or <STRONG>wgetn_wstr</STRONG>, respec-
-       tively, is recommended.
+       Using <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to  read  a  line
+       that  overflows  the array pointed to by <STRONG>wstr</STRONG> causes undefined results.
+       The  use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or   <STRONG>wgetn_wstr</STRONG>,
+       respectively, is recommended.
 
-       These functions cannot return <STRONG>KEY_</STRONG> values because there is  no  way  to
+       These  functions  cannot  return <STRONG>KEY_</STRONG> values because there is no way to
        distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.  may be macros.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  these  functions return the integer <STRONG>OK</STRONG> upon successful comple-
-       tion.  If unsuccessful, they return <STRONG>ERR</STRONG>.
+       All  of  these  functions  return  the  integer  <STRONG>OK</STRONG>   upon   successful
+       completion.  If unsuccessful, they return <STRONG>ERR</STRONG>.
 
        X/Open defines no error conditions.
 
@@ -136,7 +137,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wget_wch</STRONG> failed.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -145,39 +146,39 @@ <H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
 
-       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
-       the lower-level <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter  case,  an
-       <STRONG>ERR</STRONG>  return  without other data is treated as an end-of-file condition,
+       This implementation returns <STRONG>ERR</STRONG> if the window pointer is  null,  or  if
+       the  lower-level  <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter case, an
+       <STRONG>ERR</STRONG> return without other data is treated as an  end-of-file  condition,
        and the returned array contains a <STRONG>WEOF</STRONG> followed by a null <STRONG>wchar_t</STRONG>.
 
        X/Open curses documented these functions to pass an array of <STRONG>wchar_t</STRONG> in
        1997, but that was an error because of this part of the description:
 
               The effect of <STRONG>get_wstr</STRONG> is as though a series of calls to <STRONG>get_wch</STRONG>
-              were made, until a newline character, end-of-line character,  or
+              were  made, until a newline character, end-of-line character, or
               end-of-file character is processed.
 
-       The  latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while <STRONG>wchar_t</STRONG>
-       is a unsigned type.  All of the vendors implement  this  using  <STRONG>wint_t</STRONG>,
+       The latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while  <STRONG>wchar_t</STRONG>
+       is  a  unsigned  type.  All of the vendors implement this using <STRONG>wint_t</STRONG>,
        following the standard.
 
-       X/Open  Curses,  Issue 7 (2009) is unclear regarding whether the termi-
-       nating <EM>null</EM> <STRONG>wchar_t</STRONG> value is counted in the length parameter <EM>n</EM>.  X/Open
-       Curses,  Issue  7  revised the corresponding description of <STRONG>wgetnstr</STRONG> to
-       address this issue.  The unrevised description of <STRONG>wget_nwstr</STRONG> can be in-
-       terpreted either way.  This implementation counts the terminator in the
-       length.
+       X/Open  Curses,  Issue  7  (2009)  is  unclear  regarding  whether  the
+       terminating  <EM>null</EM>  <STRONG>wchar_t</STRONG>  value is counted in the length parameter <EM>n</EM>.
+       X/Open  Curses,  Issue  7  revised  the  corresponding  description  of
+       <STRONG>wgetnstr</STRONG>   to   address  this  issue.   The  unrevised  description  of
+       <STRONG>wget_nwstr</STRONG> can be interpreted either way.  This  implementation  counts
+       the terminator in the length.
 
-       X/Open Curses does not specify what happens if the length  <EM>n</EM>  is  nega-
-       tive.
+       X/Open  Curses  does  not  specify  what  happens  if  the  length <EM>n</EM> is
+       negative.
 
-       <STRONG>o</STRONG>   For  analogy  with  <STRONG>wgetnstr</STRONG>,  ncurses  6.2  uses a limit (based on
+       <STRONG>o</STRONG>   For analogy with <STRONG>wgetnstr</STRONG>, ncurses  6.2  uses  a  limit  (based  on
            <STRONG>LINE_MAX</STRONG>).
 
-       <STRONG>o</STRONG>   Some other implementations (such as Solaris xcurses) do  the  same,
+       <STRONG>o</STRONG>   Some  other  implementations (such as Solaris xcurses) do the same,
            while others (PDCurses) do not allow this.
 
-       <STRONG>o</STRONG>   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a <STRONG>-1</STRONG>
+       <STRONG>o</STRONG>   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  <STRONG>-1</STRONG>
            as an indefinite number of characters.
 
 
@@ -186,7 +187,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 835bb8413..495de787a 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.31 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.35 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>getcchar</STRONG>,  <STRONG>setcchar</STRONG>  - Get a wide character string and rendition from a
-       <STRONG>cchar_t</STRONG> or set a <STRONG>cchar_t</STRONG> from a wide-character string
+       <STRONG>getcchar</STRONG>,  <STRONG>setcchar</STRONG>  -  convert  between  a wide-character string and a
+       <EM>curses</EM> complex character string
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index f57249c33..a1d876057 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.68 2023/08/19 20:45:12 tom Exp @
+  * @Id: curs_getch.3x,v 1.72 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -49,7 +49,7 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>, <STRONG>ungetch</STRONG>, <STRONG>has_key</STRONG> - get (or push back)
-       characters from <STRONG>curses</STRONG> terminal keyboard
+       characters from <EM>curses</EM> terminal keyboard
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -75,19 +75,19 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        returned.  In delay mode, the program waits  until  the  system  passes
        text  through to the program.  Depending on the setting of <STRONG>cbreak</STRONG>, this
        is after one character  (cbreak  mode),  or  after  the  first  newline
-       (nocbreak mode).  In half-delay mode, the program waits until a charac-
-       ter is typed or the specified timeout has been reached.
+       (nocbreak  mode).   In  half-delay  mode,  the  program  waits  until a
+       character is typed or the specified timeout has been reached.
 
        If <STRONG>echo</STRONG> is enabled, and the window is not a  pad,  then  the  character
-       will also be echoed into the designated window according to the follow-
-       ing rules:
+       will  also  be  echoed  into  the  designated  window  according to the
+       following rules:
 
        <STRONG>o</STRONG>   If the character is the current erase  character,  left  arrow,  or
            backspace,  the  cursor  is  moved  one  space to the left and that
            screen position is erased as if <STRONG>delch</STRONG> had been called.
 
-       <STRONG>o</STRONG>   If the character value is any other <STRONG>KEY_</STRONG> define, the user is alert-
-           ed with a <STRONG>beep</STRONG> call.
+       <STRONG>o</STRONG>   If the character value is  any  other  <STRONG>KEY_</STRONG>  define,  the  user  is
+           alerted with a <STRONG>beep</STRONG> call.
 
        <STRONG>o</STRONG>   If  the character is a carriage-return, and if <STRONG>nl</STRONG> is enabled, it is
            translated to a line-feed after echoing.
@@ -104,36 +104,36 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        function key is returned instead of the raw characters:
 
        <STRONG>o</STRONG>   The  predefined  function  keys  are listed in <STRONG>&lt;curses.h&gt;</STRONG> as macros
-           with values outside the range of 8-bit characters.  Their names be-
-           gin with <STRONG>KEY_</STRONG>.
+           with values outside the range of  8-bit  characters.   Their  names
+           begin with <STRONG>KEY_</STRONG>.
 
-       <STRONG>o</STRONG>   Other  (user-defined)  function keys which may be defined using <STRONG>de-</STRONG>
-           <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG> have no names, but also are expected  to  have  values
+       <STRONG>o</STRONG>   Other  (user-defined)  function  keys  which  may  be defined using
+           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> have no names, but also are expected to have  values
            outside the range of 8-bit characters.
 
        Thus,  a  variable  intended to hold the return value of a function key
        must be of short size or larger.
 
-       When a character that could be the beginning of a function key  is  re-
-       ceived  (which, on modern terminals, means an escape character), <STRONG>curses</STRONG>
-       sets a timer.  If the remainder of the sequence does not come in within
-       the  designated  time,  the character is passed through; otherwise, the
-       function key value is returned.  For this reason, many terminals  expe-
-       rience  a  delay between the time a user presses the escape key and the
-       escape is returned to the program.
+       When a character that could be the  beginning  of  a  function  key  is
+       received  (which,  on  modern  terminals,  means  an escape character),
+       <STRONG>curses</STRONG> sets a timer.  If the remainder of the sequence does not come in
+       within the designated time, the character is passed through; otherwise,
+       the function key value is returned.  For this  reason,  many  terminals
+       experience  a  delay between the time a user presses the escape key and
+       the escape is returned to the program.
 
        In <STRONG>ncurses</STRONG>, the timer normally expires after the value in <STRONG>ESCDELAY</STRONG> (see
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).   If <STRONG>notimeout</STRONG> is <STRONG>TRUE</STRONG>, the timer does not expire;
        it is an infinite (or very large) value.  Because function keys usually
-       begin  with an escape character, the terminal may appear to hang in no-
-       timeout mode after  pressing  the  escape  key  until  another  key  is
+       begin  with  an  escape  character,  the terminal may appear to hang in
+       notimeout mode after pressing the  escape  key  until  another  key  is
        pressed.
 
 
 </PRE><H3><a name="h3-Ungetting-characters">Ungetting characters</a></H3><PRE>
        The  <STRONG>ungetch</STRONG> routine places <EM>ch</EM> back onto the input queue to be returned
-       by the next call to <STRONG>wgetch</STRONG>.  There is just one input queue for all win-
-       dows.
+       by the next call to <STRONG>wgetch</STRONG>.  There is just  one  input  queue  for  all
+       windows.
 
 
 </PRE><H3><a name="h3-Predefined-key-codes">Predefined key-codes</a></H3><PRE>
@@ -142,13 +142,13 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Except  for  the special case <STRONG>KEY_RESIZE</STRONG>, it is necessary to enable
            <STRONG>keypad</STRONG> for <STRONG>getch</STRONG> to return these codes.
 
-       <STRONG>o</STRONG>   Not all of these are necessarily supported on any particular termi-
-           nal.
+       <STRONG>o</STRONG>   Not all of  these  are  necessarily  supported  on  any  particular
+           terminal.
 
-       <STRONG>o</STRONG>   The  naming  convention  may  seem obscure, with some apparent mis-
-           spellings (such as "RSUME" for "resume").  The names correspond  to
-           the  long  terminfo capability names for the keys, and were defined
-           long ago, in the 1980s.
+       <STRONG>o</STRONG>   The   naming  convention  may  seem  obscure,  with  some  apparent
+           misspellings (such as "RSUME" for "resume").  The names  correspond
+           to  the  long  terminfo  capability  names  for  the keys, and were
+           defined long ago, in the 1980s.
 
               <STRONG>Name</STRONG>            <STRONG>Key</STRONG> <STRONG>name</STRONG>
               -------------------------------------------------
@@ -263,15 +263,15 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
            whether or not <STRONG>keypad</STRONG> has been enabled.
 
        <STRONG>o</STRONG>   <STRONG>KEY_MOUSE</STRONG>  is returned for mouse-events (see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>).  This
-           code relies upon whether or not <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> has  been  enabled,  be-
-           cause  (e.g., with <STRONG>xterm(1)</STRONG> mouse prototocol) ncurses must read es-
-           cape sequences, just like a function key.
+           code relies upon  whether  or  not  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  has  been  enabled,
+           because  (e.g.,  with  <STRONG>xterm(1)</STRONG> mouse prototocol) ncurses must read
+           escape sequences, just like a function key.
 
 
 </PRE><H3><a name="h3-Testing-key-codes">Testing key-codes</a></H3><PRE>
-       The <STRONG>has_key</STRONG> routine takes a key-code value from the above list, and re-
-       turns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> according to whether the current terminal type rec-
-       ognizes a key with that value.
+       The <STRONG>has_key</STRONG> routine takes a key-code value from  the  above  list,  and
+       returns  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG> according to whether the current terminal type
+       recognizes a key with that value.
 
        The library also supports these extensions:
 
@@ -292,8 +292,8 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
           <STRONG>wgetch</STRONG>
                returns <STRONG>ERR</STRONG> if the window pointer is null, or  if  its  timeout
-               expires without having any data, or if the execution was inter-
-               rupted by a signal (<STRONG>errno</STRONG> will be set to <STRONG>EINTR</STRONG>).
+               expires  without  having  any  data,  or  if  the execution was
+               interrupted by a signal (<STRONG>errno</STRONG> will be set to <STRONG>EINTR</STRONG>).
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -305,85 +305,86 @@ <H1 class="no-header">curs_getch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        is  discouraged, as it will cause a delay of up to one second while the
        keypad code looks for a following function-key sequence.
 
-       Some keys may be the same as commonly used control keys, e.g.,  <STRONG>KEY_EN-</STRONG>
-       <STRONG>TER</STRONG>  versus control/M, <STRONG>KEY_BACKSPACE</STRONG> versus control/H.  Some curses im-
-       plementations may differ according to whether they treat these  control
-       keys  specially  (and ignore the terminfo), or use the terminfo defini-
-       tions.  <STRONG>Ncurses</STRONG> uses the terminfo definition.  If it says that  <STRONG>KEY_EN-</STRONG>
-       <STRONG>TER</STRONG> is control/M, <STRONG>getch</STRONG> will return <STRONG>KEY_ENTER</STRONG> when you press control/M.
+       Some keys may  be  the  same  as  commonly  used  control  keys,  e.g.,
+       <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG>  versus  control/H.   Some
+       curses implementations may differ according to whether they treat these
+       control  keys  specially (and ignore the terminfo), or use the terminfo
+       definitions.  <STRONG>Ncurses</STRONG> uses the terminfo definition.  If  it  says  that
+       <STRONG>KEY_ENTER</STRONG>  is  control/M,  <STRONG>getch</STRONG>  will  return <STRONG>KEY_ENTER</STRONG> when you press
+       control/M.
 
-       Generally,  <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the <EM>Enter</EM> key on
+       Generally, <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the <EM>Enter</EM> key  on
        the numeric keypad:
 
        <STRONG>o</STRONG>   the terminal description lists the most useful keys,
 
-       <STRONG>o</STRONG>   the <EM>Enter</EM> key on the regular keyboard is  already  handled  by  the
+       <STRONG>o</STRONG>   the  <EM>Enter</EM>  key  on  the regular keyboard is already handled by the
            standard ASCII characters for carriage-return and line-feed,
 
        <STRONG>o</STRONG>   depending on whether <STRONG>nl</STRONG> or <STRONG>nonl</STRONG> was called, pressing "Enter" on the
-           regular keyboard may return either a carriage-return or  line-feed,
+           regular  keyboard may return either a carriage-return or line-feed,
            and finally
 
        <STRONG>o</STRONG>   "Enter or send" is the standard description for this key.
 
-       When   using   <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,  or  <STRONG>mvwgetch</STRONG>,  nocbreak  mode
-       (<STRONG>nocbreak</STRONG>) and echo mode (<STRONG>echo</STRONG>) should not be used at  the  same  time.
-       Depending  on the state of the tty driver when each character is typed,
+       When  using  <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,  or  <STRONG>mvwgetch</STRONG>,   nocbreak   mode
+       (<STRONG>nocbreak</STRONG>)  and  echo  mode (<STRONG>echo</STRONG>) should not be used at the same time.
+       Depending on the state of the tty driver when each character is  typed,
        the program may produce undesirable results.
 
        Note that <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be macros.
 
-       Historically, the set of keypad macros was largely defined by  the  ex-
-       tremely  function-key-rich  keyboard of the AT&amp;T 7300, aka 3B1, aka Sa-
-       fari 4.  Modern personal computers usually have only a small subset  of
-       these.   IBM  PC-style  consoles  typically  support  little  more than
-       <STRONG>KEY_UP</STRONG>, <STRONG>KEY_DOWN</STRONG>, <STRONG>KEY_LEFT</STRONG>, <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,  <STRONG>KEY_NPAGE</STRONG>,
-       <STRONG>KEY_PPAGE</STRONG>,  and  function  keys  1  through 12.  The Ins key is usually
+       Historically,  the  set  of  keypad  macros  was largely defined by the
+       extremely function-key-rich keyboard of the AT&amp;T  7300,  aka  3B1,  aka
+       Safari  4.   Modern personal computers usually have only a small subset
+       of these.  IBM PC-style consoles typically  support  little  more  than
+       <STRONG>KEY_UP</STRONG>,  <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>, <STRONG>KEY_HOME</STRONG>, <STRONG>KEY_END</STRONG>, <STRONG>KEY_NPAGE</STRONG>,
+       <STRONG>KEY_PPAGE</STRONG>, and function keys 1 through 12.   The  Ins  key  is  usually
        mapped to <STRONG>KEY_IC</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The *get* functions are described in the XSI Curses standard, Issue  4.
-       They  read  single-byte  characters  only.  The standard specifies that
+       The  *get* functions are described in the XSI Curses standard, Issue 4.
+       They read single-byte characters only.   The  standard  specifies  that
        they return <STRONG>ERR</STRONG> on failure, but specifies no error conditions.
 
-       The echo behavior of these functions on  input  of  <STRONG>KEY_</STRONG>  or  backspace
-       characters  was not specified in the SVr4 documentation.  This descrip-
-       tion is adopted from the XSI Curses standard.
+       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
+       characters  was  not  specified  in  the  SVr4   documentation.    This
+       description is adopted from the XSI Curses standard.
 
        The behavior of <STRONG>getch</STRONG> and friends in the presence of handled signals is
        unspecified in the SVr4 and XSI Curses documentation.  Under historical
-       curses implementations, it varied depending on  whether  the  operating
-       system's  implementation of handled signal receipt interrupts a <STRONG>read(2)</STRONG>
-       call in progress or not, and also (in some  implementations)  depending
+       curses  implementations,  it  varied depending on whether the operating
+       system's implementation of handled signal receipt interrupts a  <STRONG>read(2)</STRONG>
+       call  in  progress or not, and also (in some implementations) depending
        on whether an input timeout or non-blocking mode has been set.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in XSI Curses, along with a few related terminfo
-       capabilities, but no higher-level functions use the feature.   The  im-
-       plementation in ncurses is an extension.
+       capabilities,  but  no  higher-level  functions  use  the feature.  The
+       implementation in ncurses is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> is an extension first implemented for ncurses.  NetBSD curs-
-       es later added this extension.
+       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  ncurses.   NetBSD
+       curses later added this extension.
 
-       Programmers concerned about portability should be prepared  for  either
-       of  two  cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>; (b) signal
-       receipt interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set  to
+       Programmers  concerned  about portability should be prepared for either
+       of two cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>;  (b)  signal
+       receipt  interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to
        <STRONG>EINTR</STRONG>.
 
-       The  <STRONG>has_key</STRONG> function is unique to <STRONG>ncurses</STRONG>.  We recommend that any code
+       The <STRONG>has_key</STRONG> function is unique to <STRONG>ncurses</STRONG>.  We recommend that any  code
        using it be conditionalized on the <STRONG>NCURSES_VERSION</STRONG> feature macro.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>, <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,  <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG>curs_out-</STRONG>
-       <STRONG><A HREF="curs_outopts.3x.html">opts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
+       Comparable functions  in  the  wide-character  (ncursesw)  library  are
+       described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-08-19                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 01c347fbd..ec8f83831 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp @
+  * @Id: curs_getstr.3x,v 1.46 2023/09/16 23:34:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>getstr</STRONG>, <STRONG>getnstr</STRONG>, <STRONG>wgetstr</STRONG>, <STRONG>wgetnstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetstr</STRONG>,
-       <STRONG>mvwgetnstr</STRONG> - accept character strings from <STRONG>curses</STRONG> terminal keyboard
+       <STRONG>getstr</STRONG>,  <STRONG>getnstr</STRONG>,  <STRONG>wgetstr</STRONG>,  <STRONG>wgetnstr</STRONG>,  <STRONG>mvgetstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetstr</STRONG>,
+       <STRONG>mvwgetnstr</STRONG> - accept character strings from <EM>curses</EM> terminal keyboard
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -96,28 +96,28 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
            cursor at the beginning of the buffer.
 
        Characters  input  are  echoed  only  if <STRONG>echo</STRONG> is currently on.  In that
-       case, backspace is echoed as deletion of the previous character  (typi-
-       cally a left motion).
+       case, backspace  is  echoed  as  deletion  of  the  previous  character
+       (typically a left motion).
 
-       The  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, and <STRONG>wgetnstr</STRONG> functions are identi-
-       cal to the <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, and <STRONG>wgetstr</STRONG> functions,  respec-
-       tively, except that the <STRONG>*n*</STRONG> versions read at most <EM>n</EM> characters, letting
-       the application prevent overflow of the input buffer.
+       The   <STRONG>getnstr</STRONG>,   <STRONG>mvgetnstr</STRONG>,  <STRONG>mvwgetnstr</STRONG>,  and  <STRONG>wgetnstr</STRONG>  functions  are
+       identical to the <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>,  and  <STRONG>wgetstr</STRONG>  functions,
+       respectively,  except  that the <STRONG>*n*</STRONG> versions read at most <EM>n</EM> characters,
+       letting the application prevent overflow of the input buffer.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
 
-       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or <STRONG>wgetstr</STRONG> to read a line that over-
-       flows the array pointed to by <STRONG>str</STRONG> causes undefined results.  The use of
-       <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or <STRONG>wgetnstr</STRONG>,  respectively,  is  recom-
-       mended.
+       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or  <STRONG>wgetstr</STRONG>  to  read  a  line  that
+       overflows  the  array  pointed to by <STRONG>str</STRONG> causes undefined results.  The
+       use of <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or  <STRONG>wgetnstr</STRONG>,  respectively,  is
+       recommended.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  these  functions return the integer <STRONG>OK</STRONG> upon successful comple-
-       tion.  (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")  If  un-
-       successful, they return <STRONG>ERR</STRONG>.
+       All   of   these  functions  return  the  integer  <STRONG>OK</STRONG>  upon  successful
+       completion.  (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") If
+       unsuccessful, they return <STRONG>ERR</STRONG>.
 
        X/Open defines no error conditions.
 
@@ -129,10 +129,11 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wgetch</STRONG> failed.
 
-       This  implementation  provides an extension as well.  If a <STRONG>SIGWINCH</STRONG> in-
-       terrupts the function, it will return <STRONG>KEY_RESIZE</STRONG> rather than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.
+       This  implementation  provides  an  extension  as  well.  If a <STRONG>SIGWINCH</STRONG>
+       interrupts the function, it will return <STRONG>KEY_RESIZE</STRONG> rather  than  <STRONG>OK</STRONG>  or
+       <STRONG>ERR</STRONG>.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -141,15 +142,16 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
 
-       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
+       This implementation returns <STRONG>ERR</STRONG> if the window pointer is  null,  or  if
        the lower-level <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call returns an <STRONG>ERR</STRONG>.
 
-       SVr3 and early SVr4 curses  implementations  did  not  reject  function
-       keys;  the  SVr4.0  documentation  claimed that "special keys" (such as
-       function keys, "home" key, "clear" key, <EM>etc</EM>.) are "interpreted",  with-
-       out  giving details.  It lied.  In fact, the "character" value appended
-       to the string by those implementations was predictable but  not  useful
-       (being, in fact, the low-order eight bits of the key's KEY_ value).
+       SVr3  and  early  SVr4  curses  implementations did not reject function
+       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
+       function  keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are "interpreted",
+       without giving details.  It  lied.   In  fact,  the  "character"  value
+       appended to the string by those implementations was predictable but not
+       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
+       value).
 
        The  functions  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present but not
        documented in SVr4.
@@ -165,71 +167,72 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 
-       <STRONG>o</STRONG>   Solaris  xcurses  provides  both:  its wide-character <STRONG>wget_nstr</STRONG> re-
-           serves a NUL, but its <STRONG>wgetnstr</STRONG> does not count the NUL consistently.
+       <STRONG>o</STRONG>   Solaris   xcurses   provides  both:  its  wide-character  <STRONG>wget_nstr</STRONG>
+           reserves  a  NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count   the   NUL
+           consistently.
 
        In SVr4 curses, a negative value of <EM>n</EM> tells <STRONG>wgetnstr</STRONG> to assume that the
-       caller's  buffer  is large enough to hold the result, i.e., to act like
-       <STRONG>wgetstr</STRONG>.  X/Open Curses does not mention this (or anything  related  to
-       negative  or  zero  values  of <EM>n</EM>), however most implementations use the
+       caller's buffer is large enough to hold the result, i.e., to  act  like
+       <STRONG>wgetstr</STRONG>.   X/Open  Curses does not mention this (or anything related to
+       negative or zero values of <EM>n</EM>), however  most  implementations  use  the
        feature, with different limits:
 
-       <STRONG>o</STRONG>   Solaris SVr4 curses and PDCurses limit the  result  to  255  bytes.
+       <STRONG>o</STRONG>   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
            Other Unix systems than Solaris are likely to use the same limit.
 
        <STRONG>o</STRONG>   Solaris xcurses limits the result to <STRONG>LINE_MAX</STRONG> bytes.
 
-       <STRONG>o</STRONG>   NetBSD  7  assumes no particular limit for the result from <STRONG>wgetstr</STRONG>.
-           However, it limits the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure  that  it  is
+       <STRONG>o</STRONG>   NetBSD 7 assumes no particular limit for the result  from  <STRONG>wgetstr</STRONG>.
+           However,  it  limits  the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure that it is
            greater than zero.
 
-           A  comment in NetBSD's source code states that this is specified in
+           A comment in NetBSD's source code states that this is specified  in
            SUSv2.
 
-       <STRONG>o</STRONG>   ncurses (before 6.2) assumes no particular  limit  for  the  result
-           from  <STRONG>wgetstr</STRONG>,  and  treats  the  <EM>n</EM> parameter of <STRONG>wgetnstr</STRONG> like SVr4
+       <STRONG>o</STRONG>   ncurses  (before  6.2)  assumes  no particular limit for the result
+           from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
            curses.
 
-       <STRONG>o</STRONG>   ncurses 6.2 uses <STRONG>LINE_MAX</STRONG>, or  a  larger  (system-dependent)  value
-           which  the  <STRONG>sysconf</STRONG>  function  may provide.  If neither <STRONG>LINE_MAX</STRONG> or
-           <STRONG>sysconf</STRONG> is available, ncurses uses the POSIX value for <STRONG>LINE_MAX</STRONG>  (a
-           2048  byte limit).  In either case, it reserves a byte for the ter-
-           minating NUL.
+       <STRONG>o</STRONG>   ncurses  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
+           which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
+           <STRONG>sysconf</STRONG>  is available, ncurses uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
+           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
+           terminating NUL.
 
-       Although <STRONG>getnstr</STRONG> is equivalent to a series of calls to <STRONG>getch</STRONG>,  it  also
-       makes  changes to the curses modes to allow simple editing of the input
+       Although  <STRONG>getnstr</STRONG>  is equivalent to a series of calls to <STRONG>getch</STRONG>, it also
+       makes changes to the curses modes to allow simple editing of the  input
        buffer:
 
-       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG> saves the current value of the <STRONG>nl</STRONG>,  <STRONG>echo</STRONG>,  <STRONG>raw</STRONG>  and  <STRONG>cbreak</STRONG>
+       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG>  saves  the  current  value of the <STRONG>nl</STRONG>, <STRONG>echo</STRONG>, <STRONG>raw</STRONG> and <STRONG>cbreak</STRONG>
            modes, and sets <STRONG>nl</STRONG>, <STRONG>noecho</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>cbreak</STRONG>.
 
-           <STRONG>getnstr</STRONG>  handles  the echoing of characters, rather than relying on
+           <STRONG>getnstr</STRONG> handles the echoing of characters, rather than  relying  on
            the caller to set an appropriate mode.
 
-       <STRONG>o</STRONG>   It also obtains the <EM>erase</EM> and <EM>kill</EM> characters  from  <STRONG>erasechar</STRONG>  and
+       <STRONG>o</STRONG>   It  also  obtains  the <EM>erase</EM> and <EM>kill</EM> characters from <STRONG>erasechar</STRONG> and
            <STRONG>killchar</STRONG>, respectively.
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
 
        Other implementations differ in their treatment of special characters:
 
-       <STRONG>o</STRONG>   While they may set the <EM>echo</EM> mode, other implementations do not mod-
-           ify the <EM>raw</EM> mode, They may take the <EM>cbreak</EM> mode set by  the  caller
-           into account when deciding whether to handle echoing within <STRONG>getnstr</STRONG>
-           or as a side-effect of the <STRONG>getch</STRONG> calls.
+       <STRONG>o</STRONG>   While they may set the <EM>echo</EM>  mode,  other  implementations  do  not
+           modify  the  <EM>raw</EM>  mode,  They  may  take the <EM>cbreak</EM> mode set by the
+           caller into account when deciding whether to handle echoing  within
+           <STRONG>getnstr</STRONG> or as a side-effect of the <STRONG>getch</STRONG> calls.
 
        <STRONG>o</STRONG>   The original ncurses (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
-           accepting input for <STRONG>getnstr</STRONG>.  That may have been done to make func-
-           tion- and cursor-keys work; it is not necessary with ncurses.
+           accepting input for <STRONG>getnstr</STRONG>.  That  may  have  been  done  to  make
+           function- and cursor-keys work; it is not necessary with ncurses.
 
-           Since 1995, ncurses has provided signal handlers for INTR and  QUIT
-           (e.g.,  <STRONG>^C</STRONG>  or  <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> settings, those may
-           catch a signal and stop the program,  where  other  implementations
+           Since  1995, ncurses has provided signal handlers for INTR and QUIT
+           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
+           catch  a  signal  and stop the program, where other implementations
            allow one to enter those characters in the buffer.
 
        <STRONG>o</STRONG>   Starting in 2021 (ncurses 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
-           and <STRONG>cbreak</STRONG> for better compatibility with SVr4-curses, e.g.,  allow-
-           ing one to enter a <STRONG>^C</STRONG> into the buffer.
+           and   <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,  e.g.,
+           allowing one to enter a <STRONG>^C</STRONG> into the buffer.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -237,7 +240,7 @@ <H1 class="no-header">curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-05                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index e3a541e0b..07ca999e0 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.27 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_getyx.3x,v 1.31 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>getyx</STRONG>,  <STRONG>getparyx</STRONG>,  <STRONG>getbegyx</STRONG>,  <STRONG>getmaxyx</STRONG>  -  get <STRONG>curses</STRONG> cursor and window
+       <STRONG>getyx</STRONG>,  <STRONG>getparyx</STRONG>,  <STRONG>getbegyx</STRONG>,  <STRONG>getmaxyx</STRONG>  -  get <EM>curses</EM> cursor and window
        coordinates
 
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 5121de3e6..2ac24bf38 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.14 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>in_wch</STRONG>,  <STRONG>mvin_wch</STRONG>, <STRONG>mvwin_wch</STRONG>, <STRONG>win_wch</STRONG> - extract a complex character and
-       rendition from a window
+       <STRONG>in_wch</STRONG>,  <STRONG>mvin_wch</STRONG>,  <STRONG>mvwin_wch</STRONG>, <STRONG>win_wch</STRONG> - get a <EM>curses</EM> complex character
+       from a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -91,7 +91,7 @@ <H1 class="no-header">curs_in_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index eec27b648..fbdee5ed9 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>in_wchstr</STRONG>, <STRONG>in_wchnstr</STRONG>, <STRONG>win_wchstr</STRONG>, <STRONG>win_wchnstr</STRONG>, <STRONG>mvin_wchstr</STRONG>,
-       <STRONG>mvin_wchnstr</STRONG>, <STRONG>mvwin_wchstr</STRONG>, <STRONG>mvwin_wchnstr</STRONG> - get an array of complex
-       characters and renditions from a curses window
+       <STRONG>in_wchstr</STRONG>,    <STRONG>in_wchnstr</STRONG>,    <STRONG>win_wchstr</STRONG>,    <STRONG>win_wchnstr</STRONG>,   <STRONG>mvin_wchstr</STRONG>,
+       <STRONG>mvin_wchnstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>,  <STRONG>mvwin_wchnstr</STRONG>  -  get  a  <EM>curses</EM>  complex
+       character string from a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,9 +67,9 @@ <H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions return an array of complex characters in <EM>wchstr</EM>, start-
-       ing at the current cursor position in  the  named  window.   Attributes
-       (rendition) are stored with the characters.
+       These  functions  return  an  array  of  complex  characters in <EM>wchstr</EM>,
+       starting  at  the  current  cursor  position  in  the   named   window.
+       Attributes (rendition) are stored with the characters.
 
        The  <STRONG>in_wchnstr</STRONG>,  <STRONG>mvin_wchnstr</STRONG>,  <STRONG>mvwin_wchnstr</STRONG> and <STRONG>win_wchnstr</STRONG> fill the
        array with at most <EM>n</EM> <STRONG>cchar_t</STRONG> elements.
@@ -79,9 +79,9 @@ <H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1
        Note that all routines except <STRONG>win_wchnstr</STRONG> may be macros.
 
        Reading a line that overflows the  array  pointed  to  by  <EM>wchstr</EM>  with
-       <STRONG>in_wchstr</STRONG>, <STRONG>mvin_wchstr</STRONG>, <STRONG>mvwin_wchstr</STRONG> or <STRONG>win_wchstr</STRONG> causes undefined re-
-       sults.  Therefore, the use of <STRONG>in_wchnstr</STRONG>, <STRONG>mvin_wchnstr</STRONG>,  <STRONG>mvwin_wchnstr</STRONG>,
-       or <STRONG>win_wchnstr</STRONG> is recommended.
+       <STRONG>in_wchstr</STRONG>,  <STRONG>mvin_wchstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG> causes undefined
+       results.    Therefore,   the   use   of    <STRONG>in_wchnstr</STRONG>,    <STRONG>mvin_wchnstr</STRONG>,
+       <STRONG>mvwin_wchnstr</STRONG>, or <STRONG>win_wchnstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2022-02-12 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2022-02-12                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index c1b9cbe96..0f767a7a0 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.33 2023/08/19 20:46:33 tom Exp @
+  * @Id: curs_inch.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -48,8 +48,7 @@ <H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>inch</STRONG>,  <STRONG>winch</STRONG>,  <STRONG>mvinch</STRONG>,  <STRONG>mvwinch</STRONG> - get a character and attributes from a
-       <STRONG>curses</STRONG> window
+       <STRONG>inch</STRONG>, <STRONG>winch</STRONG>, <STRONG>mvinch</STRONG>, <STRONG>mvwinch</STRONG> - get a <EM>curses</EM> character from a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -63,15 +62,15 @@ <H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines return the character, of type  <STRONG>chtype</STRONG>,  at  the  current
-       position  in  the  named  window.   If  any attributes are set for that
-       position, their values are OR'ed into the  value  returned.   Constants
-       defined  in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical AND) operator to
+       These  routines  return  the  character, of type <STRONG>chtype</STRONG>, at the current
+       position in the named window.  If  any  attributes  are  set  for  that
+       position,  their  values  are OR'ed into the value returned.  Constants
+       defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical AND) operator  to
        extract the character or attributes alone.
 
 
 </PRE><H3><a name="h3-Attributes">Attributes</a></H3><PRE>
-       The following bit-masks may  be  AND-ed  with  characters  returned  by
+       The  following  bit-masks  may  be  AND-ed  with characters returned by
        <STRONG>winch</STRONG>.
 
        <STRONG>A_CHARTEXT</STRONG>     Bit-mask to extract character
@@ -80,12 +79,12 @@ <H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
-       The  <STRONG>winch</STRONG>  function  does  not  return an error if the window contains
-       characters larger than 8-bits (255).  Only the low-order 8 bits of  the
+       The <STRONG>winch</STRONG> function does not return an  error  if  the  window  contains
+       characters  larger than 8-bits (255).  Only the low-order 8 bits of the
        character are used by <STRONG>winch</STRONG>.
 
 
@@ -96,26 +95,26 @@ <H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       Very  old systems (before standardization) provide a different function
+       Very old systems (before standardization) provide a different  function
        with the same name:
 
-       <STRONG>o</STRONG>   The <STRONG>winch</STRONG> function was part of the  original  BSD  curses  library,
-           which   stored   a  7-bit  character  combined  with  the  <EM>standout</EM>
+       <STRONG>o</STRONG>   The  <STRONG>winch</STRONG>  function  was  part of the original BSD curses library,
+           which  stored  a  7-bit  character  combined  with   the   <EM>standout</EM>
            attribute.
 
-           In BSD curses, <STRONG>winch</STRONG> returned only the character  (as  an  integer)
+           In  BSD  curses,  <STRONG>winch</STRONG> returned only the character (as an integer)
            with the <EM>standout</EM> attribute removed.
 
-       <STRONG>o</STRONG>   System  V  curses  added support for several video attributes which
+       <STRONG>o</STRONG>   System V curses added support for several  video  attributes  which
            could be combined with characters in the window.
 
            Reflecting this improvement, the function was altered to return the
            character combined with all video attributes in a <STRONG>chtype</STRONG> value.
 
        X/Open Curses does not specify the size and layout of attributes, color
-       and character values in <STRONG>chtype</STRONG>; it is  implementation-dependent.   This
-       implementation  uses 8 bits for character values.  An application using
-       more bits,  e.g.,  a  Unicode  value,  should  use  the  wide-character
+       and  character  values in <STRONG>chtype</STRONG>; it is implementation-dependent.  This
+       implementation uses 8 bits for character values.  An application  using
+       more  bits,  e.g.,  a  Unicode  value,  should  use  the wide-character
        equivalents to these functions.
 
 
@@ -124,16 +123,16 @@ <H1 class="no-header">curs_inch 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             gives an overview of the WINDOW and <STRONG>chtype</STRONG> data types.
 
        <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-            goes  into  more  detail,  pointing  out  portability problems and
+            goes into more  detail,  pointing  out  portability  problems  and
             constraints on the use of <STRONG>chtype</STRONG> for returning window information.
 
        <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
-            describes comparable functions for the  wide-character  (ncursesw)
+            describes  comparable  functions for the wide-character (ncursesw)
             library.
 
 
 
-ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 42b5f7a9b..dc15d90fb 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.28 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.32 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -47,9 +47,8 @@ <H1 class="no-header">curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>inchstr</STRONG>, <STRONG>inchnstr</STRONG>, <STRONG>winchstr</STRONG>, <STRONG>winchnstr</STRONG>, <STRONG>mvinchstr</STRONG>, <STRONG>mvinchnstr</STRONG>,
-       <STRONG>mvwinchstr</STRONG>, <STRONG>mvwinchnstr</STRONG> - get a string of characters (and attributes)
-       from a <STRONG>curses</STRONG> window
+       <STRONG>inchstr</STRONG>,   <STRONG>inchnstr</STRONG>,   <STRONG>winchstr</STRONG>,   <STRONG>winchnstr</STRONG>,   <STRONG>mvinchstr</STRONG>,  <STRONG>mvinchnstr</STRONG>,
+       <STRONG>mvwinchstr</STRONG>, <STRONG>mvwinchnstr</STRONG> - get a <EM>curses</EM> character string from a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,20 +66,20 @@ <H1 class="no-header">curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  routines  return  a  NULL-terminated array of <STRONG>chtype</STRONG> quantities,
-       starting at the current cursor position in the named window and  ending
-       at  the  right  margin of the window.  The four functions with <EM>n</EM> as the
-       last argument, return a leading substring at  most  <EM>n</EM>  characters  long
+       These routines return a NULL-terminated  array  of  <STRONG>chtype</STRONG>  quantities,
+       starting  at the current cursor position in the named window and ending
+       at the right margin of the window.  The four functions with  <EM>n</EM>  as  the
+       last  argument,  return  a  leading substring at most <EM>n</EM> characters long
        (exclusive of the trailing (chtype)0).  Constants defined in <STRONG>&lt;curses.h&gt;</STRONG>
-       can be used with the <STRONG>&amp;</STRONG> (logical AND) operator to extract the  character
-       or   the   attribute   alone  from  any  position  in  the  <EM>chstr</EM>  [see
+       can  be used with the <STRONG>&amp;</STRONG> (logical AND) operator to extract the character
+       or  the  attribute  alone  from  any  position  in   the   <EM>chstr</EM>   [see
        <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>].
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and an  integer  value
-       other than <STRONG>ERR</STRONG> upon successful completion (the number of characters re-
-       trieved, exclusive of the trailing 0).
+       All  routines  return the integer <STRONG>ERR</STRONG> upon failure and an integer value
+       other than <STRONG>ERR</STRONG> upon successful completion  (the  number  of  characters
+       retrieved, exclusive of the trailing 0).
 
        X/Open Curses defines no error conditions.  In this implementation:
 
@@ -88,33 +87,33 @@ <H1 class="no-header">curs_inchstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   If the <EM>chstr</EM> parameter is null, an error is returned,
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all routines except <STRONG>winchnstr</STRONG> may be macros.  SVr4  does  not
-       document whether the result string is zero-terminated; it does not doc-
-       ument whether a length limit argument includes any trailing 0;  and  it
-       does not document the meaning of the return value.
+       Note  that  all routines except <STRONG>winchnstr</STRONG> may be macros.  SVr4 does not
+       document whether the result string  is  zero-terminated;  it  does  not
+       document  whether  a length limit argument includes any trailing 0; and
+       it does not document the meaning of the return value.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in the XSI Curses standard, Issue 4.  It
-       is no more specific than the SVr4 documentation on the trailing 0.   It
+       These functions are described in the XSI Curses standard, Issue 4.   It
+       is  no more specific than the SVr4 documentation on the trailing 0.  It
        does specify that the successful return of the functions is <STRONG>OK</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>.
+       Comparable functions  in  the  wide-character  (ncursesw)  library  are
+       described in <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 81d931185..760d464ab 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.45 2023/08/19 19:46:20 tom Exp @
+  * @Id: curs_initscr.3x,v 1.50 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>initscr</STRONG>, <STRONG>newterm</STRONG>, <STRONG>endwin</STRONG>, <STRONG>isendwin</STRONG>, <STRONG>set_term</STRONG>, <STRONG>delscreen</STRONG> - <STRONG>curses</STRONG> screen
-       initialization and manipulation routines
+       <STRONG>initscr</STRONG>,  <STRONG>newterm</STRONG>,  <STRONG>endwin</STRONG>, <STRONG>isendwin</STRONG>, <STRONG>set_term</STRONG>, <STRONG>delscreen</STRONG> - initialize,
+       manipulate, or tear down <EM>curses</EM> terminal interface
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -72,11 +72,11 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        it; these are <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>, <STRONG>filter</STRONG>, <STRONG>ripoffline</STRONG>, <STRONG>use_env</STRONG>.  For multiple-
        terminal applications, <STRONG>newterm</STRONG> may be called before <STRONG>initscr</STRONG>.
 
-       The initscr code determines the terminal type and initializes all <STRONG>curs-</STRONG>
-       <STRONG>es</STRONG> data structures.  <STRONG>initscr</STRONG> also causes the first call to  <STRONG><A HREF="curscurs_refresh.3x.html">refresh(3x)</A></STRONG>
-       to  clear  the  screen.  If errors occur, <STRONG>initscr</STRONG> writes an appropriate
-       error message to standard error and exits; otherwise, a pointer is  re-
-       turned to <STRONG>stdscr</STRONG>.
+       The  initscr  code  determines  the  terminal  type and initializes all
+       <STRONG>curses</STRONG>  data  structures.   <STRONG>initscr</STRONG>  also  causes  the  first  call  to
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to  clear  the screen.  If errors occur, <STRONG>initscr</STRONG> writes an
+       appropriate error message to standard error  and  exits;  otherwise,  a
+       pointer is returned to <STRONG>stdscr</STRONG>.
 
 
 </PRE><H3><a name="h3-newterm">newterm</a></H3><PRE>
@@ -86,9 +86,9 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        if the terminal cannot support a screen-oriented  program,  would  also
        use <STRONG>newterm</STRONG>.
 
-       The  routine  <STRONG>newterm</STRONG>  should be called once for each terminal.  It re-
-       turns a variable of type <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> which should be saved as a  reference
-       to that terminal.  <STRONG>newterm</STRONG>'s arguments are
+       The  routine  <STRONG>newterm</STRONG>  should  be  called  once  for each terminal.  It
+       returns a variable of  type  <STRONG>SCREEN</STRONG>  <STRONG>*</STRONG>  which  should  be  saved  as  a
+       reference to that terminal.  <STRONG>newterm</STRONG>'s arguments are
 
        <STRONG>o</STRONG>   the <EM>type</EM> of the terminal to be used in place of <STRONG>$TERM</STRONG>,
 
@@ -99,8 +99,8 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        If the <EM>type</EM> parameter is <STRONG>NULL</STRONG>, <STRONG>$TERM</STRONG> will be used.
 
        The  file  descriptor  of the output stream is passed to <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>,
-       which returns a pointer to a <STRONG>TERMINAL</STRONG> structure.  <STRONG>newterm</STRONG>'s return val-
-       ue holds a pointer to the <STRONG>TERMINAL</STRONG> structure.
+       which returns a pointer to  a  <STRONG>TERMINAL</STRONG>  structure.   <STRONG>newterm</STRONG>'s  return
+       value holds a pointer to the <STRONG>TERMINAL</STRONG> structure.
 
 
 </PRE><H3><a name="h3-endwin">endwin</a></H3><PRE>
@@ -116,13 +116,13 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   moves the cursor to the lower left-hand corner of the screen,
 
-       <STRONG>o</STRONG>   clears  the  remainder of the line so that it uses the default col-
-           ors,
+       <STRONG>o</STRONG>   clears  the  remainder  of  the  line  so  that it uses the default
+           colors,
 
        <STRONG>o</STRONG>   sets the cursor to normal visibility (see <STRONG><A HREF="curs_kernel.3x.html">curs_set(3x)</A></STRONG>),
 
-       <STRONG>o</STRONG>   stops cursor-addressing mode using the <EM>exit</EM><STRONG>_</STRONG><EM>ca</EM><STRONG>_</STRONG><EM>mode</EM> terminal  capa-
-           bility,
+       <STRONG>o</STRONG>   stops  cursor-addressing  mode  using  the  <EM>exit</EM><STRONG>_</STRONG><EM>ca</EM><STRONG>_</STRONG><EM>mode</EM>   terminal
+           capability,
 
        <STRONG>o</STRONG>   restores tty modes (see <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG>).
 
@@ -137,8 +137,8 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-set_term">set_term</a></H3><PRE>
        The  <STRONG>set_term</STRONG>  routine  is  used to switch between different terminals.
-       The screen reference <EM>new</EM> becomes the new current terminal.  The  previ-
-       ous  terminal  is  returned  by  the routine.  This is the only routine
+       The screen  reference  <EM>new</EM>  becomes  the  new  current  terminal.   The
+       previous terminal is returned by the routine.  This is the only routine
        which manipulates <STRONG>SCREEN</STRONG> pointers; all other routines affect  only  the
        current terminal.
 
@@ -150,8 +150,8 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>endwin</STRONG> returns the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon successful com-
-       pletion.
+       <STRONG>endwin</STRONG>  returns  the  integer  <STRONG>ERR</STRONG>  upon failure and <STRONG>OK</STRONG> upon successful
+       completion.
 
        Routines that return pointers always return <STRONG>NULL</STRONG> on error.
 
@@ -188,9 +188,9 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG>newterm</STRONG>.  Deleting a <STRONG>SCREEN</STRONG> provides a way to do this:
 
        <STRONG>o</STRONG>   X/Open Curses does not say what happens to <STRONG>WINDOW</STRONG>s  when  <STRONG>delscreen</STRONG>
-           "frees  storage associated with the <STRONG>SCREEN</STRONG>" nor does the SVr4 docu-
-           mentation help, adding that it should be called after <STRONG>endwin</STRONG>  if  a
-           <STRONG>SCREEN</STRONG> is no longer needed.
+           "frees  storage  associated  with  the  <STRONG>SCREEN</STRONG>"  nor  does the SVr4
+           documentation help, adding that it should be called after <STRONG>endwin</STRONG> if
+           a <STRONG>SCREEN</STRONG> is no longer needed.
 
        <STRONG>o</STRONG>   However,  <STRONG>WINDOW</STRONG>s are implicitly associated with a <STRONG>SCREEN</STRONG>.  so that
            it is reasonable to expect <STRONG>delscreen</STRONG> to deal with these.
@@ -199,9 +199,9 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
            <STRONG>curscr</STRONG>  as  well  as a work area <STRONG>newscr</STRONG>.  SVr4 curses ignores other
            windows.
 
-       <STRONG>o</STRONG>   Since version 4.0 (1996), ncurses has maintained a list of all win-
-           dows  for  each screen, using that information to delete those win-
-           dows when <STRONG>delscreen</STRONG> is called.
+       <STRONG>o</STRONG>   Since version 4.0 (1996), ncurses has  maintained  a  list  of  all
+           windows  for  each  screen,  using that information to delete those
+           windows when <STRONG>delscreen</STRONG> is called.
 
        <STRONG>o</STRONG>   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
            the SVr4 model, deleting only the standard <STRONG>WINDOW</STRONG> structures.
@@ -209,12 +209,12 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-High-level-versus-low-level">High-level versus low-level</a></H3><PRE>
        Different  implementations  may  disagree  regarding  the level of some
-       functions.  For example, <STRONG>SCREEN</STRONG> (returned by <STRONG>newterm</STRONG>) and <STRONG>TERMINAL</STRONG> (re-
-       turned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>) hold file descriptors for the output stream.
-       If an application switches screens using <STRONG>set_term</STRONG>, or  switches  termi-
-       nals  using <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>, applications which use the output file de-
-       scriptor can have different behavior depending on which structure holds
-       the corresponding descriptor.
+       functions.  For example, <STRONG>SCREEN</STRONG>  (returned  by  <STRONG>newterm</STRONG>)  and  <STRONG>TERMINAL</STRONG>
+       (returned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>)  hold  file  descriptors  for  the output
+       stream.  If an application switches screens using <STRONG>set_term</STRONG>, or switches
+       terminals using <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>, applications which use the output file
+       descriptor can have different behavior  depending  on  which  structure
+       holds the corresponding descriptor.
 
        For example
 
@@ -227,31 +227,31 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Unset-TERM-Variable">Unset TERM Variable</a></H3><PRE>
-       If the TERM variable is missing or empty, <STRONG>initscr</STRONG> uses the  value  "un-
-       known", which normally corresponds to a terminal entry with the <EM>generic</EM>
-       (<EM>gn</EM>) capability.  Generic entries are  detected  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  and
-       cannot  be  used  for full-screen operation.  Other implementations may
-       handle a missing/empty TERM variable differently.
+       If the TERM variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
+       "unknown",  which  normally  corresponds  to  a terminal entry with the
+       <EM>generic</EM> (<EM>gn</EM>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
+       and  cannot  be  used for full-screen operation.  Other implementations
+       may handle a missing/empty TERM variable differently.
 
 
 </PRE><H3><a name="h3-Signal-Handlers">Signal Handlers</a></H3><PRE>
-       Quoting from X/Open Curses, section 3.1.1:
+       Quoting from X/Open Curses Issue 7, section 3.1.1:
 
-            <EM>Curses</EM> <EM>implementations</EM> <EM>may</EM> <EM>provide</EM> <EM>for</EM>  <EM>special</EM>  <EM>handling</EM>  <EM>of</EM>  <EM>the</EM>
-            <STRONG>SIGINT</STRONG><EM>,</EM>  <STRONG>SIGQUIT</STRONG>  <EM>and</EM>  <STRONG>SIGTSTP</STRONG>  <EM>signals</EM>  <EM>if</EM>  <EM>their</EM>  <EM>disposition</EM> <EM>is</EM>
-            <STRONG>SIG_DFL</STRONG> <EM>at</EM> <EM>the</EM> <EM>time</EM> <STRONG>initscr</STRONG> <EM>is</EM> <EM>called</EM> ...
+            Curses implementations may provide for  special  handling  of  the
+            SIGINT,  SIGQUIT,  and  SIGTSTP  signals  if  their disposition is
+            SIG_DFL at the time <EM>initscr</EM> is called...
 
-            <EM>Any</EM> <EM>special</EM> <EM>handling</EM> <EM>for</EM> <EM>these</EM> <EM>signals</EM> <EM>may</EM> <EM>remain</EM>  <EM>in</EM>  <EM>effect</EM>  <EM>for</EM>
-            <EM>the</EM>  <EM>life</EM>  <EM>of</EM>  <EM>the</EM>  <EM>process</EM>  <EM>or</EM>  <EM>until</EM>  <EM>the</EM>  <EM>process</EM>  <EM>changes</EM>  <EM>the</EM>
-            <EM>disposition</EM> <EM>of</EM> <EM>the</EM> <EM>signal.</EM>
+            Any special handling for these signals may remain  in  effect  for
+            the  life  of  the  process  or  until  the  process  changes  the
+            disposition of the signal.
 
-            <EM>None</EM> <EM>of</EM> <EM>the</EM> <EM>Curses</EM> <EM>functions</EM> <EM>are</EM> <EM>required</EM> <EM>to</EM> <EM>be</EM> <EM>safe</EM> <EM>with</EM>  <EM>respect</EM>
-            <EM>to</EM> <EM>signals</EM> ...
+            None of the Curses functions are required to be safe with  respect
+            to signals...
 
        This  implementation establishes signal handlers during initialization,
        e.g., <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  Applications which must handle these signals
-       should  set  up  the  corresponding handlers <EM>after</EM> initializing the li-
-       brary:
+       should  set  up  the  corresponding  handlers  <EM>after</EM>  initializing  the
+       library:
 
        <STRONG>SIGINT</STRONG>
             The handler <EM>attempts</EM> to cleanup the screen on exit.   Although  it
@@ -260,8 +260,8 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             <STRONG>o</STRONG>   Walking  the  <STRONG>SCREEN</STRONG> list is unsafe, since all list management
                 is done without any signal blocking.
 
-            <STRONG>o</STRONG>   On systems which have <STRONG>REENTRANT</STRONG> turned on, <STRONG>set_term</STRONG> uses func-
-                tions which could deadlock or misbehave in other ways.
+            <STRONG>o</STRONG>   On systems which  have  <STRONG>REENTRANT</STRONG>  turned  on,  <STRONG>set_term</STRONG>  uses
+                functions which could deadlock or misbehave in other ways.
 
             <STRONG>o</STRONG>   <STRONG>endwin</STRONG> calls other functions, many of which use stdio or other
                 library functions which are clearly unsafe.
@@ -280,21 +280,21 @@ <H1 class="no-header">curs_initscr 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>SIGWINCH</STRONG>
             This handles the window-size changes which  were  ignored  in  the
-            standardization  efforts.   The handler sets a (signal-safe) vari-
-            able which is later tested in  <STRONG>wgetch</STRONG>  (see  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>).   If
-            <STRONG>keypad</STRONG>  has  been enabled for the corresponding window, <STRONG>wgetch</STRONG> re-
-            turns the key symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time,  <STRONG>wgetch</STRONG>  calls
+            standardization   efforts.    The  handler  sets  a  (signal-safe)
+            variable which is later tested in <STRONG>wgetch</STRONG> (see <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>).  If
+            <STRONG>keypad</STRONG>  has  been  enabled  for  the  corresponding window, <STRONG>wgetch</STRONG>
+            returns the key symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time, <STRONG>wgetch</STRONG> calls
             <STRONG>resizeterm</STRONG>  to adjust the standard screen <STRONG>stdscr</STRONG>, and update other
             data such as <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,  <STRONG>curs_ter-</STRONG>
-       <STRONG><A HREF="curs_terminfo.3x.html">minfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index bc86026d1..f371d69eb 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.43 2023/08/19 20:55:23 tom Exp @
+  * @Id: curs_inopts.3x,v 1.47 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -48,10 +48,10 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>cbreak</STRONG>, <STRONG>echo</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>is_cbreak</STRONG>, <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, <STRONG>is_raw</STRONG>,
-       <STRONG>keypad</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>noecho</STRONG>, <STRONG>nonl</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>noraw</STRONG>,
-       <STRONG>notimeout</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>raw</STRONG>, <STRONG>timeout</STRONG>, <STRONG>wtimeout</STRONG>, <STRONG>typeahead</STRONG> - <STRONG>curses</STRONG> input
-       options
+       <STRONG>cbreak</STRONG>,  <STRONG>echo</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>is_cbreak</STRONG>, <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, <STRONG>is_raw</STRONG>,
+       <STRONG>keypad</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>noecho</STRONG>,  <STRONG>nonl</STRONG>,  <STRONG>noqiflush</STRONG>,  <STRONG>noraw</STRONG>,
+       <STRONG>notimeout</STRONG>,  <STRONG>qiflush</STRONG>,  <STRONG>raw</STRONG>,  <STRONG>timeout</STRONG>,  <STRONG>wtimeout</STRONG>, <STRONG>typeahead</STRONG> - get and set
+       <EM>curses</EM> terminal input options
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -94,45 +94,45 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The <STRONG>ncurses</STRONG> library provides several functions which let an application
        change  the  way  input from the terminal is handled.  Some are global,
-       applying to all windows.  Others apply only to a specific window.  Win-
-       dow-specific  settings  are not automatically applied to new or derived
-       windows.  An application must apply these to each window, if  the  same
-       behavior is needed.
+       applying to all windows.  Others  apply  only  to  a  specific  window.
+       Window-specific  settings  are  not  automatically  applied  to  new or
+       derived windows.  An application must apply these to  each  window,  if
+       the same behavior is needed.
 
 
 </PRE><H3><a name="h3-cbreak_nocbreak">cbreak/nocbreak</a></H3><PRE>
        Normally,  the  tty  driver buffers typed characters until a newline or
        carriage return is typed.  The <STRONG>cbreak</STRONG> routine disables  line  buffering
-       and erase/kill character-processing (interrupt and flow control charac-
-       ters are unaffected), making characters typed by the  user  immediately
-       available to the program.  The <STRONG>nocbreak</STRONG> routine returns the terminal to
-       normal (cooked) mode.
+       and   erase/kill   character-processing  (interrupt  and  flow  control
+       characters  are  unaffected),  making  characters  typed  by  the  user
+       immediately available to the program.  The <STRONG>nocbreak</STRONG> routine returns the
+       terminal to normal (cooked) mode.
 
        Initially the terminal may or may not be in <STRONG>cbreak</STRONG> mode, as the mode is
-       inherited;  therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explic-
-       itly.  Most interactive programs using  <STRONG>curses</STRONG>  set  the  <STRONG>cbreak</STRONG>  mode.
-       Note  that  <STRONG>cbreak</STRONG> overrides <STRONG>raw</STRONG>.  [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion
-       of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
+       inherited;   therefore,  a  program  should  call  <STRONG>cbreak</STRONG>  or  <STRONG>nocbreak</STRONG>
+       explicitly.  Most interactive programs  using  <STRONG>curses</STRONG>  set  the  <STRONG>cbreak</STRONG>
+       mode.   Note  that  <STRONG>cbreak</STRONG>  overrides  <STRONG>raw</STRONG>.   [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a
+       discussion of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
 
 
 </PRE><H3><a name="h3-echo_noecho">echo/noecho</a></H3><PRE>
        The <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> routines control whether characters  typed  by  the
        user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG> as they are typed.  Echoing by the tty
        driver is always disabled, but initially <STRONG>getch</STRONG>  is  in  echo  mode,  so
-       characters typed are echoed.  Authors of most interactive programs pre-
-       fer to do their own echoing in a controlled area of the screen, or  not
-       to  echo  at  all,  so  they  disable  echoing by calling <STRONG>noecho</STRONG>.  [See
+       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 <STRONG>noecho</STRONG>.  [See
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion of how  these  routines  interact  with
        <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.]
 
 
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
        The  <STRONG>halfdelay</STRONG> routine is used for half-delay mode, which is similar to
-       <STRONG>cbreak</STRONG> mode in that characters typed by the user are immediately avail-
-       able to the program.  However, after blocking for <EM>tenths</EM> tenths of sec-
-       onds, <STRONG>ERR</STRONG> is returned if nothing has been typed.  The value  of  <EM>tenths</EM>
-       must  be  a number between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-delay
-       mode.
+       <STRONG>cbreak</STRONG> mode in that  characters  typed  by  the  user  are  immediately
+       available to the program.  However, after blocking for <EM>tenths</EM> tenths of
+       seconds, <STRONG>ERR</STRONG> is returned if nothing  has  been  typed.   The  value  of
+       <EM>tenths</EM> must be a number between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-
+       delay mode.
 
 
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
@@ -146,28 +146,28 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-keypad">keypad</a></H3><PRE>
-       The <STRONG>keypad</STRONG> option enables the keypad of the user's  terminal.   If  en-
-       abled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the user can press a function key (such as an arrow
-       key) and <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> returns a single value  representing  the  function
-       key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>curses</STRONG> does not treat
-       function keys specially and the program has to interpret the escape se-
-       quences  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 <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> is called.
-       The default value for keypad is <STRONG>FALSE</STRONG>.
+       The <STRONG>keypad</STRONG> option enables  the  keypad  of  the  user's  terminal.   If
+       enabled  (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the user can press a function key (such as an
+       arrow key) and <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  returns  a  single  value  representing  the
+       function  key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>curses</STRONG> 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 locally), turning  on  this
+       option  causes  the  terminal keypad to be turned on when <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> is
+       called.  The default value for keypad is <STRONG>FALSE</STRONG>.
 
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
-       Initially, whether the terminal returns 7 or 8 significant bits on  in-
-       put depends on the control mode of the tty driver [see <STRONG>termios(3)</STRONG>].  To
-       force 8 bits to be returned, invoke <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>);  this  is  equiva-
-       lent, under POSIX, to setting the CS8 flag on the terminal.  To force 7
-       bits to be returned, invoke <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>); this is equivalent, under
-       POSIX,  to  setting the CS7 flag on the terminal.  The window argument,
-       <EM>win</EM>, is always ignored.  If the terminfo capabilities <STRONG>smm</STRONG> (meta_on) and
-       <STRONG>rmm</STRONG>  (meta_off) are defined for the terminal, <STRONG>smm</STRONG> is sent to the termi-
-       nal when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>) is called  and  <STRONG>rmm</STRONG>  is  sent  when  <STRONG>meta</STRONG>(<EM>win</EM>,
-       <STRONG>FALSE</STRONG>) is called.
+       Initially, whether the terminal returns 7  or  8  significant  bits  on
+       input  depends  on the control mode of the tty driver [see <STRONG>termios(3)</STRONG>].
+       To force 8 bits  to  be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>);  this  is
+       equivalent,  under  POSIX, to setting the CS8 flag on the terminal.  To
+       force  7  bits  to  be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>FALSE</STRONG>);  this  is
+       equivalent,  under POSIX, to setting the CS7 flag on the terminal.  The
+       window argument, <EM>win</EM>, is always ignored.  If the terminfo  capabilities
+       <STRONG>smm</STRONG>  (meta_on)  and <STRONG>rmm</STRONG> (meta_off) are defined for the terminal, <STRONG>smm</STRONG> is
+       sent to the terminal when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>) is called  and  <STRONG>rmm</STRONG>  is  sent
+       when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
 
 
 </PRE><H3><a name="h3-nl_nonl">nl/nonl</a></H3><PRE>
@@ -191,12 +191,12 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-raw_noraw">raw/noraw</a></H3><PRE>
        The <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw  mode.
-       Raw  mode is similar to <STRONG>cbreak</STRONG> mode, in that characters typed are imme-
-       diately passed through to the user program.  The differences  are  that
-       in  raw mode, the interrupt, quit, suspend, and flow control characters
-       are all passed through uninterpreted, instead of generating  a  signal.
-       The  behavior  of the BREAK key depends on other bits in the tty driver
-       that are not set by <STRONG>curses</STRONG>.
+       Raw  mode  is  similar  to  <STRONG>cbreak</STRONG>  mode,  in that characters typed are
+       immediately passed through to the user program.   The  differences  are
+       that  in  raw  mode,  the  interrupt,  quit,  suspend, and flow control
+       characters are all passed through uninterpreted, instead of  generating
+       a  signal.   The behavior of the BREAK key depends on other bits in the
+       tty driver that are not set by <STRONG>curses</STRONG>.
 
 
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush/noqiflush</a></H3><PRE>
@@ -220,27 +220,27 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
-       The <STRONG>curses</STRONG> library does "line-breakout optimization" by looking for ty-
-       peahead periodically while updating the screen.  If input is found, and
-       it is coming from a tty, the current  update  is  postponed  until  <STRONG>re-</STRONG>
-       <STRONG><A HREF="refresh.3x.html">fresh(3x)</A></STRONG>  or <STRONG>doupdate</STRONG> is called again.  This allows faster response to
-       commands typed in advance.  Normally, the input FILE pointer passed  to
-       <STRONG>newterm</STRONG>, or <STRONG>stdin</STRONG> in the case that <STRONG>initscr</STRONG> was used, will be used to do
-       this typeahead checking.  The <STRONG>typeahead</STRONG> routine specifies that the file
-       descriptor  <EM>fd</EM>  is to be used to check for typeahead instead.  If <EM>fd</EM> is
-       -1, then no typeahead checking is done.
+       The <STRONG>curses</STRONG> 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
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  or  <STRONG>doupdate</STRONG> is called again.  This allows faster response
+       to commands typed in advance.  Normally, the input FILE pointer  passed
+       to <STRONG>newterm</STRONG>, or <STRONG>stdin</STRONG> in the case that <STRONG>initscr</STRONG> was used, will be used to
+       do this typeahead checking.  The <STRONG>typeahead</STRONG> routine specifies  that  the
+       file descriptor <EM>fd</EM> is to be used to check for typeahead instead.  If <EM>fd</EM>
+       is -1, then no typeahead checking is done.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines that return an integer return  <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>
        (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") upon successful
-       completion, unless otherwise noted in the  preceding  routine  descrip-
-       tions.
+       completion,  unless  otherwise   noted   in   the   preceding   routine
+       descriptions.
 
        X/Open  does  not define any error conditions.  In this implementation,
        functions with a window parameter will return an error if it  is  null.
-       Any function will also return an error if the terminal was not initial-
-       ized.  Also,
+       Any  function  will  also  return  an  error  if  the  terminal was not
+       initialized.  Also,
 
           <STRONG>halfdelay</STRONG>
                returns an error if its parameter is outside the range 1..255.
@@ -267,21 +267,21 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code  depending on ncurses extensions be conditioned using NCURSES_VER-
-       SION.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Except as noted in the section on extensions, these functions  are  de-
-       scribed in the XSI Curses standard, Issue 4.
+       Except as noted in the  section  on  extensions,  these  functions  are
+       described in the XSI Curses standard, Issue 4.
 
        The ncurses library obeys the XPG4 standard and the historical practice
        of the AT&amp;T curses implementations, in that the  echo  bit  is  cleared
        when  curses  initializes the terminal state.  BSD curses differed from
        this slightly; it left the echo bit on at initialization, but  the  BSD
        <STRONG>raw</STRONG>  call  turned  it  off as a side-effect.  For best portability, set
-       <STRONG>echo</STRONG> or <STRONG>noecho</STRONG> explicitly just after initialization, even if your  pro-
-       gram remains in cooked mode.
+       <STRONG>echo</STRONG> or <STRONG>noecho</STRONG> explicitly  just  after  initialization,  even  if  your
+       program remains in cooked mode.
 
        The  XSI  Curses  standard  is ambiguous on the question of whether <STRONG>raw</STRONG>
        should disable the CRLF translations controlled by <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>.   BSD
@@ -291,51 +291,52 @@ <H1 class="no-header">curs_inopts 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        that the operating system will not alter.
 
        When <STRONG>keypad</STRONG> is first enabled, ncurses loads the key-definitions for the
-       current terminal description.  If the terminal description includes ex-
-       tended string capabilities, e.g., from using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>, then
-       ncurses  also  defines keys for the capabilities whose names begin with
-       "k".  The corresponding keycodes are generated and (depending on previ-
-       ous  loads of terminal descriptions) may differ from one execution of a
-       program to the next.  The generated keycodes are recognized by the <STRONG>key-</STRONG>
-       <STRONG>name</STRONG>  function (which will then return a name beginning with "k" denot-
-       ing the terminfo capability name rather than "K", used for curses  key-
-       names).  On the other hand, an application can use <STRONG>define_key</STRONG> to estab-
-       lish a specific keycode for a given string.  This makes it possible for
-       an  application  to  check  for  an extended capability's presence with
-       <STRONG>tigetstr</STRONG>, and reassign the keycode to match its own needs.
+       current  terminal  description.   If  the terminal description includes
+       extended string capabilities, e.g., from using the <STRONG>-x</STRONG>  option  of  <STRONG>tic</STRONG>,
+       then  ncurses  also defines keys for the capabilities whose names begin
+       with "k".  The corresponding keycodes are generated and  (depending  on
+       previous  loads of terminal descriptions) may differ from one execution
+       of a program to the next.  The generated keycodes are recognized by the
+       <STRONG>keyname</STRONG>  function  (which  will  then  return a name beginning with "k"
+       denoting the terminfo capability name rather than "K", used for  curses
+       key-names).   On  the  other hand, an application can use <STRONG>define_key</STRONG> 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 <STRONG>tigetstr</STRONG>, and reassign  the  keycode  to  match  its  own
+       needs.
 
        Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
-       particular  string capability.  Higher-level applications which use the
-       curses <STRONG>wgetch</STRONG> and similar functions to return keycodes  rely  upon  the
+       particular string capability.  Higher-level applications which use  the
+       curses  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
        order in which the strings are loaded.  If more than one key definition
-       has the same string value, then <STRONG>wgetch</STRONG> can  return  only  one  keycode.
+       has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
        Most curses implementations (including ncurses) load key definitions in
-       the order defined by the array of string capability  names.   The  last
-       key  to  be  loaded  determines the keycode which will be returned.  In
-       ncurses, you may also have extended  capabilities  interpreted  as  key
-       definitions.   These are loaded after the predefined keys, and if a ca-
-       pability's value is the same as a previously-loaded key definition, the
-       later definition is the one used.
+       the  order  defined  by the array of string capability names.  The last
+       key to be loaded determines the keycode which  will  be  returned.   In
+       ncurses,  you  may  also  have extended capabilities interpreted as key
+       definitions.  These are loaded after the  predefined  keys,  and  if  a
+       capability's  value  is the same as a previously-loaded key definition,
+       the later definition is the one used.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>,
+       Note that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>,  <STRONG>nodelay</STRONG>,
        <STRONG>notimeout</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be macros.
 
-       The <STRONG>noraw</STRONG> and <STRONG>nocbreak</STRONG> calls follow historical practice  in  that  they
-       attempt  to restore to normal ("cooked") mode from raw and cbreak modes
-       respectively.  Mixing raw/noraw and cbreak/nocbreak calls leads to  tty
+       The  <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> calls follow historical practice in that they
+       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
+       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
        driver control states that are hard to predict or understand; it is not
        recommended.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,   <STRONG>de-</STRONG>
-       <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index acc07a26b..26db9703f 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.14 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ins_wch</STRONG>,  <STRONG>mvins_wch</STRONG>,  <STRONG>mvwins_wch</STRONG>, <STRONG>wins_wch</STRONG> - insert a complex character
-       and rendition into a window
+       <STRONG>ins_wch</STRONG>,  <STRONG>mvins_wch</STRONG>,  <STRONG>mvwins_wch</STRONG>,  <STRONG>wins_wch</STRONG>  -  insert a <EM>curses</EM> complex
+       character string in a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_ins_wch 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 11f6636d0..a848b6d8b 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.15 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.20 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ins_wstr</STRONG>, <STRONG>ins_nwstr</STRONG>, <STRONG>wins_wstr</STRONG>, <STRONG>wins_nwstr</STRONG>, <STRONG>mvins_wstr</STRONG>, <STRONG>mvins_nwstr</STRONG>,
-       <STRONG>mvwins_wstr</STRONG>, <STRONG>mvwins_nwstr</STRONG> - insert a wide-character string into a
-       curses window
+       <STRONG>ins_wstr</STRONG>,  <STRONG>ins_nwstr</STRONG>,  <STRONG>wins_wstr</STRONG>,  <STRONG>wins_nwstr</STRONG>, <STRONG>mvins_wstr</STRONG>, <STRONG>mvins_nwstr</STRONG>,
+       <STRONG>mvwins_wstr</STRONG>, <STRONG>mvwins_nwstr</STRONG> - insert a wide-character string in a  <EM>curses</EM>
+       window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -68,13 +68,13 @@ <H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines insert a <STRONG>wchar_t</STRONG> character string (as many characters as
-       will fit on the line) before the character under the cursor.  All char-
-       acters to the right of the cursor are shifted right, with the possibil-
-       ity of the rightmost characters on the line being lost.  No wrapping is
-       performed.   The cursor position does not change (after moving to <EM>y</EM>, <EM>x</EM>,
-       if specified).  The four routines with <EM>n</EM> as the last argument insert  a
-       leading  substring  of at most <EM>n</EM> <STRONG>wchar_t</STRONG> characters.  If <EM>n</EM> is less than
-       1, the entire string is inserted.
+       will fit on the line) before  the  character  under  the  cursor.   All
+       characters  to  the  right  of  the  cursor are shifted right, with the
+       possibility of the rightmost characters on the  line  being  lost.   No
+       wrapping  is  performed.   The  cursor  position does not change (after
+       moving to <EM>y</EM>, <EM>x</EM>, if specified).  The four routines with <EM>n</EM>  as  the  last
+       argument  insert  a  leading substring of at most <EM>n</EM> <STRONG>wchar_t</STRONG> characters.
+       If <EM>n</EM> is less than 1, the entire string is inserted.
 
        If a character in <EM>wstr</EM> is a tab, newline, carriage return or backspace,
        the  cursor  is  moved appropriately within the window.  A newline also
@@ -90,8 +90,8 @@ <H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
        Note that all but wins_nwstr may be macros.
 
        If  the  first character in the string is a nonspacing character, these
-       functions will fail.  XSI does not define what will happen  if  a  non-
-       spacing character follows a control character.
+       functions will fail.  XSI  does  not  define  what  will  happen  if  a
+       nonspacing character follows a control character.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index bd037135b..a7f3a1c2e 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_insch.3x,v 1.30 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>insch</STRONG>,  <STRONG>winsch</STRONG>, <STRONG>mvinsch</STRONG>, <STRONG>mvwinsch</STRONG> - insert a character before cursor in
-       a <STRONG>curses</STRONG> window
+       <STRONG>insch</STRONG>,  <STRONG>winsch</STRONG>,  <STRONG>mvinsch</STRONG>,  <STRONG>mvwinsch</STRONG>  -  insert  a <EM>curses</EM> character in a
+       window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_insch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 04cc818ee..72f1f4567 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.33 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_insstr.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>insstr</STRONG>,  <STRONG>insnstr</STRONG>,  <STRONG>winsstr</STRONG>,  <STRONG>winsnstr</STRONG>,  <STRONG>mvinsstr</STRONG>, <STRONG>mvinsnstr</STRONG>, <STRONG>mvwinsstr</STRONG>,
-       <STRONG>mvwinsnstr</STRONG> - insert string before cursor in a <STRONG>curses</STRONG> window
+       <STRONG>mvwinsnstr</STRONG> - insert a string in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_insstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 2a8656918..1890788dc 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.29 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_instr.3x,v 1.33 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>instr</STRONG>,  <STRONG>innstr</STRONG>, <STRONG>winstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinstr</STRONG>, <STRONG>mvwinnstr</STRONG>
-       - get a string of characters from a <STRONG>curses</STRONG> window
+       - get a string from a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_instr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 97f814a48..202beef91 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.21 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>inwstr</STRONG>,  <STRONG>innwstr</STRONG>,  <STRONG>winwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinwstr</STRONG>,
-       <STRONG>mvwinnwstr</STRONG> - get a string of <STRONG>wchar_t</STRONG> characters from a curses window
+       <STRONG>mvwinnwstr</STRONG> - get a wide-character string from a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 4ca4a9655..73426e03b 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.37 2023/08/19 19:47:16 tom Exp @
+  * @Id: curs_kernel.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>def_prog_mode</STRONG>, <STRONG>def_shell_mode</STRONG>, <STRONG>reset_prog_mode</STRONG>, <STRONG>reset_shell_mode</STRONG>,
-       <STRONG>resetty</STRONG>, <STRONG>savetty</STRONG>, <STRONG>getsyx</STRONG>, <STRONG>setsyx</STRONG>, <STRONG>ripoffline</STRONG>, <STRONG>curs_set</STRONG>, <STRONG>napms</STRONG> - low-
-       level <STRONG>curses</STRONG> routines
+       <STRONG>def_prog_mode</STRONG>,   <STRONG>def_shell_mode</STRONG>,   <STRONG>reset_prog_mode</STRONG>,   <STRONG>reset_shell_mode</STRONG>,
+       <STRONG>resetty</STRONG>, <STRONG>savetty</STRONG>, <STRONG>getsyx</STRONG>, <STRONG>setsyx</STRONG>, <STRONG>ripoffline</STRONG>, <STRONG>curs_set</STRONG>,  <STRONG>napms</STRONG>  -  low-
+       level <EM>curses</EM> routines
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -73,83 +73,84 @@ <H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The following routines give low-level access to various <STRONG>curses</STRONG> capabil-
-       ities.  These routines typically are used inside library routines.
+       The   following  routines  give  low-level  access  to  various  <STRONG>curses</STRONG>
+       capabilities.   These  routines  typically  are  used  inside   library
+       routines.
 
 
 </PRE><H3><a name="h3-def_prog_mode_-def_shell_mode">def_prog_mode, def_shell_mode</a></H3><PRE>
        The <STRONG>def_prog_mode</STRONG> and <STRONG>def_shell_mode</STRONG> routines save the current terminal
        modes as the "program" (in <STRONG>curses</STRONG>) or "shell" (not in <STRONG>curses</STRONG>) state for
        use by the <STRONG>reset_prog_mode</STRONG> and <STRONG>reset_shell_mode</STRONG> routines.  This is done
-       automatically  by <STRONG>initscr</STRONG>.  There is one such save area for each screen
+       automatically by <STRONG>initscr</STRONG>.  There is one such save area for each  screen
        context allocated by <STRONG>newterm</STRONG>.
 
 
 </PRE><H3><a name="h3-reset_prog_mode_-reset_shell_mode">reset_prog_mode, reset_shell_mode</a></H3><PRE>
-       The <STRONG>reset_prog_mode</STRONG> and <STRONG>reset_shell_mode</STRONG> routines restore the  terminal
-       to  "program"  (in <STRONG>curses</STRONG>) or "shell" (out of <STRONG>curses</STRONG>) state.  These are
-       done automatically by <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> and, after an <STRONG>endwin</STRONG>, by <STRONG>doupdate</STRONG>,  so
+       The  <STRONG>reset_prog_mode</STRONG> and <STRONG>reset_shell_mode</STRONG> routines restore the terminal
+       to "program" (in <STRONG>curses</STRONG>) or "shell" (out of <STRONG>curses</STRONG>) state.   These  are
+       done  automatically by <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> and, after an <STRONG>endwin</STRONG>, by <STRONG>doupdate</STRONG>, so
        they normally are not called.
 
 
 </PRE><H3><a name="h3-resetty_-savetty">resetty, savetty</a></H3><PRE>
-       The <STRONG>resetty</STRONG> and <STRONG>savetty</STRONG> routines save and restore the state of the ter-
-       minal modes.  <STRONG>savetty</STRONG> saves the current state in a buffer  and  <STRONG>resetty</STRONG>
-       restores the state to what it was at the last call to <STRONG>savetty</STRONG>.
+       The <STRONG>resetty</STRONG> and <STRONG>savetty</STRONG> routines save and  restore  the  state  of  the
+       terminal  modes.   <STRONG>savetty</STRONG>  saves  the  current  state  in a buffer and
+       <STRONG>resetty</STRONG> restores the state to what it was at the last call to <STRONG>savetty</STRONG>.
 
 
 </PRE><H3><a name="h3-getsyx">getsyx</a></H3><PRE>
-       The  <STRONG>getsyx</STRONG>  routine  returns  the  current  coordinates of the <EM>virtual</EM>
-       <EM>screen</EM> cursor in <EM>y</EM> and <EM>x</EM>.  If <STRONG>leaveok</STRONG> is currently <STRONG>TRUE</STRONG>, then <STRONG>-1</STRONG>,<STRONG>-1</STRONG>  is
+       The <STRONG>getsyx</STRONG> routine returns  the  current  coordinates  of  the  <EM>virtual</EM>
+       <EM>screen</EM>  cursor in <EM>y</EM> and <EM>x</EM>.  If <STRONG>leaveok</STRONG> is currently <STRONG>TRUE</STRONG>, then <STRONG>-1</STRONG>,<STRONG>-1</STRONG> is
        returned.  If lines have been removed from the top of the screen, using
-       <STRONG>ripoffline</STRONG>, <EM>y</EM> and <EM>x</EM> include these lines; therefore, <EM>y</EM> and <EM>x</EM>  should  be
+       <STRONG>ripoffline</STRONG>,  <EM>y</EM>  and <EM>x</EM> include these lines; therefore, <EM>y</EM> and <EM>x</EM> should be
        used only as arguments for <STRONG>setsyx</STRONG>.
 
        Few applications will use this feature, most use <STRONG>getyx</STRONG> instead.
 
 
 </PRE><H3><a name="h3-setsyx">setsyx</a></H3><PRE>
-       The  <STRONG>setsyx</STRONG> routine sets the <EM>virtual</EM> <EM>screen</EM> cursor to <EM>y</EM>, <EM>x</EM>.  If <EM>y</EM> and <EM>x</EM>
-       are both <STRONG>-1</STRONG>, then <STRONG>leaveok</STRONG> is set.  The two routines <STRONG>getsyx</STRONG>  and  <STRONG>setsyx</STRONG>
-       are  designed to be used by a library routine, which manipulates <STRONG>curses</STRONG>
-       windows but does not want to change the current position  of  the  pro-
-       gram's cursor.  The library routine would call <STRONG>getsyx</STRONG> at the beginning,
-       do its manipulation of its own windows, do a <STRONG>wnoutrefresh</STRONG> on  its  win-
-       dows, call <STRONG>setsyx</STRONG>, and then call <STRONG>doupdate</STRONG>.
+       The <STRONG>setsyx</STRONG> routine sets the <EM>virtual</EM> <EM>screen</EM> cursor to <EM>y</EM>, <EM>x</EM>.  If <EM>y</EM> and  <EM>x</EM>
+       are  both  <STRONG>-1</STRONG>, then <STRONG>leaveok</STRONG> is set.  The two routines <STRONG>getsyx</STRONG> and <STRONG>setsyx</STRONG>
+       are designed to be used by a library routine, which manipulates  <STRONG>curses</STRONG>
+       windows  but  does  not  want  to  change  the  current position of the
+       program's cursor.   The  library  routine  would  call  <STRONG>getsyx</STRONG>  at  the
+       beginning, do its manipulation of its own windows, do a <STRONG>wnoutrefresh</STRONG> on
+       its windows, call <STRONG>setsyx</STRONG>, and then call <STRONG>doupdate</STRONG>.
 
        Few applications will use this feature, most use <STRONG>wmove</STRONG> instead.
 
 
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
-       The  <STRONG>ripoffline</STRONG>  routine  provides  access  to  the  same facility that
-       <STRONG>slk_init</STRONG> [see <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>] uses to reduce  the  size  of  the  screen.
-       <STRONG>ripoffline</STRONG>  must be called before <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is called, to pre-
-       pare these initial actions:
+       The <STRONG>ripoffline</STRONG> routine  provides  access  to  the  same  facility  that
+       <STRONG>slk_init</STRONG>  [see  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>]  uses  to  reduce the size of the screen.
+       <STRONG>ripoffline</STRONG> must be called before  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>  is  called,  to
+       prepare these initial actions:
 
        <STRONG>o</STRONG>   If <EM>line</EM> is positive, a line is removed from the top of <STRONG>stdscr</STRONG>.
 
        <STRONG>o</STRONG>   if <EM>line</EM> is negative, a line is removed from the bottom.
 
-       When the resulting initialization is done inside <STRONG>initscr</STRONG>,  the  routine
+       When  the  resulting initialization is done inside <STRONG>initscr</STRONG>, the routine
        <STRONG>init</STRONG> (supplied by the user) is called with two arguments:
 
        <STRONG>o</STRONG>   a window pointer to the one-line window that has been allocated and
 
        <STRONG>o</STRONG>   an integer with the number of columns in the window.
 
-       Inside  this  initialization  routine,  the integer variables <STRONG>LINES</STRONG> and
-       <STRONG>COLS</STRONG> (defined in <STRONG>&lt;curses.h&gt;</STRONG>) are not guaranteed to be accurate and <STRONG>wre-</STRONG>
-       <STRONG>fresh</STRONG> or <STRONG>doupdate</STRONG> must not be called.  It is allowable to call <STRONG>wnoutre-</STRONG>
-       <STRONG>fresh</STRONG> during the initialization routine.
+       Inside this initialization routine, the  integer  variables  <STRONG>LINES</STRONG>  and
+       <STRONG>COLS</STRONG>  (defined  in  <STRONG>&lt;curses.h&gt;</STRONG>)  are  not guaranteed to be accurate and
+       <STRONG>wrefresh</STRONG> or <STRONG>doupdate</STRONG> must not be  called.   It  is  allowable  to  call
+       <STRONG>wnoutrefresh</STRONG> during the initialization routine.
 
-       <STRONG>ripoffline</STRONG> can be called up to five times  before  calling  <STRONG>initscr</STRONG>  or
+       <STRONG>ripoffline</STRONG>  can  be  called  up to five times before calling <STRONG>initscr</STRONG> or
        <STRONG>newterm</STRONG>.
 
 
 </PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
-       The  <STRONG>curs_set</STRONG>  routine  sets  the cursor state to invisible, normal, or
-       very visible for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.   If  the
-       terminal  supports  the <EM>visibility</EM> requested, the previous <EM>cursor</EM> state
+       The <STRONG>curs_set</STRONG> routine sets the cursor state  to  invisible,  normal,  or
+       very  visible  for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.  If the
+       terminal supports the <EM>visibility</EM> requested, the previous  <EM>cursor</EM>  state
        is returned; otherwise, <STRONG>ERR</STRONG> is returned.
 
 
@@ -160,7 +161,7 @@ <H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
-       <STRONG>curs_set</STRONG> returns the previous cursor state, or  <STRONG>ERR</STRONG>  if  the  requested
+       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
        <EM>visibility</EM> is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -171,30 +172,30 @@ <H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>ripoffline</STRONG>
             returns an error if the maximum number of ripped-off lines exceeds
-            the maximum (NRIPS = 5).
+            the maximum (5).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
        <EM>y</EM> and <EM>x</EM>.
 
-       Older SVr4 man pages warn that the return value of  <STRONG>curs_set</STRONG>  "is  cur-
-       rently  incorrect".   This  implementation gets it right, but it may be
+       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
+       currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both ncurses and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for ncurses  to  determine  the  initial
+       called to make the cursor other than normal, i.e., either invisible  or
+       very  visible.   There  is  no way for ncurses to determine the initial
        cursor state to restore that.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in the
-       XSI Curses standard, Issue 4.  All other functions are as described  in
+       XSI  Curses standard, Issue 4.  All other functions are as described in
        XSI Curses.
 
-       The  SVr4  documentation  describes  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> as having return
-       type int.  This is misleading, as they are macros  with  no  documented
+       The SVr4 documentation describes <STRONG>setsyx</STRONG> and  <STRONG>getsyx</STRONG>  as  having  return
+       type  int.   This  is misleading, as they are macros with no documented
        semantics for the return value.
 
 
@@ -204,7 +205,7 @@ <H1 class="no-header">curs_kernel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 320fd816c..b553505d2 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.17 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_legacy.3x,v 1.22 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -47,7 +47,9 @@ <H1 class="no-header">curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       curs_legacy - get <STRONG>curses</STRONG> cursor and window coordinates, attributes
+       <STRONG>getattrs</STRONG>,   <STRONG>getbegx</STRONG>,   <STRONG>getbegy</STRONG>,  <STRONG>getcurx</STRONG>,  <STRONG>getcury</STRONG>,  <STRONG>getmaxx</STRONG>,  <STRONG>getmaxy</STRONG>,
+       <STRONG>getparx</STRONG>,  <STRONG>getpary</STRONG>  -  get  <EM>curses</EM>  cursor  and  window  coordinates  or
+       attributes (legacy)
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -123,7 +125,7 @@ <H1 class="no-header">curs_legacy 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 95ed8cf74..2f8490224 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.16 2022/06/04 23:33:48 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.21 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>exit_curses</STRONG>, <STRONG>exit_terminfo</STRONG> - <STRONG>curses</STRONG> memory-leak checking
+       <STRONG>exit_curses</STRONG>, <STRONG>exit_terminfo</STRONG> - check for memory leaks in <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -70,11 +70,11 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
        Any implementation of curses must not free the memory associated with a
        screen, since (even after calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>), it must be available for
        use in the next call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.  There are also chunks  of  memory
-       held for performance reasons.  That makes it hard to analyze curses ap-
-       plications for memory leaks.  When using the specially  configured  de-
-       bugging version of the ncurses library, applications can call functions
-       which free those chunks of memory, simplifying the process  of  memory-
-       leak checking.
+       held  for  performance  reasons.   That makes it hard to analyze curses
+       applications for memory leaks.  When  using  the  specially  configured
+       debugging  version  of  the  ncurses  library,  applications  can  call
+       functions which free those chunks of memory, simplifying the process of
+       memory-leak checking.
 
        Some  of  the functions are named with a "_nc_" prefix because they are
        not intended for use in the non-debugging library:
@@ -85,8 +85,8 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
        <STRONG>_nc_free_and_exit</STRONG>
             This frees the memory allocated by ncurses (like <STRONG>_nc_freeall</STRONG>), and
             exits the program.  It is preferred over <STRONG>_nc_freeall</STRONG> since some of
-            that memory may be required to keep the application running.  Sim-
-            ply exiting (with the given exit-code) is safer.
+            that memory may be  required  to  keep  the  application  running.
+            Simply exiting (with the given exit-code) is safer.
 
        <STRONG>_nc_free_tinfo</STRONG>
             Use  this  function  if only the low-level terminfo functions (and
@@ -94,9 +94,9 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
             the program after freeing memory.
 
        The  functions  prefixed "_nc" are normally not available; they must be
-       configured into the library at build time using the <STRONG>--disable-leaks</STRONG> op-
-       tion.   That compiles-in code that frees memory that normally would not
-       be freed.
+       configured into the library at build  time  using  the  <STRONG>--disable-leaks</STRONG>
+       option.   That  compiles-in  code that frees memory that normally would
+       not be freed.
 
        The <STRONG>exit_curses</STRONG> and <STRONG>exit_terminfo</STRONG> functions call <STRONG>_nc_free_and_exit</STRONG>  and
        <STRONG>_nc_free_tinfo</STRONG>  if  the  library  is  configured to support memory-leak
@@ -109,8 +109,8 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are not part of X/Open Curses; nor do other implementa-
-       tions of curses provide a similar feature.
+       These   functions   are  not  part  of  X/Open  Curses;  nor  do  other
+       implementations of curses provide a similar feature.
 
        In any implementation of X/Open Curses, an application can free part of
        the memory allocated by curses:
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2022-06-04 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-06-04                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 78e3ac5b7..0022bf406 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp @
+  * @Id: curs_mouse.3x,v 1.71 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>has_mouse</STRONG>, <STRONG>getmouse</STRONG>, <STRONG>ungetmouse</STRONG>, <STRONG>mousemask</STRONG>, <STRONG>wenclose</STRONG>, <STRONG>mouse_trafo</STRONG>,
-       <STRONG>wmouse_trafo</STRONG>, <STRONG>mouseinterval</STRONG> - mouse interface through curses
+       <STRONG>has_mouse</STRONG>,  <STRONG>getmouse</STRONG>,  <STRONG>ungetmouse</STRONG>,  <STRONG>mousemask</STRONG>,  <STRONG>wenclose</STRONG>,  <STRONG>mouse_trafo</STRONG>,
+       <STRONG>wmouse_trafo</STRONG>, <STRONG>mouseinterval</STRONG> - get mouse events in <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -87,8 +87,8 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-mousemask">mousemask</a></H3><PRE>
        To make mouse events visible, use the <STRONG>mousemask</STRONG>  function.   This  sets
-       the  mouse  events to be reported.  By default, no mouse events are re-
-       ported.
+       the  mouse  events  to  be  reported.   By default, no mouse events are
+       reported.
 
        <STRONG>o</STRONG>   The function returns an updated copy of <EM>newmask</EM> to  indicate  which
            of the specified mouse events can be reported.
@@ -155,11 +155,11 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        event off the queue, call <STRONG>getmouse</STRONG>.  This function will return <STRONG>OK</STRONG> if  a
        mouse  event  is  actually  visible in the given window, <STRONG>ERR</STRONG> otherwise.
        When <STRONG>getmouse</STRONG> returns <STRONG>OK</STRONG>, the data deposited as y and x  in  the  event
-       structure  coordinates  will  be screen-relative character-cell coordi-
-       nates.  The returned state mask will have exactly one bit set to  indi-
-       cate the event type.  The corresponding data in the queue is marked in-
-       valid.  A subsequent call to <STRONG>getmouse</STRONG> will retrieve the next older item
-       from the queue.
+       structure    coordinates   will   be   screen-relative   character-cell
+       coordinates.  The returned state mask will have exactly one bit set  to
+       indicate the event type.  The corresponding data in the queue is marked
+       invalid.  A subsequent call to <STRONG>getmouse</STRONG> will retrieve  the  next  older
+       item from the queue.
 
 
 </PRE><H3><a name="h3-ungetmouse">ungetmouse</a></H3><PRE>
@@ -178,29 +178,29 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-wmouse_trafo">wmouse_trafo</a></H3><PRE>
        The <STRONG>wmouse_trafo</STRONG> function transforms a given pair of  coordinates  from
        stdscr-relative coordinates to coordinates relative to the given window
-       or vice versa.  The resulting stdscr-relative coordinates are  not  al-
-       ways  identical  to window-relative coordinates due to the mechanism to
+       or vice versa.   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 <STRONG>ripoffline</STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
 
-       <STRONG>o</STRONG>   If the parameter <EM>to</EM><STRONG>_</STRONG><EM>screen</EM> is <STRONG>TRUE</STRONG>, the pointers <EM>pY,</EM> <EM>pX</EM> must refer-
-           ence the coordinates of a location inside the window <EM>win</EM>.  They are
-           converted  to  window-relative coordinates and returned through the
-           pointers.  If the conversion was successful, the  function  returns
-           <STRONG>TRUE</STRONG>.
+       <STRONG>o</STRONG>   If  the  parameter  <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>TRUE</STRONG>,  the  pointers <EM>pY,</EM> <EM>pX</EM> must
+           reference the coordinates of a  location  inside  the  window  <EM>win</EM>.
+           They  are  converted  to  window-relative  coordinates and returned
+           through the  pointers.   If  the  conversion  was  successful,  the
+           function returns <STRONG>TRUE</STRONG>.
 
        <STRONG>o</STRONG>   If one of the parameters was NULL or the location is not inside the
            window, <STRONG>FALSE</STRONG> is returned.
 
        <STRONG>o</STRONG>   If <EM>to</EM><STRONG>_</STRONG><EM>screen</EM> is <STRONG>FALSE</STRONG>, the pointers <EM>pY,</EM> <EM>pX</EM> must  reference  window-
-           relative  coordinates.  They are converted to stdscr-relative coor-
-           dinates if the window <EM>win</EM> encloses this point.  In  this  case  the
-           function returns <STRONG>TRUE</STRONG>.
+           relative   coordinates.   They  are  converted  to  stdscr-relative
+           coordinates if the window <EM>win</EM> encloses this point.   In  this  case
+           the function returns <STRONG>TRUE</STRONG>.
 
        <STRONG>o</STRONG>   If  one  of  the  parameters is NULL or the point is not inside the
-           window, <STRONG>FALSE</STRONG> is returned.  The referenced coordinates are only re-
-           placed  by the converted coordinates if the transformation was suc-
-           cessful.
+           window, <STRONG>FALSE</STRONG> is returned.  The  referenced  coordinates  are  only
+           replaced  by  the  converted  coordinates if the transformation was
+           successful.
 
 
 </PRE><H3><a name="h3-mouse_trafo">mouse_trafo</a></H3><PRE>
@@ -211,15 +211,15 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
        The  <STRONG>mouseinterval</STRONG>  function  sets  the maximum time (in thousands of a
        second) that can elapse between press and release events for them to be
-       recognized  as  a click.  Use <STRONG>mouseinterval(0)</STRONG> to disable click resolu-
-       tion.  This function returns the previous interval value.  Use <STRONG>mousein-</STRONG>
-       <STRONG>terval(-1)</STRONG>  to obtain the interval without altering it.  The default is
-       one sixth of a second.
+       recognized   as   a  click.   Use  <STRONG>mouseinterval(0)</STRONG>  to  disable  click
+       resolution.  This function returns the previous  interval  value.   Use
+       <STRONG>mouseinterval(-1)</STRONG>  to  obtain  the  interval  without altering it.  The
+       default is one sixth of a second.
 
 
 </PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
-       The <STRONG>has_mouse</STRONG> function returns <STRONG>TRUE</STRONG> if the mouse driver has  been  suc-
-       cessfully initialized.
+       The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
+       successfully initialized.
 
        Note  that  mouse  events will be ignored when input is in cooked mode,
        and will cause an error beep when cooked mode is being simulated  in  a
@@ -287,8 +287,8 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
            For instance the SVr4 curses library used the <STRONG>get_mouse</STRONG>  capability
            to  tell  the  terminal  which  mouse button events it should send,
            passing the mouse-button bit-mask to the terminal.  Also, it  could
-           ask  the terminal where the mouse was using the <STRONG>req_mouse_pos</STRONG> capa-
-           bility.
+           ask  the  terminal  where  the  mouse  was  using the <STRONG>req_mouse_pos</STRONG>
+           capability.
 
            Those features required a terminal which had been modified to  work
            with curses.  They were not part of the X Consortium's xterm.
@@ -297,22 +297,22 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        Eric Raymond was uninterested in using the same interface  due  to  its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
        in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
-       use  video  terminals, making it unnecessary to be concerned about com-
-       patibility with the escape sequences.
+       use  video  terminals,  making  it  unnecessary  to  be concerned about
+       compatibility with the escape sequences.
 
        The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the preprocessor
-       can  be used to test whether these features are present.  If the inter-
-       face is changed, the value of <STRONG>NCURSES_MOUSE_VERSION</STRONG> will be  increment-
-       ed.   These values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified when con-
-       figuring ncurses:
+       can  be  used  to  test  whether  these  features  are present.  If the
+       interface is  changed,  the  value  of  <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will  be
+       incremented.   These  values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified
+       when configuring ncurses:
 
           1  has definitions for reserved events.  The mask uses 28 bits.
 
-          2  adds definitions for button 5, removes the  definitions  for  re-
-             served events.  The mask uses 29 bits.
+          2  adds definitions  for  button  5,  removes  the  definitions  for
+             reserved events.  The mask uses 29 bits.
 
-       The order of the <STRONG>MEVENT</STRONG> structure members is not guaranteed.  Addition-
-       al fields may be added to the structure in the future.
+       The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
+       Additional fields may be added to the structure in the future.
 
        Under <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, these calls are  implemented  using  either  xterm's
        built-in mouse-tracking API or platform-specific drivers including
@@ -338,9 +338,9 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
           \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-       The <EM>z</EM> member in the event structure is not presently used.  It  is  in-
-       tended  for use with touch screens (which may be pressure-sensitive) or
-       with 3D-mice/trackballs/power gloves.
+       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
+       intended  for  use with touch screens (which may be pressure-sensitive)
+       or with 3D-mice/trackballs/power gloves.
 
        The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
        They  are  distinct.   For example, in xterm, wheel/scrolling mice send
@@ -361,8 +361,8 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        i.e., it is the beginning of the response.
 
        Because there are no standard terminal responses that  would  serve  to
-       identify  terminals which support the xterm mouse protocol, <STRONG>ncurses</STRONG> as-
-       sumes that if <STRONG>kmous</STRONG> is defined in the terminal description, or  if  the
+       identify  terminals  which  support  the  xterm mouse protocol, <STRONG>ncurses</STRONG>
+       assumes that if <STRONG>kmous</STRONG> 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 <STRONG>kmous</STRONG> capability
        is  checked first, allowing the use of newer xterm mouse protocols such
@@ -370,12 +370,12 @@ <H1 class="no-header">curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,  <STRONG>curs_vari-</STRONG>
-       <STRONG><A HREF="curs_variables.3x.html">ables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-09                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 78d2f5c6b..0409b5e78 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_move.3x,v 1.29 2023/09/16 20:18:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_move 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>move</STRONG>, <STRONG>wmove</STRONG> - move <STRONG>curses</STRONG> window cursor
+       <STRONG>move</STRONG>, <STRONG>wmove</STRONG> - move cursor in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -59,9 +59,9 @@ <H1 class="no-header">curs_move 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines move the cursor associated with the window to line <EM>y</EM> and
-       column <EM>x</EM>.  This routine does not move the physical cursor of the termi-
-       nal until <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> is called.  The position specified is relative to
-       the upper left-hand corner of the window, which is (0,0).
+       column <EM>x</EM>.  This routine does  not  move  the  physical  cursor  of  the
+       terminal  until  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The  position  specified is
+       relative to the upper left-hand corner of the window, which is (0,0).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_move 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 28d1487ce..d6c82def2 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.23 2023/07/01 14:31:54 tom Exp @
+  * @Id: curs_opaque.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>is_cleared</STRONG>, <STRONG>is_idlok</STRONG>, <STRONG>is_idcok</STRONG>, <STRONG>is_immedok</STRONG>, <STRONG>is_keypad</STRONG>, <STRONG>is_leaveok</STRONG>,
-       <STRONG>is_nodelay</STRONG>, <STRONG>is_notimeout</STRONG>, <STRONG>is_pad</STRONG>, <STRONG>is_scrollok</STRONG>, <STRONG>is_subwin</STRONG>, <STRONG>is_syncok</STRONG>,
-       <STRONG>wgetdelay</STRONG>, <STRONG>wgetparent</STRONG>, <STRONG>wgetscrreg</STRONG> - <STRONG>curses</STRONG> window properties
+       <STRONG>is_cleared</STRONG>,  <STRONG>is_idlok</STRONG>,  <STRONG>is_idcok</STRONG>,  <STRONG>is_immedok</STRONG>,  <STRONG>is_keypad</STRONG>,  <STRONG>is_leaveok</STRONG>,
+       <STRONG>is_nodelay</STRONG>, <STRONG>is_notimeout</STRONG>, <STRONG>is_pad</STRONG>,  <STRONG>is_scrollok</STRONG>,  <STRONG>is_subwin</STRONG>,  <STRONG>is_syncok</STRONG>,
+       <STRONG>wgetdelay</STRONG>, <STRONG>wgetparent</STRONG>, <STRONG>wgetscrreg</STRONG> - obtain <EM>curses</EM> window properties
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -74,8 +74,8 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        This  implementation  provides functions which return properties set in
-       the WINDOW structure, allowing it to be "opaque" if the  symbol  <STRONG>NCURS-</STRONG>
-       <STRONG>ES_OPAQUE</STRONG> is defined:
+       the WINDOW  structure,  allowing  it  to  be  "opaque"  if  the  symbol
+       <STRONG>NCURSES_OPAQUE</STRONG> is defined:
 
        <STRONG>is_cleared</STRONG>
             returns the value set in <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG>
@@ -108,8 +108,8 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
             returns the value set in <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>
 
        <STRONG>is_subwin</STRONG>
-            returns  <STRONG>TRUE</STRONG>  if the window is a subwindow, i.e., created by <STRONG>sub-</STRONG>
-            <STRONG><A HREF="subwin.3x.html">win(3x)</A></STRONG> or <STRONG><A HREF="derwin.3x.html">derwin(3x)</A></STRONG>
+            returns  <STRONG>TRUE</STRONG>  if  the  window  is  a  subwindow, i.e., created by
+            <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG> or <STRONG><A HREF="derwin.3x.html">derwin(3x)</A></STRONG>
 
        <STRONG>is_syncok</STRONG>
             returns the value set in <STRONG><A HREF="syncok.3x.html">syncok(3x)</A></STRONG>
@@ -118,8 +118,8 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
             returns the delay timeout as set in <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
 
        <STRONG>wgetparent</STRONG>
-            returns the parent WINDOW pointer for subwindows, or NULL for win-
-            dows having no parent.
+            returns the parent WINDOW pointer  for  subwindows,  or  NULL  for
+            windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
             returns the top and bottom rows for the scrolling margin as set in
@@ -137,8 +137,8 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on ncurses extensions be conditioned using  NCURSES_VER-
-       SION.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -146,7 +146,7 @@ <H1 class="no-header">curs_opaque 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index dcf87bdc1..d309d4b79 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_outopts.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>clearok</STRONG>, <STRONG>idlok</STRONG>, <STRONG>idcok</STRONG>, <STRONG>immedok</STRONG>, <STRONG>leaveok</STRONG>, <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>,
-       <STRONG>scrollok</STRONG> - <STRONG>curses</STRONG> output options
+       <STRONG>clearok</STRONG>,   <STRONG>idlok</STRONG>,   <STRONG>idcok</STRONG>,  <STRONG>immedok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>setscrreg</STRONG>,  <STRONG>wsetscrreg</STRONG>,
+       <STRONG>scrollok</STRONG> - set <EM>curses</EM> output options
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -66,9 +66,9 @@ <H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines set options that change the style of output within <STRONG>curs-</STRONG>
-       <STRONG>es</STRONG>.   All  options are initially <STRONG>FALSE</STRONG>, unless otherwise stated.  It is
-       not necessary to turn these options off before calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
+       These routines set options that  change  the  style  of  output  within
+       <STRONG>curses</STRONG>.   All options are initially <STRONG>FALSE</STRONG>, unless otherwise stated.  It
+       is not necessary to turn these options off before calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-clearok">clearok</a></H3><PRE>
@@ -84,117 +84,118 @@ <H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-idlok">idlok</a></H3><PRE>
        If <STRONG>idlok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, <STRONG>curses</STRONG> considers using
        the  hardware  insert/delete  line  feature  of  terminals so equipped.
-       Calling <STRONG>idlok</STRONG> with <STRONG>FALSE</STRONG> as second argument disables use of line inser-
-       tion  and deletion.  This option should be enabled only if the applica-
-       tion needs insert/delete line, for example, for a screen editor.  It is
-       disabled by default because insert/delete line tends to be visually an-
-       noying when used in applications where it is not really needed.  If in-
-       sert/delete line cannot be used, <STRONG>curses</STRONG> redraws the changed portions of
-       all lines.
+       Calling <STRONG>idlok</STRONG> with <STRONG>FALSE</STRONG>  as  second  argument  disables  use  of  line
+       insertion  and  deletion.   This  option  should be enabled only if the
+       application needs insert/delete line, for example, for a screen editor.
+       It  is  disabled  by  default  because  insert/delete  line tends to be
+       visually annoying when used in applications  where  it  is  not  really
+       needed.   If  insert/delete  line  cannot  be  used, <STRONG>curses</STRONG> redraws the
+       changed portions of all lines.
 
 
 </PRE><H3><a name="h3-idcok">idcok</a></H3><PRE>
-       If <STRONG>idcok</STRONG> is called with <STRONG>FALSE</STRONG> as second argument, <STRONG>curses</STRONG> no longer con-
-       siders  using the hardware insert/delete character feature of terminals
-       so equipped.  Use of character insert/delete  is  enabled  by  default.
-       Calling  <STRONG>idcok</STRONG> with <STRONG>TRUE</STRONG> as second argument re-enables use of character
-       insertion and deletion.
+       If <STRONG>idcok</STRONG> is called with <STRONG>FALSE</STRONG> as  second  argument,  <STRONG>curses</STRONG>  no  longer
+       considers   using  the  hardware  insert/delete  character  feature  of
+       terminals so equipped.  Use of character insert/delete  is  enabled  by
+       default.   Calling <STRONG>idcok</STRONG> with <STRONG>TRUE</STRONG> as second argument re-enables use of
+       character insertion and deletion.
 
 
 </PRE><H3><a name="h3-immedok">immedok</a></H3><PRE>
        If <STRONG>immedok</STRONG> is called with <STRONG>TRUE</STRONG> <STRONG>as</STRONG> <STRONG>argument</STRONG>, any change  in  the  window
-       image, such as the ones caused by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>, etc., auto-
-       matically cause a call to <STRONG>wrefresh</STRONG>.  However, it  may  degrade  perfor-
-       mance  considerably, due to repeated calls to <STRONG>wrefresh</STRONG>.  It is disabled
-       by default.
+       image,  such  as  the  ones  caused  by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>, etc.,
+       automatically cause a  call  to  <STRONG>wrefresh</STRONG>.   However,  it  may  degrade
+       performance  considerably,  due  to  repeated calls to <STRONG>wrefresh</STRONG>.  It is
+       disabled by default.
 
 
 </PRE><H3><a name="h3-leaveok">leaveok</a></H3><PRE>
        Normally, the hardware cursor is left at the  location  of  the  window
        cursor  being  refreshed.   The  <STRONG>leaveok</STRONG> option allows the cursor to be
-       left wherever the update happens to leave it.  It is useful for  appli-
-       cations  where  the  cursor  is not used, since it reduces the need for
-       cursor motions.
+       left wherever the update  happens  to  leave  it.   It  is  useful  for
+       applications  where  the  cursor is not used, since it reduces the need
+       for cursor motions.
 
 
 </PRE><H3><a name="h3-scrollok">scrollok</a></H3><PRE>
        The <STRONG>scrollok</STRONG> option controls what happens when the cursor of  a  window
        is  moved  off  the edge of the window or scrolling region, either as a
-       result of a newline action on the bottom line, or typing the last char-
-       acter of the last line.  If disabled, (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the cursor is left
-       on the bottom line.  If enabled, (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the window  is  scrolled
-       up one line (Note that to get the physical scrolling effect on the ter-
-       minal, it is also necessary to call <STRONG>idlok</STRONG>).
+       result of a newline action on the  bottom  line,  or  typing  the  last
+       character  of the last line.  If disabled, (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the cursor is
+       left on the bottom line.  If enabled,  (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the  window  is
+       scrolled up one line (Note that to get the physical scrolling effect on
+       the terminal, it is also necessary to call <STRONG>idlok</STRONG>).
 
 
 </PRE><H3><a name="h3-setscrreg_wsetscrreg">setscrreg/wsetscrreg</a></H3><PRE>
        The <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> routines allow the application  programmer
-       to set a software scrolling region in a window.  The <EM>top</EM> and <EM>bot</EM> param-
-       eters are the line  numbers  of  the  top  and  bottom  margin  of  the
-       scrolling region.  (Line 0 is the top line of the window.)  If this op-
-       tion and <STRONG>scrollok</STRONG> are enabled, an attempt to move off the bottom margin
-       line causes all lines in the scrolling region to scroll one line in the
-       direction of the first line.  Only the text of the window is  scrolled.
-       (Note  that this has nothing to do with the use of a physical scrolling
-       region capability in the terminal, like that in the VT100.  If <STRONG>idlok</STRONG> is
-       enabled and the terminal has either a scrolling region or insert/delete
-       line capability, they will probably be used by the output routines.)
+       to  set  a  software  scrolling  region  in  a window.  The <EM>top</EM> and <EM>bot</EM>
+       parameters are the line numbers of the top and  bottom  margin  of  the
+       scrolling  region.   (Line  0  is the top line of the window.)  If this
+       option and <STRONG>scrollok</STRONG> are enabled, an attempt  to  move  off  the  bottom
+       margin line causes all lines in the scrolling region to scroll one line
+       in the direction of the first line.  Only the text  of  the  window  is
+       scrolled.  (Note that this has nothing to do with the use of a physical
+       scrolling region capability in the terminal, like that  in  the  VT100.
+       If  <STRONG>idlok</STRONG>  is enabled and the terminal has either a scrolling region or
+       insert/delete line capability, they will probably be used by the output
+       routines.)
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The functions <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> return <STRONG>OK</STRONG> upon success  and  <STRONG>ERR</STRONG>
-       upon  failure.  All other routines that return an integer always return
+       The  functions  <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> return <STRONG>OK</STRONG> upon success and <STRONG>ERR</STRONG>
+       upon failure.  All other routines that return an integer always  return
        <STRONG>OK</STRONG>.
 
        X/Open Curses does not define any error conditions.
 
        In this implementation,
 
-       <STRONG>o</STRONG>   those functions that have a window pointer will return an error  if
+       <STRONG>o</STRONG>   those  functions that have a window pointer will return an error if
            the window pointer is null
 
-       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
+       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG> returns an error if the scrolling region  limits  extend
            outside the window.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       X/Open  does  not  define  any  error  conditions.  This implementation
+       returns an error if the window pointer is null.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       From the outset, ncurses used <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> to control the conversion of new-
-       lines to carriage return/line-feed on output as  well  as  input.   XSI
-       Curses  documents only the use of these functions for input.  This dif-
-       ference arose from converting the  <EM>pcurses</EM>  source  (which  used  <STRONG>ioctl</STRONG>
-       calls  with  the <STRONG>sgttyb</STRONG> structure) to termios (i.e., the POSIX terminal
+       From the outset, ncurses used <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>  to  control  the  conversion  of
+       newlines  to carriage return/line-feed on output as well as input.  XSI
+       Curses documents only the use  of  these  functions  for  input.   This
+       difference  arose  from converting the <EM>pcurses</EM> source (which used <STRONG>ioctl</STRONG>
+       calls with the <STRONG>sgttyb</STRONG> structure) to termios (i.e., the  POSIX  terminal
        interface).  In the former, both input and output were controlled via a
-       single  option  <STRONG>CRMOD</STRONG>,  while the latter separates these features.  Be-
-       cause that conversion interferes with output optimization, <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> were
-       amended after ncurses 6.2 to eliminate their effect on output.
+       single  option  <STRONG>CRMOD</STRONG>,  while  the  latter  separates  these  features.
+       Because  that  conversion  interferes with output optimization, <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>
+       were amended after ncurses 6.2 to eliminate their effect on output.
 
-       Some  historic  curses implementations had, as an undocumented feature,
-       the ability to do the equivalent of <STRONG>clearok(...,</STRONG> <STRONG>1)</STRONG>  by  saying  <STRONG>touch-</STRONG>
-       <STRONG>win(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
+       Some historic curses implementations had, as an  undocumented  feature,
+       the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
+       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
 
-       Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
-       enabled, any window modification triggering  a  scroll  also  forced  a
+       Earlier System V curses implementations specified  that  with  <STRONG>scrollok</STRONG>
+       enabled,  any  window  modification  triggering  a scroll also forced a
        physical refresh.  XSI Curses does not require this, and <STRONG>ncurses</STRONG> avoids
-       doing it to perform better  vertical-motion  optimization  at  <STRONG>wrefresh</STRONG>
+       doing  it  to  perform  better vertical-motion optimization at <STRONG>wrefresh</STRONG>
        time.
 
        The XSI Curses standard does not mention that the cursor should be made
-       invisible as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation  does
-       this,  but  the code does not.  Use <STRONG>curs_set</STRONG> to make the cursor invisi-
-       ble.
+       invisible  as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does
+       this, but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the  cursor
+       invisible.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and  <STRONG>setscrreg</STRONG>  may  be
+       Note  that  <STRONG>clearok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and <STRONG>setscrreg</STRONG> may be
        macros.
 
-       The <STRONG>immedok</STRONG> routine is useful for windows that are used as terminal em-
-       ulators.
+       The <STRONG>immedok</STRONG> routine is useful for windows that  are  used  as  terminal
+       emulators.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -203,7 +204,7 @@ <H1 class="no-header">curs_outopts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 06bbce878..4b7ba1aa8 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.26 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_overlay.3x,v 1.30 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>overlay</STRONG>, <STRONG>overwrite</STRONG>, <STRONG>copywin</STRONG> - overlay and manipulate overlapped <STRONG>curses</STRONG>
-       windows
+       <STRONG>overlay</STRONG>,  <STRONG>overwrite</STRONG>,  <STRONG>copywin</STRONG>  -  overlay <EM>curses</EM> windows and manipulate
+       them
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,23 +67,23 @@ <H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        The <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> routines overlay <EM>srcwin</EM>  on  top  of  <EM>dstwin</EM>.
        <EM>scrwin</EM> and <EM>dstwin</EM> are not required to be the same size; only text where
        the two windows overlap is copied.  The difference is that  <STRONG>overlay</STRONG>  is
-       non-destructive  (blanks  are not copied) whereas <STRONG>overwrite</STRONG> is destruc-
-       tive.
+       non-destructive   (blanks   are   not   copied)  whereas  <STRONG>overwrite</STRONG>  is
+       destructive.
 
 
 </PRE><H3><a name="h3-copywin">copywin</a></H3><PRE>
        The <STRONG>copywin</STRONG> routine provides a finer granularity of  control  over  the
-       <STRONG>overlay</STRONG>  and <STRONG>overwrite</STRONG> routines.  As in the <STRONG>prefresh</STRONG> routine, a rectan-
-       gle is specified in the  destination  window,  (<EM>dminrow</EM>,  <EM>dmincol</EM>)  and
-       (<EM>dmaxrow</EM>, <EM>dmaxcol</EM>), and the upper-left-corner coordinates of the source
-       window, (<EM>sminrow</EM>, <EM>smincol</EM>).  If the  argument  <EM>overlay</EM>  is  <STRONG>true</STRONG>,  then
-       copying is non-destructive, as in <STRONG>overlay</STRONG>.
+       <STRONG>overlay</STRONG>  and  <STRONG>overwrite</STRONG>  routines.   As  in  the  <STRONG>prefresh</STRONG>  routine,  a
+       rectangle is specified in the destination  window,  (<EM>dminrow</EM>,  <EM>dmincol</EM>)
+       and  (<EM>dmaxrow</EM>,  <EM>dmaxcol</EM>),  and the upper-left-corner coordinates of the
+       source window, (<EM>sminrow</EM>, <EM>smincol</EM>).  If the argument  <EM>overlay</EM>  is  <STRONG>true</STRONG>,
+       then copying is non-destructive, as in <STRONG>overlay</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines  that  return an integer return <STRONG>ERR</STRONG> upon failure, and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer value other than <STRONG>ERR</STRONG>") upon successful  com-
-       pletion.
+       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       completion.
 
        X/Open  defines  no error conditions.  In this implementation, <STRONG>copywin</STRONG>,
        <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> return an error if either of the window  pointers
@@ -97,8 +97,8 @@ <H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The  XSI Curses standard, Issue 4 describes these functions (adding the
        const qualifiers).  It further specifies their behavior in the presence
-       of  characters with multibyte renditions (not yet supported in this im-
-       plementation).
+       of  characters  with  multibyte  renditions  (not yet supported in this
+       implementation).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index df83523ac..68ab04fb4 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.33 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_pad.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>newpad</STRONG>, <STRONG>subpad</STRONG>, <STRONG>prefresh</STRONG>, <STRONG>pnoutrefresh</STRONG>, <STRONG>pechochar</STRONG>, <STRONG>pecho_wchar</STRONG> - create
-       and display <STRONG>curses</STRONG> pads
+       and display <EM>curses</EM> pads
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -73,12 +73,12 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        A pad is like a window, except that it is not restricted by the  screen
        size,  and  is not necessarily associated with a particular part of the
        screen.  Pads can be used when a large window is  needed,  and  only  a
-       part  of  the  window will be on the screen at one time.  Automatic re-
-       freshes of pads (e.g., from scrolling or echoing of input) do  not  oc-
-       cur.
+       part  of  the  window  will  be  on  the screen at one time.  Automatic
+       refreshes of pads (e.g., from scrolling or echoing  of  input)  do  not
+       occur.
 
-       It  is  not  legal to call <STRONG>wrefresh</STRONG> with a <EM>pad</EM> as an argument; the rou-
-       tines <STRONG>prefresh</STRONG> or <STRONG>pnoutrefresh</STRONG> should be  called  instead.   Note  that
+       It  is  not  legal  to  call  <STRONG>wrefresh</STRONG>  with  a <EM>pad</EM> as an argument; the
+       routines <STRONG>prefresh</STRONG> or <STRONG>pnoutrefresh</STRONG> should be called instead.  Note  that
        these routines require additional parameters to specify the part of the
        pad to be displayed and the location on the screen to be used  for  the
        display.
@@ -86,8 +86,8 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-subpad">subpad</a></H3><PRE>
        The  <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow within
-       a pad with the given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.   Un-
-       like  <STRONG>subwin</STRONG>,  which uses screen coordinates, the window is at position
+       a pad with the given number  of  lines,  <EM>nlines</EM>,  and  columns,  <EM>ncols</EM>.
+       Unlike <STRONG>subwin</STRONG>, which uses screen coordinates, the window is at position
        (<EM>begin</EM>_<EM>x</EM><STRONG>,</STRONG> <EM>begin</EM>_<EM>y</EM>) on the pad.  The window is made in the middle of the
        window  <EM>orig</EM>,  so  that changes made to one window affect both windows.
        During the use of this routine, it will  often  be  necessary  to  call
@@ -100,8 +100,8 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        additional  parameters  are needed to indicate what part of the pad and
        screen are involved.
 
-       <STRONG>o</STRONG>   The <EM>pminrow</EM> and <EM>pmincol</EM> parameters specify the upper left-hand cor-
-           ner of the rectangle to be displayed in the pad.
+       <STRONG>o</STRONG>   The <EM>pminrow</EM> and <EM>pmincol</EM>  parameters  specify  the  upper  left-hand
+           corner of the rectangle to be displayed in the pad.
 
        <STRONG>o</STRONG>   The  <EM>sminrow</EM>,  <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters specify the
            edges of the rectangle to be displayed on the screen.
@@ -118,23 +118,23 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        followed  by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a call
        to <STRONG>wrefresh</STRONG>, or a call to <STRONG>waddch</STRONG> followed by a call to  <STRONG>prefresh</STRONG>.   The
        knowledge  that  only  a single character is being output is taken into
-       consideration and, for non-control characters, a  considerable  perfor-
-       mance  gain  might  be  seen  by  using these routines instead of their
+       consideration  and,  for   non-control   characters,   a   considerable
+       performance gain might be seen by using these routines instead of their
        equivalents.  In the case of <STRONG>pechochar</STRONG>, the last location of the pad on
        the screen is reused for the arguments to <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-pecho_wchar">pecho_wchar</a></H3><PRE>
-       The  <STRONG>pecho_wchar</STRONG>  function  is the analogous wide-character form of <STRONG>pe-</STRONG>
-       <STRONG>chochar</STRONG>.  It outputs one character to a pad and  immediately  refreshes
-       the pad.  It does this by a call to <STRONG>wadd_wch</STRONG> followed by a call to <STRONG>pre-</STRONG>
-       <STRONG>fresh</STRONG>.
+       The  <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form of
+       <STRONG>pechochar</STRONG>.  It outputs one character to a pad and immediately refreshes
+       the  pad.   It  does  this  by a call to <STRONG>wadd_wch</STRONG> followed by a call to
+       <STRONG>prefresh</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
-       only  specifies "an integer value other than <STRONG>ERR</STRONG>") upon successful com-
-       pletion.
+       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error, and  set  <STRONG>errno</STRONG>  to
        <STRONG>ENOMEM</STRONG>.
@@ -144,16 +144,16 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
                return an error if the window pointer is null, or if the window
                is not really a pad or if the  area  to  refresh  extends  off-
-               screen or if the minimum coordinates are greater than the maxi-
-               mum.
+               screen  or  if  the  minimum  coordinates  are greater than the
+               maximum.
 
           <STRONG>pechochar</STRONG>
-               returns an error if the window is not really a pad, and the as-
-               sociated call to <STRONG>wechochar</STRONG> returns an error.
+               returns an error if the window is not really  a  pad,  and  the
+               associated call to <STRONG>wechochar</STRONG> returns an error.
 
           <STRONG>pecho_wchar</STRONG>
-               returns an error if the window is not really a pad, and the as-
-               sociated call to <STRONG>wecho_wchar</STRONG> returns an error.
+               returns  an  error  if  the window is not really a pad, and the
+               associated call to <STRONG>wecho_wchar</STRONG> returns an error.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -163,18 +163,18 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        BSD curses has no <EM>pad</EM> feature.
 
-       SVr2 curses (1986) provided the <STRONG>newpad</STRONG> and related functions, document-
-       ing  them  in  a single line each.  SVr3 (1987) provided more extensive
-       documentation.
+       SVr2  curses  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
+       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
+       extensive documentation.
 
        The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
        <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
 
-       <STRONG>o</STRONG>   These  graphical pads could be much larger than the computer's dis-
-           play.
+       <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
+           display.
 
-       <STRONG>o</STRONG>   The read-only output from a command could be scrolled back  to  in-
-           spect, and select text from the pad.
+       <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
+           inspect, and select text from the pad.
 
        The two uses may be related.
 
@@ -195,16 +195,16 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            returning <STRONG>ERR</STRONG> in that case.
 
            However,  it only sets the flag for subwindows if the parent window
-           is a pad.  Its <STRONG>newpad</STRONG> function does not set this information.  Con-
-           sequently, the check will never fail.
+           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
+           Consequently, the check will never fail.
 
            It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
            enough, a comment in the source code states  that  the  lack  of  a
            check was an MKS extension.
 
        <STRONG>o</STRONG>   NetBSD  7 curses sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and
-           <STRONG>subpad</STRONG>, using this to help with the  distinction  between  <STRONG>wnoutre-</STRONG>
-           <STRONG>fresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
+           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
+           <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
            It  does  not  check for the case where a subwindow is created in a
            pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
@@ -223,8 +223,8 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures that <STRONG>dupwin</STRONG> and <STRONG>getwin</STRONG> treat pads  versus  windows  consis-
-           tently.
+       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
+           consistently.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_pad 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index f7d4cea14..b0d8c668b 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.20 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_print.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_print 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>mcprint</STRONG> - ship binary data to printer
+       <STRONG>mcprint</STRONG> - write binary data to printer using <EM>terminfo</EM> capabilities
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_print 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index a9a490e51..dfd7d6193 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_printw.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG>, <STRONG>mvwprintw</STRONG>, <STRONG>vwprintw</STRONG>, <STRONG>vw_printw</STRONG> - print
-       formatted output in <STRONG>curses</STRONG> windows
+       <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>,  <STRONG>mvprintw</STRONG>,  <STRONG>mvwprintw</STRONG>,  <STRONG>vwprintw</STRONG>,  <STRONG>vw_printw</STRONG>  - write
+       formatted output to <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,19 +67,19 @@ <H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG> and <STRONG>mvwprintw</STRONG> routines are  analogous  to
        <STRONG>printf</STRONG>  [see <STRONG>printf(3)</STRONG>].  In effect, the string that would be output by
-       <STRONG>printf</STRONG> is output instead as though <STRONG>waddstr</STRONG> were used on the given  win-
-       dow.
+       <STRONG>printf</STRONG> is output instead as though  <STRONG>waddstr</STRONG>  were  used  on  the  given
+       window.
 
        The  <STRONG>vwprintw</STRONG>  and  <STRONG>vw_printw</STRONG>  routines  are  analogous to <STRONG>vprintf</STRONG> [see
        <STRONG>printf(3)</STRONG>] and perform a <STRONG>wprintw</STRONG> using a variable argument  list.   The
-       third  argument  is a <STRONG>va_list</STRONG>, a pointer to a list of arguments, as de-
-       fined in <STRONG>&lt;stdarg.h&gt;</STRONG>.
+       third  argument  is  a  <STRONG>va_list</STRONG>,  a  pointer to a list of arguments, as
+       defined in <STRONG>&lt;stdarg.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
-       only  specifies "an integer value other than <STRONG>ERR</STRONG>") upon successful com-
-       pletion.
+       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion.
 
        X/Open defines no error conditions.  In this implementation,  an  error
        may be returned if it cannot allocate enough memory for the buffer used
@@ -97,9 +97,9 @@ <H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
        standard.   It  did not use &lt;varargs.h&gt;, though that was available.  In
        1991 (a couple of years after SVr4 was generally available,  and  after
        the  C  standard  was published), other developers updated the library,
-       using &lt;stdarg.h&gt; internally in 4.4BSD curses.  Even with this  improve-
-       ment, BSD curses did not use function prototypes (or even declare func-
-       tions) in the &lt;curses.h&gt; header until 1992.
+       using  &lt;stdarg.h&gt;  internally  in  4.4BSD  curses.   Even   with   this
+       improvement,  BSD  curses  did  not  use  function  prototypes (or even
+       declare functions) in the &lt;curses.h&gt; header until 1992.
 
        SVr2 documented <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>  tersely  as  "printf  on  <EM>stdscr</EM>"  and
        tersely as "printf on <EM>win</EM>", respectively.
@@ -107,20 +107,22 @@ <H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
        SVr3  added  <STRONG>mvprintw</STRONG>,  and <STRONG>mvwprintw</STRONG>, with a three-line summary saying
        that they were analogous to <STRONG>printf(3)</STRONG>, explaining that the string which
        would be output from <STRONG>printf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on
-       the given window.  SVr3 also added <STRONG>vwprintw</STRONG>, saying that the third  pa-
-       rameter  is a <STRONG>va_list</STRONG>, defined in &lt;varargs.h&gt;, and referring the reader
-       to the manual pages for <EM>varargs</EM> and <STRONG>vprintf</STRONG> for detailed descriptions.
+       the given window.  SVr3 also added  <STRONG>vwprintw</STRONG>,  saying  that  the  third
+       parameter  is  a  <STRONG>va_list</STRONG>,  defined  in  &lt;varargs.h&gt;, and referring the
+       reader to the  manual  pages  for  <EM>varargs</EM>  and  <STRONG>vprintf</STRONG>  for  detailed
+       descriptions.
 
-       SVr4 added  no  new  variations  of  <STRONG>printw</STRONG>,  but  provided  for  using
+       SVr4  added  no  new  variations  of  <STRONG>printw</STRONG>,  but  provided  for using
        &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
 
-       X/Open  Curses  added  <STRONG>vw_printw</STRONG>  to replace <STRONG>vwprintw</STRONG>, stating that its
+       X/Open Curses added <STRONG>vw_printw</STRONG> to replace  <STRONG>vwprintw</STRONG>,  stating  that  its
        <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       In this implementation, <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> are equivalent, to  sup-
-       port legacy applications.  However, the latter (<STRONG>vwprintw</STRONG>) is obsolete:
+       In  this  implementation,  <STRONG>vw_printw</STRONG>  and  <STRONG>vwprintw</STRONG>  are equivalent, to
+       support  legacy  applications.   However,  the  latter  (<STRONG>vwprintw</STRONG>)   is
+       obsolete:
 
        <STRONG>o</STRONG>   The  XSI  Curses  standard, Issue 4 described these functions.  The
            function <STRONG>vwprintw</STRONG> is marked TO BE WITHDRAWN, and is to be  replaced
@@ -142,7 +144,7 @@ <H1 class="no-header">curs_printw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index a882addb4..34e56721a 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.31 2023/08/19 19:47:40 tom Exp @
+  * @Id: curs_refresh.3x,v 1.35 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>doupdate</STRONG>, <STRONG>redrawwin</STRONG>, <STRONG>refresh</STRONG>, <STRONG>wnoutrefresh</STRONG>, <STRONG>wredrawln</STRONG>, <STRONG>wrefresh</STRONG> -
-       refresh <STRONG>curses</STRONG> windows and lines
+       <STRONG>doupdate</STRONG>,  <STRONG>redrawwin</STRONG>,  <STRONG>refresh</STRONG>,  <STRONG>wnoutrefresh</STRONG>,  <STRONG>wredrawln</STRONG>,  <STRONG>wrefresh</STRONG>  -
+       refresh <EM>curses</EM> windows or lines thereupon
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,19 +67,19 @@ <H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-refresh_wrefresh">refresh/wrefresh</a></H3><PRE>
        The <STRONG>refresh</STRONG> and <STRONG>wrefresh</STRONG> routines (or <STRONG>wnoutrefresh</STRONG> and  <STRONG>doupdate</STRONG>)  must
-       be called to get actual output to the terminal, as other routines mere-
-       ly manipulate data structures.  The routine <STRONG>wrefresh</STRONG> copies  the  named
-       window  to  the  <EM>physical</EM>  <EM>screen</EM>,  taking into account what is already
-       there to do optimizations.  The <STRONG>refresh</STRONG> routine is the same, using <STRONG>std-</STRONG>
-       <STRONG>scr</STRONG>  as  the  default window.  Unless <STRONG><A HREF="leaveok.3x.html">leaveok(3x)</A></STRONG> has been enabled, the
-       physical cursor of the terminal is left at the location of  the  cursor
-       for that window.
+       be  called  to  get  actual  output  to the terminal, as other routines
+       merely manipulate data structures.  The  routine  <STRONG>wrefresh</STRONG>  copies  the
+       named  window  to  the  <EM>physical</EM>  <EM>screen</EM>,  taking  into account what is
+       already there to do optimizations.  The <STRONG>refresh</STRONG> routine  is  the  same,
+       using  <STRONG>stdscr</STRONG>  as  the  default  window.   Unless  <STRONG><A HREF="leaveok.3x.html">leaveok(3x)</A></STRONG> has been
+       enabled, the physical cursor of the terminal is left at the location of
+       the cursor for that window.
 
 
 </PRE><H3><a name="h3-wnoutrefresh_doupdate">wnoutrefresh/doupdate</a></H3><PRE>
        The <STRONG>wnoutrefresh</STRONG> and <STRONG>doupdate</STRONG> routines allow multiple updates with more
-       efficiency than <STRONG>wrefresh</STRONG> alone.  In addition to all the  window  struc-
-       tures,  <STRONG>curses</STRONG>  keeps  two  data  structures  representing the terminal
+       efficiency  than  <STRONG>wrefresh</STRONG>  alone.   In  addition  to  all  the  window
+       structures,  <STRONG>curses</STRONG> keeps two data structures representing the terminal
        screen:
 
        <STRONG>o</STRONG>   a <EM>physical</EM> <EM>screen</EM>, describing what is actually on the screen, and
@@ -98,40 +98,40 @@ <H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        If the programmer wishes to output several windows at once, a series of
        calls to <STRONG>wrefresh</STRONG> results in  alternating  calls  to  <STRONG>wnoutrefresh</STRONG>  and
        <STRONG>doupdate</STRONG>,  causing  several  bursts  of output to the screen.  By first
-       calling <STRONG>wnoutrefresh</STRONG> for each window, it is then possible to call <STRONG>doup-</STRONG>
-       <STRONG>date</STRONG>  once,  resulting  in  only  one burst of output, with fewer total
+       calling <STRONG>wnoutrefresh</STRONG> for each window,  it  is  then  possible  to  call
+       <STRONG>doupdate</STRONG>  once, resulting in only one burst of output, with fewer total
        characters transmitted and less CPU time used.
 
-       If the <EM>win</EM> argument to <STRONG>wrefresh</STRONG> is the <EM>physical</EM> <EM>screen</EM> (i.e., the glob-
-       al  variable  <STRONG>curscr</STRONG>),  the screen is immediately cleared and repainted
-       from scratch.
+       If the <EM>win</EM> argument to <STRONG>wrefresh</STRONG>  is  the  <EM>physical</EM>  <EM>screen</EM>  (i.e.,  the
+       global   variable  <STRONG>curscr</STRONG>),  the  screen  is  immediately  cleared  and
+       repainted from scratch.
 
-       The phrase "copies the named window to the virtual screen" above is am-
-       biguous.   What actually happens is that all <EM>touched</EM> (changed) lines in
-       the window are copied to the virtual  screen.   This  affects  programs
+       The phrase "copies the named window to the  virtual  screen"  above  is
+       ambiguous.   What  actually happens is that all <EM>touched</EM> (changed) lines
+       in the window are copied to the virtual screen.  This affects  programs
        that use overlapping windows; it means that if two windows overlap, you
-       can refresh them in either order and the overlap region will  be  modi-
-       fied  only  when  it  is  explicitly  changed.  (But see the section on
+       can refresh them in  either  order  and  the  overlap  region  will  be
+       modified  only  when it is explicitly changed.  (But see the section on
        <STRONG>PORTABILITY</STRONG> below for a warning about exploiting this behavior.)
 
 
 </PRE><H3><a name="h3-wredrawln_redrawwin">wredrawln/redrawwin</a></H3><PRE>
        The <STRONG>wredrawln</STRONG> routine indicates to <STRONG>curses</STRONG> 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 rou-
-       tine <STRONG>redrawwin</STRONG> touches the entire window.
+       them.  It touches the indicated  lines  (marking  them  changed).   The
+       routine <STRONG>redrawwin</STRONG> touches the entire window.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines  that  return an integer return <STRONG>ERR</STRONG> upon failure, and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer value other than <STRONG>ERR</STRONG>") upon successful  com-
-       pletion.
+       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       completion.
 
        X/Open does not define any error conditions.  In this implementation
 
           <STRONG>wnoutrefresh</STRONG>
-               returns  an error if the window pointer is null, or if the win-
-               dow is really a pad.
+               returns  an  error  if  the  window  pointer is null, or if the
+               window is really a pad.
 
           <STRONG>wredrawln</STRONG>
                returns an error if the associated call to <STRONG>touchln</STRONG>  returns  an
@@ -150,8 +150,8 @@ <H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        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 <STRONG>touchwin</STRONG>
-       before the <STRONG>wnoutrefresh</STRONG> call to guarantee an entire-contents copy  any-
-       where.
+       before the <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an  entire-contents  copy
+       anywhere.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 1fc75d3e1..de9ef5e45 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.33 2022/02/12 20:05:11 tom Exp @
+  * @Id: curs_scanw.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG>, <STRONG>mvscanw</STRONG>, <STRONG>mvwscanw</STRONG>, <STRONG>vwscanw</STRONG>, <STRONG>vw_scanw</STRONG> - convert formatted
-       input from a <STRONG>curses</STRONG> window
+       <STRONG>scanw</STRONG>,  <STRONG>wscanw</STRONG>,  <STRONG>mvscanw</STRONG>,  <STRONG>mvwscanw</STRONG>, <STRONG>vwscanw</STRONG>, <STRONG>vw_scanw</STRONG> - read formatted
+       input from a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -163,7 +163,7 @@ <H1 class="no-header">curs_scanw 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 7013bb3ef..452c5e717 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.24 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>scr_dump</STRONG>, <STRONG>scr_restore</STRONG>, <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG> - read (write) a <STRONG>curses</STRONG> screen
-       from (to) a file
+       <STRONG>scr_dump</STRONG>,  <STRONG>scr_restore</STRONG>,  <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG> - read/write a <EM>curses</EM> screen
+       from/to a file
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -115,9 +115,9 @@ <H1 class="no-header">curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        The XSI Curses standard, Issue 4, describes these functions (adding the
        const qualifiers).
 
-       The SVr4 docs merely say under <STRONG>scr_init</STRONG> that the dump data is also con-
-       sidered invalid "if the time-stamp of the tty is old" but do not define
-       "old".
+       The SVr4 docs merely say under <STRONG>scr_init</STRONG> that  the  dump  data  is  also
+       considered  invalid  "if  the  time-stamp of the tty is old" but do not
+       define "old".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 341d6dfaa..a586f2b19 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.28 2023/08/19 19:47:52 tom Exp @
+  * @Id: curs_scroll.3x,v 1.32 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>scroll</STRONG>, <STRONG>scrl</STRONG>, <STRONG>wscrl</STRONG> - scroll a <STRONG>curses</STRONG> window
+       <STRONG>scroll</STRONG>, <STRONG>scrl</STRONG>, <STRONG>wscrl</STRONG> - scroll a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -60,9 +60,9 @@ <H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>scroll</STRONG> routine scrolls the window up one line.  This involves mov-
-       ing the lines in the window data structure.  As an optimization, if the
-       scrolling  region  of  the  window  is  the entire screen, the <EM>physical</EM>
+       The  <STRONG>scroll</STRONG>  routine  scrolls  the  window  up one line.  This involves
+       moving the lines in the window data structure.  As an optimization,  if
+       the  scrolling  region of the window is the entire screen, the <EM>physical</EM>
        <EM>screen</EM> may be scrolled at the same time.
 
        For positive <EM>n</EM>, the <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> routines  scroll  the  window  up  <EM>n</EM>
@@ -70,8 +70,8 @@ <H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        This involves moving the lines in the window character image structure.
        The current cursor position is not changed.
 
-       For  these  functions  to  work,  scrolling  must be enabled via <STRONG>scrol-</STRONG>
-       <STRONG><A HREF="scrollok.3x.html">lok(3x)</A></STRONG>.
+       For   these   functions   to   work,  scrolling  must  be  enabled  via
+       <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -94,8 +94,8 @@ <H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        of smarter optimization of multiple scroll actions on the next update.
 
        Neither the SVr4 nor the XSI documentation specify whether the  current
-       attribute or current color-pair of blanks generated by the scroll func-
-       tion is zeroed.  Under this implementation it is.
+       attribute  or  current  color-pair  of  blanks  generated by the scroll
+       function is zeroed.  Under this implementation it is.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 06ca45a47..5e0231eb1 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.48 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_slk.3x,v 1.53 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -47,10 +47,10 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>slk_init</STRONG>, <STRONG>slk_set</STRONG>, <STRONG>slk_wset</STRONG>, <STRONG>slk_refresh</STRONG>, <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_label</STRONG>,
-       <STRONG>slk_clear</STRONG>, <STRONG>slk_restore</STRONG>, <STRONG>slk_touch</STRONG>, <STRONG>slk_attron</STRONG>, <STRONG>slk_attrset</STRONG>,
-       <STRONG>slk_attroff</STRONG>, <STRONG>slk_attr_on</STRONG>, <STRONG>slk_attr_set</STRONG>, <STRONG>slk_attr_off</STRONG>, <STRONG>slk_attr</STRONG>,
-       <STRONG>slk_color</STRONG>, <STRONG>extended_slk_color</STRONG> - <STRONG>curses</STRONG> soft label routines
+       <STRONG>slk_init</STRONG>,  <STRONG>slk_set</STRONG>,  <STRONG>slk_wset</STRONG>, <STRONG>slk_refresh</STRONG>, <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_label</STRONG>,
+       <STRONG>slk_clear</STRONG>,    <STRONG>slk_restore</STRONG>,    <STRONG>slk_touch</STRONG>,    <STRONG>slk_attron</STRONG>,    <STRONG>slk_attrset</STRONG>,
+       <STRONG>slk_attroff</STRONG>,   <STRONG>slk_attr_on</STRONG>,   <STRONG>slk_attr_set</STRONG>,   <STRONG>slk_attr_off</STRONG>,   <STRONG>slk_attr</STRONG>,
+       <STRONG>slk_color</STRONG>, <STRONG>extended_slk_color</STRONG> - <EM>curses</EM> soft label key routines
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -85,20 +85,21 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The slk* functions manipulate the set of soft function-key labels  that
-       exist on many terminals.  For those terminals that do not have soft la-
-       bels, <STRONG>curses</STRONG> takes over the bottom line of <STRONG>stdscr</STRONG>, reducing the size of
-       <STRONG>stdscr</STRONG>  and the variable <STRONG>LINES</STRONG>.  <STRONG>curses</STRONG> standardizes on eight labels of
-       up to eight characters each.  In addition to this, the  ncurses  imple-
-       mentation  supports  a  mode where it simulates 12 labels of up to five
-       characters each.  This is useful for PC-like enduser devices.   ncurses
-       simulates this mode by taking over up to two lines at the bottom of the
-       screen; it does not try to use any hardware support for this mode.
+       exist  on  many  terminals.   For those terminals that do not have soft
+       labels, <STRONG>curses</STRONG> takes over the bottom line of <STRONG>stdscr</STRONG>, reducing the  size
+       of  <STRONG>stdscr</STRONG> and the variable <STRONG>LINES</STRONG>.  <STRONG>curses</STRONG> standardizes on eight labels
+       of up to eight characters each.   In  addition  to  this,  the  ncurses
+       implementation  supports  a  mode where it simulates 12 labels of up to
+       five characters each.  This is  useful  for  PC-like  enduser  devices.
+       ncurses  simulates  this  mode  by  taking  over up to two lines at the
+       bottom of the screen; it does not try to use any hardware  support  for
+       this mode.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The <STRONG>slk_init</STRONG> routine must  be  called  before  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>  is
-       called.   If  <STRONG>initscr</STRONG> eventually uses a line from <STRONG>stdscr</STRONG> to emulate the
-       soft labels, then <EM>fmt</EM> determines how the labels  are  arranged  on  the
+       The  <STRONG>slk_init</STRONG>  routine  must  be  called  before  <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is
+       called.  If <STRONG>initscr</STRONG> eventually uses a line from <STRONG>stdscr</STRONG> to  emulate  the
+       soft  labels,  then  <EM>fmt</EM>  determines how the labels are arranged on the
        screen:
 
           <STRONG>0</STRONG>  indicates a 3-2-3 arrangement of the labels.
@@ -112,7 +113,7 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Labels">Labels</a></H3><PRE>
-       The <STRONG>slk_set</STRONG> routine (and the <STRONG>slk_wset</STRONG> routine  for  the  wide-character
+       The  <STRONG>slk_set</STRONG>  routine  (and the <STRONG>slk_wset</STRONG> routine for the wide-character
        library) has three parameters:
 
           <EM>labnum</EM>
@@ -120,16 +121,16 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
                <STRONG>3</STRONG>);
 
           <EM>label</EM>
-               is be the string to put on the label, up to eight (five if  <EM>fmt</EM>
-               in  <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or <STRONG>3</STRONG>) characters in length.  A null string or
+               is  be the string to put on the label, up to eight (five if <EM>fmt</EM>
+               in <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or <STRONG>3</STRONG>) characters in length.  A null string  or
                a null pointer sets up a blank label.
 
-          <EM>fmt</EM>  is either <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG>, indicating whether the  label  is  to  be
+          <EM>fmt</EM>  is  either  <STRONG>0</STRONG>,  <STRONG>1</STRONG>,  or <STRONG>2</STRONG>, indicating whether the label is to be
                left-justified,  centered,  or  right-justified,  respectively,
                within the label.
 
-       The <STRONG>slk_label</STRONG> routine returns the current label for label  number  <EM>lab-</EM>
-       <EM>num</EM>, with leading and trailing blanks stripped.
+       The  <STRONG>slk_label</STRONG>  routine  returns  the  current  label  for label number
+       <EM>labnum</EM>, with leading and trailing blanks stripped.
 
 
 </PRE><H3><a name="h3-Screen-updates">Screen updates</a></H3><PRE>
@@ -138,32 +139,32 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        The <STRONG>slk_clear</STRONG> routine clears the soft labels from the screen.
 
-       The <STRONG>slk_restore</STRONG> routine restores the soft labels to the screen after  a
+       The  <STRONG>slk_restore</STRONG> routine restores the soft labels to the screen after a
        <STRONG>slk_clear</STRONG> has been performed.
 
-       The  <STRONG>slk_touch</STRONG> routine forces all the soft labels to be output the next
+       The <STRONG>slk_touch</STRONG> routine forces all the soft labels to be output the  next
        time a <STRONG>slk_noutrefresh</STRONG> is performed.
 
 
 </PRE><H3><a name="h3-Video-attributes">Video attributes</a></H3><PRE>
-       The <STRONG>slk_attron</STRONG>, <STRONG>slk_attrset</STRONG>, <STRONG>slk_attroff</STRONG> and <STRONG>slk_attr</STRONG>  routines  corre-
-       spond  to  <STRONG>attron</STRONG>,  <STRONG>attrset</STRONG>,  <STRONG>attroff</STRONG> and <STRONG>attr_get</STRONG>, respectively.  They
-       have an effect only if soft labels are simulated on the bottom line  of
-       the  screen.   The default highlight for soft keys is A_STANDOUT (as in
-       System V curses, which does not document this fact).
+       The   <STRONG>slk_attron</STRONG>,   <STRONG>slk_attrset</STRONG>,   <STRONG>slk_attroff</STRONG>  and  <STRONG>slk_attr</STRONG>  routines
+       correspond to <STRONG>attron</STRONG>,  <STRONG>attrset</STRONG>,  <STRONG>attroff</STRONG>  and  <STRONG>attr_get</STRONG>,  respectively.
+       They  have  an  effect  only if soft labels are simulated on the bottom
+       line of the screen.  The default highlight for soft keys is  A_STANDOUT
+       (as in System V curses, which does not document this fact).
 
 
 </PRE><H3><a name="h3-Colors">Colors</a></H3><PRE>
-       The <STRONG>slk_color</STRONG> routine corresponds to <STRONG>color_set</STRONG>.  It has an effect  only
+       The  <STRONG>slk_color</STRONG> routine corresponds to <STRONG>color_set</STRONG>.  It has an effect only
        if soft labels are simulated on the bottom line of the screen.
 
-       Because  <STRONG>slk_color</STRONG>  accepts  only <STRONG>short</STRONG> (signed 16-bit integer) values,
-       this implementation provides <STRONG>extended_slk_color</STRONG> which accepts an  inte-
-       ger value, e.g., 32-bits.
+       Because <STRONG>slk_color</STRONG> accepts only <STRONG>short</STRONG> (signed  16-bit  integer)  values,
+       this   implementation  provides  <STRONG>extended_slk_color</STRONG>  which  accepts  an
+       integer value, e.g., 32-bits.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These  routines return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 specifies only "an
+       These routines return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 specifies only  "an
        integer value other than <STRONG>ERR</STRONG>") upon successful completion.
 
        X/Open defines no error conditions.  In this implementation
@@ -171,37 +172,37 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
           <STRONG>slk_attr</STRONG>
                returns the attribute used for the soft keys.
 
-          <STRONG>slk_attroff</STRONG>, <STRONG>slk_attron</STRONG>, <STRONG>slk_clear</STRONG>, <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_refresh</STRONG>,
+          <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attron</STRONG>,  <STRONG>slk_clear</STRONG>,  <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_refresh</STRONG>,
           <STRONG>slk_touch</STRONG>
-               return  an  error if the terminal or the softkeys were not ini-
-               tialized.
+               return an error if  the  terminal  or  the  softkeys  were  not
+               initialized.
 
           <STRONG>slk_attrset</STRONG>
-               returns an error if the terminal or the softkeys were not  ini-
-               tialized.
+               returns  an  error  if  the  terminal  or the softkeys were not
+               initialized.
 
           <STRONG>slk_attr_set</STRONG>
-               returns  an error if the terminal or the softkeys were not ini-
-               tialized, or the  color  pair  is  outside  the  range  0..COL-
-               OR_PAIRS-1.
+               returns an error if the  terminal  or  the  softkeys  were  not
+               initialized,   or   the   color   pair  is  outside  the  range
+               0..COLOR_PAIRS-1.
 
           <STRONG>slk_color</STRONG>
-               returns  an error if the terminal or the softkeys were not ini-
-               tialized, or the  color  pair  is  outside  the  range  0..COL-
-               OR_PAIRS-1.
+               returns an error if the  terminal  or  the  softkeys  were  not
+               initialized,   or   the   color   pair  is  outside  the  range
+               0..COLOR_PAIRS-1.
 
           <STRONG>slk_init</STRONG>
-               returns  an  error if the format parameter is outside the range
+               returns an error if the format parameter is outside  the  range
                0..3.
 
           <STRONG>slk_label</STRONG>
                returns <STRONG>NULL</STRONG> on error.
 
           <STRONG>slk_set</STRONG>
-               returns an error if the terminal or the softkeys were not  ini-
-               tialized, or the <EM>labnum</EM> parameter is outside the range of label
-               counts, or if the format parameter is outside the  range  0..2,
-               or if memory for the labels cannot be allocated.
+               returns  an  error  if  the  terminal  or the softkeys were not
+               initialized, or the <EM>labnum</EM> parameter is outside  the  range  of
+               label  counts,  or if the format parameter is outside the range
+               0..2, or if memory for the labels cannot be allocated.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -230,31 +231,32 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
-       saying that it must be null.  This implementation uses  that  parameter
+       X/Open Curses documents the <EM>opts</EM> argument as reserved for  future  use,
+       saying  that  it must be null.  This implementation uses that parameter
        in ABI 6 for the functions which have a color-pair parameter to support
        extended color pairs.
 
-       For  functions  which modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM>  is
-       set  it  is  treated  as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
+       For   functions  which modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM> is
+       set it is treated as a pointer to <STRONG>int</STRONG>, and used  to   set   the   color
        pair instead of the <STRONG>short</STRONG> pair parameter.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Most applications would use <STRONG>slk_noutrefresh</STRONG> because a <STRONG>wrefresh</STRONG> is like-
-       ly to follow soon.
+       Most  applications  would  use  <STRONG>slk_noutrefresh</STRONG>  because  a <STRONG>wrefresh</STRONG> is
+       likely to follow soon.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  XSI  Curses  standard,  Issue 4, described the soft-key functions,
+       The XSI Curses standard, Issue 4,  described  the  soft-key  functions,
        with some differences from SVr4 curses:
 
-       <STRONG>o</STRONG>   It added functions like the SVr4  attribute-manipulation  functions
-           <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>, <STRONG>slk_attrset</STRONG>, but which use <STRONG>attr_t</STRONG> parame-
-           ters (rather than <STRONG>chtype</STRONG>), along with a reserved <EM>opts</EM> parameter.
+       <STRONG>o</STRONG>   It  added  functions like the SVr4 attribute-manipulation functions
+           <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attrset</STRONG>,  but   which   use   <STRONG>attr_t</STRONG>
+           parameters  (rather  than  <STRONG>chtype</STRONG>),  along  with  a  reserved  <EM>opts</EM>
+           parameter.
 
-           Two of these new functions (unlike the SVr4 functions) have no pro-
-           vision for color: <STRONG>slk_attr_on</STRONG> and <STRONG>slk_attr_off</STRONG>.
+           Two of these new functions (unlike  the  SVr4  functions)  have  no
+           provision for color: <STRONG>slk_attr_on</STRONG> and <STRONG>slk_attr_off</STRONG>.
 
            The third function (<STRONG>slk_attr_set</STRONG>) has a color-pair parameter.
 
@@ -275,12 +277,12 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Soft-key groups are an array of <EM>ng</EM> integers.
 
        <STRONG>o</STRONG>   In  SVr4, <STRONG>slk_init</STRONG> calls <STRONG>slk_start</STRONG> passing a null for <EM>gp</EM>.  For this
-           case, <STRONG>slk_start</STRONG> uses the number of groups <EM>ng</EM> (3 for the 3-2-3  lay-
-           out, 2 for the 4-4 layout) which <STRONG>slk_init</STRONG> provided.
+           case, <STRONG>slk_start</STRONG> uses the number of  groups  <EM>ng</EM>  (3  for  the  3-2-3
+           layout, 2 for the 4-4 layout) which <STRONG>slk_init</STRONG> provided.
 
-           If  <EM>ng</EM>  is  neither  2 or 3, <STRONG>slk_start</STRONG> checks the terminfo <EM>fln</EM> (la-
-           bel_format) capability, interpreting that as a comma-separated list
-           of numbers, e.g., "3,2,3" for the 3-2-3 layout.
+           If  <EM>ng</EM>  is  neither  2  or  3,  <STRONG>slk_start</STRONG>  checks  the terminfo <EM>fln</EM>
+           (label_format) capability, interpreting that as  a  comma-separated
+           list of numbers, e.g., "3,2,3" for the 3-2-3 layout.
 
            Finally, if there is no <EM>fln</EM> capability, <STRONG>slk_start</STRONG> returns ERR.
 
@@ -309,7 +311,7 @@ <H1 class="no-header">curs_slk 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 566ff5afb..3f52808e5 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.33 2023/08/19 19:48:07 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -50,7 +50,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       curs_sp_funcs - <STRONG>curses</STRONG> screen-pointer extension
+       <STRONG>curs_sp_funcs</STRONG> - <EM>curses</EM> screen-pointer extension
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -229,14 +229,14 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-IMPROVED-FUNCTIONS">IMPROVED FUNCTIONS</a></H3><PRE>
-       Most of the functions are new versions of existing functions.  A param-
-       eter  is  added  at  the  front  of the parameter list.  It is a SCREEN
+       Most of the functions  are  new  versions  of  existing  functions.   A
+       parameter  is added at the front of the parameter list.  It is a SCREEN
        pointer.
 
        The existing functions all use the current screen, which  is  a  static
-       variable.  The extended functions use the specified screen, thereby re-
-       ducing the number of variables which must be modified to update  multi-
-       ple screens.
+       variable.   The  extended  functions  use the specified screen, thereby
+       reducing the number of variables  which  must  be  modified  to  update
+       multiple screens.
 
 
 </PRE><H3><a name="h3-NEW-FUNCTIONS">NEW FUNCTIONS</a></H3><PRE>
@@ -254,8 +254,8 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             With  the  screen-pointer extension, there are situations where it
             must create a current screen before the unextended  library  does.
             The  <STRONG>new_prescr</STRONG> function is used internally to handle these cases.
-            It is also provided as an entrypoint to allow applications to cus-
-            tomize the library initialization.
+            It is also provided as an  entrypoint  to  allow  applications  to
+            customize the library initialization.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -268,27 +268,28 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        NCURSES_SP_NAME
             The new functions are named using the macro <EM>NCURSES</EM><STRONG>_</STRONG><EM>SP</EM><STRONG>_</STRONG><EM>NAME</EM>, which
-            hides the actual implementation.  Currently this adds a "_sp" suf-
-            fix  to the name of the unextended function.  This manual page in-
-            dexes the extensions showing the full name.   However  the  proper
-            usage of these functions uses the macro, to provide for the possi-
-            bility of changing the naming convention for specific library con-
-            figurations.
+            hides the actual implementation.   Currently  this  adds  a  "_sp"
+            suffix  to  the name of the unextended function.  This manual page
+            indexes the extensions showing the full name.  However the  proper
+            usage  of  these  functions  uses  the  macro,  to provide for the
+            possibility of changing the naming convention for specific library
+            configurations.
 
        NCURSES_SP_OUTC
             This  is  a new function-pointer type to use in the screen-pointer
             functions where an <EM>NCURSES</EM><STRONG>_</STRONG><EM>OUTC</EM> is used in the unextended library.
 
        NCURSES_OUTC
-            This is a function-pointer type used for the cases where  a  func-
-            tion passes characters to the output stream, e.g., <STRONG><A HREF="curs_terminfo.3x.html">vidputs(3x)</A></STRONG>.
+            This is a  function-pointer  type  used  for  the  cases  where  a
+            function   passes   characters   to   the   output  stream,  e.g.,
+            <STRONG><A HREF="curs_terminfo.3x.html">vidputs(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code  depending  on  ncurses  extensions  be  conditioned  using <EM>NCURS-</EM>
-       <EM>ES</EM><STRONG>_</STRONG><EM>SP</EM><STRONG>_</STRONG><EM>FUNCS</EM>.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>SP</EM><STRONG>_</STRONG><EM>FUNCS</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -296,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index a968e2358..85855d0e1 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.24 2023/07/01 14:31:54 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</H1
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>baudrate</STRONG>,  <STRONG>erasechar</STRONG>,  <STRONG>erasewchar</STRONG>, <STRONG>has_ic</STRONG>, <STRONG>has_il</STRONG>, <STRONG>killchar</STRONG>, <STRONG>killwchar</STRONG>,
-       <STRONG>longname</STRONG>, <STRONG>term_attrs</STRONG>, <STRONG>termattrs</STRONG>, <STRONG>termname</STRONG> -  <STRONG>curses</STRONG>  environment  query
+       <STRONG>longname</STRONG>, <STRONG>term_attrs</STRONG>, <STRONG>termattrs</STRONG>, <STRONG>termname</STRONG> -  <EM>curses</EM>  environment  query
        routines
 
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-07-01 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-07-01                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index d3412b6dc..af1dafa9a 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.62 2023/07/01 15:28:47 tom Exp @
+  * @Id: curs_termcap.3x,v 1.66 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>PC</STRONG>, <STRONG>UP</STRONG>, <STRONG>BC</STRONG>, <STRONG>ospeed</STRONG>, <STRONG>tgetent</STRONG>, <STRONG>tgetflag</STRONG>, <STRONG>tgetnum</STRONG>, <STRONG>tgetstr</STRONG>, <STRONG>tgoto</STRONG>, <STRONG>tputs</STRONG> -
-       <STRONG>curses</STRONG> emulation of termcap
+       <EM>curses</EM> emulation of <EM>termcap</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -88,16 +88,16 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        This differs from the <EM>termcap</EM> library in two ways:
 
-          <STRONG>o</STRONG>   The  emulation  ignores  the buffer pointer <EM>bp</EM>.  The <EM>termcap</EM> li-
-              brary would store a copy of the terminal description in the area
-              referenced  by this pointer.  However, ncurses stores its termi-
-              nal descriptions in compiled binary form, which is not the  same
-              thing.
+          <STRONG>o</STRONG>   The  emulation  ignores  the  buffer  pointer  <EM>bp</EM>.   The <EM>termcap</EM>
+              library would store a copy of the terminal  description  in  the
+              area  referenced  by  this pointer.  However, ncurses stores its
+              terminal descriptions in compiled binary form, which is not  the
+              same thing.
 
           <STRONG>o</STRONG>   There is a difference in return codes.  The <EM>termcap</EM> library does
               not check if the terminal description is marked with the <EM>generic</EM>
-              capability,  or  if the terminal description has cursor-address-
-              ing.
+              capability,   or   if   the  terminal  description  has  cursor-
+              addressing.
 
 
 </PRE><H3><a name="h3-Capability-Values">Capability Values</a></H3><PRE>
@@ -108,22 +108,22 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        available.
 
        The <STRONG>tgetstr</STRONG> routine returns the string entry for <EM>id</EM>, or zero if  it  is
-       not  available.  Use <STRONG>tputs</STRONG> to output the returned string.  The <EM>area</EM> pa-
-       rameter is used as follows:
+       not  available.   Use  <STRONG>tputs</STRONG>  to  output the returned string.  The <EM>area</EM>
+       parameter is used as follows:
 
           <STRONG>o</STRONG>   It is assumed to be the address of a pointer to a buffer managed
               by the calling application.
 
-          <STRONG>o</STRONG>   However, ncurses checks to ensure that <STRONG>area</STRONG> is not NULL, and al-
-              so that the resulting buffer pointer is  not  NULL.   If  either
+          <STRONG>o</STRONG>   However,  ncurses  checks  to  ensure that <STRONG>area</STRONG> is not NULL, and
+              also that the resulting buffer pointer is not NULL.   If  either
               check fails, the <EM>area</EM> parameter is ignored.
 
           <STRONG>o</STRONG>   If  the  checks succeed, ncurses also copies the return value to
-              the buffer pointed to by <EM>area</EM>, and the <EM>area</EM> value will be updat-
-              ed to point past the null ending this value.
+              the buffer pointed to by  <EM>area</EM>,  and  the  <EM>area</EM>  value  will  be
+              updated to point past the null ending this value.
 
-          <STRONG>o</STRONG>   The  return  value itself is an address in the terminal descrip-
-              tion which is loaded into memory.
+          <STRONG>o</STRONG>   The   return   value  itself  is  an  address  in  the  terminal
+              description which is loaded into memory.
 
        Only the first two characters of the <STRONG>id</STRONG> parameter of <STRONG>tgetflag</STRONG>,  <STRONG>tgetnum</STRONG>
        and <STRONG>tgetstr</STRONG> are compared in lookups.
@@ -133,30 +133,30 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        The <STRONG>tgoto</STRONG> routine expands the given capability using the parameters.
 
        <STRONG>o</STRONG>   Because  the  capability may have padding characters, the output of
-           <STRONG>tgoto</STRONG> should be passed to <STRONG>tputs</STRONG> rather than some other output func-
-           tion such as <STRONG>printf(3)</STRONG>.
+           <STRONG>tgoto</STRONG> should be passed to  <STRONG>tputs</STRONG>  rather  than  some  other  output
+           function such as <STRONG>printf(3)</STRONG>.
 
-       <STRONG>o</STRONG>   While  <STRONG>tgoto</STRONG> is assumed to be used for the two-parameter cursor po-
-           sitioning capability, termcap applications also use it for  single-
-           parameter capabilities.
+       <STRONG>o</STRONG>   While  <STRONG>tgoto</STRONG>  is  assumed  to  be used for the two-parameter cursor
+           positioning  capability,  termcap  applications  also  use  it  for
+           single-parameter capabilities.
 
-           Doing this shows a quirk in <STRONG>tgoto</STRONG>: most hardware terminals use cur-
-           sor addressing with <EM>row</EM> first, but the original developers  of  the
-           termcap  interface  chose  to  put the <EM>column</EM> parameter first.  The
+           Doing  this  shows  a  quirk  in <STRONG>tgoto</STRONG>: most hardware terminals use
+           cursor addressing with <EM>row</EM> first, but the  original  developers  of
+           the termcap interface chose to put the <EM>column</EM> parameter first.  The
            <STRONG>tgoto</STRONG> function swaps the order of parameters.  It  does  this  also
            for  calls  requiring  only  a single parameter.  In that case, the
            first parameter is merely a placeholder.
 
        <STRONG>o</STRONG>   Normally the ncurses library is compiled with terminfo support.  In
-           that  case, <STRONG>tgoto</STRONG> uses an internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> (a more ca-
-           pable formatter).
+           that  case,  <STRONG>tgoto</STRONG>  uses  an  internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> (a more
+           capable formatter).
 
            With terminfo support, <STRONG>tgoto</STRONG> is able to use some  of  the  terminfo
-           features,  but  not all.  In particular, it allows only numeric pa-
-           rameters; <STRONG>tparm</STRONG> supports string parameters.
+           features,  but  not  all.   In  particular,  it allows only numeric
+           parameters; <STRONG>tparm</STRONG> supports string parameters.
 
-           However, <STRONG>tparm</STRONG> is not a <EM>termcap</EM> feature, and portable  <EM>termcap</EM>  ap-
-           plications should not rely upon its availability.
+           However, <STRONG>tparm</STRONG> is not  a  <EM>termcap</EM>  feature,  and  portable  <EM>termcap</EM>
+           applications should not rely upon its availability.
 
        The  <STRONG>tputs</STRONG>  routine  is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> manual page.
        It can retrieve capabilities by either termcap or terminfo name.
@@ -173,24 +173,24 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        The termcap functions provide no  means  for  freeing  memory,  because
        legacy  termcap  implementations used only the buffer areas provided by
-       the caller via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused  in  ter-
-       minfo.
+       the caller via <STRONG>tgetent</STRONG>  and  <STRONG>tgetstr</STRONG>.   Those  buffers  are  unused  in
+       terminfo.
 
-       On the other hand, terminfo allocates memory.  It uses <STRONG>setupterm</STRONG> to re-
-       trieve the data used by <STRONG>tgetent</STRONG> and the functions which return capabil-
-       ity values such as <STRONG>tgetstr</STRONG>.  One could use
+       On  the  other  hand,  terminfo allocates memory.  It uses <STRONG>setupterm</STRONG> to
+       retrieve the data used  by  <STRONG>tgetent</STRONG>  and  the  functions  which  return
+       capability values such as <STRONG>tgetstr</STRONG>.  One could use
 
                <STRONG>del_curterm(cur_term);</STRONG>
 
 
        to  free  this  memory,  but  there  is an additional complication with
-       ncurses.  It uses a fixed-size <EM>pool</EM> of storage locations, one per  set-
-       ting  of  the <STRONG>TERM</STRONG> variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG> pro-
-       gram relies upon this arrangement, to improve its performance.
+       ncurses.  It uses a fixed-size  <EM>pool</EM>  of  storage  locations,  one  per
+       setting  of  the  <STRONG>TERM</STRONG>  variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
+       program relies upon this arrangement, to improve its performance.
 
        An application which uses only the low-level  termcap  functions  could
-       free the memory using <STRONG>del_curterm</STRONG>, because the pool is freed using oth-
-       er functions (see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>).
+       free  the  memory  using  <STRONG>del_curterm</STRONG>,  because the pool is freed using
+       other functions (see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -208,8 +208,8 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The  calls  with  a  string  parameter  (<STRONG>tgoto</STRONG>, <STRONG>tputs</STRONG>) check if the
            string is null, or cancelled.  Those return an error.
 
-       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with string parameters is an er-
-           ror.
+       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with  string  parameters  is  an
+           error.
 
        <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with more than two parameters is
            an error.
@@ -220,13 +220,13 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        aware  that it will be returned in terminfo notation, not the older and
        not-quite-compatible termcap notation.  This will not cause problems if
        all  you do with it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand terminfo-
-       style strings as terminfo.  (The <STRONG>tgoto</STRONG> function, if configured to  sup-
-       port  termcap,  will  check  if  the string is indeed terminfo-style by
+       style strings as terminfo.   (The  <STRONG>tgoto</STRONG>  function,  if  configured  to
+       support  termcap,  will check if the string is indeed terminfo-style by
        looking for "%p" parameters or "$&lt;..&gt;" delays, and  invoke  a  termcap-
        style parser if the string does not appear to be terminfo).
 
-       Because  terminfo  conventions for representing padding in string capa-
-       bilities differ from termcap's, users can be surprised:
+       Because   terminfo  conventions  for  representing  padding  in  string
+       capabilities differ from termcap's, users can be surprised:
 
        <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a terminfo system will put out a literal "50" rather
            than busy-waiting for 50 milliseconds.
@@ -234,8 +234,8 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   However,  if  ncurses is configured to support termcap, it may also
            have been configured to support the BSD-style padding.
 
-           In that case, <STRONG>tputs</STRONG> inspects strings passed to it, looking for dig-
-           its at the beginning of the string.
+           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
+           digits at the beginning of the string.
 
            <STRONG>tputs("50")</STRONG> in a termcap system may wait for 50 milliseconds rather
            than put out a literal "50"
@@ -243,8 +243,8 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        Note that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> string.   One
        consequence  of  this  is that termcap applications assume <STRONG>me</STRONG> (terminfo
        <STRONG>sgr0</STRONG>) does not reset the alternate character set.  This  implementation
-       checks for, and modifies the data shown to the termcap interface to ac-
-       commodate termcap's limitation in this respect.
+       checks  for,  and  modifies  the data shown to the termcap interface to
+       accommodate termcap's limitation in this respect.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -253,46 +253,46 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        These functions are provided for supporting  legacy  applications,  and
        should not be used in new programs:
 
-       <STRONG>o</STRONG>   The XSI Curses standard, Issue 4 describes these functions.  Howev-
-           er, they are marked TO BE WITHDRAWN and may be  removed  in  future
-           versions.
+       <STRONG>o</STRONG>   The  XSI  Curses  standard,  Issue  4  describes  these  functions.
+           However, they are marked TO BE WITHDRAWN  and  may  be  removed  in
+           future versions.
 
        <STRONG>o</STRONG>   X/Open Curses, Issue 5 (December 2007) marked the termcap interface
            (along with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
 
        Neither the XSI Curses standard nor the SVr4 man pages  documented  the
-       return  values  of <STRONG>tgetent</STRONG> correctly, though all three were in fact re-
-       turned ever since SVr1.  In particular, an omission in the  XSI  Curses
+       return  values  of  <STRONG>tgetent</STRONG>  correctly,  though  all three were in fact
+       returned ever since SVr1.  In particular, an omission in the XSI Curses
        documentation  has  been misinterpreted to mean that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG>
-       or <STRONG>ERR</STRONG>.  Because the purpose of these functions is to provide  compati-
-       bility  with the <EM>termcap</EM> library, that is a defect in XCurses, Issue 4,
-       Version 2 rather than in ncurses.
+       or  <STRONG>ERR</STRONG>.   Because  the  purpose  of  these  functions  is  to  provide
+       compatibility  with  the  <EM>termcap</EM> library, that is a defect in XCurses,
+       Issue 4, Version 2 rather than in ncurses.
 
 
 </PRE><H3><a name="h3-Compatibility-with-BSD-Termcap">Compatibility with BSD Termcap</a></H3><PRE>
-       External variables are provided for support of certain termcap applica-
-       tions.  However, termcap applications' use of those variables is poorly
-       documented, e.g., not distinguishing between input and output.  In par-
-       ticular,  some  applications  are reported to declare and/or modify <STRONG>os-</STRONG>
-       <STRONG>peed</STRONG>.
+       External  variables  are  provided  for  support  of  certain   termcap
+       applications.  However, termcap applications' use of those variables is
+       poorly documented, e.g., not distinguishing between input  and  output.
+       In  particular, some applications are reported to declare and/or modify
+       <STRONG>ospeed</STRONG>.
 
        The comment that only the first two characters of the <STRONG>id</STRONG> parameter  are
        used escapes many application developers.  The original BSD 4.2 termcap
        library (and historical relics thereof) did not require a trailing null
        NUL  on  the  parameter  name  passed to <STRONG>tgetstr</STRONG>, <STRONG>tgetnum</STRONG> and <STRONG>tgetflag</STRONG>.
        Some applications assume that the termcap interface  does  not  require
-       the trailing NUL for the parameter name.  Taking into account these is-
-       sues:
+       the  trailing  NUL  for  the parameter name.  Taking into account these
+       issues:
 
        <STRONG>o</STRONG>   As a special case,  <STRONG>tgetflag</STRONG>  matched  against  a  single-character
-           identifier  provided  that  was at the end of the terminal descrip-
-           tion.  You should not rely upon this behavior in portable programs.
-           This  implementation disallows matches against single-character ca-
-           pability names.
+           identifier   provided   that   was  at  the  end  of  the  terminal
+           description.  You should not rely upon this  behavior  in  portable
+           programs.   This  implementation  disallows matches against single-
+           character capability names.
 
        <STRONG>o</STRONG>   This implementation disallows  matches  by  the  termcap  interface
-           against extended capability names which are longer than two charac-
-           ters.
+           against  extended  capability  names  which  are  longer  than  two
+           characters.
 
        The BSD termcap function <STRONG>tgetent</STRONG> returns the text of a termcap entry in
        the  buffer  passed  as an argument.  This library (like other terminfo
@@ -302,8 +302,8 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Other-Compatibility">Other Compatibility</a></H3><PRE>
        This  library includes a termcap.h header, for compatibility with other
-       implementations.  But the header is rarely used because the  other  im-
-       plementations are not strictly compatible.
+       implementations.  But the header  is  rarely  used  because  the  other
+       implementations are not strictly compatible.
 
        The original BSD termcap (through 4.3BSD) had no header file which gave
        function prototypes, because that was a feature of ANSI C.  BSD termcap
@@ -314,11 +314,11 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            It defined global symbols for the termcap variables which it used.
 
        <STRONG>o</STRONG>   The  other  appeared in 4.4BSD Lite Release 2 (mid-1993) as part of
-           <EM>libedit</EM> (also known as the <EM>editline</EM> library).  The CSRG source his-
-           tory  shows  that  this  was added in mid-1992.  The <EM>libedit</EM> header
-           file was used internally, as a convenience for compiling the  <EM>edit-</EM>
-           <EM>line</EM> library.  It declared function prototypes, but no global vari-
-           ables.
+           <EM>libedit</EM> (also known as the  <EM>editline</EM>  library).   The  CSRG  source
+           history  shows that this was added in mid-1992.  The <EM>libedit</EM> header
+           file was used  internally,  as  a  convenience  for  compiling  the
+           <EM>editline</EM>  library.   It declared function prototypes, but no global
+           variables.
 
        The header file from <EM>libedit</EM> was added to NetBSD's termcap  library  in
        mid-1994.
@@ -326,10 +326,10 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        Meanwhile,  GNU  termcap  was under development, starting in 1990.  The
        first release (termcap 1.0) in 1991 included a termcap.h  header.   The
        second  release  (termcap 1.1) in September 1992 modified the header to
-       use <STRONG>const</STRONG> for the function prototypes in the header where one would ex-
-       pect  the parameters to be read-only.  This was a difference versus the
-       original BSD termcap.  The prototype for <STRONG>tputs</STRONG> also  differed,  but  in
-       that instance, it was <EM>libedit</EM> which differed from BSD termcap.
+       use <STRONG>const</STRONG> for the function prototypes in the  header  where  one  would
+       expect  the  parameters  to be read-only.  This was a difference versus
+       the original BSD termcap.  The prototype for <STRONG>tputs</STRONG> also  differed,  but
+       in that instance, it was <EM>libedit</EM> which differed from BSD termcap.
 
        A copy of GNU termcap 1.3 was bundled with <EM>bash</EM> in mid-1993, to support
        the <STRONG>readline(3)</STRONG> library.
@@ -356,7 +356,7 @@ <H1 class="no-header">curs_termcap 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index f9009a271..3ebc130d9 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.95 2023/08/19 20:37:54 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.99 2023/09/16 23:37:03 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -57,10 +57,10 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>del_curterm</STRONG>, <STRONG>mvcur</STRONG>, <STRONG>putp</STRONG>, <STRONG>restartterm</STRONG>, <STRONG>set_curterm</STRONG>, <STRONG>setupterm</STRONG>,
-       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, <STRONG>tigetstr</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tiparm_s</STRONG>, <STRONG>tiscan_s</STRONG>, <STRONG>tparm</STRONG>,
-       <STRONG>tputs</STRONG>, <STRONG>vid_attr</STRONG>, <STRONG>vid_puts</STRONG>, <STRONG>vidattr</STRONG>, <STRONG>vidputs</STRONG> - <STRONG>curses</STRONG> interfaces to
-       terminfo database
+       <STRONG>del_curterm</STRONG>,   <STRONG>mvcur</STRONG>,   <STRONG>putp</STRONG>,   <STRONG>restartterm</STRONG>,   <STRONG>set_curterm</STRONG>,  <STRONG>setupterm</STRONG>,
+       <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG>,  <STRONG>tigetstr</STRONG>,  <STRONG>tiparm</STRONG>,  <STRONG>tiparm_s</STRONG>,  <STRONG>tiscan_s</STRONG>,  <STRONG>tparm</STRONG>,
+       <STRONG>tputs</STRONG>,  <STRONG>vid_attr</STRONG>,  <STRONG>vid_puts</STRONG>,  <STRONG>vidattr</STRONG>,  <STRONG>vidputs</STRONG>  - <EM>curses</EM> interfaces to
+       <EM>terminfo</EM> database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -111,45 +111,46 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These low-level routines must be called by programs that have  to  deal
-       directly with the <STRONG>terminfo</STRONG> database to handle certain terminal capabil-
-       ities, such as programming function keys.  For all other functionality,
-       <STRONG>curses</STRONG> routines are more suitable and their use is recommended.
+       directly   with  the  <STRONG>terminfo</STRONG>  database  to  handle  certain  terminal
+       capabilities,  such  as  programming  function  keys.   For  all  other
+       functionality,  <STRONG>curses</STRONG>  routines  are  more  suitable  and their use is
+       recommended.
 
-       None  of  these  functions  use  (or  are aware of) multibyte character
+       None of these functions use  (or  are  aware  of)  multibyte  character
        strings such as UTF-8:
 
        <STRONG>o</STRONG>   capability names use the POSIX portable character set
 
-       <STRONG>o</STRONG>   capability string values have  no  associated  encoding;  they  are
+       <STRONG>o</STRONG>   capability  string  values  have  no  associated encoding; they are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        Initially, <STRONG>setupterm</STRONG> should be called.  The high-level curses functions
-       <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level  set  of
+       <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
        terminal-dependent variables [listed in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].
 
-       Applications  can  use  the  terminal capabilities either directly (via
-       header definitions), or by special functions.  The header  files  <STRONG>curs-</STRONG>
-       <STRONG>es.h</STRONG>  and  <STRONG>term.h</STRONG> should be included (in this order) to get the defini-
-       tions for these strings, numbers, and flags.
+       Applications can use the terminal  capabilities  either  directly  (via
+       header  definitions),  or  by  special  functions.   The  header  files
+       <STRONG>curses.h</STRONG> and <STRONG>term.h</STRONG> should be included  (in  this  order)  to  get  the
+       definitions for these strings, numbers, and flags.
 
-       The <STRONG>terminfo</STRONG> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized  by  <STRONG>setupterm</STRONG>
+       The  <STRONG>terminfo</STRONG>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
        as follows:
 
-       <STRONG>o</STRONG>   If  <STRONG>use_env(FALSE)</STRONG>  has  been  called, values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG>
+       <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
            specified in <STRONG>terminfo</STRONG> are used.
 
-       <STRONG>o</STRONG>   Otherwise, if the environment variables <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>  exist,
+       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> exist,
            their values are used.  If these environment variables do not exist
-           and the program is running in a window, the current window size  is
-           used.   Otherwise,  if  the environment variables do not exist, the
+           and  the program is running in a window, the current window size is
+           used.  Otherwise, if the environment variables do  not  exist,  the
            values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <STRONG>terminfo</STRONG> database are
            used.
 
-       Parameterized  strings  should  be  passed through <STRONG>tparm</STRONG> to instantiate
-       them.  All <STRONG>terminfo</STRONG> strings (including the output of <STRONG>tparm</STRONG>)  should  be
-       printed  with  <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore the tty
+       Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
+       them.   All  <STRONG>terminfo</STRONG> strings (including the output of <STRONG>tparm</STRONG>) should be
+       printed with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore  the  tty
        modes before exiting [see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>].
 
        Programs which use cursor addressing should
@@ -160,55 +161,55 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        Programs which execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call <STRONG>reset_shell_mode</STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell  is
+       <STRONG>o</STRONG>   call  <STRONG>reset_shell_mode</STRONG>  and output <STRONG>exit_ca_mode</STRONG> before the shell is
            called and
 
-       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning from
+       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
            the shell.
 
-       The <STRONG>setupterm</STRONG> routine reads in the <STRONG>terminfo</STRONG> database, initializing  the
-       <STRONG>terminfo</STRONG>  structures,  but  does  not  set up the output virtualization
+       The  <STRONG>setupterm</STRONG> routine reads in the <STRONG>terminfo</STRONG> database, initializing the
+       <STRONG>terminfo</STRONG> structures, but does not  set  up  the  output  virtualization
        structures used by <STRONG>curses</STRONG>.  These are its parameters:
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <STRONG>TERM</STRONG> is used.
 
           <EM>filedes</EM>
-               is  the  file  descriptor used for getting and setting terminal
+               is the file descriptor used for getting  and  setting  terminal
                I/O modes.
 
-               Higher-level applications use <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> for initializing  the
-               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
-               In curses, the two are  the  same  because  <STRONG>newterm</STRONG>  calls  <STRONG>se-</STRONG>
-               <STRONG>tupterm</STRONG>,  passing  the  file descriptor derived from its output
+               Higher-level  applications use <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> for initializing the
+               terminal, passing an output <EM>stream</EM> rather  than  a  <EM>descriptor</EM>.
+               In   curses,  the  two  are  the  same  because  <STRONG>newterm</STRONG>  calls
+               <STRONG>setupterm</STRONG>, passing the file descriptor derived from its  output
                stream parameter.
 
           <EM>errret</EM>
-               points to an optional location where an error status can be re-
-               turned  to  the  caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
-               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
-               pointed  to by <EM>errret</EM>.  A return value of <STRONG>OK</STRONG> combined with sta-
-               tus of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
+               points  to  an  optional  location where an error status can be
+               returned to the caller.  If <EM>errret</EM> is not null, then  <STRONG>setupterm</STRONG>
+               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
+               pointed to by <EM>errret</EM>.  A  return  value  of  <STRONG>OK</STRONG>  combined  with
+               status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>:
 
-               <STRONG>1</STRONG>    means that the terminal is hardcopy, cannot  be  used  for
+               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, cannot be used for
                     curses applications.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the entry is a hardcopy type by
+                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
                     checking the <STRONG>hc</STRONG> (<STRONG>hardcopy</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
-                    a  generic  type, having too little information for curses
+               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
+                    a generic type, having too little information  for  curses
                     applications to run.
 
-                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
+                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
                     checking the <STRONG>gn</STRONG> (<STRONG>generic_type</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <STRONG>terminfo</STRONG> database could not be found.
 
-               If <EM>errret</EM> is null, <STRONG>setupterm</STRONG> prints an error message upon find-
-               ing an error and exits.  Thus, the simplest call is:
+               If <EM>errret</EM> is null,  <STRONG>setupterm</STRONG>  prints  an  error  message  upon
+               finding an error and exits.  Thus, the simplest call is:
 
                      <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>,
 
@@ -216,122 +217,122 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       The <STRONG>setupterm</STRONG> routine stores its information about the  terminal  in  a
-       <STRONG>TERMINAL</STRONG>  structure  pointed to by the global variable <STRONG>cur_term</STRONG>.  If it
-       detects an error, or decides that the terminal is unsuitable  (hardcopy
-       or  generic),  it discards this information, making it not available to
+       The  <STRONG>setupterm</STRONG>  routine  stores its information about the terminal in a
+       <STRONG>TERMINAL</STRONG> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
+       detects  an error, or decides that the terminal is unsuitable (hardcopy
+       or generic), it discards this information, making it not  available  to
        applications.
 
-       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type,  it  will
-       reuse  the  information.   It maintains only one copy of a given termi-
-       nal's capabilities in memory.  If it is called for  different  terminal
-       types,  <STRONG>setupterm</STRONG>  allocates new storage for each set of terminal capa-
-       bilities.
+       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
+       reuse  the  information.   It  maintains  only  one  copy  of  a  given
+       terminal's  capabilities  in  memory.   If  it  is called for different
+       terminal types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set  of
+       terminal capabilities.
 
-       The <STRONG>set_curterm</STRONG> routine sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes  all  of  the
-       <STRONG>terminfo</STRONG>  boolean,  numeric,  and  string variables use the values from
+       The  <STRONG>set_curterm</STRONG>  routine  sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes all of the
+       <STRONG>terminfo</STRONG> boolean, numeric, and string variables  use  the  values  from
        <EM>nterm</EM>.  It returns the old value of <STRONG>cur_term</STRONG>.
 
-       The <STRONG>del_curterm</STRONG> routine frees the space pointed to by <EM>oterm</EM>  and  makes
-       it available for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, refer-
-       ences to any of the <STRONG>terminfo</STRONG> boolean,  numeric,  and  string  variables
-       thereafter  may  refer  to  invalid  memory locations until another <STRONG>se-</STRONG>
-       <STRONG>tupterm</STRONG> has been called.
+       The  <STRONG>del_curterm</STRONG>  routine frees the space pointed to by <EM>oterm</EM> and makes
+       it available for further use.   If  <EM>oterm</EM>  is  the  same  as  <STRONG>cur_term</STRONG>,
+       references  to  any  of  the  <STRONG>terminfo</STRONG>  boolean,  numeric,  and  string
+       variables thereafter  may  refer  to  invalid  memory  locations  until
+       another <STRONG>setupterm</STRONG> has been called.
 
-       The <STRONG>restartterm</STRONG> routine is similar to  <STRONG>setupterm</STRONG>  and  <STRONG>initscr</STRONG>,  except
-       that it is called after restoring memory to a previous state (for exam-
-       ple, when reloading a game saved as a core  image  dump).   <STRONG>restartterm</STRONG>
-       assumes  that the windows and the input and output options are the same
-       as when memory was saved, but the terminal type and baud  rate  may  be
-       different.   Accordingly,  <STRONG>restartterm</STRONG>  saves  various  tty state bits,
-       calls <STRONG>setupterm</STRONG>, and then restores the bits.
+       The  <STRONG>restartterm</STRONG>  routine  is  similar to <STRONG>setupterm</STRONG> and <STRONG>initscr</STRONG>, except
+       that it is called after restoring  memory  to  a  previous  state  (for
+       example,   when   reloading  a  game  saved  as  a  core  image  dump).
+       <STRONG>restartterm</STRONG> assumes that the windows and the input and  output  options
+       are  the  same as when memory was saved, but the terminal type and baud
+       rate may be different.   Accordingly,  <STRONG>restartterm</STRONG>  saves  various  tty
+       state bits, calls <STRONG>setupterm</STRONG>, and then restores the bits.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       The <STRONG>tparm</STRONG> routine instantiates the string <EM>str</EM> with  parameters  <EM>pi</EM>.   A
-       pointer  is  returned to the result of <EM>str</EM> with the parameters applied.
-       Application developers should keep in mind these quirks of  the  inter-
-       face:
+       The  <STRONG>tparm</STRONG>  routine  instantiates the string <EM>str</EM> with parameters <EM>pi</EM>.  A
+       pointer is returned to the result of <EM>str</EM> with the  parameters  applied.
+       Application  developers  should  keep  in  mind  these  quirks  of  the
+       interface:
 
-       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
+       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
            prototype expects <STRONG>long</STRONG> (integer) values.
 
-       <STRONG>o</STRONG>   Aside from the <STRONG>set_attributes</STRONG> (<STRONG>sgr</STRONG>) capability, most terminal capa-
-           bilities require no more than one or two parameters.
+       <STRONG>o</STRONG>   Aside  from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most terminal
+           capabilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
+       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
+       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG>  is  a  newer  form of <STRONG>tparm</STRONG> which uses <EM>&lt;stdarg.h&gt;</EM> rather than a
+       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG> which uses  <EM>&lt;stdarg.h&gt;</EM>  rather  than  a
        fixed-parameter list.  Its numeric parameters are integers (int) rather
        than longs.
 
-       Both  <STRONG>tparm</STRONG>  and  <STRONG>tiparm</STRONG>  assume that the application passes parameters
-       consistent with the terminal description.  Two extensions are  provided
+       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
+       consistent  with the terminal description.  Two extensions are provided
        as alternatives to deal with untrusted data:
 
-       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG>  is an extension which is a safer formatting function than
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
            <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the curses
-           library  how  many  parameters to expect in the parameter list, and
+           library how many parameters to expect in the  parameter  list,  and
            which may be string parameters.
 
-           The <EM>mask</EM> parameter has one bit set for each of the  parameters  (up
+           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
            to 9) which will be passed as char* rather than numbers.
 
-       <STRONG>o</STRONG>   The  extension <STRONG>tiscan_s</STRONG> allows the application to inspect a format-
-           ting capability to see what the curses library would assume.
+       <STRONG>o</STRONG>   The  extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect   a
+           formatting capability to see what the curses library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       The <STRONG>tputs</STRONG> routine applies padding information  (i.e.,  by  interpreting
-       marker  embedded  in  the  terminfo capability such as "$&lt;5&gt;" as 5 mil-
-       liseconds) to the string <EM>str</EM> and outputs it:
+       The  <STRONG>tputs</STRONG>  routine  applies padding information (i.e., by interpreting
+       marker embedded  in  the  terminfo  capability  such  as  "$&lt;5&gt;"  as  5
+       milliseconds) to the string <EM>str</EM> and outputs it:
 
-       <STRONG>o</STRONG>   The <EM>str</EM> parameter must be a terminfo string variable or the  return
+       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a terminfo string variable or the return
            value from <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
 
-           The  <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM> interface,
-           which happens to share this function name with the <EM>terminfo</EM>  inter-
-           face.
+           The <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM>  interface,
+           which  happens  to  share  this  function  name  with  the <EM>terminfo</EM>
+           interface.
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or 1 if not applicable.
 
-       <STRONG>o</STRONG>   <EM>putc</EM>  is a <STRONG>putchar</STRONG>-like routine to which the characters are passed,
+       <STRONG>o</STRONG>   <EM>putc</EM> is a <STRONG>putchar</STRONG>-like routine to which the characters are  passed,
            one at a time.
 
-       The <STRONG>putp</STRONG> routine calls <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG>  al-
-       ways goes to <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
+       The  <STRONG>putp</STRONG>  routine  calls  <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG>  <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG>
+       always goes to <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
-       The  <STRONG>vidputs</STRONG>  routine  displays the string on the terminal in the video
+       The <STRONG>vidputs</STRONG> routine displays the string on the terminal  in  the  video
        attribute mode <EM>attrs</EM>, which is any combination of the attributes listed
-       in  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.   The characters are passed to the <STRONG>putchar</STRONG>-like routine
+       in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.  The characters are passed to the  <STRONG>putchar</STRONG>-like  routine
        <EM>putc</EM>.
 
        The <STRONG>vidattr</STRONG> routine is like the <STRONG>vidputs</STRONG> routine, except that it outputs
        through <STRONG>putchar</STRONG>.
 
-       The  <STRONG>vid_attr</STRONG>  and <STRONG>vid_puts</STRONG> routines correspond to vidattr and vidputs,
-       respectively.  They use a set of arguments for representing  the  video
+       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines correspond to vidattr  and  vidputs,
+       respectively.   They  use a set of arguments for representing the video
        attributes plus color, i.e.,
 
        <STRONG>o</STRONG>   <EM>attrs</EM> of type <STRONG>attr_t</STRONG> for the attributes and
 
        <STRONG>o</STRONG>   <EM>pair</EM> of type <STRONG>short</STRONG> for the color-pair number.
 
-       The  <STRONG>vid_attr</STRONG>  and  <STRONG>vid_puts</STRONG> routines are designed to use the attribute
+       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines are designed to  use  the  attribute
        constants with the <STRONG>WA_</STRONG> prefix.
 
-       X/Open Curses reserves the <EM>opts</EM> argument for future  use,  saying  that
-       applications  must provide a null pointer for that argument.  As an ex-
-       tension, this implementation allows <EM>opts</EM> to be used  as  a  pointer  to
+       X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
+       applications must provide a null pointer  for  that  argument.   As  an
+       extension,  this  implementation allows <EM>opts</EM> to be used as a pointer to
        <STRONG>int</STRONG>, which overrides the <EM>pair</EM> (<STRONG>short</STRONG>) argument.
 
-       The  <STRONG>mvcur</STRONG>  routine  provides low-level cursor motion.  It takes effect
-       immediately (rather than at the next refresh).  Unlike the  other  low-
-       level  output  functions,  which either write to the standard output or
+       The <STRONG>mvcur</STRONG> routine provides low-level cursor motion.   It  takes  effect
+       immediately  (rather  than at the next refresh).  Unlike the other low-
+       level output functions, which either write to the  standard  output  or
        pass an output function parameter, <STRONG>mvcur</STRONG> uses an output file descriptor
        derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
@@ -341,9 +342,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
-       The  <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG> and <STRONG>tigetstr</STRONG> routines return the value of the
-       capability corresponding to the <STRONG>terminfo</STRONG> <EM>capname</EM> passed to  them,  such
-       as  <STRONG>xenl</STRONG>.  The <EM>capname</EM> for each capability is given in the table column
+       The <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG> and <STRONG>tigetstr</STRONG> routines return the value  of  the
+       capability  corresponding  to the <STRONG>terminfo</STRONG> <EM>capname</EM> passed to them, such
+       as <STRONG>xenl</STRONG>.  The <EM>capname</EM> for each capability is given in the table  column
        entitled <EM>capname</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        These routines return special values to denote errors.
@@ -386,33 +387,34 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
-       description.  As a side-effect, it sets <STRONG>cur_term</STRONG> to point to this memo-
-       ry.  If an application calls
+       description.  As a side-effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
+       memory.  If an application calls
 
                <STRONG>del_curterm(cur_term);</STRONG>
 
        the memory will be freed.
 
-       The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
+       The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
        by <STRONG>setupterm</STRONG>:
 
-       <STRONG>o</STRONG>   the  "static"  terminfo variables [a-z].  Before ncurses 6.3, those
-           were shared by all screens.  With ncurses 6.3, those are  allocated
+       <STRONG>o</STRONG>   the "static" terminfo variables [a-z].  Before ncurses  6.3,  those
+           were  shared by all screens.  With ncurses 6.3, those are allocated
            per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-       <STRONG>o</STRONG>   to  improve performance, ncurses 6.3 caches the result of analyzing
-           terminfo strings for their parameter types.  That is  stored  as  a
+       <STRONG>o</STRONG>   to improve performance, ncurses 6.3 caches the result of  analyzing
+           terminfo  strings  for  their parameter types.  That is stored as a
            binary tree referenced from the <STRONG>TERMINAL</STRONG> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
-       they do not free this memory, but it is possible to do that  using  the
+       they  do  not free this memory, but it is possible to do that using the
        <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG> function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer value other than <STRONG>ERR</STRONG>") upon successful  com-
-       pletion, unless otherwise noted in the preceding routine descriptions.
+       Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
+       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion,  unless  otherwise   noted   in   the   preceding   routine
+       descriptions.
 
        Routines that return pointers always return <STRONG>NULL</STRONG> on error.
 
@@ -429,13 +431,13 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
           <STRONG>setupterm</STRONG>
                returns an error if it cannot allocate enough memory, or create
-               the initial windows (stdscr, curscr, newscr).  Other error con-
-               ditions are documented above.
+               the  initial  windows  (stdscr,  curscr,  newscr).  Other error
+               conditions are documented above.
 
           <STRONG>tparm</STRONG>
-               returns a null if the capability would require  unexpected  pa-
-               rameters,  e.g., too many, too few, or incorrect types (strings
-               where integers are expected, or vice versa).
+               returns a null  if  the  capability  would  require  unexpected
+               parameters,  e.g.,  too  many,  too  few,  or  incorrect  types
+               (strings where integers are expected, or vice versa).
 
           <STRONG>tputs</STRONG>
                returns an error if the string parameter is null.  It does  not
@@ -444,8 +446,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Compatibility-macros">Compatibility macros</a></H3><PRE>
-       This implementation provides a few macros for compatibility  with  sys-
-       tems  before  SVr4  (see  <EM>HISTORY</EM>).   Those  include  <STRONG>crmode</STRONG>,  <STRONG>fixterm</STRONG>,
+       This implementation  provides  a  few  macros  for  compatibility  with
+       systems  before  SVr4  (see  <EM>HISTORY</EM>).   Those include <STRONG>crmode</STRONG>, <STRONG>fixterm</STRONG>,
        <STRONG>gettmode</STRONG>, <STRONG>nocrmode</STRONG>, <STRONG>resetterm</STRONG>, <STRONG>saveterm</STRONG>, and <STRONG>setterm</STRONG>.
 
        In SVr4, those are found in <STRONG>&lt;curses.h&gt;</STRONG>, but  except  for  <STRONG>setterm</STRONG>,  are
@@ -455,9 +457,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
 
-       provides the same functionality as <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>, and is not recommend-
-       ed for new programs.  This implementation provides each of  those  sym-
-       bols as macros for BSD compatibility,
+       provides   the   same   functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  and  is  not
+       recommended for new programs.  This  implementation  provides  each  of
+       those symbols as macros for BSD compatibility,
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -467,10 +469,11 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------
        fixterm     restore tty to "in curses" state
+
        gettmode    establish current tty modes
        mvcur       low level cursor motion
-       putp        utility function that uses <STRONG>tputs</STRONG> to send  char-
-                   acters via <STRONG>putchar</STRONG>.
+       putp        utility  function  that  uses  <STRONG>tputs</STRONG>  to   send
+                   characters via <STRONG>putchar</STRONG>.
        resetterm   set tty modes to "out of curses" state
        resetty     reset tty flags to stored value
        saveterm    save current modes as "in curses" state
@@ -499,8 +502,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        Early terminfo programs obtained capability values  from  the  <STRONG>TERMINAL</STRONG>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3  extended terminfo by adding functions to retrieve capability val-
-       ues (like the termcap interface), and reusing tgoto and tputs:
+       SVr3  extended  terminfo  by  adding  functions  to retrieve capability
+       values (like the termcap interface), and reusing tgoto and tputs:
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        -------------------------------------------
@@ -522,13 +525,13 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        setterm     setupterm
 
        SVr3  kept  the  <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>.  The latter were needed to support padding,  and  han-
-       dling  functions  such as <STRONG>vidattr</STRONG> (which used more than the two parame-
-       ters supported by <STRONG>tgoto</STRONG>).
+       <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>.  The  latter  were  needed  to  support  padding,  and
+       handling  functions  such  as  <STRONG>vidattr</STRONG>  (which  used  more than the two
+       parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3 introduced the functions for switching between  terminal  descrip-
-       tions, e.g., <STRONG>set_curterm</STRONG>.  Some of that was incremental improvements to
-       the SVr2 library:
+       SVr3  introduced  the  functions   for   switching   between   terminal
+       descriptions,   e.g.,   <STRONG>set_curterm</STRONG>.   Some  of  that  was  incremental
+       improvements to the SVr2 library:
 
        <STRONG>o</STRONG>   The <STRONG>TERMINAL</STRONG> type definition was introduced  in  SVr3.01,  for  the
            <STRONG>term</STRONG> structure provided in SVr2.
@@ -540,16 +543,16 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
        There are other low-level functions declared in the curses header files
-       on Unix systems, but none were documented.  The functions marked "obso-
-       lete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
+       on Unix systems,  but  none  were  documented.   The  functions  marked
+       "obsolete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
        The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
-       are not found in SVr4 curses, 4.4BSD curses, or any other previous ver-
-       sion of curses.
+       are not found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous
+       version of curses.
 
 
 </PRE><H3><a name="h3-Legacy-functions">Legacy functions</a></H3><PRE>
@@ -573,22 +576,22 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Output-buffering">Output buffering</a></H3><PRE>
        Older  versions  of  <STRONG>ncurses</STRONG> assumed that the file descriptor passed to
        <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
-       the  corresponding stream.  In addition to the limitation that the ter-
-       minal was left in block-buffered mode on exit (like System  V  curses),
-       it  was  problematic  because  <STRONG>ncurses</STRONG>  did not allow a reliable way to
-       cleanup on receiving SIGTSTP.
+       the  corresponding  stream.   In  addition  to  the limitation that the
+       terminal was left  in  block-buffered  mode  on  exit  (like  System  V
+       curses),  it  was  problematic because <STRONG>ncurses</STRONG> did not allow a reliable
+       way to cleanup on receiving SIGTSTP.
 
        The current version (ncurses6) uses output buffers managed directly  by
        <STRONG>ncurses</STRONG>.  Some of the low-level functions described in this manual page
-       write to the standard output.  They are not signal-safe.  The high-lev-
-       el functions in <STRONG>ncurses</STRONG> use alternate versions of these functions using
-       the more reliable buffering scheme.
+       write to the standard output.  They are  not  signal-safe.   The  high-
+       level  functions  in  <STRONG>ncurses</STRONG> use alternate versions of these functions
+       using the more reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-prototypes">Function prototypes</a></H3><PRE>
-       The X/Open Curses prototypes are based on the SVr4 curses header decla-
-       rations,  which  were defined at the same time the C language was first
-       standardized in the late 1980s.
+       The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
+       declarations,  which  were  defined at the same time the C language was
+       first standardized in the late 1980s.
 
        <STRONG>o</STRONG>   X/Open Curses uses <STRONG>const</STRONG>  less  effectively  than  a  later  design
            might,  in  some cases applying it needlessly to values are already
@@ -604,8 +607,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
            rather than a variable argument list.
 
-           This implementation uses a variable argument list, but can be  con-
-           figured  to  use  the  fixed-parameter list.  Portable applications
+           This implementation uses a  variable  argument  list,  but  can  be
+           configured  to use the fixed-parameter list.  Portable applications
            should provide 9 parameters after the format; zeroes are  fine  for
            this purpose.
 
@@ -622,23 +625,23 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
            nine on each call is awkward.
 
            Using  <STRONG>long</STRONG>  for the numeric parameter type is a workaround to make
-           the parameter use the same amount of stack as a pointer.  That  ap-
-           proach  dates  back  to  the  mid-1980s, before C was standardized.
+           the parameter use the same amount of  stack  as  a  pointer.   That
+           approach  dates  back  to the mid-1980s, before C was standardized.
            Since then, there is a standard (and pointers are not  required  to
            fit in a long).
 
        <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
-           such as <STRONG>tiparm</STRONG> can be a problem, in particular for  string  parame-
-           ters.  However, only a few terminfo capabilities use string parame-
-           ters (e.g., the ones used for programmable function keys).
+           such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
+           parameters.   However,  only a few terminfo capabilities use string
+           parameters (e.g., the ones used for programmable function keys).
 
            The ncurses library checks usage of these capabilities, and returns
            an  error  if  the capability mishandles string parameters.  But it
            cannot check if a calling program provides  strings  in  the  right
            places for the <STRONG>tparm</STRONG> calls.
 
-           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of these capabilities with a ta-
-           ble, so that it calls <STRONG>tparm</STRONG> correctly.
+           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
+           table, so that it calls <STRONG>tparm</STRONG> correctly.
 
 
 </PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE>
@@ -670,26 +673,26 @@ <H1 class="no-header">curs_terminfo 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        and does no error-checking.
 
        X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the curses state may not match
-       the actual terminal state, and that an application should touch and re-
-       fresh the window before resuming normal curses calls.  Both <STRONG>ncurses</STRONG> and
-       System V Release 4 curses implement <STRONG>mvcur</STRONG> using the SCREEN  data  allo-
-       cated  in  either  <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a
-       terminfo function, <STRONG>mvcur</STRONG> is really a curses function which is not  well
-       specified.
-
-       X/Open  states that the old location must be given for <STRONG>mvcur</STRONG>.  This im-
-       plementation allows the caller to use -1's for the old  ordinates.   In
+       the actual terminal state, and that an  application  should  touch  and
+       refresh  the  window before resuming normal curses calls.  Both <STRONG>ncurses</STRONG>
+       and System V Release 4 curses implement <STRONG>mvcur</STRONG>  using  the  SCREEN  data
+       allocated  in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as
+       a terminfo function, <STRONG>mvcur</STRONG> is really a curses  function  which  is  not
+       well specified.
+
+       X/Open  states  that  the  old  location must be given for <STRONG>mvcur</STRONG>.  This
+       implementation allows the caller to use -1's for the old ordinates.  In
        that case, the old location is unknown.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG>ter-</STRONG>
-       <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-08-19                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 3063541a0..28176698e 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.37 2023/08/19 20:38:10 tom Exp @
+  * @Id: curs_threads.3x,v 1.41 2023/09/16 23:37:03 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -50,7 +50,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>curs_threads</STRONG> - <STRONG>curses</STRONG> thread support
+       <STRONG>curs_threads</STRONG> - <EM>curses</EM> thread support
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -69,13 +69,13 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        This  implementation  can  be configured to provide rudimentary support
-       for multi-threaded applications.  This makes a  different  set  of  li-
-       braries, e.g., <STRONG>libncursest</STRONG> since the binary interfaces are different.
+       for  multi-threaded  applications.   This  makes  a  different  set  of
+       libraries, e.g., <STRONG>libncursest</STRONG> since the binary interfaces are different.
 
        Rather  than  modify  the interfaces to pass a thread specifier to each
-       function, it adds a few functions which can be used in  any  configura-
-       tion  which  hide  the  mutex's needed to prevent concurrent use of the
-       global variables when configured for threading.
+       function,  it  adds  a  few  functions  which  can  be  used   in   any
+       configuration  which  hide the mutex's needed to prevent concurrent use
+       of the global variables when configured for threading.
 
        In addition to forcing access to members of the <STRONG>WINDOW</STRONG> structure to  be
        via  functions  (see <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>), it makes functions of the common
@@ -90,33 +90,34 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        are considered writable by some applications.  The functions  described
        here address these special situations.
 
-       The ESCDELAY and TABSIZE global variables are modified by some applica-
-       tions.  To modify them in any configuration, use  the  <STRONG>set_escdelay</STRONG>  or
-       <STRONG>set_tabsize</STRONG> functions.  Other global variables are not modifiable.
+       The  ESCDELAY  and  TABSIZE  global  variables  are  modified  by  some
+       applications.   To  modify  them  in   any   configuration,   use   the
+       <STRONG>set_escdelay</STRONG>  or <STRONG>set_tabsize</STRONG> functions.  Other global variables are not
+       modifiable.
 
        The <STRONG>get_escdelay</STRONG> function returns the value for ESCDELAY.
 
-       The  <STRONG>use_window</STRONG> and <STRONG>use_screen</STRONG> functions provide coarse granularity mu-
-       texes for their respective <STRONG>WINDOW</STRONG> and <STRONG>SCREEN</STRONG> parameters, and call a us-
-       er-supplied  function,  passing  it a <EM>data</EM> parameter, and returning the
+       The <STRONG>use_window</STRONG> and  <STRONG>use_screen</STRONG>  functions  provide  coarse  granularity
+       mutexes  for  their respective <STRONG>WINDOW</STRONG> and <STRONG>SCREEN</STRONG> parameters, and call a
+       user-supplied function, passing it a <EM>data</EM> parameter, and returning  the
        value from the user-supplied function to the application.
 
 
 </PRE><H3><a name="h3-USAGE">USAGE</a></H3><PRE>
-       All of the ncurses library functions assume that the locale is not  al-
-       tered during operation.  In addition, they use data which is maintained
-       within a hierarchy of scopes.
+       All  of  the  ncurses  library  functions assume that the locale is not
+       altered  during  operation.   In  addition,  they  use  data  which  is
+       maintained within a hierarchy of scopes.
 
-          <STRONG>o</STRONG>   global data, e.g., used in the low-level terminfo or termcap in-
-              terfaces.
+          <STRONG>o</STRONG>   global  data,  e.g.,  used  in the low-level terminfo or termcap
+              interfaces.
 
           <STRONG>o</STRONG>   terminal data, e.g., associated with a call to <STRONG>set_curterm</STRONG>.  The
               terminal data are initialized when screens are created.
 
           <STRONG>o</STRONG>   screen data, e.g., associated with a call to <STRONG>newterm</STRONG> or <STRONG>initscr</STRONG>.
 
-          <STRONG>o</STRONG>   window data, e.g., associated with a call to <STRONG>newwin</STRONG>  or  <STRONG>subwin</STRONG>.
-              Windows  are  associated with screens.  Pads are not necessarily
+          <STRONG>o</STRONG>   window  data,  e.g., associated with a call to <STRONG>newwin</STRONG> or <STRONG>subwin</STRONG>.
+              Windows are associated with screens.  Pads are  not  necessarily
               associated with a particular screen.
 
               Most curses applications operate on one or more windows within a
@@ -124,7 +125,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   reentrant, i.e., it uses only the data passed as parameters.
 
-       This  table lists the scope of data used for each symbol in the ncurses
+       This table lists the scope of data used for each symbol in the  ncurses
        library when it is configured to support threading:
 
             Symbol                  Scope
@@ -178,10 +179,10 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             chgat                   window (stdscr)
             clear                   window (stdscr)
             clearok                 window
+
             clrtobot                window (stdscr)
             clrtoeol                window (stdscr)
             color_content           screen
-
             color_set               window (stdscr)
             copywin                 window locks(source, target)
             cur_term                terminal
@@ -244,11 +245,11 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             in_wchnstr              window (stdscr)
             in_wchstr               window (stdscr)
             inch                    window (stdscr)
+
             inchnstr                window (stdscr)
             inchstr                 window (stdscr)
             init_color              screen
             init_pair               screen
-
             initscr                 global locks(screenlist)
             innstr                  window (stdscr)
             innwstr                 window (stdscr)
@@ -310,12 +311,12 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             mvget_wch               screen (input-operation)
             mvget_wstr              screen (input-operation)
             mvgetch                 screen (input-operation)
+
             mvgetn_wstr             screen (input-operation)
             mvgetnstr               screen (input-operation)
             mvgetstr                screen (input-operation)
             mvhline                 window (stdscr)
             mvhline_set             window (stdscr)
-
             mvin_wch                window (stdscr)
             mvin_wchnstr            window (stdscr)
             mvin_wchstr             window (stdscr)
@@ -376,13 +377,13 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             mvwprintw               window
             mvwscanw                screen
             mvwvline                window
+
             mvwvline_set            window
             napms                   reentrant
             newpad                  global locks(windowlist)
             newscr                  screen (readonly)
             newterm                 global locks(screenlist)
             newwin                  global locks(windowlist)
-
             nl                      screen
             nocbreak                screen
             nodelay                 window
@@ -442,6 +443,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             slk_attrset             screen
             slk_clear               screen
             slk_color               screen
+
             slk_init                screen
             slk_label               screen
             slk_noutrefresh         screen
@@ -449,7 +451,6 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             slk_restore             screen
             slk_set                 screen
             slk_touch               screen
-
             slk_wset                screen
             standend                window
             standout                window
@@ -508,6 +509,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             waddchnstr              window
             waddchstr               window
             waddnstr                window
+
             waddnwstr               window
             waddstr                 window
             waddwstr                window
@@ -516,7 +518,6 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             wattr_on                window
             wattr_set               window
             wattroff                window
-
             wattron                 window
             wattrset                window
             wbkgd                   window
@@ -574,6 +575,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             wredrawln               window
             wrefresh                screen
             wresize                 window locks(windowlist)
+
             wscanw                  screen
             wscrl                   window
             wsetscrreg              window
@@ -583,7 +585,6 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
             wsyncup                 screen (affects window plus parents)
             wtimeout                window
             wtouchln                window
-
             wunctrl                 global (static data)
             wvline                  window
             wvline_set              window
@@ -598,10 +599,10 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on ncurses extensions be conditioned using  NCURSES_VER-
-       SION.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -609,7 +610,7 @@ <H1 class="no-header">curs_threads 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 0e258f6ae..d1da3f8cd 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.30 2023/07/01 15:46:10 tom Exp @
+  * @Id: curs_touch.3x,v 1.34 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>touchwin</STRONG>, <STRONG>touchline</STRONG>, <STRONG>untouchwin</STRONG>, <STRONG>wtouchln</STRONG>, <STRONG>is_linetouched</STRONG>,
-       <STRONG>is_wintouched</STRONG> - <STRONG>curses</STRONG> refresh control routines
+       <STRONG>touchwin</STRONG>,     <STRONG>touchline</STRONG>,    <STRONG>untouchwin</STRONG>,    <STRONG>wtouchln</STRONG>,    <STRONG>is_linetouched</STRONG>,
+       <STRONG>is_wintouched</STRONG> - control terminal output refresh in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -66,57 +66,58 @@ <H1 class="no-header">curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>touchwin</STRONG> and <STRONG>touchline</STRONG> routines throw away all optimization  infor-
-       mation about which parts of the window have been touched, by pretending
-       that the entire window has been drawn on.  This is sometimes  necessary
-       when  using  overlapping  windows, since a change to one window affects
-       the other window, but the records of which lines have been  changed  in
-       the other window do not reflect the change.  The routine <STRONG>touchline</STRONG> only
-       pretends that <EM>count</EM> lines have been changed, beginning with line <EM>start</EM>.
+       The  <STRONG>touchwin</STRONG>  and  <STRONG>touchline</STRONG>  routines  throw  away  all  optimization
+       information  about  which  parts  of  the  window have been touched, by
+       pretending that the entire window has been drawn on.  This is sometimes
+       necessary  when using overlapping windows, since a change to one window
+       affects the other window, but the records  of  which  lines  have  been
+       changed  in  the  other  window do not reflect the change.  The routine
+       <STRONG>touchline</STRONG> only pretends that <EM>count</EM> lines have been  changed,  beginning
+       with line <EM>start</EM>.
 
        The <STRONG>untouchwin</STRONG> routine marks all lines in the window as unchanged since
        the last call to <STRONG>wrefresh</STRONG>.
 
-       The  <STRONG>wtouchln</STRONG>  routine makes <EM>n</EM> lines in the window, starting at line <EM>y</EM>,
-       look as if they have (<EM>changed</EM><STRONG>=1</STRONG>) or have not (<EM>changed</EM><STRONG>=0</STRONG>)  been  changed
+       The <STRONG>wtouchln</STRONG> routine makes <EM>n</EM> lines in the window, starting at  line  <EM>y</EM>,
+       look  as  if they have (<EM>changed</EM><STRONG>=1</STRONG>) or have not (<EM>changed</EM><STRONG>=0</STRONG>) been changed
        since the last call to <STRONG>wrefresh</STRONG>.
 
-       The <STRONG>is_linetouched</STRONG> and <STRONG>is_wintouched</STRONG> routines return <STRONG>TRUE</STRONG> if the speci-
-       fied line/window was modified since the last call to  <STRONG>wrefresh</STRONG>;  other-
-       wise  they  return  <STRONG>FALSE</STRONG>.   In addition, <STRONG>is_linetouched</STRONG> returns <STRONG>ERR</STRONG> if
-       <EM>line</EM> is not valid for the given window.
+       The <STRONG>is_linetouched</STRONG>  and  <STRONG>is_wintouched</STRONG>  routines  return  <STRONG>TRUE</STRONG>  if  the
+       specified  line/window  was  modified  since the last call to <STRONG>wrefresh</STRONG>;
+       otherwise they return <STRONG>FALSE</STRONG>.  In addition, <STRONG>is_linetouched</STRONG>  returns  <STRONG>ERR</STRONG>
+       if <EM>line</EM> is not valid for the given window.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and an  integer  value
-       other  than  <STRONG>ERR</STRONG>  upon successful completion, unless otherwise noted in
+       All  routines  return the integer <STRONG>ERR</STRONG> upon failure and an integer value
+       other than <STRONG>ERR</STRONG> upon successful completion, unless  otherwise  noted  in
        the preceding routine descriptions.
 
        X/Open does not define any error conditions.  In this implementation
 
           <STRONG>is_linetouched</STRONG>
-               returns an error if the window pointer is null, or if the  line
+               returns  an error if the window pointer is null, or if the line
                number is outside the window.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
-               normal return values of this function.   Because  the  function
+               normal  return  values  of this function.  Because the function
                returns a <STRONG>bool</STRONG>, returning <STRONG>ERR</STRONG> (which is neither <STRONG>TRUE</STRONG> nor <STRONG>FALSE</STRONG>)
                may not be supported by the compiler.
 
-               To provide error-checking and also match  the  X/Open  function
+               To  provide  error-checking  and also match the X/Open function
                prototype, the <STRONG>ERR</STRONG> is provided by a macro named <STRONG>is_linetouched</STRONG>.
                The actual function returns <STRONG>FALSE</STRONG> when it detects an error.
 
           <STRONG>wtouchln</STRONG>
-               returns an error if the window pointer is null, or if the  line
+               returns  an error if the window pointer is null, or if the line
                number is outside the window.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  were  introduced  by SVr4.  The Solaris curses header
+       These functions were introduced by SVr4.   The  Solaris  curses  header
        file, for instance, defines both an actual function and macro for each.
-       The  macros  give the same result as the actual functions.  SVr4 curses
-       does not check the window parameter <EM>win</EM> to ensure that it is not  <STRONG>NULL</STRONG>;
+       The macros give the same result as the actual functions.   SVr4  curses
+       does  not check the window parameter <EM>win</EM> to ensure that it is not <STRONG>NULL</STRONG>;
        otherwise this implementation behaves the same as SVr4.
 
        The XSI Curses standard, Issue 4 describes these functions, but defines
@@ -132,7 +133,7 @@ <H1 class="no-header">curs_touch 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 6bebf735e..6fb618fce 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.29 2023/07/01 15:46:10 tom Exp @
+  * @Id: curs_trace.3x,v 1.35 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>curses_trace</STRONG>, <STRONG>trace</STRONG>, <STRONG>_tracef</STRONG>, <STRONG>_traceattr</STRONG>, <STRONG>_traceattr2</STRONG>, <STRONG>_tracecchar_t</STRONG>,
+       <STRONG>curses_trace</STRONG>,  <STRONG>trace</STRONG>,  <STRONG>_tracef</STRONG>, <STRONG>_traceattr</STRONG>, <STRONG>_traceattr2</STRONG>, <STRONG>_tracecchar_t</STRONG>,
        <STRONG>_tracecchar_t2</STRONG>, <STRONG>_tracechar</STRONG>, <STRONG>_tracechtype</STRONG>, <STRONG>_tracechtype2</STRONG>, <STRONG>_nc_tracebits</STRONG>,
-       <STRONG>_tracedump</STRONG>, <STRONG>_tracemouse</STRONG> - <STRONG>curses</STRONG> debugging routines
+       <STRONG>_tracedump</STRONG>, <STRONG>_tracemouse</STRONG> - <EM>curses</EM> debugging routines
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -77,8 +77,8 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The <EM>curses</EM> <EM>trace</EM> routines are used for debugging the ncurses libraries,
-       as well as applications which use the ncurses libraries.  Some  limita-
-       tions apply:
+       as  well  as  applications  which  use  the  ncurses  libraries.   Some
+       limitations apply:
 
        <STRONG>o</STRONG>   Aside from <STRONG>curses_trace</STRONG>, the other functions are normally available
            only with the debugging library e.g., <STRONG>libncurses_g.a</STRONG>.
@@ -98,9 +98,9 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   <STRONG>_tracef</STRONG>, which writes formatted data to the <EM>trace</EM> file.
 
-           The other functions either return a pointer to a string-area (allo-
-           cated by the corresponding function), or return no value  (such  as
-           <STRONG>_tracedump</STRONG>,  which  implements  the  screen dump for <STRONG>TRACE_UPDATE</STRONG>).
+           The  other  functions  either  return  a  pointer  to a string-area
+           (allocated by the corresponding function), or return no value (such
+           as  <STRONG>_tracedump</STRONG>, which implements the screen dump for <STRONG>TRACE_UPDATE</STRONG>).
            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,
@@ -109,26 +109,27 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        The <STRONG>curses_trace</STRONG> function is always available, whether or not the other
        trace functions are available:
 
-       <STRONG>o</STRONG>   If tracing is available, calling <STRONG>curses_trace</STRONG> with a nonzero param-
-           eter updates the trace mask, and returns the previous trace mask.
+       <STRONG>o</STRONG>   If tracing  is  available,  calling  <STRONG>curses_trace</STRONG>  with  a  nonzero
+           parameter  updates  the  trace mask, and returns the previous trace
+           mask.
 
            When the trace mask is nonzero, ncurses creates the file "trace" in
-           the current directory for output.  If the file already  exists,  no
+           the  current  directory for output.  If the file already exists, no
            tracing is done.
 
        <STRONG>o</STRONG>   If tracing is not available, <STRONG>curses_trace</STRONG> returns zero (0).
 
 
 </PRE><H3><a name="h3-Trace-Parameter">Trace Parameter</a></H3><PRE>
-       The  trace  parameter  is  formed  by  OR'ing  values  from the list of
+       The trace parameter is  formed  by  OR'ing  values  from  the  list  of
        <STRONG>TRACE_</STRONG><EM>xxx</EM> definitions in <STRONG>&lt;curses.h&gt;</STRONG>.  These include:
 
        <STRONG>TRACE_DISABLE</STRONG>
             turn off tracing by passing a zero parameter.
 
-            The library flushes the output file, but retains an open  file-de-
-            scriptor  to the trace file so that it can resume tracing later if
-            a nonzero parameter is passed to the <STRONG>curses_trace</STRONG> function.
+            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 <STRONG>curses_trace</STRONG> function.
 
        <STRONG>TRACE_TIMES</STRONG>
             trace user and system times of updates.
@@ -146,11 +147,11 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
             trace all character outputs.
 
        <STRONG>TRACE_ORDINARY</STRONG>
-            trace all update actions.  The old and  new  screen  contents  are
+            trace  all  update  actions.   The old and new screen contents are
             written to the trace file for each refresh.
 
        <STRONG>TRACE_CALLS</STRONG>
-            trace  all curses calls.  The parameters for each call are traced,
+            trace all curses calls.  The parameters for each call are  traced,
             as well as return values.
 
        <STRONG>TRACE_VIRTPUT</STRONG>
@@ -177,69 +178,70 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        <STRONG>TRACE_MAXIMUM</STRONG>
             maximum trace level, enables all of the separate trace features.
 
-       Some tracing features are enabled whenever the  <STRONG>curses_trace</STRONG>  parameter
-       is  nonzero.   Some features overlap.  The specific names are used as a
+       Some  tracing  features are enabled whenever the <STRONG>curses_trace</STRONG> parameter
+       is nonzero.  Some features overlap.  The specific names are used  as  a
        guideline.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       These functions check the <STRONG>NCURSES_TRACE</STRONG> environment  variable,  to  set
+       These  functions  check  the <STRONG>NCURSES_TRACE</STRONG> environment variable, to set
        the tracing feature as if <STRONG>curses_trace</STRONG> was called:
 
-           filter, initscr, new_prescr, newterm, nofilter, restartterm,
-           ripoffline, setupterm, slk_init, tgetent, use_env,
+           filter,  initscr,  new_prescr,  newterm,   nofilter,   restartterm,
+           ripoffline,      setupterm,     slk_init,     tgetent,     use_env,
            use_extended_names, use_tioctl
 
 
 </PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
-       The  command-line  utilities  such  as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> provide a verbose option
-       which extends the set of messages written using the <STRONG>curses_trace</STRONG>  func-
-       tion.   Both  of  these  (<STRONG>-v</STRONG>  and  <STRONG>curses_trace</STRONG>)  use the same variable
+       The command-line utilities such as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>  provide  a  verbose  option
+       which  extends  the  set  of  messages  written  using the <STRONG>curses_trace</STRONG>
+       function.  Both of these (<STRONG>-v</STRONG> and <STRONG>curses_trace</STRONG>) use  the  same  variable
        (<STRONG>_nc_tracing</STRONG>), which determines the messages which are written.
 
-       Because the command-line utilities may  call  initialization  functions
-       such  as <STRONG>setupterm</STRONG>, <STRONG>tgetent</STRONG> or <STRONG>use_extended_names</STRONG>, some of their debug-
-       ging output may be directed to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG>  en-
-       vironment variable is set:
+       Because  the  command-line  utilities may call initialization functions
+       such  as  <STRONG>setupterm</STRONG>,  <STRONG>tgetent</STRONG>  or  <STRONG>use_extended_names</STRONG>,  some  of  their
+       debugging output may be directed to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG>
+       environment variable is set:
 
        <STRONG>o</STRONG>   messages produced in the utility are written to the standard error.
 
        <STRONG>o</STRONG>   messages produced by the underlying library are written to <EM>trace</EM>.
 
-       If  ncurses  is built without tracing, none of the latter are produced,
+       If ncurses is built without tracing, none of the latter  are  produced,
        and fewer diagnostics are provided by the command-line utilities.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines which return a value are designed to be used as parameters  to
+       Routines  which return a value are designed to be used as parameters to
        the <STRONG>_tracef</STRONG> routine.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are not part of the XSI interface.  Some other curses
-       implementations are known to have similar features, but  they  are  not
+       These functions are not part of the XSI interface.  Some  other  curses
+       implementations  are  known  to have similar features, but they are not
        compatible with ncurses:
 
-       <STRONG>o</STRONG>   SVr4  provided  <STRONG>traceon</STRONG>  and <STRONG>traceoff</STRONG>, to control whether debugging
-           information was written to the "trace" file.  While  the  functions
-           were  always  available, this feature was only enabled if <STRONG>DEBUG</STRONG> was
+       <STRONG>o</STRONG>   SVr4 provided <STRONG>traceon</STRONG> and <STRONG>traceoff</STRONG>, to  control  whether  debugging
+           information  was  written to the "trace" file.  While the functions
+           were always available, this feature was only enabled if  <STRONG>DEBUG</STRONG>  was
            defined when building the library.
 
            The SVr4 tracing feature is undocumented.
 
-       <STRONG>o</STRONG>   PDCurses provides <STRONG>traceon</STRONG> and <STRONG>traceoff</STRONG>, which (like SVr4)  are  al-
-           ways  available, and enable tracing to the "trace" file only when a
-           debug-library is built.
+       <STRONG>o</STRONG>   PDCurses  provides  <STRONG>traceon</STRONG>  and  <STRONG>traceoff</STRONG>,  which  (like SVr4) are
+           always available, and enable tracing to the "trace" file only  when
+           a debug-library is built.
 
-           PDCurses has a short description of these functions,  with  a  note
-           that  they are not present in X/Open Curses, ncurses or NetBSD.  It
-           does not mention SVr4, but the functions'  inclusion  in  a  header
+           PDCurses  has  a  short description of these functions, with a note
+           that they are not present in X/Open Curses, ncurses or NetBSD.   It
+           does  not  mention  SVr4,  but the functions' inclusion in a header
            file section labeled "Quasi-standard" hints at the origin.
 
-       <STRONG>o</STRONG>   NetBSD  does  not  provide functions for enabling/disabling traces.
-           It  uses  environment   variables   <STRONG>CURSES_TRACE_MASK</STRONG>   and   <STRONG>CURS-</STRONG>
-           <STRONG>ES_TRACE_FILE</STRONG>  to  determine  what is traced, and where the results
-           are written.  This is available only when a debug-library is built.
+       <STRONG>o</STRONG>   NetBSD does not provide functions  for  enabling/disabling  traces.
+           It     uses    environment    variables    <STRONG>CURSES_TRACE_MASK</STRONG>    and
+           <STRONG>CURSES_TRACE_FILE</STRONG> to  determine  what  is  traced,  and  where  the
+           results  are  written.  This is available only when a debug-library
+           is built.
 
            The NetBSD tracing feature is undocumented.
 
@@ -257,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index b653bfc25..31740a583 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.73 2023/08/19 20:38:17 tom Exp @
+  * @Id: curs_util.3x,v 1.77 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>delay_output</STRONG>, <STRONG>filter</STRONG>, <STRONG>flushinp</STRONG>, <STRONG>getwin</STRONG>, <STRONG>key_name</STRONG>, <STRONG>keyname</STRONG>, <STRONG>nofilter</STRONG>,
-       <STRONG>putwin</STRONG>, <STRONG>unctrl</STRONG>, <STRONG>use_env</STRONG>, <STRONG>use_tioctl</STRONG>, <STRONG>wunctrl</STRONG> - miscellaneous <STRONG>curses</STRONG>
+       <STRONG>delay_output</STRONG>,  <STRONG>filter</STRONG>,  <STRONG>flushinp</STRONG>,  <STRONG>getwin</STRONG>, <STRONG>key_name</STRONG>, <STRONG>keyname</STRONG>, <STRONG>nofilter</STRONG>,
+       <STRONG>putwin</STRONG>, <STRONG>unctrl</STRONG>, <STRONG>use_env</STRONG>, <STRONG>use_tioctl</STRONG>,  <STRONG>wunctrl</STRONG>  -  miscellaneous  <EM>curses</EM>
        utility routines
 
 
@@ -80,11 +80,11 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-unctrl">unctrl</a></H3><PRE>
-       The <STRONG>unctrl</STRONG> routine returns a character string which is a printable rep-
-       resentation of the character <EM>c</EM>:
+       The  <STRONG>unctrl</STRONG>  routine  returns  a  character string which is a printable
+       representation of the character <EM>c</EM>:
 
-       <STRONG>o</STRONG>   Printable characters are displayed as themselves, e.g., a one-char-
-           acter string containing the key.
+       <STRONG>o</STRONG>   Printable characters are displayed  as  themselves,  e.g.,  a  one-
+           character string containing the key.
 
        <STRONG>o</STRONG>   Control characters are displayed in the <STRONG>^</STRONG><EM>X</EM> notation.
 
@@ -93,13 +93,13 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   DEL (character 127) is displayed as <STRONG>^?</STRONG>.
 
        <STRONG>o</STRONG>   Values  above 128 are either meta characters (if the screen has not
-           been initialized, or if <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> has been called with a <STRONG>TRUE</STRONG> param-
-           eter),  shown  in the <STRONG>M-</STRONG><EM>X</EM> notation, or are displayed as themselves.
-           In the latter case, the values may not be printable;  this  follows
-           the X/Open specification.
+           been initialized, or if  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  has  been  called  with  a  <STRONG>TRUE</STRONG>
+           parameter),  shown  in  the  <STRONG>M-</STRONG><EM>X</EM>  notation,  or  are  displayed  as
+           themselves.  In the latter case, the values may not  be  printable;
+           this follows the X/Open specification.
 
-       The  corresponding <STRONG>wunctrl</STRONG> returns a printable representation of a com-
-       plex character <EM>c</EM>.
+       The  corresponding  <STRONG>wunctrl</STRONG>  returns  a  printable  representation of a
+       complex character <EM>c</EM>.
 
        In both <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> the attributes and color associated with the
        character parameter are ignored.
@@ -109,20 +109,20 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        The <STRONG>keyname</STRONG> routine returns a character string corresponding to the key
        <EM>c</EM>.  Key codes are different from character codes.
 
-       <STRONG>o</STRONG>   Key codes below 256 are characters.  They are displayed using  <STRONG>unc-</STRONG>
-           <STRONG>trl</STRONG>.
+       <STRONG>o</STRONG>   Key codes below 256  are  characters.   They  are  displayed  using
+           <STRONG>unctrl</STRONG>.
 
        <STRONG>o</STRONG>   Values  above 256 may be the codes for function keys.  The function
            key name is displayed.
 
        <STRONG>o</STRONG>   Otherwise (if there is no corresponding name and the key is  not  a
            character)  the  function returns null, to denote an error.  X/Open
-           also lists an "UNKNOWN KEY" return value,  which  some  implementa-
-           tions return rather than null.
+           also  lists   an   "UNKNOWN   KEY"   return   value,   which   some
+           implementations return rather than null.
 
-       The  corresponding <STRONG>key_name</STRONG> returns a multibyte character string corre-
-       sponding to the wide-character value <EM>w</EM>.  The two functions (<STRONG>keyname</STRONG> and
-       <STRONG>key_name</STRONG>) do not return the same set of strings:
+       The   corresponding  <STRONG>key_name</STRONG>  returns  a  multibyte  character  string
+       corresponding  to  the  wide-character  value  <EM>w</EM>.   The  two  functions
+       (<STRONG>keyname</STRONG> and <STRONG>key_name</STRONG>) do not return the same set of strings:
 
        <STRONG>o</STRONG>   <STRONG>keyname</STRONG> returns null where <STRONG>key_name</STRONG> would display a meta character.
 
@@ -135,8 +135,8 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   <STRONG>LINES</STRONG> is set to 1;
 
-       <STRONG>o</STRONG>   the capabilities <STRONG>clear</STRONG>, <STRONG>cud1</STRONG>, <STRONG>cud</STRONG>, <STRONG>cup</STRONG>, <STRONG>cuu1</STRONG>,  <STRONG>cuu</STRONG>,  <STRONG>vpa</STRONG>  are  dis-
-           abled;
+       <STRONG>o</STRONG>   the  capabilities  <STRONG>clear</STRONG>,  <STRONG>cud1</STRONG>,  <STRONG>cud</STRONG>,  <STRONG>cup</STRONG>,  <STRONG>cuu1</STRONG>,  <STRONG>cuu</STRONG>,  <STRONG>vpa</STRONG>  are
+           disabled;
 
        <STRONG>o</STRONG>   the capability <STRONG>ed</STRONG> is disabled if <STRONG>bce</STRONG> is set;
 
@@ -150,26 +150,26 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-use_env">use_env</a></H3><PRE>
        The <STRONG>use_env</STRONG> routine, if  used,  should  be  called  before  <STRONG>initscr</STRONG>  or
-       <STRONG>newterm</STRONG>  are  called (because those compute the screen size).  It modi-
-       fies the way <STRONG>ncurses</STRONG> treats environment variables when determining  the
-       screen size.
+       <STRONG>newterm</STRONG>  are  called  (because  those  compute  the  screen  size).  It
+       modifies the way <STRONG>ncurses</STRONG> treats environment variables when  determining
+       the screen size.
 
        <STRONG>o</STRONG>   Normally  <STRONG>ncurses</STRONG>  looks  first  at  the  terminal database for the
            screen size.
 
-           If <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG> for parameter, it stops  here  un-
-           less <STRONG>use_tioctl</STRONG> was also called with <STRONG>TRUE</STRONG> for parameter.
+           If <STRONG>use_env</STRONG> was called with  <STRONG>FALSE</STRONG>  for  parameter,  it  stops  here
+           unless <STRONG>use_tioctl</STRONG> was also called with <STRONG>TRUE</STRONG> for parameter.
 
        <STRONG>o</STRONG>   Then  it  asks  for the screen size via operating system calls.  If
            successful, it overrides the values from the terminal database.
 
        <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <STRONG>ncurses</STRONG>
            examines  the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables, using a value
-           in those to override the results from the operating system or  ter-
-           minal database.
+           in those to override the  results  from  the  operating  system  or
+           terminal database.
 
-           <STRONG>Ncurses</STRONG>  also  updates the screen size in response to <STRONG>SIGWINCH</STRONG>, un-
-           less overridden by the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables,
+           <STRONG>Ncurses</STRONG>  also  updates  the  screen  size  in response to <STRONG>SIGWINCH</STRONG>,
+           unless overridden by the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables,
 
 
 </PRE><H3><a name="h3-use_tioctl">use_tioctl</a></H3><PRE>
@@ -193,13 +193,13 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
            <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
            ----------------------------------------------------------------
            TRUE      FALSE        This  is  the default behavior.  <STRONG>ncurses</STRONG>
-                                  uses operating system calls unless over-
-                                  ridden by $LINES or $COLUMNS environment
-                                  variables.
+                                  uses  operating  system   calls   unless
+                                  overridden   by   $LINES   or   $COLUMNS
+                                  environment variables.
            TRUE      TRUE         <STRONG>ncurses</STRONG>  updates  $LINES  and   $COLUMNS
                                   based on operating system calls.
-           FALSE     TRUE         <STRONG>ncurses</STRONG> ignores $LINES and $COLUMNS, us-
-                                  es  operating  system  calls  to  obtain
+           FALSE     TRUE         <STRONG>ncurses</STRONG>  ignores  $LINES  and  $COLUMNS,
+                                  uses operating system  calls  to  obtain
                                   size.
            FALSE     FALSE        <STRONG>ncurses</STRONG>  relies on the terminal database
                                   to determine size.
@@ -207,18 +207,18 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-putwin_getwin">putwin/getwin</a></H3><PRE>
        The <STRONG>putwin</STRONG> routine writes all data associated with window (or pad)  <EM>win</EM>
-       into the file to which <EM>filep</EM> points.  This information can be later re-
-       trieved using the <STRONG>getwin</STRONG> function.
+       into  the  file  to  which <EM>filep</EM> points.  This information can be later
+       retrieved using the <STRONG>getwin</STRONG> function.
 
        The <STRONG>getwin</STRONG> routine reads window related data  stored  in  the  file  by
        <STRONG>putwin</STRONG>.   The  routine  then creates and initializes a new window using
        that data.  It returns a pointer to the new window.  There  are  a  few
        caveats:
 
-       <STRONG>o</STRONG>   the data written is a copy of the <STRONG>WINDOW</STRONG> structure, and its associ-
-           ated character cells.  The format differs between the  wide-charac-
-           ter  (<STRONG>ncursesw</STRONG>) and non-wide (<STRONG>ncurses</STRONG>) libraries.  You can transfer
-           data between the two, however.
+       <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <STRONG>WINDOW</STRONG> structure, and its
+           associated character cells.  The format differs between  the  wide-
+           character  (<STRONG>ncursesw</STRONG>)  and  non-wide  (<STRONG>ncurses</STRONG>) libraries.  You can
+           transfer data between the two, however.
 
        <STRONG>o</STRONG>   the retrieved window is always created as a  top-level  window  (or
            pad), rather than a subwindow.
@@ -232,8 +232,8 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-delay_output">delay_output</a></H3><PRE>
        The <STRONG>delay_output</STRONG> routine inserts an <EM>ms</EM>  millisecond  pause  in  output.
        This  routine should not be used extensively because padding characters
-       are used rather than a CPU pause.  If no padding  character  is  speci-
-       fied, this uses <STRONG>napms</STRONG> to perform the delay.
+       are used  rather  than  a  CPU  pause.   If  no  padding  character  is
+       specified, this uses <STRONG>napms</STRONG> to perform the delay.
 
 
 </PRE><H3><a name="h3-flushinp">flushinp</a></H3><PRE>
@@ -254,8 +254,8 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
                returns an error if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns an error if the associated <STRONG>fwrite</STRONG> calls return  an  er-
-               ror.
+               returns an error if  the  associated  <STRONG>fwrite</STRONG>  calls  return  an
+               error.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -267,10 +267,10 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The  <STRONG>keyname</STRONG> function may return the names of user-defined string capa-
-       bilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option  of
-       <STRONG>tic</STRONG>.  This implementation automatically assigns at run-time keycodes to
-       user-defined strings which begin  with  "k".   The  keycodes  start  at
+       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
+       capabilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option
+       of <STRONG>tic</STRONG>.  This implementation automatically 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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function controls
@@ -281,16 +281,16 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter/use_tioctl</a></H3><PRE>
        The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <STRONG>ncurses</STRONG>.  They
        were not supported on Version 7, BSD or System V  implementations.   It
-       is  recommended that any code depending on <STRONG>ncurses</STRONG> extensions be condi-
-       tioned using NCURSES_VERSION.
+       is  recommended  that  any  code  depending  on  <STRONG>ncurses</STRONG>  extensions be
+       conditioned using NCURSES_VERSION.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The files written and read by these functions  use  an  implementa-
-           tion-specific format.  Although the format is an obvious target for
-           standardization, it has been overlooked.
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.) originated with
@@ -323,9 +323,9 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
            <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
-           returns the parameter, i.e., a one-character string with the param-
-           eter as the first character.  Otherwise,  it  returns  "~@",  "~A",
-           etc., analogous to "^@", "^A", C0 controls.
+           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 <STRONG>unctrl</STRONG> can be called before
            initializing curses.  This implementation permits that, and returns
@@ -336,42 +336,43 @@ <H1 class="no-header">curs_util 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
        The strings returned by <STRONG>unctrl</STRONG> 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  conven-
-       tions.  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 printable.  This implementation
-       uses 8 bits but does not modify the  string  to  reflect  locale.   The
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  function  allows the caller to change the output
-       of <STRONG>unctrl</STRONG>.
+       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 printable.
+       This implementation uses 8 bits but  does  not  modify  the  string  to
+       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
+       to change the output of <STRONG>unctrl</STRONG>.
 
        Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
        of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
-       "meta" keys (codes in the range  128  to  255).   Both  <STRONG>use_legacy_cod-</STRONG>
-       <STRONG><A HREF="use_legacy_coding.3x.html">ing(3x)</A></STRONG>  and <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> 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 <STRONG>keyname</STRONG> is called before initializ-
-       ing curses), this implementation returns strings "M-^@", "M-^A", etc.
+       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
+       before  initializing  curses),  this  implementation  returns   strings
+       "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <STRONG>ncurses</STRONG>
-       does.   However,  <STRONG>ncurses</STRONG>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
+       does.  However, <STRONG>ncurses</STRONG>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env/use_tioctl</a></H3><PRE>
-       If <STRONG>ncurses</STRONG> is configured to provide  the  sp-functions  extension,  the
-       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
-       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
+       If  <STRONG>ncurses</STRONG>  is  configured  to provide the sp-functions extension, the
+       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
+       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>legacy_cod-</STRONG>
-       <STRONG><A HREF="legacy_coding.3x.html">ing(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-08-19                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 6b944a930..1d3cf47ab 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.18 2021/12/25 21:49:32 tom Exp @
+  * @Id: curs_variables.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>COLORS</STRONG>, <STRONG>COLOR_PAIRS</STRONG>, <STRONG>COLS</STRONG>, <STRONG>ESCDELAY</STRONG>, <STRONG>LINES</STRONG>, <STRONG>TABSIZE</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>,
-       <STRONG>stdscr</STRONG> - <STRONG>curses</STRONG> global variables
+       <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLS</STRONG>,  <STRONG>ESCDELAY</STRONG>, <STRONG>LINES</STRONG>, <STRONG>TABSIZE</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>,
+       <STRONG>stdscr</STRONG> - <EM>curses</EM> global variables
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -101,8 +101,8 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 </PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
        This variable holds the number of milliseconds to wait after reading an
        escape character, to distinguish between an individual escape character
-       entered on the keyboard from escape sequences sent by cursor- and func-
-       tion-keys (see <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>).
+       entered  on  the  keyboard  from  escape  sequences sent by cursor- and
+       function-keys (see <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-LINES">LINES</a></H3><PRE>
@@ -112,8 +112,8 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
        This  variable  holds  the number of columns used by the <EM>curses</EM> library
-       when converting a tab character to spaces as it adds the tab to a  win-
-       dow (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
+       when converting a tab character to spaces as  it  adds  the  tab  to  a
+       window (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-The-Current-Screen">The Current Screen</a></H3><PRE>
@@ -125,8 +125,8 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
 
 </PRE><H3><a name="h3-The-New-Screen">The New Screen</a></H3><PRE>
-       This  implementation of curses uses a special window <STRONG>newscr</STRONG> to hold up-
-       dates to the terminal screen before applying them to <STRONG>curscr</STRONG>.
+       This  implementation  of  curses  uses  a special window <STRONG>newscr</STRONG> to hold
+       updates to the terminal screen before applying them to <STRONG>curscr</STRONG>.
 
        This is referred to as the "virtual  screen"  in  the  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> manual pages.
@@ -150,22 +150,22 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
        <STRONG>TABSIZE</STRONG>  is  a feature of SVr4 curses which is not documented by X/Open
        curses.
 
-       <STRONG>o</STRONG>   In SVr4 curses, <STRONG>TABSIZE</STRONG> is initially set from the terminal descrip-
-           tion's  <STRONG>init_tabs</STRONG> capability.  After that, it can be altered by the
-           applications using SVr4 curses.
+       <STRONG>o</STRONG>   In  SVr4  curses,  <STRONG>TABSIZE</STRONG>  is  initially  set  from  the  terminal
+           description's  <STRONG>init_tabs</STRONG> capability.  After that, it can be altered
+           by the applications using SVr4 curses.
 
-           SVr4 curses uses the current value of <STRONG>TABSIZE</STRONG> to compute the  posi-
-           tion  of  tabstops  for  updating both the virtual screen with <STRONG>add-</STRONG>
-           <STRONG><A HREF="addch.3x.html">ch(3x)</A></STRONG> as well as the physical screen with <STRONG><A HREF="curs_terminfo.3x.html">mvcur(3x)</A></STRONG>.
+           SVr4 curses uses the  current  value  of  <STRONG>TABSIZE</STRONG>  to  compute  the
+           position  of  tabstops  for  updating  both the virtual screen with
+           <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> as well as the physical screen with <STRONG><A HREF="curs_terminfo.3x.html">mvcur(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   This implementation uses the current value of <STRONG>TABSIZE</STRONG> only for  up-
-           dating  the  virtual screen.  It uses the terminal description's <STRONG>it</STRONG>
+       <STRONG>o</STRONG>   This implementation uses the current  value  of  <STRONG>TABSIZE</STRONG>  only  for
+           updating the virtual screen.  It uses the terminal description's <STRONG>it</STRONG>
            (<STRONG>init_tabs</STRONG>) capability for computing hardware tabs (i.e., tab stops
            on the physical screen).
 
        <STRONG>o</STRONG>   Other  implementations  differ.  For instance, NetBSD curses allows
-           <STRONG>TABSIZE</STRONG> to be set through an environment variable.  This  implemen-
-           tation does not.
+           <STRONG>TABSIZE</STRONG>  to  be  set  through  an   environment   variable.    This
+           implementation does not.
 
            NetBSD curses does not support hardware tabs; it uses the <STRONG>init_tabs</STRONG>
            capability and the <STRONG>TABSIZE</STRONG> variable only for updating  the  virtual
@@ -177,8 +177,8 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
        <STRONG>o</STRONG>   The default value for AIX's <STRONG>ESCDELAY</STRONG> is 0.1 seconds.
 
-       <STRONG>o</STRONG>   AIX  also enforces a limit of 10,000 seconds for <STRONG>ESCDELAY</STRONG>; this im-
-           plementation currently has no upper limit.
+       <STRONG>o</STRONG>   AIX  also  enforces  a  limit  of 10,000 seconds for <STRONG>ESCDELAY</STRONG>; this
+           implementation currently has no upper limit.
 
        This implementation has long used <STRONG>ESCDELAY</STRONG> with units of  milliseconds,
        making  it  impossible to be completely compatible with AIX.  Likewise,
@@ -192,7 +192,7 @@ <H1 class="no-header">curs_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2021-12-25                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 59409f858..1d07732db 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.32 2023/07/01 15:46:10 tom Exp @
+  * @Id: curs_window.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>newwin</STRONG>, <STRONG>delwin</STRONG>, <STRONG>mvwin</STRONG>, <STRONG>subwin</STRONG>, <STRONG>derwin</STRONG>, <STRONG>mvderwin</STRONG>, <STRONG>dupwin</STRONG>, <STRONG>wsyncup</STRONG>,
-       <STRONG>syncok</STRONG>, <STRONG>wcursyncup</STRONG>, <STRONG>wsyncdown</STRONG> - create <STRONG>curses</STRONG> windows
+       <STRONG>newwin</STRONG>,  <STRONG>delwin</STRONG>,  <STRONG>mvwin</STRONG>,  <STRONG>subwin</STRONG>,  <STRONG>derwin</STRONG>,  <STRONG>mvderwin</STRONG>,  <STRONG>dupwin</STRONG>, <STRONG>wsyncup</STRONG>,
+       <STRONG>syncok</STRONG>, <STRONG>wcursyncup</STRONG>, <STRONG>wsyncdown</STRONG> - create and manipulate <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -99,8 +99,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-delwin">delwin</a></H3><PRE>
        Calling <STRONG>delwin</STRONG> deletes the named window, freeing all memory  associated
-       with  it  (it does not actually erase the window's screen image).  Sub-
-       windows must be deleted before the main window can be deleted.
+       with  it  (it  does  not  actually  erase  the  window's screen image).
+       Subwindows must be deleted before the main window can be deleted.
 
 
 </PRE><H3><a name="h3-mvwin">mvwin</a></H3><PRE>
@@ -115,8 +115,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.  The  window  is  at
        position (<EM>begin</EM>_<EM>y</EM>, <EM>begin</EM>_<EM>x</EM>) on the screen.  The subwindow shares memory
        with the window <EM>orig</EM>, so that changes made to one  window  will  affect
-       both  windows.  When using this routine, it is necessary to call <STRONG>touch-</STRONG>
-       <STRONG>win</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>wrefresh</STRONG> on the subwindow.
+       both  windows.   When  using  this  routine,  it  is  necessary to call
+       <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>wrefresh</STRONG> on the subwindow.
 
 
 </PRE><H3><a name="h3-derwin">derwin</a></H3><PRE>
@@ -125,8 +125,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        screen.  There is no difference between the subwindows and the  derived
        windows.
 
-       Calling  <STRONG>mvderwin</STRONG> moves a derived window (or subwindow) inside its par-
-       ent window.  The screen-relative  parameters  of  the  window  are  not
+       Calling  <STRONG>mvderwin</STRONG>  moves  a  derived  window  (or subwindow) inside its
+       parent window.  The screen-relative parameters of the  window  are  not
        changed.  This routine is used to display different parts of the parent
        window at the same physical position on the screen.
 
@@ -138,14 +138,14 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-wsyncup">wsyncup</a></H3><PRE>
        Calling <STRONG>wsyncup</STRONG> touches all locations in  ancestors  of  <EM>win</EM>  that  are
        changed  in  <EM>win</EM>.   If  <STRONG>syncok</STRONG> is called with second argument <STRONG>TRUE</STRONG> then
-       <STRONG>wsyncup</STRONG> is called automatically whenever there is a change in the  win-
-       dow.
+       <STRONG>wsyncup</STRONG> is called automatically whenever  there  is  a  change  in  the
+       window.
 
 
 </PRE><H3><a name="h3-wsyncdown">wsyncdown</a></H3><PRE>
        The  <STRONG>wsyncdown</STRONG>  routine  touches  each  location  in  <EM>win</EM> that has been
-       touched in any of its ancestor windows.  This routine is called by <STRONG>wre-</STRONG>
-       <STRONG>fresh</STRONG>, so it should almost never be necessary to call it manually.
+       touched in any of its ancestor windows.   This  routine  is  called  by
+       <STRONG>wrefresh</STRONG>, so it should almost never be necessary to call it manually.
 
 
 </PRE><H3><a name="h3-wcursyncup">wcursyncup</a></H3><PRE>
@@ -156,8 +156,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines that return an integer return the integer <STRONG>ERR</STRONG> upon failure and
-       <STRONG>OK</STRONG> (SVr4 only specifies "an integer value other than  <STRONG>ERR</STRONG>")  upon  suc-
-       cessful completion.
+       <STRONG>OK</STRONG> (SVr4 only  specifies  "an  integer  value  other  than  <STRONG>ERR</STRONG>")  upon
+       successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
@@ -176,8 +176,8 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
             returns an error if the window pointer is null.
 
             This implementation also maintains a list of windows,  and  checks
-            that  the pointer passed to <STRONG>delwin</STRONG> is one that it created, return-
-            ing an error if it was not..
+            that  the  pointer  passed  to  <STRONG>delwin</STRONG>  is  one  that  it created,
+            returning an error if it was not..
 
        <STRONG>mvderwin</STRONG>
             returns an error if the window pointer is null, or if some part of
@@ -219,11 +219,11 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        tested.
 
        The System V curses documentation is very unclear  about  what  <STRONG>wsyncup</STRONG>
-       and  <STRONG>wsyncdown</STRONG>  actually do.  It seems to imply that they are only sup-
-       posed to touch exactly  those  lines  that  are  affected  by  ancestor
-       changes.  The language here, and the behavior of the <STRONG>curses</STRONG> implementa-
-       tion, is patterned on the XPG4 curses standard.  The weaker  XPG4  spec
-       may result in slower updates.
+       and  <STRONG>wsyncdown</STRONG>  actually  do.   It  seems  to  imply that they are only
+       supposed to touch exactly those lines that  are  affected  by  ancestor
+       changes.    The   language   here,  and  the  behavior  of  the  <STRONG>curses</STRONG>
+       implementation, is patterned on the XPG4 curses standard.   The  weaker
+       XPG4 spec may result in slower updates.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -237,12 +237,12 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
            if the curses library keeps a list of the subwindows.  SVr4  curses
            kept  a  count  of the number of subwindows rather than a list.  It
            simply returned <STRONG>ERR</STRONG> when asked  to  delete  a  subwindow.   Solaris
-           X/Open curses does not even make that check, and will delete a par-
-           ent window which still has subwindows.
+           X/Open  curses  does  not  even  make that check, and will delete a
+           parent window which still has subwindows.
 
        <STRONG>o</STRONG>   Since release 4.0 (1996), ncurses maintains a list of  windows  for
-           each  screen,  to ensure that a window has no subwindows before al-
-           lowing deletion.
+           each  screen,  to  ensure  that  a  window has no subwindows before
+           allowing deletion.
 
        <STRONG>o</STRONG>   NetBSD copied this feature of ncurses in 2003.
            PDCurses follows the scheme used in Solaris X/Open curses.
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_window 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index a489ca81c..30b88479c 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.38 2023/08/19 19:48:15 tom Exp @
+  * @Id: default_colors.3x,v 1.41 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2023-08-19 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-08-19                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 28a693565..1afcc721c 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: define_key.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">define_key 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>define_key</STRONG> - define a keycode
+       <STRONG>define_key</STRONG> - define a <EM>curses</EM> keycode
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index f69d0052f..d2c768b0c 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.43 2023/08/19 20:38:32 tom Exp @
+  * @Id: form.3x,v 1.45 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -248,11 +248,11 @@ <H1 class="no-header">form 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-08-19                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index b3e8a835a..d1550dca6 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.21 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_cursor.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">form_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 0467ec604..112ebd986 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_data.3x,v 1.24 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">form_data 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index c33be12b2..7eed0c4b2 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.45 2023/08/19 20:38:39 tom Exp @
+  * @Id: form_driver.3x,v 1.47 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -280,7 +280,7 @@ <H1 class="no-header">form_driver 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 3120bb77b..7505971eb 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">form_field 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 5ea5cf686..e2f0ac290 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">form_field_attributes 3x 2023-07-01 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-07-01         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index ed9d832db..0d6812e7b 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.34 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-07-01 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2023-07-01             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index 6162b43f9..7ad137b6a 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.22 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_info.3x,v 1.24 2023/09/16 23:39:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">form_field_info 3x 2022-02-12 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2022-02-12               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 49a6d570c..746c5164f 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_just.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -101,7 +101,7 @@ <H1 class="no-header">form_field_just 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-07-01               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 092466134..68cc46e79 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.31 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_new.3x,v 1.33 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">form_field_new 3x 2023-07-01 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-07-01                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index f7464f9a8..017426b51 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.34 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_opts.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -170,7 +170,7 @@ <H1 class="no-header">form_field_opts 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-07-01               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 203354ab2..15d85c214 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.22 2023/09/16 23:39:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_field_userptr 3x 2022-02-12 ncurses 6.4 Library calls
 
 
 
-ncurses 6.4                       2022-02-12            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 64e780bdc..2c030660c 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.40 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_field_validation.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library ca
        Several field types are predefined by the form library.
 
 
-</PRE><H3><a name="h3-Predefined-types">Predefined types</a></H3><PRE>
+</PRE><H2><a name="h2-PREDEFINED-TYPES">PREDEFINED TYPES</a></H2><PRE>
        It is possible to set up new  programmer-defined  field  types.   Field
        types  are implemented via the <STRONG>FIELDTYPE</STRONG> data structure, which contains
        several pointers to functions.
@@ -102,100 +102,102 @@ <H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library ca
 
        The predefined types are as follows:
 
-       TYPE_ALNUM
-            Alphanumeric data.  Required parameter:
 
-            <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument, a minimum field width.
+</PRE><H3><a name="h3-TYPE_ALNUM">TYPE_ALNUM</a></H3><PRE>
+       Alphanumeric data.  Required parameter:
 
-       TYPE_ALPHA
-            Character data.  Required parameter:
+       <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument, a minimum field width.
 
-            <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument, a minimum field width.
 
-       TYPE_ENUM
-            Accept one of a specified set of strings.  Required parameters:
+</PRE><H3><a name="h3-TYPE_ALPHA">TYPE_ALPHA</a></H3><PRE>
+       Character data.  Required parameter:
 
-            <STRONG>o</STRONG>   a third <STRONG>(char</STRONG> <STRONG>**)</STRONG> argument pointing to a string list;
+       <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument, a minimum field width.
 
-            <STRONG>o</STRONG>   a fourth <STRONG>int</STRONG> flag argument to enable case-sensitivity;
 
-            <STRONG>o</STRONG>   a  fifth  <STRONG>int</STRONG> flag argument specifying whether a partial match
-                must be a unique one.  If this flag is off, a  prefix  matches
-                the  first of any set of more than one list elements with that
-                prefix.
+</PRE><H3><a name="h3-TYPE_ENUM">TYPE_ENUM</a></H3><PRE>
+       Accept one of a specified set of strings.  Required parameters:
 
-            The library copies the string list, so you may  use  a  list  that
-            lives in automatic variables on the stack.
+       <STRONG>o</STRONG>   a third <STRONG>(char</STRONG> <STRONG>**)</STRONG> argument pointing to a string list;
 
-       TYPE_INTEGER
-            Integer  data,  parsable  to  an  integer  by  <STRONG>atoi(3)</STRONG>.   Required
-            parameters:
+       <STRONG>o</STRONG>   a fourth <STRONG>int</STRONG> flag argument to enable case-sensitivity;
 
-            <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument controlling the precision,
+       <STRONG>o</STRONG>   a  fifth  <STRONG>int</STRONG> flag argument specifying whether a partial match must
+           be a unique one.  If this flag is off, a prefix matches  the  first
+           of any set of more than one list elements with that prefix.
 
-            <STRONG>o</STRONG>   a fourth <STRONG>long</STRONG> argument constraining minimum value,
+       The library copies the string list, so you may use a list that lives in
+       automatic variables on the stack.
 
-            <STRONG>o</STRONG>   a fifth <STRONG>long</STRONG> constraining maximum value.  If the maximum value
-                is  less  than  or  equal  to  the minimum value, the range is
-                simply ignored.
 
-            On return, the field buffer is formatted according to  the  <STRONG>printf</STRONG>
-            format  specification  ".*ld",  where  the  "*" is replaced by the
-            precision argument.
+</PRE><H3><a name="h3-TYPE_INTEGER">TYPE_INTEGER</a></H3><PRE>
+       Integer data, parsable to an integer by <STRONG>atoi(3)</STRONG>.  Required parameters:
 
-            For details of the precision handling see <STRONG>printf(3)</STRONG>.
+       <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument controlling the precision,
 
-       TYPE_NUMERIC
-            Numeric  data  (may  have   a   decimal-point   part).    Required
-            parameters:
+       <STRONG>o</STRONG>   a fourth <STRONG>long</STRONG> argument constraining minimum value,
 
-            <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument controlling the precision,
+       <STRONG>o</STRONG>   a fifth <STRONG>long</STRONG> constraining maximum value.  If the maximum  value  is
+           less  than  or  equal  to  the  minimum  value, the range is simply
+           ignored.
 
-            <STRONG>o</STRONG>   a fourth <STRONG>double</STRONG> argument constraining minimum value,
+       On return, the field buffer is formatted according to the <STRONG>printf</STRONG> format
+       specification  ".*ld",  where  the  "*"  is  replaced  by the precision
+       argument.
 
-            <STRONG>o</STRONG>   and a fifth <STRONG>double</STRONG> constraining maximum value.  If your system
-                supports locales, the decimal point character must be the  one
-                specified  by  your locale.  If the maximum value is less than
-                or equal to the minimum value, the range is simply ignored.
+       For details of the precision handling see <STRONG>printf(3)</STRONG>.
 
-            On return, the field buffer is formatted according to  the  <STRONG>printf</STRONG>
-            format  specification  ".*f",  where  the  "*"  is replaced by the
-            precision argument.
 
-            For details of the precision handling see <STRONG>printf(3)</STRONG>.
+</PRE><H3><a name="h3-TYPE_NUMERIC">TYPE_NUMERIC</a></H3><PRE>
+       Numeric data (may have a decimal-point part).  Required parameters:
 
-       TYPE_REGEXP
-            Regular expression data.  Required parameter:
+       <STRONG>o</STRONG>   a third <STRONG>int</STRONG> argument controlling the precision,
 
-            <STRONG>o</STRONG>   a third argument, a regular expression <STRONG>(char</STRONG> <STRONG>*)</STRONG>  string.   The
-                data is valid if the regular expression matches it.
+       <STRONG>o</STRONG>   a fourth <STRONG>double</STRONG> argument constraining minimum value,
 
-            Regular expressions are in the format of <STRONG>regcomp</STRONG> and <STRONG>regexec</STRONG>.
+       <STRONG>o</STRONG>   and a fifth <STRONG>double</STRONG> constraining  maximum  value.   If  your  system
+           supports  locales,  the  decimal  point  character  must be the one
+           specified by your locale.  If the maximum value  is  less  than  or
+           equal to the minimum value, the range is simply ignored.
 
-            The  regular  expression  must match the whole field.  If you have
-            for example, an eight character wide field, a  regular  expression
-            "^[0-9]*$"  always means that you have to fill all eight positions
-            with digits.  If you want to allow fewer digits, you may  use  for
-            example  "^[0-9]*  *$" which is good for trailing spaces (up to an
-            empty field), or "^ *[0-9]* *$" which  is  good  for  leading  and
-            trailing spaces around the digits.
+       On return, the field buffer is formatted according to the <STRONG>printf</STRONG> format
+       specification ".*f",  where  the  "*"  is  replaced  by  the  precision
+       argument.
 
-       TYPE_IPV4
-            An Internet Protocol Version 4 address.  Required parameter:
+       For details of the precision handling see <STRONG>printf(3)</STRONG>.
 
-            <STRONG>o</STRONG>   none
 
-            The  form  library  checks  whether or not the buffer has the form
-            <EM>a.b.c.d</EM>, where <EM>a</EM>, <EM>b</EM>, <EM>c</EM>, and <EM>d</EM> are numbers in the range 0  to  255.
-            Trailing  blanks in the buffer are ignored.  The address itself is
-            not validated.
+</PRE><H3><a name="h3-TYPE_REGEXP">TYPE_REGEXP</a></H3><PRE>
+       Regular expression data.  Required parameter:
 
-            This is an ncurses extension; this field type may not be available
-            in other curses implementations.
+       <STRONG>o</STRONG>   a  third  argument, a regular expression <STRONG>(char</STRONG> <STRONG>*)</STRONG> string.  The data
+           is valid if the regular expression matches it.
+
+       Regular expressions are in the format of <STRONG>regcomp</STRONG> and <STRONG>regexec</STRONG>.
+
+       The regular expression must match the whole field.   If  you  have  for
+       example, an eight character wide field, a regular expression "^[0-9]*$"
+       always means that you have to fill all eight positions with digits.  If
+       you  want  to  allow fewer digits, you may use for example "^[0-9]* *$"
+       which is good for trailing spaces (up to an empty field), or "^ *[0-9]*
+       *$" which is good for leading and trailing spaces around the digits.
+
+
+</PRE><H3><a name="h3-TYPE_IPV4">TYPE_IPV4</a></H3><PRE>
+       An Internet Protocol Version 4 address.  Required parameter:
+
+       <STRONG>o</STRONG>   none
+
+       The form library checks whether or not the buffer has the form <EM>a.b.c.d</EM>,
+       where <EM>a</EM>, <EM>b</EM>, <EM>c</EM>, and <EM>d</EM> are numbers in  the  range  0  to  255.   Trailing
+       blanks in the buffer are ignored.  The address itself is not validated.
+
+       This  is  an ncurses extension; this field type may not be available in
+       other curses implementations.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  functions  <STRONG>field_type</STRONG>  and  <STRONG>field_arg</STRONG>  return  <STRONG>NULL</STRONG> on error.  The
+       The functions <STRONG>field_type</STRONG> and  <STRONG>field_arg</STRONG>  return  <STRONG>NULL</STRONG>  on  error.   The
        function <STRONG>set_field_type</STRONG> returns one of the following:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -214,7 +216,7 @@ <H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library ca
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -224,7 +226,7 @@ <H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-07-01         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -235,7 +237,17 @@ <H1 class="no-header">form_field_validation 3x 2023-07-01 ncurses 6.4 Library ca
 <li><a href="#h3-field_arg">field_arg</a></li>
 <li><a href="#h3-field_type">field_type</a></li>
 <li><a href="#h3-set_field_type">set_field_type</a></li>
-<li><a href="#h3-Predefined-types">Predefined types</a></li>
+</ul>
+</li>
+<li><a href="#h2-PREDEFINED-TYPES">PREDEFINED TYPES</a>
+<ul>
+<li><a href="#h3-TYPE_ALNUM">TYPE_ALNUM</a></li>
+<li><a href="#h3-TYPE_ALPHA">TYPE_ALPHA</a></li>
+<li><a href="#h3-TYPE_ENUM">TYPE_ENUM</a></li>
+<li><a href="#h3-TYPE_INTEGER">TYPE_INTEGER</a></li>
+<li><a href="#h3-TYPE_NUMERIC">TYPE_NUMERIC</a></li>
+<li><a href="#h3-TYPE_REGEXP">TYPE_REGEXP</a></li>
+<li><a href="#h3-TYPE_IPV4">TYPE_IPV4</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 5283667d8..81dd86862 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.35 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -189,7 +189,7 @@ <H1 class="no-header">form_fieldtype 3x 2023-07-01 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-07-01                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 85f7a3666..02ad2a130 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_hook.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -72,23 +72,45 @@ <H1 class="no-header">form_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
        various points in the automatic processing  of  input  event  codes  by
        <STRONG>form_driver</STRONG>.
 
-       The  function <STRONG>set_field_init</STRONG> sets a hook to be called at form-post time
-       and  each  time  the  selected  field  changes  (after   the   change).
-       <STRONG>field_init</STRONG>  returns  the current field init hook, if any (<STRONG>NULL</STRONG> if there
-       is no such hook).
 
-       The function <STRONG>set_field_term</STRONG> sets a hook to  be  called  at  form-unpost
-       time  and  each  time  the  selected field changes (before the change).
-       <STRONG>field_term</STRONG> returns the current field term hook, if any (<STRONG>NULL</STRONG>  if  there
-       is no such hook).
+</PRE><H3><a name="h3-set_field_init">set_field_init</a></H3><PRE>
+       sets  a  hook to be called at form-post time and each time the selected
+       field changes (after the change).
 
-       The  function  <STRONG>set_form_init</STRONG> sets a hook to be called at form-post time
-       and just after a page change once it is posted.  <STRONG>form_init</STRONG> returns  the
-       current form init hook, if any (<STRONG>NULL</STRONG> if there is no such hook).
 
-       The function <STRONG>set_form_term</STRONG> sets a hook to be called at form-unpost time
-       and just before a page change once it is posted.  <STRONG>form_init</STRONG> returns the
-       current form term hook, if any (<STRONG>NULL</STRONG> if there is no such hook).
+</PRE><H3><a name="h3-field_init">field_init</a></H3><PRE>
+       returns the current field init hook, if any (<STRONG>NULL</STRONG> if there is  no  such
+       hook).
+
+
+</PRE><H3><a name="h3-set_field_term">set_field_term</a></H3><PRE>
+       sets a hook to be called at form-unpost time and each time the selected
+       field changes (before the change).
+
+
+</PRE><H3><a name="h3-field_term">field_term</a></H3><PRE>
+       returns the current field term hook, if any (<STRONG>NULL</STRONG> if there is  no  such
+       hook).
+
+
+</PRE><H3><a name="h3-set_form_init">set_form_init</a></H3><PRE>
+       sets a hook to be called at form-post time and just after a page change
+       once it is posted.
+
+
+</PRE><H3><a name="h3-form_init">form_init</a></H3><PRE>
+       returns the current form init hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
+       hook).
+
+
+</PRE><H3><a name="h3-set_form_term">set_form_term</a></H3><PRE>
+       sets  a  hook  to  be called at form-unpost time and just before a page
+       change once it is posted.
+
+
+</PRE><H3><a name="h3-form_init">form_init</a></H3><PRE>
+       returns the current form term hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
+       hook).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -121,13 +143,24 @@ <H1 class="no-header">form_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
+<ul>
+<li><a href="#h3-set_field_init">set_field_init</a></li>
+<li><a href="#h3-field_init">field_init</a></li>
+<li><a href="#h3-set_field_term">set_field_term</a></li>
+<li><a href="#h3-field_term">field_term</a></li>
+<li><a href="#h3-set_form_init">set_form_init</a></li>
+<li><a href="#h3-form_init">form_init</a></li>
+<li><a href="#h3-set_form_term">set_form_term</a></li>
+<li><a href="#h3-form_init">form_init</a></li>
+</ul>
+</li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 02fd96162..3ee01b6eb 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_new.3x,v 1.24 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">form_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 3f3ccbeea..612ad960f 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_new_page.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">form_new_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index c369c1277..add4dee1f 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_opts.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 4d465e0d6..da7ef4502 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_page.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -126,7 +126,7 @@ <H1 class="no-header">form_page 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 694b108ad..5a531caf0 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_post.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -115,7 +115,7 @@ <H1 class="no-header">form_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 6a897069e..ccd835aba 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_requestname.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -60,16 +60,10 @@ <H1 class="no-header">form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-
-</PRE><H3><a name="h3-form_request_name">form_request_name</a></H3><PRE>
        The function <STRONG>form_request_name</STRONG> returns the printable  name  of  a  form
-       request code.
-
-
-</PRE><H3><a name="h3-form_request_name_by_name">form_request_name_by_name</a></H3><PRE>
-       The  function  <STRONG>form_request_by_name</STRONG>  searches  in  the name-table for a
-       request with the given name and returns its  request  code.   Otherwise
-       E_NO_MATCH is returned.
+       request  code.  The function <STRONG>form_request_by_name</STRONG> searches in the name-
+       table for a request with the given name and returns its  request  code.
+       Otherwise E_NO_MATCH is returned.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -101,18 +95,13 @@ <H1 class="no-header">form_requestname 3x 2023-07-01 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-07-01              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
-<ul>
-<li><a href="#h3-form_request_name">form_request_name</a></li>
-<li><a href="#h3-form_request_name_by_name">form_request_name_by_name</a></li>
-</ul>
-</li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 35dc1192f..9bcc0c275 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_userptr.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index 5a8e585b0..caf1fdce8 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020,2021 Thomas E. Dickey                                     *
+  * Copyright 2020-2021,2023 Thomas E. Dickey                                *
   * Copyright 2010-2013,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_variables.3x,v 1.10 2021/12/25 21:50:36 tom Exp @
+  * @Id: form_variables.3x,v 1.12 2023/09/16 23:39:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x 2021-12-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_variables 3x 2021-12-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2021-12-25                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index c2b0b040c..bae77038c 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: form_win.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">form_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 2abfabee6..60622bdf1 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp @
+  * @Id: infocmp.1m,v 1.92 2023/09/16 23:37:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-09-09 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -522,7 +522,7 @@ <H1 class="no-header">infocmp 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-09                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-09-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 4b794ec23..32130894e 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.21 2022/02/12 20:02:20 tom Exp @
+  * @Id: infotocap.1m,v 1.26 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2022-02-12 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -100,7 +100,7 @@ <H1 class="no-header">infotocap 1m 2022-02-12 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2022-02-12                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index f09018c56..a2f601a09 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.14 2022/02/12 20:03:40 tom Exp @
+  * @Id: key_defined.3x,v 1.20 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">key_defined 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>key_defined</STRONG> - check if a keycode is defined
+       <STRONG>key_defined</STRONG> - test whether a <EM>curses</EM> keycode is defined
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -69,9 +69,9 @@ <H1 class="no-header">key_defined 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       This routine is specific to ncurses.  It was not supported  on  Version
+       7,  BSD  or  System V implementations.  It is recommended that any code
+       depending on them be conditioned using NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 2f6d6584f..5d0bdb348 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.15 2022/02/12 20:03:40 tom Exp @
+  * @Id: keybound.3x,v 1.21 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">keybound 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>keybound</STRONG> - return definition of keycode
+       <STRONG>keybound</STRONG> - get definition of <EM>curses</EM> keycode
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -72,9 +72,9 @@ <H1 class="no-header">keybound 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       This  routine  is specific to ncurses.  It was not supported on Version
+       7, BSD or System V implementations.  It is recommended  that  any  code
+       depending on them be conditioned using NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index df0e4f231..dce2a0a0f 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.20 2022/02/12 20:03:40 tom Exp @
+  * @Id: keyok.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">keyok 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>keyok</STRONG> - enable or disable a keycode
+       <STRONG>keyok</STRONG> - enable or disable a <EM>curses</EM> keycode
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -71,9 +71,9 @@ <H1 class="no-header">keyok 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       This routine is specific to ncurses.  It was not supported  on  Version
+       7,  BSD  or  System V implementations.  It is recommended that any code
+       depending on them be conditioned using NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index 8b019b8e4..433c53a6a 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
   * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.12 2022/02/12 20:07:56 tom Exp @
+  * @Id: legacy_coding.3x,v 1.17 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>use_legacy_coding</STRONG> - override locale-encoding checks
+       <STRONG>use_legacy_coding</STRONG> - override <EM>curses</EM> locale encoding checks
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2022-02-12 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2022-02-12                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 6022f6ccd..e2eaadc6f 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.34 2023/08/19 20:39:40 tom Exp @
+  * @Id: menu.3x,v 1.36 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -223,11 +223,11 @@ <H1 class="no-header">menu 3x 2023-08-19 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-08-19                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 7361da6f2..67e11b041 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_attributes.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -122,7 +122,7 @@ <H1 class="no-header">menu_attributes 3x 2023-07-01 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-07-01               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index fa0f7f871..7fbc6368d 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.20 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_cursor.3x,v 1.22 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">menu_cursor 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index bb18751d4..9331ee283 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.35 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_driver.3x,v 1.37 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -228,7 +228,7 @@ <H1 class="no-header">menu_driver 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index ce74e39f0..5d3588597 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_format.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">menu_format 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index de38b3e6f..435cac1f6 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_hook.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -123,7 +123,7 @@ <H1 class="no-header">menu_hook 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 875a18a99..b7f020ea5 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_items.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_items 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 23f07cf7c..8587aaeaa 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_mark.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_mark 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index 2a2c9df87..434a29fc2 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_new.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">menu_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index f0a06a251..44db0f0b7 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_opts.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -134,7 +134,7 @@ <H1 class="no-header">menu_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 389a4b4d4..6c278fa88 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.28 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_pattern.3x,v 1.30 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_pattern 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index 1ff1d35eb..4905084de 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_post.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_post 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 91bc208f8..20b1e93a2 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_requestname.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_requestname 3x 2023-07-01 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-07-01              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 13dc2e8ab..e55b60f40 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_spacing.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_spacing 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index 996adb1f6..bdb5db216 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_userptr.3x,v 1.25 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">menu_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 7a661c28c..76d98426b 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: menu_win.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">menu_win 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 05ac7266f..2b24b9544 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.27 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_current.3x,v 1.29 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">mitem_current 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index de34e9a7f..2230a55c4 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.21 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_name.3x,v 1.23 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_name 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 6b1605c33..78df15f4c 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.26 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_new.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">mitem_new 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 6149faa6d..51fde1c73 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.23 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_opts.3x,v 1.25 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">mitem_opts 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index b17ccbf2b..e2ac68800 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">mitem_userptr 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 3b967ab04..51e5503f7 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.22 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_value.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">mitem_value 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index c695443db..5ddd8bd96 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.17 2023/07/01 15:46:10 tom Exp @
+  * @Id: mitem_visible.3x,v 1.19 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_visible 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 9142cfa48..59e5689fb 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp @
+  * @Id: ncurses.3x,v 1.171 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-09-09 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">ncurses 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ncurses</STRONG> - CRT screen handling and optimization package
+       <STRONG>ncurses</STRONG> - character-cell terminal interface with optimized output
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1482,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-09                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 974aff840..6994763ef 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020,2021 Thomas E. Dickey                                     *
+  * Copyright 2020-2021,2023 Thomas E. Dickey                                *
   * Copyright 2010 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.7 2021/12/25 17:39:16 tom Exp @
+  * @Id: MKncu_config.in,v 1.12 2023/09/17 08:29:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</TITLE>
+<TITLE>ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>               User commands              <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       ncurses6-config - helper script for ncurses libraries
+       <STRONG>ncurses6-config</STRONG> - helper script for <EM>ncurses</EM> libraries
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -113,11 +113,11 @@ <H1 class="no-header">ncurses6-config 1 2021-12-25 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2021-12-25                <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
+ncurses 6.4                       2023-09-17                <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index d55b3c7e7..b2c0d2095 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp @
+  * @Id: new_pair.3x,v 1.30 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -48,7 +48,8 @@ <H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>alloc_pair</STRONG>, <STRONG>find_pair</STRONG>, <STRONG>free_pair</STRONG> - new curses color-pair functions
+       <STRONG>alloc_pair</STRONG>,  <STRONG>find_pair</STRONG>,  <STRONG>free_pair</STRONG>  - dynamically allocate <EM>curses</EM> color
+       pairs
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -61,30 +62,30 @@ <H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These functions are an extension to the curses library.  They permit an
-       application  to  dynamically  allocate   a   color   pair   using   the
-       foreground/background  colors  rather  than  assign  a fixed color pair
+       application   to   dynamically   allocate   a   color  pair  using  the
+       foreground/background colors rather than  assign  a  fixed  color  pair
        number, and return an unused pair to the pool.
 
-       The number of colors may be related to the  number  of  possible  color
+       The  number  of  colors  may be related to the number of possible color
        pairs for a given terminal, or it may not:
 
-       <STRONG>o</STRONG>   While  almost  all  terminals  allow  setting  the color <EM>attributes</EM>
-           independently, it is unlikely that  your  terminal  allows  you  to
-           modify  the  attributes of a given character cell without rewriting
+       <STRONG>o</STRONG>   While almost all  terminals  allow  setting  the  color  <EM>attributes</EM>
+           independently,  it  is  unlikely  that  your terminal allows you to
+           modify the attributes of a given character cell  without  rewriting
            it.  That is, the foreground and background colors are applied as a
            pair.
 
-       <STRONG>o</STRONG>   Color  pairs  are  the  curses  library's  way  of managing a color
-           palette on a terminal.  If the library does not keep track  of  the
+       <STRONG>o</STRONG>   Color pairs are the  curses  library's  way  of  managing  a  color
+           palette  on  a terminal.  If the library does not keep track of the
            <EM>combinations</EM> of colors which are displayed, it will be inefficient.
 
-       <STRONG>o</STRONG>   For   simple  terminal  emulators  with  only  a  few  dozen  color
-           combinations, it  is  convenient  to  use  the  maximum  number  of
+       <STRONG>o</STRONG>   For  simple  terminal  emulators  with  only  a  few  dozen   color
+           combinations,  it  is  convenient  to  use  the  maximum  number of
            combinations as the limit on color pairs:
 
                <STRONG>COLORS</STRONG> <EM>*</EM> <STRONG>COLORS</STRONG>
 
-       <STRONG>o</STRONG>   Terminals  which support <EM>default</EM> <EM>colors</EM> distinct from "ANSI colors"
+       <STRONG>o</STRONG>   Terminals which support <EM>default</EM> <EM>colors</EM> distinct from "ANSI  colors"
            add to the possible combinations, producing this total:
 
                <EM>(</EM> <STRONG>COLORS</STRONG> <EM>+</EM> <EM>1</EM> <EM>)</EM> <EM>*</EM> <EM>(</EM> <STRONG>COLORS</STRONG> <EM>+</EM> <EM>1</EM> <EM>)</EM>
@@ -92,43 +93,43 @@ <H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   An application might use up to a few dozen color pairs to implement
            a predefined color scheme.
 
-           Beyond  that lies in the realm of programs using the foreground and
-           background colors  for  "ASCII  art"  (or  some  other  non-textual
+           Beyond that lies in the realm of programs using the foreground  and
+           background  colors  for  "ASCII  art"  (or  some  other non-textual
            application).
 
            Also beyond those few dozen pairs, the required size for a table to
-           represent the combinations grows rapidly with an increasing  number
+           represent  the combinations grows rapidly with an increasing number
            of colors.
 
-           These  functions allow a developer to let the screen library manage
+           These functions allow a developer to let the screen library  manage
            color pairs.
 
 
 </PRE><H3><a name="h3-alloc_pair">alloc_pair</a></H3><PRE>
-       The  <STRONG>alloc_pair</STRONG>  function  accepts  parameters   for   foreground   and
-       background  color,  and  checks  if  that  color combination is already
+       The   <STRONG>alloc_pair</STRONG>   function   accepts  parameters  for  foreground  and
+       background color, and checks  if  that  color  combination  is  already
        associated with a color pair.
 
-       <STRONG>o</STRONG>   If the combination already exists, <STRONG>alloc_pair</STRONG> returns the  existing
+       <STRONG>o</STRONG>   If  the combination already exists, <STRONG>alloc_pair</STRONG> returns the existing
            pair.
 
        <STRONG>o</STRONG>   If the combination does not exist, <STRONG>alloc_pair</STRONG> allocates a new color
            pair and returns that.
 
-       <STRONG>o</STRONG>   If the table  fills  up,  <STRONG>alloc_pair</STRONG>  discards  the  least-recently
+       <STRONG>o</STRONG>   If  the  table  fills  up,  <STRONG>alloc_pair</STRONG>  discards the least-recently
            allocated entry using <STRONG>free_pair</STRONG> and allocates a new color pair.
 
-       All  of  the  color  pairs are allocated from a table of possible color
-       pairs.  The size of the table  is  determined  by  the  terminfo  <STRONG>pairs</STRONG>
-       capability.   The  table  is  shared with <STRONG>init_pair</STRONG>; in fact <STRONG>alloc_pair</STRONG>
-       calls <STRONG>init_pair</STRONG> after updating the ncurses library's fast index to  the
+       All of the color pairs are allocated from a  table  of  possible  color
+       pairs.   The  size  of  the  table  is determined by the terminfo <STRONG>pairs</STRONG>
+       capability.  The table is shared with  <STRONG>init_pair</STRONG>;  in  fact  <STRONG>alloc_pair</STRONG>
+       calls  <STRONG>init_pair</STRONG> after updating the ncurses library's fast index to the
        colors versus color pairs.
 
 
 </PRE><H3><a name="h3-find_pair">find_pair</a></H3><PRE>
        The <STRONG>find_pair</STRONG> function accepts parameters for foreground and background
-       color, and checks if that color combination is already associated  with
-       a  color  pair,  returning  the  pair  number if it has been allocated.
+       color,  and checks if that color combination is already associated with
+       a color pair, returning the pair  number  if  it  has  been  allocated.
        Otherwise it returns -1.
 
 
@@ -137,20 +138,20 @@ <H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <STRONG>alloc_pair</STRONG> function returns a color pair  number  in  the  range  1
-       through  <STRONG>COLOR_PAIRS</STRONG>-1, unless it encounters an error updating its fast
-       index to the color pair values, preventing it from allocating  a  color
+       The  <STRONG>alloc_pair</STRONG>  function  returns  a  color pair number in the range 1
+       through <STRONG>COLOR_PAIRS</STRONG>-1, unless it encounters an error updating its  fast
+       index  to  the color pair values, preventing it from allocating a color
        pair.  In that case, it returns -1.
 
-       The  <STRONG>find_pair</STRONG>  function returns a color pair number if the given color
+       The <STRONG>find_pair</STRONG> function returns a color pair number if the  given  color
        combination has been associated with a color pair, or -1 if not.
 
-       Likewise, <STRONG>free_pair</STRONG> returns <STRONG>OK</STRONG> unless it encounters an  error  updating
+       Likewise,  <STRONG>free_pair</STRONG>  returns <STRONG>OK</STRONG> unless it encounters an error updating
        the fast index or if no such color pair is in use.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -164,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-09-09 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-09                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 972eff351..8b8c6d829 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.48 2023/08/19 21:01:21 tom Exp @
+  * @Id: panel.3x,v 1.50 2023/09/16 23:38:39 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-08-19 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -295,7 +295,7 @@ <H1 class="no-header">panel 3x 2023-08-19 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-08-19                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 638d50456..5c3979cda 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.36 2023/07/01 15:46:10 tom Exp @
+  * @Id: resizeterm.3x,v 1.40 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>is_term_resized</STRONG>,  <STRONG>resize_term</STRONG>,  <STRONG>resizeterm</STRONG> - change the curses terminal
-       size
+       <STRONG>is_term_resized</STRONG>,   <STRONG>resize_term</STRONG>,   <STRONG>resizeterm</STRONG>   -  manage  the  terminal
+       dimensions understood by <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index f090e2781..97181eebc 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp @
+  * @Id: scr_dump.5,v 1.31 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-09-09 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-09-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-09-09 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">scr_dump 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       scr_dump - format of curses screen-dumps.
+       scr_dump - <EM>curses</EM> screen dump
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-09                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-09-16                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index cf8d9ab5b..563da4db1 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp @
+  * @Id: tabs.1,v 1.44 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-09-09 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-09-09 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">tabs 1 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tabs</STRONG> - set tabs on a terminal
+       <STRONG>tabs</STRONG> - set terminal tab stops
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -252,11 +252,11 @@ <H1 class="no-header">tabs 1 2023-09-09 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-09-09                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 356b849fb..a87b1513c 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp @
+  * @Id: term.5,v 1.56 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-09-09 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-09-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-09-09 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-09-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">term 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       term - format of compiled term file.
+       term - compiled <EM>terminfo</EM> terminal description
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -378,7 +378,7 @@ <H1 class="no-header">term 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-09                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 7e7980c5b..3aae1fca8 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,19 +27,20 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.35 2023/07/01 15:46:10 tom Exp @
+  * @Id: term.7,v 1.36 2023/09/17 00:10:28 tom Exp @
+  *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-07-01 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-09-16 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-07-01 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-09-16 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -216,7 +217,7 @@ <H1 class="no-header">term 7 2023-07-01 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index f5acf53b5..0aeb5d8a9 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp @
+  * @Id: term_variables.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-09-09 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -47,9 +47,9 @@ <H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>SP</STRONG>, <STRONG>acs_map</STRONG>, <STRONG>boolcodes</STRONG>, <STRONG>boolfnames</STRONG>, <STRONG>boolnames</STRONG>, <STRONG>cur_term</STRONG>, <STRONG>numcodes</STRONG>,
-       <STRONG>numfnames</STRONG>, <STRONG>numnames</STRONG>, <STRONG>strcodes</STRONG>, <STRONG>strfnames</STRONG>, <STRONG>strnames</STRONG>, <STRONG>ttytype</STRONG> - <STRONG>curses</STRONG>
-       terminfo global variables
+       <STRONG>SP</STRONG>,  <STRONG>acs_map</STRONG>,  <STRONG>boolcodes</STRONG>,  <STRONG>boolfnames</STRONG>,  <STRONG>boolnames</STRONG>,  <STRONG>cur_term</STRONG>, <STRONG>numcodes</STRONG>,
+       <STRONG>numfnames</STRONG>, <STRONG>numnames</STRONG>, <STRONG>strcodes</STRONG>, <STRONG>strfnames</STRONG>, <STRONG>strnames</STRONG>, <STRONG>ttytype</STRONG> -  <EM>terminfo</EM>
+       global variables
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -83,9 +83,9 @@ <H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1
        <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> manual page.
 
        Depending  on  the  configuration,  these  may  be actual variables, or
-       macros (see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>) which provide read-only access  to  <EM>curs-</EM>
-       <EM>es</EM>'s state.  In either case, applications should treat them as read-on-
-       ly to avoid confusing the library.
+       macros  (see  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>)  which  provide  read-only  access   to
+       <EM>curses</EM>'s  state.   In  either  case,  applications should treat them as
+       read-only to avoid confusing the library.
 
 
 </PRE><H3><a name="h3-Alternate-Character-Set-Mapping">Alternate Character Set Mapping</a></H3><PRE>
@@ -97,43 +97,43 @@ <H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1
        Application  developers  need  only know that it is used for the "ACS_"
        constants in &lt;curses.h&gt;.
 
-       The comparable data for the wide-character library is a  private  vari-
-       able.
+       The comparable  data  for  the  wide-character  library  is  a  private
+       variable.
 
 
 </PRE><H3><a name="h3-Current-Terminal-Data">Current Terminal Data</a></H3><PRE>
-       After initializing the curses or terminfo interfaces, the <STRONG>cur_term</STRONG> con-
-       tains data describing the current terminal.  This variable is also  set
-       as a side-effect of <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG> and <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG>.
+       After  initializing  the  curses  or  terminfo interfaces, the <STRONG>cur_term</STRONG>
+       contains data describing the current terminal.  This variable  is  also
+       set as a side-effect of <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG> and <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG>.
 
-       It  is possible to save a value of <STRONG>cur_term</STRONG> for subsequent use as a pa-
-       rameter to <STRONG>set_term</STRONG>, for switching between screens.  Alternatively, one
-       can  save  the  return  value from <STRONG>newterm</STRONG> or <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to reuse in
+       It  is  possible  to  save  a value of <STRONG>cur_term</STRONG> for subsequent use as a
+       parameter to <STRONG>set_term</STRONG>, for switching between  screens.   Alternatively,
+       one can save the return value from <STRONG>newterm</STRONG> or <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to reuse in
        <STRONG>set_term</STRONG>.
 
 
 </PRE><H3><a name="h3-Terminfo-Lookup-Tables">Terminfo Lookup Tables</a></H3><PRE>
        The <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> and <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG> 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  applica-
-       tions,  although the hash-tables used by the terminfo and termcap func-
-       tions are not available.
+       names  for  termcap  capabilities.   These  are  available   to   other
+       applications, although the hash-tables used by the terminfo and termcap
+       functions are not available.
 
        The long terminfo capability names use a  "f"  (eff)  in  their  names:
        <STRONG>boolfnames</STRONG>, <STRONG>numfnames</STRONG>, and <STRONG>strfnames</STRONG>.
 
-       These  are  the  short names for terminfo capabilities: <STRONG>boolnames</STRONG>, <STRONG>num-</STRONG>
-       <STRONG>names</STRONG>, and <STRONG>strnames</STRONG>.
+       These  are  the  short  names  for  terminfo  capabilities:  <STRONG>boolnames</STRONG>,
+       <STRONG>numnames</STRONG>, and <STRONG>strnames</STRONG>.
 
-       These are the corresponding names used for termcap descriptions:  <STRONG>bool-</STRONG>
-       <STRONG>codes</STRONG>, <STRONG>numcodes</STRONG>, and <STRONG>strcodes</STRONG>.
+       These are  the  corresponding  names  used  for  termcap  descriptions:
+       <STRONG>boolcodes</STRONG>, <STRONG>numcodes</STRONG>, and <STRONG>strcodes</STRONG>.
 
 
 </PRE><H3><a name="h3-Terminal-Type">Terminal Type</a></H3><PRE>
        A terminal description begins with one or more terminal names separated
        by "|" (vertical bars).  On initialization of the  curses  or  terminfo
-       interfaces,  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  copies the terminal names to the array <STRONG>tty-</STRONG>
-       <STRONG>type</STRONG>.
+       interfaces,  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  copies  the  terminal  names  to  the array
+       <STRONG>ttytype</STRONG>.
 
 
 </PRE><H3><a name="h3-Terminfo-Names">Terminfo Names</a></H3><PRE>
@@ -143,8 +143,8 @@ <H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1
 
        #define CUR ((TERMTYPE *)(cur_term))-&gt;
 
-       These symbols provide a faster method of accessing  terminfo  capabili-
-       ties than using <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, etc.
+       These  symbols  provide  a  faster   method   of   accessing   terminfo
+       capabilities than using <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, etc.
 
        The  actual definition of <STRONG>CUR</STRONG> depends upon the implementation, but each
        terminfo library provides these long names defined to  point  into  the
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-09-09 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-09                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 1d21b3f55..0578da6ea 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp @
+  * @Id: terminfo.head,v 1.51 2023/09/17 08:29:38 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp @
+  * @Id: terminfo.tail,v 1.131 2023/09/16 17:01:55 Branden.Robinson Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-09-09 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-09-17 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       terminfo - terminal capability database
+       <STRONG>terminfo</STRONG> - terminal capability database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -2680,19 +2680,19 @@ <H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
        /usr/share/terminfo/?/*  files containing terminal descriptions
 
 
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
+       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on <EM>pcurses</EM>
+       by Pavel Curtis.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on <EM>pcurses</EM>
-       by Pavel Curtis.
-
 
-
-ncurses 6.4                       2023-09-09                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-09-17                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -2731,8 +2731,8 @@ <H1 class="no-header">terminfo 5 2023-09-09 ncurses 6.4 File formats</H1>
 </li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 433621cc5..54ad85bba 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.89 2023/09/02 22:29:35 tom Exp @
+  * @Id: tic.1m,v 1.93 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-09-02 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tic</STRONG> - the <EM>terminfo</EM> entry-description compiler
+       <STRONG>tic</STRONG> - compile terminal descriptions for <EM>terminfo</EM> or <EM>termcap</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -475,7 +475,7 @@ <H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -484,7 +484,7 @@ <H1 class="no-header">tic 1m 2023-09-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-02                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 272fecd2f..6a334303c 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp @
+  * @Id: toe.1m,v 1.46 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-09-09 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-09-09 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">toe 1m 2023-09-09 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>toe</STRONG> - table of (terminfo) entries
+       <STRONG>toe</STRONG> - list table of entries of <EM>terminfo</EM> terminal types
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -171,11 +171,11 @@ <H1 class="no-header">toe 1m 2023-09-09 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-09-09                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 2fcbfb04f..42064ad59 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.79 2023/07/01 15:46:10 tom Exp @
+  * @Id: tput.1,v 1.83 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tput</STRONG>, <STRONG>reset</STRONG> - initialize a terminal or query terminfo database
+       <STRONG>tput</STRONG>, <STRONG>reset</STRONG> - initialize a terminal or query <EM>terminfo</EM> database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -545,11 +545,11 @@ <H1 class="no-header">tput 1 2023-07-01 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 138286c77..4b07fc2df 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.66 2023/07/01 15:21:06 tom Exp @
+  * @Id: tset.1,v 1.69 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-07-01 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-09-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-09-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tset</STRONG>, <STRONG>reset</STRONG> - terminal initialization
+       <STRONG>tset</STRONG>, <STRONG>reset</STRONG> - initialize or reset terminal state
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -392,11 +392,11 @@ <H1 class="no-header">tset 1 2023-07-01 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230909).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
 
 
 
-ncurses 6.4                       2023-07-01                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 1ef433212..061b203e8 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp @
+  * @Id: user_caps.5,v 1.36 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-09-09 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-09-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-09-09 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">user_caps 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       user_caps - user-defined terminfo capabilities
+       user_caps - user-defined <EM>terminfo</EM> capability format
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -394,7 +394,7 @@ <H1 class="no-header">user_caps 5 2023-09-09 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-09                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-09-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index de98a56d5..5c332ce7f 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: wresize.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2023-07-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2023-07-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">wresize 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>wresize</STRONG> - resize a curses window
+       <STRONG>wresize</STRONG> - resize a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2023-07-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-07-01                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2023-09-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index f1a956a70..ba30b57b2 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,16 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.18 2023/09/09 23:32:29 tom Exp $
+.\" $Id: MKada_config.in,v 1.22 2023/09/17 08:29:17 tom Exp $
+.TH ADACURSES 1 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.TH ADACURSES 1 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie n .ds CW R
 .el   \{
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
 .SH NAME
-adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
+\fB\%adacurses@USE_CFG_SUFFIX@\-config\fP \-
+helper script for @ADA_LIBNAME@ libraries
 .SH SYNOPSIS
 .B \*C
 [\fIoptions\fP]
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 110bd8b1a..a93724531 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+.\" Copyright 2020-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2010 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.7 2021/12/25 17:39:16 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2021-12-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.12 2023/09/17 08:29:56 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
-@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \- helper script for ncurses libraries
+\fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
+helper script for \fIncurses\fR libraries
 .SH SYNOPSIS
 .B @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
 [\fIoptions\fP]
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 55b43f321..65f191f0e 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,14 +28,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-09-09 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.44 2023/09/16 23:39:05 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-09-16 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-\fB@CAPTOINFO@\fP \- convert a \fItermcap\fP description into a \fIterminfo\fP description
+\fB\%@CAPTOINFO@\fP \-
+convert a \fItermcap\fR description into a \fIterminfo\fR description
 .SH SYNOPSIS
-\fB@CAPTOINFO@\fR [\fB\-v\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
+.B @CAPTOINFO@
+.RI [ tic-option ]
+.I file
+\&.\|.\|.
+.P
+\fB@CAPTOINFO@\fR \fB\-V\fR
 .SH DESCRIPTION
 \fB@CAPTOINFO@\fP looks in each given text
 \fIfile\fP for \fBtermcap\fP descriptions.
@@ -52,21 +58,18 @@ the terminal whose name is specified in the environment variable \fBTERM\fP is
 extracted from that file.
 If the environment variable \fBTERMCAP\fP is not
 set, then the file \fB\*d\fP is read.
-.TP 5
-\fB\-v\fP
-print out tracing information on standard error as the program runs.
-.TP 5
-\fB\-V\fP
-print out the version of the program in use on standard error and exit.
-.TP 5
-\fB\-1\fP
-cause the fields to print out one to a line.
-Otherwise, the fields
-will be printed several to a line to a maximum width of 60
-characters.
-.TP 5
-\fB\-w\fP
-change the output to \fIwidth\fP characters.
+.PP
+This utility is implemented as a link to \fB@TIC@\fP(1M),
+with the latter's
+.B \-I
+option implied.
+You can use other \fB@TIC@\fP options such as
+.BR \-1 ,
+.BR \-f ,
+.BR \-v ,
+.BR \-w ,
+and
+.BR \-x .
 .SH FILES
 .TP 20
 \*d
@@ -181,9 +184,6 @@ Hewlett-Packard's terminfo library supports two nonstandard terminfo
 capabilities \fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
 These will be discarded with a warning message.
 .SH NOTES
-This utility is actually a link to \fB@TIC@\fP(1M), running in \fI\-I\fP mode.
-You can use other \fB@TIC@\fP options such as \fB\-f\fP and  \fB\-x\fP.
-.PP
 The verbose option is not identical to SVr4's.
 Under SVr4, instead of following
 the \fB\-v\fP with a trace level n, you repeat it n times.
diff --git a/man/clear.1 b/man/clear.1
index 3498dc7df..7b620fe80 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp $
-.TH @CLEAR@ 1 2023-09-09 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.38 2023/09/16 23:39:05 tom Exp $
+.TH @CLEAR@ 1 2023-09-16 "ncurses 6.4" "User commands"
 .ie n .ds CW R
 .el   \{
 .ie \n(.g .ds CW CR
@@ -60,7 +60,8 @@
 ..
 .ds n 5
 .SH NAME
-\fB@CLEAR@\fP \- clear the terminal screen
+\fB\%@CLEAR@\fP \-
+clear the terminal screen
 .SH SYNOPSIS
 \fB@CLEAR@\fR [\fB\-T\fItype\fR] [\fB\-V\fR] [\fB\-x\fR]
 .SH DESCRIPTION
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 43e392447..69c2ed0ba 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.39 2023/08/19 20:37:30 tom Exp $
-.TH curs_add_wch 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.43 2023/09/16 23:34:43 tom Exp $
+.TH curs_add_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,12 +39,13 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBadd_wch\fP,
-\fBwadd_wch\fP,
-\fBmvadd_wch\fP,
-\fBmvwadd_wch\fP,
-\fBecho_wchar\fP,
-\fBwecho_wchar\fP \- add a complex character and rendition to a \fBcurses\fP window, then advance the cursor
+\fB\%add_wch\fP,
+\fB\%wadd_wch\fP,
+\fB\%mvadd_wch\fP,
+\fB\%mvwadd_wch\fP,
+\fB\%echo_wchar\fP,
+\fB\%wecho_wchar\fP \-
+add a \fIcurses\fR complex character to a window and advance the cursor
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index fa58192ec..ac24b36d2 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.20 2022/02/12 20:07:29 tom Exp $
-.TH curs_add_wchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.25 2023/09/16 23:34:43 tom Exp $
+.TH curs_add_wchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBadd_wchstr\fP,
-\fBadd_wchnstr\fP,
-\fBwadd_wchstr\fP,
-\fBwadd_wchnstr\fP,
-\fBmvadd_wchstr\fP,
-\fBmvadd_wchnstr\fP,
-\fBmvwadd_wchstr\fP,
-\fBmvwadd_wchnstr\fP \- add an array of complex characters (and attributes) to a curses window
-.ad
-.hy
+\fB\%add_wchstr\fP,
+\fB\%add_wchnstr\fP,
+\fB\%wadd_wchstr\fP,
+\fB\%wadd_wchnstr\fP,
+\fB\%mvadd_wchstr\fP,
+\fB\%mvadd_wchnstr\fP,
+\fB\%mvwadd_wchstr\fP,
+\fB\%mvwadd_wchnstr\fP \-
+add a \fIcurses\fR complex character string to a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 92e73786a..7cfc3db9b 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.65 2023/08/19 19:45:54 tom Exp $
-.TH curs_addch 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.69 2023/09/16 23:34:43 tom Exp $
+.TH curs_addch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,12 +39,13 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBaddch\fP,
-\fBwaddch\fP,
-\fBmvaddch\fP,
-\fBmvwaddch\fP,
-\fBechochar\fP,
-\fBwechochar\fP \- add a character (with attributes) to a \fBcurses\fP window, then advance the cursor
+\fB\%addch\fP,
+\fB\%waddch\fP,
+\fB\%mvaddch\fP,
+\fB\%mvwaddch\fP,
+\fB\%echochar\fP,
+\fB\%wechochar\fP \-
+add a \fIcurses\fR character to a window and advance the cursor
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 906b54a36..fbf46367a 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp $
-.TH curs_addchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.31 2023/09/16 23:34:43 tom Exp $
+.TH curs_addchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBaddchstr\fP,
-\fBaddchnstr\fP,
-\fBwaddchstr\fP,
-\fBwaddchnstr\fP,
-\fBmvaddchstr\fP,
-\fBmvaddchnstr\fP,
-\fBmvwaddchstr\fP,
-\fBmvwaddchnstr\fP \- add a string of characters (and attributes) to a \fBcurses\fP window
-.ad
-.hy
+\fB\%addchstr\fP,
+\fB\%addchnstr\fP,
+\fB\%waddchstr\fP,
+\fB\%waddchnstr\fP,
+\fB\%mvaddchstr\fP,
+\fB\%mvaddchnstr\fP,
+\fB\%mvwaddchstr\fP,
+\fB\%mvwaddchnstr\fP \-
+add a \fIcurses\fR character string to a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 3eac89b6d..e7543bb9f 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.28 2023/03/11 20:40:52 tom Exp $
-.TH curs_addstr 3X 2023-03-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.32 2023/09/16 23:34:43 tom Exp $
+.TH curs_addstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBaddstr\fP,
-\fBaddnstr\fP,
-\fBwaddstr\fP,
-\fBwaddnstr\fP,
-\fBmvaddstr\fP,
-\fBmvaddnstr\fP,
-\fBmvwaddstr\fP,
-\fBmvwaddnstr\fP \- add a string of characters to a \fBcurses\fP window and advance cursor
-.ad
-.hy
+\fB\%addstr\fP,
+\fB\%addnstr\fP,
+\fB\%waddstr\fP,
+\fB\%waddnstr\fP,
+\fB\%mvaddstr\fP,
+\fB\%mvaddnstr\fP,
+\fB\%mvwaddstr\fP,
+\fB\%mvwaddnstr\fP \-
+add a string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 072b29bcd..a0a1b4230 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.20 2023/07/15 17:11:59 tom Exp $
-.TH curs_addwstr 3X 2023-07-15 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.24 2023/09/16 23:34:43 tom Exp $
+.TH curs_addwstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBaddwstr\fP,
-\fBaddnwstr\fP,
-\fBwaddwstr\fP,
-\fBwaddnwstr\fP,
-\fBmvaddwstr\fP,
-\fBmvaddnwstr\fP,
-\fBmvwaddwstr\fP,
-\fBmvwaddnwstr\fP \- add a string of wide characters to a \fBcurses\fP window and advance cursor
-.ad
-.hy
+\fB\%addwstr\fP,
+\fB\%addnwstr\fP,
+\fB\%waddwstr\fP,
+\fB\%waddnwstr\fP,
+\fB\%mvaddwstr\fP,
+\fB\%mvaddnwstr\fP,
+\fB\%mvwaddwstr\fP,
+\fB\%mvwaddnwstr\fP \-
+add a wide-character string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 0795102ec..133e751d4 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp $
-.TH curs_attr 3X 2023-09-09 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.84 2023/09/16 23:34:43 tom Exp $
+.TH curs_attr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -57,42 +57,33 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .\" ---------------------------------------------------------------------------
 .SH NAME
-.\" attr_get
-\fBattr_get\fP,
-\fBwattr_get\fP,
-\fBattr_set\fP,
-\fBwattr_set\fP,
-.\" .br
-\fBattr_off\fP,
-\fBwattr_off\fP,
-\fBattr_on\fP,
-\fBwattr_on\fP,
-.\" .br
-\fBattroff\fP,
-\fBwattroff\fP,
-\fBattron\fP,
-\fBwattron\fP,
-\fBattrset\fP,
-\fBwattrset\fP,
-.\" .br
-\fBchgat\fP,
-\fBwchgat\fP,
-\fBmvchgat\fP,
-\fBmvwchgat\fP,
-.\" .br
-\fBcolor_set\fP,
-\fBwcolor_set\fP,
-.\" .br
-\fBstandend\fP,
-\fBwstandend\fP,
-\fBstandout\fP,
-\fBwstandout\fP \- \fBcurses\fP character and window attribute control routines
-.ad
-.hy
+\fB\%attr_get\fP,
+\fB\%wattr_get\fP,
+\fB\%attr_set\fP,
+\fB\%wattr_set\fP,
+\fB\%attr_off\fP,
+\fB\%wattr_off\fP,
+\fB\%attr_on\fP,
+\fB\%wattr_on\fP,
+\fB\%attroff\fP,
+\fB\%wattroff\fP,
+\fB\%attron\fP,
+\fB\%wattron\fP,
+\fB\%attrset\fP,
+\fB\%wattrset\fP,
+\fB\%chgat\fP,
+\fB\%wchgat\fP,
+\fB\%mvchgat\fP,
+\fB\%mvwchgat\fP,
+\fB\%color_set\fP,
+\fB\%wcolor_set\fP,
+\fB\%standend\fP,
+\fB\%wstandend\fP,
+\fB\%standout\fP,
+\fB\%wstandout\fP \-
+manipulate attributes of character cells in \fIcurses\fR windows
 .\" ---------------------------------------------------------------------------
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index be18f910e..2f0a82910 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,10 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
-.TH curs_beep 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_beep.3x,v 1.22 2023/09/16 23:34:43 tom Exp $
+.TH curs_beep 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBbeep\fP, \fBflash\fP \- \fBcurses\fP bell and screen flash routines
+\fB\%beep\fP,
+\fB\%flash\fP \-
+ring the (visual) bell of the terminal with \fIcurses\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 927b009ea..b95ee2ab6 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,16 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.39 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.44 2023/09/16 23:34:43 tom Exp $
+.TH curs_bkgd 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgd 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBbkgdset\fP, \fBwbkgdset\fP,
-\fBbkgd\fP, \fBwbkgd\fP,
-\fBgetbkgd\fP \- \fBcurses\fP window background manipulation routines
+\fB\%bkgdset\fP,
+\fB\%wbkgdset\fP,
+\fB\%bkgd\fP,
+\fB\%wbkgd\fP,
+\fB\%getbkgd\fP \-
+manipulate background of a \fIcurses\fR window of characters
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 95f9b83b3..7a7894531 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,25 +27,26 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.21 2023/08/12 18:31:54 tom Exp $
+.\" $Id: curs_bkgrnd.3x,v 1.27 2023/09/16 23:34:43 tom Exp $
+.TH curs_bkgrnd 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_bkgrnd 3X 2023-08-12 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBbkgrnd\fP,
-\fBwbkgrnd\fP,
-\fBbkgrndset\fP,
-\fBwbkgrndset\fP,
-\fBgetbkgrnd\fP,
-\fBwgetbkgrnd\fP \- \fBcurses\fP window complex background manipulation routines
+\fB\%bkgrnd\fP,
+\fB\%wbkgrnd\fP,
+\fB\%bkgrndset\fP,
+\fB\%wbkgrndset\fP,
+\fB\%getbkgrnd\fP,
+\fB\%wgetbkgrnd\fP \-
+manipulate background of a \fIcurses\fP window of wide characters
 .SH SYNOPSIS
 \fB#include <curses.h>\fR
 .sp
-\fBint bkgrnd(\fB const cchar_t *\fIwch\fB);\fR
+\fBint bkgrnd(\fBconst cchar_t *\fIwch\fB);\fR
 .br
-\fBint wbkgrnd(\fB WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
+\fBint wbkgrnd(\fBWINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
 .sp
 \fBvoid bkgrndset(const cchar_t *\fIwch\fR \fB);\fR
 .br
@@ -87,9 +88,11 @@ Wherever the former background character
 appears, it is changed to the new background character.
 .SS getbkgrnd
 The \fBgetbkgrnd\fP function returns the given window's current background
-character/attribute pair via the \fBwch\fP pointer.
+character/attribute pair via the
+.I wch
+pointer.
 If the given window pointer is null,
-the character is not updated (but no error returned).
+the character is not updated (but no error is returned).
 .SH NOTES
 Note that
 \fBbkgrnd\fP,
diff --git a/man/curs_border.3x b/man/curs_border.3x
index a8fc08110..a3f752113 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,28 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.34 2023/07/01 15:43:20 tom Exp $
-.TH curs_border 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.38 2023/09/16 23:34:43 tom Exp $
+.TH curs_border 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBborder\fP,
-\fBwborder\fP,
-\fBbox\fP,
-\fBhline\fP,
-\fBwhline\fP,
-\fBvline\fP,
-\fBwvline\fP,
-\fBmvhline\fP,
-\fBmvwhline\fP,
-\fBmvvline\fP,
-\fBmvwvline\fP \- create \fBcurses\fP borders, horizontal and vertical lines
-.ad
-.hy
+\fB\%border\fP,
+\fB\%wborder\fP,
+\fB\%box\fP,
+\fB\%hline\fP,
+\fB\%whline\fP,
+\fB\%vline\fP,
+\fB\%wvline\fP,
+\fB\%mvhline\fP,
+\fB\%mvwhline\fP,
+\fB\%mvvline\fP,
+\fB\%mvwvline\fP \-
+draw borders and lines in a \fIcurses\fR window of characters
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index b8055d50b..5b672f7de 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,28 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.20 2023/07/01 15:43:20 tom Exp $
-.TH curs_border_set 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.24 2023/09/16 23:34:43 tom Exp $
+.TH curs_border_set 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBborder_set\fP,
-\fBwborder_set\fP,
-\fBbox_set\fP,
-\fBhline_set\fP,
-\fBwhline_set\fP,
-\fBmvhline_set\fP,
-\fBmvwhline_set\fP,
-\fBvline_set\fP,
-\fBwvline_set\fP,
-\fBmvvline_set\fP,
-\fBmvwvline_set\fP \- create \fBcurses\fP borders or lines using complex characters and renditions
-.ad
-.hy
+\fB\%border_set\fP,
+\fB\%wborder_set\fP,
+\fB\%box_set\fP,
+\fB\%hline_set\fP,
+\fB\%whline_set\fP,
+\fB\%mvhline_set\fP,
+\fB\%mvwhline_set\fP,
+\fB\%vline_set\fP,
+\fB\%wvline_set\fP,
+\fB\%mvvline_set\fP,
+\fB\%mvwvline_set\fP \-
+draw borders and lines in a \fIcurses\fR window of wide characters
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 71600b28d..1c8d3535f 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,25 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
-.TH curs_clear 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_clear.3x,v 1.35 2023/09/16 23:34:43 tom Exp $
+.TH curs_clear 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBerase\fP,
-\fBwerase\fP,
-\fBclear\fP,
-\fBwclear\fP,
-\fBclrtobot\fP,
-\fBwclrtobot\fP,
-\fBclrtoeol\fP,
-\fBwclrtoeol\fP \- clear all or part of a \fBcurses\fP window
-.ad
-.hy
+\fB\%erase\fP,
+\fB\%werase\fP,
+\fB\%clear\fP,
+\fB\%wclear\fP,
+\fB\%clrtobot\fP,
+\fB\%wclrtobot\fP,
+\fB\%clrtoeol\fP,
+\fB\%wclrtoeol\fP \-
+clear all or part of a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_color.3x b/man/curs_color.3x
index ffd552341..744ad3854 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.73 2023/07/01 14:23:04 tom Exp $
-.TH curs_color 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.77 2023/09/16 23:34:43 tom Exp $
+.TH curs_color 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,25 +38,22 @@
 .el    .IP \(bu 2
 ..
 .ds n 5
-.na
-.hy 0
 .SH NAME
-\fBstart_color\fP,
-\fBhas_colors\fP,
-\fBcan_change_color\fP,
-\fBinit_pair\fP,
-\fBinit_color\fP,
-\fBinit_extended_pair\fP,
-\fBinit_extended_color\fP,
-\fBcolor_content\fP,
-\fBpair_content\fP,
-\fBextended_color_content\fP,
-\fBextended_pair_content\fP,
-\fBreset_color_pairs\fP,
-\fBCOLOR_PAIR\fP,
-\fBPAIR_NUMBER\fP \- \fBcurses\fP color manipulation routines
-.ad
-.hy
+\fB\%start_color\fP,
+\fB\%has_colors\fP,
+\fB\%can_change_color\fP,
+\fB\%init_pair\fP,
+\fB\%init_color\fP,
+\fB\%init_extended_pair\fP,
+\fB\%init_extended_color\fP,
+\fB\%color_content\fP,
+\fB\%pair_content\fP,
+\fB\%extended_color_content\fP,
+\fB\%extended_pair_content\fP,
+\fB\%reset_color_pairs\fP,
+\fB\%COLOR_PAIR\fP,
+\fB\%PAIR_NUMBER\fP \-
+manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 161647a5f..dab1d4239 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,17 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.22 2023/07/01 15:43:20 tom Exp $
-.TH curs_delch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_delch.3x,v 1.26 2023/09/16 23:34:43 tom Exp $
+.TH curs_delch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBdelch\fP,
-\fBwdelch\fP,
-\fBmvdelch\fP,
-\fBmvwdelch\fP \- delete character under the cursor in a \fBcurses\fP window
+\fB\%delch\fP,
+\fB\%wdelch\fP,
+\fB\%mvdelch\fP,
+\fB\%mvwdelch\fP \-
+delete the character at the cursor in a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index f8c6b449f..55ef06a32 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,15 +27,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.24 2023/07/01 15:43:20 tom Exp $
-.TH curs_deleteln 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.28 2023/09/16 23:34:43 tom Exp $
+.TH curs_deleteln 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBdeleteln\fP,
-\fBwdeleteln\fP,
-\fBinsdelln\fP,
-\fBwinsdelln\fP,
-\fBinsertln\fP,
-\fBwinsertln\fP \- delete and insert lines in a \fBcurses\fP window
+\fB\%deleteln\fP,
+\fB\%wdeleteln\fP,
+\fB\%insdelln\fP,
+\fB\%winsdelln\fP,
+\fB\%insertln\fP,
+\fB\%winsertln\fP \-
+delete or insert lines in a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 3764c23eb..5ea88a028 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,16 +29,16 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.32 2023/07/01 15:43:20 tom Exp $
-.TH curs_extend 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.36 2023/09/16 23:34:43 tom Exp $
+.TH curs_extend 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBcurses_version\fP,
-\fBuse_extended_names\fP \- miscellaneous curses extensions
-.
+\fB\%curses_version\fP,
+\fB\%use_extended_names\fP \-
+miscellaneous \fIcurses\fR extensions
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index be13c902d..0a033174b 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,10 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
-.TH curs_get_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_get_wch.3x,v 1.23 2023/09/16 23:34:43 tom Exp $
+.TH curs_get_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -40,13 +38,12 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBget_wch\fP,
-\fBwget_wch\fP,
-\fBmvget_wch\fP,
-\fBmvwget_wch\fP,
-\fBunget_wch\fP \- get (or push back) a wide character from curses terminal keyboard
-.ad
-.hy
+\fB\%get_wch\fP,
+\fB\%wget_wch\fP,
+\fB\%mvget_wch\fP,
+\fB\%mvwget_wch\fP,
+\fB\%unget_wch\fP \-
+get (or push back) a wide character from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 2d632522a..ec2bac776 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp $
-.TH curs_get_wstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.34 2023/09/16 23:34:43 tom Exp $
+.TH curs_get_wstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBget_wstr\fP,
-\fBgetn_wstr\fP,
-\fBwget_wstr\fP,
-\fBwgetn_wstr\fP,
-\fBmvget_wstr\fP,
-\fBmvgetn_wstr\fP,
-\fBmvwget_wstr\fP,
-\fBmvwgetn_wstr\fP \- get an array of wide characters from a curses terminal keyboard
-.ad
-.hy
+\fB\%get_wstr\fP,
+\fB\%getn_wstr\fP,
+\fB\%wget_wstr\fP,
+\fB\%wgetn_wstr\fP,
+\fB\%mvget_wstr\fP,
+\fB\%mvgetn_wstr\fP,
+\fB\%mvwget_wstr\fP,
+\fB\%mvwgetn_wstr\fP \-
+get a wide-character string from a \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 1ebcdb57d..3e6971ab2 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,15 +27,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.31 2023/07/01 15:43:20 tom Exp $
-.TH curs_getcchar 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.35 2023/09/16 23:34:43 tom Exp $
+.TH curs_getcchar 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBgetcchar\fP,
-\fBsetcchar\fP \- Get a wide character string and rendition from a \fBcchar_t\fP or set a \fBcchar_t\fP from a wide-character string
+\fB\%getcchar\fP,
+\fB\%setcchar\fP \-
+convert between a wide-character string and a \fIcurses\fR complex character string
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 9f84f8c30..b09520270 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,10 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.68 2023/08/19 20:45:12 tom Exp $
-.TH curs_getch 3X 2023-08-19 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_getch.3x,v 1.72 2023/09/16 23:34:43 tom Exp $
+.TH curs_getch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -41,14 +39,13 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBgetch\fP,
-\fBwgetch\fP,
-\fBmvgetch\fP,
-\fBmvwgetch\fP,
-\fBungetch\fP,
-\fBhas_key\fP \- get (or push back) characters from \fBcurses\fP terminal keyboard
-.ad
-.hy
+\fB\%getch\fP,
+\fB\%wgetch\fP,
+\fB\%mvgetch\fP,
+\fB\%mvwgetch\fP,
+\fB\%ungetch\fP,
+\fB\%has_key\fP \-
+get (or push back) characters from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .B #include <curses.h>
 .PP
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index b66480330..ba385e2b9 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp $
-.TH curs_getstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.46 2023/09/16 23:34:43 tom Exp $
+.TH curs_getstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBgetstr\fP,
-\fBgetnstr\fP,
-\fBwgetstr\fP,
-\fBwgetnstr\fP,
-\fBmvgetstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetstr\fP,
-\fBmvwgetnstr\fP \- accept character strings from \fBcurses\fP terminal keyboard
-.ad
-.hy
+\fB\%getstr\fP,
+\fB\%getnstr\fP,
+\fB\%wgetstr\fP,
+\fB\%wgetnstr\fP,
+\fB\%mvgetstr\fP,
+\fB\%mvgetnstr\fP,
+\fB\%mvwgetstr\fP,
+\fB\%mvwgetnstr\fP \-
+accept character strings from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index ff49c86fb..05bce4f99 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,13 +27,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.27 2023/07/01 15:43:20 tom Exp $
-.TH curs_getyx 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.31 2023/09/16 23:37:03 tom Exp $
+.TH curs_getyx 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBgetyx\fP,
-\fBgetparyx\fP,
-\fBgetbegyx\fP,
-\fBgetmaxyx\fP \- get \fBcurses\fP cursor and window coordinates
+\fB\%getyx\fP,
+\fB\%getparyx\fP,
+\fB\%getbegyx\fP,
+\fB\%getmaxyx\fP \-
+get \fIcurses\fR cursor and window coordinates
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index bd009dfc5..feaf2bc83 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,17 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.14 2022/02/12 20:07:29 tom Exp $
-.TH curs_in_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp $
+.TH curs_in_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBin_wch\fP,
-\fBmvin_wch\fP,
-\fBmvwin_wch\fP,
-\fBwin_wch\fP \- extract a complex character and rendition from a window
+\fB\%in_wch\fP,
+\fB\%mvin_wch\fP,
+\fB\%mvwin_wch\fP,
+\fB\%win_wch\fP \-
+get a \fIcurses\fR complex character from a window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 551f52c27..3888f8852 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,25 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
-.TH curs_in_wchstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
+.TH curs_in_wchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBin_wchstr\fP,
-\fBin_wchnstr\fP,
-\fBwin_wchstr\fP,
-\fBwin_wchnstr\fP,
-\fBmvin_wchstr\fP,
-\fBmvin_wchnstr\fP,
-\fBmvwin_wchstr\fP,
-\fBmvwin_wchnstr\fP \- get an array of complex characters and renditions from a curses window
-.ad
-.hy
+\fB\%in_wchstr\fP,
+\fB\%in_wchnstr\fP,
+\fB\%win_wchstr\fP,
+\fB\%win_wchnstr\fP,
+\fB\%mvin_wchstr\fP,
+\fB\%mvin_wchnstr\fP,
+\fB\%mvwin_wchstr\fP,
+\fB\%mvwin_wchnstr\fP \-
+get a \fIcurses\fR complex character string from a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 02d2d323b..2df5e11aa 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.33 2023/08/19 20:46:33 tom Exp $
-.TH curs_inch 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
+.TH curs_inch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,10 +39,11 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBinch\fP,
-\fBwinch\fP,
-\fBmvinch\fP,
-\fBmvwinch\fP \- get a character and attributes from a \fBcurses\fP window
+\fB\%inch\fP,
+\fB\%winch\fP,
+\fB\%mvinch\fP,
+\fB\%mvwinch\fP \-
+get a \fIcurses\fR character from a window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index c05fe8208..f174b09f7 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.28 2023/07/01 15:43:20 tom Exp $
-.TH curs_inchstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.32 2023/09/16 23:37:03 tom Exp $
+.TH curs_inchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,19 +37,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBinchstr\fP,
-\fBinchnstr\fP,
-\fBwinchstr\fP,
-\fBwinchnstr\fP,
-\fBmvinchstr\fP,
-\fBmvinchnstr\fP,
-\fBmvwinchstr\fP,
-\fBmvwinchnstr\fP \- get a string of characters (and attributes) from a \fBcurses\fP window
-.ad
-.hy
+\fB\%inchstr\fP,
+\fB\%inchnstr\fP,
+\fB\%winchstr\fP,
+\fB\%winchnstr\fP,
+\fB\%mvinchstr\fP,
+\fB\%mvinchnstr\fP,
+\fB\%mvwinchstr\fP,
+\fB\%mvwinchnstr\fP \-
+get a \fIcurses\fR character string from a window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 829a50aeb..404c2bdc6 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.45 2023/08/19 19:46:20 tom Exp $
-.TH curs_initscr 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.50 2023/09/16 23:37:03 tom Exp $
+.TH curs_initscr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -37,17 +37,14 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBinitscr\fP,
-\fBnewterm\fP,
-\fBendwin\fP,
-\fBisendwin\fP,
-\fBset_term\fP,
-\fBdelscreen\fP \- \fBcurses\fP screen initialization and manipulation routines
-.ad
-.hy
+\fB\%initscr\fP,
+\fB\%newterm\fP,
+\fB\%endwin\fP,
+\fB\%isendwin\fP,
+\fB\%set_term\fP,
+\fB\%delscreen\fP \-
+initialize, manipulate, or tear down \fIcurses\fR terminal interface
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -235,25 +232,23 @@ Generic entries are detected by \fBsetupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle a missing/empty TERM variable differently.
 .SS Signal Handlers
-Quoting from X/Open Curses, section 3.1.1:
+Quoting from X/Open Curses Issue 7, section 3.1.1:
 .RS 5
-.hy 0
 .PP
-.I Curses implementations may provide for special handling of the
-.I \fBSIGINT\fP,
-.I \fBSIGQUIT\fP and
-.I \fBSIGTSTP\fP signals
-.I if their disposition is \fBSIG_DFL\fP at the time
-\fBinitscr\fI is called \fR...
+Curses implementations may provide for special handling of the
+\%SIGINT,
+\%SIGQUIT,
+and \%SIGTSTP signals if their disposition is \%SIG_DFL at the time
+.I \%initscr
+is called.\|.\|.
 .PP
-.I Any special handling for these signals may remain in effect for the
-.I life of the process or until the process changes the disposition of
-.I the signal.
+Any special handling for these signals may remain in effect for the
+life of the process or until the process changes the disposition of
+the signal.
 .PP
-.I None of the Curses functions are required to be safe
-.I with respect to signals \fP...
+None of the Curses functions are required to be safe
+with respect to signals.\|.\|.
 .RE
-.hy
 .PP
 This implementation establishes signal handlers during initialization,
 e.g., \fBinitscr\fP or \fBnewterm\fP.
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index cbce7ef4a..8e9b9863f 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,40 +28,37 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.43 2023/08/19 20:55:23 tom Exp $
-.TH curs_inopts 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.47 2023/09/16 23:37:03 tom Exp $
+.TH curs_inopts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBcbreak\fP,
-\fBecho\fP,
-\fBhalfdelay\fP,
-\fBintrflush\fP,
-\fBis_cbreak\fP,
-\fBis_echo\fP,
-\fBis_nl\fP,
-\fBis_raw\fP,
-\fBkeypad\fP,
-\fBmeta\fP,
-\fBnl\fP,
-\fBnocbreak\fP,
-\fBnodelay\fP,
-\fBnoecho\fP,
-\fBnonl\fP,
-\fBnoqiflush\fP,
-\fBnoraw\fP,
-\fBnotimeout\fP,
-\fBqiflush\fP,
-\fBraw\fP,
-\fBtimeout\fP,
-\fBwtimeout\fP,
-\fBtypeahead\fP \- \fBcurses\fP input options
-.ad
-.hy
+\fB\%cbreak\fP,
+\fB\%echo\fP,
+\fB\%halfdelay\fP,
+\fB\%intrflush\fP,
+\fB\%is_cbreak\fP,
+\fB\%is_echo\fP,
+\fB\%is_nl\fP,
+\fB\%is_raw\fP,
+\fB\%keypad\fP,
+\fB\%meta\fP,
+\fB\%nl\fP,
+\fB\%nocbreak\fP,
+\fB\%nodelay\fP,
+\fB\%noecho\fP,
+\fB\%nonl\fP,
+\fB\%noqiflush\fP,
+\fB\%noraw\fP,
+\fB\%notimeout\fP,
+\fB\%qiflush\fP,
+\fB\%raw\fP,
+\fB\%timeout\fP,
+\fB\%wtimeout\fP,
+\fB\%typeahead\fP \-
+get and set \fIcurses\fR terminal input options
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 42d284afd..021046629 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,17 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
-.TH curs_ins_wch 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp $
+.TH curs_ins_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBins_wch\fP,
-\fBmvins_wch\fP,
-\fBmvwins_wch\fP,
-\fBwins_wch\fP \- insert a complex character and rendition into a window
+\fB\%ins_wch\fP,
+\fB\%mvins_wch\fP,
+\fB\%mvwins_wch\fP,
+\fB\%wins_wch\fP \-
+insert a \fIcurses\fR complex character string in a window
 .SH SYNOPSIS
 #include <curses.h>
 .sp
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index e1c145716..648560708 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,25 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.15 2022/02/12 20:05:11 tom Exp $
-.TH curs_ins_wstr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.20 2023/09/16 23:37:03 tom Exp $
+.TH curs_ins_wstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBins_wstr\fP,
-\fBins_nwstr\fP,
-\fBwins_wstr\fP,
-\fBwins_nwstr\fP,
-\fBmvins_wstr\fP,
-\fBmvins_nwstr\fP,
-\fBmvwins_wstr\fP,
-\fBmvwins_nwstr\fP \- insert a wide-character string into a curses window
-.ad
-.hy
+\fB\%ins_wstr\fP,
+\fB\%ins_nwstr\fP,
+\fB\%wins_wstr\fP,
+\fB\%wins_nwstr\fP,
+\fB\%mvins_wstr\fP,
+\fB\%mvins_nwstr\fP,
+\fB\%mvwins_wstr\fP,
+\fB\%mvwins_nwstr\fP \-
+insert a wide-character string in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index d56319581..4a808607f 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,17 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
-.TH curs_insch 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.30 2023/09/16 23:37:03 tom Exp $
+.TH curs_insch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBinsch\fP,
-\fBwinsch\fP,
-\fBmvinsch\fP,
-\fBmvwinsch\fP \- insert a character before cursor in a \fBcurses\fP window
+\fB\%insch\fP,
+\fB\%winsch\fP,
+\fB\%mvinsch\fP,
+\fB\%mvwinsch\fP \-
+insert a \fIcurses\fR character in a window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index b2b563946..2621bfe50 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,21 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.33 2023/07/01 15:43:20 tom Exp $
-.TH curs_insstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
+.TH curs_insstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBinsstr\fP,
-\fBinsnstr\fP,
-\fBwinsstr\fP,
-\fBwinsnstr\fP,
-\fBmvinsstr\fP,
-\fBmvinsnstr\fP,
-\fBmvwinsstr\fP,
-\fBmvwinsnstr\fP \- insert string before cursor in a \fBcurses\fP window
+\fB\%insstr\fP,
+\fB\%insnstr\fP,
+\fB\%winsstr\fP,
+\fB\%winsnstr\fP,
+\fB\%mvinsstr\fP,
+\fB\%mvinsnstr\fP,
+\fB\%mvwinsstr\fP,
+\fB\%mvwinsnstr\fP \-
+insert a string in a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .br
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index fab97c94f..fbbf1782a 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.29 2023/07/01 15:43:20 tom Exp $
-.TH curs_instr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.33 2023/09/16 23:37:03 tom Exp $
+.TH curs_instr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,14 +38,15 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBinstr\fP,
-\fBinnstr\fP,
-\fBwinstr\fP,
-\fBwinnstr\fP,
-\fBmvinstr\fP,
-\fBmvinnstr\fP,
-\fBmvwinstr\fP,
-\fBmvwinnstr\fP \- get a string of characters from a \fBcurses\fP window
+\fB\%instr\fP,
+\fB\%innstr\fP,
+\fB\%winstr\fP,
+\fB\%winnstr\fP,
+\fB\%mvinstr\fP,
+\fB\%mvinnstr\fP,
+\fB\%mvwinstr\fP,
+\fB\%mvwinnstr\fP \-
+get a string from a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 7022b91ab..fa283a8c1 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,21 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.21 2023/07/01 15:43:20 tom Exp $
-.TH curs_inwstr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
+.TH curs_inwstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBinwstr\fP,
-\fBinnwstr\fP,
-\fBwinwstr\fP,
-\fBwinnwstr\fP,
-\fBmvinwstr\fP,
-\fBmvinnwstr\fP,
-\fBmvwinwstr\fP,
-\fBmvwinnwstr\fP \- get a string of \fBwchar_t\fP characters from a curses window
+\fB\%inwstr\fP,
+\fB\%innwstr\fP,
+\fB\%winwstr\fP,
+\fB\%winnwstr\fP,
+\fB\%mvinwstr\fP,
+\fB\%mvinnwstr\fP,
+\fB\%mvwinwstr\fP,
+\fB\%mvwinnwstr\fP \-
+get a wide-character string from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h> \fP
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 14c90522b..6692479fb 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,7 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.37 2023/08/19 19:47:16 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
+.TH curs_kernel 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,23 +37,19 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_kernel 3X 2023-08-19 "ncurses 6.4" "Library calls"
-.na
-.hy 0
 .SH NAME
-\fBdef_prog_mode\fP,
-\fBdef_shell_mode\fP,
-\fBreset_prog_mode\fP,
-\fBreset_shell_mode\fP,
-\fBresetty\fP,
-\fBsavetty\fP,
-\fBgetsyx\fP,
-\fBsetsyx\fP,
-\fBripoffline\fP,
-\fBcurs_set\fP,
-\fBnapms\fP \- low-level \fBcurses\fP routines
-.ad
-.hy
+\fB\%def_prog_mode\fP,
+\fB\%def_shell_mode\fP,
+\fB\%reset_prog_mode\fP,
+\fB\%reset_shell_mode\fP,
+\fB\%resetty\fP,
+\fB\%savetty\fP,
+\fB\%getsyx\fP,
+\fB\%setsyx\fP,
+\fB\%ripoffline\fP,
+\fB\%curs_set\fP,
+\fB\%napms\fP \-
+low-level \fIcurses\fR routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -177,18 +174,14 @@ requested \fIvisibility\fP is not supported.
 X/Open defines no error conditions.
 In this implementation
 .TP 5
-.na
-.hy 0
 \fBdef_prog_mode\fP, \fBdef_shell_mode\fP, \fBreset_prog_mode\fP, \fBreset_shell_mode\fP
-.hy
-.ad
 return an error
 if the terminal was not initialized, or
 if the I/O call to obtain the terminal settings fails.
 .TP 5
 \fBripoffline\fP
 returns an error if the maximum number of ripped-off lines
-exceeds the maximum (NRIPS = 5).
+exceeds the maximum (5).
 .SH NOTES
 Note that \fBgetsyx\fP is a macro, so \fB&\fP is not necessary before
 the variables \fIy\fP and \fIx\fP.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 5eaee7951..86c0176f6 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,14 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.17 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.22 2023/09/16 23:37:03 tom Exp $
+.TH curs_legacy 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_legacy 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
-curs_legacy \- get \fBcurses\fP cursor and window coordinates, attributes
+\fB\%getattrs\fP,
+\fB\%getbegx\fP,
+\fB\%getbegy\fP,
+\fB\%getcurx\fP,
+\fB\%getcury\fP,
+\fB\%getmaxx\fP,
+\fB\%getmaxy\fP,
+\fB\%getparx\fP,
+\fB\%getpary\fP \-
+get \fIcurses\fR cursor and window coordinates or attributes (legacy)
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 1cd1dc921..c04598a90 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.16 2022/06/04 23:33:48 tom Exp $
-.TH curs_memleaks 3X 2022-06-04 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.21 2023/09/16 23:37:03 tom Exp $
+.TH curs_memleaks 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,13 +37,10 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBexit_curses\fP,
-\fBexit_terminfo\fP \- \fBcurses\fP memory-leak checking
-.ad
-.hy
+\fB\%exit_curses\fP,
+\fB\%exit_terminfo\fP \-
+check for memory leaks in \fIcurses\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .br
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 731e6e5ed..31d128f3d 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,7 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.71 2023/09/16 23:37:03 tom Exp $
+.TH curs_mouse 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -56,17 +57,16 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_mouse 3X 2023-09-09 "ncurses 6.4" "Library calls"
-.na
-.hy 0
 .SH NAME
-\fBhas_mouse\fP,
-\fBgetmouse\fP, \fBungetmouse\fP,
-\fBmousemask\fP, \fBwenclose\fP,
-\fBmouse_trafo\fP, \fBwmouse_trafo\fP,
-\fBmouseinterval\fP \- mouse interface through curses
-.ad
-.hy
+\fB\%has_mouse\fP,
+\fB\%getmouse\fP,
+\fB\%ungetmouse\fP,
+\fB\%mousemask\fP,
+\fB\%wenclose\fP,
+\fB\%mouse_trafo\fP,
+\fB\%wmouse_trafo\fP,
+\fB\%mouseinterval\fP \-
+get mouse events in \fIcurses\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 26490809b..7ac46740d 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,15 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
-.TH curs_move 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_move.3x,v 1.29 2023/09/16 20:18:53 tom Exp $
+.TH curs_move 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmove\fP,
-\fBwmove\fP \- move \fBcurses\fP window cursor
-.ad
-.hy
+\fB\%move\fP,
+\fB\%wmove\fP \-
+move cursor in a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index ef6a19339..e7f8561d7 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,32 +27,29 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.23 2023/07/01 14:31:54 tom Exp $
-.TH curs_opaque 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
+.TH curs_opaque 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBis_cleared\fP,
-\fBis_idlok\fP,
-\fBis_idcok\fP,
-\fBis_immedok\fP,
-\fBis_keypad\fP,
-\fBis_leaveok\fP,
-\fBis_nodelay\fP,
-\fBis_notimeout\fP,
-\fBis_pad\fP,
-\fBis_scrollok\fP,
-\fBis_subwin\fP,
-\fBis_syncok\fP,
-\fBwgetdelay\fP,
-\fBwgetparent\fP,
-\fBwgetscrreg\fP \- \fBcurses\fP window properties
-.ad
-.hy
+\fB\%is_cleared\fP,
+\fB\%is_idlok\fP,
+\fB\%is_idcok\fP,
+\fB\%is_immedok\fP,
+\fB\%is_keypad\fP,
+\fB\%is_leaveok\fP,
+\fB\%is_nodelay\fP,
+\fB\%is_notimeout\fP,
+\fB\%is_pad\fP,
+\fB\%is_scrollok\fP,
+\fB\%is_subwin\fP,
+\fB\%is_syncok\fP,
+\fB\%wgetdelay\fP,
+\fB\%wgetparent\fP,
+\fB\%wgetscrreg\fP \-
+obtain \fIcurses\fR window properties
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 3d12eff4c..3f7eb90ec 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,25 +27,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.40 2023/07/01 15:43:20 tom Exp $
-.TH curs_outopts 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_outopts.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
+.TH curs_outopts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBclearok\fP,
-\fBidlok\fP,
-\fBidcok\fP,
-\fBimmedok\fP,
-\fBleaveok\fP,
-\fBsetscrreg\fP,
-\fBwsetscrreg\fP,
-\fBscrollok\fP \- \fBcurses\fP output options
-.ad
-.hy
+\fB\%clearok\fP,
+\fB\%idlok\fP,
+\fB\%idcok\fP,
+\fB\%immedok\fP,
+\fB\%leaveok\fP,
+\fB\%setscrreg\fP,
+\fB\%wsetscrreg\fP,
+\fB\%scrollok\fP \-
+set \fIcurses\fR output options
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 334bf4fb4..6f98fc714 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,16 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.26 2023/07/01 15:43:20 tom Exp $
-.TH curs_overlay 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_overlay.3x,v 1.30 2023/09/16 23:37:03 tom Exp $
+.TH curs_overlay 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBoverlay\fP,
-\fBoverwrite\fP,
-\fBcopywin\fP \- overlay and manipulate overlapped \fBcurses\fP windows
-.ad
-.hy
+\fB\%overlay\fP,
+\fB\%overwrite\fP,
+\fB\%copywin\fP \-
+overlay \fIcurses\fR windows and manipulate them
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index b69484102..28dbc7b79 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,23 +27,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.33 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_pad.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
+.TH curs_pad 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_pad 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
 .SH NAME
-\fBnewpad\fP,
-\fBsubpad\fP,
-\fBprefresh\fP,
-\fBpnoutrefresh\fP,
-\fBpechochar\fP,
-\fBpecho_wchar\fP \- create and display \fBcurses\fP pads
-.ad
-.hy
+\fB\%newpad\fP,
+\fB\%subpad\fP,
+\fB\%prefresh\fP,
+\fB\%pnoutrefresh\fP,
+\fB\%pechochar\fP,
+\fB\%pecho_wchar\fP \-
+create and display \fIcurses\fR pads
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_print.3x b/man/curs_print.3x
index bbaeaa901..3325958eb 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
-.TH curs_print 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
+.TH curs_print 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmcprint\fP \- ship binary data to printer
+\fB\%mcprint\fP \-
+write binary data to printer using \fIterminfo\fR capabilities
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 985fbe25c..9f804a458 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
-.TH curs_printw 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
+.TH curs_printw 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,16 +37,14 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBprintw\fP,
-\fBwprintw\fP,
-\fBmvprintw\fP,
-\fBmvwprintw\fP,
-\fBvwprintw\fP, \fBvw_printw\fP \- print formatted output in \fBcurses\fP windows
-.ad
-.hy
+\fB\%printw\fP,
+\fB\%wprintw\fP,
+\fB\%mvprintw\fP,
+\fB\%mvwprintw\fP,
+\fB\%vwprintw\fP,
+\fB\%vw_printw\fP \-
+write formatted output to \fIcurses\fR windows
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 90d18ea78..e458b1289 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.31 2023/08/19 19:47:40 tom Exp $
-.TH curs_refresh 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.35 2023/09/16 23:37:03 tom Exp $
+.TH curs_refresh 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,17 +37,14 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBdoupdate\fP,
-\fBredrawwin\fP,
-\fBrefresh\fP,
-\fBwnoutrefresh\fP,
-\fBwredrawln\fP,
-\fBwrefresh\fP \- refresh \fBcurses\fP windows and lines
-.ad
-.hy
+\fB\%doupdate\fP,
+\fB\%redrawwin\fP,
+\fB\%refresh\fP,
+\fB\%wnoutrefresh\fP,
+\fB\%wredrawln\fP,
+\fB\%wrefresh\fP \-
+refresh \fIcurses\fR windows or lines thereupon
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index fe499b4eb..9aff66fab 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.33 2022/02/12 20:05:11 tom Exp $
-.TH curs_scanw 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
+.TH curs_scanw 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,11 +38,13 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBscanw\fP,
-\fBwscanw\fP,
-\fBmvscanw\fP,
-\fBmvwscanw\fP,
-\fBvwscanw\fP, \fBvw_scanw\fP \- convert formatted input from a \fBcurses\fP window
+\fB\%scanw\fP,
+\fB\%wscanw\fP,
+\fB\%mvscanw\fP,
+\fB\%mvwscanw\fP,
+\fB\%vwscanw\fP,
+\fB\%vw_scanw\fP \-
+read formatted input from a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index ff9d87027..fb74acba9 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.24 2023/07/01 15:43:20 tom Exp $
-.TH curs_scr_dump 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
+.TH curs_scr_dump 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,15 +37,12 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBscr_dump\fP,
-\fBscr_restore\fP,
-\fBscr_init\fP,
-\fBscr_set\fP \- read (write) a \fBcurses\fP screen from (to) a file
-.ad
-.hy
+\fB\%scr_dump\fP,
+\fB\%scr_restore\fP,
+\fB\%scr_init\fP,
+\fB\%scr_set\fP \-
+read/write a \fIcurses\fR screen from/to a file
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 444cb48f3..135183ad4 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,20 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.28 2023/08/19 19:47:52 tom Exp $
-.TH curs_scroll 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.32 2023/09/16 23:37:03 tom Exp $
+.TH curs_scroll 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-\fBscroll\fP,
-\fBscrl\fP,
-\fBwscrl\fP \- scroll a \fBcurses\fP window
-.ad
-.hy
+\fB\%scroll\fP,
+\fB\%scrl\fP,
+\fB\%wscrl\fP \-
+scroll a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 56324f9a9..50b477ac6 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.48 2023/07/01 15:43:20 tom Exp $
-.TH curs_slk 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.53 2023/09/16 23:37:03 tom Exp $
+.TH curs_slk 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,29 +37,26 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBslk_init\fP,
-\fBslk_set\fP,
-\fBslk_wset\fP,
-\fBslk_refresh\fP,
-\fBslk_noutrefresh\fP,
-\fBslk_label\fP,
-\fBslk_clear\fP,
-\fBslk_restore\fP,
-\fBslk_touch\fP,
-\fBslk_attron\fP,
-\fBslk_attrset\fP,
-\fBslk_attroff\fP,
-\fBslk_attr_on\fP,
-\fBslk_attr_set\fP,
-\fBslk_attr_off\fP,
-\fBslk_attr\fP,
-\fBslk_color\fP,
-\fBextended_slk_color\fP \- \fBcurses\fP soft label routines
-.ad
-.hy
+\fB\%slk_init\fP,
+\fB\%slk_set\fP,
+\fB\%slk_wset\fP,
+\fB\%slk_refresh\fP,
+\fB\%slk_noutrefresh\fP,
+\fB\%slk_label\fP,
+\fB\%slk_clear\fP,
+\fB\%slk_restore\fP,
+\fB\%slk_touch\fP,
+\fB\%slk_attron\fP,
+\fB\%slk_attrset\fP,
+\fB\%slk_attroff\fP,
+\fB\%slk_attr_on\fP,
+\fB\%slk_attr_set\fP,
+\fB\%slk_attr_off\fP,
+\fB\%slk_attr\fP,
+\fB\%slk_color\fP,
+\fB\%extended_slk_color\fP \-
+\fIcurses\fR soft label key routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -208,11 +205,7 @@ In this implementation
 \fBslk_attr\fP
 returns the attribute used for the soft keys.
 .TP 5
-.na
-.hy 0
 \fBslk_attroff\fP, \fBslk_attron\fP, \fBslk_clear\fP, \fBslk_noutrefresh\fP, \fBslk_refresh\fP, \fBslk_touch\fP
-.ad
-.hy
 return an error
 if the terminal or the softkeys were not initialized.
 .TP 5
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 2cbc587be..d22a9ef63 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,18 +27,15 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.33 2023/08/19 19:48:07 tom Exp $
-.TH curs_sp_funcs 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
+.TH curs_sp_funcs 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.na
-.hy 0
 .SH NAME
-curs_sp_funcs \- \fBcurses\fP screen-pointer extension
-.ad
-.hy
+\fB\%curs_sp_funcs\fP \-
+\fIcurses\fR screen-pointer extension
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .nf
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 121734736..1f529b5d4 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,20 +27,21 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.24 2023/07/01 14:31:54 tom Exp $
-.TH curs_termattrs 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
+.TH curs_termattrs 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBbaudrate\fP,
-\fBerasechar\fP,
-\fBerasewchar\fP,
-\fBhas_ic\fP,
-\fBhas_il\fP,
-\fBkillchar\fP,
-\fBkillwchar\fP,
-\fBlongname\fP,
-\fBterm_attrs\fP,
-\fBtermattrs\fP,
-\fBtermname\fP \- \fBcurses\fP environment query routines
+\fB\%baudrate\fP,
+\fB\%erasechar\fP,
+\fB\%erasewchar\fP,
+\fB\%has_ic\fP,
+\fB\%has_il\fP,
+\fB\%killchar\fP,
+\fB\%killwchar\fP,
+\fB\%longname\fP,
+\fB\%term_attrs\fP,
+\fB\%termattrs\fP,
+\fB\%termname\fP \-
+\fIcurses\fR environment query routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .PP
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index f26a536c9..8e1fd7b84 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.62 2023/07/01 15:28:47 tom Exp $
-.TH curs_termcap 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.66 2023/09/16 23:37:03 tom Exp $
+.TH curs_termcap 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -37,22 +37,19 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .ds n 5
 .SH NAME
-\fBPC\fP,
-\fBUP\fP,
-\fBBC\fP,
-\fBospeed\fP,
-\fBtgetent\fP,
-\fBtgetflag\fP,
-\fBtgetnum\fP,
-\fBtgetstr\fP,
-\fBtgoto\fP,
-\fBtputs\fP \- \fBcurses\fP emulation of termcap
-.ad
-.hy
+\fB\%PC\fP,
+\fB\%UP\fP,
+\fB\%BC\fP,
+\fB\%ospeed\fP,
+\fB\%tgetent\fP,
+\fB\%tgetflag\fP,
+\fB\%tgetnum\fP,
+\fB\%tgetstr\fP,
+\fB\%tgoto\fP,
+\fB\%tputs\fP \-
+\fIcurses\fR emulation of \fItermcap\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .br
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 22ed0777b..bd4189514 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.95 2023/08/19 20:37:54 tom Exp $
-.TH curs_terminfo 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.99 2023/09/16 23:37:03 tom Exp $
+.TH curs_terminfo 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,29 +39,26 @@
 .el    .IP \(bu 2
 ..
 .ds n 5
-.na
-.hy 0
 .SH NAME
-\fBdel_curterm\fP,
-\fBmvcur\fP,
-\fBputp\fP,
-\fBrestartterm\fP,
-\fBset_curterm\fP,
-\fBsetupterm\fP,
-\fBtigetflag\fP,
-\fBtigetnum\fP,
-\fBtigetstr\fP,
-\fBtiparm\fP,
-\fBtiparm_s\fP,
-\fBtiscan_s\fP,
-\fBtparm\fP,
-\fBtputs\fP,
-\fBvid_attr\fP,
-\fBvid_puts\fP,
-\fBvidattr\fP,
-\fBvidputs\fP \- \fBcurses\fP interfaces to terminfo database
-.ad
-.hy
+\fB\%del_curterm\fP,
+\fB\%mvcur\fP,
+\fB\%putp\fP,
+\fB\%restartterm\fP,
+\fB\%set_curterm\fP,
+\fB\%setupterm\fP,
+\fB\%tigetflag\fP,
+\fB\%tigetnum\fP,
+\fB\%tigetstr\fP,
+\fB\%tiparm\fP,
+\fB\%tiparm_s\fP,
+\fB\%tiscan_s\fP,
+\fB\%tparm\fP,
+\fB\%tputs\fP,
+\fB\%vid_attr\fP,
+\fB\%vid_puts\fP,
+\fB\%vidattr\fP,
+\fB\%vidputs\fP \-
+\fIcurses\fR interfaces to \fIterminfo\fR database
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 153f348d9..c058a14d8 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,18 +28,15 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.37 2023/08/19 20:38:10 tom Exp $
-.TH curs_threads 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.41 2023/09/16 23:37:03 tom Exp $
+.TH curs_threads 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBcurs_threads\fP \- \fBcurses\fP thread support
-.ad
-.hy
+\fB\%curs_threads\fP \-
+\fIcurses\fR thread support
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index e1faa612e..46270aba3 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,19 +27,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.30 2023/07/01 15:46:10 tom Exp $
-.TH curs_touch 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: curs_touch.3x,v 1.34 2023/09/16 23:37:03 tom Exp $
+.TH curs_touch 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBtouchwin\fP,
-\fBtouchline\fP,
-\fBuntouchwin\fP,
-\fBwtouchln\fP,
-\fBis_linetouched\fP,
-\fBis_wintouched\fP \- \fBcurses\fP refresh control routines
-.ad
-.hy
+\fB\%touchwin\fP,
+\fB\%touchline\fP,
+\fB\%untouchwin\fP,
+\fB\%wtouchln\fP,
+\fB\%is_linetouched\fP,
+\fB\%is_wintouched\fP \-
+control terminal output refresh in a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 5117d3deb..add2b6be2 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,7 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.29 2023/07/01 15:46:10 tom Exp $
+.\" $Id: curs_trace.3x,v 1.35 2023/09/16 23:37:03 tom Exp $
+.TH curs_trace 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,25 +37,21 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_trace 3X 2023-07-01 "ncurses 6.4" "Library calls"
-.na
-.hy 0
 .SH NAME
-\fBcurses_trace\fP,
-\fBtrace\fP,
-\fB_tracef\fP,
-\fB_traceattr\fP,
-\fB_traceattr2\fP,
-\fB_tracecchar_t\fP,
-\fB_tracecchar_t2\fP,
-\fB_tracechar\fP,
-\fB_tracechtype\fP,
-\fB_tracechtype2\fP,
-\fB_nc_tracebits\fP,
-\fB_tracedump\fP,
-\fB_tracemouse\fP \- \fBcurses\fP debugging routines
-.ad
-.hy
+\fB\%curses_trace\fP,
+\fB\%trace\fP,
+\fB\%_tracef\fP,
+\fB\%_traceattr\fP,
+\fB\%_traceattr2\fP,
+\fB\%_tracecchar_t\fP,
+\fB\%_tracecchar_t2\fP,
+\fB\%_tracechar\fP,
+\fB\%_tracechtype\fP,
+\fB\%_tracechtype2\fP,
+\fB\%_nc_tracebits\fP,
+\fB\%_tracedump\fP,
+\fB\%_tracemouse\fP \-
+\fIcurses\fR debugging routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -199,8 +196,6 @@ These functions check the \fBNCURSES_TRACE\fP environment variable,
 to set the tracing feature as if \fBcurses_trace\fP was called:
 .RS 4
 .PP
-.na
-.hy 0
 filter,
 initscr,
 new_prescr,
@@ -214,8 +209,6 @@ tgetent,
 use_env,
 use_extended_names,
 use_tioctl
-.hy
-.ad
 .RE
 .SS Command-line Utilities
 The command-line utilities such as \fBtic\fP(1) provide a verbose option
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 4f741350b..6390749b5 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.73 2023/08/19 20:38:17 tom Exp $
-.TH curs_util 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.77 2023/09/16 23:37:03 tom Exp $
+.TH curs_util 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,23 +38,20 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBdelay_output\fP,
-\fBfilter\fP,
-\fBflushinp\fP,
-\fBgetwin\fP,
-\fBkey_name\fP,
-\fBkeyname\fP,
-\fBnofilter\fP,
-\fBputwin\fP,
-\fBunctrl\fP,
-\fBuse_env\fP,
-\fBuse_tioctl\fP,
-\fBwunctrl\fP \- miscellaneous \fBcurses\fP utility routines
-.ad
-.hy
+\fB\%delay_output\fP,
+\fB\%filter\fP,
+\fB\%flushinp\fP,
+\fB\%getwin\fP,
+\fB\%key_name\fP,
+\fB\%keyname\fP,
+\fB\%nofilter\fP,
+\fB\%putwin\fP,
+\fB\%unctrl\fP,
+\fB\%use_env\fP,
+\fB\%use_tioctl\fP,
+\fB\%wunctrl\fP \-
+miscellaneous \fIcurses\fR utility routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 4d5b684a5..62dccd093 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
-.TH curs_variables 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
+.TH curs_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,21 +38,17 @@
 .el    .IP \(bu 2
 ..
 .ds n 5
-.na
-.hy 0
 .SH NAME
-\fBCOLORS\fP,
-\fBCOLOR_PAIRS\fP,
-\fBCOLS\fP,
-\fBESCDELAY\fP,
-\fBLINES\fP,
-\fBTABSIZE\fP,
-\fBcurscr\fP,
-\fBnewscr\fP,
-\fBstdscr\fP
-\- \fBcurses\fP global variables
-.ad
-.hy
+\fB\%COLORS\fP,
+\fB\%COLOR_PAIRS\fP,
+\fB\%COLS\fP,
+\fB\%ESCDELAY\fP,
+\fB\%LINES\fP,
+\fB\%TABSIZE\fP,
+\fB\%curscr\fP,
+\fB\%newscr\fP,
+\fB\%stdscr\fP \-
+\fIcurses\fR global variables
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 8215a066c..931372db1 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,28 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.32 2023/07/01 15:46:10 tom Exp $
-.TH curs_window 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
+.TH curs_window 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.na
-.hy 0
 .SH NAME
-\fBnewwin\fP,
-\fBdelwin\fP,
-\fBmvwin\fP,
-\fBsubwin\fP,
-\fBderwin\fP,
-\fBmvderwin\fP,
-\fBdupwin\fP,
-\fBwsyncup\fP,
-\fBsyncok\fP,
-\fBwcursyncup\fP,
-\fBwsyncdown\fP \- create \fBcurses\fP windows
-.ad
-.hy
+\fB\%newwin\fP,
+\fB\%delwin\fP,
+\fB\%mvwin\fP,
+\fB\%subwin\fP,
+\fB\%derwin\fP,
+\fB\%mvderwin\fP,
+\fB\%dupwin\fP,
+\fB\%wsyncup\fP,
+\fB\%syncok\fP,
+\fB\%wcursyncup\fP,
+\fB\%wsyncdown\fP \-
+create and manipulate \fIcurses\fR windows
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/default_colors.3x b/man/default_colors.3x
index f60740e49..8ffb6ed46 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,15 +29,16 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.38 2023/08/19 19:48:15 tom Exp $
-.TH default_colors 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.41 2023/09/16 23:37:03 tom Exp $
+.TH default_colors 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBuse_default_colors\fP,
-\fBassume_default_colors\fP \- use terminal's default colors
+\fB\%use_default_colors\fP,
+\fB\%assume_default_colors\fP \-
+use terminal's default colors
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/define_key.3x b/man/define_key.3x
index f2962d8b9..d4ac62f41 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH define_key 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
+.TH define_key 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBdefine_key\fP \- define a keycode
+\fB\%define_key\fP \-
+define a \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/form.3x b/man/form.3x
index ff81a43db..b91314b22 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.43 2023/08/19 20:38:32 tom Exp $
-.TH form 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.45 2023/09/16 23:37:03 tom Exp $
+.TH form 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBform\fP \- curses extension for programming forms
+\fBform\fP \-
+curses extension for programming forms
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .SH DESCRIPTION
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index 338fc902f..e984bd5eb 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.21 2023/07/01 15:46:10 tom Exp $
-.TH form_cursor 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
+.TH form_cursor 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBpos_form_cursor\fP \- position a form window cursor
+\fBpos_form_cursor\fP \-
+position a form window cursor
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_data.3x b/man/form_data.3x
index ce4287549..fdc18d6d1 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH form_data 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.24 2023/09/16 23:37:03 tom Exp $
+.TH form_data 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
-\fBdata_behind\fP \- test for off-screen data in given forms
+\fBdata_behind\fP \-
+test for off-screen data in given forms
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 9824f9867..ff079dea0 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,15 +28,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.45 2023/08/19 20:38:39 tom Exp $
-.TH form_driver 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.47 2023/09/16 23:37:03 tom Exp $
+.TH form_driver 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
 \fBform_driver\fP,
-\fBform_driver_w\fP \- command-processing loop of the form system
+\fBform_driver_w\fP \-
+command-processing loop of the form system
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field.3x b/man/form_field.3x
index 3161de5be..92e300457 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH form_field 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
+.TH form_field 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBform_field\fP \- make and break connections between fields and forms
+\fBform_field\fP \-
+make and break connections between fields and forms
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index 6cae1f373..fa3f7f1cf 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,14 +28,15 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH form_field_attributes 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_attributes.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
+.TH form_field_attributes 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
-\fBform_field_attributes\fP \- color and attribute control for form fields
+\fBform_field_attributes\fP \-
+color and attribute control for form fields
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 8a484a1c5..5e85c3fd1 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.34 2023/07/01 15:46:10 tom Exp $
-.TH form_field_buffer 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
+.TH form_field_buffer 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBform_field_buffer\fP \- field buffer control
+\fBform_field_buffer\fP \-
+field buffer control
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index 2c18bc789..3465ddaed 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,15 +28,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
-.TH form_field_info 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_info.3x,v 1.24 2023/09/16 23:39:54 tom Exp $
+.TH form_field_info 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
 \fBdynamic_field_info\fP,
-\fBfield_info\fP \- retrieve field characteristics
+\fBfield_info\fP \-
+retrieve field characteristics
 .SH SYNOPSIS
 .nf
 \fB#include <form.h>\fP
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index 6cd1f327f..fc9cb4bbf 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -28,15 +28,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH form_field_just 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_just.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
+.TH form_field_just 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
 \fBset_field_just\fP,
-\fBfield_just\fP \- retrieve field characteristics
+\fBfield_just\fP \-
+retrieve field characteristics
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 4c9efcab5..f8dfb98ab 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -28,13 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.31 2023/07/01 15:46:10 tom Exp $
-.TH form_field_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.33 2023/09/16 23:37:03 tom Exp $
+.TH form_field_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
 \fBlink_field\fP,
-\fBfree_field\fP \- create and destroy form fields
+\fBfree_field\fP \-
+create and destroy form fields
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 3edac10d3..2649cc42f 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -28,13 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.34 2023/07/01 15:46:10 tom Exp $
-.TH form_field_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
+.TH form_field_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
 \fBfield_opts_off\fP,
-\fBfield_opts\fP \- set and get field options
+\fBfield_opts\fP \-
+set and get field options
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 4c760673e..e01edf01b 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH form_field_userptr 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.22 2023/09/16 23:39:54 tom Exp $
+.TH form_field_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
-\fBfield_userptr\fP \- associate application data with a form field
+\fBfield_userptr\fP \-
+associate application data with a form field
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index f46abec97..93cfd858f 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.40 2023/07/01 15:46:10 tom Exp $
-.TH form_field_validation 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
+.TH form_field_validation 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,7 +38,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBform_field_validation\fP \- data type validation for fields
+\fBform_field_validation\fP \-
+data type validation for fields
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
@@ -82,7 +83,7 @@ Most field types are configurable,
 via arguments which the caller provides when calling \fBset_field_type\fP.
 .PP
 Several field types are predefined by the form library.
-.SS Predefined types
+.SH PREDEFINED TYPES
 It is possible to set up new programmer-defined field types.
 Field types are implemented via the \fBFIELDTYPE\fP data
 structure, which contains several pointers to functions.
@@ -92,27 +93,19 @@ which describes functions which can be used to construct
 a field-type dynamically.
 .PP
 The predefined types are as follows:
-.TP 5
-TYPE_ALNUM
+.SS TYPE_ALNUM
 Alphanumeric data.
 Required parameter:
-.RS
 .bP
 a third \fBint\fP argument, a minimum field width.
-.RE
-.TP 5
-TYPE_ALPHA
+.SS TYPE_ALPHA
 Character data.
 Required parameter:
-.RS
 .bP
 a third \fBint\fP argument, a minimum field width.
-.RE
-.TP 5
-TYPE_ENUM
+.SS TYPE_ENUM
 Accept one of a specified set of strings.
 Required parameters:
-.RS
 .bP
 a third \fB(char **)\fP argument pointing to a string list;
 .bP
@@ -122,15 +115,12 @@ a fifth \fBint\fP flag argument specifying whether a partial
 match must be a unique one.
 If this flag is off, a prefix matches the first
 of any set of more than one list elements with that prefix.
-.RE
-.IP
+.PP
 The library copies the string list,
 so you may use a list that lives in automatic variables on the stack.
-.TP 5
-TYPE_INTEGER
+.SS TYPE_INTEGER
 Integer data, parsable to an integer by \fBatoi\fP(3).
 Required parameters:
-.RS
 .bP
 a third \fBint\fP argument controlling the precision,
 .bP
@@ -139,18 +129,15 @@ a fourth \fBlong\fP argument constraining minimum value,
 a fifth \fBlong\fP constraining maximum value.
 If the maximum value is less than or equal to the minimum value, the range is
 simply ignored.
-.RE
-.IP
+.PP
 On return, the field buffer is formatted according to the
 \fBprintf\fP format specification \*(``.*ld\*('',
 where the \*(``*\*('' is replaced by the precision argument.
-.IP
+.PP
 For details of the precision handling see \fBprintf\fP(3).
-.TP 5
-TYPE_NUMERIC
+.SS TYPE_NUMERIC
 Numeric data (may have a decimal-point part).
 Required parameters:
-.RS
 .bP
 a third \fBint\fP argument controlling the precision,
 .bP
@@ -161,26 +148,22 @@ If your system supports locales,
 the decimal point character must be the one specified by your locale.
 If the maximum value is less than or equal to the minimum value,
 the range is simply ignored.
-.RE
-.IP
+.PP
 On return, the field buffer is formatted according to the
 \fBprintf\fP format specification \*(``.*f\*('',
 where the \*(``*\*('' is replaced by the precision argument.
-.IP
+.PP
 For details of the precision handling see \fBprintf\fP(3).
-.TP 5
-TYPE_REGEXP
+.SS TYPE_REGEXP
 Regular expression data.
 Required parameter:
-.RS
 .bP
 a third argument, a regular expression \fB(char *)\fP string.
 The data is valid if the regular expression matches it.
-.RE
-.IP
+.PP
 Regular expressions
 are in the format of \fBregcomp\fP and \fBregexec\fP.
-.IP
+.PP
 The regular expression must match the whole field.
 If you have for example, an eight character wide field,
 a regular expression "^[0\-9]*$" always
@@ -190,20 +173,17 @@ you may use for example "^[0\-9]* *$" which is good for
 trailing spaces (up to an empty field),
 or "^ *[0\-9]* *$" which is good for
 leading and trailing spaces around the digits.
-.TP 5
-TYPE_IPV4
+.SS TYPE_IPV4
 An Internet Protocol Version 4 address.
 Required parameter:
-.RS
 .bP
 none
-.RE
-.IP
+.PP
 The form library checks whether or not the buffer has the form \fIa.b.c.d\fP,
 where \fIa\fP, \fIb\fP, \fIc\fP, and \fId\fP are numbers in the range 0 to 255.
 Trailing blanks in the buffer are ignored.
 The address itself is not validated.
-.IP
+.PP
 This is an ncurses extension;
 this field type may not be available in other curses implementations.
 .SH RETURN VALUE
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 730ebc910..4063baf01 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -28,14 +28,15 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.35 2023/07/01 15:46:10 tom Exp $
+.\" $Id: form_fieldtype.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
+.TH form_fieldtype 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH form_fieldtype 3X 2023-07-01 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBform_fieldtype\fP \- define validation-field types
+\fBform_fieldtype\fP \-
+define validation-field types
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 010d48e18..54a0f6328 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
-.TH form_hook 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
+.TH form_hook 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBform_hook\fP \- set hooks for automatic invocation by applications
+\fBform_hook\fP \-
+set hooks for automatic invocation by applications
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
@@ -53,27 +54,28 @@
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBform_driver\fP.
-.PP
-The function \fBset_field_init\fP sets a hook to be called at form-post time
+.SS set_field_init\fP
+sets a hook to be called at form-post time
 and each time the selected field changes (after the change).
-\fBfield_init\fP
+.SS field_init
 returns the current field init hook, if any (\fBNULL\fP if there is no such
 hook).
-.PP
-The function \fBset_field_term\fP sets a hook to be called at form-unpost time
+.SS set_field_term
+sets a hook to be called at form-unpost time
 and each time the selected field changes (before the change).
-\fBfield_term\fP
+.SS field_term
 returns the current field term hook, if any (\fBNULL\fP if there is no such
 hook).
-.PP
-The function \fBset_form_init\fP sets a hook to be called at form-post time and
+.SS set_form_init
+sets a hook to be called at form-post time and
 just after a page change once it is posted.
-\fBform_init\fP returns the
-current form init hook, if any (\fBNULL\fP if there is no such hook).
-.PP
-The function \fBset_form_term\fP sets a hook to be called at form-unpost time
+.SS form_init
+returns the current form init hook,
+if any (\fBNULL\fP if there is no such hook).
+.SS set_form_term
+sets a hook to be called at form-unpost time
 and just before a page change once it is posted.
-\fBform_init\fP
+.SS form_init
 returns the current form term hook, if any (\fBNULL\fP if there is no such
 hook).
 .SH RETURN VALUE
diff --git a/man/form_new.3x b/man/form_new.3x
index fae1f0b05..b2a992c37 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH form_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.24 2023/09/16 23:37:03 tom Exp $
+.TH form_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
-\fBfree_form\fP \- create and destroy forms
+\fBfree_form\fP \-
+create and destroy forms
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 7f41c2f9b..3b93b1e0e 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -28,15 +28,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH form_new_page 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_new_page.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
+.TH form_new_page 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
 .SH NAME
 \fBset_new_page\fP,
-\fBnew_page\fP \- form pagination functions
+\fBnew_page\fP \-
+form pagination functions
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_opts.3x b/man/form_opts.3x
index f108605ad..eb72f8625 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -28,13 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH form_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
+.TH form_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
 \fBform_opts_off\fP,
-\fBform_opts\fP \- set and get form options
+\fBform_opts\fP \-
+set and get form options
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_page.3x b/man/form_page.3x
index 36d0b1d87..5a9c1835c 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
-.TH form_page 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
+.TH form_page 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBform_page\fP \- set and get form page number
+\fBform_page\fP \-
+set and get form page number
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_post.3x b/man/form_post.3x
index e7e6733fb..471b88d48 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
-.TH form_post 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
+.TH form_post 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
-\fBunpost_form\fP \- write or erase forms from associated subwindows
+\fBunpost_form\fP \-
+write or erase forms from associated subwindows
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index df2245029..dbd973096 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
-.TH form_requestname 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
+.TH form_requestname 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
-\fBform_request_name\fP \- handle printable form request names
+\fBform_request_name\fP \-
+handle printable form request names
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
@@ -40,10 +41,8 @@
 .br
 \fBint form_request_by_name(const char *\fIname\fB);\fR
 .SH DESCRIPTION
-.SS form_request_name
 The function \fBform_request_name\fP returns the printable name of a form
 request code.
-.SS form_request_name_by_name
 The function \fBform_request_by_name\fP searches in the name-table for a request
 with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index d424dc58a..e7d9216f4 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
-.TH form_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
+.TH form_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
-\fBform_userptr\fP \- associate application data with a form item
+\fBform_userptr\fP \-
+associate application data with a form item
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/form_variables.3x b/man/form_variables.3x
index 1f97fef47..54a1d65fa 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+.\" Copyright 2020-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2010-2013,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_variables.3x,v 1.10 2021/12/25 21:50:36 tom Exp $
-.TH form_variables 3X 2021-12-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_variables.3x,v 1.12 2023/09/16 23:39:54 tom Exp $
+.TH form_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
@@ -38,8 +38,8 @@
 \fBTYPE_INTEGER\fP,
 \fBTYPE_IPV4\fP,
 \fBTYPE_NUMERIC\fP,
-\fBTYPE_REGEXP\fP
-\- form system global variables
+\fBTYPE_REGEXP\fP \-
+form system global variables
 .ad
 .hy
 .SH SYNOPSIS
diff --git a/man/form_win.3x b/man/form_win.3x
index ba9e3687c..c7cf800aa 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH form_win 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
+.TH form_win 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBform_win\fP \- make and break form window and subwindow associations
+\fBform_win\fP \-
+make and break form window and subwindow associations
 .SH SYNOPSIS
 \fB#include <form.h>\fP
 .sp
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 582cd7ecc..2da87669b 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp $
-.TH @INFOCMP@ 1M 2023-09-09 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.92 2023/09/16 23:37:03 tom Exp $
+.TH @INFOCMP@ 1M 2023-09-16 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -60,7 +60,8 @@
 ..
 .ds d @TERMINFO@
 .SH NAME
-\fB@INFOCMP@\fP \- compare or print out \fIterminfo\fP descriptions
+\fB@INFOCMP@\fP \-
+compare or print out \fIterminfo\fP descriptions
 .SH SYNOPSIS
 \fB@INFOCMP@\fP [\fB\-\
 1\
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 12820720d..1d74088a0 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,12 +28,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.21 2022/02/12 20:02:20 tom Exp $
-.TH @INFOTOCAP@ 1M 2022-02-12 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.26 2023/09/16 23:38:39 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-09-16 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-\fB@INFOTOCAP@\fP \- convert a \fIterminfo\fP description into a \fItermcap\fP description
+\fB\%@INFOTOCAP@\fP \-
+convert a \fIterminfo\fR description into a \fItermcap\fR description
 .SH SYNOPSIS
 \fB@INFOTOCAP@\fR [\fB\-v\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
 .SH DESCRIPTION
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 5614e1ce8..5e140551d 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
-.TH key_defined 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.20 2023/09/16 23:38:39 tom Exp $
+.TH key_defined 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBkey_defined\fP \- check if a keycode is defined
+\fB\%key_defined\fP \-
+test whether a \fIcurses\fR keycode is defined
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -47,8 +48,8 @@ If no keycode is bound, zero is returned.
 If the string conflicts with longer strings
 which are bound to keys, \-1 is returned.
 .SH PORTABILITY
-These routines are specific to ncurses.
-They were not supported on
+This routine is specific to ncurses.
+It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
diff --git a/man/keybound.3x b/man/keybound.3x
index 76825c4c0..b2dde39c3 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.15 2022/02/12 20:03:40 tom Exp $
-.TH keybound 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.21 2023/09/16 23:38:39 tom Exp $
+.TH keybound 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBkeybound\fP \- return definition of keycode
+\fB\%keybound\fP \-
+get definition of \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -49,8 +50,8 @@ through multiple definitions, counting from zero.
 When successful,
 the function returns a string which must be freed by the caller.
 .SH PORTABILITY
-These routines are specific to ncurses.
-They were not supported on
+This routine is specific to ncurses.
+It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
diff --git a/man/keyok.3x b/man/keyok.3x
index f69c82e62..7bc1d9114 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
-.TH keyok 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
+.TH keyok 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBkeyok\fP \- enable or disable a keycode
+\fB\%keyok\fP \-
+enable or disable a \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
@@ -49,8 +50,8 @@ If the \fIenable\fP parameter is true, then the key must have been disabled,
 and vice versa.
 Otherwise, the function returns \fBOK\fP.
 .SH PORTABILITY
-These routines are specific to ncurses.
-They were not supported on
+This routine is specific to ncurses.
+It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 57d88d80a..6dfe1bb8c 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.12 2022/02/12 20:07:56 tom Exp $
-.TH legacy_coding 3X 2022-02-12 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.17 2023/09/16 23:38:39 tom Exp $
+.TH legacy_coding 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBuse_legacy_coding\fP \- override locale-encoding checks
+\fB\%use_legacy_coding\fP \-
+override \fIcurses\fR locale encoding checks
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 09b055f2f..2f09cbbec 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,6 +1,6 @@
-# $Id: manlinks.sed,v 1.15 2021/01/05 20:30:00 tom Exp $
+# $Id: manlinks.sed,v 1.19 2023/09/17 08:26:33 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -31,6 +31,9 @@
 # listed in the "NAME" section, i.e., the names that we would like to use
 # as aliases for the manpage -T.Dickey
 #
+# workaround for manpages without a SYNOPSIS
+s/^\.\\"SH/.SH/
+#
 # eliminate formatting controls that get in the way
 /^'\\"/d
 /\.\\"/d
@@ -39,12 +42,13 @@
 /typedef/d
 s/^\.IX//
 s/\\f.//g
+s/\\%//g
 s/[:,]/ /g
 #
 # ignore C-style comments
 s%/\*.*\*/%%
 #
-# eliminate unnecessary whitespace, convert multiple blanks to single space
+# Eliminate unnecessary whitespace, convert multiple blanks to single space.
 s/^[ 	][ 	]*//
 s/[ 	][ 	]*$//
 s/[ 	][ 	]*/ /g
@@ -54,16 +58,16 @@ s/[ 	][ 	]*/ /g
 s/\.SH[ 	][ 	]*/.SH_(/
 #
 # in ".SH NAME"
-# change "\-" to "-", eliminate text after "-", and split the remaining lines
-# at each space, making a list of names:
-/^\.SH_(NAME/,/^\.SH_(SYNOPSIS/{
-s/\\-.*/ -/
-/ -/{
-s/ -.*//
-s/ /\
-/g
-}
-/^-/{
+# Convert a list of names separated from their description by " \-" to a list
+# of names on separate lines.  Normally the list is also comma-separated, but
+# we ignore that detail here.  The description is on a separate line to make
+# the nroff source more pleasing to some eyes.
+/^\.SH_(NAME/,/ \\-$/{
+s/\\-/-/g
+s/  / /g
+/ -$/{
+s/ -$//
+n
 d
 }
 s/ /\
@@ -71,9 +75,14 @@ s/ /\
 }
 #
 # in ".SH SYNOPSIS"
-# remove any line that does not contain a '(', since we only want functions.
+# For readability, the NAME section may not contain all function names, but we
+# still want to make aliases for those.  Do this by extracting names from the
+# list of function prototypes in the synopsis.
+#
+# Remove any line that does not contain a '(', since we only want functions. 
 # then strip off return-type of each function.
-# finally, remove the parameter list, which begins with a '('.
+#
+# Finally, remove the parameter list, which begins with a '('.
 /^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
 /^[^(]*$/d
 # reduce
diff --git a/man/menu.3x b/man/menu.3x
index 4b114c48c..fa7b03ac6 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.34 2023/08/19 20:39:40 tom Exp $
-.TH menu 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.36 2023/09/16 23:38:39 tom Exp $
+.TH menu 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBmenu\fP \- curses extension for programming menus
+\fBmenu\fP \-
+curses extension for programming menus
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .SH DESCRIPTION
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index dac377dd3..7a35f0233 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
-.TH menu_attributes 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_attributes.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
+.TH menu_attributes 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,7 +42,8 @@
 \fBset_menu_back\fP,
 \fBset_menu_fore\fP,
 \fBset_menu_grey\fP,
-\fBset_menu_pad\fP \- color and attribute control for menus
+\fBset_menu_pad\fP \-
+color and attribute control for menus
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index eea54c6d9..d7e8e2882 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.20 2023/07/01 15:46:10 tom Exp $
-.TH menu_cursor 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.22 2023/09/16 23:38:39 tom Exp $
+.TH menu_cursor 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBpos_menu_cursor\fP \- position a menu's cursor
+\fBpos_menu_cursor\fP \-
+position a menu's cursor
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 7709952ff..9891e4a13 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,14 +27,15 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.35 2023/07/01 15:46:10 tom Exp $
-.TH menu_driver 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.37 2023/09/16 23:38:39 tom Exp $
+.TH menu_driver 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBmenu_driver\fP \- command-processing loop of the menu system
+\fBmenu_driver\fP \-
+command-processing loop of the menu system
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_format.3x b/man/menu_format.3x
index 0d5ab6ae1..ebe79b488 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH menu_format 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
+.TH menu_format 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
-\fBmenu_format\fP \- set and get menu sizes
+\fBmenu_format\fP \-
+set and get menu sizes
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 3d0533c60..a3b53d9be 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH menu_hook 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
+.TH menu_hook 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmenu_hook\fP \- set hooks for automatic invocation by applications
+\fBmenu_hook\fP \-
+set hooks for automatic invocation by applications
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 056b22b86..79d383e60 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -28,12 +28,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH menu_items 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
+.TH menu_items 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
-\fBitem_count\fP \- make and break connections between items and menus
+\fBitem_count\fP \-
+make and break connections between items and menus
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index f3afa95ec..087832b19 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH menu_mark 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
+.TH menu_mark 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
-\fBmenu_mark\fP \- get and set the menu mark string
+\fBmenu_mark\fP \-
+get and set the menu mark string
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_new.3x b/man/menu_new.3x
index bd3800a4b..7793102dd 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH menu_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
+.TH menu_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
-\fBfree_menu\fP \- create and destroy menus
+\fBfree_menu\fP \-
+create and destroy menus
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 2ed1a8267..471d153aa 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -28,13 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH menu_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
+.TH menu_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
 \fBmenu_opts_off\fP,
-\fBmenu_opts\fP \- set and get menu options
+\fBmenu_opts\fP \-
+set and get menu options
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index 1e3c0a878..fb5372baa 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,11 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.28 2023/07/01 15:46:10 tom Exp $
-.TH menu_pattern 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.30 2023/09/16 23:38:39 tom Exp $
+.TH menu_pattern 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
-\fBmenu_pattern\fP \- set and get a menu's pattern buffer
+\fBmenu_pattern\fP \-
+set and get a menu's pattern buffer
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_post.3x b/man/menu_post.3x
index ba618f525..15f232a64 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
-.TH menu_post 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
+.TH menu_post 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
-\fBunpost_menu\fP \- write or erase menus from associated subwindows
+\fBunpost_menu\fP \-
+write or erase menus from associated subwindows
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index c2ffc617c..146a45b00 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH menu_requestname 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
+.TH menu_requestname 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
-\fBmenu_request_name\fP \- handle printable menu request names
+\fBmenu_request_name\fP \-
+handle printable menu request names
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 8c5ef7474..9edc191ee 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH menu_spacing 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
+.TH menu_spacing 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
-\fBmenu_spacing\fP \- set and get spacing between menu items.
+\fBmenu_spacing\fP \-
+set and get spacing between menu items.
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 36bf47f42..31aa9f326 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
-.TH menu_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.25 2023/09/16 23:38:39 tom Exp $
+.TH menu_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
-\fBmenu_userptr\fP \- associate application data with a menu item
+\fBmenu_userptr\fP \-
+associate application data with a menu item
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/menu_win.3x b/man/menu_win.3x
index af95f3b2f..47e5bac28 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH menu_win 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
+.TH menu_win 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmenu_win\fP \- make and break menu window and subwindow associations
+\fBmenu_win\fP \-
+make and break menu window and subwindow associations
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 6cac7496b..456b02849 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.27 2023/07/01 15:46:10 tom Exp $
-.TH mitem_current 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.29 2023/09/16 23:38:39 tom Exp $
+.TH mitem_current 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmitem_current\fP \- set and get current_menu_item
+\fBmitem_current\fP \-
+set and get current_menu_item
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 362a076f3..475a541f2 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.21 2023/07/01 15:46:10 tom Exp $
-.TH mitem_name 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.23 2023/09/16 23:38:39 tom Exp $
+.TH mitem_name 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
-\fBitem_description\fP \- get menu item name and description fields
+\fBitem_description\fP \-
+get menu item name and description fields
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index f75553746..51d149457 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.26 2023/07/01 15:46:10 tom Exp $
-.TH mitem_new 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
+.TH mitem_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
-\fBfree_item\fP \- create and destroy menu items
+\fBfree_item\fP \-
+create and destroy menu items
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 485dc9e14..36ac3062f 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -28,13 +28,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.23 2023/07/01 15:46:10 tom Exp $
-.TH mitem_opts 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.25 2023/09/16 23:38:39 tom Exp $
+.TH mitem_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
 \fBitem_opts_off\fP,
-\fBitem_opts\fP \- set and get menu item options
+\fBitem_opts\fP \-
+set and get menu item options
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index 76848812a..7cfe7ae19 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -28,11 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH mitem_userptr 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
+.TH mitem_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
-\fBitem_userptr\fP \- associate application data with a menu item
+\fBitem_userptr\fP \-
+associate application data with a menu item
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 15751e74a..684591c0f 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,11 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.22 2023/07/01 15:46:10 tom Exp $
-.TH mitem_value 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
+.TH mitem_value 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
-\fBitem_value\fP \- set and get menu item values
+\fBitem_value\fP \-
+set and get menu item values
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 865a9d9d1..b2efded5d 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -28,10 +28,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.17 2023/07/01 15:46:10 tom Exp $
-.TH mitem_visible 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.19 2023/09/16 23:38:39 tom Exp $
+.TH mitem_visible 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmitem_visible\fP \- check visibility of a menu item
+\fBmitem_visible\fP \-
+check visibility of a menu item
 .SH SYNOPSIS
 \fB#include <menu.h>\fP
 .sp
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 5bd9d5f52..10878e1cf 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,9 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp $
-.hy 0
-.TH ncurses 3X 2023-09-09 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.171 2023/09/16 23:38:39 tom Exp $
+.TH ncurses 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -61,7 +60,8 @@
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-\fBncurses\fP \- CRT screen handling and optimization package
+\fB\%ncurses\fP \-
+character-cell terminal interface with optimized output
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .SH DESCRIPTION
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 38203fd86..772d09eb0 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp $
-.TH new_pair 3X 2023-09-09 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.30 2023/09/16 23:38:39 tom Exp $
+.TH new_pair 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -59,9 +59,10 @@
 .el    .in -2
 ..
 .SH NAME
-\fBalloc_pair\fP,
-\fBfind_pair\fP,
-\fBfree_pair\fP \- new curses color-pair functions
+\fB\%alloc_pair\fP,
+\fB\%find_pair\fP,
+\fB\%free_pair\fP \-
+dynamically allocate \fIcurses\fR color pairs
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/panel.3x b/man/panel.3x
index fded6f2c6..56ea1cd27 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.48 2023/08/19 21:01:21 tom Exp $
-.TH panel 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.50 2023/09/16 23:38:39 tom Exp $
+.TH panel 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,7 +38,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-panel \- panel stack extension for curses
+panel \-
+panel stack extension for curses
 .SH SYNOPSIS
 \fB#include <panel.h>\fP
 .P
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 3830c92eb..73b8d3f03 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,16 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.36 2023/07/01 15:46:10 tom Exp $
-.TH resizeterm 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.40 2023/09/16 23:38:39 tom Exp $
+.TH resizeterm 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fBis_term_resized\fP,
-\fBresize_term\fP,
-\fBresizeterm\fP \- change the curses terminal size
+\fB\%is_term_resized\fP,
+\fB\%resize_term\fP,
+\fB\%resizeterm\fP \-
+manage the terminal dimensions understood by \fIcurses\fR
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 2a2203be5..5eaa7f799 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp $
-.TH scr_dump 5 2023-09-09 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.31 2023/09/16 23:38:39 tom Exp $
+.TH scr_dump 5 2023-09-16 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -57,7 +57,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-scr_dump \- format of curses screen-dumps.
+scr_dump \-
+\fIcurses\fR screen dump
 .SH SYNOPSIS
 .B scr_dump
 .SH DESCRIPTION
diff --git a/man/tabs.1 b/man/tabs.1
index 8b83c1d0d..f406eeb8a 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp $
-.TH @TABS@ 1 2023-09-09 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.44 2023/09/16 23:38:39 tom Exp $
+.TH @TABS@ 1 2023-09-16 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -58,7 +58,8 @@
 .el    .in -2
 ..
 .SH NAME
-\fB@TABS@\fP \- set tabs on a terminal
+\fB\%@TABS@\fP \-
+set terminal tab stops
 .SH SYNOPSIS
 \fB@TABS@\fP [\fIoptions\fP]] \fI[tabstop-list]\fP
 .SH DESCRIPTION
diff --git a/man/term.5 b/man/term.5
index d8ba7ac72..2db2d5028 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp $
-.TH term 5 2023-09-09 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.56 2023/09/16 23:38:39 tom Exp $
+.TH term 5 2023-09-16 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -59,7 +59,8 @@
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-term \- format of compiled term file.
+term \-
+compiled \fIterminfo\fR terminal description
 .SH SYNOPSIS
 .B term
 .SH DESCRIPTION
diff --git a/man/term.7 b/man/term.7
index 6b52ce299..b6a4da946 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.35 2023/07/01 15:46:10 tom Exp $
-.TH term 7 2023-07-01 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.36 2023/09/17 00:10:28 tom Exp $
+.TH term 7 2023-09-16 "ncurses 6.4" Miscellaneous
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -36,7 +36,9 @@
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-term \- conventions for naming terminal types
+term \-
+conventions for naming terminal types
+.\"SH SYNOPSIS
 .SH DESCRIPTION
 The environment variable \fBTERM\fP should normally contain the type name of
 the terminal, console or display-device type you are using.
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 68028cb09..fe81b6605 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp $
-.TH term_variables 3X 2023-09-09 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
+.TH term_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -39,25 +39,21 @@
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
-.na
-.hy 0
 .SH NAME
-\fBSP\fP,
-\fBacs_map\fP,
-\fBboolcodes\fP,
-\fBboolfnames\fP,
-\fBboolnames\fP,
-\fBcur_term\fP,
-\fBnumcodes\fP,
-\fBnumfnames\fP,
-\fBnumnames\fP,
-\fBstrcodes\fP,
-\fBstrfnames\fP,
-\fBstrnames\fP,
-\fBttytype\fP
-\- \fBcurses\fP terminfo global variables
-.ad
-.hy
+\fB\%SP\fP,
+\fB\%acs_map\fP,
+\fB\%boolcodes\fP,
+\fB\%boolfnames\fP,
+\fB\%boolnames\fP,
+\fB\%cur_term\fP,
+\fB\%numcodes\fP,
+\fB\%numfnames\fP,
+\fB\%numnames\fP,
+\fB\%strcodes\fP,
+\fB\%strfnames\fP,
+\fB\%strnames\fP,
+\fB\%ttytype\fP \-
+\fIterminfo\fR global variables
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
diff --git a/man/terminfo.head b/man/terminfo.head
index ab24174e9..b114b4d89 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp $
-.TH terminfo 5 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.51 2023/09/17 08:29:38 tom Exp $
+.TH terminfo 5 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ds n 5
 .ds d @TERMINFO@
 .ie \n(.g .ds `` \(lq
@@ -63,7 +63,8 @@
 .el    .in -2
 ..
 .SH NAME
-terminfo \- terminal capability database
+\fB\%terminfo\fP \-
+terminal capability database
 .SH SYNOPSIS
 \*d/*/*
 .SH DESCRIPTION
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 05c0426af..2ce4c1bb4 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp $
+.\" $Id: terminfo.tail,v 1.131 2023/09/16 17:01:55 Branden.Robinson Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -2092,6 +2092,9 @@ Supports both the SVr4 set and the AIX extensions.
 .TP 25
 \*d/?/*
 files containing terminal descriptions
+.SH AUTHORS
+Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
+Based on \fIpcurses\fP by Pavel Curtis.
 .SH SEE ALSO
 .na
 .hy 0
@@ -2105,6 +2108,3 @@ files containing terminal descriptions
 \fBterm_variables\fP(3X).
 \fBterm\fP(\*n).
 \fBuser_caps\fP(5).
-.SH AUTHORS
-Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
-Based on \fIpcurses\fP by Pavel Curtis.
diff --git a/man/tic.1m b/man/tic.1m
index ce8b00438..d9bb24bf8 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.89 2023/09/02 22:29:35 tom Exp $
-.TH @TIC@ 1M 2023-09-02 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.93 2023/09/16 23:38:39 tom Exp $
+.TH @TIC@ 1M 2023-09-16 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -40,7 +40,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fB@TIC@\fP \- the \fIterminfo\fP entry-description compiler
+\fB\%@TIC@\fP \-
+compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR
 .SH SYNOPSIS
 \fB@TIC@\fP
 [\fB\-\
diff --git a/man/toe.1m b/man/toe.1m
index f67566b74..c0325e813 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp $
-.TH @TOE@ 1M 2023-09-09 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.46 2023/09/16 23:38:39 tom Exp $
+.TH @TOE@ 1M 2023-09-16 "ncurses 6.4" "User commands"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -59,7 +59,8 @@
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
-\fB@TOE@\fP \- table of (terminfo) entries
+\fB\%@TOE@\fP \-
+list table of entries of \fIterminfo\fR terminal types
 .SH SYNOPSIS
 \fB@TOE@\fP [\fB\-v\fP[\fIn\fP]] [\fB\-ahsuUV\fP] \fIfile...\fP
 .SH DESCRIPTION
diff --git a/man/tput.1 b/man/tput.1
index 5ee14d5c0..93cf0e029 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.79 2023/07/01 15:46:10 tom Exp $
-.TH @TPUT@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.83 2023/09/16 23:38:39 tom Exp $
+.TH @TPUT@ 1 2023-09-16 "ncurses 6.4" "User commands"
 .ds d @TERMINFO@
 .ds n 1
 .ie \n(.g .ds `` \(lq
@@ -41,7 +41,9 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fB@TPUT@\fP, \fBreset\fP \- initialize a terminal or query terminfo database
+\fB\%@TPUT@\fP,
+\fB\%reset\fP \-
+initialize a terminal or query \fIterminfo\fR database
 .SH SYNOPSIS
 \fB@TPUT@\fR [\fB\-T\fItype\fR] \fIcapname\fR [\fIparameters\fR]
 .br
diff --git a/man/tset.1 b/man/tset.1
index 92268f67d..92d91a35e 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.66 2023/07/01 15:21:06 tom Exp $
-.TH @TSET@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.69 2023/09/16 23:38:39 tom Exp $
+.TH @TSET@ 1 2023-09-16 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -38,7 +38,9 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fB@TSET@\fP, \fB@RESET@\fP \- terminal initialization
+\fB\%@TSET@\fP,
+\fB\%@RESET@\fP \-
+initialize or reset terminal state
 .SH SYNOPSIS
 \fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP]
 .br
diff --git a/man/user_caps.5 b/man/user_caps.5
index 0ca74be88..8e19116b3 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp $
-.TH user_caps 5 2023-09-09 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.36 2023/09/16 23:38:39 tom Exp $
+.TH user_caps 5 2023-09-16 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,7 +39,8 @@
 .el    .IP \(bu 2
 ..
 .SH NAME
-user_caps \- user-defined terminfo capabilities
+user_caps \-
+user-defined \fIterminfo\fR capability format
 .SH SYNOPSIS
 .B @TIC@ -x, @INFOCMP@ -x
 .SH DESCRIPTION
diff --git a/man/wresize.3x b/man/wresize.3x
index c52970ea4..c07f284fb 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,10 +29,11 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH wresize 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
+.TH wresize 3X 2023-09-16 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBwresize\fP \- resize a curses window
+\fB\%wresize\fP \-
+resize a \fIcurses\fR window
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .sp
diff --git a/menu/m_global.c b/menu/m_global.c
index 4ec08c528..4bc8ef8fc 100644
--- a/menu/m_global.c
+++ b/menu/m_global.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_global.c,v 1.33 2021/03/27 23:46:29 tom Exp $")
+MODULE_ID("$Id: m_global.c,v 1.34 2023/09/16 16:39:26 tom Exp $")
 
 static char mark[] = "-";
 /* *INDENT-OFF* */
@@ -568,7 +568,7 @@ _nc_New_TopRow_and_CurrentItem(
       cur_item = menu->curitem;
       assert(cur_item);
       menu->toprow = (short)(((menu->rows - menu->frows) >= 0)
-			     ? min(menu->rows - menu->frows, new_toprow)
+			     ? Min(menu->rows - menu->frows, new_toprow)
 			     : 0);
       menu->curitem = new_current_item;
 
@@ -592,7 +592,7 @@ _nc_New_TopRow_and_CurrentItem(
   else
     {				/* if we are not posted, this is quite simple */
       menu->toprow = (short)(((menu->rows - menu->frows) >= 0)
-			     ? min(menu->rows - menu->frows, new_toprow)
+			     ? Min(menu->rows - menu->frows, new_toprow)
 			     : 0);
       menu->curitem = new_current_item;
     }
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index b61d44a6a..f001b2241 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.149 2022/04/30 18:36:54 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.150 2023/09/16 16:39:15 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -745,7 +745,7 @@ _nc_init_color(SCREEN *sp, int color, int r, int g, int b)
 	NCURSES_PUTP2("initialize_color",
 		      TIPARM_4(initialize_color, color, r, g, b));
 #endif
-	sp->_color_defs = max(color + 1, sp->_color_defs);
+	sp->_color_defs = Max(color + 1, sp->_color_defs);
 
 	result = OK;
     }
diff --git a/ncurses/base/lib_overlay.c b/ncurses/base/lib_overlay.c
index 6d451d046..6d21c7617 100644
--- a/ncurses/base/lib_overlay.c
+++ b/ncurses/base/lib_overlay.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_overlay.c,v 1.33 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_overlay.c,v 1.34 2023/09/16 16:39:07 tom Exp $")
 
 static int
 overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
@@ -78,12 +78,12 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
 	dy2 = dy1 + dst->_maxy;
 
 	if (dx2 >= sx1 && dx1 <= sx2 && dy2 >= sy1 && dy1 <= sy2) {
-	    int sminrow = max(sy1, dy1) - sy1;
-	    int smincol = max(sx1, dx1) - sx1;
-	    int dminrow = max(sy1, dy1) - dy1;
-	    int dmincol = max(sx1, dx1) - dx1;
-	    int dmaxrow = min(sy2, dy2) - dy1;
-	    int dmaxcol = min(sx2, dx2) - dx1;
+	    int sminrow = Max(sy1, dy1) - sy1;
+	    int smincol = Max(sx1, dx1) - sx1;
+	    int dminrow = Max(sy1, dy1) - dy1;
+	    int dmincol = Max(sx1, dx1) - dx1;
+	    int dmaxrow = Min(sy2, dy2) - dy1;
+	    int dmaxcol = Min(sx2, dx2) - dx1;
 
 	    rc = copywin(src, dst,
 			 sminrow, smincol,
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 0c09d2635..7946d56f7 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.672 2023/09/09 23:13:32 tom Exp $
+ * $Id: curses.priv.h,v 1.674 2023/09/16 16:31:14 tom Exp $
  *
  *	curses.priv.h
  *
@@ -875,6 +875,12 @@ typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *);
 #endif /* HAVE_LIBDL */
 #endif /* USE_GPM_SUPPORT */
 
+/*
+ * Limit delay-times to 30 seconds, which is consistent with signed 16-bit
+ * numbers in legacy terminfo.
+ */
+#define MAX_DELAY_MSECS 30000
+
 /*
  * When converting from terminfo to termcap, check for cases where we can trim
  * octal escapes down to 2-character form.  It is useful for terminfo format
@@ -1292,12 +1298,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 /* Checks for isprint() should be done on 8-bit characters (non-wide) */
 #define is8bits(c)	((unsigned)(c) <= UCHAR_MAX)
 
-#ifndef min
-#define min(a,b)	((a) > (b)  ?  (b)  :  (a))
+#ifndef Min
+#define Min(a,b)	((a) > (b)  ?  (b)  :  (a))
 #endif
 
-#ifndef max
-#define max(a,b)	((a) < (b)  ?  (b)  :  (a))
+#ifndef Max
+#define Max(a,b)	((a) < (b)  ?  (b)  :  (a))
 #endif
 
 /* usually in <unistd.h> */
diff --git a/ncurses/doit b/ncurses/doit
new file mode 100644
index 000000000..ca093ee9e
--- /dev/null
+++ b/ncurses/doit
@@ -0,0 +1 @@
+TERM=vxt-delay ASAN_OPTIONS=detect_odr_violation=0 ./lib_mvcur
diff --git a/ncurses/term.priv.h b/ncurses/term.priv.h
index 03669cb4b..37547180a 100644
--- a/ncurses/term.priv.h
+++ b/ncurses/term.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2021 Thomas E. Dickey                                          *
+ * Copyright 2021,2023 Thomas E. Dickey                                     *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,12 @@
  ****************************************************************************/
 
 /*
- * $Id: term.priv.h,v 1.7 2021/11/20 23:33:33 tom Exp $
+ * $Id: term.priv.h,v 1.8 2023/09/16 15:16:38 tom Exp $
  *
  *	term.priv.h
  *
  *	Header file for terminfo library objects which are private to
  *	the library.
- *
  */
 
 #ifndef _TERM_PRIV_H
@@ -46,6 +45,10 @@ extern "C" {
 
 #include <ncurses_cfg.h>
 
+#ifndef __NCURSES_H
+#include <curses.h>
+#endif
+
 #undef NCURSES_OPAQUE
 #define NCURSES_INTERNALS 1
 #define NCURSES_OPAQUE 0
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 55f51fb64..6280ad4a2 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.78 2023/09/09 16:06:00 Nicholas.Marriott Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.79 2023/09/15 08:16:12 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -158,8 +158,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 	/* copy term_names, Strings, uses */
 	tp->term_names = _nc_save_str(tp->term_names);
 	for_each_string(i, tp) {
-	    if (tp->Strings[i] != ABSENT_STRING &&
-		tp->Strings[i] != CANCELLED_STRING) {
+	    if (VALID_STRING(tp->Strings[i])) {
 		tp->Strings[i] = _nc_save_str(tp->Strings[i]);
 	    }
 	}
diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index 1669c6414..ef20dfb1d 100644
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 #include <curses.priv.h>
 #include <tic.h>		/* struct tinfo_fkeys */
 
-MODULE_ID("$Id: init_keytry.c,v 1.19 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.20 2023/09/16 12:55:01 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -67,6 +67,8 @@ _nc_tinfo_fkeysf(void)
 NCURSES_EXPORT(void)
 _nc_init_keytry(SCREEN *sp)
 {
+    T(("_nc_init_keytry(%p)", (void *) sp));
+
     /* The sp->_keytry value is initialized in newterm(), where the sp
      * structure is created, because we can not tell where keypad() or
      * mouse_activate() (which will call keyok()) are first called.
@@ -95,7 +97,7 @@ _nc_init_keytry(SCREEN *sp)
 		char *value = tp->Strings[n];
 		if (name != 0
 		    && *name == 'k'
-		    && value != 0
+		    && VALID_STRING(value)
 		    && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
 						     value) == 0) {
 		    (void) _nc_add_to_try(&(sp->_keytry),
diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index 3a9fc3168..1b89a54c7 100644
--- a/ncurses/tinfo/lib_napms.c
+++ b/ncurses/tinfo/lib_napms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,13 +52,16 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_napms.c,v 1.27 2020/08/15 19:45:23 tom Exp $")
+MODULE_ID("$Id: lib_napms.c,v 1.28 2023/09/16 16:09:33 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
 {
     T((T_CALLED("napms(%d)"), ms));
 
+    if (ms > MAX_DELAY_MSECS)
+	ms = MAX_DELAY_MSECS;
+
 #ifdef USE_TERM_DRIVER
     CallDriver_1(SP_PARM, td_nap, ms);
 #else /* !USE_TERM_DRIVER */
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index ed93378c6..d0d216dc8 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.221 2023/07/22 20:13:04 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.222 2023/09/16 12:29:28 tom Exp $")
 
 /****************************************************************************
  *
@@ -503,6 +503,7 @@ _nc_setup_tinfo(const char *const tn, TERMTYPE2 *const tp)
      */
     if (status == TGETENT_YES) {
 	unsigned n;
+	T(("_nc_setup_tinfo - resetting invalid booleans/strings"));
 	for_each_boolean(n, tp) {
 	    if (!VALID_BOOLEAN(tp->Booleans[n]))
 		tp->Booleans[n] = FALSE;
@@ -517,9 +518,9 @@ _nc_setup_tinfo(const char *const tn, TERMTYPE2 *const tp)
 #endif
 
 /*
-**	Take the real command character out of the CC environment variable
-**	and substitute it in for the prototype given in 'command_character'.
-*/
+ * Take the real command character out of the CC environment variable
+ * and substitute it in for the prototype given in 'command_character'.
+ */
 void
 _nc_tinfo_cmdch(TERMINAL *termp, int proto)
 {
@@ -535,9 +536,12 @@ _nc_tinfo_cmdch(TERMINAL *termp, int proto)
 	char CC = *tmp;
 
 	for_each_string(i, &(termp->type)) {
-	    for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) {
-		if (UChar(*tmp) == proto)
-		    *tmp = CC;
+	    tmp = termp->type.Strings[i];
+	    if (VALID_STRING(tmp)) {
+		for (; *tmp; ++tmp) {
+		    if (UChar(*tmp) == proto)
+			*tmp = CC;
+		}
 	    }
 	}
     }
@@ -822,7 +826,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
 	set_curterm(termp);
 
-	if (command_character)
+	if (VALID_STRING(command_character))
 	    _nc_tinfo_cmdch(termp, UChar(*command_character));
 
 	/*
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 724009cfe..1353eb3f2 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.151 2023/07/01 14:09:18 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.152 2023/09/16 16:30:27 tom Exp $")
 
 /*
  *	char *
@@ -647,7 +647,7 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result)
 		    result->num_parsed = NUM_PARM;
 		if (result->num_popped > NUM_PARM)
 		    result->num_popped = NUM_PARM;
-		result->num_actual = max(result->num_popped, result->num_parsed);
+		result->num_actual = Max(result->num_popped, result->num_parsed);
 
 		for (n = 0; n < result->num_actual; ++n) {
 		    if (result->p_is_s[n])
diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 7aa30f5f6..f834532c9 100644
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -52,7 +52,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.110 2023/04/22 15:12:57 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.111 2023/09/16 16:05:15 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -89,6 +89,9 @@ NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
 {
     T((T_CALLED("delay_output(%p,%d)"), (void *) SP_PARM, ms));
 
+    if (ms > MAX_DELAY_MSECS)
+	ms = MAX_DELAY_MSECS;
+
     if (!HasTInfoTerminal(SP_PARM))
 	returnCode(ERR);
 
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 3591a5080..b0f360eca 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.170 2023/06/24 18:09:05 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.171 2023/09/16 16:30:34 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -351,7 +351,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
     }
 
     /* grab the name (a null-terminated string) */
-    want = min(MAX_NAME_SIZE, (unsigned) name_size);
+    want = Min(MAX_NAME_SIZE, (unsigned) name_size);
     ptr->str_table = string_table;
     ptr->term_names = string_table;
     if ((have = (unsigned) Read(ptr->term_names, want)) != want) {
@@ -364,7 +364,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 	offset = (int) (have - MAX_NAME_SIZE);
 
     /* grab the booleans */
-    TYPE_CALLOC(NCURSES_SBOOL, max(BOOLCOUNT, bool_count), ptr->Booleans);
+    TYPE_CALLOC(NCURSES_SBOOL, Max(BOOLCOUNT, bool_count), ptr->Booleans);
     if (Read(ptr->Booleans, (unsigned) bool_count) < bool_count) {
 	returnDB(TGETENT_NO);
     }
@@ -378,13 +378,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
     even_boundary(name_size + bool_count);
 
     /* grab the numbers */
-    TYPE_CALLOC(NCURSES_INT2, max(NUMCOUNT, num_count), ptr->Numbers);
+    TYPE_CALLOC(NCURSES_INT2, Max(NUMCOUNT, num_count), ptr->Numbers);
     if (!read_numbers(buf, num_count)) {
 	returnDB(TGETENT_NO);
     }
     convert_numbers(buf, ptr->Numbers, num_count);
 
-    TYPE_CALLOC(char *, max(STRCOUNT, str_count), ptr->Strings);
+    TYPE_CALLOC(char *, Max(STRCOUNT, str_count), ptr->Strings);
 
     if (str_count) {
 	/* grab the string offsets */
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index eb4ecb3dd..fd993b820 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.73 2022/08/13 14:36:43 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.74 2023/09/16 10:44:33 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -206,8 +206,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
     save_ttytype(termp);
 #endif
 
-    if (command_character)
-	_nc_tinfo_cmdch(termp, *command_character);
+    if (VALID_STRING(command_character))
+	_nc_tinfo_cmdch(termp, UChar(*command_character));
 
     /*
      * If an application calls setupterm() rather than initscr() or
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 586b1dde9..f05b40790 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.130 2023/07/08 14:00:24 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.131 2023/09/16 16:28:36 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -790,7 +790,8 @@ _nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit)
 #else
     LITTLE_ENDIAN(buf, MAGIC);
 #endif
-    LITTLE_ENDIAN(buf + 2, min(namelen, MAX_NAME_SIZE + 1));
+    namelen = Min(namelen, MAX_NAME_SIZE + 1);
+    LITTLE_ENDIAN(buf + 2, namelen);
     LITTLE_ENDIAN(buf + 4, boolmax);
     LITTLE_ENDIAN(buf + 6, nummax);
     LITTLE_ENDIAN(buf + 8, strmax);
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 2ddfaaa29..e50b63847 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -74,7 +74,7 @@ AUTHOR
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: hashmap.c,v 1.70 2023/06/25 17:16:01 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.71 2023/09/16 16:28:53 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -406,7 +406,7 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
 	       && OLDNUM(SP_PARM, i) - i == shift)
 	    i++;
 	size = i - start;
-	if (size < 3 || size + min(size / 8, 2) < abs(shift)) {
+	if (size < 3 || size + Min(size / 8, 2) < abs(shift)) {
 	    while (start < i) {
 		OLDNUM(SP_PARM, start) = _NEWINDEX;
 		start++;
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index aa3a67c51..8fad93c72 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.158 2023/06/24 17:34:43 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.161 2023/09/16 16:29:02 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -232,14 +232,33 @@ NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcn
 	    /* extract padding, either mandatory or required */
 	    if (cp[0] == '$' && cp[1] == '<' && strchr(cp, '>')) {
 		float number = 0.0;
+		int state = 0;
 
 		for (cp += 2; *cp != '>'; cp++) {
-		    if (isdigit(UChar(*cp)))
-			number = number * 10 + (float) (*cp - '0');
-		    else if (*cp == '*')
-			number *= (float) affcnt;
-		    else if (*cp == '.' && (*++cp != '>') && isdigit(UChar(*cp)))
-			number += (float) ((*cp - '0') / 10.0);
+		    if (isdigit(UChar(*cp))) {
+			switch (state) {
+			case 0:
+			    number = number * 10 + (float) (*cp - '0');
+			    break;
+			case 2:
+			    number += (float) ((*cp - '0') / 10.0);
+			    ++state;
+			    break;
+			}
+		    } else if (*cp == '*') {
+			/* padding is always a suffix */
+			if (state < 4) {
+			    number *= (float) affcnt;
+			    state = 4;
+			}
+		    } else if (*cp == '.') {
+			/* a single decimal point is allowed */
+			state = (state == 0) ? 2 : 3;
+		    }
+		    if (number > MAX_DELAY_MSECS) {
+			number = MAX_DELAY_MSECS;
+			break;
+		    }
 		}
 
 #if NCURSES_NO_PADDING
@@ -432,8 +451,8 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
 					   1);
     SP_PARM->_hpa_ch_cost = NormalizedCost(TIPARM_1(column_address, 23), 1);
     SP_PARM->_cuf_ch_cost = NormalizedCost(TIPARM_1(parm_right_cursor, 23), 1);
-    SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost,
-				min(SP_PARM->_hpa_ch_cost,
+    SP_PARM->_inline_cost = Min(SP_PARM->_cup_ch_cost,
+				Min(SP_PARM->_hpa_ch_cost,
 				    SP_PARM->_cuf_ch_cost));
 
     /*
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 407a72035..6fa73eedb 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.80 2023/03/04 23:47:00 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.81 2023/09/16 16:30:40 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -360,7 +360,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     if ((mode & TW_MOUSE)
 	&& (fd = sp->_mouse_fd) >= 0) {
 	FD_SET(fd, &set);
-	count = max(fd, count) + 1;
+	count = Max(fd, count) + 1;
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl) {
@@ -370,7 +370,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
 	    if (ev->type == _NC_EVENT_FILE
 		&& (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
 		FD_SET(ev->data.fev.fd, &set);
-		count = max(ev->data.fev.fd + 1, count);
+		count = Max(ev->data.fev.fd + 1, count);
 	    }
 	}
     }
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 80815244b..066b7fce3 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -85,7 +85,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: tty_update.c,v 1.314 2022/07/23 22:12:59 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.315 2023/09/16 16:38:41 tom Exp $")
 
 /*
  * This define controls the line-breakout optimization.  Every once in a
@@ -1004,7 +1004,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 	if (check_pending(NCURSES_SP_ARG))
 	    goto cleanup;
 
-	nonempty = min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1);
+	nonempty = Min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1);
 
 	if (SP_PARM->_scrolling) {
 	    NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_ARG);
@@ -1134,7 +1134,7 @@ ClrUpdate(NCURSES_SP_DCL0)
     if (0 != SP_PARM) {
 	int i;
 	NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));
-	int nonempty = min(screen_lines(SP_PARM),
+	int nonempty = Min(screen_lines(SP_PARM),
 			   NewScreen(SP_PARM)->_maxy + 1);
 
 	ClearScreen(NCURSES_SP_ARGx blank);
@@ -1233,7 +1233,7 @@ static int
 ClrBottom(NCURSES_SP_DCLx int total)
 {
     int top = total;
-    int last = min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1);
+    int last = Min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1);
     NCURSES_CH_T blank = NewScreen(SP_PARM)->_line[total - 1].text[last - 1];
 
     if (clr_eos && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) {
@@ -1293,7 +1293,7 @@ ClrBottom(NCURSES_SP_DCLx int total)
 **		nLastChar = position of last different character in new line
 **
 **		move to firstChar
-**		overwrite chars up to min(oLastChar, nLastChar)
+**		overwrite chars up to Min(oLastChar, nLastChar)
 **		if oLastChar < nLastChar
 **			insert newLine[oLastChar+1..nLastChar]
 **		else
@@ -1531,7 +1531,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
 		}
 		ClrToEOL(NCURSES_SP_ARGx blank, FALSE);
 	    } else {
-		n = max(nLastChar, oLastChar);
+		n = Max(nLastChar, oLastChar);
 		PutRange(NCURSES_SP_ARGx
 			 oldLine,
 			 newLine,
@@ -1556,7 +1556,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
 		    break;
 	    }
 
-	    n = min(oLastChar, nLastChar);
+	    n = Min(oLastChar, nLastChar);
 	    if (n >= firstChar) {
 		GoTo(NCURSES_SP_ARGx lineno, firstChar);
 		PutRange(NCURSES_SP_ARGx
@@ -1568,7 +1568,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
 	    }
 
 	    if (oLastChar < nLastChar) {
-		int m = max(nLastNonblank, oLastNonblank);
+		int m = Max(nLastNonblank, oLastNonblank);
 #if USE_WIDEC_SUPPORT
 		if (n) {
 		    while (isWidecExt(newLine[n + 1]) && n) {
diff --git a/ncurses/win32con/win32_driver.c b/ncurses/win32con/win32_driver.c
index 67b816259..0a43588b1 100644
--- a/ncurses/win32con/win32_driver.c
+++ b/ncurses/win32con/win32_driver.c
@@ -48,7 +48,7 @@
 
 #define CUR TerminalType(my_term).
 
-MODULE_ID("$Id: win32_driver.c,v 1.3 2023/03/25 14:08:36 tom Exp $")
+MODULE_ID("$Id: win32_driver.c,v 1.4 2023/09/16 16:29:24 tom Exp $")
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 #define EXP_OPTIMIZE 0
@@ -393,7 +393,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 
 	Width = screen_columns(sp);
 	Height = screen_lines(sp);
-	nonempty = min(Height, NewScreen(sp)->_maxy + 1);
+	nonempty = Min(Height, NewScreen(sp)->_maxy + 1);
 
 	T(("... %dx%d clear cur:%d new:%d",
 	   Height, Width,
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 2945d8dc1..2425b3a44 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.73 2023/08/05 19:02:24 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.74 2023/09/16 16:27:44 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -488,7 +488,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 
 	Width = screen_columns(sp);
 	Height = screen_lines(sp);
-	nonempty = min(Height, NewScreen(sp)->_maxy + 1);
+	nonempty = Min(Height, NewScreen(sp)->_maxy + 1);
 
 	T(("... %dx%d clear cur:%d new:%d",
 	   Height, Width,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9c61e9bfb..5e8d4e6ea 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230909) unstable; urgency=low
+ncurses6 (6.4+20230917) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9c61e9bfb..5e8d4e6ea 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230909) unstable; urgency=low
+ncurses6 (6.4+20230917) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index daf3cf750..ae6d95822 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230909) unstable; urgency=low
+ncurses6 (6.4+20230917) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Sep 2023 08:21:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 05be5485f..3127d319d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.603 2023/09/09 12:21:39 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.605 2023/09/17 08:35:40 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0909"
+!define VERSION_MMDD  "0917"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e108cf6f8..a9341799d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230909
+Release: 20230917
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b32c89995..9aafe1623 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230909
+Release: 20230917
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e241a4d79..824e43cdd 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230909
+Release: 20230917
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/doit b/progs/doit
new file mode 100644
index 000000000..81652c4ba
--- /dev/null
+++ b/progs/doit
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ../ncurses
+make || exit
+cd ../progs
+make || exit
+export TERMINFO=/tmp/FOO
+rm -rf $TERMINFO
+mkdir -p $TERMINFO
+rm -f trace
+shlib ./tic -v2 -x /var/mail/long_name.ti
+shlib ./infocmp -x xy

From c9ee57c76f90470e2091e6064d7ff08b77702f3d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 18 Sep 2023 09:47:34 +0200
Subject: [PATCH 030/106] ncurses-6.4-20230918.patch

---
 NEWS                             | 5 ++++-
 VERSION                          | 2 +-
 dist.mk                          | 4 ++--
 package/debian-mingw/changelog   | 4 ++--
 package/debian-mingw64/changelog | 4 ++--
 package/debian/changelog         | 4 ++--
 package/mingw-ncurses.nsi        | 4 ++--
 package/mingw-ncurses.spec       | 2 +-
 package/ncurses.spec             | 2 +-
 package/ncursest.spec            | 2 +-
 10 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 1d64985f8..fdcd78603 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4000 2023/09/17 08:34:59 tom Exp $
+-- $Id: NEWS,v 1.4001 2023/09/17 22:41:20 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230918
+	+ new tarball/errata (report by Sven Joachim).
+
 20230917
 	+ improve formatting of manpages (integrated patches by Branden
 	  Robinson).
diff --git a/VERSION b/VERSION
index cfa562bbd..0a90ac369 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230917
+5:0:10	6.4	20230918
diff --git a/dist.mk b/dist.mk
index af4f6073c..fedcbbd76 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1565 2023/09/17 08:35:40 tom Exp $
+# $Id: dist.mk,v 1.1566 2023/09/18 07:33:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230917
+NCURSES_PATCH = 20230918
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 5e8d4e6ea..0f99c1c04 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230917) unstable; urgency=low
+ncurses6 (6.4+20230918) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 5e8d4e6ea..0f99c1c04 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230917) unstable; urgency=low
+ncurses6 (6.4+20230918) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ae6d95822..a3ca43ec8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230917) unstable; urgency=low
+ncurses6 (6.4+20230918) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 04:35:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3127d319d..3eb41412e 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.605 2023/09/17 08:35:40 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.606 2023/09/17 22:08:06 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0917"
+!define VERSION_MMDD  "0918"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index a9341799d..b0bc20821 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230917
+Release: 20230918
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 9aafe1623..340f23ee9 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230917
+Release: 20230918
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 824e43cdd..9780cc303 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230917
+Release: 20230918
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 8a1f81ac78421a041489c180d4841a8a5c5bb0c8 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 24 Sep 2023 02:19:47 +0200
Subject: [PATCH 031/106] ncurses-6.4-20230923.patch

---
 NEWS                                  |   8 +-
 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_color.3x.html       |  34 ++--
 doc/html/man/curs_getyx.3x.html       |  16 +-
 doc/html/man/curs_inopts.3x.html      |  48 ++---
 doc/html/man/curs_legacy.3x.html      |  12 +-
 doc/html/man/curs_memleaks.3x.html    |  10 +-
 doc/html/man/curs_mouse.3x.html       | 135 +++++++-------
 doc/html/man/curs_opaque.3x.html      |  20 +-
 doc/html/man/curs_pad.3x.html         |  18 +-
 doc/html/man/curs_print.3x.html       |  18 +-
 doc/html/man/curs_slk.3x.html         |  84 ++++-----
 doc/html/man/curs_terminfo.3x.html    | 124 ++++++------
 doc/html/man/curs_touch.3x.html       |  14 +-
 doc/html/man/curs_trace.3x.html       |   8 +-
 doc/html/man/curs_util.3x.html        |  41 ++--
 doc/html/man/define_key.3x.html       |  30 +--
 doc/html/man/form.3x.html             |   2 +-
 doc/html/man/infocmp.1m.html          |   2 +-
 doc/html/man/infotocap.1m.html        |   2 +-
 doc/html/man/key_defined.3x.html      |  18 +-
 doc/html/man/keybound.3x.html         |  22 +--
 doc/html/man/keyok.3x.html            |  18 +-
 doc/html/man/menu.3x.html             |   2 +-
 doc/html/man/ncurses.3x.html          |  16 +-
 doc/html/man/ncurses6-config.1.html   |   2 +-
 doc/html/man/new_pair.3x.html         |  22 +--
 doc/html/man/panel.3x.html            |  12 +-
 doc/html/man/resizeterm.3x.html       |  38 ++--
 doc/html/man/scr_dump.5.html          |  20 +-
 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_color.3x                     | 259 +++++++++++++-------------
 man/curs_getyx.3x                     |  60 +++---
 man/curs_inopts.3x                    | 210 ++++++++++-----------
 man/curs_legacy.3x                    |  66 ++++---
 man/curs_memleaks.3x                  |  53 +++---
 man/curs_mouse.3x                     | 143 +++++++-------
 man/curs_opaque.3x                    |  72 +++----
 man/curs_pad.3x                       | 113 ++++++-----
 man/curs_print.3x                     |  26 +--
 man/curs_slk.3x                       | 188 +++++++++----------
 man/curs_terminfo.3x                  | 146 +++++++--------
 man/curs_touch.3x                     |  48 ++---
 man/curs_trace.3x                     |  25 +--
 man/curs_util.3x                      |  70 ++++---
 man/define_key.3x                     |  27 +--
 man/key_defined.3x                    |  16 +-
 man/keybound.3x                       |  22 +--
 man/keyok.3x                          |  18 +-
 man/manhtml.aliases                   |   3 +-
 man/ncurses.3x                        |  10 +-
 man/new_pair.3x                       |  24 +--
 man/panel.3x                          |   6 +-
 man/resizeterm.3x                     | 118 ++++++------
 man/scr_dump.5                        |  12 +-
 misc/magic                            |   4 +-
 ncurses/base/vsscanf.c                |  11 +-
 ncurses/curses.priv.h                 |  14 +-
 ncurses/report_offsets.c              |  15 +-
 ncurses/tinfo/trim_sgr0.c             |  12 +-
 package/debian-mingw/changelog        |   4 +-
 package/debian-mingw64/changelog      |   4 +-
 package/debian/changelog              |   4 +-
 package/mingw-ncurses.nsi             |   4 +-
 package/mingw-ncurses.spec            |   2 +-
 package/ncurses.spec                  |   2 +-
 package/ncursest.spec                 |   2 +-
 test/ditto.c                          |  14 +-
 77 files changed, 1292 insertions(+), 1355 deletions(-)

diff --git a/NEWS b/NEWS
index fdcd78603..bd488acad 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4001 2023/09/17 22:41:20 tom Exp $
+-- $Id: NEWS,v 1.4004 2023/09/23 23:48:03 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20230923
+	+ improve formatting of manpages (patches by Branden Robinson).
+	+ amend change to delscreen() to limit the windows which it creates to
+	  just those associated with the screen (report by Frederic Boiteux,
+	  cf: 20220813).
+
 20230918
 	+ new tarball/errata (report by Sven Joachim).
 
diff --git a/VERSION b/VERSION
index 0a90ac369..4fa26f6db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230918
+5:0:10	6.4	20230923
diff --git a/dist.mk b/dist.mk
index fedcbbd76..0c503d688 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1566 2023/09/18 07:33:33 tom Exp $
+# $Id: dist.mk,v 1.1567 2023/09/23 09:27:19 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230918
+NCURSES_PATCH = 20230923
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 91809abed..218266234 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@ <H1 class="no-header">ADACURSES 1 2023-09-17 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 3b966d499..fb6dfcaeb 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -190,7 +190,7 @@ <H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index c3edec046..bbfa5d258 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@ <H1 class="no-header">clear 1 2023-09-16 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index e914aedb1..44b161ef9 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.77 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_color.3x,v 1.82 2023/09/23 22:24:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -63,17 +63,17 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>init_pair(short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>f</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_color(short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>init_extended_pair(int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>f</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_extended_color(int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>b</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>color_content(short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG><EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG><EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pair_content(short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG><EM>f</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>extended_color_content(int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_pair_content(int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>f</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
 
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs(void);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>COLOR_PAIR(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
@@ -83,7 +83,7 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       <STRONG>curses</STRONG> supports color attributes on terminals with that capability.  To
+       <EM>curses</EM> supports color attributes on terminals with that capability.  To
        use  these  routines  <STRONG>start_color</STRONG>  must  be called, usually right after
        <STRONG>initscr</STRONG>.  Colors are always used in pairs (referred to as color-pairs).
        A  color-pair  consists  of  a  foreground color (for characters) and a
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Color-Rendering">Color Rendering</a></H3><PRE>
-       The  <STRONG>curses</STRONG>  library  combines  these  inputs  to  produce  the  actual
+       The  <EM>curses</EM>  library  combines  these  inputs  to  produce  the  actual
        foreground and background colors shown on the screen:
 
        <STRONG>o</STRONG>   per-character video attributes (e.g., via <STRONG>waddch</STRONG>),
@@ -120,32 +120,32 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The background character is a special case:  it  includes  a  character
        value, just as if it were passed to <STRONG>waddch</STRONG>.
 
-       The  <STRONG>curses</STRONG> library does the actual work of combining these color pairs
+       The  <EM>curses</EM> library does the actual work of combining these color pairs
        in an internal function called from <STRONG>waddch</STRONG>:
 
        <STRONG>o</STRONG>   If the parameter passed to <STRONG>waddch</STRONG> is <EM>blank</EM>, and it uses the special
            color pair 0,
 
-           <STRONG>o</STRONG>   <STRONG>curses</STRONG> next checks the window attribute.
+           <STRONG>o</STRONG>   <EM>curses</EM> next checks the window attribute.
 
-           <STRONG>o</STRONG>   If  the window attribute does not use color pair 0, <STRONG>curses</STRONG> uses
+           <STRONG>o</STRONG>   If  the window attribute does not use color pair 0, <EM>curses</EM> uses
                the color pair from the window attribute.
 
-           <STRONG>o</STRONG>   Otherwise, <STRONG>curses</STRONG> uses the background character.
+           <STRONG>o</STRONG>   Otherwise, <EM>curses</EM> uses the background character.
 
        <STRONG>o</STRONG>   If the parameter passed to <STRONG>waddch</STRONG> is <EM>not</EM> <EM>blank</EM>, or it does not  use
-           the  special  color  pair 0, <STRONG>curses</STRONG> prefers the color pair from the
+           the  special  color  pair 0, <EM>curses</EM> prefers the color pair from the
            parameter, if it  is  nonzero.   Otherwise,  it  tries  the  window
            attribute next, and finally the background character.
 
-       Some  <STRONG>curses</STRONG>  functions  such  as  <STRONG>wprintw</STRONG>  call  <STRONG>waddch</STRONG>.  Those do not
+       Some  <EM>curses</EM>  functions  such  as  <STRONG>wprintw</STRONG>  call  <STRONG>waddch</STRONG>.  Those do not
        combine its parameter with a color pair.  Consequently those calls  use
        only the window attribute or the background character.
 
 
 </PRE><H2><a name="h2-CONSTANTS">CONSTANTS</a></H2><PRE>
        In <STRONG>&lt;curses.h&gt;</STRONG> the following macros are defined.  These are the standard
-       colors (ISO-6429).  <STRONG>curses</STRONG> also assumes that <STRONG>COLOR_BLACK</STRONG> is the default
+       colors (ISO-6429).  <EM>curses</EM> also assumes that <STRONG>COLOR_BLACK</STRONG> is the default
        background color for all terminals.
 
              <STRONG>COLOR_BLACK</STRONG>
@@ -413,7 +413,7 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       In  the  <STRONG>ncurses</STRONG>  implementation,  there is a separate color activation
+       In  the  <EM>ncurses</EM>  implementation,  there is a separate color activation
        flag, color palette, color  pairs  table,  and  associated  <STRONG>COLORS</STRONG>  and
        <STRONG>COLOR_PAIRS</STRONG>  counts  for  each  screen;  the  <STRONG>start_color</STRONG> function only
        affects the current screen.   The  SVr4/XSI  interface  is  not  really
@@ -525,7 +525,7 @@ <H1 class="no-header">curs_color 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 07ca999e0..6d4a62e8f 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.31 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_getyx.3x,v 1.37 2023/09/23 22:10:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -88,17 +88,17 @@ <H1 class="no-header">curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        This  implementation also provides functions <STRONG>getbegx</STRONG>, <STRONG>getbegy</STRONG>, <STRONG>getcurx</STRONG>,
        <STRONG>getcury</STRONG>, <STRONG>getmaxx</STRONG>, <STRONG>getmaxy</STRONG>, <STRONG>getparx</STRONG> and <STRONG>getpary</STRONG> for  compatibility  with
-       older versions of curses.
+       older versions of <EM>curses</EM>; see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>.
 
        Although  X/Open  Curses  does  not  address this, many implementations
-       provide members of the WINDOW structure containing values corresponding
+       provide members of the <STRONG>WINDOW</STRONG> structure containing values corresponding
        to  these  macros.  For best portability, do not rely on using the data
-       in WINDOW, since some implementations make WINDOW opaque (do not  allow
+       in <STRONG>WINDOW</STRONG>, since some implementations make <STRONG>WINDOW</STRONG> opaque (do not  allow
        direct use of its members).
 
        Besides the problem of opaque structures, the data stored in like-named
        members may not have like-values  in  different  implementations.   For
-       example,  the  WINDOW._maxx and WINDOW._maxy values in ncurses have (at
+       example,  the  <STRONG>WINDOW._maxx</STRONG> and <STRONG>WINDOW._maxy</STRONG> values in <EM>ncurses</EM> have (at
        least  since  release  1.8.1)  differed  by   one   from   some   other
        implementations.   The  difference  is  hidden  by  means  of the macro
        <STRONG>getmaxyx</STRONG>.
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index f371d69eb..39fd72715 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.47 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_inopts.3x,v 1.54 2023/09/23 22:24:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>typeahead(int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
 
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>is_cbreak(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>is_echo(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>is_nl(void);</STRONG>
@@ -92,7 +92,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>ncurses</STRONG> library provides several functions which let an application
+       The <EM>ncurses</EM> library provides several functions which let an application
        change  the  way  input from the terminal is handled.  Some are global,
        applying to all windows.  Others  apply  only  to  a  specific  window.
        Window-specific  settings  are  not  automatically  applied  to  new or
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        Initially the terminal may or may not be in <STRONG>cbreak</STRONG> mode, as the mode is
        inherited;   therefore,  a  program  should  call  <STRONG>cbreak</STRONG>  or  <STRONG>nocbreak</STRONG>
-       explicitly.  Most interactive programs  using  <STRONG>curses</STRONG>  set  the  <STRONG>cbreak</STRONG>
+       explicitly.  Most interactive programs  using  <EM>curses</EM>  set  the  <STRONG>cbreak</STRONG>
        mode.   Note  that  <STRONG>cbreak</STRONG>  overrides  <STRONG>raw</STRONG>.   [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a
        discussion of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
 
@@ -139,7 +139,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        If the <STRONG>intrflush</STRONG> option is enabled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), and an  interrupt  key
        is  pressed on the keyboard (interrupt, break, quit), all output in the
        tty driver queue will be flushed, giving the effect of faster  response
-       to  the interrupt, but causing <STRONG>curses</STRONG> to have the wrong idea of what is
+       to  the interrupt, but causing <EM>curses</EM> to have the wrong idea of what is
        on the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>) prevents the  flush.
        The  default  for the option is inherited from the tty driver settings.
        The window argument is ignored.
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The <STRONG>keypad</STRONG> option enables  the  keypad  of  the  user's  terminal.   If
        enabled  (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the user can press a function key (such as an
        arrow key) and <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  returns  a  single  value  representing  the
-       function  key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>curses</STRONG> does
+       function  key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <EM>curses</EM> 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 locally), turning  on  this
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        that  in  raw  mode,  the  interrupt,  quit,  suspend, and flow control
        characters are all passed through uninterpreted, instead of  generating
        a  signal.   The behavior of the BREAK key depends on other bits in the
-       tty driver that are not set by <STRONG>curses</STRONG>.
+       tty driver that are not set by <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush/noqiflush</a></H3><PRE>
@@ -220,7 +220,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
-       The <STRONG>curses</STRONG> library does "line-breakout  optimization"  by  looking  for
+       The <EM>curses</EM> 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
        <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  or  <STRONG>doupdate</STRONG> is called again.  This allows faster response
@@ -263,11 +263,11 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        0    if the flag is reset, or
 
-       -1   if the curses library was not initialized.
+       -1   if the <EM>curses</EM> library was not initialized.
 
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  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
+       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
        NCURSES_VERSION.
 
 
@@ -275,9 +275,9 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Except as noted in the  section  on  extensions,  these  functions  are
        described in the XSI Curses standard, Issue 4.
 
-       The ncurses library obeys the XPG4 standard and the historical practice
-       of the AT&amp;T curses implementations, in that the  echo  bit  is  cleared
-       when  curses  initializes the terminal state.  BSD curses differed from
+       The <EM>ncurses</EM> library obeys the XPG4 standard and the historical practice
+       of the AT&amp;T <EM>curses</EM> implementations, in that the  echo  bit  is  cleared
+       when  <EM>curses</EM>  initializes the terminal state.  BSD <EM>curses</EM> differed from
        this slightly; it left the echo bit on at initialization, but  the  BSD
        <STRONG>raw</STRONG>  call  turned  it  off as a side-effect.  For best portability, set
        <STRONG>echo</STRONG> or <STRONG>noecho</STRONG> explicitly  just  after  initialization,  even  if  your
@@ -285,20 +285,20 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        The  XSI  Curses  standard  is ambiguous on the question of whether <STRONG>raw</STRONG>
        should disable the CRLF translations controlled by <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>.   BSD
-       curses  did  turn off these translations; AT&amp;T curses (at least as late
+       <EM>curses</EM>  did  turn off these translations; AT&amp;T <EM>curses</EM> (at least as late
        as SVr1) did not.  We chose to do so, on the theory that  a  programmer
        requesting  raw  input  wants  a clean (ideally 8-bit clean) connection
        that the operating system will not alter.
 
-       When <STRONG>keypad</STRONG> is first enabled, ncurses loads the key-definitions for the
+       When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key-definitions for the
        current  terminal  description.   If  the terminal description includes
        extended string capabilities, e.g., from using the <STRONG>-x</STRONG>  option  of  <STRONG>tic</STRONG>,
-       then  ncurses  also defines keys for the capabilities whose names begin
+       then  <EM>ncurses</EM>  also defines keys for the capabilities whose names begin
        with "k".  The corresponding keycodes are generated and  (depending  on
        previous  loads of terminal descriptions) may differ from one execution
        of a program to the next.  The generated keycodes are recognized by the
        <STRONG>keyname</STRONG>  function  (which  will  then  return a name beginning with "k"
-       denoting the terminfo capability name rather than "K", used for  curses
+       denoting the terminfo capability name rather than "K", used for  <EM>curses</EM>
        key-names).   On  the  other hand, an application can use <STRONG>define_key</STRONG> to
        establish a specific  keycode  for  a  given  string.   This  makes  it
        possible  for  an  application  to  check  for an extended capability's
@@ -307,13 +307,13 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
        particular string capability.  Higher-level applications which use  the
-       curses  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
+       <EM>curses</EM>  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
        order in which the strings are loaded.  If more than one key definition
        has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
-       Most curses implementations (including ncurses) load key definitions in
+       Most <EM>curses</EM> implementations (including <EM>ncurses</EM>) load key definitions in
        the  order  defined  by the array of string capability names.  The last
        key to be loaded determines the keycode which  will  be  returned.   In
-       ncurses,  you  may  also  have extended capabilities interpreted as key
+       <EM>ncurses</EM>,  you  may  also  have extended capabilities interpreted as key
        definitions.  These are loaded after the  predefined  keys,  and  if  a
        capability's  value  is the same as a previously-loaded key definition,
        the later definition is the one used.
@@ -336,7 +336,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index b553505d2..76e01f28f 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.22 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_legacy.3x,v 1.27 2023/09/23 22:11:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  legacy  functions  are  simpler  to  use  than the X/Open Curses
+       These  legacy  functions  are  simpler  to  use  than the X/Open <EM>curses</EM>
        functions:
 
        <STRONG>o</STRONG>   The <STRONG>getattrs</STRONG> function returns the same attribute data as <STRONG>wattr_get</STRONG>.
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>NCURSES_OPAQUE</STRONG> is defined.  The standard forms such as  <STRONG>getyx</STRONG>  must  be
        implemented  as  macros,  and  (in  this implementation) are defined in
        terms of the functions described here, to avoid  reliance  on  internal
-       details of the WINDOW structure.
+       details of the <STRONG>WINDOW</STRONG> structure.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_legacy 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 2f8490224..56b90a95a 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.21 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.25 2023/09/23 21:07:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -128,11 +128,11 @@ <H1 class="no-header">curs_memleaks 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>.  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 0022bf406..031cde103 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.71 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_mouse.3x,v 1.78 2023/09/23 23:08:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -96,7 +96,7 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            If the screen has not been initialized, or if the terminal does not
            support mouse-events, this function returns 0.
 
-       <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-NULL, this function fills the indicated  location
+       <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-<STRONG>NULL</STRONG>, this function fills the indicated  location
            with the previous value of the current screen's mouse event mask.
 
        As  a  side  effect,  setting  a  zero mousemask may turn off the mouse
@@ -109,42 +109,42 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>Name</STRONG>                     <STRONG>Description</STRONG>
        ---------------------------------------------------------------------
-       BUTTON1_PRESSED          mouse button 1 down
-       BUTTON1_RELEASED         mouse button 1 up
-       BUTTON1_CLICKED          mouse button 1 clicked
+       <STRONG>BUTTON1_PRESSED</STRONG>          mouse button 1 down
+       <STRONG>BUTTON1_RELEASED</STRONG>         mouse button 1 up
+       <STRONG>BUTTON1_CLICKED</STRONG>          mouse button 1 clicked
 
-       BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
-       BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
+       <STRONG>BUTTON1_DOUBLE_CLICKED</STRONG>   mouse button 1 double clicked
+       <STRONG>BUTTON1_TRIPLE_CLICKED</STRONG>   mouse button 1 triple clicked
        ---------------------------------------------------------------------
-       BUTTON2_PRESSED          mouse button 2 down
-       BUTTON2_RELEASED         mouse button 2 up
-       BUTTON2_CLICKED          mouse button 2 clicked
-       BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
-       BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
+       <STRONG>BUTTON2_PRESSED</STRONG>          mouse button 2 down
+       <STRONG>BUTTON2_RELEASED</STRONG>         mouse button 2 up
+       <STRONG>BUTTON2_CLICKED</STRONG>          mouse button 2 clicked
+       <STRONG>BUTTON2_DOUBLE_CLICKED</STRONG>   mouse button 2 double clicked
+       <STRONG>BUTTON2_TRIPLE_CLICKED</STRONG>   mouse button 2 triple clicked
        ---------------------------------------------------------------------
-       BUTTON3_PRESSED          mouse button 3 down
-       BUTTON3_RELEASED         mouse button 3 up
-       BUTTON3_CLICKED          mouse button 3 clicked
-       BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
-       BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
+       <STRONG>BUTTON3_PRESSED</STRONG>          mouse button 3 down
+       <STRONG>BUTTON3_RELEASED</STRONG>         mouse button 3 up
+       <STRONG>BUTTON3_CLICKED</STRONG>          mouse button 3 clicked
+       <STRONG>BUTTON3_DOUBLE_CLICKED</STRONG>   mouse button 3 double clicked
+       <STRONG>BUTTON3_TRIPLE_CLICKED</STRONG>   mouse button 3 triple clicked
        ---------------------------------------------------------------------
-       BUTTON4_PRESSED          mouse button 4 down
-       BUTTON4_RELEASED         mouse button 4 up
-       BUTTON4_CLICKED          mouse button 4 clicked
-       BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
-       BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
+       <STRONG>BUTTON4_PRESSED</STRONG>          mouse button 4 down
+       <STRONG>BUTTON4_RELEASED</STRONG>         mouse button 4 up
+       <STRONG>BUTTON4_CLICKED</STRONG>          mouse button 4 clicked
+       <STRONG>BUTTON4_DOUBLE_CLICKED</STRONG>   mouse button 4 double clicked
+       <STRONG>BUTTON4_TRIPLE_CLICKED</STRONG>   mouse button 4 triple clicked
        ---------------------------------------------------------------------
-       BUTTON5_PRESSED          mouse button 5 down
-       BUTTON5_RELEASED         mouse button 5 up
-       BUTTON5_CLICKED          mouse button 5 clicked
-       BUTTON5_DOUBLE_CLICKED   mouse button 5 double clicked
-       BUTTON5_TRIPLE_CLICKED   mouse button 5 triple clicked
+       <STRONG>BUTTON5_PRESSED</STRONG>          mouse button 5 down
+       <STRONG>BUTTON5_RELEASED</STRONG>         mouse button 5 up
+       <STRONG>BUTTON5_CLICKED</STRONG>          mouse button 5 clicked
+       <STRONG>BUTTON5_DOUBLE_CLICKED</STRONG>   mouse button 5 double clicked
+       <STRONG>BUTTON5_TRIPLE_CLICKED</STRONG>   mouse button 5 triple clicked
        ---------------------------------------------------------------------
-       BUTTON_SHIFT             shift was down during button state change
-       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
+       <STRONG>BUTTON_SHIFT</STRONG>             shift was down during button state change
+       <STRONG>BUTTON_CTRL</STRONG>              control was down during button state change
+       <STRONG>BUTTON_ALT</STRONG>               alt was down during button state change
+       <STRONG>ALL_MOUSE_EVENTS</STRONG>         report all button state changes
+       <STRONG>REPORT_MOUSE_POSITION</STRONG>    report mouse movement
        ---------------------------------------------------------------------
 
 
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            through the  pointers.   If  the  conversion  was  successful,  the
            function returns <STRONG>TRUE</STRONG>.
 
-       <STRONG>o</STRONG>   If one of the parameters was NULL or the location is not inside the
+       <STRONG>o</STRONG>   If one of the parameters was <STRONG>NULL</STRONG> or the location is not inside the
            window, <STRONG>FALSE</STRONG> is returned.
 
        <STRONG>o</STRONG>   If <EM>to</EM><STRONG>_</STRONG><EM>screen</EM> is <STRONG>FALSE</STRONG>, the pointers <EM>pY,</EM> <EM>pX</EM> must  reference  window-
@@ -197,7 +197,7 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            coordinates if the window <EM>win</EM> encloses this point.   In  this  case
            the function returns <STRONG>TRUE</STRONG>.
 
-       <STRONG>o</STRONG>   If  one  of  the  parameters is NULL or the point is not inside the
+       <STRONG>o</STRONG>   If  one  of  the  parameters is <STRONG>NULL</STRONG> or the point is not inside the
            window, <STRONG>FALSE</STRONG> is returned.  The  referenced  coordinates  are  only
            replaced  by  the  converted  coordinates if the transformation was
            successful.
@@ -256,10 +256,10 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These calls were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not  found  in  SVr4
-       curses, 4.4BSD curses, or any other previous version of curses.
+       These calls were designed for  <EM>ncurses</EM>,  and  are  not  found  in  SVr4
+       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous version of <EM>curses</EM>.
 
-       SVr4  curses had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It is
+       SVr4  <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It is
        mentioned in a few places, but with no supporting documentation:
 
        <STRONG>o</STRONG>   the "libcurses" manual page lists functions for this feature  which
@@ -281,19 +281,19 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
                mouse_info        minfo   Mi       Mouse status information
                req_mouse_pos     reqmp   RQ       Request mouse position report
 
-       <STRONG>o</STRONG>   the  interface  made assumptions (as does ncurses) about the escape
+       <STRONG>o</STRONG>   the  interface  made assumptions (as does <EM>ncurses</EM>) about the escape
            sequences sent to and received from the terminal.
 
-           For instance the SVr4 curses library used the <STRONG>get_mouse</STRONG>  capability
+           For instance the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG>  capability
            to  tell  the  terminal  which  mouse button events it should send,
            passing the mouse-button bit-mask to the terminal.  Also, it  could
            ask  the  terminal  where  the  mouse  was  using the <STRONG>req_mouse_pos</STRONG>
            capability.
 
            Those features required a terminal which had been modified to  work
-           with curses.  They were not part of the X Consortium's xterm.
+           with <EM>curses</EM>.  They were not part of the X Consortium's xterm.
 
-       When  developing the xterm mouse support for ncurses in September 1995,
+       When  developing the xterm mouse support for <EM>ncurses</EM> in September 1995,
        Eric Raymond was uninterested in using the same interface  due  to  its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
        in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
@@ -304,7 +304,7 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        can  be  used  to  test  whether  these  features  are present.  If the
        interface is  changed,  the  value  of  <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will  be
        incremented.   These  values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified
-       when configuring ncurses:
+       when configuring <EM>ncurses</EM>:
 
           1  has definitions for reserved events.  The mask uses 28 bits.
 
@@ -314,8 +314,8 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
        Additional fields may be added to the structure in the future.
 
-       Under <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, these calls are  implemented  using  either  xterm's
-       built-in mouse-tracking API or platform-specific drivers including
+       Under <EM>ncurses</EM>, these calls are implemented using either xterm's  built-
+       in mouse-tracking API or platform-specific drivers including
 
           <STRONG>o</STRONG>   Alessandro Rubini's gpm server
 
@@ -324,12 +324,11 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
           <STRONG>o</STRONG>   OS/2 EMX
 
        If you are using an unsupported configuration, mouse events will not be
-       visible to <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> (and the <STRONG>mousemask</STRONG> function will  always  return
-       <STRONG>0</STRONG>).
+       visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
 
-       If  the  terminfo entry contains a <STRONG>XM</STRONG> string, this is used in the xterm
-       mouse driver to control the way the terminal is initialized  for  mouse
-       operation.   The  default,  if  <STRONG>XM</STRONG> is not found, corresponds to private
+       If the terminfo entry contains a <STRONG>XM</STRONG> string, this is used in  the  xterm
+       mouse  driver  to control the way the terminal is initialized for mouse
+       operation.  The default, if <STRONG>XM</STRONG> is not  found,  corresponds  to  private
        mode 1000 of xterm:
 
           \E[?1000%?%p1%{1}%=%th%el%;
@@ -338,44 +337,44 @@ <H1 class="no-header">curs_mouse 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
           \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
-       intended  for  use with touch screens (which may be pressure-sensitive)
+       The  <EM>z</EM>  member  in  the  event  structure is not presently used.  It is
+       intended for use with touch screens (which may  be  pressure-sensitive)
        or with 3D-mice/trackballs/power gloves.
 
-       The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
-       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
-       position reports as a sequence of presses of buttons  4  or  5  without
+       The  <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include <STRONG>REPORT_MOUSE_POSITION</STRONG>.
+       They are distinct.  For example, in xterm,  wheel/scrolling  mice  send
+       position  reports  as  a  sequence of presses of buttons 4 or 5 without
        matching button-releases.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse  events  under  xterm  will  not in fact be ignored during cooked
+       Mouse events under xterm will not in  fact  be  ignored  during  cooked
        mode, if they have been enabled by <STRONG>mousemask</STRONG>.  Instead, the xterm mouse
        report sequence will appear in the string read.
 
-       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 <STRONG>kmous</STRONG> set to
-       "\E[M" (the beginning of the response from  xterm  for  mouse  clicks).
-       Other  values  for  <STRONG>kmous</STRONG> are permitted, but under the same assumption,
+       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  <STRONG>kmous</STRONG>  set  to
+       "\E[M"  (the  beginning  of  the response from xterm for mouse clicks).
+       Other values for <STRONG>kmous</STRONG> are permitted, but under  the  same  assumption,
        i.e., it is the beginning of the response.
 
-       Because there are no standard terminal responses that  would  serve  to
-       identify  terminals  which  support  the  xterm mouse protocol, <STRONG>ncurses</STRONG>
+       Because  there  are  no standard terminal responses that would serve to
+       identify terminals which support  the  xterm  mouse  protocol,  <EM>ncurses</EM>
        assumes that if <STRONG>kmous</STRONG> is defined in the terminal description, or if the
-       terminal  description's  primary  name  or  aliases  contain the string
+       terminal description's primary  name  or  aliases  contain  the  string
        "xterm", then the terminal may send mouse events.  The <STRONG>kmous</STRONG> capability
-       is  checked first, allowing the use of newer xterm mouse protocols such
+       is checked first, allowing the use of newer xterm mouse protocols  such
        as xterm's private mode 1006.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index d6c82def2..e1472e1ec 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_opaque.3x,v 1.33 2023/09/23 22:59:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -74,7 +74,7 @@ <H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        This  implementation  provides functions which return properties set in
-       the WINDOW  structure,  allowing  it  to  be  "opaque"  if  the  symbol
+       the <STRONG>WINDOW</STRONG>  structure,  allowing  it  to  be  "opaque"  if  the  symbol
        <STRONG>NCURSES_OPAQUE</STRONG> is defined:
 
        <STRONG>is_cleared</STRONG>
@@ -118,12 +118,12 @@ <H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             returns the delay timeout as set in <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
 
        <STRONG>wgetparent</STRONG>
-            returns the parent WINDOW pointer  for  subwindows,  or  NULL  for
+            returns the parent <STRONG>WINDOW</STRONG> pointer  for  subwindows,  or  <STRONG>NULL</STRONG>  for
             windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
             returns the top and bottom rows for the scrolling margin as set in
-            <STRONG>wsetscrreg</STRONG>.
+            <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -135,10 +135,10 @@ <H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to <EM>ncurses</EM>.  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
-       NCURSES_VERSION.
+       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
+       <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -146,7 +146,7 @@ <H1 class="no-header">curs_opaque 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 68ab04fb4..68b7e3a18 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_pad.3x,v 1.43 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -161,9 +161,9 @@ <H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       BSD curses has no <EM>pad</EM> feature.
+       BSD <EM>curses</EM> has no <EM>pad</EM> feature.
 
-       SVr2  curses  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
+       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
        documenting  them  in  a  single  line each.  SVr3 (1987) provided more
        extensive documentation.
 
@@ -183,7 +183,7 @@ <H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        conditions.   The  behavior of <STRONG>subpad</STRONG> if the parent window is not a pad
        is undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4 curses sets a flag in the <STRONG>WINDOW</STRONG>  structure  in  <STRONG>newpad</STRONG>  which
+       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG>  structure  in  <STRONG>newpad</STRONG>  which
            tells if the window is a <EM>pad</EM>.
 
            However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
@@ -202,7 +202,7 @@ <H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            enough, a comment in the source code states  that  the  lack  of  a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD  7 curses sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and
+       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and
            <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
@@ -228,11 +228,11 @@ <H1 class="no-header">curs_pad 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index b0d8c668b..e458b1e03 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_print.3x,v 1.31 2023/09/23 23:04:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -74,10 +74,10 @@ <H1 class="no-header">curs_print 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        some  reason.   In  this  case,  <STRONG>errno</STRONG>  will  contain  either  an error
        associated with <STRONG>write(2)</STRONG> or one of the following:
 
-       ENODEV
+       <STRONG>ENODEV</STRONG>
             Capabilities for printer redirection do not exist.
 
-       ENOMEM
+       <STRONG>ENOMEM</STRONG>
             Couldn't allocate sufficient memory to buffer the printer write.
 
        When <STRONG>mcprint</STRONG> succeeds, it returns the  number  of  characters  actually
@@ -85,8 +85,10 @@ <H1 class="no-header">curs_print 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <STRONG>mcprint</STRONG> call was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4
-       curses, 4.4BSD curses, or any other previous version of curses.
+       The  <STRONG>mcprint</STRONG>  call  was  designed for <EM>ncurses</EM>, and is not found in SVr4
+       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous version of <EM>curses</EM>.  It  is
+       recommended   that   any   code  depending  on  <EM>ncurses</EM>  extensions  be
+       conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
@@ -98,7 +100,7 @@ <H1 class="no-header">curs_print 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 5e0231eb1..80295be49 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.53 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_slk.3x,v 1.60 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -75,23 +75,23 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>slk_attr_on(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attr_off(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attr_set(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       /* extension */
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>attr_t</STRONG> <STRONG>slk_attr(void);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>slk_color(short</STRONG> <EM>pair</EM><STRONG>);</STRONG>
-       /* extension */
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>extended_slk_color(int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The slk* functions manipulate the set of soft function-key labels  that
+       The <STRONG>slk</STRONG>* functions manipulate the set of soft function-key labels  that
        exist  on  many  terminals.   For those terminals that do not have soft
-       labels, <STRONG>curses</STRONG> takes over the bottom line of <STRONG>stdscr</STRONG>, reducing the  size
-       of  <STRONG>stdscr</STRONG> and the variable <STRONG>LINES</STRONG>.  <STRONG>curses</STRONG> standardizes on eight labels
-       of up to eight characters each.   In  addition  to  this,  the  ncurses
+       labels, <EM>curses</EM> takes over the bottom line of <STRONG>stdscr</STRONG>, reducing the  size
+       of  <STRONG>stdscr</STRONG> and the variable <STRONG>LINES</STRONG>.  <EM>curses</EM> standardizes on eight labels
+       of up to eight characters each.   In  addition  to  this,  the  <EM>ncurses</EM>
        implementation  supports  a  mode where it simulates 12 labels of up to
        five characters each.  This is  useful  for  PC-like  enduser  devices.
-       ncurses  simulates  this  mode  by  taking  over up to two lines at the
+       <EM>ncurses</EM>  simulates  this  mode  by  taking  over up to two lines at the
        bottom of the screen; it does not try to use any hardware  support  for
        this mode.
 
@@ -151,7 +151,7 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        correspond to <STRONG>attron</STRONG>,  <STRONG>attrset</STRONG>,  <STRONG>attroff</STRONG>  and  <STRONG>attr_get</STRONG>,  respectively.
        They  have  an  effect  only if soft labels are simulated on the bottom
        line of the screen.  The default highlight for soft keys is  A_STANDOUT
-       (as in System V curses, which does not document this fact).
+       (as in System V <EM>curses</EM>, which does not document this fact).
 
 
 </PRE><H3><a name="h3-Colors">Colors</a></H3><PRE>
@@ -184,12 +184,12 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
           <STRONG>slk_attr_set</STRONG>
                returns an error if the  terminal  or  the  softkeys  were  not
                initialized,   or   the   color   pair  is  outside  the  range
-               0..COLOR_PAIRS-1.
+               0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_color</STRONG>
                returns an error if the  terminal  or  the  softkeys  were  not
                initialized,   or   the   color   pair  is  outside  the  range
-               0..COLOR_PAIRS-1.
+               0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_init</STRONG>
                returns an error if the format parameter is outside  the  range
@@ -207,31 +207,31 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        SVr3 introduced these functions:
-         slk_clear
-         slk_init
-         slk_label
-         slk_noutrefresh
-         slk_refresh
-         slk_restore
-         slk_set
-         slk_touch
+         <STRONG>slk_clear</STRONG>
+         <STRONG>slk_init</STRONG>
+         <STRONG>slk_label</STRONG>
+         <STRONG>slk_noutrefresh</STRONG>
+         <STRONG>slk_refresh</STRONG>
+         <STRONG>slk_restore</STRONG>
+         <STRONG>slk_set</STRONG>
+         <STRONG>slk_touch</STRONG>
 
        SVr4 added these functions:
-         slk_attroff
-         slk_attron
-         slk_attrset
-         slk_start
+         <STRONG>slk_attroff</STRONG>
+         <STRONG>slk_attron</STRONG>
+         <STRONG>slk_attrset</STRONG>
+         <STRONG>slk_start</STRONG>
 
-       X/Open Curses added these:
-         slk_attr_off
-         slk_attr_on
-         slk_attr_set
-         slk_color
-         slk_wset
+       X/Open <EM>curses</EM> added these:
+         <STRONG>slk_attr_off</STRONG>
+         <STRONG>slk_attr_on</STRONG>
+         <STRONG>slk_attr_set</STRONG>
+         <STRONG>slk_color</STRONG>
+         <STRONG>slk_wset</STRONG>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open Curses documents the <EM>opts</EM> argument as reserved for  future  use,
+       X/Open <EM>curses</EM> documents the <EM>opts</EM> argument as reserved for  future  use,
        saying  that  it must be null.  This implementation uses that parameter
        in ABI 6 for the functions which have a color-pair parameter to support
        extended color pairs.
@@ -247,8 +247,8 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4,  described  the  soft-key  functions,
-       with some differences from SVr4 curses:
+       The XSI <EM>curses</EM> standard, Issue 4,  described  the  soft-key  functions,
+       with some differences from SVr4 <EM>curses</EM>:
 
        <STRONG>o</STRONG>   It  added  functions like the SVr4 attribute-manipulation functions
            <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attrset</STRONG>,  but   which   use   <STRONG>attr_t</STRONG>
@@ -264,7 +264,7 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   It added <STRONG>slk_color</STRONG>.
 
-       Although  <STRONG>slk_start</STRONG>  is  declared in the curses header file, it was not
+       Although  <STRONG>slk_start</STRONG>  is  declared in the <EM>curses</EM> header file, it was not
        documented by SVr4 other than its presence in a list of libtermlib.so.1
        symbols.  Reading the source code (i.e., Illumos):
 
@@ -280,23 +280,23 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            case, <STRONG>slk_start</STRONG> uses the number of  groups  <EM>ng</EM>  (3  for  the  3-2-3
            layout, 2 for the 4-4 layout) which <STRONG>slk_init</STRONG> provided.
 
-           If  <EM>ng</EM>  is  neither  2  or  3,  <STRONG>slk_start</STRONG>  checks  the terminfo <EM>fln</EM>
+           If  <EM>ng</EM>  is  neither  2  or  3,  <STRONG>slk_start</STRONG>  checks  the terminfo <STRONG>fln</STRONG>
            (label_format) capability, interpreting that as  a  comma-separated
            list of numbers, e.g., "3,2,3" for the 3-2-3 layout.
 
-           Finally, if there is no <EM>fln</EM> capability, <STRONG>slk_start</STRONG> returns ERR.
+           Finally, if there is no <STRONG>fln</STRONG> capability, <STRONG>slk_start</STRONG> returns <STRONG>ERR</STRONG>.
 
        <STRONG>o</STRONG>   If  <STRONG>slk_start</STRONG>  is given a non-null <EM>gp</EM>, it copies the <EM>ng</EM> elements of
            the group of soft-keys, up to 16.
 
            If there are more than 16 elements, <STRONG>slk_start</STRONG> returns an error.
 
-       <STRONG>o</STRONG>   The format codes <STRONG>2</STRONG> and <STRONG>3</STRONG> for <STRONG>slk_init</STRONG>  were  added  by  ncurses  in
+       <STRONG>o</STRONG>   The format codes <STRONG>2</STRONG> and <STRONG>3</STRONG> for <STRONG>slk_init</STRONG>  were  added  by  <EM>ncurses</EM>  in
            1996.  PDCurses 2.4 added this feature in 2001.
 
-       The function <STRONG>slk_attr</STRONG> was added by ncurses in 1996.
+       The function <STRONG>slk_attr</STRONG> was added by <EM>ncurses</EM> in 1996.
 
-       X/Open  Curses  does  not  specify a limit for the number of colors and
+       X/Open  <EM>curses</EM>  does  not  specify a limit for the number of colors and
        color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
        for  the  parameters,  it carries over SVr4's implementation detail for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
@@ -307,11 +307,11 @@ <H1 class="no-header">curs_slk 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 3ebc130d9..3815079b0 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.99 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.108 2023/09/23 23:38:10 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -104,16 +104,16 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>char</STRONG> <STRONG>*tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>tiscan_s(int</STRONG> <STRONG>*</STRONG><EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These low-level routines must be called by programs that have  to  deal
-       directly   with  the  <STRONG>terminfo</STRONG>  database  to  handle  certain  terminal
+       directly   with  the  <EM>terminfo</EM>  database  to  handle  certain  terminal
        capabilities,  such  as  programming  function  keys.   For  all  other
-       functionality,  <STRONG>curses</STRONG>  routines  are  more  suitable  and their use is
+       functionality,  <EM>curses</EM>  routines  are  more  suitable  and their use is
        recommended.
 
        None of these functions use  (or  are  aware  of)  multibyte  character
@@ -194,26 +194,26 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>:
 
                <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, cannot be used for
-                    curses applications.
+                    <EM>curses</EM> applications.
 
                     <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
                     checking the <STRONG>hc</STRONG> (<STRONG>hardcopy</STRONG>) capability.
 
                <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
-                    a generic type, having too little information  for  curses
+                    a generic type, having too little information  for  <EM>curses</EM>
                     applications to run.
 
                     <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
                     checking the <STRONG>gn</STRONG> (<STRONG>generic_type</STRONG>) capability.
 
-               <STRONG>-1</STRONG>   means that the <STRONG>terminfo</STRONG> database could not be found.
+               <STRONG>-1</STRONG>   means that the <EM>terminfo</EM> database could not be found.
 
                If <EM>errret</EM> is null,  <STRONG>setupterm</STRONG>  prints  an  error  message  upon
                finding an error and exits.  Thus, the simplest call is:
 
-                     <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>,
+               <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>,
 
-               which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
+          which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
@@ -337,8 +337,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
        While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions which do not use the high-
-       level curses state, they are declared in <STRONG>&lt;curses.h&gt;</STRONG> because SystemV did
-       this (see <EM>HISTORY</EM>).
+       level  curses  state,  they are declared in <STRONG>&lt;curses.h&gt;</STRONG> because System V
+       did this (see <EM>HISTORY</EM>).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
@@ -372,13 +372,13 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Terminal-Capability-Names">Terminal Capability Names</a></H3><PRE>
        These null-terminated arrays contain
 
-       <STRONG>o</STRONG>   the short terminfo names ("codes"),
+       <STRONG>o</STRONG>   the short <EM>terminfo</EM> names ("codes"),
 
-       <STRONG>o</STRONG>   the <STRONG>termcap</STRONG> names ("names"), and
+       <STRONG>o</STRONG>   the <EM>termcap</EM> names ("names"), and
 
-       <STRONG>o</STRONG>   the long terminfo names ("fnames")
+       <STRONG>o</STRONG>   the long <EM>terminfo</EM> names ("fnames")
 
-       for each of the predefined <STRONG>terminfo</STRONG> variables:
+       for each of the predefined <EM>terminfo</EM> variables:
 
               <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*boolnames[]</STRONG>, <STRONG>*boolcodes[]</STRONG>, <STRONG>*boolfnames[]</STRONG>
               <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*numnames[]</STRONG>, <STRONG>*numcodes[]</STRONG>, <STRONG>*numfnames[]</STRONG>
@@ -390,7 +390,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        description.  As a side-effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
        memory.  If an application calls
 
-               <STRONG>del_curterm(cur_term);</STRONG>
+              <STRONG>del_curterm(cur_term);</STRONG>
 
        the memory will be freed.
 
@@ -453,9 +453,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        In SVr4, those are found in <STRONG>&lt;curses.h&gt;</STRONG>, but  except  for  <STRONG>setterm</STRONG>,  are
        likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
        page.  The manual page notes that the <STRONG>setterm</STRONG> routine was  replaced  by
-       <STRONG>setupterm</STRONG>, stating that the call:
+       <STRONG>setupterm</STRONG>, stating that the call
 
-             <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
+              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
 
        provides   the   same   functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  and  is  not
        recommended for new programs.  This  implementation  provides  each  of
@@ -464,61 +464,61 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        SVr2 introduced the terminfo feature.  Its programming manual mentioned
-       these low-level functions:
+       the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
-       ------------------------------------------------------------
-       fixterm     restore tty to "in curses" state
-
-       gettmode    establish current tty modes
-       mvcur       low level cursor motion
-       putp        utility  function  that  uses  <STRONG>tputs</STRONG>  to   send
-                   characters via <STRONG>putchar</STRONG>.
-       resetterm   set tty modes to "out of curses" state
-       resetty     reset tty flags to stored value
-       saveterm    save current modes as "in curses" state
-       savetty     store current tty flags
-       setterm     establish terminal with given type
-       setupterm   establish terminal with given type
-       tparm       instantiate a string expression with parameters
-       tputs       apply padding information to a string
-       vidattr     like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG>
-       vidputs     output  a string to put terminal in a specified
-                   video attribute mode
-
-       The programming manual also mentioned functions  provided  for  termcap
-       compatibility (commenting that they "may go away at a later date"):
+       ------------------------------------------------------------------------
+       <STRONG>fixterm</STRONG>     restore tty to "in curses" state
+
+       <STRONG>gettmode</STRONG>    establish current tty modes
+       <STRONG>mvcur</STRONG>       low level cursor motion
+       <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
+                   <STRONG>putchar</STRONG>.
+       <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
+       <STRONG>resetty</STRONG>     reset tty flags to stored value
+       <STRONG>saveterm</STRONG>    save current modes as "in curses" state
+       <STRONG>savetty</STRONG>     store current tty flags
+       <STRONG>setterm</STRONG>     establish terminal with given type
+       <STRONG>setupterm</STRONG>   establish terminal with given type
+       <STRONG>tparm</STRONG>       instantiate a string expression with parameters
+       <STRONG>tputs</STRONG>       apply padding information to a string
+       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG>
+       <STRONG>vidputs</STRONG>     output  a  string  to  put  terminal  in  a specified video
+                   attribute mode
+
+       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
-       ------------------------------------------------
-       tgetent    look up termcap entry for given <EM>name</EM>
-       tgetflag   get boolean entry for given <EM>id</EM>
-       tgetnum    get numeric entry for given <EM>id</EM>
-       tgetstr    get string entry for given <EM>id</EM>
-       tgoto      apply parameters to given capability
-       tputs      apply padding to capability, calling
-                  a function to put characters
+       ------------------------------------------------------------------------
+       <STRONG>tgetent</STRONG>    look up <EM>termcap</EM> entry for given <EM>name</EM>
+       <STRONG>tgetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tgetnum</STRONG>    get numeric entry for given <EM>id</EM>
+       <STRONG>tgetstr</STRONG>    get string entry for given <EM>id</EM>
+       <STRONG>tgoto</STRONG>      apply parameters to given capability
+       <STRONG>tputs</STRONG>      apply  padding  to  capability,  calling  a  function to put
+                  characters
 
        Early terminfo programs obtained capability values  from  the  <STRONG>TERMINAL</STRONG>
        structure initialized by <STRONG>setupterm</STRONG>.
 
        SVr3  extended  terminfo  by  adding  functions  to retrieve capability
-       values (like the termcap interface), and reusing tgoto and tputs:
+       values (like the termcap interface), and reusing <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>:
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
-       -------------------------------------------
-       tigetflag   get boolean entry for given <EM>id</EM>
-       tigetnum    get numeric entry for given <EM>id</EM>
-       tigetstr    get string entry for given <EM>id</EM>
+       ------------------------------------------------------------------------
+       <STRONG>tigetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
+       <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3 also replaced several of the SVr2 terminfo functions which had  no
-       counterpart in the termcap interface, documenting them as obsolete:
+       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions which had  no
+       counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
-       -----------------------------
+       ------------------------------------------------------------------------
        crmode      cbreak
        fixterm     reset_prog_mode
-       gettmode    N/A
+       gettmode    <EM>n/a</EM>
        nocrmode    nocbreak
        resetterm   reset_shell_mode
        saveterm    def_prog_mode
@@ -542,7 +542,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
        SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       There are other low-level functions declared in the curses header files
+       There are other low-level functions declared in the <EM>curses</EM> header files
        on Unix systems,  but  none  were  documented.   The  functions  marked
        "obsolete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
 
@@ -601,7 +601,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            hand, <EM>writable</EM> <EM>strings</EM> are an obsolescent feature.
 
            As  an  extension,  this implementation can be configured to change
-           the function prototypes to use the <STRONG>const</STRONG> keyword.  The ncurses  ABI
+           the function prototypes to use the <STRONG>const</STRONG> keyword.  The <EM>ncurses</EM>  ABI
            6 enables this feature by default.
 
        <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
@@ -692,7 +692,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index d1da3f8cd..594caffa2 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.34 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_touch.3x,v 1.39 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -114,9 +114,9 @@ <H1 class="no-header">curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions were introduced by SVr4.   The  Solaris  curses  header
+       These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
        file, for instance, defines both an actual function and macro for each.
-       The macros give the same result as the actual functions.   SVr4  curses
+       The macros give the same result as the actual functions.   SVr4  <EM>curses</EM>
        does  not check the window parameter <EM>win</EM> to ensure that it is not <STRONG>NULL</STRONG>;
        otherwise this implementation behaves the same as SVr4.
 
@@ -129,11 +129,11 @@ <H1 class="no-header">curs_touch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 6fb618fce..df12d719a 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.35 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_trace.3x,v 1.37 2023/09/23 20:53:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 31740a583..5d4166974 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.77 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_util.3x,v 1.83 2023/09/23 23:14:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -72,7 +72,7 @@ <H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>delay_output(int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flushinp(void);</STRONG>
 
-       /* extensions */
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
 
@@ -151,10 +151,10 @@ <H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-use_env">use_env</a></H3><PRE>
        The <STRONG>use_env</STRONG> routine, if  used,  should  be  called  before  <STRONG>initscr</STRONG>  or
        <STRONG>newterm</STRONG>  are  called  (because  those  compute  the  screen  size).  It
-       modifies the way <STRONG>ncurses</STRONG> treats environment variables when  determining
+       modifies the way <EM>ncurses</EM> treats environment variables when  determining
        the screen size.
 
-       <STRONG>o</STRONG>   Normally  <STRONG>ncurses</STRONG>  looks  first  at  the  terminal database for the
+       <STRONG>o</STRONG>   Normally  <EM>ncurses</EM>  looks  first  at  the  terminal database for the
            screen size.
 
            If <STRONG>use_env</STRONG> was called with  <STRONG>FALSE</STRONG>  for  parameter,  it  stops  here
@@ -188,21 +188,18 @@ <H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>ncurses</STRONG> re-fetches the value of the environment variables  so  that
            it is still the environment variables which set the screen size.
 
-       The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as summarized here:
+       The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as follows.
 
-           <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
-           ----------------------------------------------------------------
-           TRUE      FALSE        This  is  the default behavior.  <STRONG>ncurses</STRONG>
-                                  uses  operating  system   calls   unless
-                                  overridden   by   $LINES   or   $COLUMNS
-                                  environment variables.
-           TRUE      TRUE         <STRONG>ncurses</STRONG>  updates  $LINES  and   $COLUMNS
-                                  based on operating system calls.
-           FALSE     TRUE         <STRONG>ncurses</STRONG>  ignores  $LINES  and  $COLUMNS,
-                                  uses operating system  calls  to  obtain
-                                  size.
-           FALSE     FALSE        <STRONG>ncurses</STRONG>  relies on the terminal database
-                                  to determine size.
+              <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
+              -----------------------------------------------------------------
+              <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        This  is  the  default behavior.  <EM>ncurses</EM>
+                                     uses  operating   system   calls   unless
+                                     overridden    by    <STRONG>LINES</STRONG>    or   <STRONG>COLUMNS</STRONG>
+                                     environment variables; default.
+              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM> updates <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  based
+                                     on operating system calls.
+              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  ignores <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG>, using
+                                     operating system calls to obtain size.
 
 
 </PRE><H3><a name="h3-putwin_getwin">putwin/getwin</a></H3><PRE>
@@ -282,7 +279,7 @@ <H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <STRONG>ncurses</STRONG>.  They
        were not supported on Version 7, BSD or System V  implementations.   It
        is  recommended  that  any  code  depending  on  <STRONG>ncurses</STRONG>  extensions be
-       conditioned using NCURSES_VERSION.
+       conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
@@ -372,7 +369,7 @@ <H1 class="no-header">curs_util 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 1afcc721c..ac1f581ea 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
+  * @Id: define_key.3x,v 1.34 2023/09/23 23:04:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -58,39 +58,39 @@ <H1 class="no-header">define_key 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the curses library.  It permits an application
+       This  is an extension to the <EM>curses</EM> library.  It permits an application
        to define keycodes with their corresponding control  strings,  so  that
-       the ncurses library will interpret them just as it would the predefined
+       the <EM>ncurses</EM> library will interpret them just as it would the predefined
        codes in the terminfo database.
 
-       If the given string is null, any existing definition for the keycode is
-       removed.   Similarly,  if  the  given  keycode is negative or zero, any
-       existing string for the given definition is removed.
+       If <EM>definition</EM> is <STRONG>NULL</STRONG>, any existing one for  the  keycode  is  removed.
+       Similarly,  if  the  given  keycode  is  negative or zero, any existing
+       string for the given definition is removed.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The keycode must  be  greater  than  zero,  and  the  string  non-null,
-       otherwise  <STRONG>ERR</STRONG>  is  returned.   <STRONG>ERR</STRONG>  may  also  be returned if there is
+       Either <EM>keycode</EM> must be greater than zero, or <EM>definition</EM>  must  be  non-
+       <STRONG>NULL</STRONG>,  otherwise <STRONG>ERR</STRONG> is returned.  <STRONG>ERR</STRONG> may also be returned if there is
        insufficient memory to allocate the data to store the  definition.   If
        no error is detected, <STRONG>OK</STRONG> is returned.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
+       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index d2c768b0c..8114da101 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@ <H1 class="no-header">form 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 60622bdf1..29b84671a 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -522,7 +522,7 @@ <H1 class="no-header">infocmp 1m 2023-09-16 ncurses 6.4 User commands</H1>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 32130894e..b7250b684 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@ <H1 class="no-header">infotocap 1m 2023-09-16 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index a2f601a09..1512b4e98 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.20 2023/09/16 23:38:39 tom Exp @
+  * @Id: key_defined.3x,v 1.26 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -58,7 +58,7 @@ <H1 class="no-header">key_defined 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the curses library.  It permits an application
+       This  is an extension to the <EM>curses</EM> library.  It permits an application
        to determine if a string is currently bound to any keycode.
 
 
@@ -69,21 +69,21 @@ <H1 class="no-header">key_defined 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This routine is specific to ncurses.  It was not supported  on  Version
+       This routine is specific to <EM>ncurses</EM>.  It was not supported  on  Version
        7,  BSD  or  System V implementations.  It is recommended that any code
-       depending on them be conditioned using NCURSES_VERSION.
+       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>.
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 5d0bdb348..826bfaf58 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.21 2023/09/16 23:38:39 tom Exp @
+  * @Id: keybound.3x,v 1.27 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -58,35 +58,35 @@ <H1 class="no-header">keybound 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the curses library.  It permits an application
+       This  is an extension to the <EM>curses</EM> library.  It permits an application
        to determine the string which is defined in the terminfo  for  specific
        keycodes.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <EM>keycode</EM> parameter must be greater than zero, else NULL is returned.
-       If it does not correspond to a defined key, then NULL is returned.  The
+       The <EM>keycode</EM> parameter must be greater than zero, else <STRONG>NULL</STRONG> is returned.
+       If it does not correspond to a defined key, then <STRONG>NULL</STRONG> is returned.  The
        <EM>count</EM>  parameter  is  used  to allow the application to iterate through
        multiple  definitions,  counting  from  zero.   When  successful,   the
        function returns a string which must be freed by the caller.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  routine  is specific to ncurses.  It was not supported on Version
+       This  routine  is specific to <EM>ncurses</EM>.  It was not supported on Version
        7, BSD or System V implementations.  It is recommended  that  any  code
-       depending on them be conditioned using NCURSES_VERSION.
+       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index dce2a0a0f..4e65b40c6 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
+  * @Id: keyok.3x,v 1.32 2023/09/23 22:49:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -58,7 +58,7 @@ <H1 class="no-header">keyok 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the curses library.  It permits an application
+       This  is an extension to the <EM>curses</EM> library.  It permits an application
        to disable specific keycodes, rather than use the  <STRONG>keypad</STRONG>  function  to
        disable all keycodes.  Keys that have been disabled can be re-enabled.
 
@@ -71,21 +71,21 @@ <H1 class="no-header">keyok 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This routine is specific to ncurses.  It was not supported  on  Version
+       This routine is specific to <EM>ncurses</EM>.  It was not supported  on  Version
        7,  BSD  or  System V implementations.  It is recommended that any code
-       depending on them be conditioned using NCURSES_VERSION.
+       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>.
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 
-ncurses 6.4                       2023-09-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index e2eaadc6f..b93d72f68 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@ <H1 class="no-header">menu 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 59e5689fb..3c20d8cea 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.171 2023/09/16 23:38:39 tom Exp @
+  * @Id: ncurses.3x,v 1.174 2023/09/23 22:58:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -557,7 +557,7 @@ <H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
                     overlay                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     overwrite                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
-                    pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>*
+                    pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pechochar                <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pnoutrefresh             <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     prefresh                 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
@@ -608,7 +608,7 @@ <H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-                    slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
+                    slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     standout                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     start_color              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -627,7 +627,7 @@ <H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
                     tigetnum                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-                    tiparm                   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
+                    tiparm                   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tiparm_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
                     tiscan_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
                     touchline                <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
@@ -1482,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 6994763ef..e8c75c2ef 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@ <H1 class="no-header">ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</H1
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index b2c0d2095..ce4adc314 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.30 2023/09/16 23:38:39 tom Exp @
+  * @Id: new_pair.3x,v 1.36 2023/09/23 22:37:46 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions are an extension to the curses library.  They permit an
+       These functions are an extension to the <EM>curses</EM> library.  They permit an
        application   to   dynamically   allocate   a   color  pair  using  the
        foreground/background colors rather than  assign  a  fixed  color  pair
        number, and return an unused pair to the pool.
@@ -75,7 +75,7 @@ <H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            it.  That is, the foreground and background colors are applied as a
            pair.
 
-       <STRONG>o</STRONG>   Color pairs are the  curses  library's  way  of  managing  a  color
+       <STRONG>o</STRONG>   Color pairs are the  <EM>curses</EM>  library's  way  of  managing  a  color
            palette  on  a terminal.  If the library does not keep track of the
            <EM>combinations</EM> of colors which are displayed, it will be inefficient.
 
@@ -122,7 +122,7 @@ <H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        All of the color pairs are allocated from a  table  of  possible  color
        pairs.   The  size  of  the  table  is determined by the terminfo <STRONG>pairs</STRONG>
        capability.  The table is shared with  <STRONG>init_pair</STRONG>;  in  fact  <STRONG>alloc_pair</STRONG>
-       calls  <STRONG>init_pair</STRONG> after updating the ncurses library's fast index to the
+       calls  <STRONG>init_pair</STRONG> after updating the <EM>ncurses</EM> library's fast index to the
        colors versus color pairs.
 
 
@@ -151,21 +151,21 @@ <H1 class="no-header">new_pair 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 8b8c6d829..9b1ac49ce 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.50 2023/09/16 23:38:39 tom Exp @
+  * @Id: panel.3x,v 1.52 2023/09/23 23:37:26 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -261,7 +261,7 @@ <H1 class="no-header">panel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
            domain implementation by Warren Tucker published  in  <EM>u386mon</EM>  2.20
            (1990).
 
-           According  to  Tucker, the SystemV panel library was first released
+           According  to Tucker, the System V panel library was first released
            in SVr3.2 (1988), and his implementation  helped  with  a  port  to
            SVr3.1 (1987).
 
@@ -281,7 +281,7 @@ <H1 class="no-header">panel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -295,7 +295,7 @@ <H1 class="no-header">panel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 5c3979cda..555a7ce8d 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.40 2023/09/16 23:38:39 tom Exp @
+  * @Id: resizeterm.3x,v 1.45 2023/09/23 22:49:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -61,21 +61,21 @@ <H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This is an extension to the curses library.  It provides callers with a
-       hook  into  the  <STRONG>ncurses</STRONG>  data  to resize windows, primarily for use by
+       This is an extension to the <EM>curses</EM> library.  It provides callers with a
+       hook  into  the  <EM>ncurses</EM>  data  to resize windows, primarily for use by
        programs running in  an  X  Window  terminal  (e.g.,  xterm)  when  the
        terminal's screen size is changed by the user:
 
-       <STRONG>o</STRONG>   Curses  windows  cannot extend outside the screen.  If the terminal
-           is shrunk, curses windows must be shrunk to fit.
+       <STRONG>o</STRONG>   <EM>curses</EM>  windows  cannot extend outside the screen.  If the terminal
+           is shrunk, <EM>curses</EM> windows must be shrunk to fit.
 
        <STRONG>o</STRONG>   If the terminal is stretched, rows and/or columns can be  added  to
            existing  windows.   The  added  cells  should  match  the  current
            attributes of the windows.
 
        If the calling program has not set up a handler for  <STRONG>SIGWINCH</STRONG>  when  it
-       initializes  <STRONG>ncurses</STRONG>  (e.g.,  using  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>), then
-       <STRONG>ncurses</STRONG> sets a handler for <STRONG>SIGWINCH</STRONG> which notifies the library  when  a
+       initializes  <EM>ncurses</EM>  (e.g.,  using  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>), then
+       <EM>ncurses</EM> sets a handler for <STRONG>SIGWINCH</STRONG> which notifies the library  when  a
        window-size   event   has   occurred.   The  library  checks  for  this
        notification
 
@@ -99,7 +99,7 @@ <H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-resizeterm">resizeterm</a></H3><PRE>
        The function <STRONG>resizeterm</STRONG> resizes the standard and current windows (i.e.,
        <STRONG>stdscr</STRONG>  and  <STRONG>curscr</STRONG>)  to  the  specified  dimensions, and adjusts other
-       bookkeeping data used by the <STRONG>ncurses</STRONG> library  that  record  the  window
+       bookkeeping data used by the <EM>ncurses</EM> library  that  record  the  window
        dimensions such as the <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG> variables.
 
 
@@ -144,7 +144,7 @@ <H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        them in a context where <STRONG>malloc</STRONG> or <STRONG>realloc</STRONG> may  have  been  interrupted,
        since it uses those functions.
 
-       If ncurses is configured to supply its own <STRONG>SIGWINCH</STRONG> handler,
+       If <EM>ncurses</EM> is configured to supply its own <STRONG>SIGWINCH</STRONG> handler,
 
        <STRONG>o</STRONG>   on receipt of a <STRONG>SIGWINCH</STRONG>, the handler sets a flag
 
@@ -161,7 +161,7 @@ <H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
            Calling <STRONG>resizeterm</STRONG> or <STRONG>resize_term</STRONG> directly from a signal handler is
            unsafe.   This  indirect  method  is  used to provide a safe way to
-           resize the ncurses data structures.
+           resize the <EM>ncurses</EM> data structures.
 
        If the environment variables <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> are set,  this  overrides
        the  library's  use  of  the  window  size  obtained from the operating
@@ -170,29 +170,29 @@ <H1 class="no-header">resizeterm 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       It is possible to resize the screen with SVr4 curses, by
+       It is possible to resize the screen with SVr4 <EM>curses</EM>, by
 
-       <STRONG>o</STRONG>   exiting curses with <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> and
+       <STRONG>o</STRONG>   exiting <EM>curses</EM> with <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> and
 
        <STRONG>o</STRONG>   resuming using <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.
 
        Doing that clears the screen and is visually distracting.
 
-       This  extension  of ncurses was introduced in mid-1995.  It was adopted
-       in NetBSD curses (2001) and PDCurses (2003).
+       This  extension  of <EM>ncurses</EM> was introduced in mid-1995.  It was adopted
+       in NetBSD <EM>curses</EM> (2001) and PDCurses (2003).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
-       curses).
+       <EM>curses</EM>)
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-09-23                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 97181eebc..55a1f21dd 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.31 2023/09/16 23:38:39 tom Exp @
+  * @Id: scr_dump.5,v 1.33 2023/09/23 23:37:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-09-16 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-09-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-09-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -124,8 +124,8 @@ <H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
            into  the  array of line-data and adjust the <STRONG>WINDOW</STRONG> structure which
            was read back into memory.
 
-       This is similar to Unix SystemV, but does not write a "magic number" to
-       identify the file format.
+       This is similar to Unix System V, but does not write a  "magic  number"
+       to identify the file format.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -165,8 +165,8 @@ <H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
        <STRONG>or</STRONG> <STRONG>to</STRONG> <STRONG>earlier</STRONG> <STRONG>XPG</STRONG> <STRONG>releases</STRONG>, for clarity.
 
 
-</PRE><H3><a name="h3-Unix-SystemV">Unix SystemV</a></H3><PRE>
-       Unix SystemV curses identified the file  format  by  writing  a  "magic
+</PRE><H3><a name="h3-Unix-System-V">Unix System V</a></H3><PRE>
+       Unix System V curses identified the file format  by  writing  a  "magic
        number" at the beginning of the dump.  The <STRONG>WINDOW</STRONG> data and the lines of
        text follow, all in binary form.
 
@@ -233,7 +233,7 @@ <H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-PDCurses">PDCurses</a></H3><PRE>
        PDCurses added support for screen dumps in version  2.7  (2005).   Like
-       Unix  SystemV  and  ncurses5, it writes the <STRONG>WINDOW</STRONG> structure in binary,
+       Unix  System V  and ncurses5, it writes the <STRONG>WINDOW</STRONG> structure in binary,
        but begins the file with its three-byte identifier "PDC", followed by a
        one-byte version, e.g.,
 
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-16                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-09-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -422,7 +422,7 @@ <H1 class="no-header">scr_dump 5 2023-09-16 ncurses 6.4 File formats</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-X_Open-Curses">X/Open Curses</a></li>
-<li><a href="#h3-Unix-SystemV">Unix SystemV</a></li>
+<li><a href="#h3-Unix-System-V">Unix System V</a></li>
 <li><a href="#h3-Solaris">Solaris</a></li>
 <li><a href="#h3-PDCurses">PDCurses</a></li>
 <li><a href="#h3-NetBSD">NetBSD</a></li>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 563da4db1..d61176fc3 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@ <H1 class="no-header">tabs 1 2023-09-16 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 0578da6ea..c1f2ea725 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 54ad85bba..065b6d585 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -475,7 +475,7 @@ <H1 class="no-header">tic 1m 2023-09-16 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 6a334303c..f28c0c54f 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@ <H1 class="no-header">toe 1m 2023-09-16 ncurses 6.4 User commands</H1>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 42064ad59..60726515e 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@ <H1 class="no-header">tput 1 2023-09-16 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 4b07fc2df..06aad9cdc 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@ <H1 class="no-header">tset 1 2023-09-16 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230917).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
 
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 744ad3854..6b1e5bac3 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.77 2023/09/16 23:34:43 tom Exp $
-.TH curs_color 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.82 2023/09/23 22:24:15 tom Exp $
+.TH curs_color 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -55,112 +55,103 @@
 \fB\%PAIR_NUMBER\fP \-
 manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint start_color(void);\fP
-.sp
+.PP
 \fBbool has_colors(void);\fP
-.br
 \fBbool can_change_color(void);\fP
-.sp
+.PP
 \fBint init_pair(short \fIpair\fB, short \fIf\fB, short \fIb\fB);\fR
-.br
 \fBint init_color(short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
-.br
-/* extensions */
-.br
+\fI/* extensions */\fP
 \fBint init_extended_pair(int \fIpair\fB, int \fIf\fB, int \fIb\fB);\fR
-.br
 \fBint init_extended_color(int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
-.sp
+.PP
 \fBint color_content(short \fIcolor\fB, short *\fIr\fB, short *\fIg\fB, short *\fIb\fB);\fR
-.br
 \fBint pair_content(short \fIpair\fB, short *\fIf\fB, short *\fIb\fB);\fR
-.br
-/* extensions */
-.br
+\fI/* extensions */\fP
 \fBint extended_color_content(int \fIcolor\fB, int *\fIr\fB, int *\fIg\fB, int *\fIb\fB);\fR
-.br
 \fBint extended_pair_content(int \fIpair\fB, int *\fIf\fB, int *\fIb\fB);\fR
-.sp
-/* extensions */
-.br
+.PP
+\fI/* extensions */\fP
 \fBvoid reset_color_pairs(void);\fP
-.sp
+.PP
 \fBint COLOR_PAIR(int \fIn\fB);\fR
-.br
 \fBPAIR_NUMBER(\fIattrs\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS Overview
-\fBcurses\fP supports color attributes on terminals with that capability.
-To use these routines \fBstart_color\fP must be called, usually right after
-\fBinitscr\fP.
+\fIcurses\fP supports color attributes on terminals with that capability.
+To use these routines \fB\%start_color\fP must be called, usually right after
+\fB\%initscr\fP.
 Colors are always used in pairs (referred to as color-pairs).
 A color-pair consists of a foreground color (for characters) and a background
 color (for the blank field on which the characters are displayed).
-A programmer initializes a color-pair with the routine \fBinit_pair\fP.
-After it has been initialized, \fBCOLOR_PAIR\fP(\fIn\fP)
+A programmer initializes a color-pair with the routine \fB\%init_pair\fP.
+After it has been initialized, \fB\%COLOR_PAIR\fP(\fIn\fP)
 can be used to convert the pair to a video attribute.
 .PP
 If a terminal is capable of redefining colors, the programmer can use the
-routine \fBinit_color\fP to change the definition of a color.
-The routines \fBhas_colors\fP and \fBcan_change_color\fP
+routine \fB\%init_color\fP to change the definition of a color.
+The routines \fB\%has_colors\fP and \fB\%can_change_color\fP
 return \fBTRUE\fP or \fBFALSE\fP,
 depending on whether the terminal has color capabilities and whether the
 programmer can change the colors.
-The routine \fBcolor_content\fP allows a
+The routine \fB\%color_content\fP allows a
 programmer to extract the amounts of red, green, and blue components in an
 initialized color.
-The routine \fBpair_content\fP allows a programmer to find
+The routine \fB\%pair_content\fP allows a programmer to find
 out how a given color-pair is currently defined.
 .SS Color Rendering
-The \fBcurses\fP library combines these inputs to produce the
+The \fIcurses\fP library combines these inputs to produce the
 actual foreground and background colors shown on the screen:
 .bP
-per-character video attributes (e.g., via \fBwaddch\fP),
+per-character video attributes (e.g., via \fB\%waddch\fP),
 .bP
-the window attribute (e.g., by \fBwattrset\fP), and
+the window attribute (e.g., by \fB\%wattrset\fP), and
 .bP
-the background character (e.g., \fBwbkgdset\fP).
+the background character (e.g., \fB\%wbkgdset\fP).
 .PP
 Per-character and window attributes are usually set by a parameter containing
 video attributes including a color pair value.
-Some functions such as \fBwattr_set\fP use a separate parameter which
+Some functions such as \fB\%wattr_set\fP use a separate parameter which
 is the color pair number.
 .PP
 The background character is a special case: it includes a character value,
-just as if it were passed to \fBwaddch\fP.
+just as if it were passed to \fB\%waddch\fP.
 .PP
-The \fBcurses\fP library does the actual work of combining these color
-pairs in an internal function called from \fBwaddch\fP:
+The \fIcurses\fP library does the actual work of combining these color
+pairs in an internal function called from \fB\%waddch\fP:
 .bP
-If the parameter passed to \fBwaddch\fP is \fIblank\fP,
+If the parameter passed to \fB\%waddch\fP is \fIblank\fP,
 and it uses the special color pair 0,
 .RS
 .bP
-\fBcurses\fP next checks the window attribute.
+\fIcurses\fP next checks the window attribute.
 .bP
 If the window attribute does not use color pair 0,
-\fBcurses\fP uses the color pair from the window attribute.
+\fIcurses\fP uses the color pair from the window attribute.
 .bP
-Otherwise, \fBcurses\fP uses the background character.
+Otherwise, \fIcurses\fP uses the background character.
 .RE
 .bP
-If the parameter passed to \fBwaddch\fP is \fInot blank\fP,
+If the parameter passed to \fB\%waddch\fP is \fInot blank\fP,
 or it does not use the special color pair 0,
-\fBcurses\fP prefers the color pair from the parameter,
+\fIcurses\fP prefers the color pair from the parameter,
 if it is nonzero.
 Otherwise, it tries the window attribute next, and finally the
 background character.
 .PP
-Some \fBcurses\fP functions such as \fBwprintw\fP call \fBwaddch\fP.
+Some \fIcurses\fP functions such as \fB\%wprintw\fP call \fB\%waddch\fP.
 Those do not combine its parameter with a color pair.
 Consequently those calls use only the window attribute or
 the background character.
 .SH CONSTANTS
-In \fB<curses.h>\fP the following macros are defined.
+In \fB\%<curses.h>\fP the following macros are defined.
 These are the standard colors (ISO-6429).
-\fBcurses\fP also assumes that \fBCOLOR_BLACK\fP is the default
+\fIcurses\fP also assumes that \fB\%COLOR_BLACK\fP is the default
 background color for all terminals.
 .PP
 .nf
@@ -178,38 +169,38 @@ Some terminals support more than the eight (8) \*(``ANSI\*('' colors.
 There are no standard names for those additional colors.
 .SH VARIABLES
 .SS COLORS
-is initialized by \fBstart_color\fP to the maximum number of colors
+is initialized by \fB\%start_color\fP to the maximum number of colors
 the terminal can support.
 .SS COLOR_PAIRS
-is initialized by \fBstart_color\fP to the maximum number of color pairs
+is initialized by \fB\%start_color\fP to the maximum number of color pairs
 the terminal can support.
 .SH FUNCTIONS
 .SS start_color
-The \fBstart_color\fP routine requires no arguments.
+The \fB\%start_color\fP routine requires no arguments.
 It must be called if the programmer wants to use colors, and before any other
 color manipulation routine is called.
-It is good practice to call this routine right after \fBinitscr\fP.
-\fBstart_color\fP does this:
+It is good practice to call this routine right after \fB\%initscr\fP.
+\fB\%start_color\fP does this:
 .bP
-It initializes two global variables, \fBCOLORS\fP and
-\fBCOLOR_PAIRS\fP (respectively defining the maximum number of colors
+It initializes two global variables, \fB\%COLORS\fP and
+\fB\%COLOR_PAIRS\fP (respectively defining the maximum number of colors
 and color-pairs the terminal can support).
 .bP
-It initializes the special color pair \fB0\fP to the default foreground
+It initializes the special color pair \fB\%0\fP to the default foreground
 and background colors.
 No other color pairs are initialized.
 .bP
 It restores the colors on the terminal to the values
 they had when the terminal was just turned on.
 .bP
-If the terminal supports the \fBinitc\fP (\fBinitialize_color\fP) capability,
-\fBstart_color\fP
+If the terminal supports the \fBinitc\fP (\fB\%initialize_color\fP) capability,
+\fB\%start_color\fP
 initializes its internal table representing the
 red, green, and blue components of the color palette.
 .IP
 The components depend on whether the terminal uses
 CGA (aka \*(``ANSI\*('') or
-HLS (i.e., the \fBhls\fP (\fBhue_lightness_saturation\fP) capability is set).
+HLS (i.e., the \fBhls\fP (\fB\%hue_lightness_saturation\fP) capability is set).
 The table is initialized first for eight basic colors
 (black, red, green, yellow, blue, magenta, cyan, and white),
 using weights that depend upon the CGA/HLS choice.
@@ -224,28 +215,28 @@ but with weights of \fB1000\fP.
 SVr4 uses a similar scheme, but uses \fB1000\fP
 for the components of the initial eight colors.
 .IP
-\fBstart_color\fP does not attempt to set the terminal's color palette
+\fB\%start_color\fP does not attempt to set the terminal's color palette
 to match its built-in table.
-An application may use \fBinit_color\fP to alter the internal table
+An application may use \fB\%init_color\fP to alter the internal table
 along with the terminal's color.
 .PP
 These limits apply to color values and color pairs.
 Values outside these limits are not legal, and may result in a runtime error:
 .bP
-\fBCOLORS\fP corresponds to the terminal database's \fBmax_colors\fP capability,
-(see \fBterminfo\fP(\*n)).
+\fBCOLORS\fP corresponds to the terminal database's \fB\%max_colors\fP capability,
+(see \fB\%terminfo\fP(\*n)).
 .bP
-color values are expected to be in the range \fB0\fP to \fBCOLORS\-1\fP,
-inclusive (including \fB0\fP and \fBCOLORS\-1\fP).
+color values are expected to be in the range \fB0\fP to \fB\%COLORS\-1\fP,
+inclusive (including \fB0\fP and \fB\%COLORS\-1\fP).
 .bP
 a special color value \fB\-1\fP is used in certain extended functions
-to denote the \fIdefault color\fP (see \fBuse_default_colors\fP(3X)).
+to denote the \fIdefault color\fP (see \fB\%use_default_colors\fP(3X)).
 .bP
-\fBCOLOR_PAIRS\fP corresponds to
-the terminal database's \fBmax_pairs\fP capability,
-(see \fBterminfo\fP(\*n)).
+\fB\%COLOR_PAIRS\fP corresponds to
+the terminal database's \fB\%max_pairs\fP capability,
+(see \fB\%terminfo\fP(\*n)).
 .bP
-legal color pair values are in the range \fB1\fP to \fBCOLOR_PAIRS\-1\fP,
+legal color pair values are in the range \fB1\fP to \fB\%COLOR_PAIRS\-1\fP,
 inclusive.
 .bP
 color pair \fB0\fP is special; it denotes \*(``no color\*(''.
@@ -254,27 +245,27 @@ Color pair \fB0\fP is assumed to be white on black,
 but is actually whatever the terminal implements before color is initialized.
 It cannot be modified by the application.
 .SS has_colors
-The \fBhas_colors\fP routine requires no arguments.
+The \fB\%has_colors\fP routine requires no arguments.
 It returns \fBTRUE\fP if
 the terminal can manipulate colors; otherwise, it returns \fBFALSE\fP.
 This routine facilitates writing terminal-independent programs.
 For example, a programmer can use it to decide
 whether to use color or some other video attribute.
 .SS can_change_color
-The \fBcan_change_color\fP routine requires no arguments.
+The \fB\%can_change_color\fP routine requires no arguments.
 It returns \fBTRUE\fP if the terminal supports colors
 and can change their definitions;
 other, it returns \fBFALSE\fP.
 This routine facilitates writing terminal-independent programs.
 .SS init_pair
-The \fBinit_pair\fP routine changes the definition of a color-pair.
+The \fB\%init_pair\fP routine changes the definition of a color-pair.
 It takes three arguments:
 the number of the color-pair to be changed, the foreground
 color number, and the background color number.
 For portable applications:
 .bP
 The first argument must be a legal color pair value.
-If default colors are used (see \fBuse_default_colors\fP(3X))
+If default colors are used (see \fB\%use_default_colors\fP(3X))
 the upper limit is adjusted to allow for extra pairs which use
 a default color in foreground and/or background.
 .bP
@@ -285,42 +276,42 @@ the screen is refreshed and all occurrences of that color-pair
 are changed to the new definition.
 .PP
 As an extension, ncurses allows you to set color pair \fB0\fP via
-the \fBassume_default_colors\fP(3X) routine, or to specify the use of
+the \fB\%assume_default_colors\fP(3X) routine, or to specify the use of
 default colors (color number \fB\-1\fP) if you first invoke the
-\fBuse_default_colors\fP(3X) routine.
+\fB\%use_default_colors\fP(3X) routine.
 .SS init_extended_pair
-Because \fBinit_pair\fP uses signed \fBshort\fPs for its parameters,
+Because \fB\%init_pair\fP uses signed \fBshort\fPs for its parameters,
 that limits color-pairs and color-values
 to 32767 on modern hardware.
-The extension \fBinit_extended_pair\fP uses \fBint\fPs
+The extension \fB\%init_extended_pair\fP uses \fBint\fPs
 for the color-pair and color-value,
 allowing a larger number of colors to be supported.
 .SS init_color
-The \fBinit_color\fP routine changes the definition of a color.
+The \fB\%init_color\fP routine changes the definition of a color.
 It takes four arguments:
 the number of the color to be changed followed by three RGB values
 (for the amounts of red, green, and blue components).
 .bP
 The first argument must be a legal color value;
 default colors are not allowed here.
-(See the section \fBColors\fP for the default color index.)
+(See the section \fB\%Colors\fP for the default color index.)
 .bP
 Each of the last three arguments
 must be a value in the range \fB0\fP through \fB1000\fP.
 .PP
-When \fBinit_color\fP is used, all
+When \fB\%init_color\fP is used, all
 occurrences of that color on the screen immediately change to the new
 definition.
 .SS init_extended_color
-Because \fBinit_color\fP uses signed \fBshort\fPs for its parameters,
+Because \fB\%init_color\fP uses signed \fBshort\fPs for its parameters,
 that limits color-values and their red, green, and blue components
 to 32767 on modern hardware.
-The extension \fBinit_extended_color\fP uses \fBint\fPs
+The extension \fB\%init_extended_color\fP uses \fBint\fPs
 for the color value and
 for setting the red, green, and blue components,
 allowing a larger number of colors to be supported.
 .SS color_content
-The \fBcolor_content\fP routine gives programmers a way to find the intensity
+The \fB\%color_content\fP routine gives programmers a way to find the intensity
 of the red, green, and blue (RGB) components in a color.
 It requires four arguments: the color number, and three addresses
 of \fBshort\fRs for storing
@@ -328,57 +319,57 @@ the information about the amounts of red, green, and blue components in the
 given color.
 .bP
 The first argument must be a legal color value, i.e.,
-\fB0\fP through \fBCOLORS\-1\fP, inclusive.
+\fB0\fP through \fB\%COLORS\-1\fP, inclusive.
 .bP
 The values that are stored at the addresses pointed to by the
 last three arguments are in the range
 \fB0\fP (no component) through \fB1000\fP
 (maximum amount of component), inclusive.
 .SS extended_color_content
-Because \fBcolor_content\fP uses signed \fBshort\fPs for its parameters,
+Because \fB\%color_content\fP uses signed \fBshort\fPs for its parameters,
 that limits color-values and their red, green, and blue components
 to 32767 on modern hardware.
-The extension \fBextended_color_content\fP uses \fBint\fPs
+The extension \fB\%extended_color_content\fP uses \fBint\fPs
 for the color value and
 for returning the red, green, and blue components,
 allowing a larger number of colors to be supported.
 .SS pair_content
-The \fBpair_content\fP routine allows programmers to find out what colors a
+The \fB\%pair_content\fP routine allows programmers to find out what colors a
 given color-pair consists of.
 It requires three arguments: the color-pair
 number, and two addresses of \fBshort\fRs for storing the foreground and the
 background color numbers.
 .bP
 The first argument must be a legal color value,
-i.e., in the range \fB1\fP through \fBCOLOR_PAIRS\-1\fP, inclusive.
+i.e., in the range \fB1\fP through \fB\%COLOR_PAIRS\-1\fP, inclusive.
 .bP
 The values that are stored at the addresses pointed
 to by the second and third arguments are in the
-range \fB0\fP through \fBCOLORS\fP, inclusive.
+range \fB0\fP through \fB\%COLORS\fP, inclusive.
 .SS extended_pair_content
-Because \fBpair_content\fP uses signed \fBshort\fPs for its parameters,
+Because \fB\%pair_content\fP uses signed \fBshort\fPs for its parameters,
 that limits color-pair and color-values to 32767 on modern hardware.
-The extension \fBextended_pair_content\fP uses \fBint\fPs
+The extension \fB\%extended_pair_content\fP uses \fBint\fPs
 for the color pair and
 for returning the foreground and background colors,
 allowing a larger number of colors to be supported.
 .SS reset_color_pairs
-The extension \fBreset_color_pairs\fP tells ncurses to discard all
-of the color-pair information which was set with \fBinit_pair\fP.
+The extension \fB\%reset_color_pairs\fP tells ncurses to discard all
+of the color-pair information which was set with \fB\%init_pair\fP.
 It also touches the current- and standard-screens, allowing an application to
 switch color palettes rapidly.
 .SS PAIR_NUMBER
-\fBPAIR_NUMBER(\fIattrs\fR) extracts the color
+\fB\%PAIR_NUMBER(\fIattrs\fR) extracts the color
 value from its \fIattrs\fP parameter and returns it as a color pair number.
 .SS COLOR_PAIR
-Its inverse \fBCOLOR_PAIR(\fIn\fB)\fR converts a color pair number
+Its inverse \fB\%COLOR_PAIR(\fIn\fB)\fR converts a color pair number
 to an attribute.
 Attributes can hold color pairs in the range 0 to 255.
 If you need a color pair larger than that, you must use functions
-such as \fBattr_set\fP (which pass the color pair as a separate parameter)
-rather than the legacy functions such as \fBattrset\fP.
+such as \fB\%attr_set\fP (which pass the color pair as a separate parameter)
+rather than the legacy functions such as \fB\%attrset\fP.
 .SH RETURN VALUE
-The routines \fBcan_change_color\fP and \fBhas_colors\fP return \fBTRUE\fP
+The routines \fB\%can_change_color\fP and \fB\%has_colors\fP return \fBTRUE\fP
 or \fBFALSE\fP.
 .PP
 All other routines return the integer \fBERR\fP upon failure and an \fBOK\fP
@@ -389,24 +380,24 @@ X/Open defines no error conditions.
 SVr4 does document some error conditions which apply in general:
 .bP
 This implementation will return \fBERR\fP on attempts to
-use color values outside the range \fB0\fP to \fBCOLORS\fP\-1
+use color values outside the range \fB0\fP to \fB\%COLORS\fP\-1
 (except for the default colors extension),
-or use color pairs outside the range \fB0\fP to \fBCOLOR_PAIRS\-1\fP.
+or use color pairs outside the range \fB0\fP to \fB\%COLOR_PAIRS\-1\fP.
 .IP
-Color values used in \fBinit_color\fP must be
+Color values used in \fB\%init_color\fP must be
 in the range \fB0\fP to \fB1000\fP.
 .IP
 An error is returned from all functions
 if the terminal has not been initialized.
 .IP
-An error is returned from secondary functions such as \fBinit_pair\fP
-if \fBstart_color\fP was not called.
+An error is returned from secondary functions such as \fB\%init_pair\fP
+if \fB\%start_color\fP was not called.
 .bP
 SVr4 does much the same, except that
-it returns \fBERR\fP from \fBpair_content\fP if the pair was not initialized
-using \fBinit_pairs\fP
+it returns \fBERR\fP from \fB\%pair_content\fP if the pair was not initialized
+using \fB\%init_pairs\fP
 and
-it returns \fBERR\fP from \fBcolor_content\fP
+it returns \fBERR\fP from \fB\%color_content\fP
 if the terminal does not support changing colors.
 .IP
 This implementation does not return \fBERR\fP for either case.
@@ -414,19 +405,19 @@ This implementation does not return \fBERR\fP for either case.
 Specific functions make additional checks:
 .RS 3
 .TP 5
-\fBinit_color\fP
+\fB\%init_color\fP
 returns an error if the terminal does not support
-this feature, e.g., if the \fBinitialize_color\fP capability is absent
+this feature, e.g., if the \fB\%initialize_color\fP capability is absent
 from the terminal description.
 .TP 5
-\fBstart_color\fP
+\fB\%start_color\fP
 returns an error if the color table cannot be allocated.
 .RE
 .SH NOTES
-In the \fBncurses\fP implementation, there is a separate color activation flag,
+In the \fIncurses\fP implementation, there is a separate color activation flag,
 color palette, color pairs table,
-and associated \fBCOLORS\fP and \fBCOLOR_PAIRS\fP counts
-for each screen; the \fBstart_color\fP function only affects the current
+and associated \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP counts
+for each screen; the \fB\%start_color\fP function only affects the current
 screen.
 The SVr4/XSI interface is not really designed with this in mind, and
 historical implementations may use a single shared color palette.
@@ -435,7 +426,7 @@ Setting an implicit background color via a color pair affects only
 character cells that a character write operation explicitly touches.
 To change
 the background color used when parts of a window are blanked by erasing or
-scrolling operations, see \fBcurs_bkgd\fP(3X).
+scrolling operations, see \fB\%curs_bkgd\fP(3X).
 .PP
 Several caveats apply on older x86 machines
 (e.g., i386, i486) with VGA-compatible graphics:
@@ -456,13 +447,13 @@ SVr3.2 introduced color support to curses in 1987.
 SVr4 made internal changes,
 e.g., moving the storage for the color state
 from \fBSP\fP (the \fBSCREEN\fP structure)
-to \fBcur_term\fP (the \fBTERMINAL\fP structure),
+to \fB\%cur_term\fP (the \fB\%TERMINAL\fP structure),
 but provided the same set of library functions.
 .PP
 SVr4 curses limits the number of color pairs to 64,
 reserving color pair zero (0) as the terminal's initial uncolored state.
 This limit arises because the color pair information is a bitfield
-in the \fBchtype\fP data type (denoted by \fBA_COLOR\fP).
+in the \fB\%chtype\fP data type (denoted by \fB\%A_COLOR\fP).
 .PP
 Other implementations of curses had different limits:
 .bP
@@ -470,24 +461,24 @@ PCCurses (1987-1990) provided for only eight (8) colors.
 .bP
 PDCurses (1992-present) inherited the 8-color limitation from PCCurses,
 but changed this to 256 in version 2.5 (2001),
-along with changing \fBchtype\fP from 16-bits to 32-bits.
+along with changing \fB\%chtype\fP from 16-bits to 32-bits.
 .bP
 X/Open Curses (1992-present)
-added a new structure \fBcchar_t\fP to store the character,
+added a new structure \fB\%cchar_t\fP to store the character,
 attributes and color-pair values, allowing increased range of color-pairs.
 Both color-pairs and color-values used a signed \fBshort\fP,
 limiting values to 15 bits.
 .bP
-ncurses (1992-present) uses eight bits for \fBA_COLOR\fP in \fBchtype\fP values.
+ncurses (1992-present) uses eight bits for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
 .IP
 Version 5.3 provided a wide-character interface (2002),
 but left color-pairs as part of the attributes-field.
 .IP
 Since version 6 (2015),
-ncurses uses a separate \fBint\fP for color-pairs in the \fBcchar_t\fP values.
+ncurses uses a separate \fBint\fP for color-pairs in the \fB\%cchar_t\fP values.
 When those color-pair values fit in 8 bits,
 ncurses allows color-pairs to be manipulated
-via the functions using \fBchtype\fP values.
+via the functions using \fB\%chtype\fP values.
 .bP
 NetBSD curses used 6 bits from
 2000 (when colors were first supported) until 2004.
@@ -495,7 +486,7 @@ At that point, NetBSD changed to use 10 bits.
 As of 2021, that size is unchanged.
 Like ncurses before version 6,
 the NetBSD color-pair information is stored in
-the attributes field of \fBcchar_t\fP, limiting the number of color-pairs
+the attributes field of \fB\%cchar_t\fP, limiting the number of color-pairs
 by the size of the bitfield.
 .SH PORTABILITY
 .SS Extensions
@@ -504,19 +495,19 @@ and are not found in SVr4 curses, 4.4BSD curses,
 or any other previous version of curses.
 .SS Standards
 This implementation satisfies XSI Curses's minimum maximums
-for \fBCOLORS\fP and \fBCOLOR_PAIRS\fP.
+for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
 .PP
-The \fBinit_pair\fP routine accepts negative values of foreground
-and background color to support the \fBuse_default_colors\fP(3X) extension,
+The \fB\%init_pair\fP routine accepts negative values of foreground
+and background color to support the \fB\%use_default_colors\fP(3X) extension,
 but only if that routine has been first invoked.
 .PP
-The assumption that \fBCOLOR_BLACK\fP is the default
+The assumption that \fB\%COLOR_BLACK\fP is the default
 background color for all terminals can be modified using the
-\fBassume_default_colors\fP(3X) extension.
+\fB\%assume_default_colors\fP(3X) extension.
 .PP
 This implementation checks the pointers,
 e.g., for the values returned by
-\fBcolor_content\fP and \fBpair_content\fP,
+\fB\%color_content\fP and \fB\%pair_content\fP,
 and will treat those as optional parameters when null.
 .PP
 X/Open Curses does not specify a limit for the number of colors and
@@ -528,10 +519,10 @@ This implementation provides extended versions of those functions
 which use \fBshort\fP parameters,
 allowing applications to use larger color- and pair-numbers.
 .PP
-The \fBreset_color_pairs\fP function is an extension of ncurses.
+The \fB\%reset_color_pairs\fP function is an extension of ncurses.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_attr\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBdefault_colors\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_attr\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%default_colors\fP(3X)
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 05bce4f99..887b4c284 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.31 2023/09/16 23:37:03 tom Exp $
-.TH curs_getyx 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.37 2023/09/23 22:10:55 tom Exp $
+.TH curs_getyx 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%getyx\fP,
 \fB\%getparyx\fP,
@@ -36,25 +36,24 @@
 \fB\%getmaxyx\fP \-
 get \fIcurses\fR cursor and window coordinates
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBvoid getyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 \fBvoid getparyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 \fBvoid getbegyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 \fBvoid getmaxyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.fi
 .SH DESCRIPTION
-The \fBgetyx\fP macro places the current cursor position of the given window in
+The \fB\%getyx\fP macro places the current cursor position of the given window in
 the two integer variables \fIy\fP and \fIx\fP.
 .PP
-If \fIwin\fP is a subwindow, the \fBgetparyx\fP macro places the beginning
+If \fIwin\fP is a subwindow, the \fB\%getparyx\fP macro places the beginning
 coordinates of the subwindow relative to the parent window into two integer
 variables \fIy\fP and \fIx\fP.
 Otherwise, \fB\-1\fP is placed into \fIy\fP and \fIx\fP.
 .PP
-Like \fBgetyx\fP, the \fBgetbegyx\fP and \fBgetmaxyx\fP macros store
+Like \fB\%getyx\fP, the \fB\%getbegyx\fP and \fB\%getmaxyx\fP macros store
 the current beginning coordinates and size of the specified window.
 .SH RETURN VALUE
 The return values of these macros are undefined (i.e.,
@@ -64,38 +63,39 @@ All of these interfaces are macros.
 A "\fB&\fP" is not necessary before the variables \fIy\fP and \fIx\fP.
 .SH PORTABILITY
 The
-\fBgetyx\fP,
-\fBgetparyx\fP,
-\fBgetbegyx\fP and
-\fBgetmaxyx\fP
+\fB\%getyx\fP,
+\fB\%getparyx\fP,
+\fB\%getbegyx\fP and
+\fB\%getmaxyx\fP
 macros are described in the XSI Curses standard, Issue 4.
 .PP
 This implementation also provides functions
-\fBgetbegx\fP,
-\fBgetbegy\fP,
-\fBgetcurx\fP,
-\fBgetcury\fP,
-\fBgetmaxx\fP,
-\fBgetmaxy\fP,
-\fBgetparx\fP and
-\fBgetpary\fP
-for compatibility with older versions of curses.
+\fB\%getbegx\fP,
+\fB\%getbegy\fP,
+\fB\%getcurx\fP,
+\fB\%getcury\fP,
+\fB\%getmaxx\fP,
+\fB\%getmaxy\fP,
+\fB\%getparx\fP and
+\fB\%getpary\fP
+for compatibility with older versions of \fIcurses\fP;
+see \fB\%curs_legacy\fP(3X).
 .PP
 Although X/Open Curses does not address this,
-many implementations provide members of the WINDOW structure
+many implementations provide members of the \fB\%WINDOW\fP structure
 containing values corresponding to these macros.
-For best portability, do not rely on using the data in WINDOW,
-since some implementations make WINDOW opaque (do not allow
+For best portability, do not rely on using the data in \fB\%WINDOW\fP,
+since some implementations make \fB\%WINDOW\fP opaque (do not allow
 direct use of its members).
 .PP
 Besides the problem of opaque structures,
 the data stored in like-named members may not have like-values in
 different implementations.
-For example, the WINDOW._maxx and WINDOW._maxy values in ncurses
+For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values in \fIncurses\fP
 have (at least since release 1.8.1) differed by one from some
 other implementations.
-The difference is hidden by means of the macro \fBgetmaxyx\fP.
+The difference is hidden by means of the macro \fB\%getmaxyx\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_legacy\fP(3X),
-\fBcurs_opaque\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_legacy\fP(3X),
+\fB\%curs_opaque\fP(3X)
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 8e9b9863f..56a9b1e79 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.47 2023/09/16 23:37:03 tom Exp $
-.TH curs_inopts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.54 2023/09/23 22:24:15 tom Exp $
+.TH curs_inopts 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -60,58 +60,44 @@
 \fB\%typeahead\fP \-
 get and set \fIcurses\fR terminal input options
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
 .PP
 \fBint cbreak(void);\fP
-.br
 \fBint nocbreak(void);\fP
-.sp
+.PP
 \fBint echo(void);\fP
-.br
 \fBint noecho(void);\fP
-.sp
+.PP
 \fBint intrflush(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBint keypad(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBint meta(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBint nodelay(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBint notimeout(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.sp
+.PP
 \fBint nl(void);\fP
-.br
 \fBint nonl(void);\fP
-.sp
+.PP
 \fBint raw(void);\fP
-.br
 \fBint noraw(void);\fP
-.sp
+.PP
 \fBvoid qiflush(void);\fP
-.br
 \fBvoid noqiflush(void);\fP
-.sp
+.PP
 \fBint halfdelay(int \fItenths\fB);\fR
-.br
 \fBvoid timeout(int \fIdelay\fB);\fR
-.br
 \fBvoid wtimeout(WINDOW *\fIwin\fB, int \fIdelay\fB);\fR
-.sp
+.PP
 \fBint typeahead(int \fIfd\fB);\fR
-.sp
-/* extensions */
-.br
+.PP
+\fI/* extensions */\fP
 \fBint is_cbreak(void);\fP
-.br
 \fBint is_echo(void);\fP
-.br
 \fBint is_nl(void);\fP
-.br
 \fBint is_raw(void);\fP
-.br
+.fi
 .SH DESCRIPTION
-The \fBncurses\fP library provides several functions which let an application
+The \fIncurses\fP library provides several functions which let an application
 change the way input from the terminal is handled.
 Some are global, applying to all windows.
 Others apply only to a specific window.
@@ -123,51 +109,51 @@ is needed.
 .SS cbreak/nocbreak
 Normally, the tty driver buffers typed characters until a newline or carriage
 return is typed.
-The \fBcbreak\fP routine disables line buffering and
+The \fB\%cbreak\fP routine disables line buffering and
 erase/kill character-processing (interrupt and flow control characters are
 unaffected), making characters typed by the user immediately available to the
 program.
-The \fBnocbreak\fP routine returns the terminal to normal (cooked)
+The \fB\%nocbreak\fP routine returns the terminal to normal (cooked)
 mode.
 .PP
-Initially the terminal may or may not be in \fBcbreak\fP mode, as the mode is
-inherited; therefore, a program should call \fBcbreak\fP or \fBnocbreak\fP
+Initially the terminal may or may not be in \fB\%cbreak\fP mode, as the mode is
+inherited; therefore, a program should call \fB\%cbreak\fP or \fB\%nocbreak\fP
 explicitly.
-Most interactive programs using \fBcurses\fP set the \fBcbreak\fP
+Most interactive programs using \fIcurses\fP set the \fB\%cbreak\fP
 mode.
-Note that \fBcbreak\fP overrides \fBraw\fP.
-[See \fBcurs_getch\fP(3X) for a
-discussion of how these routines interact with \fBecho\fP and \fBnoecho\fP.]
+Note that \fB\%cbreak\fP overrides \fBraw\fP.
+[See \fB\%curs_getch\fP(3X) for a
+discussion of how these routines interact with \fBecho\fP and \fB\%noecho\fP.]
 .\"
 .SS echo/noecho
-The \fBecho\fP and \fBnoecho\fP routines control whether characters typed by
-the user are echoed by \fBgetch\fP(3X) as they are typed.
+The \fBecho\fP and \fB\%noecho\fP routines control whether characters typed by
+the user are echoed by \fB\%getch\fP(3X) as they are typed.
 Echoing by the tty
-driver is always disabled, but initially \fBgetch\fP is in echo mode, so
+driver is always disabled, but initially \fB\%getch\fP 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 \fBnoecho\fP.
-[See \fBcurs_getch\fP(3X) for a
-discussion of how these routines interact with \fBcbreak\fP and
-\fBnocbreak\fP.]
+they disable echoing by calling \fB\%noecho\fP.
+[See \fB\%curs_getch\fP(3X) for a
+discussion of how these routines interact with \fB\%cbreak\fP and
+\fB\%nocbreak\fP.]
 .\"
 .SS halfdelay
-The \fBhalfdelay\fP routine is used for half-delay mode, which is similar to
-\fBcbreak\fP mode in that characters typed by the user are immediately
+The \fB\%halfdelay\fP routine is used for half-delay mode, which is similar to
+\fB\%cbreak\fP mode in that characters typed by the user are immediately
 available to the program.
 However, after blocking for \fItenths\fP tenths of
 seconds, \fBERR\fP is returned if nothing has been typed.
 The value of \fItenths\fP
 must be a number between 1 and 255.
-Use \fBnocbreak\fP to leave half-delay
+Use \fB\%nocbreak\fP to leave half-delay
 mode.
 .\"
 .SS intrflush
-If the \fBintrflush\fP option is enabled (\fIbf\fP is \fBTRUE\fP), and an
+If the \fB\%intrflush\fP option is enabled (\fIbf\fP is \fBTRUE\fP), and an
 interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
 the tty driver queue will be flushed, giving the effect of faster response to
-the interrupt, but causing \fBcurses\fP to have the wrong idea of what is on
+the interrupt, but causing \fIcurses\fP to have the wrong idea of what is on
 the screen.
 Disabling the option (\fIbf\fP is \fBFALSE\fP) prevents the
 flush.
@@ -175,24 +161,24 @@ The default for the option is inherited from the tty driver settings.
 The window argument is ignored.
 .\"
 .SS keypad
-The \fBkeypad\fP option enables the keypad of the user's terminal.
+The \fB\%keypad\fP option enables the keypad of the user's terminal.
 If
 enabled (\fIbf\fP is \fBTRUE\fP), the user can press a function key
-(such as an arrow key) and \fBwgetch\fP(3X) returns a single value
-representing the function key, as in \fBKEY_LEFT\fP.
+(such as an arrow key) and \fB\%wgetch\fP(3X) returns a single value
+representing the function key, as in \fB\%KEY_LEFT\fP.
 If disabled
-(\fIbf\fP is \fBFALSE\fP), \fBcurses\fP does not treat function keys
+(\fIbf\fP is \fBFALSE\fP), \fIcurses\fP 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 locally), turning on this option
-causes the terminal keypad to be turned on when \fBwgetch\fP(3X) is
+causes the terminal keypad to be turned on when \fB\%wgetch\fP(3X) is
 called.
 The default value for keypad is \fBFALSE\fP.
 .\"
 .SS meta
 Initially, whether the terminal returns 7 or 8 significant bits on
-input depends on the control mode of the tty driver [see \fBtermios\fP(3)].
+input depends on the control mode of the tty driver [see \fB\%termios\fP(3)].
 To force 8 bits to be returned, invoke \fBmeta\fP(\fIwin\fP,
 \fBTRUE\fP); this is equivalent, under POSIX, to setting the CS8 flag
 on the terminal.
@@ -212,44 +198,44 @@ The \fBnl\fP and \fBnonl\fP routines control whether the underlying display
 device translates the return key into newline on input.
 .\"
 .SS nodelay
-The \fBnodelay\fP option causes \fBgetch\fP to be a non-blocking call.
-If no input is ready, \fBgetch\fP returns \fBERR\fP.
+The \fB\%nodelay\fP option causes \fB\%getch\fP to be a non-blocking call.
+If no input is ready, \fB\%getch\fP returns \fBERR\fP.
 If disabled
-(\fIbf\fP is \fBFALSE\fP), \fBgetch\fP waits until a key is pressed.
+(\fIbf\fP is \fBFALSE\fP), \fB\%getch\fP waits until a key is pressed.
 .SS notimeout
-When interpreting an escape sequence, \fBwgetch\fP(3X) sets a timer
+When interpreting an escape sequence, \fB\%wgetch\fP(3X) sets a timer
 while waiting for the next character.
-If \fBnotimeout(\fIwin\fR,
-\fBTRUE\fP) is called, then \fBwgetch\fP does not set a timer.
+If \fB\%notimeout(\fIwin\fR,
+\fBTRUE\fP) is called, then \fB\%wgetch\fP does not set a timer.
 The
 purpose of the timeout is to differentiate between sequences received
 from a function key and those typed by a user.
 .\"
 .SS raw/noraw
-The \fBraw\fP and \fBnoraw\fP routines place the terminal into or out of raw
+The \fBraw\fP and \fB\%noraw\fP routines place the terminal into or out of raw
 mode.
-Raw mode is similar to \fBcbreak\fP mode, in that characters typed are
+Raw mode is similar to \fB\%cbreak\fP mode, in that characters typed are
 immediately passed through to the user program.
 The differences are that in
 raw mode, the interrupt, quit, suspend, and flow control characters are all
 passed through uninterpreted, instead of generating a signal.
 The behavior of
 the BREAK key depends on other bits in the tty driver that are not set by
-\fBcurses\fP.
+\fIcurses\fP.
 .\"
 .SS qiflush/noqiflush
-When the \fBnoqiflush\fP routine is used, normal flush of input and
+When the \fB\%noqiflush\fP routine is used, normal flush of input and
 output queues associated with the \fBINTR\fP, \fBQUIT\fP and
-\fBSUSP\fP characters will not be done [see \fBtermios\fP(3)].
+\fBSUSP\fP characters will not be done [see \fB\%termios\fP(3)].
 When
-\fBqiflush\fP is called, the queues will be flushed when these control
+\fB\%qiflush\fP is called, the queues will be flushed when these control
 characters are read.
-You may want to call \fBnoqiflush\fP in a signal
+You may want to call \fB\%noqiflush\fP in a signal
 handler if you want output to continue as though the interrupt
 had not occurred, after the handler exits.
 .\"
 .SS timeout/wtimeout
-The \fBtimeout\fP and \fBwtimeout\fP routines set blocking or
+The \fB\%timeout\fP and \fB\%wtimeout\fP routines set blocking or
 non-blocking read for a given window.
 If \fIdelay\fP is negative,
 blocking read is used (i.e., waits indefinitely for
@@ -259,21 +245,21 @@ If \fIdelay\fP is zero, then non-blocking read is used
 If
 \fIdelay\fP is positive, then read blocks for \fIdelay\fP
 milliseconds, and returns \fBERR\fP if there is still no input.
-Hence, these routines provide the same functionality as \fBnodelay\fP,
+Hence, these routines provide the same functionality as \fB\%nodelay\fP,
 plus the additional capability of being able to block for only
 \fIdelay\fP milliseconds (where \fIdelay\fP is positive).
 .\"
 .SS typeahead
-The \fBcurses\fP library does \*(``line-breakout optimization\*(''
+The \fIcurses\fP 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
-\fBrefresh\fP(3X) or \fBdoupdate\fP is called again.
+\fB\%refresh\fP(3X) or \fB\%doupdate\fP is called again.
 This allows faster response to commands typed in advance.
 Normally, the input FILE
-pointer passed to \fBnewterm\fP, or \fBstdin\fP in the case that
-\fBinitscr\fP was used, will be used to do this typeahead checking.
-The \fBtypeahead\fP routine specifies that the file descriptor
+pointer passed to \fB\%newterm\fP, or \fBstdin\fP in the case that
+\fB\%initscr\fP was used, will be used to do this typeahead checking.
+The \fB\%typeahead\fP routine specifies that the file descriptor
 \fIfd\fP is to be used to check for typeahead instead.
 If \fIfd\fP is
 \-1, then no typeahead checking is done.
@@ -291,7 +277,7 @@ Any function will also return an error if the terminal was not initialized.
 Also,
 .RS 3
 .TP 5
-\fBhalfdelay\fP
+\fB\%halfdelay\fP
 returns an error
 if its parameter is outside the range 1..255.
 .RE
@@ -317,64 +303,64 @@ if the flag is set,
 0
 if the flag is reset, or
 .TP 5
--1
-if the curses library was not initialized.
+\-1
+if the \fIcurses\fP library was not initialized.
 .PP
-These routines are specific to ncurses.
+These routines are specific to \fIncurses\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 \fIncurses\fP extensions
 be conditioned using NCURSES_VERSION.
 .SH PORTABILITY
 Except as noted in the section on extensions,
 these functions are described in the XSI Curses standard, Issue 4.
 .PP
-The ncurses library obeys the XPG4 standard and the historical practice of the
-AT&T curses implementations, in that the echo bit is cleared when curses
+The \fIncurses\fP library obeys the XPG4 standard and the historical practice of the
+AT&T \fIcurses\fP implementations, in that the echo bit is cleared when \fIcurses\fP
 initializes the terminal state.
-BSD curses differed from this slightly; it
+BSD \fIcurses\fP differed from this slightly; it
 left the echo bit on at initialization, but the BSD \fBraw\fP call turned it
 off as a side-effect.
-For best portability, set \fBecho \fPor \fBnoecho\fP explicitly
+For best portability, set \fBecho \fPor \fB\%noecho\fP explicitly
 just after initialization, even if your program remains in cooked mode.
 .PP
 The XSI Curses standard is ambiguous on the question of whether \fBraw\fP
 should disable the CRLF translations controlled by \fBnl\fP and \fBnonl\fP.
-BSD curses did turn off these translations; AT&T curses (at least as late as
+BSD \fIcurses\fP did turn off these translations; AT&T \fIcurses\fP (at least as late as
 SVr1) did not.
 We chose to do so, on the theory that a programmer requesting
 raw input wants a clean (ideally 8-bit clean) connection that the operating
 system will not alter.
 .PP
-When \fBkeypad\fP is first enabled,
-ncurses loads the key-definitions for the current terminal description.
+When \fB\%keypad\fP is first enabled,
+\fIncurses\fP 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 \fB@TIC@\fP,
-then ncurses also defines keys for the capabilities whose names
+then \fIncurses\fP also defines keys for the capabilities whose names
 begin with \*(``k\*(''.
 The corresponding keycodes are generated and (depending on previous
 loads of terminal descriptions) may differ from one execution of a
 program to the next.
-The generated keycodes are recognized by the \fBkeyname\fP function
+The generated keycodes are recognized by the \fB\%keyname\fP function
 (which will then return a name beginning with \*(``k\*('' denoting the
-terminfo capability name rather than \*(``K\*('', used for curses key-names).
-On the other hand, an application can use \fBdefine_key\fP to establish
+terminfo capability name rather than \*(``K\*('', used for \fIcurses\fP key-names).
+On the other hand, an application can use \fB\%define_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 \fBtigetstr\fP,
+capability's presence with \fB\%tigetstr\fP,
 and reassign the keycode to match its own needs.
 .PP
-Low-level applications can use \fBtigetstr\fP to obtain the definition
+Low-level applications can use \fB\%tigetstr\fP to obtain the definition
 of any particular string capability.
-Higher-level applications which use the curses \fBwgetch\fP
+Higher-level applications which use the \fIcurses\fP \fB\%wgetch\fP
 and similar functions to return keycodes rely upon the order in which
 the strings are loaded.
 If more than one key definition has the same string value,
-then \fBwgetch\fP can return only one keycode.
-Most curses implementations (including ncurses)
+then \fB\%wgetch\fP can return only one keycode.
+Most \fIcurses\fP implementations (including \fIncurses\fP)
 load key definitions in the order
 defined by the array of string capability names.
 The last key to be loaded determines the keycode which will be returned.
-In ncurses, you may also have extended capabilities interpreted as
+In \fIncurses\fP, you may also have extended capabilities interpreted as
 key definitions.
 These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
@@ -383,28 +369,28 @@ the later definition is the one used.
 .SH NOTES
 Note that
 \fBecho\fP,
-\fBnoecho\fP,
-\fBhalfdelay\fP,
-\fBintrflush\fP,
+\fB\%noecho\fP,
+\fB\%halfdelay\fP,
+\fB\%intrflush\fP,
 \fBmeta\fP,
 \fBnl\fP,
 \fBnonl\fP,
-\fBnodelay\fP,
-\fBnotimeout\fP,
-\fBnoqiflush\fP,
-\fBqiflush\fP,
-\fBtimeout\fP, and
-\fBwtimeout\fP may be macros.
+\fB\%nodelay\fP,
+\fB\%notimeout\fP,
+\fB\%noqiflush\fP,
+\fB\%qiflush\fP,
+\fB\%timeout\fP, and
+\fB\%wtimeout\fP may be macros.
 .PP
-The \fBnoraw\fP and \fBnocbreak\fP calls follow historical practice in that
+The \fB\%noraw\fP and \fB\%nocbreak\fP calls follow historical practice in that
 they attempt to restore to normal (\*(``cooked\*('') mode
 from raw and cbreak modes respectively.
 Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
 control states that are hard to predict or understand; it is not recommended.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_getch\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_util\fP(3X),
-\fBdefine_key\fP(3X),
-\fBtermios\fP(3)
+\fB\%curses\fP(3X),
+\fB\%curs_getch\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_util\fP(3X),
+\fB\%define_key\fP(3X),
+\fB\%termios\fP(3)
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 86c0176f6..233a2d064 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.22 2023/09/16 23:37:03 tom Exp $
-.TH curs_legacy 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.27 2023/09/23 22:11:47 tom Exp $
+.TH curs_legacy 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,52 +45,50 @@
 \fB\%getpary\fP \-
 get \fIcurses\fR cursor and window coordinates or attributes (legacy)
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint getattrs(const WINDOW *\fIwin\fB);\fR
-.sp
+.PP
 \fBint getbegx(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint getbegy(const WINDOW *\fIwin\fB);\fR
-.sp
+.PP
 \fBint getcurx(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint getcury(const WINDOW *\fIwin\fB);\fR
-.sp
+.PP
 \fBint getmaxx(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint getmaxy(const WINDOW *\fIwin\fB);\fR
-.sp
+.PP
 \fBint getparx(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint getpary(const WINDOW *\fIwin\fB);\fR
+.fi
 .SH DESCRIPTION
-These legacy functions are simpler to use than the X/Open Curses functions:
+These legacy functions are simpler to use than the X/Open \fIcurses\fP functions:
 .bP
-The \fBgetattrs\fP function returns the same attribute data as \fBwattr_get\fP.
+The \fB\%getattrs\fP function returns the same attribute data as \fB\%wattr_get\fP.
 .IP
-However, \fBgetattrs\fP returns an integer (actually a \fBchtype\fP),
-while \fBwattr_get\fP returns the current color pair in a separate parameter.
+However, \fB\%getattrs\fP returns an integer (actually a \fB\%chtype\fP),
+while \fB\%wattr_get\fP returns the current color pair in a separate parameter.
 In the wide-character library configuration,
-color pairs may not fit into a \fBchtype\fP,
-so \fBwattr_get\fP is the only way to obtain the color information.
+color pairs may not fit into a \fB\%chtype\fP,
+so \fB\%wattr_get\fP is the only way to obtain the color information.
 .IP
-Because \fBgetattrs\fP returns the attributes in a single parameter,
+Because \fB\%getattrs\fP returns the attributes in a single parameter,
 it would not be possible for an application to distinguish that from
 \fBERR\fP (a \fI-1\fP).
-If the window parameter is null, \fBgetattrs\fP returns \fBA_NORMAL\fP (zero).
+If the window parameter is null, \fB\%getattrs\fP returns \fB\%A_NORMAL\fP (zero).
 .bP
-The \fBgetbegy\fP and \fBgetbegx\fP functions return the same
-data as \fBgetbegyx\fP.
+The \fB\%getbegy\fP and \fB\%getbegx\fP functions return the same
+data as \fB\%getbegyx\fP.
 .bP
-The \fBgetcury\fP and \fBgetcurx\fP functions return the same
-data as \fBgetyx\fP.
+The \fB\%getcury\fP and \fB\%getcurx\fP functions return the same
+data as \fB\%getyx\fP.
 .bP
-The \fBgetmaxy\fP and \fBgetmaxx\fP functions return the same
-data as \fBgetmaxyx\fP.
+The \fB\%getmaxy\fP and \fB\%getmaxx\fP functions return the same
+data as \fB\%getmaxyx\fP.
 .bP
-The \fBgetpary\fP and \fBgetparx\fP functions return the same
-data as \fBgetparyx\fP.
+The \fB\%getpary\fP and \fB\%getparx\fP functions return the same
+data as \fB\%getparyx\fP.
 .SH RETURN VALUE
 Except as noted,
 these functions return an integer,
@@ -98,19 +96,19 @@ or \fBERR\fP if the window parameter is null.
 .SH NOTES
 All of these interfaces are provided as macros and functions.
 The macros are suppressed (and only the functions provided)
-when \fBNCURSES_OPAQUE\fP is defined.
-The standard forms such as \fBgetyx\fP must be implemented as macros,
+when \fB\%NCURSES_OPAQUE\fP is defined.
+The standard forms such as \fB\%getyx\fP must be implemented as macros,
 and (in this implementation) are defined in terms of the functions
 described here,
-to avoid reliance on internal details of the WINDOW structure.
+to avoid reliance on internal details of the \fB\%WINDOW\fP structure.
 .SH PORTABILITY
 These functions were supported on Version 7, BSD or System V implementations.
 None of those implementations checked the window parameter.
 .PP
-The \fBgetattrs\fP function and macro are defined to return a (signed) integer
+The \fB\%getattrs\fP function and macro are defined to return a (signed) integer
 for compatibility with those implementations
 although an unsigned type would have been more appropriate.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_getyx\fP(3X),
-\fBcurs_opaque\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_getyx\fP(3X),
+\fB\%curs_opaque\fP(3X)
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index c04598a90..182737313 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.21 2023/09/16 23:37:03 tom Exp $
-.TH curs_memleaks 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.25 2023/09/23 21:07:59 tom Exp $
+.TH curs_memleaks 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,28 +42,25 @@
 \fB\%exit_terminfo\fP \-
 check for memory leaks in \fIcurses\fR
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.br
 \fBvoid exit_curses(int \fIcode\fB);\fR
-.sp
+.PP
 \fB#include <term.h>\fP
-.br
 \fBvoid exit_terminfo(int \fIcode\fB);\fR
-.sp
+.PP
 /* deprecated (intentionally not declared in curses.h or term.h) */
-.br
 \fBvoid _nc_freeall(void);\fP
-.br
 \fBvoid _nc_free_and_exit(int \fIcode\fB);\fR
-.br
 \fBvoid _nc_free_tinfo(int \fIcode\fB);\fR
+.fi
 .SH DESCRIPTION
 These functions are used to simplify analysis of memory leaks in the ncurses
 library.
 .PP
 Any implementation of curses must not free the memory associated with
-a screen, since (even after calling \fBendwin\fP(3X)), it must be available
-for use in the next call to \fBrefresh\fP(3X).
+a screen, since (even after calling \fB\%endwin\fP(3X)), it must be available
+for use in the next call to \fB\%refresh\fP(3X).
 There are also chunks of memory held for performance reasons.
 That makes it hard to analyze curses applications for memory leaks.
 When using the specially configured debugging version of the ncurses library,
@@ -73,28 +70,28 @@ simplifying the process of memory-leak checking.
 Some of the functions are named with a \*(``_nc_\*('' prefix
 because they are not intended for use in the non-debugging library:
 .TP 5
-\fB_nc_freeall\fP
+\fB\%_nc_freeall\fP
 This frees (almost) all of the memory allocated by ncurses.
 .TP 5
-\fB_nc_free_and_exit\fP
-This frees the memory allocated by ncurses (like \fB_nc_freeall\fP),
+\fB\%_nc_free_and_exit\fP
+This frees the memory allocated by ncurses (like \fB\%_nc_freeall\fP),
 and exits the program.
-It is preferred over \fB_nc_freeall\fP since some of that memory
+It is preferred over \fB\%_nc_freeall\fP since some of that memory
 may be required to keep the application running.
 Simply exiting (with the given exit-code) is safer.
 .TP 5
-\fB_nc_free_tinfo\fP
+\fB\%_nc_free_tinfo\fP
 Use this function if only the low-level terminfo functions (and
 corresponding library) are used.
-Like \fB_nc_free_and_exit\fP, it exits the program after freeing memory.
+Like \fB\%_nc_free_and_exit\fP, it exits the program after freeing memory.
 .PP
 The functions prefixed \*(``_nc\*('' are normally not available;
 they must be configured into the library
-at build time using the \fB\-\-disable-leaks\fP option.
+at build time using the \fB\%\-\-disable-leaks\fP option.
 That compiles-in code that frees memory that normally would not be freed.
 .PP
-The \fBexit_curses\fP and \fBexit_terminfo\fP functions
-call \fB_nc_free_and_exit\fP and \fB_nc_free_tinfo\fP if
+The \fB\%exit_curses\fP and \fB\%exit_terminfo\fP functions
+call \fB\%_nc_free_and_exit\fP and \fB\%_nc_free_tinfo\fP if
 the library is configured to support memory-leak checking.
 If the library is not configured to support memory-leak checking,
 they simply call \fBexit\fP.
@@ -107,18 +104,18 @@ nor do other implementations of curses provide a similar feature.
 In any implementation of X/Open Curses, an application can free part
 of the memory allocated by curses:
 .bP
-The portable part of \fBexit_curses\fP can be freed using \fBdelscreen\fP,
-passing the \fBSCREEN*\fP pointer returned by \fBnewterm\fP.
+The portable part of \fB\%exit_curses\fP can be freed using \fB\%delscreen\fP,
+passing the \fBSCREEN*\fP pointer returned by \fB\%newterm\fP.
 .IP
 In some implementations, there is a global variable \fBsp\fP
 which could be used, e.g., if the screen were only initialized
-using \fBinitscr\fP.
+using \fB\%initscr\fP.
 .bP
-The portable part of \fBexit_terminfo\fP can be freed using \fBdel_curterm\fP.
+The portable part of \fB\%exit_terminfo\fP can be freed using \fB\%del_curterm\fP.
 .IP
-In this case, there is a global variable \fBcur_term\fP which can be
+In this case, there is a global variable \fB\%cur_term\fP which can be
 used as parameter.
 .SH SEE ALSO
-\fBcurs_initscr\fP(3X),
-\fBcurs_terminfo\fP(3X).
-\fBcurses\fP(3X).
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%curses\fP(3X)
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 31d128f3d..8f40045cf 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.71 2023/09/16 23:37:03 tom Exp $
-.TH curs_mouse 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.78 2023/09/23 23:08:40 tom Exp $
+.TH curs_mouse 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -68,42 +68,39 @@
 \fB\%mouseinterval\fP \-
 get mouse events in \fIcurses\fR
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
 .PP
 \fBtypedef unsigned long mmask_t;\fP
 .PP
-.nf
 \fBtypedef struct {\fP
 \fB    short id;         \fI/* ID to distinguish multiple devices */\fR
 \fB    int x, y, z;      \fI/* event coordinates */\fR
 \fB    mmask_t bstate;   \fI/* button state bits */\fR
 \fB} MEVENT;\fP
-.fi
 .PP
 \fBbool has_mouse(void);\fP
-.sp
+.PP
 \fBint getmouse(MEVENT *\fIevent\fB);\fR
-.br
 \fBint ungetmouse(MEVENT *\fIevent\fB);\fR
-.sp
+.PP
 \fBmmask_t mousemask(mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
-.sp
+.PP
 \fBbool wenclose(const WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.sp
+.PP
 \fBbool mouse_trafo(int* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
-.br
 \fBbool wmouse_trafo(const WINDOW* \fIwin\fB,\fR
                   \fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
-.sp
+.PP
 \fBint mouseinterval(int \fIerval\fB);\fR
-.br
+.fi
 .SH DESCRIPTION
 These functions provide an interface to mouse events from
-\fBncurses\fP(3X).
-Mouse events are represented by \fBKEY_MOUSE\fP
-pseudo-key values in the \fBwgetch\fP(3X) input stream.
+\fB\%ncurses\fP(3X).
+Mouse events are represented by \fB\%KEY_MOUSE\fP
+pseudo-key values in the \fB\%wgetch\fP(3X) input stream.
 .SS mousemask
-To make mouse events visible, use the \fBmousemask\fP function.
+To make mouse events visible, use the \fB\%mousemask\fP function.
 This sets the mouse events to be reported.
 By default, no mouse events are reported.
 .bP
@@ -114,7 +111,7 @@ If the screen has not been initialized,
 or if the terminal does not support mouse-events,
 this function returns 0.
 .bP
-If \fIoldmask\fP is non-NULL,
+If \fIoldmask\fP is non-\fBNULL\fP,
 this function fills the indicated location with the previous value of the
 current screen's mouse event mask.
 .PP
@@ -125,10 +122,10 @@ Whether this happens is device-dependent.
 Here are the mouse event type masks which may be defined:
 .PP
 .TS
-l l
-_ _
-l l.
-\fBName\fP	\fBDescription\fP
+lB lB
+lB l .
+Name	Description
+_
 BUTTON1_PRESSED	mouse button 1 down
 BUTTON1_RELEASED	mouse button 1 up
 BUTTON1_CLICKED	mouse button 1 clicked
@@ -168,39 +165,39 @@ _
 .TE
 .SS getmouse
 Once a class of mouse events has been made visible in a window,
-calling the \fBwgetch\fP function on that window may return
-\fBKEY_MOUSE\fP as an indicator that a mouse event has been queued.
+calling the \fB\%wgetch\fP function on that window may return
+\fB\%KEY_MOUSE\fP as an indicator that a mouse event has been queued.
 To read the event data and pop the event off the queue, call
-\fBgetmouse\fP.
+\fB\%getmouse\fP.
 This function will return \fBOK\fP if a mouse event
 is actually visible in the given window, \fBERR\fP otherwise.
-When \fBgetmouse\fP returns \fBOK\fP, the data deposited as y and
+When \fB\%getmouse\fP returns \fBOK\fP, the data deposited as y and
 x in the event structure coordinates will be screen-relative character-cell
 coordinates.
 The returned state mask will have exactly one bit set to
 indicate the event type.
 The corresponding data in the queue is marked invalid.
-A subsequent call to \fBgetmouse\fP will retrieve the next older
+A subsequent call to \fB\%getmouse\fP will retrieve the next older
 item from the queue.
 .SS ungetmouse
-The \fBungetmouse\fP function behaves analogously to \fBungetch\fP.
+The \fB\%ungetmouse\fP function behaves analogously to \fB\%ungetch\fP.
 It pushes
-a \fBKEY_MOUSE\fP event onto the input queue, and associates with that event
+a \fB\%KEY_MOUSE\fP event onto the input queue, and associates with that event
 the given state data and screen-relative character-cell coordinates.
 .SS wenclose
-The \fBwenclose\fP function tests whether a given pair of screen-relative
+The \fB\%wenclose\fP function tests whether a given pair of screen-relative
 character-cell coordinates is enclosed by a given window, returning \fBTRUE\fP
 if it is and \fBFALSE\fP otherwise.
 It is useful for determining what subset of
 the screen windows enclose the location of a mouse event.
 .SS wmouse_trafo
-The \fBwmouse_trafo\fP function transforms a given pair of coordinates
+The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
 from stdscr-relative coordinates
 to coordinates relative to the given window or vice versa.
 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\fP(3X) calls, for example).
+(see the \fB\%ripoffline\fP and \fB\%slk_init\fP(3X) calls, for example).
 .bP
 If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
 \fIpY, pX\fP must reference the coordinates of a location
@@ -209,7 +206,7 @@ They are converted to window-relative coordinates and returned
 through the pointers.
 If the conversion was successful, the function returns \fBTRUE\fP.
 .bP
-If one of the parameters was NULL or the location is
+If one of the parameters was \fBNULL\fP or the location is
 not inside the window, \fBFALSE\fP is returned.
 .bP
 If \fIto_screen\fP is
@@ -219,38 +216,38 @@ They are converted to stdscr-relative coordinates if the
 window \fIwin\fP encloses this point.
 In this case the function returns \fBTRUE\fP.
 .bP
-If one of the parameters is NULL or the point is not inside the
+If one of the parameters is \fBNULL\fP or the point is not inside the
 window, \fBFALSE\fP is returned.
 The referenced coordinates
 are only replaced by the converted coordinates if the transformation was
 successful.
 .SS mouse_trafo
-The \fBmouse_trafo\fP function performs the same translation
-as \fBwmouse_trafo\fP,
+The \fB\%mouse_trafo\fP function performs the same translation
+as \fB\%wmouse_trafo\fP,
 using stdscr for \fIwin\fP.
 .SS mouseinterval
-The \fBmouseinterval\fP function sets the maximum time (in thousands of a
+The \fB\%mouseinterval\fP function sets the maximum time (in thousands of a
 second) that can elapse between press and release events for them to
 be recognized as a click.
-Use \fBmouseinterval(0)\fP to disable click resolution.
+Use \fB\%mouseinterval(0)\fP to disable click resolution.
 This function returns the previous interval value.
-Use \fBmouseinterval(\-1)\fP to obtain the interval without altering it.
+Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
 The default is one sixth of a second.
 .SS has_mouse
-The \fBhas_mouse\fP function returns \fBTRUE\fP if the mouse driver has been
+The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver has been
 successfully initialized.
 .PP
 Note that mouse events will be ignored when input is in cooked mode, and will
 cause an error beep when cooked mode is being simulated in a window by a
-function such as \fBgetstr\fP that expects a linefeed for input-loop
+function such as \fB\%getstr\fP that expects a linefeed for input-loop
 termination.
 .SH RETURN VALUE
-\fBgetmouse\fP and \fBungetmouse\fP
+\fB\%getmouse\fP and \fB\%ungetmouse\fP
 return the integer \fBERR\fP upon failure or \fBOK\fP
 upon successful completion:
 .RS 3
 .TP 5
-\fBgetmouse\fP
+\fB\%getmouse\fP
 returns an error.
 .bP
 If no mouse driver was initialized, or
@@ -261,26 +258,26 @@ current \fImousemask\fP.
 .bP
 It also returns an error if no more events remain in the queue.
 .TP 5
-\fBungetmouse\fP
+\fB\%ungetmouse\fP
 returns an error if the FIFO is full.
 .RE
 .PP
-\fBmousemask\fP
+\fB\%mousemask\fP
 returns the mask of reportable events.
 .PP
-\fBmouseinterval\fP
+\fB\%mouseinterval\fP
 returns the previous interval value, unless
 the terminal was not initialized.
 In that case, it returns the maximum interval value (166).
 .PP
-\fBwenclose\fP and \fBwmouse_trafo\fP
+\fB\%wenclose\fP and \fB\%wmouse_trafo\fP
 are boolean functions returning \fBTRUE\fP or \fBFALSE\fP depending
 on their test result.
 .SH PORTABILITY
-These calls were designed for \fBncurses\fP(3X), and are not found in SVr4
-curses, 4.4BSD curses, or any other previous version of curses.
+These calls were designed for \fIncurses\fP, and are not found in SVr4
+\fIcurses\fP, 4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
 .PP
-SVr4 curses had support for the mouse in a variant of \fBxterm\fP(1).
+SVr4 \fIcurses\fP had support for the mouse in a variant of \fBxterm\fP(1).
 It is mentioned in a few places, but with no supporting documentation:
 .bP
 the \*(``libcurses\*('' manual page lists functions for this feature
@@ -304,20 +301,20 @@ mouse_info        minfo   Mi       Mouse status information
 req_mouse_pos     reqmp   RQ       Request mouse position report
 .NE
 .bP
-the interface made assumptions (as does ncurses) about the escape sequences
+the interface made assumptions (as does \fIncurses\fP) about the escape sequences
 sent to and received from the terminal.
 .IP
 For instance
-the SVr4 curses library used the \fBget_mouse\fP capability to tell the
+the SVr4 \fIcurses\fP library used the \fB\%get_mouse\fP capability to tell the
 terminal which mouse button events it should send,
 passing the mouse-button bit-mask to the terminal.
 Also, it could ask the terminal
-where the mouse was using the \fBreq_mouse_pos\fP capability.
+where the mouse was using the \fB\%req_mouse_pos\fP capability.
 .IP
-Those features required a terminal which had been modified to work with curses.
+Those features required a terminal which had been modified to work with \fIcurses\fP.
 They were not part of the X Consortium's xterm.
 .PP
-When developing the xterm mouse support for ncurses in September 1995,
+When developing the xterm mouse support for \fIncurses\fP in September 1995,
 Eric Raymond was uninterested in using the same interface due to its
 lack of documentation.
 Later, in 1998, Mark Hesseling provided support in
@@ -326,12 +323,12 @@ PDCurses, however, does not use video terminals,
 making it unnecessary to be concerned about compatibility with the
 escape sequences.
 .PP
-The feature macro \fBNCURSES_MOUSE_VERSION\fP is provided so the preprocessor
+The feature macro \fB\%NCURSES_MOUSE_VERSION\fP is provided so the preprocessor
 can be used to test whether these features are present.
-If the interface is changed, the value of \fBNCURSES_MOUSE_VERSION\fP will be
+If the interface is changed, the value of \fB\%NCURSES_MOUSE_VERSION\fP will be
 incremented.
-These values for \fBNCURSES_MOUSE_VERSION\fP may be
-specified when configuring ncurses:
+These values for \fB\%NCURSES_MOUSE_VERSION\fP may be
+specified when configuring \fIncurses\fP:
 .RS 3
 .TP 3
 1
@@ -344,10 +341,10 @@ removes the definitions for reserved events.
 The mask uses 29 bits.
 .RE
 .PP
-The order of the \fBMEVENT\fP structure members is not guaranteed.
+The order of the \fB\%MEVENT\fP structure members is not guaranteed.
 Additional fields may be added to the structure in the future.
 .PP
-Under \fBncurses\fP(3X), these calls are implemented using either
+Under \fIncurses\fP, these calls are implemented using either
 xterm's built-in mouse-tracking API or
 platform-specific drivers including
 .RS 3
@@ -361,7 +358,7 @@ OS/2 EMX
 .PP
 If you are using an unsupported configuration,
 mouse events will not be visible to
-\fBncurses\fP(3X) (and the \fBmousemask\fP function will always
+\fIncurses\fP (and the \fB\%mousemask\fP function will always
 return \fB0\fP).
 .PP
 If the terminfo entry contains a \fBXM\fP string,
@@ -385,37 +382,37 @@ It is intended
 for use with touch screens (which may be pressure-sensitive) or with
 3D-mice/trackballs/power gloves.
 .PP
-The \fBALL_MOUSE_EVENTS\fP class does not include \fBREPORT_MOUSE_POSITION\fP.
+The \fB\%ALL_MOUSE_EVENTS\fP class does not include \fB\%REPORT_MOUSE_POSITION\fP.
 They are distinct.
 For example, in xterm,
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
 .SH BUGS
 Mouse events under xterm will not in fact be ignored during cooked mode,
-if they have been enabled by \fBmousemask\fP.
+if they have been enabled by \fB\%mousemask\fP.
 Instead, the xterm mouse
 report sequence will appear in the string read.
 .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\fP set to \*(``\\E[M\*(''
+Your terminfo description should have \fB\%kmous\fP set to \*(``\\E[M\*(''
 (the beginning of the response from xterm for mouse clicks).
-Other values for \fBkmous\fP are permitted,
+Other values for \fB\%kmous\fP are permitted,
 but under the same assumption,
 i.e., it is the beginning of the response.
 .PP
 Because there are no standard terminal responses that would serve to identify
-terminals which support the xterm mouse protocol, \fBncurses\fP assumes that
-if \fBkmous\fP is defined in the terminal description,
+terminals which support the xterm mouse protocol, \fIncurses\fP assumes that
+if \fB\%kmous\fP 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,
+The \fB\%kmous\fP capability is checked first,
 allowing the use of newer xterm mouse protocols
 such as xterm's private mode 1006.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_inopts\fP(3X),
-\fBcurs_kernel\fP(3X),
-\fBcurs_slk\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_inopts\fP(3X),
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_slk\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index e7f8561d7..6e13f7db3 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
-.TH curs_opaque 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.33 2023/09/23 22:59:48 tom Exp $
+.TH curs_opaque 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -51,101 +51,89 @@
 \fB\%wgetscrreg\fP \-
 obtain \fIcurses\fR window properties
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBbool is_cleared(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_idcok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_idlok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_immedok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_keypad(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_leaveok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_nodelay(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_notimeout(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_pad(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_scrollok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_subwin(const WINDOW *\fIwin\fB);\fR
-.br
 \fBbool is_syncok(const WINDOW *\fIwin\fB);\fR
-.br
 \fBWINDOW * wgetparent(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
-.br
 \fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int *\fIbottom\fB);\fR
+.fi
 .SH DESCRIPTION
 This implementation provides functions which return properties
-set in the WINDOW structure, allowing it to be \*(``opaque\*('' if
-the symbol \fBNCURSES_OPAQUE\fP is defined:
+set in the \fB\%WINDOW\fP structure, allowing it to be \*(``opaque\*('' if
+the symbol \fB\%NCURSES_OPAQUE\fP is defined:
 .TP 5
 \fBis_cleared\fP
-returns the value set in \fBclearok\fP(3X)
+returns the value set in \fB\%clearok\fP(3X)
 .TP 5
 \fBis_idcok\fP
-returns the value set in \fBidcok\fP(3X)
+returns the value set in \fB\%idcok\fP(3X)
 .TP 5
 \fBis_idlok\fP
-returns the value set in \fBidlok\fP(3X)
+returns the value set in \fB\%idlok\fP(3X)
 .TP 5
 \fBis_immedok\fP
-returns the value set in \fBimmedok\fP(3X)
+returns the value set in \fB\%immedok\fP(3X)
 .TP 5
 \fBis_keypad\fP
-returns the value set in \fBkeypad\fP(3X)
+returns the value set in \fB\%keypad\fP(3X)
 .TP 5
 \fBis_leaveok\fP
-returns the value set in \fBleaveok\fP(3X)
+returns the value set in \fB\%leaveok\fP(3X)
 .TP 5
 \fBis_nodelay\fP
-returns the value set in \fBnodelay\fP(3X)
+returns the value set in \fB\%nodelay\fP(3X)
 .TP 5
 \fBis_notimeout\fP
-returns the value set in \fBnotimeout\fP(3X)
+returns the value set in \fB\%notimeout\fP(3X)
 .TP 5
 \fBis_pad\fP
 returns \fBTRUE\fP if the window is a pad
-i.e., created by \fBnewpad\fP(3X)
+i.e., created by \fB\%newpad\fP(3X)
 .TP 5
 \fBis_scrollok\fP
-returns the value set in \fBscrollok\fP(3X)
+returns the value set in \fB\%scrollok\fP(3X)
 .TP 5
 \fBis_subwin\fP
 returns \fBTRUE\fP if the window is a subwindow,
-i.e., created by \fBsubwin\fP(3X) or \fBderwin\fP(3X)
+i.e., created by \fB\%subwin\fP(3X) or \fB\%derwin\fP(3X)
 .TP 5
 \fBis_syncok\fP
-returns the value set in \fBsyncok\fP(3X)
+returns the value set in \fB\%syncok\fP(3X)
 .TP 5
 \fBwgetdelay\fP
-returns the delay timeout as set in \fBwtimeout\fP(3X).
+returns the delay timeout as set in \fB\%wtimeout\fP(3X).
 .TP 5
 \fBwgetparent\fP
-returns the parent WINDOW pointer for subwindows,
-or NULL for windows having no parent.
+returns the parent \fB\%WINDOW\fP pointer for subwindows,
+or \fBNULL\fP for windows having no parent.
 .TP 5
 \fBwgetscrreg\fP
 returns the top and bottom rows for the scrolling margin
-as set in \fBwsetscrreg\fP.
+as set in \fB\%wsetscrreg\fP(3X).
 .SH RETURN VALUE
 These functions all return \fBTRUE\fP or \fBFALSE\fP, except as noted.
 .SH NOTES
 Both a macro and a function are provided for each name.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fIncurses\fP.
 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 NCURSES_VERSION.
+It is recommended that any code depending on \fIncurses\fP extensions
+be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_inopts\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_window\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_inopts\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_window\fP(3X)
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 28dbc7b79..2c58047c0 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
-.TH curs_pad 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.43 2023/09/23 22:49:51 tom Exp $
+.TH curs_pad 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,25 +42,22 @@
 \fB\%pecho_wchar\fP \-
 create and display \fIcurses\fR pads
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBWINDOW *newpad(int \fInlines\fB, int \fIncols\fB);\fR
-.br
 \fBWINDOW *subpad(WINDOW *\fIorig\fB, int \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint prefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
-.br
 \fBint pnoutrefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
-.br
 \fBint pechochar(WINDOW *\fIpad\fB, chtype \fIch\fB);\fR
-.br
 \fBint pecho_wchar(WINDOW *\fIpad\fB, const cchar_t *\fIwch\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS newpad
-The \fBnewpad\fP routine creates and returns a pointer to a new pad data
+The \fB\%newpad\fP routine creates and returns a pointer to a new pad data
 structure with the given number of lines, \fInlines\fP, and columns,
 \fIncols\fP.
 A pad is like a window, except that it is not restricted by the
@@ -72,25 +69,25 @@ Automatic refreshes of pads
 (e.g., from scrolling or echoing of input) do not occur.
 .PP
 It is not
-legal to call \fBwrefresh\fP with a \fIpad\fP as an argument; the routines
-\fBprefresh\fP or \fBpnoutrefresh\fP should be called instead.
+legal to call \fB\%wrefresh\fP with a \fIpad\fP as an argument; the routines
+\fB\%prefresh\fP or \fB\%pnoutrefresh\fP should be called instead.
 Note that these
 routines require additional parameters to specify the part of the pad to be
 displayed and the location on the screen to be used for the display.
 .SS subpad
-The \fBsubpad\fP routine creates and returns a pointer to a subwindow within a
+The \fB\%subpad\fP routine creates and returns a pointer to a subwindow within a
 pad with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
-Unlike \fBsubwin\fP, which uses screen coordinates, the window is at position
+Unlike \fB\%subwin\fP, which uses screen coordinates, the window is at position
 (\fIbegin\fR_\fIx\fB,\fR \fIbegin\fR_\fIy\fR) on the pad.
 The window is
 made in the middle of the window \fIorig\fP, so that changes made to one window
 affect both windows.
 During the use of this routine, it will often be
-necessary to call \fBtouchwin\fP or \fBtouchline\fP on \fIorig\fP before
-calling \fBprefresh\fP.
+necessary to call \fB\%touchwin\fP or \fB\%touchline\fP on \fIorig\fP before
+calling \fB\%prefresh\fP.
 .SS prefresh, pnoutrefresh
-The \fBprefresh\fP and \fBpnoutrefresh\fP routines are analogous to
-\fBwrefresh\fP and \fBwnoutrefresh\fP except that they relate to pads instead
+The \fB\%prefresh\fP and \fB\%pnoutrefresh\fP routines are analogous to
+\fB\%wrefresh\fP and \fB\%wnoutrefresh\fP except that they relate to pads instead
 of windows.
 The additional parameters are needed to indicate what part of the
 pad and screen are involved.
@@ -112,35 +109,35 @@ Negative values of
 \fIpminrow\fP, \fIpmincol\fP, \fIsminrow\fP, or \fIsmincol\fP are treated as if
 they were zero.
 .SS pechochar
-The \fBpechochar\fP routine is functionally equivalent to a call to \fBaddch\fP
-followed by a call to \fBrefresh\fP(3X),
-a call to \fBwaddch\fP followed by a call
-to \fBwrefresh\fP, or a call to \fBwaddch\fP followed by a call to
-\fBprefresh\fP.
+The \fB\%pechochar\fP routine is functionally equivalent to a call to \fB\%addch\fP
+followed by a call to \fB\%refresh\fP(3X),
+a call to \fB\%waddch\fP followed by a call
+to \fB\%wrefresh\fP, or a call to \fB\%waddch\fP followed by a call to
+\fB\%prefresh\fP.
 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 these routines instead of their
 equivalents.
-In the case of \fBpechochar\fP, the last location of the pad on
-the screen is reused for the arguments to \fBprefresh\fP.
+In the case of \fB\%pechochar\fP, the last location of the pad on
+the screen is reused for the arguments to \fB\%prefresh\fP.
 .SS pecho_wchar
-The \fBpecho_wchar\fP function is the analogous wide-character
-form of \fBpechochar\fP.
+The \fB\%pecho_wchar\fP function is the analogous wide-character
+form of \fB\%pechochar\fP.
 It outputs one character to a pad and immediately refreshes the pad.
-It does this by a call to \fBwadd_wch\fP followed by a call to \fBprefresh\fP.
+It does this by a call to \fB\%wadd_wch\fP followed by a call to \fB\%prefresh\fP.
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
 (SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
 completion.
 .PP
-Routines that return pointers return \fBNULL\fP on error, and set \fBerrno\fP
-to \fBENOMEM\fP.
+Routines that return pointers return \fBNULL\fP on error, and set \fB\%errno\fP
+to \fB\%ENOMEM\fP.
 .PP
 X/Open does not define any error conditions.
 In this implementation
 .RS 3
 .TP 5
-\fBprefresh\fP and \fBpnoutrefresh\fP
+\fB\%prefresh\fP and \fB\%pnoutrefresh\fP
 return an error
 if the window pointer is null, or
 if the window is not really a pad or
@@ -150,19 +147,19 @@ if the minimum coordinates are greater than the maximum.
 \fBpechochar\fP
 returns an error
 if the window is not really a pad, and the associated call
-to \fBwechochar\fP returns an error.
+to \fB\%wechochar\fP returns an error.
 .TP 5
 \fBpecho_wchar\fP
 returns an error
 if the window is not really a pad, and the associated call
-to \fBwecho_wchar\fP returns an error.
+to \fB\%wecho_wchar\fP returns an error.
 .RE
 .SH NOTES
-Note that \fBpechochar\fP may be a macro.
+Note that \fB\%pechochar\fP may be a macro.
 .SH PORTABILITY
-BSD curses has no \fIpad\fP feature.
+BSD \fIcurses\fP has no \fIpad\fP feature.
 .PP
-SVr2 curses (1986) provided the \fBnewpad\fP and related functions,
+SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
 documenting them in a single line each.
 SVr3 (1987) provided more extensive documentation.
 .PP
@@ -180,56 +177,56 @@ The two uses may be related.
 The XSI Curses standard, Issue 4 describes these functions,
 without significant change from the SVr3 documentation.
 It describes no error conditions.
-The behavior of \fBsubpad\fP if the parent window is not
+The behavior of \fB\%subpad\fP if the parent window is not
 a pad is undocumented,
 and is not checked by the vendor Unix implementations:
 .bP
-SVr4 curses sets a flag in the \fBWINDOW\fP structure in \fBnewpad\fP
+SVr4 \fIcurses\fP sets a flag in the \fB\%WINDOW\fP structure in \fB\%newpad\fP
 which tells if the window is a \fIpad\fP.
 .IP
 However, it uses this information only in
-\fBwaddch\fP (to decide if it should call \fBwrefresh\fP) and
-\fBwscrl\fP (to avoid scrolling a pad),
-and does not check in \fBwrefresh\fP to ensure that the pad
+\fB\%waddch\fP (to decide if it should call \fB\%wrefresh\fP) and
+\fB\%wscrl\fP (to avoid scrolling a pad),
+and does not check in \fB\%wrefresh\fP to ensure that the pad
 is refreshed properly.
 .bP
-Solaris X/Open Curses checks if a window is a pad in \fBwnoutrefresh\fP,
+Solaris X/Open Curses checks if a window is a pad in \fB\%wnoutrefresh\fP,
 returning \fBERR\fP in that case.
 .IP
 However, it only sets the flag for subwindows if the parent window is a pad.
-Its \fBnewpad\fP function does not set this information.
+Its \fB\%newpad\fP function does not set this information.
 Consequently, the check will never fail.
 .IP
-It makes no comparable check in \fBpnoutrefresh\fP,
+It makes no comparable check in \fB\%pnoutrefresh\fP,
 though interestingly enough, a comment in the source code
 states that the lack of a check was an MKS extension.
 .bP
-NetBSD 7 curses
-sets a flag in the \fBWINDOW\fP structure for \fBnewpad\fP and \fBsubpad\fP,
-using this to help with the distinction between \fBwnoutrefresh\fP
-and \fBpnoutrefresh\fP.
+NetBSD 7 \fIcurses\fP
+sets a flag in the \fB\%WINDOW\fP structure for \fB\%newpad\fP and \fB\%subpad\fP,
+using this to help with the distinction between \fB\%wnoutrefresh\fP
+and \fB\%pnoutrefresh\fP.
 .IP
 It does not check for the case where a subwindow is created in
-a pad using \fBsubwin\fP or \fBderwin\fP.
+a pad using \fB\%subwin\fP or \fB\%derwin\fP.
 .IP
-The \fBdupwin\fP function returns a regular window when duplicating a pad.
-Likewise, \fBgetwin\fP always returns a window, even if the saved
+The \fB\%dupwin\fP function returns a regular window when duplicating a pad.
+Likewise, \fB\%getwin\fP always returns a window, even if the saved
 data was from a pad.
 .PP
 This implementation
 .bP
-sets a flag in the \fBWINDOW\fP structure for \fBnewpad\fP and \fBsubpad\fP,
+sets a flag in the \fB\%WINDOW\fP structure for \fB\%newpad\fP and \fB\%subpad\fP,
 .bP
-allows a \fBsubwin\fP or \fBderwin\fP call to succeed having a pad parent by
+allows a \fB\%subwin\fP or \fB\%derwin\fP call to succeed having a pad parent by
 forcing the subwindow to be a pad,
 .bP
-checks in both \fBwnoutrefresh\fP and \fBpnoutrefresh\fP to ensure
+checks in both \fB\%wnoutrefresh\fP and \fB\%pnoutrefresh\fP to ensure
 that pads and windows are handled distinctly, and
 .bP
-ensures that \fBdupwin\fP and \fBgetwin\fP treat
+ensures that \fB\%dupwin\fP and \fB\%getwin\fP treat
 pads versus windows consistently.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_touch\fP(3X),
-\fBcurs_addch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_touch\fP(3X),
+\fB\%curs_addch\fP(3X)
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 3325958eb..a3a5b48bf 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,20 +27,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
-.TH curs_print 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.31 2023/09/23 23:04:49 tom Exp $
+.TH curs_print 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint mcprint(char *\fIdata\fB, int \fIlen\fB);\fR
 .SH DESCRIPTION
 This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
 if they are present, to ship given data to a printer attached to the terminal.
 .PP
-Note that the \fBmcprint\fP code has no way to do flow control with the printer
+Note that the \fB\%mcprint\fP code has no way to do flow control with the printer
 or to know how much buffering it has.
 Your application is responsible for
 keeping the rate of writes to the printer below its continuous throughput rate
@@ -50,24 +50,26 @@ Dot-matrix printers and
 rule of thumb is to sleep for a second after shipping each 80-character line.
 .
 .SH RETURN VALUE
-The \fBmcprint\fP function returns \fBERR\fP if the write operation aborted
+The \fB\%mcprint\fP function returns \fBERR\fP if the write operation aborted
 for some reason.
-In this case, \fBerrno\fP will contain either an error associated
+In this case, \fB\%errno\fP will contain either an error associated
 with \fBwrite\fP(2) or one of the following:
 .TP 5
-ENODEV
+\fBENODEV\fP
 Capabilities for printer redirection do not exist.
 .TP 5
-ENOMEM
+\fBENOMEM\fP
 Couldn't allocate sufficient memory to buffer the printer write.
 .PP
-When \fBmcprint\fP succeeds, it returns the number of characters actually
+When \fB\%mcprint\fP succeeds, it returns the number of characters actually
 sent to the printer.
 .SH PORTABILITY
-The \fBmcprint\fP call was designed for \fBncurses\fP(3X), and is not found
-in SVr4 curses, 4.4BSD curses, or any other previous version of curses.
+The \fB\%mcprint\fP call was designed for \fIncurses\fP, and is not found
+in SVr4 \fIcurses\fP, 4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
+It is recommended that any code depending on \fIncurses\fP extensions
+be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH BUGS
 Padding in the \fBmc5p\fP, \fBmc4\fP and \fBmc5\fP capabilities will not be
 interpreted.
 .SH SEE ALSO
-\fBcurses\fP(3X)
+\fB\%curses\fP(3X)
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 50b477ac6..2cdab7926 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.53 2023/09/16 23:37:03 tom Exp $
-.TH curs_slk 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.60 2023/09/23 22:49:51 tom Exp $
+.TH curs_slk 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -58,67 +58,55 @@
 \fB\%extended_slk_color\fP \-
 \fIcurses\fR soft label key routines
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint slk_init(int \fIfmt\fB);\fR
-.sp
+.PP
 \fBint slk_set(int \fIlabnum\fB, const char *\fIlabel\fB, int \fIfmt\fB);\fR
-.br
 \fBint slk_wset(int \fIlabnum\fB, const wchar_t *\fIlabel\fB, int \fIfmt\fB);\fR
-.sp
+.PP
 \fBchar *slk_label(int \fIlabnum\fB);\fR
-.sp
+.PP
 \fBint slk_refresh(void);\fP
-.br
 \fBint slk_noutrefresh(void);\fP
-.br
 \fBint slk_clear(void);\fP
-.br
 \fBint slk_restore(void);\fP
-.br
 \fBint slk_touch(void);\fP
-.sp
+.PP
 \fBint slk_attron(const chtype \fIattrs\fB);\fR
-.br
 \fBint slk_attroff(const chtype \fIattrs\fB);\fR
-.br
 \fBint slk_attrset(const chtype \fIattrs\fB);\fR
-.br
 \fBint slk_attr_on(attr_t \fIattrs\fB, void* \fIopts\fB);\fR
-.br
 \fBint slk_attr_off(const attr_t \fIattrs\fB, void * \fIopts\fB);\fR
-.br
 \fBint slk_attr_set(const attr_t \fIattrs\fB, short \fIpair\fB, void* \fIopts\fB);\fR
-.br
-/* extension */
-.br
+\fI/* extension */\fP
 \fBattr_t slk_attr(void);\fP
-.sp
+.PP
 \fBint slk_color(short \fIpair\fB);\fR
-.br
-/* extension */
-.br
+\fI/* extension */\fP
 \fBint extended_slk_color(int \fIpair\fB);\fR
+.fi
 .SH DESCRIPTION
-The slk* functions manipulate the set of soft function-key labels that exist on
+The \fBslk\fP* functions manipulate the set of soft function-key labels that exist on
 many terminals.
 For those terminals that do not have soft labels,
-\fBcurses\fP takes over the bottom line of \fBstdscr\fP, reducing the size of
-\fBstdscr\fP and the variable \fBLINES\fP.
-\fBcurses\fP standardizes on eight
+\fIcurses\fP takes over the bottom line of \fB\%stdscr\fP, reducing the size of
+\fB\%stdscr\fP and the variable \fBLINES\fP.
+\fIcurses\fP standardizes on eight
 labels of up to eight characters each.
-In addition to this, the ncurses
+In addition to this, the \fIncurses\fP
 implementation supports a mode where it simulates 12 labels of up to five
 characters each.
 This is useful for PC-like enduser devices.
-ncurses simulates this mode by taking over up to two lines at
+\fIncurses\fP simulates this mode by taking over up to two lines at
 the bottom of the screen;
 it does not try to use any hardware support for this
 mode.
 .SS Initialization
-The \fBslk_init\fP routine must be called before \fBinitscr\fP or \fBnewterm\fP
+The \fB\%slk_init\fP routine must be called before \fB\%initscr\fP or \fB\%newterm\fP
 is called.
-If \fBinitscr\fP eventually uses a line from \fBstdscr\fP to
+If \fB\%initscr\fP eventually uses a line from \fB\%stdscr\fP to
 emulate the soft labels,
 then \fIfmt\fP determines how the labels are arranged on the screen:
 .RS 3
@@ -139,19 +127,19 @@ but in addition an index line is generated, helping the user to
 identify the key numbers easily.
 .RE
 .SS Labels
-The \fBslk_set\fP routine
-(and the \fBslk_wset\fP routine for the wide-character library)
+The \fB\%slk_set\fP routine
+(and the \fB\%slk_wset\fP routine for the wide-character library)
 has three parameters:
 .RS 3
 .TP 5
 .I labnum
 is the label number, from \fB1\fP to \fB8\fP
-(12 if \fIfmt\fP in \fBslk_init\fP is \fB2\fP or \fB3\fP);
+(12 if \fIfmt\fP in \fB\%slk_init\fP is \fB2\fP or \fB3\fP);
 .TP
 .I label
 is be the string to put on the label,
 up to eight
-(five if \fIfmt\fP in \fBslk_init\fP is \fB2\fP or \fB3\fP)
+(five if \fIfmt\fP in \fB\%slk_init\fP is \fB2\fP or \fB3\fP)
 characters in length.
 A null string or a null pointer sets up a blank label.
 .TP
@@ -162,36 +150,36 @@ left-justified, centered, or right-justified, respectively, within the
 label.
 .RE
 .PP
-The \fBslk_label\fP routine returns the current label for label number
+The \fB\%slk_label\fP routine returns the current label for label number
 \fIlabnum\fP, with leading and trailing blanks stripped.
 .SS Screen updates
-The \fBslk_refresh\fP and \fBslk_noutrefresh\fP routines correspond to
-the \fBwrefresh\fP and \fBwnoutrefresh\fP routines.
+The \fB\%slk_refresh\fP and \fB\%slk_noutrefresh\fP routines correspond to
+the \fB\%wrefresh\fP and \fB\%wnoutrefresh\fP routines.
 .PP
-The \fBslk_clear\fP routine clears the soft labels from the screen.
+The \fB\%slk_clear\fP routine clears the soft labels from the screen.
 .PP
-The \fBslk_restore\fP routine restores the soft labels to the screen
-after a \fBslk_clear\fP has been performed.
+The \fB\%slk_restore\fP routine restores the soft labels to the screen
+after a \fB\%slk_clear\fP has been performed.
 .PP
-The \fBslk_touch\fP routine forces all the soft labels to be output
-the next time a \fBslk_noutrefresh\fP is performed.
+The \fB\%slk_touch\fP routine forces all the soft labels to be output
+the next time a \fB\%slk_noutrefresh\fP is performed.
 .SS Video attributes
 The
-\fBslk_attron\fP, \fBslk_attrset\fP, \fBslk_attroff\fP and \fBslk_attr\fP
+\fB\%slk_attron\fP, \fB\%slk_attrset\fP, \fB\%slk_attroff\fP and \fB\%slk_attr\fP
 routines correspond to
-\fBattron\fP, \fBattrset\fP, \fBattroff\fP and \fBattr_get\fP, respectively.
+\fB\%attron\fP, \fB\%attrset\fP, \fB\%attroff\fP and \fB\%attr_get\fP, respectively.
 They have an effect only if soft labels are simulated on the bottom line of
 the screen.
 The default highlight for soft keys is A_STANDOUT (as in
-System V curses, which does not document this fact).
+System V \fIcurses\fP, which does not document this fact).
 .SS Colors
-The \fBslk_color\fP routine corresponds to \fBcolor_set\fP.
+The \fB\%slk_color\fP routine corresponds to \fB\%color_set\fP.
 It has an effect only
 if soft labels are simulated on the bottom line of the screen.
 .PP
-Because \fBslk_color\fP accepts only \fBshort\fP (signed 16-bit integer) values,
+Because \fB\%slk_color\fP accepts only \fBshort\fP (signed 16-bit integer) values,
 this implementation provides
-\fBextended_slk_color\fP which accepts an integer value, e.g., 32-bits.
+\fB\%extended_slk_color\fP which accepts an integer value, e.g., 32-bits.
 .
 .SH RETURN VALUE
 These routines return \fBERR\fP upon failure
@@ -216,12 +204,12 @@ if the terminal or the softkeys were not initialized.
 \fBslk_attr_set\fP
 returns an error
 if the terminal or the softkeys were not initialized, or
-the color pair is outside the range 0..COLOR_PAIRS\-1.
+the color pair is outside the range 0..\fBCOLOR_PAIRS\fP\-1.
 .TP 5
 \fBslk_color\fP
 returns an error
 if the terminal or the softkeys were not initialized, or
-the color pair is outside the range 0..COLOR_PAIRS\-1.
+the color pair is outside the range 0..\fBCOLOR_PAIRS\fP\-1.
 .TP 5
 \fBslk_init\fP
 returns an error
@@ -239,65 +227,65 @@ memory for the labels cannot be allocated.
 .RE
 .SH HISTORY
 SVr3 introduced these functions:
-  slk_clear
-  slk_init
-  slk_label
-  slk_noutrefresh
-  slk_refresh
-  slk_restore
-  slk_set
-  slk_touch
+  \fBslk_clear\fP
+  \fBslk_init\fP
+  \fBslk_label\fP
+  \fBslk_noutrefresh\fP
+  \fBslk_refresh\fP
+  \fBslk_restore\fP
+  \fBslk_set\fP
+  \fBslk_touch\fP
 .PP
 SVr4 added these functions:
-  slk_attroff
-  slk_attron
-  slk_attrset
-  slk_start
+  \fBslk_attroff\fP
+  \fBslk_attron\fP
+  \fBslk_attrset\fP
+  \fBslk_start\fP
 .PP
-X/Open Curses added these:
-  slk_attr_off
-  slk_attr_on
-  slk_attr_set
-  slk_color
-  slk_wset
+X/Open \fIcurses\fP added these:
+  \fBslk_attr_off\fP
+  \fBslk_attr_on\fP
+  \fBslk_attr_set\fP
+  \fBslk_color\fP
+  \fBslk_wset\fP
 .SH EXTENSIONS
-X/Open Curses documents the \fIopts\fP argument as reserved for future use,
+X/Open \fIcurses\fP documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
 This implementation
 uses that parameter in ABI 6 for the functions which have a color-pair
 parameter to support extended color pairs.
 .PP
-For  functions  which modify the color, e.g., \fBslk_attr_set\fP,
+For  functions  which modify the color, e.g., \fB\%slk_attr_set\fP,
 if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
 and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
 .SH NOTES
-Most applications would use \fBslk_noutrefresh\fP because a
-\fBwrefresh\fP is likely to follow soon.
+Most applications would use \fB\%slk_noutrefresh\fP because a
+\fB\%wrefresh\fP is likely to follow soon.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4, described the soft-key functions,
-with some differences from SVr4 curses:
+The XSI \fIcurses\fP standard, Issue 4, described the soft-key functions,
+with some differences from SVr4 \fIcurses\fP:
 .bP
 It added functions like the SVr4
-attribute-manipulation functions \fBslk_attron\fP,
-\fBslk_attroff\fP, \fBslk_attrset\fP,
-but which use \fBattr_t\fP parameters (rather than \fBchtype\fP),
+attribute-manipulation functions \fB\%slk_attron\fP,
+\fB\%slk_attroff\fP, \fB\%slk_attrset\fP,
+but which use \fBattr_t\fP parameters (rather than \fB\%chtype\fP),
 along with a reserved \fIopts\fP parameter.
 .IP
 Two of these new functions (unlike the SVr4 functions) have no provision
-for color: \fBslk_attr_on\fP and \fBslk_attr_off\fP.
+for color: \fB\%slk_attr_on\fP and \fB\%slk_attr_off\fP.
 .IP
-The third function (\fBslk_attr_set\fP) has a color-pair parameter.
+The third function (\fB\%slk_attr_set\fP) has a color-pair parameter.
 .bP
 It added \fBconst\fP qualifiers to parameters (unnecessarily), and
 .bP
-It added \fBslk_color\fP.
+It added \fB\%slk_color\fP.
 .PP
-Although \fBslk_start\fP is declared in the curses header file,
+Although \fB\%slk_start\fP is declared in the \fIcurses\fP header file,
 it was not documented by SVr4 other than its presence in a list
 of libtermlib.so.1 symbols.
 Reading the source code (i.e., Illumos):
 .bP
-\fBslk_start\fP has two parameters:
+\fB\%slk_start\fP has two parameters:
 .RS
 .bP
 \fIng\fP (number of groups) and
@@ -307,29 +295,29 @@ Reading the source code (i.e., Illumos):
 .bP
 Soft-key groups are an array of \fIng\fP integers.
 .bP
-In SVr4, \fBslk_init\fP calls \fBslk_start\fP passing a null for \fIgp\fP.
-For this case, \fBslk_start\fP uses the number of groups \fIng\fP
-(3 for the 3-2-3 layout, 2 for the 4-4 layout) which \fBslk_init\fP provided.
+In SVr4, \fB\%slk_init\fP calls \fB\%slk_start\fP passing a null for \fIgp\fP.
+For this case, \fB\%slk_start\fP uses the number of groups \fIng\fP
+(3 for the 3-2-3 layout, 2 for the 4-4 layout) which \fB\%slk_init\fP provided.
 .IP
 If \fIng\fP is neither 2 or 3,
-\fBslk_start\fP checks the terminfo \fIfln\fP (label_format) capability,
+\fB\%slk_start\fP checks the terminfo \fBfln\fP (label_format) capability,
 interpreting that as a comma-separated list of numbers,
 e.g., \*(``3,2,3\*('' for the 3-2-3 layout.
 .IP
-Finally, if there is no \fIfln\fP capability, \fBslk_start\fP returns ERR.
+Finally, if there is no \fBfln\fP capability, \fB\%slk_start\fP returns \fBERR\fP.
 .bP
-If \fBslk_start\fP is given a non-null \fIgp\fP,
+If \fB\%slk_start\fP is given a non-null \fIgp\fP,
 it copies the \fIng\fP elements of the group of soft-keys, up to 16.
 .IP
-If there are more than 16 elements, \fBslk_start\fP returns an error.
+If there are more than 16 elements, \fB\%slk_start\fP returns an error.
 .bP
-The format codes \fB2\fP and \fB3\fP for \fBslk_init\fP
-were added by ncurses in 1996.
+The format codes \fB2\fP and \fB3\fP for \fB\%slk_init\fP
+were added by \fIncurses\fP in 1996.
 PDCurses 2.4 added this feature in 2001.
 .PP
-The function \fBslk_attr\fP was added by ncurses in 1996.
+The function \fB\%slk_attr\fP was added by \fIncurses\fP in 1996.
 .PP
-X/Open Curses does not specify a limit for the number of colors and
+X/Open \fIcurses\fP does not specify a limit for the number of colors and
 color pairs which a terminal can support.
 However, in its use of \fBshort\fP for the parameters,
 it carries over SVr4's implementation detail for the compiled
@@ -338,8 +326,8 @@ This implementation provides extended versions of those functions
 which use \fBint\fP parameters,
 allowing applications to use larger color- and pair-numbers.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_attr\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_attr\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index bd4189514..90aef061a 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.99 2023/09/16 23:37:03 tom Exp $
-.TH curs_terminfo 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.108 2023/09/23 23:38:10 tom Exp $
+.TH curs_terminfo 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -63,9 +63,9 @@
 .nf
 \fB#include <curses.h>\fP
 \fB#include <term.h>\fP
-.sp
+.PP
 \fBTERMINAL *cur_term;\fP
-.sp
+.PP
 \fBconst char * const boolnames[];\fP
 \fBconst char * const boolcodes[];\fP
 \fBconst char * const boolfnames[];\fP
@@ -75,56 +75,42 @@
 \fBconst char * const strnames[];\fP
 \fBconst char * const strcodes[];\fP
 \fBconst char * const strfnames[];\fP
-.sp
+.PP
 \fBint setupterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
-.br
 \fBTERMINAL *set_curterm(TERMINAL *\fInterm\fB);\fR
-.br
 \fBint del_curterm(TERMINAL *\fIoterm\fB);\fR
-.br
 \fBint restartterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
-.sp
+.PP
 \fBchar *tparm(const char *\fIstr\fB, ...);\fR
-.br
 	\fIor\fP
-.br
 \fBchar *tparm(const char *\fIstr\fB, long \fIp1 ... \fBlong \fIp9\fB);\fR
-.sp
+.PP
 \fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
-.br
 \fBint putp(const char *\fIstr\fB);\fR
-.sp
+.PP
 \fBint vidputs(chtype \fIattrs\fB, int (*\fIputc\fB)(int));\fR
-.br
 \fBint vidattr(chtype \fIattrs\fB);\fR
-.br
 \fBint vid_puts(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB, int (*\fIputc\fB)(int));\fR
-.br
 \fBint vid_attr(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
-.sp
+.PP
 \fBint mvcur(int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fR, int \fInewcol\fB);\fR
-.sp
+.PP
 \fBint tigetflag(const char *\fIcapname\fB);\fR
-.br
 \fBint tigetnum(const char *\fIcapname\fB);\fR
-.br
 \fBchar *tigetstr(const char *\fIcapname\fB);\fR
-.sp
+.PP
 \fBchar *tiparm(const char *\fIstr\fB, ...);\fR
-.sp
-/* extensions */
-.br
+.PP
+\fI/* extensions */\fP
 \fBchar *tiparm_s(int \fIexpected\fB, int \fImask\fB, const char *\fIstr\fB, ...);\fR
-.br
 \fBint tiscan_s(int *\fIexpected\fB, int *\fImask\fB, const char *\fIstr\fB);\fR
-.br
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
-directly with the \fBterminfo\fP database to handle certain terminal
+directly with the \fIterminfo\fP database to handle certain terminal
 capabilities, such as programming function keys.
 For all other
-functionality, \fBcurses\fP routines are more suitable and their use is
+functionality, \fIcurses\fP routines are more suitable and their use is
 recommended.
 .PP
 None of these functions use (or are aware of) multibyte character strings
@@ -219,30 +205,30 @@ If \fBERR\fP is returned, examine \fIerrret\fP:
 .RS
 .TP 5
 .B 1
-means that the terminal is hardcopy, cannot be used for curses applications.
+means that the terminal is hardcopy, cannot be used for \fIcurses\fP applications.
 .IP
-\fBsetupterm\fP determines if the entry is a hardcopy type by
+\fB\%setupterm\fP determines if the entry is a hardcopy type by
 checking the \fBhc\fP (\fBhardcopy\fP) capability.
 .TP 5
 .B 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.
+having too little information for \fIcurses\fP applications to run.
 .IP
-\fBsetupterm\fP determines if the entry is a generic type by
-checking the \fBgn\fP (\fBgeneric_type\fP) capability.
+\fB\%setupterm\fP determines if the entry is a generic type by
+checking the \fBgn\fP (\fB\%generic_type\fP) capability.
 .TP 5
 .B \-1
-means that the \fBterminfo\fP database could not be found.
+means that the \fIterminfo\fP database could not be found.
 .RE
 .IP
 If \fIerrret\fP is
-null, \fBsetupterm\fP prints an error message upon finding an error
+null, \fB\%setupterm\fP prints an error message upon finding an error
 and exits.
 Thus, the simplest call is:
-.sp
-      \fBsetupterm((char *)0, 1, (int *)0);\fP,
-.sp
+.IP
+\fBsetupterm((char *)0, 1, (int *)0);\fP,
+.PP
 which uses all the defaults and sends the output to \fBstdout\fP.
 .RE
 .\" ***************************************************************************
@@ -380,7 +366,7 @@ the output stream parameter of \fBnewterm\fP(3X).
 .PP
 While \fBputp\fP and \fBmvcur\fP are low-level functions which
 do not use the high-level curses state,
-they are declared in \fB<curses.h>\fP because SystemV did this
+they are declared in \fB\%<curses.h>\fP because System\ V did this
 (see \fIHISTORY\fP).
 .\" ***************************************************************************
 .SS Terminal Capability Functions
@@ -421,20 +407,20 @@ if it is canceled or absent from the terminal description.
 .SS Terminal Capability Names
 These null-terminated arrays contain
 .bP
-the short terminfo names (\*(``codes\*(''),
+the short \fIterminfo\fP names (\*(``codes\*(''),
 .bP
-the \fBtermcap\fP names (\*(``names\*(''), and
+the \fItermcap\fP names (\*(``names\*(''), and
 .bP
-the long terminfo names (\*(``fnames\*('')
+the long \fIterminfo\fP names (\*(``fnames\*('')
+.PP
+for each of the predefined \fIterminfo\fP variables:
 .PP
-for each of the predefined \fBterminfo\fP variables:
-.sp
 .RS
+.nf
 \fBconst char *boolnames[]\fP, \fB*boolcodes[]\fP, \fB*boolfnames[]\fP
-.br
 \fBconst char *numnames[]\fP, \fB*numcodes[]\fP, \fB*numfnames[]\fP
-.br
 \fBconst char *strnames[]\fP, \fB*strcodes[]\fP, \fB*strfnames[]\fP
+.fi
 .RE
 .\" ***************************************************************************
 .SS Releasing Memory
@@ -442,9 +428,9 @@ Each successful call to \fBsetupterm\fP allocates memory to hold the terminal
 description.
 As a side-effect, it sets \fBcur_term\fP to point to this memory.
 If an application calls
-.sp
-        \fBdel_curterm(cur_term);\fP
-.sp
+.IP
+\fBdel_curterm(cur_term);\fP
+.PP
 the memory will be freed.
 .PP
 The formatting functions \fBtparm\fP and \fBtiparm\fP extend the storage
@@ -520,10 +506,10 @@ In SVr4, those are found in \fB<curses.h>\fP,
 but except for \fBsetterm\fP, are likewise macros.
 The one function, \fBsetterm\fP, is mentioned in the manual page.
 The manual page notes that the \fBsetterm\fP routine
-was replaced by \fBsetupterm\fP, stating that the call:
-.sp
-      \fBsetupterm(\fIterm\fB, 1, (int *)0)\fR
-.sp
+was replaced by \fB\%setupterm\fP, stating that the call
+.IP
+\fBsetupterm(\fIterm\fB, 1, (int *)0)\fR
+.PP
 provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
 and is not recommended for new programs.
 This implementation provides each of those symbols
@@ -531,11 +517,12 @@ as macros for BSD compatibility,
 .\" ***************************************************************************
 .SH HISTORY
 SVr2 introduced the terminfo feature.
-Its programming manual mentioned these low-level functions:
+Its programming manual mentioned the following low-level functions.
 .PP
 .TS
-l l.
-\fBFunction\fP	\fBDescription\fP
+lB lB
+lB lx.
+Function	Description
 _
 fixterm	restore tty to \*(``in curses\*('' state
 gettmode	establish current tty modes
@@ -558,15 +545,15 @@ T}
 .TE
 .PP
 The programming manual also mentioned
-functions provided for termcap compatibility
-(commenting that they \*(``may go away at a later date\*(''):
+functions provided for \fItermcap\fP compatibility
+(commenting that they \*(``may go away at a later date\*('').
 .PP
 .TS
-l l
-_ _
-l l.
-\fBFunction\fP	\fBDescription\fP
-tgetent	look up termcap entry for given \fIname\fP
+lB lB
+lB lx.
+Function	Description
+_
+tgetent	look up \fItermcap\fP entry for given \fIname\fP
 tgetflag	get boolean entry for given \fIid\fP
 tgetnum	get numeric entry for given \fIid\fP
 tgetstr	get string entry for given \fIid\fP
@@ -581,29 +568,30 @@ Early terminfo programs obtained capability values from the
 .PP
 SVr3 extended terminfo by adding functions to retrieve capability values
 (like the termcap interface),
-and reusing tgoto and tputs:
+and reusing \fBtgoto\fP and \fBtputs\fP:
 .PP
 .TS
-l l
-_ _
-l l.
-\fBFunction\fP	\fBDescription\fP
+lB lB
+lB lx.
+Function	Description
+_
 tigetflag	get boolean entry for given \fIid\fP
 tigetnum	get numeric entry for given \fIid\fP
 tigetstr	get string entry for given \fIid\fP
 .TE
 .PP
-SVr3 also replaced several of the SVr2 terminfo functions
-which had no counterpart in the termcap interface,
-documenting them as obsolete:
+SVr3 also replaced several of the SVr2 \fIterminfo\fP functions
+which had no counterpart in the \fItermcap\fP interface,
+documenting them as obsolete.
+.PP
 .TS
-l l
-_ _
-l l.
-\fBFunction\fP	\fBReplaced by\fP
+lB lB
+l  lx.
+Function	Replaced by
+_
 crmode	cbreak
 fixterm	reset_prog_mode
-gettmode	N/A
+gettmode	\fIn/a\fP
 nocrmode	nocbreak
 resetterm	reset_shell_mode
 saveterm	def_prog_mode
@@ -629,7 +617,7 @@ though the variables were provided in SVr2.
 .PP
 SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions.
 .PP
-There are other low-level functions declared in the curses header files
+There are other low-level functions declared in the \fIcurses\fP header files
 on Unix systems,
 but none were documented.
 The functions marked \*(``obsolete\*('' remained in use
@@ -686,7 +674,7 @@ On the other hand, \fIwritable strings\fP are an obsolescent feature.
 .IP
 As an extension, this implementation can be configured to change the
 function prototypes to use the \fBconst\fP keyword.
-The ncurses ABI 6 enables this feature by default.
+The \fIncurses\fP ABI 6 enables this feature by default.
 .bP
 X/Open Curses prototypes \fBtparm\fP with a fixed number of parameters,
 rather than a variable argument list.
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 46270aba3..72bcb6aae 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.34 2023/09/16 23:37:03 tom Exp $
-.TH curs_touch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_touch.3x,v 1.39 2023/09/23 22:49:51 tom Exp $
+.TH curs_touch 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -38,21 +38,21 @@
 \fB\%is_wintouched\fP \-
 control terminal output refresh in a \fIcurses\fR window
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint touchline(WINDOW *\fIwin\fB, int \fIstart\fB, int \fIcount\fB);\fR
-.sp
+.PP
 \fBint touchwin(WINDOW *\fIwin\fB);\fR
-.br
 \fBint wtouchln(WINDOW *\fIwin\fB, int \fIy\fB, int \fIn\fB, int \fIchanged\fB);\fR
-.sp
+.PP
 \fBint untouchwin(WINDOW *\fIwin\fB);\fR
-.sp
+.PP
 \fBbool is_linetouched(WINDOW *\fIwin\fB, int \fIline\fB);\fR
-.br
 \fBbool is_wintouched(WINDOW *\fIwin\fB);\fR
+.fi
 .SH DESCRIPTION
-The \fBtouchwin\fP and \fBtouchline\fP routines throw away all
+The \fB\%touchwin\fP and \fB\%touchline\fP routines throw away all
 optimization information about which parts of the window have been
 touched, by pretending that the entire window has been drawn on.
 This
@@ -60,21 +60,21 @@ is sometimes necessary when using overlapping windows, since a change
 to one window affects the other window, but the records of which lines
 have been changed in the other window do not reflect the change.
 The
-routine \fBtouchline\fP only pretends that \fIcount\fP lines have been
+routine \fB\%touchline\fP only pretends that \fIcount\fP lines have been
 changed, beginning with line \fIstart\fP.
 .PP
-The \fBuntouchwin\fP routine marks all lines in the window as unchanged since
-the last call to \fBwrefresh\fP.
+The \fB\%untouchwin\fP routine marks all lines in the window as unchanged since
+the last call to \fB\%wrefresh\fP.
 .PP
-The \fBwtouchln\fP routine makes \fIn\fP lines in the window, starting
+The \fB\%wtouchln\fP routine makes \fIn\fP lines in the window, starting
 at line \fIy\fR, look as if they have (\fIchanged\fB=1\fR) or have
 not (\fIchanged\fB=0\fR) been changed since the last call to
-\fBwrefresh\fP.
+\fB\%wrefresh\fP.
 .PP
-The \fBis_linetouched\fP and \fBis_wintouched\fP routines return
+The \fB\%is_linetouched\fP and \fB\%is_wintouched\fP routines return
 \fBTRUE\fP if the specified line/window was modified since the last
-call to \fBwrefresh\fP; otherwise they return \fBFALSE\fP.  In
-addition, \fBis_linetouched\fP returns \fBERR\fP if \fIline\fP is not
+call to \fB\%wrefresh\fP; otherwise they return \fBFALSE\fP.  In
+addition, \fB\%is_linetouched\fP returns \fBERR\fP if \fIline\fP is not
 valid for the given window.
 .SH RETURN VALUE
 All routines return the integer \fBERR\fP upon failure and an integer value
@@ -97,7 +97,7 @@ returning \fBERR\fP (which is neither \fBTRUE\fP nor \fBFALSE\fP)
 may not be supported by the compiler.
 .IP
 To provide error-checking and also match the X/Open function prototype,
-the \fBERR\fP is provided by a macro named \fBis_linetouched\fP.
+the \fBERR\fP is provided by a macro named \fB\%is_linetouched\fP.
 The actual function returns \fBFALSE\fP when it detects an error.
 .TP 5
 \fBwtouchln\fP
@@ -107,18 +107,18 @@ if the line number is outside the window.
 .RE
 .SH PORTABILITY
 These functions were introduced by SVr4.
-The Solaris curses header file,
+The Solaris \fIcurses\fP header file,
 for instance, defines both an actual function and macro for each.
 The macros give the same result as the actual functions.
-SVr4 curses does not check the window parameter \fIwin\fP to ensure
+SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
 that it is not \fBNULL\fP;
 otherwise this implementation behaves the same as SVr4.
 .PP
 The XSI Curses standard, Issue 4 describes these functions,
 but defines no error conditions.
 .SH NOTES
-All of these routines except \fBwtouchln\fP may be macros.
+All of these routines except \fB\%wtouchln\fP may be macros.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index add2b6be2..f4d19a398 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.35 2023/09/16 23:37:03 tom Exp $
-.TH curs_trace 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.37 2023/09/23 20:53:33 tom Exp $
+.TH curs_trace 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -53,35 +53,28 @@
 \fB\%_tracemouse\fP \-
 \fIcurses\fR debugging routines
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBunsigned curses_trace(const unsigned \fIparam\fB);\fR
-.sp
+.PP
 \fBvoid _tracef(const char *\fIformat\fB, ...);\fR
-.sp
+.PP
 \fBchar *_traceattr(attr_t \fIattr\fB);\fR
-.br
 \fBchar *_traceattr2(int \fIbuffer\fB, chtype \fIch\fB);\fR
-.br
 \fBchar *_tracecchar_t(const cchar_t *\fIstring\fB);\fR
-.br
 \fBchar *_tracecchar_t2(int \fIbuffer\fB, const cchar_t *\fIstring\fB);\fR
-.br
 \fBchar *_tracechar(int \fIch\fB);\fR
-.br
 \fBchar *_tracechtype(chtype \fIch\fB);\fR
-.br
 \fBchar *_tracechtype2(int \fIbuffer\fB, chtype \fIch\fB);\fR
-.sp
+.PP
 \fBvoid _tracedump(const char *\fIlabel\fB, WINDOW *\fIwin\fB);\fR
-.br
 \fBchar *_nc_tracebits(void);\fP
-.br
 \fBchar *_tracemouse(const MEVENT *\fIevent\fB);\fR
-.sp
+.PP
 /* deprecated */
-.br
 \fBvoid trace(const unsigned int \fIparam\fB);\fR
+.fi
 .SH DESCRIPTION
 The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
 as well as applications which use the ncurses libraries.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 6390749b5..9d8e7f26f 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.77 2023/09/16 23:37:03 tom Exp $
-.TH curs_util 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.83 2023/09/23 23:14:19 tom Exp $
+.TH curs_util 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -53,33 +53,29 @@
 \fB\%wunctrl\fP \-
 miscellaneous \fIcurses\fR utility routines
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBconst char *unctrl(chtype \fIc\fB);\fR
-.br
 \fBwchar_t *wunctrl(cchar_t *\fIc\fB);\fR
-.sp
+.PP
 \fBconst char *keyname(int \fIc\fB);\fR
-.br
 \fBconst char *key_name(wchar_t \fIw\fB);\fR
-.sp
+.PP
 \fBvoid filter(void);\fP
-.sp
+.PP
 \fBvoid use_env(bool \fIf\fB);\fR
-.sp
+.PP
 \fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
-.br
 \fBWINDOW *getwin(FILE *\fIfilep\fB);\fR
-.sp
+.PP
 \fBint delay_output(int \fIms\fB);\fR
-.br
 \fBint flushinp(void);\fP
-.sp
-/* extensions */
-.br
+.PP
+\fI/* extensions */\fP
 \fBvoid nofilter(void);\fP
-.br
 \fBvoid use_tioctl(bool \fIf\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS unctrl
 The \fBunctrl\fP routine returns a character string which is a printable
@@ -164,10 +160,10 @@ The \fBuse_env\fP routine, if used,
 should be called before \fBinitscr\fP or
 \fBnewterm\fP are called
 (because those compute the screen size).
-It modifies the way \fBncurses\fP treats environment variables
+It modifies the way \fIncurses\fP treats environment variables
 when determining the screen size.
 .bP
-Normally \fBncurses\fP looks first at the terminal database for the screen size.
+Normally \fIncurses\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
@@ -202,29 +198,27 @@ or from the terminal database.
 \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
-summarized here:
-.PP
+The \fB\%use_env\fP and \fB\%use_tioctl\fP routines combine as follows.
+.IP
 .TS
-center tab(/);
-l l l
-_ _ _
-lw7 lw7 lw40.
-\fBuse_env\fP/\fBuse_tioctl\fP/\fBSummary\fP
-TRUE/FALSE/T{
+lB lB lB
+lB lB lx.
+use_env	use_tioctl	Summary
+_
+TRUE	FALSE	T{
 This is the default behavior.
-\fBncurses\fP uses operating system calls
-unless overridden by $LINES or $COLUMNS environment variables.
-T}
-TRUE/TRUE/T{
-\fBncurses\fP updates $LINES and $COLUMNS based on operating system calls.
+\fIncurses\fP uses operating system calls
+unless overridden by \fBLINES\fP or \fB\%COLUMNS\fP environment
+variables;
+default.
 T}
-FALSE/TRUE/T{
-\fBncurses\fP ignores $LINES and $COLUMNS,
-uses operating system calls to obtain size.
+TRUE	TRUE	T{
+\fIncurses\fP updates \fBLINES\fP and \fB\%COLUMNS\fP based on operating
+system calls.
 T}
-FALSE/FALSE/T{
-\fBncurses\fP relies on the terminal database to determine size.
+FALSE	TRUE	T{
+\fIncurses\fP ignores \fBLINES\fP and \fB\%COLUMNS\fP,
+using operating system calls to obtain size.
 T}
 .TE
 .SS putwin/getwin
@@ -303,7 +297,7 @@ loaded when the terminal description is read by the library.
 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 \fBncurses\fP extensions
-be conditioned using NCURSES_VERSION.
+be conditioned using \fBNCURSES_VERSION\fP.
 .SS putwin/getwin file-format
 The \fBputwin\fP and \fBgetwin\fP functions have several issues with
 portability:
diff --git a/man/define_key.3x b/man/define_key.3x
index d4ac62f41..fed925eab 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,39 +29,40 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
-.TH define_key 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.34 2023/09/23 23:04:14 tom Exp $
+.TH define_key 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint define_key(const char *\fIdefinition\fB, int \fIkeycode\fB);\fR
 .SH DESCRIPTION
-This is an extension to the curses library.
+This is an extension to the \fIcurses\fP library.
 It permits an application to define keycodes with their corresponding control
-strings, so that the ncurses library will interpret them just as it would
+strings, so that the \fIncurses\fP library will interpret them just as it would
 the predefined codes in the terminfo database.
 .PP
-If the given string is null, any existing definition for the keycode is
-removed.
+If \fIdefinition\fP is \fBNULL\fP,
+any existing one for the keycode is removed.
 Similarly, if the given keycode is negative or zero, any existing string
 for the given definition is removed.
 .SH RETURN VALUE
-The keycode must be greater than zero, and the string non-null,
+Either \fIkeycode\fP must be greater than zero,
+or \fIdefinition\fP must be non-\fBNULL\fP,
 otherwise \fBERR\fP is returned.
 \fBERR\fP may also be returned if there is insufficient memory to allocate the
 data to store the definition.
 If no error is detected, \fBOK\fP is returned.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fIncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBkeyok\fP(3X),
-\fBkey_defined\fP(3X).
+\fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X)
 .SH AUTHOR
-Thomas Dickey.
+Thomas Dickey
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 5e140551d..1fa66c4d1 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,17 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.20 2023/09/16 23:38:39 tom Exp $
-.TH key_defined 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.26 2023/09/23 22:49:51 tom Exp $
+.TH key_defined 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint key_defined(const char *\fIdefinition\fB);\fR
 .SH DESCRIPTION
-This is an extension to the curses library.
+This is an extension to the \fIcurses\fP library.
 It permits an application to determine if a string is currently bound
 to any keycode.
 .SH RETURN VALUE
@@ -48,12 +48,12 @@ If no keycode is bound, zero is returned.
 If the string conflicts with longer strings
 which are bound to keys, \-1 is returned.
 .SH PORTABILITY
-This routine is specific to ncurses.
+This routine is specific to \fIncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBdefine_key\fP(3X).
+\fB\%define_key\fP(3X)
 .SH AUTHOR
-Thomas Dickey.
+Thomas Dickey
diff --git a/man/keybound.3x b/man/keybound.3x
index b2dde39c3..e85289029 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,34 +29,34 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.21 2023/09/16 23:38:39 tom Exp $
-.TH keybound 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.27 2023/09/23 22:49:51 tom Exp $
+.TH keybound 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBchar * keybound(int \fIkeycode\fB, int \fIcount);\fR
 .SH DESCRIPTION
-This is an extension to the curses library.
+This is an extension to the \fIcurses\fP library.
 It permits an application to determine the string which is defined
 in the terminfo for specific keycodes.
 .SH RETURN VALUE
-The \fIkeycode\fP parameter must be greater than zero, else NULL is returned.
-If it does not correspond to a defined key, then NULL is returned.
+The \fIkeycode\fP parameter must be greater than zero, else \fBNULL\fP is returned.
+If it does not correspond to a defined key, then \fBNULL\fP is returned.
 The \fIcount\fP parameter is used to allow the application to iterate
 through multiple definitions, counting from zero.
 When successful,
 the function returns a string which must be freed by the caller.
 .SH PORTABILITY
-This routine is specific to ncurses.
+This routine is specific to \fIncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBdefine_key\fP(3X),
-\fBkeyok\fP(3X).
+\fB\%define_key\fP(3X),
+\fB\%keyok\fP(3X)
 .SH AUTHOR
-Thomas Dickey.
+Thomas Dickey
diff --git a/man/keyok.3x b/man/keyok.3x
index 7bc1d9114..c6205cb31 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,19 +29,19 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
-.TH keyok 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.32 2023/09/23 22:49:51 tom Exp $
+.TH keyok 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint keyok(int \fIkeycode\fB, bool \fIenable\fB);\fR
 .SH DESCRIPTION
-This is an extension to the curses library.
+This is an extension to the \fIcurses\fP library.
 It permits an application to disable specific keycodes, rather than
-use the \fBkeypad\fP function to disable all keycodes.
+use the \fB\%keypad\fP function to disable all keycodes.
 Keys that have been disabled can be re-enabled.
 .SH RETURN VALUE
 The keycode must be greater than zero, else \fBERR\fP is returned.
@@ -50,12 +50,12 @@ If the \fIenable\fP parameter is true, then the key must have been disabled,
 and vice versa.
 Otherwise, the function returns \fBOK\fP.
 .SH PORTABILITY
-This routine is specific to ncurses.
+This routine is specific to \fIncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBdefine_key\fP(3X).
+\fB\%define_key\fP(3X)
 .SH AUTHOR
-Thomas Dickey.
+Thomas Dickey
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 455edb3b2..21c47de95 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.24 2023/07/29 16:47:09 tom Exp $
+# $Id: manhtml.aliases,v 1.25 2023/09/23 23:00:59 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -78,3 +78,4 @@ wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
 wrefresh(3X)		curs_refresh(3X)
+wsetscrreg(3X)		curs_outopts(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 10878e1cf..3edab6888 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.171 2023/09/16 23:38:39 tom Exp $
-.TH ncurses 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.174 2023/09/23 22:58:27 tom Exp $
+.TH ncurses 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -599,7 +599,7 @@ notimeout/\fBcurs_inopts\fP(3X)
 overlay/\fBcurs_overlay\fP(3X)
 overwrite/\fBcurs_overlay\fP(3X)
 pair_content/\fBcurs_color\fP(3X)
-pecho_wchar/\fBcurs_pad\fP(3X)*
+pecho_wchar/\fBcurs_pad\fP(3X)
 pechochar/\fBcurs_pad\fP(3X)
 pnoutrefresh/\fBcurs_pad\fP(3X)
 prefresh/\fBcurs_pad\fP(3X)
@@ -649,7 +649,7 @@ slk_refresh/\fBcurs_slk\fP(3X)
 slk_restore/\fBcurs_slk\fP(3X)
 slk_set/\fBcurs_slk\fP(3X)
 slk_touch/\fBcurs_slk\fP(3X)
-slk_wset/\fBcurs_slk\fP(3X)*
+slk_wset/\fBcurs_slk\fP(3X)
 standend/\fBcurs_attr\fP(3X)
 standout/\fBcurs_attr\fP(3X)
 start_color/\fBcurs_color\fP(3X)
@@ -668,7 +668,7 @@ tigetflag/\fBcurs_terminfo\fP(3X)
 tigetnum/\fBcurs_terminfo\fP(3X)
 tigetstr/\fBcurs_terminfo\fP(3X)
 timeout/\fBcurs_inopts\fP(3X)
-tiparm/\fBcurs_terminfo\fP(3X)*
+tiparm/\fBcurs_terminfo\fP(3X)
 tiparm_s/\fBcurs_terminfo\fP(3X)*
 tiscan_s/\fBcurs_terminfo\fP(3X)*
 touchline/\fBcurs_touch\fP(3X)
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 772d09eb0..66d2c0062 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.30 2023/09/16 23:38:39 tom Exp $
-.TH new_pair 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.36 2023/09/23 22:37:46 tom Exp $
+.TH new_pair 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -64,15 +64,15 @@
 \fB\%free_pair\fP \-
 dynamically allocate \fIcurses\fR color pairs
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBint alloc_pair(int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint find_pair(int \fIfg\fB, int \fIbg\fB);\fR
-.br
 \fBint free_pair(int \fIpair\fB);\fR
+.fi
 .SH DESCRIPTION
-These functions are an extension to the curses library.
+These functions are an extension to the \fIcurses\fP library.
 They permit an application to dynamically allocate a color pair using
 the foreground/background colors rather than assign a fixed color pair number,
 and return an unused pair to the pool.
@@ -86,7 +86,7 @@ it is unlikely that your terminal allows you to modify the attributes
 of a given character cell without rewriting it.
 That is, the foreground and background colors are applied as a pair.
 .bP
-Color pairs are the curses library's way of managing a color palette
+Color pairs are the \fIcurses\fP library's way of managing a color palette
 on a terminal.
 If the library does not keep track of the \fIcombinations\fP of
 colors which are displayed, it will be inefficient.
@@ -136,7 +136,7 @@ All of the color pairs are allocated from a table of possible color pairs.
 The size of the table is determined by the terminfo \fBpairs\fP capability.
 The table is shared with \fBinit_pair\fP;
 in fact \fBalloc_pair\fP calls \fBinit_pair\fP after
-updating the ncurses library's fast index to the colors versus color pairs.
+updating the \fIncurses\fP library's fast index to the colors versus color pairs.
 .SS find_pair
 The \fBfind_pair\fP function accepts parameters for
 foreground and background color, and
@@ -160,12 +160,12 @@ or \-1 if not.
 Likewise, \fBfree_pair\fP returns \fBOK\fP unless it encounters an
 error updating the fast index or if no such color pair is in use.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fIncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBcurs_color\fP(3X).
+\fBcurs_color\fP(3X)
 .SH AUTHOR
-Thomas Dickey.
+Thomas Dickey
diff --git a/man/panel.3x b/man/panel.3x
index 56ea1cd27..5716fa889 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.50 2023/09/16 23:38:39 tom Exp $
-.TH panel 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.52 2023/09/23 23:37:26 tom Exp $
+.TH panel 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -245,7 +245,7 @@ provide a panel library whose common ancestor
 was a public domain implementation by Warren Tucker
 published in \fIu386mon\fP 2.20 (1990).
 .IP
-According to Tucker, the SystemV panel library
+According to Tucker, the System\ V panel library
 was first released in SVr3.2 (1988),
 and his implementation helped with a port to SVr3.1 (1987).
 .IP
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 73b8d3f03..c44b40e31 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.40 2023/09/16 23:38:39 tom Exp $
-.TH resizeterm 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.45 2023/09/23 22:49:53 tom Exp $
+.TH resizeterm 3X 2023-09-23 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -41,81 +41,81 @@
 \fB\%resizeterm\fP \-
 manage the terminal dimensions understood by \fIcurses\fR
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
 \fBbool is_term_resized(int \fIlines\fB, int \fIcolumns\fB);\fR
-.br
 \fBint resize_term(int \fIlines\fB, int \fIcolumns\fB);\fR
-.br
 \fBint resizeterm(int \fIlines\fB, int \fIcolumns\fB);\fR
+.fi
 .SH DESCRIPTION
-This is an extension to the curses library.
-It provides callers with a hook into the \fBncurses\fP data to resize windows,
+This is an extension to the \fIcurses\fP library.
+It provides callers with a hook into the \fIncurses\fP data to resize windows,
 primarily for use by programs running in an X Window terminal (e.g., xterm)
 when the terminal's screen size is changed by the user:
 .bP
-Curses windows cannot extend outside the screen.
-If the terminal is shrunk, curses windows must be shrunk to fit.
+\fIcurses\fP windows cannot extend outside the screen.
+If the terminal is shrunk, \fIcurses\fP windows must be shrunk to fit.
 .bP
 If the terminal is stretched,
 rows and/or columns can be added to existing windows.
 The added cells should match the current attributes of the windows.
 .PP
-If the calling program has not set up a handler for \fBSIGWINCH\fP
-when it initializes \fBncurses\fP
-(e.g., using \fBinitscr\fP(3X) or \fBnewterm\fP(3X)),
-then \fBncurses\fP sets a handler for \fBSIGWINCH\fP which notifies
+If the calling program has not set up a handler for \fB\%SIGWINCH\fP
+when it initializes \fIncurses\fP
+(e.g., using \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)),
+then \fIncurses\fP sets a handler for \fB\%SIGWINCH\fP which notifies
 the library when a window-size event has occurred.
 The library checks for this notification
 .bP
 when reading input data,
 .bP
 when implicitly resuming program mode
-(e.g., between \fBendwin\fP(3X) and \fBwrefresh\fP(3X)),
+(e.g., between \fB\%endwin\fP(3X) and \fB\%wrefresh\fP(3X)),
 and
 .bP
-when explicitly resuming program mode in \fBrestartterm\fP(3X).
+when explicitly resuming program mode in \fB\%restartterm\fP(3X).
 .PP
 When the library has found that the terminal's window-size has
-changed, it calls \fBresizeterm\fP to update its data structures.
+changed, it calls \fB\%resizeterm\fP to update its data structures.
 .PP
-An application which establishes its own \fBSIGWINCH\fP handler
-can call \fBresizeterm\fP, but in that case, the library will not
-see \fBSIGWINCH\fP, and proper layout will rely upon the application.
+An application which establishes its own \fB\%SIGWINCH\fP handler
+can call \fB\%resizeterm\fP, but in that case, the library will not
+see \fB\%SIGWINCH\fP, and proper layout will rely upon the application.
 .SH FUNCTIONS
 .SS resizeterm
-The function \fBresizeterm\fP resizes the standard and current windows
-(i.e., \fBstdscr\fP and \fBcurscr\fP)
+The function \fB\%resizeterm\fP resizes the standard and current windows
+(i.e., \fB\%stdscr\fP and \fB\%curscr\fP)
 to the specified dimensions, and adjusts other bookkeeping data used by
-the \fBncurses\fP library that record the window dimensions
-such as the \fBLINES\fP and \fBCOLS\fP variables.
+the \fIncurses\fP library that record the window dimensions
+such as the \fB\%LINES\fP and \fB\%COLS\fP variables.
 .SS resize_term
-Most of the work for \fBresizeterm\fP is
-done by the inner function \fBresize_term\fP.
-The outer function \fBresizeterm\fP adds bookkeeping
-for the \fBSIGWINCH\fP handler,
-as well as repainting the soft-key area (see \fBslk_touch\fP(3X)).
+Most of the work for \fB\%resizeterm\fP is
+done by the inner function \fB\%resize_term\fP.
+The outer function \fB\%resizeterm\fP adds bookkeeping
+for the \fB\%SIGWINCH\fP handler,
+as well as repainting the soft-key area (see \fB\%slk_touch\fP(3X)).
 .PP
-The \fBresize_term\fP function attempts to resize all windows.
+The \fB\%resize_term\fP function attempts to resize all windows.
 This helps with simple applications.
 However:
 .bP
 It is not possible to automatically resize pads.
 .bP
 Applications which have complicated layouts should check for
-\fBKEY_RESIZE\fP returned from \fBwgetch\fP,
-and adjust their layout, e.g., using \fBwresize\fP and \fBmvwin\fP,
+\fB\%KEY_RESIZE\fP returned from \fB\%wgetch\fP,
+and adjust their layout, e.g., using \fB\%wresize\fP and \fB\%mvwin\fP,
 or by recreating the windows.
 .PP
-When resizing windows, \fBresize_term\fP recursively adjusts subwindows,
+When resizing windows, \fB\%resize_term\fP recursively adjusts subwindows,
 keeping them within the updated parent window's limits.
 If a top-level window happens to extend to the screen's limits,
-then on resizing the window, \fBresize_term\fP will keep the window
+then on resizing the window, \fB\%resize_term\fP will keep the window
 extending to the corresponding limit, regardless of whether the
 screen has shrunk or grown.
 .SS is_term_resized
-A support function \fBis_term_resized\fP is provided so that applications
-can check if the \fBresize_term\fP function would modify the window structures.
+A support function \fB\%is_term_resized\fP is provided so that applications
+can check if the \fB\%resize_term\fP function would modify the window structures.
 It returns \fBTRUE\fP if the windows would be modified,
 and \fBFALSE\fP otherwise.
 .SH RETURN VALUE
@@ -125,53 +125,53 @@ They will fail if either of the dimensions are less than or equal to zero,
 or if an error occurs while (re)allocating memory for the windows.
 .SH NOTES
 While these functions are intended to be used to support a signal handler
-(i.e., for \fBSIGWINCH\fP), care should be taken to avoid invoking them in a
-context where \fBmalloc\fP or \fBrealloc\fP may have been interrupted,
+(i.e., for \fB\%SIGWINCH\fP), care should be taken to avoid invoking them in a
+context where \fB\%malloc\fP or \fB\%realloc\fP may have been interrupted,
 since it uses those functions.
 .PP
-If ncurses is configured to supply its own \fBSIGWINCH\fP handler,
+If \fIncurses\fP is configured to supply its own \fB\%SIGWINCH\fP handler,
 .bP
-on receipt of a \fBSIGWINCH\fP, the handler sets a flag
+on receipt of a \fB\%SIGWINCH\fP, the handler sets a flag
 .bP
 which is tested in
-\fBwgetch\fP(3X),
-\fBdoupdate\fP(3X) and
-\fBrestartterm\fP(3X),
+\fB\%wgetch\fP(3X),
+\fB\%doupdate\fP(3X) and
+\fB\%restartterm\fP(3X),
 .bP
-in turn, calling the \fBresizeterm\fP function,
+in turn, calling the \fB\%resizeterm\fP function,
 .bP
-which \fBungetch\fP's a \fBKEY_RESIZE\fP which
-will be read on the next call to \fBwgetch\fP.
+which \fB\%ungetch\fP's a \fB\%KEY_RESIZE\fP which
+will be read on the next call to \fB\%wgetch\fP.
 .IP
-The \fBKEY_RESIZE\fP alerts an application that the screen size has changed,
+The \fB\%KEY_RESIZE\fP alerts an application that the screen size has changed,
 and that it should repaint special features such as pads that cannot
 be done automatically.
 .IP
-Calling \fBresizeterm\fP or \fBresize_term\fP
+Calling \fB\%resizeterm\fP or \fB\%resize_term\fP
 directly from a signal handler is unsafe.
-This indirect method is used to provide a safe way to resize the ncurses
+This indirect method is used to provide a safe way to resize the \fIncurses\fP
 data structures.
 .PP
-If the environment variables \fBLINES\fP or \fBCOLUMNS\fP are set,
+If the environment variables \fB\%LINES\fP or \fB\%COLUMNS\fP are set,
 this overrides the library's use of the window size obtained from
 the operating system.
-Thus, even if a \fBSIGWINCH\fP is received,
+Thus, even if a \fB\%SIGWINCH\fP is received,
 no screen size change may be recorded.
 .SH PORTABILITY
-It is possible to resize the screen with SVr4 curses,
+It is possible to resize the screen with SVr4 \fIcurses\fP,
 by
 .bP
-exiting curses with \fBendwin\fP(3X) and
+exiting \fIcurses\fP with \fB\%endwin\fP(3X) and
 .bP
-resuming using \fBrefresh\fP(3X).
+resuming using \fB\%refresh\fP(3X).
 .PP
 Doing that clears the screen and is visually distracting.
 .PP
-This extension of ncurses was introduced in mid-1995.
-It was adopted in NetBSD curses (2001) and PDCurses (2003).
+This extension of \fIncurses\fP was introduced in mid-1995.
+It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
 .SH SEE ALSO
-\fBcurs_getch\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBwresize\fP(3X).
+\fB\%curs_getch\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%wresize\fP(3X)
 .SH AUTHOR
-Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 5eaa7f799..b1db0ea51 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.31 2023/09/16 23:38:39 tom Exp $
-.TH scr_dump 5 2023-09-16 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.33 2023/09/23 23:37:26 tom Exp $
+.TH scr_dump 5 2023-09-23 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -129,7 +129,7 @@ When \fBgetwin\fP restored the window,
 it would keep track of offsets into the array of line-data
 and adjust the \fBWINDOW\fP structure which was read back into memory.
 .PP
-This is similar to Unix SystemV,
+This is similar to Unix System\ V,
 but does not write a \*(``magic number\*('' to identify the file format.
 .SH PORTABILITY
 There is no standard format for \fBputwin\fP.
@@ -171,8 +171,8 @@ or more specific portability warnings about use of the material.
 In the foregoing, emphasis was added to \fBunspecified format\fP
 and to \fBXPG4 or to earlier XPG releases\fP,
 for clarity.
-.SS Unix SystemV
-Unix SystemV curses identified the file format by writing a
+.SS Unix System V
+Unix System\ V curses identified the file format by writing a
 \*(``magic number\*('' at the beginning of the dump.
 The \fBWINDOW\fP data and the lines of text follow, all in binary form.
 .PP
@@ -242,7 +242,7 @@ with coordinates and attributes for each chunk of text rather
 than writing the whole window from top to bottom.
 .SS PDCurses
 PDCurses added support for screen dumps in version 2.7 (2005).
-Like Unix SystemV and ncurses5,
+Like Unix System\ V and ncurses5,
 it writes the \fBWINDOW\fP structure in binary,
 but begins the file with its three-byte identifier \*(``PDC\*('',
 followed by a one-byte version,
diff --git a/misc/magic b/misc/magic
index 0fab0049a..67a3caa2c 100644
--- a/misc/magic
+++ b/misc/magic
@@ -1,4 +1,4 @@
-# $Id: magic,v 1.3 2020/02/02 23:34:34 tom Exp $
+# $Id: magic,v 1.4 2023/09/23 23:37:26 Branden.Robinson Exp $
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 2015,2018 Free Software Foundation, Inc.                         #
@@ -60,7 +60,7 @@
 !:mime	application/x-terminfo2
 #
 # While the compiled terminfo uses little-endian format irregardless of
-# platform, SystemV screen dumps do not.  They came later, and that detail was
+# platform, System V screen dumps do not.  They came later, and that detail was
 # overlooked.
 #
 # AIX and HPUX use the SVr4 big-endian format
diff --git a/ncurses/base/vsscanf.c b/ncurses/base/vsscanf.c
index ef524250c..40ee8bb1d 100644
--- a/ncurses/base/vsscanf.c
+++ b/ncurses/base/vsscanf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2004,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,15 +39,12 @@
 
 #if !HAVE_VSSCANF
 
-MODULE_ID("$Id: vsscanf.c,v 1.21 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: vsscanf.c,v 1.22 2023/09/23 18:48:57 tom Exp $")
 
 #if !(HAVE_VFSCANF || HAVE__DOSCAN)
 
 #include <ctype.h>
 
-#define L_SQUARE '['
-#define R_SQUARE ']'
-
 typedef enum {
     cUnknown
     ,cError			/* anything that isn't ANSI */
@@ -243,7 +240,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 		    case sPercent:
 			if (format[n] == '%') {
 			    state = sUnknown;
-			} else if (format[n] == L_SQUARE) {
+			} else if (format[n] == L_BLOCK) {
 			    state = sLeft;
 			} else {
 			    state = sNormal;
@@ -258,7 +255,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 			}
 			break;
 		    case sRange:
-			if (format[n] == R_SQUARE) {
+			if (format[n] == R_BLOCK) {
 			    state = sFinal;
 			    chunk = cRange;
 			}
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 7946d56f7..d18945cd8 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.674 2023/09/16 16:31:14 tom Exp $
+ * $Id: curses.priv.h,v 1.676 2023/09/23 18:46:47 tom Exp $
  *
  *	curses.priv.h
  *
@@ -312,7 +312,6 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
 #define NO_TERMINAL "unknown"
 #define USE_SP_RIPOFF     1
 #define USE_SP_TERMTYPE   1
-#define USE_SP_WINDOWLIST 1
 #else
 #define NO_TERMINAL 0
 #endif
@@ -323,6 +322,12 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
 		     : no_terminal), \
 	 NonEmpty(term_env))
 
+/*
+ * Originally a terminal-driver option, the window-list is per-screen to allow
+ * freeing memory used for windows when a screen is deleted.
+ */
+#define USE_SP_WINDOWLIST 1
+
 /*
  * Note:  ht/cbt expansion flakes out randomly under Linux 1.1.47, but only
  * when we're throwing control codes at the screen at high volume.  To see
@@ -345,6 +350,11 @@ typedef TRIES {
  */
 #define StringOf(ch) {ch, 0}
 
+#define CSI_CHR 0x9b
+#define ESC_CHR 0x1b
+
+#define L_BLOCK '['
+#define R_BLOCK ']'
 #define L_BRACE '{'
 #define R_BRACE '}'
 #define S_QUOTE '\''
diff --git a/ncurses/report_offsets.c b/ncurses/report_offsets.c
index 83f6f3815..cef8a8ec3 100644
--- a/ncurses/report_offsets.c
+++ b/ncurses/report_offsets.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: report_offsets.c,v 1.22 2021/08/19 19:51:33 tom Exp $")
+MODULE_ID("$Id: report_offsets.c,v 1.23 2023/09/23 16:47:57 tom Exp $")
 
 #define show_size(type) \
 	flag = 0; \
@@ -65,12 +65,7 @@ MODULE_ID("$Id: report_offsets.c,v 1.22 2021/08/19 19:51:33 tom Exp $")
 #define show_MLEAKS(type,member)	/* nothing */
 #endif
 
-#ifdef USE_TERM_DRIVER
-#define show_NORMAL(type,member)	/* nothing */
-#else
 #define show_NORMAL(type,member) { flag = "n"; show_offset(type,member); }
-#endif
-
 #define show_OPTION(type,member) { flag = "+"; show_offset(type,member); }
 
 #if USE_REENTRANT
@@ -160,7 +155,9 @@ main(void)
 #if USE_SIZECHANGE
     show_OPTION(SCREEN, _resize);
 #endif
-    show_DRIVER(SCREEN, _windowlist);
+#ifdef USE_SP_WINDOWLIST
+    show_NORMAL(SCREEN, _windowlist);
+#endif
     show_REENTR(SCREEN, _ttytype);
     show_SPFUNC(SCREEN, use_tioctl);
     show_WIDECH(SCREEN, _screen_acs_fix);
@@ -210,7 +207,9 @@ main(void)
     show_offset(NCURSES_GLOBALS, cached_tparm);
 #endif
     show_DRIVER(NCURSES_GLOBALS, term_driver);
+#ifndef USE_SP_WINDOWLIST
     show_NORMAL(NCURSES_GLOBALS, _nc_windowlist);
+#endif
 #if USE_HOME_TERMINFO
     show_OPTION(NCURSES_GLOBALS, home_terminfo);
 #endif
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index 22bc82ff3..177dcd872 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 2005-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,15 +37,11 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.21 2021/06/17 21:20:30 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.22 2023/09/23 18:47:56 tom Exp $")
 
 #undef CUR
 #define CUR tp->
 
-#define CSI       233
-#define ESC       033		/* ^[ */
-#define L_BRACK   '['
-
 static char *
 set_attribute_9(TERMTYPE2 *tp, int flag)
 {
@@ -65,9 +61,9 @@ is_csi(const char *s)
 {
     int result = 0;
     if (s != 0) {
-	if (UChar(s[0]) == CSI)
+	if (UChar(s[0]) == CSI_CHR)
 	    result = 1;
-	else if (s[0] == ESC && s[1] == L_BRACK)
+	else if (s[0] == ESC_CHR && s[1] == L_BLOCK)
 	    result = 2;
     }
     return result;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0f99c1c04..9463548ad 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230918) unstable; urgency=low
+ncurses6 (6.4+20230923) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0f99c1c04..9463548ad 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230918) unstable; urgency=low
+ncurses6 (6.4+20230923) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a3ca43ec8..737841138 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230918) unstable; urgency=low
+ncurses6 (6.4+20230923) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Sep 2023 18:08:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3eb41412e..7a5c2d079 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.606 2023/09/17 22:08:06 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.607 2023/09/23 09:27:19 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0918"
+!define VERSION_MMDD  "0923"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b0bc20821..97007c33f 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230918
+Release: 20230923
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 340f23ee9..a5fda1c3a 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230918
+Release: 20230923
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9780cc303..7d0542ef2 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230918
+Release: 20230923
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/ditto.c b/test/ditto.c
index 390eb3c0f..acac8377a 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.58 2022/12/24 23:53:08 tom Exp $
+ * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -239,6 +239,14 @@ init_screen(
     return TRUE;
 }
 
+static void
+free_screen(DITTO * target)
+{
+    free(target->parents);
+    free(target->windows);
+    free(target->peeks);
+}
+
 static void
 open_screen(DITTO * target, char **source, int length, int which1)
 {
@@ -480,8 +488,10 @@ main(int argc, char *argv[])
 	fflush(data[j].output);
 	fclose(data[j].output);
 	delscreen(data[j].screen);
+	free_screen(&data[j]);
 	UnlockIt();
     }
+    free(data);
     ExitProgram(EXIT_SUCCESS);
 }
 #else

From 44cd700479a7cc69b9e45000b2b60576612fb53c Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 2 Oct 2023 02:24:04 +0200
Subject: [PATCH 032/106] ncurses-6.4-20231001.patch

---
 NEWS                                       |   13 +-
 VERSION                                    |    2 +-
 dist.mk                                    |    4 +-
 doc/html/man/adacurses6-config.1.html      |  110 +--
 doc/html/man/captoinfo.1m.html             |  227 ++---
 doc/html/man/clear.1.html                  |  117 ++-
 doc/html/man/curs_add_wch.3x.html          |   10 +-
 doc/html/man/curs_add_wchstr.3x.html       |   10 +-
 doc/html/man/curs_addch.3x.html            |   10 +-
 doc/html/man/curs_addchstr.3x.html         |   10 +-
 doc/html/man/curs_addstr.3x.html           |   10 +-
 doc/html/man/curs_addwstr.3x.html          |   10 +-
 doc/html/man/curs_attr.3x.html             |   10 +-
 doc/html/man/curs_beep.3x.html             |    8 +-
 doc/html/man/curs_bkgd.3x.html             |    8 +-
 doc/html/man/curs_bkgrnd.3x.html           |    8 +-
 doc/html/man/curs_border.3x.html           |   10 +-
 doc/html/man/curs_border_set.3x.html       |    8 +-
 doc/html/man/curs_clear.3x.html            |    8 +-
 doc/html/man/curs_color.3x.html            |    8 +-
 doc/html/man/curs_delch.3x.html            |    8 +-
 doc/html/man/curs_deleteln.3x.html         |    8 +-
 doc/html/man/curs_extend.3x.html           |   20 +-
 doc/html/man/curs_get_wch.3x.html          |    8 +-
 doc/html/man/curs_get_wstr.3x.html         |   10 +-
 doc/html/man/curs_getcchar.3x.html         |   10 +-
 doc/html/man/curs_getch.3x.html            |   10 +-
 doc/html/man/curs_getstr.3x.html           |   10 +-
 doc/html/man/curs_in_wch.3x.html           |   10 +-
 doc/html/man/curs_in_wchstr.3x.html        |   10 +-
 doc/html/man/curs_inch.3x.html             |   19 +-
 doc/html/man/curs_inchstr.3x.html          |   10 +-
 doc/html/man/curs_initscr.3x.html          |   10 +-
 doc/html/man/curs_ins_wch.3x.html          |   10 +-
 doc/html/man/curs_ins_wstr.3x.html         |   10 +-
 doc/html/man/curs_insch.3x.html            |   10 +-
 doc/html/man/curs_insstr.3x.html           |   10 +-
 doc/html/man/curs_instr.3x.html            |   10 +-
 doc/html/man/curs_inwstr.3x.html           |    8 +-
 doc/html/man/curs_kernel.3x.html           |   10 +-
 doc/html/man/curs_memleaks.3x.html         |   10 +-
 doc/html/man/curs_move.3x.html             |    8 +-
 doc/html/man/curs_opaque.3x.html           |   64 +-
 doc/html/man/curs_outopts.3x.html          |   12 +-
 doc/html/man/curs_overlay.3x.html          |    8 +-
 doc/html/man/curs_printw.3x.html           |   12 +-
 doc/html/man/curs_refresh.3x.html          |   10 +-
 doc/html/man/curs_scanw.3x.html            |   12 +-
 doc/html/man/curs_scr_dump.3x.html         |    8 +-
 doc/html/man/curs_scroll.3x.html           |    8 +-
 doc/html/man/curs_slk.3x.html              |    8 +-
 doc/html/man/curs_sp_funcs.3x.html         |   10 +-
 doc/html/man/curs_termattrs.3x.html        |    8 +-
 doc/html/man/curs_termcap.3x.html          |   10 +-
 doc/html/man/curs_terminfo.3x.html         |    8 +-
 doc/html/man/curs_threads.3x.html          | 1043 ++++++++++----------
 doc/html/man/curs_trace.3x.html            |   10 +-
 doc/html/man/curs_util.3x.html             |   10 +-
 doc/html/man/curs_variables.3x.html        |  237 +++--
 doc/html/man/curs_window.3x.html           |   12 +-
 doc/html/man/default_colors.3x.html        |   18 +-
 doc/html/man/define_key.3x.html            |   18 +-
 doc/html/man/form.3x.html                  |   10 +-
 doc/html/man/form_cursor.3x.html           |   18 +-
 doc/html/man/form_data.3x.html             |   18 +-
 doc/html/man/form_driver.3x.html           |   24 +-
 doc/html/man/form_field.3x.html            |   18 +-
 doc/html/man/form_field_attributes.3x.html |   22 +-
 doc/html/man/form_field_buffer.3x.html     |   30 +-
 doc/html/man/form_field_info.3x.html       |   26 +-
 doc/html/man/form_field_just.3x.html       |   22 +-
 doc/html/man/form_field_new.3x.html        |   18 +-
 doc/html/man/form_field_opts.3x.html       |   18 +-
 doc/html/man/form_field_userptr.3x.html    |   18 +-
 doc/html/man/form_field_validation.3x.html |   18 +-
 doc/html/man/form_fieldtype.3x.html        |   18 +-
 doc/html/man/form_hook.3x.html             |   18 +-
 doc/html/man/form_new.3x.html              |   18 +-
 doc/html/man/form_new_page.3x.html         |   22 +-
 doc/html/man/form_opts.3x.html             |   18 +-
 doc/html/man/form_page.3x.html             |   18 +-
 doc/html/man/form_post.3x.html             |   18 +-
 doc/html/man/form_requestname.3x.html      |   18 +-
 doc/html/man/form_userptr.3x.html          |   18 +-
 doc/html/man/form_variables.3x.html        |   16 +-
 doc/html/man/form_win.3x.html              |   18 +-
 doc/html/man/infocmp.1m.html               |   24 +-
 doc/html/man/infotocap.1m.html             |   61 +-
 doc/html/man/key_defined.3x.html           |   18 +-
 doc/html/man/keybound.3x.html              |   18 +-
 doc/html/man/keyok.3x.html                 |   18 +-
 doc/html/man/legacy_coding.3x.html         |   18 +-
 doc/html/man/menu.3x.html                  |   10 +-
 doc/html/man/menu_attributes.3x.html       |   22 +-
 doc/html/man/menu_cursor.3x.html           |   18 +-
 doc/html/man/menu_driver.3x.html           |   18 +-
 doc/html/man/menu_format.3x.html           |   18 +-
 doc/html/man/menu_hook.3x.html             |   18 +-
 doc/html/man/menu_items.3x.html            |   18 +-
 doc/html/man/menu_mark.3x.html             |   18 +-
 doc/html/man/menu_new.3x.html              |   18 +-
 doc/html/man/menu_opts.3x.html             |   18 +-
 doc/html/man/menu_pattern.3x.html          |   18 +-
 doc/html/man/menu_post.3x.html             |   18 +-
 doc/html/man/menu_requestname.3x.html      |   18 +-
 doc/html/man/menu_spacing.3x.html          |   54 +-
 doc/html/man/menu_userptr.3x.html          |   18 +-
 doc/html/man/menu_win.3x.html              |   18 +-
 doc/html/man/mitem_current.3x.html         |   18 +-
 doc/html/man/mitem_name.3x.html            |   18 +-
 doc/html/man/mitem_new.3x.html             |   18 +-
 doc/html/man/mitem_opts.3x.html            |   18 +-
 doc/html/man/mitem_userptr.3x.html         |   18 +-
 doc/html/man/mitem_value.3x.html           |   18 +-
 doc/html/man/mitem_visible.3x.html         |   18 +-
 doc/html/man/ncurses.3x.html               |  178 ++--
 doc/html/man/ncurses6-config.1.html        |   61 +-
 doc/html/man/new_pair.3x.html              |   18 +-
 doc/html/man/panel.3x.html                 |   20 +-
 doc/html/man/resizeterm.3x.html            |   18 +-
 doc/html/man/scr_dump.5.html               |   18 +-
 doc/html/man/tabs.1.html                   |   12 +-
 doc/html/man/term.5.html                   |   18 +-
 doc/html/man/term.7.html                   |   10 +-
 doc/html/man/term_variables.3x.html        |   20 +-
 doc/html/man/terminfo.5.html               |   10 +-
 doc/html/man/tic.1m.html                   |   22 +-
 doc/html/man/toe.1m.html                   |  197 ++--
 doc/html/man/tput.1.html                   |   12 +-
 doc/html/man/tset.1.html                   |   10 +-
 doc/html/man/user_caps.5.html              |   32 +-
 doc/html/man/wresize.3x.html               |   18 +-
 man/MKada_config.in                        |  145 ++-
 man/MKncu_config.in                        |   66 +-
 man/captoinfo.1m                           |  179 ++--
 man/clear.1                                |  195 ++--
 man/curs_add_wch.3x                        |   22 +-
 man/curs_add_wchstr.3x                     |   10 +-
 man/curs_addch.3x                          |   22 +-
 man/curs_addchstr.3x                       |   10 +-
 man/curs_addstr.3x                         |    8 +-
 man/curs_addwstr.3x                        |   10 +-
 man/curs_attr.3x                           |   17 +-
 man/curs_beep.3x                           |    6 +-
 man/curs_bkgd.3x                           |   13 +-
 man/curs_bkgrnd.3x                         |    8 +-
 man/curs_border.3x                         |    7 +-
 man/curs_border_set.3x                     |   12 +-
 man/curs_clear.3x                          |   12 +-
 man/curs_color.3x                          |    8 +-
 man/curs_delch.3x                          |    6 +-
 man/curs_deleteln.3x                       |    6 +-
 man/curs_extend.3x                         |   26 +-
 man/curs_get_wch.3x                        |   16 +-
 man/curs_get_wstr.3x                       |   11 +-
 man/curs_getcchar.3x                       |   13 +-
 man/curs_getch.3x                          |   22 +-
 man/curs_getstr.3x                         |   12 +-
 man/curs_in_wch.3x                         |    8 +-
 man/curs_in_wchstr.3x                      |   15 +-
 man/curs_inch.3x                           |   24 +-
 man/curs_inchstr.3x                        |    9 +-
 man/curs_initscr.3x                        |   18 +-
 man/curs_ins_wch.3x                        |    8 +-
 man/curs_ins_wstr.3x                       |   12 +-
 man/curs_insch.3x                          |    8 +-
 man/curs_insstr.3x                         |   12 +-
 man/curs_instr.3x                          |    6 +-
 man/curs_inwstr.3x                         |   10 +-
 man/curs_kernel.3x                         |   18 +-
 man/curs_memleaks.3x                       |    6 +-
 man/curs_move.3x                           |    7 +-
 man/curs_opaque.3x                         |   86 +-
 man/curs_outopts.3x                        |   19 +-
 man/curs_overlay.3x                        |    8 +-
 man/curs_printw.3x                         |   17 +-
 man/curs_refresh.3x                        |   10 +-
 man/curs_scanw.3x                          |   15 +-
 man/curs_scr_dump.3x                       |   16 +-
 man/curs_scroll.3x                         |    7 +-
 man/curs_slk.3x                            |    6 +-
 man/curs_sp_funcs.3x                       |   62 +-
 man/curs_termattrs.3x                      |    8 +-
 man/curs_termcap.3x                        |   14 +-
 man/curs_terminfo.3x                       |   24 +-
 man/curs_threads.3x                        |  502 +++++-----
 man/curs_trace.3x                          |    6 +-
 man/curs_util.3x                           |   20 +-
 man/curs_variables.3x                      |  297 ++++--
 man/curs_window.3x                         |   40 +-
 man/default_colors.3x                      |   10 +-
 man/define_key.3x                          |    8 +-
 man/form.3x                                |   11 +-
 man/form_cursor.3x                         |   10 +-
 man/form_data.3x                           |    9 +-
 man/form_driver.3x                         |   21 +-
 man/form_field.3x                          |    9 +-
 man/form_field_attributes.3x               |   11 +-
 man/form_field_buffer.3x                   |   10 +-
 man/form_field_info.3x                     |   10 +-
 man/form_field_just.3x                     |   10 +-
 man/form_field_new.3x                      |    9 +-
 man/form_field_opts.3x                     |   12 +-
 man/form_field_userptr.3x                  |    9 +-
 man/form_field_validation.3x               |   14 +-
 man/form_fieldtype.3x                      |   12 +-
 man/form_hook.3x                           |    9 +-
 man/form_new.3x                            |    9 +-
 man/form_new_page.3x                       |   10 +-
 man/form_opts.3x                           |    9 +-
 man/form_page.3x                           |   10 +-
 man/form_post.3x                           |   10 +-
 man/form_requestname.3x                    |    9 +-
 man/form_userptr.3x                        |    9 +-
 man/form_variables.3x                      |   24 +-
 man/form_win.3x                            |   12 +-
 man/infocmp.1m                             |   27 +-
 man/infotocap.1m                           |   85 +-
 man/key_defined.3x                         |    8 +-
 man/keybound.3x                            |    8 +-
 man/keyok.3x                               |    8 +-
 man/legacy_coding.3x                       |    8 +-
 man/manhtml.aliases                        |    7 +-
 man/menu.3x                                |    9 +-
 man/menu_attributes.3x                     |   10 +-
 man/menu_cursor.3x                         |    9 +-
 man/menu_driver.3x                         |   12 +-
 man/menu_format.3x                         |    9 +-
 man/menu_hook.3x                           |    9 +-
 man/menu_items.3x                          |   10 +-
 man/menu_mark.3x                           |    9 +-
 man/menu_new.3x                            |    9 +-
 man/menu_opts.3x                           |    9 +-
 man/menu_pattern.3x                        |    9 +-
 man/menu_post.3x                           |    9 +-
 man/menu_requestname.3x                    |    9 +-
 man/menu_spacing.3x                        |   33 +-
 man/menu_userptr.3x                        |    9 +-
 man/menu_win.3x                            |   12 +-
 man/mitem_current.3x                       |    9 +-
 man/mitem_name.3x                          |    9 +-
 man/mitem_new.3x                           |    9 +-
 man/mitem_opts.3x                          |    9 +-
 man/mitem_userptr.3x                       |   10 +-
 man/mitem_value.3x                         |    9 +-
 man/mitem_visible.3x                       |    9 +-
 man/ncurses.3x                             |   18 +-
 man/new_pair.3x                            |    8 +-
 man/panel.3x                               |   13 +-
 man/resizeterm.3x                          |    8 +-
 man/scr_dump.5                             |   10 +-
 man/tabs.1                                 |   15 +-
 man/term.5                                 |   10 +-
 man/term.7                                 |    8 +-
 man/term_variables.3x                      |   18 +-
 man/terminfo.tail                          |   25 +-
 man/tic.1m                                 |   25 +-
 man/toe.1m                                 |  285 +++---
 man/tput.1                                 |   19 +-
 man/tset.1                                 |   25 +-
 man/user_caps.5                            |   26 +-
 man/wresize.3x                             |    8 +-
 ncurses/base/safe_sprintf.c                |   15 +-
 ncurses/tinfo/lib_setup.c                  |  160 ++-
 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 +-
 test/clip_printw.c                         |  101 +-
 273 files changed, 4164 insertions(+), 3619 deletions(-)

diff --git a/NEWS b/NEWS
index bd488acad..96ccb8f5a 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4004 2023/09/23 23:48:03 tom Exp $
+-- $Id: NEWS,v 1.4009 2023/10/01 23:03:08 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,17 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231001
+	+ modify setupterm to provide for using ANSI cursor-position report (in
+	  user6/user7 terminfo capabilities) to obtain screensize if neither
+	  environment variables or ioctl is used.  The ncurses test-program
+	  with options "-E -T" demonstrates this feature.
+	+ improve error messages in tic (patch by Branden Robinson).
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ modify test/clip_printw.c to optionally test non-wrapped updates.
+	+ fix reallocation loop for vsnprintf() in _nc_sprintf_string() by
+	  copying the va_list variable (patch by Ian Abbott).
+
 20230923
 	+ improve formatting of manpages (patches by Branden Robinson).
 	+ amend change to delscreen() to limit the windows which it creates to
diff --git a/VERSION b/VERSION
index 4fa26f6db..374ea2b36 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20230923
+5:0:10	6.4	20231001
diff --git a/dist.mk b/dist.mk
index 0c503d688..bb6fc5c34 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1567 2023/09/23 09:27:19 tom Exp $
+# $Id: dist.mk,v 1.1569 2023/10/01 08:35:58 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20230923
+NCURSES_PATCH = 20231001
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 218266234..96a9812fe 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -27,110 +27,110 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.22 2023/09/17 08:29:17 tom Exp @
+  * @Id: MKada_config.in,v 1.28 2023/09/30 23:55:34 tom Exp @
+  * Start example.
+  * End example.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ADACURSES 1 2023-09-17 ncurses 6.4 User commands</TITLE>
+<TITLE>adacurses6\-config 1 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ADACURSES 1 2023-09-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacurses6\-config 1 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
-<STRONG>ADACURSES(1)</STRONG>                     User commands                    <STRONG>ADACURSES(1)</STRONG>
+<STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>             User commands            <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>
 
 
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>adacurses6-config</STRONG> - helper script for AdaCurses libraries
+       <STRONG>adacurses6-config</STRONG> - configuration helper for <EM>AdaCurses</EM> libraries
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>adacurses6-config</STRONG> [<EM>options</EM>]
+       <STRONG>adacurses6-config</STRONG> [<STRONG>--cflags</STRONG>] [<STRONG>--libs</STRONG>]
+
+       <STRONG>adacurses6-config</STRONG> <STRONG>--version</STRONG>
+
+       <STRONG>adacurses6-config</STRONG> <STRONG>--help</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is  a shell script which simplifies configuring an application to
-       use the AdaCurses library binding to ncurses.
+       This  program  development  aid  simplifies  the process of configuring
+       applications to use the <EM>AdaCurses</EM> library binding to <EM>ncurses</EM>.
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
-       <STRONG>--cflags</STRONG>
-              echos the gnat (Ada  compiler)  flags  needed  to  compile  with
-              AdaCurses.
+       <STRONG>--cflags</STRONG>   reports the GNAT (Ada compiler) flags needed to compile with
+                  <EM>AdaCurses</EM>.
 
-       <STRONG>--libs</STRONG> echos the gnat libraries needed to link with AdaCurses.
+       <STRONG>--libs</STRONG>     reports the GNAT libraries needed to link with <EM>AdaCurses</EM>.
 
-       <STRONG>--version</STRONG>
-              echos  the  release+patchdate  version  of the ncurses libraries
-              used to configure and build AdaCurses.
+       <STRONG>--version</STRONG>  reports  the  release  and  patch  date  information  of the
+                  <EM>ncurses</EM> libraries used to configure and build <EM>AdaCurses</EM>  and
+                  exits successfully.
 
-       <STRONG>--help</STRONG> prints a list of the <STRONG>adacurses6-config</STRONG> script's options.
+       <STRONG>--help</STRONG>     issues a usage message and exits successfully.
 
-       If no options are given, <STRONG>adacurses6-config</STRONG> prints  the  combination  of
-       <STRONG>--cflags</STRONG> and <STRONG>--libs</STRONG> that <STRONG>gnatmake</STRONG> expects (see example).
+       Omitting options implies "<STRONG>--cflags</STRONG> <STRONG>--libs</STRONG>".
 
 
 </PRE><H2><a name="h2-EXAMPLE">EXAMPLE</a></H2><PRE>
-       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;
+       Consider a program using <EM>AdaCurses</EM> to write the message "Hello, world!"
+       in the center of the screen and wait for the user to press the "q"  key
+       before exiting.  Populate a file <EM>hello.adb</EM> with the following.
 
-              begin
+           with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
-                 Init_Screen;
-                 Set_Echo_Mode (False);
+           procedure Hello is
+              Visibility : Cursor_Visibility := Invisible;
+              Message : constant String := "Hello, World!";
+              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);
 
-                 Set_Cursor_Visibility (Visibility);
-                 Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
+              Move_Cursor (Line =&gt; Lines / 2,
+                           Column =&gt; (Columns - Message'Length) / 2);
+              Add (Str =&gt; Message);
 
-                 Move_Cursor (Line =&gt; Lines / 2, Column =&gt; (Columns - 12) / 2);
-                 Add (Str =&gt; "Hello World!");
+              while not done loop
+                 c := Get_Keystroke (Standard_Window);
 
-                 while not done loop
+                 case c is
+                     when Character'Pos ('q') =&gt; done := True;
+                     when others =&gt; null;
+                 end case;
 
-                    c := Get_Keystroke (Standard_Window);
-                    case c is
-                    when Character'Pos ('q') =&gt; done := True;
-                    when others =&gt; null;
-                    end case;
+                 Nap_Milli_Seconds (50);
+              end loop;
 
-                    Nap_Milli_Seconds (50);
-                 end loop;
+              End_Windows;
 
-                 End_Windows;
-
-              end Hello;
+           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.
+           gnatmake `adacurses6-config --cflags` hello \
+               -largs `adacurses6-config --libs`
+       or, more simply,
+           gnatmake hello `adacurses6-config`
+       you can compile and link the program.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
 
 
-ncurses 6.4                       2023-09-17                      <STRONG>ADACURSES(1)</STRONG>
+ncurses 6.4                       2023-09-30              <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fb6dfcaeb..dd238edbb 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,23 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.44 2023/09/16 23:39:05 tom Exp @
+  * @Id: captoinfo.1m,v 1.50 2023/10/01 22:22:00 tom Exp @
+  * TODO: There are about 40 box drawing code points in CCSID 437;
+  * were there no XENIX capabilities for the mixed single- and double-
+  * line intersections?
+  * TODO: GG doesn't seem to fit with the others; explain it.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-10-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -52,110 +56,105 @@ <H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>captoinfo</STRONG> [<EM>tic-option</EM>] <EM>file</EM> ...
+       <STRONG>captoinfo</STRONG> [<EM>tic-option</EM>] [<EM>file</EM> ...]
 
        <STRONG>captoinfo</STRONG> <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>captoinfo</STRONG>  looks in each given text <EM>file</EM> for <STRONG>termcap</STRONG> descriptions.  For
-       each one found,  an  equivalent  <STRONG>terminfo</STRONG>  description  is  written  to
-       standard  output.   Termcap  <STRONG>tc</STRONG> capabilities are translated directly to
-       terminfo <STRONG>use</STRONG> capabilities.
+       <STRONG>captoinfo</STRONG>  looks in each given text <EM>file</EM> for <EM>termcap</EM> descriptions.  For
+       each one found, it writes an equivalent  <EM>terminfo</EM>  description  to  the
+       standard   output  stream.   <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities  are  translated
+       directly to <EM>terminfo</EM> "<STRONG>use</STRONG>" capabilities.
 
-       If no <EM>file</EM> is given, then the environment variable <STRONG>TERMCAP</STRONG> is used  for
-       the  filename  or entry.  If <STRONG>TERMCAP</STRONG> is a full pathname to a file, only
-       the terminal whose name is specified in the environment  variable  <STRONG>TERM</STRONG>
-       is  extracted  from  that file.  If the environment variable <STRONG>TERMCAP</STRONG> is
-       not set, then the file <STRONG>/usr/share/terminfo</STRONG> is read.
+       If no <EM>file</EM>s are specified, <STRONG>captoinfo</STRONG>  interprets  the  content  of  the
+       environment  variable  <STRONG>TERMCAP</STRONG>  as  a  file name, and extracts only the
+       entry for the terminal named in the environment variable <STRONG>TERM</STRONG> from  it.
+       If  the  environment  variable  <STRONG>TERMCAP</STRONG>  is  not  set,  <STRONG>captoinfo</STRONG> reads
+       <EM>/etc/termcap</EM>.
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
        option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
        and <STRONG>-x</STRONG>.
 
 
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo Compiled terminal description database.
-
-
-</PRE><H2><a name="h2-TRANSLATIONS-FROM-NONSTANDARD-CAPABILITIES">TRANSLATIONS FROM NONSTANDARD CAPABILITIES</a></H2><PRE>
-       Some obsolete nonstandard capabilities will automatically be translated
-       into  standard  (SVr4/XSI  Curses)  terminfo capabilities by <STRONG>captoinfo</STRONG>.
-       Whenever one of these automatic translations is done, the program  will
-       issue an notification to stderr, inviting the user to check that it has
-       not mistakenly translated a completely unknown  and  random  capability
-       and/or syntax error.
-
-       <STRONG>Nonstd</STRONG>   <STRONG>Std</STRONG>                   <STRONG>Terminfo</STRONG>
-        <STRONG>name</STRONG>    <STRONG>name</STRONG>   <STRONG>From</STRONG>          <STRONG>capability</STRONG>
-       -----------------------------------------------
-       BO       mr     AT&amp;T    enter_reverse_mode
-       CI       vi     AT&amp;T    cursor_invisible
-       CV       ve     AT&amp;T    cursor_normal
-       DS       mh     AT&amp;T    enter_dim_mode
-       EE       me     AT&amp;T    exit_attribute_mode
-       FE       LF     AT&amp;T    label_on
-       FL       LO     AT&amp;T    label_off
-       XS       mk     AT&amp;T    enter_secure_mode
-       EN       @7     XENIX   key_end
-       GE       ae     XENIX   exit_alt_charset_mode
-       GS       as     XENIX   enter_alt_charset_mode
-       HM       kh     XENIX   key_home
-       LD       kL     XENIX   key_dl
-       PD       kN     XENIX   key_npage
-       PN       po     XENIX   prtr_off
-       PS       pf     XENIX   prtr_on
-       PU       kP     XENIX   key_ppage
-       RT       @8     XENIX   kent
-       UP       ku     XENIX   kcuu1
-       KA       k;     Tek     key_f10
-       KB       F1     Tek     key_f11
-       KC       F2     Tek     key_f12
-       KD       F3     Tek     key_f13
-
-       KE       F4     Tek     key_f14
-       KF       F5     Tek     key_f15
-       BC       Sb     Tek     set_background
-       FC       Sf     Tek     set_foreground
-       HS       mh     Iris    enter_dim_mode
-
-       XENIX  termcap  also  used  to have a set of extension capabilities for
-       forms drawing, designed to take  advantage  of  the  IBM  PC  high-half
-       graphics.  They were as follows:
-
-       <STRONG>Cap</STRONG>          <STRONG>Graphic</STRONG>
-       -----------------------------
-       G2    upper left
-       G3    lower left
-       G1    upper right
-       G4    lower right
-       GR    pointing right
-       GL    pointing left
-       GU    pointing up
-       GD    pointing down
-       GH    horizontal line
-       GV    vertical line
-       GC    intersection
-       G6    upper left
-       G7    lower left
-       G5    upper right
-       G8    lower right
-       Gr    tee pointing right
-       Gr    tee pointing left
-       Gu    tee pointing up
-       Gd    tee pointing down
-       Gh    horizontal line
-       Gv    vertical line
-       Gc    intersection
-       GG    acs magic cookie count
-
-       If   the   single-line  capabilities  occur  in  an  entry,  they  will
-       automatically  be  composed  into  an  <STRONG>acsc</STRONG>  string.   The  double-line
-       capabilities and <STRONG>GG</STRONG> are discarded with a warning message.
-
-       IBM's  AIX  has  a  terminfo  facility descended from SVr1 terminfo but
-       incompatible with the SVr4 format.  The following  AIX  extensions  are
-       automatically translated:
+</PRE><H3><a name="h3-Translations-from-nonstandard-capabilities">Translations from nonstandard capabilities</a></H3><PRE>
+       <STRONG>captoinfo</STRONG>  translates  some  obsolete,  nonstandard  capabilities  into
+       standard   (SVr4/XSI   Curses)  <EM>terminfo</EM>  capabilities.   It  issues  a
+       diagnostic to the standard error stream for each, inviting the user  to
+       check  that  it  has  not  mistakenly translated an unknown or mistyped
+       capability name.
+
+       <STRONG>Nonstandard</STRONG>   <STRONG>Standard</STRONG>                  <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>i</I<STRONG>i</STRONG><EM>n</I<STRONG>n</STRONG><EM>f</I<STRONG>f</STRONG><EM>o</I<STRONG>o</STRONG>
+          <STRONG>name</STRONG>         <STRONG>name</STRONG>     <STRONG>From</STRONG>          <STRONG>capability</STRONG>
+       --------------------------------------------------------
+           <STRONG>BO</STRONG>           <STRONG>mr</STRONG>      AT&amp;T    <STRONG>enter_reverse_mode</STRONG>
+           <STRONG>CI</STRONG>           <STRONG>vi</STRONG>      AT&amp;T    <STRONG>cursor_invisible</STRONG>
+           <STRONG>CV</STRONG>           <STRONG>ve</STRONG>      AT&amp;T    <STRONG>cursor_normal</STRONG>
+           <STRONG>DS</STRONG>           <STRONG>mh</STRONG>      AT&amp;T    <STRONG>enter_dim_mode</STRONG>
+           <STRONG>EE</STRONG>           <STRONG>me</STRONG>      AT&amp;T    <STRONG>exit_attribute_mode</STRONG>
+           <STRONG>FE</STRONG>           <STRONG>LF</STRONG>      AT&amp;T    <STRONG>label_on</STRONG>
+           <STRONG>FL</STRONG>           <STRONG>LO</STRONG>      AT&amp;T    <STRONG>label_off</STRONG>
+           <STRONG>XS</STRONG>           <STRONG>mk</STRONG>      AT&amp;T    <STRONG>enter_secure_mode</STRONG>
+           <STRONG>EN</STRONG>           <STRONG>@7</STRONG>      XENIX   <STRONG>key_end</STRONG>
+           <STRONG>GE</STRONG>           <STRONG>ae</STRONG>      XENIX   <STRONG>exit_alt_charset_mode</STRONG>
+           <STRONG>GS</STRONG>           <STRONG>as</STRONG>      XENIX   <STRONG>enter_alt_charset_mode</STRONG>
+           <STRONG>HM</STRONG>           <STRONG>kh</STRONG>      XENIX   <STRONG>key_home</STRONG>
+           <STRONG>LD</STRONG>           <STRONG>kL</STRONG>      XENIX   <STRONG>key_dl</STRONG>
+           <STRONG>PD</STRONG>           <STRONG>kN</STRONG>      XENIX   <STRONG>key_npage</STRONG>
+           <STRONG>PN</STRONG>           <STRONG>po</STRONG>      XENIX   <STRONG>prtr_off</STRONG>
+           <STRONG>PS</STRONG>           <STRONG>pf</STRONG>      XENIX   <STRONG>prtr_on</STRONG>
+           <STRONG>PU</STRONG>           <STRONG>kP</STRONG>      XENIX   <STRONG>key_ppage</STRONG>
+           <STRONG>RT</STRONG>           <STRONG>@8</STRONG>      XENIX   <STRONG>kent</STRONG>
+           <STRONG>UP</STRONG>           <STRONG>ku</STRONG>      XENIX   <STRONG>kcuu1</STRONG>
+           <STRONG>KA</STRONG>           <STRONG>k;</STRONG>      Tek     <STRONG>key_f10</STRONG>
+           <STRONG>KB</STRONG>           <STRONG>F1</STRONG>      Tek     <STRONG>key_f11</STRONG>
+           <STRONG>KC</STRONG>           <STRONG>F2</STRONG>      Tek     <STRONG>key_f12</STRONG>
+           <STRONG>KD</STRONG>           <STRONG>F3</STRONG>      Tek     <STRONG>key_f13</STRONG>
+           <STRONG>KE</STRONG>           <STRONG>F4</STRONG>      Tek     <STRONG>key_f14</STRONG>
+           <STRONG>KF</STRONG>           <STRONG>F5</STRONG>      Tek     <STRONG>key_f15</STRONG>
+           <STRONG>BC</STRONG>           <STRONG>Sb</STRONG>      Tek     <STRONG>set_background</STRONG>
+           <STRONG>FC</STRONG>           <STRONG>Sf</STRONG>      Tek     <STRONG>set_foreground</STRONG>
+
+           <STRONG>HS</STRONG>           <STRONG>mh</STRONG>      Iris    <STRONG>enter_dim_mode</STRONG>
+
+       XENIX <EM>termcap</EM> had a set of extension capabilities, corresponding to box
+       drawing characters of CCSID ("code page") 437, as follows.
+
+       <STRONG>Termcap</STRONG>
+        <STRONG>Name</STRONG>              <STRONG>Graphic</STRONG>
+       ------------------------------------
+         <STRONG>G2</STRONG>      upper left corner
+         <STRONG>G3</STRONG>      lower left corner
+         <STRONG>G1</STRONG>      upper right corner
+         <STRONG>G4</STRONG>      lower right corner
+         <STRONG>GR</STRONG>      tee pointing right
+         <STRONG>GL</STRONG>      tee pointing left
+         <STRONG>GU</STRONG>      tee pointing up
+         <STRONG>GD</STRONG>      tee pointing down
+         <STRONG>GH</STRONG>      horizontal line
+         <STRONG>GV</STRONG>      vertical line
+         <STRONG>GC</STRONG>      intersection
+         <STRONG>G6</STRONG>      double upper left corner
+         <STRONG>G7</STRONG>      double lower left corner
+         <STRONG>G5</STRONG>      double upper right corner
+         <STRONG>G8</STRONG>      double lower right corner
+         <STRONG>Gr</STRONG>      double tee pointing right
+         <STRONG>Gr</STRONG>      double tee pointing left
+         <STRONG>Gu</STRONG>      double tee pointing up
+         <STRONG>Gd</STRONG>      double tee pointing down
+         <STRONG>Gh</STRONG>      double horizontal line
+         <STRONG>Gv</STRONG>      double vertical line
+         <STRONG>Gc</STRONG>      double intersection
+         <STRONG>GG</STRONG>      ACS magic cookie count
+
+       If  the  single-line  capabilities occur in an entry, they are composed
+       into an <STRONG>acsc</STRONG> string.  The double-line capabilities and <STRONG>GG</STRONG> are discarded
+       with a warning message.
+
+       IBM's  AIX  has  a  <EM>terminfo</EM> facility descended from SVr1 <EM>terminfo</EM>, but
+       which is incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG>  translates  the
+       following AIX extensions.
 
         <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
        -------------
@@ -166,17 +165,22 @@ <H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
        font2   s2ds
        font3   s3ds
 
-       Additionally,  the AIX <EM>box1</EM> capability will be automatically translated
-       to an <STRONG>acsc</STRONG> string.
+       Additionally,  this  program  translates  the AIX <STRONG>box1</STRONG> capability to an
+       <STRONG>acsc</STRONG> string.
+
+       The  HP-UX  <EM>terminfo</EM>  library   supports   two   nonstandard   <EM>terminfo</EM>
+       capabilities,  <STRONG>meml</STRONG>  (memory lock) and <STRONG>memu</STRONG> (memory unlock).  <STRONG>captoinfo</STRONG>
+       discards these with a warning message.
 
-       Hewlett-Packard's terminfo library supports  two  nonstandard  terminfo
-       capabilities  <STRONG>meml</STRONG>  (memory lock) and <STRONG>memu</STRONG> (memory unlock).  These will
-       be discarded with a warning message.
+
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/etc/termcap</EM>
+              default <EM>termcap</EM> terminal capability database
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The verbose option is not identical to SVr4's.  Under SVr4, instead  of
-       following the <STRONG>-v</STRONG> with a trace level n, you repeat it n times.
+       following the <STRONG>-v</STRONG> with a trace level <EM>n</EM>, you repeat it <EM>n</EM> times.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -187,31 +191,32 @@ <H1 class="no-header">captoinfo 1m 2023-09-16 ncurses 6.4 User commands</H1>
        NetBSD does not provide this application.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+
+ncurses 6.4                       2023-10-01                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
+<ul>
+<li><a href="#h3-Translations-from-nonstandard-capabilities">Translations from nonstandard capabilities</a></li>
+</ul>
+</li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-TRANSLATIONS-FROM-NONSTANDARD-CAPABILITIES">TRANSLATIONS FROM NONSTANDARD CAPABILITIES</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index bbfa5d258..af32a0c27 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,21 +27,22 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.38 2023/09/16 23:39:05 tom Exp @
-  * these would be fallbacks for DS/DE,
-  * but groff changed the meaning of the macros.
+  * @Id: clear.1,v 1.40 2023/10/01 22:12:38 tom Exp @
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
+  *   tput/clear.sh
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-10-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-10-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -53,108 +54,104 @@ <H1 class="no-header">clear 1 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>clear</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] [<STRONG>-V</STRONG>] [<STRONG>-x</STRONG>]
+       <STRONG>clear</STRONG> [<STRONG>-x</STRONG>] [<STRONG>-T</STRONG> <EM>type</EM>]
+
+       <STRONG>clear</STRONG> <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>clear</STRONG>  clears your terminal's screen if this is possible, including the
-       terminal's scrollback  buffer  (if  the  extended  "E3"  capability  is
-       defined).   <STRONG>clear</STRONG>  looks in the environment for the terminal type given
-       by the environment variable <STRONG>TERM</STRONG>, and then in the <STRONG>terminfo</STRONG> database  to
-       determine how to clear the screen.
+       <STRONG>clear</STRONG>  clears your terminal's screen and its scrollback buffer, if any.
+       <STRONG>clear</STRONG> retrieves the terminal type from the environment  variable  <STRONG>TERM</STRONG>,
+       then  consults the <EM>terminfo</EM> terminal capability database entry for that
+       type to determine how to perform these actions.
 
-       <STRONG>clear</STRONG>  writes  to  the  standard output.  You can redirect the standard
-       output to a file (which  prevents  <STRONG>clear</STRONG>  from  actually  clearing  the
-       screen),  and  later  <STRONG>cat</STRONG>  the  file to the screen, clearing it at that
-       point.
+       The capabilities to clear the screen and scrollback  buffer  are  named
+       "clear"   and   "E3",  respectively.   The  latter  is  a  <EM>user-defined</EM>
+       <EM>capability</EM>, applying an extension mechanism introduced in  <EM>ncurses</EM>  5.0
+       (1999).
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
-       <STRONG>-T</STRONG> <EM>type</EM>
-            indicates  the  <EM>type</EM>  of  terminal.   Normally  this   option   is
-            unnecessary,  because  the  default  is taken from the environment
-            variable <STRONG>TERM</STRONG>.  If <STRONG>-T</STRONG> is specified, then the shell variables <STRONG>LINES</STRONG>
-            and <STRONG>COLUMNS</STRONG> will also be ignored.
+       <STRONG>clear</STRONG> recognizes the following options.
+
+       <STRONG>-T</STRONG> <EM>type</EM>  produces   instructions   suitable   for  the  terminal  <EM>type</EM>.
+                Normally, this option is  unnecessary,  because  the  terminal
+                type  is inferred from the environment variable <STRONG>TERM</STRONG>.  If this
+                option is specified, <STRONG>clear</STRONG> ignores the  environment  variables
+                <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> as well.
 
-       <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
-            exits.  The options are as follows:
+       <STRONG>-V</STRONG>       reports  the  version  of <EM>ncurses</EM> associated with this program
+                and exits with a successful status.
 
-       <STRONG>-x</STRONG>   do not attempt to clear the terminal's scrollback buffer using the
-            extended "E3" capability.
+       <STRONG>-x</STRONG>       prevents <STRONG>clear</STRONG> from attempting to clear the scrollback buffer.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A  <STRONG>clear</STRONG>  command  appeared  in 2.79BSD dated February 24, 1979.  Later
-       that was provided in Unix 8th edition (1985).
+       A <STRONG>clear</STRONG> command using the <EM>termcap</EM> database and library appeared in 2BSD
+       (1979).  Eighth Edition Unix (1985) later included it.
 
-       AT&amp;T adapted a different BSD program  (<STRONG>tset</STRONG>)  to  make  a  new  command
-       (<STRONG>tput</STRONG>),  and used this to replace the <STRONG>clear</STRONG> command with a shell script
-       which calls <STRONG>tput</STRONG> <STRONG>clear</STRONG>, e.g.,
+       The  commercial Unix arm of AT&amp;T adapted a different BSD program (<STRONG>tset</STRONG>)
+       to make a new command, <STRONG>tput</STRONG>, and replaced  the  <STRONG>clear</STRONG>  program  with  a
+       shell script that called "<STRONG>tput</STRONG> <STRONG>clear</STRONG>".
 
            /usr/bin/tput ${1:+-T$1} clear 2&gt; /dev/null
            exit
 
-       In 1989, when Keith Bostic revised the BSD  <STRONG>tput</STRONG>  command  to  make  it
-       similar  to  the  AT&amp;T  <STRONG>tput</STRONG>,  he  added  a  shell script for the <STRONG>clear</STRONG>
-       command:
+       In  1989,  when  Keith  Bostic  revised the BSD <STRONG>tput</STRONG> command to make it
+       similar to AT&amp;T's <STRONG>tput</STRONG>, he added a <STRONG>clear</STRONG> shell script as well.
 
            exec tput clear
 
        The remainder of the script in each case is a copyright notice.
 
-       The ncurses <STRONG>clear</STRONG> command began in 1995 by adapting  the  original  BSD
-       <STRONG>clear</STRONG> command (with terminfo, of course).
+       In 1995, <EM>ncurses</EM>'s <STRONG>clear</STRONG> began by adapting BSD's original <STRONG>clear</STRONG> command
+       to use <EM>terminfo</EM>.  The <STRONG>E3</STRONG> extension came later.
 
-       The <STRONG>E3</STRONG> extension came later:
-
-       <STRONG>o</STRONG>   In  June  1999, <STRONG>xterm</STRONG> provided an extension to the standard control
+       <STRONG>o</STRONG>   In  June  1999, <EM>xterm</EM> provided an extension to the standard control
            sequence for clearing the screen.  Rather than  clearing  just  the
            visible part of the screen using
 
                printf '\033[2J'
 
-           one could clear the <EM>scrollback</EM> using
+           one could clear the scrollback buffer using
 
                printf '\033[<STRONG>3</STRONG>J'
 
-           This  is  documented  in  <EM>XTerm</EM>  <EM>Control</EM>  <EM>Sequences</EM>  as  a  feature
-           originating with <STRONG>xterm</STRONG>.
+           "XTerm  Control  Sequences"  documents  this feature as originating
+           with <EM>xterm</EM>.
 
-       <STRONG>o</STRONG>   A few other terminal developers adopted the feature, e.g., PuTTY in
-           2006.
+       <STRONG>o</STRONG>   A few other terminal emulators adopted it, such as PuTTY in 2006.
 
-       <STRONG>o</STRONG>   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 <STRONG>xterm</STRONG>,
-           although it was cited in the Red Hat bug report (#683733) which led
-           to the change.
+       <STRONG>o</STRONG>   In April 2011, a Red Hat developer submitted a patch to  the  Linux
+           kernel,  modifying  its  console  driver  to  do  the  same  thing.
+           Documentation of this change,  appearing  in  Linux  3.0,  did  not
+           mention  <EM>xterm</EM>,  although that program was cited in the Red Hat bug
+           report (#683733) motivating the feature.
 
-       <STRONG>o</STRONG>   Again,  a  few  other terminal developers adopted the feature.  But
-           the next relevant step was a change to the <STRONG>clear</STRONG> program in 2013 to
-           incorporate this extension.
+       <STRONG>o</STRONG>   Subsequently, more terminal developers adopted  the  feature.   The
+           next  relevant step was to change the <EM>ncurses</EM> <STRONG>clear</STRONG> program in 2013
+           to incorporate this extension.
 
-       <STRONG>o</STRONG>   In  2013,  the <STRONG>E3</STRONG> extension was overlooked in <STRONG>tput</STRONG> with the "clear"
-           parameter.  That was addressed in  2016  by  reorganizing  <STRONG>tput</STRONG>  to
-           share its logic with <STRONG>clear</STRONG> and <STRONG>tset</STRONG>.
+       <STRONG>o</STRONG>   In 2013, the <STRONG>E3</STRONG> capability was not exercised by "<STRONG>tput</STRONG> <STRONG>clear</STRONG>".  That
+           oversight  was  addressed in 2016 by reorganizing <STRONG>tput</STRONG> to share its
+           logic with <STRONG>clear</STRONG> and <STRONG>tset</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        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.
+       (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
 
-       The latter documents <STRONG>tput</STRONG>, which could be used to replace this  utility
-       either  via  a shell script or by an alias (such as a symbolic link) to
+       The  latter documents <STRONG>tput</STRONG>, which could be used to replace this utility
+       either via a shell script or by an alias (such as a symbolic  link)  to
        run <STRONG>tput</STRONG> as <STRONG>clear</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
+       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-10-01                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 206e45c41..193b71f97 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.43 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.45 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -315,12 +315,12 @@ <H1 class="no-header">curs_add_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,      <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
        <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 38faabe01..2c791993f 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.25 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -113,14 +113,14 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
        Comparable  functions  in  the  narrow-character  (ncurses) library are
        described in <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index bc812c733..18ae03aa9 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.69 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_addch.3x,v 1.71 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -301,14 +301,14 @@ <H1 class="no-header">curs_addch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,      <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,      <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>.
+       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>
 
        Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 2abed1c28..04bbdbeab 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.31 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.33 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -106,14 +106,14 @@ <H1 class="no-header">curs_addchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
        Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index beca3213a..f78da57b8 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.32 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_addstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -113,11 +113,11 @@ <H1 class="no-header">curs_addstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 767e996fa..29edcfd2b 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.24 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -112,11 +112,11 @@ <H1 class="no-header">curs_addwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 3d6c5941f..c5050ba03 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.84 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_attr.3x,v 1.86 2023/09/30 21:38:11 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -509,12 +509,12 @@ <H1 class="no-header">curs_attr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>, <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>,
        <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 5f149e773..6c94547e2 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.22 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_beep.3x,v 1.24 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 789892f28..ee84ed563 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.44 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 8c7944069..b90558c0c 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.27 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 8356000f9..cd71db357 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.38 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_border.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -140,11 +140,11 @@ <H1 class="no-header">curs_border 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 95fdb4b41..3f9f3830d 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.24 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_border_set.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_border_set 3x 2023-09-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 3e4c2c261..8d48dc225 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.35 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_clear.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -140,7 +140,7 @@ <H1 class="no-header">curs_clear 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 44b161ef9..f426351ba 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.82 2023/09/23 22:24:15 tom Exp @
+  * @Id: curs_color.3x,v 1.84 2023/09/30 20:13:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -525,7 +525,7 @@ <H1 class="no-header">curs_color 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 5d94c2a61..00f318c80 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.26 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_delch.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index aa31843b0..f06bdce5c 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.28 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 1bcbdaf18..cd7bb5c0c 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.36 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_extend.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -94,18 +94,18 @@ <H1 class="no-header">curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using NCURSES_VERSION.
 
 
+</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+       Thomas Dickey.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,     <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,     <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
-
-
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Thomas Dickey.
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,8 +119,8 @@ <H1 class="no-header">curs_extend 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 48e000c47..16c41b27e 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.23 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -153,7 +153,7 @@ <H1 class="no-header">curs_get_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index fcecf4cb7..735fca299 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.34 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.36 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -183,11 +183,11 @@ <H1 class="no-header">curs_get_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       Functions: <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 495de787a..a370b6ed7 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.35 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -192,11 +192,11 @@ <H1 class="no-header">curs_getcchar 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       Functions: <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>wcwidth(3)</STRONG>.
+       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>wcwidth(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index a1d876057..46fc07428 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.72 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_getch.3x,v 1.74 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -377,14 +377,14 @@ <H1 class="no-header">curs_getch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
        Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index ec8f83831..92c45f30c 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.46 2023/09/16 23:34:43 tom Exp @
+  * @Id: curs_getstr.3x,v 1.48 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -236,11 +236,11 @@ <H1 class="no-header">curs_getstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 2ac24bf38..d90a5a70b 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -87,11 +87,11 @@ <H1 class="no-header">curs_in_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index fbdee5ed9..b2f36ff59 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -99,12 +99,12 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       Functions: <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
        <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 0f767a7a0..07d3db41e 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_inch.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -120,19 +120,20 @@ <H1 class="no-header">curs_inch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
-            gives an overview of the WINDOW and <STRONG>chtype</STRONG> data types.
+              gives an overview of the <STRONG>WINDOW</STRONG> and <STRONG>chtype</STRONG> data types.
 
        <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-            goes into more  detail,  pointing  out  portability  problems  and
-            constraints on the use of <STRONG>chtype</STRONG> for returning window information.
+              goes into more detail, pointing  out  portability  problems  and
+              constraints   on   the   use  of  <STRONG>chtype</STRONG>  for  returning  window
+              information.
 
        <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
-            describes  comparable  functions for the wide-character (ncursesw)
-            library.
+              describes comparable functions for the wide-character (ncursesw)
+              library.
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index dc15d90fb..df6b36d6f 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.32 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -106,14 +106,14 @@ <H1 class="no-header">curs_inchstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
        Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 760d464ab..88cc9da8f 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.50 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_initscr.3x,v 1.52 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -290,11 +290,11 @@ <H1 class="no-header">curs_initscr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 26db9703f..77b7761d2 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -82,11 +82,11 @@ <H1 class="no-header">curs_ins_wch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index a848b6d8b..43e858ec5 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.20 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.22 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -104,11 +104,11 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index a7f3a1c2e..8325bb88b 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.30 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_insch.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -92,14 +92,14 @@ <H1 class="no-header">curs_insch 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
        Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 72f1f4567..175b8bd06 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_insstr.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -106,11 +106,11 @@ <H1 class="no-header">curs_insstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 1890788dc..112b086af 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.33 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_instr.3x,v 1.35 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -102,11 +102,11 @@ <H1 class="no-header">curs_instr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 202beef91..821a28287 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 73426e03b..d6d14e05a 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_kernel.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -201,11 +201,11 @@ <H1 class="no-header">curs_kernel 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 56b90a95a..d41244636 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.25 2023/09/23 21:07:59 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.27 2023/09/30 23:13:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -57,7 +57,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;term.h&gt;</STRONG>
        <STRONG>void</STRONG> <STRONG>exit_terminfo(int</STRONG> <EM>code</EM><STRONG>);</STRONG>
 
-       /* deprecated (intentionally not declared in curses.h or term.h) */
+       <EM>/*</EM> <EM>deprecated</EM> <EM>(intentionally</EM> <EM>not</EM> <EM>declared</EM> <EM>in</EM> <EM>curses.h</EM> <EM>or</EM> <EM>term.h)</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>_nc_freeall(void);</STRONG>
        <STRONG>void</STRONG> <STRONG>_nc_free_and_exit(int</STRONG> <EM>code</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>_nc_free_tinfo(int</STRONG> <EM>code</EM><STRONG>);</STRONG>
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 0409b5e78..912e6d04b 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.29 2023/09/16 20:18:53 tom Exp @
+  * @Id: curs_move.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_move 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index e1472e1ec..ff11a9505 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.33 2023/09/23 22:59:48 tom Exp @
+  * @Id: curs_opaque.3x,v 1.35 2023/09/30 22:01:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -67,86 +67,90 @@ <H1 class="no-header">curs_opaque 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        <STRONG>bool</STRONG> <STRONG>is_scrollok(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>is_subwin(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>is_syncok(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+
        <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>wgetparent(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wgetdelay(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wgetscrreg(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>top</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>bottom</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  implementation  provides functions which return properties set in
-       the <STRONG>WINDOW</STRONG>  structure,  allowing  it  to  be  "opaque"  if  the  symbol
-       <STRONG>NCURSES_OPAQUE</STRONG> is defined:
+       <EM>ncurses</EM>  provides functions returning properties of a <EM>WINDOW</EM> structure,
+       allowing  it  to  be  "opaque"   if   the   application   defines   the
+       <STRONG>NCURSES_OPAQUE</STRONG> preprocessor symbol.
 
        <STRONG>is_cleared</STRONG>
-            returns the value set in <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG>.
 
        <STRONG>is_idcok</STRONG>
-            returns the value set in <STRONG><A HREF="idcok.3x.html">idcok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="idcok.3x.html">idcok(3x)</A></STRONG>.
 
        <STRONG>is_idlok</STRONG>
-            returns the value set in <STRONG><A HREF="idlok.3x.html">idlok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="idlok.3x.html">idlok(3x)</A></STRONG>.
 
        <STRONG>is_immedok</STRONG>
-            returns the value set in <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG>.
 
        <STRONG>is_keypad</STRONG>
-            returns the value set in <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>.
 
        <STRONG>is_leaveok</STRONG>
-            returns the value set in <STRONG><A HREF="leaveok.3x.html">leaveok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="leaveok.3x.html">leaveok(3x)</A></STRONG>.
 
        <STRONG>is_nodelay</STRONG>
-            returns the value set in <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>.
 
        <STRONG>is_notimeout</STRONG>
-            returns the value set in <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.
 
-       <STRONG>is_pad</STRONG>
-            returns <STRONG>TRUE</STRONG> if the window is a pad i.e., created by <STRONG><A HREF="newpad.3x.html">newpad(3x)</A></STRONG>
+       <STRONG>is_pad</STRONG> returns  <STRONG>TRUE</STRONG>  if  the  window  is a pad; that is, it created by
+              <STRONG><A HREF="newpad.3x.html">newpad(3x)</A></STRONG>.
 
        <STRONG>is_scrollok</STRONG>
-            returns the value set in <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
        <STRONG>is_subwin</STRONG>
-            returns  <STRONG>TRUE</STRONG>  if  the  window  is  a  subwindow, i.e., created by
-            <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG> or <STRONG><A HREF="derwin.3x.html">derwin(3x)</A></STRONG>
+              returns <STRONG>TRUE</STRONG> if the window is  a  subwindow,  that  is,  it  was
+              created by <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG> or <STRONG><A HREF="derwin.3x.html">derwin(3x)</A></STRONG>.
 
        <STRONG>is_syncok</STRONG>
-            returns the value set in <STRONG><A HREF="syncok.3x.html">syncok(3x)</A></STRONG>
+              returns the value set by <STRONG><A HREF="syncok.3x.html">syncok(3x)</A></STRONG>.
 
        <STRONG>wgetdelay</STRONG>
-            returns the delay timeout as set in <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
+              returns the delay timeout set by <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
 
        <STRONG>wgetparent</STRONG>
-            returns the parent <STRONG>WINDOW</STRONG> pointer  for  subwindows,  or  <STRONG>NULL</STRONG>  for
-            windows having no parent.
+              returns  the  parent  <EM>WINDOW</EM> pointer for subwindows, or <STRONG>NULL</STRONG> for
+              windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
-            returns the top and bottom rows for the scrolling margin as set in
-            <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG>.
+              stores the the top and bottom rows for the scrolling margin  set
+              by  <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG> in the corresponding arguments, returning <STRONG>ERR</STRONG>
+              upon failure and <STRONG>OK</STRONG> upon successful completion.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These functions all return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>, except as noted.
+       These functions return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> except as noted.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Both a macro and a function are provided for each name.
+       <EM>ncurses</EM> provides both a C function and a preprocessor  macro  for  each
+       function documented in this page.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
+       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
        <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index d309d4b79..0abaa743a 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_outopts.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -199,12 +199,12 @@ <H1 class="no-header">curs_outopts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 4b7ba1aa8..b6ad8713e 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.30 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_overlay.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index dfd7d6193..63cf8d03f 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_printw.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -139,12 +139,12 @@ <H1 class="no-header">curs_printw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>, <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
-       <STRONG>printf(3)</STRONG>, <STRONG>vprintf(3)</STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
+       <STRONG>printf(3)</STRONG>, <STRONG>vprintf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 34e56721a..01df6a2e1 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.35 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_refresh.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -155,11 +155,11 @@ <H1 class="no-header">curs_refresh 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index de9ef5e45..98d514282 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_scanw.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -158,12 +158,12 @@ <H1 class="no-header">curs_scanw 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
-       <STRONG>scanf(3)</STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
+       <STRONG>scanf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 452c5e717..9835189c7 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index a586f2b19..6ffb51fbb 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.32 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_scroll.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 80295be49..8dda503fe 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.60 2023/09/23 22:49:51 tom Exp @
+  * @Id: curs_slk.3x,v 1.62 2023/09/30 20:13:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -311,7 +311,7 @@ <H1 class="no-header">curs_slk 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 3f52808e5..ff9ebae31 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.37 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.40 2023/09/30 23:13:32 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -293,11 +293,11 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>, <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>, <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 85855d0e1..6aac0ff35 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index af1dafa9a..ec9849373 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.66 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_termcap.3x,v 1.68 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -350,13 +350,13 @@ <H1 class="no-header">curs_termcap 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
        https://invisible-island.net/ncurses/tctest.html
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 3815079b0..88f8f25f7 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.108 2023/09/23 23:38:10 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.111 2023/09/30 21:38:11 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -692,7 +692,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 28176698e..0a1c75e56 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.41 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_threads.3x,v 1.46 2023/10/01 09:45:30 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-10-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-10-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -50,12 +50,15 @@ <H1 class="no-header">curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>curs_threads</STRONG> - <EM>curses</EM> thread support
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>WINDOW</EM><STRONG>_</STRONG><EM>CB</EM>,   <EM>NCURSES</EM><STRONG>_</STRONG><EM>SCREEN</EM><STRONG>_</STRONG><EM>CB</EM>,   <STRONG>get_escdelay</STRONG>,   <STRONG>set_escdelay</STRONG>,
+       <STRONG>set_tabsize</STRONG>, <STRONG>use_screen</STRONG>, <STRONG>use_window</STRONG> - <EM>curses</EM> support for multi-threaded
+       applications
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
+       <EM>/*</EM> <EM>data</EM> <EM>types</EM> <EM>*/</EM>
        <STRONG>typedef</STRONG> <STRONG>int</STRONG> <STRONG>(*NCURSES_WINDOW_CB)(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>void</STRONG> <STRONG>*);</STRONG>
        <STRONG>typedef</STRONG> <STRONG>int</STRONG> <STRONG>(*NCURSES_SCREEN_CB)(SCREEN</STRONG> <STRONG>*,</STRONG> <STRONG>void</STRONG> <STRONG>*);</STRONG>
 
@@ -68,549 +71,555 @@ <H1 class="no-header">curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  implementation  can  be configured to provide rudimentary support
-       for  multi-threaded  applications.   This  makes  a  different  set  of
-       libraries, e.g., <STRONG>libncursest</STRONG> since the binary interfaces are different.
-
-       Rather  than  modify  the interfaces to pass a thread specifier to each
-       function,  it  adds  a  few  functions  which  can  be  used   in   any
-       configuration  which  hide the mutex's needed to prevent concurrent use
-       of the global variables when configured for threading.
-
-       In addition to forcing access to members of the <STRONG>WINDOW</STRONG> structure to  be
-       via  functions  (see <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>), it makes functions of the common
-       global variables, e.g., COLORS,  COLOR_PAIRS,  COLS,  ESCDELAY,  LINES,
-       TABSIZE  curscr, newscr and ttytype.  Those variables are maintained as
-       read-only values, stored in the <STRONG>SCREEN</STRONG> structure.
-
-       Even this is not enough to make a thread-safe application using curses.
-       A multi-threaded application would be expected to have threads updating
-       separate windows (within the same  device),  or  updating  on  separate
-       screens  (on  different  devices).  Also, a few of the global variables
-       are considered writable by some applications.  The functions  described
-       here address these special situations.
-
-       The  ESCDELAY  and  TABSIZE  global  variables  are  modified  by  some
+       The  <EM>ncurses</EM>  library  can  be  configured  to  support  multi-threaded
+       applications in a  rudimentary  way.   Such  configuration  produces  a
+       different set of libraries, named <EM>libncursest</EM>, for example, since doing
+       so alters <EM>ncurses</EM>'s application binary interface (ABI).
+
+       Instead of modifying the programming interface (API)  to  make  <EM>ncurses</EM>
+       functions  expect  an  additional  argument  specifying  a  thread, the
+       library adds a few functions, usable in any  configuration,  that  hide
+       the  <EM>mutexes</EM>  (mutual  exclusion  locks)  needed  to prevent concurrent
+       access to variables shared by multiple threads of execution.
+
+       <EM>ncurses</EM> threading support requires  the  use  of  functions  to  access
+       members  of  the  <EM>WINDOW</EM>  structure  (see <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>).  It further
+       makes functions of the common  global  variables  <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,
+       <STRONG>COLS</STRONG>,   <STRONG>ESCDELAY</STRONG>,   <STRONG>LINES</STRONG>,   <STRONG>TABSIZE</STRONG>,   <STRONG>curscr</STRONG>,  <STRONG>newscr</STRONG>,  and  <STRONG>ttytype</STRONG>,
+       maintaining them as as read-only values in the <EM>SCREEN</EM> structure.
+
+       Even this is not enough to make an  application  using  <EM>curses</EM>  thread-
+       safe.   We  would  expect  a multi-threaded application to have threads
+       updating separate windows (on the same device),  and  separate  screens
+       (on  different  devices).   Further,  applications  expect a few of the
+       global variables to be writable.  The functions described here  address
+       these special situations.
+
+       The  <STRONG>ESCDELAY</STRONG>  and  <STRONG>TABSIZE</STRONG>  global  variables  are  modified  by  some
        applications.   To  modify  them  in   any   configuration,   use   the
        <STRONG>set_escdelay</STRONG>  or <STRONG>set_tabsize</STRONG> functions.  Other global variables are not
-       modifiable.
+       modifiable.  <STRONG>get_escdelay</STRONG> retrieves <STRONG>ESCDELAY</STRONG>'s value.
 
-       The <STRONG>get_escdelay</STRONG> function returns the value for ESCDELAY.
+       The <STRONG>use_window</STRONG> and <STRONG>use_screen</STRONG> functions provide coarse-grained  mutexes
+       for  their  respective  <EM>WINDOW</EM> and <EM>SCREEN</EM> parameters; they call a user-
+       supplied function, pass it a <EM>data</EM> parameter, and return the value  from
+       the user-supplied function to the application.
 
-       The <STRONG>use_window</STRONG> and  <STRONG>use_screen</STRONG>  functions  provide  coarse  granularity
-       mutexes  for  their respective <STRONG>WINDOW</STRONG> and <STRONG>SCREEN</STRONG> parameters, and call a
-       user-supplied function, passing it a <EM>data</EM> parameter, and returning  the
-       value from the user-supplied function to the application.
 
+</PRE><H3><a name="h3-Usage">Usage</a></H3><PRE>
+       All  <EM>ncurses</EM>  library  functions  assume that the locale is not altered
+       during operation.  In addition, they use data that is maintained within
+       a hierarchy of scopes.
 
-</PRE><H3><a name="h3-USAGE">USAGE</a></H3><PRE>
-       All  of  the  ncurses  library  functions assume that the locale is not
-       altered  during  operation.   In  addition,  they  use  data  which  is
-       maintained within a hierarchy of scopes.
+       <STRONG>o</STRONG>   global data used in the low-level <EM>terminfo</EM> or <EM>termcap</EM> interfaces
 
-          <STRONG>o</STRONG>   global  data,  e.g.,  used  in the low-level terminfo or termcap
-              interfaces.
+       <STRONG>o</STRONG>   terminal data associated with a call to <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>
 
-          <STRONG>o</STRONG>   terminal data, e.g., associated with a call to <STRONG>set_curterm</STRONG>.  The
-              terminal data are initialized when screens are created.
+           Terminal data are initialized when screens are created.
 
-          <STRONG>o</STRONG>   screen data, e.g., associated with a call to <STRONG>newterm</STRONG> or <STRONG>initscr</STRONG>.
+       <STRONG>o</STRONG>   screen data associated with a call to <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>
 
-          <STRONG>o</STRONG>   window  data,  e.g., associated with a call to <STRONG>newwin</STRONG> or <STRONG>subwin</STRONG>.
-              Windows are associated with screens.  Pads are  not  necessarily
-              associated with a particular screen.
+       <STRONG>o</STRONG>   window data associated with a call to <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG> or <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG>
 
-              Most curses applications operate on one or more windows within a
-              single screen.
+           Windows  are  associated  with  screens.   Pads are not necessarily
+           associated with any particular screen.
 
-          <STRONG>o</STRONG>   reentrant, i.e., it uses only the data passed as parameters.
+           Most <EM>curses</EM> applications operate on one or more  windows  within  a
+           single screen.
 
-       This table lists the scope of data used for each symbol in the  ncurses
-       library when it is configured to support threading:
+       <STRONG>o</STRONG>   reentrant  data  associated  with  "pure"  functions  that alter no
+           shared variables
 
-            Symbol                  Scope
+       The following table lists the scope  of  each  symbol  in  the  <EM>ncurses</EM>
+       library when configured to support multi-threaded applications.
+
+            <STRONG>Symbol</STRONG>                  <STRONG>Scope</STRONG>
             -------------------------------------------------------------
-            BC                      global
-            COLORS                  screen (readonly)
-            COLOR_PAIR              reentrant
-            COLOR_PAIRS             screen (readonly)
-            COLS                    screen (readonly)
-            ESCDELAY                screen (readonly, see <STRONG>set_escdelay</STRONG>)
-            LINES                   screen (readonly)
-            PAIR_NUMBER             reentrant
-            PC                      global
-            SP                      global
-            TABSIZE                 screen (readonly)
-            UP                      global
-            acs_map                 screen (readonly)
-            add_wch                 window (stdscr)
-            add_wchnstr             window (stdscr)
-            add_wchstr              window (stdscr)
-            addch                   window (stdscr)
-            addchnstr               window (stdscr)
-            addchstr                window (stdscr)
-            addnstr                 window (stdscr)
-            addnwstr                window (stdscr)
-            addstr                  window (stdscr)
-            addwstr                 window (stdscr)
-            assume_default_colors   screen
-            attr_get                window (stdscr)
-            attr_off                window (stdscr)
-            attr_on                 window (stdscr)
-            attr_set                window (stdscr)
-            attroff                 window (stdscr)
-            attron                  window (stdscr)
-            attrset                 window (stdscr)
-            baudrate                screen
-            beep                    screen
-            bkgd                    window (stdscr)
-            bkgdset                 window (stdscr)
-            bkgrnd                  window (stdscr)
-            bkgrndset               window (stdscr)
-            boolcodes               global (readonly)
-            boolfnames              global (readonly)
-            boolnames               global (readonly)
-            border                  window (stdscr)
-            border_set              window (stdscr)
-            box                     window (stdscr)
-            box_set                 window (stdscr)
-            can_change_color        terminal
-            cbreak                  screen
-            chgat                   window (stdscr)
-            clear                   window (stdscr)
-            clearok                 window
-
-            clrtobot                window (stdscr)
-            clrtoeol                window (stdscr)
-            color_content           screen
-            color_set               window (stdscr)
-            copywin                 window locks(source, target)
-            cur_term                terminal
-            curs_set                screen
-            curscr                  screen (readonly)
-            curses_version          global (readonly)
-            def_prog_mode           terminal
-            def_shell_mode          terminal
-            define_key              screen
-            del_curterm             screen
-            delay_output            screen
-            delch                   window (stdscr)
-            deleteln                window (stdscr)
-            delscreen               global locks(screenlist, screen)
-            delwin                  global locks(windowlist)
-            derwin                  screen
-            doupdate                screen
-            dupwin                  screen locks(window)
-            echo                    screen
-            echo_wchar              window (stdscr)
-            echochar                window (stdscr)
-            endwin                  screen
-            erase                   window (stdscr)
-            erasechar               window (stdscr)
-            erasewchar              window (stdscr)
-            filter                  global
-            flash                   terminal
-            flushinp                screen
-            get_wch                 screen (input-operation)
-            get_wstr                screen (input-operation)
-            getattrs                window
-            getbegx                 window
-            getbegy                 window
-            getbkgd                 window
-            getbkgrnd               window
-            getcchar                reentrant
-            getch                   screen (input-operation)
-            getcurx                 window
-            getcury                 window
-            getmaxx                 window
-            getmaxy                 window
-            getmouse                screen (input-operation)
-            getn_wstr               screen (input-operation)
-            getnstr                 screen (input-operation)
-            getparx                 window
-            getpary                 window
-            getstr                  screen (input-operation)
-            getwin                  screen (input-operation)
-            halfdelay               screen
-            has_colors              terminal
-            has_ic                  terminal
-            has_il                  terminal
-            has_key                 screen
-            hline                   window (stdscr)
-            hline_set               window (stdscr)
-            idcok                   window
-            idlok                   window
-            immedok                 window
-            in_wch                  window (stdscr)
-            in_wchnstr              window (stdscr)
-            in_wchstr               window (stdscr)
-            inch                    window (stdscr)
-
-            inchnstr                window (stdscr)
-            inchstr                 window (stdscr)
-            init_color              screen
-            init_pair               screen
-            initscr                 global locks(screenlist)
-            innstr                  window (stdscr)
-            innwstr                 window (stdscr)
-            ins_nwstr               window (stdscr)
-            ins_wch                 window (stdscr)
-            ins_wstr                window (stdscr)
-            insch                   window (stdscr)
-            insdelln                window (stdscr)
-            insertln                window (stdscr)
-            insnstr                 window (stdscr)
-            insstr                  window (stdscr)
-            instr                   window (stdscr)
-            intrflush               terminal
-            inwstr                  window (stdscr)
-            is_cleared              window
-            is_idcok                window
-            is_idlok                window
-            is_immedok              window
-            is_keypad               window
-            is_leaveok              window
-            is_linetouched          window
-            is_nodelay              window
-            is_notimeout            window
-            is_scrollok             window
-            is_syncok               window
-            is_term_resized         terminal
-            is_wintouched           window
-            isendwin                screen
-            key_defined             screen
-            key_name                global (static data)
-            keybound                screen
-            keyname                 global (static data)
-            keyok                   screen
-            keypad                  window
-            killchar                terminal
-            killwchar               terminal
-            leaveok                 window
-            longname                screen
-            mcprint                 terminal
-            meta                    screen
-            mouse_trafo             window (stdscr)
-            mouseinterval           screen
-            mousemask               screen
-            move                    window (stdscr)
-            mvadd_wch               window (stdscr)
-            mvadd_wchnstr           window (stdscr)
-            mvadd_wchstr            window (stdscr)
-            mvaddch                 window (stdscr)
-            mvaddchnstr             window (stdscr)
-            mvaddchstr              window (stdscr)
-            mvaddnstr               window (stdscr)
-            mvaddnwstr              window (stdscr)
-            mvaddstr                window (stdscr)
-            mvaddwstr               window (stdscr)
-            mvchgat                 window (stdscr)
-            mvcur                   screen
-            mvdelch                 window (stdscr)
-            mvderwin                window (stdscr)
-            mvget_wch               screen (input-operation)
-            mvget_wstr              screen (input-operation)
-            mvgetch                 screen (input-operation)
-
-            mvgetn_wstr             screen (input-operation)
-            mvgetnstr               screen (input-operation)
-            mvgetstr                screen (input-operation)
-            mvhline                 window (stdscr)
-            mvhline_set             window (stdscr)
-            mvin_wch                window (stdscr)
-            mvin_wchnstr            window (stdscr)
-            mvin_wchstr             window (stdscr)
-            mvinch                  window (stdscr)
-            mvinchnstr              window (stdscr)
-            mvinchstr               window (stdscr)
-            mvinnstr                window (stdscr)
-            mvinnwstr               window (stdscr)
-            mvins_nwstr             window (stdscr)
-            mvins_wch               window (stdscr)
-            mvins_wstr              window (stdscr)
-            mvinsch                 window (stdscr)
-            mvinsnstr               window (stdscr)
-            mvinsstr                window (stdscr)
-            mvinstr                 window (stdscr)
-            mvinwstr                window (stdscr)
-            mvprintw                window (stdscr)
-            mvscanw                 screen
-            mvvline                 window (stdscr)
-            mvvline_set             window (stdscr)
-            mvwadd_wch              window
-            mvwadd_wchnstr          window
-            mvwadd_wchstr           window
-            mvwaddch                window
-            mvwaddchnstr            window
-            mvwaddchstr             window
-            mvwaddnstr              window
-            mvwaddnwstr             window
-            mvwaddstr               window
-            mvwaddwstr              window
-            mvwchgat                window
-            mvwdelch                window
-            mvwget_wch              screen (input-operation)
-            mvwget_wstr             screen (input-operation)
-            mvwgetch                screen (input-operation)
-            mvwgetn_wstr            screen (input-operation)
-            mvwgetnstr              screen (input-operation)
-            mvwgetstr               screen (input-operation)
-            mvwhline                window
-            mvwhline_set            window
-            mvwin                   window
-            mvwin_wch               window
-            mvwin_wchnstr           window
-            mvwin_wchstr            window
-            mvwinch                 window
-            mvwinchnstr             window
-            mvwinchstr              window
-            mvwinnstr               window
-            mvwinnwstr              window
-            mvwins_nwstr            window
-            mvwins_wch              window
-            mvwins_wstr             window
-            mvwinsch                window
-            mvwinsnstr              window
-            mvwinsstr               window
-            mvwinstr                window
-            mvwinwstr               window
-            mvwprintw               window
-            mvwscanw                screen
-            mvwvline                window
-
-            mvwvline_set            window
-            napms                   reentrant
-            newpad                  global locks(windowlist)
-            newscr                  screen (readonly)
-            newterm                 global locks(screenlist)
-            newwin                  global locks(windowlist)
-            nl                      screen
-            nocbreak                screen
-            nodelay                 window
-            noecho                  screen
-            nofilter                global
-            nonl                    screen
-            noqiflush               terminal
-            noraw                   screen
-            notimeout               window
-            numcodes                global (readonly)
-            numfnames               global (readonly)
-            numnames                global (readonly)
-            ospeed                  global
-            overlay                 window locks(source, target)
-            overwrite               window locks(source, target)
-            pair_content            screen
-            pecho_wchar             screen
-            pechochar               screen
-            pnoutrefresh            screen
-            prefresh                screen
-            printw                  window
-            putp                    global
-            putwin                  window
-            qiflush                 terminal
-            raw                     screen
-            redrawwin               window
-            refresh                 screen
-            reset_prog_mode         screen
-            reset_shell_mode        screen
-            resetty                 terminal
-            resize_term             screen locks(windowlist)
-            resizeterm              screen
-            restartterm             screen
-            ripoffline              global (static data)
-            savetty                 terminal
-            scanw                   screen
-            scr_dump                screen
-            scr_init                screen
-            scr_restore             screen
-            scr_set                 screen
-            scrl                    window (stdscr)
-            scroll                  window
-            scrollok                window
-            set_curterm             screen
-            set_escdelay            screen
-            set_tabsize             screen
-            set_term                global locks(screenlist, screen)
-            setcchar                reentrant
-            setscrreg               window (stdscr)
-            setupterm               global
-            slk_attr                screen
-            slk_attr_off            screen
-            slk_attr_on             screen
-            slk_attr_set            screen
-            slk_attroff             screen
-            slk_attron              screen
-            slk_attrset             screen
-            slk_clear               screen
-            slk_color               screen
-
-            slk_init                screen
-            slk_label               screen
-            slk_noutrefresh         screen
-            slk_refresh             screen
-            slk_restore             screen
-            slk_set                 screen
-            slk_touch               screen
-            slk_wset                screen
-            standend                window
-            standout                window
-            start_color             screen
-            stdscr                  screen (readonly)
-            strcodes                global (readonly)
-            strfnames               global (readonly)
-            strnames                global (readonly)
-            subpad                  window
-            subwin                  window
-            syncok                  window
-            term_attrs              screen
-            termattrs               screen
-            termname                terminal
-            tgetent                 global
-            tgetflag                global
-            tgetnum                 global
-            tgetstr                 global
-            tgoto                   global
-            tigetflag               terminal
-            tigetnum                terminal
-            tigetstr                terminal
-            timeout                 window (stdscr)
-            touchline               window
-            touchwin                window
-            tparm                   global (static data)
-            tputs                   screen
-            trace                   global (static data)
-            ttytype                 screen (readonly)
-            typeahead               screen
-            unctrl                  screen
-            unget_wch               screen (input-operation)
-            ungetch                 screen (input-operation)
-            ungetmouse              screen (input-operation)
-            untouchwin              window
-            use_default_colors      screen
-            use_env                 global (static data)
-            use_extended_names      global (static data)
-            use_legacy_coding       screen
-            use_screen              global locks(screenlist, screen)
-            use_window              global locks(windowlist, window)
-            vid_attr                screen
-            vid_puts                screen
-            vidattr                 screen
-            vidputs                 screen
-            vline                   window (stdscr)
-            vline_set               window (stdscr)
-            vw_printw               window
-            vw_scanw                screen
-            vwprintw                window
-            vwscanw                 screen
-            wadd_wch                window
-            wadd_wchnstr            window
-            wadd_wchstr             window
-            waddch                  window
-            waddchnstr              window
-            waddchstr               window
-            waddnstr                window
-
-            waddnwstr               window
-            waddstr                 window
-            waddwstr                window
-            wattr_get               window
-            wattr_off               window
-            wattr_on                window
-            wattr_set               window
-            wattroff                window
-            wattron                 window
-            wattrset                window
-            wbkgd                   window
-            wbkgdset                window
-            wbkgrnd                 window
-            wbkgrndset              window
-            wborder                 window
-            wborder_set             window
-            wchgat                  window
-            wclear                  window
-            wclrtobot               window
-            wclrtoeol               window
-            wcolor_set              window
-            wcursyncup              screen (affects window plus parents)
-            wdelch                  window
-            wdeleteln               window
-            wecho_wchar             window
-            wechochar               window
-            wenclose                window
-            werase                  window
-            wget_wch                screen (input-operation)
-            wget_wstr               screen (input-operation)
-            wgetbkgrnd              window
-            wgetch                  screen (input-operation)
-            wgetdelay               window
-            wgetn_wstr              screen (input-operation)
-            wgetnstr                screen (input-operation)
-            wgetparent              window
-            wgetscrreg              window
-            wgetstr                 screen (input-operation)
-            whline                  window
-            whline_set              window
-            win_wch                 window
-            win_wchnstr             window
-            win_wchstr              window
-            winch                   window
-            winchnstr               window
-            winchstr                window
-            winnstr                 window
-            winnwstr                window
-            wins_nwstr              window
-            wins_wch                window
-            wins_wstr               window
-            winsch                  window
-            winsdelln               window
-            winsertln               window
-            winsnstr                window
-            winsstr                 window
-            winstr                  window
-            winwstr                 window
-            wmouse_trafo            window
-            wmove                   window
-            wnoutrefresh            screen
-            wprintw                 window
-            wredrawln               window
-            wrefresh                screen
-            wresize                 window locks(windowlist)
-
-            wscanw                  screen
-            wscrl                   window
-            wsetscrreg              window
-            wstandend               window
-            wstandout               window
-            wsyncdown               screen (affects window plus parents)
-            wsyncup                 screen (affects window plus parents)
-            wtimeout                window
-            wtouchln                window
-            wunctrl                 global (static data)
-            wvline                  window
-            wvline_set              window
+            <STRONG>BC</STRONG>                      global
+            <STRONG>COLORS</STRONG>                  screen (read-only)
+            <STRONG>COLOR_PAIR</STRONG>              reentrant
+            <STRONG>COLOR_PAIRS</STRONG>             screen (read-only)
+            <STRONG>COLS</STRONG>                    screen (read-only)
+            <STRONG>ESCDELAY</STRONG>                screen (read-only; see <STRONG>set_escdelay</STRONG>)
+            <STRONG>LINES</STRONG>                   screen (read-only)
+            <STRONG>PAIR_NUMBER</STRONG>             reentrant
+            <STRONG>PC</STRONG>                      global
+            <STRONG>SP</STRONG>                      global
+            <STRONG>TABSIZE</STRONG>                 screen (read-only; see <STRONG>set_tabsize</STRONG>)
+            <STRONG>UP</STRONG>                      global
+            <STRONG>acs_map</STRONG>                 screen (read-only)
+            <STRONG>add_wch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>add_wchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>add_wchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>addch</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>addchnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>addchstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>addnstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>addnwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>addstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>addwstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>assume_default_colors</STRONG>   screen
+            <STRONG>attr_get</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>attr_off</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>attr_on</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>attr_set</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>attroff</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>attron</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>attrset</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>baudrate</STRONG>                screen
+            <STRONG>beep</STRONG>                    screen
+            <STRONG>bkgd</STRONG>                    window (<STRONG>stdscr</STRONG>)
+            <STRONG>bkgdset</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>bkgrnd</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>bkgrndset</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>boolcodes</STRONG>               global (read-only)
+            <STRONG>boolfnames</STRONG>              global (read-only)
+            <STRONG>boolnames</STRONG>               global (read-only)
+            <STRONG>border</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>border_set</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>box</STRONG>                     window (<STRONG>stdscr</STRONG>)
+            <STRONG>box_set</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>can_change_color</STRONG>        terminal
+            <STRONG>cbreak</STRONG>                  screen
+
+            <STRONG>chgat</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>clear</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>clearok</STRONG>                 window
+            <STRONG>clrtobot</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>clrtoeol</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>color_content</STRONG>           screen
+            <STRONG>color_set</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>copywin</STRONG>                 window (locks source, target)
+            <STRONG>cur_term</STRONG>                terminal
+            <STRONG>curs_set</STRONG>                screen
+            <STRONG>curscr</STRONG>                  screen (read-only)
+            <STRONG>curses_version</STRONG>          global (read-only)
+            <STRONG>def_prog_mode</STRONG>           terminal
+            <STRONG>def_shell_mode</STRONG>          terminal
+            <STRONG>define_key</STRONG>              screen
+            <STRONG>del_curterm</STRONG>             screen
+            <STRONG>delay_output</STRONG>            screen
+            <STRONG>delch</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>deleteln</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>delscreen</STRONG>               global (locks screen list, screen)
+            <STRONG>delwin</STRONG>                  global (locks window list)
+            <STRONG>derwin</STRONG>                  screen
+            <STRONG>doupdate</STRONG>                screen
+            <STRONG>dupwin</STRONG>                  screen (locks window)
+            <STRONG>echo</STRONG>                    screen
+            <STRONG>echo_wchar</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>echochar</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>endwin</STRONG>                  screen
+            <STRONG>erase</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>erasechar</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>erasewchar</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>filter</STRONG>                  global
+            <STRONG>flash</STRONG>                   terminal
+            <STRONG>flushinp</STRONG>                screen
+            <STRONG>get_wch</STRONG>                 screen (input operation)
+            <STRONG>get_wstr</STRONG>                screen (input operation)
+            <STRONG>getattrs</STRONG>                window
+            <STRONG>getbegx</STRONG>                 window
+            <STRONG>getbegy</STRONG>                 window
+            <STRONG>getbkgd</STRONG>                 window
+            <STRONG>getbkgrnd</STRONG>               window
+            <STRONG>getcchar</STRONG>                reentrant
+            <STRONG>getch</STRONG>                   screen (input operation)
+            <STRONG>getcurx</STRONG>                 window
+            <STRONG>getcury</STRONG>                 window
+            <STRONG>getmaxx</STRONG>                 window
+            <STRONG>getmaxy</STRONG>                 window
+            <STRONG>getmouse</STRONG>                screen (input operation)
+            <STRONG>getn_wstr</STRONG>               screen (input operation)
+            <STRONG>getnstr</STRONG>                 screen (input operation)
+            <STRONG>getparx</STRONG>                 window
+            <STRONG>getpary</STRONG>                 window
+            <STRONG>getstr</STRONG>                  screen (input operation)
+            <STRONG>getwin</STRONG>                  screen (input operation)
+            <STRONG>halfdelay</STRONG>               screen
+            <STRONG>has_colors</STRONG>              terminal
+            <STRONG>has_ic</STRONG>                  terminal
+            <STRONG>has_il</STRONG>                  terminal
+            <STRONG>has_key</STRONG>                 screen
+            <STRONG>hline</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>hline_set</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>idcok</STRONG>                   window
+            <STRONG>idlok</STRONG>                   window
+            <STRONG>immedok</STRONG>                 window
+            <STRONG>in_wch</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>in_wchnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+
+            <STRONG>in_wchstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>inch</STRONG>                    window (<STRONG>stdscr</STRONG>)
+            <STRONG>inchnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>inchstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>init_color</STRONG>              screen
+            <STRONG>init_pair</STRONG>               screen
+            <STRONG>initscr</STRONG>                 global (locks screen list)
+            <STRONG>innstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>innwstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>ins_nwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>ins_wch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>ins_wstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>insch</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>insdelln</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>insertln</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>insnstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>insstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>instr</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>intrflush</STRONG>               terminal
+            <STRONG>inwstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>is_cleared</STRONG>              window
+            <STRONG>is_idcok</STRONG>                window
+            <STRONG>is_idlok</STRONG>                window
+            <STRONG>is_immedok</STRONG>              window
+            <STRONG>is_keypad</STRONG>               window
+            <STRONG>is_leaveok</STRONG>              window
+            <STRONG>is_linetouched</STRONG>          window
+            <STRONG>is_nodelay</STRONG>              window
+            <STRONG>is_notimeout</STRONG>            window
+            <STRONG>is_scrollok</STRONG>             window
+            <STRONG>is_syncok</STRONG>               window
+            <STRONG>is_term_resized</STRONG>         terminal
+            <STRONG>is_wintouched</STRONG>           window
+            <STRONG>isendwin</STRONG>                screen
+            <STRONG>key_defined</STRONG>             screen
+            <STRONG>key_name</STRONG>                global (static data)
+            <STRONG>keybound</STRONG>                screen
+            <STRONG>keyname</STRONG>                 global (static data)
+            <STRONG>keyok</STRONG>                   screen
+            <STRONG>keypad</STRONG>                  window
+            <STRONG>killchar</STRONG>                terminal
+            <STRONG>killwchar</STRONG>               terminal
+            <STRONG>leaveok</STRONG>                 window
+            <STRONG>longname</STRONG>                screen
+            <STRONG>mcprint</STRONG>                 terminal
+            <STRONG>meta</STRONG>                    screen
+            <STRONG>mouse_trafo</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mouseinterval</STRONG>           screen
+            <STRONG>mousemask</STRONG>               screen
+            <STRONG>move</STRONG>                    window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvadd_wch</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvadd_wchnstr</STRONG>           window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvadd_wchstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddnwstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvaddwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvchgat</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvcur</STRONG>                   screen
+            <STRONG>mvdelch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvderwin</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvget_wch</STRONG>               screen (input operation)
+            <STRONG>mvget_wstr</STRONG>              screen (input operation)
+
+            <STRONG>mvgetch</STRONG>                 screen (input operation)
+            <STRONG>mvgetn_wstr</STRONG>             screen (input operation)
+            <STRONG>mvgetnstr</STRONG>               screen (input operation)
+            <STRONG>mvgetstr</STRONG>                screen (input operation)
+            <STRONG>mvhline</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvhline_set</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvin_wch</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvin_wchnstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvin_wchstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinch</STRONG>                  window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinchnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinchstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinnwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvins_nwstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvins_wch</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvins_wstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinsch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinsnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinsstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvinwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvprintw</STRONG>                window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvscanw</STRONG>                 screen
+            <STRONG>mvvline</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvvline_set</STRONG>             window (<STRONG>stdscr</STRONG>)
+            <STRONG>mvwadd_wch</STRONG>              window
+            <STRONG>mvwadd_wchnstr</STRONG>          window
+            <STRONG>mvwadd_wchstr</STRONG>           window
+            <STRONG>mvwaddch</STRONG>                window
+            <STRONG>mvwaddchnstr</STRONG>            window
+            <STRONG>mvwaddchstr</STRONG>             window
+            <STRONG>mvwaddnstr</STRONG>              window
+            <STRONG>mvwaddnwstr</STRONG>             window
+            <STRONG>mvwaddstr</STRONG>               window
+            <STRONG>mvwaddwstr</STRONG>              window
+            <STRONG>mvwchgat</STRONG>                window
+            <STRONG>mvwdelch</STRONG>                window
+            <STRONG>mvwget_wch</STRONG>              screen (input operation)
+            <STRONG>mvwget_wstr</STRONG>             screen (input operation)
+            <STRONG>mvwgetch</STRONG>                screen (input operation)
+            <STRONG>mvwgetn_wstr</STRONG>            screen (input operation)
+            <STRONG>mvwgetnstr</STRONG>              screen (input operation)
+            <STRONG>mvwgetstr</STRONG>               screen (input operation)
+            <STRONG>mvwhline</STRONG>                window
+            <STRONG>mvwhline_set</STRONG>            window
+            <STRONG>mvwin</STRONG>                   window
+            <STRONG>mvwin_wch</STRONG>               window
+            <STRONG>mvwin_wchnstr</STRONG>           window
+            <STRONG>mvwin_wchstr</STRONG>            window
+            <STRONG>mvwinch</STRONG>                 window
+            <STRONG>mvwinchnstr</STRONG>             window
+            <STRONG>mvwinchstr</STRONG>              window
+            <STRONG>mvwinnstr</STRONG>               window
+            <STRONG>mvwinnwstr</STRONG>              window
+            <STRONG>mvwins_nwstr</STRONG>            window
+            <STRONG>mvwins_wch</STRONG>              window
+            <STRONG>mvwins_wstr</STRONG>             window
+            <STRONG>mvwinsch</STRONG>                window
+            <STRONG>mvwinsnstr</STRONG>              window
+            <STRONG>mvwinsstr</STRONG>               window
+            <STRONG>mvwinstr</STRONG>                window
+            <STRONG>mvwinwstr</STRONG>               window
+            <STRONG>mvwprintw</STRONG>               window
+            <STRONG>mvwscanw</STRONG>                screen
+            <STRONG>mvwvline</STRONG>                window
+
+            <STRONG>mvwvline_set</STRONG>            window
+            <STRONG>napms</STRONG>                   reentrant
+            <STRONG>newpad</STRONG>                  global (locks window list)
+            <STRONG>newscr</STRONG>                  screen (read-only)
+            <STRONG>newterm</STRONG>                 global (locks screen list)
+            <STRONG>newwin</STRONG>                  global (locks window list)
+            <STRONG>nl</STRONG>                      screen
+            <STRONG>nocbreak</STRONG>                screen
+            <STRONG>nodelay</STRONG>                 window
+            <STRONG>noecho</STRONG>                  screen
+            <STRONG>nofilter</STRONG>                global
+            <STRONG>nonl</STRONG>                    screen
+            <STRONG>noqiflush</STRONG>               terminal
+            <STRONG>noraw</STRONG>                   screen
+            <STRONG>notimeout</STRONG>               window
+            <STRONG>numcodes</STRONG>                global (read-only)
+            <STRONG>numfnames</STRONG>               global (read-only)
+            <STRONG>numnames</STRONG>                global (read-only)
+            <STRONG>ospeed</STRONG>                  global
+            <STRONG>overlay</STRONG>                 window (locks source, target)
+            <STRONG>overwrite</STRONG>               window (locks source, target)
+            <STRONG>pair_content</STRONG>            screen
+            <STRONG>pecho_wchar</STRONG>             screen
+            <STRONG>pechochar</STRONG>               screen
+            <STRONG>pnoutrefresh</STRONG>            screen
+            <STRONG>prefresh</STRONG>                screen
+            <STRONG>printw</STRONG>                  window
+            <STRONG>putp</STRONG>                    global
+            <STRONG>putwin</STRONG>                  window
+            <STRONG>qiflush</STRONG>                 terminal
+            <STRONG>raw</STRONG>                     screen
+            <STRONG>redrawwin</STRONG>               window
+            <STRONG>refresh</STRONG>                 screen
+            <STRONG>reset_prog_mode</STRONG>         screen
+            <STRONG>reset_shell_mode</STRONG>        screen
+            <STRONG>resetty</STRONG>                 terminal
+            <STRONG>resize_term</STRONG>             screen (locks window list)
+            <STRONG>resizeterm</STRONG>              screen
+            <STRONG>restartterm</STRONG>             screen
+            <STRONG>ripoffline</STRONG>              global (static data)
+            <STRONG>savetty</STRONG>                 terminal
+            <STRONG>scanw</STRONG>                   screen
+            <STRONG>scr_dump</STRONG>                screen
+            <STRONG>scr_init</STRONG>                screen
+            <STRONG>scr_restore</STRONG>             screen
+            <STRONG>scr_set</STRONG>                 screen
+            <STRONG>scrl</STRONG>                    window (<STRONG>stdscr</STRONG>)
+            <STRONG>scroll</STRONG>                  window
+            <STRONG>scrollok</STRONG>                window
+            <STRONG>set_curterm</STRONG>             screen
+            <STRONG>set_escdelay</STRONG>            screen
+            <STRONG>set_tabsize</STRONG>             screen
+            <STRONG>set_term</STRONG>                global (locks screen list, screen)
+            <STRONG>setcchar</STRONG>                reentrant
+            <STRONG>setscrreg</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>setupterm</STRONG>               global
+            <STRONG>slk_attr</STRONG>                screen
+            <STRONG>slk_attr_off</STRONG>            screen
+            <STRONG>slk_attr_on</STRONG>             screen
+            <STRONG>slk_attr_set</STRONG>            screen
+            <STRONG>slk_attroff</STRONG>             screen
+            <STRONG>slk_attron</STRONG>              screen
+            <STRONG>slk_attrset</STRONG>             screen
+            <STRONG>slk_clear</STRONG>               screen
+            <STRONG>slk_color</STRONG>               screen
+            <STRONG>slk_init</STRONG>                screen
+
+            <STRONG>slk_label</STRONG>               screen
+            <STRONG>slk_noutrefresh</STRONG>         screen
+            <STRONG>slk_refresh</STRONG>             screen
+            <STRONG>slk_restore</STRONG>             screen
+            <STRONG>slk_set</STRONG>                 screen
+            <STRONG>slk_touch</STRONG>               screen
+            <STRONG>slk_wset</STRONG>                screen
+            <STRONG>standend</STRONG>                window
+            <STRONG>standout</STRONG>                window
+            <STRONG>start_color</STRONG>             screen
+            <STRONG>stdscr</STRONG>                  screen (read-only)
+            <STRONG>strcodes</STRONG>                global (read-only)
+            <STRONG>strfnames</STRONG>               global (read-only)
+            <STRONG>strnames</STRONG>                global (read-only)
+            <STRONG>subpad</STRONG>                  window
+            <STRONG>subwin</STRONG>                  window
+            <STRONG>syncok</STRONG>                  window
+            <STRONG>term_attrs</STRONG>              screen
+            <STRONG>termattrs</STRONG>               screen
+            <STRONG>termname</STRONG>                terminal
+            <STRONG>tgetent</STRONG>                 global
+            <STRONG>tgetflag</STRONG>                global
+            <STRONG>tgetnum</STRONG>                 global
+            <STRONG>tgetstr</STRONG>                 global
+            <STRONG>tgoto</STRONG>                   global
+            <STRONG>tigetflag</STRONG>               terminal
+            <STRONG>tigetnum</STRONG>                terminal
+            <STRONG>tigetstr</STRONG>                terminal
+            <STRONG>timeout</STRONG>                 window (<STRONG>stdscr</STRONG>)
+            <STRONG>touchline</STRONG>               window
+            <STRONG>touchwin</STRONG>                window
+            <STRONG>tparm</STRONG>                   global (static data)
+            <STRONG>tputs</STRONG>                   screen
+            <STRONG>trace</STRONG>                   global (static data)
+            <STRONG>ttytype</STRONG>                 screen (read-only)
+            <STRONG>typeahead</STRONG>               screen
+            <STRONG>unctrl</STRONG>                  screen
+            <STRONG>unget_wch</STRONG>               screen (input operation)
+            <STRONG>ungetch</STRONG>                 screen (input operation)
+            <STRONG>ungetmouse</STRONG>              screen (input operation)
+            <STRONG>untouchwin</STRONG>              window
+            <STRONG>use_default_colors</STRONG>      screen
+            <STRONG>use_env</STRONG>                 global (static data)
+            <STRONG>use_extended_names</STRONG>      global (static data)
+            <STRONG>use_legacy_coding</STRONG>       screen
+            <STRONG>use_screen</STRONG>              global (locks screen list, screen)
+            <STRONG>use_window</STRONG>              global (locks window list, window)
+            <STRONG>vid_attr</STRONG>                screen
+            <STRONG>vid_puts</STRONG>                screen
+            <STRONG>vidattr</STRONG>                 screen
+            <STRONG>vidputs</STRONG>                 screen
+            <STRONG>vline</STRONG>                   window (<STRONG>stdscr</STRONG>)
+            <STRONG>vline_set</STRONG>               window (<STRONG>stdscr</STRONG>)
+            <STRONG>vw_printw</STRONG>               window
+            <STRONG>vw_scanw</STRONG>                screen
+            <STRONG>vwprintw</STRONG>                window
+            <STRONG>vwscanw</STRONG>                 screen
+            <STRONG>wadd_wch</STRONG>                window
+            <STRONG>wadd_wchnstr</STRONG>            window
+            <STRONG>wadd_wchstr</STRONG>             window
+            <STRONG>waddch</STRONG>                  window
+            <STRONG>waddchnstr</STRONG>              window
+            <STRONG>waddchstr</STRONG>               window
+            <STRONG>waddnstr</STRONG>                window
+            <STRONG>waddnwstr</STRONG>               window
+            <STRONG>waddstr</STRONG>                 window
+
+            <STRONG>waddwstr</STRONG>                window
+            <STRONG>wattr_get</STRONG>               window
+            <STRONG>wattr_off</STRONG>               window
+            <STRONG>wattr_on</STRONG>                window
+            <STRONG>wattr_set</STRONG>               window
+            <STRONG>wattroff</STRONG>                window
+            <STRONG>wattron</STRONG>                 window
+            <STRONG>wattrset</STRONG>                window
+            <STRONG>wbkgd</STRONG>                   window
+            <STRONG>wbkgdset</STRONG>                window
+            <STRONG>wbkgrnd</STRONG>                 window
+            <STRONG>wbkgrndset</STRONG>              window
+            <STRONG>wborder</STRONG>                 window
+            <STRONG>wborder_set</STRONG>             window
+            <STRONG>wchgat</STRONG>                  window
+            <STRONG>wclear</STRONG>                  window
+            <STRONG>wclrtobot</STRONG>               window
+            <STRONG>wclrtoeol</STRONG>               window
+            <STRONG>wcolor_set</STRONG>              window
+            <STRONG>wcursyncup</STRONG>              screen (affects window plus parents)
+            <STRONG>wdelch</STRONG>                  window
+            <STRONG>wdeleteln</STRONG>               window
+            <STRONG>wecho_wchar</STRONG>             window
+            <STRONG>wechochar</STRONG>               window
+            <STRONG>wenclose</STRONG>                window
+            <STRONG>werase</STRONG>                  window
+            <STRONG>wget_wch</STRONG>                screen (input operation)
+            <STRONG>wget_wstr</STRONG>               screen (input operation)
+            <STRONG>wgetbkgrnd</STRONG>              window
+            <STRONG>wgetch</STRONG>                  screen (input operation)
+            <STRONG>wgetdelay</STRONG>               window
+            <STRONG>wgetn_wstr</STRONG>              screen (input operation)
+            <STRONG>wgetnstr</STRONG>                screen (input operation)
+            <STRONG>wgetparent</STRONG>              window
+            <STRONG>wgetscrreg</STRONG>              window
+            <STRONG>wgetstr</STRONG>                 screen (input operation)
+            <STRONG>whline</STRONG>                  window
+            <STRONG>whline_set</STRONG>              window
+            <STRONG>win_wch</STRONG>                 window
+            <STRONG>win_wchnstr</STRONG>             window
+            <STRONG>win_wchstr</STRONG>              window
+            <STRONG>winch</STRONG>                   window
+            <STRONG>winchnstr</STRONG>               window
+            <STRONG>winchstr</STRONG>                window
+            <STRONG>winnstr</STRONG>                 window
+            <STRONG>winnwstr</STRONG>                window
+            <STRONG>wins_nwstr</STRONG>              window
+            <STRONG>wins_wch</STRONG>                window
+            <STRONG>wins_wstr</STRONG>               window
+            <STRONG>winsch</STRONG>                  window
+            <STRONG>winsdelln</STRONG>               window
+            <STRONG>winsertln</STRONG>               window
+            <STRONG>winsnstr</STRONG>                window
+            <STRONG>winsstr</STRONG>                 window
+            <STRONG>winstr</STRONG>                  window
+            <STRONG>winwstr</STRONG>                 window
+            <STRONG>wmouse_trafo</STRONG>            window
+            <STRONG>wmove</STRONG>                   window
+            <STRONG>wnoutrefresh</STRONG>            screen
+            <STRONG>wprintw</STRONG>                 window
+            <STRONG>wredrawln</STRONG>               window
+            <STRONG>wrefresh</STRONG>                screen
+            <STRONG>wresize</STRONG>                 window (locks window list)
+            <STRONG>wscanw</STRONG>                  screen
+            <STRONG>wscrl</STRONG>                   window
+            <STRONG>wsetscrreg</STRONG>              window
+
+            <STRONG>wstandend</STRONG>               window
+            <STRONG>wstandout</STRONG>               window
+            <STRONG>wsyncdown</STRONG>               screen (affects window plus parents)
+            <STRONG>wsyncup</STRONG>                 screen (affects window plus parents)
+            <STRONG>wtimeout</STRONG>                window
+            <STRONG>wtouchln</STRONG>                window
+            <STRONG>wunctrl</STRONG>                 global (static data)
+            <STRONG>wvline</STRONG>                  window
+            <STRONG>wvline_set</STRONG>              window
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These functions all return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>, except as noted.
+       <STRONG>get_escdelay</STRONG>   returns   the   value  of  <STRONG>ESCDELAY</STRONG>.   <STRONG>set_escdelay</STRONG>  and
+       <STRONG>set_tabsize</STRONG> return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon successful  completion.
+       <STRONG>use_screen</STRONG>  and <STRONG>use_window</STRONG> return the <EM>int</EM> returned by the user-supplied
+       function they are called with.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Both a macro and a function are provided for each name.
+       <EM>ncurses</EM> provides both a C function and a preprocessor  macro  for  each
+       function documented in this page.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  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
-       NCURSES_VERSION.
+       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
+       <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-10-01                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -618,7 +627,7 @@ <H1 class="no-header">curs_threads 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-USAGE">USAGE</a></li>
+<li><a href="#h3-Usage">Usage</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index df12d719a..e4dd2c69f 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.37 2023/09/23 20:53:33 tom Exp @
+  * @Id: curs_trace.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -255,11 +255,11 @@ <H1 class="no-header">curs_trace 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 5d4166974..956e47746 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.83 2023/09/23 23:14:19 tom Exp @
+  * @Id: curs_util.3x,v 1.85 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -365,11 +365,11 @@ <H1 class="no-header">curs_util 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
-       <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>.
+       <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-23                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 1d3cf47ab..8fab98968 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_variables.3x,v 1.31 2023/10/01 22:36:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-10-01 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-10-01 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -47,13 +47,29 @@ <H1 class="no-header">curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLS</STRONG>,  <STRONG>ESCDELAY</STRONG>, <STRONG>LINES</STRONG>, <STRONG>TABSIZE</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>,
-       <STRONG>stdscr</STRONG> - <EM>curses</EM> global variables
+       <EM>bool</EM>,  <EM>chtype</EM>,  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, <EM>WINDOW</EM>, <STRONG>TRUE</STRONG>, <STRONG>FALSE</STRONG>, <STRONG>ERR</STRONG>, <STRONG>OK</STRONG>, <STRONG>COLORS</STRONG>,
+       <STRONG>COLOR_PAIRS</STRONG>, <STRONG>COLS</STRONG>, <STRONG>ESCDELAY</STRONG>, <STRONG>LINES</STRONG>, <STRONG>TABSIZE</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>,  <STRONG>stdscr</STRONG>  -
+       <EM>curses</EM> data types, constants, and global variables
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
+       <EM>/*</EM> <EM>data</EM> <EM>types</EM> <EM>*/</EM>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>bool;</STRONG>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>chtype;</STRONG>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>cchar_t;</STRONG>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>attr_t;</STRONG>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>WINDOW;</STRONG>
+
+       <EM>/*</EM> <EM>constants</EM> <EM>*/</EM>
+       <STRONG>const</STRONG> <STRONG>bool</STRONG> <STRONG>TRUE;</STRONG>
+       <STRONG>const</STRONG> <STRONG>bool</STRONG> <STRONG>FALSE;</STRONG>
+
+       <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>ERR;</STRONG>
+       <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>OK;</STRONG>
+
+       <EM>/*</EM> <EM>variables</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLORS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLS;</STRONG>
@@ -66,133 +82,180 @@ <H1 class="no-header">curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This page summarizes variables provided by the <STRONG>curses</STRONG> library.  A  more
-       complete description is given in the <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> manual page.
+       This  page  summarizes data types, constants, and variables provided by
+       the <EM>curses</EM> library.  Locate further discussion in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+
+       Depending on <EM>ncurses</EM>'s  build-time  configuration,  the  variables  may
+       instead  be  macros  (see  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>  and  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>) that
+       provide read-only access to  the  library's  state.   In  either  case,
+       applications  should  treat  them  as  read-only to avoid confusing the
+       library.
+
+
+</PRE><H3><a name="h3-bool_-TRUE_-FALSE">bool, TRUE, FALSE</a></H3><PRE>
+       X/Open Issue 4 <EM>curses</EM>  (1996)  preceded  the  ISO  C99  and  ISO  C++98
+       standards,  each of which also defined a Boolean data type.  The <EM>curses</EM>
+       library requires an integral type <EM>bool</EM> and constants <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>  to
+       store its two possible values.
+
+
+</PRE><H3><a name="h3-ERR_-OK">ERR, OK</a></H3><PRE>
+       <EM>curses</EM>  and <EM>terminfo</EM> routines frequently return these constant integral
+       values indicating failure and success, respectively.
+
 
-       Depending  on  the  configuration,  these  may  be actual variables, or
-       macros (see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> and <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>) which  provide  read-
-       only  access  to  <EM>curses</EM>'s  state.  In either case, applications should
-       treat them as read-only to avoid confusing the library.
+</PRE><H3><a name="h3-chtype">chtype</a></H3><PRE>
+       The <EM>chtype</EM> integral type combines a ("narrow",  8-bit)  character  with
+       attributes  encoding  the character's <EM>rendition</EM>, such as the styling of
+       its  typeface  and/or  foreground  and  background  colors.   See,  for
+       example, <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>, and <STRONG><A HREF="curs_inch.3x.html">inch(3x)</A></STRONG>.
+
+
+</PRE><H3><a name="h3-cchar_t_-attr_t">cchar_t, attr_t</a></H3><PRE>
+       <EM>chtype</EM>  is  too small for the standard C library's wide-character type,
+       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>.  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> is a type that can accommodate an <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  and  enough
+       wide  characters  to  store  what  Unicode  terms a <EM>grapheme</EM> <EM>cluster</EM> (a
+       "user-perceived character" [UAX #29], which  may  nevertheless  require
+       several  character encoding units to represent).  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> is an integral
+       type storing "wide"  attributes  that  apply  to  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>s.   See,  for
+       example, <STRONG><A HREF="curs_add_wch.3x.html">add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attr_on(3x)</A></STRONG>, and <STRONG><A HREF="curs_in_wch.3x.html">in_wch(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
-       After initializing curses, this variable contains the number  of  color
-       pairs  which  the  terminal  can  support.  Usually the number of color
-       pairs will be the product <STRONG>COLORS</STRONG>*<STRONG>COLORS</STRONG>, however  this  is  not  always
-       true:
+       Once  <EM>curses</EM>  is  initialized, <STRONG>COLOR_PAIRS</STRONG> contains the number of color
+       pairs supported by the terminal.   Often,  its  value  is  the  product
+       <STRONG>COLORS</STRONG> x <STRONG>COLORS</STRONG>, but this is not always true.
 
-       <STRONG>o</STRONG>   a few terminals use HLS colors, which do not follow this rule
+       <STRONG>o</STRONG>   A few terminals use HLS colors, ignoring this rule; and
 
        <STRONG>o</STRONG>   terminals  supporting  a  large number of colors are limited by the
-           number of color pairs that can be represented  in  a  <EM>signed</EM>  <EM>short</EM>
-           value.
+           number of color pairs that a <EM>signed</EM> <EM>short</EM> value can represent.
 
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
-       After  initializing curses, this variable contains the number of colors
-       which the terminal can support.
+       Once <EM>curses</EM> is  initialized,  <STRONG>COLORS</STRONG>  contains  the  number  of  colors
+       supported by the terminal.
 
 
 </PRE><H3><a name="h3-COLS">COLS</a></H3><PRE>
-       After initializing curses, this variable  contains  the  width  of  the
-       screen, i.e., the number of columns.
+       Once  <EM>curses</EM>  is  initialized,  <STRONG>COLS</STRONG>  contains  the  screen's  width in
+       character cells; that is, the number of columns.
 
 
 </PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
-       This variable holds the number of milliseconds to wait after reading an
-       escape character, to distinguish between an individual escape character
-       entered  on  the  keyboard  from  escape  sequences sent by cursor- and
-       function-keys (see <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>).
+       For <EM>curses</EM> to distinguish an escape character corresponding to a user's
+       press  of  an  "Escape"  key on the input device from one included in a
+       control sequence used by a cursor movement or function key, the library
+       waits  to  see  if another key event occurs after the escape character.
+       <STRONG>ESCDELAY</STRONG> stores this interval in milliseconds.
 
 
 </PRE><H3><a name="h3-LINES">LINES</a></H3><PRE>
-       After initializing curses, this variable contains  the  height  of  the
-       screen, i.e., the number of lines.
+       Once <EM>curses</EM> is initialized,  <STRONG>LINES</STRONG>  contains  the  screen's  height  in
+       character cells; that is, the number of lines.
 
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       This  variable  holds  the number of columns used by the <EM>curses</EM> library
-       when converting a tab character to spaces as  it  adds  the  tab  to  a
-       window (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
+       The <EM>curses</EM> library converts a tab character to this number of spaces as
+       it adds a tab to a window; see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-The-Current-Screen">The Current Screen</a></H3><PRE>
-       This  implementation  of  curses uses a special window <STRONG>curscr</STRONG> to record
-       its updates to the terminal screen.
+</PRE><H3><a name="h3-curscr">curscr</a></H3><PRE>
+       <EM>curses</EM> records updates to the terminal screen  in  a  <EM>WINDOW</EM>  structure
+       named <STRONG>curscr</STRONG>.
 
-       This is referred to as the "physical screen"  in  the  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
-       and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> manual pages.
+       This object is referred to as the "physical screen" in <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+       and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-The-New-Screen">The New Screen</a></H3><PRE>
-       This  implementation  of  curses  uses  a special window <STRONG>newscr</STRONG> to hold
-       updates to the terminal screen before applying them to <STRONG>curscr</STRONG>.
+</PRE><H3><a name="h3-newscr">newscr</a></H3><PRE>
+       <EM>ncurses</EM> collects pending updates to the terminal  screen  in  a  <EM>WINDOW</EM>
+       structure named <STRONG>newscr</STRONG>.
 
-       This is referred to as the "virtual  screen"  in  the  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> manual pages.
+       This   object   is   referred   to  as  the  "virtual  screen"  in  the
+       <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  and  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.   When  the
+       screen  is  refreshed, <EM>curses</EM> determines a minimal set of updates using
+       the terminal's capabilities to make <STRONG>curscr</STRONG> look like <STRONG>newscr</STRONG>.
 
 
-</PRE><H3><a name="h3-The-Standard-Screen">The Standard Screen</a></H3><PRE>
-       Upon  initializing curses, a default window called <STRONG>stdscr</STRONG>, which is the
-       size of the terminal screen, is created.   Many  curses  functions  use
-       this window.
+</PRE><H3><a name="h3-stdscr">stdscr</a></H3><PRE>
+       Once <EM>curses</EM> is initialized, it creates a <EM>WINDOW</EM> structure named <STRONG>stdscr</STRONG>.
+       It  is  the  same size as the terminal screen and is the default window
+       used by routines that do not take a parameter  identifying  one.   Many
+       <EM>curses</EM> functions use this window.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The   curses  library  is  initialized  using  either  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>,  or
-       <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
+       Either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> initializes <EM>curses</EM>.
 
-       If <STRONG>curses</STRONG> is configured to use separate curses/terminfo libraries, most
-       of these variables reside in the curses library.
+       If  <EM>ncurses</EM>  is  configured  to  provide  separate  <EM>curses</EM> and <EM>terminfo</EM>
+       libraries, most of these variables reside in the <EM>curses</EM> library.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       <STRONG>TABSIZE</STRONG>  is  a feature of SVr4 curses which is not documented by X/Open
-       curses.
-
-       <STRONG>o</STRONG>   In  SVr4  curses,  <STRONG>TABSIZE</STRONG>  is  initially  set  from  the  terminal
-           description's  <STRONG>init_tabs</STRONG> capability.  After that, it can be altered
-           by the applications using SVr4 curses.
-
-           SVr4 curses uses the  current  value  of  <STRONG>TABSIZE</STRONG>  to  compute  the
-           position  of  tabstops  for  updating  both the virtual screen with
-           <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> as well as the physical screen with <STRONG><A HREF="curs_terminfo.3x.html">mvcur(3x)</A></STRONG>.
-
-       <STRONG>o</STRONG>   This implementation uses the current  value  of  <STRONG>TABSIZE</STRONG>  only  for
-           updating the virtual screen.  It uses the terminal description's <STRONG>it</STRONG>
-           (<STRONG>init_tabs</STRONG>) capability for computing hardware tabs (i.e., tab stops
-           on the physical screen).
-
-       <STRONG>o</STRONG>   Other  implementations  differ.  For instance, NetBSD curses allows
-           <STRONG>TABSIZE</STRONG>  to  be  set  through  an   environment   variable.    This
-           implementation does not.
-
-           NetBSD curses does not support hardware tabs; it uses the <STRONG>init_tabs</STRONG>
-           capability and the <STRONG>TABSIZE</STRONG> variable only for updating  the  virtual
+       The X/Open Curses standard documents all of  the  foregoing  types  and
+       symbols except for <STRONG>newscr</STRONG>, <STRONG>TABSIZE</STRONG>, and <STRONG>ESCDELAY</STRONG>.
+
+       X/Open  Curses  describes  <STRONG>curscr</STRONG> only as "an internal data structure";
+       SVID  gave  more  details,  noting  its  use  "for  certain   low-level
+       operations  like  clearing  and redrawing a screen containing garbage".
+       Neither specified its interaction with the rest of the interface beyond
+       use as an argument to <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG> and <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>.
+
+       <STRONG>newscr</STRONG>  is  a feature of SVr4 <EM>curses</EM>.  When refreshing the screen, this
+       window is used as a working area  for  combining  the  standard  screen
+       <STRONG>stdscr</STRONG>  with  any  other windows which the application may have created
+       with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.  When the updated <STRONG>newscr</STRONG> is complete,  <EM>curses</EM>  updates
+       <STRONG>curscr</STRONG> to match <STRONG>newscr</STRONG>.
+
+       <STRONG>TABSIZE</STRONG> is a feature of SVr4 <EM>curses</EM>.
+
+       <STRONG>o</STRONG>   SVr4   initially  sets  <STRONG>TABSIZE</STRONG>  from  the  terminal  description's
+           <STRONG>init_tabs</STRONG>  capability.   After  that,  it   can   be   altered   by
+           applications using SVr4 <EM>curses</EM>.
+
+       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  uses  the value of <STRONG>TABSIZE</STRONG> to compute the position of
+           tab stops when updating both the virtual screen with <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>  and
+           the physical screen with <STRONG><A HREF="curs_terminfo.3x.html">mvcur(3x)</A></STRONG>.
+
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  uses  the  value  of  <STRONG>TABSIZE</STRONG>  only  to update the virtual
+           screen.   It  uses  the  terminal  description's  "<STRONG>it</STRONG>"  (<STRONG>init_tabs</STRONG>)
+           capability  for  computing hardware tabs (that is, tab stops on the
+           physical screen).
+
+       <STRONG>o</STRONG>   Other implementations differ.  For instance, NetBSD  <EM>curses</EM>  allows
+           <STRONG>TABSIZE</STRONG>  to  be  set through an environment variable.  <EM>ncurses</EM> does
+           not.
+
+           NetBSD <EM>curses</EM> does not support hardware tabs; it uses the <STRONG>init_tabs</STRONG>
+           capability  and  the <STRONG>TABSIZE</STRONG> variable only for updating the virtual
            screen.
 
-       <STRONG>ESCDELAY</STRONG> is an extension in AIX curses:
+       <STRONG>ESCDELAY</STRONG> is a feature of AIX <EM>curses</EM>.
 
-       <STRONG>o</STRONG>   In AIX, the units for <STRONG>ESCDELAY</STRONG> are <EM>fifths</EM> of a millisecond.
+       <STRONG>o</STRONG>   In AIX, the units for <STRONG>ESCDELAY</STRONG> are <EM>fifths</EM> of milliseconds.
 
-       <STRONG>o</STRONG>   The default value for AIX's <STRONG>ESCDELAY</STRONG> is 0.1 seconds.
+       <STRONG>o</STRONG>   The default value for AIX's <STRONG>ESCDELAY</STRONG> equals 0.1 seconds.
 
-       <STRONG>o</STRONG>   AIX  also  enforces  a  limit  of 10,000 seconds for <STRONG>ESCDELAY</STRONG>; this
-           implementation currently has no upper limit.
+       <STRONG>o</STRONG>   AIX also enforces a limit of 10,000 seconds for  <STRONG>ESCDELAY</STRONG>;  <EM>ncurses</EM>
+           does not enforce any upper limit.
 
-       This implementation has long used <STRONG>ESCDELAY</STRONG> with units of  milliseconds,
-       making  it  impossible to be completely compatible with AIX.  Likewise,
-       most users have either decided to override the value, or rely upon  its
-       default value.
+       <EM>ncurses</EM>  has  long  used <STRONG>ESCDELAY</STRONG> with units of milliseconds, making it
+       impossible to be completely compatible with  AIX.   Consequently,  most
+       users  have  decided  either to override the value, or to rely upon its
+       default.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
-       <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
+       [UAX  #29]  "Unicode  Standard  Annex  #29: Unicode Text Segmentation";
+       &lt;https://unicode.org/reports/tr29/&gt;
 
 
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-10-01                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -200,15 +263,19 @@ <H1 class="no-header">curs_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
+<li><a href="#h3-bool_-TRUE_-FALSE">bool, TRUE, FALSE</a></li>
+<li><a href="#h3-ERR_-OK">ERR, OK</a></li>
+<li><a href="#h3-chtype">chtype</a></li>
+<li><a href="#h3-cchar_t_-attr_t">cchar_t, attr_t</a></li>
 <li><a href="#h3-COLOR_PAIRS">COLOR_PAIRS</a></li>
 <li><a href="#h3-COLORS">COLORS</a></li>
 <li><a href="#h3-COLS">COLS</a></li>
 <li><a href="#h3-ESCDELAY">ESCDELAY</a></li>
 <li><a href="#h3-LINES">LINES</a></li>
 <li><a href="#h3-TABSIZE">TABSIZE</a></li>
-<li><a href="#h3-The-Current-Screen">The Current Screen</a></li>
-<li><a href="#h3-The-New-Screen">The New Screen</a></li>
-<li><a href="#h3-The-Standard-Screen">The Standard Screen</a></li>
+<li><a href="#h3-curscr">curscr</a></li>
+<li><a href="#h3-newscr">newscr</a></li>
+<li><a href="#h3-stdscr">stdscr</a></li>
 </ul>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 1d07732db..15b3717ec 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
+  * @Id: curs_window.3x,v 1.39 2023/09/30 23:13:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -93,8 +93,8 @@ <H1 class="no-header">curs_window 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        all of the window modes are initialized to the default  values.   These
        functions set window modes after a window is created:
 
-              idcok, idlok, immedok, keypad, leaveok, nodelay, scrollok,
-              setscrreg, syncok, wbkgdset, wbkgrndset, and wtimeout
+              <STRONG>idcok</STRONG>  <STRONG>idlok</STRONG>  <STRONG>immedok</STRONG>  <STRONG>keypad</STRONG> <STRONG>leaveok</STRONG> <STRONG>nodelay</STRONG> <STRONG>scrollok</STRONG> <STRONG>setscrreg</STRONG>
+              <STRONG>syncok</STRONG> <STRONG>wbkgdset</STRONG> <STRONG>wbkgrndset</STRONG> and <STRONG>wtimeout</STRONG>.
 
 
 </PRE><H3><a name="h3-delwin">delwin</a></H3><PRE>
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_window 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index 30b88479c..d36e20367 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.41 2023/09/16 23:37:03 tom Exp @
+  * @Id: default_colors.3x,v 1.44 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -139,17 +139,17 @@ <H1 class="no-header">default_colors 3x 2023-09-16 ncurses 6.4 Library calls</H1
        code depending on them be conditioned using NCURSES_VERSION.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG>ded(1)</STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey (from an analysis of the requirements for color xterm for
        XFree86 3.1.2C, February 1996).
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG>ded(1)</STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -159,8 +159,8 @@ <H1 class="no-header">default_colors 3x 2023-09-16 ncurses 6.4 Library calls</H1
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index ac1f581ea..4aae33397 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.34 2023/09/23 23:04:14 tom Exp @
+  * @Id: define_key.3x,v 1.36 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -81,16 +81,16 @@ <H1 class="no-header">define_key 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -99,8 +99,8 @@ <H1 class="no-header">define_key 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 8114da101..362c8b23a 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.45 2023/09/16 23:37:03 tom Exp @
+  * @Id: form.3x,v 1.47 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -248,11 +248,9 @@ <H1 class="no-header">form 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-
-ncurses 6.4                       2023-09-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index d1550dca6..5b8bf5fec 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.23 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_cursor.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -79,10 +79,6 @@ <H1 class="no-header">form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -98,8 +94,12 @@ <H1 class="no-header">form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,10 +107,10 @@ <H1 class="no-header">form_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 112ebd986..28d80d764 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.24 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_data.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -66,10 +66,6 @@ <H1 class="no-header">form_data 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        in the given form.  It returns TRUE (1) or FALSE (0).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -85,18 +81,22 @@ <H1 class="no-header">form_data 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 7eed0c4b2..163056d8f 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.47 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_driver.3x,v 1.50 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -259,18 +259,13 @@ <H1 class="no-header">form_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The form driver code saw an unknown request code.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>,   <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>,    <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>,
-       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>, <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header files
+       The header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  files
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -279,8 +274,13 @@ <H1 class="no-header">form_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>,   <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>,   <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>,
+       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>, <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -297,10 +297,10 @@ <H1 class="no-header">form_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 7505971eb..7a02d90cd 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -96,10 +96,6 @@ <H1 class="no-header">form_field 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -118,8 +114,12 @@ <H1 class="no-header">form_field 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -127,10 +127,10 @@ <H1 class="no-header">form_field 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index e2f0ac290..4afc22e4f 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -92,18 +92,13 @@ <H1 class="no-header">form_field_attributes 3x 2023-09-16 ncurses 6.4 Library ca
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -112,8 +107,13 @@ <H1 class="no-header">form_field_attributes 3x 2023-09-16 ncurses 6.4 Library ca
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -121,10 +121,10 @@ <H1 class="no-header">form_field_attributes 3x 2023-09-16 ncurses 6.4 Library ca
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 0d6812e7b..1d0f1332b 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -126,26 +126,21 @@ <H1 class="no-header">form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls<
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The header file <STRONG>&lt;form.h&gt;</STRONG> automatically includes the header file
 
-       When configured for wide characters, <STRONG>field_buffer</STRONG> returns a pointer  to
-       temporary   storage   (allocated   and  freed  by  the  library).   The
+       When  configured for wide characters, <STRONG>field_buffer</STRONG> returns a pointer to
+       temporary  storage  (allocated  and  freed  by   the   library).    The
        application should not attempt to modify the data.  It will be freed on
        the next call to <STRONG>field_buffer</STRONG> to return the same buffer.  <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The  <STRONG>set_max_field</STRONG>   function   checks   for   an   ncurses   extension
-       <STRONG>O_INPUT_FIELD</STRONG>  which  allows a dynamic field to shrink if the new limit
+       The   <STRONG>set_max_field</STRONG>   function   checks   for   an   ncurses  extension
+       <STRONG>O_INPUT_FIELD</STRONG> which allows a dynamic field to shrink if the  new  limit
        is smaller than the current field size.
 
 
@@ -154,8 +149,13 @@ <H1 class="no-header">form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls<
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -163,10 +163,10 @@ <H1 class="no-header">form_field_buffer 3x 2023-09-16 ncurses 6.4 Library calls<
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index 7ad137b6a..e243cd309 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.24 2023/09/16 23:39:54 tom Exp @
+  * @Id: form_field_info.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -87,22 +87,17 @@ <H1 class="no-header">form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       A null (zero pointer) is accepted for any  of  the  return  values,  to
-       ignore  that  value.  Not all implementations allow this, e.g., Solaris
+       A  null  (zero  pointer)  is  accepted for any of the return values, to
+       ignore that value.  Not all implementations allow this,  e.g.,  Solaris
        2.7 does not.
 
 
@@ -111,8 +106,13 @@ <H1 class="no-header">form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</H
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -120,10 +120,10 @@ <H1 class="no-header">form_field_info 3x 2023-09-16 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 746c5164f..120d18352 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_just.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -80,18 +80,13 @@ <H1 class="no-header">form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -100,8 +95,13 @@ <H1 class="no-header">form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</H
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -109,10 +109,10 @@ <H1 class="no-header">form_field_just 3x 2023-09-16 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 68cc46e79..512af66d9 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.33 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_new.3x,v 1.36 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -104,10 +104,6 @@ <H1 class="no-header">form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</H1
             field is connected.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -127,8 +123,12 @@ <H1 class="no-header">form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</H1
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -136,10 +136,10 @@ <H1 class="no-header">form_field_new 3x 2023-09-16 ncurses 6.4 Library calls</H1
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 017426b51..e5a81b691 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.36 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_opts.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -150,10 +150,6 @@ <H1 class="no-header">form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</H
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.  <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -169,8 +165,12 @@ <H1 class="no-header">form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</H
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -178,10 +178,10 @@ <H1 class="no-header">form_field_opts 3x 2023-09-16 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 15d85c214..baa3ea9e7 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.22 2023/09/16 23:39:54 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -72,10 +72,6 @@ <H1 class="no-header">form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls
        The function <STRONG>set_field_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">form_field_userptr 3x 2023-09-16 ncurses 6.4 Library calls
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 2c030660c..1b7900606 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.44 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_field_validation.3x,v 1.47 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -206,10 +206,6 @@ <H1 class="no-header">form_field_validation 3x 2023-09-16 ncurses 6.4 Library ca
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>, <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -225,8 +221,12 @@ <H1 class="no-header">form_field_validation 3x 2023-09-16 ncurses 6.4 Library ca
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>, <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -251,10 +251,10 @@ <H1 class="no-header">form_field_validation 3x 2023-09-16 ncurses 6.4 Library ca
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 81dd86862..2f5376992 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.38 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.41 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -169,10 +169,6 @@ <H1 class="no-header">form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</H1
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -188,8 +184,12 @@ <H1 class="no-header">form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</H1
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -205,10 +205,10 @@ <H1 class="no-header">form_fieldtype 3x 2023-09-16 ncurses 6.4 Library calls</H1
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 02ad2a130..1a805bdf9 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_hook.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -123,10 +123,6 @@ <H1 class="no-header">form_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -142,8 +138,12 @@ <H1 class="no-header">form_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -162,10 +162,10 @@ <H1 class="no-header">form_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 3ee01b6eb..e1529da5e 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.24 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_new.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -92,10 +92,6 @@ <H1 class="no-header">form_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The form has already been posted.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -111,8 +107,12 @@ <H1 class="no-header">form_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -120,10 +120,10 @@ <H1 class="no-header">form_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 612ad960f..1d9f0ebf0 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_new_page.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -77,18 +77,13 @@ <H1 class="no-header">form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The given field is already connected to a form.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -97,8 +92,13 @@ <H1 class="no-header">form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -106,10 +106,10 @@ <H1 class="no-header">form_new_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index add4dee1f..1363fb4b6 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_opts.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -94,10 +94,6 @@ <H1 class="no-header">form_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -113,8 +109,12 @@ <H1 class="no-header">form_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -122,10 +122,10 @@ <H1 class="no-header">form_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index da7ef4502..42940c072 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_page.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -104,10 +104,6 @@ <H1 class="no-header">form_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -125,8 +121,12 @@ <H1 class="no-header">form_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -134,10 +134,10 @@ <H1 class="no-header">form_page 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 5a531caf0..a0c288b2e 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.25 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_post.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -95,10 +95,6 @@ <H1 class="no-header">form_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -114,8 +110,12 @@ <H1 class="no-header">form_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -123,10 +123,10 @@ <H1 class="no-header">form_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index ccd835aba..9cb62be3a 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.26 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_requestname.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -74,10 +74,6 @@ <H1 class="no-header">form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">form_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 9bcc0c275..3a90e38fa 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.28 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_userptr.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -72,10 +72,6 @@ <H1 class="no-header">form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The function <STRONG>set_form_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">form_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index caf1fdce8..c1e20f7f4 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_variables.3x,v 1.12 2023/09/16 23:39:54 tom Exp @
+  * @Id: form_variables.3x,v 1.15 2023/09/30 23:13:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_variables 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">form_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>TYPE_ALNUM</STRONG>, <STRONG>TYPE_ALPHA</STRONG>, <STRONG>TYPE_ENUM</STRONG>, <STRONG>TYPE_INTEGER</STRONG>, <STRONG>TYPE_IPV4</STRONG>,
+       <STRONG>TYPE_ALNUM</STRONG>,    <STRONG>TYPE_ALPHA</STRONG>,    <STRONG>TYPE_ENUM</STRONG>,    <STRONG>TYPE_INTEGER</STRONG>,    <STRONG>TYPE_IPV4</STRONG>,
        <STRONG>TYPE_NUMERIC</STRONG>, <STRONG>TYPE_REGEXP</STRONG> - form system global variables
 
 
@@ -99,16 +99,16 @@ <H1 class="no-header">form_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>TYPE_IPV4</STRONG> variable is an extension not provided by older implemen-
-       tations of the form library.
+       The   <STRONG>TYPE_IPV4</STRONG>   variable  is  an  extension  not  provided  by  older
+       implementations of the form library.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
+       <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index bae77038c..b1fbd5509 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.27 2023/09/16 23:37:03 tom Exp @
+  * @Id: form_win.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -100,10 +100,6 @@ <H1 class="no-header">form_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             No items are connected to the form.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -119,8 +115,12 @@ <H1 class="no-header">form_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -128,10 +128,10 @@ <H1 class="no-header">form_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 29b84671a..9a27634c0 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.92 2023/09/16 23:37:03 tom Exp @
+  * @Id: infocmp.1m,v 1.95 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -516,22 +516,20 @@ <H1 class="no-header">infocmp 1m 2023-09-16 ncurses 6.4 User commands</H1>
        The <STRONG>-F</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> should be a <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG> mode.
 
 
+</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+       Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
+       Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
-       Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
-
-
-
-ncurses 6.4                       2023-09-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-09-30                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -551,8 +549,8 @@ <H1 class="no-header">infocmp 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index b7250b684..9257a0afc 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.26 2023/09/16 23:38:39 tom Exp @
+  * @Id: infotocap.1m,v 1.33 2023/10/01 22:43:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-10-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -52,55 +51,46 @@ <H1 class="no-header">infotocap 1m 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>infotocap</STRONG> [<STRONG>-v</STRONG><EM>n</EM> <EM>width</EM>]  [<STRONG>-V</STRONG>] [<STRONG>-1</STRONG>] [<STRONG>-w</STRONG> <EM>width</EM>] <EM>file</EM> ...
+       <STRONG>infotocap</STRONG> [<EM>tic-option</EM>] <EM>file</EM> ...
 
+       <STRONG>infotocap</STRONG> <STRONG>-V</STRONG>
 
-</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>infotocap</STRONG> looks in each given text <EM>file</EM> for <STRONG>terminfo</STRONG> descriptions.  For
-       each terminfo description found, an equivalent <STRONG>termcap</STRONG>  description  is
-       written  to  standard output.  Terminfo <STRONG>use</STRONG> capabilities are translated
-       directly to termcap <STRONG>tc</STRONG> capabilities.
-
-       <STRONG>-v</STRONG>   print out tracing information on standard  error  as  the  program
-            runs.
-
-       <STRONG>-V</STRONG>   print  out the version of the program in use on standard error and
-            exit.
 
-       <STRONG>-1</STRONG>   cause the fields to print out  one  to  a  line.   Otherwise,  the
-            fields  will be printed several to a line to a maximum width of 60
-            characters.
+</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       <STRONG>infotocap</STRONG> looks in each given text <EM>file</EM> for <EM>terminfo</EM> descriptions.  For
+       each one found, it writes  an  analogous  <EM>termcap</EM>  description  to  the
+       standard  output  stream.   <EM>terminfo</EM>  "<STRONG>use</STRONG>" capabilities are translated
+       directly to  <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities.   Because  <EM>termcap</EM>  is  a  less
+       expressive   format   than   <EM>terminfo</EM>,   some  capabilities  cannot  be
+       translated.
 
-       <STRONG>-w</STRONG>   change the output to <EM>width</EM> characters.
+       This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-C</STRONG>
+       option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
+       and <STRONG>-x</STRONG>.  The <STRONG>-V</STRONG> option reports the version of <EM>ncurses</EM>  associated  with
+       this program and exits with a successful status.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo Compiled terminal description database.
-
-
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       This utility is actually a link to <STRONG>tic</STRONG>, running in <EM>-C</EM>  mode.   You  can
-       use other <STRONG>tic</STRONG> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       None  of  X/Open  Curses,  Issue 7 (2009), SVr4 or NetBSD document this
+       None  of  X/Open  Curses, Issue 7 (2009), SVr4, or NetBSD document this
        application.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-10-01                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -108,10 +98,9 @@ <H1 class="no-header">infotocap 1m 2023-09-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 1512b4e98..5c34fad61 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.26 2023/09/23 22:49:51 tom Exp @
+  * @Id: key_defined.3x,v 1.28 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -74,16 +74,16 @@ <H1 class="no-header">key_defined 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -92,8 +92,8 @@ <H1 class="no-header">key_defined 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 826bfaf58..a019ba6bc 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.27 2023/09/23 22:49:51 tom Exp @
+  * @Id: keybound.3x,v 1.29 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -77,16 +77,16 @@ <H1 class="no-header">keybound 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -95,8 +95,8 @@ <H1 class="no-header">keybound 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 4e65b40c6..b22b63b16 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.32 2023/09/23 22:49:51 tom Exp @
+  * @Id: keyok.3x,v 1.34 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -76,16 +76,16 @@ <H1 class="no-header">keyok 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -94,8 +94,8 @@ <H1 class="no-header">keyok 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index 433c53a6a..dcf110ce1 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.17 2023/09/16 23:38:39 tom Exp @
+  * @Id: legacy_coding.3x,v 1.20 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -89,16 +89,16 @@ <H1 class="no-header">legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        depending on ncurses extensions be conditioned using NCURSES_VERSION.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey (to support lynx's font-switching feature).
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,8 +107,8 @@ <H1 class="no-header">legacy_coding 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index b93d72f68..61a3b643e 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.36 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu.3x,v 1.38 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -223,11 +223,9 @@ <H1 class="no-header">menu 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-
-ncurses 6.4                       2023-09-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 67e11b041..57547f873 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_attributes.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -101,18 +101,13 @@ <H1 class="no-header">menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "menu_" for detailed
-       descriptions of the entry points.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -121,8 +116,13 @@ <H1 class="no-header">menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
+       descriptions of the entry points.
+
+
 
-ncurses 6.4                       2023-09-16               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -130,10 +130,10 @@ <H1 class="no-header">menu_attributes 3x 2023-09-16 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 7fbc6368d..65b62ec06 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.22 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_cursor.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -79,10 +79,6 @@ <H1 class="no-header">menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The menu has not been posted.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -98,8 +94,12 @@ <H1 class="no-header">menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,10 +107,10 @@ <H1 class="no-header">menu_cursor 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 9331ee283..72d54a22c 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.37 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_driver.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -207,10 +207,6 @@ <H1 class="no-header">menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The menu driver could not process the request.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  files
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -227,8 +223,12 @@ <H1 class="no-header">menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -241,10 +241,10 @@ <H1 class="no-header">menu_driver 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 5d3588597..6927f71b0 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_format.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -92,10 +92,6 @@ <H1 class="no-header">menu_format 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -111,8 +107,12 @@ <H1 class="no-header">menu_format 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -120,10 +120,10 @@ <H1 class="no-header">menu_format 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 435cac1f6..8f180aa68 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_hook.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -103,10 +103,6 @@ <H1 class="no-header">menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -122,8 +118,12 @@ <H1 class="no-header">menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -131,10 +131,10 @@ <H1 class="no-header">menu_hook 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index b7f020ea5..7245996ec 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_items.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -94,10 +94,6 @@ <H1 class="no-header">menu_items 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -116,8 +112,12 @@ <H1 class="no-header">menu_items 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -125,10 +125,10 @@ <H1 class="no-header">menu_items 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 8587aaeaa..6f40d0052 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_mark.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -90,10 +90,6 @@ <H1 class="no-header">menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -109,8 +105,12 @@ <H1 class="no-header">menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -118,10 +118,10 @@ <H1 class="no-header">menu_mark 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index 434a29fc2..afc07cd37 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_new.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -90,10 +90,6 @@ <H1 class="no-header">menu_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The menu has already been posted.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -109,8 +105,12 @@ <H1 class="no-header">menu_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -118,10 +118,10 @@ <H1 class="no-header">menu_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 44db0f0b7..794324eb0 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_opts.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -114,10 +114,6 @@ <H1 class="no-header">menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The menu is already posted.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -133,8 +129,12 @@ <H1 class="no-header">menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -142,10 +142,10 @@ <H1 class="no-header">menu_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 6c278fa88..ab9e2538e 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.30 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_pattern.3x,v 1.33 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -94,10 +94,6 @@ <H1 class="no-header">menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -113,8 +109,12 @@ <H1 class="no-header">menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -122,10 +122,10 @@ <H1 class="no-header">menu_pattern 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index 4905084de..fd40a32b7 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_post.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -97,10 +97,6 @@ <H1 class="no-header">menu_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -116,8 +112,12 @@ <H1 class="no-header">menu_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -125,10 +125,10 @@ <H1 class="no-header">menu_post 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 20b1e93a2..26e8a964b 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_requestname.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -74,10 +74,6 @@ <H1 class="no-header">menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">menu_requestname 3x 2023-09-16 ncurses 6.4 Library calls</
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index e55b60f40..f9a24aff8 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_spacing.3x,v 1.31 2023/09/30 23:44:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -67,19 +67,29 @@ <H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_menu_spacing</STRONG> sets  the  spacing  information  for  the
-       menu.   Its  parameter  <STRONG>spc_description</STRONG>  controls  the number of spaces
-       between an item name and an item description.  It must  not  be  larger
-       than  <STRONG>TABSIZE</STRONG>.  The menu system puts in the middle of this spacing area
-       the pad character.  The remaining parts are filled  with  spaces.   The
-       <STRONG>spc_rows</STRONG>  parameter  controls  the  number of rows that are used for an
-       item.  It must not be larger than 3.  The menu system inserts the blank
-       lines  between item rows, these lines will contain the pad character in
-       the appropriate positions.   The  <STRONG>spc_columns</STRONG>  parameter  controls  the
-       number  of blanks between columns of items.  It must not be larger than
-       <STRONG>TABSIZE</STRONG>.  A value of 0 for all the spacing values resets  them  to  the
-       default, which is 1 for all of them.
-       The  function  <STRONG>menu_spacing</STRONG>  passes back the spacing info for the menu.
-       If a pointer is NULL, this specific info is simply not returned.
+       menu.  Its parameters provide the description and the size (in rows and
+       columns).
+
+       <EM>spc</EM><STRONG>_</STRONG><EM>description</EM>
+              controls the number of spaces between an item name and  an  item
+              description.   It  must  not  be  larger than <STRONG>TABSIZE</STRONG>.  The menu
+              system  puts  in  the  middle  of  this  spacing  area  the  pad
+              character.  The remaining parts are filled with spaces.
+
+       <EM>spc</EM><STRONG>_</STRONG><EM>rows</EM>
+              controls  the number of rows that are used for an item.  It must
+              not be larger than 3.  The menu system inserts the  blank  lines
+              between item rows, these lines will contain the pad character in
+              the appropriate positions.
+
+       <EM>spc</EM><STRONG>_</STRONG><EM>columns</EM>
+              controls the number of blanks between columns of items.  It must
+              not  be  larger  than <STRONG>TABSIZE</STRONG>.  A value of 0 for all the spacing
+              values resets them to the default, which is 1 for all of them.
+
+       The function <STRONG>menu_spacing</STRONG> returns the spacing information for the menu.
+       If  a  pointer  is  NULL,  the  corresponding information is simply not
+       returned.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -88,10 +98,6 @@ <H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        values is out of range.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -108,8 +114,12 @@ <H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -117,10 +127,10 @@ <H1 class="no-header">menu_spacing 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index bdb5db216..3c8bf9f95 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.25 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_userptr.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -72,10 +72,6 @@ <H1 class="no-header">menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>set_menu_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">menu_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 76d98426b..779e2f5c0 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
+  * @Id: menu_win.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -100,10 +100,6 @@ <H1 class="no-header">menu_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -119,8 +115,12 @@ <H1 class="no-header">menu_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -128,10 +128,10 @@ <H1 class="no-header">menu_win 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 2b24b9544..403bbe0d2 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.29 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_current.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -102,10 +102,6 @@ <H1 class="no-header">mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -124,8 +120,12 @@ <H1 class="no-header">mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -133,10 +133,10 @@ <H1 class="no-header">mitem_current 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index 2230a55c4..fc76759dc 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.23 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_name.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -69,10 +69,6 @@ <H1 class="no-header">mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -88,8 +84,12 @@ <H1 class="no-header">mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -97,10 +97,10 @@ <H1 class="no-header">mitem_name 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 78df15f4c..99b01f8e7 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_new.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -93,10 +93,6 @@ <H1 class="no-header">mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -112,8 +108,12 @@ <H1 class="no-header">mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -121,10 +121,10 @@ <H1 class="no-header">mitem_new 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 51fde1c73..5427affca 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.25 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_opts.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -88,10 +88,6 @@ <H1 class="no-header">mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -107,8 +103,12 @@ <H1 class="no-header">mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -116,10 +116,10 @@ <H1 class="no-header">mitem_opts 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index e2ac68800..000eeae32 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.26 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -72,10 +72,6 @@ <H1 class="no-header">mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        The <STRONG>set_item_userptr</STRONG> always returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -94,8 +90,12 @@ <H1 class="no-header">mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -103,10 +103,10 @@ <H1 class="no-header">mitem_userptr 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 51e5503f7..fbb1efc4c 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.24 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_value.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -79,10 +79,6 @@ <H1 class="no-header">mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</H1>
             The menu driver could not process the request.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -98,8 +94,12 @@ <H1 class="no-header">mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,10 +107,10 @@ <H1 class="no-header">mitem_value 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index 5ddd8bd96..cee3f0c04 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.19 2023/09/16 23:38:39 tom Exp @
+  * @Id: mitem_visible.3x,v 1.22 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -63,10 +63,6 @@ <H1 class="no-header">mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        this portion will be smaller than the whole menu).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
        <STRONG>&lt;curses.h&gt;</STRONG>.
@@ -82,18 +78,22 @@ <H1 class="no-header">mitem_visible 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        Raymond.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 3c20d8cea..a71d23adb 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.174 2023/09/23 22:58:27 tom Exp @
+  * @Id: ncurses.3x,v 1.177 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231001).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1270,85 +1270,78 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
             database
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_" for detailed
-       routine descriptions.
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
-       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for user-defined capabilities
-
-
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>)  that
-       falls  back  to  the  old-style /etc/termcap file if the terminal setup
-       code cannot find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use  of  this
-       feature  is  not  recommended,  as  it  essentially  includes an entire
-       termcap compiler in the <STRONG>ncurses</STRONG> startup code, at  significant  cost  in
+       The  <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
+       falls back to the old-style /etc/termcap file  if  the  terminal  setup
+       code  cannot  find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use of this
+       feature is not  recommended,  as  it  essentially  includes  an  entire
+       termcap  compiler  in  the <STRONG>ncurses</STRONG> startup code, at significant cost in
        core and startup cycles.
 
-       The  <STRONG>ncurses</STRONG>  library includes facilities for capturing mouse events on
-       certain terminals (including xterm).   See  the  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>  manual
+       The <STRONG>ncurses</STRONG> library includes facilities for capturing mouse  events  on
+       certain  terminals  (including  xterm).   See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual
        page for details.
 
-       The  <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to window
-       resizing  events,  e.g.,  when  running   in   an   xterm.    See   the
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>  and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In addition,
+       The <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to  window
+       resizing   events,   e.g.,   when   running   in  an  xterm.   See  the
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In  addition,
        the library may be configured with a <STRONG>SIGWINCH</STRONG> handler.
 
-       The <STRONG>ncurses</STRONG> library extends the fixed set of function key  capabilities
-       of  terminals by allowing the application designer to define additional
-       key sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,  and
+       The  <STRONG>ncurses</STRONG> library extends the fixed set of function key capabilities
+       of terminals by allowing the application designer to define  additional
+       key  sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and
        <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> manual pages for details.
 
-       The  <STRONG>ncurses</STRONG>  library  can  exploit the capabilities of terminals which
-       implement the ISO-6429 SGR 39 and  SGR  49  controls,  which  allow  an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From the users'  perspective,  the  application  is
+       The <STRONG>ncurses</STRONG> library can exploit the  capabilities  of  terminals  which
+       implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
+       application to reset  the  terminal  to  its  original  foreground  and
+       background  colors.   From  the  users' perspective, the application is
        able  to  draw  colored  text  on  a  background  whose  color  is  set
-       independently, providing better control over color contrasts.  See  the
+       independently,  providing better control over color contrasts.  See the
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
 
-       The  <STRONG>ncurses</STRONG>  library  includes  a  function  for directing application
+       The <STRONG>ncurses</STRONG> library  includes  a  function  for  directing  application
        output  to  a  printer  attached  to  the  terminal  device.   See  the
        <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>ncurses</STRONG>  library  is intended to be BASE-level conformant with XSI
-       Curses.   The  EXTENDED  XSI  Curses  functionality  (including   color
+       The <STRONG>ncurses</STRONG> library is intended to be BASE-level  conformant  with  XSI
+       Curses.    The  EXTENDED  XSI  Curses  functionality  (including  color
        support) is supported.
 
-       A  small  number  of local differences (that is, individual differences
-       between the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in  <STRONG>PORTABILITY</STRONG>
+       A small number of local differences (that  is,  individual  differences
+       between  the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in <STRONG>PORTABILITY</STRONG>
        sections of the library man pages.
 
 
 </PRE><H3><a name="h3-Error-checking">Error checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other  implementations,  this  one  checks  parameters  such  as
-       pointers  to  WINDOW  structures to ensure they are not null.  The main
-       reason for providing this  behavior  is  to  guard  against  programmer
-       error.   The  standard interface does not provide a way for the library
-       to tell an application which of several possible errors were  detected.
-       Relying  on  this  (or  some other) extension will adversely affect the
+       Unlike  other  implementations,  this  one  checks  parameters  such as
+       pointers to WINDOW structures to ensure they are not  null.   The  main
+       reason  for  providing  this  behavior  is  to guard against programmer
+       error.  The standard interface does not provide a way for  the  library
+       to  tell an application which of several possible errors were detected.
+       Relying on this (or some other) extension  will  adversely  affect  the
        portability of curses applications.
 
 
 </PRE><H3><a name="h3-Extensions-versus-portability">Extensions versus portability</a></H3><PRE>
-       Most of the extensions provided by ncurses have not been  standardized.
+       Most  of the extensions provided by ncurses have not been standardized.
        Some  have  been  incorporated  into  other  implementations,  such  as
        PDCurses or NetBSD curses.  Here are a few to consider:
 
        <STRONG>o</STRONG>   The routine <STRONG>has_key</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The  routine  <STRONG>slk_attr</STRONG>  is  not  part of XPG4, nor is it present in
+       <STRONG>o</STRONG>   The routine <STRONG>slk_attr</STRONG> is not part of XPG4,  nor  is  it  present  in
            SVr4.  See the <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The routines <STRONG>getmouse</STRONG>, <STRONG>mousemask</STRONG>,  <STRONG>ungetmouse</STRONG>,  <STRONG>mouseinterval</STRONG>,  and
-           <STRONG>wenclose</STRONG>  relating  to  mouse interfacing are not part of XPG4, nor
-           are they present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual  page  for
+       <STRONG>o</STRONG>   The  routines  <STRONG>getmouse</STRONG>,  <STRONG>mousemask</STRONG>, <STRONG>ungetmouse</STRONG>, <STRONG>mouseinterval</STRONG>, and
+           <STRONG>wenclose</STRONG> relating to mouse interfacing are not part  of  XPG4,  nor
+           are  they  present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for
            details.
 
        <STRONG>o</STRONG>   The  routine  <STRONG>mcprint</STRONG>  was  not  present  in  any  previous  curses
@@ -1357,65 +1350,65 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The routine <STRONG>wresize</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The   WINDOW  structure's  internal  details  can  be  hidden  from
-           application programs.  See <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for  the  discussion  of
+       <STRONG>o</STRONG>   The  WINDOW  structure's  internal  details  can  be  hidden   from
+           application  programs.   See  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for the discussion of
            <STRONG>is_scrollok</STRONG>, etc.
 
        <STRONG>o</STRONG>   This  implementation  can  be  configured  to  provide  rudimentary
-           support for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>  for
+           support  for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> for
            details.
 
-       <STRONG>o</STRONG>   This  implementation  can  also  be  configured to provide a set of
-           functions which improve the ability  to  manage  multiple  screens.
+       <STRONG>o</STRONG>   This implementation can also be configured  to  provide  a  set  of
+           functions  which  improve  the  ability to manage multiple screens.
            See <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> for details.
 
 
 </PRE><H3><a name="h3-Padding-differences">Padding differences</a></H3><PRE>
-       In  historic  curses  versions, delays embedded in the capabilities <STRONG>cr</STRONG>,
-       <STRONG>ind</STRONG>, <STRONG>cub1</STRONG>, <STRONG>ff</STRONG> and <STRONG>tab</STRONG> activated corresponding delay bits  in  the  UNIX
+       In historic curses versions, delays embedded in  the  capabilities  <STRONG>cr</STRONG>,
+       <STRONG>ind</STRONG>,  <STRONG>cub1</STRONG>,  <STRONG>ff</STRONG>  and <STRONG>tab</STRONG> activated corresponding delay bits in the UNIX
        tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
-       interface  to the UNIX kernel significantly and increases the package's
+       bytes.   This  method  is  slightly  more  expensive,  but  narrows the
+       interface to the UNIX kernel significantly and increases the  package's
        portability correspondingly.
 
 
 </PRE><H3><a name="h3-Header-files">Header files</a></H3><PRE>
-       The header file <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the  header  files
+       The  header  file  <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes the header files
        <STRONG>&lt;stdio.h&gt;</STRONG> and <STRONG>&lt;unctrl.h&gt;</STRONG>.
 
        X/Open Curses has more to say, but does not finish the story:
 
-           The  inclusion  of &lt;curses.h&gt; may make visible all symbols from the
+           The inclusion of &lt;curses.h&gt; may make visible all symbols  from  the
            headers &lt;stdio.h&gt;, &lt;term.h&gt;, &lt;termios.h&gt;, and &lt;wchar.h&gt;.
 
        Here is a more complete story:
 
-       <STRONG>o</STRONG>   Starting  with  BSD  curses,  all  implementations  have   included
+       <STRONG>o</STRONG>   Starting   with  BSD  curses,  all  implementations  have  included
            &lt;stdio.h&gt;.
 
-           BSD  curses  included  &lt;curses.h&gt;  and  &lt;unctrl.h&gt; from an internal
+           BSD curses included &lt;curses.h&gt;  and  &lt;unctrl.h&gt;  from  an  internal
            header "curses.ext" ("ext" was a short name for <EM>externs</EM>).
 
-           BSD curses used &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG>  and  <STRONG>scanw</STRONG>),  but
+           BSD  curses  used  &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG> and <STRONG>scanw</STRONG>), but
            nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   SVr2  curses  added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon &lt;stdio.h&gt;.  That
+       <STRONG>o</STRONG>   SVr2 curses added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon  &lt;stdio.h&gt;.   That
            is, the function prototype uses <STRONG>FILE</STRONG>.
 
            SVr4 curses added <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>, which also use &lt;stdio.h&gt;.
 
            X/Open Curses documents all three of these functions.
 
-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+           SVr4  curses  and  X/Open  Curses  do  not require the developer to
            include  &lt;stdio.h&gt;  before  including  &lt;curses.h&gt;.   Both  document
            curses showing &lt;curses.h&gt; as the only required header.
 
            As a result, standard &lt;curses.h&gt; will always include &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
+       <STRONG>o</STRONG>   X/Open  Curses  is  inconsistent  with  respect  to  SVr4 regarding
            &lt;unctrl.h&gt;.
 
-           As   noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;  from
+           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;   from
            &lt;curses.h&gt; (like SVr4).
 
        <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
@@ -1424,55 +1417,55 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
            HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
            in curses.h, but ncurses (and Solaris curses) do not.
 
-           AIX curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses  (and
+           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses (and
            Solaris curses) do not.
 
-       <STRONG>o</STRONG>   X/Open  says  that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there is no
+       <STRONG>o</STRONG>   X/Open says that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there  is  no
            requirement that it do that.
 
            Some  programs  use  functions  declared  in  both  &lt;curses.h&gt;  and
-           &lt;term.h&gt;,  and  must include both headers in the same module.  Very
-           old versions of AIX curses  required  including  &lt;curses.h&gt;  before
+           &lt;term.h&gt;, and must include both headers in the same  module.   Very
+           old  versions  of  AIX  curses required including &lt;curses.h&gt; before
            including &lt;term.h&gt;.
 
-           Because  ncurses  header files include the headers needed to define
+           Because ncurses header files include the headers needed  to  define
            datatypes used in the headers, ncurses header files can be included
-           in  any  order.  But for portability, you should include &lt;curses.h&gt;
+           in any order.  But for portability, you should  include  &lt;curses.h&gt;
            before &lt;term.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open Curses says <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because  including  a  header
+       <STRONG>o</STRONG>   X/Open  Curses  says  <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because including a header
            file does not necessarily make all symbols in it visible (there are
            ifdef's to consider).
 
-           For instance, in ncurses &lt;wchar.h&gt; <EM>may</EM> be included  if  the  proper
-           symbol  is defined, and if ncurses is configured for wide-character
-           support.  If the header  is  included,  its  symbols  may  be  made
-           visible.   That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature
+           For  instance,  in  ncurses &lt;wchar.h&gt; <EM>may</EM> be included if the proper
+           symbol is defined, and if ncurses is configured for  wide-character
+           support.   If  the  header  is  included,  its  symbols may be made
+           visible.  That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG>  feature
            test macro.
 
-       <STRONG>o</STRONG>   X/Open Curses documents one required header,  in  a  special  case:
-           &lt;stdarg.h&gt;   before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>  and
-           <STRONG>vw_scanw</STRONG> functions (as  well  as  the  obsolete  the  <STRONG>vwprintw</STRONG>  and
+       <STRONG>o</STRONG>   X/Open  Curses  documents  one  required header, in a special case:
+           &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>   and
+           <STRONG>vw_scanw</STRONG>  functions  (as  well  as  the  obsolete  the <STRONG>vwprintw</STRONG> and
            <STRONG>vwscanw</STRONG> functions).  Each of those uses a <STRONG>va_list</STRONG> parameter.
 
-           The  two  obsolete  functions  were  introduced in SVr3.  The other
-           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
-           curses  provided  for  the  possibility  that  an application might
+           The two obsolete functions were  introduced  in  SVr3.   The  other
+           functions  were  introduced  in  X/Open  Curses.   In between, SVr4
+           curses provided for  the  possibility  that  an  application  might
            include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;.  Initially, that was done
-           by  using  <STRONG>void*</STRONG>  for the <STRONG>va_list</STRONG> parameter.  Later, a special type
-           (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler  type-
+           by using <STRONG>void*</STRONG> for the <STRONG>va_list</STRONG> parameter.  Later,  a  special  type
+           (defined  in &lt;stdio.h&gt;) was introduced, to allow for compiler type-
            checking.  That special type is always available, because &lt;stdio.h&gt;
            is always included by &lt;curses.h&gt;.
 
            None of the X/Open Curses implementations require an application to
-           include  &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either have
-           allowed for a special type, or (like  ncurses)  include  &lt;stdarg.h&gt;
+           include &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either  have
+           allowed  for  a  special type, or (like ncurses) include &lt;stdarg.h&gt;
            directly to provide a portable interface.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If  standard  output from a <STRONG>ncurses</STRONG> program is re-directed to something
-       which is not a tty, screen updates will be directed to standard  error.
+       If standard output from a <STRONG>ncurses</STRONG> program is re-directed  to  something
+       which  is not a tty, screen updates will be directed to standard error.
        This was an undocumented feature of AT&amp;T System V Release 3 curses.
 
 
@@ -1481,8 +1474,15 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        by Pavel Curtis.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_" for detailed
+       routine descriptions.
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for user-defined capabilities
+
+
 
-ncurses 6.4                       2023-09-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1525,7 +1525,6 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
@@ -1537,6 +1536,7 @@ <H1 class="no-header">ncurses 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index e8c75c2ef..98e76561d 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.12 2023/09/17 08:29:56 tom Exp @
+  * @Id: MKncu_config.in,v 1.17 2023/10/01 09:59:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</TITLE>
+<TITLE>ncurses6-config 1 2023-10-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncurses6-config 1 2023-10-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>               User commands              <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 
@@ -47,77 +47,80 @@ <H1 class="no-header">ncurses6-config 1 2023-09-17 ncurses 6.4 User commands</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ncurses6-config</STRONG> - helper script for <EM>ncurses</EM> libraries
+       <STRONG>ncurses6-config</STRONG> - configuration helper for <EM>ncurses</EM> libraries
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>ncurses6-config</STRONG> [<EM>options</EM>]
+       <STRONG>ncurses6-config</STRONG> <EM>option</EM> ...
+
+       <STRONG>ncurses6-config</STRONG> <STRONG>--version</STRONG>
+
+       <STRONG>ncurses6-config</STRONG> <STRONG>--help</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is  a  shell  script  which  simplifies  configuring applications
-       against a particular set of ncurses libraries.
+       This  program  development  aid  simplifies  the process of configuring
+       applications against a particular set of <EM>ncurses</EM> libraries.
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
        <STRONG>--prefix</STRONG>
-              echos the package-prefix of ncurses
+              reports the package prefix of <EM>ncurses</EM>.
 
        <STRONG>--exec-prefix</STRONG>
-              echos the executable-prefix of ncurses
+              reports the executable prefix of <EM>ncurses</EM>.
 
        <STRONG>--cflags</STRONG>
-              echos the C compiler flags needed to compile with ncurses
+              reports the C compiler flags needed to compile with <EM>ncurses</EM>.
 
-       <STRONG>--libs</STRONG> echos the libraries needed to link with ncurses
+       <STRONG>--libs</STRONG> reports the libraries needed to link with <EM>ncurses</EM>.
 
        <STRONG>--version</STRONG>
-              echos the release+patchdate version of ncurses
+              reports the release and patch date information  of  <EM>ncurses</EM>  and
+              exits successfully.
 
        <STRONG>--abi-version</STRONG>
-              echos the ABI version of ncurses
+              reports the ABI version of <EM>ncurses</EM>.
 
        <STRONG>--mouse-version</STRONG>
-              echos the mouse-interface version of ncurses
+              reports the mouse-interface version of <EM>ncurses</EM>.
 
        <STRONG>--bindir</STRONG>
-              echos the directory containing ncurses programs
+              reports the directory containing <EM>ncurses</EM> programs.
 
        <STRONG>--datadir</STRONG>
-              echos the directory containing ncurses data
+              reports the directory containing <EM>ncurses</EM> data.
 
        <STRONG>--includedir</STRONG>
-              echos the directory containing ncurses header files
+              reports the directory containing <EM>ncurses</EM> header files.
 
        <STRONG>--libdir</STRONG>
-              echos the directory containing ncurses libraries
+              reports the directory containing <EM>ncurses</EM> libraries.
 
        <STRONG>--mandir</STRONG>
-              echos the directory containing ncurses manpages
+              reports the directory containing <EM>ncurses</EM> man pages.
 
        <STRONG>--terminfo</STRONG>
-              echos the $TERMINFO terminfo database path, e.g.,
-              /usr/share/terminfo
+              reports   the  <STRONG>TERMINFO</STRONG>  <EM>terminfo</EM>  database  path,  for  example
+              <EM>/usr/share/terminfo</EM>.
 
        <STRONG>--terminfo-dirs</STRONG>
-              echos the $TERMINFO_DIRS directory list, e.g.,
-              /usr/share/terminfo
+              reports the  <STRONG>TERMINFO_DIRS</STRONG>  supplemental  search  path  for  the
+              <EM>terminfo</EM> database, for example <EM>/usr/share/terminfo</EM>.
 
        <STRONG>--termpath</STRONG>
-              echos the $TERMPATH termcap list,  if  support  for  termcap  is
-              configured.
+              reports  the  <STRONG>TERMPATH</STRONG>  supplemental search path for the <EM>termcap</EM>
+              database, if support for <EM>termcap</EM> is configured.
 
-       <STRONG>--help</STRONG> prints this message
+       <STRONG>--help</STRONG> issues a usage message and exits successfully.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
 
 
-ncurses 6.4                       2023-09-17                <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
+ncurses 6.4                       2023-10-01                <STRONG><A HREF="ncurses6-config.1.html">ncurses6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index ce4adc314..cbe2b702b 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.36 2023/09/23 22:37:46 tom Exp @
+  * @Id: new_pair.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -156,16 +156,16 @@ <H1 class="no-header">new_pair 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -180,8 +180,8 @@ <H1 class="no-header">new_pair 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 9b1ac49ce..4cbe0b717 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.52 2023/09/23 23:37:26 tom Exp @
+  * @Id: panel.3x,v 1.55 2023/09/30 21:38:11 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -278,12 +278,6 @@ <H1 class="no-header">panel 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        libpanel.a the panels library itself
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Originally   written   by   Warren   Tucker  &lt;wht@n4hgf.mt-park.ga.us&gt;,
        primarily to assist in porting <EM>u386mon</EM>  to  systems  without  a  native
@@ -294,8 +288,12 @@ <H1 class="no-header">panel 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
-ncurses 6.4                       2023-09-23                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+
+
+ncurses 6.4                       2023-09-30                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -328,8 +326,8 @@ <H1 class="no-header">panel 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-NOTE">NOTE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 555a7ce8d..eb164d425 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.45 2023/09/23 22:49:53 tom Exp @
+  * @Id: resizeterm.3x,v 1.47 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -182,17 +182,17 @@ <H1 class="no-header">resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</H1>
        in NetBSD <EM>curses</EM> (2001) and PDCurses (2003).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
        <EM>curses</EM>)
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -209,8 +209,8 @@ <H1 class="no-header">resizeterm 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 55a1f21dd..6dae96b86 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.33 2023/09/23 23:37:26 tom Exp @
+  * @Id: scr_dump.5,v 1.36 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-09-23 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-09-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-09-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-09-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -394,10 +394,6 @@ <H1 class="no-header">scr_dump 5 2023-09-23 ncurses 6.4 File formats</H1>
            0002371
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
        extended screen-dump format for ncurses 6.0 (2015)
@@ -406,8 +402,12 @@ <H1 class="no-header">scr_dump 5 2023-09-23 ncurses 6.4 File formats</H1>
        screen dump feature in ncurses 1.9.2d (1995)
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-09-30                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -429,8 +429,8 @@ <H1 class="no-header">scr_dump 5 2023-09-23 ncurses 6.4 File formats</H1>
 </ul>
 </li>
 <li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index d61176fc3..5b9a474ba 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.44 2023/09/16 23:38:39 tom Exp @
+  * @Id: tabs.1,v 1.46 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -250,13 +250,11 @@ <H1 class="no-header">tabs 1 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index a87b1513c..1ef664bbc 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.56 2023/09/16 23:38:39 tom Exp @
+  * @Id: term.5,v 1.58 2023/09/30 21:26:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-09-16 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-09-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-09-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-09-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -363,10 +363,6 @@ <H1 class="no-header">term 5 2023-09-16 ncurses 6.4 File formats</H1>
        /usr/share/terminfo/*/* compiled terminal capability database
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
        extended terminfo format for ncurses 5.0
@@ -377,8 +373,12 @@ <H1 class="no-header">term 5 2023-09-16 ncurses 6.4 File formats</H1>
        documented legacy terminfo format, e.g., from <EM>pcurses</EM>.
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -404,8 +404,8 @@ <H1 class="no-header">term 5 2023-09-16 ncurses 6.4 File formats</H1>
 <li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
 <li><a href="#h2-LIMITS">LIMITS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 3aae1fca8..b6f10b062 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.36 2023/09/17 00:10:28 tom Exp @
+  * @Id: term.7,v 1.38 2023/09/30 21:38:11 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-09-16 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-09-30 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-09-16 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-09-30 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -213,11 +213,11 @@ <H1 class="no-header">term 7 2023-09-16 ncurses 6.4 Miscellaneous</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 0aeb5d8a9..ab5297895 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.27 2023/09/16 23:38:39 tom Exp @
+  * @Id: term_variables.3x,v 1.30 2023/09/30 23:13:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -159,12 +159,12 @@ <H1 class="no-header">term_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses does not describe any of these except for <STRONG>cur_term</STRONG>.  (The
-       inclusion of <STRONG>cur_term</STRONG> appears to be an oversight, since other  compara-
-       ble low-level information is omitted by X/Open).
+       inclusion  of  <STRONG>cur_term</STRONG>  appears  to  be  an  oversight,  since   other
+       comparable low-level information is omitted by X/Open).
 
-       Other  implementations may have comparable variables.  Some implementa-
-       tions provide the variables in their libraries, but omit them from  the
-       header files.
+       Other    implementations   may   have   comparable   variables.    Some
+       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 <STRONG>Terminfo</STRONG> <STRONG>Names</STRONG> section.  Most, but  not  all,  base
@@ -172,11 +172,11 @@ <H1 class="no-header">term_variables 3x 2023-09-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index c1f2ea725..ccd0dd468 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.131 2023/09/16 17:01:55 Branden.Robinson Exp @
+  * @Id: terminfo.tail,v 1.132 2023/09/30 21:38:11 Branden.Robinson Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231001).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -2686,9 +2686,9 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
-       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,     <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 065b6d585..7fae7b945 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.93 2023/09/16 23:38:39 tom Exp @
+  * @Id: tic.1m,v 1.96 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -471,20 +471,18 @@ <H1 class="no-header">tic 1m 2023-09-16 ncurses 6.4 User commands</H1>
             Compiled terminal description database.
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
-       <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
+       <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -506,8 +504,8 @@ <H1 class="no-header">tic 1m 2023-09-16 ncurses 6.4 User commands</H1>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index f28c0c54f..6f6d302a7 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,19 +27,24 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.46 2023/09/16 23:38:39 tom Exp @
+  * @Id: toe.1m,v 1.51 2023/10/01 09:45:05 tom Exp @
+  * toe -a | grep -E '^(xterm|vt)'
+  * The next row overruns the line length on DWB nroff (65n).
+  * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
+  * The next row overruns the line length on DWB nroff (65n).
+  * The next row overruns the line length on DWB nroff (65n).
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-10-01 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -51,108 +56,123 @@ <H1 class="no-header">toe 1m 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>toe</STRONG> [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-ahsuUV</STRONG>] <EM>file...</EM>
+       <STRONG>toe</STRONG> [<STRONG>-ahs</STRONG>] [<STRONG>-v</STRONG> [<EM>n</EM>]] [<EM>directory</EM> ...]
+
+       <STRONG>toe</STRONG> [<STRONG>-u</STRONG>|<STRONG>-U</STRONG>] <EM>file</EM>
+
+       <STRONG>toe</STRONG> <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       With no options, <STRONG>toe</STRONG> lists all available terminal types by primary name
-       with descriptions.   File  arguments  specify  the  directories  to  be
-       scanned;  if  no  such  arguments  are  given,  your  default  terminfo
-       directory is scanned.  If you also specify the <STRONG>-h</STRONG> option,  a  directory
-       header will be issued as each directory is entered.
+       <STRONG>toe</STRONG>  reports  to  the  standard  output  stream the (primary) names and
+       descriptions of the terminal types available to the  <EM>terminfo</EM>  library.
+       Each <EM>directory</EM> operand is scanned; if none are given, <STRONG>toe</STRONG> scans the the
+       default <EM>terminfo</EM> directory.
+
 
-       There are other options intended for use by terminfo file maintainers:
+</PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
+       The <STRONG>-h</STRONG> option can be helpful  to  observe  where  <STRONG>toe</STRONG>  is  looking  for
+       terminal  descriptions.   Other options support maintainers of <EM>terminfo</EM>
+       terminal descriptions.
 
-       <STRONG>-a</STRONG>     report  on  all  of  the  terminal databases which ncurses would
-              search, rather than only the first one that it finds.
+       <STRONG>-a</STRONG>       lists entries from  all  terminal  database  directories  that
+                <EM>terminfo</EM>  would  search,  instead  of  only  the first that it
+                finds.
 
-              If the <STRONG>-s</STRONG> is also given,  <STRONG>toe</STRONG>  adds  a  column  to  the  report,
-              showing (like <STRONG>conflict(1)</STRONG>) which entries which belong to a given
-              terminal database.  An "*" marks entries which differ,  and  "+"
-              marks equivalent entries.
+                If the <STRONG>-s</STRONG> option is also given,  <STRONG>toe</STRONG>  adds  a  column  to  the
+                report,  showing  (like <STRONG>conflict(1)</STRONG>) which entries belong to a
+                given terminal database.  An "*" marks  entries  that  differ,
+                and "+" marks equivalent entries.
 
-              Without  the <STRONG>-s</STRONG> option, <STRONG>toe</STRONG> does not attempt to merge duplicates
-              in its report
+                Without   the  <STRONG>-s</STRONG>  option,  <STRONG>toe</STRONG>  does  not  attempt  to  merge
+                duplicates in its report.
 
-       <STRONG>-s</STRONG>     sort the output by the entry names.
+       <STRONG>-h</STRONG>       writes a heading naming each each directory as it is accessed.
 
-       <STRONG>-u</STRONG> <EM>file</EM>
-              says  to  write  a  report  to  the  standard  output,   listing
-              dependencies  in  the  given  terminfo/termcap source file.  The
-              report condenses the "use" relation: each line consists  of  the
-              primary  name  of a terminal that has use capabilities, followed
-              by a colon, followed by the whitespace-separated  primary  names
-              of all terminals which occur in those use capabilities, followed
-              by a newline
+       <STRONG>-s</STRONG>       sorts the output by the entry names.
 
-       <STRONG>-U</STRONG> <EM>file</EM>
-              says to write a report to the standard output,  listing  reverse
-              dependencies  in  the  given  terminfo/termcap source file.  The
-              report reverses the "use" relation: each line  consists  of  the
-              primary  name  of  a  terminal  that occurs in use capabilities,
-              followed  by  a  colon,  followed  by  the  whitespace-separated
-              primary names of all terminals which depend on it, followed by a
-              newline.
+       <STRONG>-u</STRONG> <EM>file</EM>  lists terminal type dependencies in  <EM>file</EM>,  a  <EM>terminfo</EM>  entry
+                source  or  <EM>termcap</EM>  database file.  The report summarizes the
+                "<STRONG>use</STRONG>" (<EM>terminfo</EM>)  and  "<STRONG>tc</STRONG>"  (<EM>termcap</EM>)  relations:  each  line
+                comprises the primary name of a terminal type employing <STRONG>use</STRONG>/<STRONG>tc</STRONG>
+                capabilities, a colon, a  space-  and  tab-separated  list  of
+                primary names of terminal types thus named, and a newline.
 
-       <STRONG>-v</STRONG><EM>n</EM>    specifies that (verbose) output be written  to  standard  error,
-              showing <STRONG>toe</STRONG>'s progress.
+       <STRONG>-U</STRONG> <EM>file</EM>  lists  terminal  type reverse dependencies in <EM>file</EM>, a <EM>terminfo</EM>
+                entry source or <EM>termcap</EM> database file.  The report  summarizes
+                the  "<STRONG>use</STRONG>"  (<EM>terminfo</EM>)  and  "<STRONG>tc</STRONG>" (<EM>termcap</EM>) reverse relations:
+                each line comprises  the  primary  name  of  a  terminal  type
+                occurring  in  <STRONG>use</STRONG>/<STRONG>tc</STRONG> capabilities, a colon, a space- and tab-
+                separated list of primary names of terminal types naming  them
+                thus, and a newline.
 
-              The  optional  parameter <EM>n</EM> is a number from 1 to 10, interpreted
-              as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.  If ncurses is built  without  tracing  support,
-              the optional parameter is ignored.
+       <STRONG>-v</STRONG> [<EM>n</EM>]   reports  verbose  status  information  to  the  standard error
+                stream, showing <STRONG>toe</STRONG>'s progress.
 
-       <STRONG>-V</STRONG>     reports  the  version of ncurses which was used in this program,
-              and exits.
+                The optional parameter <EM>n</EM>  is  an  integer  between  1  and  10
+                inclusive,  interpreted  as  for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.  If <EM>ncurses</EM> is built
+                without tracing support, <EM>n</EM> is ignored.
+
+       <STRONG>-V</STRONG>       reports the version of <EM>ncurses</EM> associated  with  this  program
+                and exits with a successful status.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
-       Without sorting, the <STRONG>-a</STRONG> option reports all of the names found in all of
-       the   terminal  databases  found  by  the  <STRONG>TERMINFO</STRONG>  and  <STRONG>TERMINFO_DIRS</STRONG>
-       environment 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 <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where  each  terminal
-       description was found:
-
-           --&gt; /usr/local/ncurses/share/terminfo
-           ----&gt; /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
-           . . .
+       When  not  sorting with the <STRONG>-s</STRONG> option, the <STRONG>-a</STRONG> option reports all of the
+       names found in all of the terminal database directories  named  in  the
+       <STRONG>TERMINFO</STRONG> and <STRONG>TERMINFO_DIRS</STRONG> environment variables.
+
+           xterm-color     generic color xterm
+           xterm-xfree86   xterm terminal emulator (XFree86)
+           xterm-vt220     xterm emulating vt220
+           xterm-256color  xterm with 256 colors
+           xterm-r6        xterm X11R6 version
+           xterm-r5        xterm R5 version
+           xterm-mono      monochrome xterm
+           xterm           xterm terminal emulator (X Window System)
+           vt220           dec vt220
+           vt102           dec vt102
+           vt100           dec vt100 (w/advanced video)
+           vt52            dec vt52
+           ...
+
+       Use  the  <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where each terminal
+       description was found.
+
+           --&gt; /etc/terminfo
+           ----&gt; /lib/terminfo
+           ------&gt; /usr/share/terminfo
+
+           --*---: vt100           dec vt100 (w/advanced video)
+           --*---: vt102           dec vt102
+           --*---: vt220           dec vt220
+           --*---: vt52            dec vt52
+           --*---: xterm           xterm terminal emulator (X Window System)
+           --*---: xterm-256color  xterm with 256 colors
+           --*---: xterm-color     generic color xterm
+           --*---: xterm-mono      monochrome xterm
+           --*---: xterm-r5        xterm R5 version
+           --*---: xterm-r6        xterm X11R6 version
+           --*---: xterm-vt220     xterm emulating vt220
+           --*---: xterm-xfree86   xterm terminal emulator (XFree86)
+           ...
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <STRONG>/usr/share/terminfo/?/*</STRONG>
-            Compiled terminal description database.
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       This  utility  is  not  provided by other implementations.  There is no
-       relevant X/Open or POSIX standard for <STRONG>toe</STRONG>.
+       <STRONG>toe</STRONG> is not provided by other implementations.  There is  no  applicable
+       X/Open or POSIX standard for it.
+
+       It  replaces  a  <STRONG>-T</STRONG>  option  that  was briefly supported by the <EM>ncurses</EM>
+       <STRONG>infocmp</STRONG> utility in 1995.
 
-       The program name refers to a developer's pun:
+       The <STRONG>-a</STRONG> and <STRONG>-s</STRONG> options were added in 2006 and 2011, respectively.
+
+       The program's name originates with a developer's pun:
 
        <STRONG>o</STRONG>   <STRONG>tic</STRONG>,
 
@@ -160,28 +180,21 @@ <H1 class="no-header">toe 1m 2023-09-16 ncurses 6.4 User commands</H1>
 
        <STRONG>o</STRONG>   <STRONG>toe</STRONG>.
 
-       It replaced a <STRONG>-T</STRONG> option which was  briefly  supported  by  the  ncurses
-       <STRONG>infocmp</STRONG> utility in 1995.
-
-       The  <STRONG>-a</STRONG>  and <STRONG>-s</STRONG> options were added to <STRONG>toe</STRONG> several years later (2006 and
-       2011, respectively).
-
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-10-01                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-OPTIONS">OPTIONS</a></li>
 <li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 60726515e..95699b326 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.83 2023/09/16 23:38:39 tom Exp @
+  * @Id: tput.1,v 1.85 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -543,13 +543,11 @@ <H1 class="no-header">tput 1 2023-09-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 06aad9cdc..dde9fa190 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.69 2023/09/16 23:38:39 tom Exp @
+  * @Id: tset.1,v 1.71 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-09-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-09-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-09-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-09-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -392,11 +392,9 @@ <H1 class="no-header">tset 1 2023-09-16 ncurses 6.4 User commands</H1>
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20230923).
 
 
-
-ncurses 6.4                       2023-09-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 061b203e8..48b69f112 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.36 2023/09/16 23:38:39 tom Exp @
+  * @Id: user_caps.5,v 1.40 2023/09/30 23:47:46 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-09-16 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-09-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-09-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -194,10 +194,10 @@ <H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
 
              The command "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" does the same thing.
 
-          NQ used to suppress a consistency  check  in  tic  for  the  ncurses
-             capabilities  in  user6  through  user9 (u6, u7, u8 and u9) which
-             tell how to query the terminal's cursor position and  its  device
-             attributes.
+          NQ <EM>boolean</EM>, used to suppress a consistency  check  in  tic  for  the
+             ncurses  capabilities  in user6 through user9 (u6, u7, u8 and u9)
+             which tell how to query the terminal's cursor  position  and  its
+             device attributes.
 
           RGB
              <EM>boolean</EM>,   <EM>number</EM>   <STRONG>or</STRONG>   <EM>string</EM>,   used   to   assert   that  the
@@ -376,8 +376,13 @@ <H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
        but makes no use of these capabilities itself.
 
 
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
+       Thomas E. Dickey
+       beginning with ncurses 5.0 (1999)
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
        The  terminal  database  section  <EM>NCURSES</EM>  <EM>USER-DEFINABLE</EM>  <EM>CAPABILITIES</EM>
        summarizes commonly-used user-defined capabilities which  are  used  in
@@ -385,16 +390,11 @@ <H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
        <STRONG>screen(1)</STRONG> or <STRONG>tmux(1)</STRONG>.
 
        <EM>XTerm</EM> <EM>Control</EM> <EM>Sequences</EM> provides further information  on  the  <STRONG>xterm(1)</STRONG>
-       features which are used in these extended capabilities.
-
+       features that are used in these extended capabilities.
 
-</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Thomas E. Dickey
-       beginning with ncurses 5.0 (1999)
 
 
-
-ncurses 6.4                       2023-09-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-09-30                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -408,8 +408,8 @@ <H1 class="no-header">user_caps 5 2023-09-16 ncurses 6.4 File formats</H1>
 </ul>
 </li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 5c332ce7f..f72daee3d 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.28 2023/09/16 23:38:39 tom Exp @
+  * @Id: wresize.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2023-09-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2023-09-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -85,17 +85,17 @@ <H1 class="no-header">wresize 3x 2023-09-16 ncurses 6.4 Library calls</H1>
        in NetBSD curses (2001) and PDCurses (2003).
 
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
        curses).
 
 
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+
+
 
-ncurses 6.4                       2023-09-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2023-09-30                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -105,8 +105,8 @@ <H1 class="no-header">wresize 3x 2023-09-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
 </BODY>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index ba30b57b2..f63133c1c 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,103 +27,148 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.22 2023/09/17 08:29:17 tom Exp $
-.TH ADACURSES 1 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKada_config.in,v 1.28 2023/09/30 23:55:34 tom Exp $
+.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-09-30 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
 .ie n .ds CW R
 .el   \{
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
+.
+.nr mE 0 \" in an example (EX/EE)?
+.
+.\" Start example.
+.if !\n(.g \{\
+.de EX
+.  br
+.  if !\\n(mE \{\
+.    nr mF \\n(.f
+.    nr mP \\n(PD
+.    nr PD 1v
+.    nf
+.    ft \\*(CW
+.    nr mE 1
+.  \}
+..
+.\}
+.
+.\" End example.
+.if !\n(.g \{\
+.de EE
+.  br
+.  if \\n(mE \{\
+.    ft \\n(mF
+.    nr PD \\n(mP
+.    fi
+.    nr mE 0
+.  \}
+..
+.\}
+.
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds '  \(aq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ie t .ds '  \(aq
+.el   .ds '  '
+.\}
+.
 .SH NAME
 \fB\%adacurses@USE_CFG_SUFFIX@\-config\fP \-
-helper script for @ADA_LIBNAME@ libraries
+configuration helper for \fI@ADA_LIBNAME@\fP libraries
 .SH SYNOPSIS
 .B \*C
-[\fIoptions\fP]
+.RB [ \-\-cflags ]
+.RB [ \-\-libs ]
+.PP
+.B \*C \-\-version
+.PP
+.B \*C \-\-help
 .SH DESCRIPTION
-This is a shell script which simplifies configuring an application to use
-the @ADA_LIBNAME@ library binding to ncurses.
+This program development aid simplifies the process of configuring
+applications to use the \fI@ADA_LIBNAME@\fP library binding to
+\fIncurses\fP.
 .SH OPTIONS
-.TP
+.TP 11 \" "--version" + 2n
 \fB\-\-cflags\fP
-echos the gnat (Ada compiler) flags needed to compile with @ADA_LIBNAME@.
+reports the GNAT (Ada compiler) flags needed to compile with
+\fI@ADA_LIBNAME@\fP.
 .TP
 \fB\-\-libs\fP
-echos the gnat libraries needed to link with @ADA_LIBNAME@.
+reports the GNAT libraries needed to link with \fI@ADA_LIBNAME@\fP.
 .TP
 \fB\-\-version\fP
-echos the release+patchdate version of the ncurses libraries used
-to configure and build @ADA_LIBNAME@.
+reports the release and patch date information of the \fIncurses\fP
+libraries used to configure and build \fI@ADA_LIBNAME@\fP and exits
+successfully.
 .TP
 \fB\-\-help\fP
-prints a list of the \fB\*C\fP script's options.
+issues a usage message and exits successfully.
 .PP
-If no options are given, \fB\*C\fP prints the combination
-of
-\fB\-\-cflags\fP and
-\fB\-\-libs\fP
-that \fBgnatmake\fP expects (see example).
+Omitting options implies \*(``\fB\-\-cflags \-\-libs\fP\*(''.
 .SH EXAMPLE
-For example, supposing that you want to compile the "Hello World!"
-program for @ADA_LIBNAME@.
-Make a file named "hello.adb":
-.RS
-.nf
-.ft \*(CW
+Consider a program using \fI@ADA_LIBNAME@\fP to write the message
+\*(``Hello, world!\*('' in the center of the screen and wait for the
+user to press the \*(``q\*('' key before exiting.
+Populate a file \fIhello.adb\fP with the following.
+.PP
+.RS 4
+.EX
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
 procedure Hello is
-
    Visibility : Cursor_Visibility := Invisible;
+   Message : constant String := "Hello, World!";
    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!");
+   Move_Cursor (Line => Lines / 2,
+                Column => (Columns \- Message\*'Length) / 2);
+   Add (Str => Message);
 
    while not done loop
-
       c := Get_Keystroke (Standard_Window);
+
       case c is
-      when Character'Pos ('q') => done := True;
-      when others => null;
+          when Character\*'Pos (\*'q\*') => done := True;
+          when others => null;
       end case;
 
       Nap_Milli_Seconds (50);
    end loop;
 
    End_Windows;
-
 end Hello;
-.fi
+.EE
 .RE
+.br
+.ne 2
 .PP
 Then, using
-.RS
-.ft \*(CW
-gnatmake `adacurses-config --cflags` hello -largs `adacurses-config --libs`
-.ft
+.RS 4
+.EX
+gnatmake \(gaadacurses@USE_CFG_SUFFIX@\-config \-\-cflags\(ga hello \e
+    \-largs \(gaadacurses@USE_CFG_SUFFIX@\-config \-\-libs\(ga
+.EE
 .RE
-.PP
-or (simpler):
-.RS
-.ft \*(CW
-gnatmake hello `adacurses-config`
-.ft
+or, more simply,
+.RS 4
+.EX
+gnatmake hello \(gaadacurses@USE_CFG_SUFFIX@\-config\(ga
+.EE
 .RE
-.PP
-you will compile and link the program.
+you can compile and link the program.
 .SH "SEE ALSO"
-\fBcurses\fP(3X)
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%curses\fP(3X)
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index a93724531..26ec40675 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,74 +27,76 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.12 2023/09/17 08:29:56 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.17 2023/10/01 09:59:29 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-10-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
-helper script for \fIncurses\fR libraries
+configuration helper for \fIncurses\fR libraries
 .SH SYNOPSIS
 .B @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
-[\fIoptions\fP]
+.I option
+\&.\|.\|.
+.PP
+.B "@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \-\-version"
+.PP
+.B "@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \-\-help"
 .SH DESCRIPTION
-This is a shell script which simplifies configuring applications against
-a particular set of ncurses libraries.
+This program development aid simplifies the process of configuring
+applications against a particular set of \fIncurses\fP libraries.
 .SH OPTIONS
 .TP
 \fB\-\-prefix\fP
-echos the package\-prefix of ncurses
+reports the package prefix of \fIncurses\fP.
 .TP
 \fB\-\-exec\-prefix\fP
-echos the executable\-prefix of ncurses
+reports the executable prefix of \fIncurses\fP.
 .TP
 \fB\-\-cflags\fP
-echos the C compiler flags needed to compile with ncurses
+reports the C compiler flags needed to compile with \fIncurses\fP.
 .TP
 \fB\-\-libs\fP
-echos the libraries needed to link with ncurses
+reports the libraries needed to link with \fIncurses\fP.
 .TP
 \fB\-\-version\fP
-echos the release+patchdate version of ncurses
+reports the release and patch date information of \fIncurses\fP and
+exits successfully.
 .TP
 \fB\-\-abi\-version\fP
-echos the ABI version of ncurses
+reports the ABI version of \fIncurses\fP.
 .TP
 \fB\-\-mouse\-version\fP
-echos the mouse\-interface version of ncurses
+reports the mouse\-interface version of \fIncurses\fP.
 .TP
 \fB\-\-bindir\fP
-echos the directory containing ncurses programs
+reports the directory containing \fIncurses\fP programs.
 .TP
 \fB\-\-datadir\fP
-echos the directory containing ncurses data
+reports the directory containing \fIncurses\fP data.
 .TP
 \fB\-\-includedir\fP
-echos the directory containing ncurses header files
+reports the directory containing \fIncurses\fP header files.
 .TP
 \fB\-\-libdir\fP
-echos the directory containing ncurses libraries
+reports the directory containing \fIncurses\fP libraries.
 .TP
 \fB\-\-mandir\fP
-echos the directory containing ncurses manpages
+reports the directory containing \fIncurses\fP man pages.
 .TP
 \fB\-\-terminfo\fP
-echos the $TERMINFO terminfo database path, e.g.,
-.RS
-@TERMINFO@
-.RE
+reports the \fBTERMINFO\fP \fIterminfo\fP database path,
+for example \fI\%@TERMINFO@\fP.
 .TP
 \fB\-\-terminfo\-dirs\fP
-echos the $TERMINFO_DIRS directory list, e.g.,
-.RS
-@TERMINFO_DIRS@
-.RE
+reports the \fBTERMINFO_DIRS\fP supplemental search path for the
+\fIterminfo\fP database,
+for example \fI\%@TERMINFO_DIRS@\fP.
 .TP
 \fB\-\-termpath\fP
-echos the $TERMPATH termcap list, if support for termcap is configured.
+reports the \fBTERMPATH\fP supplemental search path for the
+\fItermcap\fP database,
+if support for \fItermcap\fP is configured.
 .TP
 \fB\-\-help\fP
-prints this message
+issues a usage message and exits successfully.
 .SH "SEE ALSO"
-\fBcurses\fP(3X)
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%curses\fP(3X)
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 65f191f0e..961992802 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,65 +28,69 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.44 2023/09/16 23:39:05 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.50 2023/10/01 22:22:00 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-10-01 "ncurses 6.4" "User commands"
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''
 .ds n 5
-.ds d @TERMINFO@
+.ds d /etc/termcap
 .SH NAME
 \fB\%@CAPTOINFO@\fP \-
 convert a \fItermcap\fR description into a \fIterminfo\fR description
 .SH SYNOPSIS
 .B @CAPTOINFO@
 .RI [ tic-option ]
-.I file
-\&.\|.\|.
+.RI [ file
+\&.\|.\|.]
 .P
-\fB@CAPTOINFO@\fR \fB\-V\fR
+.B "@CAPTOINFO@ \-V"
 .SH DESCRIPTION
-\fB@CAPTOINFO@\fP looks in each given text
-\fIfile\fP for \fBtermcap\fP descriptions.
-For each
-one found, an equivalent \fBterminfo\fP description is written to standard
-output.
-Termcap \fBtc\fP capabilities are translated directly to terminfo
-\fBuse\fP capabilities.
+\fB\%@CAPTOINFO@\fP looks in each given text
+\fIfile\fP for \fItermcap\fP descriptions.
+For each one found,
+it writes an equivalent \fIterminfo\fP description to the standard
+output stream.
+\fItermcap\fP \fBtc\fP capabilities are translated directly to
+\fIterminfo\fP \*(``\fBuse\fP\*('' capabilities.
 .PP
-If no \fIfile\fP is given, then the environment variable \fBTERMCAP\fP is used
-for the filename or entry.
-If \fBTERMCAP\fP is a full pathname to a file, only
-the terminal whose name is specified in the environment variable \fBTERM\fP is
-extracted from that file.
-If the environment variable \fBTERMCAP\fP is not
-set, then the file \fB\*d\fP is read.
+If no \fIfile\fPs are specified,
+\fB\%@CAPTOINFO@\fP interprets the content of the environment variable
+\fB\%TERMCAP\fP as a file name,
+and extracts only the entry for the terminal named in the environment
+variable \fB\%TERM\fP from it.
+If the environment variable \fB\%TERMCAP\fP is not set,
+\fB\%@CAPTOINFO@\fP reads \fI\%\*d\fP.
 .PP
-This utility is implemented as a link to \fB@TIC@\fP(1M),
+This utility is implemented as a link to \fB\%@TIC@\fP(1M),
 with the latter's
 .B \-I
 option implied.
-You can use other \fB@TIC@\fP options such as
+You can use other \fB\%@TIC@\fP options such as
 .BR \-1 ,
 .BR \-f ,
 .BR \-v ,
 .BR \-w ,
 and
 .BR \-x .
-.SH FILES
-.TP 20
-\*d
-Compiled terminal description database.
-.SH TRANSLATIONS FROM NONSTANDARD CAPABILITIES
-Some obsolete nonstandard capabilities will automatically be translated
-into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fP.
-Whenever one of these automatic translations is done, the program
-will issue an notification to stderr, inviting the user to check that
-it has not mistakenly translated a completely unknown and random
-capability and/or syntax error.
+.SS "Translations from nonstandard capabilities"
+\fB\%@CAPTOINFO@\fP translates some obsolete,
+nonstandard capabilities into standard (SVr4/XSI Curses) \fIterminfo\fP
+capabilities.
+It issues a diagnostic to the standard error stream for each,
+inviting the user to check that it has not mistakenly translated an
+unknown or mistyped capability name.
 .PP
 .TS
 cb cb cb cb
 cb cb cb cb
-l  l  l  l .
-Nonstd	Std	\&	Terminfo
+cb cb l  lb.
+Nonstandard	Standard	\&	\f(BIterminfo\fP
 name	name	From	capability
 _
 BO	mr	AT&T	enter_reverse_mode
@@ -119,50 +123,57 @@ FC	Sf	Tek	set_foreground
 HS	mh	Iris	enter_dim_mode
 .TE
 .PP
-XENIX termcap also used to have a set of extension capabilities
-for forms drawing, designed to take advantage of the IBM PC
-high-half graphics.
-They were as follows:
+XENIX \fItermcap\fP had a set of extension capabilities,
+corresponding to box drawing characters of CCSID
+(\*(``code page\*('') 437,
+as follows.
 .PP
 .TS
 cb cb
-l l.
-Cap	Graphic
+cb cb
+cb l .
+Termcap
+Name	Graphic
 _
-G2	upper left
-G3	lower left
-G1	upper right
-G4	lower right
-GR	pointing right
-GL	pointing left
-GU	pointing up
-GD	pointing down
+G2	upper left corner
+G3	lower left corner
+G1	upper right corner
+G4	lower right corner
+GR	tee pointing right
+GL	tee pointing left
+GU	tee pointing up
+GD	tee pointing down
 GH	horizontal line
 GV	vertical line
 GC	intersection
-G6	upper left
-G7	lower left
-G5	upper right
-G8	lower right
-Gr	tee pointing right
-Gr	tee pointing left
-Gu	tee pointing up
-Gd	tee pointing down
-Gh	horizontal line
-Gv	vertical line
-Gc	intersection
-GG	acs magic cookie count
+G6	double upper left corner
+G7	double lower left corner
+G5	double upper right corner
+G8	double lower right corner
+Gr	double tee pointing right
+Gr	double tee pointing left
+Gu	double tee pointing up
+Gd	double tee pointing down
+Gh	double horizontal line
+Gv	double vertical line
+Gc	double intersection
+.\" TODO: There are about 40 box drawing code points in CCSID 437;
+.\" were there no XENIX capabilities for the mixed single- and double-
+.\" line intersections?
+.\"
+.\" TODO: GG doesn't seem to fit with the others; explain it.
+GG	ACS magic cookie count
 .TE
 .PP
-If the single-line capabilities occur in an entry, they will automatically
-be composed into an \fBacsc\fP string.
+If the single-line capabilities occur in an entry,
+they are composed into an \fBacsc\fP string.
 The double-line capabilities and
 \fBGG\fP are discarded with a warning message.
 .PP
-IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
-with the SVr4 format.
-The following AIX extensions are automatically
-translated:
+IBM's AIX has a \fIterminfo\fP facility descended from SVr1
+\fIterminfo\fP,
+but which is incompatible with the SVr4 format.
+\fB\%@CAPTOINFO@\fP translates the following AIX extensions.
 .PP
 .TS
 cb cb
@@ -177,31 +188,37 @@ font2	s2ds
 font3	s3ds
 .TE
 .PP
-Additionally, the AIX \fIbox1\fP capability will be automatically translated to
-an \fBacsc\fP string.
+Additionally,
+this program translates the AIX \fBbox1\fP capability to an \fBacsc\fP
+string.
 .PP
-Hewlett-Packard's terminfo library supports two nonstandard terminfo
-capabilities \fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
-These will be discarded with a warning message.
+The HP-UX \fIterminfo\fP library supports two nonstandard \fIterminfo\fP
+capabilities,
+\fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
+\fB\%@CAPTOINFO@\fP discards these with a warning message.
+.SH FILES
+.TP
+\fI\*d\fP
+default \fItermcap\fP terminal capability database
 .SH NOTES
 The verbose option is not identical to SVr4's.
 Under SVr4, instead of following
-the \fB\-v\fP with a trace level n, you repeat it n times.
+the \fB\-v\fP with a trace level \fIn\fP,
+you repeat it \fIn\fP times.
 .SH PORTABILITY
 X/Open Curses, Issue 7 (2009) describes \fBtic\fP briefly,
 but omits this program.
-SVr4 systems provide \fBcaptoinfo\fP as a separate application from \fBtic\fP.
+SVr4 systems provide \fB\%captoinfo\fP as a separate application from
+\fBtic\fP.
 .PP
 NetBSD does not provide this application.
-.SH SEE ALSO
-\fB@INFOCMP@\fP(1M),
-\fBcurses\fP(3X),
-\fBterminfo\fP(\*n)
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
 Thomas E. Dickey <dickey@invisible-island.net>
+.SH SEE ALSO
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@TIC@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/clear.1 b/man/clear.1
index 7b620fe80..07ddd93be 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,33 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.38 2023/09/16 23:39:05 tom Exp $
-.TH @CLEAR@ 1 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.40 2023/10/01 22:12:38 tom Exp $
+.TH @CLEAR@ 1 2023-10-01 "ncurses 6.4" "User commands"
 .ie n .ds CW R
 .el   \{
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
-.\" these would be fallbacks for DS/DE,
-.\" but groff changed the meaning of the macros.
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie \n(.g .ds '  \(aq
+.el       .ds ' '
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -63,107 +49,134 @@
 \fB\%@CLEAR@\fP \-
 clear the terminal screen
 .SH SYNOPSIS
-\fB@CLEAR@\fR [\fB\-T\fItype\fR] [\fB\-V\fR] [\fB\-x\fR]
+.B @CLEAR@
+.RB [ \-x ]
+.RB [ \-T\ \c
+.IR type ]
+.PP
+.B "@CLEAR@ \-V"
 .SH DESCRIPTION
-\fB@CLEAR@\fP clears your terminal's screen if this is possible,
-including the terminal's scrollback buffer
-(if the extended \*(``E3\*('' capability is defined).
-\fB@CLEAR@\fP looks in the environment for the terminal type
-given by the environment variable \fBTERM\fP,
-and then in the
-\fBterminfo\fP database to determine how to clear the screen.
+\fB\%@CLEAR@\fP clears your terminal's screen and its scrollback buffer,
+if any.
+\fB\%@CLEAR@\fP retrieves the terminal type from the environment
+variable \fBTERM\fP,
+then consults the \fIterminfo\fP terminal capability database entry for
+that type to determine how to perform these actions.
 .PP
-\fB@CLEAR@\fP writes to the standard output.
-You can redirect the standard output to a file (which prevents
-\fB@CLEAR@\fP from actually clearing the screen),
-and later \fBcat\fP the file to the screen, clearing it at that point.
+The capabilities to clear the screen and scrollback buffer are named
+\*(``clear\*('' and \*(``E3\*('', respectively.
+The latter is a \fIuser-defined capability\fP,
+applying an extension mechanism introduced in \fIncurses\fP 5.0 (1999).
 .SH OPTIONS
-.TP 5
+\fB\%@CLEAR@\fP recognizes the following options.
+.TP 9 \" "-T type" + 2n
 .B \-T \fItype\fP
-indicates the \fItype\fP of terminal.
-Normally this option is
-unnecessary, because the default is taken from the environment
-variable \fBTERM\fP.
-If \fB\-T\fP is specified, then the shell
-variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored.
+produces instructions suitable for the terminal \fItype\fP.
+Normally,
+this option is unnecessary,
+because the terminal type is inferred from the environment variable
+\fBTERM\fP.
+If this option is specified,
+\fB\%@CLEAR@\fP ignores the environment variables \fBLINES\fP and
+\fB\%COLUMNS\fP as well.
 .TP
 .B \-V
-reports the version of ncurses which was used in this program, and exits.
-The options are as follows:
+reports the version of \fIncurses\fP associated with this program and
+exits with a successful status.
 .TP
 .B \-x
-do not attempt to clear the terminal's scrollback buffer
-using the extended \*(``E3\*('' capability.
+prevents \fB\%@CLEAR@\fP from attempting to clear the scrollback buffer.
 .SH HISTORY
-A \fBclear\fP command appeared in 2.79BSD dated February 24, 1979.
-Later that was provided in Unix 8th edition (1985).
+A \fBclear\fP command using the \fItermcap\fP database and library
+appeared in 2BSD (1979).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
+Eighth Edition Unix (1985) later included it.
 .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
+The commercial Unix arm of AT&T adapted a different BSD program
+(\fBtset\fP) to make a new command,
+\fBtput\fP,
+and replaced the \fBclear\fP program with a shell script that called
+\*(``\fBtput clear\fP\*(''.
+.PP
+.RS 4
+.EX
+/usr/bin/tput ${1:+\-T$1} clear 2> /dev/null
 exit
-.NE
+.EE
+.RE
 .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
+to make it similar to AT&T's \fBtput\fP,
+he added a \fBclear\fP shell script as well.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
+.\"   tput/clear.sh
+.PP
+.RS 4
+.EX
 exec tput clear
-.NE
+.EE
+.RE
 .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:
+In 1995,
+\fIncurses\fP's \fBclear\fP began by adapting BSD's original \fBclear\fP
+command to use \fIterminfo\fP.
+The \fBE3\fP extension came later.
 .bP
-In June 1999, \fBxterm\fP provided an extension to the standard control
+In June 1999, \fIxterm\fP 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
+.RS 8
+.EX
+printf \*'\e033[2J\*'
+.EE
+.RE
+.IP
+one could clear the scrollback buffer using
 .IP
-This is documented in \fIXTerm Control Sequences\fP as a feature originating
-with \fBxterm\fP.
+.RS 8
+.EX
+printf \*'\e033[\fB3\fPJ\*'
+.EE
+.RE
+.IP
+\*(``XTerm Control Sequences\fP\*('' documents this feature as
+originating with \fIxterm\fP.
 .bP
-A few other terminal developers adopted the feature, e.g., PuTTY in 2006.
+A few other terminal emulators adopted it,
+such as 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 \fBxterm\fP,
-although it was cited in the Red Hat bug report (#683733)
-which led to the change.
+Documentation of this change,
+appearing in Linux 3.0,
+did not mention \fIxterm\fP,
+although that program was cited in the Red Hat bug report (#683733)
+motivating the feature.
 .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.
+Subsequently,
+more terminal developers adopted the feature.
+The next relevant step was to change the \fIncurses\fP \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.
+In 2013,
+the \fBE3\fP capability was not exercised by
+\*(``\fB\%@TPUT@ clear\fP\*(''.
+That oversight 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@.
+Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@TSET@\fP or
+\fB\%@RESET@\fP.
 .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.
+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@\fP(1),
-\fBxterm\fP(1),
-\fBterminfo\fP(\*n).
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%@TPUT@\fP(1),
+\fB\%xterm\fP(1),
+\fB\%terminfo\fP(\*n)
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 69c2ed0ba..f0f5c079f 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.43 2023/09/16 23:34:43 tom Exp $
-.TH curs_add_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.45 2023/09/30 21:38:11 tom Exp $
+.TH curs_add_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -345,13 +345,11 @@ may hold one non-spacing character.
 In the latter case, ncurses adds the non-spacing character to the active
 (base) spacing character.
 .SH SEE ALSO
-.na
-.hy 0
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X),
-\fBcurs_attr\fP(3X),
-\fBcurs_clear\fP(3X),
-\fBcurs_getcchar\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBputwc\fP(3)
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_attr\fP(3X),
+\fB\%curs_clear\fP(3X),
+\fB\%curs_getcchar\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%putwc\fP(3)
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index ac24b36d2..1570a6176 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.25 2023/09/16 23:34:43 tom Exp $
-.TH curs_add_wchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH curs_add_wchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -112,9 +112,9 @@ All functions except \fBwadd_wchnstr\fP may be macros.
 .SH PORTABILITY
 These entry points are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_addwstr\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_addwstr\fP(3X)
 .PP
 Comparable functions in the narrow-character (ncurses) library are
 described in
-\fBcurs_addchstr\fP(3X).
+\fB\%curs_addchstr\fP(3X).
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 7cfc3db9b..d5d6aff21 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.69 2023/09/16 23:34:43 tom Exp $
-.TH curs_addch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.71 2023/09/30 21:38:11 tom Exp $
+.TH curs_addch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -308,15 +308,15 @@ If \fIch\fP is a carriage return,
 the cursor is moved to the beginning of the current row of the window.
 This is true of other implementations, but is not documented.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_attr\fP(3X),
-\fBcurs_clear\fP(3X),
-\fBcurs_inch\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBputc\fP(3).
+\fB\%curses\fP(3X),
+\fB\%curs_attr\fP(3X),
+\fB\%curs_clear\fP(3X),
+\fB\%curs_inch\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%putc\fP(3)
 .PP
 Comparable functions in the wide-character (ncursesw) library are
 described in
-\fBcurs_add_wch\fP(3X).
+\fB\%curs_add_wch\fP(3X).
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index fbf46367a..905f74426 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.31 2023/09/16 23:34:43 tom Exp $
-.TH curs_addchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.33 2023/09/30 21:38:11 tom Exp $
+.TH curs_addchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -106,9 +106,9 @@ All functions except \fBwaddchnstr\fP may be macros.
 .SH PORTABILITY
 These entry points are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_addstr\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_addstr\fP(3X)
 .PP
 Comparable functions in the wide-character (ncursesw) library are
 described in
-\fBcurs_add_wchstr\fP(3X).
+\fB\%curs_add_wchstr\fP(3X).
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index e7543bb9f..b0b35482d 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.32 2023/09/16 23:34:43 tom Exp $
-.TH curs_addstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
+.TH curs_addstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -112,5 +112,5 @@ All of these functions except \fBwaddnstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X)
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index a0a1b4230..eb9f1eaaa 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.24 2023/09/16 23:34:43 tom Exp $
-.TH curs_addwstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
+.TH curs_addwstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -108,6 +108,6 @@ All of these functions except \fBwaddnwstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X),
-\fBcurs_add_wch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_add_wch\fP(3X)
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 133e751d4..e6db84bf6 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.84 2023/09/16 23:34:43 tom Exp $
-.TH curs_attr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.86 2023/09/30 21:38:11 tom Exp $
+.TH curs_attr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -602,10 +602,9 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 or if the window pointer is null.
 .\" ---------------------------------------------------------------------------
 .SH SEE ALSO
-.na
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X),
-\fBcurs_addstr\fP(3X),
-\fBcurs_bkgd\fP(3X),
-\fBcurs_printw\fP(3X),
-\fBcurs_variables\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addstr\fP(3X),
+\fB\%curs_bkgd\fP(3X),
+\fB\%curs_printw\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 2f0a82910..9e17fa4b9 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.22 2023/09/16 23:34:43 tom Exp $
-.TH curs_beep 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_beep.3x,v 1.24 2023/09/30 21:38:11 tom Exp $
+.TH curs_beep 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -60,4 +60,4 @@ possible to tell when the beep or flash failed.
 These functions are described in the XSI Curses standard, Issue 4.
 Like SVr4, it specifies that they always return \fBOK\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X)
+\fB\%curses\fP(3X)
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index b95ee2ab6..ac30e16d4 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.44 2023/09/16 23:34:43 tom Exp $
-.TH curs_bkgd 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
+.TH curs_bkgd 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -158,8 +158,7 @@ and will reuse the old background character if the check fails.
 These functions are described in the XSI Curses standard, Issue 4
 (X/Open Curses).
 .SH SEE ALSO
-.na
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X),
-\fBcurs_attr\fP(3X),
-\fBcurs_outopts\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_attr\fP(3X),
+\fB\%curs_outopts\fP(3X)
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 7a7894531..227c6a202 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.27 2023/09/16 23:34:43 tom Exp $
-.TH curs_bkgrnd 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH curs_bkgrnd 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -116,5 +116,5 @@ A null character pointer is treated as an error.
 These functions are described in the XSI Curses standard, Issue 4
 (X/Open Curses).
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_bkgd\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_bkgd\fP(3X)
diff --git a/man/curs_border.3x b/man/curs_border.3x
index a3f752113..8891d9d87 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.38 2023/09/16 23:34:43 tom Exp $
-.TH curs_border 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
+.TH curs_border 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -156,4 +156,5 @@ These functions are described in the XSI Curses standard, Issue 4.
 The standard specifies that they return \fBERR\fP on failure,
 but specifies no error conditions.
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_outopts\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_outopts\fP(3X)
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 5b672f7de..b35331444 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.24 2023/09/16 23:34:43 tom Exp $
-.TH curs_border_set 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
+.TH curs_border_set 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -196,7 +196,7 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH SEE ALSO
-\fBncurses\fP(3X),
-\fBcurs_add_wch\fP(3X),
-\fBcurs_border\fP(3X),
-\fBcurs_outopts\fP(3X)
+\fB\%ncurses\fP(3X),
+\fB\%curs_add_wch\fP(3X),
+\fB\%curs_border\fP(3X),
+\fB\%curs_outopts\fP(3X)
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 1c8d3535f..d59b321ad 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.35 2023/09/16 23:34:43 tom Exp $
-.TH curs_clear 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
+.TH curs_clear 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -125,7 +125,7 @@ even for a subwindow or derived window.
 If you do not want to clear the screen during the next \fBwrefresh\fP,
 use \fBwerase\fP instead.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 6b1e5bac3..5a9bfd5c0 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.82 2023/09/23 22:24:15 tom Exp $
-.TH curs_color 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.84 2023/09/30 20:13:18 tom Exp $
+.TH curs_color 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -193,14 +193,14 @@ No other color pairs are initialized.
 It restores the colors on the terminal to the values
 they had when the terminal was just turned on.
 .bP
-If the terminal supports the \fBinitc\fP (\fB\%initialize_color\fP) capability,
+If the terminal supports the \fBinitc\fP \%(\fBinitialize_color\fP) capability,
 \fB\%start_color\fP
 initializes its internal table representing the
 red, green, and blue components of the color palette.
 .IP
 The components depend on whether the terminal uses
 CGA (aka \*(``ANSI\*('') or
-HLS (i.e., the \fBhls\fP (\fB\%hue_lightness_saturation\fP) capability is set).
+HLS (i.e., the \fBhls\fP \%(\fBhue_lightness_saturation\fP) capability is set).
 The table is initialized first for eight basic colors
 (black, red, green, yellow, blue, magenta, cyan, and white),
 using weights that depend upon the CGA/HLS choice.
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index dab1d4239..c2e4ff829 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.26 2023/09/16 23:34:43 tom Exp $
-.TH curs_delch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_delch.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
+.TH curs_delch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -73,4 +73,4 @@ The
 standard specifies that they return \fBERR\fP on failure, but specifies no
 error conditions.
 .SH SEE ALSO
-\fBcurses\fP(3X)
+\fB\%curses\fP(3X)
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 55ef06a32..554af5f3d 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.28 2023/09/16 23:34:43 tom Exp $
-.TH curs_deleteln 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH curs_deleteln 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%deleteln\fP,
 \fB\%wdeleteln\fP,
@@ -90,4 +90,4 @@ terminal.
 In fact, they will not use hardware line delete/insert unless
 \fBidlok(..., TRUE)\fP has been set on the current window.
 .SH SEE ALSO
-\fBcurses\fP(3X)
+\fB\%curses\fP(3X)
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 5ea88a028..bed7f4f3f 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.36 2023/09/16 23:34:43 tom Exp $
-.TH curs_extend 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH curs_extend 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -79,16 +79,16 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
-.SH SEE ALSO
-\fBcurs_getch\fP(3X),
-\fBcurs_mouse\fP(3X),
-\fBcurs_print\fP(3X),
-\fBcurs_util\fP(3X),
-\fBdefault_colors\fP(3X),
-\fBdefine_key\fP(3X),
-\fBkeybound\fP(3X),
-\fBkeyok\fP(3X),
-\fBresizeterm\fP(3X),
-\fBwresize\fP(3X).
 .SH AUTHOR
 Thomas Dickey.
+.SH SEE ALSO
+\fB\%curs_getch\fP(3X),
+\fB\%curs_mouse\fP(3X),
+\fB\%curs_print\fP(3X),
+\fB\%curs_util\fP(3X),
+\fB\%default_colors\fP(3X),
+\fB\%define_key\fP(3X),
+\fB\%keybound\fP(3X),
+\fB\%keyok\fP(3X),
+\fB\%resizeterm\fP(3X),
+\fB\%wresize\fP(3X)
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 0a033174b..a81c9ebf2 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.23 2023/09/16 23:34:43 tom Exp $
-.TH curs_get_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
+.TH curs_get_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -183,9 +183,9 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_getch\fP(3X),
-\fBcurs_ins_wch\fP(3X),
-\fBcurs_inopts\fP(3X),
-\fBcurs_move\fP(3X),
-\fBcurs_refresh\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_getch\fP(3X),
+\fB\%curs_ins_wch\fP(3X),
+\fB\%curs_inopts\fP(3X),
+\fB\%curs_move\fP(3X),
+\fB\%curs_refresh\fP(3X)
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index ec2bac776..3d53b30be 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.34 2023/09/16 23:34:43 tom Exp $
-.TH curs_get_wstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.36 2023/09/30 21:38:11 tom Exp $
+.TH curs_get_wstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -216,7 +216,6 @@ while others (PDCurses) do not allow this.
 NetBSD 7 curses imitates ncurses 6.1 in this regard,
 treating a \fB\-1\fP as an indefinite number of characters.
 .SH SEE ALSO
-Functions:
-\fBcurses\fP(3X),
-\fBcurs_get_wch\fP(3X),
-\fBcurs_getstr\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_get_wch\fP(3X),
+\fB\%curs_getstr\fP(3X)
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 3e6971ab2..94b87a526 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.35 2023/09/16 23:34:43 tom Exp $
-.TH curs_getcchar 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
+.TH curs_getcchar 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -190,8 +190,7 @@ including using them for ligatures between characters
 Unicode does not limit the (analogous) number of combining characters,
 so some applications may be affected.
 .SH SEE ALSO
-Functions:
-\fBcurs_attr\fP(3X),
-\fBcurs_color\fP(3X),
-\fBcurses\fP(3X),
-\fBwcwidth\fP(3).
+\fB\%curs_attr\fP(3X),
+\fB\%curs_color\fP(3X),
+\fB\%curses\fP(3X),
+\fB\%wcwidth\fP(3)
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index b09520270..22c25bff9 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.72 2023/09/16 23:34:43 tom Exp $
-.TH curs_getch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.74 2023/09/30 21:38:11 tom Exp $
+.TH curs_getch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -400,15 +400,15 @@ The \fBhas_key\fP function is unique to \fBncurses\fP.
 We recommend that
 any code using it be conditionalized on the \fBNCURSES_VERSION\fP feature macro.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_inopts\fP(3X),
-\fBcurs_mouse\fP(3X),
-\fBcurs_move\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBresizeterm\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_inopts\fP(3X),
+\fB\%curs_mouse\fP(3X),
+\fB\%curs_move\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%resizeterm\fP(3X)
 .PP
 Comparable functions in the wide-character (ncursesw) library are
 described in
-\fBcurs_get_wch\fP(3X).
+\fB\%curs_get_wch\fP(3X).
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index ba385e2b9..f4c65f344 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.46 2023/09/16 23:34:43 tom Exp $
-.TH curs_getstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.48 2023/09/30 21:38:11 tom Exp $
+.TH curs_getstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -281,7 +281,7 @@ Starting in 2021 (ncurses 6.3), \fBgetnstr\fP sets \fBraw\fP,
 rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
 SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_getch\fP(3X),
-\fBcurs_termattrs\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_getch\fP(3X),
+\fB\%curs_termattrs\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index feaf2bc83..fcc430b2d 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp $
-.TH curs_in_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp $
+.TH curs_in_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -68,5 +68,5 @@ Note that all of these routines may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_inch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_inch\fP(3X)
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 3888f8852..7118abf95 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
-.TH curs_in_wchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
+.TH curs_in_wchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -115,9 +115,8 @@ The XSI Curses defines no error conditions.
 This implementation checks for null pointers,
 returning \fBERR\fP in that case.
 .SH SEE ALSO
-Functions:
-\fBcurses\fP(3X),
-\fBcurs_in_wch\fP(3X),
-\fBcurs_instr\fP(3X),
-\fBcurs_inwstr\fP(3X)
-\fBcurs_inchstr\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_in_wch\fP(3X),
+\fB\%curs_instr\fP(3X),
+\fB\%curs_inwstr\fP(3X)
+\fB\%curs_inchstr\fP(3X)
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 2df5e11aa..16f2fb96d 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
-.TH curs_inch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH curs_inch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -107,13 +107,15 @@ This implementation uses 8 bits for character values.
 An application using more bits, e.g., a Unicode value,
 should use the wide-character equivalents to these functions.
 .SH SEE ALSO
-.TP 5
-\fBcurses\fP(3X)
-gives an overview of the WINDOW and \fBchtype\fP data types.
-.TP 5
-\fBcurs_attr\fP(3X)
+.TP
+\fB\%curses\fP(3X)
+gives an overview of the \fB\%WINDOW\fP and \fB\%chtype\fP data types.
+.TP
+\fB\%curs_attr\fP(3X)
 goes into more detail, pointing out portability problems and
-constraints on the use of \fBchtype\fP for returning window information.
-.TP 5
-\fBcurs_in_wch\fP(3X)
-describes comparable functions for the wide-character (ncursesw) library.
+constraints on the use of \fB\%chtype\fP for returning window
+information.
+.TP
+\fB\%curs_in_wch\fP(3X)
+describes comparable functions for the wide-character (ncursesw)
+library.
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index f174b09f7..1bbb75dd3 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.32 2023/09/16 23:37:03 tom Exp $
-.TH curs_inchstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
+.TH curs_inchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -103,8 +103,9 @@ more specific than the SVr4 documentation on the trailing 0.
 It does specify
 that the successful return of the functions is \fBOK\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_inch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_inch\fP(3X)
 .PP
 Comparable functions in the wide-character (ncursesw) library are
 described in
-\fBcurs_in_wchstr\fP(3X).
+\fB\%curs_in_wchstr\fP(3X).
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 404c2bdc6..cfc8d1096 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.50 2023/09/16 23:37:03 tom Exp $
-.TH curs_initscr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.52 2023/09/30 21:38:11 tom Exp $
+.TH curs_initscr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -294,10 +294,10 @@ At the same time, \fBwgetch\fP calls \fBresizeterm\fP to adjust the
 standard screen \fBstdscr\fP,
 and update other data such as \fBLINES\fP and \fBCOLS\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_kernel\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_slk\fP(3X),
-\fBcurs_terminfo\fP(3X),
-\fBcurs_util\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_slk\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%curs_util\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 021046629..ead78c7e3 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.19 2023/09/16 23:37:03 tom Exp $
-.TH curs_ins_wch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp $
+.TH curs_ins_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -65,5 +65,5 @@ or if the window pointer is null.
 .SH ERRORS
 No errors are defined.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_insch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_insch\fP(3X)
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 648560708..019f1e0eb 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.20 2023/09/16 23:37:03 tom Exp $
-.TH curs_ins_wstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.22 2023/09/30 21:38:11 tom Exp $
+.TH curs_ins_wstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -102,7 +102,7 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_insstr\fP(3X),
-\fBcurs_in_wch\fP(3X),
-\fBcurs_ins_wch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_insstr\fP(3X),
+\fB\%curs_in_wch\fP(3X),
+\fB\%curs_ins_wch\fP(3X)
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 4a808607f..56d409887 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.30 2023/09/16 23:37:03 tom Exp $
-.TH curs_insch 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
+.TH curs_insch 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -72,8 +72,8 @@ Note that \fBinsch\fP, \fBmvinsch\fP, and \fBmvwinsch\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X).
+\fB\%curses\fP(3X)
 .PP
 Comparable functions in the wide-character (ncursesw) library are
 described in
-\fBcurs_ins_wch\fP(3X).
+\fB\%curs_ins_wch\fP(3X).
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 2621bfe50..7bc2006d6 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
-.TH curs_insstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH curs_insstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -99,7 +99,7 @@ The Single Unix Specification, Version 2 states that
 This is probably an error, since it makes this group of functions inconsistent.
 Also, no implementation of curses documents this inconsistency.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_util\fP(3X),
-\fBcurs_clear\fP(3X),
-\fBcurs_inch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_util\fP(3X),
+\fB\%curs_clear\fP(3X),
+\fB\%curs_inch\fP(3X)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index fbbf1782a..2b4a9b7d9 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.33 2023/09/16 23:37:03 tom Exp $
-.TH curs_instr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.35 2023/09/30 21:38:11 tom Exp $
+.TH curs_instr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -96,4 +96,4 @@ The ncurses library extends the XSI description by allowing a negative
 value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
-\fBcurses\fP(3X).
+\fB\%curses\fP(3X)
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index fa283a8c1..df97c51dc 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
-.TH curs_inwstr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH curs_inwstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -100,6 +100,6 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_instr\fP(3X),
-\fBcurs_in_wchstr\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_instr\fP(3X),
+\fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 6692479fb..8993e6c95 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
-.TH curs_kernel 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
+.TH curs_kernel 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -207,10 +207,10 @@ as having return type int.
 This is misleading, as they are macros with no documented semantics
 for the return value.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_outopts\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_scr_dump\fP(3X),
-\fBcurs_slk\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_outopts\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_scr_dump\fP(3X),
+\fB\%curs_slk\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 182737313..dd158643b 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.25 2023/09/23 21:07:59 tom Exp $
-.TH curs_memleaks 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.27 2023/09/30 23:13:30 tom Exp $
+.TH curs_memleaks 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -49,7 +49,7 @@ check for memory leaks in \fIcurses\fR
 \fB#include <term.h>\fP
 \fBvoid exit_terminfo(int \fIcode\fB);\fR
 .PP
-/* deprecated (intentionally not declared in curses.h or term.h) */
+\fI/* deprecated (intentionally not declared in curses.h or term.h) */\fP
 \fBvoid _nc_freeall(void);\fP
 \fBvoid _nc_free_and_exit(int \fIcode\fB);\fR
 \fBvoid _nc_free_tinfo(int \fIcode\fB);\fR
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 7ac46740d..3431cc1f0 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.29 2023/09/16 20:18:53 tom Exp $
-.TH curs_move 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_move.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH curs_move 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -59,4 +59,5 @@ Note that \fBmove\fP may be a macro.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_refresh\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_refresh\fP(3X)
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 6e13f7db3..3c206555b 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.33 2023/09/23 22:59:48 tom Exp $
-.TH curs_opaque 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.35 2023/09/30 22:01:38 tom Exp $
+.TH curs_opaque 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -66,67 +66,74 @@ obtain \fIcurses\fR window properties
 \fBbool is_scrollok(const WINDOW *\fIwin\fB);\fR
 \fBbool is_subwin(const WINDOW *\fIwin\fB);\fR
 \fBbool is_syncok(const WINDOW *\fIwin\fB);\fR
+.PP
 \fBWINDOW * wgetparent(const WINDOW *\fIwin\fB);\fR
 \fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
 \fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int *\fIbottom\fB);\fR
 .fi
 .SH DESCRIPTION
-This implementation provides functions which return properties
-set in the \fB\%WINDOW\fP structure, allowing it to be \*(``opaque\*('' if
-the symbol \fB\%NCURSES_OPAQUE\fP is defined:
-.TP 5
+\fIncurses\fP provides functions returning properties of a
+\fI\%WINDOW\fP structure,
+allowing it to be \*(``opaque\*('' if
+the application defines the \fB\%NCURSES_OPAQUE\fP preprocessor symbol.
+.TP
 \fBis_cleared\fP
-returns the value set in \fB\%clearok\fP(3X)
-.TP 5
+returns the value set by \fB\%clearok\fP(3X).
+.TP
 \fBis_idcok\fP
-returns the value set in \fB\%idcok\fP(3X)
-.TP 5
+returns the value set by \fB\%idcok\fP(3X).
+.TP
 \fBis_idlok\fP
-returns the value set in \fB\%idlok\fP(3X)
-.TP 5
+returns the value set by \fB\%idlok\fP(3X).
+.TP
 \fBis_immedok\fP
-returns the value set in \fB\%immedok\fP(3X)
-.TP 5
+returns the value set by \fB\%immedok\fP(3X).
+.TP
 \fBis_keypad\fP
-returns the value set in \fB\%keypad\fP(3X)
-.TP 5
+returns the value set by \fB\%keypad\fP(3X).
+.TP
 \fBis_leaveok\fP
-returns the value set in \fB\%leaveok\fP(3X)
-.TP 5
+returns the value set by \fB\%leaveok\fP(3X).
+.TP
 \fBis_nodelay\fP
-returns the value set in \fB\%nodelay\fP(3X)
-.TP 5
+returns the value set by \fB\%nodelay\fP(3X).
+.TP
 \fBis_notimeout\fP
-returns the value set in \fB\%notimeout\fP(3X)
-.TP 5
+returns the value set by \fB\%notimeout\fP(3X).
+.TP
 \fBis_pad\fP
-returns \fBTRUE\fP if the window is a pad
-i.e., created by \fB\%newpad\fP(3X)
-.TP 5
+returns \fBTRUE\fP if the window is a pad;
+that is,
+it created by \fB\%newpad\fP(3X).
+.TP
 \fBis_scrollok\fP
-returns the value set in \fB\%scrollok\fP(3X)
-.TP 5
+returns the value set by \fB\%scrollok\fP(3X).
+.TP
 \fBis_subwin\fP
 returns \fBTRUE\fP if the window is a subwindow,
-i.e., created by \fB\%subwin\fP(3X) or \fB\%derwin\fP(3X)
-.TP 5
+that is,
+it was created by \fB\%subwin\fP(3X) or \fB\%derwin\fP(3X).
+.TP
 \fBis_syncok\fP
-returns the value set in \fB\%syncok\fP(3X)
-.TP 5
+returns the value set by \fB\%syncok\fP(3X).
+.TP
 \fBwgetdelay\fP
-returns the delay timeout as set in \fB\%wtimeout\fP(3X).
-.TP 5
+returns the delay timeout set by \fB\%wtimeout\fP(3X).
+.TP
 \fBwgetparent\fP
-returns the parent \fB\%WINDOW\fP pointer for subwindows,
+returns the parent \fI\%WINDOW\fP pointer for subwindows,
 or \fBNULL\fP for windows having no parent.
-.TP 5
+.TP
 \fBwgetscrreg\fP
-returns the top and bottom rows for the scrolling margin
-as set in \fB\%wsetscrreg\fP(3X).
+stores the the top and bottom rows for the scrolling margin set by
+\fB\%wsetscrreg\fP(3X) in the corresponding arguments,
+returning \fBERR\fP upon failure and \fBOK\fP upon successful
+completion.
 .SH RETURN VALUE
-These functions all return \fBTRUE\fP or \fBFALSE\fP, except as noted.
+These functions return \fBTRUE\fP or \fBFALSE\fP except as noted.
 .SH NOTES
-Both a macro and a function are provided for each name.
+\fIncurses\fP provides both a C function and a preprocessor macro for
+each function documented in this page.
 .SH PORTABILITY
 These routines are specific to \fIncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
@@ -136,4 +143,5 @@ be conditioned using \fB\%NCURSES_VERSION\fP.
 \fB\%curses\fP(3X),
 \fB\%curs_inopts\fP(3X),
 \fB\%curs_outopts\fP(3X),
+\fB\%curs_threads\fP(3X),
 \fB\%curs_window\fP(3X)
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 3f7eb90ec..3f0bfdaee 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
-.TH curs_outopts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
+.TH curs_outopts 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -200,11 +200,10 @@ Note that
 The \fBimmedok\fP routine is useful for windows that are used as terminal
 emulators.
 .SH SEE ALSO
-.na
-\fBcurses\fP(3X),
-\fBcurs_addch\fP(3X),
-\fBcurs_clear\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_scroll\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_clear\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_scroll\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 6f98fc714..c582152cf 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.30 2023/09/16 23:37:03 tom Exp $
-.TH curs_overlay 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
+.TH curs_overlay 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%overlay\fP,
 \fB\%overwrite\fP,
@@ -81,4 +81,6 @@ qualifiers).
 It further specifies their behavior in the presence of characters
 with multibyte renditions (not yet supported in this implementation).
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_pad\fP(3X), \fBcurs_refresh\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_pad\fP(3X),
+\fB\%curs_refresh\fP(3X)
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 9f804a458..d7f266071 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
-.TH curs_printw 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
+.TH curs_printw 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -143,10 +143,9 @@ because that header is included in \fB<curses.h\fP>.
 X/Open Curses, Issue 5 (December 2007) marked \fBvwprintw\fP (along with
 \fBvwscanw\fP and the termcap interface) as withdrawn.
 .SH SEE ALSO
-.na
-\fBcurses\fP(3X),
-\fBcurs_addstr\fP(3X),
-\fBcurs_scanw\fP(3X),
-\fBcurs_termcap\fP(3X),
-\fBprintf\fP(3),
-\fBvprintf\fP(3).
+\fB\%curses\fP(3X),
+\fB\%curs_addstr\fP(3X),
+\fB\%curs_scanw\fP(3X),
+\fB\%curs_termcap\fP(3X),
+\fB\%printf\fP(3),
+\fB\%vprintf\fP(3)
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index e458b1289..c1abae444 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.35 2023/09/16 23:37:03 tom Exp $
-.TH curs_refresh 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
+.TH curs_refresh 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -154,6 +154,6 @@ implementations.
 Instead, you can do an explicit \fBtouchwin\fP before the
 \fBwnoutrefresh\fP call to guarantee an entire-contents copy anywhere.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_outopts\fP(3X)
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_outopts\fP(3X)
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index 9aff66fab..8f905b998 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
-.TH curs_scanw 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
+.TH curs_scanw 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -163,9 +163,8 @@ since the \fBOK\fP value (zero) is likely to be misleading.
 One possible way to get useful results would be to use a "%n" conversion
 at the end of the format string to ensure that something was processed.
 .SH SEE ALSO
-.na
-\fBcurses\fP(3X),
-\fBcurs_getstr\fP(3X),
-\fBcurs_printw\fP(3X),
-\fBcurs_termcap\fP(3X),
-\fBscanf\fP(3).
+\fB\%curses\fP(3X),
+\fB\%curs_getstr\fP(3X),
+\fB\%curs_printw\fP(3X),
+\fB\%curs_termcap\fP(3X),
+\fB\%scanf\fP(3)
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index fb74acba9..2e4b7bc82 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
-.TH curs_scr_dump 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH curs_scr_dump 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -104,9 +104,9 @@ The SVr4 docs merely say under \fBscr_init\fP that the dump data is also
 considered invalid "if the time-stamp of the tty is old" but do not define
 \*(``old\*(''.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_util\fP(3X),
-\fBscr_dump\fP(5),
-\fBsystem\fP(3)
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_util\fP(3X),
+\fB\%scr_dump\fP(5),
+\fB\%system\fP(3)
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 135183ad4..65c26d471 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.32 2023/09/16 23:37:03 tom Exp $
-.TH curs_scroll 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
+.TH curs_scroll 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -88,4 +88,5 @@ Under this implementation it is.
 .SH PORTABILITY
 The XSI Curses standard, Issue 4 describes these functions.
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_outopts\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_outopts\fP(3X)
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 2cdab7926..cac57c1bf 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.60 2023/09/23 22:49:51 tom Exp $
-.TH curs_slk 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.62 2023/09/30 20:13:18 tom Exp $
+.TH curs_slk 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -274,7 +274,7 @@ along with a reserved \fIopts\fP parameter.
 Two of these new functions (unlike the SVr4 functions) have no provision
 for color: \fB\%slk_attr_on\fP and \fB\%slk_attr_off\fP.
 .IP
-The third function (\fB\%slk_attr_set\fP) has a color-pair parameter.
+The third function \%(\fBslk_attr_set\fP) has a color-pair parameter.
 .bP
 It added \fBconst\fP qualifiers to parameters (unnecessarily), and
 .bP
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index d22a9ef63..4e9116d9b 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.37 2023/09/16 23:37:03 tom Exp $
-.TH curs_sp_funcs 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.40 2023/09/30 23:13:32 tom Exp $
+.TH curs_sp_funcs 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,8 +39,7 @@
 .SH SYNOPSIS
 \fB#include <curses.h>\fP
 .nf
-.na
-.sp
+.PP
 \fBint alloc_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
 \fBint assume_default_colors_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
 \fBint baudrate_sp(SCREEN* \fIsp\fB);\fR
@@ -51,7 +50,7 @@
 \fBint curs_set_sp(SCREEN* \fIsp\fB, int \fIvisibility\fR);\fR
 \fBint def_prog_mode_sp(SCREEN* \fIsp\fB);\fR
 \fBint def_shell_mode_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBint define_key_sp(SCREEN* \fIsp\fB, const char * \fIdefinition\fB, int \fIkeycode\fB);\fR
 \fBint delay_output_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
 \fBint doupdate_sp(SCREEN* \fIsp\fB);\fR
@@ -62,7 +61,7 @@
 \fBint extended_color_content_sp(SCREEN * \fIsp\fB, int \fIcolor\fB, int * \fIr\fB, int * \fIg\fB, int * \fIb\fB);\fR
 \fBint extended_pair_content_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int * \fIfg\fB, int * \fIbg\fB);\fR
 \fBint extended_slk_color_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
-.sp
+.PP
 \fBvoid filter_sp(SCREEN* \fIsp\fB);\fR
 \fBint find_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
 \fBint flash_sp(SCREEN* \fIsp\fB);\fR
@@ -73,7 +72,7 @@
 \fBWINDOW* getwin_sp(SCREEN* \fIsp\fB, FILE* \fIfilep\fB);\fR
 \fBint halfdelay_sp(SCREEN* \fIsp\fB, int \fItenths\fB);\fR
 \fBbool has_colors_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBbool has_ic_sp(SCREEN* \fIsp\fB);\fR
 \fBbool has_il_sp(SCREEN* \fIsp\fB);\fR
 \fBint has_key_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
@@ -84,7 +83,7 @@
 \fBint init_pair_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short \fIfg\fB, short \fIbg\fB);\fR
 \fBint intrflush_sp(SCREEN* \fIsp\fB, WINDOW* \fIwin\fB, bool \fIbf\fB);\fR
 \fBint is_cbreak_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBint is_echo_sp(SCREEN* \fIsp\fB);\fR
 \fBint is_nl_sp(SCREEN* \fIsp\fB);\fR
 \fBint is_raw_sp(SCREEN* \fIsp\fB);\fR
@@ -95,7 +94,7 @@
 \fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
 \fBint keyok_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, bool \fIenable\fB);\fR
 \fBchar killchar_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBint killwchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
 \fBchar* longname_sp(SCREEN* \fIsp\fB);\fR
 \fBint mcprint_sp(SCREEN* \fIsp\fB, char *\fIdata\fB, int \fIlen\fB);\fR
@@ -106,7 +105,7 @@
 \fBWINDOW* newpad_sp(SCREEN* \fIsp\fB, int \fInrows\fB, int \fIncols\fB);\fR
 \fBSCREEN* new_prescr(void);\fP
 \fBSCREEN* newterm_sp(SCREEN* \fIsp\fB, const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
-.sp
+.PP
 \fBWINDOW* newwin_sp(SCREEN* \fIsp\fB, int \fInlines\fB, int \fIncols\fB, int \fIbegin_y\fB, int \fIbegin_x\fB);\fR
 \fBint nl_sp(SCREEN* \fIsp\fB);\fR
 \fBint nocbreak_sp(SCREEN* \fIsp\fB);\fR
@@ -117,7 +116,7 @@
 \fBint noraw_sp(SCREEN* \fIsp\fB);\fR
 \fBint pair_content_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short* \fIfg\fB, short* \fIbg\fB);\fR
 \fBvoid qiflush_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBint raw_sp(SCREEN* \fIsp\fB);\fR
 \fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fB);\fR
 \fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
@@ -128,7 +127,7 @@
 \fBint ripoffline_sp(SCREEN* \fIsp\fB, int \fIline\fB, int (*\fIinit\fB)(WINDOW* \fIwin\fB, int \fIfmt\fB));\fR
 \fBint savetty_sp(SCREEN* \fIsp\fB);\fR
 \fBint scr_init_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-.sp
+.PP
 \fBint scr_restore_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
 \fBint scr_set_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
 \fBint set_escdelay_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
@@ -139,7 +138,7 @@
 \fBint slk_attron_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
 \fBattr_t slk_attr_sp(SCREEN* \fIsp\fB);\fR
 \fBint slk_clear_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBint slk_color_sp(SCREEN* \fIsp\fB, short \fIpair\fB);\fR
 \fBint slk_init_sp(SCREEN* \fIsp\fB, int \fIfmt\fB);\fR
 \fBchar* slk_label_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB);\fR
@@ -150,7 +149,7 @@
 \fBint slk_touch_sp(SCREEN* \fIsp\fB);\fR
 \fBint start_color_sp(SCREEN* \fIsp\fB);\fR
 \fBattr_t term_attrs_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fBchtype termattrs_sp(SCREEN* \fIsp\fB);\fR
 \fBchar* termname_sp(SCREEN* \fIsp\fB);\fR
 \fBint typeahead_sp(SCREEN* \fIsp\fB, int \fIfd\fB);\fR
@@ -161,33 +160,31 @@
 \fBvoid use_env_sp(SCREEN* \fIsp\fB, bool \fIbf\fB);\fR
 \fBint use_legacy_coding_sp(SCREEN* \fIsp\fB, int \fIlevel\fB);\fR
 \fBvoid use_tioctl_sp(SCREEN *\fIsp\fB, bool \fIbf\fB);\fR
-.sp
+.PP
 \fBint vid_attr_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB);\fR
 \fBint vid_puts_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
 \fBint vidattr_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB);\fR
 \fBint vidputs_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
 \fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fB, cchar_t *\fIch\fB);\fR
-.ad
-.sp
+.PP
 \fB#include <form.h>\fP
-.sp
+.PP
 \fBFORM* new_form_sp(SCREEN* \fIsp\fB, FIELD **\fIfields\fB);\fR
-.sp
+.PP
 \fB#include <menu.h>\fP
-.sp
+.PP
 \fBMENU* new_menu_sp(SCREEN* \fIsp\fB, ITEM **\fIitems\fB);\fR
-.sp
+.PP
 \fB#include <panel.h>\fP
-.sp
+.PP
 \fBPANEL* ceiling_panel(SCREEN* \fIsp\fB);\fR
 .br
 \fBPANEL* ground_panel(SCREEN* \fIsp\fB);\fR
 .br
 \fBvoid update_panels_sp(SCREEN* \fIsp\fB);\fR
-.sp
+.PP
 \fB#include <term.h>\fP
-.sp
-.na
+.PP
 \fBint del_curterm_sp(SCREEN* \fIsp\fB, TERMINAL *\fIoterm\fB);\fR
 \fBint putp_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB);\fR
 \fBint restartterm_sp(SCREEN* \fIsp\fB, NCURSES_CONST char*\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
@@ -198,18 +195,17 @@
 \fBchar* tgetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, char **\fIarea\fB);\fR
 \fBchar* tgoto_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, int \fIcol\fB, int \fIrow\fB);\fR
 \fBint tigetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-.sp
+.PP
 \fBint tigetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
 \fBchar* tigetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
 \fR/* may instead use 9 long parameters */\fR
 \fBchar* tparm_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, ...);\fR
 \fBint tputs_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, int \fIaffcnt\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-.ad
-.sp
+.PP
 \fB#include <unctrl.h>\fP
-.sp
+.PP
 \fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fB, chtype \fIc\fB);\fR
-.ad
+.fi
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
 improve the ability to manage multiple screens.
@@ -278,6 +274,6 @@ 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 \fINCURSES_SP_FUNCS\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_opaque\fP(3X),
-\fBcurs_threads\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_opaque\fP(3X),
+\fB\%curs_threads\fP(3X)
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 1f529b5d4..f8fe7c064 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
-.TH curs_termattrs 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH curs_termattrs 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -133,4 +133,6 @@ return type of \fBtermattrs\fP to the new type \fBattr_t\fP.
 Most versions of curses truncate the result returned by \fBtermname\fP to
 14 characters.
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBcurs_initscr\fP(3X), \fBcurs_outopts\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_outopts\fP(3X)
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 8e1fd7b84..88bff07d1 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.66 2023/09/16 23:37:03 tom Exp $
-.TH curs_termcap 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.68 2023/09/30 21:38:11 tom Exp $
+.TH curs_termcap 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -376,9 +376,9 @@ As a result, there are differences between any of the four implementations,
 which must be taken into account by programs which can work with all
 termcap library interfaces.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBputc\fP(3),
-\fBterm_variables\fP(3X),
-\fBterminfo\fP(\*n).
-.sp
+\fB\%curses\fP(3X),
+\fB\%putc\fP(3),
+\fB\%term_variables\fP(3X),
+\fB\%terminfo\fP(\*n)
+.PP
 https://invisible-island.net/ncurses/tctest.html
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 90aef061a..978ec5eac 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.108 2023/09/23 23:38:10 tom Exp $
-.TH curs_terminfo 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.111 2023/09/30 21:38:11 tom Exp $
+.TH curs_terminfo 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -216,7 +216,7 @@ or that it is a generic type,
 having too little information for \fIcurses\fP applications to run.
 .IP
 \fB\%setupterm\fP determines if the entry is a generic type by
-checking the \fBgn\fP (\fB\%generic_type\fP) capability.
+checking the \fBgn\fP \%(\fBgeneric_type\fP) capability.
 .TP 5
 .B \-1
 means that the \fIterminfo\fP database could not be found.
@@ -756,12 +756,12 @@ X/Open states that the old location must be given for \fBmvcur\fP.
 This implementation allows the caller to use \-1's for the old ordinates.
 In that case, the old location is unknown.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_kernel\fP(3X),
-\fBcurs_memleaks\fP(3X),
-\fBcurs_termcap\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBterm_variables\fP(3X),
-\fBputc\fP(3),
-\fBterminfo\fP(\*n)
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_memleaks\fP(3X),
+\fB\%curs_termcap\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%term_variables\fP(3X),
+\fB\%putc\fP(3),
+\fB\%terminfo\fP(\*n)
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index c058a14d8..7247a5272 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,243 +28,266 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.41 2023/09/16 23:37:03 tom Exp $
-.TH curs_threads 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.46 2023/10/01 09:45:30 tom Exp $
+.TH curs_threads 3X 2023-10-01 "ncurses 6.4" "Library calls"
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
-\fB\%curs_threads\fP \-
-\fIcurses\fR thread support
+\fI\%NCURSES_WINDOW_CB\fP,
+\fI\%NCURSES_SCREEN_CB\fP,
+\fB\%get_escdelay\fP,
+\fB\%set_escdelay\fP,
+\fB\%set_tabsize\fP,
+\fB\%use_screen\fP,
+\fB\%use_window\fP \-
+\fIcurses\fR support for multi-threaded applications
 .SH SYNOPSIS
+.nf
 \fB#include <curses.h>\fP
-.sp
+.PP
+\fI/* data types */\fP
 \fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fP
-.br
 \fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fP
-.sp
+.PP
 \fBint get_escdelay(void);\fP
-.br
 \fBint set_escdelay(int \fIms\fB);\fR
-.br
 \fBint set_tabsize(int \fIcols\fB);\fR
-.sp
+.PP
 \fBint use_screen(SCREEN *\fIscr\fB, NCURSES_SCREEN_CB \fIfunc\fB, void *\fIdata\fB);\fR
-.br
 \fBint use_window(WINDOW *\fIwin\fB, NCURSES_WINDOW_CB \fIfunc\fB, void *\fIdata\fB);\fR
+.fi
 .SH DESCRIPTION
-This implementation can be configured to provide rudimentary support
-for multi-threaded applications.
-This makes a different set of libraries, e.g., \fBlibncursest\fP since
-the binary interfaces are different.
+The \fIncurses\fP library can be configured to support multi-threaded
+applications in a rudimentary way.
+Such configuration produces a different set of libraries,
+named \fIlibncursest\fP,
+for example,
+since doing so alters \fIncurses\fP's application binary interface
+(ABI).
 .PP
-Rather than modify the interfaces to pass a thread specifier to
-each function, it adds a few functions which can be used in any
-configuration which hide the mutex's needed to prevent concurrent
-use of the global variables when configured for threading.
+Instead of modifying the programming interface (API) to make
+\fIncurses\fP functions expect an additional argument specifying a
+thread,
+the library adds a few functions,
+usable in any configuration,
+that hide the \fImutexes\fP
+(mutual exclusion locks)
+needed to prevent concurrent access to variables shared by multiple
+threads of execution.
 .PP
-In addition to forcing access to members of the \fBWINDOW\fP structure
-to be via functions (see \fBcurs_opaque\fP(3X)),
-it makes functions of the common global variables,
-e.g.,
-COLORS,
-COLOR_PAIRS,
-COLS,
-ESCDELAY,
-LINES,
-TABSIZE
-curscr,
-newscr and
-ttytype.
-Those variables are maintained as read-only values, stored in the \fBSCREEN\fP
-structure.
+\fIncurses\fP threading support requires the use of functions to access
+members of the \fI\%WINDOW\fP structure (see \fBcurs_opaque\fP(3X)).
+It further makes functions of the common global variables
+\fB\%COLORS\fP,
+\fB\%COLOR_PAIRS\fP,
+\fB\%COLS\fP,
+\fB\%ESCDELAY\fP,
+\fB\%LINES\fP,
+\fB\%TABSIZE\fP,
+\fB\%curscr\fP,
+\fB\%newscr\fP,
+and
+\fB\%ttytype\fP,
+maintaining them as as read-only values in the \fISCREEN\fP structure.
 .PP
-Even this is not enough to make a thread-safe application using curses.
-A multi-threaded application would be expected to have threads updating
-separate windows (within the same device),
-or updating on separate screens (on different devices).
-Also, a few of the global variables are considered writable by some
-applications.
+Even this is not enough to make an application using \fIcurses\fP
+thread-safe.
+We would expect a multi-threaded application to have threads updating
+separate windows (on the same device),
+and separate screens (on different devices).
+Further,
+applications expect a few of the global variables to be writable.
 The functions described here address these special situations.
 .PP
-The ESCDELAY and TABSIZE global variables are modified by some applications.
+The \fB\%ESCDELAY\fP and \fB\%TABSIZE\fP global variables are modified
+by some applications.
 To modify them in any configuration,
-use the \fBset_escdelay\fP or \fBset_tabsize\fP functions.
+use the \fB\%set_escdelay\fP or \fB\%set_tabsize\fP functions.
 Other global variables are not modifiable.
+\fBget_escdelay\fP retrieves \fB\%ESCDELAY\fP's value.
 .PP
-The \fBget_escdelay\fP function returns the value for ESCDELAY.
-.PP
-The \fBuse_window\fP and \fBuse_screen\fP functions provide coarse
-granularity mutexes for their respective \fBWINDOW\fP and \fBSCREEN\fP
-parameters, and call a user-supplied function,
-passing it a \fIdata\fP parameter,
-and returning the value from the user-supplied function to the application.
+The \fBuse_window\fP and \fBuse_screen\fP functions provide
+coarse-grained mutexes for their respective \fI\%WINDOW\fP and
+\fI\%SCREEN\fP parameters;
+they call a user-supplied function,
+pass it a \fIdata\fP parameter,
+and return the value from the user-supplied function to the application.
 .\" ***************************************************************************
-.SS USAGE
-All of the ncurses library functions assume that the locale is not
+.SS Usage
+All \fIncurses\fP library functions assume that the locale is not
 altered during operation.
 In addition,
-they use data which is maintained within a hierarchy of scopes.
-.RS 3
+they use data that is maintained within a hierarchy of scopes.
 .bP
-global data, e.g., used in the low-level terminfo or termcap interfaces.
+global data used in the low-level \fIterminfo\fP or \fItermcap\fP
+interfaces
 .bP
-terminal data, e.g., associated with a call to \fBset_curterm\fP.
-The terminal data are initialized when screens are created.
+terminal data associated with a call to \fBset_curterm\fP(3X)
+.IP
+Terminal data are initialized when screens are created.
 .bP
-screen data, e.g., associated with a call to \fBnewterm\fP or \fBinitscr\fP.
+screen data associated with a call to \fBnewterm\fP(3X) or
+\fBinitscr\fP(3X)
 .bP
-window data, e.g., associated with a call to \fBnewwin\fP or \fBsubwin\fP.
+window data associated with a call to \fBnewwin\fP(3X) or
+\fBsubwin\fP(3X)
+.IP
 Windows are associated with screens.
-Pads are not necessarily associated with a particular screen.
+Pads are not necessarily associated with any particular screen.
 .IP
-Most curses applications operate on one or more windows within a single screen.
+Most \fIcurses\fP applications operate on one or more windows within a
+single screen.
 .bP
-reentrant, i.e., it uses only the data passed as parameters.
-.RE
+reentrant data associated with \*(``pure\*('' functions that alter no
+shared variables
 .PP
-This table lists the scope of data used for each symbol in the
-ncurses library when it is configured to support threading:
+The following table lists the scope of each symbol in the \fIncurses\fP
+library when configured to support multi-threaded applications.
 .PP
 .TS
 center tab(/);
-l l
-l l .
+lb lb
+lb l .
 Symbol/Scope
 =
 BC/global
-COLORS/screen (readonly)
+COLORS/screen (read-only)
 COLOR_PAIR/reentrant
-COLOR_PAIRS/screen (readonly)
-COLS/screen (readonly)
-ESCDELAY/screen (readonly, see \fBset_escdelay\fP)
-LINES/screen (readonly)
+COLOR_PAIRS/screen (read-only)
+COLS/screen (read-only)
+ESCDELAY/screen (read-only; see \fBset_escdelay\fP)
+LINES/screen (read-only)
 PAIR_NUMBER/reentrant
 PC/global
 SP/global
-TABSIZE/screen (readonly)
+TABSIZE/screen (read-only; see \fBset_tabsize\fP)
 UP/global
-acs_map/screen (readonly)
-add_wch/window (stdscr)
-add_wchnstr/window (stdscr)
-add_wchstr/window (stdscr)
-addch/window (stdscr)
-addchnstr/window (stdscr)
-addchstr/window (stdscr)
-addnstr/window (stdscr)
-addnwstr/window (stdscr)
-addstr/window (stdscr)
-addwstr/window (stdscr)
+acs_map/screen (read-only)
+add_wch/window (\fBstdscr\fP)
+add_wchnstr/window (\fBstdscr\fP)
+add_wchstr/window (\fBstdscr\fP)
+addch/window (\fBstdscr\fP)
+addchnstr/window (\fBstdscr\fP)
+addchstr/window (\fBstdscr\fP)
+addnstr/window (\fBstdscr\fP)
+addnwstr/window (\fBstdscr\fP)
+addstr/window (\fBstdscr\fP)
+addwstr/window (\fBstdscr\fP)
 assume_default_colors/screen
-attr_get/window (stdscr)
-attr_off/window (stdscr)
-attr_on/window (stdscr)
-attr_set/window (stdscr)
-attroff/window (stdscr)
-attron/window (stdscr)
-attrset/window (stdscr)
+attr_get/window (\fBstdscr\fP)
+attr_off/window (\fBstdscr\fP)
+attr_on/window (\fBstdscr\fP)
+attr_set/window (\fBstdscr\fP)
+attroff/window (\fBstdscr\fP)
+attron/window (\fBstdscr\fP)
+attrset/window (\fBstdscr\fP)
 baudrate/screen
 beep/screen
-bkgd/window (stdscr)
-bkgdset/window (stdscr)
-bkgrnd/window (stdscr)
-bkgrndset/window (stdscr)
-boolcodes/global (readonly)
-boolfnames/global (readonly)
-boolnames/global (readonly)
-border/window (stdscr)
-border_set/window (stdscr)
-box/window (stdscr)
-box_set/window (stdscr)
+bkgd/window (\fBstdscr\fP)
+bkgdset/window (\fBstdscr\fP)
+bkgrnd/window (\fBstdscr\fP)
+bkgrndset/window (\fBstdscr\fP)
+boolcodes/global (read-only)
+boolfnames/global (read-only)
+boolnames/global (read-only)
+border/window (\fBstdscr\fP)
+border_set/window (\fBstdscr\fP)
+box/window (\fBstdscr\fP)
+box_set/window (\fBstdscr\fP)
 can_change_color/terminal
 cbreak/screen
-chgat/window (stdscr)
-clear/window (stdscr)
+chgat/window (\fBstdscr\fP)
+clear/window (\fBstdscr\fP)
 clearok/window
-clrtobot/window (stdscr)
-clrtoeol/window (stdscr)
+clrtobot/window (\fBstdscr\fP)
+clrtoeol/window (\fBstdscr\fP)
 color_content/screen
-color_set/window (stdscr)
-copywin/window locks(source, target)
+color_set/window (\fBstdscr\fP)
+copywin/window (locks source, target)
 cur_term/terminal
 curs_set/screen
-curscr/screen (readonly)
-curses_version/global (readonly)
+curscr/screen (read-only)
+curses_version/global (read-only)
 def_prog_mode/terminal
 def_shell_mode/terminal
 define_key/screen
 del_curterm/screen
 delay_output/screen
-delch/window (stdscr)
-deleteln/window (stdscr)
-delscreen/global locks(screenlist, screen)
-delwin/global locks(windowlist)
+delch/window (\fBstdscr\fP)
+deleteln/window (\fBstdscr\fP)
+delscreen/global (locks screen list, screen)
+delwin/global (locks window list)
 derwin/screen
 doupdate/screen
-dupwin/screen locks(window)
+dupwin/screen (locks window)
 echo/screen
-echo_wchar/window (stdscr)
-echochar/window (stdscr)
+echo_wchar/window (\fBstdscr\fP)
+echochar/window (\fBstdscr\fP)
 endwin/screen
-erase/window (stdscr)
-erasechar/window (stdscr)
-erasewchar/window (stdscr)
+erase/window (\fBstdscr\fP)
+erasechar/window (\fBstdscr\fP)
+erasewchar/window (\fBstdscr\fP)
 filter/global
 flash/terminal
 flushinp/screen
-get_wch/screen (input-operation)
-get_wstr/screen (input-operation)
+get_wch/screen (input operation)
+get_wstr/screen (input operation)
 getattrs/window
 getbegx/window
 getbegy/window
 getbkgd/window
 getbkgrnd/window
 getcchar/reentrant
-getch/screen (input-operation)
+getch/screen (input operation)
 getcurx/window
 getcury/window
 getmaxx/window
 getmaxy/window
-getmouse/screen (input-operation)
-getn_wstr/screen (input-operation)
-getnstr/screen (input-operation)
+getmouse/screen (input operation)
+getn_wstr/screen (input operation)
+getnstr/screen (input operation)
 getparx/window
 getpary/window
-getstr/screen (input-operation)
-getwin/screen (input-operation)
+getstr/screen (input operation)
+getwin/screen (input operation)
 halfdelay/screen
 has_colors/terminal
 has_ic/terminal
 has_il/terminal
 has_key/screen
-hline/window (stdscr)
-hline_set/window (stdscr)
+hline/window (\fBstdscr\fP)
+hline_set/window (\fBstdscr\fP)
 idcok/window
 idlok/window
 immedok/window
-in_wch/window (stdscr)
-in_wchnstr/window (stdscr)
-in_wchstr/window (stdscr)
-inch/window (stdscr)
-inchnstr/window (stdscr)
-inchstr/window (stdscr)
+in_wch/window (\fBstdscr\fP)
+in_wchnstr/window (\fBstdscr\fP)
+in_wchstr/window (\fBstdscr\fP)
+inch/window (\fBstdscr\fP)
+inchnstr/window (\fBstdscr\fP)
+inchstr/window (\fBstdscr\fP)
 init_color/screen
 init_pair/screen
-initscr/global locks(screenlist)
-innstr/window (stdscr)
-innwstr/window (stdscr)
-ins_nwstr/window (stdscr)
-ins_wch/window (stdscr)
-ins_wstr/window (stdscr)
-insch/window (stdscr)
-insdelln/window (stdscr)
-insertln/window (stdscr)
-insnstr/window (stdscr)
-insstr/window (stdscr)
-instr/window (stdscr)
+initscr/global (locks screen list)
+innstr/window (\fBstdscr\fP)
+innwstr/window (\fBstdscr\fP)
+ins_nwstr/window (\fBstdscr\fP)
+ins_wch/window (\fBstdscr\fP)
+ins_wstr/window (\fBstdscr\fP)
+insch/window (\fBstdscr\fP)
+insdelln/window (\fBstdscr\fP)
+insertln/window (\fBstdscr\fP)
+insnstr/window (\fBstdscr\fP)
+insstr/window (\fBstdscr\fP)
+instr/window (\fBstdscr\fP)
 intrflush/terminal
-inwstr/window (stdscr)
+inwstr/window (\fBstdscr\fP)
 is_cleared/window
 is_idcok/window
 is_idlok/window
@@ -291,52 +314,52 @@ leaveok/window
 longname/screen
 mcprint/terminal
 meta/screen
-mouse_trafo/window (stdscr)
+mouse_trafo/window (\fBstdscr\fP)
 mouseinterval/screen
 mousemask/screen
-move/window (stdscr)
-mvadd_wch/window (stdscr)
-mvadd_wchnstr/window (stdscr)
-mvadd_wchstr/window (stdscr)
-mvaddch/window (stdscr)
-mvaddchnstr/window (stdscr)
-mvaddchstr/window (stdscr)
-mvaddnstr/window (stdscr)
-mvaddnwstr/window (stdscr)
-mvaddstr/window (stdscr)
-mvaddwstr/window (stdscr)
-mvchgat/window (stdscr)
+move/window (\fBstdscr\fP)
+mvadd_wch/window (\fBstdscr\fP)
+mvadd_wchnstr/window (\fBstdscr\fP)
+mvadd_wchstr/window (\fBstdscr\fP)
+mvaddch/window (\fBstdscr\fP)
+mvaddchnstr/window (\fBstdscr\fP)
+mvaddchstr/window (\fBstdscr\fP)
+mvaddnstr/window (\fBstdscr\fP)
+mvaddnwstr/window (\fBstdscr\fP)
+mvaddstr/window (\fBstdscr\fP)
+mvaddwstr/window (\fBstdscr\fP)
+mvchgat/window (\fBstdscr\fP)
 mvcur/screen
-mvdelch/window (stdscr)
-mvderwin/window (stdscr)
-mvget_wch/screen (input-operation)
-mvget_wstr/screen (input-operation)
-mvgetch/screen (input-operation)
-mvgetn_wstr/screen (input-operation)
-mvgetnstr/screen (input-operation)
-mvgetstr/screen (input-operation)
-mvhline/window (stdscr)
-mvhline_set/window (stdscr)
-mvin_wch/window (stdscr)
-mvin_wchnstr/window (stdscr)
-mvin_wchstr/window (stdscr)
-mvinch/window (stdscr)
-mvinchnstr/window (stdscr)
-mvinchstr/window (stdscr)
-mvinnstr/window (stdscr)
-mvinnwstr/window (stdscr)
-mvins_nwstr/window (stdscr)
-mvins_wch/window (stdscr)
-mvins_wstr/window (stdscr)
-mvinsch/window (stdscr)
-mvinsnstr/window (stdscr)
-mvinsstr/window (stdscr)
-mvinstr/window (stdscr)
-mvinwstr/window (stdscr)
-mvprintw/window (stdscr)
+mvdelch/window (\fBstdscr\fP)
+mvderwin/window (\fBstdscr\fP)
+mvget_wch/screen (input operation)
+mvget_wstr/screen (input operation)
+mvgetch/screen (input operation)
+mvgetn_wstr/screen (input operation)
+mvgetnstr/screen (input operation)
+mvgetstr/screen (input operation)
+mvhline/window (\fBstdscr\fP)
+mvhline_set/window (\fBstdscr\fP)
+mvin_wch/window (\fBstdscr\fP)
+mvin_wchnstr/window (\fBstdscr\fP)
+mvin_wchstr/window (\fBstdscr\fP)
+mvinch/window (\fBstdscr\fP)
+mvinchnstr/window (\fBstdscr\fP)
+mvinchstr/window (\fBstdscr\fP)
+mvinnstr/window (\fBstdscr\fP)
+mvinnwstr/window (\fBstdscr\fP)
+mvins_nwstr/window (\fBstdscr\fP)
+mvins_wch/window (\fBstdscr\fP)
+mvins_wstr/window (\fBstdscr\fP)
+mvinsch/window (\fBstdscr\fP)
+mvinsnstr/window (\fBstdscr\fP)
+mvinsstr/window (\fBstdscr\fP)
+mvinstr/window (\fBstdscr\fP)
+mvinwstr/window (\fBstdscr\fP)
+mvprintw/window (\fBstdscr\fP)
 mvscanw/screen
-mvvline/window (stdscr)
-mvvline_set/window (stdscr)
+mvvline/window (\fBstdscr\fP)
+mvvline_set/window (\fBstdscr\fP)
 mvwadd_wch/window
 mvwadd_wchnstr/window
 mvwadd_wchstr/window
@@ -349,12 +372,12 @@ mvwaddstr/window
 mvwaddwstr/window
 mvwchgat/window
 mvwdelch/window
-mvwget_wch/screen (input-operation)
-mvwget_wstr/screen (input-operation)
-mvwgetch/screen (input-operation)
-mvwgetn_wstr/screen (input-operation)
-mvwgetnstr/screen (input-operation)
-mvwgetstr/screen (input-operation)
+mvwget_wch/screen (input operation)
+mvwget_wstr/screen (input operation)
+mvwgetch/screen (input operation)
+mvwgetn_wstr/screen (input operation)
+mvwgetnstr/screen (input operation)
+mvwgetstr/screen (input operation)
 mvwhline/window
 mvwhline_set/window
 mvwin/window
@@ -379,10 +402,10 @@ mvwscanw/screen
 mvwvline/window
 mvwvline_set/window
 napms/reentrant
-newpad/global locks(windowlist)
-newscr/screen (readonly)
-newterm/global locks(screenlist)
-newwin/global locks(windowlist)
+newpad/global (locks window list)
+newscr/screen (read-only)
+newterm/global (locks screen list)
+newwin/global (locks window list)
 nl/screen
 nocbreak/screen
 nodelay/window
@@ -392,12 +415,12 @@ nonl/screen
 noqiflush/terminal
 noraw/screen
 notimeout/window
-numcodes/global (readonly)
-numfnames/global (readonly)
-numnames/global (readonly)
+numcodes/global (read-only)
+numfnames/global (read-only)
+numnames/global (read-only)
 ospeed/global
-overlay/window locks(source, target)
-overwrite/window locks(source, target)
+overlay/window (locks source, target)
+overwrite/window (locks source, target)
 pair_content/screen
 pecho_wchar/screen
 pechochar/screen
@@ -413,7 +436,7 @@ refresh/screen
 reset_prog_mode/screen
 reset_shell_mode/screen
 resetty/terminal
-resize_term/screen locks(windowlist)
+resize_term/screen (locks window list)
 resizeterm/screen
 restartterm/screen
 ripoffline/global (static data)
@@ -423,15 +446,15 @@ scr_dump/screen
 scr_init/screen
 scr_restore/screen
 scr_set/screen
-scrl/window (stdscr)
+scrl/window (\fBstdscr\fP)
 scroll/window
 scrollok/window
 set_curterm/screen
 set_escdelay/screen
 set_tabsize/screen
-set_term/global locks(screenlist, screen)
+set_term/global (locks screen list, screen)
 setcchar/reentrant
-setscrreg/window (stdscr)
+setscrreg/window (\fBstdscr\fP)
 setupterm/global
 slk_attr/screen
 slk_attr_off/screen
@@ -453,10 +476,10 @@ slk_wset/screen
 standend/window
 standout/window
 start_color/screen
-stdscr/screen (readonly)
-strcodes/global (readonly)
-strfnames/global (readonly)
-strnames/global (readonly)
+\fBstdscr\fP/screen (read-only)
+strcodes/global (read-only)
+strfnames/global (read-only)
+strnames/global (read-only)
 subpad/window
 subwin/window
 syncok/window
@@ -471,31 +494,31 @@ tgoto/global
 tigetflag/terminal
 tigetnum/terminal
 tigetstr/terminal
-timeout/window (stdscr)
+timeout/window (\fBstdscr\fP)
 touchline/window
 touchwin/window
 tparm/global (static data)
 tputs/screen
 trace/global (static data)
-ttytype/screen (readonly)
+ttytype/screen (read-only)
 typeahead/screen
 unctrl/screen
-unget_wch/screen (input-operation)
-ungetch/screen (input-operation)
-ungetmouse/screen (input-operation)
+unget_wch/screen (input operation)
+ungetch/screen (input operation)
+ungetmouse/screen (input operation)
 untouchwin/window
 use_default_colors/screen
 use_env/global (static data)
 use_extended_names/global (static data)
 use_legacy_coding/screen
-use_screen/global locks(screenlist, screen)
-use_window/global locks(windowlist, window)
+use_screen/global (locks screen list, screen)
+use_window/global (locks window list, window)
 vid_attr/screen
 vid_puts/screen
 vidattr/screen
 vidputs/screen
-vline/window (stdscr)
-vline_set/window (stdscr)
+vline/window (\fBstdscr\fP)
+vline_set/window (\fBstdscr\fP)
 vw_printw/window
 vw_scanw/screen
 vwprintw/window
@@ -535,16 +558,16 @@ wecho_wchar/window
 wechochar/window
 wenclose/window
 werase/window
-wget_wch/screen (input-operation)
-wget_wstr/screen (input-operation)
+wget_wch/screen (input operation)
+wget_wstr/screen (input operation)
 wgetbkgrnd/window
-wgetch/screen (input-operation)
+wgetch/screen (input operation)
 wgetdelay/window
-wgetn_wstr/screen (input-operation)
-wgetnstr/screen (input-operation)
+wgetn_wstr/screen (input operation)
+wgetnstr/screen (input operation)
 wgetparent/window
 wgetscrreg/window
-wgetstr/screen (input-operation)
+wgetstr/screen (input operation)
 whline/window
 whline_set/window
 win_wch/window
@@ -571,7 +594,7 @@ wnoutrefresh/screen
 wprintw/window
 wredrawln/window
 wrefresh/screen
-wresize/window locks(windowlist)
+wresize/window (locks window list)
 wscanw/screen
 wscrl/window
 wsetscrreg/window
@@ -587,15 +610,20 @@ wvline_set/window
 .TE
 .\" ***************************************************************************
 .SH RETURN VALUE
-These functions all return \fBTRUE\fP or \fBFALSE\fP, except as noted.
+\fB\%get_escdelay\fP returns the value of \fB\%ESCDELAY\fP.
+\fB\%set_escdelay\fP and \fB\%set_tabsize\fP return \fBERR\fP upon
+failure and \fBOK\fP upon successful completion.
+\fB\%use_screen\fP and \fB\%use_window\fP return the \fIint\fP returned
+by the user-supplied function they are called with.
 .SH NOTES
-Both a macro and a function are provided for each name.
+\fIncurses\fP provides both a C function and a preprocessor macro for
+each function documented in this page.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fIncurses\fP.
 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 NCURSES_VERSION.
+It is recommended that any code depending on \fIncurses\fP extensions
+be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_opaque\fP(3X),
-\fBcurs_variables\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_opaque\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index f4d19a398..f793267a8 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.37 2023/09/23 20:53:33 tom Exp $
-.TH curs_trace 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH curs_trace 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -272,4 +272,4 @@ _tracemouse
 The original \fBtrace\fP routine was deprecated because
 it often conflicted with application names.
 .SH SEE ALSO
-\fBcurses\fP(3X).
+\fB\%curses\fP(3X)
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 9d8e7f26f..be7f4d6c4 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.83 2023/09/23 23:14:19 tom Exp $
-.TH curs_util 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.85 2023/09/30 21:38:11 tom Exp $
+.TH curs_util 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -390,11 +390,11 @@ creating each \fIscreen\fP rather than once only
 This feature of \fBuse_env\fP
 is not provided by other implementations of curses.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_inopts\fP(3X),
-\fBcurs_kernel\fP(3X),
-\fBcurs_scr_dump\fP(3X),
-\fBcurs_sp_funcs\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBlegacy_coding\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_inopts\fP(3X),
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_scr_dump\fP(3X),
+\fB\%curs_sp_funcs\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%legacy_coding\fP(3X)
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 62dccd093..5ed8c3e28 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,18 +27,29 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
-.TH curs_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.31 2023/10/01 22:36:35 tom Exp $
+.TH curs_variables 3X 2023-10-01 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie \n(.g .ds : \:
+.el       .ds : \" empty
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .ds n 5
 .SH NAME
+\fI\%bool\fP,
+\fI\%chtype\fP,
+\fI\%cchar_t\fP,
+\fI\%attr_t\fP,
+\fI\%WINDOW\fP,
+\fB\%TRUE\fP,
+\fB\%FALSE\fP,
+\fB\%ERR\fP,
+\fB\%OK\fP,
 \fB\%COLORS\fP,
 \fB\%COLOR_PAIRS\fP,
 \fB\%COLS\fP,
@@ -48,137 +59,237 @@
 \fB\%curscr\fP,
 \fB\%newscr\fP,
 \fB\%stdscr\fP \-
-\fIcurses\fR global variables
+\fIcurses\fR data types, constants, and global variables
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
 .PP
+\fI/* data types */\fP
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP bool;\fP
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;\fP
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;\fP
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;\fP
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;\fP
+.PP
+\fI/* constants */\fP
+\fBconst bool TRUE;\fP
+\fBconst bool FALSE;\fP
+.PP
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;\fP
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;\fP
+.PP
+\fI/* variables */\fP
 \fBint COLOR_PAIRS;\fP
-.br
 \fBint COLORS;\fP
-.br
 \fBint COLS;\fP
-.br
 \fBint ESCDELAY;\fP
-.br
 \fBint LINES;\fP
-.br
 \fBint TABSIZE;\fP
-.br
 \fBWINDOW * curscr;\fP
-.br
 \fBWINDOW * newscr;\fP
-.br
 \fBWINDOW * stdscr;\fP
 .fi
 .SH DESCRIPTION
-This page summarizes variables provided by the \fBcurses\fP library.
-A more complete description is given in the \fBcurses\fP(3X) manual page.
+This page summarizes data types,
+constants,
+and variables provided by the \fIcurses\fP library.
+Locate further discussion in \fB\%curses\fP(3X).
 .PP
-Depending on the configuration, these may be actual variables,
-or macros (see \fBcurs_threads\fP(3X) and \fBcurs_opaque\fP(3X))
-which provide read-only access to \fIcurses\fP's state.
-In either case, applications should treat them as read-only to avoid
+Depending on \fIncurses\fP's build-time configuration,
+the variables may instead be
+macros (see \fB\%curs_threads\fP(3X) and \fB\%curs_opaque\fP(3X))
+that provide read-only access to the library's state.
+In either case,
+applications should treat them as read-only to avoid
 confusing the library.
+.SS bool, TRUE, FALSE
+X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
+standards,
+each of which also defined a Boolean data type.
+The \fIcurses\fP library requires an integral type \fIbool\fP and
+constants \fBTRUE\fP and \fBFALSE\fP to store its two possible values.
+.SS ERR, OK
+\fIcurses\fP and \fIterminfo\fP routines frequently return these
+constant integral values indicating failure and success,
+respectively.
+.SS chtype
+The \fI\%chtype\fP integral type combines a
+(\*(``narrow\*('',
+8-bit)
+character with attributes encoding the character's \fIrendition\fP,
+such as the styling of its typeface and/or foreground and background
+colors.
+See,
+for example,
+\fB\%addch\fP(3X),
+\fB\%attron\fP(3X),
+and
+\fB\%inch\fP(3X).
+.SS cchar_t, attr_t
+\fI\%chtype\fP is too small for the standard C library's wide-character
+type,
+\fIwchar_t\fP.
+\fI\%cchar_t\fP is a type that can accommodate an \fI\%attr_t\fP and
+enough wide characters to store what Unicode terms a \fIgrapheme cluster\fP
+(a \*(``user-perceived character\*('' [UAX #29],
+which may nevertheless require several character encoding units to
+represent).
+\fI\%attr_t\fP is an integral type storing \*(``wide\*('' attributes that
+apply to \fI\%cchar_t\fPs.
+See,
+for example,
+\fB\%add_wch\fP(3X),
+\fB\%attr_on\fP(3X),
+and
+\fB\%in_wch\fP(3X).
 .SS COLOR_PAIRS
-After initializing curses, this variable contains the number of color pairs
-which the terminal can support.
-Usually the number of color pairs will be the product \fBCOLORS\fP*\fBCOLORS\fP,
-however this is not always true:
+Once \fIcurses\fP is initialized,
+\fB\%COLOR_PAIRS\fP
+contains the number of color pairs supported by the terminal.
+Often,
+its value is the product \fB\%COLORS\fP \(mu \fB\%COLORS\fP,
+but this is not always true.
 .bP
-a few terminals use HLS colors, which do not follow this rule
+A few terminals use HLS colors,
+ignoring this rule;
+and
 .bP
 terminals supporting a large number of colors are limited by the number
-of color pairs that can be represented in a \fIsigned short\fP value.
+of color pairs that a \fIsigned short\fP value can represent.
 .SS COLORS
-After initializing curses, this variable contains the number of colors
-which the terminal can support.
+Once \fIcurses\fP is initialized,
+\fB\%COLORS\fP
+contains the number of colors supported by the terminal.
 .SS COLS
-After initializing curses, this variable contains the width of the screen,
-i.e., the number of columns.
+Once \fIcurses\fP is initialized,
+\fB\%COLS\fP
+contains the screen's width in character cells;
+that is,
+the number of columns.
 .SS ESCDELAY
-This variable holds the number of milliseconds to wait after reading an
-escape character,
-to distinguish between an individual escape character entered on the
-keyboard from escape sequences sent by cursor- and function-keys
-(see curses(3X)).
+For \fIcurses\fP to distinguish an escape character corresponding to a
+user's press of an \*(``Escape\*('' key on the input device from one
+included in a control sequence used by a cursor movement or function
+key,
+the library waits to see if another key event occurs after the escape
+character.
+\fB\%ESCDELAY\fP
+stores this interval in milliseconds.
 .SS LINES
-After initializing curses, this variable contains the height of the screen,
-i.e., the number of lines.
+Once \fIcurses\fP is initialized,
+\fB\%LINES\fP
+contains the screen's height in character cells;
+that is,
+the number of lines.
 .SS TABSIZE
-This variable holds the number of columns used by the \fIcurses\fP library
-when converting a tab character to spaces as it adds the tab to a window
-(see \fBcurs_addch\fP(3X).
-.SS The Current Screen
-This implementation of curses uses a special window \fBcurscr\fP to
-record its updates to the terminal screen.
+The \fIcurses\fP library converts a tab character to this number of
+spaces as it adds a tab to a window;
+see \fB\%curs_addch\fP(3X).
+.SS curscr
+\fIcurses\fP records updates to the terminal screen in a \fI\%WINDOW\fP
+structure named \fB\%curscr\fP.
 .PP
-This is referred to as the \*(``physical screen\*('' in the
-\fBcurs_refresh\fP(3X) and
-\fBcurs_outopts\fP(3X) manual pages.
-.SS The New Screen
-This implementation of curses uses a special window \fBnewscr\fP to
-hold updates to the terminal screen before applying them to \fBcurscr\fP.
+This object is referred to as the \*(``physical screen\*('' in
+\fB\%curs_refresh\fP(3X) and
+\fB\%curs_outopts\fP(3X).
+.SS newscr
+\fIncurses\fP collects pending updates to the terminal screen in a
+\fI\%WINDOW\fP structure named \fB\%newscr\fP.
 .PP
-This is referred to as the \*(``virtual screen\*('' in the
-\fBcurs_kernel\fP(3X),
-\fBcurs_refresh\fP(3X) and
-\fBcurs_outopts\fP(3X) manual pages.
-.SS The Standard Screen
-Upon initializing curses,
-a default window called \fBstdscr\fP,
-which is the size of the terminal screen, is created.
-Many curses functions use this window.
+This object is referred to as the \*(``virtual screen\*('' in the
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_refresh\fP(3X),
+and
+\fB\%curs_outopts\fP(3X).
+When the screen is refreshed,
+\fIcurses\fP determines a minimal set of updates using the terminal's
+capabilities to make \fB\%curscr\fP look like \fB\%newscr\fP.
+.SS stdscr
+Once \fIcurses\fP is initialized,
+it creates a \fI\%WINDOW\fP structure named \fB\%stdscr\fP.
+It is the same size as the terminal screen and is the default window
+used by routines that do not take a parameter identifying one.
+Many \fIcurses\fP functions use this window.
 .SH NOTES
-The curses library is initialized using either \fBinitscr\fP(3X),
-or \fBnewterm\fP(3X).
+Either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) initializes
+\fIcurses\fP.
 .PP
-If \fBcurses\fP is configured to use separate curses/terminfo libraries,
-most of these variables reside in the curses library.
+If \fIncurses\fP is configured to provide separate \fIcurses\fP and
+\fIterminfo\fP libraries,
+most of these variables reside in the \fIcurses\fP library.
 .SH PORTABILITY
-\fBTABSIZE\fP is a feature of SVr4 curses
-which is not documented by X/Open curses.
+The X/Open Curses standard documents all of the foregoing types and
+symbols except for \fB\%newscr\fP,
+\fB\%TABSIZE\fP,
+and \fB\%ESCDELAY\fP.
+.PP
+X/Open Curses describes \fB\%curscr\fP only as \*(``an internal data
+structure\*('';
+SVID gave more details,
+noting its use \*(``for certain low-level operations like clearing and
+redrawing a screen containing garbage\*(''.
+Neither specified its interaction with the rest of the interface beyond
+use as an argument to \fB\%clearok\fP(3X) and \fB\%wrefresh\fP(3X).
+.PP
+\fB\%newscr\fP is a feature of SVr4 \fIcurses\fP.
+When refreshing the screen, this window is used as a working area
+for combining the standard screen \fB\%stdscr\fP with any other windows
+which the application may have created with \fB\%newwin\fP(3X).
+When the updated \fB\%newscr\fP is complete,
+\fIcurses\fP updates \fB\%curscr\fP to match \fB\%newscr\fP.
+.PP
+\fB\%TABSIZE\fP is a feature of SVr4 \fIcurses\fP.
 .bP
-In SVr4 curses, \fBTABSIZE\fP is initially set from the terminal description's
-\fBinit_tabs\fP capability.
-After that, it can be altered by the applications using SVr4 curses.
-.IP
-SVr4 curses uses the current value of \fBTABSIZE\fP to
-compute the position of tabstops for updating both
-the virtual screen with \fBaddch\fP(3X) as well as
-the physical screen with \fBmvcur\fP(3X).
+SVr4 initially sets \fB\%TABSIZE\fP from the terminal description's
+\fB\%init_tabs\fP capability.
+After that,
+it can be altered by applications using SVr4 \fIcurses\fP.
 .bP
-This implementation uses the current value of \fBTABSIZE\fP only for
-updating the virtual screen.
-It uses the terminal description's \fBit\fP (\fBinit_tabs\fP) capability for
-computing hardware tabs (i.e., tab stops on the physical screen).
+SVr4 \fIcurses\fP uses the value of \fB\%TABSIZE\fP to compute the
+position of tab stops when updating both
+the virtual screen with \fB\%addch\fP(3X) and
+the physical screen with \fB\%mvcur\fP(3X).
+.bP
+\fIncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
+virtual screen.
+It uses the terminal description's \*(``\fBit\fP\*(''
+(\fB\%init_tabs\fP) capability for computing hardware tabs
+(that is,
+tab stops on the physical screen).
 .bP
 Other implementations differ.
-For instance, NetBSD curses allows \fBTABSIZE\fP to be set through
-an environment variable.
-This implementation does not.
+For instance,
+NetBSD \fIcurses\fP allows \fB\%TABSIZE\fP to be set through an
+environment variable.
+\fIncurses\fP does not.
 .IP
-NetBSD curses does not support hardware tabs;
-it uses the \fBinit_tabs\fP capability and the \fBTABSIZE\fP variable
-only for updating the virtual screen.
+NetBSD \fIcurses\fP does not support hardware tabs;
+it uses the \fB\%init_tabs\fP capability and the \fB\%TABSIZE\fP
+variable only for updating the virtual screen.
 .PP
-\fBESCDELAY\fP is an extension in AIX curses:
+\fB\%ESCDELAY\fP is a feature of AIX \fIcurses\fP.
 .bP
-In AIX, the units for \fBESCDELAY\fP are \fIfifths\fP of a millisecond.
+In AIX,
+the units for \fB\%ESCDELAY\fP are \fIfifths\fP of milliseconds.
 .bP
-The default value for AIX's \fBESCDELAY\fP is 0.1 seconds.
+The default value for AIX's \fB\%ESCDELAY\fP equals 0.1 seconds.
 .bP
-AIX also enforces a limit of 10,000 seconds for \fBESCDELAY\fP;
-this implementation currently has no upper limit.
+AIX also enforces a limit of 10,000 seconds for \fB\%ESCDELAY\fP;
+\fIncurses\fP does not enforce any upper limit.
 .PP
-This implementation has long used \fBESCDELAY\fP with units of milliseconds,
+\fIncurses\fP has long used \fB\%ESCDELAY\fP with units of milliseconds,
 making it impossible to be completely compatible with AIX.
-Likewise, most users have either decided to override the value,
-or rely upon its default value.
+Consequently,
+most users have decided either to override the value,
+or to rely upon its default.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_opaque\fP(3X),
-\fBcurs_terminfo\fP(3X),
-\fBcurs_threads\fP(3X),
-\fBterm_variables\fP(3X),
-\fBterminfo\fP(\*n).
+\fB\%curses\fP(3X),
+\fB\%curs_opaque\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%curs_threads\fP(3X),
+\fB\%term_variables\fP(3X),
+\fB\%terminfo\fP(\*n)
+.PP
+[UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
+Segmentation\*('';
+\%<https://\*:unicode\*:.org/\*:reports/\*:tr29/>
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 931372db1..91af66bdd 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
-.TH curs_window 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.39 2023/09/30 23:13:32 tom Exp $
+.TH curs_window 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -104,22 +104,20 @@ rather than a duplicate (with \fBdupwin\fP),
 all of the window modes are initialized to the default values.
 These functions set window modes after a window is created:
 .RS
-.na
 .PP
-idcok,
-idlok,
-immedok,
-keypad,
-leaveok,
-nodelay,
-scrollok,
-setscrreg,
-syncok,
-wbkgdset,
-wbkgrndset, and
-wtimeout
+\fB\%idcok\fP
+\fB\%idlok\fP
+\fB\%immedok\fP
+\fB\%keypad\fP
+\fB\%leaveok\fP
+\fB\%nodelay\fP
+\fB\%scrollok\fP
+\fB\%setscrreg\fP
+\fB\%syncok\fP
+\fB\%wbkgdset\fP
+\fB\%wbkgrndset\fP and
+\fB\%wtimeout\fP.
 .RE
-.ad
 .SS delwin
 Calling \fBdelwin\fP deletes the named window, freeing all memory
 associated with it (it does not actually erase the window's screen
@@ -263,8 +261,8 @@ NetBSD copied this feature of ncurses in 2003.
 .br
 PDCurses follows the scheme used in Solaris X/Open curses.
 .SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_initscr\fP(3X),
-\fBcurs_refresh\fP(3X),
-\fBcurs_touch\fP(3X),
-\fBcurs_variables\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_initscr\fP(3X),
+\fB\%curs_refresh\fP(3X),
+\fB\%curs_touch\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 8ffb6ed46..42a678366 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.41 2023/09/16 23:37:03 tom Exp $
-.TH default_colors 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.44 2023/09/30 21:38:11 tom Exp $
+.TH default_colors 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -138,9 +138,9 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
-.SH SEE ALSO
-\fBded\fP(1),
-\fBcurs_color\fP(3X).
 .SH AUTHOR
 Thomas Dickey (from an analysis of the requirements for color xterm
 for XFree86 3.1.2C, February 1996).
+.SH SEE ALSO
+\fB\%ded\fP(1),
+\fB\%curs_color\fP(3X)
diff --git a/man/define_key.3x b/man/define_key.3x
index fed925eab..b9cf5d899 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.34 2023/09/23 23:04:14 tom Exp $
-.TH define_key 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.36 2023/09/30 21:26:43 tom Exp $
+.TH define_key 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
@@ -61,8 +61,8 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+.SH AUTHOR
+Thomas Dickey
 .SH SEE ALSO
 \fB\%keyok\fP(3X),
 \fB\%key_defined\fP(3X)
-.SH AUTHOR
-Thomas Dickey
diff --git a/man/form.3x b/man/form.3x
index b91314b22..6e7217b7e 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.45 2023/09/16 23:37:03 tom Exp $
-.TH form 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.47 2023/09/30 21:38:11 tom Exp $
+.TH form 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -237,8 +237,5 @@ Juergen Pfeifer.
 Manual pages and adaptation for ncurses by Eric
 S. Raymond.
 .SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for
+detailed descriptions of the entry points.
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index e984bd5eb..a5f7e7521 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.23 2023/09/16 23:37:03 tom Exp $
-.TH form_cursor 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
+.TH form_cursor 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \-
 position a form window cursor
@@ -57,9 +57,6 @@ The form has not been posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -70,3 +67,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_data.3x b/man/form_data.3x
index fdc18d6d1..de695c5d6 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.24 2023/09/16 23:37:03 tom Exp $
-.TH form_data 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH form_data 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \-
@@ -48,8 +48,6 @@ It returns TRUE (1) or FALSE (0).
 The function \fBdata_behind\fP tests whether there is off-screen data
 behind in the given form.
 It returns TRUE (1) or FALSE (0).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -60,3 +58,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_driver.3x b/man/form_driver.3x
index ff079dea0..80d7a1567 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.47 2023/09/16 23:37:03 tom Exp $
-.TH form_driver 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.50 2023/09/30 21:38:11 tom Exp $
+.TH form_driver 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -247,15 +247,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_UNKNOWN_COMMAND
 The form driver code saw an unknown request code.
-.
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBform\fP(3X),
-\fBform_fieldtype\fP(3X),
-\fBform_field_buffer\fP(3X),
-\fBform_field_validation\fP(3X),
-\fBform_variables\fP(3X),
-\fBgetch\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header files
 \fB<curses.h>\fP.
@@ -266,3 +257,11 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X),
+\fB\%form_fieldtype\fP(3X),
+\fB\%form_field_buffer\fP(3X),
+\fB\%form_field_validation\fP(3X),
+\fB\%form_variables\fP(3X),
+\fB\%getch\fP(3X)
diff --git a/man/form_field.3x b/man/form_field.3x
index 92e300457..cd0e65000 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
-.TH form_field 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH form_field 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
@@ -77,8 +77,6 @@ The form is already posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -92,3 +90,6 @@ as \-1 (which is the value of \fBERR\fP).
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index fa3f7f1cf..b8718dbce 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
-.TH form_field_attributes 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_attributes.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH form_field_attributes 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -80,10 +80,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -94,3 +90,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``form_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 5e85c3fd1..37c0d3076 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
-.TH form_field_buffer 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH form_field_buffer 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -119,9 +119,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 .PP
@@ -142,3 +139,6 @@ limit is smaller than the current field size.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``form_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index 3465ddaed..cd561779d 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.24 2023/09/16 23:39:54 tom Exp $
-.TH form_field_info 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_info.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH form_field_info 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -74,9 +74,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -91,3 +88,6 @@ Not all implementations allow this, e.g., Solaris 2.7 does not.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``form_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index fc9cb4bbf..cf9c51e85 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
-.TH form_field_just 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_just.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH form_field_just 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -64,9 +64,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -77,3 +74,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``form_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index f8dfb98ab..ce1b5d865 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.33 2023/09/16 23:37:03 tom Exp $
-.TH form_field_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.36 2023/09/30 21:38:11 tom Exp $
+.TH form_field_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
@@ -90,8 +90,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_CONNECTED
 field is connected.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -106,3 +104,6 @@ not very explicit about what gets copied and what does not.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 2649cc42f..f303683f1 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.36 2023/09/16 23:37:03 tom Exp $
-.TH form_field_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH form_field_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
@@ -134,10 +134,6 @@ The field is the current field.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBform\fP(3X).
-\fBform_field_just\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -148,3 +144,7 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X),
+\fB\%form_field_just\fP(3X)
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index e01edf01b..c13beaa24 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.22 2023/09/16 23:39:54 tom Exp $
-.TH form_field_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
+.TH form_field_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \-
@@ -50,8 +50,6 @@ The function \fBfield_userptr\fP returns a pointer (which may be \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_field_userptr\fP returns \fBE_OK\fP (success).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -65,3 +63,6 @@ We chose not to leave it as a char pointer for SVr4 compatibility.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 93cfd858f..005a03f4c 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.44 2023/09/16 23:37:03 tom Exp $
-.TH form_field_validation 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.47 2023/09/30 21:38:11 tom Exp $
+.TH form_field_validation 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -195,11 +195,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBform\fP(3X),
-\fBform_fieldtype\fP(3X),
-\fBform_variables\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -210,3 +205,8 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X),
+\fB\%form_fieldtype\fP(3X),
+\fB\%form_variables\fP(3X)
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 4063baf01..87febba76 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.38 2023/09/16 23:37:03 tom Exp $
-.TH form_fieldtype 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.41 2023/09/30 21:38:11 tom Exp $
+.TH form_fieldtype 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -151,10 +151,6 @@ The field is the current field.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBform\fP(3X),
-\fBform_field_validation\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -165,3 +161,7 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X),
+\fB\%form_field_validation\fP(3X)
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 54a0f6328..07c86662e 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
-.TH form_hook 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
+.TH form_hook 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
@@ -88,8 +88,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -100,3 +98,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_new.3x b/man/form_new.3x
index b2a992c37..da72e8f69 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.24 2023/09/16 23:37:03 tom Exp $
-.TH form_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH form_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \-
@@ -72,8 +72,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_POSTED
 The form has already been posted.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -84,3 +82,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 3b93b1e0e..096224f6d 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
-.TH form_new_page 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_new_page.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH form_new_page 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -60,9 +60,6 @@ The routine succeeded.
 .TP 5
 .B E_CONNECTED
 The given field is already connected to a form.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -73,3 +70,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``form_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/form_opts.3x b/man/form_opts.3x
index eb72f8625..d413b5b49 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
-.TH form_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH form_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
@@ -75,8 +75,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -87,3 +85,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_page.3x b/man/form_page.3x
index 5a9c1835c..674368f69 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
-.TH form_page 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH form_page 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
@@ -84,9 +84,6 @@ The form driver could not process the request.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -99,3 +96,6 @@ 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.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_post.3x b/man/form_post.3x
index 471b88d48..7aabb234a 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.25 2023/09/16 23:37:03 tom Exp $
-.TH form_post 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
+.TH form_post 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \-
@@ -74,9 +74,6 @@ The form has already been posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -87,3 +84,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index dbd973096..f5f7c7d6b 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.26 2023/09/16 23:37:03 tom Exp $
-.TH form_requestname 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH form_requestname 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
@@ -52,8 +52,6 @@ to \fBE_BAD_ARGUMENT\fP.
 .PP
 \fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -66,3 +64,6 @@ any code depending on them be conditioned using NCURSES_VERSION.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index e7d9216f4..2fcc851fa 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.28 2023/09/16 23:37:03 tom Exp $
-.TH form_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH form_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \-
@@ -49,8 +49,6 @@ The function \fBform_userptr\fP returns a pointer (which may be \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_form_userptr\fP returns \fBE_OK\fP (success).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -64,3 +62,6 @@ We chose not to leave it as a char pointer for SVr4 compatibility.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/form_variables.3x b/man/form_variables.3x
index 54a1d65fa..67995f7a7 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -27,21 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_variables.3x,v 1.12 2023/09/16 23:39:54 tom Exp $
-.TH form_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
-.na
-.hy 0
+.\" $Id: form_variables.3x,v 1.15 2023/09/30 23:13:32 tom Exp $
+.TH form_variables 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBTYPE_ALNUM\fP,
-\fBTYPE_ALPHA\fP,
-\fBTYPE_ENUM\fP,
-\fBTYPE_INTEGER\fP,
-\fBTYPE_IPV4\fP,
-\fBTYPE_NUMERIC\fP,
-\fBTYPE_REGEXP\fP \-
+\fB\%TYPE_ALNUM\fP,
+\fB\%TYPE_ALPHA\fP,
+\fB\%TYPE_ENUM\fP,
+\fB\%TYPE_INTEGER\fP,
+\fB\%TYPE_IPV4\fP,
+\fB\%TYPE_NUMERIC\fP,
+\fB\%TYPE_REGEXP\fP \-
 form system global variables
-.ad
-.hy
 .SH SYNOPSIS
 .nf
 \fB#include <form.h>\fP
@@ -78,4 +74,4 @@ This holds a regular expression.
 The \fBTYPE_IPV4\fP variable is an extension not provided by older
 implementations of the form library.
 .SH SEE ALSO
-\fBform\fP(3X).
+\fB\%form\fP(3X)
diff --git a/man/form_win.3x b/man/form_win.3x
index c7cf800aa..a25927ebb 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.27 2023/09/16 23:37:03 tom Exp $
-.TH form_win 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH form_win 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
@@ -80,10 +80,6 @@ The form has already been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the form.
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBform\fP(3X).
 .SH NOTES
 The header file \fB<form.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -94,3 +90,7 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%form\fP(3X)
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 2da87669b..6c00d5e30 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.92 2023/09/16 23:37:03 tom Exp $
-.TH @INFOCMP@ 1M 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.95 2023/09/30 21:38:11 tom Exp $
+.TH @INFOCMP@ 1M 2023-09-30 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -641,21 +641,18 @@ To see only the
 4.4BSD set, use \fB\-r\fP \fB\-RBSD\fP.
 .SH BUGS
 The \fB\-F\fP option of \fB@INFOCMP@\fP(1M) should be a \fB@TOE@\fP(1M) mode.
-.SH SEE ALSO
-\fB@CAPTOINFO@\fP(1M),
-\fB@INFOTOCAP@\fP(1M),
-\fB@TIC@\fP(1M),
-\fB@TOE@\fP(1M),
-\fBcurses\fP(3X),
-\fBterminfo\fP(\*n).
-\fBuser_caps\fP(\*n).
-.sp
-https://invisible-island.net/ncurses/tctest.html
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
 Thomas E. Dickey <dickey@invisible-island.net>
+.SH SEE ALSO
+\fB\%@CAPTOINFO@\fP(1M),
+\fB\%@INFOTOCAP@\fP(1M),
+\fB\%@TIC@\fP(1M),
+\fB\%@TOE@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n),
+\fB\%user_caps\fP(\*n)
+.PP
+https://invisible-island.net/ncurses/tctest.html
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 1d74088a0..78505b107 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
@@ -28,55 +27,63 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.26 2023/09/16 23:38:39 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.33 2023/10/01 22:43:17 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-10-01 "ncurses 6.4" "User commands"
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@INFOTOCAP@\fP \-
 convert a \fIterminfo\fR description into a \fItermcap\fR description
 .SH SYNOPSIS
-\fB@INFOTOCAP@\fR [\fB\-v\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
+.B @INFOTOCAP@
+.RI [ tic-option ]
+.I file
+\&.\|.\|.
+.P
+.B "@INFOTOCAP@ \-V"
 .SH DESCRIPTION
-\fB@INFOTOCAP@\fP looks in each given text
-\fIfile\fP for \fBterminfo\fP descriptions.
-For each terminfo description found,
-an equivalent \fBtermcap\fP description is written to standard output.
-Terminfo \fBuse\fP capabilities are translated directly to termcap
-\fBtc\fP capabilities.
-.TP 5
-\fB\-v\fP
-print out tracing information on standard error as the program runs.
-.TP 5
-\fB\-V\fP
-print out the version of the program in use on standard error and exit.
-.TP 5
-\fB\-1\fP
-cause the fields to print out one to a line.
-Otherwise, the fields
-will be printed several to a line to a maximum width of 60 characters.
-.TP 5
-\fB\-w\fP
-change the output to \fIwidth\fP characters.
+\fB\%@INFOTOCAP@\fP looks in each given text
+\fIfile\fP for \fIterminfo\fP descriptions.
+For each one found,
+it writes an analogous \fItermcap\fP description to the standard output
+stream.
+\fIterminfo\fP \*(``\fBuse\fP\*('' capabilities are translated directly
+to \fItermcap\fP \fBtc\fP capabilities.
+Because \fItermcap\fP is a less expressive format than \fIterminfo\fP,
+some capabilities cannot be translated.
+.PP
+This utility is implemented as a link to \fB\%@TIC@\fP(1M),
+with the latter's
+.B \-C
+option implied.
+You can use other \fB\%@TIC@\fP options such as
+.BR \-1 ,
+.BR \-f ,
+.BR \-v ,
+.BR \-w ,
+and
+.BR \-x .
+The \fB\-V\fP option reports the version of \fIncurses\fP associated
+with this program and exits with a successful status.
 .SH FILES
-.TP 20
-\*d
-Compiled terminal description database.
-.SH NOTES
-This utility is actually a link to \fB@TIC@\fP, running in \fI\-C\fP mode.
-You can use other \fB@TIC@\fP options such as \fB\-f\fP and  \fB\-x\fP.
+.TP
+\fI\*d\fP
+compiled terminal description database
 .SH PORTABILITY
-None of X/Open Curses, Issue 7 (2009), SVr4 or NetBSD document this application.
-.SH SEE ALSO
-\fB@INFOCMP@\fP(1M),
-\fB@TIC@\fP(1M),
-\fBcurses\fP(3X),
-\fBterminfo\fP(\*n)
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+None of X/Open Curses, Issue 7 (2009),
+SVr4,
+or NetBSD document this application.
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
 Thomas E. Dickey <dickey@invisible-island.net>
+.SH SEE ALSO
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@TIC@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 1fa66c4d1..aceea6ed3 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.26 2023/09/23 22:49:51 tom Exp $
-.TH key_defined 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.28 2023/09/30 21:26:43 tom Exp $
+.TH key_defined 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
@@ -53,7 +53,7 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH SEE ALSO
-\fB\%define_key\fP(3X)
 .SH AUTHOR
 Thomas Dickey
+.SH SEE ALSO
+\fB\%define_key\fP(3X)
diff --git a/man/keybound.3x b/man/keybound.3x
index e85289029..33630128d 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.27 2023/09/23 22:49:51 tom Exp $
-.TH keybound 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.29 2023/09/30 21:26:43 tom Exp $
+.TH keybound 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
@@ -55,8 +55,8 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+.SH AUTHOR
+Thomas Dickey
 .SH SEE ALSO
 \fB\%define_key\fP(3X),
 \fB\%keyok\fP(3X)
-.SH AUTHOR
-Thomas Dickey
diff --git a/man/keyok.3x b/man/keyok.3x
index c6205cb31..92f9af9a8 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.32 2023/09/23 22:49:51 tom Exp $
-.TH keyok 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.34 2023/09/30 21:26:43 tom Exp $
+.TH keyok 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
@@ -55,7 +55,7 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH SEE ALSO
-\fB\%define_key\fP(3X)
 .SH AUTHOR
 Thomas Dickey
+.SH SEE ALSO
+\fB\%define_key\fP(3X)
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 6dfe1bb8c..9f9b421f3 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.17 2023/09/16 23:38:39 tom Exp $
-.TH legacy_coding 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.20 2023/09/30 21:38:11 tom Exp $
+.TH legacy_coding 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -70,7 +70,7 @@ This routine is specific to ncurses.
 It was not supported on Version 7, BSD or System V implementations.
 It is recommended that any code depending on ncurses extensions
 be conditioned using NCURSES_VERSION.
-.SH SEE ALSO
-\fBunctrl\fP(3X).
 .SH AUTHOR
 Thomas Dickey (to support lynx's font-switching feature).
+.SH SEE ALSO
+\fB\%unctrl\fP(3X)
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 21c47de95..38e399938 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.25 2023/09/23 23:00:59 tom Exp $
+# $Id: manhtml.aliases,v 1.26 2023/09/30 22:12:35 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -28,8 +28,11 @@
 # authorization.                                                           *
 #***************************************************************************
 # Items in this list will be linked to the corresponding manpages by man2html
+add_wch(3X)		curs_add_wch(3X)
 addch(3X)		curs_addch(3X)
 assume_default_colors(3X)	default_colors(3X)
+attr_on(3X)		curs_attr(3X)
+attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
 clearok(3X)		curs_outopts(3X)
 curs_set(3X)		curs_kernel(3X)
@@ -43,6 +46,7 @@ get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
 immedok(3X)		curs_outopts(3X)
+in_wch(3X)		curs_in_wch(3X)
 inch(3X)		curs_inch(3X)
 infocmp(1)		infocmp(1M)
 initscr(3X)		curs_initscr(3X)
@@ -53,6 +57,7 @@ meta(3X)		curs_inopts(3X)
 mvcur(3X)		curs_terminfo(3X)
 mvwin(3X)		curs_window(3X)
 newterm(3X)		curs_initscr(3X)
+newwin(3X)		curs_window(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
diff --git a/man/menu.3x b/man/menu.3x
index fa7b03ac6..a9b2f223c 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.36 2023/09/16 23:38:39 tom Exp $
-.TH menu 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.38 2023/09/30 21:38:11 tom Exp $
+.TH menu 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -206,8 +206,5 @@ NetBSD curses.
 Juergen Pfeifer.
 Manual pages and adaptation for ncurses by Eric S. Raymond.
 .SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``menu_\*(''
+\fB\%curses\fP(3X) and related pages whose names begin \*(``menu_\*(''
 for detailed descriptions of the entry points.
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 7a35f0233..f41ddd6ce 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
-.TH menu_attributes 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_attributes.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH menu_attributes 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -98,9 +98,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH SEE ALSO
-\fBcurses\fP(3X) and related pages whose names begin \*(``menu_\*('' for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -111,3 +108,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X) and related pages whose names begin \*(``menu_\*(''
+for detailed descriptions of the entry points.
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index d7e8e2882..f5c5041ba 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.22 2023/09/16 23:38:39 tom Exp $
-.TH menu_cursor 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
+.TH menu_cursor 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \-
 position a menu's cursor
@@ -56,8 +56,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_NOT_POSTED
 The menu has not been posted.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -68,3 +66,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 9891e4a13..6acda6b71 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.37 2023/09/16 23:38:39 tom Exp $
-.TH menu_driver 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
+.TH menu_driver 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -189,10 +189,6 @@ Character failed to match.
 .TP 5
 .B E_REQUEST_DENIED
 The menu driver could not process the request.
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBgetch\fP(3X),
-\fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header files
 \fB<curses.h>\fP.
@@ -204,3 +200,7 @@ The support for mouse events is ncurses specific.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%getch\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_format.3x b/man/menu_format.3x
index ebe79b488..cfe4ef57e 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
-.TH menu_format 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH menu_format 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \-
@@ -74,8 +74,6 @@ The menu is already posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -86,3 +84,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index a3b53d9be..f0cd7cecc 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
-.TH menu_hook 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH menu_hook 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
@@ -87,8 +87,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -100,3 +98,6 @@ Version 7 or BSD versions.
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric
 S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 79d383e60..9982027d9 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
-.TH menu_items 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH menu_items 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
@@ -73,9 +73,6 @@ The menu is already posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -89,3 +86,6 @@ as \-1 (which is the value of \fBERR\fP).
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 087832b19..23c5454e3 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
-.TH menu_mark 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH menu_mark 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \-
@@ -70,8 +70,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -82,3 +80,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 7793102dd..b739159c1 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
-.TH menu_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH menu_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \-
@@ -69,8 +69,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_POSTED
 The menu has already been posted.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -81,3 +79,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 471d153aa..490081a3d 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
-.TH menu_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
+.TH menu_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
@@ -95,8 +95,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_POSTED
 The menu is already posted.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -107,3 +105,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index fb5372baa..c1400d3dd 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.30 2023/09/16 23:38:39 tom Exp $
-.TH menu_pattern 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.33 2023/09/30 21:38:11 tom Exp $
+.TH menu_pattern 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \-
@@ -78,8 +78,6 @@ Character failed to match.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -90,3 +88,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 15f232a64..29e90f875 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
-.TH menu_post 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH menu_post 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \-
@@ -77,8 +77,6 @@ The menu has not been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -89,3 +87,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 146a45b00..7e05c170f 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
-.TH menu_requestname 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH menu_requestname 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
@@ -53,8 +53,6 @@ and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
 .br
 \fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -67,3 +65,6 @@ any code depending on them be conditioned using NCURSES_VERSION.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 9edc191ee..1e6728ce8 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
-.TH menu_spacing 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.31 2023/09/30 23:44:51 tom Exp $
+.TH menu_spacing 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
@@ -48,36 +48,37 @@ set and get spacing between menu items.
                  \fBint* \fIspc_columns\fB);\fR
 .SH DESCRIPTION
 The function \fBset_menu_spacing\fP sets the spacing information for the menu.
-Its parameter \fBspc_description\fP controls the number of spaces
+Its parameters provide the description and the size (in rows and columns).
+.TP
+\fIspc_description\fP
+controls the number of spaces
 between an item name and an item description.
 It must not be larger than \fBTABSIZE\fP.
 The menu system puts in the
 middle of this spacing area the pad character.
 The remaining parts are filled with
 spaces.
-The \fBspc_rows\fP parameter controls the number of rows
+.TP
+\fIspc_rows\fP
+controls the number of rows
 that are used for an item.
 It must not be larger than 3.
 The menu system inserts the blank lines between item rows, these lines
 will contain the pad character in the appropriate positions.
-The \fBspc_columns\fP parameter controls
-the number of blanks between columns of items.
+.TP
+\fIspc_columns\fP
+controls the number of blanks between columns of items.
 It must not be larger than \fBTABSIZE\fP.
 A value of 0 for all the spacing values resets them to the default,
 which is 1 for all of them.
-.br
-The function \fBmenu_spacing\fP passes back the spacing info for the menu.
-If a
-pointer is NULL, this specific info is simply not returned.
+.PP
+The function \fBmenu_spacing\fP returns the spacing information for the menu.
+If a pointer is NULL, the corresponding information is simply not returned.
 .SH RETURN VALUE
 Both routines return \fBE_OK\fP on success.
 \fBset_menu_spacing\fP may return
 \fBE_POSTED\fP if the menu is posted, or \fBE_BAD_ARGUMENT\fP if one of the
 spacing values is out of range.
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -90,3 +91,7 @@ any code depending on them be conditioned using NCURSES_VERSION.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 31aa9f326..3e8932fda 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.25 2023/09/16 23:38:39 tom Exp $
-.TH menu_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
+.TH menu_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \-
@@ -49,8 +49,6 @@ These functions get and set the menu user pointer field.
 It does not set \fBerrno\fP.
 .PP
 \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -64,3 +62,6 @@ We chose not to leave it as a char pointer for SVr4 compatibility.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 47e5bac28..6035ee3d3 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
-.TH menu_win 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH menu_win 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
@@ -80,10 +80,6 @@ The menu has already been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -94,3 +90,7 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 456b02849..d76ad8f3b 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.29 2023/09/16 23:38:39 tom Exp $
-.TH mitem_current 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
+.TH mitem_current 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
@@ -84,8 +84,6 @@ No items are connected to the menu.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -99,3 +97,6 @@ The SVr4 menu library documentation specifies the \fBtop_row\fP and
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 475a541f2..43e8fe016 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.23 2023/09/16 23:38:39 tom Exp $
-.TH mitem_name 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
+.TH mitem_name 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \-
@@ -48,8 +48,6 @@ item.
 .SH RETURN VALUE
 These routines return a pointer (which may be \fBNULL\fP).
 They do not set \fBerrno\fP.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -59,3 +57,6 @@ They were not supported on Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 51d149457..6a878b6c7 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
-.TH mitem_new 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH mitem_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \-
@@ -77,8 +77,6 @@ Item is connected to a menu.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -89,3 +87,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 36ac3062f..356ff75c1 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.25 2023/09/16 23:38:39 tom Exp $
-.TH mitem_opts 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
+.TH mitem_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
@@ -70,8 +70,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -82,3 +80,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index 7cfe7ae19..b37db98f6 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.26 2023/09/16 23:38:39 tom Exp $
-.TH mitem_userptr 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
+.TH mitem_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \-
@@ -50,9 +50,6 @@ The function \fBitem_userptr\fP returns a pointer (possibly \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
-.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -66,3 +63,6 @@ We chose not to leave it as a char pointer for SVr4 compatibility.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 684591c0f..ec37afb73 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.24 2023/09/16 23:38:39 tom Exp $
-.TH mitem_value 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
+.TH mitem_value 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \-
@@ -59,8 +59,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_REQUEST_DENIED
 The menu driver could not process the request.
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -71,3 +69,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index b2efded5d..2c857284c 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.19 2023/09/16 23:38:39 tom Exp $
-.TH mitem_visible 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.22 2023/09/30 21:38:11 tom Exp $
+.TH mitem_visible 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_visible\fP \-
 check visibility of a menu item
@@ -41,8 +41,6 @@ check visibility of a menu item
 A menu item is visible when it is in the portion of a posted menu that
 is mapped onto the screen (if the menu is scrollable, in particular, this
 portion will be smaller than the whole menu).
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBmenu\fP(3X).
 .SH NOTES
 The header file \fB<menu.h>\fP automatically includes the header file
 \fB<curses.h>\fP.
@@ -53,3 +51,6 @@ Version 7 or BSD versions.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%menu\fP(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 3edab6888..ecb0170a1 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.174 2023/09/23 22:58:27 tom Exp $
-.TH ncurses 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.177 2023/09/30 21:38:11 tom Exp $
+.TH ncurses 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -1329,13 +1329,6 @@ than assuming it is always in the debug library.
 directory containing initialization files for the terminal capability database
 @TERMINFO@
 terminal capability database
-.SH SEE ALSO
-\fBterminfo\fP(\*n) and related pages whose names begin
-\*(``curs_\*('' for detailed routine descriptions.
-.br
-\fBcurs_variables\fP(3X)
-.br
-\fBuser_caps\fP(5) for user-defined capabilities
 .SH EXTENSIONS
 The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
 that falls back to the old-style /etc/termcap file if the terminal setup code
@@ -1538,3 +1531,10 @@ This was an undocumented feature of AT&T System V Release 3 curses.
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
+.SH SEE ALSO
+\fB\%terminfo\fP(\*n) and related pages whose names begin
+\*(``curs_\*('' for detailed routine descriptions.
+.br
+\fB\%curs_variables\fP(3X)
+.br
+\fB\%user_caps\fP(5) for user-defined capabilities
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 66d2c0062..6fd7bef28 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.36 2023/09/23 22:37:46 tom Exp $
-.TH new_pair 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
+.TH new_pair 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -165,7 +165,7 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH SEE ALSO
-\fBcurs_color\fP(3X)
 .SH AUTHOR
 Thomas Dickey
+.SH SEE ALSO
+\fB\%curs_color\fP(3X)
diff --git a/man/panel.3x b/man/panel.3x
index 5716fa889..1202d77d3 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.52 2023/09/23 23:37:26 tom Exp $
-.TH panel 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.55 2023/09/30 21:38:11 tom Exp $
+.TH panel 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -261,12 +261,6 @@ interface for the panels library
 .P
 libpanel.a
 the panels library itself
-.SH SEE ALSO
-\fBcurses\fP(3X),
-\fBcurs_variables\fP(3X),
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SH AUTHOR
 Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,
 primarily to assist in porting \fIu386mon\fP to systems without a native
@@ -275,3 +269,6 @@ panels library.
 Repackaged for ncurses by Zeyd ben-Halim.
 .PP
 Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%curs_variables\fP(3X)
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index c44b40e31..08325d601 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.45 2023/09/23 22:49:53 tom Exp $
-.TH resizeterm 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.47 2023/09/30 21:26:43 tom Exp $
+.TH resizeterm 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -169,9 +169,9 @@ Doing that clears the screen and is visually distracting.
 .PP
 This extension of \fIncurses\fP was introduced in mid-1995.
 It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
+.SH AUTHOR
+Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
 .SH SEE ALSO
 \fB\%curs_getch\fP(3X),
 \fB\%curs_variables\fP(3X),
 \fB\%wresize\fP(3X)
-.SH AUTHOR
-Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index b1db0ea51..38d503d1a 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.33 2023/09/23 23:37:26 tom Exp $
-.TH scr_dump 5 2023-09-23 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.36 2023/09/30 21:38:11 tom Exp $
+.TH scr_dump 5 2023-09-30 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -410,9 +410,6 @@ Here is the corresponding dump (using \*(``od -t x1\*(''):
 *
 0002371
 .NE
-.SH SEE ALSO
-\fBcurs_scr_dump\fP(3X),
-\fBcurs_util\fP(3X).
 .SH AUTHORS
 Thomas E. Dickey
 .br
@@ -421,3 +418,6 @@ extended screen-dump format for ncurses 6.0 (2015)
 Eric S. Raymond
 .br
 screen dump feature in ncurses 1.9.2d (1995)
+.SH SEE ALSO
+\fB\%curs_scr_dump\fP(3X),
+\fB\%curs_util\fP(3X)
diff --git a/man/tabs.1 b/man/tabs.1
index f406eeb8a..98b689d53 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.44 2023/09/16 23:38:39 tom Exp $
-.TH @TABS@ 1 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.46 2023/09/30 21:38:11 tom Exp $
+.TH @TABS@ 1 2023-09-30 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -288,10 +288,7 @@ 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@INFOCMP@\fP(1M),
-\fB@TSET@\fP(1),
-\fBcurses\fP(3X),
-\fBterminfo\fP(\*n).
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@TSET@\fP(1),
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/term.5 b/man/term.5
index 2db2d5028..201927241 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.56 2023/09/16 23:38:39 tom Exp $
-.TH term 5 2023-09-16 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.58 2023/09/30 21:26:43 tom Exp $
+.TH term 5 2023-09-30 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -403,8 +403,6 @@ The legacy format could have supported 32768-byte entries,
 but was limited a virtual memory page's 4096 bytes.
 .SH FILES
 \*d/*/* compiled terminal capability database
-.SH SEE ALSO
-\fBcurses\fP(3X), \fBterminfo\fP(\*n).
 .SH AUTHORS
 Thomas E. Dickey
 .br
@@ -417,3 +415,7 @@ extended number support for ncurses 6.1
 Eric S. Raymond
 .br
 documented legacy terminfo format, e.g., from \fIpcurses\fP.
+.SH SEE ALSO
+\fB\%curses\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/term.7 b/man/term.7
index b6a4da946..d68ba1c6e 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.36 2023/09/17 00:10:28 tom Exp $
-.TH term 7 2023-09-16 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.38 2023/09/30 21:38:11 tom Exp $
+.TH term 7 2023-09-30 "ncurses 6.4" Miscellaneous
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -222,4 +222,6 @@ tty line initialization (AT&T-like UNIXes)
 /etc/ttys
 tty line initialization (BSD-like UNIXes)
 .SH SEE ALSO
-\fBcurses\fP(3X), \fBterminfo\fP(\*n), \fBterm\fP(\*n).
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n),
+\fB\%term\fP(\*n)
diff --git a/man/term_variables.3x b/man/term_variables.3x
index fe81b6605..e81401962 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.27 2023/09/16 23:38:39 tom Exp $
-.TH term_variables 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.30 2023/09/30 23:13:32 tom Exp $
+.TH term_variables 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -167,9 +167,7 @@ into the current terminal description loaded into memory.
 .\"
 .SH NOTES
 The low-level terminfo interface is initialized using
-.hy 0
-\fBsetupterm\fP(3X).
-.hy
+\fB\%setupterm\fP(3X).
 The upper-level curses interface uses the low-level terminfo interface,
 internally.
 .\"
@@ -186,9 +184,7 @@ All implementations which provide terminfo interfaces add definitions
 as described in the \fBTerminfo Names\fP section.
 Most, but not all, base the definition upon the \fBcur_term\fP variable.
 .SH SEE ALSO
-.hy 0
-\fBcurses\fP(3X),
-\fBcurs_terminfo\fP(3X),
-\fBcurs_threads\fP(3X),
-\fBterminfo\fP(\*n).
-.hy
+\fB\%curses\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%curs_threads\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 2ce4c1bb4..66cfbe74d 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.131 2023/09/16 17:01:55 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.132 2023/09/30 21:38:11 Branden.Robinson Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -2096,15 +2096,14 @@ files containing terminal descriptions
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
 .SH SEE ALSO
-.na
-.hy 0
-\fB@INFOCMP@\fP(1M),
-\fB@TABS@\fP(1),
-\fB@TIC@\fP(1M),
-\fBcurses\fP(3X),
-\fBcurs_color\fP(3X),
-\fBcurs_variables\fP(3X),
-\fBprintf\fP(3),
-\fBterm_variables\fP(3X).
-\fBterm\fP(\*n).
-\fBuser_caps\fP(5).
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@TABS@\fP(1),
+\fB\%@TIC@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%curs_color\fP(3X),
+\fB\%curs_terminfo\fP(3X),
+\fB\%curs_variables\fP(3X),
+\fB\%printf\fP(3),
+\fB\%term_variables\fP(3X),
+\fB\%term\fP(\*n),
+\fB\%user_caps\fP(5)
diff --git a/man/tic.1m b/man/tic.1m
index d9bb24bf8..dfcaa31e7 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.93 2023/09/16 23:38:39 tom Exp $
-.TH @TIC@ 1M 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.96 2023/09/30 21:38:11 tom Exp $
+.TH @TIC@ 1M 2023-09-30 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -589,20 +589,17 @@ System V does not compile entries to or read entries from your
 .TP 5
 \fB\*d/?/*\fP
 Compiled terminal description database.
-.SH SEE ALSO
-\fB@CAPTOINFO@\fP(1M),
-\fB@INFOCMP@\fP(1M),
-\fB@INFOTOCAP@\fP(1M),
-\fB@TOE@\fP(1M),
-\fBcurses\fP(3X),
-\fBterm\fP(\*n).
-\fBterminfo\fP(\*n).
-\fBuser_caps\fP(\*n).
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
 Thomas E. Dickey <dickey@invisible-island.net>
+.SH SEE ALSO
+\fB\%@CAPTOINFO@\fP(1M),
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@INFOTOCAP@\fP(1M),
+\fB\%@TOE@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%term\fP(\*n),
+\fB\%terminfo\fP(\*n),
+\fB\%user_caps\fP(\*n)
diff --git a/man/toe.1m b/man/toe.1m
index c0325e813..af0f48998 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,12 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.46 2023/09/16 23:38:39 tom Exp $
-.TH @TOE@ 1M 2023-09-16 "ncurses 6.4" "User commands"
-.de bP
-.ie n  .IP \(bu 4
-.el    .IP \(bu 2
-..
+.\" $Id: toe.1m,v 1.51 2023/10/01 09:45:05 tom Exp $
+.TH @TOE@ 1M 2023-10-01 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -42,19 +38,9 @@
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
 ..
 .ds n 5
 .ds d @TERMINFO@
@@ -62,136 +48,175 @@
 \fB\%@TOE@\fP \-
 list table of entries of \fIterminfo\fR terminal types
 .SH SYNOPSIS
-\fB@TOE@\fP [\fB\-v\fP[\fIn\fP]] [\fB\-ahsuUV\fP] \fIfile...\fP
-.SH DESCRIPTION
-With no options,
-\fB@TOE@\fP lists all available terminal types by primary name
-with descriptions.
-File arguments specify the directories to be scanned; if no
-such arguments are given,
-your default terminfo directory is scanned.
-If you also specify the \fB\-h\fP option,
-a directory header will be issued as each
-directory is entered.
+.B @TOE@
+.RB [ \-ahs ]
+.RB [ \-v\ \c
+.RI [ n ]]
+.RI [ directory
+\&.\|.\|.]
 .PP
-There are other options intended for use by terminfo file maintainers:
-.TP
-\fB\-a\fP
-report on all of the terminal databases which ncurses would search,
-rather than only the first one that it finds.
+.B @TOE@
+.RB [ \-u | \-U ]
+.I file
+.PP
+.B "@TOE@ \-V"
+.SH DESCRIPTION
+\fB\%@TOE@\fP reports to the standard output stream the (primary) names
+and descriptions of the terminal types available to the \fIterminfo\fP
+library.
+Each \fIdirectory\fP operand is scanned;
+if none are given,
+\fB\%@TOE@\fP scans the the default \fIterminfo\fP directory.
+.SH OPTIONS
+The \fB\-h\fP option can be helpful to observe where \fB\%@TOE@\fP is
+looking for terminal descriptions.
+Other options support maintainers of \fIterminfo\fP terminal
+descriptions.
+.TP 9 \" "-u file" + 2n
+.B \-a
+lists entries from all terminal database directories that \fIterminfo\fP
+would search,
+instead of only the first that it finds.
 .IP
-If the \fB\-s\fP is also given, \fB@TOE@\fP
-adds a column to the report,
-showing (like \fBconflict\fP(1)) which entries which
-belong to a given terminal database.
-An "*" marks entries which differ, and "+" marks equivalent entries.
+If the \fB\-s\fP option is also given,
+\fB\%@TOE@\fP adds a column to the report,
+showing (like \fB\%conflict\fP(1)) which entries belong to a given
+terminal database.
+An \*(``*\*('' marks entries that differ,
+and \*(``+\*('' marks equivalent entries.
 .IP
-Without the \fB\-s\fP option, \fB@TOE@\fP does not attempt to merge
-duplicates in its report
+Without the \fB\-s\fP option,
+\fB\%@TOE@\fP does not attempt to merge duplicates in its report.
+.TP
+.B \-h
+writes a heading naming each each directory as it is accessed.
 .TP
-\fB\-s\fP
-sort the output by the entry names.
+.B \-s
+sorts the output by the entry names.
 .TP
-\fB\-u\fP \fIfile\fP
-says to write a report to the standard output,
-listing dependencies in the given terminfo/termcap source file.
-The report condenses the \*(``use\*('' relation:
-each line consists of the primary name of a terminal that
-has use capabilities,
-followed by a colon,
-followed by the
-whitespace-separated primary names of all terminals which occur in those use
-capabilities,
-followed by a newline
+.BI \-u\  file
+lists terminal type dependencies in \fIfile\fP,
+a \fIterminfo\fP entry source or \fItermcap\fP database file.
+The report summarizes the \*(``\fBuse\fP\*('' (\fIterminfo\fP) and
+\*(``\fBtc\fP\*('' (\fItermcap\fP) relations:
+each line comprises the primary name of a terminal type employing
+\fBuse\fP/\fBtc\fP capabilities,
+a colon,
+a space- and tab-separated list of primary names of terminal types thus
+named,
+and a newline.
 .TP
-\fB\-U\fP \fIfile\fP
-says to write a report to the standard output,
-listing reverse dependencies in the given terminfo/termcap source file.
-The report reverses the \*(``use\*('' relation:
-each line consists of the primary name of a
-terminal that occurs in use capabilities,
-followed by a colon,
-followed by the
-whitespace-separated primary names of all terminals which depend on it,
-followed by a newline.
+.BI \-U\  file
+lists terminal type reverse dependencies in \fIfile\fP,
+a \fIterminfo\fP entry source or \fItermcap\fP database file.
+The report summarizes the \*(``\fBuse\fP\*('' (\fIterminfo\fP) and
+\*(``\fBtc\fP\*('' (\fItermcap\fP) reverse relations:
+each line comprises the primary name of a terminal type occurring in
+\fBuse\fP/\fBtc\fP capabilities,
+a colon,
+a space- and tab-separated list of primary names of terminal types
+naming them thus,
+and a newline.
 .TP
-\fB\-v\fIn\fR
-specifies that (verbose) output be written to standard error,
-showing \fB@TOE@\fP's progress.
+.BR \-v\  [\c
+.IR n ]
+reports verbose status information to the standard error stream,
+showing \fB\%@TOE@\fP's progress.
 .IP
-The optional parameter \fIn\fP is a number from 1 to 10,
-interpreted as for \fB@TIC@\fP(1M).
-If ncurses is built without tracing support, the optional parameter is ignored.
+The optional parameter \fIn\fP is an integer between 1 and 10 inclusive,
+interpreted as for \fB\%@TIC@\fP(1M).
+If \fIncurses\fP is built without tracing support,
+\fIn\fP is ignored.
 .TP
 \fB\-V\fP
-reports the version of ncurses which was used in this program,
-and exits.
+reports the version of \fIncurses\fP associated
+with this program and exits with a successful status.
 .SH EXAMPLES
-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
+When not sorting with the \fB\-s\fP option,
+the \fB\-a\fP option reports all of the names found in all of the
+terminal database directories named in the \fB\%TERMINFO\fP and
+\fB\%TERMINFO_DIRS\fP environment variables.
+.RS 4
+.PP
+.\" toe -a | grep -E '^(xterm|vt)'
+.TS
+Lf(\*(CW)2 Lf(\*(CW).
+xterm\-color	generic color xterm
+xterm\-xfree86	xterm terminal emulator (XFree86)
+xterm\-vt220	xterm emulating vt220
+xterm\-256color	xterm with 256 colors
+xterm\-r6	xterm X11R6 version
+xterm\-r5	xterm R5 version
+xterm\-mono	monochrome xterm
+.\" The next row overruns the line length on DWB nroff (65n).
+xterm	xterm terminal emulator (X Window System)
+vt220	dec vt220
+vt102	dec vt102
+vt100	dec vt100 (w/advanced video)
+vt52	dec vt52
+.T&
+L.
+\&.\|.\|.
+.TE
+.RE
 .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
+Use the \fB\-a\fP and \fB\-s\fP options together to show where each
+terminal description was found.
+.RS 4
+.PP
+.\" toe -as | grep -E '(^-+>|:.(xterm|vt))'
+.TS
+lf(\*(CW).
+\-\-> /etc/terminfo
+\-\-\-\-> /lib/terminfo
+\-\-\-\-\-\-> /usr/share/terminfo
+.TE
+.TS
+lf(\*(CW)1 lf(\*(CW)2 lf(\*(CW).
+\-\-*\-\-\-:	vt100	dec vt100 (w/advanced video)
+\-\-*\-\-\-:	vt102	dec vt102
+\-\-*\-\-\-:	vt220	dec vt220
+\-\-*\-\-\-:	vt52	dec vt52
+.\" The next row overruns the line length on DWB nroff (65n).
+\-\-*\-\-\-:	xterm	xterm terminal emulator (X Window System)
+\-\-*\-\-\-:	xterm\-256color	xterm with 256 colors
+\-\-*\-\-\-:	xterm\-color	generic color xterm
+\-\-*\-\-\-:	xterm\-mono	monochrome xterm
+\-\-*\-\-\-:	xterm\-r5	xterm R5 version
+\-\-*\-\-\-:	xterm\-r6	xterm X11R6 version
+\-\-*\-\-\-:	xterm\-vt220	xterm emulating vt220
+.\" The next row overruns the line length on DWB nroff (65n).
+\-\-*\-\-\-:	xterm\-xfree86	xterm terminal emulator (XFree86)
+.T&
+l.
+\&.\|.\|.
+.TE
+.RE
 .SH FILES
-.TP 5
-\fB\*d/?/*\fP
-Compiled terminal description database.
+.TP
+\fI\*d\fP
+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.
+\fB\%@TOE@\fP is not provided by other implementations.
+There is no applicable X/Open or POSIX standard for it.
 .PP
-The program name refers to a developer's pun:
+It replaces a \fB\-T\fP option that was briefly supported by
+the \fIncurses\fP \fB\%infocmp\fP utility in 1995.
+.PP
+The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011,
+respectively.
+.PP
+The program's name originates with 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@\fP several years later (2006 and 2011, respectively).
 .SH SEE ALSO
-\fB@CAPTOINFO@\fP(1M),
-\fB@INFOCMP@\fP(1M),
-\fB@INFOTOCAP@\fP(1M),
-\fB@TIC@\fP(1M),
-\fBcurses\fP(3X),
-\fBterminfo\fP(\*n).
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%@CAPTOINFO@\fP(1M),
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@INFOTOCAP@\fP(1M),
+\fB\%@TIC@\fP(1M),
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(\*n)
diff --git a/man/tput.1 b/man/tput.1
index 93cf0e029..314bf38f8 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.83 2023/09/16 23:38:39 tom Exp $
-.TH @TPUT@ 1 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.85 2023/09/30 21:38:11 tom Exp $
+.TH @TPUT@ 1 2023-09-30 "ncurses 6.4" "User commands"
 .ds d @TERMINFO@
 .ds n 1
 .ie \n(.g .ds `` \(lq
@@ -608,12 +608,9 @@ as ncurses.
 NetBSD curses documents different exit codes which do not correspond
 to either ncurses or X/Open.
 .SH SEE ALSO
-\fB@CLEAR@\fP(\*n),
-\fBstty\fP(1),
-\fB@TABS@\fP(\*n),
-\fB@TSET@\fP(\*n),
-\fBcurs_termcap\fP(3X),
-\fBterminfo\fP(5).
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%@CLEAR@\fP(\*n),
+\fB\%stty\fP(1),
+\fB\%@TABS@\fP(\*n),
+\fB\%@TSET@\fP(\*n),
+\fB\%curs_termcap\fP(3X),
+\fB\%terminfo\fP(5)
diff --git a/man/tset.1 b/man/tset.1
index 92d91a35e..a5ca03527 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.69 2023/09/16 23:38:39 tom Exp $
-.TH @TSET@ 1 2023-09-16 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.71 2023/09/30 21:38:11 tom Exp $
+.TH @TSET@ 1 2023-09-30 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -422,16 +422,11 @@ system port name to terminal type mapping database (BSD versions only).
 @TERMINFO@
 terminal capability database
 .SH SEE ALSO
-.hy 0
-\fBcsh\fP(1),
-\fBsh\fP(1),
-\fBstty\fP(1),
-\fBcurs_terminfo\fP(3X),
-\fBtty\fP(4),
-\fBterminfo\fP(5),
-\fBttys\fP(5),
-\fBenviron\fP(7)
-.hy
-.PP
-This describes \fBncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+\fB\%csh\fP(1),
+\fB\%sh\fP(1),
+\fB\%stty\fP(1),
+\fB\%curs_terminfo\fP(3X),
+\fB\%tty\fP(4),
+\fB\%terminfo\fP(5),
+\fB\%ttys\fP(5),
+\fB\%environ\fP(7)
diff --git a/man/user_caps.5 b/man/user_caps.5
index 8e19116b3..27c48f83d 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.36 2023/09/16 23:38:39 tom Exp $
-.TH user_caps 5 2023-09-16 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.40 2023/09/30 23:47:46 tom Exp $
+.TH user_caps 5 2023-09-30 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -194,6 +194,7 @@ the terminal.
 The command \*(``\fBtput clear\fP\*('' does the same thing.
 .TP 3
 NQ
+\fIboolean\fP,
 used to suppress a consistency check in @TIC@ for the ncurses capabilities
 in user6 through user9 (u6, u7, u8 and u9)
 which tell how to query the terminal's cursor position
@@ -408,21 +409,22 @@ has been adopted in NetBSD curses.
 That implementation stores user-defined capabilities,
 but makes no use of these capabilities itself.
 .\"
+.SH AUTHORS
+Thomas E. Dickey
+.br
+beginning with ncurses 5.0 (1999)
+.\"
 .SH SEE ALSO
-\fB@INFOCMP@\fP(1M),
-\fB@TIC@\fP(1M).
+\fB\%@INFOCMP@\fP(1M),
+\fB\%@TIC@\fP(1M)
 .PP
 The terminal database section
 .I "NCURSES USER-DEFINABLE CAPABILITIES"
 summarizes commonly-used user-defined capabilities
 which are used in the terminal descriptions.
-Some of those features are mentioned in \fBscreen\fP(1) or \fBtmux\fP(1).
+Some of those features are mentioned in \fB\%screen\fP(1) or
+\fBtmux\fP(1).
 .PP
 .I "XTerm Control Sequences"
-provides further information on the \fBxterm\fP(1) features
-which are used in these extended capabilities.
-.\"
-.SH AUTHORS
-Thomas E. Dickey
-.br
-beginning with ncurses 5.0 (1999)
+provides further information on the \fB\%xterm\fP(1) features
+that are used in these extended capabilities.
diff --git a/man/wresize.3x b/man/wresize.3x
index c07f284fb..ab2674d66 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.28 2023/09/16 23:38:39 tom Exp $
-.TH wresize 3X 2023-09-16 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
+.TH wresize 3X 2023-09-30 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -60,7 +60,7 @@ It is not possible to resize windows with SVr4 curses.
 .PP
 This extension of ncurses was introduced in mid-1995.
 It was adopted in NetBSD curses (2001) and PDCurses (2003).
-.SH SEE ALSO
-\fBresizeterm\fP(3X).
 .SH AUTHOR
 Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+.SH SEE ALSO
+\fB\%resizeterm\fP(3X)
diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index 3fff2e83c..c38931d10 100644
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.35 2021/10/03 00:25:09 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.36 2023/09/30 10:42:42 Ian.Abbott Exp $")
 
 #if USE_SAFE_SPRINTF
 
@@ -264,11 +264,18 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx
 # if HAVE_VSNPRINTF
 	    /* SUSv2, 1997 */
 	    int used;
-	    while ((used = vsnprintf(my_buffer, my_length, fmt, ap))
-		   >= (int) my_length) {
+
+	    do {
+		va_list ap2;
+
+		begin_va_copy(ap2, ap);
+		used = vsnprintf(my_buffer, my_length, fmt, ap2);
+		end_va_copy(ap2);
+		if (used < (int) my_length)
+		    break;
 		my_length = (size_t) ((3 * used) / 2);
 		my_buffer = typeRealloc(char, my_length, my_buffer);
-	    }
+	    } while (my_buffer != NULL);
 # else
 	    /* ISO/ANSI C, 1989 */
 	    vsprintf(my_buffer, fmt, ap);
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index d0d216dc8..cd0973893 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.222 2023/09/16 12:29:28 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.226 2023/10/01 23:53:23 tom Exp $")
 
 /****************************************************************************
  *
@@ -272,6 +272,144 @@ use_tioctl(bool f)
 }
 #endif
 
+#if !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER))
+static void
+_nc_default_screensize(TERMINAL *termp, int *linep, int *colp)
+{
+    /* if we can't get dynamic info about the size, use static */
+    if (*linep <= 0) {
+	*linep = (int) lines;
+    }
+    if (*colp <= 0) {
+	*colp = (int) columns;
+    }
+
+    /* the ultimate fallback, assume fixed 24x80 size */
+    if (*linep <= 0) {
+	*linep = 24;
+    }
+    if (*colp <= 0) {
+	*colp = 80;
+    }
+}
+
+static const char *
+skip_csi(const char *value)
+{
+    if (UChar(*value) == CSI_CHR) {
+	++value;
+    } else if (*value == ESC_CHR && value[1] == L_BLOCK) {
+	value += 2;
+    }
+    return value;
+}
+
+static bool
+is_expected(const char *value, const char *expected)
+{
+    bool result = FALSE;
+    if (VALID_STRING(value)) {
+	const char *skipped = skip_csi(value);
+	if (skipped != value) {
+	    if (!strcmp(skipped, expected))
+		result = TRUE;
+	}
+    }
+    return result;
+}
+
+static bool
+get_position(TERMINAL *termp, int fd, int *row, int *col)
+{
+    bool result = FALSE;
+    size_t need = strlen(user7);
+    int have;
+
+    have = (int) write(fd, user7, need);
+
+    if (have == (int) need) {
+	int y, x;
+	char buf[20];
+	char *s;
+	char ignore;
+
+	s = memset(buf, '\0', sizeof(buf));
+	do {
+	    int ask = (int) (sizeof(buf) - 1 - (s - buf));
+	    int got = (int) read(fd, s, ask);
+	    if (got == 0)
+		break;
+	    s += got;
+	    *s = '\0';
+	} while (strchr(buf, 'R') == NULL);
+	T(("response %s", _nc_visbuf(buf)));
+	if (sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &ignore) != 2
+	    || (ignore != 'R' && ignore != ';')) {
+	    *row = y;
+	    *col = x;
+	    result = TRUE;
+	}
+    }
+    T(("get_position %d,%d", *row, *col));
+    return result;
+}
+
+static bool
+set_position(TERMINAL *termp, int fd, int row, int col)
+{
+    bool result = FALSE;
+    char *actual = TIPARM_2(cursor_address, row, col);
+    T(("set_position %d,%d", row, col));
+    if (actual != NULL) {
+	size_t want = strlen(actual);
+	int have = (int) write(fd, actual, want);	/* FIXME - padding */
+	result = ((int) want == have);
+    }
+    return result;
+}
+
+/*
+ * This is a little more complicated than one might expect, because we do this
+ * before setting up the terminal modes, etc.
+ */
+static void
+_nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
+{
+    int fd = fileno(stderr);
+    TTY saved;
+
+    if (NC_ISATTY(fd)
+	&& VALID_STRING(cursor_address)
+	&& is_expected(user7, "6n")
+	&& is_expected(user6, "%i%d;%dR")
+	&& GET_TTY(fd, &saved) == OK) {
+	int current_y, current_x;
+	int updated_y, updated_x;
+	TTY alter = saved;
+
+	alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN);
+	alter.c_iflag &= (unsigned) ~(IXON | BRKINT | PARMRK);
+	alter.c_cc[VMIN] = 0;
+	alter.c_cc[VTIME] = 1;
+	SET_TTY(fd, &alter);
+
+	if (get_position(termp, fd, &current_y, &current_x)
+	    && set_position(termp, fd, 9999, 9999)
+	    && get_position(termp, fd, &updated_y, &updated_x)) {
+	    *linep = updated_y;
+	    *colp = updated_x;
+	    set_position(termp, fd, current_y, current_x);
+	}
+	/* restore tty modes */
+	SET_TTY(fd, &saved);
+    }
+
+    _nc_default_screensize(termp, linep, colp);
+}
+#else
+#define _nc_check_screensize(termp, linep, colp) _nc_default_screensize(termp, linep, colp)
+#endif
+
 NCURSES_EXPORT(void)
 _nc_get_screensize(SCREEN *sp,
 #ifdef USE_TERM_DRIVER
@@ -389,22 +527,10 @@ _nc_get_screensize(SCREEN *sp,
 		*colp = value;
 		T(("screen size: environment COLUMNS = %d", *colp));
 	    }
-	}
 
-	/* if we can't get dynamic info about the size, use static */
-	if (*linep <= 0) {
-	    *linep = (int) lines;
-	}
-	if (*colp <= 0) {
-	    *colp = (int) columns;
-	}
-
-	/* the ultimate fallback, assume fixed 24x80 size */
-	if (*linep <= 0) {
-	    *linep = 24;
-	}
-	if (*colp <= 0) {
-	    *colp = 80;
+	    _nc_default_screensize(termp, linep, colp);
+	} else {
+	    _nc_check_screensize(termp, linep, colp);
 	}
 
 	/*
@@ -419,6 +545,8 @@ _nc_get_screensize(SCREEN *sp,
 	OldNumber(termp, lines) = (short) (*linep);
 	OldNumber(termp, columns) = (short) (*colp);
 #endif
+    } else {
+	_nc_check_screensize(termp, linep, colp);
     }
 
     T(("screen size is %dx%d", *linep, *colp));
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9463548ad..8be102adb 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230923) unstable; urgency=low
+ncurses6 (6.4+20231001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9463548ad..8be102adb 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230923) unstable; urgency=low
+ncurses6 (6.4+20231001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 737841138..432ff028d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230923) unstable; urgency=low
+ncurses6 (6.4+20231001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Sep 2023 05:27:19 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7a5c2d079..581a2d801 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.607 2023/09/23 09:27:19 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.609 2023/10/01 08:35:58 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0923"
+!define VERSION_MMDD  "1001"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 97007c33f..9f292f259 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230923
+Release: 20231001
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a5fda1c3a..bf428407d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230923
+Release: 20231001
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7d0542ef2..ce2d089b5 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230923
+Release: 20231001
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tic.c b/progs/tic.c
index d8052648f..474e93d8e 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.322 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.323 2023/09/30 21:17:23 Branden.Robinson Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -459,17 +459,20 @@ open_input(const char *filename, char *alt_file)
     if (!strcmp(filename, "-")) {
 	fp = copy_input(stdin, STDIN_NAME, alt_file);
     } else if (stat(filename, &sb) == -1) {
-	fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno));
+	fprintf(stderr, "%s: cannot open '%s': %s\n", _nc_progname,
+		filename, strerror(errno));
 	ExitProgram(EXIT_FAILURE);
     } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR
 	       || (mode != S_IFREG && mode != S_IFCHR && mode != S_IFIFO)) {
-	fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
+	fprintf(stderr, "%s: cannot open '%s'; it is not a file\n",
+		_nc_progname, filename);
 	ExitProgram(EXIT_FAILURE);
     } else {
 	fp = safe_fopen(filename, "r");
 
 	if (fp == NULL) {
-	    fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
+	    fprintf(stderr, "%s: cannot open '%s': %s\n", _nc_progname,
+		    filename, strerror(errno));
 	    ExitProgram(EXIT_FAILURE);
 	}
 	if (mode != S_IFREG) {
@@ -477,7 +480,8 @@ open_input(const char *filename, char *alt_file)
 		FILE *fp2 = copy_input(fp, filename, alt_file);
 		fp = fp2;
 	    } else {
-		fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
+		fprintf(stderr, "%s: cannot open '%s'; it is not a"
+			" file\n", _nc_progname, filename);
 		ExitProgram(EXIT_FAILURE);
 	    }
 	}
diff --git a/test/clip_printw.c b/test/clip_printw.c
index 49d67c537..c34a1e09f 100644
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,9 +27,9 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: clip_printw.c,v 1.21 2022/12/10 23:31:31 tom Exp $
+ * $Id: clip_printw.c,v 1.23 2023/09/30 19:57:44 tom Exp $
  *
- * demonstrate how to use printw without wrapping.
+ * demonstrate how to use printw with/without wrapping.
  */
 
 #include <test.priv.h>
@@ -40,9 +40,15 @@
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 #define COLOR_DEFAULT (-1)
 
+#define X_BASE 0
+#define Y_BASE 1
+#define MARGIN 1
+#define Y_TOP  (Y_BASE + MARGIN)
+
 typedef struct {
     unsigned c;
     unsigned v;
+    bool single;
     int status;
     int pair;
     attr_t attr;
@@ -57,21 +63,29 @@ typedef struct {
 } STATUS;
 
 static int
-clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
+clip_wprintw(WINDOW *win, bool single, NCURSES_CONST char *fmt, ...)
 {
     int y0, x0, y1, x1, width;
     WINDOW *sub;
     va_list ap;
     int rc;
 
-    /*
-     * Allocate a single-line derived window extending from the current
-     * cursor position to the end of the current line in the given window.
-     * Disable scrolling in the derived window.
-     */
     getyx(win, y0, x0);
     width = getmaxx(win) - x0;
-    sub = derwin(win, 1, width, y0, x0);
+    if (single) {
+	/*
+	 * Allocate a single-line derived window extending from the current
+	 * cursor position to the end of the current line in the given window.
+	 * Disable scrolling in the derived window.
+	 */
+	sub = derwin(win, 1, width, y0, x0);
+    } else {
+	/*
+	 * Allow printw to wrap through the entire window.
+	 */
+	sub = derwin(win, getmaxy(win), getmaxx(win), 0, 0);
+	wmove(sub, y0, x0);
+    }
     scrollok(sub, FALSE);
 
     /*
@@ -84,7 +98,11 @@ clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
     getyx(sub, y1, x1);
     delwin(sub);
 
-    wmove(win, y1 + y0, x1 + x0);
+    if (single) {
+	wmove(win, y1 + y0, x1 + x0);
+    } else {
+	wmove(win, y1, x1);
+    }
 
     return rc;
 }
@@ -156,11 +174,12 @@ video_params(unsigned state, attr_t *attr)
 static void
 fill_window(WINDOW *win)
 {
+    int y_top = (win == stdscr) ? Y_BASE : MARGIN;
     int y, x;
     int y0 = -1, x0 = -1;
 
     getyx(win, y, x);
-    wmove(win, 0, 0);
+    wmove(win, y_top, 0);
     while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
 	int y1, x1;
 	getyx(win, y1, x1);
@@ -178,25 +197,34 @@ show_status(WINDOW *win, STATUS * sp)
     int y, x;
 
     getyx(win, y, x);
+    wattron(win, A_REVERSE);
     wmove(win, 0, 0);
-    wprintw(win, "Count %d", sp->count);
+    wprintw(win, "Clip %s", sp->single ? "line" : "window");
+    wprintw(win, " Count %d", sp->count);
     if (sp->v_msg != 0)
 	wprintw(win, " Video %s", sp->v_msg);
     if (sp->c_msg != 0)
 	wprintw(win, " Color %s", sp->c_msg);
     wprintw(win, " (%d)", sp->status);
     wclrtoeol(win);
+    wattroff(win, A_REVERSE);
     wmove(win, y, x);
 }
 
 static void
 do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
 {
-    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
-			  sp->y_beg + 1, sp->x_beg + 1);
+    WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN),
+			  sp->x_max - (2 * MARGIN),
+			  sp->y_beg + MARGIN,
+			  sp->x_beg + MARGIN);
 
     if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
-	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
+	WINDOW *win2 = derwin(win1,
+			      sp->y_max - (2 * MARGIN) - 2,
+			      sp->x_max - (2 * MARGIN) - 2,
+			      (win == stdscr) ? Y_BASE : Y_BASE,
+			      MARGIN);
 
 	if (win2 != 0) {
 	    box(win1, 0, 0);
@@ -216,10 +244,14 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
     }
 }
 
+/*
+ * The status line is within the same window as the test-data.
+ */
 static void
 init_status(WINDOW *win, STATUS * sp)
 {
     memset(sp, 0, sizeof(*sp));
+    sp->single = TRUE;
     sp->c = 99;
     sp->v = 99;
     sp->ch = ' ';
@@ -229,6 +261,8 @@ init_status(WINDOW *win, STATUS * sp)
 
     getbegyx(win, sp->y_beg, sp->x_beg);
     getmaxyx(win, sp->y_max, sp->x_max);
+
+    wmove(win, sp->y_val = Y_BASE, sp->x_val = 0);
 }
 
 static void
@@ -242,7 +276,10 @@ show_help(WINDOW *win)
 	,""
 	,"Other commands:"
 	,"space toggles through the set of video attributes and colors."
+	,"q     exit subwindow, quit if last window."
+	,"s     toggles single-line updates versus entire windows."
 	,"t     touches (forces repaint) of the current line."
+	,"w     create subwindow."
 	,".     calls vw_printw at the current position with the given count."
 	,"=     resets count to zero."
 	,"?     shows this help-window"
@@ -255,6 +292,8 @@ show_help(WINDOW *win)
 static void
 update_status(WINDOW *win, STATUS * sp)
 {
+    int margin = 0;
+
     switch (sp->ch) {
     case ' ':			/* next test-iteration */
 	if (has_colors()) {
@@ -272,24 +311,40 @@ update_status(WINDOW *win, STATUS * sp)
 	sp->count = 0;
 	show_status(win, sp);
 	break;
+    case KEY_HOME:
+    case '^':
+	wmove(win, sp->y_val, sp->x_val = margin);
+	break;
+    case KEY_END:
+    case '$':
+	wmove(win, sp->y_val, sp->x_val = (sp->x_max - margin - 1));
+	break;
+    case KEY_PPAGE:
+    case CTRL('B'):
+	wmove(win, sp->y_val = Y_BASE, sp->x_val);
+	break;
+    case KEY_NPAGE:
+    case CTRL('F'):
+	wmove(win, sp->y_val = (sp->y_max - margin - 1), sp->x_val);
+	break;
     case KEY_LEFT:
     case 'h':
-	if (sp->x_val > 0)
+	if (sp->x_val > margin)
 	    wmove(win, sp->y_val, --(sp->x_val));
 	break;
     case KEY_DOWN:
     case 'j':
-	if (sp->y_val < sp->y_max)
+	if (sp->y_val < (sp->y_max - margin))
 	    wmove(win, ++(sp->y_val), sp->x_val);
 	break;
     case KEY_UP:
     case 'k':
-	if (sp->y_val > 0)
+	if (sp->y_val > Y_BASE)
 	    wmove(win, --(sp->y_val), sp->x_val);
 	break;
     case KEY_RIGHT:
     case 'l':
-	if (sp->x_val < sp->x_max)
+	if (sp->x_val < (sp->x_max - margin))
 	    wmove(win, sp->y_val, ++(sp->x_val));
 	break;
     case 't':
@@ -299,6 +354,10 @@ update_status(WINDOW *win, STATUS * sp)
 	sp->count = 0;
 	show_status(win, sp);
 	break;
+    case 's':
+	sp->single = !sp->single;
+	show_status(win, sp);
+	break;
     case HELP_KEY_1:
 	show_help(win);
 	break;
@@ -342,7 +401,7 @@ test_clipping(WINDOW *win)
 		    buffer[j] = (char) ('A' + (j % 26));
 		}
 		buffer[need - 1] = '\0';
-		st.status = clip_wprintw(win, fmt, '[', buffer, ']');
+		st.status = clip_wprintw(win, st.single, fmt, '[', buffer, ']');
 		free(buffer);
 	    }
 	    break;

From 68fba93a6a2c30d9d38d8b53c7debff452a95be7 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 8 Oct 2023 01:33:09 +0200
Subject: [PATCH 033/106] ncurses-6.4-20231007.patch

---
 NEWS                                       |   8 +-
 VERSION                                    |   2 +-
 dist.mk                                    |   4 +-
 doc/html/man/adacurses6-config.1.html      |  10 +-
 doc/html/man/captoinfo.1m.html             |   8 +-
 doc/html/man/clear.1.html                  |  12 +-
 doc/html/man/curs_add_wch.3x.html          |  20 +-
 doc/html/man/curs_add_wchstr.3x.html       |   8 +-
 doc/html/man/curs_addch.3x.html            |   8 +-
 doc/html/man/curs_addchstr.3x.html         |   8 +-
 doc/html/man/curs_addstr.3x.html           |  10 +-
 doc/html/man/curs_addwstr.3x.html          |   8 +-
 doc/html/man/curs_attr.3x.html             |  12 +-
 doc/html/man/curs_beep.3x.html             |   8 +-
 doc/html/man/curs_bkgd.3x.html             |  10 +-
 doc/html/man/curs_bkgrnd.3x.html           |  10 +-
 doc/html/man/curs_border.3x.html           |   8 +-
 doc/html/man/curs_border_set.3x.html       |  10 +-
 doc/html/man/curs_clear.3x.html            |   8 +-
 doc/html/man/curs_color.3x.html            |   8 +-
 doc/html/man/curs_delch.3x.html            |   8 +-
 doc/html/man/curs_deleteln.3x.html         |   8 +-
 doc/html/man/curs_extend.3x.html           |   8 +-
 doc/html/man/curs_get_wch.3x.html          |   8 +-
 doc/html/man/curs_get_wstr.3x.html         |   8 +-
 doc/html/man/curs_getcchar.3x.html         |   8 +-
 doc/html/man/curs_getch.3x.html            |  10 +-
 doc/html/man/curs_getstr.3x.html           |   8 +-
 doc/html/man/curs_getyx.3x.html            |   8 +-
 doc/html/man/curs_in_wch.3x.html           |   8 +-
 doc/html/man/curs_in_wchstr.3x.html        |  10 +-
 doc/html/man/curs_inch.3x.html             |   8 +-
 doc/html/man/curs_inchstr.3x.html          |   8 +-
 doc/html/man/curs_initscr.3x.html          |   8 +-
 doc/html/man/curs_inopts.3x.html           |   8 +-
 doc/html/man/curs_ins_wch.3x.html          |   8 +-
 doc/html/man/curs_ins_wstr.3x.html         |  10 +-
 doc/html/man/curs_insch.3x.html            |   8 +-
 doc/html/man/curs_insstr.3x.html           |   8 +-
 doc/html/man/curs_instr.3x.html            |   8 +-
 doc/html/man/curs_inwstr.3x.html           |   8 +-
 doc/html/man/curs_kernel.3x.html           |   8 +-
 doc/html/man/curs_legacy.3x.html           |   8 +-
 doc/html/man/curs_memleaks.3x.html         |   8 +-
 doc/html/man/curs_mouse.3x.html            |   8 +-
 doc/html/man/curs_move.3x.html             |   8 +-
 doc/html/man/curs_opaque.3x.html           |   8 +-
 doc/html/man/curs_outopts.3x.html          |  93 +++----
 doc/html/man/curs_overlay.3x.html          |   8 +-
 doc/html/man/curs_pad.3x.html              |   8 +-
 doc/html/man/curs_print.3x.html            |   8 +-
 doc/html/man/curs_printw.3x.html           |  10 +-
 doc/html/man/curs_refresh.3x.html          |   8 +-
 doc/html/man/curs_scanw.3x.html            |  10 +-
 doc/html/man/curs_scr_dump.3x.html         |   8 +-
 doc/html/man/curs_scroll.3x.html           |   8 +-
 doc/html/man/curs_slk.3x.html              |   8 +-
 doc/html/man/curs_sp_funcs.3x.html         |  14 +-
 doc/html/man/curs_termattrs.3x.html        |   8 +-
 doc/html/man/curs_termcap.3x.html          |   8 +-
 doc/html/man/curs_terminfo.3x.html         |  10 +-
 doc/html/man/curs_threads.3x.html          |   8 +-
 doc/html/man/curs_touch.3x.html            |   8 +-
 doc/html/man/curs_trace.3x.html            |  10 +-
 doc/html/man/curs_util.3x.html             |   8 +-
 doc/html/man/curs_variables.3x.html        |   8 +-
 doc/html/man/curs_window.3x.html           |   8 +-
 doc/html/man/default_colors.3x.html        |   8 +-
 doc/html/man/define_key.3x.html            |   8 +-
 doc/html/man/form.3x.html                  |   8 +-
 doc/html/man/form_cursor.3x.html           |   8 +-
 doc/html/man/form_data.3x.html             |   8 +-
 doc/html/man/form_driver.3x.html           |   8 +-
 doc/html/man/form_field.3x.html            |   8 +-
 doc/html/man/form_field_attributes.3x.html |   8 +-
 doc/html/man/form_field_buffer.3x.html     |   9 +-
 doc/html/man/form_field_info.3x.html       |   9 +-
 doc/html/man/form_field_just.3x.html       |   9 +-
 doc/html/man/form_field_new.3x.html        |   9 +-
 doc/html/man/form_field_opts.3x.html       |   9 +-
 doc/html/man/form_field_userptr.3x.html    |   9 +-
 doc/html/man/form_field_validation.3x.html |  10 +-
 doc/html/man/form_fieldtype.3x.html        |   9 +-
 doc/html/man/form_hook.3x.html             |   9 +-
 doc/html/man/form_new.3x.html              |   9 +-
 doc/html/man/form_new_page.3x.html         |   9 +-
 doc/html/man/form_opts.3x.html             |   9 +-
 doc/html/man/form_page.3x.html             |   9 +-
 doc/html/man/form_post.3x.html             |   9 +-
 doc/html/man/form_requestname.3x.html      |   9 +-
 doc/html/man/form_userptr.3x.html          |   9 +-
 doc/html/man/form_variables.3x.html        |   8 +-
 doc/html/man/form_win.3x.html              |   9 +-
 doc/html/man/infocmp.1m.html               |   8 +-
 doc/html/man/infotocap.1m.html             |   8 +-
 doc/html/man/key_defined.3x.html           |   8 +-
 doc/html/man/keybound.3x.html              |  10 +-
 doc/html/man/keyok.3x.html                 |   8 +-
 doc/html/man/legacy_coding.3x.html         |   8 +-
 doc/html/man/menu.3x.html                  |   8 +-
 doc/html/man/menu_attributes.3x.html       |   9 +-
 doc/html/man/menu_cursor.3x.html           |   9 +-
 doc/html/man/menu_driver.3x.html           |   8 +-
 doc/html/man/menu_format.3x.html           |   9 +-
 doc/html/man/menu_hook.3x.html             |  25 +-
 doc/html/man/menu_items.3x.html            |   9 +-
 doc/html/man/menu_mark.3x.html             |   9 +-
 doc/html/man/menu_new.3x.html              |   9 +-
 doc/html/man/menu_opts.3x.html             |   9 +-
 doc/html/man/menu_pattern.3x.html          |   8 +-
 doc/html/man/menu_post.3x.html             |   9 +-
 doc/html/man/menu_requestname.3x.html      |   9 +-
 doc/html/man/menu_spacing.3x.html          |   9 +-
 doc/html/man/menu_userptr.3x.html          |   9 +-
 doc/html/man/menu_win.3x.html              |  11 +-
 doc/html/man/mitem_current.3x.html         |   9 +-
 doc/html/man/mitem_name.3x.html            |   9 +-
 doc/html/man/mitem_new.3x.html             |   9 +-
 doc/html/man/mitem_opts.3x.html            |   9 +-
 doc/html/man/mitem_userptr.3x.html         |   9 +-
 doc/html/man/mitem_value.3x.html           |   8 +-
 doc/html/man/mitem_visible.3x.html         |   9 +-
 doc/html/man/ncurses.3x.html               |  10 +-
 doc/html/man/new_pair.3x.html              |   8 +-
 doc/html/man/panel.3x.html                 |  12 +-
 doc/html/man/resizeterm.3x.html            |   8 +-
 doc/html/man/scr_dump.5.html               |  10 +-
 doc/html/man/tabs.1.html                   |   8 +-
 doc/html/man/term.5.html                   |  10 +-
 doc/html/man/term.7.html                   |   8 +-
 doc/html/man/term_variables.3x.html        |   8 +-
 doc/html/man/terminfo.5.html               |  16 +-
 doc/html/man/tic.1m.html                   |   8 +-
 doc/html/man/toe.1m.html                   |   8 +-
 doc/html/man/tput.1.html                   |   8 +-
 doc/html/man/tset.1.html                   |   8 +-
 doc/html/man/user_caps.5.html              |  12 +-
 doc/html/man/wresize.3x.html               |   8 +-
 man/MKada_config.in                        |  42 +--
 man/captoinfo.1m                           |  26 +-
 man/clear.1                                |  33 ++-
 man/curs_add_wch.3x                        |  45 +--
 man/curs_add_wchstr.3x                     |  45 +--
 man/curs_addch.3x                          |  44 +--
 man/curs_addchstr.3x                       |  45 +--
 man/curs_addstr.3x                         |  45 +--
 man/curs_addwstr.3x                        |  45 +--
 man/curs_attr.3x                           | 118 ++++----
 man/curs_beep.3x                           |  14 +-
 man/curs_bkgd.3x                           |  25 +-
 man/curs_bkgrnd.3x                         |  29 +-
 man/curs_border.3x                         |  39 +--
 man/curs_border_set.3x                     |  38 ++-
 man/curs_clear.3x                          |  36 ++-
 man/curs_color.3x                          |  56 ++--
 man/curs_delch.3x                          |  35 ++-
 man/curs_deleteln.3x                       |  29 +-
 man/curs_extend.3x                         |  29 +-
 man/curs_get_wch.3x                        |  40 +--
 man/curs_get_wstr.3x                       |  47 ++--
 man/curs_getcchar.3x                       |  26 +-
 man/curs_getch.3x                          |  43 +--
 man/curs_getstr.3x                         |  51 ++--
 man/curs_getyx.3x                          |  14 +-
 man/curs_in_wch.3x                         |  36 ++-
 man/curs_in_wchstr.3x                      |  47 ++--
 man/curs_inch.3x                           |  37 ++-
 man/curs_inchstr.3x                        |  49 ++--
 man/curs_initscr.3x                        |  44 +--
 man/curs_inopts.3x                         |  68 ++---
 man/curs_ins_wch.3x                        |  34 ++-
 man/curs_ins_wstr.3x                       |  46 ++--
 man/curs_insch.3x                          |  36 ++-
 man/curs_insstr.3x                         |  47 ++--
 man/curs_instr.3x                          |  49 ++--
 man/curs_inwstr.3x                         |  46 ++--
 man/curs_kernel.3x                         |  61 +++--
 man/curs_legacy.3x                         |  24 +-
 man/curs_memleaks.3x                       |  35 ++-
 man/curs_mouse.3x                          |  84 +++---
 man/curs_move.3x                           |  15 +-
 man/curs_opaque.3x                         |  50 ++--
 man/curs_outopts.3x                        |  49 ++--
 man/curs_overlay.3x                        |  18 +-
 man/curs_pad.3x                            |  10 +-
 man/curs_print.3x                          |  10 +-
 man/curs_printw.3x                         |  46 ++--
 man/curs_refresh.3x                        |  43 +--
 man/curs_scanw.3x                          |  47 ++--
 man/curs_scr_dump.3x                       |  36 ++-
 man/curs_scroll.3x                         |  33 ++-
 man/curs_slk.3x                            |  61 +++--
 man/curs_sp_funcs.3x                       | 304 +++++++++++----------
 man/curs_termattrs.3x                      |  41 ++-
 man/curs_termcap.3x                        |  59 ++--
 man/curs_terminfo.3x                       |  88 +++---
 man/curs_threads.3x                        |  37 ++-
 man/curs_touch.3x                          |  18 +-
 man/curs_trace.3x                          |  49 ++--
 man/curs_util.3x                           |  47 ++--
 man/curs_variables.3x                      |  65 +++--
 man/curs_window.3x                         |  22 +-
 man/default_colors.3x                      |  29 +-
 man/define_key.3x                          |  10 +-
 man/form.3x                                |  23 +-
 man/form_cursor.3x                         |  12 +-
 man/form_data.3x                           |  15 +-
 man/form_driver.3x                         |  15 +-
 man/form_field.3x                          |  21 +-
 man/form_field_attributes.3x               |  43 +--
 man/form_field_buffer.3x                   |  42 +--
 man/form_field_info.3x                     |  27 +-
 man/form_field_just.3x                     |  30 +-
 man/form_field_new.3x                      |  16 +-
 man/form_field_opts.3x                     |  23 +-
 man/form_field_userptr.3x                  |  16 +-
 man/form_field_validation.3x               |  58 ++--
 man/form_fieldtype.3x                      |  19 +-
 man/form_hook.3x                           |  37 ++-
 man/form_new.3x                            |  16 +-
 man/form_new_page.3x                       |  30 +-
 man/form_opts.3x                           |  23 +-
 man/form_page.3x                           |  31 +--
 man/form_post.3x                           |  16 +-
 man/form_requestname.3x                    |  16 +-
 man/form_userptr.3x                        |  16 +-
 man/form_variables.3x                      |  20 +-
 man/form_win.3x                            |  27 +-
 man/infocmp.1m                             |  50 ++--
 man/infotocap.1m                           |  19 +-
 man/key_defined.3x                         |  10 +-
 man/keybound.3x                            |  10 +-
 man/keyok.3x                               |  10 +-
 man/legacy_coding.3x                       |  12 +-
 man/menu.3x                                |  23 +-
 man/menu_attributes.3x                     |  51 ++--
 man/menu_cursor.3x                         |  13 +-
 man/menu_driver.3x                         |  12 +-
 man/menu_format.3x                         |  16 +-
 man/menu_hook.3x                           |  37 ++-
 man/menu_items.3x                          |  19 +-
 man/menu_mark.3x                           |  16 +-
 man/menu_new.3x                            |  16 +-
 man/menu_opts.3x                           |  23 +-
 man/menu_pattern.3x                        |  15 +-
 man/menu_post.3x                           |  16 +-
 man/menu_requestname.3x                    |  16 +-
 man/menu_spacing.3x                        |  14 +-
 man/menu_userptr.3x                        |  16 +-
 man/menu_win.3x                            |  27 +-
 man/mitem_current.3x                       |  27 +-
 man/mitem_name.3x                          |  16 +-
 man/mitem_new.3x                           |  16 +-
 man/mitem_opts.3x                          |  23 +-
 man/mitem_userptr.3x                       |  16 +-
 man/mitem_value.3x                         |  15 +-
 man/mitem_visible.3x                       |  13 +-
 man/ncurses.3x                             | 211 ++++++++------
 man/new_pair.3x                            |  64 ++---
 man/panel.3x                               |  87 +++---
 man/resizeterm.3x                          |  12 +-
 man/scr_dump.5                             | 163 ++++++-----
 man/tabs.1                                 |  72 ++---
 man/term.5                                 |  54 ++--
 man/term.7                                 |  19 +-
 man/term_variables.3x                      |  84 +++---
 man/terminfo.head                          |  47 ++--
 man/terminfo.tail                          | 123 ++++-----
 man/tic.1m                                 |  26 +-
 man/toe.1m                                 |  19 +-
 man/tput.1                                 |  27 +-
 man/tset.1                                 |  25 +-
 man/user_caps.5                            |  31 ++-
 man/wresize.3x                             |  12 +-
 ncurses/tinfo/lib_setup.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 +-
 282 files changed, 3369 insertions(+), 3171 deletions(-)

diff --git a/NEWS b/NEWS
index 96ccb8f5a..01e0761cb 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4009 2023/10/01 23:03:08 tom Exp $
+-- $Id: NEWS,v 1.4012 2023/10/07 23:07:35 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231007
+	+ improve loop-limit for get_position().
+	+ improve manual description of immedok (Debian #1053603).
+	+ fix a few formatting issues with manpages (Debian #1053123).
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+
 20231001
 	+ modify setupterm to provide for using ANSI cursor-position report (in
 	  user6/user7 terminfo capabilities) to obtain screensize if neither
diff --git a/VERSION b/VERSION
index 374ea2b36..f134650c1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231001
+5:0:10	6.4	20231007
diff --git a/dist.mk b/dist.mk
index bb6fc5c34..3f8fa261a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1569 2023/10/01 08:35:58 tom Exp $
+# $Id: dist.mk,v 1.1570 2023/10/07 10:05:48 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231001
+NCURSES_PATCH = 20231007
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 96a9812fe..9ddd175d8 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -27,21 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.28 2023/09/30 23:55:34 tom Exp @
-  * Start example.
-  * End example.
+  * @Id: MKada_config.in,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>adacurses6\-config 1 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>adacurses6\-config 1 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">adacurses6\-config 1 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacurses6\-config 1 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>             User commands            <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>
 
@@ -130,7 +128,7 @@ <H1 class="no-header">adacurses6\-config 1 2023-09-30 ncurses 6.4 User commands<
 
 
 
-ncurses 6.4                       2023-09-30              <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>
+ncurses 6.4                       2023-10-07              <STRONG><A HREF="adacurses6-config.1.html">adacurses6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index dd238edbb..bb74c5e10 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.50 2023/10/01 22:22:00 tom Exp @
+  * @Id: captoinfo.1m,v 1.51 2023/10/07 21:19:07 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-10-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -201,7 +201,7 @@ <H1 class="no-header">captoinfo 1m 2023-10-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-01                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index af32a0c27..175615819 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.40 2023/10/01 22:12:38 tom Exp @
+  * @Id: clear.1,v 1.41 2023/10/07 21:19:07 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
   *   tput/clear.sh
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-10-01 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-10-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -117,8 +117,8 @@ <H1 class="no-header">clear 1 2023-10-01 ncurses 6.4 User commands</H1>
 
                printf '\033[<STRONG>3</STRONG>J'
 
-           "XTerm  Control  Sequences"  documents  this feature as originating
-           with <EM>xterm</EM>.
+           instead.   "XTerm  Control  Sequences"  documents  this  feature as
+           originating with <EM>xterm</EM>.
 
        <STRONG>o</STRONG>   A few other terminal emulators adopted it, such as PuTTY in 2006.
 
@@ -151,7 +151,7 @@ <H1 class="no-header">clear 1 2023-10-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-01                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-10-07                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 193b71f97..c39713bda 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.45 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.46 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -55,13 +55,13 @@ <H1 class="no-header">curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>add_wch(</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wch(</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wch(</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wch(</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>add_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>echo_wchar(</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wecho_wchar(</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>echo_wchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wecho_wchar(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -320,7 +320,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 2c791993f..93978f7d2 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 18ae03aa9..6477ac2fd 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.71 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_addch.3x,v 1.72 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 04bbdbeab..d1b8b8af4 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.33 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.34 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">curs_addchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index f78da57b8..9760bcdd0 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_addstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -62,7 +62,7 @@ <H1 class="no-header">curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str,</EM> <EM>int</EM> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_addstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 29edcfd2b..94c9469a3 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index c5050ba03..54c4b894b 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.86 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_attr.3x,v 1.87 2023/10/07 22:21:46 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>attr_on(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wattr_on(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>attroff(int</STRONG> <EM>attrs);</EM>
+       <STRONG>int</STRONG> <STRONG>attroff(int</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wattroff(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>attron(int</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wattron(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
              <STRONG>int</STRONG> <EM>n,</EM> <STRONG>attr_t</STRONG> <EM>attr</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>color_set(short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wcolor_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts);</EM>
+       <STRONG>int</STRONG> <STRONG>wcolor_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>standend(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>wstandend(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
@@ -514,7 +514,7 @@ <H1 class="no-header">curs_attr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 6c94547e2..8fe5d5d33 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.24 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_beep.3x,v 1.25 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index ee84ed563..4706d7616 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -55,7 +55,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>void</STRONG> <STRONG>bkgdset(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wbkgdset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win,</EM> <EM>chtype</EM> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wbkgdset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>bkgd(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wbkgd(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index b90558c0c..391283553 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -57,7 +57,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>bkgrnd(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wbkgrnd(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>void</STRONG> <STRONG>bkgrndset(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM> <STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>bkgrndset(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>wbkgrndset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>getbkgrnd(cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index cd71db357..df9c40140 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_border.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_border 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 3f9f3830d..c85cbb109 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_border_set.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -59,7 +59,7 @@ <H1 class="no-header">curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</H
           <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM>,
           <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM>,
           <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM> <STRONG>);</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wborder_set(</STRONG>
           <STRONG>WINDOW</STRONG> <STRONG>*win</STRONG>,
           <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM>,
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_border_set 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 8d48dc225..20b5f50ac 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_clear.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -140,7 +140,7 @@ <H1 class="no-header">curs_clear 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index f426351ba..e5bb6745a 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.84 2023/09/30 20:13:18 tom Exp @
+  * @Id: curs_color.3x,v 1.85 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -525,7 +525,7 @@ <H1 class="no-header">curs_color 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 00f318c80..07f5bc2a5 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_delch.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index f06bdce5c..a3af64c1d 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index cd7bb5c0c..77b7cfdca 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_extend.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 16c41b27e..590cf488a 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -153,7 +153,7 @@ <H1 class="no-header">curs_get_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 735fca299..0281cbb26 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.36 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -187,7 +187,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index a370b6ed7..605ac14ef 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 46fc07428..855dd7003 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.74 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_getch.3x,v 1.75 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>ungetch(int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
-       /* extension */
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>has_key(int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
 
@@ -384,7 +384,7 @@ <H1 class="no-header">curs_getch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 92c45f30c..7622e5c00 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.48 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_getstr.3x,v 1.49 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -240,7 +240,7 @@ <H1 class="no-header">curs_getstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 6d4a62e8f..7778d283c 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.37 2023/09/23 22:10:55 tom Exp @
+  * @Id: curs_getyx.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index d90a5a70b..c9b6b7f40 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -91,7 +91,7 @@ <H1 class="no-header">curs_in_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index b2f36ff59..3b37a8701 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1
        <STRONG>int</STRONG> <STRONG>mvin_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvin_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwin_wchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwin_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM>, int <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwin_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 07d3db41e..c11a137c9 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_inch.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_inch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index df6b36d6f..2c58bdad9 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">curs_inchstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 88cc9da8f..fc51ad909 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.52 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_initscr.3x,v 1.53 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_initscr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 39fd72715..878a3644e 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.54 2023/09/23 22:24:15 tom Exp @
+  * @Id: curs_inopts.3x,v 1.55 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -336,7 +336,7 @@ <H1 class="no-header">curs_inopts 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 77b7761d2..4022dedd2 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_ins_wch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 43e858ec5..488625902 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.22 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.23 2023/10/07 22:22:46 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -55,7 +55,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>ins_wstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr);</EM>
+       <STRONG>int</STRONG> <STRONG>ins_wstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ins_nwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 8325bb88b..b2afb581e 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_insch.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_insch 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 175b8bd06..a8ea74802 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_insstr.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_insstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 112b086af..72119d6dc 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.35 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_instr.3x,v 1.36 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_instr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 821a28287..0d4dc7829 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index d6d14e05a..467e480c6 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_kernel.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -205,7 +205,7 @@ <H1 class="no-header">curs_kernel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 76e01f28f..183e7de1b 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.27 2023/09/23 22:11:47 tom Exp @
+  * @Id: curs_legacy.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_legacy 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index d41244636..035960ed8 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.27 2023/09/30 23:13:30 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 031cde103..fe486764f 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.78 2023/09/23 23:08:40 tom Exp @
+  * @Id: curs_mouse.3x,v 1.79 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -374,7 +374,7 @@ <H1 class="no-header">curs_mouse 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 912e6d04b..9bef53b05 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_move.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_move 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index ff11a9505..318e57445 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.35 2023/09/30 22:01:38 tom Exp @
+  * @Id: curs_opaque.3x,v 1.36 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -150,7 +150,7 @@ <H1 class="no-header">curs_opaque 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 0abaa743a..ace13cc86 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.46 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_outopts.3x,v 1.48 2023/10/07 22:54:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -102,109 +102,110 @@ <H1 class="no-header">curs_outopts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-immedok">immedok</a></H3><PRE>
-       If <STRONG>immedok</STRONG> is called with <STRONG>TRUE</STRONG> <STRONG>as</STRONG> <STRONG>argument</STRONG>, any change  in  the  window
-       image,  such  as  the  ones  caused  by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>, etc.,
-       automatically cause a  call  to  <STRONG>wrefresh</STRONG>.   However,  it  may  degrade
-       performance  considerably,  due  to  repeated calls to <STRONG>wrefresh</STRONG>.  It is
-       disabled by default.
+       If <STRONG>immedok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, any  change  in  the
+       window  image,  such  as  the  ones caused by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>,
+       etc., automatically causes a call to <STRONG>wrefresh</STRONG>.  However, it may degrade
+       performance  considerably,  due to repeated calls to <STRONG>wrefresh</STRONG>.  Calling
+       <STRONG>immedok</STRONG> with <STRONG>FALSE</STRONG> as second argument restores  the  default  behavior,
+       i.e., deferring screen updates until a refresh is needed.
 
 
 </PRE><H3><a name="h3-leaveok">leaveok</a></H3><PRE>
-       Normally, the hardware cursor is left at the  location  of  the  window
-       cursor  being  refreshed.   The  <STRONG>leaveok</STRONG> option allows the cursor to be
-       left wherever the update  happens  to  leave  it.   It  is  useful  for
-       applications  where  the  cursor is not used, since it reduces the need
+       Normally,  the  hardware  cursor  is left at the location of the window
+       cursor being refreshed.  The <STRONG>leaveok</STRONG> option allows  the  cursor  to  be
+       left  wherever  the  update  happens  to  leave  it.   It is useful for
+       applications where the cursor is not used, since it  reduces  the  need
        for cursor motions.
 
 
 </PRE><H3><a name="h3-scrollok">scrollok</a></H3><PRE>
-       The <STRONG>scrollok</STRONG> option controls what happens when the cursor of  a  window
-       is  moved  off  the edge of the window or scrolling region, either as a
-       result of a newline action on the  bottom  line,  or  typing  the  last
-       character  of the last line.  If disabled, (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the cursor is
-       left on the bottom line.  If enabled,  (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the  window  is
+       The  <STRONG>scrollok</STRONG>  option controls what happens when the cursor of a window
+       is moved off the edge of the window or scrolling region,  either  as  a
+       result  of  a  newline  action  on  the bottom line, or typing the last
+       character of the last line.  If disabled, (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the cursor  is
+       left  on  the  bottom  line.   If  enabled, (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the window is
        scrolled up one line (Note that to get the physical scrolling effect on
        the terminal, it is also necessary to call <STRONG>idlok</STRONG>).
 
 
 </PRE><H3><a name="h3-setscrreg_wsetscrreg">setscrreg/wsetscrreg</a></H3><PRE>
-       The <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> routines allow the application  programmer
-       to  set  a  software  scrolling  region  in  a window.  The <EM>top</EM> and <EM>bot</EM>
-       parameters are the line numbers of the top and  bottom  margin  of  the
-       scrolling  region.   (Line  0  is the top line of the window.)  If this
-       option and <STRONG>scrollok</STRONG> are enabled, an attempt  to  move  off  the  bottom
+       The  <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> routines allow the application programmer
+       to set a software scrolling region  in  a  window.   The  <EM>top</EM>  and  <EM>bot</EM>
+       parameters  are  the  line  numbers of the top and bottom margin of the
+       scrolling region.  (Line 0 is the top line of  the  window.)   If  this
+       option  and  <STRONG>scrollok</STRONG>  are  enabled,  an attempt to move off the bottom
        margin line causes all lines in the scrolling region to scroll one line
-       in the direction of the first line.  Only the text  of  the  window  is
+       in  the  direction  of  the first line.  Only the text of the window is
        scrolled.  (Note that this has nothing to do with the use of a physical
-       scrolling region capability in the terminal, like that  in  the  VT100.
-       If  <STRONG>idlok</STRONG>  is enabled and the terminal has either a scrolling region or
+       scrolling  region  capability  in the terminal, like that in the VT100.
+       If <STRONG>idlok</STRONG> is enabled and the terminal has either a scrolling  region  or
        insert/delete line capability, they will probably be used by the output
        routines.)
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  functions  <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> return <STRONG>OK</STRONG> upon success and <STRONG>ERR</STRONG>
-       upon failure.  All other routines that return an integer always  return
+       The functions <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> return <STRONG>OK</STRONG> upon success  and  <STRONG>ERR</STRONG>
+       upon  failure.  All other routines that return an integer always return
        <STRONG>OK</STRONG>.
 
        X/Open Curses does not define any error conditions.
 
        In this implementation,
 
-       <STRONG>o</STRONG>   those  functions that have a window pointer will return an error if
+       <STRONG>o</STRONG>   those functions that have a window pointer will return an error  if
            the window pointer is null
 
-       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG> returns an error if the scrolling region  limits  extend
+       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
            outside the window.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
+       X/Open does not  define  any  error  conditions.   This  implementation
        returns an error if the window pointer is null.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       From the outset, ncurses used <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>  to  control  the  conversion  of
-       newlines  to carriage return/line-feed on output as well as input.  XSI
-       Curses documents only the use  of  these  functions  for  input.   This
-       difference  arose  from converting the <EM>pcurses</EM> source (which used <STRONG>ioctl</STRONG>
-       calls with the <STRONG>sgttyb</STRONG> structure) to termios (i.e., the  POSIX  terminal
+       From  the  outset,  ncurses  used  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> to control the conversion of
+       newlines to carriage return/line-feed on output as well as input.   XSI
+       Curses  documents  only  the  use  of  these functions for input.  This
+       difference arose from converting the <EM>pcurses</EM> source (which  used  <STRONG>ioctl</STRONG>
+       calls  with  the <STRONG>sgttyb</STRONG> structure) to termios (i.e., the POSIX terminal
        interface).  In the former, both input and output were controlled via a
        single  option  <STRONG>CRMOD</STRONG>,  while  the  latter  separates  these  features.
-       Because  that  conversion  interferes with output optimization, <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>
+       Because that conversion interferes with  output  optimization,  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>
        were amended after ncurses 6.2 to eliminate their effect on output.
 
-       Some historic curses implementations had, as an  undocumented  feature,
+       Some  historic  curses implementations had, as an undocumented feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
        <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
 
-       Earlier System V curses implementations specified  that  with  <STRONG>scrollok</STRONG>
-       enabled,  any  window  modification  triggering  a scroll also forced a
+       Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
+       enabled, any window modification triggering  a  scroll  also  forced  a
        physical refresh.  XSI Curses does not require this, and <STRONG>ncurses</STRONG> avoids
-       doing  it  to  perform  better vertical-motion optimization at <STRONG>wrefresh</STRONG>
+       doing it to perform better  vertical-motion  optimization  at  <STRONG>wrefresh</STRONG>
        time.
 
        The XSI Curses standard does not mention that the cursor should be made
-       invisible  as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does
-       this, but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the  cursor
+       invisible as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation  does
+       this,  but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the cursor
        invisible.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that  <STRONG>clearok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and <STRONG>setscrreg</STRONG> may be
+       Note that <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and  <STRONG>setscrreg</STRONG>  may  be
        macros.
 
-       The <STRONG>immedok</STRONG> routine is useful for windows that  are  used  as  terminal
+       The  <STRONG>immedok</STRONG>  routine  is  useful for windows that are used as terminal
        emulators.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index b6ad8713e..d27415cab 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_overlay.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 68b7e3a18..cba22b056 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.43 2023/09/23 22:49:51 tom Exp @
+  * @Id: curs_pad.3x,v 1.44 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_pad 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index e458b1e03..00630c6fe 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.31 2023/09/23 23:04:49 tom Exp @
+  * @Id: curs_print.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_print 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 63cf8d03f..9fe5e1f1a 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_printw.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>mvwprintw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>vw_printw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>va_list</STRONG> <EM>varglist</EM><STRONG>);</STRONG>
 
-       /* obsolete */
+       <EM>/*</EM> <EM>obsolete</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>vwprintw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>va_list</STRONG> <EM>varglist</EM><STRONG>);</STRONG>
 
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_printw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 01df6a2e1..227427fa5 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.37 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_refresh.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 98d514282..2c65478f7 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_scanw.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>vw_scanw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>va_list</STRONG> <EM>varglist</EM><STRONG>);</STRONG>
 
-       /* obsolete */
+       <EM>/*</EM> <EM>obsolete</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>vwscanw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>va_list</STRONG> <EM>varglist</EM><STRONG>);</STRONG>
 
 
@@ -163,7 +163,7 @@ <H1 class="no-header">curs_scanw 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 9835189c7..39cc97350 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 6ffb51fbb..eb775e8a4 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.34 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_scroll.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_scroll 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 8dda503fe..6657248c3 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.62 2023/09/30 20:13:18 tom Exp @
+  * @Id: curs_slk.3x,v 1.63 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -311,7 +311,7 @@ <H1 class="no-header">curs_slk 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index ff9ebae31..619d40d20 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.40 2023/09/30 23:13:32 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.41 2023/10/07 21:33:35 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>flushinp_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>free_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>get_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>getmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <STRONG>event);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <EM>event</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>getwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FILE*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>halfdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
@@ -171,7 +171,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,MEVENT</STRONG> <STRONG>*</STRONG> <STRONG>event);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <EM>event</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_legacy_coding_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>level</EM><STRONG>);</STRONG>
@@ -212,7 +212,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>tigetnum_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>tigetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       /* may instead use 9 long parameters */
+       <EM>/*</EM> <EM>may</EM> <EM>instead</EM> <EM>use</EM> <EM>9</EM> <EM>long</EM> <EM>parameters</EM> <EM>*/</EM>
        <STRONG>char*</STRONG> <STRONG>tparm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>tputs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
 
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 6aac0ff35..0640554c1 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index ec9849373..2efd40c76 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.68 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_termcap.3x,v 1.69 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -356,7 +356,7 @@ <H1 class="no-header">curs_termcap 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 88f8f25f7..d5e8edb19 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.111 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.112 2023/10/07 21:19:07 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -96,7 +96,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>vid_puts(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
        <STRONG>int</STRONG> <STRONG>vid_attr(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvcur(int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM>, int <EM>newcol</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvcur(int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
@@ -692,7 +692,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 0a1c75e56..8d87e49ab 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.46 2023/10/01 09:45:30 tom Exp @
+  * @Id: curs_threads.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-10-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-10-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -619,7 +619,7 @@ <H1 class="no-header">curs_threads 3x 2023-10-01 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-01                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 594caffa2..749236ef5 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.39 2023/09/23 22:49:51 tom Exp @
+  * @Id: curs_touch.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2023-09-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2023-09-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_touch 3x 2023-09-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-23                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index e4dd2c69f..3a5baa2d5 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_trace.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>char</STRONG> <STRONG>*_nc_tracebits(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
 
-       /* deprecated */
+       <EM>/*</EM> <EM>deprecated</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>trace(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>int</STRONG> <EM>param</EM><STRONG>);</STRONG>
 
 
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 956e47746..650e6513c 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.85 2023/09/30 21:38:11 tom Exp @
+  * @Id: curs_util.3x,v 1.86 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_util 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 8fab98968..e193c6001 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.31 2023/10/01 22:36:35 tom Exp @
+  * @Id: curs_variables.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-10-01 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-10-01 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -255,7 +255,7 @@ <H1 class="no-header">curs_variables 3x 2023-10-01 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-01                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 15b3717ec..fb67ddba8 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.39 2023/09/30 23:13:32 tom Exp @
+  * @Id: curs_window.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_window 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index d36e20367..2811fcb01 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.44 2023/09/30 21:38:11 tom Exp @
+  * @Id: default_colors.3x,v 1.45 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 4aae33397..b9316c000 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.36 2023/09/30 21:26:43 tom Exp @
+  * @Id: define_key.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 362c8b23a..fec134e65 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.47 2023/09/30 21:38:11 tom Exp @
+  * @Id: form.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -250,7 +250,7 @@ <H1 class="no-header">form 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 5b8bf5fec..034e32333 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_cursor.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">form_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 28d80d764..7bb13d61a 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_data.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">form_data 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 163056d8f..eea6dd521 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.50 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_driver.3x,v 1.51 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -280,7 +280,7 @@ <H1 class="no-header">form_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 7a02d90cd..8f9decc36 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">form_field 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 4afc22e4f..fe047c06d 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">form_field_attributes 3x 2023-09-30 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-09-30         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 1d0f1332b..5fa639773 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -155,7 +154,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-09-30 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2023-09-30             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index e243cd309..a9ff34c34 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_info.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -112,7 +111,7 @@ <H1 class="no-header">form_field_info 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 120d18352..a14bc7b99 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_just.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -101,7 +100,7 @@ <H1 class="no-header">form_field_just 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 512af66d9..392c85d23 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.36 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_new.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -128,7 +127,7 @@ <H1 class="no-header">form_field_new 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index e5a81b691..9f8e3b968 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_opts.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -170,7 +169,7 @@ <H1 class="no-header">form_field_opts 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index baa3ea9e7..97138e94f 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">form_field_userptr 3x 2023-09-30 ncurses 6.4 Library calls
 
 
 
-ncurses 6.4                       2023-09-30            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 1b7900606..475fe46ee 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.47 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_field_validation.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -57,7 +57,7 @@ <H1 class="no-header">form_field_validation 3x 2023-09-30 ncurses 6.4 Library ca
        <STRONG>FIELDTYPE</STRONG> <STRONG>*field_type(const</STRONG> <STRONG>FIELD</STRONG> <STRONG>*</STRONG><EM>field</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_field_type(FIELD</STRONG> <STRONG>*</STRONG><EM>field</EM><STRONG>,</STRONG> <STRONG>FIELDTYPE</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 
-       /* predefined field types */
+       <EM>/*</EM> <EM>predefined</EM> <EM>field</EM> <EM>types</EM> <EM>*/</EM>
        <STRONG>FIELDTYPE</STRONG> <STRONG>*TYPE_ALNUM;</STRONG>
        <STRONG>FIELDTYPE</STRONG> <STRONG>*TYPE_ALPHA;</STRONG>
        <STRONG>FIELDTYPE</STRONG> <STRONG>*TYPE_ENUM;</STRONG>
@@ -226,7 +226,7 @@ <H1 class="no-header">form_field_validation 3x 2023-09-30 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-09-30         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 2f5376992..32d97842d 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.41 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.42 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -189,7 +188,7 @@ <H1 class="no-header">form_fieldtype 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 1a805bdf9..6f865535f 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_hook.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -143,7 +142,7 @@ <H1 class="no-header">form_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index e1529da5e..d8a14a184 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_new.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -112,7 +111,7 @@ <H1 class="no-header">form_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 1d9f0ebf0..0157b9093 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_new_page.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -98,7 +97,7 @@ <H1 class="no-header">form_new_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 1363fb4b6..baee878d2 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_opts.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -114,7 +113,7 @@ <H1 class="no-header">form_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 42940c072..d9f369122 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_page.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -126,7 +125,7 @@ <H1 class="no-header">form_page 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index a0c288b2e..7f6ed24ab 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_post.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -115,7 +114,7 @@ <H1 class="no-header">form_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 9cb62be3a..770d05a49 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_requestname.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">form_requestname 3x 2023-09-30 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-09-30              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 3a90e38fa..1d19dbe1c 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_userptr.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">form_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index c1e20f7f4..7227ca7b0 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_variables.3x,v 1.15 2023/09/30 23:13:32 tom Exp @
+  * @Id: form_variables.3x,v 1.16 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index b1fbd5509..769ba7fad 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: form_win.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -120,7 +119,7 @@ <H1 class="no-header">form_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 9a27634c0..601e12d10 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.95 2023/09/30 21:38:11 tom Exp @
+  * @Id: infocmp.1m,v 1.96 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -529,7 +529,7 @@ <H1 class="no-header">infocmp 1m 2023-09-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-30                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-10-07                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9257a0afc..728ce6062 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.33 2023/10/01 22:43:17 tom Exp @
+  * @Id: infotocap.1m,v 1.34 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-10-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2023-10-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-01                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 5c34fad61..2917f0a90 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.28 2023/09/30 21:26:43 tom Exp @
+  * @Id: key_defined.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index a019ba6bc..5d4be1a97 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.29 2023/09/30 21:26:43 tom Exp @
+  * @Id: keybound.3x,v 1.30 2023/10/07 22:24:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -54,7 +54,7 @@ <H1 class="no-header">keybound 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keybound(int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count);</EM>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keybound(int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index b22b63b16..1b33b84d0 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.34 2023/09/30 21:26:43 tom Exp @
+  * @Id: keyok.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index dcf110ce1..42391d3db 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.20 2023/09/30 21:38:11 tom Exp @
+  * @Id: legacy_coding.3x,v 1.21 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 61a3b643e..18c44c798 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.38 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu.3x,v 1.39 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -225,7 +225,7 @@ <H1 class="no-header">menu 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 57547f873..2f69ed510 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_attributes.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -122,7 +121,7 @@ <H1 class="no-header">menu_attributes 3x 2023-09-30 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-09-30               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 65b62ec06..700a2b4fc 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.25 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_cursor.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -99,7 +98,7 @@ <H1 class="no-header">menu_cursor 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 72d54a22c..b83c04995 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.40 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_driver.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -228,7 +228,7 @@ <H1 class="no-header">menu_driver 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 6927f71b0..2b198e3bc 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_format.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -112,7 +111,7 @@ <H1 class="no-header">menu_format 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 8f180aa68..3f40dfd7b 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_hook.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -54,17 +53,17 @@ <H1 class="no-header">menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>set_item_init(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func);</EM>
-       <STRONG>Menu_Hook</STRONG> <STRONG>item_init(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu);</EM>
+       <STRONG>int</STRONG> <STRONG>set_item_init(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func</EM><STRONG>);</STRONG>
+       <STRONG>Menu_Hook</STRONG> <STRONG>item_init(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>set_item_term(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func);</EM>
-       <STRONG>Menu_Hook</STRONG> <STRONG>item_term(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu);</EM>
+       <STRONG>int</STRONG> <STRONG>set_item_term(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func</EM><STRONG>);</STRONG>
+       <STRONG>Menu_Hook</STRONG> <STRONG>item_term(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>set_menu_init(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func);</EM>
-       <STRONG>Menu_Hook</STRONG> <STRONG>menu_init(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu);</EM>
+       <STRONG>int</STRONG> <STRONG>set_menu_init(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func</EM><STRONG>);</STRONG>
+       <STRONG>Menu_Hook</STRONG> <STRONG>menu_init(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>set_menu_term(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func);</EM>
-       <STRONG>Menu_Hook</STRONG> <STRONG>menu_term(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu);</EM>
+       <STRONG>int</STRONG> <STRONG>set_menu_term(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>Menu_Hook</STRONG> <EM>func</EM><STRONG>);</STRONG>
+       <STRONG>Menu_Hook</STRONG> <STRONG>menu_term(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -123,7 +122,7 @@ <H1 class="no-header">menu_hook 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 7245996ec..2a1873d75 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_items.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -117,7 +116,7 @@ <H1 class="no-header">menu_items 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 6f40d0052..13ed0698c 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_mark.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -110,7 +109,7 @@ <H1 class="no-header">menu_mark 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index afc07cd37..28428983d 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_new.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -110,7 +109,7 @@ <H1 class="no-header">menu_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 794324eb0..d50bc6914 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.30 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_opts.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -134,7 +133,7 @@ <H1 class="no-header">menu_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index ab9e2538e..17365800e 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.33 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_pattern.3x,v 1.34 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_pattern 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index fd40a32b7..ac619ea57 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_post.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -117,7 +116,7 @@ <H1 class="no-header">menu_post 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 26e8a964b..fc5427048 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_requestname.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">menu_requestname 3x 2023-09-30 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-09-30              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index f9a24aff8..264775a1d 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.31 2023/09/30 23:44:51 tom Exp @
+  * @Id: menu_spacing.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -119,7 +118,7 @@ <H1 class="no-header">menu_spacing 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index 3c8bf9f95..f8a872ded 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_userptr.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">menu_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 779e2f5c0..fba3a9e0c 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: menu_win.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -60,7 +59,7 @@ <H1 class="no-header">menu_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>set_menu_sub(MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>sub</EM><STRONG>);</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*menu_sub(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>scale_menu(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu,</EM> <EM>int</EM> <EM>*rows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>columns);</EM>
+       <STRONG>int</STRONG> <STRONG>scale_menu(const</STRONG> <STRONG>MENU</STRONG> <STRONG>*</STRONG><EM>menu</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>rows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>columns</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -120,7 +119,7 @@ <H1 class="no-header">menu_win 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 403bbe0d2..bd87edb63 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.32 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_current.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -125,7 +124,7 @@ <H1 class="no-header">mitem_current 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index fc76759dc..0e5ffb3fb 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.26 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_name.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -89,7 +88,7 @@ <H1 class="no-header">mitem_name 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 99b01f8e7..e64c513e2 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_new.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -113,7 +112,7 @@ <H1 class="no-header">mitem_new 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 5427affca..859db62d4 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.28 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_opts.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -108,7 +107,7 @@ <H1 class="no-header">mitem_opts 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index 000eeae32..6387c5b00 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.29 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -95,7 +94,7 @@ <H1 class="no-header">mitem_userptr 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index fbb1efc4c..33d4aa644 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.27 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_value.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">mitem_value 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index cee3f0c04..f32708ada 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -1,5 +1,4 @@
 <!--
-  * t
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998,2010 Free Software Foundation, Inc.                       *
@@ -28,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.22 2023/09/30 21:38:11 tom Exp @
+  * @Id: mitem_visible.3x,v 1.23 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -83,7 +82,7 @@ <H1 class="no-header">mitem_visible 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index a71d23adb..903989960 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.177 2023/09/30 21:38:11 tom Exp @
+  * @Id: ncurses.3x,v 1.178 2023/10/07 22:17:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-09-30 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231001).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231007).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1482,7 +1482,7 @@ <H1 class="no-header">ncurses 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index cbe2b702b..3e0987dee 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.39 2023/09/30 21:38:11 tom Exp @
+  * @Id: new_pair.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 4cbe0b717..821e3691d 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.55 2023/09/30 21:38:11 tom Exp @
+  * @Id: panel.3x,v 1.56 2023/10/07 21:19:07 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -70,8 +70,6 @@ <H1 class="no-header">panel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;panel.h&gt;</STRONG>
 
-       <STRONG>cc</STRONG> <STRONG>[flags]</STRONG> <STRONG>sourcefiles</STRONG> <STRONG>-lpanel</STRONG> <STRONG>-lncurses</STRONG>
-
        <STRONG>PANEL</STRONG> <STRONG>*new_panel(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>bottom_panel(PANEL</STRONG> <STRONG>*</STRONG><EM>pan</EM><STRONG>);</STRONG>
@@ -93,7 +91,7 @@ <H1 class="no-header">panel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>del_panel(PANEL</STRONG> <STRONG>*</STRONG><EM>pan</EM><STRONG>);</STRONG>
 
-       /* ncurses-extensions */
+       <EM>/*</EM> <EM>ncurses</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>PANEL</STRONG> <STRONG>*ground_panel(SCREEN</STRONG> <STRONG>*</STRONG><EM>sp</EM><STRONG>);</STRONG>
        <STRONG>PANEL</STRONG> <STRONG>*ceiling_panel(SCREEN</STRONG> <STRONG>*</STRONG><EM>sp</EM><STRONG>);</STRONG>
 
@@ -293,7 +291,7 @@ <H1 class="no-header">panel 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index eb164d425..210cd4db0 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.47 2023/09/30 21:26:43 tom Exp @
+  * @Id: resizeterm.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 6dae96b86..3af344afa 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.36 2023/09/30 21:38:11 tom Exp @
+  * @Id: scr_dump.5,v 1.37 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-09-30 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-10-07 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-09-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -191,7 +191,7 @@ <H1 class="no-header">scr_dump 5 2023-09-30 ncurses 6.4 File formats</H1>
        big-endian hardware, the magic number is written  with  the  high-order
        byte first, e.g.,
 
-            01 35
+           \001\035
 
        After  the magic number, the <STRONG>WINDOW</STRONG> structure and line-data are written
        in binary format.  While the magic number used by the Unix systems  can
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-09-30 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-30                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-10-07                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 5b9a474ba..1b78541ca 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.46 2023/09/30 21:38:11 tom Exp @
+  * @Id: tabs.1,v 1.47 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -254,7 +254,7 @@ <H1 class="no-header">tabs 1 2023-09-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 1ef664bbc..9531d2854 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.58 2023/09/30 21:26:43 tom Exp @
+  * @Id: term.5,v 1.59 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-09-30 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-10-07 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-09-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-10-07 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -312,7 +312,7 @@ <H1 class="no-header">term 5 2023-09-30 ncurses 6.4 File formats</H1>
            adm3a|lsi adm3a,
                    am,
                    cols#80, lines#24,
-                   bel=^G, clear= 32$&lt;1&gt;, cr=^M, cub1=^H, cud1=^J,
+                   bel=^G, clear=\032$&lt;1&gt;, cr=^M, cub1=^H, cud1=^J,
                    cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
                    home=^^, ind=^J,
 
@@ -378,7 +378,7 @@ <H1 class="no-header">term 5 2023-09-30 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index b6f10b062..e89e53fd5 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.38 2023/09/30 21:38:11 tom Exp @
+  * @Id: term.7,v 1.39 2023/10/07 21:19:07 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-09-30 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-10-07 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-09-30 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-10-07 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -217,7 +217,7 @@ <H1 class="no-header">term 7 2023-09-30 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index ab5297895..8ae772445 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.30 2023/09/30 23:13:32 tom Exp @
+  * @Id: term_variables.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-09-30 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-09-30                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index ccd0dd468..d8c8ffed2 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.51 2023/09/17 08:29:38 tom Exp @
+  * @Id: terminfo.head,v 1.52 2023/10/07 21:19:07 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.132 2023/09/30 21:38:11 Branden.Robinson Exp @
+  * @Id: terminfo.tail,v 1.133 2023/10/07 20:53:54 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-09-17 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-10-07 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231001).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231007).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1247,7 +1247,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character,
 
-       <STRONG>o</STRONG>   <STRONG>^x</STRONG> maps to a control-x for any appropriate <EM>x</EM>, and
+       <STRONG>o</STRONG>   <STRONG>^</STRONG><EM>x</I<STRONG>x</STRONG> maps to a control-<EM>x</EM> for any appropriate <EM>x</EM>, and
 
        <STRONG>o</STRONG>   the sequences
 
@@ -1473,7 +1473,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
-       %c   print <EM>pop()</EM> like %c in <STRONG>printf</STRONG>
+       <STRONG>%c</STRONG>   print <EM>pop()</EM> like %c in <STRONG>printf</STRONG>
 
        <STRONG>%s</STRONG>   print <EM>pop()</EM> like %s in <STRONG>printf</STRONG>
 
@@ -2692,7 +2692,7 @@ <H1 class="no-header">terminfo 5 2023-09-17 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-17                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-10-07                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 7fae7b945..386d4bd20 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.96 2023/09/30 21:38:11 tom Exp @
+  * @Id: tic.1m,v 1.97 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-09-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 6f6d302a7..9d103c56e 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.51 2023/10/01 09:45:05 tom Exp @
+  * @Id: toe.1m,v 1.52 2023/10/07 21:19:07 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-10-01 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-10-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -187,7 +187,7 @@ <H1 class="no-header">toe 1m 2023-10-01 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-01                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 95699b326..6a327d6dd 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.85 2023/09/30 21:38:11 tom Exp @
+  * @Id: tput.1,v 1.86 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -547,7 +547,7 @@ <H1 class="no-header">tput 1 2023-09-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index dde9fa190..4bbe18f70 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.71 2023/09/30 21:38:11 tom Exp @
+  * @Id: tset.1,v 1.72 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-09-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-10-07 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-09-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-10-07 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -394,7 +394,7 @@ <H1 class="no-header">tset 1 2023-09-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-09-30                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 48b69f112..777caad94 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.40 2023/09/30 23:47:46 tom Exp @
+  * @Id: user_caps.5,v 1.41 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-09-30 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-10-07 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-09-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -52,7 +52,9 @@ <H1 class="no-header">user_caps 5 2023-09-30 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tic</STRONG> <STRONG>-x,</STRONG> <STRONG>infocmp</STRONG> <STRONG>-x</STRONG>
+       <STRONG>infocmp</STRONG> <STRONG>-x</STRONG>
+
+       <STRONG>tic</STRONG> <STRONG>-x</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -394,7 +396,7 @@ <H1 class="no-header">user_caps 5 2023-09-30 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-09-30                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-10-07                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index f72daee3d..9cdb61c89 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.31 2023/09/30 21:38:11 tom Exp @
+  * @Id: wresize.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2023-09-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2023-09-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2023-09-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-09-30                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2023-10-07                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index f63133c1c..8dd1aed99 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,45 +27,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.28 2023/09/30 23:55:34 tom Exp $
-.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-09-30 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKada_config.in,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-10-07 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
-.\}
-.
-.nr mE 0 \" in an example (EX/EE)?
-.
-.\" Start example.
-.if !\n(.g \{\
-.de EX
-.  br
-.  if !\\n(mE \{\
-.    nr mF \\n(.f
-.    nr mP \\n(PD
-.    nr PD 1v
-.    nf
-.    ft \\*(CW
-.    nr mE 1
-.  \}
-..
-.\}
-.
-.\" End example.
-.if !\n(.g \{\
-.de EE
-.  br
-.  if \\n(mE \{\
-.    ft \\n(mF
-.    nr PD \\n(mP
-.    fi
-.    nr mE 0
-.  \}
-..
-.\}
-.
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,7 +43,6 @@
 .ie t .ds '  \(aq
 .el   .ds '  '
 .\}
-.
 .SH NAME
 \fB\%adacurses@USE_CFG_SUFFIX@\-config\fP \-
 configuration helper for \fI@ADA_LIBNAME@\fP libraries
@@ -153,7 +116,6 @@ begin
 end Hello;
 .EE
 .RE
-.br
 .ne 2
 .PP
 Then, using
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 961992802..5c9dbd46e 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,16 +28,22 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.50 2023/10/01 22:22:00 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-10-01 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: captoinfo.1m,v 1.51 2023/10/07 21:19:07 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds '  \(aq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ie t .ds '  \(aq
+.el   .ds '  '
+.\}
+.
 .ds n 5
 .ds d /etc/termcap
 .SH NAME
diff --git a/man/clear.1 b/man/clear.1
index 07ddd93be..8d5e0e529 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,23 +27,27 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.40 2023/10/01 22:12:38 tom Exp $
-.TH @CLEAR@ 1 2023-10-01 "ncurses 6.4" "User commands"
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: clear.1,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH @CLEAR@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds '  \(aq
 .\}
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie \n(.g .ds '  \(aq
-.el       .ds ' '
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ie t .ds '  \(aq
+.el   .ds '  '
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .SH NAME
 \fB\%@CLEAR@\fP \-
@@ -127,21 +131,22 @@ The \fBE3\fP extension came later.
 In June 1999, \fIxterm\fP provided an extension to the standard control
 sequence for clearing the screen.
 Rather than clearing just the visible part of the screen using
-.IP
 .RS 8
+.PP
 .EX
 printf \*'\e033[2J\*'
 .EE
 .RE
 .IP
 one could clear the scrollback buffer using
-.IP
 .RS 8
+.PP
 .EX
 printf \*'\e033[\fB3\fPJ\*'
 .EE
 .RE
 .IP
+instead.
 \*(``XTerm Control Sequences\fP\*('' documents this feature as
 originating with \fIxterm\fP.
 .bP
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index f0f5c079f..9f56f3455 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.45 2023/09/30 21:38:11 tom Exp $
-.TH curs_add_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_add_wch.3x,v 1.46 2023/10/07 21:19:07 tom Exp $
+.TH curs_add_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -47,19 +54,17 @@
 \fB\%wecho_wchar\fP \-
 add a \fIcurses\fR complex character to a window and advance the cursor
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-.B "int add_wch( const cchar_t *\fIwch\fB );"
-.br
-.B "int wadd_wch( WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB );"
-.br
-.B "int mvadd_wch( int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fB );"
-.br
-.B "int mvwadd_wch( WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fB );"
-.sp
-.B "int echo_wchar( const cchar_t *\fIwch\fB );"
-.br
-.B "int wecho_wchar( WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB );"
+.nf
+\fB#include <curses.h>
+.PP
+\fBint add_wch(const cchar_t *\fIwch\fP);
+\fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBint echo_wchar(const cchar_t *\fIwch\fP);
+\fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS add_wch
 The
@@ -133,7 +138,7 @@ WACS_BULLET	0x00b7 	o	~	bullet
 WACS_CKBOARD	0x2592 	:	a	checker board (stipple)
 WACS_DARROW	0x2193 	v	.	arrow pointing down
 WACS_DEGREE	0x00b0 	'	f	degree symbol
-WACS_DIAMOND	0x25c6 	+	`	diamond
+WACS_DIAMOND	0x25c6 	+	\(ga	diamond
 WACS_GEQUAL	0x2265 	>	>	greater-than-or-equal-to
 WACS_HLINE	0x2500 	\-	q	horizontal line
 WACS_LANTERN	0x2603 	#	i	lantern symbol
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 1570a6176..3c2dbedff 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH curs_add_wchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_add_wchstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH curs_add_wchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,23 +56,17 @@
 add a \fIcurses\fR complex character string to a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint add_wchstr(const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint add_wchnstr(const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint wadd_wchstr(WINDOW *\fR \fIwin\fB, const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint wadd_wchnstr(WINDOW *\fR \fIwin\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvadd_wchstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvadd_wchnstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwadd_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvwadd_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+\fBint add_wchstr(const cchar_t *\fIwchstr\fP);
+\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint wadd_wchstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP);
+\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+.PP
+\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint mvwadd_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+\fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions copy the (null-terminated)
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index d5d6aff21..d69804578 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.71 2023/09/30 21:38:11 tom Exp $
-.TH curs_addch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_addch.3x,v 1.72 2023/10/07 21:19:07 tom Exp $
+.TH curs_addch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -47,20 +54,17 @@
 \fB\%wechochar\fP \-
 add a \fIcurses\fR character to a window and advance the cursor
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint addch(const chtype \fIch\fB);\fR
-.br
-\fBint waddch(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
-.br
-\fBint mvaddch(int \fIy\fB, int \fIx\fB, const chtype \fIch\fB);\fR
-.br
-\fBint mvwaddch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype \fIch\fB);\fR
-.sp
-\fBint echochar(const chtype \fIch\fB);\fR
-.br
-\fBint wechochar(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
-.br
+\fBint addch(const chtype \fIch\fP);
+\fBint waddch(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+\fBint mvaddch(int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+\fBint mvwaddch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+.PP
+\fBint echochar(const chtype \fIch\fP);
+\fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+.fi
 .SH DESCRIPTION
 .SS Adding characters
 The \fBaddch\fP, \fBwaddch\fP, \fBmvaddch\fP and \fBmvwaddch\fP routines put
@@ -151,7 +155,7 @@ ACS_BULLET	o	~	bullet
 ACS_CKBOARD	:	a	checker board (stipple)
 ACS_DARROW	v	.	arrow pointing down
 ACS_DEGREE	'	f	degree symbol
-ACS_DIAMOND	+	`	diamond
+ACS_DIAMOND	+	\(ga	diamond
 ACS_GEQUAL	>	>	greater-than-or-equal-to
 ACS_HLINE	\-	q	horizontal line
 ACS_LANTERN	#	i	lantern symbol
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 905f74426..ca285ada4 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.33 2023/09/30 21:38:11 tom Exp $
-.TH curs_addchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_addchstr.3x,v 1.34 2023/10/07 21:19:07 tom Exp $
+.TH curs_addchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,23 +56,17 @@
 add a \fIcurses\fR character string to a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addchstr(const chtype *\fIchstr\fB);\fR
-.br
-\fBint addchnstr(const chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddchstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB);\fR
-.br
-\fBint waddchnstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvaddchstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB);\fR
-.br
-\fBint mvaddchnstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwaddchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB);\fR
-.br
-\fBint mvwaddchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
+\fBint addchstr(const chtype *\fIchstr\fP);
+\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint waddchstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP);
+\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint mvwaddchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+\fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions copy the (null-terminated)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index b0b35482d..69c4ecd6d 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
-.TH curs_addstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_addstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
+.TH curs_addstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,23 +56,17 @@
 add a string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addstr(const char *\fIstr\fB);\fR
-.br
-\fBint addnstr(const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
-.br
-\fBint waddnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvaddstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvaddnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwaddstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvwaddnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr, int \fIn\fB);\fR
+\fBint addstr(const char *\fIstr\fP);
+\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
+\fBint waddstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvwaddnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions write the (null-terminated) character string
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index eb9f1eaaa..b247d9b92 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
-.TH curs_addwstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_addwstr.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
+.TH curs_addwstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,23 +56,17 @@
 add a wide-character string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addwstr(const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint addnwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint waddnwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvaddwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvaddnwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwaddwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvwaddnwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+\fBint addwstr(const wchar_t *\fIwstr\fP);
+\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint waddwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvwaddnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions write the characters of the
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index e6db84bf6..4ecf71634 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,31 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.86 2023/09/30 21:38:11 tom Exp $
-.TH curs_attr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: curs_attr.3x,v 1.87 2023/10/07 22:21:46 tom Exp $
+.TH curs_attr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
 .\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -86,58 +74,42 @@
 manipulate attributes of character cells in \fIcurses\fR windows
 .\" ---------------------------------------------------------------------------
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint attr_get(attr_t *\fIattrs\fB, short *\fIpair\fB, void *\fIopts\fB);\fR
-.br
-\fBint wattr_get(WINDOW *\fIwin\fB, attr_t *\fIattrs\fB, short *\fIpair\fB,\fR \fBvoid *\fIopts\fB);\fR
-.br
-\fBint attr_set(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
-.br
-\fBint wattr_set(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
-.sp
-\fBint attr_off(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-.br
-\fBint wattr_off(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-.br
-\fBint attr_on(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-.br
-\fBint wattr_on(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-.sp
-\fBint attroff(int \fIattrs);\fR
-.br
-\fBint wattroff(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-.br
-\fBint attron(int \fIattrs\fB);\fR
-.br
-\fBint wattron(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-.br
-\fBint attrset(int \fIattrs\fB);\fR
-.br
-\fBint wattrset(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-.sp
-\fBint chgat(int \fIn\fB, attr_t \fIattr\fB, short \fIpair\fB,\fR \fBconst void *\fIopts\fB);\fR
-.br
-\fBint wchgat(WINDOW *\fIwin\fB,\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint attr_get(attr_t *\fIattrs\fP, short *\fIpair\fP, void *\fIopts\fP);
+\fBint wattr_get(WINDOW *\fIwin\fP, attr_t *\fIattrs\fP, short *\fIpair\fP,\fR \fPvoid *\fIopts\fP);
+\fBint attr_set(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
+\fBint wattr_set(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
+.PP
+\fBint attr_off(attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint wattr_off(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint attr_on(attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint wattr_on(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, void *\fIopts\fP);
+.PP
+\fBint attroff(int \fIattrs\fP);
+\fBint wattroff(WINDOW *\fIwin\fP, int \fIattrs\fP);
+\fBint attron(int \fIattrs\fP);
+\fBint wattron(WINDOW *\fIwin\fP, int \fIattrs\fP);
+\fBint attrset(int \fIattrs\fP);
+\fBint wattrset(WINDOW *\fIwin\fP, int \fIattrs\fP);
+.PP
+\fBint chgat(int \fIn\fP, attr_t \fIattr\fP, short \fIpair\fP,\fR \fPconst void *\fIopts\fP);
+\fBint wchgat(WINDOW *\fIwin\fP,
       \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
-.br
 \fBint mvchgat(int \fIy\fB, int \fIx\fB,\fR
       \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
-.br
 \fBint mvwchgat(WINDOW *\fIwin, int \fIy, int \fIx\fB,\fR
       \fBint \fIn,\fR \fBattr_t \fIattr\fB, short \fIpair\fB, const void *\fIopts\fB);\fR
-.sp
+.PP
 \fBint color_set(short \fIpair\fB, void* \fIopts\fB);\fR
-.br
-\fBint wcolor_set(WINDOW *\fIwin\fB, short \fIpair\fB,\fR \fBvoid* \fIopts);\fR
-.sp
+\fBint wcolor_set(WINDOW *\fIwin\fB, short \fIpair\fB,\fR \fBvoid* \fIopts\fP);\fR
+.PP
 \fBint standend(void);\fP
-.br
 \fBint wstandend(WINDOW *\fIwin\fB);\fR
-.br
 \fBint standout(void);\fP
-.br
 \fBint wstandout(WINDOW *\fIwin\fB);\fR
+.fi
 .\" ---------------------------------------------------------------------------
 .SH DESCRIPTION
 These routines manipulate the current attributes of the named window,
@@ -198,10 +170,13 @@ the attribute parameter.
 For example,
 as long as that value fits into the \fBA_COLOR\fP mask,
 then these calls produce similar results:
-.NS
+.PP
+.RS 4
+.EX
 attrset(A_BOLD | COLOR_PAIR(\fIpair\fP));
 attr_set(A_BOLD, \fIpair\fP, NULL);
-.NE
+.EE
+.RE
 .PP
 However, if the value does not fit, then the \fBCOLOR_PAIR\fP macro
 uses only the bits that fit.
@@ -213,10 +188,13 @@ The \fBPAIR_NUMBER\fP macro extracts a pair number from an \fBint\fP
 (or \fBchtype\fP).
 For example, the \fIinput\fP and \fIoutput\fP values in these statements
 would be the same:
-.NS
+.PP
+.RS 4
+.EX
 int value = A_BOLD | COLOR_PAIR(\fIinput\fP);
 int \fIoutput\fP = PAIR_NUMBER(value);
-.NE
+.EE
+.RE
 .PP
 The \fBattrset\fP routine is a legacy feature predating SVr4 curses
 but kept in X/Open Curses for the same reason that SVr4 curses kept it:
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 9e17fa4b9..f5bd11aea 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,19 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.24 2023/09/30 21:38:11 tom Exp $
-.TH curs_beep 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_beep.3x,v 1.25 2023/10/07 21:19:07 tom Exp $
+.TH curs_beep 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
 ring the (visual) bell of the terminal with \fIcurses\fR
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint beep(void);\fP
-.br
-\fBint flash(void);\fP
-.br
+\fBint beep(void);
+\fBint flash(void);
+.fi
 .SH DESCRIPTION
 The \fBbeep\fP and \fBflash\fP routines are used to alert the terminal user.
 The routine \fBbeep\fP sounds an audible alarm on the terminal, if possible;
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index ac30e16d4..7d981a361 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
-.TH curs_bkgd 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
+.TH curs_bkgd 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -41,18 +41,17 @@
 \fB\%getbkgd\fP \-
 manipulate background of a \fIcurses\fR window of characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBvoid bkgdset(chtype \fIch\fB);\fR
-.br
-\fBvoid wbkgdset(WINDOW *\fIwin, chtype \fIch\fB);\fR
-.sp
-\fBint bkgd(chtype \fIch\fB);\fR
-.br
-\fBint wbkgd(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
-.sp
-\fBchtype getbkgd(WINDOW *\fIwin\fB);\fR
-.br
+\fBvoid bkgdset(chtype \fIch\fP);
+\fBvoid wbkgdset(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBint bkgd(chtype \fIch\fP);
+\fBint wbkgd(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBchtype getbkgd(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 .SS bkgdset
 The \fBbkgdset\fP and \fBwbkgdset\fP routines
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 227c6a202..34ae0de13 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH curs_bkgrnd 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH curs_bkgrnd 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,19 +42,18 @@
 \fB\%wgetbkgrnd\fP \-
 manipulate background of a \fIcurses\fP window of wide characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fR
-.sp
-\fBint bkgrnd(\fBconst cchar_t *\fIwch\fB);\fR
-.br
-\fBint wbkgrnd(\fBWINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBvoid bkgrndset(const cchar_t *\fIwch\fR \fB);\fR
-.br
-\fBvoid wbkgrndset(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBint getbkgrnd(cchar_t *\fIwch\fB);\fR
-.br
-\fBint wgetbkgrnd(WINDOW *\fIwin\fB, cchar_t *\fIwch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint bkgrnd(const cchar_t *\fIwch\fP);
+\fBint wbkgrnd(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBvoid bkgrndset(const cchar_t *\fIwch\fP);
+\fBvoid wbkgrndset(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBint getbkgrnd(cchar_t *\fIwch\fP);
+\fBint wgetbkgrnd(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS bkgrndset
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines manipulate the
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 8891d9d87..df4698c50 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
-.TH curs_border 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_border.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH curs_border 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%border\fP,
 \fB\%wborder\fP,
@@ -47,32 +53,27 @@
 \fB\%mvwvline\fP \-
 draw borders and lines in a \fIcurses\fR window of characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint border(chtype \fIls\fB, chtype \fIrs\fB, chtype \fIts\fB, chtype \fIbs\fB,\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint border(chtype \fIls\fP, chtype \fIrs\fP, chtype \fIts\fP, chtype \fIbs\fP,
            \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
-.br
 \fBint wborder(WINDOW *\fIwin\fB, chtype \fIls\fB, chtype \fIrs\fB,\fR
             \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype \fItr\fB,\fR
             \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
-.sp
+.PP
 \fBint box(WINDOW *\fIwin\fB, chtype \fIverch\fB, chtype \fIhorch\fB);\fR
-.sp
+.PP
 \fBint hline(chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint whline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.sp
+.PP
 \fBint mvhline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint mvwhline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+.fi
 .SH DESCRIPTION
 The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
 draw a box around the edges of a window.
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index b35331444..98f8c39ca 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
-.TH curs_border_set 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_border_set.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
+.TH curs_border_set 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%border_set\fP,
 \fB\%wborder_set\fP,
@@ -47,14 +53,14 @@
 \fB\%mvwvline_set\fP \-
 draw borders and lines in a \fIcurses\fR window of wide characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint border_set(\fP
+.nf
+\fB#include <curses.h>
+.PP
+\fBint border_set(
    \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
    \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
    \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
-   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fR
-\fB);\fP
+   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
 .br
 \fBint wborder_set(\fP
    \fBWINDOW *win\fP,
@@ -62,43 +68,35 @@ draw borders and lines in a \fIcurses\fR window of wide characters
    \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
    \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
    \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
-.br
 \fBint box_set(\fP
    \fBWINDOW *win\fP,
    \fBconst cchar_t *\fIverch\fR,
    \fBconst cchar_t *\fIhorch\fB);\fR
-.br
 \fBint hline_set(\fP
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint whline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvhline_set(\fP
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvwhline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint vline_set(\fP
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint wvline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvvline_set(\fP
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvwvline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+.fi
 .SH DESCRIPTION
 The
 \fBborder_set\fP
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index d59b321ad..d2af03516 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
-.TH curs_clear 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
+.TH curs_clear 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -44,23 +44,21 @@
 \fB\%wclrtoeol\fP \-
 clear all or part of a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint erase(void);\fP
-.br
-\fBint werase(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clear(void);\fP
-.br
-\fBint wclear(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clrtobot(void);\fP
-.br
-\fBint wclrtobot(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clrtoeol(void);\fP
-.br
-\fBint wclrtoeol(WINDOW *\fIwin\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint erase(void);
+\fBint werase(WINDOW *\fIwin\fP);
+.PP
+\fBint clear(void);
+\fBint wclear(WINDOW *\fIwin\fP);
+.PP
+\fBint clrtobot(void);
+\fBint wclrtobot(WINDOW *\fIwin\fP);
+.PP
+\fBint clrtoeol(void);
+\fBint wclrtoeol(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 .SS erase/werase
 The \fBerase\fP and \fBwerase\fP routines copy blanks to every
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 5a9bfd5c0..70dabf1b5 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,16 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.84 2023/09/30 20:13:18 tom Exp $
-.TH curs_color 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_color.3x,v 1.85 2023/10/07 21:19:07 tom Exp $
+.TH curs_color 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .SH NAME
 \fB\%start_color\fP,
@@ -56,30 +64,30 @@
 manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint start_color(void);\fP
+\fBint start_color(void);
 .PP
-\fBbool has_colors(void);\fP
-\fBbool can_change_color(void);\fP
+\fBbool has_colors(void);
+\fBbool can_change_color(void);
 .PP
-\fBint init_pair(short \fIpair\fB, short \fIf\fB, short \fIb\fB);\fR
-\fBint init_color(short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
-\fI/* extensions */\fP
-\fBint init_extended_pair(int \fIpair\fB, int \fIf\fB, int \fIb\fB);\fR
-\fBint init_extended_color(int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
+\fBint init_pair(short \fIpair\fP, short \fIf\fP, short \fIb\fP);
+\fBint init_color(short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
+\fI/* extensions */
+\fBint init_extended_pair(int \fIpair\fP, int \fIf\fP, int \fIb\fP);
+\fBint init_extended_color(int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
 .PP
-\fBint color_content(short \fIcolor\fB, short *\fIr\fB, short *\fIg\fB, short *\fIb\fB);\fR
-\fBint pair_content(short \fIpair\fB, short *\fIf\fB, short *\fIb\fB);\fR
-\fI/* extensions */\fP
-\fBint extended_color_content(int \fIcolor\fB, int *\fIr\fB, int *\fIg\fB, int *\fIb\fB);\fR
-\fBint extended_pair_content(int \fIpair\fB, int *\fIf\fB, int *\fIb\fB);\fR
+\fBint color_content(short \fIcolor\fP, short *\fIr\fP, short *\fIg\fP, short *\fIb\fP);
+\fBint pair_content(short \fIpair\fP, short *\fIf\fP, short *\fIb\fP);
+\fI/* extensions */
+\fBint extended_color_content(int \fIcolor\fP, int *\fIr\fP, int *\fIg\fP, int *\fIb\fP);
+\fBint extended_pair_content(int \fIpair\fP, int *\fIf\fP, int *\fIb\fP);
 .PP
-\fI/* extensions */\fP
-\fBvoid reset_color_pairs(void);\fP
+\fI/* extensions */
+\fBvoid reset_color_pairs(void);
 .PP
-\fBint COLOR_PAIR(int \fIn\fB);\fR
-\fBPAIR_NUMBER(\fIattrs\fB);\fR
+\fBint COLOR_PAIR(int \fIn\fP);
+\fBPAIR_NUMBER(\fIattrs\fP);
 .fi
 .SH DESCRIPTION
 .SS Overview
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index c2e4ff829..81028fda1 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
-.TH curs_delch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_delch.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH curs_delch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%delch\fP,
 \fB\%wdelch\fP,
@@ -40,15 +46,14 @@
 \fB\%mvwdelch\fP \-
 delete the character at the cursor in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint delch(void);\fP
-.br
-\fBint wdelch(WINDOW *\fIwin\fB);\fR
-.br
-\fBint mvdelch(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBint mvwdelch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint delch(void);
+\fBint wdelch(WINDOW *\fIwin\fP);
+\fBint mvdelch(int \fIy\fP, int \fIx\fP);
+\fBint mvwdelch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines delete the character under the cursor; all characters to the
 right of the cursor on the same line are moved to the left one position and the
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 554af5f3d..9cc5ef18b 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH curs_deleteln 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH curs_deleteln 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%deleteln\fP,
 \fB\%wdeleteln\fP,
@@ -38,19 +38,18 @@
 \fB\%winsertln\fP \-
 delete or insert lines in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint deleteln(void);\fP
-.br
-\fBint wdeleteln(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint insdelln(int \fIn\fB);\fR
-.br
-\fBint winsdelln(WINDOW *\fIwin\fB, int \fIn\fB);\fR
-.sp
-\fBint insertln(void);\fP
-.br
-\fBint winsertln(WINDOW *\fIwin\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint deleteln(void);
+\fBint wdeleteln(WINDOW *\fIwin\fP);
+.PP
+\fBint insdelln(int \fIn\fP);
+\fBint winsdelln(WINDOW *\fIwin\fP, int \fIn\fP);
+.PP
+\fBint insertln(void);
+\fBint winsertln(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
 cursor in the window; all lines below the current line are moved up one line.
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index bed7f4f3f..a6aaae47b 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,22 +29,29 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH curs_extend 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_extend.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_extend 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%curses_version\fP,
 \fB\%use_extended_names\fP \-
 miscellaneous \fIcurses\fR extensions
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBconst char * curses_version(void);\fP
-.br
-\fBint use_extended_names(bool \fIenable\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBconst char * curses_version(void);
+\fBint use_extended_names(bool \fIenable\fP);
+.fi
 .SH DESCRIPTION
 These functions are extensions to the curses library
 which do not fit easily into other categories.
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index a81c9ebf2..7f73ff2ce 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
-.TH curs_get_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_get_wch.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
+.TH curs_get_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,17 +52,16 @@
 \fB\%unget_wch\fP \-
 get (or push back) a wide character from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint get_wch(wint_t *\fIwch\fB);\fR
-.br
-\fBint wget_wch(WINDOW *\fIwin\fB, wint_t *\fIwch\fB);\fR
-.br
-\fBint mvget_wch(int \fIy\fB, int \fIx\fB, wint_t *\fIwch\fB);\fR
-.br
-\fBint mvwget_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwch\fB);\fR
-.sp
-\fBint unget_wch(const wchar_t \fIwch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint get_wch(wint_t *\fIwch\fP);
+\fBint wget_wch(WINDOW *\fIwin\fP, wint_t *\fIwch\fP);
+\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
+\fBint mvwget_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
+.PP
+\fBint unget_wch(const wchar_t \fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS wget_wch
 The
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 3d53b30be..5364de8b8 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.36 2023/09/30 21:38:11 tom Exp $
-.TH curs_get_wstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_get_wstr.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
+.TH curs_get_wstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,23 +56,17 @@
 get a wide-character string from a \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint get_wstr(wint_t *\fIwstr\fB);\fR
-.br
-\fBint getn_wstr(wint_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint wget_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB);\fR
-.br
-\fBint wgetn_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvget_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB);\fR
-.br
-\fBint mvgetn_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwget_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB);\fR
-.br
-\fBint mvwgetn_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint get_wstr(wint_t *\fIwstr\fP);
+\fBint getn_wstr(wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint wget_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP);
+\fBint wgetn_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
+\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwget_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
+\fBint mvwgetn_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 The function
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 94b87a526..8840a9334 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
-.TH curs_getcchar 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
+.TH curs_getcchar 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -38,31 +38,23 @@
 \fB\%setcchar\fP \-
 convert between a wide-character string and a \fIcurses\fR complex character string
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint getcchar(\fP
-.br
+.nf
+\fB#include <curses.h>
+.PP
+\fBint getcchar(
 .B "        const cchar_t *\fIwcval\fP,"
-.br
 .B "        wchar_t *\fIwch\fP,"
-.br
 .B "        attr_t *\fIattrs\fP,"
-.br
 .B "        short *\fIcolor_pair\fP,"
-.br
 .B "        void *\fIopts\fP );"
-.sp
+.PP
 .B "int setcchar("
-.br
 .B "        cchar_t *\fIwcval\fP,"
-.br
 .B "        const wchar_t *\fIwch\fP,"
-.br
 .B "        const attr_t \fIattrs\fP,"
-.br
 .B "        short \fIcolor_pair\fP,"
-.br
 .B "        const void *\fIopts\fP );"
+.fi
 .SH DESCRIPTION
 .SS getcchar
 The \fBgetcchar\fP function gets a wide-character string
@@ -102,7 +94,7 @@ The color pair in
 \fIcolor_pair\fP
 .bP
 The wide-character string pointed to by \fIwch\fP.
-The string must be L'\\0' terminated,
+The string must be L'\e0' terminated,
 contain at most one spacing character,
 which must be the first.
 .IP
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 22c25bff9..cf7225b6c 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.74 2023/09/30 21:38:11 tom Exp $
-.TH curs_getch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_getch.3x,v 1.75 2023/10/07 21:19:07 tom Exp $
+.TH curs_getch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -47,22 +54,20 @@
 \fB\%has_key\fP \-
 get (or push back) characters from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
+.nf
 .B #include <curses.h>
 .PP
 .B int getch(void);
-.br
-.B int wgetch(WINDOW *\fIwin\fB);
-.sp
-.B int mvgetch(int \fIy\fB, int \fIx\fB);
-.br
-.B int mvwgetch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);
-.sp
-.B int ungetch(int \fIch\fB);
-.sp
-/* extension */
-.br
-.B int has_key(int \fIch\fB);
-.br
+.B int wgetch(WINDOW *\fIwin\fP);
+.PP
+.B int mvgetch(int \fIy\fP, int \fIx\fP);
+.B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.PP
+.B int ungetch(int \fIch\fP);
+.PP
+\fI/* extension */\fP
+.B int has_key(int \fIch\fP);
+.fi
 .SH DESCRIPTION
 .SS Reading characters
 The \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP and \fBmvwgetch\fP, routines read
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index f4c65f344..0aea21bfc 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.48 2023/09/30 21:38:11 tom Exp $
-.TH curs_getstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_getstr.3x,v 1.49 2023/10/07 21:19:07 tom Exp $
+.TH curs_getstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -48,23 +55,19 @@
 \fB\%mvwgetnstr\fP \-
 accept character strings from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint getstr(char *\fIstr\fB);\fR
-.br
-\fBint getnstr(char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint wgetstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
-.br
-\fBint wgetnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvgetstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvwgetstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvgetnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwgetnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint getstr(char *\fIstr\fP);
+\fBint getnstr(char *\fIstr\fP, int \fIn\fP);
+\fBint wgetstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+\fBint wgetnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvwgetstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint mvwgetnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 The function
 \fBwgetnstr\fP
@@ -272,7 +275,7 @@ That may have been done to make function- and cursor-keys work;
 it is not necessary with ncurses.
 .IP
 Since 1995, ncurses has provided signal handlers for INTR and QUIT
-(e.g., \fB^C\fP or \fB^\\\fP).
+(e.g., \fB^C\fP or \fB^\e\fP).
 With the \fBnoraw\fP and \fBcbreak\fP settings,
 those may catch a signal and stop the program,
 where other implementations allow one to enter those characters in the buffer.
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 887b4c284..a34231fbf 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.37 2023/09/23 22:10:55 tom Exp $
-.TH curs_getyx 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
+.TH curs_getyx 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%getyx\fP,
 \fB\%getparyx\fP,
@@ -37,12 +37,12 @@
 get \fIcurses\fR cursor and window coordinates
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBvoid getyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getparyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getbegyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getmaxyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+\fBvoid getyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getbegyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getmaxyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
 The \fB\%getyx\fP macro places the current cursor position of the given window in
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index fcc430b2d..b8ea1d827 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp $
-.TH curs_in_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_in_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp $
+.TH curs_in_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%in_wch\fP,
 \fB\%mvin_wch\fP,
@@ -40,15 +46,15 @@
 \fB\%win_wch\fP \-
 get a \fIcurses\fR complex character from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint in_wch(cchar_t *\fIwcval\fB);\fR
-.br
-\fBint win_wch(WINDOW *\fIwin\fB, cchar_t *\fIwcval\fB);\fR
-.sp
-\fBint mvin_wch(int \fIy\fB, int \fIx\fB, cchar_t *\fIwcval\fB);\fR
-.br
-\fBint mvwin_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwcval\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint in_wch(cchar_t *\fIwcval\fP);
+\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwcval\fP);
+.PP
+\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwcval\fP);
+\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwcval\fP);
+.fi
 .SH DESCRIPTION
 These functions extract the complex character and rendition from
 the current position in the named window into the \fBcchar_t\fP object
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 7118abf95..c2380120d 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
-.TH curs_in_wchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_in_wchstr.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
+.TH curs_in_wchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%in_wchstr\fP,
 \fB\%in_wchnstr\fP,
@@ -45,23 +51,17 @@
 get a \fIcurses\fR complex character string from a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint in_wchstr(cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint in_wchnstr(cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint win_wchstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint win_wchnstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvin_wchstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvin_wchnstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwin_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvwin_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fR, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint in_wchstr(cchar_t *\fIwchstr\fP);
+\fBint in_wchnstr(cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint win_wchstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP);
+\fBint win_wchnstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
+.PP
+\fBint mvin_wchstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP);
+\fBint mvin_wchnstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint mvwin_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP);
+\fBint mvwin_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions return an array of complex characters in \fIwchstr\fP,
@@ -79,7 +79,6 @@ with at most
 \fIn\fP
 \fBcchar_t\fP
 elements.
-.br
 .SH NOTES
 Note that all routines except
 \fBwin_wchnstr\fP
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 16f2fb96d..4e5f14d8a 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH curs_inch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_inch.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_inch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,15 +52,15 @@
 \fB\%mvwinch\fP \-
 get a \fIcurses\fR character from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBchtype inch(void);\fP
-.br
-\fBchtype winch(WINDOW *\fIwin\fB);\fR
-.sp
-\fBchtype mvinch(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBchtype mvwinch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBchtype inch(void);
+\fBchtype winch(WINDOW *\fIwin\fP);
+.PP
+\fBchtype mvinch(int \fIy\fP, int \fIx\fP);
+\fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines return the character, of type \fBchtype\fP, at the current
 position in the named window.
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 1bbb75dd3..fa263ba3d 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
-.TH curs_inchstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_inchstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
+.TH curs_inchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -48,23 +55,19 @@
 \fB\%mvwinchnstr\fP \-
 get a \fIcurses\fR character string from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint inchstr(chtype *\fIchstr\fB);\fR
-.br
-\fBint inchnstr(chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint winchstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB);\fR
-.br
-\fBint winchnstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinchstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
-.br
-\fBint mvinchnstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwinchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
-.br
-\fBint mvwinchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint inchstr(chtype *\fIchstr\fP);
+\fBint inchnstr(chtype *\fIchstr\fP, int \fIn\fP);
+\fBint winchstr(WINDOW *\fIwin\fP, chtype *\fIchstr\fP);
+\fBint winchnstr(WINDOW *\fIwin\fP, chtype *\fIchstr\fP, int \fIn\fP);
+.PP
+\fBint mvinchstr(int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP);
+\fBint mvinchnstr(int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP, int \fIn\fP);
+\fBint mvwinchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP);
+\fBint mvwinchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines return a NULL-terminated array of \fBchtype\fP quantities,
 starting at the current cursor position in the named window and ending at the
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index cfc8d1096..3bf80125c 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,16 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.52 2023/09/30 21:38:11 tom Exp $
-.TH curs_initscr 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.53 2023/10/07 21:19:07 tom Exp $
+.TH curs_initscr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .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 '' ''
 .SH NAME
 \fB\%initscr\fP,
 \fB\%newterm\fP,
@@ -46,19 +53,18 @@
 \fB\%delscreen\fP \-
 initialize, manipulate, or tear down \fIcurses\fR terminal interface
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBWINDOW *initscr(void);\fP
-.br
-\fBint endwin(void);\fP
-.sp
-\fBbool isendwin(void);\fP
-.sp
-\fBSCREEN *newterm(const char *\fItype\fB, FILE *\fIoutf\fB, FILE *\fIinf\fB);\fR
-.br
-\fBSCREEN *set_term(SCREEN *\fInew\fB);\fR
-.br
-\fBvoid delscreen(SCREEN* \fIsp\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBWINDOW *initscr(void);
+\fBint endwin(void);
+.PP
+\fBbool isendwin(void);
+.PP
+\fBSCREEN *newterm(const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
+\fBSCREEN *set_term(SCREEN *\fInew\fP);
+\fBvoid delscreen(SCREEN* \fIsp\fP);
+.fi
 .SH DESCRIPTION
 .SS initscr
 \fBinitscr\fP is normally the first \fBcurses\fP routine to call when
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 56a9b1e79..a2b366f31 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,12 +28,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.54 2023/09/23 22:24:15 tom Exp $
-.TH curs_inopts 3X 2023-09-23 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_inopts.3x,v 1.55 2023/10/07 21:19:07 tom Exp $
+.TH curs_inopts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%cbreak\fP,
 \fB\%echo\fP,
@@ -61,40 +67,40 @@
 get and set \fIcurses\fR terminal input options
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint cbreak(void);\fP
-\fBint nocbreak(void);\fP
+\fBint cbreak(void);
+\fBint nocbreak(void);
 .PP
-\fBint echo(void);\fP
-\fBint noecho(void);\fP
+\fBint echo(void);
+\fBint noecho(void);
 .PP
-\fBint intrflush(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint keypad(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint meta(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint nodelay(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint notimeout(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+\fBint intrflush(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint keypad(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint meta(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint nodelay(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint notimeout(WINDOW *\fIwin\fP, bool \fIbf\fP);
 .PP
-\fBint nl(void);\fP
-\fBint nonl(void);\fP
+\fBint nl(void);
+\fBint nonl(void);
 .PP
-\fBint raw(void);\fP
-\fBint noraw(void);\fP
+\fBint raw(void);
+\fBint noraw(void);
 .PP
-\fBvoid qiflush(void);\fP
-\fBvoid noqiflush(void);\fP
+\fBvoid qiflush(void);
+\fBvoid noqiflush(void);
 .PP
-\fBint halfdelay(int \fItenths\fB);\fR
-\fBvoid timeout(int \fIdelay\fB);\fR
-\fBvoid wtimeout(WINDOW *\fIwin\fB, int \fIdelay\fB);\fR
+\fBint halfdelay(int \fItenths\fP);
+\fBvoid timeout(int \fIdelay\fP);
+\fBvoid wtimeout(WINDOW *\fIwin\fP, int \fIdelay\fP);
 .PP
-\fBint typeahead(int \fIfd\fB);\fR
+\fBint typeahead(int \fIfd\fP);
 .PP
-\fI/* extensions */\fP
-\fBint is_cbreak(void);\fP
-\fBint is_echo(void);\fP
-\fBint is_nl(void);\fP
-\fBint is_raw(void);\fP
+\fI/* extensions */
+\fBint is_cbreak(void);
+\fBint is_echo(void);
+\fBint is_nl(void);
+\fBint is_raw(void);
 .fi
 .SH DESCRIPTION
 The \fIncurses\fP library provides several functions which let an application
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index ead78c7e3..6c50e9b62 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.21 2023/09/30 21:38:11 tom Exp $
-.TH curs_ins_wch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_ins_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp $
+.TH curs_ins_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%ins_wch\fP,
 \fB\%mvins_wch\fP,
@@ -40,15 +46,15 @@
 \fB\%wins_wch\fP \-
 insert a \fIcurses\fR complex character string in a window
 .SH SYNOPSIS
+.nf
 #include <curses.h>
-.sp
-\fBint ins_wch(const cchar_t *\fIwch\fB);\fR
-.br
-\fBint wins_wch(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBint mvins_wch(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwch\fB);\fR
-.br
-\fBint mvwins_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwch\fB);\fR
+.PP
+\fBint ins_wch(const cchar_t *\fIwch\fP);
+\fBint wins_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint mvwins_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+.fi
 .SH DESCRIPTION
 These routines, insert the complex character \fIwch\fP with rendition
 before the character under the cursor.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 019f1e0eb..6b6cf806c 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.22 2023/09/30 21:38:11 tom Exp $
-.TH curs_ins_wstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_ins_wstr.3x,v 1.23 2023/10/07 22:22:46 tom Exp $
+.TH curs_ins_wstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%ins_wstr\fP,
 \fB\%ins_nwstr\fP,
@@ -45,23 +51,17 @@
 insert a wide-character string in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint ins_wstr(const wchar_t *\fIwstr);\fR
-.br
-\fBint ins_nwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint wins_wstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint wins_nwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvins_wstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvins_nwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwins_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvwins_nwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint ins_wstr(const wchar_t *\fIwstr\fP);
+\fBint ins_nwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint wins_wstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+\fBint wins_nwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwins_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvwins_nwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These routines insert a \fBwchar_t\fP character string
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 56d409887..37903968e 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
-.TH curs_insch 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_insch.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
+.TH curs_insch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%insch\fP,
 \fB\%winsch\fP,
@@ -40,15 +46,15 @@
 \fB\%mvwinsch\fP \-
 insert a \fIcurses\fR character in a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint insch(chtype \fIch\fB);\fR
-.br
-\fBint winsch(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
-.sp
-\fBint mvinsch(int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
-.br
-\fBint mvwinsch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint insch(chtype \fIch\fP);
+\fBint winsch(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBint mvinsch(int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+\fBint mvwinsch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+.fi
 .SH DESCRIPTION
 These routines insert the character \fIch\fP before the character under the
 cursor.
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 7bc2006d6..348d78fae 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH curs_insstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_insstr.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_insstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%insstr\fP,
 \fB\%insnstr\fP,
@@ -44,23 +50,18 @@
 \fB\%mvwinsnstr\fP \-
 insert a string in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.br
-\fBint insstr(const char *\fIstr\fB);\fR
-.br
-\fBint insnstr(const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint winsstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
-.br
-\fBint winsnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinsstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvinsnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwinsstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvwinsnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+\fBint insstr(const char *\fIstr\fP);
+\fBint insnstr(const char *\fIstr\fP, int \fIn\fP);
+\fBint winsstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+\fBint winsnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint mvwinsstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvwinsnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines insert a character string
 (as many characters as will fit on the line)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 2b4a9b7d9..aa5e01574 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.35 2023/09/30 21:38:11 tom Exp $
-.TH curs_instr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_instr.3x,v 1.36 2023/10/07 21:19:07 tom Exp $
+.TH curs_instr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -48,23 +55,19 @@
 \fB\%mvwinnstr\fP \-
 get a string from a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint instr(char *\fIstr\fB);\fR
-.br
-\fBint innstr(char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint winstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
-.br
-\fBint winnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvinnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwinstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvwinnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint instr(char *\fIstr\fP);
+\fBint innstr(char *\fIstr\fP, int \fIn\fP);
+\fBint winstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+\fBint winnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint mvwinstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines return a string of characters in \fIstr\fP, extracted starting
 at the current cursor position in the named window.
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index df97c51dc..27843122c 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH curs_inwstr 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_inwstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH curs_inwstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%inwstr\fP,
 \fB\%innwstr\fP,
@@ -45,23 +51,17 @@
 get a wide-character string from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h> \fP
-.sp
-\fBint inwstr(\fBwchar_t *\fIwstr\fB);\fR
-.br
-\fBint innwstr(\fBwchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint winwstr(\fBWINDOW *\fIwin\fB, wchar_t *\fIwstr\fB);\fR
-.br
-\fBint winnwstr(\fBWINDOW *\fIwin\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinwstr(\fBint \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvinnwstr(\fBint \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwinwstr(\fBWINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvwinnwstr(\fBWINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint inwstr(wchar_t *\fIwstr\fP);
+\fBint innwstr(wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint winwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP);
+\fBint winnwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
+\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwinwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
+\fBint mvwinnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 8993e6c95..b563a176d 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
-.TH curs_kernel 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_kernel.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
+.TH curs_kernel 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -51,29 +58,25 @@
 \fB\%napms\fP \-
 low-level \fIcurses\fR routines
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint def_prog_mode(void);\fP
-.br
-\fBint def_shell_mode(void);\fP
-.sp
-\fBint reset_prog_mode(void);\fP
-.br
-\fBint reset_shell_mode(void);\fP
-.sp
-\fBint resetty(void);\fP
-.br
-\fBint savetty(void);\fP
-.sp
-\fBvoid getsyx(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBvoid setsyx(int \fIy\fB, int \fIx\fB);\fR
-.sp
-\fBint ripoffline(int \fIline\fB, int (*\fIinit\fB)(WINDOW *, int));\fR
-.br
-\fBint curs_set(int \fIvisibility\fB);\fR
-.br
-\fBint napms(int \fIms\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint def_prog_mode(void);
+\fBint def_shell_mode(void);
+.PP
+\fBint reset_prog_mode(void);
+\fBint reset_shell_mode(void);
+.PP
+\fBint resetty(void);
+\fBint savetty(void);
+.PP
+\fBvoid getsyx(int \fIy\fP, int \fIx\fP);
+\fBvoid setsyx(int \fIy\fP, int \fIx\fP);
+.PP
+\fBint ripoffline(int \fIline\fP, int (*\fIinit\fP)(WINDOW *, int));
+\fBint curs_set(int \fIvisibility\fP);
+\fBint napms(int \fIms\fP);
+.fi
 .SH DESCRIPTION
 The following routines give low-level access
 to various \fBcurses\fP capabilities.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 233a2d064..bf24a74d4 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.27 2023/09/23 22:11:47 tom Exp $
-.TH curs_legacy 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH curs_legacy 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -46,21 +46,21 @@
 get \fIcurses\fR cursor and window coordinates or attributes (legacy)
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint getattrs(const WINDOW *\fIwin\fB);\fR
+\fBint getattrs(const WINDOW *\fIwin\fP);
 .PP
-\fBint getbegx(const WINDOW *\fIwin\fB);\fR
-\fBint getbegy(const WINDOW *\fIwin\fB);\fR
+\fBint getbegx(const WINDOW *\fIwin\fP);
+\fBint getbegy(const WINDOW *\fIwin\fP);
 .PP
-\fBint getcurx(const WINDOW *\fIwin\fB);\fR
-\fBint getcury(const WINDOW *\fIwin\fB);\fR
+\fBint getcurx(const WINDOW *\fIwin\fP);
+\fBint getcury(const WINDOW *\fIwin\fP);
 .PP
-\fBint getmaxx(const WINDOW *\fIwin\fB);\fR
-\fBint getmaxy(const WINDOW *\fIwin\fB);\fR
+\fBint getmaxx(const WINDOW *\fIwin\fP);
+\fBint getmaxy(const WINDOW *\fIwin\fP);
 .PP
-\fBint getparx(const WINDOW *\fIwin\fB);\fR
-\fBint getpary(const WINDOW *\fIwin\fB);\fR
+\fBint getparx(const WINDOW *\fIwin\fP);
+\fBint getpary(const WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
 These legacy functions are simpler to use than the X/Open \fIcurses\fP functions:
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index dd158643b..31a927c40 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.27 2023/09/30 23:13:30 tom Exp $
-.TH curs_memleaks 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_memleaks.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH curs_memleaks 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -43,16 +50,16 @@
 check for memory leaks in \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-\fBvoid exit_curses(int \fIcode\fB);\fR
+\fB#include <curses.h>
+\fBvoid exit_curses(int \fIcode\fP);
 .PP
-\fB#include <term.h>\fP
-\fBvoid exit_terminfo(int \fIcode\fB);\fR
+\fB#include <term.h>
+\fBvoid exit_terminfo(int \fIcode\fP);
 .PP
-\fI/* deprecated (intentionally not declared in curses.h or term.h) */\fP
-\fBvoid _nc_freeall(void);\fP
-\fBvoid _nc_free_and_exit(int \fIcode\fB);\fR
-\fBvoid _nc_free_tinfo(int \fIcode\fB);\fR
+\fI/* deprecated (intentionally not declared in curses.h or term.h) */
+\fBvoid _nc_freeall(void);
+\fBvoid _nc_free_and_exit(int \fIcode\fP);
+\fBvoid _nc_free_tinfo(int \fIcode\fP);
 .fi
 .SH DESCRIPTION
 These functions are used to simplify analysis of memory leaks in the ncurses
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 8f40045cf..61f99b3da 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,31 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.78 2023/09/23 23:08:40 tom Exp $
-.TH curs_mouse 3X 2023-09-23 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: curs_mouse.3x,v 1.79 2023/10/07 21:19:07 tom Exp $
+.TH curs_mouse 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
 .\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -69,27 +57,27 @@
 get mouse events in \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBtypedef unsigned long mmask_t;\fP
+\fBtypedef unsigned long mmask_t;
 .PP
-\fBtypedef struct {\fP
-\fB    short id;         \fI/* ID to distinguish multiple devices */\fR
-\fB    int x, y, z;      \fI/* event coordinates */\fR
-\fB    mmask_t bstate;   \fI/* button state bits */\fR
-\fB} MEVENT;\fP
+\fBtypedef struct {
+\fB    short id;         \fI/* ID to distinguish multiple devices */
+\fB    int x, y, z;      \fI/* event coordinates */
+\fB    mmask_t bstate;   \fI/* button state bits */
+\fB} MEVENT;
 .PP
-\fBbool has_mouse(void);\fP
+\fBbool has_mouse(void);
 .PP
-\fBint getmouse(MEVENT *\fIevent\fB);\fR
-\fBint ungetmouse(MEVENT *\fIevent\fB);\fR
+\fBint getmouse(MEVENT *\fIevent\fP);
+\fBint ungetmouse(MEVENT *\fIevent\fP);
 .PP
-\fBmmask_t mousemask(mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
+\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
 .PP
-\fBbool wenclose(const WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+\fBbool wenclose(const WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
-\fBbool mouse_trafo(int* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
-\fBbool wmouse_trafo(const WINDOW* \fIwin\fB,\fR
+\fBbool mouse_trafo(int* \fIpY\fP, int* \fIpX\fP, bool \fIto_screen\fP);
+\fBbool wmouse_trafo(const WINDOW* \fIwin\fP,
                   \fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
 .PP
 \fBint mouseinterval(int \fIerval\fB);\fR
@@ -282,7 +270,9 @@ It is mentioned in a few places, but with no supporting documentation:
 .bP
 the \*(``libcurses\*('' manual page lists functions for this feature
 which are prototyped in \fBcurses.h\fP:
-.NS
+.PP
+.RS 8
+.EX
 extern int mouse_set(long int);
 extern int mouse_on(long int);
 extern int mouse_off(long int);
@@ -290,16 +280,20 @@ extern int request_mouse_pos(void);
 extern int map_button(unsigned long);
 extern void wmouse_position(WINDOW *, int *, int *);
 extern unsigned long getmouse(void), getbmap(void);
-.NE
+.EE
+.RE
 .bP
 the \*(``terminfo\*('' manual page lists capabilities for the feature
-.NS
+.PP
+.RS 8
+.EX
 buttons           btns    BT       Number of buttons on the mouse
 get_mouse         getm    Gm       Curses should get button events
 key_mouse         kmous   Km       0631, Mouse event has occurred
 mouse_info        minfo   Mi       Mouse status information
 req_mouse_pos     reqmp   RQ       Request mouse position report
-.NE
+.EE
+.RE
 .bP
 the interface made assumptions (as does \fIncurses\fP) about the escape sequences
 sent to and received from the terminal.
@@ -368,13 +362,13 @@ The default, if \fBXM\fP is not found,
 corresponds to private mode 1000 of xterm:
 .PP
 .RS 3
-\\E[?1000%?%p1%{1}%=%th%el%;
+\eE[?1000%?%p1%{1}%=%th%el%;
 .RE
 .PP
 The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
 .PP
 .RS 3
-\\E[?1006;1000%?%p1%{1}%=%th%el%;
+\eE[?1006;1000%?%p1%{1}%=%th%el%;
 .RE
 .PP
 The \fIz\fP member in the event structure is not presently used.
@@ -395,7 +389,7 @@ report sequence will appear in the string read.
 .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 \fB\%kmous\fP set to \*(``\\E[M\*(''
+Your terminfo description should have \fB\%kmous\fP set to \*(``\eE[M\*(''
 (the beginning of the response from xterm for mouse clicks).
 Other values for \fB\%kmous\fP are permitted,
 but under the same assumption,
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 3431cc1f0..d3d656a09 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH curs_move 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_move.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH curs_move 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
 move cursor in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint move(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBint wmove(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint move(int \fIy\fP, int \fIx\fP);
+\fBint wmove(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines move the cursor associated with the window to line \fIy\fP and
 column \fIx\fP.
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 3c206555b..a4fb1572e 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.35 2023/09/30 22:01:38 tom Exp $
-.TH curs_opaque 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_opaque.3x,v 1.36 2023/10/07 21:19:07 tom Exp $
+.TH curs_opaque 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%is_cleared\fP,
 \fB\%is_idlok\fP,
@@ -52,24 +58,24 @@
 obtain \fIcurses\fR window properties
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBbool is_cleared(const WINDOW *\fIwin\fB);\fR
-\fBbool is_idcok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_idlok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_immedok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_keypad(const WINDOW *\fIwin\fB);\fR
-\fBbool is_leaveok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_nodelay(const WINDOW *\fIwin\fB);\fR
-\fBbool is_notimeout(const WINDOW *\fIwin\fB);\fR
-\fBbool is_pad(const WINDOW *\fIwin\fB);\fR
-\fBbool is_scrollok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_subwin(const WINDOW *\fIwin\fB);\fR
-\fBbool is_syncok(const WINDOW *\fIwin\fB);\fR
+\fBbool is_cleared(const WINDOW *\fIwin\fP);
+\fBbool is_idcok(const WINDOW *\fIwin\fP);
+\fBbool is_idlok(const WINDOW *\fIwin\fP);
+\fBbool is_immedok(const WINDOW *\fIwin\fP);
+\fBbool is_keypad(const WINDOW *\fIwin\fP);
+\fBbool is_leaveok(const WINDOW *\fIwin\fP);
+\fBbool is_nodelay(const WINDOW *\fIwin\fP);
+\fBbool is_notimeout(const WINDOW *\fIwin\fP);
+\fBbool is_pad(const WINDOW *\fIwin\fP);
+\fBbool is_scrollok(const WINDOW *\fIwin\fP);
+\fBbool is_subwin(const WINDOW *\fIwin\fP);
+\fBbool is_syncok(const WINDOW *\fIwin\fP);
 .PP
-\fBWINDOW * wgetparent(const WINDOW *\fIwin\fB);\fR
-\fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
-\fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int *\fIbottom\fB);\fR
+\fBWINDOW * wgetparent(const WINDOW *\fIwin\fP);
+\fBint wgetdelay(const WINDOW *\fIwin\fP);
+\fBint wgetscrreg(const WINDOW *\fIwin\fP, int *\fItop\fP, int *\fIbottom\fP);
 .fi
 .SH DESCRIPTION
 \fIncurses\fP provides functions returning properties of a
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 3f0bfdaee..3a9141481 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.46 2023/09/30 21:38:11 tom Exp $
-.TH curs_outopts 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.48 2023/10/07 22:54:10 tom Exp $
+.TH curs_outopts 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -44,23 +44,19 @@
 \fB\%scrollok\fP \-
 set \fIcurses\fR output options
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint clearok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint idlok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBvoid idcok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBvoid immedok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint leaveok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint scrollok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.sp
-\fBint setscrreg(int \fItop\fB, int \fIbot\fB);\fR
-.br
-\fBint wsetscrreg(WINDOW *\fIwin\fB, int \fItop\fB, int \fIbot\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+.PP
+\fBint setscrreg(int \fItop\fP, int \fIbot\fP);
+\fBint wsetscrreg(WINDOW *\fIwin\fP, int \fItop\fP, int \fIbot\fP);
+.fi
 .SH DESCRIPTION
 These routines set options that change the style of output within
 \fBcurses\fP.
@@ -97,12 +93,15 @@ Use of character insert/delete is enabled by default.
 Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
 of character insertion and deletion.
 .SS immedok
-If \fBimmedok\fP is called with \fBTRUE as argument\fP, any change
-in the window image, such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
-etc., automatically cause a call to \fBwrefresh\fP.
-However, it may
-degrade performance considerably, due to repeated calls to \fBwrefresh\fP.
-It is disabled by default.
+If \fBimmedok\fP is called with \fBTRUE\fP as second argument,
+any change in the window image,
+such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
+etc., automatically causes a call to \fBwrefresh\fP.
+However, it may degrade performance considerably,
+due to repeated calls to \fBwrefresh\fP.
+Calling \fBimmedok\fP with \fBFALSE\fP as second argument
+restores the default behavior,
+i.e., deferring screen updates until a refresh is needed.
 .SS leaveok
 Normally, the hardware cursor is left at the location of the window cursor
 being refreshed.
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index c582152cf..392147897 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,23 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
-.TH curs_overlay 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
+.TH curs_overlay 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%overlay\fP,
 \fB\%overwrite\fP,
 \fB\%copywin\fP \-
 overlay \fIcurses\fR windows and manipulate them
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint overlay(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
-.br
-\fBint overwrite(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
-.br
-\fBint copywin(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB, int \fIsminrow\fB,\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint overlay(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP);
+\fBint overwrite(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP);
+\fBint copywin(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP, int \fIsminrow\fP,
       \fBint \fIsmincol\fB, int \fIdminrow\fB, int \fIdmincol\fB, int \fIdmaxrow\fB,\fR
       \fBint \fIdmaxcol\fB, int \fIoverlay\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS overlay, overwrite
 The \fBoverlay\fP and \fBoverwrite\fP routines overlay \fIsrcwin\fP on
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 2c58047c0..587a24125 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.43 2023/09/23 22:49:51 tom Exp $
-.TH curs_pad 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.44 2023/10/07 21:19:07 tom Exp $
+.TH curs_pad 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -43,10 +43,10 @@
 create and display \fIcurses\fR pads
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBWINDOW *newpad(int \fInlines\fB, int \fIncols\fB);\fR
-\fBWINDOW *subpad(WINDOW *\fIorig\fB, int \fInlines\fB, int \fIncols\fB,\fR
+\fBWINDOW *newpad(int \fInlines\fP, int \fIncols\fP);
+\fBWINDOW *subpad(WINDOW *\fIorig\fP, int \fInlines\fP, int \fIncols\fP,
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
 \fBint prefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
diff --git a/man/curs_print.3x b/man/curs_print.3x
index a3a5b48bf..72c15a80a 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,15 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.31 2023/09/23 23:04:49 tom Exp $
-.TH curs_print 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH curs_print 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint mcprint(char *\fIdata\fB, int \fIlen\fB);\fR
+\fBint mcprint(char *\fIdata\fP, int \fIlen\fP);
+.fi
 .SH DESCRIPTION
 This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
 if they are present, to ship given data to a printer attached to the terminal.
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index d7f266071..8d7c081d3 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
-.TH curs_printw 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_printw.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH curs_printw 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -46,21 +53,18 @@
 \fB\%vw_printw\fP \-
 write formatted output to \fIcurses\fR windows
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint printw(const char *\fIfmt\fB, ...);\fR
-.br
-\fBint wprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvprintw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvwprintw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint vw_printw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
-.sp
-/* obsolete */
-.br
-\fBint vwprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint printw(const char *\fIfmt\fP, ...);
+\fBint wprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, ...);
+\fBint mvprintw(int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+\fBint mvwprintw(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+\fBint vw_printw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
+.PP
+\fI/* obsolete */\fP
+\fBint vwprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
+.fi
 .SH DESCRIPTION
 The \fBprintw\fP, \fBwprintw\fP, \fBmvprintw\fP and \fBmvwprintw\fP
 routines are analogous to \fBprintf\fP [see \fBprintf\fP(3)].
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index c1abae444..a32880df4 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.37 2023/09/30 21:38:11 tom Exp $
-.TH curs_refresh 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_refresh.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
+.TH curs_refresh 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -46,19 +53,17 @@
 \fB\%wrefresh\fP \-
 refresh \fIcurses\fR windows or lines thereupon
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint refresh(void);\fP
-.br
-\fBint wrefresh(WINDOW *\fIwin\fB);\fR
-.br
-\fBint wnoutrefresh(WINDOW *\fIwin\fB);\fR
-.br
-\fBint doupdate(void);\fP
-.sp
-\fBint redrawwin(WINDOW *\fIwin\fB);\fR
-.br
-\fBint wredrawln(WINDOW *\fIwin\fB, int \fIbeg_line\fB, int \fInum_lines\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint refresh(void);
+\fBint wrefresh(WINDOW *\fIwin\fP);
+\fBint wnoutrefresh(WINDOW *\fIwin\fP);
+\fBint doupdate(void);
+.PP
+\fBint redrawwin(WINDOW *\fIwin\fP);
+\fBint wredrawln(WINDOW *\fIwin\fP, int \fIbeg_line\fP, int \fInum_lines\fP);
+.fi
 .SH DESCRIPTION
 .SS refresh/wrefresh
 The \fBrefresh\fP and \fBwrefresh\fP routines (or \fBwnoutrefresh\fP and
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index 8f905b998..f51d39b43 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
-.TH curs_scanw 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_scanw.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH curs_scanw 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -46,21 +53,19 @@
 \fB\%vw_scanw\fP \-
 read formatted input from a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scanw(const char *\fIfmt\fB, ...);\fR
-.br
-\fBint wscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvscanw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvwscanw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.sp
-\fBint vw_scanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
-.sp
-/* obsolete */
-.br
-\fBint vwscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scanw(const char *\fIfmt\fP, ...);
+\fBint wscanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, ...);
+\fBint mvscanw(int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+\fBint mvwscanw(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+.PP
+\fBint vw_scanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
+.PP
+\fI/* obsolete */\fP
+\fBint vwscanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
+.fi
 .SH DESCRIPTION
 The \fBscanw\fP, \fBwscanw\fP and \fBmvscanw\fP routines are analogous to
 \fBscanf\fP [see \fBscanf\fP(3)].
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 2e4b7bc82..8733e9f71 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH curs_scr_dump 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_scr_dump.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH curs_scr_dump 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -44,15 +51,14 @@
 \fB\%scr_set\fP \-
 read/write a \fIcurses\fR screen from/to a file
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scr_dump(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_restore(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_init(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_set(const char *\fIfilename\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scr_dump(const char *\fIfilename\fP);
+\fBint scr_restore(const char *\fIfilename\fP);
+\fBint scr_init(const char *\fIfilename\fP);
+\fBint scr_set(const char *\fIfilename\fP);
+.fi
 .SH DESCRIPTION
 .SS scr_dump
 The \fBscr_dump\fP routine dumps the current contents
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 65c26d471..3f3ce7119 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,25 +27,32 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.34 2023/09/30 21:38:11 tom Exp $
-.TH curs_scroll 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_scroll.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
+.TH curs_scroll 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%scroll\fP,
 \fB\%scrl\fP,
 \fB\%wscrl\fP \-
 scroll a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scroll(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint scrl(int \fIn\fB);\fR
-.br
-\fBint wscrl(WINDOW *\fIwin\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scroll(WINDOW *\fIwin\fP);
+.PP
+\fBint scrl(int \fIn\fP);
+\fBint wscrl(WINDOW *\fIwin\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 The \fBscroll\fP routine scrolls the window up one line.
 This involves moving
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index cac57c1bf..6a4943c14 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.62 2023/09/30 20:13:18 tom Exp $
-.TH curs_slk 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_slk.3x,v 1.63 2023/10/07 21:19:07 tom Exp $
+.TH curs_slk 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -59,33 +66,33 @@
 \fIcurses\fR soft label key routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint slk_init(int \fIfmt\fB);\fR
+\fBint slk_init(int \fIfmt\fP);
 .PP
-\fBint slk_set(int \fIlabnum\fB, const char *\fIlabel\fB, int \fIfmt\fB);\fR
-\fBint slk_wset(int \fIlabnum\fB, const wchar_t *\fIlabel\fB, int \fIfmt\fB);\fR
+\fBint slk_set(int \fIlabnum\fP, const char *\fIlabel\fP, int \fIfmt\fP);
+\fBint slk_wset(int \fIlabnum\fP, const wchar_t *\fIlabel\fP, int \fIfmt\fP);
 .PP
-\fBchar *slk_label(int \fIlabnum\fB);\fR
+\fBchar *slk_label(int \fIlabnum\fP);
 .PP
-\fBint slk_refresh(void);\fP
-\fBint slk_noutrefresh(void);\fP
-\fBint slk_clear(void);\fP
-\fBint slk_restore(void);\fP
-\fBint slk_touch(void);\fP
+\fBint slk_refresh(void);
+\fBint slk_noutrefresh(void);
+\fBint slk_clear(void);
+\fBint slk_restore(void);
+\fBint slk_touch(void);
 .PP
-\fBint slk_attron(const chtype \fIattrs\fB);\fR
-\fBint slk_attroff(const chtype \fIattrs\fB);\fR
-\fBint slk_attrset(const chtype \fIattrs\fB);\fR
-\fBint slk_attr_on(attr_t \fIattrs\fB, void* \fIopts\fB);\fR
-\fBint slk_attr_off(const attr_t \fIattrs\fB, void * \fIopts\fB);\fR
-\fBint slk_attr_set(const attr_t \fIattrs\fB, short \fIpair\fB, void* \fIopts\fB);\fR
-\fI/* extension */\fP
-\fBattr_t slk_attr(void);\fP
+\fBint slk_attron(const chtype \fIattrs\fP);
+\fBint slk_attroff(const chtype \fIattrs\fP);
+\fBint slk_attrset(const chtype \fIattrs\fP);
+\fBint slk_attr_on(attr_t \fIattrs\fP, void* \fIopts\fP);
+\fBint slk_attr_off(const attr_t \fIattrs\fP, void * \fIopts\fP);
+\fBint slk_attr_set(const attr_t \fIattrs\fP, short \fIpair\fP, void* \fIopts\fP);
+\fI/* extension */
+\fBattr_t slk_attr(void);
 .PP
-\fBint slk_color(short \fIpair\fB);\fR
-\fI/* extension */\fP
-\fBint extended_slk_color(int \fIpair\fB);\fR
+\fBint slk_color(short \fIpair\fP);
+\fI/* extension */
+\fBint extended_slk_color(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
 The \fBslk\fP* functions manipulate the set of soft function-key labels that exist on
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 4e9116d9b..193cff67f 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,184 +27,188 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.40 2023/09/30 23:13:32 tom Exp $
-.TH curs_sp_funcs 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_sp_funcs.3x,v 1.41 2023/10/07 21:33:35 tom Exp $
+.TH curs_sp_funcs 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%curs_sp_funcs\fP \-
 \fIcurses\fR screen-pointer extension
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
 .nf
+\fB#include <curses.h>
 .PP
-\fBint alloc_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint assume_default_colors_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint baudrate_sp(SCREEN* \fIsp\fB);\fR
-\fBint beep_sp(SCREEN* \fIsp\fB);\fR
-\fBbool can_change_color_sp(SCREEN* \fIsp\fB);\fR
-\fBint cbreak_sp(SCREEN* \fIsp\fB);\fR
-\fBint color_content_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short* \fIr\fB, short* \fIg\fB, short* \fIb\fB);\fR
-\fBint curs_set_sp(SCREEN* \fIsp\fB, int \fIvisibility\fR);\fR
-\fBint def_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint def_shell_mode_sp(SCREEN* \fIsp\fB);\fR
+\fBint alloc_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint assume_default_colors_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint baudrate_sp(SCREEN* \fIsp\fP);
+\fBint beep_sp(SCREEN* \fIsp\fP);
+\fBbool can_change_color_sp(SCREEN* \fIsp\fP);
+\fBint cbreak_sp(SCREEN* \fIsp\fP);
+\fBint color_content_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short* \fIr\fP, short* \fIg\fP, short* \fIb\fP);
+\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fR);
+\fBint def_prog_mode_sp(SCREEN* \fIsp\fP);
+\fBint def_shell_mode_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint define_key_sp(SCREEN* \fIsp\fB, const char * \fIdefinition\fB, int \fIkeycode\fB);\fR
-\fBint delay_output_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBint doupdate_sp(SCREEN* \fIsp\fB);\fR
-\fBint echo_sp(SCREEN* \fIsp\fB);\fR
-\fBint endwin_sp(SCREEN* \fIsp\fB);\fR
-\fBchar erasechar_sp(SCREEN* \fIsp\fB);\fR
-\fBint erasewchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-\fBint extended_color_content_sp(SCREEN * \fIsp\fB, int \fIcolor\fB, int * \fIr\fB, int * \fIg\fB, int * \fIb\fB);\fR
-\fBint extended_pair_content_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int * \fIfg\fB, int * \fIbg\fB);\fR
-\fBint extended_slk_color_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
+\fBint define_key_sp(SCREEN* \fIsp\fP, const char * \fIdefinition\fP, int \fIkeycode\fP);
+\fBint delay_output_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBint doupdate_sp(SCREEN* \fIsp\fP);
+\fBint echo_sp(SCREEN* \fIsp\fP);
+\fBint endwin_sp(SCREEN* \fIsp\fP);
+\fBchar erasechar_sp(SCREEN* \fIsp\fP);
+\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBint extended_color_content_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int * \fIr\fP, int * \fIg\fP, int * \fIb\fP);
+\fBint extended_pair_content_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
+\fBint extended_slk_color_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
 .PP
-\fBvoid filter_sp(SCREEN* \fIsp\fB);\fR
-\fBint find_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint flash_sp(SCREEN* \fIsp\fB);\fR
-\fBint flushinp_sp(SCREEN* \fIsp\fB);\fR
-\fBint free_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
-\fBint get_escdelay_sp(SCREEN* \fIsp\fB);\fR
-\fBint getmouse_sp(SCREEN* \fIsp\fB, MEVENT* \fBevent\fB);\fR
-\fBWINDOW* getwin_sp(SCREEN* \fIsp\fB, FILE* \fIfilep\fB);\fR
-\fBint halfdelay_sp(SCREEN* \fIsp\fB, int \fItenths\fB);\fR
-\fBbool has_colors_sp(SCREEN* \fIsp\fB);\fR
+\fBvoid filter_sp(SCREEN* \fIsp\fP);
+\fBint find_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint flash_sp(SCREEN* \fIsp\fP);
+\fBint flushinp_sp(SCREEN* \fIsp\fP);
+\fBint free_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
+\fBint get_escdelay_sp(SCREEN* \fIsp\fP);
+\fBint getmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+\fBWINDOW* getwin_sp(SCREEN* \fIsp\fP, FILE* \fIfilep\fP);
+\fBint halfdelay_sp(SCREEN* \fIsp\fP, int \fItenths\fP);
+\fBbool has_colors_sp(SCREEN* \fIsp\fP);
 .PP
-\fBbool has_ic_sp(SCREEN* \fIsp\fB);\fR
-\fBbool has_il_sp(SCREEN* \fIsp\fB);\fR
-\fBint has_key_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-\fBbool has_mouse_sp(SCREEN* \fIsp\fB);\fR
-\fBint init_color_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
-\fBint init_extended_color_sp(SCREEN* \fIsp\fB, int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
-\fBint init_extended_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint init_pair_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short \fIfg\fB, short \fIbg\fB);\fR
-\fBint intrflush_sp(SCREEN* \fIsp\fB, WINDOW* \fIwin\fB, bool \fIbf\fB);\fR
-\fBint is_cbreak_sp(SCREEN* \fIsp\fB);\fR
+\fBbool has_ic_sp(SCREEN* \fIsp\fP);
+\fBbool has_il_sp(SCREEN* \fIsp\fP);
+\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBbool has_mouse_sp(SCREEN* \fIsp\fP);
+\fBint init_color_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
+\fBint init_extended_color_sp(SCREEN* \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
+\fBint init_extended_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint init_pair_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short \fIbg\fP);
+\fBint intrflush_sp(SCREEN* \fIsp\fP, WINDOW* \fIwin\fP, bool \fIbf\fP);
+\fBint is_cbreak_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint is_echo_sp(SCREEN* \fIsp\fB);\fR
-\fBint is_nl_sp(SCREEN* \fIsp\fB);\fR
-\fBint is_raw_sp(SCREEN* \fIsp\fB);\fR
-\fBbool is_term_resized_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBbool isendwin_sp(SCREEN* \fIsp\fB);\fR
-\fBint key_defined_sp(SCREEN* \fIsp\fB, const char *\fIdefinition\fB);\fR
-\fBchar* keybound_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, int \fIcount\fB);\fR
-\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
-\fBint keyok_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, bool \fIenable\fB);\fR
-\fBchar killchar_sp(SCREEN* \fIsp\fB);\fR
+\fBint is_echo_sp(SCREEN* \fIsp\fP);
+\fBint is_nl_sp(SCREEN* \fIsp\fP);
+\fBint is_raw_sp(SCREEN* \fIsp\fP);
+\fBbool is_term_resized_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBbool isendwin_sp(SCREEN* \fIsp\fP);
+\fBint key_defined_sp(SCREEN* \fIsp\fP, const char *\fIdefinition\fP);
+\fBchar* keybound_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
+\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fP, int \fIc\fP);
+\fBint keyok_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
+\fBchar killchar_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint killwchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-\fBchar* longname_sp(SCREEN* \fIsp\fB);\fR
-\fBint mcprint_sp(SCREEN* \fIsp\fB, char *\fIdata\fB, int \fIlen\fB);\fR
-\fBint mouseinterval_sp(SCREEN* \fIsp\fB, int \fIerval\fB);\fR
-\fBmmask_t mousemask_sp(SCREEN* \fIsp\fB, mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
-\fBint mvcur_sp(SCREEN* \fIsp\fB, int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fB, int \fInewcol\fB);\fR
-\fBint napms_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBWINDOW* newpad_sp(SCREEN* \fIsp\fB, int \fInrows\fB, int \fIncols\fB);\fR
-\fBSCREEN* new_prescr(void);\fP
-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fB, const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
+\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBchar* longname_sp(SCREEN* \fIsp\fP);
+\fBint mcprint_sp(SCREEN* \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
+\fBint mouseinterval_sp(SCREEN* \fIsp\fP, int \fIerval\fP);
+\fBmmask_t mousemask_sp(SCREEN* \fIsp\fP, mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
+\fBint mvcur_sp(SCREEN* \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
+\fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
+\fBSCREEN* new_prescr(void);
+\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutfd\fP, FILE *\fIinfd\fP);
 .PP
-\fBWINDOW* newwin_sp(SCREEN* \fIsp\fB, int \fInlines\fB, int \fIncols\fB, int \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-\fBint nl_sp(SCREEN* \fIsp\fB);\fR
-\fBint nocbreak_sp(SCREEN* \fIsp\fB);\fR
-\fBint noecho_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid nofilter_sp(SCREEN* \fIsp\fB);\fR
-\fBint nonl_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid noqiflush_sp(SCREEN* \fIsp\fB);\fR
-\fBint noraw_sp(SCREEN* \fIsp\fB);\fR
-\fBint pair_content_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short* \fIfg\fB, short* \fIbg\fB);\fR
-\fBvoid qiflush_sp(SCREEN* \fIsp\fB);\fR
+\fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBint nl_sp(SCREEN* \fIsp\fP);
+\fBint nocbreak_sp(SCREEN* \fIsp\fP);
+\fBint noecho_sp(SCREEN* \fIsp\fP);
+\fBvoid nofilter_sp(SCREEN* \fIsp\fP);
+\fBint nonl_sp(SCREEN* \fIsp\fP);
+\fBvoid noqiflush_sp(SCREEN* \fIsp\fP);
+\fBint noraw_sp(SCREEN* \fIsp\fP);
+\fBint pair_content_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short* \fIfg\fP, short* \fIbg\fP);
+\fBvoid qiflush_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint raw_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fB);\fR
-\fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint reset_shell_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint resetty_sp(SCREEN* \fIsp\fB);\fR
-\fBint resize_term_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resizeterm_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint ripoffline_sp(SCREEN* \fIsp\fB, int \fIline\fB, int (*\fIinit\fB)(WINDOW* \fIwin\fB, int \fIfmt\fB));\fR
-\fBint savetty_sp(SCREEN* \fIsp\fB);\fR
-\fBint scr_init_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
+\fBint raw_sp(SCREEN* \fIsp\fP);
+\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fP);
+\fBint reset_prog_mode_sp(SCREEN* \fIsp\fP);
+\fBint reset_shell_mode_sp(SCREEN* \fIsp\fP);
+\fBint resetty_sp(SCREEN* \fIsp\fP);
+\fBint resize_term_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint resizeterm_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint ripoffline_sp(SCREEN* \fIsp\fP, int \fIline\fP, int (*\fIinit\fP)(WINDOW* \fIwin\fP, int \fIfmt\fP));
+\fBint savetty_sp(SCREEN* \fIsp\fP);
+\fBint scr_init_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
 .PP
-\fBint scr_restore_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-\fBint scr_set_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-\fBint set_escdelay_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBint set_tabsize_sp(SCREEN* \fIsp\fB, int \fIcols\fB);\fR
-\fBint slk_attrset_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBint slk_attr_set_sp(SCREEN* \fIsp\fB, const attr_t \fIattrs\fB, short \fIpair\fB, void*\fIopts\fB);\fR
-\fBint slk_attroff_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBint slk_attron_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBattr_t slk_attr_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_clear_sp(SCREEN* \fIsp\fB);\fR
+\fBint scr_restore_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+\fBint scr_set_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+\fBint set_escdelay_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBint set_tabsize_sp(SCREEN* \fIsp\fP, int \fIcols\fP);
+\fBint slk_attrset_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attr_set_sp(SCREEN* \fIsp\fP, const attr_t \fIattrs\fP, short \fIpair\fP, void*\fIopts\fP);
+\fBint slk_attroff_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attron_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBattr_t slk_attr_sp(SCREEN* \fIsp\fP);
+\fBint slk_clear_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint slk_color_sp(SCREEN* \fIsp\fB, short \fIpair\fB);\fR
-\fBint slk_init_sp(SCREEN* \fIsp\fB, int \fIfmt\fB);\fR
-\fBchar* slk_label_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB);\fR
-\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_refresh_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_restore_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_set_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB, const char * \fIlabel\fB, int \fIfmt\fB);\fR
-\fBint slk_touch_sp(SCREEN* \fIsp\fB);\fR
-\fBint start_color_sp(SCREEN* \fIsp\fB);\fR
-\fBattr_t term_attrs_sp(SCREEN* \fIsp\fB);\fR
+\fBint slk_color_sp(SCREEN* \fIsp\fP, short \fIpair\fP);
+\fBint slk_init_sp(SCREEN* \fIsp\fP, int \fIfmt\fP);
+\fBchar* slk_label_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP);
+\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fP);
+\fBint slk_refresh_sp(SCREEN* \fIsp\fP);
+\fBint slk_restore_sp(SCREEN* \fIsp\fP);
+\fBint slk_set_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP, const char * \fIlabel\fP, int \fIfmt\fP);
+\fBint slk_touch_sp(SCREEN* \fIsp\fP);
+\fBint start_color_sp(SCREEN* \fIsp\fP);
+\fBattr_t term_attrs_sp(SCREEN* \fIsp\fP);
 .PP
-\fBchtype termattrs_sp(SCREEN* \fIsp\fB);\fR
-\fBchar* termname_sp(SCREEN* \fIsp\fB);\fR
-\fBint typeahead_sp(SCREEN* \fIsp\fB, int \fIfd\fB);\fR
-\fBint unget_wch_sp(SCREEN* \fIsp\fB, const wchar_t \fIwch\fB);\fR
-\fBint ungetch_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-\fBint ungetmouse_sp(SCREEN* \fIsp\fB,MEVENT * \fBevent\fB);\fR
-\fBint use_default_colors_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid use_env_sp(SCREEN* \fIsp\fB, bool \fIbf\fB);\fR
-\fBint use_legacy_coding_sp(SCREEN* \fIsp\fB, int \fIlevel\fB);\fR
-\fBvoid use_tioctl_sp(SCREEN *\fIsp\fB, bool \fIbf\fB);\fR
+\fBchtype termattrs_sp(SCREEN* \fIsp\fP);
+\fBchar* termname_sp(SCREEN* \fIsp\fP);
+\fBint typeahead_sp(SCREEN* \fIsp\fP, int \fIfd\fP);
+\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwch\fP);
+\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBint ungetmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+\fBint use_default_colors_sp(SCREEN* \fIsp\fP);
+\fBvoid use_env_sp(SCREEN* \fIsp\fP, bool \fIbf\fP);
+\fBint use_legacy_coding_sp(SCREEN* \fIsp\fP, int \fIlevel\fP);
+\fBvoid use_tioctl_sp(SCREEN *\fIsp\fP, bool \fIbf\fP);
 .PP
-\fBint vid_attr_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB);\fR
-\fBint vid_puts_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-\fBint vidattr_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB);\fR
-\fBint vidputs_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fB, cchar_t *\fIch\fB);\fR
+\fBint vid_attr_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
+\fBint vid_puts_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBint vidattr_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP);
+\fBint vidputs_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIch\fP);
 .PP
-\fB#include <form.h>\fP
+\fB#include <form.h>
 .PP
-\fBFORM* new_form_sp(SCREEN* \fIsp\fB, FIELD **\fIfields\fB);\fR
+\fBFORM* new_form_sp(SCREEN* \fIsp\fP, FIELD **\fIfields\fP);
 .PP
-\fB#include <menu.h>\fP
+\fB#include <menu.h>
 .PP
-\fBMENU* new_menu_sp(SCREEN* \fIsp\fB, ITEM **\fIitems\fB);\fR
+\fBMENU* new_menu_sp(SCREEN* \fIsp\fP, ITEM **\fIitems\fP);
 .PP
-\fB#include <panel.h>\fP
+\fB#include <panel.h>
 .PP
-\fBPANEL* ceiling_panel(SCREEN* \fIsp\fB);\fR
-.br
-\fBPANEL* ground_panel(SCREEN* \fIsp\fB);\fR
-.br
-\fBvoid update_panels_sp(SCREEN* \fIsp\fB);\fR
+\fBPANEL* ceiling_panel(SCREEN* \fIsp\fP);
+\fBPANEL* ground_panel(SCREEN* \fIsp\fP);
+\fBvoid update_panels_sp(SCREEN* \fIsp\fP);
 .PP
-\fB#include <term.h>\fP
+\fB#include <term.h>
 .PP
-\fBint del_curterm_sp(SCREEN* \fIsp\fB, TERMINAL *\fIoterm\fB);\fR
-\fBint putp_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB);\fR
-\fBint restartterm_sp(SCREEN* \fIsp\fB, NCURSES_CONST char*\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
-\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fB, TERMINAL*\fInterm\fB);\fR
-\fBint tgetent_sp(SCREEN* \fIsp\fB, char *\fIbp\fB, const char *\fIname\fB);\fR
-\fBint tgetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBint tgetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBchar* tgetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, char **\fIarea\fB);\fR
-\fBchar* tgoto_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, int \fIcol\fB, int \fIrow\fB);\fR
-\fBint tigetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+\fBint del_curterm_sp(SCREEN* \fIsp\fP, TERMINAL *\fIoterm\fP);
+\fBint putp_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP);
+\fBint restartterm_sp(SCREEN* \fIsp\fP, NCURSES_CONST char*\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fP, TERMINAL*\fInterm\fP);
+\fBint tgetent_sp(SCREEN* \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
+\fBint tgetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBint tgetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBchar* tgetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, char **\fIarea\fP);
+\fBchar* tgoto_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, int \fIrow\fP);
+\fBint tigetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
 .PP
-\fBint tigetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBchar* tigetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fR/* may instead use 9 long parameters */\fR
-\fBchar* tparm_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, ...);\fR
-\fBint tputs_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, int \fIaffcnt\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
+\fBint tigetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBchar* tigetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fI/* may instead use 9 long parameters */
+\fBchar* tparm_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, ...);
+\fBint tputs_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
 .PP
-\fB#include <unctrl.h>\fP
+\fB#include <unctrl.h>
 .PP
-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fB, chtype \fIc\fB);\fR
+\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIc\fP);
 .fi
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index f8fe7c064..8df5e357c 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH curs_termattrs 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH curs_termattrs 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -43,30 +43,21 @@
 \fB\%termname\fP \-
 \fIcurses\fR environment query routines
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint baudrate(void);\fP
-.br
-\fBchar erasechar(void);\fP
-.br
-\fBint erasewchar(wchar_t *\fIch\fB);\fR
-.br
-\fBbool has_ic(void);\fP
-.br
-\fBbool has_il(void);\fP
-.br
-\fBchar killchar(void);\fP
-.br
-\fBint killwchar(wchar_t *\fIch\fB);\fR
-.br
-\fBchar *longname(void);\fP
-.br
-\fBattr_t term_attrs(void);\fP
-.br
-\fBchtype termattrs(void);\fP
-.br
-\fBchar *termname(void);\fP
-.br
+\fBint baudrate(void);
+\fBchar erasechar(void);
+\fBint erasewchar(wchar_t *\fIch\fP);
+\fBbool has_ic(void);
+\fBbool has_il(void);
+\fBchar killchar(void);
+\fBint killwchar(wchar_t *\fIch\fP);
+\fBchar *longname(void);
+\fBattr_t term_attrs(void);
+\fBchtype termattrs(void);
+\fBchar *termname(void);
+.fi
 .SH DESCRIPTION
 .SS baudrate
 The \fBbaudrate\fP routine returns the output speed of the terminal.
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 88bff07d1..4d7fd6a94 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,16 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.68 2023/09/30 21:38:11 tom Exp $
-.TH curs_termcap 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_termcap.3x,v 1.69 2023/10/07 21:19:07 tom Exp $
+.TH curs_termcap 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .SH NAME
 \fB\%PC\fP,
@@ -51,29 +59,22 @@
 \fB\%tputs\fP \-
 \fIcurses\fR emulation of \fItermcap\fR
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.br
-\fB#include <term.h>\fP
-.sp
-\fBextern char PC;\fP
-.br
-\fBextern char * UP;\fP
-.br
-\fBextern char * BC;\fP
-.br
-\fBextern @NCURSES_OSPEED@ ospeed;\fP
-.sp
-\fBint tgetent(char *\fIbp\fB, const char *\fIname\fB);\fR
-.br
-\fBint tgetflag(const char *\fIid\fB);\fR
-.br
-\fBint tgetnum(const char *\fIid\fB);\fR
-.br
-\fBchar *tgetstr(const char *\fIid\fB, char **\fIarea\fB);\fR
-.br
-\fBchar *tgoto(const char *\fIcap\fB, int \fIcol\fB, int \fIrow\fB);\fR
-.br
-\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
+.nf
+\fB#include <curses.h>
+\fB#include <term.h>
+.PP
+\fBextern char PC;
+\fBextern char * UP;
+\fBextern char * BC;
+\fBextern @NCURSES_OSPEED@ ospeed;
+.PP
+\fBint tgetent(char *\fIbp\fP, const char *\fIname\fP);
+\fBint tgetflag(const char *\fIid\fP);
+\fBint tgetnum(const char *\fIid\fP);
+\fBchar *tgetstr(const char *\fIid\fP, char **\fIarea\fP);
+\fBchar *tgoto(const char *\fIcap\fP, int \fIcol\fP, int \fIrow\fP);
+\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+.fi
 .SH DESCRIPTION
 These routines are included as a conversion aid for programs that use
 the \fItermcap\fP library.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 978ec5eac..0ef5a4956 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,16 +28,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.111 2023/09/30 21:38:11 tom Exp $
-.TH curs_terminfo 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_terminfo.3x,v 1.112 2023/10/07 21:19:07 tom Exp $
+.TH curs_terminfo 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .SH NAME
 \fB\%del_curterm\fP,
@@ -61,49 +69,49 @@
 \fIcurses\fR interfaces to \fIterminfo\fR database
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-\fB#include <term.h>\fP
+\fB#include <curses.h>
+\fB#include <term.h>
 .PP
-\fBTERMINAL *cur_term;\fP
+\fBTERMINAL *cur_term;
 .PP
-\fBconst char * const boolnames[];\fP
-\fBconst char * const boolcodes[];\fP
-\fBconst char * const boolfnames[];\fP
-\fBconst char * const numnames[];\fP
-\fBconst char * const numcodes[];\fP
-\fBconst char * const numfnames[];\fP
-\fBconst char * const strnames[];\fP
-\fBconst char * const strcodes[];\fP
-\fBconst char * const strfnames[];\fP
+\fBconst char * const boolnames[];
+\fBconst char * const boolcodes[];
+\fBconst char * const boolfnames[];
+\fBconst char * const numnames[];
+\fBconst char * const numcodes[];
+\fBconst char * const numfnames[];
+\fBconst char * const strnames[];
+\fBconst char * const strcodes[];
+\fBconst char * const strfnames[];
 .PP
-\fBint setupterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
-\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fB);\fR
-\fBint del_curterm(TERMINAL *\fIoterm\fB);\fR
-\fBint restartterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
+\fBint setupterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fP);
+\fBint del_curterm(TERMINAL *\fIoterm\fP);
+\fBint restartterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
 .PP
-\fBchar *tparm(const char *\fIstr\fB, ...);\fR
-	\fIor\fP
-\fBchar *tparm(const char *\fIstr\fB, long \fIp1 ... \fBlong \fIp9\fB);\fR
+\fBchar *tparm(const char *\fIstr\fP, ...);
+	\fIor
+\fBchar *tparm(const char *\fIstr\fP, long \fIp1 ... \fPlong \fIp9\fP);
 .PP
-\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
-\fBint putp(const char *\fIstr\fB);\fR
+\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+\fBint putp(const char *\fIstr\fP);
 .PP
-\fBint vidputs(chtype \fIattrs\fB, int (*\fIputc\fB)(int));\fR
-\fBint vidattr(chtype \fIattrs\fB);\fR
-\fBint vid_puts(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB, int (*\fIputc\fB)(int));\fR
-\fBint vid_attr(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
+\fBint vidputs(chtype \fIattrs\fP, int (*\fIputc\fP)(int));
+\fBint vidattr(chtype \fIattrs\fP);
+\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP, int (*\fIputc\fP)(int));
+\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
 .PP
-\fBint mvcur(int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fR, int \fInewcol\fB);\fR
+\fBint mvcur(int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
 .PP
-\fBint tigetflag(const char *\fIcapname\fB);\fR
-\fBint tigetnum(const char *\fIcapname\fB);\fR
-\fBchar *tigetstr(const char *\fIcapname\fB);\fR
+\fBint tigetflag(const char *\fIcapname\fP);
+\fBint tigetnum(const char *\fIcapname\fP);
+\fBchar *tigetstr(const char *\fIcapname\fP);
 .PP
-\fBchar *tiparm(const char *\fIstr\fB, ...);\fR
+\fBchar *tiparm(const char *\fIstr\fP, ...);
 .PP
-\fI/* extensions */\fP
-\fBchar *tiparm_s(int \fIexpected\fB, int \fImask\fB, const char *\fIstr\fB, ...);\fR
-\fBint tiscan_s(int *\fIexpected\fB, int *\fImask\fB, const char *\fIstr\fB);\fR
+\fI/* extensions */
+\fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, ...);
+\fBint tiscan_s(int *\fIexpected\fP, int *\fImask\fP, const char *\fIstr\fP);
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
@@ -283,7 +291,7 @@ Padding information is ignored by \fBtparm\fP;
 it is interpreted by \fBtputs\fP.
 .bP
 The capability string is null-terminated.
-Use \*(``\\200\*('' where an ASCII NUL is needed in the output.
+Use \*(``\e200\*('' where an ASCII NUL is needed in the output.
 .PP
 \fBtiparm\fP is a newer form of \fBtparm\fP which uses \fI<stdarg.h>\fP
 rather than a fixed-parameter list.
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 7247a5272..9df26ba25 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.46 2023/10/01 09:45:30 tom Exp $
-.TH curs_threads 3X 2023-10-01 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_threads.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
+.TH curs_threads 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -49,18 +56,18 @@
 \fIcurses\fR support for multi-threaded applications
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fI/* data types */\fP
-\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fP
-\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fP
+\fI/* data types */
+\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
+\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
 .PP
-\fBint get_escdelay(void);\fP
-\fBint set_escdelay(int \fIms\fB);\fR
-\fBint set_tabsize(int \fIcols\fB);\fR
+\fBint get_escdelay(void);
+\fBint set_escdelay(int \fIms\fP);
+\fBint set_tabsize(int \fIcols\fP);
 .PP
-\fBint use_screen(SCREEN *\fIscr\fB, NCURSES_SCREEN_CB \fIfunc\fB, void *\fIdata\fB);\fR
-\fBint use_window(WINDOW *\fIwin\fB, NCURSES_WINDOW_CB \fIfunc\fB, void *\fIdata\fB);\fR
+\fBint use_screen(SCREEN *\fIscr\fP, NCURSES_SCREEN_CB \fIfunc\fP, void *\fIdata\fP);
+\fBint use_window(WINDOW *\fIwin\fP, NCURSES_WINDOW_CB \fIfunc\fP, void *\fIdata\fP);
 .fi
 .SH DESCRIPTION
 The \fIncurses\fP library can be configured to support multi-threaded
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 72bcb6aae..8fc44abe6 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.39 2023/09/23 22:49:51 tom Exp $
-.TH curs_touch 3X 2023-09-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_touch.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_touch 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -39,17 +39,17 @@
 control terminal output refresh in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint touchline(WINDOW *\fIwin\fB, int \fIstart\fB, int \fIcount\fB);\fR
+\fBint touchline(WINDOW *\fIwin\fP, int \fIstart\fP, int \fIcount\fP);
 .PP
-\fBint touchwin(WINDOW *\fIwin\fB);\fR
-\fBint wtouchln(WINDOW *\fIwin\fB, int \fIy\fB, int \fIn\fB, int \fIchanged\fB);\fR
+\fBint touchwin(WINDOW *\fIwin\fP);
+\fBint wtouchln(WINDOW *\fIwin\fP, int \fIy\fP, int \fIn\fP, int \fIchanged\fP);
 .PP
-\fBint untouchwin(WINDOW *\fIwin\fB);\fR
+\fBint untouchwin(WINDOW *\fIwin\fP);
 .PP
-\fBbool is_linetouched(WINDOW *\fIwin\fB, int \fIline\fB);\fR
-\fBbool is_wintouched(WINDOW *\fIwin\fB);\fR
+\fBbool is_linetouched(WINDOW *\fIwin\fP, int \fIline\fP);
+\fBbool is_wintouched(WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
 The \fB\%touchwin\fP and \fB\%touchline\fP routines throw away all
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index f793267a8..6233edb6c 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH curs_trace 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_trace.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_trace 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -54,26 +61,26 @@
 \fIcurses\fR debugging routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBunsigned curses_trace(const unsigned \fIparam\fB);\fR
+\fBunsigned curses_trace(const unsigned \fIparam\fP);
 .PP
-\fBvoid _tracef(const char *\fIformat\fB, ...);\fR
+\fBvoid _tracef(const char *\fIformat\fP, ...);
 .PP
-\fBchar *_traceattr(attr_t \fIattr\fB);\fR
-\fBchar *_traceattr2(int \fIbuffer\fB, chtype \fIch\fB);\fR
-\fBchar *_tracecchar_t(const cchar_t *\fIstring\fB);\fR
-\fBchar *_tracecchar_t2(int \fIbuffer\fB, const cchar_t *\fIstring\fB);\fR
-\fBchar *_tracechar(int \fIch\fB);\fR
-\fBchar *_tracechtype(chtype \fIch\fB);\fR
-\fBchar *_tracechtype2(int \fIbuffer\fB, chtype \fIch\fB);\fR
+\fBchar *_traceattr(attr_t \fIattr\fP);
+\fBchar *_traceattr2(int \fIbuffer\fP, chtype \fIch\fP);
+\fBchar *_tracecchar_t(const cchar_t *\fIstring\fP);
+\fBchar *_tracecchar_t2(int \fIbuffer\fP, const cchar_t *\fIstring\fP);
+\fBchar *_tracechar(int \fIch\fP);
+\fBchar *_tracechtype(chtype \fIch\fP);
+\fBchar *_tracechtype2(int \fIbuffer\fP, chtype \fIch\fP);
 .PP
-\fBvoid _tracedump(const char *\fIlabel\fB, WINDOW *\fIwin\fB);\fR
-\fBchar *_nc_tracebits(void);\fP
-\fBchar *_tracemouse(const MEVENT *\fIevent\fB);\fR
+\fBvoid _tracedump(const char *\fIlabel\fP, WINDOW *\fIwin\fP);
+\fBchar *_nc_tracebits(void);
+\fBchar *_tracemouse(const MEVENT *\fIevent\fP);
 .PP
-/* deprecated */
-\fBvoid trace(const unsigned int \fIparam\fB);\fR
+\fI/* deprecated */\fP
+\fBvoid trace(const unsigned int \fIparam\fP);
 .fi
 .SH DESCRIPTION
 The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
diff --git a/man/curs_util.3x b/man/curs_util.3x
index be7f4d6c4..dfa78951e 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.85 2023/09/30 21:38:11 tom Exp $
-.TH curs_util 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_util.3x,v 1.86 2023/10/07 21:19:07 tom Exp $
+.TH curs_util 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -54,27 +61,27 @@
 miscellaneous \fIcurses\fR utility routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBconst char *unctrl(chtype \fIc\fB);\fR
-\fBwchar_t *wunctrl(cchar_t *\fIc\fB);\fR
+\fBconst char *unctrl(chtype \fIc\fP);
+\fBwchar_t *wunctrl(cchar_t *\fIc\fP);
 .PP
-\fBconst char *keyname(int \fIc\fB);\fR
-\fBconst char *key_name(wchar_t \fIw\fB);\fR
+\fBconst char *keyname(int \fIc\fP);
+\fBconst char *key_name(wchar_t \fIw\fP);
 .PP
-\fBvoid filter(void);\fP
+\fBvoid filter(void);
 .PP
-\fBvoid use_env(bool \fIf\fB);\fR
+\fBvoid use_env(bool \fIf\fP);
 .PP
-\fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
-\fBWINDOW *getwin(FILE *\fIfilep\fB);\fR
+\fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP);
+\fBWINDOW *getwin(FILE *\fIfilep\fP);
 .PP
-\fBint delay_output(int \fIms\fB);\fR
-\fBint flushinp(void);\fP
+\fBint delay_output(int \fIms\fP);
+\fBint flushinp(void);
 .PP
-\fI/* extensions */\fP
-\fBvoid nofilter(void);\fP
-\fBvoid use_tioctl(bool \fIf\fB);\fR
+\fI/* extensions */
+\fBvoid nofilter(void);
+\fBvoid use_tioctl(bool \fIf\fP);
 .fi
 .SH DESCRIPTION
 .SS unctrl
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 5ed8c3e28..f75686101 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,18 +27,27 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.31 2023/10/01 22:36:35 tom Exp $
-.TH curs_variables 3X 2023-10-01 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: curs_variables.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH curs_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .ie \n(.g .ds : \:
 .el       .ds : \" empty
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .SH NAME
 \fI\%bool\fP,
@@ -62,32 +71,32 @@
 \fIcurses\fR data types, constants, and global variables
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fI/* data types */\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP bool;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;\fP
+\fI/* data types */
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP bool;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;
 .PP
-\fI/* constants */\fP
-\fBconst bool TRUE;\fP
-\fBconst bool FALSE;\fP
+\fI/* constants */
+\fBconst bool TRUE;
+\fBconst bool FALSE;
 .PP
-\fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;\fP
-\fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;\fP
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;
 .PP
-\fI/* variables */\fP
-\fBint COLOR_PAIRS;\fP
-\fBint COLORS;\fP
-\fBint COLS;\fP
-\fBint ESCDELAY;\fP
-\fBint LINES;\fP
-\fBint TABSIZE;\fP
-\fBWINDOW * curscr;\fP
-\fBWINDOW * newscr;\fP
-\fBWINDOW * stdscr;\fP
+\fI/* variables */
+\fBint COLOR_PAIRS;
+\fBint COLORS;
+\fBint COLS;
+\fBint ESCDELAY;
+\fBint LINES;
+\fBint TABSIZE;
+\fBWINDOW * curscr;
+\fBWINDOW * newscr;
+\fBWINDOW * stdscr;
 .fi
 .SH DESCRIPTION
 This page summarizes data types,
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 91af66bdd..39cbddf12 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.39 2023/09/30 23:13:32 tom Exp $
-.TH curs_window 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH curs_window 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -47,35 +47,27 @@
 \fB\%wsyncdown\fP \-
 create and manipulate \fIcurses\fR windows
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBWINDOW *newwin(\fP
+.nf
+\fB#include <curses.h>
+.PP
+\fBWINDOW *newwin(
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint delwin(WINDOW *\fIwin\fB);\fR
-.br
 \fBint mvwin(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 \fBWINDOW *subwin(WINDOW *\fIorig\fB,\fR
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBWINDOW *derwin(WINDOW *\fIorig\fB,\fR
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint mvderwin(WINDOW *\fIwin\fB, int \fIpar_y\fB, int \fIpar_x\fB);\fR
-.br
 \fBWINDOW *dupwin(WINDOW *\fIwin\fB);\fR
-.br
 \fBvoid wsyncup(WINDOW *\fIwin\fB);\fR
-.br
 \fBint syncok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
-.br
 \fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS newwin
 Calling \fBnewwin\fP creates and returns a pointer to a new window with the
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 42a678366..3c2a115e0 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,22 +29,29 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.44 2023/09/30 21:38:11 tom Exp $
-.TH default_colors 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: default_colors.3x,v 1.45 2023/10/07 21:19:07 tom Exp $
+.TH default_colors 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%use_default_colors\fP,
 \fB\%assume_default_colors\fP \-
 use terminal's default colors
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint use_default_colors(void);\fP
-.br
-\fBint assume_default_colors(int \fIfg\fB, int \fIbg\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint use_default_colors(void);
+\fBint assume_default_colors(int \fIfg\fP, int \fIbg\fP);
+.fi
 .SH DESCRIPTION
 The \fBuse_default_colors\fP and \fBassume_default_colors\fP
 functions are extensions to the curses library.
diff --git a/man/define_key.3x b/man/define_key.3x
index b9cf5d899..fcf8bee2b 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.36 2023/09/30 21:26:43 tom Exp $
-.TH define_key 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
+.TH define_key 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint define_key(const char *\fIdefinition\fB, int \fIkeycode\fB);\fR
+\fBint define_key(const char *\fIdefinition\fP, int \fIkeycode\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to define keycodes with their corresponding control
diff --git a/man/form.3x b/man/form.3x
index 6e7217b7e..e40e313b6 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.47 2023/09/30 21:38:11 tom Exp $
-.TH form 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
+.TH form 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,7 +49,9 @@
 \fBform\fP \-
 curses extension for programming forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
+.nf
+\fB#include <form.h>
+.fi
 .SH DESCRIPTION
 The \fBform\fP library provides terminal-independent facilities for composing
 form screens on character-cell terminals.
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index a5f7e7521..3e2e6b2df 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,15 +28,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
-.TH form_cursor 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
+.TH form_cursor 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \-
 position a form window cursor
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint pos_form_cursor(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint pos_form_cursor(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpos_form_cursor\fP restores the cursor to the position required
 for the forms driver to continue processing requests.
diff --git a/man/form_data.3x b/man/form_data.3x
index de695c5d6..7c113223b 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,18 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH form_data 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH form_data 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \-
 test for off-screen data in given forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBbool data_ahead(const FORM *\fIform\fB);\fR
-.br
-\fBbool data_behind(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBbool data_ahead(const FORM *\fIform\fP);
+\fBbool data_behind(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBdata_ahead\fP tests whether there is off-screen data
 ahead in the given form.
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 80d7a1567..14e7828af 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.50 2023/09/30 21:38:11 tom Exp $
-.TH form_driver 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.51 2023/10/07 21:19:07 tom Exp $
+.TH form_driver 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -39,11 +39,12 @@
 \fBform_driver_w\fP \-
 command-processing loop of the form system
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint form_driver(FORM *\fIform\fB, int \fIc\fB);\fR
-.br
-\fBint form_driver_w(FORM *\fIform\fB, int \fIc\fB, wchar_t \fIwch\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint form_driver(FORM *\fIform\fP, int \fIc\fP);
+\fBint form_driver_w(FORM *\fIform\fP, int \fIc\fP, wchar_t \fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS form_driver
 Once a form has been posted (displayed), you should funnel input events to it
diff --git a/man/form_field.3x b/man/form_field.3x
index cd0e65000..036b0ad48 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,21 +28,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH form_field 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH form_field 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_fields(FORM *\fIform\fB, FIELD **\fIfields\fB);\fR
-.br
-\fBFIELD **form_fields(const FORM *\fIform\fB);\fR
-.br
-\fBint field_count(const FORM *\fIform\fB);\fR
-.br
-\fBint move_field(FIELD *\fIfield\fB, int \fIfrow\fB, int \fIfcol\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_fields(FORM *\fIform\fP, FIELD **\fIfields\fP);
+\fBFIELD **form_fields(const FORM *\fIform\fP);
+\fBint field_count(const FORM *\fIform\fP);
+\fBint move_field(FIELD *\fIfield\fP, int \fIfrow\fP, int \fIfcol\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_form_fields\fP changes the field pointer array of
 the given \fIform\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index b8718dbce..0b2040519 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,29 +28,34 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH form_field_attributes 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_field_attributes.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH form_field_attributes 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBform_field_attributes\fP \-
 color and attribute control for form fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_fore(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype field_fore(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_field_back(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype field_back(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_field_pad(FIELD *\fIfield\fB, int \fIpad\fB);\fR
-.br
-\fBint field_pad(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_fore(FIELD *\fIfield\fP, chtype \fIattr\fP);
+\fBchtype field_fore(const FIELD *\fIfield\fP);
+.PP
+\fBint set_field_back(FIELD *\fIfield\fP, chtype \fIattr\fP);
+\fBchtype field_back(const FIELD *\fIfield\fP);
+.PP
+\fBint set_field_pad(FIELD *\fIfield\fP, int \fIpad\fP);
+\fBint field_pad(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_fore\fP sets the foreground attribute of
 \fIfield\fP. This is the highlight used to display the field contents.  The
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 37c0d3076..cba17f754 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
@@ -28,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH form_field_buffer 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_field_buffer.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH form_field_buffer 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,17 +48,17 @@
 \fBform_field_buffer\fP \-
 field buffer control
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_buffer(FIELD *\fIfield\fB, int \fIbuf\fB, const char *\fIvalue\fB);\fR
-.br
-\fBchar *field_buffer(const FIELD *\fIfield\fB, int \fIbuffer\fB);\fR
-.sp
-\fBint set_field_status(FIELD *\fIfield\fB, bool \fIstatus\fB);\fR
-.br
-\fBbool field_status(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_max_field(FIELD *\fIfield\fB, int \fImax\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_buffer(FIELD *\fIfield\fP, int \fIbuf\fP, const char *\fIvalue\fP);
+\fBchar *field_buffer(const FIELD *\fIfield\fP, int \fIbuffer\fP);
+.PP
+\fBint set_field_status(FIELD *\fIfield\fP, bool \fIstatus\fP);
+\fBbool field_status(const FIELD *\fIfield\fP);
+.PP
+\fBint set_max_field(FIELD *\fIfield\fP, int \fImax\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_buffer\fP sets the numbered buffer of the given field
 to contain a given string:
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index cd561779d..47ddbd480 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,25 +27,31 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH form_field_info 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_field_info.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH form_field_info 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBdynamic_field_info\fP,
 \fBfield_info\fP \-
 retrieve field characteristics
 .SH SYNOPSIS
 .nf
-\fB#include <form.h>\fP
-.sp
-\fBint field_info(const FIELD *\fIfield\fB,\fR
+\fB#include <form.h>
+.PP
+\fBint field_info(const FIELD *\fIfield\fP,
                \fBint *\fIrows\fB, int *\fIcols\fB,\fR
                \fBint *\fIfrow\fB, int *\fIfcol\fB,\fR
                \fBint *\fInrow\fB, int *\fInbuf\fB);\fR
-.sp
+.PP
 \fBint dynamic_field_info(const FIELD *\fIfield\fB,\fR
                        \fBint *\fIrows\fB, int *\fIcols\fB, int *\fImax\fB);\fR
 .fi
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index cf9c51e85..a9445f83b 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,22 +27,29 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH form_field_just 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_field_just.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH form_field_just 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_field_just\fP,
 \fBfield_just\fP \-
 retrieve field characteristics
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_just(FIELD *\fIfield\fB, int \fIjustification\fB);\fR
-.br
-\fBint field_just(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_just(FIELD *\fIfield\fP, int \fIjustification\fP);
+\fBint field_just(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_just\fP sets the justification attribute of
 a field; \fBfield_just\fP returns a field's justification attribute.
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index ce1b5d865..cf603edf3 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.36 2023/09/30 21:38:11 tom Exp $
-.TH form_field_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
+.TH form_field_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
@@ -37,17 +36,16 @@
 \fBfree_field\fP \-
 create and destroy form fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFIELD *new_field(int \fIheight\fB, int \fIwidth\fB,\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBFIELD *new_field(int \fIheight\fP, int \fIwidth\fP,
                  \fBint \fItoprow\fB, int \fIleftcol\fB,\fR
                  \fBint \fIoffscreen\fB, int \fInbuffers\fB);\fR
-.br
 \fBFIELD *dup_field(FIELD *\fIfield\fB, int \fItoprow\fB, int \fIleftcol\fB);\fR
-.br
 \fBFIELD *link_field(FIELD *\fIfield\fB, int \fItoprow\fB, int \fIleftcol\fB);\fR
-.br
 \fBint free_field(FIELD *\fIfield\fB);\fR
+.fi
 .SH DESCRIPTION
 The function \fBnew_field\fP allocates a new field and initializes it from the
 parameters given: height, width, row of upper-left corner, column of upper-left
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index f303683f1..34e2de932 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH form_field_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH form_field_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
@@ -37,15 +36,15 @@
 \fBfield_opts\fP \-
 set and get field options
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_opts(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBField_Options field_opts(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint field_opts_on(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBint field_opts_off(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_opts(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+\fBField_Options field_opts(const FIELD *\fIfield\fP);
+.PP
+\fBint field_opts_on(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+\fBint field_opts_off(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_opts\fP sets all the given field's option bits (field
 option bits may be logically-OR'ed together).
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index c13beaa24..a94215fe1 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
-.TH form_field_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
+.TH form_field_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \-
 associate application data with a form field
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_userptr(FIELD *\fIfield\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *field_userptr(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_userptr(FIELD *\fIfield\fP, void *\fIuserptr\fP);
+\fBvoid *field_userptr(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 Every form field has a field that can be used to hold application-specific data
 (that is, the form-driver code leaves it alone).
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 005a03f4c..6b2bddaea 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.47 2023/09/30 21:38:11 tom Exp $
-.TH form_field_validation 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_field_validation.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
+.TH form_field_validation 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -41,29 +48,22 @@
 \fBform_field_validation\fP \-
 data type validation for fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBvoid *field_arg(const FIELD *\fIfield\fB);\fR
-.br
-\fBFIELDTYPE *field_type(const FIELD *\fIfield\fB);\fR
-.br
-\fBint set_field_type(FIELD *\fIfield\fB, FIELDTYPE *\fItype\fB, ...);\fR
-.sp
-/* predefined field types */
-.br
-\fBFIELDTYPE *TYPE_ALNUM;\fP
-.br
-\fBFIELDTYPE *TYPE_ALPHA;\fP
-.br
-\fBFIELDTYPE *TYPE_ENUM;\fP
-.br
-\fBFIELDTYPE *TYPE_INTEGER;\fP
-.br
-\fBFIELDTYPE *TYPE_NUMERIC;\fP
-.br
-\fBFIELDTYPE *TYPE_REGEXP;\fP
-.br
-\fBFIELDTYPE *TYPE_IPV4;\fP
+.nf
+\fB#include <form.h>
+.PP
+\fBvoid *field_arg(const FIELD *\fIfield\fP);
+\fBFIELDTYPE *field_type(const FIELD *\fIfield\fP);
+\fBint set_field_type(FIELD *\fIfield\fP, FIELDTYPE *\fItype\fP, ...);
+.PP
+\fI/* predefined field types */\fP
+\fBFIELDTYPE *TYPE_ALNUM;
+\fBFIELDTYPE *TYPE_ALPHA;
+\fBFIELDTYPE *TYPE_ENUM;
+\fBFIELDTYPE *TYPE_INTEGER;
+\fBFIELDTYPE *TYPE_NUMERIC;
+\fBFIELDTYPE *TYPE_REGEXP;
+\fBFIELDTYPE *TYPE_IPV4;
+.fi
 .SH DESCRIPTION
 By default, no validation is done on form fields.
 You can associate a form with with a \fIfield type\fP,
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 87febba76..376d0f336 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.41 2023/09/30 21:38:11 tom Exp $
-.TH form_fieldtype 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.42 2023/10/07 21:19:07 tom Exp $
+.TH form_fieldtype 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -38,27 +37,27 @@
 \fBform_fieldtype\fP \-
 define validation-field types
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFIELDTYPE *new_fieldtype(\fP
+.nf
+\fB#include <form.h>
+.PP
+\fBFIELDTYPE *new_fieldtype(
     \fBbool (* const \fIfield_check\fB)(FIELD *, const void *),\fR
     \fBbool (* const \fIchar_check\fB)(int, const void *));\fR
-.br
 \fBint free_fieldtype(FIELDTYPE *\fIfieldtype\fB);\fR
-.sp
+.PP
 \fBint set_fieldtype_arg(\fP
     \fBFIELDTYPE *\fIfieldtype\fB,\fR
     \fBvoid *(* const \fImake_arg\fB)(va_list *),\fR
     \fBvoid *(* const \fIcopy_arg\fB)(const void *),\fR
     \fBvoid  (* const \fIfree_arg\fB)(void *));\fR
-.br
 \fBint set_fieldtype_choice(\fP
     \fBFIELDTYPE *\fIfieldtype\fB,\fR
     \fBbool (* const \fInext_choice\fB)(FIELD *, const void *),\fR
     \fBbool (* const \fIprev_choice\fB)(FIELD *, const void *));\fR
-.sp
+.PP
 \fBFIELDTYPE *link_fieldtype(FIELDTYPE *\fItype1\fB,\fR
                           \fBFIELDTYPE *\fItype2\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS new_fieldtype
 The function \fBnew_fieldtype\fP creates a new field type usable for data
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 07c86662e..37b05eb68 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
@@ -28,29 +27,27 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
-.TH form_hook 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH form_hook 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook field_init(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_field_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook field_term(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook form_init(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook form_term(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_init(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook field_init(const FORM *\fIform\fP);
+.PP
+\fBint set_field_term(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook field_term(const FORM *\fIform\fP);
+.PP
+\fBint set_form_init(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook form_init(const FORM *\fIform\fP);
+.PP
+\fBint set_form_term(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook form_term(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBform_driver\fP.
diff --git a/man/form_new.3x b/man/form_new.3x
index da72e8f69..cc15c5320 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH form_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH form_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \-
 create and destroy forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFORM *new_form(FIELD **\fIfields\fB);\fR
-.br
-\fBint free_form(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBFORM *new_form(FIELD **\fIfields\fP);
+\fBint free_form(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_form\fP creates a new form connected to a specified field
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 096224f6d..1a60ac4a1 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,22 +27,29 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH form_new_page 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: form_new_page.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH form_new_page 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_new_page\fP,
 \fBnew_page\fP \-
 form pagination functions
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_new_page(FIELD *\fIfield\fB, bool \fInew_page_flag\fB);\fR
-.br
-\fBbool new_page(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_new_page(FIELD *\fIfield\fP, bool \fInew_page_flag\fP);
+\fBbool new_page(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_new_page\fP sets or resets a flag marking the given field
 as the beginning of a new page on its form.
diff --git a/man/form_opts.3x b/man/form_opts.3x
index d413b5b49..a662e71b8 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH form_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH form_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
@@ -37,15 +36,15 @@
 \fBform_opts\fP \-
 set and get form options
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_opts(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBField_Options form_opts(const FORM *\fIform\fB);\fR
-.sp
-\fBint form_opts_on(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBint form_opts_off(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_opts(FORM *\fIform\fP, Field_Options \fIopts\fP);
+\fBField_Options form_opts(const FORM *\fIform\fP);
+.PP
+\fBint form_opts_on(FORM *\fIform\fP, Field_Options \fIopts\fP);
+\fBint form_opts_off(FORM *\fIform\fP, Field_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_form_opts\fP sets all the given form's option bits (form
 option bits may be logically-OR'ed together).
diff --git a/man/form_page.3x b/man/form_page.3x
index 674368f69..ee0b89875 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
@@ -28,25 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH form_page 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH form_page 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_current_field(FORM *\fIform\fB, FIELD *\fIfield\fB);\fR
-.br
-\fBFIELD *current_field(const FORM *\fIform\fB);\fR
-.sp
-\fBint unfocus_current_field(FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_page(FORM *\fIform\fB, int \fIn\fB);\fR
-.br
-\fBint form_page(const FORM *\fIform\fB);\fR
-.sp
-\fBint field_index(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_current_field(FORM *\fIform\fP, FIELD *\fIfield\fP);
+\fBFIELD *current_field(const FORM *\fIform\fP);
+.PP
+\fBint unfocus_current_field(FORM *\fIform\fP);
+.PP
+\fBint set_form_page(FORM *\fIform\fP, int \fIn\fP);
+\fBint form_page(const FORM *\fIform\fP);
+.PP
+\fBint field_index(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_current_field\fP sets the current field of the given
 form; \fBcurrent_field\fP returns the current field of the given form.
diff --git a/man/form_post.3x b/man/form_post.3x
index 7aabb234a..82e05ebcc 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
-.TH form_post 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH form_post 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \-
 write or erase forms from associated subwindows
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint post_form(FORM *\fIform\fB);\fR
-.br
-\fBint unpost_form(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint post_form(FORM *\fIform\fP);
+\fBint unpost_form(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpost_form\fP displays a form to its associated subwindow.
 To trigger physical display of the subwindow,
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index f5f7c7d6b..5b1be8d3d 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH form_requestname 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH form_requestname 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
 handle printable form request names
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBconst char *form_request_name(int \fIrequest\fB);\fR
-.br
-\fBint form_request_by_name(const char *\fIname\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBconst char *form_request_name(int \fIrequest\fP);
+\fBint form_request_by_name(const char *\fIname\fP);
+.fi
 .SH DESCRIPTION
 The function \fBform_request_name\fP returns the printable name of a form
 request code.
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 2fcc851fa..00d49e994 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH form_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH form_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \-
 associate application data with a form item
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_userptr(FORM *\fIform\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid* form_userptr(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_userptr(FORM *\fIform\fP, void *\fIuserptr\fP);
+\fBvoid* form_userptr(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 Every form and every form item has a field that can be used to hold
 application-specific data (that is, the form-driver code leaves it alone).
diff --git a/man/form_variables.3x b/man/form_variables.3x
index 67995f7a7..ad4d609f5 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_variables.3x,v 1.15 2023/09/30 23:13:32 tom Exp $
-.TH form_variables 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_variables.3x,v 1.16 2023/10/07 21:19:07 tom Exp $
+.TH form_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%TYPE_ALNUM\fP,
 \fB\%TYPE_ALPHA\fP,
@@ -40,15 +40,15 @@
 form system global variables
 .SH SYNOPSIS
 .nf
-\fB#include <form.h>\fP
+\fB#include <form.h>
 .PP
-\fBFIELDTYPE * TYPE_ALNUM;\fP
-\fBFIELDTYPE * TYPE_ALPHA;\fP
-\fBFIELDTYPE * TYPE_ENUM;\fP
-\fBFIELDTYPE * TYPE_INTEGER;\fP
-\fBFIELDTYPE * TYPE_IPV4;\fP
-\fBFIELDTYPE * TYPE_NUMERIC;\fP
-\fBFIELDTYPE * TYPE_REGEXP;\fP
+\fBFIELDTYPE * TYPE_ALNUM;
+\fBFIELDTYPE * TYPE_ALPHA;
+\fBFIELDTYPE * TYPE_ENUM;
+\fBFIELDTYPE * TYPE_INTEGER;
+\fBFIELDTYPE * TYPE_IPV4;
+\fBFIELDTYPE * TYPE_NUMERIC;
+\fBFIELDTYPE * TYPE_REGEXP;
 .fi
 .SH DESCRIPTION
 These are building blocks for the form library,
diff --git a/man/form_win.3x b/man/form_win.3x
index a25927ebb..a4bd5cc0f 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,23 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH form_win 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH form_win 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_win(FORM *\fIform\fB, WINDOW *\fIwin\fB);\fR
-.br
-\fBWINDOW *form_win(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_sub(FORM *\fIform\fB, WINDOW *\fIsub\fB);\fR
-.br
-\fBWINDOW *form_sub(const FORM *\fIform\fB);\fR
-.sp
-\fBint scale_form(const FORM *\fIform\fB, int *\fIrows\fB, int *\fIcolumns\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_win(FORM *\fIform\fP, WINDOW *\fIwin\fP);
+\fBWINDOW *form_win(const FORM *\fIform\fP);
+.PP
+\fBint set_form_sub(FORM *\fIform\fP, WINDOW *\fIsub\fP);
+\fBWINDOW *form_sub(const FORM *\fIform\fP);
+.PP
+\fBint scale_form(const FORM *\fIform\fP, int *\fIrows\fP, int *\fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 Every form has an associated pair of \fBcurses\fP windows.
 The form window
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 6c00d5e30..5aeab4093 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,36 +28,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.95 2023/09/30 21:38:11 tom Exp $
-.TH @INFOCMP@ 1M 2023-09-30 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ds n 5
+.\" $Id: infocmp.1m,v 1.96 2023/10/07 21:19:07 tom Exp $
+.TH @INFOCMP@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
-.\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.
+.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB@INFOCMP@\fP \-
@@ -461,9 +450,12 @@ hexadecimal and base64
 .IP
 For example, this prints the compiled terminfo value as a string
 which could be assigned to the \fBTERMINFO\fP environment variable:
-.NS
-@INFOCMP@ -0 -q -Q2
-.NE
+.PP
+.RS 9
+.EX
+@INFOCMP@ \-0 \-q \-Q2
+.EE
+.RE
 .TP 5
 \fB\-q\fP
 This makes the output a little shorter:
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 78505b107..3e96cfb36 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.33 2023/10/01 22:43:17 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-10-01 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: infotocap.1m,v 1.34 2023/10/07 21:19:07 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
diff --git a/man/key_defined.3x b/man/key_defined.3x
index aceea6ed3..f1b63d7f6 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.28 2023/09/30 21:26:43 tom Exp $
-.TH key_defined 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH key_defined 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint key_defined(const char *\fIdefinition\fB);\fR
+\fBint key_defined(const char *\fIdefinition\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to determine if a string is currently bound
diff --git a/man/keybound.3x b/man/keybound.3x
index 33630128d..5d1547eaf 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.29 2023/09/30 21:26:43 tom Exp $
-.TH keybound 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.30 2023/10/07 22:24:44 tom Exp $
+.TH keybound 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBchar * keybound(int \fIkeycode\fB, int \fIcount);\fR
+\fBchar * keybound(int \fIkeycode\fP, int \fIcount\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to determine the string which is defined
diff --git a/man/keyok.3x b/man/keyok.3x
index 92f9af9a8..ce5ca3ee0 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.34 2023/09/30 21:26:43 tom Exp $
-.TH keyok 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
+.TH keyok 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint keyok(int \fIkeycode\fB, bool \fIenable\fB);\fR
+\fBint keyok(int \fIkeycode\fP, bool \fIenable\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to disable specific keycodes, rather than
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 9f9b421f3..73f14d4f5 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.20 2023/09/30 21:38:11 tom Exp $
-.TH legacy_coding 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.21 2023/10/07 21:19:07 tom Exp $
+.TH legacy_coding 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint use_legacy_coding(int \fIlevel\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint use_legacy_coding(int \fIlevel\fP);
+.fi
 .SH DESCRIPTION
 The \fBuse_legacy_coding\fP function is an extension to the curses library.
 It allows the caller to change the result of \fBunctrl\fP,
diff --git a/man/menu.3x b/man/menu.3x
index a9b2f223c..bdcec5a66 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.38 2023/09/30 21:38:11 tom Exp $
-.TH menu 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: menu.3x,v 1.39 2023/10/07 21:19:07 tom Exp $
+.TH menu 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,7 +49,9 @@
 \fBmenu\fP \-
 curses extension for programming menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
+.nf
+\fB#include <menu.h>
+.fi
 .SH DESCRIPTION
 The \fBmenu\fP library provides terminal-independent facilities for composing
 menu systems on character-cell terminals.
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index f41ddd6ce..6b4be3524 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,12 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH menu_attributes 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: menu_attributes.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH menu_attributes 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBmenu_back\fP,
 \fBmenu_fore\fP,
@@ -45,23 +50,21 @@
 \fBset_menu_pad\fP \-
 color and attribute control for menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_fore(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_fore(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_back(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_back(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_grey(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_grey(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_pad(MENU *\fImenu\fB, int \fIpad\fB);\fR
-.br
-\fBint menu_pad(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_fore(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_fore(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_back(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_back(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_grey(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_grey(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_pad(MENU *\fImenu\fP, int \fIpad\fP);
+\fBint menu_pad(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_fore\fP sets the foreground attribute of
 \fImenu\fP. This is the highlight used for selected menu items.
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index f5c5041ba..3f01c1e47 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,15 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.25 2023/09/30 21:38:11 tom Exp $
-.TH menu_cursor 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
+.TH menu_cursor 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \-
 position a menu's cursor
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint pos_menu_cursor(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint pos_menu_cursor(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpos_menu_cursor\fP restores the cursor to the current position
 associated with the menu's selected item.
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 6acda6b71..10e9d2167 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.40 2023/09/30 21:38:11 tom Exp $
-.TH menu_driver 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH menu_driver 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -37,9 +37,11 @@
 \fBmenu_driver\fP \-
 command-processing loop of the menu system
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint menu_driver(MENU *\fImenu\fB, int \fIc\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint menu_driver(MENU *\fImenu\fP, int \fIc\fP);
+.fi
 .SH DESCRIPTION
 Once a menu has been posted (displayed), you should funnel input events to it
 through \fBmenu_driver\fP.  This routine has three major input cases:
diff --git a/man/menu_format.3x b/man/menu_format.3x
index cfe4ef57e..952ea9a79 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH menu_format 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH menu_format 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \-
 set and get menu sizes
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_format(MENU *\fImenu\fB, int \fIrows\fB, int \fIcols\fB);\fR
-.br
-\fBvoid menu_format(const MENU *\fImenu\fB, int *\fIrows\fB, int *\fIcols\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_format(MENU *\fImenu\fP, int \fIrows\fP, int \fIcols\fP);
+\fBvoid menu_format(const MENU *\fImenu\fP, int *\fIrows\fP, int *\fIcols\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_format\fP sets the maximum display size of the given
 menu.
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index f0cd7cecc..844639317 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
@@ -28,29 +27,27 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH menu_hook 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH menu_hook 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_init(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
-.br
-\fBMenu_Hook item_init(const MENU *\fImenu);\fR
-.sp
-\fBint set_item_term(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
-.br
-\fBMenu_Hook item_term(const MENU *\fImenu);\fR
-.sp
-\fBint set_menu_init(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
-.br
-\fBMenu_Hook menu_init(const MENU *\fImenu);\fR
-.sp
-\fBint set_menu_term(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
-.br
-\fBMenu_Hook menu_term(const MENU *\fImenu);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_init(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook item_init(const MENU *\fImenu\fP);
+.PP
+\fBint set_item_term(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook item_term(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_init(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook menu_init(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_term(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook menu_term(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBmenu_driver\fP.
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 9982027d9..da0b49100 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
@@ -28,21 +27,21 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH menu_items 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH menu_items 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
 \fBitem_count\fP \-
 make and break connections between items and menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_items(MENU *\fImenu\fB, ITEM **\fIitems\fB);\fR
-.br
-\fBITEM **menu_items(const MENU *\fImenu\fB);\fR
-.br
-\fBint item_count(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_items(MENU *\fImenu\fP, ITEM **\fIitems\fP);
+\fBITEM **menu_items(const MENU *\fImenu\fP);
+\fBint item_count(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_items\fP changes the item pointer array of the given
 \fImenu\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 23c5454e3..91b891c46 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH menu_mark 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH menu_mark 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \-
 get and set the menu mark string
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_mark(MENU *\fImenu\fB, const char *\fImark\fB);\fR
-.br
-\fBconst char *menu_mark(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_mark(MENU *\fImenu\fP, const char *\fImark\fP);
+\fBconst char *menu_mark(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 In order to make menu selections visible on older terminals without
 highlighting or color capability, the menu library marks selected items
diff --git a/man/menu_new.3x b/man/menu_new.3x
index b739159c1..8ead72971 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH menu_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH menu_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \-
 create and destroy menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBMENU *new_menu(ITEM **\fIitems\fB);\fR
-.br
-\fBint free_menu(MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBMENU *new_menu(ITEM **\fIitems\fP);
+\fBint free_menu(MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_menu\fP creates a new menu connected to a specified item
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 490081a3d..439891acc 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.30 2023/09/30 21:38:11 tom Exp $
-.TH menu_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH menu_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
@@ -37,15 +36,15 @@
 \fBmenu_opts\fP \-
 set and get menu options
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_opts(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
-.br
-\fBMenu_Options menu_opts(const MENU *\fImenu\fB);\fR
-.sp
-\fBint menu_opts_on(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
-.br
-\fBint menu_opts_off(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_opts(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+\fBMenu_Options menu_opts(const MENU *\fImenu\fP);
+.PP
+\fBint menu_opts_on(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+\fBint menu_opts_off(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index c1400d3dd..f5647fb58 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.33 2023/09/30 21:38:11 tom Exp $
-.TH menu_pattern 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.34 2023/10/07 21:19:07 tom Exp $
+.TH menu_pattern 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \-
 set and get a menu's pattern buffer
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_pattern(MENU *\fImenu\fB, const char *\fIpattern\fB);\fR
-.br
-\fBchar *menu_pattern(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_pattern(MENU *\fImenu\fP, const char *\fIpattern\fP);
+\fBchar *menu_pattern(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 Every menu has an associated pattern match buffer.
 As input events that are
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 29e90f875..2e855e2ff 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH menu_post 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH menu_post 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \-
 write or erase menus from associated subwindows
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint post_menu(MENU *\fImenu\fB);\fR
-.br
-\fBint unpost_menu(MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint post_menu(MENU *\fImenu\fP);
+\fBint unpost_menu(MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpost_menu\fP displays a menu to its associated subwindow.
 To
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 7e05c170f..8c33b607c 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH menu_requestname 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH menu_requestname 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
 handle printable menu request names
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBconst char *menu_request_name(int \fIrequest\fB);\fR
-.br
-\fBint menu_request_by_name(const char *\fIname\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBconst char *menu_request_name(int \fIrequest\fP);
+\fBint menu_request_by_name(const char *\fIname\fP);
+.fi
 .SH DESCRIPTION
 The function \fBmenu_request_name\fP returns the printable name of a menu
 request code.
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 1e6728ce8..4d960b6fb 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,24 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.31 2023/09/30 23:44:51 tom Exp $
-.TH menu_spacing 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH menu_spacing 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
 set and get spacing between menu items.
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_spacing(MENU *\fImenu\fB,\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_spacing(MENU *\fImenu\fP,
                      \fBint \fIspc_description\fB,\fR
                      \fBint \fIspc_rows\fB,\fR
                      \fBint \fIspc_columns\fB);\fR
-.br
 \fBint menu_spacing(const MENU *\fImenu\fB,\fR
                  \fBint* \fIspc_description\fB,\fR
                  \fBint* \fIspc_rows\fB,\fR
                  \fBint* \fIspc_columns\fB);\fR
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_spacing\fP sets the spacing information for the menu.
 Its parameters provide the description and the size (in rows and columns).
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 3e8932fda..36db008ae 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
-.TH menu_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH menu_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \-
 associate application data with a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_userptr(MENU *\fImenu\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *menu_userptr(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_userptr(MENU *\fImenu\fP, void *\fIuserptr\fP);
+\fBvoid *menu_userptr(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 Every menu and every menu item has a field that can be used to hold
 application-specific data (that is, the menu-driver code leaves it alone).
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 6035ee3d3..bc244b1a4 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,23 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH menu_win 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH menu_win 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_win(MENU *\fImenu\fB, WINDOW *\fIwin\fB);\fR
-.br
-\fBWINDOW *menu_win(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_sub(MENU *\fImenu\fB, WINDOW *\fIsub\fB);\fR
-.br
-\fBWINDOW *menu_sub(const MENU *\fImenu\fB);\fR
-.sp
-\fBint scale_menu(const MENU *\fImenu, int *\fIrows\fB, int *\fIcolumns);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_win(MENU *\fImenu\fP, WINDOW *\fIwin\fP);
+\fBWINDOW *menu_win(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_sub(MENU *\fImenu\fP, WINDOW *\fIsub\fP);
+\fBWINDOW *menu_sub(const MENU *\fImenu\fP);
+.PP
+\fBint scale_menu(const MENU *\fImenu\fP, int *\fIrows\fP, int *\fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 Every menu has an associated pair of \fBcurses\fP windows.
 The menu window
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index d76ad8f3b..648213ac3 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
@@ -28,23 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.32 2023/09/30 21:38:11 tom Exp $
-.TH mitem_current 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
+.TH mitem_current 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_current_item(MENU *\fImenu\fB, ITEM *\fIitem\fB);\fR
-.br
-\fBITEM *current_item(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_top_row(MENU *\fImenu\fB, int \fIrow\fB);\fR
-.br
-\fBint top_row(const MENU *\fImenu\fB);\fR
-.sp
-\fBint item_index(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_current_item(MENU *\fImenu\fP, ITEM *\fIitem\fP);
+\fBITEM *current_item(const MENU *\fImenu\fP);
+.PP
+\fBint set_top_row(MENU *\fImenu\fP, int \fIrow\fP);
+\fBint top_row(const MENU *\fImenu\fP);
+.PP
+\fBint item_index(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_current_item\fP sets the current item (the item on which
 the menu cursor is positioned).
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 43e8fe016..126c3fb9e 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.26 2023/09/30 21:38:11 tom Exp $
-.TH mitem_name 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
+.TH mitem_name 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \-
 get menu item name and description fields
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBconst char *item_name(const ITEM *\fIitem\fB);\fR
-.br
-\fBconst char *item_description(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBconst char *item_name(const ITEM *\fIitem\fP);
+\fBconst char *item_description(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBitem_name\fP returns the name part of the given item.
 .br
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 6a878b6c7..418e6a9f8 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH mitem_new 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH mitem_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \-
 create and destroy menu items
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBITEM *new_item(const char *\fIname\fB, const char *\fIdescription\fB);\fR
-.br
-\fBint free_item(ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBITEM *new_item(const char *\fIname\fP, const char *\fIdescription\fP);
+\fBint free_item(ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_item\fP allocates a new item and initializes it from the
 \fBname\fP and \fBdescription\fP pointers.
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 356ff75c1..c9c600b2d 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.28 2023/09/30 21:38:11 tom Exp $
-.TH mitem_opts 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
+.TH mitem_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
@@ -37,15 +36,15 @@
 \fBitem_opts\fP \-
 set and get menu item options
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_opts(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
-.br
-\fBItem_Options item_opts(const ITEM *\fIitem\fB);\fR
-.sp
-\fBint item_opts_on(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
-.br
-\fBint item_opts_off(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_opts(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+\fBItem_Options item_opts(const ITEM *\fIitem\fP);
+.PP
+\fBint item_opts_on(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+\fBint item_opts_off(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_item_opts\fP sets all the given item's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index b37db98f6..a723dbf2d 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
@@ -28,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.29 2023/09/30 21:38:11 tom Exp $
-.TH mitem_userptr 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
+.TH mitem_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \-
 associate application data with a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_userptr(ITEM *\fIitem\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *item_userptr(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_userptr(ITEM *\fIitem\fP, void *\fIuserptr\fP);
+\fBvoid *item_userptr(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 Every menu item has a field that can be used to hold application-specific data
 (that is, the menu-driver code leaves it alone).
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index ec37afb73..84dd0bfd2 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,18 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.27 2023/09/30 21:38:11 tom Exp $
-.TH mitem_value 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
+.TH mitem_value 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \-
 set and get menu item values
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_value(ITEM *\fIitem\fB, bool \fIvalue\fB);\fR
-.br
-\fBbool item_value(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_value(ITEM *\fIitem\fP, bool \fIvalue\fP);
+\fBbool item_value(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 If you turn off the menu option \fBO_ONEVALUE\fP (e.g., with
 \fBset_menu_opts\fP or \fBmenu_opts_off\fP; see \fBmenu_opts\fP(3X)), the menu
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 2c857284c..abd629435 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -1,4 +1,3 @@
-'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998,2010 Free Software Foundation, Inc.                       *
@@ -28,15 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.22 2023/09/30 21:38:11 tom Exp $
-.TH mitem_visible 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.23 2023/10/07 21:19:07 tom Exp $
+.TH mitem_visible 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_visible\fP \-
 check visibility of a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBbool item_visible(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBbool item_visible(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 A menu item is visible when it is in the portion of a posted menu that
 is mapped onto the screen (if the menu is scrollable, in particular, this
diff --git a/man/ncurses.3x b/man/ncurses.3x
index ecb0170a1..170b50c88 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,42 +28,32 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.177 2023/09/30 21:38:11 tom Exp $
-.TH ncurses 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: ncurses.3x,v 1.178 2023/10/07 22:17:08 tom Exp $
+.TH ncurses 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
 .\}
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%ncurses\fP \-
 character-cell terminal interface with optimized output
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
+.fi
 .SH DESCRIPTION
 The \fBncurses\fP library routines give the user a terminal-independent method
 of updating character screens with reasonable optimization.
@@ -106,9 +96,12 @@ and access to low-level terminal-manipulation routines.
 .SS Initialization
 The library uses the locale which the calling program has initialized.
 That is normally done with \fBsetlocale\fP(3):
-.NS
+.PP
+.RS 4
+.EX
 \fBsetlocale(LC_ALL, "");\fP
-.NE
+.EE
+.RE
 .PP
 If the locale is not initialized,
 the library assumes that characters are printable as in ISO\-8859\-1,
@@ -125,15 +118,21 @@ The routine \fBendwin\fP(3X) must be called before exiting.
 To get character-at-a-time input without echoing (most
 interactive, screen oriented programs want this), the following
 sequence should be used:
-.NS
+.PP
+.RS 4
+.EX
 \fBinitscr(); cbreak(); noecho();\fP
-.NE
+.EE
+.RE
 .PP
 Most programs would additionally use the sequence:
-.NS
+.PP
+.RS 4
+.EX
 \fBintrflush(stdscr, FALSE);\fP
 \fBkeypad(stdscr, TRUE);\fP
-.NE
+.EE
+.RE
 .PP
 Before a \fBcurses\fP program is run, the tab stops of the terminal
 should be set and its initialization strings, if defined, must be output.
@@ -203,21 +202,30 @@ If the environment variable \fBTERMINFO\fP is defined, any program using
 standard place.
 For example, if \fBTERM\fP is set to \fBatt4424\fP, then the
 compiled terminal definition is found in
-.NS
+.PP
+.RS 4
+.EX
 \fB\*d/a/att4424\fP.
-.NE
+.EE
+.RE
 .PP
 (The \fBa\fP is copied from the first letter of \fBatt4424\fP to avoid
 creation of huge directories.)  However, if \fBTERMINFO\fP is set to
 \fB$HOME/myterms\fP, \fBcurses\fP first checks
-.NS
+.PP
+.RS 4
+.EX
 \fB$HOME/myterms/a/att4424\fP,
-.NE
+.EE
+.RE
 .PP
 and if that fails, it then checks
-.NS
+.PP
+.RS 4
+.EX
 \fB\*d/a/att4424\fP.
-.NE
+.EE
+.RE
 .PP
 This is useful for developing experimental definitions or when write
 permission in \fB\*d\fP is not available.
@@ -894,10 +902,13 @@ does not create problems when compiling an application.
 .SS HOME
 Tells \fBncurses\fP where your home directory is.
 That is where it may read and write auxiliary terminal descriptions:
-.NS
+.PP
+.RS 4
+.EX
 $HOME/.termcap
 $HOME/.terminfo
-.NE
+.EE
+.RE
 .SS LINES
 Like COLUMNS, specify the height of the screen in characters.
 See COLUMNS for a detailed description.
@@ -906,13 +917,14 @@ This applies only to the OS/2 EMX port.
 It specifies the order of buttons on the mouse.
 OS/2 numbers a 3-button mouse inconsistently from other
 platforms:
-.NS
+.PP
+.RS 4
+.EX
 1 = left
-.br
 2 = right
-.br
 3 = middle.
-.NE
+.EE
+.RE
 .PP
 This variable lets you customize the mouse.
 The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
@@ -1040,20 +1052,18 @@ As an alternative to the environment variable,
 ncurses checks for an extended terminfo capability \fBU8\fP.
 This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
 For example
+.PP
 .RS 3
-.ft \*(CW
-.sp
-.nf
+.EX
 # linux console, if patched to provide working
-# VT100 shift-in/shift-out, with corresponding font.
-linux-vt100|linux console with VT100 line-graphics,
+# VT100 shift\-in/shift\-out, with corresponding font.
+linux\-vt100|linux console with VT100 line\-graphics,
         U8#0, use=linux,
-.sp
+
 # uxterm with vt100Graphics resource set to false
-xterm-utf8|xterm relying on UTF-8 line-graphics,
+xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
         U8#1, use=xterm,
-.fi
-.ft R
+.EE
 .RE
 .PP
 The name \*(``U8\*('' is chosen to be two characters,
@@ -1112,40 +1122,53 @@ using subdirectories named by the first letter of the terminal names therein.
 This is the scheme used in System V, which legacy Unix systems use,
 and the \fBTERMINFO\fP variable is used by \fIcurses\fP applications on those
 systems to override the default location of the terminal database.
-.bP
+.IP \(bu 4
 If \fBncurses\fP is built to use hashed databases,
 then each entry in this list may be the path of a hashed database file, e.g.,
-.NS
+.RS 4
+.PP
+.RS 4
+.EX
 /usr/share/terminfo.db
-.NE
-.IP
+.EE
+.RE
+.PP
 rather than
-.NS
+.PP
+.RS 4
+.EX
 /usr/share/terminfo/
-.NE
-.IP
+.EE
+.RE
+.PP
 The hashed database uses less disk-space and is a little faster than the
 directory tree.
 However,
 some applications assume the existence of the directory tree,
 reading it directly
 rather than using the terminfo library calls.
+.RE
 .bP
 If \fBncurses\fP is built with a support for reading termcap files
 directly, then an entry in this list may be the path of a termcap file.
-.bP
+.IP \(bu 4
 If the \fBTERMINFO\fP variable begins with
 \*(``hex:\*('' or \*(``b64:\*('',
 \fBncurses\fP uses the remainder of that variable as a compiled terminal
 description.
 You might produce the base64 format using \fBinfocmp\fP(1M):
-.NS
-TERMINFO="$(infocmp -0 -Q2 -q)"
+.RS 4
+.PP
+.RS 4
+.EX
+TERMINFO="$(infocmp \-0 \-Q2 \-q)"
 export TERMINFO
-.NE
-.IP
+.EE
+.RE
+.PP
 The compiled description is used if it corresponds to the terminal identified
 by the \fBTERM\fP variable.
+.RE
 .PP
 Setting \fBTERMINFO\fP is the simplest,
 but not the only way to set location of the default terminal database.
@@ -1186,18 +1209,24 @@ semicolons on OS/2 EMX.
 .PP
 If the \fBTERMPATH\fP environment variable is not set,
 \fBncurses\fP looks in the files
-.NS
+.PP
+.RS 4
+.EX
 /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
-.NE
+.EE
+.RE
 .PP
 in that order.
 .PP
 The library may be configured to disregard the following variables when the
 current user is the superuser (root), or if the application uses setuid or
 setgid permissions:
-.NS
+.PP
+.RS 4
+.EX
 $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
-.NE
+.EE
+.RE
 .SH ALTERNATE CONFIGURATIONS
 Several different configurations are possible,
 depending on the configure script options used when building \fBncurses\fP.
@@ -1206,20 +1235,28 @@ developer using \fBncurses\fP:
 .TP 5
 \-\-disable\-overwrite
 The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
-.NS
+.RS 5
+.PP
+.RS 4
+.EX
 \fB#include <curses.h>\fP
-.NE
-.IP
+.EE
+.RE
+.PP
 This option is used to avoid filename conflicts when \fBncurses\fP
 is not the main implementation of curses of the computer.
 If \fBncurses\fP is installed disabling overwrite, it puts its headers in
 a subdirectory, e.g.,
-.NS
+.PP
+.RS 4
+.EX
 \fB#include <ncurses/curses.h>\fP
-.NE
-.IP
+.EE
+.RE
+.PP
 It also omits a symbolic link which would allow you to use \fB\-lcurses\fP
 to build executables.
+.RE
 .TP 5
 \-\-enable\-widec
 The configure script renames the library and
@@ -1227,20 +1264,26 @@ The configure script renames the library and
 puts the header files in a different subdirectory.
 All of the library names have a \*(``w\*('' appended to them,
 i.e., instead of
-.NS
+.RS 5
+.PP
+.RS 4
+.EX
 \fB\-lncurses\fP
-.NE
-.IP
+.EE
+.RE
+.PP
 you link with
-.NS
+.PP
+.RS 4
+.EX
 \fB\-lncursesw\fP
-.NE
-.IP
+.EE
+.RE
+.PP
 You must also enable the wide-character features in the header file
 when compiling for the wide-character library
 to use the extended (wide-character) functions.
 The symbol which enables these features has changed since XSI Curses, Issue 4:
-.RS
 .bP
 Originally, the wide-character feature required the symbol
 \fB_XOPEN_SOURCE_EXTENDED\fP
@@ -1257,17 +1300,17 @@ Alternatively, you can enable the feature by defining \fBNCURSES_WIDECHAR\fP
 with the caveat that some other header file than \fBcurses.h\fP
 may require a specific value for \fB_XOPEN_SOURCE\fP
 (or a system-specific symbol).
-.RE
-.IP
+.PP
 The \fBcurses.h\fP file which is installed for the wide-character
 library is designed to be compatible with the normal library's header.
 Only the size of the \fBWINDOW\fP structure differs, and very few
 applications require more than a pointer to \fBWINDOW\fPs.
-.IP
+.PP
 If the headers are installed allowing overwrite,
 the wide-character library's headers should be installed last,
 to allow applications to be built using either library
 from the same set of headers.
+.RE
 .TP 5
 \-\-with\-pthread
 The configure script renames the library.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 6fd7bef28..7e86fd0d8 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,35 +29,23 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.39 2023/09/30 21:38:11 tom Exp $
-.TH new_pair 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: new_pair.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
+.TH new_pair 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
-.\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
 .SH NAME
 \fB\%alloc_pair\fP,
 \fB\%find_pair\fP,
@@ -65,11 +53,11 @@
 dynamically allocate \fIcurses\fR color pairs
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint alloc_pair(int \fIfg\fB, int \fIbg\fB);\fR
-\fBint find_pair(int \fIfg\fB, int \fIbg\fB);\fR
-\fBint free_pair(int \fIpair\fB);\fR
+\fBint alloc_pair(int \fIfg\fP, int \fIbg\fP);
+\fBint find_pair(int \fIfg\fP, int \fIbg\fP);
+\fBint free_pair(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
 These functions are an extension to the \fIcurses\fP library.
@@ -90,21 +78,27 @@ Color pairs are the \fIcurses\fP library's way of managing a color palette
 on a terminal.
 If the library does not keep track of the \fIcombinations\fP of
 colors which are displayed, it will be inefficient.
-.bP
+.IP \(bu 4
 For simple terminal emulators
 with only a few dozen color combinations,
 it is convenient to use the maximum number of combinations
 as the limit on color pairs:
-.NS
+.PP
+.RS 8
+.EX
 \fBCOLORS\fI * \fBCOLORS\fR
-.NE
-.bP
+.EE
+.RE
+.IP \(bu 4
 Terminals which support \fIdefault colors\fP distinct
 from \*(``ANSI colors\*(''
 add to the possible combinations, producing this total:
-.NS
+.PP
+.RS 8
+.EX
 \fI( \fBCOLORS\fI + 1 ) * ( \fBCOLORS\fI + 1 )\fR
-.NE
+.EE
+.RE
 .bP
 An application might use up to a few dozen color pairs to
 implement a predefined color scheme.
diff --git a/man/panel.3x b/man/panel.3x
index 1202d77d3..c77d2ab5d 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.55 2023/09/30 21:38:11 tom Exp $
-.TH panel 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: panel.3x,v 1.56 2023/10/07 21:19:07 tom Exp $
+.TH panel 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -41,46 +48,34 @@
 panel \-
 panel stack extension for curses
 .SH SYNOPSIS
-\fB#include <panel.h>\fP
-.P
-\fBcc [flags] sourcefiles \-lpanel \-lncurses\fP
-.P
-\fBPANEL *new_panel(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint bottom_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBint top_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBint show_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBvoid update_panels(void);\fP
-.br
-\fBint hide_panel(PANEL *\fIpan\fB);\fR
-.sp
-\fBWINDOW *panel_window(const PANEL *\fIpan\fB);\fR
-.br
-\fBint replace_panel(PANEL *\fIpan\fB, WINDOW *\fIwindow\fB);\fR
-.br
-\fBint move_panel(PANEL *\fIpan\fB, int \fIstarty\fB, int \fIstartx\fB);\fR
-.br
-\fBint panel_hidden(const PANEL *\fIpan\fB);\fR
-.sp
-\fBPANEL *panel_above(const PANEL *\fIpan\fB);\fR
-.br
-\fBPANEL *panel_below(const PANEL *\fIpan\fB);\fR
-.sp
-\fBint set_panel_userptr(PANEL *\fIpan\fB, const void *\fIptr\fB);\fR
-.br
-\fBconst void *panel_userptr(const PANEL *\fIpan\fB);\fR
-.sp
-\fBint del_panel(PANEL *\fIpan\fB);\fR
-.sp
-\fR/* ncurses-extensions */\fP
-.br
-\fBPANEL *ground_panel(SCREEN *\fIsp\fB);\fR
-.br
-\fBPANEL *ceiling_panel(SCREEN *\fIsp\fB);\fR
-.br
+.nf
+\fB#include <panel.h>
+.PP
+\fBPANEL *new_panel(WINDOW *\fIwin\fP);
+.PP
+\fBint bottom_panel(PANEL *\fIpan\fP);
+\fBint top_panel(PANEL *\fIpan\fP);
+\fBint show_panel(PANEL *\fIpan\fP);
+\fBvoid update_panels(void);
+\fBint hide_panel(PANEL *\fIpan\fP);
+.PP
+\fBWINDOW *panel_window(const PANEL *\fIpan\fP);
+\fBint replace_panel(PANEL *\fIpan\fP, WINDOW *\fIwindow\fP);
+\fBint move_panel(PANEL *\fIpan\fP, int \fIstarty\fP, int \fIstartx\fP);
+\fBint panel_hidden(const PANEL *\fIpan\fP);
+.PP
+\fBPANEL *panel_above(const PANEL *\fIpan\fP);
+\fBPANEL *panel_below(const PANEL *\fIpan\fP);
+.PP
+\fBint set_panel_userptr(PANEL *\fIpan\fP, const void *\fIptr\fP);
+\fBconst void *panel_userptr(const PANEL *\fIpan\fP);
+.PP
+\fBint del_panel(PANEL *\fIpan\fP);
+.PP
+\fI/* ncurses extensions */\fP
+\fBPANEL *ground_panel(SCREEN *\fIsp\fP);
+\fBPANEL *ceiling_panel(SCREEN *\fIsp\fP);
+.fi
 .SH DESCRIPTION
 Panels are \fBcurses\fP(3X) windows with the added feature of
 depth.
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 08325d601..a7a43ecd0 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.47 2023/09/30 21:26:43 tom Exp $
-.TH resizeterm 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
+.TH resizeterm 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,11 +42,11 @@
 manage the terminal dimensions understood by \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBbool is_term_resized(int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resize_term(int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resizeterm(int \fIlines\fB, int \fIcolumns\fB);\fR
+\fBbool is_term_resized(int \fIlines\fP, int \fIcolumns\fP);
+\fBint resize_term(int \fIlines\fP, int \fIcolumns\fP);
+\fBint resizeterm(int \fIlines\fP, int \fIcolumns\fP);
 .fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 38d503d1a..7bc736dda 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,31 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.36 2023/09/30 21:38:11 tom Exp $
-.TH scr_dump 5 2023-09-30 "ncurses 6.4" "File formats"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: scr_dump.5,v 1.37 2023/10/07 21:19:07 tom Exp $
+.TH scr_dump 5 2023-10-07 "ncurses 6.4" "File formats"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
 .\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -72,7 +60,7 @@ the whole screen, i.e., \fBstdscr\fP.
 .SS ncurses6
 A longstanding implementation of screen-dump was
 revised with ncurses6 to remedy problems with the earlier approach:
-.bP
+.IP \(bu 4
 A \*(``magic number\*('' is written to the beginning of the dump file,
 allowing applications (such as \fBfile\fP(1)) to recognize curses dump files.
 .IP
@@ -80,25 +68,36 @@ Because ncurses6 uses a new format,
 that requires a new magic number
 was unused by other applications.
 This 16-bit number was unused:
-.NS
-0x8888 (octal \*(``\\210\\210\*('')
-.NE
-.IP
+.RS 4
+.PP
+.RS 4
+.EX
+0x8888 (octal \*(``\e210\e210\*('')
+.EE
+.RE
+.PP
 but to be more certain, this 32-bit number was chosen:
-.NS
-0x88888888 (octal \*(``\\210\\210\\210\\210\*('')
-.NE
-.IP
+.PP
+.RS 4
+.EX
+0x88888888 (octal \*(``\e210\e210\e210\e210\*('')
+.EE
+.RE
+.PP
 This is the pattern submitted to the maintainers of the \fBfile\fP program:
-.NS
+.PP
+.RS 4
+.EX
 #
 # ncurses5 (and before) did not use a magic number,
 # making screen dumps "data".
 #
 # ncurses6 (2015) uses this format, ignoring byte-order
-0    string    \\210\\210\\210\\210ncurses    ncurses6 screen image
+0    string    \e210\e210\e210\e210ncurses    ncurses6 screen image
 #
-.NE
+.EE
+.RE
+.RE
 .bP
 The screen dumps are written in textual form,
 so that internal data sizes are not directly related to the dump-format, and
@@ -177,31 +176,40 @@ Unix System\ V curses identified the file format by writing a
 The \fBWINDOW\fP data and the lines of text follow, all in binary form.
 .PP
 The Solaris curses source has these definitions:
-.NS
+.PP
+.RS 4
+.EX
 /* terminfo magic number */
 #define MAGNUM  0432
 
 /* curses screen dump magic number */
 #define SVR2_DUMP_MAGIC_NUMBER  0433
 #define SVR3_DUMP_MAGIC_NUMBER  0434
-.NE
+.EE
+.RE
 .PP
 That is, the feature was likely introduced in SVr2 (1984),
 and improved in SVr3 (1987).
 The Solaris curses source has no magic number for SVr4 (1989).
 Other operating systems (AIX and HPUX) use a magic number which would
 correspond to this definition:
-.NS
+.PP
+.RS 4
+.EX
 /* curses screen dump magic number */
 #define SVR4_DUMP_MAGIC_NUMBER  0435
-.NE
+.EE
+.RE
 .PP
 That octal number in bytes is 001, 035.
 Because most Unix vendors use big-endian hardware,
 the magic number is written with the high-order byte first, e.g.,
-.NS
-\001\035
-.NE
+.PP
+.RS 4
+.EX
+\e001\e035
+.EE
+.RE
 .PP
 After the magic number, the \fBWINDOW\fP structure and line-data are
 written in binary format.
@@ -247,9 +255,12 @@ it writes the \fBWINDOW\fP structure in binary,
 but begins the file with its three-byte identifier \*(``PDC\*('',
 followed by a one-byte version,
 e.g.,
-.NS
-	\*(``PDC\\001\*(''
-.NE
+.PP
+.RS 4
+.EX
+	\*(``PDC\e001\*(''
+.EE
+.RE
 .SS NetBSD
 As of April 2017, NetBSD curses does
 not support \fBscr_dump\fP and \fBscr_restore\fP
@@ -271,7 +282,9 @@ finally, lines as done by other implementations.
 .SH EXAMPLE
 Given a simple program which writes text to the screen
 (and for the sake of example, limiting the screen-size to 10x20):
-.NS
+.PP
+.RS 4
+.EX
 #include <curses.h>
 
 int
@@ -296,33 +309,37 @@ main(void)
     endwin();
     return 0;
 }
-.NE
+.EE
+.RE
 .PP
 When run using ncurses6, the output looks like this:
-.NS
-\\210\\210\\210\\210ncurses 6.0.20170415
+.PP
+.RS 4
+.EX
+\e210\e210\e210\e210ncurses 6.0.20170415
 _cury=5
 _curx=11
 _maxy=9
 _maxx=19
 _flags=14
-_attrs=\\{REVERSE|C2}
+_attrs=\e{REVERSE|C2}
 flag=_idcok
 _delay=-1
 _regbottom=9
-_bkgrnd=\\{NORMAL|C1}\\s
+_bkgrnd=\e{NORMAL|C1}\es
 rows:
-1:\\{NORMAL|C1}\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-2:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-3:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-4:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-5:\\s\\s\\s\\s\\s\\{BOLD}Hello\\{NORMAL}\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-6:\\s\\s\\s\\s\\s\\{REVERSE|C2}World!\\{NORMAL|C1}\\s\\s\\s\\s\\s\\s\\s\\s\\s
-7:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-8:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-9:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-10:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s
-.NE
+1:\e{NORMAL|C1}\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+2:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+3:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+4:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+5:\es\es\es\es\es\e{BOLD}Hello\e{NORMAL}\es\es\es\es\es\es\es\es\es\es
+6:\es\es\es\es\es\e{REVERSE|C2}World!\e{NORMAL|C1}\es\es\es\es\es\es\es\es\es
+7:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+8:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+9:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+10:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+.EE
+.RE
 .PP
 The first four octal escapes are actually nonprinting characters,
 while the remainder of the file is printable text.
@@ -330,10 +347,10 @@ You may notice:
 .bP
 The actual color pair values are not written to the file.
 .bP
-All characters are shown in printable form; spaces are \*(``\\s\*('' to
+All characters are shown in printable form; spaces are \*(``\es\*('' to
 ensure they are not overlooked.
 .bP
-Attributes are written in escaped curly braces, e.g., \*(``\\{BOLD}\*('',
+Attributes are written in escaped curly braces, e.g., \*(``\e{BOLD}\*('',
 and may include a color-pair (C1 or C2 in this example).
 .bP
 The parameters in the header are written out only if they are nonzero.
@@ -341,7 +358,9 @@ When reading back, order does not matter.
 .ne 10
 .PP
 Running the same program with Solaris \fIxpg4\fP curses gives this dump:
-.NS
+.PP
+.RS 4
+.EX
 MAX=10,20
 BEG=0,0
 SCROLL=0,10
@@ -375,7 +394,8 @@ BG=0,0,
 9,0,0,1,
 9,19,0,0,
 CUR=11,5
-.NE
+.EE
+.RE
 .PP
 Solaris \fBgetwin\fP requires that all parameters are present, and
 in the same order.
@@ -385,8 +405,10 @@ The \fIxpg4\fP curses library does not know about the \fBbce\fP
 .PP
 On the other hand, the SVr4 curses library does know about the background color.
 However, its screen dumps are in binary.
-Here is the corresponding dump (using \*(``od -t x1\*(''):
-.NS
+Here is the corresponding dump (using \*(``od \-t x1\*(''):
+.PP
+.RS 4
+.EX
 0000000 1c 01 c3 d6 f3 58 05 00 0b 00 0a 00 14 00 00 00
 0000020 00 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00
 0000040 00 00 b8 1a 06 08 cc 1a 06 08 00 00 09 00 10 00
@@ -409,7 +431,8 @@ Here is the corresponding dump (using \*(``od -t x1\*(''):
 0001620 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 *
 0002371
-.NE
+.EE
+.RE
 .SH AUTHORS
 Thomas E. Dickey
 .br
diff --git a/man/tabs.1 b/man/tabs.1
index 98b689d53..86fc74fcb 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,36 +27,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.46 2023/09/30 21:38:11 tom Exp $
-.TH @TABS@ 1 2023-09-30 "ncurses 6.4" "User commands"
-.ds n 5
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: tabs.1,v 1.47 2023/10/07 21:19:07 tom Exp $
+.TH @TABS@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
-.\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.
+.ds n 5
 .SH NAME
 \fB\%@TABS@\fP \-
 set terminal tab stops
@@ -67,9 +56,12 @@ The \fB@TABS@\fP program clears and sets tab-stops on the terminal.
 This uses the terminfo \fBclear_all_tabs\fP and \fBset_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.,
-.NS
+.PP
+.RS 4
+.EX
 stty tab0
-.NE
+.EE
+.RE
 .PP
 Like \fB@CLEAR@\fP(1), \fB@TABS@\fP writes to the standard output.
 You can redirect the standard output to a file (which prevents
@@ -84,9 +76,12 @@ 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
+.RS 4
+.EX
+tabs \-8
+.EE
+.RE
 .PP
 or use the \fB@RESET@\fP program,
 since the normal initialization sequences do not ensure that tab-stops
@@ -130,18 +125,23 @@ An explicit list can be defined after the options
 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
+.PP
+.RS 4
+.EX
 tabs 1,6,11,16,21
-.br
 tabs 1 6 11 16 21
-.NE
+.EE
+.RE
 .PP
 Use a \*(``+\*('' to treat a number
 as an increment relative to the previous value,
 e.g.,
-.NS
+.PP
+.RS 4
+.EX
 tabs 1,+5,+5,+5,+5
-.NE
+.EE
+.RE
 .PP
 which is equivalent to the 1,6,11,16,21 example.
 .SS Predefined Tab-Stops
diff --git a/man/term.5 b/man/term.5
index 201927241..b06c346fd 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,35 +27,26 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.58 2023/09/30 21:26:43 tom Exp $
-.TH term 5 2023-09-30 "ncurses 6.4" "File formats"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: term.5,v 1.59 2023/10/07 21:19:07 tom Exp $
+.TH term 5 2023-10-07 "ncurses 6.4" "File formats"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds ^  \(ha
 .\}
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ds       ^  ^
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -211,7 +202,7 @@ The \fIstring table\fP is the last section.
 It contains all of the values of string capabilities referenced in
 the \fIstrings\fP section.
 Each string is null-terminated.
-Special characters in ^X or \ec notation are stored in their
+Special characters in \*^X or \ec notation are stored in their
 interpreted form, not the printing representation.
 Padding information $<nn> and parameter information %x are
 stored intact in uninterpreted form.
@@ -349,14 +340,17 @@ the intermediate level of a directory tree in (two-character) hexadecimal form.
 .SH EXAMPLE
 As an example, here is a description for the Lear-Siegler
 ADM\-3, a popular though rather stupid early terminal:
-.NS
+.PP
+.RS 4
+.EX
 adm3a|lsi adm3a,
         am,
         cols#80, lines#24,
-        bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J,
-        cuf1=^L, cup=\\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
-        home=^^, ind=^J,
-.NE
+        bel=\*^G, clear=\e032$<1>, cr=\*^M, cub1=\*^H, cud1=\*^J,
+        cuf1=\*^L, cup=\eE=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\*^K,
+        home=\*^\*^, ind=\*^J,
+.EE
+.RE
 .PP
 and a hexadecimal dump of the compiled terminal description:
 .PP
diff --git a/man/term.7 b/man/term.7
index d68ba1c6e..f2ffb878c 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,12 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.38 2023/09/30 21:38:11 tom Exp $
-.TH term 7 2023-09-30 "ncurses 6.4" Miscellaneous
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: term.7,v 1.39 2023/10/07 21:19:07 tom Exp $
+.TH term 7 2023-10-07 "ncurses 6.4" Miscellaneous
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
diff --git a/man/term_variables.3x b/man/term_variables.3x
index e81401962..30c8e2cbf 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,18 +27,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.30 2023/09/30 23:13:32 tom Exp $
-.TH term_variables 3X 2023-09-30 "ncurses 6.4" "Library calls"
-.ds n 5
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
+.\" $Id: term_variables.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
+.TH term_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
 .\}
+.
+.ds n 5
 .SH NAME
 \fB\%SP\fP,
 \fB\%acs_map\fP,
@@ -56,36 +58,28 @@
 \fIterminfo\fR global variables
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.br
-\fB#include <term.h>\fP
-.PP
-\fBchtype acs_map[];\fP
-.sp
-\fBSCREEN * SP;\fP
-.sp
-\fBTERMINAL * cur_term;\fP
-.sp
-\fBchar ttytype[];\fP
-.sp
-\fBNCURSES_CONST char * const boolcodes[];\fP
-.br
-\fBNCURSES_CONST char * const boolfnames[];\fP
-.br
-\fBNCURSES_CONST char * const boolnames[];\fP
-.sp
-\fBNCURSES_CONST char * const numcodes[];\fP
-.br
-\fBNCURSES_CONST char * const numfnames[];\fP
-.br
-\fBNCURSES_CONST char * const numnames[];\fP
-.sp
-\fBNCURSES_CONST char * const strcodes[];\fP
-.br
-\fBNCURSES_CONST char * const strfnames[];\fP
-.br
-\fBNCURSES_CONST char * const strnames[];\fP
-.br
+\fB#include <curses.h>
+\fB#include <term.h>
+.PP
+\fBchtype acs_map[];
+.PP
+\fBSCREEN * SP;
+.PP
+\fBTERMINAL * cur_term;
+.PP
+\fBchar ttytype[];
+.PP
+\fBNCURSES_CONST char * const boolcodes[];
+\fBNCURSES_CONST char * const boolfnames[];
+\fBNCURSES_CONST char * const boolnames[];
+.PP
+\fBNCURSES_CONST char * const numcodes[];
+\fBNCURSES_CONST char * const numfnames[];
+\fBNCURSES_CONST char * const numnames[];
+.PP
+\fBNCURSES_CONST char * const strcodes[];
+\fBNCURSES_CONST char * const strfnames[];
+\fBNCURSES_CONST char * const strnames[];
 .fi
 .SH DESCRIPTION
 This page summarizes variables provided by the \fBcurses\fP library's
@@ -152,11 +146,9 @@ terminfo capability \fIlong name\fP.
 These are in terms of the symbol \fBCUR\fP,
 which is defined
 .PP
-.nf
-.ft \*(CW
-#define CUR ((TERMTYPE *)(cur_term))->
-.fi
-.ft R
+.EX
+#define CUR ((TERMTYPE *)(cur_term))\->
+.EE
 .PP
 These symbols provide a faster method of accessing terminfo capabilities
 than using \fBtigetstr\fP(3X), etc.
diff --git a/man/terminfo.head b/man/terminfo.head
index b114b4d89..7efe7f746 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,41 +27,32 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.51 2023/09/17 08:29:38 tom Exp $
-.TH terminfo 5 2023-09-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
-.ds n 5
-.ds d @TERMINFO@
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: terminfo.head,v 1.52 2023/10/07 21:19:07 tom Exp $
+.TH terminfo 5 2023-10-07 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.ie \n(.g .ds ' \(aq
+.el       .ds ' '
 .ie \n(.g .ds ^ \(ha
 .el       .ds ^ ^
 .ie \n(.g .ds ~ \(ti
 .el       .ds ~ ~
-.ie n .ds CW R
-.el   \{
-.ie \n(.g .ds CW CR
-.el       .ds CW CW
-.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft \*(CW
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
+.
+.ds n 5
+.ds d @TERMINFO@
 .SH NAME
 \fB\%terminfo\fP \-
 terminal capability database
@@ -94,7 +85,7 @@ consist of a sequence of fields:
 .bP
 Each field ends with a comma \*(``,\*(''
 (embedded commas may be
-escaped with a backslash or written as \*(``\\054\*('').
+escaped with a backslash or written as \*(``\e054\*('').
 .bP
 White space between fields is ignored.
 .bP
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 66cfbe74d..3da551078 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.132 2023/09/30 21:38:11 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.133 2023/10/07 20:53:54 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -84,40 +84,38 @@ described in the terminal database, in the section on
 The following entry, describing an ANSI-standard terminal, is representative
 of what a \fBterminfo\fP entry for a modern terminal typically looks like.
 .PP
-.nf
-.ft \*(CW
-\s-2ansi|ansi/pc-term compatible with color,
+.EX
+\s-2ansi|ansi/pc\-term compatible with color,
         am, mc5i, mir, msgr,
         colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
-        acsc=+\\020\\,\\021-\\030.^Y0\\333`\\004a\\261f\\370g\\361h\\260
-             j\\331k\\277l\\332m\\300n\\305o~p\\304q\\304r\\304s_t\\303
-             u\\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,
-        cr=^M, cub=\\E[%p1%dD, cub1=\\E[D, 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%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=\\E[I, hts=\\EH,
-        ich=\\E[%p1%d@, il=\\E[%p1%dL, il1=\\E[L, ind=^J,
-        indn=\\E[%p1%dS, invis=\\E[8m, kbs=^H, kcbt=\\E[Z, kcub1=\\E[D,
-        kcud1=\\E[B, kcuf1=\\E[C, kcuu1=\\E[A, khome=\\E[H, kich1=\\E[L,
-        mc4=\\E[4i, mc5=\\E[5i, nel=\\r\\E[S, op=\\E[39;49m,
-        rep=%p1%c\\E[%p2%{1}%-%db, rev=\\E[7m, rin=\\E[%p1%dT,
-        rmacs=\\E[10m, rmpch=\\E[10m, rmso=\\E[m, rmul=\\E[m,
-        s0ds=\\E(B, s1ds=\\E)B, s2ds=\\E*B, s3ds=\\E+B,
-        setab=\\E[4%p1%dm, setaf=\\E[3%p1%dm,
-        sgr=\\E[0;10%?%p1%t;7%;
+        acsc=+\e020\e,\e021\-\e030.\*^Y0\e333\(ga\e004a\e261f\e370g\e361h\e260
+             j\e331k\e277l\e332m\e300n\e305o\*~p\e304q\e304r\e304s_t\e303
+             u\e264v\e301w\e302x\e263y\e363z\e362{\e343|\e330}\e234\*~\e376,
+        bel=\*^G, blink=\eE[5m, bold=\eE[1m, cbt=\eE[Z, clear=\eE[H\eE[J,
+        cr=\*^M, cub=\eE[%p1%dD, cub1=\eE[D, cud=\eE[%p1%dB, cud1=\eE[B,
+        cuf=\eE[%p1%dC, cuf1=\eE[C, cup=\eE[%i%p1%d;%p2%dH,
+        cuu=\eE[%p1%dA, cuu1=\eE[A, dch=\eE[%p1%dP, dch1=\eE[P,
+        dl=\eE[%p1%dM, dl1=\eE[M, ech=\eE[%p1%dX, ed=\eE[J, el=\eE[K,
+        el1=\eE[1K, home=\eE[H, hpa=\eE[%i%p1%dG, ht=\eE[I, hts=\eEH,
+        ich=\eE[%p1%d@, il=\eE[%p1%dL, il1=\eE[L, ind=\*^J,
+        indn=\eE[%p1%dS, invis=\eE[8m, kbs=\*^H, kcbt=\eE[Z, kcub1=\eE[D,
+        kcud1=\eE[B, kcuf1=\eE[C, kcuu1=\eE[A, khome=\eE[H, kich1=\eE[L,
+        mc4=\eE[4i, mc5=\eE[5i, nel=\er\eE[S, op=\eE[39;49m,
+        rep=%p1%c\eE[%p2%{1}%\-%db, rev=\eE[7m, rin=\eE[%p1%dT,
+        rmacs=\eE[10m, rmpch=\eE[10m, rmso=\eE[m, rmul=\eE[m,
+        s0ds=\eE(B, s1ds=\eE)B, s2ds=\eE*B, s3ds=\eE+B,
+        setab=\eE[4%p1%dm, setaf=\eE[3%p1%dm,
+        sgr=\eE[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, smpch=\\E[11m, smso=\\E[7m,
-        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,
-.fi
-.ft R
+        sgr0=\eE[0;10m, smacs=\eE[11m, smpch=\eE[11m, smso=\eE[7m,
+        smul=\eE[4m, tbc=\eE[3g, u6=\eE[%i%d;%dR, u7=\eE[6n,
+        u8=\eE[?%[;0123456789]c, u9=\eE[c, vpa=\eE[%i%p1%dd,
+.EE
 .PP
 Entries may continue onto multiple lines by placing white space at
 the beginning of each line except the first.
@@ -166,7 +164,8 @@ for easy encoding of characters there:
 Both \fB\eE\fP and \fB\ee\fP
 map to an \s-1ESCAPE\s0 character,
 .bP
-\fB^x\fP maps to a control-x for any appropriate \fIx\fP, and
+\fB\*^\f(BIx\fR maps to a control-\fIx\fP for any appropriate \fIx\fP,
+and
 .bP
 the sequences
 .RS 6
@@ -184,13 +183,13 @@ respectively.
 .PP
 X/Open Curses does not say what \*(``appropriate \fIx\fP\*('' might be.
 In practice, that is a printable ASCII graphic character.
-The special case \*(``^?\*('' is interpreted as DEL (127).
+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.
 .PP
 Other escapes include
 .bP
-\fB\e^\fP for \fB^\fP,
+\fB\e\*^\fP for \fB\*^\fP,
 .bP
 \fB\e\e\fP for \fB\e\fP,
 .bP
@@ -432,28 +431,22 @@ These capabilities suffice to describe
 hard-copy and \*(``glass-tty\*('' terminals.
 Thus the model 33 teletype is described as
 .PP
-.DT
-.nf
-.ft \*(CW
+.EX
 .\".in -2
 \s-133\||\|tty33\||\|tty\||\|model 33 teletype,
-        bel=^G, cols#72, cr=^M, cud1=^J, hc, ind=^J, os,\s+1
+        bel=\*^G, cols#72, cr=\*^M, cud1=\*^J, hc, ind=\*^J, os,\s+1
 .\".in +2
-.ft R
-.fi
+.EE
 .PP
 while the Lear Siegler \s-1ADM-3\s0 is described as
 .PP
-.DT
-.nf
-.ft \*(CW
+.EX
 .\".in -2
 \s-1adm3\||\|3\||\|lsi adm3,
-        am, bel=^G, clear=^Z, cols#80, cr=^M, cub1=^H, cud1=^J,
-        ind=^J, lines#24,\s+1
+        am, bel=\*^G, clear=\*^Z, cols#80, cr=\*^M, cub1=\*^H, cud1=\*^J,
+        ind=\*^J, lines#24,\s+1
 .\".in +2
-.ft R
-.fi
+.EE
 .SS Parameterized Strings
 Cursor addressing and other strings requiring parameters
 in the terminal are described by a
@@ -488,7 +481,7 @@ as in \fBprintf\fP(3), flags are \fI[\-+#]\fP and \fIspace\fP.
 Use a \*(``:\*('' to allow the next character to be a \*(``\-\*('' flag,
 avoiding interpreting \*(``%\-\*('' as an operator.
 .TP
-\f\*(CW%c\fP
+\fB%c\fP
 print \fIpop()\fP like %c in \fBprintf\fP
 .TP
 \fB%s\fP
@@ -554,7 +547,7 @@ Use static variables if persistent storage is needed.
 .RE
 .RE
 .TP
-\fB%\(aq\fIc\fB\(aq\fR
+\fB%\*'\fIc\fB\*'\fR
 char constant \fIc\fP
 .TP
 \fB%{\fInn\fB}\fR
@@ -566,7 +559,7 @@ push strlen(pop)
 \fB%+\fP, \fB%\-\fP, \fB%*\fP, \fB%/\fP, \fB%m\fP
 arithmetic (%m is \fImod\fP): \fIpush(pop() op pop())\fP
 .TP
-\fB%&\fP, \fB%|\fP, \fB%^\fP
+\fB%&\fP, \fB%|\fP, \fB%\*^\fP
 bit operations (AND, OR and exclusive-OR): \fIpush(pop() op pop())\fP
 .TP
 \fB%=\fP, \fB%>\fP, \fB%<\fP
@@ -575,7 +568,7 @@ logical operations: \fIpush(pop() op pop())\fP
 \fB%A\fP, \fB%O\fP
 logical AND and OR operations (for conditionals)
 .TP
-\fB%!\fP, \fB%~\fP
+\fB%!\fP, \fB%\*~\fP
 unary operations (logical and bit complement): \fIpush(op pop())\fP
 .TP
 \fB%i\fP
@@ -616,16 +609,16 @@ cup=\eE&a%p2%dc%p1%dY$<6>,
 .RE
 .PP
 The Microterm \s-1ACT-IV\s0 needs the current row and column sent
-preceded by a \fB^T\fP, with the row and column simply encoded in binary,
+preceded by a \fB\*^T\fP, with the row and column simply encoded in binary,
 .RS
-cup=^T%p1%c%p2%c
+cup=\*^T%p1%c%p2%c
 .RE
 .PP
 Terminals which use \*(``%c\*('' need to be able to
 backspace the cursor (\fBcub1\fP),
 and to move the cursor up one line on the screen (\fBcuu1\fP).
 This is necessary because it is not always safe to transmit \fB\en\fP
-\fB^D\fP and \fB\er\fP, as the system may change or discard them.
+\fB\*^D\fP and \fB\er\fP, as the system may change or discard them.
 (The library routines dealing with terminfo set tty modes so that
 tabs are never expanded, so \et is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
@@ -633,7 +626,7 @@ This turns out to be essential for the Ann Arbor 4080.)
 A final example is the \s-1LSI ADM\s0-3a, which uses row and column
 offset by a blank character, thus
 .RS
-cup=\eE=%p1%\(aq \(aq%+%c%p2%\(aq \(aq%+%c
+cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
 .RE
 .PP
 After sending \*(``\eE=\*('', this pushes the first parameter, pushes the
@@ -870,7 +863,7 @@ automatically, so you need not compose insert/delete strings for
 an entry with \fBcsr\fP).
 .PP
 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
+index with the memory-lock feature found on some terminals (like the HP-700/90
 series, which however also has insert/delete).
 .PP
 Inserting lines at the top or bottom of the screen can also be
@@ -1099,7 +1092,7 @@ p5	dim	not available
 p6	bold	\eE[0;1m
 p7	invis	\eE[0;8m
 p8	protect	not used
-p9	altcharset	^O (off) ^N (on)
+p9	altcharset	\*^O (off) \*^N (on)
 .TE
 .PP
 We begin each escape sequence by turning off any existing modes, since
@@ -1108,9 +1101,9 @@ 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 erasures.
-The altcharset mode also is different in that it is either ^O or ^N,
+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.
+If all modes are turned on, the resulting sequence is \eE[0;1;4;5;7;8m\*^N.
 .PP
 Some sequences are common to different modes.
 For example, ;7 is output when either p1 or p3 is true, that is, if
@@ -1125,7 +1118,7 @@ lb lb lb
 l  l  l .
 Sequence	When to Output	terminfo Translation
 _
-\\E[0	always	\\E[0
+\eE[0	always	\eE[0
 ;1	if p1 or p6	%?%p1%p6%|%t;1%;
 ;4	if p2	%?%p2%|%t;4%;
 ;5	if p4	%?%p4%|%t;5%;
@@ -1137,12 +1130,10 @@ m	always	m
 .PP
 Putting this all together into the sgr sequence gives:
 .PP
-.ft \*(CW
-.nf
-    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%;,
-.fi
-.ft R
+.EX
+    sgr=\eE[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
+        %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\e016%e\e017%;,
+.EE
 .PP
 Remember that if you specify sgr, you must also specify sgr0.
 Also, some implementations rely on sgr being given if sgr0 is,
@@ -1487,7 +1478,7 @@ These may require padding characters
 after certain cursor motions and screen changes.
 .PP
 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
+it automatically emits \*^S back to the host when its input buffers are
 close to full), set
 .BR xon .
 This capability suppresses the emission of padding.
@@ -1561,7 +1552,7 @@ arrow pointing left	ACS_LARROW	<	,	0x2c
 arrow pointing up	ACS_UARROW	\*^	\-	0x2d
 arrow pointing down	ACS_DARROW	v	.	0x2e
 solid square block	ACS_BLOCK	#	0	0x30
-diamond         	ACS_DIAMOND	+	`	0x60
+diamond         	ACS_DIAMOND	+	\(ga	0x60
 checker board (stipple)	ACS_CKBOARD	:	a	0x61
 degree symbol   	ACS_DEGREE	\e	f	0x66
 plus/minus      	ACS_PLMINUS	#	g	0x67
@@ -1809,7 +1800,7 @@ this can be indicated with the parameterized string
 .BR 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, \(aqx\(aq, 10) is the same as \*(``xxxxxxxxxx\*(''.
+Thus, tparm(repeat_char, \*'x\*', 10) is the same as \*(``xxxxxxxxxx\*(''.
 .PP
 If the terminal has a settable command character,
 such as the \s-1TEKTRONIX\s+1 4025,
@@ -1890,7 +1881,7 @@ is transparently passed to the printer while an
 is in effect.
 .SS Glitches and Braindamage
 Hazeltine terminals,
-which do not allow \*(``~\*('' characters to be displayed should
+which do not allow \*(``\*~\*('' characters to be displayed should
 indicate \fBhz\fP.
 .PP
 Terminals which ignore a line-feed immediately after an \fBam\fP wrap,
diff --git a/man/tic.1m b/man/tic.1m
index dfcaa31e7..d76cf33c9 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,18 +27,26 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.96 2023/09/30 21:38:11 tom Exp $
-.TH @TIC@ 1M 2023-09-30 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
-.ds n 5
-.ds d @TERMINFO@
+.\" $Id: tic.1m,v 1.97 2023/10/07 21:19:07 tom Exp $
+.TH @TIC@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
+.ds n 5
+.ds d @TERMINFO@
 .SH NAME
 \fB\%@TIC@\fP \-
 compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR
@@ -236,7 +244,7 @@ Force source translation to terminfo format.
 .TP
 \fB\-K\fP
 Suppress some longstanding ncurses extensions to termcap format,
-e.g., "\\s" for space.
+e.g., "\es" for space.
 .TP
 \fB\-L\fP
 Force source translation to terminfo format
diff --git a/man/toe.1m b/man/toe.1m
index af0f48998..132146b9b 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,17 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.51 2023/10/01 09:45:05 tom Exp $
-.TH @TOE@ 1M 2023-10-01 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: toe.1m,v 1.52 2023/10/07 21:19:07 tom Exp $
+.TH @TOE@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .ie n .ds CW R
 .el   \{
 .ie \n(.g .ds CW CR
 .el       .ds CW CW
 .\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/tput.1 b/man/tput.1
index 314bf38f8..2ea0471af 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,18 +28,25 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.85 2023/09/30 21:38:11 tom Exp $
-.TH @TPUT@ 1 2023-09-30 "ncurses 6.4" "User commands"
-.ds d @TERMINFO@
-.ds n 1
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: tput.1,v 1.86 2023/10/07 21:19:07 tom Exp $
+.TH @TPUT@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ds n 1
+.ds d @TERMINFO@
 .SH NAME
 \fB\%@TPUT@\fP,
 \fB\%reset\fP \-
@@ -320,12 +327,12 @@ Print the number of columns for the current terminal.
 \fB@TPUT@ \-T450 cols\fP
 Print the number of columns for the 450 terminal.
 .TP 5
-\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fP
+\fBbold=\(ga@TPUT@ smso\(ga offbold=\(ga@TPUT@ rmso\(ga\fP
 Set the shell variables \fBbold\fP, to begin stand-out mode
 sequence, and \fBoffbold\fP, to end standout mode sequence,
 for the current terminal.
 This might be followed by a
-prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fP
+prompt: \fBecho "${bold}Please type in your name: ${offbold}\ec"\fP
 .TP 5
 \fB@TPUT@ hc\fP
 Set exit code to indicate if the current terminal is a hard copy terminal.
diff --git a/man/tset.1 b/man/tset.1
index a5ca03527..877f0a8a0 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,12 +27,21 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.71 2023/09/30 21:38:11 tom Exp $
-.TH @TSET@ 1 2023-09-30 "ncurses 6.4" "User commands"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: tset.1,v 1.72 2023/10/07 21:19:07 tom Exp $
+.TH @TSET@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds ^  \(ha
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ds       ^  ^
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -200,7 +209,7 @@ unless \fBsetupterm\fP is not able to detect the window size.
 The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP
 options may either be entered as actual characters
 or by using the \*(``hat\*(''
-notation, i.e., control-h may be specified as \*(``^H\*('' or \*(``^h\*(''.
+notation, i.e., control-h may be specified as \*(``\*^H\*('' or \*(``\*^h\*(''.
 .PP
 If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed.
 .
@@ -219,7 +228,7 @@ Note, the \fBcsh\fP commands set and unset the shell variable
 The following line in the \fB.login\fP
 or \fB.profile\fP files will initialize the environment correctly:
 .sp
-    eval \`@TSET@ \-s options ... \`
+    eval \(ga@TSET@ \-s options ... \(ga
 .
 .SH TERMINAL TYPE MAPPING
 When the terminal is not hardwired into the system (or the current
diff --git a/man/user_caps.5 b/man/user_caps.5
index 27c48f83d..7ffd4b31e 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,12 +28,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.40 2023/09/30 23:47:46 tom Exp $
-.TH user_caps 5 2023-09-30 "ncurses 6.4" "File formats"
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.\" $Id: user_caps.5,v 1.41 2023/10/07 21:19:07 tom Exp $
+.TH user_caps 5 2023-10-07 "ncurses 6.4" "File formats"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,7 +49,9 @@
 user_caps \-
 user-defined \fIterminfo\fR capability format
 .SH SYNOPSIS
-.B @TIC@ -x, @INFOCMP@ -x
+.B @INFOCMP@ \-x
+.PP
+.B @TIC@ \-x
 .SH DESCRIPTION
 .SS Background
 Before ncurses 5.0,
@@ -317,15 +326,15 @@ xterm mouse protocols:
 .IP
 .nf
   xterm+x11mouse|X11 xterm mouse protocol,
-          kmous=\\E[M, XM=\\E[?1000%?%p1%{1}%=%th%el%;,
-          xm=\\E[M
+          kmous=\eE[M, XM=\eE[?1000%?%p1%{1}%=%th%el%;,
+          xm=\eE[M
              %?%p4%t%p3%e%{3}%;%'\ '%+%c
              %p2%'!'%+%c
              %p1%'!'%+%c,
 
   xterm+sm+1006|xterm SGR-mouse,
-          kmous=\\E[<, XM=\\E[?1006;1000%?%p1%{1}%=%th%el%;,
-          xm=\\E[<%i%p3%d;
+          kmous=\eE[<, XM=\eE[?1006;1000%?%p1%{1}%=%th%el%;,
+          xm=\eE[<%i%p3%d;
              %p1%d;
              %p2%d;
              %?%p4%tM%em%;,
diff --git a/man/wresize.3x b/man/wresize.3x
index ab2674d66..6a31db493 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,15 +29,17 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.31 2023/09/30 21:38:11 tom Exp $
-.TH wresize 3X 2023-09-30 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
+.TH wresize 3X 2023-10-07 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint wresize(WINDOW *\fIwin\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint wresize(WINDOW *\fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the curses library.
 It reallocates storage for an \fBncurses\fP
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index cd0973893..b3cac8150 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.226 2023/10/01 23:53:23 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.228 2023/10/07 23:06:04 tom Exp $")
 
 /****************************************************************************
  *
@@ -335,13 +335,13 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 
 	s = memset(buf, '\0', sizeof(buf));
 	do {
-	    int ask = (int) (sizeof(buf) - 1 - (s - buf));
+	    size_t ask = (sizeof(buf) - 1 - (size_t) (s - buf));
 	    int got = (int) read(fd, s, ask);
 	    if (got == 0)
 		break;
 	    s += got;
 	    *s = '\0';
-	} while (strchr(buf, 'R') == NULL);
+	} while (strchr(buf, 'R') == NULL && (size_t) (s + 1 - buf) < sizeof(buf));
 	T(("response %s", _nc_visbuf(buf)));
 	if (sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &ignore) != 2
 	    || (ignore != 'R' && ignore != ';')) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8be102adb..f5f2e1266 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231001) unstable; urgency=low
+ncurses6 (6.4+20231007) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8be102adb..f5f2e1266 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231001) unstable; urgency=low
+ncurses6 (6.4+20231007) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 432ff028d..ed5109ef1 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231001) unstable; urgency=low
+ncurses6 (6.4+20231007) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Oct 2023 04:35:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 581a2d801..30dd4299b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.609 2023/10/01 08:35:58 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.610 2023/10/07 10:05:48 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1001"
+!define VERSION_MMDD  "1007"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9f292f259..8531ed6e1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231001
+Release: 20231007
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index bf428407d..282ffb541 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231001
+Release: 20231007
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index ce2d089b5..36dbc11b1 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231001
+Release: 20231007
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From caf3ac02cacabbc5a8e4689addeed302c4ea287b Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 15 Oct 2023 01:56:09 +0200
Subject: [PATCH 034/106] ncurses-6.4-20231014.patch

---
 Ada95/aclocal.m4                   |   75 +-
 Ada95/configure                    | 2971 ++++++++++-----------
 NEWS                               |    7 +-
 VERSION                            |    2 +-
 aclocal.m4                         |    6 +-
 config.guess                       |    8 +-
 config.sub                         |  155 +-
 configure                          |  900 ++++---
 dist.mk                            |    4 +-
 doc/html/man/captoinfo.1m.html     |   35 +-
 doc/html/man/curs_color.3x.html    |   10 +-
 doc/html/man/curs_kernel.3x.html   |   28 +-
 doc/html/man/curs_mouse.3x.html    |   43 +-
 doc/html/man/curs_print.3x.html    |   10 +-
 doc/html/man/curs_sp_funcs.3x.html |   10 +-
 doc/html/man/curs_termcap.3x.html  |   75 +-
 doc/html/man/curs_terminfo.3x.html |   23 +-
 doc/html/man/curs_util.3x.html     |   49 +-
 doc/html/man/curs_window.3x.html   |   94 +-
 doc/html/man/infocmp.1m.html       |   21 +-
 doc/html/man/infotocap.1m.html     |    8 +-
 doc/html/man/ncurses.3x.html       |  698 ++---
 doc/html/man/panel.3x.html         |   15 +-
 doc/html/man/tabs.1.html           |   14 +-
 doc/html/man/term.5.html           |   11 +-
 doc/html/man/term.7.html           |   12 +-
 doc/html/man/terminfo.5.html       |   55 +-
 doc/html/man/tic.1m.html           |   12 +-
 doc/html/man/toe.1m.html           |   20 +-
 doc/html/man/tput.1.html           |  177 +-
 doc/html/man/tset.1.html           |   12 +-
 include/Caps                       |   42 +-
 include/Caps.aix4                  |   42 +-
 include/Caps.hpux11                |   42 +-
 include/Caps.keys                  |   42 +-
 include/Caps.osf1r5                |   38 +-
 include/Caps.uwin                  |   42 +-
 man/captoinfo.1m                   |    8 +-
 man/curs_color.3x                  |    6 +-
 man/curs_kernel.3x                 |   11 +-
 man/curs_mouse.3x                  |   43 +-
 man/curs_print.3x                  |   10 +-
 man/curs_sp_funcs.3x               |    6 +-
 man/curs_termcap.3x                |   82 +-
 man/curs_terminfo.3x               |   24 +-
 man/curs_util.3x                   |   34 +-
 man/curs_window.3x                 |   39 +-
 man/infocmp.1m                     |   19 +-
 man/infotocap.1m                   |    8 +-
 man/manhtml.aliases                |    3 +-
 man/ncurses.3x                     |   17 +-
 man/panel.3x                       |   10 +-
 man/tabs.1                         |    8 +-
 man/term.5                         |   14 +-
 man/term.7                         |    8 +-
 man/terminfo.head                  |   16 +-
 man/terminfo.tail                  |    8 +-
 man/tic.1m                         |   12 +-
 man/toe.1m                         |   10 +-
 man/tput.1                         |   17 +-
 man/tset.1                         |   12 +-
 package/debian-mingw/changelog     |    4 +-
 package/debian-mingw64/changelog   |    4 +-
 package/debian/changelog           |    4 +-
 package/mingw-ncurses.nsi          |    4 +-
 package/mingw-ncurses.spec         |    2 +-
 package/ncurses.spec               |    2 +-
 package/ncursest.spec              |    2 +-
 test/aclocal.m4                    |   75 +-
 test/configure                     | 3913 ++++++++++++++--------------
 70 files changed, 5349 insertions(+), 4894 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 289bd73b5..f14cfaee2 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.202 2023/04/15 20:02:10 tom Exp $
+dnl $Id: aclocal.m4,v 1.203 2023/09/06 22:55:27 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2126,7 +2126,7 @@ CPPFLAGS="-I. $CPPFLAGS"
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30
 dnl ---------------
 dnl prompt for/fill-in useful install-program options
 AC_DEFUN([CF_INSTALL_OPTS],
@@ -2134,6 +2134,7 @@ AC_DEFUN([CF_INSTALL_OPTS],
 CF_INSTALL_OPT_S
 CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
+CF_INSTALL_OPT_STRIP_PROG
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42
@@ -2220,6 +2221,72 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30
+dnl -------------------------
+dnl Provide an option for overriding the strip program used in install "-s"
+dnl
+dnl coreutils install provides a --strip-program option
+dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use
+dnl STRIP environment variable.  Other versions of install do not support this.
+AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG],
+[
+AC_REQUIRE([CF_INSTALL_OPT_S])
+if test -n "$INSTALL_OPT_S"
+then
+	AC_MSG_CHECKING(if you want to specify strip-program)
+	AC_ARG_WITH(strip-program,
+		[  --with-strip-program=XX specify program to use when stripping in install],
+		[with_strip_program=$withval],
+		[with_strip_program=no])
+	AC_MSG_RESULT($with_strip_program)
+	if test "$with_strip_program" != no
+	then
+		AC_MSG_CHECKING(if strip-program is supported with this installer)
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		AC_MSG_RESULT($check_install_strip)
+		case "$check_install_strip" in
+		(no)
+			AC_MSG_WARN($cf_install_program does not support strip program option)
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "[$]@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			CF_VERBOSE(created $INSTALL)
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
@@ -5045,7 +5112,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -5105,7 +5172,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
diff --git a/Ada95/configure b/Ada95/configure
index 7d87aaf95..59e75b183 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.91 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230114.
+# Generated by Autoconf 2.52.20230903.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -704,6 +704,7 @@ Optional Features:
 General Options:
   --with-system-type=XXX  test: override derived host system-type
   --disable-stripping     do not strip (debug info) installed executables
+  --with-strip-program=XX specify program to use when stripping in install
   --with-pkg-config{=path} enable/disable use of pkg-config
   --with-pkg-config-libdir=XXX use given directory for installing pc-files
   --without-tests         suppress build with test-programs
@@ -822,7 +823,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230114.  Invocation command line was
+generated by GNU Autoconf 2.52.20230903.  Invocation command line was
 
   $ $0 $@
 
@@ -946,7 +947,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:949: loading site script $ac_site_file" >&5
+    { echo "$as_me:950: 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"
@@ -957,7 +958,7 @@ if test -r "$cache_file"; then
   # 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:960: loading cache $cache_file" >&5
+    { echo "$as_me:961: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -965,7 +966,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:968: creating cache $cache_file" >&5
+  { echo "$as_me:969: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -981,21 +982,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:984: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:985: 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:988: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:989: 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:994: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:995: 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:996:   former value:  $ac_old_val" >&5
+        { echo "$as_me:997:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:998:   current value: $ac_new_val" >&5
+        { echo "$as_me:999:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1014,9 +1015,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1017: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1018: 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:1019: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1020: 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
@@ -1045,10 +1046,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1048: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1049: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1051: \$? = $ac_status" >&5
+  echo "$as_me:1052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1080,7 +1081,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1083: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1084: 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
@@ -1090,11 +1091,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1093: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1094: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1097: checking build system type" >&5
+echo "$as_me:1098: 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
@@ -1103,23 +1104,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1106: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1107: 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:1110: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1111: 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:1115: result: $ac_cv_build" >&5
+echo "$as_me:1116: 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:1122: checking host system type" >&5
+echo "$as_me:1123: 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
@@ -1128,12 +1129,12 @@ else
 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:1131: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1132: 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:1136: result: $ac_cv_host" >&5
+echo "$as_me:1137: 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/'`
@@ -1141,7 +1142,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1144: checking target system type" >&5
+	echo "$as_me:1145: 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
@@ -1150,12 +1151,12 @@ else
 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:1153: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1154: 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:1158: result: $ac_cv_target" >&5
+echo "$as_me:1159: 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/'`
@@ -1187,13 +1188,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1190: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1191: 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:1194: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1195: 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:1196: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1197: 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
@@ -1201,7 +1202,7 @@ fi
 # 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:1204: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1205: 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
@@ -1216,7 +1217,7 @@ for ac_prog in ggrep grep
 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:1219: checking for $ac_word" >&5
+echo "$as_me:1220: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1231,7 +1232,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1234: found $ac_dir/$ac_word" >&5
+echo "$as_me:1235: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1239,10 +1240,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1242: result: $GREP" >&5
+  echo "$as_me:1243: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1245: result: no" >&5
+  echo "$as_me:1246: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1250,7 +1251,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1253: checking for fgrep" >&5
+echo "$as_me:1254: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1262,7 +1263,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1265: checking for $ac_word" >&5
+echo "$as_me:1266: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1279,7 +1280,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1282: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1283: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1290,10 +1291,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1293: result: $FGREP" >&5
+  echo "$as_me:1294: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1296: result: no" >&5
+  echo "$as_me:1297: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1301,16 +1302,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1304: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1305: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1309: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1310: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1313: checking for prefix" >&5
+echo "$as_me:1314: 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
@@ -1322,11 +1323,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1325: result: $prefix" >&5
+echo "$as_me:1326: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1329: checking for default include-directory" >&5
+echo "$as_me:1330: 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 \
@@ -1349,7 +1350,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1352: result: $includedir" >&5
+echo "$as_me:1353: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1366,7 +1367,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1369: checking for $ac_word" >&5
+echo "$as_me:1370: 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
@@ -1381,7 +1382,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+echo "$as_me:1385: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1389,10 +1390,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1392: result: $CC" >&5
+  echo "$as_me:1393: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1395: result: no" >&5
+  echo "$as_me:1396: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1405,7 +1406,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1408: checking for $ac_word" >&5
+echo "$as_me:1409: 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
@@ -1420,7 +1421,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1423: found $ac_dir/$ac_word" >&5
+echo "$as_me:1424: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1428,10 +1429,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1431: result: $ac_ct_CC" >&5
+  echo "$as_me:1432: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1434: result: no" >&5
+  echo "$as_me:1435: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1441,32 +1442,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1444: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1445: 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:1449:" \
+echo "$as_me:1450:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1452: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1453: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1455: \$? = $ac_status" >&5
+  echo "$as_me:1456: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1457: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1458: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1460: \$? = $ac_status" >&5
+  echo "$as_me:1461: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1462: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1463: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1465: \$? = $ac_status" >&5
+  echo "$as_me:1466: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1469 "configure"
+#line 1470 "configure"
 #include "confdefs.h"
 
 int
@@ -1482,13 +1483,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1485: checking for C compiler default output" >&5
+echo "$as_me:1486: 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:1488: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1489: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1491: \$? = $ac_status" >&5
+  echo "$as_me:1492: \$? = $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
@@ -1511,34 +1512,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1514: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1515: 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:1520: result: $ac_file" >&5
+echo "$as_me:1521: 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:1525: checking whether the C compiler works" >&5
+echo "$as_me:1526: 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:1531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1534: \$? = $ac_status" >&5
+  echo "$as_me:1535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1541: error: cannot run C compiled programs.
+	{ { echo "$as_me:1542: 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;}
@@ -1546,24 +1547,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1549: result: yes" >&5
+echo "$as_me:1550: 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:1556: checking whether we are cross compiling" >&5
+echo "$as_me:1557: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1558: result: $cross_compiling" >&5
+echo "$as_me:1559: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1561: checking for executable suffix" >&5
+echo "$as_me:1562: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1566: \$? = $ac_status" >&5
+  echo "$as_me:1567: \$? = $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
@@ -1579,25 +1580,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1582: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1583: 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:1588: result: $ac_cv_exeext" >&5
+echo "$as_me:1589: 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:1594: checking for object suffix" >&5
+echo "$as_me:1595: 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 1600 "configure"
+#line 1601 "configure"
 #include "confdefs.h"
 
 int
@@ -1609,10 +1610,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1615: \$? = $ac_status" >&5
+  echo "$as_me:1616: \$? = $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
@@ -1624,24 +1625,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1627: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1628: 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:1634: result: $ac_cv_objext" >&5
+echo "$as_me:1635: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1638: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1639: 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 1644 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 
 int
@@ -1656,16 +1657,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1662: \$? = $ac_status" >&5
+  echo "$as_me:1663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1668: \$? = $ac_status" >&5
+  echo "$as_me:1669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1677,19 +1678,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1680: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1681: 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:1686: checking whether $CC accepts -g" >&5
+echo "$as_me:1687: 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 1692 "configure"
+#line 1693 "configure"
 #include "confdefs.h"
 
 int
@@ -1701,16 +1702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1707: \$? = $ac_status" >&5
+  echo "$as_me:1708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1713: \$? = $ac_status" >&5
+  echo "$as_me:1714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1720,7 +1721,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1723: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1724: 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
@@ -1747,16 +1748,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1753: \$? = $ac_status" >&5
+  echo "$as_me:1754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1759: \$? = $ac_status" >&5
+  echo "$as_me:1760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1768,7 +1769,7 @@ if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1771 "configure"
+#line 1772 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1781,16 +1782,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1787: \$? = $ac_status" >&5
+  echo "$as_me:1788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1793: \$? = $ac_status" >&5
+  echo "$as_me:1794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1800,7 +1801,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1803 "configure"
+#line 1804 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1812,16 +1813,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1818: \$? = $ac_status" >&5
+  echo "$as_me:1819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1824: \$? = $ac_status" >&5
+  echo "$as_me:1825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1851,11 +1852,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1854: checking version of $CC" >&5
+	echo "$as_me:1855: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1858: result: $GCC_VERSION" >&5
+	echo "$as_me:1859: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1864,12 +1865,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1867: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1868: 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 1872 "configure"
+#line 1873 "configure"
 #include "confdefs.h"
 
 int
@@ -1886,16 +1887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1892: \$? = $ac_status" >&5
+  echo "$as_me:1893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1898: \$? = $ac_status" >&5
+  echo "$as_me:1899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1906,7 +1907,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1909: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1910: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1915,11 +1916,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1918: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1919: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1922 "configure"
+#line 1923 "configure"
 #include "confdefs.h"
 
 int
@@ -1936,16 +1937,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1942: \$? = $ac_status" >&5
+  echo "$as_me:1943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1948: \$? = $ac_status" >&5
+  echo "$as_me:1949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -1955,7 +1956,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:1958: result: $CLANG_COMPILER" >&5
+	echo "$as_me:1959: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -1964,30 +1965,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:1967: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:1968: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:1974: checking version of $CC" >&5
+	echo "$as_me:1975: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:1978: result: $CLANG_VERSION" >&5
+	echo "$as_me:1979: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:1985: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:1986: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 1990 "configure"
+#line 1991 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2001,16 +2002,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2007: \$? = $ac_status" >&5
+  echo "$as_me:2008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2013: \$? = $ac_status" >&5
+  echo "$as_me:2014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2021,13 +2022,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2024: result: $cf_clang_optok" >&5
+		echo "$as_me:2025: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2031: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2036,7 +2037,7 @@ echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2039: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2040: 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
@@ -2044,7 +2045,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2047 "configure"
+#line 2048 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2091,16 +2092,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2097: \$? = $ac_status" >&5
+  echo "$as_me:2098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2103: \$? = $ac_status" >&5
+  echo "$as_me:2104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2117,10 +2118,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2120: result: none needed" >&5
+    echo "$as_me:2121: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2123: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2124: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2128,13 +2129,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2131: checking \$CFLAGS variable" >&5
+echo "$as_me:2132: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2135: result: broken" >&5
+	echo "$as_me:2136: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2137: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2138: 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=
@@ -2242,18 +2243,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2245: result: ok" >&5
+	echo "$as_me:2246: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2250: checking \$CC variable" >&5
+echo "$as_me:2251: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2254: result: broken" >&5
+	echo "$as_me:2255: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2256: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2257: 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/[ ]*[ ]-[^ ].*//'`
@@ -2370,24 +2371,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2373: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2374: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2377: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2378: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2381: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2382: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2385: result: ok" >&5
+	echo "$as_me:2386: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2390: checking for egrep" >&5
+echo "$as_me:2391: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2399,7 +2400,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2402: checking for $ac_word" >&5
+echo "$as_me:2403: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2416,7 +2417,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2419: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2420: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2427,10 +2428,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2430: result: $EGREP" >&5
+  echo "$as_me:2431: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2433: result: no" >&5
+  echo "$as_me:2434: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2438,12 +2439,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2441: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2442: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2446: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2447: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2453,7 +2454,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2456: checking how to run the C preprocessor" >&5
+echo "$as_me:2457: 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
@@ -2474,18 +2475,18 @@ do
   # 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 2477 "configure"
+#line 2478 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2482: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2483: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2488: \$? = $ac_status" >&5
+  echo "$as_me:2489: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2508,17 +2509,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2511 "configure"
+#line 2512 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2516: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2521: \$? = $ac_status" >&5
+  echo "$as_me:2522: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2555,7 +2556,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2558: result: $CPP" >&5
+echo "$as_me:2559: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2565,18 +2566,18 @@ do
   # 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 2568 "configure"
+#line 2569 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2574: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2579: \$? = $ac_status" >&5
+  echo "$as_me:2580: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2599,17 +2600,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2602 "configure"
+#line 2603 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2606: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2607: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2612: \$? = $ac_status" >&5
+  echo "$as_me:2613: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2637,7 +2638,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2640: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2641: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2650,14 +2651,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2653: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2654: 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 2660 "configure"
+#line 2661 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2672,7 +2673,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 2675 "configure"
+#line 2676 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2685,14 +2686,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:2688: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2689: 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:2695: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2696: 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
@@ -2707,15 +2708,15 @@ CF_EOF
 # 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:2710: \"$ac_try\"") >&5
+if { (eval echo "$as_me:2711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2713: \$? = $ac_status" >&5
+  echo "$as_me:2714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2715: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2718: \$? = $ac_status" >&5
+  echo "$as_me:2719: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -2726,10 +2727,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:2729: result: yes" >&5
+  echo "$as_me:2730: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2732: result: no" >&5
+  echo "$as_me:2733: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2750,7 +2751,7 @@ for ac_prog in mawk gawk nawk awk
 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:2753: checking for $ac_word" >&5
+echo "$as_me:2754: 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
@@ -2765,7 +2766,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2768: found $ac_dir/$ac_word" >&5
+echo "$as_me:2769: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2773,21 +2774,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2776: result: $AWK" >&5
+  echo "$as_me:2777: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2779: result: no" >&5
+  echo "$as_me:2780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:2786: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:2787: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2790: checking for egrep" >&5
+echo "$as_me:2791: 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
@@ -2797,11 +2798,11 @@ else
 		else ac_cv_prog_egrep='egrep'
 	fi
 fi
-echo "$as_me:2800: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:2801: 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:2804: error: No egrep program found" >&5
+	test -z "$EGREP" && { { echo "$as_me:2805: error: No egrep program found" >&5
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -2817,7 +2818,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # 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:2820: checking for a BSD compatible install" >&5
+echo "$as_me:2821: 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
@@ -2866,7 +2867,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2869: result: $INSTALL" >&5
+echo "$as_me:2870: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2877,18 +2878,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2880: checking whether ln -s works" >&5
+echo "$as_me:2881: 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:2884: result: yes" >&5
+  echo "$as_me:2885: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2887: result: no, using $LN_S" >&5
+  echo "$as_me:2888: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2891: checking if $LN_S -f options work" >&5
+echo "$as_me:2892: 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
@@ -2900,7 +2901,7 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:2903: result: $cf_prog_ln_sf" >&5
+echo "$as_me:2904: 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"
@@ -2917,7 +2918,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 # 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:2920: checking for a BSD compatible install" >&5
+echo "$as_me:2921: 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
@@ -2966,7 +2967,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2969: result: $INSTALL" >&5
+echo "$as_me:2970: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2987,7 +2988,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:2990: checking if you want to install stripped executables" >&5
+echo "$as_me:2991: 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.
@@ -3004,7 +3005,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:3007: result: $enable_stripping" >&5
+echo "$as_me:3008: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -3015,7 +3016,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:3018: checking if install accepts -p option" >&5
+echo "$as_me:3019: 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
@@ -3046,10 +3047,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3049: result: $cf_cv_install_p" >&5
+echo "$as_me:3050: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3052: checking if install needs to be told about ownership" >&5
+echo "$as_me:3053: 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)
@@ -3060,7 +3061,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3063: result: $with_install_o" >&5
+echo "$as_me:3064: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3069,7 +3070,73 @@ else
 	INSTALL_OPT_O=
 fi
 
-echo "$as_me:3072: checking for long file names" >&5
+if test -n "$INSTALL_OPT_S"
+then
+	echo "$as_me:3075: checking if you want to specify strip-program" >&5
+echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+
+# Check whether --with-strip-program or --without-strip-program was given.
+if test "${with_strip_program+set}" = set; then
+  withval="$with_strip_program"
+  with_strip_program=$withval
+else
+  with_strip_program=no
+fi;
+	echo "$as_me:3085: result: $with_strip_program" >&5
+echo "${ECHO_T}$with_strip_program" >&6
+	if test "$with_strip_program" != no
+	then
+		echo "$as_me:3089: checking if strip-program is supported with this installer" >&5
+echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		echo "$as_me:3110: result: $check_install_strip" >&5
+echo "${ECHO_T}$check_install_strip" >&6
+		case "$check_install_strip" in
+		(no)
+			{ echo "$as_me:3114: WARNING: $cf_install_program does not support strip program option" >&5
+echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "$@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+
+echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5
+
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+
+echo "$as_me:3139: 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
@@ -3108,7 +3175,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3111: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3178: 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
 
@@ -3120,7 +3187,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:3123: checking if you want to use pkg-config" >&5
+echo "$as_me:3190: 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.
@@ -3130,7 +3197,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:3133: result: $cf_pkg_config" >&5
+echo "$as_me:3200: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -3142,7 +3209,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3145: checking for $ac_word" >&5
+echo "$as_me:3212: 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
@@ -3159,7 +3226,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3162: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3229: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3170,10 +3237,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3173: result: $PKG_CONFIG" >&5
+  echo "$as_me:3240: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3176: result: no" >&5
+  echo "$as_me:3243: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3182,7 +3249,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3185: checking for $ac_word" >&5
+echo "$as_me:3252: 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
@@ -3199,7 +3266,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3202: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3269: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3211,10 +3278,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:3214: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3281: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:3217: result: no" >&5
+  echo "$as_me:3284: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3257,24 +3324,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:3260: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:3327: 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:3267: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:3334: 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:3273: checking for pkg-config library directory" >&5
+	echo "$as_me:3340: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:3277: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:3344: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -3301,7 +3368,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:3304: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3371: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -3312,16 +3379,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:3315: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3382: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:3320: result: auto" >&5
+	echo "$as_me:3387: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:3324: checking for search-list" >&5
+	echo "$as_me:3391: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -3348,11 +3415,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:3351: result: $cf_search_path" >&5
+	echo "$as_me:3418: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:3355: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:3422: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -3360,7 +3427,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:3363: checking for first directory" >&5
+	echo "$as_me:3430: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -3371,7 +3438,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:3374: result: $cf_pkg_config_path" >&5
+	echo "$as_me:3441: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -3381,7 +3448,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:3384: checking for workaround" >&5
+		echo "$as_me:3451: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -3404,12 +3471,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:3407: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:3474: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
-echo "$as_me:3412: checking if you want to build test-programs" >&5
+echo "$as_me:3479: 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.
@@ -3419,10 +3486,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3422: result: $cf_with_tests" >&5
+echo "$as_me:3489: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3425: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3492: 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.
@@ -3432,11 +3499,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:3435: result: $enable_mixedcase" >&5
+echo "$as_me:3502: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:3439: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3506: 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
@@ -3463,7 +3530,7 @@ else
 fi
 
 fi
-echo "$as_me:3466: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3533: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3481,7 +3548,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3484: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3551: 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
@@ -3501,16 +3568,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3504: result: yes" >&5
+  echo "$as_me:3571: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3508: result: no" >&5
+  echo "$as_me:3575: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:3513: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3580: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3565,7 +3632,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3568: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3635: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -3576,7 +3643,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3579: checking for $ac_word" >&5
+echo "$as_me:3646: 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
@@ -3591,7 +3658,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3594: found $ac_dir/$ac_word" >&5
+echo "$as_me:3661: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3599,10 +3666,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3602: result: $CTAGS" >&5
+  echo "$as_me:3669: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3605: result: no" >&5
+  echo "$as_me:3672: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3613,7 +3680,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3616: checking for $ac_word" >&5
+echo "$as_me:3683: 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
@@ -3628,7 +3695,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3631: found $ac_dir/$ac_word" >&5
+echo "$as_me:3698: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3636,10 +3703,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3639: result: $ETAGS" >&5
+  echo "$as_me:3706: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3642: result: no" >&5
+  echo "$as_me:3709: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3648,7 +3715,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3651: checking for $ac_word" >&5
+echo "$as_me:3718: 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
@@ -3663,7 +3730,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3666: found $ac_dir/$ac_word" >&5
+echo "$as_me:3733: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3672,17 +3739,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3675: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3742: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3678: result: no" >&5
+  echo "$as_me:3745: 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:3685: checking for $ac_word" >&5
+echo "$as_me:3752: 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
@@ -3697,7 +3764,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3700: found $ac_dir/$ac_word" >&5
+echo "$as_me:3767: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3706,10 +3773,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3709: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3776: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3712: result: no" >&5
+  echo "$as_me:3779: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3729,7 +3796,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3732: checking for makeflags variable" >&5
+echo "$as_me:3799: 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
@@ -3759,7 +3826,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:3762: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -3767,13 +3834,13 @@ echo "${as_me:-configure}:3762: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3770: result: $cf_cv_makeflags" >&5
+echo "$as_me:3837: 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:3776: checking for $ac_word" >&5
+echo "$as_me:3843: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3788,7 +3855,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3791: found $ac_dir/$ac_word" >&5
+echo "$as_me:3858: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3796,10 +3863,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3799: result: $RANLIB" >&5
+  echo "$as_me:3866: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3802: result: no" >&5
+  echo "$as_me:3869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3808,7 +3875,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3811: checking for $ac_word" >&5
+echo "$as_me:3878: 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
@@ -3823,7 +3890,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3826: found $ac_dir/$ac_word" >&5
+echo "$as_me:3893: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3832,10 +3899,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3835: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3902: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3838: result: no" >&5
+  echo "$as_me:3905: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3847,7 +3914,7 @@ fi
 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:3850: checking for $ac_word" >&5
+echo "$as_me:3917: 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
@@ -3862,7 +3929,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:3865: found $ac_dir/$ac_word" >&5
+echo "$as_me:3932: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3870,10 +3937,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:3873: result: $LD" >&5
+  echo "$as_me:3940: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3876: result: no" >&5
+  echo "$as_me:3943: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3882,7 +3949,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:3885: checking for $ac_word" >&5
+echo "$as_me:3952: 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
@@ -3897,7 +3964,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:3900: found $ac_dir/$ac_word" >&5
+echo "$as_me:3967: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3906,10 +3973,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:3909: result: $ac_ct_LD" >&5
+  echo "$as_me:3976: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:3912: result: no" >&5
+  echo "$as_me:3979: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3921,7 +3988,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3924: checking for $ac_word" >&5
+echo "$as_me:3991: 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
@@ -3936,7 +4003,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:3939: found $ac_dir/$ac_word" >&5
+echo "$as_me:4006: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3944,10 +4011,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3947: result: $AR" >&5
+  echo "$as_me:4014: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3950: result: no" >&5
+  echo "$as_me:4017: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3956,7 +4023,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3959: checking for $ac_word" >&5
+echo "$as_me:4026: 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
@@ -3971,7 +4038,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:3974: found $ac_dir/$ac_word" >&5
+echo "$as_me:4041: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3980,10 +4047,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3983: result: $ac_ct_AR" >&5
+  echo "$as_me:4050: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3986: result: no" >&5
+  echo "$as_me:4053: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3995,7 +4062,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3998: checking for $ac_word" >&5
+echo "$as_me:4065: 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
@@ -4010,7 +4077,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4013: found $ac_dir/$ac_word" >&5
+echo "$as_me:4080: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4018,10 +4085,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4021: result: $AR" >&5
+  echo "$as_me:4088: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4024: result: no" >&5
+  echo "$as_me:4091: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4030,7 +4097,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4033: checking for $ac_word" >&5
+echo "$as_me:4100: 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
@@ -4045,7 +4112,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4048: found $ac_dir/$ac_word" >&5
+echo "$as_me:4115: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4054,10 +4121,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4057: result: $ac_ct_AR" >&5
+  echo "$as_me:4124: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4060: result: no" >&5
+  echo "$as_me:4127: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4066,7 +4133,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:4069: checking for options to update archives" >&5
+echo "$as_me:4136: 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
@@ -4103,13 +4170,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4106 "configure"
+#line 4173 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4109: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4112: \$? = $ac_status" >&5
+  echo "$as_me:4179: \$? = $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
@@ -4120,7 +4187,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4123: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4130,7 +4197,7 @@ echo "${as_me:-configure}:4123: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4133: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4200: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4141,17 +4208,17 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-	echo "$as_me:4144: checking for PATH separator" >&5
+	echo "$as_me:4211: 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:4151: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:4218: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
-echo "$as_me:4154: checking if you have specified an install-prefix" >&5
+echo "$as_me:4221: 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.
@@ -4164,7 +4231,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:4167: result: $DESTDIR" >&5
+echo "$as_me:4234: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -4192,7 +4259,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4195: checking for $ac_word" >&5
+echo "$as_me:4262: 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
@@ -4207,7 +4274,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:4210: found $ac_dir/$ac_word" >&5
+echo "$as_me:4277: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4215,10 +4282,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:4218: result: $BUILD_CC" >&5
+  echo "$as_me:4285: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:4221: result: no" >&5
+  echo "$as_me:4288: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4227,12 +4294,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:4230: checking for native build C compiler" >&5
+	echo "$as_me:4297: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:4232: result: $BUILD_CC" >&5
+	echo "$as_me:4299: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:4235: checking for native build C preprocessor" >&5
+	echo "$as_me:4302: 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.
@@ -4242,10 +4309,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:4245: result: $BUILD_CPP" >&5
+	echo "$as_me:4312: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:4248: checking for native build C flags" >&5
+	echo "$as_me:4315: 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.
@@ -4253,10 +4320,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:4256: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:4323: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:4259: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:4326: 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.
@@ -4264,10 +4331,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:4267: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:4334: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:4270: checking for native build linker-flags" >&5
+	echo "$as_me:4337: 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.
@@ -4275,10 +4342,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:4278: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:4345: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:4281: checking for native build linker-libraries" >&5
+	echo "$as_me:4348: 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.
@@ -4286,7 +4353,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:4289: result: $BUILD_LIBS" >&5
+	echo "$as_me:4356: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -4295,7 +4362,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:4298: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:4365: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -4309,7 +4376,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4312 "configure"
+#line 4379 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -4319,15 +4386,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4325: \$? = $ac_status" >&5
+  echo "$as_me:4392: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4330: \$? = $ac_status" >&5
+  echo "$as_me:4397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -4342,12 +4409,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:4345: result: $cf_ok_build_cc" >&5
+	echo "$as_me:4412: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:4350: error: Cross-build requires two compilers.
+		{ { echo "$as_me:4417: 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;}
@@ -4372,7 +4439,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:4375: checking if you want to build shared C-objects" >&5
+echo "$as_me:4442: checking if you want to build shared C-objects" >&5
 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
@@ -4382,27 +4449,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:4385: result: $with_shared" >&5
+echo "$as_me:4452: result: $with_shared" >&5
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
-echo "$as_me:4389: checking for specified models" >&5
+echo "$as_me:4456: checking for specified models" >&5
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
-echo "$as_me:4392: result: $cf_list_models" >&5
+echo "$as_me:4459: 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:4397: checking for default model" >&5
+echo "$as_me:4464: 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:4400: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4467: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:4405: checking for specific curses-directory" >&5
+echo "$as_me:4472: 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.
@@ -4412,7 +4479,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:4415: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4482: 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"
@@ -4443,7 +4510,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4446: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:4513: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4479,7 +4546,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 4482 "configure"
+#line 4549 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4491,16 +4558,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4497: \$? = $ac_status" >&5
+  echo "$as_me:4564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4517,7 +4584,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:4520: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4587: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -4553,7 +4620,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:4556: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4623: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -4568,13 +4635,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:4571: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:4638: 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:4574: result: yes" >&5
+		echo "$as_me:4641: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:4577: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:4644: 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
 
@@ -4707,7 +4774,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4710 "configure"
+#line 4777 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -4719,37 +4786,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4725: \$? = $ac_status" >&5
+  echo "$as_me:4792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4731: \$? = $ac_status" >&5
+  echo "$as_me:4798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4737 "configure"
+#line 4804 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4747: \$? = $ac_status" >&5
+  echo "$as_me:4814: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4752: \$? = $ac_status" >&5
+  echo "$as_me:4819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -4923,7 +4990,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4926 "configure"
+#line 4993 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -4935,37 +5002,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4941: \$? = $ac_status" >&5
+  echo "$as_me:5008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4947: \$? = $ac_status" >&5
+  echo "$as_me:5014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4953 "configure"
+#line 5020 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4963: \$? = $ac_status" >&5
+  echo "$as_me:5030: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4968: \$? = $ac_status" >&5
+  echo "$as_me:5035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -4982,7 +5049,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:4985: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5052: 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"
@@ -4998,7 +5065,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5001: checking for terminfo header" >&5
+echo "$as_me:5068: 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
@@ -5016,7 +5083,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5019 "configure"
+#line 5086 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5031,16 +5098,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5037: \$? = $ac_status" >&5
+  echo "$as_me:5104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5043: \$? = $ac_status" >&5
+  echo "$as_me:5110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5056,7 +5123,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5059: result: $cf_cv_term_header" >&5
+echo "$as_me:5126: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5091,7 +5158,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5094: result: no" >&5
+		echo "$as_me:5161: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5107,7 +5174,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5110: checking for $ac_word" >&5
+echo "$as_me:5177: 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
@@ -5122,7 +5189,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5125: found $ac_dir/$ac_word" >&5
+echo "$as_me:5192: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5130,10 +5197,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5133: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5200: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5136: result: no" >&5
+  echo "$as_me:5203: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5146,7 +5213,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5149: checking for $ac_word" >&5
+echo "$as_me:5216: 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
@@ -5161,7 +5228,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5164: found $ac_dir/$ac_word" >&5
+echo "$as_me:5231: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5169,10 +5236,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5172: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5239: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5175: result: no" >&5
+  echo "$as_me:5242: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5329,7 +5396,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5332: checking if we have identified curses headers" >&5
+echo "$as_me:5399: 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
@@ -5341,7 +5408,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5344 "configure"
+#line 5411 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5353,16 +5420,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5359: \$? = $ac_status" >&5
+  echo "$as_me:5426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5365: \$? = $ac_status" >&5
+  echo "$as_me:5432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5373,11 +5440,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5376: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5443: 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:5380: error: No curses header-files found" >&5
+	{ { echo "$as_me:5447: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5387,23 +5454,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5390: checking for $ac_header" >&5
+echo "$as_me:5457: 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 5396 "configure"
+#line 5463 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5400: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5467: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5406: \$? = $ac_status" >&5
+  echo "$as_me:5473: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5422,7 +5489,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5425: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5492: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5478,7 +5545,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5481 "configure"
+#line 5548 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5490,16 +5557,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5496: \$? = $ac_status" >&5
+  echo "$as_me:5563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5502: \$? = $ac_status" >&5
+  echo "$as_me:5569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5516,7 +5583,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5519: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5586: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5535,7 +5602,7 @@ fi
 
 }
 
-echo "$as_me:5538: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5605: 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
@@ -5547,7 +5614,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5550 "configure"
+#line 5617 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5571,16 +5638,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5577: \$? = $ac_status" >&5
+  echo "$as_me:5644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5583: \$? = $ac_status" >&5
+  echo "$as_me:5650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -5595,14 +5662,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:5598: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:5665: 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:5605: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:5672: 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
@@ -5723,7 +5790,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5726 "configure"
+#line 5793 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5735,16 +5802,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5741: \$? = $ac_status" >&5
+  echo "$as_me:5808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5747: \$? = $ac_status" >&5
+  echo "$as_me:5814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5761,7 +5828,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5764: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5831: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5784,7 +5851,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5787 "configure"
+#line 5854 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5808,16 +5875,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5814: \$? = $ac_status" >&5
+  echo "$as_me:5881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5820: \$? = $ac_status" >&5
+  echo "$as_me:5887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -5838,12 +5905,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5841: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5908: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:5846: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:5913: 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%/[^/]*$%%'`
@@ -5879,7 +5946,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5882 "configure"
+#line 5949 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5891,16 +5958,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5897: \$? = $ac_status" >&5
+  echo "$as_me:5964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5903: \$? = $ac_status" >&5
+  echo "$as_me:5970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5917,7 +5984,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5920: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5987: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5965,7 +6032,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:5968: checking for terminfo header" >&5
+echo "$as_me:6035: 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
@@ -5983,7 +6050,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5986 "configure"
+#line 6053 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5998,16 +6065,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6004: \$? = $ac_status" >&5
+  echo "$as_me:6071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6010: \$? = $ac_status" >&5
+  echo "$as_me:6077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6023,7 +6090,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6026: result: $cf_cv_term_header" >&5
+echo "$as_me:6093: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6061,7 +6128,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6064: checking for ncurses version" >&5
+echo "$as_me:6131: 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
@@ -6087,10 +6154,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6090: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6157: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6093: \$? = $ac_status" >&5
+  echo "$as_me:6160: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6100,7 +6167,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6103 "configure"
+#line 6170 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6127,15 +6194,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6133: \$? = $ac_status" >&5
+  echo "$as_me:6200: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6138: \$? = $ac_status" >&5
+  echo "$as_me:6205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6149,7 +6216,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6152: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6219: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6162,7 +6229,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6165: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6232: 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
@@ -6170,7 +6237,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6173 "configure"
+#line 6240 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6189,16 +6256,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6195: \$? = $ac_status" >&5
+  echo "$as_me:6262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6201: \$? = $ac_status" >&5
+  echo "$as_me:6268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6209,10 +6276,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6212: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6279: 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:6215: checking for initscr in -lgpm" >&5
+  echo "$as_me:6282: 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
@@ -6220,7 +6287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6223 "configure"
+#line 6290 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6239,16 +6306,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6245: \$? = $ac_status" >&5
+  echo "$as_me:6312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6251: \$? = $ac_status" >&5
+  echo "$as_me:6318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6259,7 +6326,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6262: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6329: 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"
@@ -6274,7 +6341,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6277: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6344: 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
@@ -6282,7 +6349,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6285 "configure"
+#line 6352 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6301,16 +6368,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6307: \$? = $ac_status" >&5
+  echo "$as_me:6374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6313: \$? = $ac_status" >&5
+  echo "$as_me:6380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6321,7 +6388,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6324: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6391: 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"
@@ -6370,13 +6437,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6373: checking for initscr" >&5
+	echo "$as_me:6440: 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 6379 "configure"
+#line 6446 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6407,16 +6474,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6413: \$? = $ac_status" >&5
+  echo "$as_me:6480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6419: \$? = $ac_status" >&5
+  echo "$as_me:6486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6426,18 +6493,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6429: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6496: 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:6436: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:6503: 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 6440 "configure"
+#line 6507 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6449,25 +6516,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6455: \$? = $ac_status" >&5
+  echo "$as_me:6522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6461: \$? = $ac_status" >&5
+  echo "$as_me:6528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6463: result: yes" >&5
+  echo "$as_me:6530: 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:6470: result: no" >&5
+echo "$as_me:6537: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6535,11 +6602,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6538: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:6605: 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 6542 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6551,25 +6618,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6557: \$? = $ac_status" >&5
+  echo "$as_me:6624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6563: \$? = $ac_status" >&5
+  echo "$as_me:6630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6565: result: yes" >&5
+  echo "$as_me:6632: 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:6572: result: no" >&5
+echo "$as_me:6639: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -6584,7 +6651,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:6587: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:6654: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6592,7 +6659,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:6595: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:6662: 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
@@ -6602,7 +6669,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6605 "configure"
+#line 6672 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6614,23 +6681,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6620: \$? = $ac_status" >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6626: \$? = $ac_status" >&5
+  echo "$as_me:6693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6628: result: yes" >&5
+  echo "$as_me:6695: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:6633: result: no" >&5
+echo "$as_me:6700: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -6648,7 +6715,7 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:6651: checking if you want wide-character code" >&5
+echo "$as_me:6718: 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.
@@ -6658,30 +6725,30 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:6661: result: $with_widec" >&5
+echo "$as_me:6728: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
 
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6668: checking for $ac_header" >&5
+echo "$as_me:6735: 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 6674 "configure"
+#line 6741 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6678: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6684: \$? = $ac_status" >&5
+  echo "$as_me:6751: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6700,7 +6767,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6703: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6770: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6710,7 +6777,7 @@ EOF
 fi
 done
 
-echo "$as_me:6713: checking for multibyte character support" >&5
+echo "$as_me:6780: 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
@@ -6718,7 +6785,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6721 "configure"
+#line 6788 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6735,16 +6802,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6741: \$? = $ac_status" >&5
+  echo "$as_me:6808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6747: \$? = $ac_status" >&5
+  echo "$as_me:6814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -6756,12 +6823,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:6759: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6826: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6764 "configure"
+#line 6831 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -6774,16 +6841,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6780: \$? = $ac_status" >&5
+  echo "$as_me:6847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6786: \$? = $ac_status" >&5
+  echo "$as_me:6853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -6797,7 +6864,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6800 "configure"
+#line 6867 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -6810,16 +6877,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6816: \$? = $ac_status" >&5
+  echo "$as_me:6883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6822: \$? = $ac_status" >&5
+  echo "$as_me:6889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -6836,9 +6903,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:6839: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:6906: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:6841: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6908: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6929,7 +6996,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:6932: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -6937,7 +7004,7 @@ echo "${as_me:-configure}:6932: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6940 "configure"
+#line 7007 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -6950,21 +7017,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6956: \$? = $ac_status" >&5
+  echo "$as_me:7023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6962: \$? = $ac_status" >&5
+  echo "$as_me:7029: \$? = $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}:6967: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7034: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6982,7 +7049,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:6985: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7052: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7057,13 +7124,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7060: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7127: 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 7066 "configure"
+#line 7133 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7076,21 +7143,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7082: \$? = $ac_status" >&5
+  echo "$as_me:7149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7088: \$? = $ac_status" >&5
+  echo "$as_me:7155: \$? = $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}:7093: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7160: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7132,7 +7199,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7135: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7202: 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
@@ -7170,7 +7237,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7173 "configure"
+#line 7240 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7182,16 +7249,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7188: \$? = $ac_status" >&5
+  echo "$as_me:7255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7194: \$? = $ac_status" >&5
+  echo "$as_me:7261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7208,7 +7275,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7211: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7278: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7244,7 +7311,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7247: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7314: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7274,13 +7341,13 @@ cf_ncuconfig_root=ncursesw
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7277: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7344: 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:7280: result: yes" >&5
+		echo "$as_me:7347: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7283: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7350: 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
 
@@ -7413,7 +7480,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7416 "configure"
+#line 7483 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7425,37 +7492,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7431: \$? = $ac_status" >&5
+  echo "$as_me:7498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7437: \$? = $ac_status" >&5
+  echo "$as_me:7504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7443 "configure"
+#line 7510 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7453: \$? = $ac_status" >&5
+  echo "$as_me:7520: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7458: \$? = $ac_status" >&5
+  echo "$as_me:7525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -7629,7 +7696,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7632 "configure"
+#line 7699 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7641,37 +7708,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7647: \$? = $ac_status" >&5
+  echo "$as_me:7714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7653: \$? = $ac_status" >&5
+  echo "$as_me:7720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7659 "configure"
+#line 7726 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7733: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7669: \$? = $ac_status" >&5
+  echo "$as_me:7736: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7674: \$? = $ac_status" >&5
+  echo "$as_me:7741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -7688,7 +7755,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7691: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:7758: 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"
@@ -7704,7 +7771,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:7707: checking for terminfo header" >&5
+echo "$as_me:7774: 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
@@ -7722,7 +7789,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7725 "configure"
+#line 7792 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7737,16 +7804,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7743: \$? = $ac_status" >&5
+  echo "$as_me:7810: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7749: \$? = $ac_status" >&5
+  echo "$as_me:7816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7762,7 +7829,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7765: result: $cf_cv_term_header" >&5
+echo "$as_me:7832: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7797,7 +7864,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:7800: result: no" >&5
+		echo "$as_me:7867: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -7813,7 +7880,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:7816: checking for $ac_word" >&5
+echo "$as_me:7883: 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
@@ -7828,7 +7895,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:7831: found $ac_dir/$ac_word" >&5
+echo "$as_me:7898: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7836,10 +7903,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:7839: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:7906: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:7842: result: no" >&5
+  echo "$as_me:7909: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7852,7 +7919,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:7855: checking for $ac_word" >&5
+echo "$as_me:7922: 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
@@ -7867,7 +7934,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:7870: found $ac_dir/$ac_word" >&5
+echo "$as_me:7937: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7875,10 +7942,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:7878: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:7945: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:7881: result: no" >&5
+  echo "$as_me:7948: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8035,7 +8102,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8038: checking if we have identified curses headers" >&5
+echo "$as_me:8105: 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
@@ -8047,7 +8114,7 @@ for cf_header in \
 	curses.h ncursesw/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8050 "configure"
+#line 8117 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8059,16 +8126,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8065: \$? = $ac_status" >&5
+  echo "$as_me:8132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8071: \$? = $ac_status" >&5
+  echo "$as_me:8138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8079,11 +8146,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8082: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8149: 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:8086: error: No curses header-files found" >&5
+	{ { echo "$as_me:8153: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8093,23 +8160,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8096: checking for $ac_header" >&5
+echo "$as_me:8163: 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 8102 "configure"
+#line 8169 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8106: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8173: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8112: \$? = $ac_status" >&5
+  echo "$as_me:8179: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8128,7 +8195,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8131: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8198: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8184,7 +8251,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8187 "configure"
+#line 8254 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8196,16 +8263,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8202: \$? = $ac_status" >&5
+  echo "$as_me:8269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8208: \$? = $ac_status" >&5
+  echo "$as_me:8275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8222,7 +8289,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8225: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8292: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8241,7 +8308,7 @@ fi
 
 }
 
-echo "$as_me:8244: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8311: 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
@@ -8253,7 +8320,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8256 "configure"
+#line 8323 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -8285,16 +8352,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8288: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8291: \$? = $ac_status" >&5
+  echo "$as_me:8358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8297: \$? = $ac_status" >&5
+  echo "$as_me:8364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8309,14 +8376,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8312: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8379: 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:8319: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8386: 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
@@ -8437,7 +8504,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8440 "configure"
+#line 8507 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8449,16 +8516,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8455: \$? = $ac_status" >&5
+  echo "$as_me:8522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8461: \$? = $ac_status" >&5
+  echo "$as_me:8528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8475,7 +8542,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8478: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8545: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8498,7 +8565,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8501 "configure"
+#line 8568 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8522,16 +8589,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8528: \$? = $ac_status" >&5
+  echo "$as_me:8595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8534: \$? = $ac_status" >&5
+  echo "$as_me:8601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8552,12 +8619,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8555: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8622: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8560: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8627: 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%/[^/]*$%%'`
@@ -8593,7 +8660,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8596 "configure"
+#line 8663 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8605,16 +8672,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8611: \$? = $ac_status" >&5
+  echo "$as_me:8678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8617: \$? = $ac_status" >&5
+  echo "$as_me:8684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8631,7 +8698,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8634: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8701: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8679,7 +8746,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:8682: checking for terminfo header" >&5
+echo "$as_me:8749: 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
@@ -8697,7 +8764,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8700 "configure"
+#line 8767 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8712,16 +8779,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8718: \$? = $ac_status" >&5
+  echo "$as_me:8785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8724: \$? = $ac_status" >&5
+  echo "$as_me:8791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8737,7 +8804,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8740: result: $cf_cv_term_header" >&5
+echo "$as_me:8807: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8775,7 +8842,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:8778: checking for ncurses version" >&5
+echo "$as_me:8845: 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
@@ -8801,10 +8868,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:8804: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:8871: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:8807: \$? = $ac_status" >&5
+  echo "$as_me:8874: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -8814,7 +8881,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8817 "configure"
+#line 8884 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8841,15 +8908,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8847: \$? = $ac_status" >&5
+  echo "$as_me:8914: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8852: \$? = $ac_status" >&5
+  echo "$as_me:8919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8863,7 +8930,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:8866: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:8933: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -8876,7 +8943,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:8879: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:8946: 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
@@ -8884,7 +8951,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8887 "configure"
+#line 8954 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8903,16 +8970,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8909: \$? = $ac_status" >&5
+  echo "$as_me:8976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8915: \$? = $ac_status" >&5
+  echo "$as_me:8982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -8923,10 +8990,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8926: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:8993: 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:8929: checking for initscr in -lgpm" >&5
+  echo "$as_me:8996: 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
@@ -8934,7 +9001,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8937 "configure"
+#line 9004 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8953,16 +9020,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8959: \$? = $ac_status" >&5
+  echo "$as_me:9026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8965: \$? = $ac_status" >&5
+  echo "$as_me:9032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -8973,7 +9040,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8976: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9043: 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"
@@ -8988,7 +9055,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:8991: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9058: 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
@@ -8996,7 +9063,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8999 "configure"
+#line 9066 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9015,16 +9082,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9021: \$? = $ac_status" >&5
+  echo "$as_me:9088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9027: \$? = $ac_status" >&5
+  echo "$as_me:9094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9035,7 +9102,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9038: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9105: 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"
@@ -9084,13 +9151,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9087: checking for initscr" >&5
+	echo "$as_me:9154: 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 9093 "configure"
+#line 9160 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9121,16 +9188,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9191: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9127: \$? = $ac_status" >&5
+  echo "$as_me:9194: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9133: \$? = $ac_status" >&5
+  echo "$as_me:9200: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9140,18 +9207,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9143: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9210: 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:9150: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9217: 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 9154 "configure"
+#line 9221 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9163,25 +9230,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9169: \$? = $ac_status" >&5
+  echo "$as_me:9236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9175: \$? = $ac_status" >&5
+  echo "$as_me:9242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9177: result: yes" >&5
+  echo "$as_me:9244: 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:9184: result: no" >&5
+echo "$as_me:9251: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9249,11 +9316,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9252: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9319: 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 9256 "configure"
+#line 9323 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9265,25 +9332,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9271: \$? = $ac_status" >&5
+  echo "$as_me:9338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9277: \$? = $ac_status" >&5
+  echo "$as_me:9344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9279: result: yes" >&5
+  echo "$as_me:9346: 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:9286: result: no" >&5
+echo "$as_me:9353: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9298,7 +9365,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9301: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9368: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9306,7 +9373,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9309: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9376: 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
@@ -9316,7 +9383,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9319 "configure"
+#line 9386 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9328,23 +9395,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9334: \$? = $ac_status" >&5
+  echo "$as_me:9401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9340: \$? = $ac_status" >&5
+  echo "$as_me:9407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9342: result: yes" >&5
+  echo "$as_me:9409: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9347: result: no" >&5
+echo "$as_me:9414: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9368,13 +9435,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9371: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9438: 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:9374: result: yes" >&5
+		echo "$as_me:9441: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9377: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9444: 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
 
@@ -9507,7 +9574,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9510 "configure"
+#line 9577 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9519,37 +9586,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9525: \$? = $ac_status" >&5
+  echo "$as_me:9592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9531: \$? = $ac_status" >&5
+  echo "$as_me:9598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9537 "configure"
+#line 9604 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9547: \$? = $ac_status" >&5
+  echo "$as_me:9614: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9552: \$? = $ac_status" >&5
+  echo "$as_me:9619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -9723,7 +9790,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 9726 "configure"
+#line 9793 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9735,37 +9802,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9741: \$? = $ac_status" >&5
+  echo "$as_me:9808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9747: \$? = $ac_status" >&5
+  echo "$as_me:9814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9753 "configure"
+#line 9820 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9763: \$? = $ac_status" >&5
+  echo "$as_me:9830: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9768: \$? = $ac_status" >&5
+  echo "$as_me:9835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -9782,7 +9849,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:9785: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9852: 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"
@@ -9798,7 +9865,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:9801: checking for terminfo header" >&5
+echo "$as_me:9868: 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
@@ -9816,7 +9883,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9819 "configure"
+#line 9886 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9831,16 +9898,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9837: \$? = $ac_status" >&5
+  echo "$as_me:9904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9843: \$? = $ac_status" >&5
+  echo "$as_me:9910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9856,7 +9923,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9859: result: $cf_cv_term_header" >&5
+echo "$as_me:9926: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9891,7 +9958,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9894: result: no" >&5
+		echo "$as_me:9961: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9907,7 +9974,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9910: checking for $ac_word" >&5
+echo "$as_me:9977: 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
@@ -9922,7 +9989,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9925: found $ac_dir/$ac_word" >&5
+echo "$as_me:9992: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9930,10 +9997,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9933: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10000: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9936: result: no" >&5
+  echo "$as_me:10003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9946,7 +10013,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9949: checking for $ac_word" >&5
+echo "$as_me:10016: 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
@@ -9961,7 +10028,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9964: found $ac_dir/$ac_word" >&5
+echo "$as_me:10031: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9969,10 +10036,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9972: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10039: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9975: result: no" >&5
+  echo "$as_me:10042: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10129,7 +10196,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10132: checking if we have identified curses headers" >&5
+echo "$as_me:10199: 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
@@ -10141,7 +10208,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10144 "configure"
+#line 10211 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10153,16 +10220,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10159: \$? = $ac_status" >&5
+  echo "$as_me:10226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10165: \$? = $ac_status" >&5
+  echo "$as_me:10232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10173,11 +10240,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10176: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10243: 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:10180: error: No curses header-files found" >&5
+	{ { echo "$as_me:10247: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10187,23 +10254,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10190: checking for $ac_header" >&5
+echo "$as_me:10257: 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 10196 "configure"
+#line 10263 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10200: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10206: \$? = $ac_status" >&5
+  echo "$as_me:10273: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10222,7 +10289,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10278,7 +10345,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10281 "configure"
+#line 10348 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10290,16 +10357,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10296: \$? = $ac_status" >&5
+  echo "$as_me:10363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10302: \$? = $ac_status" >&5
+  echo "$as_me:10369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10316,7 +10383,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10319: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10386: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10335,7 +10402,7 @@ fi
 
 }
 
-echo "$as_me:10338: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10405: 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
@@ -10347,7 +10414,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10350 "configure"
+#line 10417 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10371,16 +10438,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10377: \$? = $ac_status" >&5
+  echo "$as_me:10444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10383: \$? = $ac_status" >&5
+  echo "$as_me:10450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10395,14 +10462,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10398: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10465: 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:10405: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10472: 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
@@ -10523,7 +10590,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10526 "configure"
+#line 10593 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10535,16 +10602,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10541: \$? = $ac_status" >&5
+  echo "$as_me:10608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10547: \$? = $ac_status" >&5
+  echo "$as_me:10614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10561,7 +10628,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10564: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10631: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10584,7 +10651,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10587 "configure"
+#line 10654 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10608,16 +10675,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10614: \$? = $ac_status" >&5
+  echo "$as_me:10681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10620: \$? = $ac_status" >&5
+  echo "$as_me:10687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -10638,12 +10705,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10641: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10708: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:10646: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10713: 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%/[^/]*$%%'`
@@ -10679,7 +10746,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10682 "configure"
+#line 10749 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10691,16 +10758,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10697: \$? = $ac_status" >&5
+  echo "$as_me:10764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10703: \$? = $ac_status" >&5
+  echo "$as_me:10770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10717,7 +10784,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10720: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10787: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10765,7 +10832,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10768: checking for terminfo header" >&5
+echo "$as_me:10835: 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
@@ -10783,7 +10850,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10786 "configure"
+#line 10853 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10798,16 +10865,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10804: \$? = $ac_status" >&5
+  echo "$as_me:10871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10810: \$? = $ac_status" >&5
+  echo "$as_me:10877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10823,7 +10890,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10826: result: $cf_cv_term_header" >&5
+echo "$as_me:10893: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10861,7 +10928,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10864: checking for ncurses version" >&5
+echo "$as_me:10931: 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
@@ -10887,10 +10954,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10890: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10957: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10893: \$? = $ac_status" >&5
+  echo "$as_me:10960: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10900,7 +10967,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10903 "configure"
+#line 10970 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10927,15 +10994,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10933: \$? = $ac_status" >&5
+  echo "$as_me:11000: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10938: \$? = $ac_status" >&5
+  echo "$as_me:11005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10949,7 +11016,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10952: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11019: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10962,7 +11029,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10965: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11032: 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
@@ -10970,7 +11037,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10973 "configure"
+#line 11040 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10989,16 +11056,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10995: \$? = $ac_status" >&5
+  echo "$as_me:11062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:11068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11009,10 +11076,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11012: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11079: 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:11015: checking for initscr in -lgpm" >&5
+  echo "$as_me:11082: 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
@@ -11020,7 +11087,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11023 "configure"
+#line 11090 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11039,16 +11106,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11045: \$? = $ac_status" >&5
+  echo "$as_me:11112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11051: \$? = $ac_status" >&5
+  echo "$as_me:11118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11059,7 +11126,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11062: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11129: 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"
@@ -11074,7 +11141,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11077: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11144: 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
@@ -11082,7 +11149,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11085 "configure"
+#line 11152 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11101,16 +11168,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11107: \$? = $ac_status" >&5
+  echo "$as_me:11174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11113: \$? = $ac_status" >&5
+  echo "$as_me:11180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11121,7 +11188,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11124: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11191: 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"
@@ -11170,13 +11237,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11173: checking for initscr" >&5
+	echo "$as_me:11240: 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 11179 "configure"
+#line 11246 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11207,16 +11274,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11213: \$? = $ac_status" >&5
+  echo "$as_me:11280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11219: \$? = $ac_status" >&5
+  echo "$as_me:11286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11226,18 +11293,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11229: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11296: 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:11236: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11303: 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 11240 "configure"
+#line 11307 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11249,25 +11316,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11255: \$? = $ac_status" >&5
+  echo "$as_me:11322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11261: \$? = $ac_status" >&5
+  echo "$as_me:11328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11263: result: yes" >&5
+  echo "$as_me:11330: 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:11270: result: no" >&5
+echo "$as_me:11337: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11335,11 +11402,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11338: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11405: 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 11342 "configure"
+#line 11409 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11351,25 +11418,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11357: \$? = $ac_status" >&5
+  echo "$as_me:11424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11363: \$? = $ac_status" >&5
+  echo "$as_me:11430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11365: result: yes" >&5
+  echo "$as_me:11432: 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:11372: result: no" >&5
+echo "$as_me:11439: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11384,7 +11451,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11387: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11454: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11392,7 +11459,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11395: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11462: 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
@@ -11402,7 +11469,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11405 "configure"
+#line 11472 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11414,23 +11481,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11420: \$? = $ac_status" >&5
+  echo "$as_me:11487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11426: \$? = $ac_status" >&5
+  echo "$as_me:11493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11428: result: yes" >&5
+  echo "$as_me:11495: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11433: result: no" >&5
+echo "$as_me:11500: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11483,10 +11550,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11486: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11553: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11489: \$? = $ac_status" >&5
+  echo "$as_me:11556: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11504,10 +11571,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11507: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11574: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11510: checking if you want to have a library-prefix" >&5
+echo "$as_me:11577: 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.
@@ -11517,7 +11584,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11520: result: $with_lib_prefix" >&5
+echo "$as_me:11587: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -11555,7 +11622,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:11558: checking for default loader flags" >&5
+echo "$as_me:11625: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -11563,13 +11630,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:11566: result: $LD_MODEL" >&5
+echo "$as_me:11633: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:11572: checking for an rpath option" >&5
+	echo "$as_me:11639: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -11600,12 +11667,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:11603: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:11670: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:11608: checking if we need a space after rpath option" >&5
+		echo "$as_me:11675: 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"
 
@@ -11626,7 +11693,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11629 "configure"
+#line 11696 "configure"
 #include "confdefs.h"
 
 int
@@ -11638,16 +11705,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11644: \$? = $ac_status" >&5
+  echo "$as_me:11711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11650: \$? = $ac_status" >&5
+  echo "$as_me:11717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -11657,7 +11724,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:11660: result: $cf_rpath_space" >&5
+		echo "$as_me:11727: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -11679,7 +11746,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:11682: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:11749: 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.
@@ -11694,9 +11761,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:11697: result: $withval" >&5
+		echo "$as_me:11764: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:11699: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:11766: 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; }; }
 		;;
@@ -11705,7 +11772,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:11708: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:11775: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -11728,14 +11795,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:11731: checking which $CC option to use" >&5
+		echo "$as_me:11798: 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 11738 "configure"
+#line 11805 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11747,16 +11814,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11753: \$? = $ac_status" >&5
+  echo "$as_me:11820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11759: \$? = $ac_status" >&5
+  echo "$as_me:11826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -11765,7 +11832,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:11768: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:11835: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -11836,7 +11903,7 @@ CF_EOF
 		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:11839: checking if ld -search_paths_first works" >&5
+		echo "$as_me:11906: 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
@@ -11845,7 +11912,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11848 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 
 int
@@ -11857,16 +11924,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11863: \$? = $ac_status" >&5
+  echo "$as_me:11930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11869: \$? = $ac_status" >&5
+  echo "$as_me:11936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -11877,7 +11944,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:11880: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:11947: 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"
@@ -12227,7 +12294,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12230 "configure"
+#line 12297 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12239,16 +12306,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12245: \$? = $ac_status" >&5
+  echo "$as_me:12312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12251: \$? = $ac_status" >&5
+  echo "$as_me:12318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12285,7 +12352,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12288: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12355: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12295,7 +12362,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12298 "${as_me:-configure}"
+#line 12365 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12307,18 +12374,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12310: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12377: 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:12312: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12315: \$? = $ac_status" >&5
+  echo "$as_me:12382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12317: result: yes" >&5
+				echo "$as_me:12384: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12321: result: no" >&5
+				echo "$as_me:12388: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12333,17 +12400,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12336: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12403: 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}:12340: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12407: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12346: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12413: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12353,7 +12420,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12356: result: $with_rpath_link" >&5
+	echo "$as_me:12423: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12366,7 +12433,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12369: checking if you want broken-linker support code" >&5
+echo "$as_me:12436: 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.
@@ -12376,7 +12443,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12379: result: $with_broken_linker" >&5
+echo "$as_me:12446: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12391,14 +12458,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12394: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12461: 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 12401 "configure"
+#line 12468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12417,16 +12484,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12423: \$? = $ac_status" >&5
+  echo "$as_me:12490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12429: \$? = $ac_status" >&5
+  echo "$as_me:12496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12437,7 +12504,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12440: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12507: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12475,18 +12542,18 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12482: checking if this is the GNU C library" >&5
+echo "$as_me:12549: 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 12489 "configure"
+#line 12556 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12505,16 +12572,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12511: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12517: \$? = $ac_status" >&5
+  echo "$as_me:12584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12525,7 +12592,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12528: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12595: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12533,7 +12600,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12536: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:12603: 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
@@ -12545,7 +12612,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12548 "configure"
+#line 12615 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12564,16 +12631,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12570: \$? = $ac_status" >&5
+  echo "$as_me:12637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12576: \$? = $ac_status" >&5
+  echo "$as_me:12643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -12585,12 +12652,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:12588: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:12655: 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:12593: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:12660: 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
@@ -12695,7 +12762,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12698 "configure"
+#line 12765 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -12715,16 +12782,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12721: \$? = $ac_status" >&5
+  echo "$as_me:12788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12727: \$? = $ac_status" >&5
+  echo "$as_me:12794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -12735,7 +12802,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12738: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:12805: 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
@@ -12744,14 +12811,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:12747: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:12814: 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 12754 "configure"
+#line 12821 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12766,16 +12833,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12772: \$? = $ac_status" >&5
+  echo "$as_me:12839: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12778: \$? = $ac_status" >&5
+  echo "$as_me:12845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -12882,7 +12949,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12885 "configure"
+#line 12952 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12897,16 +12964,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12903: \$? = $ac_status" >&5
+  echo "$as_me:12970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12909: \$? = $ac_status" >&5
+  echo "$as_me:12976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -12921,12 +12988,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12924: result: $cf_cv_gnu_source" >&5
+echo "$as_me:12991: 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:12929: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:12996: 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
@@ -12936,7 +13003,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12939 "configure"
+#line 13006 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12951,16 +13018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12957: \$? = $ac_status" >&5
+  echo "$as_me:13024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12963: \$? = $ac_status" >&5
+  echo "$as_me:13030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -12971,7 +13038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12974: result: $cf_cv_default_source" >&5
+echo "$as_me:13041: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13008,16 +13075,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13011: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13078: 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}:13017: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13084: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13020 "configure"
+#line 13087 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13032,16 +13099,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13038: \$? = $ac_status" >&5
+  echo "$as_me:13105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13044: \$? = $ac_status" >&5
+  echo "$as_me:13111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13062,7 +13129,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13065 "configure"
+#line 13132 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13077,16 +13144,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13083: \$? = $ac_status" >&5
+  echo "$as_me:13150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13089: \$? = $ac_status" >&5
+  echo "$as_me:13156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13097,7 +13164,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13100: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13105,10 +13172,10 @@ echo "${as_me:-configure}:13100: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13108: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13175: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13111 "configure"
+#line 13178 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13123,16 +13190,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13129: \$? = $ac_status" >&5
+  echo "$as_me:13196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13135: \$? = $ac_status" >&5
+  echo "$as_me:13202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13148,7 +13215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13151: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13218: 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
@@ -13265,7 +13332,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13268: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13335: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13297,14 +13364,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13300: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13367: 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 13307 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13322,16 +13389,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13328: \$? = $ac_status" >&5
+  echo "$as_me:13395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13334: \$? = $ac_status" >&5
+  echo "$as_me:13401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13343,7 +13410,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13346 "configure"
+#line 13413 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13361,16 +13428,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13367: \$? = $ac_status" >&5
+  echo "$as_me:13434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13373: \$? = $ac_status" >&5
+  echo "$as_me:13440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13385,7 +13452,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13388: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13455: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13545,16 +13612,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13548: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13615: 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}:13554: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13621: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13557 "configure"
+#line 13624 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13569,16 +13636,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13575: \$? = $ac_status" >&5
+  echo "$as_me:13642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13581: \$? = $ac_status" >&5
+  echo "$as_me:13648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13599,7 +13666,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13602 "configure"
+#line 13669 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13614,16 +13681,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13617: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13620: \$? = $ac_status" >&5
+  echo "$as_me:13687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13626: \$? = $ac_status" >&5
+  echo "$as_me:13693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13634,7 +13701,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13637: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13642,10 +13709,10 @@ echo "${as_me:-configure}:13637: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13645: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13712: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13648 "configure"
+#line 13715 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13660,16 +13727,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13666: \$? = $ac_status" >&5
+  echo "$as_me:13733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13672: \$? = $ac_status" >&5
+  echo "$as_me:13739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13685,7 +13752,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13688: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13755: 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
@@ -13798,10 +13865,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:13801: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13868: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13804 "configure"
+#line 13871 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13819,23 +13886,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13825: \$? = $ac_status" >&5
+  echo "$as_me:13892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13831: \$? = $ac_status" >&5
+  echo "$as_me:13898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:13838: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:13905: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -13858,7 +13925,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13861: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13928: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -13870,7 +13937,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:13873: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13940: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -13958,7 +14025,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:13961: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14028: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13968,7 +14035,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:13971: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14038: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13978,7 +14045,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:13981: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14048: 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"
@@ -13990,10 +14057,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:13993: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14060: 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 13996 "configure"
+#line 14063 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14008,16 +14075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14014: \$? = $ac_status" >&5
+  echo "$as_me:14081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14020: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14026,12 +14093,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14029: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14096: 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 14034 "configure"
+#line 14101 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14046,16 +14113,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14052: \$? = $ac_status" >&5
+  echo "$as_me:14119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14058: \$? = $ac_status" >&5
+  echo "$as_me:14125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14066,19 +14133,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14069: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14136: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14074: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14141: 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 14081 "configure"
+#line 14148 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14096,16 +14163,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14102: \$? = $ac_status" >&5
+  echo "$as_me:14169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14108: \$? = $ac_status" >&5
+  echo "$as_me:14175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14117,7 +14184,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14120 "configure"
+#line 14187 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14135,16 +14202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14141: \$? = $ac_status" >&5
+  echo "$as_me:14208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14147: \$? = $ac_status" >&5
+  echo "$as_me:14214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14159,7 +14226,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14162: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14229: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14306,13 +14373,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14309: checking for ANSI C header files" >&5
+echo "$as_me:14376: 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 14315 "configure"
+#line 14382 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14320,13 +14387,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14323: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14329: \$? = $ac_status" >&5
+  echo "$as_me:14396: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14348,7 +14415,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14351 "configure"
+#line 14418 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14366,7 +14433,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14369 "configure"
+#line 14436 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14387,7 +14454,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14390 "configure"
+#line 14457 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14413,15 +14480,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14419: \$? = $ac_status" >&5
+  echo "$as_me:14486: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14424: \$? = $ac_status" >&5
+  echo "$as_me:14491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14434,7 +14501,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14437: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14504: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14450,28 +14517,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14453: checking for $ac_header" >&5
+echo "$as_me:14520: 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 14459 "configure"
+#line 14526 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14468: \$? = $ac_status" >&5
+  echo "$as_me:14535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14474: \$? = $ac_status" >&5
+  echo "$as_me:14541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14481,7 +14548,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14484: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14551: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14491,13 +14558,13 @@ EOF
 fi
 done
 
-echo "$as_me:14494: checking whether exit is declared" >&5
+echo "$as_me:14561: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14500 "configure"
+#line 14567 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14512,16 +14579,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14582: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14518: \$? = $ac_status" >&5
+  echo "$as_me:14585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14524: \$? = $ac_status" >&5
+  echo "$as_me:14591: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14531,7 +14598,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14534: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:14601: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14541,7 +14608,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14544: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14611: 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
@@ -14553,7 +14620,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14556 "configure"
+#line 14623 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14573,16 +14640,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14579: \$? = $ac_status" >&5
+  echo "$as_me:14646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14585: \$? = $ac_status" >&5
+  echo "$as_me:14652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14592,16 +14659,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14598: \$? = $ac_status" >&5
+  echo "$as_me:14665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14604: \$? = $ac_status" >&5
+  echo "$as_me:14671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14615,13 +14682,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14618: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14685: 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:14624: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14691: 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
@@ -14629,7 +14696,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14632 "configure"
+#line 14699 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14649,16 +14716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:14722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14661: \$? = $ac_status" >&5
+  echo "$as_me:14728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14667,7 +14734,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14670 "configure"
+#line 14737 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14688,16 +14755,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14700: \$? = $ac_status" >&5
+  echo "$as_me:14767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14708,7 +14775,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14711: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14778: 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
 
@@ -14718,7 +14785,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14721: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14788: 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
@@ -14726,7 +14793,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14729 "configure"
+#line 14796 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14746,16 +14813,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14752: \$? = $ac_status" >&5
+  echo "$as_me:14819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14758: \$? = $ac_status" >&5
+  echo "$as_me:14825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14764,7 +14831,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14767 "configure"
+#line 14834 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14785,16 +14852,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14791: \$? = $ac_status" >&5
+  echo "$as_me:14858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14797: \$? = $ac_status" >&5
+  echo "$as_me:14864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14805,7 +14872,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14808: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14875: 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
 
@@ -14818,7 +14885,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14821: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14888: 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
@@ -14826,7 +14893,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14829 "configure"
+#line 14896 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14838,16 +14905,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14844: \$? = $ac_status" >&5
+  echo "$as_me:14911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14850: \$? = $ac_status" >&5
+  echo "$as_me:14917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14856,7 +14923,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14859 "configure"
+#line 14926 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14869,16 +14936,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14875: \$? = $ac_status" >&5
+  echo "$as_me:14942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14881: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14889,7 +14956,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14892: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14959: 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
 
@@ -14903,13 +14970,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14906: checking for fseeko" >&5
+echo "$as_me:14973: 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 14912 "configure"
+#line 14979 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14921,16 +14988,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14927: \$? = $ac_status" >&5
+  echo "$as_me:14994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14933: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14940,7 +15007,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14943: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15010: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14979,14 +15046,14 @@ fi
 
 	fi
 
-	echo "$as_me:14982: checking whether to use struct dirent64" >&5
+	echo "$as_me:15049: 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 14989 "configure"
+#line 15056 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15009,16 +15076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15015: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15021: \$? = $ac_status" >&5
+  echo "$as_me:15088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15029,7 +15096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15032: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15099: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15039,7 +15106,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15042: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15109: 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.
@@ -15049,7 +15116,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15052: result: $with_rcs_ids" >&5
+echo "$as_me:15119: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15059,7 +15126,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15062: checking if you want to build with function extensions" >&5
+echo "$as_me:15129: 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.
@@ -15069,7 +15136,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15072: result: $with_ext_funcs" >&5
+echo "$as_me:15139: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15087,7 +15154,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15090: checking for extended use of const keyword" >&5
+echo "$as_me:15157: 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.
@@ -15097,7 +15164,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15100: result: $with_ext_const" >&5
+echo "$as_me:15167: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15107,7 +15174,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15110: checking if you want all development code" >&5
+echo "$as_me:15177: 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.
@@ -15117,7 +15184,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15120: result: $with_develop" >&5
+echo "$as_me:15187: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15126,7 +15193,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15129: checking if you want to link with the pthread library" >&5
+echo "$as_me:15196: 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.
@@ -15136,27 +15203,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15139: result: $with_pthread" >&5
+echo "$as_me:15206: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15143: checking for pthread.h" >&5
+	echo "$as_me:15210: 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 15149 "configure"
+#line 15216 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15153: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15159: \$? = $ac_status" >&5
+  echo "$as_me:15226: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15175,7 +15242,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15178: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15245: 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
 
@@ -15185,7 +15252,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15188: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15255: 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"
 
@@ -15206,7 +15273,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15209 "configure"
+#line 15276 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15223,16 +15290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15229: \$? = $ac_status" >&5
+  echo "$as_me:15296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15235: \$? = $ac_status" >&5
+  echo "$as_me:15302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15242,7 +15309,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15245: result: $with_pthread" >&5
+	    echo "$as_me:15312: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15270,7 +15337,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15273: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15340: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15279,7 +15346,7 @@ fi
 
 fi
 
-echo "$as_me:15282: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15349: 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.
@@ -15289,18 +15356,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15292: result: $use_weak_symbols" >&5
+echo "$as_me:15359: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15296: checking if $CC supports weak symbols" >&5
+echo "$as_me:15363: 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 15303 "configure"
+#line 15370 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15326,16 +15393,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15332: \$? = $ac_status" >&5
+  echo "$as_me:15399: \$? = $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:15402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15338: \$? = $ac_status" >&5
+  echo "$as_me:15405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15346,7 +15413,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15349: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15416: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15375,13 +15442,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15378: checking for _nc_TABSIZE" >&5
+echo "$as_me:15445: 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 15384 "configure"
+#line 15451 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15412,16 +15479,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15418: \$? = $ac_status" >&5
+  echo "$as_me:15485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15424: \$? = $ac_status" >&5
+  echo "$as_me:15491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15431,7 +15498,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15434: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15501: 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
@@ -15443,7 +15510,7 @@ fi
 # 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:15446: checking if you want experimental reentrant code" >&5
+echo "$as_me:15513: 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.
@@ -15453,7 +15520,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15456: result: $with_reentrant" >&5
+echo "$as_me:15523: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15476,7 +15543,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15479: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15546: 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.
@@ -15486,7 +15553,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15489: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15556: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15500,7 +15567,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15503: checking if you want to see long compiling messages" >&5
+echo "$as_me:15570: 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.
@@ -15534,10 +15601,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15537: result: $enableval" >&5
+echo "$as_me:15604: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15540: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15607: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15554,17 +15621,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15557: result: $enable_stdnoreturn" >&5
+echo "$as_me:15624: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15561: checking for C11 _Noreturn feature" >&5
+echo "$as_me:15628: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15567 "configure"
+#line 15634 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15580,16 +15647,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15586: \$? = $ac_status" >&5
+  echo "$as_me:15653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15592: \$? = $ac_status" >&5
+  echo "$as_me:15659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -15600,7 +15667,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15603: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:15670: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -15656,16 +15723,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15659: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15726: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15664: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15731: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15668: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15704,16 +15771,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15774: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15712: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15779: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15716: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15783: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15752,23 +15819,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15822: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15760: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15827: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15831: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:15771: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:15838: 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.
@@ -15785,7 +15852,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:15788: result: $enable_warnings" >&5
+echo "$as_me:15855: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -15809,7 +15876,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15812 "configure"
+#line 15879 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15824,26 +15891,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15830: \$? = $ac_status" >&5
+  echo "$as_me:15897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15836: \$? = $ac_status" >&5
+  echo "$as_me:15903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:15839: checking for X11/Xt const-feature" >&5
+echo "$as_me:15906: 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 15846 "configure"
+#line 15913 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -15860,16 +15927,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15866: \$? = $ac_status" >&5
+  echo "$as_me:15933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15872: \$? = $ac_status" >&5
+  echo "$as_me:15939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -15884,7 +15951,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15887: result: $cf_cv_const_x_string" >&5
+echo "$as_me:15954: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -15913,7 +15980,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 15916 "${as_me:-configure}"
+#line 15983 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -15929,7 +15996,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:15932: checking for $CC warning options..." >&5
+	{ echo "$as_me:15999: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -15945,12 +16012,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:15948: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15951: \$? = $ac_status" >&5
+  echo "$as_me:16018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:15953: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16020: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -15958,7 +16025,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:15961: checking for $CC warning options..." >&5
+	{ echo "$as_me:16028: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -15981,12 +16048,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:15984: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15987: \$? = $ac_status" >&5
+  echo "$as_me:16054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:15989: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16056: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -15994,7 +16061,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:15997: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16064: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16004,7 +16071,7 @@ echo "${as_me:-configure}:15997: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16007: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16074: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16037,10 +16104,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16040: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16107: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16043 "${as_me:-configure}"
+#line 16110 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16090,12 +16157,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16093: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16096: \$? = $ac_status" >&5
+  echo "$as_me:16163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16098: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16165: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16163,7 +16230,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16166: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16233: 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.
@@ -16173,7 +16240,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16176: result: $with_assertions" >&5
+echo "$as_me:16243: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16226,7 +16293,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16229: checking whether to add trace feature to all models" >&5
+echo "$as_me:16296: 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.
@@ -16236,7 +16303,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16239: result: $cf_with_trace" >&5
+echo "$as_me:16306: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16344,7 +16411,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16347: checking if we want to use GNAT projects" >&5
+echo "$as_me:16414: 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.
@@ -16361,21 +16428,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16364: result: $enable_gnat_projects" >&5
+echo "$as_me:16431: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16371: checking if ssp library is needed" >&5
+echo "$as_me:16438: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16378 "configure"
+#line 16445 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16392,16 +16459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16398: \$? = $ac_status" >&5
+  echo "$as_me:16465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16404: \$? = $ac_status" >&5
+  echo "$as_me:16471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16411,7 +16478,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16414 "configure"
+#line 16481 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16428,16 +16495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16434: \$? = $ac_status" >&5
+  echo "$as_me:16501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16440: \$? = $ac_status" >&5
+  echo "$as_me:16507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16451,7 +16518,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16454: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16521: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16478,14 +16545,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:16481: checking for clock_gettime" >&5
+echo "$as_me:16548: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16488 "configure"
+#line 16555 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -16498,16 +16565,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16504: \$? = $ac_status" >&5
+  echo "$as_me:16571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16510: \$? = $ac_status" >&5
+  echo "$as_me:16577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16518,7 +16585,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16521: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16588: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -16529,13 +16596,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:16532: checking for gettimeofday" >&5
+echo "$as_me:16599: 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 16538 "configure"
+#line 16605 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16566,16 +16633,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16572: \$? = $ac_status" >&5
+  echo "$as_me:16639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16578: \$? = $ac_status" >&5
+  echo "$as_me:16645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -16585,7 +16652,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16588: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:16655: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -16595,7 +16662,7 @@ EOF
 
 else
 
-echo "$as_me:16598: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:16665: 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
@@ -16603,7 +16670,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16606 "configure"
+#line 16673 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16622,16 +16689,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:16695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:16701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -16642,7 +16709,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16645: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:16712: 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
 
@@ -16675,13 +16742,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:16678: checking for signed char" >&5
+echo "$as_me:16745: 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 16684 "configure"
+#line 16751 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16696,16 +16763,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16702: \$? = $ac_status" >&5
+  echo "$as_me:16769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16708: \$? = $ac_status" >&5
+  echo "$as_me:16775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -16715,10 +16782,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16718: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:16785: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:16721: checking size of signed char" >&5
+echo "$as_me:16788: 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
@@ -16727,7 +16794,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16730 "configure"
+#line 16797 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16739,21 +16806,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16745: \$? = $ac_status" >&5
+  echo "$as_me:16812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16751: \$? = $ac_status" >&5
+  echo "$as_me:16818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16756 "configure"
+#line 16823 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16765,16 +16832,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16771: \$? = $ac_status" >&5
+  echo "$as_me:16838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16777: \$? = $ac_status" >&5
+  echo "$as_me:16844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -16790,7 +16857,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16793 "configure"
+#line 16860 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16802,16 +16869,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16872: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16808: \$? = $ac_status" >&5
+  echo "$as_me:16875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16814: \$? = $ac_status" >&5
+  echo "$as_me:16881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -16827,7 +16894,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16830 "configure"
+#line 16897 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16839,16 +16906,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16845: \$? = $ac_status" >&5
+  echo "$as_me:16912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16851: \$? = $ac_status" >&5
+  echo "$as_me:16918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -16861,12 +16928,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16864: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16931: 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 16869 "configure"
+#line 16936 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16882,15 +16949,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16888: \$? = $ac_status" >&5
+  echo "$as_me:16955: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16893: \$? = $ac_status" >&5
+  echo "$as_me:16960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -16906,7 +16973,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:16909: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:16976: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -16915,13 +16982,13 @@ EOF
 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:16918: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:16985: 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 16924 "configure"
+#line 16991 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -16936,16 +17003,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16942: \$? = $ac_status" >&5
+  echo "$as_me:17009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16948: \$? = $ac_status" >&5
+  echo "$as_me:17015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -16955,7 +17022,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16958: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17025: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -16968,7 +17035,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:16971: checking for opendir in -ldir" >&5
+  echo "$as_me:17038: 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
@@ -16976,7 +17043,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16979 "configure"
+#line 17046 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16995,16 +17062,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17001: \$? = $ac_status" >&5
+  echo "$as_me:17068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17007: \$? = $ac_status" >&5
+  echo "$as_me:17074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17015,14 +17082,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17018: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17085: 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:17025: checking for opendir in -lx" >&5
+  echo "$as_me:17092: 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
@@ -17030,7 +17097,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17033 "configure"
+#line 17100 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17049,16 +17116,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17055: \$? = $ac_status" >&5
+  echo "$as_me:17122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17061: \$? = $ac_status" >&5
+  echo "$as_me:17128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17069,7 +17136,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17072: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17139: 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"
@@ -17077,13 +17144,13 @@ fi
 
 fi
 
-echo "$as_me:17080: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17147: 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 17086 "configure"
+#line 17153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17099,16 +17166,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17105: \$? = $ac_status" >&5
+  echo "$as_me:17172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17111: \$? = $ac_status" >&5
+  echo "$as_me:17178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17118,7 +17185,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17121: result: $ac_cv_header_time" >&5
+echo "$as_me:17188: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17136,13 +17203,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17139: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17206: 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 17145 "configure"
+#line 17212 "configure"
 #include "confdefs.h"
 
 int
@@ -17200,16 +17267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17206: \$? = $ac_status" >&5
+  echo "$as_me:17273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17212: \$? = $ac_status" >&5
+  echo "$as_me:17279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17219,7 +17286,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17222: result: $ac_cv_c_const" >&5
+echo "$as_me:17289: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17231,7 +17298,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17234: checking if data-only library module links" >&5
+echo "$as_me:17301: 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
@@ -17239,20 +17306,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17242 "configure"
+#line 17309 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17245: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17248: \$? = $ac_status" >&5
+  echo "$as_me:17315: \$? = $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 <<EOF
-#line 17255 "configure"
+#line 17322 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -17265,10 +17332,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:17268: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17271: \$? = $ac_status" >&5
+  echo "$as_me:17338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17281,7 +17348,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17284 "configure"
+#line 17351 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -17292,15 +17359,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17362: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17298: \$? = $ac_status" >&5
+  echo "$as_me:17365: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17303: \$? = $ac_status" >&5
+  echo "$as_me:17370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17315,7 +17382,7 @@ fi
 
 fi
 
-echo "$as_me:17318: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17385: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17334,23 +17401,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17337: checking for $ac_header" >&5
+echo "$as_me:17404: 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 17343 "configure"
+#line 17410 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17347: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17414: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17353: \$? = $ac_status" >&5
+  echo "$as_me:17420: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17369,7 +17436,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17372: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17439: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17379,7 +17446,7 @@ EOF
 fi
 done
 
-echo "$as_me:17382: checking for working mkstemp" >&5
+echo "$as_me:17449: 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
@@ -17390,7 +17457,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17393 "configure"
+#line 17460 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17425,15 +17492,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17431: \$? = $ac_status" >&5
+  echo "$as_me:17498: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17436: \$? = $ac_status" >&5
+  echo "$as_me:17503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17448,16 +17515,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17451: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17518: 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:17454: checking for mkstemp" >&5
+	echo "$as_me:17521: 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 17460 "configure"
+#line 17527 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17488,16 +17555,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17494: \$? = $ac_status" >&5
+  echo "$as_me:17561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17500: \$? = $ac_status" >&5
+  echo "$as_me:17567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17507,7 +17574,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17510: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17577: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -17536,7 +17603,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:17539: checking for $ac_word" >&5
+echo "$as_me:17606: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17553,7 +17620,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:17556: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17623: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17565,10 +17632,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:17568: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:17635: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:17571: result: no" >&5
+  echo "$as_me:17638: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17578,7 +17645,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:17581: checking for $cf_prog_gnat version" >&5
+echo "$as_me:17648: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17589,7 +17656,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17592: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17659: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -17618,7 +17685,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:17621: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:17688: 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
@@ -17637,10 +17704,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:17640: result: $cf_gprconfig_value" >&5
+					echo "$as_me:17707: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:17643: result: missing" >&5
+					echo "$as_me:17710: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -17653,7 +17720,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:17656: checking for gnat version" >&5
+echo "$as_me:17723: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17664,7 +17731,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17667: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17734: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -17673,7 +17740,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:17676: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:17743: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -17681,7 +17748,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:17684: checking for $ac_word" >&5
+echo "$as_me:17751: 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
@@ -17696,7 +17763,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:17699: found $ac_dir/$ac_word" >&5
+echo "$as_me:17766: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17705,20 +17772,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:17708: result: $M4_exists" >&5
+  echo "$as_me:17775: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:17711: result: no" >&5
+  echo "$as_me:17778: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:17717: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:17784: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:17721: checking if GNAT works" >&5
+			echo "$as_me:17788: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -17746,7 +17813,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:17749: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:17816: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -17756,7 +17823,7 @@ fi
 
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:17759: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:17826: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -17773,10 +17840,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:17776: result: $ADAFLAGS" >&5
+	echo "$as_me:17843: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:17779: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17846: 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
@@ -17786,11 +17853,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:17789: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17856: 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:17793: checking if GNAT supports generics" >&5
+echo "$as_me:17860: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -17800,7 +17867,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:17803: result: $cf_gnat_generics" >&5
+echo "$as_me:17870: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -17812,7 +17879,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:17815: checking if GNAT supports SIGINT" >&5
+echo "$as_me:17882: 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
@@ -17860,7 +17927,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:17863: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:17930: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -17873,7 +17940,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:17876: checking if GNAT supports project files" >&5
+echo "$as_me:17943: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -17936,15 +18003,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:17939: result: $cf_gnat_projects" >&5
+echo "$as_me:18006: 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:17945: checking if GNAT supports libraries" >&5
+	echo "$as_me:18012: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:17947: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18014: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -17964,7 +18031,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:17967: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18034: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -17976,7 +18043,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:17979: checking for ada-compiler" >&5
+echo "$as_me:18046: 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.
@@ -17987,12 +18054,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:17990: result: $cf_ada_compiler" >&5
+echo "$as_me:18057: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:17995: checking for ada-include" >&5
+echo "$as_me:18062: 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.
@@ -18028,7 +18095,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18031: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18098: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18037,10 +18104,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18040: result: $ADA_INCLUDE" >&5
+echo "$as_me:18107: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18043: checking for ada-objects" >&5
+echo "$as_me:18110: 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.
@@ -18076,7 +18143,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18079: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18146: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18085,10 +18152,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18088: result: $ADA_OBJECTS" >&5
+echo "$as_me:18155: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18091: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:18158: 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.
@@ -18098,14 +18165,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:18101: result: $with_ada_sharedlib" >&5
+echo "$as_me:18168: 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:18108: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:18175: 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
@@ -18125,7 +18192,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18128: checking for ada-libname" >&5
+echo "$as_me:18195: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18141,16 +18208,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18144: result: $ADA_LIBNAME" >&5
+echo "$as_me:18211: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18148: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18215: 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:18153: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18220: 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
@@ -18190,7 +18257,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18193: checking default library suffix" >&5
+echo "$as_me:18260: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18201,10 +18268,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18204: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18271: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18207: checking default library-dependency suffix" >&5
+echo "$as_me:18274: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18287,10 +18354,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18290: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18357: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18293: checking default object directory" >&5
+echo "$as_me:18360: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18306,7 +18373,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18309: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18376: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18448,7 +18515,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18451: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18518: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18584,7 +18651,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230114,
+configured by $0, generated by GNU Autoconf 2.52.20230903,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -18629,7 +18696,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18632: error: ambiguous option: $1
+    { { echo "$as_me:18699: 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;}
@@ -18648,7 +18715,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18651: error: unrecognized option: $1
+  -*) { { echo "$as_me:18718: 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;}
@@ -18667,7 +18734,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230114, executed with
+This file was extended by $as_me 2.52.20230903, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -18723,7 +18790,7 @@ do
   "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:18726: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18793: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19084,7 +19151,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19087: creating $ac_file" >&5
+    { echo "$as_me:19154: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19102,7 +19169,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19105: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19172: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19115,7 +19182,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19118: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19185: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19131,7 +19198,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19134: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19201: 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;}
@@ -19140,7 +19207,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19143: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19210: 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;}
@@ -19168,11 +19235,11 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out
   rm -f "$tmp"/stdin
 EOF
-: "${FGREP:=grep -F}"
-: "${EGREP:=grep -E}"
+test -n "${FGREP}" || FGREP="grep -F"
+test -n "${EGREP}" || EGREP="grep -E"
 cat >>"$CONFIG_STATUS" <<EOF
-  : "\${FGREP:=$FGREP}"
-  : "\${EGREP:=$EGREP}"
+  test -n "\${FGREP}" || FGREP="$FGREP"
+  test -n "\${EGREP}" || EGREP="$EGREP"
 EOF
 cat >>"$CONFIG_STATUS" <<\EOF
   if test x"$ac_file" != x-; then
@@ -19185,7 +19252,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19255: 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 +19263,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19199: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19266: 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 +19312,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19248: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19315: 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 +19323,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19259: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19326: 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 +19336,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19272: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19339: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19327,7 +19394,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19330: $ac_file is unchanged" >&5
+      { echo "$as_me:19397: $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/NEWS b/NEWS
index 01e0761cb..6fa56fc57 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4012 2023/10/07 23:07:35 tom Exp $
+-- $Id: NEWS,v 1.4014 2023/10/14 19:43:34 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231014
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng
+	+ update config.guess, config.sub
+
 20231007
 	+ improve loop-limit for get_position().
 	+ improve manual description of immedok (Debian #1053603).
diff --git a/VERSION b/VERSION
index f134650c1..7be90bfb2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231007
+5:0:10	6.4	20231014
diff --git a/aclocal.m4 b/aclocal.m4
index de4b9fba2..dcf1d2954 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1050 2023/07/29 00:15:23 tom Exp $
+dnl $Id: aclocal.m4,v 1.1051 2023/09/06 22:55:27 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -10002,7 +10002,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -10062,7 +10062,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
diff --git a/config.guess b/config.guess
index b18721393..cdfc43920 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-07-20'
+timestamp='2023-08-22'
 
 # 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
@@ -155,6 +155,9 @@ Linux|GNU|GNU/*)
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
+	#if defined(__ANDROID__)
+	LIBC=android
+	#else
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -169,6 +172,7 @@ Linux|GNU|GNU/*)
 	LIBC=musl
 	#endif
 	#endif
+	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -904,7 +908,7 @@ EOF
 	fi
 	;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
diff --git a/config.sub b/config.sub
index 6ae250275..51394d320 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-07-31'
+timestamp='2023-09-15'
 
 # 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
@@ -1181,7 +1181,7 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be \
+			| aarch64 | aarch64_be | aarch64c | arm64ec \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1200,6 +1200,7 @@ case $cpu-$vendor in
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 			| hexagon \
@@ -1284,11 +1285,12 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if test x"$basic_os" != x
 then
 
 # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
+obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
@@ -1488,10 +1490,16 @@ case $os in
 			os=eabi
 			;;
 		    *)
-			os=elf
+			os=
+			obj=elf
 			;;
 		esac
 		;;
+	aout* | coff* | elf* | pe*)
+		# These are machine code file formats, not OSes
+		obj=$os
+		os=
+		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1510,12 +1518,15 @@ else
 # system, and we'll never get to this point.
 
 kernel=
+obj=
 case $cpu-$vendor in
 	score-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	spu-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1525,28 +1536,35 @@ case $cpu-$vendor in
 		os=gnu
 		;;
 	arm*-semi)
-		os=aout
+		os=
+		obj=aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	c8051-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	tic54x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic55x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic6x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1568,19 +1586,24 @@ case $cpu-$vendor in
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=
+		obj=aout
 		;;
 	mep-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	or32-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1589,7 +1612,8 @@ case $cpu-$vendor in
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-be)
 		os=beos
@@ -1670,10 +1694,12 @@ case $cpu-$vendor in
 		os=uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-*bug)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-apple)
 		os=macos
@@ -1691,7 +1717,8 @@ esac
 
 fi
 
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
+
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
 	musl* | newlib* | relibc* | uclibc*)
@@ -1702,6 +1729,9 @@ case $os in
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;
+	# See `case $cpu-$os` validation below
+	ghcjs)
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1719,11 +1749,11 @@ case $os in
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
 	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | bosx* | nextstep* | cxux* | oabi* \
+	     | ptx* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
 	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | cygwin* | msys* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1747,60 +1777,95 @@ case $os in
 	kernel* | msvc* )
 		# Restricted further below
 		;;
+	'')
+		if test x"$obj" = x
+		then
+			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
+		fi
+		;;
 	*)
 		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
 		exit 1
 		;;
 esac
 
+case $obj in
+	aout* | coff* | elf* | pe*)
+		;;
+	'')
+		# empty is fine
+		;;
+	*)
+		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+# Here we handle the constraint that a (synthetic) cpu and os are
+# valid only in combination with each other and nowhere else.
+case $cpu-$os in
+	# The "javascript-unknown-ghcjs" triple is used by GHC; we
+	# accept it here in order to tolerate that, but reject any
+	# variations.
+	javascript-ghcjs)
+		;;
+	javascript-* | *-ghcjs)
+		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
+		exit 1
+		;;
+esac
+
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		   | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
+case $kernel-$os-$obj in
+	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
+		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
 		;;
-	uclinux-uclibc* )
+	uclinux-uclibc*- )
 		;;
-	managarm-mlibc* | managarm-kernel* )
+	managarm-mlibc*- | managarm-kernel*- )
 		;;
-	windows*-gnu* | windows*-msvc*)
+	windows*-gnu*- | windows*-msvc*-)
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
+	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
 		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	-kernel* )
+	-kernel*- )
 		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	*-kernel* )
+	*-kernel*- )
 		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
 		exit 1
 		;;
-	*-msvc* )
+	*-msvc*- )
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
+	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
-	nto-qnx*)
+	nto-qnx*-)
 		;;
-	os2-emx)
+	os2-emx-)
 		;;
-	*-eabi* | *-gnueabi*)
+	*-eabi*- | *-gnueabi*-)
 		;;
-	none-coff* | none-elf*)
+	none--*)
 		# None (no kernel, i.e. freestanding / bare metal),
-		# can be paired with an output format "OS"
+		# can be paired with an machine code file format
 		;;
-	-*)
+	-*-)
 		# Blank kernel with real OS is always fine.
 		;;
-	*-*)
+	--*)
+		# Blank kernel and OS with real machine code file format is always fine.
+		;;
+	*-*-*)
 		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
@@ -1884,7 +1949,7 @@ case $vendor in
 		;;
 esac
 
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit
 
 # Local variables:
diff --git a/configure b/configure
index eec2f77e2..1b1e9e921 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.765 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230114.
+# Generated by Autoconf 2.52.20230903.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -947,7 +947,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230114.  Invocation command line was
+generated by GNU Autoconf 2.52.20230903.  Invocation command line was
 
   $ $0 $@
 
@@ -10414,7 +10414,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
@@ -22873,7 +22873,7 @@ main (void)
   if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0)
     $ac_main_return(1);
   putc('\r', stdout);
-  $ac_main_return(0);			/* Non-reversed systems segv here.  */
+  $ac_main_return(0);                   /* Non-reversed systems segv here.  */
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
@@ -24063,11 +24063,7 @@ else
    static variable whose address is put into a register that is
    clobbered by the vfork.  */
 static
-#ifdef __cplusplus
 sparc_address_test (int arg)
-# else
-sparc_address_test (arg) int arg;
-#endif
 {
   static pid_t child;
   if (!child) {
@@ -24110,7 +24106,7 @@ main (void)
     /* Convince the compiler that p..p7 are live; otherwise, it might
        use the same hardware register for all 8 local variables.  */
     if (p != p1 || p != p2 || p != p3 || p != p4
-	|| p != p5 || p != p6 || p != p7)
+        || p != p5 || p != p6 || p != p7)
       _exit(1);
 
     /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
@@ -24125,31 +24121,31 @@ main (void)
     while (wait(&status) != child)
       ;
     $ac_main_return(
-	 /* Was there some problem with vforking?  */
-	 child < 0
+         /* Was there some problem with vforking?  */
+         child < 0
 
-	 /* Did the child fail?  (This shouldn't happen.)  */
-	 || status
+         /* Did the child fail?  (This shouldn't happen.)  */
+         || status
 
-	 /* Did the vfork/compiler bug occur?  */
-	 || parent != getpid()
+         /* Did the vfork/compiler bug occur?  */
+         || parent != getpid()
 
-	 /* Did the file descriptor bug occur?  */
-	 || fstat(fileno(stdout), &st) != 0
-	 );
+         /* Did the file descriptor bug occur?  */
+         || fstat(fileno(stdout), &st) != 0
+         );
   }
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24147: \$? = $ac_status" >&5
+  echo "$as_me:24143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24152: \$? = $ac_status" >&5
+  echo "$as_me:24148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24161,13 +24157,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24164: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24160: 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:24170: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24166: 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
 
@@ -24192,7 +24188,7 @@ EOF
 
 fi
 
-echo "$as_me:24195: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24191: 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
@@ -24202,7 +24198,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24205 "configure"
+#line 24201 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24237,15 +24233,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24243: \$? = $ac_status" >&5
+  echo "$as_me:24239: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24248: \$? = $ac_status" >&5
+  echo "$as_me:24244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24258,7 +24254,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24261: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24257: 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
@@ -24267,7 +24263,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24270: checking for openpty in -lutil" >&5
+echo "$as_me:24266: 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
@@ -24275,7 +24271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24278 "configure"
+#line 24274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24294,16 +24290,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24300: \$? = $ac_status" >&5
+  echo "$as_me:24296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24314,7 +24310,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24317: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24313: 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
@@ -24322,7 +24318,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24325: checking for openpty header" >&5
+echo "$as_me:24321: 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
@@ -24349,7 +24345,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24352 "configure"
+#line 24348 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24366,16 +24362,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24372: \$? = $ac_status" >&5
+  echo "$as_me:24368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24378: \$? = $ac_status" >&5
+  echo "$as_me:24374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24393,7 +24389,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24396: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24392: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24466,7 +24462,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24469 "configure"
+#line 24465 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24478,16 +24474,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24484: \$? = $ac_status" >&5
+  echo "$as_me:24480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24490: \$? = $ac_status" >&5
+  echo "$as_me:24486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24504,7 +24500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24507: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24540,7 +24536,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24543: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24539: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24551,7 +24547,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24554: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24550: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24623,7 +24619,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24626 "configure"
+#line 24622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24635,16 +24631,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24641: \$? = $ac_status" >&5
+  echo "$as_me:24637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24647: \$? = $ac_status" >&5
+  echo "$as_me:24643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24661,7 +24657,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24664: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24660: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24741,7 +24737,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24744: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24740: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24758,23 +24754,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24761: checking for db.h" >&5
+echo "$as_me:24757: 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 24767 "configure"
+#line 24763 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24771: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24777: \$? = $ac_status" >&5
+  echo "$as_me:24773: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24793,11 +24789,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24796: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24792: 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:24800: checking for version of db" >&5
+echo "$as_me:24796: 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
@@ -24808,10 +24804,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24811: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24807: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24814 "configure"
+#line 24810 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24841,16 +24837,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24847: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24853: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24864,16 +24860,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24867: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24863: 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:24871: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24867: 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:24876: checking for db libraries" >&5
+echo "$as_me:24872: 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
@@ -24903,10 +24899,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24906: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24902: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24909 "configure"
+#line 24905 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24961,16 +24957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24967: \$? = $ac_status" >&5
+  echo "$as_me:24963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24973: \$? = $ac_status" >&5
+  echo "$as_me:24969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24990,11 +24986,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24993: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24989: 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:24997: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:24993: 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
@@ -25020,7 +25016,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25023: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25019: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25035,7 +25031,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25038: checking if we should include stdbool.h" >&5
+echo "$as_me:25034: 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
@@ -25043,7 +25039,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25046 "configure"
+#line 25042 "configure"
 #include "confdefs.h"
 
 int
@@ -25055,23 +25051,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25061: \$? = $ac_status" >&5
+  echo "$as_me:25057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25067: \$? = $ac_status" >&5
+  echo "$as_me:25063: \$? = $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 25074 "configure"
+#line 25070 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25087,16 +25083,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25093: \$? = $ac_status" >&5
+  echo "$as_me:25089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25099: \$? = $ac_status" >&5
+  echo "$as_me:25095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25110,13 +25106,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25113: result: yes" >&5
+then	echo "$as_me:25109: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25115: result: no" >&5
+else	echo "$as_me:25111: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25119: checking for builtin bool type" >&5
+echo "$as_me:25115: 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
@@ -25124,7 +25120,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25127 "configure"
+#line 25123 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25139,16 +25135,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25145: \$? = $ac_status" >&5
+  echo "$as_me:25141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25151: \$? = $ac_status" >&5
+  echo "$as_me:25147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25161,9 +25157,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25164: result: yes" >&5
+then	echo "$as_me:25160: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25166: result: no" >&5
+else	echo "$as_me:25162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25180,10 +25176,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25183: checking if we already have C++ library" >&5
+	echo "$as_me:25179: 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 25186 "configure"
+#line 25182 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25197,16 +25193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25203: \$? = $ac_status" >&5
+  echo "$as_me:25199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25209: \$? = $ac_status" >&5
+  echo "$as_me:25205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25215,7 +25211,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25218: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25214: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25234,7 +25230,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25237: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25233: 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
@@ -25260,7 +25256,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25263 "configure"
+#line 25259 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25274,16 +25270,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25280: \$? = $ac_status" >&5
+  echo "$as_me:25276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25286: \$? = $ac_status" >&5
+  echo "$as_me:25282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25295,7 +25291,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25298: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25294: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25317,7 +25313,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25320: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25316: 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
@@ -25332,15 +25328,15 @@ CF_EOF
 # 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:25335: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25338: \$? = $ac_status" >&5
+  echo "$as_me:25334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25340: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25343: \$? = $ac_status" >&5
+  echo "$as_me:25339: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25351,10 +25347,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25354: result: yes" >&5
+  echo "$as_me:25350: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25357: result: no" >&5
+  echo "$as_me:25353: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25374,7 +25370,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25377: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25373: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25395,7 +25391,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25398 "configure"
+#line 25394 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25409,16 +25405,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25415: \$? = $ac_status" >&5
+  echo "$as_me:25411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25421: \$? = $ac_status" >&5
+  echo "$as_me:25417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25455,7 +25451,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25458 "configure"
+#line 25454 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25469,16 +25465,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25475: \$? = $ac_status" >&5
+  echo "$as_me:25471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25481: \$? = $ac_status" >&5
+  echo "$as_me:25477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25511,7 +25507,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25514: result: $cf_cxx_library" >&5
+	echo "$as_me:25510: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25527,7 +25523,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25530: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25526: 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
@@ -25544,18 +25540,18 @@ do
   # 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 25547 "configure"
+#line 25543 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25552: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25548: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25558: \$? = $ac_status" >&5
+  echo "$as_me:25554: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25578,17 +25574,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25581 "configure"
+#line 25577 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25591: \$? = $ac_status" >&5
+  echo "$as_me:25587: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25625,7 +25621,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25628: result: $CXXCPP" >&5
+echo "$as_me:25624: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25635,18 +25631,18 @@ do
   # 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 25638 "configure"
+#line 25634 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25643: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25639: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25649: \$? = $ac_status" >&5
+  echo "$as_me:25645: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25669,17 +25665,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25672 "configure"
+#line 25668 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25676: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25682: \$? = $ac_status" >&5
+  echo "$as_me:25678: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25707,7 +25703,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25710: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25706: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25722,23 +25718,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25725: checking for $ac_header" >&5
+echo "$as_me:25721: 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 25731 "configure"
+#line 25727 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25735: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25731: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25741: \$? = $ac_status" >&5
+  echo "$as_me:25737: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25757,7 +25753,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25760: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25756: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25770,23 +25766,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25773: checking for $ac_header" >&5
+echo "$as_me:25769: 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 25779 "configure"
+#line 25775 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25783: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25779: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25789: \$? = $ac_status" >&5
+  echo "$as_me:25785: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25805,7 +25801,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25808: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25804: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25816,10 +25812,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25819: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25815: 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 25822 "configure"
+#line 25818 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25836,16 +25832,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25842: \$? = $ac_status" >&5
+  echo "$as_me:25838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25848: \$? = $ac_status" >&5
+  echo "$as_me:25844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25854,7 +25850,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25857: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25853: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25865,7 +25861,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25868: checking if we should include stdbool.h" >&5
+echo "$as_me:25864: 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
@@ -25873,7 +25869,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25876 "configure"
+#line 25872 "configure"
 #include "confdefs.h"
 
 int
@@ -25885,23 +25881,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25891: \$? = $ac_status" >&5
+  echo "$as_me:25887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25897: \$? = $ac_status" >&5
+  echo "$as_me:25893: \$? = $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 25904 "configure"
+#line 25900 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25917,16 +25913,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25923: \$? = $ac_status" >&5
+  echo "$as_me:25919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25929: \$? = $ac_status" >&5
+  echo "$as_me:25925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25940,13 +25936,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25943: result: yes" >&5
+then	echo "$as_me:25939: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25945: result: no" >&5
+else	echo "$as_me:25941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25949: checking for builtin bool type" >&5
+echo "$as_me:25945: 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
@@ -25954,7 +25950,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25957 "configure"
+#line 25953 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25969,16 +25965,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25975: \$? = $ac_status" >&5
+  echo "$as_me:25971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25981: \$? = $ac_status" >&5
+  echo "$as_me:25977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25991,19 +25987,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25994: result: yes" >&5
+then	echo "$as_me:25990: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25996: result: no" >&5
+else	echo "$as_me:25992: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26000: checking for bool" >&5
+echo "$as_me:25996: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26006 "configure"
+#line 26002 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26038,16 +26034,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26044: \$? = $ac_status" >&5
+  echo "$as_me:26040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26050: \$? = $ac_status" >&5
+  echo "$as_me:26046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26057,10 +26053,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26060: result: $ac_cv_type_bool" >&5
+echo "$as_me:26056: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26063: checking size of bool" >&5
+echo "$as_me:26059: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26069,7 +26065,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26072 "configure"
+#line 26068 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26101,21 +26097,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26107: \$? = $ac_status" >&5
+  echo "$as_me:26103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26113: \$? = $ac_status" >&5
+  echo "$as_me:26109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26118 "configure"
+#line 26114 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26147,16 +26143,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26153: \$? = $ac_status" >&5
+  echo "$as_me:26149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26159: \$? = $ac_status" >&5
+  echo "$as_me:26155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26172,7 +26168,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26175 "configure"
+#line 26171 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26204,16 +26200,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26210: \$? = $ac_status" >&5
+  echo "$as_me:26206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26216: \$? = $ac_status" >&5
+  echo "$as_me:26212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26229,7 +26225,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26232 "configure"
+#line 26228 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26261,16 +26257,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26267: \$? = $ac_status" >&5
+  echo "$as_me:26263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26273: \$? = $ac_status" >&5
+  echo "$as_me:26269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26283,12 +26279,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26286: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26282: 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 26291 "configure"
+#line 26287 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26324,15 +26320,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26330: \$? = $ac_status" >&5
+  echo "$as_me:26326: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26335: \$? = $ac_status" >&5
+  echo "$as_me:26331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26348,13 +26344,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26351: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26347: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26357: checking for type of bool" >&5
+echo "$as_me:26353: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26373,7 +26369,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26376 "configure"
+#line 26372 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26414,15 +26410,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26420: \$? = $ac_status" >&5
+  echo "$as_me:26416: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26425: \$? = $ac_status" >&5
+  echo "$as_me:26421: \$? = $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
@@ -26439,19 +26435,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26442: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26438: 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:26449: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26445: 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:26454: checking for special defines needed for etip.h" >&5
+echo "$as_me:26450: 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"
@@ -26469,7 +26465,7 @@ do
 	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 26472 "configure"
+#line 26468 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26483,16 +26479,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26489: \$? = $ac_status" >&5
+  echo "$as_me:26485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26495: \$? = $ac_status" >&5
+  echo "$as_me:26491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26513,12 +26509,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26516: result: $cf_result" >&5
+echo "$as_me:26512: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26521: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26517: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26535,7 +26531,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26538 "configure"
+#line 26534 "configure"
 #include "confdefs.h"
 
 class base
@@ -26554,15 +26550,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26560: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26565: \$? = $ac_status" >&5
+  echo "$as_me:26561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26581,7 +26577,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26584: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26580: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26590,7 +26586,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26593: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26589: 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
@@ -26607,7 +26603,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26610 "configure"
+#line 26606 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26626,15 +26622,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26632: \$? = $ac_status" >&5
+  echo "$as_me:26628: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26637: \$? = $ac_status" >&5
+  echo "$as_me:26633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26653,7 +26649,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26656: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26652: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26663,7 +26659,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26666: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26662: 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
@@ -26677,7 +26673,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26680 "configure"
+#line 26676 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26721,16 +26717,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26727: \$? = $ac_status" >&5
+  echo "$as_me:26723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26733: \$? = $ac_status" >&5
+  echo "$as_me:26729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26748,7 +26744,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26751: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26747: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26797,13 +26793,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26800: checking for bool" >&5
+echo "$as_me:26796: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26806 "configure"
+#line 26802 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26838,16 +26834,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26844: \$? = $ac_status" >&5
+  echo "$as_me:26840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26850: \$? = $ac_status" >&5
+  echo "$as_me:26846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26857,10 +26853,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26860: result: $ac_cv_type_bool" >&5
+echo "$as_me:26856: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26863: checking size of bool" >&5
+echo "$as_me:26859: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26869,7 +26865,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26872 "configure"
+#line 26868 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26901,21 +26897,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26907: \$? = $ac_status" >&5
+  echo "$as_me:26903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26913: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26918 "configure"
+#line 26914 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26947,16 +26943,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26950: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26953: \$? = $ac_status" >&5
+  echo "$as_me:26949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26959: \$? = $ac_status" >&5
+  echo "$as_me:26955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26972,7 +26968,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26975 "configure"
+#line 26971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27004,16 +27000,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27010: \$? = $ac_status" >&5
+  echo "$as_me:27006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27016: \$? = $ac_status" >&5
+  echo "$as_me:27012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27029,7 +27025,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27032 "configure"
+#line 27028 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27061,16 +27057,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27067: \$? = $ac_status" >&5
+  echo "$as_me:27063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27073: \$? = $ac_status" >&5
+  echo "$as_me:27069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27083,12 +27079,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27086: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27082: 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 27091 "configure"
+#line 27087 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27124,15 +27120,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27130: \$? = $ac_status" >&5
+  echo "$as_me:27126: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27135: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27148,13 +27144,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27151: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27147: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27157: checking for type of bool" >&5
+echo "$as_me:27153: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27173,7 +27169,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27176 "configure"
+#line 27172 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27214,15 +27210,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27220: \$? = $ac_status" >&5
+  echo "$as_me:27216: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27225: \$? = $ac_status" >&5
+  echo "$as_me:27221: \$? = $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
@@ -27239,26 +27235,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27242: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27238: 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:27249: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27245: 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:27255: checking for fallback type of bool" >&5
+			echo "$as_me:27251: 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:27261: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27257: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27287,7 +27283,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27290: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27286: 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
@@ -27304,7 +27300,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27307: checking for $ac_word" >&5
+echo "$as_me:27303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27321,7 +27317,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27324: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27320: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27333,10 +27329,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27336: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27332: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27339: result: no" >&5
+  echo "$as_me:27335: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27346,7 +27342,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27349: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27345: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27357,7 +27353,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27360: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27356: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27386,7 +27382,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27389: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27385: 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
@@ -27405,10 +27401,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27408: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27404: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27411: result: missing" >&5
+					echo "$as_me:27407: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27421,7 +27417,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27424: checking for gnat version" >&5
+echo "$as_me:27420: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27432,7 +27428,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27435: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27431: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27441,7 +27437,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27444: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27440: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27449,7 +27445,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27452: checking for $ac_word" >&5
+echo "$as_me:27448: 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
@@ -27464,7 +27460,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27467: found $ac_dir/$ac_word" >&5
+echo "$as_me:27463: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27473,20 +27469,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27476: result: $M4_exists" >&5
+  echo "$as_me:27472: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27479: result: no" >&5
+  echo "$as_me:27475: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27485: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27481: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27489: checking if GNAT works" >&5
+			echo "$as_me:27485: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27514,7 +27510,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27517: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27513: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27526,7 +27522,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27529: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27525: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27543,10 +27539,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27546: result: $ADAFLAGS" >&5
+	echo "$as_me:27542: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27549: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27545: 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
@@ -27556,11 +27552,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27559: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27555: 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:27563: checking if GNAT supports generics" >&5
+echo "$as_me:27559: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27570,7 +27566,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27573: result: $cf_gnat_generics" >&5
+echo "$as_me:27569: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27582,7 +27578,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27585: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27581: 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
@@ -27630,7 +27626,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27633: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27629: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27643,7 +27639,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27646: checking if GNAT supports project files" >&5
+echo "$as_me:27642: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27706,15 +27702,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27709: result: $cf_gnat_projects" >&5
+echo "$as_me:27705: 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:27715: checking if GNAT supports libraries" >&5
+	echo "$as_me:27711: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27717: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27713: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27734,7 +27730,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27737: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27733: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27746,7 +27742,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27749: checking for ada-compiler" >&5
+echo "$as_me:27745: 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.
@@ -27757,12 +27753,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27760: result: $cf_ada_compiler" >&5
+echo "$as_me:27756: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27765: checking for ada-include" >&5
+echo "$as_me:27761: 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.
@@ -27798,7 +27794,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27801: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27797: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27807,10 +27803,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27810: result: $ADA_INCLUDE" >&5
+echo "$as_me:27806: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27813: checking for ada-objects" >&5
+echo "$as_me:27809: 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.
@@ -27846,7 +27842,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27849: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27845: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27855,10 +27851,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27858: result: $ADA_OBJECTS" >&5
+echo "$as_me:27854: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27861: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27857: 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.
@@ -27868,14 +27864,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27871: result: $with_ada_sharedlib" >&5
+echo "$as_me:27867: 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:27878: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27874: 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
@@ -27895,7 +27891,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27898: checking for ada-libname" >&5
+echo "$as_me:27894: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27911,7 +27907,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27914: result: $ADA_LIBNAME" >&5
+echo "$as_me:27910: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27922,13 +27918,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27925: checking for wchar_t" >&5
+	echo "$as_me:27921: 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 27931 "configure"
+#line 27927 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27943,16 +27939,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27949: \$? = $ac_status" >&5
+  echo "$as_me:27945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27955: \$? = $ac_status" >&5
+  echo "$as_me:27951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27962,10 +27958,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27965: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27961: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27968: checking size of wchar_t" >&5
+echo "$as_me:27964: 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
@@ -27974,7 +27970,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27977 "configure"
+#line 27973 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27986,21 +27982,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27992: \$? = $ac_status" >&5
+  echo "$as_me:27988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27998: \$? = $ac_status" >&5
+  echo "$as_me:27994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28003 "configure"
+#line 27999 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28012,16 +28008,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28018: \$? = $ac_status" >&5
+  echo "$as_me:28014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28024: \$? = $ac_status" >&5
+  echo "$as_me:28020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28037,7 +28033,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28040 "configure"
+#line 28036 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28049,16 +28045,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28048: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28055: \$? = $ac_status" >&5
+  echo "$as_me:28051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28061: \$? = $ac_status" >&5
+  echo "$as_me:28057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28074,7 +28070,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28077 "configure"
+#line 28073 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28086,16 +28082,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28092: \$? = $ac_status" >&5
+  echo "$as_me:28088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28098: \$? = $ac_status" >&5
+  echo "$as_me:28094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28108,12 +28104,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28111: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28107: 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 28116 "configure"
+#line 28112 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28129,15 +28125,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28135: \$? = $ac_status" >&5
+  echo "$as_me:28131: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28140: \$? = $ac_status" >&5
+  echo "$as_me:28136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28153,7 +28149,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28156: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28152: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28166,7 +28162,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28169: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28165: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28184,7 +28180,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28187: checking for library subsets" >&5
+echo "$as_me:28183: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28238,7 +28234,7 @@ fi
 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:28241: result: $LIB_SUBSETS" >&5
+echo "$as_me:28237: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28269,7 +28265,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28272: checking default library suffix" >&5
+echo "$as_me:28268: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28280,10 +28276,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28283: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28279: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28286: checking default library-dependency suffix" >&5
+echo "$as_me:28282: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28366,10 +28362,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28369: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28365: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28372: checking default object directory" >&5
+echo "$as_me:28368: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28385,11 +28381,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28388: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28384: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28392: checking c++ library-dependency suffix" >&5
+echo "$as_me:28388: 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++)
@@ -28482,7 +28478,7 @@ else
 	fi
 
 fi
-echo "$as_me:28485: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28481: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28658,19 +28654,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28661: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28657: 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 <<EOF
-#line 28666 "configure"
+#line 28662 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28670: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28673: \$? = $ac_status" >&5
+  echo "$as_me:28669: \$? = $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
@@ -28681,10 +28677,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28684 "configure"
+#line 28680 "configure"
 #include "confdefs.h"
 
-#line 28687 "configure"
+#line 28683 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28699,16 +28695,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28705: \$? = $ac_status" >&5
+  echo "$as_me:28701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28711: \$? = $ac_status" >&5
+  echo "$as_me:28707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28731,7 +28727,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28734: result: $cf_ldflags_static" >&5
+	echo "$as_me:28730: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28747,7 +28743,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28750: checking where we will install curses.h" >&5
+echo "$as_me:28746: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28757,7 +28753,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28760: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28756: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28765,7 +28761,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28768: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28764: 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
@@ -28790,7 +28786,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28793: checking for desired basename for form library" >&5
+echo "$as_me:28789: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28810,10 +28806,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28813: result: $FORM_NAME" >&5
+echo "$as_me:28809: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28816: checking for desired basename for menu library" >&5
+echo "$as_me:28812: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28833,10 +28829,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28836: result: $MENU_NAME" >&5
+echo "$as_me:28832: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28839: checking for desired basename for panel library" >&5
+echo "$as_me:28835: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28856,10 +28852,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28859: result: $PANEL_NAME" >&5
+echo "$as_me:28855: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28862: checking for desired basename for cxx library" >&5
+echo "$as_me:28858: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28879,13 +28875,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28882: result: $CXX_NAME" >&5
+echo "$as_me:28878: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28888: checking for src modules" >&5
+echo "$as_me:28884: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28944,7 +28940,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28947: result: $cf_cv_src_modules" >&5
+echo "$as_me:28943: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29105,7 +29101,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29108: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29104: 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//'`
@@ -29116,7 +29112,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29119: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29115: 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
@@ -29132,7 +29128,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29135: result: $PKG_CFLAGS" >&5
+echo "$as_me:29131: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29193,7 +29189,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29196: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29192: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29220,7 +29216,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29223: checking for linker search path" >&5
+echo "$as_me:29219: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29268,7 +29264,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29271: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29267: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29309,7 +29305,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29312: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29308: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29395,7 +29391,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29398: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29394: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29531,7 +29527,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230114,
+configured by $0, generated by GNU Autoconf 2.52.20230903,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -29576,7 +29572,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29579: error: ambiguous option: $1
+    { { echo "$as_me:29575: 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;}
@@ -29595,7 +29591,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29598: error: unrecognized option: $1
+  -*) { { echo "$as_me:29594: 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;}
@@ -29614,7 +29610,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230114, executed with
+This file was extended by $as_me 2.52.20230903, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -29725,7 +29721,7 @@ do
   "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:29728: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29724: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30242,7 +30238,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30245: creating $ac_file" >&5
+    { echo "$as_me:30241: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30260,7 +30256,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30263: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30259: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30273,7 +30269,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30276: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30272: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30289,7 +30285,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30292: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30288: 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;}
@@ -30298,7 +30294,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30301: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30297: 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;}
@@ -30326,11 +30322,11 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out
   rm -f "$tmp"/stdin
 EOF
-: "${FGREP:=grep -F}"
-: "${EGREP:=grep -E}"
+test -n "${FGREP}" || FGREP="grep -F"
+test -n "${EGREP}" || EGREP="grep -E"
 cat >>"$CONFIG_STATUS" <<EOF
-  : "\${FGREP:=$FGREP}"
-  : "\${EGREP:=$EGREP}"
+  test -n "\${FGREP}" || FGREP="$FGREP"
+  test -n "\${EGREP}" || EGREP="$EGREP"
 EOF
 cat >>"$CONFIG_STATUS" <<\EOF
   if test x"$ac_file" != x-; then
@@ -30343,7 +30339,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30346: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30342: 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;}
@@ -30354,7 +30350,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30357: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30353: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30403,7 +30399,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30406: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30402: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30414,7 +30410,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30417: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30413: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30427,7 +30423,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30430: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30426: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30485,7 +30481,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30488: $ac_file is unchanged" >&5
+      { echo "$as_me:30484: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30872,7 +30868,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30875: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30871: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index 3f8fa261a..2742f1f5f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1570 2023/10/07 10:05:48 tom Exp $
+# $Id: dist.mk,v 1.1571 2023/10/14 09:55:54 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231007
+NCURSES_PATCH = 20231014
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index bb74c5e10..4d1c8ce38 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.51 2023/10/07 21:19:07 tom Exp @
+  * @Id: captoinfo.1m,v 1.52 2023/10/14 19:25:26 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -75,14 +75,15 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
        option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
-       and <STRONG>-x</STRONG>.
+       and <STRONG>-x</STRONG>.  The <STRONG>-V</STRONG> option reports the version of <EM>ncurses</EM>  associated  with
+       this program and exits with a successful status.
 
 
 </PRE><H3><a name="h3-Translations-from-nonstandard-capabilities">Translations from nonstandard capabilities</a></H3><PRE>
        <STRONG>captoinfo</STRONG>  translates  some  obsolete,  nonstandard  capabilities  into
-       standard   (SVr4/XSI   Curses)  <EM>terminfo</EM>  capabilities.   It  issues  a
-       diagnostic to the standard error stream for each, inviting the user  to
-       check  that  it  has  not  mistakenly translated an unknown or mistyped
+       standard  (SVr4/XSI  Curses)  <EM>terminfo</EM>  capabilities.   It   issues   a
+       diagnostic  to the standard error stream for each, inviting the user to
+       check that it has not mistakenly  translated  an  unknown  or  mistyped
        capability name.
 
        <STRONG>Nonstandard</STRONG>   <STRONG>Standard</STRONG>                  <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>i</I<STRONG>i</STRONG><EM>n</I<STRONG>n</STRONG><EM>f</I<STRONG>f</STRONG><EM>o</I<STRONG>o</STRONG>
@@ -114,8 +115,8 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
            <STRONG>KE</STRONG>           <STRONG>F4</STRONG>      Tek     <STRONG>key_f14</STRONG>
            <STRONG>KF</STRONG>           <STRONG>F5</STRONG>      Tek     <STRONG>key_f15</STRONG>
            <STRONG>BC</STRONG>           <STRONG>Sb</STRONG>      Tek     <STRONG>set_background</STRONG>
-           <STRONG>FC</STRONG>           <STRONG>Sf</STRONG>      Tek     <STRONG>set_foreground</STRONG>
 
+           <STRONG>FC</STRONG>           <STRONG>Sf</STRONG>      Tek     <STRONG>set_foreground</STRONG>
            <STRONG>HS</STRONG>           <STRONG>mh</STRONG>      Iris    <STRONG>enter_dim_mode</STRONG>
 
        XENIX <EM>termcap</EM> had a set of extension capabilities, corresponding to box
@@ -148,12 +149,12 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
          <STRONG>Gc</STRONG>      double intersection
          <STRONG>GG</STRONG>      ACS magic cookie count
 
-       If  the  single-line  capabilities occur in an entry, they are composed
+       If the single-line capabilities occur in an entry,  they  are  composed
        into an <STRONG>acsc</STRONG> string.  The double-line capabilities and <STRONG>GG</STRONG> are discarded
        with a warning message.
 
-       IBM's  AIX  has  a  <EM>terminfo</EM> facility descended from SVr1 <EM>terminfo</EM>, but
-       which is incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG>  translates  the
+       IBM's AIX has a <EM>terminfo</EM> facility descended  from  SVr1  <EM>terminfo</EM>,  but
+       which  is  incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG> translates the
        following AIX extensions.
 
         <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
@@ -165,11 +166,11 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
        font2   s2ds
        font3   s3ds
 
-       Additionally,  this  program  translates  the AIX <STRONG>box1</STRONG> capability to an
+       Additionally, this program translates the AIX  <STRONG>box1</STRONG>  capability  to  an
        <STRONG>acsc</STRONG> string.
 
-       The  HP-UX  <EM>terminfo</EM>  library   supports   two   nonstandard   <EM>terminfo</EM>
-       capabilities,  <STRONG>meml</STRONG>  (memory lock) and <STRONG>memu</STRONG> (memory unlock).  <STRONG>captoinfo</STRONG>
+       The   HP-UX   <EM>terminfo</EM>   library   supports  two  nonstandard  <EM>terminfo</EM>
+       capabilities, <STRONG>meml</STRONG> (memory lock) and <STRONG>memu</STRONG> (memory  unlock).   <STRONG>captoinfo</STRONG>
        discards these with a warning message.
 
 
@@ -179,12 +180,12 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The verbose option is not identical to SVr4's.  Under SVr4, instead  of
+       The  verbose option is not identical to SVr4's.  Under SVr4, instead of
        following the <STRONG>-v</STRONG> with a trace level <EM>n</EM>, you repeat it <EM>n</EM> times.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
+       X/Open Curses, Issue 7 (2009) describes <STRONG>tic</STRONG>  briefly,  but  omits  this
        program.  SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from
        <STRONG>tic</STRONG>.
 
@@ -201,7 +202,7 @@ <H1 class="no-header">captoinfo 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-10-14                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index e5bb6745a..375c6324e 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.85 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_color.3x,v 1.86 2023/10/14 19:19:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -73,7 +73,7 @@ <H1 class="no-header">curs_color 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>extended_color_content(int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_pair_content(int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>f</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>b</EM><STRONG>);</STRONG>
 
-       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs(void);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>COLOR_PAIR(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
@@ -525,7 +525,7 @@ <H1 class="no-header">curs_color 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 467e480c6..0abb2f764 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_kernel.3x,v 1.49 2023/10/14 22:03:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -155,13 +155,14 @@ <H1 class="no-header">curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-napms">napms</a></H3><PRE>
-       The <STRONG>napms</STRONG> routine is used to sleep for <EM>ms</EM> milliseconds.
+       The  <STRONG>napms</STRONG>  routine is used to sleep for <EM>ms</EM> milliseconds.  If the value
+       of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped at that value.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
-       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
+       <STRONG>curs_set</STRONG> returns the previous cursor state, or  <STRONG>ERR</STRONG>  if  the  requested
        <EM>visibility</EM> is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -179,25 +180,28 @@ <H1 class="no-header">curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
        <EM>y</EM> and <EM>x</EM>.
 
-       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
+       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both ncurses and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called to make the cursor other than normal, i.e., either invisible  or
-       very  visible.   There  is  no way for ncurses to determine the initial
+       called  to make the cursor other than normal, i.e., either invisible or
+       very visible.  There is no way for ncurses  to  determine  the  initial
        cursor state to restore that.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in the
-       XSI  Curses standard, Issue 4.  All other functions are as described in
+       XSI Curses standard, Issue 4.  All other functions are as described  in
        XSI Curses.
 
-       The SVr4 documentation describes <STRONG>setsyx</STRONG> and  <STRONG>getsyx</STRONG>  as  having  return
-       type  int.   This  is misleading, as they are macros with no documented
+       The  SVr4  documentation  describes  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> as having return
+       type int.  This is misleading, as they are macros  with  no  documented
        semantics for the return value.
 
+       If interrupted, ncurses restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
+       seconds, are different from other implementations.
+
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
@@ -205,7 +209,7 @@ <H1 class="no-header">curs_kernel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index fe486764f..7e2a81be4 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.79 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_mouse.3x,v 1.80 2023/10/14 20:00:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -348,24 +348,23 @@ <H1 class="no-header">curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse events under xterm will not in  fact  be  ignored  during  cooked
-       mode, if they have been enabled by <STRONG>mousemask</STRONG>.  Instead, the xterm mouse
-       report sequence will appear in the string read.
-
-       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  <STRONG>kmous</STRONG>  set  to
-       "\E[M"  (the  beginning  of  the response from xterm for mouse clicks).
-       Other values for <STRONG>kmous</STRONG> are permitted, but under  the  same  assumption,
-       i.e., it is the beginning of the response.
-
-       Because  there  are  no standard terminal responses that would serve to
-       identify terminals which support  the  xterm  mouse  protocol,  <EM>ncurses</EM>
-       assumes that if <STRONG>kmous</STRONG> 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 <STRONG>kmous</STRONG> capability
-       is checked first, allowing the use of newer xterm mouse protocols  such
-       as xterm's private mode 1006.
+       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in cooked  mode  if  they  have
+       been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
+       appears in the string read.
+
+       Mouse event reports from <EM>xterm</EM> are not detected correctly in  a  window
+       with  keypad application mode disabled, since they are interpreted as a
+       variety of function key.  Set the the  terminal's  <EM>terminfo</EM>  capability
+       <STRONG>kmous</STRONG>  to  "\E[M"  (the  beginning of the response from <EM>xterm</EM> for mouse
+       clicks).   Other  values  of  <STRONG>kmous</STRONG>  are  permitted  under   the   same
+       assumption, that is, the report begins with that sequence.
+
+       Because there are no standard response sequences that serve to identify
+       terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
+       <STRONG>kmous</STRONG> is defined in the terminal description, or if the terminal type's
+       primary name or aliases contain the string "xterm", then  the  terminal
+       may send mouse events.  The <STRONG>kmous</STRONG> capability is checked first, allowing
+       use of newer <EM>xterm</EM> mouse protocols such as its private mode 1006.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -374,7 +373,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 00630c6fe..56c35bcce 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_print.3x,v 1.33 2023/10/14 19:26:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">curs_print 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Padding in the <STRONG>mc5p</STRONG>, <STRONG>mc4</STRONG> and <STRONG>mc5</STRONG> capabilities will not be interpreted.
+       Padding in the <STRONG>mc5p</STRONG>, <STRONG>mc4</STRONG>, and <STRONG>mc5</STRONG> capabilities is not interpreted.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_print 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 619d40d20..4d4084665 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.41 2023/10/07 21:33:35 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.42 2023/10/14 19:51:44 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -212,7 +212,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>tigetnum_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>tigetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <EM>/*</EM> <EM>may</EM> <EM>instead</EM> <EM>use</EM> <EM>9</EM> <EM>long</EM> <EM>parameters</EM> <EM>*/</EM>
+       <EM>/*</EM> <EM>tparm</EM><STRONG>_</STRONG><EM>sp</EM> <EM>may</EM> <EM>use</EM> <EM>9</EM> <EM>long</EM> <EM>parameters</EM> <EM>rather</EM> <EM>than</EM> <EM>being</EM> <EM>variadic</EM> <EM>*/</EM>
        <STRONG>char*</STRONG> <STRONG>tparm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>tputs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
 
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 2efd40c76..a861edd8c 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.69 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_termcap.3x,v 1.70 2023/10/14 19:26:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -215,38 +215,6 @@ <H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            an error.
 
 
-</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       If you call <STRONG>tgetstr</STRONG> to fetch <STRONG>ca</STRONG> or any other parameterized  string,  be
-       aware  that it will be returned in terminfo notation, not the older and
-       not-quite-compatible termcap notation.  This will not cause problems if
-       all  you do with it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand terminfo-
-       style strings as terminfo.   (The  <STRONG>tgoto</STRONG>  function,  if  configured  to
-       support  termcap,  will check if the string is indeed terminfo-style by
-       looking for "%p" parameters or "$&lt;..&gt;" delays, and  invoke  a  termcap-
-       style parser if the string does not appear to be terminfo).
-
-       Because   terminfo  conventions  for  representing  padding  in  string
-       capabilities differ from termcap's, users can be surprised:
-
-       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a terminfo system will put out a literal "50" rather
-           than busy-waiting for 50 milliseconds.
-
-       <STRONG>o</STRONG>   However,  if  ncurses is configured to support termcap, it may also
-           have been configured to support the BSD-style padding.
-
-           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
-           digits at the beginning of the string.
-
-           <STRONG>tputs("50")</STRONG> in a termcap system may wait for 50 milliseconds rather
-           than put out a literal "50"
-
-       Note that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> string.   One
-       consequence  of  this  is that termcap applications assume <STRONG>me</STRONG> (terminfo
-       <STRONG>sgr0</STRONG>) does not reset the alternate character set.  This  implementation
-       checks  for,  and  modifies  the data shown to the termcap interface to
-       accommodate termcap's limitation in this respect.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
@@ -349,6 +317,39 @@ <H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        termcap library interfaces.
 
 
+</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
+       If you call <STRONG>tgetstr</STRONG> to fetch  <STRONG>ca</STRONG>  or  any  other  parameterized  string
+       capability,  be aware that it is returned in <EM>terminfo</EM> notation, not the
+       older and not-quite-compatible <EM>termcap</EM> notation.  This does  not  cause
+       problems  if  all  you  do  with  it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both
+       expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.  (The  <STRONG>tgoto</STRONG>  function,
+       if  configured  to  support  <EM>termcap,</EM>  checks  if  the string is indeed
+       <EM>terminfo</EM>-style by looking for "<STRONG>%p</STRONG>" parameters or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"  delays,  and
+       invokes  a  <EM>termcap</EM>-style  parser  if  the  string  appears  not to use
+       <EM>terminfo</EM> syntax.)
+
+       Because <EM>terminfo</EM>'s syntax for padding in  string  capabilities  differs
+       from <EM>termcap</EM>'s, users can be surprised.
+
+       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG>  in  a <EM>terminfo</EM> system transmits "50" rather than busy-
+           waiting for 50 milliseconds.
+
+       <STRONG>o</STRONG>   However, if <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it  may  also
+           have been configured to support BSD-style padding.
+
+           In  that  case,  <STRONG>tputs</STRONG>  inspects  strings passed to it, looking for
+           digits at the beginning of the string.
+
+           <STRONG>tputs("50")</STRONG> in a <EM>termcap</EM> system may busy-wait for  50  milliseconds
+           rather than transmitting "50".
+
+       <EM>termcap</EM>   has   nothing   analogous  to  <EM>terminfo</EM>'s  <STRONG>sgr</STRONG>  string.   One
+       consequence is that <EM>termcap</EM> applications assume that <STRONG>me</STRONG> (equivalent  to
+       <EM>terminfo</EM>'s <STRONG>sgr0</STRONG> capability) does not reset the alternate character set.
+       <EM>ncurses</EM> checks for, and modifies the  data  shared  with,  the  <EM>termcap</EM>
+       interface to accommodate the latter's limitation in this respect.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -356,7 +357,7 @@ <H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -372,7 +373,6 @@ <H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Standards">Standards</a></li>
@@ -380,6 +380,7 @@ <H1 class="no-header">curs_termcap 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-Other-Compatibility">Other Compatibility</a></li>
 </ul>
 </li>
+<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index d5e8edb19..3e3f873ed 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.112 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.114 2023/10/14 22:35:16 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -287,9 +287,13 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       The  <STRONG>tputs</STRONG>  routine  applies padding information (i.e., by interpreting
-       marker embedded  in  the  terminfo  capability  such  as  "$&lt;5&gt;"  as  5
-       milliseconds) to the string <EM>str</EM> and outputs it:
+       String  capabilities  can  contain  padding  information,  a time delay
+       (accommodating performance limitations of hardware terminals) expressed
+       as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM>
+       exceeds 30,000 (thirty seconds), it is capped at that value.
+
+       The <STRONG>tputs</STRONG> routine interprets time-delay information in the  string  <EM>str</EM>
+       and outputs it, executing the delays:
 
        <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a terminfo string variable or the return
            value from <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
@@ -303,6 +307,10 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <EM>putc</EM> is a <STRONG>putchar</STRONG>-like routine to which the characters are  passed,
            one at a time.
 
+           If  <STRONG>tputs</STRONG>  processes  a  time-delay,  it  uses the <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
+           function, routing any resulting  padding  characters  through  this
+           function.
+
        The  <STRONG>putp</STRONG>  routine  calls  <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG>  <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG>
        always goes to <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
@@ -469,7 +477,6 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
        <STRONG>fixterm</STRONG>     restore tty to "in curses" state
-
        <STRONG>gettmode</STRONG>    establish current tty modes
        <STRONG>mvcur</STRONG>       low level cursor motion
        <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
@@ -692,7 +699,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 650e6513c..6d04cda35 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.86 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_util.3x,v 1.88 2023/10/14 22:26:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -228,19 +228,28 @@ <H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-delay_output">delay_output</a></H3><PRE>
        The <STRONG>delay_output</STRONG> routine inserts an <EM>ms</EM>  millisecond  pause  in  output.
-       This  routine should not be used extensively because padding characters
-       are used  rather  than  a  CPU  pause.   If  no  padding  character  is
-       specified, this uses <STRONG>napms</STRONG> to perform the delay.
+       Employ  this  function  judiciously  when terminal output uses padding,
+       because <EM>ncurses</EM>  transmits  null  characters  (consuming  CPU  and  I/O
+       resources)  instead  of  sleeping  and  requesting  resumption from the
+       operating system.  Padding is used unless:
+
+       <STRONG>o</STRONG>   the terminal description has <STRONG>npc</STRONG> (<STRONG>no_pad_char</STRONG>) capability, or
+
+       <STRONG>o</STRONG>   the environment variable <STRONG>NCURSES_NO_PADDING</STRONG> is set.
+
+       If padding is not in use, <EM>ncurses</EM> uses <STRONG>napms</STRONG> to perform the delay.   If
+       the  value  of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped at that
+       value.
 
 
 </PRE><H3><a name="h3-flushinp">flushinp</a></H3><PRE>
-       The  <STRONG>flushinp</STRONG>  routine throws away any typeahead that has been typed by
+       The <STRONG>flushinp</STRONG> routine throws away any typeahead that has been  typed  by
        the user and has not yet been read by the program.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except for <STRONG>flushinp</STRONG>, routines that return an integer  return  <STRONG>ERR</STRONG>  upon
-       failure  and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")
+       Except  for  <STRONG>flushinp</STRONG>,  routines that return an integer return <STRONG>ERR</STRONG> upon
+       failure and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than  <STRONG>ERR</STRONG>")
        upon successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
@@ -251,18 +260,31 @@ <H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                returns an error if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns an error if  the  associated  <STRONG>fwrite</STRONG>  calls  return  an
+               returns  an  error  if  the  associated  <STRONG>fwrite</STRONG> calls return an
                error.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
-       vaguest terms.  The description here is adapted  from  the  XSI  Curses
+       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
+       vaguest  terms.   The  description  here is adapted from the XSI Curses
        standard (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
+</PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
+       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
+       implementations.
+
+       <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
+
+       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
+           but does not take  timing  into  account  when  using  the  padding
+           character.
+
+       Neither limits the delay.
+
+
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
        The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
        capabilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option
@@ -369,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -391,6 +413,7 @@ <H1 class="no-header">curs_util 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-filter">filter</a></li>
+<li><a href="#h3-delay_output-padding">delay_output padding</a></li>
 <li><a href="#h3-keyname">keyname</a></li>
 <li><a href="#h3-nofilter_use_tioctl">nofilter/use_tioctl</a></li>
 <li><a href="#h3-putwin_getwin-file-format">putwin/getwin file-format</a></li>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index fb67ddba8..b0569be0e 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_window.3x,v 1.41 2023/10/14 19:27:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -114,19 +114,20 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        Calling  <STRONG>subwin</STRONG>  creates and returns a pointer to a new window with the
        given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.  The  window  is  at
        position (<EM>begin</EM>_<EM>y</EM>, <EM>begin</EM>_<EM>x</EM>) on the screen.  The subwindow shares memory
-       with the window <EM>orig</EM>, so that changes made to one  window  will  affect
-       both  windows.   When  using  this  routine,  it  is  necessary to call
-       <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>wrefresh</STRONG> on the subwindow.
+       with the window <EM>orig</EM>, its <EM>ancestor</EM>, so that changes made to one  window
+       will  affect both windows.  When using this routine, it is necessary to
+       call <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on  <EM>orig</EM>  before  calling  <STRONG>wrefresh</STRONG>  on  the
+       subwindow.
 
 
 </PRE><H3><a name="h3-derwin">derwin</a></H3><PRE>
-       Calling <STRONG>derwin</STRONG> is the same as calling <STRONG>subwin,</STRONG> except that  <EM>begin</EM>_<EM>y</EM>  and
-       <EM>begin</EM>_<EM>x</EM>  are  relative to the origin of the window <EM>orig</EM> rather than the
-       screen.  There is no difference between the subwindows and the  derived
+       Calling  <STRONG>derwin</STRONG>  is the same as calling <STRONG>subwin,</STRONG> except that <EM>begin</EM>_<EM>y</EM> and
+       <EM>begin</EM>_<EM>x</EM> are relative to the origin of the window <EM>orig</EM> rather  than  the
+       screen.   There is no difference between the subwindows and the derived
        windows.
 
-       Calling  <STRONG>mvderwin</STRONG>  moves  a  derived  window  (or subwindow) inside its
-       parent window.  The screen-relative parameters of the  window  are  not
+       Calling <STRONG>mvderwin</STRONG> moves a  derived  window  (or  subwindow)  inside  its
+       parent  window.   The  screen-relative parameters of the window are not
        changed.  This routine is used to display different parts of the parent
        window at the same physical position on the screen.
 
@@ -136,27 +137,27 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-wsyncup">wsyncup</a></H3><PRE>
-       Calling <STRONG>wsyncup</STRONG> touches all locations in  ancestors  of  <EM>win</EM>  that  are
-       changed  in  <EM>win</EM>.   If  <STRONG>syncok</STRONG> is called with second argument <STRONG>TRUE</STRONG> then
-       <STRONG>wsyncup</STRONG> is called automatically whenever  there  is  a  change  in  the
+       Calling  <STRONG>wsyncup</STRONG>  touches  all  locations  in ancestors of <EM>win</EM> that are
+       changed in <EM>win</EM>.  If <STRONG>syncok</STRONG> is called with  second  argument  <STRONG>TRUE</STRONG>  then
+       <STRONG>wsyncup</STRONG>  is  called  automatically  whenever  there  is a change in the
        window.
 
 
 </PRE><H3><a name="h3-wsyncdown">wsyncdown</a></H3><PRE>
-       The  <STRONG>wsyncdown</STRONG>  routine  touches  each  location  in  <EM>win</EM> that has been
-       touched in any of its ancestor windows.   This  routine  is  called  by
+       The <STRONG>wsyncdown</STRONG> routine touches  each  location  in  <EM>win</EM>  that  has  been
+       touched  in  any  of  its  ancestor windows.  This routine is called by
        <STRONG>wrefresh</STRONG>, so it should almost never be necessary to call it manually.
 
 
 </PRE><H3><a name="h3-wcursyncup">wcursyncup</a></H3><PRE>
-       The  routine  <STRONG>wcursyncup</STRONG> updates the current cursor position of all the
-       ancestors of the window to reflect the current cursor position  of  the
+       The routine <STRONG>wcursyncup</STRONG> updates the current cursor position of  all  the
+       ancestors  of  the window to reflect the current cursor position of the
        window.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Routines that return an integer return the integer <STRONG>ERR</STRONG> upon failure and
-       <STRONG>OK</STRONG> (SVr4 only  specifies  "an  integer  value  other  than  <STRONG>ERR</STRONG>")  upon
+       <STRONG>OK</STRONG>  (SVr4  only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon
        successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
@@ -164,19 +165,19 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        X/Open defines no error conditions.  In this implementation
 
        <STRONG>delwin</STRONG>
-            returns  an  error if the window pointer is null, or if the window
+            returns an error if the window pointer is null, or if  the  window
             is the parent of another window.
 
        <STRONG>derwin</STRONG>
-            returns an error if the parent window pointer is null, or  if  any
-            of  its  ordinates  or dimensions is negative, or if the resulting
+            returns  an  error if the parent window pointer is null, or if any
+            of its ordinates or dimensions is negative, or  if  the  resulting
             window does not fit inside the parent window.
 
        <STRONG>dupwin</STRONG>
             returns an error if the window pointer is null.
 
-            This implementation also maintains a list of windows,  and  checks
-            that  the  pointer  passed  to  <STRONG>delwin</STRONG>  is  one  that  it created,
+            This  implementation  also maintains a list of windows, and checks
+            that the  pointer  passed  to  <STRONG>delwin</STRONG>  is  one  that  it  created,
             returning an error if it was not..
 
        <STRONG>mvderwin</STRONG>
@@ -184,48 +185,35 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             the window would be placed off-screen.
 
        <STRONG>mvwin</STRONG>
-            returns  an  error if the window pointer is null, or if the window
-            is really a pad, or if some part of the  window  would  be  placed
+            returns an error if the window pointer is null, or if  the  window
+            is  really  a  pad,  or if some part of the window would be placed
             off-screen.
 
        <STRONG>newwin</STRONG>
-            will  fail if either of its beginning ordinates is negative, or if
+            will fail if either of its beginning ordinates is negative, or  if
             either the number of lines or columns is negative.
 
        <STRONG>syncok</STRONG>
             returns an error if the window pointer is null.
 
        <STRONG>subwin</STRONG>
-            returns an error if the parent window pointer is null, or  if  any
-            of  its  ordinates  or dimensions is negative, or if the resulting
+            returns  an  error if the parent window pointer is null, or if any
+            of its ordinates or dimensions is negative, or  if  the  resulting
             window does not fit inside the parent window.
 
-       The functions which return a window pointer may also fail if  there  is
-       insufficient  memory  for  its data structures.  Any of these functions
+       The  functions  which return a window pointer may also fail if there is
+       insufficient memory for its data structures.  Any  of  these  functions
        will fail if the screen has not been initialized, i.e., with <STRONG>initscr</STRONG> or
        <STRONG>newterm</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If  many small changes are made to the window, the <STRONG>wsyncup</STRONG> option could
+       If many small changes are made to the window, the <STRONG>wsyncup</STRONG> option  could
        degrade performance.
 
        Note that <STRONG>syncok</STRONG> may be a macro.
 
 
-</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       The subwindow functions (<STRONG>subwin</STRONG>, <STRONG>derwin</STRONG>, <STRONG>mvderwin</STRONG>, <STRONG>wsyncup</STRONG>,  <STRONG>wsyncdown</STRONG>,
-       <STRONG>wcursyncup</STRONG>,  <STRONG>syncok</STRONG>)  are flaky, incompletely implemented, and not well
-       tested.
-
-       The System V curses documentation is very unclear  about  what  <STRONG>wsyncup</STRONG>
-       and  <STRONG>wsyncdown</STRONG>  actually  do.   It  seems  to  imply that they are only
-       supposed to touch exactly those lines that  are  affected  by  ancestor
-       changes.    The   language   here,  and  the  behavior  of  the  <STRONG>curses</STRONG>
-       implementation, is patterned on the XPG4 curses standard.   The  weaker
-       XPG4 spec may result in slower updates.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The XSI Curses standard, Issue 4 describes these functions.
 
@@ -248,13 +236,25 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            PDCurses follows the scheme used in Solaris X/Open curses.
 
 
+</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
+       The subwindow functions <STRONG>subwin</STRONG>, <STRONG>derwin</STRONG>, <STRONG>mvderwin</STRONG>,  <STRONG>wsyncup</STRONG>,  <STRONG>wsyncdown</STRONG>,
+       <STRONG>wcursyncup</STRONG>,  and  <STRONG>syncok</STRONG>  are  flaky, incompletely implemented, and not
+       well tested.
+
+       System V's <EM>curses</EM> documentation  is  unclear  about  what  <STRONG>wsyncup</STRONG>  and
+       <STRONG>wsyncdown</STRONG>  actually  do.   It  seems to imply that they are supposed to
+       touch only those lines that are  affected  by  changes  to  a  window's
+       ancestors.  The language here, and behavior of <EM>ncurses</EM>, is patterned on
+       the X/Open Curses standard; this approach may result in slower updates.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -275,8 +275,8 @@ <H1 class="no-header">curs_window 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
-<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 601e12d10..30dd3e882 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.96 2023/10/07 21:19:07 tom Exp @
+  * @Id: infocmp.1m,v 1.97 2023/10/14 19:26:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -463,7 +463,8 @@ <H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo Compiled terminal description database.
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -512,15 +513,15 @@ <H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
        see only the 4.4BSD set, use <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
 
 
-</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       The <STRONG>-F</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> should be a <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG> mode.
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
 
+</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
+       The <STRONG>-F</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> should be a <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG> mode.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
@@ -529,7 +530,7 @@ <H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-10-14                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -548,8 +549,8 @@ <H1 class="no-header">infocmp 1m 2023-10-07 ncurses 6.4 User commands</H1>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
-<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 728ce6062..3c881403f 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.34 2023/10/07 21:19:07 tom Exp @
+  * @Id: infotocap.1m,v 1.35 2023/10/14 19:25:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-10-14                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 903989960..f732e3c66 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.178 2023/10/07 22:17:08 tom Exp @
+  * @Id: ncurses.3x,v 1.179 2023/10/14 19:29:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231007).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231014).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -119,68 +119,69 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        Before a <STRONG>curses</STRONG> program is run, the tab stops of the terminal should be
        set  and  its initialization strings, if defined, must be output.  This
        can be done  by  executing  the  <STRONG>tput</STRONG>  <STRONG>init</STRONG>  command  after  the  shell
-       environment  variable  <STRONG>TERM</STRONG>  has  been  exported.   <STRONG>tset(1)</STRONG>  is usually
-       responsible for doing this.  [See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for further details.]
+       environment  variable  <STRONG>TERM</STRONG>  has been exported.  (The BSD-style <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+       utility  also  performs  this  function.)   See  subsection  "Tabs  and
+       Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Datatypes">Datatypes</a></H3><PRE>
-       The <STRONG>ncurses</STRONG> library permits manipulation  of  data  structures,  called
-       <EM>windows</EM>,   which  can  be  thought  of  as  two-dimensional  arrays  of
-       characters representing all or part of a CRT screen.  A default  window
-       called  <STRONG>stdscr</STRONG>,  which is the size of the terminal screen, is supplied.
+       The  <STRONG>ncurses</STRONG>  library  permits  manipulation of data structures, called
+       <EM>windows</EM>,  which  can  be  thought  of  as  two-dimensional  arrays   of
+       characters  representing all or part of a CRT screen.  A default window
+       called <STRONG>stdscr</STRONG>, which is the size of the terminal screen,  is  supplied.
        Others may be created with <STRONG>newwin</STRONG>.
 
-       Note that <STRONG>curses</STRONG> does not handle overlapping windows,  that's  done  by
-       the  <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>  library.   This means that you can either use <STRONG>stdscr</STRONG> or
-       divide the screen into tiled windows  and  not  using  <STRONG>stdscr</STRONG>  at  all.
+       Note  that  <STRONG>curses</STRONG>  does not handle overlapping windows, that's done by
+       the <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG> library.  This means that you can either  use  <STRONG>stdscr</STRONG>  or
+       divide  the  screen  into  tiled  windows  and not using <STRONG>stdscr</STRONG> at all.
        Mixing the two will result in unpredictable, and undesired, effects.
 
-       Windows  are referred to by variables declared as <STRONG>WINDOW</STRONG> <STRONG>*</STRONG>.  These data
-       structures are manipulated with routines described here  and  elsewhere
-       in  the <STRONG>ncurses</STRONG> manual pages.  Among those, the most basic routines are
-       <STRONG>move</STRONG> and <STRONG>addch</STRONG>.  More general versions of these routines  are  included
-       with  names  beginning  with  <STRONG>w</STRONG>, allowing the user to specify a window.
+       Windows are referred to by variables declared as <STRONG>WINDOW</STRONG> <STRONG>*</STRONG>.  These  data
+       structures  are  manipulated with routines described here and elsewhere
+       in the <STRONG>ncurses</STRONG> manual pages.  Among those, the most basic routines  are
+       <STRONG>move</STRONG>  and  <STRONG>addch</STRONG>.  More general versions of these routines are included
+       with names beginning with <STRONG>w</STRONG>, allowing the user  to  specify  a  window.
        The routines not beginning with <STRONG>w</STRONG> affect <STRONG>stdscr</STRONG>.
 
-       After using routines to manipulate a  window,  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called,
-       telling  <STRONG>curses</STRONG>  to  make  the user's CRT screen look like <STRONG>stdscr</STRONG>.  The
-       characters in a window are actually  of  type  <STRONG>chtype</STRONG>,  (character  and
-       attribute  data) so that other information about the character may also
+       After  using  routines  to  manipulate a window, <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> is called,
+       telling <STRONG>curses</STRONG> to make the user's CRT screen  look  like  <STRONG>stdscr</STRONG>.   The
+       characters  in  a  window  are  actually of type <STRONG>chtype</STRONG>, (character and
+       attribute data) so that other information about the character may  also
        be stored with each character.
 
        Special windows called <EM>pads</EM> may also be manipulated.  These are windows
-       which  are not constrained to the size of the screen and whose contents
-       need  not  be  completely  displayed.   See   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>   for   more
+       which are not constrained to the size of the screen and whose  contents
+       need   not   be   completely  displayed.   See  <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>  for  more
        information.
 
-       In  addition  to drawing characters on the screen, video attributes and
-       colors may be supported, causing the characters  to  show  up  in  such
-       modes  as  underlined,  in reverse video, or in color on terminals that
-       support such display enhancements.   Line  drawing  characters  may  be
-       specified  to  be  output.   On input, <STRONG>curses</STRONG> is also able to translate
-       arrow and function keys that  transmit  escape  sequences  into  single
-       values.   The  video  attributes,  line  drawing  characters, and input
-       values use names, defined in <STRONG>&lt;curses.h&gt;</STRONG>, such as <STRONG>A_REVERSE</STRONG>,  <STRONG>ACS_HLINE</STRONG>,
+       In addition to drawing characters on the screen, video  attributes  and
+       colors  may  be  supported,  causing  the characters to show up in such
+       modes as underlined, in reverse video, or in color  on  terminals  that
+       support  such  display  enhancements.   Line  drawing characters may be
+       specified to be output.  On input, <STRONG>curses</STRONG> is  also  able  to  translate
+       arrow  and  function  keys  that  transmit escape sequences into single
+       values.  The video  attributes,  line  drawing  characters,  and  input
+       values  use names, defined in <STRONG>&lt;curses.h&gt;</STRONG>, such as <STRONG>A_REVERSE</STRONG>, <STRONG>ACS_HLINE</STRONG>,
        and <STRONG>KEY_LEFT</STRONG>.
 
 
 </PRE><H3><a name="h3-Environment-variables">Environment variables</a></H3><PRE>
-       If  the  environment  variables  <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG> are set, or if the
-       program  is  executing  in  a  window  environment,  line  and   column
-       information  in  the  environment  will  override  information  read by
-       <EM>terminfo</EM>.  This would affect a program running in an  AT&amp;T  630  layer,
-       for   example,   where   the  size  of  a  screen  is  changeable  (see
+       If the environment variables <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  are  set,  or  if  the
+       program   is  executing  in  a  window  environment,  line  and  column
+       information in  the  environment  will  override  information  read  by
+       <EM>terminfo</EM>.   This  would  affect a program running in an AT&amp;T 630 layer,
+       for  example,  where  the  size  of  a  screen   is   changeable   (see
        <STRONG>ENVIRONMENT</STRONG>).
 
-       If the environment variable <STRONG>TERMINFO</STRONG>  is  defined,  any  program  using
-       <STRONG>curses</STRONG>  checks  for  a local terminal definition before checking in the
-       standard place.  For example, if <STRONG>TERM</STRONG>  is  set  to  <STRONG>att4424</STRONG>,  then  the
+       If  the  environment  variable  <STRONG>TERMINFO</STRONG>  is defined, any program using
+       <STRONG>curses</STRONG> checks for a local terminal definition before  checking  in  the
+       standard  place.   For  example,  if  <STRONG>TERM</STRONG>  is set to <STRONG>att4424</STRONG>, then the
        compiled terminal definition is found in
 
            <STRONG>/usr/share/terminfo/a/att4424</STRONG>.
 
-       (The  <STRONG>a</STRONG> is copied from the first letter of <STRONG>att4424</STRONG> to avoid creation of
-       huge directories.)  However,  if  <STRONG>TERMINFO</STRONG>  is  set  to  <STRONG>$HOME/myterms</STRONG>,
+       (The <STRONG>a</STRONG> is copied from the first letter of <STRONG>att4424</STRONG> to avoid creation  of
+       huge  directories.)   However,  if  <STRONG>TERMINFO</STRONG>  is  set to <STRONG>$HOME/myterms</STRONG>,
        <STRONG>curses</STRONG> first checks
 
            <STRONG>$HOME/myterms/a/att4424</STRONG>,
@@ -189,98 +190,98 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
            <STRONG>/usr/share/terminfo/a/att4424</STRONG>.
 
-       This  is  useful  for developing experimental definitions or when write
+       This is useful for developing experimental definitions  or  when  write
        permission in <STRONG>/usr/share/terminfo</STRONG> is not available.
 
        The integer variables <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG> are defined in <STRONG>&lt;curses.h&gt;</STRONG> and will
-       be  filled  in  by  <STRONG>initscr</STRONG> with the size of the screen.  The constants
+       be filled in by <STRONG>initscr</STRONG> with the size of  the  screen.   The  constants
        <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG> have the values <STRONG>1</STRONG> and <STRONG>0</STRONG>, respectively.
 
-       The <STRONG>curses</STRONG> routines also define the <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> variable <STRONG>curscr</STRONG>  which  is
-       used  for  certain  low-level  operations like clearing and redrawing a
-       screen containing garbage.  The <STRONG>curscr</STRONG>  can  be  used  in  only  a  few
+       The  <STRONG>curses</STRONG>  routines also define the <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> variable <STRONG>curscr</STRONG> which is
+       used for certain low-level operations like  clearing  and  redrawing  a
+       screen  containing  garbage.   The  <STRONG>curscr</STRONG>  can  be  used in only a few
        routines.
 
 
 </PRE><H3><a name="h3-Routine-and-Argument-Names">Routine and Argument Names</a></H3><PRE>
-       Many  <STRONG>curses</STRONG> routines have two or more versions.  The routines prefixed
+       Many <STRONG>curses</STRONG> routines have two or more versions.  The routines  prefixed
        with <EM>w</EM> require a window argument.  The routines prefixed with <EM>p</EM> require
        a pad argument.  Those without a prefix generally use <STRONG>stdscr</STRONG>.
 
-       The  routines  prefixed with <STRONG>mv</STRONG> require a <EM>y</EM> and <EM>x</EM> coordinate to move to
+       The routines prefixed with <STRONG>mv</STRONG> require a <EM>y</EM> and <EM>x</EM> coordinate to  move  to
        before performing the appropriate action.  The <STRONG>mv</STRONG> routines imply a call
-       to  <STRONG>move</STRONG> before the call to the other routine.  The coordinate <EM>y</EM> always
-       refers to the row (of the window), and <EM>x</EM> always refers to  the  column.
+       to <STRONG>move</STRONG> before the call to the other routine.  The coordinate <EM>y</EM>  always
+       refers  to  the row (of the window), and <EM>x</EM> always refers to the column.
        The upper left-hand corner is always (0,0), not (1,1).
 
-       The  routines prefixed with <STRONG>mvw</STRONG> take both a window argument and <EM>x</EM> and <EM>y</EM>
-       coordinates.  The  window  argument  is  always  specified  before  the
+       The routines prefixed with <STRONG>mvw</STRONG> take both a window argument and <EM>x</EM> and  <EM>y</EM>
+       coordinates.   The  window  argument  is  always  specified  before the
        coordinates.
 
-       In  each case, <EM>win</EM> is the window affected, and <EM>pad</EM> is the pad affected;
+       In each case, <EM>win</EM> is the window affected, and <EM>pad</EM> is the pad  affected;
        <EM>win</EM> and <EM>pad</EM> are always pointers to type <STRONG>WINDOW</STRONG>.
 
-       Option setting routines require a Boolean flag <EM>bf</EM> with the  value  <STRONG>TRUE</STRONG>
-       or  <STRONG>FALSE</STRONG>;  <EM>bf</EM>  is always of type <STRONG>bool</STRONG>.  Most of the data types used in
-       the library routines, such as <STRONG>WINDOW</STRONG>,  <STRONG>SCREEN</STRONG>,  <STRONG>bool</STRONG>,  and  <STRONG>chtype</STRONG>  are
-       defined  in  <STRONG>&lt;curses.h&gt;</STRONG>.   Types used for the terminfo routines such as
+       Option  setting  routines require a Boolean flag <EM>bf</EM> with the value <STRONG>TRUE</STRONG>
+       or <STRONG>FALSE</STRONG>; <EM>bf</EM> is always of type <STRONG>bool</STRONG>.  Most of the data  types  used  in
+       the  library  routines,  such  as  <STRONG>WINDOW</STRONG>, <STRONG>SCREEN</STRONG>, <STRONG>bool</STRONG>, and <STRONG>chtype</STRONG> are
+       defined in <STRONG>&lt;curses.h&gt;</STRONG>.  Types used for the terminfo  routines  such  as
        <STRONG>TERMINAL</STRONG> are defined in <STRONG>&lt;term.h&gt;</STRONG>.
 
-       This  manual  page  describes  functions  which  may  appear   in   any
-       configuration  of  the library.  There are two common configurations of
+       This   manual   page  describes  functions  which  may  appear  in  any
+       configuration of the library.  There are two common  configurations  of
        the library:
 
           <EM>ncurses</EM>
-               the "normal" library,  which  handles  8-bit  characters.   The
-               normal   (8-bit)   library   stores  characters  combined  with
+               the  "normal"  library,  which  handles  8-bit characters.  The
+               normal  (8-bit)  library  stores   characters   combined   with
                attributes in <STRONG>chtype</STRONG> data.
 
-               Attributes alone (no corresponding character) may be stored  in
+               Attributes  alone (no corresponding character) may be stored in
                <STRONG>chtype</STRONG> or the equivalent <STRONG>attr_t</STRONG> data.  In either case, the data
                is stored in something like an integer.
 
                Each cell (row and column) in a <STRONG>WINDOW</STRONG> is stored as a <STRONG>chtype</STRONG>.
 
           <EM>ncursesw</EM>
-               the  so-called  "wide"   library,   which   handles   multibyte
-               characters  (see the section on <STRONG>ALTERNATE</STRONG> <STRONG>CONFIGURATIONS</STRONG>).  The
-               "wide" library includes all of  the  calls  from  the  "normal"
-               library.   It  adds about one third more calls using data types
+               the   so-called   "wide"   library,   which  handles  multibyte
+               characters (see the section on <STRONG>ALTERNATE</STRONG> <STRONG>CONFIGURATIONS</STRONG>).   The
+               "wide"  library  includes  all  of  the calls from the "normal"
+               library.  It adds about one third more calls using  data  types
                which store multibyte characters:
 
                <STRONG>cchar_t</STRONG>
                     corresponds to <STRONG>chtype</STRONG>.  However it is a structure, because
-                    more  data  is  stored  than can fit into an integer.  The
-                    characters are large enough  to  require  a  full  integer
+                    more data is stored than can fit  into  an  integer.   The
+                    characters  are  large  enough  to  require a full integer
                     value - and there may be more than one character per cell.
-                    The video attributes and  color  are  stored  in  separate
+                    The  video  attributes  and  color  are stored in separate
                     fields of the structure.
 
-                    Each  cell  (row  and  column)  in a <STRONG>WINDOW</STRONG> is stored as a
+                    Each cell (row and column) in a  <STRONG>WINDOW</STRONG>  is  stored  as  a
                     <STRONG>cchar_t</STRONG>.
 
-                    The <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store  and
+                    The  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store and
                     retrieve the data from a <STRONG>cchar_t</STRONG> structure.
 
                <STRONG>wchar_t</STRONG>
-                    stores  a  "wide"  character.  Like <STRONG>chtype</STRONG>, this may be an
+                    stores a "wide" character.  Like <STRONG>chtype</STRONG>, this  may  be  an
                     integer.
 
                <STRONG>wint_t</STRONG>
-                    stores a <STRONG>wchar_t</STRONG> or <STRONG>WEOF</STRONG> - not the same, though  both  may
+                    stores  a  <STRONG>wchar_t</STRONG> or <STRONG>WEOF</STRONG> - not the same, though both may
                     have the same size.
 
-               The  "wide"  library provides new functions which are analogous
-               to functions in  the  "normal"  library.   There  is  a  naming
-               convention  which  relates  many of the normal/wide variants: a
-               "_w" is inserted into the name.  For  example,  <STRONG>waddch</STRONG>  becomes
+               The "wide" library provides new functions which  are  analogous
+               to  functions  in  the  "normal"  library.   There  is a naming
+               convention which relates many of the  normal/wide  variants:  a
+               "_w"  is  inserted  into the name.  For example, <STRONG>waddch</STRONG> becomes
                <STRONG>wadd_wch</STRONG>.
 
 
 </PRE><H3><a name="h3-Routine-Name-Index">Routine Name Index</a></H3><PRE>
-       The  following table lists the <STRONG>curses</STRONG> routines provided in the "normal"
-       and "wide" libraries and the names of the manual pages  on  which  they
-       are  described.   Routines  flagged  with "*" are ncurses-specific, not
+       The following table lists the <STRONG>curses</STRONG> routines provided in the  "normal"
+       and  "wide"  libraries  and the names of the manual pages on which they
+       are described.  Routines flagged with  "*"  are  ncurses-specific,  not
        described by XPG4 or present in SVr4.
 
                     <STRONG>curses</STRONG> Routine Name      Manual Page Name
@@ -312,8 +313,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     bkgdset                  <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     bkgrnd                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     bkgrndset                <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
-                    border                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
+                    border                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     border_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     box                      <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     box_set                  <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
@@ -378,8 +379,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     getn_wstr                <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     getnstr                  <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     getparx                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
-                    getpary                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
 
+                    getpary                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
                     getparyx                 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
                     getstr                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     getsyx                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
@@ -444,8 +445,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     key_name                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     keybound                 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>*
                     keyname                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
-                    keyok                    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>*
 
+                    keyok                    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>*
                     keypad                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     killchar                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     killwchar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
@@ -510,8 +511,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     mvwaddstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvwaddwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvwchgat                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-                    mvwdelch                 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
+                    mvwdelch                 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvwget_wch               <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvwget_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvwgetch                 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
@@ -576,8 +577,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     resizeterm               <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>*
                     restartterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     ripoffline               <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
-                    savetty                  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
+                    savetty                  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     scanw                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     scr_dump                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
                     scr_init                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
@@ -642,8 +643,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     ungetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     ungetmouse               <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
                     untouchwin               <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
-                    use_default_colors       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>*
 
+                    use_default_colors       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>*
                     use_env                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     use_extended_names       <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
@@ -708,8 +709,8 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     win_wch                  <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     win_wchnstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     win_wchstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
-                    winch                    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
+                    winch                    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     winchnstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winchstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winnstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
@@ -744,7 +745,7 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       Depending on the configuration, additional sets  of  functions  may  be
+       Depending  on  the  configuration,  additional sets of functions may be
        available:
 
           <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG> - curses memory-leak checking
@@ -757,37 +758,37 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that return an integer return <STRONG>ERR</STRONG> upon failure and an integer
+       Routines that return an integer return <STRONG>ERR</STRONG> upon failure and an  integer
        value other than <STRONG>ERR</STRONG> upon successful completion, unless otherwise noted
        in the routine descriptions.
 
        As  a  general  rule,  routines  check  for  null  pointers  passed  as
        parameters, and handle this as an error.
 
-       All macros return  the  value  of  the  <STRONG>w</STRONG>  version,  except  <STRONG>setscrreg</STRONG>,
-       <STRONG>wsetscrreg</STRONG>,  <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG>.   The  return  values of
-       <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG>  are  undefined
-       (i.e.,  these  should  not be used as the right-hand side of assignment
+       All  macros  return  the  value  of  the  <STRONG>w</STRONG>  version, except <STRONG>setscrreg</STRONG>,
+       <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG>.   The  return  values  of
+       <STRONG>setscrreg</STRONG>,  <STRONG>wsetscrreg</STRONG>,  <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG> are undefined
+       (i.e., these should not be used as the right-hand  side  of  assignment
        statements).
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer  is  null.   Most  "mv"-prefixed  functions  (except
-       variadic  functions  such  as <STRONG>mvprintw</STRONG>) are provided both as macros and
+       the  window  pointer  is  null.   Most  "mv"-prefixed functions (except
+       variadic functions such as <STRONG>mvprintw</STRONG>) are provided both  as  macros  and
        functions.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The following  environment  symbols  are  useful  for  customizing  the
-       runtime  behavior of the <STRONG>ncurses</STRONG> library.  The most important ones have
+       The  following  environment  symbols  are  useful  for  customizing the
+       runtime behavior of the <STRONG>ncurses</STRONG> library.  The most important ones  have
        been already discussed in detail.
 
 
 </PRE><H3><a name="h3-CC-command-character">CC command-character</a></H3><PRE>
-       When set, change occurrences of the command_character (i.e., the  <STRONG>cmdch</STRONG>
-       capability)  of  the  loaded  terminfo  entries  to  the  value of this
+       When  set, change occurrences of the command_character (i.e., the <STRONG>cmdch</STRONG>
+       capability) of the  loaded  terminfo  entries  to  the  value  of  this
        variable.  Very few terminfo entries provide this feature.
 
        Because this name is also used in development environments to represent
@@ -797,33 +798,33 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-BAUDRATE">BAUDRATE</a></H3><PRE>
        The  debugging  library  checks  this  environment  variable  when  the
-       application  has  redirected  output to a file.  The variable's numeric
-       value is used for the baudrate.  If no value  is  found,  <STRONG>ncurses</STRONG>  uses
+       application has redirected output to a file.   The  variable's  numeric
+       value  is  used  for  the baudrate.  If no value is found, <STRONG>ncurses</STRONG> uses
        9600.  This allows testers to construct repeatable test-cases that take
        into account costs that depend on baudrate.
 
 
 </PRE><H3><a name="h3-COLUMNS">COLUMNS</a></H3><PRE>
        Specify the width of the screen in characters.  Applications running in
-       a  windowing  environment  usually  are able to obtain the width of the
-       window in which they are executing.  If neither the <STRONG>COLUMNS</STRONG>  value  nor
-       the  terminal's  screen  size is available, <STRONG>ncurses</STRONG> uses the size which
+       a windowing environment usually are able to obtain  the  width  of  the
+       window  in  which they are executing.  If neither the <STRONG>COLUMNS</STRONG> value nor
+       the terminal's screen size is available, <STRONG>ncurses</STRONG> uses  the  size  which
        may be specified in the terminfo database (i.e., the <STRONG>cols</STRONG> capability).
 
-       It is important that your  application  use  a  correct  size  for  the
-       screen.   This  is  not always possible because your application may be
-       running on a host which does not honor NAWS (Negotiations About  Window
+       It  is  important  that  your  application  use  a correct size for the
+       screen.  This is not always possible because your  application  may  be
+       running  on a host which does not honor NAWS (Negotiations About Window
        Size),  or  because  you  are  temporarily  running  as  another  user.
-       However, setting <STRONG>COLUMNS</STRONG> and/or <STRONG>LINES</STRONG> overrides the  library's  use  of
+       However,  setting  <STRONG>COLUMNS</STRONG>  and/or <STRONG>LINES</STRONG> overrides the library's use of
        the screen size obtained from the operating system.
 
-       Either  <STRONG>COLUMNS</STRONG>  or <STRONG>LINES</STRONG> symbols may be specified independently.  This
-       is  mainly  useful  to  circumvent  legacy  misfeatures   of   terminal
-       descriptions,  e.g.,  xterm  which commonly specifies a 65 line screen.
-       For best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a  terminal
+       Either <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> symbols may be specified  independently.   This
+       is   mainly   useful  to  circumvent  legacy  misfeatures  of  terminal
+       descriptions, e.g., xterm which commonly specifies a  65  line  screen.
+       For  best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a terminal
        description for terminals which are run as emulations.
 
-       Use  the  <STRONG>use_env</STRONG>  function  to disable all use of external environment
+       Use the <STRONG>use_env</STRONG> function to disable all  use  of  external  environment
        (but not including system calls) to determine the screen size.  Use the
        <STRONG>use_tioctl</STRONG> function to update <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> to match the screen size
        obtained from system calls or the terminal database.
@@ -831,31 +832,31 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
        Specifies the total time, in milliseconds, for which ncurses will await
-       a  character  sequence,  e.g., a function key.  The default value, 1000
-       milliseconds, is enough for most uses.  However, it is made a  variable
+       a character sequence, e.g., a function key.  The  default  value,  1000
+       milliseconds,  is enough for most uses.  However, it is made a variable
        to accommodate unusual applications.
 
-       The  most common instance where you may wish to change this value is to
-       work with slow hosts, e.g., running on a network.  If the  host  cannot
-       read  characters rapidly enough, it will have the same effect as if the
-       terminal did not send characters  rapidly  enough.   The  library  will
+       The most common instance where you may wish to change this value is  to
+       work  with  slow hosts, e.g., running on a network.  If the host cannot
+       read characters rapidly enough, it will have the same effect as if  the
+       terminal  did  not  send  characters  rapidly enough.  The library will
        still see a timeout.
 
-       Note  that  xterm  mouse  events  are built up from character sequences
-       received from the xterm.   If  your  application  makes  heavy  use  of
-       multiple-clicking,  you may wish to lengthen this default value because
-       the timeout applies to the composed multi-click event as  well  as  the
+       Note that xterm mouse events are  built  up  from  character  sequences
+       received  from  the  xterm.   If  your  application  makes heavy use of
+       multiple-clicking, you may wish to lengthen this default value  because
+       the  timeout  applies  to the composed multi-click event as well as the
        individual clicks.
 
        In addition to the environment variable, this implementation provides a
-       global variable with the same name.  Portable applications  should  not
-       rely  upon  the  presence  of  ESCDELAY in either form, but setting the
-       environment variable rather than the global variable  does  not  create
+       global  variable  with the same name.  Portable applications should not
+       rely upon the presence of ESCDELAY in  either  form,  but  setting  the
+       environment  variable  rather  than the global variable does not create
        problems when compiling an application.
 
 
 </PRE><H3><a name="h3-HOME">HOME</a></H3><PRE>
-       Tells  <STRONG>ncurses</STRONG> where your home directory is.  That is where it may read
+       Tells <STRONG>ncurses</STRONG> where your home directory is.  That is where it may  read
        and write auxiliary terminal descriptions:
 
            $HOME/.termcap
@@ -863,13 +864,13 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-LINES">LINES</a></H3><PRE>
-       Like COLUMNS, specify the height of  the  screen  in  characters.   See
+       Like  COLUMNS,  specify  the  height  of the screen in characters.  See
        COLUMNS for a detailed description.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123">MOUSE_BUTTONS_123</a></H3><PRE>
-       This  applies  only  to  the  OS/2 EMX port.  It specifies the order of
-       buttons on the mouse.  OS/2 numbers  a  3-button  mouse  inconsistently
+       This applies only to the OS/2 EMX port.   It  specifies  the  order  of
+       buttons  on  the  mouse.   OS/2 numbers a 3-button mouse inconsistently
        from other platforms:
 
            1 = left
@@ -877,37 +878,37 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            3 = middle.
 
        This variable lets you customize the mouse.  The variable must be three
-       numeric digits 1-3 in any order, e.g.,  123  or  321.   If  it  is  not
+       numeric  digits  1-3  in  any  order,  e.g.,  123 or 321.  If it is not
        specified, <STRONG>ncurses</STRONG> uses 132.
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS">NCURSES_ASSUMED_COLORS</a></H3><PRE>
-       Override  the compiled-in assumption that the terminal's default colors
-       are  white-on-black  (see  <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You   may   set   the
-       foreground  and  background color values with this environment variable
-       by proving a 2-element list: foreground,background.   For  example,  to
-       tell  ncurses  to  not  assume  anything  about the colors, set this to
-       "-1,-1".  To make it green-on-black, set it  to  "2,0".   Any  positive
+       Override the compiled-in assumption that the terminal's default  colors
+       are   white-on-black   (see   <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You  may  set  the
+       foreground and background color values with this  environment  variable
+       by  proving  a  2-element list: foreground,background.  For example, to
+       tell ncurses to not assume anything  about  the  colors,  set  this  to
+       "-1,-1".   To  make  it  green-on-black, set it to "2,0".  Any positive
        value from zero to the terminfo <STRONG>max_colors</STRONG> value is allowed.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2">NCURSES_CONSOLE2</a></H3><PRE>
        This applies only to the MinGW port of ncurses.
 
-       The  <STRONG>Console2</STRONG>  program's  handling  of  the  Microsoft Console API call
-       <STRONG>CreateConsoleScreenBuffer</STRONG> is defective.  Applications  which  use  this
+       The <STRONG>Console2</STRONG> program's handling  of  the  Microsoft  Console  API  call
+       <STRONG>CreateConsoleScreenBuffer</STRONG>  is  defective.   Applications which use this
        will hang.  However, it is possible to simulate the action of this call
-       by mapping coordinates, explicitly saving and  restoring  the  original
-       screen  contents.   Setting the environment variable <STRONG>NCGDB</STRONG> has the same
+       by  mapping  coordinates,  explicitly saving and restoring the original
+       screen contents.  Setting the environment variable <STRONG>NCGDB</STRONG> has  the  same
        effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS">NCURSES_GPM_TERMS</a></H3><PRE>
        This applies only to ncurses configured to use the GPM interface.
 
-       If present, the environment variable is a list of one or more  terminal
-       names  against which the <STRONG>TERM</STRONG> environment variable is matched.  Setting
-       it to an empty value disables the GPM  interface;  using  the  built-in
+       If  present, the environment variable is a list of one or more terminal
+       names against which the <STRONG>TERM</STRONG> environment variable is matched.   Setting
+       it  to  an  empty  value disables the GPM interface; using the built-in
        support for xterm, etc.
 
        If the environment variable is absent, ncurses will attempt to open GPM
@@ -915,39 +916,39 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS">NCURSES_NO_HARD_TABS</a></H3><PRE>
-       <STRONG>Ncurses</STRONG> may use tabs as part of the cursor movement  optimization.   In
-       some  cases,  your  terminal driver may not handle these properly.  Set
-       this environment variable to disable the feature.  You can also  adjust
+       <STRONG>Ncurses</STRONG>  may  use tabs as part of the cursor movement optimization.  In
+       some cases, your terminal driver may not handle  these  properly.   Set
+       this  environment variable to disable the feature.  You can also adjust
        your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE">NCURSES_NO_MAGIC_COOKIE</a></H3><PRE>
-       Some  terminals  use  a  magic-cookie  feature  which  requires special
-       handling to  make  highlighting  and  other  video  attributes  display
+       Some terminals  use  a  magic-cookie  feature  which  requires  special
+       handling  to  make  highlighting  and  other  video  attributes display
        properly.   You  can  suppress  the  highlighting  entirely  for  these
        terminals by setting this environment variable.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING">NCURSES_NO_PADDING</a></H3><PRE>
-       Most of the terminal descriptions in the terminfo database are  written
-       for  real  "hardware"  terminals.   Many  people use terminal emulators
+       Most  of the terminal descriptions in the terminfo database are written
+       for real "hardware" terminals.   Many  people  use  terminal  emulators
        which run in a windowing environment and use curses-based applications.
-       Terminal  emulators  can  duplicate  all  of the important aspects of a
-       hardware terminal, but they do not  have  the  same  limitations.   The
-       chief  limitation  of  a  hardware terminal from the standpoint of your
-       application is the management of  dataflow,  i.e.,  timing.   Unless  a
-       hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), it (or  your  application)  must  manage  dataflow,
-       preventing  overruns.   The cheapest solution (no hardware cost) is for
-       your program to do this by pausing after operations that  the  terminal
+       Terminal emulators can duplicate all of  the  important  aspects  of  a
+       hardware  terminal,  but  they  do  not have the same limitations.  The
+       chief limitation of a hardware terminal from  the  standpoint  of  your
+       application  is  the  management  of  dataflow, i.e., timing.  Unless a
+       hardware terminal is interfaced into  a  terminal  concentrator  (which
+       does  flow  control),  it  (or  your application) must manage dataflow,
+       preventing overruns.  The cheapest solution (no hardware cost)  is  for
+       your  program  to do this by pausing after operations that the terminal
        does slowly, such as clearing the display.
 
-       As  a  result,  many  terminal  descriptions (including the vt100) have
-       delay times embedded.  You may wish to use these descriptions, but  not
+       As a result, many terminal  descriptions  (including  the  vt100)  have
+       delay  times embedded.  You may wish to use these descriptions, but not
        want to pay the performance penalty.
 
-       Set  the  NCURSES_NO_PADDING  environment  variable  to disable all but
-       mandatory padding.  Mandatory padding is used  as  a  part  of  special
+       Set the NCURSES_NO_PADDING environment  variable  to  disable  all  but
+       mandatory  padding.   Mandatory  padding  is  used as a part of special
        control sequences such as <STRONG>flash</STRONG>.
 
 
@@ -958,44 +959,44 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   continued though 5.9 patch 20130126
 
-       <STRONG>ncurses</STRONG>  enabled  buffered output during terminal initialization.  This
-       was done (as in SVr4 curses)  for  performance  reasons.   For  testing
-       purposes,  both  of  <STRONG>ncurses</STRONG> and certain applications, this feature was
-       made optional.  Setting the NCURSES_NO_SETBUF variable disabled  output
-       buffering,  leaving  the output in the original (usually line buffered)
+       <STRONG>ncurses</STRONG> enabled buffered output during terminal  initialization.   This
+       was  done  (as  in  SVr4  curses) for performance reasons.  For testing
+       purposes, both of <STRONG>ncurses</STRONG> and certain applications,  this  feature  was
+       made  optional.  Setting the NCURSES_NO_SETBUF variable disabled output
+       buffering, leaving the output in the original (usually  line  buffered)
        mode.
 
-       In the current implementation, ncurses performs its own  buffering  and
-       does  not require this workaround.  It does not modify the buffering of
+       In  the  current implementation, ncurses performs its own buffering and
+       does not require this workaround.  It does not modify the buffering  of
        the standard output.
 
-       The reason for the change was to make the behavior for  interrupts  and
-       other   signals   more   robust.    One   drawback   is   that  certain
-       nonconventional programs would mix ordinary stdio  calls  with  ncurses
-       calls  and (usually) work.  This is no longer possible since ncurses is
-       not using the buffered standard output but its own output (to the  same
-       file  descriptor).  As a special case, the low-level calls such as <STRONG>putp</STRONG>
+       The  reason  for the change was to make the behavior for interrupts and
+       other  signals   more   robust.    One   drawback   is   that   certain
+       nonconventional  programs  would  mix ordinary stdio calls with ncurses
+       calls and (usually) work.  This is no longer possible since ncurses  is
+       not  using the buffered standard output but its own output (to the same
+       file descriptor).  As a special case, the low-level calls such as  <STRONG>putp</STRONG>
        still use the standard output.  But high-level curses calls do not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS">NCURSES_NO_UTF8_ACS</a></H3><PRE>
-       During initialization, the <STRONG>ncurses</STRONG> library  checks  for  special  cases
+       During  initialization,  the  <STRONG>ncurses</STRONG>  library checks for special cases
        where VT100 line-drawing (and the corresponding alternate character set
-       capabilities) described in  the  terminfo  are  known  to  be  missing.
-       Specifically,  when  running  in  a  UTF-8  locale,  the  Linux console
-       emulator and the GNU screen program ignore these.  Ncurses  checks  the
-       <STRONG>TERM</STRONG>  environment  variable  for  these.   For other special cases, you
-       should set this environment variable.  Doing this tells ncurses to  use
+       capabilities)  described  in  the  terminfo  are  known  to be missing.
+       Specifically, when  running  in  a  UTF-8  locale,  the  Linux  console
+       emulator  and  the GNU screen program ignore these.  Ncurses checks the
+       <STRONG>TERM</STRONG> environment variable for these.   For  other  special  cases,  you
+       should  set this environment variable.  Doing this tells ncurses to use
        Unicode values which correspond to the VT100 line-drawing glyphs.  That
-       works for the special cases cited, and is likely to work  for  terminal
+       works  for  the special cases cited, and is likely to work for terminal
        emulators.
 
-       When  setting  this  variable,  you  should  set it to a nonzero value.
-       Setting it to zero (or to a nonnumber) disables the special  check  for
+       When setting this variable, you should  set  it  to  a  nonzero  value.
+       Setting  it  to zero (or to a nonnumber) disables the special check for
        "linux" and "screen".
 
-       As  an  alternative  to the environment variable, ncurses checks for an
-       extended terminfo capability <STRONG>U8</STRONG>.  This is a  numeric  capability  which
+       As an alternative to the environment variable, ncurses  checks  for  an
+       extended  terminfo  capability  <STRONG>U8</STRONG>.  This is a numeric capability which
        can be compiled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>.  For example
 
           # linux console, if patched to provide working
@@ -1007,67 +1008,67 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  name  "U8" is chosen to be two characters, to permit it to be used
+       The name "U8" is chosen to be two characters, to permit it to  be  used
        by applications that use ncurses' termcap interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE">NCURSES_TRACE</a></H3><PRE>
-       During  initialization,  the  <STRONG>ncurses</STRONG>  debugging  library  checks   the
-       NCURSES_TRACE  environment  variable.   If  it is defined, to a numeric
-       value, <STRONG>ncurses</STRONG> calls the  <STRONG>trace</STRONG>  function,  using  that  value  as  the
+       During   initialization,  the  <STRONG>ncurses</STRONG>  debugging  library  checks  the
+       NCURSES_TRACE environment variable.  If it is  defined,  to  a  numeric
+       value,  <STRONG>ncurses</STRONG>  calls  the  <STRONG>trace</STRONG>  function,  using  that value as the
        argument.
 
-       The  argument  values,  which  are defined in <STRONG>curses.h</STRONG>, provide several
-       types  of  information.   When  running  with  traces   enabled,   your
+       The argument values, which are defined  in  <STRONG>curses.h</STRONG>,  provide  several
+       types   of   information.   When  running  with  traces  enabled,  your
        application will write the file <STRONG>trace</STRONG> to the current directory.
 
        See <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> for more information.
 
 
 </PRE><H3><a name="h3-TERM">TERM</a></H3><PRE>
-       Denotes  your  terminal  type.   Each terminal type is distinct, though
+       Denotes your terminal type.  Each terminal  type  is  distinct,  though
        many are similar.
 
-       <STRONG>TERM</STRONG> is commonly set by terminal emulators to help applications find  a
-       workable   terminal  description.   Some  of  those  choose  a  popular
+       <STRONG>TERM</STRONG>  is commonly set by terminal emulators to help applications find a
+       workable  terminal  description.   Some  of  those  choose  a   popular
        approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
        Not  infrequently,  your  application  will  have  problems  with  that
        approach, e.g., incorrect function-key definitions.
 
-       If you set <STRONG>TERM</STRONG> in your environment, it has no effect on the  operation
-       of  the  terminal  emulator.  It only affects the way applications work
-       within the terminal.  Likewise, as a general  rule  (<STRONG>xterm(1)</STRONG>  being  a
-       rare  exception), terminal emulators which allow you to specify <STRONG>TERM</STRONG> as
-       a parameter or configuration value do  not  change  their  behavior  to
+       If  you set <STRONG>TERM</STRONG> in your environment, it has no effect on the operation
+       of the terminal emulator.  It only affects the  way  applications  work
+       within  the  terminal.   Likewise,  as a general rule (<STRONG>xterm(1)</STRONG> being a
+       rare exception), terminal emulators which allow you to specify <STRONG>TERM</STRONG>  as
+       a  parameter  or  configuration  value  do not change their behavior to
        match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP">TERMCAP</a></H3><PRE>
-       If  the  <STRONG>ncurses</STRONG>  library  has  been  configured  with <EM>termcap</EM> support,
-       <STRONG>ncurses</STRONG> will check for a terminal's description in termcap form  if  it
+       If the <STRONG>ncurses</STRONG>  library  has  been  configured  with  <EM>termcap</EM>  support,
+       <STRONG>ncurses</STRONG>  will  check for a terminal's description in termcap form if it
        is not available in the terminfo database.
 
        The <STRONG>TERMCAP</STRONG> environment variable contains either a terminal description
-       (with newlines  stripped  out),  or  a  file  name  telling  where  the
+       (with  newlines  stripped  out),  or  a  file  name  telling  where the
        information denoted by the <STRONG>TERM</STRONG> environment variable exists.  In either
-       case, setting it directs <STRONG>ncurses</STRONG> to ignore the  usual  place  for  this
+       case,  setting  it  directs  <STRONG>ncurses</STRONG> to ignore the usual place for this
        information, e.g., /etc/termcap.
 
 
 </PRE><H3><a name="h3-TERMINFO">TERMINFO</a></H3><PRE>
-       <STRONG>ncurses</STRONG>  can  be  configured  to read from multiple terminal databases.
-       The <STRONG>TERMINFO</STRONG> variable overrides the location for the  default  terminal
-       database.   Terminal  descriptions  (in  terminal format) are stored in
+       <STRONG>ncurses</STRONG> can be configured to read  from  multiple  terminal  databases.
+       The  <STRONG>TERMINFO</STRONG>  variable overrides the location for the default terminal
+       database.  Terminal descriptions (in terminal  format)  are  stored  in
        terminal databases:
 
        <STRONG>o</STRONG>   Normally these are stored in a directory tree, using subdirectories
            named by the first letter of the terminal names therein.
 
            This is the scheme used in System V, which legacy Unix systems use,
-           and the <STRONG>TERMINFO</STRONG> variable is used by <EM>curses</EM> applications  on  those
+           and  the  <STRONG>TERMINFO</STRONG> variable is used by <EM>curses</EM> applications on those
            systems to override the default location of the terminal database.
 
-       <STRONG>o</STRONG>   If  <STRONG>ncurses</STRONG>  is  built  to use hashed databases, then each entry in
+       <STRONG>o</STRONG>   If <STRONG>ncurses</STRONG> is built to use hashed databases,  then  each  entry  in
            this list may be the path of a hashed database file, e.g.,
 
                /usr/share/terminfo.db
@@ -1076,30 +1077,30 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
                /usr/share/terminfo/
 
-           The hashed database uses less disk-space and  is  a  little  faster
-           than  the  directory  tree.   However, some applications assume the
-           existence of the directory tree, reading it  directly  rather  than
+           The  hashed  database  uses  less disk-space and is a little faster
+           than the directory tree.  However,  some  applications  assume  the
+           existence  of  the  directory tree, reading it directly rather than
            using the terminfo library calls.
 
-       <STRONG>o</STRONG>   If  <STRONG>ncurses</STRONG>  is  built  with  a  support  for reading termcap files
-           directly, then an entry in this list may be the path of  a  termcap
+       <STRONG>o</STRONG>   If <STRONG>ncurses</STRONG> is built  with  a  support  for  reading  termcap  files
+           directly,  then  an entry in this list may be the path of a termcap
            file.
 
        <STRONG>o</STRONG>   If the <STRONG>TERMINFO</STRONG> variable begins with "hex:" or "b64:", <STRONG>ncurses</STRONG> uses
-           the remainder of that variable as a compiled terminal  description.
+           the  remainder of that variable as a compiled terminal description.
            You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
 
                TERMINFO="$(infocmp -0 -Q2 -q)"
                export TERMINFO
 
-           The  compiled description is used if it corresponds to the terminal
+           The compiled description is used if it corresponds to the  terminal
            identified by the <STRONG>TERM</STRONG> variable.
 
-       Setting <STRONG>TERMINFO</STRONG> is the simplest, but not the only way to set  location
-       of  the  default  terminal  database.   The  complete  list of database
+       Setting  <STRONG>TERMINFO</STRONG> is the simplest, but not the only way to set location
+       of the default  terminal  database.   The  complete  list  of  database
        locations in order follows:
 
-          <STRONG>o</STRONG>   the last terminal database to which <STRONG>ncurses</STRONG> wrote,  if  any,  is
+          <STRONG>o</STRONG>   the  last  terminal  database to which <STRONG>ncurses</STRONG> wrote, if any, is
               searched first
 
           <STRONG>o</STRONG>   the location specified by the TERMINFO environment variable
@@ -1108,31 +1109,31 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   locations listed in the TERMINFO_DIRS environment variable
 
-          <STRONG>o</STRONG>   one  or  more  locations whose names are configured and compiled
+          <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
               into the ncurses library, i.e.,
 
-             <STRONG>o</STRONG>   /usr/share/terminfo  (corresponding  to   the   TERMINFO_DIRS
+             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  TERMINFO_DIRS
                  variable)
 
              <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the TERMINFO variable)
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS">TERMINFO_DIRS</a></H3><PRE>
-       Specifies  a  list  of  locations  to search for terminal descriptions.
-       Each location in the list is a terminal database as  described  in  the
-       section  on  the  <STRONG>TERMINFO</STRONG>  variable.   The list is separated by colons
+       Specifies a list of locations  to  search  for  terminal  descriptions.
+       Each  location  in  the list is a terminal database as described in the
+       section on the <STRONG>TERMINFO</STRONG> variable.  The  list  is  separated  by  colons
        (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       There is no corresponding feature  in  System  V  terminfo;  it  is  an
+       There  is  no  corresponding  feature  in  System  V terminfo; it is an
        extension developed for <STRONG>ncurses</STRONG>.
 
 
 </PRE><H3><a name="h3-TERMPATH">TERMPATH</a></H3><PRE>
-       If  <STRONG>TERMCAP</STRONG>  does not hold a file name then <STRONG>ncurses</STRONG> checks the <STRONG>TERMPATH</STRONG>
-       environment variable.  This is a list of filenames separated by  spaces
+       If <STRONG>TERMCAP</STRONG> does not hold a file name then <STRONG>ncurses</STRONG> checks  the  <STRONG>TERMPATH</STRONG>
+       environment  variable.  This is a list of filenames separated by spaces
        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       If  the  <STRONG>TERMPATH</STRONG> environment variable is not set, <STRONG>ncurses</STRONG> looks in the
+       If the <STRONG>TERMPATH</STRONG> environment variable is not set, <STRONG>ncurses</STRONG> looks  in  the
        files
 
            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
@@ -1140,16 +1141,16 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        in that order.
 
        The library may be configured to disregard the following variables when
-       the  current  user  is the superuser (root), or if the application uses
+       the current user is the superuser (root), or if  the  application  uses
        setuid or setgid permissions:
 
            $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Several  different  configurations  are  possible,  depending  on   the
-       configure  script  options used when building <STRONG>ncurses</STRONG>.  There are a few
-       main options whose effects are visible to  the  applications  developer
+       Several   different  configurations  are  possible,  depending  on  the
+       configure script options used when building <STRONG>ncurses</STRONG>.  There are  a  few
+       main  options  whose  effects are visible to the applications developer
        using <STRONG>ncurses</STRONG>:
 
        --disable-overwrite
@@ -1157,20 +1158,20 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This  option  is  used to avoid filename conflicts when <STRONG>ncurses</STRONG> is
+            This option is used to avoid filename conflicts  when  <STRONG>ncurses</STRONG>  is
             not the main implementation of curses of the computer.  If <STRONG>ncurses</STRONG>
-            is  installed  disabling  overwrite,  it  puts  its  headers  in a
+            is installed  disabling  overwrite,  it  puts  its  headers  in  a
             subdirectory, e.g.,
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            It also omits a  symbolic  link  which  would  allow  you  to  use
+            It  also  omits  a  symbolic  link  which  would  allow you to use
             <STRONG>-lcurses</STRONG> to build executables.
 
        --enable-widec
-            The   configure   script   renames   the   library   and  (if  the
-            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
-            different  subdirectory.   All  of  the  library  names have a "w"
+            The  configure  script   renames   the   library   and   (if   the
+            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
+            different subdirectory.  All of  the  library  names  have  a  "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1179,45 +1180,45 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You must also enable the wide-character  features  in  the  header
-            file  when  compiling  for  the  wide-character library to use the
-            extended (wide-character) functions.   The  symbol  which  enables
+            You  must  also  enable  the wide-character features in the header
+            file when compiling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The  symbol which enables
             these features has changed since XSI Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
+            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
+            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
                 to 500.
 
-            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
-                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
+            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
+                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
-                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
-                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
+                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
+                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The  <STRONG>curses.h</STRONG>  file  which  is  installed  for  the wide-character
-            library is designed to be compatible  with  the  normal  library's
-            header.   Only  the size of the <STRONG>WINDOW</STRONG> structure differs, and very
+            The <STRONG>curses.h</STRONG>  file  which  is  installed  for  the  wide-character
+            library  is  designed  to  be compatible with the normal library's
+            header.  Only the size of the <STRONG>WINDOW</STRONG> structure differs,  and  very
             few applications require more than a pointer to <STRONG>WINDOW</STRONG>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character  library's  headers  should  be installed last, to allow
+            character library's headers should be  installed  last,  to  allow
             applications to be built using either library from the same set of
             headers.
 
        --with-pthread
-            The  configure  script  renames  the  library.  All of the library
-            names have a "t"  appended  to  them  (before  any  "w"  added  by
+            The configure script renames the  library.   All  of  the  library
+            names  have  a  "t"  appended  to  them  (before  any "w" added by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to  set  these  values.   Some applications (very few) may require
+            to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
        --with-shared
@@ -1227,17 +1228,17 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        --with-debug
 
        --with-profile
-            The shared and normal  (static)  library  names  differ  by  their
-            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+            The  shared  and  normal  (static)  library  names differ by their
+            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
+            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        --with-termlib
-            Low-level  functions  which do not depend upon whether the library
+            Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
-            By doing this, it is possible to share the tinfo  library  between
-            wide/normal  configurations  as  well  as  reduce  the size of the
+            By  doing  this, it is possible to share the tinfo library between
+            wide/normal configurations as well  as  reduce  the  size  of  the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1257,91 +1258,92 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <STRONG>curses</STRONG> utility routines
 
        --with-trace
-            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
-            is  sometimes  useful  to  configure  this  in the shared library.
+            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
+            is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/tabset
-            directory   containing   initialization  files  for  the  terminal
-            capability  database   /usr/share/terminfo   terminal   capability
-            database
+       <EM>/usr/share/tabset</EM>
+            tab stop initialization database
+
+       <EM>/usr/share/terminfo</EM>
+            compiled terminal capability database
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
-       falls back to the old-style /etc/termcap file  if  the  terminal  setup
-       code  cannot  find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use of this
-       feature is not  recommended,  as  it  essentially  includes  an  entire
-       termcap  compiler  in  the <STRONG>ncurses</STRONG> startup code, at significant cost in
+       The <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>)  that
+       falls  back  to  the  old-style /etc/termcap file if the terminal setup
+       code cannot find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use  of  this
+       feature  is  not  recommended,  as  it  essentially  includes an entire
+       termcap compiler in the <STRONG>ncurses</STRONG> startup code, at  significant  cost  in
        core and startup cycles.
 
-       The <STRONG>ncurses</STRONG> library includes facilities for capturing mouse  events  on
-       certain  terminals  (including  xterm).   See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual
+       The  <STRONG>ncurses</STRONG>  library includes facilities for capturing mouse events on
+       certain terminals (including xterm).   See  the  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>  manual
        page for details.
 
-       The <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to  window
-       resizing   events,   e.g.,   when   running   in  an  xterm.   See  the
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In  addition,
+       The  <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to window
+       resizing  events,  e.g.,  when  running   in   an   xterm.    See   the
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>  and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In addition,
        the library may be configured with a <STRONG>SIGWINCH</STRONG> handler.
 
-       The  <STRONG>ncurses</STRONG> library extends the fixed set of function key capabilities
-       of terminals by allowing the application designer to define  additional
-       key  sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and
+       The <STRONG>ncurses</STRONG> library extends the fixed set of function key  capabilities
+       of  terminals by allowing the application designer to define additional
+       key sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,  and
        <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> manual pages for details.
 
-       The <STRONG>ncurses</STRONG> library can exploit the  capabilities  of  terminals  which
-       implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
-       application to reset  the  terminal  to  its  original  foreground  and
-       background  colors.   From  the  users' perspective, the application is
+       The  <STRONG>ncurses</STRONG>  library  can  exploit the capabilities of terminals which
+       implement the ISO-6429 SGR 39 and  SGR  49  controls,  which  allow  an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From the users'  perspective,  the  application  is
        able  to  draw  colored  text  on  a  background  whose  color  is  set
-       independently,  providing better control over color contrasts.  See the
+       independently, providing better control over color contrasts.  See  the
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
 
-       The <STRONG>ncurses</STRONG> library  includes  a  function  for  directing  application
+       The  <STRONG>ncurses</STRONG>  library  includes  a  function  for directing application
        output  to  a  printer  attached  to  the  terminal  device.   See  the
        <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <STRONG>ncurses</STRONG> library is intended to be BASE-level  conformant  with  XSI
-       Curses.    The  EXTENDED  XSI  Curses  functionality  (including  color
+       The  <STRONG>ncurses</STRONG>  library  is intended to be BASE-level conformant with XSI
+       Curses.   The  EXTENDED  XSI  Curses  functionality  (including   color
        support) is supported.
 
-       A small number of local differences (that  is,  individual  differences
-       between  the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in <STRONG>PORTABILITY</STRONG>
+       A  small  number  of local differences (that is, individual differences
+       between the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in  <STRONG>PORTABILITY</STRONG>
        sections of the library man pages.
 
 
 </PRE><H3><a name="h3-Error-checking">Error checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
+       In  many cases, X/Open Curses is vague about error conditions, omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations,  this  one  checks  parameters  such as
-       pointers to WINDOW structures to ensure they are not  null.   The  main
-       reason  for  providing  this  behavior  is  to guard against programmer
-       error.  The standard interface does not provide a way for  the  library
-       to  tell an application which of several possible errors were detected.
-       Relying on this (or some other) extension  will  adversely  affect  the
+       Unlike other  implementations,  this  one  checks  parameters  such  as
+       pointers  to  WINDOW  structures to ensure they are not null.  The main
+       reason for providing this  behavior  is  to  guard  against  programmer
+       error.   The  standard interface does not provide a way for the library
+       to tell an application which of several possible errors were  detected.
+       Relying  on  this  (or  some other) extension will adversely affect the
        portability of curses applications.
 
 
 </PRE><H3><a name="h3-Extensions-versus-portability">Extensions versus portability</a></H3><PRE>
-       Most  of the extensions provided by ncurses have not been standardized.
+       Most of the extensions provided by ncurses have not been  standardized.
        Some  have  been  incorporated  into  other  implementations,  such  as
        PDCurses or NetBSD curses.  Here are a few to consider:
 
        <STRONG>o</STRONG>   The routine <STRONG>has_key</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The routine <STRONG>slk_attr</STRONG> is not part of XPG4,  nor  is  it  present  in
+       <STRONG>o</STRONG>   The  routine  <STRONG>slk_attr</STRONG>  is  not  part of XPG4, nor is it present in
            SVr4.  See the <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The  routines  <STRONG>getmouse</STRONG>,  <STRONG>mousemask</STRONG>, <STRONG>ungetmouse</STRONG>, <STRONG>mouseinterval</STRONG>, and
-           <STRONG>wenclose</STRONG> relating to mouse interfacing are not part  of  XPG4,  nor
-           are  they  present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for
+       <STRONG>o</STRONG>   The routines <STRONG>getmouse</STRONG>, <STRONG>mousemask</STRONG>,  <STRONG>ungetmouse</STRONG>,  <STRONG>mouseinterval</STRONG>,  and
+           <STRONG>wenclose</STRONG>  relating  to  mouse interfacing are not part of XPG4, nor
+           are they present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual  page  for
            details.
 
        <STRONG>o</STRONG>   The  routine  <STRONG>mcprint</STRONG>  was  not  present  in  any  previous  curses
@@ -1350,65 +1352,65 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The routine <STRONG>wresize</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The  WINDOW  structure's  internal  details  can  be  hidden   from
-           application  programs.   See  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for the discussion of
+       <STRONG>o</STRONG>   The   WINDOW  structure's  internal  details  can  be  hidden  from
+           application programs.  See <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for  the  discussion  of
            <STRONG>is_scrollok</STRONG>, etc.
 
        <STRONG>o</STRONG>   This  implementation  can  be  configured  to  provide  rudimentary
-           support  for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> for
+           support for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>  for
            details.
 
-       <STRONG>o</STRONG>   This implementation can also be configured  to  provide  a  set  of
-           functions  which  improve  the  ability to manage multiple screens.
+       <STRONG>o</STRONG>   This  implementation  can  also  be  configured to provide a set of
+           functions which improve the ability  to  manage  multiple  screens.
            See <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> for details.
 
 
 </PRE><H3><a name="h3-Padding-differences">Padding differences</a></H3><PRE>
-       In historic curses versions, delays embedded in  the  capabilities  <STRONG>cr</STRONG>,
-       <STRONG>ind</STRONG>,  <STRONG>cub1</STRONG>,  <STRONG>ff</STRONG>  and <STRONG>tab</STRONG> activated corresponding delay bits in the UNIX
+       In  historic  curses  versions, delays embedded in the capabilities <STRONG>cr</STRONG>,
+       <STRONG>ind</STRONG>, <STRONG>cub1</STRONG>, <STRONG>ff</STRONG> and <STRONG>tab</STRONG> activated corresponding delay bits  in  the  UNIX
        tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.   This  method  is  slightly  more  expensive,  but  narrows the
-       interface to the UNIX kernel significantly and increases the  package's
+       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
+       interface  to the UNIX kernel significantly and increases the package's
        portability correspondingly.
 
 
 </PRE><H3><a name="h3-Header-files">Header files</a></H3><PRE>
-       The  header  file  <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes the header files
+       The header file <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the  header  files
        <STRONG>&lt;stdio.h&gt;</STRONG> and <STRONG>&lt;unctrl.h&gt;</STRONG>.
 
        X/Open Curses has more to say, but does not finish the story:
 
-           The inclusion of &lt;curses.h&gt; may make visible all symbols  from  the
+           The  inclusion  of &lt;curses.h&gt; may make visible all symbols from the
            headers &lt;stdio.h&gt;, &lt;term.h&gt;, &lt;termios.h&gt;, and &lt;wchar.h&gt;.
 
        Here is a more complete story:
 
-       <STRONG>o</STRONG>   Starting   with  BSD  curses,  all  implementations  have  included
+       <STRONG>o</STRONG>   Starting  with  BSD  curses,  all  implementations  have   included
            &lt;stdio.h&gt;.
 
-           BSD curses included &lt;curses.h&gt;  and  &lt;unctrl.h&gt;  from  an  internal
+           BSD  curses  included  &lt;curses.h&gt;  and  &lt;unctrl.h&gt; from an internal
            header "curses.ext" ("ext" was a short name for <EM>externs</EM>).
 
-           BSD  curses  used  &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG> and <STRONG>scanw</STRONG>), but
+           BSD curses used &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG>  and  <STRONG>scanw</STRONG>),  but
            nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   SVr2 curses added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon  &lt;stdio.h&gt;.   That
+       <STRONG>o</STRONG>   SVr2  curses  added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon &lt;stdio.h&gt;.  That
            is, the function prototype uses <STRONG>FILE</STRONG>.
 
            SVr4 curses added <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>, which also use &lt;stdio.h&gt;.
 
            X/Open Curses documents all three of these functions.
 
-           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
            include  &lt;stdio.h&gt;  before  including  &lt;curses.h&gt;.   Both  document
            curses showing &lt;curses.h&gt; as the only required header.
 
            As a result, standard &lt;curses.h&gt; will always include &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open  Curses  is  inconsistent  with  respect  to  SVr4 regarding
+       <STRONG>o</STRONG>   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
            &lt;unctrl.h&gt;.
 
-           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;   from
+           As   noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;  from
            &lt;curses.h&gt; (like SVr4).
 
        <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
@@ -1417,55 +1419,55 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
            in curses.h, but ncurses (and Solaris curses) do not.
 
-           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses (and
+           AIX curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses  (and
            Solaris curses) do not.
 
-       <STRONG>o</STRONG>   X/Open says that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there  is  no
+       <STRONG>o</STRONG>   X/Open  says  that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there is no
            requirement that it do that.
 
            Some  programs  use  functions  declared  in  both  &lt;curses.h&gt;  and
-           &lt;term.h&gt;, and must include both headers in the same  module.   Very
-           old  versions  of  AIX  curses required including &lt;curses.h&gt; before
+           &lt;term.h&gt;,  and  must include both headers in the same module.  Very
+           old versions of AIX curses  required  including  &lt;curses.h&gt;  before
            including &lt;term.h&gt;.
 
-           Because ncurses header files include the headers needed  to  define
+           Because  ncurses  header files include the headers needed to define
            datatypes used in the headers, ncurses header files can be included
-           in any order.  But for portability, you should  include  &lt;curses.h&gt;
+           in  any  order.  But for portability, you should include &lt;curses.h&gt;
            before &lt;term.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says  <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because including a header
+       <STRONG>o</STRONG>   X/Open Curses says <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because  including  a  header
            file does not necessarily make all symbols in it visible (there are
            ifdef's to consider).
 
-           For  instance,  in  ncurses &lt;wchar.h&gt; <EM>may</EM> be included if the proper
-           symbol is defined, and if ncurses is configured for  wide-character
-           support.   If  the  header  is  included,  its  symbols may be made
-           visible.  That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG>  feature
+           For instance, in ncurses &lt;wchar.h&gt; <EM>may</EM> be included  if  the  proper
+           symbol  is defined, and if ncurses is configured for wide-character
+           support.  If the header  is  included,  its  symbols  may  be  made
+           visible.   That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature
            test macro.
 
-       <STRONG>o</STRONG>   X/Open  Curses  documents  one  required header, in a special case:
-           &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>   and
-           <STRONG>vw_scanw</STRONG>  functions  (as  well  as  the  obsolete  the <STRONG>vwprintw</STRONG> and
+       <STRONG>o</STRONG>   X/Open Curses documents one required header,  in  a  special  case:
+           &lt;stdarg.h&gt;   before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>  and
+           <STRONG>vw_scanw</STRONG> functions (as  well  as  the  obsolete  the  <STRONG>vwprintw</STRONG>  and
            <STRONG>vwscanw</STRONG> functions).  Each of those uses a <STRONG>va_list</STRONG> parameter.
 
-           The two obsolete functions were  introduced  in  SVr3.   The  other
-           functions  were  introduced  in  X/Open  Curses.   In between, SVr4
-           curses provided for  the  possibility  that  an  application  might
+           The  two  obsolete  functions  were  introduced in SVr3.  The other
+           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
+           curses  provided  for  the  possibility  that  an application might
            include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;.  Initially, that was done
-           by using <STRONG>void*</STRONG> for the <STRONG>va_list</STRONG> parameter.  Later,  a  special  type
-           (defined  in &lt;stdio.h&gt;) was introduced, to allow for compiler type-
+           by  using  <STRONG>void*</STRONG>  for the <STRONG>va_list</STRONG> parameter.  Later, a special type
+           (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler  type-
            checking.  That special type is always available, because &lt;stdio.h&gt;
            is always included by &lt;curses.h&gt;.
 
            None of the X/Open Curses implementations require an application to
-           include &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either  have
-           allowed  for  a  special type, or (like ncurses) include &lt;stdarg.h&gt;
+           include  &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either have
+           allowed for a special type, or (like  ncurses)  include  &lt;stdarg.h&gt;
            directly to provide a portable interface.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If standard output from a <STRONG>ncurses</STRONG> program is re-directed  to  something
-       which  is not a tty, screen updates will be directed to standard error.
+       If  standard  output from a <STRONG>ncurses</STRONG> program is re-directed to something
+       which is not a tty, screen updates will be directed to standard  error.
        This was an undocumented feature of AT&amp;T System V Release 3 curses.
 
 
@@ -1475,14 +1477,14 @@ <H1 class="no-header">ncurses 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_" for detailed
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> and related pages whose names begin  "curs_"  for  detailed
        routine descriptions.
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for user-defined capabilities
 
 
 
-ncurses 6.4                       2023-10-07                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 821e3691d..d2eb22d4c 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.56 2023/10/07 21:19:07 tom Exp @
+  * @Id: panel.3x,v 1.57 2023/10/14 19:20:40 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -270,12 +270,6 @@ <H1 class="no-header">panel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            2015.  This is based on the AT&amp;T documentation.
 
 
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       panel.h interface for the panels library
-
-       libpanel.a the panels library itself
-
-
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
        Originally   written   by   Warren   Tucker  &lt;wht@n4hgf.mt-park.ga.us&gt;,
        primarily to assist in porting <EM>u386mon</EM>  to  systems  without  a  native
@@ -291,7 +285,7 @@ <H1 class="no-header">panel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-10-14                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -323,7 +317,6 @@ <H1 class="no-header">panel 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-COMPATIBILITY">COMPATIBILITY</a></li>
 <li><a href="#h2-NOTE">NOTE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-AUTHOR">AUTHOR</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 1b78541ca..1cbace54d 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.47 2023/10/07 21:19:07 tom Exp @
+  * @Id: tabs.1,v 1.48 2023/10/14 19:29:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -190,6 +190,11 @@ <H1 class="no-header">tabs 1 2023-10-07 ncurses 6.4 User commands</H1>
        margin.
 
 
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/tabset</EM>
+              tab stop initialization database
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        <EM>IEEE</EM>   <EM>Std</EM>   <EM>1003.1/The</EM>   <EM>Open</EM>   <EM>Group</EM>   <EM>Base</EM>  <EM>Specifications</EM>  <EM>Issue</EM>  <EM>7</EM>
        (POSIX.1-2008) describes a <STRONG>tabs</STRONG> utility.  However
@@ -254,7 +259,7 @@ <H1 class="no-header">tabs 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -270,6 +275,7 @@ <H1 class="no-header">tabs 1 2023-10-07 ncurses 6.4 User commands</H1>
 <li><a href="#h3-Margins">Margins</a></li>
 </ul>
 </li>
+<li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 9531d2854..a25dfa104 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.59 2023/10/07 21:19:07 tom Exp @
+  * @Id: term.5,v 1.60 2023/10/14 19:18:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-10-07 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-10-14 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-10-07 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-10-14 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -360,7 +360,8 @@ <H1 class="no-header">term 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo/*/* compiled terminal capability database
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -378,7 +379,7 @@ <H1 class="no-header">term 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index e89e53fd5..aa9ae4db9 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.39 2023/10/07 21:19:07 tom Exp @
+  * @Id: term.7,v 1.40 2023/10/14 19:18:14 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-10-07 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-10-14 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-10-07 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-10-14 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -202,8 +202,8 @@ <H1 class="no-header">term 7 2023-10-07 ncurses 6.4 Miscellaneous</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo/?/*
-            compiled terminal capability database
+       <EM>/usr/share/terminfo</EM>
+            compiled terminal description database
 
        /etc/inittab
             tty line initialization (AT&amp;T-like UNIXes)
@@ -217,7 +217,7 @@ <H1 class="no-header">term 7 2023-10-07 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index d8c8ffed2..db75f645c 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.52 2023/10/07 21:19:07 tom Exp @
+  * @Id: terminfo.head,v 1.53 2023/10/14 19:53:57 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.133 2023/10/07 20:53:54 tom Exp @
+  * @Id: terminfo.tail,v 1.134 2023/10/14 19:18:14 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-10-07 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-10-14 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231007).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231014).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -243,25 +243,29 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
        terminfo  description  block  and available to terminfo-using code.  In
        each line of the table,
 
-       The <STRONG>variable</STRONG> is the name by  which  the  programmer  (at  the  terminfo
-       level) accesses the capability.
+       <STRONG>o</STRONG>   The <STRONG>variable</STRONG> is the name by which the programmer (at  the  terminfo
+           level) accesses the capability.
 
-       The  <STRONG>capname</STRONG> 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
-       specification.
+       <STRONG>o</STRONG>   The  <STRONG>capname</STRONG>  (<EM>Cap-name</EM>)  is the short name used in the text of the
+           database, and is used by a person updating the database.
 
-       The termcap code is the old <STRONG>termcap</STRONG> capability name (some  capabilities
-       are new, and have names which termcap did not originate).
+           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 specification.
 
-       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 <STRONG>Caps</STRONG> to line up nicely.
+           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 <STRONG>Caps</STRONG> to line up nicely.
 
-       Finally,  the description field attempts to convey the semantics of the
-       capability.  You may find some codes in the description field:
+       <STRONG>o</STRONG>   The   <STRONG>termcap</STRONG>   (<EM>Tcap</EM>)  code  is  the  old  capability  name  (some
+           capabilities  are  new,  and  have  names  which  termcap  did  not
+           originate).
+
+       <STRONG>o</STRONG>   Finally,  the <STRONG>description</STRONG> 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
 
@@ -283,8 +287,6 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
 
                   <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
                   <STRONG>Booleans</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-
-
           auto_left_margin            bw        bw     cub1 wraps from
                                                        column 0 to last
                                                        column
@@ -348,9 +350,9 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
                                                        f2=ctrl C)
           no_pad_char                 npc       NP     pad character does
                                                        not exist
+
           non_dest_scroll_region      ndscr     ND     scrolling region is
                                                        non-destructive
-
           non_rev_rmcup               nrrmc     NR     smcup does not
                                                        reverse rmcup
           over_strike                 os        os     terminal can
@@ -416,7 +418,6 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
        with SVr4's printer support.
 
 
-
                   <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
                    <STRONG>Numeric</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
           bit_image_entwining         bitwin    Yo     number of passes for
@@ -482,7 +483,6 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
           change_res_horz             chr       ZC     Change horizontal
                                                        resolution to #1
 
-
           change_res_vert             cvr       ZD     Change vertical
                                                        resolution to #1
           change_scroll_region        csr       cs     change region to
@@ -2677,7 +2677,8 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /usr/share/terminfo/?/*  files containing terminal descriptions
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database directory
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -2692,7 +2693,7 @@ <H1 class="no-header">terminfo 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-10-07                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-10-14                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 386d4bd20..044f51089 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.97 2023/10/07 21:19:07 tom Exp @
+  * @Id: tic.1m,v 1.98 2023/10/14 19:25:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -467,8 +467,8 @@ <H1 class="no-header">tic 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <STRONG>/usr/share/terminfo/?/*</STRONG>
-            Compiled terminal description database.
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 9d103c56e..f1b199421 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.52 2023/10/07 21:19:07 tom Exp @
+  * @Id: toe.1m,v 1.53 2023/10/14 19:18:14 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -93,18 +93,18 @@ <H1 class="no-header">toe 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
        <STRONG>-u</STRONG> <EM>file</EM>  lists terminal type dependencies in  <EM>file</EM>,  a  <EM>terminfo</EM>  entry
                 source  or  <EM>termcap</EM>  database file.  The report summarizes the
-                "<STRONG>use</STRONG>" (<EM>terminfo</EM>)  and  "<STRONG>tc</STRONG>"  (<EM>termcap</EM>)  relations:  each  line
+                "<STRONG>use</STRONG>"  (<EM>terminfo</EM>)  and  <STRONG>tc</STRONG>  (<EM>termcap</EM>)  relations:  each   line
                 comprises the primary name of a terminal type employing <STRONG>use</STRONG>/<STRONG>tc</STRONG>
                 capabilities, a colon, a  space-  and  tab-separated  list  of
                 primary names of terminal types thus named, and a newline.
 
        <STRONG>-U</STRONG> <EM>file</EM>  lists  terminal  type reverse dependencies in <EM>file</EM>, a <EM>terminfo</EM>
                 entry source or <EM>termcap</EM> database file.  The report  summarizes
-                the  "<STRONG>use</STRONG>"  (<EM>terminfo</EM>)  and  "<STRONG>tc</STRONG>" (<EM>termcap</EM>) reverse relations:
-                each line comprises  the  primary  name  of  a  terminal  type
-                occurring  in  <STRONG>use</STRONG>/<STRONG>tc</STRONG> capabilities, a colon, a space- and tab-
-                separated list of primary names of terminal types naming  them
-                thus, and a newline.
+                the  "<STRONG>use</STRONG>" (<EM>terminfo</EM>) and <STRONG>tc</STRONG> (<EM>termcap</EM>) reverse relations: each
+                line comprises the primary name of a terminal  type  occurring
+                in  <STRONG>use</STRONG>/<STRONG>tc</STRONG>  capabilities,  a colon, a space- and tab-separated
+                list of primary names of terminal types naming them thus,  and
+                a newline.
 
        <STRONG>-v</STRONG> [<EM>n</EM>]   reports  verbose  status  information  to  the  standard error
                 stream, showing <STRONG>toe</STRONG>'s progress.
@@ -187,7 +187,7 @@ <H1 class="no-header">toe 1m 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 6a327d6dd..7a732a525 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.86 2023/10/07 21:19:07 tom Exp @
+  * @Id: tput.1,v 1.87 2023/10/14 19:29:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -326,54 +326,51 @@ <H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <STRONG>/usr/share/terminfo</STRONG>
-              compiled terminal description database
+       <EM>/usr/share/tabset</EM>
+              tab stop initialization database
 
-       <STRONG>/usr/share/tabset/*</STRONG>
-              tab  settings  for some terminals, in a format appropriate to be
-              output to the terminal (escape sequences that  set  margins  and
-              tabs);  for  more  information, see the <EM>Tabs</EM> <EM>and</EM> <EM>Initialization</EM>,
-              section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-EXIT-CODES">EXIT CODES</a></H2><PRE>
        If the <STRONG>-S</STRONG> option is used, <STRONG>tput</STRONG> 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  <STRONG>0</STRONG>.   No
-       indication  of which line failed can be given so exit code <STRONG>1</STRONG> will never
-       appear.  Exit codes <STRONG>2</STRONG>, <STRONG>3</STRONG>, and <STRONG>4</STRONG> retain their usual interpretation.   If
-       the  <STRONG>-S</STRONG>  option  is  not  used,  the  exit  code depends on the type of
+       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 <STRONG>0</STRONG>.  No
+       indication of which line failed can be given so exit code <STRONG>1</STRONG> will  never
+       appear.   Exit codes <STRONG>2</STRONG>, <STRONG>3</STRONG>, and <STRONG>4</STRONG> retain their usual interpretation.  If
+       the <STRONG>-S</STRONG> option is not used,  the  exit  code  depends  on  the  type  of
        <EM>capname</EM>:
 
           <EM>boolean</EM>
                  a value of <STRONG>0</STRONG> is set for TRUE and <STRONG>1</STRONG> for FALSE.
 
-          <EM>string</EM> a value of <STRONG>0</STRONG> is set  if  the  <EM>capname</EM>  is  defined  for  this
-                 terminal  <EM>type</EM>  (the value of <EM>capname</EM> is returned on standard
-                 output); a value of <STRONG>1</STRONG> is set if <EM>capname</EM> is  not  defined  for
+          <EM>string</EM> a  value  of  <STRONG>0</STRONG>  is  set  if  the <EM>capname</EM> is defined for this
+                 terminal <EM>type</EM> (the value of <EM>capname</EM> is returned  on  standard
+                 output);  a  value  of <STRONG>1</STRONG> is set if <EM>capname</EM> is not defined for
                  this terminal <EM>type</EM> (nothing is written to standard output).
 
           <EM>integer</EM>
                  a value of <STRONG>0</STRONG> is always set, whether or not <EM>capname</EM> is defined
-                 for this terminal <EM>type</EM>.  To determine if <EM>capname</EM>  is  defined
-                 for  this terminal <EM>type</EM>, the user must test the value written
-                 to standard output.  A value of <STRONG>-1</STRONG> means that <EM>capname</EM> is  not
+                 for  this  terminal <EM>type</EM>.  To determine if <EM>capname</EM> is defined
+                 for this terminal <EM>type</EM>, the user must test the value  written
+                 to  standard output.  A value of <STRONG>-1</STRONG> means that <EM>capname</EM> is not
                  defined for this terminal <EM>type</EM>.
 
-          <EM>other</EM>  <STRONG>reset</STRONG>  or  <STRONG>init</STRONG>  may fail to find their respective files.  In
+          <EM>other</EM>  <STRONG>reset</STRONG> or <STRONG>init</STRONG> may fail to find their  respective  files.   In
                  that case, the exit code is set to 4 + <STRONG>errno</STRONG>.
 
        Any other exit code indicates an error; see the DIAGNOSTICS section.
 
 
 </PRE><H2><a name="h2-DIAGNOSTICS">DIAGNOSTICS</a></H2><PRE>
-       <STRONG>tput</STRONG> prints the following error messages  and  sets  the  corresponding
+       <STRONG>tput</STRONG>  prints  the  following  error messages and sets the corresponding
        exit codes.
 
        exit code   error message
        ---------------------------------------------------------------------
-       <STRONG>0</STRONG>           (<EM>capname</EM>  is a numeric variable that is not specified in
-                   the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> database for this  terminal  type,  e.g.
+       <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not specified  in
+                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for this terminal type, e.g.
                    <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
        <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> section.
        <STRONG>2</STRONG>           usage error
@@ -384,65 +381,65 @@ <H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The  <STRONG>tput</STRONG>  command  was begun by Bill Joy in 1980.  The initial version
+       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
        only cleared the screen.
 
        AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
 
-       <STRONG>o</STRONG>   SVr2 provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the  parameter
-           against  each  predefined capability and returned the corresponding
-           value.  This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for  the
+       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
+           against each predefined capability and returned  the  corresponding
+           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
            capabilities which are parameterized.
 
        <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
-           <STRONG>init</STRONG> and <STRONG>reset</STRONG>  subcommands  (more  than  half  the  program)  were
-           incorporated  from  the  <STRONG>reset</STRONG>  feature of BSD <STRONG>tset</STRONG> written by Eric
+           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
+           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
            Allman.
 
        <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
            capabilities in the <STRONG>init</STRONG> subcommand.
 
-       Keith  Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a new
-       implementation based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the  AT&amp;T
-       program,  Bostic's  version accepted some parameters named for <EM>terminfo</EM>
-       capabilities (<STRONG>clear</STRONG>, <STRONG>init</STRONG>, <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).   However  (because  he
-       had  only  <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names for other
-       capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal  I/O
+       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
+       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
+       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
+       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
+       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
+       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
        modes as the earlier BSD <STRONG>tset</STRONG> had done.
 
        At the same time, Bostic added a shell script named "clear", which used
        <STRONG>tput</STRONG> to clear the screen.
 
-       Both  of  these  appeared  in  4.4BSD,  becoming   the   "modern"   BSD
+       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
        implementation of <STRONG>tput</STRONG>.
 
-       This  implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T or
-       BSD: Ross Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in
-       December  1992.   Ridge's  program  made  more sophisticated use of the
-       terminal capabilities than the BSD program.   Eric  Raymond  used  that
-       <STRONG>tput</STRONG>  program  (and  other  parts  of <EM>mytinfo</EM>) in ncurses in June 1995.
-       Using the portions dealing with terminal  capabilities  almost  without
-       change,   Raymond   made  improvements  to  the  way  the  command-line
+       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
+       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
+       December 1992.  Ridge's program made  more  sophisticated  use  of  the
+       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
+       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  ncurses  in  June  1995.
+       Using  the  portions  dealing with terminal capabilities almost without
+       change,  Raymond  made  improvements  to  the  way   the   command-line
        parameters were handled.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This implementation of <STRONG>tput</STRONG> differs from AT&amp;T  <STRONG>tput</STRONG>  in  two  important
+       This  implementation  of  <STRONG>tput</STRONG>  differs from AT&amp;T <STRONG>tput</STRONG> in two important
        areas:
 
-       <STRONG>o</STRONG>   <STRONG>tput</STRONG>  <EM>capname</EM>  writes  to  the standard output.  That need not be a
-           regular  terminal.   However,  the  subcommands  which   manipulate
+       <STRONG>o</STRONG>   <STRONG>tput</STRONG> <EM>capname</EM> 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.
 
-           The  AT&amp;T  implementation's  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands use the BSD
-           (4.1c)  <STRONG>tset</STRONG>  source,  which  manipulates   terminal   modes.    It
-           successively  tries standard output, standard error, standard input
+           The AT&amp;T implementation's <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands  use  the  BSD
+           (4.1c)   <STRONG>tset</STRONG>   source,   which  manipulates  terminal  modes.   It
+           successively tries standard output, standard 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, <STRONG>tput</STRONG> did not modify terminal
+           Until changes made after ncurses 6.0, <STRONG>tput</STRONG> did not modify  terminal
            modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
-           <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
+           <STRONG>tset</STRONG> (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not  able
            to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
            an error.
 
@@ -450,92 +447,92 @@ <H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
            of the characters are numeric, or not.
 
            Most implementations which provide support for <EM>capname</EM> operands use
-           the  <STRONG>tparm</STRONG>  function  to  expand  parameters  in it.  That function
-           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
+           the <STRONG>tparm</STRONG> function to  expand  parameters  in  it.   That  function
+           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
            to know which type to use.
 
-           This  implementation  uses a table to determine the parameter types
+           This implementation uses a table to determine the  parameter  types
            for the standard <EM>capname</EM> operands, and an internal library function
            to analyze nonstandard <EM>capname</EM> operands.
 
-           Besides  providing  more  reliable operation than AT&amp;T's utility, a
-           portability problem is introduced  by  this  analysis:  An  OpenBSD
-           developer  adapted  the  internal  library function from ncurses to
-           port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
-           modified  to  interpret  multiple  commands  on  a  line.  Portable
+           Besides providing more reliable operation than  AT&amp;T's  utility,  a
+           portability  problem  is  introduced  by  this analysis: An OpenBSD
+           developer adapted the internal library  function  from  ncurses  to
+           port  NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had been
+           modified to  interpret  multiple  commands  on  a  line.   Portable
            applications should not rely upon this feature; ncurses provides it
            to support applications written specifically for OpenBSD.
 
        This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
-       <EM>terminfo</EM> names for the <EM>capname</EM> feature, if <EM>termcap</EM> support is  compiled
-       in.   However,  the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names have two
+       <EM>terminfo</EM>  names for the <EM>capname</EM> feature, if <EM>termcap</EM> support is compiled
+       in.  However, the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names  have  two
        ambiguities in this case (and the <EM>terminfo</EM> name is assumed):
 
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM>  name  <STRONG>dl1</STRONG>  (delete
+       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM> name <STRONG>dl1</STRONG> (delete
            one line).
-           The  <EM>terminfo</EM>  name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG> (delete a
+           The <EM>terminfo</EM> name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG>  (delete  a
            given number of lines).
 
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>ed</STRONG> corresponds to  the  <EM>terminfo</EM>  name  <STRONG>rmdc</STRONG>  (end
+       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>ed</STRONG>  corresponds  to the <EM>terminfo</EM> name <STRONG>rmdc</STRONG> (end
            delete mode).
-           The  <EM>terminfo</EM>  name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG> (clear to
+           The <EM>terminfo</EM> name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG>  (clear  to
            end of screen).
 
-       The <STRONG>longname</STRONG> and <STRONG>-S</STRONG> options, and  the  parameter-substitution  features
-       used  in  the  <STRONG>cup</STRONG>  example,  were  not  supported in BSD curses before
+       The  <STRONG>longname</STRONG>  and  <STRONG>-S</STRONG> options, and the parameter-substitution features
+       used in the <STRONG>cup</STRONG> example,  were  not  supported  in  BSD  curses  before
        4.3reno (1989) or in AT&amp;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 <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG>.
+       IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
+       (POSIX.1-2008) documents only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>.
        There are a few interesting observations to make regarding that:
 
-       <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>capname</EM> support.   The
-           others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
+       <STRONG>o</STRONG>   In  this implementation, <STRONG>clear</STRONG> is part of the <EM>capname</EM> support.  The
+           others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
            capabilities.
 
        <STRONG>o</STRONG>   Other  implementations  of  <STRONG>tput</STRONG>  on  SVr4-based  systems  such  as
-           Solaris,  IRIX64  and  HPUX as well as others such as AIX and Tru64
+           Solaris, IRIX64 and HPUX as well as others such as  AIX  and  Tru64
            provide support for <EM>capname</EM> operands.
 
        <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize termcap names rather than
            terminfo capability names in their respective <STRONG>tput</STRONG> commands.  Since
-           2010, NetBSD's <STRONG>tput</STRONG> uses terminfo names.   Before  that,  it  (like
+           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  terminfo names.  Before that, it (like
            FreeBSD) recognized termcap names.
 
-           Beginning  in  2021,  FreeBSD uses the ncurses <STRONG>tput</STRONG>, configured for
+           Beginning in 2021, FreeBSD uses the ncurses  <STRONG>tput</STRONG>,  configured  for
            both terminfo (tested first) and termcap (as a fallback).
 
        Because (apparently) <EM>all</EM> of the certified Unix systems support the full
-       set  of  capability names, the reasoning for documenting only a few may
+       set of capability names, the reasoning for documenting only a  few  may
        not be apparent.
 
-       <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>capname</EM>  and
+       <STRONG>o</STRONG>   X/Open  Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>capname</EM> and
            the other features used in this implementation.
 
-       <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: 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
+       <STRONG>o</STRONG>   That is, there are two standards for <STRONG>tput</STRONG>:  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.
 
-       <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
-           using   curses,   none   of   the   systems  which  have  a  curses
-           implementation provide a <STRONG>tput</STRONG> utility which does  not  provide  the
+       <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <STRONG>tput</STRONG> program without
+           using  curses,  none  of  the   systems   which   have   a   curses
+           implementation  provide  a  <STRONG>tput</STRONG> utility which does not provide the
            <EM>capname</EM> feature.
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (i.e., Unix features documented in SVID 3):
 
-       <STRONG>o</STRONG>   It  assigns exit code 4 to "invalid operand", which may be the same
-           as <EM>unknown</EM> <EM>capability</EM>.  For instance, the source code for  Solaris'
+       <STRONG>o</STRONG>   It assigns exit code 4 to "invalid operand", which may be the  same
+           as  <EM>unknown</EM> <EM>capability</EM>.  For instance, the source code for Solaris'
            xcurses uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It  assigns  exit  code  255  to  a  numeric  variable  that is not
+       <STRONG>o</STRONG>   It assigns exit  code  255  to  a  numeric  variable  that  is  not
            specified in the terminfo database.  That likely is a documentation
-           error,  confusing  the  <STRONG>-1</STRONG>  written  to  the standard output for an
+           error, confusing the <STRONG>-1</STRONG> written  to  the  standard  output  for  an
            absent or cancelled numeric value versus an (unsigned) exit code.
 
-       The various Unix systems (AIX, HPUX, Solaris) use the  same  exit-codes
+       The  various  Unix systems (AIX, HPUX, Solaris) use the same exit-codes
        as ncurses.
 
        NetBSD curses documents different exit codes which do not correspond to
@@ -547,7 +544,7 @@ <H1 class="no-header">tput 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 4bbe18f70..8d63ebc9c 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.72 2023/10/07 21:19:07 tom Exp @
+  * @Id: tset.1,v 1.73 2023/10/14 19:24:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-10-14 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -384,8 +384,8 @@ <H1 class="no-header">tset 1 2023-10-07 ncurses 6.4 User commands</H1>
             system  port  name to terminal type mapping database (BSD versions
             only).
 
-       /usr/share/terminfo
-            terminal capability database
+       <EM>/usr/share/terminfo</EM>
+            compiled terminal description database directory
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -394,7 +394,7 @@ <H1 class="no-header">tset 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-07                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index 7bc00ea6b..ceff65af0 100644
--- a/include/Caps
+++ b/include/Caps
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.48 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps,v 1.49 2023/10/14 20:54:32 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -158,32 +158,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
@@ -285,8 +287,8 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.ad
 #%
 #%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.
+#%but are not yet documented in the man page.
+#%They came in with SVr4's printer support.
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index ee9f2cf24..ce6069f0b 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.20 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps.aix4,v 1.21 2023/10/14 21:47:17 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -158,32 +158,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
@@ -285,8 +287,8 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.ad
 #%
 #%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.
+#%but are not yet documented in the man page.
+#%They came in with SVr4's printer support.
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 3c0444f81..4d61364df 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2002-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.18 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps.hpux11,v 1.19 2023/10/14 21:50:28 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -158,32 +158,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
@@ -287,8 +289,8 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.ad
 #%
 #%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.
+#%but are not yet documented in the man page.
+#%They came in with SVr4's printer support.
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.keys b/include/Caps.keys
index 09d7a472d..f3e6dc3bd 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.17 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps.keys,v 1.18 2023/10/14 21:48:29 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -160,32 +160,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
@@ -287,8 +289,8 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.ad
 #%
 #%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.
+#%but are not yet documented in the man page.
+#%They came in with SVr4's printer support.
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index beb71c342..30e350a24 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2002-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.16 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps.osf1r5,v 1.17 2023/10/14 21:48:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -158,32 +158,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
diff --git a/include/Caps.uwin b/include/Caps.uwin
index af47de9cc..59332c4e6 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.15 2021/10/08 07:55:48 tom Exp $
+# $Id: Caps.uwin,v 1.16 2023/10/14 21:48:58 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -158,32 +158,34 @@
 # STANDARD CAPABILITIES
 #
 #%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.  In each
-#%line of the table,
-#%
+#%terminfo description block and available to terminfo-using code.
+#%In each line of the table,
+#%.bP
 #%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
 #%accesses the capability.
-#%
-#%The \fBcapname\fR is the short name used in the text of the database,
+#%.bP
+#%The \fBcapname\fR (\fICap-name\fP)
+#%is the short name used in the text of the database,
 #%and is used by a person updating the database.
+#%.IP
 #%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 specification.
-#%
-#%The termcap code is the old
-#%.B termcap
-#%capability name (some capabilities are new, and have names which termcap
-#%did not originate).
-#%.P
+#%identical or very similar names).
+#%Semantics are also intended to match those of the specification.
+#%.IP
 #%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
 #%.B Caps
 #%to line up nicely.
-#%
-#%Finally, the description field attempts to convey the semantics of the
-#%capability.  You may find some codes in the description field:
+#%.bP
+#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
+#%(some capabilities are new, and have names which termcap did not originate).
+#%.bP
+#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
+#%capability.
+#%.PP
+#%You may find some codes in the description field:
 #%.TP
 #%(P)
 #%indicates that padding may be specified
@@ -279,8 +281,8 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.ad
 #%
 #%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.
+#%but are not yet documented in the man page.
+#%They came in with SVr4's printer support.
 #%
 #%.na
 #%
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 5c9dbd46e..819c75c35 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.51 2023/10/07 21:19:07 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.52 2023/10/14 19:25:26 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -84,6 +84,8 @@ You can use other \fB\%@TIC@\fP options such as
 .BR \-w ,
 and
 .BR \-x .
+The \fB\-V\fP option reports the version of \fIncurses\fP associated
+with this program and exits with a successful status.
 .SS "Translations from nonstandard capabilities"
 \fB\%@CAPTOINFO@\fP translates some obsolete,
 nonstandard capabilities into standard (SVr4/XSI Curses) \fIterminfo\fP
@@ -222,7 +224,7 @@ NetBSD does not provide this application.
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
-Thomas E. Dickey <dickey@invisible-island.net>
+Thomas E. Dickey <dickey@invisible\-island.net>
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TIC@\fP(1M),
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 70dabf1b5..cc70ddbe6 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.85 2023/10/07 21:19:07 tom Exp $
-.TH curs_color 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.86 2023/10/14 19:19:11 tom Exp $
+.TH curs_color 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -83,7 +83,7 @@ manipulate terminal colors with \fIcurses\fR
 \fBint extended_color_content(int \fIcolor\fP, int *\fIr\fP, int *\fIg\fP, int *\fIb\fP);
 \fBint extended_pair_content(int \fIpair\fP, int *\fIf\fP, int *\fIb\fP);
 .PP
-\fI/* extensions */
+\fI/* extension */
 \fBvoid reset_color_pairs(void);
 .PP
 \fBint COLOR_PAIR(int \fIn\fP);
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index b563a176d..3ff80107b 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
-.TH curs_kernel 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.49 2023/10/14 22:03:52 tom Exp $
+.TH curs_kernel 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,6 +167,9 @@ the previous \fIcursor\fP state is returned;
 otherwise, \fBERR\fP is returned.
 .SS napms
 The \fBnapms\fP routine is used to sleep for \fIms\fP milliseconds.
+If the value of \fIms\fP exceeds 30,000
+(thirty seconds),
+it is capped at that value.
 .SH RETURN VALUE
 Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
 .PP
@@ -209,6 +212,10 @@ The SVr4 documentation describes \fBsetsyx\fP and \fBgetsyx\fP
 as having return type int.
 This is misleading, as they are macros with no documented semantics
 for the return value.
+.PP
+If interrupted, ncurses restarts \fBnapms\fP.
+That, and the limitation to 30 seconds,
+are different from other implementations.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 61f99b3da..95129c28a 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.79 2023/10/07 21:19:07 tom Exp $
-.TH curs_mouse 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.80 2023/10/14 20:00:10 tom Exp $
+.TH curs_mouse 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -382,28 +382,31 @@ For example, in xterm,
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
 .SH BUGS
-Mouse events under xterm will not in fact be ignored during cooked mode,
-if they have been enabled by \fB\%mousemask\fP.
-Instead, the xterm mouse
-report sequence will appear in the string read.
+Mouse events from \fI\%xterm\fP are \fInot\fP ignored in cooked mode if
+they have been enabled by \fB\%mousemask\fP.
+Instead,
+the \fI\%xterm\fP mouse report sequence appears in the string read.
 .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 \fB\%kmous\fP set to \*(``\eE[M\*(''
-(the beginning of the response from xterm for mouse clicks).
-Other values for \fB\%kmous\fP are permitted,
-but under the same assumption,
-i.e., it is the beginning of the response.
+Mouse event reports from \fI\%xterm\fP are not detected correctly in
+a window with keypad application mode disabled,
+since they are interpreted as a variety of function key.
+Set the the terminal's \fI\%terminfo\fP capability \fB\%kmous\fP to
+\*(``\eE[M\*(''
+(the beginning of the response from \fI\%xterm\fP for mouse clicks).
+Other values of \fB\%kmous\fP are permitted under the same assumption,
+that is,
+the report begins with that sequence.
 .PP
-Because there are no standard terminal responses that would serve to identify
-terminals which support the xterm mouse protocol, \fIncurses\fP assumes that
-if \fB\%kmous\fP is defined in the terminal description,
-or if the terminal description's primary name or aliases
-contain the string \*(``xterm\*('',
+Because there are no standard response sequences that serve to identify
+terminals supporting the \fI\%xterm\fP mouse protocol,
+\fI\%ncurses\fP assumes that if \fB\%kmous\fP is defined in the terminal
+description,
+or if the terminal type's primary name or aliases contain the string
+\%\*(``xterm\*('',
 then the terminal may send mouse events.
 The \fB\%kmous\fP capability is checked first,
-allowing the use of newer xterm mouse protocols
-such as xterm's private mode 1006.
+allowing use of newer \fI\%xterm\fP mouse protocols such as its private
+mode 1006.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inopts\fP(3X),
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 72c15a80a..9225bb99b 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH curs_print 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.33 2023/10/14 19:26:28 tom Exp $
+.TH curs_print 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
@@ -71,7 +71,9 @@ in SVr4 \fIcurses\fP, 4.4BSD \fIcurses\fP, or any other previous version of \fIc
 It is recommended that any code depending on \fIncurses\fP extensions
 be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH BUGS
-Padding in the \fBmc5p\fP, \fBmc4\fP and \fBmc5\fP capabilities will not be
-interpreted.
+Padding in the
+\fBmc5p\fP,
+\fBmc4\fP, and
+\fBmc5\fP capabilities is not interpreted.
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 193cff67f..22c9f41e1 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.41 2023/10/07 21:33:35 tom Exp $
-.TH curs_sp_funcs 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.42 2023/10/14 19:51:44 tom Exp $
+.TH curs_sp_funcs 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -202,7 +202,7 @@
 .PP
 \fBint tigetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
 \fBchar* tigetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
-\fI/* may instead use 9 long parameters */
+\fI/* tparm_sp may use 9 long parameters rather than being variadic */
 \fBchar* tparm_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, ...);
 \fBint tputs_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
 .PP
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 4d7fd6a94..0c0a16839 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.69 2023/10/07 21:19:07 tom Exp $
-.TH curs_termcap 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.70 2023/10/14 19:26:28 tom Exp $
+.TH curs_termcap 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -242,39 +242,6 @@ A call to \fBtgoto\fP using a capability with string parameters is an error.
 .bP
 A call to \fBtgoto\fP using a capability with more than two parameters
 is an error.
-.SH BUGS
-If you call \fBtgetstr\fP to fetch \fBca\fP or any other parameterized string,
-be aware that it will be returned in terminfo notation, not the older and
-not-quite-compatible termcap notation.
-This will not cause problems if all
-you do with it is call \fBtgoto\fP or \fBtparm\fP, which both expand
-terminfo-style strings as terminfo.
-(The \fBtgoto\fP function, if configured to support termcap, will check
-if the string is indeed terminfo-style by looking for "%p" parameters or
-"$<..>" delays, and invoke a termcap-style parser if the string does not
-appear to be terminfo).
-.PP
-Because terminfo conventions for representing padding in string capabilities
-differ from termcap's,
-users can be surprised:
-.bP
-\fBtputs("50")\fP in a terminfo system will put out a literal \*(``50\*(''
-rather than busy-waiting for 50 milliseconds.
-.bP
-However, if ncurses is configured to support termcap,
-it may also have been configured to support the BSD-style padding.
-.IP
-In that case, \fBtputs\fP inspects strings passed to it,
-looking for digits at the beginning of the string.
-.IP
-\fBtputs("50")\fP in a termcap system may wait for 50 milliseconds
-rather than put out a literal \*(``50\*(''
-.PP
-Note that termcap has nothing analogous to terminfo's \fBsgr\fP string.
-One consequence of this is that termcap applications assume \fBme\fP
-(terminfo \fBsgr0\fP) does not reset the alternate character set.
-This implementation checks for, and modifies the data shown to the
-termcap interface to accommodate termcap's limitation in this respect.
 .SH PORTABILITY
 .SS Standards
 These functions are provided for supporting legacy applications,
@@ -376,10 +343,53 @@ Later (in mid-1996) the \fBtparam\fP function was removed from ncurses.
 As a result, there are differences between any of the four implementations,
 which must be taken into account by programs which can work with all
 termcap library interfaces.
+.SH BUGS
+If you call \fB\%tgetstr\fP to fetch \fB\%ca\fP or any other
+parameterized string capability,
+be aware that it is returned in \fI\%terminfo\fP notation,
+not the older and not-quite-compatible \fI\%termcap\fP notation.
+This does not cause problems if all you do with it is call \fB\%tgoto\fP
+or \fB\%tparm\fP, which both expand
+\fI\%terminfo\fP-style strings as \fI\%terminfo\fP does.
+(The \fB\%tgoto\fP function,
+if configured to support \fI\%termcap,\fP
+checks if the string is indeed \fI\%terminfo\fP-style by looking for
+\*(``\fB%p\fP\*('' parameters or \*(``\fB<\fP.\|.\|.\fB>\fP\*('' delays,
+and invokes a \fI\%termcap\fP-style parser if the string appears not to
+use \fI\%terminfo\fP syntax.)
+.PP
+Because \fI\%terminfo\fP's syntax for padding in string capabilities
+differs from \fI\%termcap\fP's,
+users can be surprised.
+.IP \(bu 4
+\fB\%tputs("50")\fP in a \fI\%terminfo\fP system transmits \*(``50\*(''
+rather than busy-waiting for 50 milliseconds.
+.IP \(bu 4
+However,
+if \fI\%ncurses\fP is configured to support \fI\%termcap\fP,
+it may also have been configured to support BSD-style padding.
+.IP
+In that case,
+\fB\%tputs\fP inspects strings passed to it,
+looking for digits at the beginning of the string.
+.IP
+\fB\%tputs("50")\fP in a \fI\%termcap\fP system may busy-wait for 50
+milliseconds rather than transmitting \*(``50\*(''.
+.PP
+\fI\%termcap\fP has nothing analogous to \fI\%terminfo\fP's \fBsgr\fP
+string.
+One consequence is that \fI\%termcap\fP applications assume that
+\fBme\fP
+(equivalent to \fI\%terminfo\fP's \fBsgr0\fP capability)
+does not reset the alternate character set.
+\fI\%ncurses\fP checks for,
+and modifies the data shared with,
+the \fI\%termcap\fP interface to accommodate the latter's limitation in
+this respect.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%putc\fP(3),
 \fB\%term_variables\fP(3X),
 \fB\%terminfo\fP(\*n)
 .PP
-https://invisible-island.net/ncurses/tctest.html
+https://invisible\-island.net/ncurses/tctest.html
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 0ef5a4956..df8598834 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.112 2023/10/07 21:19:07 tom Exp $
-.TH curs_terminfo 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.114 2023/10/14 22:35:16 tom Exp $
+.TH curs_terminfo 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -314,11 +314,17 @@ The extension \fBtiscan_s\fP allows the application
 to inspect a formatting capability to see what the curses library would assume.
 .\" ***************************************************************************
 .SS Output Functions
-The \fBtputs\fP routine applies padding information
-(i.e., by interpreting marker embedded in the terminfo capability
-such as \*(``$<5>\*('' as 5 milliseconds)
-to the string
-\fIstr\fP and outputs it:
+String capabilities can contain padding information,
+a time delay
+(accommodating performance limitations of hardware terminals)
+expressed as \fB$<\fIn\fB>\fR,
+where \fIn\fP is a nonnegative integral count of milliseconds.
+If \fIn\fP exceeds 30,000
+(thirty seconds),
+it is capped at that value.
+.PP
+The \fBtputs\fP routine interprets time-delay information in the string
+\fIstr\fP and outputs it, executing the delays:
 .bP
 The \fIstr\fP parameter must be a terminfo string
 variable or the return value from
@@ -333,6 +339,10 @@ not applicable.
 .bP
 \fIputc\fP is a \fBputchar\fP-like routine to which
 the characters are passed, one at a time.
+.IP
+If \fBtputs\fP processes a time-delay,
+it uses the \fBdelay_output\fP(3X) function,
+routing any resulting padding characters through this function.
 .PP
 The \fBputp\fR routine calls \fBtputs(\fIstr\fB, 1, putchar)\fR.
 The output of \fBputp\fP always goes to \fBstdout\fP, rather than
diff --git a/man/curs_util.3x b/man/curs_util.3x
index dfa78951e..90ffab5b7 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.86 2023/10/07 21:19:07 tom Exp $
-.TH curs_util 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.88 2023/10/14 22:26:23 tom Exp $
+.TH curs_util 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -259,10 +259,21 @@ they will not be colored when the window is refreshed.
 .SS delay_output
 The \fBdelay_output\fP routine inserts an \fIms\fP millisecond pause
 in output.
-This routine should not be used extensively because
-padding characters are used rather than a CPU pause.
-If no padding character is specified,
-this uses \fBnapms\fP to perform the delay.
+Employ this function judiciously when terminal output uses padding,
+because \fIncurses\fP transmits null characters
+(consuming CPU and I/O resources)
+instead of sleeping and requesting resumption from the operating system.
+Padding is used unless:
+.bP
+the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability, or
+.bP
+the environment variable \fB\%NCURSES_NO_PADDING\fP is set.
+.PP
+If padding is not in use,
+\fIncurses\fP uses \fBnapms\fP to perform the delay.
+If the value of \fIms\fP exceeds 30,000
+(thirty seconds),
+it is capped at that value.
 .SS flushinp
 The \fBflushinp\fP routine throws away any typeahead that has been typed by the
 user and has not yet been read by the program.
@@ -289,6 +300,17 @@ The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
 terms.
 The description here is adapted from the XSI Curses standard (which
 erroneously fails to describe the disabling of \fBcuu\fP).
+.SS delay_output padding
+The limitation to 30 seconds
+and the use of \fBnapms\fP
+differ from other implementations.
+.bP
+SVr4 curses does not delay if no padding character is available.
+.bP
+NetBSD curses uses \fBnapms\fP when no padding character is available,
+but does not take timing into account when using the padding character.
+.PP
+Neither limits the delay.
 .SS keyname
 The \fBkeyname\fP function may return the names of user-defined
 string capabilities which are defined in the terminfo entry via the \fB\-x\fP
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 39cbddf12..b5262b854 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_window 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.41 2023/10/14 19:27:01 tom Exp $
+.TH curs_window 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -127,6 +127,7 @@ with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
 The window is at position (\fIbegin\fR_\fIy\fP,
 \fIbegin\fR_\fIx\fP) on the screen.
 The subwindow shares memory with the window \fIorig\fP,
+its \fIancestor\fP,
 so that changes made to one window
 will affect both windows.
 When using this routine, it is necessary to call
@@ -220,18 +221,6 @@ If many small changes are made to the window, the \fBwsyncup\fP option could
 degrade performance.
 .PP
 Note that \fBsyncok\fP may be a macro.
-.SH BUGS
-The subwindow functions (\fBsubwin\fP, \fBderwin\fP, \fBmvderwin\fP,
-\fBwsyncup\fP, \fBwsyncdown\fP, \fBwcursyncup\fP, \fBsyncok\fP) are flaky,
-incompletely implemented, and not well tested.
-.PP
-The System V curses documentation is very unclear about what \fBwsyncup\fP
-and \fBwsyncdown\fP actually do.
-It seems to imply that they are only
-supposed to touch exactly those lines that are affected by ancestor changes.
-The language here, and the behavior of the \fBcurses\fP implementation,
-is patterned on the XPG4 curses standard.
-The weaker XPG4 spec may result in slower updates.
 .SH PORTABILITY
 The XSI Curses standard, Issue 4 describes these functions.
 .PP
@@ -252,6 +241,28 @@ to ensure that a window has no subwindows before allowing deletion.
 NetBSD copied this feature of ncurses in 2003.
 .br
 PDCurses follows the scheme used in Solaris X/Open curses.
+.SH BUGS
+The subwindow functions
+\fB\%subwin\fP,
+\fB\%derwin\fP,
+\fB\%mvderwin\fP,
+\fB\%wsyncup\fP,
+\fB\%wsyncdown\fP,
+\fB\%wcursyncup\fP,
+and
+\fB\%syncok\fP
+are flaky,
+incompletely implemented,
+and not well tested.
+.PP
+System\ V's \fIcurses\fP documentation is unclear about what
+\fB\%wsyncup\fP and \fB\%wsyncdown\fP actually do.
+It seems to imply that they are supposed to touch only those lines that
+are affected by changes to a window's ancestors.
+The language here,
+and behavior of \fI\%ncurses\fP,
+is patterned on the X/Open Curses standard;
+this approach may result in slower updates.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 5aeab4093..cc99150da 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.96 2023/10/07 21:19:07 tom Exp $
-.TH @INFOCMP@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.97 2023/10/14 19:26:28 tom Exp $
+.TH @INFOCMP@ 1M 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -567,9 +567,9 @@ print information for user-defined capabilities (see \fBuser_caps(\*n)\fP.
 These are extensions to the terminfo repertoire which can be loaded
 using the \fB\-x\fP option of \fB@TIC@\fP.
 .SH FILES
-.TP 20
-\*d
-Compiled terminal description database.
+.TP
+.I \*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.
@@ -631,13 +631,14 @@ is System V Release 4's.
 Actual BSD curses versions will have a more restricted set.
 To see only the
 4.4BSD set, use \fB\-r\fP \fB\-RBSD\fP.
-.SH BUGS
-The \fB\-F\fP option of \fB@INFOCMP@\fP(1M) should be a \fB@TOE@\fP(1M) mode.
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
-Thomas E. Dickey <dickey@invisible-island.net>
+Thomas E. Dickey <dickey@invisible\-island.net>
+.SH BUGS
+The \fB\-F\fP option of \fB\%@INFOCMP@\fP(1M) should be a
+\fB\%@TOE@\fP(1M) mode.
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
 \fB\%@INFOTOCAP@\fP(1M),
@@ -647,4 +648,4 @@ Thomas E. Dickey <dickey@invisible-island.net>
 \fB\%terminfo\fP(\*n),
 \fB\%user_caps\fP(\*n)
 .PP
-https://invisible-island.net/ncurses/tctest.html
+https://invisible\-island.net/ncurses/tctest.html
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 3e96cfb36..f2c006cb8 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.34 2023/10/07 21:19:07 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.35 2023/10/14 19:25:26 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -78,7 +78,7 @@ The \fB\-V\fP option reports the version of \fIncurses\fP associated
 with this program and exits with a successful status.
 .SH FILES
 .TP
-\fI\*d\fP
+.I \*d
 compiled terminal description database
 .SH PORTABILITY
 None of X/Open Curses, Issue 7 (2009),
@@ -88,7 +88,7 @@ or NetBSD document this application.
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
-Thomas E. Dickey <dickey@invisible-island.net>
+Thomas E. Dickey <dickey@invisible\-island.net>
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TIC@\fP(1M),
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 38e399938..2cbb67329 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.26 2023/09/30 22:12:35 tom Exp $
+# $Id: manhtml.aliases,v 1.27 2023/10/14 22:36:19 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -38,6 +38,7 @@ clearok(3X)		curs_outopts(3X)
 curs_set(3X)		curs_kernel(3X)
 def_prog_mode(3X)	curs_kernel(3X)
 def_shell_mode(3X)	curs_kernel(3X)
+delay_output(3X)	curs_util(3X)
 delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 endwin(3X)		curs_initscr(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 170b50c88..d6911f36a 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.178 2023/10/07 22:17:08 tom Exp $
-.TH ncurses 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.179 2023/10/14 19:29:06 tom Exp $
+.TH ncurses 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -138,8 +138,8 @@ Before a \fBcurses\fP program is run, the tab stops of the terminal
 should be set and its initialization strings, if defined, must be output.
 This can be done by executing the \fB@TPUT@ init\fP command
 after the shell environment variable \fBTERM\fP has been exported.
-\fB@TSET@(1)\fP is usually responsible for doing this.
-[See \fBterminfo\fP(\*n) for further details.]
+(The BSD-style \fB\%@TSET@\fP(1) utility also performs this function.)
+See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(\*n).
 .SS Datatypes
 The \fBncurses\fP library permits manipulation of data structures,
 called \fIwindows\fP, which can be thought of as two-dimensional
@@ -1368,10 +1368,11 @@ Configure scripts should check for the function's existence rather
 than assuming it is always in the debug library.
 .SH FILES
 .TP 5
-@DATADIR@/tabset
-directory containing initialization files for the terminal capability database
-@TERMINFO@
-terminal capability database
+.I @DATADIR@/tabset
+tab stop initialization database
+.TP
+.I \*d
+compiled terminal capability database
 .SH EXTENSIONS
 The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
 that falls back to the old-style /etc/termcap file if the terminal setup code
diff --git a/man/panel.3x b/man/panel.3x
index c77d2ab5d..57a577461 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.56 2023/10/07 21:19:07 tom Exp $
-.TH panel 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.57 2023/10/14 19:20:40 tom Exp $
+.TH panel 3X 2023-10-14 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -250,12 +250,6 @@ they are no longer the same as Tucker's implementation.
 NetBSD 8 (2018)
 has a panel library begun by Valery Ushakov in 2015.
 This is based on the AT&T documentation.
-.SH FILES
-panel.h
-interface for the panels library
-.P
-libpanel.a
-the panels library itself
 .SH AUTHOR
 Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,
 primarily to assist in porting \fIu386mon\fP to systems without a native
diff --git a/man/tabs.1 b/man/tabs.1
index 86fc74fcb..f2ce065f3 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.47 2023/10/07 21:19:07 tom Exp $
-.TH @TABS@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.48 2023/10/14 19:29:06 tom Exp $
+.TH @TABS@ 1 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -217,6 +217,10 @@ on moving the cursor before the current left-margin.
 .PP
 When setting or resetting the left-margin,
 @TABS@ may reset the right-margin.
+.SH FILES
+.TP
+.I @DATADIR@/tabset
+tab stop initialization database
 .SH PORTABILITY
 \fIIEEE Std 1003.1/The Open Group Base Specifications Issue 7\fP (POSIX.1-2008)
 describes a \fBtabs\fP utility.
diff --git a/man/term.5 b/man/term.5
index b06c346fd..7029e96f7 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,11 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.59 2023/10/07 21:19:07 tom Exp $
-.TH term 5 2023-10-07 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.60 2023/10/14 19:18:14 tom Exp $
+.TH term 5 2023-10-14 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds '  \(aq
 .ds ^  \(ha
 .\}
 .el \{\
@@ -39,6 +40,7 @@
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       '  '
 .ds       ^  ^
 .\}
 .
@@ -361,8 +363,8 @@ lp-1f(\*(CW).
 0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
 0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
 0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
-0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
-0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
+0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.\*'...
+0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..\-.....
 0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
 0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
 0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
@@ -396,7 +398,9 @@ Compiled entries are limited to 32768 bytes because offsets into the
 The legacy format could have supported 32768-byte entries,
 but was limited a virtual memory page's 4096 bytes.
 .SH FILES
-\*d/*/* compiled terminal capability database
+.TP
+.I \*d
+compiled terminal description database
 .SH AUTHORS
 Thomas E. Dickey
 .br
diff --git a/man/term.7 b/man/term.7
index f2ffb878c..963368bb2 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.39 2023/10/07 21:19:07 tom Exp $
-.TH term 7 2023-10-07 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.40 2023/10/14 19:18:14 tom Exp $
+.TH term 7 2023-10-14 "ncurses 6.4" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -220,8 +220,8 @@ For maximum compatibility with older System V UNIXes, names and aliases
 should be unique within the first 14 characters.
 .SH FILES
 .TP 5
-\*d/?/*
-compiled terminal capability database
+.I \*d
+compiled terminal description database
 .TP 5
 /etc/inittab
 tty line initialization (AT&T-like UNIXes)
diff --git a/man/terminfo.head b/man/terminfo.head
index 7efe7f746..61dda6966 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,24 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.52 2023/10/07 21:19:07 tom Exp $
-.TH terminfo 5 2023-10-07 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.53 2023/10/14 19:53:57 tom Exp $
+.TH terminfo 5 2023-10-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds '  \(aq
+.ds ^  \(ha
+.ds ~  \(ti
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       '  '
+.ds       ^  ^
+.ds       ~  ~
 .\}
-.ie \n(.g .ds ' \(aq
-.el       .ds ' '
-.ie \n(.g .ds ^ \(ha
-.el       .ds ^ ^
-.ie \n(.g .ds ~ \(ti
-.el       .ds ~ ~
 .
 .de bP
 .ie n  .IP \(bu 4
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 3da551078..e420275a2 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.133 2023/10/07 20:53:54 tom Exp $
+.\" $Id: terminfo.tail,v 1.134 2023/10/14 19:18:14 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -2080,9 +2080,9 @@ of incompatible string table extensions.
 \fBOSF\fP \-\-
 Supports both the SVr4 set and the AIX extensions.
 .SH FILES
-.TP 25
-\*d/?/*
-files containing terminal descriptions
+.TP
+.I \*d
+compiled terminal description database directory
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
diff --git a/man/tic.1m b/man/tic.1m
index d76cf33c9..63ca64be4 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.97 2023/10/07 21:19:07 tom Exp $
-.TH @TIC@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.98 2023/10/14 19:25:26 tom Exp $
+.TH @TIC@ 1M 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -594,14 +594,14 @@ The SVr4 \fB\-c\fP mode does not report bad \*(``use=\*('' links.
 System V does not compile entries to or read entries from your
 \fI$HOME/.terminfo\fP database unless TERMINFO is explicitly set to it.
 .SH FILES
-.TP 5
-\fB\*d/?/*\fP
-Compiled terminal description database.
+.TP
+.I \*d
+compiled terminal description database
 .SH AUTHOR
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
-Thomas E. Dickey <dickey@invisible-island.net>
+Thomas E. Dickey <dickey@invisible\-island.net>
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
 \fB\%@INFOCMP@\fP(1M),
diff --git a/man/toe.1m b/man/toe.1m
index 132146b9b..096e81dbe 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.52 2023/10/07 21:19:07 tom Exp $
-.TH @TOE@ 1M 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.53 2023/10/14 19:18:14 tom Exp $
+.TH @TOE@ 1M 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -105,7 +105,7 @@ sorts the output by the entry names.
 lists terminal type dependencies in \fIfile\fP,
 a \fIterminfo\fP entry source or \fItermcap\fP database file.
 The report summarizes the \*(``\fBuse\fP\*('' (\fIterminfo\fP) and
-\*(``\fBtc\fP\*('' (\fItermcap\fP) relations:
+\fBtc\fP (\fItermcap\fP) relations:
 each line comprises the primary name of a terminal type employing
 \fBuse\fP/\fBtc\fP capabilities,
 a colon,
@@ -117,7 +117,7 @@ and a newline.
 lists terminal type reverse dependencies in \fIfile\fP,
 a \fIterminfo\fP entry source or \fItermcap\fP database file.
 The report summarizes the \*(``\fBuse\fP\*('' (\fIterminfo\fP) and
-\*(``\fBtc\fP\*('' (\fItermcap\fP) reverse relations:
+\fBtc\fP (\fItermcap\fP) reverse relations:
 each line comprises the primary name of a terminal type occurring in
 \fBuse\fP/\fBtc\fP capabilities,
 a colon,
@@ -201,7 +201,7 @@ l.
 .RE
 .SH FILES
 .TP
-\fI\*d\fP
+.I \*d
 compiled terminal description database
 .SH HISTORY
 \fB\%@TOE@\fP is not provided by other implementations.
diff --git a/man/tput.1 b/man/tput.1
index 2ea0471af..03cdabda5 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.86 2023/10/07 21:19:07 tom Exp $
-.TH @TPUT@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.87 2023/10/14 19:29:06 tom Exp $
+.TH @TPUT@ 1 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -369,16 +369,11 @@ and turns on bold (extra bright) mode.
 The list is terminated by an exclamation mark (\fB!\fP) on a line by itself.
 .SH FILES
 .TP
-\fB\*d\fP
-compiled terminal description database
+.I @DATADIR@/tabset
+tab stop initialization database
 .TP
-\fB@DATADIR@/tabset/*\fP
-tab settings for some terminals, in a format
-appropriate to be output to the terminal (escape
-sequences that set margins and tabs); for more
-information, see the
-.IR "Tabs and Initialization" ,
-section of \fBterminfo\fP(5)
+.I \*d
+compiled terminal description database
 .SH EXIT CODES
 If the \fB\-S\fP option is used,
 \fB@TPUT@\fP checks for errors from each line,
diff --git a/man/tset.1 b/man/tset.1
index 877f0a8a0..415e625ae 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.72 2023/10/07 21:19:07 tom Exp $
-.TH @TSET@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.73 2023/10/14 19:24:28 tom Exp $
+.TH @TSET@ 1 2023-10-14 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,6 +46,8 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
+.ds d @TERMINFO@
 .SH NAME
 \fB\%@TSET@\fP,
 \fB\%@RESET@\fP \-
@@ -295,7 +297,7 @@ any exclamation marks (\*(``!\*('').
 .SH HISTORY
 A \fBreset\fP command appeared in 1BSD (March 1978), written by Kurt Shoens.
 This program set the \fIerase\fP and \fIkill\fP characters
-to \fB^H\fP (backspace) and \fB@\fP respectively.
+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.
@@ -428,8 +430,8 @@ for the terminal description.
 /etc/ttys
 system port name to terminal type mapping database (BSD versions only).
 .TP
-@TERMINFO@
-terminal capability database
+.I \*d
+compiled terminal description database directory
 .SH SEE ALSO
 \fB\%csh\fP(1),
 \fB\%sh\fP(1),
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index f5f2e1266..07ddd5a10 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231007) unstable; urgency=low
+ncurses6 (6.4+20231014) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index f5f2e1266..07ddd5a10 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231007) unstable; urgency=low
+ncurses6 (6.4+20231014) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ed5109ef1..bf3547444 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231007) unstable; urgency=low
+ncurses6 (6.4+20231014) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Oct 2023 06:05:48 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 30dd4299b..ee748d2bb 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.610 2023/10/07 10:05:48 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.611 2023/10/14 09:55:54 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1007"
+!define VERSION_MMDD  "1014"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 8531ed6e1..a2f12893c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231007
+Release: 20231014
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 282ffb541..29af48575 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231007
+Release: 20231014
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 36dbc11b1..de5d939a3 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231007
+Release: 20231014
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 440d99fe7..3df14cd55 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.215 2023/04/15 20:01:23 tom Exp $
+dnl $Id: aclocal.m4,v 1.216 2023/09/06 22:55:27 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -2182,7 +2182,7 @@ AC_DEFUN([CF_INHERIT_SCRIPT],
 test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30
 dnl ---------------
 dnl prompt for/fill-in useful install-program options
 AC_DEFUN([CF_INSTALL_OPTS],
@@ -2190,6 +2190,7 @@ AC_DEFUN([CF_INSTALL_OPTS],
 CF_INSTALL_OPT_S
 CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
+CF_INSTALL_OPT_STRIP_PROG
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42
@@ -2276,6 +2277,72 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30
+dnl -------------------------
+dnl Provide an option for overriding the strip program used in install "-s"
+dnl
+dnl coreutils install provides a --strip-program option
+dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use
+dnl STRIP environment variable.  Other versions of install do not support this.
+AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG],
+[
+AC_REQUIRE([CF_INSTALL_OPT_S])
+if test -n "$INSTALL_OPT_S"
+then
+	AC_MSG_CHECKING(if you want to specify strip-program)
+	AC_ARG_WITH(strip-program,
+		[  --with-strip-program=XX specify program to use when stripping in install],
+		[with_strip_program=$withval],
+		[with_strip_program=no])
+	AC_MSG_RESULT($with_strip_program)
+	if test "$with_strip_program" != no
+	then
+		AC_MSG_CHECKING(if strip-program is supported with this installer)
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		AC_MSG_RESULT($check_install_strip)
+		case "$check_install_strip" in
+		(no)
+			AC_MSG_WARN($cf_install_program does not support strip program option)
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "[$]@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			CF_VERBOSE(created $INSTALL)
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
@@ -4381,7 +4448,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4441,7 +4508,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
diff --git a/test/configure b/test/configure
index 3b1d258e9..8540ac478 100755
--- a/test/configure
+++ b/test/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230114.
+# Generated by Autoconf 2.52.20230903.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -705,6 +705,7 @@ Optional Packages:
 
 General Options:
   --disable-stripping     do not strip (debug info) installed executables
+  --with-strip-program=XX specify program to use when stripping in install
   --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics
   --enable-string-hacks   work around bogus compiler/loader warnings
   --with-pkg-config{=path} enable/disable use of pkg-config
@@ -808,7 +809,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230114.  Invocation command line was
+generated by GNU Autoconf 2.52.20230903.  Invocation command line was
 
   $ $0 $@
 
@@ -932,7 +933,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:935: loading site script $ac_site_file" >&5
+    { echo "$as_me:936: 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"
@@ -943,7 +944,7 @@ if test -r "$cache_file"; then
   # 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:946: loading cache $cache_file" >&5
+    { echo "$as_me:947: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -951,7 +952,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:954: creating cache $cache_file" >&5
+  { echo "$as_me:955: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -967,21 +968,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:970: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:971: 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:974: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:975: 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:980: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:981: 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:982:   former value:  $ac_old_val" >&5
+        { echo "$as_me:983:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:984:   current value: $ac_new_val" >&5
+        { echo "$as_me:985:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1000,9 +1001,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1003: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1004: 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:1005: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1006: 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
@@ -1031,10 +1032,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1034: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1037: \$? = $ac_status" >&5
+  echo "$as_me:1038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1066,7 +1067,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1069: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1070: 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
@@ -1076,11 +1077,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1079: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1083: checking build system type" >&5
+echo "$as_me:1084: 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
@@ -1089,16 +1090,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1092: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1093: 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:1096: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1097: 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:1101: result: $ac_cv_build" >&5
+echo "$as_me:1102: 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/'`
@@ -1106,7 +1107,7 @@ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1109: checking host system type" >&5
+	echo "$as_me:1110: 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
@@ -1115,12 +1116,12 @@ else
 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:1118: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1119: 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:1123: result: $ac_cv_host" >&5
+echo "$as_me:1124: 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/'`
@@ -1146,13 +1147,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1149: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1150: 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:1153: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1154: 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:1155: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1156: 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
@@ -1170,7 +1171,7 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-echo "$as_me:1173: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1174: 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
@@ -1190,11 +1191,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1193: result: yes" >&5
+  echo "$as_me:1194: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1197: result: no" >&5
+  echo "$as_me:1198: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1208,7 +1209,7 @@ ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1211: checking for $ac_word" >&5
+echo "$as_me:1212: 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
@@ -1223,7 +1224,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1226: found $ac_dir/$ac_word" >&5
+echo "$as_me:1227: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1231,10 +1232,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1234: result: $CC" >&5
+  echo "$as_me:1235: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1237: result: no" >&5
+  echo "$as_me:1238: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1243,7 +1244,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1246: checking for $ac_word" >&5
+echo "$as_me:1247: 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
@@ -1258,7 +1259,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1261: found $ac_dir/$ac_word" >&5
+echo "$as_me:1262: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1266,10 +1267,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1269: result: $ac_ct_CC" >&5
+  echo "$as_me:1270: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1272: result: no" >&5
+  echo "$as_me:1273: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1282,7 +1283,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1285: checking for $ac_word" >&5
+echo "$as_me:1286: 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
@@ -1297,7 +1298,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1300: found $ac_dir/$ac_word" >&5
+echo "$as_me:1301: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1305,10 +1306,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1308: result: $CC" >&5
+  echo "$as_me:1309: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1311: result: no" >&5
+  echo "$as_me:1312: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1317,7 +1318,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1320: checking for $ac_word" >&5
+echo "$as_me:1321: 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
@@ -1332,7 +1333,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1335: found $ac_dir/$ac_word" >&5
+echo "$as_me:1336: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1340,10 +1341,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1343: result: $ac_ct_CC" >&5
+  echo "$as_me:1344: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1346: result: no" >&5
+  echo "$as_me:1347: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1356,7 +1357,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1359: checking for $ac_word" >&5
+echo "$as_me:1360: 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
@@ -1376,7 +1377,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1379: found $ac_dir/$ac_word" >&5
+echo "$as_me:1380: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1398,10 +1399,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1401: result: $CC" >&5
+  echo "$as_me:1402: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1404: result: no" >&5
+  echo "$as_me:1405: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1412,7 +1413,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1415: checking for $ac_word" >&5
+echo "$as_me:1416: 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
@@ -1427,7 +1428,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1430: found $ac_dir/$ac_word" >&5
+echo "$as_me:1431: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1435,10 +1436,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1438: result: $CC" >&5
+  echo "$as_me:1439: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1441: result: no" >&5
+  echo "$as_me:1442: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1451,7 +1452,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1454: checking for $ac_word" >&5
+echo "$as_me:1455: 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
@@ -1466,7 +1467,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1469: found $ac_dir/$ac_word" >&5
+echo "$as_me:1470: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1474,10 +1475,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1477: result: $ac_ct_CC" >&5
+  echo "$as_me:1478: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1480: result: no" >&5
+  echo "$as_me:1481: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1489,32 +1490,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1492: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1493: 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:1497:" \
+echo "$as_me:1498:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1500: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1501: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1503: \$? = $ac_status" >&5
+  echo "$as_me:1504: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1505: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1506: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1508: \$? = $ac_status" >&5
+  echo "$as_me:1509: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1510: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1511: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1513: \$? = $ac_status" >&5
+  echo "$as_me:1514: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1517 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 
 int
@@ -1530,13 +1531,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1533: checking for C compiler default output" >&5
+echo "$as_me:1534: 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:1536: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1537: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1539: \$? = $ac_status" >&5
+  echo "$as_me:1540: \$? = $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
@@ -1559,34 +1560,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1562: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1563: 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:1568: result: $ac_file" >&5
+echo "$as_me:1569: 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:1573: checking whether the C compiler works" >&5
+echo "$as_me:1574: 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:1579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1582: \$? = $ac_status" >&5
+  echo "$as_me:1583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1589: error: cannot run C compiled programs.
+	{ { echo "$as_me:1590: 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;}
@@ -1594,24 +1595,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1597: result: yes" >&5
+echo "$as_me:1598: 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:1604: checking whether we are cross compiling" >&5
+echo "$as_me:1605: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1606: result: $cross_compiling" >&5
+echo "$as_me:1607: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1609: checking for executable suffix" >&5
+echo "$as_me:1610: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1614: \$? = $ac_status" >&5
+  echo "$as_me:1615: \$? = $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
@@ -1627,25 +1628,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1630: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1631: 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:1636: result: $ac_cv_exeext" >&5
+echo "$as_me:1637: 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:1642: checking for object suffix" >&5
+echo "$as_me:1643: 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 1648 "configure"
+#line 1649 "configure"
 #include "confdefs.h"
 
 int
@@ -1657,10 +1658,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1663: \$? = $ac_status" >&5
+  echo "$as_me:1664: \$? = $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
@@ -1672,24 +1673,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1675: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1676: 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:1682: result: $ac_cv_objext" >&5
+echo "$as_me:1683: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1686: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1687: 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 1692 "configure"
+#line 1693 "configure"
 #include "confdefs.h"
 
 int
@@ -1704,16 +1705,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1710: \$? = $ac_status" >&5
+  echo "$as_me:1711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1716: \$? = $ac_status" >&5
+  echo "$as_me:1717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1725,19 +1726,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1728: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1729: 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:1734: checking whether $CC accepts -g" >&5
+echo "$as_me:1735: 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 1740 "configure"
+#line 1741 "configure"
 #include "confdefs.h"
 
 int
@@ -1749,16 +1750,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1755: \$? = $ac_status" >&5
+  echo "$as_me:1756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1761: \$? = $ac_status" >&5
+  echo "$as_me:1762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1768,7 +1769,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1771: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1772: 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
@@ -1795,16 +1796,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1801: \$? = $ac_status" >&5
+  echo "$as_me:1802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1807: \$? = $ac_status" >&5
+  echo "$as_me:1808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1816,7 +1817,7 @@ if { (eval echo "$as_me:1798: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1819 "configure"
+#line 1820 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1829,16 +1830,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1835: \$? = $ac_status" >&5
+  echo "$as_me:1836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1841: \$? = $ac_status" >&5
+  echo "$as_me:1842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1848,7 +1849,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1851 "configure"
+#line 1852 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1860,16 +1861,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1866: \$? = $ac_status" >&5
+  echo "$as_me:1867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1872: \$? = $ac_status" >&5
+  echo "$as_me:1873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1899,11 +1900,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1902: checking version of $CC" >&5
+	echo "$as_me:1903: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1906: result: $GCC_VERSION" >&5
+	echo "$as_me:1907: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1912,12 +1913,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1915: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1916: 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 1920 "configure"
+#line 1921 "configure"
 #include "confdefs.h"
 
 int
@@ -1934,16 +1935,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1940: \$? = $ac_status" >&5
+  echo "$as_me:1941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1946: \$? = $ac_status" >&5
+  echo "$as_me:1947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1954,7 +1955,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1957: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1958: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1963,11 +1964,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1966: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1967: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1970 "configure"
+#line 1971 "configure"
 #include "confdefs.h"
 
 int
@@ -1984,16 +1985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1990: \$? = $ac_status" >&5
+  echo "$as_me:1991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1996: \$? = $ac_status" >&5
+  echo "$as_me:1997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2003,7 +2004,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2006: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2007: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2012,30 +2013,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2015: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2022: checking version of $CC" >&5
+	echo "$as_me:2023: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2026: result: $CLANG_VERSION" >&5
+	echo "$as_me:2027: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2033: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2034: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2038 "configure"
+#line 2039 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2049,16 +2050,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2055: \$? = $ac_status" >&5
+  echo "$as_me:2056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2061: \$? = $ac_status" >&5
+  echo "$as_me:2062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2069,13 +2070,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2072: result: $cf_clang_optok" >&5
+		echo "$as_me:2073: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2078: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2084,7 +2085,7 @@ echo "${as_me:-configure}:2078: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2087: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2088: 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
@@ -2092,7 +2093,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2095 "configure"
+#line 2096 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2139,16 +2140,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2145: \$? = $ac_status" >&5
+  echo "$as_me:2146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2151: \$? = $ac_status" >&5
+  echo "$as_me:2152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2165,10 +2166,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2168: result: none needed" >&5
+    echo "$as_me:2169: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2171: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2176,13 +2177,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2179: checking \$CFLAGS variable" >&5
+echo "$as_me:2180: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2183: result: broken" >&5
+	echo "$as_me:2184: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2185: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2186: 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=
@@ -2290,18 +2291,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2293: result: ok" >&5
+	echo "$as_me:2294: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2298: checking \$CC variable" >&5
+echo "$as_me:2299: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2302: result: broken" >&5
+	echo "$as_me:2303: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2304: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2305: 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/[ ]*[ ]-[^ ].*//'`
@@ -2418,24 +2419,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2421: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2425: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2429: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2433: result: ok" >&5
+	echo "$as_me:2434: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2438: checking for inline" >&5
+echo "$as_me:2439: 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
@@ -2443,7 +2444,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2446 "configure"
+#line 2447 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -2452,16 +2453,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2458: \$? = $ac_status" >&5
+  echo "$as_me:2459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2464: \$? = $ac_status" >&5
+  echo "$as_me:2465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2472,7 +2473,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:2475: result: $ac_cv_c_inline" >&5
+echo "$as_me:2476: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2491,7 +2492,7 @@ for ac_prog in ggrep grep
 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:2494: checking for $ac_word" >&5
+echo "$as_me:2495: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2506,7 +2507,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2509: found $ac_dir/$ac_word" >&5
+echo "$as_me:2510: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2514,10 +2515,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2517: result: $GREP" >&5
+  echo "$as_me:2518: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2520: result: no" >&5
+  echo "$as_me:2521: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2525,7 +2526,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2528: checking for egrep" >&5
+echo "$as_me:2529: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2537,7 +2538,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2540: checking for $ac_word" >&5
+echo "$as_me:2541: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2554,7 +2555,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2557: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2558: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2565,10 +2566,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2568: result: $EGREP" >&5
+  echo "$as_me:2569: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2571: result: no" >&5
+  echo "$as_me:2572: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2576,12 +2577,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2579: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2584: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2591,7 +2592,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2594: checking how to run the C preprocessor" >&5
+echo "$as_me:2595: 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
@@ -2612,18 +2613,18 @@ do
   # 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 2615 "configure"
+#line 2616 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:2627: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2646,17 +2647,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2649 "configure"
+#line 2650 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2653: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2659: \$? = $ac_status" >&5
+  echo "$as_me:2660: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2693,7 +2694,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2696: result: $CPP" >&5
+echo "$as_me:2697: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2703,18 +2704,18 @@ do
   # 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 2706 "configure"
+#line 2707 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2711: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2717: \$? = $ac_status" >&5
+  echo "$as_me:2718: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2737,17 +2738,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2740 "configure"
+#line 2741 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2744: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2750: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2775,7 +2776,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2778: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2791,7 +2792,7 @@ for ac_prog in mawk gawk nawk awk
 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:2794: checking for $ac_word" >&5
+echo "$as_me:2795: 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
@@ -2806,7 +2807,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2809: found $ac_dir/$ac_word" >&5
+echo "$as_me:2810: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2814,10 +2815,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2817: result: $AWK" >&5
+  echo "$as_me:2818: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2820: result: no" >&5
+  echo "$as_me:2821: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2836,7 +2837,7 @@ done
 # 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:2839: checking for a BSD compatible install" >&5
+echo "$as_me:2840: 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
@@ -2885,7 +2886,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2888: result: $INSTALL" >&5
+echo "$as_me:2889: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2906,7 +2907,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:2909: checking if you want to install stripped executables" >&5
+echo "$as_me:2910: 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.
@@ -2923,7 +2924,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:2926: result: $enable_stripping" >&5
+echo "$as_me:2927: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -2934,7 +2935,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:2937: checking if install accepts -p option" >&5
+echo "$as_me:2938: 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
@@ -2965,10 +2966,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:2968: result: $cf_cv_install_p" >&5
+echo "$as_me:2969: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:2971: checking if install needs to be told about ownership" >&5
+echo "$as_me:2972: 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)
@@ -2979,7 +2980,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:2982: result: $with_install_o" >&5
+echo "$as_me:2983: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -2988,11 +2989,77 @@ else
 	INSTALL_OPT_O=
 fi
 
+if test -n "$INSTALL_OPT_S"
+then
+	echo "$as_me:2994: checking if you want to specify strip-program" >&5
+echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+
+# Check whether --with-strip-program or --without-strip-program was given.
+if test "${with_strip_program+set}" = set; then
+  withval="$with_strip_program"
+  with_strip_program=$withval
+else
+  with_strip_program=no
+fi;
+	echo "$as_me:3004: result: $with_strip_program" >&5
+echo "${ECHO_T}$with_strip_program" >&6
+	if test "$with_strip_program" != no
+	then
+		echo "$as_me:3008: checking if strip-program is supported with this installer" >&5
+echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+		check_install_strip=no
+		if test -f "$cf_install_program"
+		then
+			check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+			if test -n "$check_install_version"
+			then
+				check_install_strip="option"
+			else
+				for check_strip_variable in STRIPBIN STRIP
+				do
+					if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null
+					then
+						check_install_strip="environ"
+						break
+					fi
+				done
+			fi
+		fi
+		echo "$as_me:3029: result: $check_install_strip" >&5
+echo "${ECHO_T}$check_install_strip" >&6
+		case "$check_install_strip" in
+		(no)
+			{ echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5
+echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+			with_strip_program=no
+			;;
+		(environ)
+			cat >install.tmp <<-CF_EOF
+			#! $SHELL
+			STRIPBIN="$with_strip_program" \\
+			STRIP="$with_strip_program" \\
+			$INSTALL "$@"
+			CF_EOF
+			INSTALL="`pwd`/install.tmp"
+			chmod +x "$INSTALL"
+			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+
+echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5
+
+			;;
+		(option)
+			INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+			;;
+		esac
+	fi
+fi
+
 for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2995: checking for $ac_word" >&5
+echo "$as_me:3062: 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
@@ -3007,7 +3074,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3010: found $ac_dir/$ac_word" >&5
+echo "$as_me:3077: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3015,10 +3082,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3018: result: $LINT" >&5
+  echo "$as_me:3085: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3021: result: no" >&5
+  echo "$as_me:3088: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3031,7 +3098,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3034: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3101: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3086,14 +3153,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3089: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3096: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3163: 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
@@ -3120,7 +3187,7 @@ else
 fi
 
 fi
-echo "$as_me:3123: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3190: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3131,7 +3198,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3134: checking for $ac_word" >&5
+echo "$as_me:3201: 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
@@ -3146,7 +3213,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3149: found $ac_dir/$ac_word" >&5
+echo "$as_me:3216: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3154,10 +3221,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3157: result: $CTAGS" >&5
+  echo "$as_me:3224: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3160: result: no" >&5
+  echo "$as_me:3227: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3168,7 +3235,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3171: checking for $ac_word" >&5
+echo "$as_me:3238: 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
@@ -3183,7 +3250,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3186: found $ac_dir/$ac_word" >&5
+echo "$as_me:3253: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3191,10 +3258,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3194: result: $ETAGS" >&5
+  echo "$as_me:3261: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3197: result: no" >&5
+  echo "$as_me:3264: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3203,7 +3270,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3206: checking for $ac_word" >&5
+echo "$as_me:3273: 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
@@ -3218,7 +3285,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3221: found $ac_dir/$ac_word" >&5
+echo "$as_me:3288: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3227,17 +3294,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3230: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3233: result: no" >&5
+  echo "$as_me:3300: 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:3240: checking for $ac_word" >&5
+echo "$as_me:3307: 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
@@ -3252,7 +3319,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3255: found $ac_dir/$ac_word" >&5
+echo "$as_me:3322: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3261,10 +3328,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3264: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3267: result: no" >&5
+  echo "$as_me:3334: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3284,14 +3351,14 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3287: checking if -lm needed for math functions" >&5
+echo "$as_me:3354: 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 3294 "configure"
+#line 3361 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3307,16 +3374,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3313: \$? = $ac_status" >&5
+  echo "$as_me:3380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3319: \$? = $ac_status" >&5
+  echo "$as_me:3386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -3326,7 +3393,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3329: result: $cf_cv_need_libm" >&5
+echo "$as_me:3396: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -3334,14 +3401,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:3337: checking if -lm is available for math functions" >&5
+	echo "$as_me:3404: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3344 "configure"
+#line 3411 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3357,16 +3424,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3363: \$? = $ac_status" >&5
+  echo "$as_me:3430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3369: \$? = $ac_status" >&5
+  echo "$as_me:3436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -3376,7 +3443,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3379: result: $cf_cv_have_libm" >&5
+echo "$as_me:3446: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -3431,7 +3498,7 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
-echo "$as_me:3434: checking for fgrep" >&5
+echo "$as_me:3501: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3443,7 +3510,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3446: checking for $ac_word" >&5
+echo "$as_me:3513: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3460,7 +3527,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3463: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3530: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3471,10 +3538,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3474: result: $FGREP" >&5
+  echo "$as_me:3541: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3477: result: no" >&5
+  echo "$as_me:3544: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3482,16 +3549,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3485: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3490: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3494: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -3508,17 +3575,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:3511: result: $enable_stdnoreturn" >&5
+echo "$as_me:3578: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:3515: checking for C11 _Noreturn feature" >&5
+echo "$as_me:3582: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3521 "configure"
+#line 3588 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3534,16 +3601,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3540: \$? = $ac_status" >&5
+  echo "$as_me:3607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3546: \$? = $ac_status" >&5
+  echo "$as_me:3613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -3554,7 +3621,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3557: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -3593,10 +3660,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3596: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 3599 "${as_me:-configure}"
+#line 3666 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -3646,12 +3713,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3649: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3652: \$? = $ac_status" >&5
+  echo "$as_me:3719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:3654: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -3710,7 +3777,7 @@ fi
 rm -rf ./conftest*
 fi
 
-echo "$as_me:3713: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3780: 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.
@@ -3720,7 +3787,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:3723: result: $enable_string_hacks" >&5
+echo "$as_me:3790: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -3729,15 +3796,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:3732: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:3799: 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:3734: checking for strlcat" >&5
+	echo "$as_me:3801: 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 3740 "configure"
+#line 3807 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3768,16 +3835,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3774: \$? = $ac_status" >&5
+  echo "$as_me:3841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3780: \$? = $ac_status" >&5
+  echo "$as_me:3847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -3787,7 +3854,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3790: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -3797,7 +3864,7 @@ EOF
 
 else
 
-		echo "$as_me:3800: checking for strlcat in -lbsd" >&5
+		echo "$as_me:3867: 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
@@ -3805,7 +3872,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3808 "configure"
+#line 3875 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3824,16 +3891,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3830: \$? = $ac_status" >&5
+  echo "$as_me:3897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3836: \$? = $ac_status" >&5
+  echo "$as_me:3903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -3844,7 +3911,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3847: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3914: 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
 
@@ -3867,23 +3934,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3870: checking for $ac_header" >&5
+echo "$as_me:3937: 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 3876 "configure"
+#line 3943 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3880: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3947: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3886: \$? = $ac_status" >&5
+  echo "$as_me:3953: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3902,7 +3969,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:3905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -3923,13 +3990,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3926: checking for $ac_func" >&5
+echo "$as_me:3993: 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 3932 "configure"
+#line 3999 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3960,16 +4027,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3966: \$? = $ac_status" >&5
+  echo "$as_me:4033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3972: \$? = $ac_status" >&5
+  echo "$as_me:4039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -3979,7 +4046,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3982: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -3991,14 +4058,14 @@ done
 
 fi
 
-echo "$as_me:3994: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:4061: 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 4001 "configure"
+#line 4068 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4017,16 +4084,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4023: \$? = $ac_status" >&5
+  echo "$as_me:4090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4029: \$? = $ac_status" >&5
+  echo "$as_me:4096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -4037,7 +4104,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4040: result: $cf_cv_posix_visible" >&5
+echo "$as_me:4107: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -4075,18 +4142,18 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:4082: checking if this is the GNU C library" >&5
+echo "$as_me:4149: 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 4089 "configure"
+#line 4156 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4105,16 +4172,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4111: \$? = $ac_status" >&5
+  echo "$as_me:4178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4117: \$? = $ac_status" >&5
+  echo "$as_me:4184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -4125,7 +4192,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4128: result: $cf_cv_gnu_library" >&5
+echo "$as_me:4195: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -4133,7 +4200,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:4136: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:4203: 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
@@ -4145,7 +4212,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4148 "configure"
+#line 4215 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4164,16 +4231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4170: \$? = $ac_status" >&5
+  echo "$as_me:4237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4176: \$? = $ac_status" >&5
+  echo "$as_me:4243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -4185,12 +4252,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:4188: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:4255: 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:4193: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:4260: 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
@@ -4295,7 +4362,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4298 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -4315,16 +4382,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4321: \$? = $ac_status" >&5
+  echo "$as_me:4388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4327: \$? = $ac_status" >&5
+  echo "$as_me:4394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -4335,7 +4402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4338: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4405: 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
@@ -4344,14 +4411,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:4347: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:4414: 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 4354 "configure"
+#line 4421 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4366,16 +4433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4372: \$? = $ac_status" >&5
+  echo "$as_me:4439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4378: \$? = $ac_status" >&5
+  echo "$as_me:4445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4482,7 +4549,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4485 "configure"
+#line 4552 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4497,16 +4564,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4509: \$? = $ac_status" >&5
+  echo "$as_me:4576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4521,12 +4588,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4524: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4591: 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:4529: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:4596: 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
@@ -4536,7 +4603,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4539 "configure"
+#line 4606 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4551,16 +4618,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4557: \$? = $ac_status" >&5
+  echo "$as_me:4624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4563: \$? = $ac_status" >&5
+  echo "$as_me:4630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -4571,7 +4638,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4574: result: $cf_cv_default_source" >&5
+echo "$as_me:4641: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -4608,16 +4675,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4611: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4678: 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}:4617: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4684: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4620 "configure"
+#line 4687 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4632,16 +4699,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4638: \$? = $ac_status" >&5
+  echo "$as_me:4705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4644: \$? = $ac_status" >&5
+  echo "$as_me:4711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4662,7 +4729,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4665 "configure"
+#line 4732 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4677,16 +4744,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4683: \$? = $ac_status" >&5
+  echo "$as_me:4750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4689: \$? = $ac_status" >&5
+  echo "$as_me:4756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4697,7 +4764,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4700: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4705,10 +4772,10 @@ echo "${as_me:-configure}:4700: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4708: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4711 "configure"
+#line 4778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4723,16 +4790,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4729: \$? = $ac_status" >&5
+  echo "$as_me:4796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4735: \$? = $ac_status" >&5
+  echo "$as_me:4802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4748,7 +4815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4751: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4818: 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
@@ -4865,7 +4932,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4868: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4935: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -4897,14 +4964,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:4900: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4967: 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 4907 "configure"
+#line 4974 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4922,16 +4989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4928: \$? = $ac_status" >&5
+  echo "$as_me:4995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4934: \$? = $ac_status" >&5
+  echo "$as_me:5001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4943,7 +5010,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4946 "configure"
+#line 5013 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4961,16 +5028,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4967: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4973: \$? = $ac_status" >&5
+  echo "$as_me:5040: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4985,7 +5052,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4988: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5055: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5145,16 +5212,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5148: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5215: 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}:5154: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5221: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5157 "configure"
+#line 5224 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5169,16 +5236,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5175: \$? = $ac_status" >&5
+  echo "$as_me:5242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5181: \$? = $ac_status" >&5
+  echo "$as_me:5248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5199,7 +5266,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5202 "configure"
+#line 5269 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5214,16 +5281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5220: \$? = $ac_status" >&5
+  echo "$as_me:5287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5226: \$? = $ac_status" >&5
+  echo "$as_me:5293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5234,7 +5301,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5237: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5242,10 +5309,10 @@ echo "${as_me:-configure}:5237: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5245: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5248 "configure"
+#line 5315 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5260,16 +5327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5266: \$? = $ac_status" >&5
+  echo "$as_me:5333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5272: \$? = $ac_status" >&5
+  echo "$as_me:5339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5285,7 +5352,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5288: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5355: 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
@@ -5398,10 +5465,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5401: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5404 "configure"
+#line 5471 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5419,23 +5486,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5425: \$? = $ac_status" >&5
+  echo "$as_me:5492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5431: \$? = $ac_status" >&5
+  echo "$as_me:5498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5438: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5458,7 +5525,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5461: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5470,7 +5537,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5473: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5558,7 +5625,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5568,7 +5635,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5578,7 +5645,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5581: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5648: 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"
@@ -5590,10 +5657,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5593: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5660: 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 5596 "configure"
+#line 5663 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5608,16 +5675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5614: \$? = $ac_status" >&5
+  echo "$as_me:5681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5620: \$? = $ac_status" >&5
+  echo "$as_me:5687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5626,12 +5693,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5629: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5696: 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 5634 "configure"
+#line 5701 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5646,16 +5713,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5652: \$? = $ac_status" >&5
+  echo "$as_me:5719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5658: \$? = $ac_status" >&5
+  echo "$as_me:5725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5666,19 +5733,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5669: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5674: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5741: 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 5681 "configure"
+#line 5748 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5696,16 +5763,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5702: \$? = $ac_status" >&5
+  echo "$as_me:5769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5708: \$? = $ac_status" >&5
+  echo "$as_me:5775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5717,7 +5784,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5720 "configure"
+#line 5787 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5735,16 +5802,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5741: \$? = $ac_status" >&5
+  echo "$as_me:5808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5747: \$? = $ac_status" >&5
+  echo "$as_me:5814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5759,7 +5826,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5762: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5829: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5906,13 +5973,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:5909: checking for ANSI C header files" >&5
+echo "$as_me:5976: 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 5915 "configure"
+#line 5982 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5920,13 +5987,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5923: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5990: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5929: \$? = $ac_status" >&5
+  echo "$as_me:5996: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5948,7 +6015,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5951 "configure"
+#line 6018 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5966,7 +6033,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5969 "configure"
+#line 6036 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5987,7 +6054,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5990 "configure"
+#line 6057 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6013,15 +6080,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6019: \$? = $ac_status" >&5
+  echo "$as_me:6086: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6024: \$? = $ac_status" >&5
+  echo "$as_me:6091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6034,7 +6101,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6037: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6104: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6050,28 +6117,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6053: checking for $ac_header" >&5
+echo "$as_me:6120: 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 6059 "configure"
+#line 6126 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6068: \$? = $ac_status" >&5
+  echo "$as_me:6135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6074: \$? = $ac_status" >&5
+  echo "$as_me:6141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6081,7 +6148,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6091,13 +6158,13 @@ EOF
 fi
 done
 
-echo "$as_me:6094: checking whether exit is declared" >&5
+echo "$as_me:6161: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6100 "configure"
+#line 6167 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6112,16 +6179,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6118: \$? = $ac_status" >&5
+  echo "$as_me:6185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6124: \$? = $ac_status" >&5
+  echo "$as_me:6191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6131,10 +6198,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6134: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6137: checking for signal global datatype" >&5
+echo "$as_me:6204: 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
@@ -6146,7 +6213,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6149 "configure"
+#line 6216 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6170,16 +6237,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6176: \$? = $ac_status" >&5
+  echo "$as_me:6243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6182: \$? = $ac_status" >&5
+  echo "$as_me:6249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6193,7 +6260,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6196: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6263: 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 <<EOF
@@ -6202,14 +6269,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6205: checking if SIGWINCH is defined" >&5
+echo "$as_me:6272: 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 6212 "configure"
+#line 6279 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6224,23 +6291,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6230: \$? = $ac_status" >&5
+  echo "$as_me:6297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6236: \$? = $ac_status" >&5
+  echo "$as_me:6303: \$? = $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 6243 "configure"
+#line 6310 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6258,16 +6325,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6264: \$? = $ac_status" >&5
+  echo "$as_me:6331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6270: \$? = $ac_status" >&5
+  echo "$as_me:6337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6281,11 +6348,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6284: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6351: 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:6288: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6355: 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
@@ -6296,7 +6363,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6299 "configure"
+#line 6366 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6318,16 +6385,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6324: \$? = $ac_status" >&5
+  echo "$as_me:6391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6330: \$? = $ac_status" >&5
+  echo "$as_me:6397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6341,7 +6408,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6344: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6351,13 +6418,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6354: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6421: 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 6360 "configure"
+#line 6427 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6371,16 +6438,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6377: \$? = $ac_status" >&5
+  echo "$as_me:6444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6383: \$? = $ac_status" >&5
+  echo "$as_me:6450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6391,7 +6458,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6394: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6401,7 +6468,7 @@ EOF
 
 	fi
 
-echo "$as_me:6404: checking if you want to use pkg-config" >&5
+echo "$as_me:6471: 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.
@@ -6411,7 +6478,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6414: result: $cf_pkg_config" >&5
+echo "$as_me:6481: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6423,7 +6490,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6426: checking for $ac_word" >&5
+echo "$as_me:6493: 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
@@ -6440,7 +6507,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6443: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6510: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6451,10 +6518,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6454: result: $PKG_CONFIG" >&5
+  echo "$as_me:6521: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6457: result: no" >&5
+  echo "$as_me:6524: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6463,7 +6530,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6466: checking for $ac_word" >&5
+echo "$as_me:6533: 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
@@ -6480,7 +6547,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6483: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6550: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6492,10 +6559,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6495: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6498: result: no" >&5
+  echo "$as_me:6565: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6538,18 +6605,18 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6541: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6608: 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:6548: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6615: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6552: checking if you want to see long compiling messages" >&5
+echo "$as_me:6619: 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.
@@ -6583,10 +6650,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6586: result: $enableval" >&5
+echo "$as_me:6653: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6589: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6656: 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.
@@ -6596,10 +6663,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6599: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6602: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6669: 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.
@@ -6616,10 +6683,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6619: result: $cf_enable_widec" >&5
+echo "$as_me:6686: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6622: checking for specific curses-directory" >&5
+echo "$as_me:6689: 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.
@@ -6629,7 +6696,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6632: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6699: 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"
@@ -6660,7 +6727,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6663: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6696,7 +6763,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6699 "configure"
+#line 6766 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6708,16 +6775,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6714: \$? = $ac_status" >&5
+  echo "$as_me:6781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6720: \$? = $ac_status" >&5
+  echo "$as_me:6787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6734,7 +6801,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6737: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6770,7 +6837,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6773: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6783,7 +6850,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6786: checking for specified curses library type" >&5
+echo "$as_me:6853: 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.
@@ -6827,13 +6894,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6830: result: $cf_cv_screen" >&5
+echo "$as_me:6897: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6836: checking for extra include directories" >&5
+echo "$as_me:6903: 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
@@ -6859,7 +6926,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:6862: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -6869,7 +6936,7 @@ then
 
 fi
 
-echo "$as_me:6872: checking if we have identified curses headers" >&5
+echo "$as_me:6939: 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
@@ -6881,7 +6948,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6884 "configure"
+#line 6951 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -6893,16 +6960,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6899: \$? = $ac_status" >&5
+  echo "$as_me:6966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6905: \$? = $ac_status" >&5
+  echo "$as_me:6972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -6913,11 +6980,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6916: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:6983: 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:6920: error: No curses header-files found" >&5
+	{ { echo "$as_me:6987: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6927,23 +6994,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6930: checking for $ac_header" >&5
+echo "$as_me:6997: 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 6936 "configure"
+#line 7003 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6940: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7007: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6946: \$? = $ac_status" >&5
+  echo "$as_me:7013: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6962,7 +7029,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6965: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6972,7 +7039,7 @@ EOF
 fi
 done
 
-echo "$as_me:6975: checking for terminfo header" >&5
+echo "$as_me:7042: 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
@@ -6990,7 +7057,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6993 "configure"
+#line 7060 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7005,16 +7072,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7011: \$? = $ac_status" >&5
+  echo "$as_me:7078: \$? = $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:7081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7017: \$? = $ac_status" >&5
+  echo "$as_me:7084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7030,7 +7097,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7033: result: $cf_cv_term_header" >&5
+echo "$as_me:7100: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7062,7 +7129,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7065: checking for ncurses version" >&5
+echo "$as_me:7132: 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
@@ -7088,10 +7155,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7091: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7158: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7094: \$? = $ac_status" >&5
+  echo "$as_me:7161: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7101,7 +7168,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7104 "configure"
+#line 7171 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7128,15 +7195,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7134: \$? = $ac_status" >&5
+  echo "$as_me:7201: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7139: \$? = $ac_status" >&5
+  echo "$as_me:7206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7150,17 +7217,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7153: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7220: 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:7160: checking if we have identified curses libraries" >&5
+echo "$as_me:7227: 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 7163 "configure"
+#line 7230 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7172,16 +7239,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7178: \$? = $ac_status" >&5
+  echo "$as_me:7245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7184: \$? = $ac_status" >&5
+  echo "$as_me:7251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7190,13 +7257,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7193: result: $cf_result" >&5
+echo "$as_me:7260: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7199: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7266: 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
@@ -7204,7 +7271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7207 "configure"
+#line 7274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7223,16 +7290,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7229: \$? = $ac_status" >&5
+  echo "$as_me:7296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7235: \$? = $ac_status" >&5
+  echo "$as_me:7302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7243,7 +7310,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7246: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7313: 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
 
@@ -7273,7 +7340,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7276: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7343: 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
@@ -7281,7 +7348,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7284 "configure"
+#line 7351 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7300,16 +7367,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7306: \$? = $ac_status" >&5
+  echo "$as_me:7373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7312: \$? = $ac_status" >&5
+  echo "$as_me:7379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7320,7 +7387,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7323: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7390: 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
 
@@ -7344,7 +7411,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7347: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7414: 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
@@ -7352,7 +7419,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7355 "configure"
+#line 7422 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7371,16 +7438,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7377: \$? = $ac_status" >&5
+  echo "$as_me:7444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7383: \$? = $ac_status" >&5
+  echo "$as_me:7450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7391,7 +7458,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7394: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7461: 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
 
@@ -7449,7 +7516,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7452: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7478,7 +7545,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7481: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7509,7 +7576,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7512: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7544,7 +7611,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7547: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7588,13 +7655,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7591: checking for tgoto" >&5
+		echo "$as_me:7658: 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 7597 "configure"
+#line 7664 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7625,16 +7692,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7631: \$? = $ac_status" >&5
+  echo "$as_me:7698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7637: \$? = $ac_status" >&5
+  echo "$as_me:7704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -7644,7 +7711,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7647: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7714: 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
@@ -7653,7 +7720,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7656: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7723: 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
@@ -7661,7 +7728,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7664 "configure"
+#line 7731 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7680,16 +7747,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7686: \$? = $ac_status" >&5
+  echo "$as_me:7753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7692: \$? = $ac_status" >&5
+  echo "$as_me:7759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7700,7 +7767,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7703: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7770: 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
 
@@ -7723,10 +7790,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7726: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7793: 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 7729 "configure"
+#line 7796 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7738,16 +7805,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7744: \$? = $ac_status" >&5
+  echo "$as_me:7811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7750: \$? = $ac_status" >&5
+  echo "$as_me:7817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7756,16 +7823,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7759: result: $cf_result" >&5
+				echo "$as_me:7826: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7765: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7832: 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 7768 "configure"
+#line 7835 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7777,16 +7844,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7783: \$? = $ac_status" >&5
+  echo "$as_me:7850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7789: \$? = $ac_status" >&5
+  echo "$as_me:7856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7795,7 +7862,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7798 "configure"
+#line 7865 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7807,16 +7874,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7813: \$? = $ac_status" >&5
+  echo "$as_me:7880: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7819: \$? = $ac_status" >&5
+  echo "$as_me:7886: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7828,13 +7895,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7831: result: $cf_result" >&5
+				echo "$as_me:7898: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7837: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7904: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7846,23 +7913,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7849: checking for $ac_header" >&5
+echo "$as_me:7916: 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 7855 "configure"
+#line 7922 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7859: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7865: \$? = $ac_status" >&5
+  echo "$as_me:7932: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7881,7 +7948,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7884: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7891,7 +7958,7 @@ EOF
 fi
 done
 
-echo "$as_me:7894: checking for multibyte character support" >&5
+echo "$as_me:7961: 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
@@ -7899,7 +7966,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7902 "configure"
+#line 7969 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7916,16 +7983,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7922: \$? = $ac_status" >&5
+  echo "$as_me:7989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7928: \$? = $ac_status" >&5
+  echo "$as_me:7995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7937,12 +8004,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7940: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7945 "configure"
+#line 8012 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7955,16 +8022,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7961: \$? = $ac_status" >&5
+  echo "$as_me:8028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7967: \$? = $ac_status" >&5
+  echo "$as_me:8034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7978,7 +8045,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7981 "configure"
+#line 8048 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7991,16 +8058,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7997: \$? = $ac_status" >&5
+  echo "$as_me:8064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8003: \$? = $ac_status" >&5
+  echo "$as_me:8070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8017,9 +8084,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8020: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8022: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8110,7 +8177,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8113: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8118,7 +8185,7 @@ echo "${as_me:-configure}:8113: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8121 "configure"
+#line 8188 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8131,21 +8198,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8137: \$? = $ac_status" >&5
+  echo "$as_me:8204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8143: \$? = $ac_status" >&5
+  echo "$as_me:8210: \$? = $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}:8148: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8163,7 +8230,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8166: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8238,13 +8305,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8241: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8308: 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 8247 "configure"
+#line 8314 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8257,21 +8324,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8263: \$? = $ac_status" >&5
+  echo "$as_me:8330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8336: \$? = $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}:8274: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8313,7 +8380,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8316: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8383: 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
@@ -8351,7 +8418,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8354 "configure"
+#line 8421 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8363,16 +8430,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8369: \$? = $ac_status" >&5
+  echo "$as_me:8436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8375: \$? = $ac_status" >&5
+  echo "$as_me:8442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8389,7 +8456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8392: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8425,7 +8492,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8428: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8455,13 +8522,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8458: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8525: 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:8461: result: yes" >&5
+		echo "$as_me:8528: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8464: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8531: 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
 
@@ -8594,7 +8661,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8597 "configure"
+#line 8664 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8606,37 +8673,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8612: \$? = $ac_status" >&5
+  echo "$as_me:8679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8618: \$? = $ac_status" >&5
+  echo "$as_me:8685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8624 "configure"
+#line 8691 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8634: \$? = $ac_status" >&5
+  echo "$as_me:8701: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8639: \$? = $ac_status" >&5
+  echo "$as_me:8706: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8810,7 +8877,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8813 "configure"
+#line 8880 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8822,37 +8889,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8828: \$? = $ac_status" >&5
+  echo "$as_me:8895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8834: \$? = $ac_status" >&5
+  echo "$as_me:8901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8840 "configure"
+#line 8907 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8850: \$? = $ac_status" >&5
+  echo "$as_me:8917: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8855: \$? = $ac_status" >&5
+  echo "$as_me:8922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8869,7 +8936,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8872: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8939: 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"
@@ -8885,7 +8952,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8888: checking for terminfo header" >&5
+echo "$as_me:8955: 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
@@ -8903,7 +8970,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8906 "configure"
+#line 8973 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8918,16 +8985,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8924: \$? = $ac_status" >&5
+  echo "$as_me:8991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8930: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8943,7 +9010,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8946: result: $cf_cv_term_header" >&5
+echo "$as_me:9013: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8978,7 +9045,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8981: result: no" >&5
+		echo "$as_me:9048: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8994,7 +9061,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8997: checking for $ac_word" >&5
+echo "$as_me:9064: 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
@@ -9009,7 +9076,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9012: found $ac_dir/$ac_word" >&5
+echo "$as_me:9079: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9017,10 +9084,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9020: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9087: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9023: result: no" >&5
+  echo "$as_me:9090: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9033,7 +9100,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9036: checking for $ac_word" >&5
+echo "$as_me:9103: 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
@@ -9048,7 +9115,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9051: found $ac_dir/$ac_word" >&5
+echo "$as_me:9118: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9056,10 +9123,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9059: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9062: result: no" >&5
+  echo "$as_me:9129: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9216,7 +9283,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9219: checking if we have identified curses headers" >&5
+echo "$as_me:9286: 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
@@ -9228,7 +9295,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9231 "configure"
+#line 9298 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9240,16 +9307,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9246: \$? = $ac_status" >&5
+  echo "$as_me:9313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9252: \$? = $ac_status" >&5
+  echo "$as_me:9319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9260,11 +9327,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9263: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9330: 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:9267: error: No curses header-files found" >&5
+	{ { echo "$as_me:9334: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9274,23 +9341,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9277: checking for $ac_header" >&5
+echo "$as_me:9344: 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 9283 "configure"
+#line 9350 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9287: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9354: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9293: \$? = $ac_status" >&5
+  echo "$as_me:9360: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9309,7 +9376,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9312: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9365,7 +9432,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9368 "configure"
+#line 9435 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9377,16 +9444,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9383: \$? = $ac_status" >&5
+  echo "$as_me:9450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9389: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9403,7 +9470,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9406: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9422,7 +9489,7 @@ fi
 
 }
 
-echo "$as_me:9425: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9492: 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
@@ -9434,7 +9501,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9437 "configure"
+#line 9504 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9458,16 +9525,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9464: \$? = $ac_status" >&5
+  echo "$as_me:9531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9470: \$? = $ac_status" >&5
+  echo "$as_me:9537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9482,14 +9549,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9485: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9552: 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:9492: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9559: 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
@@ -9610,7 +9677,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9613 "configure"
+#line 9680 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9622,16 +9689,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9628: \$? = $ac_status" >&5
+  echo "$as_me:9695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9634: \$? = $ac_status" >&5
+  echo "$as_me:9701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9648,7 +9715,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9651: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9671,7 +9738,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9674 "configure"
+#line 9741 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9695,16 +9762,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9701: \$? = $ac_status" >&5
+  echo "$as_me:9768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9707: \$? = $ac_status" >&5
+  echo "$as_me:9774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9725,12 +9792,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9728: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9733: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9800: 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%/[^/]*$%%'`
@@ -9766,7 +9833,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9769 "configure"
+#line 9836 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9778,16 +9845,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9784: \$? = $ac_status" >&5
+  echo "$as_me:9851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9790: \$? = $ac_status" >&5
+  echo "$as_me:9857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9804,7 +9871,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9807: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9852,7 +9919,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9855: checking for terminfo header" >&5
+echo "$as_me:9922: 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
@@ -9870,7 +9937,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9873 "configure"
+#line 9940 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9885,16 +9952,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9891: \$? = $ac_status" >&5
+  echo "$as_me:9958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9897: \$? = $ac_status" >&5
+  echo "$as_me:9964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9910,7 +9977,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9913: result: $cf_cv_term_header" >&5
+echo "$as_me:9980: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9948,7 +10015,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9951: checking for ncurses version" >&5
+echo "$as_me:10018: 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
@@ -9974,10 +10041,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9977: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10044: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9980: \$? = $ac_status" >&5
+  echo "$as_me:10047: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9987,7 +10054,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9990 "configure"
+#line 10057 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10014,15 +10081,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10020: \$? = $ac_status" >&5
+  echo "$as_me:10087: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
+  echo "$as_me:10092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10036,7 +10103,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10039: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10049,7 +10116,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10052: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10119: 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
@@ -10057,7 +10124,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10060 "configure"
+#line 10127 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10076,16 +10143,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10082: \$? = $ac_status" >&5
+  echo "$as_me:10149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10088: \$? = $ac_status" >&5
+  echo "$as_me:10155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10096,10 +10163,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10099: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10166: 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:10102: checking for initscr in -lgpm" >&5
+  echo "$as_me:10169: 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
@@ -10107,7 +10174,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10110 "configure"
+#line 10177 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10126,16 +10193,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10132: \$? = $ac_status" >&5
+  echo "$as_me:10199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10138: \$? = $ac_status" >&5
+  echo "$as_me:10205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10146,7 +10213,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10149: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10216: 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"
@@ -10161,7 +10228,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10164: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10231: 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
@@ -10169,7 +10236,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10172 "configure"
+#line 10239 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10188,16 +10255,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10194: \$? = $ac_status" >&5
+  echo "$as_me:10261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10200: \$? = $ac_status" >&5
+  echo "$as_me:10267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10208,7 +10275,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10211: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10278: 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"
@@ -10257,13 +10324,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10260: checking for initscr" >&5
+	echo "$as_me:10327: 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 10266 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10294,16 +10361,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10300: \$? = $ac_status" >&5
+  echo "$as_me:10367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10306: \$? = $ac_status" >&5
+  echo "$as_me:10373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10313,18 +10380,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10316: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10383: 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:10323: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10390: 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 10327 "configure"
+#line 10394 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10336,25 +10403,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10342: \$? = $ac_status" >&5
+  echo "$as_me:10409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10348: \$? = $ac_status" >&5
+  echo "$as_me:10415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10350: result: yes" >&5
+  echo "$as_me:10417: 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:10357: result: no" >&5
+echo "$as_me:10424: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10422,11 +10489,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10425: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10492: 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 10429 "configure"
+#line 10496 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10438,25 +10505,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10444: \$? = $ac_status" >&5
+  echo "$as_me:10511: \$? = $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:10514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10450: \$? = $ac_status" >&5
+  echo "$as_me:10517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10452: result: yes" >&5
+  echo "$as_me:10519: 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:10459: result: no" >&5
+echo "$as_me:10526: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10471,7 +10538,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10474: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10479,7 +10546,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10482: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10549: 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
@@ -10489,7 +10556,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10492 "configure"
+#line 10559 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10501,23 +10568,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10507: \$? = $ac_status" >&5
+  echo "$as_me:10574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10513: \$? = $ac_status" >&5
+  echo "$as_me:10580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10515: result: yes" >&5
+  echo "$as_me:10582: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10520: result: no" >&5
+echo "$as_me:10587: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10542,13 +10609,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10545: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10612: 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:10548: result: yes" >&5
+		echo "$as_me:10615: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10551: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10618: 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
 
@@ -10681,7 +10748,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10684 "configure"
+#line 10751 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10693,37 +10760,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10699: \$? = $ac_status" >&5
+  echo "$as_me:10766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10705: \$? = $ac_status" >&5
+  echo "$as_me:10772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10711 "configure"
+#line 10778 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:10788: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10726: \$? = $ac_status" >&5
+  echo "$as_me:10793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10897,7 +10964,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10900 "configure"
+#line 10967 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10909,37 +10976,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10915: \$? = $ac_status" >&5
+  echo "$as_me:10982: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10921: \$? = $ac_status" >&5
+  echo "$as_me:10988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10927 "configure"
+#line 10994 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10937: \$? = $ac_status" >&5
+  echo "$as_me:11004: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10942: \$? = $ac_status" >&5
+  echo "$as_me:11009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10956,7 +11023,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10959: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11026: 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"
@@ -10972,7 +11039,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10975: checking for terminfo header" >&5
+echo "$as_me:11042: 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
@@ -10990,7 +11057,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10993 "configure"
+#line 11060 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11005,16 +11072,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11011: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11017: \$? = $ac_status" >&5
+  echo "$as_me:11084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11030,7 +11097,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11033: result: $cf_cv_term_header" >&5
+echo "$as_me:11100: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11065,7 +11132,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11068: result: no" >&5
+		echo "$as_me:11135: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11081,7 +11148,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11084: checking for $ac_word" >&5
+echo "$as_me:11151: 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
@@ -11096,7 +11163,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11099: found $ac_dir/$ac_word" >&5
+echo "$as_me:11166: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11104,10 +11171,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11107: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11174: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11110: result: no" >&5
+  echo "$as_me:11177: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11120,7 +11187,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11123: checking for $ac_word" >&5
+echo "$as_me:11190: 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
@@ -11135,7 +11202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11138: found $ac_dir/$ac_word" >&5
+echo "$as_me:11205: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11143,10 +11210,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11146: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11149: result: no" >&5
+  echo "$as_me:11216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11303,7 +11370,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11306: checking if we have identified curses headers" >&5
+echo "$as_me:11373: 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
@@ -11315,7 +11382,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11318 "configure"
+#line 11385 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11327,16 +11394,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11333: \$? = $ac_status" >&5
+  echo "$as_me:11400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11339: \$? = $ac_status" >&5
+  echo "$as_me:11406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11347,11 +11414,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11350: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11417: 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:11354: error: No curses header-files found" >&5
+	{ { echo "$as_me:11421: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11361,23 +11428,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11364: checking for $ac_header" >&5
+echo "$as_me:11431: 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 11370 "configure"
+#line 11437 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11374: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11441: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11380: \$? = $ac_status" >&5
+  echo "$as_me:11447: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11396,7 +11463,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11399: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11452,7 +11519,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11455 "configure"
+#line 11522 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11464,16 +11531,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11470: \$? = $ac_status" >&5
+  echo "$as_me:11537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11476: \$? = $ac_status" >&5
+  echo "$as_me:11543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11490,7 +11557,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11493: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11509,7 +11576,7 @@ fi
 
 }
 
-echo "$as_me:11512: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11579: 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
@@ -11521,7 +11588,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11524 "configure"
+#line 11591 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11545,16 +11612,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11551: \$? = $ac_status" >&5
+  echo "$as_me:11618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11557: \$? = $ac_status" >&5
+  echo "$as_me:11624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11569,14 +11636,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11572: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11639: 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:11579: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11646: 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
@@ -11697,7 +11764,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11700 "configure"
+#line 11767 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11709,16 +11776,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11715: \$? = $ac_status" >&5
+  echo "$as_me:11782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11721: \$? = $ac_status" >&5
+  echo "$as_me:11788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11735,7 +11802,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11738: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11758,7 +11825,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11761 "configure"
+#line 11828 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11782,16 +11849,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11788: \$? = $ac_status" >&5
+  echo "$as_me:11855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11794: \$? = $ac_status" >&5
+  echo "$as_me:11861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11812,12 +11879,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11815: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11820: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11887: 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%/[^/]*$%%'`
@@ -11853,7 +11920,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11856 "configure"
+#line 11923 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11865,16 +11932,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11871: \$? = $ac_status" >&5
+  echo "$as_me:11938: \$? = $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:11941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11877: \$? = $ac_status" >&5
+  echo "$as_me:11944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11891,7 +11958,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11894: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11939,7 +12006,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11942: checking for terminfo header" >&5
+echo "$as_me:12009: 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
@@ -11957,7 +12024,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11960 "configure"
+#line 12027 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11972,16 +12039,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11978: \$? = $ac_status" >&5
+  echo "$as_me:12045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11984: \$? = $ac_status" >&5
+  echo "$as_me:12051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11997,7 +12064,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12000: result: $cf_cv_term_header" >&5
+echo "$as_me:12067: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12035,7 +12102,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12038: checking for ncurses version" >&5
+echo "$as_me:12105: 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
@@ -12061,10 +12128,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12064: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12131: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12067: \$? = $ac_status" >&5
+  echo "$as_me:12134: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12074,7 +12141,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12077 "configure"
+#line 12144 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12101,15 +12168,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12107: \$? = $ac_status" >&5
+  echo "$as_me:12174: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12112: \$? = $ac_status" >&5
+  echo "$as_me:12179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12123,7 +12190,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12126: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12136,7 +12203,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12139: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12206: 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
@@ -12144,7 +12211,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12147 "configure"
+#line 12214 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12163,16 +12230,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12169: \$? = $ac_status" >&5
+  echo "$as_me:12236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12183,10 +12250,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12186: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12253: 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:12189: checking for initscr in -lgpm" >&5
+  echo "$as_me:12256: 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
@@ -12194,7 +12261,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12197 "configure"
+#line 12264 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12213,16 +12280,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12219: \$? = $ac_status" >&5
+  echo "$as_me:12286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12225: \$? = $ac_status" >&5
+  echo "$as_me:12292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12233,7 +12300,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12236: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12303: 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"
@@ -12248,7 +12315,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12251: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12318: 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
@@ -12256,7 +12323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12259 "configure"
+#line 12326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12275,16 +12342,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12281: \$? = $ac_status" >&5
+  echo "$as_me:12348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12295,7 +12362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12298: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12365: 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"
@@ -12344,13 +12411,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12347: checking for initscr" >&5
+	echo "$as_me:12414: 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 12353 "configure"
+#line 12420 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12381,16 +12448,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12387: \$? = $ac_status" >&5
+  echo "$as_me:12454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12393: \$? = $ac_status" >&5
+  echo "$as_me:12460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12400,18 +12467,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12403: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12470: 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:12410: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12477: 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 12414 "configure"
+#line 12481 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12423,25 +12490,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12429: \$? = $ac_status" >&5
+  echo "$as_me:12496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12435: \$? = $ac_status" >&5
+  echo "$as_me:12502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12437: result: yes" >&5
+  echo "$as_me:12504: 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:12444: result: no" >&5
+echo "$as_me:12511: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12509,11 +12576,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12512: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12579: 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 12516 "configure"
+#line 12583 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12525,25 +12592,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12531: \$? = $ac_status" >&5
+  echo "$as_me:12598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12537: \$? = $ac_status" >&5
+  echo "$as_me:12604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12539: result: yes" >&5
+  echo "$as_me:12606: 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:12546: result: no" >&5
+echo "$as_me:12613: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12558,7 +12625,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12561: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12566,7 +12633,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12569: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12636: 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
@@ -12576,7 +12643,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12579 "configure"
+#line 12646 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12588,23 +12655,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12594: \$? = $ac_status" >&5
+  echo "$as_me:12661: \$? = $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:12664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12600: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12602: result: yes" >&5
+  echo "$as_me:12669: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12607: result: no" >&5
+echo "$as_me:12674: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12624,7 +12691,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12627: checking for X" >&5
+	echo "$as_me:12694: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12728,17 +12795,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12731 "configure"
+#line 12798 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12735: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12741: \$? = $ac_status" >&5
+  echo "$as_me:12808: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12771,7 +12838,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12774 "configure"
+#line 12841 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12783,16 +12850,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12789: \$? = $ac_status" >&5
+  echo "$as_me:12856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12795: \$? = $ac_status" >&5
+  echo "$as_me:12862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12830,7 +12897,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12833: result: $have_x" >&5
+  echo "$as_me:12900: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12840,7 +12907,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12843: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12910: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -12867,11 +12934,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:12870: checking whether -R must be followed by a space" >&5
+      echo "$as_me:12937: 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 12874 "configure"
+#line 12941 "configure"
 #include "confdefs.h"
 
 int
@@ -12883,16 +12950,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12889: \$? = $ac_status" >&5
+  echo "$as_me:12956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12895: \$? = $ac_status" >&5
+  echo "$as_me:12962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -12902,13 +12969,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:12905: result: no" >&5
+	echo "$as_me:12972: 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 12911 "configure"
+#line 12978 "configure"
 #include "confdefs.h"
 
 int
@@ -12920,16 +12987,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12926: \$? = $ac_status" >&5
+  echo "$as_me:12993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12932: \$? = $ac_status" >&5
+  echo "$as_me:12999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -12939,11 +13006,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:12942: result: yes" >&5
+	  echo "$as_me:13009: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:12946: result: neither works" >&5
+	  echo "$as_me:13013: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -12963,7 +13030,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 12966 "configure"
+#line 13033 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12982,22 +13049,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12988: \$? = $ac_status" >&5
+  echo "$as_me:13055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12994: \$? = $ac_status" >&5
+  echo "$as_me:13061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13000: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13067: 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
@@ -13005,7 +13072,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13008 "configure"
+#line 13075 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13024,16 +13091,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13030: \$? = $ac_status" >&5
+  echo "$as_me:13097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13036: \$? = $ac_status" >&5
+  echo "$as_me:13103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13044,14 +13111,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13047: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13114: 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:13054: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13121: 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
@@ -13059,7 +13126,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13062 "configure"
+#line 13129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13078,16 +13145,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13084: \$? = $ac_status" >&5
+  echo "$as_me:13151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13090: \$? = $ac_status" >&5
+  echo "$as_me:13157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13098,7 +13165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13101: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13168: 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"
@@ -13117,13 +13184,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13120: checking for gethostbyname" >&5
+    echo "$as_me:13187: 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 13126 "configure"
+#line 13193 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13154,16 +13221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13160: \$? = $ac_status" >&5
+  echo "$as_me:13227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13166: \$? = $ac_status" >&5
+  echo "$as_me:13233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13173,11 +13240,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13176: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13243: 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:13180: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13247: 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
@@ -13185,7 +13252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13188 "configure"
+#line 13255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13204,16 +13271,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13210: \$? = $ac_status" >&5
+  echo "$as_me:13277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13216: \$? = $ac_status" >&5
+  echo "$as_me:13283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13224,14 +13291,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13227: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13294: 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:13234: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13301: 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
@@ -13239,7 +13306,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13242 "configure"
+#line 13309 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13258,16 +13325,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13264: \$? = $ac_status" >&5
+  echo "$as_me:13331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13270: \$? = $ac_status" >&5
+  echo "$as_me:13337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13278,7 +13345,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13281: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13348: 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"
@@ -13294,13 +13361,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13297: checking for connect" >&5
+    echo "$as_me:13364: 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 13303 "configure"
+#line 13370 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13331,16 +13398,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13337: \$? = $ac_status" >&5
+  echo "$as_me:13404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13343: \$? = $ac_status" >&5
+  echo "$as_me:13410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13350,11 +13417,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13353: result: $ac_cv_func_connect" >&5
+echo "$as_me:13420: 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:13357: checking for connect in -lsocket" >&5
+      echo "$as_me:13424: 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
@@ -13362,7 +13429,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13365 "configure"
+#line 13432 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13381,16 +13448,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13387: \$? = $ac_status" >&5
+  echo "$as_me:13454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13393: \$? = $ac_status" >&5
+  echo "$as_me:13460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13401,7 +13468,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13404: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13471: 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"
@@ -13410,13 +13477,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13413: checking for remove" >&5
+    echo "$as_me:13480: 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 13419 "configure"
+#line 13486 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13447,16 +13514,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13453: \$? = $ac_status" >&5
+  echo "$as_me:13520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13459: \$? = $ac_status" >&5
+  echo "$as_me:13526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13466,11 +13533,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13469: result: $ac_cv_func_remove" >&5
+echo "$as_me:13536: 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:13473: checking for remove in -lposix" >&5
+      echo "$as_me:13540: 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
@@ -13478,7 +13545,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13481 "configure"
+#line 13548 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13497,16 +13564,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13503: \$? = $ac_status" >&5
+  echo "$as_me:13570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13509: \$? = $ac_status" >&5
+  echo "$as_me:13576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13517,7 +13584,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13520: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13587: 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"
@@ -13526,13 +13593,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13529: checking for shmat" >&5
+    echo "$as_me:13596: 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 13535 "configure"
+#line 13602 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13563,16 +13630,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13569: \$? = $ac_status" >&5
+  echo "$as_me:13636: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13575: \$? = $ac_status" >&5
+  echo "$as_me:13642: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13582,11 +13649,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13585: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13652: 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:13589: checking for shmat in -lipc" >&5
+      echo "$as_me:13656: 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
@@ -13594,7 +13661,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13597 "configure"
+#line 13664 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13613,16 +13680,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13619: \$? = $ac_status" >&5
+  echo "$as_me:13686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13625: \$? = $ac_status" >&5
+  echo "$as_me:13692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13633,7 +13700,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13636: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13703: 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"
@@ -13651,7 +13718,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13654: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13721: 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
@@ -13659,7 +13726,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13662 "configure"
+#line 13729 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13678,16 +13745,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13684: \$? = $ac_status" >&5
+  echo "$as_me:13751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13690: \$? = $ac_status" >&5
+  echo "$as_me:13757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13698,7 +13765,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13701: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13768: 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"
@@ -13710,7 +13777,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13713: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13780: 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=
 
@@ -13721,14 +13788,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13724: result: yes" >&5
+	echo "$as_me:13791: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13727: result: no" >&5
+	echo "$as_me:13794: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13731: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13798: 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=
 
@@ -13739,14 +13806,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13742: result: yes" >&5
+	echo "$as_me:13809: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13745: result: no" >&5
+	echo "$as_me:13812: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13749: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13816: 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=
 
@@ -13757,14 +13824,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13760: result: yes" >&5
+	echo "$as_me:13827: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13763: result: no" >&5
+	echo "$as_me:13830: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13767: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13834: 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=
 
@@ -13775,10 +13842,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13778: result: yes" >&5
+	echo "$as_me:13845: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13781: result: no" >&5
+	echo "$as_me:13848: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13798,17 +13865,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13801: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13868: 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}:13807: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13874: 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}:13811: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13939,20 +14006,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:13942: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14009: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:13948: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14015: 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 13955 "configure"
+#line 14022 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13970,16 +14037,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:14043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13982: \$? = $ac_status" >&5
+  echo "$as_me:14049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -13989,7 +14056,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13992: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14001,7 +14068,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14004: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14009,17 +14076,17 @@ echo "${as_me:-configure}:14004: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14012: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14079: 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}:14018: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14085: 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}:14022: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14139,12 +14206,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14142: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14209: 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}:14147: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14214: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14152,12 +14219,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14155: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14222: 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}:14160: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14227: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14168,7 +14235,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14171: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14238: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14193,17 +14260,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14196: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14263: 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}:14202: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14269: 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}:14206: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14324,7 +14391,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14327: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14394: 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
@@ -14332,7 +14399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14335 "configure"
+#line 14402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14351,16 +14418,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14357: \$? = $ac_status" >&5
+  echo "$as_me:14424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14363: \$? = $ac_status" >&5
+  echo "$as_me:14430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14371,7 +14438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14374: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14441: 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
 
@@ -14407,17 +14474,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14410: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14477: 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}:14416: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14483: 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}:14420: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14537,24 +14604,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14540: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14607: 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}:14547: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14614: 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}:14553: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14620: 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}:14557: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14674,24 +14741,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14677: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14744: 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}:14684: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14751: 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}:14690: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14757: 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}:14694: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14811,24 +14878,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14814: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14881: 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}:14821: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14888: 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}:14827: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14894: 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}:14831: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14948,7 +15015,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14951: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15018: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -14961,17 +15028,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:14964: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15031: 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}:14970: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15037: 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}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15092,14 +15159,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15095: checking for usable X dependency" >&5
+echo "$as_me:15162: 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 15102 "configure"
+#line 15169 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15119,16 +15186,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15125: \$? = $ac_status" >&5
+  echo "$as_me:15192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15131: \$? = $ac_status" >&5
+  echo "$as_me:15198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15138,30 +15205,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15141: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15208: 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}:15147: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15214: 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}:15154: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15221: 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}:15160: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15227: 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}:15164: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15284,12 +15351,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15287: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15354: 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}:15292: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15359: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15297,14 +15364,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15300: checking for usable X Toolkit package" >&5
+echo "$as_me:15367: 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 15307 "configure"
+#line 15374 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15320,16 +15387,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15326: \$? = $ac_status" >&5
+  echo "$as_me:15393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15332: \$? = $ac_status" >&5
+  echo "$as_me:15399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15339,7 +15406,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15342: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15353,22 +15420,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15356: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15423: 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}:15361: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15428: 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}:15367: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15434: 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}:15371: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15487,17 +15554,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15490: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15557: 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}:15496: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15563: 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}:15500: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15626,12 +15693,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15629: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15696: 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}:15634: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15701: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15651,7 +15718,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15654: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15736,7 +15803,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15746,7 +15813,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15749: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15756,7 +15823,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15759: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15826: 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"
@@ -15765,7 +15832,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15768 "configure"
+#line 15835 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15777,16 +15844,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15783: \$? = $ac_status" >&5
+  echo "$as_me:15850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15789: \$? = $ac_status" >&5
+  echo "$as_me:15856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15794,12 +15861,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15797: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15864: 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}:15802: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15807,13 +15874,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15810: checking for XOpenDisplay" >&5
+	echo "$as_me:15877: 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 15816 "configure"
+#line 15883 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15844,16 +15911,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15850: \$? = $ac_status" >&5
+  echo "$as_me:15917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:15923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15863,13 +15930,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15866: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15933: 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:15872: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:15939: 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
@@ -15877,7 +15944,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15880 "configure"
+#line 15947 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15896,16 +15963,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15902: \$? = $ac_status" >&5
+  echo "$as_me:15969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15908: \$? = $ac_status" >&5
+  echo "$as_me:15975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -15916,7 +15983,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15919: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:15986: 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
 
@@ -15940,13 +16007,13 @@ fi
 
 fi
 
-	echo "$as_me:15943: checking for XtAppInitialize" >&5
+	echo "$as_me:16010: 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 15949 "configure"
+#line 16016 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15977,16 +16044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15983: \$? = $ac_status" >&5
+  echo "$as_me:16050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15989: \$? = $ac_status" >&5
+  echo "$as_me:16056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -15996,13 +16063,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15999: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16066: 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:16005: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16072: 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
@@ -16010,7 +16077,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16013 "configure"
+#line 16080 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16029,16 +16096,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16035: \$? = $ac_status" >&5
+  echo "$as_me:16102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16041: \$? = $ac_status" >&5
+  echo "$as_me:16108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16049,7 +16116,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16052: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16119: 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
 
@@ -16066,7 +16133,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16069: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16136: 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
@@ -16107,14 +16174,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16110: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16177: 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:16113: checking for $cf_test" >&5
+			echo "$as_me:16180: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16117 "configure"
+#line 16184 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16128,16 +16195,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16134: \$? = $ac_status" >&5
+  echo "$as_me:16201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16140: \$? = $ac_status" >&5
+  echo "$as_me:16207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16146,7 +16213,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16149: result: $cf_result" >&5
+		echo "$as_me:16216: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16162,7 +16229,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16165: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16227,10 +16294,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16230: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16233 "configure"
+#line 16300 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16247,16 +16314,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16253: \$? = $ac_status" >&5
+  echo "$as_me:16320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16259: \$? = $ac_status" >&5
+  echo "$as_me:16326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16265,7 +16332,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16268: result: $cf_result" >&5
+		echo "$as_me:16335: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16282,7 +16349,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16285: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16352: 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
@@ -16316,7 +16383,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16319: checking for $ac_word" >&5
+echo "$as_me:16386: 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
@@ -16331,7 +16398,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16334: found $ac_dir/$ac_word" >&5
+echo "$as_me:16401: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16339,10 +16406,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16342: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16409: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16345: result: no" >&5
+  echo "$as_me:16412: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16355,7 +16422,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16358: checking for $ac_word" >&5
+echo "$as_me:16425: 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
@@ -16370,7 +16437,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16373: found $ac_dir/$ac_word" >&5
+echo "$as_me:16440: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16378,10 +16445,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16381: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16384: result: no" >&5
+  echo "$as_me:16451: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16516,7 +16583,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16519: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16601,7 +16668,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16604: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16611,7 +16678,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16614: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16621,7 +16688,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16624: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16691: 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"
@@ -16630,7 +16697,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16633 "configure"
+#line 16700 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16642,16 +16709,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16648: \$? = $ac_status" >&5
+  echo "$as_me:16715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16654: \$? = $ac_status" >&5
+  echo "$as_me:16721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16659,12 +16726,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16662: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16729: 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}:16667: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16672,7 +16739,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16675: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16742: 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
@@ -16680,7 +16747,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16683 "configure"
+#line 16750 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16699,16 +16766,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16705: \$? = $ac_status" >&5
+  echo "$as_me:16772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16711: \$? = $ac_status" >&5
+  echo "$as_me:16778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16719,7 +16786,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16722: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16789: 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
 
@@ -16741,7 +16808,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16744: checking for XCurses library" >&5
+echo "$as_me:16811: 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
@@ -16764,7 +16831,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16767 "configure"
+#line 16834 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16779,16 +16846,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16785: \$? = $ac_status" >&5
+  echo "$as_me:16852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16791: \$? = $ac_status" >&5
+  echo "$as_me:16858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16799,7 +16866,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16802: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16814,23 +16881,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16817: checking for xcurses.h" >&5
+	echo "$as_me:16884: 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 16823 "configure"
+#line 16890 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16827: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16894: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16833: \$? = $ac_status" >&5
+  echo "$as_me:16900: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16849,7 +16916,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16852: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16919: 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
 
@@ -16860,14 +16927,14 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:16863: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:16930: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:16870: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16875,7 +16942,7 @@ esac
 
 : ${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:16878: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+echo "$as_me:16945: 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
@@ -16883,7 +16950,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16886 "configure"
+#line 16953 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16902,16 +16969,16 @@ _nc_init_pthreads ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16908: \$? = $ac_status" >&5
+  echo "$as_me:16975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16914: \$? = $ac_status" >&5
+  echo "$as_me:16981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -16922,7 +16989,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:16992: 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
@@ -16957,7 +17024,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:16960: checking for X11 rgb file" >&5
+echo "$as_me:17027: 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.
@@ -17021,7 +17088,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17024: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17029,7 +17096,7 @@ esac
 
 fi
 
-echo "$as_me:17032: result: $RGB_PATH" >&5
+echo "$as_me:17099: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17070,7 +17137,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17073: checking for desired basename for form library" >&5
+echo "$as_me:17140: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17090,10 +17157,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17093: result: $FORM_NAME" >&5
+echo "$as_me:17160: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17096: checking for desired basename for menu library" >&5
+echo "$as_me:17163: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17113,10 +17180,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17116: result: $MENU_NAME" >&5
+echo "$as_me:17183: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17119: checking for desired basename for panel library" >&5
+echo "$as_me:17186: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17136,10 +17203,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17139: result: $PANEL_NAME" >&5
+echo "$as_me:17206: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17142: checking if you want to check for panel functions" >&5
+echo "$as_me:17209: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17156,7 +17223,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17159: result: $cf_enable_panel" >&5
+echo "$as_me:17226: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17167,13 +17234,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17170: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17173: result: yes" >&5
+		echo "$as_me:17240: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17176: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17323,7 +17390,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17326 "configure"
+#line 17393 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17335,37 +17402,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17341: \$? = $ac_status" >&5
+  echo "$as_me:17408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17347: \$? = $ac_status" >&5
+  echo "$as_me:17414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17353 "configure"
+#line 17420 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17363: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17368: \$? = $ac_status" >&5
+  echo "$as_me:17435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17382,7 +17449,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17385: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17452: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17403,7 +17470,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17406: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17411,7 +17478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17414 "configure"
+#line 17481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17430,16 +17497,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17436: \$? = $ac_status" >&5
+  echo "$as_me:17503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17442: \$? = $ac_status" >&5
+  echo "$as_me:17509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17450,7 +17517,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17453: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17520: 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
 
@@ -17483,7 +17550,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17486: checking if you want to check for menu functions" >&5
+echo "$as_me:17553: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17500,7 +17567,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17503: result: $cf_enable_menu" >&5
+echo "$as_me:17570: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17509,14 +17576,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17512: checking for NetBSD menu.h" >&5
+echo "$as_me:17579: 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 17519 "configure"
+#line 17586 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17534,16 +17601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17540: \$? = $ac_status" >&5
+  echo "$as_me:17607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17546: \$? = $ac_status" >&5
+  echo "$as_me:17613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17555,7 +17622,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17558: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17572,13 +17639,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17575: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17578: result: yes" >&5
+		echo "$as_me:17645: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17581: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17728,7 +17795,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17731 "configure"
+#line 17798 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17740,37 +17807,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17746: \$? = $ac_status" >&5
+  echo "$as_me:17813: \$? = $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:17816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17752: \$? = $ac_status" >&5
+  echo "$as_me:17819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17758 "configure"
+#line 17825 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17768: \$? = $ac_status" >&5
+  echo "$as_me:17835: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17773: \$? = $ac_status" >&5
+  echo "$as_me:17840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17787,7 +17854,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17790: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17857: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17808,7 +17875,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17811: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17816,7 +17883,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17819 "configure"
+#line 17886 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17835,16 +17902,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17841: \$? = $ac_status" >&5
+  echo "$as_me:17908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17847: \$? = $ac_status" >&5
+  echo "$as_me:17914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17855,7 +17922,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17858: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17925: 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
 
@@ -17888,7 +17955,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:17891: checking if you want to check for form functions" >&5
+echo "$as_me:17958: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -17905,7 +17972,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:17908: result: $cf_enable_form" >&5
+echo "$as_me:17975: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -17914,14 +17981,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17917: checking for NetBSD form.h" >&5
+echo "$as_me:17984: 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 17924 "configure"
+#line 17991 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17940,16 +18007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17946: \$? = $ac_status" >&5
+  echo "$as_me:18013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17952: \$? = $ac_status" >&5
+  echo "$as_me:18019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -17961,7 +18028,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17964: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -17978,13 +18045,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17981: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17984: result: yes" >&5
+		echo "$as_me:18051: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17987: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18134,7 +18201,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18137 "configure"
+#line 18204 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18146,37 +18213,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18152: \$? = $ac_status" >&5
+  echo "$as_me:18219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18158: \$? = $ac_status" >&5
+  echo "$as_me:18225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18164 "configure"
+#line 18231 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18174: \$? = $ac_status" >&5
+  echo "$as_me:18241: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18179: \$? = $ac_status" >&5
+  echo "$as_me:18246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18193,7 +18260,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18196: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18263: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18214,7 +18281,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18217: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18222,7 +18289,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18225 "configure"
+#line 18292 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18241,16 +18308,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18247: \$? = $ac_status" >&5
+  echo "$as_me:18314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18253: \$? = $ac_status" >&5
+  echo "$as_me:18320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18261,7 +18328,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18264: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18331: 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
 
@@ -18299,23 +18366,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18302: checking for $ac_header" >&5
+echo "$as_me:18369: 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 18308 "configure"
+#line 18375 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18312: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18379: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18318: \$? = $ac_status" >&5
+  echo "$as_me:18385: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18334,7 +18401,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18337: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18344,13 +18411,13 @@ EOF
 fi
 done
 
-echo "$as_me:18347: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18414: 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 18353 "configure"
+#line 18420 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18366,16 +18433,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18372: \$? = $ac_status" >&5
+  echo "$as_me:18439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18378: \$? = $ac_status" >&5
+  echo "$as_me:18445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18385,7 +18452,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18388: result: $ac_cv_header_time" >&5
+echo "$as_me:18455: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18408,23 +18475,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18411: checking for $ac_header" >&5
+echo "$as_me:18478: 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 18417 "configure"
+#line 18484 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18421: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18488: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18427: \$? = $ac_status" >&5
+  echo "$as_me:18494: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18443,7 +18510,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18446: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18456,23 +18523,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18459: checking for $ac_header" >&5
+echo "$as_me:18526: 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 18465 "configure"
+#line 18532 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18469: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18475: \$? = $ac_status" >&5
+  echo "$as_me:18542: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18491,7 +18558,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18494: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18501,7 +18568,7 @@ EOF
 fi
 done
 
-echo "$as_me:18504: checking for header declaring getopt variables" >&5
+echo "$as_me:18571: 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
@@ -18511,7 +18578,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18514 "configure"
+#line 18581 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18524,16 +18591,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18530: \$? = $ac_status" >&5
+  echo "$as_me:18597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18536: \$? = $ac_status" >&5
+  echo "$as_me:18603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18545,7 +18612,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18548: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18615: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18562,14 +18629,14 @@ EOF
 
 fi
 
-echo "$as_me:18565: checking for clock_gettime" >&5
+echo "$as_me:18632: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18572 "configure"
+#line 18639 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -18582,16 +18649,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18588: \$? = $ac_status" >&5
+  echo "$as_me:18655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18594: \$? = $ac_status" >&5
+  echo "$as_me:18661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18602,7 +18669,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18605: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18672: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -18613,13 +18680,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18616: checking for gettimeofday" >&5
+echo "$as_me:18683: 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 18622 "configure"
+#line 18689 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18650,16 +18717,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18656: \$? = $ac_status" >&5
+  echo "$as_me:18723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18662: \$? = $ac_status" >&5
+  echo "$as_me:18729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18669,7 +18736,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18672: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18739: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18679,7 +18746,7 @@ EOF
 
 else
 
-echo "$as_me:18682: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18749: 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
@@ -18687,7 +18754,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18690 "configure"
+#line 18757 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18706,16 +18773,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18712: \$? = $ac_status" >&5
+  echo "$as_me:18779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18718: \$? = $ac_status" >&5
+  echo "$as_me:18785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -18726,7 +18793,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18729: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18796: 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
 
@@ -18765,13 +18832,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18768: checking for $ac_func" >&5
+echo "$as_me:18835: 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 18774 "configure"
+#line 18841 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18802,16 +18869,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18808: \$? = $ac_status" >&5
+  echo "$as_me:18875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18814: \$? = $ac_status" >&5
+  echo "$as_me:18881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18821,7 +18888,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18824: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18891: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18832,14 +18899,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:18835: checking if we can use termcap.h" >&5
+echo "$as_me:18902: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18842 "configure"
+#line 18909 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -18860,16 +18927,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18866: \$? = $ac_status" >&5
+  echo "$as_me:18933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18872: \$? = $ac_status" >&5
+  echo "$as_me:18939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -18879,7 +18946,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18882: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:18949: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -18889,14 +18956,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18892: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:18959: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18899 "configure"
+#line 18966 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -18917,16 +18984,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18923: \$? = $ac_status" >&5
+  echo "$as_me:18990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18929: \$? = $ac_status" >&5
+  echo "$as_me:18996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -18936,7 +19003,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18939: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19006: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -18946,7 +19013,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:18949: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19016: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18965,13 +19032,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18968: checking for $ac_func" >&5
+echo "$as_me:19035: 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 18974 "configure"
+#line 19041 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19002,16 +19069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19008: \$? = $ac_status" >&5
+  echo "$as_me:19075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19014: \$? = $ac_status" >&5
+  echo "$as_me:19081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19021,7 +19088,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19024: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19091: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19033,7 +19100,7 @@ done
 
 fi
 
-echo "$as_me:19036: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19103: 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
@@ -19041,7 +19108,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19044 "configure"
+#line 19111 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19073,16 +19140,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19079: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19085: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19092,7 +19159,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19095 "configure"
+#line 19162 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19117,16 +19184,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19123: \$? = $ac_status" >&5
+  echo "$as_me:19190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19129: \$? = $ac_status" >&5
+  echo "$as_me:19196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19140,7 +19207,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19143: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19210: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19152,7 +19219,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19155: checking for term.h" >&5
+echo "$as_me:19222: 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
@@ -19173,7 +19240,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19176 "configure"
+#line 19243 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19187,16 +19254,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19193: \$? = $ac_status" >&5
+  echo "$as_me:19260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19199: \$? = $ac_status" >&5
+  echo "$as_me:19266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19215,7 +19282,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19218 "configure"
+#line 19285 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19233,16 +19300,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19239: \$? = $ac_status" >&5
+  echo "$as_me:19306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19245: \$? = $ac_status" >&5
+  echo "$as_me:19312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19257,7 +19324,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19260: result: $cf_cv_term_header" >&5
+echo "$as_me:19327: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19284,7 +19351,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19287: checking for unctrl.h" >&5
+echo "$as_me:19354: 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
@@ -19305,7 +19372,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19308 "configure"
+#line 19375 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19319,16 +19386,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19325: \$? = $ac_status" >&5
+  echo "$as_me:19392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19331: \$? = $ac_status" >&5
+  echo "$as_me:19398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19341,12 +19408,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19344: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19411: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19349: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19416: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19444,10 +19511,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19447: checking for ${cf_func}" >&5
+	echo "$as_me:19514: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19450: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19517: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19456,7 +19523,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19459 "configure"
+#line 19526 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19489,16 +19556,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19495: \$? = $ac_status" >&5
+  echo "$as_me:19562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19514,7 +19581,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19517: result: $cf_result" >&5
+	echo "$as_me:19584: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19529,10 +19596,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19532: checking for ${cf_func}" >&5
+	echo "$as_me:19599: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19535: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19602: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19541,7 +19608,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19544 "configure"
+#line 19611 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19574,16 +19641,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19580: \$? = $ac_status" >&5
+  echo "$as_me:19647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19586: \$? = $ac_status" >&5
+  echo "$as_me:19653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19599,7 +19666,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19602: result: $cf_result" >&5
+	echo "$as_me:19669: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19623,7 +19690,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19626 "configure"
+#line 19693 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19643,21 +19710,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19649: \$? = $ac_status" >&5
+  echo "$as_me:19716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19655: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19660: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19727: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19677,14 +19744,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19680: checking for ncurses extended functions" >&5
+echo "$as_me:19747: 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 19687 "configure"
+#line 19754 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19699,16 +19766,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19705: \$? = $ac_status" >&5
+  echo "$as_me:19772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19711: \$? = $ac_status" >&5
+  echo "$as_me:19778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19716,7 +19783,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19719 "configure"
+#line 19786 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19741,16 +19808,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19747: \$? = $ac_status" >&5
+  echo "$as_me:19814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19753: \$? = $ac_status" >&5
+  echo "$as_me:19820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19764,7 +19831,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19767: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19834: 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
@@ -19778,11 +19845,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19781: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19848: 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 19785 "configure"
+#line 19852 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19795,16 +19862,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19801: \$? = $ac_status" >&5
+  echo "$as_me:19868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19807: \$? = $ac_status" >&5
+  echo "$as_me:19874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19813,7 +19880,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19816 "configure"
+#line 19883 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19826,16 +19893,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19832: \$? = $ac_status" >&5
+  echo "$as_me:19899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19838: \$? = $ac_status" >&5
+  echo "$as_me:19905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19846,7 +19913,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19849: result: $cf_define_xpg5" >&5
+		echo "$as_me:19916: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19855,14 +19922,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19858: checking for wide-character functions" >&5
+	echo "$as_me:19925: 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 19865 "configure"
+#line 19932 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19879,16 +19946,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19885: \$? = $ac_status" >&5
+  echo "$as_me:19952: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19891: \$? = $ac_status" >&5
+  echo "$as_me:19958: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19899,7 +19966,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19902: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19969: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19920,14 +19987,14 @@ EOF
 
 fi
 
-echo "$as_me:19923: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19990: 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 19930 "configure"
+#line 19997 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19945,16 +20012,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19951: \$? = $ac_status" >&5
+  echo "$as_me:20018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19957: \$? = $ac_status" >&5
+  echo "$as_me:20024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -19965,21 +20032,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19968: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20035: 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:19975: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20042: 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 19982 "configure"
+#line 20049 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19999,16 +20066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20005: \$? = $ac_status" >&5
+  echo "$as_me:20072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20011: \$? = $ac_status" >&5
+  echo "$as_me:20078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20020,7 +20087,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20023: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20090: 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
@@ -20029,7 +20096,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20032: checking for openpty in -lutil" >&5
+echo "$as_me:20099: 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
@@ -20037,7 +20104,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20040 "configure"
+#line 20107 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20056,16 +20123,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20062: \$? = $ac_status" >&5
+  echo "$as_me:20129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20068: \$? = $ac_status" >&5
+  echo "$as_me:20135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20076,7 +20143,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20079: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20146: 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
@@ -20084,7 +20151,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20087: checking for openpty header" >&5
+echo "$as_me:20154: 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
@@ -20111,7 +20178,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20114 "configure"
+#line 20181 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20128,16 +20195,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20134: \$? = $ac_status" >&5
+  echo "$as_me:20201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20140: \$? = $ac_status" >&5
+  echo "$as_me:20207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20155,7 +20222,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20158: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20225: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20189,7 +20256,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20192: checking for function curses_version" >&5
+echo "$as_me:20259: 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
@@ -20199,7 +20266,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20202 "configure"
+#line 20269 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20215,15 +20282,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20218: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20221: \$? = $ac_status" >&5
+  echo "$as_me:20288: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20226: \$? = $ac_status" >&5
+  echo "$as_me:20293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20238,14 +20305,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20241: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20308: 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:20248: checking for alternate character set array" >&5
+echo "$as_me:20315: 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
@@ -20255,7 +20322,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20258 "configure"
+#line 20325 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20271,16 +20338,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20277: \$? = $ac_status" >&5
+  echo "$as_me:20344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20283: \$? = $ac_status" >&5
+  echo "$as_me:20350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20291,7 +20358,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20294: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20361: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20301,7 +20368,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20304: checking for wide alternate character set array" >&5
+echo "$as_me:20371: 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
@@ -20311,7 +20378,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20314 "configure"
+#line 20381 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20327,16 +20394,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20333: \$? = $ac_status" >&5
+  echo "$as_me:20400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20339: \$? = $ac_status" >&5
+  echo "$as_me:20406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20347,7 +20414,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20350: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20417: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20355,7 +20422,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20358: checking for wide alternate character constants" >&5
+echo "$as_me:20425: 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
@@ -20365,7 +20432,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20368 "configure"
+#line 20435 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20382,16 +20449,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20388: \$? = $ac_status" >&5
+  echo "$as_me:20455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20394: \$? = $ac_status" >&5
+  echo "$as_me:20461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20401,7 +20468,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20404 "configure"
+#line 20471 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20417,16 +20484,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20437,7 +20504,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20440: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20507: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20447,10 +20514,10 @@ EOF
 
 fi
 
-echo "$as_me:20450: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20517: 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 20453 "configure"
+#line 20520 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20468,16 +20535,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20474: \$? = $ac_status" >&5
+  echo "$as_me:20541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20480: \$? = $ac_status" >&5
+  echo "$as_me:20547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20486,7 +20553,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20489: result: $cf_result" >&5
+echo "$as_me:20556: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20507,14 +20574,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20510: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20577: 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 20517 "configure"
+#line 20584 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20532,23 +20599,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20538: \$? = $ac_status" >&5
+  echo "$as_me:20605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20544: \$? = $ac_status" >&5
+  echo "$as_me:20611: \$? = $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 20551 "configure"
+#line 20618 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20567,16 +20634,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20573: \$? = $ac_status" >&5
+  echo "$as_me:20640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20579: \$? = $ac_status" >&5
+  echo "$as_me:20646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20588,7 +20655,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20591: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20658: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20611,14 +20678,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20614: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20681: 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 20621 "configure"
+#line 20688 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20636,23 +20703,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20642: \$? = $ac_status" >&5
+  echo "$as_me:20709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20648: \$? = $ac_status" >&5
+  echo "$as_me:20715: \$? = $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 20655 "configure"
+#line 20722 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20671,16 +20738,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20677: \$? = $ac_status" >&5
+  echo "$as_me:20744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20683: \$? = $ac_status" >&5
+  echo "$as_me:20750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20692,7 +20759,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20695: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20762: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20715,14 +20782,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20718: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20785: 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 20725 "configure"
+#line 20792 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20740,23 +20807,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20746: \$? = $ac_status" >&5
+  echo "$as_me:20813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20752: \$? = $ac_status" >&5
+  echo "$as_me:20819: \$? = $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 20759 "configure"
+#line 20826 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20775,16 +20842,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20781: \$? = $ac_status" >&5
+  echo "$as_me:20848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20787: \$? = $ac_status" >&5
+  echo "$as_me:20854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20796,7 +20863,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20799: result: $cf_cv_wint_t" >&5
+echo "$as_me:20866: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20820,10 +20887,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20823: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20890: 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 20826 "configure"
+#line 20893 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20841,16 +20908,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20847: \$? = $ac_status" >&5
+  echo "$as_me:20914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20853: \$? = $ac_status" >&5
+  echo "$as_me:20920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20859,7 +20926,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20862: result: $cf_result" >&5
+echo "$as_me:20929: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20881,10 +20948,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20884: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20951: 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 20887 "configure"
+#line 20954 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20902,16 +20969,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20908: \$? = $ac_status" >&5
+  echo "$as_me:20975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20914: \$? = $ac_status" >&5
+  echo "$as_me:20981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20920,7 +20987,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20923: result: $cf_result" >&5
+echo "$as_me:20990: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20942,10 +21009,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:20945: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21012: 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 20948 "configure"
+#line 21015 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20963,16 +21030,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20969: \$? = $ac_status" >&5
+  echo "$as_me:21036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20975: \$? = $ac_status" >&5
+  echo "$as_me:21042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20981,7 +21048,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20984: result: $cf_result" >&5
+echo "$as_me:21051: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21010,11 +21077,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21013: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21080: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21017 "configure"
+#line 21084 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21047,16 +21114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21053: \$? = $ac_status" >&5
+  echo "$as_me:21120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21059: \$? = $ac_status" >&5
+  echo "$as_me:21126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21066,7 +21133,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21069: result: $cf_result" >&5
+echo "$as_me:21136: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21078,14 +21145,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21081: checking for data $cf_data in library" >&5
+	echo "$as_me:21148: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21088 "configure"
+#line 21155 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21124,16 +21191,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:21197: \$? = $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:21200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21136: \$? = $ac_status" >&5
+  echo "$as_me:21203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21145,7 +21212,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21148 "configure"
+#line 21215 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21177,15 +21244,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21183: \$? = $ac_status" >&5
+  echo "$as_me:21250: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21188: \$? = $ac_status" >&5
+  echo "$as_me:21255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21197,7 +21264,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21200: result: $cf_result" >&5
+	echo "$as_me:21267: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21214,7 +21281,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21217: checking for X" >&5
+	echo "$as_me:21284: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21318,17 +21385,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21321 "configure"
+#line 21388 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21392: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21331: \$? = $ac_status" >&5
+  echo "$as_me:21398: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21361,7 +21428,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21364 "configure"
+#line 21431 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21373,16 +21440,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21379: \$? = $ac_status" >&5
+  echo "$as_me:21446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21385: \$? = $ac_status" >&5
+  echo "$as_me:21452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21420,7 +21487,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21423: result: $have_x" >&5
+  echo "$as_me:21490: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21430,7 +21497,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21433: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21500: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21457,11 +21524,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21460: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21527: 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 21464 "configure"
+#line 21531 "configure"
 #include "confdefs.h"
 
 int
@@ -21473,16 +21540,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21543: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21479: \$? = $ac_status" >&5
+  echo "$as_me:21546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21485: \$? = $ac_status" >&5
+  echo "$as_me:21552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21492,13 +21559,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21495: result: no" >&5
+	echo "$as_me:21562: 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 21501 "configure"
+#line 21568 "configure"
 #include "confdefs.h"
 
 int
@@ -21510,16 +21577,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21516: \$? = $ac_status" >&5
+  echo "$as_me:21583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21522: \$? = $ac_status" >&5
+  echo "$as_me:21589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21529,11 +21596,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21532: result: yes" >&5
+	  echo "$as_me:21599: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21536: result: neither works" >&5
+	  echo "$as_me:21603: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21553,7 +21620,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21556 "configure"
+#line 21623 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21572,22 +21639,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21578: \$? = $ac_status" >&5
+  echo "$as_me:21645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21584: \$? = $ac_status" >&5
+  echo "$as_me:21651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21590: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21657: 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
@@ -21595,7 +21662,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21598 "configure"
+#line 21665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21614,16 +21681,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21620: \$? = $ac_status" >&5
+  echo "$as_me:21687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21626: \$? = $ac_status" >&5
+  echo "$as_me:21693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21634,14 +21701,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21637: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21704: 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:21644: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21711: 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
@@ -21649,7 +21716,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21652 "configure"
+#line 21719 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21668,16 +21735,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21674: \$? = $ac_status" >&5
+  echo "$as_me:21741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21680: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21688,7 +21755,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21691: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21758: 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"
@@ -21707,13 +21774,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21710: checking for gethostbyname" >&5
+    echo "$as_me:21777: 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 21716 "configure"
+#line 21783 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21744,16 +21811,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21750: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21756: \$? = $ac_status" >&5
+  echo "$as_me:21823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21763,11 +21830,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21766: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21833: 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:21770: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21837: 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
@@ -21775,7 +21842,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21778 "configure"
+#line 21845 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21794,16 +21861,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21800: \$? = $ac_status" >&5
+  echo "$as_me:21867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21806: \$? = $ac_status" >&5
+  echo "$as_me:21873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21814,14 +21881,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21817: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21884: 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:21824: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21891: 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
@@ -21829,7 +21896,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21832 "configure"
+#line 21899 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21848,16 +21915,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21854: \$? = $ac_status" >&5
+  echo "$as_me:21921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21860: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21868,7 +21935,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21871: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21938: 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"
@@ -21884,13 +21951,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21887: checking for connect" >&5
+    echo "$as_me:21954: 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 21893 "configure"
+#line 21960 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21921,16 +21988,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21933: \$? = $ac_status" >&5
+  echo "$as_me:22000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -21940,11 +22007,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21943: result: $ac_cv_func_connect" >&5
+echo "$as_me:22010: 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:21947: checking for connect in -lsocket" >&5
+      echo "$as_me:22014: 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
@@ -21952,7 +22019,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21955 "configure"
+#line 22022 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21971,16 +22038,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21977: \$? = $ac_status" >&5
+  echo "$as_me:22044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21983: \$? = $ac_status" >&5
+  echo "$as_me:22050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -21991,7 +22058,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21994: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22061: 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"
@@ -22000,13 +22067,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22003: checking for remove" >&5
+    echo "$as_me:22070: 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 22009 "configure"
+#line 22076 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22037,16 +22104,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22043: \$? = $ac_status" >&5
+  echo "$as_me:22110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22049: \$? = $ac_status" >&5
+  echo "$as_me:22116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22056,11 +22123,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22059: result: $ac_cv_func_remove" >&5
+echo "$as_me:22126: 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:22063: checking for remove in -lposix" >&5
+      echo "$as_me:22130: 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
@@ -22068,7 +22135,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22071 "configure"
+#line 22138 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22087,16 +22154,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22090: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22093: \$? = $ac_status" >&5
+  echo "$as_me:22160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22099: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22107,7 +22174,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22110: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22177: 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"
@@ -22116,13 +22183,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22119: checking for shmat" >&5
+    echo "$as_me:22186: 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 22125 "configure"
+#line 22192 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22153,16 +22220,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22159: \$? = $ac_status" >&5
+  echo "$as_me:22226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22165: \$? = $ac_status" >&5
+  echo "$as_me:22232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22172,11 +22239,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22175: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22242: 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:22179: checking for shmat in -lipc" >&5
+      echo "$as_me:22246: 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
@@ -22184,7 +22251,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22187 "configure"
+#line 22254 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22203,16 +22270,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22209: \$? = $ac_status" >&5
+  echo "$as_me:22276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22215: \$? = $ac_status" >&5
+  echo "$as_me:22282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22223,7 +22290,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22226: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22293: 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"
@@ -22241,7 +22308,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22244: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22311: 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
@@ -22249,7 +22316,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22252 "configure"
+#line 22319 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22268,16 +22335,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22274: \$? = $ac_status" >&5
+  echo "$as_me:22341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22288,7 +22355,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22291: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22358: 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"
@@ -22335,16 +22402,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22338: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22405: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22343: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22410: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22347: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22414: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22383,16 +22450,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22386: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22453: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22391: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22458: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22395: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22462: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22431,23 +22498,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22434: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22501: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22439: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22506: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22443: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22510: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22450: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22517: 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.
@@ -22464,7 +22531,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22467: result: $enable_warnings" >&5
+echo "$as_me:22534: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22487,10 +22554,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22490: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22557: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22493 "${as_me:-configure}"
+#line 22560 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22540,12 +22607,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22543: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22546: \$? = $ac_status" >&5
+  echo "$as_me:22613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22548: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22615: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22623,7 +22690,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22626 "configure"
+#line 22693 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22638,26 +22705,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22644: \$? = $ac_status" >&5
+  echo "$as_me:22711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22650: \$? = $ac_status" >&5
+  echo "$as_me:22717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22653: checking for X11/Xt const-feature" >&5
+echo "$as_me:22720: 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 22660 "configure"
+#line 22727 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -22674,16 +22741,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22680: \$? = $ac_status" >&5
+  echo "$as_me:22747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22686: \$? = $ac_status" >&5
+  echo "$as_me:22753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22698,7 +22765,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22701: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22768: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22727,7 +22794,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22730 "${as_me:-configure}"
+#line 22797 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22743,7 +22810,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22746: checking for $CC warning options..." >&5
+	{ echo "$as_me:22813: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22759,12 +22826,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22762: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22765: \$? = $ac_status" >&5
+  echo "$as_me:22832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22767: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22834: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22772,7 +22839,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22775: checking for $CC warning options..." >&5
+	{ echo "$as_me:22842: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22795,12 +22862,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22798: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22801: \$? = $ac_status" >&5
+  echo "$as_me:22868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22803: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22870: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22808,7 +22875,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22811: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22878: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22818,7 +22885,7 @@ echo "${as_me:-configure}:22811: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22821: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22888: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22835,7 +22902,7 @@ fi
 
 fi
 
-echo "$as_me:22838: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22905: 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.
@@ -22857,7 +22924,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22860: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22927: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22971,23 +23038,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:22974: checking for dmalloc.h" >&5
+	echo "$as_me:23041: 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 22980 "configure"
+#line 23047 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22984: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22990: \$? = $ac_status" >&5
+  echo "$as_me:23057: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23006,11 +23073,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23009: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23076: 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:23013: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23080: 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
@@ -23018,7 +23085,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23021 "configure"
+#line 23088 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23037,16 +23104,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23043: \$? = $ac_status" >&5
+  echo "$as_me:23110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23049: \$? = $ac_status" >&5
+  echo "$as_me:23116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23057,7 +23124,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23060: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23127: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23072,7 +23139,7 @@ fi
 
 fi
 
-echo "$as_me:23075: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23142: 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.
@@ -23094,7 +23161,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23097: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23164: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23208,23 +23275,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23211: checking for dbmalloc.h" >&5
+	echo "$as_me:23278: 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 23217 "configure"
+#line 23284 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23288: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23227: \$? = $ac_status" >&5
+  echo "$as_me:23294: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23243,11 +23310,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23246: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23313: 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:23250: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23317: 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
@@ -23255,7 +23322,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23258 "configure"
+#line 23325 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23274,16 +23341,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23280: \$? = $ac_status" >&5
+  echo "$as_me:23347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23286: \$? = $ac_status" >&5
+  echo "$as_me:23353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23294,7 +23361,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23297: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23364: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23309,7 +23376,7 @@ fi
 
 fi
 
-echo "$as_me:23312: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23379: 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.
@@ -23331,7 +23398,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23334: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23401: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23444,7 +23511,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23447: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23514: 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.
@@ -23455,7 +23522,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23458: result: $with_no_leaks" >&5
+echo "$as_me:23525: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23473,7 +23540,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23476: checking for an rpath option" >&5
+	echo "$as_me:23543: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23504,12 +23571,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23507: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23574: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23512: checking if we need a space after rpath option" >&5
+		echo "$as_me:23579: 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"
 
@@ -23530,7 +23597,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23533 "configure"
+#line 23600 "configure"
 #include "confdefs.h"
 
 int
@@ -23542,16 +23609,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23548: \$? = $ac_status" >&5
+  echo "$as_me:23615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23554: \$? = $ac_status" >&5
+  echo "$as_me:23621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23561,14 +23628,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23564: result: $cf_rpath_space" >&5
+		echo "$as_me:23631: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23571: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23638: 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.
@@ -23586,22 +23653,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23589: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23656: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23594: checking for updated LDFLAGS" >&5
+echo "$as_me:23661: 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:23597: result: maybe" >&5
+	echo "$as_me:23664: 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:23604: checking for $ac_word" >&5
+echo "$as_me:23671: 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
@@ -23616,7 +23683,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23619: found $ac_dir/$ac_word" >&5
+echo "$as_me:23686: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23624,10 +23691,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23627: result: $cf_ldd_prog" >&5
+  echo "$as_me:23694: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23630: result: no" >&5
+  echo "$as_me:23697: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23641,7 +23708,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23644 "configure"
+#line 23711 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23653,16 +23720,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23659: \$? = $ac_status" >&5
+  echo "$as_me:23726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23665: \$? = $ac_status" >&5
+  echo "$as_me:23732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23690,7 +23757,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23693: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23760: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23702,11 +23769,11 @@ echo "${as_me:-configure}:23693: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23705: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23772: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23709: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23776: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23743,7 +23810,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23746: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23813: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23756,11 +23823,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23759: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23826: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23763: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23830: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23797,7 +23864,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23800: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23867: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23810,14 +23877,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23813: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23880: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23817: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23884: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23820: result: no" >&5
+	echo "$as_me:23887: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23907,7 +23974,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23910: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23977: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24043,7 +24110,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230114,
+configured by $0, generated by GNU Autoconf 2.52.20230903,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -24088,7 +24155,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24091: error: ambiguous option: $1
+    { { echo "$as_me:24158: 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;}
@@ -24107,7 +24174,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24110: error: unrecognized option: $1
+  -*) { { echo "$as_me:24177: 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;}
@@ -24126,7 +24193,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230114, executed with
+This file was extended by $as_me 2.52.20230903, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -24157,7 +24224,7 @@ do
   "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:24160: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24227: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24465,7 +24532,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24468: creating $ac_file" >&5
+    { echo "$as_me:24535: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24483,7 +24550,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24486: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24553: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24496,7 +24563,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24499: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24566: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24512,7 +24579,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24515: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24582: 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;}
@@ -24521,7 +24588,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24524: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24591: 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;}
@@ -24549,11 +24616,11 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out
   rm -f "$tmp"/stdin
 EOF
-: "${FGREP:=grep -F}"
-: "${EGREP:=grep -E}"
+test -n "${FGREP}" || FGREP="grep -F"
+test -n "${EGREP}" || EGREP="grep -E"
 cat >>"$CONFIG_STATUS" <<EOF
-  : "\${FGREP:=$FGREP}"
-  : "\${EGREP:=$EGREP}"
+  test -n "\${FGREP}" || FGREP="$FGREP"
+  test -n "\${EGREP}" || EGREP="$EGREP"
 EOF
 cat >>"$CONFIG_STATUS" <<\EOF
   if test x"$ac_file" != x-; then
@@ -24566,7 +24633,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24569: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24636: 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;}
@@ -24577,7 +24644,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24580: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24647: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24626,7 +24693,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24629: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24696: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24637,7 +24704,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24640: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24707: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24650,7 +24717,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24653: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24720: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24708,7 +24775,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24711: $ac_file is unchanged" >&5
+      { echo "$as_me:24778: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

From 0c2d5c088081c9395edcdd5f430df6e905695795 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Tue, 17 Oct 2023 01:56:15 +0200
Subject: [PATCH 035/106] ncurses-6.4-20231016.patch

---
 INSTALL                          |    6 +-
 NEWS                             |    6 +-
 VERSION                          |    2 +-
 configure                        | 5059 +++++++++++++++---------------
 configure.in                     |   13 +-
 dist.mk                          |    4 +-
 ncurses/tinfo/lib_setup.c        |    8 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/debian/rules             |    3 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    2 +-
 package/ncursest.spec            |    2 +-
 15 files changed, 2581 insertions(+), 2542 deletions(-)

diff --git a/INSTALL b/INSTALL
index fec266fec..03732eb55 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.247 2023/07/22 17:25:24 tom Exp $
+-- $Id: INSTALL,v 1.248 2023/10/16 23:06:54 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -551,6 +551,10 @@ CONFIGURE OPTIONS:
 	Recognize BSD-style prefix padding.  Some ancient BSD programs (such as
 	nethack) call tputs("50") to implement delays.
 
+    --enable-check-size
+	Compile-in feature to detect screensize for terminals which do not
+	advertise their screensize, e.g., serial terminals.
+
     --enable-colorfgbg
 	Compile with experimental $COLORFGBG code.  That environment variable
 	is set by some terminal emulators as a hint to applications, by
diff --git a/NEWS b/NEWS
index 6fa56fc57..a44fbd7a1 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4014 2023/10/14 19:43:34 tom Exp $
+-- $Id: NEWS,v 1.4016 2023/10/16 23:09:02 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231016
+	+ make the recent change to setupterm optional "--enable-check-size"
+	  (Debian #1054022).
+
 20231014
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng
diff --git a/VERSION b/VERSION
index 7be90bfb2..38be905da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231014
+5:0:10	6.4	20231016
diff --git a/configure b/configure
index 1b1e9e921..7b2e574d6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.765 .
+# From configure.in Revision: 1.766 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230903.
 #
@@ -841,6 +841,7 @@ Development Code:
 Experimental Code:
   --disable-assumed-color do not assume anything about default-colors
   --disable-hashmap       compile without hashmap scrolling-optimization
+  --enable-check-size     compile-in code to detect screensize
   --enable-colorfgbg      compile-in experimental $COLORFGBG code
   --enable-fvisibility    compile with -fvisibility=hidden
   --enable-interop        compile-in interop bindings
@@ -1071,7 +1072,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1074: loading site script $ac_site_file" >&5
+    { echo "$as_me:1075: 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"
@@ -1082,7 +1083,7 @@ if test -r "$cache_file"; then
   # 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:1085: loading cache $cache_file" >&5
+    { echo "$as_me:1086: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1090,7 +1091,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1093: creating cache $cache_file" >&5
+  { echo "$as_me:1094: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1106,21 +1107,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1109: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1110: 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:1113: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1114: 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:1119: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1120: 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:1121:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1122:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1123:   current value: $ac_new_val" >&5
+        { echo "$as_me:1124:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1139,9 +1140,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1142: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1143: 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:1144: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1145: 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
@@ -1170,10 +1171,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1173: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1174: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1176: \$? = $ac_status" >&5
+  echo "$as_me:1177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1190,7 +1191,7 @@ for ac_prog in ggrep grep
 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:1193: checking for $ac_word" >&5
+echo "$as_me:1194: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1205,7 +1206,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1208: found $ac_dir/$ac_word" >&5
+echo "$as_me:1209: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1213,10 +1214,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1216: result: $GREP" >&5
+  echo "$as_me:1217: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1219: result: no" >&5
+  echo "$as_me:1220: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1224,7 +1225,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1227: checking for egrep" >&5
+echo "$as_me:1228: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1236,7 +1237,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1239: checking for $ac_word" >&5
+echo "$as_me:1240: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1253,7 +1254,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:1256: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1257: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1264,10 +1265,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:1267: result: $EGREP" >&5
+  echo "$as_me:1268: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:1270: result: no" >&5
+  echo "$as_me:1271: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1275,12 +1276,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1278: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1279: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1283: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:1284: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -1291,11 +1292,11 @@ cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_abi_default=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
-echo "$as_me:1294: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+echo "$as_me:1295: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
 
 if test -f "$srcdir/VERSION" ; then
-	echo "$as_me:1298: checking for package version" >&5
+	echo "$as_me:1299: 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...
@@ -1307,39 +1308,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1310: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1311: 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:1315: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1316: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1319: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1320: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1322: checking for package patch date" >&5
+	echo "$as_me:1323: 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:1327: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1328: 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:1334: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1335: 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:1339: result: $VERSION_PATCH" >&5
+	echo "$as_me:1340: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1342: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1343: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1347,19 +1348,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
 
-echo "${as_me:-configure}:1350: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1351: testing ABI VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me:-configure}:1354: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1355: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me:-configure}:1358: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1359: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me:-configure}:1362: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1363: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
 	cf_PACKAGE=NCURSES
 	PACKAGE=ncurses
@@ -1383,7 +1384,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1386: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1387: 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;
@@ -1397,13 +1398,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1400: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1401: 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:1406: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1407: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1413,13 +1414,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1416: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1417: 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:1422: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1423: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1432,7 +1433,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1435: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1436: 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.*)
@@ -1451,13 +1452,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1454: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1455: 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:1460: error: ABI version value is empty" >&5
+  { { echo "$as_me:1461: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1490,7 +1491,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1493: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1494: 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
@@ -1500,11 +1501,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1503: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1504: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1507: checking build system type" >&5
+echo "$as_me:1508: 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
@@ -1513,23 +1514,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1516: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1517: 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:1520: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1521: 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:1525: result: $ac_cv_build" >&5
+echo "$as_me:1526: 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:1532: checking host system type" >&5
+echo "$as_me:1533: 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
@@ -1538,12 +1539,12 @@ else
 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:1541: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1542: 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:1546: result: $ac_cv_host" >&5
+echo "$as_me:1547: 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/'`
@@ -1551,7 +1552,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1554: checking target system type" >&5
+	echo "$as_me:1555: 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
@@ -1560,12 +1561,12 @@ else
 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:1563: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1564: 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:1568: result: $ac_cv_target" >&5
+echo "$as_me:1569: 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/'`
@@ -1597,13 +1598,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1600: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1601: 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:1604: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1605: 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:1606: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1607: 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
@@ -1611,7 +1612,7 @@ fi
 # 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:1614: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1615: 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
@@ -1622,7 +1623,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1625: checking for fgrep" >&5
+echo "$as_me:1626: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1634,7 +1635,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1637: checking for $ac_word" >&5
+echo "$as_me:1638: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1651,7 +1652,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1654: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1655: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1662,10 +1663,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1665: result: $FGREP" >&5
+  echo "$as_me:1666: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1668: result: no" >&5
+  echo "$as_me:1669: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1673,16 +1674,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1676: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1677: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1681: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1682: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1685: checking for prefix" >&5
+echo "$as_me:1686: 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
@@ -1694,11 +1695,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1697: result: $prefix" >&5
+echo "$as_me:1698: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1701: checking for default include-directory" >&5
+echo "$as_me:1702: 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 \
@@ -1721,7 +1722,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1724: result: $includedir" >&5
+echo "$as_me:1725: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1784,20 +1785,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1787: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1788: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1793: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1794: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1800: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1801: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1832,7 +1833,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1835: checking for $ac_word" >&5
+echo "$as_me:1836: 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
@@ -1847,7 +1848,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1850: found $ac_dir/$ac_word" >&5
+echo "$as_me:1851: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1855,10 +1856,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1858: result: $CC" >&5
+  echo "$as_me:1859: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1861: result: no" >&5
+  echo "$as_me:1862: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1871,7 +1872,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1874: checking for $ac_word" >&5
+echo "$as_me:1875: 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
@@ -1886,7 +1887,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1889: found $ac_dir/$ac_word" >&5
+echo "$as_me:1890: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1894,10 +1895,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1897: result: $ac_ct_CC" >&5
+  echo "$as_me:1898: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1900: result: no" >&5
+  echo "$as_me:1901: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1907,32 +1908,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1910: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1911: 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:1915:" \
+echo "$as_me:1916:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1918: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1919: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1921: \$? = $ac_status" >&5
+  echo "$as_me:1922: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1923: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1924: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1926: \$? = $ac_status" >&5
+  echo "$as_me:1927: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1928: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1929: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1931: \$? = $ac_status" >&5
+  echo "$as_me:1932: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1935 "configure"
+#line 1936 "configure"
 #include "confdefs.h"
 
 int
@@ -1948,13 +1949,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1951: checking for C compiler default output" >&5
+echo "$as_me:1952: 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:1954: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1955: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1957: \$? = $ac_status" >&5
+  echo "$as_me:1958: \$? = $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
@@ -1977,34 +1978,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1980: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1981: 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:1986: result: $ac_file" >&5
+echo "$as_me:1987: 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:1991: checking whether the C compiler works" >&5
+echo "$as_me:1992: 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:1997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2000: \$? = $ac_status" >&5
+  echo "$as_me:2001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2007: error: cannot run C compiled programs.
+	{ { echo "$as_me:2008: 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;}
@@ -2012,24 +2013,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2015: result: yes" >&5
+echo "$as_me:2016: 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:2022: checking whether we are cross compiling" >&5
+echo "$as_me:2023: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2024: result: $cross_compiling" >&5
+echo "$as_me:2025: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2027: checking for executable suffix" >&5
+echo "$as_me:2028: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2032: \$? = $ac_status" >&5
+  echo "$as_me:2033: \$? = $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
@@ -2045,25 +2046,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2048: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2049: 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:2054: result: $ac_cv_exeext" >&5
+echo "$as_me:2055: 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:2060: checking for object suffix" >&5
+echo "$as_me:2061: 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 2066 "configure"
+#line 2067 "configure"
 #include "confdefs.h"
 
 int
@@ -2075,10 +2076,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2081: \$? = $ac_status" >&5
+  echo "$as_me:2082: \$? = $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
@@ -2090,24 +2091,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2093: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2094: 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:2100: result: $ac_cv_objext" >&5
+echo "$as_me:2101: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2104: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2105: 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 2110 "configure"
+#line 2111 "configure"
 #include "confdefs.h"
 
 int
@@ -2122,16 +2123,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2128: \$? = $ac_status" >&5
+  echo "$as_me:2129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2134: \$? = $ac_status" >&5
+  echo "$as_me:2135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2143,19 +2144,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2146: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2147: 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:2152: checking whether $CC accepts -g" >&5
+echo "$as_me:2153: 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 2158 "configure"
+#line 2159 "configure"
 #include "confdefs.h"
 
 int
@@ -2167,16 +2168,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2173: \$? = $ac_status" >&5
+  echo "$as_me:2174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2179: \$? = $ac_status" >&5
+  echo "$as_me:2180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2186,7 +2187,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2189: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2190: 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
@@ -2213,16 +2214,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2219: \$? = $ac_status" >&5
+  echo "$as_me:2220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2225: \$? = $ac_status" >&5
+  echo "$as_me:2226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2234,7 +2235,7 @@ if { (eval echo "$as_me:2216: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2237 "configure"
+#line 2238 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2247,16 +2248,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2253: \$? = $ac_status" >&5
+  echo "$as_me:2254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2259: \$? = $ac_status" >&5
+  echo "$as_me:2260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2266,7 +2267,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2269 "configure"
+#line 2270 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2278,16 +2279,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2284: \$? = $ac_status" >&5
+  echo "$as_me:2285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2290: \$? = $ac_status" >&5
+  echo "$as_me:2291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2317,11 +2318,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2320: checking version of $CC" >&5
+	echo "$as_me:2321: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2324: result: $GCC_VERSION" >&5
+	echo "$as_me:2325: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2330,12 +2331,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2333: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2334: 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 2338 "configure"
+#line 2339 "configure"
 #include "confdefs.h"
 
 int
@@ -2352,16 +2353,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2358: \$? = $ac_status" >&5
+  echo "$as_me:2359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2364: \$? = $ac_status" >&5
+  echo "$as_me:2365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2372,7 +2373,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2375: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2376: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2381,11 +2382,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2384: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2385: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2388 "configure"
+#line 2389 "configure"
 #include "confdefs.h"
 
 int
@@ -2402,16 +2403,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2408: \$? = $ac_status" >&5
+  echo "$as_me:2409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2414: \$? = $ac_status" >&5
+  echo "$as_me:2415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2421,7 +2422,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2424: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2425: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2430,30 +2431,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2433: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2434: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2440: checking version of $CC" >&5
+	echo "$as_me:2441: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2444: result: $CLANG_VERSION" >&5
+	echo "$as_me:2445: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2451: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2452: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2456 "configure"
+#line 2457 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2467,16 +2468,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2473: \$? = $ac_status" >&5
+  echo "$as_me:2474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2479: \$? = $ac_status" >&5
+  echo "$as_me:2480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2487,13 +2488,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2490: result: $cf_clang_optok" >&5
+		echo "$as_me:2491: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2496: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2497: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2502,7 +2503,7 @@ echo "${as_me:-configure}:2496: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2505: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2506: 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
@@ -2510,7 +2511,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2513 "configure"
+#line 2514 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2557,16 +2558,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2563: \$? = $ac_status" >&5
+  echo "$as_me:2564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2566: \"$ac_try\"") >&5
+  { (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
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2583,10 +2584,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2586: result: none needed" >&5
+    echo "$as_me:2587: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2589: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2590: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2594,13 +2595,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2597: checking \$CFLAGS variable" >&5
+echo "$as_me:2598: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2601: result: broken" >&5
+	echo "$as_me:2602: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2603: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2604: 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=
@@ -2708,18 +2709,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2711: result: ok" >&5
+	echo "$as_me:2712: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2716: checking \$CC variable" >&5
+echo "$as_me:2717: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2720: result: broken" >&5
+	echo "$as_me:2721: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2722: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2723: 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/[ ]*[ ]-[^ ].*//'`
@@ -2836,19 +2837,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2839: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2840: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2843: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2844: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2847: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2848: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2851: result: ok" >&5
+	echo "$as_me:2852: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2859,7 +2860,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2862: checking how to run the C preprocessor" >&5
+echo "$as_me:2863: 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
@@ -2880,18 +2881,18 @@ do
   # 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 2883 "configure"
+#line 2884 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2889: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2894: \$? = $ac_status" >&5
+  echo "$as_me:2895: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2914,17 +2915,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2917 "configure"
+#line 2918 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2927: \$? = $ac_status" >&5
+  echo "$as_me:2928: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2961,7 +2962,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2964: result: $CPP" >&5
+echo "$as_me:2965: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2971,18 +2972,18 @@ do
   # 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 2974 "configure"
+#line 2975 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2979: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2980: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2985: \$? = $ac_status" >&5
+  echo "$as_me:2986: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3005,17 +3006,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3008 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3012: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3013: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3018: \$? = $ac_status" >&5
+  echo "$as_me:3019: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3043,7 +3044,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3046: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3047: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3056,14 +3057,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3059: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3060: 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 3066 "configure"
+#line 3067 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3078,7 +3079,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3081 "configure"
+#line 3082 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3091,14 +3092,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3094: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3095: 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:3101: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3102: 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
@@ -3113,15 +3114,15 @@ CF_EOF
 # 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:3116: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3119: \$? = $ac_status" >&5
+  echo "$as_me:3120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3121: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3124: \$? = $ac_status" >&5
+  echo "$as_me:3125: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3132,10 +3133,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3135: result: yes" >&5
+  echo "$as_me:3136: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3138: result: no" >&5
+  echo "$as_me:3139: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3149,7 +3150,7 @@ else
 	(*) 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:3152: checking for $ac_word" >&5
+echo "$as_me:3153: 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
@@ -3166,7 +3167,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3169: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3170: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3177,10 +3178,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3180: result: $LDCONFIG" >&5
+  echo "$as_me:3181: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3183: result: no" >&5
+  echo "$as_me:3184: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3188,7 +3189,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3191: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3192: 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.
@@ -3198,7 +3199,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3201: result: $cf_with_cxx" >&5
+echo "$as_me:3202: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3216,7 +3217,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3219: checking for $ac_word" >&5
+echo "$as_me:3220: 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
@@ -3231,7 +3232,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3234: found $ac_dir/$ac_word" >&5
+echo "$as_me:3235: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3239,10 +3240,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3242: result: $CXX" >&5
+  echo "$as_me:3243: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3245: result: no" >&5
+  echo "$as_me:3246: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3255,7 +3256,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3258: checking for $ac_word" >&5
+echo "$as_me:3259: 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
@@ -3270,7 +3271,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3273: found $ac_dir/$ac_word" >&5
+echo "$as_me:3274: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3278,10 +3279,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3281: result: $ac_ct_CXX" >&5
+  echo "$as_me:3282: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3284: result: no" >&5
+  echo "$as_me:3285: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3293,32 +3294,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3296:" \
+echo "$as_me:3297:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3299: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3300: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3302: \$? = $ac_status" >&5
+  echo "$as_me:3303: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3304: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3305: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3307: \$? = $ac_status" >&5
+  echo "$as_me:3308: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3309: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3310: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3312: \$? = $ac_status" >&5
+  echo "$as_me:3313: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3315: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3316: 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 3321 "configure"
+#line 3322 "configure"
 #include "confdefs.h"
 
 int
@@ -3333,16 +3334,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3339: \$? = $ac_status" >&5
+  echo "$as_me:3340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3345: \$? = $ac_status" >&5
+  echo "$as_me:3346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3354,19 +3355,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3357: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3358: 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:3363: checking whether $CXX accepts -g" >&5
+echo "$as_me:3364: 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 3369 "configure"
+#line 3370 "configure"
 #include "confdefs.h"
 
 int
@@ -3378,16 +3379,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3384: \$? = $ac_status" >&5
+  echo "$as_me:3385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3390: \$? = $ac_status" >&5
+  echo "$as_me:3391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3397,7 +3398,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3400: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3401: 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
@@ -3424,7 +3425,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3427 "configure"
+#line 3428 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3437,16 +3438,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3443: \$? = $ac_status" >&5
+  echo "$as_me:3444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3449: \$? = $ac_status" >&5
+  echo "$as_me:3450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3456,7 +3457,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3459 "configure"
+#line 3460 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3468,16 +3469,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3474: \$? = $ac_status" >&5
+  echo "$as_me:3475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3480: \$? = $ac_status" >&5
+  echo "$as_me:3481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3511,7 +3512,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3514: checking if $CXX works" >&5
+		echo "$as_me:3515: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3519,7 +3520,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3522 "configure"
+#line 3523 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3536,16 +3537,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3542: \$? = $ac_status" >&5
+  echo "$as_me:3543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3548: \$? = $ac_status" >&5
+  echo "$as_me:3549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3556,11 +3557,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3559: result: $cf_cxx_works" >&5
+		echo "$as_me:3560: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3563: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3564: 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
@@ -3576,7 +3577,7 @@ ac_main_return="return"
 	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:3579: checking for $ac_word" >&5
+echo "$as_me:3580: 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
@@ -3593,7 +3594,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3596: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3597: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3604,17 +3605,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3607: result: $CXX" >&5
+  echo "$as_me:3608: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3610: result: no" >&5
+  echo "$as_me:3611: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3617: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3618: 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="";
 		;;
@@ -3623,7 +3624,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3626: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3627: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3631,7 +3632,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3634: result: $GXX_VERSION" >&5
+	echo "$as_me:3635: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3639,12 +3640,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3642: WARNING: templates do not work" >&5
+	{ echo "$as_me:3643: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3647: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3648: 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.
@@ -3654,15 +3655,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3657: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3658: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3660: checking if you want to build with Ada" >&5
+echo "$as_me:3661: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3662: result: $cf_with_ada" >&5
+echo "$as_me:3663: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3665: checking if you want to install terminal database" >&5
+echo "$as_me:3666: 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.
@@ -3672,10 +3673,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3675: result: $cf_with_db_install" >&5
+echo "$as_me:3676: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3678: checking if you want to install manpages" >&5
+echo "$as_me:3679: 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.
@@ -3685,10 +3686,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3688: result: $cf_with_manpages" >&5
+echo "$as_me:3689: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3691: checking if you want to build programs such as tic" >&5
+echo "$as_me:3692: 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.
@@ -3698,10 +3699,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3701: result: $cf_with_progs" >&5
+echo "$as_me:3702: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3704: checking if you want to build test-programs" >&5
+echo "$as_me:3705: 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.
@@ -3711,10 +3712,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3714: result: $cf_with_tests" >&5
+echo "$as_me:3715: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3717: checking if you wish to install curses.h" >&5
+echo "$as_me:3718: 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.
@@ -3724,7 +3725,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3727: result: $with_curses_h" >&5
+echo "$as_me:3728: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3748,7 +3749,7 @@ for ac_prog in mawk gawk nawk awk
 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:3751: checking for $ac_word" >&5
+echo "$as_me:3752: 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
@@ -3763,7 +3764,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3766: found $ac_dir/$ac_word" >&5
+echo "$as_me:3767: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3771,17 +3772,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3774: result: $AWK" >&5
+  echo "$as_me:3775: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3777: result: no" >&5
+  echo "$as_me:3778: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3784: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3785: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3797,7 +3798,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3800: checking for a BSD compatible install" >&5
+echo "$as_me:3801: 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
@@ -3846,7 +3847,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3849: result: $INSTALL" >&5
+echo "$as_me:3850: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3871,7 +3872,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3874: checking for $ac_word" >&5
+echo "$as_me:3875: 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
@@ -3886,7 +3887,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3889: found $ac_dir/$ac_word" >&5
+echo "$as_me:3890: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3894,10 +3895,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3897: result: $LINT" >&5
+  echo "$as_me:3898: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3900: result: no" >&5
+  echo "$as_me:3901: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3910,18 +3911,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3913: checking whether ln -s works" >&5
+echo "$as_me:3914: 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:3917: result: yes" >&5
+  echo "$as_me:3918: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3920: result: no, using $LN_S" >&5
+  echo "$as_me:3921: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3924: checking if $LN_S -f options work" >&5
+echo "$as_me:3925: 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
@@ -3933,12 +3934,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3936: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3937: 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:3941: checking for long file names" >&5
+echo "$as_me:3942: 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
@@ -3977,7 +3978,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3980: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3981: 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
 
@@ -3996,7 +3997,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:3999: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4000: 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"
@@ -4006,7 +4007,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4009: checking if you want to use pkg-config" >&5
+echo "$as_me:4010: 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.
@@ -4016,7 +4017,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4019: result: $cf_pkg_config" >&5
+echo "$as_me:4020: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4028,7 +4029,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4031: checking for $ac_word" >&5
+echo "$as_me:4032: 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
@@ -4045,7 +4046,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4048: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4049: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4056,10 +4057,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4059: result: $PKG_CONFIG" >&5
+  echo "$as_me:4060: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4062: result: no" >&5
+  echo "$as_me:4063: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4068,7 +4069,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4071: checking for $ac_word" >&5
+echo "$as_me:4072: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4085,7 +4086,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4088: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4089: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4097,10 +4098,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4100: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4101: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4103: result: no" >&5
+  echo "$as_me:4104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4143,24 +4144,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4146: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4147: 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:4153: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4154: 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:4159: checking for pkg-config library directory" >&5
+	echo "$as_me:4160: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4163: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4164: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4187,7 +4188,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4190: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4191: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4198,16 +4199,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4201: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4202: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4206: result: auto" >&5
+	echo "$as_me:4207: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4210: checking for search-list" >&5
+	echo "$as_me:4211: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4234,11 +4235,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4237: result: $cf_search_path" >&5
+	echo "$as_me:4238: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4241: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4242: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4246,7 +4247,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4249: checking for first directory" >&5
+	echo "$as_me:4250: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4257,7 +4258,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4260: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4261: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4267,7 +4268,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4270: checking for workaround" >&5
+		echo "$as_me:4271: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4290,17 +4291,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4293: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4294: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4300: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4301: 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:4303: checking if we should install .pc files" >&5
+	echo "$as_me:4304: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4311,7 +4312,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4314: result: $enable_pc_files" >&5
+echo "$as_me:4315: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4319,7 +4320,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4322: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4323: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4350,7 +4351,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4353: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4354: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4364,7 +4365,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4367: checking for suffix to add to pc-files" >&5
+	echo "$as_me:4368: 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.
@@ -4379,13 +4380,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4382: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4383: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4388: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4389: 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.
@@ -4395,11 +4396,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4398: result: $enable_mixedcase" >&5
+echo "$as_me:4399: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4402: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4403: 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
@@ -4426,7 +4427,7 @@ else
 fi
 
 fi
-echo "$as_me:4429: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4430: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4445,7 +4446,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4448: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4449: 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
@@ -4465,16 +4466,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4468: result: yes" >&5
+  echo "$as_me:4469: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4472: result: no" >&5
+  echo "$as_me:4473: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4477: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4478: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4529,7 +4530,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4532: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4533: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4540,7 +4541,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4543: checking for $ac_word" >&5
+echo "$as_me:4544: 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
@@ -4555,7 +4556,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4558: found $ac_dir/$ac_word" >&5
+echo "$as_me:4559: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4563,10 +4564,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4566: result: $CTAGS" >&5
+  echo "$as_me:4567: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4569: result: no" >&5
+  echo "$as_me:4570: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4577,7 +4578,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4580: checking for $ac_word" >&5
+echo "$as_me:4581: 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
@@ -4592,7 +4593,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4595: found $ac_dir/$ac_word" >&5
+echo "$as_me:4596: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4600,10 +4601,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4603: result: $ETAGS" >&5
+  echo "$as_me:4604: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4606: result: no" >&5
+  echo "$as_me:4607: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4612,7 +4613,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4615: checking for $ac_word" >&5
+echo "$as_me:4616: 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
@@ -4627,7 +4628,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4630: found $ac_dir/$ac_word" >&5
+echo "$as_me:4631: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4636,17 +4637,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4639: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4640: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4642: result: no" >&5
+  echo "$as_me:4643: 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:4649: checking for $ac_word" >&5
+echo "$as_me:4650: 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
@@ -4661,7 +4662,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4664: found $ac_dir/$ac_word" >&5
+echo "$as_me:4665: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4670,10 +4671,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4673: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4674: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4676: result: no" >&5
+  echo "$as_me:4677: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4693,7 +4694,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4696: checking for makeflags variable" >&5
+echo "$as_me:4697: 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
@@ -4723,7 +4724,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4726: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4727: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4731,13 +4732,13 @@ echo "${as_me:-configure}:4726: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4734: result: $cf_cv_makeflags" >&5
+echo "$as_me:4735: 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:4740: checking for $ac_word" >&5
+echo "$as_me:4741: 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
@@ -4752,7 +4753,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4755: found $ac_dir/$ac_word" >&5
+echo "$as_me:4756: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4760,10 +4761,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4763: result: $RANLIB" >&5
+  echo "$as_me:4764: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4766: result: no" >&5
+  echo "$as_me:4767: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4772,7 +4773,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4775: checking for $ac_word" >&5
+echo "$as_me:4776: 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
@@ -4787,7 +4788,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4790: found $ac_dir/$ac_word" >&5
+echo "$as_me:4791: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4796,10 +4797,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4799: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4800: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4802: result: no" >&5
+  echo "$as_me:4803: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4811,7 +4812,7 @@ fi
 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:4814: checking for $ac_word" >&5
+echo "$as_me:4815: 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
@@ -4826,7 +4827,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4829: found $ac_dir/$ac_word" >&5
+echo "$as_me:4830: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4834,10 +4835,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4837: result: $LD" >&5
+  echo "$as_me:4838: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4840: result: no" >&5
+  echo "$as_me:4841: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4846,7 +4847,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4849: checking for $ac_word" >&5
+echo "$as_me:4850: 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
@@ -4861,7 +4862,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4864: found $ac_dir/$ac_word" >&5
+echo "$as_me:4865: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4870,10 +4871,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4873: result: $ac_ct_LD" >&5
+  echo "$as_me:4874: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4876: result: no" >&5
+  echo "$as_me:4877: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4885,7 +4886,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4888: checking for $ac_word" >&5
+echo "$as_me:4889: 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
@@ -4900,7 +4901,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4903: found $ac_dir/$ac_word" >&5
+echo "$as_me:4904: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4908,10 +4909,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4911: result: $AR" >&5
+  echo "$as_me:4912: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4914: result: no" >&5
+  echo "$as_me:4915: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4920,7 +4921,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4923: checking for $ac_word" >&5
+echo "$as_me:4924: 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
@@ -4935,7 +4936,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4938: found $ac_dir/$ac_word" >&5
+echo "$as_me:4939: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4944,10 +4945,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4947: result: $ac_ct_AR" >&5
+  echo "$as_me:4948: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4950: result: no" >&5
+  echo "$as_me:4951: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4959,7 +4960,7 @@ fi
 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:4962: checking for $ac_word" >&5
+echo "$as_me:4963: 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
@@ -4974,7 +4975,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4977: found $ac_dir/$ac_word" >&5
+echo "$as_me:4978: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4982,10 +4983,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4985: result: $NM" >&5
+  echo "$as_me:4986: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4988: result: no" >&5
+  echo "$as_me:4989: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4994,7 +4995,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:4997: checking for $ac_word" >&5
+echo "$as_me:4998: 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
@@ -5009,7 +5010,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5012: found $ac_dir/$ac_word" >&5
+echo "$as_me:5013: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5018,10 +5019,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5021: result: $ac_ct_NM" >&5
+  echo "$as_me:5022: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5024: result: no" >&5
+  echo "$as_me:5025: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5033,7 +5034,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5036: checking for $ac_word" >&5
+echo "$as_me:5037: 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
@@ -5048,7 +5049,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5051: found $ac_dir/$ac_word" >&5
+echo "$as_me:5052: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5056,10 +5057,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5059: result: $AR" >&5
+  echo "$as_me:5060: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5062: result: no" >&5
+  echo "$as_me:5063: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5068,7 +5069,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5071: checking for $ac_word" >&5
+echo "$as_me:5072: 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
@@ -5083,7 +5084,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5086: found $ac_dir/$ac_word" >&5
+echo "$as_me:5087: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5092,10 +5093,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5095: result: $ac_ct_AR" >&5
+  echo "$as_me:5096: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5098: result: no" >&5
+  echo "$as_me:5099: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5104,7 +5105,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5107: checking for options to update archives" >&5
+echo "$as_me:5108: 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
@@ -5141,13 +5142,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5144 "configure"
+#line 5145 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5147: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5150: \$? = $ac_status" >&5
+  echo "$as_me:5151: \$? = $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
@@ -5158,7 +5159,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5161: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5162: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5168,7 +5169,7 @@ echo "${as_me:-configure}:5161: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5171: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5172: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5179,7 +5180,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5182: checking if you have specified an install-prefix" >&5
+echo "$as_me:5183: 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.
@@ -5192,7 +5193,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5195: result: $DESTDIR" >&5
+echo "$as_me:5196: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -5227,7 +5228,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5230: checking for $ac_word" >&5
+echo "$as_me:5231: 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
@@ -5242,7 +5243,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5245: found $ac_dir/$ac_word" >&5
+echo "$as_me:5246: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5250,10 +5251,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5253: result: $BUILD_CC" >&5
+  echo "$as_me:5254: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5256: result: no" >&5
+  echo "$as_me:5257: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5262,12 +5263,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5265: checking for native build C compiler" >&5
+	echo "$as_me:5266: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5267: result: $BUILD_CC" >&5
+	echo "$as_me:5268: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5270: checking for native build C preprocessor" >&5
+	echo "$as_me:5271: 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.
@@ -5277,10 +5278,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5280: result: $BUILD_CPP" >&5
+	echo "$as_me:5281: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5283: checking for native build C flags" >&5
+	echo "$as_me:5284: 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.
@@ -5288,10 +5289,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5291: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5292: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5294: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5295: 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.
@@ -5299,10 +5300,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5302: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5303: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5305: checking for native build linker-flags" >&5
+	echo "$as_me:5306: 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.
@@ -5310,10 +5311,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5313: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5314: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5316: checking for native build linker-libraries" >&5
+	echo "$as_me:5317: 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.
@@ -5321,7 +5322,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5324: result: $BUILD_LIBS" >&5
+	echo "$as_me:5325: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5330,7 +5331,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5333: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5334: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5344,7 +5345,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5347 "configure"
+#line 5348 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5354,15 +5355,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5360: \$? = $ac_status" >&5
+  echo "$as_me:5361: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5365: \$? = $ac_status" >&5
+  echo "$as_me:5366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5377,12 +5378,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5380: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5381: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5385: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5386: 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;}
@@ -5407,7 +5408,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5410: checking if libtool -version-number should be used" >&5
+echo "$as_me:5411: 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.
@@ -5424,7 +5425,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5427: result: $cf_libtool_version" >&5
+echo "$as_me:5428: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5433,25 +5434,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5436: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5437: 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}:5443: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5444: 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}:5450: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5451: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5454: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5455: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5473,7 +5474,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5476: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5477: 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.
@@ -5483,7 +5484,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5486: result: $with_libtool" >&5
+echo "$as_me:5487: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5514,7 +5515,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5517: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5518: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5527,7 +5528,7 @@ esac
   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:5530: checking for $ac_word" >&5
+echo "$as_me:5531: 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
@@ -5542,7 +5543,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5545: found $ac_dir/$ac_word" >&5
+echo "$as_me:5546: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5550,10 +5551,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5553: result: $LIBTOOL" >&5
+  echo "$as_me:5554: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5556: result: no" >&5
+  echo "$as_me:5557: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5566,7 +5567,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5569: checking for $ac_word" >&5
+echo "$as_me:5570: 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
@@ -5581,7 +5582,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5584: found $ac_dir/$ac_word" >&5
+echo "$as_me:5585: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5589,10 +5590,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5592: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5593: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5595: result: no" >&5
+  echo "$as_me:5596: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5623,7 +5624,7 @@ unset LIBTOOL
   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:5626: checking for $ac_word" >&5
+echo "$as_me:5627: 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
@@ -5638,7 +5639,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5641: found $ac_dir/$ac_word" >&5
+echo "$as_me:5642: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5646,10 +5647,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5649: result: $LIBTOOL" >&5
+  echo "$as_me:5650: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5652: result: no" >&5
+  echo "$as_me:5653: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5662,7 +5663,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5665: checking for $ac_word" >&5
+echo "$as_me:5666: 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
@@ -5677,7 +5678,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5680: found $ac_dir/$ac_word" >&5
+echo "$as_me:5681: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5685,10 +5686,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5688: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5689: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5691: result: no" >&5
+  echo "$as_me:5692: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5710,7 +5711,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5713: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5714: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5726,7 +5727,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5729: checking version of $LIBTOOL" >&5
+	echo "$as_me:5730: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5737,7 +5738,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5740: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5741: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5746,18 +5747,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5749: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5750: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5755: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5756: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5760: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5761: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5793,7 +5794,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5796: checking if you want to build shared libraries" >&5
+echo "$as_me:5797: 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.
@@ -5803,11 +5804,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5806: result: $with_shared" >&5
+echo "$as_me:5807: 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:5810: checking if you want to build static libraries" >&5
+echo "$as_me:5811: 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.
@@ -5817,11 +5818,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5820: result: $with_normal" >&5
+echo "$as_me:5821: 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:5824: checking if you want to build debug libraries" >&5
+echo "$as_me:5825: 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.
@@ -5831,11 +5832,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5834: result: $with_debug" >&5
+echo "$as_me:5835: 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:5838: checking if you want to build profiling libraries" >&5
+echo "$as_me:5839: 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.
@@ -5845,7 +5846,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5848: result: $with_profile" >&5
+echo "$as_me:5849: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5853,7 +5854,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5856: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5857: 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.
@@ -5863,26 +5864,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5866: result: $with_shared_cxx" >&5
+echo "$as_me:5867: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5873: checking for specified models" >&5
+echo "$as_me:5874: 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:5877: result: $cf_list_models" >&5
+echo "$as_me:5878: 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:5882: checking for default model" >&5
+echo "$as_me:5883: 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:5885: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5886: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5896,7 +5897,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5899: checking if you want to have a library-prefix" >&5
+echo "$as_me:5900: 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.
@@ -5906,7 +5907,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5909: result: $with_lib_prefix" >&5
+echo "$as_me:5910: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5937,24 +5938,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5940: checking for PATH separator" >&5
+	echo "$as_me:5941: 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:5947: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5948: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5951: checking for ANSI C header files" >&5
+echo "$as_me:5952: 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 5957 "configure"
+#line 5958 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5962,13 +5963,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5965: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5966: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5971: \$? = $ac_status" >&5
+  echo "$as_me:5972: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5990,7 +5991,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5993 "configure"
+#line 5994 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6008,7 +6009,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6011 "configure"
+#line 6012 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6029,7 +6030,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6032 "configure"
+#line 6033 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6055,15 +6056,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6061: \$? = $ac_status" >&5
+  echo "$as_me:6062: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6066: \$? = $ac_status" >&5
+  echo "$as_me:6067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6076,7 +6077,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6079: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6080: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6092,28 +6093,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6095: checking for $ac_header" >&5
+echo "$as_me:6096: 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 6101 "configure"
+#line 6102 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6110: \$? = $ac_status" >&5
+  echo "$as_me:6111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6116: \$? = $ac_status" >&5
+  echo "$as_me:6117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6123,7 +6124,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6126: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6127: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6133,13 +6134,13 @@ EOF
 fi
 done
 
-echo "$as_me:6136: checking whether exit is declared" >&5
+echo "$as_me:6137: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6142 "configure"
+#line 6143 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6154,16 +6155,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6157: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6160: \$? = $ac_status" >&5
+  echo "$as_me:6161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6166: \$? = $ac_status" >&5
+  echo "$as_me:6167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6173,19 +6174,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6176: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6177: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6182: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6183: 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 6188 "configure"
+#line 6189 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6200,16 +6201,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6206: \$? = $ac_status" >&5
+  echo "$as_me:6207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6212: \$? = $ac_status" >&5
+  echo "$as_me:6213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6219,7 +6220,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6222: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6223: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6232,7 +6233,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6235: checking for opendir in -ldir" >&5
+  echo "$as_me:6236: 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
@@ -6240,7 +6241,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6243 "configure"
+#line 6244 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6259,16 +6260,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6265: \$? = $ac_status" >&5
+  echo "$as_me:6266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6271: \$? = $ac_status" >&5
+  echo "$as_me:6272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6279,14 +6280,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6282: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6283: 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:6289: checking for opendir in -lx" >&5
+  echo "$as_me:6290: 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
@@ -6294,7 +6295,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6297 "configure"
+#line 6298 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6313,16 +6314,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6319: \$? = $ac_status" >&5
+  echo "$as_me:6320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6325: \$? = $ac_status" >&5
+  echo "$as_me:6326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6333,7 +6334,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6336: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6337: 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"
@@ -6343,7 +6344,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6346: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6347: 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.
@@ -6353,10 +6354,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6356: result: $with_termlib" >&5
+echo "$as_me:6357: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6359: checking if you want to build a separate tic library" >&5
+echo "$as_me:6360: 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.
@@ -6366,7 +6367,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6369: result: $with_ticlib" >&5
+echo "$as_me:6370: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6379,7 +6380,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6382: checking for default loader flags" >&5
+echo "$as_me:6383: 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=''   ;;
@@ -6388,13 +6389,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6391: result: $LD_MODEL" >&5
+echo "$as_me:6392: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6397: checking if rpath option should be used" >&5
+echo "$as_me:6398: 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.
@@ -6404,10 +6405,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6407: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6408: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6410: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6411: 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.
@@ -6417,7 +6418,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6420: result: $cf_cv_do_relink" >&5
+echo "$as_me:6421: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6428,7 +6429,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6431: checking for an rpath option" >&5
+	echo "$as_me:6432: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6459,12 +6460,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6462: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6463: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6467: checking if we need a space after rpath option" >&5
+		echo "$as_me:6468: 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"
 
@@ -6485,7 +6486,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6488 "configure"
+#line 6489 "configure"
 #include "confdefs.h"
 
 int
@@ -6497,16 +6498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6503: \$? = $ac_status" >&5
+  echo "$as_me:6504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6509: \$? = $ac_status" >&5
+  echo "$as_me:6510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6516,7 +6517,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6519: result: $cf_rpath_space" >&5
+		echo "$as_me:6520: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6538,7 +6539,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6541: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:6542: 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.
@@ -6553,9 +6554,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6556: result: $withval" >&5
+		echo "$as_me:6557: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6558: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6559: 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; }; }
 		;;
@@ -6564,7 +6565,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6567: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6568: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6587,14 +6588,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6590: checking which $CC option to use" >&5
+		echo "$as_me:6591: 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 6597 "configure"
+#line 6598 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6606,16 +6607,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6612: \$? = $ac_status" >&5
+  echo "$as_me:6613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6618: \$? = $ac_status" >&5
+  echo "$as_me:6619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6624,7 +6625,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6627: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6628: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6695,7 +6696,7 @@ CF_EOF
 		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:6698: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6699: 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
@@ -6704,7 +6705,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6707 "configure"
+#line 6708 "configure"
 #include "confdefs.h"
 
 int
@@ -6716,16 +6717,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6722: \$? = $ac_status" >&5
+  echo "$as_me:6723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6728: \$? = $ac_status" >&5
+  echo "$as_me:6729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6736,7 +6737,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6739: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6740: 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"
@@ -7086,7 +7087,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7089 "configure"
+#line 7090 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7098,16 +7099,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7104: \$? = $ac_status" >&5
+  echo "$as_me:7105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7110: \$? = $ac_status" >&5
+  echo "$as_me:7111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7144,7 +7145,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7147: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7148: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7154,7 +7155,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7157 "${as_me:-configure}"
+#line 7158 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7166,18 +7167,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7169: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7170: 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:7171: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7174: \$? = $ac_status" >&5
+  echo "$as_me:7175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7176: result: yes" >&5
+				echo "$as_me:7177: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7180: result: no" >&5
+				echo "$as_me:7181: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7192,17 +7193,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7195: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7196: 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}:7199: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7200: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7205: checking for additional libtool options" >&5
+echo "$as_me:7206: 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.
@@ -7212,7 +7213,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7215: result: $with_libtool_opts" >&5
+echo "$as_me:7216: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7223,7 +7224,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7226: checking if exported-symbols file should be used" >&5
+echo "$as_me:7227: 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.
@@ -7238,7 +7239,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7241: result: $with_export_syms" >&5
+echo "$as_me:7242: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7249,15 +7250,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7252: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7253: 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:7257: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7258: 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 7260 "configure"
+#line 7261 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7269,16 +7270,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7275: \$? = $ac_status" >&5
+  echo "$as_me:7276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7281: \$? = $ac_status" >&5
+  echo "$as_me:7282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7287,18 +7288,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7290: result: $cf_cflags_work" >&5
+		echo "$as_me:7291: 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}:7296: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7297: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7301: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7302: 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.
@@ -7316,18 +7317,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7319: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7320: 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:7324: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7325: 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:7330: result: $with_versioned_syms" >&5
+echo "$as_me:7331: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7343,7 +7344,7 @@ then
 		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}:7346: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7347: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7351,11 +7352,11 @@ echo "${as_me:-configure}:7346: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7354: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7355: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7358: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7359: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7367,7 +7368,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7370: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7371: 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
 
@@ -7404,7 +7405,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7407 "configure"
+#line 7408 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7435,7 +7436,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7438: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7439: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7448,7 +7449,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7451: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7452: 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.
@@ -7458,27 +7459,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7461: result: $with_gpm" >&5
+echo "$as_me:7462: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7465: checking for gpm.h" >&5
+	echo "$as_me:7466: 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 7471 "configure"
+#line 7472 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7475: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7476: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7481: \$? = $ac_status" >&5
+  echo "$as_me:7482: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7497,7 +7498,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7500: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7501: 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
 
@@ -7508,7 +7509,7 @@ EOF
 		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}:7511: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7512: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7516,7 +7517,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7519: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7520: 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
@@ -7524,7 +7525,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7527 "configure"
+#line 7528 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7543,16 +7544,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7549: \$? = $ac_status" >&5
+  echo "$as_me:7550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7555: \$? = $ac_status" >&5
+  echo "$as_me:7556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7563,18 +7564,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7566: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7567: 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:7573: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7574: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7577: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7578: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7585,7 +7586,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7588: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7589: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7594,7 +7595,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7597: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7598: 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.
@@ -7604,18 +7605,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7607: result: $with_dlsym" >&5
+	echo "$as_me:7608: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7612: checking for dlsym" >&5
+echo "$as_me:7613: 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 7618 "configure"
+#line 7619 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7646,16 +7647,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7652: \$? = $ac_status" >&5
+  echo "$as_me:7653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7658: \$? = $ac_status" >&5
+  echo "$as_me:7659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7665,14 +7666,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7668: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7669: 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:7675: checking for dlsym in -ldl" >&5
+echo "$as_me:7676: 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
@@ -7680,7 +7681,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7683 "configure"
+#line 7684 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7699,16 +7700,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7705: \$? = $ac_status" >&5
+  echo "$as_me:7706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7711: \$? = $ac_status" >&5
+  echo "$as_me:7712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7719,7 +7720,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7722: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7723: 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
 
@@ -7748,10 +7749,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7751: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7752: 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 7754 "configure"
+#line 7755 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7769,16 +7770,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7775: \$? = $ac_status" >&5
+  echo "$as_me:7776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7781: \$? = $ac_status" >&5
+  echo "$as_me:7782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7789,15 +7790,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7792: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7793: 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:7797: result: ok" >&5
+	echo "$as_me:7798: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7800: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7801: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7805,12 +7806,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7808: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7809: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7813: checking for soname of gpm library" >&5
+echo "$as_me:7814: 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
@@ -7844,15 +7845,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7847: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7850: \$? = $ac_status" >&5
+  echo "$as_me:7851: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7852: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7855: \$? = $ac_status" >&5
+  echo "$as_me:7856: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7863,7 +7864,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7866: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7867: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7931,7 +7932,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7934: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7935: 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
@@ -7939,7 +7940,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7942 "configure"
+#line 7943 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7958,16 +7959,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7964: \$? = $ac_status" >&5
+  echo "$as_me:7965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7970: \$? = $ac_status" >&5
+  echo "$as_me:7971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7978,11 +7979,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7981: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7982: 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:7985: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7986: 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
@@ -8006,15 +8007,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8012: \$? = $ac_status" >&5
+  echo "$as_me:8013: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8014: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8017: \$? = $ac_status" >&5
+  echo "$as_me:8018: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8026,11 +8027,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8029: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8030: 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:8033: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8034: 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
 
@@ -8038,7 +8039,7 @@ fi
 
 fi
 
-echo "$as_me:8041: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8042: 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.
@@ -8047,7 +8048,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8050: result: $with_pcre2" >&5
+echo "$as_me:8051: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8058,17 +8059,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8061: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8062: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8067: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8068: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8071: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8072: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8192,7 +8193,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8195: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8196: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8205,7 +8206,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8208: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8209: 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
@@ -8213,7 +8214,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8216 "configure"
+#line 8217 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8232,16 +8233,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8238: \$? = $ac_status" >&5
+  echo "$as_me:8239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8244: \$? = $ac_status" >&5
+  echo "$as_me:8245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8252,7 +8253,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8255: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8256: 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
 
@@ -8273,7 +8274,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8276: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8277: 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
@@ -8281,7 +8282,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8284 "configure"
+#line 8285 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8300,16 +8301,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8306: \$? = $ac_status" >&5
+  echo "$as_me:8307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8312: \$? = $ac_status" >&5
+  echo "$as_me:8313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8320,7 +8321,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8323: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8324: 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
 
@@ -8341,7 +8342,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8344: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8345: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8356,23 +8357,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8359: checking for $ac_header" >&5
+echo "$as_me:8360: 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 8365 "configure"
+#line 8366 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8370: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8375: \$? = $ac_status" >&5
+  echo "$as_me:8376: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8391,7 +8392,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8394: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8395: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8404,13 +8405,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8407: checking for $ac_func" >&5
+echo "$as_me:8408: 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 8413 "configure"
+#line 8414 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8441,16 +8442,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8447: \$? = $ac_status" >&5
+  echo "$as_me:8448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8453: \$? = $ac_status" >&5
+  echo "$as_me:8454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8460,7 +8461,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8463: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8464: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8474,7 +8475,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8477: checking if you want to use sysmouse" >&5
+echo "$as_me:8478: 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.
@@ -8486,7 +8487,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8489 "configure"
+#line 8490 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8509,16 +8510,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8515: \$? = $ac_status" >&5
+  echo "$as_me:8516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8521: \$? = $ac_status" >&5
+  echo "$as_me:8522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8528,7 +8529,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8531: result: $cf_with_sysmouse" >&5
+echo "$as_me:8532: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8538,7 +8539,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8541: checking if you want to disable library suffixes" >&5
+echo "$as_me:8542: 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.
@@ -8555,13 +8556,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8558: result: $disable_lib_suffixes" >&5
+echo "$as_me:8559: 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:8564: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8565: 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.
@@ -8579,22 +8580,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8582: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8583: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8587: checking for updated LDFLAGS" >&5
+echo "$as_me:8588: 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:8590: result: maybe" >&5
+	echo "$as_me:8591: 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:8597: checking for $ac_word" >&5
+echo "$as_me:8598: 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
@@ -8609,7 +8610,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8612: found $ac_dir/$ac_word" >&5
+echo "$as_me:8613: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8617,10 +8618,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8620: result: $cf_ldd_prog" >&5
+  echo "$as_me:8621: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8623: result: no" >&5
+  echo "$as_me:8624: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8634,7 +8635,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8637 "configure"
+#line 8638 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8646,16 +8647,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8652: \$? = $ac_status" >&5
+  echo "$as_me:8653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8658: \$? = $ac_status" >&5
+  echo "$as_me:8659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8683,7 +8684,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8686: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8687: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8695,11 +8696,11 @@ echo "${as_me:-configure}:8686: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8698: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8699: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8702: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8703: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8736,7 +8737,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8739: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8740: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8749,11 +8750,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8752: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8753: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8756: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8757: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8790,7 +8791,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8793: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8794: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8803,14 +8804,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8806: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8807: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8810: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8811: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8813: result: no" >&5
+	echo "$as_me:8814: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8824,7 +8825,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8827: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8828: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8841,7 +8842,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8844: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8845: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8849,7 +8850,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8852: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8853: 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=
 
@@ -8868,11 +8869,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8871: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8872: result: $EXTRA_SUFFIX" >&5
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8875: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8876: 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.
@@ -8882,10 +8883,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8885: result: $with_overwrite" >&5
+echo "$as_me:8886: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8888: checking if external terminfo-database is used" >&5
+echo "$as_me:8889: 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.
@@ -8895,7 +8896,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8898: result: $use_database" >&5
+echo "$as_me:8899: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8911,7 +8912,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8914: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8915: 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.
@@ -8919,10 +8920,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8922: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8923: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8925: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8926: 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.
@@ -8932,13 +8933,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8935: result: $with_hashed_db" >&5
+	echo "$as_me:8936: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8941: checking for list of fallback descriptions" >&5
+echo "$as_me:8942: 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.
@@ -8948,7 +8949,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8951: result: $with_fallback" >&5
+echo "$as_me:8952: result: $with_fallback" >&5
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
@@ -8956,7 +8957,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8959: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8960: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8972,7 +8973,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8975: checking for $ac_word" >&5
+echo "$as_me:8976: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8987,7 +8988,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8990: found $ac_dir/$ac_word" >&5
+echo "$as_me:8991: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8995,10 +8996,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:8998: result: $TIC" >&5
+  echo "$as_me:8999: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9001: result: no" >&5
+  echo "$as_me:9002: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9007,7 +9008,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9010: checking for $ac_word" >&5
+echo "$as_me:9011: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9022,7 +9023,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9025: found $ac_dir/$ac_word" >&5
+echo "$as_me:9026: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9030,10 +9031,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9033: result: $ac_ct_TIC" >&5
+  echo "$as_me:9034: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9036: result: no" >&5
+  echo "$as_me:9037: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9045,7 +9046,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9048: checking for $ac_word" >&5
+echo "$as_me:9049: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9060,7 +9061,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9063: found $ac_dir/$ac_word" >&5
+echo "$as_me:9064: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9068,10 +9069,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9071: result: $INFOCMP" >&5
+  echo "$as_me:9072: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9074: result: no" >&5
+  echo "$as_me:9075: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9080,7 +9081,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9083: checking for $ac_word" >&5
+echo "$as_me:9084: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9095,7 +9096,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9098: found $ac_dir/$ac_word" >&5
+echo "$as_me:9099: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9103,10 +9104,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9106: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9107: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9109: result: no" >&5
+  echo "$as_me:9110: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9121,10 +9122,10 @@ 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:9124: checking for tic program for fallbacks" >&5
+  echo "$as_me:9125: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9127: result: $TIC" >&5
+		echo "$as_me:9128: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9152,7 +9153,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9155: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9156: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9165,7 +9166,7 @@ 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:9168: checking for $ac_word" >&5
+echo "$as_me:9169: 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
@@ -9182,7 +9183,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9185: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9186: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9193,10 +9194,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9196: result: $TIC" >&5
+  echo "$as_me:9197: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9199: result: no" >&5
+  echo "$as_me:9200: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9255,7 +9256,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9258: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9259: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9270,7 +9271,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9273: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9274: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9279,10 +9280,10 @@ 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:9282: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9283: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9285: result: $INFOCMP" >&5
+		echo "$as_me:9286: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9310,7 +9311,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9313: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9314: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9323,7 +9324,7 @@ 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:9326: checking for $ac_word" >&5
+echo "$as_me:9327: 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
@@ -9340,7 +9341,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9343: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9344: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9351,10 +9352,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9354: result: $INFOCMP" >&5
+  echo "$as_me:9355: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9357: result: no" >&5
+  echo "$as_me:9358: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9413,7 +9414,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9416: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9417: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9428,7 +9429,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9431: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9432: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9438,7 +9439,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9441: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9442: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9446,7 +9447,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9449: checking if you want modern xterm or antique" >&5
+echo "$as_me:9450: 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.
@@ -9460,7 +9461,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9463: result: $with_xterm_new" >&5
+echo "$as_me:9464: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9473,7 +9474,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9476: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9477: 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.
@@ -9497,13 +9498,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9500: result: $with_xterm_kbs" >&5
+echo "$as_me:9501: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9506: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9507: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9513,7 +9514,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9516: checking for list of terminfo directories" >&5
+echo "$as_me:9517: 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.
@@ -9553,7 +9554,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9556: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9557: 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; }; }
 	;;
@@ -9576,7 +9577,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9579: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9580: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9585,13 +9586,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9588: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9589: 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:9594: checking for default terminfo directory" >&5
+echo "$as_me:9595: 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.
@@ -9627,7 +9628,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9630: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9631: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9636,7 +9637,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9639: result: $TERMINFO" >&5
+echo "$as_me:9640: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9647,7 +9648,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9650: checking if big-core option selected" >&5
+echo "$as_me:9651: 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.
@@ -9659,7 +9660,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9662 "configure"
+#line 9663 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9673,15 +9674,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9679: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9684: \$? = $ac_status" >&5
+  echo "$as_me:9685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9693,7 +9694,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9696: result: $with_big_core" >&5
+echo "$as_me:9697: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9703,7 +9704,7 @@ EOF
 ### 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:9706: checking if big-strings option selected" >&5
+echo "$as_me:9707: 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.
@@ -9727,14 +9728,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9730: result: $with_big_strings" >&5
+echo "$as_me:9731: 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:9737: checking if you want termcap-fallback support" >&5
+echo "$as_me:9738: 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.
@@ -9744,14 +9745,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9747: result: $with_termcap" >&5
+echo "$as_me:9748: 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:9754: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9755: 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
@@ -9764,13 +9765,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9767: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9768: 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:9773: checking for list of termcap files" >&5
+	echo "$as_me:9774: 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.
@@ -9810,7 +9811,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9813: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9814: 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; }; }
 	;;
@@ -9833,7 +9834,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9836: result: $TERMPATH" >&5
+	echo "$as_me:9837: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9841,7 +9842,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9844: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9845: 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.
@@ -9851,14 +9852,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9854: result: $with_getcap" >&5
+	echo "$as_me:9855: 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:9861: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9862: 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.
@@ -9868,7 +9869,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9871: result: $with_getcap_cache" >&5
+	echo "$as_me:9872: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9878,7 +9879,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9881: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9882: 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.
@@ -9888,14 +9889,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9891: result: $with_home_terminfo" >&5
+echo "$as_me:9892: 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:9898: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9899: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9905,14 +9906,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9908: result: $with_root_environ" >&5
+echo "$as_me:9909: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9915: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9916: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9922,14 +9923,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9925: result: $with_root_access" >&5
+echo "$as_me:9926: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9932: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9933: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9939,7 +9940,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9942: result: $with_setuid_environ" >&5
+echo "$as_me:9943: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9954,23 +9955,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9957: checking for $ac_header" >&5
+echo "$as_me:9958: 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 9963 "configure"
+#line 9964 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9967: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9968: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9973: \$? = $ac_status" >&5
+  echo "$as_me:9974: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9989,7 +9990,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9992: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9993: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10004,13 +10005,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10007: checking for $ac_func" >&5
+echo "$as_me:10008: 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 10013 "configure"
+#line 10014 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10041,16 +10042,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10047: \$? = $ac_status" >&5
+  echo "$as_me:10048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10053: \$? = $ac_status" >&5
+  echo "$as_me:10054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10060,7 +10061,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10063: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10064: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10077,13 +10078,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10080: checking for $ac_func" >&5
+echo "$as_me:10081: 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 10086 "configure"
+#line 10087 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10114,16 +10115,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10120: \$? = $ac_status" >&5
+  echo "$as_me:10121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10126: \$? = $ac_status" >&5
+  echo "$as_me:10127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10133,7 +10134,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10136: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10137: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10144,7 +10145,7 @@ fi
 done
 
 else
-	echo "$as_me:10147: checking if link/symlink functions work" >&5
+	echo "$as_me:10148: 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
@@ -10157,7 +10158,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10160 "configure"
+#line 10161 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10191,15 +10192,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10197: \$? = $ac_status" >&5
+  echo "$as_me:10198: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10202: \$? = $ac_status" >&5
+  echo "$as_me:10203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10217,7 +10218,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10220: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10221: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10237,7 +10238,7 @@ with_symlinks=no
 # 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:10240: checking if tic should use symbolic links" >&5
+	echo "$as_me:10241: 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.
@@ -10247,21 +10248,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10250: result: $with_symlinks" >&5
+	echo "$as_me:10251: 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:10257: checking if tic should use hard links" >&5
+	echo "$as_me:10258: 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:10264: result: $with_links" >&5
+	echo "$as_me:10265: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10277,7 +10278,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10280: checking if you want broken-linker support code" >&5
+echo "$as_me:10281: 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.
@@ -10287,7 +10288,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10290: result: $with_broken_linker" >&5
+echo "$as_me:10291: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10301,7 +10302,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10304: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10305: 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.
@@ -10311,7 +10312,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10314: result: $with_bsdpad" >&5
+echo "$as_me:10315: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10330,14 +10331,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10333: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10334: 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 10340 "configure"
+#line 10341 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10356,16 +10357,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10362: \$? = $ac_status" >&5
+  echo "$as_me:10363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10368: \$? = $ac_status" >&5
+  echo "$as_me:10369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10376,7 +10377,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10379: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10380: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10418,14 +10419,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10421: checking if this is the GNU C library" >&5
+echo "$as_me:10422: 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 10428 "configure"
+#line 10429 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10444,16 +10445,16 @@ main (void)
 }
 _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_gnu_library=yes
 else
@@ -10464,7 +10465,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10467: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10468: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10472,7 +10473,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10475: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10476: 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
@@ -10484,7 +10485,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10487 "configure"
+#line 10488 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10503,16 +10504,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10509: \$? = $ac_status" >&5
+  echo "$as_me:10510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10515: \$? = $ac_status" >&5
+  echo "$as_me:10516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10524,12 +10525,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10527: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10528: 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:10532: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10533: 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
@@ -10634,7 +10635,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10637 "configure"
+#line 10638 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10654,16 +10655,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10660: \$? = $ac_status" >&5
+  echo "$as_me:10661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10666: \$? = $ac_status" >&5
+  echo "$as_me:10667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10674,7 +10675,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10677: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10678: 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
@@ -10683,14 +10684,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10686: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10687: 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 10693 "configure"
+#line 10694 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10705,16 +10706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10711: \$? = $ac_status" >&5
+  echo "$as_me:10712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10717: \$? = $ac_status" >&5
+  echo "$as_me:10718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10821,7 +10822,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10824 "configure"
+#line 10825 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10836,16 +10837,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10842: \$? = $ac_status" >&5
+  echo "$as_me:10843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10848: \$? = $ac_status" >&5
+  echo "$as_me:10849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10860,12 +10861,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10863: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10864: 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:10868: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10869: 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
@@ -10875,7 +10876,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10878 "configure"
+#line 10879 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10890,16 +10891,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10896: \$? = $ac_status" >&5
+  echo "$as_me:10897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10902: \$? = $ac_status" >&5
+  echo "$as_me:10903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10910,7 +10911,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10913: result: $cf_cv_default_source" >&5
+echo "$as_me:10914: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10947,16 +10948,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10950: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10951: 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}:10956: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10957: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10959 "configure"
+#line 10960 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10971,16 +10972,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10977: \$? = $ac_status" >&5
+  echo "$as_me:10978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10983: \$? = $ac_status" >&5
+  echo "$as_me:10984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11001,7 +11002,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11004 "configure"
+#line 11005 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11016,16 +11017,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11028: \$? = $ac_status" >&5
+  echo "$as_me:11029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11036,7 +11037,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11039: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11040: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11044,10 +11045,10 @@ echo "${as_me:-configure}:11039: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11047: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11048: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11050 "configure"
+#line 11051 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11062,16 +11063,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11068: \$? = $ac_status" >&5
+  echo "$as_me:11069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11074: \$? = $ac_status" >&5
+  echo "$as_me:11075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11087,7 +11088,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11090: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11091: 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
@@ -11204,7 +11205,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11207: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11208: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11236,14 +11237,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11239: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11240: 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 11246 "configure"
+#line 11247 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11261,16 +11262,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11267: \$? = $ac_status" >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11273: \$? = $ac_status" >&5
+  echo "$as_me:11274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11282,7 +11283,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11285 "configure"
+#line 11286 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11300,16 +11301,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11306: \$? = $ac_status" >&5
+  echo "$as_me:11307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11312: \$? = $ac_status" >&5
+  echo "$as_me:11313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11324,7 +11325,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11327: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11328: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11484,16 +11485,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11487: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11488: 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}:11493: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11494: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11496 "configure"
+#line 11497 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11508,16 +11509,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11512: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11514: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11520: \$? = $ac_status" >&5
+  echo "$as_me:11521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11538,7 +11539,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11541 "configure"
+#line 11542 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11553,16 +11554,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11559: \$? = $ac_status" >&5
+  echo "$as_me:11560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11565: \$? = $ac_status" >&5
+  echo "$as_me:11566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11573,7 +11574,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11576: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11577: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11581,10 +11582,10 @@ echo "${as_me:-configure}:11576: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11584: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11585: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11587 "configure"
+#line 11588 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11599,16 +11600,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11605: \$? = $ac_status" >&5
+  echo "$as_me:11606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11611: \$? = $ac_status" >&5
+  echo "$as_me:11612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11624,7 +11625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11627: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11628: 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
@@ -11737,10 +11738,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11740: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11741: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11743 "configure"
+#line 11744 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11758,23 +11759,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11764: \$? = $ac_status" >&5
+  echo "$as_me:11765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11770: \$? = $ac_status" >&5
+  echo "$as_me:11771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11777: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11778: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11797,7 +11798,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11800: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11801: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11809,7 +11810,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11812: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11813: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11897,7 +11898,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11900: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11901: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11907,7 +11908,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11910: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11911: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11917,7 +11918,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11920: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11921: 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"
@@ -11929,10 +11930,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11932: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11933: 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 11935 "configure"
+#line 11936 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11947,16 +11948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11950: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11953: \$? = $ac_status" >&5
+  echo "$as_me:11954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11959: \$? = $ac_status" >&5
+  echo "$as_me:11960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11965,12 +11966,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11968: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11969: 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 11973 "configure"
+#line 11974 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11985,16 +11986,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11991: \$? = $ac_status" >&5
+  echo "$as_me:11992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11997: \$? = $ac_status" >&5
+  echo "$as_me:11998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12005,19 +12006,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12008: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12009: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12013: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12014: 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 12020 "configure"
+#line 12021 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12035,16 +12036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12041: \$? = $ac_status" >&5
+  echo "$as_me:12042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12047: \$? = $ac_status" >&5
+  echo "$as_me:12048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12056,7 +12057,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12059 "configure"
+#line 12060 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12074,16 +12075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12080: \$? = $ac_status" >&5
+  echo "$as_me:12081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12086: \$? = $ac_status" >&5
+  echo "$as_me:12087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12098,7 +12099,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12101: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12102: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12249,14 +12250,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12252: checking if SIGWINCH is defined" >&5
+echo "$as_me:12253: 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 12259 "configure"
+#line 12260 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12271,23 +12272,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12277: \$? = $ac_status" >&5
+  echo "$as_me:12278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12283: \$? = $ac_status" >&5
+  echo "$as_me:12284: \$? = $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 12290 "configure"
+#line 12291 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12305,16 +12306,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12311: \$? = $ac_status" >&5
+  echo "$as_me:12312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12317: \$? = $ac_status" >&5
+  echo "$as_me:12318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12328,11 +12329,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12331: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12332: 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:12335: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12336: 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
@@ -12343,7 +12344,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12346 "configure"
+#line 12347 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12365,16 +12366,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12371: \$? = $ac_status" >&5
+  echo "$as_me:12372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12377: \$? = $ac_status" >&5
+  echo "$as_me:12378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12388,7 +12389,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12391: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12392: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12398,13 +12399,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12401: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12402: 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 12407 "configure"
+#line 12408 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12418,16 +12419,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12424: \$? = $ac_status" >&5
+  echo "$as_me:12425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12430: \$? = $ac_status" >&5
+  echo "$as_me:12431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12438,7 +12439,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12441: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12442: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12452,7 +12453,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12455: checking if you want wide-character code" >&5
+echo "$as_me:12456: 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.
@@ -12462,7 +12463,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:12465: result: $with_widec" >&5
+echo "$as_me:12466: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12484,7 +12485,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12487: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12488: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12497,23 +12498,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12500: checking for $ac_header" >&5
+echo "$as_me:12501: 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 12506 "configure"
+#line 12507 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12511: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12516: \$? = $ac_status" >&5
+  echo "$as_me:12517: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12532,7 +12533,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12536: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12542,14 +12543,14 @@ EOF
 fi
 done
 
-echo "$as_me:12545: checking if wchar.h can be used as is" >&5
+echo "$as_me:12546: 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 12552 "configure"
+#line 12553 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12571,16 +12572,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12577: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12583: \$? = $ac_status" >&5
+  echo "$as_me:12584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12590,16 +12591,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12593: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12594: 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:12599: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12600: 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 12602 "configure"
+#line 12603 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12615,16 +12616,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12621: \$? = $ac_status" >&5
+  echo "$as_me:12622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12627: \$? = $ac_status" >&5
+  echo "$as_me:12628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12633,16 +12634,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12636: result: $cf_result" >&5
+echo "$as_me:12637: 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:12642: checking checking for compatible value versus " >&5
+	echo "$as_me:12643: 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 12645 "configure"
+#line 12646 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12658,16 +12659,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12664: \$? = $ac_status" >&5
+  echo "$as_me:12665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12670: \$? = $ac_status" >&5
+  echo "$as_me:12671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12676,7 +12677,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12679: result: $cf_result" >&5
+	echo "$as_me:12680: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12686,7 +12687,7 @@ fi
 
 fi
 
-echo "$as_me:12689: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12690: 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
@@ -12757,7 +12758,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12760 "configure"
+#line 12761 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12802,15 +12803,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:12809: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12813: \$? = $ac_status" >&5
+  echo "$as_me:12814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12823,7 +12824,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12826: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12827: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12834,13 +12835,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12837: checking for $ac_func" >&5
+echo "$as_me:12838: 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 12843 "configure"
+#line 12844 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12871,16 +12872,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12877: \$? = $ac_status" >&5
+  echo "$as_me:12878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12883: \$? = $ac_status" >&5
+  echo "$as_me:12884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12890,7 +12891,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12893: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12894: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12905,23 +12906,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12908: checking for $ac_header" >&5
+echo "$as_me:12909: 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 12914 "configure"
+#line 12915 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12918: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12919: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12924: \$? = $ac_status" >&5
+  echo "$as_me:12925: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12940,7 +12941,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12943: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12944: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12950,7 +12951,7 @@ EOF
 fi
 done
 
-echo "$as_me:12953: checking for multibyte character support" >&5
+echo "$as_me:12954: 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
@@ -12958,7 +12959,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12961 "configure"
+#line 12962 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12975,16 +12976,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12981: \$? = $ac_status" >&5
+  echo "$as_me:12982: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12987: \$? = $ac_status" >&5
+  echo "$as_me:12988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12996,12 +12997,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:12999: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13000: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13004 "configure"
+#line 13005 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13014,16 +13015,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13020: \$? = $ac_status" >&5
+  echo "$as_me:13021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13026: \$? = $ac_status" >&5
+  echo "$as_me:13027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13037,7 +13038,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13040 "configure"
+#line 13041 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13050,16 +13051,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13056: \$? = $ac_status" >&5
+  echo "$as_me:13057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13062: \$? = $ac_status" >&5
+  echo "$as_me:13063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13076,9 +13077,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13079: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13080: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13081: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13082: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13169,7 +13170,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13172: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13173: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13177,7 +13178,7 @@ echo "${as_me:-configure}:13172: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13180 "configure"
+#line 13181 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13190,21 +13191,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13196: \$? = $ac_status" >&5
+  echo "$as_me:13197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13202: \$? = $ac_status" >&5
+  echo "$as_me:13203: \$? = $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}:13207: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13208: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13222,7 +13223,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13225: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13226: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13297,13 +13298,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13300: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13301: 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 13306 "configure"
+#line 13307 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13316,21 +13317,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13322: \$? = $ac_status" >&5
+  echo "$as_me:13323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13328: \$? = $ac_status" >&5
+  echo "$as_me:13329: \$? = $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}:13333: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13334: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13372,7 +13373,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13375: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13376: 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
@@ -13410,7 +13411,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13413 "configure"
+#line 13414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13422,16 +13423,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13428: \$? = $ac_status" >&5
+  echo "$as_me:13429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13434: \$? = $ac_status" >&5
+  echo "$as_me:13435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13448,7 +13449,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13451: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13452: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13484,7 +13485,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13487: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13488: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13516,14 +13517,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13519: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13520: 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 13526 "configure"
+#line 13527 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13541,23 +13542,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13547: \$? = $ac_status" >&5
+  echo "$as_me:13548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13553: \$? = $ac_status" >&5
+  echo "$as_me:13554: \$? = $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 13560 "configure"
+#line 13561 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13576,16 +13577,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13582: \$? = $ac_status" >&5
+  echo "$as_me:13583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13588: \$? = $ac_status" >&5
+  echo "$as_me:13589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13597,7 +13598,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13600: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13601: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13615,14 +13616,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13618: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13619: 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 13625 "configure"
+#line 13626 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13640,23 +13641,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13646: \$? = $ac_status" >&5
+  echo "$as_me:13647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13652: \$? = $ac_status" >&5
+  echo "$as_me:13653: \$? = $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 13659 "configure"
+#line 13660 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13675,16 +13676,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13681: \$? = $ac_status" >&5
+  echo "$as_me:13682: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13687: \$? = $ac_status" >&5
+  echo "$as_me:13688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13696,7 +13697,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13699: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13700: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13719,14 +13720,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13722: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13723: 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 13729 "configure"
+#line 13730 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13744,23 +13745,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13750: \$? = $ac_status" >&5
+  echo "$as_me:13751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13756: \$? = $ac_status" >&5
+  echo "$as_me:13757: \$? = $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 13763 "configure"
+#line 13764 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13779,16 +13780,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13785: \$? = $ac_status" >&5
+  echo "$as_me:13786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13791: \$? = $ac_status" >&5
+  echo "$as_me:13792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13800,7 +13801,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13803: result: $cf_cv_wint_t" >&5
+echo "$as_me:13804: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13832,7 +13833,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13835: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13836: 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.
@@ -13842,7 +13843,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13845: result: $with_lp64" >&5
+echo "$as_me:13846: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13858,7 +13859,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13861: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13862: 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
@@ -13870,7 +13871,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13873 "configure"
+#line 13874 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13890,16 +13891,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13896: \$? = $ac_status" >&5
+  echo "$as_me:13897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13902: \$? = $ac_status" >&5
+  echo "$as_me:13903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13909,16 +13910,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13915: \$? = $ac_status" >&5
+  echo "$as_me:13916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13921: \$? = $ac_status" >&5
+  echo "$as_me:13922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13932,13 +13933,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13935: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13936: 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:13941: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13942: 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
@@ -13946,7 +13947,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13949 "configure"
+#line 13950 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13966,16 +13967,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13972: \$? = $ac_status" >&5
+  echo "$as_me:13973: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13978: \$? = $ac_status" >&5
+  echo "$as_me:13979: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13984,7 +13985,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13987 "configure"
+#line 13988 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14005,16 +14006,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14011: \$? = $ac_status" >&5
+  echo "$as_me:14012: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14017: \$? = $ac_status" >&5
+  echo "$as_me:14018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14025,7 +14026,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14028: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14029: 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
 
@@ -14035,7 +14036,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14038: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14039: 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
@@ -14043,7 +14044,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14046 "configure"
+#line 14047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14063,16 +14064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14069: \$? = $ac_status" >&5
+  echo "$as_me:14070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14075: \$? = $ac_status" >&5
+  echo "$as_me:14076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14081,7 +14082,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14084 "configure"
+#line 14085 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14102,16 +14103,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14108: \$? = $ac_status" >&5
+  echo "$as_me:14109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14114: \$? = $ac_status" >&5
+  echo "$as_me:14115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14122,7 +14123,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14125: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14126: 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
 
@@ -14135,7 +14136,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14138: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14139: 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
@@ -14143,7 +14144,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14146 "configure"
+#line 14147 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14155,16 +14156,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14161: \$? = $ac_status" >&5
+  echo "$as_me:14162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14167: \$? = $ac_status" >&5
+  echo "$as_me:14168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14173,7 +14174,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14176 "configure"
+#line 14177 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14186,16 +14187,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14192: \$? = $ac_status" >&5
+  echo "$as_me:14193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14198: \$? = $ac_status" >&5
+  echo "$as_me:14199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14206,7 +14207,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14209: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14210: 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
 
@@ -14220,13 +14221,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14223: checking for fseeko" >&5
+echo "$as_me:14224: 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 14229 "configure"
+#line 14230 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14238,16 +14239,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14244: \$? = $ac_status" >&5
+  echo "$as_me:14245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14250: \$? = $ac_status" >&5
+  echo "$as_me:14251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14257,7 +14258,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14260: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14261: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14296,14 +14297,14 @@ fi
 
 	fi
 
-	echo "$as_me:14299: checking whether to use struct dirent64" >&5
+	echo "$as_me:14300: 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 14306 "configure"
+#line 14307 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14326,16 +14327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14332: \$? = $ac_status" >&5
+  echo "$as_me:14333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14338: \$? = $ac_status" >&5
+  echo "$as_me:14339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14346,7 +14347,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14349: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14350: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14356,7 +14357,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14359: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14360: 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.
@@ -14366,14 +14367,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14369: result: $with_tparm_varargs" >&5
+echo "$as_me:14370: 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:14376: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14377: 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.
@@ -14383,14 +14384,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14386: result: $with_tic_depends" >&5
+echo "$as_me:14387: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14393: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14394: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14402,15 +14403,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14405: result: no" >&5
+	echo "$as_me:14406: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14409: result: yes" >&5
+	echo "$as_me:14410: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14413: checking for X11 rgb file" >&5
+echo "$as_me:14414: 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.
@@ -14474,7 +14475,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14477: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14478: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14482,7 +14483,7 @@ esac
 
 fi
 
-echo "$as_me:14485: result: $RGB_PATH" >&5
+echo "$as_me:14486: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14496,7 +14497,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14499: checking for type of bool" >&5
+echo "$as_me:14500: 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.
@@ -14506,10 +14507,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14509: result: $NCURSES_BOOL" >&5
+echo "$as_me:14510: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14512: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14513: 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.
@@ -14521,15 +14522,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14524: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14525: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14528: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14529: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14532: checking for type of chtype" >&5
+echo "$as_me:14533: 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.
@@ -14539,11 +14540,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14542: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14543: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14546: checking for type of ospeed" >&5
+echo "$as_me:14547: 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.
@@ -14553,11 +14554,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14556: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14557: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14560: checking for type of mmask_t" >&5
+echo "$as_me:14561: 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.
@@ -14567,11 +14568,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14570: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14571: 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:14574: checking for size CCHARW_MAX" >&5
+echo "$as_me:14575: 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.
@@ -14581,16 +14582,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14584: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14585: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14587: checking for signed char" >&5
+echo "$as_me:14588: 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 14593 "configure"
+#line 14594 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14605,16 +14606,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14611: \$? = $ac_status" >&5
+  echo "$as_me:14612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14617: \$? = $ac_status" >&5
+  echo "$as_me:14618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14624,10 +14625,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14627: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14628: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14630: checking size of signed char" >&5
+echo "$as_me:14631: 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
@@ -14636,7 +14637,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14639 "configure"
+#line 14640 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14648,21 +14649,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14654: \$? = $ac_status" >&5
+  echo "$as_me:14655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14660: \$? = $ac_status" >&5
+  echo "$as_me:14661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14665 "configure"
+#line 14666 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14674,16 +14675,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14680: \$? = $ac_status" >&5
+  echo "$as_me:14681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14686: \$? = $ac_status" >&5
+  echo "$as_me:14687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14699,7 +14700,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14702 "configure"
+#line 14703 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14711,16 +14712,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14717: \$? = $ac_status" >&5
+  echo "$as_me:14718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14723: \$? = $ac_status" >&5
+  echo "$as_me:14724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14736,7 +14737,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14739 "configure"
+#line 14740 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14748,16 +14749,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14754: \$? = $ac_status" >&5
+  echo "$as_me:14755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14760: \$? = $ac_status" >&5
+  echo "$as_me:14761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14770,12 +14771,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14773: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14774: 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 14778 "configure"
+#line 14779 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14791,15 +14792,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14797: \$? = $ac_status" >&5
+  echo "$as_me:14798: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14802: \$? = $ac_status" >&5
+  echo "$as_me:14803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14815,7 +14816,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14818: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14819: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14826,7 +14827,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14829: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14830: 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.
@@ -14836,12 +14837,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14839: result: $with_signed_char" >&5
+echo "$as_me:14840: 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:14844: checking for type of tparm args" >&5
+echo "$as_me:14845: 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.
@@ -14851,11 +14852,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14854: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14855: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14858: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14859: 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.
@@ -14865,7 +14866,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14868: result: $with_rcs_ids" >&5
+echo "$as_me:14869: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14874,7 +14875,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14877: checking format of man-pages" >&5
+echo "$as_me:14878: 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.
@@ -14965,10 +14966,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14968: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14969: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14971: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14972: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15007,7 +15008,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15010: checking for manpage renaming" >&5
+echo "$as_me:15011: 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.
@@ -15036,15 +15037,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15039: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15040: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15044: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15045: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15047: checking if manpage aliases will be installed" >&5
+echo "$as_me:15048: 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.
@@ -15055,7 +15056,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15058: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15059: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15069,7 +15070,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15072: checking if manpage symlinks should be used" >&5
+echo "$as_me:15073: 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.
@@ -15082,17 +15083,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15085: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15086: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15091: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15092: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15095: checking for manpage tbl" >&5
+echo "$as_me:15096: 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.
@@ -15103,7 +15104,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15106: result: $MANPAGE_TBL" >&5
+echo "$as_me:15107: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15421,7 +15422,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15424: checking if you want to build with function extensions" >&5
+echo "$as_me:15425: 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.
@@ -15431,7 +15432,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15434: result: $with_ext_funcs" >&5
+echo "$as_me:15435: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15487,7 +15488,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15490: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15491: 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.
@@ -15497,7 +15498,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15500: result: $with_sp_funcs" >&5
+echo "$as_me:15501: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15516,7 +15517,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15519: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15520: 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.
@@ -15526,7 +15527,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15529: result: $with_term_driver" >&5
+echo "$as_me:15530: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15535,19 +15536,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15538: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15539: 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:15543: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15544: 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:15550: checking for extended use of const keyword" >&5
+echo "$as_me:15551: 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.
@@ -15557,7 +15558,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15560: result: $with_ext_const" >&5
+echo "$as_me:15561: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15565,7 +15566,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15568: checking if you want to use extended colors" >&5
+echo "$as_me:15569: 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.
@@ -15575,12 +15576,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15578: result: $with_ext_colors" >&5
+echo "$as_me:15579: 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:15583: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15584: 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)
@@ -15591,7 +15592,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15594: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15595: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15619,7 +15620,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15622: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15623: 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.
@@ -15629,7 +15630,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15632: result: $with_ext_mouse" >&5
+echo "$as_me:15633: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15639,7 +15640,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15643: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15656,7 +15657,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15659: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15660: 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.
@@ -15666,7 +15667,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15669: result: $with_ext_putwin" >&5
+echo "$as_me:15670: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15676,7 +15677,7 @@ EOF
 
 fi
 
-echo "$as_me:15679: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15680: 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.
@@ -15686,7 +15687,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15689: result: $with_no_padding" >&5
+echo "$as_me:15690: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15694,7 +15695,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15697: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15698: 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.
@@ -15704,7 +15705,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15707: result: $with_sigwinch" >&5
+echo "$as_me:15708: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15712,7 +15713,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15715: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15716: 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.
@@ -15722,7 +15723,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15725: result: $with_tcap_names" >&5
+echo "$as_me:15726: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15736,7 +15737,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15739: checking if you want to link with the pthread library" >&5
+echo "$as_me:15740: 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.
@@ -15746,27 +15747,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15749: result: $with_pthread" >&5
+echo "$as_me:15750: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15753: checking for pthread.h" >&5
+	echo "$as_me:15754: 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 15759 "configure"
+#line 15760 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15764: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15769: \$? = $ac_status" >&5
+  echo "$as_me:15770: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15785,7 +15786,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15788: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15789: 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
 
@@ -15795,7 +15796,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15798: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15799: 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"
 
@@ -15816,7 +15817,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15819 "configure"
+#line 15820 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15833,16 +15834,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15839: \$? = $ac_status" >&5
+  echo "$as_me:15840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15845: \$? = $ac_status" >&5
+  echo "$as_me:15846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15852,7 +15853,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15855: result: $with_pthread" >&5
+	    echo "$as_me:15856: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15880,7 +15881,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15883: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15884: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15890,13 +15891,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15893: checking for pthread_kill" >&5
+	echo "$as_me:15894: 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 15899 "configure"
+#line 15900 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15927,16 +15928,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15933: \$? = $ac_status" >&5
+  echo "$as_me:15934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15939: \$? = $ac_status" >&5
+  echo "$as_me:15940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15946,11 +15947,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15949: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15950: 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:15953: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15954: 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.
@@ -15960,7 +15961,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15963: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15964: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15971,7 +15972,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15974: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15975: 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.
@@ -15981,18 +15982,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15984: result: $use_weak_symbols" >&5
+	echo "$as_me:15985: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15988: checking if $CC supports weak symbols" >&5
+echo "$as_me:15989: 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 15995 "configure"
+#line 15996 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16018,16 +16019,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16024: \$? = $ac_status" >&5
+  echo "$as_me:16025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16030: \$? = $ac_status" >&5
+  echo "$as_me:16031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16038,7 +16039,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16041: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16042: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16088,7 +16089,7 @@ fi
 # 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:16091: checking if you want reentrant code" >&5
+echo "$as_me:16092: 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.
@@ -16098,7 +16099,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16101: result: $with_reentrant" >&5
+echo "$as_me:16102: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16187,7 +16188,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16190: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16191: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16199,7 +16200,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16202: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16203: 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.
@@ -16221,16 +16222,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16224: result: $enable_opaque_curses" >&5
+echo "$as_me:16225: 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:16229: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16230: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16233: checking if you want opaque form-library structures" >&5
+echo "$as_me:16234: 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.
@@ -16240,10 +16241,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
-echo "$as_me:16243: result: $enable_opaque_form" >&5
+echo "$as_me:16244: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16246: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16247: 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.
@@ -16253,10 +16254,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
-echo "$as_me:16256: result: $enable_opaque_menu" >&5
+echo "$as_me:16257: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16259: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16260: 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.
@@ -16266,7 +16267,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
-echo "$as_me:16269: result: $enable_opaque_panel" >&5
+echo "$as_me:16270: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16276,7 +16277,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16279: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16280: 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.
@@ -16286,7 +16287,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16289: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16290: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16299,7 +16300,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16302: checking if you want all development code" >&5
+echo "$as_me:16303: 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.
@@ -16309,11 +16310,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16312: result: $with_develop" >&5
+echo "$as_me:16313: 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:16316: checking if you want hard-tabs code" >&5
+echo "$as_me:16317: 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.
@@ -16323,7 +16324,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16326: result: $enable_hard_tabs" >&5
+echo "$as_me:16327: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16331,7 +16332,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16334: checking if you want limited support for xmc" >&5
+echo "$as_me:16335: 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.
@@ -16341,7 +16342,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16344: result: $enable_xmc_glitch" >&5
+echo "$as_me:16345: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16351,7 +16352,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16354: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16355: 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.
@@ -16361,7 +16362,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16364: result: $with_assumed_color" >&5
+echo "$as_me:16365: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16369,7 +16370,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16372: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16373: 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.
@@ -16379,7 +16380,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16382: result: $with_hashmap" >&5
+echo "$as_me:16383: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16387,7 +16388,25 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16390: checking if you want colorfgbg code" >&5
+echo "$as_me:16391: checking if you want code to check screensize" >&5
+echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
+
+# Check whether --enable-check-size or --disable-check-size was given.
+if test "${enable_check_size+set}" = set; then
+  enableval="$enable_check_size"
+  with_check_size=$enableval
+else
+  with_check_size=no
+fi;
+echo "$as_me:16401: result: $with_check_size" >&5
+echo "${ECHO_T}$with_check_size" >&6
+test "x$with_check_size" = xyes &&
+cat >>confdefs.h <<\EOF
+#define USE_CHECK_SIZE 1
+EOF
+
+###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+echo "$as_me:16409: 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.
@@ -16397,7 +16416,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16400: result: $with_colorfgbg" >&5
+echo "$as_me:16419: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16405,7 +16424,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16408: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16427: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16415,14 +16434,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16418: result: $cf_with_fvisibility" >&5
+echo "$as_me:16437: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16425: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16444: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16431,7 +16450,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16434 "configure"
+#line 16453 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16447,16 +16466,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16453: \$? = $ac_status" >&5
+  echo "$as_me:16472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16459: \$? = $ac_status" >&5
+  echo "$as_me:16478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16468,7 +16487,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16471: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16490: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16583,7 +16602,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16586: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16605: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16592,7 +16611,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16595 "configure"
+#line 16614 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16608,16 +16627,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16614: \$? = $ac_status" >&5
+  echo "$as_me:16633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16620: \$? = $ac_status" >&5
+  echo "$as_me:16639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16629,7 +16648,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16632: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16651: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16752,7 +16771,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16755: checking if you want interop bindings" >&5
+echo "$as_me:16774: 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.
@@ -16762,13 +16781,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16765: result: $with_exp_interop" >&5
+echo "$as_me:16784: 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:16771: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16790: 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.
@@ -16778,13 +16797,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16781: result: $with_safe_sprintf" >&5
+echo "$as_me:16800: 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:16787: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16806: 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.
@@ -16794,7 +16813,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16797: result: $with_scroll_hints" >&5
+echo "$as_me:16816: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16803,7 +16822,7 @@ EOF
 
 fi
 
-echo "$as_me:16806: checking if you want wgetch-events code" >&5
+echo "$as_me:16825: 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.
@@ -16813,7 +16832,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16816: result: $with_wgetch_events" >&5
+echo "$as_me:16835: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16828,7 +16847,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16831: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16850: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16838,7 +16857,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16841: result: $with_exp_win32" >&5
+	echo "$as_me:16860: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16864,7 +16883,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16867: checking if you want to see long compiling messages" >&5
+echo "$as_me:16886: 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.
@@ -16898,7 +16917,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16901: result: $enableval" >&5
+echo "$as_me:16920: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16911,7 +16930,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16914: checking if you want to install stripped executables" >&5
+echo "$as_me:16933: 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.
@@ -16928,7 +16947,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16931: result: $enable_stripping" >&5
+echo "$as_me:16950: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16939,7 +16958,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16942: checking if install accepts -p option" >&5
+echo "$as_me:16961: 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
@@ -16970,10 +16989,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16973: result: $cf_cv_install_p" >&5
+echo "$as_me:16992: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16976: checking if install needs to be told about ownership" >&5
+echo "$as_me:16995: 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)
@@ -16984,7 +17003,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:16987: result: $with_install_o" >&5
+echo "$as_me:17006: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -16995,7 +17014,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:16998: checking if you want to specify strip-program" >&5
+	echo "$as_me:17017: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17005,11 +17024,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17008: result: $with_strip_program" >&5
+	echo "$as_me:17027: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17012: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17031: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17030,11 +17049,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17033: result: $check_install_strip" >&5
+		echo "$as_me:17052: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17037: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17056: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17049,7 +17068,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17052: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17071: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17075,7 +17094,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17078: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17097: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17092,17 +17111,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17095: result: $enable_stdnoreturn" >&5
+echo "$as_me:17114: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17099: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17118: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17105 "configure"
+#line 17124 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17118,16 +17137,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17140: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17124: \$? = $ac_status" >&5
+  echo "$as_me:17143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17130: \$? = $ac_status" >&5
+  echo "$as_me:17149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17138,7 +17157,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17141: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17160: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17194,16 +17213,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17197: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17216: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17202: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17221: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17225: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17242,16 +17261,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17245: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17264: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17250: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17269: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17254: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17273: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17290,23 +17309,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17293: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17312: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17298: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17317: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17302: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17321: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17309: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17328: 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.
@@ -17323,7 +17342,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17326: result: $enable_warnings" >&5
+echo "$as_me:17345: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17347,7 +17366,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17350 "configure"
+#line 17369 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17362,26 +17381,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17368: \$? = $ac_status" >&5
+  echo "$as_me:17387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17374: \$? = $ac_status" >&5
+  echo "$as_me:17393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17377: checking for X11/Xt const-feature" >&5
+echo "$as_me:17396: 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 17384 "configure"
+#line 17403 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17398,16 +17417,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17404: \$? = $ac_status" >&5
+  echo "$as_me:17423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17410: \$? = $ac_status" >&5
+  echo "$as_me:17429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17422,7 +17441,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17425: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17444: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17451,7 +17470,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17454 "${as_me:-configure}"
+#line 17473 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17467,7 +17486,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17470: checking for $CC warning options..." >&5
+	{ echo "$as_me:17489: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17483,12 +17502,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17486: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17489: \$? = $ac_status" >&5
+  echo "$as_me:17508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17491: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17510: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17496,7 +17515,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17499: checking for $CC warning options..." >&5
+	{ echo "$as_me:17518: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17519,12 +17538,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17522: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17525: \$? = $ac_status" >&5
+  echo "$as_me:17544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17527: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17546: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17532,7 +17551,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17535: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17554: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17542,7 +17561,7 @@ echo "${as_me:-configure}:17535: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17545: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17564: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17575,10 +17594,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17578: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17597: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17581 "${as_me:-configure}"
+#line 17600 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17628,12 +17647,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17631: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17634: \$? = $ac_status" >&5
+  echo "$as_me:17653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17636: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17655: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17705,12 +17724,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17708: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17727: 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 17713 "configure"
+#line 17732 "configure"
 #include "confdefs.h"
 
 int
@@ -17727,16 +17746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17733: \$? = $ac_status" >&5
+  echo "$as_me:17752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17739: \$? = $ac_status" >&5
+  echo "$as_me:17758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17747,7 +17766,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17750: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17769: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17756,11 +17775,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17759: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17778: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17763 "configure"
+#line 17782 "configure"
 #include "confdefs.h"
 
 int
@@ -17777,16 +17796,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17783: \$? = $ac_status" >&5
+  echo "$as_me:17802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17789: \$? = $ac_status" >&5
+  echo "$as_me:17808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17796,7 +17815,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17799: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17818: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17805,30 +17824,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17808: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17827: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17815: checking version of $CC" >&5
+	echo "$as_me:17834: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17819: result: $CLANG_VERSION" >&5
+	echo "$as_me:17838: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17826: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17845: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17831 "configure"
+#line 17850 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17842,16 +17861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17848: \$? = $ac_status" >&5
+  echo "$as_me:17867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17854: \$? = $ac_status" >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17862,13 +17881,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17865: result: $cf_clang_optok" >&5
+		echo "$as_me:17884: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17871: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17890: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17885,7 +17904,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17888 "configure"
+#line 17907 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17903,7 +17922,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17906: checking for $CC warning options..." >&5
+	{ echo "$as_me:17925: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17920,12 +17939,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17926: \$? = $ac_status" >&5
+  echo "$as_me:17945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17947: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17934,7 +17953,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17937: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17956: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17964,16 +17983,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17967: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17970: \$? = $ac_status" >&5
+  echo "$as_me:17989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17972: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17991: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17976: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17995: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -17991,7 +18010,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:17994: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18013: 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.
@@ -18001,7 +18020,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18004: result: $enable_string_hacks" >&5
+echo "$as_me:18023: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18010,15 +18029,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18013: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18032: 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:18015: checking for strlcat" >&5
+	echo "$as_me:18034: 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 18021 "configure"
+#line 18040 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18049,16 +18068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18055: \$? = $ac_status" >&5
+  echo "$as_me:18074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18061: \$? = $ac_status" >&5
+  echo "$as_me:18080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18068,7 +18087,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18071: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18090: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18078,7 +18097,7 @@ EOF
 
 else
 
-		echo "$as_me:18081: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18100: 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
@@ -18086,7 +18105,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18089 "configure"
+#line 18108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18105,16 +18124,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18111: \$? = $ac_status" >&5
+  echo "$as_me:18130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
+  echo "$as_me:18136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18125,7 +18144,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18128: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18147: 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
 
@@ -18148,23 +18167,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18151: checking for $ac_header" >&5
+echo "$as_me:18170: 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 18157 "configure"
+#line 18176 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18161: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18180: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18167: \$? = $ac_status" >&5
+  echo "$as_me:18186: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18183,7 +18202,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18186: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18205: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18204,13 +18223,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18207: checking for $ac_func" >&5
+echo "$as_me:18226: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18213 "configure"
+#line 18232 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18241,16 +18260,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18247: \$? = $ac_status" >&5
+  echo "$as_me:18266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18253: \$? = $ac_status" >&5
+  echo "$as_me:18272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18260,7 +18279,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18263: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18282: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18273,7 +18292,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18276: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18295: 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.
@@ -18283,7 +18302,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18286: result: $with_assertions" >&5
+echo "$as_me:18305: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18299,7 +18318,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18302: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18321: 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.
@@ -18321,7 +18340,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18324: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18343: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18435,23 +18454,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18438: checking for dmalloc.h" >&5
+	echo "$as_me:18457: 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 18444 "configure"
+#line 18463 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18448: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18467: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18454: \$? = $ac_status" >&5
+  echo "$as_me:18473: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18470,11 +18489,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18473: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18492: 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:18477: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18496: 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
@@ -18482,7 +18501,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18485 "configure"
+#line 18504 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18501,16 +18520,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18507: \$? = $ac_status" >&5
+  echo "$as_me:18526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18513: \$? = $ac_status" >&5
+  echo "$as_me:18532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18521,7 +18540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18524: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18543: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18536,7 +18555,7 @@ fi
 
 fi
 
-echo "$as_me:18539: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18558: 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.
@@ -18558,7 +18577,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18561: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18580: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18672,23 +18691,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18675: checking for dbmalloc.h" >&5
+	echo "$as_me:18694: 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 18681 "configure"
+#line 18700 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18685: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18704: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18691: \$? = $ac_status" >&5
+  echo "$as_me:18710: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18707,11 +18726,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18710: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18729: 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:18714: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18733: 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
@@ -18719,7 +18738,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18722 "configure"
+#line 18741 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18738,16 +18757,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18744: \$? = $ac_status" >&5
+  echo "$as_me:18763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18750: \$? = $ac_status" >&5
+  echo "$as_me:18769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18758,7 +18777,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18761: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18780: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18773,7 +18792,7 @@ fi
 
 fi
 
-echo "$as_me:18776: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18795: 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.
@@ -18795,7 +18814,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18798: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18817: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18908,7 +18927,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18911: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18930: 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.
@@ -18919,7 +18938,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18922: result: $with_no_leaks" >&5
+echo "$as_me:18941: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18971,7 +18990,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18974: checking whether to add trace feature to all models" >&5
+echo "$as_me:18993: 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.
@@ -18981,7 +19000,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:18984: result: $cf_with_trace" >&5
+echo "$as_me:19003: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19095,7 +19114,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19098: checking if we want to use GNAT projects" >&5
+echo "$as_me:19117: 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.
@@ -19112,7 +19131,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19115: result: $enable_gnat_projects" >&5
+echo "$as_me:19134: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19125,14 +19144,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19128: checking if ssp library is needed" >&5
+echo "$as_me:19147: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19135 "configure"
+#line 19154 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19149,16 +19168,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19155: \$? = $ac_status" >&5
+  echo "$as_me:19174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19161: \$? = $ac_status" >&5
+  echo "$as_me:19180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19168,7 +19187,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19171 "configure"
+#line 19190 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19185,16 +19204,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19197: \$? = $ac_status" >&5
+  echo "$as_me:19216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19208,7 +19227,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19211: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19230: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19237,14 +19256,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19240: checking if -lm needed for math functions" >&5
+echo "$as_me:19259: 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 19247 "configure"
+#line 19266 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19260,16 +19279,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19266: \$? = $ac_status" >&5
+  echo "$as_me:19285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19272: \$? = $ac_status" >&5
+  echo "$as_me:19291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19279,7 +19298,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19282: result: $cf_cv_need_libm" >&5
+echo "$as_me:19301: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19287,14 +19306,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19290: checking if -lm is available for math functions" >&5
+	echo "$as_me:19309: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19297 "configure"
+#line 19316 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19310,16 +19329,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19316: \$? = $ac_status" >&5
+  echo "$as_me:19335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19322: \$? = $ac_status" >&5
+  echo "$as_me:19341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19329,7 +19348,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19332: result: $cf_cv_have_libm" >&5
+echo "$as_me:19351: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19351,13 +19370,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19354: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19373: 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 19360 "configure"
+#line 19379 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19373,16 +19392,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19395: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19379: \$? = $ac_status" >&5
+  echo "$as_me:19398: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19385: \$? = $ac_status" >&5
+  echo "$as_me:19404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19392,7 +19411,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19395: result: $ac_cv_header_time" >&5
+echo "$as_me:19414: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19407,7 +19426,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19410: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19429: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19415,7 +19434,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19418 "configure"
+#line 19437 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19434,16 +19453,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19440: \$? = $ac_status" >&5
+  echo "$as_me:19459: \$? = $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:19462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19446: \$? = $ac_status" >&5
+  echo "$as_me:19465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19454,11 +19473,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19457: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19476: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19461: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19480: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19466,7 +19485,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19469 "configure"
+#line 19488 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19485,16 +19504,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19491: \$? = $ac_status" >&5
+  echo "$as_me:19510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19497: \$? = $ac_status" >&5
+  echo "$as_me:19516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19505,7 +19524,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19508: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19527: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19527,7 +19546,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19530: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19549: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19535,7 +19554,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19538 "configure"
+#line 19557 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19554,16 +19573,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19560: \$? = $ac_status" >&5
+  echo "$as_me:19579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19566: \$? = $ac_status" >&5
+  echo "$as_me:19585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19574,7 +19593,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19577: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19596: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19596,7 +19615,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19599: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19618: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19604,7 +19623,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19607 "configure"
+#line 19626 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19623,16 +19642,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19629: \$? = $ac_status" >&5
+  echo "$as_me:19648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19635: \$? = $ac_status" >&5
+  echo "$as_me:19654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19643,7 +19662,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19646: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19665: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19685,7 +19704,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19688: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19707: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19693,7 +19712,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19696 "configure"
+#line 19715 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19712,16 +19731,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19718: \$? = $ac_status" >&5
+  echo "$as_me:19737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19724: \$? = $ac_status" >&5
+  echo "$as_me:19743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19732,7 +19751,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19735: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19754: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19760,13 +19779,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19763: checking for regcomp" >&5
+	echo "$as_me:19782: 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 19769 "configure"
+#line 19788 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19797,16 +19816,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19803: \$? = $ac_status" >&5
+  echo "$as_me:19822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19809: \$? = $ac_status" >&5
+  echo "$as_me:19828: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19816,7 +19835,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19819: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19838: 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
@@ -19825,7 +19844,7 @@ else
 		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:19828: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19847: 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
@@ -19833,7 +19852,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19836 "configure"
+#line 19855 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19852,16 +19871,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19858: \$? = $ac_status" >&5
+  echo "$as_me:19877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19864: \$? = $ac_status" >&5
+  echo "$as_me:19883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19872,7 +19891,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19875: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19894: 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
 
@@ -19904,13 +19923,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19907: checking for compile" >&5
+	echo "$as_me:19926: 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 19913 "configure"
+#line 19932 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19941,16 +19960,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19947: \$? = $ac_status" >&5
+  echo "$as_me:19966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19953: \$? = $ac_status" >&5
+  echo "$as_me:19972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19960,13 +19979,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19963: result: $ac_cv_func_compile" >&5
+echo "$as_me:19982: 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:19969: checking for compile in -lgen" >&5
+		echo "$as_me:19988: 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
@@ -19974,7 +19993,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19977 "configure"
+#line 19996 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19993,16 +20012,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19999: \$? = $ac_status" >&5
+  echo "$as_me:20018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20005: \$? = $ac_status" >&5
+  echo "$as_me:20024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20013,7 +20032,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20016: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20035: 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
 
@@ -20041,11 +20060,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20044: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20063: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20048: checking for regular-expression headers" >&5
+echo "$as_me:20067: 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
@@ -20057,7 +20076,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20060 "configure"
+#line 20079 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20074,16 +20093,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20080: \$? = $ac_status" >&5
+  echo "$as_me:20099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20086: \$? = $ac_status" >&5
+  echo "$as_me:20105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20100,7 +20119,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20103 "configure"
+#line 20122 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20120,16 +20139,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20126: \$? = $ac_status" >&5
+  echo "$as_me:20145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20132: \$? = $ac_status" >&5
+  echo "$as_me:20151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20145,11 +20164,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20148: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20167: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20152: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20171: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20187,23 +20206,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20190: checking for $ac_header" >&5
+echo "$as_me:20209: 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 20196 "configure"
+#line 20215 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20200: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20219: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20206: \$? = $ac_status" >&5
+  echo "$as_me:20225: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20222,7 +20241,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20244: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20235,23 +20254,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20238: checking for $ac_header" >&5
+echo "$as_me:20257: 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 20244 "configure"
+#line 20263 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20248: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20254: \$? = $ac_status" >&5
+  echo "$as_me:20273: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20270,7 +20289,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20273: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20280,7 +20299,7 @@ EOF
 fi
 done
 
-echo "$as_me:20283: checking for header declaring getopt variables" >&5
+echo "$as_me:20302: 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
@@ -20290,7 +20309,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20293 "configure"
+#line 20312 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20303,16 +20322,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20309: \$? = $ac_status" >&5
+  echo "$as_me:20328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20315: \$? = $ac_status" >&5
+  echo "$as_me:20334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20324,7 +20343,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20327: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20346: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20341,14 +20360,14 @@ EOF
 
 fi
 
-echo "$as_me:20344: checking if external environ is declared" >&5
+echo "$as_me:20363: 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 20351 "configure"
+#line 20370 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20361,16 +20380,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20367: \$? = $ac_status" >&5
+  echo "$as_me:20386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20373: \$? = $ac_status" >&5
+  echo "$as_me:20392: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20381,7 +20400,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20384: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20403: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20396,14 +20415,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20399: checking if external environ exists" >&5
+echo "$as_me:20418: 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 20406 "configure"
+#line 20425 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20418,16 +20437,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20424: \$? = $ac_status" >&5
+  echo "$as_me:20443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20430: \$? = $ac_status" >&5
+  echo "$as_me:20449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20438,7 +20457,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20441: result: $cf_cv_have_environ" >&5
+echo "$as_me:20460: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20451,13 +20470,13 @@ EOF
 
 fi
 
-echo "$as_me:20454: checking for getenv" >&5
+echo "$as_me:20473: 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 20460 "configure"
+#line 20479 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20488,16 +20507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20494: \$? = $ac_status" >&5
+  echo "$as_me:20513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20500: \$? = $ac_status" >&5
+  echo "$as_me:20519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20507,19 +20526,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20510: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20529: 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:20516: checking for $ac_func" >&5
+echo "$as_me:20535: 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 20522 "configure"
+#line 20541 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20550,16 +20569,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20556: \$? = $ac_status" >&5
+  echo "$as_me:20575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20562: \$? = $ac_status" >&5
+  echo "$as_me:20581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20569,7 +20588,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20572: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20591: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20579,7 +20598,7 @@ EOF
 fi
 done
 
-echo "$as_me:20582: checking if getenv returns consistent values" >&5
+echo "$as_me:20601: 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
@@ -20589,7 +20608,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20592 "configure"
+#line 20611 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20694,15 +20713,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20700: \$? = $ac_status" >&5
+  echo "$as_me:20719: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20705: \$? = $ac_status" >&5
+  echo "$as_me:20724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20715,7 +20734,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20718: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20737: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20730,18 +20749,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20733: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20752: 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
 
-echo "$as_me:20737: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20756: 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 20744 "configure"
+#line 20763 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20761,16 +20780,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20773: \$? = $ac_status" >&5
+  echo "$as_me:20792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20782,7 +20801,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20785: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20804: 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
@@ -20797,13 +20816,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20800: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20819: 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 20806 "configure"
+#line 20825 "configure"
 #include "confdefs.h"
 
 int
@@ -20861,16 +20880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20867: \$? = $ac_status" >&5
+  echo "$as_me:20886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20873: \$? = $ac_status" >&5
+  echo "$as_me:20892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20880,7 +20899,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20883: result: $ac_cv_c_const" >&5
+echo "$as_me:20902: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20890,7 +20909,7 @@ EOF
 
 fi
 
-echo "$as_me:20893: checking for inline" >&5
+echo "$as_me:20912: 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
@@ -20898,7 +20917,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20901 "configure"
+#line 20920 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20907,16 +20926,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20913: \$? = $ac_status" >&5
+  echo "$as_me:20932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20919: \$? = $ac_status" >&5
+  echo "$as_me:20938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20927,7 +20946,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20930: result: $ac_cv_c_inline" >&5
+echo "$as_me:20949: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20953,7 +20972,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20956: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20975: 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
@@ -20962,7 +20981,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20965 "configure"
+#line 20984 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20974,16 +20993,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20980: \$? = $ac_status" >&5
+  echo "$as_me:20999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20986: \$? = $ac_status" >&5
+  echo "$as_me:21005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -20995,7 +21014,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:20998: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21017: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21101,7 +21120,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21104: checking for signal global datatype" >&5
+echo "$as_me:21123: 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
@@ -21113,7 +21132,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21116 "configure"
+#line 21135 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21137,16 +21156,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21143: \$? = $ac_status" >&5
+  echo "$as_me:21162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21149: \$? = $ac_status" >&5
+  echo "$as_me:21168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21160,7 +21179,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21163: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21182: 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 <<EOF
@@ -21169,7 +21188,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21172: checking for type of chtype" >&5
+echo "$as_me:21191: 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
@@ -21179,7 +21198,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21182 "configure"
+#line 21201 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21214,15 +21233,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21220: \$? = $ac_status" >&5
+  echo "$as_me:21239: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21225: \$? = $ac_status" >&5
+  echo "$as_me:21244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21237,7 +21256,7 @@ fi
 
 fi
 
-echo "$as_me:21240: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21259: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21249,14 +21268,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21252: checking if unsigned literals are legal" >&5
+echo "$as_me:21271: 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 21259 "configure"
+#line 21278 "configure"
 #include "confdefs.h"
 
 int
@@ -21268,16 +21287,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21274: \$? = $ac_status" >&5
+  echo "$as_me:21293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21280: \$? = $ac_status" >&5
+  echo "$as_me:21299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21289,7 +21308,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21292: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21311: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21305,14 +21324,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21308: checking if external errno is declared" >&5
+echo "$as_me:21327: 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 21315 "configure"
+#line 21334 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21326,16 +21345,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21332: \$? = $ac_status" >&5
+  echo "$as_me:21351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21338: \$? = $ac_status" >&5
+  echo "$as_me:21357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21346,7 +21365,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21349: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21368: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21361,14 +21380,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21364: checking if external errno exists" >&5
+echo "$as_me:21383: 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 21371 "configure"
+#line 21390 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21383,16 +21402,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21389: \$? = $ac_status" >&5
+  echo "$as_me:21408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21395: \$? = $ac_status" >&5
+  echo "$as_me:21414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21403,7 +21422,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21406: result: $cf_cv_have_errno" >&5
+echo "$as_me:21425: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21416,7 +21435,7 @@ EOF
 
 fi
 
-echo "$as_me:21419: checking if data-only library module links" >&5
+echo "$as_me:21438: 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
@@ -21424,20 +21443,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21427 "configure"
+#line 21446 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21430: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21433: \$? = $ac_status" >&5
+  echo "$as_me:21452: \$? = $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 <<EOF
-#line 21440 "configure"
+#line 21459 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21450,10 +21469,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21456: \$? = $ac_status" >&5
+  echo "$as_me:21475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21466,7 +21485,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21469 "configure"
+#line 21488 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21477,15 +21496,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21483: \$? = $ac_status" >&5
+  echo "$as_me:21502: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21488: \$? = $ac_status" >&5
+  echo "$as_me:21507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21500,7 +21519,7 @@ fi
 
 fi
 
-echo "$as_me:21503: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21522: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21514,14 +21533,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21517: checking for clock_gettime" >&5
+echo "$as_me:21536: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21524 "configure"
+#line 21543 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21534,16 +21553,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21540: \$? = $ac_status" >&5
+  echo "$as_me:21559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21546: \$? = $ac_status" >&5
+  echo "$as_me:21565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21554,7 +21573,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21557: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21576: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21565,13 +21584,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21568: checking for gettimeofday" >&5
+echo "$as_me:21587: 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 21574 "configure"
+#line 21593 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21602,16 +21621,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21608: \$? = $ac_status" >&5
+  echo "$as_me:21627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21614: \$? = $ac_status" >&5
+  echo "$as_me:21633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21621,7 +21640,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21624: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21643: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21631,7 +21650,7 @@ EOF
 
 else
 
-echo "$as_me:21634: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21653: 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
@@ -21639,7 +21658,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21642 "configure"
+#line 21661 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21658,16 +21677,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21664: \$? = $ac_status" >&5
+  echo "$as_me:21683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21670: \$? = $ac_status" >&5
+  echo "$as_me:21689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21678,7 +21697,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21681: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21700: 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
 
@@ -21739,13 +21758,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21742: checking for $ac_func" >&5
+echo "$as_me:21761: 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 21748 "configure"
+#line 21767 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21776,16 +21795,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21782: \$? = $ac_status" >&5
+  echo "$as_me:21801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21788: \$? = $ac_status" >&5
+  echo "$as_me:21807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21795,7 +21814,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21798: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21817: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21805,14 +21824,14 @@ EOF
 fi
 done
 
-echo "$as_me:21808: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21827: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21815 "configure"
+#line 21834 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21827,16 +21846,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21833: \$? = $ac_status" >&5
+  echo "$as_me:21852: \$? = $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:21855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21839: \$? = $ac_status" >&5
+  echo "$as_me:21858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21846,7 +21865,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21849: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21868: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21868,7 +21887,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21871: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21890: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21878,7 +21897,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21881 "configure"
+#line 21900 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21891,15 +21910,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21897: \$? = $ac_status" >&5
+  echo "$as_me:21916: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21902: \$? = $ac_status" >&5
+  echo "$as_me:21921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21911,7 +21930,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21914: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21933: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21923,14 +21942,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21926: checking for getttynam" >&5
+	echo "$as_me:21945: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21933 "configure"
+#line 21952 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21942,16 +21961,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21948: \$? = $ac_status" >&5
+  echo "$as_me:21967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21961,7 +21980,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21964: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21983: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21971,7 +21990,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21974: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21993: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21980,7 +21999,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:21983: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22002: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -21993,14 +22012,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:21996: checking for terminal-capability database functions" >&5
+echo "$as_me:22015: 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 22003 "configure"
+#line 22022 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22020,16 +22039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22026: \$? = $ac_status" >&5
+  echo "$as_me:22045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22032: \$? = $ac_status" >&5
+  echo "$as_me:22051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22040,7 +22059,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22043: result: $cf_cv_cgetent" >&5
+echo "$as_me:22062: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22050,14 +22069,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22053: checking if cgetent uses const parameter" >&5
+echo "$as_me:22072: 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 22060 "configure"
+#line 22079 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22080,16 +22099,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22086: \$? = $ac_status" >&5
+  echo "$as_me:22105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22092: \$? = $ac_status" >&5
+  echo "$as_me:22111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22100,7 +22119,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22103: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22122: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22114,14 +22133,14 @@ fi
 
 fi
 
-echo "$as_me:22117: checking for isascii" >&5
+echo "$as_me:22136: 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 22124 "configure"
+#line 22143 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22133,16 +22152,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22139: \$? = $ac_status" >&5
+  echo "$as_me:22158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22145: \$? = $ac_status" >&5
+  echo "$as_me:22164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22153,7 +22172,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22156: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22175: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22161,10 +22180,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22164: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22183: 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 22167 "configure"
+#line 22186 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22178,16 +22197,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22184: \$? = $ac_status" >&5
+  echo "$as_me:22203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22190: \$? = $ac_status" >&5
+  echo "$as_me:22209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22195,7 +22214,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22198 "configure"
+#line 22217 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22210,16 +22229,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22216: \$? = $ac_status" >&5
+  echo "$as_me:22235: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22222: \$? = $ac_status" >&5
+  echo "$as_me:22241: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22235,11 +22254,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22238: result: $sigact_bad" >&5
+echo "$as_me:22257: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22242: checking if nanosleep really works" >&5
+echo "$as_me:22261: 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
@@ -22249,7 +22268,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22252 "configure"
+#line 22271 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22275,15 +22294,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22281: \$? = $ac_status" >&5
+  echo "$as_me:22300: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22286: \$? = $ac_status" >&5
+  echo "$as_me:22305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22295,7 +22314,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22298: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22317: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22312,23 +22331,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22315: checking for $ac_header" >&5
+echo "$as_me:22334: 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 22321 "configure"
+#line 22340 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22344: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22331: \$? = $ac_status" >&5
+  echo "$as_me:22350: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22347,7 +22366,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22369: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22364,10 +22383,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22367: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22386: 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 22370 "configure"
+#line 22389 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22379,16 +22398,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22385: \$? = $ac_status" >&5
+  echo "$as_me:22404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22391: \$? = $ac_status" >&5
+  echo "$as_me:22410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22396,7 +22415,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22399 "configure"
+#line 22418 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22410,16 +22429,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22416: \$? = $ac_status" >&5
+  echo "$as_me:22435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22422: \$? = $ac_status" >&5
+  echo "$as_me:22441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22435,19 +22454,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22438: result: $termios_bad" >&5
+	echo "$as_me:22457: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22443: checking for tcgetattr" >&5
+echo "$as_me:22462: 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 22450 "configure"
+#line 22469 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22475,16 +22494,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22481: \$? = $ac_status" >&5
+  echo "$as_me:22500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22487: \$? = $ac_status" >&5
+  echo "$as_me:22506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22494,21 +22513,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22497: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22516: 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:22504: checking for vsscanf function or workaround" >&5
+echo "$as_me:22523: 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 22511 "configure"
+#line 22530 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22524,16 +22543,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22530: \$? = $ac_status" >&5
+  echo "$as_me:22549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22536: \$? = $ac_status" >&5
+  echo "$as_me:22555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22541,7 +22560,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22544 "configure"
+#line 22563 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22563,16 +22582,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22569: \$? = $ac_status" >&5
+  echo "$as_me:22588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22575: \$? = $ac_status" >&5
+  echo "$as_me:22594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22580,7 +22599,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22583 "configure"
+#line 22602 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22602,16 +22621,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22608: \$? = $ac_status" >&5
+  echo "$as_me:22627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22614: \$? = $ac_status" >&5
+  echo "$as_me:22633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22626,7 +22645,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22629: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22648: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22652,23 +22671,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22655: checking for $ac_header" >&5
+echo "$as_me:22674: 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 22661 "configure"
+#line 22680 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22665: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22684: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22671: \$? = $ac_status" >&5
+  echo "$as_me:22690: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22687,7 +22706,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22690: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22709: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22697,7 +22716,7 @@ EOF
 fi
 done
 
-echo "$as_me:22700: checking for working mkstemp" >&5
+echo "$as_me:22719: 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
@@ -22708,7 +22727,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22711 "configure"
+#line 22730 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22743,15 +22762,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22749: \$? = $ac_status" >&5
+  echo "$as_me:22768: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22754: \$? = $ac_status" >&5
+  echo "$as_me:22773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22766,16 +22785,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22769: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22788: 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:22772: checking for mkstemp" >&5
+	echo "$as_me:22791: 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 22778 "configure"
+#line 22797 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22806,16 +22825,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22812: \$? = $ac_status" >&5
+  echo "$as_me:22831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22818: \$? = $ac_status" >&5
+  echo "$as_me:22837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22825,7 +22844,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22828: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22847: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22846,21 +22865,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22849: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22868: 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:22852: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22871: 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:22858: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22877: 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 22863 "configure"
+#line 22882 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22877,15 +22896,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22883: \$? = $ac_status" >&5
+  echo "$as_me:22902: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22888: \$? = $ac_status" >&5
+  echo "$as_me:22907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22898,7 +22917,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22901: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22920: 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
 
@@ -22909,13 +22928,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22912: checking for intptr_t" >&5
+echo "$as_me:22931: 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 22918 "configure"
+#line 22937 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22930,16 +22949,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22933: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22936: \$? = $ac_status" >&5
+  echo "$as_me:22955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22942: \$? = $ac_status" >&5
+  echo "$as_me:22961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22949,7 +22968,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22952: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22971: 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
   :
@@ -22961,13 +22980,13 @@ EOF
 
 fi
 
-echo "$as_me:22964: checking for ssize_t" >&5
+echo "$as_me:22983: 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 22970 "configure"
+#line 22989 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22982,16 +23001,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22988: \$? = $ac_status" >&5
+  echo "$as_me:23007: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22994: \$? = $ac_status" >&5
+  echo "$as_me:23013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23001,7 +23020,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23004: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23023: 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
   :
@@ -23013,14 +23032,14 @@ EOF
 
 fi
 
-echo "$as_me:23016: checking for type sigaction_t" >&5
+echo "$as_me:23035: 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 23023 "configure"
+#line 23042 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23033,16 +23052,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23039: \$? = $ac_status" >&5
+  echo "$as_me:23058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23045: \$? = $ac_status" >&5
+  echo "$as_me:23064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23053,14 +23072,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23056: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23075: 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:23063: checking declaration of size-change" >&5
+echo "$as_me:23082: 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
@@ -23081,7 +23100,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23084 "configure"
+#line 23103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23131,16 +23150,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23137: \$? = $ac_status" >&5
+  echo "$as_me:23156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23143: \$? = $ac_status" >&5
+  echo "$as_me:23162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23159,7 +23178,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23162: result: $cf_cv_sizechange" >&5
+echo "$as_me:23181: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23177,13 +23196,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23180: checking for memmove" >&5
+echo "$as_me:23199: 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 23186 "configure"
+#line 23205 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23214,16 +23233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23220: \$? = $ac_status" >&5
+  echo "$as_me:23239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23226: \$? = $ac_status" >&5
+  echo "$as_me:23245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23233,19 +23252,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23236: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23255: 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:23242: checking for bcopy" >&5
+echo "$as_me:23261: 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 23248 "configure"
+#line 23267 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23276,16 +23295,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23282: \$? = $ac_status" >&5
+  echo "$as_me:23301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23288: \$? = $ac_status" >&5
+  echo "$as_me:23307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23295,11 +23314,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23298: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23317: 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:23302: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23321: 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
@@ -23309,7 +23328,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23312 "configure"
+#line 23331 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23325,15 +23344,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23331: \$? = $ac_status" >&5
+  echo "$as_me:23350: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23336: \$? = $ac_status" >&5
+  echo "$as_me:23355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23346,7 +23365,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23349: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23368: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23373,13 +23392,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23376: checking for $ac_func" >&5
+echo "$as_me:23395: 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 23382 "configure"
+#line 23401 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23410,16 +23429,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23416: \$? = $ac_status" >&5
+  echo "$as_me:23435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23422: \$? = $ac_status" >&5
+  echo "$as_me:23441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23429,7 +23448,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23432: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23451: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23439,7 +23458,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23442: checking if poll really works" >&5
+echo "$as_me:23461: 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
@@ -23449,7 +23468,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23452 "configure"
+#line 23471 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23502,15 +23521,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23508: \$? = $ac_status" >&5
+  echo "$as_me:23527: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23513: \$? = $ac_status" >&5
+  echo "$as_me:23532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23522,21 +23541,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23525: result: $cf_cv_working_poll" >&5
+echo "$as_me:23544: 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:23532: checking for va_copy" >&5
+echo "$as_me:23551: 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 23539 "configure"
+#line 23558 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23553,16 +23572,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23559: \$? = $ac_status" >&5
+  echo "$as_me:23578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23565: \$? = $ac_status" >&5
+  echo "$as_me:23584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23572,7 +23591,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23575: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23594: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23584,14 +23603,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23587: checking for __va_copy" >&5
+echo "$as_me:23606: 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 23594 "configure"
+#line 23613 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23608,16 +23627,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23614: \$? = $ac_status" >&5
+  echo "$as_me:23633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23620: \$? = $ac_status" >&5
+  echo "$as_me:23639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23627,7 +23646,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23630: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23649: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23639,14 +23658,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23642: checking for __builtin_va_copy" >&5
+echo "$as_me:23661: 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 23649 "configure"
+#line 23668 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23663,16 +23682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23669: \$? = $ac_status" >&5
+  echo "$as_me:23688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23675: \$? = $ac_status" >&5
+  echo "$as_me:23694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23682,7 +23701,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23685: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23704: 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 &&
@@ -23700,14 +23719,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23703: checking if we can simply copy va_list" >&5
+	echo "$as_me:23722: 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 23710 "configure"
+#line 23729 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23724,16 +23743,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23730: \$? = $ac_status" >&5
+  echo "$as_me:23749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23736: \$? = $ac_status" >&5
+  echo "$as_me:23755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23743,19 +23762,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23746: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23765: 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:23751: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23770: 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 23758 "configure"
+#line 23777 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23772,16 +23791,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23778: \$? = $ac_status" >&5
+  echo "$as_me:23797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23784: \$? = $ac_status" >&5
+  echo "$as_me:23803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23791,7 +23810,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23794: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23813: 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
@@ -23802,13 +23821,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23805: checking for pid_t" >&5
+echo "$as_me:23824: 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 23811 "configure"
+#line 23830 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23823,16 +23842,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23829: \$? = $ac_status" >&5
+  echo "$as_me:23848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23835: \$? = $ac_status" >&5
+  echo "$as_me:23854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23842,7 +23861,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23845: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23864: 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
   :
@@ -23857,23 +23876,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23860: checking for $ac_header" >&5
+echo "$as_me:23879: 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 23866 "configure"
+#line 23885 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23870: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23889: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23876: \$? = $ac_status" >&5
+  echo "$as_me:23895: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23892,7 +23911,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23895: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23905,13 +23924,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23908: checking for $ac_func" >&5
+echo "$as_me:23927: 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 23914 "configure"
+#line 23933 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23942,16 +23961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23948: \$? = $ac_status" >&5
+  echo "$as_me:23967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23954: \$? = $ac_status" >&5
+  echo "$as_me:23973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23961,7 +23980,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23964: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23983: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23973,7 +23992,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23976: checking for working fork" >&5
+  echo "$as_me:23995: 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
@@ -23996,15 +24015,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24002: \$? = $ac_status" >&5
+  echo "$as_me:24021: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24007: \$? = $ac_status" >&5
+  echo "$as_me:24026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24016,7 +24035,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24019: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24038: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24030,12 +24049,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24033: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24052: 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:24038: checking for working vfork" >&5
+  echo "$as_me:24057: 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
@@ -24044,7 +24063,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24047 "configure"
+#line 24066 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24137,15 +24156,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24143: \$? = $ac_status" >&5
+  echo "$as_me:24162: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24148: \$? = $ac_status" >&5
+  echo "$as_me:24167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24157,13 +24176,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24160: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24179: 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:24166: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24185: 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
 
@@ -24188,7 +24207,7 @@ EOF
 
 fi
 
-echo "$as_me:24191: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24210: 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
@@ -24198,7 +24217,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24201 "configure"
+#line 24220 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24233,15 +24252,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24239: \$? = $ac_status" >&5
+  echo "$as_me:24258: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24244: \$? = $ac_status" >&5
+  echo "$as_me:24263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24254,7 +24273,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24257: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24276: 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
@@ -24263,7 +24282,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24266: checking for openpty in -lutil" >&5
+echo "$as_me:24285: 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
@@ -24271,7 +24290,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24274 "configure"
+#line 24293 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24290,16 +24309,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24296: \$? = $ac_status" >&5
+  echo "$as_me:24315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24302: \$? = $ac_status" >&5
+  echo "$as_me:24321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24310,7 +24329,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24313: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24332: 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
@@ -24318,7 +24337,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24321: checking for openpty header" >&5
+echo "$as_me:24340: 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
@@ -24345,7 +24364,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24348 "configure"
+#line 24367 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24362,16 +24381,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24368: \$? = $ac_status" >&5
+  echo "$as_me:24387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24374: \$? = $ac_status" >&5
+  echo "$as_me:24393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24389,7 +24408,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24392: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24411: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24462,7 +24481,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24465 "configure"
+#line 24484 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24474,16 +24493,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24480: \$? = $ac_status" >&5
+  echo "$as_me:24499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24486: \$? = $ac_status" >&5
+  echo "$as_me:24505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24500,7 +24519,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24522: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24536,7 +24555,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24539: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24558: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24547,7 +24566,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24550: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24569: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24619,7 +24638,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24622 "configure"
+#line 24641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24631,16 +24650,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24637: \$? = $ac_status" >&5
+  echo "$as_me:24656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24643: \$? = $ac_status" >&5
+  echo "$as_me:24662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24657,7 +24676,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24660: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24679: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24737,7 +24756,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24740: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24759: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24754,23 +24773,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24757: checking for db.h" >&5
+echo "$as_me:24776: 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 24763 "configure"
+#line 24782 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24786: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24773: \$? = $ac_status" >&5
+  echo "$as_me:24792: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24789,11 +24808,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24792: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24811: 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:24796: checking for version of db" >&5
+echo "$as_me:24815: 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
@@ -24804,10 +24823,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24807: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24826: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24810 "configure"
+#line 24829 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24837,16 +24856,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24859: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24843: \$? = $ac_status" >&5
+  echo "$as_me:24862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24849: \$? = $ac_status" >&5
+  echo "$as_me:24868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24860,16 +24879,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24863: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24882: 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:24867: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24886: 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:24872: checking for db libraries" >&5
+echo "$as_me:24891: 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
@@ -24899,10 +24918,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24902: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24921: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24905 "configure"
+#line 24924 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24957,16 +24976,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24963: \$? = $ac_status" >&5
+  echo "$as_me:24982: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24969: \$? = $ac_status" >&5
+  echo "$as_me:24988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -24986,11 +25005,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24989: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25008: 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:24993: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25012: 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
@@ -25016,7 +25035,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25019: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25038: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25031,7 +25050,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25034: checking if we should include stdbool.h" >&5
+echo "$as_me:25053: 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
@@ -25039,7 +25058,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25042 "configure"
+#line 25061 "configure"
 #include "confdefs.h"
 
 int
@@ -25051,23 +25070,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25057: \$? = $ac_status" >&5
+  echo "$as_me:25076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25063: \$? = $ac_status" >&5
+  echo "$as_me:25082: \$? = $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 25070 "configure"
+#line 25089 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25083,16 +25102,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25089: \$? = $ac_status" >&5
+  echo "$as_me:25108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25095: \$? = $ac_status" >&5
+  echo "$as_me:25114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25106,13 +25125,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25109: result: yes" >&5
+then	echo "$as_me:25128: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25111: result: no" >&5
+else	echo "$as_me:25130: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25115: checking for builtin bool type" >&5
+echo "$as_me:25134: 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
@@ -25120,7 +25139,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25123 "configure"
+#line 25142 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25135,16 +25154,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25141: \$? = $ac_status" >&5
+  echo "$as_me:25160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25147: \$? = $ac_status" >&5
+  echo "$as_me:25166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25157,9 +25176,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25160: result: yes" >&5
+then	echo "$as_me:25179: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25162: result: no" >&5
+else	echo "$as_me:25181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25176,10 +25195,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25179: checking if we already have C++ library" >&5
+	echo "$as_me:25198: 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 25182 "configure"
+#line 25201 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25193,16 +25212,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25199: \$? = $ac_status" >&5
+  echo "$as_me:25218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25205: \$? = $ac_status" >&5
+  echo "$as_me:25224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25211,7 +25230,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25214: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25233: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25230,7 +25249,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25233: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25252: 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
@@ -25256,7 +25275,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25259 "configure"
+#line 25278 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25270,16 +25289,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25276: \$? = $ac_status" >&5
+  echo "$as_me:25295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25282: \$? = $ac_status" >&5
+  echo "$as_me:25301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25291,7 +25310,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25294: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25313: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25313,7 +25332,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25316: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25335: 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
@@ -25328,15 +25347,15 @@ CF_EOF
 # 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:25331: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25334: \$? = $ac_status" >&5
+  echo "$as_me:25353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25336: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25339: \$? = $ac_status" >&5
+  echo "$as_me:25358: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25347,10 +25366,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25350: result: yes" >&5
+  echo "$as_me:25369: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25353: result: no" >&5
+  echo "$as_me:25372: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25370,7 +25389,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25373: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25392: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25391,7 +25410,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25394 "configure"
+#line 25413 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25405,16 +25424,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25411: \$? = $ac_status" >&5
+  echo "$as_me:25430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25417: \$? = $ac_status" >&5
+  echo "$as_me:25436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25451,7 +25470,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25454 "configure"
+#line 25473 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25465,16 +25484,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25471: \$? = $ac_status" >&5
+  echo "$as_me:25490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25477: \$? = $ac_status" >&5
+  echo "$as_me:25496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25507,7 +25526,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25510: result: $cf_cxx_library" >&5
+	echo "$as_me:25529: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25523,7 +25542,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25526: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25545: 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
@@ -25540,18 +25559,18 @@ do
   # 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 25543 "configure"
+#line 25562 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25548: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25554: \$? = $ac_status" >&5
+  echo "$as_me:25573: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25574,17 +25593,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25577 "configure"
+#line 25596 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25600: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25587: \$? = $ac_status" >&5
+  echo "$as_me:25606: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25621,7 +25640,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25624: result: $CXXCPP" >&5
+echo "$as_me:25643: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25631,18 +25650,18 @@ do
   # 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 25634 "configure"
+#line 25653 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25639: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25645: \$? = $ac_status" >&5
+  echo "$as_me:25664: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25665,17 +25684,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25668 "configure"
+#line 25687 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25691: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25678: \$? = $ac_status" >&5
+  echo "$as_me:25697: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25703,7 +25722,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25706: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25725: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25718,23 +25737,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25721: checking for $ac_header" >&5
+echo "$as_me:25740: 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 25727 "configure"
+#line 25746 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25731: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25750: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25737: \$? = $ac_status" >&5
+  echo "$as_me:25756: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25753,7 +25772,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25756: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25775: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25766,23 +25785,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25769: checking for $ac_header" >&5
+echo "$as_me:25788: 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 25775 "configure"
+#line 25794 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25779: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25785: \$? = $ac_status" >&5
+  echo "$as_me:25804: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25801,7 +25820,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25804: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25823: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25812,10 +25831,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25815: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25834: 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 25818 "configure"
+#line 25837 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25832,16 +25851,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25838: \$? = $ac_status" >&5
+  echo "$as_me:25857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25844: \$? = $ac_status" >&5
+  echo "$as_me:25863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25850,7 +25869,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25853: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25872: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25861,7 +25880,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25864: checking if we should include stdbool.h" >&5
+echo "$as_me:25883: 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
@@ -25869,7 +25888,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25872 "configure"
+#line 25891 "configure"
 #include "confdefs.h"
 
 int
@@ -25881,23 +25900,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25887: \$? = $ac_status" >&5
+  echo "$as_me:25906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25893: \$? = $ac_status" >&5
+  echo "$as_me:25912: \$? = $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 25900 "configure"
+#line 25919 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25913,16 +25932,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25919: \$? = $ac_status" >&5
+  echo "$as_me:25938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25925: \$? = $ac_status" >&5
+  echo "$as_me:25944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25936,13 +25955,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25939: result: yes" >&5
+then	echo "$as_me:25958: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25941: result: no" >&5
+else	echo "$as_me:25960: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25945: checking for builtin bool type" >&5
+echo "$as_me:25964: 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
@@ -25950,7 +25969,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25953 "configure"
+#line 25972 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25965,16 +25984,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25971: \$? = $ac_status" >&5
+  echo "$as_me:25990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25977: \$? = $ac_status" >&5
+  echo "$as_me:25996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -25987,19 +26006,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:25990: result: yes" >&5
+then	echo "$as_me:26009: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25992: result: no" >&5
+else	echo "$as_me:26011: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25996: checking for bool" >&5
+echo "$as_me:26015: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26002 "configure"
+#line 26021 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26034,16 +26053,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26040: \$? = $ac_status" >&5
+  echo "$as_me:26059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26046: \$? = $ac_status" >&5
+  echo "$as_me:26065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26053,10 +26072,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26056: result: $ac_cv_type_bool" >&5
+echo "$as_me:26075: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26059: checking size of bool" >&5
+echo "$as_me:26078: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26065,7 +26084,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26068 "configure"
+#line 26087 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26097,21 +26116,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26109: \$? = $ac_status" >&5
+  echo "$as_me:26128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26114 "configure"
+#line 26133 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26143,16 +26162,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26149: \$? = $ac_status" >&5
+  echo "$as_me:26168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26155: \$? = $ac_status" >&5
+  echo "$as_me:26174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26168,7 +26187,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26171 "configure"
+#line 26190 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26200,16 +26219,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26206: \$? = $ac_status" >&5
+  echo "$as_me:26225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26212: \$? = $ac_status" >&5
+  echo "$as_me:26231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26225,7 +26244,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26228 "configure"
+#line 26247 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26257,16 +26276,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26263: \$? = $ac_status" >&5
+  echo "$as_me:26282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26269: \$? = $ac_status" >&5
+  echo "$as_me:26288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26279,12 +26298,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26282: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26301: 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 26287 "configure"
+#line 26306 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26320,15 +26339,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26326: \$? = $ac_status" >&5
+  echo "$as_me:26345: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26331: \$? = $ac_status" >&5
+  echo "$as_me:26350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26344,13 +26363,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26347: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26366: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26353: checking for type of bool" >&5
+echo "$as_me:26372: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26369,7 +26388,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26372 "configure"
+#line 26391 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26410,15 +26429,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26416: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26421: \$? = $ac_status" >&5
+  echo "$as_me:26440: \$? = $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
@@ -26435,19 +26454,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26438: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26457: 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:26445: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26464: 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:26450: checking for special defines needed for etip.h" >&5
+echo "$as_me:26469: 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"
@@ -26465,7 +26484,7 @@ do
 	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 26468 "configure"
+#line 26487 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26479,16 +26498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26485: \$? = $ac_status" >&5
+  echo "$as_me:26504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26491: \$? = $ac_status" >&5
+  echo "$as_me:26510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26509,12 +26528,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26512: result: $cf_result" >&5
+echo "$as_me:26531: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26517: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26536: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26531,7 +26550,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26534 "configure"
+#line 26553 "configure"
 #include "confdefs.h"
 
 class base
@@ -26550,15 +26569,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26556: \$? = $ac_status" >&5
+  echo "$as_me:26575: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26561: \$? = $ac_status" >&5
+  echo "$as_me:26580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26577,7 +26596,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26580: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26599: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26586,7 +26605,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26589: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26608: 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
@@ -26603,7 +26622,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26606 "configure"
+#line 26625 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26622,15 +26641,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26628: \$? = $ac_status" >&5
+  echo "$as_me:26647: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26633: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26649,7 +26668,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26652: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26671: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26659,7 +26678,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26662: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26681: 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
@@ -26673,7 +26692,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26676 "configure"
+#line 26695 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26717,16 +26736,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26739: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26723: \$? = $ac_status" >&5
+  echo "$as_me:26742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26729: \$? = $ac_status" >&5
+  echo "$as_me:26748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26744,7 +26763,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26747: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26766: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26793,13 +26812,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26796: checking for bool" >&5
+echo "$as_me:26815: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26802 "configure"
+#line 26821 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26834,16 +26853,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26840: \$? = $ac_status" >&5
+  echo "$as_me:26859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26846: \$? = $ac_status" >&5
+  echo "$as_me:26865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26853,10 +26872,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26856: result: $ac_cv_type_bool" >&5
+echo "$as_me:26875: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26859: checking size of bool" >&5
+echo "$as_me:26878: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26865,7 +26884,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26868 "configure"
+#line 26887 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26897,21 +26916,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26903: \$? = $ac_status" >&5
+  echo "$as_me:26922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26909: \$? = $ac_status" >&5
+  echo "$as_me:26928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26914 "configure"
+#line 26933 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26943,16 +26962,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26949: \$? = $ac_status" >&5
+  echo "$as_me:26968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26955: \$? = $ac_status" >&5
+  echo "$as_me:26974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26968,7 +26987,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26971 "configure"
+#line 26990 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27000,16 +27019,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27006: \$? = $ac_status" >&5
+  echo "$as_me:27025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27012: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27025,7 +27044,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27028 "configure"
+#line 27047 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27057,16 +27076,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27063: \$? = $ac_status" >&5
+  echo "$as_me:27082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27069: \$? = $ac_status" >&5
+  echo "$as_me:27088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27079,12 +27098,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27082: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27101: 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 27087 "configure"
+#line 27106 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27120,15 +27139,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27126: \$? = $ac_status" >&5
+  echo "$as_me:27145: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27131: \$? = $ac_status" >&5
+  echo "$as_me:27150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27144,13 +27163,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27147: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27166: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27153: checking for type of bool" >&5
+echo "$as_me:27172: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27169,7 +27188,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27172 "configure"
+#line 27191 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27210,15 +27229,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27216: \$? = $ac_status" >&5
+  echo "$as_me:27235: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27221: \$? = $ac_status" >&5
+  echo "$as_me:27240: \$? = $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
@@ -27235,26 +27254,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27238: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27257: 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:27245: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27264: 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:27251: checking for fallback type of bool" >&5
+			echo "$as_me:27270: 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:27257: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27276: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27283,7 +27302,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27286: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27305: 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
@@ -27300,7 +27319,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27303: checking for $ac_word" >&5
+echo "$as_me:27322: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27317,7 +27336,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27320: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27339: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27329,10 +27348,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27332: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27351: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27335: result: no" >&5
+  echo "$as_me:27354: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27342,7 +27361,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27345: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27364: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27353,7 +27372,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27356: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27375: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27382,7 +27401,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27385: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27404: 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
@@ -27401,10 +27420,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27404: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27423: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27407: result: missing" >&5
+					echo "$as_me:27426: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27417,7 +27436,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27420: checking for gnat version" >&5
+echo "$as_me:27439: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27428,7 +27447,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27431: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27450: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27437,7 +27456,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27440: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27459: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27445,7 +27464,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27448: checking for $ac_word" >&5
+echo "$as_me:27467: 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
@@ -27460,7 +27479,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27463: found $ac_dir/$ac_word" >&5
+echo "$as_me:27482: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27469,20 +27488,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27472: result: $M4_exists" >&5
+  echo "$as_me:27491: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27475: result: no" >&5
+  echo "$as_me:27494: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27481: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27500: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27485: checking if GNAT works" >&5
+			echo "$as_me:27504: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27510,7 +27529,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27513: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27532: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27522,7 +27541,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27525: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27544: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27539,10 +27558,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27542: result: $ADAFLAGS" >&5
+	echo "$as_me:27561: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27545: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27564: 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
@@ -27552,11 +27571,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27555: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27574: 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:27559: checking if GNAT supports generics" >&5
+echo "$as_me:27578: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27566,7 +27585,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27569: result: $cf_gnat_generics" >&5
+echo "$as_me:27588: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27578,7 +27597,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27581: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27600: 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
@@ -27626,7 +27645,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27629: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27648: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27639,7 +27658,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27642: checking if GNAT supports project files" >&5
+echo "$as_me:27661: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27702,15 +27721,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27705: result: $cf_gnat_projects" >&5
+echo "$as_me:27724: 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:27711: checking if GNAT supports libraries" >&5
+	echo "$as_me:27730: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27713: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27732: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27730,7 +27749,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27733: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27752: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27742,7 +27761,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27745: checking for ada-compiler" >&5
+echo "$as_me:27764: 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.
@@ -27753,12 +27772,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27756: result: $cf_ada_compiler" >&5
+echo "$as_me:27775: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27761: checking for ada-include" >&5
+echo "$as_me:27780: 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.
@@ -27794,7 +27813,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27797: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27816: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27803,10 +27822,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27806: result: $ADA_INCLUDE" >&5
+echo "$as_me:27825: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27809: checking for ada-objects" >&5
+echo "$as_me:27828: 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.
@@ -27842,7 +27861,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27845: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27864: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27851,10 +27870,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27854: result: $ADA_OBJECTS" >&5
+echo "$as_me:27873: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27857: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27876: 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.
@@ -27864,14 +27883,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27867: result: $with_ada_sharedlib" >&5
+echo "$as_me:27886: 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:27874: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27893: 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
@@ -27891,7 +27910,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27894: checking for ada-libname" >&5
+echo "$as_me:27913: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27907,7 +27926,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27910: result: $ADA_LIBNAME" >&5
+echo "$as_me:27929: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27918,13 +27937,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27921: checking for wchar_t" >&5
+	echo "$as_me:27940: 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 27927 "configure"
+#line 27946 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27939,16 +27958,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27945: \$? = $ac_status" >&5
+  echo "$as_me:27964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27951: \$? = $ac_status" >&5
+  echo "$as_me:27970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27958,10 +27977,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27961: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27980: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27964: checking size of wchar_t" >&5
+echo "$as_me:27983: 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
@@ -27970,7 +27989,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27973 "configure"
+#line 27992 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27982,21 +28001,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27988: \$? = $ac_status" >&5
+  echo "$as_me:28007: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27994: \$? = $ac_status" >&5
+  echo "$as_me:28013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27999 "configure"
+#line 28018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28008,16 +28027,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28014: \$? = $ac_status" >&5
+  echo "$as_me:28033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:28039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28033,7 +28052,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28036 "configure"
+#line 28055 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28045,16 +28064,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28051: \$? = $ac_status" >&5
+  echo "$as_me:28070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28057: \$? = $ac_status" >&5
+  echo "$as_me:28076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28070,7 +28089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28073 "configure"
+#line 28092 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28082,16 +28101,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28088: \$? = $ac_status" >&5
+  echo "$as_me:28107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28094: \$? = $ac_status" >&5
+  echo "$as_me:28113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28104,12 +28123,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28107: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28126: 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 28112 "configure"
+#line 28131 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28125,15 +28144,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28131: \$? = $ac_status" >&5
+  echo "$as_me:28150: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28136: \$? = $ac_status" >&5
+  echo "$as_me:28155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28149,7 +28168,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28152: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28171: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28162,7 +28181,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28165: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28184: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28180,7 +28199,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28183: checking for library subsets" >&5
+echo "$as_me:28202: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28234,7 +28253,7 @@ fi
 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:28237: result: $LIB_SUBSETS" >&5
+echo "$as_me:28256: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28265,7 +28284,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28268: checking default library suffix" >&5
+echo "$as_me:28287: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28276,10 +28295,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28279: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28298: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28282: checking default library-dependency suffix" >&5
+echo "$as_me:28301: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28362,10 +28381,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28365: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28384: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28368: checking default object directory" >&5
+echo "$as_me:28387: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28381,11 +28400,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28384: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28403: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28388: checking c++ library-dependency suffix" >&5
+echo "$as_me:28407: 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++)
@@ -28478,7 +28497,7 @@ else
 	fi
 
 fi
-echo "$as_me:28481: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28500: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28654,19 +28673,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28657: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28676: 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 <<EOF
-#line 28662 "configure"
+#line 28681 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28666: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28669: \$? = $ac_status" >&5
+  echo "$as_me:28688: \$? = $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
@@ -28677,10 +28696,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28680 "configure"
+#line 28699 "configure"
 #include "confdefs.h"
 
-#line 28683 "configure"
+#line 28702 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28695,16 +28714,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28701: \$? = $ac_status" >&5
+  echo "$as_me:28720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28707: \$? = $ac_status" >&5
+  echo "$as_me:28726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28727,7 +28746,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28730: result: $cf_ldflags_static" >&5
+	echo "$as_me:28749: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28743,7 +28762,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28746: checking where we will install curses.h" >&5
+echo "$as_me:28765: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28753,7 +28772,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28756: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28775: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28761,7 +28780,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28764: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28783: 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
@@ -28786,7 +28805,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28789: checking for desired basename for form library" >&5
+echo "$as_me:28808: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28806,10 +28825,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28809: result: $FORM_NAME" >&5
+echo "$as_me:28828: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28812: checking for desired basename for menu library" >&5
+echo "$as_me:28831: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28829,10 +28848,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28832: result: $MENU_NAME" >&5
+echo "$as_me:28851: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28835: checking for desired basename for panel library" >&5
+echo "$as_me:28854: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28852,10 +28871,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28855: result: $PANEL_NAME" >&5
+echo "$as_me:28874: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28858: checking for desired basename for cxx library" >&5
+echo "$as_me:28877: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28875,13 +28894,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28878: result: $CXX_NAME" >&5
+echo "$as_me:28897: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28884: checking for src modules" >&5
+echo "$as_me:28903: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28940,7 +28959,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28943: result: $cf_cv_src_modules" >&5
+echo "$as_me:28962: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29101,7 +29120,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29104: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29123: 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//'`
@@ -29112,7 +29131,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29115: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29134: 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
@@ -29128,7 +29147,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29131: result: $PKG_CFLAGS" >&5
+echo "$as_me:29150: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29189,7 +29208,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29192: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29211: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29216,7 +29235,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29219: checking for linker search path" >&5
+echo "$as_me:29238: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29264,7 +29283,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29267: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29286: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29305,7 +29324,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29308: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29327: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29391,7 +29410,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29394: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29413: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29572,7 +29591,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29575: error: ambiguous option: $1
+    { { echo "$as_me:29594: 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;}
@@ -29591,7 +29610,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29594: error: unrecognized option: $1
+  -*) { { echo "$as_me:29613: 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;}
@@ -29721,7 +29740,7 @@ do
   "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:29724: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29743: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30238,7 +30257,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30241: creating $ac_file" >&5
+    { echo "$as_me:30260: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30256,7 +30275,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30259: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30278: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30269,7 +30288,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30272: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30291: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30285,7 +30304,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30288: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30307: 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;}
@@ -30294,7 +30313,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30297: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30316: 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;}
@@ -30339,7 +30358,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30342: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30361: 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;}
@@ -30350,7 +30369,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30353: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30372: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30399,7 +30418,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30402: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30421: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30410,7 +30429,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30413: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30432: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30423,7 +30442,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30426: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30445: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30481,7 +30500,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30484: $ac_file is unchanged" >&5
+      { echo "$as_me:30503: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30868,7 +30887,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30871: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30890: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 4ad552352..f59adf72f 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.765 2023/07/22 17:20:35 tom Exp $
+dnl $Id: configure.in,v 1.766 2023/10/16 23:04:12 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.765 $)
+AC_REVISION($Revision: 1.766 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1513,6 +1513,15 @@ AC_ARG_ENABLE(hashmap,
 AC_MSG_RESULT($with_hashmap)
 test "x$with_hashmap" = xyes && AC_DEFINE(USE_HASHMAP,1,[Define to 1 to compile with hashmap scrolling-optimization])
 
+###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+AC_MSG_CHECKING(if you want code to check screensize)
+AC_ARG_ENABLE(check-size,
+	[  --enable-check-size     compile-in code to detect screensize],
+	[with_check_size=$enableval],
+	[with_check_size=no])
+AC_MSG_RESULT($with_check_size)
+test "x$with_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize])
+
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 AC_MSG_CHECKING(if you want colorfgbg code)
 AC_ARG_ENABLE(colorfgbg,
diff --git a/dist.mk b/dist.mk
index 2742f1f5f..3e6fa5453 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1571 2023/10/14 09:55:54 tom Exp $
+# $Id: dist.mk,v 1.1572 2023/10/16 23:03:18 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231014
+NCURSES_PATCH = 20231016
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index b3cac8150..71db2a8d4 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.228 2023/10/07 23:06:04 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.229 2023/10/16 23:05:28 tom Exp $")
 
 /****************************************************************************
  *
@@ -293,6 +293,7 @@ _nc_default_screensize(TERMINAL *termp, int *linep, int *colp)
     }
 }
 
+#ifdef USE_CHECK_SIZE
 static const char *
 skip_csi(const char *value)
 {
@@ -406,9 +407,10 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
 
     _nc_default_screensize(termp, linep, colp);
 }
-#else
-#define _nc_check_screensize(termp, linep, colp) _nc_default_screensize(termp, linep, colp)
+#else /* !USE_CHECK_SIZE */
+#define _nc_check_screensize(termp, linep, colp) /* nothing */
 #endif
+#endif /* !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)) */
 
 NCURSES_EXPORT(void)
 _nc_get_screensize(SCREEN *sp,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 07ddd5a10..6baeec6f3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231014) unstable; urgency=low
+ncurses6 (6.4+20231016) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 07ddd5a10..6baeec6f3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231014) unstable; urgency=low
+ncurses6 (6.4+20231016) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bf3547444..7226c90c4 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231014) unstable; urgency=low
+ncurses6 (6.4+20231016) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Oct 2023 05:55:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/rules b/package/debian/rules
index 3bcf51147..7bfabfe0c 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.48 2023/05/13 23:54:31 tom Exp $
+# $Id: rules,v 1.49 2023/10/16 23:06:26 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -67,6 +67,7 @@ configure = \
 		--disable-root-access \
 		--disable-root-environ \
 		--disable-termcap \
+		--enable-check-size \
 		--enable-hard-tabs \
 		--enable-opaque-curses \
 		--enable-opaque-form \
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ee748d2bb..aeb77ea7c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.611 2023/10/14 09:55:54 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.612 2023/10/16 23:03:18 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1014"
+!define VERSION_MMDD  "1016"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index a2f12893c..629ceadfd 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231014
+Release: 20231016
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 29af48575..c00ee4cd7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231014
+Release: 20231016
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index de5d939a3..985c36af9 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231014
+Release: 20231016
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 5e0b7e869ffa67b8be673cc764c67c775fb3c856 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 22 Oct 2023 01:49:50 +0200
Subject: [PATCH 036/106] ncurses-6.4-20231021.patch

---
 INSTALL                                       |   18 +-
 MANIFEST                                      |    4 +-
 NEWS                                          |   11 +-
 VERSION                                       |    2 +-
 aclocal.m4                                    |   12 +-
 configure                                     | 4926 +++++++++--------
 configure.in                                  |   22 +-
 dist.mk                                       |    4 +-
 doc/html/NCURSES-Programming-HOWTO.html       |   33 +-
 ...rminal_interface-curses_constants__ads.htm |    2 +-
 doc/html/man/adacursesw6-config.1.html        |  144 +
 doc/html/man/curs_color.3x.html               |    8 +-
 doc/html/man/curs_getyx.3x.html               |    8 +-
 doc/html/man/curs_inopts.3x.html              |    8 +-
 doc/html/man/curs_legacy.3x.html              |    8 +-
 doc/html/man/curs_memleaks.3x.html            |    8 +-
 doc/html/man/curs_mouse.3x.html               |    8 +-
 doc/html/man/curs_pad.3x.html                 |    8 +-
 doc/html/man/curs_print.3x.html               |    8 +-
 doc/html/man/curs_slk.3x.html                 |    8 +-
 doc/html/man/curs_terminfo.3x.html            |    8 +-
 doc/html/man/keybound.3x.html                 |    8 +-
 doc/html/man/ncurses.3x.html                  |    2 +-
 doc/html/man/ncursesw6-config.1.html          |  135 +
 doc/html/man/new_pair.3x.html                 |    8 +-
 doc/html/man/resizeterm.3x.html               |    8 +-
 doc/html/man/term.5.html                      |    9 +-
 doc/html/man/terminfo.5.html                  |    2 +-
 doc/html/man/toe.1m.html                      |    9 +-
 man/curs_color.3x                             |    7 +-
 man/curs_getyx.3x                             |   15 +-
 man/curs_inopts.3x                            |   17 +-
 man/curs_legacy.3x                            |   13 +-
 man/curs_memleaks.3x                          |    7 +-
 man/curs_mouse.3x                             |   13 +-
 man/curs_pad.3x                               |   16 +-
 man/curs_print.3x                             |   10 +-
 man/curs_slk.3x                               |   20 +-
 man/curs_terminfo.3x                          |    7 +-
 man/keybound.3x                               |    7 +-
 man/new_pair.3x                               |    7 +-
 man/resizeterm.3x                             |    7 +-
 man/term.5                                    |   10 +-
 man/toe.1m                                    |    5 +-
 misc/terminfo.src                             |   20 +-
 ncurses/base/lib_delwin.c                     |    6 +-
 ncurses/base/wresize.c                        |    6 +-
 ncurses/tinfo/obsolete.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 +-
 55 files changed, 3004 insertions(+), 2654 deletions(-)
 create mode 100644 doc/html/man/adacursesw6-config.1.html
 create mode 100644 doc/html/man/ncursesw6-config.1.html

diff --git a/INSTALL b/INSTALL
index 03732eb55..39a8a9f8f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.248 2023/10/16 23:06:54 tom Exp $
+-- $Id: INSTALL,v 1.249 2023/10/21 15:51:23 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -670,7 +670,14 @@ CONFIGURE OPTIONS:
     --enable-opaque-panel
 	Define symbol in curses.h which controls whether some library
 	structures are treated as "opaque".  The --enable-opaque-curses option
-	is overridden by the --enable-reentrant option.
+	may be overridden by the --enable-reentrant option.
+
+	Enabling opaque-curses enables opaque for the form, menu, and panel
+	libraries.  Use their corresponding options to disable the feature
+	individually.
+
+	NOTE: beginning with ncurses 6.5 this option is enabled by default;
+	older versions disable it by default.
 
     --enable-pc-files
 	If pkg-config is found (see --with-pkg-config), generate ".pc" files
@@ -816,11 +823,14 @@ CONFIGURE OPTIONS:
 	symbolic link to equate libncurses.so with libncursesw.so
 
 	NOTE: the Ada95 binding may be built against either version of the the
-	ncurses library, but you must decide which:  the binding installs the
-	same set of files for either version.  Currently (2002/6/22) it does
+	ncurses library, but you must decide which: the binding installs the
+	same set of files for either version.  Currently (2023/10/21) it does
 	not use the extended features from the wide-character code, so it is
 	probably better to not install the binding for that configuration.
 
+	NOTE: beginning with ncurses 6.5 this option is enabled by default;
+	older versions disable it by default.
+
     --enable-xmc-glitch
 	Compile-in support experimental xmc (magic cookie) code.
 
diff --git a/MANIFEST b/MANIFEST
index 1156b49ec..83b01132e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -343,7 +343,7 @@
 ./doc/html/announce.html
 ./doc/html/hackguide.html
 ./doc/html/index.html
-./doc/html/man/adacurses6-config.1.html
+./doc/html/man/adacursesw6-config.1.html
 ./doc/html/man/captoinfo.1m.html
 ./doc/html/man/clear.1.html
 ./doc/html/man/curs_add_wch.3x.html
@@ -464,7 +464,7 @@
 ./doc/html/man/mitem_value.3x.html
 ./doc/html/man/mitem_visible.3x.html
 ./doc/html/man/ncurses.3x.html
-./doc/html/man/ncurses6-config.1.html
+./doc/html/man/ncursesw6-config.1.html
 ./doc/html/man/new_pair.3x.html
 ./doc/html/man/panel.3x.html
 ./doc/html/man/resizeterm.3x.html
diff --git a/NEWS b/NEWS
index a44fbd7a1..53e715d1d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4016 2023/10/16 23:09:02 tom Exp $
+-- $Id: NEWS,v 1.4019 2023/10/21 23:13:51 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231021
+	+ use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD
+	+ add ansi+apparrows -TD
+	+ change defaults for configure opaque and widec options (prompted by
+	  discussion with Branden Robinson).
+	+ minor cleanup of compiler- and manpage-warnings.
+
 20231016
 	+ make the recent change to setupterm optional "--enable-check-size"
 	  (Debian #1054022).
@@ -5570,7 +5577,7 @@ it is not possible to add this information.
 	  function pointer passed to tputs().
 	+ modify init_pair() to accept -1's for color value after
 	  assume_default_colors() has been called (Debian #337095).
-	+ modify test/background.c, adding commmand-line options to demonstrate
+	+ modify test/background.c, adding command-line options to demonstrate
 	  assume_default_colors() and use_default_colors().
 
 20110416
diff --git a/VERSION b/VERSION
index 38be905da..25e77a8ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231016
+5:0:10	6.4	20231021
diff --git a/aclocal.m4 b/aclocal.m4
index dcf1d2954..3b5b241b7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1051 2023/09/06 22:55:27 tom Exp $
+dnl $Id: aclocal.m4,v 1.1053 2023/10/21 12:54:23 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -67,7 +67,7 @@ $ac_includes_default
 	fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ABI_DEFAULTS version: 4 updated: 2023/01/07 16:32:06
+dnl CF_ABI_DEFAULTS version: 5 updated: 2023/10/21 08:54:23
 dnl ---------------
 dnl Provide configure-script defaults for different ncurses ABIs.
 AC_DEFUN([CF_ABI_DEFAULTS],[
@@ -88,9 +88,10 @@ cf_dft_opaque_curses=no
 cf_dft_ordinate_type=short
 cf_dft_signed_char=no
 cf_dft_tparm_arg=long
+cf_dft_widec=no
 cf_dft_with_lp64=no
 
-# ABI 6 defaults:
+# ABI 6 default differences from ABI 5:
 case x$cf_cv_abi_default in
 (x[[6789]])
 	cf_dft_chtype=uint32_t
@@ -102,17 +103,18 @@ case x$cf_cv_abi_default in
 	cf_dft_filter_syms=yes
 	cf_dft_interop=yes
 	cf_dft_mmask_t=uint32_t
+	cf_dft_opaque_curses=yes
 	cf_dft_tparm_arg=intptr_t
+	cf_dft_widec=yes
 	cf_dft_with_lp64=yes
 	;;
 esac
 
-# ABI 7 defaults:
+# ABI 7 default differences from ABI 6:
 case x$cf_cv_abi_default in
 (x[[789]])
 	cf_dft_ccharw_max=6
 	cf_dft_mmask_t=uint64_t
-	cf_dft_opaque_curses=yes
 	cf_dft_ordinate_type=int
 	cf_dft_signed_char=yes
 	# also: remove the wgetch-events feature in ABI 7
diff --git a/configure b/configure
index 7b2e574d6..c30e376f9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.766 .
+# From configure.in Revision: 1.769 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230903.
 #
@@ -789,7 +789,7 @@ Fine-Tuning Your Configuration:
   --enable-symlinks       make tic use symbolic links not hard links
   --enable-broken_linker  compile with broken-linker support code
   --enable-bsdpad         recognize BSD-style prefix padding
-  --enable-widec          compile with wide-char/UTF-8 code
+  --disable-widec         do not compile with wide-char/UTF-8 code
   --disable-lp64          allow chtype to be long (ignore _LP64)
   --disable-largefile     omit support for large files
   --disable-tparm-varargs compile tparm() without varargs interface
@@ -829,10 +829,10 @@ Reentrant Code:
   --enable-pthreads-eintr enable EINTR in wgetch with pthreads
   --enable-weak-symbols   enable weak-symbols for pthreads
   --enable-reentrant      compile with reentrant code
-  --enable-opaque-curses  make curses WINDOW, etc., "opaque"
-  --enable-opaque-form    make form-library structures "opaque"
-  --enable-opaque-menu    make menu-library structures "opaque"
-  --enable-opaque-panel   make panel-library structures "opaque"
+  --disable-opaque-curses do not make curses WINDOW, etc., "opaque"
+  --disable-opaque-form   do not make form-library structures "opaque"
+  --disable-opaque-menu   do not make menu-library structures "opaque"
+  --disable-opaque-panel  do not make panel-library structures "opaque"
   --with-wrap-prefix=XXX  override prefix used for public variables
 Development Code:
   --without-develop       disable development options
@@ -1743,9 +1743,10 @@ cf_dft_opaque_curses=no
 cf_dft_ordinate_type=short
 cf_dft_signed_char=no
 cf_dft_tparm_arg=long
+cf_dft_widec=no
 cf_dft_with_lp64=no
 
-# ABI 6 defaults:
+# ABI 6 default differences from ABI 5:
 case x$cf_cv_abi_default in
 (x[6789])
 	cf_dft_chtype=uint32_t
@@ -1757,17 +1758,18 @@ case x$cf_cv_abi_default in
 	cf_dft_filter_syms=yes
 	cf_dft_interop=yes
 	cf_dft_mmask_t=uint32_t
+	cf_dft_opaque_curses=yes
 	cf_dft_tparm_arg=intptr_t
+	cf_dft_widec=yes
 	cf_dft_with_lp64=yes
 	;;
 esac
 
-# ABI 7 defaults:
+# ABI 7 default differences from ABI 6:
 case x$cf_cv_abi_default in
 (x[789])
 	cf_dft_ccharw_max=6
 	cf_dft_mmask_t=uint64_t
-	cf_dft_opaque_curses=yes
 	cf_dft_ordinate_type=int
 	cf_dft_signed_char=yes
 	# also: remove the wgetch-events feature in ABI 7
@@ -1785,20 +1787,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1788: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1790: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1794: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1796: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1801: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1803: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1833,7 +1835,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1836: checking for $ac_word" >&5
+echo "$as_me:1838: 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
@@ -1848,7 +1850,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1851: found $ac_dir/$ac_word" >&5
+echo "$as_me:1853: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1856,10 +1858,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1859: result: $CC" >&5
+  echo "$as_me:1861: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1862: result: no" >&5
+  echo "$as_me:1864: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1872,7 +1874,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1875: checking for $ac_word" >&5
+echo "$as_me:1877: 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
@@ -1887,7 +1889,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1890: found $ac_dir/$ac_word" >&5
+echo "$as_me:1892: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1895,10 +1897,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1898: result: $ac_ct_CC" >&5
+  echo "$as_me:1900: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1901: result: no" >&5
+  echo "$as_me:1903: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1908,32 +1910,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1911: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1913: 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:1916:" \
+echo "$as_me:1918:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1919: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1921: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1922: \$? = $ac_status" >&5
+  echo "$as_me:1924: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1924: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1926: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1927: \$? = $ac_status" >&5
+  echo "$as_me:1929: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1929: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1931: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1932: \$? = $ac_status" >&5
+  echo "$as_me:1934: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1936 "configure"
+#line 1938 "configure"
 #include "confdefs.h"
 
 int
@@ -1949,13 +1951,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1952: checking for C compiler default output" >&5
+echo "$as_me:1954: 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:1955: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1957: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1958: \$? = $ac_status" >&5
+  echo "$as_me:1960: \$? = $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
@@ -1978,34 +1980,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1981: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1983: 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:1987: result: $ac_file" >&5
+echo "$as_me:1989: 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:1992: checking whether the C compiler works" >&5
+echo "$as_me:1994: 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:1998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2001: \$? = $ac_status" >&5
+  echo "$as_me:2003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2008: error: cannot run C compiled programs.
+	{ { echo "$as_me:2010: 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;}
@@ -2013,24 +2015,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2016: result: yes" >&5
+echo "$as_me:2018: 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:2023: checking whether we are cross compiling" >&5
+echo "$as_me:2025: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2025: result: $cross_compiling" >&5
+echo "$as_me:2027: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2028: checking for executable suffix" >&5
+echo "$as_me:2030: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2033: \$? = $ac_status" >&5
+  echo "$as_me:2035: \$? = $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
@@ -2046,25 +2048,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2049: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2051: 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:2055: result: $ac_cv_exeext" >&5
+echo "$as_me:2057: 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:2061: checking for object suffix" >&5
+echo "$as_me:2063: 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 2067 "configure"
+#line 2069 "configure"
 #include "confdefs.h"
 
 int
@@ -2076,10 +2078,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2082: \$? = $ac_status" >&5
+  echo "$as_me:2084: \$? = $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
@@ -2091,24 +2093,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2094: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2096: 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:2101: result: $ac_cv_objext" >&5
+echo "$as_me:2103: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2105: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2107: 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 2111 "configure"
+#line 2113 "configure"
 #include "confdefs.h"
 
 int
@@ -2123,16 +2125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2129: \$? = $ac_status" >&5
+  echo "$as_me:2131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2135: \$? = $ac_status" >&5
+  echo "$as_me:2137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2144,19 +2146,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2147: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2149: 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:2153: checking whether $CC accepts -g" >&5
+echo "$as_me:2155: 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 2159 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
 
 int
@@ -2168,16 +2170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2174: \$? = $ac_status" >&5
+  echo "$as_me:2176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2180: \$? = $ac_status" >&5
+  echo "$as_me:2182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2187,7 +2189,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2190: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2192: 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
@@ -2214,16 +2216,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2220: \$? = $ac_status" >&5
+  echo "$as_me:2222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2226: \$? = $ac_status" >&5
+  echo "$as_me:2228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2235,7 +2237,7 @@ if { (eval echo "$as_me:2217: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2238 "configure"
+#line 2240 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2248,16 +2250,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2254: \$? = $ac_status" >&5
+  echo "$as_me:2256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2260: \$? = $ac_status" >&5
+  echo "$as_me:2262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2267,7 +2269,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2270 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2279,16 +2281,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2282: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2285: \$? = $ac_status" >&5
+  echo "$as_me:2287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2291: \$? = $ac_status" >&5
+  echo "$as_me:2293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2318,11 +2320,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2321: checking version of $CC" >&5
+	echo "$as_me:2323: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2325: result: $GCC_VERSION" >&5
+	echo "$as_me:2327: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2331,12 +2333,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2334: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2336: 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 2339 "configure"
+#line 2341 "configure"
 #include "confdefs.h"
 
 int
@@ -2353,16 +2355,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2359: \$? = $ac_status" >&5
+  echo "$as_me:2361: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2365: \$? = $ac_status" >&5
+  echo "$as_me:2367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2373,7 +2375,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2376: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2378: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2382,11 +2384,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2385: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2387: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2389 "configure"
+#line 2391 "configure"
 #include "confdefs.h"
 
 int
@@ -2403,16 +2405,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2409: \$? = $ac_status" >&5
+  echo "$as_me:2411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2415: \$? = $ac_status" >&5
+  echo "$as_me:2417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2422,7 +2424,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2425: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2427: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2431,30 +2433,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2434: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2436: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2441: checking version of $CC" >&5
+	echo "$as_me:2443: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2445: result: $CLANG_VERSION" >&5
+	echo "$as_me:2447: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2452: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2454: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2457 "configure"
+#line 2459 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2468,16 +2470,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2474: \$? = $ac_status" >&5
+  echo "$as_me:2476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2480: \$? = $ac_status" >&5
+  echo "$as_me:2482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2488,13 +2490,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2491: result: $cf_clang_optok" >&5
+		echo "$as_me:2493: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2497: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2499: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2503,7 +2505,7 @@ echo "${as_me:-configure}:2497: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2506: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2508: 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
@@ -2511,7 +2513,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2514 "configure"
+#line 2516 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2558,16 +2560,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2564: \$? = $ac_status" >&5
+  echo "$as_me:2566: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2570: \$? = $ac_status" >&5
+  echo "$as_me:2572: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2584,10 +2586,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2587: result: none needed" >&5
+    echo "$as_me:2589: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2590: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2592: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2595,13 +2597,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2598: checking \$CFLAGS variable" >&5
+echo "$as_me:2600: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2602: result: broken" >&5
+	echo "$as_me:2604: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2604: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2606: 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=
@@ -2709,18 +2711,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2712: result: ok" >&5
+	echo "$as_me:2714: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2717: checking \$CC variable" >&5
+echo "$as_me:2719: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2721: result: broken" >&5
+	echo "$as_me:2723: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2723: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2725: 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/[ ]*[ ]-[^ ].*//'`
@@ -2837,19 +2839,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2840: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2842: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2844: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2846: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2848: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2850: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2852: result: ok" >&5
+	echo "$as_me:2854: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2860,7 +2862,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2863: checking how to run the C preprocessor" >&5
+echo "$as_me:2865: 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
@@ -2881,18 +2883,18 @@ do
   # 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 2884 "configure"
+#line 2886 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2889: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2895: \$? = $ac_status" >&5
+  echo "$as_me:2897: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2915,17 +2917,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2918 "configure"
+#line 2920 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2924: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2928: \$? = $ac_status" >&5
+  echo "$as_me:2930: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2962,7 +2964,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2965: result: $CPP" >&5
+echo "$as_me:2967: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2972,18 +2974,18 @@ do
   # 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 2975 "configure"
+#line 2977 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2980: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2982: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2986: \$? = $ac_status" >&5
+  echo "$as_me:2988: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3006,17 +3008,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3009 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3013: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3015: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3019: \$? = $ac_status" >&5
+  echo "$as_me:3021: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3044,7 +3046,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3047: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3049: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3057,14 +3059,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3060: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3062: 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 3067 "configure"
+#line 3069 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3079,7 +3081,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3082 "configure"
+#line 3084 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3092,14 +3094,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3095: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3097: 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:3102: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3104: 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
@@ -3114,15 +3116,15 @@ CF_EOF
 # 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:3117: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3120: \$? = $ac_status" >&5
+  echo "$as_me:3122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3122: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3125: \$? = $ac_status" >&5
+  echo "$as_me:3127: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3133,10 +3135,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3136: result: yes" >&5
+  echo "$as_me:3138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3139: result: no" >&5
+  echo "$as_me:3141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3150,7 +3152,7 @@ else
 	(*) 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:3153: checking for $ac_word" >&5
+echo "$as_me:3155: 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
@@ -3167,7 +3169,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3170: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3178,10 +3180,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3181: result: $LDCONFIG" >&5
+  echo "$as_me:3183: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3184: result: no" >&5
+  echo "$as_me:3186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3189,7 +3191,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3192: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3194: 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.
@@ -3199,7 +3201,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3202: result: $cf_with_cxx" >&5
+echo "$as_me:3204: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3217,7 +3219,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3220: checking for $ac_word" >&5
+echo "$as_me:3222: 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
@@ -3232,7 +3234,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3235: found $ac_dir/$ac_word" >&5
+echo "$as_me:3237: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3240,10 +3242,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3243: result: $CXX" >&5
+  echo "$as_me:3245: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3246: result: no" >&5
+  echo "$as_me:3248: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3256,7 +3258,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3259: checking for $ac_word" >&5
+echo "$as_me:3261: 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
@@ -3271,7 +3273,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3274: found $ac_dir/$ac_word" >&5
+echo "$as_me:3276: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3279,10 +3281,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3282: result: $ac_ct_CXX" >&5
+  echo "$as_me:3284: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3285: result: no" >&5
+  echo "$as_me:3287: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3294,32 +3296,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3297:" \
+echo "$as_me:3299:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3300: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3302: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3303: \$? = $ac_status" >&5
+  echo "$as_me:3305: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3305: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3307: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3308: \$? = $ac_status" >&5
+  echo "$as_me:3310: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3310: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3312: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3313: \$? = $ac_status" >&5
+  echo "$as_me:3315: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3316: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3318: 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 3322 "configure"
+#line 3324 "configure"
 #include "confdefs.h"
 
 int
@@ -3334,16 +3336,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3340: \$? = $ac_status" >&5
+  echo "$as_me:3342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3346: \$? = $ac_status" >&5
+  echo "$as_me:3348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3355,19 +3357,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3358: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3360: 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:3364: checking whether $CXX accepts -g" >&5
+echo "$as_me:3366: 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 3370 "configure"
+#line 3372 "configure"
 #include "confdefs.h"
 
 int
@@ -3379,16 +3381,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3385: \$? = $ac_status" >&5
+  echo "$as_me:3387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3391: \$? = $ac_status" >&5
+  echo "$as_me:3393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3398,7 +3400,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3401: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3403: 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
@@ -3425,7 +3427,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3428 "configure"
+#line 3430 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3438,16 +3440,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3444: \$? = $ac_status" >&5
+  echo "$as_me:3446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3450: \$? = $ac_status" >&5
+  echo "$as_me:3452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3457,7 +3459,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3460 "configure"
+#line 3462 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3469,16 +3471,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3472: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3475: \$? = $ac_status" >&5
+  echo "$as_me:3477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3481: \$? = $ac_status" >&5
+  echo "$as_me:3483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3512,7 +3514,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3515: checking if $CXX works" >&5
+		echo "$as_me:3517: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3520,7 +3522,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3523 "configure"
+#line 3525 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3537,16 +3539,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3543: \$? = $ac_status" >&5
+  echo "$as_me:3545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3549: \$? = $ac_status" >&5
+  echo "$as_me:3551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3557,11 +3559,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3560: result: $cf_cxx_works" >&5
+		echo "$as_me:3562: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3564: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3566: 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
@@ -3577,7 +3579,7 @@ ac_main_return="return"
 	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:3580: checking for $ac_word" >&5
+echo "$as_me:3582: 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
@@ -3594,7 +3596,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3597: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3599: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3605,17 +3607,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3608: result: $CXX" >&5
+  echo "$as_me:3610: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3611: result: no" >&5
+  echo "$as_me:3613: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3618: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3620: 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="";
 		;;
@@ -3624,7 +3626,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3627: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3629: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3632,7 +3634,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3635: result: $GXX_VERSION" >&5
+	echo "$as_me:3637: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3640,12 +3642,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3643: WARNING: templates do not work" >&5
+	{ echo "$as_me:3645: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3648: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3650: 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.
@@ -3655,15 +3657,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3658: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3660: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3661: checking if you want to build with Ada" >&5
+echo "$as_me:3663: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3663: result: $cf_with_ada" >&5
+echo "$as_me:3665: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3666: checking if you want to install terminal database" >&5
+echo "$as_me:3668: 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.
@@ -3673,10 +3675,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3676: result: $cf_with_db_install" >&5
+echo "$as_me:3678: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3679: checking if you want to install manpages" >&5
+echo "$as_me:3681: 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.
@@ -3686,10 +3688,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3689: result: $cf_with_manpages" >&5
+echo "$as_me:3691: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3692: checking if you want to build programs such as tic" >&5
+echo "$as_me:3694: 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.
@@ -3699,10 +3701,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3702: result: $cf_with_progs" >&5
+echo "$as_me:3704: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3705: checking if you want to build test-programs" >&5
+echo "$as_me:3707: 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.
@@ -3712,10 +3714,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3715: result: $cf_with_tests" >&5
+echo "$as_me:3717: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3718: checking if you wish to install curses.h" >&5
+echo "$as_me:3720: 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.
@@ -3725,7 +3727,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3728: result: $with_curses_h" >&5
+echo "$as_me:3730: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3749,7 +3751,7 @@ for ac_prog in mawk gawk nawk awk
 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:3752: checking for $ac_word" >&5
+echo "$as_me:3754: 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
@@ -3764,7 +3766,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3767: found $ac_dir/$ac_word" >&5
+echo "$as_me:3769: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3772,17 +3774,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3775: result: $AWK" >&5
+  echo "$as_me:3777: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3778: result: no" >&5
+  echo "$as_me:3780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3785: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3787: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3798,7 +3800,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3801: checking for a BSD compatible install" >&5
+echo "$as_me:3803: 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
@@ -3847,7 +3849,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3850: result: $INSTALL" >&5
+echo "$as_me:3852: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3872,7 +3874,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3875: checking for $ac_word" >&5
+echo "$as_me:3877: 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
@@ -3887,7 +3889,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3890: found $ac_dir/$ac_word" >&5
+echo "$as_me:3892: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3895,10 +3897,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3898: result: $LINT" >&5
+  echo "$as_me:3900: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3901: result: no" >&5
+  echo "$as_me:3903: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3911,18 +3913,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3914: checking whether ln -s works" >&5
+echo "$as_me:3916: 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:3918: result: yes" >&5
+  echo "$as_me:3920: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3921: result: no, using $LN_S" >&5
+  echo "$as_me:3923: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3925: checking if $LN_S -f options work" >&5
+echo "$as_me:3927: 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
@@ -3934,12 +3936,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3937: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3939: 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:3942: checking for long file names" >&5
+echo "$as_me:3944: 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
@@ -3978,7 +3980,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3981: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3983: 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
 
@@ -3997,7 +3999,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4000: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4002: 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"
@@ -4007,7 +4009,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4010: checking if you want to use pkg-config" >&5
+echo "$as_me:4012: 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.
@@ -4017,7 +4019,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4020: result: $cf_pkg_config" >&5
+echo "$as_me:4022: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4029,7 +4031,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4032: checking for $ac_word" >&5
+echo "$as_me:4034: 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
@@ -4046,7 +4048,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4049: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4051: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4057,10 +4059,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4060: result: $PKG_CONFIG" >&5
+  echo "$as_me:4062: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4063: result: no" >&5
+  echo "$as_me:4065: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4069,7 +4071,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me: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_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4086,7 +4088,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4089: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4091: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4098,10 +4100,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4101: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4103: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4104: result: no" >&5
+  echo "$as_me:4106: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4144,24 +4146,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4147: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4149: 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:4154: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4156: 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:4160: checking for pkg-config library directory" >&5
+	echo "$as_me:4162: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4164: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4166: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4188,7 +4190,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4191: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4193: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4199,16 +4201,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4202: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4204: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4207: result: auto" >&5
+	echo "$as_me:4209: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4211: checking for search-list" >&5
+	echo "$as_me:4213: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4235,11 +4237,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4238: result: $cf_search_path" >&5
+	echo "$as_me:4240: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4242: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4244: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4247,7 +4249,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4250: checking for first directory" >&5
+	echo "$as_me:4252: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4258,7 +4260,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4261: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4263: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4268,7 +4270,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4271: checking for workaround" >&5
+		echo "$as_me:4273: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4291,17 +4293,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4294: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4296: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4301: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4303: 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:4304: checking if we should install .pc files" >&5
+	echo "$as_me:4306: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4312,7 +4314,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4315: result: $enable_pc_files" >&5
+echo "$as_me:4317: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4320,7 +4322,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4323: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4325: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4351,7 +4353,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4354: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4356: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4365,7 +4367,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4368: checking for suffix to add to pc-files" >&5
+	echo "$as_me:4370: 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.
@@ -4380,13 +4382,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4383: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4385: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4389: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4391: 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.
@@ -4396,11 +4398,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4399: result: $enable_mixedcase" >&5
+echo "$as_me:4401: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4403: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4405: 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
@@ -4427,7 +4429,7 @@ else
 fi
 
 fi
-echo "$as_me:4430: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4432: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4446,7 +4448,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4449: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4451: 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
@@ -4466,16 +4468,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4469: result: yes" >&5
+  echo "$as_me:4471: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4473: result: no" >&5
+  echo "$as_me:4475: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4478: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4480: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4530,7 +4532,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4533: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4535: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4541,7 +4543,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4544: checking for $ac_word" >&5
+echo "$as_me:4546: 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
@@ -4556,7 +4558,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4559: found $ac_dir/$ac_word" >&5
+echo "$as_me:4561: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4564,10 +4566,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4567: result: $CTAGS" >&5
+  echo "$as_me:4569: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4570: result: no" >&5
+  echo "$as_me:4572: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4578,7 +4580,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4581: checking for $ac_word" >&5
+echo "$as_me:4583: 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
@@ -4593,7 +4595,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4596: found $ac_dir/$ac_word" >&5
+echo "$as_me:4598: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4601,10 +4603,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4604: result: $ETAGS" >&5
+  echo "$as_me:4606: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4607: result: no" >&5
+  echo "$as_me:4609: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4613,7 +4615,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4616: checking for $ac_word" >&5
+echo "$as_me:4618: 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
@@ -4628,7 +4630,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4631: found $ac_dir/$ac_word" >&5
+echo "$as_me:4633: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4637,17 +4639,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4640: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4642: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4643: result: no" >&5
+  echo "$as_me:4645: 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:4650: checking for $ac_word" >&5
+echo "$as_me:4652: 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
@@ -4662,7 +4664,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4665: found $ac_dir/$ac_word" >&5
+echo "$as_me:4667: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4671,10 +4673,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4674: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4676: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4677: result: no" >&5
+  echo "$as_me:4679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4694,7 +4696,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4697: checking for makeflags variable" >&5
+echo "$as_me:4699: 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
@@ -4724,7 +4726,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4727: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4729: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4732,13 +4734,13 @@ echo "${as_me:-configure}:4727: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4735: result: $cf_cv_makeflags" >&5
+echo "$as_me:4737: 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:4741: checking for $ac_word" >&5
+echo "$as_me:4743: 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
@@ -4753,7 +4755,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4756: found $ac_dir/$ac_word" >&5
+echo "$as_me:4758: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4761,10 +4763,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4764: result: $RANLIB" >&5
+  echo "$as_me:4766: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4767: result: no" >&5
+  echo "$as_me:4769: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4773,7 +4775,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4776: checking for $ac_word" >&5
+echo "$as_me:4778: 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
@@ -4788,7 +4790,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4791: found $ac_dir/$ac_word" >&5
+echo "$as_me:4793: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4797,10 +4799,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4800: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4802: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4803: result: no" >&5
+  echo "$as_me:4805: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4812,7 +4814,7 @@ fi
 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:4815: checking for $ac_word" >&5
+echo "$as_me:4817: 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
@@ -4827,7 +4829,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4830: found $ac_dir/$ac_word" >&5
+echo "$as_me:4832: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4835,10 +4837,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4838: result: $LD" >&5
+  echo "$as_me:4840: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4841: result: no" >&5
+  echo "$as_me:4843: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4847,7 +4849,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4850: checking for $ac_word" >&5
+echo "$as_me:4852: 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
@@ -4862,7 +4864,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4865: found $ac_dir/$ac_word" >&5
+echo "$as_me:4867: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4871,10 +4873,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4874: result: $ac_ct_LD" >&5
+  echo "$as_me:4876: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4877: result: no" >&5
+  echo "$as_me:4879: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4886,7 +4888,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4889: checking for $ac_word" >&5
+echo "$as_me:4891: 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
@@ -4901,7 +4903,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4904: found $ac_dir/$ac_word" >&5
+echo "$as_me:4906: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4909,10 +4911,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4912: result: $AR" >&5
+  echo "$as_me:4914: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4915: result: no" >&5
+  echo "$as_me:4917: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4921,7 +4923,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4924: checking for $ac_word" >&5
+echo "$as_me:4926: 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
@@ -4936,7 +4938,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4939: found $ac_dir/$ac_word" >&5
+echo "$as_me:4941: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4945,10 +4947,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4948: result: $ac_ct_AR" >&5
+  echo "$as_me:4950: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4951: result: no" >&5
+  echo "$as_me:4953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4960,7 +4962,7 @@ fi
 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:4963: checking for $ac_word" >&5
+echo "$as_me:4965: 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
@@ -4975,7 +4977,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4978: found $ac_dir/$ac_word" >&5
+echo "$as_me:4980: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4983,10 +4985,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4986: result: $NM" >&5
+  echo "$as_me:4988: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4989: result: no" >&5
+  echo "$as_me:4991: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4995,7 +4997,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:4998: checking for $ac_word" >&5
+echo "$as_me:5000: 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
@@ -5010,7 +5012,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5013: found $ac_dir/$ac_word" >&5
+echo "$as_me:5015: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5019,10 +5021,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5022: result: $ac_ct_NM" >&5
+  echo "$as_me:5024: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5025: result: no" >&5
+  echo "$as_me:5027: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5034,7 +5036,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5037: checking for $ac_word" >&5
+echo "$as_me:5039: 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
@@ -5049,7 +5051,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5052: found $ac_dir/$ac_word" >&5
+echo "$as_me:5054: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5057,10 +5059,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5060: result: $AR" >&5
+  echo "$as_me:5062: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5063: result: no" >&5
+  echo "$as_me:5065: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5069,7 +5071,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5072: checking for $ac_word" >&5
+echo "$as_me:5074: 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
@@ -5084,7 +5086,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5087: found $ac_dir/$ac_word" >&5
+echo "$as_me:5089: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5093,10 +5095,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5096: result: $ac_ct_AR" >&5
+  echo "$as_me:5098: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5099: result: no" >&5
+  echo "$as_me:5101: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5105,7 +5107,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5108: checking for options to update archives" >&5
+echo "$as_me:5110: 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
@@ -5142,13 +5144,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5145 "configure"
+#line 5147 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5148: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5151: \$? = $ac_status" >&5
+  echo "$as_me:5153: \$? = $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
@@ -5159,7 +5161,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5162: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5164: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5169,7 +5171,7 @@ echo "${as_me:-configure}:5162: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5172: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5174: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5180,7 +5182,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5183: checking if you have specified an install-prefix" >&5
+echo "$as_me:5185: 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.
@@ -5193,7 +5195,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5196: result: $DESTDIR" >&5
+echo "$as_me:5198: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -5228,7 +5230,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5231: checking for $ac_word" >&5
+echo "$as_me:5233: 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
@@ -5243,7 +5245,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5246: found $ac_dir/$ac_word" >&5
+echo "$as_me:5248: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5251,10 +5253,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5254: result: $BUILD_CC" >&5
+  echo "$as_me:5256: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5257: result: no" >&5
+  echo "$as_me:5259: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5263,12 +5265,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5266: checking for native build C compiler" >&5
+	echo "$as_me:5268: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5268: result: $BUILD_CC" >&5
+	echo "$as_me:5270: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5271: checking for native build C preprocessor" >&5
+	echo "$as_me:5273: 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.
@@ -5278,10 +5280,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5281: result: $BUILD_CPP" >&5
+	echo "$as_me:5283: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5284: checking for native build C flags" >&5
+	echo "$as_me:5286: 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.
@@ -5289,10 +5291,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5292: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5294: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5295: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5297: 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.
@@ -5300,10 +5302,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5303: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5305: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5306: checking for native build linker-flags" >&5
+	echo "$as_me:5308: 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.
@@ -5311,10 +5313,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5314: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5316: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5317: checking for native build linker-libraries" >&5
+	echo "$as_me:5319: 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.
@@ -5322,7 +5324,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5325: result: $BUILD_LIBS" >&5
+	echo "$as_me:5327: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5331,7 +5333,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5334: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5336: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5345,7 +5347,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5348 "configure"
+#line 5350 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5355,15 +5357,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5361: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5366: \$? = $ac_status" >&5
+  echo "$as_me:5368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5378,12 +5380,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5381: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5383: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5386: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5388: 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;}
@@ -5408,7 +5410,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5411: checking if libtool -version-number should be used" >&5
+echo "$as_me:5413: 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.
@@ -5425,7 +5427,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5428: result: $cf_libtool_version" >&5
+echo "$as_me:5430: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5434,25 +5436,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5437: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5439: 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}:5444: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5446: 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}:5451: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5453: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5455: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5457: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5474,7 +5476,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5477: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5479: 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.
@@ -5484,7 +5486,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5487: result: $with_libtool" >&5
+echo "$as_me:5489: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5515,7 +5517,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5518: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5520: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5528,7 +5530,7 @@ esac
   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:5531: checking for $ac_word" >&5
+echo "$as_me:5533: 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
@@ -5543,7 +5545,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5546: found $ac_dir/$ac_word" >&5
+echo "$as_me:5548: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5551,10 +5553,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5554: result: $LIBTOOL" >&5
+  echo "$as_me:5556: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5557: result: no" >&5
+  echo "$as_me:5559: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5567,7 +5569,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5570: checking for $ac_word" >&5
+echo "$as_me:5572: 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
@@ -5582,7 +5584,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5585: found $ac_dir/$ac_word" >&5
+echo "$as_me:5587: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5590,10 +5592,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5593: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5595: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5596: result: no" >&5
+  echo "$as_me:5598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5624,7 +5626,7 @@ unset LIBTOOL
   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:5627: checking for $ac_word" >&5
+echo "$as_me:5629: 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
@@ -5639,7 +5641,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5642: found $ac_dir/$ac_word" >&5
+echo "$as_me:5644: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5647,10 +5649,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5650: result: $LIBTOOL" >&5
+  echo "$as_me:5652: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5653: result: no" >&5
+  echo "$as_me:5655: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5663,7 +5665,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5666: checking for $ac_word" >&5
+echo "$as_me:5668: 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
@@ -5678,7 +5680,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5681: found $ac_dir/$ac_word" >&5
+echo "$as_me:5683: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5686,10 +5688,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5689: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5691: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5692: result: no" >&5
+  echo "$as_me:5694: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5711,7 +5713,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5714: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5716: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5727,7 +5729,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5730: checking version of $LIBTOOL" >&5
+	echo "$as_me:5732: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5738,7 +5740,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5741: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5743: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5747,18 +5749,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5750: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5752: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5756: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5758: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5761: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5763: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5794,7 +5796,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5797: checking if you want to build shared libraries" >&5
+echo "$as_me:5799: 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.
@@ -5804,11 +5806,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5807: result: $with_shared" >&5
+echo "$as_me:5809: 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:5811: checking if you want to build static libraries" >&5
+echo "$as_me:5813: 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.
@@ -5818,11 +5820,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5821: result: $with_normal" >&5
+echo "$as_me:5823: 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:5825: checking if you want to build debug libraries" >&5
+echo "$as_me:5827: 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.
@@ -5832,11 +5834,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5835: result: $with_debug" >&5
+echo "$as_me:5837: 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:5839: checking if you want to build profiling libraries" >&5
+echo "$as_me:5841: 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.
@@ -5846,7 +5848,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5849: result: $with_profile" >&5
+echo "$as_me:5851: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5854,7 +5856,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5857: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5859: 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.
@@ -5864,26 +5866,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5867: result: $with_shared_cxx" >&5
+echo "$as_me:5869: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5874: checking for specified models" >&5
+echo "$as_me:5876: 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:5878: result: $cf_list_models" >&5
+echo "$as_me:5880: 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:5883: checking for default model" >&5
+echo "$as_me:5885: 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:5886: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5888: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5897,7 +5899,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5900: checking if you want to have a library-prefix" >&5
+echo "$as_me:5902: 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.
@@ -5907,7 +5909,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5910: result: $with_lib_prefix" >&5
+echo "$as_me:5912: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5938,24 +5940,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5941: checking for PATH separator" >&5
+	echo "$as_me:5943: 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:5948: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5950: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5952: checking for ANSI C header files" >&5
+echo "$as_me:5954: 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 5958 "configure"
+#line 5960 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5963,13 +5965,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5966: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5968: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5972: \$? = $ac_status" >&5
+  echo "$as_me:5974: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5991,7 +5993,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5994 "configure"
+#line 5996 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6009,7 +6011,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6012 "configure"
+#line 6014 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6030,7 +6032,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6033 "configure"
+#line 6035 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6056,15 +6058,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6062: \$? = $ac_status" >&5
+  echo "$as_me:6064: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6067: \$? = $ac_status" >&5
+  echo "$as_me:6069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6077,7 +6079,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6080: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6082: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6093,28 +6095,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6096: checking for $ac_header" >&5
+echo "$as_me:6098: 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 6102 "configure"
+#line 6104 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6111: \$? = $ac_status" >&5
+  echo "$as_me:6113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6117: \$? = $ac_status" >&5
+  echo "$as_me:6119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6124,7 +6126,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6127: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6129: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6134,13 +6136,13 @@ EOF
 fi
 done
 
-echo "$as_me:6137: checking whether exit is declared" >&5
+echo "$as_me:6139: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6143 "configure"
+#line 6145 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6155,16 +6157,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6161: \$? = $ac_status" >&5
+  echo "$as_me:6163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6167: \$? = $ac_status" >&5
+  echo "$as_me:6169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6174,19 +6176,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6177: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6179: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6183: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6185: 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 6189 "configure"
+#line 6191 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6201,16 +6203,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6207: \$? = $ac_status" >&5
+  echo "$as_me:6209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6213: \$? = $ac_status" >&5
+  echo "$as_me:6215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6220,7 +6222,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6223: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6233,7 +6235,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6236: checking for opendir in -ldir" >&5
+  echo "$as_me:6238: 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
@@ -6241,7 +6243,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6244 "configure"
+#line 6246 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6260,16 +6262,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6266: \$? = $ac_status" >&5
+  echo "$as_me:6268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6272: \$? = $ac_status" >&5
+  echo "$as_me:6274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6280,14 +6282,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6283: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6285: 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:6290: checking for opendir in -lx" >&5
+  echo "$as_me:6292: 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
@@ -6295,7 +6297,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6298 "configure"
+#line 6300 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6314,16 +6316,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6320: \$? = $ac_status" >&5
+  echo "$as_me:6322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6326: \$? = $ac_status" >&5
+  echo "$as_me:6328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6334,7 +6336,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6337: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6339: 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"
@@ -6344,7 +6346,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6347: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6349: 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.
@@ -6354,10 +6356,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6357: result: $with_termlib" >&5
+echo "$as_me:6359: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6360: checking if you want to build a separate tic library" >&5
+echo "$as_me:6362: 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.
@@ -6367,7 +6369,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6370: result: $with_ticlib" >&5
+echo "$as_me:6372: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6380,7 +6382,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6383: checking for default loader flags" >&5
+echo "$as_me:6385: 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=''   ;;
@@ -6389,13 +6391,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6392: result: $LD_MODEL" >&5
+echo "$as_me:6394: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6398: checking if rpath option should be used" >&5
+echo "$as_me:6400: 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.
@@ -6405,10 +6407,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6408: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6410: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6411: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6413: 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.
@@ -6418,7 +6420,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6421: result: $cf_cv_do_relink" >&5
+echo "$as_me:6423: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6429,7 +6431,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6432: checking for an rpath option" >&5
+	echo "$as_me:6434: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6460,12 +6462,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6463: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6465: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6468: checking if we need a space after rpath option" >&5
+		echo "$as_me:6470: 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"
 
@@ -6486,7 +6488,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6489 "configure"
+#line 6491 "configure"
 #include "confdefs.h"
 
 int
@@ -6498,16 +6500,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6504: \$? = $ac_status" >&5
+  echo "$as_me:6506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6510: \$? = $ac_status" >&5
+  echo "$as_me:6512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6517,7 +6519,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6520: result: $cf_rpath_space" >&5
+		echo "$as_me:6522: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6539,7 +6541,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6542: checking if release/abi version should be used for shared libs" >&5
+	echo "$as_me:6544: 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.
@@ -6554,9 +6556,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6557: result: $withval" >&5
+		echo "$as_me:6559: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6559: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6561: 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; }; }
 		;;
@@ -6565,7 +6567,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6568: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6570: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6588,14 +6590,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6591: checking which $CC option to use" >&5
+		echo "$as_me:6593: 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 6598 "configure"
+#line 6600 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6607,16 +6609,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6613: \$? = $ac_status" >&5
+  echo "$as_me:6615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6619: \$? = $ac_status" >&5
+  echo "$as_me:6621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6625,7 +6627,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6628: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6630: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6696,7 +6698,7 @@ CF_EOF
 		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:6699: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6701: 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
@@ -6705,7 +6707,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6708 "configure"
+#line 6710 "configure"
 #include "confdefs.h"
 
 int
@@ -6717,16 +6719,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6723: \$? = $ac_status" >&5
+  echo "$as_me:6725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6729: \$? = $ac_status" >&5
+  echo "$as_me:6731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6737,7 +6739,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6740: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6742: 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"
@@ -7087,7 +7089,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7090 "configure"
+#line 7092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7099,16 +7101,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7105: \$? = $ac_status" >&5
+  echo "$as_me:7107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7111: \$? = $ac_status" >&5
+  echo "$as_me:7113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7145,7 +7147,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7148: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7150: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7155,7 +7157,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7158 "${as_me:-configure}"
+#line 7160 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7167,18 +7169,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7170: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7172: 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:7172: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7175: \$? = $ac_status" >&5
+  echo "$as_me:7177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7177: result: yes" >&5
+				echo "$as_me:7179: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7181: result: no" >&5
+				echo "$as_me:7183: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7193,17 +7195,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7196: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7198: 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}:7200: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7202: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7206: checking for additional libtool options" >&5
+echo "$as_me:7208: 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.
@@ -7213,7 +7215,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7216: result: $with_libtool_opts" >&5
+echo "$as_me:7218: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7224,7 +7226,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7227: checking if exported-symbols file should be used" >&5
+echo "$as_me:7229: 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.
@@ -7239,7 +7241,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7242: result: $with_export_syms" >&5
+echo "$as_me:7244: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7250,15 +7252,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7253: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7255: 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:7258: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7260: 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 7261 "configure"
+#line 7263 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7270,16 +7272,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7276: \$? = $ac_status" >&5
+  echo "$as_me:7278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7282: \$? = $ac_status" >&5
+  echo "$as_me:7284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7288,18 +7290,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7291: result: $cf_cflags_work" >&5
+		echo "$as_me:7293: 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}:7297: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7299: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7302: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7304: 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.
@@ -7317,18 +7319,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7320: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7322: 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:7325: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7327: 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:7331: result: $with_versioned_syms" >&5
+echo "$as_me:7333: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7344,7 +7346,7 @@ then
 		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}:7347: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7349: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7352,11 +7354,11 @@ echo "${as_me:-configure}:7347: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7355: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7357: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7359: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7361: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7368,7 +7370,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7371: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7373: 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
 
@@ -7405,7 +7407,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7408 "configure"
+#line 7410 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7436,7 +7438,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7439: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7441: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7449,7 +7451,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7452: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7454: 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.
@@ -7459,27 +7461,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7462: result: $with_gpm" >&5
+echo "$as_me:7464: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7466: checking for gpm.h" >&5
+	echo "$as_me:7468: 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 7472 "configure"
+#line 7474 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7476: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7478: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7482: \$? = $ac_status" >&5
+  echo "$as_me:7484: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7498,7 +7500,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7501: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7503: 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
 
@@ -7509,7 +7511,7 @@ EOF
 		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}:7512: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7514: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7517,7 +7519,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7520: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7522: 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
@@ -7525,7 +7527,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7528 "configure"
+#line 7530 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7544,16 +7546,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7550: \$? = $ac_status" >&5
+  echo "$as_me:7552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7556: \$? = $ac_status" >&5
+  echo "$as_me:7558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7564,18 +7566,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7567: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7569: 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:7574: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7576: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7578: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7580: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7586,7 +7588,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7589: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7591: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7595,7 +7597,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7598: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7600: 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.
@@ -7605,18 +7607,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7608: result: $with_dlsym" >&5
+	echo "$as_me:7610: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7613: checking for dlsym" >&5
+echo "$as_me:7615: 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 7619 "configure"
+#line 7621 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7647,16 +7649,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7653: \$? = $ac_status" >&5
+  echo "$as_me:7655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7659: \$? = $ac_status" >&5
+  echo "$as_me:7661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7666,14 +7668,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7669: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7671: 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:7676: checking for dlsym in -ldl" >&5
+echo "$as_me:7678: 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
@@ -7681,7 +7683,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7684 "configure"
+#line 7686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7700,16 +7702,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7706: \$? = $ac_status" >&5
+  echo "$as_me:7708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7712: \$? = $ac_status" >&5
+  echo "$as_me:7714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7720,7 +7722,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7723: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7725: 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
 
@@ -7749,10 +7751,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7752: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7754: 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 7755 "configure"
+#line 7757 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7770,16 +7772,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7776: \$? = $ac_status" >&5
+  echo "$as_me:7778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7782: \$? = $ac_status" >&5
+  echo "$as_me:7784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7790,15 +7792,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7793: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7795: 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:7798: result: ok" >&5
+	echo "$as_me:7800: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7801: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7803: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7806,12 +7808,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7809: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7811: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7814: checking for soname of gpm library" >&5
+echo "$as_me:7816: 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
@@ -7845,15 +7847,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7848: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7851: \$? = $ac_status" >&5
+  echo "$as_me:7853: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7856: \$? = $ac_status" >&5
+  echo "$as_me:7858: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7864,7 +7866,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7867: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7869: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7932,7 +7934,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7935: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7937: 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
@@ -7940,7 +7942,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7943 "configure"
+#line 7945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7959,16 +7961,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7965: \$? = $ac_status" >&5
+  echo "$as_me:7967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7971: \$? = $ac_status" >&5
+  echo "$as_me:7973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7979,11 +7981,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7982: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7984: 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:7986: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7988: 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
@@ -8007,15 +8009,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8013: \$? = $ac_status" >&5
+  echo "$as_me:8015: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8015: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8018: \$? = $ac_status" >&5
+  echo "$as_me:8020: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8027,11 +8029,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8030: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8032: 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:8034: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8036: 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
 
@@ -8039,7 +8041,7 @@ fi
 
 fi
 
-echo "$as_me:8042: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8044: 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.
@@ -8048,7 +8050,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8051: result: $with_pcre2" >&5
+echo "$as_me:8053: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8059,17 +8061,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8062: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8064: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8068: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8070: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8072: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8074: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8193,7 +8195,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8196: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8198: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8206,7 +8208,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8209: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8211: 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
@@ -8214,7 +8216,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8217 "configure"
+#line 8219 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8233,16 +8235,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8239: \$? = $ac_status" >&5
+  echo "$as_me:8241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8245: \$? = $ac_status" >&5
+  echo "$as_me:8247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8253,7 +8255,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8256: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8258: 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
 
@@ -8274,7 +8276,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8277: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8279: 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
@@ -8282,7 +8284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8285 "configure"
+#line 8287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8301,16 +8303,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8307: \$? = $ac_status" >&5
+  echo "$as_me:8309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8313: \$? = $ac_status" >&5
+  echo "$as_me:8315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8321,7 +8323,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8324: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8326: 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
 
@@ -8342,7 +8344,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8345: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8347: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8357,23 +8359,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8360: checking for $ac_header" >&5
+echo "$as_me:8362: 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 8366 "configure"
+#line 8368 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8370: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8372: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8376: \$? = $ac_status" >&5
+  echo "$as_me:8378: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8392,7 +8394,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8395: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8397: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8405,13 +8407,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8408: checking for $ac_func" >&5
+echo "$as_me:8410: 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 8414 "configure"
+#line 8416 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8442,16 +8444,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8448: \$? = $ac_status" >&5
+  echo "$as_me:8450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8454: \$? = $ac_status" >&5
+  echo "$as_me:8456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8461,7 +8463,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8464: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8466: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8475,7 +8477,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8478: checking if you want to use sysmouse" >&5
+echo "$as_me:8480: 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.
@@ -8487,7 +8489,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8490 "configure"
+#line 8492 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8510,16 +8512,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8516: \$? = $ac_status" >&5
+  echo "$as_me:8518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8522: \$? = $ac_status" >&5
+  echo "$as_me:8524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8529,7 +8531,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8532: result: $cf_with_sysmouse" >&5
+echo "$as_me:8534: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8539,7 +8541,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8542: checking if you want to disable library suffixes" >&5
+echo "$as_me:8544: 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.
@@ -8556,13 +8558,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8559: result: $disable_lib_suffixes" >&5
+echo "$as_me:8561: 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:8565: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8567: 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.
@@ -8580,22 +8582,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8583: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8585: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8588: checking for updated LDFLAGS" >&5
+echo "$as_me:8590: 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:8591: result: maybe" >&5
+	echo "$as_me:8593: 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:8598: checking for $ac_word" >&5
+echo "$as_me:8600: 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
@@ -8610,7 +8612,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8613: found $ac_dir/$ac_word" >&5
+echo "$as_me:8615: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8618,10 +8620,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8621: result: $cf_ldd_prog" >&5
+  echo "$as_me:8623: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8624: result: no" >&5
+  echo "$as_me:8626: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8635,7 +8637,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8638 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8647,16 +8649,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8653: \$? = $ac_status" >&5
+  echo "$as_me:8655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8659: \$? = $ac_status" >&5
+  echo "$as_me:8661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8684,7 +8686,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8687: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8689: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8696,11 +8698,11 @@ echo "${as_me:-configure}:8687: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8699: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8701: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8703: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8705: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8737,7 +8739,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8740: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8742: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8750,11 +8752,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8753: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8755: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8757: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8759: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8791,7 +8793,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8794: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8796: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8804,14 +8806,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8807: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8809: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8811: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8813: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8814: result: no" >&5
+	echo "$as_me:8816: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8825,7 +8827,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8828: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8830: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8842,7 +8844,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8845: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8847: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8850,7 +8852,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8853: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8855: 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=
 
@@ -8869,11 +8871,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8872: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8874: result: $EXTRA_SUFFIX" >&5
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8876: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8878: 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.
@@ -8883,10 +8885,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8886: result: $with_overwrite" >&5
+echo "$as_me:8888: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8889: checking if external terminfo-database is used" >&5
+echo "$as_me:8891: 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.
@@ -8896,7 +8898,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8899: result: $use_database" >&5
+echo "$as_me:8901: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8912,7 +8914,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8915: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8917: 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.
@@ -8920,10 +8922,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8923: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8925: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8926: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8928: 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.
@@ -8933,13 +8935,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8936: result: $with_hashed_db" >&5
+	echo "$as_me:8938: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8942: checking for list of fallback descriptions" >&5
+echo "$as_me:8944: 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.
@@ -8949,7 +8951,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8952: result: $with_fallback" >&5
+echo "$as_me:8954: result: $with_fallback" >&5
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
@@ -8957,7 +8959,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8960: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8962: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8973,7 +8975,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8976: checking for $ac_word" >&5
+echo "$as_me:8978: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8988,7 +8990,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8991: found $ac_dir/$ac_word" >&5
+echo "$as_me:8993: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8996,10 +8998,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:8999: result: $TIC" >&5
+  echo "$as_me:9001: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9002: result: no" >&5
+  echo "$as_me:9004: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9008,7 +9010,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9011: checking for $ac_word" >&5
+echo "$as_me:9013: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9023,7 +9025,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9026: found $ac_dir/$ac_word" >&5
+echo "$as_me:9028: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9031,10 +9033,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9034: result: $ac_ct_TIC" >&5
+  echo "$as_me:9036: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9037: result: no" >&5
+  echo "$as_me:9039: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9046,7 +9048,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9049: checking for $ac_word" >&5
+echo "$as_me:9051: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9061,7 +9063,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9064: found $ac_dir/$ac_word" >&5
+echo "$as_me:9066: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9069,10 +9071,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9072: result: $INFOCMP" >&5
+  echo "$as_me:9074: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9075: result: no" >&5
+  echo "$as_me:9077: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9081,7 +9083,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9084: checking for $ac_word" >&5
+echo "$as_me:9086: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9096,7 +9098,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9099: found $ac_dir/$ac_word" >&5
+echo "$as_me:9101: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9104,10 +9106,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9107: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9109: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9110: result: no" >&5
+  echo "$as_me:9112: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9122,10 +9124,10 @@ 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:9125: checking for tic program for fallbacks" >&5
+  echo "$as_me:9127: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9128: result: $TIC" >&5
+		echo "$as_me:9130: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9153,7 +9155,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9156: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9158: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9166,7 +9168,7 @@ 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:9169: checking for $ac_word" >&5
+echo "$as_me:9171: 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
@@ -9183,7 +9185,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9186: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9188: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9194,10 +9196,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9197: result: $TIC" >&5
+  echo "$as_me:9199: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9200: result: no" >&5
+  echo "$as_me:9202: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9256,7 +9258,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9259: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9261: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9271,7 +9273,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9274: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9276: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9280,10 +9282,10 @@ 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:9283: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9285: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9286: result: $INFOCMP" >&5
+		echo "$as_me:9288: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9311,7 +9313,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9314: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9316: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9324,7 +9326,7 @@ 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:9327: checking for $ac_word" >&5
+echo "$as_me:9329: 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
@@ -9341,7 +9343,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9344: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9346: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9352,10 +9354,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9355: result: $INFOCMP" >&5
+  echo "$as_me:9357: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9358: result: no" >&5
+  echo "$as_me:9360: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9414,7 +9416,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9417: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9419: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9429,7 +9431,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9432: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9434: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9439,7 +9441,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9442: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9444: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9447,7 +9449,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9450: checking if you want modern xterm or antique" >&5
+echo "$as_me:9452: 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.
@@ -9461,7 +9463,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9464: result: $with_xterm_new" >&5
+echo "$as_me:9466: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9474,7 +9476,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9477: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9479: 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.
@@ -9498,13 +9500,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9501: result: $with_xterm_kbs" >&5
+echo "$as_me:9503: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9507: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9509: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9514,7 +9516,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9517: checking for list of terminfo directories" >&5
+echo "$as_me:9519: 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.
@@ -9554,7 +9556,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9557: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9559: 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; }; }
 	;;
@@ -9577,7 +9579,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9580: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9582: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9586,13 +9588,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9589: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9591: 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:9595: checking for default terminfo directory" >&5
+echo "$as_me:9597: 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.
@@ -9628,7 +9630,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9631: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9633: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9637,7 +9639,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9640: result: $TERMINFO" >&5
+echo "$as_me:9642: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9648,7 +9650,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9651: checking if big-core option selected" >&5
+echo "$as_me:9653: 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.
@@ -9660,7 +9662,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9663 "configure"
+#line 9665 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9674,15 +9676,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9680: \$? = $ac_status" >&5
+  echo "$as_me:9682: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9685: \$? = $ac_status" >&5
+  echo "$as_me:9687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9694,7 +9696,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9697: result: $with_big_core" >&5
+echo "$as_me:9699: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9704,7 +9706,7 @@ EOF
 ### 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:9707: checking if big-strings option selected" >&5
+echo "$as_me:9709: 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.
@@ -9728,14 +9730,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9731: result: $with_big_strings" >&5
+echo "$as_me:9733: 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:9738: checking if you want termcap-fallback support" >&5
+echo "$as_me:9740: 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.
@@ -9745,14 +9747,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9748: result: $with_termcap" >&5
+echo "$as_me:9750: 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:9755: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9757: 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
@@ -9765,13 +9767,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9768: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9770: 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:9774: checking for list of termcap files" >&5
+	echo "$as_me:9776: 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.
@@ -9811,7 +9813,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9814: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9816: 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; }; }
 	;;
@@ -9834,7 +9836,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9837: result: $TERMPATH" >&5
+	echo "$as_me:9839: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9842,7 +9844,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9845: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9847: 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.
@@ -9852,14 +9854,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9855: result: $with_getcap" >&5
+	echo "$as_me:9857: 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:9862: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9864: 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.
@@ -9869,7 +9871,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9872: result: $with_getcap_cache" >&5
+	echo "$as_me:9874: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9879,7 +9881,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9882: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9884: 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.
@@ -9889,14 +9891,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9892: result: $with_home_terminfo" >&5
+echo "$as_me:9894: 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:9899: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9901: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9906,14 +9908,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9909: result: $with_root_environ" >&5
+echo "$as_me:9911: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9916: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9918: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9923,14 +9925,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9926: result: $with_root_access" >&5
+echo "$as_me:9928: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9933: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9935: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9940,7 +9942,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9943: result: $with_setuid_environ" >&5
+echo "$as_me:9945: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9955,23 +9957,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9958: checking for $ac_header" >&5
+echo "$as_me:9960: 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 9964 "configure"
+#line 9966 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9968: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9974: \$? = $ac_status" >&5
+  echo "$as_me:9976: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9990,7 +9992,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9993: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10005,13 +10007,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10008: checking for $ac_func" >&5
+echo "$as_me:10010: 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 10014 "configure"
+#line 10016 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10042,16 +10044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10048: \$? = $ac_status" >&5
+  echo "$as_me:10050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10054: \$? = $ac_status" >&5
+  echo "$as_me:10056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10061,7 +10063,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10064: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10066: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10078,13 +10080,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10081: checking for $ac_func" >&5
+echo "$as_me:10083: 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 10087 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10115,16 +10117,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10121: \$? = $ac_status" >&5
+  echo "$as_me:10123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10127: \$? = $ac_status" >&5
+  echo "$as_me:10129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10134,7 +10136,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10137: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10139: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10145,7 +10147,7 @@ fi
 done
 
 else
-	echo "$as_me:10148: checking if link/symlink functions work" >&5
+	echo "$as_me:10150: 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
@@ -10158,7 +10160,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10161 "configure"
+#line 10163 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10192,15 +10194,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10198: \$? = $ac_status" >&5
+  echo "$as_me:10200: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10203: \$? = $ac_status" >&5
+  echo "$as_me:10205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10218,7 +10220,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10221: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10223: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10238,7 +10240,7 @@ with_symlinks=no
 # 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:10241: checking if tic should use symbolic links" >&5
+	echo "$as_me:10243: 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.
@@ -10248,21 +10250,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10251: result: $with_symlinks" >&5
+	echo "$as_me:10253: 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:10258: checking if tic should use hard links" >&5
+	echo "$as_me:10260: 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:10265: result: $with_links" >&5
+	echo "$as_me:10267: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10278,7 +10280,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10281: checking if you want broken-linker support code" >&5
+echo "$as_me:10283: 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.
@@ -10288,7 +10290,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10291: result: $with_broken_linker" >&5
+echo "$as_me:10293: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10302,7 +10304,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10305: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10307: 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.
@@ -10312,7 +10314,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10315: result: $with_bsdpad" >&5
+echo "$as_me:10317: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10331,14 +10333,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10334: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10336: 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 10341 "configure"
+#line 10343 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10357,16 +10359,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10363: \$? = $ac_status" >&5
+  echo "$as_me:10365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10369: \$? = $ac_status" >&5
+  echo "$as_me:10371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10377,7 +10379,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10380: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10382: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10419,14 +10421,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10422: checking if this is the GNU C library" >&5
+echo "$as_me:10424: 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 10429 "configure"
+#line 10431 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10445,16 +10447,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10451: \$? = $ac_status" >&5
+  echo "$as_me:10453: \$? = $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:10456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10457: \$? = $ac_status" >&5
+  echo "$as_me:10459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10465,7 +10467,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10468: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10470: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10473,7 +10475,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10476: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10478: 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
@@ -10485,7 +10487,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10488 "configure"
+#line 10490 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10504,16 +10506,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10510: \$? = $ac_status" >&5
+  echo "$as_me:10512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10516: \$? = $ac_status" >&5
+  echo "$as_me:10518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10525,12 +10527,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10528: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10530: 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:10533: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10535: 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
@@ -10635,7 +10637,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10638 "configure"
+#line 10640 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10655,16 +10657,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10661: \$? = $ac_status" >&5
+  echo "$as_me:10663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10667: \$? = $ac_status" >&5
+  echo "$as_me:10669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10675,7 +10677,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10678: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10680: 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
@@ -10684,14 +10686,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10687: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10689: 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 10694 "configure"
+#line 10696 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10706,16 +10708,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10712: \$? = $ac_status" >&5
+  echo "$as_me:10714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10718: \$? = $ac_status" >&5
+  echo "$as_me:10720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10822,7 +10824,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10825 "configure"
+#line 10827 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10837,16 +10839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10843: \$? = $ac_status" >&5
+  echo "$as_me:10845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10849: \$? = $ac_status" >&5
+  echo "$as_me:10851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10861,12 +10863,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10864: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10866: 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:10869: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10871: 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
@@ -10876,7 +10878,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10879 "configure"
+#line 10881 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10891,16 +10893,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10897: \$? = $ac_status" >&5
+  echo "$as_me:10899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10903: \$? = $ac_status" >&5
+  echo "$as_me:10905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10911,7 +10913,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10914: result: $cf_cv_default_source" >&5
+echo "$as_me:10916: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10948,16 +10950,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10951: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10953: 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}:10957: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10959: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10960 "configure"
+#line 10962 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10972,16 +10974,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10978: \$? = $ac_status" >&5
+  echo "$as_me:10980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10984: \$? = $ac_status" >&5
+  echo "$as_me:10986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11002,7 +11004,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11005 "configure"
+#line 11007 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11017,16 +11019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11023: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11029: \$? = $ac_status" >&5
+  echo "$as_me:11031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11037,7 +11039,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11040: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11042: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11045,10 +11047,10 @@ echo "${as_me:-configure}:11040: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11048: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11050: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11051 "configure"
+#line 11053 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11063,16 +11065,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11069: \$? = $ac_status" >&5
+  echo "$as_me:11071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11075: \$? = $ac_status" >&5
+  echo "$as_me:11077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11088,7 +11090,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11091: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11093: 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
@@ -11205,7 +11207,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11208: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11210: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11237,14 +11239,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11240: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11242: 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 11247 "configure"
+#line 11249 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11262,16 +11264,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11268: \$? = $ac_status" >&5
+  echo "$as_me:11270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11274: \$? = $ac_status" >&5
+  echo "$as_me:11276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11283,7 +11285,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11286 "configure"
+#line 11288 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11301,16 +11303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11307: \$? = $ac_status" >&5
+  echo "$as_me:11309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11313: \$? = $ac_status" >&5
+  echo "$as_me:11315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11325,7 +11327,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11328: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11330: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11485,16 +11487,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11488: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11490: 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}:11494: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11496: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11497 "configure"
+#line 11499 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11509,16 +11511,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11515: \$? = $ac_status" >&5
+  echo "$as_me:11517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11521: \$? = $ac_status" >&5
+  echo "$as_me:11523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11539,7 +11541,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11542 "configure"
+#line 11544 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11554,16 +11556,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11559: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11560: \$? = $ac_status" >&5
+  echo "$as_me:11562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11566: \$? = $ac_status" >&5
+  echo "$as_me:11568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11574,7 +11576,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11577: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11579: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11582,10 +11584,10 @@ echo "${as_me:-configure}:11577: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11585: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11587: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11588 "configure"
+#line 11590 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11600,16 +11602,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11606: \$? = $ac_status" >&5
+  echo "$as_me:11608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11612: \$? = $ac_status" >&5
+  echo "$as_me:11614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11625,7 +11627,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11628: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11630: 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
@@ -11738,10 +11740,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11741: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11743: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11744 "configure"
+#line 11746 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11759,23 +11761,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11765: \$? = $ac_status" >&5
+  echo "$as_me:11767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11771: \$? = $ac_status" >&5
+  echo "$as_me:11773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11778: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11780: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11798,7 +11800,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11801: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11803: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11810,7 +11812,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11813: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11815: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11898,7 +11900,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11901: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11903: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11908,7 +11910,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11911: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11913: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11918,7 +11920,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11921: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11923: 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"
@@ -11930,10 +11932,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11933: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11935: 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 11936 "configure"
+#line 11938 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11948,16 +11950,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11954: \$? = $ac_status" >&5
+  echo "$as_me:11956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11960: \$? = $ac_status" >&5
+  echo "$as_me:11962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11966,12 +11968,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11969: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11971: 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 11974 "configure"
+#line 11976 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11986,16 +11988,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11992: \$? = $ac_status" >&5
+  echo "$as_me:11994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11998: \$? = $ac_status" >&5
+  echo "$as_me:12000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12006,19 +12008,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12009: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12011: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12014: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12016: 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 12021 "configure"
+#line 12023 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12036,16 +12038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12042: \$? = $ac_status" >&5
+  echo "$as_me:12044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12048: \$? = $ac_status" >&5
+  echo "$as_me:12050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12057,7 +12059,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12060 "configure"
+#line 12062 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12075,16 +12077,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12081: \$? = $ac_status" >&5
+  echo "$as_me:12083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12087: \$? = $ac_status" >&5
+  echo "$as_me:12089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12099,7 +12101,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12102: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12104: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12250,14 +12252,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12253: checking if SIGWINCH is defined" >&5
+echo "$as_me:12255: 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 12260 "configure"
+#line 12262 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12272,23 +12274,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12278: \$? = $ac_status" >&5
+  echo "$as_me:12280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12284: \$? = $ac_status" >&5
+  echo "$as_me:12286: \$? = $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 12291 "configure"
+#line 12293 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12306,16 +12308,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12312: \$? = $ac_status" >&5
+  echo "$as_me:12314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12329,11 +12331,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12332: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12334: 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:12336: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12338: 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
@@ -12344,7 +12346,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12347 "configure"
+#line 12349 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12366,16 +12368,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12372: \$? = $ac_status" >&5
+  echo "$as_me:12374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12378: \$? = $ac_status" >&5
+  echo "$as_me:12380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12389,7 +12391,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12392: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12394: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12399,13 +12401,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12402: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12404: 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 12408 "configure"
+#line 12410 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12419,16 +12421,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12425: \$? = $ac_status" >&5
+  echo "$as_me:12427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12431: \$? = $ac_status" >&5
+  echo "$as_me:12433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12439,7 +12441,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12442: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12444: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12453,7 +12455,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12456: checking if you want wide-character code" >&5
+echo "$as_me:12458: 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.
@@ -12461,9 +12463,9 @@ if test "${enable_widec+set}" = set; then
   enableval="$enable_widec"
   with_widec=$enableval
 else
-  with_widec=no
+  with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12466: result: $with_widec" >&5
+echo "$as_me:12468: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12485,7 +12487,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12488: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12490: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12498,23 +12500,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12501: checking for $ac_header" >&5
+echo "$as_me:12503: 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 12507 "configure"
+#line 12509 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12511: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12517: \$? = $ac_status" >&5
+  echo "$as_me:12519: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12533,7 +12535,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12536: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12543,14 +12545,14 @@ EOF
 fi
 done
 
-echo "$as_me:12546: checking if wchar.h can be used as is" >&5
+echo "$as_me:12548: 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 12553 "configure"
+#line 12555 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12572,16 +12574,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12584: \$? = $ac_status" >&5
+  echo "$as_me:12586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12591,16 +12593,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12594: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12596: 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:12600: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12602: 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 12603 "configure"
+#line 12605 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12616,16 +12618,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12622: \$? = $ac_status" >&5
+  echo "$as_me:12624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12628: \$? = $ac_status" >&5
+  echo "$as_me:12630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12634,16 +12636,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12637: result: $cf_result" >&5
+echo "$as_me:12639: 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:12643: checking checking for compatible value versus " >&5
+	echo "$as_me:12645: 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 12646 "configure"
+#line 12648 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12659,16 +12661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12665: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12677,7 +12679,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12680: result: $cf_result" >&5
+	echo "$as_me:12682: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12687,7 +12689,7 @@ fi
 
 fi
 
-echo "$as_me:12690: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12692: 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
@@ -12758,7 +12760,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12761 "configure"
+#line 12763 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12803,15 +12805,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12809: \$? = $ac_status" >&5
+  echo "$as_me:12811: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12814: \$? = $ac_status" >&5
+  echo "$as_me:12816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12824,7 +12826,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12827: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12829: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12835,13 +12837,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12838: checking for $ac_func" >&5
+echo "$as_me:12840: 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 12844 "configure"
+#line 12846 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12872,16 +12874,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12878: \$? = $ac_status" >&5
+  echo "$as_me:12880: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12884: \$? = $ac_status" >&5
+  echo "$as_me:12886: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12891,7 +12893,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12894: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12896: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12906,23 +12908,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12909: checking for $ac_header" >&5
+echo "$as_me:12911: 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 12915 "configure"
+#line 12917 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12919: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12925: \$? = $ac_status" >&5
+  echo "$as_me:12927: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12941,7 +12943,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12944: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12946: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12951,7 +12953,7 @@ EOF
 fi
 done
 
-echo "$as_me:12954: checking for multibyte character support" >&5
+echo "$as_me:12956: 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
@@ -12959,7 +12961,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12962 "configure"
+#line 12964 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12976,16 +12978,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12982: \$? = $ac_status" >&5
+  echo "$as_me:12984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12988: \$? = $ac_status" >&5
+  echo "$as_me:12990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12997,12 +12999,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13000: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13002: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13005 "configure"
+#line 13007 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13015,16 +13017,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13021: \$? = $ac_status" >&5
+  echo "$as_me:13023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13027: \$? = $ac_status" >&5
+  echo "$as_me:13029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13038,7 +13040,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13041 "configure"
+#line 13043 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13051,16 +13053,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13057: \$? = $ac_status" >&5
+  echo "$as_me:13059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13063: \$? = $ac_status" >&5
+  echo "$as_me:13065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13077,9 +13079,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13080: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13082: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13082: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13084: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13170,7 +13172,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13173: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13175: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13178,7 +13180,7 @@ echo "${as_me:-configure}:13173: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13181 "configure"
+#line 13183 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13191,21 +13193,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13197: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13203: \$? = $ac_status" >&5
+  echo "$as_me:13205: \$? = $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}:13208: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13210: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13223,7 +13225,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13226: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13228: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13298,13 +13300,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13301: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13303: 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 13307 "configure"
+#line 13309 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13317,21 +13319,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13323: \$? = $ac_status" >&5
+  echo "$as_me:13325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13329: \$? = $ac_status" >&5
+  echo "$as_me:13331: \$? = $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}:13334: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13336: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13373,7 +13375,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13376: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13378: 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
@@ -13411,7 +13413,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13414 "configure"
+#line 13416 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13423,16 +13425,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13429: \$? = $ac_status" >&5
+  echo "$as_me:13431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13435: \$? = $ac_status" >&5
+  echo "$as_me:13437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13449,7 +13451,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13452: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13454: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13485,7 +13487,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13488: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13490: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13517,14 +13519,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13520: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13522: 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 13527 "configure"
+#line 13529 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13542,23 +13544,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13548: \$? = $ac_status" >&5
+  echo "$as_me:13550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13554: \$? = $ac_status" >&5
+  echo "$as_me:13556: \$? = $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 13561 "configure"
+#line 13563 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13577,16 +13579,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13582: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13583: \$? = $ac_status" >&5
+  echo "$as_me:13585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13589: \$? = $ac_status" >&5
+  echo "$as_me:13591: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13598,7 +13600,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13601: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13603: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13616,14 +13618,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13619: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13621: 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 13626 "configure"
+#line 13628 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13641,23 +13643,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13647: \$? = $ac_status" >&5
+  echo "$as_me:13649: \$? = $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:13652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13653: \$? = $ac_status" >&5
+  echo "$as_me:13655: \$? = $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 13660 "configure"
+#line 13662 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13676,16 +13678,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13682: \$? = $ac_status" >&5
+  echo "$as_me:13684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13688: \$? = $ac_status" >&5
+  echo "$as_me:13690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13697,7 +13699,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13700: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13702: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13720,14 +13722,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13723: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13725: 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 13730 "configure"
+#line 13732 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13745,23 +13747,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13751: \$? = $ac_status" >&5
+  echo "$as_me:13753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13757: \$? = $ac_status" >&5
+  echo "$as_me:13759: \$? = $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 13764 "configure"
+#line 13766 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13780,16 +13782,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13786: \$? = $ac_status" >&5
+  echo "$as_me:13788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13792: \$? = $ac_status" >&5
+  echo "$as_me:13794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13801,7 +13803,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13804: result: $cf_cv_wint_t" >&5
+echo "$as_me:13806: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13833,7 +13835,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13836: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13838: 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.
@@ -13843,7 +13845,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13846: result: $with_lp64" >&5
+echo "$as_me:13848: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13859,7 +13861,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13862: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13864: 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
@@ -13871,7 +13873,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13874 "configure"
+#line 13876 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13891,16 +13893,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13897: \$? = $ac_status" >&5
+  echo "$as_me:13899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13903: \$? = $ac_status" >&5
+  echo "$as_me:13905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13910,16 +13912,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13916: \$? = $ac_status" >&5
+  echo "$as_me:13918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13922: \$? = $ac_status" >&5
+  echo "$as_me:13924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13933,13 +13935,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13936: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13938: 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:13942: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13944: 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
@@ -13947,7 +13949,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13950 "configure"
+#line 13952 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13967,16 +13969,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13973: \$? = $ac_status" >&5
+  echo "$as_me:13975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13979: \$? = $ac_status" >&5
+  echo "$as_me:13981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13985,7 +13987,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13988 "configure"
+#line 13990 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14006,16 +14008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14012: \$? = $ac_status" >&5
+  echo "$as_me:14014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14018: \$? = $ac_status" >&5
+  echo "$as_me:14020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14026,7 +14028,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14029: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14031: 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
 
@@ -14036,7 +14038,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14039: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14041: 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
@@ -14044,7 +14046,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14047 "configure"
+#line 14049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14064,16 +14066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14070: \$? = $ac_status" >&5
+  echo "$as_me:14072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14076: \$? = $ac_status" >&5
+  echo "$as_me:14078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14082,7 +14084,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14085 "configure"
+#line 14087 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14103,16 +14105,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14109: \$? = $ac_status" >&5
+  echo "$as_me:14111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14115: \$? = $ac_status" >&5
+  echo "$as_me:14117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14123,7 +14125,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14126: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14128: 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
 
@@ -14136,7 +14138,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14139: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14141: 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
@@ -14144,7 +14146,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14147 "configure"
+#line 14149 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14156,16 +14158,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14162: \$? = $ac_status" >&5
+  echo "$as_me:14164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14168: \$? = $ac_status" >&5
+  echo "$as_me:14170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14174,7 +14176,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14177 "configure"
+#line 14179 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14187,16 +14189,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14193: \$? = $ac_status" >&5
+  echo "$as_me:14195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14199: \$? = $ac_status" >&5
+  echo "$as_me:14201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14207,7 +14209,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14210: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14212: 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
 
@@ -14221,13 +14223,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14224: checking for fseeko" >&5
+echo "$as_me:14226: 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 14230 "configure"
+#line 14232 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14239,16 +14241,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14245: \$? = $ac_status" >&5
+  echo "$as_me:14247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14251: \$? = $ac_status" >&5
+  echo "$as_me:14253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14258,7 +14260,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14261: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14263: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14297,14 +14299,14 @@ fi
 
 	fi
 
-	echo "$as_me:14300: checking whether to use struct dirent64" >&5
+	echo "$as_me:14302: 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 14307 "configure"
+#line 14309 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14327,16 +14329,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14333: \$? = $ac_status" >&5
+  echo "$as_me:14335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14339: \$? = $ac_status" >&5
+  echo "$as_me:14341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14347,7 +14349,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14350: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14352: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14357,7 +14359,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14360: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14362: 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.
@@ -14367,14 +14369,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14370: result: $with_tparm_varargs" >&5
+echo "$as_me:14372: 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:14377: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14379: 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.
@@ -14384,14 +14386,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14387: result: $with_tic_depends" >&5
+echo "$as_me:14389: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14394: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14396: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14403,15 +14405,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14406: result: no" >&5
+	echo "$as_me:14408: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14410: result: yes" >&5
+	echo "$as_me:14412: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14414: checking for X11 rgb file" >&5
+echo "$as_me:14416: 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.
@@ -14475,7 +14477,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14478: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14480: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14483,7 +14485,7 @@ esac
 
 fi
 
-echo "$as_me:14486: result: $RGB_PATH" >&5
+echo "$as_me:14488: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14497,7 +14499,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14500: checking for type of bool" >&5
+echo "$as_me:14502: 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.
@@ -14507,10 +14509,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14510: result: $NCURSES_BOOL" >&5
+echo "$as_me:14512: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14513: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14515: 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.
@@ -14522,15 +14524,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14525: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14527: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14529: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14531: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14533: checking for type of chtype" >&5
+echo "$as_me:14535: 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.
@@ -14540,11 +14542,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14543: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14545: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14547: checking for type of ospeed" >&5
+echo "$as_me:14549: 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.
@@ -14554,11 +14556,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14557: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14559: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14561: checking for type of mmask_t" >&5
+echo "$as_me:14563: 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.
@@ -14568,11 +14570,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14571: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14573: 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:14575: checking for size CCHARW_MAX" >&5
+echo "$as_me:14577: 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.
@@ -14582,16 +14584,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14585: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14587: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14588: checking for signed char" >&5
+echo "$as_me:14590: 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 14594 "configure"
+#line 14596 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14606,16 +14608,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14612: \$? = $ac_status" >&5
+  echo "$as_me:14614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14618: \$? = $ac_status" >&5
+  echo "$as_me:14620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14625,10 +14627,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14628: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14630: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14631: checking size of signed char" >&5
+echo "$as_me:14633: 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
@@ -14637,7 +14639,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14640 "configure"
+#line 14642 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14649,21 +14651,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:14657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14661: \$? = $ac_status" >&5
+  echo "$as_me:14663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14666 "configure"
+#line 14668 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14675,16 +14677,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14681: \$? = $ac_status" >&5
+  echo "$as_me:14683: \$? = $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:14686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14687: \$? = $ac_status" >&5
+  echo "$as_me:14689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14700,7 +14702,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14703 "configure"
+#line 14705 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14712,16 +14714,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14718: \$? = $ac_status" >&5
+  echo "$as_me:14720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14724: \$? = $ac_status" >&5
+  echo "$as_me:14726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14737,7 +14739,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14740 "configure"
+#line 14742 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14749,16 +14751,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14755: \$? = $ac_status" >&5
+  echo "$as_me:14757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14761: \$? = $ac_status" >&5
+  echo "$as_me:14763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14771,12 +14773,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14774: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14776: 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 14779 "configure"
+#line 14781 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14792,15 +14794,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14798: \$? = $ac_status" >&5
+  echo "$as_me:14800: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14803: \$? = $ac_status" >&5
+  echo "$as_me:14805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14816,7 +14818,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14819: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14821: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14827,7 +14829,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14830: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14832: 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.
@@ -14837,12 +14839,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14840: result: $with_signed_char" >&5
+echo "$as_me:14842: 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:14845: checking for type of tparm args" >&5
+echo "$as_me:14847: 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.
@@ -14852,11 +14854,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14855: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14857: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14859: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14861: 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.
@@ -14866,7 +14868,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14869: result: $with_rcs_ids" >&5
+echo "$as_me:14871: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14875,7 +14877,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14878: checking format of man-pages" >&5
+echo "$as_me:14880: 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.
@@ -14966,10 +14968,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14969: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14971: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14972: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14974: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15008,7 +15010,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15011: checking for manpage renaming" >&5
+echo "$as_me:15013: 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.
@@ -15037,15 +15039,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15040: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15042: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15045: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15047: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15048: checking if manpage aliases will be installed" >&5
+echo "$as_me:15050: 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.
@@ -15056,7 +15058,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15059: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15061: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15070,7 +15072,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15073: checking if manpage symlinks should be used" >&5
+echo "$as_me:15075: 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.
@@ -15083,17 +15085,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15086: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15088: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15092: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15094: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15096: checking for manpage tbl" >&5
+echo "$as_me:15098: 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.
@@ -15104,7 +15106,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15107: result: $MANPAGE_TBL" >&5
+echo "$as_me:15109: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15422,7 +15424,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15425: checking if you want to build with function extensions" >&5
+echo "$as_me:15427: 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.
@@ -15432,7 +15434,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15435: result: $with_ext_funcs" >&5
+echo "$as_me:15437: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15488,7 +15490,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15491: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15493: 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.
@@ -15498,7 +15500,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15501: result: $with_sp_funcs" >&5
+echo "$as_me:15503: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15517,7 +15519,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15520: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15522: 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.
@@ -15527,7 +15529,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15530: result: $with_term_driver" >&5
+echo "$as_me:15532: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15536,19 +15538,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15539: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15541: 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:15544: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15546: 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:15551: checking for extended use of const keyword" >&5
+echo "$as_me:15553: 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.
@@ -15558,7 +15560,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15561: result: $with_ext_const" >&5
+echo "$as_me:15563: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15566,7 +15568,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15569: checking if you want to use extended colors" >&5
+echo "$as_me:15571: 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.
@@ -15576,12 +15578,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15579: result: $with_ext_colors" >&5
+echo "$as_me:15581: 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:15584: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15586: 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)
@@ -15592,7 +15594,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15595: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15597: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15620,7 +15622,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15623: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15625: 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.
@@ -15630,7 +15632,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15633: result: $with_ext_mouse" >&5
+echo "$as_me:15635: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15640,7 +15642,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15643: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15645: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15657,7 +15659,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15660: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15662: 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.
@@ -15667,7 +15669,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15670: result: $with_ext_putwin" >&5
+echo "$as_me:15672: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15677,7 +15679,7 @@ EOF
 
 fi
 
-echo "$as_me:15680: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15682: 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.
@@ -15687,7 +15689,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15690: result: $with_no_padding" >&5
+echo "$as_me:15692: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15695,7 +15697,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15698: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15700: 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.
@@ -15705,7 +15707,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15708: result: $with_sigwinch" >&5
+echo "$as_me:15710: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15713,7 +15715,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15716: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15718: 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.
@@ -15723,7 +15725,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15726: result: $with_tcap_names" >&5
+echo "$as_me:15728: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15737,7 +15739,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15740: checking if you want to link with the pthread library" >&5
+echo "$as_me:15742: 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.
@@ -15747,27 +15749,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15750: result: $with_pthread" >&5
+echo "$as_me:15752: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15754: checking for pthread.h" >&5
+	echo "$as_me:15756: 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 15760 "configure"
+#line 15762 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15764: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15766: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15770: \$? = $ac_status" >&5
+  echo "$as_me:15772: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15786,7 +15788,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15789: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15791: 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
 
@@ -15796,7 +15798,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15799: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15801: 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"
 
@@ -15817,7 +15819,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15820 "configure"
+#line 15822 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15834,16 +15836,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15840: \$? = $ac_status" >&5
+  echo "$as_me:15842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15846: \$? = $ac_status" >&5
+  echo "$as_me:15848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15853,7 +15855,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15856: result: $with_pthread" >&5
+	    echo "$as_me:15858: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15881,7 +15883,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15884: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15886: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15891,13 +15893,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15894: checking for pthread_kill" >&5
+	echo "$as_me:15896: 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 15900 "configure"
+#line 15902 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15928,16 +15930,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15933: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15934: \$? = $ac_status" >&5
+  echo "$as_me:15936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15940: \$? = $ac_status" >&5
+  echo "$as_me:15942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15947,11 +15949,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15950: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15952: 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:15954: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15956: 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.
@@ -15961,7 +15963,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15964: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15966: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15972,7 +15974,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15975: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15977: 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.
@@ -15982,18 +15984,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15985: result: $use_weak_symbols" >&5
+	echo "$as_me:15987: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15989: checking if $CC supports weak symbols" >&5
+echo "$as_me:15991: 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 15996 "configure"
+#line 15998 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16019,16 +16021,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16025: \$? = $ac_status" >&5
+  echo "$as_me:16027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16031: \$? = $ac_status" >&5
+  echo "$as_me:16033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16039,7 +16041,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16042: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16044: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16089,7 +16091,7 @@ fi
 # 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:16092: checking if you want reentrant code" >&5
+echo "$as_me:16094: 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.
@@ -16099,7 +16101,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16102: result: $with_reentrant" >&5
+echo "$as_me:16104: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16188,7 +16190,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16191: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16193: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16200,7 +16202,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16203: checking if you want opaque curses-library structures" >&5
+echo "$as_me:16205: 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.
@@ -16222,16 +16224,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16225: result: $enable_opaque_curses" >&5
+echo "$as_me:16227: 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:16230: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16232: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16234: checking if you want opaque form-library structures" >&5
+echo "$as_me:16236: 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.
@@ -16239,12 +16241,12 @@ if test "${enable_opaque_form+set}" = set; then
   enableval="$enable_opaque_form"
   enable_opaque_form=yes
 else
-  enable_opaque_form=no
+  enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16244: result: $enable_opaque_form" >&5
+echo "$as_me:16246: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16247: checking if you want opaque menu-library structures" >&5
+echo "$as_me:16249: 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.
@@ -16252,12 +16254,12 @@ if test "${enable_opaque_menu+set}" = set; then
   enableval="$enable_opaque_menu"
   enable_opaque_menu=yes
 else
-  enable_opaque_menu=no
+  enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16257: result: $enable_opaque_menu" >&5
+echo "$as_me:16259: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16260: checking if you want opaque panel-library structures" >&5
+echo "$as_me:16262: 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.
@@ -16265,9 +16267,9 @@ if test "${enable_opaque_panel+set}" = set; then
   enableval="$enable_opaque_panel"
   enable_opaque_panel=yes
 else
-  enable_opaque_panel=no
+  enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16270: result: $enable_opaque_panel" >&5
+echo "$as_me:16272: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16277,7 +16279,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16280: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16282: 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.
@@ -16287,7 +16289,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16290: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16292: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16300,7 +16302,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16303: checking if you want all development code" >&5
+echo "$as_me:16305: 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.
@@ -16310,11 +16312,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16313: result: $with_develop" >&5
+echo "$as_me:16315: 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:16317: checking if you want hard-tabs code" >&5
+echo "$as_me:16319: 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.
@@ -16324,7 +16326,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16327: result: $enable_hard_tabs" >&5
+echo "$as_me:16329: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16332,7 +16334,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16335: checking if you want limited support for xmc" >&5
+echo "$as_me:16337: 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.
@@ -16342,7 +16344,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16345: result: $enable_xmc_glitch" >&5
+echo "$as_me:16347: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16352,7 +16354,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16355: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16357: 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.
@@ -16362,7 +16364,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16365: result: $with_assumed_color" >&5
+echo "$as_me:16367: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16370,7 +16372,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16373: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16375: 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.
@@ -16380,7 +16382,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16383: result: $with_hashmap" >&5
+echo "$as_me:16385: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16388,7 +16390,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16391: checking if you want code to check screensize" >&5
+echo "$as_me:16393: checking if you want code to check screensize" >&5
 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16398,7 +16400,7 @@ if test "${enable_check_size+set}" = set; then
 else
   with_check_size=no
 fi;
-echo "$as_me:16401: result: $with_check_size" >&5
+echo "$as_me:16403: result: $with_check_size" >&5
 echo "${ECHO_T}$with_check_size" >&6
 test "x$with_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16406,7 +16408,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16409: checking if you want colorfgbg code" >&5
+echo "$as_me:16411: 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.
@@ -16416,7 +16418,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16419: result: $with_colorfgbg" >&5
+echo "$as_me:16421: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16424,7 +16426,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16427: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16429: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16434,14 +16436,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16437: result: $cf_with_fvisibility" >&5
+echo "$as_me:16439: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16444: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16446: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16450,7 +16452,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16453 "configure"
+#line 16455 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16466,16 +16468,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16472: \$? = $ac_status" >&5
+  echo "$as_me:16474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16478: \$? = $ac_status" >&5
+  echo "$as_me:16480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16487,7 +16489,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16490: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16492: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16602,7 +16604,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16605: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16607: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16611,7 +16613,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16614 "configure"
+#line 16616 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16627,16 +16629,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16633: \$? = $ac_status" >&5
+  echo "$as_me:16635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16639: \$? = $ac_status" >&5
+  echo "$as_me:16641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16648,7 +16650,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16651: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16653: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16771,7 +16773,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16774: checking if you want interop bindings" >&5
+echo "$as_me:16776: 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.
@@ -16781,13 +16783,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16784: result: $with_exp_interop" >&5
+echo "$as_me:16786: 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:16790: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16792: 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.
@@ -16797,13 +16799,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16800: result: $with_safe_sprintf" >&5
+echo "$as_me:16802: 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:16806: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16808: 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.
@@ -16813,7 +16815,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16816: result: $with_scroll_hints" >&5
+echo "$as_me:16818: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16822,7 +16824,7 @@ EOF
 
 fi
 
-echo "$as_me:16825: checking if you want wgetch-events code" >&5
+echo "$as_me:16827: 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.
@@ -16832,7 +16834,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16835: result: $with_wgetch_events" >&5
+echo "$as_me:16837: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16847,7 +16849,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16850: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16852: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16857,7 +16859,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16860: result: $with_exp_win32" >&5
+	echo "$as_me:16862: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16883,7 +16885,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16886: checking if you want to see long compiling messages" >&5
+echo "$as_me:16888: 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.
@@ -16917,7 +16919,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16920: result: $enableval" >&5
+echo "$as_me:16922: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16930,7 +16932,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16933: checking if you want to install stripped executables" >&5
+echo "$as_me:16935: 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.
@@ -16947,7 +16949,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16950: result: $enable_stripping" >&5
+echo "$as_me:16952: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16958,7 +16960,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16961: checking if install accepts -p option" >&5
+echo "$as_me:16963: 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
@@ -16989,10 +16991,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16992: result: $cf_cv_install_p" >&5
+echo "$as_me:16994: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16995: checking if install needs to be told about ownership" >&5
+echo "$as_me:16997: 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)
@@ -17003,7 +17005,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17006: result: $with_install_o" >&5
+echo "$as_me:17008: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17014,7 +17016,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17017: checking if you want to specify strip-program" >&5
+	echo "$as_me:17019: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17024,11 +17026,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17027: result: $with_strip_program" >&5
+	echo "$as_me:17029: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17031: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17033: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17049,11 +17051,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17052: result: $check_install_strip" >&5
+		echo "$as_me:17054: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17056: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17058: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17068,7 +17070,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17071: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17073: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17094,7 +17096,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17097: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17099: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17111,17 +17113,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17114: result: $enable_stdnoreturn" >&5
+echo "$as_me:17116: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17118: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17120: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17124 "configure"
+#line 17126 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17137,16 +17139,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17143: \$? = $ac_status" >&5
+  echo "$as_me:17145: \$? = $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:17148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17149: \$? = $ac_status" >&5
+  echo "$as_me:17151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17157,7 +17159,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17160: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17162: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17213,16 +17215,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17216: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17218: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17221: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17223: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17225: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17227: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17261,16 +17263,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17264: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17266: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17269: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17271: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17273: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17275: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17309,23 +17311,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17312: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17314: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17317: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17319: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17321: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17323: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17328: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17330: 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.
@@ -17342,7 +17344,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17345: result: $enable_warnings" >&5
+echo "$as_me:17347: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17366,7 +17368,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17369 "configure"
+#line 17371 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17381,26 +17383,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17387: \$? = $ac_status" >&5
+  echo "$as_me:17389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17393: \$? = $ac_status" >&5
+  echo "$as_me:17395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17396: checking for X11/Xt const-feature" >&5
+echo "$as_me:17398: 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 17403 "configure"
+#line 17405 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17417,16 +17419,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17423: \$? = $ac_status" >&5
+  echo "$as_me:17425: \$? = $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:17428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17429: \$? = $ac_status" >&5
+  echo "$as_me:17431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17441,7 +17443,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17444: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17446: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17470,7 +17472,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17473 "${as_me:-configure}"
+#line 17475 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17486,7 +17488,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17489: checking for $CC warning options..." >&5
+	{ echo "$as_me:17491: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17502,12 +17504,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17508: \$? = $ac_status" >&5
+  echo "$as_me:17510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17510: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17512: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17515,7 +17517,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17518: checking for $CC warning options..." >&5
+	{ echo "$as_me:17520: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17538,12 +17540,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17541: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17544: \$? = $ac_status" >&5
+  echo "$as_me:17546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17546: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17548: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17551,7 +17553,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17554: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17556: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17561,7 +17563,7 @@ echo "${as_me:-configure}:17554: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17564: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17566: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17594,10 +17596,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17597: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17599: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17600 "${as_me:-configure}"
+#line 17602 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17647,12 +17649,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17650: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17653: \$? = $ac_status" >&5
+  echo "$as_me:17655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17655: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17657: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17724,12 +17726,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17727: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17729: 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 17732 "configure"
+#line 17734 "configure"
 #include "confdefs.h"
 
 int
@@ -17746,16 +17748,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17752: \$? = $ac_status" >&5
+  echo "$as_me:17754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17758: \$? = $ac_status" >&5
+  echo "$as_me:17760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17766,7 +17768,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17769: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17771: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17775,11 +17777,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17778: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17780: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17782 "configure"
+#line 17784 "configure"
 #include "confdefs.h"
 
 int
@@ -17796,16 +17798,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17802: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17808: \$? = $ac_status" >&5
+  echo "$as_me:17810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17815,7 +17817,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17818: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17820: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17824,30 +17826,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17827: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17829: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17834: checking version of $CC" >&5
+	echo "$as_me:17836: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17838: result: $CLANG_VERSION" >&5
+	echo "$as_me:17840: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17845: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17847: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17850 "configure"
+#line 17852 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17861,16 +17863,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17867: \$? = $ac_status" >&5
+  echo "$as_me:17869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17873: \$? = $ac_status" >&5
+  echo "$as_me:17875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17881,13 +17883,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17884: result: $cf_clang_optok" >&5
+		echo "$as_me:17886: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17890: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17892: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17904,7 +17906,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17907 "configure"
+#line 17909 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17922,7 +17924,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17925: checking for $CC warning options..." >&5
+	{ echo "$as_me:17927: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17939,12 +17941,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17942: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17945: \$? = $ac_status" >&5
+  echo "$as_me:17947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17947: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17949: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17953,7 +17955,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17956: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17958: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17983,16 +17985,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17986: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17989: \$? = $ac_status" >&5
+  echo "$as_me:17991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17991: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17993: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17995: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17997: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18010,7 +18012,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18013: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18015: 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.
@@ -18020,7 +18022,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18023: result: $enable_string_hacks" >&5
+echo "$as_me:18025: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18029,15 +18031,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18032: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18034: 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:18034: checking for strlcat" >&5
+	echo "$as_me:18036: 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 18040 "configure"
+#line 18042 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18068,16 +18070,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18074: \$? = $ac_status" >&5
+  echo "$as_me:18076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18080: \$? = $ac_status" >&5
+  echo "$as_me:18082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18087,7 +18089,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18090: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18092: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18097,7 +18099,7 @@ EOF
 
 else
 
-		echo "$as_me:18100: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18102: 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
@@ -18105,7 +18107,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18108 "configure"
+#line 18110 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18124,16 +18126,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18130: \$? = $ac_status" >&5
+  echo "$as_me:18132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18136: \$? = $ac_status" >&5
+  echo "$as_me:18138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18144,7 +18146,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18147: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18149: 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
 
@@ -18167,23 +18169,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18170: checking for $ac_header" >&5
+echo "$as_me:18172: 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 18176 "configure"
+#line 18178 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18180: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18186: \$? = $ac_status" >&5
+  echo "$as_me:18188: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18202,7 +18204,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18205: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18223,13 +18225,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18226: checking for $ac_func" >&5
+echo "$as_me:18228: 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 18232 "configure"
+#line 18234 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18260,16 +18262,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18266: \$? = $ac_status" >&5
+  echo "$as_me:18268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18272: \$? = $ac_status" >&5
+  echo "$as_me:18274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18279,7 +18281,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18282: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18284: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18292,7 +18294,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18295: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18297: 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.
@@ -18302,7 +18304,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18305: result: $with_assertions" >&5
+echo "$as_me:18307: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18318,7 +18320,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18321: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18323: 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.
@@ -18340,7 +18342,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18343: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18345: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18454,23 +18456,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18457: checking for dmalloc.h" >&5
+	echo "$as_me:18459: 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 18463 "configure"
+#line 18465 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18467: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18469: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18473: \$? = $ac_status" >&5
+  echo "$as_me:18475: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18489,11 +18491,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18492: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18494: 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:18496: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18498: 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
@@ -18501,7 +18503,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18504 "configure"
+#line 18506 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18520,16 +18522,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18526: \$? = $ac_status" >&5
+  echo "$as_me:18528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18532: \$? = $ac_status" >&5
+  echo "$as_me:18534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18540,7 +18542,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18543: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18545: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18555,7 +18557,7 @@ fi
 
 fi
 
-echo "$as_me:18558: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18560: 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.
@@ -18577,7 +18579,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18580: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18582: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18691,23 +18693,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18694: checking for dbmalloc.h" >&5
+	echo "$as_me:18696: 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 18700 "configure"
+#line 18702 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18704: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18706: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18710: \$? = $ac_status" >&5
+  echo "$as_me:18712: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18726,11 +18728,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18729: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18731: 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:18733: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18735: 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
@@ -18738,7 +18740,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18741 "configure"
+#line 18743 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18757,16 +18759,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18763: \$? = $ac_status" >&5
+  echo "$as_me:18765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18769: \$? = $ac_status" >&5
+  echo "$as_me:18771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18777,7 +18779,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18780: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18782: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18792,7 +18794,7 @@ fi
 
 fi
 
-echo "$as_me:18795: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18797: 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.
@@ -18814,7 +18816,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18817: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18819: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18927,7 +18929,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18930: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18932: 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.
@@ -18938,7 +18940,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18941: result: $with_no_leaks" >&5
+echo "$as_me:18943: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18990,7 +18992,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18993: checking whether to add trace feature to all models" >&5
+echo "$as_me:18995: 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.
@@ -19000,7 +19002,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19003: result: $cf_with_trace" >&5
+echo "$as_me:19005: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19114,7 +19116,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19117: checking if we want to use GNAT projects" >&5
+echo "$as_me:19119: 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.
@@ -19131,7 +19133,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19134: result: $enable_gnat_projects" >&5
+echo "$as_me:19136: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19144,14 +19146,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19147: checking if ssp library is needed" >&5
+echo "$as_me:19149: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19154 "configure"
+#line 19156 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19168,16 +19170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19174: \$? = $ac_status" >&5
+  echo "$as_me:19176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19180: \$? = $ac_status" >&5
+  echo "$as_me:19182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19187,7 +19189,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19190 "configure"
+#line 19192 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19204,16 +19206,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19210: \$? = $ac_status" >&5
+  echo "$as_me:19212: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19216: \$? = $ac_status" >&5
+  echo "$as_me:19218: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19227,7 +19229,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19230: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19232: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19256,14 +19258,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19259: checking if -lm needed for math functions" >&5
+echo "$as_me:19261: 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 19266 "configure"
+#line 19268 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19279,16 +19281,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19285: \$? = $ac_status" >&5
+  echo "$as_me:19287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19291: \$? = $ac_status" >&5
+  echo "$as_me:19293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19298,7 +19300,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19301: result: $cf_cv_need_libm" >&5
+echo "$as_me:19303: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19306,14 +19308,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19309: checking if -lm is available for math functions" >&5
+	echo "$as_me:19311: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19316 "configure"
+#line 19318 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19329,16 +19331,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19335: \$? = $ac_status" >&5
+  echo "$as_me:19337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19341: \$? = $ac_status" >&5
+  echo "$as_me:19343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19348,7 +19350,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19351: result: $cf_cv_have_libm" >&5
+echo "$as_me:19353: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19370,13 +19372,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19373: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19375: 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 19379 "configure"
+#line 19381 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19392,16 +19394,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19395: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19398: \$? = $ac_status" >&5
+  echo "$as_me:19400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19404: \$? = $ac_status" >&5
+  echo "$as_me:19406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19411,7 +19413,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19414: result: $ac_cv_header_time" >&5
+echo "$as_me:19416: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19426,7 +19428,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19429: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19431: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19434,7 +19436,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19437 "configure"
+#line 19439 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19453,16 +19455,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19459: \$? = $ac_status" >&5
+  echo "$as_me:19461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19465: \$? = $ac_status" >&5
+  echo "$as_me:19467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19473,11 +19475,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19476: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19478: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19480: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19482: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19485,7 +19487,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19488 "configure"
+#line 19490 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19504,16 +19506,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19510: \$? = $ac_status" >&5
+  echo "$as_me:19512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19516: \$? = $ac_status" >&5
+  echo "$as_me:19518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19524,7 +19526,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19527: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19529: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19546,7 +19548,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19549: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19551: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19554,7 +19556,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19557 "configure"
+#line 19559 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19573,16 +19575,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19578: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19579: \$? = $ac_status" >&5
+  echo "$as_me:19581: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19585: \$? = $ac_status" >&5
+  echo "$as_me:19587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19593,7 +19595,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19596: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19598: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19615,7 +19617,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19618: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19620: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19623,7 +19625,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19626 "configure"
+#line 19628 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19642,16 +19644,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19648: \$? = $ac_status" >&5
+  echo "$as_me:19650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19654: \$? = $ac_status" >&5
+  echo "$as_me:19656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19662,7 +19664,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19665: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19667: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19704,7 +19706,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19707: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19709: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19712,7 +19714,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19715 "configure"
+#line 19717 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19731,16 +19733,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19737: \$? = $ac_status" >&5
+  echo "$as_me:19739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19743: \$? = $ac_status" >&5
+  echo "$as_me:19745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19751,7 +19753,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19754: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19756: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19779,13 +19781,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19782: checking for regcomp" >&5
+	echo "$as_me:19784: 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 19788 "configure"
+#line 19790 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19816,16 +19818,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19822: \$? = $ac_status" >&5
+  echo "$as_me:19824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19828: \$? = $ac_status" >&5
+  echo "$as_me:19830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19835,7 +19837,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19838: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19840: 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
@@ -19844,7 +19846,7 @@ else
 		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:19847: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19849: 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
@@ -19852,7 +19854,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19855 "configure"
+#line 19857 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19871,16 +19873,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19877: \$? = $ac_status" >&5
+  echo "$as_me:19879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19883: \$? = $ac_status" >&5
+  echo "$as_me:19885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19891,7 +19893,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19894: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19896: 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
 
@@ -19923,13 +19925,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19926: checking for compile" >&5
+	echo "$as_me:19928: 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 19932 "configure"
+#line 19934 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19960,16 +19962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19966: \$? = $ac_status" >&5
+  echo "$as_me:19968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19972: \$? = $ac_status" >&5
+  echo "$as_me:19974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19979,13 +19981,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19982: result: $ac_cv_func_compile" >&5
+echo "$as_me:19984: 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:19988: checking for compile in -lgen" >&5
+		echo "$as_me:19990: 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
@@ -19993,7 +19995,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19996 "configure"
+#line 19998 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20012,16 +20014,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20018: \$? = $ac_status" >&5
+  echo "$as_me:20020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20024: \$? = $ac_status" >&5
+  echo "$as_me:20026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20032,7 +20034,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20035: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20037: 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
 
@@ -20060,11 +20062,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20063: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20065: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20067: checking for regular-expression headers" >&5
+echo "$as_me:20069: 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
@@ -20076,7 +20078,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20079 "configure"
+#line 20081 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20093,16 +20095,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20099: \$? = $ac_status" >&5
+  echo "$as_me:20101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20105: \$? = $ac_status" >&5
+  echo "$as_me:20107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20119,7 +20121,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20122 "configure"
+#line 20124 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20139,16 +20141,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20145: \$? = $ac_status" >&5
+  echo "$as_me:20147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20151: \$? = $ac_status" >&5
+  echo "$as_me:20153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20164,11 +20166,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20167: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20169: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20171: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20173: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20206,23 +20208,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20209: checking for $ac_header" >&5
+echo "$as_me:20211: 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 20215 "configure"
+#line 20217 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20219: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20225: \$? = $ac_status" >&5
+  echo "$as_me:20227: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20241,7 +20243,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20244: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20246: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20254,23 +20256,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20257: checking for $ac_header" >&5
+echo "$as_me:20259: 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 20263 "configure"
+#line 20265 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20273: \$? = $ac_status" >&5
+  echo "$as_me:20275: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20289,7 +20291,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20299,7 +20301,7 @@ EOF
 fi
 done
 
-echo "$as_me:20302: checking for header declaring getopt variables" >&5
+echo "$as_me:20304: 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
@@ -20309,7 +20311,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20312 "configure"
+#line 20314 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20322,16 +20324,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20328: \$? = $ac_status" >&5
+  echo "$as_me:20330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20334: \$? = $ac_status" >&5
+  echo "$as_me:20336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20343,7 +20345,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20346: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20348: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20360,14 +20362,14 @@ EOF
 
 fi
 
-echo "$as_me:20363: checking if external environ is declared" >&5
+echo "$as_me:20365: 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 20370 "configure"
+#line 20372 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20380,16 +20382,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20386: \$? = $ac_status" >&5
+  echo "$as_me:20388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20392: \$? = $ac_status" >&5
+  echo "$as_me:20394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20400,7 +20402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20403: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20405: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20415,14 +20417,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20418: checking if external environ exists" >&5
+echo "$as_me:20420: 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 20425 "configure"
+#line 20427 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20437,16 +20439,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20443: \$? = $ac_status" >&5
+  echo "$as_me:20445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20449: \$? = $ac_status" >&5
+  echo "$as_me:20451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20457,7 +20459,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20460: result: $cf_cv_have_environ" >&5
+echo "$as_me:20462: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20470,13 +20472,13 @@ EOF
 
 fi
 
-echo "$as_me:20473: checking for getenv" >&5
+echo "$as_me:20475: 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 20479 "configure"
+#line 20481 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20507,16 +20509,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20513: \$? = $ac_status" >&5
+  echo "$as_me:20515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20519: \$? = $ac_status" >&5
+  echo "$as_me:20521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20526,19 +20528,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20529: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20531: 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:20535: checking for $ac_func" >&5
+echo "$as_me:20537: 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 20541 "configure"
+#line 20543 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20569,16 +20571,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20575: \$? = $ac_status" >&5
+  echo "$as_me:20577: \$? = $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:20580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20581: \$? = $ac_status" >&5
+  echo "$as_me:20583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20588,7 +20590,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20591: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20593: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20598,7 +20600,7 @@ EOF
 fi
 done
 
-echo "$as_me:20601: checking if getenv returns consistent values" >&5
+echo "$as_me:20603: 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
@@ -20608,7 +20610,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20611 "configure"
+#line 20613 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20713,15 +20715,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20718: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20719: \$? = $ac_status" >&5
+  echo "$as_me:20721: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20724: \$? = $ac_status" >&5
+  echo "$as_me:20726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20734,7 +20736,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20737: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20739: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20749,18 +20751,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20752: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20754: 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
 
-echo "$as_me:20756: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20758: 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 20763 "configure"
+#line 20765 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20780,16 +20782,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20786: \$? = $ac_status" >&5
+  echo "$as_me:20788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20792: \$? = $ac_status" >&5
+  echo "$as_me:20794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20801,7 +20803,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20804: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20806: 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
@@ -20816,13 +20818,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20819: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20821: 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 20825 "configure"
+#line 20827 "configure"
 #include "confdefs.h"
 
 int
@@ -20880,16 +20882,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20886: \$? = $ac_status" >&5
+  echo "$as_me:20888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20892: \$? = $ac_status" >&5
+  echo "$as_me:20894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20899,7 +20901,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20902: result: $ac_cv_c_const" >&5
+echo "$as_me:20904: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20909,7 +20911,7 @@ EOF
 
 fi
 
-echo "$as_me:20912: checking for inline" >&5
+echo "$as_me:20914: 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
@@ -20917,7 +20919,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20920 "configure"
+#line 20922 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20926,16 +20928,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20932: \$? = $ac_status" >&5
+  echo "$as_me:20934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20938: \$? = $ac_status" >&5
+  echo "$as_me:20940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20946,7 +20948,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20949: result: $ac_cv_c_inline" >&5
+echo "$as_me:20951: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20972,7 +20974,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20975: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20977: 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
@@ -20981,7 +20983,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20984 "configure"
+#line 20986 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20993,16 +20995,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20999: \$? = $ac_status" >&5
+  echo "$as_me:21001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21005: \$? = $ac_status" >&5
+  echo "$as_me:21007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21014,7 +21016,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21017: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21019: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21120,7 +21122,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21123: checking for signal global datatype" >&5
+echo "$as_me:21125: 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
@@ -21132,7 +21134,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21135 "configure"
+#line 21137 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21156,16 +21158,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21162: \$? = $ac_status" >&5
+  echo "$as_me:21164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21168: \$? = $ac_status" >&5
+  echo "$as_me:21170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21179,7 +21181,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21182: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21184: 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 <<EOF
@@ -21188,7 +21190,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21191: checking for type of chtype" >&5
+echo "$as_me:21193: 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
@@ -21198,7 +21200,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21201 "configure"
+#line 21203 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21233,15 +21235,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21239: \$? = $ac_status" >&5
+  echo "$as_me:21241: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21244: \$? = $ac_status" >&5
+  echo "$as_me:21246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21256,7 +21258,7 @@ fi
 
 fi
 
-echo "$as_me:21259: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21261: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21268,14 +21270,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21271: checking if unsigned literals are legal" >&5
+echo "$as_me:21273: 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 21278 "configure"
+#line 21280 "configure"
 #include "confdefs.h"
 
 int
@@ -21287,16 +21289,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21293: \$? = $ac_status" >&5
+  echo "$as_me:21295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21299: \$? = $ac_status" >&5
+  echo "$as_me:21301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21308,7 +21310,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21311: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21313: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21324,14 +21326,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21327: checking if external errno is declared" >&5
+echo "$as_me:21329: 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 21334 "configure"
+#line 21336 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21345,16 +21347,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21351: \$? = $ac_status" >&5
+  echo "$as_me:21353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21357: \$? = $ac_status" >&5
+  echo "$as_me:21359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21365,7 +21367,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21368: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21370: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21380,14 +21382,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21383: checking if external errno exists" >&5
+echo "$as_me:21385: 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 21390 "configure"
+#line 21392 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21402,16 +21404,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21408: \$? = $ac_status" >&5
+  echo "$as_me:21410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21414: \$? = $ac_status" >&5
+  echo "$as_me:21416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21422,7 +21424,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21425: result: $cf_cv_have_errno" >&5
+echo "$as_me:21427: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21435,7 +21437,7 @@ EOF
 
 fi
 
-echo "$as_me:21438: checking if data-only library module links" >&5
+echo "$as_me:21440: 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
@@ -21443,20 +21445,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21446 "configure"
+#line 21448 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21449: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21452: \$? = $ac_status" >&5
+  echo "$as_me:21454: \$? = $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 <<EOF
-#line 21459 "configure"
+#line 21461 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21469,10 +21471,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21472: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21475: \$? = $ac_status" >&5
+  echo "$as_me:21477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21485,7 +21487,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21488 "configure"
+#line 21490 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21496,15 +21498,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21502: \$? = $ac_status" >&5
+  echo "$as_me:21504: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21507: \$? = $ac_status" >&5
+  echo "$as_me:21509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21519,7 +21521,7 @@ fi
 
 fi
 
-echo "$as_me:21522: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21524: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21533,14 +21535,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21536: checking for clock_gettime" >&5
+echo "$as_me:21538: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21543 "configure"
+#line 21545 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21553,16 +21555,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21559: \$? = $ac_status" >&5
+  echo "$as_me:21561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21565: \$? = $ac_status" >&5
+  echo "$as_me:21567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21573,7 +21575,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21576: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21578: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21584,13 +21586,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21587: checking for gettimeofday" >&5
+echo "$as_me:21589: 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 21593 "configure"
+#line 21595 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21621,16 +21623,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21627: \$? = $ac_status" >&5
+  echo "$as_me:21629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21633: \$? = $ac_status" >&5
+  echo "$as_me:21635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21640,7 +21642,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21643: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21645: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21650,7 +21652,7 @@ EOF
 
 else
 
-echo "$as_me:21653: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21655: 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
@@ -21658,7 +21660,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21661 "configure"
+#line 21663 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21677,16 +21679,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21683: \$? = $ac_status" >&5
+  echo "$as_me:21685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21689: \$? = $ac_status" >&5
+  echo "$as_me:21691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21697,7 +21699,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21700: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21702: 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
 
@@ -21758,13 +21760,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21761: checking for $ac_func" >&5
+echo "$as_me:21763: 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 21767 "configure"
+#line 21769 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21795,16 +21797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21801: \$? = $ac_status" >&5
+  echo "$as_me:21803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21807: \$? = $ac_status" >&5
+  echo "$as_me:21809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21814,7 +21816,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21817: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21819: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21824,14 +21826,14 @@ EOF
 fi
 done
 
-echo "$as_me:21827: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21829: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21834 "configure"
+#line 21836 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21846,16 +21848,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21852: \$? = $ac_status" >&5
+  echo "$as_me:21854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21858: \$? = $ac_status" >&5
+  echo "$as_me:21860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21865,7 +21867,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21868: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21870: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21887,7 +21889,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21890: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21892: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21897,7 +21899,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21900 "configure"
+#line 21902 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21910,15 +21912,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21916: \$? = $ac_status" >&5
+  echo "$as_me:21918: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21921: \$? = $ac_status" >&5
+  echo "$as_me:21923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21930,7 +21932,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21933: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21935: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21942,14 +21944,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21945: checking for getttynam" >&5
+	echo "$as_me:21947: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21952 "configure"
+#line 21954 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21961,16 +21963,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21967: \$? = $ac_status" >&5
+  echo "$as_me:21969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21973: \$? = $ac_status" >&5
+  echo "$as_me:21975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21980,7 +21982,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21983: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21985: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21990,7 +21992,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21993: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21995: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21999,7 +22001,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22002: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22004: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22012,14 +22014,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22015: checking for terminal-capability database functions" >&5
+echo "$as_me:22017: 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 22022 "configure"
+#line 22024 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22039,16 +22041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22059,7 +22061,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22062: result: $cf_cv_cgetent" >&5
+echo "$as_me:22064: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22069,14 +22071,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22072: checking if cgetent uses const parameter" >&5
+echo "$as_me:22074: 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 22079 "configure"
+#line 22081 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22099,16 +22101,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22105: \$? = $ac_status" >&5
+  echo "$as_me:22107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22111: \$? = $ac_status" >&5
+  echo "$as_me:22113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22119,7 +22121,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22122: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22124: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22133,14 +22135,14 @@ fi
 
 fi
 
-echo "$as_me:22136: checking for isascii" >&5
+echo "$as_me:22138: 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 22143 "configure"
+#line 22145 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22152,16 +22154,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22155: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22158: \$? = $ac_status" >&5
+  echo "$as_me:22160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22164: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22172,7 +22174,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22175: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22177: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22180,10 +22182,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22183: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22185: 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 22186 "configure"
+#line 22188 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22197,16 +22199,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22203: \$? = $ac_status" >&5
+  echo "$as_me:22205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22209: \$? = $ac_status" >&5
+  echo "$as_me:22211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22214,7 +22216,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22217 "configure"
+#line 22219 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22229,16 +22231,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22235: \$? = $ac_status" >&5
+  echo "$as_me:22237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22241: \$? = $ac_status" >&5
+  echo "$as_me:22243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22254,11 +22256,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22257: result: $sigact_bad" >&5
+echo "$as_me:22259: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22261: checking if nanosleep really works" >&5
+echo "$as_me:22263: 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
@@ -22268,7 +22270,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22271 "configure"
+#line 22273 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22294,15 +22296,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22300: \$? = $ac_status" >&5
+  echo "$as_me:22302: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22305: \$? = $ac_status" >&5
+  echo "$as_me:22307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22314,7 +22316,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22317: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22319: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22331,23 +22333,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22334: checking for $ac_header" >&5
+echo "$as_me:22336: 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 22340 "configure"
+#line 22342 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22344: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22350: \$? = $ac_status" >&5
+  echo "$as_me:22352: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22366,7 +22368,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22369: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22371: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22383,10 +22385,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22386: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22388: 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 22389 "configure"
+#line 22391 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22398,16 +22400,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22404: \$? = $ac_status" >&5
+  echo "$as_me:22406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22410: \$? = $ac_status" >&5
+  echo "$as_me:22412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22415,7 +22417,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22418 "configure"
+#line 22420 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22429,16 +22431,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22435: \$? = $ac_status" >&5
+  echo "$as_me:22437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22441: \$? = $ac_status" >&5
+  echo "$as_me:22443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22454,19 +22456,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22457: result: $termios_bad" >&5
+	echo "$as_me:22459: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22462: checking for tcgetattr" >&5
+echo "$as_me:22464: 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 22469 "configure"
+#line 22471 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22494,16 +22496,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22500: \$? = $ac_status" >&5
+  echo "$as_me:22502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22506: \$? = $ac_status" >&5
+  echo "$as_me:22508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22513,21 +22515,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22516: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22518: 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:22523: checking for vsscanf function or workaround" >&5
+echo "$as_me:22525: 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 22530 "configure"
+#line 22532 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22543,16 +22545,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22549: \$? = $ac_status" >&5
+  echo "$as_me:22551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22555: \$? = $ac_status" >&5
+  echo "$as_me:22557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22560,7 +22562,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22563 "configure"
+#line 22565 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22582,16 +22584,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22588: \$? = $ac_status" >&5
+  echo "$as_me:22590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22594: \$? = $ac_status" >&5
+  echo "$as_me:22596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22599,7 +22601,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22602 "configure"
+#line 22604 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22621,16 +22623,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22627: \$? = $ac_status" >&5
+  echo "$as_me:22629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22633: \$? = $ac_status" >&5
+  echo "$as_me:22635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22645,7 +22647,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22648: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22650: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22671,23 +22673,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22674: checking for $ac_header" >&5
+echo "$as_me:22676: 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 22680 "configure"
+#line 22682 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22684: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22686: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22690: \$? = $ac_status" >&5
+  echo "$as_me:22692: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22706,7 +22708,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22709: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22711: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22716,7 +22718,7 @@ EOF
 fi
 done
 
-echo "$as_me:22719: checking for working mkstemp" >&5
+echo "$as_me:22721: 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
@@ -22727,7 +22729,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22730 "configure"
+#line 22732 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22762,15 +22764,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22768: \$? = $ac_status" >&5
+  echo "$as_me:22770: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22773: \$? = $ac_status" >&5
+  echo "$as_me:22775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22785,16 +22787,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22788: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22790: 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:22791: checking for mkstemp" >&5
+	echo "$as_me:22793: 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 22797 "configure"
+#line 22799 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22825,16 +22827,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22831: \$? = $ac_status" >&5
+  echo "$as_me:22833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22837: \$? = $ac_status" >&5
+  echo "$as_me:22839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22844,7 +22846,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22847: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22849: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22865,21 +22867,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22868: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22870: 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:22871: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22873: 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:22877: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22879: 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 22882 "configure"
+#line 22884 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22896,15 +22898,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22902: \$? = $ac_status" >&5
+  echo "$as_me:22904: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22907: \$? = $ac_status" >&5
+  echo "$as_me:22909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22917,7 +22919,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22920: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22922: 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
 
@@ -22928,13 +22930,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22931: checking for intptr_t" >&5
+echo "$as_me:22933: 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 22937 "configure"
+#line 22939 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22949,16 +22951,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22955: \$? = $ac_status" >&5
+  echo "$as_me:22957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22961: \$? = $ac_status" >&5
+  echo "$as_me:22963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22968,7 +22970,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22971: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22973: 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
   :
@@ -22980,13 +22982,13 @@ EOF
 
 fi
 
-echo "$as_me:22983: checking for ssize_t" >&5
+echo "$as_me:22985: 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 22989 "configure"
+#line 22991 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23001,16 +23003,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23007: \$? = $ac_status" >&5
+  echo "$as_me:23009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23013: \$? = $ac_status" >&5
+  echo "$as_me:23015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23020,7 +23022,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23023: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23025: 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
   :
@@ -23032,14 +23034,14 @@ EOF
 
 fi
 
-echo "$as_me:23035: checking for type sigaction_t" >&5
+echo "$as_me:23037: 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 23042 "configure"
+#line 23044 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23052,16 +23054,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23058: \$? = $ac_status" >&5
+  echo "$as_me:23060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23064: \$? = $ac_status" >&5
+  echo "$as_me:23066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23072,14 +23074,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23075: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23077: 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:23082: checking declaration of size-change" >&5
+echo "$as_me:23084: 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
@@ -23100,7 +23102,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23103 "configure"
+#line 23105 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23150,16 +23152,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23156: \$? = $ac_status" >&5
+  echo "$as_me:23158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23162: \$? = $ac_status" >&5
+  echo "$as_me:23164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23178,7 +23180,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23181: result: $cf_cv_sizechange" >&5
+echo "$as_me:23183: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23196,13 +23198,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23199: checking for memmove" >&5
+echo "$as_me:23201: 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 23205 "configure"
+#line 23207 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23233,16 +23235,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23239: \$? = $ac_status" >&5
+  echo "$as_me:23241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23245: \$? = $ac_status" >&5
+  echo "$as_me:23247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23252,19 +23254,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23255: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23257: 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:23261: checking for bcopy" >&5
+echo "$as_me:23263: 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 23267 "configure"
+#line 23269 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23295,16 +23297,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23301: \$? = $ac_status" >&5
+  echo "$as_me:23303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23307: \$? = $ac_status" >&5
+  echo "$as_me:23309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23314,11 +23316,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23317: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23319: 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:23321: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23323: 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
@@ -23328,7 +23330,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23331 "configure"
+#line 23333 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23344,15 +23346,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23350: \$? = $ac_status" >&5
+  echo "$as_me:23352: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23355: \$? = $ac_status" >&5
+  echo "$as_me:23357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23365,7 +23367,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23368: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23370: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23392,13 +23394,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23395: checking for $ac_func" >&5
+echo "$as_me:23397: 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 23401 "configure"
+#line 23403 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23429,16 +23431,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23435: \$? = $ac_status" >&5
+  echo "$as_me:23437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23441: \$? = $ac_status" >&5
+  echo "$as_me:23443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23448,7 +23450,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23451: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23453: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23458,7 +23460,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23461: checking if poll really works" >&5
+echo "$as_me:23463: 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
@@ -23468,7 +23470,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23471 "configure"
+#line 23473 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23521,15 +23523,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23527: \$? = $ac_status" >&5
+  echo "$as_me:23529: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23532: \$? = $ac_status" >&5
+  echo "$as_me:23534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23541,21 +23543,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23544: result: $cf_cv_working_poll" >&5
+echo "$as_me:23546: 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:23551: checking for va_copy" >&5
+echo "$as_me:23553: 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 23558 "configure"
+#line 23560 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23572,16 +23574,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23578: \$? = $ac_status" >&5
+  echo "$as_me:23580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23584: \$? = $ac_status" >&5
+  echo "$as_me:23586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23591,7 +23593,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23594: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23596: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23603,14 +23605,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23606: checking for __va_copy" >&5
+echo "$as_me:23608: 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 23613 "configure"
+#line 23615 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23627,16 +23629,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23633: \$? = $ac_status" >&5
+  echo "$as_me:23635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23639: \$? = $ac_status" >&5
+  echo "$as_me:23641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23646,7 +23648,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23649: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23651: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23658,14 +23660,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23661: checking for __builtin_va_copy" >&5
+echo "$as_me:23663: 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 23668 "configure"
+#line 23670 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23682,16 +23684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23688: \$? = $ac_status" >&5
+  echo "$as_me:23690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23694: \$? = $ac_status" >&5
+  echo "$as_me:23696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23701,7 +23703,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23704: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23706: 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 &&
@@ -23719,14 +23721,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23722: checking if we can simply copy va_list" >&5
+	echo "$as_me:23724: 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 23729 "configure"
+#line 23731 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23743,16 +23745,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23749: \$? = $ac_status" >&5
+  echo "$as_me:23751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23755: \$? = $ac_status" >&5
+  echo "$as_me:23757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23762,19 +23764,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23765: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23767: 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:23770: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23772: 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 23777 "configure"
+#line 23779 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23791,16 +23793,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23797: \$? = $ac_status" >&5
+  echo "$as_me:23799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23803: \$? = $ac_status" >&5
+  echo "$as_me:23805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23810,7 +23812,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23813: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23815: 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
@@ -23821,13 +23823,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23824: checking for pid_t" >&5
+echo "$as_me:23826: 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 23830 "configure"
+#line 23832 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23842,16 +23844,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23848: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23854: \$? = $ac_status" >&5
+  echo "$as_me:23856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23861,7 +23863,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23864: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23866: 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
   :
@@ -23876,23 +23878,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23879: checking for $ac_header" >&5
+echo "$as_me:23881: 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 23885 "configure"
+#line 23887 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23889: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23895: \$? = $ac_status" >&5
+  echo "$as_me:23897: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23911,7 +23913,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23916: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23924,13 +23926,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23927: checking for $ac_func" >&5
+echo "$as_me:23929: 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 23933 "configure"
+#line 23935 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23961,16 +23963,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23967: \$? = $ac_status" >&5
+  echo "$as_me:23969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23973: \$? = $ac_status" >&5
+  echo "$as_me:23975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23980,7 +23982,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23983: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23985: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23992,7 +23994,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23995: checking for working fork" >&5
+  echo "$as_me:23997: 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
@@ -24015,15 +24017,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24021: \$? = $ac_status" >&5
+  echo "$as_me:24023: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24026: \$? = $ac_status" >&5
+  echo "$as_me:24028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24035,7 +24037,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24038: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24040: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24049,12 +24051,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24052: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24054: 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:24057: checking for working vfork" >&5
+  echo "$as_me:24059: 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
@@ -24063,7 +24065,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24066 "configure"
+#line 24068 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24156,15 +24158,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24164: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24167: \$? = $ac_status" >&5
+  echo "$as_me:24169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24176,13 +24178,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24179: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24181: 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:24185: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24187: 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
 
@@ -24207,7 +24209,7 @@ EOF
 
 fi
 
-echo "$as_me:24210: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24212: 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
@@ -24217,7 +24219,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24220 "configure"
+#line 24222 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24252,15 +24254,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24258: \$? = $ac_status" >&5
+  echo "$as_me:24260: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24263: \$? = $ac_status" >&5
+  echo "$as_me:24265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24273,7 +24275,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24276: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24278: 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
@@ -24282,7 +24284,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24285: checking for openpty in -lutil" >&5
+echo "$as_me:24287: 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
@@ -24290,7 +24292,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24293 "configure"
+#line 24295 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24309,16 +24311,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24315: \$? = $ac_status" >&5
+  echo "$as_me:24317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24321: \$? = $ac_status" >&5
+  echo "$as_me:24323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24329,7 +24331,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24332: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24334: 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
@@ -24337,7 +24339,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24340: checking for openpty header" >&5
+echo "$as_me:24342: 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
@@ -24364,7 +24366,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24367 "configure"
+#line 24369 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24381,16 +24383,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24387: \$? = $ac_status" >&5
+  echo "$as_me:24389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24393: \$? = $ac_status" >&5
+  echo "$as_me:24395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24408,7 +24410,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24411: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24413: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24481,7 +24483,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24484 "configure"
+#line 24486 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24493,16 +24495,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24499: \$? = $ac_status" >&5
+  echo "$as_me:24501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24505: \$? = $ac_status" >&5
+  echo "$as_me:24507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24519,7 +24521,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24522: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24524: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24555,7 +24557,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24558: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24560: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24566,7 +24568,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24569: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24571: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24638,7 +24640,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24641 "configure"
+#line 24643 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24650,16 +24652,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24655: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24656: \$? = $ac_status" >&5
+  echo "$as_me:24658: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24662: \$? = $ac_status" >&5
+  echo "$as_me:24664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24676,7 +24678,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24679: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24681: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24756,7 +24758,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24759: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24761: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24773,23 +24775,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24776: checking for db.h" >&5
+echo "$as_me:24778: 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 24782 "configure"
+#line 24784 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24786: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24788: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24792: \$? = $ac_status" >&5
+  echo "$as_me:24794: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24808,11 +24810,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24811: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24813: 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:24815: checking for version of db" >&5
+echo "$as_me:24817: 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
@@ -24823,10 +24825,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24826: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24828: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24829 "configure"
+#line 24831 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24856,16 +24858,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24862: \$? = $ac_status" >&5
+  echo "$as_me:24864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24868: \$? = $ac_status" >&5
+  echo "$as_me:24870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24879,16 +24881,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24882: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24884: 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:24886: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24888: 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:24891: checking for db libraries" >&5
+echo "$as_me:24893: 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
@@ -24918,10 +24920,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24921: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24923: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24924 "configure"
+#line 24926 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24976,16 +24978,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24982: \$? = $ac_status" >&5
+  echo "$as_me:24984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24988: \$? = $ac_status" >&5
+  echo "$as_me:24990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25005,11 +25007,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25008: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25010: 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:25012: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25014: 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
@@ -25035,7 +25037,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25038: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25040: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25050,7 +25052,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25053: checking if we should include stdbool.h" >&5
+echo "$as_me:25055: 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
@@ -25058,7 +25060,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25061 "configure"
+#line 25063 "configure"
 #include "confdefs.h"
 
 int
@@ -25070,23 +25072,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25076: \$? = $ac_status" >&5
+  echo "$as_me:25078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25082: \$? = $ac_status" >&5
+  echo "$as_me:25084: \$? = $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 25089 "configure"
+#line 25091 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25102,16 +25104,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25108: \$? = $ac_status" >&5
+  echo "$as_me:25110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25114: \$? = $ac_status" >&5
+  echo "$as_me:25116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25125,13 +25127,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25128: result: yes" >&5
+then	echo "$as_me:25130: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25130: result: no" >&5
+else	echo "$as_me:25132: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25134: checking for builtin bool type" >&5
+echo "$as_me:25136: 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
@@ -25139,7 +25141,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25142 "configure"
+#line 25144 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25154,16 +25156,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25157: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25160: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25166: \$? = $ac_status" >&5
+  echo "$as_me:25168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25176,9 +25178,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25179: result: yes" >&5
+then	echo "$as_me:25181: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25181: result: no" >&5
+else	echo "$as_me:25183: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25195,10 +25197,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25198: checking if we already have C++ library" >&5
+	echo "$as_me:25200: 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 25201 "configure"
+#line 25203 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25212,16 +25214,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25218: \$? = $ac_status" >&5
+  echo "$as_me:25220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25224: \$? = $ac_status" >&5
+  echo "$as_me:25226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25230,7 +25232,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25233: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25235: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25249,7 +25251,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25252: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25254: 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
@@ -25275,7 +25277,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25278 "configure"
+#line 25280 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25289,16 +25291,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25295: \$? = $ac_status" >&5
+  echo "$as_me:25297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25301: \$? = $ac_status" >&5
+  echo "$as_me:25303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25310,7 +25312,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25313: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25315: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25332,7 +25334,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25335: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25337: 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
@@ -25347,15 +25349,15 @@ CF_EOF
 # 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:25350: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25353: \$? = $ac_status" >&5
+  echo "$as_me:25355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25355: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25358: \$? = $ac_status" >&5
+  echo "$as_me:25360: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25366,10 +25368,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25369: result: yes" >&5
+  echo "$as_me:25371: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25372: result: no" >&5
+  echo "$as_me:25374: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25389,7 +25391,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25392: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25394: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25410,7 +25412,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25413 "configure"
+#line 25415 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25424,16 +25426,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25430: \$? = $ac_status" >&5
+  echo "$as_me:25432: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25436: \$? = $ac_status" >&5
+  echo "$as_me:25438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25470,7 +25472,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25473 "configure"
+#line 25475 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25484,16 +25486,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25490: \$? = $ac_status" >&5
+  echo "$as_me:25492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25496: \$? = $ac_status" >&5
+  echo "$as_me:25498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25526,7 +25528,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25529: result: $cf_cxx_library" >&5
+	echo "$as_me:25531: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25542,7 +25544,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25545: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25547: 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
@@ -25559,18 +25561,18 @@ do
   # 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 25562 "configure"
+#line 25564 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25569: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25573: \$? = $ac_status" >&5
+  echo "$as_me:25575: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25593,17 +25595,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25596 "configure"
+#line 25598 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25600: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25602: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25606: \$? = $ac_status" >&5
+  echo "$as_me:25608: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25640,7 +25642,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25643: result: $CXXCPP" >&5
+echo "$as_me:25645: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25650,18 +25652,18 @@ do
   # 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 25653 "configure"
+#line 25655 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25660: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25664: \$? = $ac_status" >&5
+  echo "$as_me:25666: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25684,17 +25686,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25687 "configure"
+#line 25689 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25691: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25693: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25697: \$? = $ac_status" >&5
+  echo "$as_me:25699: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25722,7 +25724,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25725: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25727: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25737,23 +25739,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25740: checking for $ac_header" >&5
+echo "$as_me:25742: 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 25746 "configure"
+#line 25748 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25750: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25752: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25756: \$? = $ac_status" >&5
+  echo "$as_me:25758: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25772,7 +25774,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25775: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25777: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25785,23 +25787,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25788: checking for $ac_header" >&5
+echo "$as_me:25790: 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 25794 "configure"
+#line 25796 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25804: \$? = $ac_status" >&5
+  echo "$as_me:25806: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25820,7 +25822,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25823: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25831,10 +25833,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25834: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25836: 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 25837 "configure"
+#line 25839 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25851,16 +25853,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25857: \$? = $ac_status" >&5
+  echo "$as_me:25859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25863: \$? = $ac_status" >&5
+  echo "$as_me:25865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25869,7 +25871,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25872: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25874: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25880,7 +25882,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25883: checking if we should include stdbool.h" >&5
+echo "$as_me:25885: 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
@@ -25888,7 +25890,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25891 "configure"
+#line 25893 "configure"
 #include "confdefs.h"
 
 int
@@ -25900,23 +25902,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25906: \$? = $ac_status" >&5
+  echo "$as_me:25908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25912: \$? = $ac_status" >&5
+  echo "$as_me:25914: \$? = $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 25919 "configure"
+#line 25921 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25932,16 +25934,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25938: \$? = $ac_status" >&5
+  echo "$as_me:25940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25944: \$? = $ac_status" >&5
+  echo "$as_me:25946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25955,13 +25957,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25958: result: yes" >&5
+then	echo "$as_me:25960: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25960: result: no" >&5
+else	echo "$as_me:25962: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25964: checking for builtin bool type" >&5
+echo "$as_me:25966: 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
@@ -25969,7 +25971,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25972 "configure"
+#line 25974 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25984,16 +25986,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25990: \$? = $ac_status" >&5
+  echo "$as_me:25992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25996: \$? = $ac_status" >&5
+  echo "$as_me:25998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26006,19 +26008,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26009: result: yes" >&5
+then	echo "$as_me:26011: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26011: result: no" >&5
+else	echo "$as_me:26013: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26015: checking for bool" >&5
+echo "$as_me:26017: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26021 "configure"
+#line 26023 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26053,16 +26055,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26059: \$? = $ac_status" >&5
+  echo "$as_me:26061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26065: \$? = $ac_status" >&5
+  echo "$as_me:26067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26072,10 +26074,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26075: result: $ac_cv_type_bool" >&5
+echo "$as_me:26077: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26078: checking size of bool" >&5
+echo "$as_me:26080: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26084,7 +26086,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26087 "configure"
+#line 26089 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26116,21 +26118,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26122: \$? = $ac_status" >&5
+  echo "$as_me:26124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26128: \$? = $ac_status" >&5
+  echo "$as_me:26130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26133 "configure"
+#line 26135 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26162,16 +26164,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26168: \$? = $ac_status" >&5
+  echo "$as_me:26170: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26174: \$? = $ac_status" >&5
+  echo "$as_me:26176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26187,7 +26189,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26190 "configure"
+#line 26192 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26219,16 +26221,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26225: \$? = $ac_status" >&5
+  echo "$as_me:26227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26231: \$? = $ac_status" >&5
+  echo "$as_me:26233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26244,7 +26246,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26247 "configure"
+#line 26249 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26276,16 +26278,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26282: \$? = $ac_status" >&5
+  echo "$as_me:26284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26288: \$? = $ac_status" >&5
+  echo "$as_me:26290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26298,12 +26300,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26301: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26303: 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 26306 "configure"
+#line 26308 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26339,15 +26341,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26345: \$? = $ac_status" >&5
+  echo "$as_me:26347: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26350: \$? = $ac_status" >&5
+  echo "$as_me:26352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26363,13 +26365,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26366: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26368: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26372: checking for type of bool" >&5
+echo "$as_me:26374: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26388,7 +26390,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26391 "configure"
+#line 26393 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26429,15 +26431,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26435: \$? = $ac_status" >&5
+  echo "$as_me:26437: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26440: \$? = $ac_status" >&5
+  echo "$as_me:26442: \$? = $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
@@ -26454,19 +26456,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26457: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26459: 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:26464: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26466: 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:26469: checking for special defines needed for etip.h" >&5
+echo "$as_me:26471: 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"
@@ -26484,7 +26486,7 @@ do
 	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 26487 "configure"
+#line 26489 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26498,16 +26500,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26504: \$? = $ac_status" >&5
+  echo "$as_me:26506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26510: \$? = $ac_status" >&5
+  echo "$as_me:26512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26528,12 +26530,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26531: result: $cf_result" >&5
+echo "$as_me:26533: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26536: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26538: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26550,7 +26552,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26553 "configure"
+#line 26555 "configure"
 #include "confdefs.h"
 
 class base
@@ -26569,15 +26571,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26575: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26580: \$? = $ac_status" >&5
+  echo "$as_me:26582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26596,7 +26598,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26599: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26601: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26605,7 +26607,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26608: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26610: 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
@@ -26622,7 +26624,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26625 "configure"
+#line 26627 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26641,15 +26643,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26647: \$? = $ac_status" >&5
+  echo "$as_me:26649: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26668,7 +26670,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26671: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26673: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26678,7 +26680,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26681: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26683: 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
@@ -26692,7 +26694,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26695 "configure"
+#line 26697 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26736,16 +26738,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26742: \$? = $ac_status" >&5
+  echo "$as_me:26744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26748: \$? = $ac_status" >&5
+  echo "$as_me:26750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26763,7 +26765,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26766: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26768: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26812,13 +26814,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26815: checking for bool" >&5
+echo "$as_me:26817: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26821 "configure"
+#line 26823 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26853,16 +26855,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26859: \$? = $ac_status" >&5
+  echo "$as_me:26861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26865: \$? = $ac_status" >&5
+  echo "$as_me:26867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26872,10 +26874,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26875: result: $ac_cv_type_bool" >&5
+echo "$as_me:26877: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26878: checking size of bool" >&5
+echo "$as_me:26880: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26884,7 +26886,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26887 "configure"
+#line 26889 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26916,21 +26918,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26922: \$? = $ac_status" >&5
+  echo "$as_me:26924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26928: \$? = $ac_status" >&5
+  echo "$as_me:26930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26933 "configure"
+#line 26935 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26962,16 +26964,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26965: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26968: \$? = $ac_status" >&5
+  echo "$as_me:26970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26974: \$? = $ac_status" >&5
+  echo "$as_me:26976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26987,7 +26989,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26990 "configure"
+#line 26992 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27019,16 +27021,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27025: \$? = $ac_status" >&5
+  echo "$as_me:27027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27031: \$? = $ac_status" >&5
+  echo "$as_me:27033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27044,7 +27046,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27047 "configure"
+#line 27049 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27076,16 +27078,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27082: \$? = $ac_status" >&5
+  echo "$as_me:27084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27088: \$? = $ac_status" >&5
+  echo "$as_me:27090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27098,12 +27100,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27101: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27103: 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 27106 "configure"
+#line 27108 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27139,15 +27141,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27145: \$? = $ac_status" >&5
+  echo "$as_me:27147: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27150: \$? = $ac_status" >&5
+  echo "$as_me:27152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27163,13 +27165,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27166: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27168: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27172: checking for type of bool" >&5
+echo "$as_me:27174: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27188,7 +27190,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27191 "configure"
+#line 27193 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27229,15 +27231,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27235: \$? = $ac_status" >&5
+  echo "$as_me:27237: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27240: \$? = $ac_status" >&5
+  echo "$as_me:27242: \$? = $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
@@ -27254,26 +27256,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27257: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27259: 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:27264: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27266: 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:27270: checking for fallback type of bool" >&5
+			echo "$as_me:27272: 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:27276: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27278: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27302,7 +27304,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27305: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27307: 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
@@ -27319,7 +27321,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27322: checking for $ac_word" >&5
+echo "$as_me:27324: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27336,7 +27338,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27339: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27341: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27348,10 +27350,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27351: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27353: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27354: result: no" >&5
+  echo "$as_me:27356: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27361,7 +27363,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27364: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27366: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27372,7 +27374,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27375: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27377: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27401,7 +27403,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27404: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27406: 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
@@ -27420,10 +27422,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27423: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27425: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27426: result: missing" >&5
+					echo "$as_me:27428: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27436,7 +27438,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27439: checking for gnat version" >&5
+echo "$as_me:27441: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27447,7 +27449,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27450: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27452: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27456,7 +27458,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27459: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27461: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27464,7 +27466,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27467: checking for $ac_word" >&5
+echo "$as_me:27469: 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
@@ -27479,7 +27481,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27482: found $ac_dir/$ac_word" >&5
+echo "$as_me:27484: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27488,20 +27490,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27491: result: $M4_exists" >&5
+  echo "$as_me:27493: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27494: result: no" >&5
+  echo "$as_me:27496: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27500: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27502: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27504: checking if GNAT works" >&5
+			echo "$as_me:27506: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27529,7 +27531,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27532: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27534: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27541,7 +27543,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27544: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27546: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27558,10 +27560,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27561: result: $ADAFLAGS" >&5
+	echo "$as_me:27563: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27564: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27566: 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
@@ -27571,11 +27573,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27574: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27576: 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:27578: checking if GNAT supports generics" >&5
+echo "$as_me:27580: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27585,7 +27587,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27588: result: $cf_gnat_generics" >&5
+echo "$as_me:27590: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27597,7 +27599,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27600: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27602: 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
@@ -27645,7 +27647,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27648: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27650: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27658,7 +27660,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27661: checking if GNAT supports project files" >&5
+echo "$as_me:27663: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27721,15 +27723,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27724: result: $cf_gnat_projects" >&5
+echo "$as_me:27726: 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:27730: checking if GNAT supports libraries" >&5
+	echo "$as_me:27732: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27732: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27734: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27749,7 +27751,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27752: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27754: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27761,7 +27763,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27764: checking for ada-compiler" >&5
+echo "$as_me:27766: 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.
@@ -27772,12 +27774,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27775: result: $cf_ada_compiler" >&5
+echo "$as_me:27777: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27780: checking for ada-include" >&5
+echo "$as_me:27782: 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.
@@ -27813,7 +27815,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27816: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27818: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27822,10 +27824,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27825: result: $ADA_INCLUDE" >&5
+echo "$as_me:27827: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27828: checking for ada-objects" >&5
+echo "$as_me:27830: 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.
@@ -27861,7 +27863,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27864: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27866: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27870,10 +27872,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27873: result: $ADA_OBJECTS" >&5
+echo "$as_me:27875: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27876: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27878: 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.
@@ -27883,14 +27885,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27886: result: $with_ada_sharedlib" >&5
+echo "$as_me:27888: 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:27893: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:27895: 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
@@ -27910,7 +27912,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27913: checking for ada-libname" >&5
+echo "$as_me:27915: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27926,7 +27928,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27929: result: $ADA_LIBNAME" >&5
+echo "$as_me:27931: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27937,13 +27939,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27940: checking for wchar_t" >&5
+	echo "$as_me:27942: 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 27946 "configure"
+#line 27948 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27958,16 +27960,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27964: \$? = $ac_status" >&5
+  echo "$as_me:27966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27970: \$? = $ac_status" >&5
+  echo "$as_me:27972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27977,10 +27979,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27980: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27982: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27983: checking size of wchar_t" >&5
+echo "$as_me:27985: 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
@@ -27989,7 +27991,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27992 "configure"
+#line 27994 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28001,21 +28003,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28007: \$? = $ac_status" >&5
+  echo "$as_me:28009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28013: \$? = $ac_status" >&5
+  echo "$as_me:28015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28018 "configure"
+#line 28020 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28027,16 +28029,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28033: \$? = $ac_status" >&5
+  echo "$as_me:28035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28039: \$? = $ac_status" >&5
+  echo "$as_me:28041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28052,7 +28054,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28055 "configure"
+#line 28057 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28064,16 +28066,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28070: \$? = $ac_status" >&5
+  echo "$as_me:28072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28076: \$? = $ac_status" >&5
+  echo "$as_me:28078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28089,7 +28091,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28092 "configure"
+#line 28094 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28101,16 +28103,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28107: \$? = $ac_status" >&5
+  echo "$as_me:28109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28113: \$? = $ac_status" >&5
+  echo "$as_me:28115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28123,12 +28125,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28126: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28128: 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 28131 "configure"
+#line 28133 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28144,15 +28146,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28150: \$? = $ac_status" >&5
+  echo "$as_me:28152: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28155: \$? = $ac_status" >&5
+  echo "$as_me:28157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28168,7 +28170,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28171: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28173: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28181,7 +28183,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28184: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28186: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28199,7 +28201,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28202: checking for library subsets" >&5
+echo "$as_me:28204: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28253,7 +28255,7 @@ fi
 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:28256: result: $LIB_SUBSETS" >&5
+echo "$as_me:28258: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28284,7 +28286,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28287: checking default library suffix" >&5
+echo "$as_me:28289: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28295,10 +28297,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28298: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28300: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28301: checking default library-dependency suffix" >&5
+echo "$as_me:28303: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28381,10 +28383,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28384: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28386: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28387: checking default object directory" >&5
+echo "$as_me:28389: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28400,11 +28402,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28403: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28405: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28407: checking c++ library-dependency suffix" >&5
+echo "$as_me:28409: 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++)
@@ -28497,7 +28499,7 @@ else
 	fi
 
 fi
-echo "$as_me:28500: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28502: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28673,19 +28675,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28676: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28678: 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 <<EOF
-#line 28681 "configure"
+#line 28683 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28685: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28688: \$? = $ac_status" >&5
+  echo "$as_me:28690: \$? = $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
@@ -28696,10 +28698,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28699 "configure"
+#line 28701 "configure"
 #include "confdefs.h"
 
-#line 28702 "configure"
+#line 28704 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28714,16 +28716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28720: \$? = $ac_status" >&5
+  echo "$as_me:28722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28726: \$? = $ac_status" >&5
+  echo "$as_me:28728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28746,7 +28748,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28749: result: $cf_ldflags_static" >&5
+	echo "$as_me:28751: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28762,7 +28764,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28765: checking where we will install curses.h" >&5
+echo "$as_me:28767: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28772,7 +28774,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28775: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28777: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28780,7 +28782,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28783: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28785: 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
@@ -28805,7 +28807,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28808: checking for desired basename for form library" >&5
+echo "$as_me:28810: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28825,10 +28827,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28828: result: $FORM_NAME" >&5
+echo "$as_me:28830: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28831: checking for desired basename for menu library" >&5
+echo "$as_me:28833: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28848,10 +28850,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28851: result: $MENU_NAME" >&5
+echo "$as_me:28853: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28854: checking for desired basename for panel library" >&5
+echo "$as_me:28856: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28871,10 +28873,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28874: result: $PANEL_NAME" >&5
+echo "$as_me:28876: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28877: checking for desired basename for cxx library" >&5
+echo "$as_me:28879: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28894,13 +28896,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28897: result: $CXX_NAME" >&5
+echo "$as_me:28899: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28903: checking for src modules" >&5
+echo "$as_me:28905: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28959,7 +28961,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28962: result: $cf_cv_src_modules" >&5
+echo "$as_me:28964: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29120,7 +29122,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29123: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29125: 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//'`
@@ -29131,7 +29133,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29134: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:29136: 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
@@ -29147,7 +29149,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29150: result: $PKG_CFLAGS" >&5
+echo "$as_me:29152: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29208,7 +29210,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29211: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29213: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29235,7 +29237,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29238: checking for linker search path" >&5
+echo "$as_me:29240: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29283,7 +29285,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29286: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29288: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29324,7 +29326,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29327: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29329: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29410,7 +29412,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29413: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29415: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29591,7 +29593,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29594: error: ambiguous option: $1
+    { { echo "$as_me:29596: 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;}
@@ -29610,7 +29612,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29613: error: unrecognized option: $1
+  -*) { { echo "$as_me:29615: 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;}
@@ -29740,7 +29742,7 @@ do
   "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:29743: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29745: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30257,7 +30259,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30260: creating $ac_file" >&5
+    { echo "$as_me:30262: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30275,7 +30277,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30278: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30280: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30288,7 +30290,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30291: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30293: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30304,7 +30306,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30307: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30309: 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;}
@@ -30313,7 +30315,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30316: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30318: 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;}
@@ -30358,7 +30360,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30361: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30363: 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;}
@@ -30369,7 +30371,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30372: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30374: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30418,7 +30420,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30421: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30423: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30429,7 +30431,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30432: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30434: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30442,7 +30444,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30445: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30447: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30500,7 +30502,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30503: $ac_file is unchanged" >&5
+      { echo "$as_me:30505: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30887,7 +30889,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30890: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30892: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index f59adf72f..354e4a516 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.766 2023/10/16 23:04:12 tom Exp $
+dnl $Id: configure.in,v 1.769 2023/10/21 15:43:56 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.766 $)
+AC_REVISION($Revision: 1.769 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -947,9 +947,9 @@ NCURSES_OK_WINT_T=
 
 AC_MSG_CHECKING(if you want wide-character code)
 AC_ARG_ENABLE(widec,
-	[  --enable-widec          compile with wide-char/UTF-8 code],
+	[  --disable-widec         do not compile with wide-char/UTF-8 code],
 	[with_widec=$enableval],
-	[with_widec=no])
+	[with_widec=$cf_dft_widec])
 AC_MSG_RESULT($with_widec)
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -1413,7 +1413,7 @@ AC_SUBST(NCURSES_SIZE_T)
 
 AC_MSG_CHECKING(if you want opaque curses-library structures)
 CF_ARG_ENABLE(opaque-curses,
-	[  --enable-opaque-curses  make curses WINDOW, etc., "opaque"],
+	[  --disable-opaque-curses do not make curses WINDOW, etc., "opaque"],
 	[enable_opaque_curses=yes],[
 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
@@ -1426,20 +1426,20 @@ AC_MSG_ERROR(reentrant configuration requires opaque library)
 
 AC_MSG_CHECKING(if you want opaque form-library structures)
 AC_ARG_ENABLE(opaque-form,
-	[  --enable-opaque-form    make form-library structures "opaque"],
-	[enable_opaque_form=yes],[enable_opaque_form=no])
+	[  --disable-opaque-form   do not make form-library structures "opaque"],
+	[enable_opaque_form=yes],[enable_opaque_form=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_form)
 
 AC_MSG_CHECKING(if you want opaque menu-library structures)
 AC_ARG_ENABLE(opaque-menu,
-	[  --enable-opaque-menu    make menu-library structures "opaque"],
-	[enable_opaque_menu=yes],[enable_opaque_menu=no])
+	[  --disable-opaque-menu   do not make menu-library structures "opaque"],
+	[enable_opaque_menu=yes],[enable_opaque_menu=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_menu)
 
 AC_MSG_CHECKING(if you want opaque panel-library structures)
 AC_ARG_ENABLE(opaque-panel,
-	[  --enable-opaque-panel   make panel-library structures "opaque"],
-	[enable_opaque_panel=yes],[enable_opaque_panel=no])
+	[  --disable-opaque-panel  do not make panel-library structures "opaque"],
+	[enable_opaque_panel=yes],[enable_opaque_panel=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_panel)
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
diff --git a/dist.mk b/dist.mk
index 3e6fa5453..2061815f4 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1572 2023/10/16 23:03:18 tom Exp $
+# $Id: dist.mk,v 1.1573 2023/10/21 10:14:10 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231016
+NCURSES_PATCH = 20231021
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/NCURSES-Programming-HOWTO.html b/doc/html/NCURSES-Programming-HOWTO.html
index f4680ca37..9a3f078d2 100644
--- a/doc/html/NCURSES-Programming-HOWTO.html
+++ b/doc/html/NCURSES-Programming-HOWTO.html
@@ -2017,7 +2017,7 @@ <h3 class="SECT2"><a name="ATTRIBDETAILS" id=
     COLOR_PAIR(n)   Color-pair number n 
     </pre>
         <p>The last one is the most colorful one :-) Colors are
-        explained in the <a href="#COLOR" target="_top">next
+        explained in the <a href="#color" target="_top">next
         sections</a>.</p>
 
         <p>We can OR(|) any number of above attributes to get a
@@ -2937,7 +2937,7 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
 #include &lt;curses.h&gt;
 
 #define WIDTH 30
-#define HEIGHT 10 
+#define HEIGHT 10
 
 int startx = 0;
 int starty = 0;
@@ -2968,7 +2968,7 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
         /* 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();
@@ -2976,10 +2976,11 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
 
         /* Print the menu for the first time */
         menu_win = newwin(HEIGHT, WIDTH, starty, startx);
+        keypad(menu_win, TRUE);
         print_menu(menu_win, 1);
         /* Get all the mouse events */
         mousemask(ALL_MOUSE_EVENTS, NULL);
-        
+
         while(1)
         {       c = wgetch(menu_win);
                 switch(c)
@@ -2991,13 +2992,13 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
                                         if(choice == -1) //Exit chosen
                                                 goto end;
                                         mvprintw(22, 1, "Choice made is : %d String Chosen is \"%10s\"", choice, choices[choice - 1]);
-                                        refresh(); 
+                                        refresh();
                                 }
                         }
                         print_menu(menu_win, choice);
                         break;
                 }
-        }               
+        }
 end:
         endwin();
         return 0;
@@ -3005,14 +3006,14 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
 
 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 &lt; n_choices; ++i)
         {       if(highlight == i + 1)
-                {       wattron(menu_win, A_REVERSE); 
+                {       wattron(menu_win, A_REVERSE);
                         mvwprintw(menu_win, y, x, "%s", choices[i]);
                         wattroff(menu_win, A_REVERSE);
                 }
@@ -3029,13 +3030,13 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
 
         i = startx + 2;
         j = starty + 3;
-        
+
         for(choice = 0; choice &lt; n_choices; ++choice)
                 if(mouse_y == j + choice &amp;&amp; mouse_x &gt;= i &amp;&amp; mouse_x &lt;= i + strlen(choices[choice]))
                 {       if(choice == n_choices - 1)
-                                *p_choice = -1;         
+                                *p_choice = -1;
                         else
-                                *p_choice = choice + 1; 
+                                *p_choice = choice + 1;
                         break;
                 }
 }</span></pre>
@@ -4515,7 +4516,7 @@ <h3 class="SECT2"><a name="MENUWINDOWS" id=
         for(i = 0; i &lt; n_choices; ++i)
                 my_items[i] = new_item(choices[i], choices[i]);
 
-        /* Crate menu */
+        /* Create menu */
         my_menu = new_menu((ITEM **)my_items);
 
         /* Create the window to be associated with the menu */
@@ -4661,7 +4662,7 @@ <h3 class="SECT2"><a name="SCROLLMENUS" id=
         for(i = 0; i &lt; n_choices; ++i)
                 my_items[i] = new_item(choices[i], choices[i]);
 
-        /* Crate menu */
+        /* Create menu */
         my_menu = new_menu((ITEM **)my_items);
 
         /* Create the window to be associated with the menu */
@@ -4815,7 +4816,7 @@ <h3 class="SECT2"><a name="MULTICOLUMN" id=
         for(i = 0; i &lt; n_choices; ++i)
                 my_items[i] = new_item(choices[i], choices[i]);
 
-        /* Crate menu */
+        /* Create menu */
         my_menu = new_menu((ITEM **)my_items);
 
         /* Set menu option not to show the description */
@@ -5123,7 +5124,7 @@ <h3 class="SECT2"><a name="MENUOPT" id="MENUOPT">17.8. Menu
 
         /* Post the menu */
         mvprintw(LINES - 3, 0, "Press &lt;ENTER&gt; to see the option selected");
-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
+        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
         post_menu(my_menu);
         refresh();
 
@@ -5224,7 +5225,7 @@ <h3 class="SECT2"><a name="MENUUSERPTR" id=
 
         /* Post the menu */
         mvprintw(LINES - 3, 0, "Press &lt;ENTER&gt; to see the option selected");
-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to naviage (F1 to Exit)");
+        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
         post_menu(my_menu);
         refresh();
 
diff --git a/doc/html/ada/terminal_interface-curses_constants__ads.htm b/doc/html/ada/terminal_interface-curses_constants__ads.htm
index 8be0214c9..eef12f454 100644
--- a/doc/html/ada/terminal_interface-curses_constants__ads.htm
+++ b/doc/html/ada/terminal_interface-curses_constants__ads.htm
@@ -23,7 +23,7 @@
 <b>package</b> <a href="terminal_interface__ads.htm#ref_43_9">Terminal_Interface</a>.<span class="symbol"><a name="ref_6_28">Curses_Constants</a></span> <b>is</b>
    <b>pragma</b> Pure;
 
-   <span class="symbol"><a name="ref_9_4">DFT_ARG_SUFFIX</a></span> : <b>constant</b> String := "";
+   <span class="symbol"><a name="ref_9_4">DFT_ARG_SUFFIX</a></span> : <b>constant</b> String := "w";
    <span class="symbol"><a name="ref_10_4">Bit_Order</a></span> : <b>constant</b> System.Bit_Order := System.Low_Order_First;
    <span class="symbol"><a name="ref_11_4">Sizeof_Bool</a></span>                  : <b>constant</b> := 8;
    <span class="symbol"><a name="ref_12_4">OK</a></span>                           : <b>constant</b> := 0;
diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html
new file mode 100644
index 000000000..f0c4b60b6
--- /dev/null
+++ b/doc/html/man/adacursesw6-config.1.html
@@ -0,0 +1,144 @@
+<!--
+  ****************************************************************************
+  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+  * Copyright 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            *
+  * "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: MKada_config.in,v 1.29 2023/10/07 21:19:07 tom Exp @
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
+<TITLE>adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<link rel="author" href="mailto:bug-ncurses@gnu.org">
+
+</HEAD>
+<BODY>
+<H1 class="no-header">adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands</H1>
+<PRE>
+<STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>            User commands           <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+
+
+
+
+</PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
+       <STRONG>adacursesw6-config</STRONG> - configuration helper for <EM>AdaCurses</EM> libraries
+
+
+</PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
+       <STRONG>adacursesw6-config</STRONG> [<STRONG>--cflags</STRONG>] [<STRONG>--libs</STRONG>]
+
+       <STRONG>adacursesw6-config</STRONG> <STRONG>--version</STRONG>
+
+       <STRONG>adacursesw6-config</STRONG> <STRONG>--help</STRONG>
+
+
+</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       This  program  development  aid  simplifies  the process of configuring
+       applications to use the <EM>AdaCurses</EM> library binding to <EM>ncurses</EM>.
+
+
+</PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
+       <STRONG>--cflags</STRONG>   reports the GNAT (Ada compiler) flags needed to compile with
+                  <EM>AdaCurses</EM>.
+
+       <STRONG>--libs</STRONG>     reports the GNAT libraries needed to link with <EM>AdaCurses</EM>.
+
+       <STRONG>--version</STRONG>  reports  the  release  and  patch  date  information  of the
+                  <EM>ncurses</EM> libraries used to configure and build <EM>AdaCurses</EM>  and
+                  exits successfully.
+
+       <STRONG>--help</STRONG>     issues a usage message and exits successfully.
+
+       Omitting options implies "<STRONG>--cflags</STRONG> <STRONG>--libs</STRONG>".
+
+
+</PRE><H2><a name="h2-EXAMPLE">EXAMPLE</a></H2><PRE>
+       Consider a program using <EM>AdaCurses</EM> to write the message "Hello, world!"
+       in the center of the screen and wait for the user to press the "q"  key
+       before exiting.  Populate a file <EM>hello.adb</EM> with the following.
+
+           with Terminal_Interface.Curses; use Terminal_Interface.Curses;
+
+           procedure Hello is
+              Visibility : Cursor_Visibility := Invisible;
+              Message : constant String := "Hello, World!";
+              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 =&gt; Lines / 2,
+                           Column =&gt; (Columns - Message'Length) / 2);
+              Add (Str =&gt; Message);
+
+              while not done loop
+                 c := Get_Keystroke (Standard_Window);
+
+                 case c is
+                     when Character'Pos ('q') =&gt; done := True;
+                     when others =&gt; null;
+                 end case;
+
+                 Nap_Milli_Seconds (50);
+              end loop;
+
+              End_Windows;
+
+           end Hello;
+
+       Then, using
+           gnatmake `adacursesw6-config --cflags` hello \
+               -largs `adacursesw6-config --libs`
+       or, more simply,
+           gnatmake hello `adacursesw6-config`
+       you can compile and link the program.
+
+
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+
+
+
+ncurses 6.4                       2023-10-07             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+</PRE>
+<div class="nav">
+<ul>
+<li><a href="#h2-NAME">NAME</a></li>
+<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-OPTIONS">OPTIONS</a></li>
+<li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
+</ul>
+</div>
+</BODY>
+</HTML>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 375c6324e..1eaf1e8c5 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.86 2023/10/14 19:19:11 tom Exp @
+  * @Id: curs_color.3x,v 1.87 2023/10/21 10:28:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -525,7 +525,7 @@ <H1 class="no-header">curs_color 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 7778d283c..766aad03d 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_getyx.3x,v 1.39 2023/10/21 10:28:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 878a3644e..79d4feec1 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.55 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_inopts.3x,v 1.56 2023/10/21 10:28:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -336,7 +336,7 @@ <H1 class="no-header">curs_inopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 183e7de1b..b4bf5283e 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_legacy.3x,v 1.29 2023/10/21 10:28:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_legacy 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 035960ed8..e3415935a 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.29 2023/10/21 10:28:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 7e2a81be4..5804c6dc7 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.80 2023/10/14 20:00:10 tom Exp @
+  * @Id: curs_mouse.3x,v 1.81 2023/10/21 10:29:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -373,7 +373,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index cba22b056..aa5dd7c05 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.44 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_pad.3x,v 1.45 2023/10/21 10:29:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_pad 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 56c35bcce..93f433da5 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.33 2023/10/14 19:26:28 tom Exp @
+  * @Id: curs_print.3x,v 1.34 2023/10/21 10:31:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_print 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 6657248c3..69886dcfd 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.63 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_slk.3x,v 1.64 2023/10/21 10:31:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -311,7 +311,7 @@ <H1 class="no-header">curs_slk 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 3e3f873ed..87e3e2930 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.114 2023/10/14 22:35:16 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.115 2023/10/21 10:31:22 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -699,7 +699,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 5d4be1a97..c131f08af 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.30 2023/10/07 22:24:44 tom Exp @
+  * @Id: keybound.3x,v 1.31 2023/10/21 10:31:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index f732e3c66..70fb2f83e 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231014).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231021).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
new file mode 100644
index 000000000..908e57b17
--- /dev/null
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -0,0 +1,135 @@
+<!--
+  ****************************************************************************
+  * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2010 Free 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: MKncu_config.in,v 1.17 2023/10/01 09:59:29 tom Exp @
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
+<TITLE>ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</TITLE>
+<link rel="author" href="mailto:bug-ncurses@gnu.org">
+
+</HEAD>
+<BODY>
+<H1 class="no-header">ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</H1>
+<PRE>
+<STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+
+
+
+
+</PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
+       <STRONG>ncursesw6-config</STRONG> - configuration helper for <EM>ncurses</EM> libraries
+
+
+</PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
+       <STRONG>ncursesw6-config</STRONG> <EM>option</EM> ...
+
+       <STRONG>ncursesw6-config</STRONG> <STRONG>--version</STRONG>
+
+       <STRONG>ncursesw6-config</STRONG> <STRONG>--help</STRONG>
+
+
+</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       This  program  development  aid  simplifies  the process of configuring
+       applications against a particular set of <EM>ncurses</EM> libraries.
+
+
+</PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
+       <STRONG>--prefix</STRONG>
+              reports the package prefix of <EM>ncurses</EM>.
+
+       <STRONG>--exec-prefix</STRONG>
+              reports the executable prefix of <EM>ncurses</EM>.
+
+       <STRONG>--cflags</STRONG>
+              reports the C compiler flags needed to compile with <EM>ncurses</EM>.
+
+       <STRONG>--libs</STRONG> reports the libraries needed to link with <EM>ncurses</EM>.
+
+       <STRONG>--version</STRONG>
+              reports the release and patch date information  of  <EM>ncurses</EM>  and
+              exits successfully.
+
+       <STRONG>--abi-version</STRONG>
+              reports the ABI version of <EM>ncurses</EM>.
+
+       <STRONG>--mouse-version</STRONG>
+              reports the mouse-interface version of <EM>ncurses</EM>.
+
+       <STRONG>--bindir</STRONG>
+              reports the directory containing <EM>ncurses</EM> programs.
+
+       <STRONG>--datadir</STRONG>
+              reports the directory containing <EM>ncurses</EM> data.
+
+       <STRONG>--includedir</STRONG>
+              reports the directory containing <EM>ncurses</EM> header files.
+
+       <STRONG>--libdir</STRONG>
+              reports the directory containing <EM>ncurses</EM> libraries.
+
+       <STRONG>--mandir</STRONG>
+              reports the directory containing <EM>ncurses</EM> man pages.
+
+       <STRONG>--terminfo</STRONG>
+              reports   the  <STRONG>TERMINFO</STRONG>  <EM>terminfo</EM>  database  path,  for  example
+              <EM>/usr/share/terminfo</EM>.
+
+       <STRONG>--terminfo-dirs</STRONG>
+              reports the  <STRONG>TERMINFO_DIRS</STRONG>  supplemental  search  path  for  the
+              <EM>terminfo</EM> database, for example <EM>/usr/share/terminfo</EM>.
+
+       <STRONG>--termpath</STRONG>
+              reports  the  <STRONG>TERMPATH</STRONG>  supplemental search path for the <EM>termcap</EM>
+              database, if support for <EM>termcap</EM> is configured.
+
+       <STRONG>--help</STRONG> issues a usage message and exits successfully.
+
+
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+
+
+
+ncurses 6.4                       2023-10-01               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+</PRE>
+<div class="nav">
+<ul>
+<li><a href="#h2-NAME">NAME</a></li>
+<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-OPTIONS">OPTIONS</a></li>
+<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
+</ul>
+</div>
+</BODY>
+</HTML>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 3e0987dee..9d66af93c 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: new_pair.3x,v 1.41 2023/10/21 10:31:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 210cd4db0..7321a16a2 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
+  * @Id: resizeterm.3x,v 1.49 2023/10/21 10:31:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-10-21                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index a25dfa104..2cd0f44d9 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2018-2021,2023 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.60 2023/10/14 19:18:14 tom Exp @
+  * @Id: term.5,v 1.62 2023/10/21 15:33:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-10-14 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-10-21 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-10-14 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -379,7 +380,7 @@ <H1 class="no-header">term 5 2023-10-14 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-10-21                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index db75f645c..8d6428871 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231014).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231021).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index f1b199421..c55eb66c5 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,4 +1,5 @@
 <!--
+  * t
   ****************************************************************************
   * Copyright 2019-2022,2023 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.53 2023/10/14 19:18:14 tom Exp @
+  * @Id: toe.1m,v 1.54 2023/10/21 15:30:27 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -39,12 +40,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-10-21 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-10-21 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -187,7 +188,7 @@ <H1 class="no-header">toe 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-10-21                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/curs_color.3x b/man/curs_color.3x
index cc70ddbe6..39fac3904 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.86 2023/10/14 19:19:11 tom Exp $
-.TH curs_color 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.87 2023/10/21 10:28:36 tom Exp $
+.TH curs_color 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -477,7 +477,8 @@ attributes and color-pair values, allowing increased range of color-pairs.
 Both color-pairs and color-values used a signed \fBshort\fP,
 limiting values to 15 bits.
 .bP
-ncurses (1992-present) uses eight bits for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
+ncurses (1992-present) uses eight bits
+for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
 .IP
 Version 5.3 provided a wide-character interface (2002),
 but left color-pairs as part of the attributes-field.
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index a34231fbf..d75ebeb68 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
-.TH curs_getyx 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.39 2023/10/21 10:28:36 tom Exp $
+.TH curs_getyx 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%getyx\fP,
 \fB\%getparyx\fP,
@@ -45,8 +45,8 @@ get \fIcurses\fR cursor and window coordinates
 \fBvoid getmaxyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
-The \fB\%getyx\fP macro places the current cursor position of the given window in
-the two integer variables \fIy\fP and \fIx\fP.
+The \fB\%getyx\fP macro places the current cursor position
+of the given window in the two integer variables \fIy\fP and \fIx\fP.
 .PP
 If \fIwin\fP is a subwindow, the \fB\%getparyx\fP macro places the beginning
 coordinates of the subwindow relative to the parent window into two integer
@@ -91,9 +91,10 @@ direct use of its members).
 Besides the problem of opaque structures,
 the data stored in like-named members may not have like-values in
 different implementations.
-For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values in \fIncurses\fP
-have (at least since release 1.8.1) differed by one from some
-other implementations.
+For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values
+in \fIncurses\fP have
+(at least since release 1.8.1)
+differed by one from some other implementations.
 The difference is hidden by means of the macro \fB\%getmaxyx\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index a2b366f31..78ff32dc6 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.55 2023/10/07 21:19:07 tom Exp $
-.TH curs_inopts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.56 2023/10/21 10:28:36 tom Exp $
+.TH curs_inopts 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -320,8 +320,10 @@ be conditioned using NCURSES_VERSION.
 Except as noted in the section on extensions,
 these functions are described in the XSI Curses standard, Issue 4.
 .PP
-The \fIncurses\fP library obeys the XPG4 standard and the historical practice of the
-AT&T \fIcurses\fP implementations, in that the echo bit is cleared when \fIcurses\fP
+The \fIncurses\fP library obeys the XPG4 standard
+and the historical practice of the
+AT&T \fIcurses\fP implementations,
+in that the echo bit is cleared when \fIcurses\fP
 initializes the terminal state.
 BSD \fIcurses\fP differed from this slightly; it
 left the echo bit on at initialization, but the BSD \fBraw\fP call turned it
@@ -331,8 +333,8 @@ just after initialization, even if your program remains in cooked mode.
 .PP
 The XSI Curses standard is ambiguous on the question of whether \fBraw\fP
 should disable the CRLF translations controlled by \fBnl\fP and \fBnonl\fP.
-BSD \fIcurses\fP did turn off these translations; AT&T \fIcurses\fP (at least as late as
-SVr1) did not.
+BSD \fIcurses\fP did turn off these translations;
+AT&T \fIcurses\fP (at least as late as SVr1) did not.
 We chose to do so, on the theory that a programmer requesting
 raw input wants a clean (ideally 8-bit clean) connection that the operating
 system will not alter.
@@ -348,7 +350,8 @@ loads of terminal descriptions) may differ from one execution of a
 program to the next.
 The generated keycodes are recognized by the \fB\%keyname\fP function
 (which will then return a name beginning with \*(``k\*('' denoting the
-terminfo capability name rather than \*(``K\*('', used for \fIcurses\fP key-names).
+terminfo capability name rather than \*(``K\*('',
+used for \fIcurses\fP key-names).
 On the other hand, an application can use \fB\%define_key\fP to establish
 a specific keycode for a given string.
 This makes it possible for an application to check for an extended
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index bf24a74d4..a89337c2f 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH curs_legacy 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.29 2023/10/21 10:28:36 tom Exp $
+.TH curs_legacy 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -63,9 +63,11 @@ get \fIcurses\fR cursor and window coordinates or attributes (legacy)
 \fBint getpary(const WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
-These legacy functions are simpler to use than the X/Open \fIcurses\fP functions:
+These legacy functions are simpler to use
+than the X/Open \fIcurses\fP functions:
 .bP
-The \fB\%getattrs\fP function returns the same attribute data as \fB\%wattr_get\fP.
+The \fB\%getattrs\fP function returns the same attribute data
+as \fB\%wattr_get\fP.
 .IP
 However, \fB\%getattrs\fP returns an integer (actually a \fB\%chtype\fP),
 while \fB\%wattr_get\fP returns the current color pair in a separate parameter.
@@ -76,7 +78,8 @@ so \fB\%wattr_get\fP is the only way to obtain the color information.
 Because \fB\%getattrs\fP returns the attributes in a single parameter,
 it would not be possible for an application to distinguish that from
 \fBERR\fP (a \fI-1\fP).
-If the window parameter is null, \fB\%getattrs\fP returns \fB\%A_NORMAL\fP (zero).
+If the window parameter is null, \fB\%getattrs\fP
+returns \fB\%A_NORMAL\fP (zero).
 .bP
 The \fB\%getbegy\fP and \fB\%getbegx\fP functions return the same
 data as \fB\%getbegyx\fP.
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 31a927c40..82c37042a 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH curs_memleaks 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.29 2023/10/21 10:28:36 tom Exp $
+.TH curs_memleaks 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,7 +118,8 @@ In some implementations, there is a global variable \fBsp\fP
 which could be used, e.g., if the screen were only initialized
 using \fB\%initscr\fP.
 .bP
-The portable part of \fB\%exit_terminfo\fP can be freed using \fB\%del_curterm\fP.
+The portable part of \fB\%exit_terminfo\fP can be freed
+using \fB\%del_curterm\fP.
 .IP
 In this case, there is a global variable \fB\%cur_term\fP which can be
 used as parameter.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 95129c28a..b65403ae2 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.80 2023/10/14 20:00:10 tom Exp $
-.TH curs_mouse 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.81 2023/10/21 10:29:45 tom Exp $
+.TH curs_mouse 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -295,7 +295,8 @@ req_mouse_pos     reqmp   RQ       Request mouse position report
 .EE
 .RE
 .bP
-the interface made assumptions (as does \fIncurses\fP) about the escape sequences
+the interface made assumptions (as does \fIncurses\fP)
+about the escape sequences
 sent to and received from the terminal.
 .IP
 For instance
@@ -305,7 +306,8 @@ passing the mouse-button bit-mask to the terminal.
 Also, it could ask the terminal
 where the mouse was using the \fB\%req_mouse_pos\fP capability.
 .IP
-Those features required a terminal which had been modified to work with \fIcurses\fP.
+Those features required a terminal which had been modified
+to work with \fIcurses\fP.
 They were not part of the X Consortium's xterm.
 .PP
 When developing the xterm mouse support for \fIncurses\fP in September 1995,
@@ -376,7 +378,8 @@ It is intended
 for use with touch screens (which may be pressure-sensitive) or with
 3D-mice/trackballs/power gloves.
 .PP
-The \fB\%ALL_MOUSE_EVENTS\fP class does not include \fB\%REPORT_MOUSE_POSITION\fP.
+The \fB\%ALL_MOUSE_EVENTS\fP class does not
+include \fB\%REPORT_MOUSE_POSITION\fP.
 They are distinct.
 For example, in xterm,
 wheel/scrolling mice send position reports as a sequence of
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 587a24125..f00590af4 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.44 2023/10/07 21:19:07 tom Exp $
-.TH curs_pad 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.45 2023/10/21 10:29:45 tom Exp $
+.TH curs_pad 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -109,7 +109,8 @@ Negative values of
 \fIpminrow\fP, \fIpmincol\fP, \fIsminrow\fP, or \fIsmincol\fP are treated as if
 they were zero.
 .SS pechochar
-The \fB\%pechochar\fP routine is functionally equivalent to a call to \fB\%addch\fP
+The \fB\%pechochar\fP routine is functionally equivalent
+to a call to \fB\%addch\fP
 followed by a call to \fB\%refresh\fP(3X),
 a call to \fB\%waddch\fP followed by a call
 to \fB\%wrefresh\fP, or a call to \fB\%waddch\fP followed by a call to
@@ -124,7 +125,8 @@ the screen is reused for the arguments to \fB\%prefresh\fP.
 The \fB\%pecho_wchar\fP function is the analogous wide-character
 form of \fB\%pechochar\fP.
 It outputs one character to a pad and immediately refreshes the pad.
-It does this by a call to \fB\%wadd_wch\fP followed by a call to \fB\%prefresh\fP.
+It does this by a call to \fB\%wadd_wch\fP followed by a call
+to \fB\%prefresh\fP.
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
 (SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
@@ -202,7 +204,8 @@ though interestingly enough, a comment in the source code
 states that the lack of a check was an MKS extension.
 .bP
 NetBSD 7 \fIcurses\fP
-sets a flag in the \fB\%WINDOW\fP structure for \fB\%newpad\fP and \fB\%subpad\fP,
+sets a flag in the \fB\%WINDOW\fP structure
+for \fB\%newpad\fP and \fB\%subpad\fP,
 using this to help with the distinction between \fB\%wnoutrefresh\fP
 and \fB\%pnoutrefresh\fP.
 .IP
@@ -215,7 +218,8 @@ data was from a pad.
 .PP
 This implementation
 .bP
-sets a flag in the \fB\%WINDOW\fP structure for \fB\%newpad\fP and \fB\%subpad\fP,
+sets a flag in the \fB\%WINDOW\fP structure
+for \fB\%newpad\fP and \fB\%subpad\fP,
 .bP
 allows a \fB\%subwin\fP or \fB\%derwin\fP call to succeed having a pad parent by
 forcing the subwindow to be a pad,
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 9225bb99b..8c9211cc7 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.33 2023/10/14 19:26:28 tom Exp $
-.TH curs_print 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.34 2023/10/21 10:31:22 tom Exp $
+.TH curs_print 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
@@ -42,7 +42,8 @@ write binary data to printer using \fIterminfo\fR capabilities
 This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
 if they are present, to ship given data to a printer attached to the terminal.
 .PP
-Note that the \fB\%mcprint\fP code has no way to do flow control with the printer
+Note that the \fB\%mcprint\fP code has no way
+to do flow control with the printer
 or to know how much buffering it has.
 Your application is responsible for
 keeping the rate of writes to the printer below its continuous throughput rate
@@ -67,7 +68,8 @@ When \fB\%mcprint\fP succeeds, it returns the number of characters actually
 sent to the printer.
 .SH PORTABILITY
 The \fB\%mcprint\fP call was designed for \fIncurses\fP, and is not found
-in SVr4 \fIcurses\fP, 4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
+in SVr4 \fIcurses\fP, 4.4BSD \fIcurses\fP,
+or any other previous version of \fIcurses\fP.
 It is recommended that any code depending on \fIncurses\fP extensions
 be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH BUGS
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 6a4943c14..7bc27a6de 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.63 2023/10/07 21:19:07 tom Exp $
-.TH curs_slk 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.64 2023/10/21 10:31:22 tom Exp $
+.TH curs_slk 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -95,8 +95,8 @@
 \fBint extended_slk_color(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
-The \fBslk\fP* functions manipulate the set of soft function-key labels that exist on
-many terminals.
+The \fBslk\fP* functions manipulate the set
+of soft function-key labels that exist on many terminals.
 For those terminals that do not have soft labels,
 \fIcurses\fP takes over the bottom line of \fB\%stdscr\fP, reducing the size of
 \fB\%stdscr\fP and the variable \fBLINES\fP.
@@ -111,7 +111,8 @@ the bottom of the screen;
 it does not try to use any hardware support for this
 mode.
 .SS Initialization
-The \fB\%slk_init\fP routine must be called before \fB\%initscr\fP or \fB\%newterm\fP
+The \fB\%slk_init\fP routine must be called
+before \fB\%initscr\fP or \fB\%newterm\fP
 is called.
 If \fB\%initscr\fP eventually uses a line from \fB\%stdscr\fP to
 emulate the soft labels,
@@ -184,7 +185,8 @@ The \fB\%slk_color\fP routine corresponds to \fB\%color_set\fP.
 It has an effect only
 if soft labels are simulated on the bottom line of the screen.
 .PP
-Because \fB\%slk_color\fP accepts only \fBshort\fP (signed 16-bit integer) values,
+Because \fB\%slk_color\fP accepts
+only \fBshort\fP (signed 16-bit integer) values,
 this implementation provides
 \fB\%extended_slk_color\fP which accepts an integer value, e.g., 32-bits.
 .
@@ -256,7 +258,8 @@ X/Open \fIcurses\fP added these:
   \fBslk_color\fP
   \fBslk_wset\fP
 .SH EXTENSIONS
-X/Open \fIcurses\fP documents the \fIopts\fP argument as reserved for future use,
+X/Open \fIcurses\fP documents the \fIopts\fP argument
+as reserved for future use,
 saying that it must be null.
 This implementation
 uses that parameter in ABI 6 for the functions which have a color-pair
@@ -311,7 +314,8 @@ If \fIng\fP is neither 2 or 3,
 interpreting that as a comma-separated list of numbers,
 e.g., \*(``3,2,3\*('' for the 3-2-3 layout.
 .IP
-Finally, if there is no \fBfln\fP capability, \fB\%slk_start\fP returns \fBERR\fP.
+Finally, if there is no \fBfln\fP capability,
+\fB\%slk_start\fP returns \fBERR\fP.
 .bP
 If \fB\%slk_start\fP is given a non-null \fIgp\fP,
 it copies the \fIng\fP elements of the group of soft-keys, up to 16.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index df8598834..c5fcc9629 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.114 2023/10/14 22:35:16 tom Exp $
-.TH curs_terminfo 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.115 2023/10/21 10:31:22 tom Exp $
+.TH curs_terminfo 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -213,7 +213,8 @@ If \fBERR\fP is returned, examine \fIerrret\fP:
 .RS
 .TP 5
 .B 1
-means that the terminal is hardcopy, cannot be used for \fIcurses\fP applications.
+means that the terminal is hardcopy, cannot be used
+for \fIcurses\fP applications.
 .IP
 \fB\%setupterm\fP determines if the entry is a hardcopy type by
 checking the \fBhc\fP (\fBhardcopy\fP) capability.
diff --git a/man/keybound.3x b/man/keybound.3x
index 5d1547eaf..b44253a94 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.30 2023/10/07 22:24:44 tom Exp $
-.TH keybound 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.31 2023/10/21 10:31:22 tom Exp $
+.TH keybound 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
@@ -45,7 +45,8 @@ This is an extension to the \fIcurses\fP library.
 It permits an application to determine the string which is defined
 in the terminfo for specific keycodes.
 .SH RETURN VALUE
-The \fIkeycode\fP parameter must be greater than zero, else \fBNULL\fP is returned.
+The \fIkeycode\fP parameter must be greater than zero,
+else \fBNULL\fP is returned.
 If it does not correspond to a defined key, then \fBNULL\fP is returned.
 The \fIcount\fP parameter is used to allow the application to iterate
 through multiple definitions, counting from zero.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 7e86fd0d8..cbc686bdc 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH new_pair 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.41 2023/10/21 10:31:22 tom Exp $
+.TH new_pair 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -130,7 +130,8 @@ All of the color pairs are allocated from a table of possible color pairs.
 The size of the table is determined by the terminfo \fBpairs\fP capability.
 The table is shared with \fBinit_pair\fP;
 in fact \fBalloc_pair\fP calls \fBinit_pair\fP after
-updating the \fIncurses\fP library's fast index to the colors versus color pairs.
+updating the \fIncurses\fP library's fast index
+to the colors versus color pairs.
 .SS find_pair
 The \fBfind_pair\fP function accepts parameters for
 foreground and background color, and
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index a7a43ecd0..57f22fd15 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
-.TH resizeterm 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.49 2023/10/21 10:31:22 tom Exp $
+.TH resizeterm 3X 2023-10-21 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -115,7 +115,8 @@ extending to the corresponding limit, regardless of whether the
 screen has shrunk or grown.
 .SS is_term_resized
 A support function \fB\%is_term_resized\fP is provided so that applications
-can check if the \fB\%resize_term\fP function would modify the window structures.
+can check if the \fB\%resize_term\fP function would modify
+the window structures.
 It returns \fBTRUE\fP if the windows would be modified,
 and \fBFALSE\fP otherwise.
 .SH RETURN VALUE
diff --git a/man/term.5 b/man/term.5
index 7029e96f7..bcc780bb7 100644
--- a/man/term.5
+++ b/man/term.5
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.60 2023/10/14 19:18:14 tom Exp $
-.TH term 5 2023-10-14 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.62 2023/10/21 15:33:10 tom Exp $
+.TH term 5 2023-10-21 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -43,6 +44,11 @@
 .ds       '  '
 .ds       ^  ^
 .\}
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .
 .de bP
 .ie n  .IP \(bu 4
diff --git a/man/toe.1m b/man/toe.1m
index 096e81dbe..251382eb8 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.53 2023/10/14 19:18:14 tom Exp $
-.TH @TOE@ 1M 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.54 2023/10/21 15:30:27 tom Exp $
+.TH @TOE@ 1M 2023-10-21 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 56d561242..1021a5cce 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1062 $
-#	$Date: 2023/08/12 20:21:29 $
+#	$Revision: 1.1065 $
+#	$Date: 2023/10/21 22:49:03 $
 #
 # 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
@@ -368,6 +368,9 @@ ansi+idc|ANSI insert/delete characters,
 ansi+arrows|ANSI normal-mode home and cursor-keys,
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	khome=\E[H,
+ansi+apparrows|ANSI application-mode home and cursor-keys,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\EOH,
+	use=ansi+arrows,
 ansi+sgr|ANSI graphic renditions,
 	blink=\E[5m, invis=\E[8m, rev=\E[7m,
 	sgr=\E[0%?%p3%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
@@ -5964,6 +5967,13 @@ xterm+sm+1006|xterm SGR-mouse (building block),
 xterm-1006|xterm SGR-mouse,
 	use=xterm+sm+1006, use=xterm,
 
+# Some terminal emulators implement xterm focus in/out, but do it incorrectly,
+# interfering with user applications.
+# https://lists.gnu.org/archive/html/bug-ncurses/2023-10/msg00087.html
+oldxterm+sm+1006|xterm SGR-mouse (building block),
+	kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;,
+	xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;,
+
 #### KTERM
 # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
 # (kterm should not invoke DEC Graphics as the alternate character set
@@ -6297,7 +6307,7 @@ vte-2014|VTE 0.35.1,
 	ncv@,
 	cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
 	ich=\E[%p1%d@, kent=\EOM, use=ecma+index,
-	use=xterm+sm+1006, use=xterm+pcfkeys, use=vte-2012,
+	use=oldxterm+sm+1006, use=xterm+pcfkeys, use=vte-2012,
 	use=bracketed+paste,
 
 # As of January 2018, this was the  most recent release,
@@ -27851,4 +27861,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  2021 -TD
 #	+ add ecma+strikeout to putty -TD
 #
+# 2023-10-21
+#	+ use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD
+#	+ add ansi+apparrows -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 1136305af..c96e417a9 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.24 2021/12/11 23:56:25 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.25 2023/10/21 11:12:44 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
@@ -54,7 +54,7 @@ cannot_delete(WINDOW *win)
 	result = FALSE;
     } else {
 	WINDOWLIST *p;
-#ifdef USE_SP_WINDOWLIST
+#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST)
 	SCREEN *sp = _nc_screen_of(win);
 #endif
 
diff --git a/ncurses/base/wresize.c b/ncurses/base/wresize.c
index 5eb6a3048..6d5589e27 100644
--- a/ncurses/base/wresize.c
+++ b/ncurses/base/wresize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: wresize.c,v 1.42 2021/10/23 18:54:16 tom Exp $")
+MODULE_ID("$Id: wresize.c,v 1.43 2023/10/21 11:13:03 tom Exp $")
 
 static int
 cleanup_lines(struct ldat *data, int length)
@@ -55,7 +55,7 @@ repair_subwindows(WINDOW *cmp)
     WINDOWLIST *wp;
     struct ldat *pline = cmp->_line;
     int row;
-#ifdef USE_SP_WINDOWLIST
+#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST)
     SCREEN *sp = _nc_screen_of(cmp);
 #endif
 
diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c
index 869496c28..cc62f18cb 100644
--- a/ncurses/tinfo/obsolete.c
+++ b/ncurses/tinfo/obsolete.c
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: obsolete.c,v 1.10 2023/06/25 16:56:27 tom Exp $")
+MODULE_ID("$Id: obsolete.c,v 1.11 2023/10/21 15:38:47 tom Exp $")
 
 /*
  * Obsolete entrypoint retained for binary compatibility.
@@ -243,7 +243,7 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit)
 /*
  * Out-of-memory testing, suitable for checking if initialization (and limited
  * running) recovers from errors due to insufficient memory.  In practice, this
- * is unlikely except with artifically constructed tests (or poorly behaved
+ * is unlikely except with artificially constructed tests (or poorly behaved
  * applications).
  */
 #undef malloc
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6baeec6f3..418648a54 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231016) unstable; urgency=low
+ncurses6 (6.4+20231021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6baeec6f3..418648a54 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231016) unstable; urgency=low
+ncurses6 (6.4+20231021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 7226c90c4..56487d96f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231016) unstable; urgency=low
+ncurses6 (6.4+20231021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 16 Oct 2023 19:03:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index aeb77ea7c..68957d7e9 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.612 2023/10/16 23:03:18 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.613 2023/10/21 10:14:10 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1016"
+!define VERSION_MMDD  "1021"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 629ceadfd..2786e9e14 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231016
+Release: 20231021
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index c00ee4cd7..4058fa7f8 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231016
+Release: 20231021
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 985c36af9..fa1041d1e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231016
+Release: 20231021
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From a6cd7269c245d2e3a8359e0d9f7adca9b279a1ed Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 29 Oct 2023 00:35:47 +0200
Subject: [PATCH 037/106] ncurses-6.4-20231028.patch

---
 Ada95/aclocal.m4                 |   54 +-
 Ada95/configure                  |  100 +-
 INSTALL                          |  113 +-
 NEWS                             |    9 +-
 README                           |   32 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   79 +-
 configure                        | 5145 +++++++++++++++---------------
 configure.in                     |   59 +-
 dist.mk                          |    4 +-
 doc/html/man/curs_opaque.3x.html |   31 +-
 doc/html/man/ncurses.3x.html     |    2 +-
 doc/html/man/terminfo.5.html     |    2 +-
 include/Caps-ncurses             |    4 +-
 man/curs_opaque.3x               |   12 +-
 misc/magic                       |    4 +-
 misc/terminfo.src                |   83 +-
 ncurses/base/safe_sprintf.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/aclocal.m4                  |   10 +-
 test/configure                   |    4 +-
 27 files changed, 2928 insertions(+), 2847 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index f14cfaee2..9813c40e1 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.203 2023/09/06 22:55:27 tom Exp $
+dnl $Id: aclocal.m4,v 1.205 2023/10/28 16:05:04 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3486,7 +3486,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
+dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 dnl
@@ -3495,7 +3495,7 @@ AC_DEFUN([CF_PKG_CONFIG],
 [
 AC_MSG_CHECKING(if you want to use pkg-config)
 AC_ARG_WITH(pkg-config,
-	[  --with-pkg-config{=path} enable/disable use of pkg-config],
+	[[  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
 	[cf_pkg_config=$withval],
 	[cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
@@ -3973,7 +3973,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34
+dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4019,9 +4019,9 @@ AC_DEFUN([CF_SHARED_OPTS],
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	AC_MSG_CHECKING(if release/abi version should be used for shared libs)
+	AC_MSG_CHECKING(whether to use release or ABI version in shared library file names)
 	AC_ARG_WITH(shlib-version,
-	[  --with-shlib-version=X  Specify rel or abi version for shared libs],
+	[[  --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]],
 	[test -z "$withval" && withval=auto
 	case "$withval" in
 	(yes)
@@ -4737,26 +4737,26 @@ weak_symbol(fopen);
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
 dnl --------------------
 dnl Command-line option to specify the Ada95 compiler.
 AC_DEFUN([CF_WITH_ADA_COMPILER],[
-AC_MSG_CHECKING(for ada-compiler)
+AC_MSG_CHECKING(for Ada95 compiler)
 AC_ARG_WITH(ada-compiler,
-	[  --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)],
+	[[  --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]],
 	[cf_ada_compiler=$withval],
 	[cf_ada_compiler=gnatmake])
 AC_SUBST(cf_ada_compiler)
 AC_MSG_RESULT($cf_ada_compiler)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl Command-line option to specify where Ada includes will install.
 AC_DEFUN([CF_WITH_ADA_INCLUDE],[
-AC_MSG_CHECKING(for ada-include)
+AC_MSG_CHECKING(for Ada95 include directory)
 CF_WITH_PATH(ada-include,
-   [  --with-ada-include=DIR  Ada includes are in DIR],
+   [  --with-ada-include=DIR  find Ada95 includes in DIR],
    ADA_INCLUDE,
    PREFIX/share/ada/adainclude,
    [$]prefix/share/ada/adainclude)
@@ -4764,16 +4764,16 @@ AC_SUBST(ADA_INCLUDE)
 AC_MSG_RESULT($ADA_INCLUDE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41
+dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl CF_WITH_ADA_LIBNAME
 dnl -------------------
 dnl Command-line option to specify how to name the resulting Ada library.
 dnl $1 = default value
 AC_DEFUN([CF_WITH_ADA_LIBNAME],[
-AC_MSG_CHECKING(for ada-libname)
+AC_MSG_CHECKING(for Ada95 curses library name)
 AC_ARG_WITH(ada-libname,
-   [  --with-ada-libname=XXX  override default Ada library-name],
+   [  --with-ada-libname=XXX  use XXX as Ada95 library name],
    ADA_LIBNAME=[$]withval,
    ADA_LIBNAME=$1)
 case "x$ADA_LIBNAME" in
@@ -4785,13 +4785,13 @@ AC_SUBST(ADA_LIBNAME)
 AC_MSG_RESULT($ADA_LIBNAME)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl Command-line option to specify where Ada objects will install.
 AC_DEFUN([CF_WITH_ADA_OBJECTS],[
-AC_MSG_CHECKING(for ada-objects)
+AC_MSG_CHECKING(for Ada95 object directory)
 CF_WITH_PATH(ada-objects,
-   [  --with-ada-objects=DIR  Ada objects are in DIR],
+   [  --with-ada-objects=DIR  find Ada95 objects in DIR],
    ADA_OBJECTS,
    PREFIX/lib/ada/adalib,
    [$]prefix/lib/ada/adalib)
@@ -4799,28 +4799,34 @@ AC_SUBST(ADA_OBJECTS)
 AC_MSG_RESULT($ADA_OBJECTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35
+dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01
 dnl ---------------------
-dnl Command-line option to specify if an Ada95 shared-library should be built,
+dnl Command-line option to specify if an Ada95 shared library should be built,
 dnl and optionally what its soname should be.
 AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
 AC_REQUIRE([CF_GNAT_PROJECTS])
-AC_MSG_CHECKING(if an Ada95 shared-library should be built)
+AC_MSG_CHECKING(whether to build an Ada95 shared library)
 AC_ARG_WITH(ada-sharedlib,
-	[  --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
+	[  --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support],
 	[with_ada_sharedlib=$withval],
 	[with_ada_sharedlib=no])
-AC_MSG_RESULT($with_ada_sharedlib)
+cf_ada_sharedlib_warn=no
 
 if test "x$with_ada_sharedlib" != xno
 then
 	if test "x$cf_gnat_projects" != xyes
 	then
-		AC_MSG_WARN(disabling shared-library since GNAT projects are not supported)
 		with_ada_sharedlib=no
+		cf_ada_sharedlib_warn=yes
 	fi
 fi
 
+AC_MSG_RESULT($with_ada_sharedlib)
+if test "x$cf_ada_sharedlib_warn" != xno
+then
+	AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported)
+fi
+
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 MAKE_ADA_SHAREDLIB="#"
 
diff --git a/Ada95/configure b/Ada95/configure
index 59e75b183..9a9ef92cf 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -705,7 +705,7 @@ General Options:
   --with-system-type=XXX  test: override derived host system-type
   --disable-stripping     do not strip (debug info) installed executables
   --with-strip-program=XX specify program to use when stripping in install
-  --with-pkg-config{=path} enable/disable use of pkg-config
+  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
   --with-pkg-config-libdir=XXX use given directory for installing pc-files
   --without-tests         suppress build with test-programs
   --enable-mixed-case     tic should assume mixed-case filenames
@@ -722,7 +722,7 @@ Options to Specify the Libraries Built/Used:
   --with-curses-dir=DIR   directory in which (n)curses is installed
   --enable-widec          compile with wide-char/UTF-8 code
   --with-lib-prefix       override library-prefix
-  --with-shlib-version=X  Specify rel or abi version for shared libs
+  --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names
   --enable-rpath-link     link sample programs with rpath option
 Fine-Tuning Your Configuration:
   --enable-broken_linker  compile with broken-linker support code
@@ -748,11 +748,11 @@ Testing/development Options:
   --with-trace            test: add trace() function to all models of ncurses
   --disable-gnat-projects test: disable GNAT projects even if usable
 Ada95 Binding Options:
-  --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)
-  --with-ada-include=DIR  Ada includes are in DIR (default: PREFIX/share/ada/adainclude)
-  --with-ada-objects=DIR  Ada objects are in DIR (default: PREFIX/lib/ada/adalib)
-  --with-ada-sharedlib=soname build shared-library (requires GNAT projects)
-  --with-ada-libname=XXX  override default Ada library-name
+  --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)
+  --with-ada-include=DIR  find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude)
+  --with-ada-objects=DIR  find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib)
+  --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support
+  --with-ada-libname=XXX  use XXX as Ada95 library name
 
 Some influential environment variables:
   CC          C compiler command
@@ -11746,8 +11746,8 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:11749: 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
+	echo "$as_me:11749: checking whether to use release or ABI version in shared library file names" >&5
+echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
 if test "${with_shlib_version+set}" = set; then
@@ -18043,8 +18043,8 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18046: checking for ada-compiler" >&5
-echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+echo "$as_me:18046: checking for Ada95 compiler" >&5
+echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
 if test "${with_ada_compiler+set}" = set; then
@@ -18059,8 +18059,8 @@ echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18062: checking for ada-include" >&5
-echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+echo "$as_me:18062: checking for Ada95 include directory" >&5
+echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
 if test "${with_ada_include+set}" = set; then
@@ -18107,8 +18107,8 @@ eval ADA_INCLUDE="$withval"
 echo "$as_me:18107: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18110: checking for ada-objects" >&5
-echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+echo "$as_me:18110: checking for Ada95 object directory" >&5
+echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
 if test "${with_ada_objects+set}" = set; then
@@ -18155,8 +18155,8 @@ eval ADA_OBJECTS="$withval"
 echo "$as_me:18155: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18158: 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
+echo "$as_me:18158: checking whether to build an Ada95 shared library" >&5
+echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
 if test "${with_ada_sharedlib+set}" = set; then
@@ -18165,19 +18165,25 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:18168: result: $with_ada_sharedlib" >&5
-echo "${ECHO_T}$with_ada_sharedlib" >&6
+cf_ada_sharedlib_warn=no
 
 if test "x$with_ada_sharedlib" != xno
 then
 	if test "x$cf_gnat_projects" != xyes
 	then
-		{ echo "$as_me:18175: 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
+		cf_ada_sharedlib_warn=yes
 	fi
 fi
 
+echo "$as_me:18179: result: $with_ada_sharedlib" >&5
+echo "${ECHO_T}$with_ada_sharedlib" >&6
+if test "x$cf_ada_sharedlib_warn" != xno
+then
+	{ echo "$as_me:18183: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+fi
+
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 MAKE_ADA_SHAREDLIB="#"
 
@@ -18192,8 +18198,8 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18195: checking for ada-libname" >&5
-echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+echo "$as_me:18201: checking for Ada95 curses library name" >&5
+echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 if test "${with_ada_libname+set}" = set; then
@@ -18208,16 +18214,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18211: result: $ADA_LIBNAME" >&5
+echo "$as_me:18217: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18215: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18221: 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:18220: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18226: 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
@@ -18257,7 +18263,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18260: checking default library suffix" >&5
+echo "$as_me:18266: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18268,10 +18274,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18271: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18277: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18274: checking default library-dependency suffix" >&5
+echo "$as_me:18280: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18354,10 +18360,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18357: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18363: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18360: checking default object directory" >&5
+echo "$as_me:18366: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18373,7 +18379,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18376: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18382: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18515,7 +18521,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18518: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18524: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18696,7 +18702,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18699: error: ambiguous option: $1
+    { { echo "$as_me:18705: 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;}
@@ -18715,7 +18721,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18718: error: unrecognized option: $1
+  -*) { { echo "$as_me:18724: 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;}
@@ -18790,7 +18796,7 @@ do
   "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:18793: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18799: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19151,7 +19157,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19154: creating $ac_file" >&5
+    { echo "$as_me:19160: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19169,7 +19175,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19172: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19178: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19182,7 +19188,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19185: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19191: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19198,7 +19204,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19201: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19207: 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;}
@@ -19207,7 +19213,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19210: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19216: 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;}
@@ -19252,7 +19258,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19255: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19261: 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;}
@@ -19263,7 +19269,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19266: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19272: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19312,7 +19318,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19315: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19321: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19323,7 +19329,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19326: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19332: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19336,7 +19342,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19339: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19345: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19394,7 +19400,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19397: $ac_file is unchanged" >&5
+      { echo "$as_me:19403: $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/INSTALL b/INSTALL
index 39a8a9f8f..9dabaa89e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.249 2023/10/21 15:51:23 tom Exp $
+-- $Id: INSTALL,v 1.251 2023/10/28 16:54:24 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -35,10 +35,10 @@
     * READ ALL OF THIS FILE BEFORE YOU TRY TO INSTALL NCURSES. *
     ************************************************************
 
-You should be reading the file INSTALL in a directory called ncurses-d.d, where
-d.d is the current version number.  There should be several subdirectories,
-including `c++', `form', `man', `menu', 'misc', `ncurses', `panel', `progs',
-and `test'.  See the README file for a roadmap to the package.
+You should be reading the file INSTALL in a directory called ncurses-d.d,
+where d.d is the current version number.  There should be several
+subdirectories, including 'c++', 'form', 'man', 'menu', 'misc', 'ncurses',
+'panel', 'progs', and 'test'.  See 'README' for a roadmap to the package.
 
 If you are a distribution integrator or packager, please read and act on the
 section titled FOR SYSTEM INTEGRATORS below.
@@ -49,7 +49,8 @@ to read the BSD CONVERSION NOTES section below.
 If you are trying to build applications using gpm with ncurses,
 read the USING NCURSES WITH GPM section below.
 
-If you are cross-compiling, see the note below on BUILDING WITH A CROSS-COMPILER.
+If you are cross-compiling, see the note below on
+BUILDING WITH A CROSS-COMPILER.
 
 If you want to build the Ada95 binding, go to the Ada95 directory and
 follow the instructions there.  The Ada95 binding is not covered below.
@@ -72,9 +73,9 @@ Ncurses has been also built in the OS/2 EMX environment.
 INSTALLATION PROCEDURE:
 ----------------------
 
-1.  First, decide whether you want ncurses to replace your existing library (in
-    which case you'll need super-user privileges) or be installed in parallel
-    with it.
+1.  First, decide whether you want ncurses to replace your existing library
+    (in which case you'll need super-user privileges) or be installed in
+    parallel with it.
 
     The --prefix option to configure changes the root directory for installing
     ncurses.  The default is normally in subdirectories of /usr/local, except
@@ -106,16 +107,16 @@ INSTALLATION PROCEDURE:
 
     See also the discussion of --with-install-prefix.
 
-2.  Type `./configure' in the top-level directory of the distribution to
+2.  Type './configure' in the top-level directory of the distribution to
     configure ncurses for your operating system and create the Makefiles.
     Besides --prefix, various configuration options are available to customize
-    the installation; use `./configure --help' to list the available options.
+    the installation; use './configure --help' to list the available options.
 
     If your operating system is not supported, read the PORTABILITY section in
     the file ncurses/README for information on how to create a configuration
     file for your system.
 
-    The `configure' script generates makefile rules for one or more object
+    The 'configure' script generates makefile rules for one or more object
     models and their associated libraries:
 
 	libncurses.a (normal)
@@ -145,7 +146,7 @@ INSTALLATION PROCEDURE:
     the library names (e.g., libncursest.a, libncursestw.a).
 
     If you do not specify any models, the normal and debug libraries will be
-    configured.  Typing `configure' with no arguments is equivalent to:
+    configured.  Typing 'configure' with no arguments is equivalent to:
 
 	./configure --with-normal --with-debug --enable-overwrite
 
@@ -179,7 +180,7 @@ INSTALLATION PROCEDURE:
     also interpret the contents of the TERM environment variable.  See the
     section BSD CONVERSION NOTES below.
 
-3.  Type `make'.  Ignore any warnings, no error messages should be produced.
+3.  Type 'make'.  Ignore any warnings; no error messages should be produced.
     This should compile the ncurses library, the terminfo compiler tic(1),
     captoinfo(1), infocmp(1), toe(1), clear(1) tset(1), reset(1), and tput(1)
     programs (see the manual pages for explanation of what they do), some test
@@ -195,8 +196,9 @@ INSTALLATION PROCEDURE:
     database before running the test programs.  Not all vendors' terminfo
     databases are SVr4-compatible, but most seem to be.
 
-    It is possible to configure ncurses to use other terminfo database formats.
-    A few are provided as examples in the include-directory (see --with-caps).
+    It is possible to configure ncurses to use other terminfo database
+    formats.  A few are provided as examples in the include-directory (see
+    --with-caps).
 
     If you run the test programs WITHOUT installing terminfo, ncurses may
     read the termcap file and cache that in $HOME/.terminfo, which will
@@ -207,21 +209,21 @@ INSTALLATION PROCEDURE:
     You can use it to verify that the screen highlights work correctly, that
     cursor addressing and window scrolling works OK, etc.
 
-5.  Once you've tested, you can type `make install' to install libraries,
-    the programs, the terminfo database and the manual pages.  Alternately, you
-    can type `make install' in each directory you want to install.  In the
+5.  Once you've tested, you can type 'make install' to install libraries,
+    the programs, the terminfo database and the manual pages.  Alternately,
+    you can type 'make install' in each directory you want to install.  In the
     top-level directory, you can do a partial install using these commands:
 
 	'make install.progs'    installs tic, infocmp, etc...
 	'make install.includes' installs the headers.
 	'make install.libs'     installs the libraries (and the headers).
-	'make install.data'     installs the terminfo data. (Note: `tic' must
+	'make install.data'     installs the terminfo data. (Note: 'tic' must
 				be installed before the terminfo data can be
 				compiled).
 	'make install.man'      installs the manual pages.
 
   ############################################################################
-  #     CAVEAT EMPTOR: `install.data' run as root will NUKE any existing     #
+  #     CAVEAT EMPTOR: 'install.data' run as root will NUKE any existing     #
   #  terminfo database. If you have any custom or unusual entries SAVE them  #
   #  before you install ncurses.                                             #
   ############################################################################
@@ -242,8 +244,8 @@ INSTALLATION PROCEDURE:
     compile using its curses.h you'll end up with a large number of
     undefined symbols at link time.
 
-    IF YOU DO NOT HAVE ROOT: Change directory to the `progs' subdirectory
-    and run the `capconvert' script.  This script will deduce various things
+    IF YOU DO NOT HAVE ROOT: Change directory to the 'progs' subdirectory
+    and run the 'capconvert' script.  This script will deduce various things
     about your environment and use them to build you a private terminfo tree,
     so you can use ncurses applications.
 
@@ -273,13 +275,13 @@ CONFIGURE OPTIONS:
 
 	./configure --help
 
-    The --help and several options are common to all configure scripts that are
-    generated with autoconf.  Those are all listed before the line
+    The --help and several options are common to all configure scripts that
+    are generated with autoconf.  Those are all listed before the line
 
 	--enable and --with options recognized:
 
-    The other options are specific to this package.  We list them in alphabetic
-    order.
+    The other options are specific to this package.  We list them in
+    alphabetic order.
 
     --disable-assumed-color
 	With ncurses 5.1, we introduced a new function, assume_default_colors()
@@ -668,9 +670,10 @@ CONFIGURE OPTIONS:
     --enable-opaque-form
     --enable-opaque-menu
     --enable-opaque-panel
-	Define symbol in curses.h which controls whether some library
-	structures are treated as "opaque".  The --enable-opaque-curses option
-	may be overridden by the --enable-reentrant option.
+	Define symbol in curses.h controlling whether some library structures
+	are opaque, meaning that their members are accessible only via the
+	documented API.  The --enable-opaque-curses option may be overridden
+	by the --enable-reentrant option.
 
 	Enabling opaque-curses enables opaque for the form, menu, and panel
 	libraries.  Use their corresponding options to disable the feature
@@ -936,8 +939,9 @@ CONFIGURE OPTIONS:
 	script supplies "unsigned").
 
     --with-config-suffix=XXX
-	Specify a suffix for the ncursesw6-config file, etc., used to work
-	around conflicts with packages.
+	Specify an suffix for "ncurses*" in the ncurses*-config filename to
+	work around conflicts with packages.  The suffix is placed before the
+	dash.
 
     --with-cxx-libname=NAME
 	Override the basename of the ncurses++ library (default: "ncurses++")
@@ -1158,9 +1162,10 @@ CONFIGURE OPTIONS:
 	Override the basename of the panel library (default: "panel")
 
     --with-pc-suffix=SUFFIX
-	If ".pc" files are installed, optionally add a suffix to the files
-	and corresponding package names to separate unusual configurations.
-	If no option value is given (or if it is "none"), no suffix is added.
+	If ".pc" files are installed (see --enable-pc-files), optionally add a
+	suffix to the files and corresponding package names to separate
+	unusual configurations.  If no option value is given (or if it is
+	"none"), no suffix is added.
 
     --with-pcre2
 	Add PCRE2 (Perl-compatible regular expressions v2) to the build if it
@@ -1171,12 +1176,20 @@ CONFIGURE OPTIONS:
 	not supplied by the development environment, while ncurses' form
 	library uses a regular expression feature for one of the field types.
 
-    --with-pkg-config=[DIR]
-	Check for pkg-config, optionally specifying its path.
+    --with-pkg-config[=CMD]
+	Check for pkg-config, optionally specifying its pathname.
 
-    --with-pkg-config-libdir=[DIR]
+    --with-pkg-config-libdir[=DIR]
 	If pkg-config was found, override the automatic check for its library
-	path.  The configure script allows only a single directory, because
+	path.  The optional DIR value can be
+	
+	"auto", automatically use pkg-config's library directory, or
+	
+	"libdir", use a ${libdir}/pkgconfig (based on the configuration), or
+	
+	a directory path, i.e., beginning with "/".
+
+	The configure script allows only a single directory, because
 	that is used as the directory in which to install ".pc" files.
 
 	The automatic check for the library path prefers the first directory
@@ -1186,12 +1199,6 @@ CONFIGURE OPTIONS:
 	default), or if pkg-config lists nothing suitable, the first one which
 	is listed by pkg-config is used.
 
-	Automatic selection is overridden by providing an option-value
-	beginning with "/".
-
-	If this option is omitted, the default directory for installing
-	".pc" files is ${libdir}/pkgconfig
-
     --with-profile
 	Generate profile-libraries These are named by adding "_p" to the root,
 	e.g., libncurses_p.a
@@ -1444,6 +1451,16 @@ COMPATIBILITY WITH OLDER RELEASES:
     you may encounter when building a system with different versions of
     ncurses:
 
+    6.5 (TBD; not stable; in development)
+	Interface changes:
+
+	+ the WINDOW structure and some related internal data types declared
+	  in <curses.h> have been made opaque by default;
+	+ the FORM, MENU, and PANEL structures and related internal data types
+	  from their corresponding header files have been made opqaue by
+	  default; and
+	+ support for wide characters is now enabled by default.
+
     6.4 (Dec 31, 2022)
 	Interface changes:
 
@@ -2259,10 +2276,10 @@ FOR SYSTEM INTEGRATORS:
     Naming the Console Terminal
 
 	In various systems there has been a practice of designating the system
-	console driver type as `console'.  Please do not do this!  It
+	console driver type as 'console'.  Please do not do this!  It
 	complicates peoples' lives, because it can mean that several different
 	terminfo entries from different operating systems all logically want to
-	be called `console'.
+	be called 'console'.
 
 	Please pick a name unique to your console driver and set that up
 	in the /etc/inittab table or local equivalent.  Send the entry to the
@@ -2500,4 +2517,4 @@ BUG REPORTS:
 	The Hacker's Guide in the doc directory includes some guidelines
 	on how to report bugs in ways that will get them fixed most quickly.
 
--- vile:txtmode
+-- vile:txtmode fc=78
diff --git a/NEWS b/NEWS
index 53e715d1d..4c04caf16 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4019 2023/10/21 23:13:51 tom Exp $
+-- $Id: NEWS,v 1.4022 2023/10/28 18:20:39 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231028
+	+ move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as
+	  fe/fd capabilities, like vim (vim-pr #13440).
+	+ modify --with-pkg-config-libdir option to make "libdir" the default,
+	  as documented, rather than "auto" (report by Branden Robinson).
+	+ improve messages from configure script (patches by Branden Robinson).
+
 20231021
 	+ use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD
 	+ add ansi+apparrows -TD
diff --git a/README b/README
index 4e4e0da07..5587f5b70 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.30 2023/04/22 15:49:24 tom Exp $
+-- $Id: README,v 1.31 2023/10/28 14:49:04 tom Exp $
 -------------------------------------------------------------------------------
 		README file for the ncurses package
 
@@ -35,11 +35,13 @@ See the file INSTALL for instructions on how to build and install ncurses.
 See the file NEWS for a release history and bug-fix notes.
 See the file TO-DO for things that still need doing, including known bugs.
 
-Browse the file misc/ncurses-intro.html for narrative descriptions of how
+Browse the file doc/html/ncurses-intro.html for narrative descriptions of how
 to use ncurses and the panel, menu, and form libraries.
 
 Browse the file doc/html/hackguide.html for a tour of the package internals.
 
+Find plain text versions of both of these documents in doc/.
+
 ROADMAP AND PACKAGE OVERVIEW:
 
 You should be reading this file in a directory called:  ncurses-d.d, where d.d
@@ -80,7 +82,7 @@ version.
 
 If you configure using the --enable-reentrant option, a "t" is appended to the
 library names (e.g., libncursest.a) and the resulting libraries have a
-different binary interface which makes the ncurses interface more "opaque".
+different binary interface, making the ncurses interface more opaque.
 
 The ncurses libraries implement the curses API.  The panel, menu and forms
 libraries implement clones of the SVr4 panel, menu and forms APIs.  The source
@@ -88,9 +90,9 @@ code for these lives in the `ncurses', `panel', `menu', and `form' directories
 respectively.
 
 In the `c++' directory, you'll find code that defines an interface to the
-curses, forms, menus and panels library packaged as C++ classes, and a demo program in C++
-to test it.  These class definition modules are not installed by the 'make
-install.libs' rule as libncurses++.
+curses, forms, menus and panels library packaged as C++ classes, and a demo
+program in C++ to test it.  These class definition modules are not installed
+by the 'make install.libs' rule as libncurses++.
 
 In the `Ada95' directory, you'll find code and documentation for an
 Ada95 binding of the curses API, to be used with the GNAT compiler.
@@ -101,8 +103,8 @@ for documentation of the binding.
 
 To do its job, the ncurses code needs your terminal type to be set in the
 environment variable TERM (normally set by your OS; under UNIX, getty(1)
-typically does this, but you can override it in your .profile); and, it needs a
-database of terminal descriptions in which to look up your terminal type's
+typically does this, but you can override it in your .profile); and, it needs
+a database of terminal descriptions in which to look up your terminal type's
 capabilities.
 
 In older (V7/BSD) versions of curses, the database was a flat text file,
@@ -116,10 +118,10 @@ second form.
 In the `misc' directory, there is a text file terminfo.src, in editable
 terminfo format, which can be used to generate the terminfo binaries (that's
 what make install.data does).  If the package was built with the
---enable-termcap option enabled, and the ncurses library cannot find a terminfo
-description for your terminal, it will fall back to the termcap file supplied
-with your system (which the ncurses package installation leaves strictly
-alone).
+--enable-termcap option enabled, and the ncurses library cannot find a
+terminfo description for your terminal, it will fall back to the termcap file
+supplied with your system (which the ncurses package installation leaves
+strictly alone).
 
 The utilities are as follows:
 
@@ -175,8 +177,8 @@ Eric S. Raymond:
 	xterm mouse support, and the ncurses test program.
 
 Juergen Pfeifer
-	The menu and form libraries, C++ bindings for ncurses, menus, forms and
-	panels, as well as the Ada95 binding.  Ongoing support for panel.
+	The menu and form libraries, C++ bindings for ncurses, menus, forms
+	and panels, as well as the Ada95 binding.  Ongoing support for panel.
 
 CONTRIBUTORS:
 
@@ -215,3 +217,5 @@ BUGS:
 	See the INSTALL file for bug and developer-list addresses.
 	The Hacker's Guide in the doc directory includes some guidelines
 	on how to report bugs in ways that will get them fixed most quickly.
+
+-- vile:txtmode fc=78
diff --git a/VERSION b/VERSION
index 25e77a8ef..c2f4c9b4f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231021
+5:0:10	6.4	20231028
diff --git a/aclocal.m4 b/aclocal.m4
index 3b5b241b7..883f50f18 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1053 2023/10/21 12:54:23 tom Exp $
+dnl $Id: aclocal.m4,v 1.1056 2023/10/28 16:51:30 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2273,7 +2273,7 @@ AC_DEFUN([CF_ERRNO],
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ETIP_DEFINES version: 6 updated: 2021/01/02 17:09:14
+dnl CF_ETIP_DEFINES version: 7 updated: 2023/10/28 11:59:01
 dnl ---------------
 dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
 dnl math.h and builtin.h, only for ncurses
@@ -2305,7 +2305,7 @@ AC_TRY_COMPILE([
 ],[])
 done
 done
-AC_MSG_RESULT($cf_result)
+AC_MSG_RESULT([${cf_result:-(none)}])
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------
@@ -6623,7 +6623,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
+dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 dnl
@@ -6632,7 +6632,7 @@ AC_DEFUN([CF_PKG_CONFIG],
 [
 AC_MSG_CHECKING(if you want to use pkg-config)
 AC_ARG_WITH(pkg-config,
-	[  --with-pkg-config{=path} enable/disable use of pkg-config],
+	[[  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
 	[cf_pkg_config=$withval],
 	[cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
@@ -7375,7 +7375,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34
+dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -7421,9 +7421,9 @@ AC_DEFUN([CF_SHARED_OPTS],
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	AC_MSG_CHECKING(if release/abi version should be used for shared libs)
+	AC_MSG_CHECKING(whether to use release or ABI version in shared library file names)
 	AC_ARG_WITH(shlib-version,
-	[  --with-shlib-version=X  Specify rel or abi version for shared libs],
+	[[  --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]],
 	[test -z "$withval" && withval=auto
 	case "$withval" in
 	(yes)
@@ -8953,26 +8953,26 @@ $1_ABI=$cf_cv_abi_version
 cf_cv_abi_default=$cf_cv_abi_version
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
 dnl --------------------
 dnl Command-line option to specify the Ada95 compiler.
 AC_DEFUN([CF_WITH_ADA_COMPILER],[
-AC_MSG_CHECKING(for ada-compiler)
+AC_MSG_CHECKING(for Ada95 compiler)
 AC_ARG_WITH(ada-compiler,
-	[  --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)],
+	[[  --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]],
 	[cf_ada_compiler=$withval],
 	[cf_ada_compiler=gnatmake])
 AC_SUBST(cf_ada_compiler)
 AC_MSG_RESULT($cf_ada_compiler)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl Command-line option to specify where Ada includes will install.
 AC_DEFUN([CF_WITH_ADA_INCLUDE],[
-AC_MSG_CHECKING(for ada-include)
+AC_MSG_CHECKING(for Ada95 include directory)
 CF_WITH_PATH(ada-include,
-   [  --with-ada-include=DIR  Ada includes are in DIR],
+   [  --with-ada-include=DIR  find Ada95 includes in DIR],
    ADA_INCLUDE,
    PREFIX/share/ada/adainclude,
    [$]prefix/share/ada/adainclude)
@@ -8980,16 +8980,16 @@ AC_SUBST(ADA_INCLUDE)
 AC_MSG_RESULT($ADA_INCLUDE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41
+dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl CF_WITH_ADA_LIBNAME
 dnl -------------------
 dnl Command-line option to specify how to name the resulting Ada library.
 dnl $1 = default value
 AC_DEFUN([CF_WITH_ADA_LIBNAME],[
-AC_MSG_CHECKING(for ada-libname)
+AC_MSG_CHECKING(for Ada95 curses library name)
 AC_ARG_WITH(ada-libname,
-   [  --with-ada-libname=XXX  override default Ada library-name],
+   [  --with-ada-libname=XXX  use XXX as Ada95 library name],
    ADA_LIBNAME=[$]withval,
    ADA_LIBNAME=$1)
 case "x$ADA_LIBNAME" in
@@ -9001,13 +9001,13 @@ AC_SUBST(ADA_LIBNAME)
 AC_MSG_RESULT($ADA_LIBNAME)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl Command-line option to specify where Ada objects will install.
 AC_DEFUN([CF_WITH_ADA_OBJECTS],[
-AC_MSG_CHECKING(for ada-objects)
+AC_MSG_CHECKING(for Ada95 object directory)
 CF_WITH_PATH(ada-objects,
-   [  --with-ada-objects=DIR  Ada objects are in DIR],
+   [  --with-ada-objects=DIR  find Ada95 objects in DIR],
    ADA_OBJECTS,
    PREFIX/lib/ada/adalib,
    [$]prefix/lib/ada/adalib)
@@ -9015,28 +9015,34 @@ AC_SUBST(ADA_OBJECTS)
 AC_MSG_RESULT($ADA_OBJECTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35
+dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01
 dnl ---------------------
-dnl Command-line option to specify if an Ada95 shared-library should be built,
+dnl Command-line option to specify if an Ada95 shared library should be built,
 dnl and optionally what its soname should be.
 AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
 AC_REQUIRE([CF_GNAT_PROJECTS])
-AC_MSG_CHECKING(if an Ada95 shared-library should be built)
+AC_MSG_CHECKING(whether to build an Ada95 shared library)
 AC_ARG_WITH(ada-sharedlib,
-	[  --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
+	[  --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support],
 	[with_ada_sharedlib=$withval],
 	[with_ada_sharedlib=no])
-AC_MSG_RESULT($with_ada_sharedlib)
+cf_ada_sharedlib_warn=no
 
 if test "x$with_ada_sharedlib" != xno
 then
 	if test "x$cf_gnat_projects" != xyes
 	then
-		AC_MSG_WARN(disabling shared-library since GNAT projects are not supported)
 		with_ada_sharedlib=no
+		cf_ada_sharedlib_warn=yes
 	fi
 fi
 
+AC_MSG_RESULT($with_ada_sharedlib)
+if test "x$cf_ada_sharedlib_warn" != xno
+then
+	AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported)
+fi
+
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 MAKE_ADA_SHAREDLIB="#"
 
@@ -9083,7 +9089,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_EXPORT_SYMS version: 3 updated: 2014/12/20 19:16:08
+dnl CF_WITH_EXPORT_SYMS version: 4 updated: 2023/10/28 11:59:01
 dnl -------------------
 dnl Use this with libtool to specify the list of symbols that may be exported.
 dnl The input file contains one symbol per line; comments work with "#".
@@ -9093,7 +9099,7 @@ AC_DEFUN([CF_WITH_EXPORT_SYMS],
 [
 AC_MSG_CHECKING(if exported-symbols file should be used)
 AC_ARG_WITH(export-syms,
-	[  --with-export-syms=XXX  limit exported symbols using libtool],
+	[  --with-export-syms=SYM-FILE limit symbols exported by libtool to those listed in SYM-FILE],
 	[with_export_syms=$withval],
 	[with_export_syms=no])
 if test "x$with_export_syms" = xyes
@@ -9285,7 +9291,7 @@ AC_SUBST(LIB_UNINSTALL)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL_OPTS version: 4 updated: 2015/04/17 21:13:04
+dnl CF_WITH_LIBTOOL_OPTS version: 5 updated: 2023/10/28 11:59:01
 dnl --------------------
 dnl Allow user to pass additional libtool options into the library creation
 dnl and link steps.  The main use for this is to do something like
@@ -9295,7 +9301,7 @@ dnl	./configure --enable-static
 AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[
 AC_MSG_CHECKING(for additional libtool options)
 AC_ARG_WITH(libtool-opts,
-	[  --with-libtool-opts=XXX specify additional libtool options],
+	[  --with-libtool-opts=XXX give libtool additional options XXX],
 	[with_libtool_opts=$withval],
 	[with_libtool_opts=no])
 AC_MSG_RESULT($with_libtool_opts)
@@ -9541,14 +9547,13 @@ if test -n "$PKG_CONFIG_PATH"; then
 elif test -n "$PKG_CONFIG_LIBDIR"; then
 	cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ 	]]*,,' -e 's,[[ 	]]*$,,'`
 else
-	cf_search_path=auto
+	cf_search_path=libdir
 fi
 
 # if the option is used, let that override.  otherwise default to "libdir"
 AC_ARG_WITH(pkg-config-libdir,
 	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-	[cf_search_path=$withval],
-	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+	[cf_search_path=$withval])
 
 case "x$cf_search_path" in
 (xlibdir)
@@ -9779,7 +9784,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 10 updated: 2021/01/04 18:48:01
+dnl CF_WITH_VERSIONED_SYMS version: 11 updated: 2023/10/28 11:59:01
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -9792,7 +9797,7 @@ AC_REQUIRE([AC_PROG_EGREP])dnl
 
 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
-	[  --with-versioned-syms=X markup versioned symbols using ld],
+	[  --with-versioned-syms=MAP-FILE version ELF shared library symbols per MAP-FILE],
 	[with_versioned_syms=$withval],
 	[with_versioned_syms=no])
 case "x$with_versioned_syms" in
@@ -9918,7 +9923,7 @@ AC_SUBST(VERSIONED_SYMS)
 AC_SUBST(WILDCARD_SYMS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
+dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01
 dnl ---------------
 dnl Handle configure option "--with-x11-rgb", setting these shell
 dnl variables:
@@ -9958,7 +9963,7 @@ dnl 	/usr/X11/lib/X11/rgb.txt
 AC_DEFUN([CF_WITH_X11_RGB],[
 AC_MSG_CHECKING(for X11 rgb file)
 AC_ARG_WITH(x11-rgb,
-	[  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
+	[  --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)],
 	[RGB_PATH=$withval],
 	[RGB_PATH=auto])
 
diff --git a/configure b/configure
index c30e376f9..d652dc078 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.769 .
+# From configure.in Revision: 1.770 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230903.
 #
@@ -725,13 +725,13 @@ Optional Features:
   --without-progs         suppress build/install with programs (e.g., tic)
   --without-tests         suppress build/install with test-programs
   --without-curses-h      install curses.h as ncurses.h only
-  --with-config-suffix=X  suffixes ncursesXX-config file
-  --with-pkg-config{=path} enable/disable use of pkg-config
+  --with-config-suffix=X  name ncurses*X-config file with X
+  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
   --with-pkg-config-libdir=XXX use given directory for installing pc-files
   --enable-pc-files       generate and install .pc files for pkg-config
-  --with-pc-suffix        suffixes pc-files
+  --with-pc-suffix=XXX    suffix pkg-config files with XXX
   --enable-mixed-case     tic should assume mixed-case filenames
-  --with-install-prefix   prefixes actual install-location ($DESTDIR)
+  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
@@ -752,10 +752,10 @@ Options to Specify the Libraries Built/Used:
   --with-ticlib           generate separate tic library
   --enable-rpath          use rpath option when generating shared libraries
   --disable-relink        relink shared libraries during install
-  --with-shlib-version=X  Specify rel or abi version for shared libs
-  --with-libtool-opts=XXX specify additional libtool options
-  --with-export-syms=XXX  limit exported symbols using libtool
-  --with-versioned-syms=X markup versioned symbols using ld
+  --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names
+  --with-libtool-opts=XXX give libtool additional options XXX
+  --with-export-syms=SYM-FILE limit symbols exported by libtool to those listed in SYM-FILE
+  --with-versioned-syms=MAP-FILE version ELF shared library symbols per MAP-FILE
   --with-gpm              use Alessandro Rubini's GPM library
   --without-dlsym         do not use dlsym() to load GPM dynamically
   --with-pcre2            use PCRE2 for regular-expressions
@@ -764,7 +764,7 @@ Options to Specify the Libraries Built/Used:
   --disable-rpath-hack    don't add rpath options for additional libraries
   --disable-pkg-ldflags   disable extra LDFLAGS for package-scripts
 Fine-Tuning Your Configuration:
-  --with-extra-suffix=X   append extra suffix to header/library paths
+  --with-extra-suffix=X   append extra suffix X to header/library paths
   --disable-overwrite     put headers in subdir, omit link to -lcurses
   --disable-database      do not use terminfo, only fallbacks/termcap
   --with-database=XXX     specify terminfo source to install
@@ -789,20 +789,20 @@ Fine-Tuning Your Configuration:
   --enable-symlinks       make tic use symbolic links not hard links
   --enable-broken_linker  compile with broken-linker support code
   --enable-bsdpad         recognize BSD-style prefix padding
-  --disable-widec         do not compile with wide-char/UTF-8 code
+  --disable-widec         compile without wide character and UTF-8 support
   --disable-lp64          allow chtype to be long (ignore _LP64)
   --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
   --enable-wattr-macros   enable wattr* macros
-  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
-  --with-bool=TYPE        override fallback type of bool variable
+  --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)
+  --with-bool=TYPE        fall back to TYPE for curses 'bool' typedef
   --with-caps=alt         compile with alternate Caps file
   --with-chtype=TYPE      override type of chtype
   --with-ospeed=TYPE      override type of ospeed variable
   --with-mmask-t=TYPE     override type of mmask_t
   --with-ccharw-max=XXX   override size CCHARW_MAX
-  --enable-signed-char    compile using signed Boolean's in term.h
+  --enable-signed-char    use signed chars for Boolean array in term.h
   --with-tparm-arg=TYPE   override parameter type of tparm
   --with-rcs-ids          compile-in RCS identifiers
 Options to Specify How Manpages are Installed:
@@ -829,10 +829,10 @@ Reentrant Code:
   --enable-pthreads-eintr enable EINTR in wgetch with pthreads
   --enable-weak-symbols   enable weak-symbols for pthreads
   --enable-reentrant      compile with reentrant code
-  --disable-opaque-curses do not make curses WINDOW, etc., "opaque"
-  --disable-opaque-form   do not make form-library structures "opaque"
-  --disable-opaque-menu   do not make menu-library structures "opaque"
-  --disable-opaque-panel  do not make panel-library structures "opaque"
+  --disable-opaque-curses do not make WINDOW, etc., structures opaque
+  --disable-opaque-form   do not make form library structures opaque
+  --disable-opaque-menu   do not make menu library structures opaque
+  --disable-opaque-panel  do not make panel library structures opaque
   --with-wrap-prefix=XXX  override prefix used for public variables
 Development Code:
   --without-develop       disable development options
@@ -866,11 +866,12 @@ Testing/development Options:
   --with-trace            test: add trace() function to all models of ncurses
   --disable-gnat-projects test: disable GNAT projects even if usable
 Ada Binding Options:
-  --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)
-  --with-ada-include=DIR  Ada includes are in DIR (default: PREFIX/share/ada/adainclude)
-  --with-ada-objects=DIR  Ada objects are in DIR (default: PREFIX/lib/ada/adalib)
-  --with-ada-sharedlib=soname build shared-library (requires GNAT projects)
-  --with-ada-libname=XXX  override default Ada library-name
+  --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)
+  --with-ada-include=DIR  find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude)
+  --with-ada-objects=DIR  find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib)
+  --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support
+  --with-ada-libname=XXX  use XXX as Ada95 library name
+Library basenames for pkgsrc:
   --with-form-libname=XXX override form basename of library
   --with-menu-libname=XXX override menu basename of library
   --with-panel-libname=XXX override panel basename of library
@@ -1072,7 +1073,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1075: loading site script $ac_site_file" >&5
+    { echo "$as_me:1076: 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"
@@ -1083,7 +1084,7 @@ if test -r "$cache_file"; then
   # 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:1086: loading cache $cache_file" >&5
+    { echo "$as_me:1087: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1091,7 +1092,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1094: creating cache $cache_file" >&5
+  { echo "$as_me:1095: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1107,21 +1108,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1110: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1111: 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:1114: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1115: 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:1120: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1121: 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:1122:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1123:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1124:   current value: $ac_new_val" >&5
+        { echo "$as_me:1125:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1140,9 +1141,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1143: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1144: 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:1145: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1146: 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
@@ -1171,10 +1172,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1174: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1175: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1177: \$? = $ac_status" >&5
+  echo "$as_me:1178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1191,7 +1192,7 @@ for ac_prog in ggrep grep
 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:1194: checking for $ac_word" >&5
+echo "$as_me:1195: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1206,7 +1207,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1209: found $ac_dir/$ac_word" >&5
+echo "$as_me:1210: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1214,10 +1215,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1217: result: $GREP" >&5
+  echo "$as_me:1218: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1220: result: no" >&5
+  echo "$as_me:1221: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1225,7 +1226,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1228: checking for egrep" >&5
+echo "$as_me:1229: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1237,7 +1238,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1240: checking for $ac_word" >&5
+echo "$as_me:1241: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1254,7 +1255,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:1257: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1258: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1265,10 +1266,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:1268: result: $EGREP" >&5
+  echo "$as_me:1269: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:1271: result: no" >&5
+  echo "$as_me:1272: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1276,12 +1277,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1279: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1280: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1284: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:1285: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -1292,11 +1293,11 @@ cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_abi_default=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
-echo "$as_me:1295: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+echo "$as_me:1296: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
 
 if test -f "$srcdir/VERSION" ; then
-	echo "$as_me:1299: checking for package version" >&5
+	echo "$as_me:1300: 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...
@@ -1308,39 +1309,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1311: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1312: 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:1316: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1317: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1320: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1321: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1323: checking for package patch date" >&5
+	echo "$as_me:1324: 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:1328: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1329: 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:1335: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1336: 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:1340: result: $VERSION_PATCH" >&5
+	echo "$as_me:1341: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1343: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1344: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1348,19 +1349,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
 
-echo "${as_me:-configure}:1351: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1352: testing ABI VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me:-configure}:1355: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1356: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me:-configure}:1359: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1360: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me:-configure}:1363: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1364: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
 	cf_PACKAGE=NCURSES
 	PACKAGE=ncurses
@@ -1384,7 +1385,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1387: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1388: 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;
@@ -1398,13 +1399,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1401: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1402: 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:1407: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1408: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1414,13 +1415,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1417: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1418: 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:1423: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1424: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1433,7 +1434,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1436: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1437: 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.*)
@@ -1452,13 +1453,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1455: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1456: 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:1461: error: ABI version value is empty" >&5
+  { { echo "$as_me:1462: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1491,7 +1492,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1494: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1495: 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
@@ -1501,11 +1502,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1504: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1505: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1508: checking build system type" >&5
+echo "$as_me:1509: 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
@@ -1514,23 +1515,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1517: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1518: 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:1521: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1522: 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:1526: result: $ac_cv_build" >&5
+echo "$as_me:1527: 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:1533: checking host system type" >&5
+echo "$as_me:1534: 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
@@ -1539,12 +1540,12 @@ else
 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:1542: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1543: 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:1547: result: $ac_cv_host" >&5
+echo "$as_me:1548: 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/'`
@@ -1552,7 +1553,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1555: checking target system type" >&5
+	echo "$as_me:1556: 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
@@ -1561,12 +1562,12 @@ else
 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:1564: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1565: 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:1569: result: $ac_cv_target" >&5
+echo "$as_me:1570: 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/'`
@@ -1598,13 +1599,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1601: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1602: 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:1605: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1606: 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:1607: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1608: 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
@@ -1612,7 +1613,7 @@ fi
 # 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:1615: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1616: 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
@@ -1623,7 +1624,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1626: checking for fgrep" >&5
+echo "$as_me:1627: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1635,7 +1636,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1638: checking for $ac_word" >&5
+echo "$as_me:1639: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1652,7 +1653,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1655: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1656: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1663,10 +1664,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1666: result: $FGREP" >&5
+  echo "$as_me:1667: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1669: result: no" >&5
+  echo "$as_me:1670: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1674,16 +1675,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1677: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1678: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1682: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1683: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1686: checking for prefix" >&5
+echo "$as_me:1687: 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
@@ -1695,11 +1696,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1698: result: $prefix" >&5
+echo "$as_me:1699: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1702: checking for default include-directory" >&5
+echo "$as_me:1703: 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 \
@@ -1722,7 +1723,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1725: result: $includedir" >&5
+echo "$as_me:1726: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1787,20 +1788,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1790: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1791: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1796: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1797: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1803: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1804: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1835,7 +1836,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1838: checking for $ac_word" >&5
+echo "$as_me:1839: 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
@@ -1850,7 +1851,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1853: found $ac_dir/$ac_word" >&5
+echo "$as_me:1854: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1858,10 +1859,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1861: result: $CC" >&5
+  echo "$as_me:1862: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1864: result: no" >&5
+  echo "$as_me:1865: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1874,7 +1875,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1877: checking for $ac_word" >&5
+echo "$as_me:1878: 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
@@ -1889,7 +1890,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1892: found $ac_dir/$ac_word" >&5
+echo "$as_me:1893: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1897,10 +1898,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1900: result: $ac_ct_CC" >&5
+  echo "$as_me:1901: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1903: result: no" >&5
+  echo "$as_me:1904: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1910,32 +1911,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1913: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1914: 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:1918:" \
+echo "$as_me:1919:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1921: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1922: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1924: \$? = $ac_status" >&5
+  echo "$as_me:1925: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1926: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1927: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1929: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1931: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1932: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1934: \$? = $ac_status" >&5
+  echo "$as_me:1935: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1938 "configure"
+#line 1939 "configure"
 #include "confdefs.h"
 
 int
@@ -1951,13 +1952,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1954: checking for C compiler default output" >&5
+echo "$as_me:1955: 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:1957: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1958: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1960: \$? = $ac_status" >&5
+  echo "$as_me:1961: \$? = $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
@@ -1980,34 +1981,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1983: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1984: 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:1989: result: $ac_file" >&5
+echo "$as_me:1990: 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:1994: checking whether the C compiler works" >&5
+echo "$as_me:1995: 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:2000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2003: \$? = $ac_status" >&5
+  echo "$as_me:2004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2010: error: cannot run C compiled programs.
+	{ { echo "$as_me:2011: 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;}
@@ -2015,24 +2016,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2018: result: yes" >&5
+echo "$as_me:2019: 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:2025: checking whether we are cross compiling" >&5
+echo "$as_me:2026: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2027: result: $cross_compiling" >&5
+echo "$as_me:2028: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2030: checking for executable suffix" >&5
+echo "$as_me:2031: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2035: \$? = $ac_status" >&5
+  echo "$as_me:2036: \$? = $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
@@ -2048,25 +2049,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2051: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2052: 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:2057: result: $ac_cv_exeext" >&5
+echo "$as_me:2058: 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:2063: checking for object suffix" >&5
+echo "$as_me:2064: 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 2069 "configure"
+#line 2070 "configure"
 #include "confdefs.h"
 
 int
@@ -2078,10 +2079,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2084: \$? = $ac_status" >&5
+  echo "$as_me:2085: \$? = $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
@@ -2093,24 +2094,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2096: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2097: 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:2103: result: $ac_cv_objext" >&5
+echo "$as_me:2104: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2107: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2108: 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 2113 "configure"
+#line 2114 "configure"
 #include "confdefs.h"
 
 int
@@ -2125,16 +2126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2131: \$? = $ac_status" >&5
+  echo "$as_me:2132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2137: \$? = $ac_status" >&5
+  echo "$as_me:2138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2146,19 +2147,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2149: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2150: 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:2155: checking whether $CC accepts -g" >&5
+echo "$as_me:2156: 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 2161 "configure"
+#line 2162 "configure"
 #include "confdefs.h"
 
 int
@@ -2170,16 +2171,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2176: \$? = $ac_status" >&5
+  echo "$as_me:2177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2182: \$? = $ac_status" >&5
+  echo "$as_me:2183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2189,7 +2190,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2192: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2193: 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
@@ -2216,16 +2217,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2222: \$? = $ac_status" >&5
+  echo "$as_me:2223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2228: \$? = $ac_status" >&5
+  echo "$as_me:2229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2237,7 +2238,7 @@ if { (eval echo "$as_me:2219: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2240 "configure"
+#line 2241 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2250,16 +2251,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2256: \$? = $ac_status" >&5
+  echo "$as_me:2257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2262: \$? = $ac_status" >&5
+  echo "$as_me:2263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2269,7 +2270,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2272 "configure"
+#line 2273 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2281,16 +2282,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2285: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2287: \$? = $ac_status" >&5
+  echo "$as_me:2288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2293: \$? = $ac_status" >&5
+  echo "$as_me:2294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2320,11 +2321,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2323: checking version of $CC" >&5
+	echo "$as_me:2324: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2327: result: $GCC_VERSION" >&5
+	echo "$as_me:2328: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2333,12 +2334,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2336: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2337: 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 2341 "configure"
+#line 2342 "configure"
 #include "confdefs.h"
 
 int
@@ -2355,16 +2356,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2361: \$? = $ac_status" >&5
+  echo "$as_me:2362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2367: \$? = $ac_status" >&5
+  echo "$as_me:2368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2375,7 +2376,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2378: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2379: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2384,11 +2385,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2387: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2388: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2391 "configure"
+#line 2392 "configure"
 #include "confdefs.h"
 
 int
@@ -2405,16 +2406,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2411: \$? = $ac_status" >&5
+  echo "$as_me:2412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2417: \$? = $ac_status" >&5
+  echo "$as_me:2418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2424,7 +2425,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2427: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2428: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2433,30 +2434,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2436: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2437: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2443: checking version of $CC" >&5
+	echo "$as_me:2444: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2447: result: $CLANG_VERSION" >&5
+	echo "$as_me:2448: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2454: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2455: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2459 "configure"
+#line 2460 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2470,16 +2471,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2476: \$? = $ac_status" >&5
+  echo "$as_me:2477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2482: \$? = $ac_status" >&5
+  echo "$as_me:2483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2490,13 +2491,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2493: result: $cf_clang_optok" >&5
+		echo "$as_me:2494: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2499: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2500: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2505,7 +2506,7 @@ echo "${as_me:-configure}:2499: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2508: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2509: 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
@@ -2513,7 +2514,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2516 "configure"
+#line 2517 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2560,16 +2561,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2566: \$? = $ac_status" >&5
+  echo "$as_me:2567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2572: \$? = $ac_status" >&5
+  echo "$as_me:2573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2586,10 +2587,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2589: result: none needed" >&5
+    echo "$as_me:2590: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2592: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2593: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2597,13 +2598,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2600: checking \$CFLAGS variable" >&5
+echo "$as_me:2601: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2604: result: broken" >&5
+	echo "$as_me:2605: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2606: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2607: 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=
@@ -2711,18 +2712,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2714: result: ok" >&5
+	echo "$as_me:2715: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2719: checking \$CC variable" >&5
+echo "$as_me:2720: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2723: result: broken" >&5
+	echo "$as_me:2724: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2725: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2726: 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/[ ]*[ ]-[^ ].*//'`
@@ -2839,19 +2840,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2842: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2843: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2846: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2847: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2850: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2851: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2854: result: ok" >&5
+	echo "$as_me:2855: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2862,7 +2863,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2865: checking how to run the C preprocessor" >&5
+echo "$as_me:2866: 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
@@ -2883,18 +2884,18 @@ do
   # 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 2886 "configure"
+#line 2887 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2897: \$? = $ac_status" >&5
+  echo "$as_me:2898: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2917,17 +2918,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2920 "configure"
+#line 2921 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2924: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2930: \$? = $ac_status" >&5
+  echo "$as_me:2931: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2964,7 +2965,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2967: result: $CPP" >&5
+echo "$as_me:2968: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2974,18 +2975,18 @@ do
   # 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 2977 "configure"
+#line 2978 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2982: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2988: \$? = $ac_status" >&5
+  echo "$as_me:2989: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3008,17 +3009,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3011 "configure"
+#line 3012 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3015: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3016: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3021: \$? = $ac_status" >&5
+  echo "$as_me:3022: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3046,7 +3047,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3049: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3050: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3059,14 +3060,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3062: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3063: 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 3069 "configure"
+#line 3070 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3081,7 +3082,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3084 "configure"
+#line 3085 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3094,14 +3095,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3097: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3098: 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:3104: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3105: 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
@@ -3116,15 +3117,15 @@ CF_EOF
 # 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:3119: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3122: \$? = $ac_status" >&5
+  echo "$as_me:3123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3124: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3127: \$? = $ac_status" >&5
+  echo "$as_me:3128: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3135,10 +3136,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3138: result: yes" >&5
+  echo "$as_me:3139: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3141: result: no" >&5
+  echo "$as_me:3142: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3152,7 +3153,7 @@ else
 	(*) 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:3155: checking for $ac_word" >&5
+echo "$as_me:3156: 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
@@ -3169,7 +3170,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3172: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3173: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3180,10 +3181,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3183: result: $LDCONFIG" >&5
+  echo "$as_me:3184: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3186: result: no" >&5
+  echo "$as_me:3187: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3191,7 +3192,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3194: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3195: 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.
@@ -3201,7 +3202,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3204: result: $cf_with_cxx" >&5
+echo "$as_me:3205: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3219,7 +3220,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3222: checking for $ac_word" >&5
+echo "$as_me:3223: 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
@@ -3234,7 +3235,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3237: found $ac_dir/$ac_word" >&5
+echo "$as_me:3238: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3242,10 +3243,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3245: result: $CXX" >&5
+  echo "$as_me:3246: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3248: result: no" >&5
+  echo "$as_me:3249: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3258,7 +3259,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3261: checking for $ac_word" >&5
+echo "$as_me:3262: 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
@@ -3273,7 +3274,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3276: found $ac_dir/$ac_word" >&5
+echo "$as_me:3277: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3281,10 +3282,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3284: result: $ac_ct_CXX" >&5
+  echo "$as_me:3285: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3287: result: no" >&5
+  echo "$as_me:3288: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3296,32 +3297,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3299:" \
+echo "$as_me:3300:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3302: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3303: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3305: \$? = $ac_status" >&5
+  echo "$as_me:3306: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3307: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3308: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3310: \$? = $ac_status" >&5
+  echo "$as_me:3311: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3312: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3313: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3315: \$? = $ac_status" >&5
+  echo "$as_me:3316: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3318: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3319: 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 3324 "configure"
+#line 3325 "configure"
 #include "confdefs.h"
 
 int
@@ -3336,16 +3337,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3342: \$? = $ac_status" >&5
+  echo "$as_me:3343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3348: \$? = $ac_status" >&5
+  echo "$as_me:3349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3357,19 +3358,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3360: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3361: 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:3366: checking whether $CXX accepts -g" >&5
+echo "$as_me:3367: 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 3372 "configure"
+#line 3373 "configure"
 #include "confdefs.h"
 
 int
@@ -3381,16 +3382,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3387: \$? = $ac_status" >&5
+  echo "$as_me:3388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3393: \$? = $ac_status" >&5
+  echo "$as_me:3394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3400,7 +3401,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3403: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3404: 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
@@ -3427,7 +3428,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3430 "configure"
+#line 3431 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3440,16 +3441,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3446: \$? = $ac_status" >&5
+  echo "$as_me:3447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3452: \$? = $ac_status" >&5
+  echo "$as_me:3453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3459,7 +3460,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3462 "configure"
+#line 3463 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3471,16 +3472,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3477: \$? = $ac_status" >&5
+  echo "$as_me:3478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3483: \$? = $ac_status" >&5
+  echo "$as_me:3484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3514,7 +3515,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3517: checking if $CXX works" >&5
+		echo "$as_me:3518: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3522,7 +3523,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3525 "configure"
+#line 3526 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3539,16 +3540,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3545: \$? = $ac_status" >&5
+  echo "$as_me:3546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3551: \$? = $ac_status" >&5
+  echo "$as_me:3552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3559,11 +3560,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3562: result: $cf_cxx_works" >&5
+		echo "$as_me:3563: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3566: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3567: 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
@@ -3579,7 +3580,7 @@ ac_main_return="return"
 	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:3582: checking for $ac_word" >&5
+echo "$as_me:3583: 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
@@ -3596,7 +3597,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3599: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3600: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3607,17 +3608,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3610: result: $CXX" >&5
+  echo "$as_me:3611: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3613: result: no" >&5
+  echo "$as_me:3614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3620: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3621: 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="";
 		;;
@@ -3626,7 +3627,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3629: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3630: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3634,7 +3635,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3637: result: $GXX_VERSION" >&5
+	echo "$as_me:3638: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3642,12 +3643,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3645: WARNING: templates do not work" >&5
+	{ echo "$as_me:3646: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3650: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3651: 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.
@@ -3657,15 +3658,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3660: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3661: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3663: checking if you want to build with Ada" >&5
+echo "$as_me:3664: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3665: result: $cf_with_ada" >&5
+echo "$as_me:3666: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3668: checking if you want to install terminal database" >&5
+echo "$as_me:3669: 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.
@@ -3675,10 +3676,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3678: result: $cf_with_db_install" >&5
+echo "$as_me:3679: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3681: checking if you want to install manpages" >&5
+echo "$as_me:3682: 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.
@@ -3688,10 +3689,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3691: result: $cf_with_manpages" >&5
+echo "$as_me:3692: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3694: checking if you want to build programs such as tic" >&5
+echo "$as_me:3695: 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.
@@ -3701,10 +3702,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3704: result: $cf_with_progs" >&5
+echo "$as_me:3705: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3707: checking if you want to build test-programs" >&5
+echo "$as_me:3708: 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.
@@ -3714,10 +3715,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3717: result: $cf_with_tests" >&5
+echo "$as_me:3718: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3720: checking if you wish to install curses.h" >&5
+echo "$as_me:3721: 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.
@@ -3727,7 +3728,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3730: result: $with_curses_h" >&5
+echo "$as_me:3731: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3751,7 +3752,7 @@ for ac_prog in mawk gawk nawk awk
 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:3754: checking for $ac_word" >&5
+echo "$as_me:3755: 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
@@ -3766,7 +3767,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3769: found $ac_dir/$ac_word" >&5
+echo "$as_me:3770: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3774,17 +3775,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3777: result: $AWK" >&5
+  echo "$as_me:3778: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3780: result: no" >&5
+  echo "$as_me:3781: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3787: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3788: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3800,7 +3801,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3803: checking for a BSD compatible install" >&5
+echo "$as_me:3804: 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
@@ -3849,7 +3850,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3852: result: $INSTALL" >&5
+echo "$as_me:3853: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3874,7 +3875,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3877: checking for $ac_word" >&5
+echo "$as_me:3878: 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
@@ -3889,7 +3890,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3892: found $ac_dir/$ac_word" >&5
+echo "$as_me:3893: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3897,10 +3898,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3900: result: $LINT" >&5
+  echo "$as_me:3901: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3903: result: no" >&5
+  echo "$as_me:3904: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3913,18 +3914,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3916: checking whether ln -s works" >&5
+echo "$as_me:3917: 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:3920: result: yes" >&5
+  echo "$as_me:3921: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3923: result: no, using $LN_S" >&5
+  echo "$as_me:3924: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3927: checking if $LN_S -f options work" >&5
+echo "$as_me:3928: 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
@@ -3936,12 +3937,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3939: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3940: 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:3944: checking for long file names" >&5
+echo "$as_me:3945: 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
@@ -3980,7 +3981,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3983: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3984: 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
 
@@ -3999,7 +4000,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4002: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4003: 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"
@@ -4009,7 +4010,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4012: checking if you want to use pkg-config" >&5
+echo "$as_me:4013: 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.
@@ -4019,7 +4020,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4022: result: $cf_pkg_config" >&5
+echo "$as_me:4023: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4031,7 +4032,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4034: checking for $ac_word" >&5
+echo "$as_me:4035: 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
@@ -4048,7 +4049,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4051: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4052: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4059,10 +4060,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4062: result: $PKG_CONFIG" >&5
+  echo "$as_me:4063: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4065: result: no" >&5
+  echo "$as_me:4066: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4071,7 +4072,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4074: checking for $ac_word" >&5
+echo "$as_me:4075: 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
@@ -4088,7 +4089,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4091: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4092: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4100,10 +4101,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4103: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4104: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4106: result: no" >&5
+  echo "$as_me:4107: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4146,24 +4147,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4149: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4150: 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:4156: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4157: 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:4162: checking for pkg-config library directory" >&5
+	echo "$as_me:4163: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4166: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4167: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4174,7 +4175,7 @@ if test -n "$PKG_CONFIG_PATH"; then
 elif test -n "$PKG_CONFIG_LIBDIR"; then
 	cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ 	]*,,' -e 's,[ 	]*$,,'`
 else
-	cf_search_path=auto
+	cf_search_path=libdir
 fi
 
 # if the option is used, let that override.  otherwise default to "libdir"
@@ -4183,14 +4184,12 @@ fi
 if test "${with_pkg_config_libdir+set}" = set; then
   withval="$with_pkg_config_libdir"
   cf_search_path=$withval
-else
-  test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
 fi;
 
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4193: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4192: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4201,16 +4200,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4204: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4203: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4209: result: auto" >&5
+	echo "$as_me:4208: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4213: checking for search-list" >&5
+	echo "$as_me:4212: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4237,11 +4236,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4240: result: $cf_search_path" >&5
+	echo "$as_me:4239: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4244: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4243: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4249,7 +4248,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4252: checking for first directory" >&5
+	echo "$as_me:4251: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4260,7 +4259,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4263: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4262: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4270,7 +4269,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4273: checking for workaround" >&5
+		echo "$as_me:4272: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4293,17 +4292,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4296: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4295: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4303: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4302: 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:4306: checking if we should install .pc files" >&5
+	echo "$as_me:4305: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4314,7 +4313,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4317: result: $enable_pc_files" >&5
+echo "$as_me:4316: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4322,7 +4321,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4325: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4324: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4353,7 +4352,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4356: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4355: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4367,8 +4366,8 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4370: checking for suffix to add to pc-files" >&5
-echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+	echo "$as_me:4369: checking for suffix to add to pkg-config files" >&5
+echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
 if test "${with_pc_suffix+set}" = set; then
@@ -4382,13 +4381,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4385: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4384: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4391: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4390: 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.
@@ -4398,11 +4397,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4401: result: $enable_mixedcase" >&5
+echo "$as_me:4400: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4405: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4404: 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
@@ -4429,7 +4428,7 @@ else
 fi
 
 fi
-echo "$as_me:4432: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4431: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4448,7 +4447,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4451: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4450: 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
@@ -4468,16 +4467,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4471: result: yes" >&5
+  echo "$as_me:4470: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4475: result: no" >&5
+  echo "$as_me:4474: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4480: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4479: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4532,7 +4531,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4535: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4534: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4543,7 +4542,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4546: checking for $ac_word" >&5
+echo "$as_me:4545: 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
@@ -4558,7 +4557,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4561: found $ac_dir/$ac_word" >&5
+echo "$as_me:4560: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4566,10 +4565,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4569: result: $CTAGS" >&5
+  echo "$as_me:4568: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4572: result: no" >&5
+  echo "$as_me:4571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4580,7 +4579,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4583: checking for $ac_word" >&5
+echo "$as_me:4582: 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
@@ -4595,7 +4594,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4598: found $ac_dir/$ac_word" >&5
+echo "$as_me:4597: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4603,10 +4602,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4606: result: $ETAGS" >&5
+  echo "$as_me:4605: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4609: result: no" >&5
+  echo "$as_me:4608: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4615,7 +4614,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4618: checking for $ac_word" >&5
+echo "$as_me:4617: 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
@@ -4630,7 +4629,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4633: found $ac_dir/$ac_word" >&5
+echo "$as_me:4632: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4639,17 +4638,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4642: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4641: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4645: result: no" >&5
+  echo "$as_me:4644: 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:4652: checking for $ac_word" >&5
+echo "$as_me:4651: 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
@@ -4664,7 +4663,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4667: found $ac_dir/$ac_word" >&5
+echo "$as_me:4666: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4673,10 +4672,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4676: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4675: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4679: result: no" >&5
+  echo "$as_me:4678: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4696,7 +4695,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4699: checking for makeflags variable" >&5
+echo "$as_me:4698: 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
@@ -4726,7 +4725,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4729: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4728: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4734,13 +4733,13 @@ echo "${as_me:-configure}:4729: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4737: result: $cf_cv_makeflags" >&5
+echo "$as_me:4736: 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:4743: checking for $ac_word" >&5
+echo "$as_me:4742: 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
@@ -4755,7 +4754,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4758: found $ac_dir/$ac_word" >&5
+echo "$as_me:4757: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4763,10 +4762,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4766: result: $RANLIB" >&5
+  echo "$as_me:4765: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4769: result: no" >&5
+  echo "$as_me:4768: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4775,7 +4774,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4778: checking for $ac_word" >&5
+echo "$as_me:4777: 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
@@ -4790,7 +4789,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4793: found $ac_dir/$ac_word" >&5
+echo "$as_me:4792: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4799,10 +4798,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4802: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4801: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4805: result: no" >&5
+  echo "$as_me:4804: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4814,7 +4813,7 @@ fi
 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:4817: checking for $ac_word" >&5
+echo "$as_me:4816: 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
@@ -4829,7 +4828,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4832: found $ac_dir/$ac_word" >&5
+echo "$as_me:4831: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4837,10 +4836,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4840: result: $LD" >&5
+  echo "$as_me:4839: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4843: result: no" >&5
+  echo "$as_me:4842: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4849,7 +4848,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4852: checking for $ac_word" >&5
+echo "$as_me:4851: 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
@@ -4864,7 +4863,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4867: found $ac_dir/$ac_word" >&5
+echo "$as_me:4866: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4873,10 +4872,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4876: result: $ac_ct_LD" >&5
+  echo "$as_me:4875: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4879: result: no" >&5
+  echo "$as_me:4878: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4888,7 +4887,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4891: checking for $ac_word" >&5
+echo "$as_me:4890: 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
@@ -4903,7 +4902,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4906: found $ac_dir/$ac_word" >&5
+echo "$as_me:4905: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4911,10 +4910,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4914: result: $AR" >&5
+  echo "$as_me:4913: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4917: result: no" >&5
+  echo "$as_me:4916: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4923,7 +4922,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4926: checking for $ac_word" >&5
+echo "$as_me:4925: 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
@@ -4938,7 +4937,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4941: found $ac_dir/$ac_word" >&5
+echo "$as_me:4940: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4947,10 +4946,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4950: result: $ac_ct_AR" >&5
+  echo "$as_me:4949: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4953: result: no" >&5
+  echo "$as_me:4952: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4962,7 +4961,7 @@ fi
 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:4965: checking for $ac_word" >&5
+echo "$as_me:4964: 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
@@ -4977,7 +4976,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4980: found $ac_dir/$ac_word" >&5
+echo "$as_me:4979: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4985,10 +4984,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4988: result: $NM" >&5
+  echo "$as_me:4987: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4991: result: no" >&5
+  echo "$as_me:4990: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4997,7 +4996,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5000: checking for $ac_word" >&5
+echo "$as_me:4999: 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
@@ -5012,7 +5011,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5015: found $ac_dir/$ac_word" >&5
+echo "$as_me:5014: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5021,10 +5020,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5024: result: $ac_ct_NM" >&5
+  echo "$as_me:5023: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5027: result: no" >&5
+  echo "$as_me:5026: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5036,7 +5035,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5039: checking for $ac_word" >&5
+echo "$as_me:5038: 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
@@ -5051,7 +5050,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5054: found $ac_dir/$ac_word" >&5
+echo "$as_me:5053: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5059,10 +5058,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5062: result: $AR" >&5
+  echo "$as_me:5061: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5065: result: no" >&5
+  echo "$as_me:5064: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5071,7 +5070,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5074: checking for $ac_word" >&5
+echo "$as_me:5073: 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
@@ -5086,7 +5085,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5089: found $ac_dir/$ac_word" >&5
+echo "$as_me:5088: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5095,10 +5094,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5098: result: $ac_ct_AR" >&5
+  echo "$as_me:5097: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5101: result: no" >&5
+  echo "$as_me:5100: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5107,7 +5106,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5110: checking for options to update archives" >&5
+echo "$as_me:5109: 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
@@ -5144,13 +5143,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5147 "configure"
+#line 5146 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5150: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5153: \$? = $ac_status" >&5
+  echo "$as_me:5152: \$? = $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
@@ -5161,7 +5160,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5164: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5163: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5171,7 +5170,7 @@ echo "${as_me:-configure}:5164: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5174: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5173: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5182,8 +5181,8 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5185: checking if you have specified an install-prefix" >&5
-echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+echo "$as_me:5184: checking for an installation directory prefix" >&5
+echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
 if test "${with_install_prefix+set}" = set; then
@@ -5195,8 +5194,8 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5198: result: $DESTDIR" >&5
-echo "${ECHO_T}$DESTDIR" >&6
+echo "$as_me:5197: result: ${DESTDIR:-(none)}" >&5
+echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
 ###############################################################################
 
@@ -5230,7 +5229,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5233: checking for $ac_word" >&5
+echo "$as_me:5232: 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
@@ -5245,7 +5244,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5248: found $ac_dir/$ac_word" >&5
+echo "$as_me:5247: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5253,10 +5252,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5256: result: $BUILD_CC" >&5
+  echo "$as_me:5255: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5259: result: no" >&5
+  echo "$as_me:5258: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5265,12 +5264,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5268: checking for native build C compiler" >&5
+	echo "$as_me:5267: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5270: result: $BUILD_CC" >&5
+	echo "$as_me:5269: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5273: checking for native build C preprocessor" >&5
+	echo "$as_me:5272: 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.
@@ -5280,10 +5279,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5283: result: $BUILD_CPP" >&5
+	echo "$as_me:5282: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5286: checking for native build C flags" >&5
+	echo "$as_me:5285: 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.
@@ -5291,10 +5290,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5294: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5293: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5297: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5296: 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.
@@ -5302,10 +5301,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5305: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5304: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5308: checking for native build linker-flags" >&5
+	echo "$as_me:5307: 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.
@@ -5313,10 +5312,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5316: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5315: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5319: checking for native build linker-libraries" >&5
+	echo "$as_me:5318: 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.
@@ -5324,7 +5323,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5327: result: $BUILD_LIBS" >&5
+	echo "$as_me:5326: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5333,7 +5332,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5336: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5335: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5347,7 +5346,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5350 "configure"
+#line 5349 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5357,15 +5356,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5363: \$? = $ac_status" >&5
+  echo "$as_me:5362: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5368: \$? = $ac_status" >&5
+  echo "$as_me:5367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5380,12 +5379,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5383: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5382: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5388: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5387: 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;}
@@ -5410,7 +5409,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5413: checking if libtool -version-number should be used" >&5
+echo "$as_me:5412: 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.
@@ -5427,7 +5426,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5430: result: $cf_libtool_version" >&5
+echo "$as_me:5429: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5436,25 +5435,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5439: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5438: 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}:5446: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5445: 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}:5453: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5452: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5457: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5456: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5476,7 +5475,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5479: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5478: 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.
@@ -5486,7 +5485,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5489: result: $with_libtool" >&5
+echo "$as_me:5488: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5517,7 +5516,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5520: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5519: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5530,7 +5529,7 @@ esac
   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:5533: checking for $ac_word" >&5
+echo "$as_me:5532: 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
@@ -5545,7 +5544,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5548: found $ac_dir/$ac_word" >&5
+echo "$as_me:5547: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5553,10 +5552,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5556: result: $LIBTOOL" >&5
+  echo "$as_me:5555: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5559: result: no" >&5
+  echo "$as_me:5558: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5569,7 +5568,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5572: checking for $ac_word" >&5
+echo "$as_me:5571: 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
@@ -5584,7 +5583,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5587: found $ac_dir/$ac_word" >&5
+echo "$as_me:5586: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5592,10 +5591,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5595: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5594: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5598: result: no" >&5
+  echo "$as_me:5597: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5626,7 +5625,7 @@ unset LIBTOOL
   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:5629: checking for $ac_word" >&5
+echo "$as_me:5628: 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
@@ -5641,7 +5640,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5644: found $ac_dir/$ac_word" >&5
+echo "$as_me:5643: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5649,10 +5648,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5652: result: $LIBTOOL" >&5
+  echo "$as_me:5651: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5655: result: no" >&5
+  echo "$as_me:5654: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5665,7 +5664,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5668: checking for $ac_word" >&5
+echo "$as_me:5667: 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
@@ -5680,7 +5679,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5683: found $ac_dir/$ac_word" >&5
+echo "$as_me:5682: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5688,10 +5687,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5691: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5690: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5694: result: no" >&5
+  echo "$as_me:5693: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5713,7 +5712,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5716: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5715: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5729,7 +5728,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5732: checking version of $LIBTOOL" >&5
+	echo "$as_me:5731: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5740,7 +5739,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5743: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5742: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5749,18 +5748,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5752: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5751: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5758: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5757: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5763: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5762: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5796,7 +5795,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5799: checking if you want to build shared libraries" >&5
+echo "$as_me:5798: 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.
@@ -5806,11 +5805,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5809: result: $with_shared" >&5
+echo "$as_me:5808: 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:5813: checking if you want to build static libraries" >&5
+echo "$as_me:5812: 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.
@@ -5820,11 +5819,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5823: result: $with_normal" >&5
+echo "$as_me:5822: 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:5827: checking if you want to build debug libraries" >&5
+echo "$as_me:5826: 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.
@@ -5834,11 +5833,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5837: result: $with_debug" >&5
+echo "$as_me:5836: 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:5841: checking if you want to build profiling libraries" >&5
+echo "$as_me:5840: 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.
@@ -5848,7 +5847,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5851: result: $with_profile" >&5
+echo "$as_me:5850: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5856,7 +5855,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5859: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5858: 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.
@@ -5866,26 +5865,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5869: result: $with_shared_cxx" >&5
+echo "$as_me:5868: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5876: checking for specified models" >&5
+echo "$as_me:5875: 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:5880: result: $cf_list_models" >&5
+echo "$as_me:5879: 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:5885: checking for default model" >&5
+echo "$as_me:5884: 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:5888: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5887: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5899,7 +5898,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5902: checking if you want to have a library-prefix" >&5
+echo "$as_me:5901: 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.
@@ -5909,7 +5908,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5912: result: $with_lib_prefix" >&5
+echo "$as_me:5911: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5940,24 +5939,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5943: checking for PATH separator" >&5
+	echo "$as_me:5942: 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:5950: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5949: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5954: checking for ANSI C header files" >&5
+echo "$as_me:5953: 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 5960 "configure"
+#line 5959 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5965,13 +5964,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5968: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5967: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5974: \$? = $ac_status" >&5
+  echo "$as_me:5973: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5993,7 +5992,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5996 "configure"
+#line 5995 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6011,7 +6010,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6014 "configure"
+#line 6013 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6032,7 +6031,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6035 "configure"
+#line 6034 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6058,15 +6057,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6064: \$? = $ac_status" >&5
+  echo "$as_me:6063: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6069: \$? = $ac_status" >&5
+  echo "$as_me:6068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6079,7 +6078,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6082: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6081: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6095,28 +6094,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6098: checking for $ac_header" >&5
+echo "$as_me:6097: 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 6104 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6113: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6119: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6126,7 +6125,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6129: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6128: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6136,13 +6135,13 @@ EOF
 fi
 done
 
-echo "$as_me:6139: checking whether exit is declared" >&5
+echo "$as_me:6138: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6145 "configure"
+#line 6144 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6157,16 +6156,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6163: \$? = $ac_status" >&5
+  echo "$as_me:6162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6169: \$? = $ac_status" >&5
+  echo "$as_me:6168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6176,19 +6175,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6179: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6178: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6185: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6184: 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 6191 "configure"
+#line 6190 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6203,16 +6202,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6209: \$? = $ac_status" >&5
+  echo "$as_me:6208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6215: \$? = $ac_status" >&5
+  echo "$as_me:6214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6222,7 +6221,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6224: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6235,7 +6234,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6238: checking for opendir in -ldir" >&5
+  echo "$as_me:6237: 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
@@ -6243,7 +6242,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6246 "configure"
+#line 6245 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6262,16 +6261,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6268: \$? = $ac_status" >&5
+  echo "$as_me:6267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6274: \$? = $ac_status" >&5
+  echo "$as_me:6273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6282,14 +6281,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6285: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6284: 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:6292: checking for opendir in -lx" >&5
+  echo "$as_me:6291: 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
@@ -6297,7 +6296,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6300 "configure"
+#line 6299 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6316,16 +6315,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6322: \$? = $ac_status" >&5
+  echo "$as_me:6321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6328: \$? = $ac_status" >&5
+  echo "$as_me:6327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6336,7 +6335,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6339: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6338: 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"
@@ -6346,7 +6345,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6349: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6348: 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.
@@ -6356,10 +6355,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6359: result: $with_termlib" >&5
+echo "$as_me:6358: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6362: checking if you want to build a separate tic library" >&5
+echo "$as_me:6361: 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.
@@ -6369,7 +6368,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6372: result: $with_ticlib" >&5
+echo "$as_me:6371: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6382,7 +6381,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6385: checking for default loader flags" >&5
+echo "$as_me:6384: 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=''   ;;
@@ -6391,13 +6390,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6394: result: $LD_MODEL" >&5
-echo "${ECHO_T}$LD_MODEL" >&6
+echo "$as_me:6393: result: ${LD_MODEL:-(none)}" >&5
+echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6400: checking if rpath option should be used" >&5
+echo "$as_me:6399: 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.
@@ -6407,10 +6406,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6410: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6409: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6413: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6412: 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.
@@ -6420,7 +6419,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6423: result: $cf_cv_do_relink" >&5
+echo "$as_me:6422: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6431,7 +6430,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6434: checking for an rpath option" >&5
+	echo "$as_me:6433: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6462,12 +6461,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6465: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6464: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6470: checking if we need a space after rpath option" >&5
+		echo "$as_me:6469: 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"
 
@@ -6488,7 +6487,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6491 "configure"
+#line 6490 "configure"
 #include "confdefs.h"
 
 int
@@ -6500,16 +6499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6506: \$? = $ac_status" >&5
+  echo "$as_me:6505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6512: \$? = $ac_status" >&5
+  echo "$as_me:6511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6519,7 +6518,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6522: result: $cf_rpath_space" >&5
+		echo "$as_me:6521: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6541,8 +6540,8 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6544: 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
+	echo "$as_me:6543: checking whether to use release or ABI version in shared library file names" >&5
+echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
 if test "${with_shlib_version+set}" = set; then
@@ -6556,9 +6555,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6559: result: $withval" >&5
+		echo "$as_me:6558: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6561: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6560: 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; }; }
 		;;
@@ -6567,7 +6566,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6570: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6569: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6590,14 +6589,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6593: checking which $CC option to use" >&5
+		echo "$as_me:6592: 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 6600 "configure"
+#line 6599 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6609,16 +6608,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6615: \$? = $ac_status" >&5
+  echo "$as_me:6614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6621: \$? = $ac_status" >&5
+  echo "$as_me:6620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6627,7 +6626,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6630: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6629: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6698,7 +6697,7 @@ CF_EOF
 		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:6701: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6700: 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
@@ -6707,7 +6706,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6710 "configure"
+#line 6709 "configure"
 #include "confdefs.h"
 
 int
@@ -6719,16 +6718,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6725: \$? = $ac_status" >&5
+  echo "$as_me:6724: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6731: \$? = $ac_status" >&5
+  echo "$as_me:6730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6739,7 +6738,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6742: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6741: 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"
@@ -7089,7 +7088,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7092 "configure"
+#line 7091 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7101,16 +7100,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7107: \$? = $ac_status" >&5
+  echo "$as_me:7106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7113: \$? = $ac_status" >&5
+  echo "$as_me:7112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7147,7 +7146,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7150: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7149: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7157,7 +7156,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7160 "${as_me:-configure}"
+#line 7159 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7169,18 +7168,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7172: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7171: 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:7174: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7177: \$? = $ac_status" >&5
+  echo "$as_me:7176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7179: result: yes" >&5
+				echo "$as_me:7178: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7183: result: no" >&5
+				echo "$as_me:7182: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7195,17 +7194,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7198: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7197: 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}:7202: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7201: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7208: checking for additional libtool options" >&5
+echo "$as_me:7207: 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.
@@ -7215,7 +7214,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7218: result: $with_libtool_opts" >&5
+echo "$as_me:7217: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7226,7 +7225,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7229: checking if exported-symbols file should be used" >&5
+echo "$as_me:7228: 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.
@@ -7241,7 +7240,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7244: result: $with_export_syms" >&5
+echo "$as_me:7243: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7252,15 +7251,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7255: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7254: 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:7260: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7259: 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 7263 "configure"
+#line 7262 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7272,16 +7271,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7278: \$? = $ac_status" >&5
+  echo "$as_me:7277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7284: \$? = $ac_status" >&5
+  echo "$as_me:7283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7290,18 +7289,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7293: result: $cf_cflags_work" >&5
+		echo "$as_me:7292: 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}:7299: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7298: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7304: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7303: 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.
@@ -7319,18 +7318,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7322: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7321: 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:7327: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7326: 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:7333: result: $with_versioned_syms" >&5
+echo "$as_me:7332: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7346,7 +7345,7 @@ then
 		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}:7349: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7348: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7354,11 +7353,11 @@ echo "${as_me:-configure}:7349: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7357: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7356: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7361: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7360: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7370,7 +7369,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7373: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7372: 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
 
@@ -7407,7 +7406,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7410 "configure"
+#line 7409 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7438,7 +7437,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7441: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7440: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7451,7 +7450,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7454: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7453: 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.
@@ -7461,27 +7460,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7464: result: $with_gpm" >&5
+echo "$as_me:7463: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7468: checking for gpm.h" >&5
+	echo "$as_me:7467: 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 7474 "configure"
+#line 7473 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7478: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7477: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7484: \$? = $ac_status" >&5
+  echo "$as_me:7483: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7500,7 +7499,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7503: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7502: 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
 
@@ -7511,7 +7510,7 @@ EOF
 		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}:7514: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7513: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7519,7 +7518,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7522: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7521: 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
@@ -7527,7 +7526,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7530 "configure"
+#line 7529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7546,16 +7545,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7552: \$? = $ac_status" >&5
+  echo "$as_me:7551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7558: \$? = $ac_status" >&5
+  echo "$as_me:7557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7566,18 +7565,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7569: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7568: 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:7576: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7575: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7580: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7579: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7588,7 +7587,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7591: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7590: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7597,7 +7596,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7600: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7599: 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.
@@ -7607,18 +7606,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7610: result: $with_dlsym" >&5
+	echo "$as_me:7609: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7615: checking for dlsym" >&5
+echo "$as_me:7614: 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 7621 "configure"
+#line 7620 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7649,16 +7648,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7655: \$? = $ac_status" >&5
+  echo "$as_me:7654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7661: \$? = $ac_status" >&5
+  echo "$as_me:7660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7668,14 +7667,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7671: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7670: 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:7678: checking for dlsym in -ldl" >&5
+echo "$as_me:7677: 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
@@ -7683,7 +7682,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7686 "configure"
+#line 7685 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7702,16 +7701,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7708: \$? = $ac_status" >&5
+  echo "$as_me:7707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7714: \$? = $ac_status" >&5
+  echo "$as_me:7713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7722,7 +7721,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7725: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7724: 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
 
@@ -7751,10 +7750,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7754: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7753: 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 7757 "configure"
+#line 7756 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7772,16 +7771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7778: \$? = $ac_status" >&5
+  echo "$as_me:7777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7784: \$? = $ac_status" >&5
+  echo "$as_me:7783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7792,15 +7791,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7795: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7794: 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:7800: result: ok" >&5
+	echo "$as_me:7799: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7803: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7802: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7808,12 +7807,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7811: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7810: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7816: checking for soname of gpm library" >&5
+echo "$as_me:7815: 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
@@ -7847,15 +7846,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7850: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7853: \$? = $ac_status" >&5
+  echo "$as_me:7852: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7855: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7854: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7858: \$? = $ac_status" >&5
+  echo "$as_me:7857: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7866,7 +7865,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7869: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7868: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7934,7 +7933,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7937: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7936: 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
@@ -7942,7 +7941,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7945 "configure"
+#line 7944 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7961,16 +7960,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7967: \$? = $ac_status" >&5
+  echo "$as_me:7966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7973: \$? = $ac_status" >&5
+  echo "$as_me:7972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7981,11 +7980,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7984: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7983: 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:7988: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7987: 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
@@ -8009,15 +8008,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8012: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8015: \$? = $ac_status" >&5
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8017: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8020: \$? = $ac_status" >&5
+  echo "$as_me:8019: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8029,11 +8028,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8032: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8031: 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:8036: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8035: 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
 
@@ -8041,7 +8040,7 @@ fi
 
 fi
 
-echo "$as_me:8044: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8043: 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.
@@ -8050,7 +8049,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8053: result: $with_pcre2" >&5
+echo "$as_me:8052: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8061,17 +8060,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8064: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8063: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8070: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8069: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8074: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8073: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8195,7 +8194,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8198: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8197: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8208,7 +8207,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8211: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8210: 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
@@ -8216,7 +8215,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8219 "configure"
+#line 8218 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8235,16 +8234,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8241: \$? = $ac_status" >&5
+  echo "$as_me:8240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8247: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8255,7 +8254,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8258: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8257: 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
 
@@ -8276,7 +8275,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8279: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8278: 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
@@ -8284,7 +8283,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8287 "configure"
+#line 8286 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8303,16 +8302,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8309: \$? = $ac_status" >&5
+  echo "$as_me:8308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8315: \$? = $ac_status" >&5
+  echo "$as_me:8314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8323,7 +8322,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8326: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8325: 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
 
@@ -8344,7 +8343,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8347: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8346: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8359,23 +8358,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8362: checking for $ac_header" >&5
+echo "$as_me:8361: 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 8368 "configure"
+#line 8367 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8372: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8371: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8378: \$? = $ac_status" >&5
+  echo "$as_me:8377: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8394,7 +8393,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8397: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8396: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8407,13 +8406,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8410: checking for $ac_func" >&5
+echo "$as_me:8409: 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 8416 "configure"
+#line 8415 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8444,16 +8443,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8450: \$? = $ac_status" >&5
+  echo "$as_me:8449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8456: \$? = $ac_status" >&5
+  echo "$as_me:8455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8463,7 +8462,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8466: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8465: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8477,7 +8476,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8480: checking if you want to use sysmouse" >&5
+echo "$as_me:8479: 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.
@@ -8489,7 +8488,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8492 "configure"
+#line 8491 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8512,16 +8511,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8518: \$? = $ac_status" >&5
+  echo "$as_me:8517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8524: \$? = $ac_status" >&5
+  echo "$as_me:8523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8531,7 +8530,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8534: result: $cf_with_sysmouse" >&5
+echo "$as_me:8533: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8541,7 +8540,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8544: checking if you want to disable library suffixes" >&5
+echo "$as_me:8543: 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.
@@ -8558,13 +8557,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8561: result: $disable_lib_suffixes" >&5
+echo "$as_me:8560: 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:8567: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8566: 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.
@@ -8582,22 +8581,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8585: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8584: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8590: checking for updated LDFLAGS" >&5
+echo "$as_me:8589: 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:8593: result: maybe" >&5
+	echo "$as_me:8592: 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:8600: checking for $ac_word" >&5
+echo "$as_me:8599: 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
@@ -8612,7 +8611,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8615: found $ac_dir/$ac_word" >&5
+echo "$as_me:8614: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8620,10 +8619,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8623: result: $cf_ldd_prog" >&5
+  echo "$as_me:8622: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8626: result: no" >&5
+  echo "$as_me:8625: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8637,7 +8636,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8640 "configure"
+#line 8639 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8649,16 +8648,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8655: \$? = $ac_status" >&5
+  echo "$as_me:8654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8661: \$? = $ac_status" >&5
+  echo "$as_me:8660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8686,7 +8685,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8689: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8688: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8698,11 +8697,11 @@ echo "${as_me:-configure}:8689: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8701: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8700: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8705: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8704: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8739,7 +8738,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8742: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8741: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8752,11 +8751,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8755: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8754: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8759: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8758: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8793,7 +8792,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8796: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8795: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8806,14 +8805,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8809: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8808: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8813: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8812: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8816: result: no" >&5
+	echo "$as_me:8815: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8827,7 +8826,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8830: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8829: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8844,7 +8843,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8847: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8846: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8852,8 +8851,8 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8855: 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
+echo "$as_me:8854: checking for extra suffix to append to header/library paths" >&5
+echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
 # Check whether --with-extra-suffix or --without-extra-suffix was given.
@@ -8871,11 +8870,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8874: result: $EXTRA_SUFFIX" >&5
-echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+echo "$as_me:8873: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8878: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8877: 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.
@@ -8885,10 +8884,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8888: result: $with_overwrite" >&5
+echo "$as_me:8887: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8891: checking if external terminfo-database is used" >&5
+echo "$as_me:8890: 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.
@@ -8898,7 +8897,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8901: result: $use_database" >&5
+echo "$as_me:8900: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8914,7 +8913,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8917: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8916: 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.
@@ -8922,10 +8921,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8925: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8924: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8928: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8927: 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.
@@ -8935,14 +8934,14 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8938: result: $with_hashed_db" >&5
+	echo "$as_me:8937: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8944: checking for list of fallback descriptions" >&5
-echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+echo "$as_me:8943: checking for list of fallback terminal descriptions" >&5
+echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
 if test "${with_fallbacks+set}" = set; then
@@ -8951,15 +8950,15 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8954: result: $with_fallback" >&5
-echo "${ECHO_T}$with_fallback" >&6
+echo "$as_me:8953: result: ${with_fallback:-(none)}" >&5
+echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
 (.|.no)
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8962: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8961: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8975,7 +8974,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8978: checking for $ac_word" >&5
+echo "$as_me:8977: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8990,7 +8989,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8993: found $ac_dir/$ac_word" >&5
+echo "$as_me:8992: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8998,10 +8997,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9001: result: $TIC" >&5
+  echo "$as_me:9000: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9004: result: no" >&5
+  echo "$as_me:9003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9010,7 +9009,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9013: checking for $ac_word" >&5
+echo "$as_me:9012: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9025,7 +9024,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9028: found $ac_dir/$ac_word" >&5
+echo "$as_me:9027: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9033,10 +9032,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9036: result: $ac_ct_TIC" >&5
+  echo "$as_me:9035: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9039: result: no" >&5
+  echo "$as_me:9038: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9048,7 +9047,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9051: checking for $ac_word" >&5
+echo "$as_me:9050: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9063,7 +9062,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9066: found $ac_dir/$ac_word" >&5
+echo "$as_me:9065: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9071,10 +9070,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9074: result: $INFOCMP" >&5
+  echo "$as_me:9073: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9077: result: no" >&5
+  echo "$as_me:9076: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9083,7 +9082,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9086: checking for $ac_word" >&5
+echo "$as_me:9085: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9098,7 +9097,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9101: found $ac_dir/$ac_word" >&5
+echo "$as_me:9100: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9106,10 +9105,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9109: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9108: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9112: result: no" >&5
+  echo "$as_me:9111: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9124,10 +9123,10 @@ 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:9127: checking for tic program for fallbacks" >&5
+  echo "$as_me:9126: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9130: result: $TIC" >&5
+		echo "$as_me:9129: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9155,7 +9154,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9158: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9157: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9168,7 +9167,7 @@ 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:9171: checking for $ac_word" >&5
+echo "$as_me:9170: 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
@@ -9185,7 +9184,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9188: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9187: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9196,10 +9195,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9199: result: $TIC" >&5
+  echo "$as_me:9198: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9202: result: no" >&5
+  echo "$as_me:9201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9258,7 +9257,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9261: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9260: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9273,7 +9272,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9276: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9275: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9282,10 +9281,10 @@ 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:9285: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9284: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9288: result: $INFOCMP" >&5
+		echo "$as_me:9287: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9313,7 +9312,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9316: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9315: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9326,7 +9325,7 @@ 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:9329: checking for $ac_word" >&5
+echo "$as_me:9328: 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
@@ -9343,7 +9342,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9346: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9345: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9354,10 +9353,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9357: result: $INFOCMP" >&5
+  echo "$as_me:9356: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9360: result: no" >&5
+  echo "$as_me:9359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9416,7 +9415,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9419: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9418: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9431,7 +9430,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9434: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9433: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9441,7 +9440,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9444: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9443: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9449,7 +9448,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9452: checking if you want modern xterm or antique" >&5
+echo "$as_me:9451: 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.
@@ -9463,7 +9462,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9466: result: $with_xterm_new" >&5
+echo "$as_me:9465: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9476,7 +9475,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9479: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9478: 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.
@@ -9500,13 +9499,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9503: result: $with_xterm_kbs" >&5
+echo "$as_me:9502: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9509: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9508: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9516,7 +9515,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9519: checking for list of terminfo directories" >&5
+echo "$as_me:9518: 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.
@@ -9556,7 +9555,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9559: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9558: 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; }; }
 	;;
@@ -9579,7 +9578,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9582: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9581: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9588,13 +9587,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9591: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9590: 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:9597: checking for default terminfo directory" >&5
+echo "$as_me:9596: 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.
@@ -9630,7 +9629,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9633: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9632: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9639,7 +9638,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9642: result: $TERMINFO" >&5
+echo "$as_me:9641: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9650,7 +9649,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9653: checking if big-core option selected" >&5
+echo "$as_me:9652: 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.
@@ -9662,7 +9661,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9665 "configure"
+#line 9664 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9676,15 +9675,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9682: \$? = $ac_status" >&5
+  echo "$as_me:9681: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9687: \$? = $ac_status" >&5
+  echo "$as_me:9686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9696,7 +9695,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9699: result: $with_big_core" >&5
+echo "$as_me:9698: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9706,7 +9705,7 @@ EOF
 ### 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:9709: checking if big-strings option selected" >&5
+echo "$as_me:9708: 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.
@@ -9730,14 +9729,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9733: result: $with_big_strings" >&5
+echo "$as_me:9732: 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:9740: checking if you want termcap-fallback support" >&5
+echo "$as_me:9739: 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.
@@ -9747,14 +9746,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9750: result: $with_termcap" >&5
+echo "$as_me:9749: 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:9757: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9756: 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
@@ -9767,13 +9766,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9770: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9769: 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:9776: checking for list of termcap files" >&5
+	echo "$as_me:9775: 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.
@@ -9813,7 +9812,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9816: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9815: 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; }; }
 	;;
@@ -9836,7 +9835,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9839: result: $TERMPATH" >&5
+	echo "$as_me:9838: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9844,7 +9843,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9847: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9846: 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.
@@ -9854,14 +9853,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9857: result: $with_getcap" >&5
+	echo "$as_me:9856: 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:9864: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9863: 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.
@@ -9871,7 +9870,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9874: result: $with_getcap_cache" >&5
+	echo "$as_me:9873: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9881,7 +9880,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9884: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9883: 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.
@@ -9891,14 +9890,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9894: result: $with_home_terminfo" >&5
+echo "$as_me:9893: 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:9901: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9900: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9908,14 +9907,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9911: result: $with_root_environ" >&5
+echo "$as_me:9910: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9918: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9917: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9925,14 +9924,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9928: result: $with_root_access" >&5
+echo "$as_me:9927: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9935: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9934: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9942,7 +9941,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9945: result: $with_setuid_environ" >&5
+echo "$as_me:9944: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9957,23 +9956,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9960: checking for $ac_header" >&5
+echo "$as_me:9959: 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 9966 "configure"
+#line 9965 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9969: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9976: \$? = $ac_status" >&5
+  echo "$as_me:9975: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9992,7 +9991,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9994: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10007,13 +10006,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10010: checking for $ac_func" >&5
+echo "$as_me:10009: 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 10016 "configure"
+#line 10015 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10044,16 +10043,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10050: \$? = $ac_status" >&5
+  echo "$as_me:10049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10056: \$? = $ac_status" >&5
+  echo "$as_me:10055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10063,7 +10062,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10066: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10065: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10080,13 +10079,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10083: checking for $ac_func" >&5
+echo "$as_me:10082: 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 10089 "configure"
+#line 10088 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10117,16 +10116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10123: \$? = $ac_status" >&5
+  echo "$as_me:10122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10129: \$? = $ac_status" >&5
+  echo "$as_me:10128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10136,7 +10135,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10139: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10138: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10147,7 +10146,7 @@ fi
 done
 
 else
-	echo "$as_me:10150: checking if link/symlink functions work" >&5
+	echo "$as_me:10149: 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
@@ -10160,7 +10159,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10163 "configure"
+#line 10162 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10194,15 +10193,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10200: \$? = $ac_status" >&5
+  echo "$as_me:10199: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10205: \$? = $ac_status" >&5
+  echo "$as_me:10204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10220,7 +10219,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10223: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10222: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10240,7 +10239,7 @@ with_symlinks=no
 # 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:10243: checking if tic should use symbolic links" >&5
+	echo "$as_me:10242: 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.
@@ -10250,21 +10249,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10253: result: $with_symlinks" >&5
+	echo "$as_me:10252: 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:10260: checking if tic should use hard links" >&5
+	echo "$as_me:10259: 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:10267: result: $with_links" >&5
+	echo "$as_me:10266: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10280,7 +10279,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10283: checking if you want broken-linker support code" >&5
+echo "$as_me:10282: 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.
@@ -10290,7 +10289,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10293: result: $with_broken_linker" >&5
+echo "$as_me:10292: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10304,7 +10303,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10307: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10306: 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.
@@ -10314,7 +10313,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10317: result: $with_bsdpad" >&5
+echo "$as_me:10316: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10333,14 +10332,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10336: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10335: 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 10343 "configure"
+#line 10342 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10359,16 +10358,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10365: \$? = $ac_status" >&5
+  echo "$as_me:10364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10371: \$? = $ac_status" >&5
+  echo "$as_me:10370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10379,7 +10378,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10382: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10381: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10421,14 +10420,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10424: checking if this is the GNU C library" >&5
+echo "$as_me:10423: 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 10431 "configure"
+#line 10430 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10447,16 +10446,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10453: \$? = $ac_status" >&5
+  echo "$as_me:10452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10459: \$? = $ac_status" >&5
+  echo "$as_me:10458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10467,7 +10466,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10470: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10469: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10475,7 +10474,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10478: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10477: 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
@@ -10487,7 +10486,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10490 "configure"
+#line 10489 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10506,16 +10505,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10512: \$? = $ac_status" >&5
+  echo "$as_me:10511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10518: \$? = $ac_status" >&5
+  echo "$as_me:10517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10527,12 +10526,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10530: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10529: 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:10535: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10534: 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
@@ -10637,7 +10636,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10640 "configure"
+#line 10639 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10657,16 +10656,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10663: \$? = $ac_status" >&5
+  echo "$as_me:10662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10669: \$? = $ac_status" >&5
+  echo "$as_me:10668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10677,7 +10676,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10680: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10679: 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
@@ -10686,14 +10685,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10689: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10688: 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 10696 "configure"
+#line 10695 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10708,16 +10707,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10714: \$? = $ac_status" >&5
+  echo "$as_me:10713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10720: \$? = $ac_status" >&5
+  echo "$as_me:10719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10824,7 +10823,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10827 "configure"
+#line 10826 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10839,16 +10838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10845: \$? = $ac_status" >&5
+  echo "$as_me:10844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10851: \$? = $ac_status" >&5
+  echo "$as_me:10850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10863,12 +10862,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10866: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10865: 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:10871: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10870: 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
@@ -10878,7 +10877,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10881 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10893,16 +10892,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10899: \$? = $ac_status" >&5
+  echo "$as_me:10898: \$? = $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:10901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10905: \$? = $ac_status" >&5
+  echo "$as_me:10904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10913,7 +10912,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10916: result: $cf_cv_default_source" >&5
+echo "$as_me:10915: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10950,16 +10949,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10953: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10952: 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}:10959: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10958: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10962 "configure"
+#line 10961 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10974,16 +10973,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10980: \$? = $ac_status" >&5
+  echo "$as_me:10979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10986: \$? = $ac_status" >&5
+  echo "$as_me:10985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11004,7 +11003,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11007 "configure"
+#line 11006 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11019,16 +11018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11025: \$? = $ac_status" >&5
+  echo "$as_me:11024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11031: \$? = $ac_status" >&5
+  echo "$as_me:11030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11039,7 +11038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11042: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11041: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11047,10 +11046,10 @@ echo "${as_me:-configure}:11042: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11050: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11049: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11053 "configure"
+#line 11052 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11065,16 +11064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11071: \$? = $ac_status" >&5
+  echo "$as_me:11070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11077: \$? = $ac_status" >&5
+  echo "$as_me:11076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11090,7 +11089,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11093: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11092: 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
@@ -11207,7 +11206,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11210: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11209: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11239,14 +11238,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11242: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11241: 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 11249 "configure"
+#line 11248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11264,16 +11263,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11270: \$? = $ac_status" >&5
+  echo "$as_me:11269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11276: \$? = $ac_status" >&5
+  echo "$as_me:11275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11285,7 +11284,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11288 "configure"
+#line 11287 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11303,16 +11302,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11309: \$? = $ac_status" >&5
+  echo "$as_me:11308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11315: \$? = $ac_status" >&5
+  echo "$as_me:11314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11327,7 +11326,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11330: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11329: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11487,16 +11486,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11490: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11489: 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}:11496: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11495: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11499 "configure"
+#line 11498 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11511,16 +11510,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11517: \$? = $ac_status" >&5
+  echo "$as_me:11516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11523: \$? = $ac_status" >&5
+  echo "$as_me:11522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11541,7 +11540,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11544 "configure"
+#line 11543 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11556,16 +11555,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11562: \$? = $ac_status" >&5
+  echo "$as_me:11561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11568: \$? = $ac_status" >&5
+  echo "$as_me:11567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11576,7 +11575,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11579: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11578: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11584,10 +11583,10 @@ echo "${as_me:-configure}:11579: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11587: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11586: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11590 "configure"
+#line 11589 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11602,16 +11601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11608: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11614: \$? = $ac_status" >&5
+  echo "$as_me:11613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11627,7 +11626,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11630: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11629: 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
@@ -11740,10 +11739,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11743: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11742: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11746 "configure"
+#line 11745 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11761,23 +11760,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11767: \$? = $ac_status" >&5
+  echo "$as_me:11766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11773: \$? = $ac_status" >&5
+  echo "$as_me:11772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11780: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11779: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11800,7 +11799,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11803: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11802: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11812,7 +11811,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11815: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11814: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11900,7 +11899,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11903: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11902: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11910,7 +11909,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11913: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11912: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11920,7 +11919,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11923: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11922: 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"
@@ -11932,10 +11931,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11935: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11934: 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 11938 "configure"
+#line 11937 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11950,16 +11949,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11956: \$? = $ac_status" >&5
+  echo "$as_me:11955: \$? = $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:11958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11962: \$? = $ac_status" >&5
+  echo "$as_me:11961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11968,12 +11967,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11971: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11970: 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 11976 "configure"
+#line 11975 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11988,16 +11987,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11994: \$? = $ac_status" >&5
+  echo "$as_me:11993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12000: \$? = $ac_status" >&5
+  echo "$as_me:11999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12008,19 +12007,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12011: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12010: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12016: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12015: 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 12023 "configure"
+#line 12022 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12038,16 +12037,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12044: \$? = $ac_status" >&5
+  echo "$as_me:12043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12050: \$? = $ac_status" >&5
+  echo "$as_me:12049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12059,7 +12058,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12062 "configure"
+#line 12061 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12077,16 +12076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12083: \$? = $ac_status" >&5
+  echo "$as_me:12082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12089: \$? = $ac_status" >&5
+  echo "$as_me:12088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12101,7 +12100,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12104: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12103: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12252,14 +12251,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12255: checking if SIGWINCH is defined" >&5
+echo "$as_me:12254: 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 12262 "configure"
+#line 12261 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12274,23 +12273,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12280: \$? = $ac_status" >&5
+  echo "$as_me:12279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12286: \$? = $ac_status" >&5
+  echo "$as_me:12285: \$? = $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 12293 "configure"
+#line 12292 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12308,16 +12307,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12314: \$? = $ac_status" >&5
+  echo "$as_me:12313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12320: \$? = $ac_status" >&5
+  echo "$as_me:12319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12331,11 +12330,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12334: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12333: 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:12338: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12337: 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
@@ -12346,7 +12345,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12349 "configure"
+#line 12348 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12368,16 +12367,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12374: \$? = $ac_status" >&5
+  echo "$as_me:12373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12380: \$? = $ac_status" >&5
+  echo "$as_me:12379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12391,7 +12390,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12394: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12393: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12401,13 +12400,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12404: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12403: 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 12410 "configure"
+#line 12409 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12421,16 +12420,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12427: \$? = $ac_status" >&5
+  echo "$as_me:12426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12433: \$? = $ac_status" >&5
+  echo "$as_me:12432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12441,7 +12440,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12444: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12443: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12455,7 +12454,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12458: checking if you want wide-character code" >&5
+echo "$as_me:12457: 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.
@@ -12465,7 +12464,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12468: result: $with_widec" >&5
+echo "$as_me:12467: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12487,7 +12486,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12490: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12489: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12500,23 +12499,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12503: checking for $ac_header" >&5
+echo "$as_me:12502: 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 12509 "configure"
+#line 12508 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12512: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12519: \$? = $ac_status" >&5
+  echo "$as_me:12518: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12535,7 +12534,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12537: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12545,14 +12544,14 @@ EOF
 fi
 done
 
-echo "$as_me:12548: checking if wchar.h can be used as is" >&5
+echo "$as_me:12547: 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 12555 "configure"
+#line 12554 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12574,16 +12573,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12577: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12580: \$? = $ac_status" >&5
+  echo "$as_me:12579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12586: \$? = $ac_status" >&5
+  echo "$as_me:12585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12593,16 +12592,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12596: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12595: 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:12602: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12601: 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 12605 "configure"
+#line 12604 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12618,16 +12617,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12624: \$? = $ac_status" >&5
+  echo "$as_me:12623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12630: \$? = $ac_status" >&5
+  echo "$as_me:12629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12636,16 +12635,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12639: result: $cf_result" >&5
+echo "$as_me:12638: 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:12645: checking checking for compatible value versus " >&5
+	echo "$as_me:12644: 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 12648 "configure"
+#line 12647 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12661,16 +12660,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12667: \$? = $ac_status" >&5
+  echo "$as_me:12666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12673: \$? = $ac_status" >&5
+  echo "$as_me:12672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12679,7 +12678,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12682: result: $cf_result" >&5
+	echo "$as_me:12681: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12689,7 +12688,7 @@ fi
 
 fi
 
-echo "$as_me:12692: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12691: 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
@@ -12760,7 +12759,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12763 "configure"
+#line 12762 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12805,15 +12804,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12811: \$? = $ac_status" >&5
+  echo "$as_me:12810: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12816: \$? = $ac_status" >&5
+  echo "$as_me:12815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12826,7 +12825,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12829: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12828: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12837,13 +12836,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12840: checking for $ac_func" >&5
+echo "$as_me:12839: 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 12846 "configure"
+#line 12845 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12874,16 +12873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12880: \$? = $ac_status" >&5
+  echo "$as_me:12879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12886: \$? = $ac_status" >&5
+  echo "$as_me:12885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12893,7 +12892,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12896: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12895: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12908,23 +12907,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12911: checking for $ac_header" >&5
+echo "$as_me:12910: 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 12917 "configure"
+#line 12916 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12920: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12927: \$? = $ac_status" >&5
+  echo "$as_me:12926: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12943,7 +12942,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12946: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12945: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12953,7 +12952,7 @@ EOF
 fi
 done
 
-echo "$as_me:12956: checking for multibyte character support" >&5
+echo "$as_me:12955: 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
@@ -12961,7 +12960,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12964 "configure"
+#line 12963 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12978,16 +12977,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12984: \$? = $ac_status" >&5
+  echo "$as_me:12983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12990: \$? = $ac_status" >&5
+  echo "$as_me:12989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12999,12 +12998,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13002: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13001: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13007 "configure"
+#line 13006 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13017,16 +13016,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13023: \$? = $ac_status" >&5
+  echo "$as_me:13022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13029: \$? = $ac_status" >&5
+  echo "$as_me:13028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13040,7 +13039,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13043 "configure"
+#line 13042 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13053,16 +13052,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13059: \$? = $ac_status" >&5
+  echo "$as_me:13058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13065: \$? = $ac_status" >&5
+  echo "$as_me:13064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13079,9 +13078,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13082: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13081: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13084: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13083: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13172,7 +13171,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13175: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13174: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13180,7 +13179,7 @@ echo "${as_me:-configure}:13175: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13183 "configure"
+#line 13182 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13193,21 +13192,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13199: \$? = $ac_status" >&5
+  echo "$as_me:13198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13205: \$? = $ac_status" >&5
+  echo "$as_me:13204: \$? = $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}:13210: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13209: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13225,7 +13224,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13228: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13227: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13300,13 +13299,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13303: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13302: 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 13309 "configure"
+#line 13308 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13319,21 +13318,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13325: \$? = $ac_status" >&5
+  echo "$as_me:13324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13331: \$? = $ac_status" >&5
+  echo "$as_me:13330: \$? = $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}:13336: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13335: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13375,7 +13374,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13378: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13377: 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
@@ -13413,7 +13412,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13416 "configure"
+#line 13415 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13425,16 +13424,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13431: \$? = $ac_status" >&5
+  echo "$as_me:13430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13437: \$? = $ac_status" >&5
+  echo "$as_me:13436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13451,7 +13450,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13454: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13453: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13487,7 +13486,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13490: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13489: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13519,14 +13518,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13522: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13521: 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 13529 "configure"
+#line 13528 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13544,23 +13543,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13550: \$? = $ac_status" >&5
+  echo "$as_me:13549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13556: \$? = $ac_status" >&5
+  echo "$as_me:13555: \$? = $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 13563 "configure"
+#line 13562 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13579,16 +13578,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13585: \$? = $ac_status" >&5
+  echo "$as_me:13584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13591: \$? = $ac_status" >&5
+  echo "$as_me:13590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13600,7 +13599,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13603: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13602: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13618,14 +13617,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13621: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13620: 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 13628 "configure"
+#line 13627 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13643,23 +13642,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13649: \$? = $ac_status" >&5
+  echo "$as_me:13648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13655: \$? = $ac_status" >&5
+  echo "$as_me:13654: \$? = $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 13662 "configure"
+#line 13661 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13678,16 +13677,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13684: \$? = $ac_status" >&5
+  echo "$as_me:13683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13690: \$? = $ac_status" >&5
+  echo "$as_me:13689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13699,7 +13698,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13702: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13701: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13722,14 +13721,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13725: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13724: 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 13732 "configure"
+#line 13731 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13747,23 +13746,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13753: \$? = $ac_status" >&5
+  echo "$as_me:13752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13759: \$? = $ac_status" >&5
+  echo "$as_me:13758: \$? = $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 13766 "configure"
+#line 13765 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13782,16 +13781,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13788: \$? = $ac_status" >&5
+  echo "$as_me:13787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13794: \$? = $ac_status" >&5
+  echo "$as_me:13793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13803,7 +13802,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13806: result: $cf_cv_wint_t" >&5
+echo "$as_me:13805: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13835,7 +13834,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13838: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13837: 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.
@@ -13845,7 +13844,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13848: result: $with_lp64" >&5
+echo "$as_me:13847: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13861,7 +13860,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13864: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13863: 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
@@ -13873,7 +13872,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13876 "configure"
+#line 13875 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13893,16 +13892,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13899: \$? = $ac_status" >&5
+  echo "$as_me:13898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13905: \$? = $ac_status" >&5
+  echo "$as_me:13904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13912,16 +13911,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13918: \$? = $ac_status" >&5
+  echo "$as_me:13917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13924: \$? = $ac_status" >&5
+  echo "$as_me:13923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13935,13 +13934,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13938: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13937: 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:13944: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13943: 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
@@ -13949,7 +13948,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13952 "configure"
+#line 13951 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13969,16 +13968,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13975: \$? = $ac_status" >&5
+  echo "$as_me:13974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13981: \$? = $ac_status" >&5
+  echo "$as_me:13980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13987,7 +13986,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13990 "configure"
+#line 13989 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14008,16 +14007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14014: \$? = $ac_status" >&5
+  echo "$as_me:14013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14020: \$? = $ac_status" >&5
+  echo "$as_me:14019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14028,7 +14027,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14031: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14030: 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
 
@@ -14038,7 +14037,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14041: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14040: 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
@@ -14046,7 +14045,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14049 "configure"
+#line 14048 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14066,16 +14065,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14072: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14078: \$? = $ac_status" >&5
+  echo "$as_me:14077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14084,7 +14083,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14087 "configure"
+#line 14086 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14105,16 +14104,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14111: \$? = $ac_status" >&5
+  echo "$as_me:14110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14117: \$? = $ac_status" >&5
+  echo "$as_me:14116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14125,7 +14124,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14128: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14127: 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
 
@@ -14138,7 +14137,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14141: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14140: 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
@@ -14146,7 +14145,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14149 "configure"
+#line 14148 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14158,16 +14157,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14164: \$? = $ac_status" >&5
+  echo "$as_me:14163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14170: \$? = $ac_status" >&5
+  echo "$as_me:14169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14176,7 +14175,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14179 "configure"
+#line 14178 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14189,16 +14188,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14195: \$? = $ac_status" >&5
+  echo "$as_me:14194: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14201: \$? = $ac_status" >&5
+  echo "$as_me:14200: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14209,7 +14208,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14212: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14211: 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
 
@@ -14223,13 +14222,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14226: checking for fseeko" >&5
+echo "$as_me:14225: 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 14232 "configure"
+#line 14231 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14241,16 +14240,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14247: \$? = $ac_status" >&5
+  echo "$as_me:14246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14253: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14260,7 +14259,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14263: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14262: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14299,14 +14298,14 @@ fi
 
 	fi
 
-	echo "$as_me:14302: checking whether to use struct dirent64" >&5
+	echo "$as_me:14301: 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 14309 "configure"
+#line 14308 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14329,16 +14328,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14335: \$? = $ac_status" >&5
+  echo "$as_me:14334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14341: \$? = $ac_status" >&5
+  echo "$as_me:14340: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14349,7 +14348,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14352: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14351: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14359,7 +14358,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14362: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14361: 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.
@@ -14369,14 +14368,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14372: result: $with_tparm_varargs" >&5
+echo "$as_me:14371: 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:14379: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14378: 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.
@@ -14386,14 +14385,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14389: result: $with_tic_depends" >&5
+echo "$as_me:14388: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14396: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14395: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14405,15 +14404,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14408: result: no" >&5
+	echo "$as_me:14407: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14412: result: yes" >&5
+	echo "$as_me:14411: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14416: checking for X11 rgb file" >&5
+echo "$as_me:14415: 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.
@@ -14477,7 +14476,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14480: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14479: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14485,7 +14484,7 @@ esac
 
 fi
 
-echo "$as_me:14488: result: $RGB_PATH" >&5
+echo "$as_me:14487: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14499,7 +14498,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14502: checking for type of bool" >&5
+echo "$as_me:14501: 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.
@@ -14509,10 +14508,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14512: result: $NCURSES_BOOL" >&5
+echo "$as_me:14511: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
-echo "$as_me:14515: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14514: 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.
@@ -14524,15 +14523,15 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14527: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14526: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14531: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14530: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14535: checking for type of chtype" >&5
+echo "$as_me:14534: 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.
@@ -14542,11 +14541,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14545: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14544: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14549: checking for type of ospeed" >&5
+echo "$as_me:14548: 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.
@@ -14556,11 +14555,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14559: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14558: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14563: checking for type of mmask_t" >&5
+echo "$as_me:14562: 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.
@@ -14570,11 +14569,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14573: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14572: 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:14577: checking for size CCHARW_MAX" >&5
+echo "$as_me:14576: 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.
@@ -14584,16 +14583,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14587: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14586: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14590: checking for signed char" >&5
+echo "$as_me:14589: 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 14596 "configure"
+#line 14595 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14608,16 +14607,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14614: \$? = $ac_status" >&5
+  echo "$as_me:14613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14620: \$? = $ac_status" >&5
+  echo "$as_me:14619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14627,10 +14626,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14630: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14629: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14633: checking size of signed char" >&5
+echo "$as_me:14632: 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
@@ -14639,7 +14638,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14642 "configure"
+#line 14641 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14651,21 +14650,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14657: \$? = $ac_status" >&5
+  echo "$as_me:14656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14663: \$? = $ac_status" >&5
+  echo "$as_me:14662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14668 "configure"
+#line 14667 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14677,16 +14676,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14683: \$? = $ac_status" >&5
+  echo "$as_me:14682: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14689: \$? = $ac_status" >&5
+  echo "$as_me:14688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14702,7 +14701,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14705 "configure"
+#line 14704 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14714,16 +14713,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14720: \$? = $ac_status" >&5
+  echo "$as_me:14719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14726: \$? = $ac_status" >&5
+  echo "$as_me:14725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14739,7 +14738,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14742 "configure"
+#line 14741 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14751,16 +14750,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14757: \$? = $ac_status" >&5
+  echo "$as_me:14756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14763: \$? = $ac_status" >&5
+  echo "$as_me:14762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14773,12 +14772,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14776: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14775: 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 14781 "configure"
+#line 14780 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14794,15 +14793,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14800: \$? = $ac_status" >&5
+  echo "$as_me:14799: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14805: \$? = $ac_status" >&5
+  echo "$as_me:14804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14818,7 +14817,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14821: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14820: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14829,8 +14828,8 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14832: 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
+echo "$as_me:14831: checking whether to use signed chars for Boolean array in term.h" >&5
+echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
 if test "${enable_signed_char+set}" = set; then
@@ -14839,12 +14838,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14842: result: $with_signed_char" >&5
+echo "$as_me:14841: 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:14847: checking for type of tparm args" >&5
+echo "$as_me:14846: 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.
@@ -14854,11 +14853,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14857: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14856: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14861: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14860: 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.
@@ -14868,7 +14867,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14871: result: $with_rcs_ids" >&5
+echo "$as_me:14870: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14877,7 +14876,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14880: checking format of man-pages" >&5
+echo "$as_me:14879: 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.
@@ -14968,10 +14967,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14971: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14970: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14974: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:14973: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15010,7 +15009,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15013: checking for manpage renaming" >&5
+echo "$as_me:15012: 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.
@@ -15039,15 +15038,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15042: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15041: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15047: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15046: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15050: checking if manpage aliases will be installed" >&5
+echo "$as_me:15049: 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.
@@ -15058,7 +15057,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15061: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15060: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15072,7 +15071,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15075: checking if manpage symlinks should be used" >&5
+echo "$as_me:15074: 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.
@@ -15085,17 +15084,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15088: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15087: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15094: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15093: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15098: checking for manpage tbl" >&5
+echo "$as_me:15097: 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.
@@ -15106,7 +15105,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15109: result: $MANPAGE_TBL" >&5
+echo "$as_me:15108: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15424,7 +15423,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15427: checking if you want to build with function extensions" >&5
+echo "$as_me:15426: 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.
@@ -15434,7 +15433,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15437: result: $with_ext_funcs" >&5
+echo "$as_me:15436: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15490,7 +15489,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15493: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15492: 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.
@@ -15500,7 +15499,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15503: result: $with_sp_funcs" >&5
+echo "$as_me:15502: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15519,7 +15518,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15522: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15521: 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.
@@ -15529,7 +15528,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15532: result: $with_term_driver" >&5
+echo "$as_me:15531: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15538,19 +15537,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15541: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15540: 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:15546: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15545: 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:15553: checking for extended use of const keyword" >&5
+echo "$as_me:15552: 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.
@@ -15560,7 +15559,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15563: result: $with_ext_const" >&5
+echo "$as_me:15562: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15568,7 +15567,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15571: checking if you want to use extended colors" >&5
+echo "$as_me:15570: 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.
@@ -15578,12 +15577,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15581: result: $with_ext_colors" >&5
+echo "$as_me:15580: 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:15586: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15585: 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)
@@ -15594,7 +15593,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15597: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15596: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15622,7 +15621,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15625: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15624: 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.
@@ -15632,7 +15631,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15635: result: $with_ext_mouse" >&5
+echo "$as_me:15634: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15642,7 +15641,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15645: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15644: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15659,7 +15658,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15662: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15661: 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.
@@ -15669,7 +15668,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15672: result: $with_ext_putwin" >&5
+echo "$as_me:15671: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15679,7 +15678,7 @@ EOF
 
 fi
 
-echo "$as_me:15682: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15681: 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.
@@ -15689,7 +15688,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15692: result: $with_no_padding" >&5
+echo "$as_me:15691: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15697,7 +15696,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15700: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15699: 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.
@@ -15707,7 +15706,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15710: result: $with_sigwinch" >&5
+echo "$as_me:15709: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15715,7 +15714,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15718: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15717: 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.
@@ -15725,7 +15724,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15728: result: $with_tcap_names" >&5
+echo "$as_me:15727: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15739,7 +15738,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15742: checking if you want to link with the pthread library" >&5
+echo "$as_me:15741: 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.
@@ -15749,27 +15748,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15752: result: $with_pthread" >&5
+echo "$as_me:15751: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15756: checking for pthread.h" >&5
+	echo "$as_me:15755: 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 15762 "configure"
+#line 15761 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15766: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15772: \$? = $ac_status" >&5
+  echo "$as_me:15771: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15788,7 +15787,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15791: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15790: 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
 
@@ -15798,7 +15797,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15801: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15800: 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"
 
@@ -15819,7 +15818,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15822 "configure"
+#line 15821 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15836,16 +15835,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15842: \$? = $ac_status" >&5
+  echo "$as_me:15841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15848: \$? = $ac_status" >&5
+  echo "$as_me:15847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15855,7 +15854,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15858: result: $with_pthread" >&5
+	    echo "$as_me:15857: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15883,7 +15882,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15886: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15885: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15893,13 +15892,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15896: checking for pthread_kill" >&5
+	echo "$as_me:15895: 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 15902 "configure"
+#line 15901 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15930,16 +15929,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15936: \$? = $ac_status" >&5
+  echo "$as_me:15935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15942: \$? = $ac_status" >&5
+  echo "$as_me:15941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15949,11 +15948,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15952: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15951: 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:15956: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15955: 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.
@@ -15963,7 +15962,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15966: result: $use_pthreads_eintr" >&5
+		echo "$as_me:15965: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15974,7 +15973,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15977: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:15976: 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.
@@ -15984,18 +15983,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15987: result: $use_weak_symbols" >&5
+	echo "$as_me:15986: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15991: checking if $CC supports weak symbols" >&5
+echo "$as_me:15990: 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 15998 "configure"
+#line 15997 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16021,16 +16020,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16027: \$? = $ac_status" >&5
+  echo "$as_me:16026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16033: \$? = $ac_status" >&5
+  echo "$as_me:16032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16041,7 +16040,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16044: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16043: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16091,7 +16090,7 @@ fi
 # 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:16094: checking if you want reentrant code" >&5
+echo "$as_me:16093: 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.
@@ -16101,7 +16100,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16104: result: $with_reentrant" >&5
+echo "$as_me:16103: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16190,7 +16189,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16193: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16192: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16202,8 +16201,8 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16205: checking if you want opaque curses-library structures" >&5
-echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+echo "$as_me:16204: checking whether curses library structures should be opaque" >&5
+echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
 if test "${enable_opaque_curses+set}" = set; then
@@ -16224,17 +16223,17 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16227: result: $enable_opaque_curses" >&5
+echo "$as_me:16226: 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:16232: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16231: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16236: checking if you want opaque form-library structures" >&5
-echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+echo "$as_me:16235: checking whether form library structures should be opaque" >&5
+echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
 if test "${enable_opaque_form+set}" = set; then
@@ -16243,11 +16242,11 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16246: result: $enable_opaque_form" >&5
+echo "$as_me:16245: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16249: checking if you want opaque menu-library structures" >&5
-echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+echo "$as_me:16248: checking whether menu library structures should be opaque" >&5
+echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
 if test "${enable_opaque_menu+set}" = set; then
@@ -16256,11 +16255,11 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16259: result: $enable_opaque_menu" >&5
+echo "$as_me:16258: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16262: checking if you want opaque panel-library structures" >&5
-echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+echo "$as_me:16261: checking whether panel library structures should be opaque" >&5
+echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
 if test "${enable_opaque_panel+set}" = set; then
@@ -16269,7 +16268,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16272: result: $enable_opaque_panel" >&5
+echo "$as_me:16271: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16279,7 +16278,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16282: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16281: 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.
@@ -16289,7 +16288,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16292: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16291: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16302,7 +16301,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16305: checking if you want all development code" >&5
+echo "$as_me:16304: 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.
@@ -16312,11 +16311,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16315: result: $with_develop" >&5
+echo "$as_me:16314: 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:16319: checking if you want hard-tabs code" >&5
+echo "$as_me:16318: 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.
@@ -16326,7 +16325,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16329: result: $enable_hard_tabs" >&5
+echo "$as_me:16328: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16334,7 +16333,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16337: checking if you want limited support for xmc" >&5
+echo "$as_me:16336: 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.
@@ -16344,7 +16343,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16347: result: $enable_xmc_glitch" >&5
+echo "$as_me:16346: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16354,7 +16353,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16357: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16356: 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.
@@ -16364,7 +16363,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16367: result: $with_assumed_color" >&5
+echo "$as_me:16366: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16372,7 +16371,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16375: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16374: 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.
@@ -16382,7 +16381,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16385: result: $with_hashmap" >&5
+echo "$as_me:16384: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16390,7 +16389,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16393: checking if you want code to check screensize" >&5
+echo "$as_me:16392: checking if you want code to check screensize" >&5
 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16400,7 +16399,7 @@ if test "${enable_check_size+set}" = set; then
 else
   with_check_size=no
 fi;
-echo "$as_me:16403: result: $with_check_size" >&5
+echo "$as_me:16402: result: $with_check_size" >&5
 echo "${ECHO_T}$with_check_size" >&6
 test "x$with_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16408,7 +16407,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16411: checking if you want colorfgbg code" >&5
+echo "$as_me:16410: 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.
@@ -16418,7 +16417,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16421: result: $with_colorfgbg" >&5
+echo "$as_me:16420: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16426,7 +16425,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16429: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16428: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16436,14 +16435,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16439: result: $cf_with_fvisibility" >&5
+echo "$as_me:16438: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16446: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16445: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16452,7 +16451,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16455 "configure"
+#line 16454 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16468,16 +16467,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16474: \$? = $ac_status" >&5
+  echo "$as_me:16473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16480: \$? = $ac_status" >&5
+  echo "$as_me:16479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16489,7 +16488,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16492: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16491: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16604,7 +16603,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16607: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16606: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16613,7 +16612,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16616 "configure"
+#line 16615 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16629,16 +16628,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16641: \$? = $ac_status" >&5
+  echo "$as_me:16640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16650,7 +16649,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16653: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16652: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16773,7 +16772,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16776: checking if you want interop bindings" >&5
+echo "$as_me:16775: 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.
@@ -16783,13 +16782,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16786: result: $with_exp_interop" >&5
+echo "$as_me:16785: 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:16792: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16791: 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.
@@ -16799,13 +16798,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16802: result: $with_safe_sprintf" >&5
+echo "$as_me:16801: 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:16808: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16807: 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.
@@ -16815,7 +16814,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16818: result: $with_scroll_hints" >&5
+echo "$as_me:16817: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16824,7 +16823,7 @@ EOF
 
 fi
 
-echo "$as_me:16827: checking if you want wgetch-events code" >&5
+echo "$as_me:16826: 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.
@@ -16834,7 +16833,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16837: result: $with_wgetch_events" >&5
+echo "$as_me:16836: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16849,7 +16848,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16852: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16851: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16859,7 +16858,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16862: result: $with_exp_win32" >&5
+	echo "$as_me:16861: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16885,7 +16884,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16888: checking if you want to see long compiling messages" >&5
+echo "$as_me:16887: 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.
@@ -16919,7 +16918,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16922: result: $enableval" >&5
+echo "$as_me:16921: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16932,7 +16931,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16935: checking if you want to install stripped executables" >&5
+echo "$as_me:16934: 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.
@@ -16949,7 +16948,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16952: result: $enable_stripping" >&5
+echo "$as_me:16951: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16960,7 +16959,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16963: checking if install accepts -p option" >&5
+echo "$as_me:16962: 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
@@ -16991,10 +16990,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16994: result: $cf_cv_install_p" >&5
+echo "$as_me:16993: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16997: checking if install needs to be told about ownership" >&5
+echo "$as_me:16996: 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)
@@ -17005,7 +17004,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17008: result: $with_install_o" >&5
+echo "$as_me:17007: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17016,7 +17015,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17019: checking if you want to specify strip-program" >&5
+	echo "$as_me:17018: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17026,11 +17025,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17029: result: $with_strip_program" >&5
+	echo "$as_me:17028: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17033: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17032: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17051,11 +17050,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17054: result: $check_install_strip" >&5
+		echo "$as_me:17053: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17058: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17057: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17070,7 +17069,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17073: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17072: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17096,7 +17095,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17099: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17098: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17113,17 +17112,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17116: result: $enable_stdnoreturn" >&5
+echo "$as_me:17115: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17120: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17119: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17126 "configure"
+#line 17125 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17139,16 +17138,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17145: \$? = $ac_status" >&5
+  echo "$as_me:17144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17151: \$? = $ac_status" >&5
+  echo "$as_me:17150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17159,7 +17158,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17162: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17161: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17215,16 +17214,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17218: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17217: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17223: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17222: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17227: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17226: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17263,16 +17262,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17266: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17265: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17271: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17270: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17275: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17274: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17311,23 +17310,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17314: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17313: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17319: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17318: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17323: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17322: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17330: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17329: 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.
@@ -17344,7 +17343,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17347: result: $enable_warnings" >&5
+echo "$as_me:17346: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17368,7 +17367,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17371 "configure"
+#line 17370 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17383,26 +17382,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17389: \$? = $ac_status" >&5
+  echo "$as_me:17388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17395: \$? = $ac_status" >&5
+  echo "$as_me:17394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17398: checking for X11/Xt const-feature" >&5
+echo "$as_me:17397: 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 17405 "configure"
+#line 17404 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17419,16 +17418,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17425: \$? = $ac_status" >&5
+  echo "$as_me:17424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17431: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17443,7 +17442,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17446: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17445: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17472,7 +17471,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17475 "${as_me:-configure}"
+#line 17474 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17488,7 +17487,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17491: checking for $CC warning options..." >&5
+	{ echo "$as_me:17490: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17504,12 +17503,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17510: \$? = $ac_status" >&5
+  echo "$as_me:17509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17512: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17511: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17517,7 +17516,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17520: checking for $CC warning options..." >&5
+	{ echo "$as_me:17519: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17540,12 +17539,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17543: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17546: \$? = $ac_status" >&5
+  echo "$as_me:17545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17548: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17547: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17553,7 +17552,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17556: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17555: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17563,7 +17562,7 @@ echo "${as_me:-configure}:17556: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17566: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17565: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17596,10 +17595,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17599: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17598: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17602 "${as_me:-configure}"
+#line 17601 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17649,12 +17648,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17652: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17655: \$? = $ac_status" >&5
+  echo "$as_me:17654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17657: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17656: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17726,12 +17725,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17729: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17728: 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 17734 "configure"
+#line 17733 "configure"
 #include "confdefs.h"
 
 int
@@ -17748,16 +17747,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17754: \$? = $ac_status" >&5
+  echo "$as_me:17753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17760: \$? = $ac_status" >&5
+  echo "$as_me:17759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17768,7 +17767,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17771: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17770: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17777,11 +17776,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17780: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17779: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17784 "configure"
+#line 17783 "configure"
 #include "confdefs.h"
 
 int
@@ -17798,16 +17797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17804: \$? = $ac_status" >&5
+  echo "$as_me:17803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17810: \$? = $ac_status" >&5
+  echo "$as_me:17809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17817,7 +17816,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17820: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17819: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17826,30 +17825,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17829: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17828: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17836: checking version of $CC" >&5
+	echo "$as_me:17835: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17840: result: $CLANG_VERSION" >&5
+	echo "$as_me:17839: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17847: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17846: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17852 "configure"
+#line 17851 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17863,16 +17862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17869: \$? = $ac_status" >&5
+  echo "$as_me:17868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17875: \$? = $ac_status" >&5
+  echo "$as_me:17874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17883,13 +17882,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17886: result: $cf_clang_optok" >&5
+		echo "$as_me:17885: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17892: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17891: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17906,7 +17905,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17909 "configure"
+#line 17908 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17924,7 +17923,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17927: checking for $CC warning options..." >&5
+	{ echo "$as_me:17926: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17941,12 +17940,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17944: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17947: \$? = $ac_status" >&5
+  echo "$as_me:17946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17949: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17948: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17955,7 +17954,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17958: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17957: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17985,16 +17984,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17988: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17991: \$? = $ac_status" >&5
+  echo "$as_me:17990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17993: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17997: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17996: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18012,7 +18011,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18015: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18014: 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.
@@ -18022,7 +18021,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18025: result: $enable_string_hacks" >&5
+echo "$as_me:18024: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18031,15 +18030,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18034: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18033: 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:18036: checking for strlcat" >&5
+	echo "$as_me:18035: 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 18042 "configure"
+#line 18041 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18070,16 +18069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18076: \$? = $ac_status" >&5
+  echo "$as_me:18075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18082: \$? = $ac_status" >&5
+  echo "$as_me:18081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18089,7 +18088,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18092: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18091: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18099,7 +18098,7 @@ EOF
 
 else
 
-		echo "$as_me:18102: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18101: 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
@@ -18107,7 +18106,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18110 "configure"
+#line 18109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18126,16 +18125,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18132: \$? = $ac_status" >&5
+  echo "$as_me:18131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18138: \$? = $ac_status" >&5
+  echo "$as_me:18137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18146,7 +18145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18149: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18148: 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
 
@@ -18169,23 +18168,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18172: checking for $ac_header" >&5
+echo "$as_me:18171: 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 18178 "configure"
+#line 18177 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18181: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18188: \$? = $ac_status" >&5
+  echo "$as_me:18187: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18204,7 +18203,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18206: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18225,13 +18224,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18228: checking for $ac_func" >&5
+echo "$as_me:18227: 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 18234 "configure"
+#line 18233 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18262,16 +18261,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18268: \$? = $ac_status" >&5
+  echo "$as_me:18267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18274: \$? = $ac_status" >&5
+  echo "$as_me:18273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18281,7 +18280,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18284: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18283: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18294,7 +18293,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18297: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18296: 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.
@@ -18304,7 +18303,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18307: result: $with_assertions" >&5
+echo "$as_me:18306: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18320,7 +18319,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18323: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18322: 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.
@@ -18342,7 +18341,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18345: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18344: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18456,23 +18455,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18459: checking for dmalloc.h" >&5
+	echo "$as_me:18458: 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 18465 "configure"
+#line 18464 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18469: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18475: \$? = $ac_status" >&5
+  echo "$as_me:18474: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18491,11 +18490,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18494: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18493: 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:18498: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18497: 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
@@ -18503,7 +18502,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18506 "configure"
+#line 18505 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18522,16 +18521,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18528: \$? = $ac_status" >&5
+  echo "$as_me:18527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18534: \$? = $ac_status" >&5
+  echo "$as_me:18533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18542,7 +18541,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18545: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18544: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18557,7 +18556,7 @@ fi
 
 fi
 
-echo "$as_me:18560: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18559: 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.
@@ -18579,7 +18578,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18582: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18581: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18693,23 +18692,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18696: checking for dbmalloc.h" >&5
+	echo "$as_me:18695: 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 18702 "configure"
+#line 18701 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18706: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18705: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18712: \$? = $ac_status" >&5
+  echo "$as_me:18711: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18728,11 +18727,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18731: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18730: 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:18735: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18734: 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
@@ -18740,7 +18739,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18743 "configure"
+#line 18742 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18759,16 +18758,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18765: \$? = $ac_status" >&5
+  echo "$as_me:18764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18771: \$? = $ac_status" >&5
+  echo "$as_me:18770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18779,7 +18778,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18782: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18781: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18794,7 +18793,7 @@ fi
 
 fi
 
-echo "$as_me:18797: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18796: 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.
@@ -18816,7 +18815,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18819: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18818: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18929,7 +18928,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18932: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18931: 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.
@@ -18940,7 +18939,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18943: result: $with_no_leaks" >&5
+echo "$as_me:18942: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18992,7 +18991,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18995: checking whether to add trace feature to all models" >&5
+echo "$as_me:18994: 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.
@@ -19002,7 +19001,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19005: result: $cf_with_trace" >&5
+echo "$as_me:19004: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19116,7 +19115,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19119: checking if we want to use GNAT projects" >&5
+echo "$as_me:19118: 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.
@@ -19133,7 +19132,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19136: result: $enable_gnat_projects" >&5
+echo "$as_me:19135: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19146,14 +19145,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19149: checking if ssp library is needed" >&5
+echo "$as_me:19148: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19156 "configure"
+#line 19155 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19170,16 +19169,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19176: \$? = $ac_status" >&5
+  echo "$as_me:19175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19182: \$? = $ac_status" >&5
+  echo "$as_me:19181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19189,7 +19188,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19192 "configure"
+#line 19191 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19206,16 +19205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19212: \$? = $ac_status" >&5
+  echo "$as_me:19211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19218: \$? = $ac_status" >&5
+  echo "$as_me:19217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19229,7 +19228,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19232: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19231: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19258,14 +19257,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19261: checking if -lm needed for math functions" >&5
+echo "$as_me:19260: 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 19268 "configure"
+#line 19267 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19281,16 +19280,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19287: \$? = $ac_status" >&5
+  echo "$as_me:19286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19293: \$? = $ac_status" >&5
+  echo "$as_me:19292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19300,7 +19299,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19303: result: $cf_cv_need_libm" >&5
+echo "$as_me:19302: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19308,14 +19307,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19311: checking if -lm is available for math functions" >&5
+	echo "$as_me:19310: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19318 "configure"
+#line 19317 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19331,16 +19330,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19337: \$? = $ac_status" >&5
+  echo "$as_me:19336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19343: \$? = $ac_status" >&5
+  echo "$as_me:19342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19350,7 +19349,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19353: result: $cf_cv_have_libm" >&5
+echo "$as_me:19352: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19372,13 +19371,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19375: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19374: 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 19381 "configure"
+#line 19380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19394,16 +19393,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19400: \$? = $ac_status" >&5
+  echo "$as_me:19399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19406: \$? = $ac_status" >&5
+  echo "$as_me:19405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19413,7 +19412,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19416: result: $ac_cv_header_time" >&5
+echo "$as_me:19415: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19428,7 +19427,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19431: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19430: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19436,7 +19435,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19439 "configure"
+#line 19438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19455,16 +19454,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19458: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19461: \$? = $ac_status" >&5
+  echo "$as_me:19460: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19467: \$? = $ac_status" >&5
+  echo "$as_me:19466: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19475,11 +19474,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19478: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19477: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19482: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19481: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19487,7 +19486,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19490 "configure"
+#line 19489 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19506,16 +19505,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19512: \$? = $ac_status" >&5
+  echo "$as_me:19511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19518: \$? = $ac_status" >&5
+  echo "$as_me:19517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19526,7 +19525,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19529: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19528: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19548,7 +19547,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19551: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19550: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19556,7 +19555,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19559 "configure"
+#line 19558 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19575,16 +19574,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19581: \$? = $ac_status" >&5
+  echo "$as_me:19580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19587: \$? = $ac_status" >&5
+  echo "$as_me:19586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19595,7 +19594,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19598: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19597: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19617,7 +19616,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19620: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19619: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19625,7 +19624,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19628 "configure"
+#line 19627 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19644,16 +19643,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19650: \$? = $ac_status" >&5
+  echo "$as_me:19649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19656: \$? = $ac_status" >&5
+  echo "$as_me:19655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19664,7 +19663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19667: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19666: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19706,7 +19705,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19709: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19708: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19714,7 +19713,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19717 "configure"
+#line 19716 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19733,16 +19732,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19739: \$? = $ac_status" >&5
+  echo "$as_me:19738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19745: \$? = $ac_status" >&5
+  echo "$as_me:19744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19753,7 +19752,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19756: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19755: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19781,13 +19780,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19784: checking for regcomp" >&5
+	echo "$as_me:19783: 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 19790 "configure"
+#line 19789 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19818,16 +19817,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19824: \$? = $ac_status" >&5
+  echo "$as_me:19823: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19830: \$? = $ac_status" >&5
+  echo "$as_me:19829: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19837,7 +19836,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19840: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19839: 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
@@ -19846,7 +19845,7 @@ else
 		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:19849: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19848: 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
@@ -19854,7 +19853,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19857 "configure"
+#line 19856 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19873,16 +19872,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19879: \$? = $ac_status" >&5
+  echo "$as_me:19878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19885: \$? = $ac_status" >&5
+  echo "$as_me:19884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19893,7 +19892,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19896: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19895: 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
 
@@ -19925,13 +19924,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19928: checking for compile" >&5
+	echo "$as_me:19927: 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 19934 "configure"
+#line 19933 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19962,16 +19961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19968: \$? = $ac_status" >&5
+  echo "$as_me:19967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19974: \$? = $ac_status" >&5
+  echo "$as_me:19973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19981,13 +19980,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19984: result: $ac_cv_func_compile" >&5
+echo "$as_me:19983: 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:19990: checking for compile in -lgen" >&5
+		echo "$as_me:19989: 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
@@ -19995,7 +19994,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19998 "configure"
+#line 19997 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20014,16 +20013,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20020: \$? = $ac_status" >&5
+  echo "$as_me:20019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20026: \$? = $ac_status" >&5
+  echo "$as_me:20025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20034,7 +20033,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20037: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20036: 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
 
@@ -20062,11 +20061,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20065: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20064: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20069: checking for regular-expression headers" >&5
+echo "$as_me:20068: 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
@@ -20078,7 +20077,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20081 "configure"
+#line 20080 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20095,16 +20094,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20101: \$? = $ac_status" >&5
+  echo "$as_me:20100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20107: \$? = $ac_status" >&5
+  echo "$as_me:20106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20121,7 +20120,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20124 "configure"
+#line 20123 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20141,16 +20140,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20147: \$? = $ac_status" >&5
+  echo "$as_me:20146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20153: \$? = $ac_status" >&5
+  echo "$as_me:20152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20166,11 +20165,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20169: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20168: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20173: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20172: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20208,23 +20207,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20211: checking for $ac_header" >&5
+echo "$as_me:20210: 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 20217 "configure"
+#line 20216 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:20226: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20243,7 +20242,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20246: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20256,23 +20255,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20259: checking for $ac_header" >&5
+echo "$as_me:20258: 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 20265 "configure"
+#line 20264 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20275: \$? = $ac_status" >&5
+  echo "$as_me:20274: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20291,7 +20290,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20293: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20301,7 +20300,7 @@ EOF
 fi
 done
 
-echo "$as_me:20304: checking for header declaring getopt variables" >&5
+echo "$as_me:20303: 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
@@ -20311,7 +20310,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20314 "configure"
+#line 20313 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20324,16 +20323,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20330: \$? = $ac_status" >&5
+  echo "$as_me:20329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20336: \$? = $ac_status" >&5
+  echo "$as_me:20335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20345,7 +20344,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20348: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20347: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20362,14 +20361,14 @@ EOF
 
 fi
 
-echo "$as_me:20365: checking if external environ is declared" >&5
+echo "$as_me:20364: 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 20372 "configure"
+#line 20371 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20382,16 +20381,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20388: \$? = $ac_status" >&5
+  echo "$as_me:20387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20394: \$? = $ac_status" >&5
+  echo "$as_me:20393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20402,7 +20401,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20405: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20404: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20417,14 +20416,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20420: checking if external environ exists" >&5
+echo "$as_me:20419: 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 20427 "configure"
+#line 20426 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20439,16 +20438,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20445: \$? = $ac_status" >&5
+  echo "$as_me:20444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20451: \$? = $ac_status" >&5
+  echo "$as_me:20450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20459,7 +20458,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20462: result: $cf_cv_have_environ" >&5
+echo "$as_me:20461: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20472,13 +20471,13 @@ EOF
 
 fi
 
-echo "$as_me:20475: checking for getenv" >&5
+echo "$as_me:20474: 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 20481 "configure"
+#line 20480 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20509,16 +20508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20515: \$? = $ac_status" >&5
+  echo "$as_me:20514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20521: \$? = $ac_status" >&5
+  echo "$as_me:20520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20528,19 +20527,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20531: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20530: 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:20537: checking for $ac_func" >&5
+echo "$as_me:20536: 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 20543 "configure"
+#line 20542 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20571,16 +20570,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20577: \$? = $ac_status" >&5
+  echo "$as_me:20576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20583: \$? = $ac_status" >&5
+  echo "$as_me:20582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20590,7 +20589,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20593: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20592: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20600,7 +20599,7 @@ EOF
 fi
 done
 
-echo "$as_me:20603: checking if getenv returns consistent values" >&5
+echo "$as_me:20602: 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
@@ -20610,7 +20609,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20613 "configure"
+#line 20612 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20715,15 +20714,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20721: \$? = $ac_status" >&5
+  echo "$as_me:20720: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20726: \$? = $ac_status" >&5
+  echo "$as_me:20725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20736,7 +20735,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20739: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20738: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20751,18 +20750,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20754: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20753: 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
 
-echo "$as_me:20758: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20757: 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 20765 "configure"
+#line 20764 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20782,16 +20781,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20788: \$? = $ac_status" >&5
+  echo "$as_me:20787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20794: \$? = $ac_status" >&5
+  echo "$as_me:20793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20803,7 +20802,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20806: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20805: 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
@@ -20818,13 +20817,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20821: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20820: 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 20827 "configure"
+#line 20826 "configure"
 #include "confdefs.h"
 
 int
@@ -20882,16 +20881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20888: \$? = $ac_status" >&5
+  echo "$as_me:20887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20894: \$? = $ac_status" >&5
+  echo "$as_me:20893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20901,7 +20900,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20904: result: $ac_cv_c_const" >&5
+echo "$as_me:20903: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20911,7 +20910,7 @@ EOF
 
 fi
 
-echo "$as_me:20914: checking for inline" >&5
+echo "$as_me:20913: 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
@@ -20919,7 +20918,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20922 "configure"
+#line 20921 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20928,16 +20927,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20934: \$? = $ac_status" >&5
+  echo "$as_me:20933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20940: \$? = $ac_status" >&5
+  echo "$as_me:20939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20948,7 +20947,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20951: result: $ac_cv_c_inline" >&5
+echo "$as_me:20950: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20974,7 +20973,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20977: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:20976: 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
@@ -20983,7 +20982,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20986 "configure"
+#line 20985 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20995,16 +20994,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21001: \$? = $ac_status" >&5
+  echo "$as_me:21000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21007: \$? = $ac_status" >&5
+  echo "$as_me:21006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21016,7 +21015,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21019: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21018: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21122,7 +21121,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21125: checking for signal global datatype" >&5
+echo "$as_me:21124: 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
@@ -21134,7 +21133,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21137 "configure"
+#line 21136 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21158,16 +21157,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21164: \$? = $ac_status" >&5
+  echo "$as_me:21163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21170: \$? = $ac_status" >&5
+  echo "$as_me:21169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21181,7 +21180,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21184: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21183: 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 <<EOF
@@ -21190,7 +21189,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21193: checking for type of chtype" >&5
+echo "$as_me:21192: 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
@@ -21200,7 +21199,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21203 "configure"
+#line 21202 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21235,15 +21234,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21241: \$? = $ac_status" >&5
+  echo "$as_me:21240: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21246: \$? = $ac_status" >&5
+  echo "$as_me:21245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21258,7 +21257,7 @@ fi
 
 fi
 
-echo "$as_me:21261: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21260: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21270,14 +21269,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21273: checking if unsigned literals are legal" >&5
+echo "$as_me:21272: 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 21280 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 
 int
@@ -21289,16 +21288,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21295: \$? = $ac_status" >&5
+  echo "$as_me:21294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21301: \$? = $ac_status" >&5
+  echo "$as_me:21300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21310,7 +21309,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21313: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21312: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21326,14 +21325,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21329: checking if external errno is declared" >&5
+echo "$as_me:21328: 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 21336 "configure"
+#line 21335 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21347,16 +21346,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21349: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21353: \$? = $ac_status" >&5
+  echo "$as_me:21352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21359: \$? = $ac_status" >&5
+  echo "$as_me:21358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21367,7 +21366,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21370: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21369: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21382,14 +21381,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21385: checking if external errno exists" >&5
+echo "$as_me:21384: 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 21392 "configure"
+#line 21391 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21404,16 +21403,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21410: \$? = $ac_status" >&5
+  echo "$as_me:21409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21424,7 +21423,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21427: result: $cf_cv_have_errno" >&5
+echo "$as_me:21426: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21437,7 +21436,7 @@ EOF
 
 fi
 
-echo "$as_me:21440: checking if data-only library module links" >&5
+echo "$as_me:21439: 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
@@ -21445,20 +21444,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21448 "configure"
+#line 21447 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21451: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21454: \$? = $ac_status" >&5
+  echo "$as_me:21453: \$? = $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 <<EOF
-#line 21461 "configure"
+#line 21460 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21471,10 +21470,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21474: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21477: \$? = $ac_status" >&5
+  echo "$as_me:21476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21487,7 +21486,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21490 "configure"
+#line 21489 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21498,15 +21497,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21504: \$? = $ac_status" >&5
+  echo "$as_me:21503: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21509: \$? = $ac_status" >&5
+  echo "$as_me:21508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21521,7 +21520,7 @@ fi
 
 fi
 
-echo "$as_me:21524: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21523: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21535,14 +21534,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21538: checking for clock_gettime" >&5
+echo "$as_me:21537: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21545 "configure"
+#line 21544 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21555,16 +21554,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21561: \$? = $ac_status" >&5
+  echo "$as_me:21560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21567: \$? = $ac_status" >&5
+  echo "$as_me:21566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21575,7 +21574,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21578: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21577: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21586,13 +21585,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21589: checking for gettimeofday" >&5
+echo "$as_me:21588: 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 21595 "configure"
+#line 21594 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21623,16 +21622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21629: \$? = $ac_status" >&5
+  echo "$as_me:21628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21635: \$? = $ac_status" >&5
+  echo "$as_me:21634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21642,7 +21641,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21645: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21644: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21652,7 +21651,7 @@ EOF
 
 else
 
-echo "$as_me:21655: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21654: 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
@@ -21660,7 +21659,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21663 "configure"
+#line 21662 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21679,16 +21678,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21685: \$? = $ac_status" >&5
+  echo "$as_me:21684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21691: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21699,7 +21698,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21702: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21701: 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
 
@@ -21760,13 +21759,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21763: checking for $ac_func" >&5
+echo "$as_me:21762: 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 21769 "configure"
+#line 21768 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21797,16 +21796,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21803: \$? = $ac_status" >&5
+  echo "$as_me:21802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21809: \$? = $ac_status" >&5
+  echo "$as_me:21808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21816,7 +21815,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21819: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21818: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21826,14 +21825,14 @@ EOF
 fi
 done
 
-echo "$as_me:21829: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21828: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21836 "configure"
+#line 21835 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21848,16 +21847,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21854: \$? = $ac_status" >&5
+  echo "$as_me:21853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21860: \$? = $ac_status" >&5
+  echo "$as_me:21859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21867,7 +21866,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21870: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21869: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21889,7 +21888,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21892: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21891: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21899,7 +21898,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21902 "configure"
+#line 21901 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21912,15 +21911,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21918: \$? = $ac_status" >&5
+  echo "$as_me:21917: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21923: \$? = $ac_status" >&5
+  echo "$as_me:21922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21932,7 +21931,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21935: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21934: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21944,14 +21943,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21947: checking for getttynam" >&5
+	echo "$as_me:21946: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21954 "configure"
+#line 21953 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21963,16 +21962,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21969: \$? = $ac_status" >&5
+  echo "$as_me:21968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21975: \$? = $ac_status" >&5
+  echo "$as_me:21974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21982,7 +21981,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21985: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:21984: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21992,7 +21991,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21995: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:21994: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22001,7 +22000,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22004: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22003: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22014,14 +22013,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22017: checking for terminal-capability database functions" >&5
+echo "$as_me:22016: 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 22024 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22041,16 +22040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22047: \$? = $ac_status" >&5
+  echo "$as_me:22046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22053: \$? = $ac_status" >&5
+  echo "$as_me:22052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22061,7 +22060,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22064: result: $cf_cv_cgetent" >&5
+echo "$as_me:22063: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22071,14 +22070,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22074: checking if cgetent uses const parameter" >&5
+echo "$as_me:22073: 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 22081 "configure"
+#line 22080 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22101,16 +22100,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22107: \$? = $ac_status" >&5
+  echo "$as_me:22106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22113: \$? = $ac_status" >&5
+  echo "$as_me:22112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22121,7 +22120,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22124: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22123: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22135,14 +22134,14 @@ fi
 
 fi
 
-echo "$as_me:22138: checking for isascii" >&5
+echo "$as_me:22137: 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 22145 "configure"
+#line 22144 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22154,16 +22153,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22160: \$? = $ac_status" >&5
+  echo "$as_me:22159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22166: \$? = $ac_status" >&5
+  echo "$as_me:22165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22174,7 +22173,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22177: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22176: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22182,10 +22181,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22185: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22184: 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 22188 "configure"
+#line 22187 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22199,16 +22198,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22205: \$? = $ac_status" >&5
+  echo "$as_me:22204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22211: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22216,7 +22215,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22219 "configure"
+#line 22218 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22231,16 +22230,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22237: \$? = $ac_status" >&5
+  echo "$as_me:22236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22243: \$? = $ac_status" >&5
+  echo "$as_me:22242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22256,11 +22255,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22259: result: $sigact_bad" >&5
+echo "$as_me:22258: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22263: checking if nanosleep really works" >&5
+echo "$as_me:22262: 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
@@ -22270,7 +22269,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22273 "configure"
+#line 22272 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22296,15 +22295,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22302: \$? = $ac_status" >&5
+  echo "$as_me:22301: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22307: \$? = $ac_status" >&5
+  echo "$as_me:22306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22316,7 +22315,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22319: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22318: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22333,23 +22332,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22336: checking for $ac_header" >&5
+echo "$as_me:22335: 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 22342 "configure"
+#line 22341 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22345: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22352: \$? = $ac_status" >&5
+  echo "$as_me:22351: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22368,7 +22367,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22371: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22370: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22385,10 +22384,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22388: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22387: 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 22391 "configure"
+#line 22390 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22400,16 +22399,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22412: \$? = $ac_status" >&5
+  echo "$as_me:22411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22417,7 +22416,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22420 "configure"
+#line 22419 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22431,16 +22430,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22437: \$? = $ac_status" >&5
+  echo "$as_me:22436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22443: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22456,19 +22455,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22459: result: $termios_bad" >&5
+	echo "$as_me:22458: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22464: checking for tcgetattr" >&5
+echo "$as_me:22463: 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 22471 "configure"
+#line 22470 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22496,16 +22495,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22502: \$? = $ac_status" >&5
+  echo "$as_me:22501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22508: \$? = $ac_status" >&5
+  echo "$as_me:22507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22515,21 +22514,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22518: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22517: 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:22525: checking for vsscanf function or workaround" >&5
+echo "$as_me:22524: 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 22532 "configure"
+#line 22531 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22545,16 +22544,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22551: \$? = $ac_status" >&5
+  echo "$as_me:22550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22557: \$? = $ac_status" >&5
+  echo "$as_me:22556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22562,7 +22561,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22565 "configure"
+#line 22564 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22584,16 +22583,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22590: \$? = $ac_status" >&5
+  echo "$as_me:22589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22596: \$? = $ac_status" >&5
+  echo "$as_me:22595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22601,7 +22600,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22604 "configure"
+#line 22603 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22623,16 +22622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22629: \$? = $ac_status" >&5
+  echo "$as_me:22628: \$? = $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:22631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22635: \$? = $ac_status" >&5
+  echo "$as_me:22634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22647,7 +22646,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22650: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22649: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22673,23 +22672,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22676: checking for $ac_header" >&5
+echo "$as_me:22675: 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 22682 "configure"
+#line 22681 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22686: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22685: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22692: \$? = $ac_status" >&5
+  echo "$as_me:22691: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22708,7 +22707,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22711: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22710: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22718,7 +22717,7 @@ EOF
 fi
 done
 
-echo "$as_me:22721: checking for working mkstemp" >&5
+echo "$as_me:22720: 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
@@ -22729,7 +22728,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22732 "configure"
+#line 22731 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22764,15 +22763,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22770: \$? = $ac_status" >&5
+  echo "$as_me:22769: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22775: \$? = $ac_status" >&5
+  echo "$as_me:22774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22787,16 +22786,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22790: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22789: 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:22793: checking for mkstemp" >&5
+	echo "$as_me:22792: 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 22799 "configure"
+#line 22798 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22827,16 +22826,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22833: \$? = $ac_status" >&5
+  echo "$as_me:22832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22839: \$? = $ac_status" >&5
+  echo "$as_me:22838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22846,7 +22845,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22849: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22848: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22867,21 +22866,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22870: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22869: 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:22873: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22872: 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:22879: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22878: 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 22884 "configure"
+#line 22883 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22898,15 +22897,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22904: \$? = $ac_status" >&5
+  echo "$as_me:22903: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22909: \$? = $ac_status" >&5
+  echo "$as_me:22908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22919,7 +22918,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22922: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22921: 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
 
@@ -22930,13 +22929,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22933: checking for intptr_t" >&5
+echo "$as_me:22932: 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 22939 "configure"
+#line 22938 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22951,16 +22950,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22957: \$? = $ac_status" >&5
+  echo "$as_me:22956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22963: \$? = $ac_status" >&5
+  echo "$as_me:22962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22970,7 +22969,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22973: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22972: 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
   :
@@ -22982,13 +22981,13 @@ EOF
 
 fi
 
-echo "$as_me:22985: checking for ssize_t" >&5
+echo "$as_me:22984: 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 22991 "configure"
+#line 22990 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23003,16 +23002,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23009: \$? = $ac_status" >&5
+  echo "$as_me:23008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23015: \$? = $ac_status" >&5
+  echo "$as_me:23014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23022,7 +23021,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23025: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23024: 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
   :
@@ -23034,14 +23033,14 @@ EOF
 
 fi
 
-echo "$as_me:23037: checking for type sigaction_t" >&5
+echo "$as_me:23036: 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 23044 "configure"
+#line 23043 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23054,16 +23053,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23060: \$? = $ac_status" >&5
+  echo "$as_me:23059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23066: \$? = $ac_status" >&5
+  echo "$as_me:23065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23074,14 +23073,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23077: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23076: 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:23084: checking declaration of size-change" >&5
+echo "$as_me:23083: 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
@@ -23102,7 +23101,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23105 "configure"
+#line 23104 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23152,16 +23151,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23158: \$? = $ac_status" >&5
+  echo "$as_me:23157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23164: \$? = $ac_status" >&5
+  echo "$as_me:23163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23180,7 +23179,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23183: result: $cf_cv_sizechange" >&5
+echo "$as_me:23182: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23198,13 +23197,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23201: checking for memmove" >&5
+echo "$as_me:23200: 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 23207 "configure"
+#line 23206 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23235,16 +23234,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23241: \$? = $ac_status" >&5
+  echo "$as_me:23240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23247: \$? = $ac_status" >&5
+  echo "$as_me:23246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23254,19 +23253,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23257: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23256: 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:23263: checking for bcopy" >&5
+echo "$as_me:23262: 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 23269 "configure"
+#line 23268 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23297,16 +23296,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23303: \$? = $ac_status" >&5
+  echo "$as_me:23302: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23309: \$? = $ac_status" >&5
+  echo "$as_me:23308: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23316,11 +23315,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23319: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23318: 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:23323: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23322: 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
@@ -23330,7 +23329,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23333 "configure"
+#line 23332 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23346,15 +23345,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23352: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23357: \$? = $ac_status" >&5
+  echo "$as_me:23356: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23367,7 +23366,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23370: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23369: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23394,13 +23393,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23397: checking for $ac_func" >&5
+echo "$as_me:23396: 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 23403 "configure"
+#line 23402 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23431,16 +23430,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23437: \$? = $ac_status" >&5
+  echo "$as_me:23436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23443: \$? = $ac_status" >&5
+  echo "$as_me:23442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23450,7 +23449,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23453: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23452: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23460,7 +23459,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23463: checking if poll really works" >&5
+echo "$as_me:23462: 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
@@ -23470,7 +23469,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23473 "configure"
+#line 23472 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23523,15 +23522,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23529: \$? = $ac_status" >&5
+  echo "$as_me:23528: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23534: \$? = $ac_status" >&5
+  echo "$as_me:23533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23543,21 +23542,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23546: result: $cf_cv_working_poll" >&5
+echo "$as_me:23545: 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:23553: checking for va_copy" >&5
+echo "$as_me:23552: 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 23560 "configure"
+#line 23559 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23574,16 +23573,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23580: \$? = $ac_status" >&5
+  echo "$as_me:23579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23586: \$? = $ac_status" >&5
+  echo "$as_me:23585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23593,7 +23592,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23596: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23595: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23605,14 +23604,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23608: checking for __va_copy" >&5
+echo "$as_me:23607: 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 23615 "configure"
+#line 23614 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23629,16 +23628,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23635: \$? = $ac_status" >&5
+  echo "$as_me:23634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23641: \$? = $ac_status" >&5
+  echo "$as_me:23640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23648,7 +23647,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23651: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23650: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23660,14 +23659,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23663: checking for __builtin_va_copy" >&5
+echo "$as_me:23662: 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 23670 "configure"
+#line 23669 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23684,16 +23683,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23690: \$? = $ac_status" >&5
+  echo "$as_me:23689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23696: \$? = $ac_status" >&5
+  echo "$as_me:23695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23703,7 +23702,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23706: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23705: 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 &&
@@ -23721,14 +23720,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23724: checking if we can simply copy va_list" >&5
+	echo "$as_me:23723: 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 23731 "configure"
+#line 23730 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23745,16 +23744,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23751: \$? = $ac_status" >&5
+  echo "$as_me:23750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23757: \$? = $ac_status" >&5
+  echo "$as_me:23756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23764,19 +23763,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23767: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23766: 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:23772: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23771: 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 23779 "configure"
+#line 23778 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23793,16 +23792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23799: \$? = $ac_status" >&5
+  echo "$as_me:23798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23805: \$? = $ac_status" >&5
+  echo "$as_me:23804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23812,7 +23811,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23815: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23814: 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
@@ -23823,13 +23822,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23826: checking for pid_t" >&5
+echo "$as_me:23825: 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 23832 "configure"
+#line 23831 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23844,16 +23843,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:23849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23856: \$? = $ac_status" >&5
+  echo "$as_me:23855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23863,7 +23862,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23866: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23865: 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
   :
@@ -23878,23 +23877,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23881: checking for $ac_header" >&5
+echo "$as_me:23880: 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 23887 "configure"
+#line 23886 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23890: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23897: \$? = $ac_status" >&5
+  echo "$as_me:23896: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23913,7 +23912,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23916: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23915: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23926,13 +23925,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23929: checking for $ac_func" >&5
+echo "$as_me:23928: 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 23935 "configure"
+#line 23934 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23963,16 +23962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23969: \$? = $ac_status" >&5
+  echo "$as_me:23968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23975: \$? = $ac_status" >&5
+  echo "$as_me:23974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23982,7 +23981,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23985: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23984: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23994,7 +23993,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23997: checking for working fork" >&5
+  echo "$as_me:23996: 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
@@ -24017,15 +24016,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24023: \$? = $ac_status" >&5
+  echo "$as_me:24022: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24028: \$? = $ac_status" >&5
+  echo "$as_me:24027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24037,7 +24036,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24040: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24039: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24051,12 +24050,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24054: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24053: 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:24059: checking for working vfork" >&5
+  echo "$as_me:24058: 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
@@ -24065,7 +24064,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24068 "configure"
+#line 24067 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24158,15 +24157,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24164: \$? = $ac_status" >&5
+  echo "$as_me:24163: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24169: \$? = $ac_status" >&5
+  echo "$as_me:24168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24178,13 +24177,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24181: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24180: 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:24187: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24186: 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
 
@@ -24209,7 +24208,7 @@ EOF
 
 fi
 
-echo "$as_me:24212: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24211: 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
@@ -24219,7 +24218,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24222 "configure"
+#line 24221 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24254,15 +24253,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24260: \$? = $ac_status" >&5
+  echo "$as_me:24259: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24265: \$? = $ac_status" >&5
+  echo "$as_me:24264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24275,7 +24274,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24278: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24277: 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
@@ -24284,7 +24283,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24287: checking for openpty in -lutil" >&5
+echo "$as_me:24286: 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
@@ -24292,7 +24291,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24295 "configure"
+#line 24294 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24311,16 +24310,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24317: \$? = $ac_status" >&5
+  echo "$as_me:24316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24323: \$? = $ac_status" >&5
+  echo "$as_me:24322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24331,7 +24330,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24334: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24333: 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
@@ -24339,7 +24338,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24342: checking for openpty header" >&5
+echo "$as_me:24341: 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
@@ -24366,7 +24365,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24369 "configure"
+#line 24368 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24383,16 +24382,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24389: \$? = $ac_status" >&5
+  echo "$as_me:24388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24395: \$? = $ac_status" >&5
+  echo "$as_me:24394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24410,7 +24409,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24413: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24412: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24483,7 +24482,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24486 "configure"
+#line 24485 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24495,16 +24494,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24501: \$? = $ac_status" >&5
+  echo "$as_me:24500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24507: \$? = $ac_status" >&5
+  echo "$as_me:24506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24521,7 +24520,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24524: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24523: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24557,7 +24556,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24560: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24559: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24568,7 +24567,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24571: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24570: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24640,7 +24639,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24643 "configure"
+#line 24642 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24652,16 +24651,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24658: \$? = $ac_status" >&5
+  echo "$as_me:24657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24664: \$? = $ac_status" >&5
+  echo "$as_me:24663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24678,7 +24677,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24681: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24680: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24758,7 +24757,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24761: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24760: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24775,23 +24774,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24778: checking for db.h" >&5
+echo "$as_me:24777: 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 24784 "configure"
+#line 24783 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24788: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24787: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24794: \$? = $ac_status" >&5
+  echo "$as_me:24793: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24810,11 +24809,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24813: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24812: 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:24817: checking for version of db" >&5
+echo "$as_me:24816: 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
@@ -24825,10 +24824,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24828: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24827: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24831 "configure"
+#line 24830 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24858,16 +24857,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24864: \$? = $ac_status" >&5
+  echo "$as_me:24863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24870: \$? = $ac_status" >&5
+  echo "$as_me:24869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24881,16 +24880,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24884: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24883: 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:24888: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24887: 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:24893: checking for db libraries" >&5
+echo "$as_me:24892: 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
@@ -24920,10 +24919,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24923: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24922: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24926 "configure"
+#line 24925 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24978,16 +24977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24984: \$? = $ac_status" >&5
+  echo "$as_me:24983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24990: \$? = $ac_status" >&5
+  echo "$as_me:24989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25007,11 +25006,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25010: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25009: 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:25014: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25013: 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
@@ -25037,7 +25036,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25040: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25039: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25052,7 +25051,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25055: checking if we should include stdbool.h" >&5
+echo "$as_me:25054: 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
@@ -25060,7 +25059,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25063 "configure"
+#line 25062 "configure"
 #include "confdefs.h"
 
 int
@@ -25072,23 +25071,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25078: \$? = $ac_status" >&5
+  echo "$as_me:25077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25084: \$? = $ac_status" >&5
+  echo "$as_me:25083: \$? = $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 25091 "configure"
+#line 25090 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25104,16 +25103,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25110: \$? = $ac_status" >&5
+  echo "$as_me:25109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25116: \$? = $ac_status" >&5
+  echo "$as_me:25115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25127,13 +25126,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25130: result: yes" >&5
+then	echo "$as_me:25129: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25132: result: no" >&5
+else	echo "$as_me:25131: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25136: checking for builtin bool type" >&5
+echo "$as_me:25135: 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
@@ -25141,7 +25140,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25144 "configure"
+#line 25143 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25156,16 +25155,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25162: \$? = $ac_status" >&5
+  echo "$as_me:25161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25168: \$? = $ac_status" >&5
+  echo "$as_me:25167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25178,9 +25177,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25181: result: yes" >&5
+then	echo "$as_me:25180: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25183: result: no" >&5
+else	echo "$as_me:25182: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25197,10 +25196,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25200: checking if we already have C++ library" >&5
+	echo "$as_me:25199: 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 25203 "configure"
+#line 25202 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25214,16 +25213,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25220: \$? = $ac_status" >&5
+  echo "$as_me:25219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25226: \$? = $ac_status" >&5
+  echo "$as_me:25225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25232,7 +25231,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25235: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25234: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25251,7 +25250,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25254: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25253: 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
@@ -25277,7 +25276,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25280 "configure"
+#line 25279 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25291,16 +25290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25297: \$? = $ac_status" >&5
+  echo "$as_me:25296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25303: \$? = $ac_status" >&5
+  echo "$as_me:25302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25312,7 +25311,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25315: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25314: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25334,7 +25333,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25337: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25336: 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
@@ -25349,15 +25348,15 @@ CF_EOF
 # 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:25352: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25355: \$? = $ac_status" >&5
+  echo "$as_me:25354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25357: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25360: \$? = $ac_status" >&5
+  echo "$as_me:25359: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25368,10 +25367,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25371: result: yes" >&5
+  echo "$as_me:25370: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25374: result: no" >&5
+  echo "$as_me:25373: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25391,7 +25390,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25394: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25393: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25412,7 +25411,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25415 "configure"
+#line 25414 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25426,16 +25425,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25432: \$? = $ac_status" >&5
+  echo "$as_me:25431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25438: \$? = $ac_status" >&5
+  echo "$as_me:25437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25472,7 +25471,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25475 "configure"
+#line 25474 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25486,16 +25485,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25492: \$? = $ac_status" >&5
+  echo "$as_me:25491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25498: \$? = $ac_status" >&5
+  echo "$as_me:25497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25528,7 +25527,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25531: result: $cf_cxx_library" >&5
+	echo "$as_me:25530: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25544,7 +25543,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25547: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25546: 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
@@ -25561,18 +25560,18 @@ do
   # 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 25564 "configure"
+#line 25563 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25569: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25575: \$? = $ac_status" >&5
+  echo "$as_me:25574: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25595,17 +25594,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25598 "configure"
+#line 25597 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25602: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25608: \$? = $ac_status" >&5
+  echo "$as_me:25607: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25642,7 +25641,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25645: result: $CXXCPP" >&5
+echo "$as_me:25644: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25652,18 +25651,18 @@ do
   # 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 25655 "configure"
+#line 25654 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25660: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25659: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25666: \$? = $ac_status" >&5
+  echo "$as_me:25665: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25686,17 +25685,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25689 "configure"
+#line 25688 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25693: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25692: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25699: \$? = $ac_status" >&5
+  echo "$as_me:25698: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25724,7 +25723,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25727: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25726: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25739,23 +25738,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25742: checking for $ac_header" >&5
+echo "$as_me:25741: 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 25748 "configure"
+#line 25747 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25752: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25758: \$? = $ac_status" >&5
+  echo "$as_me:25757: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25774,7 +25773,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25777: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25776: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25787,23 +25786,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25790: checking for $ac_header" >&5
+echo "$as_me:25789: 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 25796 "configure"
+#line 25795 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25799: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25806: \$? = $ac_status" >&5
+  echo "$as_me:25805: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25822,7 +25821,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25824: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25833,10 +25832,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25836: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25835: 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 25839 "configure"
+#line 25838 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25853,16 +25852,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25859: \$? = $ac_status" >&5
+  echo "$as_me:25858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25865: \$? = $ac_status" >&5
+  echo "$as_me:25864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25871,7 +25870,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25874: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25873: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25882,7 +25881,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25885: checking if we should include stdbool.h" >&5
+echo "$as_me:25884: 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
@@ -25890,7 +25889,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25893 "configure"
+#line 25892 "configure"
 #include "confdefs.h"
 
 int
@@ -25902,23 +25901,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25908: \$? = $ac_status" >&5
+  echo "$as_me:25907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25914: \$? = $ac_status" >&5
+  echo "$as_me:25913: \$? = $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 25921 "configure"
+#line 25920 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25934,16 +25933,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25940: \$? = $ac_status" >&5
+  echo "$as_me:25939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25946: \$? = $ac_status" >&5
+  echo "$as_me:25945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25957,13 +25956,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25960: result: yes" >&5
+then	echo "$as_me:25959: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25962: result: no" >&5
+else	echo "$as_me:25961: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25966: checking for builtin bool type" >&5
+echo "$as_me:25965: 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
@@ -25971,7 +25970,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25974 "configure"
+#line 25973 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25986,16 +25985,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25992: \$? = $ac_status" >&5
+  echo "$as_me:25991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25998: \$? = $ac_status" >&5
+  echo "$as_me:25997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26008,19 +26007,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26011: result: yes" >&5
+then	echo "$as_me:26010: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26013: result: no" >&5
+else	echo "$as_me:26012: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26017: checking for bool" >&5
+echo "$as_me:26016: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26023 "configure"
+#line 26022 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26055,16 +26054,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26061: \$? = $ac_status" >&5
+  echo "$as_me:26060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26067: \$? = $ac_status" >&5
+  echo "$as_me:26066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26074,10 +26073,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26077: result: $ac_cv_type_bool" >&5
+echo "$as_me:26076: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26080: checking size of bool" >&5
+echo "$as_me:26079: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26086,7 +26085,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26089 "configure"
+#line 26088 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26118,21 +26117,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26124: \$? = $ac_status" >&5
+  echo "$as_me:26123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26130: \$? = $ac_status" >&5
+  echo "$as_me:26129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26135 "configure"
+#line 26134 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26164,16 +26163,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26170: \$? = $ac_status" >&5
+  echo "$as_me:26169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26176: \$? = $ac_status" >&5
+  echo "$as_me:26175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26189,7 +26188,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26192 "configure"
+#line 26191 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26221,16 +26220,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26227: \$? = $ac_status" >&5
+  echo "$as_me:26226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26233: \$? = $ac_status" >&5
+  echo "$as_me:26232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26246,7 +26245,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26249 "configure"
+#line 26248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26278,16 +26277,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26284: \$? = $ac_status" >&5
+  echo "$as_me:26283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26290: \$? = $ac_status" >&5
+  echo "$as_me:26289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26300,12 +26299,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26303: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26302: 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 26308 "configure"
+#line 26307 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26341,15 +26340,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26347: \$? = $ac_status" >&5
+  echo "$as_me:26346: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26352: \$? = $ac_status" >&5
+  echo "$as_me:26351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26365,13 +26364,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26368: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26367: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26374: checking for type of bool" >&5
+echo "$as_me:26373: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26390,7 +26389,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26393 "configure"
+#line 26392 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26431,15 +26430,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26437: \$? = $ac_status" >&5
+  echo "$as_me:26436: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26442: \$? = $ac_status" >&5
+  echo "$as_me:26441: \$? = $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
@@ -26456,19 +26455,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26459: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26458: 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:26466: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26465: 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:26471: checking for special defines needed for etip.h" >&5
+echo "$as_me:26470: 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"
@@ -26486,7 +26485,7 @@ do
 	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 26489 "configure"
+#line 26488 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26500,16 +26499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26506: \$? = $ac_status" >&5
+  echo "$as_me:26505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26512: \$? = $ac_status" >&5
+  echo "$as_me:26511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26530,12 +26529,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26533: result: $cf_result" >&5
-echo "${ECHO_T}$cf_result" >&6
+echo "$as_me:26532: result: ${cf_result:-(none)}" >&5
+echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26538: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26537: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26552,7 +26551,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26555 "configure"
+#line 26554 "configure"
 #include "confdefs.h"
 
 class base
@@ -26571,15 +26570,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26577: \$? = $ac_status" >&5
+  echo "$as_me:26576: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26582: \$? = $ac_status" >&5
+  echo "$as_me:26581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26598,7 +26597,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26601: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26600: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26607,7 +26606,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26610: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26609: 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
@@ -26624,7 +26623,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26627 "configure"
+#line 26626 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26643,15 +26642,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26649: \$? = $ac_status" >&5
+  echo "$as_me:26648: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26654: \$? = $ac_status" >&5
+  echo "$as_me:26653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26670,7 +26669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26673: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26672: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26680,7 +26679,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26683: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26682: 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
@@ -26694,7 +26693,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26697 "configure"
+#line 26696 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26738,16 +26737,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26744: \$? = $ac_status" >&5
+  echo "$as_me:26743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26750: \$? = $ac_status" >&5
+  echo "$as_me:26749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26765,7 +26764,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26768: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26767: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26814,13 +26813,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26817: checking for bool" >&5
+echo "$as_me:26816: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26823 "configure"
+#line 26822 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26855,16 +26854,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26861: \$? = $ac_status" >&5
+  echo "$as_me:26860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26867: \$? = $ac_status" >&5
+  echo "$as_me:26866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26874,10 +26873,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26877: result: $ac_cv_type_bool" >&5
+echo "$as_me:26876: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26880: checking size of bool" >&5
+echo "$as_me:26879: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26886,7 +26885,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26889 "configure"
+#line 26888 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26918,21 +26917,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26924: \$? = $ac_status" >&5
+  echo "$as_me:26923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26930: \$? = $ac_status" >&5
+  echo "$as_me:26929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26935 "configure"
+#line 26934 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26964,16 +26963,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26970: \$? = $ac_status" >&5
+  echo "$as_me:26969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26976: \$? = $ac_status" >&5
+  echo "$as_me:26975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26989,7 +26988,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26992 "configure"
+#line 26991 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27021,16 +27020,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27027: \$? = $ac_status" >&5
+  echo "$as_me:27026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27033: \$? = $ac_status" >&5
+  echo "$as_me:27032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27046,7 +27045,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27049 "configure"
+#line 27048 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27078,16 +27077,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27084: \$? = $ac_status" >&5
+  echo "$as_me:27083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27090: \$? = $ac_status" >&5
+  echo "$as_me:27089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27100,12 +27099,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27103: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27102: 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 27108 "configure"
+#line 27107 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27141,15 +27140,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27147: \$? = $ac_status" >&5
+  echo "$as_me:27146: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27152: \$? = $ac_status" >&5
+  echo "$as_me:27151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27165,13 +27164,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27168: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27167: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27174: checking for type of bool" >&5
+echo "$as_me:27173: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27190,7 +27189,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27193 "configure"
+#line 27192 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27231,15 +27230,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27237: \$? = $ac_status" >&5
+  echo "$as_me:27236: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27242: \$? = $ac_status" >&5
+  echo "$as_me:27241: \$? = $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
@@ -27256,26 +27255,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27259: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27258: 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:27266: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27265: 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:27272: checking for fallback type of bool" >&5
+			echo "$as_me:27271: 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:27278: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27277: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27304,7 +27303,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27307: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27306: 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
@@ -27321,7 +27320,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27324: checking for $ac_word" >&5
+echo "$as_me:27323: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27338,7 +27337,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27341: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27340: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27350,10 +27349,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27353: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27352: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27356: result: no" >&5
+  echo "$as_me:27355: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27363,7 +27362,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27366: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27365: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27374,7 +27373,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27377: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27376: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27403,7 +27402,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27406: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27405: 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
@@ -27422,10 +27421,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27425: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27424: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27428: result: missing" >&5
+					echo "$as_me:27427: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27438,7 +27437,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27441: checking for gnat version" >&5
+echo "$as_me:27440: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27449,7 +27448,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27452: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27451: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27458,7 +27457,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27461: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27460: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27466,7 +27465,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27469: checking for $ac_word" >&5
+echo "$as_me:27468: 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
@@ -27481,7 +27480,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27484: found $ac_dir/$ac_word" >&5
+echo "$as_me:27483: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27490,20 +27489,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27493: result: $M4_exists" >&5
+  echo "$as_me:27492: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27496: result: no" >&5
+  echo "$as_me:27495: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27502: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27501: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27506: checking if GNAT works" >&5
+			echo "$as_me:27505: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27531,7 +27530,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27534: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27533: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27543,7 +27542,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27546: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27545: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27560,10 +27559,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27563: result: $ADAFLAGS" >&5
+	echo "$as_me:27562: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27566: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27565: 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
@@ -27573,11 +27572,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27576: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27575: 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:27580: checking if GNAT supports generics" >&5
+echo "$as_me:27579: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27587,7 +27586,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27590: result: $cf_gnat_generics" >&5
+echo "$as_me:27589: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27599,7 +27598,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27602: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27601: 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
@@ -27647,7 +27646,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27650: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27649: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27660,7 +27659,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27663: checking if GNAT supports project files" >&5
+echo "$as_me:27662: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27723,15 +27722,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27726: result: $cf_gnat_projects" >&5
+echo "$as_me:27725: 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:27732: checking if GNAT supports libraries" >&5
+	echo "$as_me:27731: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27734: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27733: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27751,7 +27750,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27754: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27753: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27763,8 +27762,8 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27766: checking for ada-compiler" >&5
-echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+echo "$as_me:27765: checking for Ada95 compiler" >&5
+echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
 if test "${with_ada_compiler+set}" = set; then
@@ -27774,13 +27773,13 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27777: result: $cf_ada_compiler" >&5
+echo "$as_me:27776: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27782: checking for ada-include" >&5
-echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+echo "$as_me:27781: checking for Ada95 include directory" >&5
+echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
 if test "${with_ada_include+set}" = set; then
@@ -27815,7 +27814,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27818: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27817: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27824,11 +27823,11 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27827: result: $ADA_INCLUDE" >&5
+echo "$as_me:27826: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27830: checking for ada-objects" >&5
-echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+echo "$as_me:27829: checking for Ada95 object directory" >&5
+echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
 if test "${with_ada_objects+set}" = set; then
@@ -27863,7 +27862,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27866: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27865: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27872,11 +27871,11 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27875: result: $ADA_OBJECTS" >&5
+echo "$as_me:27874: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27878: 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
+echo "$as_me:27877: checking whether to build an Ada95 shared library" >&5
+echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
 if test "${with_ada_sharedlib+set}" = set; then
@@ -27885,19 +27884,25 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:27888: result: $with_ada_sharedlib" >&5
-echo "${ECHO_T}$with_ada_sharedlib" >&6
+cf_ada_sharedlib_warn=no
 
 if test "x$with_ada_sharedlib" != xno
 then
 	if test "x$cf_gnat_projects" != xyes
 	then
-		{ echo "$as_me:27895: 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
+		cf_ada_sharedlib_warn=yes
 	fi
 fi
 
+echo "$as_me:27898: result: $with_ada_sharedlib" >&5
+echo "${ECHO_T}$with_ada_sharedlib" >&6
+if test "x$cf_ada_sharedlib_warn" != xno
+then
+	{ echo "$as_me:27902: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+fi
+
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 MAKE_ADA_SHAREDLIB="#"
 
@@ -27912,8 +27917,8 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27915: checking for ada-libname" >&5
-echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+echo "$as_me:27920: checking for Ada95 curses library name" >&5
+echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 if test "${with_ada_libname+set}" = set; then
@@ -27928,7 +27933,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27931: result: $ADA_LIBNAME" >&5
+echo "$as_me:27936: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27939,13 +27944,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27942: checking for wchar_t" >&5
+	echo "$as_me:27947: 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 27948 "configure"
+#line 27953 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27960,16 +27965,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27966: \$? = $ac_status" >&5
+  echo "$as_me:27971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27972: \$? = $ac_status" >&5
+  echo "$as_me:27977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27979,10 +27984,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27982: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27987: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27985: checking size of wchar_t" >&5
+echo "$as_me:27990: 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
@@ -27991,7 +27996,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27994 "configure"
+#line 27999 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28003,21 +28008,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28009: \$? = $ac_status" >&5
+  echo "$as_me:28014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28015: \$? = $ac_status" >&5
+  echo "$as_me:28020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28020 "configure"
+#line 28025 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28029,16 +28034,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28035: \$? = $ac_status" >&5
+  echo "$as_me:28040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28041: \$? = $ac_status" >&5
+  echo "$as_me:28046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28054,7 +28059,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28057 "configure"
+#line 28062 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28066,16 +28071,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28072: \$? = $ac_status" >&5
+  echo "$as_me:28077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28078: \$? = $ac_status" >&5
+  echo "$as_me:28083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28091,7 +28096,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28094 "configure"
+#line 28099 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28103,16 +28108,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28109: \$? = $ac_status" >&5
+  echo "$as_me:28114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28115: \$? = $ac_status" >&5
+  echo "$as_me:28120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28125,12 +28130,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28128: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28133: 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 28133 "configure"
+#line 28138 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28146,15 +28151,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28152: \$? = $ac_status" >&5
+  echo "$as_me:28157: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28157: \$? = $ac_status" >&5
+  echo "$as_me:28162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28170,7 +28175,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28173: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28178: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28183,7 +28188,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28186: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28191: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28201,7 +28206,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28204: checking for library subsets" >&5
+echo "$as_me:28209: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28255,7 +28260,7 @@ fi
 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:28258: result: $LIB_SUBSETS" >&5
+echo "$as_me:28263: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28286,7 +28291,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28289: checking default library suffix" >&5
+echo "$as_me:28294: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28297,10 +28302,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28300: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28305: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28303: checking default library-dependency suffix" >&5
+echo "$as_me:28308: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28383,10 +28388,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28386: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28391: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28389: checking default object directory" >&5
+echo "$as_me:28394: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28402,11 +28407,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28405: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28410: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28409: checking c++ library-dependency suffix" >&5
+echo "$as_me:28414: 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++)
@@ -28499,7 +28504,7 @@ else
 	fi
 
 fi
-echo "$as_me:28502: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28507: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28675,19 +28680,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28678: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28683: 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 <<EOF
-#line 28683 "configure"
+#line 28688 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28687: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28690: \$? = $ac_status" >&5
+  echo "$as_me:28695: \$? = $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
@@ -28698,10 +28703,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28701 "configure"
+#line 28706 "configure"
 #include "confdefs.h"
 
-#line 28704 "configure"
+#line 28709 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28716,16 +28721,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28722: \$? = $ac_status" >&5
+  echo "$as_me:28727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28728: \$? = $ac_status" >&5
+  echo "$as_me:28733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28748,7 +28753,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28751: result: $cf_ldflags_static" >&5
+	echo "$as_me:28756: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28764,7 +28769,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28767: checking where we will install curses.h" >&5
+echo "$as_me:28772: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28774,7 +28779,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28777: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28782: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28782,7 +28787,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28785: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28790: 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
@@ -28807,7 +28812,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28810: checking for desired basename for form library" >&5
+echo "$as_me:28815: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28827,10 +28832,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28830: result: $FORM_NAME" >&5
+echo "$as_me:28835: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28833: checking for desired basename for menu library" >&5
+echo "$as_me:28838: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28850,10 +28855,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28853: result: $MENU_NAME" >&5
+echo "$as_me:28858: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28856: checking for desired basename for panel library" >&5
+echo "$as_me:28861: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28873,10 +28878,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28876: result: $PANEL_NAME" >&5
+echo "$as_me:28881: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28879: checking for desired basename for cxx library" >&5
+echo "$as_me:28884: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28896,13 +28901,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28899: result: $CXX_NAME" >&5
+echo "$as_me:28904: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28905: checking for src modules" >&5
+echo "$as_me:28910: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28961,7 +28966,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28964: result: $cf_cv_src_modules" >&5
+echo "$as_me:28969: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29122,7 +29127,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29125: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29130: 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//'`
@@ -29133,8 +29138,8 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29136: 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
+echo "$as_me:29141: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
 do
@@ -29149,7 +29154,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29152: result: $PKG_CFLAGS" >&5
+echo "$as_me:29157: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29210,7 +29215,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29213: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29218: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29237,7 +29242,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29240: checking for linker search path" >&5
+echo "$as_me:29245: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29285,7 +29290,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29288: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29293: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29326,7 +29331,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29329: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29334: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29412,7 +29417,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29415: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29420: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29593,7 +29598,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29596: error: ambiguous option: $1
+    { { echo "$as_me:29601: 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;}
@@ -29612,7 +29617,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29615: error: unrecognized option: $1
+  -*) { { echo "$as_me:29620: 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;}
@@ -29742,7 +29747,7 @@ do
   "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:29745: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29750: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30259,7 +30264,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30262: creating $ac_file" >&5
+    { echo "$as_me:30267: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30277,7 +30282,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30280: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30285: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30290,7 +30295,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30293: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30298: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30306,7 +30311,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30309: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30314: 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;}
@@ -30315,7 +30320,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30318: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30323: 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;}
@@ -30360,7 +30365,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30363: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30368: 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;}
@@ -30371,7 +30376,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30374: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30379: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30420,7 +30425,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30423: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30428: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30431,7 +30436,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30434: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30439: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30444,7 +30449,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30447: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30452: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30502,7 +30507,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30505: $ac_file is unchanged" >&5
+      { echo "$as_me:30510: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30889,7 +30894,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30892: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30897: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 354e4a516..d2a80ac91 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.769 2023/10/21 15:43:56 tom Exp $
+dnl $Id: configure.in,v 1.770 2023/10/28 15:41:34 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.769 $)
+AC_REVISION($Revision: 1.770 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -217,7 +217,7 @@ AC_SYS_LONG_FILE_NAMES
 # of package conflict.
 cf_config_suffix=
 AC_ARG_WITH(config-suffix,
-	[  --with-config-suffix=X  suffixes ncursesXX-config file],
+	[  --with-config-suffix=X  name ncurses*X-config file with X],
 	[case "x$withval" in
 	(xyes|xno)
 		AC_MSG_WARN(expected a value for config-suffix option)
@@ -233,9 +233,9 @@ CF_WITH_PKG_CONFIG_LIBDIR
 CF_ENABLE_PC_FILES
 if test -z "$MAKE_PC_FILES"
 then
-	AC_MSG_CHECKING(for suffix to add to pc-files)
+	AC_MSG_CHECKING(for suffix to add to pkg-config files)
 AC_ARG_WITH(pc-suffix,
-	[  --with-pc-suffix        suffixes pc-files],
+	[  --with-pc-suffix=XXX    suffix pkg-config files with XXX],
 	[case "x$withval" in
 	(xyes|xno)
 		PC_MODULE_SUFFIX=
@@ -280,16 +280,16 @@ CF_AR_FLAGS
 dnl Special option for use by system-builders: the install-prefix is used to
 dnl adjust the location into which the actual install is done, so that an
 dnl archive can be built without modifying the host system's configuration.
-AC_MSG_CHECKING(if you have specified an install-prefix)
+AC_MSG_CHECKING(for an installation directory prefix)
 AC_ARG_WITH(install-prefix,
-	[  --with-install-prefix   prefixes actual install-location ($DESTDIR)],
+	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
 	[case "x$withval" in
 	(xyes|xno)
 		;;
 	(*)	DESTDIR="$withval"
 		;;
 	esac])
-AC_MSG_RESULT($DESTDIR)
+AC_MSG_RESULT([${DESTDIR:-(none)}])
 AC_SUBST(DESTDIR)
 
 ###############################################################################
@@ -449,7 +449,7 @@ case "$DFT_LWR_MODEL" in
 (shared)  LD_MODEL=''   ;;
 esac
 AC_SUBST(LD_MODEL)dnl		the type of link (e.g., -g or -pg)
-AC_MSG_RESULT($LD_MODEL)
+AC_MSG_RESULT([${LD_MODEL:-(none)}])
 
 case "$DFT_LWR_MODEL" in
 (shared)
@@ -562,10 +562,10 @@ AC_SUBST(EXTRA_PKG_LDFLAGS)
 CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-AC_MSG_CHECKING(if you wish to append extra suffix to header/library paths)
+AC_MSG_CHECKING(for extra suffix to append to header/library paths)
 EXTRA_SUFFIX=
 AC_ARG_WITH(extra-suffix,
-	[  --with-extra-suffix=X   append extra suffix to header/library paths],
+	[  --with-extra-suffix=X   append extra suffix X to header/library paths],
 	[case x$withval in
 	(xno)
 		;;
@@ -577,7 +577,7 @@ AC_ARG_WITH(extra-suffix,
 		;;
 	esac
 	])
-AC_MSG_RESULT($EXTRA_SUFFIX)
+AC_MSG_RESULT([${EXTRA_SUFFIX:-(none)}])
 AC_SUBST(EXTRA_SUFFIX)
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
@@ -625,12 +625,12 @@ else
 fi
 AC_SUBST(NCURSES_USE_DATABASE)
 
-AC_MSG_CHECKING(for list of fallback descriptions)
+AC_MSG_CHECKING(for list of fallback terminal descriptions)
 AC_ARG_WITH(fallbacks,
 	[  --with-fallbacks=XXX    specify list of fallback terminal descriptions],
 	[with_fallback=$withval],
 	[with_fallback=])
-AC_MSG_RESULT($with_fallback)
+AC_MSG_RESULT([${with_fallback:-(none)}])
 
 case ".$with_fallback" in
 (.|.no)
@@ -947,7 +947,7 @@ NCURSES_OK_WINT_T=
 
 AC_MSG_CHECKING(if you want wide-character code)
 AC_ARG_ENABLE(widec,
-	[  --disable-widec         do not compile with wide-char/UTF-8 code],
+	[  --disable-widec         compile without wide character and UTF-8 support],
 	[with_widec=$enableval],
 	[with_widec=$cf_dft_widec])
 AC_MSG_RESULT($with_widec)
@@ -959,8 +959,8 @@ if test "x$with_widec" = xyes ; then
 	if test "x$disable_lib_suffixes" = xno ; then
 		LIB_SUFFIX="w${LIB_SUFFIX}"
 	fi
-	AC_DEFINE(USE_WIDEC_SUPPORT,1,[Define to 1 to compile with wide-char/UTF-8 code])
-	AC_DEFINE(NCURSES_WIDECHAR,1,[Define to 1 to compile with wide-char/UTF-8 code])
+	AC_DEFINE(USE_WIDEC_SUPPORT,1,[Define to 1 to compile with wide character and UTF-8 support])
+	AC_DEFINE(NCURSES_WIDECHAR,1,[Define to 1 to compile with wide character and UTF-8 support])
 	case "$CPPFLAGS" in
 	(*_XOPEN_SOURCE=*)
 		;;
@@ -1063,7 +1063,7 @@ CF_WITH_X11_RGB
 ###   use option --with-bool to override bool's type
 AC_MSG_CHECKING(for type of bool)
 AC_ARG_WITH(bool,
-	[  --with-bool=TYPE        override fallback type of bool variable],
+	[  --with-bool=TYPE        fall back to TYPE for curses 'bool' typedef],
 	[NCURSES_BOOL="$withval"],
 	[NCURSES_BOOL=auto])
 AC_MSG_RESULT($NCURSES_BOOL)
@@ -1122,9 +1122,9 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-AC_MSG_CHECKING(if you want to use signed Boolean array in term.h)
+AC_MSG_CHECKING(whether to use signed chars for Boolean array in term.h)
 AC_ARG_ENABLE(signed-char,
-	[  --enable-signed-char    compile using signed Boolean's in term.h],
+	[  --enable-signed-char    use signed chars for Boolean array in term.h],
 	[with_signed_char=$enableval],
 	[with_signed_char=$cf_dft_signed_char])
 AC_MSG_RESULT($with_signed_char)
@@ -1411,9 +1411,9 @@ AC_SUBST(cf_cv_enable_opaque)
 
 AC_SUBST(NCURSES_SIZE_T)
 
-AC_MSG_CHECKING(if you want opaque curses-library structures)
+AC_MSG_CHECKING(whether curses library structures should be opaque)
 CF_ARG_ENABLE(opaque-curses,
-	[  --disable-opaque-curses do not make curses WINDOW, etc., "opaque"],
+	[  --disable-opaque-curses do not make WINDOW, etc., structures opaque],
 	[enable_opaque_curses=yes],[
 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
@@ -1424,21 +1424,21 @@ test "$cf_cv_enable_reentrant" = 1 && \
 test "$enable_opaque_curses" = no && \
 AC_MSG_ERROR(reentrant configuration requires opaque library)
 
-AC_MSG_CHECKING(if you want opaque form-library structures)
+AC_MSG_CHECKING(whether form library structures should be opaque)
 AC_ARG_ENABLE(opaque-form,
-	[  --disable-opaque-form   do not make form-library structures "opaque"],
+	[  --disable-opaque-form   do not make form library structures opaque],
 	[enable_opaque_form=yes],[enable_opaque_form=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_form)
 
-AC_MSG_CHECKING(if you want opaque menu-library structures)
+AC_MSG_CHECKING(whether menu library structures should be opaque)
 AC_ARG_ENABLE(opaque-menu,
-	[  --disable-opaque-menu   do not make menu-library structures "opaque"],
+	[  --disable-opaque-menu   do not make menu library structures opaque],
 	[enable_opaque_menu=yes],[enable_opaque_menu=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_menu)
 
-AC_MSG_CHECKING(if you want opaque panel-library structures)
+AC_MSG_CHECKING(whether panel library structures should be opaque)
 AC_ARG_ENABLE(opaque-panel,
-	[  --disable-opaque-panel  do not make panel-library structures "opaque"],
+	[  --disable-opaque-panel  do not make panel library structures opaque],
 	[enable_opaque_panel=yes],[enable_opaque_panel=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_panel)
 
@@ -2352,6 +2352,7 @@ AC_SUBST(SHLIB_LIST)
 AC_DEFINE(HAVE_SLK_COLOR,1,[Define to 1 if we have slk_color for test-programs])
 
 # pkgsrc uses these
+CF_HELP_MESSAGE(Library basenames for pkgsrc:)
 CF_WITH_LIB_BASENAME(FORM_NAME,form)
 CF_WITH_LIB_BASENAME(MENU_NAME,menu)
 CF_WITH_LIB_BASENAME(PANEL_NAME,panel)
@@ -2433,7 +2434,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-AC_MSG_CHECKING(for defines to add to ncurses${USE_CFG_SUFFIX}-config script)
+AC_MSG_CHECKING(for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script)
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
 do
diff --git a/dist.mk b/dist.mk
index 2061815f4..b80fe3c1c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1573 2023/10/21 10:14:10 tom Exp $
+# $Id: dist.mk,v 1.1574 2023/10/28 09:18:03 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231021
+NCURSES_PATCH = 20231028
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 318e57445..4247cafa3 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.36 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_opaque.3x,v 1.38 2023/10/28 14:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -76,7 +76,12 @@ <H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <EM>ncurses</EM>  provides functions returning properties of a <EM>WINDOW</EM> structure,
        allowing  it  to  be  "opaque"   if   the   application   defines   the
-       <STRONG>NCURSES_OPAQUE</STRONG> preprocessor symbol.
+       <STRONG>NCURSES_OPAQUE</STRONG>  preprocessor  symbol.  <EM>Opacity</EM> in this sense means that
+       the members of <EM>struct</EM> data  types  are  not  directly  accessible  (for
+       instance,  through  "." or "-&gt;" operators), but instead must be queried
+       and/or set  via  library  functions.   Advantages  of  opacity  include
+       greater  abstraction  and improved management of concurrent accesses to
+       data structures, keeping object states coherent.
 
        <STRONG>is_cleared</STRONG>
               returns the value set by <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG>.
@@ -102,14 +107,14 @@ <H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>is_notimeout</STRONG>
               returns the value set by <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.
 
-       <STRONG>is_pad</STRONG> returns  <STRONG>TRUE</STRONG>  if  the  window  is a pad; that is, it created by
+       <STRONG>is_pad</STRONG> returns <STRONG>TRUE</STRONG> if the window is a pad;  that  is,  it  created  by
               <STRONG><A HREF="newpad.3x.html">newpad(3x)</A></STRONG>.
 
        <STRONG>is_scrollok</STRONG>
               returns the value set by <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
        <STRONG>is_subwin</STRONG>
-              returns <STRONG>TRUE</STRONG> if the window is  a  subwindow,  that  is,  it  was
+              returns  <STRONG>TRUE</STRONG>  if  the  window  is  a subwindow, that is, it was
               created by <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG> or <STRONG><A HREF="derwin.3x.html">derwin(3x)</A></STRONG>.
 
        <STRONG>is_syncok</STRONG>
@@ -119,12 +124,12 @@ <H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
               returns the delay timeout set by <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
 
        <STRONG>wgetparent</STRONG>
-              returns  the  parent  <EM>WINDOW</EM> pointer for subwindows, or <STRONG>NULL</STRONG> for
+              returns the parent <EM>WINDOW</EM> pointer for subwindows,  or  <STRONG>NULL</STRONG>  for
               windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
-              stores the the top and bottom rows for the scrolling margin  set
-              by  <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG> in the corresponding arguments, returning <STRONG>ERR</STRONG>
+              stores  the the top and bottom rows for the scrolling margin set
+              by <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG> in the corresponding arguments, returning  <STRONG>ERR</STRONG>
               upon failure and <STRONG>OK</STRONG> upon successful completion.
 
 
@@ -133,24 +138,24 @@ <H1 class="no-header">curs_opaque 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <EM>ncurses</EM> provides both a C function and a preprocessor  macro  for  each
+       <EM>ncurses</EM>  provides  both  a C function and a preprocessor macro for each
        function documented in this page.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
+       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
        <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
        <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-10-28                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 70fb2f83e..f7667988d 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231021).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231028).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 8d6428871..610b5d8e0 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231021).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231028).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/include/Caps-ncurses b/include/Caps-ncurses
index 826843a73..f9a5da069 100644
--- a/include/Caps-ncurses
+++ b/include/Caps-ncurses
@@ -28,7 +28,7 @@
 #
 # Author: Thomas E. Dickey
 #
-# $Id: Caps-ncurses,v 1.14 2023/01/15 01:02:07 tom Exp $
+# $Id: Caps-ncurses,v 1.15 2023/10/28 21:55:47 tom Exp $
 #
 #############################################################################
 #
@@ -410,6 +410,8 @@ userdef	PS	str	-	is sent before pasted text
 userdef	RV	str	-	report terminal secondary device attributes
 userdef	XR	str	-	report terminal version as a free-format string.
 userdef	XF	bool	-	terminal supports xterm focus in/out
+userdef	fd	str	-	disable xterm focus-events
+userdef	fe	str	-	enable xterm focus-events
 userdef	rv	str	-	response to RV, regular expression
 userdef	xr	str	-	response to XR, regular expression
 #
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index a4fb1572e..e2cc290db 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.36 2023/10/07 21:19:07 tom Exp $
-.TH curs_opaque 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.38 2023/10/28 14:49:04 tom Exp $
+.TH curs_opaque 3X 2023-10-28 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -82,6 +82,14 @@ obtain \fIcurses\fR window properties
 \fI\%WINDOW\fP structure,
 allowing it to be \*(``opaque\*('' if
 the application defines the \fB\%NCURSES_OPAQUE\fP preprocessor symbol.
+\fIOpacity\fP in this sense means that the members of \fIstruct\fP data
+types are not directly accessible
+(for instance,
+through \*(``.\*('' or \*(``\->\*('' operators),
+but instead must be queried and/or set via library functions.
+Advantages of opacity include greater abstraction and improved
+management of concurrent accesses to data structures,
+keeping object states coherent.
 .TP
 \fBis_cleared\fP
 returns the value set by \fB\%clearok\fP(3X).
diff --git a/misc/magic b/misc/magic
index 67a3caa2c..ee1a1c4d4 100644
--- a/misc/magic
+++ b/misc/magic
@@ -1,6 +1,6 @@
-# $Id: magic,v 1.4 2023/09/23 23:37:26 Branden.Robinson Exp $
+# $Id: magic,v 1.5 2023/09/23 23:37:26 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2023 Thomas E. Dickey                                       #
 # Copyright 2015,2018 Free Software Foundation, Inc.                         #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 1021a5cce..fa5c67e41 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1065 $
-#	$Date: 2023/10/21 22:49:03 $
+#	$Revision: 1.1067 $
+#	$Date: 2023/10/28 21:45: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
@@ -4437,9 +4437,9 @@ mintty+common|shared capabilities for mintty,
 	Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m,
 	opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep,
 	use=ecma+strikeout, use=ecma+index, use=vt420+lrmm,
-	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
-	use=ecma+italics, use=xterm-basic, use=bracketed+paste,
-	use=report+version,
+	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
+	use=xterm+tmux, use=ecma+italics, use=xterm-basic,
+	use=bracketed+paste, use=report+version,
 # 2019-06-09: These capabilities are commented-out for compatibility with
 # existing releases 5.9-6.1, and may be considered for inclusion after the
 # release of ncurses 6.2:
@@ -4793,9 +4793,9 @@ ms-terminal|Windows10 terminal,
 vscode|xterm.js|Visual Studio Code terminal using xterm.js,
 	npc,
 	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs,
-	use=xterm+256setaf, use=ecma+index, use=xterm+sm+1006,
-	use=xterm+pcfkeys, use=ecma+italics, use=xterm-basic,
-	use=bracketed+paste,
+	use=xterm+256setaf, use=ecma+index, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm+pcfkeys, use=ecma+italics,
+	use=xterm-basic, use=bracketed+paste,
 vscode-direct|Visual Studio Code with direct-colors,
 	use=xterm+indirect, use=vscode,
 
@@ -5016,8 +5016,8 @@ xterm+nofkeys|building block for xterm fkey-variants,
 	npc,
 	kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
 	use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm,
-	use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
-	use=xterm+keypad, use=xterm-basic,
+	use=xterm+focus, use=xterm+sm+1006, use=xterm+tmux,
+	use=ecma+italics, use=xterm+keypad, use=xterm-basic,
 
 xterm-p370|xterm patch #370,
 	npc,
@@ -5686,8 +5686,8 @@ xterm-vt220|xterm emulating VT220,
 	kmous=\E[M, knp=\E[6~, kpp=\E[5~, nel=\EE, use=xterm+app,
 	use=xterm+edit, use=vt220+keypad, use=ecma+italics,
 	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
-	use=xterm+sm+1006, use=xterm+tmux, use=xterm+keypad,
-	use=xterm-basic,
+	use=xterm+focus, use=xterm+sm+1006, use=xterm+tmux,
+	use=xterm+keypad, use=xterm-basic,
 
 xterm-vt52|xterm emulating DEC VT52,
 	cols#80, it#8, lines#24,
@@ -5927,9 +5927,12 @@ xterm+sm+1003|xterm any-event mouse,
 xterm-1003|example of xterm any-event mouse,
 	use=xterm+sm+1003, use=xterm,
 
+# Some terminal emulators implement xterm focus in/out, but do it incorrectly,
+# interfering with user applications.
+# https://lists.gnu.org/archive/html/bug-ncurses/2023-10/msg00087.html
 xterm+focus|xterm focus-in/out event "keys",
 	XF,
-	kxIN=\E[I, kxOUT=\E[O,
+	fd=\E[?1004l, fe=\E[?1004h, kxIN=\E[I, kxOUT=\E[O,
 
 # xterm patch #116 (1999/9/25) added Stephen P Wall's changes to support DEC
 # locator mode.
@@ -5962,7 +5965,7 @@ xterm-1005|xterm UTF-8 mouse,
 # protocol regarding button-releases), I provided the 1006 mode, referring
 # to it as "SGR 1006" since the replies resemble the SGR control string:
 xterm+sm+1006|xterm SGR-mouse (building block),
-	kmous=\E[<, XM=\E[?1006;1004;1000%?%p1%{1}%=%th%el%;,
+	kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;,
 	xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;,
 xterm-1006|xterm SGR-mouse,
 	use=xterm+sm+1006, use=xterm,
@@ -6370,9 +6373,10 @@ hterm|Chromium hterm,
 	U8#1,
 	kcbt=\E[Z, kent=\EOM, nel=\EE, use=linux+kbs,
 	use=xterm+osc104, use=ecma+index, use=ansi+rep,
-	use=ecma+strikeout, use=vt420+lrmm, use=xterm+sm+1006,
-	use=xterm+tmux, use=ecma+italics, use=xterm+pcfkeys,
-	use=xterm-basic, use=bracketed+paste,
+	use=ecma+strikeout, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
+	use=xterm+pcfkeys, use=xterm-basic,
+	use=bracketed+paste,
 hterm-256color|Chromium hterm with xterm 256-colors,
 	use=xterm+256color2, use=hterm,
 
@@ -6503,9 +6507,9 @@ konsole-base|KDE console window (common),
 	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=ecma+index, use=xterm+sm+1006, use=ecma+strikeout,
-	use=ecma+italics, use=ecma+color, use=xterm-r6,
-	use=vt220+cvis, use=bracketed+paste,
+	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
+	use=ecma+strikeout, use=ecma+italics, use=ecma+color,
+	use=xterm-r6, use=vt220+cvis, use=bracketed+paste,
 	use=report+version,
 
 # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
@@ -7749,9 +7753,10 @@ terminology-1.8.1|EFL-based terminal emulator (1.8.1),
 	km@,
 	cvvis@, flash@, initc@, kcbt=\E[Z, rmm@, smm@, Ms@,
 	use=linux+kbs, use=ecma+index, use=xterm+256setaf,
-	use=ansi+rep, use=ecma+strikeout, use=xterm+sm+1006,
-	use=xterm+pcfkeys, use=xterm+tmux, use=vt220+cvis,
-	use=ecma+italics, use=xterm-basic, use=report+version,
+	use=ansi+rep, use=ecma+strikeout, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
+	use=vt220+cvis, use=ecma+italics, use=xterm-basic,
+	use=report+version,
 
 terminology|EFL-based terminal emulator,
 	use=terminology-1.8.1,
@@ -7820,11 +7825,11 @@ alacritty-direct|alacritty with direct color indexing,
 alacritty+common|base fragment for alacritty,
 	km@, npc,
 	kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
-	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+sm+1006,
-	use=xterm-basic, use=xterm+app, use=ansi+rep,
-	use=xterm+tmux, use=ecma+strikeout, use=xterm+sl-twm,
-	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
-	use=xterm+pcf2, use=bracketed+paste, use=xterm+focus,
+	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm-basic, use=xterm+app,
+	use=ansi+rep, use=xterm+tmux, use=ecma+strikeout,
+	use=xterm+sl-twm, use=ecma+italics, use=xterm+pce2,
+	use=xterm+pcc2, use=xterm+pcf2, use=bracketed+paste,
 
 #### Kitty
 # https://github.com/kovidgoyal/kitty
@@ -7976,8 +7981,8 @@ kitty+common|KovId's TTY common properties,
 	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, Smulx=\E[4:%p1%dm, use=ansi+enq,
-	use=ansi+rep, use=xterm+sm+1006, use=ecma+index,
-	use=xterm+pcfkeys, use=xterm+sl-twm,
+	use=ansi+rep, use=xterm+focus, use=xterm+sm+1006,
+	use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm,
 	use=ecma+strikeout, use=ecma+italics,
 	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
 	use=bracketed+paste, use=report+version,
@@ -8097,8 +8102,9 @@ domterm|DomTerm web client,
 	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=linux+kbs, use=xterm+256setaf,
-	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
-	use=xterm-basic, use=bracketed+paste,
+	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
+	use=xterm+pcfkeys, use=xterm-basic,
+	use=bracketed+paste,
 
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
@@ -8550,7 +8556,7 @@ tmux|tmux terminal multiplexer,
 	use=ecma+italics, use=ecma+strikeout, use=xterm+edit,
 	use=xterm+pcfkeys, use=xterm+sl, use=xterm+tmux,
 	use=screen, use=bracketed+paste, use=report+version,
-	use=xterm+focus,
+	use=xterm+focus, use=xterm+sm+1006,
 
 tmux-256color|tmux with 256 colors,
 	use=xterm+256setaf, use=tmux,
@@ -8599,7 +8605,7 @@ mosh|mobile shell,
 	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
 	sgr0=\E(B\E[m, use=ansi+enq, use=xterm+meta,
 	use=ecma+italics, use=ecma+index, use=xterm+acs,
-	use=xterm+sm+1006, use=xterm+pcfkeys,
+	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
 	use=xterm-xfree86, use=bracketed+paste,
 
 mosh-256color|mosh using 256-colors,
@@ -25602,6 +25608,11 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # PS is sent before the pasted text
 # PE is sent after the pasted text
 #
+# vim also uses these names for xterm focus:
+#
+# fe enables focus events
+# fd disables focus events
+#
 # Here are the other xterm-related extensions which are used in this file:
 #
 # Cr is a string capability which resets the cursor color
@@ -27865,4 +27876,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD
 #	+ add ansi+apparrows -TD
 #
+# 2023-10-28
+#	+ move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as
+#	  fe/fd capabilities, like vim (vim-pr #13440).
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index c38931d10..8816e58c2 100644
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2023 Thomas E. Dickey                                *
  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.36 2023/09/30 10:42:42 Ian.Abbott Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.37 2023/09/30 10:42:42 tom Exp $")
 
 #if USE_SAFE_SPRINTF
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 418648a54..150f79c03 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231021) unstable; urgency=low
+ncurses6 (6.4+20231028) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 418648a54..150f79c03 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231021) unstable; urgency=low
+ncurses6 (6.4+20231028) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 56487d96f..574d7da92 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231021) unstable; urgency=low
+ncurses6 (6.4+20231028) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Oct 2023 06:14:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 68957d7e9..e775dd848 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.613 2023/10/21 10:14:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.614 2023/10/28 09:18:03 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1021"
+!define VERSION_MMDD  "1028"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 2786e9e14..7ca63175c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231021
+Release: 20231028
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4058fa7f8..03709863a 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231021
+Release: 20231028
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index fa1041d1e..c97e5bb36 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231021
+Release: 20231028
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 3df14cd55..d14591fef 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.216 2023/09/06 22:55:27 tom Exp $
+dnl $Id: aclocal.m4,v 1.218 2023/10/28 16:08:26 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -3312,7 +3312,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
+dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 dnl
@@ -3321,7 +3321,7 @@ AC_DEFUN([CF_PKG_CONFIG],
 [
 AC_MSG_CHECKING(if you want to use pkg-config)
 AC_ARG_WITH(pkg-config,
-	[  --with-pkg-config{=path} enable/disable use of pkg-config],
+	[[  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
 	[cf_pkg_config=$withval],
 	[cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
@@ -4298,7 +4298,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
+dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01
 dnl ---------------
 dnl Handle configure option "--with-x11-rgb", setting these shell
 dnl variables:
@@ -4338,7 +4338,7 @@ dnl 	/usr/X11/lib/X11/rgb.txt
 AC_DEFUN([CF_WITH_X11_RGB],[
 AC_MSG_CHECKING(for X11 rgb file)
 AC_ARG_WITH(x11-rgb,
-	[  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
+	[  --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)],
 	[RGB_PATH=$withval],
 	[RGB_PATH=auto])
 
diff --git a/test/configure b/test/configure
index 8540ac478..36daaa413 100755
--- a/test/configure
+++ b/test/configure
@@ -708,7 +708,7 @@ General Options:
   --with-strip-program=XX specify program to use when stripping in install
   --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics
   --enable-string-hacks   work around bogus compiler/loader warnings
-  --with-pkg-config{=path} enable/disable use of pkg-config
+  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
   --disable-echo          do not display "compiling" commands
 Curses Version-dependent Options:
   --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables
@@ -725,7 +725,7 @@ Curses Version-dependent Options:
   --with-neXtaw           link with neXT Athena library
   --with-XawPlus          link with Athena-Plus library
   --with-x                use the X Window System
-  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
+  --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)
   --with-form-libname=XXX override form basename of library
   --with-menu-libname=XXX override menu basename of library
   --with-panel-libname=XXX override panel basename of library

From 991ce4fa6b56407d47db81f6dddd7516e7bcd584 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 5 Nov 2023 01:24:54 +0100
Subject: [PATCH 038/106] ncurses-6.4-20231104.patch

---
 INSTALL                          |  10 +-
 NEWS                             |   9 +-
 VERSION                          |   2 +-
 dist.mk                          |   4 +-
 include/curses.events            |   2 +-
 ncurses/tinfo/lib_setup.c        |   6 +-
 ncurses/tinfo/lib_tparm.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 +-
 progs/reset_cmd.c                | 284 +++++++++++++++++--------------
 progs/tabs.c                     |  12 +-
 progs/tic.c                      |   6 +-
 17 files changed, 207 insertions(+), 154 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9dabaa89e..281107825 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.251 2023/10/28 16:54:24 tom Exp $
+-- $Id: INSTALL,v 1.253 2023/11/03 20:55:47 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -47,7 +47,7 @@ If you are converting from BSD curses and do not have root access, be sure
 to read the BSD CONVERSION NOTES section below.
 
 If you are trying to build applications using gpm with ncurses,
-read the USING NCURSES WITH GPM section below.
+read the USING GPM section below.
 
 If you are cross-compiling, see the note below on
 BUILDING WITH A CROSS-COMPILER.
@@ -80,7 +80,7 @@ INSTALLATION PROCEDURE:
     The --prefix option to configure changes the root directory for installing
     ncurses.  The default is normally in subdirectories of /usr/local, except
     for systems where ncurses is normally installed as a system library (see
-    "IF YOU ARE A SYSTEM INTEGRATOR").  Use --prefix=/usr to replace your
+    "FOR SYSTEM INTEGRATORS").  Use --prefix=/usr to replace your
     default curses distribution.
 
     The package gets installed beneath the --prefix directory as follows:
@@ -177,7 +177,7 @@ INSTALLATION PROCEDURE:
     You can make curses and terminfo fall back to an existing file of termcap
     definitions by configuring with --enable-termcap.  If you do this, the
     library will search /etc/termcap before the terminfo database, and will
-    also interpret the contents of the TERM environment variable.  See the
+    also interpret the contents of the $TERM environment variable.  See the
     section BSD CONVERSION NOTES below.
 
 3.  Type 'make'.  Ignore any warnings; no error messages should be produced.
@@ -1275,7 +1275,7 @@ CONFIGURE OPTIONS:
 	Specify a search-list of terminfo directories which will be compiled
 	into the ncurses library (default: DATADIR/terminfo)
 
-	This is a colon-separated list, like the TERMINFO_DIRS environment
+	This is a colon-separated list, like the $TERMINFO_DIRS environment
 	variable.
 
     --with-termlib[=XXX]
diff --git a/NEWS b/NEWS
index 4c04caf16..f953ea860 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4022 2023/10/28 18:20:39 tom Exp $
+-- $Id: NEWS,v 1.4025 2023/11/04 21:45:02 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231104
+	+ modify reset command to avoid altering clocal if the terminal uses a
+	  modem (prompted by discussion with Werner Fink, Michal Suchanek,
+	  OpenSUSE #1201384, Debian #60377).
+	+ build-fixes for --with-caps variations.
+	+ correct a couple of section-references in INSTALL.
+
 20231028
 	+ move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as
 	  fe/fd capabilities, like vim (vim-pr #13440).
diff --git a/VERSION b/VERSION
index c2f4c9b4f..786852eae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231028
+5:0:10	6.4	20231104
diff --git a/dist.mk b/dist.mk
index b80fe3c1c..5a7c559c7 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1574 2023/10/28 09:18:03 tom Exp $
+# $Id: dist.mk,v 1.1575 2023/11/04 10:01:01 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231028
+NCURSES_PATCH = 20231104
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/curses.events b/include/curses.events
index 25a2583fc..468bde18e 100644
--- a/include/curses.events
+++ b/include/curses.events
@@ -50,6 +50,6 @@ typedef struct
 extern NCURSES_EXPORT(int) wgetch_events (WINDOW *, _nc_eventlist *) GCC_DEPRECATED(experimental option); /* experimental */
 extern NCURSES_EXPORT(int) wgetnstr_events (WINDOW *,char *,int,_nc_eventlist *) GCC_DEPRECATED(experimental option); /* experimental */
 
-#define KEY_EVENT	0633		/* We were interrupted by an event */
+#define KEY_EVENT	0634		/* We were interrupted by an event */
 
 #endif /* NCURSES_WGETCH_EVENTS */
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 71db2a8d4..f2d2bb363 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.229 2023/10/16 23:05:28 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.230 2023/11/04 21:02:27 tom Exp $")
 
 /****************************************************************************
  *
@@ -293,7 +293,7 @@ _nc_default_screensize(TERMINAL *termp, int *linep, int *colp)
     }
 }
 
-#ifdef USE_CHECK_SIZE
+#if defined(USE_CHECK_SIZE) && defined(user6) && defined(user7)
 static const char *
 skip_csi(const char *value)
 {
@@ -408,7 +408,7 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
     _nc_default_screensize(termp, linep, colp);
 }
 #else /* !USE_CHECK_SIZE */
-#define _nc_check_screensize(termp, linep, colp) /* nothing */
+#define _nc_check_screensize(termp, linep, colp)	/* nothing */
 #endif
 #endif /* !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)) */
 
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 1353eb3f2..5666b27b7 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.152 2023/09/16 16:30:27 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.153 2023/11/04 19:28:41 tom Exp $")
 
 /*
  *	char *
@@ -1120,8 +1120,10 @@ check_string_caps(TPARM_DATA *data, const char *string)
 	    want_type = 2;	/* function key #1, transmit string #2 */
 	else if (CHECK_CAP(plab_norm))
 	    want_type = 2;	/* label #1, show string #2 */
+#ifdef pkey_plab
 	else if (CHECK_CAP(pkey_plab))
 	    want_type = 6;	/* function key #1, type string #2, show string #3 */
+#endif
 #if NCURSES_XNAMES
 	else {
 	    char *check;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 150f79c03..104374a50 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231028) unstable; urgency=low
+ncurses6 (6.4+20231104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 150f79c03..104374a50 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231028) unstable; urgency=low
+ncurses6 (6.4+20231104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 574d7da92..be5d0827b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231028) unstable; urgency=low
+ncurses6 (6.4+20231104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Oct 2023 05:18:03 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e775dd848..623826e85 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.614 2023/10/28 09:18:03 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.615 2023/11/03 07:58:06 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1028"
+!define VERSION_MMDD  "1104"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7ca63175c..f546b373d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231028
+Release: 20231104
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 03709863a..bf1267656 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231028
+Release: 20231104
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c97e5bb36..0a3db841e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231028
+Release: 20231104
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c
index 50bfd2cd0..d706c4573 100644
--- a/progs/reset_cmd.c
+++ b/progs/reset_cmd.c
@@ -53,7 +53,7 @@
 #include <sys/ptem.h>
 #endif
 
-MODULE_ID("$Id: reset_cmd.c,v 1.29 2023/01/07 21:50:34 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.35 2023/11/05 00:02:37 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -75,6 +75,9 @@ MODULE_ID("$Id: reset_cmd.c,v 1.29 2023/01/07 21:50:34 tom Exp $")
 # endif
 #endif
 
+#define set_flags(target, mask)    target |= mask
+#define clear_flags(target, mask)  target &= ~((unsigned)(mask))
+
 static FILE *my_file;
 
 static bool use_reset = FALSE;	/* invoked as reset */
@@ -188,6 +191,79 @@ out_char(int c)
 #define reset_char(item, value) \
     tty_settings->c_cc[item] = CHK(tty_settings->c_cc[item], value)
 
+/*
+ * Simplify ifdefs
+ */
+#ifndef BSDLY
+#define BSDLY 0
+#endif
+#ifndef CRDLY
+#define CRDLY 0
+#endif
+#ifndef ECHOCTL
+#define ECHOCTL 0
+#endif
+#ifndef ECHOKE
+#define ECHOKE 0
+#endif
+#ifndef ECHOPRT
+#define ECHOPRT 0
+#endif
+#ifndef FFDLY
+#define FFDLY 0
+#endif
+#ifndef IMAXBEL
+#define IMAXBEL 0
+#endif
+#ifndef IUCLC
+#define IUCLC 0
+#endif
+#ifndef IXANY
+#define IXANY 0
+#endif
+#ifndef NLDLY
+#define NLDLY 0
+#endif
+#ifndef OCRNL
+#define OCRNL 0
+#endif
+#ifndef OFDEL
+#define OFDEL 0
+#endif
+#ifndef OFILL
+#define OFILL 0
+#endif
+#ifndef OLCUC
+#define OLCUC 0
+#endif
+#ifndef ONLCR
+#define ONLCR 0
+#endif
+#ifndef ONLRET
+#define ONLRET 0
+#endif
+#ifndef ONOCR
+#define ONOCR 0
+#endif
+#ifndef OXTABS
+#define OXTABS 0
+#endif
+#ifndef TAB3
+#define TAB3 0
+#endif
+#ifndef TABDLY
+#define TABDLY 0
+#endif
+#ifndef TOSTOP
+#define TOSTOP 0
+#endif
+#ifndef VTDLY
+#define VTDLY 0
+#endif
+#ifndef XCASE
+#define XCASE 0
+#endif
+
 /*
  * Reset the terminal mode bits to a sensible state.  Very useful after
  * a child program dies in raw mode.
@@ -195,6 +271,11 @@ out_char(int c)
 void
 reset_tty_settings(int fd, TTY * tty_settings, int noset)
 {
+    unsigned mask;
+#ifdef TIOCMGET
+    int modem_bits;
+#endif
+
     GET_TTY(fd, tty_settings);
 
 #ifdef TERMIOS
@@ -231,106 +312,65 @@ reset_tty_settings(int fd, TTY * tty_settings, int noset)
     reset_char(VWERASE, CWERASE);
 #endif
 
-    tty_settings->c_iflag &= ~((unsigned) (IGNBRK
-					   | PARMRK
-					   | INPCK
-					   | ISTRIP
-					   | INLCR
-					   | IGNCR
-#ifdef IUCLC
-					   | IUCLC
-#endif
-#ifdef IXANY
-					   | IXANY
-#endif
-					   | IXOFF));
-
-    tty_settings->c_iflag |= (BRKINT
-			      | IGNPAR
-			      | ICRNL
-			      | IXON
-#ifdef IMAXBEL
-			      | IMAXBEL
-#endif
-	);
-
-    tty_settings->c_oflag &= ~((unsigned) (0
-#ifdef OLCUC
-					   | OLCUC
-#endif
-#ifdef OCRNL
-					   | OCRNL
-#endif
-#ifdef ONOCR
-					   | ONOCR
-#endif
-#ifdef ONLRET
-					   | ONLRET
-#endif
-#ifdef OFILL
-					   | OFILL
-#endif
-#ifdef OFDEL
-					   | OFDEL
-#endif
-#ifdef NLDLY
-					   | NLDLY
-#endif
-#ifdef CRDLY
-					   | CRDLY
-#endif
-#ifdef TABDLY
-					   | TABDLY
-#endif
-#ifdef BSDLY
-					   | BSDLY
-#endif
-#ifdef VTDLY
-					   | VTDLY
-#endif
-#ifdef FFDLY
-					   | FFDLY
-#endif
-			       ));
-
-    tty_settings->c_oflag |= (OPOST
-#ifdef ONLCR
-			      | ONLCR
-#endif
-	);
-
-    tty_settings->c_cflag &= ~((unsigned) (CSIZE
-					   | CSTOPB
-					   | PARENB
-					   | PARODD
-					   | CLOCAL));
-    tty_settings->c_cflag |= (CS8 | CREAD);
-    tty_settings->c_lflag &= ~((unsigned) (ECHONL
-					   | NOFLSH
-#ifdef TOSTOP
-					   | TOSTOP
-#endif
-#ifdef ECHOPTR
-					   | ECHOPRT
-#endif
-#ifdef XCASE
-					   | XCASE
-#endif
-			       ));
-
-    tty_settings->c_lflag |= (ISIG
-			      | ICANON
-			      | ECHO
-			      | ECHOE
-			      | ECHOK
-#ifdef ECHOCTL
-			      | ECHOCTL
-#endif
-#ifdef ECHOKE
-			      | ECHOKE
-#endif
-	);
-#endif
+    clear_flags(tty_settings->c_iflag, (IGNBRK
+					| PARMRK
+					| INPCK
+					| ISTRIP
+					| INLCR
+					| IGNCR
+					| IUCLC
+					| IXANY
+					| IXOFF));
+
+    set_flags(tty_settings->c_iflag, (BRKINT
+				      | IGNPAR
+				      | ICRNL
+				      | IXON
+				      | IMAXBEL));
+
+    clear_flags(tty_settings->c_oflag, (0
+					| OLCUC
+					| OCRNL
+					| ONOCR
+					| ONLRET
+					| OFILL
+					| OFDEL
+					| NLDLY
+					| CRDLY
+					| TABDLY
+					| BSDLY
+					| VTDLY
+					| FFDLY));
+
+    set_flags(tty_settings->c_oflag, (OPOST
+				      | ONLCR));
+
+    mask = (CSIZE | CSTOPB | PARENB | PARODD);
+#ifdef TIOCMGET
+    /* leave clocal alone if this appears to use a modem */
+    if (ioctl(fd, TIOCMGET, &modem_bits) == -1)
+	mask |= CLOCAL;
+#else
+    /* cannot check - use the behavior from tset */
+    mask |= CLOCAL;
+#endif
+    clear_flags(tty_settings->c_cflag, mask);
+
+    set_flags(tty_settings->c_cflag, (CS8 | CREAD));
+    clear_flags(tty_settings->c_lflag, (ECHONL
+					| NOFLSH
+					| TOSTOP
+					| ECHOPRT
+					| XCASE));
+
+    set_flags(tty_settings->c_lflag, (ISIG
+				      | ICANON
+				      | ECHO
+				      | ECHOE
+				      | ECHOK
+				      | ECHOCTL
+				      | ECHOKE));
+#endif /* TERMIOS */
 
     if (!noset) {
 	SET_TTY(fd, tty_settings);
@@ -405,29 +445,23 @@ set_conversions(TTY * tty_settings)
 #if defined(EXP_WIN32_DRIVER)
     /* FIXME */
 #else
-#ifdef ONLCR
-    tty_settings->c_oflag |= ONLCR;
-#endif
-    tty_settings->c_iflag |= ICRNL;
-    tty_settings->c_lflag |= ECHO;
-#ifdef OXTABS
-    tty_settings->c_oflag |= OXTABS;
-#endif /* OXTABS */
+    set_flags(tty_settings->c_oflag, ONLCR);
+    set_flags(tty_settings->c_iflag, ICRNL);
+    set_flags(tty_settings->c_lflag, ECHO);
+    set_flags(tty_settings->c_oflag, OXTABS);
 
     /* test used to be tgetflag("NL") */
     if (VALID_STRING(newline) && newline[0] == '\n' && !newline[1]) {
 	/* Newline, not linefeed. */
-#ifdef ONLCR
-	tty_settings->c_oflag &= ~((unsigned) ONLCR);
-#endif
-	tty_settings->c_iflag &= ~((unsigned) ICRNL);
+	clear_flags(tty_settings->c_oflag, ONLCR);
+	clear_flags(tty_settings->c_iflag, ICRNL);
     }
-#ifdef OXTABS
+#if OXTABS
     /* test used to be tgetflag("pt") */
     if (VALID_STRING(set_tab) && VALID_STRING(clear_all_tabs))
-	tty_settings->c_oflag &= ~OXTABS;
+	clear_flags(tty_settings->c_oflag, OXTABS);
 #endif /* OXTABS */
-    tty_settings->c_lflag |= (ECHOE | ECHOK);
+    set_flags(tty_settings->c_lflag, (ECHOE | ECHOK));
 #endif
 }
 
@@ -493,7 +527,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
     bool need_flush = FALSE;
 
     (void) old_settings;
-#ifdef TAB3
+#if TAB3
     if (old_settings != 0 &&
 	old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) {
 	old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET);
@@ -515,22 +549,22 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 
 	if (VALID_STRING(clear_margins)) {
 	    need_flush |= sent_string(clear_margins);
-	} else
+	}
 #if defined(set_lr_margin)
-	if (VALID_STRING(set_lr_margin)) {
+	else if (VALID_STRING(set_lr_margin)) {
 	    need_flush |= sent_string(TIPARM_2(set_lr_margin, 0, columns - 1));
-	} else
+	}
 #endif
 #if defined(set_left_margin_parm) && defined(set_right_margin_parm)
-	    if (VALID_STRING(set_left_margin_parm)
-		&& VALID_STRING(set_right_margin_parm)) {
+	else if (VALID_STRING(set_left_margin_parm)
+		 && VALID_STRING(set_right_margin_parm)) {
 	    need_flush |= sent_string(TIPARM_1(set_left_margin_parm, 0));
 	    need_flush |= sent_string(TIPARM_1(set_right_margin_parm,
 					       columns - 1));
-	} else
+	}
 #endif
-	    if (VALID_STRING(set_left_margin)
-		&& VALID_STRING(set_right_margin)) {
+	else if (VALID_STRING(set_left_margin)
+		 && VALID_STRING(set_right_margin)) {
 	    need_flush |= to_left_margin();
 	    need_flush |= sent_string(set_left_margin);
 	    if (VALID_STRING(parm_right_cursor)) {
diff --git a/progs/tabs.c b/progs/tabs.c
index c852eb858..a630b044e 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -39,7 +39,7 @@
 #include <progs.priv.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tabs.c,v 1.52 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.53 2023/11/04 20:46:09 tom Exp $")
 
 static GCC_NORETURN void usage(void);
 
@@ -370,7 +370,9 @@ do_set_margin(int margin, bool no_op)
 	    }
 	    tputs(set_left_margin, 1, putch);
 	}
-    } else if (VALID_STRING(set_left_margin_parm)) {
+    }
+#if defined(set_left_margin_parm) && defined(set_right_margin_parm)
+    else if (VALID_STRING(set_left_margin_parm)) {
 	result = TRUE;
 	if (!no_op) {
 	    if (VALID_STRING(set_right_margin_parm)) {
@@ -379,12 +381,16 @@ do_set_margin(int margin, bool no_op)
 		tputs(TIPARM_2(set_left_margin_parm, margin, max_cols), 1, putch);
 	    }
 	}
-    } else if (VALID_STRING(set_lr_margin)) {
+    }
+#endif
+#if defined(set_lr_margin)
+    else if (VALID_STRING(set_lr_margin)) {
 	result = TRUE;
 	if (!no_op) {
 	    tputs(TIPARM_2(set_lr_margin, margin, max_cols), 1, putch);
 	}
     }
+#endif
     return result;
 }
 
diff --git a/progs/tic.c b/progs/tic.c
index 474e93d8e..ae65e6317 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.323 2023/09/30 21:17:23 Branden.Robinson Exp $")
+MODULE_ID("$Id: tic.c,v 1.324 2023/11/04 19:43:43 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -3149,6 +3149,7 @@ guess_ANSI_VTxx(TERMTYPE2 *tp)
  * In particular, any ECMA-48 terminal should support these, though the details
  * for u9 are implementation dependent.
  */
+#if defined(user6) && defined(user7) && defined(user8) && defined(user9)
 static void
 check_user_6789(TERMTYPE2 *tp)
 {
@@ -3184,6 +3185,9 @@ check_user_6789(TERMTYPE2 *tp)
 	break;
     }
 }
+#else
+#define check_user_6789(tp)	/* nothing */
+#endif
 
 /* other sanity-checks (things that we don't want in the normal
  * logic that reads a terminfo entry)

From e91c52698607e42aa17eda12b95eba3685d73677 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 12 Nov 2023 00:53:16 +0100
Subject: [PATCH 039/106] ncurses-6.4-20231111.patch

---
 MANIFEST                             |   1 +
 NEWS                                 |  11 +-
 VERSION                              |   2 +-
 dist.mk                              |   4 +-
 doc/html/man/curs_border_set.3x.html |  10 +-
 doc/html/man/curs_color.3x.html      |  10 +-
 doc/html/man/curs_get_wch.3x.html    |  10 +-
 doc/html/man/curs_get_wstr.3x.html   |  10 +-
 doc/html/man/curs_getcchar.3x.html   |  10 +-
 doc/html/man/curs_in_wchstr.3x.html  |  12 +-
 doc/html/man/curs_initscr.3x.html    |  16 +-
 doc/html/man/curs_ins_wstr.3x.html   |  10 +-
 doc/html/man/curs_insstr.3x.html     |  10 +-
 doc/html/man/curs_memleaks.3x.html   |  10 +-
 doc/html/man/curs_outopts.3x.html    |  10 +-
 doc/html/man/curs_pad.3x.html        |  10 +-
 doc/html/man/curs_scr_dump.3x.html   |  10 +-
 doc/html/man/curs_terminfo.3x.html   |  10 +-
 doc/html/man/ncurses.3x.html         |   2 +-
 doc/html/man/term.7.html             |  10 +-
 doc/html/man/terminfo.5.html         |   2 +-
 man/curs_border_set.3x               |   6 +-
 man/curs_color.3x                    |   6 +-
 man/curs_get_wch.3x                  |   6 +-
 man/curs_get_wstr.3x                 |   8 +-
 man/curs_getcchar.3x                 |   6 +-
 man/curs_in_wchstr.3x                |  10 +-
 man/curs_initscr.3x                  |  14 +-
 man/curs_ins_wstr.3x                 |   8 +-
 man/curs_insstr.3x                   |   8 +-
 man/curs_memleaks.3x                 |   8 +-
 man/curs_outopts.3x                  |   6 +-
 man/curs_pad.3x                      |   8 +-
 man/curs_scr_dump.3x                 |   8 +-
 man/curs_terminfo.3x                 |   6 +-
 man/term.7                           |   8 +-
 misc/terminfo.src                    | 639 +++++++++++----------------
 ncurses/base/lib_endwin.c            |  28 +-
 ncurses/curses.priv.h                |   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 +-
 package/ncursest.spec                |   2 +-
 progs/infocmp.c                      |  65 +--
 test/demo_forms.c                    |   4 +-
 test/dump_window.c                   |   6 +-
 test/dup_field.c                     |   6 +-
 test/list_keys.c                     |   7 +-
 test/modules                         |   5 +-
 test/move_field.c                    |   6 +-
 test/ncurses.c                       |  12 +-
 test/programs                        |   3 +-
 test/test.priv.h                     |   8 +-
 test/test_endwin.c                   | 132 ++++++
 test/test_tparm.c                    |  14 +-
 58 files changed, 668 insertions(+), 590 deletions(-)
 create mode 100644 test/test_endwin.c

diff --git a/MANIFEST b/MANIFEST
index 83b01132e..a9395d2f8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1218,6 +1218,7 @@
 ./test/test_addwstr.c
 ./test/test_arrays.c
 ./test/test_delwin.c
+./test/test_endwin.c
 ./test/test_get_wstr.c
 ./test/test_getstr.c
 ./test/test_instr.c
diff --git a/NEWS b/NEWS
index f953ea860..012df958d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4025 2023/11/04 21:45:02 tom Exp $
+-- $Id: NEWS,v 1.4031 2023/11/11 23:13:58 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231111
+	+ used "infocmp -u" to help trim redundant capabilities -TD
+	+ add limit checks in infocmp needed when processing extended
+	  capabilities with the "-u" option.
+	+ fix inconsistent sort-order in see-also sections of manpages.
+	+ fix a few compiler warnings for Solaris 10.
+	+ modify endwin() to return an error if it is called again without an
+	  intervening screen update (report by Rajeev Pillai, NetBSD #57592).
+
 20231104
 	+ modify reset command to avoid altering clocal if the terminal uses a
 	  modem (prompted by discussion with Werner Fink, Michal Suchanek,
diff --git a/VERSION b/VERSION
index 786852eae..5809d11d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231104
+5:0:10	6.4	20231111
diff --git a/dist.mk b/dist.mk
index 5a7c559c7..af5ebc7a5 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1575 2023/11/04 10:01:01 tom Exp $
+# $Id: dist.mk,v 1.1576 2023/11/11 10:45:00 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231104
+NCURSES_PATCH = 20231111
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index c85cbb109..b61ed4159 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_border_set.3x,v 1.29 2023/11/11 11:38:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -157,11 +157,11 @@ <H1 class="no-header">curs_border_set 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 1eaf1e8c5..0d9566d82 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.87 2023/10/21 10:28:36 tom Exp @
+  * @Id: curs_color.3x,v 1.89 2023/11/11 11:38:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -520,12 +520,12 @@ <H1 class="no-header">curs_color 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 590cf488a..ea28e6353 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.28 2023/11/11 11:39:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -148,12 +148,12 @@ <H1 class="no-header">curs_get_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>,
        <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 0281cbb26..92dd50da7 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.39 2023/11/11 11:39:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -183,11 +183,11 @@ <H1 class="no-header">curs_get_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 605ac14ef..0d165a65f 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.40 2023/11/11 11:39:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -192,11 +192,11 @@ <H1 class="no-header">curs_getcchar 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>wcwidth(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>, <STRONG>wcwidth(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 3b37a8701..0a4804fa1 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.28 2023/11/11 11:42:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -99,12 +99,12 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
-       <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index fc51ad909..0d7d55882 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.53 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_initscr.3x,v 1.54 2023/11/11 23:20:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -157,7 +157,13 @@ <H1 class="no-header">curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        X/Open defines no error conditions.  In this implementation
 
-       <STRONG>o</STRONG>   <STRONG>endwin</STRONG> returns an error if the terminal was not initialized.
+       <STRONG>o</STRONG>   <STRONG>endwin</STRONG> returns an error if
+
+           <STRONG>o</STRONG>   the terminal was not initialized, or
+
+           <STRONG>o</STRONG>   <STRONG>endwin</STRONG> is called more than once without updating the screen, or
+
+           <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> returns an error.
 
        <STRONG>o</STRONG>   <STRONG>newterm</STRONG> returns an error if it cannot allocate the data  structures
            for  the  screen,  or  for the top-level windows within the screen,
@@ -294,7 +300,7 @@ <H1 class="no-header">curs_initscr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 488625902..c38a7c3f7 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.23 2023/10/07 22:22:46 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.25 2023/11/11 11:43:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -104,11 +104,11 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index a8ea74802..bd93c58c3 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_insstr.3x,v 1.42 2023/11/11 11:46:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -106,11 +106,11 @@ <H1 class="no-header">curs_insstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index e3415935a..95c15b8f6 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.29 2023/10/21 10:28:36 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.31 2023/11/11 11:46:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -128,11 +128,11 @@ <H1 class="no-header">curs_memleaks 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index ace13cc86..f4ab7c985 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.48 2023/10/07 22:54:10 tom Exp @
+  * @Id: curs_outopts.3x,v 1.50 2023/11/11 11:46:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -201,11 +201,11 @@ <H1 class="no-header">curs_outopts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index aa5dd7c05..de86709dc 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.45 2023/10/21 10:29:45 tom Exp @
+  * @Id: curs_pad.3x,v 1.47 2023/11/11 11:47:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -228,11 +228,11 @@ <H1 class="no-header">curs_pad 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 39cc97350..926d977d7 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.33 2023/11/11 11:47:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -122,11 +122,11 @@ <H1 class="no-header">curs_scr_dump 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>, <STRONG>system(3)</STRONG>
+       <STRONG>system(3)</STRONG>, <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 87e3e2930..a6a489af6 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.115 2023/10/21 10:31:22 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.117 2023/11/11 11:48:04 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +44,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -694,12 +694,12 @@ <H1 class="no-header">curs_terminfo 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index f7667988d..f0124e57d 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231028).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231111).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index aa9ae4db9..459fb4222 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.40 2023/10/14 19:18:14 tom Exp @
+  * @Id: term.7,v 1.42 2023/11/11 11:48:16 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-10-14 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-11-11 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-10-14 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-11-11 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -213,11 +213,11 @@ <H1 class="no-header">term 7 2023-10-14 ncurses 6.4 Miscellaneous</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-11-11                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 610b5d8e0..859a54554 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231028).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231111).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 98f8c39ca..f833acbae 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
-.TH curs_border_set 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.29 2023/11/11 11:38:35 tom Exp $
+.TH curs_border_set 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -194,7 +194,7 @@ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
 \fB\%curs_border\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 39fac3904..8cb561f6e 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.87 2023/10/21 10:28:36 tom Exp $
-.TH curs_color 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.89 2023/11/11 11:38:59 tom Exp $
+.TH curs_color 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -531,7 +531,7 @@ allowing applications to use larger color- and pair-numbers.
 The \fB\%reset_color_pairs\fP function is an extension of ncurses.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_initscr\fP(3X),
 \fB\%curs_attr\fP(3X),
+\fB\%curs_initscr\fP(3X),
 \fB\%curs_variables\fP(3X),
 \fB\%default_colors\fP(3X)
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 7f73ff2ce..63036343c 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
-.TH curs_get_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.28 2023/11/11 11:39:15 tom Exp $
+.TH curs_get_wch 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -191,7 +191,7 @@ or if the window pointer is null.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
-\fB\%curs_ins_wch\fP(3X),
 \fB\%curs_inopts\fP(3X),
+\fB\%curs_ins_wch\fP(3X),
 \fB\%curs_move\fP(3X),
 \fB\%curs_refresh\fP(3X)
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 5364de8b8..697dfd1c6 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
-.TH curs_get_wstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.39 2023/11/11 11:39:29 tom Exp $
+.TH curs_get_wstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -218,5 +218,5 @@ NetBSD 7 curses imitates ncurses 6.1 in this regard,
 treating a \fB\-1\fP as an indefinite number of characters.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_get_wch\fP(3X),
-\fB\%curs_getstr\fP(3X)
+\fB\%curs_getstr\fP(3X),
+\fB\%curs_get_wch\fP(3X)
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 8840a9334..3ec21e4b8 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
-.TH curs_getcchar 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.40 2023/11/11 11:39:43 tom Exp $
+.TH curs_getcchar 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -182,7 +182,7 @@ including using them for ligatures between characters
 Unicode does not limit the (analogous) number of combining characters,
 so some applications may be affected.
 .SH SEE ALSO
+\fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
 \fB\%curs_color\fP(3X),
-\fB\%curses\fP(3X),
 \fB\%wcwidth\fP(3)
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index c2380120d..91f22c142 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
-.TH curs_in_wchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.28 2023/11/11 11:42:45 tom Exp $
+.TH curs_in_wchstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,7 +115,7 @@ This implementation checks for null pointers,
 returning \fBERR\fP in that case.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_in_wch\fP(3X),
+\fB\%curs_inchstr\fP(3X),
 \fB\%curs_instr\fP(3X),
-\fB\%curs_inwstr\fP(3X)
-\fB\%curs_inchstr\fP(3X)
+\fB\%curs_inwstr\fP(3X),
+\fB\%curs_in_wch\fP(3X)
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 3bf80125c..aab21a664 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.53 2023/10/07 21:19:07 tom Exp $
-.TH curs_initscr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.54 2023/11/11 23:20:20 tom Exp $
+.TH curs_initscr 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -155,7 +155,15 @@ Routines that return pointers always return \fBNULL\fP on error.
 X/Open defines no error conditions.
 In this implementation
 .bP
-\fBendwin\fP returns an error if the terminal was not initialized.
+\fBendwin\fP returns an error if
+.RS
+.bP
+the terminal was not initialized, or
+.bP
+\fBendwin\fP is called more than once without updating the screen, or
+.bP
+\fBreset_shell_mode\fP(3X) returns an error.
+.RE
 .bP
 \fBnewterm\fP
 returns an error if it cannot allocate the data structures for the screen,
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 6b6cf806c..db27fb948 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.23 2023/10/07 22:22:46 tom Exp $
-.TH curs_ins_wstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.25 2023/11/11 11:43:21 tom Exp $
+.TH curs_ins_wstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,5 +104,5 @@ or if the window pointer is null.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_insstr\fP(3X),
-\fB\%curs_in_wch\fP(3X),
-\fB\%curs_ins_wch\fP(3X)
+\fB\%curs_ins_wch\fP(3X),
+\fB\%curs_in_wch\fP(3X)
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 348d78fae..c8fc50bf2 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_insstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.42 2023/11/11 11:46:07 tom Exp $
+.TH curs_insstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,6 +101,6 @@ This is probably an error, since it makes this group of functions inconsistent.
 Also, no implementation of curses documents this inconsistency.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_util\fP(3X),
 \fB\%curs_clear\fP(3X),
-\fB\%curs_inch\fP(3X)
+\fB\%curs_inch\fP(3X),
+\fB\%curs_util\fP(3X)
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 82c37042a..0f52899c7 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.29 2023/10/21 10:28:36 tom Exp $
-.TH curs_memleaks 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.31 2023/11/11 11:46:43 tom Exp $
+.TH curs_memleaks 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -124,6 +124,6 @@ using \fB\%del_curterm\fP.
 In this case, there is a global variable \fB\%cur_term\fP which can be
 used as parameter.
 .SH SEE ALSO
+\fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
-\fB\%curs_terminfo\fP(3X),
-\fB\%curses\fP(3X)
+\fB\%curs_terminfo\fP(3X)
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 3a9141481..85c350b48 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.48 2023/10/07 22:54:10 tom Exp $
-.TH curs_outopts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.50 2023/11/11 11:46:54 tom Exp $
+.TH curs_outopts 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -203,6 +203,6 @@ emulators.
 \fB\%curs_addch\fP(3X),
 \fB\%curs_clear\fP(3X),
 \fB\%curs_initscr\fP(3X),
-\fB\%curs_scroll\fP(3X),
 \fB\%curs_refresh\fP(3X),
+\fB\%curs_scroll\fP(3X),
 \fB\%curs_variables\fP(3X)
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index f00590af4..95d70bba0 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.45 2023/10/21 10:29:45 tom Exp $
-.TH curs_pad 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.47 2023/11/11 11:47:10 tom Exp $
+.TH curs_pad 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -231,6 +231,6 @@ ensures that \fB\%dupwin\fP and \fB\%getwin\fP treat
 pads versus windows consistently.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
 \fB\%curs_refresh\fP(3X),
-\fB\%curs_touch\fP(3X),
-\fB\%curs_addch\fP(3X)
+\fB\%curs_touch\fP(3X)
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 8733e9f71..66603f1a1 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH curs_scr_dump 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.33 2023/11/11 11:47:41 tom Exp $
+.TH curs_scr_dump 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,5 +114,5 @@ considered invalid "if the time-stamp of the tty is old" but do not define
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_util\fP(3X),
-\fB\%scr_dump\fP(5),
-\fB\%system\fP(3)
+\fB\%system\fP(3),
+\fB\%scr_dump\fP(5)
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index c5fcc9629..606e3afc0 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.115 2023/10/21 10:31:22 tom Exp $
-.TH curs_terminfo 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.117 2023/11/11 11:48:04 tom Exp $
+.TH curs_terminfo 3X 2023-11-11 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -781,6 +781,6 @@ In that case, the old location is unknown.
 \fB\%curs_memleaks\fP(3X),
 \fB\%curs_termcap\fP(3X),
 \fB\%curs_variables\fP(3X),
-\fB\%term_variables\fP(3X),
 \fB\%putc\fP(3),
+\fB\%term_variables\fP(3X),
 \fB\%terminfo\fP(\*n)
diff --git a/man/term.7 b/man/term.7
index 963368bb2..110bc6f36 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.40 2023/10/14 19:18:14 tom Exp $
-.TH term 7 2023-10-14 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.42 2023/11/11 11:48:16 tom Exp $
+.TH term 7 2023-11-11 "ncurses 6.4" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -230,5 +230,5 @@ tty line initialization (AT&T-like UNIXes)
 tty line initialization (BSD-like UNIXes)
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n),
-\fB\%term\fP(\*n)
+\fB\%term\fP(\*n),
+\fB\%terminfo\fP(\*n)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index fa5c67e41..7a75d2c16 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1067 $
-#	$Date: 2023/10/28 21:45:20 $
+#	$Revision: 1.1081 $
+#	$Date: 2023/11/11 20:54:00 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -616,11 +616,11 @@ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
 	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, 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,
+	ich=\E[%p1%d@, il=\E[%p1%dL, kcbt=\E[Z, 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, vpa=\E[%i%p1%dd, use=ecma+index,
+	use=pcansi-m,
 
 # ECMA-48 addresses three of the four capabilities here:
 #
@@ -1013,13 +1013,13 @@ linux-basic|Linux console (basic),
 	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~, kmous=\E[M, kspd=^Z, nel=\r\n,
-	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,
+	rc=\E8, 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,
-	smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, use=vt220+pcedit, use=vt102+enq,
-	use=klone+sgr, use=ecma+color, use=linux+sfkeys,
+	smam=\E[?7h, smir=\E[4h, tbc=\E[3g, vpa=\E[%i%p1%dd,
+	use=vt220+pcedit, use=vt102+enq, use=klone+sgr,
+	use=ecma+color, use=linux+sfkeys,
 
 linux+decid|ncurses extension for Linux console DECID,
 	u8=\E[?6c, use=decid+cpr,
@@ -1698,16 +1698,15 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m,
 	tbc=\E[3g,
 iris-ansi-ap|IRIS ANSI in application-keypad mode,
-	is2=\E[?1l\E=\E[?7h, kent=\EOM, kf10=\E[010q,
-	kf11=\E[011q, kf12=\E[012q, kf9=\E[009q, use=iris-ansi,
+	is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi,
 
 # From the man-page, this is a quasi-vt100 emulator that runs on SGI's IRIX
 # (T.Dickey 98/1/24)
 iris-color|xwsh|IRIX ANSI with color,
 	ncv#33,
 	csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dP, dim=\E[2m,
-	ech=\E[%p1%dX, ich=\E[%p1%d@, rc=\E8, rmul=\E[24m, rs1=\Ec,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+	ech=\E[%p1%dX, ich=\E[%p1%d@, rmul=\E[24m, rs1=\Ec,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	use=ecma+italics, use=vt100+enq, use=klone+color,
 	use=iris-ansi-ap,
 
@@ -1953,13 +1952,12 @@ ofcons|DNARD OpenFirmware console,
 # the level of detail in a termcap, it is a passable emulator, since ECH does
 # work.  Don't use it on a VMS system -TD
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
-	bce, msgr,
-	colors#8, cols#80, it#8, lines#25, ncv#2, pairs#64,
+	bce,
+	colors#8, lines#25, ncv#2, pairs#64,
 	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt220,
+	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+	khome=\E[7~, op=\E[m, rs1=\Ec, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm, use=vt220,
 
 wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta,
 	km, use=wsvt25,
@@ -2256,13 +2254,12 @@ teken-2018|teken as of 2018,
 	bw@, mir, xenl, NQ,
 	acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q
 	     \304t\303u\264v\301w\302x\263y\363z\362~\371,
-	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=\r,
+	cvvis@, hpa=\E[%i%p1%dG, hts=\EH, kdch1=\E[3~, kent=\r,
 	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[H, kich1=\E[2~, knp=\E[6~,
-	kpp=\E[5~, rmir=\E[4l, smir=\E[4h, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, use=vt220+cvis, use=cons25,
+	kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+	rmir=\E[4l, smir=\E[4h, tbc=\E[3g, use=vt220+cvis,
+	use=cons25,
 
 teken-2022|teken as of 2022,
 	am, bce, eo, mir, msgr, npc, NQ,
@@ -3738,7 +3735,7 @@ nsterm|nsterm-256color|Apple_Terminal|AppKit Terminal.app,
 #	can display/alter xterm-256color cube
 #	can display/alter xterm-88color cube
 iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
-	am, bce, hs, mir, msgr, npc, xenl, xon,
+	am, bce, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lines#24, wsl#50,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -3801,13 +3798,13 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 # 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, 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,
+	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~, 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%;,
@@ -4095,9 +4092,8 @@ xnuppc-256x96|darwin-256x96|Darwin PowerPC console (color) 256x96,
 ######## DOS/WINDOWS
 # CRT is shareware.  It implements some xterm features, including mouse.
 crt|crt-vt220|CRT 2.3 emulating VT220,
-	bce, msgr,
-	ncv@,
-	hts=\EH, use=vt100+enq, use=vt220-base, use=ecma+color,
+	bce,
+	ncv@, use=vt100+enq, use=vt220-base, use=ecma+color,
 
 # SecureCRT 8.7.3.2279
 # 8.7.3 was released 2020/08/11
@@ -4158,10 +4154,9 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
 #	resize.pl gets no reply, resize.sh needs fix for no reply.
 scrt|securecrt|SecureCRT emulating xterm-256color,
 	bce@, km@, npc,
-	bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=linux+kbs,
-	use=vt220+pcedit, use=xterm+256setaf, use=ecma+index,
-	use=ansi+rep, use=xterm+keypad, use=xterm+pcfkeys,
-	use=xterm-basic,
+	bel@, cvvis@, kcbt=\E[Z, use=linux+kbs, use=vt220+pcedit,
+	use=xterm+256setaf, use=ecma+index, use=ansi+rep,
+	use=xterm+keypad, use=xterm+pcfkeys, use=xterm-basic,
 
 # Absolute Telnet
 # (eval 2021/02/20)
@@ -4967,18 +4962,17 @@ xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System),
 	npc,
 	kDC=\E[3;5~, kEND=\EO5F, kHOM=\EO5H, kIC=\E[2;5~,
 	kLFT=\EO5D, kNXT=\E[6;5~, kPRV=\E[5;5~, kRIT=\EO5C, ka1@,
-	ka3@, kb2=\EOE, kc1@, kc3@, kcbt=\E[Z, kdch1=\E[3~, kend=\EOF,
-	kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, kf26=\EO5Q,
-	kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, 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=\EO6P,
-	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,
+	ka3@, kb2=\EOE, kc1@, kc3@, kcbt=\E[Z, kf13=\EO2P, kf14=\EO2Q,
+	kf15=\EO2R, kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~,
+	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
+	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P,
+	kf26=\EO5Q, kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~,
+	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=\EO6P, 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~,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
 	use=xterm+alt1049, use=xterm-xf86-v333,
@@ -5014,14 +5008,12 @@ xterm-xfree86|xterm terminal emulator (XFree86),
 
 xterm+nofkeys|building block for xterm fkey-variants,
 	npc,
-	kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
-	use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm,
-	use=xterm+focus, use=xterm+sm+1006, use=xterm+tmux,
-	use=ecma+italics, use=xterm+keypad, use=xterm-basic,
+	kcbt=\E[Z, nel=\EE, use=ecma+index, use=ansi+rep,
+	use=ecma+strikeout, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics,
+	use=xterm+keypad, use=xterm-basic,
 
 xterm-p370|xterm patch #370,
-	npc,
-	kcbt=\E[Z, kent=\EOM, nel=\EE,
 	rv=\E\\[41;[1-6][0-9][0-9];0c,
 	xr=\EP>\\|XTerm\\([1-9][0-9]+\\)\E\\\\,
 	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
@@ -5207,17 +5199,16 @@ xterm+pcf2|fragment with modifyFunctionKeys:2,
 # Chunks from xterm #230:
 xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
 	kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~,
-	kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~,
-	kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~,
-	kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F,
-	kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F,
-	kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H,
-	kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~,
-	kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~,
-	kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~,
-	kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~,
-	kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~,
-	use=xterm+edit,
+	kNXT=\E[6;2~, kPRV=\E[5;2~, kDC3=\E[3;3~, kDC4=\E[3;4~,
+	kDC5=\E[3;5~, kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F,
+	kEND4=\E[1;4F, kEND5=\E[1;5F, kEND6=\E[1;6F,
+	kEND7=\E[1;7F, kHOM3=\E[1;3H, kHOM4=\E[1;4H,
+	kHOM5=\E[1;5H, kHOM6=\E[1;6H, kHOM7=\E[1;7H,
+	kIC3=\E[2;3~, kIC4=\E[2;4~, kIC5=\E[2;5~, kIC6=\E[2;6~,
+	kIC7=\E[2;7~, kNXT3=\E[6;3~, kNXT4=\E[6;4~,
+	kNXT5=\E[6;5~, kNXT6=\E[6;6~, kNXT7=\E[6;7~,
+	kPRV3=\E[5;3~, kPRV4=\E[5;4~, kPRV5=\E[5;5~,
+	kPRV6=\E[5;6~, kPRV7=\E[5;7~, use=xterm+edit,
 
 xterm+edit|fragment for 6-key editing-keypad,
 	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
@@ -5677,17 +5668,15 @@ xterm-sco|xterm with SCO function keys,
 #
 xterm-vt220|xterm emulating VT220,
 	npc,
-	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kend=\E[4~, kent=\EOM, kf10=\E[21~, kf11=\E[23~,
+	kcbt=\E[Z, kend=\E[4~, 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~,
 	kf20=\E[34~, 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, use=xterm+app,
-	use=xterm+edit, use=vt220+keypad, use=ecma+italics,
-	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
-	use=xterm+focus, use=xterm+sm+1006, use=xterm+tmux,
-	use=xterm+keypad, use=xterm-basic,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, nel=\EE,
+	use=xterm+app, use=xterm+edit, use=vt220+keypad,
+	use=ecma+italics, use=ecma+index, use=ansi+rep,
+	use=ecma+strikeout, use=xterm+focus, use=xterm+sm+1006,
+	use=xterm+tmux, use=xterm+keypad, use=xterm-basic,
 
 xterm-vt52|xterm emulating DEC VT52,
 	cols#80, it#8, lines#24,
@@ -5987,9 +5976,8 @@ oldxterm+sm+1006|xterm SGR-mouse (building block),
 kterm|kterm kanji terminal emulator (X window system),
 	XT,
 	ncv@,
-	acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~,
-	csr=\E[%i%p1%d;%p2%dr, enacs=, kmous=\E[M, rc=\E8,
-	rmacs=\E(B, rmam=\E[?7l, sc=\E7,
+	acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~, enacs=,
+	rmacs=\E(B, rmam=\E[?7l,
 	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, use=x10term+sl,
@@ -6171,8 +6159,7 @@ gnome-rh62|GNOME terminal,
 #	it hangs in tack after running function-keys test.
 gnome-rh72|GNOME Terminal in RedHat 7,
 	bce, km@,
-	kdch1=\E[3~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	rmam=\E[?7l,
+	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%;,
 	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=vt220+cvis,
@@ -6193,18 +6180,17 @@ gnome-rh72|GNOME Terminal in RedHat 7,
 # that it implements kcbt.
 gnome-rh80|GNOME Terminal in RedHat 8,
 	bce@, msgr@,
-	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kbs=^?,
-	kcbt=\E^I, op=\E[39;49m, use=gnome-rh72,
+	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kcbt=\E^I,
+	op=\E[39;49m, use=gnome-rh72,
 
 # GNOME Terminal 2.2.1 (Redhat 9.0)
 #
 # bce and msgr are repaired.
 gnome-rh90|GNOME Terminal in RedHat 9,
 	bce, msgr, XT,
-	hpa=\E[%i%p1%dG, kDC=\E[3;2~, kLFT=\EO2D, kRIT=\EO2C,
-	kb2=\E[E, kcbt=\E[Z, kend=\EOF, khome=\EOH, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, use=xterm+pcf0, use=xterm+pcfkeys,
-	use=gnome-rh80,
+	hpa=\E[%i%p1%dG, kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E,
+	kcbt=\E[Z, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+pcf0,
+	use=xterm+pcfkeys, use=gnome-rh80,
 
 # GNOME Terminal 2.14.2 (Fedora Core 5)
 # Ed Catmur notes that gnome-terminal has recognized soft-reset since May 2002.
@@ -6273,10 +6259,9 @@ gnome-2012|GNOME Terminal 3.6.0,
 # The parameters with \EO (SS3) are technically an error, since SS3 should have
 # no parameters.  This appears to be rote copying based on xterm+pcc0.
 vte+pcfkeys|VTE's variation on xterm+pcfkeys (building block),
-	kf1=\EOP, kf13=\EO1;2P, kf14=\EO1;2Q, kf15=\EO1;2R,
-	kf16=\EO1;2S, kf2=\EOQ, kf25=\EO1;5P, kf26=\EO1;5Q,
-	kf27=\EO1;5R, kf28=\EO1;5S, kf3=\EOR, kf37=\EO1;6P,
-	kf38=\EO1;6Q, kf39=\EO1;6R, kf4=\EOS, kf40=\EO1;6S,
+	kf13=\EO1;2P, kf14=\EO1;2Q, kf15=\EO1;2R, kf16=\EO1;2S,
+	kf25=\EO1;5P, kf26=\EO1;5Q, kf27=\EO1;5R, kf28=\EO1;5S,
+	kf37=\EO1;6P, kf38=\EO1;6Q, kf39=\EO1;6R, kf40=\EO1;6S,
 	kf49=\EO1;3P, kf50=\EO1;3Q, kf51=\EO1;3R, kf52=\EO1;3S,
 	kf61=\EO1;4P, kf62=\EO1;4Q, kf63=\EO1;4R,
 	use=xterm+pcfkeys,
@@ -6401,7 +6386,7 @@ hterm-256color|Chromium hterm with xterm 256-colors,
 # trimmed to eliminate those.  Also, since it is a slightly older version of
 # VTE, it lacks a few more features (again, trimmed).
 termite|VTE-based terminal,
-	am, ccc, km, mir, msgr, npc, xenl,
+	am, km, mir, msgr, npc, xenl,
 	cols#80, it#8, lines#24, ncv@,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
@@ -6409,7 +6394,7 @@ termite|VTE-based terminal,
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	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, invis=\E[8m,
 	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
@@ -6499,10 +6484,10 @@ konsole-base|KDE console window (common),
 	ncv@,
 	blink=\E[5m, dim=\E[2m, ech=\E[%p1%dX,
 	flash=\E[?5h$<100/>\E[?5l, 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,
+	invis=\E[8m, 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%;,
@@ -6596,11 +6581,11 @@ konsole+pcfkeys|konsole subset of xterm+pcfkeys,
 # it is still useful for deriving the other entries, since the developer
 # provided function-keys based on xterm.
 konsole-vt100|KDE console window with VT100 (sic) keyboard,
-	kbs=^?, kdch1=\E[3~, kend=\E[F, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@,
-	kf18@, kf19@, kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[H, use=konsole-base,
+	kend=\E[F, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
+	kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	use=konsole-base,
 
 # Obsolete: vt420pc.keytab was added in June 2000, dropped from the install in
 # September 2008 and removed in June 2016.  The developer who removed it stated
@@ -6981,7 +6966,6 @@ rxvt-16color|rxvt with 16 colors like aixterm,
 #	(not in rxvt, but not documented by mrxvt) but not CSI 19 t.
 # +	none of the "dynamic colors" (OSC colors) scripts work.
 mrxvt|multitabbed rxvt,
-	XT,
 	kEND=\E[8;2~, kHOM=\E[7;2~, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kend=\E[8~, khome=\E[7~,
 	kEND3=\E[8;3~, kEND4=\E[8;4~, kEND5=\E[8;5~,
@@ -7050,8 +7034,7 @@ aterm|AfterStep terminal,
 # vttest shows several problems with keyboard, cursor-movements.
 # see also https://invisible-island.net/xterm/xterm.faq.html#bug_xiterm
 xiterm|internationalized terminal emulator for X,
-	km@,
-	kbs=^?, kdch1=\E[3~, use=klone+color, use=xterm-r6,
+	km@, use=klone+color, use=xterm-r6,
 
 
 #### HPTERM
@@ -7223,9 +7206,8 @@ mvterm|vv100|SwitchTerm aka mvTERM,
 	el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I,
 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
 	ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu,
-	kf7=\EOv, kf8=\EOl, kf9=\EOw, op=\E[100m, rc=\E8, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	kcuu1=\EOA, op=\E[100m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	rmkx=\E[?1l\E>, rmso=\E[m, 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
@@ -7375,14 +7357,12 @@ st|stterm|aka simpleterm,
 # This entry discards the ccc/initc capabilities from st-0.7 because they
 # belong in st-256color.
 st-0.8|simpleterm 0.8,
-	dim=\E[2m, kcbt@, kent@, oc=\E]104\007,
-	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%;%?%p7%t;8%;m,
-	Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
-	kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
-	kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
-	kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
-	use=ecma+strikeout, use=st-0.6,
+	kcbt@, kent@, oc=\E]104\007, Ms=\E]52;%p1%s;%p2%s\007,
+	kDN3=\E[1;3B, kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
+	kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~,
+	kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C,
+	kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout,
+	use=st-0.6,
 
 # Reviewed 0.7:
 #	dim is intermittent, sometimes works, sometimes does not
@@ -7395,17 +7375,14 @@ st-0.8|simpleterm 0.8,
 #	as booleans rather than strings.
 st-0.7|simpleterm 0.7,
 	ccc,
-	dim=\E[2m,
 	initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
 	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-	kcbt@, kent@, oc=\E]104\007,
-	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%;%?%p7%t;8%;m,
-	Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
-	kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
-	kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
-	kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
-	use=ecma+strikeout, use=st-0.6,
+	kcbt@, kent@, oc=\E]104\007, Ms=\E]52;%p1%s;%p2%s\007,
+	kDN3=\E[1;3B, kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
+	kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~,
+	kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C,
+	kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout,
+	use=st-0.6,
 
 # st-0.4.1
 #
@@ -7436,7 +7413,7 @@ st-0.7|simpleterm 0.7,
 # still has no function keys past kf36 (no combinations of modifiers)
 # no application keypad mode, e.g, kent.
 st-0.6|simpleterm 0.6,
-	am, bce, hs, mir, msgr, npc, xenl, XT,
+	am, bce, mir, msgr, npc, xenl, XT,
 	colors#8, cols#80, it#8, lines#24, pairs#64,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
 	     zz{{||}}~~,
@@ -7446,7 +7423,7 @@ st-0.6|simpleterm 0.6,
 	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,
-	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
+	enacs=\E)0, 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, invis=\E[8m,
 	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
@@ -7472,10 +7449,10 @@ st-0.6|simpleterm 0.6,
 	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~, kil1=\E[2;5~,
-	kind=\E[1;2B, kmous=\E[M, 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, rmir=\E[4l, rmkx=\E[?1l\E>,
+	kf8=\E[19~, kf9=\E[20~, kil1=\E[2;5~, kind=\E[1;2B,
+	kmous=\E[M, 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, 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}
@@ -7638,9 +7615,9 @@ terminator|Terminator no line wrap,
 	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, smacs=\E(0, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, tsl=\E]2;, vpa=\E[%i%p1%dd,
-	use=ansi+enq, use=vt220+pcedit, use=ecma+italics,
-	use=ecma+index, use=xterm+256setaf, use=xterm+sl-twm,
+	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+enq,
+	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
+	use=xterm+256setaf, use=xterm+sl-twm,
 	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
 
 #### TERMINOLOGY
@@ -7696,9 +7673,7 @@ terminator|Terminator no line wrap,
 terminology-0.6.1|EFL-based terminal emulator (0.6.1),
 	mc5i@,
 	blink@, ed@, el@, el1@, invis=\E[8m, kLFT=\E[1;2D,
-	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,
+	kRIT=\E[1;2C, 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>,
 	vpa=\E[%i%p1%dd, kDC3=\E[3;3~, kDC4=\E[3;4~,
@@ -7824,7 +7799,7 @@ alacritty-direct|alacritty with direct color indexing,
 # added xterm+sl-twm in 0.3.3 -TD
 alacritty+common|base fragment for alacritty,
 	km@, npc,
-	kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
+	kb2=\EOE, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
 	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+focus,
 	use=xterm+sm+1006, use=xterm-basic, use=xterm+app,
 	use=ansi+rep, use=xterm+tmux, use=ecma+strikeout,
@@ -7961,21 +7936,9 @@ kitty+common|KovId's TTY common properties,
 	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, kBEG=\E[1;2E, kbeg=\EOE, 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, 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=\E]\E\\\Ec, sc=\E7,
+	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=\E]\E\\\Ec, sc=\E7,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;m,
 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
@@ -8027,7 +7990,7 @@ foot-direct|foot with direct color indexing,
 	use=xterm+direct, use=foot+base,
 
 foot+base|foot base fragment,
-	am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT,
+	am, bce, bw, mir, msgr, npc, xenl, AX, XT,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
@@ -8152,11 +8115,10 @@ eterm|GNU Emacs term.el terminal emulation,
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 	msgr,
 	colors#8, pairs#64,
-	blink=\E[5m, il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
-	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	op=\E[39;49m, rc=\E8, ri=\EM, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec, sc=\E7, setab=\E[%p1%'('%+%dm,
-	setaf=\E[%p1%{30}%+%dm,
+	blink=\E[5m, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, op=\E[39;49m, rc=\E8, ri=\EM,
+	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,
 	sgr0=\E[m, use=vt220+pcedit, use=eterm,
@@ -8255,7 +8217,7 @@ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 # terminfo entries (which list about 60% of the control sequences).
 screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
-	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
+	cols#80, it#8, lines#24, ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
@@ -8325,7 +8287,7 @@ screen-256color-s|GNU Screen with 256 colors and status line,
 	use=xterm+256setaf, use=screen-s,
 
 screen-256color-bce|GNU Screen with 256 colors and BCE,
-	bce, use=xterm+256setaf, use=screen-bce,
+	use=xterm+256setaf, use=screen-bce,
 
 screen-256color-bce-s|GNU Screen with 256 colors using BCE and status line,
 	bce, use=xterm+256setaf, use=screen-s,
@@ -8387,9 +8349,8 @@ screen+italics|screen cannot support italics,
 #	since the default translations override the built-in keycode
 #	translation.  They are suppressed here to show what is tested by tack.
 screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
-	bce@, bw, npc,
-	invis@, kIC@, kNXT@, kPRV@, kcbt=\E[Z, kent=\EOM, meml@, memu@,
-	nel=\EE, rep@,
+	bce@, bw,
+	invis@, kIC@, kNXT@, kPRV@, meml@, memu@, rep@,
 	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,
@@ -8436,7 +8397,7 @@ screen.konsole|screen in KDE console window,
 # fix the backspace key
 screen.linux|screen.linux-s|screen in Linux console,
 	bw,
-	kbs=^?, kcbt@, use=linux+sfkeys, use=xterm+x11mouse,
+	kcbt@, use=linux+sfkeys, use=xterm+x11mouse,
 	use=screen+fkeys, use=screen,
 screen.mlterm|screen in mlterm,
 	XR@, use=xterm+x11mouse, use=screen+fkeys,
@@ -8471,10 +8432,8 @@ screen-bce.mrxvt|screen optimized for mrxvt,
 	bce,
 	ech@, use=screen.mrxvt,
 screen-bce.gnome|screen optimized for GNOME-Terminal,
-	bce,
 	ech@, use=screen+italics, use=screen.gnome,
 screen-bce.konsole|screen optimized for KDE console window,
-	bce,
 	ech@, use=screen+italics, use=screen.konsole,
 screen-bce.linux|screen optimized for Linux console,
 	bce,
@@ -8549,7 +8508,7 @@ screen5|VT 100/ANSI X3.64 virtual terminal (someday),
 # various entries such as screen.xterm-new provide a way to more closely
 # match the terminal.
 tmux|tmux terminal multiplexer,
-	invis=\E[8m, kbs=^?, rmso=\E[27m,
+	invis=\E[8m, rmso=\E[27m,
 	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%;,
 	smso=\E[7m, E3=\E[3J, Smulx=\E[4:%p1%dm,
@@ -8948,14 +8907,14 @@ sun-type4|Sun Workstation console with type 4 keyboard,
 sun-color|Sun Microsystems Workstation console with color support (IA systems),
 	colors#8, ncv#3, pairs#64,
 	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,
+	cuu=\E[%p1%dA, home=\E[H, op=\E[0m, 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=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-	smso=\E[7m, use=sun,
+	use=sun,
 
 #### Iris consoles
 #
@@ -9232,33 +9191,25 @@ emx-base|DOS special keys,
 #
 # Removed: rmacs=\E[10m, smacs=\E[11m, because OS/2 does not implement acs.
 ansi-emx|ANSI.SYS color,
-	am, bce, eo, mir, msgr, xon,
-	colors#8, cols#80, it#8, lines#25, pairs#64,
-	bel=^G, blink=\E[5m, bold=\E[1m,
-	clear=\E[1;33;44m\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
-	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$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\n, kb2=\E[G, kbs=^H, kf0=\0D,
-	kll=\0O, kspd=^Z, nel=\r\n, 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=vt220+cvis,
-	use=emx-base,
+	eo,
+	clear=\E[1;33;44m\E[H\E[J, cr=\r, cud1=\n, dch=\E[%p1%dp,
+	ed=\E[J, flash=\E[?5h$<100/>\E[?5l, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\n, kb2=\E[G, kf0=\0D, kll=\0O,
+	kspd=^Z, nel=\r\n, rev=\E[5;37;41m, rmir=\E[4l,
+	rmso=\E[0;44m\E[1;33m, rmul=\E[0;44m\E[1;33m, rs1=\Ec,
+	sgr0=\E[0m\E[1;33;44m, smir=\E[4h, smso=\E[0;31;47m,
+	smul=\E[1;31;44m, tbc=\E[3g, u8=\E[?6c, u9=\E[c,
+	use=vt220+cvis, 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,
-	rmso=\E[0;37;44m, rmul=\E[0;37;44m, rs1=\Ec,
-	setaf=\E[3%p1%dm, sgr0=\E[0;37;44m, smso=\E[1;37;46m,
-	smul=\E[1;36;44m, use=ansi-emx,
+	rmso=\E[0;37;44m, rmul=\E[0;37;44m, sgr0=\E[0;37;44m,
+	smso=\E[1;37;46m, smul=\E[1;36;44m, use=ansi-emx,
 # nice colors for Emacs (white on black, mode line black on cyan)
 ansi-color-3-emx|ANSI.SYS color 3,
 	clear=\E[0;37;40m\E[H\E[J, rev=\E[1;37;46m,
-	rmso=\E[0;37;40m, rmul=\E[0;37;40m, rs1=\Ec,
-	setaf=\E[3%p1%dm, sgr0=\E[0;10m, smso=\E[1;37;46m,
-	smul=\E[0;36;40m, use=ansi-emx,
+	rmso=\E[0;37;40m, rmul=\E[0;37;40m, sgr0=\E[0;10m,
+	smso=\E[1;37;46m, smul=\E[0;36;40m, use=ansi-emx,
 mono-emx|stupid monochrome ANSI terminal with only one kind of emphasis,
 	am,
 	cols#80, it#8, lines#24,
@@ -9930,8 +9881,7 @@ hp2621-fl|HP 2621,
 	xhp@, xon,
 	pb#19200,
 	cbt=\Ei, cup=\E&a%p2%dc%p1%dY, dch1=\EP$<2>, ht=\011$<2>,
-	ip=$<2>, is2=\E&j@\r, rmkx=\E&j@, rmso=\E&d@, rmul=\E&d@,
-	sgr0=\E&d@, smkx=\E&jB, smso=\E&dD, smul=\E&dD,
+	ip=$<2>, is2=\E&j@\r, rmkx=\E&j@, smkx=\E&jB, smso=\E&dD,
 	use=hp+pfk+cr, use=hpgeneric,
 
 # To use hp2621p printer, setenv TERM=2621p, PRINTER=2612p
@@ -10058,21 +10008,20 @@ hp2626-12-s|Hewlett-Packard 2626 11 lines plus status,
 # hp2627 color tubes from University of Wisconsin
 #
 hp2627a-rev|HP 2627 with reverse video colors,
-	cr=\r, cud1=\n, ht=^I, ind=\n,
+	ht=^I,
 	is2=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3
 	    \r,
-	kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rmul=\E&v0S\E&d@,
+	kcub1=^H, kcud1=\n, nel=\r\n, rmul=\E&v0S\E&d@,
 	smul=\E&dD\E&v1S, use=hp2621-nl,
 hp2627a|HP 2627 color terminal with no labels,
-	cr=\r, cud1=\n, ht=^I, ind=\n,
+	ht=^I,
 	is2=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r,
-	kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rmso=\E&v0S,
+	kcub1=^H, kcud1=\n, nel=\r\n, rmso=\E&v0S,
 	rmul=\E&v0S\E&d@, smso=\E&v2S, smul=\E&dD\E&v1S,
 	use=hp2621-nl,
 hp2627c|HP 2627 color (cyan) terminal with no labels,
-	cr=\r, cud1=\n, ht=^I, ind=\n,
 	is2=\E&v0m1a0b0c2i1a1b0c1i0a1b1c0i0S\E&j@\r\E3\r,
-	kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, use=hp2627a,
+	use=hp2627a,
 
 # hp2640a doesn't have the Y cursor addressing feature, and C is
 # memory relative instead of screen relative, as we need.
@@ -10108,7 +10057,7 @@ hp2645|hp45|HP 2645 series,
 	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,
-	sgr0=\E&d@, smkx=\E&s1A, smul=\E&dD, use=hpgeneric,
+	sgr0=\E&d@, smkx=\E&s1A, use=hpgeneric,
 # You should use this terminal at 4800 baud or less.
 hp2648|hp2648a|HP 2648a graphics terminal,
 	clear=\EH\EJ$<50>, cup=\E&a%p2%dc%p1%dY$<20>,
@@ -10328,9 +10277,9 @@ hpsub|HP terminals -- capability subset,
 # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:",
 # moved <rmir> here from hpsub -- esr)
 hpex|HP extended capabilities,
-	cr=\r, cud1=\n, cup=\E&a%p1%dy%p2%dC, ht=^I, ind=\n, kbs=^H,
-	kcub1=^H, kcud1=\n, nel=\r\n, rmir=\ER, rmul=\E&d@, smir=\EQ,
-	smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub,
+	cud1=\n, cup=\E&a%p1%dy%p2%dC, kcub1=^H, kcud1=\n,
+	nel=\r\n, rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD,
+	vpa=\E&a%p1%dY, use=hpsub,
 
 # From: Ville Sulko <Ville.Sulko@bip.atk.tpo.fi>, 05 Aug 1996
 hp2|hpex2|Hewlett-Packard extended capabilities newer version,
@@ -10588,8 +10537,7 @@ adm3a+|adm3a plus,
 # (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr)
 adm5|LSI adm5,
 	xmc#1,
-	bel=^G, cr=\r, cud1=\n, ed=\EY, el=\ET, kbs=^H, khome=^^,
-	rmso=\EG, smso=\EG, use=adm3a+,
+	ed=\EY, el=\ET, khome=^^, rmso=\EG, smso=\EG, use=adm3a+,
 # A lot of terminals other than adm11s use these.  Wherever you see
 # use=adm+sgr with some of its capabilities disabled, try the
 # disabled ones.  They may well work but not have been documented or
@@ -10683,10 +10631,9 @@ adm20|Lear Siegler adm20,
 	sgr0=\E(, smso=\E),
 adm21|Lear Siegler adm21,
 	xmc#1,
-	bel=^G, cr=\r, cud1=\n, dch1=\EW, dl1=\ER$<30*>, ed=\EY,
-	el=\ET, ich1=\EQ, il1=\EE$<30*>, ind=\n, invis@, kbs=^H,
-	kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, khome=^^,
-	use=adm+sgr, use=adm3a,
+	dch1=\EW, dl1=\ER$<30*>, ed=\EY, el=\ET, ich1=\EQ,
+	il1=\EE$<30*>, invis@, kbs=^H, khome=^^, use=adm+sgr,
+	use=adm3a,
 # (adm22: ":em=:" was an obvious typo for ":ei=:"; also,
 # removed obsolete ":kn#7:ma=j^Jk^P^K^Pl ^R^L^L :";
 # removed bogus-looking \200 from before <cup>. -- esr)
@@ -11825,7 +11772,7 @@ tvi925|TeleVideo 925,
 # to avoid "magic cookie" standout glitch:
 tvi925-hi|TeleVideo Model 925 with half intensity standout mode,
 	xmc@,
-	kbs=^H, kcub1=^H, kcud1=\n, rmso=\E(, smso=\E), use=tvi925,
+	kcud1=\n, rmso=\E(, smso=\E), use=tvi925,
 
 # From: Todd Litwin <litwin@litwin.jpl.nasa.gov> 28 May 1993
 # Originally Tim Curry, Univ. of Central Fla., <duke!ucf-cs!tim> 5/21/82
@@ -12023,8 +11970,8 @@ tvi950-rv-4p|TeleVideo 950 rev video w/4 pages,
 # If the BSD termcap file was right, <cup=\E=%p1%{32}%+%c%p2%{32}%+%c> would
 # also work.
 tvi955|TeleVideo 955,
-	OTbs, mc5i, msgr@,
-	it#8, xmc@,
+	mc5i, msgr@,
+	xmc@,
 	acsc=0_`RjHkGlFmEnIoPqKsQtMuLvOwNxJ, blink=\EG2,
 	civis=\E.0, cnorm=\E.2, cud1=^V, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E.1, dim=\E[=5h, ind@, invis=\EG1,
@@ -12033,8 +11980,7 @@ tvi955|TeleVideo 955,
 	rmam=\E[=7l, rmxon=^N,
 	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,
+	sgr0=\EG0\E[=5l, smam=\E[=7h, smxon=^O, use=tvi950,
 tvi955-w|955-w|TeleVideo 955 w/132 cols,
 	cols#132,
 	is2=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El, use=tvi955,
@@ -12215,12 +12161,9 @@ vi200|Visual 200,
 # If your version of vi doesn't support function keys you may want
 # to use vi200-f.
 vi200-f|Visual 200 no function keys,
-	is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek, kf0=\E?p, kf1=\E?q,
-	kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w,
-	kf8=\E?x, kf9=\E?y, rmkx=\E>, rmso@, smkx=\E=, smso@,
-	use=vi200,
+	is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek, rmso@, smso@, use=vi200,
 vi200-rv|Visual 200 reverse video,
-	cnorm@, cvvis@, ri@, rmso=\E3, smso=\E4, use=vi200,
+	cnorm@, cvvis@, ri@, use=vi200,
 
 # the function keys are programmable but we don't reprogram them to their
 # default values with <is2> because programming them is very verbose. maybe
@@ -12278,7 +12221,7 @@ vi550|Visual 550 ANSI x3.64,
 
 vi603|visual603|Visual 603,
 	hs, mir,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
 	csr=\E[%i%p1%d;%p2%dr, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
 	dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, il1=\E[L,
@@ -12655,9 +12598,9 @@ wy60-42|wyse60-42|Wyse 60 80-column 42-lines,
 	ri=\Ej$<10>, rs3=\Ee*$<150>, use=wy60,
 wy60-42-w|wyse60-42-w|Wyse 60 132-column 42-lines,
 	cols#132, lw#7, nlab#16, wsl#97,
-	clear=\E+$<260>, cup=\Ea%i%p1%dR%p2%dC$<2>,
-	dch1=\EW$<19>, ed=\Ey$<260>, home=\036$<2>, ip=$<6>,
-	nel=\r\n$<11>, rs2=\EeF$<150>\E`;$<150>, use=wy60-42,
+	cup=\Ea%i%p1%dR%p2%dC$<2>, dch1=\EW$<19>,
+	home=\036$<2>, ip=$<6>, nel=\r\n$<11>,
+	rs2=\EeF$<150>\E`;$<150>, use=wy60-42,
 #
 wy60-43|wyse60-43|Wyse 60 80-column 43-lines,
 	lh@, lines#43, lw@, nlab@,
@@ -12689,8 +12632,7 @@ wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell,
 wy99gt|wyse99gt|Wyse 99gt,
 	msgr@,
 	clear=\E+$<130>, dch1=\EW$<7>, dl1=\ER$<4>, ed=\Ey$<130>,
-	el=\Et$<5>, flash=\E`8$<100/>\E`9, ht=\011$<1>,
-	il1=\EE$<4>, ind=\n$<4>, ip=$<2>, is3=\Ew0$<20>, nel@,
+	el=\Et$<5>, ind=\n$<4>, ip=$<2>, is3=\Ew0$<20>, nel@,
 	ri=\Ej$<3>, rmcup=\Ew0, rs2=\E`:$<150>, smcup=\Ew1,
 	u0=\E~>\E8, u1=\E[42h, use=wy60,
 #
@@ -12702,7 +12644,7 @@ wy99gt-w|wyse99gt-w|Wyse 99gt 132-column,
 #
 wy99gt-25|wyse99gt-25|Wyse 99gt 80-column 25-lines,
 	lh@, lines#25, lw@, nlab@,
-	pln@, rs2=\E`:$<150>, rs3=\EwG\Ee)$<200>, use=wy99gt,
+	pln@, rs3=\EwG\Ee)$<200>, use=wy99gt,
 #
 wy99gt-25-w|wyse99gt-25-w|Wyse 99gt 132-column 25-lines,
 	lh@, lines#25, lw@, nlab@,
@@ -13109,17 +13051,16 @@ wy185|wyse185|Wyse 185,
 	ind=\n$<2>, invis=\E[8m, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
 	is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\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=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m,
-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
-	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,
+	kf19=\E[33~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
+	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	rc=\E8, rev=\E[7m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
+	rmcup=\E[ R, rmir=\E[4l, 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%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
@@ -13650,9 +13591,8 @@ pckermit|pckermit12|UCB IBMPC Kermit 1.2,
 # Does not use :am: because autowrap is lost when kermit dropped and restarted.
 # From: greg small <gts@populi.berkeley.edu> 12-19-84
 pckermit120|UCB IBMPC Kermit 1.20,
-	it#8, lines#24,
-	cud1=\EB, cvvis=\EO\Eq\EEK3, dch1=\EN, dl1=\EM, ht=^I,
-	il1=\EL,
+	it#8,
+	cvvis=\EO\Eq\EEK3, dch1=\EN, dl1=\EM, ht=^I, il1=\EL,
 	is2=\EO\Eq\EJ\EY7\sK3\sUCB\sIBMPC\sKermit\s1.20\s\s12-19-84
 	    \n,
 	rmir@, rmso=\Eq, smir@, smso=\Ep, use=kermit,
@@ -13861,14 +13801,14 @@ rbcomm|IBM PC with RBcomm and EMACS keybindings,
 	use=vt220+cvis,
 rbcomm-nam|IBM PC with RBcomm without autowrap,
 	am@,
-	bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n,
-	is2=\017\035\E(B\E)0\E[?7l\E[?3l\E[>8g, kbs=^H,
-	kcub1=^H, kcud1=\n, nel=\r\n, use=rbcomm,
+	cud1=\n, ind=\n,
+	is2=\017\035\E(B\E)0\E[?7l\E[?3l\E[>8g, kcub1=^H,
+	kcud1=\n, nel=\r\n, use=rbcomm,
 rbcomm-w|IBM PC with RBcomm in 132 column mode,
 	cols#132,
-	bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n,
-	is2=\017\035\E(B\E)0\E[?7h\E[?3h\E[>8g, kbs=^H,
-	kcub1=^H, kcud1=\n, nel=\r\n, use=rbcomm,
+	cud1=\n, ind=\n,
+	is2=\017\035\E(B\E)0\E[?7h\E[?3h\E[>8g, kcub1=^H,
+	kcud1=\n, nel=\r\n, use=rbcomm,
 
 ######## LCD DISPLAYS
 #
@@ -14060,8 +14000,8 @@ v5410|att5410 in terms of a VT100,
 # when pressed in SYS PF mode.
 # (att4415: I added <rmam>/<smam> based on the init string -- esr)
 att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
-	OTbs, db, mir, xon,
-	lh#2, lm#78, lw#8, nlab#8, wsl#55,
+	db,
+	lm#78, wsl#55,
 	cbt=\E[Z, clear=\E[x\E[J, cnorm=\E[11;0j, cub=\E[%p1%dD,
 	cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dx,
 	cuu=\E[%p1%dA, cvvis=\E[11;1j, dch=\E[%p1%dP,
@@ -14593,14 +14533,10 @@ att605|AT&T 605 80 column 102key keyboard,
 att605-pc|AT&T 605 in pc term mode,
 	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,
-	kdl1=\E[M, kend=\E[F, kf1=\E[M, kf10=\E[V, kf2=\E[N,
+	cub1=\E[D, kend=\E[F, kf1=\E[M, kf10=\E[V, 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[@, knp=\E[G, kpp=\E[I,
-	rmsc=\E[50;0|$<400>, smsc=\E[?11l\E[50;1|$<250>,
-	xoffc=g, xonc=e, use=att605,
+	kf9=\E[U, knp=\E[G, kpp=\E[I, rmsc=\E[50;0|$<400>,
+	smsc=\E[?11l\E[50;1|$<250>, 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,
@@ -15237,9 +15173,9 @@ ampex219|ampex-219|amp219|Ampex with automargins,
 	rmso=\E[m$<2>, rmul=\E[m$<2>, sgr0=\E[m$<2>, smam=\E[?7h,
 	smkx=\E=, smso=\E[7m$<2>, smul=\E[4m$<2>,
 ampex219w|ampex-219w|amp219w|Ampex 132 cols,
-	cols#132, lines#24,
-	bel=^G, cr=\r, cud1=\n, ind=\n,
-	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, use=ampex219,
+	cols#132,
+	cud1=\n, is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
+	use=ampex219,
 # (ampex232: removed <if=/usr/share/tabset/ampex>, no file and no <hts> --esr)
 ampex232|ampex-232|Ampex Model 232,
 	am,
@@ -15254,7 +15190,7 @@ ampex232|ampex-232|Ampex Model 232,
 	kf9=^AI\r, khome=^^, use=adm+sgr,
 # (ampex: removed <if=/usr/share/tabset/amp-132>, no file and no <hts> -- esr)
 ampex232w|Ampex Model 232 / 132 columns,
-	cols#132, lines#24,
+	cols#132,
 	is2=\E\034Eg\El, use=ampex232,
 
 #### Ann Arbor (aa)
@@ -16148,13 +16084,13 @@ c108|concept108|c108-8p|concept108-8p|Concept 108 w/8 pages,
 	    \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,
+	eslok, hs, xon,
 	pb@,
 	acsc=jEkTl\\mMqLxU, cnorm=\Ew, cr=\r,
 	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=\n, is1=\EK\E!\E F,
+	is1=\EK\E!\E F,
 	is3=\EU\E z"\Ev\177 !p\E ;"\E z \Ev  \001 p\Ep\n,
 	rmacs=\Ej\s, rmcup=\Ev  \001 p\Ep\r\n, smacs=\Ej!,
 	smcup=\EU\Ev  8p\Ep\r\E\025,
@@ -17448,7 +17384,7 @@ dm3025|Datamedia 3025a,
 	is2=\EQ\EU\EV, rmdc=\EQ, rmir=\EQ, rmso=\EO0, smdc=\EP,
 	smir=\EP, smso=\EO1,
 dm3045|Datamedia 3045a,
-	OTbs, am, eo, km@, ul, xenl,
+	am, eo, km@, ul, xenl,
 	dch1=\EB$<6>, dl1@, il1@, is2=\EU\EV, kcuf1=\EC, kcuu1=\EA,
 	kf0=\Ey\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, kf9=\Ex\r,
@@ -17486,11 +17422,10 @@ dm3045|Datamedia 3045a,
 #	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=\n, cuf1=\E[C,
-	cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
-	home=\E[H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, ri=\EM,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>, smso=\E[7m,
-	smul=\E[4m, use=vt100+4bsd,
+	clear=\E[2J\E[H, cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH,
+	cuu1=\E[A, ed=\E[J, el=\E[K, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>,
+	smso=\E[7m, smul=\E[4m, use=vt100+4bsd,
 # except in 132 column mode, where it needs a little padding.
 # This is still less padding than the VT100, and you can always turn on
 # the ^S/^Q handshaking, so you can use VT100 flavors for things like
@@ -18122,11 +18057,11 @@ ibm3101|i3101|IBM 3101-10,
 	el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
 	kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH,
 ibm3151|IBM 3151 display,
-	is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
+	is2=\E S, rmacs=\E>B, rs2=\E S,
 	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,
+	sgr0=\E4@\E>B, smacs=\E>A, use=ibm3162,
 # From: Mark Easter <marke@fsi-ssd.csg.ssd.fsi.com> 29 Oct 1992
 # removed kend, knp, kpp -TD
 #
@@ -18234,8 +18169,7 @@ ibmmono|IBM workstation monochrome,
 	sgr0=\Ew\Eq\Ez\EB, smso=\EZ, smul=\EW, tsl=\Ej\EY8%+ \Eo,
 	use=ibm3101,
 ibmega|IBM Enhanced Color Display,
-	cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
-	nel=\r\n, use=ibmmono,
+	ht=^I, kcub1=^H, kcud1=\n, use=ibmmono,
 # This color scheme is assumed in some recent IBM terminal descriptions
 # (green on black, emulated on a 16-color terminal).
 ibm+color|IBM color definitions,
@@ -18263,11 +18197,9 @@ ibmega-c|ibm5154-c|IBM Enhanced Color Display with standout and underline,
 	rmso=\EB, rmul=\EB, smso=\EF\Ef3;, smul=\EF\Ef2;,
 	use=ibmmono,
 ibmvga-c|IBM VGA display color termcap,
-	cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
-	nel=\r\n, use=ibmega-c,
+	ht=^I, kcub1=^H, kcud1=\n, use=ibmega-c,
 ibmvga|IBM VGA display,
-	cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
-	nel=\r\n, use=ibmega,
+	use=ibmega,
 # ibmapa* and ibmmono entries come from ACIS 4.3 distribution
 rtpc|ibmapa16|IBM 6155 Extended Monochrome Graphics Display,
 	lines#32,
@@ -18298,22 +18230,12 @@ ibm6153-90|IBM 6153 Black & White display (36-line),
 ibm6153-40|IBM 6153 Black & White display (12-line),
 	cols#40, lines#12, use=ibm6153-90,
 ibm8512|ibm8513|IBM color VGA Terminal,
-	am, mir, msgr,
-	cols#80, it#8, lines#25,
-	acsc=jjkkllmmnnqqttuuvvwwxx, blink=\E[5m, bold=\E[1m,
-	clear=\E[H\E[J, cub1=\E[D, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, il=\E[%p1%dL,
-	il1=\E[L, is2=\Eb\E[m\017\E[?7h, kcud1=\E[B, kcuu1=\E[A,
-	kf0=\E[010q, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q,
-	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
-	kf8=\E[008q, kf9=\E[009q, khome=\E[H, rc=\E[u, rev=\E[7m,
+	mir,
+	cub1=\E[D, is2=\Eb\E[m\017\E[?7h, kf0=\E[010q, rc=\E[u,
 	rmacs=^O, rmam=\E[?7l, rmcup=\E[20h, rmdc=\E[4l,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m,
 	rs1=\Eb\E[m\017\E[?7h\E[H\E[J, sc=\E[s, sgr0=\E[m,
 	smacs=^N, smam=\E[?7h, smcup=\E[20;4l\E[?7h\Eb,
-	smdc=\E[4h, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	use=ibm8503,
+	smdc=\E[4h, use=ibm8503,
 hft-c|HFT with Color,
 	colors#8, pairs#64,
 	acsc=jjkkllmmnnqqttuuvvwwxx, s0ds=\E(B, s1ds=\E(0,
@@ -18383,21 +18305,17 @@ ibm5081|hft|IBM Megapel Color display,
 	acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
 	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
 ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
-	eslok, hs,
 	lines#33,
-	dsl=\Ej\EYA \EI\Ek, fsl=\Ek, tsl=\Ej\EYA%+ \Eo,
-	use=ibmega-c,
+	dsl=\Ej\EYA \EI\Ek, tsl=\Ej\EYA%+ \Eo, use=ibmega-c,
 ibm8503|ibm8507|ibm8604|IBM 8503 B & W VGA display,
 	use=hft-c,
 ibm8514|IBM 8514/a color VGA display,
 	eslok, hs,
 	dsl=\Ej\EYI \EI\Ek, fsl=\Ek, tsl=\Ej\EYI%+ \Eo, use=hft,
 ibm8514-c|IBM 8514 color display with standout and underline,
-	eslok, hs,
 	lines#41,
-	cr=\r, cud1=\n, dsl=\Ej\EYI \EI\Ek, fsl=\Ek, ht=^I, ind=\n,
-	kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, tsl=\Ej\EYI%+ \Eo,
-	use=ibmega-c,
+	dsl=\Ej\EYI \EI\Ek, ht=^I, kcub1=^H, kcud1=\n,
+	tsl=\Ej\EYI%+ \Eo, use=ibmega-c,
 
 #
 # AIX entries.  IBM ships these with AIX 3.2.5.
@@ -19247,8 +19165,7 @@ act4|microterm|microterm act iv,
 # The act 5 has hardware tabs, but they are in columns 8, 16, 24, 32, 41 (!)...
 # (microterm5: removed obsolete ":ma==^Z^P^Xl^Kj:" -- esr)
 act5|microterm5|microterm act v,
-	kcub1=^H, kcud1=^K, kcuf1=^X, kcuu1=^Z, ri=\EH$<3>, uc=^H\EA,
-	use=act4,
+	ri=\EH$<3>, uc=^H\EA, use=act4,
 # Mimes using brightness for standout.  Half bright is really dim unless
 # you turn up the brightness so far that lines show up on the screen.
 mime-fb|full bright mime1,
@@ -19290,7 +19207,7 @@ mime2a|mime2a-v|microterm mime2a (emulating an enhanced VT52),
 # (mime3a: removed obsolete ":ma=^X ^K^J^Z^P:" -- esr)
 mime3a|mime1 emulating 3a,
 	am@,
-	kcub1=^H, kcud1=^K, kcuf1=^X, kcuu1=^Z, use=adm3a,
+	kcud1=^K, kcuf1=^X, kcuu1=^Z, use=adm3a,
 mime3ax|mime-3ax|mime1 emulating enhanced 3a,
 	it#8,
 	dl1=\027$<80>, ed=^_, el=^X, ht=\011$<3>, il1=\001$<80>,
@@ -19496,15 +19413,11 @@ ncr260vt100wan|NCR 2900/260 VT100 wide mode ANSI keyboard,
 	    200>,
 	use=ncr260vt100an,
 ncr260vt100pp|NCR 2900/260 VT100 with PC+ keyboard,
-	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>,
-	smkx=\E=, use=ncr260vt100an,
+	kend=\E[5~, khome=\E[2~, kich1=\E[1~, kpp=\E[3~, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=,
+	use=ncr260vt100an,
 ncr260vt100wpp|NCR 2900/260 VT100 wide mode PC+  keyboard,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH$<30>,
@@ -19533,16 +19446,15 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	kf0=\EOy, 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~, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
-	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
-	kf28=\E[3~, kf29=\E[4~, kf3=\EOR, kf30=\E[5~, kf31=\E[6~,
-	kf32=\E[7~, kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf4=\EOS,
-	kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khlp=\E[28~, krdo=\E[29~, 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,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
+	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
+	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
+	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
+	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, 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>,
 	sc=\E7,
@@ -19561,9 +19473,8 @@ ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 ncr260vt200pp|NCR 2900/260 VT200 with PC+ keyboard,
 	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[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=,
-	use=ncr260vt200an,
+	kend=\E[1~, khome=\E[H, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+	rmkx=\E>, smkx=\E=, use=ncr260vt200an,
 ncr260vt200wpp|NCR 2900/260 VT200 wide mode PC+  keyboard,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH$<30>,
@@ -19622,9 +19533,8 @@ ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 ncr260vt300pp|NCR 2900/260 VT300 with PC+ keyboard,
 	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[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=,
-	use=ncr260vt300an,
+	kend=\E[1~, khome=\E[H, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+	rmkx=\E>, smkx=\E=, use=ncr260vt300an,
 ncr260vt300wpp|NCR260VT300WPP|NCR 2900/260 VT300 wide mode PC+  keyboard,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH$<30>,
@@ -20975,8 +20885,7 @@ apple2e|Apple //e,
 # mcvax!vu44!vu45!wilcke uses the "ap" entry together with Ascii Express Pro
 # 4.20, with incoming and outgoing terminals both on 0, emulation On.
 apple2e-p|Apple //e via Pascal,
-	cup=\036%p2%{32}%+%c%p1%{32}%+%c, kbs=^H, kcub1=^H,
-	kcud1=\n, use=apple2e,
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, use=apple2e,
 # (ASCII Express) MouseTalk "Standard Apple //" emulation from BRL
 # Enable DC3/DC1 flow control with "stty ixon -ixany".
 apple-ae|ASCII Express,
@@ -21533,8 +21442,7 @@ mai|basic4|MAI Basic Four in ANSI mode,
 # (basis: removed obsolete ":ma=^K^P^R^L^L :nl=5000*^J:" -- esr)
 basis|BASIS108 computer with terminal translation table active,
 	clear=\E*$<300/>, cud1=\n$<5000/>, ed=\EY, el=\ET, kbs=^H,
-	kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, rmso=\E), sgr0=\E),
-	smso=\E(, use=adm3a,
+	rmso=\E), sgr0=\E), smso=\E(, use=adm3a,
 # luna's BMC terminal emulator
 luna|luna68k|LUNA68K Bitmap console,
 	cols#88, lines#46, use=ansi-mini,
@@ -21648,7 +21556,7 @@ minitel1b|minitel 1-bistandard (in 40cols mode),
 	use=minitel1,
 # rmkx posait des problemes (logout en sortant de vi).
 minitel1b-80|minitel 1-bistandard (standard teleinformatique),
-	am@, bw@, eslok@, hz@, msgr, G0,
+	am@, bw@, eslok@, hz@, msgr,
 	colors@, cols#80, it#8, pairs@,
 	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,
@@ -21679,7 +21587,6 @@ minitel1b-80|minitel 1-bistandard (standard teleinformatique),
 	.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\,
@@ -21731,10 +21638,9 @@ minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...
 # Fonctionne par exemple avec Midnight Commander (mc).
 
 minitel2-80|minitel 2 (80cols) avec filets VT100 (DEC),
-	G0,
 	acsc=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}},
 	enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR,
-	C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, E0=^O,
+	C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}},
 	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
@@ -21814,7 +21720,7 @@ screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for m
 
 screen.minitel1-nb|Screen specific for minitel1-nb,
 	colors@, ncv@, pairs@,
-	bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+	bold=\E[1m, op@, setab@, setaf@, setb@, setf@,
 	use=screen.minitel1,
 
 screen.minitel1b-nb|Screen specific for minitel1b-nb,
@@ -21898,8 +21804,7 @@ linux-m2|Linux Minitel 2 "like" Couleurs (Vert/Blanc/Noir+Bleu),
 	    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@,
+	oc@, op@, setab=^A, setaf=^A, sgr0=\E[;37m, .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
@@ -21921,10 +21826,10 @@ linux-s|Linux console with added status line at bottom,
 
 screen.linux-m1|Linux m1 specific for screen,
 	ncv@,
-	dim=\E[2m, kbs=^?, kclr=\E\r, 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@, u8=\E[?1;2c,
+	kclr=\E\r, 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@,
+	u8=\E[?1;2c,
 	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
@@ -21947,21 +21852,18 @@ screen.linux-m2|Linux m2 specific for screen,
 # Putty :
 
 putty-m1|Putty Minitel 1 "like" Couleurs,
-	hs,
 	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
 	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
 	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
 	use=ecma+index, use=linux-m1,
 
 putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
-	hs,
 	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
 	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
 	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
 	use=ecma+index, use=linux-m1b,
 
 putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
-	hs,
 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
 	     {||}}~~,
 	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
@@ -22541,13 +22443,12 @@ bq300-pc-w-rv|Questar 303 with PC keyboard reverse mode 132 columns,
 #    8 bit Control Characters,
 #    80 columns screen.
 bq300-8-pc|Q306-8-pc|Questar 303 with PC keyboard in full 8 bits 80 columns,
-	kbs=^H, kdch1=\2333~, kend=\2334~, kf1=\23317~,
-	kf10=\23328~, kf11=\23329~, kf12=\23331~, kf13@, kf14@,
-	kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\23318~, kf20@,
-	kf3=\23319~, kf4=\23320~, kf5=\23321~, kf6=\23323~,
-	kf7=\23324~, kf8=\23325~, kf9=\23326~, kfnd@, khlp@,
-	khome=\2331~, kich1=\2332~, knp=\2336~, kpp=\2335~, krdo@,
-	kslt@, lf1@, lf2@, lf3@, lf4@, use=bq300-8,
+	kend=\2334~, kf1=\23317~, kf10=\23328~, kf11=\23329~,
+	kf12=\23331~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
+	kf2=\23318~, kf20@, kf3=\23319~, kf4=\23320~, kf5=\23321~,
+	kf6=\23323~, kf7=\23324~, kf8=\23325~, kf9=\23326~, kfnd@,
+	khlp@, khome=\2331~, krdo@, 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\sG\E[?42l\E[?4
@@ -22913,8 +22814,7 @@ ln03|DEC ln03 laser printer,
 	smul=\E[4m,
 ln03-w|DEC ln03 laser printer 132 cols,
 	cols#132,
-	bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H,
-	kcud1=\n, nel=\r\n, use=ln03,
+	kbs=^H, kcub1=^H, kcud1=\n, use=ln03,
 
 #### Delta Data (dd)
 #
@@ -23344,7 +23244,6 @@ graphos-30|graphos III with 30 lines,
 
 modgraph|mod24|modgraph terminal emulating VT100,
 	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
@@ -23570,8 +23469,7 @@ vsc|Signetics Vsc Video driver by RMC,
 
 # (soroc120: removed obsolete ":ma=^K^P^R^L^L :" -- esr)
 soroc120|iq120|soroc|Soroc iq120,
-	clear=\E*$<2>, cud1=\n, ed=\EY, el=\ET, kcub1=^H, kcud1=\n,
-	kcuf1=^L, kcuu1=^K, use=adm3a,
+	clear=\E*$<2>, ed=\EY, el=\ET, use=adm3a,
 soroc140|iq140|Soroc iq140,
 	OTbs, am, mir,
 	cols#80, lines#24,
@@ -23672,11 +23570,10 @@ synertek|ktm|synertek380|Synertek KTM 3/80 tubeless terminal,
 #	Also the terminal understands a selection of Tektronix 4027 commands. 
 tab132|tab|tab132-15|tab 132/15,
 	da, db,
-	OTdN@, cols#80, lines#24, lm#96,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M,
-	il1=\E[L, is2=\E[?7h\E[?3l\E[?5l, kcub1=\E[D, kcud1=\E[B,
-	kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@,
-	use=decid+cpr, use=vt100+4bsd,
+	OTdN@, lm#96,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L,
+	is2=\E[?7h\E[?3l\E[?5l, rmir=\E[4l, rmkx@, smir=\E[4h,
+	smkx@, use=decid+cpr, use=vt100+4bsd,
 tab132-w|tab132 in wide mode,
 	cols#132,
 	is2=\E[?7h\E[?3h\E[?5l, use=tab132,
@@ -23798,12 +23695,10 @@ ti703-w|ti707-w|Texas Instruments Silent 703/707 (132 column),
 # Texas Instruments 916 VDT 7 bit control mode
 #
 ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL,
-	da, db, in, msgr,
-	cbt=\E[Z, clear=\E[H\E[2J$<6>, cub=\E[%p1%dD,
-	cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, dch=\E[%p1%dP$<250>, dch1=\E[P,
-	dl=\E[%p1%dM, ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K,
-	el1=\E[1K, enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>,
+	da, db, in,
+	cbt=\E[Z, clear=\E[H\E[2J$<6>, dch=\E[%p1%dP$<250>,
+	ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K,
+	enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>,
 	hpa=\E[%p1%{1}%+%dG, hts=\E[0W, ich=\E[%p1%d@$<250>,
 	il=\E[%p1%dL$<36>, ip=$<10>, is2=\E[1;24r\E[24;1H,
 	kcmd=\E[29~, kdch1=\E[P, kent=\n, kf1=\E[17~, kf10=\E[28~,
@@ -23811,18 +23706,17 @@ ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL,
 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
 	kf9=\E[26~, khome=\E[H, kich1=\E[@, knp=\E[S, kpp=\E[T,
 	kprt=^X, prot=\E&, rmacs=\017$<2>, rs2=\E[!p, sgr@,
-	smacs=\016$<2>, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-	use=vt220,
+	smacs=\016$<2>, vpa=\E[%p1%{1}%+%dd, use=vt220,
 #
 # Texas Instruments 916 VDT 8 bit control mode
 #
 ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 VT220 mode bit CTRL,
 	kcmd=\23329~, kcub1=\233D, kcud1=\233B, kcuf1=\233C,
-	kcuu1=\233A, kdch1=\233P, kent=\n, kf1=\23317~,
-	kf10=\23328~, kf11=\23329~, kf12=\23331~, kf2=\23318~,
-	kf3=\23319~, kf4=\23320~, kf5=\23321~, kf6=\23323~,
-	kf7=\23324~, kf8=\23325~, kf9=\23326~, khome=\233H,
-	kich1=\233@, knp=\233S, kpp=\233T, kprt=^X, use=ti916,
+	kcuu1=\233A, kdch1=\233P, kf1=\23317~, kf10=\23328~,
+	kf11=\23329~, kf12=\23331~, kf2=\23318~, kf3=\23319~,
+	kf4=\23320~, kf5=\23321~, kf6=\23323~, kf7=\23324~,
+	kf8=\23325~, kf9=\23326~, khome=\233H, kich1=\233@,
+	knp=\233S, kpp=\233T, use=ti916,
 #
 # Texas Instruments 916 VDT 8859/1 7 bit control 132 column mode
 #
@@ -27880,4 +27774,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as
 #	  fe/fd capabilities, like vim (vim-pr #13440).
 #
+# 2023-11-11
+#	+ used "infocmp -u" to help trim redundant capabilities -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c
index b8a9e4e66..85d2bdbaa 100644
--- a/ncurses/base/lib_endwin.c
+++ b/ncurses/base/lib_endwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_endwin.c,v 1.25 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_endwin.c,v 1.28 2023/11/11 21:27:32 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
@@ -52,20 +52,24 @@ NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
 
     T((T_CALLED("endwin(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM) {
+    if (SP_PARM != NULL) {
+	if (SP_PARM->_endwin != ewSuspend) {
 #ifdef USE_TERM_DRIVER
-	TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM);
+	    TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM);
 
-	SP_PARM->_endwin = ewSuspend;
-	if (TCB && TCB->drv && TCB->drv->td_scexit)
-	    TCB->drv->td_scexit(SP_PARM);
+	    SP_PARM->_endwin = ewSuspend;
+	    if (TCB && TCB->drv && TCB->drv->td_scexit)
+		TCB->drv->td_scexit(SP_PARM);
 #else
-	SP_PARM->_endwin = ewSuspend;
-	SP_PARM->_mouse_wrap(SP_PARM);
-	_nc_screen_wrap();
-	_nc_mvcur_wrap();	/* wrap up cursor addressing */
+	    SP_PARM->_endwin = ewSuspend;
+	    SP_PARM->_mouse_wrap(SP_PARM);
+	    _nc_screen_wrap();
+	    _nc_mvcur_wrap();	/* wrap up cursor addressing */
 #endif
-	code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG);
+	    code = OK;
+	}
+	if (NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG) == ERR)
+	    code = ERR;
     }
 
     returnCode(code);
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index d18945cd8..0889a3418 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.676 2023/09/23 18:46:47 tom Exp $
+ * $Id: curses.priv.h,v 1.677 2023/11/10 15:11:11 tom Exp $
  *
  *	curses.priv.h
  *
@@ -956,7 +956,8 @@ extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals;
 extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
 
 typedef enum {
-    ewInitial = 0,
+    ewUnknown = 0,
+    ewInitial,
     ewRunning,
     ewSuspend
 } ENDWIN;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 104374a50..fb2201680 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231104) unstable; urgency=low
+ncurses6 (6.4+20231111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 104374a50..fb2201680 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231104) unstable; urgency=low
+ncurses6 (6.4+20231111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index be5d0827b..eb58e9c42 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231104) unstable; urgency=low
+ncurses6 (6.4+20231111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Oct 2023 19:59:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 623826e85..1c0f4bbe2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.615 2023/11/03 07:58:06 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.616 2023/11/10 10:36:12 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1104"
+!define VERSION_MMDD  "1111"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index f546b373d..3b78c8033 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231104
+Release: 20231111
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index bf1267656..268e7180d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231104
+Release: 20231111
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 0a3db841e..373bbcd64 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231104
+Release: 20231111
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index ec5e07650..817845502 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.157 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.158 2023/11/11 18:25:52 tom Exp $")
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -209,15 +209,18 @@ use_predicate(unsigned type, PredIdx idx)
 	     * unlike numbers and strings, whose cancelled/absent state is
 	     * recorded in the terminfo database.
 	     */
-	    for (ep = &entries[1]; ep < entries + termcount; ep++)
-		if (ep->tterm.Booleans[idx] == TRUE) {
-		    is_set = entries[0].tterm.Booleans[idx];
-		    break;
+	    if (idx < NUM_BOOLEANS(&(entries[0].tterm))) {
+		for (ep = &entries[1]; ep < entries + termcount; ep++) {
+		    if (idx < NUM_BOOLEANS(&(ep->tterm))
+			&& ep->tterm.Booleans[idx] == TRUE) {
+			is_set = entries[0].tterm.Booleans[idx];
+			break;
+		    }
 		}
-	    if (is_set != entries[0].tterm.Booleans[idx])
-		return (!is_set);
-	    else
-		return (FAIL);
+		if (is_set != entries[0].tterm.Booleans[idx])
+		    return (!is_set);
+	    }
+	    return (FAIL);
 	}
 
     case NUMBER:
@@ -229,16 +232,18 @@ use_predicate(unsigned type, PredIdx idx)
 	     * capability gets the first non-default value found
 	     * in the sequence of use entries'.
 	     */
-	    for (ep = &entries[1]; ep < entries + termcount; ep++)
-		if (VALID_NUMERIC(ep->tterm.Numbers[idx])) {
-		    value = ep->tterm.Numbers[idx];
-		    break;
-		}
+	    if (idx < NUM_NUMBERS(&(entries[0].tterm))) {
+		for (ep = &entries[1]; ep < entries + termcount; ep++)
+		    if (idx < NUM_NUMBERS(&(ep->tterm))
+			&& VALID_NUMERIC(ep->tterm.Numbers[idx])) {
+			value = ep->tterm.Numbers[idx];
+			break;
+		    }
 
-	    if (value != entries[0].tterm.Numbers[idx])
-		return (value != ABSENT_NUMERIC);
-	    else
-		return (FAIL);
+		if (value != entries[0].tterm.Numbers[idx])
+		    return (value != ABSENT_NUMERIC);
+	    }
+	    return (FAIL);
 	}
 
     case STRING:
@@ -252,18 +257,20 @@ use_predicate(unsigned type, PredIdx idx)
 	     * capability gets the first non-default value found
 	     * in the sequence of use entries'.
 	     */
-	    for (ep = &entries[1]; ep < entries + termcount; ep++)
-		if (ep->tterm.Strings[idx]) {
-		    usestr = ep->tterm.Strings[idx];
-		    break;
-		}
+	    if (idx < NUM_STRINGS(&(entries[0].tterm))) {
+		for (ep = &entries[1]; ep < entries + termcount; ep++)
+		    if (idx < NUM_STRINGS(&(ep->tterm))
+			&& ep->tterm.Strings[idx]) {
+			usestr = ep->tterm.Strings[idx];
+			break;
+		    }
 
-	    if (usestr == ABSENT_STRING && termstr == ABSENT_STRING)
-		return (FAIL);
-	    else if (!usestr || !termstr || capcmp(idx, usestr, termstr))
-		return (TRUE);
-	    else
-		return (FAIL);
+		if (usestr == ABSENT_STRING && termstr == ABSENT_STRING)
+		    return (FAIL);
+		else if (!usestr || !termstr || capcmp(idx, usestr, termstr))
+		    return (TRUE);
+	    }
+	    return (FAIL);
 	}
     }
 
diff --git a/test/demo_forms.c b/test/demo_forms.c
index 61c4cc720..62e8c644e 100644
--- a/test/demo_forms.c
+++ b/test/demo_forms.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_forms.c,v 1.62 2023/05/27 20:13:10 tom Exp $
+ * $Id: demo_forms.c,v 1.63 2023/11/11 00:29:53 tom Exp $
  *
  * Demonstrate a variety of functions from the form library.
  * Thomas Dickey - 2003/4/26
@@ -154,7 +154,7 @@ make_label(const char *label, int frow, int fcol)
 
     if (f) {
 	set_field_buffer(f, 0, label);
-	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
+	set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE));
     }
     return (f);
 }
diff --git a/test/dump_window.c b/test/dump_window.c
index 14a8c9fa2..eed4dbcbd 100644
--- a/test/dump_window.c
+++ b/test/dump_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2023 Thomas E. Dickey                                *
  *                                                                          *
  * 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: dump_window.c,v 1.4 2020/02/02 23:34:34 tom Exp $
+ * $Id: dump_window.c,v 1.5 2023/11/11 00:30:50 tom Exp $
  */
 #include <dump_window.h>
 
@@ -97,7 +97,7 @@ dump_window(WINDOW *w)
 			char aa;
 			char pp;
 
-			temp = ((data & A_ATTRIBUTES) & (~A_COLOR));
+			temp = ((data & A_ATTRIBUTES) & (chtype) (~A_COLOR));
 			if (temp) {
 			    if (temp & A_ALTCHARSET) {
 				aa = (temp & A_BOLD) ? 'A' : 'a';
diff --git a/test/dup_field.c b/test/dup_field.c
index 3e0b76930..68198ed75 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  *                                                                          *
  * 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: dup_field.c,v 1.7 2022/12/10 23:31:31 tom Exp $
+ * $Id: dup_field.c,v 1.8 2023/11/11 00:29:10 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -116,7 +116,7 @@ make_label(const char *label, int frow, int fcol)
 
     if (f) {
 	set_field_buffer(f, 0, label);
-	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
+	set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE));
     }
     return (f);
 }
diff --git a/test/list_keys.c b/test/list_keys.c
index 96b02e14f..b616919f4 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.32 2023/06/24 13:57:11 tom Exp $
+ * $Id: list_keys.c,v 1.33 2023/11/11 00:35:05 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -52,7 +52,10 @@
 static bool f_opt = FALSE;
 static bool m_opt = FALSE;
 static bool t_opt = FALSE;
+
+#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES
 static bool x_opt = FALSE;
+#endif
 
 typedef enum {
     ktCursor
@@ -471,7 +474,7 @@ main(int argc, char *argv[])
 	case 't':
 	    t_opt = TRUE;
 	    break;
-#ifdef NCURSES_VERSION
+#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES
 	case 'x':
 	    x_opt = TRUE;
 	    break;
diff --git a/test/modules b/test/modules
index 7e3fcc221..fb97d027e 100644
--- a/test/modules
+++ b/test/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.78 2022/08/13 20:53:43 tom Exp $
+# $Id: modules,v 1.79 2023/11/10 11:48:20 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -102,6 +102,7 @@ test_addstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
 test_addwstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
 test_arrays	progs		$(srcdir)	$(HEADER_DEPS)
 test_delwin	progs		$(srcdir)	$(HEADER_DEPS)
+test_endwin	progs		$(srcdir)	$(HEADER_DEPS)
 test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)
 test_getstr	progs		$(srcdir)	$(HEADER_DEPS)
 test_instr	progs		$(srcdir)	$(HEADER_DEPS)
diff --git a/test/move_field.c b/test/move_field.c
index e337319ed..84bac3f4b 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2023 Thomas E. Dickey                                *
  *                                                                          *
  * 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: move_field.c,v 1.14 2022/12/10 23:31:31 tom Exp $
+ * $Id: move_field.c,v 1.15 2023/11/11 00:28:19 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -116,7 +116,7 @@ make_label(const char *label, int frow, int fcol)
 
     if (f) {
 	set_field_buffer(f, 0, label);
-	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
+	set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE));
     }
     return (f);
 }
diff --git a/test/ncurses.c b/test/ncurses.c
index a402c4c51..a272d1423 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.535 2023/05/27 20:13:10 tom Exp $
+$Id: ncurses.c,v 1.538 2023/11/11 01:23:59 tom Exp $
 
 ***************************************************************************/
 
@@ -3157,7 +3157,7 @@ color_edit(bool recur GCC_UNUSED)
  *
  ****************************************************************************/
 static bool
-cycle_attr(int ch, unsigned *at_code, chtype *attr, ATTR_TBL * list, unsigned limit)
+cycle_attr(int ch, unsigned *at_code, attr_t *attr, ATTR_TBL * list, unsigned limit)
 {
     bool result = TRUE;
 
@@ -3318,7 +3318,7 @@ slk_test(bool recur GCC_UNUSED)
     int c, fmt = 1;
     char buf[9];
     char *s;
-    chtype attr = A_NORMAL;
+    attr_t attr = A_NORMAL;
     unsigned at_code = 0;
 #if HAVE_SLK_COLOR
     int fg = COLOR_BLACK;
@@ -3408,7 +3408,7 @@ slk_test(bool recur GCC_UNUSED)
 
 	default:
 	    if (cycle_attr(c, &at_code, &attr, my_list, my_size)) {
-		slk_attrset(attr);
+		slk_attrset((chtype) attr);
 		slk_touch();
 		slk_noutrefresh();
 		break;
@@ -3824,7 +3824,7 @@ acs_test(bool recur GCC_UNUSED)
     const char *pch_kludge = ((term != 0 && strstr(term, "linux"))
 			      ? "p=PC, "
 			      : "");
-    chtype attr = A_NORMAL;
+    attr_t attr = A_NORMAL;
     int digit = 0;
     int repeat = 1;
     int fg = COLOR_BLACK;
@@ -6369,7 +6369,7 @@ make_label(int frow, int fcol, NCURSES_CONST char *label)
 
     if (f) {
 	set_field_buffer(f, 0, label);
-	set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
+	set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE));
     }
     return (f);
 }
diff --git a/test/programs b/test/programs
index 191a16dca..4e7e7f43e 100644
--- a/test/programs
+++ b/test/programs
@@ -1,4 +1,4 @@
-# $Id: programs,v 1.55 2022/08/13 23:37:10 tom Exp $
+# $Id: programs,v 1.56 2023/11/10 11:48:38 tom Exp $
 ##############################################################################
 # Copyright 2018-2021,2022 Thomas E. Dickey                                  #
 # Copyright 2006-2016,2017 Free Software Foundation, Inc.                    #
@@ -97,6 +97,7 @@ test_addstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_addstr
 test_addwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_addwstr
 test_arrays	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	test_arrays
 test_delwin	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_delwin
+test_endwin	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_endwin
 test_get_wstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_get_wstr popup_msg
 test_getstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_getstr popup_msg
 test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr
diff --git a/test/test.priv.h b/test/test.priv.h
index 555c8425b..7b18557d2 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.216 2023/04/23 23:38:22 tom Exp $ */
+/* $Id: test.priv.h,v 1.217 2023/11/11 00:23:26 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -765,11 +765,11 @@ extern int optind;
 #define VERSION_COMMON() \
 static char *version_common(char **argv) { \
 	char *base = argv[0]; \
-	char *leaf = strrchr(base, '/'); \
+	char *part = strrchr(base, '/'); \
 	char *result = malloc(strlen(base) + 80); \
 	if (result != NULL) { \
-	    if (leaf++ == NULL) leaf = base; \
-	    sprintf(result, "%.20s: ", leaf); \
+	    if (part++ == NULL) part = base; \
+	    sprintf(result, "%.20s: ", part); \
 	    format_version(result + strlen(result)); \
 	} \
 	return result; \
diff --git a/test/test_endwin.c b/test/test_endwin.c
new file mode 100644
index 000000000..8e0d283cd
--- /dev/null
+++ b/test/test_endwin.c
@@ -0,0 +1,132 @@
+/****************************************************************************
+ * Copyright 2023 Thomas E. Dickey                                          *
+ *                                                                          *
+ * 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: test_endwin.c,v 1.2 2023/11/10 15:17:19 tom Exp $
+ */
+#include <test.priv.h>
+
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_endwin [options]"
+	,""
+	,"Options:"
+	," -e   call endwin() an extra time"
+	," -i   call initscr() before endwin()"
+	," -n   call newterm() before endwin()"
+	," -r   call refresh() before endwin()"
+	," -s   call getch() after endwin(), to refresh screen"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
+#define status(opt,name,rc) if (opt) printf(" %s: %s", name, (rc) == OK ? "OK" : "ERR")
+
+int
+main(int argc, char *argv[])
+{
+    int ch;
+    int rc_r = OK;
+    int rc_e1 = OK;
+    int rc_e2 = OK;
+    int rc_e3 = OK;
+    SCREEN *sp = NULL;
+    bool opt_e = FALSE;
+    bool opt_i = FALSE;
+    bool opt_n = FALSE;
+    bool opt_r = FALSE;
+    bool opt_s = FALSE;
+
+    while ((ch = getopt(argc, argv, "einrs" OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case 'e':
+	    opt_e = TRUE;
+	    break;
+	case 'i':
+	    opt_i = TRUE;
+	    break;
+	case 'n':
+	    opt_n = TRUE;
+	    break;
+	case 'r':
+	    opt_r = TRUE;
+	    break;
+	case 's':
+	    opt_s = TRUE;
+	    break;
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+    if (opt_i && opt_n)
+	usage(TRUE);
+
+    if (opt_i) {
+	initscr();
+    } else if (opt_n) {
+	sp = newterm(NULL, stdout, stdin);
+    }
+    if (opt_r) {
+	rc_r = refresh();
+    }
+    rc_e1 = endwin();
+    if (opt_e) {
+	rc_e2 = endwin();
+    }
+    if (opt_s) {
+	getch();
+	rc_e3 = endwin();
+    }
+    printf("status:");
+    status(opt_i, "initscr(-i)", OK);
+    status(opt_n, "newterm(-n)", (sp != NULL) ? OK : ERR);
+    status(opt_r, "refresh(-r)", rc_r);
+    status(TRUE, "endwin", rc_e1);
+    status(opt_e, "endwin(-e)", rc_e2);
+    status(opt_s, "endwin(-s)", rc_e3);
+    printf("\n");
+    ExitProgram(EXIT_SUCCESS);
+}
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 1c4e0d4c2..50289defd 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.37 2023/04/28 23:12:00 tom Exp $
+ * $Id: test_tparm.c,v 1.39 2023/11/11 01:00:03 tom Exp $
  *
  * Exercise tparm/tiparm, either for all possible capabilities with fixed
  * parameters, or one capability with specific combinations of parameters.
@@ -69,11 +69,17 @@ failed(const char *msg)
 #if HAVE_TIGETSTR
 
 static int a_opt;
-static int i_opt;
 static int p_opt;
-static int s_opt;
 static int v_opt;
 
+#if HAVE_TIPARM
+static int i_opt;
+#endif
+
+#if HAVE_TIPARM_S
+static int s_opt;
+#endif
+
 /*
  * Total tests (and failures):
  */
@@ -605,6 +611,8 @@ main(int argc, char *argv[])
 		    all_caps[len_caps++] = strdup(ExtStrname(term, (int) n, strnames));
 		}
 	    }
+#else
+	    (void) std_caps;
 #endif
 
 	    /*

From fdf7c070b789174cd089e346897852734c5597cb Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 19 Nov 2023 02:11:57 +0100
Subject: [PATCH 040/106] ncurses-6.4-20231118.patch

---
 NEWS                                 | 13 ++++-
 VERSION                              |  2 +-
 dist.mk                              |  4 +-
 doc/html/man/curs_add_wchstr.3x.html | 45 ++++++++++--------
 doc/html/man/curs_addchstr.3x.html   | 37 ++++++++-------
 doc/html/man/curs_addstr.3x.html     | 21 +++-----
 doc/html/man/curs_addwstr.3x.html    | 11 +++--
 doc/html/man/curs_in_wch.3x.html     | 11 +++--
 doc/html/man/curs_in_wchstr.3x.html  | 43 +++++++++++------
 doc/html/man/curs_inchstr.3x.html    | 56 ++++++++++++----------
 doc/html/man/curs_ins_wstr.3x.html   | 71 +++++++++++++++++-----------
 doc/html/man/curs_insstr.3x.html     | 66 +++++++++++++++-----------
 doc/html/man/curs_instr.3x.html      | 39 +++++++++------
 doc/html/man/curs_inwstr.3x.html     | 48 ++++++++++++-------
 doc/html/man/ncurses.3x.html         |  2 +-
 doc/html/man/terminfo.5.html         |  2 +-
 man/curs_add_wchstr.3x               | 22 +++++----
 man/curs_addchstr.3x                 | 21 ++++----
 man/curs_addstr.3x                   | 21 +++-----
 man/curs_addwstr.3x                  |  9 ++--
 man/curs_in_wch.3x                   |  9 ++--
 man/curs_in_wchstr.3x                | 59 +++++++++++++----------
 man/curs_inchstr.3x                  | 45 +++++++++++++-----
 man/curs_ins_wstr.3x                 | 61 +++++++++++++++---------
 man/curs_insstr.3x                   | 52 +++++++++++++-------
 man/curs_instr.3x                    | 47 +++++++++++++-----
 man/curs_inwstr.3x                   | 57 +++++++++++++++++-----
 man/manhtml.aliases                  |  5 +-
 ncurses/base/lib_addstr.c            | 26 +++++-----
 ncurses/base/lib_insnstr.c           | 10 ++--
 ncurses/widechar/lib_ins_wch.c       | 15 ++++--
 package/debian-mingw/changelog       |  4 +-
 package/debian-mingw64/changelog     |  4 +-
 package/debian/changelog             |  4 +-
 package/mingw-ncurses.nsi            |  4 +-
 package/mingw-ncurses.spec           |  2 +-
 package/ncurses.spec                 |  2 +-
 package/ncursest.spec                |  2 +-
 38 files changed, 581 insertions(+), 371 deletions(-)

diff --git a/NEWS b/NEWS
index 012df958d..c8c404117 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4031 2023/11/11 23:13:58 tom Exp $
+-- $Id: NEWS,v 1.4033 2023/11/19 00:46:27 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,17 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231118
+	+ improve description of length-parameter and error-returns in several
+	  manpages:  curs_addchstr.3x, curs_addstr.3x, curs_addwstr.3x,
+	  curs_in_wch.3x, curs_in_wchstr.3x, curs_inchstr.3x, curs_ins_wstr.3x,
+	  curs_insstr.3x, curs_instr.3x, curs_inwstr.3x
+	+ amend parameter check for entire string versus specific length in
+	  winsnstr() and wins_nwstr() to match Solaris.
+	+ make similar correction to wins_nwstr().
+	+ correct loop termination condition in waddnstr() and waddnwstr()
+	  (Debian #1055882, cf: 20201205).
+
 20231111
 	+ used "infocmp -u" to help trim redundant capabilities -TD
 	+ add limit checks in infocmp needed when processing extended
diff --git a/VERSION b/VERSION
index 5809d11d0..5be4535cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231111
+5:0:10	6.4	20231118
diff --git a/dist.mk b/dist.mk
index af5ebc7a5..d9f527679 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1576 2023/11/11 10:45:00 tom Exp $
+# $Id: dist.mk,v 1.1577 2023/11/18 10:46:15 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231111
+NCURSES_PATCH = 20231118
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 93978f7d2..b26572a47 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.30 2023/11/18 21:18:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -69,37 +69,42 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These  functions copy the (null-terminated) array of complex characters
        <EM>wchstr</EM> into the window image structure starting at the  current  cursor
-       position.   The four functions with <EM>n</EM> as the last argument copy at most
-       <EM>n</EM> elements, but no more than will fit on the line.  If  <STRONG>n</STRONG>=<STRONG>-1</STRONG>  then  the
-       whole  array  is  copied, to the maximum number of characters that will
-       fit on the line.
+       position.
 
-       The window cursor is <EM>not</EM> advanced.  These functions  work  faster  than
+       The four functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,
+       but no more than will fit on the line.  If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
+       copied, to the maximum number of characters that will fit on the line.
+
+       The  window  cursor  is  <EM>not</EM> advanced.  These functions are faster than
        <STRONG>waddnstr</STRONG>.  On the other hand:
 
-       <STRONG>o</STRONG>   they  do  not perform checking (such as for the newline, backspace,
+       <STRONG>o</STRONG>   they do not perform checking (such as for the  newline,  backspace,
            or carriage return characters),
 
        <STRONG>o</STRONG>   they do not advance the current cursor position,
 
        <STRONG>o</STRONG>   they do not expand other control characters to ^-escapes, and
 
-       <STRONG>o</STRONG>   they truncate the string if it crosses  the  right  margin,  rather
+       <STRONG>o</STRONG>   they  truncate  the  string  if it crosses the right margin, rather
            than wrapping it around to the new line.
 
-       These  functions  end  successfully  on encountering a null <STRONG>cchar_t</STRONG>, or
-       when they have filled the current line.  If a complex character  cannot
-       completely  fit  at  the end of the current line, the remaining columns
+       These functions end successfully on encountering  a  null  <STRONG>cchar_t</STRONG>,  or
+       when  they have filled the current line.  If a complex character cannot
+       completely fit at the end of the current line,  the  remaining  columns
        are filled with the background character and rendition.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error if the window pointer is null.
+       X/Open  does  not  define  any  error  conditions.  This implementation
+       returns an error
+
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
+
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -113,14 +118,12 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
-
-       Comparable  functions  in  the  narrow-character  (ncurses) library are
-       described in <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index d1b8b8af4..35908da89 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.34 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.36 2023/11/18 21:18:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -67,32 +67,37 @@ <H1 class="no-header">curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These functions copy the (null-terminated) <EM>chstr</EM> array into the  window
-       image  structure  starting  at  the  current cursor position.  The four
-       functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,  but  no
-       more  than  will  fit  on  the  line.   If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
+       image structure starting at the current cursor position.
+
+       The four functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,
+       but no more than will fit on the line.  If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
        copied, to the maximum number of characters that will fit on the line.
 
-       The window cursor is <EM>not</EM> advanced.  These functions  work  faster  than
+       The  window  cursor  is  <EM>not</EM> advanced.  These functions are faster than
        <STRONG>waddnstr</STRONG>.  On the other hand:
 
-       <STRONG>o</STRONG>   they  do  not perform checking (such as for the newline, backspace,
+       <STRONG>o</STRONG>   they do not perform checking (such as for the  newline,  backspace,
            or carriage return characters),
 
        <STRONG>o</STRONG>   they do not advance the current cursor position,
 
        <STRONG>o</STRONG>   they do not expand other control characters to ^-escapes, and
 
-       <STRONG>o</STRONG>   they truncate the string if it crosses  the  right  margin,  rather
+       <STRONG>o</STRONG>   they  truncate  the  string  if it crosses the right margin, rather
            than wrapping it around to the new line.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
-       returns an error if the window pointer is null.
+       X/Open does not  define  any  error  conditions.   This  implementation
+       returns an error
+
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
+
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -106,14 +111,12 @@ <H1 class="no-header">curs_addchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
-
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 9760bcdd0..285ebbb0a 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_addstr.3x,v 1.37 2023/11/18 21:18:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -93,15 +93,7 @@ <H1 class="no-header">curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the  window  pointer is null.  If an error is returned by the <STRONG>wmove</STRONG>, no
-       characters are added to the window.
-
-       If an error is returned by <STRONG>waddch</STRONG> (e.g.,  because  the  window  is  not
-       large  enough,  or  an illegal byte sequence was detected) only part of
-       the string may be added.  Aside from that, there is a special  case  in
-       <STRONG>waddch</STRONG>  where  an  error  may  be returned after successfully writing a
-       character to the lower-right corner of a window  when  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is
-       disabled.
+       the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -113,11 +105,12 @@ <H1 class="no-header">curs_addstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,   <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 94c9469a3..4f4805c7c 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.29 2023/11/18 21:18:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -112,11 +112,12 @@ <H1 class="no-header">curs_addwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index c9b6b7f40..dde1ae01a 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.24 2023/11/18 18:00:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -87,11 +87,12 @@ <H1 class="no-header">curs_in_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 0a4804fa1..099d6d5e9 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.28 2023/11/11 11:42:45 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.32 2023/11/18 20:55:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -71,28 +71,41 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</H1
        starting  at  the  current  cursor  position  in  the   named   window.
        Attributes (rendition) are stored with the characters.
 
-       The  <STRONG>in_wchnstr</STRONG>,  <STRONG>mvin_wchnstr</STRONG>,  <STRONG>mvwin_wchnstr</STRONG> and <STRONG>win_wchnstr</STRONG> fill the
-       array with at most <EM>n</EM> <STRONG>cchar_t</STRONG> elements.
+       The  four  functions  with  <EM>n</EM>  as  the  last  argument return a leading
+       substring at most <EM>n</EM> characters long (exclusive of the  trailing  zeroed
+       <STRONG>cchar_t</STRONG>.   Transfer  stops  at  the  end of the current line, or when <EM>n</EM>
+       characters have been stored at the location referenced by <EM>wchstr</EM>.
 
-
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all routines except <STRONG>win_wchnstr</STRONG> may be macros.
-
-       Reading a line that overflows the  array  pointed  to  by  <EM>wchstr</EM>  with
-       <STRONG>in_wchstr</STRONG>,  <STRONG>mvin_wchstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG> causes undefined
-       results.    Therefore,   the   use   of    <STRONG>in_wchnstr</STRONG>,    <STRONG>mvin_wchnstr</STRONG>,
-       <STRONG>mvwin_wchnstr</STRONG>, or <STRONG>win_wchnstr</STRONG> is recommended.
+       Constants defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the  <STRONG>&amp;</STRONG>  (logical  AND)
+       operator  to  extract  the  character  or  the attribute alone from any
+       position in the <EM>wchstr</EM> [see <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>].
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Upon successful completion, these functions return <STRONG>OK</STRONG>.  Otherwise, they
        return <STRONG>ERR</STRONG>.
 
+       X/Open Curses defines no error conditions.  This implementation returns
+       an error
+
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+
+       <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
+
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       All routines except <STRONG>win_wchnstr</STRONG> may be macros.
+
+       Reading a line that overflows the  array  pointed  to  by  <EM>wchstr</EM>  with
+       <STRONG>in_wchstr</STRONG>,  <STRONG>mvin_wchstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG> causes undefined
+       results.    Therefore,   the   use   of    <STRONG>in_wchnstr</STRONG>,    <STRONG>mvin_wchnstr</STRONG>,
+       <STRONG>mvwin_wchnstr</STRONG>, or <STRONG>win_wchnstr</STRONG> is recommended.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The XSI Curses defines no error conditions.  This implementation checks
        for null pointers, returning <STRONG>ERR</STRONG> in that case.
@@ -104,15 +117,15 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-11-11 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-11                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 2c58bdad9..93ed74bb7 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.40 2023/11/19 00:08:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -68,12 +68,16 @@ <H1 class="no-header">curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines return a NULL-terminated  array  of  <STRONG>chtype</STRONG>  quantities,
        starting  at the current cursor position in the named window and ending
-       at the right margin of the window.  The four functions with  <EM>n</EM>  as  the
-       last  argument,  return  a  leading substring at most <EM>n</EM> characters long
-       (exclusive of the trailing (chtype)0).  Constants defined in <STRONG>&lt;curses.h&gt;</STRONG>
-       can  be used with the <STRONG>&amp;</STRONG> (logical AND) operator to extract the character
-       or  the  attribute  alone  from  any  position  in   the   <EM>chstr</EM>   [see
-       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>].
+       at the right margin of the window.
+
+       The four functions with <EM>n</EM>  as  the  last  argument,  return  a  leading
+       substring  at  most  <EM>n</EM>  characters  long  (exclusive  of  the  trailing
+       (chtype)0).  Transfer stops at the end of the current line, or  when  <EM>n</EM>
+       characters have been stored at the location referenced by <EM>chstr</EM>.
+
+       Constants  defined  in  <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical AND)
+       operator to extract the character  or  the  attribute  alone  from  any
+       position in the <EM>chstr</EM> [see <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>].
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -81,39 +85,43 @@ <H1 class="no-header">curs_inchstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        other than <STRONG>ERR</STRONG> upon successful completion  (the  number  of  characters
        retrieved, exclusive of the trailing 0).
 
-       X/Open Curses defines no error conditions.  In this implementation:
+       X/Open Curses defines no error conditions.  This implementation returns
+       an error
 
-       <STRONG>o</STRONG>   If the <EM>win</EM> parameter is null, an error is returned,
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
-       <STRONG>o</STRONG>   If the <EM>chstr</EM> parameter is null, an error is returned,
+       <STRONG>o</STRONG>   if the <EM>chstr</EM> parameter is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that  all routines except <STRONG>winchnstr</STRONG> may be macros.  SVr4 does not
-       document whether the result string  is  zero-terminated;  it  does  not
-       document  whether  a length limit argument includes any trailing 0; and
-       it does not document the meaning of the return value.
+       All routines except <STRONG>winchnstr</STRONG> may be macros.
+
+       SVr4 does not document whether the result string is zero-terminated; it
+       does not document whether a length limit argument includes any trailing
+       0; and it does not document the meaning of the return value.
+
+       Reading a line that overflows  the  array  pointed  to  by  <EM>chstr</EM>  with
+       <STRONG>inchstr</STRONG>,  <STRONG>mvinchstr</STRONG>,  <STRONG>mvwinchstr</STRONG>  or <STRONG>winchstr</STRONG> causes undefined results.
+       Therefore, the use of <STRONG>inchnstr</STRONG>, <STRONG>mvinchnstr</STRONG>, <STRONG>mvwinchnstr</STRONG>,  or  <STRONG>winchnstr</STRONG>
+       is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.   It
-       is  no more specific than the SVr4 documentation on the trailing 0.  It
+       These  functions are described in the XSI Curses standard, Issue 4.  It
+       is no more specific than the SVr4 documentation on the trailing 0.   It
        does specify that the successful return of the functions is <STRONG>OK</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
-
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index c38a7c3f7..b19bcc80f 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.25 2023/11/11 11:43:21 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.27 2023/11/18 23:44:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -68,39 +68,53 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines insert a <STRONG>wchar_t</STRONG> character string (as many characters as
-       will fit on the line) before  the  character  under  the  cursor.   All
-       characters  to  the  right  of  the  cursor are shifted right, with the
-       possibility of the rightmost characters on the  line  being  lost.   No
-       wrapping  is  performed.   The  cursor  position does not change (after
-       moving to <EM>y</EM>, <EM>x</EM>, if specified).  The four routines with <EM>n</EM>  as  the  last
-       argument  insert  a  leading substring of at most <EM>n</EM> <STRONG>wchar_t</STRONG> characters.
-       If <EM>n</EM> is less than 1, the entire string is inserted.
-
-       If a character in <EM>wstr</EM> is a tab, newline, carriage return or backspace,
-       the  cursor  is  moved appropriately within the window.  A newline also
-       does a <STRONG>clrtoeol</STRONG> before moving.  Tabs are  considered  to  be  at  every
-       eighth column.  If a character in <EM>wstr</EM> is another control character, it
-       is drawn in the <STRONG>^</STRONG><EM>X</EM> notation.  Calling <STRONG>win_wch</STRONG> after  adding  a  control
-       character  (and moving to it, if necessary) does not return the control
-       character, but instead returns a character in the  ^-representation  of
-       the control character.
+       will fit on the line) before the character  under  the  cursor,  as  if
+       calling  <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG>.   All  characters to the right of the cursor are
+       shifted right, with the possibility of the rightmost characters on  the
+       line being lost.  No wrapping is performed.
+
+       The  cursor  position  does  not  change  (after  moving  to  <EM>y</EM>,  <EM>x</EM>, if
+       specified).
+
+       The functions with <EM>n</EM> as the last argument insert a leading substring of
+       at  most  <EM>n</EM>  <STRONG>wchar_t</STRONG>  characters.   If  <EM>n</EM> is less than zero, the entire
+       string is inserted (stopping on a L'\0' character).
+
+       Special characters are handled as in <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+
+
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+
+       X/Open does not  define  any  error  conditions.   This  implementation
+       returns an error
+
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+
+       <STRONG>o</STRONG>   if the <EM>wstr</EM> parameter is null or
+
+       <STRONG>o</STRONG>   if the <STRONG>wins_wch</STRONG> function returns an error.
+
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>, and return an error if the position is outside  the  window,
+       or if the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all but wins_nwstr may be macros.
+       All but <STRONG>wins_nwstr</STRONG> may be macros.
 
        If  the  first character in the string is a nonspacing character, these
        functions will fail.  XSI  does  not  define  what  will  happen  if  a
        nonspacing character follows a control character.
 
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Upon successful completion, these functions return <STRONG>OK</STRONG>.  Otherwise, they
-       return <STRONG>ERR</STRONG>.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These  functions  are  described  in  the XSI Curses standard, Issue 4,
+       which adds const qualifiers to the arguments.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       X/Open states that the entire string is inserted if <EM>n</EM> is less  than  1.
+       This  is  probably  an  error,  because  it  is inconsistent with other
+       functions, and differs from the X/Open implementation on Solaris.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -108,15 +122,16 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index bd93c58c3..6ed135c6a 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.42 2023/11/11 11:46:07 tom Exp @
+  * @Id: curs_insstr.3x,v 1.44 2023/11/18 23:46:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -66,51 +66,63 @@ <H1 class="no-header">curs_insstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines insert a character string (as many  characters  as  will
-       fit on the line) before the character under the cursor.  All characters
-       to the right of the cursor are shifted right with  the  possibility  of
-       the  rightmost  characters on the line being lost.  The cursor position
-       does not change (after moving to <EM>y</EM>, <EM>x</EM>, if  specified).   The  functions
-       with  <EM>n</EM>  as  the  last argument insert a leading substring of at most <EM>n</EM>
-       characters.  If <EM>n</EM>&lt;=0, then the entire string is inserted.
+       fit  on  the line) before the character under the cursor, as if calling
+       <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG>.  All characters to the right  of  the  cursor  are  shifted
+       right,  with  the  possibility  of the rightmost characters on the line
+       being lost.  No wrapping is performed.
 
-       Special characters are handled as in <STRONG>addch</STRONG>.
+       The cursor  position  does  not  change  (after  moving  to  <EM>y</EM>,  <EM>x</EM>,  if
+       specified).
+
+       The functions with <EM>n</EM> as the last argument insert a leading substring of
+       at most <EM>n</EM> characters.  If <EM>n</EM> is less than zero,  the  entire  string  is
+       inserted (stopping on a NUL character).
+
+       Special characters are handled as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines that return an integer return  <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>
-       (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+
+       X/Open  does  not  define  any  error  conditions.  This implementation
+       returns an error
 
-       X/Open  defines  no  error  conditions.  In this implementation, if the
-       window parameter is null or the str parameter  is  null,  an  error  is
-       returned.
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       <STRONG>o</STRONG>   if the <EM>str</EM> parameter is null or
+
+       <STRONG>o</STRONG>   the <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> function returns an error.
+
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>,  and  return an error if the position is outside the window,
+       or if the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all but <STRONG>winsnstr</STRONG> may be macros.
+       All but <STRONG>winsnstr</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in  the XSI Curses standard, Issue 4,
+       These functions are described in the  XSI  Curses  standard,  Issue  4,
        which adds const qualifiers to the arguments.
 
-       The Single Unix  Specification,  Version  2  states  that  <STRONG>insnstr</STRONG>  and
-       <STRONG>winsnstr</STRONG>  perform  wrapping.  This is probably an error, since it makes
-       this group of  functions  inconsistent.   Also,  no  implementation  of
+       The  Single  Unix  Specification,  Version  2  states  that <STRONG>insnstr</STRONG> and
+       <STRONG>winsnstr</STRONG> perform wrapping.  This is probably an error, since  it  makes
+       this  group  of  functions  inconsistent.   Also,  no implementation of
        curses documents this inconsistency.
 
+       X/Open states that the entire string is inserted if <EM>n</EM> is less  than  1.
+       This  is  probably  an  error,  because  it  is inconsistent with other
+       functions, and differs from the  SVr4  and  X/Open  implementations  on
+       Solaris.
+
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-11                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 72119d6dc..5c0951b4d 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.36 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_instr.3x,v 1.41 2023/11/19 00:20:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -66,22 +66,26 @@ <H1 class="no-header">curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines return a string of characters in <EM>str</EM>, extracted starting
-       at  the  current  cursor  position in the named window.  Attributes are
-       stripped from the characters.  The four functions with <EM>n</EM>  as  the  last
-       argument   return  a  leading  substring  at  most  <EM>n</EM>  characters  long
-       (exclusive of the trailing NUL).
+       These routines return a string of characters in <EM>str</EM>,  starting  at  the
+       current  cursor  position in the named window.  Attributes are stripped
+       from the characters.
+
+       The four functions with  <EM>n</EM>  as  the  last  argument  return  a  leading
+       substring  at  most  <EM>n</EM> characters long (exclusive of the trailing NUL).
+       Transfer stops at the end of the current line,  or  when  <EM>n</EM>  characters
+       have been stored at the location referenced by <EM>str</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All of the  functions  return  <STRONG>ERR</STRONG>  upon  failure,  or  the  number  of
+       All  of  the  functions  return  <STRONG>ERR</STRONG>  upon  failure,  or  the number of
        characters actually read into the string.
 
-       X/Open Curses defines no error conditions.  In this implementation:
+       X/Open Curses defines no error conditions.  This implementation returns
+       an error
 
-       <STRONG>o</STRONG>   If the <EM>win</EM> parameter is null, an error is returned,
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
-       <STRONG>o</STRONG>   If the <EM>chstr</EM> parameter is null, an error is returned,
+       <STRONG>o</STRONG>   if the <EM>chstr</EM> parameter is null.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -89,7 +93,11 @@ <H1 class="no-header">curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all routines except <STRONG>winnstr</STRONG> may be macros.
+       All routines except <STRONG>winnstr</STRONG> may be macros.
+
+       Reading  a  line that overflows the array pointed to by <EM>str</EM> with <STRONG>instr</STRONG>,
+       <STRONG>mvinstr</STRONG>, <STRONG>mvwinstr</STRONG> or <STRONG>winstr</STRONG> causes undefined results.   Therefore,  the
+       use of <STRONG>innstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinnstr</STRONG>, or <STRONG>winnstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -102,11 +110,12 @@ <H1 class="no-header">curs_instr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 0d4dc7829..9022fb975 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.33 2023/11/19 00:10:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -67,7 +67,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines return a string of  <STRONG>wchar_t</STRONG>  wide  characters  in  <EM>wstr</EM>,
-       extracted starting at the current cursor position in the named window.
+       starting at the current cursor position in the named window.
 
        The  four  functions  with  <EM>n</EM>  as  the  last  argument return a leading
        substring at most <EM>n</EM> characters long (exclusive of  the  trailing  NUL).
@@ -78,39 +78,53 @@ <H1 class="no-header">curs_inwstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        character, an error is generated.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All routines except <STRONG>winnwstr</STRONG> may be macros.
-
-       Each  cell  in  the  window  holds a complex character (i.e., base- and
-       combining-characters)  together  with  attributes  and  color.    These
-       functions  store  only  the  wide  characters,  ignoring attributes and
-       color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters from a window.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return <STRONG>ERR</STRONG> upon failure.  Upon successful completion,  the
+       All  routines return <STRONG>ERR</STRONG> upon failure.  Upon successful completion, the
        *<STRONG>inwstr</STRONG> routines return <STRONG>OK</STRONG>, and the *<STRONG>innwstr</STRONG> routines return the number
        of characters read into the string.
 
+       X/Open  defines  no  error  conditions.  This implementation returns an
+       error
+
+       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+
+       <STRONG>o</STRONG>   if the <EM>wstr</EM> parameter is null, or
+
+       <STRONG>o</STRONG>   if no characters could be read.
+
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       All routines except <STRONG>winnwstr</STRONG> may be macros.
+
+       Each cell in the window holds a  complex  character  (i.e.,  base-  and
+       combining-characters)   together  with  attributes  and  color.   These
+       functions store only  the  wide  characters,  ignoring  attributes  and
+       color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters from a window.
+
+       Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
+       <STRONG>mvinwstr</STRONG>, <STRONG>mvwinwstr</STRONG> or <STRONG>winwstr</STRONG> causes  undefined  results.   Therefore,
+       the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index f0124e57d..e401bdc0a 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231111).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231118).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 859a54554..4424ac030 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231111).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231118).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 3c2dbedff..c0fab61ea 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH curs_add_wchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.30 2023/11/18 21:18:55 tom Exp $
+.TH curs_add_wchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -73,6 +73,7 @@ These functions copy the (null-terminated)
 array of complex characters \fIwchstr\fP
 into the window image structure
 starting at the current cursor position.
+.PP
 The four functions with \fIn\fP as the last
 argument copy at most \fIn\fP elements,
 but no more than will fit on the line.
@@ -80,7 +81,7 @@ If \fBn\fP=\fB\-1\fP then the whole array is copied,
 to the maximum number of characters that will fit on the line.
 .PP
 The window cursor is \fInot\fP advanced.
-These functions work faster than \fBwaddnstr\fP.
+These functions are faster than \fBwaddnstr\fP.
 On the other hand:
 .bP
 they do not perform checking
@@ -103,7 +104,10 @@ All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
 X/Open does not define any error conditions.
 This implementation returns an error
-if the window pointer is null.
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIwchstr\fP parameter is null.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
@@ -114,8 +118,8 @@ All functions except \fBwadd_wchnstr\fP may be macros.
 These entry points are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_addwstr\fP(3X)
-.PP
-Comparable functions in the narrow-character (ncurses) library are
-described in
-\fB\%curs_addchstr\fP(3X).
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addchstr\fP(3X),
+\fB\%curs_addstr\fP(3X),
+\fB\%curs_addwstr\fP(3X),
+\fB\%curs_add_wch\fP(3X)
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index ca285ada4..5632f6e56 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.34 2023/10/07 21:19:07 tom Exp $
-.TH curs_addchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.36 2023/11/18 21:18:55 tom Exp $
+.TH curs_addchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -73,6 +73,7 @@ These functions copy the (null-terminated)
 \fIchstr\fP array
 into the window image structure
 starting at the current cursor position.
+.PP
 The four functions with \fIn\fP as the last
 argument copy at most \fIn\fP elements,
 but no more than will fit on the line.
@@ -80,7 +81,7 @@ If \fBn\fP=\fB\-1\fP then the whole array is copied,
 to the maximum number of characters that will fit on the line.
 .PP
 The window cursor is \fInot\fP advanced.
-These functions work faster than \fBwaddnstr\fP.
+These functions are faster than \fBwaddnstr\fP.
 On the other hand:
 .bP
 they do not perform checking
@@ -97,7 +98,10 @@ All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
 X/Open does not define any error conditions.
 This implementation returns an error
-if the window pointer is null.
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIwchstr\fP parameter is null.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
@@ -108,8 +112,7 @@ All functions except \fBwaddchnstr\fP may be macros.
 These entry points are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_addstr\fP(3X)
-.PP
-Comparable functions in the wide-character (ncursesw) library are
-described in
-\fB\%curs_add_wchstr\fP(3X).
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addstr\fP(3X),
+\fB\%curs_addwstr\fP(3X),
+\fB\%curs_add_wchstr\fP(3X)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 69c4ecd6d..8db64ada9 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
-.TH curs_addstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.37 2023/11/18 21:18:55 tom Exp $
+.TH curs_addstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,22 +96,13 @@ if the corresponding calls to \fBwaddch\fP return an error.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
-If an error is returned by the \fBwmove\fP,
-no characters are added to the window.
-.PP
-If an error is returned by \fBwaddch\fP
-(e.g.,
-because the window is not large enough,
-or an illegal byte sequence was detected)
-only part of the string may be added.
-Aside from that,
-there is a special case in \fBwaddch\fP where an error may be
-returned after successfully writing a character to the lower-right corner
-of a window when \fBscrollok\fP(3X) is disabled.
 .SH NOTES
 All of these functions except \fBwaddnstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X)
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addchstr\fP(3X),
+\fB\%curs_addwstr\fP(3X),
+\fB\%curs_add_wchstr\fP(3X)
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index b247d9b92..ff8240bc9 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
-.TH curs_addwstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.29 2023/11/18 21:18:55 tom Exp $
+.TH curs_addwstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,4 +111,7 @@ These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
-\fB\%curs_add_wch\fP(3X)
+\fB\%curs_addchstr\fP(3X),
+\fB\%curs_addstr\fP(3X),
+\fB\%curs_add_wch\fP(3X),
+\fB\%curs_add_wchstr\fP(3X)
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index b8ea1d827..d7af7b585 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp $
-.TH curs_in_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.24 2023/11/18 18:00:11 tom Exp $
+.TH curs_in_wch 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -75,4 +75,7 @@ Note that all of these routines may be macros.
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_inch\fP(3X)
+\fB\%curs_inch\fP(3X),
+\fB\%curs_inchstr\fP(3X),
+\fB\%curs_instr\fP(3X),
+\fB\%curs_inwstr\fP(3X)
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 91f22c142..995f4f863 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.28 2023/11/11 11:42:45 tom Exp $
-.TH curs_in_wchstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.32 2023/11/18 20:55:18 tom Exp $
+.TH curs_in_wchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%in_wchstr\fP,
 \fB\%in_wchnstr\fP,
@@ -68,22 +73,33 @@ These functions return an array of complex characters in \fIwchstr\fP,
 starting at the current cursor position in the named window.
 Attributes (rendition) are stored with the characters.
 .PP
-The
-\fBin_wchnstr\fP,
-\fBmvin_wchnstr\fP,
-\fBmvwin_wchnstr\fP
-and
-\fBwin_wchnstr\fP
-fill the array
-with at most
-\fIn\fP
-\fBcchar_t\fP
-elements.
+The four functions with \fIn\fP as the last argument return
+a leading substring at most \fIn\fP characters long
+(exclusive of the trailing zeroed \fBcchar_t\fR.
+Transfer stops at the end of the current line, or when \fIn\fP characters have
+been stored at the location referenced by \fIwchstr\fP.
+.PP
+Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP (logical
+AND) operator to extract the character or the attribute alone from any position
+in the \fIwchstr\fP [see \fBgetcchar\fP(3X)].
+.SH RETURN VALUE
+Upon successful completion, these functions return
+\fBOK\fP.
+Otherwise, they return
+\fBERR\fP.
+.PP
+X/Open Curses defines no error conditions.
+This implementation returns an error
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIwchstr\fP parameter is null.
+.PP
+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+\fBwmove\fP, and return an error if the position is outside the window,
+or if the window pointer is null.
 .SH NOTES
-Note that all routines except
-\fBwin_wchnstr\fP
-may be
-macros.
+All routines except \fBwin_wchnstr\fP may be macros.
 .PP
 Reading a line that overflows the array pointed to by
 \fIwchstr\fP
@@ -100,15 +116,6 @@ Therefore, the use of
 \fBmvwin_wchnstr\fP, or
 \fBwin_wchnstr\fP
 is recommended.
-.SH RETURN VALUE
-Upon successful completion, these functions return
-\fBOK\fP.
-Otherwise, they return
-\fBERR\fP.
-.PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
 .SH PORTABILITY
 The XSI Curses defines no error conditions.
 This implementation checks for null pointers,
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index fa263ba3d..89d4bd1e3 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
-.TH curs_inchstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.40 2023/11/19 00:08:58 tom Exp $
+.TH curs_inchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -72,9 +72,13 @@ get a \fIcurses\fR character string from a window
 These routines return a NULL-terminated array of \fBchtype\fP quantities,
 starting at the current cursor position in the named window and ending at the
 right margin of the window.
-The four functions with \fIn\fP as
-the last argument, return a leading substring at most \fIn\fP characters long
+.PP
+The four functions with \fIn\fP as the last argument, return
+a leading substring at most \fIn\fP characters long
 (exclusive of the trailing (chtype)0).
+Transfer stops at the end of the current line, or when \fIn\fP characters have
+been stored at the location referenced by \fIchstr\fP.
+.PP
 Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP (logical
 AND) operator to extract the character or the attribute alone from any position
 in the \fIchstr\fP [see \fBcurs_inch\fP(3X)].
@@ -84,21 +88,38 @@ other than \fBERR\fP upon successful completion (the number of characters
 retrieved, exclusive of the trailing 0).
 .PP
 X/Open Curses defines no error conditions.
-In this implementation:
+This implementation returns an error
 .bP
-If the \fIwin\fP parameter is null, an error is returned,
+if the \fIwin\fP parameter is null or
 .bP
-If the \fIchstr\fP parameter is null, an error is returned,
+if the \fIchstr\fP parameter is null.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH NOTES
-Note that all routines except \fBwinchnstr\fP may be macros.
+All routines except \fBwinchnstr\fP may be macros.
+.PP
 SVr4 does not
 document whether the result string is zero-terminated; it does not document
 whether a length limit argument includes any trailing 0; and it does not
 document the meaning of the return value.
+.PP
+Reading a line that overflows the array pointed to by
+\fIchstr\fP
+with
+\fBinchstr\fP,
+\fBmvinchstr\fP,
+\fBmvwinchstr\fP
+or
+\fBwinchstr\fP
+causes undefined results.
+Therefore, the use of
+\fBinchnstr\fP,
+\fBmvinchnstr\fP,
+\fBmvwinchnstr\fP, or
+\fBwinchnstr\fP
+is recommended.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 It is no
@@ -107,8 +128,6 @@ It does specify
 that the successful return of the functions is \fBOK\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_inch\fP(3X)
-.PP
-Comparable functions in the wide-character (ncursesw) library are
-described in
-\fB\%curs_in_wchstr\fP(3X).
+\fB\%curs_inch\fP(3X),
+\fB\%curs_inwstr\fP(3X),
+\fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index db27fb948..cf056dac9 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.25 2023/11/11 11:43:21 tom Exp $
-.TH curs_ins_wstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.27 2023/11/18 23:44:30 tom Exp $
+.TH curs_ins_wstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%ins_wstr\fP,
 \fB\%ins_nwstr\fP,
@@ -66,41 +71,51 @@ insert a wide-character string in a \fIcurses\fR window
 .SH DESCRIPTION
 These routines insert a \fBwchar_t\fP character string
 (as many characters as will fit on the line)
-before the character under the cursor.
+before the character under the cursor,
+as if calling \fBwins_wch\fP(3X).
 All characters to the right of the cursor are shifted right,
 with the possibility of the rightmost characters on the line being lost.
 No wrapping is performed.
+.PP
 The cursor position does not change
 (after moving to \fIy\fP, \fIx\fP, if specified).
-The four routines with \fIn\fP as the last argument
+.PP
+The functions with \fIn\fP as the last argument
 insert a leading substring of at most \fIn\fP \fBwchar_t\fP characters.
-If \fIn\fP is less than 1, the entire string is inserted.
+If \fIn\fP is less than zero, the entire string is inserted
+(stopping on a L'\e0' character).
+.PP
+Special characters are handled as in \fBwadd_wch\fP(3X).
+.SH RETURN VALUE
+All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+.PP
+X/Open does not define any error conditions.
+This implementation returns an error
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIwstr\fP parameter is null or
+.bP
+if the \fBwins_wch\fP function returns an error.
 .PP
-If a character in \fIwstr\fP is a tab, newline, carriage return or
-backspace, the cursor is moved appropriately within the window.
-A newline also does a \fBclrtoeol\fP before moving.
-Tabs are considered to be at every eighth column.
-If a character in \fIwstr\fP is another control character,
-it is drawn in the \fB^\fIX\fR notation.
-Calling \fBwin_wch\fP after adding a control character
-(and moving to it, if necessary)
-does not return the control character,
-but instead returns a character in the ^-representation
-of the control character.
+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+\fBwmove\fP(3X), and return an error if the position is outside the window,
+or if the window pointer is null.
 .SH NOTES
-Note that all but wins_nwstr may be macros.
+All but \fBwins_nwstr\fP may be macros.
 .PP
 If the first character in the string is a nonspacing character, these
 functions will fail.
 XSI does not define what will happen if a nonspacing character follows
 a control character.
-.SH RETURN VALUE
-Upon successful completion, these functions return \fBOK\fP.
-Otherwise, they return \fBERR\fP.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4, which adds
+const qualifiers to the arguments.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+This is probably an error,
+because it is inconsistent with other functions,
+and differs from the X/Open implementation on Solaris.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_insstr\fP(3X),
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index c8fc50bf2..8f03c31a3 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.42 2023/11/11 11:46:07 tom Exp $
-.TH curs_insstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.44 2023/11/18 23:46:00 tom Exp $
+.TH curs_insstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%insstr\fP,
 \fB\%insnstr\fP,
@@ -65,42 +70,53 @@ insert a string in a \fIcurses\fR window
 .SH DESCRIPTION
 These routines insert a character string
 (as many characters as will fit on the line)
-before the character under the cursor.
-All characters to the right of the cursor are shifted right
+before the character under the cursor,
+as if calling \fBwinsch\fP(3X).
+All characters to the right of the cursor are shifted right,
 with the possibility of the rightmost characters on the line being lost.
+No wrapping is performed.
+.PP
 The cursor position does not change
 (after moving to \fIy\fP, \fIx\fP, if specified).
+.PP
 The functions with \fIn\fP as the last argument
 insert a leading substring of at most \fIn\fP characters.
-If \fIn\fP<=0, then the entire string is inserted.
+If \fIn\fP is less than zero, the entire string is inserted
+(stopping on a NUL character).
 .PP
-Special characters are handled as in \fBaddch\fP.
+Special characters are handled as in \fBwaddch\fP(3X).
 .SH RETURN VALUE
-All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 specifies only "an integer value other than \fBERR\fP")
-upon successful completion,
-unless otherwise noted in the preceding routine descriptions.
+All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open defines no error conditions.
-In this implementation,
-if the window parameter is null or the str parameter is null,
-an error is returned.
+X/Open does not define any error conditions.
+This implementation returns an error
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIstr\fP parameter is null or
+.bP
+the \fBwinsch\fP(3X) function returns an error.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
+\fBwmove\fP(3X), and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH NOTES
-Note that all but \fBwinsnstr\fP may be macros.
+All but \fBwinsnstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4, which adds
 const qualifiers to the arguments.
-.LP
+.PP
 The Single Unix Specification, Version 2 states that
 \fBinsnstr\fP and \fBwinsnstr\fP perform wrapping.
 This is probably an error, since it makes this group of functions inconsistent.
 Also, no implementation of curses documents this inconsistency.
+.PP
+X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+This is probably an error,
+because it is inconsistent with other functions,
+and differs from the SVr4 and X/Open implementations on Solaris.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_clear\fP(3X),
 \fB\%curs_inch\fP(3X),
+\fB\%curs_ins_wstr\fP(3X),
 \fB\%curs_util\fP(3X)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index aa5e01574..b5646a65c 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.36 2023/10/07 21:19:07 tom Exp $
-.TH curs_instr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.41 2023/11/19 00:20:02 tom Exp $
+.TH curs_instr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,28 +69,47 @@ get a string from a \fIcurses\fR window
 \fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a string of characters in \fIstr\fP, extracted starting
-at the current cursor position in the named window.
+These routines return a string of characters in \fIstr\fP,
+starting at the current cursor position in the named window.
 Attributes are stripped from the characters.
-The four
-functions with \fIn\fP as the last argument return a leading substring at most
-\fIn\fP characters long (exclusive of the trailing NUL).
+.PP
+The four functions with \fIn\fP as the last argument return
+a leading substring at most \fIn\fP characters long
+(exclusive of the trailing NUL).
+Transfer stops at the end of the current line, or when \fIn\fP characters have
+been stored at the location referenced by \fIstr\fP.
 .SH RETURN VALUE
 All of the functions return \fBERR\fP upon failure,
 or the number of characters actually read into the string.
 .PP
 X/Open Curses defines no error conditions.
-In this implementation:
+This implementation returns an error
 .bP
-If the \fIwin\fP parameter is null, an error is returned,
+if the \fIwin\fP parameter is null or
 .bP
-If the \fIchstr\fP parameter is null, an error is returned,
+if the \fIchstr\fP parameter is null.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
 .SH NOTES
-Note that all routines except \fBwinnstr\fP may be macros.
+All routines except \fBwinnstr\fP may be macros.
+.PP
+Reading a line that overflows the array pointed to by
+\fIstr\fP
+with
+\fBinstr\fP,
+\fBmvinstr\fP,
+\fBmvwinstr\fP
+or
+\fBwinstr\fP
+causes undefined results.
+Therefore, the use of
+\fBinnstr\fP,
+\fBmvinnstr\fP,
+\fBmvwinnstr\fP, or
+\fBwinnstr\fP
+is recommended.
 .SH PORTABILITY
 SVr4 does not
 document whether a length limit includes or excludes the trailing NUL.
@@ -99,4 +118,8 @@ The ncurses library extends the XSI description by allowing a negative
 value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
-\fB\%curses\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%curs_inchstr\fP(3X),
+\fB\%curs_inch\fP(3X),
+\fB\%curs_inwstr\fP(3X),
+\fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 27843122c..8c20d8217 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH curs_inwstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.33 2023/11/19 00:10:50 tom Exp $
+.TH curs_inwstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,10 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%inwstr\fP,
 \fB\%innwstr\fP,
@@ -65,7 +69,7 @@ get a wide-character string from a \fIcurses\fR window
 .fi
 .SH DESCRIPTION
 These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
-extracted starting at the current cursor position in the named window.
+starting at the current cursor position in the named window.
 .PP
 The four functions with \fIn\fP as the last argument return
 a leading substring at most \fIn\fP characters long
@@ -75,16 +79,6 @@ been stored at the location referenced by \fIwstr\fP.
 .PP
 If the size \fIn\fP is not large enough to store a complete complex character,
 an error is generated.
-.SH NOTES
-All routines except
-\fBwinnwstr\fP
-may be macros.
-.PP
-Each cell in the window holds a complex character (i.e., base-
-and combining-characters) together with attributes and color.
-These functions store only the wide characters,
-ignoring attributes and color.
-Use \fBin_wchstr\fP to return the complex characters from a window.
 .SH RETURN VALUE
 All routines return
 \fBERR\fP
@@ -96,10 +90,47 @@ routines return
 routines return the
 number of characters read into the string.
 .PP
+X/Open defines no error conditions.
+This implementation returns an error
+.bP
+if the \fIwin\fP parameter is null or
+.bP
+if the \fIwstr\fP parameter is null, or
+.bP
+if no characters could be read.
+.PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
+.SH NOTES
+All routines except
+\fBwinnwstr\fP
+may be macros.
+.PP
+Each cell in the window holds a complex character (i.e., base-
+and combining-characters) together with attributes and color.
+These functions store only the wide characters,
+ignoring attributes and color.
+Use \fBin_wchstr\fP to return the complex characters from a window.
+.PP
+Reading a line that overflows the array pointed to by
+\fIwstr\fP
+with
+\fBinwstr\fP,
+\fBmvinwstr\fP,
+\fBmvwinwstr\fP
+or
+\fBwinwstr\fP
+causes undefined results.
+Therefore, the use of
+\fBinnwstr\fP,
+\fBmvinnwstr\fP,
+\fBmvwinnwstr\fP, or
+\fBwinnwstr\fP
+is recommended.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
+\fB\%curs_inch\fP(3X),
+\fB\%curs_inchstr\fP(3X),
 \fB\%curs_instr\fP(3X),
 \fB\%curs_in_wchstr\fP(3X)
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 2cbb67329..5bb9963df 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.27 2023/10/14 22:36:19 tom Exp $
+# $Id: manhtml.aliases,v 1.28 2023/11/19 00:14:00 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -82,6 +82,9 @@ waddch(3X)		curs_addch(3X)
 wbkgdset(3X)		curs_bkgd(3X)
 wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
+wins_wch(3X)		curs_ins_wch(3X)
+winsch(3X)		curs_insch(3X)
+wmove(3X)		curs_move(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
 wrefresh(3X)		curs_refresh(3X)
 wsetscrreg(3X)		curs_outopts(3X)
diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index ea449794b..43f329ca3 100644
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.58 2022/06/11 20:12:04 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.61 2023/11/18 23:54:19 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -55,16 +55,18 @@ waddnstr(WINDOW *win, const char *astr, int n)
 
     T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
 
-    if (win && (str != 0)) {
+    if (win && (str != 0) && (n != 0)) {
+	bool explicit = (n > 0);
+
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
 	code = OK;
 
 	TR(TRACE_VIRTPUT, ("str is not null, length = %d",
-			   ((n > 0) ? n : (int) strlen(str))));
-	if (n < 0)
+			   (explicit ? n : (int) strlen(str))));
+	if (!explicit)
 	    n = INT_MAX;
-	while ((*str != '\0') && (n-- > 0)) {
+	while ((explicit || (*str != '\0')) && (n-- > 0)) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
 	    SetChar(ch, UChar(*str++), A_NORMAL);
@@ -144,7 +146,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
        _nc_viscbuf(astr, n),
        n));
 
-    if (!win)
+    if (!win || !astr)
 	returnCode(ERR);
 
     y = win->_cury;
@@ -228,16 +230,18 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 
     T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
 
-    if (win && (str != 0)) {
+    if (win && (str != 0) && (n != 0)) {
+	bool explicit = (n > 0);
+
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
 	code = OK;
 
 	TR(TRACE_VIRTPUT, ("str is not null, length = %d",
-			   ((n > 0) ? n : (int) wcslen(str))));
-	if (n < 0)
+			   (explicit ? n : (int) wcslen(str))));
+	if (!explicit)
 	    n = INT_MAX;
-	while ((*str != L('\0')) && (n-- > 0)) {
+	while ((explicit || (*str != L('\0'))) && (n-- > 0)) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str));
 	    SetChar(ch, *str++, A_NORMAL);
diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c
index dd51a9cd1..338a96b32 100644
--- a/ncurses/base/lib_insnstr.c
+++ b/ncurses/base/lib_insnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2004-2009,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insnstr.c,v 1.8 2022/05/21 17:35:15 tom Exp $")
+MODULE_ID("$Id: lib_insnstr.c,v 1.9 2023/11/18 23:47:19 tom Exp $")
 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)
@@ -51,7 +51,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 
     T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n));
 
-    if (win != 0 && str != 0) {
+    if (win != 0 && str != 0 && n != 0) {
 	SCREEN *sp = _nc_screen_of(win);
 #if USE_WIDEC_SUPPORT
 	/*
@@ -62,7 +62,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 	 * call to the wins_nwstr() function.
 	 */
 	if (sp->_screen_unicode) {
-	    size_t nn = (n > 0) ? (size_t) n : strlen(s);
+	    size_t nn = (n >= 0) ? (size_t) n : strlen(s);
 	    wchar_t *buffer = typeMalloc(wchar_t, nn + 1);
 	    if (buffer != 0) {
 		mbstate_t state;
@@ -83,7 +83,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 	    NCURSES_SIZE_T ox = win->_curx;
 	    const unsigned char *cp;
 
-	    for (cp = str; (n <= 0 || (cp - str) < n) && *cp; cp++) {
+	    for (cp = str; (n < 0 || (cp - str) < n) && *cp; cp++) {
 		_nc_insert_ch(sp, win, (chtype) UChar(*cp));
 	    }
 	    win->_curx = ox;
diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index f75361081..1be3b0eeb 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2023 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.25 2020/12/05 20:04:59 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.27 2023/11/18 23:48:20 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -109,9 +109,14 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
        (void *) win, _nc_viswbufn(wstr, n), n));
 
     if (win != 0
-	&& wstr != 0) {
-	if (n < 1)
+	&& wstr != 0
+	&& n != 0) {
+	bool explicit = TRUE;
+
+	if (n < 0) {
+	    explicit = FALSE;
 	    n = INT_MAX;
+	}
 	code = OK;
 
 	if (n > 0) {
@@ -120,7 +125,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
 	    NCURSES_SIZE_T oy = win->_cury;
 	    NCURSES_SIZE_T ox = win->_curx;
 
-	    for (cp = wstr; (*cp != L'\0') && ((cp - wstr) < n); cp++) {
+	    for (cp = wstr; (explicit || (*cp != L'\0')) && ((cp - wstr) < n); cp++) {
 		int len = _nc_wacs_width(*cp);
 
 		if ((len >= 0 && len != 1) || !is7bits(*cp)) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fb2201680..079d4e9e9 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231111) unstable; urgency=low
+ncurses6 (6.4+20231118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fb2201680..079d4e9e9 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231111) unstable; urgency=low
+ncurses6 (6.4+20231118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index eb58e9c42..edc71475e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231111) unstable; urgency=low
+ncurses6 (6.4+20231118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Nov 2023 05:36:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1c0f4bbe2..9a69bf93a 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.616 2023/11/10 10:36:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.617 2023/11/14 01:05:39 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1111"
+!define VERSION_MMDD  "1118"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 3b78c8033..6865b0710 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231111
+Release: 20231118
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 268e7180d..6c79b3675 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231111
+Release: 20231118
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 373bbcd64..e6d27a12d 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231111
+Release: 20231118
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 39199ce90d2a6e57bbd934ee80c0e47497d2e4d0 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Wed, 22 Nov 2023 01:23:27 +0100
Subject: [PATCH 041/106] ncurses-6.4-20231121.patch

---
 NEWS                             | 6 +++++-
 VERSION                          | 2 +-
 dist.mk                          | 4 ++--
 ncurses/base/lib_addstr.c        | 6 +++---
 ncurses/base/lib_insnstr.c       | 4 ++--
 ncurses/widechar/lib_ins_wch.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 +-
 13 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/NEWS b/NEWS
index c8c404117..55b43488e 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4033 2023/11/19 00:46:27 tom Exp $
+-- $Id: NEWS,v 1.4035 2023/11/21 21:51:04 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231121
+	+ amend fix for Debian #1055882, correcting nul terminator check in
+	  waddnstr (Debian #1056340).
+
 20231118
 	+ improve description of length-parameter and error-returns in several
 	  manpages:  curs_addchstr.3x, curs_addstr.3x, curs_addwstr.3x,
diff --git a/VERSION b/VERSION
index 5be4535cf..89dd33234 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231118
+5:0:10	6.4	20231121
diff --git a/dist.mk b/dist.mk
index d9f527679..ee5177d67 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1577 2023/11/18 10:46:15 tom Exp $
+# $Id: dist.mk,v 1.1578 2023/11/21 21:44:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231118
+NCURSES_PATCH = 20231121
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index 43f329ca3..a3753af0d 100644
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.61 2023/11/18 23:54:19 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.62 2023/11/21 21:47:23 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -66,7 +66,7 @@ waddnstr(WINDOW *win, const char *astr, int n)
 			   (explicit ? n : (int) strlen(str))));
 	if (!explicit)
 	    n = INT_MAX;
-	while ((explicit || (*str != '\0')) && (n-- > 0)) {
+	while ((n-- > 0) && (*str != '\0')) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
 	    SetChar(ch, UChar(*str++), A_NORMAL);
@@ -241,7 +241,7 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 			   (explicit ? n : (int) wcslen(str))));
 	if (!explicit)
 	    n = INT_MAX;
-	while ((explicit || (*str != L('\0'))) && (n-- > 0)) {
+	while ((n-- > 0) && (*str != L('\0'))) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str));
 	    SetChar(ch, *str++, A_NORMAL);
diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c
index 338a96b32..caec48e8e 100644
--- a/ncurses/base/lib_insnstr.c
+++ b/ncurses/base/lib_insnstr.c
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insnstr.c,v 1.9 2023/11/18 23:47:19 tom Exp $")
+MODULE_ID("$Id: lib_insnstr.c,v 1.10 2023/11/21 21:58:03 tom Exp $")
 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)
@@ -62,7 +62,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 	 * call to the wins_nwstr() function.
 	 */
 	if (sp->_screen_unicode) {
-	    size_t nn = (n >= 0) ? (size_t) n : strlen(s);
+	    size_t nn = (n > 0) ? (size_t) n : strlen(s);
 	    wchar_t *buffer = typeMalloc(wchar_t, nn + 1);
 	    if (buffer != 0) {
 		mbstate_t state;
diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index 1be3b0eeb..ecaabcc9b 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.27 2023/11/18 23:48:20 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.29 2023/11/21 21:53:28 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -111,10 +111,8 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
     if (win != 0
 	&& wstr != 0
 	&& n != 0) {
-	bool explicit = TRUE;
 
 	if (n < 0) {
-	    explicit = FALSE;
 	    n = INT_MAX;
 	}
 	code = OK;
@@ -125,7 +123,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
 	    NCURSES_SIZE_T oy = win->_cury;
 	    NCURSES_SIZE_T ox = win->_curx;
 
-	    for (cp = wstr; (explicit || (*cp != L'\0')) && ((cp - wstr) < n); cp++) {
+	    for (cp = wstr; ((cp - wstr) < n) && (*cp != L'\0'); cp++) {
 		int len = _nc_wacs_width(*cp);
 
 		if ((len >= 0 && len != 1) || !is7bits(*cp)) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 079d4e9e9..156469e4a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231118) unstable; urgency=low
+ncurses6 (6.4+20231121) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 079d4e9e9..156469e4a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231118) unstable; urgency=low
+ncurses6 (6.4+20231121) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index edc71475e..4c6170b3b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231118) unstable; urgency=low
+ncurses6 (6.4+20231121) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 13 Nov 2023 20:05:39 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 9a69bf93a..0ea10d011 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.617 2023/11/14 01:05:39 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.618 2023/11/21 21:44:33 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1118"
+!define VERSION_MMDD  "1121"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6865b0710..1b4b84314 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231118
+Release: 20231121
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 6c79b3675..efc5072c4 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231118
+Release: 20231121
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e6d27a12d..8a16ae659 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231118
+Release: 20231121
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 00d788acadcb0793238b857bd62d5e6fb70f9c45 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 26 Nov 2023 00:48:01 +0100
Subject: [PATCH 042/106] ncurses-6.4-20231125.patch

---
 Ada95/aclocal.m4                           |   10 +-
 Ada95/configure                            |    4 +-
 NEWS                                       |   10 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   52 +-
 configure                                  | 4472 ++++++++++----------
 configure.in                               |   53 +-
 dist.mk                                    |    4 +-
 doc/html/man/adacursesw6-config.1.html     |   12 +-
 doc/html/man/captoinfo.1m.html             |  164 +-
 doc/html/man/clear.1.html                  |   54 +-
 doc/html/man/curs_add_wch.3x.html          |   20 +-
 doc/html/man/curs_add_wchstr.3x.html       |   10 +-
 doc/html/man/curs_addch.3x.html            |   16 +-
 doc/html/man/curs_addchstr.3x.html         |   10 +-
 doc/html/man/curs_attr.3x.html             |  287 +-
 doc/html/man/curs_bkgd.3x.html             |   11 +-
 doc/html/man/curs_bkgrnd.3x.html           |   29 +-
 doc/html/man/curs_border.3x.html           |   12 +-
 doc/html/man/curs_border_set.3x.html       |   81 +-
 doc/html/man/curs_clear.3x.html            |   12 +-
 doc/html/man/curs_color.3x.html            |  124 +-
 doc/html/man/curs_deleteln.3x.html         |   22 +-
 doc/html/man/curs_extend.3x.html           |   12 +-
 doc/html/man/curs_get_wch.3x.html          |   51 +-
 doc/html/man/curs_get_wstr.3x.html         |   34 +-
 doc/html/man/curs_getcchar.3x.html         |   50 +-
 doc/html/man/curs_getstr.3x.html           |   36 +-
 doc/html/man/curs_inopts.3x.html           |   94 +-
 doc/html/man/curs_ins_wch.3x.html          |   14 +-
 doc/html/man/curs_ins_wstr.3x.html         |   10 +-
 doc/html/man/curs_insstr.3x.html           |   10 +-
 doc/html/man/curs_instr.3x.html            |   10 +-
 doc/html/man/curs_inwstr.3x.html           |   13 +-
 doc/html/man/curs_outopts.3x.html          |   26 +-
 doc/html/man/curs_overlay.3x.html          |   16 +-
 doc/html/man/curs_pad.3x.html              |  115 +-
 doc/html/man/curs_printw.3x.html           |   66 +-
 doc/html/man/curs_scanw.3x.html            |   86 +-
 doc/html/man/curs_scr_dump.3x.html         |   12 +-
 doc/html/man/curs_slk.3x.html              |   76 +-
 doc/html/man/curs_sp_funcs.3x.html         |   10 +-
 doc/html/man/curs_termcap.3x.html          |    8 +-
 doc/html/man/curs_terminfo.3x.html         |  234 +-
 doc/html/man/curs_threads.3x.html          |   14 +-
 doc/html/man/curs_touch.3x.html            |   18 +-
 doc/html/man/curs_variables.3x.html        |    8 +-
 doc/html/man/curs_window.3x.html           |   11 +-
 doc/html/man/default_colors.3x.html        |   12 +-
 doc/html/man/define_key.3x.html            |   12 +-
 doc/html/man/form.3x.html                  |   27 +-
 doc/html/man/form_cursor.3x.html           |   16 +-
 doc/html/man/form_data.3x.html             |   16 +-
 doc/html/man/form_driver.3x.html           |   18 +-
 doc/html/man/form_field.3x.html            |   18 +-
 doc/html/man/form_field_attributes.3x.html |   18 +-
 doc/html/man/form_field_buffer.3x.html     |   12 +-
 doc/html/man/form_field_info.3x.html       |   22 +-
 doc/html/man/form_field_just.3x.html       |   18 +-
 doc/html/man/form_field_new.3x.html        |   20 +-
 doc/html/man/form_field_opts.3x.html       |   16 +-
 doc/html/man/form_field_userptr.3x.html    |   16 +-
 doc/html/man/form_field_validation.3x.html |   16 +-
 doc/html/man/form_fieldtype.3x.html        |   16 +-
 doc/html/man/form_hook.3x.html             |   16 +-
 doc/html/man/form_new.3x.html              |   16 +-
 doc/html/man/form_new_page.3x.html         |   18 +-
 doc/html/man/form_opts.3x.html             |   16 +-
 doc/html/man/form_page.3x.html             |   16 +-
 doc/html/man/form_post.3x.html             |   16 +-
 doc/html/man/form_requestname.3x.html      |   16 +-
 doc/html/man/form_userptr.3x.html          |   16 +-
 doc/html/man/form_win.3x.html              |   16 +-
 doc/html/man/infocmp.1m.html               |  135 +-
 doc/html/man/infotocap.1m.html             |   24 +-
 doc/html/man/key_defined.3x.html           |   12 +-
 doc/html/man/keybound.3x.html              |   12 +-
 doc/html/man/keyok.3x.html                 |   12 +-
 doc/html/man/legacy_coding.3x.html         |   12 +-
 doc/html/man/menu.3x.html                  |   25 +-
 doc/html/man/menu_attributes.3x.html       |   18 +-
 doc/html/man/menu_cursor.3x.html           |   16 +-
 doc/html/man/menu_driver.3x.html           |   18 +-
 doc/html/man/menu_format.3x.html           |   16 +-
 doc/html/man/menu_hook.3x.html             |   16 +-
 doc/html/man/menu_items.3x.html            |   18 +-
 doc/html/man/menu_mark.3x.html             |   16 +-
 doc/html/man/menu_new.3x.html              |   16 +-
 doc/html/man/menu_opts.3x.html             |   16 +-
 doc/html/man/menu_pattern.3x.html          |   16 +-
 doc/html/man/menu_post.3x.html             |   16 +-
 doc/html/man/menu_requestname.3x.html      |   16 +-
 doc/html/man/menu_spacing.3x.html          |   16 +-
 doc/html/man/menu_userptr.3x.html          |   16 +-
 doc/html/man/menu_win.3x.html              |   16 +-
 doc/html/man/mitem_current.3x.html         |   18 +-
 doc/html/man/mitem_name.3x.html            |   16 +-
 doc/html/man/mitem_new.3x.html             |   16 +-
 doc/html/man/mitem_opts.3x.html            |   16 +-
 doc/html/man/mitem_userptr.3x.html         |   16 +-
 doc/html/man/mitem_value.3x.html           |   16 +-
 doc/html/man/mitem_visible.3x.html         |   18 +-
 doc/html/man/ncurses.3x.html               |  231 +-
 doc/html/man/new_pair.3x.html              |   12 +-
 doc/html/man/panel.3x.html                 |  146 +-
 doc/html/man/resizeterm.3x.html            |   12 +-
 doc/html/man/scr_dump.5.html               |   18 +-
 doc/html/man/tabs.1.html                   |   10 +-
 doc/html/man/term.5.html                   |   94 +-
 doc/html/man/term.7.html                   |   28 +-
 doc/html/man/term_variables.3x.html        |    8 +-
 doc/html/man/terminfo.5.html               |   67 +-
 doc/html/man/tic.1m.html                   |  227 +-
 doc/html/man/toe.1m.html                   |   56 +-
 doc/html/man/tput.1.html                   |  443 +-
 doc/html/man/tset.1.html                   |  289 +-
 doc/html/man/wresize.3x.html               |   42 +-
 man/MKada_config.in                        |    6 +-
 man/captoinfo.1m                           |   95 +-
 man/clear.1                                |   29 +-
 man/curs_add_wch.3x                        |   10 +-
 man/curs_add_wchstr.3x                     |    6 +-
 man/curs_addch.3x                          |    8 +-
 man/curs_addchstr.3x                       |    6 +-
 man/curs_attr.3x                           |  296 +-
 man/curs_bkgd.3x                           |    7 +-
 man/curs_bkgrnd.3x                         |   26 +-
 man/curs_border.3x                         |    6 +-
 man/curs_border_set.3x                     |   81 +-
 man/curs_clear.3x                          |    7 +-
 man/curs_color.3x                          |   86 +-
 man/curs_deleteln.3x                       |   14 +-
 man/curs_extend.3x                         |    6 +-
 man/curs_get_wch.3x                        |   54 +-
 man/curs_get_wstr.3x                       |   45 +-
 man/curs_getcchar.3x                       |   36 +-
 man/curs_getstr.3x                         |   46 +-
 man/curs_inopts.3x                         |   46 +-
 man/curs_ins_wch.3x                        |    8 +-
 man/curs_ins_wstr.3x                       |    8 +-
 man/curs_insstr.3x                         |    8 +-
 man/curs_instr.3x                          |    6 +-
 man/curs_inwstr.3x                         |    6 +-
 man/curs_outopts.3x                        |   24 +-
 man/curs_overlay.3x                        |    8 +-
 man/curs_pad.3x                            |   12 +-
 man/curs_printw.3x                         |   42 +-
 man/curs_scanw.3x                          |   80 +-
 man/curs_scr_dump.3x                       |    8 +-
 man/curs_slk.3x                            |   56 +-
 man/curs_sp_funcs.3x                       |    6 +-
 man/curs_termcap.3x                        |    7 +-
 man/curs_terminfo.3x                       |  254 +-
 man/curs_threads.3x                        |    6 +-
 man/curs_touch.3x                          |    8 +-
 man/curs_variables.3x                      |    7 +-
 man/curs_window.3x                         |    6 +-
 man/default_colors.3x                      |    6 +-
 man/define_key.3x                          |    6 +-
 man/form.3x                                |   15 +-
 man/form_cursor.3x                         |    7 +-
 man/form_data.3x                           |    7 +-
 man/form_driver.3x                         |    7 +-
 man/form_field.3x                          |    7 +-
 man/form_field_attributes.3x               |    7 +-
 man/form_field_buffer.3x                   |    7 +-
 man/form_field_info.3x                     |    7 +-
 man/form_field_just.3x                     |    7 +-
 man/form_field_new.3x                      |    7 +-
 man/form_field_opts.3x                     |    7 +-
 man/form_field_userptr.3x                  |    7 +-
 man/form_field_validation.3x               |    7 +-
 man/form_fieldtype.3x                      |    7 +-
 man/form_hook.3x                           |    7 +-
 man/form_new.3x                            |    7 +-
 man/form_new_page.3x                       |    7 +-
 man/form_opts.3x                           |    7 +-
 man/form_page.3x                           |    7 +-
 man/form_post.3x                           |    7 +-
 man/form_requestname.3x                    |    7 +-
 man/form_userptr.3x                        |    7 +-
 man/form_win.3x                            |    7 +-
 man/infocmp.1m                             |  153 +-
 man/infotocap.1m                           |   32 +-
 man/key_defined.3x                         |    6 +-
 man/keybound.3x                            |    6 +-
 man/keyok.3x                               |    6 +-
 man/legacy_coding.3x                       |    6 +-
 man/make_sed.sh                            |    3 +-
 man/man_db.renames.in                      |    3 +-
 man/menu.3x                                |   16 +-
 man/menu_attributes.3x                     |    7 +-
 man/menu_cursor.3x                         |    7 +-
 man/menu_driver.3x                         |    7 +-
 man/menu_format.3x                         |    7 +-
 man/menu_hook.3x                           |    7 +-
 man/menu_items.3x                          |    7 +-
 man/menu_mark.3x                           |    7 +-
 man/menu_new.3x                            |    7 +-
 man/menu_opts.3x                           |    7 +-
 man/menu_pattern.3x                        |    7 +-
 man/menu_post.3x                           |    7 +-
 man/menu_requestname.3x                    |    7 +-
 man/menu_spacing.3x                        |    7 +-
 man/menu_userptr.3x                        |    7 +-
 man/menu_win.3x                            |    7 +-
 man/mitem_current.3x                       |    7 +-
 man/mitem_name.3x                          |    7 +-
 man/mitem_new.3x                           |    7 +-
 man/mitem_opts.3x                          |    7 +-
 man/mitem_userptr.3x                       |    7 +-
 man/mitem_value.3x                         |    7 +-
 man/mitem_visible.3x                       |    9 +-
 man/ncurses.3x                             |   67 +-
 man/new_pair.3x                            |    6 +-
 man/panel.3x                               |  235 +-
 man/resizeterm.3x                          |    6 +-
 man/scr_dump.5                             |   12 +-
 man/tabs.1                                 |    9 +-
 man/term.5                                 |   77 +-
 man/term.7                                 |   29 +-
 man/term_variables.3x                      |    7 +-
 man/terminfo.head                          |    7 +-
 man/terminfo.tail                          |   85 +-
 man/tic.1m                                 |  239 +-
 man/toe.1m                                 |   49 +-
 man/tput.1                                 |  282 +-
 man/tset.1                                 |  250 +-
 man/wresize.3x                             |   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 +-
 package/ncursest.spec                      |    2 +-
 test/README                                |   20 +-
 test/aclocal.m4                            |    6 +-
 test/configure                             |    6 +-
 239 files changed, 6240 insertions(+), 6459 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 9813c40e1..93c7fb54a 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.205 2023/10/28 16:05:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.206 2023/11/23 01:48:30 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4764,7 +4764,7 @@ AC_SUBST(ADA_INCLUDE)
 AC_MSG_RESULT($ADA_INCLUDE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
+dnl CF_WITH_ADA_LIBNAME version: 3 updated: 2023/11/22 20:48:30
 dnl -------------------
 dnl CF_WITH_ADA_LIBNAME
 dnl -------------------
@@ -4773,7 +4773,7 @@ dnl $1 = default value
 AC_DEFUN([CF_WITH_ADA_LIBNAME],[
 AC_MSG_CHECKING(for Ada95 curses library name)
 AC_ARG_WITH(ada-libname,
-   [  --with-ada-libname=XXX  use XXX as Ada95 library name],
+   [[  --with-ada-libname[=XXX]  use XXX as Ada95 library name]],
    ADA_LIBNAME=[$]withval,
    ADA_LIBNAME=$1)
 case "x$ADA_LIBNAME" in
@@ -4914,7 +4914,7 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 21 updated: 2023/01/22 13:37:42
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -4949,7 +4949,7 @@ fi
 
 # if the option is used, let that override.  otherwise default to "libdir"
 AC_ARG_WITH(pkg-config-libdir,
-	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
+	[[  --with-pkg-config-libdir[=XXX] use given directory for installing pc-files]],
 	[cf_search_path=$withval],
 	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
 
diff --git a/Ada95/configure b/Ada95/configure
index 9a9ef92cf..f9eebcf4a 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -706,7 +706,7 @@ General Options:
   --disable-stripping     do not strip (debug info) installed executables
   --with-strip-program=XX specify program to use when stripping in install
   --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
-  --with-pkg-config-libdir=XXX use given directory for installing pc-files
+  --with-pkg-config-libdir[=XXX] use given directory for installing pc-files
   --without-tests         suppress build with test-programs
   --enable-mixed-case     tic should assume mixed-case filenames
   --with-install-prefix   prefixes actual install-location ($DESTDIR)
@@ -752,7 +752,7 @@ Ada95 Binding Options:
   --with-ada-include=DIR  find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude)
   --with-ada-objects=DIR  find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib)
   --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support
-  --with-ada-libname=XXX  use XXX as Ada95 library name
+  --with-ada-libname[=XXX]  use XXX as Ada95 library name
 
 Some influential environment variables:
   CC          C compiler command
diff --git a/NEWS b/NEWS
index 55b43488e..2f9c9e3a0 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4035 2023/11/21 21:51:04 tom Exp $
+-- $Id: NEWS,v 1.4039 2023/11/25 19:45:00 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231125
+	+ add information about "ttycap", termcap's forerunner, to tset.1
+	  (patch by Branden Robinson).
+	+ improve formatting/style of manpages, including section reordering
+	  (patches by Branden Robinson).
+	+ modify usage messages in configure script, bracketing optional values
+	  (report by Branden Robinson).
+
 20231121
 	+ amend fix for Debian #1055882, correcting nul terminator check in
 	  waddnstr (Debian #1056340).
diff --git a/VERSION b/VERSION
index 89dd33234..d60620cdf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231121
+5:0:10	6.4	20231125
diff --git a/aclocal.m4 b/aclocal.m4
index 883f50f18..2cc9af7f9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1056 2023/10/28 16:51:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.1059 2023/11/25 21:12:05 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -8980,7 +8980,7 @@ AC_SUBST(ADA_INCLUDE)
 AC_MSG_RESULT($ADA_INCLUDE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
+dnl CF_WITH_ADA_LIBNAME version: 3 updated: 2023/11/22 20:48:30
 dnl -------------------
 dnl CF_WITH_ADA_LIBNAME
 dnl -------------------
@@ -8989,7 +8989,7 @@ dnl $1 = default value
 AC_DEFUN([CF_WITH_ADA_LIBNAME],[
 AC_MSG_CHECKING(for Ada95 curses library name)
 AC_ARG_WITH(ada-libname,
-   [  --with-ada-libname=XXX  use XXX as Ada95 library name],
+   [[  --with-ada-libname[=XXX]  use XXX as Ada95 library name]],
    ADA_LIBNAME=[$]withval,
    ADA_LIBNAME=$1)
 case "x$ADA_LIBNAME" in
@@ -9089,7 +9089,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_EXPORT_SYMS version: 4 updated: 2023/10/28 11:59:01
+dnl CF_WITH_EXPORT_SYMS version: 5 updated: 2023/11/22 20:48:30
 dnl -------------------
 dnl Use this with libtool to specify the list of symbols that may be exported.
 dnl The input file contains one symbol per line; comments work with "#".
@@ -9099,7 +9099,7 @@ AC_DEFUN([CF_WITH_EXPORT_SYMS],
 [
 AC_MSG_CHECKING(if exported-symbols file should be used)
 AC_ARG_WITH(export-syms,
-	[  --with-export-syms=SYM-FILE limit symbols exported by libtool to those listed in SYM-FILE],
+	[[  --with-export-syms[=SYM-FILE] limit symbols exported by libtool to those listed in SYM-FILE]],
 	[with_export_syms=$withval],
 	[with_export_syms=no])
 if test "x$with_export_syms" = xyes
@@ -9291,7 +9291,7 @@ AC_SUBST(LIB_UNINSTALL)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL_OPTS version: 5 updated: 2023/10/28 11:59:01
+dnl CF_WITH_LIBTOOL_OPTS version: 6 updated: 2023/11/22 20:48:30
 dnl --------------------
 dnl Allow user to pass additional libtool options into the library creation
 dnl and link steps.  The main use for this is to do something like
@@ -9301,7 +9301,7 @@ dnl	./configure --enable-static
 AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[
 AC_MSG_CHECKING(for additional libtool options)
 AC_ARG_WITH(libtool-opts,
-	[  --with-libtool-opts=XXX give libtool additional options XXX],
+	[[  --with-libtool-opts[=XXX] give libtool additional options XXX]],
 	[with_libtool_opts=$withval],
 	[with_libtool_opts=no])
 AC_MSG_RESULT($with_libtool_opts)
@@ -9317,7 +9317,7 @@ esac
 AC_SUBST(LIBTOOL_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
+dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30
 dnl --------------------
 dnl Allow for overriding the basename of a library, i.e., the part to which
 dnl prefixes/suffixes are attached.
@@ -9329,7 +9329,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME],
 [
 AC_MSG_CHECKING(for desired basename for $2 library)
 AC_ARG_WITH($2-libname,
-	[  --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library],
+	[[  --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]],
 	[with_lib_basename=$withval],
 	[with_lib_basename=ifelse($3,,$2,$3)])
 $1="$with_lib_basename"
@@ -9517,7 +9517,7 @@ if test "x$with_pcre2" != xno ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 21 updated: 2023/01/22 13:37:42
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -9547,13 +9547,14 @@ if test -n "$PKG_CONFIG_PATH"; then
 elif test -n "$PKG_CONFIG_LIBDIR"; then
 	cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ 	]]*,,' -e 's,[[ 	]]*$,,'`
 else
-	cf_search_path=libdir
+	cf_search_path=auto
 fi
 
 # if the option is used, let that override.  otherwise default to "libdir"
 AC_ARG_WITH(pkg-config-libdir,
-	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-	[cf_search_path=$withval])
+	[[  --with-pkg-config-libdir[=XXX] use given directory for installing pc-files]],
+	[cf_search_path=$withval],
+	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
 
 case "x$cf_search_path" in
 (xlibdir)
@@ -9776,6 +9777,27 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_TYPE version: 2 updated: 2023/11/25 16:11:47
+dnl ------------
+dnl Accept a TYPE for substitution:
+dnl $1 = name of type
+dnl $2 = help/usage message
+dnl $3 = symbol to set
+dnl $4 = default value
+AC_DEFUN([CF_WITH_TYPE],[
+AC_MSG_CHECKING(for type of $1)
+AC_ARG_WITH([$1], [$2],
+	[$3="$withval"],
+	[$3=$4])
+AC_MSG_RESULT([$]$3)
+case x[$]$3 in
+(x|xyes|xno)
+	AC_MSG_ERROR(expected a type name for $1)
+	;;
+esac
+AC_SUBST($3)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
 dnl ----------------
 AC_DEFUN([CF_WITH_VALGRIND],[
@@ -9784,7 +9806,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 11 updated: 2023/10/28 11:59:01
+dnl CF_WITH_VERSIONED_SYMS version: 12 updated: 2023/11/22 20:48:30
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -9797,7 +9819,7 @@ AC_REQUIRE([AC_PROG_EGREP])dnl
 
 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
-	[  --with-versioned-syms=MAP-FILE version ELF shared library symbols per MAP-FILE],
+	[[  --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE]],
 	[with_versioned_syms=$withval],
 	[with_versioned_syms=no])
 case "x$with_versioned_syms" in
diff --git a/configure b/configure
index d652dc078..46d95ce7b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.770 .
+# From configure.in Revision: 1.772 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230903.
 #
@@ -727,9 +727,9 @@ Optional Features:
   --without-curses-h      install curses.h as ncurses.h only
   --with-config-suffix=X  name ncurses*X-config file with X
   --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
-  --with-pkg-config-libdir=XXX use given directory for installing pc-files
+  --with-pkg-config-libdir[=XXX] use given directory for installing pc-files
   --enable-pc-files       generate and install .pc files for pkg-config
-  --with-pc-suffix=XXX    suffix pkg-config files with XXX
+  --with-pc-suffix[=XXX]  suffix pkg-config files with XXX
   --enable-mixed-case     tic should assume mixed-case filenames
   --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
@@ -753,9 +753,9 @@ Options to Specify the Libraries Built/Used:
   --enable-rpath          use rpath option when generating shared libraries
   --disable-relink        relink shared libraries during install
   --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names
-  --with-libtool-opts=XXX give libtool additional options XXX
-  --with-export-syms=SYM-FILE limit symbols exported by libtool to those listed in SYM-FILE
-  --with-versioned-syms=MAP-FILE version ELF shared library symbols per MAP-FILE
+  --with-libtool-opts[=XXX] give libtool additional options XXX
+  --with-export-syms[=SYM-FILE] limit symbols exported by libtool to those listed in SYM-FILE
+  --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE
   --with-gpm              use Alessandro Rubini's GPM library
   --without-dlsym         do not use dlsym() to load GPM dynamically
   --with-pcre2            use PCRE2 for regular-expressions
@@ -764,7 +764,7 @@ Options to Specify the Libraries Built/Used:
   --disable-rpath-hack    don't add rpath options for additional libraries
   --disable-pkg-ldflags   disable extra LDFLAGS for package-scripts
 Fine-Tuning Your Configuration:
-  --with-extra-suffix=X   append extra suffix X to header/library paths
+  --with-extra-suffix[=X] append extra suffix X to header/library paths
   --disable-overwrite     put headers in subdir, omit link to -lcurses
   --disable-database      do not use terminfo, only fallbacks/termcap
   --with-database=XXX     specify terminfo source to install
@@ -773,7 +773,7 @@ Fine-Tuning Your Configuration:
   --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-xterm-kbs[=XXX]  specify if xterm backspace sends BS or DEL
   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
   --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
   --disable-big-core      assume machine has little memory
@@ -870,12 +870,12 @@ Ada Binding Options:
   --with-ada-include=DIR  find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude)
   --with-ada-objects=DIR  find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib)
   --with-ada-sharedlib    build Ada95 shared library; requires GNAT project support
-  --with-ada-libname=XXX  use XXX as Ada95 library name
+  --with-ada-libname[=XXX]  use XXX as Ada95 library name
 Library basenames for pkgsrc:
-  --with-form-libname=XXX override form basename of library
-  --with-menu-libname=XXX override menu basename of library
-  --with-panel-libname=XXX override panel basename of library
-  --with-cxx-libname=XXX override ncurses++ basename of library
+  --with-form-libname[=XXX] override ifelse(,,form,) basename of library
+  --with-menu-libname[=XXX] override ifelse(,,menu,) basename of library
+  --with-panel-libname[=XXX] override ifelse(,,panel,) basename of library
+  --with-cxx-libname[=XXX] override ifelse(ncurses++,,cxx,ncurses++) basename of library
 
 Some influential environment variables:
   CC          C compiler command
@@ -4175,7 +4175,7 @@ if test -n "$PKG_CONFIG_PATH"; then
 elif test -n "$PKG_CONFIG_LIBDIR"; then
 	cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ 	]*,,' -e 's,[ 	]*$,,'`
 else
-	cf_search_path=libdir
+	cf_search_path=auto
 fi
 
 # if the option is used, let that override.  otherwise default to "libdir"
@@ -4184,12 +4184,14 @@ fi
 if test "${with_pkg_config_libdir+set}" = set; then
   withval="$with_pkg_config_libdir"
   cf_search_path=$withval
+else
+  test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
 fi;
 
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4192: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4194: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4200,16 +4202,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4203: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4205: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4208: result: auto" >&5
+	echo "$as_me:4210: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4212: checking for search-list" >&5
+	echo "$as_me:4214: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4236,11 +4238,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4239: result: $cf_search_path" >&5
+	echo "$as_me:4241: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4243: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4245: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4248,7 +4250,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4251: checking for first directory" >&5
+	echo "$as_me:4253: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4259,7 +4261,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4262: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4264: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4269,7 +4271,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4272: checking for workaround" >&5
+		echo "$as_me:4274: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4292,17 +4294,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4295: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4297: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4302: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4304: 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:4305: checking if we should install .pc files" >&5
+	echo "$as_me:4307: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4313,7 +4315,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4316: result: $enable_pc_files" >&5
+echo "$as_me:4318: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4321,7 +4323,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4324: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4326: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4352,7 +4354,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4355: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4357: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4366,7 +4368,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4369: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4371: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4381,13 +4383,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4384: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4386: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4390: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4392: 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.
@@ -4397,11 +4399,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4400: result: $enable_mixedcase" >&5
+echo "$as_me:4402: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4404: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4406: 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
@@ -4428,7 +4430,7 @@ else
 fi
 
 fi
-echo "$as_me:4431: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4433: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4447,7 +4449,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4450: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4452: 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
@@ -4467,16 +4469,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4470: result: yes" >&5
+  echo "$as_me:4472: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4474: result: no" >&5
+  echo "$as_me:4476: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4479: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4481: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4531,7 +4533,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4534: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4536: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4542,7 +4544,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4545: checking for $ac_word" >&5
+echo "$as_me:4547: 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
@@ -4557,7 +4559,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4560: found $ac_dir/$ac_word" >&5
+echo "$as_me:4562: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4565,10 +4567,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4568: result: $CTAGS" >&5
+  echo "$as_me:4570: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4571: result: no" >&5
+  echo "$as_me:4573: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4579,7 +4581,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4582: checking for $ac_word" >&5
+echo "$as_me:4584: 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
@@ -4594,7 +4596,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4597: found $ac_dir/$ac_word" >&5
+echo "$as_me:4599: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4602,10 +4604,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4605: result: $ETAGS" >&5
+  echo "$as_me:4607: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4608: result: no" >&5
+  echo "$as_me:4610: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4614,7 +4616,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4617: checking for $ac_word" >&5
+echo "$as_me:4619: 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
@@ -4629,7 +4631,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4632: found $ac_dir/$ac_word" >&5
+echo "$as_me:4634: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4638,17 +4640,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4641: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4643: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4644: result: no" >&5
+  echo "$as_me:4646: 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:4651: checking for $ac_word" >&5
+echo "$as_me:4653: 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
@@ -4663,7 +4665,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4666: found $ac_dir/$ac_word" >&5
+echo "$as_me:4668: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4672,10 +4674,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4675: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4677: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4678: result: no" >&5
+  echo "$as_me:4680: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4695,7 +4697,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4698: checking for makeflags variable" >&5
+echo "$as_me:4700: 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
@@ -4725,7 +4727,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4728: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4730: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4733,13 +4735,13 @@ echo "${as_me:-configure}:4728: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4736: result: $cf_cv_makeflags" >&5
+echo "$as_me:4738: 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:4742: checking for $ac_word" >&5
+echo "$as_me:4744: 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
@@ -4754,7 +4756,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4757: found $ac_dir/$ac_word" >&5
+echo "$as_me:4759: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4762,10 +4764,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4765: result: $RANLIB" >&5
+  echo "$as_me:4767: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4768: result: no" >&5
+  echo "$as_me:4770: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4774,7 +4776,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4777: checking for $ac_word" >&5
+echo "$as_me:4779: 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
@@ -4789,7 +4791,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4792: found $ac_dir/$ac_word" >&5
+echo "$as_me:4794: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4798,10 +4800,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4801: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4803: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4804: result: no" >&5
+  echo "$as_me:4806: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4813,7 +4815,7 @@ fi
 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:4816: checking for $ac_word" >&5
+echo "$as_me:4818: 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
@@ -4828,7 +4830,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4831: found $ac_dir/$ac_word" >&5
+echo "$as_me:4833: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4836,10 +4838,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4839: result: $LD" >&5
+  echo "$as_me:4841: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4842: result: no" >&5
+  echo "$as_me:4844: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4848,7 +4850,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4851: checking for $ac_word" >&5
+echo "$as_me:4853: 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
@@ -4863,7 +4865,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4866: found $ac_dir/$ac_word" >&5
+echo "$as_me:4868: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4872,10 +4874,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4875: result: $ac_ct_LD" >&5
+  echo "$as_me:4877: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4878: result: no" >&5
+  echo "$as_me:4880: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4887,7 +4889,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4890: checking for $ac_word" >&5
+echo "$as_me:4892: 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
@@ -4902,7 +4904,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4905: found $ac_dir/$ac_word" >&5
+echo "$as_me:4907: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4910,10 +4912,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4913: result: $AR" >&5
+  echo "$as_me:4915: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4916: result: no" >&5
+  echo "$as_me:4918: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4922,7 +4924,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4925: checking for $ac_word" >&5
+echo "$as_me:4927: 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
@@ -4937,7 +4939,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4940: found $ac_dir/$ac_word" >&5
+echo "$as_me:4942: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4946,10 +4948,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4949: result: $ac_ct_AR" >&5
+  echo "$as_me:4951: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4952: result: no" >&5
+  echo "$as_me:4954: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4961,7 +4963,7 @@ fi
 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:4964: checking for $ac_word" >&5
+echo "$as_me:4966: 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
@@ -4976,7 +4978,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4979: found $ac_dir/$ac_word" >&5
+echo "$as_me:4981: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4984,10 +4986,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4987: result: $NM" >&5
+  echo "$as_me:4989: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4990: result: no" >&5
+  echo "$as_me:4992: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4996,7 +4998,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:4999: checking for $ac_word" >&5
+echo "$as_me:5001: 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
@@ -5011,7 +5013,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5014: found $ac_dir/$ac_word" >&5
+echo "$as_me:5016: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5020,10 +5022,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5023: result: $ac_ct_NM" >&5
+  echo "$as_me:5025: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5026: result: no" >&5
+  echo "$as_me:5028: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5035,7 +5037,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5038: checking for $ac_word" >&5
+echo "$as_me:5040: 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
@@ -5050,7 +5052,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5053: found $ac_dir/$ac_word" >&5
+echo "$as_me:5055: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5058,10 +5060,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5061: result: $AR" >&5
+  echo "$as_me:5063: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5064: result: no" >&5
+  echo "$as_me:5066: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5070,7 +5072,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5073: checking for $ac_word" >&5
+echo "$as_me:5075: 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
@@ -5085,7 +5087,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5088: found $ac_dir/$ac_word" >&5
+echo "$as_me:5090: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5094,10 +5096,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5097: result: $ac_ct_AR" >&5
+  echo "$as_me:5099: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5100: result: no" >&5
+  echo "$as_me:5102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5106,7 +5108,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5109: checking for options to update archives" >&5
+echo "$as_me:5111: 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
@@ -5143,13 +5145,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5146 "configure"
+#line 5148 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5149: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5152: \$? = $ac_status" >&5
+  echo "$as_me:5154: \$? = $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
@@ -5160,7 +5162,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5163: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5165: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5170,7 +5172,7 @@ echo "${as_me:-configure}:5163: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5173: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5175: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5181,7 +5183,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5184: checking for an installation directory prefix" >&5
+echo "$as_me:5186: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5194,7 +5196,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5197: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5199: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
 ###############################################################################
@@ -5229,7 +5231,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5232: checking for $ac_word" >&5
+echo "$as_me:5234: 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
@@ -5244,7 +5246,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5247: found $ac_dir/$ac_word" >&5
+echo "$as_me:5249: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5252,10 +5254,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5255: result: $BUILD_CC" >&5
+  echo "$as_me:5257: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5258: result: no" >&5
+  echo "$as_me:5260: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5264,12 +5266,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5267: checking for native build C compiler" >&5
+	echo "$as_me:5269: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5269: result: $BUILD_CC" >&5
+	echo "$as_me:5271: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5272: checking for native build C preprocessor" >&5
+	echo "$as_me:5274: 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.
@@ -5279,10 +5281,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5282: result: $BUILD_CPP" >&5
+	echo "$as_me:5284: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5285: checking for native build C flags" >&5
+	echo "$as_me:5287: 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.
@@ -5290,10 +5292,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5293: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5295: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5296: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5298: 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.
@@ -5301,10 +5303,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5304: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5306: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5307: checking for native build linker-flags" >&5
+	echo "$as_me:5309: 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.
@@ -5312,10 +5314,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5315: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5317: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5318: checking for native build linker-libraries" >&5
+	echo "$as_me:5320: 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.
@@ -5323,7 +5325,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5326: result: $BUILD_LIBS" >&5
+	echo "$as_me:5328: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5332,7 +5334,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5335: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5337: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5346,7 +5348,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5349 "configure"
+#line 5351 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5356,15 +5358,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5362: \$? = $ac_status" >&5
+  echo "$as_me:5364: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5367: \$? = $ac_status" >&5
+  echo "$as_me:5369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5379,12 +5381,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5382: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5384: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5387: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5389: 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;}
@@ -5409,7 +5411,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5412: checking if libtool -version-number should be used" >&5
+echo "$as_me:5414: 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.
@@ -5426,7 +5428,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5429: result: $cf_libtool_version" >&5
+echo "$as_me:5431: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5435,25 +5437,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5438: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5440: 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}:5445: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5447: 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}:5452: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5454: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5456: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5458: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5475,7 +5477,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5478: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5480: 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.
@@ -5485,7 +5487,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5488: result: $with_libtool" >&5
+echo "$as_me:5490: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5516,7 +5518,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5519: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5521: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5529,7 +5531,7 @@ esac
   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:5532: checking for $ac_word" >&5
+echo "$as_me:5534: 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
@@ -5544,7 +5546,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5547: found $ac_dir/$ac_word" >&5
+echo "$as_me:5549: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5552,10 +5554,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5555: result: $LIBTOOL" >&5
+  echo "$as_me:5557: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5558: result: no" >&5
+  echo "$as_me:5560: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5568,7 +5570,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5571: checking for $ac_word" >&5
+echo "$as_me:5573: 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
@@ -5583,7 +5585,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5586: found $ac_dir/$ac_word" >&5
+echo "$as_me:5588: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5591,10 +5593,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5594: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5596: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5597: result: no" >&5
+  echo "$as_me:5599: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5625,7 +5627,7 @@ unset LIBTOOL
   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:5628: checking for $ac_word" >&5
+echo "$as_me:5630: 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
@@ -5640,7 +5642,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5643: found $ac_dir/$ac_word" >&5
+echo "$as_me:5645: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5648,10 +5650,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5651: result: $LIBTOOL" >&5
+  echo "$as_me:5653: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5654: result: no" >&5
+  echo "$as_me:5656: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5664,7 +5666,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5667: checking for $ac_word" >&5
+echo "$as_me:5669: 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
@@ -5679,7 +5681,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5682: found $ac_dir/$ac_word" >&5
+echo "$as_me:5684: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5687,10 +5689,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5690: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5692: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5693: result: no" >&5
+  echo "$as_me:5695: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5712,7 +5714,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5715: error: Cannot find libtool" >&5
+		{ { echo "$as_me:5717: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5728,7 +5730,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5731: checking version of $LIBTOOL" >&5
+	echo "$as_me:5733: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5739,7 +5741,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5742: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:5744: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5748,18 +5750,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5751: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:5753: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5757: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:5759: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5762: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:5764: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5795,7 +5797,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5798: checking if you want to build shared libraries" >&5
+echo "$as_me:5800: 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.
@@ -5805,11 +5807,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5808: result: $with_shared" >&5
+echo "$as_me:5810: 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:5812: checking if you want to build static libraries" >&5
+echo "$as_me:5814: 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.
@@ -5819,11 +5821,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5822: result: $with_normal" >&5
+echo "$as_me:5824: 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:5826: checking if you want to build debug libraries" >&5
+echo "$as_me:5828: 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.
@@ -5833,11 +5835,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5836: result: $with_debug" >&5
+echo "$as_me:5838: 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:5840: checking if you want to build profiling libraries" >&5
+echo "$as_me:5842: 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.
@@ -5847,7 +5849,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5850: result: $with_profile" >&5
+echo "$as_me:5852: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5855,7 +5857,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5858: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5860: 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.
@@ -5865,26 +5867,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5868: result: $with_shared_cxx" >&5
+echo "$as_me:5870: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5875: checking for specified models" >&5
+echo "$as_me:5877: 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:5879: result: $cf_list_models" >&5
+echo "$as_me:5881: 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:5884: checking for default model" >&5
+echo "$as_me:5886: 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:5887: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5889: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5898,7 +5900,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5901: checking if you want to have a library-prefix" >&5
+echo "$as_me:5903: 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.
@@ -5908,7 +5910,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5911: result: $with_lib_prefix" >&5
+echo "$as_me:5913: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5939,24 +5941,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5942: checking for PATH separator" >&5
+	echo "$as_me:5944: 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:5949: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5951: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5953: checking for ANSI C header files" >&5
+echo "$as_me:5955: 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 5959 "configure"
+#line 5961 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5964,13 +5966,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5967: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5969: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5973: \$? = $ac_status" >&5
+  echo "$as_me:5975: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5992,7 +5994,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5995 "configure"
+#line 5997 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6010,7 +6012,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6013 "configure"
+#line 6015 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6031,7 +6033,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6034 "configure"
+#line 6036 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6057,15 +6059,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6063: \$? = $ac_status" >&5
+  echo "$as_me:6065: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6068: \$? = $ac_status" >&5
+  echo "$as_me:6070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6078,7 +6080,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6081: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6083: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6094,28 +6096,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6097: checking for $ac_header" >&5
+echo "$as_me:6099: 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 6103 "configure"
+#line 6105 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6112: \$? = $ac_status" >&5
+  echo "$as_me:6114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6118: \$? = $ac_status" >&5
+  echo "$as_me:6120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6125,7 +6127,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6128: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6130: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6135,13 +6137,13 @@ EOF
 fi
 done
 
-echo "$as_me:6138: checking whether exit is declared" >&5
+echo "$as_me:6140: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6144 "configure"
+#line 6146 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6156,16 +6158,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6162: \$? = $ac_status" >&5
+  echo "$as_me:6164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6168: \$? = $ac_status" >&5
+  echo "$as_me:6170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6175,19 +6177,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6178: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6180: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6184: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6186: 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 6190 "configure"
+#line 6192 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6202,16 +6204,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6208: \$? = $ac_status" >&5
+  echo "$as_me:6210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6214: \$? = $ac_status" >&5
+  echo "$as_me:6216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6221,7 +6223,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6224: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6226: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6234,7 +6236,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6237: checking for opendir in -ldir" >&5
+  echo "$as_me:6239: 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
@@ -6242,7 +6244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6245 "configure"
+#line 6247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6261,16 +6263,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6267: \$? = $ac_status" >&5
+  echo "$as_me:6269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6273: \$? = $ac_status" >&5
+  echo "$as_me:6275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6281,14 +6283,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6284: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6286: 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:6291: checking for opendir in -lx" >&5
+  echo "$as_me:6293: 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
@@ -6296,7 +6298,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6299 "configure"
+#line 6301 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6315,16 +6317,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6321: \$? = $ac_status" >&5
+  echo "$as_me:6323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6327: \$? = $ac_status" >&5
+  echo "$as_me:6329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6335,7 +6337,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6338: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6340: 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"
@@ -6345,7 +6347,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6348: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6350: 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.
@@ -6355,10 +6357,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6358: result: $with_termlib" >&5
+echo "$as_me:6360: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6361: checking if you want to build a separate tic library" >&5
+echo "$as_me:6363: 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.
@@ -6368,7 +6370,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6371: result: $with_ticlib" >&5
+echo "$as_me:6373: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6381,7 +6383,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6384: checking for default loader flags" >&5
+echo "$as_me:6386: 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=''   ;;
@@ -6390,13 +6392,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6393: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6395: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6399: checking if rpath option should be used" >&5
+echo "$as_me:6401: 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.
@@ -6406,10 +6408,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6409: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6411: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6412: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6414: 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.
@@ -6419,7 +6421,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6422: result: $cf_cv_do_relink" >&5
+echo "$as_me:6424: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6430,7 +6432,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6433: checking for an rpath option" >&5
+	echo "$as_me:6435: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6461,12 +6463,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6464: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6466: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6469: checking if we need a space after rpath option" >&5
+		echo "$as_me:6471: 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"
 
@@ -6487,7 +6489,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6490 "configure"
+#line 6492 "configure"
 #include "confdefs.h"
 
 int
@@ -6499,16 +6501,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6505: \$? = $ac_status" >&5
+  echo "$as_me:6507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6511: \$? = $ac_status" >&5
+  echo "$as_me:6513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6518,7 +6520,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6521: result: $cf_rpath_space" >&5
+		echo "$as_me:6523: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6540,7 +6542,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6543: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6545: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6555,9 +6557,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6558: result: $withval" >&5
+		echo "$as_me:6560: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6560: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6562: 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; }; }
 		;;
@@ -6566,7 +6568,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6569: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6571: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6589,14 +6591,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6592: checking which $CC option to use" >&5
+		echo "$as_me:6594: 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 6599 "configure"
+#line 6601 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6608,16 +6610,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6614: \$? = $ac_status" >&5
+  echo "$as_me:6616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6620: \$? = $ac_status" >&5
+  echo "$as_me:6622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6626,7 +6628,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6629: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6631: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6697,7 +6699,7 @@ CF_EOF
 		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:6700: checking if ld -search_paths_first works" >&5
+		echo "$as_me:6702: 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
@@ -6706,7 +6708,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6709 "configure"
+#line 6711 "configure"
 #include "confdefs.h"
 
 int
@@ -6718,16 +6720,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6724: \$? = $ac_status" >&5
+  echo "$as_me:6726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6730: \$? = $ac_status" >&5
+  echo "$as_me:6732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6738,7 +6740,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6741: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6743: 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"
@@ -7088,7 +7090,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7091 "configure"
+#line 7093 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7100,16 +7102,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7106: \$? = $ac_status" >&5
+  echo "$as_me:7108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7112: \$? = $ac_status" >&5
+  echo "$as_me:7114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7146,7 +7148,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7149: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7151: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7156,7 +7158,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7159 "${as_me:-configure}"
+#line 7161 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7168,18 +7170,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7171: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7173: 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:7173: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7176: \$? = $ac_status" >&5
+  echo "$as_me:7178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7178: result: yes" >&5
+				echo "$as_me:7180: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7182: result: no" >&5
+				echo "$as_me:7184: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7194,17 +7196,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7197: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7199: 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}:7201: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7203: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7207: checking for additional libtool options" >&5
+echo "$as_me:7209: 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.
@@ -7214,7 +7216,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7217: result: $with_libtool_opts" >&5
+echo "$as_me:7219: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7225,7 +7227,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7228: checking if exported-symbols file should be used" >&5
+echo "$as_me:7230: 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.
@@ -7240,7 +7242,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7243: result: $with_export_syms" >&5
+echo "$as_me:7245: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7251,15 +7253,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7254: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7256: 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:7259: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7261: 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 7262 "configure"
+#line 7264 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7271,16 +7273,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7289,18 +7291,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7292: result: $cf_cflags_work" >&5
+		echo "$as_me:7294: 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}:7298: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7300: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7303: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7305: 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.
@@ -7318,18 +7320,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7321: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7323: 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:7326: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7328: 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:7332: result: $with_versioned_syms" >&5
+echo "$as_me:7334: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7345,7 +7347,7 @@ then
 		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}:7348: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7350: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7353,11 +7355,11 @@ echo "${as_me:-configure}:7348: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7356: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7358: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7360: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7362: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7369,7 +7371,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7372: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7374: 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
 
@@ -7406,7 +7408,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7409 "configure"
+#line 7411 "configure"
 int	_ismissing(void) { return 1; }
 int	_localf1(void) { return 1; }
 int	_localf2(void) { return 2; }
@@ -7437,7 +7439,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7440: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7442: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7450,7 +7452,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7453: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7455: 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.
@@ -7460,27 +7462,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7463: result: $with_gpm" >&5
+echo "$as_me:7465: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7467: checking for gpm.h" >&5
+	echo "$as_me:7469: 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 7473 "configure"
+#line 7475 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7477: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7483: \$? = $ac_status" >&5
+  echo "$as_me:7485: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7499,7 +7501,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7502: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7504: 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
 
@@ -7510,7 +7512,7 @@ EOF
 		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}:7513: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7515: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7518,7 +7520,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7521: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7523: 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
@@ -7526,7 +7528,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7529 "configure"
+#line 7531 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7545,16 +7547,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7551: \$? = $ac_status" >&5
+  echo "$as_me:7553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7557: \$? = $ac_status" >&5
+  echo "$as_me:7559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7565,18 +7567,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7568: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7570: 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:7575: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7577: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7579: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7581: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7587,7 +7589,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7590: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7592: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7596,7 +7598,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7599: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7601: 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.
@@ -7606,18 +7608,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7609: result: $with_dlsym" >&5
+	echo "$as_me:7611: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7614: checking for dlsym" >&5
+echo "$as_me:7616: 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 7620 "configure"
+#line 7622 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7648,16 +7650,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7654: \$? = $ac_status" >&5
+  echo "$as_me:7656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7660: \$? = $ac_status" >&5
+  echo "$as_me:7662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7667,14 +7669,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7670: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7672: 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:7677: checking for dlsym in -ldl" >&5
+echo "$as_me:7679: 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
@@ -7682,7 +7684,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7685 "configure"
+#line 7687 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7701,16 +7703,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7707: \$? = $ac_status" >&5
+  echo "$as_me:7709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7713: \$? = $ac_status" >&5
+  echo "$as_me:7715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7721,7 +7723,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7724: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7726: 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
 
@@ -7750,10 +7752,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7753: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:7755: 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 7756 "configure"
+#line 7758 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7771,16 +7773,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7777: \$? = $ac_status" >&5
+  echo "$as_me:7779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7783: \$? = $ac_status" >&5
+  echo "$as_me:7785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7791,15 +7793,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7794: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:7796: 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:7799: result: ok" >&5
+	echo "$as_me:7801: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7802: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:7804: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7807,12 +7809,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7810: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7812: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7815: checking for soname of gpm library" >&5
+echo "$as_me:7817: 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
@@ -7846,15 +7848,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7849: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:7851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7852: \$? = $ac_status" >&5
+  echo "$as_me:7854: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7854: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:7856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7857: \$? = $ac_status" >&5
+  echo "$as_me:7859: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7865,7 +7867,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7868: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7870: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7933,7 +7935,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7936: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7938: 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
@@ -7941,7 +7943,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7944 "configure"
+#line 7946 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7960,16 +7962,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7966: \$? = $ac_status" >&5
+  echo "$as_me:7968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7972: \$? = $ac_status" >&5
+  echo "$as_me:7974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7980,11 +7982,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7983: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7985: 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:7987: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7989: 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
@@ -8008,15 +8010,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8014: \$? = $ac_status" >&5
+  echo "$as_me:8016: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8016: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8019: \$? = $ac_status" >&5
+  echo "$as_me:8021: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8028,11 +8030,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8031: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8033: 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:8035: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8037: 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
 
@@ -8040,7 +8042,7 @@ fi
 
 fi
 
-echo "$as_me:8043: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8045: 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.
@@ -8049,7 +8051,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8052: result: $with_pcre2" >&5
+echo "$as_me:8054: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8060,17 +8062,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8063: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8065: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8069: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8071: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8073: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8075: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8194,7 +8196,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8197: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8199: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8207,7 +8209,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8210: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8212: 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
@@ -8215,7 +8217,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8218 "configure"
+#line 8220 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8234,16 +8236,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8240: \$? = $ac_status" >&5
+  echo "$as_me:8242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8246: \$? = $ac_status" >&5
+  echo "$as_me:8248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8254,7 +8256,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8257: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8259: 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
 
@@ -8275,7 +8277,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8278: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8280: 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
@@ -8283,7 +8285,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8286 "configure"
+#line 8288 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8302,16 +8304,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8308: \$? = $ac_status" >&5
+  echo "$as_me:8310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8314: \$? = $ac_status" >&5
+  echo "$as_me:8316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8322,7 +8324,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8325: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8327: 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
 
@@ -8343,7 +8345,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8346: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8348: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8358,23 +8360,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8361: checking for $ac_header" >&5
+echo "$as_me:8363: 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 8367 "configure"
+#line 8369 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8371: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8377: \$? = $ac_status" >&5
+  echo "$as_me:8379: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8393,7 +8395,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8396: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8398: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8406,13 +8408,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8409: checking for $ac_func" >&5
+echo "$as_me:8411: 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 8415 "configure"
+#line 8417 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8443,16 +8445,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8449: \$? = $ac_status" >&5
+  echo "$as_me:8451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8455: \$? = $ac_status" >&5
+  echo "$as_me:8457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8462,7 +8464,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8465: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8476,7 +8478,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8479: checking if you want to use sysmouse" >&5
+echo "$as_me:8481: 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.
@@ -8488,7 +8490,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8491 "configure"
+#line 8493 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8511,16 +8513,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8517: \$? = $ac_status" >&5
+  echo "$as_me:8519: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8523: \$? = $ac_status" >&5
+  echo "$as_me:8525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8530,7 +8532,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8533: result: $cf_with_sysmouse" >&5
+echo "$as_me:8535: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8540,7 +8542,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8543: checking if you want to disable library suffixes" >&5
+echo "$as_me:8545: 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.
@@ -8557,13 +8559,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8560: result: $disable_lib_suffixes" >&5
+echo "$as_me:8562: 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:8566: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8568: 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.
@@ -8581,22 +8583,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8584: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8586: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8589: checking for updated LDFLAGS" >&5
+echo "$as_me:8591: 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:8592: result: maybe" >&5
+	echo "$as_me:8594: 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:8599: checking for $ac_word" >&5
+echo "$as_me:8601: 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
@@ -8611,7 +8613,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8614: found $ac_dir/$ac_word" >&5
+echo "$as_me:8616: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8619,10 +8621,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8622: result: $cf_ldd_prog" >&5
+  echo "$as_me:8624: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8625: result: no" >&5
+  echo "$as_me:8627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8636,7 +8638,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8639 "configure"
+#line 8641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8648,16 +8650,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8654: \$? = $ac_status" >&5
+  echo "$as_me:8656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8660: \$? = $ac_status" >&5
+  echo "$as_me:8662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8685,7 +8687,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8688: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8697,11 +8699,11 @@ echo "${as_me:-configure}:8688: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8700: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8702: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8704: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8706: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8738,7 +8740,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8741: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8743: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8751,11 +8753,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8754: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8756: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8758: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8760: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8792,7 +8794,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8795: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8805,14 +8807,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8808: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8810: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8812: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8814: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8815: result: no" >&5
+	echo "$as_me:8817: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8826,7 +8828,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8829: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:8831: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8843,7 +8845,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8846: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:8848: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8851,7 +8853,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8854: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:8856: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -8870,11 +8872,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8873: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:8875: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8877: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8879: 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.
@@ -8884,10 +8886,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8887: result: $with_overwrite" >&5
+echo "$as_me:8889: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8890: checking if external terminfo-database is used" >&5
+echo "$as_me:8892: 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.
@@ -8897,7 +8899,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8900: result: $use_database" >&5
+echo "$as_me:8902: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8913,7 +8915,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8916: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:8918: 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.
@@ -8921,10 +8923,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8924: result: $TERMINFO_SRC" >&5
+	echo "$as_me:8926: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8927: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:8929: 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.
@@ -8934,13 +8936,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8937: result: $with_hashed_db" >&5
+	echo "$as_me:8939: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8943: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:8945: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -8950,7 +8952,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8953: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:8955: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -8958,7 +8960,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8961: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:8963: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8974,7 +8976,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8977: checking for $ac_word" >&5
+echo "$as_me:8979: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8989,7 +8991,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8992: found $ac_dir/$ac_word" >&5
+echo "$as_me:8994: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8997,10 +8999,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9000: result: $TIC" >&5
+  echo "$as_me:9002: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9003: result: no" >&5
+  echo "$as_me:9005: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9009,7 +9011,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9012: checking for $ac_word" >&5
+echo "$as_me:9014: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9024,7 +9026,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9027: found $ac_dir/$ac_word" >&5
+echo "$as_me:9029: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9032,10 +9034,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9035: result: $ac_ct_TIC" >&5
+  echo "$as_me:9037: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9038: result: no" >&5
+  echo "$as_me:9040: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9047,7 +9049,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9050: checking for $ac_word" >&5
+echo "$as_me:9052: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9062,7 +9064,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9065: found $ac_dir/$ac_word" >&5
+echo "$as_me:9067: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9070,10 +9072,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9073: result: $INFOCMP" >&5
+  echo "$as_me:9075: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9076: result: no" >&5
+  echo "$as_me:9078: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9082,7 +9084,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9085: checking for $ac_word" >&5
+echo "$as_me:9087: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9097,7 +9099,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9100: found $ac_dir/$ac_word" >&5
+echo "$as_me:9102: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9105,10 +9107,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9108: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9110: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9111: result: no" >&5
+  echo "$as_me:9113: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9123,10 +9125,10 @@ 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:9126: checking for tic program for fallbacks" >&5
+  echo "$as_me:9128: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9129: result: $TIC" >&5
+		echo "$as_me:9131: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9154,7 +9156,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9157: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9159: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9167,7 +9169,7 @@ 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:9170: checking for $ac_word" >&5
+echo "$as_me:9172: 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
@@ -9184,7 +9186,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9187: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9189: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9195,10 +9197,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9198: result: $TIC" >&5
+  echo "$as_me:9200: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9201: result: no" >&5
+  echo "$as_me:9203: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9257,7 +9259,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9260: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9262: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9272,7 +9274,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9275: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9277: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9281,10 +9283,10 @@ 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:9284: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9286: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9287: result: $INFOCMP" >&5
+		echo "$as_me:9289: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9312,7 +9314,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9315: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9317: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9325,7 +9327,7 @@ 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:9328: checking for $ac_word" >&5
+echo "$as_me:9330: 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
@@ -9342,7 +9344,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9345: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9347: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9353,10 +9355,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9356: result: $INFOCMP" >&5
+  echo "$as_me:9358: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9359: result: no" >&5
+  echo "$as_me:9361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9415,7 +9417,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9418: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9420: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9430,7 +9432,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9433: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9435: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9440,7 +9442,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9443: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9445: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9448,7 +9450,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9451: checking if you want modern xterm or antique" >&5
+echo "$as_me:9453: 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.
@@ -9462,7 +9464,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9465: result: $with_xterm_new" >&5
+echo "$as_me:9467: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9475,7 +9477,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9478: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9480: 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.
@@ -9499,13 +9501,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9502: result: $with_xterm_kbs" >&5
+echo "$as_me:9504: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9508: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9510: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9515,7 +9517,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9518: checking for list of terminfo directories" >&5
+echo "$as_me:9520: 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.
@@ -9555,7 +9557,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9558: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9560: 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; }; }
 	;;
@@ -9578,7 +9580,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9581: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9583: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9587,13 +9589,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9590: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9592: 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:9596: checking for default terminfo directory" >&5
+echo "$as_me:9598: 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.
@@ -9629,7 +9631,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9632: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9634: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9638,7 +9640,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9641: result: $TERMINFO" >&5
+echo "$as_me:9643: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9649,7 +9651,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9652: checking if big-core option selected" >&5
+echo "$as_me:9654: 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.
@@ -9661,7 +9663,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9664 "configure"
+#line 9666 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9675,15 +9677,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9681: \$? = $ac_status" >&5
+  echo "$as_me:9683: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9686: \$? = $ac_status" >&5
+  echo "$as_me:9688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9695,7 +9697,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9698: result: $with_big_core" >&5
+echo "$as_me:9700: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9705,7 +9707,7 @@ EOF
 ### 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:9708: checking if big-strings option selected" >&5
+echo "$as_me:9710: 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.
@@ -9729,14 +9731,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9732: result: $with_big_strings" >&5
+echo "$as_me:9734: 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:9739: checking if you want termcap-fallback support" >&5
+echo "$as_me:9741: 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.
@@ -9746,14 +9748,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9749: result: $with_termcap" >&5
+echo "$as_me:9751: 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:9756: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:9758: 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
@@ -9766,13 +9768,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9769: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:9771: 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:9775: checking for list of termcap files" >&5
+	echo "$as_me:9777: 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.
@@ -9812,7 +9814,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9815: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9817: 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; }; }
 	;;
@@ -9835,7 +9837,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9838: result: $TERMPATH" >&5
+	echo "$as_me:9840: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9843,7 +9845,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9846: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:9848: 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.
@@ -9853,14 +9855,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9856: result: $with_getcap" >&5
+	echo "$as_me:9858: 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:9863: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:9865: 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.
@@ -9870,7 +9872,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9873: result: $with_getcap_cache" >&5
+	echo "$as_me:9875: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9880,7 +9882,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9883: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9885: 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.
@@ -9890,14 +9892,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9893: result: $with_home_terminfo" >&5
+echo "$as_me:9895: 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:9900: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9902: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9907,14 +9909,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9910: result: $with_root_environ" >&5
+echo "$as_me:9912: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9917: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9919: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9924,14 +9926,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9927: result: $with_root_access" >&5
+echo "$as_me:9929: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9934: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:9936: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9941,7 +9943,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9944: result: $with_setuid_environ" >&5
+echo "$as_me:9946: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9956,23 +9958,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9959: checking for $ac_header" >&5
+echo "$as_me:9961: 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 9965 "configure"
+#line 9967 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9969: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9971: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9975: \$? = $ac_status" >&5
+  echo "$as_me:9977: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9991,7 +9993,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9994: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9996: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10006,13 +10008,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10009: checking for $ac_func" >&5
+echo "$as_me:10011: 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 10015 "configure"
+#line 10017 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10043,16 +10045,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $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:10054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10055: \$? = $ac_status" >&5
+  echo "$as_me:10057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10062,7 +10064,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10065: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10067: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10079,13 +10081,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10082: checking for $ac_func" >&5
+echo "$as_me:10084: 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 10088 "configure"
+#line 10090 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10116,16 +10118,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10122: \$? = $ac_status" >&5
+  echo "$as_me:10124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10128: \$? = $ac_status" >&5
+  echo "$as_me:10130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10135,7 +10137,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10138: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10140: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10146,7 +10148,7 @@ fi
 done
 
 else
-	echo "$as_me:10149: checking if link/symlink functions work" >&5
+	echo "$as_me:10151: 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
@@ -10159,7 +10161,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10162 "configure"
+#line 10164 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10193,15 +10195,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10199: \$? = $ac_status" >&5
+  echo "$as_me:10201: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10204: \$? = $ac_status" >&5
+  echo "$as_me:10206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10219,7 +10221,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10222: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10224: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10239,7 +10241,7 @@ with_symlinks=no
 # 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:10242: checking if tic should use symbolic links" >&5
+	echo "$as_me:10244: 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.
@@ -10249,21 +10251,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10252: result: $with_symlinks" >&5
+	echo "$as_me:10254: 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:10259: checking if tic should use hard links" >&5
+	echo "$as_me:10261: 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:10266: result: $with_links" >&5
+	echo "$as_me:10268: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10279,7 +10281,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10282: checking if you want broken-linker support code" >&5
+echo "$as_me:10284: 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.
@@ -10289,7 +10291,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10292: result: $with_broken_linker" >&5
+echo "$as_me:10294: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10303,7 +10305,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10306: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10308: 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.
@@ -10313,7 +10315,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10316: result: $with_bsdpad" >&5
+echo "$as_me:10318: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10332,14 +10334,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10335: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10337: 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 10342 "configure"
+#line 10344 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10358,16 +10360,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10364: \$? = $ac_status" >&5
+  echo "$as_me:10366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10370: \$? = $ac_status" >&5
+  echo "$as_me:10372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10378,7 +10380,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10381: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10383: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10420,14 +10422,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10423: checking if this is the GNU C library" >&5
+echo "$as_me:10425: 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 10430 "configure"
+#line 10432 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10446,16 +10448,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10452: \$? = $ac_status" >&5
+  echo "$as_me:10454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10458: \$? = $ac_status" >&5
+  echo "$as_me:10460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10466,7 +10468,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10469: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10471: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10474,7 +10476,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10477: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10479: 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
@@ -10486,7 +10488,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10489 "configure"
+#line 10491 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10505,16 +10507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10511: \$? = $ac_status" >&5
+  echo "$as_me:10513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10517: \$? = $ac_status" >&5
+  echo "$as_me:10519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10526,12 +10528,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10529: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10531: 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:10534: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10536: 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
@@ -10636,7 +10638,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10639 "configure"
+#line 10641 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10656,16 +10658,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10662: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $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:10667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10668: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10676,7 +10678,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10679: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10681: 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
@@ -10685,14 +10687,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10688: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10690: 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 10695 "configure"
+#line 10697 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10707,16 +10709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10713: \$? = $ac_status" >&5
+  echo "$as_me:10715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10719: \$? = $ac_status" >&5
+  echo "$as_me:10721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10823,7 +10825,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10826 "configure"
+#line 10828 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10838,16 +10840,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10844: \$? = $ac_status" >&5
+  echo "$as_me:10846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10850: \$? = $ac_status" >&5
+  echo "$as_me:10852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10862,12 +10864,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10865: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10867: 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:10870: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:10872: 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
@@ -10877,7 +10879,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10880 "configure"
+#line 10882 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10892,16 +10894,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10898: \$? = $ac_status" >&5
+  echo "$as_me:10900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10904: \$? = $ac_status" >&5
+  echo "$as_me:10906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10912,7 +10914,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10915: result: $cf_cv_default_source" >&5
+echo "$as_me:10917: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10949,16 +10951,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10952: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10954: 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}:10958: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10960: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10961 "configure"
+#line 10963 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10973,16 +10975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10979: \$? = $ac_status" >&5
+  echo "$as_me:10981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10985: \$? = $ac_status" >&5
+  echo "$as_me:10987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11003,7 +11005,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11006 "configure"
+#line 11008 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11018,16 +11020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11024: \$? = $ac_status" >&5
+  echo "$as_me:11026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11030: \$? = $ac_status" >&5
+  echo "$as_me:11032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11038,7 +11040,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11041: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11046,10 +11048,10 @@ echo "${as_me:-configure}:11041: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11049: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11051: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11052 "configure"
+#line 11054 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11064,16 +11066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11070: \$? = $ac_status" >&5
+  echo "$as_me:11072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11076: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11089,7 +11091,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11092: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11094: 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
@@ -11206,7 +11208,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11209: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11211: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11238,14 +11240,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11241: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11243: 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 11248 "configure"
+#line 11250 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11263,16 +11265,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11269: \$? = $ac_status" >&5
+  echo "$as_me:11271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11275: \$? = $ac_status" >&5
+  echo "$as_me:11277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11284,7 +11286,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11287 "configure"
+#line 11289 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11302,16 +11304,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11308: \$? = $ac_status" >&5
+  echo "$as_me:11310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11326,7 +11328,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11329: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11331: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11486,16 +11488,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11489: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11491: 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}:11495: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11497: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11498 "configure"
+#line 11500 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11510,16 +11512,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11516: \$? = $ac_status" >&5
+  echo "$as_me:11518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11522: \$? = $ac_status" >&5
+  echo "$as_me:11524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11540,7 +11542,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11543 "configure"
+#line 11545 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11555,16 +11557,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11561: \$? = $ac_status" >&5
+  echo "$as_me:11563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11567: \$? = $ac_status" >&5
+  echo "$as_me:11569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11575,7 +11577,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11578: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11583,10 +11585,10 @@ echo "${as_me:-configure}:11578: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11586: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11588: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11589 "configure"
+#line 11591 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11601,16 +11603,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11626,7 +11628,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11629: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11631: 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
@@ -11739,10 +11741,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11742: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11745 "configure"
+#line 11747 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11760,23 +11762,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11766: \$? = $ac_status" >&5
+  echo "$as_me:11768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11772: \$? = $ac_status" >&5
+  echo "$as_me:11774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11779: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:11781: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11799,7 +11801,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11802: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11804: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11811,7 +11813,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11814: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11816: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11899,7 +11901,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11902: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11904: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11909,7 +11911,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11912: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11914: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11919,7 +11921,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11922: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11924: 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"
@@ -11931,10 +11933,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11934: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11936: 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 11937 "configure"
+#line 11939 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11949,16 +11951,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11955: \$? = $ac_status" >&5
+  echo "$as_me:11957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11961: \$? = $ac_status" >&5
+  echo "$as_me:11963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11967,12 +11969,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11970: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11972: 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 11975 "configure"
+#line 11977 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11987,16 +11989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11993: \$? = $ac_status" >&5
+  echo "$as_me:11995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11999: \$? = $ac_status" >&5
+  echo "$as_me:12001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12007,19 +12009,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12010: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12012: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12015: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12017: 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 12022 "configure"
+#line 12024 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12037,16 +12039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12043: \$? = $ac_status" >&5
+  echo "$as_me:12045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12049: \$? = $ac_status" >&5
+  echo "$as_me:12051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12058,7 +12060,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12061 "configure"
+#line 12063 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12076,16 +12078,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12082: \$? = $ac_status" >&5
+  echo "$as_me:12084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12088: \$? = $ac_status" >&5
+  echo "$as_me:12090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12100,7 +12102,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12103: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12105: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12251,14 +12253,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12254: checking if SIGWINCH is defined" >&5
+echo "$as_me:12256: 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 12261 "configure"
+#line 12263 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12273,23 +12275,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12279: \$? = $ac_status" >&5
+  echo "$as_me:12281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12285: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $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 12292 "configure"
+#line 12294 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12307,16 +12309,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12313: \$? = $ac_status" >&5
+  echo "$as_me:12315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12319: \$? = $ac_status" >&5
+  echo "$as_me:12321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12330,11 +12332,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12333: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12335: 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:12337: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12339: 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
@@ -12345,7 +12347,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12348 "configure"
+#line 12350 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12367,16 +12369,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12373: \$? = $ac_status" >&5
+  echo "$as_me:12375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12379: \$? = $ac_status" >&5
+  echo "$as_me:12381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12390,7 +12392,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12393: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12395: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12400,13 +12402,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12403: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12405: 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 12409 "configure"
+#line 12411 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12420,16 +12422,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12426: \$? = $ac_status" >&5
+  echo "$as_me:12428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12432: \$? = $ac_status" >&5
+  echo "$as_me:12434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12440,7 +12442,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12443: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12445: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12454,7 +12456,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12457: checking if you want wide-character code" >&5
+echo "$as_me:12459: 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.
@@ -12464,7 +12466,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12467: result: $with_widec" >&5
+echo "$as_me:12469: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12486,7 +12488,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12489: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12491: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12499,23 +12501,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12502: checking for $ac_header" >&5
+echo "$as_me:12504: 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 12508 "configure"
+#line 12510 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12512: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12518: \$? = $ac_status" >&5
+  echo "$as_me:12520: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12534,7 +12536,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12537: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12539: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12544,14 +12546,14 @@ EOF
 fi
 done
 
-echo "$as_me:12547: checking if wchar.h can be used as is" >&5
+echo "$as_me:12549: 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 12554 "configure"
+#line 12556 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12573,16 +12575,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12579: \$? = $ac_status" >&5
+  echo "$as_me:12581: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12585: \$? = $ac_status" >&5
+  echo "$as_me:12587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12592,16 +12594,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12595: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12597: 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:12601: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12603: 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 12604 "configure"
+#line 12606 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12617,16 +12619,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12629: \$? = $ac_status" >&5
+  echo "$as_me:12631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12635,16 +12637,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12638: result: $cf_result" >&5
+echo "$as_me:12640: 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:12644: checking checking for compatible value versus " >&5
+	echo "$as_me:12646: 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 12647 "configure"
+#line 12649 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12660,16 +12662,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12666: \$? = $ac_status" >&5
+  echo "$as_me:12668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12672: \$? = $ac_status" >&5
+  echo "$as_me:12674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12678,7 +12680,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12681: result: $cf_result" >&5
+	echo "$as_me:12683: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12688,7 +12690,7 @@ fi
 
 fi
 
-echo "$as_me:12691: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12693: 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
@@ -12759,7 +12761,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12762 "configure"
+#line 12764 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12804,15 +12806,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12810: \$? = $ac_status" >&5
+  echo "$as_me:12812: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12815: \$? = $ac_status" >&5
+  echo "$as_me:12817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12825,7 +12827,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12828: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12830: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12836,13 +12838,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12839: checking for $ac_func" >&5
+echo "$as_me:12841: 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 12845 "configure"
+#line 12847 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12873,16 +12875,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12878: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12879: \$? = $ac_status" >&5
+  echo "$as_me:12881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12885: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12892,7 +12894,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12895: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12897: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12907,23 +12909,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12910: checking for $ac_header" >&5
+echo "$as_me:12912: 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 12916 "configure"
+#line 12918 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12920: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12926: \$? = $ac_status" >&5
+  echo "$as_me:12928: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12942,7 +12944,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12945: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12952,7 +12954,7 @@ EOF
 fi
 done
 
-echo "$as_me:12955: checking for multibyte character support" >&5
+echo "$as_me:12957: 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
@@ -12960,7 +12962,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12963 "configure"
+#line 12965 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12977,16 +12979,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12983: \$? = $ac_status" >&5
+  echo "$as_me:12985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12989: \$? = $ac_status" >&5
+  echo "$as_me:12991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -12998,12 +13000,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13001: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13003: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13006 "configure"
+#line 13008 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13016,16 +13018,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13022: \$? = $ac_status" >&5
+  echo "$as_me:13024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13028: \$? = $ac_status" >&5
+  echo "$as_me:13030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13039,7 +13041,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13042 "configure"
+#line 13044 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13052,16 +13054,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13058: \$? = $ac_status" >&5
+  echo "$as_me:13060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13064: \$? = $ac_status" >&5
+  echo "$as_me:13066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13078,9 +13080,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13081: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13083: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13083: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13085: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13171,7 +13173,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13174: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13179,7 +13181,7 @@ echo "${as_me:-configure}:13174: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13182 "configure"
+#line 13184 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13192,21 +13194,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13198: \$? = $ac_status" >&5
+  echo "$as_me:13200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13204: \$? = $ac_status" >&5
+  echo "$as_me:13206: \$? = $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}:13209: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13211: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13224,7 +13226,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13227: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13229: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13299,13 +13301,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13302: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13304: 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 13308 "configure"
+#line 13310 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13318,21 +13320,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13324: \$? = $ac_status" >&5
+  echo "$as_me:13326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13330: \$? = $ac_status" >&5
+  echo "$as_me:13332: \$? = $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}:13335: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13337: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13374,7 +13376,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13377: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13379: 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
@@ -13412,7 +13414,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13415 "configure"
+#line 13417 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13424,16 +13426,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13430: \$? = $ac_status" >&5
+  echo "$as_me:13432: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13436: \$? = $ac_status" >&5
+  echo "$as_me:13438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13450,7 +13452,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13453: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13455: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13486,7 +13488,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13489: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13518,14 +13520,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13521: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13523: 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 13528 "configure"
+#line 13530 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13543,23 +13545,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13549: \$? = $ac_status" >&5
+  echo "$as_me:13551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13555: \$? = $ac_status" >&5
+  echo "$as_me:13557: \$? = $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 13562 "configure"
+#line 13564 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13578,16 +13580,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13584: \$? = $ac_status" >&5
+  echo "$as_me:13586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13590: \$? = $ac_status" >&5
+  echo "$as_me:13592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13599,7 +13601,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13602: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13604: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13617,14 +13619,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13620: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13622: 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 13627 "configure"
+#line 13629 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13642,23 +13644,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:13650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13654: \$? = $ac_status" >&5
+  echo "$as_me:13656: \$? = $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 13661 "configure"
+#line 13663 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13677,16 +13679,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13683: \$? = $ac_status" >&5
+  echo "$as_me:13685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13689: \$? = $ac_status" >&5
+  echo "$as_me:13691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13698,7 +13700,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13701: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13703: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13721,14 +13723,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13724: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13726: 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 13731 "configure"
+#line 13733 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13746,23 +13748,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13752: \$? = $ac_status" >&5
+  echo "$as_me:13754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13758: \$? = $ac_status" >&5
+  echo "$as_me:13760: \$? = $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 13765 "configure"
+#line 13767 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13781,16 +13783,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13787: \$? = $ac_status" >&5
+  echo "$as_me:13789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13793: \$? = $ac_status" >&5
+  echo "$as_me:13795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13802,7 +13804,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13805: result: $cf_cv_wint_t" >&5
+echo "$as_me:13807: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13834,7 +13836,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13837: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13839: 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.
@@ -13844,7 +13846,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13847: result: $with_lp64" >&5
+echo "$as_me:13849: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13860,7 +13862,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13863: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13865: 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
@@ -13872,7 +13874,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13875 "configure"
+#line 13877 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13892,16 +13894,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13898: \$? = $ac_status" >&5
+  echo "$as_me:13900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13904: \$? = $ac_status" >&5
+  echo "$as_me:13906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13911,16 +13913,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13917: \$? = $ac_status" >&5
+  echo "$as_me:13919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13923: \$? = $ac_status" >&5
+  echo "$as_me:13925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13934,13 +13936,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13937: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13939: 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:13943: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13945: 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
@@ -13948,7 +13950,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13951 "configure"
+#line 13953 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13968,16 +13970,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13974: \$? = $ac_status" >&5
+  echo "$as_me:13976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13980: \$? = $ac_status" >&5
+  echo "$as_me:13982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13986,7 +13988,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13989 "configure"
+#line 13991 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14007,16 +14009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14013: \$? = $ac_status" >&5
+  echo "$as_me:14015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14019: \$? = $ac_status" >&5
+  echo "$as_me:14021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14027,7 +14029,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14030: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14032: 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
 
@@ -14037,7 +14039,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14040: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14042: 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
@@ -14045,7 +14047,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14048 "configure"
+#line 14050 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14065,16 +14067,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14077: \$? = $ac_status" >&5
+  echo "$as_me:14079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14083,7 +14085,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14086 "configure"
+#line 14088 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14104,16 +14106,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14110: \$? = $ac_status" >&5
+  echo "$as_me:14112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14116: \$? = $ac_status" >&5
+  echo "$as_me:14118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14124,7 +14126,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14127: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14129: 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
 
@@ -14137,7 +14139,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14140: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14142: 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
@@ -14145,7 +14147,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14148 "configure"
+#line 14150 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14157,16 +14159,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14163: \$? = $ac_status" >&5
+  echo "$as_me:14165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14169: \$? = $ac_status" >&5
+  echo "$as_me:14171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14175,7 +14177,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14178 "configure"
+#line 14180 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14188,16 +14190,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14191: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14194: \$? = $ac_status" >&5
+  echo "$as_me:14196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14200: \$? = $ac_status" >&5
+  echo "$as_me:14202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14208,7 +14210,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14211: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14213: 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
 
@@ -14222,13 +14224,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14225: checking for fseeko" >&5
+echo "$as_me:14227: 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 14231 "configure"
+#line 14233 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14240,16 +14242,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14246: \$? = $ac_status" >&5
+  echo "$as_me:14248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14252: \$? = $ac_status" >&5
+  echo "$as_me:14254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14259,7 +14261,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14262: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14264: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14298,14 +14300,14 @@ fi
 
 	fi
 
-	echo "$as_me:14301: checking whether to use struct dirent64" >&5
+	echo "$as_me:14303: 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 14308 "configure"
+#line 14310 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14328,16 +14330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14334: \$? = $ac_status" >&5
+  echo "$as_me:14336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14340: \$? = $ac_status" >&5
+  echo "$as_me:14342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14348,7 +14350,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14351: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14353: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14358,7 +14360,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14361: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14363: 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.
@@ -14368,14 +14370,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14371: result: $with_tparm_varargs" >&5
+echo "$as_me:14373: 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:14378: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14380: 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.
@@ -14385,14 +14387,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14388: result: $with_tic_depends" >&5
+echo "$as_me:14390: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14395: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14397: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14404,15 +14406,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14407: result: no" >&5
+	echo "$as_me:14409: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14411: result: yes" >&5
+	echo "$as_me:14413: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14415: checking for X11 rgb file" >&5
+echo "$as_me:14417: 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.
@@ -14476,7 +14478,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14479: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14481: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14484,7 +14486,7 @@ esac
 
 fi
 
-echo "$as_me:14487: result: $RGB_PATH" >&5
+echo "$as_me:14489: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14498,7 +14500,8 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
-echo "$as_me:14501: checking for type of bool" >&5
+
+echo "$as_me:14504: 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.
@@ -14508,10 +14511,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14511: result: $NCURSES_BOOL" >&5
+echo "$as_me:14514: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
+case x$NCURSES_BOOL in
+(x|xyes|xno)
+	{ { echo "$as_me:14518: error: expected a type name for bool" >&5
+echo "$as_me: error: expected a type name for bool" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
-echo "$as_me:14514: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14524: 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.
@@ -14523,15 +14533,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14526: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14536: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14530: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14540: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
-echo "$as_me:14534: checking for type of chtype" >&5
+
+echo "$as_me:14545: 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.
@@ -14541,11 +14552,19 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14544: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14555: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+case x$NCURSES_CHTYPE in
+(x|xyes|xno)
+	{ { echo "$as_me:14559: error: expected a type name for chtype" >&5
+echo "$as_me: error: expected a type name for chtype" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
 ###   use option --with-ospeed to override ospeed's type
-echo "$as_me:14548: checking for type of ospeed" >&5
+
+echo "$as_me:14567: 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.
@@ -14555,12 +14574,20 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14558: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14577: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
+case x$NCURSES_OSPEED in
+(x|xyes|xno)
+	{ { echo "$as_me:14581: error: expected a type name for ospeed" >&5
+echo "$as_me: error: expected a type name for ospeed" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
 ###   use option --with-mmask-t to override mmask_t's type
-echo "$as_me:14562: checking for type of mmask_t" >&5
-echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+
+echo "$as_me:14589: 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.
 if test "${with_mmask_t+set}" = set; then
@@ -14569,11 +14596,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14572: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14599: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+case x$NCURSES_MMASK_T in
+(x|xyes|xno)
+	{ { echo "$as_me:14603: error: expected a type name for mmask-t" >&5
+echo "$as_me: error: expected a type name for mmask-t" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14576: checking for size CCHARW_MAX" >&5
+echo "$as_me:14610: 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.
@@ -14583,16 +14617,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14586: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14620: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14589: checking for signed char" >&5
+echo "$as_me:14623: 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 14595 "configure"
+#line 14629 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14607,16 +14641,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14613: \$? = $ac_status" >&5
+  echo "$as_me:14647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14619: \$? = $ac_status" >&5
+  echo "$as_me:14653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14626,10 +14660,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14629: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14663: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14632: checking size of signed char" >&5
+echo "$as_me:14666: 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
@@ -14638,7 +14672,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14641 "configure"
+#line 14675 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14650,21 +14684,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14656: \$? = $ac_status" >&5
+  echo "$as_me:14690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14662: \$? = $ac_status" >&5
+  echo "$as_me:14696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14667 "configure"
+#line 14701 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14676,16 +14710,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14682: \$? = $ac_status" >&5
+  echo "$as_me:14716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14688: \$? = $ac_status" >&5
+  echo "$as_me:14722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14701,7 +14735,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14704 "configure"
+#line 14738 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14713,16 +14747,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14719: \$? = $ac_status" >&5
+  echo "$as_me:14753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14725: \$? = $ac_status" >&5
+  echo "$as_me:14759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14738,7 +14772,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14741 "configure"
+#line 14775 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14750,16 +14784,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14756: \$? = $ac_status" >&5
+  echo "$as_me:14790: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14762: \$? = $ac_status" >&5
+  echo "$as_me:14796: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14772,12 +14806,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14775: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14809: 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 14780 "configure"
+#line 14814 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14793,15 +14827,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14799: \$? = $ac_status" >&5
+  echo "$as_me:14833: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14804: \$? = $ac_status" >&5
+  echo "$as_me:14838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14817,7 +14851,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14820: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14854: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14828,7 +14862,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14831: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:14865: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -14838,13 +14872,14 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14841: result: $with_signed_char" >&5
+echo "$as_me:14875: 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:14846: checking for type of tparm args" >&5
-echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+
+echo "$as_me:14881: checking for type of tparm-arg" >&5
+echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
 if test "${with_tparm_arg+set}" = set; then
@@ -14853,11 +14888,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14856: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14891: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+case x$NCURSES_TPARM_ARG in
+(x|xyes|xno)
+	{ { echo "$as_me:14895: error: expected a type name for tparm-arg" >&5
+echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14860: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14902: 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.
@@ -14867,7 +14909,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14870: result: $with_rcs_ids" >&5
+echo "$as_me:14912: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14876,7 +14918,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14879: checking format of man-pages" >&5
+echo "$as_me:14921: 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.
@@ -14967,10 +15009,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:14970: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15012: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:14973: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15015: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15009,7 +15051,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15012: checking for manpage renaming" >&5
+echo "$as_me:15054: 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.
@@ -15038,15 +15080,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15041: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15083: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15046: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15088: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15049: checking if manpage aliases will be installed" >&5
+echo "$as_me:15091: 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.
@@ -15057,7 +15099,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15060: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15102: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15071,7 +15113,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15074: checking if manpage symlinks should be used" >&5
+echo "$as_me:15116: 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.
@@ -15084,17 +15126,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15087: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15129: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15093: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15135: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15097: checking for manpage tbl" >&5
+echo "$as_me:15139: 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.
@@ -15105,7 +15147,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15108: result: $MANPAGE_TBL" >&5
+echo "$as_me:15150: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15423,7 +15465,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15426: checking if you want to build with function extensions" >&5
+echo "$as_me:15468: 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.
@@ -15433,7 +15475,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15436: result: $with_ext_funcs" >&5
+echo "$as_me:15478: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15489,7 +15531,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15492: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15534: 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.
@@ -15499,7 +15541,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15502: result: $with_sp_funcs" >&5
+echo "$as_me:15544: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15518,7 +15560,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15521: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15563: 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.
@@ -15528,7 +15570,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15531: result: $with_term_driver" >&5
+echo "$as_me:15573: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15537,19 +15579,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15540: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15582: 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:15545: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15587: 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:15552: checking for extended use of const keyword" >&5
+echo "$as_me:15594: 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.
@@ -15559,7 +15601,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15562: result: $with_ext_const" >&5
+echo "$as_me:15604: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15567,7 +15609,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15570: checking if you want to use extended colors" >&5
+echo "$as_me:15612: 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.
@@ -15577,12 +15619,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15580: result: $with_ext_colors" >&5
+echo "$as_me:15622: 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:15585: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15627: 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)
@@ -15593,7 +15635,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15596: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15638: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15621,7 +15663,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15624: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15666: 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.
@@ -15631,7 +15673,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15634: result: $with_ext_mouse" >&5
+echo "$as_me:15676: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15641,7 +15683,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15644: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15686: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15658,7 +15700,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15661: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15703: 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.
@@ -15668,7 +15710,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15671: result: $with_ext_putwin" >&5
+echo "$as_me:15713: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15678,7 +15720,7 @@ EOF
 
 fi
 
-echo "$as_me:15681: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15723: 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.
@@ -15688,7 +15730,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15691: result: $with_no_padding" >&5
+echo "$as_me:15733: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15696,7 +15738,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15699: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15741: 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.
@@ -15706,7 +15748,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15709: result: $with_sigwinch" >&5
+echo "$as_me:15751: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15714,7 +15756,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15717: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15759: 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.
@@ -15724,7 +15766,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15727: result: $with_tcap_names" >&5
+echo "$as_me:15769: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15738,7 +15780,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15741: checking if you want to link with the pthread library" >&5
+echo "$as_me:15783: 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.
@@ -15748,27 +15790,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15751: result: $with_pthread" >&5
+echo "$as_me:15793: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15755: checking for pthread.h" >&5
+	echo "$as_me:15797: 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 15761 "configure"
+#line 15803 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15807: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15771: \$? = $ac_status" >&5
+  echo "$as_me:15813: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15787,7 +15829,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15790: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15832: 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
 
@@ -15797,7 +15839,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15800: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15842: 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"
 
@@ -15818,7 +15860,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15821 "configure"
+#line 15863 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15835,16 +15877,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15841: \$? = $ac_status" >&5
+  echo "$as_me:15883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15847: \$? = $ac_status" >&5
+  echo "$as_me:15889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15854,7 +15896,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15857: result: $with_pthread" >&5
+	    echo "$as_me:15899: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15882,7 +15924,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15885: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15927: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15892,13 +15934,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15895: checking for pthread_kill" >&5
+	echo "$as_me:15937: 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 15901 "configure"
+#line 15943 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15929,16 +15971,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15935: \$? = $ac_status" >&5
+  echo "$as_me:15977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15941: \$? = $ac_status" >&5
+  echo "$as_me:15983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15948,11 +15990,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15951: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15993: 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:15955: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:15997: 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.
@@ -15962,7 +16004,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:15965: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16007: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -15973,7 +16015,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:15976: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16018: 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.
@@ -15983,18 +16025,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:15986: result: $use_weak_symbols" >&5
+	echo "$as_me:16028: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:15990: checking if $CC supports weak symbols" >&5
+echo "$as_me:16032: 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 15997 "configure"
+#line 16039 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16020,16 +16062,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16026: \$? = $ac_status" >&5
+  echo "$as_me:16068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16032: \$? = $ac_status" >&5
+  echo "$as_me:16074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16040,7 +16082,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16043: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16085: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16090,7 +16132,7 @@ fi
 # 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:16093: checking if you want reentrant code" >&5
+echo "$as_me:16135: 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.
@@ -16100,7 +16142,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16103: result: $with_reentrant" >&5
+echo "$as_me:16145: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16189,7 +16231,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16192: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16234: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16201,7 +16243,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16204: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16246: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16223,16 +16265,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16226: result: $enable_opaque_curses" >&5
+echo "$as_me:16268: 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:16231: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16273: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16235: checking whether form library structures should be opaque" >&5
+echo "$as_me:16277: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16242,10 +16284,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16245: result: $enable_opaque_form" >&5
+echo "$as_me:16287: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16248: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16290: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16255,10 +16297,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16258: result: $enable_opaque_menu" >&5
+echo "$as_me:16300: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16261: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16303: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16268,7 +16310,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16271: result: $enable_opaque_panel" >&5
+echo "$as_me:16313: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16278,7 +16320,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16281: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16323: 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.
@@ -16288,7 +16330,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16291: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16333: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16301,7 +16343,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16304: checking if you want all development code" >&5
+echo "$as_me:16346: 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.
@@ -16311,11 +16353,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16314: result: $with_develop" >&5
+echo "$as_me:16356: 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:16318: checking if you want hard-tabs code" >&5
+echo "$as_me:16360: 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.
@@ -16325,7 +16367,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16328: result: $enable_hard_tabs" >&5
+echo "$as_me:16370: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16333,7 +16375,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16336: checking if you want limited support for xmc" >&5
+echo "$as_me:16378: 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.
@@ -16343,7 +16385,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16346: result: $enable_xmc_glitch" >&5
+echo "$as_me:16388: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16353,7 +16395,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16356: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16398: 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.
@@ -16363,7 +16405,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16366: result: $with_assumed_color" >&5
+echo "$as_me:16408: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16371,7 +16413,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16374: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16416: 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.
@@ -16381,7 +16423,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16384: result: $with_hashmap" >&5
+echo "$as_me:16426: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16389,7 +16431,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16392: checking if you want code to check screensize" >&5
+echo "$as_me:16434: checking if you want code to check screensize" >&5
 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16399,7 +16441,7 @@ if test "${enable_check_size+set}" = set; then
 else
   with_check_size=no
 fi;
-echo "$as_me:16402: result: $with_check_size" >&5
+echo "$as_me:16444: result: $with_check_size" >&5
 echo "${ECHO_T}$with_check_size" >&6
 test "x$with_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16407,7 +16449,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16410: checking if you want colorfgbg code" >&5
+echo "$as_me:16452: 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.
@@ -16417,7 +16459,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16420: result: $with_colorfgbg" >&5
+echo "$as_me:16462: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16425,7 +16467,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16428: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16470: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16435,14 +16477,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16438: result: $cf_with_fvisibility" >&5
+echo "$as_me:16480: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16445: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16487: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16451,7 +16493,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16454 "configure"
+#line 16496 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16467,16 +16509,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16473: \$? = $ac_status" >&5
+  echo "$as_me:16515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16479: \$? = $ac_status" >&5
+  echo "$as_me:16521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16488,7 +16530,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16491: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16533: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16603,7 +16645,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16606: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16648: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16612,7 +16654,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16615 "configure"
+#line 16657 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16628,16 +16670,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:16676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16640: \$? = $ac_status" >&5
+  echo "$as_me:16682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16649,7 +16691,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16652: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16694: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16772,7 +16814,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16775: checking if you want interop bindings" >&5
+echo "$as_me:16817: 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.
@@ -16782,13 +16824,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16785: result: $with_exp_interop" >&5
+echo "$as_me:16827: 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:16791: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16833: 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.
@@ -16798,13 +16840,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16801: result: $with_safe_sprintf" >&5
+echo "$as_me:16843: 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:16807: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16849: 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.
@@ -16814,7 +16856,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16817: result: $with_scroll_hints" >&5
+echo "$as_me:16859: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16823,7 +16865,7 @@ EOF
 
 fi
 
-echo "$as_me:16826: checking if you want wgetch-events code" >&5
+echo "$as_me:16868: 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.
@@ -16833,7 +16875,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16836: result: $with_wgetch_events" >&5
+echo "$as_me:16878: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16848,7 +16890,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16851: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16893: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16858,7 +16900,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16861: result: $with_exp_win32" >&5
+	echo "$as_me:16903: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16884,7 +16926,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16887: checking if you want to see long compiling messages" >&5
+echo "$as_me:16929: 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.
@@ -16918,7 +16960,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16921: result: $enableval" >&5
+echo "$as_me:16963: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16931,7 +16973,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16934: checking if you want to install stripped executables" >&5
+echo "$as_me:16976: 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.
@@ -16948,7 +16990,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16951: result: $enable_stripping" >&5
+echo "$as_me:16993: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -16959,7 +17001,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:16962: checking if install accepts -p option" >&5
+echo "$as_me:17004: 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
@@ -16990,10 +17032,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:16993: result: $cf_cv_install_p" >&5
+echo "$as_me:17035: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:16996: checking if install needs to be told about ownership" >&5
+echo "$as_me:17038: 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)
@@ -17004,7 +17046,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17007: result: $with_install_o" >&5
+echo "$as_me:17049: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17015,7 +17057,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17018: checking if you want to specify strip-program" >&5
+	echo "$as_me:17060: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17025,11 +17067,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17028: result: $with_strip_program" >&5
+	echo "$as_me:17070: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17032: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17074: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17050,11 +17092,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17053: result: $check_install_strip" >&5
+		echo "$as_me:17095: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17057: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17099: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17069,7 +17111,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17072: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17114: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17095,7 +17137,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17098: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17140: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17112,17 +17154,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17115: result: $enable_stdnoreturn" >&5
+echo "$as_me:17157: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17119: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17161: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17125 "configure"
+#line 17167 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17138,16 +17180,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17144: \$? = $ac_status" >&5
+  echo "$as_me:17186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17150: \$? = $ac_status" >&5
+  echo "$as_me:17192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17158,7 +17200,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17161: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17203: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17214,16 +17256,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17217: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17259: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17222: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17264: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17226: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17268: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17262,16 +17304,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17265: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17307: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17270: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17312: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17274: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17316: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17310,23 +17352,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17313: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17355: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17318: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17360: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17322: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17364: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17329: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17371: 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.
@@ -17343,7 +17385,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17346: result: $enable_warnings" >&5
+echo "$as_me:17388: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17367,7 +17409,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17370 "configure"
+#line 17412 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17382,26 +17424,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17388: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17394: \$? = $ac_status" >&5
+  echo "$as_me:17436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17397: checking for X11/Xt const-feature" >&5
+echo "$as_me:17439: 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 17404 "configure"
+#line 17446 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -17418,16 +17460,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17424: \$? = $ac_status" >&5
+  echo "$as_me:17466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17430: \$? = $ac_status" >&5
+  echo "$as_me:17472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17442,7 +17484,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17445: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17487: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17471,7 +17513,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17474 "${as_me:-configure}"
+#line 17516 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17487,7 +17529,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17490: checking for $CC warning options..." >&5
+	{ echo "$as_me:17532: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17503,12 +17545,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17509: \$? = $ac_status" >&5
+  echo "$as_me:17551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17511: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17553: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17516,7 +17558,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17519: checking for $CC warning options..." >&5
+	{ echo "$as_me:17561: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17539,12 +17581,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17542: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17545: \$? = $ac_status" >&5
+  echo "$as_me:17587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17547: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17589: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17552,7 +17594,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17555: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17597: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17562,7 +17604,7 @@ echo "${as_me:-configure}:17555: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17565: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17607: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17595,10 +17637,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17598: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17640: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17601 "${as_me:-configure}"
+#line 17643 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17648,12 +17690,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17651: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17654: \$? = $ac_status" >&5
+  echo "$as_me:17696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17656: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17698: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17725,12 +17767,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17728: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17770: 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 17733 "configure"
+#line 17775 "configure"
 #include "confdefs.h"
 
 int
@@ -17747,16 +17789,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17753: \$? = $ac_status" >&5
+  echo "$as_me:17795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17759: \$? = $ac_status" >&5
+  echo "$as_me:17801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17767,7 +17809,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17770: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17812: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17776,11 +17818,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17779: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17821: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17783 "configure"
+#line 17825 "configure"
 #include "confdefs.h"
 
 int
@@ -17797,16 +17839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17803: \$? = $ac_status" >&5
+  echo "$as_me:17845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17809: \$? = $ac_status" >&5
+  echo "$as_me:17851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17816,7 +17858,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17819: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17861: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17825,30 +17867,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17828: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17870: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17835: checking version of $CC" >&5
+	echo "$as_me:17877: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17839: result: $CLANG_VERSION" >&5
+	echo "$as_me:17881: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17846: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17888: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17851 "configure"
+#line 17893 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17862,16 +17904,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17868: \$? = $ac_status" >&5
+  echo "$as_me:17910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17874: \$? = $ac_status" >&5
+  echo "$as_me:17916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17882,13 +17924,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17885: result: $cf_clang_optok" >&5
+		echo "$as_me:17927: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17891: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17933: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17905,7 +17947,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17908 "configure"
+#line 17950 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17923,7 +17965,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17926: checking for $CC warning options..." >&5
+	{ echo "$as_me:17968: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17940,12 +17982,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17946: \$? = $ac_status" >&5
+  echo "$as_me:17988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17948: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17954,7 +17996,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17957: checking for $CXX warning options..." >&5
+	{ echo "$as_me:17999: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -17984,16 +18026,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:17987: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17990: \$? = $ac_status" >&5
+  echo "$as_me:18032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18034: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:17996: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18038: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18011,7 +18053,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18014: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18056: 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.
@@ -18021,7 +18063,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18024: result: $enable_string_hacks" >&5
+echo "$as_me:18066: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18030,15 +18072,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18033: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18075: 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:18035: checking for strlcat" >&5
+	echo "$as_me:18077: 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 18041 "configure"
+#line 18083 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18069,16 +18111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18075: \$? = $ac_status" >&5
+  echo "$as_me:18117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18081: \$? = $ac_status" >&5
+  echo "$as_me:18123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18088,7 +18130,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18091: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18133: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18098,7 +18140,7 @@ EOF
 
 else
 
-		echo "$as_me:18101: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18143: 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
@@ -18106,7 +18148,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18109 "configure"
+#line 18151 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18125,16 +18167,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18131: \$? = $ac_status" >&5
+  echo "$as_me:18173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18137: \$? = $ac_status" >&5
+  echo "$as_me:18179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18145,7 +18187,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18148: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18190: 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
 
@@ -18168,23 +18210,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18171: checking for $ac_header" >&5
+echo "$as_me:18213: 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 18177 "configure"
+#line 18219 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18181: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18187: \$? = $ac_status" >&5
+  echo "$as_me:18229: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18203,7 +18245,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18206: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18224,13 +18266,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18227: checking for $ac_func" >&5
+echo "$as_me:18269: 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 18233 "configure"
+#line 18275 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18261,16 +18303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18267: \$? = $ac_status" >&5
+  echo "$as_me:18309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18273: \$? = $ac_status" >&5
+  echo "$as_me:18315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18280,7 +18322,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18283: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18325: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18293,7 +18335,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18296: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18338: 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.
@@ -18303,7 +18345,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18306: result: $with_assertions" >&5
+echo "$as_me:18348: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18319,7 +18361,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18322: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18364: 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.
@@ -18341,7 +18383,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18344: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18386: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18455,23 +18497,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18458: checking for dmalloc.h" >&5
+	echo "$as_me:18500: 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 18464 "configure"
+#line 18506 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18474: \$? = $ac_status" >&5
+  echo "$as_me:18516: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18490,11 +18532,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18493: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18535: 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:18497: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18539: 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
@@ -18502,7 +18544,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18505 "configure"
+#line 18547 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18521,16 +18563,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18527: \$? = $ac_status" >&5
+  echo "$as_me:18569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18533: \$? = $ac_status" >&5
+  echo "$as_me:18575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18541,7 +18583,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18544: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18586: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18556,7 +18598,7 @@ fi
 
 fi
 
-echo "$as_me:18559: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18601: 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.
@@ -18578,7 +18620,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18581: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18623: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18692,23 +18734,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18695: checking for dbmalloc.h" >&5
+	echo "$as_me:18737: 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 18701 "configure"
+#line 18743 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18705: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18747: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18711: \$? = $ac_status" >&5
+  echo "$as_me:18753: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18727,11 +18769,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18730: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18772: 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:18734: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18776: 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
@@ -18739,7 +18781,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18742 "configure"
+#line 18784 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18758,16 +18800,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18764: \$? = $ac_status" >&5
+  echo "$as_me:18806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18770: \$? = $ac_status" >&5
+  echo "$as_me:18812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18778,7 +18820,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18781: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18823: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18793,7 +18835,7 @@ fi
 
 fi
 
-echo "$as_me:18796: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18838: 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.
@@ -18815,7 +18857,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18818: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18860: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18928,7 +18970,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18931: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18973: 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.
@@ -18939,7 +18981,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18942: result: $with_no_leaks" >&5
+echo "$as_me:18984: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -18991,7 +19033,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:18994: checking whether to add trace feature to all models" >&5
+echo "$as_me:19036: 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.
@@ -19001,7 +19043,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19004: result: $cf_with_trace" >&5
+echo "$as_me:19046: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19115,7 +19157,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19118: checking if we want to use GNAT projects" >&5
+echo "$as_me:19160: 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.
@@ -19132,7 +19174,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19135: result: $enable_gnat_projects" >&5
+echo "$as_me:19177: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19145,14 +19187,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19148: checking if ssp library is needed" >&5
+echo "$as_me:19190: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19155 "configure"
+#line 19197 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19169,16 +19211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19175: \$? = $ac_status" >&5
+  echo "$as_me:19217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19181: \$? = $ac_status" >&5
+  echo "$as_me:19223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19188,7 +19230,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19191 "configure"
+#line 19233 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19205,16 +19247,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19211: \$? = $ac_status" >&5
+  echo "$as_me:19253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19217: \$? = $ac_status" >&5
+  echo "$as_me:19259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19228,7 +19270,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19231: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19273: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19257,14 +19299,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19260: checking if -lm needed for math functions" >&5
+echo "$as_me:19302: 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 19267 "configure"
+#line 19309 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19280,16 +19322,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19286: \$? = $ac_status" >&5
+  echo "$as_me:19328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19292: \$? = $ac_status" >&5
+  echo "$as_me:19334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19299,7 +19341,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19302: result: $cf_cv_need_libm" >&5
+echo "$as_me:19344: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19307,14 +19349,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19310: checking if -lm is available for math functions" >&5
+	echo "$as_me:19352: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19317 "configure"
+#line 19359 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19330,16 +19372,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19336: \$? = $ac_status" >&5
+  echo "$as_me:19378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19342: \$? = $ac_status" >&5
+  echo "$as_me:19384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19349,7 +19391,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19352: result: $cf_cv_have_libm" >&5
+echo "$as_me:19394: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19371,13 +19413,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19374: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19416: 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 19380 "configure"
+#line 19422 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19393,16 +19435,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19438: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19399: \$? = $ac_status" >&5
+  echo "$as_me:19441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19405: \$? = $ac_status" >&5
+  echo "$as_me:19447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19412,7 +19454,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19415: result: $ac_cv_header_time" >&5
+echo "$as_me:19457: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19427,7 +19469,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19430: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19472: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19435,7 +19477,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19438 "configure"
+#line 19480 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19454,16 +19496,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19460: \$? = $ac_status" >&5
+  echo "$as_me:19502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19466: \$? = $ac_status" >&5
+  echo "$as_me:19508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19474,11 +19516,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19477: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19519: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19481: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19523: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19486,7 +19528,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19489 "configure"
+#line 19531 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19505,16 +19547,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19511: \$? = $ac_status" >&5
+  echo "$as_me:19553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19517: \$? = $ac_status" >&5
+  echo "$as_me:19559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19525,7 +19567,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19528: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19570: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19547,7 +19589,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19550: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19592: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19555,7 +19597,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19558 "configure"
+#line 19600 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19574,16 +19616,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19580: \$? = $ac_status" >&5
+  echo "$as_me:19622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19586: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19594,7 +19636,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19597: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19639: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19616,7 +19658,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19619: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19661: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19624,7 +19666,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19627 "configure"
+#line 19669 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19643,16 +19685,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19649: \$? = $ac_status" >&5
+  echo "$as_me:19691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19655: \$? = $ac_status" >&5
+  echo "$as_me:19697: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19663,7 +19705,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19666: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19708: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19705,7 +19747,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19708: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19750: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19713,7 +19755,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19716 "configure"
+#line 19758 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19732,16 +19774,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19738: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19744: \$? = $ac_status" >&5
+  echo "$as_me:19786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19752,7 +19794,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19755: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19797: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19780,13 +19822,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19783: checking for regcomp" >&5
+	echo "$as_me:19825: 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 19789 "configure"
+#line 19831 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19817,16 +19859,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19823: \$? = $ac_status" >&5
+  echo "$as_me:19865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19829: \$? = $ac_status" >&5
+  echo "$as_me:19871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19836,7 +19878,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19839: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19881: 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
@@ -19845,7 +19887,7 @@ else
 		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:19848: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19890: 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
@@ -19853,7 +19895,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19856 "configure"
+#line 19898 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19872,16 +19914,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19878: \$? = $ac_status" >&5
+  echo "$as_me:19920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19884: \$? = $ac_status" >&5
+  echo "$as_me:19926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19892,7 +19934,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19895: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19937: 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
 
@@ -19924,13 +19966,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19927: checking for compile" >&5
+	echo "$as_me:19969: 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 19933 "configure"
+#line 19975 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19961,16 +20003,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19967: \$? = $ac_status" >&5
+  echo "$as_me:20009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19973: \$? = $ac_status" >&5
+  echo "$as_me:20015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -19980,13 +20022,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19983: result: $ac_cv_func_compile" >&5
+echo "$as_me:20025: 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:19989: checking for compile in -lgen" >&5
+		echo "$as_me:20031: 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
@@ -19994,7 +20036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19997 "configure"
+#line 20039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20013,16 +20055,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20019: \$? = $ac_status" >&5
+  echo "$as_me:20061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20025: \$? = $ac_status" >&5
+  echo "$as_me:20067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20033,7 +20075,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20036: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20078: 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
 
@@ -20061,11 +20103,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20064: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20106: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20068: checking for regular-expression headers" >&5
+echo "$as_me:20110: 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
@@ -20077,7 +20119,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20080 "configure"
+#line 20122 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20094,16 +20136,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20100: \$? = $ac_status" >&5
+  echo "$as_me:20142: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20106: \$? = $ac_status" >&5
+  echo "$as_me:20148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20120,7 +20162,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20123 "configure"
+#line 20165 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20140,16 +20182,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20146: \$? = $ac_status" >&5
+  echo "$as_me:20188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20152: \$? = $ac_status" >&5
+  echo "$as_me:20194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20165,11 +20207,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20168: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20210: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20172: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20214: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20207,23 +20249,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20210: checking for $ac_header" >&5
+echo "$as_me:20252: 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 20216 "configure"
+#line 20258 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20226: \$? = $ac_status" >&5
+  echo "$as_me:20268: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20242,7 +20284,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20287: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20255,23 +20297,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20258: checking for $ac_header" >&5
+echo "$as_me:20300: 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 20264 "configure"
+#line 20306 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20274: \$? = $ac_status" >&5
+  echo "$as_me:20316: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20290,7 +20332,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20293: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20335: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20300,7 +20342,7 @@ EOF
 fi
 done
 
-echo "$as_me:20303: checking for header declaring getopt variables" >&5
+echo "$as_me:20345: 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
@@ -20310,7 +20352,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20313 "configure"
+#line 20355 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20323,16 +20365,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20326: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20329: \$? = $ac_status" >&5
+  echo "$as_me:20371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20335: \$? = $ac_status" >&5
+  echo "$as_me:20377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20344,7 +20386,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20347: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20389: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20361,14 +20403,14 @@ EOF
 
 fi
 
-echo "$as_me:20364: checking if external environ is declared" >&5
+echo "$as_me:20406: 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 20371 "configure"
+#line 20413 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20381,16 +20423,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20387: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20393: \$? = $ac_status" >&5
+  echo "$as_me:20435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20401,7 +20443,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20404: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20446: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20416,14 +20458,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20419: checking if external environ exists" >&5
+echo "$as_me:20461: 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 20426 "configure"
+#line 20468 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20438,16 +20480,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20444: \$? = $ac_status" >&5
+  echo "$as_me:20486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20450: \$? = $ac_status" >&5
+  echo "$as_me:20492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20458,7 +20500,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20461: result: $cf_cv_have_environ" >&5
+echo "$as_me:20503: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20471,13 +20513,13 @@ EOF
 
 fi
 
-echo "$as_me:20474: checking for getenv" >&5
+echo "$as_me:20516: 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 20480 "configure"
+#line 20522 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20508,16 +20550,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20514: \$? = $ac_status" >&5
+  echo "$as_me:20556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20520: \$? = $ac_status" >&5
+  echo "$as_me:20562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20527,19 +20569,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20530: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20572: 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:20536: checking for $ac_func" >&5
+echo "$as_me:20578: 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 20542 "configure"
+#line 20584 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20570,16 +20612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20576: \$? = $ac_status" >&5
+  echo "$as_me:20618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20582: \$? = $ac_status" >&5
+  echo "$as_me:20624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20589,7 +20631,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20592: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20634: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20599,7 +20641,7 @@ EOF
 fi
 done
 
-echo "$as_me:20602: checking if getenv returns consistent values" >&5
+echo "$as_me:20644: 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
@@ -20609,7 +20651,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20612 "configure"
+#line 20654 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20714,15 +20756,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20720: \$? = $ac_status" >&5
+  echo "$as_me:20762: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20725: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20735,7 +20777,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20738: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20780: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20750,18 +20792,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20753: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20795: 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
 
-echo "$as_me:20757: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20799: 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 20764 "configure"
+#line 20806 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20781,16 +20823,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20787: \$? = $ac_status" >&5
+  echo "$as_me:20829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20793: \$? = $ac_status" >&5
+  echo "$as_me:20835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20802,7 +20844,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20805: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20847: 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
@@ -20817,13 +20859,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20820: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20862: 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 20826 "configure"
+#line 20868 "configure"
 #include "confdefs.h"
 
 int
@@ -20881,16 +20923,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20887: \$? = $ac_status" >&5
+  echo "$as_me:20929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20893: \$? = $ac_status" >&5
+  echo "$as_me:20935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20900,7 +20942,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20903: result: $ac_cv_c_const" >&5
+echo "$as_me:20945: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20910,7 +20952,7 @@ EOF
 
 fi
 
-echo "$as_me:20913: checking for inline" >&5
+echo "$as_me:20955: 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
@@ -20918,7 +20960,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20921 "configure"
+#line 20963 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20927,16 +20969,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20933: \$? = $ac_status" >&5
+  echo "$as_me:20975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20939: \$? = $ac_status" >&5
+  echo "$as_me:20981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20947,7 +20989,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20950: result: $ac_cv_c_inline" >&5
+echo "$as_me:20992: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20973,7 +21015,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:20976: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21018: 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
@@ -20982,7 +21024,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20985 "configure"
+#line 21027 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -20994,16 +21036,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21000: \$? = $ac_status" >&5
+  echo "$as_me:21042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21006: \$? = $ac_status" >&5
+  echo "$as_me:21048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21015,7 +21057,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21018: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21060: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21121,7 +21163,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21124: checking for signal global datatype" >&5
+echo "$as_me:21166: 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
@@ -21133,7 +21175,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21136 "configure"
+#line 21178 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21157,16 +21199,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21163: \$? = $ac_status" >&5
+  echo "$as_me:21205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21169: \$? = $ac_status" >&5
+  echo "$as_me:21211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21180,7 +21222,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21183: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21225: 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 <<EOF
@@ -21189,7 +21231,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21192: checking for type of chtype" >&5
+echo "$as_me:21234: 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
@@ -21199,7 +21241,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21202 "configure"
+#line 21244 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21234,15 +21276,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21240: \$? = $ac_status" >&5
+  echo "$as_me:21282: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21245: \$? = $ac_status" >&5
+  echo "$as_me:21287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21257,7 +21299,7 @@ fi
 
 fi
 
-echo "$as_me:21260: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21302: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21269,14 +21311,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21272: checking if unsigned literals are legal" >&5
+echo "$as_me:21314: 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 21279 "configure"
+#line 21321 "configure"
 #include "confdefs.h"
 
 int
@@ -21288,16 +21330,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21294: \$? = $ac_status" >&5
+  echo "$as_me:21336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21300: \$? = $ac_status" >&5
+  echo "$as_me:21342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21309,7 +21351,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21312: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21354: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21325,14 +21367,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21328: checking if external errno is declared" >&5
+echo "$as_me:21370: 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 21335 "configure"
+#line 21377 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21346,16 +21388,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21349: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21352: \$? = $ac_status" >&5
+  echo "$as_me:21394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21358: \$? = $ac_status" >&5
+  echo "$as_me:21400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21366,7 +21408,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21369: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21411: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21381,14 +21423,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21384: checking if external errno exists" >&5
+echo "$as_me:21426: 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 21391 "configure"
+#line 21433 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21403,16 +21445,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21409: \$? = $ac_status" >&5
+  echo "$as_me:21451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21415: \$? = $ac_status" >&5
+  echo "$as_me:21457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21423,7 +21465,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21426: result: $cf_cv_have_errno" >&5
+echo "$as_me:21468: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21436,7 +21478,7 @@ EOF
 
 fi
 
-echo "$as_me:21439: checking if data-only library module links" >&5
+echo "$as_me:21481: 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
@@ -21444,20 +21486,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21447 "configure"
+#line 21489 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21450: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21453: \$? = $ac_status" >&5
+  echo "$as_me:21495: \$? = $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 <<EOF
-#line 21460 "configure"
+#line 21502 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -21470,10 +21512,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:21473: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21476: \$? = $ac_status" >&5
+  echo "$as_me:21518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21486,7 +21528,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21489 "configure"
+#line 21531 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -21497,15 +21539,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21503: \$? = $ac_status" >&5
+  echo "$as_me:21545: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21508: \$? = $ac_status" >&5
+  echo "$as_me:21550: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21520,7 +21562,7 @@ fi
 
 fi
 
-echo "$as_me:21523: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21565: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21534,14 +21576,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21537: checking for clock_gettime" >&5
+echo "$as_me:21579: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21544 "configure"
+#line 21586 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21554,16 +21596,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21560: \$? = $ac_status" >&5
+  echo "$as_me:21602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21566: \$? = $ac_status" >&5
+  echo "$as_me:21608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21574,7 +21616,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21577: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21619: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21585,13 +21627,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21588: checking for gettimeofday" >&5
+echo "$as_me:21630: 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 21594 "configure"
+#line 21636 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21622,16 +21664,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21628: \$? = $ac_status" >&5
+  echo "$as_me:21670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21634: \$? = $ac_status" >&5
+  echo "$as_me:21676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21641,7 +21683,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21644: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21686: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21651,7 +21693,7 @@ EOF
 
 else
 
-echo "$as_me:21654: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21696: 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
@@ -21659,7 +21701,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21662 "configure"
+#line 21704 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21678,16 +21720,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21684: \$? = $ac_status" >&5
+  echo "$as_me:21726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21690: \$? = $ac_status" >&5
+  echo "$as_me:21732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21698,7 +21740,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21701: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21743: 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
 
@@ -21759,13 +21801,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21762: checking for $ac_func" >&5
+echo "$as_me:21804: 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 21768 "configure"
+#line 21810 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21796,16 +21838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21802: \$? = $ac_status" >&5
+  echo "$as_me:21844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21808: \$? = $ac_status" >&5
+  echo "$as_me:21850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21815,7 +21857,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21818: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21860: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21825,14 +21867,14 @@ EOF
 fi
 done
 
-echo "$as_me:21828: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21870: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21835 "configure"
+#line 21877 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21847,16 +21889,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21853: \$? = $ac_status" >&5
+  echo "$as_me:21895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21859: \$? = $ac_status" >&5
+  echo "$as_me:21901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21866,7 +21908,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21869: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21911: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21888,7 +21930,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21891: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21933: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21898,7 +21940,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21901 "configure"
+#line 21943 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21911,15 +21953,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21917: \$? = $ac_status" >&5
+  echo "$as_me:21959: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21922: \$? = $ac_status" >&5
+  echo "$as_me:21964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21931,7 +21973,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21934: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21976: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21943,14 +21985,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21946: checking for getttynam" >&5
+	echo "$as_me:21988: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21953 "configure"
+#line 21995 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -21962,16 +22004,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21968: \$? = $ac_status" >&5
+  echo "$as_me:22010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21974: \$? = $ac_status" >&5
+  echo "$as_me:22016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -21981,7 +22023,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21984: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22026: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -21991,7 +22033,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:21994: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22036: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22000,7 +22042,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22003: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22045: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22013,14 +22055,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22016: checking for terminal-capability database functions" >&5
+echo "$as_me:22058: 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 22023 "configure"
+#line 22065 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22040,16 +22082,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22046: \$? = $ac_status" >&5
+  echo "$as_me:22088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22052: \$? = $ac_status" >&5
+  echo "$as_me:22094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22060,7 +22102,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22063: result: $cf_cv_cgetent" >&5
+echo "$as_me:22105: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22070,14 +22112,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22073: checking if cgetent uses const parameter" >&5
+echo "$as_me:22115: 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 22080 "configure"
+#line 22122 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22100,16 +22142,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22106: \$? = $ac_status" >&5
+  echo "$as_me:22148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22112: \$? = $ac_status" >&5
+  echo "$as_me:22154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22120,7 +22162,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22123: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22165: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22134,14 +22176,14 @@ fi
 
 fi
 
-echo "$as_me:22137: checking for isascii" >&5
+echo "$as_me:22179: 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 22144 "configure"
+#line 22186 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22153,16 +22195,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22159: \$? = $ac_status" >&5
+  echo "$as_me:22201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22165: \$? = $ac_status" >&5
+  echo "$as_me:22207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22173,7 +22215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22176: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22218: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22181,10 +22223,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22184: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22226: 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 22187 "configure"
+#line 22229 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22198,16 +22240,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22204: \$? = $ac_status" >&5
+  echo "$as_me:22246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22215,7 +22257,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22218 "configure"
+#line 22260 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22230,16 +22272,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22236: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22242: \$? = $ac_status" >&5
+  echo "$as_me:22284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22255,11 +22297,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22258: result: $sigact_bad" >&5
+echo "$as_me:22300: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22262: checking if nanosleep really works" >&5
+echo "$as_me:22304: 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
@@ -22269,7 +22311,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22272 "configure"
+#line 22314 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22295,15 +22337,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22301: \$? = $ac_status" >&5
+  echo "$as_me:22343: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22306: \$? = $ac_status" >&5
+  echo "$as_me:22348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22315,7 +22357,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22318: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22360: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22332,23 +22374,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22335: checking for $ac_header" >&5
+echo "$as_me:22377: 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 22341 "configure"
+#line 22383 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22345: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22351: \$? = $ac_status" >&5
+  echo "$as_me:22393: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22367,7 +22409,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22370: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22412: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22384,10 +22426,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22387: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22429: 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 22390 "configure"
+#line 22432 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22399,16 +22441,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22405: \$? = $ac_status" >&5
+  echo "$as_me:22447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22411: \$? = $ac_status" >&5
+  echo "$as_me:22453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22416,7 +22458,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22419 "configure"
+#line 22461 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22430,16 +22472,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22436: \$? = $ac_status" >&5
+  echo "$as_me:22478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22455,19 +22497,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22458: result: $termios_bad" >&5
+	echo "$as_me:22500: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22463: checking for tcgetattr" >&5
+echo "$as_me:22505: 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 22470 "configure"
+#line 22512 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22495,16 +22537,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22501: \$? = $ac_status" >&5
+  echo "$as_me:22543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22507: \$? = $ac_status" >&5
+  echo "$as_me:22549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22514,21 +22556,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22517: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22559: 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:22524: checking for vsscanf function or workaround" >&5
+echo "$as_me:22566: 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 22531 "configure"
+#line 22573 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22544,16 +22586,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22550: \$? = $ac_status" >&5
+  echo "$as_me:22592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22556: \$? = $ac_status" >&5
+  echo "$as_me:22598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22561,7 +22603,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22564 "configure"
+#line 22606 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22583,16 +22625,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22589: \$? = $ac_status" >&5
+  echo "$as_me:22631: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22595: \$? = $ac_status" >&5
+  echo "$as_me:22637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22600,7 +22642,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22603 "configure"
+#line 22645 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22622,16 +22664,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22628: \$? = $ac_status" >&5
+  echo "$as_me:22670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22634: \$? = $ac_status" >&5
+  echo "$as_me:22676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22646,7 +22688,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22649: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22691: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22672,23 +22714,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22675: checking for $ac_header" >&5
+echo "$as_me:22717: 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 22681 "configure"
+#line 22723 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22685: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22727: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22691: \$? = $ac_status" >&5
+  echo "$as_me:22733: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22707,7 +22749,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22710: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22752: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22717,7 +22759,7 @@ EOF
 fi
 done
 
-echo "$as_me:22720: checking for working mkstemp" >&5
+echo "$as_me:22762: 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
@@ -22728,7 +22770,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22731 "configure"
+#line 22773 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22763,15 +22805,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22769: \$? = $ac_status" >&5
+  echo "$as_me:22811: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22774: \$? = $ac_status" >&5
+  echo "$as_me:22816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22786,16 +22828,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22789: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22831: 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:22792: checking for mkstemp" >&5
+	echo "$as_me:22834: 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 22798 "configure"
+#line 22840 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22826,16 +22868,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22832: \$? = $ac_status" >&5
+  echo "$as_me:22874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22838: \$? = $ac_status" >&5
+  echo "$as_me:22880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22845,7 +22887,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22848: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22890: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22866,21 +22908,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22869: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22911: 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:22872: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22914: 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:22878: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22920: 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 22883 "configure"
+#line 22925 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22897,15 +22939,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22903: \$? = $ac_status" >&5
+  echo "$as_me:22945: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22908: \$? = $ac_status" >&5
+  echo "$as_me:22950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22918,7 +22960,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22921: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22963: 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
 
@@ -22929,13 +22971,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22932: checking for intptr_t" >&5
+echo "$as_me:22974: 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 22938 "configure"
+#line 22980 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22950,16 +22992,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22956: \$? = $ac_status" >&5
+  echo "$as_me:22998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22962: \$? = $ac_status" >&5
+  echo "$as_me:23004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -22969,7 +23011,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22972: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23014: 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
   :
@@ -22981,13 +23023,13 @@ EOF
 
 fi
 
-echo "$as_me:22984: checking for ssize_t" >&5
+echo "$as_me:23026: 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 22990 "configure"
+#line 23032 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23002,16 +23044,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23008: \$? = $ac_status" >&5
+  echo "$as_me:23050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23014: \$? = $ac_status" >&5
+  echo "$as_me:23056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23021,7 +23063,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23024: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23066: 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
   :
@@ -23033,14 +23075,14 @@ EOF
 
 fi
 
-echo "$as_me:23036: checking for type sigaction_t" >&5
+echo "$as_me:23078: 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 23043 "configure"
+#line 23085 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23053,16 +23095,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23059: \$? = $ac_status" >&5
+  echo "$as_me:23101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23065: \$? = $ac_status" >&5
+  echo "$as_me:23107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23073,14 +23115,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23076: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23118: 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:23083: checking declaration of size-change" >&5
+echo "$as_me:23125: 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
@@ -23101,7 +23143,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23104 "configure"
+#line 23146 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23151,16 +23193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23157: \$? = $ac_status" >&5
+  echo "$as_me:23199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23163: \$? = $ac_status" >&5
+  echo "$as_me:23205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23179,7 +23221,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23182: result: $cf_cv_sizechange" >&5
+echo "$as_me:23224: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23197,13 +23239,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23200: checking for memmove" >&5
+echo "$as_me:23242: 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 23206 "configure"
+#line 23248 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23234,16 +23276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23240: \$? = $ac_status" >&5
+  echo "$as_me:23282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23246: \$? = $ac_status" >&5
+  echo "$as_me:23288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23253,19 +23295,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23256: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23298: 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:23262: checking for bcopy" >&5
+echo "$as_me:23304: 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 23268 "configure"
+#line 23310 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23296,16 +23338,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23302: \$? = $ac_status" >&5
+  echo "$as_me:23344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23308: \$? = $ac_status" >&5
+  echo "$as_me:23350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23315,11 +23357,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23318: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23360: 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:23322: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23364: 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
@@ -23329,7 +23371,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23332 "configure"
+#line 23374 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23345,15 +23387,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23351: \$? = $ac_status" >&5
+  echo "$as_me:23393: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23356: \$? = $ac_status" >&5
+  echo "$as_me:23398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23366,7 +23408,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23369: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23411: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23393,13 +23435,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23396: checking for $ac_func" >&5
+echo "$as_me:23438: 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 23402 "configure"
+#line 23444 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23430,16 +23472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23436: \$? = $ac_status" >&5
+  echo "$as_me:23478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23442: \$? = $ac_status" >&5
+  echo "$as_me:23484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23449,7 +23491,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23452: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23494: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23459,7 +23501,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23462: checking if poll really works" >&5
+echo "$as_me:23504: 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
@@ -23469,7 +23511,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23472 "configure"
+#line 23514 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23522,15 +23564,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23528: \$? = $ac_status" >&5
+  echo "$as_me:23570: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23533: \$? = $ac_status" >&5
+  echo "$as_me:23575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23542,21 +23584,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23545: result: $cf_cv_working_poll" >&5
+echo "$as_me:23587: 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:23552: checking for va_copy" >&5
+echo "$as_me:23594: 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 23559 "configure"
+#line 23601 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23573,16 +23615,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23579: \$? = $ac_status" >&5
+  echo "$as_me:23621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23585: \$? = $ac_status" >&5
+  echo "$as_me:23627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23592,7 +23634,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23595: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23637: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23604,14 +23646,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23607: checking for __va_copy" >&5
+echo "$as_me:23649: 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 23614 "configure"
+#line 23656 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23628,16 +23670,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23634: \$? = $ac_status" >&5
+  echo "$as_me:23676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23640: \$? = $ac_status" >&5
+  echo "$as_me:23682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23647,7 +23689,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23650: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23692: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23659,14 +23701,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23662: checking for __builtin_va_copy" >&5
+echo "$as_me:23704: 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 23669 "configure"
+#line 23711 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23683,16 +23725,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23689: \$? = $ac_status" >&5
+  echo "$as_me:23731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23695: \$? = $ac_status" >&5
+  echo "$as_me:23737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23702,7 +23744,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23705: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23747: 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 &&
@@ -23720,14 +23762,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23723: checking if we can simply copy va_list" >&5
+	echo "$as_me:23765: 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 23730 "configure"
+#line 23772 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23744,16 +23786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23750: \$? = $ac_status" >&5
+  echo "$as_me:23792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23756: \$? = $ac_status" >&5
+  echo "$as_me:23798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23763,19 +23805,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23766: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23808: 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:23771: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23813: 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 23778 "configure"
+#line 23820 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23792,16 +23834,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23798: \$? = $ac_status" >&5
+  echo "$as_me:23840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23804: \$? = $ac_status" >&5
+  echo "$as_me:23846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23811,7 +23853,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23814: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23856: 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
@@ -23822,13 +23864,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23825: checking for pid_t" >&5
+echo "$as_me:23867: 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 23831 "configure"
+#line 23873 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23843,16 +23885,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23849: \$? = $ac_status" >&5
+  echo "$as_me:23891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23855: \$? = $ac_status" >&5
+  echo "$as_me:23897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23862,7 +23904,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23865: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23907: 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
   :
@@ -23877,23 +23919,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23880: checking for $ac_header" >&5
+echo "$as_me:23922: 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 23886 "configure"
+#line 23928 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23890: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23932: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23896: \$? = $ac_status" >&5
+  echo "$as_me:23938: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23912,7 +23954,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23915: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23957: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23925,13 +23967,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23928: checking for $ac_func" >&5
+echo "$as_me:23970: 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 23934 "configure"
+#line 23976 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23962,16 +24004,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23968: \$? = $ac_status" >&5
+  echo "$as_me:24010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23974: \$? = $ac_status" >&5
+  echo "$as_me:24016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23981,7 +24023,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23984: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24026: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23993,7 +24035,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23996: checking for working fork" >&5
+  echo "$as_me:24038: 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
@@ -24016,15 +24058,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24022: \$? = $ac_status" >&5
+  echo "$as_me:24064: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24027: \$? = $ac_status" >&5
+  echo "$as_me:24069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24036,7 +24078,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24039: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24081: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24050,12 +24092,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24053: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24095: 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:24058: checking for working vfork" >&5
+  echo "$as_me:24100: 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
@@ -24064,7 +24106,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24067 "configure"
+#line 24109 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24157,15 +24199,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24163: \$? = $ac_status" >&5
+  echo "$as_me:24205: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24168: \$? = $ac_status" >&5
+  echo "$as_me:24210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24177,13 +24219,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24180: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24222: 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:24186: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24228: 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
 
@@ -24208,7 +24250,7 @@ EOF
 
 fi
 
-echo "$as_me:24211: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24253: 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
@@ -24218,7 +24260,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24221 "configure"
+#line 24263 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24253,15 +24295,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24259: \$? = $ac_status" >&5
+  echo "$as_me:24301: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24264: \$? = $ac_status" >&5
+  echo "$as_me:24306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24274,7 +24316,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24277: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24319: 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
@@ -24283,7 +24325,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24286: checking for openpty in -lutil" >&5
+echo "$as_me:24328: 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
@@ -24291,7 +24333,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24294 "configure"
+#line 24336 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24310,16 +24352,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24316: \$? = $ac_status" >&5
+  echo "$as_me:24358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24322: \$? = $ac_status" >&5
+  echo "$as_me:24364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24330,7 +24372,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24333: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24375: 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
@@ -24338,7 +24380,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24341: checking for openpty header" >&5
+echo "$as_me:24383: 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
@@ -24365,7 +24407,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24368 "configure"
+#line 24410 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24382,16 +24424,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24388: \$? = $ac_status" >&5
+  echo "$as_me:24430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24394: \$? = $ac_status" >&5
+  echo "$as_me:24436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24409,7 +24451,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24412: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24454: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24482,7 +24524,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24485 "configure"
+#line 24527 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24494,16 +24536,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24500: \$? = $ac_status" >&5
+  echo "$as_me:24542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24506: \$? = $ac_status" >&5
+  echo "$as_me:24548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24520,7 +24562,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24523: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24565: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24556,7 +24598,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24559: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24601: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24567,7 +24609,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24570: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24612: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24639,7 +24681,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24642 "configure"
+#line 24684 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24651,16 +24693,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24657: \$? = $ac_status" >&5
+  echo "$as_me:24699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24663: \$? = $ac_status" >&5
+  echo "$as_me:24705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24677,7 +24719,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24680: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24722: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24757,7 +24799,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24760: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24802: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24774,23 +24816,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24777: checking for db.h" >&5
+echo "$as_me:24819: 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 24783 "configure"
+#line 24825 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24787: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24793: \$? = $ac_status" >&5
+  echo "$as_me:24835: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24809,11 +24851,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24812: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24854: 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:24816: checking for version of db" >&5
+echo "$as_me:24858: 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
@@ -24824,10 +24866,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24827: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24869: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24830 "configure"
+#line 24872 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24857,16 +24899,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24902: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24863: \$? = $ac_status" >&5
+  echo "$as_me:24905: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24869: \$? = $ac_status" >&5
+  echo "$as_me:24911: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24880,16 +24922,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24883: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24925: 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:24887: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24929: 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:24892: checking for db libraries" >&5
+echo "$as_me:24934: 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
@@ -24919,10 +24961,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24922: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24964: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24925 "configure"
+#line 24967 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24977,16 +25019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24983: \$? = $ac_status" >&5
+  echo "$as_me:25025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24989: \$? = $ac_status" >&5
+  echo "$as_me:25031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25006,11 +25048,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25009: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25051: 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:25013: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25055: 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
@@ -25036,7 +25078,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25039: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25081: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25051,7 +25093,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25054: checking if we should include stdbool.h" >&5
+echo "$as_me:25096: 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
@@ -25059,7 +25101,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25062 "configure"
+#line 25104 "configure"
 #include "confdefs.h"
 
 int
@@ -25071,23 +25113,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25077: \$? = $ac_status" >&5
+  echo "$as_me:25119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25083: \$? = $ac_status" >&5
+  echo "$as_me:25125: \$? = $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 25090 "configure"
+#line 25132 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25103,16 +25145,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25109: \$? = $ac_status" >&5
+  echo "$as_me:25151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25115: \$? = $ac_status" >&5
+  echo "$as_me:25157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25126,13 +25168,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25129: result: yes" >&5
+then	echo "$as_me:25171: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25131: result: no" >&5
+else	echo "$as_me:25173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25135: checking for builtin bool type" >&5
+echo "$as_me:25177: 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
@@ -25140,7 +25182,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25143 "configure"
+#line 25185 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25155,16 +25197,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25161: \$? = $ac_status" >&5
+  echo "$as_me:25203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25167: \$? = $ac_status" >&5
+  echo "$as_me:25209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25177,9 +25219,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25180: result: yes" >&5
+then	echo "$as_me:25222: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25182: result: no" >&5
+else	echo "$as_me:25224: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25196,10 +25238,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25199: checking if we already have C++ library" >&5
+	echo "$as_me:25241: 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 25202 "configure"
+#line 25244 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25213,16 +25255,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25219: \$? = $ac_status" >&5
+  echo "$as_me:25261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25225: \$? = $ac_status" >&5
+  echo "$as_me:25267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25231,7 +25273,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25234: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25276: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25250,7 +25292,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25253: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25295: 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
@@ -25276,7 +25318,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25279 "configure"
+#line 25321 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25290,16 +25332,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25296: \$? = $ac_status" >&5
+  echo "$as_me:25338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25302: \$? = $ac_status" >&5
+  echo "$as_me:25344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25311,7 +25353,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25314: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25356: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25333,7 +25375,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25336: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25378: 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
@@ -25348,15 +25390,15 @@ CF_EOF
 # 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:25351: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25354: \$? = $ac_status" >&5
+  echo "$as_me:25396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25356: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25359: \$? = $ac_status" >&5
+  echo "$as_me:25401: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25367,10 +25409,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25370: result: yes" >&5
+  echo "$as_me:25412: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25373: result: no" >&5
+  echo "$as_me:25415: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25390,7 +25432,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25393: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25435: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25411,7 +25453,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25414 "configure"
+#line 25456 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25425,16 +25467,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25431: \$? = $ac_status" >&5
+  echo "$as_me:25473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25437: \$? = $ac_status" >&5
+  echo "$as_me:25479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25471,7 +25513,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25474 "configure"
+#line 25516 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25485,16 +25527,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25491: \$? = $ac_status" >&5
+  echo "$as_me:25533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25497: \$? = $ac_status" >&5
+  echo "$as_me:25539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25527,7 +25569,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25530: result: $cf_cxx_library" >&5
+	echo "$as_me:25572: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25543,7 +25585,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25546: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25588: 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
@@ -25560,18 +25602,18 @@ do
   # 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 25563 "configure"
+#line 25605 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25574: \$? = $ac_status" >&5
+  echo "$as_me:25616: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25594,17 +25636,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25597 "configure"
+#line 25639 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25643: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25607: \$? = $ac_status" >&5
+  echo "$as_me:25649: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25641,7 +25683,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25644: result: $CXXCPP" >&5
+echo "$as_me:25686: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25651,18 +25693,18 @@ do
   # 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 25654 "configure"
+#line 25696 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25659: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25701: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25665: \$? = $ac_status" >&5
+  echo "$as_me:25707: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25685,17 +25727,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25688 "configure"
+#line 25730 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25692: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25734: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25698: \$? = $ac_status" >&5
+  echo "$as_me:25740: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25723,7 +25765,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25726: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25768: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25738,23 +25780,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25741: checking for $ac_header" >&5
+echo "$as_me:25783: 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 25747 "configure"
+#line 25789 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25757: \$? = $ac_status" >&5
+  echo "$as_me:25799: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25773,7 +25815,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25776: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25818: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25786,23 +25828,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25789: checking for $ac_header" >&5
+echo "$as_me:25831: 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 25795 "configure"
+#line 25837 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25799: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25805: \$? = $ac_status" >&5
+  echo "$as_me:25847: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25821,7 +25863,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25824: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25832,10 +25874,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25835: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25877: 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 25838 "configure"
+#line 25880 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25852,16 +25894,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25858: \$? = $ac_status" >&5
+  echo "$as_me:25900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25864: \$? = $ac_status" >&5
+  echo "$as_me:25906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25870,7 +25912,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25873: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25915: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25881,7 +25923,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25884: checking if we should include stdbool.h" >&5
+echo "$as_me:25926: 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
@@ -25889,7 +25931,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25892 "configure"
+#line 25934 "configure"
 #include "confdefs.h"
 
 int
@@ -25901,23 +25943,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25907: \$? = $ac_status" >&5
+  echo "$as_me:25949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25913: \$? = $ac_status" >&5
+  echo "$as_me:25955: \$? = $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 25920 "configure"
+#line 25962 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25933,16 +25975,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25939: \$? = $ac_status" >&5
+  echo "$as_me:25981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25945: \$? = $ac_status" >&5
+  echo "$as_me:25987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25956,13 +25998,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25959: result: yes" >&5
+then	echo "$as_me:26001: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25961: result: no" >&5
+else	echo "$as_me:26003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25965: checking for builtin bool type" >&5
+echo "$as_me:26007: 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
@@ -25970,7 +26012,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25973 "configure"
+#line 26015 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25985,16 +26027,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25991: \$? = $ac_status" >&5
+  echo "$as_me:26033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25997: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26007,19 +26049,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26010: result: yes" >&5
+then	echo "$as_me:26052: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26012: result: no" >&5
+else	echo "$as_me:26054: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26016: checking for bool" >&5
+echo "$as_me:26058: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26022 "configure"
+#line 26064 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26054,16 +26096,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26060: \$? = $ac_status" >&5
+  echo "$as_me:26102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26066: \$? = $ac_status" >&5
+  echo "$as_me:26108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26073,10 +26115,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26076: result: $ac_cv_type_bool" >&5
+echo "$as_me:26118: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26079: checking size of bool" >&5
+echo "$as_me:26121: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26085,7 +26127,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26088 "configure"
+#line 26130 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26117,21 +26159,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26123: \$? = $ac_status" >&5
+  echo "$as_me:26165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26129: \$? = $ac_status" >&5
+  echo "$as_me:26171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26134 "configure"
+#line 26176 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26163,16 +26205,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26169: \$? = $ac_status" >&5
+  echo "$as_me:26211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26175: \$? = $ac_status" >&5
+  echo "$as_me:26217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26188,7 +26230,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26191 "configure"
+#line 26233 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26220,16 +26262,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26226: \$? = $ac_status" >&5
+  echo "$as_me:26268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26232: \$? = $ac_status" >&5
+  echo "$as_me:26274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26245,7 +26287,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26248 "configure"
+#line 26290 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26277,16 +26319,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26283: \$? = $ac_status" >&5
+  echo "$as_me:26325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26289: \$? = $ac_status" >&5
+  echo "$as_me:26331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26299,12 +26341,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26302: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26344: 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 26307 "configure"
+#line 26349 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26340,15 +26382,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26346: \$? = $ac_status" >&5
+  echo "$as_me:26388: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26351: \$? = $ac_status" >&5
+  echo "$as_me:26393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26364,13 +26406,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26367: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26409: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26373: checking for type of bool" >&5
+echo "$as_me:26415: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26389,7 +26431,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26392 "configure"
+#line 26434 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26430,15 +26472,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26436: \$? = $ac_status" >&5
+  echo "$as_me:26478: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26441: \$? = $ac_status" >&5
+  echo "$as_me:26483: \$? = $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
@@ -26455,19 +26497,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26458: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26500: 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:26465: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26507: 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:26470: checking for special defines needed for etip.h" >&5
+echo "$as_me:26512: 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"
@@ -26485,7 +26527,7 @@ do
 	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 26488 "configure"
+#line 26530 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26499,16 +26541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26505: \$? = $ac_status" >&5
+  echo "$as_me:26547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26511: \$? = $ac_status" >&5
+  echo "$as_me:26553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26529,12 +26571,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26532: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26574: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26537: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26579: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26551,7 +26593,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26554 "configure"
+#line 26596 "configure"
 #include "confdefs.h"
 
 class base
@@ -26570,15 +26612,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26576: \$? = $ac_status" >&5
+  echo "$as_me:26618: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26581: \$? = $ac_status" >&5
+  echo "$as_me:26623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26597,7 +26639,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26600: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26642: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26606,7 +26648,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26609: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26651: 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
@@ -26623,7 +26665,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26626 "configure"
+#line 26668 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26642,15 +26684,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26648: \$? = $ac_status" >&5
+  echo "$as_me:26690: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26653: \$? = $ac_status" >&5
+  echo "$as_me:26695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26669,7 +26711,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26672: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26714: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26679,7 +26721,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26682: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26724: 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
@@ -26693,7 +26735,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26696 "configure"
+#line 26738 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26737,16 +26779,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26743: \$? = $ac_status" >&5
+  echo "$as_me:26785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26749: \$? = $ac_status" >&5
+  echo "$as_me:26791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26764,7 +26806,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26767: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26809: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26813,13 +26855,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26816: checking for bool" >&5
+echo "$as_me:26858: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26822 "configure"
+#line 26864 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26854,16 +26896,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26860: \$? = $ac_status" >&5
+  echo "$as_me:26902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26866: \$? = $ac_status" >&5
+  echo "$as_me:26908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26873,10 +26915,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26876: result: $ac_cv_type_bool" >&5
+echo "$as_me:26918: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26879: checking size of bool" >&5
+echo "$as_me:26921: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26885,7 +26927,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26888 "configure"
+#line 26930 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26917,21 +26959,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26923: \$? = $ac_status" >&5
+  echo "$as_me:26965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26929: \$? = $ac_status" >&5
+  echo "$as_me:26971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26934 "configure"
+#line 26976 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26963,16 +27005,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26969: \$? = $ac_status" >&5
+  echo "$as_me:27011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26975: \$? = $ac_status" >&5
+  echo "$as_me:27017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26988,7 +27030,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26991 "configure"
+#line 27033 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27020,16 +27062,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27026: \$? = $ac_status" >&5
+  echo "$as_me:27068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27032: \$? = $ac_status" >&5
+  echo "$as_me:27074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27045,7 +27087,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27048 "configure"
+#line 27090 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27077,16 +27119,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27083: \$? = $ac_status" >&5
+  echo "$as_me:27125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27089: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27099,12 +27141,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27102: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27144: 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 27107 "configure"
+#line 27149 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27140,15 +27182,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27146: \$? = $ac_status" >&5
+  echo "$as_me:27188: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27151: \$? = $ac_status" >&5
+  echo "$as_me:27193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27164,13 +27206,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27167: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27209: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27173: checking for type of bool" >&5
+echo "$as_me:27215: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27189,7 +27231,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27192 "configure"
+#line 27234 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27230,15 +27272,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27236: \$? = $ac_status" >&5
+  echo "$as_me:27278: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27241: \$? = $ac_status" >&5
+  echo "$as_me:27283: \$? = $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
@@ -27255,26 +27297,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27258: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27300: 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:27265: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27307: 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:27271: checking for fallback type of bool" >&5
+			echo "$as_me:27313: 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:27277: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27319: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27303,7 +27345,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27306: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27348: 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
@@ -27320,7 +27362,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27323: checking for $ac_word" >&5
+echo "$as_me:27365: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27337,7 +27379,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27340: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27382: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27349,10 +27391,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27352: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27394: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27355: result: no" >&5
+  echo "$as_me:27397: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27362,7 +27404,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27365: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27407: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27373,7 +27415,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27376: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27418: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27402,7 +27444,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27405: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27447: 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
@@ -27421,10 +27463,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27424: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27466: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27427: result: missing" >&5
+					echo "$as_me:27469: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27437,7 +27479,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27440: checking for gnat version" >&5
+echo "$as_me:27482: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27448,7 +27490,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27451: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27493: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27457,7 +27499,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27460: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27502: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27465,7 +27507,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27468: checking for $ac_word" >&5
+echo "$as_me:27510: 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
@@ -27480,7 +27522,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27483: found $ac_dir/$ac_word" >&5
+echo "$as_me:27525: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27489,20 +27531,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27492: result: $M4_exists" >&5
+  echo "$as_me:27534: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27495: result: no" >&5
+  echo "$as_me:27537: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27501: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27543: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27505: checking if GNAT works" >&5
+			echo "$as_me:27547: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27530,7 +27572,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27533: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27575: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27542,7 +27584,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27545: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27587: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27559,10 +27601,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27562: result: $ADAFLAGS" >&5
+	echo "$as_me:27604: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27565: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27607: 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
@@ -27572,11 +27614,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27575: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27617: 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:27579: checking if GNAT supports generics" >&5
+echo "$as_me:27621: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27586,7 +27628,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27589: result: $cf_gnat_generics" >&5
+echo "$as_me:27631: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27598,7 +27640,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27601: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27643: 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
@@ -27646,7 +27688,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27649: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27691: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27659,7 +27701,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27662: checking if GNAT supports project files" >&5
+echo "$as_me:27704: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27722,15 +27764,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27725: result: $cf_gnat_projects" >&5
+echo "$as_me:27767: 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:27731: checking if GNAT supports libraries" >&5
+	echo "$as_me:27773: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27733: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27775: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27750,7 +27792,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27753: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27795: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27762,7 +27804,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27765: checking for Ada95 compiler" >&5
+echo "$as_me:27807: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27773,12 +27815,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27776: result: $cf_ada_compiler" >&5
+echo "$as_me:27818: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27781: checking for Ada95 include directory" >&5
+echo "$as_me:27823: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27814,7 +27856,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27817: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27859: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27823,10 +27865,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27826: result: $ADA_INCLUDE" >&5
+echo "$as_me:27868: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27829: checking for Ada95 object directory" >&5
+echo "$as_me:27871: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -27862,7 +27904,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27865: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27907: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27871,10 +27913,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27874: result: $ADA_OBJECTS" >&5
+echo "$as_me:27916: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27877: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:27919: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -27895,11 +27937,11 @@ then
 	fi
 fi
 
-echo "$as_me:27898: result: $with_ada_sharedlib" >&5
+echo "$as_me:27940: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:27902: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:27944: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -27917,7 +27959,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27920: checking for Ada95 curses library name" >&5
+echo "$as_me:27962: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27933,7 +27975,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27936: result: $ADA_LIBNAME" >&5
+echo "$as_me:27978: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27944,13 +27986,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27947: checking for wchar_t" >&5
+	echo "$as_me:27989: 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 27953 "configure"
+#line 27995 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27965,16 +28007,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27971: \$? = $ac_status" >&5
+  echo "$as_me:28013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27977: \$? = $ac_status" >&5
+  echo "$as_me:28019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -27984,10 +28026,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27987: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28029: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:27990: checking size of wchar_t" >&5
+echo "$as_me:28032: 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
@@ -27996,7 +28038,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27999 "configure"
+#line 28041 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28008,21 +28050,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28014: \$? = $ac_status" >&5
+  echo "$as_me:28056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:28062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28025 "configure"
+#line 28067 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28034,16 +28076,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28040: \$? = $ac_status" >&5
+  echo "$as_me:28082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28046: \$? = $ac_status" >&5
+  echo "$as_me:28088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28059,7 +28101,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28062 "configure"
+#line 28104 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28071,16 +28113,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28077: \$? = $ac_status" >&5
+  echo "$as_me:28119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28083: \$? = $ac_status" >&5
+  echo "$as_me:28125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28096,7 +28138,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28099 "configure"
+#line 28141 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28108,16 +28150,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28114: \$? = $ac_status" >&5
+  echo "$as_me:28156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28120: \$? = $ac_status" >&5
+  echo "$as_me:28162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28130,12 +28172,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28133: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28175: 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 28138 "configure"
+#line 28180 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28151,15 +28193,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28157: \$? = $ac_status" >&5
+  echo "$as_me:28199: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28162: \$? = $ac_status" >&5
+  echo "$as_me:28204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28175,7 +28217,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28178: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28220: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28188,7 +28230,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28191: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28233: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28206,7 +28248,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28209: checking for library subsets" >&5
+echo "$as_me:28251: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28260,7 +28302,7 @@ fi
 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:28263: result: $LIB_SUBSETS" >&5
+echo "$as_me:28305: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28291,7 +28333,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28294: checking default library suffix" >&5
+echo "$as_me:28336: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28302,10 +28344,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28305: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28347: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28308: checking default library-dependency suffix" >&5
+echo "$as_me:28350: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28388,10 +28430,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28391: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28433: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28394: checking default object directory" >&5
+echo "$as_me:28436: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28407,11 +28449,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28410: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28452: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28414: checking c++ library-dependency suffix" >&5
+echo "$as_me:28456: 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++)
@@ -28504,7 +28546,7 @@ else
 	fi
 
 fi
-echo "$as_me:28507: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28549: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28680,19 +28722,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28683: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28725: 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 <<EOF
-#line 28688 "configure"
+#line 28730 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28692: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28695: \$? = $ac_status" >&5
+  echo "$as_me:28737: \$? = $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
@@ -28703,10 +28745,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28706 "configure"
+#line 28748 "configure"
 #include "confdefs.h"
 
-#line 28709 "configure"
+#line 28751 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28721,16 +28763,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28727: \$? = $ac_status" >&5
+  echo "$as_me:28769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28733: \$? = $ac_status" >&5
+  echo "$as_me:28775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28753,7 +28795,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28756: result: $cf_ldflags_static" >&5
+	echo "$as_me:28798: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28769,7 +28811,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28772: checking where we will install curses.h" >&5
+echo "$as_me:28814: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28779,7 +28821,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28782: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28824: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28787,7 +28829,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28790: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28832: 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
@@ -28812,7 +28854,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28815: checking for desired basename for form library" >&5
+echo "$as_me:28857: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28832,10 +28874,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28835: result: $FORM_NAME" >&5
+echo "$as_me:28877: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28838: checking for desired basename for menu library" >&5
+echo "$as_me:28880: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28855,10 +28897,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28858: result: $MENU_NAME" >&5
+echo "$as_me:28900: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28861: checking for desired basename for panel library" >&5
+echo "$as_me:28903: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28878,10 +28920,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28881: result: $PANEL_NAME" >&5
+echo "$as_me:28923: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28884: checking for desired basename for cxx library" >&5
+echo "$as_me:28926: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28901,13 +28943,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28904: result: $CXX_NAME" >&5
+echo "$as_me:28946: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28910: checking for src modules" >&5
+echo "$as_me:28952: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -28966,7 +29008,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:28969: result: $cf_cv_src_modules" >&5
+echo "$as_me:29011: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29127,7 +29169,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29130: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29172: 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//'`
@@ -29138,7 +29180,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29141: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29183: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29154,7 +29196,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29157: result: $PKG_CFLAGS" >&5
+echo "$as_me:29199: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29215,7 +29257,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29218: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29260: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29242,7 +29284,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29245: checking for linker search path" >&5
+echo "$as_me:29287: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29290,7 +29332,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29293: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29335: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29331,7 +29373,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29334: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29376: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29417,7 +29459,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29420: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29462: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29598,7 +29640,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29601: error: ambiguous option: $1
+    { { echo "$as_me:29643: 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;}
@@ -29617,7 +29659,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29620: error: unrecognized option: $1
+  -*) { { echo "$as_me:29662: 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;}
@@ -29747,7 +29789,7 @@ do
   "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:29750: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29792: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -29994,7 +30036,9 @@ s,@RGB_PATH@,$RGB_PATH,;t t
 s,@no_x11_rgb@,$no_x11_rgb,;t t
 s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t
 s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t
+s,@NCURSES_CHTYPE@,$NCURSES_CHTYPE,;t t
 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
+s,@NCURSES_MMASK_T@,$NCURSES_MMASK_T,;t t
 s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t
 s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
 s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t
@@ -30264,7 +30308,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30267: creating $ac_file" >&5
+    { echo "$as_me:30311: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30282,7 +30326,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30285: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30329: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30295,7 +30339,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30298: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30342: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30311,7 +30355,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30314: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30358: 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;}
@@ -30320,7 +30364,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30323: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30367: 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;}
@@ -30365,7 +30409,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30368: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30412: 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;}
@@ -30376,7 +30420,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30379: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30423: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30425,7 +30469,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30428: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30472: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30436,7 +30480,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30439: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30483: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30449,7 +30493,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30452: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30496: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30507,7 +30551,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30510: $ac_file is unchanged" >&5
+      { echo "$as_me:30554: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30894,7 +30938,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30897: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30941: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index d2a80ac91..424ad6be2 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.770 2023/10/28 15:41:34 tom Exp $
+dnl $Id: configure.in,v 1.772 2023/11/25 21:05:05 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.770 $)
+AC_REVISION($Revision: 1.772 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -235,7 +235,7 @@ if test -z "$MAKE_PC_FILES"
 then
 	AC_MSG_CHECKING(for suffix to add to pkg-config files)
 AC_ARG_WITH(pc-suffix,
-	[  --with-pc-suffix=XXX    suffix pkg-config files with XXX],
+	[[  --with-pc-suffix[=XXX]  suffix pkg-config files with XXX]],
 	[case "x$withval" in
 	(xyes|xno)
 		PC_MODULE_SUFFIX=
@@ -565,7 +565,7 @@ CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
 AC_MSG_CHECKING(for extra suffix to append to header/library paths)
 EXTRA_SUFFIX=
 AC_ARG_WITH(extra-suffix,
-	[  --with-extra-suffix=X   append extra suffix X to header/library paths],
+	[[  --with-extra-suffix[=X] append extra suffix X to header/library paths]],
 	[case x$withval in
 	(xno)
 		;;
@@ -694,7 +694,7 @@ esac
 
 AC_MSG_CHECKING(if xterm backspace sends BS or DEL)
 AC_ARG_WITH(xterm-kbs,
-	[  --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL],
+	[[  --with-xterm-kbs[=XXX]  specify if xterm backspace sends BS or DEL]],
 	[with_xterm_kbs=$withval],
 	[with_xterm_kbs=auto])
 case x$with_xterm_kbs in
@@ -1061,13 +1061,10 @@ AC_SUBST(NCURSES_WATTR_MACROS)
 CF_WITH_X11_RGB
 
 ###   use option --with-bool to override bool's type
-AC_MSG_CHECKING(for type of bool)
-AC_ARG_WITH(bool,
+CF_WITH_TYPE(bool,
 	[  --with-bool=TYPE        fall back to TYPE for curses 'bool' typedef],
-	[NCURSES_BOOL="$withval"],
-	[NCURSES_BOOL=auto])
-AC_MSG_RESULT($NCURSES_BOOL)
-AC_SUBST(NCURSES_BOOL)
+	NCURSES_BOOL,
+	auto)
 
 AC_MSG_CHECKING(for alternate terminal capabilities file)
 AC_ARG_WITH(caps,
@@ -1083,29 +1080,22 @@ AC_MSG_RESULT($TERMINFO_CAPS)
 AC_SUBST(TERMINFO_CAPS)
 
 ###   use option --with-chtype to override chtype's type
-AC_MSG_CHECKING(for type of chtype)
-AC_ARG_WITH(chtype,
+CF_WITH_TYPE(chtype,
 	[  --with-chtype=TYPE      override type of chtype],
-	[NCURSES_CHTYPE="$withval"],
-	[NCURSES_CHTYPE=$cf_dft_chtype])
-AC_MSG_RESULT($NCURSES_CHTYPE)
+	NCURSES_CHTYPE,
+	$cf_dft_chtype)
 
 ###   use option --with-ospeed to override ospeed's type
-AC_MSG_CHECKING(for type of ospeed)
-AC_ARG_WITH(ospeed,
+CF_WITH_TYPE(ospeed,
 	[  --with-ospeed=TYPE      override type of ospeed variable],
-	[NCURSES_OSPEED="$withval"],
-	[NCURSES_OSPEED=short])
-AC_MSG_RESULT($NCURSES_OSPEED)
-AC_SUBST(NCURSES_OSPEED)
+	NCURSES_OSPEED,
+	short)
 
 ###   use option --with-mmask-t to override mmask_t's type
-AC_MSG_CHECKING(for type of mmask_t)
-AC_ARG_WITH(mmask-t,
+CF_WITH_TYPE(mmask-t,
 	[  --with-mmask-t=TYPE     override type of mmask_t],
-	[NCURSES_MMASK_T="$withval"],
-	[NCURSES_MMASK_T=$cf_dft_mmask_t])
-AC_MSG_RESULT($NCURSES_MMASK_T)
+	NCURSES_MMASK_T,
+	$cf_dft_mmask_t)
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
 AC_MSG_CHECKING(for size CCHARW_MAX)
@@ -1132,13 +1122,10 @@ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 AC_SUBST(NCURSES_SBOOL)
 
 ###   use option --with-tparm-arg to override tparm's argument type
-AC_MSG_CHECKING(for type of tparm args)
-AC_ARG_WITH(tparm-arg,
+CF_WITH_TYPE(tparm-arg,
 	[  --with-tparm-arg=TYPE   override parameter type of tparm],
-	[NCURSES_TPARM_ARG="$withval"],
-	[NCURSES_TPARM_ARG=$cf_dft_tparm_arg])
-AC_MSG_RESULT($NCURSES_TPARM_ARG)
-AC_SUBST(NCURSES_TPARM_ARG)
+	NCURSES_TPARM_ARG,
+	$cf_dft_tparm_arg)
 
 ### Enable compiling-in rcs id's
 AC_MSG_CHECKING(if RCS identifiers should be compiled-in)
diff --git a/dist.mk b/dist.mk
index ee5177d67..6c2dfe8a3 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1578 2023/11/21 21:44:33 tom Exp $
+# $Id: dist.mk,v 1.1579 2023/11/25 11:21:56 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231121
+NCURSES_PATCH = 20231125
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html
index f0c4b60b6..90b4f8130 100644
--- a/doc/html/man/adacursesw6-config.1.html
+++ b/doc/html/man/adacursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: MKada_config.in,v 1.31 2023/11/25 19:51:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>adacursesw6\-config 1 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacursesw6\-config 1 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>            User commands           <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 
@@ -78,7 +78,7 @@ <H1 class="no-header">adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands
        Omitting options implies "<STRONG>--cflags</STRONG> <STRONG>--libs</STRONG>".
 
 
-</PRE><H2><a name="h2-EXAMPLE">EXAMPLE</a></H2><PRE>
+</PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        Consider a program using <EM>AdaCurses</EM> to write the message "Hello, world!"
        in the center of the screen and wait for the user to press the "q"  key
        before exiting.  Populate a file <EM>hello.adb</EM> with the following.
@@ -128,7 +128,7 @@ <H1 class="no-header">adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands
 
 
 
-ncurses 6.4                       2023-10-07             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2023-11-25             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -136,7 +136,7 @@ <H1 class="no-header">adacursesw6\-config 1 2023-10-07 ncurses 6.4 User commands
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-OPTIONS">OPTIONS</a></li>
-<li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
+<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 4d1c8ce38..3562d6758 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.52 2023/10/14 19:25:26 tom Exp @
+  * @Id: captoinfo.1m,v 1.54 2023/11/25 14:32:36 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -62,15 +62,15 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>captoinfo</STRONG>  looks in each given text <EM>file</EM> for <EM>termcap</EM> descriptions.  For
-       each one found, it writes an equivalent  <EM>terminfo</EM>  description  to  the
-       standard   output  stream.   <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities  are  translated
-       directly to <EM>terminfo</EM> "<STRONG>use</STRONG>" capabilities.
+       <STRONG>captoinfo</STRONG>  translates  terminal  descriptions.   It looks in each given
+       text <EM>file</EM> for <EM>termcap</EM> entries  and,  for  each  one  found,  writes  an
+       equivalent <EM>terminfo</EM> description to the standard output stream.  <EM>termcap</EM>
+       <STRONG>tc</STRONG> capabilities translate to <EM>terminfo</EM> "<STRONG>use</STRONG>" capabilities.
 
        If no <EM>file</EM>s are specified, <STRONG>captoinfo</STRONG>  interprets  the  content  of  the
-       environment  variable  <STRONG>TERMCAP</STRONG>  as  a  file name, and extracts only the
-       entry for the terminal named in the environment variable <STRONG>TERM</STRONG> from  it.
-       If  the  environment  variable  <STRONG>TERMCAP</STRONG>  is  not  set,  <STRONG>captoinfo</STRONG> reads
+       environment  variable  <EM>TERMCAP</EM>  as  a  file name, and extracts only the
+       entry for the terminal named in the environment variable <EM>TERM</EM> from  it.
+       If  the  environment  variable  <EM>TERMCAP</EM>  is  not  set,  <STRONG>captoinfo</STRONG> reads
        <EM>/etc/termcap</EM>.
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
@@ -86,75 +86,73 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
        check that it has not mistakenly  translated  an  unknown  or  mistyped
        capability name.
 
-       <STRONG>Nonstandard</STRONG>   <STRONG>Standard</STRONG>                  <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>i</I<STRONG>i</STRONG><EM>n</I<STRONG>n</STRONG><EM>f</I<STRONG>f</STRONG><EM>o</I<STRONG>o</STRONG>
-          <STRONG>name</STRONG>         <STRONG>name</STRONG>     <STRONG>From</STRONG>          <STRONG>capability</STRONG>
-       --------------------------------------------------------
-           <STRONG>BO</STRONG>           <STRONG>mr</STRONG>      AT&amp;T    <STRONG>enter_reverse_mode</STRONG>
-           <STRONG>CI</STRONG>           <STRONG>vi</STRONG>      AT&amp;T    <STRONG>cursor_invisible</STRONG>
-           <STRONG>CV</STRONG>           <STRONG>ve</STRONG>      AT&amp;T    <STRONG>cursor_normal</STRONG>
-           <STRONG>DS</STRONG>           <STRONG>mh</STRONG>      AT&amp;T    <STRONG>enter_dim_mode</STRONG>
-           <STRONG>EE</STRONG>           <STRONG>me</STRONG>      AT&amp;T    <STRONG>exit_attribute_mode</STRONG>
-           <STRONG>FE</STRONG>           <STRONG>LF</STRONG>      AT&amp;T    <STRONG>label_on</STRONG>
-           <STRONG>FL</STRONG>           <STRONG>LO</STRONG>      AT&amp;T    <STRONG>label_off</STRONG>
-           <STRONG>XS</STRONG>           <STRONG>mk</STRONG>      AT&amp;T    <STRONG>enter_secure_mode</STRONG>
-           <STRONG>EN</STRONG>           <STRONG>@7</STRONG>      XENIX   <STRONG>key_end</STRONG>
-           <STRONG>GE</STRONG>           <STRONG>ae</STRONG>      XENIX   <STRONG>exit_alt_charset_mode</STRONG>
-           <STRONG>GS</STRONG>           <STRONG>as</STRONG>      XENIX   <STRONG>enter_alt_charset_mode</STRONG>
-           <STRONG>HM</STRONG>           <STRONG>kh</STRONG>      XENIX   <STRONG>key_home</STRONG>
-           <STRONG>LD</STRONG>           <STRONG>kL</STRONG>      XENIX   <STRONG>key_dl</STRONG>
-           <STRONG>PD</STRONG>           <STRONG>kN</STRONG>      XENIX   <STRONG>key_npage</STRONG>
-           <STRONG>PN</STRONG>           <STRONG>po</STRONG>      XENIX   <STRONG>prtr_off</STRONG>
-           <STRONG>PS</STRONG>           <STRONG>pf</STRONG>      XENIX   <STRONG>prtr_on</STRONG>
-           <STRONG>PU</STRONG>           <STRONG>kP</STRONG>      XENIX   <STRONG>key_ppage</STRONG>
-           <STRONG>RT</STRONG>           <STRONG>@8</STRONG>      XENIX   <STRONG>kent</STRONG>
-           <STRONG>UP</STRONG>           <STRONG>ku</STRONG>      XENIX   <STRONG>kcuu1</STRONG>
-           <STRONG>KA</STRONG>           <STRONG>k;</STRONG>      Tek     <STRONG>key_f10</STRONG>
-           <STRONG>KB</STRONG>           <STRONG>F1</STRONG>      Tek     <STRONG>key_f11</STRONG>
-           <STRONG>KC</STRONG>           <STRONG>F2</STRONG>      Tek     <STRONG>key_f12</STRONG>
-           <STRONG>KD</STRONG>           <STRONG>F3</STRONG>      Tek     <STRONG>key_f13</STRONG>
-           <STRONG>KE</STRONG>           <STRONG>F4</STRONG>      Tek     <STRONG>key_f14</STRONG>
-           <STRONG>KF</STRONG>           <STRONG>F5</STRONG>      Tek     <STRONG>key_f15</STRONG>
-           <STRONG>BC</STRONG>           <STRONG>Sb</STRONG>      Tek     <STRONG>set_background</STRONG>
-
-           <STRONG>FC</STRONG>           <STRONG>Sf</STRONG>      Tek     <STRONG>set_foreground</STRONG>
-           <STRONG>HS</STRONG>           <STRONG>mh</STRONG>      Iris    <STRONG>enter_dim_mode</STRONG>
+              <STRONG>Name</STRONG>
+       <STRONG>Obsolete</STRONG>   <STRONG>Standard</STRONG>    <STRONG>Origin</STRONG>      <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>i</I<STRONG>i</STRONG><EM>n</I<STRONG>n</STRONG><EM>f</I<STRONG>f</STRONG><EM>o</I<STRONG>o</STRONG> <STRONG>capability</STRONG>
+       ---------------------------------------------------------
+          <STRONG>BO</STRONG>         <STRONG>mr</STRONG>        AT&amp;T      <STRONG>enter_reverse_mode</STRONG>
+          <STRONG>CI</STRONG>         <STRONG>vi</STRONG>        AT&amp;T      <STRONG>cursor_invisible</STRONG>
+          <STRONG>CV</STRONG>         <STRONG>ve</STRONG>        AT&amp;T      <STRONG>cursor_normal</STRONG>
+          <STRONG>DS</STRONG>         <STRONG>mh</STRONG>        AT&amp;T      <STRONG>enter_dim_mode</STRONG>
+          <STRONG>EE</STRONG>         <STRONG>me</STRONG>        AT&amp;T      <STRONG>exit_attribute_mode</STRONG>
+          <STRONG>FE</STRONG>         <STRONG>LF</STRONG>        AT&amp;T      <STRONG>label_on</STRONG>
+          <STRONG>FL</STRONG>         <STRONG>LO</STRONG>        AT&amp;T      <STRONG>label_off</STRONG>
+          <STRONG>XS</STRONG>         <STRONG>mk</STRONG>        AT&amp;T      <STRONG>enter_secure_mode</STRONG>
+          <STRONG>EN</STRONG>         <STRONG>@7</STRONG>        XENIX     <STRONG>key_end</STRONG>
+          <STRONG>GE</STRONG>         <STRONG>ae</STRONG>        XENIX     <STRONG>exit_alt_charset_mode</STRONG>
+          <STRONG>GS</STRONG>         <STRONG>as</STRONG>        XENIX     <STRONG>enter_alt_charset_mode</STRONG>
+          <STRONG>HM</STRONG>         <STRONG>kh</STRONG>        XENIX     <STRONG>key_home</STRONG>
+          <STRONG>LD</STRONG>         <STRONG>kL</STRONG>        XENIX     <STRONG>key_dl</STRONG>
+          <STRONG>PD</STRONG>         <STRONG>kN</STRONG>        XENIX     <STRONG>key_npage</STRONG>
+          <STRONG>PN</STRONG>         <STRONG>po</STRONG>        XENIX     <STRONG>prtr_off</STRONG>
+          <STRONG>PS</STRONG>         <STRONG>pf</STRONG>        XENIX     <STRONG>prtr_on</STRONG>
+          <STRONG>PU</STRONG>         <STRONG>kP</STRONG>        XENIX     <STRONG>key_ppage</STRONG>
+          <STRONG>RT</STRONG>         <STRONG>@8</STRONG>        XENIX     <STRONG>kent</STRONG>
+          <STRONG>UP</STRONG>         <STRONG>ku</STRONG>        XENIX     <STRONG>kcuu1</STRONG>
+          <STRONG>KA</STRONG>         <STRONG>k;</STRONG>      Tektronix   <STRONG>key_f10</STRONG>
+          <STRONG>KB</STRONG>         <STRONG>F1</STRONG>      Tektronix   <STRONG>key_f11</STRONG>
+          <STRONG>KC</STRONG>         <STRONG>F2</STRONG>      Tektronix   <STRONG>key_f12</STRONG>
+          <STRONG>KD</STRONG>         <STRONG>F3</STRONG>      Tektronix   <STRONG>key_f13</STRONG>
+          <STRONG>KE</STRONG>         <STRONG>F4</STRONG>      Tektronix   <STRONG>key_f14</STRONG>
+          <STRONG>KF</STRONG>         <STRONG>F5</STRONG>      Tektronix   <STRONG>key_f15</STRONG>
+          <STRONG>BC</STRONG>         <STRONG>Sb</STRONG>      Tektronix   <STRONG>set_background</STRONG>
+
+          <STRONG>FC</STRONG>         <STRONG>Sf</STRONG>      Tektronix   <STRONG>set_foreground</STRONG>
+          <STRONG>HS</STRONG>         <STRONG>mh</STRONG>        IRIX      <STRONG>enter_dim_mode</STRONG>
 
        XENIX <EM>termcap</EM> had a set of extension capabilities, corresponding to box
        drawing characters of CCSID ("code page") 437, as follows.
 
-       <STRONG>Termcap</STRONG>
-        <STRONG>Name</STRONG>              <STRONG>Graphic</STRONG>
-       ------------------------------------
-         <STRONG>G2</STRONG>      upper left corner
-         <STRONG>G3</STRONG>      lower left corner
-         <STRONG>G1</STRONG>      upper right corner
-         <STRONG>G4</STRONG>      lower right corner
-         <STRONG>GR</STRONG>      tee pointing right
-         <STRONG>GL</STRONG>      tee pointing left
-         <STRONG>GU</STRONG>      tee pointing up
-         <STRONG>GD</STRONG>      tee pointing down
-         <STRONG>GH</STRONG>      horizontal line
-         <STRONG>GV</STRONG>      vertical line
-         <STRONG>GC</STRONG>      intersection
-         <STRONG>G6</STRONG>      double upper left corner
-         <STRONG>G7</STRONG>      double lower left corner
-         <STRONG>G5</STRONG>      double upper right corner
-         <STRONG>G8</STRONG>      double lower right corner
-         <STRONG>Gr</STRONG>      double tee pointing right
-         <STRONG>Gr</STRONG>      double tee pointing left
-         <STRONG>Gu</STRONG>      double tee pointing up
-         <STRONG>Gd</STRONG>      double tee pointing down
-         <STRONG>Gh</STRONG>      double horizontal line
-         <STRONG>Gv</STRONG>      double vertical line
-         <STRONG>Gc</STRONG>      double intersection
-         <STRONG>GG</STRONG>      ACS magic cookie count
-
-       If the single-line capabilities occur in an entry,  they  are  composed
-       into an <STRONG>acsc</STRONG> string.  The double-line capabilities and <STRONG>GG</STRONG> are discarded
-       with a warning message.
-
-       IBM's AIX has a <EM>terminfo</EM> facility descended  from  SVr1  <EM>terminfo</EM>,  but
-       which  is  incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG> translates the
+       <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>c</I<STRONG>c</STRONG><EM>a</I<STRONG>a</STRONG><EM>p</I<STRONG>p</STRONG> <STRONG>Name</STRONG>            <STRONG>Graphic</STRONG>
+       -----------------------------------------
+            <STRONG>G2</STRONG>        upper left corner
+            <STRONG>G3</STRONG>        lower left corner
+            <STRONG>G1</STRONG>        upper right corner
+            <STRONG>G4</STRONG>        lower right corner
+            <STRONG>GR</STRONG>        tee pointing right
+            <STRONG>GL</STRONG>        tee pointing left
+            <STRONG>GU</STRONG>        tee pointing up
+            <STRONG>GD</STRONG>        tee pointing down
+            <STRONG>GH</STRONG>        horizontal line
+            <STRONG>GV</STRONG>        vertical line
+            <STRONG>GC</STRONG>        intersection
+            <STRONG>G6</STRONG>        double upper left corner
+            <STRONG>G7</STRONG>        double lower left corner
+            <STRONG>G5</STRONG>        double upper right corner
+            <STRONG>G8</STRONG>        double lower right corner
+            <STRONG>Gr</STRONG>        double tee pointing right
+            <STRONG>Gr</STRONG>        double tee pointing left
+            <STRONG>Gu</STRONG>        double tee pointing up
+            <STRONG>Gd</STRONG>        double tee pointing down
+            <STRONG>Gh</STRONG>        double horizontal line
+            <STRONG>Gv</STRONG>        double vertical line
+            <STRONG>Gc</STRONG>        double intersection
+            <STRONG>GG</STRONG>        ACS magic cookie count
+
+       <STRONG>captoinfo</STRONG> composes single-line capabilities into an  <STRONG>acsc</STRONG>  string,  and
+       discards <STRONG>GG</STRONG> and double-line capabilities with a warning diagnostic.
+
+       IBM's  AIX  has  a  <EM>terminfo</EM> facility descended from SVr1 <EM>terminfo</EM>, but
+       which is incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG>  translates  the
        following AIX extensions.
 
         <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
@@ -166,11 +164,11 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
        font2   s2ds
        font3   s3ds
 
-       Additionally, this program translates the AIX  <STRONG>box1</STRONG>  capability  to  an
+       Additionally,  this  program  translates  the AIX <STRONG>box1</STRONG> capability to an
        <STRONG>acsc</STRONG> string.
 
-       The   HP-UX   <EM>terminfo</EM>   library   supports  two  nonstandard  <EM>terminfo</EM>
-       capabilities, <STRONG>meml</STRONG> (memory lock) and <STRONG>memu</STRONG> (memory  unlock).   <STRONG>captoinfo</STRONG>
+       The  HP-UX  <EM>terminfo</EM>  library   supports   two   nonstandard   <EM>terminfo</EM>
+       capabilities,  <STRONG>meml</STRONG>  (memory lock) and <STRONG>memu</STRONG> (memory unlock).  <STRONG>captoinfo</STRONG>
        discards these with a warning message.
 
 
@@ -180,19 +178,19 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  verbose option is not identical to SVr4's.  Under SVr4, instead of
+       The verbose option is not identical to SVr4's.  Under SVr4, instead  of
        following the <STRONG>-v</STRONG> with a trace level <EM>n</EM>, you repeat it <EM>n</EM> times.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) describes <STRONG>tic</STRONG>  briefly,  but  omits  this
+       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
        program.  SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from
        <STRONG>tic</STRONG>.
 
        NetBSD does not provide this application.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
@@ -202,7 +200,7 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -216,7 +214,7 @@ <H1 class="no-header">captoinfo 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 175615819..4f2e2aa2b 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: clear.1,v 1.43 2023/11/25 14:32:36 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
   *   tput/clear.sh
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-10-07 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -54,7 +54,7 @@ <H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>clear</STRONG> [<STRONG>-x</STRONG>] [<STRONG>-T</STRONG> <EM>type</EM>]
+       <STRONG>clear</STRONG> [<STRONG>-x</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>]
 
        <STRONG>clear</STRONG> <STRONG>-V</STRONG>
 
@@ -86,18 +86,27 @@ <H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
        <STRONG>-x</STRONG>       prevents <STRONG>clear</STRONG> from attempting to clear the scrollback buffer.
 
 
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
+       (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
+
+       The  latter documents <STRONG>tput</STRONG>, which could be used to replace this utility
+       either via a shell script or by an alias (such as a symbolic  link)  to
+       run <STRONG>tput</STRONG> as <STRONG>clear</STRONG>.
+
+
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        A <STRONG>clear</STRONG> command using the <EM>termcap</EM> database and library appeared in 2BSD
        (1979).  Eighth Edition Unix (1985) later included it.
 
-       The  commercial Unix arm of AT&amp;T adapted a different BSD program (<STRONG>tset</STRONG>)
-       to make a new command, <STRONG>tput</STRONG>, and replaced  the  <STRONG>clear</STRONG>  program  with  a
+       The commercial Unix arm of AT&amp;T adapted a different BSD program  (<STRONG>tset</STRONG>)
+       to  make  a  new  command,  <STRONG>tput</STRONG>, and replaced the <STRONG>clear</STRONG> program with a
        shell script that called "<STRONG>tput</STRONG> <STRONG>clear</STRONG>".
 
            /usr/bin/tput ${1:+-T$1} clear 2&gt; /dev/null
            exit
 
-       In  1989,  when  Keith  Bostic  revised the BSD <STRONG>tput</STRONG> command to make it
+       In 1989, when Keith Bostic revised the BSD  <STRONG>tput</STRONG>  command  to  make  it
        similar to AT&amp;T's <STRONG>tput</STRONG>, he added a <STRONG>clear</STRONG> shell script as well.
 
            exec tput clear
@@ -107,8 +116,8 @@ <H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
        In 1995, <EM>ncurses</EM>'s <STRONG>clear</STRONG> began by adapting BSD's original <STRONG>clear</STRONG> command
        to use <EM>terminfo</EM>.  The <STRONG>E3</STRONG> extension came later.
 
-       <STRONG>o</STRONG>   In  June  1999, <EM>xterm</EM> provided an extension to the standard control
-           sequence for clearing the screen.  Rather than  clearing  just  the
+       <STRONG>o</STRONG>   In June 1999, <EM>xterm</EM> provided an extension to the  standard  control
+           sequence  for  clearing  the screen.  Rather than clearing just the
            visible part of the screen using
 
                printf '\033[2J'
@@ -117,41 +126,32 @@ <H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
 
                printf '\033[<STRONG>3</STRONG>J'
 
-           instead.   "XTerm  Control  Sequences"  documents  this  feature as
+           instead.  "XTerm  Control  Sequences"  documents  this  feature  as
            originating with <EM>xterm</EM>.
 
        <STRONG>o</STRONG>   A few other terminal emulators adopted it, such as PuTTY in 2006.
 
-       <STRONG>o</STRONG>   In April 2011, a Red Hat developer submitted a patch to  the  Linux
+       <STRONG>o</STRONG>   In  April  2011, a Red Hat developer submitted a patch to the Linux
            kernel,  modifying  its  console  driver  to  do  the  same  thing.
-           Documentation of this change,  appearing  in  Linux  3.0,  did  not
-           mention  <EM>xterm</EM>,  although that program was cited in the Red Hat bug
+           Documentation  of  this  change,  appearing  in  Linux 3.0, did not
+           mention <EM>xterm</EM>, although that program was cited in the Red  Hat  bug
            report (#683733) motivating the feature.
 
-       <STRONG>o</STRONG>   Subsequently, more terminal developers adopted  the  feature.   The
-           next  relevant step was to change the <EM>ncurses</EM> <STRONG>clear</STRONG> program in 2013
+       <STRONG>o</STRONG>   Subsequently,  more  terminal  developers adopted the feature.  The
+           next relevant step was to change the <EM>ncurses</EM> <STRONG>clear</STRONG> program in  2013
            to incorporate this extension.
 
        <STRONG>o</STRONG>   In 2013, the <STRONG>E3</STRONG> capability was not exercised by "<STRONG>tput</STRONG> <STRONG>clear</STRONG>".  That
-           oversight  was  addressed in 2016 by reorganizing <STRONG>tput</STRONG> to share its
+           oversight was addressed in 2016 by reorganizing <STRONG>tput</STRONG> to  share  its
            logic with <STRONG>clear</STRONG> and <STRONG>tset</STRONG>.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
-       (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
-
-       The  latter documents <STRONG>tput</STRONG>, which could be used to replace this utility
-       either via a shell script or by an alias (such as a symbolic  link)  to
-       run <STRONG>tput</STRONG> as <STRONG>clear</STRONG>.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG>xterm(1)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-11-25                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -159,8 +159,8 @@ <H1 class="no-header">clear 1 2023-10-07 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-OPTIONS">OPTIONS</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index c39713bda..4c943dd6a 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.46 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.48 2023/11/25 14:20:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -226,9 +226,9 @@ <H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       All  of these functions are described in the XSI Curses standard, Issue
-       4.  The defaults specified for line-drawing  characters  apply  in  the
-       POSIX locale.
+       These functions are described in the XSI Curses standard, Issue 4.  The
+       defaults specified for  line-drawing  characters  apply  in  the  POSIX
+       locale.
 
 
 </PRE><H3><a name="h3-WACS-Symbols">WACS Symbols</a></H3><PRE>
@@ -238,8 +238,8 @@ <H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
-       <STRONG>o</STRONG>   HPUX curses equates some of the <STRONG>ACS_</STRONG> symbols to the analogous <STRONG>WACS_</STRONG>
-           symbols  as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.    The
+       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
            misdefined  symbols  are the arrows and other symbols which are not
            used for line-drawing.
 
@@ -252,7 +252,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
        corresponding  line-drawing  characters.  X/Open Curses did not address
        the  aspect  of  integrating  Unicode  with  line-drawing   characters.
-       Existing  implementations  of Unix curses (AIX, HPUX, Solaris) use only
+       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
        Ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
@@ -320,7 +320,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index b26572a47..3bced1827 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.30 2023/11/18 21:18:55 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.32 2023/11/25 14:01:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These entry points are described in the XSI Curses standard, Issue 4.
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -123,7 +123,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-18               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 6477ac2fd..65ba4f28c 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.72 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_addch.3x,v 1.74 2023/11/25 14:20:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -202,8 +202,8 @@ <H1 class="no-header">curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       All  these functions are described in the XSI Curses standard, Issue 4.
-       The defaults specified for forms-drawing characters apply in the  POSIX
+       These functions are described in the XSI Curses standard, Issue 4.  The
+       defaults specified for forms-drawing  characters  apply  in  the  POSIX
        locale.
 
 
@@ -220,8 +220,8 @@ <H1 class="no-header">curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HPUX curses equates some of the <STRONG>ACS_</STRONG> symbols to the analogous <STRONG>WACS_</STRONG>
-           symbols  as  if  the  <STRONG>ACS_</STRONG>  symbols  were  wide  characters.    The
+       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
            misdefined  symbols  are the arrows and other symbols which are not
            used for line-drawing.
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 35908da89..e428bb067 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.36 2023/11/18 21:18:55 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.38 2023/11/25 14:01:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These entry points are described in the XSI Curses standard, Issue 4.
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-18                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 54c4b894b..02618a6e8 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.87 2023/10/07 22:21:46 tom Exp @
+  * @Id: curs_attr.3x,v 1.89 2023/11/25 15:33:56 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -95,8 +95,8 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
              <STRONG>int</STRONG> <EM>n</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attr</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvchgat(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
              <STRONG>int</STRONG> <EM>n</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attr</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwchgat(WINDOW</STRONG> <STRONG>*</STRONG><EM>win,</EM> <EM>int</EM> <EM>y,</EM> <EM>int</EM> <EM>x</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>n,</EM> <STRONG>attr_t</STRONG> <EM>attr</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwchgat(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attr</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>color_set(short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wcolor_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
@@ -217,7 +217,7 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            combined with a color pair.
 
 
-</PRE><H2><a name="h2-VIDEO-ATTRIBUTES">VIDEO ATTRIBUTES</a></H2><PRE>
+</PRE><H3><a name="h3-Video-Attributes">Video Attributes</a></H3><PRE>
        The following video attributes, defined in <STRONG>&lt;curses.h&gt;</STRONG>, can be passed to
        the routines <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, and <STRONG>attrset</STRONG>, or OR'd with the  characters
        passed to <STRONG>addch</STRONG> (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>).
@@ -256,6 +256,26 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        always return <STRONG>1</STRONG>.
 
 
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       All routines return the integer <STRONG>OK</STRONG> on success, or <STRONG>ERR</STRONG> on failure.
+
+       X/Open does not define any error conditions.
+
+       This implementation
+
+       <STRONG>o</STRONG>   returns an error if the window pointer is null.
+
+       <STRONG>o</STRONG>   returns  an  error  if  the  color pair parameter for <STRONG>wcolor_set</STRONG> is
+           outside the range 0..COLOR_PAIRS-1.
+
+       <STRONG>o</STRONG>   does not return an error if either of the parameters  of  <STRONG>wattr_get</STRONG>
+           used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
+
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
+       the window pointer is null.
+
+
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        These functions may be macros:
 
@@ -269,127 +289,6 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        support more than 256 color pairs.
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
-       "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
-       differences from SVr4 curses address the way video  attributes  can  be
-       applied  to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
-       are similar.  SVr4 curses provided the basic features for  manipulating
-       video  attributes.  However, earlier versions of curses provided a part
-       of these features.
-
-       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
-       bit  of  a byte to represent the <EM>standout</EM> feature (often implemented as
-       bold and/or reverse video).  The BSD curses library provided  functions
-       <STRONG>standout</STRONG>  and  <STRONG>standend</STRONG> which were carried along into X/Open Curses due
-       to their pervasive use in legacy applications.
-
-       Some  terminals  in  the  1980s  could  support  a  variety  of   video
-       attributes,  although  the  BSD  curses  library  could do nothing with
-       those.  System V  (1983)  provided  an  improved  curses  library.   It
-       defined  the <STRONG>A_</STRONG> symbols for use by applications to manipulate the other
-       attributes.  There are few useful references for the chronology.
-
-       Goodheart's book <EM>UNIX</EM> <EM>Curses</EM> <EM>Explained</EM> (1991)  describes  SVr3  (1987),
-       commenting on several functions:
-
-       <STRONG>o</STRONG>   the  <STRONG>attron</STRONG>,  <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of the functions
-           found in SVr4 but not in BSD curses) were introduced by System V,
-
-       <STRONG>o</STRONG>   the alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added  in
-           SVr2 and improved in SVr3 (by adding <STRONG>acs_map[]</STRONG>),
-
-       <STRONG>o</STRONG>   <STRONG>start_color</STRONG>  and  related color-functions were introduced by System
-           V.3.2,
-
-       <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
-
-       Goodheart did not mention the background character or the <STRONG>cchar_t</STRONG> type.
-       Those are respectively SVr4 and X/Open features.  He did mention the <STRONG>A_</STRONG>
-       constants, but did not indicate their values.  Those were not the  same
-       in different systems, even for those marked as System V.
-
-       Different  Unix  systems  used  different  sizes  for the bit-fields in
-       <STRONG>chtype</STRONG> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
-       integer sizes (32-bit versus 64-bit).
-
-       This  table  showing  the number of bits for <STRONG>A_COLOR</STRONG> and <STRONG>A_CHARTEXT</STRONG> was
-       gleaned from the curses header files for various operating systems  and
-       architectures.   The inferred architecture and notes reflect the format
-       and size of the  defined  constants  as  well  as  clues  such  as  the
-       alternate  character  set implementation.  A 32-bit library can be used
-       on a 64-bit system, but not necessarily the reverse.
-
-              <STRONG>Year</STRONG>   <STRONG>System</STRONG>        <STRONG>Arch</STRONG>    <STRONG>Color</STRONG>   <STRONG>Char</STRONG>   <STRONG>Notes</STRONG>
-              ----------------------------------------------------------------
-              1992   Solaris 5.2   32      6       17     SVr4 curses
-              1992   HPUX 9        32      no      8      SVr2 curses
-              1992   AIX 3.2       32      no      23     SVr2 curses
-              1994   OSF/1 r3      32      no      23     SVr2 curses
-              1995   HP-UX 10.00   32      6       16     SVr3 "curses_colr"
-              1995   HP-UX 10.00   32      6       8      SVr4, X/Open curses
-              1995   Solaris 5.4   32/64   7       16     X/Open curses
-              1996   AIX 4.2       32      7       16     X/Open curses
-              1996   OSF/1 r4      32      6       16     X/Open curses
-
-              1997   HP-UX 11.00   32      6       8      X/Open curses
-              2000   U/Win         32/64   7/31    16     uses <STRONG>chtype</STRONG>
-
-       Notes:
-
-          Regarding HP-UX,
-
-          <STRONG>o</STRONG>   HP-UX 10.20 (1996) added support for 64-bit  PA-RISC  processors
-              in 1996.
-
-          <STRONG>o</STRONG>   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
-              of curses was dropped with HP-UX 11.30 in 2006.
-
-          Regarding OSF/1 (and Tru64),
-
-          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
-              interface is not customized for 32-bit and 64-bit versions.
-
-          <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
-              provided a new implementation for X/Open curses.
-
-          Regarding Solaris,
-
-          <STRONG>o</STRONG>   The initial release of Solaris was in 1992.
-
-          <STRONG>o</STRONG>   The <EM>xpg4</EM> (X/Open) curses was developed by MKS from 1990 to 1995.
-              Sun's copyright began in 1996.
-
-          <STRONG>o</STRONG>   Sun updated the X/Open curses interface after 64-bit support was
-              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
-              interface.
-
-          Regarding U/Win,
-
-          <STRONG>o</STRONG>   Development  of  the  curses  library  began in 1991, stopped in
-              2000.
-
-          <STRONG>o</STRONG>   Color support was added in 1998.
-
-          <STRONG>o</STRONG>   The library uses only <STRONG>chtype</STRONG> (no <STRONG>cchar_t</STRONG>).
-
-       Once X/Open curses was adopted in the mid-1990s, the  constraint  of  a
-       32-bit interface with many colors and wide-characters for <STRONG>chtype</STRONG> became
-       a moot point.  The <STRONG>cchar_t</STRONG> structure (whose size and  members  are  not
-       specified in X/Open Curses) could be extended as needed.
-
-       Other interfaces are rarely used now:
-
-       <STRONG>o</STRONG>   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
-           modification to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He  moved
-           <EM>standout</EM> attribute to a structure member.
-
-           The  resulting  4.4BSD curses was replaced by ncurses over the next
-           ten years.
-
-       <STRONG>o</STRONG>   U/Win is rarely used now.
-
-
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        This implementation provides the <STRONG>A_ITALIC</STRONG> attribute for terminals which
        have   the   <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and  <STRONG>exit_italics_mode</STRONG>  (<STRONG>ritm</STRONG>)
@@ -418,7 +317,7 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are supported in the XSI Curses standard, Issue 4.  The
+       These functions are described in the XSI Curses standard, Issue 4.  The
        standard defined the dedicated type for highlights, <STRONG>attr_t</STRONG>,  which  was
        not defined in SVr4 curses.  The functions taking <STRONG>attr_t</STRONG> arguments were
        not supported under SVr4.
@@ -488,24 +387,124 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        terminal provides these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
 
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>OK</STRONG> on success, or <STRONG>ERR</STRONG> on failure.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       X/Open  Curses  is  largely  based  on  SVr4 curses, adding support for
+       "wide-characters" (not  specific  to  Unicode).   Some  of  the  X/Open
+       differences  from  SVr4  curses address the way video attributes can be
+       applied to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and  <STRONG>attr_set</STRONG>
+       are  similar.  SVr4 curses provided the basic features for manipulating
+       video attributes.  However, earlier versions of curses provided a  part
+       of these features.
 
-       X/Open does not define any error conditions.
+       As  seen  in  2.8BSD, curses assumed 7-bit characters, using the eighth
+       bit of a byte to represent the <EM>standout</EM> feature (often  implemented  as
+       bold  and/or reverse video).  The BSD curses library provided functions
+       <STRONG>standout</STRONG> and <STRONG>standend</STRONG> which were carried along into X/Open  Curses  due
+       to their pervasive use in legacy applications.
 
-       This implementation
+       Some   terminals  in  the  1980s  could  support  a  variety  of  video
+       attributes, although the BSD  curses  library  could  do  nothing  with
+       those.   System  V  (1983)  provided  an  improved  curses library.  It
+       defined the <STRONG>A_</STRONG> symbols for use by applications to manipulate the  other
+       attributes.  There are few useful references for the chronology.
 
-       <STRONG>o</STRONG>   returns an error if the window pointer is null.
+       Goodheart's  book  <EM>UNIX</EM>  <EM>Curses</EM> <EM>Explained</EM> (1991) describes SVr3 (1987),
+       commenting on several functions:
 
-       <STRONG>o</STRONG>   returns  an  error  if  the  color pair parameter for <STRONG>wcolor_set</STRONG> is
-           outside the range 0..COLOR_PAIRS-1.
+       <STRONG>o</STRONG>   the <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of  the  functions
+           found in SVr4 but not in BSD curses) were introduced by System V,
 
-       <STRONG>o</STRONG>   does not return an error if either of the parameters  of  <STRONG>wattr_get</STRONG>
-           used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   the  alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added in
+           SVr2 and improved in SVr3 (by adding <STRONG>acs_map[]</STRONG>),
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       <STRONG>o</STRONG>   <STRONG>start_color</STRONG> and related color-functions were introduced  by  System
+           V.3.2,
+
+       <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
+
+       Goodheart did not mention the background character or the <STRONG>cchar_t</STRONG> type.
+       Those are respectively SVr4 and X/Open features.  He did mention the <STRONG>A_</STRONG>
+       constants,  but did not indicate their values.  Those were not the same
+       in different systems, even for those marked as System V.
+
+       Different Unix systems used  different  sizes  for  the  bit-fields  in
+       <STRONG>chtype</STRONG>  for  <EM>characters</EM> and <EM>colors</EM>, and took into account the different
+       integer sizes (32-bit versus 64-bit).
+
+       This table showing the number of bits for <STRONG>A_COLOR</STRONG>  and  <STRONG>A_CHARTEXT</STRONG>  was
+       gleaned  from the curses header files for various operating systems and
+       architectures.  The inferred architecture and notes reflect the  format
+       and  size  of  the  defined  constants  as  well  as  clues such as the
+       alternate character set implementation.  A 32-bit library can  be  used
+       on a 64-bit system, but not necessarily the reverse.
+
+              <STRONG>Year</STRONG>   <STRONG>System</STRONG>        <STRONG>Arch</STRONG>    <STRONG>Color</STRONG>   <STRONG>Char</STRONG>   <STRONG>Notes</STRONG>
+              ----------------------------------------------------------------
+              1992   Solaris 5.2   32      6       17     SVr4 curses
+              1992   HP-UX 9       32      no      8      SVr2 curses
+              1992   AIX 3.2       32      no      23     SVr2 curses
+              1994   OSF/1 r3      32      no      23     SVr2 curses
+              1995   HP-UX 10.00   32      6       16     SVr3 "curses_colr"
+              1995   HP-UX 10.00   32      6       8      SVr4, X/Open curses
+              1995   Solaris 5.4   32/64   7       16     X/Open curses
+              1996   AIX 4.2       32      7       16     X/Open curses
+              1996   OSF/1 r4      32      6       16     X/Open curses
+              1997   HP-UX 11.00   32      6       8      X/Open curses
+              2000   U/Win         32/64   7/31    16     uses <STRONG>chtype</STRONG>
+
+       Notes:
+
+          Regarding HP-UX,
+
+          <STRONG>o</STRONG>   HP-UX  10.20  (1996) added support for 64-bit PA-RISC processors
+              in 1996.
+
+          <STRONG>o</STRONG>   HP-UX 10.30 (1997) marked "curses_colr" obsolete.  That  version
+              of curses was dropped with HP-UX 11.30 in 2006.
+
+          Regarding OSF/1 (and Tru64),
+
+          <STRONG>o</STRONG>   These  used  64-bit  hardware.   Like  ncurses, the OSF/1 curses
+              interface is not customized for 32-bit and 64-bit versions.
+
+          <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
+              provided a new implementation for X/Open curses.
+
+          Regarding Solaris,
+
+          <STRONG>o</STRONG>   The initial release of Solaris was in 1992.
+
+          <STRONG>o</STRONG>   The <EM>xpg4</EM> (X/Open) curses was developed by MKS from 1990 to 1995.
+              Sun's copyright began in 1996.
+
+          <STRONG>o</STRONG>   Sun updated the X/Open curses interface after 64-bit support was
+              introduced   in  1997,  but  did  not  modify  the  SVr4  curses
+              interface.
+
+          Regarding U/Win,
+
+          <STRONG>o</STRONG>   Development of the curses library  began  in  1991,  stopped  in
+              2000.
+
+          <STRONG>o</STRONG>   Color support was added in 1998.
+
+          <STRONG>o</STRONG>   The library uses only <STRONG>chtype</STRONG> (no <STRONG>cchar_t</STRONG>).
+
+       Once  X/Open  curses  was adopted in the mid-1990s, the constraint of a
+       32-bit interface with many colors and wide-characters for <STRONG>chtype</STRONG> became
+       a  moot  point.   The <STRONG>cchar_t</STRONG> structure (whose size and members are not
+       specified in X/Open Curses) could be extended as needed.
+
+       Other interfaces are rarely used now:
+
+       <STRONG>o</STRONG>   BSD curses was improved slightly in 1993/1994 using Keith  Bostic's
+           modification  to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He moved
+           <EM>standout</EM> attribute to a structure member.
+
+           The resulting 4.4BSD curses was replaced by ncurses over  the  next
+           ten years.
+
+       <STRONG>o</STRONG>   U/Win is rarely used now.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -514,7 +513,7 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -527,14 +526,14 @@ <H1 class="no-header">curs_attr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-Change-character-rendition">Change character rendition</a></li>
 <li><a href="#h3-Change-window-color">Change window color</a></li>
 <li><a href="#h3-Standout">Standout</a></li>
+<li><a href="#h3-Video-Attributes">Video Attributes</a></li>
 </ul>
 </li>
-<li><a href="#h2-VIDEO-ATTRIBUTES">VIDEO ATTRIBUTES</a></li>
+<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 4706d7616..99fa807cf 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.49 2023/11/25 14:01:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -170,8 +170,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in  the  XSI  Curses  standard,  Issue  4
-       (X/Open Curses).
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -179,7 +178,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 391283553..f5ffa7441 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.32 2023/11/25 14:01:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -105,14 +105,6 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        returned).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be macros.
-
-       X/Open Curses does not provide details on how the rendition is changed.
-       This implementation follows the approach used in SVr4 curses, which  is
-       explained in the manual page for <STRONG>wbkgd</STRONG>.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        The <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> routines do not return a value.
 
@@ -124,9 +116,16 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   A null character pointer is treated as an error.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be available as macros.
+
+       X/Open Curses does not provide details on how the rendition is changed.
+       This  implementation follows the approach used in SVr4 curses, which is
+       explained in the manual page for <STRONG>wbkgd</STRONG>.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in  the  XSI  Curses  standard,  Issue  4
-       (X/Open Curses).
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -134,7 +133,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -147,8 +146,8 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-getbkgrnd">getbkgrnd</a></li>
 </ul>
 </li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index df9c40140..6ea93f52c 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_border.3x,v 1.43 2023/11/25 11:31:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -134,9 +134,7 @@ <H1 class="no-header">curs_border 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but specifies no
-       error conditions.
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -144,7 +142,7 @@ <H1 class="no-header">curs_border 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index b61ed4159..8d8a204b5 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.29 2023/11/11 11:38:35 tom Exp @
+  * @Id: curs_border_set.3x,v 1.31 2023/11/25 15:39:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -56,44 +56,44 @@ <H1 class="no-header">curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</H
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>border_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wborder_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*win</STRONG>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM>, <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>box_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*win</STRONG>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>verch</EM>,
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>verch</EM><STRONG>,</STRONG>
           <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>horch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>hline_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>whline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvhline_set(</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM>, <STRONG>int</STRONG> <EM>x</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwhline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM>,
-          <STRONG>int</STRONG> <EM>y</EM>, <STRONG>int</STRONG> <EM>x</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>vline_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wvline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvvline_set(</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM>, <STRONG>int</STRONG> <EM>x</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwvline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM>,
-          <STRONG>int</STRONG> <EM>y</EM>, <STRONG>int</STRONG> <EM>x</EM>,
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM>, <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -140,36 +140,41 @@ <H1 class="no-header">curs_border_set 3x 2023-11-11 ncurses 6.4 Library calls</H
        a line proceeding toward the last line of the window.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note   that   <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,    <STRONG>mvhline_set</STRONG>,    <STRONG>mvvline_set</STRONG>,
-       <STRONG>mvwhline_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Upon successful completion, these functions return <STRONG>OK</STRONG>.  Otherwise, they
        return <STRONG>ERR</STRONG>.
 
        Functions using a window parameter return an error if it is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Note    that    <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,   <STRONG>mvhline_set</STRONG>,   <STRONG>mvvline_set</STRONG>,
+       <STRONG>mvwhline_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
+
+
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in the XSI Curses standard, Issue 4.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-11               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 20b5f50ac..31939b063 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_clear.3x,v 1.40 2023/11/25 11:31:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -112,9 +112,7 @@ <H1 class="no-header">curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but specifies no
-       error conditions.
+       These functions are described in the XSI Curses standard, Issue 4.
 
        The SVr4.0 manual says  that  these  functions  could  return  "a  non-
        negative  integer if <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG> is set", referring to the return-value
@@ -140,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 0d9566d82..d16373ec8 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.89 2023/11/11 11:38:59 tom Exp @
+  * @Id: curs_color.3x,v 1.92 2023/11/25 17:36:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -213,7 +213,7 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
            alter the internal table along with the terminal's color.
 
        These limits apply to color values and  color  pairs.   Values  outside
-       these limits are not legal, and may result in a runtime error:
+       these limits are not valid, and may result in a runtime error:
 
        <STRONG>o</STRONG>   <STRONG>COLORS</STRONG>   corresponds   to   the   terminal   database's  <STRONG>max_colors</STRONG>
            capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
@@ -227,7 +227,7 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>COLOR_PAIRS</STRONG>  corresponds  to  the  terminal  database's   <STRONG>max_pairs</STRONG>
            capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
 
-       <STRONG>o</STRONG>   legal  color  pair  values  are  in  the  range <STRONG>1</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>,
+       <STRONG>o</STRONG>   valid  color  pair  values  are  in  the  range <STRONG>1</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>,
            inclusive.
 
        <STRONG>o</STRONG>   color pair <STRONG>0</STRONG> is special; it denotes "no color".
@@ -258,12 +258,12 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        foreground color number, and the background color number.  For portable
        applications:
 
-       <STRONG>o</STRONG>   The first argument must be a legal color pair  value.   If  default
+       <STRONG>o</STRONG>   The first argument must be a valid color pair  value.   If  default
            colors  are  used  (see  <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>) the upper limit is
            adjusted to allow for extra pairs which  use  a  default  color  in
            foreground and/or background.
 
-       <STRONG>o</STRONG>   The second and third arguments must be legal color values.
+       <STRONG>o</STRONG>   The second and third arguments must be valid color values.
 
        If  the  color-pair was previously initialized, the screen is refreshed
        and  all  occurrences  of  that  color-pair  are  changed  to  the  new
@@ -287,7 +287,7 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        four arguments: the number of the color to be changed followed by three
        RGB values (for the amounts of red, green, and blue components).
 
-       <STRONG>o</STRONG>   The  first argument must be a legal color value; default colors are
+       <STRONG>o</STRONG>   The  first argument must be a valid color value; default colors are
            not allowed here.  (See the section <STRONG>Colors</STRONG> for  the  default  color
            index.)
 
@@ -313,7 +313,7 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        storing the information about the  amounts  of  red,  green,  and  blue
        components in the given color.
 
-       <STRONG>o</STRONG>   The  first  argument  must  be a legal color value, i.e., <STRONG>0</STRONG> through
+       <STRONG>o</STRONG>   The  first  argument  must  be a valid color value, i.e., <STRONG>0</STRONG> through
            <STRONG>COLORS-1</STRONG>, inclusive.
 
        <STRONG>o</STRONG>   The values that are stored at the addresses pointed to by the  last
@@ -335,7 +335,7 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        pair number, and two addresses of <STRONG>short</STRONG>s for storing the foreground and
        the background color numbers.
 
-       <STRONG>o</STRONG>   The  first argument must be a legal color value, i.e., in the range
+       <STRONG>o</STRONG>   The  first argument must be a valid color value, i.e., in the range
            <STRONG>1</STRONG> through <STRONG>COLOR_PAIRS-1</STRONG>, inclusive.
 
        <STRONG>o</STRONG>   The values that are stored at  the  addresses  pointed  to  by  the
@@ -440,59 +440,13 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Color RGB values are not settable.
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.2 introduced color support to curses in 1987.
-
-       SVr4  made  internal  changes,  e.g.,  moving the storage for the color
-       state  from  <STRONG>SP</STRONG>  (the  <STRONG>SCREEN</STRONG>  structure)  to  <STRONG>cur_term</STRONG>  (the  <STRONG>TERMINAL</STRONG>
-       structure), but provided the same set of library functions.
-
-       SVr4  curses  limits  the  number of color pairs to 64, reserving color
-       pair zero (0) as the terminal's initial uncolored  state.   This  limit
-       arises  because  the color pair information is a bitfield in the <STRONG>chtype</STRONG>
-       data type (denoted by <STRONG>A_COLOR</STRONG>).
-
-       Other implementations of curses had different limits:
-
-       <STRONG>o</STRONG>   PCCurses (1987-1990) provided for only eight (8) colors.
-
-       <STRONG>o</STRONG>   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
-           PCCurses, but changed this to 256 in version 2.5 (2001), along with
-           changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
-
-       <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
-           the character, attributes and color-pair values, allowing increased
-           range of color-pairs.  Both color-pairs  and  color-values  used  a
-           signed <STRONG>short</STRONG>, limiting values to 15 bits.
-
-       <STRONG>o</STRONG>   ncurses  (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in <STRONG>chtype</STRONG>
-           values.
-
-           Version 5.3 provided a wide-character interface  (2002),  but  left
-           color-pairs as part of the attributes-field.
-
-           Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color-pairs
-           in the <STRONG>cchar_t</STRONG> values.  When those color-pair values fit in 8 bits,
-           ncurses  allows  color-pairs  to  be  manipulated via the functions
-           using <STRONG>chtype</STRONG> values.
-
-       <STRONG>o</STRONG>   NetBSD curses used  6  bits  from  2000  (when  colors  were  first
-           supported)  until  2004.   At  that point, NetBSD changed to use 10
-           bits.  As of 2021, that size is  unchanged.   Like  ncurses  before
-           version  6,  the  NetBSD  color-pair  information  is stored in the
-           attributes field of <STRONG>cchar_t</STRONG>, limiting the number of color-pairs  by
-           the size of the bitfield.
-
-
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-
-</PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
        are not found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous
        version of curses.
 
 
-</PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        This  implementation satisfies XSI Curses's minimum maximums for <STRONG>COLORS</STRONG>
        and <STRONG>COLOR_PAIRS</STRONG>.
 
@@ -519,13 +473,57 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        The <STRONG>reset_color_pairs</STRONG> function is an extension of ncurses.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3.2 introduced color support to curses in 1987.
+
+       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
+       state  from  <STRONG>SP</STRONG>  (the  <STRONG>SCREEN</STRONG>  structure)  to  <STRONG>cur_term</STRONG>  (the  <STRONG>TERMINAL</STRONG>
+       structure), but provided the same set of library functions.
+
+       SVr4 curses limits the number of color pairs  to  64,  reserving  color
+       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
+       arises because the color pair information is a bitfield in  the  <STRONG>chtype</STRONG>
+       data type (denoted by <STRONG>A_COLOR</STRONG>).
+
+       Other implementations of curses had different limits:
+
+       <STRONG>o</STRONG>   PCCurses (1987-1990) provided for only eight (8) colors.
+
+       <STRONG>o</STRONG>   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+           PCCurses, but changed this to 256 in version 2.5 (2001), along with
+           changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
+
+       <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
+           the character, attributes and color-pair values, allowing increased
+           range  of  color-pairs.   Both  color-pairs and color-values used a
+           signed <STRONG>short</STRONG>, limiting values to 15 bits.
+
+       <STRONG>o</STRONG>   ncurses (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in  <STRONG>chtype</STRONG>
+           values.
+
+           Version  5.3  provided  a wide-character interface (2002), but left
+           color-pairs as part of the attributes-field.
+
+           Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color-pairs
+           in the <STRONG>cchar_t</STRONG> values.  When those color-pair values fit in 8 bits,
+           ncurses allows color-pairs to  be  manipulated  via  the  functions
+           using <STRONG>chtype</STRONG> values.
+
+       <STRONG>o</STRONG>   NetBSD  curses  used  6  bits  from  2000  (when  colors were first
+           supported) until 2004.  At that point, NetBSD  changed  to  use  10
+           bits.   As  of  2021,  that size is unchanged.  Like ncurses before
+           version 6, the NetBSD  color-pair  information  is  stored  in  the
+           attributes  field of <STRONG>cchar_t</STRONG>, limiting the number of color-pairs by
+           the size of the bitfield.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-11                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -564,13 +562,9 @@ <H1 class="no-header">curs_color 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a>
-<ul>
-<li><a href="#h3-Extensions">Extensions</a></li>
-<li><a href="#h3-Standards">Standards</a></li>
-</ul>
-</li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index a3af64c1d..20b220cb9 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.33 2023/11/25 14:08:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -89,12 +89,6 @@ <H1 class="no-header">curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        window parameter is null, an error is returned.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard specifies that they return <STRONG>ERR</STRONG> on failure,  but  specifies  no
-       error conditions.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Note that all but <STRONG>winsdelln</STRONG> may be macros.
 
@@ -104,12 +98,18 @@ <H1 class="no-header">curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        window.
 
 
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in the XSI Curses standard, Issue 4.  The
+       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but specifies no
+       error conditions.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -117,8 +117,8 @@ <H1 class="no-header">curs_deleteln 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 77b7cfdca..46c1e4295 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_extend.3x,v 1.42 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using NCURSES_VERSION.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey.
 
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,7 +119,7 @@ <H1 class="no-header">curs_extend 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index ea28e6353..38e0e2099 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.28 2023/11/11 11:39:15 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -118,42 +118,44 @@ <H1 class="no-header">curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        special keys.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header file  <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;stdio.h&gt;</STRONG>.
-
-       Applications  should  not  define the escape key by itself as a single-
-       character function.
-
-       When using <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>,  or  <STRONG>mvwget_wch</STRONG>,  applications
-       should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending
-       on the state of the tty  driver  when  each  character  is  typed,  the
-       program may produce undesirable results.
-
-       All functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be macros.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        When   <STRONG>get_wch</STRONG>,   <STRONG>wget_wch</STRONG>,   <STRONG>mvget_wch</STRONG>,   and   <STRONG>mvwget_wch</STRONG>   functions
-       successfully report  the  pressing  of  a  function  key,  they  return
-       <STRONG>KEY_CODE_YES</STRONG>.   When  they  successfully  report a wide character, they
+       successfully  report  the  pressing  of  a  function  key,  they return
+       <STRONG>KEY_CODE_YES</STRONG>.  When they successfully report  a  wide  character,  they
        return <STRONG>OK</STRONG>.  Otherwise, they return <STRONG>ERR</STRONG>.
 
-       Upon successful  completion,  <STRONG>unget_wch</STRONG>  returns  <STRONG>OK</STRONG>.   Otherwise,  the
+       Upon  successful  completion,  <STRONG>unget_wch</STRONG>  returns  <STRONG>OK</STRONG>.   Otherwise, the
        function returns <STRONG>ERR</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Applications should not define the escape key by itself  as  a  single-
+       character function.
+
+       When  using  <STRONG>get_wch</STRONG>,  <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, or <STRONG>mvwget_wch</STRONG>, applications
+       should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending
+       on  the  state  of  the  tty  driver  when each character is typed, the
+       program may produce undesirable results.
+
+       All of these symbols except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be available  as
+       macros.
+
+
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in the XSI Curses standard, Issue 4.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>,
        <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -165,8 +167,9 @@ <H1 class="no-header">curs_get_wch 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-unget_wch">unget_wch</a></li>
 </ul>
 </li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 92dd50da7..81382134f 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.39 2023/11/11 11:39:29 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.41 2023/11/25 14:29:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -111,18 +111,6 @@ <H1 class="no-header">curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        buffer.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
-
-       Using <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to  read  a  line
-       that  overflows  the array pointed to by <STRONG>wstr</STRONG> causes undefined results.
-       The  use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or   <STRONG>wgetn_wstr</STRONG>,
-       respectively, is recommended.
-
-       These  functions  cannot  return <STRONG>KEY_</STRONG> values because there is no way to
-       distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.  may be macros.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All  of  these  functions  return  the  integer  <STRONG>OK</STRONG>   upon   successful
        completion.  If unsuccessful, they return <STRONG>ERR</STRONG>.
@@ -142,6 +130,18 @@ <H1 class="no-header">curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
+
+       Using  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to read a line
+       that overflows the array pointed to by <STRONG>wstr</STRONG> causes  undefined  results.
+       The   use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or  <STRONG>wgetn_wstr</STRONG>,
+       respectively, is recommended.
+
+       These functions cannot return <STRONG>KEY_</STRONG> values because there is  no  way  to
+       distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
@@ -187,15 +187,15 @@ <H1 class="no-header">curs_get_wstr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 0d165a65f..08eb5e09e 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.40 2023/11/11 11:39:43 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.42 2023/11/25 14:30:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -111,20 +111,15 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
            case, no nonspacing characters are allowed.
 
 
-</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open Curses documents the <EM>opts</EM> argument as reserved for  future  use,
-       saying  that  it must be null.  This implementation uses that parameter
-       in ABI 6 for the functions which have a color-pair parameter to support
-       extended color pairs:
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       When <EM>wch</EM> is a  null  pointer,  <STRONG>getcchar</STRONG>  returns  the  number  of  wide
+       characters referenced by <EM>wcval</EM>, including one for a trailing null.
 
-       <STRONG>o</STRONG>   For   functions  which modify the color, e.g., <STRONG>setcchar</STRONG>, if <EM>opts</EM> is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
-           pair instead of the <STRONG>short</STRONG> pair parameter.
+       When  <EM>wch</EM>  is  not  a null pointer, <STRONG>getcchar</STRONG> returns <STRONG>OK</STRONG> upon successful
+       completion, and <STRONG>ERR</STRONG> otherwise.
 
-       <STRONG>o</STRONG>   For  functions which retrieve the color, e.g., <STRONG>getcchar</STRONG>, if <EM>opts</EM> is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
-           color  pair  as  an  <STRONG>int</STRONG>  value,  in addition retrieving it via the
-           standard pointer to <STRONG>short</STRONG> parameter.
+       Upon successful completion, <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, it returns
+       <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -133,15 +128,20 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        by any other means, the effect is unspecified.
 
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       When <EM>wch</EM> is a  null  pointer,  <STRONG>getcchar</STRONG>  returns  the  number  of  wide
-       characters referenced by <EM>wcval</EM>, including one for a trailing null.
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
+       saying that it must be null.  This implementation uses  that  parameter
+       in ABI 6 for the functions which have a color-pair parameter to support
+       extended color pairs:
 
-       When  <EM>wch</EM>  is  not  a null pointer, <STRONG>getcchar</STRONG> returns <STRONG>OK</STRONG> upon successful
-       completion, and <STRONG>ERR</STRONG> otherwise.
+       <STRONG>o</STRONG>   For  functions  which modify the color, e.g., <STRONG>setcchar</STRONG>, if <EM>opts</EM>  is
+           set it is treated as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
+           pair instead of the <STRONG>short</STRONG> pair parameter.
 
-       Upon successful completion, <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, it returns
-       <STRONG>ERR</STRONG>.
+       <STRONG>o</STRONG>   For functions which retrieve the color, e.g., <STRONG>getcchar</STRONG>, if <EM>opts</EM>  is
+           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
+           color pair as an <STRONG>int</STRONG> value,  in  addition  retrieving  it  via  the
+           standard pointer to <STRONG>short</STRONG> parameter.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -208,9 +208,9 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-setcchar">setcchar</a></li>
 </ul>
 </li>
-<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 7622e5c00..9567bb3a7 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.49 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_getstr.3x,v 1.51 2023/11/25 14:29:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -105,17 +105,8 @@ <H1 class="no-header">curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        letting the application prevent overflow of the input buffer.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
-
-       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or  <STRONG>wgetstr</STRONG>  to  read  a  line  that
-       overflows  the  array  pointed to by <STRONG>str</STRONG> causes undefined results.  The
-       use of <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or  <STRONG>wgetnstr</STRONG>,  respectively,  is
-       recommended.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All   of   these  functions  return  the  integer  <STRONG>OK</STRONG>  upon  successful
+       All  of  these  functions  return  the  integer  <STRONG>OK</STRONG>   upon   successful
        completion.  (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") If
        unsuccessful, they return <STRONG>ERR</STRONG>.
 
@@ -129,15 +120,24 @@ <H1 class="no-header">curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wgetch</STRONG> failed.
 
-       This  implementation  provides  an  extension  as  well.  If a <STRONG>SIGWINCH</STRONG>
-       interrupts the function, it will return <STRONG>KEY_RESIZE</STRONG> rather  than  <STRONG>OK</STRONG>  or
+       This implementation provides an  extension  as  well.   If  a  <STRONG>SIGWINCH</STRONG>
+       interrupts  the  function,  it will return <STRONG>KEY_RESIZE</STRONG> rather than <STRONG>OK</STRONG> or
        <STRONG>ERR</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
+
+       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or  <STRONG>wgetstr</STRONG>  to  read  a  line  that
+       overflows  the  array  pointed to by <STRONG>str</STRONG> causes undefined results.  The
+       use of <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or  <STRONG>wgetnstr</STRONG>,  respectively,  is
+       recommended.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
@@ -240,15 +240,15 @@ <H1 class="no-header">curs_getstr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 79d4feec1..16f564cd4 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.56 2023/10/21 10:28:36 tom Exp @
+  * @Id: curs_inopts.3x,v 1.58 2023/11/25 14:30:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -246,6 +246,17 @@ <H1 class="no-header">curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</H1>
                returns an error if its parameter is outside the range 1..255.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Note that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>,  <STRONG>nodelay</STRONG>,
+       <STRONG>notimeout</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be macros.
+
+       The  <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> calls follow historical practice in that they
+       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
+       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
+       driver control states that are hard to predict or understand; it is not
+       recommended.
+
+
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        This implementation provides four functions which may be used to detect
        if the corresponding flags were set or reset:
@@ -265,78 +276,67 @@ <H1 class="no-header">curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
        -1   if the <EM>curses</EM> library was not initialized.
 
-       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
+       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
        NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Except as noted in the  section  on  extensions,  these  functions  are
+       Except  as  noted  in  the  section  on extensions, these functions are
        described in the XSI Curses standard, Issue 4.
 
        The <EM>ncurses</EM> library obeys the XPG4 standard and the historical practice
-       of the AT&amp;T <EM>curses</EM> implementations, in that the  echo  bit  is  cleared
-       when  <EM>curses</EM>  initializes the terminal state.  BSD <EM>curses</EM> differed from
-       this slightly; it left the echo bit on at initialization, but  the  BSD
-       <STRONG>raw</STRONG>  call  turned  it  off as a side-effect.  For best portability, set
-       <STRONG>echo</STRONG> or <STRONG>noecho</STRONG> explicitly  just  after  initialization,  even  if  your
+       of  the  AT&amp;T  <EM>curses</EM>  implementations, in that the echo bit is cleared
+       when <EM>curses</EM> initializes the terminal state.  BSD <EM>curses</EM>  differed  from
+       this  slightly;  it left the echo bit on at initialization, but the BSD
+       <STRONG>raw</STRONG> call turned it off as a side-effect.   For  best  portability,  set
+       <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly  just  after  initialization, even if your
        program remains in cooked mode.
 
-       The  XSI  Curses  standard  is ambiguous on the question of whether <STRONG>raw</STRONG>
-       should disable the CRLF translations controlled by <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>.   BSD
-       <EM>curses</EM>  did  turn off these translations; AT&amp;T <EM>curses</EM> (at least as late
-       as SVr1) did not.  We chose to do so, on the theory that  a  programmer
-       requesting  raw  input  wants  a clean (ideally 8-bit clean) connection
+       The XSI Curses standard is ambiguous on the  question  of  whether  <STRONG>raw</STRONG>
+       should  disable  the  CRLF translations controlled by <STRONG>nl</STRONG> and <STRONG>nonl</STRONG>.  BSD
+       <EM>curses</EM> did turn off these translations; AT&amp;T <EM>curses</EM> (at least  as  late
+       as  SVr1)  did not.  We chose to do so, on the theory that a programmer
+       requesting raw input wants a clean  (ideally  8-bit  clean)  connection
        that the operating system will not alter.
 
        When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key-definitions for the
-       current  terminal  description.   If  the terminal description includes
-       extended string capabilities, e.g., from using the <STRONG>-x</STRONG>  option  of  <STRONG>tic</STRONG>,
-       then  <EM>ncurses</EM>  also defines keys for the capabilities whose names begin
-       with "k".  The corresponding keycodes are generated and  (depending  on
-       previous  loads of terminal descriptions) may differ from one execution
+       current terminal description.  If  the  terminal  description  includes
+       extended  string  capabilities,  e.g., from using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>,
+       then <EM>ncurses</EM> also defines keys for the capabilities whose  names  begin
+       with  "k".   The corresponding keycodes are generated and (depending on
+       previous loads of terminal descriptions) may differ from one  execution
        of a program to the next.  The generated keycodes are recognized by the
-       <STRONG>keyname</STRONG>  function  (which  will  then  return a name beginning with "k"
-       denoting the terminfo capability name rather than "K", used for  <EM>curses</EM>
-       key-names).   On  the  other hand, an application can use <STRONG>define_key</STRONG> 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 <STRONG>tigetstr</STRONG>, and reassign  the  keycode  to  match  its  own
+       <STRONG>keyname</STRONG> function (which will then return  a  name  beginning  with  "k"
+       denoting  the terminfo capability name rather than "K", used for <EM>curses</EM>
+       key-names).  On the other hand, an application can  use  <STRONG>define_key</STRONG>  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  <STRONG>tigetstr</STRONG>,  and  reassign  the  keycode to match its own
        needs.
 
        Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
-       particular string capability.  Higher-level applications which use  the
-       <EM>curses</EM>  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
+       particular  string capability.  Higher-level applications which use the
+       <EM>curses</EM> <STRONG>wgetch</STRONG> and similar functions to return keycodes  rely  upon  the
        order in which the strings are loaded.  If more than one key definition
-       has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
+       has the same string value, then <STRONG>wgetch</STRONG> can  return  only  one  keycode.
        Most <EM>curses</EM> implementations (including <EM>ncurses</EM>) load key definitions in
-       the  order  defined  by the array of string capability names.  The last
-       key to be loaded determines the keycode which  will  be  returned.   In
-       <EM>ncurses</EM>,  you  may  also  have extended capabilities interpreted as key
-       definitions.  These are loaded after the  predefined  keys,  and  if  a
-       capability's  value  is the same as a previously-loaded key definition,
+       the order defined by the array of string capability  names.   The  last
+       key  to  be  loaded  determines the keycode which will be returned.  In
+       <EM>ncurses</EM>, you may also have extended  capabilities  interpreted  as  key
+       definitions.   These  are  loaded  after  the predefined keys, and if a
+       capability's value is the same as a previously-loaded  key  definition,
        the later definition is the one used.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>,  <STRONG>nodelay</STRONG>,
-       <STRONG>notimeout</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be macros.
-
-       The  <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> calls follow historical practice in that they
-       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
-       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
-       driver control states that are hard to predict or understand; it is not
-       recommended.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -360,9 +360,9 @@ <H1 class="no-header">curs_inopts 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 4022dedd2..1fbbd02d4 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.24 2023/11/25 11:32:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -77,8 +77,8 @@ <H1 class="no-header">curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        the window pointer is null.
 
 
-</PRE><H2><a name="h2-ERRORS">ERRORS</a></H2><PRE>
-       No errors are defined.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in the XSI Curses standard, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_ins_wch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-ERRORS">ERRORS</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index b19bcc80f..153add44e 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.27 2023/11/18 23:44:30 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.29 2023/11/25 11:29:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These  functions  are  described  in  the XSI Curses standard, Issue 4,
-       which adds const qualifiers to the arguments.
+       which adds <EM>const</EM> qualifiers to the arguments.
 
        X/Open states that the entire string is inserted if <EM>n</EM> is less  than  1.
        This  is  probably  an  error,  because  it  is inconsistent with other
@@ -122,7 +122,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-18                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 6ed135c6a..b92975ae4 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.44 2023/11/18 23:46:00 tom Exp @
+  * @Id: curs_insstr.3x,v 1.46 2023/11/25 11:29:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the  XSI  Curses  standard,  Issue  4,
-       which adds const qualifiers to the arguments.
+       which adds <EM>const</EM> qualifiers to the arguments.
 
        The  Single  Unix  Specification,  Version  2  states  that <STRONG>insnstr</STRONG> and
        <STRONG>winsnstr</STRONG> perform wrapping.  This is probably an error, since  it  makes
@@ -122,7 +122,7 @@ <H1 class="no-header">curs_insstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 5c0951b4d..4860e02cc 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.41 2023/11/19 00:20:02 tom Exp @
+  * @Id: curs_instr.3x,v 1.43 2023/11/25 17:58:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -110,12 +110,12 @@ <H1 class="no-header">curs_instr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-18                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 9022fb975..c6c08b29a 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.33 2023/11/19 00:10:50 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.35 2023/11/25 11:31:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -110,13 +110,17 @@ <H1 class="no-header">curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
        the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
 
 
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These functions are described in the XSI Curses standard, Issue 4.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -125,6 +129,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index f4ab7c985..7e1eb88b5 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.50 2023/11/11 11:46:54 tom Exp @
+  * @Id: curs_outopts.3x,v 1.52 2023/11/25 14:08:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -162,6 +162,14 @@ <H1 class="no-header">curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        returns an error if the window pointer is null.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Note  that  <STRONG>clearok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and <STRONG>setscrreg</STRONG> may be
+       macros.
+
+       The <STRONG>immedok</STRONG> routine is useful for windows that  are  used  as  terminal
+       emulators.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
@@ -191,21 +199,13 @@ <H1 class="no-header">curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        invisible.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and  <STRONG>setscrreg</STRONG>  may  be
-       macros.
-
-       The  <STRONG>immedok</STRONG>  routine  is  useful for windows that are used as terminal
-       emulators.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -223,8 +223,8 @@ <H1 class="no-header">curs_outopts 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index d27415cab..669b7d5bd 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_overlay.3x,v 1.35 2023/11/25 11:29:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -95,10 +95,10 @@ <H1 class="no-header">curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  XSI Curses standard, Issue 4 describes these functions (adding the
-       const qualifiers).  It further specifies their behavior in the presence
-       of  characters  with  multibyte  renditions  (not yet supported in this
-       implementation).
+       These  functions  are  described  in  the XSI Curses standard, Issue 4,
+       which adds <EM>const</EM> qualifiers to the  arguments.   It  further  specifies
+       their  behavior in the presence of characters with multibyte renditions
+       (not yet supported in this implementation).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index de86709dc..77fc8cd00 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.47 2023/11/11 11:47:10 tom Exp @
+  * @Id: curs_pad.3x,v 1.49 2023/11/25 14:08:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -77,82 +77,81 @@ <H1 class="no-header">curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        refreshes of pads (e.g., from scrolling or echoing  of  input)  do  not
        occur.
 
-       It  is  not  legal  to  call  <STRONG>wrefresh</STRONG>  with  a <EM>pad</EM> as an argument; the
-       routines <STRONG>prefresh</STRONG> or <STRONG>pnoutrefresh</STRONG> should be called instead.  Note  that
-       these routines require additional parameters to specify the part of the
-       pad to be displayed and the location on the screen to be used  for  the
-       display.
+       It  is not valid to call <STRONG>wrefresh</STRONG> with a <EM>pad</EM> argument; call <STRONG>prefresh</STRONG> or
+       <STRONG>pnoutrefresh</STRONG> instead.  They require additional  parameters  to  specify
+       the  part  of the pad to be displayed and the location on the screen to
+       be used for the display.
 
 
 </PRE><H3><a name="h3-subpad">subpad</a></H3><PRE>
-       The  <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow within
-       a pad with the given number  of  lines,  <EM>nlines</EM>,  and  columns,  <EM>ncols</EM>.
+       The <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow  within
+       a  pad  with  the  given  number  of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.
        Unlike <STRONG>subwin</STRONG>, which uses screen coordinates, the window is at position
        (<EM>begin</EM>_<EM>x</EM><STRONG>,</STRONG> <EM>begin</EM>_<EM>y</EM>) on the pad.  The window is made in the middle of the
-       window  <EM>orig</EM>,  so  that changes made to one window affect both windows.
-       During the use of this routine, it will  often  be  necessary  to  call
+       window <EM>orig</EM>, so that changes made to one window  affect  both  windows.
+       During  the  use  of  this  routine, it will often be necessary to call
        <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-prefresh_-pnoutrefresh">prefresh, pnoutrefresh</a></H3><PRE>
-       The  <STRONG>prefresh</STRONG>  and  <STRONG>pnoutrefresh</STRONG> routines are analogous to <STRONG>wrefresh</STRONG> and
-       <STRONG>wnoutrefresh</STRONG> except that they relate to pads instead of  windows.   The
-       additional  parameters  are needed to indicate what part of the pad and
+       The <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> routines are analogous  to  <STRONG>wrefresh</STRONG>  and
+       <STRONG>wnoutrefresh</STRONG>  except  that they relate to pads instead of windows.  The
+       additional parameters are needed to indicate what part of the  pad  and
        screen are involved.
 
-       <STRONG>o</STRONG>   The <EM>pminrow</EM> and <EM>pmincol</EM>  parameters  specify  the  upper  left-hand
+       <STRONG>o</STRONG>   The  <EM>pminrow</EM>  and  <EM>pmincol</EM>  parameters  specify the upper left-hand
            corner of the rectangle to be displayed in the pad.
 
-       <STRONG>o</STRONG>   The  <EM>sminrow</EM>,  <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters specify the
+       <STRONG>o</STRONG>   The <EM>sminrow</EM>, <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters  specify  the
            edges of the rectangle to be displayed on the screen.
 
        The lower right-hand corner of the rectangle to be displayed in the pad
        is calculated from the screen coordinates, since the rectangles must be
        the same size.  Both rectangles must be entirely contained within their
-       respective  structures.   Negative values of <EM>pminrow</EM>, <EM>pmincol</EM>, <EM>sminrow</EM>,
+       respective structures.  Negative values of <EM>pminrow</EM>,  <EM>pmincol</EM>,  <EM>sminrow</EM>,
        or <EM>smincol</EM> are treated as if they were zero.
 
 
 </PRE><H3><a name="h3-pechochar">pechochar</a></H3><PRE>
-       The <STRONG>pechochar</STRONG> routine is functionally equivalent to  a  call  to  <STRONG>addch</STRONG>
-       followed  by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a call
-       to <STRONG>wrefresh</STRONG>, or a call to <STRONG>waddch</STRONG> followed by a call to  <STRONG>prefresh</STRONG>.   The
-       knowledge  that  only  a single character is being output is taken into
-       consideration  and,  for   non-control   characters,   a   considerable
+       The  <STRONG>pechochar</STRONG>  routine  is  functionally equivalent to a call to <STRONG>addch</STRONG>
+       followed by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a  call
+       to  <STRONG>wrefresh</STRONG>,  or a call to <STRONG>waddch</STRONG> followed by a call to <STRONG>prefresh</STRONG>.  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 these routines instead of their
        equivalents.  In the case of <STRONG>pechochar</STRONG>, the last location of the pad on
        the screen is reused for the arguments to <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-pecho_wchar">pecho_wchar</a></H3><PRE>
-       The  <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form of
+       The <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form  of
        <STRONG>pechochar</STRONG>.  It outputs one character to a pad and immediately refreshes
-       the  pad.   It  does  this  by a call to <STRONG>wadd_wch</STRONG> followed by a call to
+       the pad.  It does this by a call to <STRONG>wadd_wch</STRONG>  followed  by  a  call  to
        <STRONG>prefresh</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
-       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
+       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       Routines that return pointers return <STRONG>NULL</STRONG> on error, and  set  <STRONG>errno</STRONG>  to
+       Routines  that  return  pointers return <STRONG>NULL</STRONG> on error, and set <STRONG>errno</STRONG> to
        <STRONG>ENOMEM</STRONG>.
 
        X/Open does not define any error conditions.  In this implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
                return an error if the window pointer is null, or if the window
-               is not really a pad or if the  area  to  refresh  extends  off-
-               screen  or  if  the  minimum  coordinates  are greater than the
+               is  not  really  a  pad  or if the area to refresh extends off-
+               screen or if the  minimum  coordinates  are  greater  than  the
                maximum.
 
           <STRONG>pechochar</STRONG>
-               returns an error if the window is not really  a  pad,  and  the
+               returns  an  error  if  the window is not really a pad, and the
                associated call to <STRONG>wechochar</STRONG> returns an error.
 
           <STRONG>pecho_wchar</STRONG>
-               returns  an  error  if  the window is not really a pad, and the
+               returns an error if the window is not really  a  pad,  and  the
                associated call to <STRONG>wecho_wchar</STRONG> returns an error.
 
 
@@ -163,67 +162,67 @@ <H1 class="no-header">curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        BSD <EM>curses</EM> has no <EM>pad</EM> feature.
 
-       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
-       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
+       SVr2   <EM>curses</EM>   (1986)  provided  the  <STRONG>newpad</STRONG>  and  related  functions,
+       documenting them in a single line  each.   SVr3  (1987)  provided  more
        extensive documentation.
 
-       The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
+       The  documentation  does not explain the term <EM>pad</EM>.  However, the Apollo
        <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
 
-       <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
+       <STRONG>o</STRONG>   These graphical pads could  be  much  larger  than  the  computer's
            display.
 
-       <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
+       <STRONG>o</STRONG>   The  read-only  output  from  a  command  could be scrolled back to
            inspect, and select text from the pad.
 
        The two uses may be related.
 
-       The  XSI  Curses  standard,  Issue 4 describes these functions, without
-       significant change from the SVr3 documentation.  It describes no  error
-       conditions.   The  behavior of <STRONG>subpad</STRONG> if the parent window is not a pad
+       The XSI Curses standard, Issue 4  describes  these  functions,  without
+       significant  change from the SVr3 documentation.  It describes no error
+       conditions.  The behavior of <STRONG>subpad</STRONG> if the parent window is not  a  pad
        is undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG>  structure  in  <STRONG>newpad</STRONG>  which
+       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <STRONG>WINDOW</STRONG> structure in <STRONG>newpad</STRONG> which
            tells if the window is a <EM>pad</EM>.
 
-           However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
-           should call <STRONG>wrefresh</STRONG>) and <STRONG>wscrl</STRONG> (to avoid  scrolling  a  pad),  and
-           does  not  check  in  <STRONG>wrefresh</STRONG>  to ensure that the pad is refreshed
+           However, it uses this information only in <STRONG>waddch</STRONG> (to decide  if  it
+           should  call  <STRONG>wrefresh</STRONG>)  and  <STRONG>wscrl</STRONG> (to avoid scrolling a pad), and
+           does not check in <STRONG>wrefresh</STRONG> to ensure  that  the  pad  is  refreshed
            properly.
 
-       <STRONG>o</STRONG>   Solaris X/Open Curses checks if a window is a pad in  <STRONG>wnoutrefresh</STRONG>,
+       <STRONG>o</STRONG>   Solaris  X/Open Curses checks if a window is a pad in <STRONG>wnoutrefresh</STRONG>,
            returning <STRONG>ERR</STRONG> in that case.
 
-           However,  it only sets the flag for subwindows if the parent window
-           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
+           However, it only sets the flag for subwindows if the parent  window
+           is  a  pad.   Its  <STRONG>newpad</STRONG>  function  does not set this information.
            Consequently, the check will never fail.
 
-           It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
-           enough, a comment in the source code states  that  the  lack  of  a
+           It makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though  interestingly
+           enough,  a  comment  in  the  source code states that the lack of a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and
-           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
+       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG>  and
+           <STRONG>subpad</STRONG>,   using   this   to   help  with  the  distinction  between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
-           It  does  not  check for the case where a subwindow is created in a
+           It does not check for the case where a subwindow is  created  in  a
            pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
 
-           The <STRONG>dupwin</STRONG> function returns a regular  window  when  duplicating  a
-           pad.   Likewise,  <STRONG>getwin</STRONG> always returns a window, even if the saved
+           The  <STRONG>dupwin</STRONG>  function  returns  a regular window when duplicating a
+           pad.  Likewise, <STRONG>getwin</STRONG> always returns a window, even if  the  saved
            data was from a pad.
 
        This implementation
 
        <STRONG>o</STRONG>   sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
 
-       <STRONG>o</STRONG>   allows a <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG> call to succeed having a  pad  parent  by
+       <STRONG>o</STRONG>   allows  a  <STRONG>subwin</STRONG>  or <STRONG>derwin</STRONG> call to succeed having a pad parent by
            forcing the subwindow to be a pad,
 
-       <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
+       <STRONG>o</STRONG>   checks in both <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to  ensure  that  pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
+       <STRONG>o</STRONG>   ensures   that   <STRONG>dupwin</STRONG>   and  <STRONG>getwin</STRONG>  treat  pads  versus  windows
            consistently.
 
 
@@ -232,7 +231,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 9fe5e1f1a..35e39c725 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_printw.3x,v 1.43 2023/11/25 11:31:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -91,34 +91,6 @@ <H1 class="no-header">curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        the window pointer is null.
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       While <STRONG>printw</STRONG> was implemented in 4BSD, it was unused until 4.2BSD (which
-       used it in games).  That early version of curses was before the ANSI  C
-       standard.   It  did not use &lt;varargs.h&gt;, though that was available.  In
-       1991 (a couple of years after SVr4 was generally available,  and  after
-       the  C  standard  was published), other developers updated the library,
-       using  &lt;stdarg.h&gt;  internally  in  4.4BSD  curses.   Even   with   this
-       improvement,  BSD  curses  did  not  use  function  prototypes (or even
-       declare functions) in the &lt;curses.h&gt; header until 1992.
-
-       SVr2 documented <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>  tersely  as  "printf  on  <EM>stdscr</EM>"  and
-       tersely as "printf on <EM>win</EM>", respectively.
-
-       SVr3  added  <STRONG>mvprintw</STRONG>,  and <STRONG>mvwprintw</STRONG>, with a three-line summary saying
-       that they were analogous to <STRONG>printf(3)</STRONG>, explaining that the string which
-       would be output from <STRONG>printf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on
-       the given window.  SVr3 also added  <STRONG>vwprintw</STRONG>,  saying  that  the  third
-       parameter  is  a  <STRONG>va_list</STRONG>,  defined  in  &lt;varargs.h&gt;, and referring the
-       reader to the  manual  pages  for  <EM>varargs</EM>  and  <STRONG>vprintf</STRONG>  for  detailed
-       descriptions.
-
-       SVr4  added  no  new  variations  of  <STRONG>printw</STRONG>,  but  provided  for using
-       &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
-
-       X/Open Curses added <STRONG>vw_printw</STRONG> to replace  <STRONG>vwprintw</STRONG>,  stating  that  its
-       <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        In  this  implementation,  <STRONG>vw_printw</STRONG>  and  <STRONG>vwprintw</STRONG>  are equivalent, to
        support  legacy  applications.   However,  the  latter  (<STRONG>vwprintw</STRONG>)   is
@@ -138,13 +110,41 @@ <H1 class="no-header">curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       While <STRONG>printw</STRONG> was implemented in 4BSD, it was unused until 4.2BSD (which
+       used  it in games).  That early version of curses was before the ANSI C
+       standard.  It did not use &lt;varargs.h&gt;, though that was  available.   In
+       1991  (a  couple of years after SVr4 was generally available, and after
+       the C standard was published), other developers  updated  the  library,
+       using   &lt;stdarg.h&gt;   internally  in  4.4BSD  curses.   Even  with  this
+       improvement, BSD curses  did  not  use  function  prototypes  (or  even
+       declare functions) in the &lt;curses.h&gt; header until 1992.
+
+       SVr2  documented  <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>  tersely  as  "printf on <EM>stdscr</EM>" and
+       tersely as "printf on <EM>win</EM>", respectively.
+
+       SVr3 added <STRONG>mvprintw</STRONG>, and <STRONG>mvwprintw</STRONG>, with a  three-line  summary  saying
+       that they were analogous to <STRONG>printf(3)</STRONG>, explaining that the string which
+       would be output from <STRONG>printf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on
+       the  given  window.   SVr3  also  added <STRONG>vwprintw</STRONG>, saying that the third
+       parameter is a <STRONG>va_list</STRONG>,  defined  in  &lt;varargs.h&gt;,  and  referring  the
+       reader  to  the  manual  pages  for  <EM>varargs</EM>  and  <STRONG>vprintf</STRONG> for detailed
+       descriptions.
+
+       SVr4 added  no  new  variations  of  <STRONG>printw</STRONG>,  but  provided  for  using
+       &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
+
+       X/Open  Curses  added  <STRONG>vw_printw</STRONG>  to replace <STRONG>vwprintw</STRONG>, stating that its
+       <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
        <STRONG>printf(3)</STRONG>, <STRONG>vprintf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -152,8 +152,8 @@ <H1 class="no-header">curs_printw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 2c65478f7..6b51f936d 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_scanw.3x,v 1.43 2023/11/25 11:31:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -90,6 +90,44 @@ <H1 class="no-header">curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        the window pointer is null.
 
 
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       In this implementation, <STRONG>vw_scanw</STRONG> and <STRONG>vwscanw</STRONG> are equivalent, to support
+       legacy applications.  However, the latter (<STRONG>vwscanw</STRONG>) is obsolete:
+
+       <STRONG>o</STRONG>   The XSI Curses standard, Issue 4 described these functions,  noting
+           that  the  function <STRONG>vwscanw</STRONG> is marked TO BE WITHDRAWN, and is to be
+           replaced by a function <STRONG>vw_scanw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
+
+       <STRONG>o</STRONG>   The Single Unix Specification, Version 2 states that  <STRONG>vw_scanw</STRONG>   is
+           preferred   to   <STRONG>vwscanw</STRONG>   since   the  latter  requires  including
+           <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file  as  <STRONG>&lt;stdarg.h&gt;</STRONG>.
+           This  implementation  uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
+           is included in <STRONG>&lt;curses.h</STRONG>&gt;.
+
+       <STRONG>o</STRONG>   X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwscanw</STRONG>  (along  with
+           <STRONG>vwprintw</STRONG> and the termcap interface) as withdrawn.
+
+       Both  XSI and The Single Unix Specification, Version 2 state that these
+       functions return <STRONG>ERR</STRONG> or <STRONG>OK</STRONG>.
+
+       <STRONG>o</STRONG>   Since the underlying  <STRONG>scanf(3)</STRONG>  can  return  the  number  of  items
+           scanned, and the SVr4 code was documented to use this feature, this
+           is probably an editing error which was introduced  in  XSI,  rather
+           than being done intentionally.
+
+       <STRONG>o</STRONG>   This  implementation  returns  the  number  of  items  scanned, for
+           compatibility with SVr4 curses.  As of  2018,  NetBSD  curses  also
+           returns  the  number  of  items  scanned.   Both ncurses and NetBSD
+           curses call <STRONG>vsscanf</STRONG> to scan the string, which returns <STRONG>EOF</STRONG> on error.
+
+       <STRONG>o</STRONG>   Portable applications should only test if the return value is  <STRONG>ERR</STRONG>,
+           since the <STRONG>OK</STRONG> value (zero) is likely to be misleading.
+
+           One  possible  way  to  get  useful  results would be to use a "%n"
+           conversion at the end of the format string to ensure that something
+           was processed.
+
+
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        While  <STRONG>scanw</STRONG>  was implemented in 4BSD, none of the BSD releases used it
        until 4.4BSD (in a game).  That early version of curses was before  the
@@ -119,51 +157,13 @@ <H1 class="no-header">curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       In this implementation, <STRONG>vw_scanw</STRONG> and <STRONG>vwscanw</STRONG> are equivalent, to support
-       legacy applications.  However, the latter (<STRONG>vwscanw</STRONG>) is obsolete:
-
-       <STRONG>o</STRONG>   The  XSI Curses standard, Issue 4 described these functions, noting
-           that the function <STRONG>vwscanw</STRONG> is marked TO BE WITHDRAWN, and is  to  be
-           replaced by a function <STRONG>vw_scanw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
-
-       <STRONG>o</STRONG>   The  Single  Unix Specification, Version 2 states that <STRONG>vw_scanw</STRONG>  is
-           preferred  to  <STRONG>vwscanw</STRONG>  since   the   latter   requires   including
-           <STRONG>&lt;varargs.h&gt;</STRONG>,  which  cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
-           This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because  that  header
-           is included in <STRONG>&lt;curses.h</STRONG>&gt;.
-
-       <STRONG>o</STRONG>   X/Open  Curses,  Issue 5 (December 2007) marked <STRONG>vwscanw</STRONG> (along with
-           <STRONG>vwprintw</STRONG> and the termcap interface) as withdrawn.
-
-       Both XSI and The Single Unix Specification, Version 2 state that  these
-       functions return <STRONG>ERR</STRONG> or <STRONG>OK</STRONG>.
-
-       <STRONG>o</STRONG>   Since  the  underlying  <STRONG>scanf(3)</STRONG>  can  return  the  number of items
-           scanned, and the SVr4 code was documented to use this feature, this
-           is  probably  an  editing error which was introduced in XSI, rather
-           than being done intentionally.
-
-       <STRONG>o</STRONG>   This implementation  returns  the  number  of  items  scanned,  for
-           compatibility  with  SVr4  curses.   As of 2018, NetBSD curses also
-           returns the number of  items  scanned.   Both  ncurses  and  NetBSD
-           curses call <STRONG>vsscanf</STRONG> to scan the string, which returns <STRONG>EOF</STRONG> on error.
-
-       <STRONG>o</STRONG>   Portable  applications should only test if the return value is <STRONG>ERR</STRONG>,
-           since the <STRONG>OK</STRONG> value (zero) is likely to be misleading.
-
-           One possible way to get useful results  would  be  to  use  a  "%n"
-           conversion at the end of the format string to ensure that something
-           was processed.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
        <STRONG>scanf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -171,8 +171,8 @@ <H1 class="no-header">curs_scanw 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 926d977d7..dce1c8556 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.33 2023/11/11 11:47:41 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.35 2023/11/25 11:29:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -112,8 +112,8 @@ <H1 class="no-header">curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4, describes these functions (adding the
-       const qualifiers).
+       These  functions  are  described  in  the XSI Curses standard, Issue 4,
+       which adds <EM>const</EM> qualifiers to the arguments.
 
        The SVr4 docs merely say under <STRONG>scr_init</STRONG> that  the  dump  data  is  also
        considered  invalid  "if  the  time-stamp of the tty is old" but do not
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 69886dcfd..48e91609d 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.64 2023/10/21 10:31:22 tom Exp @
+  * @Id: curs_slk.3x,v 1.66 2023/11/25 14:31:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -205,47 +205,22 @@ <H1 class="no-header">curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</H1>
                0..2, or if memory for the labels cannot be allocated.
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3 introduced these functions:
-         <STRONG>slk_clear</STRONG>
-         <STRONG>slk_init</STRONG>
-         <STRONG>slk_label</STRONG>
-         <STRONG>slk_noutrefresh</STRONG>
-         <STRONG>slk_refresh</STRONG>
-         <STRONG>slk_restore</STRONG>
-         <STRONG>slk_set</STRONG>
-         <STRONG>slk_touch</STRONG>
-
-       SVr4 added these functions:
-         <STRONG>slk_attroff</STRONG>
-         <STRONG>slk_attron</STRONG>
-         <STRONG>slk_attrset</STRONG>
-         <STRONG>slk_start</STRONG>
-
-       X/Open <EM>curses</EM> added these:
-         <STRONG>slk_attr_off</STRONG>
-         <STRONG>slk_attr_on</STRONG>
-         <STRONG>slk_attr_set</STRONG>
-         <STRONG>slk_color</STRONG>
-         <STRONG>slk_wset</STRONG>
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Most applications would  use  <STRONG>slk_noutrefresh</STRONG>  because  a  <STRONG>wrefresh</STRONG>  is
+       likely to follow soon.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open <EM>curses</EM> documents the <EM>opts</EM> argument as reserved for  future  use,
-       saying  that  it must be null.  This implementation uses that parameter
+       X/Open  <EM>curses</EM>  documents the <EM>opts</EM> argument as reserved for future use,
+       saying that it must be null.  This implementation uses  that  parameter
        in ABI 6 for the functions which have a color-pair parameter to support
        extended color pairs.
 
-       For   functions  which modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM> is
-       set it is treated as a pointer to <STRONG>int</STRONG>, and used  to   set   the   color
+       For  functions  which modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM>  is
+       set  it  is  treated  as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
        pair instead of the <STRONG>short</STRONG> pair parameter.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Most  applications  would  use  <STRONG>slk_noutrefresh</STRONG>  because  a <STRONG>wrefresh</STRONG> is
-       likely to follow soon.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The XSI <EM>curses</EM> standard, Issue 4,  described  the  soft-key  functions,
        with some differences from SVr4 <EM>curses</EM>:
@@ -305,13 +280,38 @@ <H1 class="no-header">curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</H1>
        numbers.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3 introduced these functions:
+         <STRONG>slk_clear</STRONG>
+         <STRONG>slk_init</STRONG>
+         <STRONG>slk_label</STRONG>
+         <STRONG>slk_noutrefresh</STRONG>
+         <STRONG>slk_refresh</STRONG>
+         <STRONG>slk_restore</STRONG>
+         <STRONG>slk_set</STRONG>
+         <STRONG>slk_touch</STRONG>
+
+       SVr4 added these functions:
+         <STRONG>slk_attroff</STRONG>
+         <STRONG>slk_attron</STRONG>
+         <STRONG>slk_attrset</STRONG>
+         <STRONG>slk_start</STRONG>
+
+       X/Open <EM>curses</EM> added these:
+         <STRONG>slk_attr_off</STRONG>
+         <STRONG>slk_attr_on</STRONG>
+         <STRONG>slk_attr_set</STRONG>
+         <STRONG>slk_color</STRONG>
+         <STRONG>slk_wset</STRONG>
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -327,10 +327,10 @@ <H1 class="no-header">curs_slk 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 4d4084665..017161722 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.42 2023/10/14 19:51:44 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.44 2023/11/25 15:48:03 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        <STRONG>bool</STRONG> <STRONG>can_change_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>cbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>color_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>curs_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>visibility</EM>);
+       <STRONG>int</STRONG> <STRONG>curs_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>visibility</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>def_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>def_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index a861edd8c..618d50baa 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.70 2023/10/14 19:26:28 tom Exp @
+  * @Id: curs_termcap.3x,v 1.72 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -357,7 +357,7 @@ <H1 class="no-header">curs_termcap 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index a6a489af6..39f5fa064 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,9 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.117 2023/11/11 11:48:04 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.119 2023/11/25 14:32:36 tom Exp @
+  * ***************************************************************************
+  * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -44,12 +46,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -453,120 +455,36 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
                value of the output function <EM>putc</EM>.
 
 
-</PRE><H3><a name="h3-Compatibility-macros">Compatibility macros</a></H3><PRE>
-       This implementation  provides  a  few  macros  for  compatibility  with
-       systems  before  SVr4  (see  <EM>HISTORY</EM>).   Those include <STRONG>crmode</STRONG>, <STRONG>fixterm</STRONG>,
-       <STRONG>gettmode</STRONG>, <STRONG>nocrmode</STRONG>, <STRONG>resetterm</STRONG>, <STRONG>saveterm</STRONG>, and <STRONG>setterm</STRONG>.
-
-       In SVr4, those are found in <STRONG>&lt;curses.h&gt;</STRONG>, but  except  for  <STRONG>setterm</STRONG>,  are
-       likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
-       page.  The manual page notes that the <STRONG>setterm</STRONG> routine was  replaced  by
-       <STRONG>setupterm</STRONG>, stating that the call
-
-              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
-
-       provides   the   same   functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  and  is  not
-       recommended for new programs.  This  implementation  provides  each  of
-       those symbols as macros for BSD compatibility,
-
-
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 introduced the terminfo feature.  Its programming manual mentioned
-       the following low-level functions.
-
-       <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
-       ------------------------------------------------------------------------
-       <STRONG>fixterm</STRONG>     restore tty to "in curses" state
-       <STRONG>gettmode</STRONG>    establish current tty modes
-       <STRONG>mvcur</STRONG>       low level cursor motion
-       <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
-                   <STRONG>putchar</STRONG>.
-       <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
-       <STRONG>resetty</STRONG>     reset tty flags to stored value
-       <STRONG>saveterm</STRONG>    save current modes as "in curses" state
-       <STRONG>savetty</STRONG>     store current tty flags
-       <STRONG>setterm</STRONG>     establish terminal with given type
-       <STRONG>setupterm</STRONG>   establish terminal with given type
-       <STRONG>tparm</STRONG>       instantiate a string expression with parameters
-       <STRONG>tputs</STRONG>       apply padding information to a string
-       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG>
-       <STRONG>vidputs</STRONG>     output  a  string  to  put  terminal  in  a specified video
-                   attribute mode
-
-       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
-       compatibility (commenting that they "may go away at a later date").
-
-       <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
-       ------------------------------------------------------------------------
-       <STRONG>tgetent</STRONG>    look up <EM>termcap</EM> entry for given <EM>name</EM>
-       <STRONG>tgetflag</STRONG>   get boolean entry for given <EM>id</EM>
-       <STRONG>tgetnum</STRONG>    get numeric entry for given <EM>id</EM>
-       <STRONG>tgetstr</STRONG>    get string entry for given <EM>id</EM>
-       <STRONG>tgoto</STRONG>      apply parameters to given capability
-       <STRONG>tputs</STRONG>      apply  padding  to  capability,  calling  a  function to put
-                  characters
-
-       Early terminfo programs obtained capability values  from  the  <STRONG>TERMINAL</STRONG>
-       structure initialized by <STRONG>setupterm</STRONG>.
-
-       SVr3  extended  terminfo  by  adding  functions  to retrieve capability
-       values (like the termcap interface), and reusing <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>:
-
-       <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
-       ------------------------------------------------------------------------
-       <STRONG>tigetflag</STRONG>   get boolean entry for given <EM>id</EM>
-       <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
-       <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
-
-       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions which had  no
-       counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
-
-       <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
-       ------------------------------------------------------------------------
-       crmode      cbreak
-       fixterm     reset_prog_mode
-       gettmode    <EM>n/a</EM>
-       nocrmode    nocbreak
-       resetterm   reset_shell_mode
-       saveterm    def_prog_mode
-       setterm     setupterm
-
-       SVr3  kept  the  <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>.  The  latter  were  needed  to  support  padding,  and
-       handling  functions  such  as  <STRONG>vidattr</STRONG>  (which  used  more than the two
-       parameters supported by <STRONG>tgoto</STRONG>).
-
-       SVr3  introduced  the  functions   for   switching   between   terminal
-       descriptions,   e.g.,   <STRONG>set_curterm</STRONG>.   Some  of  that  was  incremental
-       improvements to the SVr2 library:
-
-       <STRONG>o</STRONG>   The <STRONG>TERMINAL</STRONG> type definition was introduced  in  SVr3.01,  for  the
-           <STRONG>term</STRONG> structure provided in SVr2.
-
-       <STRONG>o</STRONG>   The  various  global  variables such as <STRONG>boolnames</STRONG> were mentioned in
-           the programming manual at this point,  though  the  variables  were
-           provided in SVr2.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       X/Open notes that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros.
 
-       SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       There are other low-level functions declared in the <EM>curses</EM> header files
-       on Unix systems,  but  none  were  documented.   The  functions  marked
-       "obsolete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
+       are  not  found  in  SVr4  curses, 4.4BSD curses, or any other previous
+       version of curses.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       The function <STRONG>setterm</STRONG> is not described by X/Open and must be  considered
+       non-portable.  All other functions are as described by X/Open.
 
-</PRE><H3><a name="h3-Extensions">Extensions</a></H3><PRE>
-       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
-       are not found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous
-       version of curses.
 
+</PRE><H3><a name="h3-Compatibility-macros">Compatibility macros</a></H3><PRE>
+       This  implementation  provides  a  few  macros  for  compatibility with
+       systems before SVr4 (see  <EM>HISTORY</EM>).   Those  include  <STRONG>crmode</STRONG>,  <STRONG>fixterm</STRONG>,
+       <STRONG>gettmode</STRONG>, <STRONG>nocrmode</STRONG>, <STRONG>resetterm</STRONG>, <STRONG>saveterm</STRONG>, and <STRONG>setterm</STRONG>.
+
+       In  SVr4,  those  are  found in <STRONG>&lt;curses.h&gt;</STRONG>, but except for <STRONG>setterm</STRONG>, are
+       likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
+       page.   The  manual page notes that the <STRONG>setterm</STRONG> routine was replaced by
+       <STRONG>setupterm</STRONG>, stating that the call
 
-</PRE><H3><a name="h3-Legacy-functions">Legacy functions</a></H3><PRE>
-       X/Open notes that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros.
+              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
 
-       The  function <STRONG>setterm</STRONG> is not described by X/Open and must be considered
-       non-portable.  All other functions are as described by X/Open.
+       provides  the  same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,   and   is   not
+       recommended  for  new  programs.   This implementation provides each of
+       those symbols as macros for BSD compatibility.
 
 
 </PRE><H3><a name="h3-Legacy-data">Legacy data</a></H3><PRE>
@@ -692,6 +610,91 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        that case, the old location is unknown.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr2 introduced the terminfo feature.  Its programming manual mentioned
+       the following low-level functions.
+
+       <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>fixterm</STRONG>     restore tty to "in curses" state
+       <STRONG>gettmode</STRONG>    establish current tty modes
+       <STRONG>mvcur</STRONG>       low level cursor motion
+
+       <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
+                   <STRONG>putchar</STRONG>.
+       <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
+       <STRONG>resetty</STRONG>     reset tty flags to stored value
+       <STRONG>saveterm</STRONG>    save current modes as "in curses" state
+       <STRONG>savetty</STRONG>     store current tty flags
+       <STRONG>setterm</STRONG>     establish terminal with given type
+       <STRONG>setupterm</STRONG>   establish terminal with given type
+       <STRONG>tparm</STRONG>       instantiate a string expression with parameters
+       <STRONG>tputs</STRONG>       apply padding information to a string
+       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG>
+       <STRONG>vidputs</STRONG>     output  a  string  to  put  terminal  in  a specified video
+                   attribute mode
+
+       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       compatibility (commenting that they "may go away at a later date").
+
+       <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>tgetent</STRONG>    look up <EM>termcap</EM> entry for given <EM>name</EM>
+       <STRONG>tgetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tgetnum</STRONG>    get numeric entry for given <EM>id</EM>
+       <STRONG>tgetstr</STRONG>    get string entry for given <EM>id</EM>
+       <STRONG>tgoto</STRONG>      apply parameters to given capability
+       <STRONG>tputs</STRONG>      apply  padding  to  capability,  calling  a  function to put
+                  characters
+
+       Early terminfo programs obtained capability values  from  the  <STRONG>TERMINAL</STRONG>
+       structure initialized by <STRONG>setupterm</STRONG>.
+
+       SVr3  extended  terminfo  by  adding  functions  to retrieve capability
+       values (like the termcap interface), and reusing <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>:
+
+       <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>tigetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
+       <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
+
+       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions which had  no
+       counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
+
+       <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
+       ------------------------------------------------------------------------
+       crmode      cbreak
+       fixterm     reset_prog_mode
+       gettmode    <EM>n/a</EM>
+       nocrmode    nocbreak
+       resetterm   reset_shell_mode
+       saveterm    def_prog_mode
+       setterm     setupterm
+
+       SVr3  kept  the  <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>.  The  latter  were  needed  to  support  padding,  and
+       handling  functions  such  as  <STRONG>vidattr</STRONG>  (which  used  more than the two
+       parameters supported by <STRONG>tgoto</STRONG>).
+
+       SVr3  introduced  the  functions   for   switching   between   terminal
+       descriptions,   e.g.,   <STRONG>set_curterm</STRONG>.   Some  of  that  was  incremental
+       improvements to the SVr2 library:
+
+       <STRONG>o</STRONG>   The <STRONG>TERMINAL</STRONG> type definition was introduced  in  SVr3.01,  for  the
+           <STRONG>term</STRONG> structure provided in SVr2.
+
+       <STRONG>o</STRONG>   The  various  global  variables such as <STRONG>boolnames</STRONG> were mentioned in
+           the programming manual at this point,  though  the  variables  were
+           provided in SVr2.
+
+       SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
+
+       There are other low-level functions declared in the <EM>curses</EM> header files
+       on Unix systems,  but  none  were  documented.   The  functions  marked
+       "obsolete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
        <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
@@ -699,7 +702,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -716,16 +719,12 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-Releasing-Memory">Releasing Memory</a></li>
 </ul>
 </li>
-<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a>
-<ul>
-<li><a href="#h3-Compatibility-macros">Compatibility macros</a></li>
-</ul>
-</li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
-<li><a href="#h3-Extensions">Extensions</a></li>
-<li><a href="#h3-Legacy-functions">Legacy functions</a></li>
+<li><a href="#h3-Compatibility-macros">Compatibility macros</a></li>
 <li><a href="#h3-Legacy-data">Legacy data</a></li>
 <li><a href="#h3-Output-buffering">Output buffering</a></li>
 <li><a href="#h3-Function-prototypes">Function prototypes</a></li>
@@ -733,6 +732,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-Other-portability-issues">Other portability issues</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 8d87e49ab..748c5fe55 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.47 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_threads.3x,v 1.49 2023/11/25 14:09:12 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -78,9 +78,9 @@ <H1 class="no-header">curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        Instead of modifying the programming interface (API)  to  make  <EM>ncurses</EM>
        functions  expect  an  additional  argument  specifying  a  thread, the
-       library adds a few functions, usable in any  configuration,  that  hide
-       the  <EM>mutexes</EM>  (mutual  exclusion  locks)  needed  to prevent concurrent
-       access to variables shared by multiple threads of execution.
+       library adds functions, usable in  any  configuration,  that  hide  the
+       <EM>mutexes</EM> (mutual exclusion locks) needed to prevent concurrent access to
+       variables shared by multiple threads of execution.
 
        <EM>ncurses</EM> threading support requires  the  use  of  functions  to  access
        members  of  the  <EM>WINDOW</EM>  structure  (see <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>).  It further
@@ -619,7 +619,7 @@ <H1 class="no-header">curs_threads 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 749236ef5..f51c55c9f 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_touch.3x,v 1.42 2023/11/25 14:08:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -113,6 +113,10 @@ <H1 class="no-header">curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
                number is outside the window.
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       All of these routines except <STRONG>wtouchln</STRONG> may be macros.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
        file, for instance, defines both an actual function and macro for each.
@@ -124,16 +128,12 @@ <H1 class="no-header">curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        no error conditions.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these routines except <STRONG>wtouchln</STRONG> may be macros.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -141,8 +141,8 @@ <H1 class="no-header">curs_touch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index e193c6001..78a5c3021 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_variables.3x,v 1.34 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -255,7 +255,7 @@ <H1 class="no-header">curs_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index b0569be0e..6adcc64a6 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.41 2023/10/14 19:27:01 tom Exp @
+  * @Id: curs_window.3x,v 1.43 2023/11/25 14:17:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -126,6 +126,8 @@ <H1 class="no-header">curs_window 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        screen.   There is no difference between the subwindows and the derived
        windows.
 
+
+</PRE><H3><a name="h3-mvderwin">mvderwin</a></H3><PRE>
        Calling <STRONG>mvderwin</STRONG> moves a  derived  window  (or  subwindow)  inside  its
        parent  window.   The  screen-relative parameters of the window are not
        changed.  This routine is used to display different parts of the parent
@@ -254,7 +256,7 @@ <H1 class="no-header">curs_window 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -267,6 +269,7 @@ <H1 class="no-header">curs_window 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-mvwin">mvwin</a></li>
 <li><a href="#h3-subwin">subwin</a></li>
 <li><a href="#h3-derwin">derwin</a></li>
+<li><a href="#h3-mvderwin">mvderwin</a></li>
 <li><a href="#h3-dupwin">dupwin</a></li>
 <li><a href="#h3-wsyncup">wsyncup</a></li>
 <li><a href="#h3-wsyncdown">wsyncdown</a></li>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index 2811fcb01..c6377da35 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.45 2023/10/07 21:19:07 tom Exp @
+  * @Id: default_colors.3x,v 1.47 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -139,7 +139,7 @@ <H1 class="no-header">default_colors 3x 2023-10-07 ncurses 6.4 Library calls</H1
        code depending on them be conditioned using NCURSES_VERSION.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey (from an analysis of the requirements for color xterm for
        XFree86 3.1.2C, February 1996).
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -159,7 +159,7 @@ <H1 class="no-header">default_colors 3x 2023-10-07 ncurses 6.4 Library calls</H1
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index b9316c000..5a0aab201 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
+  * @Id: define_key.3x,v 1.39 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">define_key 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey
 
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -99,7 +99,7 @@ <H1 class="no-header">define_key 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index fec134e65..e15ca18a6 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
+  * @Id: form.3x,v 1.50 2023/11/25 13:59:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -211,20 +211,15 @@ <H1 class="no-header">form 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  files
-       <STRONG>&lt;curses.h&gt;</STRONG> and <STRONG>&lt;eti.h&gt;</STRONG>.
-
-       In your library list, libform.a should be before libncurses.a; that is,
-       you want to say "-lform -lncurses", not the  other  way  around  (which
-       would give you a link error when using static libraries).
+       The header file <EM>form.h</EM> itself includes <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The menu facility was documented in SVr4.2 in <EM>Character</EM> <EM>User</EM>  <EM>Interface</EM>
-       <EM>Programming</EM> <EM>(UNIX</EM> <EM>SVR4.2)</EM>.
+       A  form  facility  was  documented in SVr4.2's <EM>Character</EM> <EM>User</EM> <EM>Interface</EM>
+       <EM>Programming</EM> document.
 
        It is not part of X/Open Curses.
 
@@ -234,23 +229,23 @@ <H1 class="no-header">form 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   NetBSD curses.
 
-       A  few  functions  in  this  implementation  are  extensions  added for
+       A few  functions  in  this  implementation  are  extensions  added  for
        ncurses,   but   not   provided   by   other   implementations,   e.g.,
        <STRONG>form_driver_w</STRONG>, <STRONG>unfocus_current_field</STRONG>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Juergen  Pfeifer.   Manual  pages and adaptation for ncurses by Eric S.
+       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
        Raymond.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 034e32333..16a757db4 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_cursor.3x,v 1.29 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -79,13 +79,8 @@ <H1 class="no-header">form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -99,7 +94,7 @@ <H1 class="no-header">form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,7 +102,6 @@ <H1 class="no-header">form_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 7bb13d61a..5ae5f555c 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_data.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -66,13 +66,8 @@ <H1 class="no-header">form_data 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        in the given form.  It returns TRUE (1) or FALSE (0).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -86,14 +81,13 @@ <H1 class="no-header">form_data 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index eea6dd521..1a59c12c1 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.51 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_driver.3x,v 1.53 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -259,13 +259,8 @@ <H1 class="no-header">form_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The form driver code saw an unknown request code.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  files
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -275,12 +270,12 @@ <H1 class="no-header">form_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>,   <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>,   <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>,   <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>,    <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>,
        <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>, <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -297,7 +292,6 @@ <H1 class="no-header">form_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 8f9decc36..d01adb72b 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -96,16 +96,11 @@ <H1 class="no-header">form_field 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       The  SVr4  forms  library documentation specifies the <STRONG>field_count</STRONG> error
+       The SVr4 forms library documentation specifies  the  <STRONG>field_count</STRONG>  error
        value as -1 (which is the value of <STRONG>ERR</STRONG>).
 
 
@@ -119,7 +114,7 @@ <H1 class="no-header">form_field 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -127,7 +122,6 @@ <H1 class="no-header">form_field 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index fe047c06d..46ace2a1c 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -92,13 +92,8 @@ <H1 class="no-header">form_field_attributes 3x 2023-10-07 ncurses 6.4 Library ca
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -108,12 +103,12 @@ <H1 class="no-header">form_field_attributes 3x 2023-10-07 ncurses 6.4 Library ca
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -121,7 +116,6 @@ <H1 class="no-header">form_field_attributes 3x 2023-10-07 ncurses 6.4 Library ca
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 5fa639773..0737994c1 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.42 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -126,12 +126,10 @@ <H1 class="no-header">form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls<
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header file <STRONG>&lt;form.h&gt;</STRONG> automatically includes the header file
-
        When  configured for wide characters, <STRONG>field_buffer</STRONG> returns a pointer to
        temporary  storage  (allocated  and  freed  by   the   library).    The
        application should not attempt to modify the data.  It will be freed on
-       the next call to <STRONG>field_buffer</STRONG> to return the same buffer.  <STRONG>&lt;curses.h&gt;</STRONG>.
+       the next call to <STRONG>field_buffer</STRONG> to return the same buffer.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -154,7 +152,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-10-07 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2023-10-07             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index a9ff34c34..a11ab8892 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_info.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -86,17 +86,12 @@ <H1 class="no-header">form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       A  null  (zero  pointer)  is  accepted for any of the return values, to
-       ignore that value.  Not all implementations allow this,  e.g.,  Solaris
+       A null (zero pointer) is accepted for any  of  the  return  values,  to
+       ignore  that  value.  Not all implementations allow this, e.g., Solaris
        2.7 does not.
 
 
@@ -106,12 +101,12 @@ <H1 class="no-header">form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,7 +114,6 @@ <H1 class="no-header">form_field_info 3x 2023-10-07 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index a14bc7b99..626e1e69c 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_just.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -79,13 +79,8 @@ <H1 class="no-header">form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -95,12 +90,12 @@ <H1 class="no-header">form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -108,7 +103,6 @@ <H1 class="no-header">form_field_just 3x 2023-10-07 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 392c85d23..f7520b452 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.37 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_new.3x,v 1.39 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -103,17 +103,12 @@ <H1 class="no-header">form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</H1
             field is connected.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       It  may be unwise to count on the set of attributes copied by <STRONG>dup_field</STRONG>
-       being portable; the System V  forms  library  documents  are  not  very
+       It may be unwise to count on the set of attributes copied by  <STRONG>dup_field</STRONG>
+       being  portable;  the  System  V  forms  library documents are not very
        explicit about what gets copied and what does not.
 
 
@@ -127,7 +122,7 @@ <H1 class="no-header">form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -135,7 +130,6 @@ <H1 class="no-header">form_field_new 3x 2023-10-07 ncurses 6.4 Library calls</H1
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 9f8e3b968..96e53f4b4 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_opts.3x,v 1.42 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -149,13 +149,8 @@ <H1 class="no-header">form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</H
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -169,7 +164,7 @@ <H1 class="no-header">form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -177,7 +172,6 @@ <H1 class="no-header">form_field_opts 3x 2023-10-07 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 97138e94f..e58f34357 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.28 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -71,13 +71,8 @@ <H1 class="no-header">form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls
        The function <STRONG>set_field_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,7 +89,7 @@ <H1 class="no-header">form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls
 
 
 
-ncurses 6.4                       2023-10-07            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">form_field_userptr 3x 2023-10-07 ncurses 6.4 Library calls
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 475fe46ee..c5d2ea72c 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.48 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_field_validation.3x,v 1.50 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -206,13 +206,8 @@ <H1 class="no-header">form_field_validation 3x 2023-10-07 ncurses 6.4 Library ca
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -226,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2023-10-07 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-10-07         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -251,7 +246,6 @@ <H1 class="no-header">form_field_validation 3x 2023-10-07 ncurses 6.4 Library ca
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 32d97842d..ed0aa4309 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.42 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.44 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -168,13 +168,8 @@ <H1 class="no-header">form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</H1
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -188,7 +183,7 @@ <H1 class="no-header">form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -204,7 +199,6 @@ <H1 class="no-header">form_fieldtype 3x 2023-10-07 ncurses 6.4 Library calls</H1
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 6f865535f..59a6d4fe2 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_hook.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -122,13 +122,8 @@ <H1 class="no-header">form_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -142,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -161,7 +156,6 @@ <H1 class="no-header">form_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index d8a14a184..43a013a6e 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_new.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -91,13 +91,8 @@ <H1 class="no-header">form_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The form has already been posted.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -111,7 +106,7 @@ <H1 class="no-header">form_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,7 +114,6 @@ <H1 class="no-header">form_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 0157b9093..081022449 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_new_page.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -76,13 +76,8 @@ <H1 class="no-header">form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The given field is already connected to a form.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -92,12 +87,12 @@ <H1 class="no-header">form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -105,7 +100,6 @@ <H1 class="no-header">form_new_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index baee878d2..276bb7d6e 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_opts.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -93,13 +93,8 @@ <H1 class="no-header">form_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -113,7 +108,7 @@ <H1 class="no-header">form_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -121,7 +116,6 @@ <H1 class="no-header">form_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index d9f369122..37e26f7f2 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_page.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -103,13 +103,8 @@ <H1 class="no-header">form_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
        The <STRONG>unfocus_current_field</STRONG> function is an ncurses extension.
@@ -125,7 +120,7 @@ <H1 class="no-header">form_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -133,7 +128,6 @@ <H1 class="no-header">form_page 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 7f6ed24ab..0cb58df1a 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_post.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -94,13 +94,8 @@ <H1 class="no-header">form_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -114,7 +109,7 @@ <H1 class="no-header">form_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -122,7 +117,6 @@ <H1 class="no-header">form_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 770d05a49..25d13e5d7 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_requestname.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -73,13 +73,8 @@ <H1 class="no-header">form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -94,7 +89,7 @@ <H1 class="no-header">form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-10-07              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">form_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 1d19dbe1c..72992e9f0 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_userptr.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -71,13 +71,8 @@ <H1 class="no-header">form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        The function <STRONG>set_form_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,7 +89,7 @@ <H1 class="no-header">form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">form_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 769ba7fad..2085ddf61 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_win.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -99,13 +99,8 @@ <H1 class="no-header">form_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             No items are connected to the form.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;form.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -119,7 +114,7 @@ <H1 class="no-header">form_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -127,7 +122,6 @@ <H1 class="no-header">form_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 30dd3e882..6b1016e75 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.97 2023/10/14 19:26:28 tom Exp @
+  * @Id: infocmp.1m,v 1.99 2023/11/25 17:10:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -52,10 +52,10 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>infocmp</STRONG> [<STRONG>-1CDEFGIKLTUVWcdegilnpqrtux</STRONG>]
+       <STRONG>infocmp</STRONG> [<STRONG>-1cCdDeEFgGiIKlLnpqrtTuUVWx</STRONG>]
              [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-Q</STRONG> <EM>n</EM>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>]
              [<STRONG>-w</STRONG> <EM>width</EM>] [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
-             [<EM>termname</EM>...]
+             [<EM>terminal-type</EM> ...]
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -68,17 +68,17 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H3><a name="h3-Default-Options">Default Options</a></H3><PRE>
-       If no options are specified and zero or one  <EM>termnames</EM>  are  specified,
-       the <STRONG>-I</STRONG> option will be assumed.  If more than one <EM>termname</EM> is specified,
-       the <STRONG>-d</STRONG> option will be assumed.
+       If no  options  are  specified  and  zero  or  one  <EM>terminal-types</EM>  are
+       specified,  the  <STRONG>-I</STRONG> option will be assumed.  If more than one <EM>terminal-</EM>
+       <EM>type</EM> is specified, the <STRONG>-d</STRONG> option will be assumed.
 
 
 </PRE><H3><a name="h3-Comparison-Options-_-d_-_-c_-_-n_">Comparison Options [-d] [-c] [-n]</a></H3><PRE>
        <STRONG>infocmp</STRONG>  compares  the  <STRONG>terminfo</STRONG>  description  of  the  first  terminal
-       <EM>termname</EM>  with  each  of  the descriptions given by the entries for the
-       other terminal's <EM>termnames</EM>.  If a capability is defined for only one of
-       the   terminals,  the  value  returned  depends  on  the  type  of  the
-       capability:
+       <EM>terminal-type</EM>  with  each  of the descriptions given by the entries for
+       the other terminal's <EM>terminal-types</EM>.  If a capability  is  defined  for
+       only  one  of  the terminals, the value returned depends on the type of
+       the capability:
 
        <STRONG>o</STRONG>   <STRONG>F</STRONG> for missing boolean variables
 
@@ -111,8 +111,8 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
             option to add the BSD-compatibility capabilities  (names  prefixed
             with "OT").
 
-            If  no  <EM>termnames</EM> are given, <STRONG>infocmp</STRONG> uses the environment variable
-            <STRONG>TERM</STRONG> for each of the <EM>termnames</EM>.
+            If  no  <EM>terminal-types</EM>  are  given,  <STRONG>infocmp</STRONG>  uses the environment
+            variable <STRONG>TERM</STRONG> for each of the <EM>terminal-types</EM>.
 
 
 </PRE><H3><a name="h3-Source-Listing-Options-_-I_-_-L_-_-C_-_-r_">Source Listing Options [-I] [-L] [-C] [-r]</a></H3><PRE>
@@ -125,8 +125,8 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
             <STRONG>-r</STRONG>   when using <STRONG>-C</STRONG>, put out all capabilities in <STRONG>termcap</STRONG> form
             <STRONG>-K</STRONG>   modifies the <STRONG>-C</STRONG> option, improving BSD-compatibility.
 
-       If  no  <EM>termnames</EM> are given, the environment variable <STRONG>TERM</STRONG> will be used
-       for the terminal name.
+       If  no  <EM>terminal-types</EM> are given, the environment variable <STRONG>TERM</STRONG> will be
+       used for the terminal name.
 
        The source produced by the <STRONG>-C</STRONG> option may be used directly as a  <STRONG>termcap</STRONG>
        entry,  but not all parameterized strings can be changed to the <STRONG>termcap</STRONG>
@@ -180,29 +180,31 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 </PRE><H3><a name="h3-Use_-Option-_-u_">Use= Option [-u]</a></H3><PRE>
        The <STRONG>-u</STRONG> option produces a  <STRONG>terminfo</STRONG>  source  description  of  the  first
-       terminal  <EM>termname</EM>  which  is  relative  to the sum of the descriptions
-       given by the entries for the other terminals <EM>termnames</EM>.  It  does  this
-       by  analyzing  the differences between the first <EM>termname</EM> and the other
-       <EM>termnames</EM> and producing a description with <STRONG>use=</STRONG> fields  for  the  other
-       terminals.  In this manner, it is possible to retrofit generic terminfo
-       entries into a terminal's description.  Or, if  two  similar  terminals
-       exist, but were coded at different times or by different people so that
-       each description is a full description, using <STRONG>infocmp</STRONG>  will  show  what
-       can be done to change one description to be relative to the other.
+       terminal <EM>terminal-type</EM> which is relative to the sum of the descriptions
+       given by the entries for the other <EM>terminal-types</EM>.   It  does  this  by
+       analyzing  the  differences  between  the  first <EM>terminal-types</EM> and the
+       other <EM>terminal-types</EM> and producing a description with <STRONG>use=</STRONG>  fields  for
+       the  other  terminals.   In  this  manner,  it  is possible to retrofit
+       generic terminfo entries into a terminal's  description.   Or,  if  two
+       similar  terminals  exist,  but  were  coded  at  different times or by
+       different people so that each description is a full description,  using
+       <STRONG>infocmp</STRONG>  will  show  what  can  be done to change one description to be
+       relative to the other.
 
        A capability will be printed with an at-sign (@) if it no longer exists
-       in the first <EM>termname</EM>, but one of the other <EM>termname</EM> entries contains a
-       value for it.  A capability's value will be printed if the value in the
-       first <EM>termname</EM> is not found in any of the other <EM>termname</EM> entries, or if
-       the  first of the other <EM>termname</EM> entries that has this capability gives
-       a different value for the capability than that in the first <EM>termname</EM>.
-
-       The order of the other <EM>termname</EM>  entries  is  significant.   Since  the
+       in  the first <EM>terminal-type</EM>, but one of the other <EM>terminal-type</EM> entries
+       contains a value for it.  A capability's value will be printed  if  the
+       value  in  the  first  <EM>terminal-type</EM>  is  not found in any of the other
+       <EM>terminal-type</EM> entries, or if  the  first  of  the  other  <EM>terminal-type</EM>
+       entries  that  has  this  capability  gives  a  different value for the
+       capability than that in the first <EM>terminal-type</EM>.
+
+       The order of the other <EM>terminal-type</EM> entries is significant.  Since the
        terminfo  compiler  <STRONG>tic</STRONG>  does a left-to-right scan of the capabilities,
        specifying two <STRONG>use=</STRONG> entries that contain differing entries for the same
        capabilities will produce different results depending on the order that
        the entries are given in.  <STRONG>infocmp</STRONG> will flag any  such  inconsistencies
-       between the other <EM>termname</EM> entries as they are found.
+       between the other <EM>terminal-type</EM> entries as they are found.
 
        Alternatively, specifying a capability <EM>after</EM> a <STRONG>use=</STRONG> entry that contains
        that capability will cause the  second  specification  to  be  ignored.
@@ -212,8 +214,8 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
        Another  error  that  does not cause incorrect compiled files, but will
        slow down the compilation time, is specifying extra  <STRONG>use=</STRONG>  fields  that
-       are superfluous.  <STRONG>infocmp</STRONG> will flag any other <EM>termname</EM> <EM>use=</EM> fields that
-       were not needed.
+       are superfluous.  <STRONG>infocmp</STRONG> will flag any other <EM>terminal-type</EM> <EM>use=</EM> fields
+       that were not needed.
 
    <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <EM>directory</EM>] [-B <EM>directory</EM>]
        Like  other  <STRONG>ncurses</STRONG>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
@@ -225,9 +227,9 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
        You can also use the options <STRONG>-A</STRONG> and <STRONG>-B</STRONG> to override the list  of  places
        to search when comparing terminal descriptions:
 
-       <STRONG>o</STRONG>   The <STRONG>-A</STRONG> option sets the location for the first <EM>termname</EM>
+       <STRONG>o</STRONG>   The <STRONG>-A</STRONG> option sets the location for the first <EM>terminal-type</EM>
 
-       <STRONG>o</STRONG>   The <STRONG>-B</STRONG> option sets the location for the other <EM>termnames</EM>.
+       <STRONG>o</STRONG>   The <STRONG>-B</STRONG> option sets the location for the other <EM>terminal-types</EM>.
 
        Using  these  options,  it  is  possible  to compare descriptions for a
        terminal with the same name located in two  different  databases.   For
@@ -311,9 +313,8 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
                       LL            home-down
                       RSR           reset scroll region
                       -----------------------------------------
-                      DECSTR        soft reset (VT320)
-
 
+                      DECSTR        soft reset (VT320)
                       S7C1T         7-bit controls (VT220)
                       -----------------------------------------
                       ISO DEC G0    enable DEC graphics for G0
@@ -457,7 +458,7 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>-w</STRONG> <EM>width</EM>
             changes the output to <EM>width</EM> characters.
 
-       <STRONG>-x</STRONG>   print information for user-defined capabilities (see <STRONG>user_caps(5)</STRONG>.
+       <STRONG>-x</STRONG>   print information for user-defined capabilities (see <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
             These  are  extensions  to  the  terminfo  repertoire which can be
             loaded using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>.
 
@@ -467,6 +468,26 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
               compiled terminal description database
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>
+       and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
+
+       SVr4   infocmp  does  not  distinguish  between  absent  and  cancelled
+       capabilities.  Also, it shows missing integer capabilities as  <STRONG>-1</STRONG>  (the
+       internal   value   used   to   represent   missing   integers).    This
+       implementation shows those as  "NULL",  for  consistency  with  missing
+       strings.
+
+       The  <STRONG>-r</STRONG>  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 <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
+
+
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open  Curses,  Issue  7 (2009) provides a description of <STRONG>infocmp</STRONG>.  It
+       does not mention the options used for converting to termcap format.
+
+
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        Although System V Release 2 provided a  terminfo  library,  it  had  no
        documented tool for decompiling the terminal descriptions.  Tony Hansen
@@ -493,35 +514,15 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
        adapted from ncurses.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) provides a description  of  <STRONG>infocmp</STRONG>.   It
-       does not mention the options used for converting to termcap format.
-
-
-</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG>
-       and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
-
-       SVr4  infocmp  does  not  distinguish  between  absent  and   cancelled
-       capabilities.   Also,  it shows missing integer capabilities as <STRONG>-1</STRONG> (the
-       internal   value   used   to   represent   missing   integers).    This
-       implementation  shows  those  as  "NULL",  for consistency with missing
-       strings.
-
-       The <STRONG>-r</STRONG> 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 <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
+</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
+       The <STRONG>-F</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> should be a <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG> mode.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
 
-</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       The <STRONG>-F</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> should be a <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG> mode.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
@@ -530,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-11-25                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -546,11 +547,11 @@ <H1 class="no-header">infocmp 1m 2023-10-14 ncurses 6.4 User commands</H1>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 3c881403f..a77c9c4f1 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.35 2023/10/14 19:25:26 tom Exp @
+  * @Id: infotocap.1m,v 1.37 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -57,12 +57,12 @@ <H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>infotocap</STRONG> looks in each given text <EM>file</EM> for <EM>terminfo</EM> descriptions.  For
-       each one found, it writes  an  analogous  <EM>termcap</EM>  description  to  the
-       standard  output  stream.   <EM>terminfo</EM>  "<STRONG>use</STRONG>" capabilities are translated
-       directly to  <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities.   Because  <EM>termcap</EM>  is  a  less
-       expressive   format   than   <EM>terminfo</EM>,   some  capabilities  cannot  be
-       translated.
+       <STRONG>infotocap</STRONG>  translates  terminal  descriptions.   It looks in each given
+       text <EM>file</EM> for <EM>terminfo</EM> entries and, For each one found,  it  writes  an
+       analogous  <EM>termcap</EM> description to the standard output stream.  <EM>terminfo</EM>
+       "<STRONG>use</STRONG>" capabilities  translate  to  <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities.   Because
+       <EM>termcap</EM>  is  a  less expressive format than <EM>terminfo</EM>, some capabilities
+       cannot be translated.
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-C</STRONG>
        option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
@@ -80,7 +80,7 @@ <H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
        application.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -99,7 +99,7 @@ <H1 class="no-header">infotocap 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 2917f0a90..164a4e20d 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: key_defined.3x,v 1.31 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -74,7 +74,7 @@ <H1 class="no-header">key_defined 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey
 
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -92,7 +92,7 @@ <H1 class="no-header">key_defined 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index c131f08af..382f61c3d 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.31 2023/10/21 10:31:22 tom Exp @
+  * @Id: keybound.3x,v 1.33 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -77,7 +77,7 @@ <H1 class="no-header">keybound 3x 2023-10-21 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey
 
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -95,7 +95,7 @@ <H1 class="no-header">keybound 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 1b33b84d0..2524ae1ec 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
+  * @Id: keyok.3x,v 1.37 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -76,7 +76,7 @@ <H1 class="no-header">keyok 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey
 
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -94,7 +94,7 @@ <H1 class="no-header">keyok 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index 42391d3db..36cce56ab 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.21 2023/10/07 21:19:07 tom Exp @
+  * @Id: legacy_coding.3x,v 1.23 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        depending on ncurses extensions be conditioned using NCURSES_VERSION.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey (to support lynx's font-switching feature).
 
 
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,7 +107,7 @@ <H1 class="no-header">legacy_coding 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 18c44c798..b7a59ed43 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.39 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu.3x,v 1.41 2023/11/25 13:59:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -190,20 +190,15 @@ <H1 class="no-header">menu 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  files
-       <STRONG>&lt;curses.h&gt;</STRONG> and <STRONG>&lt;eti.h&gt;</STRONG>.
-
-       In your library list, libmenu.a should be before libncurses.a; that is,
-       you should say "-lmenu -lncurses", not  the  other  way  around  (which
-       would give a link-error when using static libraries).
+       The header file <EM>menu.h</EM> itself includes the header file <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The menu facility was documented in SVr4.2 in <EM>Character</EM> <EM>User</EM>  <EM>Interface</EM>
-       <EM>Programming</EM> <EM>(UNIX</EM> <EM>SVR4.2)</EM>.
+       A  menu  facility  was  documented in SVr4.2's <EM>Character</EM> <EM>User</EM> <EM>Interface</EM>
+       <EM>Programming</EM> document.
 
        It is not part of X/Open Curses.
 
@@ -215,17 +210,17 @@ <H1 class="no-header">menu 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Juergen  Pfeifer.   Manual  pages and adaptation for ncurses by Eric S.
+       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
        Raymond.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 2f69ed510..cd00c0804 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_attributes.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -100,13 +100,8 @@ <H1 class="no-header">menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H
             Routine detected an incorrect or out-of-range argument.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -116,12 +111,12 @@ <H1 class="no-header">menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
 
 
-ncurses 6.4                       2023-10-07               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -129,7 +124,6 @@ <H1 class="no-header">menu_attributes 3x 2023-10-07 ncurses 6.4 Library calls</H
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 700a2b4fc..52263b8d5 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.26 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_cursor.3x,v 1.28 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -78,13 +78,8 @@ <H1 class="no-header">menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The menu has not been posted.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -98,7 +93,7 @@ <H1 class="no-header">menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -106,7 +101,6 @@ <H1 class="no-header">menu_cursor 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index b83c04995..14f0dbd58 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_driver.3x,v 1.43 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -207,14 +207,9 @@ <H1 class="no-header">menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The menu driver could not process the request.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  files
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
-       supported on Version 7 or BSD versions.  The support for  mouse  events
+       These routines emulate the  System  V  menu  library.   They  were  not
+       supported  on  Version 7 or BSD versions.  The support for mouse events
        is ncurses specific.
 
 
@@ -228,7 +223,7 @@ <H1 class="no-header">menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -241,7 +236,6 @@ <H1 class="no-header">menu_driver 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 2b198e3bc..8a61d6339 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_format.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -91,13 +91,8 @@ <H1 class="no-header">menu_format 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -111,7 +106,7 @@ <H1 class="no-header">menu_format 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,7 +114,6 @@ <H1 class="no-header">menu_format 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 3f40dfd7b..c2ed60073 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_hook.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -102,13 +102,8 @@ <H1 class="no-header">menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -122,7 +117,7 @@ <H1 class="no-header">menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -130,7 +125,6 @@ <H1 class="no-header">menu_hook 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 2a1873d75..01254b680 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_items.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -93,16 +93,11 @@ <H1 class="no-header">menu_items 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The SVr4 menu library  documentation  specifies  the  <STRONG>item_count</STRONG>  error
+       The  SVr4  menu  library  documentation  specifies the <STRONG>item_count</STRONG> error
        value as -1 (which is the value of <STRONG>ERR</STRONG>).
 
 
@@ -116,7 +111,7 @@ <H1 class="no-header">menu_items 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -124,7 +119,6 @@ <H1 class="no-header">menu_items 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 13ed0698c..a79dcd01b 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_mark.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -89,13 +89,8 @@ <H1 class="no-header">menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -109,7 +104,7 @@ <H1 class="no-header">menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -117,7 +112,6 @@ <H1 class="no-header">menu_mark 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index 28428983d..a8e36becf 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_new.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -89,13 +89,8 @@ <H1 class="no-header">menu_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The menu has already been posted.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -109,7 +104,7 @@ <H1 class="no-header">menu_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -117,7 +112,6 @@ <H1 class="no-header">menu_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index d50bc6914..52243b317 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_opts.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -113,13 +113,8 @@ <H1 class="no-header">menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The menu is already posted.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -133,7 +128,7 @@ <H1 class="no-header">menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -141,7 +136,6 @@ <H1 class="no-header">menu_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 17365800e..eb57dbbd9 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.34 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_pattern.3x,v 1.36 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -94,13 +94,8 @@ <H1 class="no-header">menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -114,7 +109,7 @@ <H1 class="no-header">menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -122,7 +117,6 @@ <H1 class="no-header">menu_pattern 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index ac619ea57..3a458b761 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_post.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -96,13 +96,8 @@ <H1 class="no-header">menu_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -116,7 +111,7 @@ <H1 class="no-header">menu_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -124,7 +119,6 @@ <H1 class="no-header">menu_post 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index fc5427048..1b567167c 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_requestname.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -73,13 +73,8 @@ <H1 class="no-header">menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -94,7 +89,7 @@ <H1 class="no-header">menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-10-07              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">menu_requestname 3x 2023-10-07 ncurses 6.4 Library calls</
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 264775a1d..562341537 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_spacing.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -97,13 +97,8 @@ <H1 class="no-header">menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        values is out of range.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -118,7 +113,7 @@ <H1 class="no-header">menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -126,7 +121,6 @@ <H1 class="no-header">menu_spacing 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index f8a872ded..f97739f08 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_userptr.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -71,13 +71,8 @@ <H1 class="no-header">menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>set_menu_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,7 +89,7 @@ <H1 class="no-header">menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">menu_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index fba3a9e0c..aa1dfeb72 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: menu_win.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -99,13 +99,8 @@ <H1 class="no-header">menu_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             No items are connected to the menu.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -119,7 +114,7 @@ <H1 class="no-header">menu_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -127,7 +122,6 @@ <H1 class="no-header">menu_win 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index bd87edb63..08dd8226a 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_current.3x,v 1.35 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -101,16 +101,11 @@ <H1 class="no-header">mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The  SVr4  menu  library  documentation  specifies  the   <STRONG>top_row</STRONG>   and
+       The   SVr4   menu  library  documentation  specifies  the  <STRONG>top_row</STRONG>  and
        <STRONG>index_item</STRONG> error value as -1 (which is the value of <STRONG>ERR</STRONG>).
 
 
@@ -124,7 +119,7 @@ <H1 class="no-header">mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -132,7 +127,6 @@ <H1 class="no-header">mitem_current 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index 0e5ffb3fb..7aac9ebe7 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.27 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_name.3x,v 1.29 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -68,13 +68,8 @@ <H1 class="no-header">mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>errno</STRONG>.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -88,7 +83,7 @@ <H1 class="no-header">mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -96,7 +91,6 @@ <H1 class="no-header">mitem_name 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index e64c513e2..aef0f5635 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_new.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -92,13 +92,8 @@ <H1 class="no-header">mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -112,7 +107,7 @@ <H1 class="no-header">mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -120,7 +115,6 @@ <H1 class="no-header">mitem_new 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 859db62d4..9dac6ef7a 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_opts.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -87,13 +87,8 @@ <H1 class="no-header">mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             System error occurred (see <STRONG>errno(3)</STRONG>).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -107,7 +102,7 @@ <H1 class="no-header">mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -115,7 +110,6 @@ <H1 class="no-header">mitem_opts 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index 6387c5b00..a3888d8a6 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.30 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -71,13 +71,8 @@ <H1 class="no-header">mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        The <STRONG>set_item_userptr</STRONG> always returns <STRONG>E_OK</STRONG> (success).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,7 +89,7 @@ <H1 class="no-header">mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -102,7 +97,6 @@ <H1 class="no-header">mitem_userptr 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 33d4aa644..f14df7fbe 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.28 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_value.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -79,13 +79,8 @@ <H1 class="no-header">mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</H1>
             The menu driver could not process the request.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -99,7 +94,7 @@ <H1 class="no-header">mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,7 +102,6 @@ <H1 class="no-header">mitem_value 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index f32708ada..9c9a3d31c 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.23 2023/10/07 21:19:07 tom Exp @
+  * @Id: mitem_visible.3x,v 1.25 2023/11/25 14:18:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>mitem_visible</STRONG> - check visibility of a menu item
+       <STRONG>item_visible</STRONG> - check visibility of a menu item
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -62,13 +62,8 @@ <H1 class="no-header">mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        this portion will be smaller than the whole menu).
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  header  file  <STRONG>&lt;menu.h&gt;</STRONG>  automatically  includes  the  header  file
-       <STRONG>&lt;curses.h&gt;</STRONG>.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -82,14 +77,13 @@ <H1 class="no-header">mitem_visible 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index e401bdc0a..7f7059d4f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.179 2023/10/14 19:29:06 tom Exp @
+  * @Id: ncurses.3x,v 1.181 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,19 +60,37 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231118).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231125).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
-       UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-       curses).   XSI  stands  for  X/Open  System  Interfaces Extension.  The
-       <STRONG>ncurses</STRONG> library is freely redistributable in source form.   Differences
-       from   the   SVr4  curses  are  summarized  under  the  <EM>EXTENSIONS</EM>  and
-       <EM>PORTABILITY</EM> sections below and described in detail  in  the  respective
-       <EM>EXTENSIONS</EM>, <EM>PORTABILITY</EM> and <EM>BUGS</EM> sections of individual man pages.
-
-       The  <STRONG>ncurses</STRONG>  library  also  provides  many  useful  extensions,  i.e.,
-       features which cannot be implemented by a  simple  add-on  library  but
-       which require access to the internals of the library.
+       Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
+       as  XSI  curses).   XSI  stands for X/Open System Interfaces Extension.
+       The <STRONG>ncurses</STRONG> library is freely redistributable in source form.
+
+       <EM>ncurses</EM> man pages employ several sections to clarify matters  of  usage
+       and interoperability with other <EM>curses</EM> implementations.
+
+       <STRONG>o</STRONG>   "NOTES"  describes  matters  and  caveats  of which any user of the
+           <EM>ncurses</EM> API should be aware, such as limitations on the size of  an
+           underlying  integral  type  or  the  availability of a preprocessor
+           macro for a function (which prevents its address from being taken).
+           This  section  also  describes  implementation details that will be
+           significant to the programmer but which are not standardized.
+
+       <STRONG>o</STRONG>   "EXTENSIONS" presents <EM>ncurses</EM> innovations beyond the X/Open  Curses
+           standard  and/or  the  SVr4 <EM>curses</EM> implementation.  They are termed
+           <EM>extensions</EM> to indicate that they cannot be  implemented  solely  by
+           using the library API, but require access to the library's internal
+           state.
+
+       <STRONG>o</STRONG>   "PORTABILITY" discusses matters (beyond the exercise of extensions)
+           that  should be considered when writing to a <EM>curses</EM> standard, or to
+           multiple implementations.
+
+       <STRONG>o</STRONG>   "HISTORY" examines points of detail in  <EM>ncurses</EM>  and  other  <EM>curses</EM>
+           implementations over the decades of their development, particularly
+           where precedent or inertia have frustrated better design (and, in a
+           few cases, where such inertia has been overcome).
 
        A  program  using  these  routines  must  be  linked with the <STRONG>-lncurses</STRONG>
        option, or (if it  has  been  generated)  with  the  debugging  library
@@ -295,6 +313,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     addchnstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     addchstr                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     addnstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+
                     addnwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     addstr                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     addwstr                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
@@ -313,7 +332,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     bkgdset                  <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     bkgrnd                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     bkgrndset                <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
-
                     border                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     border_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     box                      <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -361,6 +379,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     flushinp                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     free_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
                     get_wch                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+
                     get_wstr                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     getattrs                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     getbegx                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
@@ -379,7 +398,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     getn_wstr                <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     getnstr                  <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     getparx                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
-
                     getpary                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
                     getparyx                 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
                     getstr                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
@@ -427,6 +445,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     is_idcok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_idlok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_immedok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
+
                     is_keypad                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_leaveok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_linetouched           <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
@@ -445,7 +464,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     key_name                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     keybound                 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>*
                     keyname                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
-
                     keyok                    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>*
                     keypad                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     killchar                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
@@ -493,6 +511,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvinsch                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvinsnstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+
                     mvinsstr                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvinwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
@@ -511,7 +530,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     mvwaddstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvwaddwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvwchgat                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     mvwdelch                 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvwget_wch               <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvwget_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
@@ -559,6 +577,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     overwrite                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+
                     pechochar                <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pnoutrefresh             <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     prefresh                 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
@@ -577,7 +596,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     resizeterm               <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>*
                     restartterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     ripoffline               <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
-
                     savetty                  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     scanw                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     scr_dump                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
@@ -625,6 +643,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     tgetstr                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgoto                    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tigetflag                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+
                     tigetnum                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -643,7 +662,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     ungetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     ungetmouse               <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
                     untouchwin               <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
-
                     use_default_colors       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>*
                     use_env                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     use_extended_names       <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
@@ -691,6 +709,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     wdelch                   <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     wdeleteln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     wecho_wchar              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+
                     wechochar                <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     wenclose                 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
                     werase                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -709,7 +728,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
                     win_wch                  <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     win_wchnstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     win_wchstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
-
                     winch                    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     winchnstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     winchstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
@@ -1272,78 +1290,87 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
             compiled terminal capability database
 
 
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       If standard output from a <STRONG>ncurses</STRONG> program is re-directed  to  something
+       which  is not a tty, screen updates will be directed to standard error.
+       This was an undocumented feature of AT&amp;T System V Release 3 curses.
+
+       See subsection  "Header  files"  below  regarding  symbols  exposed  by
+       inclusion of <EM>curses.h</EM>.
+
+
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>)  that
-       falls  back  to  the  old-style /etc/termcap file if the terminal setup
-       code cannot find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use  of  this
-       feature  is  not  recommended,  as  it  essentially  includes an entire
-       termcap compiler in the <STRONG>ncurses</STRONG> startup code, at  significant  cost  in
+       The  <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
+       falls back to the old-style /etc/termcap file  if  the  terminal  setup
+       code  cannot  find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use of this
+       feature is not  recommended,  as  it  essentially  includes  an  entire
+       termcap  compiler  in  the <STRONG>ncurses</STRONG> startup code, at significant cost in
        core and startup cycles.
 
-       The  <STRONG>ncurses</STRONG>  library includes facilities for capturing mouse events on
-       certain terminals (including xterm).   See  the  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>  manual
+       The <STRONG>ncurses</STRONG> library includes facilities for capturing mouse  events  on
+       certain  terminals  (including  xterm).   See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual
        page for details.
 
-       The  <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to window
-       resizing  events,  e.g.,  when  running   in   an   xterm.    See   the
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>  and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In addition,
+       The <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to  window
+       resizing   events,   e.g.,   when   running   in  an  xterm.   See  the
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In  addition,
        the library may be configured with a <STRONG>SIGWINCH</STRONG> handler.
 
-       The <STRONG>ncurses</STRONG> library extends the fixed set of function key  capabilities
-       of  terminals by allowing the application designer to define additional
-       key sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,  and
+       The  <STRONG>ncurses</STRONG> library extends the fixed set of function key capabilities
+       of terminals by allowing the application designer to define  additional
+       key  sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and
        <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> manual pages for details.
 
-       The  <STRONG>ncurses</STRONG>  library  can  exploit the capabilities of terminals which
-       implement the ISO-6429 SGR 39 and  SGR  49  controls,  which  allow  an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From the users'  perspective,  the  application  is
+       The <STRONG>ncurses</STRONG> library can exploit the  capabilities  of  terminals  which
+       implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
+       application to reset  the  terminal  to  its  original  foreground  and
+       background  colors.   From  the  users' perspective, the application is
        able  to  draw  colored  text  on  a  background  whose  color  is  set
-       independently, providing better control over color contrasts.  See  the
+       independently,  providing better control over color contrasts.  See the
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
 
-       The  <STRONG>ncurses</STRONG>  library  includes  a  function  for directing application
+       The <STRONG>ncurses</STRONG> library  includes  a  function  for  directing  application
        output  to  a  printer  attached  to  the  terminal  device.   See  the
        <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>ncurses</STRONG>  library  is intended to be BASE-level conformant with XSI
-       Curses.   The  EXTENDED  XSI  Curses  functionality  (including   color
+       The <STRONG>ncurses</STRONG> library is intended to be BASE-level  conformant  with  XSI
+       Curses.    The  EXTENDED  XSI  Curses  functionality  (including  color
        support) is supported.
 
-       A  small  number  of local differences (that is, individual differences
-       between the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in  <STRONG>PORTABILITY</STRONG>
+       A small number of local differences (that  is,  individual  differences
+       between  the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in <STRONG>PORTABILITY</STRONG>
        sections of the library man pages.
 
 
 </PRE><H3><a name="h3-Error-checking">Error checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other  implementations,  this  one  checks  parameters  such  as
-       pointers  to  WINDOW  structures to ensure they are not null.  The main
-       reason for providing this  behavior  is  to  guard  against  programmer
-       error.   The  standard interface does not provide a way for the library
-       to tell an application which of several possible errors were  detected.
-       Relying  on  this  (or  some other) extension will adversely affect the
+       Unlike  other  implementations,  this  one  checks  parameters  such as
+       pointers to WINDOW structures to ensure they are not  null.   The  main
+       reason  for  providing  this  behavior  is  to guard against programmer
+       error.  The standard interface does not provide a way for  the  library
+       to  tell an application which of several possible errors were detected.
+       Relying on this (or some other) extension  will  adversely  affect  the
        portability of curses applications.
 
 
 </PRE><H3><a name="h3-Extensions-versus-portability">Extensions versus portability</a></H3><PRE>
-       Most of the extensions provided by ncurses have not been  standardized.
+       Most  of the extensions provided by ncurses have not been standardized.
        Some  have  been  incorporated  into  other  implementations,  such  as
        PDCurses or NetBSD curses.  Here are a few to consider:
 
        <STRONG>o</STRONG>   The routine <STRONG>has_key</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The  routine  <STRONG>slk_attr</STRONG>  is  not  part of XPG4, nor is it present in
+       <STRONG>o</STRONG>   The routine <STRONG>slk_attr</STRONG> is not part of XPG4,  nor  is  it  present  in
            SVr4.  See the <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The routines <STRONG>getmouse</STRONG>, <STRONG>mousemask</STRONG>,  <STRONG>ungetmouse</STRONG>,  <STRONG>mouseinterval</STRONG>,  and
-           <STRONG>wenclose</STRONG>  relating  to  mouse interfacing are not part of XPG4, nor
-           are they present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual  page  for
+       <STRONG>o</STRONG>   The  routines  <STRONG>getmouse</STRONG>,  <STRONG>mousemask</STRONG>, <STRONG>ungetmouse</STRONG>, <STRONG>mouseinterval</STRONG>, and
+           <STRONG>wenclose</STRONG> relating to mouse interfacing are not part  of  XPG4,  nor
+           are  they  present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for
            details.
 
        <STRONG>o</STRONG>   The  routine  <STRONG>mcprint</STRONG>  was  not  present  in  any  previous  curses
@@ -1352,65 +1379,65 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The routine <STRONG>wresize</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The   WINDOW  structure's  internal  details  can  be  hidden  from
-           application programs.  See <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for  the  discussion  of
+       <STRONG>o</STRONG>   The  WINDOW  structure's  internal  details  can  be  hidden   from
+           application  programs.   See  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for the discussion of
            <STRONG>is_scrollok</STRONG>, etc.
 
        <STRONG>o</STRONG>   This  implementation  can  be  configured  to  provide  rudimentary
-           support for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>  for
+           support  for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> for
            details.
 
-       <STRONG>o</STRONG>   This  implementation  can  also  be  configured to provide a set of
-           functions which improve the ability  to  manage  multiple  screens.
+       <STRONG>o</STRONG>   This implementation can also be configured  to  provide  a  set  of
+           functions  which  improve  the  ability to manage multiple screens.
            See <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> for details.
 
 
 </PRE><H3><a name="h3-Padding-differences">Padding differences</a></H3><PRE>
-       In  historic  curses  versions, delays embedded in the capabilities <STRONG>cr</STRONG>,
-       <STRONG>ind</STRONG>, <STRONG>cub1</STRONG>, <STRONG>ff</STRONG> and <STRONG>tab</STRONG> activated corresponding delay bits  in  the  UNIX
+       In historic curses versions, delays embedded in  the  capabilities  <STRONG>cr</STRONG>,
+       <STRONG>ind</STRONG>,  <STRONG>cub1</STRONG>,  <STRONG>ff</STRONG>  and <STRONG>tab</STRONG> activated corresponding delay bits in the Unix
        tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
-       interface  to the UNIX kernel significantly and increases the package's
+       bytes.   This  method  is  slightly  more  expensive,  but  narrows the
+       interface to the Unix kernel significantly and increases the  package's
        portability correspondingly.
 
 
 </PRE><H3><a name="h3-Header-files">Header files</a></H3><PRE>
-       The header file <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the  header  files
-       <STRONG>&lt;stdio.h&gt;</STRONG> and <STRONG>&lt;unctrl.h&gt;</STRONG>.
+       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say, but does not finish the story:
 
-           The  inclusion  of &lt;curses.h&gt; may make visible all symbols from the
+           The inclusion of &lt;curses.h&gt; may make visible all symbols  from  the
            headers &lt;stdio.h&gt;, &lt;term.h&gt;, &lt;termios.h&gt;, and &lt;wchar.h&gt;.
 
        Here is a more complete story:
 
-       <STRONG>o</STRONG>   Starting  with  BSD  curses,  all  implementations  have   included
+       <STRONG>o</STRONG>   Starting   with  BSD  curses,  all  implementations  have  included
            &lt;stdio.h&gt;.
 
-           BSD  curses  included  &lt;curses.h&gt;  and  &lt;unctrl.h&gt; from an internal
+           BSD curses included &lt;curses.h&gt;  and  &lt;unctrl.h&gt;  from  an  internal
            header "curses.ext" ("ext" was a short name for <EM>externs</EM>).
 
-           BSD curses used &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG>  and  <STRONG>scanw</STRONG>),  but
+           BSD  curses  used  &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG> and <STRONG>scanw</STRONG>), but
            nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   SVr2  curses  added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon &lt;stdio.h&gt;.  That
+       <STRONG>o</STRONG>   SVr2 curses added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon  &lt;stdio.h&gt;.   That
            is, the function prototype uses <STRONG>FILE</STRONG>.
 
            SVr4 curses added <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>, which also use &lt;stdio.h&gt;.
 
            X/Open Curses documents all three of these functions.
 
-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+           SVr4  curses  and  X/Open  Curses  do  not require the developer to
            include  &lt;stdio.h&gt;  before  including  &lt;curses.h&gt;.   Both  document
            curses showing &lt;curses.h&gt; as the only required header.
 
            As a result, standard &lt;curses.h&gt; will always include &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
+       <STRONG>o</STRONG>   X/Open  Curses  is  inconsistent  with  respect  to  SVr4 regarding
            &lt;unctrl.h&gt;.
 
-           As   noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;  from
+           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;   from
            &lt;curses.h&gt; (like SVr4).
 
        <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
@@ -1419,72 +1446,66 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
            HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
            in curses.h, but ncurses (and Solaris curses) do not.
 
-           AIX curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses  (and
+           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses (and
            Solaris curses) do not.
 
-       <STRONG>o</STRONG>   X/Open  says  that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there is no
+       <STRONG>o</STRONG>   X/Open says that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there  is  no
            requirement that it do that.
 
            Some  programs  use  functions  declared  in  both  &lt;curses.h&gt;  and
-           &lt;term.h&gt;,  and  must include both headers in the same module.  Very
-           old versions of AIX curses  required  including  &lt;curses.h&gt;  before
+           &lt;term.h&gt;, and must include both headers in the same  module.   Very
+           old  versions  of  AIX  curses required including &lt;curses.h&gt; before
            including &lt;term.h&gt;.
 
-           Because  ncurses  header files include the headers needed to define
+           Because ncurses header files include the headers needed  to  define
            datatypes used in the headers, ncurses header files can be included
-           in  any  order.  But for portability, you should include &lt;curses.h&gt;
+           in any order.  But for portability, you should  include  &lt;curses.h&gt;
            before &lt;term.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open Curses says <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because  including  a  header
+       <STRONG>o</STRONG>   X/Open  Curses  says  <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because including a header
            file does not necessarily make all symbols in it visible (there are
            ifdef's to consider).
 
-           For instance, in ncurses &lt;wchar.h&gt; <EM>may</EM> be included  if  the  proper
-           symbol  is defined, and if ncurses is configured for wide-character
-           support.  If the header  is  included,  its  symbols  may  be  made
-           visible.   That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature
+           For  instance,  in  ncurses &lt;wchar.h&gt; <EM>may</EM> be included if the proper
+           symbol is defined, and if ncurses is configured for  wide-character
+           support.   If  the  header  is  included,  its  symbols may be made
+           visible.  That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG>  feature
            test macro.
 
-       <STRONG>o</STRONG>   X/Open Curses documents one required header,  in  a  special  case:
-           &lt;stdarg.h&gt;   before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>  and
-           <STRONG>vw_scanw</STRONG> functions (as  well  as  the  obsolete  the  <STRONG>vwprintw</STRONG>  and
+       <STRONG>o</STRONG>   X/Open  Curses  documents  one  required header, in a special case:
+           &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>   and
+           <STRONG>vw_scanw</STRONG>  functions  (as  well  as  the  obsolete  the <STRONG>vwprintw</STRONG> and
            <STRONG>vwscanw</STRONG> functions).  Each of those uses a <STRONG>va_list</STRONG> parameter.
 
-           The  two  obsolete  functions  were  introduced in SVr3.  The other
-           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
-           curses  provided  for  the  possibility  that  an application might
+           The two obsolete functions were  introduced  in  SVr3.   The  other
+           functions  were  introduced  in  X/Open  Curses.   In between, SVr4
+           curses provided for  the  possibility  that  an  application  might
            include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;.  Initially, that was done
-           by  using  <STRONG>void*</STRONG>  for the <STRONG>va_list</STRONG> parameter.  Later, a special type
-           (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler  type-
+           by using <STRONG>void*</STRONG> for the <STRONG>va_list</STRONG> parameter.  Later,  a  special  type
+           (defined  in &lt;stdio.h&gt;) was introduced, to allow for compiler type-
            checking.  That special type is always available, because &lt;stdio.h&gt;
            is always included by &lt;curses.h&gt;.
 
            None of the X/Open Curses implementations require an application to
-           include  &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either have
-           allowed for a special type, or (like  ncurses)  include  &lt;stdarg.h&gt;
+           include &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either  have
+           allowed  for  a  special type, or (like ncurses) include &lt;stdarg.h&gt;
            directly to provide a portable interface.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If  standard  output from a <STRONG>ncurses</STRONG> program is re-directed to something
-       which is not a tty, screen updates will be directed to standard  error.
-       This was an undocumented feature of AT&amp;T System V Release 3 curses.
-
-
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on <EM>pcurses</EM>
        by Pavel Curtis.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> and related pages whose names begin  "curs_"  for  detailed
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_" for detailed
        routine descriptions.
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for user-defined capabilities
 
 
 
-ncurses 6.4                       2023-10-14                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1527,6 +1548,7 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
@@ -1536,7 +1558,6 @@ <H1 class="no-header">ncurses 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-Header-files">Header files</a></li>
 </ul>
 </li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 9d66af93c..2f13ede8e 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.41 2023/10/21 10:31:22 tom Exp @
+  * @Id: new_pair.3x,v 1.43 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -156,7 +156,7 @@ <H1 class="no-header">new_pair 3x 2023-10-21 ncurses 6.4 Library calls</H1>
        code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey
 
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -180,7 +180,7 @@ <H1 class="no-header">new_pair 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index d2eb22d4c..8a1bc0349 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.57 2023/10/14 19:20:40 tom Exp @
+  * @Id: panel.3x,v 1.59 2023/11/25 14:08:47 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -64,7 +64,7 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       panel - panel stack extension for curses
+       panel - panel stack extension for <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -97,19 +97,19 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       Panels  are  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> windows with the added feature of depth.  Panel
-       functions allow the use  of  stacked  windows  and  ensure  the  proper
-       portions  of  each  window  and  the curses <STRONG>stdscr</STRONG> window are hidden or
-       displayed when panels are added, moved, modified or removed.   The  set
+       Panels  are <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> windows with the added property of depth.  Panel
+       functions allow the use of stacked windows and ensure that  the  proper
+       portions  of  each  window  and  the <EM>curses</EM> <STRONG>stdscr</STRONG> window are hidden or
+       displayed when panels are added, moved, modified, or removed.  The  set
        of  currently visible panels is the stack of panels.  The <STRONG>stdscr</STRONG> window
        is beneath all panels, and is not considered part of the stack.
 
-       A window is associated with every panel.  The panel routines enable you
-       to  create, move, hide, and show panels, as well as position a panel at
-       any desired location in the stack.
+       A window is associated with each panel.  The panel routines enable  you
+       to  create,  move,  hide, and show panels.  You can relocate a panel to
+       any desired position in the stack.
 
-       Panel routines are a functional layer added to  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  make  only
-       high-level curses calls, and work anywhere terminfo curses does.
+       Panel routines are a functional layer added to <EM>curses</EM>, make only  high-
+       level <EM>curses</EM> calls, and work anywhere <EM>curses</EM> does.
 
 
 </PRE><H2><a name="h2-FUNCTIONS">FUNCTIONS</a></H2><PRE>
@@ -119,52 +119,52 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-ceiling_panel">ceiling_panel</a></H3><PRE>
-       <STRONG>ceiling_panel(</STRONG><EM>sp</EM><STRONG>)</STRONG> acts like <STRONG>panel_below(NULL)</STRONG>, for the given <STRONG>SCREEN</STRONG> <EM>sp</EM>.
+       <STRONG>ceiling_panel(</STRONG><EM>sp</EM><STRONG>)</STRONG> acts like <STRONG>panel_below(NULL)</STRONG> for the given <EM>SCREEN</EM> <EM>sp</EM>.
 
 
 </PRE><H3><a name="h3-del_panel">del_panel</a></H3><PRE>
-       <STRONG>del_panel(</STRONG><EM>pan</EM><STRONG>)</STRONG>  removes  the  given  panel  <EM>pan</EM>  from  the   stack  and
-       deallocates the <STRONG>PANEL</STRONG> structure (but not its associated window).
+       <STRONG>del_panel(</STRONG><EM>pan</EM><STRONG>)</STRONG>   removes  the  given  panel  <EM>pan</EM>  from  the  stack  and
+       deallocates the <EM>PANEL</EM> structure (but not its associated window).
 
 
 </PRE><H3><a name="h3-ground_panel">ground_panel</a></H3><PRE>
-       <STRONG>ground_panel(</STRONG><EM>sp</EM><STRONG>)</STRONG> acts like <STRONG>panel_above(NULL)</STRONG>, for the given <STRONG>SCREEN</STRONG> <EM>sp</EM>.
+       <STRONG>ground_panel(</STRONG><EM>sp</EM><STRONG>)</STRONG> acts like <STRONG>panel_above(NULL)</STRONG> for the given <EM>SCREEN</EM> <EM>sp</EM>.
 
 
 </PRE><H3><a name="h3-hide_panel">hide_panel</a></H3><PRE>
        <STRONG>hide_panel(</STRONG><EM>pan</EM><STRONG>)</STRONG> removes the given panel <EM>pan</EM> from the  panel  stack  and
-       thus  hides  it  from  view.   The  <STRONG>PANEL</STRONG> structure is not lost, merely
+       thus  hides  it  from  view.   The  <EM>PANEL</EM> structure is not lost, merely
        removed from the stack.
 
 
 </PRE><H3><a name="h3-move_panel">move_panel</a></H3><PRE>
-       <STRONG>move_panel(</STRONG><EM>pan</EM><STRONG>,</STRONG><EM>starty</EM><STRONG>,</STRONG><EM>startx</EM><STRONG>)</STRONG> moves the given  panel  <EM>pan</EM>'s  window  so
+       <STRONG>move_panel(</STRONG><EM>pan</EM><STRONG>,</STRONG> <EM>starty</EM><STRONG>,</STRONG> <EM>startx</EM><STRONG>)</STRONG> moves the given panel <EM>pan</EM>'s  window  so
        that  its  upper-left  corner is at <EM>starty</EM>, <EM>startx</EM>.  It does not change
        the position of the panel in the stack.  Be sure to use this  function,
        not <STRONG><A HREF="curs_window.3x.html">mvwin(3x)</A></STRONG>, to move a panel window.
 
 
 </PRE><H3><a name="h3-new_panel">new_panel</a></H3><PRE>
-       <STRONG>new_panel(</STRONG><EM>win</EM><STRONG>)</STRONG>  allocates  a  <STRONG>PANEL</STRONG>  structure, associates it with <EM>win</EM>,
-       places the panel on the top of the stack (causes  it to  be   displayed
+       <STRONG>new_panel(</STRONG><EM>win</EM><STRONG>)</STRONG>  allocates  a  <EM>PANEL</EM>  structure, associates it with <EM>win</EM>,
+       places the panel on the top of the stack (causes  it  to  be  displayed
        above any other panel) and returns a pointer to the new panel.
 
 
 </PRE><H3><a name="h3-panel_above">panel_above</a></H3><PRE>
        <STRONG>panel_above(</STRONG><EM>pan</EM><STRONG>)</STRONG>  returns  a  pointer  to  the panel above <EM>pan</EM>.  If the
-       panel argument is <STRONG>(PANEL</STRONG> <STRONG>*)0</STRONG>, it returns a pointer to the bottom  panel
-       in the stack.
+       panel argument is "<STRONG>(PANEL</STRONG> <STRONG>*)0</STRONG>", it returns  a  pointer  to  the  bottom
+       panel in the stack.
 
 
 </PRE><H3><a name="h3-panel_below">panel_below</a></H3><PRE>
        <STRONG>panel_below(</STRONG><EM>pan</EM><STRONG>)</STRONG> returns a pointer to the panel just below <EM>pan</EM>.  If the
-       panel argument is <STRONG>(PANEL</STRONG> <STRONG>*)0</STRONG>, it returns a pointer to the top panel  in
-       the stack.
+       panel argument is "<STRONG>(PANEL</STRONG> <STRONG>*)0</STRONG>", it returns a pointer to the  top  panel
+       in the stack.
 
 
 </PRE><H3><a name="h3-panel_hidden">panel_hidden</a></H3><PRE>
        <STRONG>panel_hidden(</STRONG><EM>pan</EM><STRONG>)</STRONG> returns <STRONG>FALSE</STRONG> if the panel <EM>pan</EM> is in the panel stack,
-       <STRONG>TRUE</STRONG> if it is not.  If the panel is a null pointer, return <STRONG>ERR</STRONG>.
+       and <STRONG>TRUE</STRONG> if it is not.  If the panel is a null pointer, it returns <STRONG>ERR</STRONG>.
 
 
 </PRE><H3><a name="h3-panel_userptr">panel_userptr</a></H3><PRE>
@@ -177,85 +177,83 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-replace_panel">replace_panel</a></H3><PRE>
-       <STRONG>replace_panel(</STRONG><EM>pan</EM><STRONG>,</STRONG><EM>window</EM><STRONG>)</STRONG> replaces the current window of panel <EM>pan</EM> with
-       <EM>window</EM> This is useful, for example if you want to resize a  panel.   In
-       <STRONG>ncurses</STRONG>,  you  can  call <STRONG>replace_panel</STRONG> to resize a panel using a window
+       <STRONG>replace_panel(</STRONG><EM>pan</EM><STRONG>,</STRONG>  <EM>window</EM><STRONG>)</STRONG>  replaces  the  current window of panel <EM>pan</EM>
+       with <EM>window</EM> This is useful if, for example, you want to resize a panel.
+       In <EM>ncurses</EM>, you can call <STRONG>replace_panel</STRONG> to resize a panel using a window
        resized with <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.  It does not change the position of the panel
        in the stack.
 
 
 </PRE><H3><a name="h3-set_panel_userptr">set_panel_userptr</a></H3><PRE>
-       <STRONG>set_panel_userptr(</STRONG><EM>pan</EM><STRONG>,</STRONG><EM>ptr</EM><STRONG>)</STRONG> sets the panel's user pointer.
+       <STRONG>set_panel_userptr(</STRONG><EM>pan</EM><STRONG>,</STRONG> <EM>ptr</EM><STRONG>)</STRONG> sets the panel's user pointer.
 
 
 </PRE><H3><a name="h3-show_panel">show_panel</a></H3><PRE>
        <STRONG>show_panel(</STRONG><EM>pan</EM><STRONG>)</STRONG>  makes  a  hidden panel visible by placing it on top of
-       the panels in the panel stack.  See <STRONG>COMPATIBILITY</STRONG> below.
+       the panels in the panel stack.  See "PORTABILITY" below.
 
 
 </PRE><H3><a name="h3-top_panel">top_panel</a></H3><PRE>
        <STRONG>top_panel(</STRONG><EM>pan</EM><STRONG>)</STRONG> puts the given visible panel <EM>pan</EM> on top of all panels in
-       the stack.  See <STRONG>COMPATIBILITY</STRONG> below.
+       the stack.  See "PORTABILITY" below.
 
 
 </PRE><H3><a name="h3-update_panels">update_panels</a></H3><PRE>
-       <STRONG>update_panels()</STRONG>  refreshes  the <EM>virtual</EM> <EM>screen</EM> to reflect the relations
+       <STRONG>update_panels()</STRONG>  refreshes  the virtual screen to reflect the relations
        between the panels in the stack, but  does  not  call  <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG>  to
-       refresh the <EM>physical</EM> <EM>screen</EM>.  Use this function and not <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG> or
+       refresh the physical screen.  Use this function and not <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG> or
        <STRONG><A HREF="curs_refresh.3x.html">wnoutrefresh(3x)</A></STRONG>.
 
        <STRONG>update_panels</STRONG> may be called more than once before a call  to  <STRONG>doupdate</STRONG>,
-       but  <STRONG>doupdate</STRONG>  is  the  function  responsible for updating the <EM>physical</EM>
-       <EM>screen</EM>.
+       but  <STRONG>doupdate</STRONG>  is  the  function  responsible for updating the physical
+       screen.
 
 
-</PRE><H2><a name="h2-DIAGNOSTICS">DIAGNOSTICS</a></H2><PRE>
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Each routine that returns a pointer returns <STRONG>NULL</STRONG> if  an  error  occurs.
        Each  routine  that  returns  an  int  value  returns <STRONG>OK</STRONG> if it executes
        successfully and <STRONG>ERR</STRONG> if not.
 
        Except as noted, the <EM>pan</EM> and <EM>window</EM> parameters must  be  non-null.   If
-       those are null, an error is returned.
+       either is null, an error is returned.
+
+       The  <STRONG>move_panel</STRONG>  function uses <STRONG><A HREF="curs_window.3x.html">mvwin(3x)</A></STRONG>, and returns an error if <STRONG>mvwin</STRONG>
+       returns an error.
+
 
-       The  <STRONG>move_panel</STRONG>  function  uses  <STRONG><A HREF="curs_window.3x.html">mvwin(3x)</A></STRONG>, and will return an error if
-       <STRONG>mvwin</STRONG> returns an error.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       The header file <EM>panel.h</EM> itself includes the header file <EM>curses.h</EM>.
 
 
-</PRE><H2><a name="h2-COMPATIBILITY">COMPATIBILITY</a></H2><PRE>
-       Reasonable care has been taken  to   ensure   compatibility  with   the
-       native   panel  facility introduced in System V (inspection of the SVr4
-       manual pages suggests the programming  interface  is  unchanged).   The
-       <STRONG>PANEL</STRONG>   data  structures  are  merely   similar.   The   programmer  is
-       cautioned not to directly use <STRONG>PANEL</STRONG> fields.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Reasonable care has been taken to ensure compatibility with the  native
+       panel  facility  introduced  in System V; inspection of the SVr4 manual
+       pages suggests the programming interface never changed.  The <EM>PANEL</EM> data
+       structures  are  merely  similar.   The  programmer is cautioned not to
+       directly use <EM>PANEL</EM> fields.
 
        The  functions  <STRONG>show_panel</STRONG>  and  <STRONG>top_panel</STRONG>  are   identical   in   this
        implementation,  and work equally well with displayed or hidden panels.
-       In the native System  V  implementation,  <STRONG>show_panel</STRONG>  is  intended  for
-       making  a  hidden panel visible (at the top of the stack) and <STRONG>top_panel</STRONG>
-       is intended for making an already-visible panel move to the top of  the
+       In the System V implementation, <STRONG>show_panel</STRONG> is  intended  for  making  a
+       hidden  panel  visible  (at  the  top  of  the  stack) and <STRONG>top_panel</STRONG> 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.
-
+       compatibility with System V panel libraries.
 
-</PRE><H2><a name="h2-NOTE">NOTE</a></H2><PRE>
-       In your library list, libpanel.a should be  before  libncurses.a;  that
-       is, you should say "-lpanel -lncurses", not the other way around (which
-       would give a link-error with static libraries).
 
-
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The panel facility was documented in SVr4.2 in <EM>Character</EM> <EM>User</EM> <EM>Interface</EM>
-       <EM>Programming</EM> <EM>(UNIX</EM> <EM>SVR4.2)</EM>.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       A panel facility was documented in SVr4.2's  <EM>Character</EM>  <EM>User</EM>  <EM>Interface</EM>
+       <EM>Programming</EM> document.
 
        It is not part of X/Open Curses.
 
        A few implementations exist:
 
-       <STRONG>o</STRONG>   Systems  based  on  SVr4  source  code, e.g., Solaris, provide this
+       <STRONG>o</STRONG>   Systems  based  on  SVr4 source code, such as Solaris, provide this
            library.
 
-       <STRONG>o</STRONG>   <STRONG>ncurses</STRONG> (since version 0.6 in 1993) and <STRONG>PDCurses</STRONG> (since version 2.2
-           in 1995) provide a panel library whose common ancestor was a public
+       <STRONG>o</STRONG>   <EM>ncurses</EM> (since version 0.6 in 1993) and <EM>PDCurses</EM> (since version 2.2
+           in  1995) provide a panel library whose common ancestor is a public
            domain implementation by Warren Tucker published  in  <EM>u386mon</EM>  2.20
            (1990).
 
@@ -267,17 +265,17 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
            the same as Tucker's implementation.
 
        <STRONG>o</STRONG>   NetBSD 8 (2018) has a panel library  begun  by  Valery  Ushakov  in
-           2015.  This is based on the AT&amp;T documentation.
+           2015, based on the System V documentation.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
-       Originally   written   by   Warren   Tucker  &lt;wht@n4hgf.mt-park.ga.us&gt;,
-       primarily to assist in porting <EM>u386mon</EM>  to  systems  without  a  native
-       panels library.
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
+       Warren   Tucker   &lt;wht@n4hgf.mt-park.ga.us&gt;   originally   wrote   this
+       implementation, primarily to  assist  in  porting  <EM>u386mon</EM>  to  systems
+       without a native panel library.
 
-       Repackaged for ncurses by Zeyd ben-Halim.
+       Zeyd ben-Halim repackaged it for <EM>ncurses</EM>.
 
-       Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+       Juergen Pfeifer and Thomas E. Dickey revised and improved the library.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -285,7 +283,7 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -313,11 +311,11 @@ <H1 class="no-header">panel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-update_panels">update_panels</a></li>
 </ul>
 </li>
-<li><a href="#h2-DIAGNOSTICS">DIAGNOSTICS</a></li>
-<li><a href="#h2-COMPATIBILITY">COMPATIBILITY</a></li>
-<li><a href="#h2-NOTE">NOTE</a></li>
+<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 7321a16a2..69791cf82 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.49 2023/10/21 10:31:22 tom Exp @
+  * @Id: resizeterm.3x,v 1.51 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -182,7 +182,7 @@ <H1 class="no-header">resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</H1>
        in NetBSD <EM>curses</EM> (2001) and PDCurses (2003).
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
        <EM>curses</EM>)
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -209,7 +209,7 @@ <H1 class="no-header">resizeterm 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 3af344afa..010df1d57 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.37 2023/10/07 21:19:07 tom Exp @
+  * @Id: scr_dump.5,v 1.39 2023/11/25 14:21:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-10-07 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-11-25 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
           <STRONG>o</STRONG>   Shading is used to identify  <EM>X/Open</EM>  <EM>Enhanced</EM>  <EM>Curses</EM>  material,
               relating to interfaces included to provide enhanced capabilities
               for applications originally written to be  compiled  on  systems
-              based  on  the  UNIX  operating system.  Therefore, the features
+              based  on  the  Unix  operating system.  Therefore, the features
               described may not be present on systems that conform to <STRONG>XPG4</STRONG>  <STRONG>or</STRONG>
               <STRONG>to</STRONG>  <STRONG>earlier</STRONG>  <STRONG>XPG</STRONG>  <STRONG>releases</STRONG>.   The  relevant  reference pages may
               provide additional or more specific portability  warnings  about
@@ -181,7 +181,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
 
        That is, the feature was likely introduced in SVr2 (1984), and improved
        in SVr3 (1987).  The Solaris curses source has no magic number for SVr4
-       (1989).  Other operating systems (AIX and  HPUX)  use  a  magic  number
+       (1989).  Other operating systems (AIX and HP-UX)  use  a  magic  number
        which would correspond to this definition:
 
            /* curses screen dump magic number */
@@ -205,7 +205,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   AIX (51817 bytes)
 
-       <STRONG>o</STRONG>   HPUX (90093 bytes)
+       <STRONG>o</STRONG>   HP-UX (90093 bytes)
 
        <STRONG>o</STRONG>   Solaris 10 (13273 bytes)
 
@@ -258,7 +258,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   finally, lines as done by other implementations.
 
 
-</PRE><H2><a name="h2-EXAMPLE">EXAMPLE</a></H2><PRE>
+</PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        Given  a  simple  program  which writes text to the screen (and for the
        sake of example, limiting the screen-size to 10x20):
 
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-10-07                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-11-25                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -428,7 +428,7 @@ <H1 class="no-header">scr_dump 5 2023-10-07 ncurses 6.4 File formats</H1>
 <li><a href="#h3-NetBSD">NetBSD</a></li>
 </ul>
 </li>
-<li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
+<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 1cbace54d..d9da04b1b 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.48 2023/10/14 19:29:06 tom Exp @
+  * @Id: tabs.1,v 1.50 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -51,7 +51,7 @@ <H1 class="no-header">tabs 1 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tabs</STRONG> [<EM>options</EM>]] <EM>[tabstop-list]</EM>
+       <STRONG>tabs</STRONG> [<EM>options</EM>] [<EM>tabstop-list</EM>]
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -259,7 +259,7 @@ <H1 class="no-header">tabs 1 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 2cd0f44d9..144bd20f8 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.62 2023/10/21 15:33:10 tom Exp @
+  * @Id: term.5,v 1.65 2023/11/25 22:58:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-10-21 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-11-25 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-11-25 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
        the <STRONG>ncurses</STRONG> libraries):
 
        <STRONG>directory</STRONG> <STRONG>tree</STRONG>
-            A two-level scheme is used to avoid a linear search of a huge UNIX
+            A two-level scheme is used to avoid a linear search of a huge Unix
             system directory: <STRONG>/usr/share/terminfo/c/name</STRONG>  where  <EM>name</EM>  is  the
             name of the terminal, and <EM>c</EM> is the first character of <EM>name</EM>.  Thus,
             <EM>act4</EM>  can  be  found  in  the   file   <STRONG>/usr/share/terminfo/a/act4</STRONG>.
@@ -189,7 +189,7 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 </PRE><H3><a name="h3-EXTENDED-STORAGE-FORMAT">EXTENDED STORAGE FORMAT</a></H3><PRE>
        The previous section describes the conventional terminfo binary format.
        With  some  minor variations of the offsets (see PORTABILITY), the same
-       binary format is used in all modern UNIX systems.  Each system  uses  a
+       binary format is used in all modern Unix systems.  Each system  uses  a
        predefined set of boolean, number or string capabilities.
 
        The <STRONG>ncurses</STRONG> libraries and applications support extended terminfo binary
@@ -223,6 +223,12 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
        extended  capabilities  in  order,  e.g.,  booleans,  then  numbers and
        finally strings.
 
+       By storing terminal descriptions  in  this  way,  <STRONG>ncurses</STRONG>  is  able  to
+       provide  a  database  useful  with  legacy  applications,  as  well  as
+       providing data for applications which need  more  than  the  predefined
+       capabilities.  See <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for an overview of the way <STRONG>ncurses</STRONG> uses
+       this extended information.
+
        Applications which manipulate terminal data  can  use  the  definitions
        described  in  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>  which  associate the long capability
        names with members of a <STRONG>TERMTYPE</STRONG> structure.
@@ -245,6 +251,11 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
        <STRONG>TERMTYPE2</STRONG> to provide data for the terminfo functions.
 
 
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-setupterm">setupterm</a></H3><PRE>
@@ -261,12 +272,12 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Binary-format">Binary format</a></H3><PRE>
        X/Open  Curses  does  not  specify  a format for the terminfo database.
-       UNIX System V curses used a directory-tree of  binary  files,  one  per
-       terminal description.
+       System V curses used a directory-tree of binary files, one per terminal
+       description.
 
        Despite  the  consistent  use  of  little-endian  for  numbers  and the
        otherwise  self-describing  format,  it  is  not  wise  to   count   on
-       portability   of   binary  terminfo  entries  between  commercial  UNIX
+       portability   of   binary  terminfo  entries  between  commercial  Unix
        versions.  The problem is that there are at  least  three  versions  of
        terminfo  (under  HP-UX,  AIX,  and OSF/1) which diverged from System V
        terminfo after SVr1, and  have  added  extension  capabilities  to  the
@@ -306,8 +317,39 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
        directory tree in (two-character) hexadecimal form.
 
 
-</PRE><H2><a name="h2-EXAMPLE">EXAMPLE</a></H2><PRE>
-       As an example, here is a description  for  the  Lear-Siegler  ADM-3,  a
+</PRE><H3><a name="h3-Limits">Limits</a></H3><PRE>
+       <STRONG>ncurses</STRONG> stores compiled terminal descriptions in three related formats,
+       described in the sections
+
+       <STRONG>o</STRONG>   <STRONG>LEGACY</STRONG> <STRONG>STORAGE</STRONG> <STRONG>FORMAT</STRONG>, and
+
+       <STRONG>o</STRONG>   <STRONG>EXTENDED</STRONG> <STRONG>STORAGE</STRONG> <STRONG>FORMAT</STRONG>, and
+
+       <STRONG>o</STRONG>   <STRONG>EXTENDED</STRONG> <STRONG>NUMBER</STRONG> <STRONG>FORMAT</STRONG>.
+
+       The  legacy storage format and the extended number format differ by the
+       types of numeric capability which they can store (i.e.,  16-bit  versus
+       32-bit  integers).   The  extended storage format introduced by ncurses
+       5.0 adds data to either of these formats.
+
+       Some limitations apply:
+
+       <STRONG>o</STRONG>   total compiled entries cannot  exceed  4096  bytes  in  the  legacy
+           format.
+
+       <STRONG>o</STRONG>   total  compiled  entries  cannot exceed 32768 bytes in the extended
+           format.
+
+       <STRONG>o</STRONG>   the name field cannot exceed 128 bytes.
+
+       Compiled entries are limited to 32768 bytes because  offsets  into  the
+       <EM>strings</EM>  <EM>table</EM>  use  two-byte  integers.   The legacy format could have
+       supported 32768-byte entries, but  was  limited  to  a  virtual  memory
+       page's 4096 bytes.
+
+
+</PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
+       As  an  example,  here  is  a description for the Lear-Siegler ADM-3, a
        popular though rather stupid early terminal:
 
            adm3a|lsi adm3a,
@@ -343,28 +385,6 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
      0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 
 
-</PRE><H2><a name="h2-LIMITS">LIMITS</a></H2><PRE>
-       Some limitations:
-
-       <STRONG>o</STRONG>   total  compiled  entries  cannot  exceed  4096  bytes in the legacy
-           format.
-
-       <STRONG>o</STRONG>   total compiled entries cannot exceed 32768 bytes  in  the  extended
-           format.
-
-       <STRONG>o</STRONG>   the name field cannot exceed 128 bytes.
-
-       Compiled  entries  are  limited to 32768 bytes because offsets into the
-       <EM>strings</EM> <EM>table</EM> use two-byte integers.   The  legacy  format  could  have
-       supported  32768-byte  entries, but was limited a virtual memory page's
-       4096 bytes.
-
-
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <EM>/usr/share/terminfo</EM>
-              compiled terminal description database
-
-
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
        extended terminfo format for ncurses 5.0
@@ -376,11 +396,11 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -394,6 +414,7 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 <li><a href="#h3-EXTENDED-NUMBER-FORMAT">EXTENDED NUMBER FORMAT</a></li>
 </ul>
 </li>
+<li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-setupterm">setupterm</a></li>
@@ -401,11 +422,10 @@ <H1 class="no-header">term 5 2023-10-21 ncurses 6.4 File formats</H1>
 <li><a href="#h3-Magic-codes">Magic codes</a></li>
 <li><a href="#h3-The-TERMTYPE-structure">The TERMTYPE structure</a></li>
 <li><a href="#h3-Mixed-case-terminal-names">Mixed-case terminal names</a></li>
+<li><a href="#h3-Limits">Limits</a></li>
 </ul>
 </li>
-<li><a href="#h2-EXAMPLE">EXAMPLE</a></li>
-<li><a href="#h2-LIMITS">LIMITS</a></li>
-<li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 459fb4222..306a77f3a 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.42 2023/11/11 11:48:16 tom Exp @
+  * @Id: term.7,v 1.44 2023/11/25 17:20:42 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-11-11 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-11-25 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-11-11 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -58,12 +58,12 @@ <H1 class="no-header">term 7 2023-11-11 ncurses 6.4 Miscellaneous</H1>
        your editor and mailer.
 
        A default <STRONG>TERM</STRONG> value  will  be  set  on  a  per-line  basis  by  either
-       <STRONG>/etc/inittab</STRONG>  (e.g.,  System-V-like  UNIXes) or <STRONG>/etc/ttys</STRONG> (BSD UNIXes).
+       <STRONG>/etc/inittab</STRONG>  (e.g.,  System-V-like  Unices) or <STRONG>/etc/ttys</STRONG> (BSD Unices).
        This will nearly  always  suffice  for  workstation  and  microcomputer
        consoles.
 
        If  you  use a dialup line, the type of device attached to it may vary.
-       Older UNIX systems pre-set a very dumb terminal  type  like  "dumb"  or
+       Older Unix systems pre-set a very dumb terminal  type  like  "dumb"  or
        "dialup"  on  dialup lines.  Newer ones may pre-set "vt100", reflecting
        the prevalence of DEC VT100-compatible terminals and  personal-computer
        emulators.
@@ -196,20 +196,20 @@ <H1 class="no-header">term 7 2023-11-11 ncurses 6.4 Miscellaneous</H1>
        specified.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       For maximum compatibility with older System V UNIXes, names and aliases
-       should be unique within the first 14 characters.
-
-
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
        <EM>/usr/share/terminfo</EM>
             compiled terminal description database
 
        /etc/inittab
-            tty line initialization (AT&amp;T-like UNIXes)
+            tty line initialization (AT&amp;T-like Unices)
 
        /etc/ttys
-            tty line initialization (BSD-like UNIXes)
+            tty line initialization (BSD-like Unices)
+
+
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       For maximum compatibility with older System V Unices, names and aliases
+       should be unique within the first 14 characters.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -217,14 +217,14 @@ <H1 class="no-header">term 7 2023-11-11 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-11-11                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 8ae772445..4373615f0 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: term_variables.3x,v 1.33 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 4424ac030..6792b9df2 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.53 2023/10/14 19:53:57 tom Exp @
+  * @Id: terminfo.head,v 1.55 2023/11/25 19:52:56 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.134 2023/10/14 19:18:14 tom Exp @
+  * @Id: terminfo.tail,v 1.135 2023/11/25 14:32:36 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-10-14 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-11-25 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231118).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231125).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -147,7 +147,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   Lines  beginning  with  a  "#"  in  the first column are treated as
            comments.
 
-           While comment lines are legal at any point, the output of <STRONG>captoinfo</STRONG>
+           While comment lines are valid at any point, the output of <STRONG>captoinfo</STRONG>
            and  <STRONG>infotocap</STRONG>  (aliases  for <STRONG>tic</STRONG>) will move comments so they occur
            only between entries.
 
@@ -2464,7 +2464,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        4025, this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command  character
        is  chosen  which is used in all capabilities.  This character is given
        in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
-       supported on some UNIX systems: The environment is to be searched for a
+       supported on some Unix systems: The environment is to be searched for a
        <STRONG>CC</STRONG> variable, and if found, all occurrences of the  prototype  character
        are replaced with the character in the environment variable.
 
@@ -2486,7 +2486,7 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
        Media copy strings which control an auxiliary printer connected to  the
@@ -2608,13 +2608,13 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        (after tc expansion) lengths.
 
 
-</PRE><H3><a name="h3-Binary-Compatibility">Binary Compatibility</a></H3><PRE>
-       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 and XSI Curses extensions.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
+       between  commercial  Unix  systems.   At  least  two implementations of
+       <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
+       Unices  after  SVr1,  adding extension capabilities to the string table
+       that (in the binary format) collide with subsequent System  V  and  XSI
+       Curses extensions.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
@@ -2652,28 +2652,29 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
        <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  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  cases)  different
-       extension sets.  Here is a summary, accurate as of October 1995:
+       Different  commercial  ports  of  <EM>terminfo</EM> and <EM>curses</EM> support different
+       subsets of XSI Curses and (in some cases) different  extensions.   Here
+       is  a  summary, accurate as of October 1995, after which the commercial
+       Unix market contracted and lost diversity.
 
-       <STRONG>o</STRONG>   <STRONG>SVR4,</STRONG> <STRONG>Solaris,</STRONG> <STRONG>ncurses</STRONG> -- These support all SVr4 capabilities.
+       <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
-       <STRONG>o</STRONG>   <STRONG>SGI</STRONG> -- Supports the SVr4 set, adds one undocumented extended string
-           capability (<STRONG>set_pglen</STRONG>).
+       <STRONG>o</STRONG>   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
+           string capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   <STRONG>SVr1,</STRONG> <STRONG>Ultrix</STRONG> -- These  support  a  restricted  subset  of  terminfo
-           capabilities.   The  booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
+       <STRONG>o</STRONG>   SVr1   and   Ultrix   support   a  restricted  subset  of  <EM>terminfo</EM>
+           capabilities.  The Booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>HP/UX</STRONG> -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
-           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
-           through 63, plus <STRONG>plab_norm</STRONG>,  <STRONG>label_on</STRONG>,  and  <STRONG>label_off</STRONG>,  plus  some
-           incompatible extensions in the string table.
+       <STRONG>o</STRONG>   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
+           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
+           through  63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a number
+           of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   <STRONG>AIX</STRONG>  -- Supports the SVr1 subset, plus function keys 11 through 63,
+       <STRONG>o</STRONG>   AIX supports the SVr1 subset, plus function  keys  11  through  63,
            plus a number of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   <STRONG>OSF</STRONG> -- Supports both the SVr4 set and the AIX extensions.
+       <STRONG>o</STRONG>   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -2687,13 +2688,13 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,     <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-14                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-11-25                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -2727,9 +2728,9 @@ <H1 class="no-header">terminfo 5 2023-10-14 ncurses 6.4 File formats</H1>
 <li><a href="#h3-Miscellaneous">Miscellaneous</a></li>
 <li><a href="#h3-Glitches-and-Braindamage">Glitches and Braindamage</a></li>
 <li><a href="#h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></li>
-<li><a href="#h3-Binary-Compatibility">Binary Compatibility</a></li>
 </ul>
 </li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 044f51089..ceff274d6 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.98 2023/10/14 19:25:26 tom Exp @
+  * @Id: tic.1m,v 1.101 2023/11/25 23:02:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -51,8 +51,8 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tic</STRONG>  [<STRONG>-01CDGIKLNTUVWacfgqrstx</STRONG>]  [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-Q</STRONG>[<EM>n</EM>]] [<STRONG>-R</STRONG> <EM>subset</EM>]
-       [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
+       <STRONG>tic</STRONG>  [<STRONG>-01acCDfgGIKLNqrstTUVWx</STRONG>] [<STRONG>-e</STRONG> <EM>terminal-type-list</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-Q</STRONG>[<EM>n</EM>]]
+       [<STRONG>-R</STRONG> <EM>subset</EM>] [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -118,7 +118,7 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>o</STRONG>   When invoked as captoinfo, tic sets the <STRONG>-C</STRONG> option.
 
 
-</PRE><H3><a name="h3-OPTIONS">OPTIONS</a></H3><PRE>
+</PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
        <STRONG>-0</STRONG>     restricts the output to a single line
 
        <STRONG>-1</STRONG>     restricts the output to a single column
@@ -172,10 +172,10 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
               summarized  above,  it  will print a diagnostic and exit with an
               error rather than printing a list of database locations.
 
-       <STRONG>-e</STRONG> <EM>names</EM>
-              Limit writes and translations to the  following  comma-separated
-              list  of  terminals.  If any name or alias of a terminal matches
-              one of the names in the list,  the  entry  will  be  written  or
+       <STRONG>-e</STRONG> <EM>list</EM>
+              Limit writes and translations to  the  comma-separated  <EM>list</EM>  of
+              terminal  types.  If any name or alias of a terminal matches one
+              of the  names  in  the  list,  the  entry  will  be  written  or
               translated as normal.  Otherwise no output will be generated for
               it.  The option value is interpreted as a  file  containing  the
               list  if  it  contains  a  '/'.  (Note: depending on how tic was
@@ -307,7 +307,7 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>-w</STRONG><EM>n</EM>  specifies the width of the output.  The parameter is optional.  If
             it is omitted, it defaults to 60.
 
-       <STRONG>-x</STRONG>   Treat unknown capabilities  as  user-defined  (see  <STRONG>user_caps(5)</STRONG>).
+       <STRONG>-x</STRONG>   Treat unknown capabilities  as  user-defined  (see  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
             That  is,  if  you  supply  a  capability  name which <STRONG>tic</STRONG> does not
             recognize, it will infer its type (boolean, number or string) from
             the  syntax  and  make  an  extended  table entry for that.  User-
@@ -340,138 +340,139 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG> for  these  capabilities  to  be  canceled  in
        <STRONG>entry_name_1</STRONG>.
 
-       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 long filenames, 14 characters otherwise)
-       will be truncated to the maximum alias length  and  a  warning  message
-       will be printed.
+       Total  compiled  entries cannot exceed 4096 bytes in the legacy storage
+       format, or 32768 using the extended  number  format.   The  name  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 printed.
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       System  V  Release  2  provided  a  <STRONG>tic</STRONG>  utility.  It accepted a single
-       option: <STRONG>-v</STRONG> (optionally  followed  by  a  number).   According  to  Ross
-       Ridge's comment in <EM>mytinfo</EM>, this version of <STRONG>tic</STRONG> was unable to represent
-       cancelled capabilities.
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
-       System V Release 3 provided a different <STRONG>tic</STRONG> utility, written  by  Pavel
-       Curtis,  (originally named "compile" in <EM>pcurses</EM>).  This added an option
-       <STRONG>-c</STRONG> 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 <EM>pcurses</EM>.   While  the  program
-       itself  was  changed  little  as  development  continued  with System V
-       Release 4, the table of capabilities grew from  180  (<EM>pcurses</EM>)  to  464
-       (Solaris).
 
-       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
-       from <EM>mytinfo</EM> to extend the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG> (see
-       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       There is  some  evidence  that  historic  <STRONG>tic</STRONG>  implementations  treated
+       description  fields with no whitespace in them as additional aliases or
+       short names.  This <STRONG>tic</STRONG>  does  not  do  that,  but  it  does  warn  when
+       description fields may be treated that way and check them for dangerous
+       characters.
 
-       Eric Raymond incorporated parts of <EM>mytinfo</EM> 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  <STRONG>-x</STRONG>  option  to  support  user-defined
-       capabilities.
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       Unlike the SVr4 <STRONG>tic</STRONG> 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  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  the  list  of
+       termcap names taken to be equivalent to terminfo names.
 
-       In  2010,  Roy  Marples provided a <STRONG>tic</STRONG> program and terminfo library for
-       NetBSD.  That implementation  adapts  several  features  from  ncurses,
-       including <STRONG>tic</STRONG>'s <STRONG>-x</STRONG> option.
+       The  SVr4  manual  pages  are not clear on the resolution rules for <STRONG>use</STRONG>
+       capabilities.   This  implementation  of  <STRONG>tic</STRONG>  will  find  <STRONG>use</STRONG>  targets
+       anywhere  in  the  source  file, or anywhere in the file tree rooted at
+       <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is defined), or  in  the  user's  <EM>$HOME/.terminfo</EM>
+       database  (if  it  exists),  or (finally) anywhere in the system's file
+       tree of compiled entries.
 
-       The  <STRONG>-c</STRONG>  option  tells <STRONG>tic</STRONG> to check for problems in the terminfo source
-       file.  Continued development provides additional checks:
+       The error messages from this <STRONG>tic</STRONG> have the same format as  GNU  C  error
+       messages, and can be parsed by GNU Emacs's compile facility.
 
-       <STRONG>o</STRONG>   <EM>pcurses</EM> had 8 warnings
+       Aside from <STRONG>-c</STRONG> and <STRONG>-v</STRONG>, options are not portable:
 
-       <STRONG>o</STRONG>   ncurses in 1996 had 16 warnings
+       <STRONG>o</STRONG>   Most of tic's options are not supported by SVr4 <STRONG>tic</STRONG>:
 
-       <STRONG>o</STRONG>   Solaris (SVr4) curses has 28 warnings
+           <STRONG>-0</STRONG> <STRONG>-1</STRONG> <STRONG>-C</STRONG> <STRONG>-G</STRONG> <STRONG>-I</STRONG> <STRONG>-N</STRONG> <STRONG>-R</STRONG> <STRONG>-T</STRONG> <STRONG>-V</STRONG> <STRONG>-a</STRONG> <STRONG>-e</STRONG> <STRONG>-f</STRONG> <STRONG>-g</STRONG> <STRONG>-o</STRONG> <STRONG>-r</STRONG> <STRONG>-s</STRONG> <STRONG>-t</STRONG> <STRONG>-x</STRONG>
 
-       <STRONG>o</STRONG>   NetBSD tic in 2019 has 19 warnings.
+       <STRONG>o</STRONG>   The NetBSD <STRONG>tic</STRONG>  supports a few of the ncurses options
 
-       <STRONG>o</STRONG>   ncurses in 2019 has 96 warnings
+           <STRONG>-a</STRONG> <STRONG>-o</STRONG> <STRONG>-x</STRONG>
 
-       The checking done in ncurses' <STRONG>tic</STRONG> 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.
+           and  adds  <STRONG>-S</STRONG>  (a feature which does the same thing as infocmp's <STRONG>-e</STRONG>
+           and <STRONG>-E</STRONG> options).
+
+       The SVr4 <STRONG>-c</STRONG> mode does not report bad "use=" links.
+
+       System V does  not  compile  entries  to  or  read  entries  from  your
+       <EM>$HOME/.terminfo</EM> database unless TERMINFO is explicitly set to it.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.   It
-       lists  one  option:  <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is unexpected.  The change
-       history states that  the  description  is  derived  from  True64  UNIX.
-       According  to  its  manual  pages,  that  system  also supported the <STRONG>-v</STRONG>
+       X/Open  Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.  It
+       lists one option: <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is  unexpected.   The  change
+       history  states  that  the  description  is  derived  from  Tru64 UNIX.
+       According to its manual  pages,  that  system  also  supported  the  <STRONG>-v</STRONG>
        option.
 
-       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
-       2019,  the  surviving  implementations  of <STRONG>tic</STRONG> are SVr4 (AIX, HP-UX and
+       Shortly  after  Issue  7  was  released, Tru64 was discontinued.  As of
+       2019, the surviving implementations of <STRONG>tic</STRONG> are  SVr4  (AIX,  HP-UX  and
        Solaris), ncurses and NetBSD curses.  The SVr4 <STRONG>tic</STRONG> programs all support
-       the  <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's documentation,
+       the <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's  documentation,
        omitting the <STRONG>-v</STRONG> option.
 
-       The X/Open rationale states  that  some  implementations  of  <STRONG>tic</STRONG>  read
-       terminal  descriptions from the standard input if the <EM>file</EM> 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
+       The  X/Open  rationale  states  that  some  implementations of <STRONG>tic</STRONG> read
+       terminal descriptions from the standard input if the <EM>file</EM> 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.
 
 
-</PRE><H3><a name="h3-COMPATIBILITY">COMPATIBILITY</a></H3><PRE>
-       There  is  some  evidence  that  historic  <STRONG>tic</STRONG>  implementations treated
-       description fields with no whitespace in them as additional aliases  or
-       short  names.   This  <STRONG>tic</STRONG>  does  not  do  that,  but  it does warn when
-       description fields may be treated that way and check them for dangerous
-       characters.
-
-
-</PRE><H3><a name="h3-EXTENSIONS">EXTENSIONS</a></H3><PRE>
-       Unlike  the  SVr4 <STRONG>tic</STRONG> 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 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for the list of
-       termcap names taken to be equivalent to terminfo names.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       System V Release 2 provided  a  <STRONG>tic</STRONG>  utility.   It  accepted  a  single
+       option:  <STRONG>-v</STRONG>  (optionally  followed  by  a  number).   According to Ross
+       Ridge's comment in <EM>mytinfo</EM>, this version of <STRONG>tic</STRONG> was unable to represent
+       cancelled capabilities.
 
-       The SVr4 manual pages are not clear on the  resolution  rules  for  <STRONG>use</STRONG>
-       capabilities.   This  implementation  of  <STRONG>tic</STRONG>  will  find  <STRONG>use</STRONG>  targets
-       anywhere in the source file, or anywhere in the  file  tree  rooted  at
-       <STRONG>TERMINFO</STRONG>  (if  <STRONG>TERMINFO</STRONG>  is  defined), or in the user's <EM>$HOME/.terminfo</EM>
-       database (if it exists), or (finally) anywhere  in  the  system's  file
-       tree of compiled entries.
+       System  V  Release 3 provided a different <STRONG>tic</STRONG> utility, written by Pavel
+       Curtis, (originally named "compile" in <EM>pcurses</EM>).  This added an  option
+       <STRONG>-c</STRONG>  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 <EM>pcurses</EM>.  While the program
+       itself was changed  little  as  development  continued  with  System  V
+       Release  4,  the  table  of capabilities grew from 180 (<EM>pcurses</EM>) to 464
+       (Solaris).
 
-       The  error  messages  from this <STRONG>tic</STRONG> have the same format as GNU C error
-       messages, and can be parsed by GNU Emacs's compile facility.
+       In early development of ncurses (1993), Zeyd Ben-Halim used  the  table
+       from  <EM>mytinfo</EM>  to  extend  the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG>  (see
+       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
 
-       Aside from <STRONG>-c</STRONG> and <STRONG>-v</STRONG>, options are not portable:
+       Eric  Raymond  incorporated  parts of <EM>mytinfo</EM> 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.
 
-       <STRONG>o</STRONG>   Most of tic's options are not supported by SVr4 <STRONG>tic</STRONG>:
+       In  1999,  Thomas  Dickey  added  the <STRONG>-x</STRONG> option to support user-defined
+       capabilities.
 
-           <STRONG>-0</STRONG> <STRONG>-1</STRONG> <STRONG>-C</STRONG> <STRONG>-G</STRONG> <STRONG>-I</STRONG> <STRONG>-N</STRONG> <STRONG>-R</STRONG> <STRONG>-T</STRONG> <STRONG>-V</STRONG> <STRONG>-a</STRONG> <STRONG>-e</STRONG> <STRONG>-f</STRONG> <STRONG>-g</STRONG> <STRONG>-o</STRONG> <STRONG>-r</STRONG> <STRONG>-s</STRONG> <STRONG>-t</STRONG> <STRONG>-x</STRONG>
+       In 2010, Roy Marples provided a <STRONG>tic</STRONG> program and  terminfo  library  for
+       NetBSD.   That  implementation  adapts  several  features from ncurses,
+       including <STRONG>tic</STRONG>'s <STRONG>-x</STRONG> option.
 
-       <STRONG>o</STRONG>   The NetBSD <STRONG>tic</STRONG>  supports a few of the ncurses options
+       The <STRONG>-c</STRONG> option tells <STRONG>tic</STRONG> to check for problems in  the  terminfo  source
+       file.  Continued development provides additional checks:
 
-           <STRONG>-a</STRONG> <STRONG>-o</STRONG> <STRONG>-x</STRONG>
+       <STRONG>o</STRONG>   <EM>pcurses</EM> had 8 warnings
 
-           and adds <STRONG>-S</STRONG> (a feature which does the same thing  as  infocmp's  <STRONG>-e</STRONG>
-           and <STRONG>-E</STRONG> options).
+       <STRONG>o</STRONG>   ncurses in 1996 had 16 warnings
 
-       The SVr4 <STRONG>-c</STRONG> mode does not report bad "use=" links.
+       <STRONG>o</STRONG>   Solaris (SVr4) curses has 28 warnings
 
-       System  V  does  not  compile  entries  to  or  read  entries from your
-       <EM>$HOME/.terminfo</EM> database unless TERMINFO is explicitly set to it.
+       <STRONG>o</STRONG>   NetBSD tic in 2019 has 19 warnings.
 
+       <STRONG>o</STRONG>   ncurses in 2019 has 96 warnings
 
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <EM>/usr/share/terminfo</EM>
-              compiled terminal description database
+       The checking done in ncurses' <STRONG>tic</STRONG> 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.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; and
        Thomas E. Dickey &lt;dickey@invisible-island.net&gt;
 
@@ -482,7 +483,7 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -491,20 +492,20 @@ <H1 class="no-header">tic 1m 2023-10-14 ncurses 6.4 User commands</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-ALIASES">ALIASES</a></li>
-<li><a href="#h3-OPTIONS">OPTIONS</a></li>
-<li><a href="#h3-PARAMETERS">PARAMETERS</a></li>
-<li><a href="#h3-PROCESSING">PROCESSING</a></li>
 </ul>
 </li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a>
+<li><a href="#h2-OPTIONS">OPTIONS</a>
 <ul>
-<li><a href="#h3-COMPATIBILITY">COMPATIBILITY</a></li>
-<li><a href="#h3-EXTENSIONS">EXTENSIONS</a></li>
+<li><a href="#h3-PARAMETERS">PARAMETERS</a></li>
+<li><a href="#h3-PROCESSING">PROCESSING</a></li>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index c55eb66c5..1d11fa699 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.54 2023/10/21 15:30:27 tom Exp @
+  * @Id: toe.1m,v 1.56 2023/11/25 14:32:36 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -40,12 +40,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-10-21 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-10-21 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -118,6 +118,29 @@ <H1 class="no-header">toe 1m 2023-10-21 ncurses 6.4 User commands</H1>
                 and exits with a successful status.
 
 
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <STRONG>toe</STRONG>  is  not provided by other implementations.  There is no applicable
+       X/Open or POSIX standard for it.
+
+       It replaces a <STRONG>-T</STRONG> option that  was  briefly  supported  by  the  <EM>ncurses</EM>
+       <STRONG>infocmp</STRONG> utility in 1995.
+
+       The <STRONG>-a</STRONG> and <STRONG>-s</STRONG> options were added in 2006 and 2011, respectively.
+
+       The program's name originates with a developer's pun:
+
+       <STRONG>o</STRONG>   <STRONG>tic</STRONG>,
+
+       <STRONG>o</STRONG>   <STRONG>tac</STRONG> (now <STRONG>tack</STRONG>),
+
+       <STRONG>o</STRONG>   <STRONG>toe</STRONG>.
+
+
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        When  not  sorting with the <STRONG>-s</STRONG> option, the <STRONG>-a</STRONG> option reports all of the
        names found in all of the terminal database directories  named  in  the
@@ -159,36 +182,13 @@ <H1 class="no-header">toe 1m 2023-10-21 ncurses 6.4 User commands</H1>
            ...
 
 
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <EM>/usr/share/terminfo</EM>
-              compiled terminal description database
-
-
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <STRONG>toe</STRONG> is not provided by other implementations.  There is  no  applicable
-       X/Open or POSIX standard for it.
-
-       It  replaces  a  <STRONG>-T</STRONG>  option  that  was briefly supported by the <EM>ncurses</EM>
-       <STRONG>infocmp</STRONG> utility in 1995.
-
-       The <STRONG>-a</STRONG> and <STRONG>-s</STRONG> options were added in 2006 and 2011, respectively.
-
-       The program's name originates with a developer's pun:
-
-       <STRONG>o</STRONG>   <STRONG>tic</STRONG>,
-
-       <STRONG>o</STRONG>   <STRONG>tac</STRONG> (now <STRONG>tack</STRONG>),
-
-       <STRONG>o</STRONG>   <STRONG>toe</STRONG>.
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-21                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -196,9 +196,9 @@ <H1 class="no-header">toe 1m 2023-10-21 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-OPTIONS">OPTIONS</a></li>
-<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 7a732a525..1d3577c0a 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.87 2023/10/14 19:29:06 tom Exp @
+  * @Id: tput.1,v 1.89 2023/11/25 14:32:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -52,11 +52,11 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] <EM>capname</EM> [<EM>parameters</EM>]
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] <STRONG>init</STRONG>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] <STRONG>reset</STRONG>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG><EM>type</EM>] <STRONG>longname</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <EM>capname</EM> [<EM>parameters</EM>]
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>init</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>reset</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>longname</STRONG>
        <STRONG>tput</STRONG> <STRONG>-S</STRONG>  <STRONG>&lt;&lt;</STRONG>
        <STRONG>tput</STRONG> <STRONG>-V</STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 
        Before  using  a value returned on the standard output, the application
        should test the exit code (e.g., <STRONG>$?</STRONG>, see <STRONG>sh(1)</STRONG>) to be  sure  it  is  <STRONG>0</STRONG>.
-       (See  the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> and <STRONG>DIAGNOSTICS</STRONG> sections.)  For a complete list of
+       (See the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> and <STRONG>DIAGNOSTICS</STRONG> sections.)  For a complete list of
        capabilities and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
@@ -92,8 +92,8 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
               capabilities  must  be  passed  to  <STRONG>tput</STRONG> from the standard input
               instead of from  the  command  line  (see  example).   Only  one
               <EM>capname</EM>  is allowed per line.  The <STRONG>-S</STRONG> option changes the meaning
-              of the <STRONG>0</STRONG> and <STRONG>1</STRONG> boolean and string exit codes (see the EXIT CODES
-              section).
+              of the <STRONG>0</STRONG> and <STRONG>1</STRONG> boolean and  string  exit  codes  (see  the  EXIT
+              STATUS section).
 
               Because  some capabilities may use <EM>string</EM> parameters rather than
               <EM>numbers</EM>, <STRONG>tput</STRONG> uses a table and the presence of parameters in its
@@ -108,34 +108,33 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>-V</STRONG>     reports  the  version of ncurses which was used in this program,
               and exits.
 
-       <STRONG>-x</STRONG>     do not attempt to clear the terminal's scrollback  buffer  using
-              the extended "E3" capability.
+       <STRONG>-x</STRONG>     prevents <STRONG>tput</STRONG> from attempting to clear the scrollback buffer.
 
 
 </PRE><H3><a name="h3-Commands">Commands</a></H3><PRE>
        A few commands (<STRONG>init</STRONG>, <STRONG>reset</STRONG> and <STRONG>longname</STRONG>) are special; they are defined
        by the <STRONG>tput</STRONG> program.  The others are the names of <EM>capabilities</EM> from the
-       terminal  database  (see  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  a list).  Although <STRONG>init</STRONG> and
-       <STRONG>reset</STRONG> resemble capability names,  <STRONG>tput</STRONG>  uses  several  capabilities  to
+       terminal database (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for  a  list).   Although  <STRONG>init</STRONG>  and
+       <STRONG>reset</STRONG>  resemble  capability  names,  <STRONG>tput</STRONG>  uses several capabilities to
        perform these special functions.
 
        <EM>capname</EM>
               indicates the capability from the terminal database.
 
-              If  the  capability  is  a  string  that  takes  parameters, the
-              arguments following the capability will be  used  as  parameters
+              If the  capability  is  a  string  that  takes  parameters,  the
+              arguments  following  the  capability will be used as parameters
               for the string.
 
-              Most  parameters  are numbers.  Only a few terminal capabilities
-              require string parameters; <STRONG>tput</STRONG> uses a table to decide which  to
-              pass  as  strings.   Normally <STRONG>tput</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> to perform the
-              substitution.  If no parameters are given  for  the  capability,
+              Most parameters are numbers.  Only a few  terminal  capabilities
+              require  string parameters; <STRONG>tput</STRONG> uses a table to decide which to
+              pass as strings.  Normally <STRONG>tput</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  to  perform  the
+              substitution.   If  no  parameters are given for the capability,
               <STRONG>tput</STRONG> writes the string without performing the substitution.
 
-       <STRONG>init</STRONG>   If  the terminal database is present and an entry for the user's
+       <STRONG>init</STRONG>   If the terminal database is present and an entry for the  user's
               terminal exists (see <STRONG>-T</STRONG><EM>type</EM>, above), the following will occur:
 
-              (1)  first, <STRONG>tput</STRONG> retrieves the current  terminal  mode  settings
+              (1)  first,  <STRONG>tput</STRONG>  retrieves  the current terminal mode settings
                    for your terminal.  It does this by successively testing
 
                    <STRONG>o</STRONG>   the standard error,
@@ -146,33 +145,33 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 
                    <STRONG>o</STRONG>   ultimately "/dev/tty"
 
-                   to   obtain  terminal  settings.   Having  retrieved  these
-                   settings, <STRONG>tput</STRONG> remembers which file descriptor to use  when
+                   to  obtain  terminal  settings.   Having  retrieved   these
+                   settings,  <STRONG>tput</STRONG> remembers which file descriptor to use when
                    updating settings.
 
-              (2)  if  the  window  size cannot be obtained from the operating
+              (2)  if the window size cannot be obtained  from  the  operating
                    system, but the terminal description (or environment, e.g.,
-                   <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>  variables  specify  this),  update the
+                   <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  variables  specify  this),  update  the
                    operating system's notion of the window size.
 
               (3)  the terminal modes will be updated:
 
-                   <STRONG>o</STRONG>   any delays (e.g., newline) specified in the entry  will
+                   <STRONG>o</STRONG>   any  delays (e.g., newline) specified in the entry will
                        be set in the tty driver,
 
-                   <STRONG>o</STRONG>   tabs  expansion  will  be turned on or off according to
+                   <STRONG>o</STRONG>   tabs expansion will be turned on or  off  according  to
                        the specification in the entry, and
 
-                   <STRONG>o</STRONG>   if tabs are not expanded, standard  tabs  will  be  set
+                   <STRONG>o</STRONG>   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 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> section on  <EM>Tabs</EM>  <EM>and</EM>
+              (4)  if present, the terminal's initialization strings  will  be
+                   output  as  detailed in the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> section on <EM>Tabs</EM> <EM>and</EM>
                    <EM>Initialization</EM>,
 
               (5)  output is flushed.
 
-              If  an  entry does not contain the information needed for any of
+              If an entry does not contain the information needed for  any  of
               these activities, that activity will silently be skipped.
 
        <STRONG>reset</STRONG>  This is similar to <STRONG>init</STRONG>, with two differences:
@@ -186,154 +185,88 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 
                    <STRONG>o</STRONG>   turn on newline translation and
 
-                   <STRONG>o</STRONG>   reset  any  unset  special  characters to their default
+                   <STRONG>o</STRONG>   reset any unset special  characters  to  their  default
                        values
 
-              (2)  Instead  of  putting  out   <EM>initialization</EM>   strings,   the
-                   terminal's  <EM>reset</EM>  strings  will be output if present (<STRONG>rs1</STRONG>,
-                   <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, <STRONG>rf</STRONG>).  If the <EM>reset</EM> strings are not  present,  but
+              (2)  Instead   of   putting   out  <EM>initialization</EM>  strings,  the
+                   terminal's <EM>reset</EM> strings will be output  if  present  (<STRONG>rs1</STRONG>,
+                   <STRONG>rs2</STRONG>,  <STRONG>rs3</STRONG>,  <STRONG>rf</STRONG>).  If the <EM>reset</EM> strings are not present, but
                    <EM>initialization</EM> strings are, the <EM>initialization</EM> strings will
                    be output.
 
               Otherwise, <STRONG>reset</STRONG> acts identically to <STRONG>init</STRONG>.
 
        <STRONG>longname</STRONG>
-              If the terminal database is present and an entry for the  user's
-              terminal  exists  (see  <STRONG>-T</STRONG><EM>type</EM> above), then the long name of the
+              If  the terminal database is present and an entry for the user's
+              terminal exists (see <STRONG>-T</STRONG><EM>type</EM> 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  <STRONG>terminfo</STRONG>
               database [see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>].
 
 
 </PRE><H3><a name="h3-Aliases">Aliases</a></H3><PRE>
-       <STRONG>tput</STRONG> handles the <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG> commands  specially:  it  allows
+       <STRONG>tput</STRONG>  handles  the  <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG> commands specially: it allows
        for the possibility that it is invoked by a link with those names.
 
-       If  <STRONG>tput</STRONG>  is invoked by a link named <STRONG>reset</STRONG>, this has the same effect as
-       <STRONG>tput</STRONG> <STRONG>reset</STRONG>.  The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link  named  <STRONG>reset</STRONG>
+       If <STRONG>tput</STRONG> is invoked by a link named <STRONG>reset</STRONG>, this has the same  effect  as
+       <STRONG>tput</STRONG>  <STRONG>reset</STRONG>.   The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link named <STRONG>reset</STRONG>
        specially.
 
        Before ncurses 6.1, the two utilities were different from each other:
 
-       <STRONG>o</STRONG>   <STRONG>tset</STRONG>  utility  reset the terminal modes and special characters (not
+       <STRONG>o</STRONG>   <STRONG>tset</STRONG> utility reset the terminal modes and special  characters  (not
            done with <STRONG>tput</STRONG>).
 
-       <STRONG>o</STRONG>   On the other hand, <STRONG>tset</STRONG>'s repertoire of terminal  capabilities  for
-           resetting  the terminal was more limited, i.e., only <STRONG>reset_1string</STRONG>,
-           <STRONG>reset_2string</STRONG> and <STRONG>reset_file</STRONG>  in  contrast  to  the  tab-stops  and
+       <STRONG>o</STRONG>   On  the  other hand, <STRONG>tset</STRONG>'s repertoire of terminal capabilities for
+           resetting the terminal was more limited, i.e., only  <STRONG>reset_1string</STRONG>,
+           <STRONG>reset_2string</STRONG>  and  <STRONG>reset_file</STRONG>  in  contrast  to  the tab-stops and
            margins which are set by this utility.
 
-       <STRONG>o</STRONG>   The  <STRONG>reset</STRONG>  program  is  usually an alias for <STRONG>tset</STRONG>, because of this
+       <STRONG>o</STRONG>   The <STRONG>reset</STRONG> program is usually an alias for  <STRONG>tset</STRONG>,  because  of  this
            difference with resetting terminal modes and special characters.
 
-       With the changes made for ncurses 6.1, the <EM>reset</EM>  feature  of  the  two
+       With  the  changes  made  for ncurses 6.1, the <EM>reset</EM> feature of the two
        programs is (mostly) the same.  A few differences remain:
 
-       <STRONG>o</STRONG>   The  <STRONG>tset</STRONG>  program  waits  one  second  when  resetting, in case it
+       <STRONG>o</STRONG>   The <STRONG>tset</STRONG> program waits  one  second  when  resetting,  in  case  it
            happens to be a hardware terminal.
 
-       <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
-           different  streams  (i.e.,  the  standard  error  for  <STRONG>tset</STRONG> and the
+       <STRONG>o</STRONG>   The  two  programs  write  the  terminal  initialization strings to
+           different streams (i.e.,  the  standard  error  for  <STRONG>tset</STRONG>  and  the
            standard output for <STRONG>tput</STRONG>).
 
-           <STRONG>Note:</STRONG>  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
+           <STRONG>Note:</STRONG>   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.
 
-       If  <STRONG>tput</STRONG>  is  invoked by a link named <STRONG>init</STRONG>, this has the same effect as
+       If <STRONG>tput</STRONG> is invoked by a link named <STRONG>init</STRONG>, this has the  same  effect  as
        <STRONG>tput</STRONG> <STRONG>init</STRONG>.  Again, you are less likely to use that link because another
        program named <STRONG>init</STRONG> has a more well-established use.
 
 
 </PRE><H3><a name="h3-Terminal-Size">Terminal Size</a></H3><PRE>
        Besides  the  special  commands  (e.g.,  <STRONG>clear</STRONG>),  tput  treats  certain
-       terminfo  capabilities  specially:  <STRONG>lines</STRONG>   and   <STRONG>cols</STRONG>.    tput   calls
+       terminfo   capabilities   specially:   <STRONG>lines</STRONG>   and  <STRONG>cols</STRONG>.   tput  calls
        <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to obtain the terminal size:
 
        <STRONG>o</STRONG>   first, it gets the size from the terminal database (which generally
-           is not provided for terminal emulators which do not  have  a  fixed
+           is  not  provided  for terminal emulators which do not have a fixed
            window size)
 
-       <STRONG>o</STRONG>   then  it  asks  the operating system for the terminal's size (which
+       <STRONG>o</STRONG>   then it asks the operating system for the  terminal's  size  (which
            generally works, unless connecting via a serial line which does not
            support <EM>NAWS</EM>: negotiations about window size).
 
-       <STRONG>o</STRONG>   finally,  it  inspects  the environment variables <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG>
+       <STRONG>o</STRONG>   finally, it inspects the environment variables  <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>
            which may override the terminal size.
 
-       If the <STRONG>-T</STRONG> option is given tput ignores  the  environment  variables  by
-       calling   <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system  (or
+       If  the  <STRONG>-T</STRONG>  option  is given tput ignores the environment variables by
+       calling  <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system   (or
        finally, the terminal database).
 
 
-</PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
-       <STRONG>tput</STRONG> <STRONG>init</STRONG>
-            Initialize the terminal according to the type of terminal  in  the
-            environmental  variable  <STRONG>TERM</STRONG>.  This command should be included in
-            everyone's .profile after the environmental variable <STRONG>TERM</STRONG> has been
-            exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
-
-       <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
-            Reset  an  AT&amp;T  5620 terminal, overriding the type of terminal in
-            the environmental variable <STRONG>TERM</STRONG>.
-
-       <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
-            Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
-            left  corner  of  the  screen,  usually known as the "home" cursor
-            position).
-
-       <STRONG>tput</STRONG> <STRONG>clear</STRONG>
-            Echo the clear-screen sequence for the current terminal.
-
-       <STRONG>tput</STRONG> <STRONG>cols</STRONG>
-            Print the number of columns for the current terminal.
-
-       <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>cols</STRONG>
-            Print the number of columns for the 450 terminal.
-
-       <STRONG>bold=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>offbold=`tput</STRONG> <STRONG>rmso`</STRONG>
-            Set the shell variables <STRONG>bold</STRONG>, to begin  stand-out  mode  sequence,
-            and  <STRONG>offbold</STRONG>,  to  end  standout  mode  sequence,  for the current
-            terminal.  This might be followed by a prompt: <STRONG>echo</STRONG> <STRONG>"${bold}Please</STRONG>
-            <STRONG>type</STRONG> <STRONG>in</STRONG> <STRONG>your</STRONG> <STRONG>name:</STRONG> <STRONG>${offbold}\c"</STRONG>
-
-       <STRONG>tput</STRONG> <STRONG>hc</STRONG>
-            Set  exit  code to indicate if the current terminal is a hard copy
-            terminal.
-
-       <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
-            Send the sequence to move the cursor to row 23, column 4.
-
-       <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-            Send the terminfo string for cursor-movement, with  no  parameters
-            substituted.
-
-       <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-            Print  the  long  name  from the <STRONG>terminfo</STRONG> database for the type of
-            terminal specified in the environmental variable <STRONG>TERM</STRONG>.
-
-            <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>clear</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>bold</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>!</STRONG>
-
-            This example shows <STRONG>tput</STRONG> processing  several  capabilities  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 (<STRONG>!</STRONG>) on a line by itself.
-
-
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <EM>/usr/share/tabset</EM>
-              tab stop initialization database
-
-       <EM>/usr/share/terminfo</EM>
-              compiled terminal description database
-
-
-</PRE><H2><a name="h2-EXIT-CODES">EXIT CODES</a></H2><PRE>
+</PRE><H2><a name="h2-EXIT-STATUS">EXIT STATUS</a></H2><PRE>
        If the <STRONG>-S</STRONG> option is used, <STRONG>tput</STRONG> 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 <STRONG>0</STRONG>.  No
@@ -368,78 +301,43 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
        exit codes.
 
        exit code   error message
-       ---------------------------------------------------------------------
-       <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not specified  in
-                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for this terminal type, e.g.
+       ----------------------------------------------------------------------
+       <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not  specified  in
+                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for  this terminal type, e.g.
                    <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
-       <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> section.
+       <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> section.
        <STRONG>2</STRONG>           usage error
        <STRONG>3</STRONG>           unknown terminal <EM>type</EM> or no <STRONG>terminfo</STRONG> database
        <STRONG>4</STRONG>           unknown <STRONG>terminfo</STRONG> capability <EM>capname</EM>
        <STRONG>&gt;4</STRONG>          error occurred in -S
-       ---------------------------------------------------------------------
-
-
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
-       only cleared the screen.
-
-       AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
-
-       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
-           against each predefined capability and returned  the  corresponding
-           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
-           capabilities which are parameterized.
-
-       <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
-           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
-           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
-           Allman.
-
-       <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
-           capabilities in the <STRONG>init</STRONG> subcommand.
-
-       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
-       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
-       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
-       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
-       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
-       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
-       modes as the earlier BSD <STRONG>tset</STRONG> had done.
+       ----------------------------------------------------------------------
 
-       At the same time, Bostic added a shell script named "clear", which used
-       <STRONG>tput</STRONG> to clear the screen.
 
-       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
-       implementation of <STRONG>tput</STRONG>.
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/tabset</EM>
+              tab stop initialization database
 
-       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
-       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
-       December 1992.  Ridge's program made  more  sophisticated  use  of  the
-       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
-       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  ncurses  in  June  1995.
-       Using  the  portions  dealing with terminal capabilities almost without
-       change,  Raymond  made  improvements  to  the  way   the   command-line
-       parameters were handled.
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  implementation  of  <STRONG>tput</STRONG>  differs from AT&amp;T <STRONG>tput</STRONG> in two important
+       This implementation of <STRONG>tput</STRONG> differs from AT&amp;T  <STRONG>tput</STRONG>  in  two  important
        areas:
 
-       <STRONG>o</STRONG>   <STRONG>tput</STRONG> <EM>capname</EM> writes to the standard output.  That  need  not  be  a
-           regular   terminal.   However,  the  subcommands  which  manipulate
+       <STRONG>o</STRONG>   <STRONG>tput</STRONG>  <EM>capname</EM>  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.
 
-           The AT&amp;T implementation's <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands  use  the  BSD
-           (4.1c)   <STRONG>tset</STRONG>   source,   which  manipulates  terminal  modes.   It
-           successively tries standard output, standard error, standard  input
+           The  AT&amp;T  implementation's  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands use the BSD
+           (4.1c)  <STRONG>tset</STRONG>  source,  which  manipulates   terminal   modes.    It
+           successively  tries standard output, standard 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, <STRONG>tput</STRONG> did not modify  terminal
+           Until  changes made after ncurses 6.0, <STRONG>tput</STRONG> did not modify terminal
            modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
-           <STRONG>tset</STRONG> (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not  able
+           <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
            to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
            an error.
 
@@ -447,104 +345,205 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
            of the characters are numeric, or not.
 
            Most implementations which provide support for <EM>capname</EM> operands use
-           the <STRONG>tparm</STRONG> function to  expand  parameters  in  it.   That  function
-           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
+           the  <STRONG>tparm</STRONG>  function  to  expand  parameters  in it.  That function
+           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
            to know which type to use.
 
-           This implementation uses a table to determine the  parameter  types
+           This  implementation  uses a table to determine the parameter types
            for the standard <EM>capname</EM> operands, and an internal library function
            to analyze nonstandard <EM>capname</EM> operands.
 
-           Besides providing more reliable operation than  AT&amp;T's  utility,  a
-           portability  problem  is  introduced  by  this analysis: An OpenBSD
-           developer adapted the internal library  function  from  ncurses  to
-           port  NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had been
-           modified to  interpret  multiple  commands  on  a  line.   Portable
+           Besides  providing  more  reliable operation than AT&amp;T's utility, a
+           portability problem is introduced  by  this  analysis:  An  OpenBSD
+           developer  adapted  the  internal  library function from ncurses to
+           port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
+           modified  to  interpret  multiple  commands  on  a  line.  Portable
            applications should not rely upon this feature; ncurses provides it
            to support applications written specifically for OpenBSD.
 
        This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
-       <EM>terminfo</EM>  names for the <EM>capname</EM> feature, if <EM>termcap</EM> support is compiled
-       in.  However, the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names  have  two
+       <EM>terminfo</EM> names for the <EM>capname</EM> feature, if <EM>termcap</EM> support is  compiled
+       in.   However,  the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names have two
        ambiguities in this case (and the <EM>terminfo</EM> name is assumed):
 
-       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM> name <STRONG>dl1</STRONG> (delete
+       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM>  name  <STRONG>dl1</STRONG>  (delete
            one line).
-           The <EM>terminfo</EM> name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG>  (delete  a
+           The  <EM>terminfo</EM>  name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG> (delete a
            given number of lines).
 
-       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>ed</STRONG>  corresponds  to the <EM>terminfo</EM> name <STRONG>rmdc</STRONG> (end
+       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>ed</STRONG> corresponds to  the  <EM>terminfo</EM>  name  <STRONG>rmdc</STRONG>  (end
            delete mode).
-           The <EM>terminfo</EM> name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG>  (clear  to
+           The  <EM>terminfo</EM>  name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG> (clear to
            end of screen).
 
-       The  <STRONG>longname</STRONG>  and  <STRONG>-S</STRONG> options, and the parameter-substitution features
-       used in the <STRONG>cup</STRONG> example,  were  not  supported  in  BSD  curses  before
+       The <STRONG>longname</STRONG> and <STRONG>-S</STRONG> options, and  the  parameter-substitution  features
+       used  in  the  <STRONG>cup</STRONG>  example,  were  not  supported in BSD curses before
        4.3reno (1989) or in AT&amp;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 <STRONG>clear</STRONG>, <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>.
+       IEEE  Std  1003.1/The  Open  Group    Base   Specifications   Issue   7
+       (POSIX.1-2008)  documents  only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG>.
        There are a few interesting observations to make regarding that:
 
-       <STRONG>o</STRONG>   In  this implementation, <STRONG>clear</STRONG> is part of the <EM>capname</EM> support.  The
-           others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
+       <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>capname</EM> support.   The
+           others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
            capabilities.
 
        <STRONG>o</STRONG>   Other  implementations  of  <STRONG>tput</STRONG>  on  SVr4-based  systems  such  as
-           Solaris, IRIX64 and HPUX as well as others such as  AIX  and  Tru64
+           Solaris,  IRIX64  and HP-UX as well as others such as AIX and Tru64
            provide support for <EM>capname</EM> operands.
 
        <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize termcap names rather than
            terminfo capability names in their respective <STRONG>tput</STRONG> commands.  Since
-           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  terminfo names.  Before that, it (like
+           2010, NetBSD's <STRONG>tput</STRONG> uses terminfo names.   Before  that,  it  (like
            FreeBSD) recognized termcap names.
 
-           Beginning in 2021, FreeBSD uses the ncurses  <STRONG>tput</STRONG>,  configured  for
+           Beginning  in  2021,  FreeBSD uses the ncurses <STRONG>tput</STRONG>, configured for
            both terminfo (tested first) and termcap (as a fallback).
 
        Because (apparently) <EM>all</EM> of the certified Unix systems support the full
-       set of capability names, the reasoning for documenting only a  few  may
+       set  of  capability names, the reasoning for documenting only a few may
        not be apparent.
 
-       <STRONG>o</STRONG>   X/Open  Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>capname</EM> and
+       <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>capname</EM>  and
            the other features used in this implementation.
 
-       <STRONG>o</STRONG>   That is, there are two standards for <STRONG>tput</STRONG>:  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
+       <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: 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.
 
-       <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <STRONG>tput</STRONG> program without
-           using  curses,  none  of  the   systems   which   have   a   curses
-           implementation  provide  a  <STRONG>tput</STRONG> utility which does not provide the
+       <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
+           using   curses,   none   of   the   systems  which  have  a  curses
+           implementation provide a <STRONG>tput</STRONG> utility which does  not  provide  the
            <EM>capname</EM> feature.
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (i.e., Unix features documented in SVID 3):
 
-       <STRONG>o</STRONG>   It assigns exit code 4 to "invalid operand", which may be the  same
-           as  <EM>unknown</EM> <EM>capability</EM>.  For instance, the source code for Solaris'
+       <STRONG>o</STRONG>   It  assigns exit code 4 to "invalid operand", which may be the same
+           as <EM>unknown</EM> <EM>capability</EM>.  For instance, the source code for  Solaris'
            xcurses uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It assigns exit  code  255  to  a  numeric  variable  that  is  not
+       <STRONG>o</STRONG>   It  assigns  exit  code  255  to  a  numeric  variable  that is not
            specified in the terminfo database.  That likely is a documentation
-           error, confusing the <STRONG>-1</STRONG> written  to  the  standard  output  for  an
+           error,  confusing  the  <STRONG>-1</STRONG>  written  to  the standard output for an
            absent or cancelled numeric value versus an (unsigned) exit code.
 
-       The  various  Unix systems (AIX, HPUX, Solaris) use the same exit-codes
+       The various Unix systems (AIX, HP-UX, Solaris) use the same  exit-codes
        as ncurses.
 
        NetBSD curses documents different exit codes which do not correspond to
        either ncurses or X/Open.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
+       only cleared the screen.
+
+       AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
+
+       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
+           against each predefined capability and returned  the  corresponding
+           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
+           capabilities which are parameterized.
+
+       <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
+           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
+           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
+           Allman.
+
+       <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
+           capabilities in the <STRONG>init</STRONG> subcommand.
+
+       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
+       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
+       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
+       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
+       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
+       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
+       modes as the earlier BSD <STRONG>tset</STRONG> had done.
+
+       At the same time, Bostic added a shell script named "clear", which used
+       <STRONG>tput</STRONG> to clear the screen.
+
+       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
+       implementation of <STRONG>tput</STRONG>.
+
+       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
+       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
+       December 1992.  Ridge's program made  more  sophisticated  use  of  the
+       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
+       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  ncurses  in  June  1995.
+       Using  the  portions  dealing with terminal capabilities almost without
+       change,  Raymond  made  improvements  to  the  way   the   command-line
+       parameters were handled.
+
+
+</PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
+       <STRONG>tput</STRONG> <STRONG>init</STRONG>
+            Initialize  the  terminal according to the type of terminal in the
+            environmental variable <STRONG>TERM</STRONG>.  This command should be  included  in
+            everyone's .profile after the environmental variable <STRONG>TERM</STRONG> has been
+            exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
+
+       <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
+            Reset an AT&amp;T 5620 terminal, overriding the type  of  terminal  in
+            the environmental variable <STRONG>TERM</STRONG>.
+
+       <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
+            Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
+            left corner of the screen, usually  known  as  the  "home"  cursor
+            position).
+
+       <STRONG>tput</STRONG> <STRONG>clear</STRONG>
+            Echo the clear-screen sequence for the current terminal.
+
+       <STRONG>tput</STRONG> <STRONG>cols</STRONG>
+            Print the number of columns for the current terminal.
+
+       <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>cols</STRONG>
+            Print the number of columns for the 450 terminal.
+
+       <STRONG>bold=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>offbold=`tput</STRONG> <STRONG>rmso`</STRONG>
+            Set  the  shell  variables <STRONG>bold</STRONG>, to begin stand-out mode sequence,
+            and <STRONG>offbold</STRONG>, to  end  standout  mode  sequence,  for  the  current
+            terminal.  This might be followed by a prompt: <STRONG>echo</STRONG> <STRONG>"${bold}Please</STRONG>
+            <STRONG>type</STRONG> <STRONG>in</STRONG> <STRONG>your</STRONG> <STRONG>name:</STRONG> <STRONG>${offbold}\c"</STRONG>
+
+       <STRONG>tput</STRONG> <STRONG>hc</STRONG>
+            Set exit code to indicate if the current terminal is a  hard  copy
+            terminal.
+
+       <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
+            Send the sequence to move the cursor to row 23, column 4.
+
+       <STRONG>tput</STRONG> <STRONG>cup</STRONG>
+            Send  the  terminfo string for cursor-movement, with no parameters
+            substituted.
+
+       <STRONG>tput</STRONG> <STRONG>longname</STRONG>
+            Print the long name from the <STRONG>terminfo</STRONG> database  for  the  type  of
+            terminal specified in the environmental variable <STRONG>TERM</STRONG>.
+
+            <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
+            <STRONG>&gt;</STRONG> <STRONG>clear</STRONG>
+            <STRONG>&gt;</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
+            <STRONG>&gt;</STRONG> <STRONG>bold</STRONG>
+            <STRONG>&gt;</STRONG> <STRONG>!</STRONG>
+
+            This  example  shows  <STRONG>tput</STRONG>  processing several capabilities 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 (<STRONG>!</STRONG>) on a line by itself.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -558,12 +557,12 @@ <H1 class="no-header">tput 1 2023-10-14 ncurses 6.4 User commands</H1>
 <li><a href="#h3-Terminal-Size">Terminal Size</a></li>
 </ul>
 </li>
-<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
-<li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-EXIT-CODES">EXIT CODES</a></li>
+<li><a href="#h2-EXIT-STATUS">EXIT STATUS</a></li>
 <li><a href="#h2-DIAGNOSTICS">DIAGNOSTICS</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
+<li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 8d63ebc9c..110c16286 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,28 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.73 2023/10/14 19:24:28 tom Exp @
+  * @Id: tset.1,v 1.75 2023/11/25 14:32:36 tom Exp @
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+  *   reset.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/tset.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+  *   tset/tset.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2.9BSD/usr/src/ucb/\
+  *   tset/tset.c
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-10-14 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-11-25 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -51,8 +60,10 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tset</STRONG> [<STRONG>-IQVcqrsw</STRONG>] [<STRONG>-</STRONG>] [<STRONG>-e</STRONG> <EM>ch</EM>] [<STRONG>-i</STRONG> <EM>ch</EM>] [<STRONG>-k</STRONG> <EM>ch</EM>] [<STRONG>-m</STRONG> <EM>mapping</EM>] [<EM>terminal</EM>]
-       <STRONG>reset</STRONG> [<STRONG>-IQVcqrsw</STRONG>] [<STRONG>-</STRONG>] [<STRONG>-e</STRONG> <EM>ch</EM>] [<STRONG>-i</STRONG> <EM>ch</EM>] [<STRONG>-k</STRONG> <EM>ch</EM>] [<STRONG>-m</STRONG> <EM>mapping</EM>] [<EM>terminal</EM>]
+       <STRONG>tset</STRONG>  [<STRONG>-IQVcqrsw</STRONG>]  [<STRONG>-</STRONG>]  [<STRONG>-e</STRONG> <EM>ch</EM>] [<STRONG>-i</STRONG> <EM>ch</EM>] [<STRONG>-k</STRONG> <EM>ch</EM>] [<STRONG>-m</STRONG> <EM>mapping</EM>] [<EM>terminal-</EM>
+       <EM>type</EM>]
+       <STRONG>reset</STRONG> [<STRONG>-IQVcqrsw</STRONG>] [<STRONG>-</STRONG>] [<STRONG>-e</STRONG> <EM>ch</EM>] [<STRONG>-i</STRONG> <EM>ch</EM>] [<STRONG>-k</STRONG> <EM>ch</EM>] [<STRONG>-m</STRONG>  <EM>mapping</EM>]  [<EM>terminal-</EM>
+       <EM>type</EM>]
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -82,7 +93,7 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        2. The value of the <STRONG>TERM</STRONG> environmental variable.
 
        3. (BSD systems only.) The terminal type associated with  the  standard
-       error  output  device  in the <EM>/etc/ttys</EM> file.  (On System-V-like UNIXes
+       error  output  device  in the <EM>/etc/ttys</EM> file.  (On System-V-like Unices
        and systems using that convention, <STRONG>getty(1)</STRONG> does this  job  by  setting
        <STRONG>TERM</STRONG> according to the type passed to it by <EM>/etc/inittab</EM>.)
 
@@ -90,14 +101,14 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        applications.
 
        If the terminal type was not specified  on  the  command-line,  the  <STRONG>-m</STRONG>
-       option mappings are then applied (see the section <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG>
-       for more information).  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 terminal description for the terminal is retrieved.  If
-       no terminal description is found for the type, the user is prompted for
-       another terminal type.
+       option  mappings  are  then  applied;  see  subsection  "Terminal  Type
+       Mapping".  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
+       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,
 
@@ -150,6 +161,71 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>o</STRONG>   Also, the terminal will often not echo the command.
 
 
+</PRE><H3><a name="h3-Setting-the-Environment">Setting the Environment</a></H3><PRE>
+       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 <STRONG>-s</STRONG> option.
+
+       When the <STRONG>-s</STRONG> option is specified, the commands to enter the  information
+       into  the  shell's  environment are written to the standard output.  If
+       the <STRONG>SHELL</STRONG> environmental variable ends in "csh", the  commands  are  for
+       <STRONG>csh</STRONG>,  otherwise,  they  are  for <STRONG>sh(1)</STRONG>.  Note, the <STRONG>csh</STRONG> commands set and
+       unset the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following  line
+       in  the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the environment
+       correctly:
+
+           eval `tset -s options ... `
+
+
+</PRE><H3><a name="h3-Terminal-Type-Mapping">Terminal Type Mapping</a></H3><PRE>
+       When the terminal is not hardwired into  the  system  (or  the  current
+       system  information  is  incorrect)  the terminal type derived from the
+       <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental variable  is  often  something
+       generic  like  <STRONG>network</STRONG>,  <STRONG>dialup</STRONG>,  or  <STRONG>unknown</STRONG>.   When <STRONG>tset</STRONG> is used in a
+       startup script it is often desirable to provide information  about  the
+       type of terminal used on such ports.
+
+       The  <STRONG>-m</STRONG>  options  maps  from some set of conditions to a terminal type,
+       that is, to tell <STRONG>tset</STRONG> "If I'm on this port at a particular speed, guess
+       that I'm on that kind of terminal".
+
+       The  argument  to  the  <STRONG>-m</STRONG> option consists of an optional port type, an
+       optional operator, an optional baud  rate  specification,  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 "&gt;", "&lt;", "@", and "!"; "&gt;" means
+       greater than, "&lt;" 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 terminal type is a string.
+
+       If  the  terminal  type  is  not  specified on the command line, the <STRONG>-m</STRONG>
+       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 applicable mapping is used.
+
+       For  example,  consider  the following mapping: <STRONG>dialup&gt;9600:vt100</STRONG>.  The
+       port type is dialup , the operator is &gt;, the baud rate specification is
+       9600, and the terminal type is vt100.  The result of this mapping is to
+       specify that if the terminal type is  <STRONG>dialup</STRONG>,  and  the  baud  rate  is
+       greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> 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,  <STRONG>-m</STRONG>  <STRONG>dialup:vt100</STRONG> <STRONG>-m</STRONG> <STRONG>:?xterm</STRONG> 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 are actually using an xterm terminal.
+
+       No  whitespace  characters  are  permitted  in  the <STRONG>-m</STRONG> option argument.
+       Also, to avoid problems with meta-characters, it is suggested that  the
+       entire <STRONG>-m</STRONG> option argument be placed within single quote characters, and
+       that  <STRONG>csh</STRONG>  users  insert  a  backslash  character  ("\")   before   any
+       exclamation marks ("!").
+
+
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
        The options are as follows:
 
@@ -158,7 +234,7 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>-e</STRONG> <EM>ch</EM>
             Set the erase character to <EM>ch</EM>.
 
-       <STRONG>-I</STRONG>   Do not send the terminal or  tab  initialization  strings  to  the
+       <STRONG>-I</STRONG>   Do  not  send  the  terminal  or tab initialization strings to the
             terminal.
 
        <STRONG>-i</STRONG> <EM>ch</EM>
@@ -168,131 +244,68 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
             Set the line kill character to <EM>ch</EM>.
 
        <STRONG>-m</STRONG> <EM>mapping</EM>
-            Specify a mapping from a port type to a terminal.  See the section
-            <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG> for more information.
+            Specify a mapping from a port type to a terminal;  see  subsection
+            "Terminal Type Mapping".
 
-       <STRONG>-Q</STRONG>   Do not display any values for the erase, interrupt and  line  kill
-            characters.    Normally  <STRONG>tset</STRONG>  displays  the  values  for  control
+       <STRONG>-Q</STRONG>   Do  not  display any values for the erase, interrupt and line kill
+            characters.   Normally  <STRONG>tset</STRONG>  displays  the  values  for   control
             characters which differ from the system's default values.
 
-       <STRONG>-q</STRONG>   The terminal type is displayed to the  standard  output,  and  the
-            terminal  is not initialized in any way.  The option "-" by itself
+       <STRONG>-q</STRONG>   The  terminal  type  is  displayed to the standard output, and the
+            terminal is not initialized in any way.  The option "-" by  itself
             is equivalent but archaic.
 
        <STRONG>-r</STRONG>   Print the terminal type to the standard error output.
 
        <STRONG>-s</STRONG>   Print the sequence of shell commands to initialize the environment
-            variable <STRONG>TERM</STRONG> to the standard output.  See the section <STRONG>SETTING</STRONG> <STRONG>THE</STRONG>
-            <STRONG>ENVIRONMENT</STRONG> for details.
+            variable <STRONG>TERM</STRONG> to the standard output; see subsection "Setting  the
+            Environment".
 
        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
             exits.
 
-       <STRONG>-w</STRONG>   Resize  the  window  to  match the size deduced via <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
-            Normally this has no effect,  unless  <STRONG>setupterm</STRONG>  is  not  able  to
+       <STRONG>-w</STRONG>   Resize the window to match the  size  deduced  via  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
+            Normally  this  has  no  effect,  unless  <STRONG>setupterm</STRONG> is not able to
             detect the window size.
 
-       The  arguments  for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be entered as
-       actual characters or by using the "hat" notation, i.e.,  control-h  may
+       The arguments for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be  entered  as
+       actual  characters  or by using the "hat" notation, i.e., control-h may
        be specified as "^H" or "^h".
 
        If neither <STRONG>-c</STRONG> or <STRONG>-w</STRONG> is given, both options are assumed.
 
 
-</PRE><H2><a name="h2-SETTING-THE-ENVIRONMENT">SETTING THE ENVIRONMENT</a></H2><PRE>
-       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 <STRONG>-s</STRONG> option.
-
-       When  the <STRONG>-s</STRONG> option is specified, the commands to enter the information
-       into the shell's environment are written to the  standard  output.   If
-       the  <STRONG>SHELL</STRONG>  environmental  variable ends in "csh", the commands are for
-       <STRONG>csh</STRONG>, otherwise, they are for <STRONG>sh(1)</STRONG>.  Note, the  <STRONG>csh</STRONG>  commands  set  and
-       unset  the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following line
-       in the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the  environment
-       correctly:
-
-           eval `tset -s options ... `
-
-
-</PRE><H2><a name="h2-TERMINAL-TYPE-MAPPING">TERMINAL TYPE MAPPING</a></H2><PRE>
-       When  the  terminal  is  not  hardwired into the system (or the current
-       system information is incorrect) the terminal  type  derived  from  the
-       <EM>/etc/ttys</EM>  file  or  the <STRONG>TERM</STRONG> environmental variable is often something
-       generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>, or <STRONG>unknown</STRONG>.   When  <STRONG>tset</STRONG>  is  used  in  a
-       startup  script  it is often desirable to provide information about the
-       type of terminal used on such ports.
-
-       The <STRONG>-m</STRONG> options maps from some set of conditions  to  a  terminal  type,
-       that is, to tell <STRONG>tset</STRONG> "If I'm on this port at a particular speed, guess
-       that I'm on that kind of terminal".
-
-       The argument to the <STRONG>-m</STRONG> option consists of an  optional  port  type,  an
-       optional  operator,  an  optional  baud rate specification, 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 "&gt;", "&lt;", "@", and  "!";  "&gt;"  means
-       greater  than,  "&lt;" 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 terminal type is a string.
-
-       If the terminal type is not specified  on  the  command  line,  the  <STRONG>-m</STRONG>
-       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 applicable mapping is used.
-
-       For example, consider the following  mapping:  <STRONG>dialup&gt;9600:vt100</STRONG>.   The
-       port type is dialup , the operator is &gt;, the baud rate specification is
-       9600, and the terminal type is vt100.  The result of this mapping is to
-       specify  that  if  the  terminal  type  is <STRONG>dialup</STRONG>, and the baud rate is
-       greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> 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, <STRONG>-m</STRONG> <STRONG>dialup:vt100</STRONG>  <STRONG>-m</STRONG>  <STRONG>:?xterm</STRONG>  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 are actually using an xterm terminal.
-
-       No whitespace characters are  permitted  in  the  <STRONG>-m</STRONG>  option  argument.
-       Also,  to avoid problems with meta-characters, it is suggested that the
-       entire <STRONG>-m</STRONG> option argument be placed within single quote characters, and
-       that   <STRONG>csh</STRONG>   users  insert  a  backslash  character  ("\")  before  any
-       exclamation marks ("!").
+</PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
+       The <STRONG>tset</STRONG> command uses these environment variables:
 
+       SHELL
+            tells <STRONG>tset</STRONG> whether  to  initialize  <STRONG>TERM</STRONG>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
+            syntax.
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A <STRONG>reset</STRONG> command appeared in 1BSD (March 1978), written by Kurt  Shoens.
-       This  program set the <EM>erase</EM> and <EM>kill</EM> characters to <STRONG>^H</STRONG> (backspace) and <STRONG>@</STRONG>
-       respectively.  Mark Horton improved that in 3BSD (October 1979), adding
-       <EM>intr</EM>,  <EM>quit</EM>,  <EM>start</EM>/<EM>stop</EM>  and  <EM>eof</EM>  characters  as well as changing the
-       program to avoid modifying any user settings.  That  version  of  <STRONG>reset</STRONG>
-       did not use the termcap database.
+       TERM Denotes  your  terminal  type.   Each  terminal  type is distinct,
+            though many are similar.
 
-       A  separate <STRONG>tset</STRONG> command was provided in 1BSD by Eric Allman, using the
-       termcap database.  Allman's comments in the source code  indicate  that
-       he began work in October 1977, continuing development over the next few
-       years.
+       TERMCAP
+            may denote the location of a termcap database.  If it  is  not  an
+            absolute  pathname,  e.g.,  begins  with  a  "/", <STRONG>tset</STRONG> removes the
+            variable from the environment  before  looking  for  the  terminal
+            description.
 
-       According to comments in the source code, the <STRONG>tset</STRONG> program was modified
-       in  September  1980,  to use logic copied from the 3BSD "reset" when it
-       was invoked as <STRONG>reset</STRONG>.  This version appeared in 4.1cBSD, late in 1982.
 
-       Other developers (e.g., Keith Bostic and Jim Bloom) continued to modify
-       <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       /etc/ttys
+            system  port  name to terminal type mapping database (BSD versions
+            only).
 
-       The  <STRONG>ncurses</STRONG> implementation was lightly adapted from the 4.4BSD sources
-       for a terminfo environment by Eric S. Raymond &lt;esr@snark.thyrsus.com&gt;.
+       <EM>/usr/share/terminfo</EM>
+            compiled terminal description database directory
 
 
-</PRE><H2><a name="h2-COMPATIBILITY">COMPATIBILITY</a></H2><PRE>
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
        (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
 
-       The  AT&amp;T  <STRONG>tput</STRONG> utility (AIX, HPUX, Solaris) incorporated the terminal-
+       The  AT&amp;T <STRONG>tput</STRONG> utility (AIX, HP-UX, Solaris) incorporated the terminal-
        mode manipulation as well as termcap-based features such  as  resetting
        tabstops  from  <STRONG>tset</STRONG>  in  BSD  (4.1c), presumably with the intention of
        making <STRONG>tset</STRONG> obsolete.  However, each of those  systems  still  provides
@@ -300,7 +313,7 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        <STRONG>tset</STRONG>.
 
        The  <STRONG>tset</STRONG>  utility  provides  for   backward-compatibility   with   BSD
-       environments  (under  most modern UNIXes, <STRONG>/etc/inittab</STRONG> and <STRONG>getty(1)</STRONG> can
+       environments  (under  most modern Unices, <STRONG>/etc/inittab</STRONG> and <STRONG>getty(1)</STRONG> can
        set <STRONG>TERM</STRONG> appropriately for each dial-up line; this  obviates  what  was
        <STRONG>tset</STRONG>'s  most  important  use).  This implementation behaves like 4.4BSD
        <STRONG>tset</STRONG>, with a few exceptions specified here.
@@ -362,30 +375,26 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
        To do this more easily, use the <STRONG>resize(1)</STRONG> program.
 
 
-</PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The <STRONG>tset</STRONG> command uses these environment variables:
-
-       SHELL
-            tells <STRONG>tset</STRONG> whether  to  initialize  <STRONG>TERM</STRONG>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
-            syntax.
-
-       TERM Denotes  your  terminal  type.   Each  terminal  type is distinct,
-            though many are similar.
-
-       TERMCAP
-            may denote the location of a termcap database.  If it  is  not  an
-            absolute  pathname,  e.g.,  begins  with  a  "/", <STRONG>tset</STRONG> removes the
-            variable from the environment  before  looking  for  the  terminal
-            description.
-
-
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /etc/ttys
-            system  port  name to terminal type mapping database (BSD versions
-            only).
-
-       <EM>/usr/share/terminfo</EM>
-            compiled terminal description database directory
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       A <STRONG>reset</STRONG> command written by Kurt Shoens appeared in 1BSD  (March  1978).
+       It  set  the  <EM>erase</EM>  and  <EM>kill</EM>  characters  to  <STRONG>^H</STRONG>  (backspace)  and  <STRONG>@</STRONG>
+       respectively.  Mark Horton improved this <STRONG>reset</STRONG> in 3BSD (October  1979),
+       adding  <EM>intr</EM>,  <EM>quit</EM>, <EM>start</EM>/<EM>stop</EM>, and <EM>eof</EM> characters as well as changing
+       the program to avoid modifying any  user  settings.   That  version  of
+       <STRONG>reset</STRONG> did not use <EM>termcap</EM>.
+
+       Eric  Allman wrote a distinct <STRONG>tset</STRONG> command for 1BSD, using a forerunner
+       of <EM>termcap</EM>  called  <EM>ttycap</EM>.   Allman's  comments  in  the  source  code
+       indicate  that  he  began  work in October 1977, continuing development
+       over the next few years.  By late 1979, it had migrated to <EM>termcap</EM>  and
+       handled  the  <EM>TERMCAP</EM>  variable.  Later comments indicate that <STRONG>tset</STRONG> was
+       modified in September 1980 to use logic copied from  the  3BSD  "reset"
+       program  when  it  was  invoked  as  <STRONG>reset</STRONG>.   This  version appeared in
+       4.1cBSD, late in 1982.  Other developers such as Keith Bostic  and  Jim
+       Bloom continued to modify <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
+
+       The  <EM>ncurses</EM> implementation was lightly adapted from the 4.4BSD sources
+       to use the <EM>terminfo</EM> API by Eric S. Raymond &lt;esr@snark.thyrsus.com&gt;.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -394,7 +403,7 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-10-14                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -404,15 +413,15 @@ <H1 class="no-header">tset 1 2023-10-14 ncurses 6.4 User commands</H1>
 <ul>
 <li><a href="#h3-tset---initialization">tset - initialization</a></li>
 <li><a href="#h3-reset---reinitialization">reset - reinitialization</a></li>
+<li><a href="#h3-Setting-the-Environment">Setting the Environment</a></li>
+<li><a href="#h3-Terminal-Type-Mapping">Terminal Type Mapping</a></li>
 </ul>
 </li>
 <li><a href="#h2-OPTIONS">OPTIONS</a></li>
-<li><a href="#h2-SETTING-THE-ENVIRONMENT">SETTING THE ENVIRONMENT</a></li>
-<li><a href="#h2-TERMINAL-TYPE-MAPPING">TERMINAL TYPE MAPPING</a></li>
-<li><a href="#h2-HISTORY">HISTORY</a></li>
-<li><a href="#h2-COMPATIBILITY">COMPATIBILITY</a></li>
 <li><a href="#h2-ENVIRONMENT">ENVIRONMENT</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 9cdb61c89..b19309875 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: wresize.3x,v 1.34 2023/11/25 14:26:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -58,36 +58,36 @@ <H1 class="no-header">wresize 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This is an extension to the curses library.  It reallocates storage for
-       an <STRONG>ncurses</STRONG> window to adjust its dimensions to the specified values.  If
-       either  dimension  is larger than the current values, the window's data
-       is filled with blanks that have the current  background  rendition  (as
-       set by <STRONG>wbkgdset</STRONG>) merged into them.
+       This  <EM>ncurses</EM>  extension  to  standard <EM>curses</EM> reallocates storage for a
+       <EM>curses</EM> window to adjust its dimensions to  the  specified  values.   If
+       either dimension is larger than its current value, the expanded part of
+       the window  is  filled  with  blanks  merged  with  current  background
+       rendition (as set by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function  returns  the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
-       It will fail if either of the dimensions less than or equal to zero, or
-       if an error occurs while (re)allocating memory for the window.
+       <STRONG>wresize</STRONG>  returns  <STRONG>ERR</STRONG>  upon failure and <STRONG>OK</STRONG> on success.  It will fail if
+       either of the dimensions is less than or equal to zero, or if an  error
+       occurs while (re)allocating memory for the window.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        The  only  restriction placed on the dimensions is that they be greater
-       than zero.  The dimensions are not compared to <STRONG>curses</STRONG> screen dimensions
-       to  simplify  the logic of <STRONG>resizeterm</STRONG>.  The caller must ensure that the
-       window's dimensions fit within the actual screen dimensions.
+       than zero.  They are <EM>not</EM> compared to the <EM>curses</EM> screen dimensions; this
+       keeps  the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.  The caller must ensure that
+       the window's dimensions fit within the actual screen dimensions.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       It is not possible to resize windows with SVr4 curses.
+       It is not possible to resize windows with SVr4 <EM>curses</EM>.
 
-       This extension of ncurses was introduced in mid-1995.  It  was  adopted
-       in NetBSD curses (2001) and PDCurses (2003).
+       <EM>ncurses</EM> introduced this extension in mid-1995.  NetBSD  <EM>curses</EM>  adopted
+       it in 2001, and <EM>PDCurses</EM> in 2003.
 
 
-</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+</PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
-       curses).
+       <EM>curses</EM>).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2023-11-25                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -105,7 +105,7 @@ <H1 class="no-header">wresize 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-AUTHOR">AUTHOR</a></li>
+<li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 8dd1aed99..2b5fabe6e 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-10-07 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKada_config.in,v 1.31 2023/11/25 19:51:50 tom Exp $
+.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-11-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
 .ie \n(.g \{\
 .ds `` \(lq
@@ -76,7 +76,7 @@ successfully.
 issues a usage message and exits successfully.
 .PP
 Omitting options implies \*(``\fB\-\-cflags \-\-libs\fP\*(''.
-.SH EXAMPLE
+.SH EXAMPLES
 Consider a program using \fI@ADA_LIBNAME@\fP to write the message
 \*(``Hello, world!\*('' in the center of the screen and wait for the
 user to press the \*(``q\*('' key before exiting.
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 819c75c35..35b92a20b 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.52 2023/10/14 19:25:26 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.54 2023/11/25 14:32:36 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,7 +44,6 @@
 .el   .ds '  '
 .\}
 .
-.ds n 5
 .ds d /etc/termcap
 .SH NAME
 \fB\%@CAPTOINFO@\fP \-
@@ -57,20 +56,20 @@ convert a \fItermcap\fR description into a \fIterminfo\fR description
 .P
 .B "@CAPTOINFO@ \-V"
 .SH DESCRIPTION
-\fB\%@CAPTOINFO@\fP looks in each given text
-\fIfile\fP for \fItermcap\fP descriptions.
-For each one found,
-it writes an equivalent \fIterminfo\fP description to the standard
-output stream.
-\fItermcap\fP \fBtc\fP capabilities are translated directly to
-\fIterminfo\fP \*(``\fBuse\fP\*('' capabilities.
+\fB\%@CAPTOINFO@\fP translates terminal descriptions.
+It looks in each given text \fIfile\fP for \fI\%termcap\fP entries and,
+for each one found,
+writes an equivalent \fI\%terminfo\fP description to the standard output
+stream.
+\fI\%termcap\fP \fBtc\fP capabilities translate to \fI\%terminfo\fP
+\*(``\fBuse\fP\*('' capabilities.
 .PP
 If no \fIfile\fPs are specified,
 \fB\%@CAPTOINFO@\fP interprets the content of the environment variable
-\fB\%TERMCAP\fP as a file name,
+\fI\%TERMCAP\fP as a file name,
 and extracts only the entry for the terminal named in the environment
-variable \fB\%TERM\fP from it.
-If the environment variable \fB\%TERMCAP\fP is not set,
+variable \fITERM\fP from it.
+If the environment variable \fI\%TERMCAP\fP is not set,
 \fB\%@CAPTOINFO@\fP reads \fI\%\*d\fP.
 .PP
 This utility is implemented as a link to \fB\%@TIC@\fP(1M),
@@ -84,22 +83,23 @@ You can use other \fB\%@TIC@\fP options such as
 .BR \-w ,
 and
 .BR \-x .
-The \fB\-V\fP option reports the version of \fIncurses\fP associated
+The \fB\-V\fP option reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
 .SS "Translations from nonstandard capabilities"
 \fB\%@CAPTOINFO@\fP translates some obsolete,
-nonstandard capabilities into standard (SVr4/XSI Curses) \fIterminfo\fP
-capabilities.
+nonstandard capabilities into standard
+(SVr4/XSI Curses)
+\fI\%terminfo\fP capabilities.
 It issues a diagnostic to the standard error stream for each,
 inviting the user to check that it has not mistakenly translated an
 unknown or mistyped capability name.
 .PP
 .TS
-cb cb cb cb
-cb cb cb cb
-cb cb l  lb.
-Nonstandard	Standard	\&	\f(BIterminfo\fP
-name	name	From	capability
+Cb S
+Cb Cb Cb Cb
+Cb Cb C  Lb.
+Name
+Obsolete	Standard	Origin	\f(BIterminfo\fP capability
 _
 BO	mr	AT&T	enter_reverse_mode
 CI	vi	AT&T	cursor_invisible
@@ -120,28 +120,26 @@ PS	pf	XENIX	prtr_on
 PU	kP	XENIX	key_ppage
 RT	@8	XENIX	kent
 UP	ku	XENIX	kcuu1
-KA	k;	Tek	key_f10
-KB	F1	Tek	key_f11
-KC	F2	Tek	key_f12
-KD	F3	Tek	key_f13
-KE	F4	Tek	key_f14
-KF	F5	Tek	key_f15
-BC	Sb	Tek	set_background
-FC	Sf	Tek	set_foreground
-HS	mh	Iris	enter_dim_mode
+KA	k;	Tektronix	key_f10
+KB	F1	Tektronix	key_f11
+KC	F2	Tektronix	key_f12
+KD	F3	Tektronix	key_f13
+KE	F4	Tektronix	key_f14
+KF	F5	Tektronix	key_f15
+BC	Sb	Tektronix	set_background
+FC	Sf	Tektronix	set_foreground
+HS	mh	IRIX	enter_dim_mode
 .TE
 .PP
-XENIX \fItermcap\fP had a set of extension capabilities,
+XENIX \fI\%termcap\fP had a set of extension capabilities,
 corresponding to box drawing characters of CCSID
 (\*(``code page\*('') 437,
 as follows.
 .PP
 .TS
 cb cb
-cb cb
 cb l .
-Termcap
-Name	Graphic
+\f(BItermcap\fP Name	Graphic
 _
 G2	upper left corner
 G3	lower left corner
@@ -173,13 +171,13 @@ Gc	double intersection
 GG	ACS magic cookie count
 .TE
 .PP
-If the single-line capabilities occur in an entry,
-they are composed into an \fBacsc\fP string.
-The double-line capabilities and
-\fBGG\fP are discarded with a warning message.
+\fB\%@CAPTOINFO@\fP composes single-line capabilities into an \fBacsc\fP
+string,
+and discards \fBGG\fP and double-line capabilities with a warning
+diagnostic.
 .PP
-IBM's AIX has a \fIterminfo\fP facility descended from SVr1
-\fIterminfo\fP,
+IBM's AIX has a \fI\%terminfo\fP facility descended from SVr1
+\fI\%terminfo\fP,
 but which is incompatible with the SVr4 format.
 \fB\%@CAPTOINFO@\fP translates the following AIX extensions.
 .PP
@@ -200,27 +198,28 @@ Additionally,
 this program translates the AIX \fBbox1\fP capability to an \fBacsc\fP
 string.
 .PP
-The HP-UX \fIterminfo\fP library supports two nonstandard \fIterminfo\fP
-capabilities,
+The HP-UX \fI\%terminfo\fP library supports two nonstandard
+\fI\%terminfo\fP capabilities,
 \fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
 \fB\%@CAPTOINFO@\fP discards these with a warning message.
 .SH FILES
 .TP
 \fI\*d\fP
-default \fItermcap\fP terminal capability database
+default \fI\%termcap\fP terminal capability database
 .SH NOTES
 The verbose option is not identical to SVr4's.
-Under SVr4, instead of following
-the \fB\-v\fP with a trace level \fIn\fP,
+Under SVr4,
+instead of following the \fB\-v\fP with a trace level \fIn\fP,
 you repeat it \fIn\fP times.
 .SH PORTABILITY
-X/Open Curses, Issue 7 (2009) describes \fBtic\fP briefly,
+X/Open Curses,
+Issue 7 (2009) describes \fBtic\fP briefly,
 but omits this program.
 SVr4 systems provide \fB\%captoinfo\fP as a separate application from
 \fBtic\fP.
 .PP
 NetBSD does not provide this application.
-.SH AUTHOR
+.SH AUTHORS
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
@@ -229,4 +228,4 @@ Thomas E. Dickey <dickey@invisible\-island.net>
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TIC@\fP(1M),
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/clear.1 b/man/clear.1
index 8d5e0e529..669bc1c73 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH @CLEAR@ 1 2023-10-07 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.43 2023/11/25 14:32:36 tom Exp $
+.TH @CLEAR@ 1 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,7 +48,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fB\%@CLEAR@\fP \-
 clear the terminal screen
@@ -56,7 +55,7 @@ clear the terminal screen
 .B @CLEAR@
 .RB [ \-x ]
 .RB [ \-T\ \c
-.IR type ]
+.IR terminal-type ]
 .PP
 .B "@CLEAR@ \-V"
 .SH DESCRIPTION
@@ -90,6 +89,16 @@ exits with a successful status.
 .TP
 .B \-x
 prevents \fB\%@CLEAR@\fP from attempting to clear the scrollback buffer.
+.SH PORTABILITY
+Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@TSET@\fP or
+\fB\%@RESET@\fP.
+.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 HISTORY
 A \fBclear\fP command using the \fItermcap\fP database and library
 appeared in 2BSD (1979).
@@ -171,17 +180,7 @@ the \fBE3\fP capability was not exercised by
 \*(``\fB\%@TPUT@ clear\fP\*(''.
 That oversight 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 \fB\%@TSET@\fP or
-\fB\%@RESET@\fP.
-.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@\fP(1),
 \fB\%xterm\fP(1),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 9f56f3455..374597b41 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.46 2023/10/07 21:19:07 tom Exp $
-.TH curs_add_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.48 2023/11/25 14:20:05 tom Exp $
+.TH curs_add_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -252,7 +252,7 @@ Note that
 \fBecho_wchar\fP
 may be macros.
 .SH PORTABILITY
-All of these functions are described in the XSI Curses standard, Issue 4.
+These functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for line-drawing characters apply in the POSIX locale.
 .SS WACS Symbols
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
@@ -261,7 +261,7 @@ A few implementations are problematic:
 .bP
 NetBSD curses defines the symbols as a \fBwchar_t\fP within a \fBcchar_t\fP.
 .bP
-HPUX curses equates some of the \fBACS_\fP symbols
+HP-UX curses equates some of the \fBACS_\fP symbols
 to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
 wide characters.
 The misdefined symbols are the arrows
@@ -278,7 +278,7 @@ alternate character sets (i.e., the \fBacsc\fP capability),
 with their corresponding line-drawing characters.
 X/Open Curses did not address the aspect of integrating Unicode with
 line-drawing characters.
-Existing implementations of Unix curses (AIX, HPUX, Solaris)
+Existing implementations of Unix curses (AIX, HP-UX, Solaris)
 use only the \fBacsc\fP character-mapping to provide this feature.
 As a result, those implementations can only use single-byte line-drawing
 characters.
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index c0fab61ea..c53b812c4 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.30 2023/11/18 21:18:55 tom Exp $
-.TH curs_add_wchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.32 2023/11/25 14:01:49 tom Exp $
+.TH curs_add_wchstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,7 +115,7 @@ or if the window pointer is null.
 .SH NOTES
 All functions except \fBwadd_wchnstr\fP may be macros.
 .SH PORTABILITY
-These entry points are described in the XSI Curses standard, Issue 4.
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index d69804578..1df5b9d92 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.72 2023/10/07 21:19:07 tom Exp $
-.TH curs_addch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.74 2023/11/25 14:20:05 tom Exp $
+.TH curs_addch 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -207,7 +207,7 @@ an error is returned.
 Note that \fBaddch\fP, \fBmvaddch\fP, \fBmvwaddch\fP, and
 \fBechochar\fP may be macros.
 .SH PORTABILITY
-All these functions are described in the XSI Curses standard, Issue 4.
+These functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for forms-drawing characters apply in the POSIX locale.
 .SS ACS Symbols
 X/Open Curses states that the \fBACS_\fP definitions are \fBchar\fP constants.
@@ -222,7 +222,7 @@ This implementation uses an array \fBacs_map\fP, as done in SVr4 curses.
 NetBSD also uses an array, actually named \fB_acs_char\fP, with a \fB#define\fP
 for compatibility.
 .bP
-HPUX curses equates some of the \fBACS_\fP symbols
+HP-UX curses equates some of the \fBACS_\fP symbols
 to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
 wide characters.
 The misdefined symbols are the arrows
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 5632f6e56..9e8db9860 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.36 2023/11/18 21:18:55 tom Exp $
-.TH curs_addchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.38 2023/11/25 14:01:49 tom Exp $
+.TH curs_addchstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,7 +109,7 @@ or if the window pointer is null.
 .SH NOTES
 All functions except \fBwaddchnstr\fP may be macros.
 .SH PORTABILITY
-These entry points are described in the XSI Curses standard, Issue 4.
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 4ecf71634..662b2113e 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.87 2023/10/07 22:21:46 tom Exp $
-.TH curs_attr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.89 2023/11/25 15:33:56 tom Exp $
+.TH curs_attr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -98,9 +98,9 @@ manipulate attributes of character cells in \fIcurses\fR windows
 \fBint wchgat(WINDOW *\fIwin\fP,
       \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
 \fBint mvchgat(int \fIy\fB, int \fIx\fB,\fR
-      \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
-\fBint mvwchgat(WINDOW *\fIwin, int \fIy, int \fIx\fB,\fR
-      \fBint \fIn,\fR \fBattr_t \fIattr\fB, short \fIpair\fB, const void *\fIopts\fB);\fR
+      \fBint \fIn\fB, attr_t \fIattr\fB, short \fIpair\fB, const void *\fIopts\fB);\fR
+\fBint mvwchgat(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB,\fR
+      \fBint \fIn\fB, attr_t \fIattr\fB, short \fIpair\fB, const void *\fIopts\fB);\fR
 .PP
 \fBint color_set(short \fIpair\fB, void* \fIopts\fB);\fR
 \fBint wcolor_set(WINDOW *\fIwin\fB, short \fIpair\fB,\fR \fBvoid* \fIopts\fP);\fR
@@ -240,7 +240,7 @@ they have well established legacy use, and
 there is no ambiguity about the way the attributes
 might be combined with a color pair.
 .\" ---------------------------------------------------------------------------
-.SH VIDEO ATTRIBUTES
+.SS "Video Attributes"
 The following video attributes, defined in \fB<curses.h>\fP, can be passed to
 the routines \fBattron\fP, \fBattroff\fP, and \fBattrset\fP, or OR'd with the
 characters passed to \fBaddch\fP (see \fBcurs_addch\fP(3X)).
@@ -289,6 +289,25 @@ The return values of many of these routines are not meaningful (they are
 implemented as macro-expanded assignments and simply return their argument).
 The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
 .\" ---------------------------------------------------------------------------
+.SH RETURN VALUE
+All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
+.PP
+X/Open does not define any error conditions.
+.PP
+This implementation
+.bP
+returns an error if the window pointer is null.
+.bP
+returns an error if the color pair parameter
+for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
+.bP
+does not return an error if either of the parameters of \fBwattr_get\fP
+used for retrieving attribute or color-pair values is \fBNULL\fP.
+.PP
+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+\fBwmove\fP, and return an error if the position is outside the window,
+or if the window pointer is null.
+.\" ---------------------------------------------------------------------------
 .SH NOTES
 These functions may be macros:
 .sp
@@ -305,6 +324,128 @@ However, ncurses ABI 4 and 5 simply OR this value
 within the alternate functions.
 You must use ncurses ABI 6 to support more than 256 color pairs.
 .\" ---------------------------------------------------------------------------
+.SH EXTENSIONS
+This implementation provides the \fBA_ITALIC\fP attribute for terminals
+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, \fBA_ITALIC\fP is unrelated
+to the \fBset_attributes\fP capabilities.
+This implementation makes the assumption that
+\fBexit_attribute_mode\fP may also reset italics.
+.PP
+Each of the functions added by XSI Curses has a parameter \fIopts\fP,
+which X/Open Curses still (after more than twenty years) documents
+as reserved for future use, saying that it should be \fBNULL\fP.
+This implementation uses that parameter in ABI 6 for the functions which
+have a color-pair parameter to support \fIextended color pairs\fP:
+.bP
+For functions which modify the color, e.g.,
+\fBwattr_set\fP and \fBwattr_on\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to set the color pair instead of the \fBshort\fP \fIpair\fP parameter.
+.bP
+For functions which retrieve the color, e.g.,
+\fBwattr_get\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to retrieve the color pair as an \fBint\fP value,
+in addition to
+retrieving it via the standard pointer to \fBshort\fP parameter.
+.bP
+For functions which turn attributes off, e.g.,
+\fBwattr_off\fP,
+the \fIopts\fP parameter is ignored except
+except to check that it is \fBNULL\fP.
+.\" ---------------------------------------------------------------------------
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
+The standard defined the dedicated type for highlights,
+\fBattr_t\fP, which was not defined in SVr4 curses.
+The functions taking \fBattr_t\fP arguments were not supported under SVr4.
+.PP
+Very old versions of this library did not force an update of the screen
+when changing the attributes.
+Use \fBtouchwin\fP to force the screen to match the updated attributes.
+.PP
+The XSI Curses standard states that whether the traditional functions
+\fBattron\fP/\fBattroff\fP/\fBattrset\fP can manipulate attributes other than
+\fBA_BLINK\fP, \fBA_BOLD\fP, \fBA_DIM\fP, \fBA_REVERSE\fP, \fBA_STANDOUT\fP, or
+\fBA_UNDERLINE\fP is \*(``unspecified\*(''.
+Under this implementation as well as
+SVr4 curses, these functions correctly manipulate all other highlights
+(specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
+.PP
+XSI Curses added these entry points:
+.sp
+.RS
+\fBattr_get\fP, \fBattr_on\fP,
+\fBattr_off\fP, \fBattr_set\fP, \fBwattr_on\fP, \fBwattr_off\fP,
+\fBwattr_get\fP, \fBwattr_set\fP
+.RE
+.PP
+The new functions are intended to work with
+a new series of highlight macros prefixed with \fBWA_\fP.
+The older macros have direct counterparts in the newer set of names:
+.PP
+.RS
+.ne 9
+.TS
+l l
+_ _ _
+l l .
+\fBName\fP	\fBDescription\fP
+\fBWA_NORMAL\fP	Normal display (no highlight)
+\fBWA_STANDOUT\fP	Best highlighting mode of the terminal.
+\fBWA_UNDERLINE\fP	Underlining
+\fBWA_REVERSE\fP	Reverse video
+\fBWA_BLINK\fP	Blinking
+\fBWA_DIM\fP	Half bright
+\fBWA_BOLD\fP	Extra bright or bold
+\fBWA_ALTCHARSET\fP	Alternate character set
+.TE
+.RE
+.PP
+XSI curses does not assign values to these symbols,
+nor does it state whether or not they are related to the
+similarly-named A_NORMAL, etc.:
+.bP
+The XSI curses standard specifies that each pair of corresponding \fBA_\fP
+and \fBWA_\fP-using functions operates on the same current-highlight
+information.
+.bP
+However, in some implementations, those symbols have unrelated values.
+.IP
+For example, the Solaris \fIxpg4\fP (X/Open) curses declares
+\fBattr_t\fP to be an unsigned short integer (16-bits),
+while \fBchtype\fP is a unsigned integer (32-bits).
+The \fBWA_\fP symbols in this case are different from the \fBA_\fP symbols
+because they are used for a smaller datatype which does not
+represent \fBA_CHARTEXT\fP or \fBA_COLOR\fP.
+.IP
+In this implementation (as in many others), the values happen to be
+the same because it simplifies copying information between
+\fBchtype\fP and \fBcchar_t\fP variables.
+.bP
+Because ncurses's \fBattr_t\fP can hold a color pair
+(in the \fBA_COLOR\fP field),
+a call to
+\fBwattr_on\fP,
+\fBwattr_off\fP, or
+\fBwattr_set\fP
+may alter the window's color.
+If the color pair information in the attribute parameter is zero,
+no change is made to the window's color.
+.IP
+This is consistent with SVr4 curses;
+X/Open Curses does not specify this.
+.PP
+The XSI standard extended conformance level adds new highlights
+\fBA_HORIZONTAL\fP, \fBA_LEFT\fP, \fBA_LOW\fP, \fBA_RIGHT\fP, \fBA_TOP\fP,
+\fBA_VERTICAL\fP (and corresponding \fBWA_\fP macros for each).
+As of August 2013,
+no known terminal provides these highlights
+(i.e., via the \fBsgr1\fP capability).
+.\" ---------------------------------------------------------------------------
 .SH HISTORY
 X/Open Curses is largely based on SVr4 curses,
 adding support for \*(``wide-characters\*('' (not specific to Unicode).
@@ -370,7 +511,7 @@ _ _ _ _ _ _
 l l l l l l .
 \fBYear\fP	\fBSystem\fP	\fBArch\fP	\fBColor\fP	\fBChar\fP	\fBNotes\fP
 1992	Solaris 5.2	32	6	17	SVr4 curses
-1992	HPUX 9	32	no	8	SVr2 curses
+1992	HP-UX 9	32	no	8	SVr2 curses
 1992	AIX 3.2	32	no	23	SVr2 curses
 1994	OSF/1 r3	32	no	23	SVr2 curses
 1995	HP-UX 10.00	32	6	16	SVr3 \*(``curses_colr\*(''
@@ -438,147 +579,6 @@ The resulting 4.4BSD curses was replaced by ncurses over the next ten years.
 .bP
 U/Win is rarely used now.
 .\" ---------------------------------------------------------------------------
-.SH EXTENSIONS
-This implementation provides the \fBA_ITALIC\fP attribute for terminals
-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, \fBA_ITALIC\fP is unrelated
-to the \fBset_attributes\fP capabilities.
-This implementation makes the assumption that
-\fBexit_attribute_mode\fP may also reset italics.
-.PP
-Each of the functions added by XSI Curses has a parameter \fIopts\fP,
-which X/Open Curses still (after more than twenty years) documents
-as reserved for future use, saying that it should be \fBNULL\fP.
-This implementation uses that parameter in ABI 6 for the functions which
-have a color-pair parameter to support \fIextended color pairs\fP:
-.bP
-For functions which modify the color, e.g.,
-\fBwattr_set\fP and \fBwattr_on\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to set the color pair instead of the \fBshort\fP \fIpair\fP parameter.
-.bP
-For functions which retrieve the color, e.g.,
-\fBwattr_get\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to retrieve the color pair as an \fBint\fP value,
-in addition to
-retrieving it via the standard pointer to \fBshort\fP parameter.
-.bP
-For functions which turn attributes off, e.g.,
-\fBwattr_off\fP,
-the \fIopts\fP parameter is ignored except
-except to check that it is \fBNULL\fP.
-.\" ---------------------------------------------------------------------------
-.SH PORTABILITY
-These functions are supported in the XSI Curses standard, Issue 4.
-The standard defined the dedicated type for highlights,
-\fBattr_t\fP, which was not defined in SVr4 curses.
-The functions taking \fBattr_t\fP arguments were not supported under SVr4.
-.PP
-Very old versions of this library did not force an update of the screen
-when changing the attributes.
-Use \fBtouchwin\fP to force the screen to match the updated attributes.
-.PP
-The XSI Curses standard states that whether the traditional functions
-\fBattron\fP/\fBattroff\fP/\fBattrset\fP can manipulate attributes other than
-\fBA_BLINK\fP, \fBA_BOLD\fP, \fBA_DIM\fP, \fBA_REVERSE\fP, \fBA_STANDOUT\fP, or
-\fBA_UNDERLINE\fP is \*(``unspecified\*(''.
-Under this implementation as well as
-SVr4 curses, these functions correctly manipulate all other highlights
-(specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
-.PP
-XSI Curses added these entry points:
-.sp
-.RS
-\fBattr_get\fP, \fBattr_on\fP,
-\fBattr_off\fP, \fBattr_set\fP, \fBwattr_on\fP, \fBwattr_off\fP,
-\fBwattr_get\fP, \fBwattr_set\fP
-.RE
-.PP
-The new functions are intended to work with
-a new series of highlight macros prefixed with \fBWA_\fP.
-The older macros have direct counterparts in the newer set of names:
-.PP
-.RS
-.ne 9
-.TS
-l l
-_ _ _
-l l .
-\fBName\fP	\fBDescription\fP
-\fBWA_NORMAL\fP	Normal display (no highlight)
-\fBWA_STANDOUT\fP	Best highlighting mode of the terminal.
-\fBWA_UNDERLINE\fP	Underlining
-\fBWA_REVERSE\fP	Reverse video
-\fBWA_BLINK\fP	Blinking
-\fBWA_DIM\fP	Half bright
-\fBWA_BOLD\fP	Extra bright or bold
-\fBWA_ALTCHARSET\fP	Alternate character set
-.TE
-.RE
-.PP
-XSI curses does not assign values to these symbols,
-nor does it state whether or not they are related to the
-similarly-named A_NORMAL, etc.:
-.bP
-The XSI curses standard specifies that each pair of corresponding \fBA_\fP
-and \fBWA_\fP-using functions operates on the same current-highlight
-information.
-.bP
-However, in some implementations, those symbols have unrelated values.
-.IP
-For example, the Solaris \fIxpg4\fP (X/Open) curses declares
-\fBattr_t\fP to be an unsigned short integer (16-bits),
-while \fBchtype\fP is a unsigned integer (32-bits).
-The \fBWA_\fP symbols in this case are different from the \fBA_\fP symbols
-because they are used for a smaller datatype which does not
-represent \fBA_CHARTEXT\fP or \fBA_COLOR\fP.
-.IP
-In this implementation (as in many others), the values happen to be
-the same because it simplifies copying information between
-\fBchtype\fP and \fBcchar_t\fP variables.
-.bP
-Because ncurses's \fBattr_t\fP can hold a color pair
-(in the \fBA_COLOR\fP field),
-a call to
-\fBwattr_on\fP,
-\fBwattr_off\fP, or
-\fBwattr_set\fP
-may alter the window's color.
-If the color pair information in the attribute parameter is zero,
-no change is made to the window's color.
-.IP
-This is consistent with SVr4 curses;
-X/Open Curses does not specify this.
-.PP
-The XSI standard extended conformance level adds new highlights
-\fBA_HORIZONTAL\fP, \fBA_LEFT\fP, \fBA_LOW\fP, \fBA_RIGHT\fP, \fBA_TOP\fP,
-\fBA_VERTICAL\fP (and corresponding \fBWA_\fP macros for each).
-As of August 2013,
-no known terminal provides these highlights
-(i.e., via the \fBsgr1\fP capability).
-.\" ---------------------------------------------------------------------------
-.SH RETURN VALUE
-All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
-.PP
-X/Open does not define any error conditions.
-.PP
-This implementation
-.bP
-returns an error if the window pointer is null.
-.bP
-returns an error if the color pair parameter
-for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
-.bP
-does not return an error if either of the parameters of \fBwattr_get\fP
-used for retrieving attribute or color-pair values is \fBNULL\fP.
-.PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
-.\" ---------------------------------------------------------------------------
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 7d981a361..3e8b85871 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
-.TH curs_bkgd 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.49 2023/11/25 14:01:49 tom Exp $
+.TH curs_bkgd 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -154,8 +154,7 @@ be a single-byte value.
 This implementation, like SVr4, checks to ensure that,
 and will reuse the old background character if the check fails.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4
-(X/Open Curses).
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 34ae0de13..2f7ee4487 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH curs_bkgrnd 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.32 2023/11/25 14:01:49 tom Exp $
+.TH curs_bkgrnd 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -92,16 +92,6 @@ character/attribute pair via the
 pointer.
 If the given window pointer is null,
 the character is not updated (but no error is returned).
-.SH NOTES
-Note that
-\fBbkgrnd\fP,
-\fBbkgrndset\fP, and
-\fBgetbkgrnd\fP
-may be macros.
-.PP
-X/Open Curses does not provide details on how the rendition is changed.
-This implementation follows the approach used in SVr4 curses,
-which is explained in the manual page for \fBwbkgd\fP.
 .SH RETURN VALUE
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines do not return a value.
 .PP
@@ -111,9 +101,17 @@ Otherwise, they return \fBERR\fP:
 A null window pointer is treated as an error.
 .bP
 A null character pointer is treated as an error.
+.SH NOTES
+\fB\%bkgrnd\fP,
+\fB\%bkgrndset\fP, and
+\fB\%getbkgrnd\fP
+may be available as macros.
+.PP
+X/Open Curses does not provide details on how the rendition is changed.
+This implementation follows the approach used in SVr4 curses,
+which is explained in the manual page for \fBwbkgd\fP.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4
-(X/Open Curses).
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_bkgd\fP(3X)
diff --git a/man/curs_border.3x b/man/curs_border.3x
index df4698c50..b8582bfc7 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH curs_border 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.43 2023/11/25 11:31:27 tom Exp $
+.TH curs_border 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -154,8 +154,6 @@ is also true of SVr4 curses, though the fact is not documented).
 Note that \fBborder\fP and \fBbox\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
-The standard specifies that they return \fBERR\fP on failure,
-but specifies no error conditions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index f833acbae..16a66ce50 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.29 2023/11/11 11:38:35 tom Exp $
-.TH curs_border_set 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.31 2023/11/25 15:39:56 tom Exp $
+.TH curs_border_set 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,45 +57,45 @@ draw borders and lines in a \fIcurses\fR window of wide characters
 \fB#include <curses.h>
 .PP
 \fBint border_set(
-   \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
-   \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
-   \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
-   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
+   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
 .br
 \fBint wborder_set(\fP
-   \fBWINDOW *win\fP,
-   \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
-   \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
-   \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
-   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
+   \fBWINDOW *\fIwin\fP,
+   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
 \fBint box_set(\fP
-   \fBWINDOW *win\fP,
-   \fBconst cchar_t *\fIverch\fR,
+   \fBWINDOW *\fIwin\fP,
+   \fBconst cchar_t *\fIverch\fP,
    \fBconst cchar_t *\fIhorch\fB);\fR
 \fBint hline_set(\fP
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint whline_set(\fP
-   \fBWINDOW *\fIwin\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBWINDOW *\fIwin\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint mvhline_set(\fP
-   \fBint \fIy\fR, \fBint \fIx\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBint \fIy\fB, int \fIx\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint mvwhline_set(\fP
-   \fBWINDOW *\fIwin\fR,
-   \fBint \fIy\fR, \fBint \fIx\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBWINDOW *\fIwin\fP,
+   \fBint \fIy\fB, int \fIx\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint vline_set(\fP
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint wvline_set(\fP
-   \fBWINDOW *\fIwin\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBWINDOW *\fIwin\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint mvvline_set(\fP
-   \fBint \fIy\fR, \fBint \fIx\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBint \fIy\fB, int \fIx\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 \fBint mvwvline_set(\fP
-   \fBWINDOW *\fIwin\fR,
-   \fBint \fIy\fR, \fBint \fIx\fR,
-   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+   \fBWINDOW *\fIwin\fP,
+   \fBint \fIy\fB, int \fIx\fP,
+   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 .fi
 .SH DESCRIPTION
 The
@@ -171,17 +171,6 @@ The
 \fBmvwvline_set\fP, and
 \fBwvline_set\fP
 functions draw a line proceeding toward the last line of the window.
-.br
-.SH NOTES
-Note that
-\fBborder_set\fP,
-\fBhline_set\fP,
-\fBmvhline_set\fP,
-\fBmvvline_set\fP,
-\fBmvwhline_set\fP,
-\fBmvwvline_set\fP, and
-\fBvline_set\fP
-may be macros.
 .SH RETURN VALUE
 Upon successful completion, these functions return
 \fBOK\fP.
@@ -193,6 +182,18 @@ Functions using a window parameter return an error if it is null.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
+.SH NOTES
+Note that
+\fBborder_set\fP,
+\fBhline_set\fP,
+\fBmvhline_set\fP,
+\fBmvvline_set\fP,
+\fBmvwhline_set\fP,
+\fBmvwvline_set\fP, and
+\fBvline_set\fP
+may be macros.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index d2af03516..7349a14ca 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
-.TH curs_clear 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.40 2023/11/25 11:31:27 tom Exp $
+.TH curs_clear 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -94,9 +94,6 @@ Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
 \fBclrtobot\fP, and \fBclrtoeol\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
-The
-standard specifies that they return \fBERR\fP on failure, but specifies no
-error conditions.
 .PP
 The SVr4.0 manual says that these functions could
 return "a non-negative integer if \fBimmedok\fP(3X) is set",
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 8cb561f6e..20c0fbde6 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.89 2023/11/11 11:38:59 tom Exp $
-.TH curs_color 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.92 2023/11/25 17:36:51 tom Exp $
+.TH curs_color 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fB\%start_color\fP,
 \fB\%has_colors\fP,
@@ -229,10 +228,10 @@ An application may use \fB\%init_color\fP to alter the internal table
 along with the terminal's color.
 .PP
 These limits apply to color values and color pairs.
-Values outside these limits are not legal, and may result in a runtime error:
+Values outside these limits are not valid, and may result in a runtime error:
 .bP
 \fBCOLORS\fP corresponds to the terminal database's \fB\%max_colors\fP capability,
-(see \fB\%terminfo\fP(\*n)).
+(see \fB\%terminfo\fP(5)).
 .bP
 color values are expected to be in the range \fB0\fP to \fB\%COLORS\-1\fP,
 inclusive (including \fB0\fP and \fB\%COLORS\-1\fP).
@@ -242,9 +241,9 @@ to denote the \fIdefault color\fP (see \fB\%use_default_colors\fP(3X)).
 .bP
 \fB\%COLOR_PAIRS\fP corresponds to
 the terminal database's \fB\%max_pairs\fP capability,
-(see \fB\%terminfo\fP(\*n)).
+(see \fB\%terminfo\fP(5)).
 .bP
-legal color pair values are in the range \fB1\fP to \fB\%COLOR_PAIRS\-1\fP,
+valid color pair values are in the range \fB1\fP to \fB\%COLOR_PAIRS\-1\fP,
 inclusive.
 .bP
 color pair \fB0\fP is special; it denotes \*(``no color\*(''.
@@ -272,12 +271,12 @@ the number of the color-pair to be changed, the foreground
 color number, and the background color number.
 For portable applications:
 .bP
-The first argument must be a legal color pair value.
+The first argument must be a valid color pair value.
 If default colors are used (see \fB\%use_default_colors\fP(3X))
 the upper limit is adjusted to allow for extra pairs which use
 a default color in foreground and/or background.
 .bP
-The second and third arguments must be legal color values.
+The second and third arguments must be valid color values.
 .PP
 If the color-pair was previously initialized,
 the screen is refreshed and all occurrences of that color-pair
@@ -300,7 +299,7 @@ It takes four arguments:
 the number of the color to be changed followed by three RGB values
 (for the amounts of red, green, and blue components).
 .bP
-The first argument must be a legal color value;
+The first argument must be a valid color value;
 default colors are not allowed here.
 (See the section \fB\%Colors\fP for the default color index.)
 .bP
@@ -326,7 +325,7 @@ of \fBshort\fRs for storing
 the information about the amounts of red, green, and blue components in the
 given color.
 .bP
-The first argument must be a legal color value, i.e.,
+The first argument must be a valid color value, i.e.,
 \fB0\fP through \fB\%COLORS\-1\fP, inclusive.
 .bP
 The values that are stored at the addresses pointed to by the
@@ -348,7 +347,7 @@ It requires three arguments: the color-pair
 number, and two addresses of \fBshort\fRs for storing the foreground and the
 background color numbers.
 .bP
-The first argument must be a legal color value,
+The first argument must be a valid color value,
 i.e., in the range \fB1\fP through \fB\%COLOR_PAIRS\-1\fP, inclusive.
 .bP
 The values that are stored at the addresses pointed
@@ -449,6 +448,37 @@ Paradise and compatibles) do the wrong thing when you try to set a bright
 \*(``yellow\*('' background (you get a blinking yellow foreground instead).
 .bP
 Color RGB values are not settable.
+.SH EXTENSIONS
+The functions marked as extensions were designed for \fBncurses\fP(3X),
+and are not found in SVr4 curses, 4.4BSD curses,
+or any other previous version of curses.
+.SH PORTABILITY
+This implementation satisfies XSI Curses's minimum maximums
+for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
+.PP
+The \fB\%init_pair\fP routine accepts negative values of foreground
+and background color to support the \fB\%use_default_colors\fP(3X) extension,
+but only if that routine has been first invoked.
+.PP
+The assumption that \fB\%COLOR_BLACK\fP is the default
+background color for all terminals can be modified using the
+\fB\%assume_default_colors\fP(3X) extension.
+.PP
+This implementation checks the pointers,
+e.g., for the values returned by
+\fB\%color_content\fP and \fB\%pair_content\fP,
+and will treat those as optional parameters when null.
+.PP
+X/Open Curses does not specify a limit for the number of colors and
+color pairs which a terminal can support.
+However, in its use of \fBshort\fP for the parameters,
+it carries over SVr4's implementation detail for the compiled
+terminfo database, which uses signed 16-bit numbers.
+This implementation provides extended versions of those functions
+which use \fBshort\fP parameters,
+allowing applications to use larger color- and pair-numbers.
+.PP
+The \fB\%reset_color_pairs\fP function is an extension of ncurses.
 .SH HISTORY
 SVr3.2 introduced color support to curses in 1987.
 .PP
@@ -497,38 +527,6 @@ Like ncurses before version 6,
 the NetBSD color-pair information is stored in
 the attributes field of \fB\%cchar_t\fP, limiting the number of color-pairs
 by the size of the bitfield.
-.SH PORTABILITY
-.SS Extensions
-The functions marked as extensions were designed for \fBncurses\fP(3X),
-and are not found in SVr4 curses, 4.4BSD curses,
-or any other previous version of curses.
-.SS Standards
-This implementation satisfies XSI Curses's minimum maximums
-for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
-.PP
-The \fB\%init_pair\fP routine accepts negative values of foreground
-and background color to support the \fB\%use_default_colors\fP(3X) extension,
-but only if that routine has been first invoked.
-.PP
-The assumption that \fB\%COLOR_BLACK\fP is the default
-background color for all terminals can be modified using the
-\fB\%assume_default_colors\fP(3X) extension.
-.PP
-This implementation checks the pointers,
-e.g., for the values returned by
-\fB\%color_content\fP and \fB\%pair_content\fP,
-and will treat those as optional parameters when null.
-.PP
-X/Open Curses does not specify a limit for the number of colors and
-color pairs which a terminal can support.
-However, in its use of \fBshort\fP for the parameters,
-it carries over SVr4's implementation detail for the compiled
-terminfo database, which uses signed 16-bit numbers.
-This implementation provides extended versions of those functions
-which use \fBshort\fP parameters,
-allowing applications to use larger color- and pair-numbers.
-.PP
-The \fB\%reset_color_pairs\fP function is an extension of ncurses.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 9cc5ef18b..3ef55d723 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH curs_deleteln 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.33 2023/11/25 14:08:05 tom Exp $
+.TH curs_deleteln 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%deleteln\fP,
 \fB\%wdeleteln\fP,
@@ -76,11 +76,6 @@ completion.
 X/Open defines no error conditions.
 In this implementation,
 if the window parameter is null, an error is returned.
-.SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-The
-standard specifies that they return \fBERR\fP on failure, but specifies no
-error conditions.
 .SH NOTES
 Note that all but \fBwinsdelln\fP may be macros.
 .PP
@@ -88,5 +83,10 @@ These routines do not require a hardware line delete or insert feature in the
 terminal.
 In fact, they will not use hardware line delete/insert unless
 \fBidlok(..., TRUE)\fP has been set on the current window.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
+The
+standard specifies that they return \fBERR\fP on failure, but specifies no
+error conditions.
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index a6aaae47b..873870662 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_extend 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.42 2023/11/25 14:26:30 tom Exp $
+.TH curs_extend 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -86,7 +86,7 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey.
 .SH SEE ALSO
 \fB\%curs_getch\fP(3X),
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 63036343c..810e8d2fe 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.28 2023/11/11 11:39:15 tom Exp $
-.TH curs_get_wch 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH curs_get_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -138,32 +138,6 @@ An application can push special keys
 which it may read via \fBwget_wch\fP
 by checking for the \fBKEY_CODE_YES\fP result,
 and using \fBungetch\fP for those special keys.
-.SH NOTES
-The header file
-\fB<curses.h>\fP
-automatically
-includes the header file
-\fB<stdio.h>\fP.
-.PP
-Applications should not define the escape key by itself as a single-character
-function.
-.PP
-When using
-\fBget_wch\fP,
-\fBwget_wch\fP,
-\fBmvget_wch\fP, or
-\fBmvwget_wch\fP, applications should
-not use
-\fBnocbreak\fP
-mode and
-\fBecho\fP
-mode
-at the same time.
-Depending on the state of the tty driver when each character
-is typed, the program may produce undesirable results.
-.PP
-All functions except \fBwget_wch\fP and \fBunget_wch\fP
-may be macros.
 .SH RETURN VALUE
 When
 \fBget_wch\fP,
@@ -188,6 +162,30 @@ Otherwise, the function returns
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
+.SH NOTES
+Applications should not define the escape key by itself as a single-character
+function.
+.PP
+When using
+\fBget_wch\fP,
+\fBwget_wch\fP,
+\fBmvget_wch\fP, or
+\fBmvwget_wch\fP, applications should
+not use
+\fBnocbreak\fP
+mode and
+\fBecho\fP
+mode
+at the same time.
+Depending on the state of the tty driver when each character
+is typed, the program may produce undesirable results.
+.PP
+All of these symbols except
+\fB\%wget_wch\fP and
+\fB\%unget_wch\fP
+may be available as macros.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 697dfd1c6..4ec2c3ec8 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.39 2023/11/11 11:39:29 tom Exp $
-.TH curs_get_wstr 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.41 2023/11/25 14:29:54 tom Exp $
+.TH curs_get_wstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -130,6 +130,26 @@ versions read at most
 \fIn\fP
 characters, letting the application prevent overflow of the
 input buffer.
+.SH RETURN VALUE
+All of these functions return the integer \fBOK\fP upon successful completion.
+If unsuccessful, they return \fBERR\fP.
+.PP
+X/Open defines no error conditions.
+.PP
+In this implementation,
+these functions return an error
+.bP
+if the window pointer is null,
+.bP
+if its timeout expires without having any data, or
+.bP
+if the associated call to
+\fBwget_wch\fP
+failed.
+.PP
+Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+\fBwmove\fP, and return an error if the position is outside the window,
+or if the window pointer is null.
 .SH NOTES
 Any of these functions other than
 \fBwgetn_wstr\fP
@@ -154,27 +174,6 @@ respectively, is recommended.
 .PP
 These functions cannot return \fBKEY_\fP values because there
 is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
-may be macros.
-.SH RETURN VALUE
-All of these functions return the integer \fBOK\fP upon successful completion.
-If unsuccessful, they return \fBERR\fP.
-.PP
-X/Open defines no error conditions.
-.PP
-In this implementation,
-these functions return an error
-.bP
-if the window pointer is null,
-.bP
-if its timeout expires without having any data, or
-.bP
-if the associated call to
-\fBwget_wch\fP
-failed.
-.PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
 .SH PORTABILITY
 These functions are described in The Single Unix Specification, Version 2.
 No error conditions are defined.
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 3ec21e4b8..1f2f74502 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.40 2023/11/11 11:39:43 tom Exp $
-.TH curs_getcchar 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.42 2023/11/25 14:30:18 tom Exp $
+.TH curs_getcchar 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -103,6 +103,22 @@ Additional nonspacing characters are ignored.
 .IP
 The string may contain a single control character instead.
 In that case, no nonspacing characters are allowed.
+.SH RETURN VALUE
+When \fIwch\fP is a null pointer,
+\fBgetcchar\fP returns the number of wide characters referenced by
+\fIwcval\fP,
+including one for a trailing null.
+.PP
+When \fIwch\fP is not a null pointer,
+\fBgetcchar\fP returns \fBOK\fP upon successful completion,
+and \fBERR\fP otherwise.
+.PP
+Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
+Otherwise, it returns \fBERR\fP.
+.SH NOTES
+The \fIwcval\fP argument may be a value generated by a call to
+\fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
+If \fIwcval\fP is constructed by any other means, the effect is unspecified.
 .SH EXTENSIONS
 X/Open Curses documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
@@ -118,22 +134,6 @@ For functions which retrieve the color, e.g., \fBgetcchar\fP,
 if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
 and  used  to  retrieve  the color pair as an \fBint\fP value,
 in addition retrieving it via the standard pointer to \fBshort\fP parameter.
-.SH NOTES
-The \fIwcval\fP argument may be a value generated by a call to
-\fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
-If \fIwcval\fP is constructed by any other means, the effect is unspecified.
-.SH RETURN VALUE
-When \fIwch\fP is a null pointer,
-\fBgetcchar\fP returns the number of wide characters referenced by
-\fIwcval\fP,
-including one for a trailing null.
-.PP
-When \fIwch\fP is not a null pointer,
-\fBgetcchar\fP returns \fBOK\fP upon successful completion,
-and \fBERR\fP otherwise.
-.PP
-Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
-Otherwise, it returns \fBERR\fP.
 .SH PORTABILITY
 The \fBCCHARW_MAX\fP symbol is specific to ncurses.
 X/Open Curses does not provide details for the layout of the \fBcchar_t\fP
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 0aea21bfc..a7d0c8ce3 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.49 2023/10/07 21:19:07 tom Exp $
-.TH curs_getstr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.51 2023/11/25 14:29:54 tom Exp $
+.TH curs_getstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,27 +127,6 @@ versions read at most
 \fIn\fP
 characters, letting the application prevent overflow of the
 input buffer.
-.SH NOTES
-Any of these functions other than
-\fBwgetnstr\fP
-may be macros.
-.PP
-Using
-\fBgetstr\fP,
-\fBmvgetstr\fP,
-\fBmvwgetstr\fP, or
-\fBwgetstr\fP
-to read a line that
-overflows the array pointed to by
-\fBstr\fP
-causes undefined
-results.
-The use of
-\fBgetnstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetnstr\fP, or
-\fBwgetnstr\fP,
-respectively, is recommended.
 .SH RETURN VALUE
 All of these functions return the integer \fBOK\fP upon successful completion.
 (SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
@@ -173,6 +152,27 @@ rather than \fBOK\fP or \fBERR\fP.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
+.SH NOTES
+Any of these functions other than
+\fBwgetnstr\fP
+may be macros.
+.PP
+Using
+\fBgetstr\fP,
+\fBmvgetstr\fP,
+\fBmvwgetstr\fP, or
+\fBwgetstr\fP
+to read a line that
+overflows the array pointed to by
+\fBstr\fP
+causes undefined
+results.
+The use of
+\fBgetnstr\fP,
+\fBmvgetnstr\fP,
+\fBmvwgetnstr\fP, or
+\fBwgetnstr\fP,
+respectively, is recommended.
 .SH PORTABILITY
 These functions are described in The Single Unix Specification, Version 2.
 No error conditions are defined.
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 78ff32dc6..fd07da5f2 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.56 2023/10/21 10:28:36 tom Exp $
-.TH curs_inopts 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.58 2023/11/25 14:30:50 tom Exp $
+.TH curs_inopts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -287,6 +287,27 @@ Also,
 returns an error
 if its parameter is outside the range 1..255.
 .RE
+.SH NOTES
+Note that
+\fBecho\fP,
+\fB\%noecho\fP,
+\fB\%halfdelay\fP,
+\fB\%intrflush\fP,
+\fBmeta\fP,
+\fBnl\fP,
+\fBnonl\fP,
+\fB\%nodelay\fP,
+\fB\%notimeout\fP,
+\fB\%noqiflush\fP,
+\fB\%qiflush\fP,
+\fB\%timeout\fP, and
+\fB\%wtimeout\fP may be macros.
+.PP
+The \fB\%noraw\fP and \fB\%nocbreak\fP calls follow historical practice in that
+they attempt to restore to normal (\*(``cooked\*('') mode
+from raw and cbreak modes respectively.
+Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
+control states that are hard to predict or understand; it is not recommended.
 .SH EXTENSIONS
 This implementation provides four functions which may be used to detect
 if the corresponding flags were set or reset:
@@ -375,27 +396,6 @@ These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
 key definition,
 the later definition is the one used.
-.SH NOTES
-Note that
-\fBecho\fP,
-\fB\%noecho\fP,
-\fB\%halfdelay\fP,
-\fB\%intrflush\fP,
-\fBmeta\fP,
-\fBnl\fP,
-\fBnonl\fP,
-\fB\%nodelay\fP,
-\fB\%notimeout\fP,
-\fB\%noqiflush\fP,
-\fB\%qiflush\fP,
-\fB\%timeout\fP, and
-\fB\%wtimeout\fP may be macros.
-.PP
-The \fB\%noraw\fP and \fB\%nocbreak\fP calls follow historical practice in that
-they attempt to restore to normal (\*(``cooked\*('') mode
-from raw and cbreak modes respectively.
-Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
-control states that are hard to predict or understand; it is not recommended.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 6c50e9b62..8ef12e442 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.22 2023/10/07 21:19:07 tom Exp $
-.TH curs_ins_wch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.24 2023/11/25 11:32:28 tom Exp $
+.TH curs_ins_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -68,8 +68,8 @@ If not, they return \fBERR\fP.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
-.SH ERRORS
-No errors are defined.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_insch\fP(3X)
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index cf056dac9..f059fceec 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.27 2023/11/18 23:44:30 tom Exp $
-.TH curs_ins_wstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.29 2023/11/25 11:29:34 tom Exp $
+.TH curs_ins_wstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,8 +109,8 @@ functions will fail.
 XSI does not define what will happen if a nonspacing character follows
 a control character.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4, which adds
-const qualifiers to the arguments.
+These functions are described in the XSI Curses standard, Issue 4,
+which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 X/Open states that the entire string is inserted if \fIn\fP is less than 1.
 This is probably an error,
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 8f03c31a3..ef338ade9 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.44 2023/11/18 23:46:00 tom Exp $
-.TH curs_insstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.46 2023/11/25 11:29:34 tom Exp $
+.TH curs_insstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,8 +103,8 @@ or if the window pointer is null.
 .SH NOTES
 All but \fBwinsnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4, which adds
-const qualifiers to the arguments.
+These functions are described in the XSI Curses standard, Issue 4,
+which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 The Single Unix Specification, Version 2 states that
 \fBinsnstr\fP and \fBwinsnstr\fP perform wrapping.
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index b5646a65c..13835a4e8 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.41 2023/11/19 00:20:02 tom Exp $
-.TH curs_instr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.43 2023/11/25 17:58:25 tom Exp $
+.TH curs_instr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -119,7 +119,7 @@ value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_inchstr\fP(3X),
 \fB\%curs_inch\fP(3X),
+\fB\%curs_inchstr\fP(3X),
 \fB\%curs_inwstr\fP(3X),
 \fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 8c20d8217..fd748d088 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.33 2023/11/19 00:10:50 tom Exp $
-.TH curs_inwstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.35 2023/11/25 11:31:49 tom Exp $
+.TH curs_inwstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -128,6 +128,8 @@ Therefore, the use of
 \fBmvwinnwstr\fP, or
 \fBwinnwstr\fP
 is recommended.
+.SH PORTABILITY
+These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 85c350b48..2fa712752 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.50 2023/11/11 11:46:54 tom Exp $
-.TH curs_outopts 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.52 2023/11/25 14:08:05 tom Exp $
+.TH curs_outopts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -156,6 +156,16 @@ returns an error if the scrolling region limits extend outside the window.
 X/Open does not define any error conditions.
 This implementation returns an error
 if the window pointer is null.
+.SH NOTES
+Note that
+\fBclearok\fP,
+\fBleaveok\fP,
+\fBscrollok\fP,
+\fBidcok\fP, and
+\fBsetscrreg\fP may be macros.
+.PP
+The \fBimmedok\fP routine is useful for windows that are used as terminal
+emulators.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .PP
@@ -188,16 +198,6 @@ The XSI Curses standard does not mention that the cursor should be
 made invisible as a side-effect of \fBleaveok\fP.
 SVr4 curses documentation does this, but the code does not.
 Use \fBcurs_set\fP to make the cursor invisible.
-.SH NOTES
-Note that
-\fBclearok\fP,
-\fBleaveok\fP,
-\fBscrollok\fP,
-\fBidcok\fP, and
-\fBsetscrreg\fP may be macros.
-.PP
-The \fBimmedok\fP routine is useful for windows that are used as terminal
-emulators.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 392147897..422824b79 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
-.TH curs_overlay 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.35 2023/11/25 11:29:34 tom Exp $
+.TH curs_overlay 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%overlay\fP,
 \fB\%overwrite\fP,
@@ -76,8 +76,8 @@ if some part of the window would be placed off-screen.
 .SH NOTES
 Note that \fBoverlay\fP and \fBoverwrite\fP may be macros.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4 describes these functions (adding the const
-qualifiers).
+These functions are described in the XSI Curses standard, Issue 4,
+which adds \fI\%const\fP qualifiers to the arguments.
 It further specifies their behavior in the presence of characters
 with multibyte renditions (not yet supported in this implementation).
 .SH SEE ALSO
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 95d70bba0..a20c1c369 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.47 2023/11/11 11:47:10 tom Exp $
-.TH curs_pad 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.49 2023/11/25 14:08:35 tom Exp $
+.TH curs_pad 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -68,11 +68,9 @@ window will be on the screen at one time.
 Automatic refreshes of pads
 (e.g., from scrolling or echoing of input) do not occur.
 .PP
-It is not
-legal to call \fB\%wrefresh\fP with a \fIpad\fP as an argument; the routines
-\fB\%prefresh\fP or \fB\%pnoutrefresh\fP should be called instead.
-Note that these
-routines require additional parameters to specify the part of the pad to be
+It is not valid to call \fB\%wrefresh\fP with a \fIpad\fP argument;
+call \fB\%prefresh\fP or \fB\%pnoutrefresh\fP instead.
+They require additional parameters to specify the part of the pad to be
 displayed and the location on the screen to be used for the display.
 .SS subpad
 The \fB\%subpad\fP routine creates and returns a pointer to a subwindow within a
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 8d7c081d3..e9f2f74f5 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH curs_printw 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.43 2023/11/25 11:31:06 tom Exp $
+.TH curs_printw 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -91,6 +91,25 @@ It will return an error if the window pointer is null.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
+.SH PORTABILITY
+In this implementation, \fBvw_printw\fP and \fBvwprintw\fP are equivalent,
+to support legacy applications.
+However, the latter (\fBvwprintw\fP) is obsolete:
+.bP
+The XSI Curses standard, Issue 4 described these functions.
+The function
+\fBvwprintw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
+\fBvw_printw\fP using the \fB<stdarg.h>\fP interface.
+.bP
+The Single Unix Specification, Version 2 states that
+\fBvw_printw\fP  is preferred to \fBvwprintw\fP since the latter requires
+including \fB<varargs.h>\fP, which
+cannot be used in the same file as \fB<stdarg.h>\fP.
+This implementation uses \fB<stdarg.h>\fP for both,
+because that header is included in \fB<curses.h\fP>.
+.bP
+X/Open Curses, Issue 5 (December 2007) marked \fBvwprintw\fP (along with
+\fBvwscanw\fP and the termcap interface) as withdrawn.
 .SH HISTORY
 While \fBprintw\fP was implemented in 4BSD,
 it was unused until 4.2BSD (which used it in games).
@@ -127,25 +146,6 @@ type.
 .PP
 X/Open Curses added \fBvw_printw\fP to replace \fBvwprintw\fP,
 stating that its \fBva_list\fP definition requires <stdarg.h>.
-.SH PORTABILITY
-In this implementation, \fBvw_printw\fP and \fBvwprintw\fP are equivalent,
-to support legacy applications.
-However, the latter (\fBvwprintw\fP) is obsolete:
-.bP
-The XSI Curses standard, Issue 4 described these functions.
-The function
-\fBvwprintw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
-\fBvw_printw\fP using the \fB<stdarg.h>\fP interface.
-.bP
-The Single Unix Specification, Version 2 states that
-\fBvw_printw\fP  is preferred to \fBvwprintw\fP since the latter requires
-including \fB<varargs.h>\fP, which
-cannot be used in the same file as \fB<stdarg.h>\fP.
-This implementation uses \fB<stdarg.h>\fP for both,
-because that header is included in \fB<curses.h\fP>.
-.bP
-X/Open Curses, Issue 5 (December 2007) marked \fBvwprintw\fP (along with
-\fBvwscanw\fP and the termcap interface) as withdrawn.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addstr\fP(3X),
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index f51d39b43..47993a7ed 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH curs_scanw 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.43 2023/11/25 11:31:06 tom Exp $
+.TH curs_scanw 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,44 +90,6 @@ which were mapped in the call.
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
 or if the window pointer is null.
-.SH HISTORY
-While \fBscanw\fP was implemented in 4BSD,
-none of the BSD releases used it until 4.4BSD (in a game).
-That early version of curses was before the ANSI C standard.
-It did not use <varargs.h>, though that was available.
-In 1991 (a couple of years after SVr4 was generally available,
-and after the C standard was published),
-other developers updated the library,
-using <stdarg.h> internally in 4.4BSD curses.
-Even with this improvement,
-BSD curses did not use function prototypes (or even declare
-functions) in the <curses.h> header until 1992.
-.PP
-SVr2 documented
-\fBscanw\fP,
-\fBwscanw\fP
-tersely as \*(``scanf through \fIstdscr\fP\*('' and
-tersely as \*(``scanf through \fIwin\fP\*('', respectively.
-.PP
-SVr3 added
-\fBmvscanw\fP, and
-\fBmvwscanw\fP, with a three-line summary saying that they were analogous
-to \fBscanf\fP(3),
-explaining that the string which would be output from \fBscanf\fP(3) would
-instead be output using \fBwaddstr\fP on the given window.
-SVr3 also added \fBvwscanw\fP, saying that the third parameter
-is a \fBva_list\fP, defined in <varargs.h>,
-and referring the reader to the manual pages for \fIvarargs\fP and
-\fBvprintf\fP for detailed descriptions.
-(Because the SVr3 documentation does not mention \fBvscanf\fP,
-that reference to \fBvprintf\fP may not be an error).
-.PP
-SVr4 added no new variations of \fBscanw\fP,
-but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
-type.
-.PP
-X/Open Curses added \fBvw_scanw\fP to replace \fBvwscanw\fP,
-stating that its \fBva_list\fP definition requires <stdarg.h>.
 .SH PORTABILITY
 In this implementation, \fBvw_scanw\fP and \fBvwscanw\fP are equivalent,
 to support legacy applications.
@@ -167,6 +129,44 @@ since the \fBOK\fP value (zero) is likely to be misleading.
 .IP
 One possible way to get useful results would be to use a "%n" conversion
 at the end of the format string to ensure that something was processed.
+.SH HISTORY
+While \fBscanw\fP was implemented in 4BSD,
+none of the BSD releases used it until 4.4BSD (in a game).
+That early version of curses was before the ANSI C standard.
+It did not use <varargs.h>, though that was available.
+In 1991 (a couple of years after SVr4 was generally available,
+and after the C standard was published),
+other developers updated the library,
+using <stdarg.h> internally in 4.4BSD curses.
+Even with this improvement,
+BSD curses did not use function prototypes (or even declare
+functions) in the <curses.h> header until 1992.
+.PP
+SVr2 documented
+\fBscanw\fP,
+\fBwscanw\fP
+tersely as \*(``scanf through \fIstdscr\fP\*('' and
+tersely as \*(``scanf through \fIwin\fP\*('', respectively.
+.PP
+SVr3 added
+\fBmvscanw\fP, and
+\fBmvwscanw\fP, with a three-line summary saying that they were analogous
+to \fBscanf\fP(3),
+explaining that the string which would be output from \fBscanf\fP(3) would
+instead be output using \fBwaddstr\fP on the given window.
+SVr3 also added \fBvwscanw\fP, saying that the third parameter
+is a \fBva_list\fP, defined in <varargs.h>,
+and referring the reader to the manual pages for \fIvarargs\fP and
+\fBvprintf\fP for detailed descriptions.
+(Because the SVr3 documentation does not mention \fBvscanf\fP,
+that reference to \fBvprintf\fP may not be an error).
+.PP
+SVr4 added no new variations of \fBscanw\fP,
+but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
+type.
+.PP
+X/Open Curses added \fBvw_scanw\fP to replace \fBvwscanw\fP,
+stating that its \fBva_list\fP definition requires <stdarg.h>.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getstr\fP(3X),
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 66603f1a1..1ef95559b 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.33 2023/11/11 11:47:41 tom Exp $
-.TH curs_scr_dump 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.35 2023/11/25 11:29:34 tom Exp $
+.TH curs_scr_dump 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,8 +103,8 @@ each will return an error if the file cannot be opened.
 .SH NOTES
 Note that \fBscr_init\fP, \fBscr_set\fP, and \fBscr_restore\fP may be macros.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4, describes these functions (adding the const
-qualifiers).
+These functions are described in the XSI Curses standard, Issue 4,
+which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 The SVr4 docs merely say under \fBscr_init\fP that the dump data is also
 considered invalid "if the time-stamp of the tty is old" but do not define
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 7bc27a6de..550005c88 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.64 2023/10/21 10:31:22 tom Exp $
-.TH curs_slk 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.66 2023/11/25 14:31:07 tom Exp $
+.TH curs_slk 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -234,29 +234,9 @@ the \fIlabnum\fP parameter is outside the range of label counts, or
 if the format parameter is outside the range 0..2, or if
 memory for the labels cannot be allocated.
 .RE
-.SH HISTORY
-SVr3 introduced these functions:
-  \fBslk_clear\fP
-  \fBslk_init\fP
-  \fBslk_label\fP
-  \fBslk_noutrefresh\fP
-  \fBslk_refresh\fP
-  \fBslk_restore\fP
-  \fBslk_set\fP
-  \fBslk_touch\fP
-.PP
-SVr4 added these functions:
-  \fBslk_attroff\fP
-  \fBslk_attron\fP
-  \fBslk_attrset\fP
-  \fBslk_start\fP
-.PP
-X/Open \fIcurses\fP added these:
-  \fBslk_attr_off\fP
-  \fBslk_attr_on\fP
-  \fBslk_attr_set\fP
-  \fBslk_color\fP
-  \fBslk_wset\fP
+.SH NOTES
+Most applications would use \fB\%slk_noutrefresh\fP because a
+\fB\%wrefresh\fP is likely to follow soon.
 .SH EXTENSIONS
 X/Open \fIcurses\fP documents the \fIopts\fP argument
 as reserved for future use,
@@ -268,9 +248,6 @@ parameter to support extended color pairs.
 For  functions  which modify the color, e.g., \fB\%slk_attr_set\fP,
 if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
 and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
-.SH NOTES
-Most applications would use \fB\%slk_noutrefresh\fP because a
-\fB\%wrefresh\fP is likely to follow soon.
 .SH PORTABILITY
 The XSI \fIcurses\fP standard, Issue 4, described the soft-key functions,
 with some differences from SVr4 \fIcurses\fP:
@@ -336,6 +313,29 @@ terminfo database, which uses signed 16-bit numbers.
 This implementation provides extended versions of those functions
 which use \fBint\fP parameters,
 allowing applications to use larger color- and pair-numbers.
+.SH HISTORY
+SVr3 introduced these functions:
+  \fBslk_clear\fP
+  \fBslk_init\fP
+  \fBslk_label\fP
+  \fBslk_noutrefresh\fP
+  \fBslk_refresh\fP
+  \fBslk_restore\fP
+  \fBslk_set\fP
+  \fBslk_touch\fP
+.PP
+SVr4 added these functions:
+  \fBslk_attroff\fP
+  \fBslk_attron\fP
+  \fBslk_attrset\fP
+  \fBslk_start\fP
+.PP
+X/Open \fIcurses\fP added these:
+  \fBslk_attr_off\fP
+  \fBslk_attr_on\fP
+  \fBslk_attr_set\fP
+  \fBslk_color\fP
+  \fBslk_wset\fP
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 22c9f41e1..1c075cd08 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.42 2023/10/14 19:51:44 tom Exp $
-.TH curs_sp_funcs 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.44 2023/11/25 15:48:03 tom Exp $
+.TH curs_sp_funcs 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,7 +53,7 @@
 \fBbool can_change_color_sp(SCREEN* \fIsp\fP);
 \fBint cbreak_sp(SCREEN* \fIsp\fP);
 \fBint color_content_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short* \fIr\fP, short* \fIg\fP, short* \fIb\fP);
-\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fR);
+\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fP);
 \fBint def_prog_mode_sp(SCREEN* \fIsp\fP);
 \fBint def_shell_mode_sp(SCREEN* \fIsp\fP);
 .PP
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 0c0a16839..e0497b29f 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.70 2023/10/14 19:26:28 tom Exp $
-.TH curs_termcap 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.72 2023/11/25 14:32:36 tom Exp $
+.TH curs_termcap 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fB\%PC\fP,
 \fB\%UP\fP,
@@ -390,6 +389,6 @@ this respect.
 \fB\%curses\fP(3X),
 \fB\%putc\fP(3),
 \fB\%term_variables\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
 .PP
 https://invisible\-island.net/ncurses/tctest.html
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 606e3afc0..f8d2e68a8 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.117 2023/11/11 11:48:04 tom Exp $
-.TH curs_terminfo 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.119 2023/11/25 14:32:36 tom Exp $
+.TH curs_terminfo 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,7 +46,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fB\%del_curterm\fP,
 \fB\%mvcur\fP,
@@ -133,7 +132,7 @@ Initially, \fBsetupterm\fP should be called.
 The high-level curses functions \fBinitscr\fP and
 \fBnewterm\fP call \fBsetupterm\fP to initialize the
 low-level set of terminal-dependent variables
-[listed in \fBterminfo\fP(\*n)].
+[listed in \fBterminfo\fP(5)].
 .PP
 Applications can use the
 terminal capabilities either directly (via header definitions),
@@ -393,7 +392,7 @@ The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
 the value of the capability corresponding to the \fBterminfo\fP
 \fIcapname\fP passed to them, such as \fBxenl\fP.
 The \fIcapname\fP for each capability is given in the table column entitled
-\fIcapname\fP code in the capabilities section of \fBterminfo\fP(\*n).
+\fIcapname\fP code in the capabilities section of \fBterminfo\fP(5).
 .PP
 These routines return special values to denote errors.
 .PP
@@ -458,7 +457,7 @@ allocated by \fBsetupterm\fP:
 the \*(``static\*('' terminfo variables [a-z].
 Before ncurses 6.3, those were shared by all screens.
 With ncurses 6.3, those are allocated per screen.
-See \fBterminfo\fP(\*n) for details.
+See \fBterminfo\fP(5) for details.
 .bP
 to improve performance, ncurses 6.3 caches the result of analyzing terminfo
 strings for their parameter types.
@@ -509,6 +508,18 @@ X/Open states that \fBtputs\fP ignores the return value
 of the output function \fIputc\fP.
 .RE
 .\" ***************************************************************************
+.SH NOTES
+X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
+.\" ***************************************************************************
+.SH EXTENSIONS
+The functions marked as extensions were designed for \fBncurses\fP(3X),
+and are not found in SVr4 curses, 4.4BSD curses,
+or any other previous version of curses.
+.\" ***************************************************************************
+.SH PORTABILITY
+The function \fBsetterm\fP is not described by X/Open and must
+be considered non-portable.
+All other functions are as described by X/Open.
 .SS Compatibility macros
 This implementation provides a few macros for compatibility with systems
 before SVr4 (see \fIHISTORY\fP).
@@ -532,126 +543,7 @@ was replaced by \fB\%setupterm\fP, stating that the call
 provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
 and is not recommended for new programs.
 This implementation provides each of those symbols
-as macros for BSD compatibility,
-.\" ***************************************************************************
-.SH HISTORY
-SVr2 introduced the terminfo feature.
-Its programming manual mentioned the following low-level functions.
-.PP
-.TS
-lB lB
-lB lx.
-Function	Description
-_
-fixterm	restore tty to \*(``in curses\*('' state
-gettmode	establish current tty modes
-mvcur	low level cursor motion
-putp	T{
-utility function that uses \fBtputs\fP to send characters via \fBputchar\fP.
-T}
-resetterm	set tty modes to \*(``out of curses\*('' state
-resetty	reset tty flags to stored value
-saveterm	save current modes as \*(``in curses\*('' state
-savetty	store current tty flags
-setterm	establish terminal with given type
-setupterm	establish terminal with given type
-tparm	instantiate a string expression with parameters
-tputs	apply padding information to a string
-vidattr	like \fBvidputs\fP, but outputs through \fBputchar\fP
-vidputs	T{
-output a string to put terminal in a specified video attribute mode
-T}
-.TE
-.PP
-The programming manual also mentioned
-functions provided for \fItermcap\fP compatibility
-(commenting that they \*(``may go away at a later date\*('').
-.PP
-.TS
-lB lB
-lB lx.
-Function	Description
-_
-tgetent	look up \fItermcap\fP entry for given \fIname\fP
-tgetflag	get boolean entry for given \fIid\fP
-tgetnum	get numeric entry for given \fIid\fP
-tgetstr	get string entry for given \fIid\fP
-tgoto	apply parameters to given capability
-tputs	T{
-apply padding to capability, calling a function to put characters
-T}
-.TE
-.PP
-Early terminfo programs obtained capability values from the
-\fBTERMINAL\fP structure initialized by \fBsetupterm\fP.
-.PP
-SVr3 extended terminfo by adding functions to retrieve capability values
-(like the termcap interface),
-and reusing \fBtgoto\fP and \fBtputs\fP:
-.PP
-.TS
-lB lB
-lB lx.
-Function	Description
-_
-tigetflag	get boolean entry for given \fIid\fP
-tigetnum	get numeric entry for given \fIid\fP
-tigetstr	get string entry for given \fIid\fP
-.TE
-.PP
-SVr3 also replaced several of the SVr2 \fIterminfo\fP functions
-which had no counterpart in the \fItermcap\fP interface,
-documenting them as obsolete.
-.PP
-.TS
-lB lB
-l  lx.
-Function	Replaced by
-_
-crmode	cbreak
-fixterm	reset_prog_mode
-gettmode	\fIn/a\fP
-nocrmode	nocbreak
-resetterm	reset_shell_mode
-saveterm	def_prog_mode
-setterm	setupterm
-.TE
-.PP
-SVr3 kept the \fBmvcur\fP, \fBvidattr\fP and \fBvidputs\fP functions,
-along with \fBputp\fP, \fBtparm\fP and \fBtputs\fP.
-The latter were needed to support padding,
-and handling functions such as \fBvidattr\fP
-(which used more than the two parameters supported by \fBtgoto\fP).
-.PP
-SVr3 introduced the functions for switching between terminal
-descriptions, e.g., \fBset_curterm\fP.
-Some of that was incremental improvements to the SVr2 library:
-.bP
-The \fBTERMINAL\fP type definition was introduced in SVr3.01,
-for the \fBterm\fP structure provided in SVr2.
-.bP
-The various global variables such as \fBboolnames\fP were mentioned
-in the programming manual at this point,
-though the variables were provided in SVr2.
-.PP
-SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions.
-.PP
-There are other low-level functions declared in the \fIcurses\fP header files
-on Unix systems,
-but none were documented.
-The functions marked \*(``obsolete\*('' remained in use
-by the Unix \fBvi\fP(1) editor.
-.SH PORTABILITY
-.SS Extensions
-The functions marked as extensions were designed for \fBncurses\fP(3X),
-and are not found in SVr4 curses, 4.4BSD curses,
-or any other previous version of curses.
-.SS Legacy functions
-X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
-.PP
-The function \fBsetterm\fP is not described by X/Open and must
-be considered non-portable.
-All other functions are as described by X/Open.
+as macros for BSD compatibility.
 .SS Legacy data
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
@@ -774,6 +666,114 @@ So though it is documented as a terminfo function,
 X/Open states that the old location must be given for \fBmvcur\fP.
 This implementation allows the caller to use \-1's for the old ordinates.
 In that case, the old location is unknown.
+.\" ***************************************************************************
+.SH HISTORY
+SVr2 introduced the terminfo feature.
+Its programming manual mentioned the following low-level functions.
+.PP
+.TS
+lB lB
+lB lx.
+Function	Description
+_
+fixterm	restore tty to \*(``in curses\*('' state
+gettmode	establish current tty modes
+mvcur	low level cursor motion
+putp	T{
+utility function that uses \fBtputs\fP to send characters via \fBputchar\fP.
+T}
+resetterm	set tty modes to \*(``out of curses\*('' state
+resetty	reset tty flags to stored value
+saveterm	save current modes as \*(``in curses\*('' state
+savetty	store current tty flags
+setterm	establish terminal with given type
+setupterm	establish terminal with given type
+tparm	instantiate a string expression with parameters
+tputs	apply padding information to a string
+vidattr	like \fBvidputs\fP, but outputs through \fBputchar\fP
+vidputs	T{
+output a string to put terminal in a specified video attribute mode
+T}
+.TE
+.PP
+The programming manual also mentioned
+functions provided for \fItermcap\fP compatibility
+(commenting that they \*(``may go away at a later date\*('').
+.PP
+.TS
+lB lB
+lB lx.
+Function	Description
+_
+tgetent	look up \fItermcap\fP entry for given \fIname\fP
+tgetflag	get boolean entry for given \fIid\fP
+tgetnum	get numeric entry for given \fIid\fP
+tgetstr	get string entry for given \fIid\fP
+tgoto	apply parameters to given capability
+tputs	T{
+apply padding to capability, calling a function to put characters
+T}
+.TE
+.PP
+Early terminfo programs obtained capability values from the
+\fBTERMINAL\fP structure initialized by \fBsetupterm\fP.
+.PP
+SVr3 extended terminfo by adding functions to retrieve capability values
+(like the termcap interface),
+and reusing \fBtgoto\fP and \fBtputs\fP:
+.PP
+.TS
+lB lB
+lB lx.
+Function	Description
+_
+tigetflag	get boolean entry for given \fIid\fP
+tigetnum	get numeric entry for given \fIid\fP
+tigetstr	get string entry for given \fIid\fP
+.TE
+.PP
+SVr3 also replaced several of the SVr2 \fIterminfo\fP functions
+which had no counterpart in the \fItermcap\fP interface,
+documenting them as obsolete.
+.PP
+.TS
+lB lB
+l  lx.
+Function	Replaced by
+_
+crmode	cbreak
+fixterm	reset_prog_mode
+gettmode	\fIn/a\fP
+nocrmode	nocbreak
+resetterm	reset_shell_mode
+saveterm	def_prog_mode
+setterm	setupterm
+.TE
+.PP
+SVr3 kept the \fBmvcur\fP, \fBvidattr\fP and \fBvidputs\fP functions,
+along with \fBputp\fP, \fBtparm\fP and \fBtputs\fP.
+The latter were needed to support padding,
+and handling functions such as \fBvidattr\fP
+(which used more than the two parameters supported by \fBtgoto\fP).
+.PP
+SVr3 introduced the functions for switching between terminal
+descriptions, e.g., \fBset_curterm\fP.
+Some of that was incremental improvements to the SVr2 library:
+.bP
+The \fBTERMINAL\fP type definition was introduced in SVr3.01,
+for the \fBterm\fP structure provided in SVr2.
+.bP
+The various global variables such as \fBboolnames\fP were mentioned
+in the programming manual at this point,
+though the variables were provided in SVr2.
+.PP
+SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions.
+.PP
+There are other low-level functions declared in the \fIcurses\fP header files
+on Unix systems,
+but none were documented.
+The functions marked \*(``obsolete\*('' remained in use
+by the Unix \fBvi\fP(1) editor.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
@@ -783,4 +783,4 @@ In that case, the old location is unknown.
 \fB\%curs_variables\fP(3X),
 \fB\%putc\fP(3),
 \fB\%term_variables\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 9df26ba25..1648dee20 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.47 2023/10/07 21:19:07 tom Exp $
-.TH curs_threads 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.49 2023/11/25 14:09:12 tom Exp $
+.TH curs_threads 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,7 +81,7 @@ since doing so alters \fIncurses\fP's application binary interface
 Instead of modifying the programming interface (API) to make
 \fIncurses\fP functions expect an additional argument specifying a
 thread,
-the library adds a few functions,
+the library adds functions,
 usable in any configuration,
 that hide the \fImutexes\fP
 (mutual exclusion locks)
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 8fc44abe6..61adaf0f9 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_touch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_touch.3x,v 1.42 2023/11/25 14:08:05 tom Exp $
+.TH curs_touch 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -105,6 +105,8 @@ returns an error
 if the window pointer is null, or
 if the line number is outside the window.
 .RE
+.SH NOTES
+All of these routines except \fB\%wtouchln\fP may be macros.
 .SH PORTABILITY
 These functions were introduced by SVr4.
 The Solaris \fIcurses\fP header file,
@@ -116,8 +118,6 @@ otherwise this implementation behaves the same as SVr4.
 .PP
 The XSI Curses standard, Issue 4 describes these functions,
 but defines no error conditions.
-.SH NOTES
-All of these routines except \fB\%wtouchln\fP may be macros.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X),
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index f75686101..913ad6b8c 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH curs_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.34 2023/11/25 14:32:36 tom Exp $
+.TH curs_variables 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,7 +48,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fI\%bool\fP,
 \fI\%chtype\fP,
@@ -297,7 +296,7 @@ or to rely upon its default.
 \fB\%curs_terminfo\fP(3X),
 \fB\%curs_threads\fP(3X),
 \fB\%term_variables\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
 .PP
 [UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
 Segmentation\*('';
diff --git a/man/curs_window.3x b/man/curs_window.3x
index b5262b854..a4cc25242 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.41 2023/10/14 19:27:01 tom Exp $
-.TH curs_window 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.43 2023/11/25 14:17:29 tom Exp $
+.TH curs_window 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -138,7 +138,7 @@ Calling \fBderwin\fP is the same as calling \fBsubwin,\fP except that
 \fIbegin\fR_\fIy\fP and \fIbegin\fR_\fIx\fP are relative to the origin
 of the window \fIorig\fP rather than the screen.
 There is no difference between the subwindows and the derived windows.
-.PP
+.SS mvderwin
 Calling \fBmvderwin\fP moves a derived window (or subwindow)
 inside its parent window.
 The screen-relative parameters of the window are not changed.
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 3c2a115e0..b33f8f09e 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.45 2023/10/07 21:19:07 tom Exp $
-.TH default_colors 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.47 2023/11/25 14:26:30 tom Exp $
+.TH default_colors 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -145,7 +145,7 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using NCURSES_VERSION.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey (from an analysis of the requirements for color xterm
 for XFree86 3.1.2C, February 1996).
 .SH SEE ALSO
diff --git a/man/define_key.3x b/man/define_key.3x
index fcf8bee2b..48e7b61a4 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
-.TH define_key 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.39 2023/11/25 14:26:30 tom Exp $
+.TH define_key 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
@@ -63,7 +63,7 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
 \fB\%keyok\fP(3X),
diff --git a/man/form.3x b/man/form.3x
index e40e313b6..0ce6bbb4e 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
-.TH form 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.50 2023/11/25 13:59:44 tom Exp $
+.TH form 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -215,19 +215,14 @@ System error occurred (see \fBerrno\fP(3)).
 .B E_UNKNOWN_COMMAND
 The form driver code saw an unknown request code.
 .SH NOTES
-The header file \fB<form.h>\fP automatically includes the header files
-\fB<curses.h>\fP and \fB<eti.h>\fP.
-.PP
-In your library list, libform.a should be before libncurses.a; that is,
-you want to say \*(``\-lform \-lncurses\*('', not the other way around
-(which would give you a link error when using static libraries).
+The header file \fI\%form.h\fP itself includes \fI\%curses.h\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
 Version 7 or BSD versions.
 .PP
-The menu facility was documented in SVr4.2 in
-\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
+A form facility was documented in SVr4.2's
+\fICharacter User Interface Programming\fP document.
 .PP
 It is not part of X/Open Curses.
 .PP
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index 3e2e6b2df..04afa9a10 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
-.TH form_cursor 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.29 2023/11/25 13:58:47 tom Exp $
+.TH form_cursor 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \-
 position a form window cursor
@@ -59,9 +59,6 @@ The form has not been posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_data.3x b/man/form_data.3x
index 7c113223b..c062ecf19 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH form_data 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH form_data 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \-
@@ -49,9 +49,6 @@ It returns TRUE (1) or FALSE (0).
 The function \fBdata_behind\fP tests whether there is off-screen data
 behind in the given form.
 It returns TRUE (1) or FALSE (0).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 14e7828af..d8434a818 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.51 2023/10/07 21:19:07 tom Exp $
-.TH form_driver 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.53 2023/11/25 13:58:47 tom Exp $
+.TH form_driver 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -248,9 +248,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_UNKNOWN_COMMAND
 The form driver code saw an unknown request code.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header files
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field.3x b/man/form_field.3x
index 036b0ad48..a43625392 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH form_field 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH form_field 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
@@ -76,9 +76,6 @@ The form is already posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index 0b2040519..ecd4c31ba 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH form_field_attributes 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_attributes.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH form_field_attributes 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -85,9 +85,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index cba17f754..fde890e3e 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH form_field_buffer 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.42 2023/11/25 13:58:47 tom Exp $
+.TH form_field_buffer 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -126,14 +126,11 @@ System error occurred (see \fBerrno\fP(3)).
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
 .SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-.PP
 When configured for wide characters, \fBfield_buffer\fP returns a pointer
 to temporary storage (allocated and freed by the library).
 The application should not attempt to modify the data.
 It will be freed on the next call to \fBfield_buffer\fP to return the
 same buffer.
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index 47ddbd480..a40b605fb 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH form_field_info 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_info.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH form_field_info 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,9 +79,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index a9445f83b..7294a1796 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH form_field_just 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_just.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH form_field_just 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,9 +70,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index cf603edf3..78f77ac59 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.37 2023/10/07 21:19:07 tom Exp $
-.TH form_field_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.39 2023/11/25 13:58:47 tom Exp $
+.TH form_field_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
@@ -88,9 +88,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_CONNECTED
 field is connected.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 34e2de932..796710295 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH form_field_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.42 2023/11/25 13:58:47 tom Exp $
+.TH form_field_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
@@ -133,9 +133,6 @@ The field is the current field.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index a94215fe1..d667ca123 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
-.TH form_field_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.28 2023/11/25 13:58:47 tom Exp $
+.TH form_field_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \-
@@ -50,9 +50,6 @@ The function \fBfield_userptr\fP returns a pointer (which may be \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_field_userptr\fP returns \fBE_OK\fP (success).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 6b2bddaea..c037d59ef 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.48 2023/10/07 21:19:07 tom Exp $
-.TH form_field_validation 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.50 2023/11/25 13:58:47 tom Exp $
+.TH form_field_validation 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -195,9 +195,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 376d0f336..b94ff965f 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.42 2023/10/07 21:19:07 tom Exp $
-.TH form_fieldtype 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.44 2023/11/25 13:58:47 tom Exp $
+.TH form_fieldtype 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -150,9 +150,6 @@ The field is the current field.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 37b05eb68..4d7cb5f2b 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH form_hook 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
+.TH form_hook 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
@@ -85,9 +85,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_new.3x b/man/form_new.3x
index cc15c5320..edc3ac03f 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH form_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH form_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \-
@@ -72,9 +72,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_POSTED
 The form has already been posted.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 1a60ac4a1..234a4ed6e 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH form_new_page 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_new_page.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH form_new_page 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,9 +66,6 @@ The routine succeeded.
 .TP 5
 .B E_CONNECTED
 The given field is already connected to a form.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_opts.3x b/man/form_opts.3x
index a662e71b8..1b60d9ba5 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH form_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH form_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
@@ -74,9 +74,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_page.3x b/man/form_page.3x
index ee0b89875..a4e94f37d 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH form_page 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH form_page 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
@@ -83,9 +83,6 @@ The form driver could not process the request.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_post.3x b/man/form_post.3x
index 82e05ebcc..ec5272a09 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH form_post 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
+.TH form_post 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \-
@@ -74,9 +74,6 @@ The form has already been posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 5b1be8d3d..68cfb8abd 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH form_requestname 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH form_requestname 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
@@ -52,9 +52,6 @@ to \fBE_BAD_ARGUMENT\fP.
 .PP
 \fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines are specific to ncurses.
 They were not supported on
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 00d49e994..ada886294 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH form_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH form_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \-
@@ -49,9 +49,6 @@ The function \fBform_userptr\fP returns a pointer (which may be \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_form_userptr\fP returns \fBE_OK\fP (success).
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/form_win.3x b/man/form_win.3x
index a4bd5cc0f..600185a4a 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH form_win 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH form_win 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
@@ -79,9 +79,6 @@ The form has already been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the form.
-.SH NOTES
-The header file \fB<form.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V forms library.
 They were not supported on
diff --git a/man/infocmp.1m b/man/infocmp.1m
index cc99150da..8b6f8c153 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.97 2023/10/14 19:26:28 tom Exp $
-.TH @INFOCMP@ 1M 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.99 2023/11/25 17:10:25 tom Exp $
+.TH @INFOCMP@ 1M 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,7 +46,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB@INFOCMP@\fP \-
@@ -54,35 +53,35 @@ compare or print out \fIterminfo\fP descriptions
 .SH SYNOPSIS
 \fB@INFOCMP@\fP [\fB\-\
 1\
+c\
 C\
+d\
 D\
+e\
 E\
 F\
+g\
 G\
+i\
 I\
 K\
-L\
-T\
-U\
-V\
-W\
-c\
-d\
-e\
-g\
-i\
 l\
+L\
 n\
 p\
 q\
 r\
 t\
+T\
 u\
+U\
+V\
+W\
 x\
 \fP]
       [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fBsubset\fR]
       [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
-      [\fItermname\fP...]
+      [\fIterminal-type\fP ...]
 .SH DESCRIPTION
 \fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
 terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
@@ -92,14 +91,16 @@ In all cases, the boolean
 fields will be printed first, followed by the numeric fields, followed by the
 string fields.
 .SS Default Options
-If no options are specified and zero or one \fItermnames\fP are specified, the
+If no options are specified and zero or one \fIterminal-types\fP are
+specified,
+the
 \fB\-I\fP option will be assumed.
-If more than one \fItermname\fP is specified,
+If more than one \fIterminal-type\fP is specified,
 the \fB\-d\fP option will be assumed.
 .SS Comparison Options [\-d] [\-c] [\-n]
 \fB@INFOCMP@\fP compares the \fBterminfo\fP description of the first terminal
-\fItermname\fP with each of the descriptions given by the entries for the other
-terminal's \fItermnames\fP.
+\fIterminal-type\fP with each of the descriptions given by the entries
+for the other terminal's \fIterminal-types\fP.
 If a capability is defined for only one of the
 terminals, the value returned depends on the type of the capability:
 .bP
@@ -138,9 +139,9 @@ Normally only the conventional capabilities are shown.
 Use the \fB\-x\fP option to add the BSD-compatibility
 capabilities (names prefixed with \*(``OT\*('').
 .IP
-If no \fItermnames\fP are given,
+If no \fIterminal-types\fP are given,
 \fB@INFOCMP@\fP uses the environment variable \fBTERM\fP
-for each of the \fItermnames\fP.
+for each of the \fIterminal-types\fP.
 .SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
 The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
 a source listing for each terminal named.
@@ -155,8 +156,8 @@ l l .
 \fB\-K\fP/modifies the \fB\-C\fP option, improving BSD-compatibility.
 .TE
 .PP
-If no \fItermnames\fP are given, the environment variable \fBTERM\fP will be
-used for the terminal name.
+If no \fIterminal-types\fP are given,
+the environment variable \fBTERM\fP will be used for the terminal name.
 .PP
 The source produced by the \fB\-C\fP option may be used directly as a
 \fBtermcap\fP entry, but not all parameterized strings can be changed to
@@ -223,12 +224,12 @@ l l l.
 .TE
 .SS Use= Option [\-u]
 The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
-terminal \fItermname\fP which is relative to the sum of the descriptions given
-by the entries for the other terminals \fItermnames\fP.
+terminal \fIterminal-type\fP which is relative to the sum of the
+descriptions given by the entries for the other \fIterminal-types\fP.
 It does this by
-analyzing the differences between the first \fItermname\fP and the other
-\fItermnames\fP and producing a description with \fBuse=\fP fields for the
-other terminals.
+analyzing the differences between the first \fIterminal-types\fP and the
+other \fIterminal-types\fP and producing a description with \fBuse=\fP
+fields for the other terminals.
 In this manner, it is possible to retrofit generic terminfo
 entries into a terminal's description.
 Or, if two similar terminals exist, but
@@ -238,21 +239,24 @@ will show what can be done to change
 one description to be relative to the other.
 .PP
 A capability will be printed with an at-sign (@) if it no longer exists in the
-first \fItermname\fP, but one of the other \fItermname\fP entries contains a
-value for it.
+first \fIterminal-type\fP,
+but one of the other \fIterminal-type\fP entries contains a value for
+it.
 A capability's value will be printed if the value in the first
-\fItermname\fP is not found in any of the other \fItermname\fP entries, or if
-the first of the other \fItermname\fP entries that has this capability gives a
-different value for the capability than that in the first \fItermname\fP.
+\fIterminal-type\fP is not found in any of the other \fIterminal-type\fP
+entries,
+or if the first of the other \fIterminal-type\fP entries that has this
+capability gives a different value for the capability than that in the
+first \fIterminal-type\fP.
 .PP
-The order of the other \fItermname\fP entries is significant.
+The order of the other \fIterminal-type\fP entries is significant.
 Since the
 terminfo compiler \fB@TIC@\fP does a left-to-right scan of the capabilities,
 specifying two \fBuse=\fP entries that contain differing entries for the same
 capabilities will produce different results depending on the order that the
 entries are given in.
 \fB@INFOCMP@\fP will flag any such inconsistencies between
-the other \fItermname\fP entries as they are found.
+the other \fIterminal-type\fP entries as they are found.
 .PP
 Alternatively, specifying a capability \fIafter\fP a \fBuse=\fP entry that
 contains that capability will cause the second specification to be ignored.
@@ -263,7 +267,7 @@ description.
 Another error that does not cause incorrect compiled files, but will slow down
 the compilation time, is specifying extra \fBuse=\fP fields that are
 superfluous.
-\fB@INFOCMP@\fP will flag any other \fItermname use=\fP fields that
+\fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
 were not needed.
 .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
 Like other \fBncurses\fP utilities,
@@ -271,15 +275,16 @@ Like other \fBncurses\fP utilities,
 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), as well as
-the \fIFetching Compiled Descriptions\fP section in \fBterminfo\fR(\*n).
+the \fIFetching Compiled Descriptions\fP section in \fBterminfo\fR(5).
 .PP
 You can also use the options \fB\-A\fP
 and \fB\-B\fP to override the list of places to search
 when comparing terminal descriptions:
 .bP
-The \fB\-A\fP option sets the location for the first \fItermname\fP
+The \fB\-A\fP option sets the location for the first \fIterminal-type\fP
 .bP
-The \fB\-B\fP option sets the location for the other \fItermnames\fP.
+The \fB\-B\fP option sets the location for the other
+\fIterminal-types\fP.
 .PP
 Using these options, it is possible to
 compare descriptions for a terminal with the same name located in two different
@@ -480,7 +485,7 @@ that have their own extensions incompatible with SVr4/XSI.
 .bP
 Available terminfo
 subsets are \*(``SVr1\*('', \*(``Ultrix\*('', \*(``HP\*('', and \*(``AIX\*('';
-see \fBterminfo\fP(\*n) for details.
+see \fBterminfo\fP(5) for details.
 .bP
 You can also choose the subset \*(``BSD\*('' which selects only capabilities
 with termcap equivalents recognized by 4.4BSD.
@@ -563,41 +568,13 @@ Use the \fB\-W\fP option to do this.
 changes the output to \fIwidth\fP characters.
 .TP
 \fB\-x\fP
-print information for user-defined capabilities (see \fBuser_caps(\*n)\fP.
+print information for user-defined capabilities (see \fBuser_caps\fP(5).
 These are extensions to the terminfo repertoire which can be loaded
 using the \fB\-x\fP option of \fB@TIC@\fP.
 .SH FILES
 .TP
 .I \*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\fP,
@@ -631,21 +608,49 @@ is System V Release 4's.
 Actual BSD curses versions will have a more restricted set.
 To see only the
 4.4BSD set, use \fB\-r\fP \fB\-RBSD\fP.
-.SH AUTHOR
+.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 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 BUGS
+The \fB\-F\fP option of \fB\%@INFOCMP@\fP(1M) should be a
+\fB\%@TOE@\fP(1M) mode.
+.SH AUTHORS
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
 Thomas E. Dickey <dickey@invisible\-island.net>
-.SH BUGS
-The \fB\-F\fP option of \fB\%@INFOCMP@\fP(1M) should be a
-\fB\%@TOE@\fP(1M) mode.
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
 \fB\%@INFOTOCAP@\fP(1M),
 \fB\%@TIC@\fP(1M),
 \fB\%@TOE@\fP(1M),
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n),
-\fB\%user_caps\fP(\*n)
+\fB\%terminfo\fP(5),
+\fB\%user_caps\fP(5)
 .PP
 https://invisible\-island.net/ncurses/tctest.html
diff --git a/man/infotocap.1m b/man/infotocap.1m
index f2c006cb8..597fbb1be 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.35 2023/10/14 19:25:26 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.37 2023/11/25 14:32:36 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,11 +40,11 @@
 .el   .ds '' ""
 .\}
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@INFOTOCAP@\fP \-
-convert a \fIterminfo\fR description into a \fItermcap\fR description
+convert a \fI\%terminfo\fR description into a \fI\%termcap\fR
+description
 .SH SYNOPSIS
 .B @INFOTOCAP@
 .RI [ tic-option ]
@@ -53,14 +53,15 @@ convert a \fIterminfo\fR description into a \fItermcap\fR description
 .P
 .B "@INFOTOCAP@ \-V"
 .SH DESCRIPTION
-\fB\%@INFOTOCAP@\fP looks in each given text
-\fIfile\fP for \fIterminfo\fP descriptions.
+\fB\%@INFOTOCAP@\fP translates terminal descriptions.
+It looks in each given text \fIfile\fP for \fI\%terminfo\fP entries and,
 For each one found,
-it writes an analogous \fItermcap\fP description to the standard output
-stream.
-\fIterminfo\fP \*(``\fBuse\fP\*('' capabilities are translated directly
-to \fItermcap\fP \fBtc\fP capabilities.
-Because \fItermcap\fP is a less expressive format than \fIterminfo\fP,
+it writes an analogous \fI\%termcap\fP description to the standard
+output stream.
+\fI\%terminfo\fP \*(``\fBuse\fP\*('' capabilities translate to
+\fI\%termcap\fP \fBtc\fP capabilities.
+Because \fI\%termcap\fP is a less expressive format than
+\fI\%terminfo\fP,
 some capabilities cannot be translated.
 .PP
 This utility is implemented as a link to \fB\%@TIC@\fP(1M),
@@ -74,17 +75,18 @@ You can use other \fB\%@TIC@\fP options such as
 .BR \-w ,
 and
 .BR \-x .
-The \fB\-V\fP option reports the version of \fIncurses\fP associated
+The \fB\-V\fP option reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
 .SH FILES
 .TP
 .I \*d
 compiled terminal description database
 .SH PORTABILITY
-None of X/Open Curses, Issue 7 (2009),
+None of X/Open Curses,
+Issue 7 (2009),
 SVr4,
 or NetBSD document this application.
-.SH AUTHOR
+.SH AUTHORS
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
@@ -93,4 +95,4 @@ Thomas E. Dickey <dickey@invisible\-island.net>
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TIC@\fP(1M),
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/key_defined.3x b/man/key_defined.3x
index f1b63d7f6..311315418 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH key_defined 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.31 2023/11/25 14:26:30 tom Exp $
+.TH key_defined 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
@@ -55,7 +55,7 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
 \fB\%define_key\fP(3X)
diff --git a/man/keybound.3x b/man/keybound.3x
index b44253a94..f72cd664d 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.31 2023/10/21 10:31:22 tom Exp $
-.TH keybound 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.33 2023/11/25 14:26:30 tom Exp $
+.TH keybound 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
@@ -58,7 +58,7 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
 \fB\%define_key\fP(3X),
diff --git a/man/keyok.3x b/man/keyok.3x
index ce5ca3ee0..b2e402d1f 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
-.TH keyok 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.37 2023/11/25 14:26:30 tom Exp $
+.TH keyok 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
@@ -57,7 +57,7 @@ It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
 \fB\%define_key\fP(3X)
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 73f14d4f5..fad145c04 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.21 2023/10/07 21:19:07 tom Exp $
-.TH legacy_coding 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.23 2023/11/25 14:26:30 tom Exp $
+.TH legacy_coding 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -72,7 +72,7 @@ This routine is specific to ncurses.
 It was not supported on Version 7, BSD or System V implementations.
 It is recommended that any code depending on ncurses extensions
 be conditioned using NCURSES_VERSION.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey (to support lynx's font-switching feature).
 .SH SEE ALSO
 \fB\%unctrl\fP(3X)
diff --git a/man/make_sed.sh b/man/make_sed.sh
index 2b9ea9f5b..c271f63a2 100755
--- a/man/make_sed.sh
+++ b/man/make_sed.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: make_sed.sh,v 1.17 2023/06/25 18:13:17 tom Exp $
+# $Id: make_sed.sh,v 1.18 2023/11/25 14:31:18 tom Exp $
 ##############################################################################
 # Copyright 2020-2022,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
@@ -66,6 +66,7 @@ sed	-e 's/^/s\/\\</' \
 	-e 's/$/\//' >$UPPER
 
 {
+echo "# This script was generated from '$1' by man/make_sed.sh."
 echo "# Do the TH lines"
 sed	-e 's/\//\/TH /' \
 	-e 's/	/ /' \
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 1d12a80ee..1616ae18a 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.60 2023/04/22 15:49:32 tom Exp $
+# $Id: man_db.renames.in,v 1.61 2023/11/25 14:32:36 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -163,7 +163,6 @@ term.5				term.5
 term.7				term.7
 term_variables.3x		terminfo_variables.3ncurses
 terminfo.5			terminfo.5
-terminfo.\\\*n			terminfo.5
 tic.1m				tic.1
 toe.1m				toe.1
 tput.1				tput.1
diff --git a/man/menu.3x b/man/menu.3x
index bdcec5a66..601ec050c 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.39 2023/10/07 21:19:07 tom Exp $
-.TH menu 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.41 2023/11/25 13:59:44 tom Exp $
+.TH menu 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -190,19 +190,15 @@ System error occurred (see \fBerrno\fP(3)).
 .B E_UNKNOWN_COMMAND
 The menu driver code saw an unknown request code.
 .SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header files
-\fB<curses.h>\fP and \fB<eti.h>\fP.
-.PP
-In your library list, libmenu.a should be before libncurses.a; that is,
-you should say \*(``\-lmenu \-lncurses\*('', not the other way around
-(which would give a link-error when using static libraries).
+The header file \fI\%menu.h\fP itself includes the header file
+\fI\%curses.h\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
 Version 7 or BSD versions.
 .PP
-The menu facility was documented in SVr4.2 in
-\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
+A menu facility was documented in SVr4.2's
+\fICharacter User Interface Programming\fP document.
 .PP
 It is not part of X/Open Curses.
 .PP
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 6b4be3524..397a72bf5 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH menu_attributes 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_attributes.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH menu_attributes 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,9 +101,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_BAD_ARGUMENT
 Routine detected an incorrect or out-of-range argument.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 3f01c1e47..5319e08c4 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.26 2023/10/07 21:19:07 tom Exp $
-.TH menu_cursor 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.28 2023/11/25 13:58:47 tom Exp $
+.TH menu_cursor 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \-
 position a menu's cursor
@@ -57,9 +57,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_NOT_POSTED
 The menu has not been posted.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 10e9d2167..19ab95e53 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH menu_driver 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.43 2023/11/25 13:58:47 tom Exp $
+.TH menu_driver 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -191,9 +191,6 @@ Character failed to match.
 .TP 5
 .B E_REQUEST_DENIED
 The menu driver could not process the request.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header files
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_format.3x b/man/menu_format.3x
index 952ea9a79..8372b18d3 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH menu_format 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH menu_format 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \-
@@ -74,9 +74,6 @@ The menu is already posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 844639317..a2d23526a 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH menu_hook 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH menu_hook 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
@@ -84,9 +84,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_items.3x b/man/menu_items.3x
index da0b49100..6c6d1cdfa 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH menu_items 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH menu_items 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
@@ -72,9 +72,6 @@ The menu is already posted.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 91b891c46..bcdf33405 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH menu_mark 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH menu_mark 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \-
@@ -70,9 +70,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 8ead72971..30bd686d2 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH menu_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH menu_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \-
@@ -69,9 +69,6 @@ Routine detected an incorrect or out-of-range argument.
 .TP 5
 .B E_POSTED
 The menu has already been posted.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 439891acc..ad7a392cb 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH menu_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
+.TH menu_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
@@ -94,9 +94,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_POSTED
 The menu is already posted.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index f5647fb58..2b00fb774 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.34 2023/10/07 21:19:07 tom Exp $
-.TH menu_pattern 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.36 2023/11/25 13:58:47 tom Exp $
+.TH menu_pattern 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \-
@@ -79,9 +79,6 @@ Character failed to match.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 2e855e2ff..d33a98c37 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH menu_post 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH menu_post 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \-
@@ -77,9 +77,6 @@ The menu has not been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 8c33b607c..897fd7354 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH menu_requestname 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH menu_requestname 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
@@ -53,9 +53,6 @@ and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
 .br
 \fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines are specific to ncurses.
 They were not supported on
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 4d960b6fb..06a9b03ba 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH menu_spacing 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH menu_spacing 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
@@ -79,9 +79,6 @@ Both routines return \fBE_OK\fP on success.
 \fBset_menu_spacing\fP may return
 \fBE_POSTED\fP if the menu is posted, or \fBE_BAD_ARGUMENT\fP if one of the
 spacing values is out of range.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines are specific to ncurses.
 They were not supported on
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 36db008ae..52efb3349 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH menu_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
+.TH menu_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \-
@@ -49,9 +49,6 @@ These functions get and set the menu user pointer field.
 It does not set \fBerrno\fP.
 .PP
 \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/menu_win.3x b/man/menu_win.3x
index bc244b1a4..71798787c 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH menu_win 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH menu_win 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
@@ -79,9 +79,6 @@ The menu has already been posted.
 .TP 5
 .B E_NOT_CONNECTED
 No items are connected to the menu.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 648213ac3..59f77b1ba 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
-.TH mitem_current 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.35 2023/11/25 13:58:47 tom Exp $
+.TH mitem_current 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
@@ -83,9 +83,6 @@ No items are connected to the menu.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 126c3fb9e..fe1b90cf8 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.27 2023/10/07 21:19:07 tom Exp $
-.TH mitem_name 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.29 2023/11/25 13:58:47 tom Exp $
+.TH mitem_name 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \-
@@ -48,9 +48,6 @@ item.
 .SH RETURN VALUE
 These routines return a pointer (which may be \fBNULL\fP).
 They do not set \fBerrno\fP.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on Version 7 or BSD versions.
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 418e6a9f8..f93ef3a1d 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH mitem_new 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
+.TH mitem_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \-
@@ -77,9 +77,6 @@ Item is connected to a menu.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index c9c600b2d..0c14c252f 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH mitem_opts 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
+.TH mitem_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
@@ -69,9 +69,6 @@ The routine succeeded.
 .TP 5
 .B E_SYSTEM_ERROR
 System error occurred (see \fBerrno\fP(3)).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index a723dbf2d..d1a2530d4 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.30 2023/10/07 21:19:07 tom Exp $
-.TH mitem_userptr 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
+.TH mitem_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \-
@@ -50,9 +50,6 @@ The function \fBitem_userptr\fP returns a pointer (possibly \fBNULL\fP).
 It does not set \fBerrno\fP.
 .PP
 The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 84dd0bfd2..8bec8644a 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.28 2023/10/07 21:19:07 tom Exp $
-.TH mitem_value 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
+.TH mitem_value 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \-
@@ -60,9 +60,6 @@ System error occurred (see \fBerrno\fP(3)).
 .TP 5
 .B E_REQUEST_DENIED
 The menu driver could not process the request.
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index abd629435..98f924afd 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -27,10 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.23 2023/10/07 21:19:07 tom Exp $
-.TH mitem_visible 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.25 2023/11/25 14:18:16 tom Exp $
+.TH mitem_visible 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
-\fBmitem_visible\fP \-
+\fBitem_visible\fP \-
 check visibility of a menu item
 .SH SYNOPSIS
 .nf
@@ -42,9 +42,6 @@ check visibility of a menu item
 A menu item is visible when it is in the portion of a posted menu that
 is mapped onto the screen (if the menu is scrollable, in particular, this
 portion will be smaller than the whole menu).
-.SH NOTES
-The header file \fB<menu.h>\fP automatically includes the header file
-\fB<curses.h>\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
 They were not supported on
diff --git a/man/ncurses.3x b/man/ncurses.3x
index d6911f36a..fc0e549ad 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.179 2023/10/14 19:29:06 tom Exp $
-.TH ncurses 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.181 2023/11/25 14:32:36 tom Exp $
+.TH ncurses 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%ncurses\fP \-
@@ -64,20 +63,39 @@ This describes \fBncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .PP
 The \fBncurses\fP library emulates the curses library of
-System V Release 4 UNIX,
+System V Release 4 Unix (\*(``SVr4\*(''),
 and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
 XSI stands for X/Open System Interfaces Extension.
 The \fBncurses\fP library is freely redistributable in source form.
-Differences from the SVr4
-curses are summarized under the
-\fIEXTENSIONS\fP and \fIPORTABILITY\fP sections below and
-described in detail in the respective
-\fIEXTENSIONS\fP, \fIPORTABILITY\fP and \fIBUGS\fP sections
-of individual man pages.
 .PP
-The \fBncurses\fP library also provides many useful extensions,
-i.e., features which cannot be implemented by a simple add-on library
-but which require access to the internals of the library.
+\fI\%ncurses\fP man pages employ several sections to clarify matters of
+usage and interoperability with other \fIcurses\fP implementations.
+.bP
+\*(``NOTES\*('' describes matters and caveats of which any user of the
+\fI\%ncurses\fP API should be aware,
+such as limitations on the size of an underlying integral type or the
+availability of a preprocessor macro for a function
+(which prevents its address from being taken).
+This section also describes implementation details that will be
+significant to the programmer but which are not standardized.
+.bP
+\*(``EXTENSIONS\*('' presents \fI\%ncurses\fP innovations beyond the
+X/Open Curses standard and/or the SVr4 \fIcurses\fP implementation.
+They are termed \fIextensions\fP to indicate that they cannot be
+implemented solely by using the library API, but require access to the
+library's internal state.
+.bP
+\*(``PORTABILITY\*('' discusses matters
+(beyond the exercise of extensions)
+that should be considered when writing to a \fIcurses\fP standard,
+or to multiple implementations.
+.bP
+\*(``HISTORY\*('' examines points of detail in \fI\%ncurses\fP and other
+\fIcurses\fP implementations over the decades of their development,
+particularly where precedent or inertia have frustrated better design
+(and,
+in a few cases,
+where such inertia has been overcome).
 .PP
 A program using these routines must be linked with the \fB\-lncurses\fP option,
 or (if it has been generated) with the debugging library \fB\-lncurses_g\fP.
@@ -139,7 +157,7 @@ should be set and its initialization strings, if defined, must be output.
 This can be done by executing the \fB@TPUT@ init\fP command
 after the shell environment variable \fBTERM\fP has been exported.
 (The BSD-style \fB\%@TSET@\fP(1) utility also performs this function.)
-See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(\*n).
+See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(5).
 .SS Datatypes
 The \fBncurses\fP library permits manipulation of data structures,
 called \fIwindows\fP, which can be thought of as two-dimensional
@@ -1373,6 +1391,13 @@ tab stop initialization database
 .TP
 .I \*d
 compiled terminal capability database
+.SH NOTES
+If standard output from a \fBncurses\fP program is re-directed to something
+which is not a tty, screen updates will be directed to standard error.
+This was an undocumented feature of AT&T System V Release 3 curses.
+.PP
+See subsection \*(``Header files\*('' below regarding symbols exposed by
+inclusion of \fI\%curses.h\fP.
 .SH EXTENSIONS
 The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
 that falls back to the old-style /etc/termcap file if the terminal setup code
@@ -1468,14 +1493,14 @@ See \fBcurs_sp_funcs\fP(3X) for details.
 .SS Padding differences
 In historic curses versions, delays embedded in the capabilities \fBcr\fP,
 \fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
-bits in the UNIX tty driver.
+bits in the Unix tty driver.
 In this implementation, all padding is done by sending NUL bytes.
 This method is slightly more expensive, but narrows the interface
-to the UNIX kernel significantly and increases the package's portability
+to the Unix kernel significantly and increases the package's portability
 correspondingly.
 .SS Header files
-The header file \fB<curses.h>\fP automatically includes the header files
-\fB<stdio.h>\fP and \fB<unctrl.h>\fP.
+The header file \fI\%curses.h\fP itself includes the header files
+\fI\%stdio.h\fP and \fI\%unctrl.h\fP.
 .PP
 X/Open Curses has more to say,
 but does not finish the story:
@@ -1568,15 +1593,11 @@ None of the X/Open Curses implementations require an application
 to include <stdarg.h> before <curses.h> because they either
 have allowed for a special type, or (like ncurses) include <stdarg.h>
 directly to provide a portable interface.
-.SH NOTES
-If standard output from a \fBncurses\fP program is re-directed to something
-which is not a tty, screen updates will be directed to standard error.
-This was an undocumented feature of AT&T System V Release 3 curses.
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
 .SH SEE ALSO
-\fB\%terminfo\fP(\*n) and related pages whose names begin
+\fB\%terminfo\fP(5) and related pages whose names begin
 \*(``curs_\*('' for detailed routine descriptions.
 .br
 \fB\%curs_variables\fP(3X)
diff --git a/man/new_pair.3x b/man/new_pair.3x
index cbc686bdc..8da580b30 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.41 2023/10/21 10:31:22 tom Exp $
-.TH new_pair 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.43 2023/11/25 14:26:30 tom Exp $
+.TH new_pair 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -160,7 +160,7 @@ They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
 any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
 \fB\%curs_color\fP(3X)
diff --git a/man/panel.3x b/man/panel.3x
index 57a577461..497006ff4 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.57 2023/10/14 19:20:40 tom Exp $
-.TH panel 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.59 2023/11/25 14:08:47 tom Exp $
+.TH panel 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,7 +46,7 @@
 ..
 .SH NAME
 panel \-
-panel stack extension for curses
+panel stack extension for \fI\%curses\fP
 .SH SYNOPSIS
 .nf
 \fB#include <panel.h>
@@ -77,187 +77,214 @@ panel stack extension for curses
 \fBPANEL *ceiling_panel(SCREEN *\fIsp\fP);
 .fi
 .SH DESCRIPTION
-Panels are \fBcurses\fP(3X) windows with the added feature of
+Panels are \fBcurses\fP(3X) windows with the added property of
 depth.
-Panel functions allow the use of stacked windows and ensure
-the proper portions of each window and the curses \fBstdscr\fP window are
-hidden or displayed when panels are added, moved, modified or removed.
+Panel functions allow the use of stacked windows and ensure that the
+proper portions of each window and the \fI\%curses\fP \fB\%stdscr\fP
+window are hidden or displayed when panels are added,
+moved,
+modified,
+or removed.
 The set of currently visible panels is the stack of panels.
 The
-\fBstdscr\fP window is beneath all panels, and is not considered part
-of the stack.
-.P
-A window is associated with every panel.
-The panel routines enable
-you to create, move, hide, and show panels, as well as position a
-panel at any desired location in the stack.
-.P
-Panel routines are a functional layer added to \fBcurses\fP(3X), make only
-high-level curses calls, and work anywhere terminfo curses does.
+\fB\%stdscr\fP window is beneath all panels,
+and is not considered part of the stack.
+.PP
+A window is associated with each panel.
+The panel routines enable you to create,
+move,
+hide,
+and show panels.
+You can relocate a panel to any desired position in the stack.
+.PP
+Panel routines are a functional layer added to \fI\%curses\fP,
+make only high-level \fI\%curses\fP calls,
+and work anywhere \fI\%curses\fP does.
 .SH FUNCTIONS
 .\" ---------
 .SS bottom_panel
-\fBbottom_panel(\fIpan\fB)\fR
+\fB\%bottom_panel(\fIpan\fB)\fR
 puts panel \fIpan\fP at the bottom of all panels.
 .\" ---------
 .SS ceiling_panel
-\fBceiling_panel(\fIsp\fB)\fR
-acts like \fBpanel_below(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+\fB\%ceiling_panel(\fIsp\fB)\fR
+acts like \fB\%panel_below(NULL)\fP
+for the given \fI\%SCREEN\fP \fIsp\fP.
 .\" ---------
 .SS del_panel
-\fBdel_panel(\fIpan\fB)\fR
-removes the given panel \fIpan\fP from the  stack and deallocates the
-\fBPANEL\fP structure (but not its associated window).
+\fB\%del_panel(\fIpan\fB)\fR
+removes the given panel \fIpan\fP from the stack and deallocates the
+\fI\%PANEL\fP structure (but not its associated window).
 .\" ---------
 .SS ground_panel
-\fBground_panel(\fIsp\fB)\fR
-acts like \fBpanel_above(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+\fB\%ground_panel(\fIsp\fB)\fR
+acts like \fB\%panel_above(NULL)\fP
+for the given \fI\%SCREEN\fP \fIsp\fP.
 .\" ---------
 .SS hide_panel
-\fBhide_panel(\fIpan\fB)\fR
+\fB\%hide_panel(\fIpan\fB)\fR
 removes the given panel \fIpan\fP from the panel stack
 and thus hides it from view.
-The \fBPANEL\fP structure is not lost, merely removed from the stack.
+The \fI\%PANEL\fP structure is not lost,
+merely removed from the stack.
 .\" ---------
 .SS move_panel
-\fBmove_panel(\fIpan\fB,\fIstarty\fB,\fIstartx\fB)\fR
-moves the given panel \fIpan\fP's window so that its upper-left corner is at
-\fIstarty\fP, \fIstartx\fP.
+\fB\%move_panel(\fIpan\fB, \fIstarty\fB, \fIstartx\fB)\fR
+moves the given panel \fIpan\fP's window so that its upper-left corner
+is at
+\fIstarty\fP,
+\fIstartx\fP.
 It does not change the position of the panel in the stack.
-Be sure to use this function, not \fBmvwin\fP(3X), to move a panel window.
+Be sure to use this function,
+not \fB\%mvwin\fP(3X),
+to move a panel window.
 .\" ---------
 .SS new_panel
-\fBnew_panel(\fIwin\fB)\fR allocates a \fBPANEL\fR structure,
-associates it with \fIwin\fP, places the panel on the top of the stack
-(causes  it to  be  displayed above any other panel) and returns a
-pointer to the new panel.
+\fB\%new_panel(\fIwin\fB)\fR allocates a \fI\%PANEL\fR structure,
+associates it with \fIwin\fP,
+places the panel on the top of the stack
+(causes it to be displayed above any other panel)
+and returns a pointer to the new panel.
 .\" ---------
 .SS panel_above
-\fBpanel_above(\fIpan\fB)\fR
+\fB\%panel_above(\fIpan\fB)\fR
 returns a pointer to the panel above \fIpan\fP.
 If the panel argument is
-\fB(PANEL *)0\fP, it returns a pointer to the bottom panel in the stack.
+\*(``\fB(PANEL *)0\fP\*('',
+it returns a pointer to the bottom panel in the stack.
 .\" ---------
 .SS panel_below
-\fBpanel_below(\fIpan\fB)\fR
+\fB\%panel_below(\fIpan\fB)\fR
 returns a pointer to the panel just below \fIpan\fP.
-If the panel argument
-is \fB(PANEL *)0\fP, it returns a pointer to the top panel in the stack.
+If the panel argument is
+\*(``\fB(PANEL *)0\fP\*('',
+it returns a pointer to the top panel in the stack.
 .\" ---------
 .SS panel_hidden
-\fBpanel_hidden(\fIpan\fB)\fR
+\fB\%panel_hidden(\fIpan\fB)\fR
 returns \fBFALSE\fP if the panel \fIpan\fP is in the panel stack,
-\fBTRUE\fP if it is not.
-If the panel is a null pointer, return \fBERR\fP.
+and \fBTRUE\fP if it is not.
+If the panel is a null pointer,
+it returns \fBERR\fP.
 .\" ---------
 .SS panel_userptr
-\fBpanel_userptr(\fIpan\fB)\fR
+\fB\%panel_userptr(\fIpan\fB)\fR
 returns the user pointer for a given panel \fIpan\fP.
 .\" ---------
 .SS panel_window
-\fBpanel_window(\fIpan\fB)\fR
+\fB\%panel_window(\fIpan\fB)\fR
 returns a pointer to the window of the given panel \fIpan\fP.
 .\" ---------
 .SS replace_panel
-\fBreplace_panel(\fIpan\fB,\fIwindow\fB)\fR
+\fB\%replace_panel(\fIpan\fB, \fIwindow\fB)\fR
 replaces the current window of panel \fIpan\fP with \fIwindow\fP
-This is useful, for example if you want to resize a panel.
-In \fBncurses\fP, you can call \fBreplace_panel\fP
-to resize a panel using a window resized with \fBwresize\fP(3X).
+This is useful if,
+for example,
+you want to resize a panel.
+In \fI\%ncurses\fP,
+you can call \fB\%replace_panel\fP
+to resize a panel using a window resized with \fB\%wresize\fP(3X).
 It does not change the position of the panel in the stack.
 .\" ---------
 .SS set_panel_userptr
-\fBset_panel_userptr(\fIpan\fB,\fIptr\fB)\fR
+\fB\%set_panel_userptr(\fIpan\fB, \fIptr\fB)\fR
 sets the panel's user pointer.
 .\" ---------
 .SS show_panel
-\fBshow_panel(\fIpan\fB)\fR
+\fB\%show_panel(\fIpan\fB)\fR
 makes a hidden panel visible by placing it on top of the panels in the
 panel stack.
-See \fBCOMPATIBILITY\fP below.
+See \*(``PORTABILITY\*('' below.
 .\" ---------
 .SS top_panel
-\fBtop_panel(\fIpan\fB)\fR
-puts the given visible panel \fIpan\fP on top of all panels in the stack.
-See \fBCOMPATIBILITY\fP below.
+\fB\%top_panel(\fIpan\fB)\fR
+puts the given visible panel \fIpan\fP on top of all panels in the
+stack.
+See \*(``PORTABILITY\*('' below.
 .\" ---------
 .SS update_panels
-\fBupdate_panels()\fR
-refreshes the \fIvirtual screen\fP to reflect the relations between the
-panels in the stack, but does not call \fBdoupdate\fP(3X) to refresh the
-\fIphysical screen\fP.
-Use this function and not \fBwrefresh\fP(3X) or \fBwnoutrefresh\fP(3X).
+\fB\%update_panels()\fR
+refreshes the virtual screen to reflect the relations between the panels
+in the stack,
+but does not call \fB\%doupdate\fP(3X) to refresh the physical screen.
+Use this function and not \fB\%wrefresh\fP(3X) or
+\fB\%wnoutrefresh\fP(3X).
 .PP
-\fBupdate_panels\fP may be called more than once before a call to
-\fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
-the \fIphysical screen\fP.
-.SH DIAGNOSTICS
+\fB\%update_panels\fP may be called more than once before a call to
+\fB\%doupdate\fP,
+but \fB\%doupdate\fP is the function responsible for updating
+the physical screen.
+.SH "RETURN VALUE"
 Each routine that returns a pointer returns \fBNULL\fP if an error
 occurs.
 Each routine that returns an int value returns \fBOK\fP if it
 executes successfully and \fBERR\fP if not.
 .PP
-Except as noted, the \fIpan\fP and \fIwindow\fP parameters must be non-null.
-If those are null, an error is returned.
+Except as noted,
+the \fIpan\fP and \fIwindow\fP parameters must be non-null.
+If either is null,
+an error is returned.
 .PP
-The \fBmove_panel\fP function uses \fBmvwin\fP(3X),
-and will return an error if \fBmvwin\fP returns an error.
-.SH COMPATIBILITY
-Reasonable care has been taken to  ensure  compatibility
-with  the  native  panel facility introduced in System V (inspection of
-the SVr4 manual pages suggests the programming interface is unchanged).
-The \fBPANEL\fP data structures are merely  similar.
-The  programmer
-is cautioned not to directly use \fBPANEL\fP fields.
-.P
-The functions \fBshow_panel\fP and \fBtop_panel\fP are identical
-in this implementation, and work equally well with displayed or hidden
-panels.
-In the native System V implementation, \fBshow_panel\fP is
-intended for making a hidden panel visible (at the top of the stack)
-and \fBtop_panel\fP is intended for making an already-visible panel
+The \fB\%move_panel\fP function uses \fBmvwin\fP(3X),
+and returns an error if \fB\%mvwin\fP returns an error.
+.SH NOTES
+The header file \fI\%panel.h\fP itself includes the header file
+\fI\%curses.h\fP.
+.SH PORTABILITY
+Reasonable care has been taken to ensure compatibility
+with the native panel facility introduced in System\ V;
+inspection of the SVr4 manual pages suggests the programming interface
+never changed.
+The \fI\%PANEL\fP data structures are merely similar.
+The programmer is cautioned not to directly use \fI\%PANEL\fP fields.
+.PP
+The functions \fB\%show_panel\fP and \fB\%top_panel\fP are identical
+in this implementation,
+and work equally well with displayed or hidden panels.
+In the System\ V implementation,
+\fB\%show_panel\fP is intended for making a hidden panel visible
+(at the top of the stack)
+and \fB\%top_panel\fP 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
-In your library list, libpanel.a should be before libncurses.a; that is,
-you should say \*(``\-lpanel \-lncurses\*('', not the other way around
-(which would give a link-error with static libraries).
-.SH PORTABILITY
-The panel facility was documented in SVr4.2 in
-\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
+function to ensure compatibility with System\ V panel libraries.
+.SH HISTORY
+A panel facility was documented in SVr4.2's
+\fICharacter User Interface Programming\fP document.
 .PP
 It is not part of X/Open Curses.
 .PP
 A few implementations exist:
 .bP
 Systems based on SVr4 source code,
-e.g., Solaris, provide this library.
+such as Solaris,
+provide this library.
 .bP
-\fBncurses\fP (since version 0.6 in 1993)
-and \fBPDCurses\fP (since version 2.2 in 1995)
+\fIncurses\fP (since version 0.6 in 1993)
+and \fIPDCurses\fP (since version 2.2 in 1995)
 provide a panel library whose common ancestor
-was a public domain implementation by Warren Tucker
+is a public domain implementation by Warren Tucker
 published in \fIu386mon\fP 2.20 (1990).
 .IP
-According to Tucker, the System\ V panel library
-was first released in SVr3.2 (1988),
+According to Tucker,
+the System\ V panel library was first released in SVr3.2 (1988),
 and his implementation helped with a port to SVr3.1 (1987).
 .IP
 Several developers have improved each of these;
 they are no longer the same as Tucker's implementation.
 .bP
 NetBSD 8 (2018)
-has a panel library begun by Valery Ushakov in 2015.
-This is based on the AT&T documentation.
-.SH AUTHOR
-Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,
-primarily to assist in porting \fIu386mon\fP to systems without a native
-panels library.
+has a panel library begun by Valery Ushakov in 2015,
+based on the System\ V documentation.
+.SH AUTHORS
+Warren Tucker <wht@n4hgf.mt\-park.ga.us> originally wrote this
+implementation,
+primarily to assist in porting \fI\%u386mon\fP to systems without a
+native panel library.
 .PP
-Repackaged for ncurses by Zeyd ben-Halim.
+Zeyd ben-Halim repackaged it for \fI\%ncurses\fP.
 .PP
-Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+Juergen Pfeifer and Thomas E. Dickey revised and improved the library.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_variables\fP(3X)
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 57f22fd15..f07a63dc1 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.49 2023/10/21 10:31:22 tom Exp $
-.TH resizeterm 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.51 2023/11/25 14:26:30 tom Exp $
+.TH resizeterm 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -170,7 +170,7 @@ Doing that clears the screen and is visually distracting.
 .PP
 This extension of \fIncurses\fP was introduced in mid-1995.
 It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
-.SH AUTHOR
+.SH AUTHORS
 Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
 .SH SEE ALSO
 \fB\%curs_getch\fP(3X),
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 7bc736dda..5d4981807 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.37 2023/10/07 21:19:07 tom Exp $
-.TH scr_dump 5 2023-10-07 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.39 2023/11/25 14:21:48 tom Exp $
+.TH scr_dump 5 2023-11-25 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -160,7 +160,7 @@ The document explained the term \*(``enhanced\*('' as follows:
 Shading is used to identify \fIX/Open Enhanced Curses\fP material,
 relating to interfaces included to provide enhanced capabilities
 for applications originally written to be compiled on systems
-based on the UNIX operating system.
+based on the Unix operating system.
 Therefore, the features described may not be present on systems
 that conform to \fBXPG4 or to earlier XPG releases\fP.
 The relevant reference pages may provide additional
@@ -191,7 +191,7 @@ The Solaris curses source has these definitions:
 That is, the feature was likely introduced in SVr2 (1984),
 and improved in SVr3 (1987).
 The Solaris curses source has no magic number for SVr4 (1989).
-Other operating systems (AIX and HPUX) use a magic number which would
+Other operating systems (AIX and HP-UX) use a magic number which would
 correspond to this definition:
 .PP
 .RS 4
@@ -224,7 +224,7 @@ produced dumps of different size
 .bP
 AIX (51817 bytes)
 .bP
-HPUX (90093 bytes)
+HP-UX (90093 bytes)
 .bP
 Solaris 10 (13273 bytes)
 .bP
@@ -279,7 +279,7 @@ followed by a binary dump of the \fBWINDOW\fP,
 some data for wide-characters referenced by the \fBWINDOW\fP structure, and
 .bP
 finally, lines as done by other implementations.
-.SH EXAMPLE
+.SH EXAMPLES
 Given a simple program which writes text to the screen
 (and for the sake of example, limiting the screen-size to 10x20):
 .PP
diff --git a/man/tabs.1 b/man/tabs.1
index f2ce065f3..a13fd2409 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.48 2023/10/14 19:29:06 tom Exp $
-.TH @TABS@ 1 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.50 2023/11/25 14:32:36 tom Exp $
+.TH @TABS@ 1 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,12 +45,11 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .SH NAME
 \fB\%@TABS@\fP \-
 set terminal tab stops
 .SH SYNOPSIS
-\fB@TABS@\fP [\fIoptions\fP]] \fI[tabstop-list]\fP
+\fB@TABS@\fP [\fIoptions\fP] [\fItabstop-list\fP]
 .SH DESCRIPTION
 The \fB@TABS@\fP program clears and sets tab-stops on the terminal.
 This uses the terminfo \fBclear_all_tabs\fP and \fBset_tab\fP capabilities.
@@ -295,4 +294,4 @@ Those provide the capability of setting abitrary tab stops.
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TSET@\fP(1),
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/term.5 b/man/term.5
index bcc780bb7..9c8852049 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.62 2023/10/21 15:33:10 tom Exp $
-.TH term 5 2023-10-21 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.65 2023/11/25 22:58:12 tom Exp $
+.TH term 5 2023-11-25 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -55,7 +55,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 term \-
@@ -69,7 +68,7 @@ Two configurations are supported (when building the \fBncurses\fP libraries):
 .TP 5
 .B directory tree
 A two-level scheme is used to avoid a linear search
-of a huge \s-1UNIX\s+1 system directory: \fB\*d/c/name\fP where
+of a huge Unix system directory: \fB\*d/c/name\fP where
 .I name
 is the name of the terminal, and
 .I c
@@ -217,7 +216,7 @@ stored intact in uninterpreted form.
 .SS EXTENDED STORAGE FORMAT
 The previous section describes the conventional terminfo binary format.
 With some minor variations of the offsets (see PORTABILITY),
-the same binary format is used in all modern UNIX systems.
+the same binary format is used in all modern Unix systems.
 Each system uses a predefined set of boolean, number or string capabilities.
 .PP
 The \fBncurses\fP libraries and applications support
@@ -262,6 +261,13 @@ After the end of these values, it contains the names for each of
 the extended capabilities in order, e.g., booleans, then numbers and
 finally strings.
 .PP
+By storing terminal descriptions in this way,
+\fBncurses\fP is able to provide a database useful with legacy applications,
+as well as providing data for applications which need more than the
+predefined capabilities.
+See \fBuser_caps\fP(5) for an overview
+of the way \fBncurses\fP uses this extended information.
+.PP
 Applications which manipulate terminal data can use the definitions
 described in \fBterm_variables\fP(3X) which associate the long capability
 names with members of a \fBTERMTYPE\fP structure.
@@ -281,6 +287,10 @@ to direct users of the \fBTERMTYPE\fP structure as in previous formats.
 However, that cannot provide callers with the extended numbers.
 The library uses a similar but hidden data structure \fBTERMTYPE2\fP
 to provide data for the terminfo functions.
+.SH FILES
+.TP
+.I \*d
+compiled terminal description database
 .SH PORTABILITY
 .SS setupterm
 Note that it is possible for
@@ -302,18 +312,18 @@ Also, new capabilities must always be added at the end of the lists
 of boolean, number, and string capabilities.
 .SS Binary format
 X/Open Curses does not specify a format for the terminfo database.
-UNIX System V curses used a directory-tree of binary files,
+System V curses used a directory-tree of binary files,
 one per terminal description.
 .PP
 Despite the consistent use of little-endian for numbers and the otherwise
 self-describing format, it is not wise to count on portability of binary
-terminfo entries between commercial UNIX versions.
+terminfo entries between commercial Unix versions.
 The problem is that there
 are at least three versions of terminfo (under HP\-UX, AIX, and OSF/1) 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 and XSI Curses extensions.
-See \fBterminfo\fP(\*n) for detailed
+See \fBterminfo\fP(5) for detailed
 discussion of terminfo source compatibility issues.
 .PP
 This implementation is by default compatible with the binary
@@ -345,7 +355,36 @@ uppercase and lowercase,
 \fBncurses\fP represents the \*(``first character\*(''
 of the terminal name used as
 the intermediate level of a directory tree in (two-character) hexadecimal form.
-.SH EXAMPLE
+.SS Limits
+\fBncurses\fP stores compiled terminal descriptions
+in three related formats,
+described in the sections
+.bP
+\fBLEGACY STORAGE FORMAT\fP, and
+.bP
+\fBEXTENDED STORAGE FORMAT\fP, and
+.bP
+\fBEXTENDED NUMBER FORMAT\fP.
+.PP
+The legacy storage format and the extended number format differ by
+the types of numeric capability which they can store
+(i.e., 16-bit versus 32-bit integers).
+The extended storage format introduced by ncurses 5.0 adds data to
+either of these formats.
+.PP
+Some limitations apply:
+.bP
+total compiled entries cannot exceed 4096 bytes in the legacy format.
+.bP
+total compiled entries cannot exceed 32768 bytes in the extended format.
+.bP
+the name field cannot exceed 128 bytes.
+.PP
+Compiled entries are limited to 32768 bytes because offsets into the
+\fIstrings table\fP use two-byte integers.
+The legacy format could have supported 32768-byte entries,
+but was limited to a virtual memory page's 4096 bytes.
+.SH EXAMPLES
 As an example, here is a description for the Lear-Siegler
 ADM\-3, a popular though rather stupid early terminal:
 .PP
@@ -390,23 +429,6 @@ lp-1f(\*(CW).
 0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 .TE
 .in
-.SH LIMITS
-Some limitations:
-.bP
-total compiled entries cannot exceed 4096 bytes in the legacy format.
-.bP
-total compiled entries cannot exceed 32768 bytes in the extended format.
-.bP
-the name field cannot exceed 128 bytes.
-.PP
-Compiled entries are limited to 32768 bytes because offsets into the
-\fIstrings table\fP use two-byte integers.
-The legacy format could have supported 32768-byte entries,
-but was limited a virtual memory page's 4096 bytes.
-.SH FILES
-.TP
-.I \*d
-compiled terminal description database
 .SH AUTHORS
 Thomas E. Dickey
 .br
@@ -422,4 +444,5 @@ documented legacy terminfo format, e.g., from \fIpcurses\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5),
+\fB\%user_caps\fP(5)
diff --git a/man/term.7 b/man/term.7
index 110bc6f36..03fadc604 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.42 2023/11/11 11:48:16 tom Exp $
-.TH term 7 2023-11-11 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.44 2023/11/25 17:20:42 tom Exp $
+.TH term 7 2023-11-25 "ncurses 6.4" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 term \-
@@ -53,12 +52,12 @@ This information
 is critical for all screen-oriented programs, including your editor and mailer.
 .PP
 A default \fBTERM\fP value will be set on a per-line basis by either
-\fB/etc/inittab\fP (e.g., System\-V-like UNIXes)
-or \fB/etc/ttys\fP (BSD UNIXes).
+\fB/etc/inittab\fP (e.g., System\-V-like Unices)
+or \fB/etc/ttys\fP (BSD Unices).
 This will nearly always suffice for workstation and microcomputer consoles.
 .PP
 If you use a dialup line, the type of device attached to it may vary.
-Older UNIX systems pre-set a very dumb terminal type
+Older Unix systems pre-set a very dumb terminal type
 like \*(``dumb\*('' or \*(``dialup\*('' on dialup lines.
 Newer ones may pre-set \*(``vt100\*('', reflecting the prevalence of DEC
 VT100-compatible terminals and personal-computer emulators.
@@ -99,9 +98,9 @@ where \fIentry_name\fP is the name of the type you wish to examine (and the
 name of its capability file the subdirectory of \*d named for its first
 letter).
 This command dumps a capability file in the text format described by
-\fBterminfo\fP(\*n).
+\fBterminfo\fP(5).
 .PP
-The first line of a \fBterminfo\fP(\*n) description gives the names by which
+The first line of a \fBterminfo\fP(5) description gives the names by which
 terminfo knows a terminal,
 separated by \*(``|\*('' (pipe-bar) characters with the last
 name field terminated by a comma.
@@ -215,20 +214,20 @@ Commands which use a terminal type to control display often accept a \-T
 option that accepts a terminal name argument.
 Such programs should fall back
 on the \fBTERM\fP environment variable when no \-T option is specified.
-.SH PORTABILITY
-For maximum compatibility with older System V UNIXes, names and aliases
-should be unique within the first 14 characters.
 .SH FILES
 .TP 5
 .I \*d
 compiled terminal description database
 .TP 5
 /etc/inittab
-tty line initialization (AT&T-like UNIXes)
+tty line initialization (AT&T-like Unices)
 .TP 5
 /etc/ttys
-tty line initialization (BSD-like UNIXes)
+tty line initialization (BSD-like Unices)
+.SH PORTABILITY
+For maximum compatibility with older System V Unices, names and aliases
+should be unique within the first 14 characters.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%term\fP(\*n),
-\fB\%terminfo\fP(\*n)
+\fB\%term\fP(5),
+\fB\%terminfo\fP(5)
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 30c8e2cbf..d0360642e 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH term_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.33 2023/11/25 14:32:36 tom Exp $
+.TH term_variables 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds n 5
 .SH NAME
 \fB\%SP\fP,
 \fB\%acs_map\fP,
@@ -179,4 +178,4 @@ Most, but not all, base the definition upon the \fBcur_term\fP variable.
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
 \fB\%curs_threads\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/terminfo.head b/man/terminfo.head
index 61dda6966..45475851c 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.53 2023/10/14 19:53:57 tom Exp $
-.TH terminfo 5 2023-10-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.55 2023/11/25 19:52:56 tom Exp $
+.TH terminfo 5 2023-11-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -51,7 +51,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%terminfo\fP \-
@@ -121,7 +120,7 @@ it allows that to be both an alias and a verbose name
 .bP
 Lines beginning with a \*(``#\*('' in the first column are treated as comments.
 .IP
-While comment lines are legal at any point, the output of \fB@CAPTOINFO@\fP
+While comment lines are valid at any point, the output of \fB@CAPTOINFO@\fP
 and \fB@INFOTOCAP@\fP (aliases for \fB@TIC@\fP)
 will move comments so they occur only between entries.
 .PP
diff --git a/man/terminfo.tail b/man/terminfo.tail
index e420275a2..267a104d5 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.134 2023/10/14 19:18:14 tom Exp $
+.\" $Id: terminfo.tail,v 1.135 2023/11/25 14:32:36 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -247,7 +247,7 @@ in the example above.
 Terminal descriptions in \fBncurses\fP are stored in terminal databases.
 These databases, which are found by their pathname,
 may be configured either as directory trees or hashed databases
-(see \fBterm\fR(\*n)),
+(see \fBterm\fR(5)),
 .PP
 The library uses a compiled-in list of pathnames,
 which can be overridden by environment variables.
@@ -1810,7 +1810,7 @@ A prototype command character is chosen which is used in all capabilities.
 This character is given in the
 .B cmdch
 capability to identify it.
-The following convention is supported on some UNIX systems:
+The following convention is supported on some Unix systems:
 The environment is to be searched for a
 .B CC
 variable, and if found, all
@@ -1852,7 +1852,7 @@ A value of
 indicates that the number of lines is not fixed,
 but that there is still more memory than fits on the screen.
 .PP
-If the terminal is one of those supported by the \s-1UNIX\s+1 virtual
+If the terminal is one of those supported by the Unix virtual
 terminal protocol, the terminal number can be given as
 .BR vt .
 .PP
@@ -2001,13 +2001,15 @@ When in \-C (translate to termcap) mode, the \fBncurses\fP implementation of
 translation is too long.
 The \-c (check) option also checks resolved (after tc
 expansion) lengths.
-.SS 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 capabilities to the string table that (in the
-binary format) collide with System V and XSI Curses extensions.
+.SH PORTABILITY
+Do not count on compiled (binary) \fI\%terminfo\fP entries being
+portable between commercial Unix systems.
+At least two implementations of \fI\%terminfo\fP
+(those of HP-UX and AIX)
+diverged from those of other System V Unices after SVr1,
+adding extension capabilities to the string table that
+(in the binary format)
+collide with subsequent System V and XSI Curses extensions.
 .SH EXTENSIONS
 Searching for terminal descriptions in
 \fB$HOME/.terminfo\fP and TERMINFO_DIRS
@@ -2049,36 +2051,45 @@ an absent or cancelled \fBncv\fP.
 If italics should work with colors,
 then the \fBncv\fP value must be specified, even if it is zero.
 .PP
-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, accurate as of October 1995:
+Different commercial ports of \fI\%terminfo\fP and \fIcurses\fP support
+different subsets of XSI Curses and
+(in some cases)
+different extensions.
+Here is a summary,
+accurate as of October 1995,
+after which the commercial Unix market contracted and lost diversity.
 .bP
-\fBSVR4, Solaris, ncurses\fP \-\-
-These support all SVr4 capabilities.
+SVr4,
+Solaris,
+and \fI\%ncurses\fP support all SVr4 capabilities.
 .bP
-\fBSGI\fP \-\-
-Supports the SVr4 set, adds one undocumented extended string
-capability (\fBset_pglen\fP).
+IRIX supports the SVr4 set and adds one undocumented extended string
+capability (\fB\%set_pglen\fP).
 .bP
-\fBSVr1, Ultrix\fP \-\-
-These support a restricted subset of terminfo capabilities.
-The booleans end with \fBxon_xoff\fP;
-the numerics with \fBwidth_status_line\fP;
-and the strings with \fBprtr_non\fP.
-.bP
-\fBHP/UX\fP \-\-
-Supports the SVr1 subset, plus the SVr[234] numerics \fBnum_labels\fP,
-\fBlabel_height\fP, \fBlabel_width\fP, plus function keys 11 through 63, plus
-\fBplab_norm\fP, \fBlabel_on\fP, and \fBlabel_off\fP, plus some incompatible
-extensions in the string table.
+SVr1 and Ultrix support a restricted subset of \fI\%terminfo\fP
+capabilities.
+The Booleans end with \fB\%xon_xoff\fP;
+the numerics with \fB\%width_status_line\fP;
+and the strings with \fB\%prtr_non\fP.
+.bP
+HP/UX supports the SVr1 subset,
+plus the SVr[234] numerics
+\fB\%num_labels\fP,
+\fB\%label_height\fP,
+\fB\%label_width\fP,
+plus function keys 11 through 63,
+plus
+\fB\%plab_norm\fP,
+\fB\%label_on\fP,
+and
+\fB\%label_off\fP,
+plus a number of incompatible string table extensions.
 .bP
-\fBAIX\fP \-\-
-Supports the SVr1 subset, plus function keys 11 through 63, plus a number
-of incompatible string table extensions.
+AIX supports the SVr1 subset,
+plus function keys 11 through 63,
+plus a number of incompatible string table extensions.
 .bP
-\fBOSF\fP \-\-
-Supports both the SVr4 set and the AIX extensions.
+OSF/1 supports both the SVr4 set and the AIX extensions.
 .SH FILES
 .TP
 .I \*d
@@ -2096,5 +2107,5 @@ Based on \fIpcurses\fP by Pavel Curtis.
 \fB\%curs_variables\fP(3X),
 \fB\%printf\fP(3),
 \fB\%term_variables\fP(3X),
-\fB\%term\fP(\*n),
+\fB\%term\fP(5),
 \fB\%user_caps\fP(5)
diff --git a/man/tic.1m b/man/tic.1m
index 63ca64be4..4f5827380 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.98 2023/10/14 19:25:26 tom Exp $
-.TH @TIC@ 1M 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.101 2023/11/25 23:02:52 tom Exp $
+.TH @TIC@ 1M 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@TIC@\fP \-
@@ -55,28 +54,28 @@ compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR
 [\fB\-\
 0\
 1\
+a\
+c\
 C\
 D\
+f\
+g\
 G\
 I\
 K\
 L\
 N\
-T\
-U\
-V\
-W\
-a\
-c\
-f\
-g\
 q\
 r\
 s\
 t\
+T\
+U\
+V\
+W\
 x\
 \fP]
-[\fB\-e\fP \fInames\fP]
+[\fB\-e\fP \fIterminal-type-list\fP]
 [\fB\-o\fP \fIdir\fP]
 [\fB\-Q\fP[\fIn\fP]]
 [\fB\-R\fP \fIsubset\fP]
@@ -89,7 +88,7 @@ format into compiled format.
 The compiled format is necessary for use with
 the library routines in \fBncurses\fP(3X).
 .PP
-As described in \fBterm\fP(\*n), the database may be either a directory
+As described in \fBterm\fP(5), the database may be either a directory
 tree (one file per terminal entry) or a hashed database (one record per entry).
 The \fB@TIC@\fP command writes only one type of entry,
 depending on how it was built:
@@ -138,7 +137,7 @@ a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
 the system terminfo database (\fI\*d\fP).
 .PP
-The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(\*n)
+The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(5)
 manual goes into further detail.
 .SS ALIASES
 This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
@@ -147,7 +146,7 @@ usually those are linked to, or copied from this program:
 When invoked as @INFOTOCAP@, @TIC@ sets the \fB\-I\fP option.
 .bP
 When invoked as @CAPTOINFO@, @TIC@ sets the \fB\-C\fP option.
-.SS OPTIONS
+.SH OPTIONS
 .TP
 \fB\-0\fP
 restricts the output to a single line
@@ -216,9 +215,9 @@ according to the rules summarized above,
 it will print a diagnostic and exit with an error rather than
 printing a list of database locations.
 .TP
-\fB\-e \fInames\fR
-Limit writes and translations to the following comma-separated list of
-terminals.
+\fB\-e \fIlist\fR
+Limit writes and translations to the comma-separated \fIlist\fP of
+terminal types.
 If any name or alias of a terminal matches one of the names in
 the list, the entry will be written or translated as normal.
 Otherwise no output will be generated for it.
@@ -302,7 +301,7 @@ Available subsets are
 \*(``AIX\*(''
 .RE
 .IP
-See \fBterminfo\fP(\*n) for details.
+See \fBterminfo\fP(5) for details.
 .TP
 \fB\-r\fP
 Force entry resolution (so there are no remaining tc capabilities) even
@@ -395,7 +394,7 @@ The parameter is optional.
 If it is omitted, it defaults to 60.
 .TP
 \fB\-x\fP
-Treat unknown capabilities as user-defined (see \fBuser_caps(\*n)\fP).
+Treat unknown capabilities as user-defined (see \fBuser_caps\fP(5)).
 That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
 it will infer its type (boolean, number or string) from the syntax and
 make an extended table entry for that.
@@ -405,7 +404,7 @@ whose name begins with \*(``k\*('' are treated as function keys.
 .TP
 \fIfile\fP
 contains one or more \fBterminfo\fP terminal descriptions in source
-format [see \fBterminfo\fP(\*n)].
+format [see \fBterminfo\fP(5)].
 Each description in the file
 describes the capabilities of a particular terminal.
 .IP
@@ -413,7 +412,7 @@ If \fIfile\fP is \*(``-\*('', then the data is read from the standard input.
 The \fIfile\fP parameter may also be the path of a character-device.
 .SS PROCESSING
 All but one of the capabilities recognized by \fB@TIC@\fP are documented
-in \fBterminfo\fP(\*n).
+in \fBterminfo\fP(5).
 The exception is the \fBuse\fP capability.
 .PP
 When a \fBuse\fP=\fIentry\fP\-\fIname\fP field is discovered in a
@@ -431,111 +430,32 @@ capabilities in \fIentry\fR_\fIname\fR_\fI2\fP must also appear in
 \fBentry_name_1\fP before \fBuse=\fP for these capabilities to be
 canceled in \fBentry_name_1\fP.
 .PP
-Total compiled entries cannot exceed 4096 bytes.
+Total compiled entries cannot exceed
+4096 bytes in the legacy storage format, or
+32768 using the extended number format.
 The name 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 printed.
-.SH HISTORY
-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.
-That 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
-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.
-The SVr4 \fBtic\fP programs all support the \fB\-v\fP option.
-The NetBSD \fBtic\fP program follows X/Open's documentation,
-omitting the \fB\-v\fP option.
-.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
+.SH FILES
+.TP
+.I \*d
+compiled terminal description database
+.SH NOTES
 There is some evidence that historic \fB@TIC@\fP implementations treated
 description fields with no whitespace in them as additional aliases or
 short names.
 This \fB@TIC@\fP does not do that, but it does warn when
 description fields may be treated that way and check them for dangerous
 characters.
-.SS EXTENSIONS
+.SH EXTENSIONS
 Unlike the SVr4 \fB@TIC@\fP 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 \fBterminfo\fP(\*n) for the list of
+See \fBterminfo\fP(5) for the list of
 termcap names taken to be equivalent to terminfo names.
 .PP
 The SVr4 manual pages are not clear on the resolution rules for \fBuse\fP
@@ -593,11 +513,92 @@ The SVr4 \fB\-c\fP mode does not report bad \*(``use=\*('' links.
 .PP
 System V does not compile entries to or read entries from your
 \fI$HOME/.terminfo\fP database unless TERMINFO is explicitly set to it.
-.SH FILES
-.TP
-.I \*d
-compiled terminal description database
-.SH AUTHOR
+.SH PORTABILITY
+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 Tru64 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.
+The SVr4 \fBtic\fP programs all support the \fB\-v\fP option.
+The NetBSD \fBtic\fP program follows X/Open's documentation,
+omitting the \fB\-v\fP option.
+.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.
+.SH HISTORY
+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.
+That 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 AUTHORS
 Eric S. Raymond <esr@snark.thyrsus.com>
 and
 .br
@@ -608,6 +609,6 @@ Thomas E. Dickey <dickey@invisible\-island.net>
 \fB\%@INFOTOCAP@\fP(1M),
 \fB\%@TOE@\fP(1M),
 \fB\%curses\fP(3X),
-\fB\%term\fP(\*n),
-\fB\%terminfo\fP(\*n),
-\fB\%user_caps\fP(\*n)
+\fB\%term\fP(5),
+\fB\%terminfo\fP(5),
+\fB\%user_caps\fP(5)
diff --git a/man/toe.1m b/man/toe.1m
index 251382eb8..14b09a057 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.54 2023/10/21 15:30:27 tom Exp $
-.TH @TOE@ 1M 2023-10-21 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.56 2023/11/25 14:32:36 tom Exp $
+.TH @TOE@ 1M 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,7 +50,6 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds n 5
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@TOE@\fP \-
@@ -139,6 +138,27 @@ If \fIncurses\fP is built without tracing support,
 \fB\-V\fP
 reports the version of \fIncurses\fP associated
 with this program and exits with a successful status.
+.SH FILES
+.TP
+.I \*d
+compiled terminal description database
+.SH HISTORY
+\fB\%@TOE@\fP is not provided by other implementations.
+There is no applicable X/Open or POSIX standard for it.
+.PP
+It replaces a \fB\-T\fP option that was briefly supported by
+the \fIncurses\fP \fB\%infocmp\fP utility in 1995.
+.PP
+The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011,
+respectively.
+.PP
+The program's name originates with a developer's pun:
+.bP
+\fBtic\fP,
+.bP
+\fBtac\fP (now \fBtack\fP),
+.bP
+\fBtoe\fP.
 .SH EXAMPLES
 When not sorting with the \fB\-s\fP option,
 the \fB\-a\fP option reports all of the names found in all of the
@@ -200,31 +220,10 @@ l.
 \&.\|.\|.
 .TE
 .RE
-.SH FILES
-.TP
-.I \*d
-compiled terminal description database
-.SH HISTORY
-\fB\%@TOE@\fP is not provided by other implementations.
-There is no applicable X/Open or POSIX standard for it.
-.PP
-It replaces a \fB\-T\fP option that was briefly supported by
-the \fIncurses\fP \fB\%infocmp\fP utility in 1995.
-.PP
-The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011,
-respectively.
-.PP
-The program's name originates with a developer's pun:
-.bP
-\fBtic\fP,
-.bP
-\fBtac\fP (now \fBtack\fP),
-.bP
-\fBtoe\fP.
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@INFOTOCAP@\fP(1M),
 \fB\%@TIC@\fP(1M),
 \fB\%curses\fP(3X),
-\fB\%terminfo\fP(\*n)
+\fB\%terminfo\fP(5)
diff --git a/man/tput.1 b/man/tput.1
index 03cdabda5..40dfadc1c 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.87 2023/10/14 19:29:06 tom Exp $
-.TH @TPUT@ 1 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.89 2023/11/25 14:32:36 tom Exp $
+.TH @TPUT@ 1 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,22 +45,21 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds n 1
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@TPUT@\fP,
 \fB\%reset\fP \-
 initialize a terminal or query \fIterminfo\fR database
 .SH SYNOPSIS
-\fB@TPUT@\fR [\fB\-T\fItype\fR] \fIcapname\fR [\fIparameters\fR]
+\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fIcapname\fR [\fIparameters\fR]
 .br
-\fB@TPUT@\fR [\fB\-T\fItype\fR] [\fB\-x\fR] \fBclear\fR
+\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] [\fB\-x\fR] \fBclear\fR
 .br
-\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBinit\fR
+\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBinit\fR
 .br
-\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBreset\fR
+\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBreset\fR
 .br
-\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBlongname\fR
+\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBlongname\fR
 .br
 \fB@TPUT@ \-S\fP  \fB<<\fP
 .br
@@ -91,7 +90,7 @@ and writes nothing to the standard output.
 Before using a value returned on the standard output,
 the application should test the exit code
 (e.g., \fB$?\fP, see \fBsh\fP(1)) to be sure it is \fB0\fP.
-(See the \fBEXIT CODES\fP and \fBDIAGNOSTICS\fP sections.)
+(See the \fBEXIT STATUS\fP and \fBDIAGNOSTICS\fP sections.)
 For a complete list of capabilities
 and the \fIcapname\fP associated with each, see \fBterminfo\fP(5).
 .SS Options
@@ -103,7 +102,7 @@ instead of from the command line (see example).
 Only one \fIcapname\fP is allowed per line.
 The \fB\-S\fP option changes the
 meaning of the \fB0\fP and \fB1\fP boolean and string exit codes (see the
-EXIT CODES section).
+EXIT STATUS section).
 .IP
 Because some capabilities may use
 \fIstring\fP parameters rather than \fInumbers\fP,
@@ -123,8 +122,7 @@ variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored.
 reports the version of ncurses which was used in this program, and exits.
 .TP
 .B \-x
-do not attempt to clear the terminal's scrollback buffer
-using the extended \*(``E3\*('' capability.
+prevents \fB\%@TPUT@\fP from attempting to clear the scrollback buffer.
 .SS Commands
 A few commands (\fBinit\fP, \fBreset\fP and \fBlongname\fP) are
 special; they are defined by the \fB@TPUT@\fP program.
@@ -246,7 +244,7 @@ it allows for the possibility that it is invoked by a link with those names.
 .PP
 If \fB@TPUT@\fP is invoked by a link named \fBreset\fP, this has the
 same effect as \fB@TPUT@ reset\fP.
-The \fB@TSET@\fP(\*n) utility also treats a link named \fBreset\fP specially.
+The \fB@TSET@\fP(1) utility also treats a link named \fBreset\fP specially.
 .PP
 Before ncurses 6.1, the two utilities were different from each other:
 .bP
@@ -300,81 +298,7 @@ which may override the terminal size.
 If the \fB\-T\fP option is given
 @TPUT@ ignores the environment variables by calling \fBuse_tioctl(TRUE)\fP,
 relying upon the operating system (or finally, the terminal database).
-.SH EXAMPLES
-.TP 5
-\fB@TPUT@ init\fP
-Initialize the terminal according to the type of
-terminal in the environmental variable \fBTERM\fP.  This
-command should be included in everyone's .profile after
-the environmental variable \fBTERM\fP has been exported, as
-illustrated on the \fBprofile\fP(5) manual page.
-.TP 5
-\fB@TPUT@ \-T5620 reset\fP
-Reset an AT&T 5620 terminal, overriding the type of
-terminal in the environmental variable \fBTERM\fP.
-.TP 5
-\fB@TPUT@ cup 0 0\fP
-Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
-(the upper left corner of the screen, usually known as the \*(``home\*(''
-cursor position).
-.TP 5
-\fB@TPUT@ clear\fP
-Echo the clear-screen sequence for the current terminal.
-.TP 5
-\fB@TPUT@ cols\fP
-Print the number of columns for the current terminal.
-.TP 5
-\fB@TPUT@ \-T450 cols\fP
-Print the number of columns for the 450 terminal.
-.TP 5
-\fBbold=\(ga@TPUT@ smso\(ga offbold=\(ga@TPUT@ rmso\(ga\fP
-Set the shell variables \fBbold\fP, to begin stand-out mode
-sequence, and \fBoffbold\fP, to end standout mode sequence,
-for the current terminal.
-This might be followed by a
-prompt: \fBecho "${bold}Please type in your name: ${offbold}\ec"\fP
-.TP 5
-\fB@TPUT@ hc\fP
-Set exit code to indicate if the current terminal is a hard copy terminal.
-.TP 5
-\fB@TPUT@ cup 23 4\fP
-Send the sequence to move the cursor to row 23, column 4.
-.TP 5
-\fB@TPUT@ cup\fP
-Send the terminfo string for cursor-movement, with no parameters substituted.
-.TP 5
-\fB@TPUT@ longname\fP
-Print the long name from the \fBterminfo\fP database for the
-type of terminal specified in the environmental
-variable \fBTERM\fP.
-.PP
-.RS 5
-\fB@TPUT@ \-S <<!\fP
-.br
-\fB> clear\fP
-.br
-\fB> cup 10 10\fP
-.br
-\fB> bold\fP
-.br
-\fB> !\fP
-.RE
-.TP 5
-\&
-This example shows \fB@TPUT@\fP processing several capabilities
-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 (\fB!\fP) on a line by itself.
-.SH FILES
-.TP
-.I @DATADIR@/tabset
-tab stop initialization database
-.TP
-.I \*d
-compiled terminal description database
-.SH EXIT CODES
+.SH EXIT STATUS
 If the \fB\-S\fP option is used,
 \fB@TPUT@\fP checks for errors from each line,
 and if any errors are found, will set the exit code to 4 plus the
@@ -427,61 +351,20 @@ exit code	error message
 \fBterminfo\fP(5) database for this terminal type, e.g.
 \fB@TPUT@ \-T450 lines\fP and \fB@TPUT@ \-Thp2621 xmc\fP)
 T}
-\fB1\fP	no error message is printed, see the \fBEXIT CODES\fP section.
+\fB1\fP	no error message is printed, see the \fBEXIT STATUS\fP section.
 \fB2\fP	usage error
 \fB3\fP	unknown terminal \fItype\fP or no \fBterminfo\fP database
 \fB4\fP	unknown \fBterminfo\fP capability \fIcapname\fP
 \fB>4\fP	error occurred in \-S
 =
 .TE
-.SH HISTORY
-The \fBtput\fP command was begun by Bill Joy in 1980.
-The initial version only cleared the screen.
-.PP
-AT&T System V provided a different \fBtput\fP command:
-.bP
-SVr2 provided a rudimentary \fBtput\fP
-which checked the parameter against each
-predefined capability and returned the corresponding value.
-This version of \fBtput\fP did not use \fBtparm\fP(3X) for
-the capabilities which are parameterized.
-.bP
-SVr3 replaced that, a year later, by a more extensive program
-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.
-.bP
-SVr4 added color initialization using the \fBorig_colors\fP and
-\fBorig_pair\fP capabilities in the \fBinit\fP subcommand.
-.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.
-Like the AT&T program, Bostic's version
-accepted some parameters named for \fIterminfo\fP capabilities
-(\fBclear\fP, \fBinit\fP, \fBlongname\fP and \fBreset\fP).
-However (because he had only \fItermcap\fP available),
-it accepted \fItermcap\fP names for other capabilities.
-Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes
-as the earlier BSD \fBtset\fP had done.
-.PP
-At the same time, Bostic added a shell script named \*(``clear\*('',
-which used \fBtput\fP to clear the screen.
-.PP
-Both of these appeared in 4.4BSD,
-becoming the \*(``modern\*('' BSD implementation of \fBtput\fP.
-.PP
-This implementation of \fBtput\fP began from a different source than
-AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on
-\fIcomp.sources.unix\fP in December 1992.
-Ridge's program made more sophisticated use of the terminal capabilities
-than the BSD program.
-Eric Raymond used that \fBtput\fP program
-(and other parts of \fImytinfo\fP) in ncurses in June 1995.
-Using the portions dealing with terminal capabilities
-almost without change,
-Raymond made improvements to the way the command-line parameters
-were handled.
+.SH FILES
+.TP
+.I @DATADIR@/tabset
+tab stop initialization database
+.TP
+.I \*d
+compiled terminal description database
 .SH PORTABILITY
 This implementation of \fBtput\fP differs from AT&T \fBtput\fP in
 two important areas:
@@ -560,7 +443,7 @@ The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal
 capabilities.
 .bP
 Other implementations of \fBtput\fP on
-SVr4-based systems such as Solaris, IRIX64 and HPUX
+SVr4-based systems such as Solaris, IRIX64 and HP-UX
 as well as others such as AIX and Tru64
 provide support for \fIcapname\fP operands.
 .bP
@@ -604,15 +487,130 @@ That likely is a documentation error,
 confusing the \fB\-1\fP written to the standard output for an absent
 or cancelled numeric value versus an (unsigned) exit code.
 .PP
-The various Unix systems (AIX, HPUX, Solaris) use the same exit-codes
+The various Unix systems (AIX, HP-UX, Solaris) use the same exit-codes
 as ncurses.
 .PP
 NetBSD curses documents different exit codes which do not correspond
 to either ncurses or X/Open.
+.SH HISTORY
+The \fBtput\fP command was begun by Bill Joy in 1980.
+The initial version only cleared the screen.
+.PP
+AT&T System V provided a different \fBtput\fP command:
+.bP
+SVr2 provided a rudimentary \fBtput\fP
+which checked the parameter against each
+predefined capability and returned the corresponding value.
+This version of \fBtput\fP did not use \fBtparm\fP(3X) for
+the capabilities which are parameterized.
+.bP
+SVr3 replaced that, a year later, by a more extensive program
+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.
+.bP
+SVr4 added color initialization using the \fBorig_colors\fP and
+\fBorig_pair\fP capabilities in the \fBinit\fP subcommand.
+.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.
+Like the AT&T program, Bostic's version
+accepted some parameters named for \fIterminfo\fP capabilities
+(\fBclear\fP, \fBinit\fP, \fBlongname\fP and \fBreset\fP).
+However (because he had only \fItermcap\fP available),
+it accepted \fItermcap\fP names for other capabilities.
+Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes
+as the earlier BSD \fBtset\fP had done.
+.PP
+At the same time, Bostic added a shell script named \*(``clear\*('',
+which used \fBtput\fP to clear the screen.
+.PP
+Both of these appeared in 4.4BSD,
+becoming the \*(``modern\*('' BSD implementation of \fBtput\fP.
+.PP
+This implementation of \fBtput\fP began from a different source than
+AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on
+\fIcomp.sources.unix\fP in December 1992.
+Ridge's program made more sophisticated use of the terminal capabilities
+than the BSD program.
+Eric Raymond used that \fBtput\fP program
+(and other parts of \fImytinfo\fP) in ncurses in June 1995.
+Using the portions dealing with terminal capabilities
+almost without change,
+Raymond made improvements to the way the command-line parameters
+were handled.
+.SH EXAMPLES
+.TP 5
+\fB@TPUT@ init\fP
+Initialize the terminal according to the type of
+terminal in the environmental variable \fBTERM\fP.  This
+command should be included in everyone's .profile after
+the environmental variable \fBTERM\fP has been exported, as
+illustrated on the \fBprofile\fP(5) manual page.
+.TP 5
+\fB@TPUT@ \-T5620 reset\fP
+Reset an AT&T 5620 terminal, overriding the type of
+terminal in the environmental variable \fBTERM\fP.
+.TP 5
+\fB@TPUT@ cup 0 0\fP
+Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
+(the upper left corner of the screen, usually known as the \*(``home\*(''
+cursor position).
+.TP 5
+\fB@TPUT@ clear\fP
+Echo the clear-screen sequence for the current terminal.
+.TP 5
+\fB@TPUT@ cols\fP
+Print the number of columns for the current terminal.
+.TP 5
+\fB@TPUT@ \-T450 cols\fP
+Print the number of columns for the 450 terminal.
+.TP 5
+\fBbold=\(ga@TPUT@ smso\(ga offbold=\(ga@TPUT@ rmso\(ga\fP
+Set the shell variables \fBbold\fP, to begin stand-out mode
+sequence, and \fBoffbold\fP, to end standout mode sequence,
+for the current terminal.
+This might be followed by a
+prompt: \fBecho "${bold}Please type in your name: ${offbold}\ec"\fP
+.TP 5
+\fB@TPUT@ hc\fP
+Set exit code to indicate if the current terminal is a hard copy terminal.
+.TP 5
+\fB@TPUT@ cup 23 4\fP
+Send the sequence to move the cursor to row 23, column 4.
+.TP 5
+\fB@TPUT@ cup\fP
+Send the terminfo string for cursor-movement, with no parameters substituted.
+.TP 5
+\fB@TPUT@ longname\fP
+Print the long name from the \fBterminfo\fP database for the
+type of terminal specified in the environmental
+variable \fBTERM\fP.
+.PP
+.RS 5
+\fB@TPUT@ \-S <<!\fP
+.br
+\fB> clear\fP
+.br
+\fB> cup 10 10\fP
+.br
+\fB> bold\fP
+.br
+\fB> !\fP
+.RE
+.TP 5
+\&
+This example shows \fB@TPUT@\fP processing several capabilities
+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 (\fB!\fP) on a line by itself.
 .SH SEE ALSO
-\fB\%@CLEAR@\fP(\*n),
+\fB\%@CLEAR@\fP(1),
 \fB\%stty\fP(1),
-\fB\%@TABS@\fP(\*n),
-\fB\%@TSET@\fP(\*n),
+\fB\%@TABS@\fP(1),
+\fB\%@TSET@\fP(1),
 \fB\%curs_termcap\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/tset.1 b/man/tset.1
index 415e625ae..5f8457870 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.73 2023/10/14 19:24:28 tom Exp $
-.TH @TSET@ 1 2023-10-14 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.75 2023/11/25 14:32:36 tom Exp $
+.TH @TSET@ 1 2023-11-25 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,9 +53,9 @@
 \fB\%@RESET@\fP \-
 initialize or reset terminal state
 .SH SYNOPSIS
-\fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP]
+\fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal-type\fP]
 .br
-\fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP]
+\fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal-type\fP]
 .SH DESCRIPTION
 .SS tset - initialization
 This program initializes terminals.
@@ -85,7 +85,7 @@ This determination is done as follows, using the first terminal type found.
 .PP
 3. (BSD systems only.) The terminal type associated with the standard
 error output device in the \fI/etc/ttys\fP file.
-(On System\-V-like UNIXes and systems using that convention,
+(On System\-V-like Unices and systems using that convention,
 \fBgetty\fP(1) does this job by setting
 \fBTERM\fP according to the type passed to it by \fI/etc/inittab\fP.)
 .PP
@@ -93,9 +93,8 @@ error output device in the \fI/etc/ttys\fP file.
 is not suitable for curses applications.
 .PP
 If the terminal type was not specified on the command-line, the \fB\-m\fP
-option mappings are then applied (see the section
-.B TERMINAL TYPE MAPPING
-for more information).
+option mappings are then applied;
+see subsection \*(``Terminal Type Mapping\*(''.
 Then, if the terminal type begins with a question mark (\*(``?\*(''), the
 user is prompted for confirmation of the terminal type.
 An empty
@@ -156,66 +155,7 @@ you may have to type
 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
-The options are as follows:
-.TP 5
-.B \-c
-Set control characters and modes.
-.TP 5
-.BI \-e\  ch
-Set the erase character to \fIch\fP.
-.TP
-.B \-I
-Do not send the terminal or tab initialization strings to the terminal.
-.TP
-.BI \-i\  ch
-Set the interrupt character to \fIch\fP.
-.TP
-.BI \-k\  ch
-Set the line kill character to \fIch\fP.
-.TP
-.BI \-m\  mapping
-Specify a mapping from a port type to a terminal.
-See the section
-.B TERMINAL TYPE MAPPING
-for more information.
-.TP
-.B \-Q
-Do not display any values for the erase, interrupt and line kill characters.
-Normally \fB@TSET@\fP displays the values for control characters which
-differ from the system's default values.
-.TP
-.B \-q
-The terminal type is displayed to the standard output, and the terminal is
-not initialized in any way.
-The option \*(``\-\*('' by itself is equivalent but archaic.
-.TP
-.B \-r
-Print the terminal type to the standard error output.
-.TP
-.B \-s
-Print the sequence of shell commands to initialize the environment variable
-\fBTERM\fP to the standard output.
-See the section
-.B SETTING THE ENVIRONMENT
-for details.
-.TP
-.B \-V
-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(3X).
-Normally this has no effect,
-unless \fBsetupterm\fP is not able to detect the window size.
-.PP
-The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP
-options may either be entered as actual characters
-or by using the \*(``hat\*(''
-notation, i.e., control-h may be specified as \*(``\*^H\*('' or \*(``\*^h\*(''.
-.PP
-If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed.
-.
-.SH SETTING THE ENVIRONMENT
+.SS "Setting the Environment"
 It is often desirable to enter the terminal type and information about
 the terminal's capabilities into the shell's environment.
 This is done using the \fB\-s\fP option.
@@ -232,7 +172,7 @@ or \fB.profile\fP files will initialize the environment correctly:
 .sp
     eval \(ga@TSET@ \-s options ... \(ga
 .
-.SH TERMINAL TYPE MAPPING
+.SS "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
 \fI/etc/ttys\fP file or the \fBTERM\fP environmental variable is often
@@ -294,39 +234,89 @@ Also, to avoid problems with meta-characters, it is suggested that the
 entire \fB\-m\fP option argument be placed within single quote characters,
 and that \fBcsh\fP users insert a backslash character (\*(``\e\*('') before
 any exclamation marks (\*(``!\*('').
-.SH HISTORY
-A \fBreset\fP command appeared in 1BSD (March 1978), 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.
-That version of \fBreset\fP did not use the termcap database.
-.PP
-A separate \fBtset\fP command was provided in 1BSD by Eric Allman,
-using the termcap database.
-Allman's comments in the source code indicate
-that he began work in October 1977,
-continuing development over the next few years.
-.PP
-According to comments in the source code,
-the \fBtset\fP program was modified in September 1980,
-to use logic copied from the 3BSD \*(``reset\*(''
-when it was invoked as \fBreset\fP.
-This version appeared in 4.1cBSD, late in 1982.
+.SH OPTIONS
+The options are as follows:
+.TP 5
+.B \-c
+Set control characters and modes.
+.TP 5
+.BI \-e\  ch
+Set the erase character to \fIch\fP.
+.TP
+.B \-I
+Do not send the terminal or tab initialization strings to the terminal.
+.TP
+.BI \-i\  ch
+Set the interrupt character to \fIch\fP.
+.TP
+.BI \-k\  ch
+Set the line kill character to \fIch\fP.
+.TP
+.BI \-m\  mapping
+Specify a mapping from a port type to a terminal;
+see subsection \*(``Terminal Type Mapping\*(''.
+.TP
+.B \-Q
+Do not display any values for the erase, interrupt and line kill characters.
+Normally \fB@TSET@\fP displays the values for control characters which
+differ from the system's default values.
+.TP
+.B \-q
+The terminal type is displayed to the standard output, and the terminal is
+not initialized in any way.
+The option \*(``\-\*('' by itself is equivalent but archaic.
+.TP
+.B \-r
+Print the terminal type to the standard error output.
+.TP
+.B \-s
+Print the sequence of shell commands to initialize the environment variable
+\fBTERM\fP to the standard output;
+see subsection \*(``Setting the Environment\*(''.
+.TP
+.B \-V
+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(3X).
+Normally this has no effect,
+unless \fBsetupterm\fP is not able to detect the window size.
 .PP
-Other developers (e.g., Keith Bostic and Jim Bloom)
-continued to modify \fBtset\fP until 4.4BSD was released in 1993.
+The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP
+options may either be entered as actual characters
+or by using the \*(``hat\*(''
+notation, i.e., control-h may be specified as \*(``\*^H\*('' or \*(``\*^h\*(''.
 .PP
-The \fBncurses\fP implementation
-was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
-S. Raymond <esr@snark.thyrsus.com>.
-.SH COMPATIBILITY
+If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed.
+.SH ENVIRONMENT
+The \fB@TSET@\fP command uses these environment variables:
+.TP 5
+SHELL
+tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP(1) or
+\fBcsh\fP(1) syntax.
+.TP 5
+TERM
+Denotes your terminal type.
+Each terminal type is distinct, though many are similar.
+.TP 5
+TERMCAP
+may denote the location of a termcap database.
+If it is not an absolute pathname, e.g., begins with a \*(``/\*('',
+\fB@TSET@\fP removes the variable from the environment before looking
+for the terminal description.
+.SH FILES
+.TP 5
+/etc/ttys
+system port name to terminal type mapping database (BSD versions only).
+.TP
+.I \*d
+compiled terminal description database directory
+.SH PORTABILITY
 Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
 (POSIX.1-2008) nor
 X/Open Curses Issue 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
 .PP
-The AT&T \fBtput\fP utility (AIX, HPUX, Solaris)
+The AT&T \fBtput\fP utility (AIX, HP-UX, Solaris)
 incorporated the terminal-mode manipulation as well as termcap-based features
 such as resetting tabstops from \fBtset\fP in BSD (4.1c),
 presumably with the intention of making \fBtset\fP obsolete.
@@ -335,7 +325,7 @@ In fact, the commonly-used \fBreset\fP utility
 is always an alias for \fBtset\fP.
 .PP
 The \fB@TSET@\fP utility provides for backward-compatibility with BSD
-environments (under most modern UNIXes, \fB/etc/inittab\fP and \fBgetty\fP(1)
+environments (under most modern Unices, \fB/etc/inittab\fP and \fBgetty\fP(1)
 can set \fBTERM\fP appropriately for each dial-up line; this obviates what was
 \fB@TSET@\fP's most important use).
 This implementation behaves like 4.4BSD
@@ -409,29 +399,49 @@ may be useful for working around window-size problems.
 Those have the drawback that if the window is resized,
 those variables must be recomputed and reassigned.
 To do this more easily, use the \fBresize\fP(1) program.
-.SH ENVIRONMENT
-The \fB@TSET@\fP command uses these environment variables:
-.TP 5
-SHELL
-tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP(1) or
-\fBcsh\fP(1) syntax.
-.TP 5
-TERM
-Denotes your terminal type.
-Each terminal type is distinct, though many are similar.
-.TP 5
-TERMCAP
-may denote the location of a termcap database.
-If it is not an absolute pathname, e.g., begins with a \*(``/\*('',
-\fB@TSET@\fP removes the variable from the environment before looking
-for the terminal description.
-.SH FILES
-.TP 5
-/etc/ttys
-system port name to terminal type mapping database (BSD versions only).
-.TP
-.I \*d
-compiled terminal description database directory
+.SH HISTORY
+A \fB\%reset\fP command written by Kurt Shoens appeared in 1BSD
+(March 1978).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
+It set the \fIerase\fP and \fIkill\fP characters
+to \fB\*^H\fP (backspace) and \fB@\fP respectively.
+Mark Horton improved this \fB\%reset\fP 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.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+.\"   reset.c
+That version of \fB\%reset\fP did not use \fI\%termcap\fP.
+.PP
+Eric Allman wrote a distinct \fBtset\fP command for 1BSD,
+using a forerunner of \fI\%termcap\fP called \fI\%ttycap\fP.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/tset.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
+Allman's comments in the source code indicate
+that he began work in October 1977,
+continuing development over the next few years.
+By late 1979,
+it had migrated to \fI\%termcap\fP and handled the \fI\%TERMCAP\fP
+variable.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+.\"   tset/tset.c
+Later comments indicate that \fBtset\fP was modified in September 1980
+to use logic copied from the 3BSD \*(``reset\*('' program when it was
+invoked as \fB\%reset\fP.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2.9BSD/usr/src/ucb/\
+.\"   tset/tset.c
+This version appeared in 4.1cBSD, \" and backported to 2.9BSD
+late in 1982.
+Other developers such as Keith Bostic and Jim Bloom continued to modify
+\fBtset\fP until 4.4BSD was released in 1993.
+.PP
+The \fI\%ncurses\fP implementation was lightly adapted from the 4.4BSD
+sources to use the \fI\%terminfo\fP API by Eric S.\& Raymond
+<esr@snark.thyrsus.com>.
 .SH SEE ALSO
 \fB\%csh\fP(1),
 \fB\%sh\fP(1),
diff --git a/man/wresize.3x b/man/wresize.3x
index 6a31db493..6990a38c1 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH wresize 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.34 2023/11/25 14:26:30 tom Exp $
+.TH wresize 3X 2023-11-25 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -41,28 +41,32 @@ resize a \fIcurses\fR window
 \fBint wresize(WINDOW *\fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
 .fi
 .SH DESCRIPTION
-This is an extension to the curses library.
-It reallocates storage for an \fBncurses\fP
-window to adjust its dimensions to the specified values.
-If either dimension is larger than the current values, the
-window's data is filled with blanks that have the current background rendition
-(as set by \fBwbkgdset\fP) merged into them.
+This \fI\%ncurses\fP extension to standard \fIcurses\fP reallocates
+storage for a \fIcurses\fP window to adjust its dimensions to the
+specified values.
+If either dimension is larger than its current value,
+the expanded part of the window is filled with blanks merged with
+current background rendition
+(as set by \fB\%wbkgdset\fP(3X)).
 .SH RETURN VALUE
-The function returns the integer \fBERR\fP upon failure and \fBOK\fP on success.
-It will fail if either of the dimensions less than or equal to zero,
+\fB\%wresize\fP returns \fBERR\fP upon failure and \fBOK\fP on success.
+It will fail if either of the dimensions is less than or equal to zero,
 or if an error occurs while (re)allocating memory for the window.
 .SH NOTES
-The only restriction placed on the dimensions is that they be greater than zero.
-The dimensions are not compared to \fBcurses\fP screen dimensions to
-simplify the logic of \fBresizeterm\fP.
+The only restriction placed on the dimensions is that they be greater
+than zero.
+They are \fInot\fP compared to the \fIcurses\fP screen dimensions;
+this keeps the logic of \fB\%resizeterm\fP(3X) simple.
 The caller must ensure that the window's dimensions fit within the
 actual screen dimensions.
 .SH PORTABILITY
-It is not possible to resize windows with SVr4 curses.
+It is not possible to resize windows with SVr4 \fIcurses\fP.
 .PP
-This extension of ncurses was introduced in mid-1995.
-It was adopted in NetBSD curses (2001) and PDCurses (2003).
-.SH AUTHOR
-Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+\fI\%ncurses\fP introduced this extension in mid-1995.
+NetBSD \fIcurses\fP adopted it in 2001,
+and \fI\%PDCurses\fP in 2003.
+.SH AUTHORS
+Thomas Dickey
+(from an equivalent function written in 1988 for BSD \fIcurses\fP).
 .SH SEE ALSO
 \fB\%resizeterm\fP(3X)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 156469e4a..d9ee4e0f9 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231121) unstable; urgency=low
+ncurses6 (6.4+20231125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 156469e4a..d9ee4e0f9 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231121) unstable; urgency=low
+ncurses6 (6.4+20231125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 4c6170b3b..652ad4bdf 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231121) unstable; urgency=low
+ncurses6 (6.4+20231125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 21 Nov 2023 16:44:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 0ea10d011..a9a653765 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.618 2023/11/21 21:44:33 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.619 2023/11/23 01:18:34 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1121"
+!define VERSION_MMDD  "1125"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1b4b84314..0cb72faec 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231121
+Release: 20231125
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index efc5072c4..b015ae6c1 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231121
+Release: 20231125
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 8a16ae659..be1baa164 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231121
+Release: 20231125
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/README b/test/README
index 9d5db7c37..300f9e61c 100644
--- a/test/README
+++ b/test/README
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.79 2023/08/12 19:07:07 tom Exp $
+-- $Id: README,v 1.80 2023/11/25 21:17:30 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -297,7 +297,7 @@ curs_set			test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdem
 curs_set_sp			test: sp_tinfo
 curscr				test: demo_panels knight lrtest ncurses popup_msg savescreen tclock
 curses_trace			test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm progs: infocmp tic toe
-curses_version			test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs demo_termcap demo_terminfo ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight list_keys lrtest move_field movewindow ncurses newdemo padview pair_content picsmap railroad rain redraw savescreen sp_tinfo tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_arrays test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_sgr test_termattrs test_tparm test_unget_wch test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas progs: clear infocmp tabs tic toe tput tset
+curses_version			test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs demo_termcap demo_terminfo ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight list_keys lrtest move_field movewindow ncurses newdemo padview pair_content picsmap railroad rain redraw savescreen sp_tinfo tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_arrays test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_sgr test_termattrs test_tparm test_unget_wch test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas progs: clear infocmp tabs tic toe tput tset
 def_prog_mode			test: bs ncurses
 def_prog_mode_sp		test: sp_tinfo
 def_shell_mode			-
@@ -320,14 +320,14 @@ echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
 echo_sp				lib: ncurses
 echo_wchar			test: ncurses
 echochar			test: echochar ncurses
-endwin				test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas
+endwin				test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas
 endwin_sp			lib: ncurses
 erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses picsmap tclock test_opaque testcurs
 erasechar			test: ncurses
 erasechar_sp			test: sp_tinfo
 erasewchar			test: ncurses
 erasewchar_sp			lib: ncurses
-exit_curses			test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_termattrs test_unget_wch testaddch testcurs testscanw view worm xmas
+exit_curses			test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_termattrs test_unget_wch testaddch testcurs testscanw view worm xmas
 exit_terminfo			test: demo_termcap demo_terminfo dots dots_mvcur dots_termcap list_keys railroad sp_tinfo test_arrays test_sgr test_tparm test_vid_puts test_vidputs
 extended_color_content		test: color_content extended_color
 extended_color_content_sp	test: extended_color
@@ -355,7 +355,7 @@ getbegy				test: chgat clip_printw demo_menus demo_panels dump_window insdelln m
 getbkgd				test: ncurses
 getbkgrnd			test: ncurses
 getcchar			test: demo_new_pair ncurses savescreen view
-getch				test: back_ground background blue bs chgat color_content color_set combine demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_mouse test_opaque test_unget_wch testaddch testcurs view xmas
+getch				test: back_ground background blue bs chgat color_content color_set combine demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_endwin test_mouse test_opaque test_unget_wch testaddch testcurs view xmas
 getcurx				test: bs chgat clip_printw combine demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view
 getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses popup_msg redraw savescreen test_mouse test_opaque testcurs view
 getmaxx				test: chgat clip_printw demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
@@ -400,7 +400,7 @@ init_extended_pair		test: extended_color ncurses pair_content picsmap
 init_extended_pair_sp		test: extended_color
 init_pair			test: back_ground background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
 init_pair_sp			lib: ncurses
-initscr				test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas
+initscr				test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas
 innstr				test: test_instr
 innwstr				test: test_inwstr
 ins_nwstr			test: ins_wide
@@ -557,7 +557,7 @@ new_prescr			test: sp_tinfo
 newpad				test: ncurses padview popup_msg testcurs
 newpad_sp			lib: ncurses
 newscr				lib: ncurses
-newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_setupterm test_termattrs
+newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_endwin test_setupterm test_termattrs
 newterm_sp			-
 newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
 newwin_sp			lib: ncurses
@@ -598,7 +598,7 @@ qiflush_sp			test: sp_tinfo
 raw				test: demo_forms dup_field move_field ncurses redraw testcurs
 raw_sp				test: sp_tinfo
 redrawwin			test: combine padview redraw view
-refresh				test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock test_delwin test_mouse testcurs view xmas
+refresh				test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock test_delwin test_endwin test_mouse testcurs view xmas
 reset_color_pairs		test: picsmap
 reset_color_pairs_sp		-
 reset_prog_mode			test: filter ncurses
@@ -762,8 +762,8 @@ wattr_get			test: ncurses
 wattr_off			lib: ncurses
 wattr_on			lib: ncurses
 wattr_set			test: ncurses
-wattroff			test: demo_forms ncurses testcurs xmas
-wattron				test: testcurs xmas
+wattroff			test: clip_printw demo_forms ncurses testcurs xmas
+wattron				test: clip_printw testcurs xmas
 wattrset			test: clip_printw demo_forms insdelln ncurses newdemo padview test_get_wstr test_getstr testcurs xmas
 wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo padview testcurs
 wbkgdset			test: demo_panels ins_wide inserts ncurses test_add_wchstr test_addchstr test_addstr test_addwstr
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index d14591fef..a204aa94f 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.218 2023/10/28 16:08:26 tom Exp $
+dnl $Id: aclocal.m4,v 1.219 2023/11/23 01:48:30 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -4180,7 +4180,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
+dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30
 dnl --------------------
 dnl Allow for overriding the basename of a library, i.e., the part to which
 dnl prefixes/suffixes are attached.
@@ -4192,7 +4192,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME],
 [
 AC_MSG_CHECKING(for desired basename for $2 library)
 AC_ARG_WITH($2-libname,
-	[  --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library],
+	[[  --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]],
 	[with_lib_basename=$withval],
 	[with_lib_basename=ifelse($3,,$2,$3)])
 $1="$with_lib_basename"
diff --git a/test/configure b/test/configure
index 36daaa413..53acceb54 100755
--- a/test/configure
+++ b/test/configure
@@ -726,9 +726,9 @@ Curses Version-dependent Options:
   --with-XawPlus          link with Athena-Plus library
   --with-x                use the X Window System
   --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)
-  --with-form-libname=XXX override form basename of library
-  --with-menu-libname=XXX override menu basename of library
-  --with-panel-libname=XXX override panel basename of library
+  --with-form-libname[=XXX] override ifelse(,,form,) basename of library
+  --with-menu-libname[=XXX] override ifelse(,,menu,) basename of library
+  --with-panel-libname[=XXX] override ifelse(,,panel,) basename of library
   --disable-panel         disable checks for panel functions
   --disable-menu          disable checks for menu functions
   --disable-form          disable checks for form functions

From 3724dc6b5c69c11564c16007ba7469ff64338aff Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 3 Dec 2023 02:15:17 +0100
Subject: [PATCH 043/106] ncurses-6.4-20231202.patch

---
 NEWS                                 |   8 +-
 VERSION                              |   2 +-
 announce.html.in                     |  29 ++--
 dist.mk                              |   4 +-
 doc/html/man/captoinfo.1m.html       |   8 +-
 doc/html/man/clear.1.html            |  18 +--
 doc/html/man/curs_attr.3x.html       | 224 +++++++++++++--------------
 doc/html/man/curs_bkgd.3x.html       |  49 +++---
 doc/html/man/curs_bkgrnd.3x.html     |  23 ++-
 doc/html/man/curs_initscr.3x.html    |  12 +-
 doc/html/man/curs_opaque.3x.html     |  10 +-
 doc/html/man/curs_termcap.3x.html    |  10 +-
 doc/html/man/curs_terminfo.3x.html   |  16 +-
 doc/html/man/curs_util.3x.html       |  20 +--
 doc/html/man/infocmp.1m.html         |  18 +--
 doc/html/man/ncurses.3x.html         | 133 ++++++++--------
 doc/html/man/ncursesw6-config.1.html |  66 ++++----
 doc/html/man/resizeterm.3x.html      |  10 +-
 doc/html/man/term.5.html             |  12 +-
 doc/html/man/term.7.html             |  32 ++--
 doc/html/man/terminfo.5.html         |  20 +--
 doc/html/man/tic.1m.html             |  89 ++++++-----
 doc/html/man/toe.1m.html             |  10 +-
 doc/html/man/tput.1.html             |  24 +--
 doc/html/man/tset.1.html             |  60 +++----
 man/MKncu_config.in                  |  12 +-
 man/captoinfo.1m                     |   6 +-
 man/clear.1                          |  17 +-
 man/curs_attr.3x                     |   9 +-
 man/curs_bkgd.3x                     |  58 ++++---
 man/curs_bkgrnd.3x                   |  15 +-
 man/curs_initscr.3x                  |   8 +-
 man/curs_opaque.3x                   |   6 +-
 man/curs_termcap.3x                  |   6 +-
 man/curs_terminfo.3x                 |  16 +-
 man/curs_util.3x                     |  18 ++-
 man/infocmp.1m                       |  14 +-
 man/ncurses.3x                       | 145 ++++++++---------
 man/resizeterm.3x                    |   6 +-
 man/term.5                           |  10 +-
 man/term.7                           |  43 ++---
 man/terminfo.tail                    |  19 ++-
 man/tic.1m                           |  30 ++--
 man/toe.1m                           |   8 +-
 man/tput.1                           |  30 ++--
 man/tset.1                           |  60 +++----
 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/infocmp.c                      |  14 +-
 test/programs                        |   4 +-
 55 files changed, 764 insertions(+), 719 deletions(-)

diff --git a/NEWS b/NEWS
index 2f9c9e3a0..68401bbc2 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4039 2023/11/25 19:45:00 tom Exp $
+-- $Id: NEWS,v 1.4042 2023/12/02 21:47:07 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231202
+	+ correct initial alignment of extended capabilities in infocmp, so
+	  that the "-u" option can be used for more than two terminal types.
+	+ improve formatting/style of manpages, changing environment variables
+	  to italics (patches by Branden Robinson).
+
 20231125
 	+ add information about "ttycap", termcap's forerunner, to tset.1
 	  (patch by Branden Robinson).
diff --git a/VERSION b/VERSION
index d60620cdf..17d58d79f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231125
+5:0:10	6.4	20231202
diff --git a/announce.html.in b/announce.html.in
index ebeee5243..da2b2fc5c 100644
--- a/announce.html.in
+++ b/announce.html.in
@@ -1,7 +1,7 @@
 <!--
-  $Id: announce.html.in,v 1.104 2022/12/31 20:35:34 tom Exp $
+  $Id: announce.html.in,v 1.105 2023/12/02 21:45:06 tom Exp $
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
@@ -927,30 +927,31 @@
     </li>
 
     <li>
-      <p><span class="main-name">ncurses</span> supports all of the
-      for SVr4 curses features including keyboard mapping, color,
-      forms-drawing with ACS characters, and automatic recognition
-      of keypad and function keys.</p>
+      <p><span class="main-name">ncurses</span> supports the features of
+      SVr4 curses including keyboard mapping, color, form drawing with
+      ACS characters, and automatic recognition of keypad and function
+      keys.</p>
     </li>
 
     <li>
-      <p><span class="main-name">ncurses</span> provides these SVr4
-      add-on libraries (not part of X/Open Curses):</p>
+      <p><span class="main-name">ncurses</span> provides work-alike
+      replacements of SVr4 supplemental libraries based on curses, but
+      which were not specified by X/Open Curses:</p>
 
       <ul>
         <li>
-          <p>the panels library, supporting a stack of windows with
-          backing store.</p>
+          <p>the panel library, supporting a stack of windows with
+          backing store</p>
         </li>
 
         <li>
-          <p>the menus library, supporting a uniform but flexible
-          interface for menu programming.</p>
+          <p>the menu library, supporting a uniform but flexible
+          interface for menu programming</p>
         </li>
 
         <li>
           <p>the form library, supporting data collection through
-          on-screen forms.</p>
+          on-screen forms</p>
         </li>
       </ul>
     </li>
@@ -962,7 +963,7 @@
       <ul>
         <li>
           <p><span class="main-name">ncurses</span> supports
-          user-defined capabilities which it can see, but which are
+          user-defined capabilities that it can see, but which are
           hidden from SVr4 curses applications using the
           <em>same</em> terminal database.</p>
         </li>
diff --git a/dist.mk b/dist.mk
index 6c2dfe8a3..17d0b6709 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1579 2023/11/25 11:21:56 tom Exp $
+# $Id: dist.mk,v 1.1581 2023/12/02 21:47:07 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231125
+NCURSES_PATCH = 20231202
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 3562d6758..9531a372c 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.54 2023/11/25 14:32:36 tom Exp @
+  * @Id: captoinfo.1m,v 1.56 2023/12/02 20:51:25 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -200,7 +200,7 @@ <H1 class="no-header">captoinfo 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-12-02                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 4f2e2aa2b..ba4754ac1 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.43 2023/11/25 14:32:36 tom Exp @
+  * @Id: clear.1,v 1.45 2023/12/02 20:49:04 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
   *   tput/clear.sh
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>clear</STRONG>  clears your terminal's screen and its scrollback buffer, if any.
-       <STRONG>clear</STRONG> retrieves the terminal type from the environment  variable  <STRONG>TERM</STRONG>,
+       <STRONG>clear</STRONG> retrieves the terminal type from the environment  variable  <EM>TERM</EM>,
        then  consults the <EM>terminfo</EM> terminal capability database entry for that
        type to determine how to perform these actions.
 
@@ -76,9 +76,9 @@ <H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 
        <STRONG>-T</STRONG> <EM>type</EM>  produces   instructions   suitable   for  the  terminal  <EM>type</EM>.
                 Normally, this option is  unnecessary,  because  the  terminal
-                type  is inferred from the environment variable <STRONG>TERM</STRONG>.  If this
+                type  is inferred from the environment variable <EM>TERM</EM>.  If this
                 option is specified, <STRONG>clear</STRONG> ignores the  environment  variables
-                <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> as well.
+                <EM>LINES</EM> and <EM>COLUMNS</EM> as well.
 
        <STRONG>-V</STRONG>       reports  the  version  of <EM>ncurses</EM> associated with this program
                 and exits with a successful status.
@@ -88,7 +88,7 @@ <H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
-       (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
+       (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>clear</STRONG>.
 
        The  latter documents <STRONG>tput</STRONG>, which could be used to replace this utility
        either via a shell script or by an alias (such as a symbolic  link)  to
@@ -122,7 +122,7 @@ <H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 
                printf '\033[2J'
 
-           one could clear the scrollback buffer using
+           one could clear the scrollback buffer as well by using
 
                printf '\033[<STRONG>3</STRONG>J'
 
@@ -151,7 +151,7 @@ <H1 class="no-header">clear 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-12-02                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 02618a6e8..7d1f64139 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.89 2023/11/25 15:33:56 tom Exp @
+  * @Id: curs_attr.3x,v 1.91 2023/12/02 21:05:24 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -120,106 +120,103 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        of the window.   See  <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  for  functions  which  modify  the
        attributes used for erasing and clearing.
 
-       Routines  which  do  not have a <STRONG>WINDOW*</STRONG> parameter apply to <STRONG>stdscr</STRONG>.  For
-       example, <STRONG>attr_set</STRONG> is the <STRONG>stdscr</STRONG> variant of <STRONG>wattr_set</STRONG>.
-
 
 </PRE><H3><a name="h3-Window-attributes">Window attributes</a></H3><PRE>
        There are two sets of functions:
 
-       <STRONG>o</STRONG>   functions  for  manipulating  the  window  attributes  and   color:
+       <STRONG>o</STRONG>   functions   for  manipulating  the  window  attributes  and  color:
            <STRONG>wattr_set</STRONG> and <STRONG>wattr_get</STRONG>.
 
-       <STRONG>o</STRONG>   functions  for manipulating only the window attributes (not color):
+       <STRONG>o</STRONG>   functions for manipulating only the window attributes (not  color):
            <STRONG>wattr_on</STRONG> and <STRONG>wattr_off</STRONG>.
 
-       The <STRONG>wattr_set</STRONG> function sets the current attributes of the given  window
+       The  <STRONG>wattr_set</STRONG> function sets the current attributes of the given window
        to <EM>attrs</EM>, with color specified by <EM>pair</EM>.
 
        Use <STRONG>wattr_get</STRONG> to retrieve attributes for the given window.
 
-       Use  <STRONG>attr_on</STRONG>  and  <STRONG>wattr_on</STRONG>  to turn on window attributes, i.e., values
+       Use <STRONG>attr_on</STRONG> and <STRONG>wattr_on</STRONG> to turn on  window  attributes,  i.e.,  values
        OR'd  together  in  <EM>attr</EM>,  without  affecting  other  attributes.   Use
        <STRONG>attr_off</STRONG> and <STRONG>wattr_off</STRONG> to turn off window attributes, again values OR'd
        together in <EM>attr</EM>, without affecting other attributes.
 
 
 </PRE><H3><a name="h3-Legacy-window-attributes">Legacy window attributes</a></H3><PRE>
-       The X/Open window attribute routines which <EM>set</EM> or <EM>get</EM>, turn <EM>on</EM>  or  <EM>off</EM>
+       The  X/Open  window attribute routines which <EM>set</EM> or <EM>get</EM>, turn <EM>on</EM> or <EM>off</EM>
        are extensions of older routines which assume that color pairs are OR'd
-       into the attribute parameter.  These newer routines use similar  names,
+       into  the attribute parameter.  These newer routines use similar names,
        because X/Open simply added an underscore (<STRONG>_</STRONG>) for the newer names.
 
        The <STRONG>int</STRONG> datatype used in the legacy routines is treated as if it is the
-       same size as <STRONG>chtype</STRONG> (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It  holds  the  common  video
-       attributes  (such  as  bold, reverse), as well as a few bits for color.
-       Those bits correspond to the  <STRONG>A_COLOR</STRONG>  symbol.   The  <STRONG>COLOR_PAIR</STRONG>  macro
-       provides  a  value which can be OR'd into the attribute parameter.  For
-       example, as long as that value fits into the <STRONG>A_COLOR</STRONG> mask,  then  these
+       same  size  as  <STRONG>chtype</STRONG>  (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It holds the common video
+       attributes (such as bold, reverse), as well as a few  bits  for  color.
+       Those  bits  correspond  to  the  <STRONG>A_COLOR</STRONG> symbol.  The <STRONG>COLOR_PAIR</STRONG> macro
+       provides a value which can be OR'd into the attribute  parameter.   For
+       example,  as  long as that value fits into the <STRONG>A_COLOR</STRONG> mask, then these
        calls produce similar results:
 
            attrset(A_BOLD | COLOR_PAIR(<EM>pair</EM>));
            attr_set(A_BOLD, <EM>pair</EM>, NULL);
 
        However, if the value does not fit, then the <STRONG>COLOR_PAIR</STRONG> macro uses only
-       the bits that fit.  For example, because in ncurses <STRONG>A_COLOR</STRONG>  has  eight
+       the  bits  that fit.  For example, because in ncurses <STRONG>A_COLOR</STRONG> has eight
        (8) bits, then <STRONG>COLOR_PAIR(</STRONG><EM>259</EM><STRONG>)</STRONG> is 4 (i.e., 259 is 4 more than the limit
        255).
 
-       The <STRONG>PAIR_NUMBER</STRONG> macro extracts a pair number from an <STRONG>int</STRONG>  (or  <STRONG>chtype</STRONG>).
-       For  example,  the <EM>input</EM> and <EM>output</EM> values in these statements would be
+       The  <STRONG>PAIR_NUMBER</STRONG>  macro extracts a pair number from an <STRONG>int</STRONG> (or <STRONG>chtype</STRONG>).
+       For example, the <EM>input</EM> and <EM>output</EM> values in these statements  would  be
        the same:
 
            int value = A_BOLD | COLOR_PAIR(<EM>input</EM>);
            int <EM>output</EM> = PAIR_NUMBER(value);
 
-       The <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 curses but  kept
-       in  X/Open  Curses  for  the  same  reason  that  SVr4  curses kept it:
+       The  <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 curses but kept
+       in X/Open Curses  for  the  same  reason  that  SVr4  curses  kept  it:
        compatibility.
 
-       The remaining <STRONG>attr</STRONG>* functions operate exactly  like  the  corresponding
-       <STRONG>attr_</STRONG>*  functions,  except  that they take arguments of type <STRONG>int</STRONG> rather
+       The  remaining  <STRONG>attr</STRONG>*  functions operate exactly like the corresponding
+       <STRONG>attr_</STRONG>* functions, except that they take arguments of  type  <STRONG>int</STRONG>  rather
        than <STRONG>attr_t</STRONG>.
 
-       There is no corresponding <STRONG>attrget</STRONG> function as such  in  X/Open  Curses,
+       There  is  no  corresponding <STRONG>attrget</STRONG> function as such in X/Open Curses,
        although ncurses provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Change-character-rendition">Change character rendition</a></H3><PRE>
        The  routine  <STRONG>chgat</STRONG>  changes  the  attributes  of  a  given  number  of
-       characters starting at the current cursor location of <STRONG>stdscr</STRONG>.  It  does
+       characters  starting at the current cursor location of <STRONG>stdscr</STRONG>.  It does
        not update the cursor and does not perform wrapping.  A character count
-       of -1 or greater than  the  remaining  window  width  means  to  change
-       attributes  all  the  way  to  the end of the current line.  The <STRONG>wchgat</STRONG>
-       function generalizes this to any window; the <STRONG>mvwchgat</STRONG> function  does  a
+       of  -1  or  greater  than  the  remaining  window width means to change
+       attributes all the way to the end of  the  current  line.   The  <STRONG>wchgat</STRONG>
+       function  generalizes  this to any window; the <STRONG>mvwchgat</STRONG> function does a
        cursor move before acting.
 
-       In  these  functions, the color <EM>pair</EM> argument is a color-pair index (as
+       In these functions, the color <EM>pair</EM> argument is a color-pair  index  (as
        in the first argument of <STRONG>init_pair</STRONG>, see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Change-window-color">Change window color</a></H3><PRE>
        The routine <STRONG>color_set</STRONG> sets the current color of the given window to the
-       foreground/background   combination   described   by   the  color  <EM>pair</EM>
+       foreground/background  combination  described   by   the   color   <EM>pair</EM>
        parameter.
 
 
 </PRE><H3><a name="h3-Standout">Standout</a></H3><PRE>
-       The routine <STRONG>standout</STRONG> is the same as  <STRONG>attron(A_STANDOUT)</STRONG>.   The  routine
-       <STRONG>standend</STRONG>  is  the  same as <STRONG>attrset(A_NORMAL)</STRONG> or <STRONG>attrset(0)</STRONG>, that is, it
+       The  routine  <STRONG>standout</STRONG>  is the same as <STRONG>attron(A_STANDOUT)</STRONG>.  The routine
+       <STRONG>standend</STRONG> is the same as <STRONG>attrset(A_NORMAL)</STRONG> or <STRONG>attrset(0)</STRONG>,  that  is,  it
        turns off all attributes.
 
        X/Open does not mark these "restricted", because
 
        <STRONG>o</STRONG>   they have well established legacy use, and
 
-       <STRONG>o</STRONG>   there is no  ambiguity  about  the  way  the  attributes  might  be
+       <STRONG>o</STRONG>   there  is  no  ambiguity  about  the  way  the  attributes might be
            combined with a color pair.
 
 
 </PRE><H3><a name="h3-Video-Attributes">Video Attributes</a></H3><PRE>
        The following video attributes, defined in <STRONG>&lt;curses.h&gt;</STRONG>, can be passed to
-       the routines <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, and <STRONG>attrset</STRONG>, or OR'd with the  characters
+       the  routines <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, and <STRONG>attrset</STRONG>, or OR'd with the characters
        passed to <STRONG>addch</STRONG> (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>).
 
               <STRONG>Name</STRONG>           <STRONG>Description</STRONG>
@@ -238,7 +235,7 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
               <STRONG>A_CHARTEXT</STRONG>     Bit-mask to extract a character
               <STRONG>A_COLOR</STRONG>        Bit-mask to extract a color (legacy routines)
 
-       These  video  attributes are supported by <STRONG>attr_on</STRONG> and related functions
+       These video attributes are supported by <STRONG>attr_on</STRONG> and  related  functions
        (which also support the attributes recognized by <STRONG>attron</STRONG>, etc.):
 
               <STRONG>Name</STRONG>            <STRONG>Description</STRONG>
@@ -250,9 +247,9 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
               <STRONG>WA_TOP</STRONG>          Top highlight
               <STRONG>WA_VERTICAL</STRONG>     Vertical highlight
 
-       The return values of many of these routines are  not  meaningful  (they
-       are  implemented  as macro-expanded assignments and simply return their
-       argument).  The SVr4 manual page claims (falsely) that  these  routines
+       The  return  values  of many of these routines are not meaningful (they
+       are implemented as macro-expanded assignments and simply  return  their
+       argument).   The  SVr4 manual page claims (falsely) that these routines
        always return <STRONG>1</STRONG>.
 
 
@@ -265,13 +262,13 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   returns an error if the window pointer is null.
 
-       <STRONG>o</STRONG>   returns  an  error  if  the  color pair parameter for <STRONG>wcolor_set</STRONG> is
+       <STRONG>o</STRONG>   returns an error if the color  pair  parameter  for  <STRONG>wcolor_set</STRONG>  is
            outside the range 0..COLOR_PAIRS-1.
 
-       <STRONG>o</STRONG>   does not return an error if either of the parameters  of  <STRONG>wattr_get</STRONG>
+       <STRONG>o</STRONG>   does  not  return an error if either of the parameters of <STRONG>wattr_get</STRONG>
            used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -279,58 +276,58 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        These functions may be macros:
 
-              <STRONG>attroff</STRONG>,  <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>standend</STRONG>
+              <STRONG>attroff</STRONG>, <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>,  <STRONG>standend</STRONG>
               and <STRONG>standout</STRONG>.
 
-       Color pair values can only be OR'd with attributes if the  pair  number
+       Color  pair  values can only be OR'd with attributes if the pair number
        is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can pass a
        color pair value directly.  However, ncurses ABI 4 and 5 simply OR this
-       value  within  the  alternate functions.  You must use ncurses ABI 6 to
+       value within the alternate functions.  You must use ncurses  ABI  6  to
        support more than 256 color pairs.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        This implementation provides the <STRONG>A_ITALIC</STRONG> attribute for terminals which
-       have   the   <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and  <STRONG>exit_italics_mode</STRONG>  (<STRONG>ritm</STRONG>)
-       capabilities.  Italics are not mentioned in X/Open Curses.  Unlike  the
-       other  video  attributes,  <STRONG>A_ITALIC</STRONG>  is unrelated to the <STRONG>set_attributes</STRONG>
-       capabilities.   This   implementation   makes   the   assumption   that
+       have  the  <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and   <STRONG>exit_italics_mode</STRONG>   (<STRONG>ritm</STRONG>)
+       capabilities.   Italics are not mentioned in X/Open Curses.  Unlike the
+       other video attributes, <STRONG>A_ITALIC</STRONG> is  unrelated  to  the  <STRONG>set_attributes</STRONG>
+       capabilities.    This   implementation   makes   the   assumption  that
        <STRONG>exit_attribute_mode</STRONG> may also reset italics.
 
-       Each  of  the functions added by XSI Curses has a parameter <EM>opts</EM>, which
-       X/Open Curses  still  (after  more  than  twenty  years)  documents  as
+       Each of the functions added by XSI Curses has a parameter  <EM>opts</EM>,  which
+       X/Open  Curses  still  (after  more  than  twenty  years)  documents as
        reserved  for  future  use,  saying  that  it  should  be  <STRONG>NULL</STRONG>.   This
-       implementation uses that parameter in ABI 6  for  the  functions  which
+       implementation  uses  that  parameter  in ABI 6 for the functions which
        have a color-pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
        <STRONG>o</STRONG>   For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
-           if <EM>opts</EM> is set it is treated as a pointer to <STRONG>int</STRONG>, and used  to  set
+           if  <EM>opts</EM>  is set it is treated as a pointer to <STRONG>int</STRONG>, and used to set
            the color pair instead of the <STRONG>short</STRONG> <EM>pair</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which retrieve the color, e.g., <STRONG>wattr_get</STRONG>, if <EM>opts</EM> is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
-           color  pair  as  an <STRONG>int</STRONG> value, in addition to retrieving it via the
+           set  it  is  treated  as a pointer to <STRONG>int</STRONG>, and used to retrieve the
+           color pair as an <STRONG>int</STRONG> value, in addition to retrieving  it  via  the
            standard pointer to <STRONG>short</STRONG> parameter.
 
-       <STRONG>o</STRONG>   For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the  <EM>opts</EM>
+       <STRONG>o</STRONG>   For  functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the <EM>opts</EM>
            parameter is ignored except except to check that it is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.  The
-       standard defined the dedicated type for highlights, <STRONG>attr_t</STRONG>,  which  was
+       standard  defined  the dedicated type for highlights, <STRONG>attr_t</STRONG>, which was
        not defined in SVr4 curses.  The functions taking <STRONG>attr_t</STRONG> arguments were
        not supported under SVr4.
 
        Very old versions of this library did not force an update of the screen
-       when  changing  the  attributes.   Use  <STRONG>touchwin</STRONG> to force the screen to
+       when changing the attributes.  Use <STRONG>touchwin</STRONG>  to  force  the  screen  to
        match the updated attributes.
 
-       The XSI Curses standard states that whether the  traditional  functions
-       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG>  can  manipulate  attributes other than <STRONG>A_BLINK</STRONG>,
-       <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is  "unspecified".
-       Under  this  implementation  as  well  as  SVr4 curses, these functions
-       correctly manipulate all other highlights (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
+       The  XSI  Curses standard states that whether the traditional functions
+       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG> can manipulate attributes  other  than  <STRONG>A_BLINK</STRONG>,
+       <STRONG>A_BOLD</STRONG>,  <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is "unspecified".
+       Under this implementation as  well  as  SVr4  curses,  these  functions
+       correctly  manipulate all other highlights (specifically, <STRONG>A_ALTCHARSET</STRONG>,
        <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
 
        XSI Curses added these entry points:
@@ -338,7 +335,7 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
               <STRONG>attr_get</STRONG>,  <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>,  <STRONG>wattr_on</STRONG>,  <STRONG>wattr_off</STRONG>,
               <STRONG>wattr_get</STRONG>, <STRONG>wattr_set</STRONG>
 
-       The new functions are intended to work with a new series  of  highlight
+       The  new  functions are intended to work with a new series of highlight
        macros prefixed with <STRONG>WA_</STRONG>.  The older macros have direct counterparts in
        the newer set of names:
 
@@ -351,91 +348,92 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
               <STRONG>WA_BLINK</STRONG>        Blinking
               <STRONG>WA_DIM</STRONG>          Half bright
               <STRONG>WA_BOLD</STRONG>         Extra bright or bold
+
               <STRONG>WA_ALTCHARSET</STRONG>   Alternate character set
 
-       XSI curses does not assign values to these symbols, nor does  it  state
+       XSI  curses  does not assign values to these symbols, nor does it state
        whether or not they are related to the similarly-named A_NORMAL, etc.:
 
-       <STRONG>o</STRONG>   The  XSI  curses standard specifies that each pair of corresponding
-           <STRONG>A_</STRONG> and <STRONG>WA_</STRONG>-using functions operates on the  same  current-highlight
+       <STRONG>o</STRONG>   The XSI curses standard specifies that each pair  of  corresponding
+           <STRONG>A_</STRONG>  and  <STRONG>WA_</STRONG>-using functions operates on the same current-highlight
            information.
 
-       <STRONG>o</STRONG>   However,  in  some  implementations,  those  symbols have unrelated
+       <STRONG>o</STRONG>   However, in some  implementations,  those  symbols  have  unrelated
            values.
 
            For example, the Solaris <EM>xpg4</EM> (X/Open) curses declares <STRONG>attr_t</STRONG> to be
-           an  unsigned  short  integer  (16-bits), while <STRONG>chtype</STRONG> is a unsigned
+           an unsigned short integer (16-bits), while  <STRONG>chtype</STRONG>  is  a  unsigned
            integer (32-bits).  The <STRONG>WA_</STRONG> symbols in this case are different from
-           the  <STRONG>A_</STRONG>  symbols because they are used for a smaller datatype which
+           the <STRONG>A_</STRONG> symbols because they are used for a smaller  datatype  which
            does not represent <STRONG>A_CHARTEXT</STRONG> or <STRONG>A_COLOR</STRONG>.
 
            In this implementation (as in many others), the values happen to be
-           the  same  because it simplifies copying information between <STRONG>chtype</STRONG>
+           the same because it simplifies copying information  between  <STRONG>chtype</STRONG>
            and <STRONG>cchar_t</STRONG> variables.
 
-       <STRONG>o</STRONG>   Because ncurses's <STRONG>attr_t</STRONG> can hold a  color  pair  (in  the  <STRONG>A_COLOR</STRONG>
-           field),  a  call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may alter the
-           window's color.  If the color pair  information  in  the  attribute
+       <STRONG>o</STRONG>   Because  ncurses's  <STRONG>attr_t</STRONG>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
+           field), a call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may  alter  the
+           window's  color.   If  the  color pair information in the attribute
            parameter is zero, no change is made to the window's color.
 
            This is consistent with SVr4 curses; X/Open Curses does not specify
            this.
 
        The  XSI  standard  extended  conformance  level  adds  new  highlights
-       <STRONG>A_HORIZONTAL</STRONG>,   <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>  (and
-       corresponding <STRONG>WA_</STRONG> macros for  each).   As  of  August  2013,  no  known
+       <STRONG>A_HORIZONTAL</STRONG>,  <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>   (and
+       corresponding  <STRONG>WA_</STRONG>  macros  for  each).   As  of  August 2013, no known
        terminal provides these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open  Curses  is  largely  based  on  SVr4 curses, adding support for
-       "wide-characters" (not  specific  to  Unicode).   Some  of  the  X/Open
-       differences  from  SVr4  curses address the way video attributes can be
-       applied to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and  <STRONG>attr_set</STRONG>
-       are  similar.  SVr4 curses provided the basic features for manipulating
-       video attributes.  However, earlier versions of curses provided a  part
+       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
+       "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
+       differences from SVr4 curses address the way video  attributes  can  be
+       applied  to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
+       are similar.  SVr4 curses provided the basic features for  manipulating
+       video  attributes.  However, earlier versions of curses provided a part
        of these features.
 
-       As  seen  in  2.8BSD, curses assumed 7-bit characters, using the eighth
-       bit of a byte to represent the <EM>standout</EM> feature (often  implemented  as
-       bold  and/or reverse video).  The BSD curses library provided functions
-       <STRONG>standout</STRONG> and <STRONG>standend</STRONG> which were carried along into X/Open  Curses  due
+       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
+       bit  of  a byte to represent the <EM>standout</EM> feature (often implemented as
+       bold and/or reverse video).  The BSD curses library provided  functions
+       <STRONG>standout</STRONG>  and  <STRONG>standend</STRONG> which were carried along into X/Open Curses due
        to their pervasive use in legacy applications.
 
-       Some   terminals  in  the  1980s  could  support  a  variety  of  video
-       attributes, although the BSD  curses  library  could  do  nothing  with
-       those.   System  V  (1983)  provided  an  improved  curses library.  It
-       defined the <STRONG>A_</STRONG> symbols for use by applications to manipulate the  other
+       Some  terminals  in  the  1980s  could  support  a  variety  of   video
+       attributes,  although  the  BSD  curses  library  could do nothing with
+       those.  System V  (1983)  provided  an  improved  curses  library.   It
+       defined  the <STRONG>A_</STRONG> symbols for use by applications to manipulate the other
        attributes.  There are few useful references for the chronology.
 
-       Goodheart's  book  <EM>UNIX</EM>  <EM>Curses</EM> <EM>Explained</EM> (1991) describes SVr3 (1987),
+       Goodheart's book <EM>UNIX</EM> <EM>Curses</EM> <EM>Explained</EM> (1991)  describes  SVr3  (1987),
        commenting on several functions:
 
-       <STRONG>o</STRONG>   the <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of  the  functions
+       <STRONG>o</STRONG>   the  <STRONG>attron</STRONG>,  <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of the functions
            found in SVr4 but not in BSD curses) were introduced by System V,
 
-       <STRONG>o</STRONG>   the  alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added in
+       <STRONG>o</STRONG>   the alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added  in
            SVr2 and improved in SVr3 (by adding <STRONG>acs_map[]</STRONG>),
 
-       <STRONG>o</STRONG>   <STRONG>start_color</STRONG> and related color-functions were introduced  by  System
+       <STRONG>o</STRONG>   <STRONG>start_color</STRONG>  and  related color-functions were introduced by System
            V.3.2,
 
        <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
 
        Goodheart did not mention the background character or the <STRONG>cchar_t</STRONG> type.
        Those are respectively SVr4 and X/Open features.  He did mention the <STRONG>A_</STRONG>
-       constants,  but did not indicate their values.  Those were not the same
+       constants, but did not indicate their values.  Those were not the  same
        in different systems, even for those marked as System V.
 
-       Different Unix systems used  different  sizes  for  the  bit-fields  in
-       <STRONG>chtype</STRONG>  for  <EM>characters</EM> and <EM>colors</EM>, and took into account the different
+       Different  Unix  systems  used  different  sizes  for the bit-fields in
+       <STRONG>chtype</STRONG> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
        integer sizes (32-bit versus 64-bit).
 
-       This table showing the number of bits for <STRONG>A_COLOR</STRONG>  and  <STRONG>A_CHARTEXT</STRONG>  was
-       gleaned  from the curses header files for various operating systems and
-       architectures.  The inferred architecture and notes reflect the  format
-       and  size  of  the  defined  constants  as  well  as  clues such as the
-       alternate character set implementation.  A 32-bit library can  be  used
+       This  table  showing  the number of bits for <STRONG>A_COLOR</STRONG> and <STRONG>A_CHARTEXT</STRONG> was
+       gleaned from the curses header files for various operating systems  and
+       architectures.   The inferred architecture and notes reflect the format
+       and size of the  defined  constants  as  well  as  clues  such  as  the
+       alternate  character  set implementation.  A 32-bit library can be used
        on a 64-bit system, but not necessarily the reverse.
 
               <STRONG>Year</STRONG>   <STRONG>System</STRONG>        <STRONG>Arch</STRONG>    <STRONG>Color</STRONG>   <STRONG>Char</STRONG>   <STRONG>Notes</STRONG>
@@ -456,15 +454,15 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
           Regarding HP-UX,
 
-          <STRONG>o</STRONG>   HP-UX  10.20  (1996) added support for 64-bit PA-RISC processors
+          <STRONG>o</STRONG>   HP-UX 10.20 (1996) added support for 64-bit  PA-RISC  processors
               in 1996.
 
-          <STRONG>o</STRONG>   HP-UX 10.30 (1997) marked "curses_colr" obsolete.  That  version
+          <STRONG>o</STRONG>   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
               of curses was dropped with HP-UX 11.30 in 2006.
 
           Regarding OSF/1 (and Tru64),
 
-          <STRONG>o</STRONG>   These  used  64-bit  hardware.   Like  ncurses, the OSF/1 curses
+          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
               interface is not customized for 32-bit and 64-bit versions.
 
           <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
@@ -478,30 +476,30 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
               Sun's copyright began in 1996.
 
           <STRONG>o</STRONG>   Sun updated the X/Open curses interface after 64-bit support was
-              introduced   in  1997,  but  did  not  modify  the  SVr4  curses
+              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
               interface.
 
           Regarding U/Win,
 
-          <STRONG>o</STRONG>   Development of the curses library  began  in  1991,  stopped  in
+          <STRONG>o</STRONG>   Development  of  the  curses  library  began in 1991, stopped in
               2000.
 
           <STRONG>o</STRONG>   Color support was added in 1998.
 
           <STRONG>o</STRONG>   The library uses only <STRONG>chtype</STRONG> (no <STRONG>cchar_t</STRONG>).
 
-       Once  X/Open  curses  was adopted in the mid-1990s, the constraint of a
+       Once X/Open curses was adopted in the mid-1990s, the  constraint  of  a
        32-bit interface with many colors and wide-characters for <STRONG>chtype</STRONG> became
-       a  moot  point.   The <STRONG>cchar_t</STRONG> structure (whose size and members are not
+       a moot point.  The <STRONG>cchar_t</STRONG> structure (whose size and  members  are  not
        specified in X/Open Curses) could be extended as needed.
 
        Other interfaces are rarely used now:
 
-       <STRONG>o</STRONG>   BSD curses was improved slightly in 1993/1994 using Keith  Bostic's
-           modification  to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He moved
+       <STRONG>o</STRONG>   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
+           modification to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He  moved
            <EM>standout</EM> attribute to a structure member.
 
-           The resulting 4.4BSD curses was replaced by ncurses over  the  next
+           The  resulting  4.4BSD curses was replaced by ncurses over the next
            ten years.
 
        <STRONG>o</STRONG>   U/Win is rarely used now.
@@ -513,7 +511,7 @@ <H1 class="no-header">curs_attr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 99fa807cf..9632a9e1f 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.49 2023/11/25 14:01:49 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.51 2023/12/02 21:02:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -101,11 +101,11 @@ <H1 class="no-header">curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        way the rendition of characters on the screen is updated when  <STRONG>bkgd</STRONG>  or
        <STRONG>wbkgd</STRONG> is used to change the background character.
 
-       This  implementation,  like  SVr4 curses, does not store the background
-       and window attribute contributions to each cell separately.  It updates
-       the  rendition  by  comparing  the  character, non-color attributes and
-       colors contained in the background.   For  each  cell  in  the  window,
-       whether or not it is blank:
+       <EM>ncurses</EM>,  like  SVr4  <EM>curses</EM>,  does not store the background and window
+       attribute contributions  to  each  cell  separately.   It  updates  the
+       rendition  by  comparing the character, non-color attributes and colors
+       contained in the background.  For each cell in the window,  whether  or
+       not it is blank:
 
        <STRONG>o</STRONG>   The  library  first  compares  the <EM>character</EM>, and if it matches the
            current character part of the background, it replaces that with the
@@ -146,31 +146,32 @@ <H1 class="no-header">curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.   It
-       specifies  that  <STRONG>bkgd</STRONG>  and  <STRONG>wbkgd</STRONG>  return  <STRONG>ERR</STRONG> on failure, but gives no
-       failure conditions.
-
-       The routines <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> return the integer <STRONG>OK</STRONG>, unless  the  library
-       has not been initialized.
+       Functions returning an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns  <STRONG>ERR</STRONG>  if
+       the  library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> if
+       the <EM>WINDOW</EM> pointer argument is null.
 
-       In  contrast, the SVr4.0 manual says <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return <STRONG>OK</STRONG> "or a
-       non-negative integer if <STRONG>immedok</STRONG> is set", which  refers  to  the  return
-       value  from <STRONG>wrefresh</STRONG> (used to implement the immediate repainting).  The
-       SVr4 curses <STRONG>wrefresh</STRONG> returns the number of characters  written  to  the
-       screen during the refresh.  This implementation does not do that.
+       In contrast, the SVr4.0 manual says <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return <STRONG>OK</STRONG> "or  a
+       non-negative  integer  if  <STRONG>immedok</STRONG>  is set", which refers to the return
+       value from <STRONG>wrefresh</STRONG> (used to implement the immediate repainting).  SVr4
+       <EM>curses</EM>  <STRONG>wrefresh</STRONG> returns the number of characters written to the screen
+       during the refresh.  <EM>ncurses</EM> does not do that.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       Unusually, there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one  would
+       expect <STRONG>wgetbkgd</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
+
        Note that <STRONG>bkgdset</STRONG> and <STRONG>bkgd</STRONG> may be macros.
 
        X/Open  Curses  mentions that the character part of the background must
-       be a single-byte value.  This  implementation,  like  SVr4,  checks  to
-       ensure  that,  and will reuse the old background character if the check
-       fails.
+       be a single-byte value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>,  checks  to  ensure
+       that, and will reuse the old background character if the check fails.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These  functions are described in the XSI Curses standard, Issue 4.  It
+       specifies that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> return  <STRONG>ERR</STRONG>  on  failure,  but  gives  no
+       failure conditions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -178,7 +179,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index f5ffa7441..60ea015b8 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.32 2023/11/25 14:01:49 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.34 2023/12/02 21:30:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -99,28 +99,27 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-getbkgrnd">getbkgrnd</a></H3><PRE>
-       The <STRONG>getbkgrnd</STRONG> function returns the given  window's  current  background
-       character/attribute  pair  via  the  <EM>wch</EM>  pointer.  If the given window
-       pointer is null,  the  character  is  not  updated  (but  no  error  is
-       returned).
+       The <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the  given  or  specified
+       window's  current  background character and attribute pair and store it
+       via the <EM>wch</EM> pointer.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        The <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> routines do not return a value.
 
-       Upon  successful completion, the other functions return <STRONG>OK</STRONG>.  Otherwise,
+       Upon successful completion, the other functions return <STRONG>OK</STRONG>.   Otherwise,
        they return <STRONG>ERR</STRONG>:
 
-       <STRONG>o</STRONG>   A null window pointer is treated as an error.
+       <STRONG>o</STRONG>   A null <EM>WINDOW</EM> pointer is treated as an error.
 
-       <STRONG>o</STRONG>   A null character pointer is treated as an error.
+       <STRONG>o</STRONG>   A null <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> pointer is treated as an error.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be available as macros.
 
        X/Open Curses does not provide details on how the rendition is changed.
-       This  implementation follows the approach used in SVr4 curses, which is
+       This implementation follows the approach used in SVr4 curses, which  is
        explained in the manual page for <STRONG>wbkgd</STRONG>.
 
 
@@ -133,7 +132,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 0d7d55882..2d1fc6562 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.54 2023/11/11 23:20:20 tom Exp @
+  * @Id: curs_initscr.3x,v 1.56 2023/12/03 00:09:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -233,11 +233,11 @@ <H1 class="no-header">curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Unset-TERM-Variable">Unset TERM Variable</a></H3><PRE>
-       If the TERM variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
+       If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
        "unknown",  which  normally  corresponds  to  a terminal entry with the
        <EM>generic</EM> (<EM>gn</EM>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
        and  cannot  be  used for full-screen operation.  Other implementations
-       may handle a missing/empty TERM variable differently.
+       may handle a missing/empty <EM>TERM</EM> variable differently.
 
 
 </PRE><H3><a name="h3-Signal-Handlers">Signal Handlers</a></H3><PRE>
@@ -300,7 +300,7 @@ <H1 class="no-header">curs_initscr 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 4247cafa3..d89e02358 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.38 2023/10/28 14:49:04 tom Exp @
+  * @Id: curs_opaque.3x,v 1.40 2023/12/02 20:52:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</H1>
        <STRONG>is_notimeout</STRONG>
               returns the value set by <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.
 
-       <STRONG>is_pad</STRONG> returns <STRONG>TRUE</STRONG> if the window is a pad;  that  is,  it  created  by
+       <STRONG>is_pad</STRONG> returns <STRONG>TRUE</STRONG> if the window is a pad; that is, it was created  by
               <STRONG><A HREF="newpad.3x.html">newpad(3x)</A></STRONG>.
 
        <STRONG>is_scrollok</STRONG>
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_opaque 3x 2023-10-28 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-28                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 618d50baa..ef3f0cd8d 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.72 2023/11/25 14:32:36 tom Exp @
+  * @Id: curs_termcap.3x,v 1.74 2023/12/02 20:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -185,7 +185,7 @@ <H1 class="no-header">curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        to  free  this  memory,  but  there  is an additional complication with
        ncurses.  It uses a fixed-size  <EM>pool</EM>  of  storage  locations,  one  per
-       setting  of  the  <STRONG>TERM</STRONG>  variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
+       setting  of  the  <EM>TERM</EM>  variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
        program relies upon this arrangement, to improve its performance.
 
        An application which uses only the low-level  termcap  functions  could
@@ -357,7 +357,7 @@ <H1 class="no-header">curs_termcap 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 39f5fa064..5b6c90aec 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.119 2023/11/25 14:32:36 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.122 2023/12/03 00:10:20 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -46,12 +46,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -143,7 +143,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
            specified in <STRONG>terminfo</STRONG> are used.
 
-       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> exist,
+       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <EM>LINES</EM> and <EM>COLUMNS</EM> exist,
            their values are used.  If these environment variables do not exist
            and  the program is running in a window, the current window size is
            used.  Otherwise, if the environment variables do  not  exist,  the
@@ -174,7 +174,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        structures used by <STRONG>curses</STRONG>.  These are its parameters:
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
-               environment variable <STRONG>TERM</STRONG> is used.
+               environment variable <EM>TERM</EM> is used.
 
           <EM>filedes</EM>
                is the file descriptor used for getting  and  setting  terminal
@@ -572,7 +572,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE>
        If configured to use the terminal-driver, e.g., for the MinGW port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty TERM variable as  the  special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
            value "unknown".
 
            SVr4 curses uses the special value "dumb".
@@ -582,7 +582,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            generic terminal is unsuitable for full-screen applications.
 
        <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
-           checking if $TERM is set to "#win32con" or an abbreviation of  that
+           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
            string.
 
 
@@ -702,7 +702,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 6d04cda35..a09055b37 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.88 2023/10/14 22:26:23 tom Exp @
+  * @Id: curs_util.3x,v 1.90 2023/12/02 21:10:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -164,12 +164,12 @@ <H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
            successful, it overrides the values from the terminal database.
 
        <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <STRONG>ncurses</STRONG>
-           examines  the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables, using a value
+           examines  the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables, using a value
            in those to override the  results  from  the  operating  system  or
            terminal database.
 
            <STRONG>Ncurses</STRONG>  also  updates  the  screen  size  in response to <STRONG>SIGWINCH</STRONG>,
-           unless overridden by the <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> environment variables,
+           unless overridden by the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables,
 
 
 </PRE><H3><a name="h3-use_tioctl">use_tioctl</a></H3><PRE>
@@ -178,7 +178,7 @@ <H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        <STRONG>use_tioctl</STRONG> is called with <STRONG>TRUE</STRONG> as an  argument,  <STRONG>ncurses</STRONG>  modifies  the
        last step in its computation of screen size as follows:
 
-       <STRONG>o</STRONG>   checks  if the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment variables are set to a
+       <STRONG>o</STRONG>   checks  if the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables are set to a
            number greater than zero.
 
        <STRONG>o</STRONG>   for each, <STRONG>ncurses</STRONG> updates the  corresponding  environment  variable
@@ -194,11 +194,11 @@ <H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
               -----------------------------------------------------------------
               <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        This  is  the  default behavior.  <EM>ncurses</EM>
                                      uses  operating   system   calls   unless
-                                     overridden    by    <STRONG>LINES</STRONG>    or   <STRONG>COLUMNS</STRONG>
+                                     overridden    by    <EM>LINES</EM>    or   <EM>COLUMNS</EM>
                                      environment variables; default.
-              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM> updates <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  based
+              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM> updates <EM>LINES</EM> and  <EM>COLUMNS</EM>  based
                                      on operating system calls.
-              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  ignores <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG>, using
+              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  ignores <EM>LINES</EM> and <EM>COLUMNS</EM>, using
                                      operating system calls to obtain size.
 
 
@@ -391,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 6b1016e75..0939532f9 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.99 2023/11/25 17:10:25 tom Exp @
+  * @Id: infocmp.1m,v 1.101 2023/12/02 20:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
             with "OT").
 
             If  no  <EM>terminal-types</EM>  are  given,  <STRONG>infocmp</STRONG>  uses the environment
-            variable <STRONG>TERM</STRONG> for each of the <EM>terminal-types</EM>.
+            variable <EM>TERM</EM> for each of the <EM>terminal-types</EM>.
 
 
 </PRE><H3><a name="h3-Source-Listing-Options-_-I_-_-L_-_-C_-_-r_">Source Listing Options [-I] [-L] [-C] [-r]</a></H3><PRE>
@@ -125,7 +125,7 @@ <H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
             <STRONG>-r</STRONG>   when using <STRONG>-C</STRONG>, put out all capabilities in <STRONG>termcap</STRONG> form
             <STRONG>-K</STRONG>   modifies the <STRONG>-C</STRONG> option, improving BSD-compatibility.
 
-       If  no  <EM>terminal-types</EM> are given, the environment variable <STRONG>TERM</STRONG> will be
+       If  no  <EM>terminal-types</EM> are given, the environment variable <EM>TERM</EM> will be
        used for the terminal name.
 
        The source produced by the <STRONG>-C</STRONG> option may be used directly as a  <STRONG>termcap</STRONG>
@@ -219,8 +219,8 @@ <H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
    <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <EM>directory</EM>] [-B <EM>directory</EM>]
        Like  other  <STRONG>ncurses</STRONG>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
-       descriptions   in  several  places.   You  can  use  the  <STRONG>TERMINFO</STRONG>  and
-       <STRONG>TERMINFO_DIRS</STRONG> environment variables to override the compiled-in default
+       descriptions   in  several  places.   You  can  use  the  <EM>TERMINFO</EM>  and
+       <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variables to override the compiled-in default
        list  of  places  to  search.   See <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, as well as the <EM>Fetching</EM>
        <EM>Compiled</EM> <EM>Descriptions</EM> section in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
@@ -368,7 +368,7 @@ <H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
                3  hexadecimal and base64
 
             For example, this prints the compiled terminfo value as  a  string
-            which could be assigned to the <STRONG>TERMINFO</STRONG> environment variable:
+            which could be assigned to the <EM>TERMINFO</EM> environment variable:
 
                 infocmp -0 -q -Q2
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-12-02                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 7f7059d4f..0d05e802d 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.181 2023/11/25 14:32:36 tom Exp @
+  * @Id: ncurses.3x,v 1.185 2023/12/03 00:14:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        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 <STRONG>ncurses</STRONG> version 6.4 (patch 20231125).
+       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231202).
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -137,7 +137,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        Before a <STRONG>curses</STRONG> program is run, the tab stops of the terminal should be
        set  and  its initialization strings, if defined, must be output.  This
        can be done  by  executing  the  <STRONG>tput</STRONG>  <STRONG>init</STRONG>  command  after  the  shell
-       environment  variable  <STRONG>TERM</STRONG>  has been exported.  (The BSD-style <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+       environment  variable  <EM>TERM</EM>  has been exported.  (The BSD-style <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
        utility  also  performs  this  function.)   See  subsection  "Tabs  and
        Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
@@ -184,22 +184,22 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Environment-variables">Environment variables</a></H3><PRE>
-       If the environment variables <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  are  set,  or  if  the
+       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
        program   is  executing  in  a  window  environment,  line  and  column
        information in  the  environment  will  override  information  read  by
        <EM>terminfo</EM>.   This  would  affect a program running in an AT&amp;T 630 layer,
        for  example,  where  the  size  of  a  screen   is   changeable   (see
        <STRONG>ENVIRONMENT</STRONG>).
 
-       If  the  environment  variable  <STRONG>TERMINFO</STRONG>  is defined, any program using
+       If  the  environment  variable  <EM>TERMINFO</EM>  is defined, any program using
        <STRONG>curses</STRONG> checks for a local terminal definition before  checking  in  the
-       standard  place.   For  example,  if  <STRONG>TERM</STRONG>  is set to <STRONG>att4424</STRONG>, then the
+       standard  place.   For  example,  if  <EM>TERM</EM>  is set to <STRONG>att4424</STRONG>, then the
        compiled terminal definition is found in
 
            <STRONG>/usr/share/terminfo/a/att4424</STRONG>.
 
        (The <STRONG>a</STRONG> is copied from the first letter of <STRONG>att4424</STRONG> to avoid creation  of
-       huge  directories.)   However,  if  <STRONG>TERMINFO</STRONG>  is  set to <STRONG>$HOME/myterms</STRONG>,
+       huge  directories.)   However,  if  <EM>TERMINFO</EM>  is  set to <STRONG>$HOME/myterms</STRONG>,
        <STRONG>curses</STRONG> first checks
 
            <STRONG>$HOME/myterms/a/att4424</STRONG>,
@@ -804,7 +804,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        been already discussed in detail.
 
 
-</PRE><H3><a name="h3-CC-command-character">CC command-character</a></H3><PRE>
+</PRE><H3><a name="h3-CC-command-character"><EM>CC</EM> command-character</a></H3><PRE>
        When  set, change occurrences of the command_character (i.e., the <STRONG>cmdch</STRONG>
        capability) of the  loaded  terminfo  entries  to  the  value  of  this
        variable.  Very few terminfo entries provide this feature.
@@ -814,7 +814,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        single character.
 
 
-</PRE><H3><a name="h3-BAUDRATE">BAUDRATE</a></H3><PRE>
+</PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
        The  debugging  library  checks  this  environment  variable  when  the
        application has redirected output to a file.   The  variable's  numeric
        value  is  used  for  the baudrate.  If no value is found, <STRONG>ncurses</STRONG> uses
@@ -822,10 +822,10 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        into account costs that depend on baudrate.
 
 
-</PRE><H3><a name="h3-COLUMNS">COLUMNS</a></H3><PRE>
+</PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        Specify the width of the screen in characters.  Applications running in
        a windowing environment usually are able to obtain  the  width  of  the
-       window  in  which they are executing.  If neither the <STRONG>COLUMNS</STRONG> value nor
+       window  in  which they are executing.  If neither the <EM>COLUMNS</EM> value nor
        the terminal's screen size is available, <STRONG>ncurses</STRONG> uses  the  size  which
        may be specified in the terminfo database (i.e., the <STRONG>cols</STRONG> capability).
 
@@ -833,10 +833,10 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        screen.  This is not always possible because your  application  may  be
        running  on a host which does not honor NAWS (Negotiations About Window
        Size),  or  because  you  are  temporarily  running  as  another  user.
-       However,  setting  <STRONG>COLUMNS</STRONG>  and/or <STRONG>LINES</STRONG> overrides the library's use of
+       However,  setting  <EM>COLUMNS</EM>  and/or <EM>LINES</EM> overrides the library's use of
        the screen size obtained from the operating system.
 
-       Either <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> symbols may be specified  independently.   This
+       Either <EM>COLUMNS</EM> or <EM>LINES</EM> symbols may be specified  independently.   This
        is   mainly   useful  to  circumvent  legacy  misfeatures  of  terminal
        descriptions, e.g., xterm which commonly specifies a  65  line  screen.
        For  best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a terminal
@@ -844,11 +844,11 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        Use the <STRONG>use_env</STRONG> function to disable all  use  of  external  environment
        (but not including system calls) to determine the screen size.  Use the
-       <STRONG>use_tioctl</STRONG> function to update <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> to match the screen size
+       <STRONG>use_tioctl</STRONG> function to update <EM>COLUMNS</EM> or <EM>LINES</EM> to match the screen size
        obtained from system calls or the terminal database.
 
 
-</PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
+</PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
        Specifies the total time, in milliseconds, for which ncurses will await
        a character sequence, e.g., a function key.  The  default  value,  1000
        milliseconds,  is enough for most uses.  However, it is made a variable
@@ -868,12 +868,12 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        In addition to the environment variable, this implementation provides a
        global  variable  with the same name.  Portable applications should not
-       rely upon the presence of ESCDELAY in  either  form,  but  setting  the
+       rely upon the presence of <STRONG>ESCDELAY</STRONG> in  either  form,  but  setting  the
        environment  variable  rather  than the global variable does not create
        problems when compiling an application.
 
 
-</PRE><H3><a name="h3-HOME">HOME</a></H3><PRE>
+</PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
        Tells <STRONG>ncurses</STRONG> where your home directory is.  That is where it may  read
        and write auxiliary terminal descriptions:
 
@@ -881,12 +881,12 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            $HOME/.terminfo
 
 
-</PRE><H3><a name="h3-LINES">LINES</a></H3><PRE>
-       Like  COLUMNS,  specify  the  height  of the screen in characters.  See
-       COLUMNS for a detailed description.
+</PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
+       Like  <EM>COLUMNS</EM>,  specify  the  height  of the screen in characters.  See
+       <EM>COLUMNS</EM> for a detailed description.
 
 
-</PRE><H3><a name="h3-MOUSE_BUTTONS_123">MOUSE_BUTTONS_123</a></H3><PRE>
+</PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
        This applies only to the OS/2 EMX port.   It  specifies  the  order  of
        buttons  on  the  mouse.   OS/2 numbers a 3-button mouse inconsistently
        from other platforms:
@@ -900,7 +900,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        specified, <STRONG>ncurses</STRONG> uses 132.
 
 
-</PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS">NCURSES_ASSUMED_COLORS</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
        Override the compiled-in assumption that the terminal's default  colors
        are   white-on-black   (see   <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You  may  set  the
        foreground and background color values with this  environment  variable
@@ -910,7 +910,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        value from zero to the terminfo <STRONG>max_colors</STRONG> value is allowed.
 
 
-</PRE><H3><a name="h3-NCURSES_CONSOLE2">NCURSES_CONSOLE2</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
        This applies only to the MinGW port of ncurses.
 
        The <STRONG>Console2</STRONG> program's handling  of  the  Microsoft  Console  API  call
@@ -921,33 +921,33 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        effect.
 
 
-</PRE><H3><a name="h3-NCURSES_GPM_TERMS">NCURSES_GPM_TERMS</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
        This applies only to ncurses configured to use the GPM interface.
 
        If  present, the environment variable is a list of one or more terminal
-       names against which the <STRONG>TERM</STRONG> environment variable is matched.   Setting
+       names against which the <EM>TERM</EM> environment variable is matched.   Setting
        it  to  an  empty  value disables the GPM interface; using the built-in
        support for xterm, etc.
 
        If the environment variable is absent, ncurses will attempt to open GPM
-       if <STRONG>TERM</STRONG> contains "linux".
+       if <EM>TERM</EM> contains "linux".
 
 
-</PRE><H3><a name="h3-NCURSES_NO_HARD_TABS">NCURSES_NO_HARD_TABS</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
        <STRONG>Ncurses</STRONG>  may  use tabs as part of the cursor movement optimization.  In
        some cases, your terminal driver may not handle  these  properly.   Set
        this  environment variable to disable the feature.  You can also adjust
        your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
-</PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE">NCURSES_NO_MAGIC_COOKIE</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
        Some terminals  use  a  magic-cookie  feature  which  requires  special
        handling  to  make  highlighting  and  other  video  attributes display
        properly.   You  can  suppress  the  highlighting  entirely  for  these
        terminals by setting this environment variable.
 
 
-</PRE><H3><a name="h3-NCURSES_NO_PADDING">NCURSES_NO_PADDING</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  of the terminal descriptions in the terminfo database are written
        for real "hardware" terminals.   Many  people  use  terminal  emulators
        which run in a windowing environment and use curses-based applications.
@@ -965,12 +965,12 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        delay  times embedded.  You may wish to use these descriptions, but not
        want to pay the performance penalty.
 
-       Set the NCURSES_NO_PADDING environment  variable  to  disable  all  but
+       Set the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> environment  variable  to  disable  all  but
        mandatory  padding.   Mandatory  padding  is  used as a part of special
        control sequences such as <STRONG>flash</STRONG>.
 
 
-</PRE><H3><a name="h3-NCURSES_NO_SETBUF">NCURSES_NO_SETBUF</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
        This setting is obsolete.  Before changes
 
           <STRONG>o</STRONG>   started with 5.9 patch 20120825 and
@@ -980,7 +980,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>ncurses</STRONG> enabled buffered output during terminal  initialization.   This
        was  done  (as  in  SVr4  curses) for performance reasons.  For testing
        purposes, both of <STRONG>ncurses</STRONG> and certain applications,  this  feature  was
-       made  optional.  Setting the NCURSES_NO_SETBUF variable disabled output
+       made  optional.  Setting the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>SETBUF</EM> variable disabled output
        buffering, leaving the output in the original (usually  line  buffered)
        mode.
 
@@ -997,13 +997,13 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        still use the standard output.  But high-level curses calls do not.
 
 
-</PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS">NCURSES_NO_UTF8_ACS</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
        During  initialization,  the  <STRONG>ncurses</STRONG>  library checks for special cases
        where VT100 line-drawing (and the corresponding alternate character set
        capabilities)  described  in  the  terminfo  are  known  to be missing.
        Specifically, when  running  in  a  UTF-8  locale,  the  Linux  console
        emulator  and  the GNU screen program ignore these.  Ncurses checks the
-       <STRONG>TERM</STRONG> environment variable for these.   For  other  special  cases,  you
+       <EM>TERM</EM> environment variable for these.   For  other  special  cases,  you
        should  set this environment variable.  Doing this tells ncurses to use
        Unicode values which correspond to the VT100 line-drawing glyphs.  That
        works  for  the special cases cited, and is likely to work for terminal
@@ -1030,9 +1030,9 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        by applications that use ncurses' termcap interface.
 
 
-</PRE><H3><a name="h3-NCURSES_TRACE">NCURSES_TRACE</a></H3><PRE>
+</PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
        During   initialization,  the  <STRONG>ncurses</STRONG>  debugging  library  checks  the
-       NCURSES_TRACE environment variable.  If it is  defined,  to  a  numeric
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable.  If it is  defined,  to  a  numeric
        value,  <STRONG>ncurses</STRONG>  calls  the  <STRONG>trace</STRONG>  function,  using  that value as the
        argument.
 
@@ -1043,39 +1043,39 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        See <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> for more information.
 
 
-</PRE><H3><a name="h3-TERM">TERM</a></H3><PRE>
+</PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
        Denotes your terminal type.  Each terminal  type  is  distinct,  though
        many are similar.
 
-       <STRONG>TERM</STRONG>  is commonly set by terminal emulators to help applications find a
+       <EM>TERM</EM>  is commonly set by terminal emulators to help applications find a
        workable  terminal  description.   Some  of  those  choose  a   popular
        approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
        Not  infrequently,  your  application  will  have  problems  with  that
        approach, e.g., incorrect function-key definitions.
 
-       If  you set <STRONG>TERM</STRONG> in your environment, it has no effect on the operation
+       If  you set <EM>TERM</EM> in your environment, it has no effect on the operation
        of the terminal emulator.  It only affects the  way  applications  work
        within  the  terminal.   Likewise,  as a general rule (<STRONG>xterm(1)</STRONG> being a
-       rare exception), terminal emulators which allow you to specify <STRONG>TERM</STRONG>  as
+       rare exception), terminal emulators which allow you to specify <EM>TERM</EM>  as
        a  parameter  or  configuration  value  do not change their behavior to
        match that setting.
 
 
-</PRE><H3><a name="h3-TERMCAP">TERMCAP</a></H3><PRE>
+</PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If the <STRONG>ncurses</STRONG>  library  has  been  configured  with  <EM>termcap</EM>  support,
        <STRONG>ncurses</STRONG>  will  check for a terminal's description in termcap form if it
        is not available in the terminfo database.
 
-       The <STRONG>TERMCAP</STRONG> environment variable contains either a terminal description
+       The <EM>TERMCAP</EM> environment variable contains either a terminal description
        (with  newlines  stripped  out),  or  a  file  name  telling  where the
-       information denoted by the <STRONG>TERM</STRONG> environment variable exists.  In either
+       information denoted by the <EM>TERM</EM> environment variable exists.  In either
        case,  setting  it  directs  <STRONG>ncurses</STRONG> to ignore the usual place for this
        information, e.g., /etc/termcap.
 
 
-</PRE><H3><a name="h3-TERMINFO">TERMINFO</a></H3><PRE>
+</PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
        <STRONG>ncurses</STRONG> can be configured to read  from  multiple  terminal  databases.
-       The  <STRONG>TERMINFO</STRONG>  variable overrides the location for the default terminal
+       The  <EM>TERMINFO</EM>  variable overrides the location for the default terminal
        database.  Terminal descriptions (in terminal  format)  are  stored  in
        terminal databases:
 
@@ -1083,7 +1083,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            named by the first letter of the terminal names therein.
 
            This is the scheme used in System V, which legacy Unix systems use,
-           and  the  <STRONG>TERMINFO</STRONG> variable is used by <EM>curses</EM> applications on those
+           and  the  <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications on those
            systems to override the default location of the terminal database.
 
        <STRONG>o</STRONG>   If <STRONG>ncurses</STRONG> is built to use hashed databases,  then  each  entry  in
@@ -1104,7 +1104,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            directly,  then  an entry in this list may be the path of a termcap
            file.
 
-       <STRONG>o</STRONG>   If the <STRONG>TERMINFO</STRONG> variable begins with "hex:" or "b64:", <STRONG>ncurses</STRONG> uses
+       <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <STRONG>ncurses</STRONG> uses
            the  remainder of that variable as a compiled terminal description.
            You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
 
@@ -1112,46 +1112,46 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
                export TERMINFO
 
            The compiled description is used if it corresponds to the  terminal
-           identified by the <STRONG>TERM</STRONG> variable.
+           identified by the <EM>TERM</EM> variable.
 
-       Setting  <STRONG>TERMINFO</STRONG> is the simplest, but not the only way to set location
+       Setting  <EM>TERMINFO</EM> is the simplest, but not the only way to set location
        of the default  terminal  database.   The  complete  list  of  database
        locations in order follows:
 
           <STRONG>o</STRONG>   the  last  terminal  database to which <STRONG>ncurses</STRONG> wrote, if any, is
               searched first
 
-          <STRONG>o</STRONG>   the location specified by the TERMINFO environment variable
+          <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
 
           <STRONG>o</STRONG>   $HOME/.terminfo
 
-          <STRONG>o</STRONG>   locations listed in the TERMINFO_DIRS environment variable
+          <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
 
           <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
               into the ncurses library, i.e.,
 
-             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  TERMINFO_DIRS
+             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
                  variable)
 
-             <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the TERMINFO variable)
+             <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the <EM>TERMINFO</EM> variable)
 
 
-</PRE><H3><a name="h3-TERMINFO_DIRS">TERMINFO_DIRS</a></H3><PRE>
+</PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
        Specifies a list of locations  to  search  for  terminal  descriptions.
        Each  location  in  the list is a terminal database as described in the
-       section on the <STRONG>TERMINFO</STRONG> variable.  The  list  is  separated  by  colons
+       section on the <EM>TERMINFO</EM> variable.  The  list  is  separated  by  colons
        (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
        There  is  no  corresponding  feature  in  System  V terminfo; it is an
        extension developed for <STRONG>ncurses</STRONG>.
 
 
-</PRE><H3><a name="h3-TERMPATH">TERMPATH</a></H3><PRE>
-       If <STRONG>TERMCAP</STRONG> does not hold a file name then <STRONG>ncurses</STRONG> checks  the  <STRONG>TERMPATH</STRONG>
+</PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
+       If <EM>TERMCAP</EM> does not hold a file name then <STRONG>ncurses</STRONG> checks  the  <EM>TERMPATH</EM>
        environment  variable.  This is a list of filenames separated by spaces
        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       If the <STRONG>TERMPATH</STRONG> environment variable is not set, <STRONG>ncurses</STRONG> looks  in  the
+       If the <EM>TERMPATH</EM> environment variable is not set, <STRONG>ncurses</STRONG> looks  in  the
        files
 
            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
@@ -1284,10 +1284,10 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
        <EM>/usr/share/tabset</EM>
-            tab stop initialization database
+              tab stop initialization database
 
        <EM>/usr/share/terminfo</EM>
-            compiled terminal capability database
+              compiled terminal capability database
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -1302,7 +1302,7 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        The  <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
        falls back to the old-style /etc/termcap file  if  the  terminal  setup
-       code  cannot  find a terminfo entry corresponding to <STRONG>TERM</STRONG>.  Use of this
+       code  cannot  find a terminfo entry corresponding to <EM>TERM</EM>.  Use of this
        feature is not  recommended,  as  it  essentially  includes  an  entire
        termcap  compiler  in  the <STRONG>ncurses</STRONG> startup code, at significant cost in
        core and startup cycles.
@@ -1498,14 +1498,11 @@ <H1 class="no-header">ncurses 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  and  related  pages whose names begin "curs_" for detailed
-       routine descriptions.
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
-       <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for user-defined capabilities
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index 908e57b17..749c3f215 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.17 2023/10/01 09:59:29 tom Exp @
+  * @Id: MKncu_config.in,v 1.19 2023/12/02 21:37:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</TITLE>
+<TITLE>ncursesw6-config 1 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncursesw6-config 1 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -64,55 +64,45 @@ <H1 class="no-header">ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</H
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
-       <STRONG>--prefix</STRONG>
-              reports the package prefix of <EM>ncurses</EM>.
+       <STRONG>--prefix</STRONG>          reports the package prefix of <EM>ncurses</EM>.
 
-       <STRONG>--exec-prefix</STRONG>
-              reports the executable prefix of <EM>ncurses</EM>.
+       <STRONG>--exec-prefix</STRONG>     reports the executable prefix of <EM>ncurses</EM>.
 
-       <STRONG>--cflags</STRONG>
-              reports the C compiler flags needed to compile with <EM>ncurses</EM>.
+       <STRONG>--cflags</STRONG>          reports the C compiler flags needed to  compile  with
+                         <EM>ncurses</EM>.
 
-       <STRONG>--libs</STRONG> reports the libraries needed to link with <EM>ncurses</EM>.
+       <STRONG>--libs</STRONG>            reports the libraries needed to link with <EM>ncurses</EM>.
 
-       <STRONG>--version</STRONG>
-              reports the release and patch date information  of  <EM>ncurses</EM>  and
-              exits successfully.
+       <STRONG>--version</STRONG>         reports  the  release  and  patch date information of
+                         <EM>ncurses</EM> and exits successfully.
 
-       <STRONG>--abi-version</STRONG>
-              reports the ABI version of <EM>ncurses</EM>.
+       <STRONG>--abi-version</STRONG>     reports the ABI version of <EM>ncurses</EM>.
 
-       <STRONG>--mouse-version</STRONG>
-              reports the mouse-interface version of <EM>ncurses</EM>.
+       <STRONG>--mouse-version</STRONG>   reports the mouse-interface version of <EM>ncurses</EM>.
 
-       <STRONG>--bindir</STRONG>
-              reports the directory containing <EM>ncurses</EM> programs.
+       <STRONG>--bindir</STRONG>          reports the directory containing <EM>ncurses</EM> programs.
 
-       <STRONG>--datadir</STRONG>
-              reports the directory containing <EM>ncurses</EM> data.
+       <STRONG>--datadir</STRONG>         reports the directory containing <EM>ncurses</EM> data.
 
-       <STRONG>--includedir</STRONG>
-              reports the directory containing <EM>ncurses</EM> header files.
+       <STRONG>--includedir</STRONG>      reports  the  directory  containing  <EM>ncurses</EM>   header
+                         files.
 
-       <STRONG>--libdir</STRONG>
-              reports the directory containing <EM>ncurses</EM> libraries.
+       <STRONG>--libdir</STRONG>          reports the directory containing <EM>ncurses</EM> libraries.
 
-       <STRONG>--mandir</STRONG>
-              reports the directory containing <EM>ncurses</EM> man pages.
+       <STRONG>--mandir</STRONG>          reports the directory containing <EM>ncurses</EM> man pages.
 
-       <STRONG>--terminfo</STRONG>
-              reports   the  <STRONG>TERMINFO</STRONG>  <EM>terminfo</EM>  database  path,  for  example
-              <EM>/usr/share/terminfo</EM>.
+       <STRONG>--terminfo</STRONG>        reports  the  <EM>TERMINFO</EM>  <EM>terminfo</EM>  database  path, for
+                         example <EM>/usr/share/terminfo</EM>.
 
-       <STRONG>--terminfo-dirs</STRONG>
-              reports the  <STRONG>TERMINFO_DIRS</STRONG>  supplemental  search  path  for  the
-              <EM>terminfo</EM> database, for example <EM>/usr/share/terminfo</EM>.
+       <STRONG>--terminfo-dirs</STRONG>   reports the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  supplemental  search  path
+                         for    the    <EM>terminfo</EM>    database,    for    example
+                         <EM>/usr/share/terminfo</EM>.
 
-       <STRONG>--termpath</STRONG>
-              reports  the  <STRONG>TERMPATH</STRONG>  supplemental search path for the <EM>termcap</EM>
-              database, if support for <EM>termcap</EM> is configured.
+       <STRONG>--termpath</STRONG>        reports the <EM>TERMPATH</EM> supplemental search path for the
+                         <EM>termcap</EM>   database,   if   support   for  <EM>termcap</EM>  is
+                         configured.
 
-       <STRONG>--help</STRONG> issues a usage message and exits successfully.
+       <STRONG>--help</STRONG>            issues a usage message and exits successfully.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -120,7 +110,7 @@ <H1 class="no-header">ncursesw6-config 1 2023-10-01 ncurses 6.4 User commands</H
 
 
 
-ncurses 6.4                       2023-10-01               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2023-12-02               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 69791cf82..6ec8747c8 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.51 2023/11/25 14:26:30 tom Exp @
+  * @Id: resizeterm.3x,v 1.53 2023/12/02 20:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -163,7 +163,7 @@ <H1 class="no-header">resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            unsafe.   This  indirect  method  is  used to provide a safe way to
            resize the <EM>ncurses</EM> data structures.
 
-       If the environment variables <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> are set,  this  overrides
+       If the environment variables <EM>LINES</EM> or <EM>COLUMNS</EM> are set,  this  overrides
        the  library's  use  of  the  window  size  obtained from the operating
        system.  Thus, even if a <STRONG>SIGWINCH</STRONG> is received, no  screen  size  change
        may be recorded.
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-12-02                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 144bd20f8..34b904a13 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.65 2023/11/25 22:58:12 tom Exp @
+  * @Id: term.5,v 1.67 2023/12/02 20:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-11-25 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-12-02 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-11-25 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -81,8 +81,8 @@ <H1 class="no-header">term 5 2023-11-25 ncurses 6.4 File formats</H1>
             entries  into  the  directory  tree.   It  can  write (or rewrite)
             entries in the hashed database.
 
-            <STRONG>ncurses</STRONG>  distinguishes  the  two  cases  in   the   TERMINFO   and
-            TERMINFO_DIRS  environment  variable  by assuming a directory tree
+            <STRONG>ncurses</STRONG>  distinguishes  the  two  cases  in   the   <EM>TERMINFO</EM>   and
+            <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  environment  variable  by assuming a directory tree
             for entries that correspond to an existing directory,  and  hashed
             database otherwise.
 
@@ -400,7 +400,7 @@ <H1 class="no-header">term 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 306a77f3a..616f52646 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.44 2023/11/25 17:20:42 tom Exp @
+  * @Id: term.7,v 1.46 2023/12/02 20:51:25 tom Exp @
   *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-11-25 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2023-12-02 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2023-12-02 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -52,12 +52,12 @@ <H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  environment variable <STRONG>TERM</STRONG> should normally contain the type name of
+       The  environment variable <EM>TERM</EM> should normally contain the type name of
        the terminal, console or  display-device  type  you  are  using.   This
        information  is  critical  for  all screen-oriented programs, including
        your editor and mailer.
 
-       A default <STRONG>TERM</STRONG> value  will  be  set  on  a  per-line  basis  by  either
+       A default <EM>TERM</EM> value  will  be  set  on  a  per-line  basis  by  either
        <STRONG>/etc/inittab</STRONG>  (e.g.,  System-V-like  Unices) or <STRONG>/etc/ttys</STRONG> (BSD Unices).
        This will nearly  always  suffice  for  workstation  and  microcomputer
        consoles.
@@ -68,19 +68,19 @@ <H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
        the prevalence of DEC VT100-compatible terminals and  personal-computer
        emulators.
 
-       Modern  telnets pass your <STRONG>TERM</STRONG> environment variable from the local side
+       Modern  telnets pass your <EM>TERM</EM> environment variable from the local side
        to the remote one.  There can be problems if  the  remote  terminfo  or
        termcap  entry  for  your  type  is not compatible with yours, but this
        situation is rare and  can  almost  always  be  avoided  by  explicitly
        exporting  "vt100"  (assuming  you  are  in fact using a VT100-superset
        console, terminal, or terminal emulator).
 
-       In any case, you are free to override the system <STRONG>TERM</STRONG> setting  to  your
+       In any case, you are free to override the system <EM>TERM</EM> setting  to  your
        taste in your shell profile.  The <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG> utility may be of assistance;
        you can give it a set of rules for deducing or  requesting  a  terminal
        type based on the tty device and baud rate.
 
-       Setting  your  own  <STRONG>TERM</STRONG> value may also be useful if you have created a
+       Setting  your  own  <EM>TERM</EM> value may also be useful if you have created a
        custom entry incorporating options (such as  visual  bell  or  reverse-
        video)  which  you  wish  to  override the system default type for your
        line.
@@ -106,7 +106,7 @@ <H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
        The first line of a <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> description gives the  names  by  which
        terminfo  knows a terminal, separated by "|" (pipe-bar) characters with
        the last name field terminated by a comma.  The first name field is the
-       type's <EM>primary</EM> <EM>name</EM>, and is the one to use when setting <STRONG>TERM</STRONG>.  The last
+       type's <EM>primary</EM> <EM>name</EM>, and is the one to use when setting <EM>TERM</EM>.  The last
        name field (if distinct from the first) is actually  a  description  of
        the  terminal  type  (it  may contain blanks; the others must be single
        words).  Name fields between  the  first  and  last  (if  present)  are
@@ -192,19 +192,19 @@ <H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
 
        Commands which use a terminal type to control display often accept a -T
        option that accepts a terminal name  argument.   Such  programs  should
-       fall  back  on  the  <STRONG>TERM</STRONG>  environment  variable  when  no -T option is
+       fall  back  on  the  <EM>TERM</EM>  environment  variable  when  no -T option is
        specified.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
        <EM>/usr/share/terminfo</EM>
-            compiled terminal description database
+              compiled terminal description database
 
-       /etc/inittab
-            tty line initialization (AT&amp;T-like Unices)
+       <EM>/etc/inittab</EM>
+              tty line initialization (AT&amp;T-like Unices)
 
-       /etc/ttys
-            tty line initialization (BSD-like Unices)
+       <EM>/etc/ttys</EM>
+              tty line initialization (BSD-like Unices)
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -217,7 +217,7 @@ <H1 class="no-header">term 7 2023-11-25 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 6792b9df2..46f2f093d 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.135 2023/11/25 14:32:36 tom Exp @
+  * @Id: terminfo.tail,v 1.137 2023/12/03 00:17:23 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231125).
+       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231202).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1328,13 +1328,13 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   The  environment variable <STRONG>TERMINFO</STRONG> is checked first, for a terminal
            database containing the terminal description.
 
-       <STRONG>o</STRONG>   Next, <STRONG>ncurses</STRONG> looks in <STRONG>$HOME/.terminfo</STRONG> for a compiled description.
+       <STRONG>o</STRONG>   Next, <STRONG>ncurses</STRONG> looks in <EM>$HOME/.terminfo</EM> for a compiled description.
 
            This is an optional feature which may be omitted entirely from  the
            library,  or  limited  to  prevent  accidental  use  by  privileged
            applications.
 
-       <STRONG>o</STRONG>   Next, if the environment variable  <STRONG>TERMINFO_DIRS</STRONG>  is  set,  <STRONG>ncurses</STRONG>
+       <STRONG>o</STRONG>   Next, if the environment variable  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  is  set,  <STRONG>ncurses</STRONG>
            interprets  the  contents  of  that  variable  as  a list of colon-
            separated pathnames of terminal databases to be searched.
 
@@ -1358,8 +1358,8 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        The  preceding addresses the usual configuration of <STRONG>ncurses</STRONG>, which uses
        terminal descriptions prepared in <EM>terminfo</EM> format.   While  <EM>termcap</EM>  is
        less  expressive,  <STRONG>ncurses</STRONG>  can  also  be  configured  to  read <EM>termcap</EM>
-       descriptions.   In  that  configuration,  it  checks  the  <STRONG>TERMCAP</STRONG>  and
-       <STRONG>TERMPATH</STRONG>  variables  (for  content and search path, respectively) after
+       descriptions.   In  that  configuration,  it  checks  the  <EM>TERMCAP</EM>  and
+       <EM>TERMPATH</EM>  variables  (for  content and search path, respectively) after
        the system terminal database.
 
 
@@ -2591,7 +2591,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        will return incorrect data for the terminal.
 
        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,
+       above, but only for people who actually set <EM>TERM</EM> to that terminal type,
        since  <STRONG>tgetent</STRONG>  only  does "tc" expansion once it is found the terminal
        type it was looking for, not while searching.
 
@@ -2599,7 +2599,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        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
+       terminal types and users whose <EM>TERM</EM> variable does not  have  a  termcap
        entry.
 
        When  in  -C (translate to termcap) mode, the <STRONG>ncurses</STRONG> implementation of
@@ -2618,8 +2618,8 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching    for   terminal   descriptions   in   <STRONG>$HOME/.terminfo</STRONG>   and
-       TERMINFO_DIRS is not supported by older implementations.
+       Searching    for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>   and
+       <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is not supported by older implementations.
 
        Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index ceff274d6..b934799e8 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.101 2023/11/25 23:02:52 tom Exp @
+  * @Id: tic.1m,v 1.103 2023/12/02 20:50:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -84,22 +84,22 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
        in a different terminfo database.  There are two ways to achieve this:
 
        <STRONG>o</STRONG>   First,  you  may override the system default either by using the <STRONG>-o</STRONG>
-           option,  or  by  setting  the  variable  <STRONG>TERMINFO</STRONG>  in  your   shell
+           option,  or  by  setting  the  variable  <EM>TERMINFO</EM>  in  your   shell
            environment to a valid database location.
 
        <STRONG>o</STRONG>   Secondly,  if  <STRONG>tic</STRONG>  cannot  write  in  <EM>/usr/share/terminfo</EM>  or  the
-           location specified using your TERMINFO variable, it looks  for  the
+           location specified using your <EM>TERMINFO</EM> variable, it looks  for  the
            directory  <EM>$HOME/.terminfo</EM> (or hashed database <EM>$HOME/.terminfo.db)</EM>;
            if that location exists, the entry is placed there.
 
        Libraries  that  read  terminfo  entries  are  expected  to  check   in
        succession
 
-       <STRONG>o</STRONG>   a location specified with the TERMINFO environment variable,
+       <STRONG>o</STRONG>   a location specified with the <EM>TERMINFO</EM> environment variable,
 
        <STRONG>o</STRONG>   <EM>$HOME/.terminfo</EM>,
 
-       <STRONG>o</STRONG>   directories listed in the TERMINFO_DIRS environment variable,
+       <STRONG>o</STRONG>   directories listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable,
 
        <STRONG>o</STRONG>   a compiled-in list of directories (/usr/share/terminfo), and
 
@@ -209,7 +209,7 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
               also preserves the obsolete capabilities.
 
        <STRONG>-o</STRONG><EM>dir</EM>  Write  compiled  entries  to given database location.  Overrides
-              the TERMINFO environment variable.
+              the <EM>TERMINFO</EM> environment variable.
 
        <STRONG>-Q</STRONG><EM>n</EM>    Rather than show source in terminfo  (text)  format,  print  the
               compiled   (binary)   format  in  hexadecimal  or  base64  form,
@@ -370,7 +370,7 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
        The  SVr4  manual  pages  are not clear on the resolution rules for <STRONG>use</STRONG>
        capabilities.   This  implementation  of  <STRONG>tic</STRONG>  will  find  <STRONG>use</STRONG>  targets
        anywhere  in  the  source  file, or anywhere in the file tree rooted at
-       <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is defined), or  in  the  user's  <EM>$HOME/.terminfo</EM>
+       <EM>TERMINFO</EM> (if <EM>TERMINFO</EM> is defined), or  in  the  user's  <EM>$HOME/.terminfo</EM>
        database  (if  it  exists),  or (finally) anywhere in the system's file
        tree of compiled entries.
 
@@ -393,66 +393,65 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
        The SVr4 <STRONG>-c</STRONG> mode does not report bad "use=" links.
 
        System V does  not  compile  entries  to  or  read  entries  from  your
-       <EM>$HOME/.terminfo</EM> database unless TERMINFO is explicitly set to it.
+       <EM>$HOME/.terminfo</EM> database unless <EM>TERMINFO</EM> is explicitly set to it.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open  Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.  It
        lists one option: <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is  unexpected.   The  change
-       history  states  that  the  description  is  derived  from  Tru64 UNIX.
-       According to its manual  pages,  that  system  also  supported  the  <STRONG>-v</STRONG>
-       option.
+       history  states  that the description is derived from Tru64.  According
+       to its manual pages, that system also supported the <STRONG>-v</STRONG> option.
 
-       Shortly  after  Issue  7  was  released, Tru64 was discontinued.  As of
-       2019, the surviving implementations of <STRONG>tic</STRONG> are  SVr4  (AIX,  HP-UX  and
+       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
+       2019,  the  surviving  implementations  of <STRONG>tic</STRONG> are SVr4 (AIX, HP-UX and
        Solaris), ncurses and NetBSD curses.  The SVr4 <STRONG>tic</STRONG> programs all support
-       the <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's  documentation,
+       the  <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's documentation,
        omitting the <STRONG>-v</STRONG> option.
 
-       The  X/Open  rationale  states  that  some  implementations of <STRONG>tic</STRONG> read
-       terminal descriptions from the standard input if the <EM>file</EM> 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
+       The X/Open rationale states  that  some  implementations  of  <STRONG>tic</STRONG>  read
+       terminal  descriptions from the standard input if the <EM>file</EM> 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.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       System V Release 2 provided  a  <STRONG>tic</STRONG>  utility.   It  accepted  a  single
-       option:  <STRONG>-v</STRONG>  (optionally  followed  by  a  number).   According to Ross
+       System  V  Release  2  provided  a  <STRONG>tic</STRONG>  utility.  It accepted a single
+       option: <STRONG>-v</STRONG> (optionally  followed  by  a  number).   According  to  Ross
        Ridge's comment in <EM>mytinfo</EM>, this version of <STRONG>tic</STRONG> was unable to represent
        cancelled capabilities.
 
-       System  V  Release 3 provided a different <STRONG>tic</STRONG> utility, written by Pavel
-       Curtis, (originally named "compile" in <EM>pcurses</EM>).  This added an  option
-       <STRONG>-c</STRONG>  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 <EM>pcurses</EM>.  While the program
-       itself was changed  little  as  development  continued  with  System  V
-       Release  4,  the  table  of capabilities grew from 180 (<EM>pcurses</EM>) to 464
+       System V Release 3 provided a different <STRONG>tic</STRONG> utility, written  by  Pavel
+       Curtis,  (originally named "compile" in <EM>pcurses</EM>).  This added an option
+       <STRONG>-c</STRONG> 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 <EM>pcurses</EM>.   While  the  program
+       itself  was  changed  little  as  development  continued  with System V
+       Release 4, the table of capabilities grew from  180  (<EM>pcurses</EM>)  to  464
        (Solaris).
 
-       In early development of ncurses (1993), Zeyd Ben-Halim used  the  table
-       from  <EM>mytinfo</EM>  to  extend  the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG>  (see
+       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
+       from <EM>mytinfo</EM> to extend the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG> (see
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
 
-       Eric  Raymond  incorporated  parts of <EM>mytinfo</EM> into ncurses to implement
-       the termcap-to-terminfo source conversion, and extended that  to  begin
+       Eric Raymond incorporated parts of <EM>mytinfo</EM> 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
+       Thomas  Dickey  completed  that  development over the course of several
        years.
 
-       In  1999,  Thomas  Dickey  added  the <STRONG>-x</STRONG> option to support user-defined
+       In 1999, Thomas Dickey added the  <STRONG>-x</STRONG>  option  to  support  user-defined
        capabilities.
 
-       In 2010, Roy Marples provided a <STRONG>tic</STRONG> program and  terminfo  library  for
-       NetBSD.   That  implementation  adapts  several  features from ncurses,
+       In  2010,  Roy  Marples provided a <STRONG>tic</STRONG> program and terminfo library for
+       NetBSD.  That implementation  adapts  several  features  from  ncurses,
        including <STRONG>tic</STRONG>'s <STRONG>-x</STRONG> option.
 
-       The <STRONG>-c</STRONG> option tells <STRONG>tic</STRONG> to check for problems in  the  terminfo  source
+       The  <STRONG>-c</STRONG>  option  tells <STRONG>tic</STRONG> to check for problems in the terminfo source
        file.  Continued development provides additional checks:
 
        <STRONG>o</STRONG>   <EM>pcurses</EM> had 8 warnings
@@ -467,8 +466,8 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
        The checking done in ncurses' <STRONG>tic</STRONG> 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
+       ensure consistency with the user-defined capabilities.  There  are  527
+       distinct  capabilities  in ncurses' terminal database; 128 of those are
        user-defined.
 
 
@@ -483,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 1d11fa699..e2128a037 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.56 2023/11/25 14:32:36 tom Exp @
+  * @Id: toe.1m,v 1.58 2023/12/02 20:49:04 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -40,12 +40,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -144,7 +144,7 @@ <H1 class="no-header">toe 1m 2023-11-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        When  not  sorting with the <STRONG>-s</STRONG> option, the <STRONG>-a</STRONG> option reports all of the
        names found in all of the terminal database directories  named  in  the
-       <STRONG>TERMINFO</STRONG> and <STRONG>TERMINFO_DIRS</STRONG> environment variables.
+       <EM>TERMINFO</EM> and <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variables.
 
            xterm-color     generic color xterm
            xterm-xfree86   xterm terminal emulator (XFree86)
@@ -188,7 +188,7 @@ <H1 class="no-header">toe 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 1d3577c0a..ff5b1c453 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.89 2023/11/25 14:32:36 tom Exp @
+  * @Id: tput.1,v 1.91 2023/12/02 20:49:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -102,8 +102,8 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 
        <STRONG>-T</STRONG><EM>type</EM> indicates  the  <EM>type</EM>  of  terminal.   Normally  this  option  is
               unnecessary,  because  the default is taken from the environment
-              variable <STRONG>TERM</STRONG>.  If <STRONG>-T</STRONG> is specified,  then  the  shell  variables
-              <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> will also be ignored.
+              variable <EM>TERM</EM>.  If <STRONG>-T</STRONG> is specified,  then  the  shell  variables
+              <EM>LINES</EM> and <EM>COLUMNS</EM> will also be ignored.
 
        <STRONG>-V</STRONG>     reports  the  version of ncurses which was used in this program,
               and exits.
@@ -151,7 +151,7 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 
               (2)  if the window size cannot be obtained  from  the  operating
                    system, but the terminal description (or environment, e.g.,
-                   <STRONG>LINES</STRONG> and  <STRONG>COLUMNS</STRONG>  variables  specify  this),  update  the
+                   <EM>LINES</EM> and  <EM>COLUMNS</EM>  variables  specify  this),  update  the
                    operating system's notion of the window size.
 
               (3)  the terminal modes will be updated:
@@ -258,7 +258,7 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
            generally works, unless connecting via a serial line which does not
            support <EM>NAWS</EM>: negotiations about window size).
 
-       <STRONG>o</STRONG>   finally, it inspects the environment variables  <STRONG>LINES</STRONG>  and  <STRONG>COLUMNS</STRONG>
+       <STRONG>o</STRONG>   finally, it inspects the environment variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM>
            which may override the terminal size.
 
        If  the  <STRONG>-T</STRONG>  option  is given tput ignores the environment variables by
@@ -483,13 +483,13 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
             Initialize  the  terminal according to the type of terminal in the
-            environmental variable <STRONG>TERM</STRONG>.  This command should be  included  in
-            everyone's .profile after the environmental variable <STRONG>TERM</STRONG> has been
+            environmental variable <EM>TERM</EM>.  This command should be  included  in
+            everyone's .profile after the environmental variable <EM>TERM</EM> has been
             exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
 
        <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
             Reset an AT&amp;T 5620 terminal, overriding the type  of  terminal  in
-            the environmental variable <STRONG>TERM</STRONG>.
+            the environmental variable <EM>TERM</EM>.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
             Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
@@ -524,7 +524,7 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
             Print the long name from the <STRONG>terminfo</STRONG> database  for  the  type  of
-            terminal specified in the environmental variable <STRONG>TERM</STRONG>.
+            terminal specified in the environmental variable <EM>TERM</EM>.
 
             <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
             <STRONG>&gt;</STRONG> <STRONG>clear</STRONG>
@@ -543,7 +543,7 @@ <H1 class="no-header">tput 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 110c16286..966068ba1 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.75 2023/11/25 14:32:36 tom Exp @
+  * @Id: tset.1,v 1.77 2023/12/02 20:52:24 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
   *   reset.c
@@ -43,12 +43,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-12-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -90,12 +90,12 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 
        1. The <STRONG>terminal</STRONG> argument specified on the command line.
 
-       2. The value of the <STRONG>TERM</STRONG> environmental variable.
+       2. The value of the <EM>TERM</EM> environmental variable.
 
        3. (BSD systems only.) The terminal type associated with  the  standard
-       error  output  device  in the <EM>/etc/ttys</EM> file.  (On System-V-like Unices
-       and systems using that convention, <STRONG>getty(1)</STRONG> does this  job  by  setting
-       <STRONG>TERM</STRONG> according to the type passed to it by <EM>/etc/inittab</EM>.)
+       error  output  device  in  the  <EM>/etc/ttys</EM> file.  (On System V hosts and
+       systems using that convention, <STRONG>getty(1)</STRONG> does this job by  setting  <EM>TERM</EM>
+       according to the type passed to it by <EM>/etc/inittab</EM>.)
 
        4.  The  default  terminal  type, "unknown", is not suitable for curses
        applications.
@@ -116,8 +116,8 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
            window size.
 
            If  the  window  size cannot be obtained from the operating system,
-           but the terminal  description  (or  environment,  e.g.,  <STRONG>LINES</STRONG>  and
-           <STRONG>COLUMNS</STRONG>  variables  specify  this),  use  this to set the operating
+           but the terminal  description  (or  environment,  e.g.,  <EM>LINES</EM>  and
+           <EM>COLUMNS</EM>  variables  specify  this),  use  this to set the operating
            system's notion of the window size.
 
        <STRONG>o</STRONG>   if the "<STRONG>-c</STRONG>" option is enabled, the backspace,  interrupt  and  line
@@ -168,7 +168,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 
        When the <STRONG>-s</STRONG> option is specified, the commands to enter the  information
        into  the  shell's  environment are written to the standard output.  If
-       the <STRONG>SHELL</STRONG> environmental variable ends in "csh", the  commands  are  for
+       the <EM>SHELL</EM> environmental variable ends in "csh", the  commands  are  for
        <STRONG>csh</STRONG>,  otherwise,  they  are  for <STRONG>sh(1)</STRONG>.  Note, the <STRONG>csh</STRONG> commands set and
        unset the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following  line
        in  the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the environment
@@ -180,7 +180,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 </PRE><H3><a name="h3-Terminal-Type-Mapping">Terminal Type Mapping</a></H3><PRE>
        When the terminal is not hardwired into  the  system  (or  the  current
        system  information  is  incorrect)  the terminal type derived from the
-       <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental variable  is  often  something
+       <EM>/etc/ttys</EM> file or the <EM>TERM</EM> environmental variable  is  often  something
        generic  like  <STRONG>network</STRONG>,  <STRONG>dialup</STRONG>,  or  <STRONG>unknown</STRONG>.   When <STRONG>tset</STRONG> is used in a
        startup script it is often desirable to provide information  about  the
        type of terminal used on such ports.
@@ -258,7 +258,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
        <STRONG>-r</STRONG>   Print the terminal type to the standard error output.
 
        <STRONG>-s</STRONG>   Print the sequence of shell commands to initialize the environment
-            variable <STRONG>TERM</STRONG> to the standard output; see subsection "Setting  the
+            variable <EM>TERM</EM> to the standard output; see subsection "Setting  the
             Environment".
 
        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
@@ -278,14 +278,14 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
        The <STRONG>tset</STRONG> command uses these environment variables:
 
-       SHELL
-            tells <STRONG>tset</STRONG> whether  to  initialize  <STRONG>TERM</STRONG>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
+       <EM>SHELL</EM>
+            tells <STRONG>tset</STRONG> whether  to  initialize  <EM>TERM</EM>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
             syntax.
 
-       TERM Denotes  your  terminal  type.   Each  terminal  type is distinct,
+       <EM>TERM</EM> Denotes  your  terminal  type.   Each  terminal  type is distinct,
             though many are similar.
 
-       TERMCAP
+       <EM>TERMCAP</EM>
             may denote the location of a termcap database.  If it  is  not  an
             absolute  pathname,  e.g.,  begins  with  a  "/", <STRONG>tset</STRONG> removes the
             variable from the environment  before  looking  for  the  terminal
@@ -293,12 +293,12 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       /etc/ttys
-            system  port  name to terminal type mapping database (BSD versions
-            only).
+       <EM>/etc/ttys</EM>
+              system port name to terminal type mapping database (BSD versions
+              only).
 
        <EM>/usr/share/terminfo</EM>
-            compiled terminal description database directory
+              compiled terminal description database directory
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -312,19 +312,19 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
        <STRONG>tset</STRONG>.   In fact, the commonly-used <STRONG>reset</STRONG> utility is always an alias for
        <STRONG>tset</STRONG>.
 
-       The  <STRONG>tset</STRONG>  utility  provides  for   backward-compatibility   with   BSD
-       environments  (under  most modern Unices, <STRONG>/etc/inittab</STRONG> and <STRONG>getty(1)</STRONG> can
-       set <STRONG>TERM</STRONG> appropriately for each dial-up line; this  obviates  what  was
-       <STRONG>tset</STRONG>'s  most  important  use).  This implementation behaves like 4.4BSD
-       <STRONG>tset</STRONG>, with a few exceptions specified here.
+       The <STRONG>tset</STRONG> utility provides backward compatibility with BSD environments;
+       under  most  modern  Unices,  <EM>/etc/inittab</EM>  and  <STRONG>getty(1)</STRONG>  can set <EM>TERM</EM>
+       appropriately for each dial-up line, obviating  what  was  <STRONG>tset</STRONG>'s  most
+       important  use.   This  implementation behaves like 4.4BSD <STRONG>tset</STRONG>, with a
+       few exceptions we shall consider now.
 
-       A few options are different because the <STRONG>TERMCAP</STRONG> variable is  no  longer
+       A few options are different because the <EM>TERMCAP</EM> variable is  no  longer
        supported under terminfo-based <STRONG>ncurses</STRONG>:
 
        <STRONG>o</STRONG>   The  <STRONG>-S</STRONG>  option  of  BSD  <STRONG>tset</STRONG>  no longer works; it prints an error
            message to the standard error and dies.
 
-       <STRONG>o</STRONG>   The <STRONG>-s</STRONG> option only sets <STRONG>TERM</STRONG>, not <STRONG>TERMCAP</STRONG>.
+       <STRONG>o</STRONG>   The <STRONG>-s</STRONG> option only sets <EM>TERM</EM>, not <EM>TERMCAP</EM>.
 
        There was an undocumented 4.4BSD feature that invoking <STRONG>tset</STRONG> via a  link
        named  "TSET"  (or  via  any  other  name  beginning with an upper-case
@@ -361,7 +361,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
            size from the operating system.
 
        <STRONG>o</STRONG>   In ncurses, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
-           be  from  the  operating  system, the <STRONG>LINES</STRONG> and <STRONG>COLUMNS</STRONG> environment
+           be  from  the  operating  system, the <EM>LINES</EM> and <EM>COLUMNS</EM> environment
            variables or the terminal description.
 
        Obtaining the window size from the terminal description  is  common  to
@@ -369,7 +369,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
        use is for hardware terminals.  Generally speaking, a window size would
        be  unset  only if there were some problem obtaining the value from the
        operating system (and <STRONG>setupterm</STRONG> would still fail).   For  that  reason,
-       the  <STRONG>LINES</STRONG>  and <STRONG>COLUMNS</STRONG> environment variables may be useful for working
+       the  <EM>LINES</EM>  and <EM>COLUMNS</EM> environment variables may be useful for working
        around window-size problems.  Those  have  the  drawback  that  if  the
        window  is  resized, those variables must be recomputed and reassigned.
        To do this more easily, use the <STRONG>resize(1)</STRONG> program.
@@ -403,7 +403,7 @@ <H1 class="no-header">tset 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 26ec40675..fb72802b0 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.17 2023/10/01 09:59:29 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-10-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.19 2023/12/02 21:37:31 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-02 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
 configuration helper for \fIncurses\fR libraries
@@ -44,7 +44,7 @@ configuration helper for \fIncurses\fR libraries
 This program development aid simplifies the process of configuring
 applications against a particular set of \fIncurses\fP libraries.
 .SH OPTIONS
-.TP
+.TP 18 \" "--mouse-version" + 2n + adjustment for PDF
 \fB\-\-prefix\fP
 reports the package prefix of \fIncurses\fP.
 .TP
@@ -83,16 +83,16 @@ reports the directory containing \fIncurses\fP libraries.
 reports the directory containing \fIncurses\fP man pages.
 .TP
 \fB\-\-terminfo\fP
-reports the \fBTERMINFO\fP \fIterminfo\fP database path,
+reports the \fI\%TERMINFO\fP \fIterminfo\fP database path,
 for example \fI\%@TERMINFO@\fP.
 .TP
 \fB\-\-terminfo\-dirs\fP
-reports the \fBTERMINFO_DIRS\fP supplemental search path for the
+reports the \fI\%TERMINFO_DIRS\fP supplemental search path for the
 \fIterminfo\fP database,
 for example \fI\%@TERMINFO_DIRS@\fP.
 .TP
 \fB\-\-termpath\fP
-reports the \fBTERMPATH\fP supplemental search path for the
+reports the \fI\%TERMPATH\fP supplemental search path for the
 \fItermcap\fP database,
 if support for \fItermcap\fP is configured.
 .TP
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 35b92a20b..b3983b41e 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.54 2023/11/25 14:32:36 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.56 2023/12/02 20:51:25 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -204,7 +204,7 @@ The HP-UX \fI\%terminfo\fP library supports two nonstandard
 \fB\%@CAPTOINFO@\fP discards these with a warning message.
 .SH FILES
 .TP
-\fI\*d\fP
+.I \*d
 default \fI\%termcap\fP terminal capability database
 .SH NOTES
 The verbose option is not identical to SVr4's.
diff --git a/man/clear.1 b/man/clear.1
index 669bc1c73..23d31bdf9 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.43 2023/11/25 14:32:36 tom Exp $
-.TH @CLEAR@ 1 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.45 2023/12/02 20:49:04 tom Exp $
+.TH @CLEAR@ 1 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -62,7 +62,7 @@ clear the terminal screen
 \fB\%@CLEAR@\fP clears your terminal's screen and its scrollback buffer,
 if any.
 \fB\%@CLEAR@\fP retrieves the terminal type from the environment
-variable \fBTERM\fP,
+variable \fITERM\fP,
 then consults the \fIterminfo\fP terminal capability database entry for
 that type to determine how to perform these actions.
 .PP
@@ -78,10 +78,10 @@ produces instructions suitable for the terminal \fItype\fP.
 Normally,
 this option is unnecessary,
 because the terminal type is inferred from the environment variable
-\fBTERM\fP.
+\fITERM\fP.
 If this option is specified,
-\fB\%@CLEAR@\fP ignores the environment variables \fBLINES\fP and
-\fB\%COLUMNS\fP as well.
+\fB\%@CLEAR@\fP ignores the environment variables \fILINES\fP and
+\fI\%COLUMNS\fP as well.
 .TP
 .B \-V
 reports the version of \fIncurses\fP associated with this program and
@@ -91,8 +91,7 @@ exits with a successful status.
 prevents \fB\%@CLEAR@\fP from attempting to clear the scrollback buffer.
 .SH PORTABILITY
 Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
-(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@TSET@\fP or
-\fB\%@RESET@\fP.
+(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@CLEAR@\fP.
 .PP
 The latter documents \fBtput\fP,
 which could be used to replace this utility either via a shell script or
@@ -147,7 +146,7 @@ printf \*'\e033[2J\*'
 .EE
 .RE
 .IP
-one could clear the scrollback buffer using
+one could clear the scrollback buffer as well by using
 .RS 8
 .PP
 .EX
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 662b2113e..1fc7c505d 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.89 2023/11/25 15:33:56 tom Exp $
-.TH curs_attr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.91 2023/12/02 21:05:24 tom Exp $
+.TH curs_attr 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -126,10 +126,6 @@ These routines do not affect the attributes used
 when erasing portions of the window.
 See \fBcurs_bkgd\fP(3X) for functions which modify the attributes used for
 erasing and clearing.
-.PP
-Routines which do not have a \fBWINDOW*\fP parameter apply to \fBstdscr\fP.
-For example,
-\fBattr_set\fP is the \fBstdscr\fP variant of \fBwattr_set\fP.
 .\" ---------------------------------------------------------------------------
 .SS Window attributes
 There are two sets of functions:
@@ -245,6 +241,7 @@ The following video attributes, defined in \fB<curses.h>\fP, can be passed to
 the routines \fBattron\fP, \fBattroff\fP, and \fBattrset\fP, or OR'd with the
 characters passed to \fBaddch\fP (see \fBcurs_addch\fP(3X)).
 .PP
+.ne 15
 .RS
 .TS
 l l
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 3e8b85871..04fc2f4c4 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.49 2023/11/25 14:01:49 tom Exp $
-.TH curs_bkgd 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.51 2023/12/02 21:02:44 tom Exp $
+.TH curs_bkgd 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -88,10 +99,12 @@ Neither X/Open Curses nor the SVr4 manual pages give details about
 the way the rendition of characters on the screen is updated when
 \fBbkgd\fP or \fBwbkgd\fP is used to change the background character.
 .PP
-This implementation, like SVr4 curses, does not store the background
-and window attribute contributions to each cell separately.
-It updates the rendition by comparing the character, non-color attributes and
-colors contained in the background.
+\fI\%ncurses\fP,
+like SVr4 \fIcurses\fP,
+does not store the background and window attribute contributions to each
+cell separately.
+It updates the rendition by comparing the character,
+non-color attributes and colors contained in the background.
 For each cell in the window, whether or not it is blank:
 .bP
 The library first compares the \fIcharacter\fP,
@@ -131,30 +144,39 @@ the new background character's color attribute will be ignored.
 The \fBgetbkgd\fP function returns the given window's current background
 character/attribute pair.
 .SH RETURN VALUE
-These functions are described in the XSI Curses standard, Issue 4.
-It specifies that \fBbkgd\fP and \fBwbkgd\fP return \fBERR\fP on failure,
-but gives no failure conditions.
-.PP
-The routines \fBbkgd\fP and \fBwbkgd\fP return the integer \fBOK\fP,
-unless the library has not been initialized.
+Functions returning an \fIint\fP return \fBOK\fP on success.
+\fB\%bkgd\fP returns \fBERR\fP if the library has not been initialized.
+\fB\%wbkgd\fP and \fB\%getbkgd\fP return \fBERR\fP if the \fI\%WINDOW\fP
+pointer argument is null.
 .PP
 In contrast,
-the SVr4.0 manual says \fBbkgd\fP and \fBwbkgd\fP may return \fBOK\fP
-"or a non-negative integer if \fBimmedok\fP is set",
-which refers to the return value from \fBwrefresh\fP
+the SVr4.0 manual says \fB\%bkgd\fP and \fB\%wbkgd\fP may return
+\fBOK\fP
+\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+which refers to the return value from \fB\%wrefresh\fP
 (used to implement the immediate repainting).
-The SVr4 curses \fBwrefresh\fP returns the number of characters
+SVr4 \fIcurses\fP \fB\%wrefresh\fP returns the number of characters
 written to the screen during the refresh.
-This implementation does not do that.
+\fI\%ncurses\fP does not do that.
 .SH NOTES
+Unusually,
+there is no \fB\%wgetbkgd\fP function;
+\fB\%getbkgd\fP behaves as one would expect \fB\%wgetbkgd\fP to,
+accepting a \fI\%WINDOW\fP pointer argument.
+.PP
 Note that \fBbkgdset\fP and \fBbkgd\fP may be macros.
 .PP
 X/Open Curses mentions that the character part of the background must
 be a single-byte value.
-This implementation, like SVr4, checks to ensure that,
+\fI\%ncurses\fP,
+like SVr4 \fIcurses\fP,
+checks to ensure that,
 and will reuse the old background character if the check fails.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
+It specifies that \fBbkgd\fP and \fBwbkgd\fP return \fBERR\fP on
+failure,
+but gives no failure conditions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 2f7ee4487..d870aa957 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.32 2023/11/25 14:01:49 tom Exp $
-.TH curs_bkgrnd 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.34 2023/12/02 21:30:00 tom Exp $
+.TH curs_bkgrnd 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -86,21 +86,20 @@ the new background rendition.
 Wherever the former background character
 appears, it is changed to the new background character.
 .SS getbkgrnd
-The \fBgetbkgrnd\fP function returns the given window's current background
-character/attribute pair via the
+The \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP functions obtain the given
+or specified window's current background character and attribute pair
+and store it via the
 .I wch
 pointer.
-If the given window pointer is null,
-the character is not updated (but no error is returned).
 .SH RETURN VALUE
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines do not return a value.
 .PP
 Upon successful completion, the other functions return \fBOK\fP.
 Otherwise, they return \fBERR\fP:
 .bP
-A null window pointer is treated as an error.
+A null \fI\%WINDOW\fP pointer is treated as an error.
 .bP
-A null character pointer is treated as an error.
+A null \fI\%cchar_t\fP pointer is treated as an error.
 .SH NOTES
 \fB\%bkgrnd\fP,
 \fB\%bkgrndset\fP, and
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index aab21a664..ea9c516a4 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.54 2023/11/11 23:20:20 tom Exp $
-.TH curs_initscr 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.56 2023/12/03 00:09:54 tom Exp $
+.TH curs_initscr 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -238,13 +238,13 @@ e.g.,
 \fBdef_prog_mode\fP(3X).
 SVr4 curses uses the descriptor in \fBSCREEN\fP.
 .SS Unset TERM Variable
-If the TERM variable is missing or empty, \fBinitscr\fP uses the
+If the \fITERM\fP variable is missing or empty, \fBinitscr\fP uses the
 value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the \fIgeneric\fP
 (\fIgn\fP) capability.
 Generic entries are detected by \fBsetupterm\fP(3X)
 and cannot be used for full-screen operation.
-Other implementations may handle a missing/empty TERM variable differently.
+Other implementations may handle a missing/empty \fITERM\fP variable differently.
 .SS Signal Handlers
 Quoting from X/Open Curses Issue 7, section 3.1.1:
 .RS 5
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index e2cc290db..3eac44faf 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.38 2023/10/28 14:49:04 tom Exp $
-.TH curs_opaque 3X 2023-10-28 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.40 2023/12/02 20:52:50 tom Exp $
+.TH curs_opaque 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,7 +118,7 @@ returns the value set by \fB\%notimeout\fP(3X).
 \fBis_pad\fP
 returns \fBTRUE\fP if the window is a pad;
 that is,
-it created by \fB\%newpad\fP(3X).
+it was created by \fB\%newpad\fP(3X).
 .TP
 \fBis_scrollok\fP
 returns the value set by \fB\%scrollok\fP(3X).
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index e0497b29f..09e3384ae 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.72 2023/11/25 14:32:36 tom Exp $
-.TH curs_termcap 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.74 2023/12/02 20:49:04 tom Exp $
+.TH curs_termcap 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -211,7 +211,7 @@ One could use
 .PP
 to free this memory, but there is an additional complication with ncurses.
 It uses a fixed-size \fIpool\fP of storage locations,
-one per setting of the \fBTERM\fP variable when \fBtgetent\fP is called.
+one per setting of the \fITERM\fP variable when \fBtgetent\fP is called.
 The \fBscreen\fP(1) program relies upon this arrangement,
 to improve its performance.
 .PP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index f8d2e68a8..62d51a65f 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.119 2023/11/25 14:32:36 tom Exp $
-.TH curs_terminfo 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.122 2023/12/03 00:10:20 tom Exp $
+.TH curs_terminfo 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -147,8 +147,9 @@ follows:
 If \fBuse_env(FALSE)\fP has been called, values for
 \fBlines\fP and \fBcolumns\fP specified in \fBterminfo\fP are used.
 .bP
-Otherwise, if the environment variables \fBLINES\fP and \fBCOLUMNS\fP
-exist, their values are used.
+Otherwise,
+if the environment variables \fILINES\fP and \fI\%COLUMNS\fP exist,
+their values are used.
 If these environment variables do not
 exist and the program is running in a window, the current window size
 is used.
@@ -188,7 +189,8 @@ These are its parameters:
 .TP 5
 \fIterm\fP
 is the terminal type, a character string.
-If \fIterm\fP is null, the environment variable \fBTERM\fP is used.
+If \fIterm\fP is null,
+the environment variable \fITERM\fP is used.
 .TP 5
 \fIfiledes\fP
 is the file descriptor used for getting and setting terminal I/O modes.
@@ -629,7 +631,7 @@ so that it calls \fBtparm\fP correctly.
 If configured to use the terminal-driver,
 e.g., for the MinGW port,
 .bP
-\fBsetupterm\fP interprets a missing/empty TERM variable as the
+\fBsetupterm\fP interprets a missing/empty \fITERM\fP variable as the
 special value \*(``unknown\*(''.
 .IP
 SVr4 curses uses the
@@ -641,7 +643,7 @@ while the latter does not.
 A generic terminal is unsuitable for full-screen applications.
 .bP
 \fBsetupterm\fP allows explicit use of the
-the windows console driver by checking if $TERM is set to
+the windows console driver by checking if \fB$TERM\fP is set to
 \*(``#win32con\*('' or an abbreviation of that string.
 .SS Other portability issues
 In System V Release 4, \fBset_curterm\fP has an \fBint\fP return type and
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 90ffab5b7..6878b43e7 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.88 2023/10/14 22:26:23 tom Exp $
-.TH curs_util 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.90 2023/12/02 21:10:36 tom Exp $
+.TH curs_util 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -181,12 +181,14 @@ If successful,
 it overrides the values from the terminal database.
 .bP
 Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
-\fBncurses\fP examines the \fBLINES\fP or \fBCOLUMNS\fP environment variables,
+\fBncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
+variables,
 using a value in those to override the results
 from the operating system or terminal database.
 .IP
 \fBNcurses\fP also updates the screen size in response to \fBSIGWINCH\fP,
-unless overridden by the \fBLINES\fP or \fBCOLUMNS\fP environment variables,
+unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
+variables,
 .SS use_tioctl
 The \fBuse_tioctl\fP routine, if used,
 should be called before \fBinitscr\fP or \fBnewterm\fP are called
@@ -195,7 +197,7 @@ After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
 \fBncurses\fP modifies the last step in its computation
 of screen size as follows:
 .bP
-checks if the \fBLINES\fP and \fBCOLUMNS\fP environment variables
+checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 are set to a number greater than zero.
 .bP
 for each, \fBncurses\fP updates the corresponding environment variable
@@ -215,16 +217,16 @@ _
 TRUE	FALSE	T{
 This is the default behavior.
 \fIncurses\fP uses operating system calls
-unless overridden by \fBLINES\fP or \fB\%COLUMNS\fP environment
+unless overridden by \fILINES\fP or \fI\%COLUMNS\fP environment
 variables;
 default.
 T}
 TRUE	TRUE	T{
-\fIncurses\fP updates \fBLINES\fP and \fB\%COLUMNS\fP based on operating
+\fIncurses\fP updates \fILINES\fP and \fI\%COLUMNS\fP based on operating
 system calls.
 T}
 FALSE	TRUE	T{
-\fIncurses\fP ignores \fBLINES\fP and \fB\%COLUMNS\fP,
+\fIncurses\fP ignores \fILINES\fP and \fI\%COLUMNS\fP,
 using operating system calls to obtain size.
 T}
 .TE
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 8b6f8c153..291fe2163 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.99 2023/11/25 17:10:25 tom Exp $
-.TH @INFOCMP@ 1M 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.101 2023/12/02 20:49:04 tom Exp $
+.TH @INFOCMP@ 1M 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -140,7 +140,7 @@ Use the \fB\-x\fP option to add the BSD-compatibility
 capabilities (names prefixed with \*(``OT\*('').
 .IP
 If no \fIterminal-types\fP are given,
-\fB@INFOCMP@\fP uses the environment variable \fBTERM\fP
+\fB@INFOCMP@\fP uses the environment variable \fITERM\fP
 for each of the \fIterminal-types\fP.
 .SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
 The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
@@ -157,7 +157,7 @@ l l .
 .TE
 .PP
 If no \fIterminal-types\fP are given,
-the environment variable \fBTERM\fP will be used for the terminal name.
+the environment variable \fITERM\fP will be used for the terminal name.
 .PP
 The source produced by the \fB\-C\fP option may be used directly as a
 \fBtermcap\fP entry, but not all parameterized strings can be changed to
@@ -272,8 +272,8 @@ were not needed.
 .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
 Like other \fBncurses\fP utilities,
 \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.
+You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
+variables to override the compiled-in default list of places to search.
 See \fBcurses\fP(3X), as well as
 the \fIFetching Compiled Descriptions\fP section in \fBterminfo\fR(5).
 .PP
@@ -454,7 +454,7 @@ hexadecimal and base64
 .RE
 .IP
 For example, this prints the compiled terminfo value as a string
-which could be assigned to the \fBTERMINFO\fP environment variable:
+which could be assigned to the \fI\%TERMINFO\fP environment variable:
 .PP
 .RS 9
 .EX
diff --git a/man/ncurses.3x b/man/ncurses.3x
index fc0e549ad..c8a58fac8 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.181 2023/11/25 14:32:36 tom Exp $
-.TH ncurses 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.185 2023/12/03 00:14:35 tom Exp $
+.TH ncurses 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -155,7 +155,7 @@ Most programs would additionally use the sequence:
 Before a \fBcurses\fP program is run, the tab stops of the terminal
 should be set and its initialization strings, if defined, must be output.
 This can be done by executing the \fB@TPUT@ init\fP command
-after the shell environment variable \fBTERM\fP has been exported.
+after the shell environment variable \fITERM\fP has been exported.
 (The BSD-style \fB\%@TSET@\fP(1) utility also performs this function.)
 See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(5).
 .SS Datatypes
@@ -208,17 +208,19 @@ The video attributes, line
 drawing characters, and input values use names, defined in \fB<curses.h>\fP,
 such as \fBA_REVERSE\fP, \fBACS_HLINE\fP, and \fBKEY_LEFT\fP.
 .SS Environment variables
-If the environment variables \fBLINES\fP and \fBCOLUMNS\fP are set, or if the
+If the environment variables \fILINES\fP and \fI\%COLUMNS\fP are set,
+or if the
 program is executing in a window environment, line and column information in
 the environment will override information read by \fIterminfo\fP.
 This would affect a program running in an AT&T 630 layer,
 for example, where the size of a
 screen is changeable (see \fBENVIRONMENT\fP).
 .PP
-If the environment variable \fBTERMINFO\fP is defined, any program using
+If the environment variable \fI\%TERMINFO\fP is defined,
+any program using
 \fBcurses\fP checks for a local terminal definition before checking in the
 standard place.
-For example, if \fBTERM\fP is set to \fBatt4424\fP, then the
+For example, if \fITERM\fP is set to \fBatt4424\fP, then the
 compiled terminal definition is found in
 .PP
 .RS 4
@@ -228,7 +230,9 @@ compiled terminal definition is found in
 .RE
 .PP
 (The \fBa\fP is copied from the first letter of \fBatt4424\fP to avoid
-creation of huge directories.)  However, if \fBTERMINFO\fP is set to
+creation of huge directories.)
+However,
+if \fI\%TERMINFO\fP is set to
 \fB$HOME/myterms\fP, \fBcurses\fP first checks
 .PP
 .RS 4
@@ -852,7 +856,7 @@ Routines that return pointers return \fBNULL\fP on error.
 The following environment symbols are useful for customizing the
 runtime behavior of the \fBncurses\fP library.
 The most important ones have been already discussed in detail.
-.SS CC command-character
+.SS \fICC\fP command-character
 When set, change occurrences of the command_character
 (i.e., the \fBcmdch\fP capability)
 of the loaded terminfo entries to the value of this variable.
@@ -861,18 +865,18 @@ Very few terminfo entries provide this feature.
 Because this name is also used in development environments to represent
 the C compiler's name, \fBncurses\fP ignores it if it does not happen to
 be a single character.
-.SS BAUDRATE
+.SS \fIBAUDRATE\fP
 The debugging library checks this environment variable when the application
 has redirected output to a file.
 The variable's numeric value is used for the baudrate.
 If no value is found, \fBncurses\fP uses 9600.
 This allows testers to construct repeatable test-cases
 that take into account costs that depend on baudrate.
-.SS COLUMNS
+.SS \fICOLUMNS\fP
 Specify the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
-If neither the \fBCOLUMNS\fP value nor the terminal's screen size is available,
+If neither the \fI\%COLUMNS\fP value nor the terminal's screen size is available,
 \fBncurses\fP uses the size which may be specified in the terminfo database
 (i.e., the \fBcols\fP capability).
 .PP
@@ -880,10 +884,12 @@ It is important that your application use a correct size for the screen.
 This is not always possible because your application may be
 running on a host which does not honor NAWS (Negotiations About Window
 Size), or because you are temporarily running as another user.
-However, setting \fBCOLUMNS\fP and/or \fBLINES\fP overrides the library's
-use of the screen size obtained from the operating system.
+However,
+setting \fI\%COLUMNS\fP and/or \fILINES\fP overrides the library's use
+of the screen size obtained from the operating system.
 .PP
-Either \fBCOLUMNS\fP or \fBLINES\fP symbols may be specified independently.
+Either \fI\%COLUMNS\fP or \fILINES\fP symbols may be specified
+independently.
 This is mainly useful to circumvent legacy misfeatures of terminal descriptions,
 e.g., xterm which commonly specifies a 65 line screen.
 For best results, \fBlines\fP and \fBcols\fP should not be specified in
@@ -891,9 +897,10 @@ a terminal description for terminals which are run as emulations.
 .PP
 Use the \fBuse_env\fP function to disable all use of external environment
 (but not including system calls) to determine the screen size.
-Use the \fBuse_tioctl\fP function to update \fBCOLUMNS\fP or \fBLINES\fP
-to match the screen size obtained from system calls or the terminal database.
-.SS ESCDELAY
+Use the \fBuse_tioctl\fP function to update \fI\%COLUMNS\fP or
+\fILINES\fP to match the screen size obtained from system calls or the
+terminal database.
+.SS \fIESCDELAY\fP
 Specifies the total time, in milliseconds, for which ncurses will
 await a character sequence, e.g., a function key.
 The default value, 1000 milliseconds, is enough for most uses.
@@ -913,11 +920,11 @@ to the composed multi-click event as well as the individual clicks.
 .PP
 In addition to the environment variable,
 this implementation provides a global variable with the same name.
-Portable applications should not rely upon the presence of ESCDELAY
+Portable applications should not rely upon the presence of \fB\%ESCDELAY\fP
 in either form,
 but setting the environment variable rather than the global variable
 does not create problems when compiling an application.
-.SS HOME
+.SS \fIHOME\fP
 Tells \fBncurses\fP where your home directory is.
 That is where it may read and write auxiliary terminal descriptions:
 .PP
@@ -927,10 +934,10 @@ $HOME/.termcap
 $HOME/.terminfo
 .EE
 .RE
-.SS LINES
-Like COLUMNS, specify the height of the screen in characters.
-See COLUMNS for a detailed description.
-.SS MOUSE_BUTTONS_123
+.SS \fILINES\fP
+Like \fI\%COLUMNS\fP, specify the height of the screen in characters.
+See \fI\%COLUMNS\fP for a detailed description.
+.SS \fIMOUSE_BUTTONS_123\fP
 This applies only to the OS/2 EMX port.
 It specifies the order of buttons on the mouse.
 OS/2 numbers a 3-button mouse inconsistently from other
@@ -947,7 +954,7 @@ platforms:
 This variable lets you customize the mouse.
 The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
 If it is not specified, \fBncurses\fP uses 132.
-.SS NCURSES_ASSUMED_COLORS
+.SS \fINCURSES_ASSUMED_COLORS\fP
 Override the compiled-in assumption that the
 terminal's default colors are white-on-black
 (see \fBdefault_colors\fP(3X)).
@@ -957,7 +964,7 @@ For example, to tell ncurses to not assume anything
 about the colors, set this to "\-1,\-1".
 To make it green-on-black, set it to "2,0".
 Any positive value from zero to the terminfo \fBmax_colors\fP value is allowed.
-.SS NCURSES_CONSOLE2
+.SS \fINCURSES_CONSOLE2\fP
 This applies only to the MinGW port of ncurses.
 .PP
 The \fBConsole2\fP program's handling of the Microsoft Console API call
@@ -967,29 +974,29 @@ However, it is possible to simulate the action of this call by
 mapping coordinates,
 explicitly saving and restoring the original screen contents.
 Setting the environment variable \fBNCGDB\fP has the same effect.
-.SS NCURSES_GPM_TERMS
+.SS \fINCURSES_GPM_TERMS\fP
 This applies only to ncurses configured to use the GPM interface.
 .PP
 If present,
 the environment variable is a list of one or more terminal names
-against which the \fBTERM\fP environment variable is matched.
+against which the \fITERM\fP environment variable is matched.
 Setting it to an empty value disables the GPM interface;
 using the built-in support for xterm, etc.
 .PP
 If the environment variable is absent,
-ncurses will attempt to open GPM if \fBTERM\fP contains \*(``linux\*(''.
-.SS NCURSES_NO_HARD_TABS
+ncurses will attempt to open GPM if \fITERM\fP contains \*(``linux\*(''.
+.SS \fINCURSES_NO_HARD_TABS\fP
 \fBNcurses\fP may use tabs as part of the cursor movement optimization.
 In some cases,
 your terminal driver may not handle these properly.
 Set this environment variable to disable the feature.
 You can also adjust your \fBstty\fP(1) settings to avoid the problem.
-.SS NCURSES_NO_MAGIC_COOKIE
+.SS \fINCURSES_NO_MAGIC_COOKIE\fP
 Some terminals use a magic-cookie feature which requires special handling
 to make highlighting and other video attributes display properly.
 You can suppress the highlighting entirely for these terminals by
 setting this environment variable.
-.SS NCURSES_NO_PADDING
+.SS \fINCURSES_NO_PADDING\fP
 Most of the terminal descriptions in the terminfo database are written
 for real \*(``hardware\*('' terminals.
 Many people use terminal emulators
@@ -1011,11 +1018,11 @@ have delay times embedded.
 You may wish to use these descriptions,
 but not want to pay the performance penalty.
 .PP
-Set the NCURSES_NO_PADDING environment variable to disable all but mandatory
-padding.
+Set the \fI\%NCURSES_NO_PADDING\fP environment variable
+to disable all but mandatory padding.
 Mandatory padding is used as a part of special control
 sequences such as \fBflash\fP.
-.SS NCURSES_NO_SETBUF
+.SS \fINCURSES_NO_SETBUF\fP
 This setting is obsolete.
 Before changes
 .RS 3
@@ -1031,7 +1038,7 @@ though 5.9 patch 20130126
 This was done (as in SVr4 curses) for performance reasons.
 For testing purposes, both of \fBncurses\fP and certain applications,
 this feature was made optional.
-Setting the NCURSES_NO_SETBUF variable
+Setting the \fI\%NCURSES_NO_SETBUF\fP variable
 disabled output buffering, leaving the output in the original (usually
 line buffered) mode.
 .PP
@@ -1048,14 +1055,14 @@ the buffered standard output but its own output (to the same file descriptor).
 As a special case, the low-level calls such as \fBputp\fP still use the
 standard output.
 But high-level curses calls do not.
-.SS NCURSES_NO_UTF8_ACS
+.SS \fINCURSES_NO_UTF8_ACS\fP
 During initialization, the \fBncurses\fP library
 checks for special cases where VT100 line-drawing (and the corresponding
 alternate character set capabilities) described in the terminfo are known
 to be missing.
 Specifically, when running in a UTF\-8 locale,
 the Linux console emulator and the GNU screen program ignore these.
-Ncurses checks the \fBTERM\fP environment variable for these.
+Ncurses checks the \fITERM\fP environment variable for these.
 For other special cases, you should set this environment variable.
 Doing this tells ncurses to use Unicode values which correspond to
 the VT100 line-drawing glyphs.
@@ -1087,9 +1094,9 @@ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
 The name \*(``U8\*('' is chosen to be two characters,
 to permit it to be used by applications that use ncurses'
 termcap interface.
-.SS NCURSES_TRACE
+.SS \fINCURSES_TRACE\fP
 During initialization, the \fBncurses\fP debugging library
-checks the NCURSES_TRACE environment variable.
+checks the \fI\%NCURSES_TRACE\fP environment variable.
 If it is defined, to a numeric value, \fBncurses\fP calls the \fBtrace\fP
 function, using that value as the argument.
 .PP
@@ -1099,38 +1106,38 @@ When running with traces enabled, your application will write the
 file \fBtrace\fP to the current directory.
 .PP
 See \fBcurs_trace\fP(3X) for more information.
-.SS TERM
+.SS \fITERM\fP
 Denotes your terminal type.
 Each terminal type is distinct, though many are similar.
 .PP
-\fBTERM\fP is commonly set by terminal emulators to help
+\fITERM\fP is commonly set by terminal emulators to help
 applications find a workable terminal description.
 Some of those choose a popular approximation, e.g.,
 \*(``ansi\*('', \*(``vt100\*('', \*(``xterm\*('' rather than an exact fit.
 Not infrequently, your application will have problems with that approach,
 e.g., incorrect function-key definitions.
 .PP
-If you set \fBTERM\fP in your environment,
+If you set \fITERM\fP in your environment,
 it has no effect on the operation of the terminal emulator.
 It only affects the way applications work within the terminal.
 Likewise, as a general rule (\fBxterm\fP(1) being a rare exception),
 terminal emulators which allow you to
-specify \fBTERM\fP as a parameter or configuration value do
+specify \fITERM\fP as a parameter or configuration value do
 not change their behavior to match that setting.
-.SS TERMCAP
+.SS \fITERMCAP\fP
 If the \fBncurses\fP library has been configured with \fItermcap\fP
 support, \fBncurses\fP will check for a terminal's description in
 termcap form if it is not available in the terminfo database.
 .PP
-The \fBTERMCAP\fP environment variable contains
+The \fI\%TERMCAP\fP environment variable contains
 either a terminal description (with newlines stripped out),
 or a file name telling where the information denoted by
-the \fBTERM\fP environment variable exists.
+the \fITERM\fP environment variable exists.
 In either case, setting it directs \fBncurses\fP to ignore
 the usual place for this information, e.g., /etc/termcap.
-.SS TERMINFO
+.SS \fITERMINFO\fP
 \fBncurses\fP can be configured to read from multiple terminal databases.
-The \fBTERMINFO\fP variable overrides the location for
+The \fI\%TERMINFO\fP variable overrides the location for
 the default terminal database.
 Terminal descriptions (in terminal format) are stored in terminal databases:
 .bP
@@ -1138,7 +1145,8 @@ Normally these are stored in a directory tree,
 using subdirectories named by the first letter of the terminal names therein.
 .IP
 This is the scheme used in System V, which legacy Unix systems use,
-and the \fBTERMINFO\fP variable is used by \fIcurses\fP applications on those
+and the \fI\%TERMINFO\fP variable is used by \fIcurses\fP applications
+on those
 systems to override the default location of the terminal database.
 .IP \(bu 4
 If \fBncurses\fP is built to use hashed databases,
@@ -1170,7 +1178,7 @@ rather than using the terminfo library calls.
 If \fBncurses\fP is built with a support for reading termcap files
 directly, then an entry in this list may be the path of a termcap file.
 .IP \(bu 4
-If the \fBTERMINFO\fP variable begins with
+If the \fI\%TERMINFO\fP variable begins with
 \*(``hex:\*('' or \*(``b64:\*('',
 \fBncurses\fP uses the remainder of that variable as a compiled terminal
 description.
@@ -1185,10 +1193,10 @@ export TERMINFO
 .RE
 .PP
 The compiled description is used if it corresponds to the terminal identified
-by the \fBTERM\fP variable.
+by the \fITERM\fP variable.
 .RE
 .PP
-Setting \fBTERMINFO\fP is the simplest,
+Setting \fI\%TERMINFO\fP is the simplest,
 but not the only way to set location of the default terminal database.
 The complete list of database locations in order follows:
 .RS 3
@@ -1196,36 +1204,36 @@ The complete list of database locations in order follows:
 the last terminal database to which \fBncurses\fP wrote,
 if any, is searched first
 .bP
-the location specified by the TERMINFO environment variable
+the location specified by the \fI\%TERMINFO\fP environment variable
 .bP
 $HOME/.terminfo
 .bP
-locations listed in the TERMINFO_DIRS environment variable
+locations listed in the \fI\%TERMINFO_DIRS\fP environment variable
 .bP
 one or more locations whose names are configured and compiled into the
 ncurses library, i.e.,
 .RS 3
 .bP
-@TERMINFO_DIRS@ (corresponding to the TERMINFO_DIRS variable)
+@TERMINFO_DIRS@ (corresponding to the \fI\%TERMINFO_DIRS\fP variable)
 .bP
-@TERMINFO@ (corresponding to the TERMINFO variable)
+@TERMINFO@ (corresponding to the \fITERMINFO\fP variable)
 .RE
 .RE
-.SS TERMINFO_DIRS
+.SS \fITERMINFO_DIRS\fP
 Specifies a list of locations to search for terminal descriptions.
 Each location in the list is a terminal database as described in
-the section on the \fBTERMINFO\fP variable.
+the section on the \fI\%TERMINFO\fP variable.
 The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 .PP
 There is no corresponding feature in System V terminfo;
 it is an extension developed for \fBncurses\fP.
-.SS TERMPATH
-If \fBTERMCAP\fP does not hold a file name then \fBncurses\fP checks
-the \fBTERMPATH\fP environment variable.
+.SS \fITERMPATH\fP
+If \fI\%TERMCAP\fP does not hold a file name then \fBncurses\fP checks
+the \fI\%TERMPATH\fP environment variable.
 This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
 semicolons on OS/2 EMX.
 .PP
-If the \fBTERMPATH\fP environment variable is not set,
+If the \fI\%TERMPATH\fP environment variable is not set,
 \fBncurses\fP looks in the files
 .PP
 .RS 4
@@ -1385,7 +1393,7 @@ but it is sometimes useful to configure this in the shared library.
 Configure scripts should check for the function's existence rather
 than assuming it is always in the debug library.
 .SH FILES
-.TP 5
+.TP
 .I @DATADIR@/tabset
 tab stop initialization database
 .TP
@@ -1401,7 +1409,7 @@ inclusion of \fI\%curses.h\fP.
 .SH EXTENSIONS
 The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
 that falls back to the old-style /etc/termcap file if the terminal setup code
-cannot find a terminfo entry corresponding to \fBTERM\fP.
+cannot find a terminfo entry corresponding to \fITERM\fP.
 Use of this feature
 is not recommended, as it essentially includes an entire termcap compiler in
 the \fBncurses\fP startup code, at significant cost in core and startup cycles.
@@ -1597,9 +1605,6 @@ directly to provide a portable interface.
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
 .SH SEE ALSO
-\fB\%terminfo\fP(5) and related pages whose names begin
-\*(``curs_\*('' for detailed routine descriptions.
-.br
-\fB\%curs_variables\fP(3X)
-.br
-\fB\%user_caps\fP(5) for user-defined capabilities
+\fB\%curs_variables\fP(3X),
+\fB\%terminfo\fP(5),
+\fB\%user_caps\fP(5)
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index f07a63dc1..9b21b819e 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.51 2023/11/25 14:26:30 tom Exp $
-.TH resizeterm 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.53 2023/12/02 20:49:04 tom Exp $
+.TH resizeterm 3X 2023-12-02 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -153,7 +153,7 @@ directly from a signal handler is unsafe.
 This indirect method is used to provide a safe way to resize the \fIncurses\fP
 data structures.
 .PP
-If the environment variables \fB\%LINES\fP or \fB\%COLUMNS\fP are set,
+If the environment variables \fILINES\fP or \fI\%COLUMNS\fP are set,
 this overrides the library's use of the window size obtained from
 the operating system.
 Thus, even if a \fB\%SIGWINCH\fP is received,
diff --git a/man/term.5 b/man/term.5
index 9c8852049..000a9da40 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.65 2023/11/25 22:58:12 tom Exp $
-.TH term 5 2023-11-25 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.67 2023/12/02 20:49:04 tom Exp $
+.TH term 5 2023-12-02 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -91,9 +91,9 @@ If built to write hashed databases,
 but cannot write entries into the directory tree.
 It can write (or rewrite) entries in the hashed database.
 .IP
-\fBncurses\fP distinguishes the two cases in the TERMINFO and TERMINFO_DIRS
-environment variable by assuming a directory tree for entries that
-correspond to an existing directory,
+\fBncurses\fP distinguishes the two cases in the \fI\%TERMINFO\fP and
+\fI\%TERMINFO_DIRS\fP environment variable by assuming a directory tree
+for entries that correspond to an existing directory,
 and hashed database otherwise.
 .SS LEGACY STORAGE FORMAT
 The format has been chosen so that it will be the same on all hardware.
diff --git a/man/term.7 b/man/term.7
index 03fadc604..503bd7810 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.44 2023/11/25 17:20:42 tom Exp $
-.TH term 7 2023-11-25 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.46 2023/12/02 20:51:25 tom Exp $
+.TH term 7 2023-12-02 "ncurses 6.4" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,12 +46,13 @@ term \-
 conventions for naming terminal types
 .\"SH SYNOPSIS
 .SH DESCRIPTION
-The environment variable \fBTERM\fP should normally contain the type name of
-the terminal, console or display-device type you are using.
+The environment variable \fITERM\fP should normally contain the type
+name of the terminal,
+console or display-device type you are using.
 This information
 is critical for all screen-oriented programs, including your editor and mailer.
 .PP
-A default \fBTERM\fP value will be set on a per-line basis by either
+A default \fITERM\fP value will be set on a per-line basis by either
 \fB/etc/inittab\fP (e.g., System\-V-like Unices)
 or \fB/etc/ttys\fP (BSD Unices).
 This will nearly always suffice for workstation and microcomputer consoles.
@@ -62,22 +63,23 @@ like \*(``dumb\*('' or \*(``dialup\*('' on dialup lines.
 Newer ones may pre-set \*(``vt100\*('', reflecting the prevalence of DEC
 VT100-compatible terminals and personal-computer emulators.
 .PP
-Modern telnets pass your \fBTERM\fP environment variable from the local side to
-the remote one.
+Modern telnets pass your \fITERM\fP environment variable from the local
+side to the remote one.
 There can be problems if the remote terminfo or termcap entry
 for your type is not compatible with yours, but this situation is rare and
 can almost always be avoided by explicitly exporting \*(``vt100\*(''
 (assuming you are in fact using a VT100-superset console,
 terminal, or terminal emulator).
 .PP
-In any case, you are free to override the system \fBTERM\fP setting to your
-taste in your shell profile.
+In any case, you are free to override the system \fITERM\fP setting to
+your taste in your shell profile.
 The \fB@TSET@\fP(1) utility may be of assistance;
 you can give it a set of rules for deducing or requesting a terminal type based
 on the tty device and baud rate.
 .PP
-Setting your own \fBTERM\fP value may also be useful if you have created a
-custom entry incorporating options (such as visual bell or reverse-video)
+Setting your own \fITERM\fP value may also be useful if you have created
+a custom entry incorporating options
+(such as visual bell or reverse-video)
 which you wish to override the system default type for your line.
 .PP
 Terminal type descriptions are stored as files of capability data underneath
@@ -105,8 +107,11 @@ terminfo knows a terminal,
 separated by \*(``|\*('' (pipe-bar) characters with the last
 name field terminated by a comma.
 The first name field is the type's
-\fIprimary name\fP, and is the one to use when setting \fBTERM\fP.  The last
-name field (if distinct from the first) is actually a description of the
+\fIprimary name\fP,
+and is the one to use when setting \fITERM\fP.
+The last name field
+(if distinct from the first)
+is actually a description of the
 terminal type (it may contain blanks; the others must be single words).
 Name
 fields between the first and last (if present) are aliases for the terminal,
@@ -213,16 +218,16 @@ are distinguished by using embedded plus signs rather than dashes.
 Commands which use a terminal type to control display often accept a \-T
 option that accepts a terminal name argument.
 Such programs should fall back
-on the \fBTERM\fP environment variable when no \-T option is specified.
+on the \fITERM\fP environment variable when no \-T option is specified.
 .SH FILES
-.TP 5
+.TP
 .I \*d
 compiled terminal description database
-.TP 5
-/etc/inittab
+.TP
+.I /etc/inittab
 tty line initialization (AT&T-like Unices)
-.TP 5
-/etc/ttys
+.TP
+.I /etc/ttys
 tty line initialization (BSD-like Unices)
 .SH PORTABILITY
 For maximum compatibility with older System V Unices, names and aliases
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 267a104d5..3560a461f 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.135 2023/11/25 14:32:36 tom Exp $
+.\" $Id: terminfo.tail,v 1.137 2023/12/03 00:17:23 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -261,13 +261,14 @@ The environment variable \fBTERMINFO\fR is checked first, for
 a terminal database containing the terminal description.
 .bP
 Next,
-\fBncurses\fP looks in \fB$HOME/.terminfo\fP
+\fBncurses\fP looks in \fI$HOME/.terminfo\fP
 for a compiled description.
 .IP
 This is an optional feature which may be omitted entirely from
 the library, or limited to prevent accidental use by privileged applications.
 .bP
-Next, if the environment variable \fBTERMINFO_DIRS\fR is set,
+Next,
+if the environment variable \fI\%TERMINFO_DIRS\fP is set,
 \fBncurses\fP interprets the contents of that variable
 as a list of colon-separated pathnames of terminal databases to be searched.
 .IP
@@ -296,8 +297,10 @@ The preceding addresses the usual configuration of \fBncurses\fP,
 which uses terminal descriptions prepared in \fIterminfo\fP format.
 While \fItermcap\fP is less expressive,
 \fBncurses\fP can also be configured to read \fItermcap\fP descriptions.
-In that configuration, it checks the \fBTERMCAP\fP and \fBTERMPATH\fP
-variables (for content and search path, respectively)
+In that configuration,
+it checks the \fI\%TERMCAP\fP and \fI\%TERMPATH\fP variables
+(for content and search path,
+respectively)
 after the system terminal database.
 .SS Preparing Descriptions
 We now outline how to prepare descriptions of terminals.
@@ -1984,7 +1987,7 @@ termcap library truncates long entries, like OSF/1 3.0, it is immune to dying
 here but will return incorrect data for the terminal.
 .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
+above, but only for people who actually set \fITERM\fP to that terminal
 type, since \fBtgetent\fP only does \*(``tc\*('' expansion once it is found the
 terminal type it was looking for, not while searching.
 .PP
@@ -1993,7 +1996,7 @@ 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
+terminal types and users whose \fITERM\fP variable does not have a termcap
 entry.
 .PP
 When in \-C (translate to termcap) mode, the \fBncurses\fP implementation of
@@ -2012,7 +2015,7 @@ adding extension capabilities to the string table that
 collide with subsequent System V and XSI Curses extensions.
 .SH EXTENSIONS
 Searching for terminal descriptions in
-\fB$HOME/.terminfo\fP and TERMINFO_DIRS
+\fI$HOME/.terminfo\fP and \fI\%TERMINFO_DIRS\fP
 is not supported by older implementations.
 .PP
 Some SVr4 \fBcurses\fP implementations, and all previous to SVr4, do not
diff --git a/man/tic.1m b/man/tic.1m
index 4f5827380..b9a50b37e 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.101 2023/11/25 23:02:52 tom Exp $
-.TH @TIC@ 1M 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.103 2023/12/02 20:50:53 tom Exp $
+.TH @TIC@ 1M 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -116,22 +116,22 @@ There are two ways to achieve this:
 .bP
 First, you may override the system default either by
 using the \fB\-o\fP option,
-or by setting the variable \fBTERMINFO\fP
+or by setting the variable \fI\%TERMINFO\fP
 in your shell environment to a valid database location.
 .bP
 Secondly, if \fB@TIC@\fP cannot write in \fI\*d\fP
-or the location specified using your TERMINFO variable,
+or the location specified using your \fI\%TERMINFO\fP variable,
 it looks for the directory \fI$HOME/.terminfo\fP
 (or hashed database \fI$HOME/.terminfo.db)\fP;
 if that location exists, the entry is placed there.
 .PP
 Libraries that read terminfo entries are expected to check in succession
 .bP
-a location specified with the TERMINFO environment variable,
+a location specified with the \fI\%TERMINFO\fP environment variable,
 .bP
 \fI$HOME/.terminfo\fP,
 .bP
-directories listed in the TERMINFO_DIRS environment variable,
+directories listed in the \fI\%TERMINFO_DIRS\fP environment variable,
 .bP
 a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
@@ -264,7 +264,7 @@ obsolete capabilities.
 .TP
 \fB\-o\fIdir\fR
 Write compiled entries to given database location.
-Overrides the TERMINFO environment variable.
+Overrides the \fI\%TERMINFO\fP environment variable.
 .TP
 \fB\-Q\fIn\fR
 Rather than show source in terminfo (text) format,
@@ -461,8 +461,11 @@ termcap names taken to be equivalent to terminfo names.
 The SVr4 manual pages are not clear on the resolution rules for \fBuse\fP
 capabilities.
 This implementation of \fB@TIC@\fP will find \fBuse\fP targets anywhere
-in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fP (if
-\fBTERMINFO\fP is defined),
+in the source file,
+or anywhere in the file tree rooted at
+\fI\%TERMINFO\fP
+(if
+\fI\%TERMINFO\fP is defined),
 or in the user's \fI$HOME/.terminfo\fP database
 (if it exists),
 or (finally) anywhere in the system's file tree of
@@ -512,12 +515,13 @@ as @INFOCMP@'s \fB\-e\fP and \fB\-E\fP options).
 The SVr4 \fB\-c\fP mode does not report bad \*(``use=\*('' links.
 .PP
 System V does not compile entries to or read entries from your
-\fI$HOME/.terminfo\fP database unless TERMINFO is explicitly set to it.
+\fI$HOME/.terminfo\fP database unless \fI\%TERMINFO\fP is explicitly set
+to it.
 .SH PORTABILITY
 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 Tru64 UNIX.
+The change history states that the description is derived from Tru64.
 According to its manual pages, that system also supported the \fB\-v\fP option.
 .PP
 Shortly after Issue 7 was released, Tru64 was discontinued.
@@ -562,8 +566,8 @@ extend the \fIpcurses\fP table to 469 capabilities
 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)).
+\fB\%memory_lock_above\fP and
+\fB\%memory_unlock\fP (see \fB\%user_caps\fP(5)).
 .PP
 Eric Raymond incorporated parts of \fImytinfo\fP into ncurses
 to implement the termcap-to-terminfo source conversion,
diff --git a/man/toe.1m b/man/toe.1m
index 14b09a057..0a462b9dd 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.56 2023/11/25 14:32:36 tom Exp $
-.TH @TOE@ 1M 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.58 2023/12/02 20:49:04 tom Exp $
+.TH @TOE@ 1M 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -162,8 +162,8 @@ The program's name originates with a developer's pun:
 .SH EXAMPLES
 When not sorting with the \fB\-s\fP option,
 the \fB\-a\fP option reports all of the names found in all of the
-terminal database directories named in the \fB\%TERMINFO\fP and
-\fB\%TERMINFO_DIRS\fP environment variables.
+terminal database directories named in the \fI\%TERMINFO\fP and
+\fI\%TERMINFO_DIRS\fP environment variables.
 .RS 4
 .PP
 .\" toe -a | grep -E '^(xterm|vt)'
diff --git a/man/tput.1 b/man/tput.1
index 40dfadc1c..a4da5d049 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.89 2023/11/25 14:32:36 tom Exp $
-.TH @TPUT@ 1 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.91 2023/12/02 20:49:04 tom Exp $
+.TH @TPUT@ 1 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,9 +114,9 @@ and how to interpret the parameters.
 indicates the \fItype\fP of terminal.
 Normally this option is
 unnecessary, because the default is taken from the environment
-variable \fBTERM\fP.
+variable \fITERM\fP.
 If \fB\-T\fP is specified, then the shell
-variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored.
+variables \fILINES\fP and \fI\%COLUMNS\fP will also be ignored.
 .TP
 \fB\-V\fP
 reports the version of ncurses which was used in this program, and exits.
@@ -171,8 +171,10 @@ file descriptor to use when updating settings.
 .TP
 (2)
 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),
+but the terminal description
+(or environment,
+e.g.,
+\fILINES\fP and \fI\%COLUMNS\fP variables specify this),
 update the operating system's notion of the window size.
 .TP
 (3)
@@ -292,8 +294,8 @@ then it asks the operating system for the terminal's size
 (which generally works, unless connecting via a serial line which
 does not support \fINAWS\fP: negotiations about window size).
 .bP
-finally, it inspects the environment variables \fBLINES\fP and \fBCOLUMNS\fP
-which may override the terminal size.
+finally, it inspects the environment variables \fILINES\fP and
+\fI\%COLUMNS\fP which may override the terminal size.
 .PP
 If the \fB\-T\fP option is given
 @TPUT@ ignores the environment variables by calling \fBuse_tioctl(TRUE)\fP,
@@ -544,14 +546,14 @@ were handled.
 .TP 5
 \fB@TPUT@ init\fP
 Initialize the terminal according to the type of
-terminal in the environmental variable \fBTERM\fP.  This
-command should be included in everyone's .profile after
-the environmental variable \fBTERM\fP has been exported, as
-illustrated on the \fBprofile\fP(5) manual page.
+terminal in the environmental variable \fITERM\fP.
+This command should be included in everyone's .profile after
+the environmental variable \fITERM\fP has been exported,
+as illustrated on the \fBprofile\fP(5) manual page.
 .TP 5
 \fB@TPUT@ \-T5620 reset\fP
 Reset an AT&T 5620 terminal, overriding the type of
-terminal in the environmental variable \fBTERM\fP.
+terminal in the environmental variable \fITERM\fP.
 .TP 5
 \fB@TPUT@ cup 0 0\fP
 Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
@@ -586,7 +588,7 @@ Send the terminfo string for cursor-movement, with no parameters substituted.
 \fB@TPUT@ longname\fP
 Print the long name from the \fBterminfo\fP database for the
 type of terminal specified in the environmental
-variable \fBTERM\fP.
+variable \fITERM\fP.
 .PP
 .RS 5
 \fB@TPUT@ \-S <<!\fP
diff --git a/man/tset.1 b/man/tset.1
index 5f8457870..ec9610932 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.75 2023/11/25 14:32:36 tom Exp $
-.TH @TSET@ 1 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.77 2023/12/02 20:52:24 tom Exp $
+.TH @TSET@ 1 2023-12-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,13 +81,13 @@ This determination is done as follows, using the first terminal type found.
 .PP
 1. The \fBterminal\fP argument specified on the command line.
 .PP
-2. The value of the \fBTERM\fP environmental variable.
+2. The value of the \fITERM\fP environmental variable.
 .PP
 3. (BSD systems only.) The terminal type associated with the standard
 error output device in the \fI/etc/ttys\fP file.
-(On System\-V-like Unices and systems using that convention,
+(On System\ V hosts and systems using that convention,
 \fBgetty\fP(1) does this job by setting
-\fBTERM\fP according to the type passed to it by \fI/etc/inittab\fP.)
+\fITERM\fP according to the type passed to it by \fI\%/etc/inittab\fP.)
 .PP
 4. The default terminal type, \*(``unknown\*('',
 is not suitable for curses applications.
@@ -111,8 +111,10 @@ 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),
+but the terminal description
+(or environment,
+e.g.,
+\fILINES\fP and \fI\%COLUMNS\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,
@@ -162,8 +164,8 @@ This is done using the \fB\-s\fP option.
 .PP
 When the \fB\-s\fP option is specified, the commands to enter the information
 into the shell's environment are written to the standard output.
-If
-the \fBSHELL\fP environmental variable ends in \*(``csh\*('', the commands
+If the \fISHELL\fP environmental variable ends in \*(``csh\*('',
+the commands
 are for \fBcsh\fP, otherwise, they are for \fBsh\fP(1).
 Note, the \fBcsh\fP commands set and unset the shell variable
 \fBnoglob\fP, leaving it unset.
@@ -175,7 +177,7 @@ or \fB.profile\fP files will initialize the environment correctly:
 .SS "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
-\fI/etc/ttys\fP file or the \fBTERM\fP environmental variable is often
+\fI/etc/ttys\fP file or the \fITERM\fP environmental variable is often
 something generic like \fBnetwork\fP, \fBdialup\fP, or \fBunknown\fP.
 When \fB@TSET@\fP is used in a startup script it is often desirable to
 provide information about the type of terminal used on such ports.
@@ -271,7 +273,7 @@ Print the terminal type to the standard error output.
 .TP
 .B \-s
 Print the sequence of shell commands to initialize the environment variable
-\fBTERM\fP to the standard output;
+\fITERM\fP to the standard output;
 see subsection \*(``Setting the Environment\*(''.
 .TP
 .B \-V
@@ -291,22 +293,22 @@ If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed.
 .SH ENVIRONMENT
 The \fB@TSET@\fP command uses these environment variables:
 .TP 5
-SHELL
-tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP(1) or
+.I SHELL
+tells \fB@TSET@\fP whether to initialize \fITERM\fP using \fBsh\fP(1) or
 \fBcsh\fP(1) syntax.
 .TP 5
-TERM
+.I TERM
 Denotes your terminal type.
 Each terminal type is distinct, though many are similar.
 .TP 5
-TERMCAP
+.I TERMCAP
 may denote the location of a termcap database.
 If it is not an absolute pathname, e.g., begins with a \*(``/\*('',
 \fB@TSET@\fP removes the variable from the environment before looking
 for the terminal description.
 .SH FILES
-.TP 5
-/etc/ttys
+.TP
+.I /etc/ttys
 system port name to terminal type mapping database (BSD versions only).
 .TP
 .I \*d
@@ -324,21 +326,24 @@ However, each of those systems still provides \fBtset\fP.
 In fact, the commonly-used \fBreset\fP utility
 is always an alias for \fBtset\fP.
 .PP
-The \fB@TSET@\fP utility provides for backward-compatibility with BSD
-environments (under most modern Unices, \fB/etc/inittab\fP and \fBgetty\fP(1)
-can set \fBTERM\fP appropriately for each dial-up line; this obviates what was
-\fB@TSET@\fP's most important use).
-This implementation behaves like 4.4BSD
-\fBtset\fP, with a few exceptions specified here.
+The \fB\%@TSET@\fP utility provides backward compatibility with BSD
+environments;
+under most modern Unices,
+\fI\%/etc/inittab\fP and \fBgetty\fP(1) can set \fITERM\fP appropriately
+for each dial-up line,
+obviating what was \fB\%@TSET@\fP's most important use.
+This implementation behaves like 4.4BSD \fBtset\fP,
+with a few exceptions we shall consider now.
 .PP
 A few options are different
-because the \fBTERMCAP\fP variable
+because the \fI\%TERMCAP\fP variable
 is no longer supported under terminfo-based \fBncurses\fP:
 .bP
 The \fB\-S\fP option of BSD \fBtset\fP no longer works;
 it prints an error message to the standard error and dies.
 .bP
-The \fB\-s\fP option only sets \fBTERM\fP, not \fBTERMCAP\fP.
+The \fB\-s\fP option only sets \fITERM\fP,
+not \fI\%TERMCAP\fP.
 .PP
 There was an undocumented 4.4BSD feature
 that invoking \fBtset\fP via a link named
@@ -385,7 +390,7 @@ size from the operating system.
 In ncurses, \fB@TSET@\fP obtains the window size using
 \fBsetupterm\fP, which may be from
 the operating system,
-the \fBLINES\fP and \fBCOLUMNS\fP environment variables or
+the \fILINES\fP and \fICOLUMNS\fP environment variables or
 the terminal description.
 .PP
 Obtaining the window size from the terminal description is common to
@@ -394,7 +399,8 @@ Its only practical use is for hardware terminals.
 Generally speaking, a window size would be unset only if there were
 some problem obtaining the value from the operating system
 (and \fBsetupterm\fP would still fail).
-For that reason, the \fBLINES\fP and \fBCOLUMNS\fP environment variables
+For that reason,
+the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 may be useful for working around window-size problems.
 Those have the drawback that if the window is resized,
 those variables must be recomputed and reassigned.
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index d9ee4e0f9..7a9f70878 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231125) unstable; urgency=low
+ncurses6 (6.4+20231202) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index d9ee4e0f9..7a9f70878 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231125) unstable; urgency=low
+ncurses6 (6.4+20231202) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 652ad4bdf..49ea84260 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231125) unstable; urgency=low
+ncurses6 (6.4+20231202) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Nov 2023 20:18:34 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index a9a653765..3a0a0908d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.619 2023/11/23 01:18:34 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.621 2023/12/02 21:47:07 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1125"
+!define VERSION_MMDD  "1202"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0cb72faec..a2efa4010 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231125
+Release: 20231202
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b015ae6c1..59cf32e9d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231125
+Release: 20231202
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index be1baa164..7e0482af7 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231125
+Release: 20231202
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 817845502..69a6483d5 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.158 2023/11/11 18:25:52 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.159 2023/12/02 17:29:01 tom Exp $")
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -1865,8 +1865,16 @@ main(int argc, char *argv[])
 	}
 
 #if NCURSES_XNAMES
-	if (termcount > 1)
-	    _nc_align_termtype(&entries[0].tterm, &entries[1].tterm);
+	if (termcount > 1) {
+	    /*
+	     * User-defined capabilities in different terminal descriptions
+	     * may have the same name/type but different indices.  Line up
+	     * the names to use comparable indices.  We may have more than two
+	     * entries to compare when processing the "-u" option.
+	     */
+	    for (c = 1; c < termcount; ++c)
+		_nc_align_termtype(&entries[c].tterm, &entries[0].tterm);
+	}
 #endif
 
 	/* dump as C initializer for the terminal type */
diff --git a/test/programs b/test/programs
index 4e7e7f43e..16ecf8103 100644
--- a/test/programs
+++ b/test/programs
@@ -1,6 +1,6 @@
-# $Id: programs,v 1.56 2023/11/10 11:48:38 tom Exp $
+# $Id: programs,v 1.57 2023/11/10 11:48:38 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
 # Copyright 2006-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #

From 96215ad139a0602246edf4536f49a202789b46fd Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 10 Dec 2023 00:35:22 +0100
Subject: [PATCH 044/106] ncurses-6.4-20231209.patch

---
 Ada95/aclocal.m4                 |   44 +-
 Ada95/configure                  |  643 +++----
 NEWS                             |   11 +-
 VERSION                          |    2 +-
 aclocal.m4                       |  144 +-
 configure                        | 2750 +++++++++++++++---------------
 configure.in                     |    6 +-
 dist.mk                          |    4 +-
 man/make_sed.sh                  |    7 +-
 misc/terminfo.src                |   16 +-
 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/infocmp.c                  |   32 +-
 test/aclocal.m4                  |   14 +-
 test/configure                   |  720 ++++----
 20 files changed, 2248 insertions(+), 2167 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 93c7fb54a..50df70fb8 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.206 2023/11/23 01:48:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.207 2023/12/04 00:09:59 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -901,7 +901,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -936,6 +936,7 @@ AC_TRY_COMPILE(
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
 		[
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -961,7 +962,7 @@ esac
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -996,6 +997,7 @@ AC_TRY_COMPILE(
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
 		[
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -2325,7 +2327,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48
+dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
@@ -2359,11 +2361,15 @@ ifdef([AC_FUNC_FSEEKO],[
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include <sys/types.h>
 #include <dirent.h>
+
+#ifndef __REDIRECT
+/* if transitional largefile support is setup, this is true */
+extern struct dirent64 * readdir(DIR *);
+#endif
 		],[
-		/* if transitional largefile support is setup, this is true */
-		extern struct dirent64 * readdir(DIR *);
-		struct dirent64 *x = readdir((DIR *)0);
-		struct dirent *y = readdir((DIR *)0);
+		DIR *dp = opendir(".");
+		struct dirent64 *x = readdir(dp);
+		struct dirent *y = readdir(dp);
 		int z = x - y;
 		(void)z;
 		],
@@ -2594,7 +2600,7 @@ AC_DEFUN([CF_LIB_TYPE],
 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30
+dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10
 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
@@ -2616,17 +2622,21 @@ EOF
 	rm -f conftest.$ac_ext data.o
 	cat >conftest.$ac_ext <<EOF
 #line __oline__ "configure"
+extern int testfunc(void);
+#if defined(NeXT)
 int	testfunc(void)
 {
-#if defined(NeXT)
 	${cf_cv_main_return:-return}(1);	/* I'm told this linker is broken */
+}
 #else
-	extern int testdata[[3]];
+extern int testdata[[3]];
+int	testfunc(void)
+{
 	return testdata[[0]] == 123
 	   &&  testdata[[1]] == 456
 	   &&  testdata[[2]] == 789;
-#endif
 }
+#endif
 EOF
 	if AC_TRY_EVAL(ac_compile); then
 		mv conftest.o func.o && \
@@ -2637,9 +2647,9 @@ EOF
 	cf_saveLIBS="$LIBS"
 	LIBS="conftest.a $LIBS"
 	AC_TRY_RUN([
+	extern int testfunc(void);
 	int main(void)
 	{
-		extern int testfunc();
 		${cf_cv_main_return:-return} (!testfunc());
 	}
 	],
@@ -2851,7 +2861,7 @@ fi
 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: 12 updated: 2023/01/05 17:53:11
+dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50
 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).
@@ -2866,7 +2876,7 @@ $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -3973,7 +3983,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
+dnl CF_SHARED_OPTS version: 109 updated: 2023/12/03 09:21:34
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4063,7 +4073,7 @@ AC_DEFUN([CF_SHARED_OPTS],
 		for CC_SHARED_OPTS in -fPIC -fpic ''
 		do
 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
-			AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[])
+			AC_TRY_COMPILE([#include <stdio.h>],[int x = 1; (void)x],[break],[])
 		done
 		AC_MSG_RESULT($CC_SHARED_OPTS)
 		CFLAGS="$cf_save_CFLAGS"
diff --git a/Ada95/configure b/Ada95/configure
index f9eebcf4a..27b6afa52 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -11808,7 +11808,7 @@ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
 int
 main (void)
 {
-int x = 1
+int x = 1; (void)x
   ;
   return 0;
 }
@@ -15060,14 +15060,18 @@ else
 #include <sys/types.h>
 #include <dirent.h>
 
+#ifndef __REDIRECT
+/* if transitional largefile support is setup, this is true */
+extern struct dirent64 * readdir(DIR *);
+#endif
+
 int
 main (void)
 {
 
-		/* if transitional largefile support is setup, this is true */
-		extern struct dirent64 * readdir(DIR *);
-		struct dirent64 *x = readdir((DIR *)0);
-		struct dirent *y = readdir((DIR *)0);
+		DIR *dp = opendir(".");
+		struct dirent64 *x = readdir(dp);
+		struct dirent *y = readdir(dp);
 		int z = x - y;
 		(void)z;
 
@@ -15076,16 +15080,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15082: \$? = $ac_status" >&5
+  echo "$as_me:15086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15088: \$? = $ac_status" >&5
+  echo "$as_me:15092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15096,7 +15100,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15099: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15103: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15106,7 +15110,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15109: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15113: 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.
@@ -15116,7 +15120,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15119: result: $with_rcs_ids" >&5
+echo "$as_me:15123: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15126,7 +15130,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15129: checking if you want to build with function extensions" >&5
+echo "$as_me:15133: 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.
@@ -15136,7 +15140,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15139: result: $with_ext_funcs" >&5
+echo "$as_me:15143: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15154,7 +15158,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15157: checking for extended use of const keyword" >&5
+echo "$as_me:15161: 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.
@@ -15164,7 +15168,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15167: result: $with_ext_const" >&5
+echo "$as_me:15171: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15174,7 +15178,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15177: checking if you want all development code" >&5
+echo "$as_me:15181: 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.
@@ -15184,7 +15188,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15187: result: $with_develop" >&5
+echo "$as_me:15191: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15193,7 +15197,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15196: checking if you want to link with the pthread library" >&5
+echo "$as_me:15200: 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.
@@ -15203,27 +15207,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15206: result: $with_pthread" >&5
+echo "$as_me:15210: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15210: checking for pthread.h" >&5
+	echo "$as_me:15214: 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 15216 "configure"
+#line 15220 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15226: \$? = $ac_status" >&5
+  echo "$as_me:15230: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15242,7 +15246,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15245: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15249: 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
 
@@ -15252,7 +15256,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15255: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15259: 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"
 
@@ -15273,7 +15277,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15276 "configure"
+#line 15280 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15290,16 +15294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15296: \$? = $ac_status" >&5
+  echo "$as_me:15300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15302: \$? = $ac_status" >&5
+  echo "$as_me:15306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15309,7 +15313,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15312: result: $with_pthread" >&5
+	    echo "$as_me:15316: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15337,7 +15341,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15340: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15344: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15346,7 +15350,7 @@ fi
 
 fi
 
-echo "$as_me:15349: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15353: 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.
@@ -15356,18 +15360,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15359: result: $use_weak_symbols" >&5
+echo "$as_me:15363: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15363: checking if $CC supports weak symbols" >&5
+echo "$as_me:15367: 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 15370 "configure"
+#line 15374 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15393,16 +15397,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15399: \$? = $ac_status" >&5
+  echo "$as_me:15403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15405: \$? = $ac_status" >&5
+  echo "$as_me:15409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15413,7 +15417,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15416: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15420: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15442,13 +15446,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15445: checking for _nc_TABSIZE" >&5
+echo "$as_me:15449: 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 15451 "configure"
+#line 15455 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15479,16 +15483,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15485: \$? = $ac_status" >&5
+  echo "$as_me:15489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15491: \$? = $ac_status" >&5
+  echo "$as_me:15495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15498,7 +15502,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15501: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15505: 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
@@ -15510,7 +15514,7 @@ fi
 # 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:15513: checking if you want experimental reentrant code" >&5
+echo "$as_me:15517: 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.
@@ -15520,7 +15524,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15523: result: $with_reentrant" >&5
+echo "$as_me:15527: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15543,7 +15547,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15546: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15550: 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.
@@ -15553,7 +15557,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15556: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15560: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15567,7 +15571,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15570: checking if you want to see long compiling messages" >&5
+echo "$as_me:15574: 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.
@@ -15601,10 +15605,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15604: result: $enableval" >&5
+echo "$as_me:15608: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15607: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15611: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15621,17 +15625,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15624: result: $enable_stdnoreturn" >&5
+echo "$as_me:15628: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15628: checking for C11 _Noreturn feature" >&5
+echo "$as_me:15632: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15634 "configure"
+#line 15638 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15647,16 +15651,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15653: \$? = $ac_status" >&5
+  echo "$as_me:15657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15659: \$? = $ac_status" >&5
+  echo "$as_me:15663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -15667,7 +15671,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15670: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:15674: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -15723,16 +15727,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15726: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15730: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15731: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15735: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15739: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15771,16 +15775,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15774: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15778: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15779: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15783: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15783: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15787: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15819,23 +15823,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15822: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15826: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15827: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15831: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15831: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15835: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:15838: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:15842: 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.
@@ -15852,7 +15856,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:15855: result: $enable_warnings" >&5
+echo "$as_me:15859: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -15876,7 +15880,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15879 "configure"
+#line 15883 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15891,28 +15895,29 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15897: \$? = $ac_status" >&5
+  echo "$as_me:15901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15903: \$? = $ac_status" >&5
+  echo "$as_me:15907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:15906: checking for X11/Xt const-feature" >&5
+echo "$as_me:15910: 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 15913 "configure"
+#line 15917 "configure"
 #include "confdefs.h"
 
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -15927,16 +15932,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15933: \$? = $ac_status" >&5
+  echo "$as_me:15938: \$? = $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:15941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15939: \$? = $ac_status" >&5
+  echo "$as_me:15944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -15951,7 +15956,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15954: result: $cf_cv_const_x_string" >&5
+echo "$as_me:15959: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -15980,7 +15985,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 15983 "${as_me:-configure}"
+#line 15988 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -15996,7 +16001,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:15999: checking for $CC warning options..." >&5
+	{ echo "$as_me:16004: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16012,12 +16017,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16015: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16018: \$? = $ac_status" >&5
+  echo "$as_me:16023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16020: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16025: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16025,7 +16030,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16028: checking for $CC warning options..." >&5
+	{ echo "$as_me:16033: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16048,12 +16053,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16051: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16054: \$? = $ac_status" >&5
+  echo "$as_me:16059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16056: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16061: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16061,7 +16066,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16064: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16069: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16071,7 +16076,7 @@ echo "${as_me:-configure}:16064: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16074: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16079: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16104,10 +16109,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16107: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16112: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16110 "${as_me:-configure}"
+#line 16115 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16157,12 +16162,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16160: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16163: \$? = $ac_status" >&5
+  echo "$as_me:16168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16165: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16170: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16230,7 +16235,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16233: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16238: 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.
@@ -16240,7 +16245,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16243: result: $with_assertions" >&5
+echo "$as_me:16248: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16293,7 +16298,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16296: checking whether to add trace feature to all models" >&5
+echo "$as_me:16301: 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.
@@ -16303,7 +16308,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16306: result: $cf_with_trace" >&5
+echo "$as_me:16311: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16411,7 +16416,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16414: checking if we want to use GNAT projects" >&5
+echo "$as_me:16419: 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.
@@ -16428,21 +16433,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16431: result: $enable_gnat_projects" >&5
+echo "$as_me:16436: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16438: checking if ssp library is needed" >&5
+echo "$as_me:16443: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16445 "configure"
+#line 16450 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16459,16 +16464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16465: \$? = $ac_status" >&5
+  echo "$as_me:16470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16471: \$? = $ac_status" >&5
+  echo "$as_me:16476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16478,7 +16483,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16481 "configure"
+#line 16486 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16495,16 +16500,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16501: \$? = $ac_status" >&5
+  echo "$as_me:16506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16507: \$? = $ac_status" >&5
+  echo "$as_me:16512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16518,7 +16523,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16521: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16526: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16545,14 +16550,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:16548: checking for clock_gettime" >&5
+echo "$as_me:16553: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16555 "configure"
+#line 16560 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -16565,16 +16570,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16571: \$? = $ac_status" >&5
+  echo "$as_me:16576: \$? = $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:16579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16577: \$? = $ac_status" >&5
+  echo "$as_me:16582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16585,7 +16590,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16588: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16593: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -16596,13 +16601,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:16599: checking for gettimeofday" >&5
+echo "$as_me:16604: 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 16605 "configure"
+#line 16610 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16633,16 +16638,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16639: \$? = $ac_status" >&5
+  echo "$as_me:16644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16645: \$? = $ac_status" >&5
+  echo "$as_me:16650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -16652,7 +16657,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16655: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:16660: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -16662,7 +16667,7 @@ EOF
 
 else
 
-echo "$as_me:16665: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:16670: 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
@@ -16670,7 +16675,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16673 "configure"
+#line 16678 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16689,16 +16694,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16695: \$? = $ac_status" >&5
+  echo "$as_me:16700: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16701: \$? = $ac_status" >&5
+  echo "$as_me:16706: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -16709,7 +16714,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16712: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:16717: 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
 
@@ -16742,13 +16747,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:16745: checking for signed char" >&5
+echo "$as_me:16750: 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 16751 "configure"
+#line 16756 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16763,16 +16768,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16769: \$? = $ac_status" >&5
+  echo "$as_me:16774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16775: \$? = $ac_status" >&5
+  echo "$as_me:16780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -16782,10 +16787,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16785: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:16790: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:16788: checking size of signed char" >&5
+echo "$as_me:16793: 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
@@ -16794,7 +16799,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16797 "configure"
+#line 16802 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16806,21 +16811,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16812: \$? = $ac_status" >&5
+  echo "$as_me:16817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16818: \$? = $ac_status" >&5
+  echo "$as_me:16823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16823 "configure"
+#line 16828 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16832,16 +16837,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16838: \$? = $ac_status" >&5
+  echo "$as_me:16843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16844: \$? = $ac_status" >&5
+  echo "$as_me:16849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -16857,7 +16862,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16860 "configure"
+#line 16865 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16869,16 +16874,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16875: \$? = $ac_status" >&5
+  echo "$as_me:16880: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16881: \$? = $ac_status" >&5
+  echo "$as_me:16886: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -16894,7 +16899,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16897 "configure"
+#line 16902 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16906,16 +16911,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16912: \$? = $ac_status" >&5
+  echo "$as_me:16917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16918: \$? = $ac_status" >&5
+  echo "$as_me:16923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -16928,12 +16933,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16931: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16936: 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 16936 "configure"
+#line 16941 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16949,15 +16954,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16955: \$? = $ac_status" >&5
+  echo "$as_me:16960: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16960: \$? = $ac_status" >&5
+  echo "$as_me:16965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -16973,7 +16978,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:16976: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:16981: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -16982,13 +16987,13 @@ EOF
 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:16985: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:16990: 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 16991 "configure"
+#line 16996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17003,16 +17008,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17009: \$? = $ac_status" >&5
+  echo "$as_me:17014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17015: \$? = $ac_status" >&5
+  echo "$as_me:17020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17022,7 +17027,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17025: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17035,7 +17040,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17038: checking for opendir in -ldir" >&5
+  echo "$as_me:17043: 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
@@ -17043,7 +17048,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17046 "configure"
+#line 17051 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17062,16 +17067,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17068: \$? = $ac_status" >&5
+  echo "$as_me:17073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17074: \$? = $ac_status" >&5
+  echo "$as_me:17079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17082,14 +17087,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17085: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17090: 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:17092: checking for opendir in -lx" >&5
+  echo "$as_me:17097: 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
@@ -17097,7 +17102,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17100 "configure"
+#line 17105 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17116,16 +17121,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17122: \$? = $ac_status" >&5
+  echo "$as_me:17127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17128: \$? = $ac_status" >&5
+  echo "$as_me:17133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17136,7 +17141,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17139: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17144: 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"
@@ -17144,13 +17149,13 @@ fi
 
 fi
 
-echo "$as_me:17147: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17152: 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 17153 "configure"
+#line 17158 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17166,16 +17171,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17172: \$? = $ac_status" >&5
+  echo "$as_me:17177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17178: \$? = $ac_status" >&5
+  echo "$as_me:17183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17185,7 +17190,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17188: result: $ac_cv_header_time" >&5
+echo "$as_me:17193: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17203,13 +17208,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17206: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17211: 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 17212 "configure"
+#line 17217 "configure"
 #include "confdefs.h"
 
 int
@@ -17267,16 +17272,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17273: \$? = $ac_status" >&5
+  echo "$as_me:17278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17279: \$? = $ac_status" >&5
+  echo "$as_me:17284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17286,7 +17291,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17289: result: $ac_cv_c_const" >&5
+echo "$as_me:17294: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17298,7 +17303,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17301: checking if data-only library module links" >&5
+echo "$as_me:17306: 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
@@ -17306,36 +17311,40 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17309 "configure"
+#line 17314 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17312: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17317: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17315: \$? = $ac_status" >&5
+  echo "$as_me:17320: \$? = $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 <<EOF
-#line 17322 "configure"
+#line 17327 "configure"
+extern int testfunc(void);
+#if defined(NeXT)
 int	testfunc(void)
 {
-#if defined(NeXT)
 	${cf_cv_main_return:-return}(1);	/* I'm told this linker is broken */
+}
 #else
-	extern int testdata[3];
+extern int testdata[3];
+int	testfunc(void)
+{
 	return testdata[0] == 123
 	   &&  testdata[1] == 456
 	   &&  testdata[2] == 789;
-#endif
 }
+#endif
 EOF
-	if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17344: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17338: \$? = $ac_status" >&5
+  echo "$as_me:17347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17348,26 +17357,26 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17351 "configure"
+#line 17360 "configure"
 #include "confdefs.h"
 
+	extern int testfunc(void);
 	int main(void)
 	{
-		extern int testfunc();
 		${cf_cv_main_return:-return} (!testfunc());
 	}
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17365: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17370: \$? = $ac_status" >&5
+  echo "$as_me:17379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17382,7 +17391,7 @@ fi
 
 fi
 
-echo "$as_me:17385: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17394: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17401,23 +17410,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17404: checking for $ac_header" >&5
+echo "$as_me:17413: 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 17410 "configure"
+#line 17419 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17414: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17423: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17420: \$? = $ac_status" >&5
+  echo "$as_me:17429: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17436,7 +17445,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17439: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17446,7 +17455,7 @@ EOF
 fi
 done
 
-echo "$as_me:17449: checking for working mkstemp" >&5
+echo "$as_me:17458: 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
@@ -17457,14 +17466,14 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17460 "configure"
+#line 17469 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -17492,15 +17501,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17498: \$? = $ac_status" >&5
+  echo "$as_me:17507: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17503: \$? = $ac_status" >&5
+  echo "$as_me:17512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17515,16 +17524,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17518: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17527: 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:17521: checking for mkstemp" >&5
+	echo "$as_me:17530: 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 17527 "configure"
+#line 17536 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17555,16 +17564,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17561: \$? = $ac_status" >&5
+  echo "$as_me:17570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17567: \$? = $ac_status" >&5
+  echo "$as_me:17576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17574,7 +17583,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17577: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17586: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -17603,7 +17612,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:17606: checking for $ac_word" >&5
+echo "$as_me:17615: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17620,7 +17629,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:17623: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17632: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17632,10 +17641,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:17635: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:17644: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:17638: result: no" >&5
+  echo "$as_me:17647: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17645,7 +17654,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:17648: checking for $cf_prog_gnat version" >&5
+echo "$as_me:17657: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17656,7 +17665,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17659: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17668: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -17685,7 +17694,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:17688: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:17697: 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
@@ -17704,10 +17713,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:17707: result: $cf_gprconfig_value" >&5
+					echo "$as_me:17716: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:17710: result: missing" >&5
+					echo "$as_me:17719: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -17720,7 +17729,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:17723: checking for gnat version" >&5
+echo "$as_me:17732: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17731,7 +17740,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17734: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17743: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -17740,7 +17749,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:17743: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:17752: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -17748,7 +17757,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:17751: checking for $ac_word" >&5
+echo "$as_me:17760: 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
@@ -17763,7 +17772,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:17766: found $ac_dir/$ac_word" >&5
+echo "$as_me:17775: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17772,20 +17781,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:17775: result: $M4_exists" >&5
+  echo "$as_me:17784: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:17778: result: no" >&5
+  echo "$as_me:17787: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:17784: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:17793: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:17788: checking if GNAT works" >&5
+			echo "$as_me:17797: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -17813,7 +17822,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:17816: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:17825: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -17823,7 +17832,7 @@ fi
 
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:17826: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:17835: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -17840,10 +17849,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:17843: result: $ADAFLAGS" >&5
+	echo "$as_me:17852: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:17846: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17855: 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
@@ -17853,11 +17862,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:17856: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17865: 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:17860: checking if GNAT supports generics" >&5
+echo "$as_me:17869: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -17867,7 +17876,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:17870: result: $cf_gnat_generics" >&5
+echo "$as_me:17879: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -17879,7 +17888,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:17882: checking if GNAT supports SIGINT" >&5
+echo "$as_me:17891: 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
@@ -17927,7 +17936,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:17930: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:17939: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -17940,7 +17949,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:17943: checking if GNAT supports project files" >&5
+echo "$as_me:17952: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18003,15 +18012,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18006: result: $cf_gnat_projects" >&5
+echo "$as_me:18015: 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:18012: checking if GNAT supports libraries" >&5
+	echo "$as_me:18021: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18014: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18023: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18031,7 +18040,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18034: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18043: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18043,7 +18052,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18046: checking for Ada95 compiler" >&5
+echo "$as_me:18055: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18054,12 +18063,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18057: result: $cf_ada_compiler" >&5
+echo "$as_me:18066: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18062: checking for Ada95 include directory" >&5
+echo "$as_me:18071: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18095,7 +18104,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18098: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18107: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18104,10 +18113,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18107: result: $ADA_INCLUDE" >&5
+echo "$as_me:18116: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18110: checking for Ada95 object directory" >&5
+echo "$as_me:18119: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18143,7 +18152,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18146: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18155: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18152,10 +18161,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18155: result: $ADA_OBJECTS" >&5
+echo "$as_me:18164: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18158: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18167: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18176,11 +18185,11 @@ then
 	fi
 fi
 
-echo "$as_me:18179: result: $with_ada_sharedlib" >&5
+echo "$as_me:18188: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18183: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18192: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18198,7 +18207,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18201: checking for Ada95 curses library name" >&5
+echo "$as_me:18210: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18214,16 +18223,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18217: result: $ADA_LIBNAME" >&5
+echo "$as_me:18226: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18221: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18230: 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:18226: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18235: 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
@@ -18263,7 +18272,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18266: checking default library suffix" >&5
+echo "$as_me:18275: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18274,10 +18283,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18277: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18286: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18280: checking default library-dependency suffix" >&5
+echo "$as_me:18289: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18360,10 +18369,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18363: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18372: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18366: checking default object directory" >&5
+echo "$as_me:18375: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18379,7 +18388,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18382: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18391: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18521,7 +18530,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18524: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18533: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18702,7 +18711,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18705: error: ambiguous option: $1
+    { { echo "$as_me:18714: 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;}
@@ -18721,7 +18730,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18724: error: unrecognized option: $1
+  -*) { { echo "$as_me:18733: 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;}
@@ -18796,7 +18805,7 @@ do
   "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:18799: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18808: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19157,7 +19166,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19160: creating $ac_file" >&5
+    { echo "$as_me:19169: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19175,7 +19184,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19178: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19187: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19188,7 +19197,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19191: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19200: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19204,7 +19213,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19207: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19216: 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;}
@@ -19213,7 +19222,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19216: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19225: 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;}
@@ -19258,7 +19267,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19261: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19270: 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;}
@@ -19269,7 +19278,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19272: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19281: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19318,7 +19327,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19321: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19330: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19329,7 +19338,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19332: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19341: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19342,7 +19351,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19345: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19354: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19400,7 +19409,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19403: $ac_file is unchanged" >&5
+      { echo "$as_me:19412: $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/NEWS b/NEWS
index 68401bbc2..03922d7b5 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4042 2023/12/02 21:47:07 tom Exp $
+-- $Id: NEWS,v 1.4047 2023/12/09 22:52:42 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231209
+	+ modify infocmp "-u" option to not report cancels in use'd chunks
+	  which are not mentioned in the top-level terminal description.
+	+ remove xterm+sm+1006 from tmux (Debian #1057688).
+	+ used "infocmp -u" to help trim redundant capabilities -TD
+	+ updated man/edit_man.sh to allow for "\%" markers embedded after
+	  bold font escapes in manpage cross-references (Debian #1057541).
+	+ reduce compiler-warnings in configure checks
+
 20231202
 	+ correct initial alignment of extended capabilities in infocmp, so
 	  that the "-u" option can be used for more than two terminal types.
diff --git a/VERSION b/VERSION
index 17d58d79f..5cc32b653 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231202
+5:0:10	6.4	20231209
diff --git a/aclocal.m4 b/aclocal.m4
index 2cc9af7f9..b2b9c3f8f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1059 2023/11/25 21:12:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.1062 2023/12/04 00:39:37 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -598,7 +598,7 @@ AC_DEFUN([CF_AWK_BIG_PRINTF],
 	esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
+dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
 dnl ------------
 dnl Test if 'bool' is a builtin type in the configured C++ compiler.  Some
 dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
@@ -613,13 +613,13 @@ AC_DEFUN([CF_BOOL_DECL],
 AC_MSG_CHECKING(if we should include stdbool.h)
 
 AC_CACHE_VAL(cf_cv_header_stdbool_h,[
-	AC_TRY_COMPILE([],[bool foo = false],
+	AC_TRY_COMPILE([],[bool foo = false; (void)foo],
 		[cf_cv_header_stdbool_h=0],
 		[AC_TRY_COMPILE([
 #ifndef __BEOS__
 #include <stdbool.h>
 #endif
-],[bool foo = false],
+],[bool foo = false; (void)foo],
 			[cf_cv_header_stdbool_h=1],
 			[cf_cv_header_stdbool_h=0])])])
 
@@ -634,7 +634,7 @@ AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[
 	AC_TRY_COMPILE([
 #include <stdio.h>
 #include <sys/types.h>
-],[bool x = false],
+],[bool x = false; (void)x],
 		[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
 		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])
 	])
@@ -1196,7 +1196,7 @@ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_GETENV version: 3 updated: 2023/01/05 17:47:56
+dnl CF_CHECK_GETENV version: 4 updated: 2023/12/03 10:18:09
 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.
@@ -1273,7 +1273,7 @@ int main(void)
 				}
 			}
 		} while (found);
-		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
+		sprintf(value, "%lu:%p", (unsigned long) k, (void*)&mynames[j]);
 		set_value(name, value);
 		mynames[j] = str_alloc(name);
 		myvalues[j] = str_alloc(value);
@@ -1445,7 +1445,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCHAR_H version: 4 updated: 2023/02/18 17:41:25
+dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34
 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
 AC_DEFUN([CF_CHECK_WCHAR_H],[
@@ -1465,7 +1465,7 @@ $ac_includes_default
 #endif
 ],[
 	wint_t foo = 0;
-	int bar = iswpunct(foo)],
+	int bar = iswpunct(foo); (void) bar],
 	[cf_cv_wchar_h_okay=yes],
 	[cf_cv_wchar_h_okay=no])])
 
@@ -1475,7 +1475,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCWIDTH_GRAPHICS version: 3 updated: 2023/01/05 18:01:30
+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 4 updated: 2023/12/03 10:17:07
 dnl -------------------------
 dnl Most "modern" terminal emulators are based to some degree on VT100, and
 dnl should support line-drawing.  Even with Unicode.  There is a problem.
@@ -1584,7 +1584,7 @@ int
 main(void)
 {
 	FILE *fp;
-	int value;
+	unsigned value;
 	char buffer[MY_LEN + 1];
 	char notes[MY_LEN + 1];
 	int totals = 0;
@@ -1600,9 +1600,9 @@ main(void)
 					fprintf(stderr, "\\t%s", buffer);
 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
 					++totals;
-					if (wcwidth(value) == 1)
+					if (wcwidth((int)value) == 1)
 						++passed;
-					fprintf(stderr, "%d\\t%s", wcwidth(value), buffer);
+					fprintf(stderr, "%d\\t%s", wcwidth((int)value), buffer);
 				} else {
 					fprintf(stderr, "?\\t%s", buffer);
 				}
@@ -1687,7 +1687,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -1722,6 +1722,7 @@ AC_TRY_COMPILE(
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
 		[
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -2774,7 +2775,7 @@ int main(void) {
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04
+dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
@@ -2791,6 +2792,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 ],[
 	int x = openpty((int *)0, (int *)0, (char *)0,
 				   (struct termios *)0, (struct winsize *)0);
+	(void)x;
 ],[
 		cf_cv_func_openpty=$cf_header
 		break
@@ -2893,19 +2895,29 @@ tcgetattr(1, &foo);],
 test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_VSSCANF version: 7 updated: 2021/01/01 13:31:04
+dnl CF_FUNC_VSSCANF version: 8 updated: 2023/12/03 19:09:59
 dnl ---------------
 dnl Check for vsscanf() function, which is in c9x but generally not in earlier
-dnl versions of C.  It is in the GNU C library, and can often be simulated by
-dnl other functions.
+dnl versions of C.  It can often be simulated by other functions on older
+dnl systems (where FILE is not opaque).
 AC_DEFUN([CF_FUNC_VSSCANF],
 [
 AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[
 AC_TRY_LINK([
 #include <stdarg.h>
-#include <stdio.h>],[
+#include <stdio.h>
+
+static void
+myfunc(const char *str, const char *fmt, ...)
+{
 	va_list ap;
-	vsscanf("from", "%d", ap)],[cf_cv_func_vsscanf=vsscanf],[
+	va_start(ap, fmt);
+	vsscanf(str, fmt, ap);
+	va_end(ap);
+}
+],[
+	myfunc("55", "%d");
+],[cf_cv_func_vsscanf=vsscanf],[
 AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>],[
@@ -4204,14 +4216,14 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ISASCII version: 4 updated: 2012/10/06 17:56:13
+dnl CF_ISASCII version: 5 updated: 2023/12/03 09:21:34
 dnl ----------
 dnl Check if we have either a function or macro for 'isascii()'.
 AC_DEFUN([CF_ISASCII],
 [
 AC_MSG_CHECKING(for isascii)
 AC_CACHE_VAL(cf_cv_have_isascii,[
-	AC_TRY_LINK([#include <ctype.h>],[int x = isascii(' ')],
+	AC_TRY_LINK([#include <ctype.h>],[int x = isascii(' '); (void)x],
 	[cf_cv_have_isascii=yes],
 	[cf_cv_have_isascii=no])
 ])dnl
@@ -4219,7 +4231,7 @@ AC_MSG_RESULT($cf_cv_have_isascii)
 test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48
+dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
@@ -4253,11 +4265,15 @@ ifdef([AC_FUNC_FSEEKO],[
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include <sys/types.h>
 #include <dirent.h>
+
+#ifndef __REDIRECT
+/* if transitional largefile support is setup, this is true */
+extern struct dirent64 * readdir(DIR *);
+#endif
 		],[
-		/* if transitional largefile support is setup, this is true */
-		extern struct dirent64 * readdir(DIR *);
-		struct dirent64 *x = readdir((DIR *)0);
-		struct dirent *y = readdir((DIR *)0);
+		DIR *dp = opendir(".");
+		struct dirent64 *x = readdir(dp);
+		struct dirent *y = readdir(dp);
 		int z = x - y;
 		(void)z;
 		],
@@ -5367,7 +5383,7 @@ AC_DEFUN([CF_LIB_TYPE],
 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30
+dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10
 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
@@ -5389,17 +5405,21 @@ EOF
 	rm -f conftest.$ac_ext data.o
 	cat >conftest.$ac_ext <<EOF
 #line __oline__ "configure"
+extern int testfunc(void);
+#if defined(NeXT)
 int	testfunc(void)
 {
-#if defined(NeXT)
 	${cf_cv_main_return:-return}(1);	/* I'm told this linker is broken */
+}
 #else
-	extern int testdata[[3]];
+extern int testdata[[3]];
+int	testfunc(void)
+{
 	return testdata[[0]] == 123
 	   &&  testdata[[1]] == 456
 	   &&  testdata[[2]] == 789;
-#endif
 }
+#endif
 EOF
 	if AC_TRY_EVAL(ac_compile); then
 		mv conftest.o func.o && \
@@ -5410,9 +5430,9 @@ EOF
 	cf_saveLIBS="$LIBS"
 	LIBS="conftest.a $LIBS"
 	AC_TRY_RUN([
+	extern int testfunc(void);
 	int main(void)
 	{
-		extern int testfunc();
 		${cf_cv_main_return:-return} (!testfunc());
 	}
 	],
@@ -5431,7 +5451,7 @@ AC_SUBST(BROKEN_LINKER)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_FUNCS version: 12 updated: 2023/01/05 17:51:41
+dnl CF_LINK_FUNCS version: 13 updated: 2023/12/03 09:24:04
 dnl -------------
 dnl Most Unix systems have both link and symlink, a few don't have symlink.
 dnl A few non-Unix systems implement symlink, but not link.
@@ -5462,8 +5482,8 @@ $ac_includes_default
 int main(void)
 {
 	int fail = 0;
-	char *src = "conftest.tmp";
-	char *dst = "conftest.chk";
+	char src[] = "conftest.tmp";
+	char dst[] = "conftest.chk";
 	struct stat src_sb, dst_sb;
 	FILE *fp = fopen(src, "w");
 	if (fp == 0) { fail = 3; } else {
@@ -6335,7 +6355,7 @@ fi
 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: 12 updated: 2023/01/05 17:53:11
+dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50
 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).
@@ -6350,7 +6370,7 @@ $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -7375,7 +7395,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
+dnl CF_SHARED_OPTS version: 109 updated: 2023/12/03 09:21:34
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -7465,7 +7485,7 @@ AC_DEFUN([CF_SHARED_OPTS],
 		for CC_SHARED_OPTS in -fPIC -fpic ''
 		do
 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
-			AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[])
+			AC_TRY_COMPILE([#include <stdio.h>],[int x = 1; (void)x],[break],[])
 		done
 		AC_MSG_RESULT($CC_SHARED_OPTS)
 		CFLAGS="$cf_save_CFLAGS"
@@ -8304,7 +8324,7 @@ dnl	Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],
 [$1=`echo "${$1}" | CF__SED_TRIMBLANKS(-e 's%-g %%' -e 's%-g$%%')`])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_SIGACTION version: 5 updated: 2012/10/06 17:56:13
+dnl CF_STRUCT_SIGACTION version: 6 updated: 2023/12/03 09:21:34
 dnl -------------------
 dnl Check if we need _POSIX_SOURCE defined to use struct sigaction.  We'll only
 dnl do this if we've found the sigaction function.
@@ -8316,14 +8336,14 @@ AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE)
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <signal.h>],
-	[struct sigaction act],
+	[struct sigaction act; (void)act],
 	[sigact_bad=no],
 	[
 AC_TRY_COMPILE([
 #define _POSIX_SOURCE
 #include <sys/types.h>
 #include <signal.h>],
-	[struct sigaction act],
+	[struct sigaction act; (void)act],
 	[sigact_bad=yes
 	 AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])],
 	 [sigact_bad=unknown])])
@@ -8331,7 +8351,7 @@ AC_MSG_RESULT($sigact_bad)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_TERMIOS version: 11 updated: 2020/03/19 20:46:13
+dnl CF_STRUCT_TERMIOS version: 13 updated: 2023/12/03 19:38:54
 dnl -----------------
 dnl Some machines require _POSIX_SOURCE to completely define struct termios.
 AC_DEFUN([CF_STRUCT_TERMIOS],[
@@ -8354,12 +8374,12 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	if test "$termios_bad" = maybe ; then
 	AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE)
 	AC_TRY_COMPILE([#include <termios.h>],
-		[struct termios foo; int x = foo.c_iflag = 1; (void)x],
+		[struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x],
 		termios_bad=no, [
 		AC_TRY_COMPILE([
 #define _POSIX_SOURCE
 #include <termios.h>],
-			[struct termios foo; int x = foo.c_iflag = 2; (void)x],
+			[struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x],
 			termios_bad=unknown,
 			termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE]))
 			])
@@ -8575,7 +8595,7 @@ AC_SUBST(cf_cv_typeof_chtype)
 AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13
+dnl CF_TYPE_SIGACTION version: 5 updated: 2023/12/03 09:21:34
 dnl -----------------
 dnl
 AC_DEFUN([CF_TYPE_SIGACTION],
@@ -8584,14 +8604,14 @@ AC_MSG_CHECKING([for type sigaction_t])
 AC_CACHE_VAL(cf_cv_type_sigaction,[
 	AC_TRY_COMPILE([
 #include <signal.h>],
-		[sigaction_t x],
+		[sigaction_t x; (void)x],
 		[cf_cv_type_sigaction=yes],
 		[cf_cv_type_sigaction=no])])
 AC_MSG_RESULT($cf_cv_type_sigaction)
 test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16
+dnl CF_UNSIGNED_LITERALS version: 3 updated: 2023/12/03 10:02:17
 dnl --------------------
 dnl Test if the compiler supports 'U' and 'L' suffixes.  Only old compilers
 dnl won't, but they're still there.
@@ -8599,7 +8619,7 @@ AC_DEFUN([CF_UNSIGNED_LITERALS],
 [
 AC_MSG_CHECKING([if unsigned literals are legal])
 AC_CACHE_VAL(cf_cv_unsigned_literals,[
-	AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1],
+	AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1; (void)x],
 		[cf_cv_unsigned_literals=yes],
 		[cf_cv_unsigned_literals=no])
 	])
@@ -8827,7 +8847,7 @@ ifelse($1,,,[
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34
 dnl -------------
 dnl Check if type wide-character type $1 is declared, and if so, which header
 dnl file is needed.  The second parameter is used to set a shell variable when
@@ -8844,7 +8864,7 @@ AC_TRY_COMPILE([
 #ifdef HAVE_LIBUTF8_H
 #include <libutf8.h>
 #endif],
-	[$1 state],
+	[$1 state; (void)state],
 	[cf_cv_$1=no],
 	[AC_TRY_COMPILE([
 #include <stdlib.h>
@@ -8854,7 +8874,7 @@ AC_TRY_COMPILE([
 #ifdef HAVE_LIBUTF8_H
 #include <libutf8.h>
 #endif],
-	[$1 value],
+	[$1 value; (void) value],
 	[cf_cv_$1=yes],
 	[cf_cv_$1=unknown])])])
 
@@ -9806,7 +9826,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 12 updated: 2023/11/22 20:48:30
+dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -9906,15 +9926,15 @@ local:
 EOF
 		cat >conftest.$ac_ext <<EOF
 #line __oline__ "configure"
-int	_ismissing(void) { return 1; }
-int	_localf1(void) { return 1; }
-int	_localf2(void) { return 2; }
-int	globalf1(void) { return 1; }
-int	globalf2(void) { return 2; }
-int	_sublocalf1(void) { return 1; }
-int	_sublocalf2(void) { return 2; }
-int	subglobalf1(void) { return 1; }
-int	subglobalf2(void) { return 2; }
+extern int _ismissing(void);    int _ismissing(void)  { return 1; }
+extern int _localf1(void);      int _localf1(void)    { return 1; }
+extern int _localf2(void);      int _localf2(void)    { return 2; }
+extern int globalf1(void);      int globalf1(void)    { return 1; }
+extern int globalf2(void);      int globalf2(void)    { return 2; }
+extern int _sublocalf1(void);   int _sublocalf1(void) { return 1; }
+extern int _sublocalf2(void);   int _sublocalf2(void) { return 2; }
+extern int subglobalf1(void);   int subglobalf1(void) { return 1; }
+extern int subglobalf2(void);   int subglobalf2(void) { return 2; }
 EOF
 		cat >conftest.mk <<EOF
 CC=${CC}
diff --git a/configure b/configure
index 46d95ce7b..655c5f226 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.772 .
+# From configure.in Revision: 1.773 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230903.
 #
@@ -6604,7 +6604,7 @@ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
 int
 main (void)
 {
-int x = 1
+int x = 1; (void)x
   ;
   return 0;
 }
@@ -7409,15 +7409,15 @@ local:
 EOF
 		cat >conftest.$ac_ext <<EOF
 #line 7411 "configure"
-int	_ismissing(void) { return 1; }
-int	_localf1(void) { return 1; }
-int	_localf2(void) { return 2; }
-int	globalf1(void) { return 1; }
-int	globalf2(void) { return 2; }
-int	_sublocalf1(void) { return 1; }
-int	_sublocalf2(void) { return 2; }
-int	subglobalf1(void) { return 1; }
-int	subglobalf2(void) { return 2; }
+extern int _ismissing(void);    int _ismissing(void)  { return 1; }
+extern int _localf1(void);      int _localf1(void)    { return 1; }
+extern int _localf2(void);      int _localf2(void)    { return 2; }
+extern int globalf1(void);      int globalf1(void)    { return 1; }
+extern int globalf2(void);      int globalf2(void)    { return 2; }
+extern int _sublocalf1(void);   int _sublocalf1(void) { return 1; }
+extern int _sublocalf2(void);   int _sublocalf2(void) { return 2; }
+extern int subglobalf1(void);   int subglobalf1(void) { return 1; }
+extern int subglobalf2(void);   int subglobalf2(void) { return 2; }
 EOF
 		cat >conftest.mk <<EOF
 CC=${CC}
@@ -9668,7 +9668,7 @@ else
 
 #include <stdlib.h>
 #include <string.h>
-int main() {
+int main(void) {
 	unsigned long n = 6000000L;
 	char *s = malloc(n);
 	if (s != 0)
@@ -10169,8 +10169,8 @@ $ac_includes_default
 int main(void)
 {
 	int fail = 0;
-	char *src = "conftest.tmp";
-	char *dst = "conftest.chk";
+	char src[] = "conftest.tmp";
+	char dst[] = "conftest.chk";
 	struct stat src_sb, dst_sb;
 	FILE *fp = fopen(src, "w");
 	if (fp == 0) { fail = 3; } else {
@@ -12569,7 +12569,7 @@ main (void)
 {
 
 	wint_t foo = 0;
-	int bar = iswpunct(foo)
+	int bar = iswpunct(foo); (void) bar
   ;
   return 0;
 }
@@ -12775,7 +12775,7 @@ int
 main(void)
 {
 	FILE *fp;
-	int value;
+	unsigned value;
 	char buffer[MY_LEN + 1];
 	char notes[MY_LEN + 1];
 	int totals = 0;
@@ -12791,9 +12791,9 @@ main(void)
 					fprintf(stderr, "\\t%s", buffer);
 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
 					++totals;
-					if (wcwidth(value) == 1)
+					if (wcwidth((int)value) == 1)
 						++passed;
-					fprintf(stderr, "%d\\t%s", wcwidth(value), buffer);
+					fprintf(stderr, "%d\\t%s", wcwidth((int)value), buffer);
 				} else {
 					fprintf(stderr, "?\\t%s", buffer);
 				}
@@ -13539,7 +13539,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-mbstate_t state
+mbstate_t state; (void)state
   ;
   return 0;
 }
@@ -13574,7 +13574,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-mbstate_t value
+mbstate_t value; (void) value
   ;
   return 0;
 }
@@ -13638,7 +13638,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wchar_t state
+wchar_t state; (void)state
   ;
   return 0;
 }
@@ -13673,7 +13673,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wchar_t value
+wchar_t value; (void) value
   ;
   return 0;
 }
@@ -13742,7 +13742,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wint_t state
+wint_t state; (void)state
   ;
   return 0;
 }
@@ -13777,7 +13777,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wint_t value
+wint_t value; (void) value
   ;
   return 0;
 }
@@ -14314,14 +14314,18 @@ else
 #include <sys/types.h>
 #include <dirent.h>
 
+#ifndef __REDIRECT
+/* if transitional largefile support is setup, this is true */
+extern struct dirent64 * readdir(DIR *);
+#endif
+
 int
 main (void)
 {
 
-		/* if transitional largefile support is setup, this is true */
-		extern struct dirent64 * readdir(DIR *);
-		struct dirent64 *x = readdir((DIR *)0);
-		struct dirent *y = readdir((DIR *)0);
+		DIR *dp = opendir(".");
+		struct dirent64 *x = readdir(dp);
+		struct dirent *y = readdir(dp);
 		int z = x - y;
 		(void)z;
 
@@ -14330,16 +14334,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14336: \$? = $ac_status" >&5
+  echo "$as_me:14340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14342: \$? = $ac_status" >&5
+  echo "$as_me:14346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14350,7 +14354,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14353: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14357: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14360,7 +14364,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14363: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14367: 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.
@@ -14370,14 +14374,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14373: result: $with_tparm_varargs" >&5
+echo "$as_me:14377: 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:14380: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14384: 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.
@@ -14387,14 +14391,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14390: result: $with_tic_depends" >&5
+echo "$as_me:14394: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14397: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14401: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14406,15 +14410,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14409: result: no" >&5
+	echo "$as_me:14413: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14413: result: yes" >&5
+	echo "$as_me:14417: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14417: checking for X11 rgb file" >&5
+echo "$as_me:14421: 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.
@@ -14478,7 +14482,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14481: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14485: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14486,7 +14490,7 @@ esac
 
 fi
 
-echo "$as_me:14489: result: $RGB_PATH" >&5
+echo "$as_me:14493: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14501,7 +14505,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14504: checking for type of bool" >&5
+echo "$as_me:14508: 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.
@@ -14511,17 +14515,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14514: result: $NCURSES_BOOL" >&5
+echo "$as_me:14518: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14518: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14522: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14524: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14528: 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.
@@ -14533,16 +14537,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14536: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14540: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14540: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14544: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14545: checking for type of chtype" >&5
+echo "$as_me:14549: 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.
@@ -14552,11 +14556,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14555: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14559: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14559: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14563: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14564,7 +14568,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14567: checking for type of ospeed" >&5
+echo "$as_me:14571: 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.
@@ -14574,11 +14578,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14577: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14581: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14581: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14585: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14586,7 +14590,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14589: checking for type of mmask-t" >&5
+echo "$as_me:14593: 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.
@@ -14596,18 +14600,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14599: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14603: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14603: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14607: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14610: checking for size CCHARW_MAX" >&5
+echo "$as_me:14614: 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.
@@ -14617,16 +14621,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14620: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14624: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14623: checking for signed char" >&5
+echo "$as_me:14627: 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 14629 "configure"
+#line 14633 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14641,16 +14645,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14647: \$? = $ac_status" >&5
+  echo "$as_me:14651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14653: \$? = $ac_status" >&5
+  echo "$as_me:14657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14660,10 +14664,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14663: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14667: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14666: checking size of signed char" >&5
+echo "$as_me:14670: 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
@@ -14672,7 +14676,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14675 "configure"
+#line 14679 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14684,21 +14688,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14690: \$? = $ac_status" >&5
+  echo "$as_me:14694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14696: \$? = $ac_status" >&5
+  echo "$as_me:14700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14701 "configure"
+#line 14705 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14710,16 +14714,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14716: \$? = $ac_status" >&5
+  echo "$as_me:14720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14722: \$? = $ac_status" >&5
+  echo "$as_me:14726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14735,7 +14739,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14738 "configure"
+#line 14742 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14747,16 +14751,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14753: \$? = $ac_status" >&5
+  echo "$as_me:14757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14759: \$? = $ac_status" >&5
+  echo "$as_me:14763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14772,7 +14776,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14775 "configure"
+#line 14779 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14784,16 +14788,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14790: \$? = $ac_status" >&5
+  echo "$as_me:14794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14796: \$? = $ac_status" >&5
+  echo "$as_me:14800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14806,12 +14810,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14809: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14813: 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 14814 "configure"
+#line 14818 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14827,15 +14831,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14833: \$? = $ac_status" >&5
+  echo "$as_me:14837: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14838: \$? = $ac_status" >&5
+  echo "$as_me:14842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14851,7 +14855,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14854: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14858: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14862,7 +14866,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14865: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:14869: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -14872,13 +14876,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14875: result: $with_signed_char" >&5
+echo "$as_me:14879: 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:14881: checking for type of tparm-arg" >&5
+echo "$as_me:14885: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -14888,18 +14892,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14891: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14895: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:14895: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:14899: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14902: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14906: 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.
@@ -14909,7 +14913,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14912: result: $with_rcs_ids" >&5
+echo "$as_me:14916: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14918,7 +14922,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14921: checking format of man-pages" >&5
+echo "$as_me:14925: 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.
@@ -15009,10 +15013,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15012: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15016: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15015: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15019: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15051,7 +15055,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15054: checking for manpage renaming" >&5
+echo "$as_me:15058: 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.
@@ -15080,15 +15084,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15083: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15087: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15088: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15092: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15091: checking if manpage aliases will be installed" >&5
+echo "$as_me:15095: 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.
@@ -15099,7 +15103,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15102: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15106: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15113,7 +15117,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15116: checking if manpage symlinks should be used" >&5
+echo "$as_me:15120: 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.
@@ -15126,17 +15130,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15129: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15133: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15135: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15139: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15139: checking for manpage tbl" >&5
+echo "$as_me:15143: 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.
@@ -15147,7 +15151,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15150: result: $MANPAGE_TBL" >&5
+echo "$as_me:15154: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15465,7 +15469,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15468: checking if you want to build with function extensions" >&5
+echo "$as_me:15472: 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.
@@ -15475,7 +15479,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15478: result: $with_ext_funcs" >&5
+echo "$as_me:15482: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15531,7 +15535,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15534: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15538: 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.
@@ -15541,7 +15545,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15544: result: $with_sp_funcs" >&5
+echo "$as_me:15548: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15560,7 +15564,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15563: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15567: 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.
@@ -15570,7 +15574,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15573: result: $with_term_driver" >&5
+echo "$as_me:15577: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15579,19 +15583,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15582: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15586: 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:15587: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15591: 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:15594: checking for extended use of const keyword" >&5
+echo "$as_me:15598: 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.
@@ -15601,7 +15605,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15604: result: $with_ext_const" >&5
+echo "$as_me:15608: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15609,7 +15613,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15612: checking if you want to use extended colors" >&5
+echo "$as_me:15616: 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.
@@ -15619,12 +15623,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15622: result: $with_ext_colors" >&5
+echo "$as_me:15626: 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:15627: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15631: 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)
@@ -15635,7 +15639,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15638: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15663,7 +15667,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15666: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15670: 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.
@@ -15673,7 +15677,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15676: result: $with_ext_mouse" >&5
+echo "$as_me:15680: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15683,7 +15687,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15686: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15690: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15700,7 +15704,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15703: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15707: 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.
@@ -15710,7 +15714,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15713: result: $with_ext_putwin" >&5
+echo "$as_me:15717: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15720,7 +15724,7 @@ EOF
 
 fi
 
-echo "$as_me:15723: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15727: 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.
@@ -15730,7 +15734,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15733: result: $with_no_padding" >&5
+echo "$as_me:15737: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15738,7 +15742,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15741: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15745: 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.
@@ -15748,7 +15752,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15751: result: $with_sigwinch" >&5
+echo "$as_me:15755: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15756,7 +15760,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15759: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15763: 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.
@@ -15766,7 +15770,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15769: result: $with_tcap_names" >&5
+echo "$as_me:15773: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15780,7 +15784,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15783: checking if you want to link with the pthread library" >&5
+echo "$as_me:15787: 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.
@@ -15790,27 +15794,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15793: result: $with_pthread" >&5
+echo "$as_me:15797: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15797: checking for pthread.h" >&5
+	echo "$as_me:15801: 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 15803 "configure"
+#line 15807 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15807: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15811: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15813: \$? = $ac_status" >&5
+  echo "$as_me:15817: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15829,7 +15833,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15832: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15836: 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
 
@@ -15839,7 +15843,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15842: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15846: 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"
 
@@ -15860,7 +15864,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15863 "configure"
+#line 15867 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15877,16 +15881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15883: \$? = $ac_status" >&5
+  echo "$as_me:15887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15889: \$? = $ac_status" >&5
+  echo "$as_me:15893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15896,7 +15900,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15899: result: $with_pthread" >&5
+	    echo "$as_me:15903: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15924,7 +15928,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15927: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15931: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15934,13 +15938,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15937: checking for pthread_kill" >&5
+	echo "$as_me:15941: 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 15943 "configure"
+#line 15947 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15971,16 +15975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15977: \$? = $ac_status" >&5
+  echo "$as_me:15981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15983: \$? = $ac_status" >&5
+  echo "$as_me:15987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15990,11 +15994,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15993: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15997: 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:15997: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16001: 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.
@@ -16004,7 +16008,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16007: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16011: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16015,7 +16019,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16018: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16022: 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.
@@ -16025,18 +16029,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16028: result: $use_weak_symbols" >&5
+	echo "$as_me:16032: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16032: checking if $CC supports weak symbols" >&5
+echo "$as_me:16036: 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 16039 "configure"
+#line 16043 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16062,16 +16066,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16068: \$? = $ac_status" >&5
+  echo "$as_me:16072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16074: \$? = $ac_status" >&5
+  echo "$as_me:16078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16082,7 +16086,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16085: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16089: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16132,7 +16136,7 @@ fi
 # 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:16135: checking if you want reentrant code" >&5
+echo "$as_me:16139: 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.
@@ -16142,7 +16146,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16145: result: $with_reentrant" >&5
+echo "$as_me:16149: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16231,7 +16235,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16234: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16238: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16243,7 +16247,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16246: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16250: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16265,16 +16269,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16268: result: $enable_opaque_curses" >&5
+echo "$as_me:16272: 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:16273: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16277: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16277: checking whether form library structures should be opaque" >&5
+echo "$as_me:16281: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16284,10 +16288,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16287: result: $enable_opaque_form" >&5
+echo "$as_me:16291: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16290: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16294: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16297,10 +16301,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16300: result: $enable_opaque_menu" >&5
+echo "$as_me:16304: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16303: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16307: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16310,7 +16314,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16313: result: $enable_opaque_panel" >&5
+echo "$as_me:16317: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16320,7 +16324,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16323: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16327: 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.
@@ -16330,7 +16334,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16333: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16337: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16343,7 +16347,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16346: checking if you want all development code" >&5
+echo "$as_me:16350: 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.
@@ -16353,11 +16357,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16356: result: $with_develop" >&5
+echo "$as_me:16360: 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:16360: checking if you want hard-tabs code" >&5
+echo "$as_me:16364: 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.
@@ -16367,7 +16371,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16370: result: $enable_hard_tabs" >&5
+echo "$as_me:16374: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16375,7 +16379,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16378: checking if you want limited support for xmc" >&5
+echo "$as_me:16382: 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.
@@ -16385,7 +16389,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16388: result: $enable_xmc_glitch" >&5
+echo "$as_me:16392: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16395,7 +16399,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16398: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16402: 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.
@@ -16405,7 +16409,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16408: result: $with_assumed_color" >&5
+echo "$as_me:16412: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16413,7 +16417,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16416: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16420: 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.
@@ -16423,7 +16427,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16426: result: $with_hashmap" >&5
+echo "$as_me:16430: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16431,7 +16435,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16434: checking if you want code to check screensize" >&5
+echo "$as_me:16438: checking if you want code to check screensize" >&5
 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16441,7 +16445,7 @@ if test "${enable_check_size+set}" = set; then
 else
   with_check_size=no
 fi;
-echo "$as_me:16444: result: $with_check_size" >&5
+echo "$as_me:16448: result: $with_check_size" >&5
 echo "${ECHO_T}$with_check_size" >&6
 test "x$with_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16449,7 +16453,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16452: checking if you want colorfgbg code" >&5
+echo "$as_me:16456: 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.
@@ -16459,7 +16463,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16462: result: $with_colorfgbg" >&5
+echo "$as_me:16466: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16467,7 +16471,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16470: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16474: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16477,14 +16481,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16480: result: $cf_with_fvisibility" >&5
+echo "$as_me:16484: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16487: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16491: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16493,7 +16497,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16496 "configure"
+#line 16500 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16509,16 +16513,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16515: \$? = $ac_status" >&5
+  echo "$as_me:16519: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16521: \$? = $ac_status" >&5
+  echo "$as_me:16525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16530,7 +16534,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16533: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16537: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16645,7 +16649,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16648: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16652: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16654,7 +16658,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16657 "configure"
+#line 16661 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16670,16 +16674,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16676: \$? = $ac_status" >&5
+  echo "$as_me:16680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16682: \$? = $ac_status" >&5
+  echo "$as_me:16686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16691,7 +16695,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16694: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16698: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16814,7 +16818,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16817: checking if you want interop bindings" >&5
+echo "$as_me:16821: 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.
@@ -16824,13 +16828,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16827: result: $with_exp_interop" >&5
+echo "$as_me:16831: 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:16833: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16837: 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.
@@ -16840,13 +16844,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16843: result: $with_safe_sprintf" >&5
+echo "$as_me:16847: 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:16849: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16853: 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.
@@ -16856,7 +16860,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16859: result: $with_scroll_hints" >&5
+echo "$as_me:16863: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16865,7 +16869,7 @@ EOF
 
 fi
 
-echo "$as_me:16868: checking if you want wgetch-events code" >&5
+echo "$as_me:16872: 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.
@@ -16875,7 +16879,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16878: result: $with_wgetch_events" >&5
+echo "$as_me:16882: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16890,7 +16894,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16893: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16897: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16900,7 +16904,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16903: result: $with_exp_win32" >&5
+	echo "$as_me:16907: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16926,7 +16930,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16929: checking if you want to see long compiling messages" >&5
+echo "$as_me:16933: 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.
@@ -16960,7 +16964,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16963: result: $enableval" >&5
+echo "$as_me:16967: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16973,7 +16977,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16976: checking if you want to install stripped executables" >&5
+echo "$as_me:16980: 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.
@@ -16990,7 +16994,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16993: result: $enable_stripping" >&5
+echo "$as_me:16997: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17001,7 +17005,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17004: checking if install accepts -p option" >&5
+echo "$as_me:17008: 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
@@ -17032,10 +17036,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17035: result: $cf_cv_install_p" >&5
+echo "$as_me:17039: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17038: checking if install needs to be told about ownership" >&5
+echo "$as_me:17042: 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)
@@ -17046,7 +17050,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17049: result: $with_install_o" >&5
+echo "$as_me:17053: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17057,7 +17061,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17060: checking if you want to specify strip-program" >&5
+	echo "$as_me:17064: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17067,11 +17071,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17070: result: $with_strip_program" >&5
+	echo "$as_me:17074: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17074: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17078: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17092,11 +17096,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17095: result: $check_install_strip" >&5
+		echo "$as_me:17099: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17099: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17103: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17111,7 +17115,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17114: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17118: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17137,7 +17141,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17140: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17144: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17154,17 +17158,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17157: result: $enable_stdnoreturn" >&5
+echo "$as_me:17161: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17161: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17165: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17167 "configure"
+#line 17171 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17180,16 +17184,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17186: \$? = $ac_status" >&5
+  echo "$as_me:17190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17192: \$? = $ac_status" >&5
+  echo "$as_me:17196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17200,7 +17204,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17203: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17207: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17256,16 +17260,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17259: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17263: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17264: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17268: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17268: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17272: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17304,16 +17308,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17307: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17311: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17312: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17316: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17316: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17320: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17352,23 +17356,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17355: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17360: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17364: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17364: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17368: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17371: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17375: 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.
@@ -17385,7 +17389,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17388: result: $enable_warnings" >&5
+echo "$as_me:17392: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17409,7 +17413,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17412 "configure"
+#line 17416 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17424,28 +17428,29 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17430: \$? = $ac_status" >&5
+  echo "$as_me:17434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17436: \$? = $ac_status" >&5
+  echo "$as_me:17440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17439: checking for X11/Xt const-feature" >&5
+echo "$as_me:17443: 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 17446 "configure"
+#line 17450 "configure"
 #include "confdefs.h"
 
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -17460,16 +17465,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17466: \$? = $ac_status" >&5
+  echo "$as_me:17471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17472: \$? = $ac_status" >&5
+  echo "$as_me:17477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17484,7 +17489,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17487: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17492: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17513,7 +17518,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17516 "${as_me:-configure}"
+#line 17521 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17529,7 +17534,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17532: checking for $CC warning options..." >&5
+	{ echo "$as_me:17537: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17545,12 +17550,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17548: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17551: \$? = $ac_status" >&5
+  echo "$as_me:17556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17553: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17558: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17558,7 +17563,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17561: checking for $CC warning options..." >&5
+	{ echo "$as_me:17566: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17581,12 +17586,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17584: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17587: \$? = $ac_status" >&5
+  echo "$as_me:17592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17589: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17594: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17594,7 +17599,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17597: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17602: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17604,7 +17609,7 @@ echo "${as_me:-configure}:17597: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17607: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17612: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17637,10 +17642,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17640: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17645: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17643 "${as_me:-configure}"
+#line 17648 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17690,12 +17695,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17693: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17696: \$? = $ac_status" >&5
+  echo "$as_me:17701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17698: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17703: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17767,12 +17772,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17770: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17775: 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 17775 "configure"
+#line 17780 "configure"
 #include "confdefs.h"
 
 int
@@ -17789,16 +17794,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17795: \$? = $ac_status" >&5
+  echo "$as_me:17800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17801: \$? = $ac_status" >&5
+  echo "$as_me:17806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17809,7 +17814,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17812: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17817: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17818,11 +17823,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17821: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17826: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17825 "configure"
+#line 17830 "configure"
 #include "confdefs.h"
 
 int
@@ -17839,16 +17844,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17845: \$? = $ac_status" >&5
+  echo "$as_me:17850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17851: \$? = $ac_status" >&5
+  echo "$as_me:17856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17858,7 +17863,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17861: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17866: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17867,30 +17872,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17870: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17875: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17877: checking version of $CC" >&5
+	echo "$as_me:17882: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17881: result: $CLANG_VERSION" >&5
+	echo "$as_me:17886: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17888: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17893: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17893 "configure"
+#line 17898 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17904,16 +17909,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17910: \$? = $ac_status" >&5
+  echo "$as_me:17915: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17916: \$? = $ac_status" >&5
+  echo "$as_me:17921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17924,13 +17929,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17927: result: $cf_clang_optok" >&5
+		echo "$as_me:17932: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17933: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17938: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17947,7 +17952,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17950 "configure"
+#line 17955 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17965,7 +17970,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17968: checking for $CC warning options..." >&5
+	{ echo "$as_me:17973: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17982,12 +17987,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17988: \$? = $ac_status" >&5
+  echo "$as_me:17993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17995: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -17996,7 +18001,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:17999: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18004: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18026,16 +18031,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18029: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18032: \$? = $ac_status" >&5
+  echo "$as_me:18037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18034: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18039: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18038: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18043: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18053,7 +18058,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18056: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18061: 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.
@@ -18063,7 +18068,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18066: result: $enable_string_hacks" >&5
+echo "$as_me:18071: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18072,15 +18077,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18075: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18080: 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:18077: checking for strlcat" >&5
+	echo "$as_me:18082: 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 18083 "configure"
+#line 18088 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18111,16 +18116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
+  echo "$as_me:18122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18123: \$? = $ac_status" >&5
+  echo "$as_me:18128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18130,7 +18135,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18133: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18138: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18140,7 +18145,7 @@ EOF
 
 else
 
-		echo "$as_me:18143: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18148: 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
@@ -18148,7 +18153,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18151 "configure"
+#line 18156 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18167,16 +18172,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18173: \$? = $ac_status" >&5
+  echo "$as_me:18178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18179: \$? = $ac_status" >&5
+  echo "$as_me:18184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18187,7 +18192,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18190: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18195: 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
 
@@ -18210,23 +18215,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18213: checking for $ac_header" >&5
+echo "$as_me:18218: 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 18219 "configure"
+#line 18224 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18228: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18229: \$? = $ac_status" >&5
+  echo "$as_me:18234: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18245,7 +18250,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18253: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18266,13 +18271,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18269: checking for $ac_func" >&5
+echo "$as_me:18274: 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 18275 "configure"
+#line 18280 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18303,16 +18308,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18309: \$? = $ac_status" >&5
+  echo "$as_me:18314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18315: \$? = $ac_status" >&5
+  echo "$as_me:18320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18322,7 +18327,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18325: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18330: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18335,7 +18340,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18338: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18343: 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.
@@ -18345,7 +18350,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18348: result: $with_assertions" >&5
+echo "$as_me:18353: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18361,7 +18366,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18364: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18369: 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.
@@ -18383,7 +18388,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18386: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18391: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18497,23 +18502,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18500: checking for dmalloc.h" >&5
+	echo "$as_me:18505: 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 18506 "configure"
+#line 18511 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18516: \$? = $ac_status" >&5
+  echo "$as_me:18521: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18532,11 +18537,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18535: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18540: 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:18539: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18544: 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
@@ -18544,7 +18549,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18547 "configure"
+#line 18552 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18563,16 +18568,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18569: \$? = $ac_status" >&5
+  echo "$as_me:18574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18575: \$? = $ac_status" >&5
+  echo "$as_me:18580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18583,7 +18588,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18586: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18591: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18598,7 +18603,7 @@ fi
 
 fi
 
-echo "$as_me:18601: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18606: 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.
@@ -18620,7 +18625,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18623: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18628: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18734,23 +18739,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18737: checking for dbmalloc.h" >&5
+	echo "$as_me:18742: 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 18743 "configure"
+#line 18748 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18747: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18752: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18753: \$? = $ac_status" >&5
+  echo "$as_me:18758: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18769,11 +18774,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18772: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18777: 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:18776: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18781: 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
@@ -18781,7 +18786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18784 "configure"
+#line 18789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18800,16 +18805,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18806: \$? = $ac_status" >&5
+  echo "$as_me:18811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18812: \$? = $ac_status" >&5
+  echo "$as_me:18817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18820,7 +18825,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18823: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18828: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18835,7 +18840,7 @@ fi
 
 fi
 
-echo "$as_me:18838: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18843: 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.
@@ -18857,7 +18862,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18860: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18865: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18970,7 +18975,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18973: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18978: 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.
@@ -18981,7 +18986,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18984: result: $with_no_leaks" >&5
+echo "$as_me:18989: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19033,7 +19038,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19036: checking whether to add trace feature to all models" >&5
+echo "$as_me:19041: 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.
@@ -19043,7 +19048,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19046: result: $cf_with_trace" >&5
+echo "$as_me:19051: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19157,7 +19162,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19160: checking if we want to use GNAT projects" >&5
+echo "$as_me:19165: 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.
@@ -19174,7 +19179,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19177: result: $enable_gnat_projects" >&5
+echo "$as_me:19182: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19187,14 +19192,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19190: checking if ssp library is needed" >&5
+echo "$as_me:19195: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19197 "configure"
+#line 19202 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19211,16 +19216,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19217: \$? = $ac_status" >&5
+  echo "$as_me:19222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19223: \$? = $ac_status" >&5
+  echo "$as_me:19228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19230,7 +19235,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19233 "configure"
+#line 19238 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19247,16 +19252,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19253: \$? = $ac_status" >&5
+  echo "$as_me:19258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19259: \$? = $ac_status" >&5
+  echo "$as_me:19264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19270,7 +19275,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19273: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19278: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19299,14 +19304,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19302: checking if -lm needed for math functions" >&5
+echo "$as_me:19307: 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 19309 "configure"
+#line 19314 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19322,16 +19327,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19328: \$? = $ac_status" >&5
+  echo "$as_me:19333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19334: \$? = $ac_status" >&5
+  echo "$as_me:19339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19341,7 +19346,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19344: result: $cf_cv_need_libm" >&5
+echo "$as_me:19349: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19349,14 +19354,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19352: checking if -lm is available for math functions" >&5
+	echo "$as_me:19357: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19359 "configure"
+#line 19364 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19372,16 +19377,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19380: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19378: \$? = $ac_status" >&5
+  echo "$as_me:19383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19384: \$? = $ac_status" >&5
+  echo "$as_me:19389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19391,7 +19396,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19394: result: $cf_cv_have_libm" >&5
+echo "$as_me:19399: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19413,13 +19418,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19416: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19421: 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 19422 "configure"
+#line 19427 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19435,16 +19440,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19441: \$? = $ac_status" >&5
+  echo "$as_me:19446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19447: \$? = $ac_status" >&5
+  echo "$as_me:19452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19454,7 +19459,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19457: result: $ac_cv_header_time" >&5
+echo "$as_me:19462: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19469,7 +19474,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19472: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19477: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19477,7 +19482,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19480 "configure"
+#line 19485 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19496,16 +19501,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19502: \$? = $ac_status" >&5
+  echo "$as_me:19507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19508: \$? = $ac_status" >&5
+  echo "$as_me:19513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19516,11 +19521,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19519: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19524: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19523: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19528: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19528,7 +19533,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19531 "configure"
+#line 19536 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19547,16 +19552,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19553: \$? = $ac_status" >&5
+  echo "$as_me:19558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19559: \$? = $ac_status" >&5
+  echo "$as_me:19564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19567,7 +19572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19570: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19575: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19589,7 +19594,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19592: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19597: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19597,7 +19602,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19600 "configure"
+#line 19605 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19616,16 +19621,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19622: \$? = $ac_status" >&5
+  echo "$as_me:19627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19628: \$? = $ac_status" >&5
+  echo "$as_me:19633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19636,7 +19641,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19639: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19644: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19658,7 +19663,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19661: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19666: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19666,7 +19671,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19669 "configure"
+#line 19674 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19685,16 +19690,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19691: \$? = $ac_status" >&5
+  echo "$as_me:19696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19697: \$? = $ac_status" >&5
+  echo "$as_me:19702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19705,7 +19710,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19708: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19713: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19747,7 +19752,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19750: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19755: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19755,7 +19760,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19758 "configure"
+#line 19763 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19774,16 +19779,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:19785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:19791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19794,7 +19799,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19797: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19802: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19822,13 +19827,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19825: checking for regcomp" >&5
+	echo "$as_me:19830: 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 19831 "configure"
+#line 19836 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19859,16 +19864,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19865: \$? = $ac_status" >&5
+  echo "$as_me:19870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19871: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19878,7 +19883,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19881: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19886: 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
@@ -19887,7 +19892,7 @@ else
 		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:19890: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19895: 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
@@ -19895,7 +19900,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19898 "configure"
+#line 19903 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19914,16 +19919,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19920: \$? = $ac_status" >&5
+  echo "$as_me:19925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19926: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19934,7 +19939,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19937: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19942: 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
 
@@ -19966,13 +19971,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19969: checking for compile" >&5
+	echo "$as_me:19974: 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 19975 "configure"
+#line 19980 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20003,16 +20008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20009: \$? = $ac_status" >&5
+  echo "$as_me:20014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20015: \$? = $ac_status" >&5
+  echo "$as_me:20020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20022,13 +20027,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20025: result: $ac_cv_func_compile" >&5
+echo "$as_me:20030: 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:20031: checking for compile in -lgen" >&5
+		echo "$as_me:20036: 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
@@ -20036,7 +20041,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20039 "configure"
+#line 20044 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20055,16 +20060,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20067: \$? = $ac_status" >&5
+  echo "$as_me:20072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20075,7 +20080,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20078: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20083: 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
 
@@ -20103,11 +20108,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20106: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20111: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20110: checking for regular-expression headers" >&5
+echo "$as_me:20115: 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
@@ -20119,7 +20124,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20122 "configure"
+#line 20127 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20136,16 +20141,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20142: \$? = $ac_status" >&5
+  echo "$as_me:20147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20148: \$? = $ac_status" >&5
+  echo "$as_me:20153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20162,7 +20167,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20165 "configure"
+#line 20170 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20182,16 +20187,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20188: \$? = $ac_status" >&5
+  echo "$as_me:20193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20194: \$? = $ac_status" >&5
+  echo "$as_me:20199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20207,11 +20212,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20210: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20215: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20214: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20219: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20249,23 +20254,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20252: checking for $ac_header" >&5
+echo "$as_me:20257: 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 20258 "configure"
+#line 20263 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20268: \$? = $ac_status" >&5
+  echo "$as_me:20273: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20284,7 +20289,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20287: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20297,23 +20302,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20300: checking for $ac_header" >&5
+echo "$as_me:20305: 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 20306 "configure"
+#line 20311 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20316: \$? = $ac_status" >&5
+  echo "$as_me:20321: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20332,7 +20337,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20335: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20340: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20342,7 +20347,7 @@ EOF
 fi
 done
 
-echo "$as_me:20345: checking for header declaring getopt variables" >&5
+echo "$as_me:20350: 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
@@ -20352,7 +20357,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20355 "configure"
+#line 20360 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20365,16 +20370,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20373: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20371: \$? = $ac_status" >&5
+  echo "$as_me:20376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20377: \$? = $ac_status" >&5
+  echo "$as_me:20382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20386,7 +20391,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20389: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20394: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20403,14 +20408,14 @@ EOF
 
 fi
 
-echo "$as_me:20406: checking if external environ is declared" >&5
+echo "$as_me:20411: 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 20413 "configure"
+#line 20418 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20423,16 +20428,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20435: \$? = $ac_status" >&5
+  echo "$as_me:20440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20443,7 +20448,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20446: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20451: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20458,14 +20463,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20461: checking if external environ exists" >&5
+echo "$as_me:20466: 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 20468 "configure"
+#line 20473 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20480,16 +20485,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20486: \$? = $ac_status" >&5
+  echo "$as_me:20491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20492: \$? = $ac_status" >&5
+  echo "$as_me:20497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20500,7 +20505,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20503: result: $cf_cv_have_environ" >&5
+echo "$as_me:20508: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20513,13 +20518,13 @@ EOF
 
 fi
 
-echo "$as_me:20516: checking for getenv" >&5
+echo "$as_me:20521: 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 20522 "configure"
+#line 20527 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20550,16 +20555,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20556: \$? = $ac_status" >&5
+  echo "$as_me:20561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20562: \$? = $ac_status" >&5
+  echo "$as_me:20567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20569,19 +20574,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20572: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20577: 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:20578: checking for $ac_func" >&5
+echo "$as_me:20583: 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 20584 "configure"
+#line 20589 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20612,16 +20617,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20618: \$? = $ac_status" >&5
+  echo "$as_me:20623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20624: \$? = $ac_status" >&5
+  echo "$as_me:20629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20631,7 +20636,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20634: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20639: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20641,7 +20646,7 @@ EOF
 fi
 done
 
-echo "$as_me:20644: checking if getenv returns consistent values" >&5
+echo "$as_me:20649: 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
@@ -20651,7 +20656,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20654 "configure"
+#line 20659 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20720,7 +20725,7 @@ int main(void)
 				}
 			}
 		} while (found);
-		sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
+		sprintf(value, "%lu:%p", (unsigned long) k, (void*)&mynames[j]);
 		set_value(name, value);
 		mynames[j] = str_alloc(name);
 		myvalues[j] = str_alloc(value);
@@ -20756,15 +20761,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20762: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20777,7 +20782,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20780: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20785: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20792,18 +20797,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20795: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20800: 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
 
-echo "$as_me:20799: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20804: 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 20806 "configure"
+#line 20811 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20823,16 +20828,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20829: \$? = $ac_status" >&5
+  echo "$as_me:20834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20835: \$? = $ac_status" >&5
+  echo "$as_me:20840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20844,7 +20849,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20847: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20852: 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
@@ -20859,13 +20864,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20862: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20867: 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 20868 "configure"
+#line 20873 "configure"
 #include "confdefs.h"
 
 int
@@ -20923,16 +20928,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20929: \$? = $ac_status" >&5
+  echo "$as_me:20934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20935: \$? = $ac_status" >&5
+  echo "$as_me:20940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20942,7 +20947,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20945: result: $ac_cv_c_const" >&5
+echo "$as_me:20950: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20952,7 +20957,7 @@ EOF
 
 fi
 
-echo "$as_me:20955: checking for inline" >&5
+echo "$as_me:20960: 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
@@ -20960,7 +20965,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20963 "configure"
+#line 20968 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -20969,16 +20974,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20975: \$? = $ac_status" >&5
+  echo "$as_me:20980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:20986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20989,7 +20994,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20992: result: $ac_cv_c_inline" >&5
+echo "$as_me:20997: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21015,7 +21020,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21018: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21023: 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
@@ -21024,7 +21029,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21027 "configure"
+#line 21032 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21036,16 +21041,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
+  echo "$as_me:21053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21057,7 +21062,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21060: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21065: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21163,7 +21168,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21166: checking for signal global datatype" >&5
+echo "$as_me:21171: 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
@@ -21175,7 +21180,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21178 "configure"
+#line 21183 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21199,16 +21204,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21205: \$? = $ac_status" >&5
+  echo "$as_me:21210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21211: \$? = $ac_status" >&5
+  echo "$as_me:21216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21222,7 +21227,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21225: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21230: 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 <<EOF
@@ -21231,7 +21236,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21234: checking for type of chtype" >&5
+echo "$as_me:21239: 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
@@ -21241,7 +21246,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21244 "configure"
+#line 21249 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21276,15 +21281,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21282: \$? = $ac_status" >&5
+  echo "$as_me:21287: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21287: \$? = $ac_status" >&5
+  echo "$as_me:21292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21299,7 +21304,7 @@ fi
 
 fi
 
-echo "$as_me:21302: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21307: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21311,35 +21316,35 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21314: checking if unsigned literals are legal" >&5
+echo "$as_me:21319: 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 21321 "configure"
+#line 21326 "configure"
 #include "confdefs.h"
 
 int
 main (void)
 {
-long x = 1L + 1UL + 1U + 1
+long x = 1L + 1UL + 1U + 1; (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21336: \$? = $ac_status" >&5
+  echo "$as_me:21341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21342: \$? = $ac_status" >&5
+  echo "$as_me:21347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21351,7 +21356,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21354: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21359: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21367,14 +21372,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21370: checking if external errno is declared" >&5
+echo "$as_me:21375: 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 21377 "configure"
+#line 21382 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21388,16 +21393,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21394: \$? = $ac_status" >&5
+  echo "$as_me:21399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21400: \$? = $ac_status" >&5
+  echo "$as_me:21405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21408,7 +21413,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21411: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21416: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21423,14 +21428,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21426: checking if external errno exists" >&5
+echo "$as_me:21431: 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 21433 "configure"
+#line 21438 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21445,16 +21450,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21451: \$? = $ac_status" >&5
+  echo "$as_me:21456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21457: \$? = $ac_status" >&5
+  echo "$as_me:21462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21465,7 +21470,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21468: result: $cf_cv_have_errno" >&5
+echo "$as_me:21473: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21478,7 +21483,7 @@ EOF
 
 fi
 
-echo "$as_me:21481: checking if data-only library module links" >&5
+echo "$as_me:21486: 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
@@ -21486,36 +21491,40 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21489 "configure"
+#line 21494 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21492: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21495: \$? = $ac_status" >&5
+  echo "$as_me:21500: \$? = $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 <<EOF
-#line 21502 "configure"
+#line 21507 "configure"
+extern int testfunc(void);
+#if defined(NeXT)
 int	testfunc(void)
 {
-#if defined(NeXT)
 	${cf_cv_main_return:-return}(1);	/* I'm told this linker is broken */
+}
 #else
-	extern int testdata[3];
+extern int testdata[3];
+int	testfunc(void)
+{
 	return testdata[0] == 123
 	   &&  testdata[1] == 456
 	   &&  testdata[2] == 789;
-#endif
 }
+#endif
 EOF
-	if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21518: \$? = $ac_status" >&5
+  echo "$as_me:21527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21528,26 +21537,26 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21531 "configure"
+#line 21540 "configure"
 #include "confdefs.h"
 
+	extern int testfunc(void);
 	int main(void)
 	{
-		extern int testfunc();
 		${cf_cv_main_return:-return} (!testfunc());
 	}
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21545: \$? = $ac_status" >&5
+  echo "$as_me:21554: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21550: \$? = $ac_status" >&5
+  echo "$as_me:21559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21562,7 +21571,7 @@ fi
 
 fi
 
-echo "$as_me:21565: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21574: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21576,14 +21585,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21579: checking for clock_gettime" >&5
+echo "$as_me:21588: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21586 "configure"
+#line 21595 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21596,16 +21605,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21602: \$? = $ac_status" >&5
+  echo "$as_me:21611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21608: \$? = $ac_status" >&5
+  echo "$as_me:21617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21616,7 +21625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21619: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21628: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21627,13 +21636,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21630: checking for gettimeofday" >&5
+echo "$as_me:21639: 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 21636 "configure"
+#line 21645 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21664,16 +21673,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21670: \$? = $ac_status" >&5
+  echo "$as_me:21679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21676: \$? = $ac_status" >&5
+  echo "$as_me:21685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21683,7 +21692,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21686: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21695: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21693,7 +21702,7 @@ EOF
 
 else
 
-echo "$as_me:21696: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21705: 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
@@ -21701,7 +21710,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21704 "configure"
+#line 21713 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21720,16 +21729,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21726: \$? = $ac_status" >&5
+  echo "$as_me:21735: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21732: \$? = $ac_status" >&5
+  echo "$as_me:21741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21740,7 +21749,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21743: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21752: 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
 
@@ -21801,13 +21810,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21804: checking for $ac_func" >&5
+echo "$as_me:21813: 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 21810 "configure"
+#line 21819 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21838,16 +21847,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21844: \$? = $ac_status" >&5
+  echo "$as_me:21853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21850: \$? = $ac_status" >&5
+  echo "$as_me:21859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21857,7 +21866,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21860: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21869: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21867,14 +21876,14 @@ EOF
 fi
 done
 
-echo "$as_me:21870: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21879: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21877 "configure"
+#line 21886 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21889,16 +21898,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21895: \$? = $ac_status" >&5
+  echo "$as_me:21904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21901: \$? = $ac_status" >&5
+  echo "$as_me:21910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21908,7 +21917,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21911: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21920: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21930,7 +21939,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21933: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21942: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21940,7 +21949,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21943 "configure"
+#line 21952 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21953,15 +21962,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21959: \$? = $ac_status" >&5
+  echo "$as_me:21968: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21964: \$? = $ac_status" >&5
+  echo "$as_me:21973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21973,7 +21982,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21976: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:21985: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21985,14 +21994,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21988: checking for getttynam" >&5
+	echo "$as_me:21997: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21995 "configure"
+#line 22004 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22004,16 +22013,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22010: \$? = $ac_status" >&5
+  echo "$as_me:22019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22016: \$? = $ac_status" >&5
+  echo "$as_me:22025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22023,7 +22032,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22026: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22035: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22033,7 +22042,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22036: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22045: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22042,7 +22051,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22045: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22054: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22055,14 +22064,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22058: checking for terminal-capability database functions" >&5
+echo "$as_me:22067: 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 22065 "configure"
+#line 22074 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22082,16 +22091,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22088: \$? = $ac_status" >&5
+  echo "$as_me:22097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22094: \$? = $ac_status" >&5
+  echo "$as_me:22103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22102,7 +22111,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22105: result: $cf_cv_cgetent" >&5
+echo "$as_me:22114: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22112,14 +22121,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22115: checking if cgetent uses const parameter" >&5
+echo "$as_me:22124: 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 22122 "configure"
+#line 22131 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22142,16 +22151,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22148: \$? = $ac_status" >&5
+  echo "$as_me:22157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22154: \$? = $ac_status" >&5
+  echo "$as_me:22163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22162,7 +22171,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22165: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22174: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22176,35 +22185,35 @@ fi
 
 fi
 
-echo "$as_me:22179: checking for isascii" >&5
+echo "$as_me:22188: 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 22186 "configure"
+#line 22195 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
 main (void)
 {
-int x = isascii(' ')
+int x = isascii(' '); (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22201: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22207: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22215,7 +22224,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22218: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22227: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22223,10 +22232,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22226: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22235: 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 22229 "configure"
+#line 22238 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22234,22 +22243,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-struct sigaction act
+struct sigaction act; (void)act
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22246: \$? = $ac_status" >&5
+  echo "$as_me:22255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22252: \$? = $ac_status" >&5
+  echo "$as_me:22261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22257,7 +22266,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22260 "configure"
+#line 22269 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22266,22 +22275,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-struct sigaction act
+struct sigaction act; (void)act
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22278: \$? = $ac_status" >&5
+  echo "$as_me:22287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22284: \$? = $ac_status" >&5
+  echo "$as_me:22293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22297,11 +22306,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22300: result: $sigact_bad" >&5
+echo "$as_me:22309: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22304: checking if nanosleep really works" >&5
+echo "$as_me:22313: 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
@@ -22311,7 +22320,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22314 "configure"
+#line 22323 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22337,15 +22346,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22343: \$? = $ac_status" >&5
+  echo "$as_me:22352: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22348: \$? = $ac_status" >&5
+  echo "$as_me:22357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22357,7 +22366,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22360: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22369: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22374,23 +22383,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22377: checking for $ac_header" >&5
+echo "$as_me:22386: 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 22383 "configure"
+#line 22392 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22396: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22393: \$? = $ac_status" >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22409,7 +22418,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22412: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22426,31 +22435,31 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22429: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22438: 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 22432 "configure"
+#line 22441 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
 main (void)
 {
-struct termios foo; int x = foo.c_iflag = 1; (void)x
+struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22447: \$? = $ac_status" >&5
+  echo "$as_me:22456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22453: \$? = $ac_status" >&5
+  echo "$as_me:22462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22458,7 +22467,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22461 "configure"
+#line 22470 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22466,22 +22475,22 @@ cat "conftest.$ac_ext" >&5
 int
 main (void)
 {
-struct termios foo; int x = foo.c_iflag = 2; (void)x
+struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22478: \$? = $ac_status" >&5
+  echo "$as_me:22487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22484: \$? = $ac_status" >&5
+  echo "$as_me:22493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22497,19 +22506,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22500: result: $termios_bad" >&5
+	echo "$as_me:22509: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22505: checking for tcgetattr" >&5
+echo "$as_me:22514: 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 22512 "configure"
+#line 22521 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22537,16 +22546,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22543: \$? = $ac_status" >&5
+  echo "$as_me:22552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22549: \$? = $ac_status" >&5
+  echo "$as_me:22558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22556,46 +22565,56 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22559: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22568: 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:22566: checking for vsscanf function or workaround" >&5
+echo "$as_me:22575: 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 22573 "configure"
+#line 22582 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
 #include <stdio.h>
+
+static void
+myfunc(const char *str, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	vsscanf(str, fmt, ap);
+	va_end(ap);
+}
+
 int
 main (void)
 {
 
-	va_list ap;
-	vsscanf("from", "%d", ap)
+	myfunc("55", "%d");
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22592: \$? = $ac_status" >&5
+  echo "$as_me:22611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22598: \$? = $ac_status" >&5
+  echo "$as_me:22617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22603,7 +22622,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22606 "configure"
+#line 22625 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22625,16 +22644,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22631: \$? = $ac_status" >&5
+  echo "$as_me:22650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22637: \$? = $ac_status" >&5
+  echo "$as_me:22656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22642,7 +22661,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22645 "configure"
+#line 22664 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22664,16 +22683,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22670: \$? = $ac_status" >&5
+  echo "$as_me:22689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22676: \$? = $ac_status" >&5
+  echo "$as_me:22695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22688,7 +22707,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22691: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22710: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22714,23 +22733,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22717: checking for $ac_header" >&5
+echo "$as_me:22736: 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 22723 "configure"
+#line 22742 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22727: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22746: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22733: \$? = $ac_status" >&5
+  echo "$as_me:22752: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22749,7 +22768,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22752: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22771: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22759,7 +22778,7 @@ EOF
 fi
 done
 
-echo "$as_me:22762: checking for working mkstemp" >&5
+echo "$as_me:22781: 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
@@ -22770,14 +22789,14 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22773 "configure"
+#line 22792 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -22805,15 +22824,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22811: \$? = $ac_status" >&5
+  echo "$as_me:22830: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22816: \$? = $ac_status" >&5
+  echo "$as_me:22835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22828,16 +22847,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22831: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22850: 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:22834: checking for mkstemp" >&5
+	echo "$as_me:22853: 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 22840 "configure"
+#line 22859 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22868,16 +22887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22874: \$? = $ac_status" >&5
+  echo "$as_me:22893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22880: \$? = $ac_status" >&5
+  echo "$as_me:22899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22887,7 +22906,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22890: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22909: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22908,21 +22927,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22911: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22930: 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:22914: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22933: 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:22920: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22939: 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 22925 "configure"
+#line 22944 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22939,15 +22958,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22945: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22950: \$? = $ac_status" >&5
+  echo "$as_me:22969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22960,7 +22979,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22963: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22982: 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
 
@@ -22971,13 +22990,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22974: checking for intptr_t" >&5
+echo "$as_me:22993: 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 22980 "configure"
+#line 22999 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22992,16 +23011,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22998: \$? = $ac_status" >&5
+  echo "$as_me:23017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23004: \$? = $ac_status" >&5
+  echo "$as_me:23023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23011,7 +23030,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23014: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23033: 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
   :
@@ -23023,13 +23042,13 @@ EOF
 
 fi
 
-echo "$as_me:23026: checking for ssize_t" >&5
+echo "$as_me:23045: 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 23032 "configure"
+#line 23051 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23044,16 +23063,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23050: \$? = $ac_status" >&5
+  echo "$as_me:23069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23056: \$? = $ac_status" >&5
+  echo "$as_me:23075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23063,7 +23082,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23066: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23085: 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
   :
@@ -23075,36 +23094,36 @@ EOF
 
 fi
 
-echo "$as_me:23078: checking for type sigaction_t" >&5
+echo "$as_me:23097: 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 23085 "configure"
+#line 23104 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
 int
 main (void)
 {
-sigaction_t x
+sigaction_t x; (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23101: \$? = $ac_status" >&5
+  echo "$as_me:23120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23107: \$? = $ac_status" >&5
+  echo "$as_me:23126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23115,14 +23134,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23118: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23137: 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:23125: checking declaration of size-change" >&5
+echo "$as_me:23144: 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
@@ -23143,7 +23162,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23146 "configure"
+#line 23165 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23193,16 +23212,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23199: \$? = $ac_status" >&5
+  echo "$as_me:23218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23205: \$? = $ac_status" >&5
+  echo "$as_me:23224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23221,7 +23240,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23224: result: $cf_cv_sizechange" >&5
+echo "$as_me:23243: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23239,13 +23258,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23242: checking for memmove" >&5
+echo "$as_me:23261: 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 23248 "configure"
+#line 23267 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23276,16 +23295,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23282: \$? = $ac_status" >&5
+  echo "$as_me:23301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23288: \$? = $ac_status" >&5
+  echo "$as_me:23307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23295,19 +23314,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23298: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23317: 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:23304: checking for bcopy" >&5
+echo "$as_me:23323: 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 23310 "configure"
+#line 23329 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23338,16 +23357,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23344: \$? = $ac_status" >&5
+  echo "$as_me:23363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23350: \$? = $ac_status" >&5
+  echo "$as_me:23369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23357,11 +23376,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23360: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23379: 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:23364: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23383: 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
@@ -23371,7 +23390,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23374 "configure"
+#line 23393 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23387,15 +23406,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23393: \$? = $ac_status" >&5
+  echo "$as_me:23412: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23398: \$? = $ac_status" >&5
+  echo "$as_me:23417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23408,7 +23427,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23411: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23430: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23435,13 +23454,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23438: checking for $ac_func" >&5
+echo "$as_me:23457: 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 23444 "configure"
+#line 23463 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23472,16 +23491,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23478: \$? = $ac_status" >&5
+  echo "$as_me:23497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23484: \$? = $ac_status" >&5
+  echo "$as_me:23503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23491,7 +23510,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23494: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23513: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23501,7 +23520,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23504: checking if poll really works" >&5
+echo "$as_me:23523: 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
@@ -23511,7 +23530,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23514 "configure"
+#line 23533 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23564,15 +23583,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23570: \$? = $ac_status" >&5
+  echo "$as_me:23589: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23575: \$? = $ac_status" >&5
+  echo "$as_me:23594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23584,21 +23603,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23587: result: $cf_cv_working_poll" >&5
+echo "$as_me:23606: 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:23594: checking for va_copy" >&5
+echo "$as_me:23613: 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 23601 "configure"
+#line 23620 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23615,16 +23634,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23621: \$? = $ac_status" >&5
+  echo "$as_me:23640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23627: \$? = $ac_status" >&5
+  echo "$as_me:23646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23634,7 +23653,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23637: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23656: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23646,14 +23665,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23649: checking for __va_copy" >&5
+echo "$as_me:23668: 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 23656 "configure"
+#line 23675 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23670,16 +23689,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23676: \$? = $ac_status" >&5
+  echo "$as_me:23695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23682: \$? = $ac_status" >&5
+  echo "$as_me:23701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23689,7 +23708,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23692: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23711: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23701,14 +23720,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23704: checking for __builtin_va_copy" >&5
+echo "$as_me:23723: 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 23711 "configure"
+#line 23730 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23725,16 +23744,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23731: \$? = $ac_status" >&5
+  echo "$as_me:23750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23737: \$? = $ac_status" >&5
+  echo "$as_me:23756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23744,7 +23763,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23747: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23766: 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 &&
@@ -23762,14 +23781,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23765: checking if we can simply copy va_list" >&5
+	echo "$as_me:23784: 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 23772 "configure"
+#line 23791 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23786,16 +23805,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23792: \$? = $ac_status" >&5
+  echo "$as_me:23811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23798: \$? = $ac_status" >&5
+  echo "$as_me:23817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23805,19 +23824,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23808: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23827: 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:23813: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23832: 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 23820 "configure"
+#line 23839 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23834,16 +23853,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23840: \$? = $ac_status" >&5
+  echo "$as_me:23859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23846: \$? = $ac_status" >&5
+  echo "$as_me:23865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23853,7 +23872,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23856: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23875: 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
@@ -23864,13 +23883,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23867: checking for pid_t" >&5
+echo "$as_me:23886: 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 23873 "configure"
+#line 23892 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23885,16 +23904,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23891: \$? = $ac_status" >&5
+  echo "$as_me:23910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23897: \$? = $ac_status" >&5
+  echo "$as_me:23916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23904,7 +23923,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23907: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23926: 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
   :
@@ -23919,23 +23938,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23922: checking for $ac_header" >&5
+echo "$as_me:23941: 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 23928 "configure"
+#line 23947 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23932: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23938: \$? = $ac_status" >&5
+  echo "$as_me:23957: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23954,7 +23973,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23957: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23967,13 +23986,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23970: checking for $ac_func" >&5
+echo "$as_me:23989: 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 23976 "configure"
+#line 23995 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24004,16 +24023,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24010: \$? = $ac_status" >&5
+  echo "$as_me:24029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24016: \$? = $ac_status" >&5
+  echo "$as_me:24035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24023,7 +24042,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24026: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24045: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24035,7 +24054,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24038: checking for working fork" >&5
+  echo "$as_me:24057: 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
@@ -24058,15 +24077,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24064: \$? = $ac_status" >&5
+  echo "$as_me:24083: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24069: \$? = $ac_status" >&5
+  echo "$as_me:24088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24078,7 +24097,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24081: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24100: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24092,12 +24111,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24095: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24114: 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:24100: checking for working vfork" >&5
+  echo "$as_me:24119: 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
@@ -24106,7 +24125,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24109 "configure"
+#line 24128 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24199,15 +24218,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24205: \$? = $ac_status" >&5
+  echo "$as_me:24224: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24210: \$? = $ac_status" >&5
+  echo "$as_me:24229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24219,13 +24238,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24222: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24241: 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:24228: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24247: 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
 
@@ -24250,7 +24269,7 @@ EOF
 
 fi
 
-echo "$as_me:24253: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24272: 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
@@ -24260,7 +24279,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24263 "configure"
+#line 24282 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24295,15 +24314,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24301: \$? = $ac_status" >&5
+  echo "$as_me:24320: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24316,7 +24335,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24319: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24338: 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
@@ -24325,7 +24344,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24328: checking for openpty in -lutil" >&5
+echo "$as_me:24347: 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
@@ -24333,7 +24352,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24336 "configure"
+#line 24355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24352,16 +24371,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24358: \$? = $ac_status" >&5
+  echo "$as_me:24377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24364: \$? = $ac_status" >&5
+  echo "$as_me:24383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24372,7 +24391,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24375: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24394: 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
@@ -24380,7 +24399,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24383: checking for openpty header" >&5
+echo "$as_me:24402: 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
@@ -24407,7 +24426,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24410 "configure"
+#line 24429 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24418,22 +24437,23 @@ main (void)
 
 	int x = openpty((int *)0, (int *)0, (char *)0,
 				   (struct termios *)0, (struct winsize *)0);
+	(void)x;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24430: \$? = $ac_status" >&5
+  echo "$as_me:24450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24436: \$? = $ac_status" >&5
+  echo "$as_me:24456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24451,7 +24471,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24454: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24474: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24524,7 +24544,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24527 "configure"
+#line 24547 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24536,16 +24556,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24559: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24542: \$? = $ac_status" >&5
+  echo "$as_me:24562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24548: \$? = $ac_status" >&5
+  echo "$as_me:24568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24562,7 +24582,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24565: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24585: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24598,7 +24618,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24601: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24621: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24609,7 +24629,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24612: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24632: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24681,7 +24701,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24684 "configure"
+#line 24704 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24693,16 +24713,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24699: \$? = $ac_status" >&5
+  echo "$as_me:24719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24705: \$? = $ac_status" >&5
+  echo "$as_me:24725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24719,7 +24739,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24722: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24742: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24799,7 +24819,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24802: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24822: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24816,23 +24836,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24819: checking for db.h" >&5
+echo "$as_me:24839: 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 24825 "configure"
+#line 24845 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24849: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24835: \$? = $ac_status" >&5
+  echo "$as_me:24855: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24851,11 +24871,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24854: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24874: 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:24858: checking for version of db" >&5
+echo "$as_me:24878: 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
@@ -24866,10 +24886,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24869: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24889: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24872 "configure"
+#line 24892 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24899,16 +24919,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24905: \$? = $ac_status" >&5
+  echo "$as_me:24925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24911: \$? = $ac_status" >&5
+  echo "$as_me:24931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24922,16 +24942,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24925: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24945: 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:24929: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24949: 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:24934: checking for db libraries" >&5
+echo "$as_me:24954: 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
@@ -24961,10 +24981,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24964: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24984: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24967 "configure"
+#line 24987 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25019,16 +25039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25025: \$? = $ac_status" >&5
+  echo "$as_me:25045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25031: \$? = $ac_status" >&5
+  echo "$as_me:25051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25048,11 +25068,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25051: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25071: 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:25055: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25075: 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
@@ -25078,7 +25098,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25081: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25101: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25093,7 +25113,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25096: checking if we should include stdbool.h" >&5
+echo "$as_me:25116: 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
@@ -25101,35 +25121,35 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25104 "configure"
+#line 25124 "configure"
 #include "confdefs.h"
 
 int
 main (void)
 {
-bool foo = false
+bool foo = false; (void)foo
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25119: \$? = $ac_status" >&5
+  echo "$as_me:25139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25125: \$? = $ac_status" >&5
+  echo "$as_me:25145: \$? = $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 25132 "configure"
+#line 25152 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25139,22 +25159,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-bool foo = false
+bool foo = false; (void)foo
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25151: \$? = $ac_status" >&5
+  echo "$as_me:25171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25157: \$? = $ac_status" >&5
+  echo "$as_me:25177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25168,13 +25188,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25171: result: yes" >&5
+then	echo "$as_me:25191: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25173: result: no" >&5
+else	echo "$as_me:25193: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25177: checking for builtin bool type" >&5
+echo "$as_me:25197: 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
@@ -25182,7 +25202,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25185 "configure"
+#line 25205 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25191,22 +25211,22 @@ else
 int
 main (void)
 {
-bool x = false
+bool x = false; (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25203: \$? = $ac_status" >&5
+  echo "$as_me:25223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25209: \$? = $ac_status" >&5
+  echo "$as_me:25229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25219,9 +25239,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25222: result: yes" >&5
+then	echo "$as_me:25242: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25224: result: no" >&5
+else	echo "$as_me:25244: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25238,10 +25258,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25241: checking if we already have C++ library" >&5
+	echo "$as_me:25261: 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 25244 "configure"
+#line 25264 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25255,16 +25275,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25261: \$? = $ac_status" >&5
+  echo "$as_me:25281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25267: \$? = $ac_status" >&5
+  echo "$as_me:25287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25273,7 +25293,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25276: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25296: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25292,7 +25312,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25295: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25315: 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
@@ -25318,7 +25338,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25321 "configure"
+#line 25341 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25332,16 +25352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25338: \$? = $ac_status" >&5
+  echo "$as_me:25358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25344: \$? = $ac_status" >&5
+  echo "$as_me:25364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25353,7 +25373,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25356: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25376: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25375,7 +25395,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25378: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25398: 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
@@ -25390,15 +25410,15 @@ CF_EOF
 # 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:25393: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25396: \$? = $ac_status" >&5
+  echo "$as_me:25416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25398: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25401: \$? = $ac_status" >&5
+  echo "$as_me:25421: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25409,10 +25429,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25412: result: yes" >&5
+  echo "$as_me:25432: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25415: result: no" >&5
+  echo "$as_me:25435: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25432,7 +25452,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25435: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25455: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25453,7 +25473,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25456 "configure"
+#line 25476 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25467,16 +25487,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25473: \$? = $ac_status" >&5
+  echo "$as_me:25493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25479: \$? = $ac_status" >&5
+  echo "$as_me:25499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25513,7 +25533,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25516 "configure"
+#line 25536 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25527,16 +25547,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25533: \$? = $ac_status" >&5
+  echo "$as_me:25553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25539: \$? = $ac_status" >&5
+  echo "$as_me:25559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25569,7 +25589,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25572: result: $cf_cxx_library" >&5
+	echo "$as_me:25592: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25585,7 +25605,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25588: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25608: 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
@@ -25602,18 +25622,18 @@ do
   # 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 25605 "configure"
+#line 25625 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25630: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25616: \$? = $ac_status" >&5
+  echo "$as_me:25636: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25636,17 +25656,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25639 "configure"
+#line 25659 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25643: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25663: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25649: \$? = $ac_status" >&5
+  echo "$as_me:25669: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25683,7 +25703,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25686: result: $CXXCPP" >&5
+echo "$as_me:25706: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25693,18 +25713,18 @@ do
   # 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 25696 "configure"
+#line 25716 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25701: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25721: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25707: \$? = $ac_status" >&5
+  echo "$as_me:25727: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25727,17 +25747,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25730 "configure"
+#line 25750 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25734: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25754: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25740: \$? = $ac_status" >&5
+  echo "$as_me:25760: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25765,7 +25785,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25768: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25788: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25780,23 +25800,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25783: checking for $ac_header" >&5
+echo "$as_me:25803: 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 25789 "configure"
+#line 25809 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25813: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25799: \$? = $ac_status" >&5
+  echo "$as_me:25819: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25815,7 +25835,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25818: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25838: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25828,23 +25848,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25831: checking for $ac_header" >&5
+echo "$as_me:25851: 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 25837 "configure"
+#line 25857 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25861: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25847: \$? = $ac_status" >&5
+  echo "$as_me:25867: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25863,7 +25883,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25886: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25874,10 +25894,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25877: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25897: 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 25880 "configure"
+#line 25900 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25894,16 +25914,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25900: \$? = $ac_status" >&5
+  echo "$as_me:25920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25906: \$? = $ac_status" >&5
+  echo "$as_me:25926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25912,7 +25932,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25915: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25935: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25923,7 +25943,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25926: checking if we should include stdbool.h" >&5
+echo "$as_me:25946: 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
@@ -25931,35 +25951,35 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25934 "configure"
+#line 25954 "configure"
 #include "confdefs.h"
 
 int
 main (void)
 {
-bool foo = false
+bool foo = false; (void)foo
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25949: \$? = $ac_status" >&5
+  echo "$as_me:25969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25955: \$? = $ac_status" >&5
+  echo "$as_me:25975: \$? = $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 25962 "configure"
+#line 25982 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25969,22 +25989,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-bool foo = false
+bool foo = false; (void)foo
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25981: \$? = $ac_status" >&5
+  echo "$as_me:26001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:26007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25998,13 +26018,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26001: result: yes" >&5
+then	echo "$as_me:26021: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26003: result: no" >&5
+else	echo "$as_me:26023: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26007: checking for builtin bool type" >&5
+echo "$as_me:26027: 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
@@ -26012,7 +26032,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26015 "configure"
+#line 26035 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26021,22 +26041,22 @@ else
 int
 main (void)
 {
-bool x = false
+bool x = false; (void)x
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26033: \$? = $ac_status" >&5
+  echo "$as_me:26053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26039: \$? = $ac_status" >&5
+  echo "$as_me:26059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26049,19 +26069,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26052: result: yes" >&5
+then	echo "$as_me:26072: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26054: result: no" >&5
+else	echo "$as_me:26074: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26058: checking for bool" >&5
+echo "$as_me:26078: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26064 "configure"
+#line 26084 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26096,16 +26116,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26102: \$? = $ac_status" >&5
+  echo "$as_me:26122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26108: \$? = $ac_status" >&5
+  echo "$as_me:26128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26115,10 +26135,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26118: result: $ac_cv_type_bool" >&5
+echo "$as_me:26138: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26121: checking size of bool" >&5
+echo "$as_me:26141: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26127,7 +26147,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26130 "configure"
+#line 26150 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26159,21 +26179,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26165: \$? = $ac_status" >&5
+  echo "$as_me:26185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26171: \$? = $ac_status" >&5
+  echo "$as_me:26191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26176 "configure"
+#line 26196 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26205,16 +26225,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26211: \$? = $ac_status" >&5
+  echo "$as_me:26231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26217: \$? = $ac_status" >&5
+  echo "$as_me:26237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26230,7 +26250,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26233 "configure"
+#line 26253 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26262,16 +26282,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26285: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26268: \$? = $ac_status" >&5
+  echo "$as_me:26288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26274: \$? = $ac_status" >&5
+  echo "$as_me:26294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26287,7 +26307,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26290 "configure"
+#line 26310 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26319,16 +26339,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26325: \$? = $ac_status" >&5
+  echo "$as_me:26345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26331: \$? = $ac_status" >&5
+  echo "$as_me:26351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26341,12 +26361,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26344: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26364: 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 26349 "configure"
+#line 26369 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26382,15 +26402,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26388: \$? = $ac_status" >&5
+  echo "$as_me:26408: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26393: \$? = $ac_status" >&5
+  echo "$as_me:26413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26406,13 +26426,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26409: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26429: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26415: checking for type of bool" >&5
+echo "$as_me:26435: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26431,7 +26451,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26434 "configure"
+#line 26454 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26472,15 +26492,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26478: \$? = $ac_status" >&5
+  echo "$as_me:26498: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26483: \$? = $ac_status" >&5
+  echo "$as_me:26503: \$? = $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
@@ -26497,19 +26517,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26500: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26520: 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:26507: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26527: 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:26512: checking for special defines needed for etip.h" >&5
+echo "$as_me:26532: 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"
@@ -26527,7 +26547,7 @@ do
 	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 26530 "configure"
+#line 26550 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26541,16 +26561,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26547: \$? = $ac_status" >&5
+  echo "$as_me:26567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26553: \$? = $ac_status" >&5
+  echo "$as_me:26573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26571,12 +26591,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26574: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26594: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26579: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26599: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26593,7 +26613,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26596 "configure"
+#line 26616 "configure"
 #include "confdefs.h"
 
 class base
@@ -26612,15 +26632,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26618: \$? = $ac_status" >&5
+  echo "$as_me:26638: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26623: \$? = $ac_status" >&5
+  echo "$as_me:26643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26639,7 +26659,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26642: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26662: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26648,7 +26668,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26651: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26671: 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
@@ -26665,7 +26685,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26668 "configure"
+#line 26688 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26684,15 +26704,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26690: \$? = $ac_status" >&5
+  echo "$as_me:26710: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26695: \$? = $ac_status" >&5
+  echo "$as_me:26715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26711,7 +26731,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26714: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26734: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26721,7 +26741,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26724: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26744: 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
@@ -26735,7 +26755,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26738 "configure"
+#line 26758 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26779,16 +26799,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26785: \$? = $ac_status" >&5
+  echo "$as_me:26805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26791: \$? = $ac_status" >&5
+  echo "$as_me:26811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26806,7 +26826,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26809: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26829: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26855,13 +26875,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26858: checking for bool" >&5
+echo "$as_me:26878: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26864 "configure"
+#line 26884 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26896,16 +26916,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26902: \$? = $ac_status" >&5
+  echo "$as_me:26922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26908: \$? = $ac_status" >&5
+  echo "$as_me:26928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26915,10 +26935,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26918: result: $ac_cv_type_bool" >&5
+echo "$as_me:26938: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26921: checking size of bool" >&5
+echo "$as_me:26941: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26927,7 +26947,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26930 "configure"
+#line 26950 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26959,21 +26979,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26965: \$? = $ac_status" >&5
+  echo "$as_me:26985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26971: \$? = $ac_status" >&5
+  echo "$as_me:26991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26976 "configure"
+#line 26996 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27005,16 +27025,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27011: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27017: \$? = $ac_status" >&5
+  echo "$as_me:27037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27030,7 +27050,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27033 "configure"
+#line 27053 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27062,16 +27082,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27068: \$? = $ac_status" >&5
+  echo "$as_me:27088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27074: \$? = $ac_status" >&5
+  echo "$as_me:27094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27087,7 +27107,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27090 "configure"
+#line 27110 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27119,16 +27139,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27122: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27125: \$? = $ac_status" >&5
+  echo "$as_me:27145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27131: \$? = $ac_status" >&5
+  echo "$as_me:27151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27141,12 +27161,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27144: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27164: 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 27149 "configure"
+#line 27169 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27182,15 +27202,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27188: \$? = $ac_status" >&5
+  echo "$as_me:27208: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27193: \$? = $ac_status" >&5
+  echo "$as_me:27213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27206,13 +27226,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27209: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27229: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27215: checking for type of bool" >&5
+echo "$as_me:27235: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27231,7 +27251,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27234 "configure"
+#line 27254 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27272,15 +27292,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27278: \$? = $ac_status" >&5
+  echo "$as_me:27298: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27283: \$? = $ac_status" >&5
+  echo "$as_me:27303: \$? = $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
@@ -27297,26 +27317,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27300: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27320: 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:27307: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27327: 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:27313: checking for fallback type of bool" >&5
+			echo "$as_me:27333: 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:27319: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27339: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27345,7 +27365,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27348: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27368: 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
@@ -27362,7 +27382,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27365: checking for $ac_word" >&5
+echo "$as_me:27385: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27379,7 +27399,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27382: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27402: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27391,10 +27411,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27394: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27414: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27397: result: no" >&5
+  echo "$as_me:27417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27404,7 +27424,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27407: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27427: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27415,7 +27435,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27418: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27438: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27444,7 +27464,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27447: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27467: 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
@@ -27463,10 +27483,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27466: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27486: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27469: result: missing" >&5
+					echo "$as_me:27489: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27479,7 +27499,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27482: checking for gnat version" >&5
+echo "$as_me:27502: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27490,7 +27510,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27493: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27513: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27499,7 +27519,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27502: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27507,7 +27527,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27510: checking for $ac_word" >&5
+echo "$as_me:27530: 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
@@ -27522,7 +27542,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27525: found $ac_dir/$ac_word" >&5
+echo "$as_me:27545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27531,20 +27551,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27534: result: $M4_exists" >&5
+  echo "$as_me:27554: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27537: result: no" >&5
+  echo "$as_me:27557: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27543: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27547: checking if GNAT works" >&5
+			echo "$as_me:27567: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27572,7 +27592,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27575: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27595: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27584,7 +27604,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27587: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27607: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27601,10 +27621,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27604: result: $ADAFLAGS" >&5
+	echo "$as_me:27624: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27607: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27627: 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
@@ -27614,11 +27634,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27617: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27637: 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:27621: checking if GNAT supports generics" >&5
+echo "$as_me:27641: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27628,7 +27648,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27631: result: $cf_gnat_generics" >&5
+echo "$as_me:27651: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27640,7 +27660,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27643: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27663: 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
@@ -27688,7 +27708,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27691: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27711: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27701,7 +27721,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27704: checking if GNAT supports project files" >&5
+echo "$as_me:27724: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27764,15 +27784,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27767: result: $cf_gnat_projects" >&5
+echo "$as_me:27787: 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:27773: checking if GNAT supports libraries" >&5
+	echo "$as_me:27793: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27775: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27795: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27792,7 +27812,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27795: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27815: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27804,7 +27824,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27807: checking for Ada95 compiler" >&5
+echo "$as_me:27827: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27815,12 +27835,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27818: result: $cf_ada_compiler" >&5
+echo "$as_me:27838: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27823: checking for Ada95 include directory" >&5
+echo "$as_me:27843: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27856,7 +27876,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27859: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27879: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27865,10 +27885,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27868: result: $ADA_INCLUDE" >&5
+echo "$as_me:27888: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27871: checking for Ada95 object directory" >&5
+echo "$as_me:27891: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -27904,7 +27924,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27907: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27927: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27913,10 +27933,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27916: result: $ADA_OBJECTS" >&5
+echo "$as_me:27936: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27919: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:27939: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -27937,11 +27957,11 @@ then
 	fi
 fi
 
-echo "$as_me:27940: result: $with_ada_sharedlib" >&5
+echo "$as_me:27960: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:27944: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:27964: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -27959,7 +27979,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27962: checking for Ada95 curses library name" >&5
+echo "$as_me:27982: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27975,7 +27995,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27978: result: $ADA_LIBNAME" >&5
+echo "$as_me:27998: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -27986,13 +28006,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:27989: checking for wchar_t" >&5
+	echo "$as_me:28009: 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 27995 "configure"
+#line 28015 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28007,16 +28027,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28013: \$? = $ac_status" >&5
+  echo "$as_me:28033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28019: \$? = $ac_status" >&5
+  echo "$as_me:28039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28026,10 +28046,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28029: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28049: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28032: checking size of wchar_t" >&5
+echo "$as_me:28052: 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
@@ -28038,7 +28058,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28041 "configure"
+#line 28061 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28050,21 +28070,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28056: \$? = $ac_status" >&5
+  echo "$as_me:28076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28062: \$? = $ac_status" >&5
+  echo "$as_me:28082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28067 "configure"
+#line 28087 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28076,16 +28096,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28082: \$? = $ac_status" >&5
+  echo "$as_me:28102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28088: \$? = $ac_status" >&5
+  echo "$as_me:28108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28101,7 +28121,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28104 "configure"
+#line 28124 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28113,16 +28133,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28119: \$? = $ac_status" >&5
+  echo "$as_me:28139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28125: \$? = $ac_status" >&5
+  echo "$as_me:28145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28138,7 +28158,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28141 "configure"
+#line 28161 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28150,16 +28170,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28156: \$? = $ac_status" >&5
+  echo "$as_me:28176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28162: \$? = $ac_status" >&5
+  echo "$as_me:28182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28172,12 +28192,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28175: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28195: 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 28180 "configure"
+#line 28200 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28193,15 +28213,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28199: \$? = $ac_status" >&5
+  echo "$as_me:28219: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28204: \$? = $ac_status" >&5
+  echo "$as_me:28224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28217,7 +28237,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28220: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28240: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28230,7 +28250,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28233: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28253: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28248,7 +28268,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28251: checking for library subsets" >&5
+echo "$as_me:28271: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28302,7 +28322,7 @@ fi
 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:28305: result: $LIB_SUBSETS" >&5
+echo "$as_me:28325: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28333,7 +28353,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28336: checking default library suffix" >&5
+echo "$as_me:28356: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28344,10 +28364,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28347: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28367: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28350: checking default library-dependency suffix" >&5
+echo "$as_me:28370: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28430,10 +28450,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28433: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28453: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28436: checking default object directory" >&5
+echo "$as_me:28456: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28449,11 +28469,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28452: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28472: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28456: checking c++ library-dependency suffix" >&5
+echo "$as_me:28476: 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++)
@@ -28546,7 +28566,7 @@ else
 	fi
 
 fi
-echo "$as_me:28549: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28569: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28722,19 +28742,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28725: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28745: 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 <<EOF
-#line 28730 "configure"
+#line 28750 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28734: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28737: \$? = $ac_status" >&5
+  echo "$as_me:28757: \$? = $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
@@ -28745,10 +28765,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28748 "configure"
+#line 28768 "configure"
 #include "confdefs.h"
 
-#line 28751 "configure"
+#line 28771 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28763,16 +28783,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28769: \$? = $ac_status" >&5
+  echo "$as_me:28789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28775: \$? = $ac_status" >&5
+  echo "$as_me:28795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28795,7 +28815,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28798: result: $cf_ldflags_static" >&5
+	echo "$as_me:28818: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28811,7 +28831,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28814: checking where we will install curses.h" >&5
+echo "$as_me:28834: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28821,7 +28841,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28824: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28844: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28829,7 +28849,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28832: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28852: 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
@@ -28854,7 +28874,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28857: checking for desired basename for form library" >&5
+echo "$as_me:28877: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28874,10 +28894,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28877: result: $FORM_NAME" >&5
+echo "$as_me:28897: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28880: checking for desired basename for menu library" >&5
+echo "$as_me:28900: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28897,10 +28917,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28900: result: $MENU_NAME" >&5
+echo "$as_me:28920: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28903: checking for desired basename for panel library" >&5
+echo "$as_me:28923: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28920,10 +28940,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28923: result: $PANEL_NAME" >&5
+echo "$as_me:28943: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28926: checking for desired basename for cxx library" >&5
+echo "$as_me:28946: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28943,13 +28963,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28946: result: $CXX_NAME" >&5
+echo "$as_me:28966: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28952: checking for src modules" >&5
+echo "$as_me:28972: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29008,7 +29028,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29011: result: $cf_cv_src_modules" >&5
+echo "$as_me:29031: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29169,7 +29189,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29172: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29192: 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//'`
@@ -29180,7 +29200,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29183: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29203: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29196,7 +29216,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29199: result: $PKG_CFLAGS" >&5
+echo "$as_me:29219: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29257,7 +29277,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29260: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29280: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29284,7 +29304,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29287: checking for linker search path" >&5
+echo "$as_me:29307: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29332,7 +29352,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29335: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29355: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29373,7 +29393,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29376: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29396: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29459,7 +29479,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29462: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29482: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29640,7 +29660,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29643: error: ambiguous option: $1
+    { { echo "$as_me:29663: 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;}
@@ -29659,7 +29679,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29662: error: unrecognized option: $1
+  -*) { { echo "$as_me:29682: 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;}
@@ -29789,7 +29809,7 @@ do
   "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:29792: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29812: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30308,7 +30328,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30311: creating $ac_file" >&5
+    { echo "$as_me:30331: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30326,7 +30346,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30329: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30349: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30339,7 +30359,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30342: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30362: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30355,7 +30375,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30358: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30378: 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;}
@@ -30364,7 +30384,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30367: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30387: 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;}
@@ -30409,7 +30429,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30412: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30432: 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;}
@@ -30420,7 +30440,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30423: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30443: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30469,7 +30489,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30472: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30492: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30480,7 +30500,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30483: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30503: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30493,7 +30513,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30496: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30516: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30551,7 +30571,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30554: $ac_file is unchanged" >&5
+      { echo "$as_me:30574: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30938,7 +30958,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30941: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30961: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 424ad6be2..565c909cc 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.772 2023/11/25 21:05:05 tom Exp $
+dnl $Id: configure.in,v 1.773 2023/12/03 11:07:25 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.772 $)
+AC_REVISION($Revision: 1.773 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -765,7 +765,7 @@ AC_ARG_ENABLE(big-core,
 	[AC_TRY_RUN([
 #include <stdlib.h>
 #include <string.h>
-int main() {
+int main(void) {
 	unsigned long n = 6000000L;
 	char *s = malloc(n);
 	if (s != 0)
diff --git a/dist.mk b/dist.mk
index 17d0b6709..271ac115e 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1581 2023/12/02 21:47:07 tom Exp $
+# $Id: dist.mk,v 1.1582 2023/12/09 11:46:25 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231202
+NCURSES_PATCH = 20231209
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/man/make_sed.sh b/man/make_sed.sh
index c271f63a2..ee7df4177 100755
--- a/man/make_sed.sh
+++ b/man/make_sed.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: make_sed.sh,v 1.18 2023/11/25 14:31:18 tom Exp $
+# $Id: make_sed.sh,v 1.19 2023/12/07 01:16:43 tom Exp $
 ##############################################################################
 # Copyright 2020-2022,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
@@ -76,9 +76,10 @@ sed	-e 's/\//\/TH /' \
 	$UPPER
 
 echo "# Do the embedded references"
-sed	-e 's/</<fB/' \
+sed	-e 's/</<fB\\(\\\\%\\)\\?/' \
+	-e 's/\\%</\\%/' \
 	-e 's/	/\\\\fP(/' \
-	-e 's/	/)\/fB/' \
+	-e 's/	/)\/fB\\\\%/' \
 	-e 's/	/\\\\fP(/' \
 	-e 's/\/$/)\//' \
 	$UPPER
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 7a75d2c16..91709614a 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1081 $
-#	$Date: 2023/11/11 20:54:00 $
+#	$Revision: 1.1083 $
+#	$Date: 2023/12/09 18:07: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
@@ -4154,7 +4154,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
 #	resize.pl gets no reply, resize.sh needs fix for no reply.
 scrt|securecrt|SecureCRT emulating xterm-256color,
 	bce@, km@, npc,
-	bel@, cvvis@, kcbt=\E[Z, use=linux+kbs, use=vt220+pcedit,
+	bel@, cvvis@, kcbt=\E[Z, use=vt220+pcedit,
 	use=xterm+256setaf, use=ecma+index, use=ansi+rep,
 	use=xterm+keypad, use=xterm+pcfkeys, use=xterm-basic,
 
@@ -8515,7 +8515,7 @@ tmux|tmux terminal multiplexer,
 	use=ecma+italics, use=ecma+strikeout, use=xterm+edit,
 	use=xterm+pcfkeys, use=xterm+sl, use=xterm+tmux,
 	use=screen, use=bracketed+paste, use=report+version,
-	use=xterm+focus, use=xterm+sm+1006,
+	use=xterm+focus,
 
 tmux-256color|tmux with 256 colors,
 	use=xterm+256setaf, use=tmux,
@@ -18190,7 +18190,7 @@ ibm+16color|IBM aixterm color definitions,
 	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,
+	ncv@,
 	bold@, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ibm5151,
 	use=ibm+color,
 ibmega-c|ibm5154-c|IBM Enhanced Color Display with standout and underline,
@@ -18237,12 +18237,10 @@ ibm8512|ibm8513|IBM color VGA Terminal,
 	smacs=^N, smam=\E[?7h, smcup=\E[20;4l\E[?7h\Eb,
 	smdc=\E[4h, use=ibm8503,
 hft-c|HFT with Color,
-	colors#8, pairs#64,
 	acsc=jjkkllmmnnqqttuuvvwwxx, s0ds=\E(B, s1ds=\E(0,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m\E(B,
 	use=ibm5151, use=ibm+color,
 hft-c-old|HFT with Color PC850,
-	colors#8, pairs#64,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ibm5151,
 	use=ibm+color,
 hft-old|AIWS High Function Terminal,
@@ -27777,4 +27775,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-11-11
 #	+ used "infocmp -u" to help trim redundant capabilities -TD
 #
+# 2023-12-09
+#	+ remove xterm+sm+1006 from tmux (Debian #1057688).
+#	+ used "infocmp -u" to help trim redundant capabilities -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 7a9f70878..f208818fb 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231202) unstable; urgency=low
+ncurses6 (6.4+20231209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7a9f70878..f208818fb 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231202) unstable; urgency=low
+ncurses6 (6.4+20231209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 49ea84260..bbc96461f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231202) unstable; urgency=low
+ncurses6 (6.4+20231209) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Dec 2023 16:47:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3a0a0908d..ea75563c2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.621 2023/12/02 21:47:07 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.622 2023/12/04 00:13:44 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1202"
+!define VERSION_MMDD  "1209"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index a2efa4010..eda21ca6e 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231202
+Release: 20231209
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 59cf32e9d..217f8cd34 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231202
+Release: 20231209
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7e0482af7..efb2f1e22 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231202
+Release: 20231209
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 69a6483d5..62cbb17a8 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.159 2023/12/02 17:29:01 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.161 2023/12/09 19:56:10 tom Exp $")
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -191,6 +191,7 @@ static int
 use_predicate(unsigned type, PredIdx idx)
 /* predicate function to use for use decompilation */
 {
+    int result = FAIL;
     ENTRY *ep;
 
     switch (type) {
@@ -218,10 +219,10 @@ use_predicate(unsigned type, PredIdx idx)
 		    }
 		}
 		if (is_set != entries[0].tterm.Booleans[idx])
-		    return (!is_set);
+		    result = (!is_set);
 	    }
-	    return (FAIL);
 	}
+	break;
 
     case NUMBER:
 	{
@@ -241,16 +242,15 @@ use_predicate(unsigned type, PredIdx idx)
 		    }
 
 		if (value != entries[0].tterm.Numbers[idx])
-		    return (value != ABSENT_NUMERIC);
+		    result = (value != ABSENT_NUMERIC);
 	    }
-	    return (FAIL);
 	}
+	break;
 
     case STRING:
 	{
-	    char *termstr, *usestr = ABSENT_STRING;
-
-	    termstr = entries[0].tterm.Strings[idx];
+	    char *termstr = entries[0].tterm.Strings[idx];
+	    char *usestr = ABSENT_STRING;
 
 	    /*
 	     * We take the semantics of multiple uses to be 'each
@@ -265,16 +265,22 @@ use_predicate(unsigned type, PredIdx idx)
 			break;
 		    }
 
-		if (usestr == ABSENT_STRING && termstr == ABSENT_STRING)
-		    return (FAIL);
+		if (usestr == CANCELLED_STRING && termstr == ABSENT_STRING)
+		    result = (FAIL);
+		else if (usestr == ABSENT_STRING && termstr == ABSENT_STRING)
+		    result = (FAIL);
 		else if (!usestr || !termstr || capcmp(idx, usestr, termstr))
-		    return (TRUE);
+		    result = (TRUE);
 	    }
-	    return (FAIL);
 	}
+	break;
+
+    default:
+	result = FALSE;
+	break;
     }
 
-    return (FALSE);		/* pacify compiler */
+    return (result);
 }
 
 static bool
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index a204aa94f..3bdd8e739 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.219 2023/11/23 01:48:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.220 2023/12/03 14:21:34 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -697,7 +697,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -732,6 +732,7 @@ AC_TRY_COMPILE(
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
 		[
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -1711,7 +1712,7 @@ AC_CHECK_LIB(bsd, gettimeofday,
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04
+dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
@@ -1728,6 +1729,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 ],[
 	int x = openpty((int *)0, (int *)0, (char *)0,
 				   (struct termios *)0, (struct winsize *)0);
+	(void)x;
 ],[
 		cf_cv_func_openpty=$cf_header
 		break
@@ -4076,7 +4078,7 @@ AC_DEFUN([CF_VERBOSE],
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34
 dnl -------------
 dnl Check if type wide-character type $1 is declared, and if so, which header
 dnl file is needed.  The second parameter is used to set a shell variable when
@@ -4093,7 +4095,7 @@ AC_TRY_COMPILE([
 #ifdef HAVE_LIBUTF8_H
 #include <libutf8.h>
 #endif],
-	[$1 state],
+	[$1 state; (void)state],
 	[cf_cv_$1=no],
 	[AC_TRY_COMPILE([
 #include <stdlib.h>
@@ -4103,7 +4105,7 @@ AC_TRY_COMPILE([
 #ifdef HAVE_LIBUTF8_H
 #include <libutf8.h>
 #endif],
-	[$1 value],
+	[$1 value; (void) value],
 	[cf_cv_$1=yes],
 	[cf_cv_$1=unknown])])])
 
diff --git a/test/configure b/test/configure
index 53acceb54..dfc9112e9 100755
--- a/test/configure
+++ b/test/configure
@@ -20189,22 +20189,23 @@ main (void)
 
 	int x = openpty((int *)0, (int *)0, (char *)0,
 				   (struct termios *)0, (struct winsize *)0);
+	(void)x;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20201: \$? = $ac_status" >&5
+  echo "$as_me:20202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20207: \$? = $ac_status" >&5
+  echo "$as_me:20208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20222,7 +20223,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20225: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20226: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20256,7 +20257,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20259: checking for function curses_version" >&5
+echo "$as_me:20260: 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
@@ -20266,7 +20267,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20269 "configure"
+#line 20270 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20282,15 +20283,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20288: \$? = $ac_status" >&5
+  echo "$as_me:20289: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20293: \$? = $ac_status" >&5
+  echo "$as_me:20294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20305,14 +20306,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20308: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20309: 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:20315: checking for alternate character set array" >&5
+echo "$as_me:20316: 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
@@ -20322,7 +20323,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20325 "configure"
+#line 20326 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20338,16 +20339,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20344: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20350: \$? = $ac_status" >&5
+  echo "$as_me:20351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20358,7 +20359,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20361: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20362: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20368,7 +20369,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20371: checking for wide alternate character set array" >&5
+echo "$as_me:20372: 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
@@ -20378,7 +20379,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20381 "configure"
+#line 20382 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20394,16 +20395,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20400: \$? = $ac_status" >&5
+  echo "$as_me:20401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20406: \$? = $ac_status" >&5
+  echo "$as_me:20407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20414,7 +20415,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20417: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20418: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20422,7 +20423,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20425: checking for wide alternate character constants" >&5
+echo "$as_me:20426: 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
@@ -20432,7 +20433,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20435 "configure"
+#line 20436 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20449,16 +20450,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20455: \$? = $ac_status" >&5
+  echo "$as_me:20456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20461: \$? = $ac_status" >&5
+  echo "$as_me:20462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20468,7 +20469,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20471 "configure"
+#line 20472 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20484,16 +20485,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20490: \$? = $ac_status" >&5
+  echo "$as_me:20491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20496: \$? = $ac_status" >&5
+  echo "$as_me:20497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20504,7 +20505,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20507: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20508: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20514,10 +20515,10 @@ EOF
 
 fi
 
-echo "$as_me:20517: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20518: 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 20520 "configure"
+#line 20521 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20535,16 +20536,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20541: \$? = $ac_status" >&5
+  echo "$as_me:20542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20547: \$? = $ac_status" >&5
+  echo "$as_me:20548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20553,7 +20554,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20556: result: $cf_result" >&5
+echo "$as_me:20557: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20574,14 +20575,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20577: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20578: 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 20584 "configure"
+#line 20585 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20593,29 +20594,29 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-mbstate_t state
+mbstate_t state; (void)state
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20605: \$? = $ac_status" >&5
+  echo "$as_me:20606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20611: \$? = $ac_status" >&5
+  echo "$as_me:20612: \$? = $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 20618 "configure"
+#line 20619 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20628,22 +20629,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-mbstate_t value
+mbstate_t value; (void) value
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20640: \$? = $ac_status" >&5
+  echo "$as_me:20641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20646: \$? = $ac_status" >&5
+  echo "$as_me:20647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20655,7 +20656,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20658: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20659: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20678,14 +20679,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20681: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20682: 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 20688 "configure"
+#line 20689 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20697,29 +20698,29 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wchar_t state
+wchar_t state; (void)state
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20709: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20715: \$? = $ac_status" >&5
+  echo "$as_me:20716: \$? = $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 20722 "configure"
+#line 20723 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20732,22 +20733,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wchar_t value
+wchar_t value; (void) value
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20744: \$? = $ac_status" >&5
+  echo "$as_me:20745: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20750: \$? = $ac_status" >&5
+  echo "$as_me:20751: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20759,7 +20760,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20762: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20763: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20782,14 +20783,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20785: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20786: 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 20792 "configure"
+#line 20793 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20801,29 +20802,29 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wint_t state
+wint_t state; (void)state
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20813: \$? = $ac_status" >&5
+  echo "$as_me:20814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20819: \$? = $ac_status" >&5
+  echo "$as_me:20820: \$? = $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 20826 "configure"
+#line 20827 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20836,22 +20837,22 @@ cat >"conftest.$ac_ext" <<_ACEOF
 int
 main (void)
 {
-wint_t value
+wint_t value; (void) value
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20848: \$? = $ac_status" >&5
+  echo "$as_me:20849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20854: \$? = $ac_status" >&5
+  echo "$as_me:20855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20863,7 +20864,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20866: result: $cf_cv_wint_t" >&5
+echo "$as_me:20867: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20887,10 +20888,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20890: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20891: 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 20893 "configure"
+#line 20894 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20908,16 +20909,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20914: \$? = $ac_status" >&5
+  echo "$as_me:20915: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20920: \$? = $ac_status" >&5
+  echo "$as_me:20921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20926,7 +20927,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20929: result: $cf_result" >&5
+echo "$as_me:20930: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20948,10 +20949,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20951: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20952: 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 20954 "configure"
+#line 20955 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20969,16 +20970,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20975: \$? = $ac_status" >&5
+  echo "$as_me:20976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:20982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20987,7 +20988,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20990: result: $cf_result" >&5
+echo "$as_me:20991: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21009,10 +21010,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21012: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21013: 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 21015 "configure"
+#line 21016 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21030,16 +21031,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21036: \$? = $ac_status" >&5
+  echo "$as_me:21037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21048,7 +21049,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21051: result: $cf_result" >&5
+echo "$as_me:21052: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21077,11 +21078,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21080: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21081: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21084 "configure"
+#line 21085 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21114,16 +21115,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21120: \$? = $ac_status" >&5
+  echo "$as_me:21121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21126: \$? = $ac_status" >&5
+  echo "$as_me:21127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21133,7 +21134,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21136: result: $cf_result" >&5
+echo "$as_me:21137: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21145,14 +21146,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21148: checking for data $cf_data in library" >&5
+	echo "$as_me:21149: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21155 "configure"
+#line 21156 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21191,16 +21192,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21197: \$? = $ac_status" >&5
+  echo "$as_me:21198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21203: \$? = $ac_status" >&5
+  echo "$as_me:21204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21212,7 +21213,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21215 "configure"
+#line 21216 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21244,15 +21245,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21248: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21250: \$? = $ac_status" >&5
+  echo "$as_me:21251: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21255: \$? = $ac_status" >&5
+  echo "$as_me:21256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21264,7 +21265,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21267: result: $cf_result" >&5
+	echo "$as_me:21268: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21281,7 +21282,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21284: checking for X" >&5
+	echo "$as_me:21285: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21385,17 +21386,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21388 "configure"
+#line 21389 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21392: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21393: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21398: \$? = $ac_status" >&5
+  echo "$as_me:21399: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21428,7 +21429,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21431 "configure"
+#line 21432 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21440,16 +21441,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21446: \$? = $ac_status" >&5
+  echo "$as_me:21447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21452: \$? = $ac_status" >&5
+  echo "$as_me:21453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21487,7 +21488,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21490: result: $have_x" >&5
+  echo "$as_me:21491: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21497,7 +21498,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21500: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21501: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21524,11 +21525,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21527: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21528: 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 21531 "configure"
+#line 21532 "configure"
 #include "confdefs.h"
 
 int
@@ -21540,16 +21541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21546: \$? = $ac_status" >&5
+  echo "$as_me:21547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21552: \$? = $ac_status" >&5
+  echo "$as_me:21553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21559,13 +21560,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21562: result: no" >&5
+	echo "$as_me:21563: 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 21568 "configure"
+#line 21569 "configure"
 #include "confdefs.h"
 
 int
@@ -21577,16 +21578,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21583: \$? = $ac_status" >&5
+  echo "$as_me:21584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21589: \$? = $ac_status" >&5
+  echo "$as_me:21590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21596,11 +21597,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21599: result: yes" >&5
+	  echo "$as_me:21600: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21603: result: neither works" >&5
+	  echo "$as_me:21604: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21620,7 +21621,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21623 "configure"
+#line 21624 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21639,22 +21640,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21645: \$? = $ac_status" >&5
+  echo "$as_me:21646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21651: \$? = $ac_status" >&5
+  echo "$as_me:21652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21657: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21658: 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
@@ -21662,7 +21663,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21665 "configure"
+#line 21666 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21681,16 +21682,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21687: \$? = $ac_status" >&5
+  echo "$as_me:21688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21693: \$? = $ac_status" >&5
+  echo "$as_me:21694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21701,14 +21702,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21704: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21705: 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:21711: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21712: 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
@@ -21716,7 +21717,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21719 "configure"
+#line 21720 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21735,16 +21736,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21741: \$? = $ac_status" >&5
+  echo "$as_me:21742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21747: \$? = $ac_status" >&5
+  echo "$as_me:21748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21755,7 +21756,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21758: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21759: 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"
@@ -21774,13 +21775,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21777: checking for gethostbyname" >&5
+    echo "$as_me:21778: 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 21783 "configure"
+#line 21784 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21811,16 +21812,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21817: \$? = $ac_status" >&5
+  echo "$as_me:21818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21823: \$? = $ac_status" >&5
+  echo "$as_me:21824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21830,11 +21831,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21833: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21834: 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:21837: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21838: 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
@@ -21842,7 +21843,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21845 "configure"
+#line 21846 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21861,16 +21862,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21867: \$? = $ac_status" >&5
+  echo "$as_me:21868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21873: \$? = $ac_status" >&5
+  echo "$as_me:21874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21881,14 +21882,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21884: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21885: 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:21891: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21892: 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
@@ -21896,7 +21897,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21899 "configure"
+#line 21900 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21915,16 +21916,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21921: \$? = $ac_status" >&5
+  echo "$as_me:21922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21935,7 +21936,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21938: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21939: 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"
@@ -21951,13 +21952,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21954: checking for connect" >&5
+    echo "$as_me:21955: 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 21960 "configure"
+#line 21961 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21988,16 +21989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21994: \$? = $ac_status" >&5
+  echo "$as_me:21995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22000: \$? = $ac_status" >&5
+  echo "$as_me:22001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22007,11 +22008,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22010: result: $ac_cv_func_connect" >&5
+echo "$as_me:22011: 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:22014: checking for connect in -lsocket" >&5
+      echo "$as_me:22015: 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
@@ -22019,7 +22020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22022 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22038,16 +22039,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22044: \$? = $ac_status" >&5
+  echo "$as_me:22045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22050: \$? = $ac_status" >&5
+  echo "$as_me:22051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22058,7 +22059,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22061: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22062: 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"
@@ -22067,13 +22068,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22070: checking for remove" >&5
+    echo "$as_me:22071: 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 22076 "configure"
+#line 22077 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22104,16 +22105,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22110: \$? = $ac_status" >&5
+  echo "$as_me:22111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22116: \$? = $ac_status" >&5
+  echo "$as_me:22117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22123,11 +22124,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22126: result: $ac_cv_func_remove" >&5
+echo "$as_me:22127: 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:22130: checking for remove in -lposix" >&5
+      echo "$as_me:22131: 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
@@ -22135,7 +22136,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22138 "configure"
+#line 22139 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22154,16 +22155,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22160: \$? = $ac_status" >&5
+  echo "$as_me:22161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22166: \$? = $ac_status" >&5
+  echo "$as_me:22167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22174,7 +22175,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22177: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22178: 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"
@@ -22183,13 +22184,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22186: checking for shmat" >&5
+    echo "$as_me:22187: 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 22192 "configure"
+#line 22193 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22220,16 +22221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22226: \$? = $ac_status" >&5
+  echo "$as_me:22227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22232: \$? = $ac_status" >&5
+  echo "$as_me:22233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22239,11 +22240,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22242: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22243: 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:22246: checking for shmat in -lipc" >&5
+      echo "$as_me:22247: 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
@@ -22251,7 +22252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22254 "configure"
+#line 22255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22270,16 +22271,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22276: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22282: \$? = $ac_status" >&5
+  echo "$as_me:22283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22290,7 +22291,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22293: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22294: 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"
@@ -22308,7 +22309,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22311: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22312: 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
@@ -22316,7 +22317,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22319 "configure"
+#line 22320 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22335,16 +22336,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22341: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22347: \$? = $ac_status" >&5
+  echo "$as_me:22348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22355,7 +22356,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22358: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22359: 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"
@@ -22402,16 +22403,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22405: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22406: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22410: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22411: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22414: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22415: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22450,16 +22451,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22453: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22458: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22459: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22462: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22463: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22498,23 +22499,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22501: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22502: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22506: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22507: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22510: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22511: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22517: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22518: 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.
@@ -22531,7 +22532,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22534: result: $enable_warnings" >&5
+echo "$as_me:22535: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22554,10 +22555,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22557: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22558: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22560 "${as_me:-configure}"
+#line 22561 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22607,12 +22608,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22610: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22613: \$? = $ac_status" >&5
+  echo "$as_me:22614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22615: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22616: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22690,7 +22691,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22693 "configure"
+#line 22694 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22705,28 +22706,29 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22711: \$? = $ac_status" >&5
+  echo "$as_me:22712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22717: \$? = $ac_status" >&5
+  echo "$as_me:22718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22720: checking for X11/Xt const-feature" >&5
+echo "$as_me:22721: 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 22727 "configure"
+#line 22728 "configure"
 #include "confdefs.h"
 
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -22741,16 +22743,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22747: \$? = $ac_status" >&5
+  echo "$as_me:22749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22753: \$? = $ac_status" >&5
+  echo "$as_me:22755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22765,7 +22767,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22768: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22770: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22794,7 +22796,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22797 "${as_me:-configure}"
+#line 22799 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22810,7 +22812,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22813: checking for $CC warning options..." >&5
+	{ echo "$as_me:22815: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22826,12 +22828,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22829: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22832: \$? = $ac_status" >&5
+  echo "$as_me:22834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22834: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22836: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22839,7 +22841,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22842: checking for $CC warning options..." >&5
+	{ echo "$as_me:22844: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22862,12 +22864,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22865: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22868: \$? = $ac_status" >&5
+  echo "$as_me:22870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22870: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22872: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22875,7 +22877,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22878: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22880: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22885,7 +22887,7 @@ echo "${as_me:-configure}:22878: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22888: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22890: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22902,7 +22904,7 @@ fi
 
 fi
 
-echo "$as_me:22905: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22907: 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.
@@ -22924,7 +22926,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22927: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22929: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23038,23 +23040,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23041: checking for dmalloc.h" >&5
+	echo "$as_me:23043: 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 23047 "configure"
+#line 23049 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23053: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23057: \$? = $ac_status" >&5
+  echo "$as_me:23059: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23073,11 +23075,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23076: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23078: 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:23080: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23082: 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
@@ -23085,7 +23087,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23088 "configure"
+#line 23090 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23104,16 +23106,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23110: \$? = $ac_status" >&5
+  echo "$as_me:23112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23116: \$? = $ac_status" >&5
+  echo "$as_me:23118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23124,7 +23126,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23127: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23129: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23139,7 +23141,7 @@ fi
 
 fi
 
-echo "$as_me:23142: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23144: 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.
@@ -23161,7 +23163,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23164: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23166: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23275,23 +23277,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23278: checking for dbmalloc.h" >&5
+	echo "$as_me:23280: 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 23284 "configure"
+#line 23286 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23288: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23290: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23294: \$? = $ac_status" >&5
+  echo "$as_me:23296: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23310,11 +23312,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23313: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23315: 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:23317: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23319: 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
@@ -23322,7 +23324,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23325 "configure"
+#line 23327 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23341,16 +23343,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23347: \$? = $ac_status" >&5
+  echo "$as_me:23349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23353: \$? = $ac_status" >&5
+  echo "$as_me:23355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23361,7 +23363,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23364: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23366: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23376,7 +23378,7 @@ fi
 
 fi
 
-echo "$as_me:23379: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23381: 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.
@@ -23398,7 +23400,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23401: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23403: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23511,7 +23513,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23514: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23516: 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.
@@ -23522,7 +23524,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23525: result: $with_no_leaks" >&5
+echo "$as_me:23527: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23540,7 +23542,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23543: checking for an rpath option" >&5
+	echo "$as_me:23545: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23571,12 +23573,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23574: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23576: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23579: checking if we need a space after rpath option" >&5
+		echo "$as_me:23581: 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"
 
@@ -23597,7 +23599,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23600 "configure"
+#line 23602 "configure"
 #include "confdefs.h"
 
 int
@@ -23609,16 +23611,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23615: \$? = $ac_status" >&5
+  echo "$as_me:23617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23621: \$? = $ac_status" >&5
+  echo "$as_me:23623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23628,14 +23630,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23631: result: $cf_rpath_space" >&5
+		echo "$as_me:23633: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23638: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23640: 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.
@@ -23653,22 +23655,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23656: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23658: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23661: checking for updated LDFLAGS" >&5
+echo "$as_me:23663: 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:23664: result: maybe" >&5
+	echo "$as_me:23666: 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:23671: checking for $ac_word" >&5
+echo "$as_me:23673: 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
@@ -23683,7 +23685,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23686: found $ac_dir/$ac_word" >&5
+echo "$as_me:23688: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23691,10 +23693,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23694: result: $cf_ldd_prog" >&5
+  echo "$as_me:23696: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23697: result: no" >&5
+  echo "$as_me:23699: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23708,7 +23710,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23711 "configure"
+#line 23713 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23720,16 +23722,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23726: \$? = $ac_status" >&5
+  echo "$as_me:23728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23732: \$? = $ac_status" >&5
+  echo "$as_me:23734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23757,7 +23759,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23760: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23762: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23769,11 +23771,11 @@ echo "${as_me:-configure}:23760: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23772: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23776: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23778: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23810,7 +23812,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23813: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23815: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23823,11 +23825,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23826: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23828: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23830: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23832: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23864,7 +23866,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23867: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23869: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23877,14 +23879,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23880: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23882: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23884: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23887: result: no" >&5
+	echo "$as_me:23889: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23974,7 +23976,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23977: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23979: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24155,7 +24157,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24158: error: ambiguous option: $1
+    { { echo "$as_me:24160: 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;}
@@ -24174,7 +24176,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24177: error: unrecognized option: $1
+  -*) { { echo "$as_me:24179: 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;}
@@ -24224,7 +24226,7 @@ do
   "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:24227: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24229: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24532,7 +24534,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24535: creating $ac_file" >&5
+    { echo "$as_me:24537: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24550,7 +24552,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24553: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24555: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24563,7 +24565,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24566: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24568: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24579,7 +24581,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24582: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24584: 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;}
@@ -24588,7 +24590,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24591: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24593: 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;}
@@ -24633,7 +24635,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24636: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24638: 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;}
@@ -24644,7 +24646,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24647: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24649: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24693,7 +24695,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24696: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24698: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24704,7 +24706,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24707: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24709: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24717,7 +24719,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24720: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24722: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24775,7 +24777,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24778: $ac_file is unchanged" >&5
+      { echo "$as_me:24780: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

From 5ba6cf3fca36dae0f066e9c2066d00d8617f3b3a Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 18 Dec 2023 09:58:33 +0100
Subject: [PATCH 045/106] ncurses-6.4-20231217.patch

---
 NEWS                                       |  15 +-
 VERSION                                    |   2 +-
 dist.mk                                    |   8 +-
 doc/html/man/adacursesw6-config.1.html     |   8 +-
 doc/html/man/captoinfo.1m.html             | 153 +++--
 doc/html/man/clear.1.html                  |   8 +-
 doc/html/man/curs_add_wch.3x.html          |  24 +-
 doc/html/man/curs_addch.3x.html            |  22 +-
 doc/html/man/curs_attr.3x.html             |  28 +-
 doc/html/man/curs_bkgd.3x.html             | 174 ++---
 doc/html/man/curs_bkgrnd.3x.html           | 131 ++--
 doc/html/man/curs_border.3x.html           |   8 +-
 doc/html/man/curs_clear.3x.html            |  18 +-
 doc/html/man/curs_color.3x.html            | 175 ++---
 doc/html/man/curs_delch.3x.html            |   8 +-
 doc/html/man/curs_deleteln.3x.html         |  10 +-
 doc/html/man/curs_extend.3x.html           |  10 +-
 doc/html/man/curs_get_wstr.3x.html         |  12 +-
 doc/html/man/curs_getcchar.3x.html         |  20 +-
 doc/html/man/curs_getch.3x.html            |  23 +-
 doc/html/man/curs_getstr.3x.html           |  24 +-
 doc/html/man/curs_getyx.3x.html            |  10 +-
 doc/html/man/curs_inch.3x.html             |  16 +-
 doc/html/man/curs_initscr.3x.html          |  44 +-
 doc/html/man/curs_inopts.3x.html           |   8 +-
 doc/html/man/curs_ins_wstr.3x.html         |  14 +-
 doc/html/man/curs_insch.3x.html            |  21 +-
 doc/html/man/curs_instr.3x.html            |  10 +-
 doc/html/man/curs_kernel.3x.html           |  14 +-
 doc/html/man/curs_memleaks.3x.html         |  16 +-
 doc/html/man/curs_mouse.3x.html            | 180 +++---
 doc/html/man/curs_move.3x.html             |  13 +-
 doc/html/man/curs_opaque.3x.html           |   8 +-
 doc/html/man/curs_outopts.3x.html          |  16 +-
 doc/html/man/curs_overlay.3x.html          |  12 +-
 doc/html/man/curs_pad.3x.html              |  84 +--
 doc/html/man/curs_print.3x.html            |   8 +-
 doc/html/man/curs_printw.3x.html           | 131 ++--
 doc/html/man/curs_refresh.3x.html          |  12 +-
 doc/html/man/curs_scanw.3x.html            | 172 ++---
 doc/html/man/curs_scr_dump.3x.html         |  10 +-
 doc/html/man/curs_scroll.3x.html           |  70 +-
 doc/html/man/curs_slk.3x.html              | 154 ++---
 doc/html/man/curs_sp_funcs.3x.html         |  14 +-
 doc/html/man/curs_termcap.3x.html          | 453 +++++++------
 doc/html/man/curs_terminfo.3x.html         |  62 +-
 doc/html/man/curs_threads.3x.html          |   8 +-
 doc/html/man/curs_trace.3x.html            |  30 +-
 doc/html/man/curs_util.3x.html             |  34 +-
 doc/html/man/curs_variables.3x.html        |  21 +-
 doc/html/man/curs_window.3x.html           |  12 +-
 doc/html/man/default_colors.3x.html        |  16 +-
 doc/html/man/define_key.3x.html            |   8 +-
 doc/html/man/form.3x.html                  |  18 +-
 doc/html/man/form_field_buffer.3x.html     |  10 +-
 doc/html/man/form_field_validation.3x.html |  10 +-
 doc/html/man/form_page.3x.html             |  10 +-
 doc/html/man/form_requestname.3x.html      |  10 +-
 doc/html/man/infocmp.1m.html               |  22 +-
 doc/html/man/infotocap.1m.html             |   8 +-
 doc/html/man/key_defined.3x.html           |   8 +-
 doc/html/man/keybound.3x.html              |   8 +-
 doc/html/man/keyok.3x.html                 |   8 +-
 doc/html/man/legacy_coding.3x.html         |  12 +-
 doc/html/man/menu.3x.html                  |  12 +-
 doc/html/man/menu_driver.3x.html           |  10 +-
 doc/html/man/menu_requestname.3x.html      |  10 +-
 doc/html/man/menu_spacing.3x.html          |  10 +-
 doc/html/man/ncurses.3x.html               | 529 +++++++--------
 doc/html/man/ncursesw6-config.1.html       |   8 +-
 doc/html/man/new_pair.3x.html              |   8 +-
 doc/html/man/panel.3x.html                 |   8 +-
 doc/html/man/resizeterm.3x.html            |   8 +-
 doc/html/man/scr_dump.5.html               |  18 +-
 doc/html/man/tabs.1.html                   |  93 +--
 doc/html/man/term.5.html                   |  40 +-
 doc/html/man/terminfo.5.html               | 164 ++---
 doc/html/man/tic.1m.html                   |  32 +-
 doc/html/man/toe.1m.html                   |  12 +-
 doc/html/man/tput.1.html                   |  28 +-
 doc/html/man/tset.1.html                   |  14 +-
 doc/html/man/user_caps.5.html              |  62 +-
 man/MKada_config.in                        |   8 +-
 man/MKncu_config.in                        |  32 +-
 man/captoinfo.1m                           |  42 +-
 man/clear.1                                |  15 +-
 man/curs_add_wch.3x                        |  36 +-
 man/curs_addch.3x                          |  53 +-
 man/curs_attr.3x                           |  33 +-
 man/curs_bkgd.3x                           | 213 +++---
 man/curs_bkgrnd.3x                         | 181 ++++--
 man/curs_border.3x                         |   9 +-
 man/curs_clear.3x                          |  21 +-
 man/curs_color.3x                          | 100 +--
 man/curs_delch.3x                          |  11 +-
 man/curs_deleteln.3x                       |  22 +-
 man/curs_extend.3x                         |   6 +-
 man/curs_get_wstr.3x                       |   8 +-
 man/curs_getcchar.3x                       |  16 +-
 man/curs_getch.3x                          |  21 +-
 man/curs_getstr.3x                         |  26 +-
 man/curs_getyx.3x                          |  19 +-
 man/curs_inch.3x                           |  12 +-
 man/curs_initscr.3x                        |  30 +-
 man/curs_inopts.3x                         |  25 +-
 man/curs_ins_wstr.3x                       |   8 +-
 man/curs_insch.3x                          |  12 +-
 man/curs_instr.3x                          |   8 +-
 man/curs_kernel.3x                         |  12 +-
 man/curs_memleaks.3x                       |  16 +-
 man/curs_mouse.3x                          | 181 +++---
 man/curs_move.3x                           |  22 +-
 man/curs_opaque.3x                         |  12 +-
 man/curs_outopts.3x                        |  15 +-
 man/curs_overlay.3x                        |  22 +-
 man/curs_pad.3x                            |  64 +-
 man/curs_print.3x                          |  11 +-
 man/curs_printw.3x                         | 182 ++++--
 man/curs_refresh.3x                        |  11 +-
 man/curs_scanw.3x                          | 241 ++++---
 man/curs_scr_dump.3x                       |  10 +-
 man/curs_scroll.3x                         | 107 ++-
 man/curs_slk.3x                            | 186 +++---
 man/curs_sp_funcs.3x                       |  11 +-
 man/curs_termcap.3x                        | 601 ++++++++++-------
 man/curs_terminfo.3x                       |  70 +-
 man/curs_threads.3x                        |  28 +-
 man/curs_trace.3x                          |  29 +-
 man/curs_util.3x                           |  51 +-
 man/curs_variables.3x                      |  32 +-
 man/curs_window.3x                         |   9 +-
 man/default_colors.3x                      |  12 +-
 man/define_key.3x                          |   9 +-
 man/form.3x                                |  13 +-
 man/form_field_buffer.3x                   |   6 +-
 man/form_field_validation.3x               |   6 +-
 man/form_page.3x                           |   7 +-
 man/form_requestname.3x                    |   6 +-
 man/infocmp.1m                             |  25 +-
 man/infotocap.1m                           |   7 +-
 man/key_defined.3x                         |   6 +-
 man/keybound.3x                            |   6 +-
 man/keyok.3x                               |   6 +-
 man/legacy_coding.3x                       |   8 +-
 man/man_db.renames.in                      |  84 ++-
 man/manhtml.aliases                        |  13 +-
 man/manhtml.externs                        |  10 +-
 man/menu.3x                                |   8 +-
 man/menu_driver.3x                         |   6 +-
 man/menu_requestname.3x                    |   6 +-
 man/menu_spacing.3x                        |   6 +-
 man/ncurses.3x                             | 719 +++++++++++++--------
 man/new_pair.3x                            |   8 +-
 man/panel.3x                               |  16 +-
 man/resizeterm.3x                          |  22 +-
 man/scr_dump.5                             |  14 +-
 man/tabs.1                                 |  89 +--
 man/term.5                                 |  45 +-
 man/terminfo.head                          |   6 +-
 man/terminfo.tail                          | 156 ++---
 man/tic.1m                                 |  36 +-
 man/toe.1m                                 |  14 +-
 man/tput.1                                 |  30 +-
 man/tset.1                                 |  11 +-
 man/user_caps.5                            |  81 +--
 misc/terminfo.src                          |  16 +-
 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/infocmp.c                            |  19 +-
 174 files changed, 4645 insertions(+), 3551 deletions(-)

diff --git a/NEWS b/NEWS
index 03922d7b5..e598e3ead 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4047 2023/12/09 22:52:42 tom Exp $
+-- $Id: NEWS,v 1.4053 2023/12/17 23:18:40 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,13 +46,24 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231217
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ correct an assignment in infocmp "-u" for detecting if a boolean
+	  is unset in a base entry and set in a use'd chunk, i.e., if it was
+	  cancelled.
+	+ modify infocmp "-u" option to not report cancels for strings which
+	  were already cancelled in a use'd chunk.
+	+ join two lines in infotocap.3x to eliminate a spurious "description"
+	  link in installed manpages (report by Sven Joachim).
+	+ fix typo in NEWS (report by Sven Joachim).
+
 20231209
 	+ modify infocmp "-u" option to not report cancels in use'd chunks
 	  which are not mentioned in the top-level terminal description.
 	+ remove xterm+sm+1006 from tmux (Debian #1057688).
 	+ used "infocmp -u" to help trim redundant capabilities -TD
 	+ updated man/edit_man.sh to allow for "\%" markers embedded after
-	  bold font escapes in manpage cross-references (Debian #1057541).
+	  bold font escapes in manpage cross-references (Debian #1057651).
 	+ reduce compiler-warnings in configure checks
 
 20231202
diff --git a/VERSION b/VERSION
index 5cc32b653..8ff8be904 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231209
+5:0:10	6.4	20231217
diff --git a/dist.mk b/dist.mk
index 271ac115e..08ff1690a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1582 2023/12/09 11:46:25 tom Exp $
+# $Id: dist.mk,v 1.1584 2023/12/17 23:18:40 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231209
+NCURSES_PATCH = 20231217
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -126,7 +126,7 @@ manhtml:
 	@misc/csort < subst.tmp | uniq > subst.sed
 	@echo '/<\/TITLE>/a\' >> subst.sed
 	@echo '<link rel="author" href="mailto:bug-ncurses@gnu.org">\' >> subst.sed
-	@rm -f subst.tmp
+	#@rm -f subst.tmp
 	@for f in man/*.[0-9]* ; do \
 	   m=`basename $$f` ;\
 	   T=`$${EGREP-grep -E} '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[ 	]\+$$//'` ; \
@@ -152,7 +152,7 @@ manhtml:
 		   sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \
 	   >> doc/html/man/$$g ;\
 	done
-	@rm -f subst.sed
+	#@rm -f subst.sed
 
 #
 # Please note that this target can only be properly built if the build of the
diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html
index 90b4f8130..e6c0dd798 100644
--- a/doc/html/man/adacursesw6-config.1.html
+++ b/doc/html/man/adacursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.31 2023/11/25 19:51:50 tom Exp @
+  * @Id: MKada_config.in,v 1.32 2023/12/16 21:42:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>adacursesw6\-config 1 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>adacursesw6\-config 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">adacursesw6\-config 1 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacursesw6\-config 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>            User commands           <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">adacursesw6\-config 1 2023-11-25 ncurses 6.4 User commands
 
 
 
-ncurses 6.4                       2023-11-25             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2023-12-16             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 9531a372c..281372a19 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.56 2023/12/02 20:51:25 tom Exp @
+  * @Id: captoinfo.1m,v 1.57 2023/12/16 21:34:23 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -86,67 +86,67 @@ <H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
        check that it has not mistakenly  translated  an  unknown  or  mistyped
        capability name.
 
-              <STRONG>Name</STRONG>
-       <STRONG>Obsolete</STRONG>   <STRONG>Standard</STRONG>    <STRONG>Origin</STRONG>      <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>i</I<STRONG>i</STRONG><EM>n</I<STRONG>n</STRONG><EM>f</I<STRONG>f</STRONG><EM>o</I<STRONG>o</STRONG> <STRONG>capability</STRONG>
-       ---------------------------------------------------------
-          <STRONG>BO</STRONG>         <STRONG>mr</STRONG>        AT&amp;T      <STRONG>enter_reverse_mode</STRONG>
-          <STRONG>CI</STRONG>         <STRONG>vi</STRONG>        AT&amp;T      <STRONG>cursor_invisible</STRONG>
-          <STRONG>CV</STRONG>         <STRONG>ve</STRONG>        AT&amp;T      <STRONG>cursor_normal</STRONG>
-          <STRONG>DS</STRONG>         <STRONG>mh</STRONG>        AT&amp;T      <STRONG>enter_dim_mode</STRONG>
-          <STRONG>EE</STRONG>         <STRONG>me</STRONG>        AT&amp;T      <STRONG>exit_attribute_mode</STRONG>
-          <STRONG>FE</STRONG>         <STRONG>LF</STRONG>        AT&amp;T      <STRONG>label_on</STRONG>
-          <STRONG>FL</STRONG>         <STRONG>LO</STRONG>        AT&amp;T      <STRONG>label_off</STRONG>
-          <STRONG>XS</STRONG>         <STRONG>mk</STRONG>        AT&amp;T      <STRONG>enter_secure_mode</STRONG>
-          <STRONG>EN</STRONG>         <STRONG>@7</STRONG>        XENIX     <STRONG>key_end</STRONG>
-          <STRONG>GE</STRONG>         <STRONG>ae</STRONG>        XENIX     <STRONG>exit_alt_charset_mode</STRONG>
-          <STRONG>GS</STRONG>         <STRONG>as</STRONG>        XENIX     <STRONG>enter_alt_charset_mode</STRONG>
-          <STRONG>HM</STRONG>         <STRONG>kh</STRONG>        XENIX     <STRONG>key_home</STRONG>
-          <STRONG>LD</STRONG>         <STRONG>kL</STRONG>        XENIX     <STRONG>key_dl</STRONG>
-          <STRONG>PD</STRONG>         <STRONG>kN</STRONG>        XENIX     <STRONG>key_npage</STRONG>
-          <STRONG>PN</STRONG>         <STRONG>po</STRONG>        XENIX     <STRONG>prtr_off</STRONG>
-          <STRONG>PS</STRONG>         <STRONG>pf</STRONG>        XENIX     <STRONG>prtr_on</STRONG>
-          <STRONG>PU</STRONG>         <STRONG>kP</STRONG>        XENIX     <STRONG>key_ppage</STRONG>
-          <STRONG>RT</STRONG>         <STRONG>@8</STRONG>        XENIX     <STRONG>kent</STRONG>
-          <STRONG>UP</STRONG>         <STRONG>ku</STRONG>        XENIX     <STRONG>kcuu1</STRONG>
-          <STRONG>KA</STRONG>         <STRONG>k;</STRONG>      Tektronix   <STRONG>key_f10</STRONG>
-          <STRONG>KB</STRONG>         <STRONG>F1</STRONG>      Tektronix   <STRONG>key_f11</STRONG>
-          <STRONG>KC</STRONG>         <STRONG>F2</STRONG>      Tektronix   <STRONG>key_f12</STRONG>
-          <STRONG>KD</STRONG>         <STRONG>F3</STRONG>      Tektronix   <STRONG>key_f13</STRONG>
-          <STRONG>KE</STRONG>         <STRONG>F4</STRONG>      Tektronix   <STRONG>key_f14</STRONG>
-          <STRONG>KF</STRONG>         <STRONG>F5</STRONG>      Tektronix   <STRONG>key_f15</STRONG>
-          <STRONG>BC</STRONG>         <STRONG>Sb</STRONG>      Tektronix   <STRONG>set_background</STRONG>
-
-          <STRONG>FC</STRONG>         <STRONG>Sf</STRONG>      Tektronix   <STRONG>set_foreground</STRONG>
-          <STRONG>HS</STRONG>         <STRONG>mh</STRONG>        IRIX      <STRONG>enter_dim_mode</STRONG>
+                     <STRONG>Name</STRONG>
+              <STRONG>Obsolete</STRONG>   <STRONG>Standard</STRONG>    <STRONG>Origin</STRONG>      <STRONG><EM>terminfo</EM></STRONG> <STRONG>capability</STRONG>
+              ---------------------------------------------------------
+                 <STRONG>BO</STRONG>         <STRONG>mr</STRONG>        AT&amp;T      <STRONG>enter_reverse_mode</STRONG>
+                 <STRONG>CI</STRONG>         <STRONG>vi</STRONG>        AT&amp;T      <STRONG>cursor_invisible</STRONG>
+                 <STRONG>CV</STRONG>         <STRONG>ve</STRONG>        AT&amp;T      <STRONG>cursor_normal</STRONG>
+                 <STRONG>DS</STRONG>         <STRONG>mh</STRONG>        AT&amp;T      <STRONG>enter_dim_mode</STRONG>
+                 <STRONG>EE</STRONG>         <STRONG>me</STRONG>        AT&amp;T      <STRONG>exit_attribute_mode</STRONG>
+                 <STRONG>FE</STRONG>         <STRONG>LF</STRONG>        AT&amp;T      <STRONG>label_on</STRONG>
+                 <STRONG>FL</STRONG>         <STRONG>LO</STRONG>        AT&amp;T      <STRONG>label_off</STRONG>
+                 <STRONG>XS</STRONG>         <STRONG>mk</STRONG>        AT&amp;T      <STRONG>enter_secure_mode</STRONG>
+                 <STRONG>EN</STRONG>         <STRONG>@7</STRONG>        XENIX     <STRONG>key_end</STRONG>
+                 <STRONG>GE</STRONG>         <STRONG>ae</STRONG>        XENIX     <STRONG>exit_alt_charset_mode</STRONG>
+                 <STRONG>GS</STRONG>         <STRONG>as</STRONG>        XENIX     <STRONG>enter_alt_charset_mode</STRONG>
+                 <STRONG>HM</STRONG>         <STRONG>kh</STRONG>        XENIX     <STRONG>key_home</STRONG>
+                 <STRONG>LD</STRONG>         <STRONG>kL</STRONG>        XENIX     <STRONG>key_dl</STRONG>
+                 <STRONG>PD</STRONG>         <STRONG>kN</STRONG>        XENIX     <STRONG>key_npage</STRONG>
+                 <STRONG>PN</STRONG>         <STRONG>po</STRONG>        XENIX     <STRONG>prtr_off</STRONG>
+                 <STRONG>PS</STRONG>         <STRONG>pf</STRONG>        XENIX     <STRONG>prtr_on</STRONG>
+                 <STRONG>PU</STRONG>         <STRONG>kP</STRONG>        XENIX     <STRONG>key_ppage</STRONG>
+                 <STRONG>RT</STRONG>         <STRONG>@8</STRONG>        XENIX     <STRONG>kent</STRONG>
+                 <STRONG>UP</STRONG>         <STRONG>ku</STRONG>        XENIX     <STRONG>kcuu1</STRONG>
+                 <STRONG>KA</STRONG>         <STRONG>k;</STRONG>      Tektronix   <STRONG>key_f10</STRONG>
+                 <STRONG>KB</STRONG>         <STRONG>F1</STRONG>      Tektronix   <STRONG>key_f11</STRONG>
+                 <STRONG>KC</STRONG>         <STRONG>F2</STRONG>      Tektronix   <STRONG>key_f12</STRONG>
+                 <STRONG>KD</STRONG>         <STRONG>F3</STRONG>      Tektronix   <STRONG>key_f13</STRONG>
+                 <STRONG>KE</STRONG>         <STRONG>F4</STRONG>      Tektronix   <STRONG>key_f14</STRONG>
+                 <STRONG>KF</STRONG>         <STRONG>F5</STRONG>      Tektronix   <STRONG>key_f15</STRONG>
+                 <STRONG>BC</STRONG>         <STRONG>Sb</STRONG>      Tektronix   <STRONG>set_background</STRONG>
+
+                 <STRONG>FC</STRONG>         <STRONG>Sf</STRONG>      Tektronix   <STRONG>set_foreground</STRONG>
+                 <STRONG>HS</STRONG>         <STRONG>mh</STRONG>        IRIX      <STRONG>enter_dim_mode</STRONG>
 
        XENIX <EM>termcap</EM> had a set of extension capabilities, corresponding to box
        drawing characters of CCSID ("code page") 437, as follows.
 
-       <EM>t</I<STRONG>t</STRONG><EM>e</I<STRONG>e</STRONG><EM>r</I<STRONG>r</STRONG><EM>m</I<STRONG>m</STRONG><EM>c</I<STRONG>c</STRONG><EM>a</I<STRONG>a</STRONG><EM>p</I<STRONG>p</STRONG> <STRONG>Name</STRONG>            <STRONG>Graphic</STRONG>
-       -----------------------------------------
-            <STRONG>G2</STRONG>        upper left corner
-            <STRONG>G3</STRONG>        lower left corner
-            <STRONG>G1</STRONG>        upper right corner
-            <STRONG>G4</STRONG>        lower right corner
-            <STRONG>GR</STRONG>        tee pointing right
-            <STRONG>GL</STRONG>        tee pointing left
-            <STRONG>GU</STRONG>        tee pointing up
-            <STRONG>GD</STRONG>        tee pointing down
-            <STRONG>GH</STRONG>        horizontal line
-            <STRONG>GV</STRONG>        vertical line
-            <STRONG>GC</STRONG>        intersection
-            <STRONG>G6</STRONG>        double upper left corner
-            <STRONG>G7</STRONG>        double lower left corner
-            <STRONG>G5</STRONG>        double upper right corner
-            <STRONG>G8</STRONG>        double lower right corner
-            <STRONG>Gr</STRONG>        double tee pointing right
-            <STRONG>Gr</STRONG>        double tee pointing left
-            <STRONG>Gu</STRONG>        double tee pointing up
-            <STRONG>Gd</STRONG>        double tee pointing down
-            <STRONG>Gh</STRONG>        double horizontal line
-            <STRONG>Gv</STRONG>        double vertical line
-            <STRONG>Gc</STRONG>        double intersection
-            <STRONG>GG</STRONG>        ACS magic cookie count
+                      <STRONG><EM>termcap</EM></STRONG> <STRONG>Name</STRONG>            <STRONG>Graphic</STRONG>
+                      -----------------------------------------
+                           <STRONG>G2</STRONG>        upper left corner
+                           <STRONG>G3</STRONG>        lower left corner
+                           <STRONG>G1</STRONG>        upper right corner
+                           <STRONG>G4</STRONG>        lower right corner
+                           <STRONG>GR</STRONG>        tee pointing right
+                           <STRONG>GL</STRONG>        tee pointing left
+                           <STRONG>GU</STRONG>        tee pointing up
+                           <STRONG>GD</STRONG>        tee pointing down
+                           <STRONG>GH</STRONG>        horizontal line
+                           <STRONG>GV</STRONG>        vertical line
+                           <STRONG>GC</STRONG>        intersection
+                           <STRONG>G6</STRONG>        double upper left corner
+                           <STRONG>G7</STRONG>        double lower left corner
+                           <STRONG>G5</STRONG>        double upper right corner
+                           <STRONG>G8</STRONG>        double lower right corner
+                           <STRONG>Gr</STRONG>        double tee pointing right
+                           <STRONG>Gr</STRONG>        double tee pointing left
+                           <STRONG>Gu</STRONG>        double tee pointing up
+                           <STRONG>Gd</STRONG>        double tee pointing down
+                           <STRONG>Gh</STRONG>        double horizontal line
+                           <STRONG>Gv</STRONG>        double vertical line
+                           <STRONG>Gc</STRONG>        double intersection
+                           <STRONG>GG</STRONG>        ACS magic cookie count
 
        <STRONG>captoinfo</STRONG> composes single-line capabilities into an  <STRONG>acsc</STRONG>  string,  and
        discards <STRONG>GG</STRONG> and double-line capabilities with a warning diagnostic.
@@ -155,14 +155,14 @@ <H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
        which is incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG>  translates  the
        following AIX extensions.
 
-        <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
-       -------------
-       ksel    kslt
-       kbtab   kcbt
-       font0   s0ds
-       font1   s1ds
-       font2   s2ds
-       font3   s3ds
+                                     <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
+                                    -------------
+                                    ksel    kslt
+                                    kbtab   kcbt
+                                    font0   s0ds
+                                    font1   s1ds
+                                    font2   s2ds
+                                    font3   s3ds
 
        Additionally,  this  program  translates  the AIX <STRONG>box1</STRONG> capability to an
        <STRONG>acsc</STRONG> string.
@@ -177,15 +177,13 @@ <H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
               default <EM>termcap</EM> terminal capability database
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The verbose option is not identical to SVr4's.  Under SVr4, instead  of
-       following the <STRONG>-v</STRONG> with a trace level <EM>n</EM>, you repeat it <EM>n</EM> times.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
-       program.  SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from
-       <STRONG>tic</STRONG>.
+       X/Open Curses, Issue 7 (2009) describes <STRONG>tic</STRONG>  briefly,  but  omits  this
+       program.
+
+       SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from <STRONG>tic</STRONG>.  Its
+       <STRONG>-v</STRONG> option does not accept a trace level argument <EM>n;</EM> repeat <STRONG>-v</STRONG>  <EM>n</EM>  times
+       instead.
 
        NetBSD does not provide this application.
 
@@ -200,7 +198,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -212,7 +210,6 @@ <H1 class="no-header">captoinfo 1m 2023-12-02 ncurses 6.4 User commands</H1>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index ba4754ac1..528a60bcc 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.45 2023/12/02 20:49:04 tom Exp @
+  * @Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
   *   tput/clear.sh
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -151,7 +151,7 @@ <H1 class="no-header">clear 1 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2023-12-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 4c943dd6a..e92b695a1 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.48 2023/11/25 14:20:05 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.49 2023/12/16 21:19:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -148,7 +148,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        WACS_URCORNER     0x2510     +         k       upper right-hand corner
        WACS_VLINE        0x2502     |         x       vertical line
 
-       The wide-character configuration of ncurses also  defines  symbols  for
+       The wide-character configuration of <EM>ncurses</EM> also  defines  symbols  for
        thick lines (<STRONG>acsc</STRONG> "J" to "V"):
 
        <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
@@ -185,7 +185,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        WACS_D_VLINE      0x2551    |         Y       double vertical line
 
        Unicode's  descriptions  for  these  characters  differs  slightly from
-       ncurses, by introducing the term "light"  (along  with  less  important
+       <EM>ncurses</EM>, by introducing the term "light"  (along  with  less  important
        details).   Here are its descriptions for the normal, thick, and double
        horizontal lines:
 
@@ -210,7 +210,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
            right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+           not possible to wrap to a new line.
 
        <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
            sequence of bytes, or if it is not  possible  to  add  all  of  the
@@ -255,14 +255,14 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       Ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
+       <EM>ncurses</EM> 5.3 (2002) provided a table of Unicode values  to  solve  these
        problems.  NetBSD curses incorporated that table in 2010.
 
        In  this  implementation,  the  Unicode  values are used instead of the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment  variable  <STRONG>NCURSES_NO_UTF8_ACS</STRONG>.   In contrast, for the same
-       cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> will use
-       only the ASCII default values.
+       environment  variable  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.   In contrast, for the same
+       cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use only
+       the ASCII default values.
 
        Having  Unicode available does not solve all of the problems with line-
        drawing for curses:
@@ -310,7 +310,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   may hold one non-spacing character.
 
-       In  the  latter  case,  ncurses  adds  the non-spacing character to the
+       In  the  latter  case,  <EM>ncurses</EM>  adds  the non-spacing character to the
        active (base) spacing character.
 
 
@@ -320,7 +320,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 65ba4f28c..976fc3e49 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.74 2023/11/25 14:20:05 tom Exp @
+  * @Id: curs_addch.3x,v 1.75 2023/12/16 21:19:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -79,7 +79,7 @@ <H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is not enabled, writing a character  at  the  lower
            right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+           not possible to wrap to a new line.
 
        If <EM>ch</EM> is a tab, newline, carriage return or backspace,  the  cursor  is
        moved appropriately within the window:
@@ -190,7 +190,7 @@ <H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
            right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+           not possible to wrap to a new line.
 
        <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
            sequence of bytes, or if it is not  possible  to  add  all  of  the
@@ -245,7 +245,7 @@ <H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        The <EM>displayed</EM> values for the <STRONG>ACS_</STRONG> and <STRONG>WACS_</STRONG> constants depend on
 
-       <STRONG>o</STRONG>   the library configuration, i.e., <STRONG>ncurses</STRONG> versus <STRONG>ncursesw</STRONG>, where the
+       <STRONG>o</STRONG>   the library configuration, i.e., <EM>ncurses</EM> versus <EM>ncursesw</EM>, where the
            latter  is  capable  of displaying Unicode while the former is not,
            and
 
@@ -266,19 +266,19 @@ <H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        character information which is packed in a <STRONG>chtype</STRONG> to pass to <STRONG>waddch</STRONG>.
 
        In this implementation,  <STRONG>chtype</STRONG>  holds  an  eight-bit  character.   But
-       ncurses  allows  multibyte  characters  to be passed in a succession of
+       <EM>ncurses</EM>  allows  multibyte  characters  to be passed in a succession of
        calls to <STRONG>waddch</STRONG>.  The other implementations do not do this; a  call  to
        <STRONG>waddch</STRONG>  passes  exactly  one  character which may be rendered as one or
        more cells on the screen depending on whether it is printable.
 
-       Depending on the locale settings, ncurses will inspect the byte  passed
+       Depending on the locale settings, <EM>ncurses</EM> will inspect the byte  passed
        in  each  call  to <STRONG>waddch</STRONG>, and check if the latest call will continue a
-       multibyte sequence.  When a character is <EM>complete</EM>, ncurses displays the
+       multibyte sequence.  When a character is <EM>complete</EM>, <EM>ncurses</EM> displays the
        character and moves to the next position in the screen.
 
        If  the  calling  application  interrupts  the succession of bytes in a
        multibyte character by moving the current location (e.g., using <STRONG>wmove</STRONG>),
-       ncurses discards the partially built character, starting over again.
+       <EM>ncurses</EM> discards the partially built character, starting over again.
 
        For  portability  to  other  implementations,  do  not  rely  upon this
        behavior:
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 7d1f64139..56fdf6678 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.91 2023/12/02 21:05:24 tom Exp @
+  * @Id: curs_attr.3x,v 1.92 2023/12/16 21:07:24 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            attr_set(A_BOLD, <EM>pair</EM>, NULL);
 
        However, if the value does not fit, then the <STRONG>COLOR_PAIR</STRONG> macro uses only
-       the  bits  that fit.  For example, because in ncurses <STRONG>A_COLOR</STRONG> has eight
+       the  bits  that fit.  For example, because in <EM>ncurses</EM> <STRONG>A_COLOR</STRONG> has eight
        (8) bits, then <STRONG>COLOR_PAIR(</STRONG><EM>259</EM><STRONG>)</STRONG> is 4 (i.e., 259 is 4 more than the limit
        255).
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        than <STRONG>attr_t</STRONG>.
 
        There  is  no  corresponding <STRONG>attrget</STRONG> function as such in X/Open Curses,
-       although ncurses provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
+       although <EM>ncurses</EM> provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Change-character-rendition">Change character rendition</a></H3><PRE>
@@ -191,7 +191,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        function  generalizes  this to any window; the <STRONG>mvwchgat</STRONG> function does a
        cursor move before acting.
 
-       In these functions, the color <EM>pair</EM> argument is a color-pair  index  (as
+       In these functions, the color <EM>pair</EM> argument is a color pair  index  (as
        in the first argument of <STRONG>init_pair</STRONG>, see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>).
 
 
@@ -266,7 +266,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            outside the range 0..COLOR_PAIRS-1.
 
        <STRONG>o</STRONG>   does  not  return an error if either of the parameters of <STRONG>wattr_get</STRONG>
-           used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
+           used for retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -281,8 +281,8 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        Color  pair  values can only be OR'd with attributes if the pair number
        is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can pass a
-       color pair value directly.  However, ncurses ABI 4 and 5 simply OR this
-       value within the alternate functions.  You must use ncurses  ABI  6  to
+       color pair value directly.  However, <EM>ncurses</EM> ABI 4 and 5 simply OR this
+       value within the alternate functions.  You must use <EM>ncurses</EM>  ABI  6  to
        support more than 256 color pairs.
 
 
@@ -298,7 +298,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        X/Open  Curses  still  (after  more  than  twenty  years)  documents as
        reserved  for  future  use,  saying  that  it  should  be  <STRONG>NULL</STRONG>.   This
        implementation  uses  that  parameter  in ABI 6 for the functions which
-       have a color-pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
+       have a color pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
        <STRONG>o</STRONG>   For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
            if  <EM>opts</EM>  is set it is treated as a pointer to <STRONG>int</STRONG>, and used to set
@@ -371,7 +371,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            the same because it simplifies copying information  between  <STRONG>chtype</STRONG>
            and <STRONG>cchar_t</STRONG> variables.
 
-       <STRONG>o</STRONG>   Because  ncurses's  <STRONG>attr_t</STRONG>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
+       <STRONG>o</STRONG>   Because  <EM>ncurses</EM>'s  <STRONG>attr_t</STRONG>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
            field), a call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may  alter  the
            window's  color.   If  the  color pair information in the attribute
            parameter is zero, no change is made to the window's color.
@@ -462,7 +462,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
           Regarding OSF/1 (and Tru64),
 
-          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
+          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  <EM>ncurses</EM>,  the  OSF/1  curses
               interface is not customized for 32-bit and 64-bit versions.
 
           <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
@@ -499,7 +499,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            modification to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He  moved
            <EM>standout</EM> attribute to a structure member.
 
-           The  resulting  4.4BSD curses was replaced by ncurses over the next
+           The  resulting  4.4BSD curses was replaced by <EM>ncurses</EM> over the next
            ten years.
 
        <STRONG>o</STRONG>   U/Win is rarely used now.
@@ -511,7 +511,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 9632a9e1f..7642671fc 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.51 2023/12/02 21:02:44 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.54 2023/12/17 23:31:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -54,114 +54,108 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>void</STRONG> <STRONG>bkgdset(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wbkgdset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>bkgd(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wbkgd(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
+       <STRONG>void</STRONG> <STRONG>bkgdset(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wbkgdset(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+
        <STRONG>chtype</STRONG> <STRONG>getbkgd(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       The  <EM>background</EM>  of  a  <EM>curses</EM>  window  (in  the  library's  non-"wide"
+       configuration)   is  a  <EM>chtype</EM>  combining  a  set  of  attributes  (see
+       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with a character called the <EM>blank</EM> <EM>character.</EM>
 
-</PRE><H3><a name="h3-bkgdset">bkgdset</a></H3><PRE>
-       The <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> routines set the <EM>background</EM> for a  window.   A
-       window's  background  is  a  <STRONG>chtype</STRONG>  consisting  of  any combination of
-       attributes (i.e., rendition) and a character:
-
-       <STRONG>o</STRONG>   The attribute part of the background is combined (OR'ed)  with  all
-           non-blank characters that are written into the window with <STRONG>waddch</STRONG>.
-
-       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
-           combined with blank characters that are written into the window.
-
-       The background becomes a property of each character and moves with  the
-       character   through  any  scrolling  and  insert/delete  line/character
-       operations.
-
-       To the extent possible on a particular terminal, the attribute part  of
-       the  background  is displayed as the graphic rendition of the character
-       put on the screen.
+       The blank character is a spacing character that  populates  a  window's
+       character  cells  when  their  contents are erased without replacement.
+       The background's attributes are combined with all non-blank  characters
+       written  to  the window, as with the <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families
+       of functions.
 
+       The blank character and  attributes  of  the  background  combine  with
+       characters  written  to  the window as described below.  The background
+       becomes a property of the character  and  moves  with  it  through  any
+       scrolling and insert/delete line/character operations.
 
-</PRE><H3><a name="h3-bkgd">bkgd</a></H3><PRE>
-       The <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> functions set the background property of the current
-       or  specified  window  and  then  apply this setting to every character
-       position in that window.  According to  X/Open  Curses,  it  should  do
-       this:
+       To  the  extent possible on a given terminal, the attribute part of the
+       background is displayed as the graphic rendition of the  character  put
+       on the screen.
 
-       <STRONG>o</STRONG>   The  rendition  of  every character on the screen is changed to the
-           new background rendition.
 
-       <STRONG>o</STRONG>   Wherever the former background character appears, it is changed  to
-           the new background character.
+</PRE><H3><a name="h3-bkgd_-wbkgd">bkgd, wbkgd</a></H3><PRE>
+       <STRONG>bkgd</STRONG>  and  <STRONG>wbkgd</STRONG> set the background property of <STRONG>stdscr</STRONG> or the specified
+       window and then apply this setting to  every  character  cell  in  that
+       window.
 
-       Neither  X/Open Curses nor the SVr4 manual pages give details about the
-       way the rendition of characters on the screen is updated when  <STRONG>bkgd</STRONG>  or
-       <STRONG>wbkgd</STRONG> is used to change the background character.
+       <STRONG>o</STRONG>   The  rendition  of every character in the window changes to the new
+           background rendition.
 
-       <EM>ncurses</EM>,  like  SVr4  <EM>curses</EM>,  does not store the background and window
-       attribute contributions  to  each  cell  separately.   It  updates  the
-       rendition  by  comparing the character, non-color attributes and colors
-       contained in the background.  For each cell in the window,  whether  or
-       not it is blank:
-
-       <STRONG>o</STRONG>   The  library  first  compares  the <EM>character</EM>, and if it matches the
-           current character part of the background, it replaces that with the
+       <STRONG>o</STRONG>   Wherever the former background character appears, it changes to the
            new background character.
 
-           When <STRONG>bkgdset</STRONG> is used to set the background character, that does not
-           update each cell in the window.  A subsequent  call  to  <STRONG>bkgd</STRONG>  will
-           only  modify  the  <EM>character</EM>  in  cells  which  match  the  current
-           background character.
+       <EM>ncurses</EM>  updates  the rendition of each character cell by comparing the
+       character, non-color attributes, and colors.  The  library  applies  to
+       following  procedure  to  each cell in the window, whether or not it is
+       blank.
+
+       <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
+           specified  blank  character;  if they match, <EM>ncurses</EM> writes the new
+           blank character to the cell.
 
-       <STRONG>o</STRONG>   The library then checks if the cell uses  color,  i.e.,  its  color
-           pair  value  is nonzero.  If not, it simply replaces the attributes
-           and color pair in the cell  with  those  from  the  new  background
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
+           value  is  nonzero.   If not, it simply replaces the attributes and
+           color  pair  in  the  cell  with  those  from  the  new  background
            character.
 
-       <STRONG>o</STRONG>   If  the  cell uses color, and that matches the color in the current
-           background, the library removes attributes which may have come from
-           the current background and adds attributes from the new background.
-           It finishes by setting the cell to  use  the  color  from  the  new
-           background.
+       <STRONG>o</STRONG>   If  the  cell  uses color, and its background color matches that of
+           the current window background, <EM>ncurses</EM> removes attributes that  may
+           have  come  from the current background and adds those from the new
+           background.  It finishes by setting the cell's  background  to  use
+           the new window background color.
 
-       <STRONG>o</STRONG>   If  the  cell  uses color, and that does not match the color in the
-           current  background,  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
+       <STRONG>o</STRONG>   If  the  cell  uses  color, and its background color does not match
+           that of the current window background,  <EM>ncurses</EM>  updates  only  the
+           non-color  attributes, first removing those that may have come from
+           the current background, and then adding  attributes  from  the  new
            background.
 
-       If the background's character value is zero (0), a space is assumed.
+       <EM>ncurses</EM>  treats  a  background  character  value of zero (0) as a blank
+       character.
+
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       character's color attribute.
+
 
-       If  the  terminal  does  not  support  color,  or if color has not been
-       started  with  <STRONG>start_color</STRONG>,  the  new  background   character's   color
-       attribute will be ignored.
+</PRE><H3><a name="h3-bkgdset_-wbkgdset">bkgdset, wbkgdset</a></H3><PRE>
+       <STRONG>bkgdset</STRONG> and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the  applicable
+       window, without updating the character cells as <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> do; only
+       future writes reflect the updated background.
 
 
 </PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
-       The  <STRONG>getbkgd</STRONG>  function  returns  the  given window's current background
-       character/attribute pair.
+       <STRONG>getbkgd</STRONG> obtains the given window's background character  and  attribute
+       combination.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions returning an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns  <STRONG>ERR</STRONG>  if
-       the  library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> if
-       the <EM>WINDOW</EM> pointer argument is null.
+       Functions  returning  an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns <STRONG>ERR</STRONG> if
+       the library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG>  if
+       a <EM>WINDOW</EM> pointer argument is null.
 
-       In contrast, the SVr4.0 manual says <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return <STRONG>OK</STRONG> "or  a
-       non-negative  integer  if  <STRONG>immedok</STRONG>  is set", which refers to the return
-       value from <STRONG>wrefresh</STRONG> (used to implement the immediate repainting).  SVr4
-       <EM>curses</EM>  <STRONG>wrefresh</STRONG> returns the number of characters written to the screen
-       during the refresh.  <EM>ncurses</EM> does not do that.
+       <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value.
+
+       <STRONG>getbkgd</STRONG>   returns   a   window's  background  character  and  attribute
+       combination.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Unusually, there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one  would
        expect <STRONG>wgetbkgd</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
-       Note that <STRONG>bkgdset</STRONG> and <STRONG>bkgd</STRONG> may be macros.
+       <STRONG>bkgd</STRONG> and <STRONG>bkgdset</STRONG> may be available as macros.
 
        X/Open  Curses  mentions that the character part of the background must
        be a single-byte value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>,  checks  to  ensure
@@ -169,17 +163,33 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in the XSI Curses standard, Issue 4.  It
-       specifies that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> return  <STRONG>ERR</STRONG>  on  failure,  but  gives  no
-       failure conditions.
+       X/Open  Curses,  Issue 4, describes these functions.  It specifies that
+       <STRONG>bkgd</STRONG>, <STRONG>wbkgd</STRONG>, and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> on failure  (in  the  case  of  the
+       last,  this  value  is  cast  to  <EM>chtype</EM>),  but  describes  no  failure
+       conditions.
+
+       The SVr4.0 manual says that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return  <STRONG>OK</STRONG>  "or  a  non-
+       negative  integer  if <STRONG>immedok</STRONG> is set", which refers to the return value
+       from <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, used to implement the  immediate  repainting.   SVr4
+       <EM>curses</EM>'s  <STRONG>wrefresh</STRONG>  returns  the  number  of  characters written to the
+       screen during the refresh.  <EM>ncurses</EM> does not do that.
+
+       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
+       rendition  of  characters  on  the  screen  updates  when <STRONG>bkgd</STRONG> or <STRONG>wbkgd</STRONG>
+       changes the background character.  <EM>ncurses,</EM> like SVr4 <EM>curses,</EM> does  not
+       (in  its  non-"wide"  configuration)  store  the  background and window
+       attribute contributions to each character cell separately.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes the corresponding  functions  in  the  "wide"
+       configuration of <EM>ncurses.</EM>
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -187,8 +197,8 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-bkgdset">bkgdset</a></li>
-<li><a href="#h3-bkgd">bkgd</a></li>
+<li><a href="#h3-bkgd_-wbkgd">bkgd, wbkgd</a></li>
+<li><a href="#h3-bkgdset_-wbkgdset">bkgdset, wbkgdset</a></li>
 <li><a href="#h3-getbkgd">getbkgd</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 60ea015b8..604fe92dd 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.34 2023/12/02 21:30:00 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.35 2023/12/16 23:00:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -65,74 +65,119 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       The  <EM>background</EM>  of  a  <EM>curses</EM>  window   (in   the   library's   "wide"
+       configuration)  is  a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  combining  a  set  of  attributes  (see
+       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with a complex character called the <EM>blank</EM> <EM>character.</EM>
 
-</PRE><H3><a name="h3-bkgrndset">bkgrndset</a></H3><PRE>
-       The <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> routines manipulate the background of  the
-       named  window.   The  window  background is a <STRONG>cchar_t</STRONG> consisting of any
-       combination of attributes (i.e., rendition) and a complex character.
+       The blank character is a spacing character that  populates  a  window's
+       character  cells  when  their  contents are erased without replacement.
+       The background's attributes are combined with all non-blank  characters
+       written  to  the  window,  as  with  the  <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG>
+       families of functions.
 
-       <STRONG>o</STRONG>   The attribute part of the background is combined (OR'ed)  with  all
-           non-blank characters that are written into the window with <STRONG>waddch</STRONG>.
+       The blank character and  attributes  of  the  background  combine  with
+       characters  written  to  the window as described below.  The background
+       becomes a property of the character  and  moves  with  it  through  any
+       scrolling and insert/delete line/character operations.
 
-       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
-           combined with the blank characters.
+       To  the  extent possible on a given terminal, the attribute part of the
+       background is displayed as the graphic rendition of the  character  put
+       on the screen.
 
-       The background becomes a property of the character and moves  with  the
-       character   through  any  scrolling  and  insert/delete  line/character
-       operations.
 
-       To the extent possible on a particular terminal, the attribute part  of
-       the  background  is displayed as the graphic rendition of the character
-       put on the screen.
+</PRE><H3><a name="h3-bkgrnd_-wbkgrnd">bkgrnd, wbkgrnd</a></H3><PRE>
+       <STRONG>bkgrnd</STRONG>  and  <STRONG>wbkgrnd</STRONG>  set  the  background  property  of  <STRONG>stdscr</STRONG> or the
+       specified window and then apply this setting to every character cell in
+       that window.
 
+       <STRONG>o</STRONG>   The  rendition  of every character in the window changes to the new
+           background rendition.
 
-</PRE><H3><a name="h3-bkgrnd">bkgrnd</a></H3><PRE>
-       The <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG> functions set the  background  property  of  the
-       current  or  specified  window  and  then  apply  this setting to every
-       character position in that window:
+       <STRONG>o</STRONG>   Wherever the former background character appears, it changes to the
+           new background character.
 
-       <STRONG>o</STRONG>   The rendition of every character on the screen is  changed  to  the
-           new background rendition.
+       <EM>ncurses</EM>  updates  the rendition of each character cell by comparing the
+       character, non-color attributes, and colors.  The  library  applies  to
+       following  procedure  to  each cell in the window, whether or not it is
+       blank.
 
-       <STRONG>o</STRONG>   Wherever  the former background character appears, it is changed to
-           the new background character.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
+           specified  blank  character;  if they match, <EM>ncurses</EM> writes the new
+           blank character to the cell.
 
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
+           value  is  nonzero.   If not, it simply replaces the attributes and
+           color  pair  in  the  cell  with  those  from  the  new  background
+           character.
 
-</PRE><H3><a name="h3-getbkgrnd">getbkgrnd</a></H3><PRE>
-       The <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the  given  or  specified
-       window's  current  background character and attribute pair and store it
-       via the <EM>wch</EM> pointer.
+       <STRONG>o</STRONG>   If  the  cell  uses color, and its background color matches that of
+           the current window background, <EM>ncurses</EM> removes attributes that  may
+           have  come  from the current background and adds those from the new
+           background.  It finishes by setting the cell's  background  to  use
+           the new window background color.
+
+       <STRONG>o</STRONG>   If  the  cell  uses  color, and its background color does not match
+           that of the current window background,  <EM>ncurses</EM>  updates  only  the
+           non-color  attributes, first removing those that may have come from
+           the current background, and then adding  attributes  from  the  new
+           background.
+
+       <EM>ncurses</EM>  treats  a  background  character  value of zero (0) as a blank
+       character.
+
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       character's color attribute.
+
+
+</PRE><H3><a name="h3-bkgrndset_-wbkgrndset">bkgrndset, wbkgrndset</a></H3><PRE>
+       <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> manipulate the background  of  the  applicable
+       window,  without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG> do;
+       only future writes reflect the updated background.
+
+
+</PRE><H3><a name="h3-getbkgrnd_-wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
+       The <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the background  character
+       and  attribute  pair of <STRONG>stdscr</STRONG> or the specified window and store it via
+       the <EM>wch</EM> pointer.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> routines do not return a value.
+       <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> do not return a value.
 
-       Upon successful completion, the other functions return <STRONG>OK</STRONG>.   Otherwise,
-       they return <STRONG>ERR</STRONG>:
+       The other functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG>  upon  success.   In
+       <EM>ncurses,</EM> failure occurs if
 
-       <STRONG>o</STRONG>   A null <EM>WINDOW</EM> pointer is treated as an error.
+       <STRONG>o</STRONG>   a <EM>WINDOW</EM> pointer <EM>win</EM> is null, or
 
-       <STRONG>o</STRONG>   A null <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> pointer is treated as an error.
+       <STRONG>o</STRONG>   a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> pointer <EM>wch</EM> is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be available as macros.
 
-       X/Open Curses does not provide details on how the rendition is changed.
-       This implementation follows the approach used in SVr4 curses, which  is
-       explained in the manual page for <STRONG>wbkgd</STRONG>.
+       Unlike  their  counterparts in the non-"wide" configuration of <EM>ncurses,</EM>
+       <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> supply the background character and  attribute
+       in a modifiable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, not as the return value.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       error conditions for them.
+
+       X/Open Curses does not provide details of how the rendition is updated.
+       This implementation follows the approach used in SVr4 <EM>curses.</EM>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the corresponding functions in the non-"wide"
+       configuration of <EM>ncurses.</EM>
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-02                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -140,9 +185,9 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-bkgrndset">bkgrndset</a></li>
-<li><a href="#h3-bkgrnd">bkgrnd</a></li>
-<li><a href="#h3-getbkgrnd">getbkgrnd</a></li>
+<li><a href="#h3-bkgrnd_-wbkgrnd">bkgrnd, wbkgrnd</a></li>
+<li><a href="#h3-bkgrndset_-wbkgrndset">bkgrndset, wbkgrndset</a></li>
+<li><a href="#h3-getbkgrnd_-wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 6ea93f52c..e03b5f10e 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.43 2023/11/25 11:31:27 tom Exp @
+  * @Id: curs_border.3x,v 1.44 2023/12/16 21:09:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -142,7 +142,7 @@ <H1 class="no-header">curs_border 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 31939b063..359c94412 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.40 2023/11/25 11:31:27 tom Exp @
+  * @Id: curs_clear.3x,v 1.41 2023/12/16 21:09:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -114,14 +114,14 @@ <H1 class="no-header">curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       The SVr4.0 manual says  that  these  functions  could  return  "a  non-
-       negative  integer if <STRONG><A HREF="curs_outopts.3x.html">immedok(3x)</A></STRONG> is set", referring to the return-value
-       of <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count  of
-       the number of characters written to the terminal.
+       The SVr4.0 manual says that these functions could  return  "or  a  non-
+       negative  integer  if <STRONG>immedok</STRONG> is set", referring to the return-value of
+       <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count of the
+       number of characters written to the terminal.
 
        Some  historic  curses implementations had, as an undocumented feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
-       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
+       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
        This  implementation,  and  others  such  as  Solaris, sets the current
        position to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is  not
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index d16373ec8..df4b22c76 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.92 2023/11/25 17:36:51 tom Exp @
+  * @Id: curs_color.3x,v 1.93 2023/12/16 21:07:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -50,7 +50,9 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>start_color</STRONG>,   <STRONG>has_colors</STRONG>,   <STRONG>can_change_color</STRONG>,  <STRONG>init_pair</STRONG>,  <STRONG>init_color</STRONG>,
        <STRONG>init_extended_pair</STRONG>, <STRONG>init_extended_color</STRONG>,  <STRONG>color_content</STRONG>,  <STRONG>pair_content</STRONG>,
        <STRONG>extended_color_content</STRONG>,    <STRONG>extended_pair_content</STRONG>,    <STRONG>reset_color_pairs</STRONG>,
-       <STRONG>COLOR_PAIR</STRONG>, <STRONG>PAIR_NUMBER</STRONG> - manipulate terminal colors with <EM>curses</EM>
+       <STRONG>COLOR_PAIR</STRONG>, <STRONG>PAIR_NUMBER</STRONG>, <STRONG>COLORS</STRONG>, <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLOR_BLACK</STRONG>,  <STRONG>COLOR_RED</STRONG>,
+       <STRONG>COLOR_GREEN</STRONG>,   <STRONG>COLOR_YELLOW</STRONG>,   <STRONG>COLOR_BLUE</STRONG>,  <STRONG>COLOR_MAGENTA</STRONG>,  <STRONG>COLOR_CYAN</STRONG>,
+       <STRONG>COLOR_WHITE</STRONG> - manipulate terminal colors with <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -77,7 +79,7 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs(void);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>COLOR_PAIR(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>PAIR_NUMBER(</STRONG><EM>attrs</EM><STRONG>);</STRONG>
+       <STRONG>PAIR_NUMBER(int</STRONG> <EM>attr</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -85,10 +87,10 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
        <EM>curses</EM> supports color attributes on terminals with that capability.  To
        use  these  routines  <STRONG>start_color</STRONG>  must  be called, usually right after
-       <STRONG>initscr</STRONG>.  Colors are always used in pairs (referred to as color-pairs).
-       A  color-pair  consists  of  a  foreground color (for characters) and a
+       <STRONG>initscr</STRONG>.  Colors are always used in pairs (referred to as color pairs).
+       A  color  pair  consists  of  a foreground color (for characters) and a
        background color (for the blank  field  on  which  the  characters  are
-       displayed).   A  programmer  initializes  a color-pair with the routine
+       displayed).   A  programmer  initializes  a color pair with the routine
        <STRONG>init_pair</STRONG>.  After it has been initialized, <STRONG>COLOR_PAIR</STRONG>(<EM>n</EM>) can be used to
        convert the pair to a video attribute.
 
@@ -99,7 +101,7 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        the programmer can change the colors.  The routine <STRONG>color_content</STRONG> allows
        a programmer to extract the amounts of red, green, and blue  components
        in  an initialized color.  The routine <STRONG>pair_content</STRONG> allows a programmer
-       to find out how a given color-pair is currently defined.
+       to find out how a given color pair is currently defined.
 
 
 </PRE><H3><a name="h3-Color-Rendering">Color Rendering</a></H3><PRE>
@@ -182,7 +184,7 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        routine right after <STRONG>initscr</STRONG>.  <STRONG>start_color</STRONG> does this:
 
        <STRONG>o</STRONG>   It   initializes  two  global  variables,  <STRONG>COLORS</STRONG>  and  <STRONG>COLOR_PAIRS</STRONG>
-           (respectively defining the maximum number of colors and color-pairs
+           (respectively defining the maximum number of colors and color pairs
            the terminal can support).
 
        <STRONG>o</STRONG>   It  initializes  the special color pair <STRONG>0</STRONG> to the default foreground
@@ -253,8 +255,8 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-init_pair">init_pair</a></H3><PRE>
-       The <STRONG>init_pair</STRONG> routine changes the definition of a color-pair.  It takes
-       three arguments: the number  of  the  color-pair  to  be  changed,  the
+       The <STRONG>init_pair</STRONG> routine changes the definition of a color pair.  It takes
+       three arguments: the number of  the  color  pair  to  be  changed,  the
        foreground color number, and the background color number.  For portable
        applications:
 
@@ -265,11 +267,11 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   The second and third arguments must be valid color values.
 
-       If  the  color-pair was previously initialized, the screen is refreshed
-       and  all  occurrences  of  that  color-pair  are  changed  to  the  new
+       If  the  color pair was previously initialized, the screen is refreshed
+       and all  occurrences  of  that  color  pair  are  changed  to  the  new
        definition.
 
-       As  an  extension,  ncurses  allows  you  to  set  color pair <STRONG>0</STRONG> via the
+       As  an  extension,  <EM>ncurses</EM>  allows  you  to  set  color pair <STRONG>0</STRONG> via the
        <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG> routine, or to specify  the  use  of  default
        colors (color number <STRONG>-1</STRONG>) if you first invoke the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>
        routine.
@@ -277,8 +279,8 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-init_extended_pair">init_extended_pair</a></H3><PRE>
        Because <STRONG>init_pair</STRONG> uses signed <STRONG>short</STRONG>s for its  parameters,  that  limits
-       color-pairs   and  color-values  to  32767  on  modern  hardware.   The
-       extension <STRONG>init_extended_pair</STRONG> uses <STRONG>int</STRONG>s for the  color-pair  and  color-
+       color  pairs  and  color-values  to  32767  on  modern  hardware.   The
+       extension <STRONG>init_extended_pair</STRONG> uses <STRONG>int</STRONG>s for the color  pair  and  color-
        value, allowing a larger number of colors to be supported.
 
 
@@ -331,7 +333,7 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-pair_content">pair_content</a></H3><PRE>
        The <STRONG>pair_content</STRONG> routine allows programmers to find out what  colors  a
-       given  color-pair consists of.  It requires three arguments: the color-
+       given  color  pair consists of.  It requires three arguments: the color
        pair number, and two addresses of <STRONG>short</STRONG>s for storing the foreground and
        the background color numbers.
 
@@ -345,58 +347,59 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-extended_pair_content">extended_pair_content</a></H3><PRE>
        Because <STRONG>pair_content</STRONG> uses signed <STRONG>short</STRONG>s for its parameters, that limits
-       color-pair and color-values to 32767 on modern hardware.  The extension
+       color pair and color-values to 32767 on modern hardware.  The extension
        <STRONG>extended_pair_content</STRONG> uses <STRONG>int</STRONG>s for the color pair  and  for  returning
        the  foreground  and  background  colors,  allowing  a larger number of
        colors to be supported.
 
 
 </PRE><H3><a name="h3-reset_color_pairs">reset_color_pairs</a></H3><PRE>
-       The extension <STRONG>reset_color_pairs</STRONG> tells ncurses to  discard  all  of  the
-       color-pair  information  which was set with <STRONG>init_pair</STRONG>.  It also touches
+       The extension <STRONG>reset_color_pairs</STRONG> tells <EM>ncurses</EM> to  discard  all  of  the
+       color  pair  information which was set with <STRONG>init_pair</STRONG>.  It also touches
        the current- and standard-screens, allowing an  application  to  switch
        color palettes rapidly.
 
 
-</PRE><H3><a name="h3-PAIR_NUMBER">PAIR_NUMBER</a></H3><PRE>
-       <STRONG>PAIR_NUMBER(</STRONG><EM>attrs</EM>)  extracts  the  color value from its <EM>attrs</EM> parameter
-       and returns it as a color pair number.
+</PRE><H3><a name="h3-COLOR_PAIR">COLOR_PAIR</a></H3><PRE>
+       <STRONG>COLOR_PAIR(</STRONG><EM>n</EM><STRONG>)</STRONG> converts a color pair number to an attribute.  Attributes
+       can hold color pairs in the range 0 to 255.  If you need a  color  pair
+       larger  than  that, you must use functions such as <STRONG>attr_set</STRONG> (which pass
+       the color  pair  as  a  separate  parameter)  rather  than  the  legacy
+       functions such as <STRONG>attrset</STRONG>.
 
 
-</PRE><H3><a name="h3-COLOR_PAIR">COLOR_PAIR</a></H3><PRE>
-       Its inverse <STRONG>COLOR_PAIR(</STRONG><EM>n</EM><STRONG>)</STRONG> converts a color pair number to an attribute.
-       Attributes  can  hold color pairs in the range 0 to 255.  If you need a
-       color pair larger than that, you must use functions  such  as  <STRONG>attr_set</STRONG>
-       (which  pass  the  color  pair as a separate parameter) rather than the
-       legacy functions such as <STRONG>attrset</STRONG>.
+</PRE><H3><a name="h3-PAIR_NUMBER">PAIR_NUMBER</a></H3><PRE>
+       <STRONG>PAIR_NUMBER(</STRONG><EM>attr</EM>)   extracts   the  color  information  from  its  <EM>attr</EM>
+       parameter and returns it as a color pair  number;  it  is  the  inverse
+       operation of <STRONG>COLOR_PAIR</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        The routines <STRONG>can_change_color</STRONG> and <STRONG>has_colors</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
-       All other routines return the integer <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG>  (SVr4
-       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       All  other routines return the integer <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG> (SVr4
+       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       X/Open defines no error conditions.   SVr4  does  document  some  error
+       X/Open  defines  no  error  conditions.   SVr4 does document some error
        conditions which apply in general:
 
        <STRONG>o</STRONG>   This implementation will return <STRONG>ERR</STRONG> on attempts to use color values
-           outside the range <STRONG>0</STRONG> to <STRONG>COLORS</STRONG>-1  (except  for  the  default  colors
-           extension),   or   use   color   pairs   outside  the  range  <STRONG>0</STRONG>  to
+           outside  the  range  <STRONG>0</STRONG>  to  <STRONG>COLORS</STRONG>-1 (except for the default colors
+           extension),  or  use  color  pairs   outside   the   range   <STRONG>0</STRONG>   to
            <STRONG>COLOR_PAIRS-1</STRONG>.
 
            Color values used in <STRONG>init_color</STRONG> must be in the range <STRONG>0</STRONG> to <STRONG>1000</STRONG>.
 
-           An error is returned from all functions if  the  terminal  has  not
+           An  error  is  returned  from all functions if the terminal has not
            been initialized.
 
-           An  error is returned from secondary functions such as <STRONG>init_pair</STRONG> if
+           An error is returned from secondary functions such as <STRONG>init_pair</STRONG>  if
            <STRONG>start_color</STRONG> was not called.
 
-       <STRONG>o</STRONG>   SVr4  does  much  the  same,  except  that  it  returns  <STRONG>ERR</STRONG>   from
-           <STRONG>pair_content</STRONG>  if  the pair was not initialized using <STRONG>init_pairs</STRONG> and
-           it returns <STRONG>ERR</STRONG> from <STRONG>color_content</STRONG> if the terminal does not  support
+       <STRONG>o</STRONG>   SVr4   does  much  the  same,  except  that  it  returns  <STRONG>ERR</STRONG>  from
+           <STRONG>pair_content</STRONG> if the pair was not initialized using  <STRONG>init_pairs</STRONG>  and
+           it  returns <STRONG>ERR</STRONG> from <STRONG>color_content</STRONG> if the terminal does not support
            changing colors.
 
            This implementation does not return <STRONG>ERR</STRONG> for either case.
@@ -405,7 +408,7 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
           <STRONG>init_color</STRONG>
                returns an error if the terminal does not support this feature,
-               e.g., if the <STRONG>initialize_color</STRONG> capability  is  absent  from  the
+               e.g.,  if  the  <STRONG>initialize_color</STRONG>  capability is absent from the
                terminal description.
 
           <STRONG>start_color</STRONG>
@@ -413,76 +416,76 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       In  the  <EM>ncurses</EM>  implementation,  there is a separate color activation
-       flag, color palette, color  pairs  table,  and  associated  <STRONG>COLORS</STRONG>  and
-       <STRONG>COLOR_PAIRS</STRONG>  counts  for  each  screen;  the  <STRONG>start_color</STRONG> function only
-       affects the current screen.   The  SVr4/XSI  interface  is  not  really
-       designed  with  this  in mind, and historical implementations may use a
+       In the <EM>ncurses</EM> implementation, there is  a  separate  color  activation
+       flag,  color  palette,  color  pairs  table,  and associated <STRONG>COLORS</STRONG> and
+       <STRONG>COLOR_PAIRS</STRONG> counts for  each  screen;  the  <STRONG>start_color</STRONG>  function  only
+       affects  the  current  screen.   The  SVr4/XSI  interface is not really
+       designed with this in mind, and historical implementations  may  use  a
        single shared color palette.
 
-       Setting an implicit background color via  a  color  pair  affects  only
-       character  cells  that  a character write operation explicitly touches.
-       To change the background color used when parts of a window are  blanked
+       Setting  an  implicit  background  color  via a color pair affects only
+       character cells that a character write  operation  explicitly  touches.
+       To  change the background color used when parts of a window are blanked
        by erasing or scrolling operations, see <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>.
 
-       Several  caveats  apply  on  older x86 machines (e.g., i386, i486) with
+       Several caveats apply on older x86 machines  (e.g.,  i386,  i486)  with
        VGA-compatible graphics:
 
-       <STRONG>o</STRONG>   COLOR_YELLOW is actually brown.  To get  yellow,  use  COLOR_YELLOW
+       <STRONG>o</STRONG>   COLOR_YELLOW  is  actually  brown.  To get yellow, use COLOR_YELLOW
            combined with the <STRONG>A_BOLD</STRONG> attribute.
 
-       <STRONG>o</STRONG>   The  A_BLINK  attribute should in theory cause the background to go
+       <STRONG>o</STRONG>   The A_BLINK attribute should in theory cause the background  to  go
            bright.  This often fails to work, and even some cards for which it
-           mostly  works  (such  as the Paradise and compatibles) do the wrong
-           thing when you try to set a bright "yellow" background (you  get  a
+           mostly works (such as the Paradise and compatibles)  do  the  wrong
+           thing  when  you try to set a bright "yellow" background (you get a
            blinking yellow foreground instead).
 
        <STRONG>o</STRONG>   Color RGB values are not settable.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
-       are not found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous
+       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
+       are  not  found  in  SVr4  curses, 4.4BSD curses, or any other previous
        version of curses.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  implementation satisfies XSI Curses's minimum maximums for <STRONG>COLORS</STRONG>
+       This implementation satisfies XSI Curses's minimum maximums for  <STRONG>COLORS</STRONG>
        and <STRONG>COLOR_PAIRS</STRONG>.
 
        The  <STRONG>init_pair</STRONG>  routine  accepts  negative  values  of  foreground  and
-       background  color  to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but
+       background color to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>  extension,  but
        only if that routine has been first invoked.
 
        The assumption that <STRONG>COLOR_BLACK</STRONG> is the default background color for all
-       terminals   can   be   modified   using  the  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
+       terminals  can  be   modified   using   the   <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
        extension.
 
-       This implementation checks the pointers, e.g., for the values  returned
-       by  <STRONG>color_content</STRONG>  and  <STRONG>pair_content</STRONG>,  and will treat those as optional
+       This  implementation checks the pointers, e.g., for the values returned
+       by <STRONG>color_content</STRONG> and <STRONG>pair_content</STRONG>, and will  treat  those  as  optional
        parameters when null.
 
-       X/Open Curses does not specify a limit for the  number  of  colors  and
+       X/Open  Curses  does  not  specify a limit for the number of colors and
        color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
-       for the parameters, it carries over SVr4's  implementation  detail  for
+       for  the  parameters,  it carries over SVr4's implementation detail for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation provides extended versions of those functions which  use
-       <STRONG>short</STRONG>  parameters, allowing applications to use larger color- and pair-
+       implementation  provides extended versions of those functions which use
+       <STRONG>short</STRONG> parameters, allowing applications to use larger color- and  pair-
        numbers.
 
-       The <STRONG>reset_color_pairs</STRONG> function is an extension of ncurses.
+       The <STRONG>reset_color_pairs</STRONG> function is an extension of <EM>ncurses</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        SVr3.2 introduced color support to curses in 1987.
 
-       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
+       SVr4  made  internal  changes,  e.g.,  moving the storage for the color
        state  from  <STRONG>SP</STRONG>  (the  <STRONG>SCREEN</STRONG>  structure)  to  <STRONG>cur_term</STRONG>  (the  <STRONG>TERMINAL</STRONG>
        structure), but provided the same set of library functions.
 
-       SVr4 curses limits the number of color pairs  to  64,  reserving  color
-       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
-       arises because the color pair information is a bitfield in  the  <STRONG>chtype</STRONG>
+       SVr4  curses  limits  the  number of color pairs to 64, reserving color
+       pair zero (0) as the terminal's initial uncolored  state.   This  limit
+       arises  because  the color pair information is a bitfield in the <STRONG>chtype</STRONG>
        data type (denoted by <STRONG>A_COLOR</STRONG>).
 
        Other implementations of curses had different limits:
@@ -494,36 +497,36 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
 
        <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
-           the character, attributes and color-pair values, allowing increased
-           range  of  color-pairs.   Both  color-pairs and color-values used a
+           the character, attributes and color pair values, allowing increased
+           range of color pairs.  Both color pairs  and  color-values  used  a
            signed <STRONG>short</STRONG>, limiting values to 15 bits.
 
-       <STRONG>o</STRONG>   ncurses (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in  <STRONG>chtype</STRONG>
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in <STRONG>chtype</STRONG>
            values.
 
-           Version  5.3  provided  a wide-character interface (2002), but left
-           color-pairs as part of the attributes-field.
+           Version 5.3 provided a wide-character interface  (2002),  but  left
+           color pairs as part of the attributes-field.
 
-           Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color-pairs
-           in the <STRONG>cchar_t</STRONG> values.  When those color-pair values fit in 8 bits,
-           ncurses allows color-pairs to  be  manipulated  via  the  functions
+           Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color pairs
+           in the <STRONG>cchar_t</STRONG> values.  When those color pair values fit in 8 bits,
+           ncurses  allows  color  pairs  to  be manipulated via the functions
            using <STRONG>chtype</STRONG> values.
 
-       <STRONG>o</STRONG>   NetBSD  curses  used  6  bits  from  2000  (when  colors were first
-           supported) until 2004.  At that point, NetBSD  changed  to  use  10
-           bits.   As  of  2021,  that size is unchanged.  Like ncurses before
-           version 6, the NetBSD  color-pair  information  is  stored  in  the
-           attributes  field of <STRONG>cchar_t</STRONG>, limiting the number of color-pairs by
+       <STRONG>o</STRONG>   NetBSD curses used  6  bits  from  2000  (when  colors  were  first
+           supported)  until  2004.   At  that point, NetBSD changed to use 10
+           bits.  As of 2021, that size is  unchanged.   Like  <EM>ncurses</EM>  before
+           version  6,  the  NetBSD  color  pair  information is stored in the
+           attributes field of <STRONG>cchar_t</STRONG>, limiting the number of color pairs  by
            the size of the bitfield.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -556,8 +559,8 @@ <H1 class="no-header">curs_color 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-pair_content">pair_content</a></li>
 <li><a href="#h3-extended_pair_content">extended_pair_content</a></li>
 <li><a href="#h3-reset_color_pairs">reset_color_pairs</a></li>
-<li><a href="#h3-PAIR_NUMBER">PAIR_NUMBER</a></li>
 <li><a href="#h3-COLOR_PAIR">COLOR_PAIR</a></li>
+<li><a href="#h3-PAIR_NUMBER">PAIR_NUMBER</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 07f5bc2a5..46b96d62b 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.29 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_delch.3x,v 1.30 2023/12/16 21:09:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 20b220cb9..2d33ccaf8 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.33 2023/11/25 14:08:05 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.34 2023/12/16 21:33:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer  <STRONG>ERR</STRONG>  upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
+       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
        specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
        completion.
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 46c1e4295..8dc4cf759 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.42 2023/11/25 14:26:30 tom Exp @
+  * @Id: curs_extend.3x,v 1.43 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_extend 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 81382134f..1dd9a9c23 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.41 2023/11/25 14:29:54 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.42 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -172,13 +172,13 @@ <H1 class="no-header">curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        X/Open  Curses  does  not  specify  what  happens  if  the  length <EM>n</EM> is
        negative.
 
-       <STRONG>o</STRONG>   For analogy with <STRONG>wgetnstr</STRONG>, ncurses  6.2  uses  a  limit  (based  on
+       <STRONG>o</STRONG>   For analogy with <STRONG>wgetnstr</STRONG>, <EM>ncurses</EM>  6.2  uses  a  limit  (based  on
            <STRONG>LINE_MAX</STRONG>).
 
        <STRONG>o</STRONG>   Some  other  implementations (such as Solaris xcurses) do the same,
            while others (PDCurses) do not allow this.
 
-       <STRONG>o</STRONG>   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  <STRONG>-1</STRONG>
+       <STRONG>o</STRONG>   NetBSD 7 curses imitates <EM>ncurses</EM> 6.1 in this regard, treating a  <STRONG>-1</STRONG>
            as an indefinite number of characters.
 
 
@@ -187,7 +187,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 08eb5e09e..29c0b5c04 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.42 2023/11/25 14:30:18 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.43 2023/12/16 21:07:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -80,7 +80,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   Stores the character attributes in the location pointed to by <EM>attrs</EM>
 
-       <STRONG>o</STRONG>   Stores the color-pair in the location pointed to by <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
+       <STRONG>o</STRONG>   Stores the color pair in the location pointed to by <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
 
        <STRONG>o</STRONG>   Stores the wide-character string, characters referenced  by  <EM>wcval</EM>,
            into the array pointed to by <EM>wch</EM>.
@@ -104,11 +104,11 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            L'\0' terminated, contain at most one spacing character, which must
            be the first.
 
-           Up to <STRONG>CCHARW_MAX</STRONG>-1 nonspacing characters  may  follow.   Additional
-           nonspacing characters are ignored.
+           Up to <STRONG>CCHARW_MAX</STRONG>-1 non-spacing characters may  follow.   Additional
+           non-spacing characters are ignored.
 
            The string may contain a single control character instead.  In that
-           case, no nonspacing characters are allowed.
+           case, no non-spacing characters are allowed.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
        saying that it must be null.  This implementation uses  that  parameter
-       in ABI 6 for the functions which have a color-pair parameter to support
+       in ABI 6 for the functions which have a color pair parameter to support
        extended color pairs:
 
        <STRONG>o</STRONG>   For  functions  which modify the color, e.g., <STRONG>setcchar</STRONG>, if <EM>opts</EM>  is
@@ -145,7 +145,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>CCHARW_MAX</STRONG>  symbol is specific to ncurses.  X/Open Curses does not
+       The  <STRONG>CCHARW_MAX</STRONG>  symbol is specific to <EM>ncurses</EM>.  X/Open Curses does not
        provide details for the layout of the <STRONG>cchar_t</STRONG> structure.  It tells what
        data are stored in it:
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 855dd7003..7246a2bd5 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.75 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_getch.3x,v 1.76 2023/12/16 21:01:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -57,7 +57,6 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>getch(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>wgetch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvgetch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwgetch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
@@ -122,7 +121,7 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        experience  a  delay between the time a user presses the escape key and
        the escape is returned to the program.
 
-       In <STRONG>ncurses</STRONG>, the timer normally expires after the value in <STRONG>ESCDELAY</STRONG> (see
+       In <EM>ncurses</EM>, the timer normally expires after the value in <STRONG>ESCDELAY</STRONG> (see
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).   If <STRONG>notimeout</STRONG> is <STRONG>TRUE</STRONG>, the timer does not expire;
        it is an infinite (or very large) value.  Because function keys usually
        begin  with  an  escape  character,  the terminal may appear to hang in
@@ -180,8 +179,8 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
               KEY_ENTER       Enter or send
               KEY_SRESET      Soft (partial) reset
               KEY_RESET       Reset or hard reset
-
               KEY_PRINT       Print or copy
+
               KEY_LL          Home down or bottom (lower left)
               KEY_A1          Upper left of keypad
               KEY_A3          Upper right of keypad
@@ -264,7 +263,7 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   <STRONG>KEY_MOUSE</STRONG>  is returned for mouse-events (see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>).  This
            code relies upon  whether  or  not  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  has  been  enabled,
-           because  (e.g.,  with  <STRONG>xterm(1)</STRONG> mouse prototocol) ncurses must read
+           because  (e.g.,  with  <STRONG>xterm(1)</STRONG> mouse prototocol) <EM>ncurses</EM> must read
            escape sequences, just like a function key.
 
 
@@ -309,7 +308,7 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG>  versus  control/H.   Some
        curses implementations may differ according to whether they treat these
        control  keys  specially (and ignore the terminfo), or use the terminfo
-       definitions.  <STRONG>Ncurses</STRONG> uses the terminfo definition.  If  it  says  that
+       definitions.  <EM>ncurses</EM> uses the terminfo definition.  If  it  says  that
        <STRONG>KEY_ENTER</STRONG>  is  control/M,  <STRONG>getch</STRONG>  will  return <STRONG>KEY_ENTER</STRONG> when you press
        control/M.
 
@@ -361,9 +360,9 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in XSI Curses, along with a few related terminfo
        capabilities,  but  no  higher-level  functions  use  the feature.  The
-       implementation in ncurses is an extension.
+       implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  ncurses.   NetBSD
+       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  <EM>ncurses</EM>.   NetBSD
        curses later added this extension.
 
        Programmers  concerned  about portability should be prepared for either
@@ -371,7 +370,7 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
        receipt  interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to
        <STRONG>EINTR</STRONG>.
 
-       The <STRONG>has_key</STRONG> function is unique to <STRONG>ncurses</STRONG>.  We recommend that any  code
+       The <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any  code
        using it be conditionalized on the <STRONG>NCURSES_VERSION</STRONG> feature macro.
 
 
@@ -384,7 +383,7 @@ <H1 class="no-header">curs_getch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 9567bb3a7..d74d8317d 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.51 2023/11/25 14:29:54 tom Exp @
+  * @Id: curs_getstr.3x,v 1.52 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -162,7 +162,7 @@ <H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
        some implementations count it, some do not:
 
-       <STRONG>o</STRONG>   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and PDCurses do not count the NUL in the  given  limit,
            while
 
        <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
@@ -189,13 +189,13 @@ <H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            A comment in NetBSD's source code states that this is specified  in
            SUSv2.
 
-       <STRONG>o</STRONG>   ncurses  (before  6.2)  assumes  no particular limit for the result
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  (before  6.2)  assumes  no particular limit for the result
            from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
            curses.
 
-       <STRONG>o</STRONG>   ncurses  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
            which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
-           <STRONG>sysconf</STRONG>  is available, ncurses uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
+           <STRONG>sysconf</STRONG>  is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
            2048 byte limit).  In either case,  it  reserves  a  byte  for  the
            terminating NUL.
 
@@ -221,16 +221,16 @@ <H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            caller into account when deciding whether to handle echoing  within
            <STRONG>getnstr</STRONG> or as a side-effect of the <STRONG>getch</STRONG> calls.
 
-       <STRONG>o</STRONG>   The original ncurses (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
+       <STRONG>o</STRONG>   The original <EM>ncurses</EM> (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
            accepting input for <STRONG>getnstr</STRONG>.  That  may  have  been  done  to  make
-           function- and cursor-keys work; it is not necessary with ncurses.
+           function- and cursor-keys work; it is not necessary with <EM>ncurses</EM>.
 
-           Since  1995, ncurses has provided signal handlers for INTR and QUIT
+           Since  1995, <EM>ncurses</EM> has provided signal handlers for INTR and QUIT
            (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
            catch  a  signal  and stop the program, where other implementations
            allow one to enter those characters in the buffer.
 
-       <STRONG>o</STRONG>   Starting in 2021 (ncurses 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
+       <STRONG>o</STRONG>   Starting in 2021 (<EM>ncurses</EM> 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
            and   <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,  e.g.,
            allowing one to enter a <STRONG>^C</STRONG> into the buffer.
 
@@ -240,7 +240,7 @@ <H1 class="no-header">curs_getstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 766aad03d..be5b1c2e6 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.39 2023/10/21 10:28:36 tom Exp @
+  * @Id: curs_getyx.3x,v 1.40 2023/12/16 21:33:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -78,7 +78,7 @@ <H1 class="no-header">curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All  of these interfaces are macros.  A "<STRONG>&amp;</STRONG>" is not necessary before the
+       All  of these interfaces are macros.  A "&amp;" is not necessary before the
        variables <EM>y</EM> and <EM>x</EM>.
 
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index c11a137c9..b4bcd57bf 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_inch.3x,v 1.41 2023/12/16 21:08:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -70,12 +70,12 @@ <H1 class="no-header">curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Attributes">Attributes</a></H3><PRE>
-       The  following  bit-masks  may  be  AND-ed  with characters returned by
+       The  following  bit  masks  may  be  AND-ed with characters returned by
        <STRONG>winch</STRONG>.
 
-       <STRONG>A_CHARTEXT</STRONG>     Bit-mask to extract character
-       <STRONG>A_ATTRIBUTES</STRONG>   Bit-mask to extract attributes
-       <STRONG>A_COLOR</STRONG>        Bit-mask to extract color-pair field information
+       <STRONG>A_CHARTEXT</STRONG>     Bit mask to extract character
+       <STRONG>A_ATTRIBUTES</STRONG>   Bit mask to extract attributes
+       <STRONG>A_COLOR</STRONG>        Bit mask to extract color pair field information
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_inch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 2d1fc6562..995f186d6 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.56 2023/12/03 00:09:54 tom Exp @
+  * @Id: curs_initscr.3x,v 1.59 2023/12/17 23:56:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -181,8 +181,8 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        X/Open  specifies that portable applications must not call <STRONG>initscr</STRONG> more
        than once:
 
-       <STRONG>o</STRONG>   The portable way to use <STRONG>initscr</STRONG> is once only,  using  <STRONG>refresh</STRONG>  (see
-           <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>) to restore the screen after <STRONG>endwin</STRONG>.
+       <STRONG>o</STRONG>   The portable way to use <STRONG>initscr</STRONG> is once only, using <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to
+           restore the screen after <STRONG>endwin</STRONG>.
 
        <STRONG>o</STRONG>   This implementation allows using <STRONG>initscr</STRONG> after <STRONG>endwin</STRONG>.
 
@@ -205,15 +205,15 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            <STRONG>curscr</STRONG>  as  well  as a work area <STRONG>newscr</STRONG>.  SVr4 curses ignores other
            windows.
 
-       <STRONG>o</STRONG>   Since version 4.0 (1996), ncurses has  maintained  a  list  of  all
+       <STRONG>o</STRONG>   Since version 4.0 (1996), <EM>ncurses</EM> has  maintained  a  list  of  all
            windows  for  each  screen,  using that information to delete those
            windows when <STRONG>delscreen</STRONG> is called.
 
-       <STRONG>o</STRONG>   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
+       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in  2001.   PDCurses  follows
            the SVr4 model, deleting only the standard <STRONG>WINDOW</STRONG> structures.
 
 
-</PRE><H3><a name="h3-High-level-versus-low-level">High-level versus low-level</a></H3><PRE>
+</PRE><H3><a name="h3-High-level-versus-Low-level">High-level versus Low-level</a></H3><PRE>
        Different  implementations  may  disagree  regarding  the level of some
        functions.  For example, <STRONG>SCREEN</STRONG>  (returned  by  <STRONG>newterm</STRONG>)  and  <STRONG>TERMINAL</STRONG>
        (returned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>)  hold  file  descriptors  for  the output
@@ -225,14 +225,13 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        For example
 
        <STRONG>o</STRONG>   NetBSD's  <STRONG><A HREF="curs_termattrs.3x.html">baudrate(3x)</A></STRONG>  function  uses  the descriptor in <STRONG>TERMINAL</STRONG>.
-           <STRONG>ncurses</STRONG> and SVr4 use the descriptor in <STRONG>SCREEN</STRONG>.
+           <EM>ncurses</EM> and SVr4 use the descriptor in <STRONG>SCREEN</STRONG>.
 
-       <STRONG>o</STRONG>   NetBSD and <STRONG>ncurses</STRONG> use the descriptor in <STRONG>TERMINAL</STRONG> for terminal  I/O
+       <STRONG>o</STRONG>   NetBSD and <EM>ncurses</EM> use the descriptor in <STRONG>TERMINAL</STRONG> for terminal  I/O
            modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
            uses the descriptor in <STRONG>SCREEN</STRONG>.
 
-
-</PRE><H3><a name="h3-Unset-TERM-Variable">Unset TERM Variable</a></H3><PRE>
+   <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
        If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
        "unknown",  which  normally  corresponds  to  a terminal entry with the
        <EM>generic</EM> (<EM>gn</EM>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
@@ -280,18 +279,18 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>SIGTSTP</STRONG>
             This handles the <EM>stop</EM> signal, used in job control.  When  resuming
             the  process,  this  implementation  discards  pending  input with
-            <STRONG>flushinput</STRONG> (see <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>), and repaints the  screen  assuming
-            that  it  has  been completely altered.  It also updates the saved
-            terminal modes with <STRONG>def_shell_mode</STRONG> (see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>).
+            <STRONG><A HREF="curs_util.3x.html">flushinp(3x)</A></STRONG>, and repaints the screen assuming that  it  has  been
+            completely altered.  It also updates the saved terminal modes with
+            <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>.
 
        <STRONG>SIGWINCH</STRONG>
             This handles the window-size changes which  were  ignored  in  the
             standardization   efforts.    The  handler  sets  a  (signal-safe)
-            variable which is later tested in <STRONG>wgetch</STRONG> (see <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>).  If
-            <STRONG>keypad</STRONG>  has  been  enabled  for  the  corresponding window, <STRONG>wgetch</STRONG>
-            returns the key symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time, <STRONG>wgetch</STRONG> calls
-            <STRONG>resizeterm</STRONG>  to adjust the standard screen <STRONG>stdscr</STRONG>, and update other
-            data such as <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
+            variable which is later tested in <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>.  If <STRONG>keypad</STRONG> has  been
+            enabled  for  the  corresponding  window,  <STRONG>wgetch</STRONG>  returns the key
+            symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time, <STRONG>wgetch</STRONG> calls  <STRONG>resizeterm</STRONG>  to
+            adjust  the  standard screen <STRONG>stdscr</STRONG>, and update other data such as
+            <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -300,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -320,8 +319,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Differences">Differences</a></li>
-<li><a href="#h3-High-level-versus-low-level">High-level versus low-level</a></li>
-<li><a href="#h3-Unset-TERM-Variable">Unset TERM Variable</a></li>
+<li><a href="#h3-High-level-versus-Low-level">High-level versus Low-level</a></li>
 <li><a href="#h3-Signal-Handlers">Signal Handlers</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 16f564cd4..d9a8d55ee 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.58 2023/11/25 14:30:50 tom Exp @
+  * @Id: curs_inopts.3x,v 1.59 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -336,7 +336,7 @@ <H1 class="no-header">curs_inopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 153add44e..b542bf8e0 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.29 2023/11/25 11:29:34 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.30 2023/12/16 20:36:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -103,9 +103,9 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All but <STRONG>wins_nwstr</STRONG> may be macros.
 
-       If  the  first character in the string is a nonspacing character, these
-       functions will fail.  XSI  does  not  define  what  will  happen  if  a
-       nonspacing character follows a control character.
+       If  the first character in the string is a non-spacing character, these
+       functions will fail.  XSI does not define what will happen  if  a  non-
+       spacing character follows a control character.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -122,7 +122,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index b2afb581e..f0a1be0df 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.33 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_insch.3x,v 1.34 2023/12/16 21:09:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -70,18 +70,17 @@ <H1 class="no-header">curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines that return an integer return  <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>
-       (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
+       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       These  routines  do  not  necessarily  imply  use  of a hardware insert
+       These routines do not  necessarily  imply  use  of  a  hardware  insert
        character feature.
 
        Note that <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be macros.
@@ -94,12 +93,12 @@ <H1 class="no-header">curs_insch 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
+       Comparable  functions  in  the  wide-character  (ncursesw)  library are
        described in <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 4860e02cc..efc2a3913 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.43 2023/11/25 17:58:25 tom Exp @
+  * @Id: curs_instr.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        SVr4  does not document whether a length limit includes or excludes the
        trailing NUL.
 
-       The ncurses library extends the XSI description by allowing a  negative
+       The <EM>ncurses</EM> library extends the XSI description by allowing a  negative
        value  for  <EM>n</EM>.  In this case, the functions return the string ending at
        the right margin.
 
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_instr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 0abb2f764..c13997e4a 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.49 2023/10/14 22:03:52 tom Exp @
+  * @Id: curs_kernel.3x,v 1.50 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -184,9 +184,9 @@ <H1 class="no-header">curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
-       Both ncurses and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
+       Both <EM>ncurses</EM> and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
        called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for ncurses  to  determine  the  initial
+       very visible.  There is no way for <EM>ncurses</EM>  to  determine  the  initial
        cursor state to restore that.
 
 
@@ -199,7 +199,7 @@ <H1 class="no-header">curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
        type int.  This is misleading, as they are macros  with  no  documented
        semantics for the return value.
 
-       If interrupted, ncurses restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
+       If interrupted, <EM>ncurses</EM> restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
        seconds, are different from other implementations.
 
 
@@ -209,7 +209,7 @@ <H1 class="no-header">curs_kernel 3x 2023-10-14 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-14                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 95c15b8f6..0572643c8 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.31 2023/11/11 11:46:43 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.32 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -65,14 +65,14 @@ <H1 class="no-header">curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These  functions  are  used to simplify analysis of memory leaks in the
-       ncurses library.
+       <EM>ncurses</EM> library.
 
        Any implementation of curses must not free the memory associated with a
        screen, since (even after calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>), it must be available for
        use in the next call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.  There are also chunks  of  memory
        held  for  performance  reasons.   That makes it hard to analyze curses
        applications for memory leaks.  When  using  the  specially  configured
-       debugging  version  of  the  ncurses  library,  applications  can  call
+       debugging  version  of  the  <EM>ncurses</EM>  library,  applications  can  call
        functions which free those chunks of memory, simplifying the process of
        memory-leak checking.
 
@@ -80,10 +80,10 @@ <H1 class="no-header">curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</H1>
        not intended for use in the non-debugging library:
 
        <STRONG>_nc_freeall</STRONG>
-            This frees (almost) all of the memory allocated by ncurses.
+            This frees (almost) all of the memory allocated by <EM>ncurses</EM>.
 
        <STRONG>_nc_free_and_exit</STRONG>
-            This frees the memory allocated by ncurses (like <STRONG>_nc_freeall</STRONG>), and
+            This frees the memory allocated by <EM>ncurses</EM> (like <STRONG>_nc_freeall</STRONG>), and
             exits the program.  It is preferred over <STRONG>_nc_freeall</STRONG> since some of
             that memory may be  required  to  keep  the  application  running.
             Simply exiting (with the given exit-code) is safer.
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-11-11 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-11                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 5804c6dc7..8067e30e5 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.81 2023/10/21 10:29:45 tom Exp @
+  * @Id: curs_mouse.3x,v 1.82 2023/12/16 21:08:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -177,8 +177,8 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-wmouse_trafo">wmouse_trafo</a></H3><PRE>
        The <STRONG>wmouse_trafo</STRONG> function transforms a given pair of  coordinates  from
-       stdscr-relative coordinates to coordinates relative to the given window
-       or vice versa.   The  resulting  stdscr-relative  coordinates  are  not
+       <STRONG>stdscr</STRONG>-relative coordinates to coordinates relative to the given window
+       or vice versa.   The  resulting  <STRONG>stdscr</STRONG>-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 <STRONG>ripoffline</STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
@@ -193,7 +193,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
            window, <STRONG>FALSE</STRONG> is returned.
 
        <STRONG>o</STRONG>   If <EM>to</EM><STRONG>_</STRONG><EM>screen</EM> is <STRONG>FALSE</STRONG>, the pointers <EM>pY,</EM> <EM>pX</EM> must  reference  window-
-           relative   coordinates.   They  are  converted  to  stdscr-relative
+           relative   coordinates.   They  are  converted  to  <STRONG>stdscr</STRONG>-relative
            coordinates if the window <EM>win</EM> encloses this point.   In  this  case
            the function returns <STRONG>TRUE</STRONG>.
 
@@ -205,7 +205,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-mouse_trafo">mouse_trafo</a></H3><PRE>
        The <STRONG>mouse_trafo</STRONG> function performs the same translation as <STRONG>wmouse_trafo</STRONG>,
-       using stdscr for <EM>win</EM>.
+       using <STRONG>stdscr</STRONG> for <EM>win</EM>.
 
 
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
        The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
-       successfully initialized.
+       successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
 
        Note  that  mouse  events will be ignored when input is in cooked mode,
        and will cause an error beep when cooked mode is being simulated  in  a
@@ -228,22 +228,22 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>getmouse</STRONG> and <STRONG>ungetmouse</STRONG> return the integer <STRONG>ERR</STRONG> upon failure or <STRONG>OK</STRONG>  upon
-       successful completion:
+       <STRONG>has_mouse</STRONG>, <STRONG>wenclose</STRONG>, <STRONG>mouse_trafo</STRONG>, and <STRONG>wmouse_trafo</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>
+       as noted above.
 
-          <STRONG>getmouse</STRONG>
-               returns an error.
+       <STRONG>getmouse</STRONG> and <STRONG>ungetmouse</STRONG> return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
-          <STRONG>o</STRONG>   If  no mouse driver was initialized, or if the mask parameter is
-              zero,
+       <STRONG>getmouse</STRONG> fails if:
 
-          <STRONG>o</STRONG>   It returns an error if a mouse event was detected which did  not
-              match the current <EM>mousemask</EM>.
+       <STRONG>o</STRONG>   no mouse driver was initialized,
 
-          <STRONG>o</STRONG>   It also returns an error if no more events remain in the queue.
+       <STRONG>o</STRONG>   the mask of reportable events is zero,
 
-          <STRONG>ungetmouse</STRONG>
-               returns an error if the FIFO is full.
+       <STRONG>o</STRONG>   a mouse event was detected that does not match the mask,
+
+       <STRONG>o</STRONG>   or if no more events remain in the queue.
+
+       <STRONG>ungetmouse</STRONG> returns an error if the event queue is full.
 
        <STRONG>mousemask</STRONG> returns the mask of reportable events.
 
@@ -251,18 +251,63 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
        was not initialized.  In that case, it  returns  the  maximum  interval
        value (166).
 
-       <STRONG>wenclose</STRONG> and <STRONG>wmouse_trafo</STRONG> are boolean functions returning <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>
-       depending on their test result.
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the preprocessor
+       can be used to  test  whether  these  features  are  present.   If  the
+       interface  is  changed,  the  value  of  <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will be
+       incremented.  These values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may  be  specified
+       when configuring <EM>ncurses</EM>:
+
+          1  has definitions for reserved events.  The mask uses 28 bits.
+
+          2  adds  definitions  for  button  5,  removes  the  definitions for
+             reserved events.  The mask uses 29 bits.
+
+       The  order  of  the  <STRONG>MEVENT</STRONG>  structure  members  is   not   guaranteed.
+       Additional fields may be added to the structure in the future.
+
+       Under  <EM>ncurses</EM>, these calls are implemented using either xterm's built-
+       in mouse-tracking API or platform-specific drivers including
+
+          <STRONG>o</STRONG>   Alessandro Rubini's gpm server
+
+          <STRONG>o</STRONG>   FreeBSD sysmouse
+
+          <STRONG>o</STRONG>   OS/2 EMX
+
+       If you are using an unsupported configuration, mouse events will not be
+       visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
+
+       If  the  terminfo entry contains a <STRONG>XM</STRONG> string, this is used in the xterm
+       mouse driver to control the way the terminal is initialized  for  mouse
+       operation.   The  default,  if  <STRONG>XM</STRONG> is not found, corresponds to private
+       mode 1000 of xterm:
+
+          \E[?1000%?%p1%{1}%=%th%el%;
+
+       The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
+
+          \E[?1006;1000%?%p1%{1}%=%th%el%;
+
+       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
+       intended  for  use with touch screens (which may be pressure-sensitive)
+       or with 3D-mice/trackballs/power gloves.
+
+       The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
+       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
+       position reports as a sequence of presses of buttons  4  or  5  without
+       matching button-releases.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These calls were designed for  <EM>ncurses</EM>,  and  are  not  found  in  SVr4
+       These  calls  were  designed  for  <EM>ncurses</EM>,  and  are not found in SVr4
        <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous version of <EM>curses</EM>.
 
-       SVr4  <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It is
+       SVr4 <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It  is
        mentioned in a few places, but with no supporting documentation:
 
-       <STRONG>o</STRONG>   the "libcurses" manual page lists functions for this feature  which
+       <STRONG>o</STRONG>   the  "libcurses" manual page lists functions for this feature which
            are prototyped in <STRONG>curses.h</STRONG>:
 
                extern int mouse_set(long int);
@@ -281,88 +326,42 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
                mouse_info        minfo   Mi       Mouse status information
                req_mouse_pos     reqmp   RQ       Request mouse position report
 
-       <STRONG>o</STRONG>   the  interface  made assumptions (as does <EM>ncurses</EM>) about the escape
+       <STRONG>o</STRONG>   the interface made assumptions (as does <EM>ncurses</EM>) about  the  escape
            sequences sent to and received from the terminal.
 
-           For instance the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG>  capability
-           to  tell  the  terminal  which  mouse button events it should send,
-           passing the mouse-button bit-mask to the terminal.  Also, it  could
-           ask  the  terminal  where  the  mouse  was  using the <STRONG>req_mouse_pos</STRONG>
+           For  instance the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> capability
+           to tell the terminal which mouse  button  events  it  should  send,
+           passing  the mouse-button bit mask to the terminal.  Also, it could
+           ask the terminal  where  the  mouse  was  using  the  <STRONG>req_mouse_pos</STRONG>
            capability.
 
-           Those features required a terminal which had been modified to  work
+           Those  features required a terminal which had been modified to work
            with <EM>curses</EM>.  They were not part of the X Consortium's xterm.
 
-       When  developing the xterm mouse support for <EM>ncurses</EM> in September 1995,
-       Eric Raymond was uninterested in using the same interface  due  to  its
+       When developing the xterm mouse support for <EM>ncurses</EM> in September  1995,
+       Eric  Raymond  was  uninterested in using the same interface due to its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
-       in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
-       use  video  terminals,  making  it  unnecessary  to  be concerned about
+       in  PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does not
+       use video terminals,  making  it  unnecessary  to  be  concerned  about
        compatibility with the escape sequences.
 
-       The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the preprocessor
-       can  be  used  to  test  whether  these  features  are present.  If the
-       interface is  changed,  the  value  of  <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will  be
-       incremented.   These  values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified
-       when configuring <EM>ncurses</EM>:
-
-          1  has definitions for reserved events.  The mask uses 28 bits.
-
-          2  adds definitions  for  button  5,  removes  the  definitions  for
-             reserved events.  The mask uses 29 bits.
-
-       The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
-       Additional fields may be added to the structure in the future.
-
-       Under <EM>ncurses</EM>, these calls are implemented using either xterm's  built-
-       in mouse-tracking API or platform-specific drivers including
-
-          <STRONG>o</STRONG>   Alessandro Rubini's gpm server
-
-          <STRONG>o</STRONG>   FreeBSD sysmouse
-
-          <STRONG>o</STRONG>   OS/2 EMX
-
-       If you are using an unsupported configuration, mouse events will not be
-       visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
-
-       If the terminfo entry contains a <STRONG>XM</STRONG> string, this is used in  the  xterm
-       mouse  driver  to control the way the terminal is initialized for mouse
-       operation.  The default, if <STRONG>XM</STRONG> is not  found,  corresponds  to  private
-       mode 1000 of xterm:
-
-          \E[?1000%?%p1%{1}%=%th%el%;
-
-       The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
-
-          \E[?1006;1000%?%p1%{1}%=%th%el%;
-
-       The  <EM>z</EM>  member  in  the  event  structure is not presently used.  It is
-       intended for use with touch screens (which may  be  pressure-sensitive)
-       or with 3D-mice/trackballs/power gloves.
-
-       The  <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include <STRONG>REPORT_MOUSE_POSITION</STRONG>.
-       They are distinct.  For example, in xterm,  wheel/scrolling  mice  send
-       position  reports  as  a  sequence of presses of buttons 4 or 5 without
-       matching button-releases.
-
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in cooked  mode  if  they  have
-       been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
+       Mouse  events  from  <EM>xterm</EM>  are <EM>not</EM> ignored in cooked mode if they have
+       been enabled by <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM>  mouse  report  sequence
        appears in the string read.
 
-       Mouse event reports from <EM>xterm</EM> are not detected correctly in  a  window
-       with  keypad application mode disabled, since they are interpreted as a
-       variety of function key.  Set the the  terminal's  <EM>terminfo</EM>  capability
-       <STRONG>kmous</STRONG>  to  "\E[M"  (the  beginning of the response from <EM>xterm</EM> for mouse
-       clicks).   Other  values  of  <STRONG>kmous</STRONG>  are  permitted  under   the   same
+       Mouse  event  reports from <EM>xterm</EM> are not detected correctly in a window
+       with keypad application mode disabled, since they are interpreted as  a
+       variety  of  function  key.  Set the the terminal's <EM>terminfo</EM> capability
+       <STRONG>kmous</STRONG> to "\E[M" (the beginning of the response  from  <EM>xterm</EM>  for  mouse
+       clicks).    Other   values  of  <STRONG>kmous</STRONG>  are  permitted  under  the  same
        assumption, that is, the report begins with that sequence.
 
        Because there are no standard response sequences that serve to identify
-       terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
+       terminals  supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that if
        <STRONG>kmous</STRONG> is defined in the terminal description, or if the terminal type's
-       primary name or aliases contain the string "xterm", then  the  terminal
+       primary  name  or aliases contain the string "xterm", then the terminal
        may send mouse events.  The <STRONG>kmous</STRONG> capability is checked first, allowing
        use of newer <EM>xterm</EM> mouse protocols such as its private mode 1006.
 
@@ -373,7 +372,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -393,6 +392,7 @@ <H1 class="no-header">curs_mouse 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 9bef53b05..284ff7862 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.32 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_move.3x,v 1.33 2023/12/16 21:33:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -65,8 +65,9 @@ <H1 class="no-header">curs_move 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 specifies only  "an
-       integer value other than <STRONG>ERR</STRONG>") upon successful completion.
+       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
+       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       completion.
 
        Specifically, they return an error if the window pointer is null, or if
        the position is outside the window.
@@ -85,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index d89e02358..89126bad7 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.40 2023/12/02 20:52:50 tom Exp @
+  * @Id: curs_opaque.3x,v 1.41 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_opaque 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 7e1eb88b5..9ca36cfc4 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.52 2023/11/25 14:08:05 tom Exp @
+  * @Id: curs_outopts.3x,v 1.53 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -173,7 +173,7 @@ <H1 class="no-header">curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       From  the  outset,  ncurses  used  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> to control the conversion of
+       From  the  outset,  <EM>ncurses</EM>  used  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> to control the conversion of
        newlines to carriage return/line-feed on output as well as input.   XSI
        Curses  documents  only  the  use  of  these functions for input.  This
        difference arose from converting the <EM>pcurses</EM> source (which  used  <STRONG>ioctl</STRONG>
@@ -181,15 +181,15 @@ <H1 class="no-header">curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        interface).  In the former, both input and output were controlled via a
        single  option  <STRONG>CRMOD</STRONG>,  while  the  latter  separates  these  features.
        Because that conversion interferes with  output  optimization,  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>
-       were amended after ncurses 6.2 to eliminate their effect on output.
+       were amended after <EM>ncurses</EM> 6.2 to eliminate their effect on output.
 
        Some  historic  curses implementations had, as an undocumented feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
-       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under ncurses.
+       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
        Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
        enabled, any window modification triggering  a  scroll  also  forced  a
-       physical refresh.  XSI Curses does not require this, and <STRONG>ncurses</STRONG> avoids
+       physical refresh.  XSI Curses does not require this, and <EM>ncurses</EM> avoids
        doing it to perform better  vertical-motion  optimization  at  <STRONG>wrefresh</STRONG>
        time.
 
@@ -205,7 +205,7 @@ <H1 class="no-header">curs_outopts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 669b7d5bd..868c4224f 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.35 2023/11/25 11:29:34 tom Exp @
+  * @Id: curs_overlay.3x,v 1.36 2023/12/16 21:32:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -81,8 +81,8 @@ <H1 class="no-header">curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return an integer return <STRONG>ERR</STRONG> upon failure, and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       These  routines  return  the  integer  <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG> (SVr4
+       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
        X/Open  defines  no error conditions.  In this implementation, <STRONG>copywin</STRONG>,
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 77fc8cd00..f4062cf74 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.49 2023/11/25 14:08:35 tom Exp @
+  * @Id: curs_pad.3x,v 1.50 2023/12/16 21:18:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -68,77 +68,77 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-newpad">newpad</a></H3><PRE>
-       The <STRONG>newpad</STRONG> routine creates and returns a pointer  to  a  new  pad  data
-       structure  with  the given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.
-       A pad is like a window, except that it is not restricted by the  screen
-       size,  and  is not necessarily associated with a particular part of the
-       screen.  Pads can be used when a large window is  needed,  and  only  a
-       part  of  the  window  will  be  on  the screen at one time.  Automatic
-       refreshes of pads (e.g., from scrolling or echoing  of  input)  do  not
-       occur.
-
-       It  is not valid to call <STRONG>wrefresh</STRONG> with a <EM>pad</EM> argument; call <STRONG>prefresh</STRONG> or
-       <STRONG>pnoutrefresh</STRONG> instead.  They require additional  parameters  to  specify
-       the  part  of the pad to be displayed and the location on the screen to
+       <STRONG>newpad</STRONG> creates and returns a pointer to a new pad data  structure  with
+       the given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.  A pad is like a
+       window, except that it is not restricted by the screen size, and is not
+       necessarily  associated with a particular part of the screen.  Pads can
+       be used when a large window is needed, and only a part  of  the  window
+       will  be  on  the  screen at one time.  Automatic refreshes of pads (as
+       from scrolling or echoing of input) do not occur.
+
+       It is not valid to call <STRONG>wrefresh</STRONG> with a <EM>pad</EM> argument; call <STRONG>prefresh</STRONG>  or
+       <STRONG>pnoutrefresh</STRONG>  instead.   They  require additional parameters to specify
+       the part of the pad to be displayed and the location on the  screen  to
        be used for the display.
 
 
 </PRE><H3><a name="h3-subpad">subpad</a></H3><PRE>
-       The <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow  within
-       a  pad  with  the  given  number  of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.
+       The  <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow within
+       a pad with the given number  of  lines,  <EM>nlines</EM>,  and  columns,  <EM>ncols</EM>.
        Unlike <STRONG>subwin</STRONG>, which uses screen coordinates, the window is at position
        (<EM>begin</EM>_<EM>x</EM><STRONG>,</STRONG> <EM>begin</EM>_<EM>y</EM>) on the pad.  The window is made in the middle of the
-       window <EM>orig</EM>, so that changes made to one window  affect  both  windows.
-       During  the  use  of  this  routine, it will often be necessary to call
+       window  <EM>orig</EM>,  so  that changes made to one window affect both windows.
+       During the use of this routine, it will  often  be  necessary  to  call
        <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-prefresh_-pnoutrefresh">prefresh, pnoutrefresh</a></H3><PRE>
-       The <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> routines are analogous  to  <STRONG>wrefresh</STRONG>  and
-       <STRONG>wnoutrefresh</STRONG>  except  that they relate to pads instead of windows.  The
-       additional parameters are needed to indicate what part of the  pad  and
+       The  <STRONG>prefresh</STRONG>  and  <STRONG>pnoutrefresh</STRONG> routines are analogous to <STRONG>wrefresh</STRONG> and
+       <STRONG>wnoutrefresh</STRONG> except that they relate to pads instead of  windows.   The
+       additional  parameters  are needed to indicate what part of the pad and
        screen are involved.
 
-       <STRONG>o</STRONG>   The  <EM>pminrow</EM>  and  <EM>pmincol</EM>  parameters  specify the upper left-hand
+       <STRONG>o</STRONG>   The <EM>pminrow</EM> and <EM>pmincol</EM>  parameters  specify  the  upper  left-hand
            corner of the rectangle to be displayed in the pad.
 
-       <STRONG>o</STRONG>   The <EM>sminrow</EM>, <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters  specify  the
+       <STRONG>o</STRONG>   The  <EM>sminrow</EM>,  <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters specify the
            edges of the rectangle to be displayed on the screen.
 
        The lower right-hand corner of the rectangle to be displayed in the pad
        is calculated from the screen coordinates, since the rectangles must be
        the same size.  Both rectangles must be entirely contained within their
-       respective structures.  Negative values of <EM>pminrow</EM>,  <EM>pmincol</EM>,  <EM>sminrow</EM>,
+       respective  structures.   Negative values of <EM>pminrow</EM>, <EM>pmincol</EM>, <EM>sminrow</EM>,
        or <EM>smincol</EM> are treated as if they were zero.
 
 
 </PRE><H3><a name="h3-pechochar">pechochar</a></H3><PRE>
-       The  <STRONG>pechochar</STRONG>  routine  is  functionally equivalent to a call to <STRONG>addch</STRONG>
-       followed by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a  call
-       to  <STRONG>wrefresh</STRONG>,  or a call to <STRONG>waddch</STRONG> followed by a call to <STRONG>prefresh</STRONG>.  The
-       knowledge that only a single character is being output  is  taken  into
-       consideration   and,   for   non-control   characters,  a  considerable
+       The <STRONG>pechochar</STRONG> routine is functionally equivalent to  a  call  to  <STRONG>addch</STRONG>
+       followed  by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a call
+       to <STRONG>wrefresh</STRONG>, or a call to <STRONG>waddch</STRONG> followed by a call to  <STRONG>prefresh</STRONG>.   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 these routines instead of their
        equivalents.  In the case of <STRONG>pechochar</STRONG>, the last location of the pad on
        the screen is reused for the arguments to <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-pecho_wchar">pecho_wchar</a></H3><PRE>
-       The <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form  of
+       The  <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form of
        <STRONG>pechochar</STRONG>.  It outputs one character to a pad and immediately refreshes
-       the pad.  It does this by a call to <STRONG>wadd_wch</STRONG>  followed  by  a  call  to
+       the  pad.   It  does  this  by a call to <STRONG>wadd_wch</STRONG> followed by a call to
        <STRONG>prefresh</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       Functions that return an integer return <STRONG>ERR</STRONG> upon failure and  <STRONG>OK</STRONG>  (SVr4
+       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
        completion.
 
-       Routines  that  return  pointers return <STRONG>NULL</STRONG> on error, and set <STRONG>errno</STRONG> to
+       Functions that return pointers return <STRONG>NULL</STRONG> on error, and set  <STRONG>errno</STRONG>  to
        <STRONG>ENOMEM</STRONG>.
 
-       X/Open does not define any error conditions.  In this implementation
+       X/Open   Curses   does  not  define  any  error  conditions.   In  this
+       implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
                return an error if the window pointer is null, or if the window
@@ -156,7 +156,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>pechochar</STRONG> may be a macro.
+       <STRONG>pechochar</STRONG> may be a macro.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -182,7 +182,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        conditions.  The behavior of <STRONG>subpad</STRONG> if the parent window is not  a  pad
        is undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <STRONG>WINDOW</STRONG> structure in <STRONG>newpad</STRONG> which
+       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <EM>WINDOW</EM> structure in <STRONG>newpad</STRONG> which
            tells if the window is a <EM>pad</EM>.
 
            However, it uses this information only in <STRONG>waddch</STRONG> (to decide  if  it
@@ -190,7 +190,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            does not check in <STRONG>wrefresh</STRONG> to ensure  that  the  pad  is  refreshed
            properly.
 
-       <STRONG>o</STRONG>   Solaris  X/Open Curses checks if a window is a pad in <STRONG>wnoutrefresh</STRONG>,
+       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  checks whether a window is a pad in <STRONG>wnoutrefresh</STRONG>,
            returning <STRONG>ERR</STRONG> in that case.
 
            However, it only sets the flag for subwindows if the parent  window
@@ -201,7 +201,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            enough,  a  comment  in  the  source code states that the lack of a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG>  and
+       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG>  and
            <STRONG>subpad</STRONG>,   using   this   to   help  with  the  distinction  between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
@@ -214,7 +214,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        This implementation
 
-       <STRONG>o</STRONG>   sets a flag in the <STRONG>WINDOW</STRONG> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
+       <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
 
        <STRONG>o</STRONG>   allows  a  <STRONG>subwin</STRONG>  or <STRONG>derwin</STRONG> call to succeed having a pad parent by
            forcing the subwindow to be a pad,
@@ -231,7 +231,7 @@ <H1 class="no-header">curs_pad 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 93f433da5..97e81782b 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.34 2023/10/21 10:31:22 tom Exp @
+  * @Id: curs_print.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_print 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 35e39c725..47ac8e5e7 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,19 +27,24 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.43 2023/11/25 11:31:06 tom Exp @
+  * @Id: curs_printw.3x,v 1.45 2023/12/18 00:03:28 tom Exp @
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+  *   libcurses/printw.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
+  *  varargs.h
+  * either header declares "va_list", but only one can be used
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -48,7 +53,7 @@ <H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>,  <STRONG>mvprintw</STRONG>,  <STRONG>mvwprintw</STRONG>,  <STRONG>vwprintw</STRONG>,  <STRONG>vw_printw</STRONG>  - write
-       formatted output to <EM>curses</EM> windows
+       formatted output to a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -58,6 +63,7 @@ <H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>wprintw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvprintw(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwprintw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>vw_printw(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>fmt</EM><STRONG>,</STRONG> <STRONG>va_list</STRONG> <EM>varglist</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>obsolete</EM> <EM>*/</EM>
@@ -65,86 +71,88 @@ <H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG> and <STRONG>mvwprintw</STRONG> routines are  analogous  to
-       <STRONG>printf</STRONG>  [see <STRONG>printf(3)</STRONG>].  In effect, the string that would be output by
-       <STRONG>printf</STRONG> is output instead as though  <STRONG>waddstr</STRONG>  were  used  on  the  given
-       window.
+       <STRONG>printw</STRONG>, <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG>, and <STRONG>mvwprintw</STRONG> are  analogous  to  <STRONG>printf(3)</STRONG>.
+       In  effect,  the  string  that  would be output by <STRONG>printf(3)</STRONG> is instead
+       output as though <STRONG><A HREF="curs_addstr.3x.html">waddstr(3x)</A></STRONG> were used with  <EM>win</EM>  (or  <STRONG>stdscr</STRONG>)  as  its
+       first argument.
 
-       The  <STRONG>vwprintw</STRONG>  and  <STRONG>vw_printw</STRONG>  routines  are  analogous to <STRONG>vprintf</STRONG> [see
-       <STRONG>printf(3)</STRONG>] and perform a <STRONG>wprintw</STRONG> using a variable argument  list.   The
-       third  argument  is  a  <STRONG>va_list</STRONG>,  a  pointer to a list of arguments, as
-       defined in <STRONG>&lt;stdarg.h&gt;</STRONG>.
+       <STRONG>vwprintw</STRONG>  and  <STRONG>vw_printw</STRONG>  are  analogous  to  <STRONG>vprintf(3)</STRONG>, and perform a
+       <STRONG>wprintw</STRONG> using a variable  argument  list.   The  third  argument  is  a
+       <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, a pointer to a list of arguments, as defined in <EM>stdarg.h</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
-       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
-       completion.
+       These functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
-       X/Open defines no error conditions.  In this implementation,  an  error
-       may be returned if it cannot allocate enough memory for the buffer used
-       to format the results.  It will return an error if the  window  pointer
-       is null.
+       In <EM>ncurses,</EM> failure occurs if the library cannot allocate enough memory
+       for the buffer into which the output is formatted,  or  if  the  window
+       pointer <EM>win</EM> is null.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
-
+       <STRONG>wmove</STRONG>, and fail if the position is outside the window.
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       In  this  implementation,  <STRONG>vw_printw</STRONG>  and  <STRONG>vwprintw</STRONG>  are equivalent, to
-       support  legacy  applications.   However,  the  latter  (<STRONG>vwprintw</STRONG>)   is
-       obsolete:
 
-       <STRONG>o</STRONG>   The  XSI  Curses  standard, Issue 4 described these functions.  The
-           function <STRONG>vwprintw</STRONG> is marked TO BE WITHDRAWN, and is to be  replaced
-           by a function <STRONG>vw_printw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       No wide character counterpart  functions  are  defined  by  the  "wide"
+       <EM>ncurses</EM> configuration nor by any standard.  To format and write a wide-
+       character string to a <EM>curses</EM> window,  consider  using  <STRONG>swprintf(3)</STRONG>  and
+       <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG> or similar.
 
-       <STRONG>o</STRONG>   The  Single Unix Specification, Version 2 states that <STRONG>vw_printw</STRONG>  is
-           preferred  to  <STRONG>vwprintw</STRONG>  since  the   latter   requires   including
-           <STRONG>&lt;varargs.h&gt;</STRONG>,  which  cannot be used in the same file as <STRONG>&lt;stdarg.h&gt;</STRONG>.
-           This implementation uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because  that  header
-           is included in <STRONG>&lt;curses.h</STRONG>&gt;.
 
-       <STRONG>o</STRONG>   X/Open  Curses, Issue 5 (December 2007) marked <STRONG>vwprintw</STRONG> (along with
-           <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       error conditions for them.
 
+       <EM>ncurses</EM> defines <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> identically  to  support  legacy
+       applications.  However, the latter is obsolete.
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       While <STRONG>printw</STRONG> was implemented in 4BSD, it was unused until 4.2BSD (which
-       used  it in games).  That early version of curses was before the ANSI C
-       standard.  It did not use &lt;varargs.h&gt;, though that was  available.   In
-       1991  (a  couple of years after SVr4 was generally available, and after
-       the C standard was published), other developers  updated  the  library,
-       using   &lt;stdarg.h&gt;   internally  in  4.4BSD  curses.   Even  with  this
-       improvement, BSD curses  did  not  use  function  prototypes  (or  even
-       declare functions) in the &lt;curses.h&gt; header until 1992.
+       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4,  Version  2  (1996),  marked <STRONG>vwprintw</STRONG> as
+           requiring <EM>varargs.h</EM> and "TO BE WITHDRAWN", and specified  <STRONG>vw_printw</STRONG>
+           using the <EM>stdarg.h</EM> interface.
 
-       SVr2  documented  <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>  tersely  as  "printf on <EM>stdscr</EM>" and
-       tersely as "printf on <EM>win</EM>", respectively.
+       <STRONG>o</STRONG>   X/Open  Curses,  Issue  5,  Draft 2 (December 2007) marked <STRONG>vwprintw</STRONG>
+           (along with <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.  After
+           incorporating  review  comments, this became X/Open Curses, Issue 7
+           (2009).
 
-       SVr3 added <STRONG>mvprintw</STRONG>, and <STRONG>mvwprintw</STRONG>, with a  three-line  summary  saying
-       that they were analogous to <STRONG>printf(3)</STRONG>, explaining that the string which
-       would be output from <STRONG>printf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on
-       the  given  window.   SVr3  also  added <STRONG>vwprintw</STRONG>, saying that the third
-       parameter is a <STRONG>va_list</STRONG>,  defined  in  &lt;varargs.h&gt;,  and  referring  the
-       reader  to  the  manual  pages  for  <EM>varargs</EM>  and  <STRONG>vprintf</STRONG> for detailed
-       descriptions.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> provides <STRONG>vwprintw</STRONG>, but marks it as deprecated.
 
-       SVr4 added  no  new  variations  of  <STRONG>printw</STRONG>,  but  provided  for  using
-       &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
 
-       X/Open  Curses  added  <STRONG>vw_printw</STRONG>  to replace <STRONG>vwprintw</STRONG>, stating that its
-       <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       While <STRONG>printw</STRONG> was implemented in 4BSD (November  1980),  it  was  unused
+       until  4.2BSD  (August  1983), which employed it for games.  That early
+       version of <EM>curses</EM> preceded the ANSI C standard of 1989.  It did not use
+       <EM>varargs.h</EM>,  though  that  had been available since Seventh Edition Unix
+       (1979).  In 1991 (a couple of years after SVr4 was generally available,
+       and  after  the C standard was published), other developers updated the
+       library, using <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses.</EM>   Even  with  this
+       improvement,  BSD  <EM>curses</EM>  did  not  use  function prototypes (nor even
+       declare functions) in <EM>curses.h</EM> until 1992.
+
+       SVr2 (1984) documented <STRONG>printw</STRONG> and <STRONG>wprintw</STRONG> tersely as "printf on <STRONG>stdscr</STRONG>"
+       and "printf on <EM>win</EM>", respectively.
+
+       SVr3  (1987)  added  <STRONG>mvprintw</STRONG>  and <STRONG>mvwprintw</STRONG>, with a three-line summary
+       asserting that they were analogous to <STRONG>printf(3)</STRONG>,  explaining  that  the
+       string  that  <STRONG>printf(3)</STRONG> would write to the standard output stream would
+       instead be output  using  <STRONG>waddstr</STRONG>  to  the  given  window.   SVr3  also
+       implemented  <STRONG>vwprintw</STRONG>,  describing  its  third  parameter as a <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,
+       defined in <EM>varargs.h</EM>, and referred the reader to the manual  pages  for
+       <EM>varargs</EM> and <EM>vprintf</EM> for detailed descriptions.
+
+       SVr4  (1989)  introduced  no new variations of <EM>printw</EM>, but provided for
+       using either <EM>varargs.h</EM> or <EM>stdarg.h</EM> to define the <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type.
+
+       X/Open Curses, Issue 4 (1995), defined <STRONG>vw_printw</STRONG> to  replace  <STRONG>vwprintw</STRONG>,
+       stating that its <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type is defined in <EM>stdarg.h</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
-       <STRONG>printf(3)</STRONG>, <STRONG>vprintf(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>, <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>, <STRONG>printf(3)</STRONG>, <STRONG>vprintf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -152,6 +160,7 @@ <H1 class="no-header">curs_printw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 227427fa5..74985fb11 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.38 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_refresh.3x,v 1.39 2023/12/16 21:09:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -123,8 +123,8 @@ <H1 class="no-header">curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return an integer return <STRONG>ERR</STRONG> upon failure, and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       These  routines  return  the  integer  <STRONG>ERR</STRONG>  upon  failure  and <STRONG>OK</STRONG> (SVr4
+       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
        X/Open does not define any error conditions.  In this implementation
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 6b51f936d..a0b8d7ccc 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,19 +27,24 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.43 2023/11/25 11:31:06 tom Exp @
+  * @Id: curs_scanw.3x,v 1.44 2023/12/17 22:50:40 tom Exp @
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+  *  libcurses/scanw.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
+  *  varargs.h
+  * either header declares "va_list", but only one can be used
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -66,104 +71,120 @@ <H1 class="no-header">curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG> and <STRONG>mvscanw</STRONG> routines  are  analogous  to  <STRONG>scanf</STRONG>  [see
-       <STRONG>scanf(3)</STRONG>].   The  effect  of  these  routines is as though <STRONG>wgetstr</STRONG> were
-       called on the  window,  and  the  resulting  line  used  as  input  for
-       <STRONG>sscanf(3)</STRONG>.   Fields which do not map to a variable in the <EM>fmt</EM> field are
-       lost.
+       <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG>, <STRONG>mvscanw</STRONG>, and <STRONG>mvwscanw</STRONG> are  analogous  to  <STRONG>scanf(3)</STRONG>.   In
+       effect,  they  call  <STRONG><A HREF="curs_getstr.3x.html">wgetstr(3x)</A></STRONG>  with  <EM>win</EM>  (or  <STRONG>stdscr</STRONG>)  as its first
+       argument,  then  attempt  conversion  of  the  resulting  string   with
+       <STRONG>vsscanf(3)</STRONG>.   Fields in the string that do not map to a variable in the
+       <EM>fmt</EM> parameter are discarded.
 
-       The <STRONG>vwscanw</STRONG> and <STRONG>vw_scanw</STRONG> routines are  analogous  to  <STRONG>vscanf(3)</STRONG>.   They
-       perform a <STRONG>wscanw</STRONG> using a variable argument list.  The third argument is
-       a <STRONG>va_list</STRONG>, a pointer to a list of arguments, as defined in <STRONG>&lt;stdarg.h&gt;</STRONG>.
+       <STRONG>vwscanw</STRONG> and <STRONG>vw_scanw</STRONG> are analogous to <STRONG>vscanf(3)</STRONG>, and perform  a  <STRONG>wscanw</STRONG>
+       using  a  variable  argument  list.  The third argument is a <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, a
+       pointer to a list of arguments, as defined in <EM>stdarg.h</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>vwscanw</STRONG> returns <STRONG>ERR</STRONG> on failure and an integer equal to  the  number  of
-       fields scanned on success.
+       These functions return <STRONG>ERR</STRONG>  upon  failure  and  otherwise  a  count  of
+       successful conversions; this quantity may be zero.
 
-       Applications  may  use the return value from the <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG>, <STRONG>mvscanw</STRONG>
-       and <STRONG>mvwscanw</STRONG> routines to determine the  number  of  fields  which  were
-       mapped in the call.
+       In  <EM>ncurses,</EM> failure occurs if <STRONG>vsscanf(3)</STRONG> returns <STRONG>EOF</STRONG>, or if the window
+       pointer <EM>win</EM> is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       <STRONG>wmove</STRONG>, and fail if the position is outside the window.
+
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       No  wide  character  counterpart  functions  are  defined by the "wide"
+       <EM>ncurses</EM> configuration nor by any standard.  They  are  unnecessary:  to
+       retrieve  and  convert  a  wide-character string from a <EM>curses</EM> terminal
+       keyboard, use these functions with the <STRONG>scanf(3)</STRONG> conversions  "%lc"  and
+       "%ls" for wide characters and strings, respectively.
+
+       <EM>ncurses</EM>  implements <STRONG>vsscanf(3)</STRONG> internally if it is unavailable when the
+       library is configured.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       In this implementation, <STRONG>vw_scanw</STRONG> and <STRONG>vwscanw</STRONG> are equivalent, to support
-       legacy applications.  However, the latter (<STRONG>vwscanw</STRONG>) is obsolete:
+       X/Open Curses, Issue 4, describes these  functions.   It  specifies  no
+       error conditions for them.
 
-       <STRONG>o</STRONG>   The XSI Curses standard, Issue 4 described these functions,  noting
-           that  the  function <STRONG>vwscanw</STRONG> is marked TO BE WITHDRAWN, and is to be
-           replaced by a function <STRONG>vw_scanw</STRONG> using the <STRONG>&lt;stdarg.h&gt;</STRONG> interface.
+       <EM>ncurses</EM>  defines  <STRONG>vw_scanw</STRONG>  and  <STRONG>vwscanw</STRONG>  identically to support legacy
+       applications.  However, the latter is obsolete.
 
-       <STRONG>o</STRONG>   The Single Unix Specification, Version 2 states that  <STRONG>vw_scanw</STRONG>   is
-           preferred   to   <STRONG>vwscanw</STRONG>   since   the  latter  requires  including
-           <STRONG>&lt;varargs.h&gt;</STRONG>, which cannot be used in the same file  as  <STRONG>&lt;stdarg.h&gt;</STRONG>.
-           This  implementation  uses <STRONG>&lt;stdarg.h&gt;</STRONG> for both, because that header
-           is included in <STRONG>&lt;curses.h</STRONG>&gt;.
+       <STRONG>o</STRONG>   X/Open Curses,  Issue  4,  Version  2  (1996),  marked  <STRONG>vwscanw</STRONG>  as
+           requiring  <EM>varargs.h</EM>  and "TO BE WITHDRAWN", and specified <STRONG>vw_scanw</STRONG>
+           using the <EM>stdarg.h</EM> interface.
 
-       <STRONG>o</STRONG>   X/Open Curses, Issue 5 (December 2007) marked <STRONG>vwscanw</STRONG>  (along  with
-           <STRONG>vwprintw</STRONG> and the termcap interface) as withdrawn.
+       <STRONG>o</STRONG>   X/Open Curses, Issue 5, Draft  2  (December  2007)  marked  <STRONG>vwscanw</STRONG>
+           (along with <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.  After
+           incorporating review comments, this became X/Open Curses,  Issue  7
+           (2009).
 
-       Both  XSI and The Single Unix Specification, Version 2 state that these
-       functions return <STRONG>ERR</STRONG> or <STRONG>OK</STRONG>.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> provides <STRONG>vwscanw</STRONG>, but marks it as deprecated.
 
-       <STRONG>o</STRONG>   Since the underlying  <STRONG>scanf(3)</STRONG>  can  return  the  number  of  items
-           scanned, and the SVr4 code was documented to use this feature, this
-           is probably an editing error which was introduced  in  XSI,  rather
-           than being done intentionally.
+       X/Open Curses Issues 4 and 7 both state that these functions return <STRONG>ERR</STRONG>
+       or <STRONG>OK</STRONG>.  This is likely an erratum.
 
-       <STRONG>o</STRONG>   This  implementation  returns  the  number  of  items  scanned, for
-           compatibility with SVr4 curses.  As of  2018,  NetBSD  curses  also
-           returns  the  number  of  items  scanned.   Both ncurses and NetBSD
-           curses call <STRONG>vsscanf</STRONG> to scan the string, which returns <STRONG>EOF</STRONG> on error.
+       <STRONG>o</STRONG>   Since the underlying <STRONG>scanf(3)</STRONG>  returns  the  number  of  successful
+           conversions,  and  SVr4  <EM>curses</EM> was documented to use this feature,
+           this may have been an  editorial  solecism  introduced  by  X/Open,
+           rather than an intentional change.
 
-       <STRONG>o</STRONG>   Portable applications should only test if the return value is  <STRONG>ERR</STRONG>,
-           since the <STRONG>OK</STRONG> value (zero) is likely to be misleading.
+       <STRONG>o</STRONG>   This  implementation retains compatibility with SVr4 <EM>curses.</EM>  As of
+           2018,  NetBSD  <EM>curses</EM>  also  returns  the  number   of   successful
+           conversions.   Both  <EM>ncurses</EM>  and  NetBSD <EM>curses</EM> call <STRONG>vsscanf(3)</STRONG> to
+           scan the string, which returns <STRONG>EOF</STRONG> on error.
 
-           One  possible  way  to  get  useful  results would be to use a "%n"
-           conversion at the end of the format string to ensure that something
-           was processed.
+       <STRONG>o</STRONG>   Portable applications should test only if the return value is  <STRONG>ERR</STRONG>,
+           and  not  compare  it  to  <STRONG>OK</STRONG>,  since  that  value  (zero) might be
+           misleading.
+
+           One portable way to get useful results  would  be  to  use  a  "%n"
+           conversion  at the end of the format string, and check the value of
+           the  corresponding  variable  to  determine  how  many  conversions
+           succeeded.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       While  <STRONG>scanw</STRONG>  was implemented in 4BSD, none of the BSD releases used it
-       until 4.4BSD (in a game).  That early version of curses was before  the
-       ANSI  C  standard.   It  did  not  use  &lt;varargs.h&gt;,  though  that  was
-       available.  In 1991  (a  couple  of  years  after  SVr4  was  generally
-       available,  and  after  the C standard was published), other developers
-       updated the library, using  &lt;stdarg.h&gt;  internally  in  4.4BSD  curses.
-       Even  with this improvement, BSD curses did not use function prototypes
-       (or even declare functions) in the &lt;curses.h&gt; header until 1992.
-
-       SVr2 documented <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG> tersely as  "scanf  through  <EM>stdscr</EM>"  and
-       tersely as "scanf through <EM>win</EM>", respectively.
-
-       SVr3 added <STRONG>mvscanw</STRONG>, and <STRONG>mvwscanw</STRONG>, with a three-line summary saying that
-       they were analogous to <STRONG>scanf(3)</STRONG>, explaining that the string which would
-       be  output  from  <STRONG>scanf(3)</STRONG> would instead be output using <STRONG>waddstr</STRONG> on the
-       given window.  SVr3 also added <STRONG>vwscanw</STRONG>, saying that the third parameter
-       is  a  <STRONG>va_list</STRONG>, defined in &lt;varargs.h&gt;, and referring the reader to the
-       manual  pages  for  <EM>varargs</EM>  and  <STRONG>vprintf</STRONG>  for  detailed  descriptions.
-       (Because the SVr3 documentation does not mention <STRONG>vscanf</STRONG>, that reference
-       to <STRONG>vprintf</STRONG> may not be an error).
-
-       SVr4  added  no  new  variations  of  <STRONG>scanw</STRONG>,  but  provided  for  using
-       &lt;varargs.h&gt; or &lt;stdarg.h&gt; to define the <STRONG>va_list</STRONG> type.
-
-       X/Open  Curses  added  <STRONG>vw_scanw</STRONG>  to  replace  <STRONG>vwscanw</STRONG>, stating that its
-       <STRONG>va_list</STRONG> definition requires &lt;stdarg.h&gt;.
+       <STRONG>scanw</STRONG>  was  implemented  in 4BSD (November 1980); that early version of
+       <EM>curses</EM> preceded the ANSI C standard of 1989.  The function  was  unused
+       in  Berkeley  distributions  for  over  ten  years, until 4.4BSD, which
+       employed it in a game.  The 4BSD <STRONG>scanw</STRONG> did not  use  <EM>varargs.h</EM>,  though
+       that  had been available since Seventh Edition Unix (1979).  In 1991 (a
+       couple of years after SVr4 was generally available,  and  after  the  C
+       standard  was  published),  other developers updated the library, using
+       <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses.</EM>  Even with this improvement,  BSD
+       <EM>curses</EM>  did not use function prototypes (nor even declare functions) in
+       <EM>curses.h</EM> until 1992.
+
+       SVr2 (1984) documented <STRONG>scanw</STRONG>  and  <STRONG>wscanw</STRONG>  tersely  as  "scanf  through
+       <STRONG>stdscr</STRONG>" and "scanf through <EM>win</EM>", respectively.
+
+       SVr3 (1987) added <STRONG>mvscanw</STRONG>, and <STRONG>mvwscanw</STRONG>, stating
+
+              These  routines  correspond  to <STRONG>scanf(3S)</STRONG>, as do their arguments
+              and return values.  <STRONG>wgetstr</STRONG>() is called on the window,  and  the
+              resulting line is used as input for the scan.
+
+       SVr3  also  implemented  <STRONG>vwscanw</STRONG>,  describing  its third parameter as a
+       <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in <EM>varargs.h</EM>, and referred the reader  to  the  manual
+       pages  for <EM>varargs</EM> and <EM>vprintf</EM> for detailed descriptions.  (Because the
+       SVr3 documentation does not mention <EM>vscanf</EM>, the  reference  to  <EM>vprintf</EM>
+       might not be an error).
+
+       SVr4  (1989)  introduced  no  new variations of <EM>scanw</EM>, but provided for
+       using either <EM>varargs.h</EM> or <EM>stdarg.h</EM> to define the <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type.
+
+       X/Open Curses, Issue 4 (1995), defined  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  to  replace  <EM>vwscanw</EM>,
+       stating that its <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type is defined in <EM>stdarg.h</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>,    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,
-       <STRONG>scanf(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG>scanf(3)</STRONG>, <STRONG>vscanf(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -171,6 +192,7 @@ <H1 class="no-header">curs_scanw 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index dce1c8556..0a7e003bc 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.35 2023/11/25 11:29:34 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.36 2023/12/16 21:10:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -101,7 +101,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
+       These routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
        X/Open defines no error conditions.  In this implementation, each  will
        return an error if the file cannot be opened.
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index eb775e8a4..48e7865fd 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.35 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_scroll.3x,v 1.36 2023/12/16 22:52:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -60,46 +60,54 @@ <H1 class="no-header">curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>scroll</STRONG>  routine  scrolls  the  window  up one line.  This involves
-       moving the lines in the window data structure.  As an optimization,  if
-       the  scrolling  region of the window is the entire screen, the <EM>physical</EM>
-       <EM>screen</EM> may be scrolled at the same time.
+       <STRONG>scroll</STRONG>  scrolls  the  given window up one line.  That is, every visible
+       line we might number <EM>i</EM> becomes line <EM>i</EM>-1.  The text of the top  line  in
+       the  window  disappears  and  the  bottom  line is populated with blank
+       characters; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> or <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.  As  an  optimization,  if  the
+       scrolling  region  of  the  window  is  the entire screen, the physical
+       screen may be scrolled at the same time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
-       For positive <EM>n</EM>, the <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> routines  scroll  the  window  up  <EM>n</EM>
-       lines  (line  <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM>); otherwise scroll the window down <EM>n</EM> lines.
-       This involves moving the lines in the window character image structure.
-       The current cursor position is not changed.
+       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scroll  <STRONG>stdscr</STRONG>  or  the  specified  window  up  or  down
+       depending on the sign of <EM>n.</EM>
 
-       For   these   functions   to   work,  scrolling  must  be  enabled  via
-       <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   For positive <EM>n,</EM> line <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM> (scrolling up);
 
+       <STRONG>o</STRONG>   for negative <EM>n,</EM> line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling down).
+
+       The  cursor does not move.  These functions perform no operation unless
+       scrolling is enabled for the window via <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return <STRONG>ERR</STRONG> upon failure, and <STRONG>OK</STRONG> (SVr4 only specifies "an
-       integer value other than <STRONG>ERR</STRONG>") upon successful completion.
 
-       X/Open defines no error conditions.
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       These functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
-       This  implementation returns an error if the window pointer is null, or
-       if scrolling is not enabled in the window, e.g., with <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
+       <EM>ncurses</EM> returns <STRONG>ERR</STRONG> if scrolling is not  enabled  in  the  window,  for
+       example with <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>, or if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>scrl</STRONG> and <STRONG>scroll</STRONG> may be macros.
-
-       The  SVr4  documentation  says  that  the  optimization  of  physically
-       scrolling  immediately  if  the scroll region is the entire screen "is"
-       performed, not "may be" performed.   This  implementation  deliberately
-       does  not guarantee that this will occur, to leave open the possibility
-       of smarter optimization of multiple scroll actions on the next update.
+       Unusually,  there  is  no <STRONG>wscroll</STRONG> function; <STRONG>scroll</STRONG> behaves as one would
+       expect <STRONG>wscroll</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
-       Neither the SVr4 nor the XSI documentation specify whether the  current
-       attribute  or  current  color-pair  of  blanks  generated by the scroll
-       function is zeroed.  Under this implementation it is.
+       <STRONG>scrl</STRONG> and <STRONG>scroll</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses, Issue 4, describes these functions.  It defines no error
+       conditions.
+
+       SVr4  specifies  only "an integer value other than <STRONG>ERR</STRONG>" as a successful
+       return value.
+
+       SVr4  indicates  that  the   optimization   of   physically   scrolling
+       immediately  if  the scroll region is the entire screen "is" performed,
+       not "may be" performed.  <EM>ncurses</EM> deliberately does not  guarantee  that
+       this  will occur, to leave open the possibility of smarter optimization
+       of multiple scroll actions on the next update.
+
+       Neither SVr4 <EM>curses</EM> nor  X/Open  Curses  specify  whether  the  current
+       attribute  or  current  color  pair  of  blanks generated by the scroll
+       function are zeroed.  <EM>ncurses</EM> does so.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -107,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 48e91609d..2ef16489e 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.66 2023/11/25 14:31:07 tom Exp @
+  * @Id: curs_slk.3x,v 1.67 2023/12/16 21:18:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -58,8 +58,8 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>slk_init(int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>slk_set(int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_wset(int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_set(int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>align</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_wset(int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>align</EM><STRONG>);</STRONG>
 
        <STRONG>char</STRONG> <STRONG>*slk_label(int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
 
@@ -72,9 +72,9 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>slk_attron(const</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attroff(const</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attrset(const</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attr_on(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attr_off(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attr_set(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attr_on(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attr_off(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attr_set(const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>
        <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>attr_t</STRONG> <STRONG>slk_attr(void);</STRONG>
 
@@ -84,90 +84,92 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>slk</STRONG>* functions manipulate the set of soft function-key labels  that
-       exist  on  many  terminals.   For those terminals that do not have soft
-       labels, <EM>curses</EM> takes over the bottom line of <STRONG>stdscr</STRONG>, reducing the  size
-       of  <STRONG>stdscr</STRONG> and the variable <STRONG>LINES</STRONG>.  <EM>curses</EM> standardizes on eight labels
-       of up to eight characters each.   In  addition  to  this,  the  <EM>ncurses</EM>
-       implementation  supports  a  mode where it simulates 12 labels of up to
-       five characters each.  This is  useful  for  PC-like  enduser  devices.
-       <EM>ncurses</EM>  simulates  this  mode  by  taking  over up to two lines at the
-       bottom of the screen; it does not try to use any hardware  support  for
-       this mode.
+       These functions manipulate the  soft  function  key  labels  that  some
+       hardware  terminals support.  For those terminals that do not have soft
+       labels, <EM>curses</EM> takes over the  bottom  line  of  <STRONG>stdscr</STRONG>,  reducing  its
+       vertical  size  and the value of <STRONG>LINES</STRONG> by one.  By default, <EM>curses</EM> uses
+       eight labels of up to eight characters each.
+
+       <EM>ncurses</EM> furthermore supports a mode comprising twelve labels of  up  to
+       five  characters  each,  following a convention associated with the IBM
+       PC/AT keyboard.  <EM>ncurses</EM> simulates this mode by taking over up  to  two
+       lines  at the bottom of the screen; it does not try to use any hardware
+       support for this mode.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The  <STRONG>slk_init</STRONG>  routine  must  be  called  before  <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is
-       called.  If <STRONG>initscr</STRONG> eventually uses a line from <STRONG>stdscr</STRONG> to  emulate  the
-       soft  labels,  then  <EM>fmt</EM>  determines how the labels are arranged on the
-       screen:
+       <STRONG>slk_init</STRONG>  must  be  called  before  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>.   If  <STRONG>initscr</STRONG>
+       eventually uses a line from <STRONG>stdscr</STRONG> to emulate the soft labels, then <EM>fmt</EM>
+       determines how the labels are arranged on the screen.
 
-          <STRONG>0</STRONG>  indicates a 3-2-3 arrangement of the labels.
+       <STRONG>0</STRONG>  indicates a 3-2-3 arrangement of the labels.
 
-          <STRONG>1</STRONG>  indicates a 4-4 arrangement
+       <STRONG>1</STRONG>  indicates a 4-4 arrangement
 
-          <STRONG>2</STRONG>  indicates the PC-like 4-4-4 mode.
+       <STRONG>2</STRONG>  indicates the PC-like 4-4-4 mode.
 
-          <STRONG>3</STRONG>  is again the PC-like 4-4-4 mode, but in addition an index line is
-             generated, helping the user to identify the key numbers easily.
+       <STRONG>3</STRONG>  is again the PC-like 4-4-4 mode, but in addition an  index  line  is
+          generated,  helping  the  user  to  associate  each  label  with its
+          numbered function key.  <STRONG>LINES</STRONG> and the vertical size  of  <STRONG>stdscr</STRONG>  are
+          further reduced.
 
 
 </PRE><H3><a name="h3-Labels">Labels</a></H3><PRE>
-       The  <STRONG>slk_set</STRONG>  routine  (and the <STRONG>slk_wset</STRONG> routine for the wide-character
-       library) has three parameters:
+       Populate  the  labels  with  normal strings (<STRONG>slk_set</STRONG>) or wide-character
+       strings (<STRONG>slk_wset</STRONG>).  Each function takes three parameters.
 
-          <EM>labnum</EM>
-               is the label number, from <STRONG>1</STRONG> to <STRONG>8</STRONG> (12 if <EM>fmt</EM> in <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or
+       <EM>labnum</EM>  is the label number, from <STRONG>1</STRONG> to <STRONG>8</STRONG> (12 if <EM>fmt</EM> in <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or
                <STRONG>3</STRONG>);
 
-          <EM>label</EM>
-               is  be the string to put on the label, up to eight (five if <EM>fmt</EM>
-               in <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or <STRONG>3</STRONG>) characters in length.  A null string  or
+       <EM>label</EM>   is  be the string to put on the label, up to eight (five if <EM>fmt</EM>
+               in <STRONG>slk_init</STRONG> is <STRONG>2</STRONG> or <STRONG>3</STRONG>) characters in length.  A empty string or
                a null pointer sets up a blank label.
 
-          <EM>fmt</EM>  is  either  <STRONG>0</STRONG>,  <STRONG>1</STRONG>,  or <STRONG>2</STRONG>, indicating whether the label is to be
-               left-justified,  centered,  or  right-justified,  respectively,
-               within the label.
+       <EM>align</EM>   is  <STRONG>0</STRONG>,  <STRONG>1</STRONG>,  or <STRONG>2</STRONG>, aligning <EM>label</EM> to the left, center, or right,
+               respectively, within the 8 (5) character cells housing it.
 
-       The  <STRONG>slk_label</STRONG>  routine  returns  the  current  label  for label number
-       <EM>labnum</EM>, with leading and trailing blanks stripped.
+       <STRONG>slk_label</STRONG> obtains the string assigned to label number <EM>labnum</EM>, with  any
+       leading and trailing blanks stripped.
 
 
-</PRE><H3><a name="h3-Screen-updates">Screen updates</a></H3><PRE>
-       The <STRONG>slk_refresh</STRONG> and <STRONG>slk_noutrefresh</STRONG> routines correspond to the <STRONG>wrefresh</STRONG>
-       and <STRONG>wnoutrefresh</STRONG> routines.
+</PRE><H3><a name="h3-Screen-Updates">Screen Updates</a></H3><PRE>
+       <STRONG>slk_refresh</STRONG>  and  <STRONG>slk_noutrefresh</STRONG>  affect  the  soft key label lines as
+       <STRONG>wrefresh</STRONG> and <STRONG>wnoutrefresh</STRONG> do the <EM>curses</EM> window.
 
        The <STRONG>slk_clear</STRONG> routine clears the soft labels from the screen.
 
-       The  <STRONG>slk_restore</STRONG> routine restores the soft labels to the screen after a
+       The <STRONG>slk_restore</STRONG> routine restores the soft labels to the screen after  a
        <STRONG>slk_clear</STRONG> has been performed.
 
-       The <STRONG>slk_touch</STRONG> routine forces all the soft labels to be output the  next
+       The  <STRONG>slk_touch</STRONG> routine forces all the soft labels to be output the next
        time a <STRONG>slk_noutrefresh</STRONG> is performed.
 
 
-</PRE><H3><a name="h3-Video-attributes">Video attributes</a></H3><PRE>
-       The   <STRONG>slk_attron</STRONG>,   <STRONG>slk_attrset</STRONG>,   <STRONG>slk_attroff</STRONG>  and  <STRONG>slk_attr</STRONG>  routines
-       correspond to <STRONG>attron</STRONG>,  <STRONG>attrset</STRONG>,  <STRONG>attroff</STRONG>  and  <STRONG>attr_get</STRONG>,  respectively.
-       They  have  an  effect  only if soft labels are simulated on the bottom
-       line of the screen.  The default highlight for soft keys is  A_STANDOUT
-       (as in System V <EM>curses</EM>, which does not document this fact).
+</PRE><H3><a name="h3-Video-Attributes">Video Attributes</a></H3><PRE>
+       The  <STRONG>slk_attron</STRONG>,  <STRONG>slk_attrset</STRONG>,  <STRONG>slk_attroff</STRONG>,  and   <STRONG>slk_attr</STRONG>   routines
+       correspond  to  <STRONG>attron</STRONG>,  <STRONG>attrset</STRONG>,  <STRONG>attroff</STRONG>, and <STRONG>attr_get</STRONG>, respectively.
+       They have an effect only if soft labels are  simulated  on  the  bottom
+       line  of  the  screen.   The  default  highlight for soft key labels is
+       <STRONG>A_STANDOUT</STRONG> (as in System V <EM>curses</EM>, which does not document this fact).
 
 
 </PRE><H3><a name="h3-Colors">Colors</a></H3><PRE>
-       The  <STRONG>slk_color</STRONG> routine corresponds to <STRONG>color_set</STRONG>.  It has an effect only
+       The <STRONG>slk_color</STRONG> routine corresponds to <STRONG>color_set</STRONG>.  It has an effect  only
        if soft labels are simulated on the bottom line of the screen.
 
-       Because <STRONG>slk_color</STRONG> accepts only <STRONG>short</STRONG> (signed  16-bit  integer)  values,
-       this   implementation  provides  <STRONG>extended_slk_color</STRONG>  which  accepts  an
-       integer value, e.g., 32-bits.
+       Because  <STRONG>slk_color</STRONG>  accepts  only <EM>short</EM> (signed 16-bit integer) values,
+       this implementation provides <STRONG>extended_slk_color</STRONG>, which accepts  an  <EM>int</EM>
+       value of at least 32 bits.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 specifies only  "an
-       integer value other than <STRONG>ERR</STRONG>") upon successful completion.
+       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
+       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
+       completion.
+
+       X/Open Curses defines no error conditions.
 
-       X/Open defines no error conditions.  In this implementation
+       In this implementation
 
           <STRONG>slk_attr</STRONG>
                returns the attribute used for the soft keys.
@@ -211,31 +213,31 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open  <EM>curses</EM>  documents the <EM>opts</EM> argument as reserved for future use,
+       X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
        saying that it must be null.  This implementation uses  that  parameter
-       in ABI 6 for the functions which have a color-pair parameter to support
+       in ABI 6 for the functions which have a color pair parameter to support
        extended color pairs.
 
-       For  functions  which modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM>  is
-       set  it  is  treated  as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
-       pair instead of the <STRONG>short</STRONG> pair parameter.
+       For functions which modify the color, e.g., <STRONG>slk_attr_set</STRONG>,  if  <EM>opts</EM>  is
+       set  it  is treated as a pointer to <EM>int</EM>, and used to set the color pair
+       instead of the <EM>short</EM> pair parameter.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI <EM>curses</EM> standard, Issue 4,  described  the  soft-key  functions,
-       with some differences from SVr4 <EM>curses</EM>:
+       X/Open  Curses,  Issue  4,  describes  these   functions,   with   some
+       differences from SVr4 <EM>curses</EM>:
 
-       <STRONG>o</STRONG>   It  added  functions like the SVr4 attribute-manipulation functions
-           <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attrset</STRONG>,  but   which   use   <STRONG>attr_t</STRONG>
-           parameters  (rather  than  <STRONG>chtype</STRONG>),  along  with  a  reserved  <EM>opts</EM>
+       <STRONG>o</STRONG>   X/Open   added   functions  like  the  SVr4  attribute-manipulation
+           functions <STRONG>slk_attron</STRONG>, <STRONG>slk_attroff</STRONG>, and <STRONG>slk_attrset</STRONG>, but  which  use
+           <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  parameters (rather than <EM>chtype</EM>), along with a reserved <EM>opts</EM>
            parameter.
 
            Two of these new functions (unlike  the  SVr4  functions)  have  no
            provision for color: <STRONG>slk_attr_on</STRONG> and <STRONG>slk_attr_off</STRONG>.
 
-           The third function (<STRONG>slk_attr_set</STRONG>) has a color-pair parameter.
+           The third function (<STRONG>slk_attr_set</STRONG>) has a color pair parameter.
 
-       <STRONG>o</STRONG>   It added <STRONG>const</STRONG> qualifiers to parameters (unnecessarily), and
+       <STRONG>o</STRONG>   It added <EM>const</EM> qualifiers to parameters (unnecessarily), and
 
        <STRONG>o</STRONG>   It added <STRONG>slk_color</STRONG>.
 
@@ -271,12 +273,12 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        The function <STRONG>slk_attr</STRONG> was added by <EM>ncurses</EM> in 1996.
 
-       X/Open  <EM>curses</EM>  does  not  specify a limit for the number of colors and
-       color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
+       X/Open  Curses  does  not  specify a limit for the number of colors and
+       color pairs which a terminal can support.  However, in its use of <EM>short</EM>
        for  the  parameters,  it carries over SVr4's implementation detail for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
        implementation  provides extended versions of those functions which use
-       <STRONG>int</STRONG> parameters, allowing applications to use larger  color-  and  pair-
+       <EM>int</EM> parameters, allowing applications to use larger  color-  and  pair-
        numbers.
 
 
@@ -297,7 +299,7 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
          <STRONG>slk_attrset</STRONG>
          <STRONG>slk_start</STRONG>
 
-       X/Open <EM>curses</EM> added these:
+       X/Open Curses added these:
          <STRONG>slk_attr_off</STRONG>
          <STRONG>slk_attr_on</STRONG>
          <STRONG>slk_attr_set</STRONG>
@@ -311,7 +313,7 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -321,8 +323,8 @@ <H1 class="no-header">curs_slk 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-Initialization">Initialization</a></li>
 <li><a href="#h3-Labels">Labels</a></li>
-<li><a href="#h3-Screen-updates">Screen updates</a></li>
-<li><a href="#h3-Video-attributes">Video attributes</a></li>
+<li><a href="#h3-Screen-Updates">Screen Updates</a></li>
+<li><a href="#h3-Video-Attributes">Video Attributes</a></li>
 <li><a href="#h3-Colors">Colors</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 017161722..738695356 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.44 2023/11/25 15:48:03 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.45 2023/12/16 20:32:22 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -224,7 +224,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        This  implementation  can  be  configured to provide a set of functions
        which improve the ability to manage multiple screens.  This feature can
-       be added to any of the configurations supported by ncurses; it adds new
+       be added to any of the configurations supported by <EM>ncurses</EM>; it adds new
        entrypoints without changing the meaning of any of the existing ones.
 
 
@@ -286,9 +286,9 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to <EM>ncurses</EM>.  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
+       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>SP</EM><STRONG>_</STRONG><EM>FUNCS</EM>.
 
 
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index ef3f0cd8d..85c315547 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,47 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.74 2023/12/02 20:49:04 tom Exp @
+  * @Id: curs_termcap.3x,v 1.76 2023/12/18 00:22:30 tom Exp @
+  * See &lt;https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
+  *   termlib/termcap.c&gt;.
+  * See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
+  * for much BSD release history.
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s7/ttycap.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/termlib/
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/bin/etc/termcap
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/lib/\
+  *   libtermlib/
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/man/man3/\
+  *   termlib.3
+  * ...except in the source tree...
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+  *   libtermlib/makefile
+  * Observe the `tncktc()`, `tnamatch()`, `tskip()`, and `tdecode()`
+  * entry points disappearing from termcap.c.
+  * 2BSD became a branch retaining support for non-virtual memory
+  * systems (like the PDP-11) whereas most BSD development focused on
+  * the VAX and other VM-enabled systems starting with 3BSD.
+  * This man page previously located a termcap.h in 2BSD, but that may
+  * be confusion arising from its backport to 2.9BSD (and still present
+  * in surviving sources for 2.11BSD, the "end of the line" for that
+  * branch's development).
+  * Observe the copyright notice in
+  *   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
+  *     jove/Makefile
+  * --much too late for 2BSD (1979).
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -55,10 +83,10 @@ <H1 class="no-header">curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
        <STRONG>#include</STRONG> <STRONG>&lt;term.h&gt;</STRONG>
 
-       <STRONG>extern</STRONG> <STRONG>char</STRONG> <STRONG>PC;</STRONG>
-       <STRONG>extern</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>UP;</STRONG>
-       <STRONG>extern</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>BC;</STRONG>
-       <STRONG>extern</STRONG> <STRONG>short</STRONG> <STRONG>ospeed;</STRONG>
+       <STRONG>char</STRONG> <STRONG>PC;</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>UP;</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>BC;</STRONG>
+       <STRONG>short</STRONG> <STRONG>ospeed;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>tgetent(char</STRONG> <STRONG>*</STRONG><EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>name</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tgetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>id</EM><STRONG>);</STRONG>
@@ -69,295 +97,307 @@ <H1 class="no-header">curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines are included as a conversion aid for programs  that  use
-       the  <EM>termcap</EM>  library.  Their parameters are the same, but the routines
-       are emulated using the <EM>terminfo</EM> database.  Thus, they can only be  used
-       to  query  the  capabilities  of entries for which a terminfo entry has
-       been compiled.
+       <EM>ncurses</EM>  provides  the  foregoing  variables   and   functions   as   a
+       compatibility layer for programs that use the <EM>termcap</EM> library.  The API
+       is the same, but behavior is  emulated  using  the  <EM>terminfo</EM>  database.
+       Thus,  it  can  be  used  only  to  query  the capabilities of terminal
+       database entries for which a <EM>terminfo</EM> entry has been compiled.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The <STRONG>tgetent</STRONG> routine loads the entry for <EM>name</EM>.  It returns:
+       <STRONG>tgetent</STRONG> loads the terminal database entry for <EM>name</EM>; see <STRONG><A HREF="term.7.html">term(7)</A></STRONG>.   This
+       must be done before calling any of the other functions.  It returns:
 
-          1  on success,
+          1   on success,
 
-          0  if there is no such entry (or that it is a generic  type,  having
-             too little information for curses applications to run), and
+          0   if  there is no such entry (or if the matching entry describes a
+              generic terminal,  having  too  little  information  for  <EM>curses</EM>
+              applications to run), and
 
-          -1 if the terminfo database could not be found.
+          -1  if the <EM>terminfo</EM> database could not be found.
 
-       This differs from the <EM>termcap</EM> library in two ways:
+       This implementation differs from those of historical <EM>termcap</EM> libraries.
 
-          <STRONG>o</STRONG>   The  emulation  ignores  the  buffer  pointer  <EM>bp</EM>.   The <EM>termcap</EM>
-              library would store a copy of the terminal  description  in  the
-              area  referenced  by  this pointer.  However, ncurses stores its
-              terminal descriptions in compiled binary form, which is not  the
-              same thing.
+          <STRONG>o</STRONG>   <EM>ncurses</EM>  ignores  the  buffer  pointer  <EM>bp</EM>,  as do other <EM>termcap</EM>
+              implementations conforming to  portions  of  X/Open  Curses  now
+              withdrawn.   The  BSD  <EM>termcap</EM> library would store a copy of the
+              terminal  type  description  in  the  area  referenced  by  this
+              pointer.   <EM>ncurses</EM> stores terminal type descriptions in compiled
+              form, which is not the same thing.
 
-          <STRONG>o</STRONG>   There is a difference in return codes.  The <EM>termcap</EM> library does
-              not check if the terminal description is marked with the <EM>generic</EM>
-              capability,   or   if   the  terminal  description  has  cursor-
-              addressing.
+          <STRONG>o</STRONG>   The meanings of the  return  values  differ.   The  BSD  <EM>termcap</EM>
+              library  does not check whether the terminal type description is
+              marked  with  the  <STRONG>gn</STRONG>  (<STRONG>generic</STRONG>)  capability,  nor  whether  the
+              terminal  type  description  supports  an  addressable cursor, a
+              property essential for any <EM>curses</EM> implementation to operate.
 
 
-</PRE><H3><a name="h3-Capability-Values">Capability Values</a></H3><PRE>
-       The <STRONG>tgetflag</STRONG> routine gets the boolean entry for <EM>id</EM>, or zero  if  it  is
-       not available.
-
-       The  <STRONG>tgetnum</STRONG>  routine gets the numeric entry for <EM>id</EM>, or -1 if it is not
+</PRE><H3><a name="h3-Retrieving-Capability-Values">Retrieving Capability Values</a></H3><PRE>
+       <STRONG>tgetflag</STRONG> reports the Boolean entry  for  <EM>id</EM>,  or  zero  if  it  is  not
        available.
 
-       The <STRONG>tgetstr</STRONG> routine returns the string entry for <EM>id</EM>, or zero if  it  is
-       not  available.   Use  <STRONG>tputs</STRONG>  to  output the returned string.  The <EM>area</EM>
-       parameter is used as follows:
+       <STRONG>tgetnum</STRONG> obtains the numeric entry for <EM>id</EM>, or -1 if it is not available.
+
+       <STRONG>tgetstr</STRONG>  returns  the  string  entry  for  <EM>id</EM>,  or  <STRONG>NULL</STRONG>  if  it is not
+       available.   Use  <STRONG>tputs</STRONG>  to  output  the  string  returned.   The  <EM>area</EM>
+       parameter is used as follows.
 
           <STRONG>o</STRONG>   It is assumed to be the address of a pointer to a buffer managed
               by the calling application.
 
-          <STRONG>o</STRONG>   However,  ncurses  checks  to  ensure that <STRONG>area</STRONG> is not NULL, and
-              also that the resulting buffer pointer is not NULL.   If  either
-              check fails, the <EM>area</EM> parameter is ignored.
+          <STRONG>o</STRONG>   However, <EM>ncurses</EM> checks to ensure that <EM>area</EM>  is  not  <STRONG>NULL</STRONG>,  and
+              also  that  the resulting buffer pointer is not <STRONG>NULL</STRONG>.  If either
+              check fails, <EM>area</EM> is ignored.
 
-          <STRONG>o</STRONG>   If  the  checks succeed, ncurses also copies the return value to
-              the buffer pointed to by  <EM>area</EM>,  and  the  <EM>area</EM>  value  will  be
-              updated to point past the null ending this value.
+          <STRONG>o</STRONG>   If the checks succeed, <EM>ncurses</EM> also copies the return  value  to
+              the  buffer  pointed to by <EM>area</EM>, and the library updates <EM>area</EM> to
+              point past the null character terminating this value.
 
-          <STRONG>o</STRONG>   The   return   value  itself  is  an  address  in  the  terminal
-              description which is loaded into memory.
+          <STRONG>o</STRONG>   The return value itself is  an  address  in  the  terminal  type
+              description loaded into memory.
 
-       Only the first two characters of the <STRONG>id</STRONG> parameter of <STRONG>tgetflag</STRONG>,  <STRONG>tgetnum</STRONG>
-       and <STRONG>tgetstr</STRONG> are compared in lookups.
 
+</PRE><H3><a name="h3-Applying-String-Capabilities">Applying String Capabilities</a></H3><PRE>
+       String capabilities can be parameterized; see subsection "Parameterized
+       Strings" in  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG>tgoto</STRONG> applies its second and third arguments
+       to  the  parametric  placeholders in the capability stored in the first
+       argument.
 
-</PRE><H3><a name="h3-Formatting-Capabilities">Formatting Capabilities</a></H3><PRE>
-       The <STRONG>tgoto</STRONG> routine expands the given capability using the parameters.
-
-       <STRONG>o</STRONG>   Because  the  capability may have padding characters, the output of
-           <STRONG>tgoto</STRONG> should be passed to  <STRONG>tputs</STRONG>  rather  than  some  other  output
-           function such as <STRONG>printf(3)</STRONG>.
+       <STRONG>o</STRONG>   The capability may contain padding specifications;  see  subsection
+           "Delays  and  Padding"  of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  The output of <STRONG>tgoto</STRONG> should
+           thus be passed to <STRONG>tputs</STRONG> rather than some other output function such
+           as <STRONG>printf(3)</STRONG>.
 
        <STRONG>o</STRONG>   While  <STRONG>tgoto</STRONG>  is  assumed  to  be used for the two-parameter cursor
-           positioning  capability,  termcap  applications  also  use  it  for
+           positioning  capability,  <EM>termcap</EM>  applications  also  use  it  for
            single-parameter capabilities.
 
-           Doing  this  shows  a  quirk  in <STRONG>tgoto</STRONG>: most hardware terminals use
+           Doing  so  reveals  a  quirk  in <STRONG>tgoto</STRONG>: most hardware terminals use
            cursor addressing with <EM>row</EM> first, but the  original  developers  of
-           the termcap interface chose to put the <EM>column</EM> parameter first.  The
-           <STRONG>tgoto</STRONG> function swaps the order of parameters.  It  does  this  also
-           for  calls  requiring  only  a single parameter.  In that case, the
-           first parameter is merely a placeholder.
+           the  <EM>termcap</EM>  interface  chose  to  put  the <EM>col</EM> (column) parameter
+           first.  The <STRONG>tgoto</STRONG> function swaps the order of parameters.  It  does
+           this  even  for  calls  requiring only a single parameter.  In that
+           case, the first parameter is merely a placeholder.
 
-       <STRONG>o</STRONG>   Normally the ncurses library is compiled with terminfo support.  In
-           that  case,  <STRONG>tgoto</STRONG>  uses  an  internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> (a more
-           capable formatter).
+       <STRONG>o</STRONG>   Normally the <EM>ncurses</EM>  library  is  compiled  without  full  <EM>termcap</EM>
+           support.  In that case, <STRONG>tgoto</STRONG> uses an internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>
+           (a more capable function).
 
-           With terminfo support, <STRONG>tgoto</STRONG> is able to use some  of  the  terminfo
-           features,  but  not  all.   In  particular,  it allows only numeric
+           Because it uses <STRONG>tparm</STRONG> internally, <STRONG>tgoto</STRONG> is able to use  some  <EM>term-</EM>
+           <EM>info</EM>  features, but not all.  In particular, it allows only numeric
            parameters; <STRONG>tparm</STRONG> supports string parameters.
 
            However, <STRONG>tparm</STRONG> is not  a  <EM>termcap</EM>  feature,  and  portable  <EM>termcap</EM>
            applications should not rely upon its availability.
 
-       The  <STRONG>tputs</STRONG>  routine  is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> manual page.
-       It can retrieve capabilities by either termcap or terminfo name.
+       <STRONG>tputs</STRONG>  is described in <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>.  It can retrieve capabilities
+       by either <EM>termcap</EM> or <EM>terminfo</EM> name.
 
 
 </PRE><H3><a name="h3-Global-Variables">Global Variables</a></H3><PRE>
-       The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the terminfo  entry's
+       The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the <EM>terminfo</EM>  entry's
        data for <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG> and <STRONG>backspace_if_not_bs</STRONG>, respectively.  <STRONG>UP</STRONG>
-       is not used by ncurses.  <STRONG>PC</STRONG> is used in the <STRONG>tdelay_output</STRONG> function.   <STRONG>BC</STRONG>
-       is  used in the <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set by ncurses
-       in a system-specific coding to reflect the terminal speed.
+       is not used by <EM>ncurses</EM>.  <STRONG>PC</STRONG> is used by <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>.  <STRONG>BC</STRONG> is used by
+       <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set by <EM>ncurses</EM> using a system-
+       specific encoding to indicate the terminal's data rate.
 
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
-       The termcap functions provide no  means  for  freeing  memory,  because
-       legacy  termcap  implementations used only the buffer areas provided by
-       the caller via <STRONG>tgetent</STRONG>  and  <STRONG>tgetstr</STRONG>.   Those  buffers  are  unused  in
-       terminfo.
+       The <EM>termcap</EM> functions provide  no  means  of  freeing  memory,  because
+       legacy  <EM>termcap</EM>  implementations used only the buffer areas provided by
+       the caller via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused in  <EM>term-</EM>
+       <EM>info</EM>.
+
+       By  contrast,  <EM>terminfo</EM>  allocates  memory.   It  uses <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to
+       obtain the data  used  by  <STRONG>tgetent</STRONG>  and  the  functions  that  retrieve
+       capability values.  One could use
+              del_curterm(cur_term);
+       to  free  this  memory,  but  there  is an additional complication with
+       <EM>ncurses</EM>.  It uses a fixed-size pool of storage locations, one per value
+       of the <EM>TERM</EM> environment variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
+       program relies upon this arrangement to improve its performance.
 
-       On  the  other  hand,  terminfo allocates memory.  It uses <STRONG>setupterm</STRONG> to
-       retrieve the data used  by  <STRONG>tgetent</STRONG>  and  the  functions  which  return
-       capability values such as <STRONG>tgetstr</STRONG>.  One could use
+       An application that uses only the <EM>termcap</EM>  functions,  not  the  higher
+       level  <EM>curses</EM>  API,  could  release  the  memory using <STRONG><A HREF="curs_terminfo.3x.html">del_curterm(3x)</A></STRONG>,
+       because the pool is freed using other functions; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-               <STRONG>del_curterm(cur_term);</STRONG>
 
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       The return values of  <STRONG>tgetent</STRONG>,  <STRONG>tgetflag</STRONG>,  <STRONG>tgetname</STRONG>,  and  <STRONG>tgetstr</STRONG>  are
+       documented above.
 
-       to  free  this  memory,  but  there  is an additional complication with
-       ncurses.  It uses a fixed-size  <EM>pool</EM>  of  storage  locations,  one  per
-       setting  of  the  <EM>TERM</EM>  variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
-       program relies upon this arrangement, to improve its performance.
+       <STRONG>tgoto</STRONG> returns <STRONG>NULL</STRONG> on error.  Error conditions include:
 
-       An application which uses only the low-level  termcap  functions  could
-       free  the  memory  using  <STRONG>del_curterm</STRONG>,  because the pool is freed using
-       other functions (see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>).
+       <STRONG>o</STRONG>   uninitialized state (<STRONG>tgetent</STRONG> was not called successfully),
 
+       <STRONG>o</STRONG>   <EM>cap</EM> being a null pointer,
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except where explicitly noted, routines that return an  integer  return
-       <STRONG>ERR</STRONG>  upon  failure  and <STRONG>OK</STRONG> (SVr4 only specifies "an integer value other
-       than <STRONG>ERR</STRONG>") upon successful completion.
+       <STRONG>o</STRONG>   <EM>cap</EM> referring to a canceled capability,
 
-       Routines that return pointers return <STRONG>NULL</STRONG> on error.
+       <STRONG>o</STRONG>   <EM>cap</EM>  being  a  capability  with  string-valued  parameters (a <EM>term-</EM>
+           <EM>info</EM>-only feature), and
 
-       A few special cases apply:
+       <STRONG>o</STRONG>   <EM>cap</EM> being a capability with more than two parameters.
 
-       <STRONG>o</STRONG>   If the terminal database has not been initialized, these return  an
-           error.
+       See <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> regarding <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The  calls  with  a  string  parameter  (<STRONG>tgoto</STRONG>, <STRONG>tputs</STRONG>) check if the
-           string is null, or cancelled.  Those return an error.
 
-       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with  string  parameters  is  an
-           error.
-
-       <STRONG>o</STRONG>   A call to <STRONG>tgoto</STRONG> using a capability with more than two parameters is
-           an error.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <EM>ncurses</EM> compares only the first two characters of the <EM>id</EM>  parameter  of
+       <STRONG>tgetflag</STRONG>, <STRONG>tgetnum</STRONG>, and <STRONG>tgetstr</STRONG> to the capability names in the database.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       These  functions  are  no  longer standardized (and the variables never
+       were); <EM>ncurses</EM> provides them  to  support  legacy  applications.   They
+       should not be used in new programs.
 
-</PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
-       These functions are provided for supporting  legacy  applications,  and
-       should not be used in new programs:
 
-       <STRONG>o</STRONG>   The  XSI  Curses  standard,  Issue  4  describes  these  functions.
-           However, they are marked TO BE WITHDRAWN  and  may  be  removed  in
-           future versions.
+</PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
+       <STRONG>o</STRONG>   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
+           functions.  However, they are marked "TO BE WITHDRAWN".
 
-       <STRONG>o</STRONG>   X/Open Curses, Issue 5 (December 2007) marked the termcap interface
-           (along with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
+       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) marked the <EM>termcap</EM>  interface  (along
+           with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
 
-       Neither the XSI Curses standard nor the SVr4 man pages  documented  the
-       return  values  of  <STRONG>tgetent</STRONG>  correctly,  though  all three were in fact
-       returned ever since SVr1.  In particular, an omission in the XSI Curses
-       documentation  has  been misinterpreted to mean that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG>
+       Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
+       values of <STRONG>tgetent</STRONG> correctly, though all three  were  in  fact  returned
+       ever  since  SVr1.   In  particular,  an  omission in the X/Open Curses
+       specification has been misinterpreted to mean that <STRONG>tgetent</STRONG>  returns  <STRONG>OK</STRONG>
        or  <STRONG>ERR</STRONG>.   Because  the  purpose  of  these  functions  is  to  provide
-       compatibility  with  the  <EM>termcap</EM> library, that is a defect in XCurses,
-       Issue 4, Version 2 rather than in ncurses.
-
-
-</PRE><H3><a name="h3-Compatibility-with-BSD-Termcap">Compatibility with BSD Termcap</a></H3><PRE>
-       External  variables  are  provided  for  support  of  certain   termcap
-       applications.  However, termcap applications' use of those variables is
-       poorly documented, e.g., not distinguishing between input  and  output.
-       In  particular, some applications are reported to declare and/or modify
-       <STRONG>ospeed</STRONG>.
-
-       The comment that only the first two characters of the <STRONG>id</STRONG> parameter  are
-       used escapes many application developers.  The original BSD 4.2 termcap
-       library (and historical relics thereof) did not require a trailing null
-       NUL  on  the  parameter  name  passed to <STRONG>tgetstr</STRONG>, <STRONG>tgetnum</STRONG> and <STRONG>tgetflag</STRONG>.
-       Some applications assume that the termcap interface  does  not  require
-       the  trailing  NUL  for  the parameter name.  Taking into account these
-       issues:
-
-       <STRONG>o</STRONG>   As a special case,  <STRONG>tgetflag</STRONG>  matched  against  a  single-character
-           identifier   provided   that   was  at  the  end  of  the  terminal
-           description.  You should not rely upon this  behavior  in  portable
-           programs.   This  implementation  disallows matches against single-
-           character capability names.
-
-       <STRONG>o</STRONG>   This implementation disallows  matches  by  the  termcap  interface
-           against  extended  capability  names  which  are  longer  than  two
-           characters.
-
-       The BSD termcap function <STRONG>tgetent</STRONG> returns the text of a termcap entry in
-       the  buffer  passed  as an argument.  This library (like other terminfo
-       implementations) does not store terminal descriptions as text.  It sets
-       the buffer contents to a null-terminated string.
-
-
-</PRE><H3><a name="h3-Other-Compatibility">Other Compatibility</a></H3><PRE>
-       This  library includes a termcap.h header, for compatibility with other
-       implementations.  But the header  is  rarely  used  because  the  other
+       compatibility with the <EM>termcap</EM> library, that  is  a  defect  in  X/Open
+       Curses, Issue 4, Version 2 rather than in <EM>ncurses</EM>.
+
+   <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <EM>termcap</EM>
+       Externally  visible  variables  are  provided  for  support  of certain
+       <EM>termcap</EM>  applications.   However,  their  correct   usage   is   poorly
+       documented; for example, it is unclear when reading and writing them is
+       meaningful.  In particular, some applications are reported  to  declare
+       and/or modify <STRONG>ospeed</STRONG>.
+
+       The  constraint  that only the first two characters of the <EM>id</EM> parameter
+       are used escapes many application developers.  The BSD <EM>termcap</EM>  library
+       did  not require a trailing null character on the capability identifier
+       passed to <STRONG>tgetstr</STRONG>,  <STRONG>tgetnum</STRONG>,  and  <STRONG>tgetflag</STRONG>.   Some  applications  thus
+       assume  that  the  <EM>termcap</EM> interface does not require the trailing null
+       character for the capability identifier.
+
+       <STRONG>o</STRONG>   <EM>ncurses</EM> disallows matches by the <EM>termcap</EM> interface against extended
+           capability   names   that  are  longer  than  two  characters;  see
+           <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
+
+       The BSD <EM>termcap</EM> function <STRONG>tgetent</STRONG> returns the text of a <EM>termcap</EM> entry in
+       the  buffer  passed  as an argument.  This library, like other <EM>terminfo</EM>
+       implementations, does not store terminal type descriptions as text.  It
+       sets the buffer contents to a null-terminated string.
+
+
+</PRE><H3><a name="h3-Header-File">Header File</a></H3><PRE>
+       This  library  includes a <EM>termcap.h</EM> header for compatibility with other
+       implementations, but the  header  is  rarely  used  because  the  other
        implementations are not strictly compatible.
 
-       The original BSD termcap (through 4.3BSD) had no header file which gave
-       function prototypes, because that was a feature of ANSI C.  BSD termcap
-       was  written  several  years before C was standardized.  However, there
-       were two different termcap.h header files in the BSD sources:
 
-       <STRONG>o</STRONG>   One was used internally by the <STRONG>jove</STRONG> editor in 2BSD through  4.4BSD.
-           It defined global symbols for the termcap variables which it used.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       Bill  Joy  originated  a  forerunner  of <EM>termcap</EM> called "ttycap", dated
+       September 1977, and released in 1BSD (March 1978).  It used many of the
+       same  function  names  as the later <EM>termcap</EM>, such as <STRONG>tgetent</STRONG>, <STRONG>tgetflag</STRONG>,
+       <STRONG>tgetnum</STRONG>, and <STRONG>tgetstr</STRONG>.
+
+       A clear descendant, the <EM>termlib</EM> library, followed in 2BSD  (May  1979),
+       adding <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>.  The former applied at that time only to cursor
+       positioning  capabilities,  thus  the  overly  specific  name.   Little
+       changed  in 3BSD (late 1979) except the addition of test programs and a
+       <EM>termlib</EM> man page, which documented the API shown in section  "SYNOPSIS"
+       above.
+
+       4BSD  (November 1980) renamed <EM>termlib</EM> to <EM>termcap</EM> and added another test
+       program.  The library remained much the same though 4.3BSD (June 1986).
+       4.4BSD-Lite (June 1994) refactored it but left the API unchanged.
+
+       Function  prototypes  were  a feature of the forthcoming ANSI C (1989).
+       Thus the library provided no header file declaring them.  Nevertheless,
+       the  BSD  sources  included  two  different <EM>termcap.h</EM> header files over
+       time.
 
-       <STRONG>o</STRONG>   The  other  appeared in 4.4BSD Lite Release 2 (mid-1993) as part of
-           <EM>libedit</EM> (also known as the  <EM>editline</EM>  library).   The  CSRG  source
-           history  shows that this was added in mid-1992.  The <EM>libedit</EM> header
-           file was used  internally,  as  a  convenience  for  compiling  the
-           <EM>editline</EM>  library.   It declared function prototypes, but no global
-           variables.
+       <STRONG>o</STRONG>   One was used internally by <STRONG>jove(1)</STRONG> from 4.3BSD onward.  It delcared
+           global symbols for the <EM>termcap</EM> variables that it used.
 
-       The header file from <EM>libedit</EM> was added to NetBSD's termcap  library  in
-       mid-1994.
+       <STRONG>o</STRONG>   The  other appeared in 4.4BSD-Lite Release 2 (June 1995) as part of
+           <EM>libedit</EM> (also known as the <EM>editline</EM> library).  CSRG source  history
+           shows that this was added in mid-1992.  The <EM>libedit</EM> header file was
+           used  internally  as  a  convenience  for  compiling  the  <EM>editline</EM>
+           library.  It declared function prototypes, but no global variables.
+           This header file was added to NetBSD's <EM>termcap</EM> library in mid-1994.
 
-       Meanwhile,  GNU  termcap  was under development, starting in 1990.  The
-       first release (termcap 1.0) in 1991 included a termcap.h  header.   The
-       second  release  (termcap 1.1) in September 1992 modified the header to
-       use <STRONG>const</STRONG> for the function prototypes in the  header  where  one  would
-       expect  the  parameters  to be read-only.  This was a difference versus
-       the original BSD termcap.  The prototype for <STRONG>tputs</STRONG> also  differed,  but
-       in that instance, it was <EM>libedit</EM> which differed from BSD termcap.
+       Meanwhile, GNU <EM>termcap</EM> began development in 1990.   Its  first  release
+       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header.   Its  second (1.1) in
+       September 1992 modified the  header  to  use  <EM>const</EM>  for  the  function
+       prototypes  in  the  header where one would expect the parameters to be
+       read-only.   BSD  <EM>termcap</EM>  did  not.   The  prototype  for  <STRONG>tputs</STRONG>  also
+       differed,  but  in that instance, it was <EM>libedit</EM> that differed from BSD
+       <EM>termcap</EM>.
 
-       A copy of GNU termcap 1.3 was bundled with <EM>bash</EM> in mid-1993, to support
-       the <STRONG>readline(3)</STRONG> library.
+       GNU <EM>termcap</EM> 1.3 was bundled  with  <EM>bash</EM>  in  mid-1993  to  support  the
+       <STRONG>readline(3)</STRONG> library.
 
-       A termcap.h file was provided in ncurses 1.8.1 (November  1993).   That
-       reflected influence by <STRONG>emacs(1)</STRONG> (rather than <STRONG>jove(1)</STRONG>) and GNU termcap:
+       <EM>ncurses</EM>  1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It reflected
+       influence  from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than   <STRONG>jove(1)</STRONG>),
+       providing the following interface:
 
-       <STRONG>o</STRONG>   it provided declarations for a few global symbols used by <STRONG>emacs</STRONG>
+       <STRONG>o</STRONG>   global symbols used by <EM>emacs</EM>,
 
-       <STRONG>o</STRONG>   it provided function prototypes (using <STRONG>const</STRONG>).
+       <STRONG>o</STRONG>   <EM>const</EM>-qualified function prototypes, and
 
-       <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG> (a GNU termcap feature) was provided.
+       <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG>, a GNU <EM>termcap</EM> feature.
 
-       Later (in mid-1996) the <STRONG>tparam</STRONG> function was removed from ncurses.  As a
-       result, there are differences between any of the four  implementations,
-       which  must  be  taken into account by programs which can work with all
-       termcap library interfaces.
+       Later  (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.  Any
+       two of the four implementations thus differ, and programs  that  intend
+       to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       If you call <STRONG>tgetstr</STRONG> to fetch  <STRONG>ca</STRONG>  or  any  other  parameterized  string
-       capability,  be aware that it is returned in <EM>terminfo</EM> notation, not the
-       older and not-quite-compatible <EM>termcap</EM> notation.  This does  not  cause
-       problems  if  all  you  do  with  it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both
-       expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.  (The  <STRONG>tgoto</STRONG>  function,
-       if  configured  to  support  <EM>termcap,</EM>  checks  if  the string is indeed
-       <EM>terminfo</EM>-style by looking for "<STRONG>%p</STRONG>" parameters or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"  delays,  and
-       invokes  a  <EM>termcap</EM>-style  parser  if  the  string  appears  not to use
-       <EM>terminfo</EM> syntax.)
-
-       Because <EM>terminfo</EM>'s syntax for padding in  string  capabilities  differs
+       If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>ca</STRONG> or any other parameterized string
+       capability, be aware that it is returned in <EM>terminfo</EM> notation, not  the
+       older  and  not-quite-compatible <EM>termcap</EM> notation.  This does not cause
+       problems if all you do with it is  call  <STRONG>tgoto</STRONG>  or  <STRONG>tparm</STRONG>,  which  both
+       expand  <EM>terminfo</EM>-style  strings  as  <EM>terminfo</EM>  does.   (If  <EM>ncurses</EM>  is
+       configured to support <EM>termcap,</EM> <STRONG>tgoto</STRONG> checks whether the string is <EM>term-</EM>
+       <EM>info</EM>-style  by  looking  for  "<STRONG>%p</STRONG>"  parameters  or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>" delays, and
+       invokes a <EM>termcap</EM>-style parser if the string appears not to  use  <EM>term-</EM>
+       <EM>info</EM> syntax.)
+
+       Because  <EM>terminfo</EM>'s  syntax  for padding in string capabilities differs
        from <EM>termcap</EM>'s, users can be surprised.
 
-       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG>  in  a <EM>terminfo</EM> system transmits "50" rather than busy-
+       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a <EM>terminfo</EM> system transmits "50" rather  than  busy-
            waiting for 50 milliseconds.
 
-       <STRONG>o</STRONG>   However, if <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it  may  also
+       <STRONG>o</STRONG>   However,  if  <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it may also
            have been configured to support BSD-style padding.
 
-           In  that  case,  <STRONG>tputs</STRONG>  inspects  strings passed to it, looking for
+           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
            digits at the beginning of the string.
 
-           <STRONG>tputs("50")</STRONG> in a <EM>termcap</EM> system may busy-wait for  50  milliseconds
+           <STRONG>tputs("50")</STRONG>  in  a <EM>termcap</EM> system may busy-wait for 50 milliseconds
            rather than transmitting "50".
 
-       <EM>termcap</EM>   has   nothing   analogous  to  <EM>terminfo</EM>'s  <STRONG>sgr</STRONG>  string.   One
-       consequence is that <EM>termcap</EM> applications assume that <STRONG>me</STRONG> (equivalent  to
-       <EM>terminfo</EM>'s <STRONG>sgr0</STRONG> capability) does not reset the alternate character set.
-       <EM>ncurses</EM> checks for, and modifies the  data  shared  with,  the  <EM>termcap</EM>
-       interface to accommodate the latter's limitation in this respect.
+       <EM>termcap</EM>  has  nothing  analogous  to  <EM>terminfo</EM>'s   <STRONG>sgr</STRONG>   string.    One
+       consequence  is  that <EM>termcap</EM> applications assume that "<STRONG>me</STRONG>" (equivalent
+       to <EM>terminfo</EM>'s <STRONG>sgr0</STRONG> capability) does not reset the  alternate  character
+       set.   <EM>ncurses</EM>  checks  for,  and  modifies  the  data shared with, the
+       <EM>termcap</EM> interface  to  accommodate  the  latter's  limitation  in  this
+       respect.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
        https://invisible-island.net/ncurses/tctest.html
 
 
 
-ncurses 6.4                       2023-12-02                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -366,20 +406,21 @@ <H1 class="no-header">curs_termcap 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Initialization">Initialization</a></li>
-<li><a href="#h3-Capability-Values">Capability Values</a></li>
-<li><a href="#h3-Formatting-Capabilities">Formatting Capabilities</a></li>
+<li><a href="#h3-Retrieving-Capability-Values">Retrieving Capability Values</a></li>
+<li><a href="#h3-Applying-String-Capabilities">Applying String Capabilities</a></li>
 <li><a href="#h3-Global-Variables">Global Variables</a></li>
 <li><a href="#h3-Releasing-Memory">Releasing Memory</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Standards">Standards</a></li>
-<li><a href="#h3-Compatibility-with-BSD-Termcap">Compatibility with BSD Termcap</a></li>
-<li><a href="#h3-Other-Compatibility">Other Compatibility</a></li>
+<li><a href="#h3-Header-File">Header File</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 5b6c90aec..eb8b33e49 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.122 2023/12/03 00:10:20 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.123 2023/12/16 21:11:53 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -46,12 +46,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -86,9 +86,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>del_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
-            <EM>or</EM>
-       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>long</STRONG> <EM>p1</EM> <EM>...</EM> <STRONG>long</STRONG> <EM>p9</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
+            <EM>/*</EM> <EM>or</EM> <EM>*/</EM>
+       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>long</STRONG> <EM>p1</EM> ... <STRONG>long</STRONG> <EM>p9</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
        <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>char</STRONG> <STRONG>*tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
@@ -330,7 +330,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>attrs</EM> of type <STRONG>attr_t</STRONG> for the attributes and
 
-       <STRONG>o</STRONG>   <EM>pair</EM> of type <STRONG>short</STRONG> for the color-pair number.
+       <STRONG>o</STRONG>   <EM>pair</EM> of type <STRONG>short</STRONG> for the color pair number.
 
        The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines are designed to  use  the  attribute
        constants with the <STRONG>WA_</STRONG> prefix.
@@ -407,11 +407,11 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
        by <STRONG>setupterm</STRONG>:
 
-       <STRONG>o</STRONG>   the "static" terminfo variables [a-z].  Before ncurses  6.3,  those
-           were  shared by all screens.  With ncurses 6.3, those are allocated
+       <STRONG>o</STRONG>   the "static" terminfo variables [a-z].  Before <EM>ncurses</EM>  6.3,  those
+           were  shared by all screens.  With <EM>ncurses</EM> 6.3, those are allocated
            per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-       <STRONG>o</STRONG>   to improve performance, ncurses 6.3 caches the result of  analyzing
+       <STRONG>o</STRONG>   to improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
            terminfo  strings  for  their parameter types.  That is stored as a
            binary tree referenced from the <STRONG>TERMINAL</STRONG> structure.
 
@@ -470,7 +470,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        non-portable.  All other functions are as described by X/Open.
 
 
-</PRE><H3><a name="h3-Compatibility-macros">Compatibility macros</a></H3><PRE>
+</PRE><H3><a name="h3-Compatibility-Macros">Compatibility Macros</a></H3><PRE>
        This  implementation  provides  a  few  macros  for  compatibility with
        systems before SVr4 (see  <EM>HISTORY</EM>).   Those  include  <STRONG>crmode</STRONG>,  <STRONG>fixterm</STRONG>,
        <STRONG>gettmode</STRONG>, <STRONG>nocrmode</STRONG>, <STRONG>resetterm</STRONG>, <STRONG>saveterm</STRONG>, and <STRONG>setterm</STRONG>.
@@ -487,7 +487,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        those symbols as macros for BSD compatibility.
 
 
-</PRE><H3><a name="h3-Legacy-data">Legacy data</a></H3><PRE>
+</PRE><H3><a name="h3-Legacy-Data">Legacy Data</a></H3><PRE>
        <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>.  This  is  not
        part of X/Open Curses, but is assumed by some applications.
 
@@ -498,22 +498,22 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        stored in the arrays described here.
 
 
-</PRE><H3><a name="h3-Output-buffering">Output buffering</a></H3><PRE>
-       Older  versions  of  <STRONG>ncurses</STRONG> assumed that the file descriptor passed to
+</PRE><H3><a name="h3-Output-Buffering">Output Buffering</a></H3><PRE>
+       Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
        <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
        the  corresponding  stream.   In  addition  to  the limitation that the
        terminal was left  in  block-buffered  mode  on  exit  (like  System  V
-       curses),  it  was  problematic because <STRONG>ncurses</STRONG> did not allow a reliable
+       curses),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
        way to cleanup on receiving SIGTSTP.
 
        The current version (ncurses6) uses output buffers managed directly  by
-       <STRONG>ncurses</STRONG>.  Some of the low-level functions described in this manual page
+       <EM>ncurses</EM>.  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  <STRONG>ncurses</STRONG> use alternate versions of these functions
+       level  functions  in  <EM>ncurses</EM> use alternate versions of these functions
        using the more reliable buffering scheme.
 
 
-</PRE><H3><a name="h3-Function-prototypes">Function prototypes</a></H3><PRE>
+</PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
        The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
        declarations,  which  were  defined at the same time the C language was
        first standardized in the late 1980s.
@@ -540,7 +540,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            In  response  to review comments by Thomas E. Dickey, X/Open Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
 
-           While <STRONG>tiparm</STRONG> is always provided in ncurses, the older form is  only
+           While <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is  only
            available  as  a build-time configuration option.  If not specially
            configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
 
@@ -560,7 +560,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            parameters.   However,  only a few terminfo capabilities use string
            parameters (e.g., the ones used for programmable function keys).
 
-           The ncurses library checks usage of these capabilities, and returns
+           The <EM>ncurses</EM> library checks usage of these capabilities, and returns
            an  error  if  the capability mishandles string parameters.  But it
            cannot check if a calling program provides  strings  in  the  right
            places for the <STRONG>tparm</STRONG> calls.
@@ -568,8 +568,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
 
-
-</PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE>
+   <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
        If configured to use the terminal-driver, e.g., for the MinGW port,
 
        <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
@@ -586,7 +585,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            string.
 
 
-</PRE><H3><a name="h3-Other-portability-issues">Other portability issues</a></H3><PRE>
+</PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
        In  System  V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type and returns
        <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to implement the X/Open Curses semantics.
 
@@ -599,7 +598,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the curses state may not match
        the actual terminal state, and that an  application  should  touch  and
-       refresh  the  window before resuming normal curses calls.  Both <STRONG>ncurses</STRONG>
+       refresh  the  window before resuming normal curses calls.  Both <EM>ncurses</EM>
        and System V Release 4 curses implement <STRONG>mvcur</STRONG>  using  the  SCREEN  data
        allocated  in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as
        a terminfo function, <STRONG>mvcur</STRONG> is really a curses  function  which  is  not
@@ -702,7 +701,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -724,12 +723,11 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
-<li><a href="#h3-Compatibility-macros">Compatibility macros</a></li>
-<li><a href="#h3-Legacy-data">Legacy data</a></li>
-<li><a href="#h3-Output-buffering">Output buffering</a></li>
-<li><a href="#h3-Function-prototypes">Function prototypes</a></li>
-<li><a href="#h3-Special-TERM-treatment">Special TERM treatment</a></li>
-<li><a href="#h3-Other-portability-issues">Other portability issues</a></li>
+<li><a href="#h3-Compatibility-Macros">Compatibility Macros</a></li>
+<li><a href="#h3-Legacy-Data">Legacy Data</a></li>
+<li><a href="#h3-Output-Buffering">Output Buffering</a></li>
+<li><a href="#h3-Function-Prototypes">Function Prototypes</a></li>
+<li><a href="#h3-Other-Portability-Issues">Other Portability Issues</a></li>
 </ul>
 </li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 748c5fe55..b7e6078eb 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.49 2023/11/25 14:09:12 tom Exp @
+  * @Id: curs_threads.3x,v 1.50 2023/12/16 20:32:22 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -619,7 +619,7 @@ <H1 class="no-header">curs_threads 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 3a5baa2d5..295fa5216 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.40 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_trace.3x,v 1.41 2023/12/16 20:50:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -76,8 +76,8 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <EM>curses</EM> <EM>trace</EM> routines are used for debugging the ncurses libraries,
-       as  well  as  applications  which  use  the  ncurses  libraries.   Some
+       The <EM>curses</EM> <EM>trace</EM> routines are used for debugging the <EM>ncurses</EM> libraries,
+       as  well  as  applications  which  use  the  <EM>ncurses</EM>  libraries.   Some
        limitations apply:
 
        <STRONG>o</STRONG>   Aside from <STRONG>curses_trace</STRONG>, the other functions are normally available
@@ -113,7 +113,7 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            parameter  updates  the  trace mask, and returns the previous trace
            mask.
 
-           When the trace mask is nonzero, ncurses creates the file "trace" in
+           When the trace mask is nonzero, <EM>ncurses</EM> creates the file "trace" in
            the  current  directory for output.  If the file already exists, no
            tracing is done.
 
@@ -184,7 +184,7 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       These  functions  check  the <STRONG>NCURSES_TRACE</STRONG> environment variable, to set
+       These  functions  check  the <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable, to set
        the tracing feature as if <STRONG>curses_trace</STRONG> was called:
 
            filter,  initscr,  new_prescr,  newterm,   nofilter,   restartterm,
@@ -200,14 +200,14 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
        Because  the  command-line  utilities may call initialization functions
        such  as  <STRONG>setupterm</STRONG>,  <STRONG>tgetent</STRONG>  or  <STRONG>use_extended_names</STRONG>,  some  of  their
-       debugging output may be directed to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG>
+       debugging output may be directed to the <EM>trace</EM> file if the <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM>
        environment variable is set:
 
        <STRONG>o</STRONG>   messages produced in the utility are written to the standard error.
 
        <STRONG>o</STRONG>   messages produced by the underlying library are written to <EM>trace</EM>.
 
-       If ncurses is built without tracing, none of the latter  are  produced,
+       If <EM>ncurses</EM> is built without tracing, none of the latter  are  produced,
        and fewer diagnostics are provided by the command-line utilities.
 
 
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are not part of the XSI interface.  Some  other  curses
        implementations  are  known  to have similar features, but they are not
-       compatible with ncurses:
+       compatible with <EM>ncurses</EM>:
 
        <STRONG>o</STRONG>   SVr4 provided <STRONG>traceon</STRONG> and <STRONG>traceoff</STRONG>, to  control  whether  debugging
            information  was  written to the "trace" file.  While the functions
@@ -233,19 +233,19 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
            a debug-library is built.
 
            PDCurses  has  a  short description of these functions, with a note
-           that they are not present in X/Open Curses, ncurses or NetBSD.   It
+           that they are not present in X/Open Curses, <EM>ncurses</EM> or NetBSD.   It
            does  not  mention  SVr4,  but the functions' inclusion in a header
            file section labeled "Quasi-standard" hints at the origin.
 
        <STRONG>o</STRONG>   NetBSD does not provide functions  for  enabling/disabling  traces.
-           It     uses    environment    variables    <STRONG>CURSES_TRACE_MASK</STRONG>    and
-           <STRONG>CURSES_TRACE_FILE</STRONG> to  determine  what  is  traced,  and  where  the
+           It     uses    environment    variables    <EM>CURSES</EM><STRONG>_</STRONG><EM>TRACE</EM><STRONG>_</STRONG><EM>MASK</EM>    and
+           <EM>CURSES</EM><STRONG>_</STRONG><EM>TRACE</EM><STRONG>_</STRONG><EM>FILE</EM> to  determine  what  is  traced,  and  where  the
            results  are  written.  This is available only when a debug-library
            is built.
 
            The NetBSD tracing feature is undocumented.
 
-       A few ncurses functions are not  provided  when  symbol  versioning  is
+       A few <EM>ncurses</EM> functions are not  provided  when  symbol  versioning  is
        used:
 
            _nc_tracebits, _tracedump, _tracemouse
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index a09055b37..ce1aec47f 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.90 2023/12/02 21:10:36 tom Exp @
+  * @Id: curs_util.3x,v 1.91 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -163,29 +163,29 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Then  it  asks  for the screen size via operating system calls.  If
            successful, it overrides the values from the terminal database.
 
-       <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <STRONG>ncurses</STRONG>
+       <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <EM>ncurses</EM>
            examines  the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables, using a value
            in those to override the  results  from  the  operating  system  or
            terminal database.
 
-           <STRONG>Ncurses</STRONG>  also  updates  the  screen  size  in response to <STRONG>SIGWINCH</STRONG>,
-           unless overridden by the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables,
+           <EM>curses</EM> also updates the screen size in response to <STRONG>SIGWINCH</STRONG>, unless
+           overridden by the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables,
 
 
 </PRE><H3><a name="h3-use_tioctl">use_tioctl</a></H3><PRE>
        The <STRONG>use_tioctl</STRONG> routine, if used, should be  called  before  <STRONG>initscr</STRONG>  or
        <STRONG>newterm</STRONG>  are  called  (because  those  compute the screen size).  After
-       <STRONG>use_tioctl</STRONG> is called with <STRONG>TRUE</STRONG> as an  argument,  <STRONG>ncurses</STRONG>  modifies  the
+       <STRONG>use_tioctl</STRONG> is called with <STRONG>TRUE</STRONG> as an  argument,  <EM>ncurses</EM>  modifies  the
        last step in its computation of screen size as follows:
 
        <STRONG>o</STRONG>   checks  if the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables are set to a
            number greater than zero.
 
-       <STRONG>o</STRONG>   for each, <STRONG>ncurses</STRONG> updates the  corresponding  environment  variable
+       <STRONG>o</STRONG>   for each, <EM>ncurses</EM> updates the  corresponding  environment  variable
            with  the  value  that it has obtained via operating system call or
            from the terminal database.
 
-       <STRONG>o</STRONG>   <STRONG>ncurses</STRONG> re-fetches the value of the environment variables  so  that
+       <STRONG>o</STRONG>   <EM>ncurses</EM> re-fetches the value of the environment variables  so  that
            it is still the environment variables which set the screen size.
 
        The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as follows.
@@ -214,7 +214,7 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <STRONG>WINDOW</STRONG> structure, and its
            associated character cells.  The format differs between  the  wide-
-           character  (<STRONG>ncursesw</STRONG>)  and  non-wide  (<STRONG>ncurses</STRONG>) libraries.  You can
+           character  (<EM>ncursesw</EM>)  and  non-wide  (<EM>ncurses</EM>) libraries.  You can
            transfer data between the two, however.
 
        <STRONG>o</STRONG>   the retrieved window is always created as a  top-level  window  (or
@@ -298,9 +298,9 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter/use_tioctl</a></H3><PRE>
-       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <STRONG>ncurses</STRONG>.  They
+       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
        were not supported on Version 7, BSD or System V  implementations.   It
-       is  recommended  that  any  code  depending  on  <STRONG>ncurses</STRONG>  extensions be
+       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
@@ -319,7 +319,7 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <STRONG>WINDOW</STRONG> structure to the
            file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
-           older <STRONG>ncurses</STRONG> versions.  This implementation (as well as the X/Open
+           older <EM>ncurses</EM> versions.  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
@@ -372,13 +372,13 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        before  initializing  curses),  this  implementation  returns   strings
        "M-^@", "M-^A", etc.
 
-       X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <STRONG>ncurses</STRONG>
-       does.  However, <STRONG>ncurses</STRONG>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
+       X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
+       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env/use_tioctl</a></H3><PRE>
-       If  <STRONG>ncurses</STRONG>  is  configured  to provide the sp-functions extension, the
+       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
        state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
        <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
@@ -391,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 78a5c3021..ed617925d 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.34 2023/11/25 14:32:36 tom Exp @
+  * @Id: curs_variables.3x,v 1.35 2023/12/16 21:05:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -73,12 +73,13 @@ <H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
        <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLORS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLS;</STRONG>
-       <STRONG>int</STRONG> <STRONG>ESCDELAY;</STRONG>
        <STRONG>int</STRONG> <STRONG>LINES;</STRONG>
-       <STRONG>int</STRONG> <STRONG>TABSIZE;</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>curscr;</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>newscr;</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>stdscr;</STRONG>
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
+       <STRONG>int</STRONG> <STRONG>ESCDELAY;</STRONG>
+       <STRONG>int</STRONG> <STRONG>TABSIZE;</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>newscr;</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -92,7 +93,7 @@ <H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
        library.
 
 
-</PRE><H3><a name="h3-bool_-TRUE_-FALSE">bool, TRUE, FALSE</a></H3><PRE>
+</PRE><H3><a name="h3-bool_-TRUE_-FALSE"><EM>bool,</EM> TRUE, FALSE</a></H3><PRE>
        X/Open Issue 4 <EM>curses</EM>  (1996)  preceded  the  ISO  C99  and  ISO  C++98
        standards,  each of which also defined a Boolean data type.  The <EM>curses</EM>
        library requires an integral type <EM>bool</EM> and constants <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>  to
@@ -104,14 +105,14 @@ <H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
        values indicating failure and success, respectively.
 
 
-</PRE><H3><a name="h3-chtype">chtype</a></H3><PRE>
+</PRE><H3><a name="h3-chtype"><EM>chtype</EM></a></H3><PRE>
        The <EM>chtype</EM> integral type combines a ("narrow",  8-bit)  character  with
        attributes  encoding  the character's <EM>rendition</EM>, such as the styling of
        its  typeface  and/or  foreground  and  background  colors.   See,  for
        example, <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>, and <STRONG><A HREF="curs_inch.3x.html">inch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-cchar_t_-attr_t">cchar_t, attr_t</a></H3><PRE>
+</PRE><H3><a name="h3-cchar_t_-attr_t"><EM>cchar_t,</EM> attr_t</a></H3><PRE>
        <EM>chtype</EM>  is  too small for the standard C library's wide-character type,
        <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>.  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> is a type that can accommodate an <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  and  enough
        wide  characters  to  store  what  Unicode  terms a <EM>grapheme</EM> <EM>cluster</EM> (a
@@ -255,7 +256,7 @@ <H1 class="no-header">curs_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-25                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 6adcc64a6..763ae7c74 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.43 2023/11/25 14:17:29 tom Exp @
+  * @Id: curs_window.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -230,11 +230,11 @@ <H1 class="no-header">curs_window 3x 2023-11-25 ncurses 6.4 Library calls</H1>
            X/Open  curses  does  not  even  make that check, and will delete a
            parent window which still has subwindows.
 
-       <STRONG>o</STRONG>   Since release 4.0 (1996), ncurses maintains a list of  windows  for
+       <STRONG>o</STRONG>   Since release 4.0 (1996), <EM>ncurses</EM> maintains a list of  windows  for
            each  screen,  to  ensure  that  a  window has no subwindows before
            allowing deletion.
 
-       <STRONG>o</STRONG>   NetBSD copied this feature of ncurses in 2003.
+       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in 2003.
            PDCurses follows the scheme used in Solaris X/Open curses.
 
 
@@ -256,7 +256,7 @@ <H1 class="no-header">curs_window 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index c6377da35..3f79ad1f3 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.47 2023/11/25 14:26:30 tom Exp @
+  * @Id: default_colors.3x,v 1.48 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -90,15 +90,15 @@ <H1 class="no-header">default_colors 3x 2023-11-25 ncurses 6.4 Library calls</H1
               <EM>use</EM><STRONG>_</STRONG><EM>default</EM><STRONG>_</STRONG><EM>colors();</EM>
               <EM>assume</EM><STRONG>_</STRONG><EM>default</EM><STRONG>_</STRONG><EM>colors(-1,-1);</EM>
 
-       These are ncurses extensions.  For other curses implementations,  color
-       number  -1  does  not  mean  anything,  just  as  for  ncurses before a
+       These are <EM>ncurses</EM> extensions.  For other curses implementations,  color
+       number  -1  does  not  mean  anything,  just  as  for  <EM>ncurses</EM> before a
        successful call of <STRONG>use_default_colors</STRONG> or <STRONG>assume_default_colors</STRONG>.
 
        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  <STRONG>use_default_colors</STRONG>  or
-       <STRONG>assume_default_colors</STRONG> ncurses will paint a white foreground (text) with
+       <STRONG>assume_default_colors</STRONG> <EM>ncurses</EM> will paint a white foreground (text) with
        black background for color pair 0.
 
 
@@ -134,7 +134,7 @@ <H1 class="no-header">default_colors 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-25                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 5a0aab201..ad69c1185 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.39 2023/11/25 14:26:30 tom Exp @
+  * @Id: define_key.3x,v 1.40 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index e15ca18a6..5b2722cee 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.50 2023/11/25 13:59:44 tom Exp @
+  * @Id: form.3x,v 1.51 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -85,8 +85,8 @@ <H1 class="no-header">form 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Routine-Name-Index">Routine Name Index</a></H3><PRE>
        The  following table lists each <STRONG>form</STRONG> routine and the name of the manual
-       page on which it is described.  Routines flagged with "*" are  ncurses-
-       specific, not present in SVr4.
+       page  on  which  it  is  described.   Routines  flagged  with  "*"  are
+       <EM>ncurses</EM>-specific, not present in SVr4.
 
        <STRONG>curses</STRONG> Routine Name     Manual Page Name
        --------------------------------------------------
@@ -223,19 +223,19 @@ <H1 class="no-header">form 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        It is not part of X/Open Curses.
 
-       Aside from ncurses, there are few implementations:
+       Aside from <EM>ncurses</EM>, there are few implementations:
 
        <STRONG>o</STRONG>   systems based on SVr4 source code, e.g., Solaris.
 
        <STRONG>o</STRONG>   NetBSD curses.
 
        A few  functions  in  this  implementation  are  extensions  added  for
-       ncurses,   but   not   provided   by   other   implementations,   e.g.,
+       <EM>ncurses</EM>,   but   not   provided   by   other   implementations,   e.g.,
        <STRONG>form_driver_w</STRONG>, <STRONG>unfocus_current_field</STRONG>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
+       Juergen Pfeifer.  Manual pages and adaptation for <EM>ncurses</EM>  by  Eric  S.
        Raymond.
 
 
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 0737994c1..8c1ac74c3 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.42 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.43 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -136,7 +136,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls<
        These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The   <STRONG>set_max_field</STRONG>   function   checks   for   an   ncurses  extension
+       The   <STRONG>set_max_field</STRONG>   function   checks   for   an   <EM>ncurses</EM>  extension
        <STRONG>O_INPUT_FIELD</STRONG> which allows a dynamic field to shrink if the  new  limit
        is smaller than the current field size.
 
@@ -152,7 +152,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-11-25 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2023-11-25             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index c5d2ea72c..9780e0a95 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.50 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_validation.3x,v 1.51 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">form_field_validation 3x 2023-11-25 ncurses 6.4 Library ca
        where <EM>a</EM>, <EM>b</EM>, <EM>c</EM>, and <EM>d</EM> are numbers in  the  range  0  to  255.   Trailing
        blanks in the buffer are ignored.  The address itself is not validated.
 
-       This  is  an ncurses extension; this field type may not be available in
+       This  is  an <EM>ncurses</EM> extension; this field type may not be available in
        other curses implementations.
 
 
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2023-11-25 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-11-25         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 37e26f7f2..4ceeb10be 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_page.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">form_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       The <STRONG>unfocus_current_field</STRONG> function is an ncurses extension.
+       The <STRONG>unfocus_current_field</STRONG> function is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -120,7 +120,7 @@ <H1 class="no-header">form_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index 25d13e5d7..fa8f05097 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_requestname.3x,v 1.33 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -74,7 +74,7 @@ <H1 class="no-header">form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_requestname 3x 2023-11-25 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-11-25              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 0939532f9..b3ba683a2 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.101 2023/12/02 20:49:04 tom Exp @
+  * @Id: infocmp.1m,v 1.102 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -218,7 +218,7 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
        that were not needed.
 
    <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <EM>directory</EM>] [-B <EM>directory</EM>]
-       Like  other  <STRONG>ncurses</STRONG>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
+       Like  other  <EM>ncurses</EM>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
        descriptions   in  several  places.   You  can  use  the  <EM>TERMINFO</EM>  and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variables to override the compiled-in default
        list  of  places  to  search.   See <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, as well as the <EM>Fetching</EM>
@@ -259,7 +259,7 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
             according to the type and the name of the  corresponding  terminal
             entry.
 
-            Before  ncurses  5.0,  the split between the <STRONG>-e</STRONG> and <STRONG>-E</STRONG> options was
+            Before  <EM>ncurses</EM>  5.0,  the split between the <STRONG>-e</STRONG> and <STRONG>-E</STRONG> options was
             not needed; but support for extended  names  required  making  the
             arrays   of  terminal  capabilities  separate  from  the  TERMTYPE
             structure.
@@ -441,14 +441,14 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
             contents  of  two  source  files, since it excludes the inferences
             that <STRONG>infocmp</STRONG> makes to fill in missing data.
 
-       <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
+       <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
             exits.
 
        <STRONG>-v</STRONG> <EM>n</EM> prints  out  tracing  information on standard error as the program
             runs.
 
             The optional parameter <EM>n</EM> is a number  from  1  to  10,  inclusive,
-            indicating the desired level of detail of information.  If ncurses
+            indicating the desired level of detail of information.  If <EM>ncurses</EM>
             is built  without  tracing  support,  the  optional  parameter  is
             ignored.
 
@@ -494,7 +494,7 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
        (AT&amp;T) wrote the first <STRONG>infocmp</STRONG> in early 1984, for System V Release 3.
 
        Eric Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide  an
-       equivalent  <STRONG>infocmp</STRONG>  for  ncurses.   In  addition,  he  added a few new
+       equivalent  <STRONG>infocmp</STRONG>  for  <EM>ncurses</EM>.   In  addition,  he  added a few new
        features such as:
 
        <STRONG>o</STRONG>   the  <STRONG>-e</STRONG>  option,  to  support   <EM>fallback</EM>   (compiled-in)   terminal
@@ -509,9 +509,9 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
        For a complete list, see the <EM>EXTENSIONS</EM> section.
 
        In  2010,  Roy  Marples  provided an <STRONG>infocmp</STRONG> program for NetBSD.  It is
-       less capable than the SVr4 or ncurses  versions  (e.g.,  it  lacks  the
+       less capable than the SVr4 or <EM>ncurses</EM>  versions  (e.g.,  it  lacks  the
        sorting  options  documented in X/Open), but does include the <STRONG>-x</STRONG> option
-       adapted from ncurses.
+       adapted from <EM>ncurses</EM>.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-12-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index a77c9c4f1..8f507c239 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.37 2023/11/25 14:32:36 tom Exp @
+  * @Id: infotocap.1m,v 1.39 2023/12/10 14:12:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2023-12-10 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2023-12-10 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2023-12-10                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 164a4e20d..7bdce9de9 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.31 2023/11/25 14:26:30 tom Exp @
+  * @Id: key_defined.3x,v 1.32 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index 382f61c3d..ddea78d39 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.33 2023/11/25 14:26:30 tom Exp @
+  * @Id: keybound.3x,v 1.34 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 2524ae1ec..3f0f1f246 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.37 2023/11/25 14:26:30 tom Exp @
+  * @Id: keyok.3x,v 1.38 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index 36cce56ab..d81dc9947 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.23 2023/11/25 14:26:30 tom Exp @
+  * @Id: legacy_coding.3x,v 1.24 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -84,9 +84,9 @@ <H1 class="no-header">legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  routine  is specific to ncurses.  It was not supported on Version
+       This  routine  is specific to <EM>ncurses</EM>.  It was not supported on Version
        7, BSD or System V implementations.  It is recommended  that  any  code
-       depending on ncurses extensions be conditioned using NCURSES_VERSION.
+       depending on <EM>ncurses</EM> extensions be conditioned using NCURSES_VERSION.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index b7a59ed43..b3f14cee2 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.41 2023/11/25 13:59:44 tom Exp @
+  * @Id: menu.3x,v 1.42 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -202,7 +202,7 @@ <H1 class="no-header">menu 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
        It is not part of X/Open Curses.
 
-       Aside from ncurses, there are few implementations:
+       Aside from <EM>ncurses</EM>, there are few implementations:
 
        <STRONG>o</STRONG>   systems based on SVr4 source code, e.g., Solaris.
 
@@ -210,7 +210,7 @@ <H1 class="no-header">menu 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
+       Juergen Pfeifer.  Manual pages and adaptation for <EM>ncurses</EM>  by  Eric  S.
        Raymond.
 
 
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 14f0dbd58..57e115431 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.43 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_driver.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -210,7 +210,7 @@ <H1 class="no-header">menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These routines emulate the  System  V  menu  library.   They  were  not
        supported  on  Version 7 or BSD versions.  The support for mouse events
-       is ncurses specific.
+       is <EM>ncurses</EM> specific.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -223,7 +223,7 @@ <H1 class="no-header">menu_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 1b567167c..8b4d4d471 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_requestname.3x,v 1.31 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -74,7 +74,7 @@ <H1 class="no-header">menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to ncurses.  They were not supported on
+       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_requestname 3x 2023-11-25 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-11-25              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 562341537..1521ee4c6 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_spacing.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -113,7 +113,7 @@ <H1 class="no-header">menu_spacing 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 0d05e802d..5054afdce 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,21 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.185 2023/12/03 00:14:35 tom Exp @
+  * @Id: ncurses.3x,v 1.187 2023/12/17 23:44:14 tom Exp @
+  * X/Open Curses Issue 7 assumes some optimization will be done, but
+  * does not mandate it in any way.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -56,16 +58,16 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>ncurses</STRONG>  library  routines  give  the  user a terminal-independent
+       The  <EM>ncurses</EM>  library  routines  give  the  user a terminal-independent
        method of updating  character  screens  with  reasonable  optimization.
-       This  implementation  is  "new  curses"  (ncurses)  and is the approved
+       This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231202).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20231217).
 
-       The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
+       The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
        as  XSI  curses).   XSI  stands for X/Open System Interfaces Extension.
-       The <STRONG>ncurses</STRONG> library is freely redistributable in source form.
+       The <EM>ncurses</EM> library is freely redistributable in source form.
 
        <EM>ncurses</EM> man pages employ several sections to clarify matters  of  usage
        and interoperability with other <EM>curses</EM> implementations.
@@ -100,7 +102,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        directory) that describe curses  actions.   See  also  the  section  on
        <STRONG>ALTERNATE</STRONG> <STRONG>CONFIGURATIONS</STRONG>.
 
-       The   <STRONG>ncurses</STRONG>   package   supports:  overall  screen,  window  and  pad
+       The   <EM>ncurses</EM>   package   supports:  overall  screen,  window  and  pad
        manipulation; output to  windows  and  pads;  reading  terminal  input;
        control  over terminal and <STRONG>curses</STRONG> input and output options; environment
        query routines; color manipulation; use of soft  label  keys;  terminfo
@@ -142,167 +144,178 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-Datatypes">Datatypes</a></H3><PRE>
-       The  <STRONG>ncurses</STRONG>  library  permits  manipulation of data structures, called
-       <EM>windows</EM>,  which  can  be  thought  of  as  two-dimensional  arrays   of
-       characters  representing all or part of a CRT screen.  A default window
-       called <STRONG>stdscr</STRONG>, which is the size of the terminal screen,  is  supplied.
-       Others may be created with <STRONG>newwin</STRONG>.
-
-       Note  that  <STRONG>curses</STRONG>  does not handle overlapping windows, that's done by
-       the <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG> library.  This means that you can either  use  <STRONG>stdscr</STRONG>  or
-       divide  the  screen  into  tiled  windows  and not using <STRONG>stdscr</STRONG> at all.
-       Mixing the two will result in unpredictable, and undesired, effects.
-
-       Windows are referred to by variables declared as <STRONG>WINDOW</STRONG> <STRONG>*</STRONG>.  These  data
-       structures  are  manipulated with routines described here and elsewhere
-       in the <STRONG>ncurses</STRONG> manual pages.  Among those, the most basic routines  are
-       <STRONG>move</STRONG>  and  <STRONG>addch</STRONG>.  More general versions of these routines are included
-       with names beginning with <STRONG>w</STRONG>, allowing the user  to  specify  a  window.
-       The routines not beginning with <STRONG>w</STRONG> affect <STRONG>stdscr</STRONG>.
-
-       After  using  routines  to  manipulate a window, <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> is called,
-       telling <STRONG>curses</STRONG> to make the user's CRT screen  look  like  <STRONG>stdscr</STRONG>.   The
-       characters  in  a  window  are  actually of type <STRONG>chtype</STRONG>, (character and
-       attribute data) so that other information about the character may  also
-       be stored with each character.
+</PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
+       A  <EM>curses</EM>  library abstracts the terminal screen by representing all or
+       part of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular  grid
+       of  character  cells,  addressed  by row and column coordinates (<EM>y</EM>, <EM>x</EM>),
+       with the upper left corner as (0, 0).  A window called <STRONG>stdscr</STRONG>, the same
+       size  as  the terminal screen, is always available.  Create others with
+       <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
+
+       A <EM>curses</EM> library does not manage overlapping windows.   (See  <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+       if  you  desire this.)  You can either use <STRONG>stdscr</STRONG> to manage one screen-
+       filling window, or tile the screen into non-overlapping windows and not
+       use   <STRONG>stdscr</STRONG>  at  all.   Mixing  the  two  approaches  will  result  in
+       unpredictable, and undesired, effects.
+
+       Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
+       the  cell  within  it  at  which  the next output operation will occur.
+       Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
+       cursor  and  write  a  character  to  <STRONG>stdscr</STRONG>, respectively.  As a rule,
+       window-addressing functions feature names  prefixed  (or  infixed,  see
+       below) with "w"; these allow the user to specify a pointer to a <EM>WINDOW.</EM>
+       Counterparts not thus prefixed (or  infixed)  affect  <STRONG>stdscr</STRONG>.   Because
+       moving  the  cursor  prior  to  another  operation is so common, <EM>curses</EM>
+       generally also provides functions with a "mv" prefix as a  convenience.
+       Thus,  the library defines all of <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG>, and <STRONG>mvwaddch</STRONG>.
+       When both prefixes are present, the order  of  arguments  is  a  <EM>WINDOW</EM>
+       pointer first, then a <EM>y</EM> and <EM>x</EM> coordinate pair.
+
+       Updating   the  terminal  screen  with  every  <EM>curses</EM>  call  can  cause
+       unpleasant flicker or inefficient use of the communications channel  to
+       the  device.   Therefore,  after using <EM>curses</EM> functions to accumulate a
+       set of desired updates  that  make  sense  to  present  together,  call
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to  tell  the  library to make the user's screen look like
+       <STRONG>stdscr</STRONG>.  <EM>ncurses</EM> <EM>optimizes</EM> its output by computing a minimal number  of
+       operations  to mutate the screen from its state at the previous refresh
+       to the new one.  Effective optimization  demands  accurate  information
+       about  the  terminal  device: the management of such information is the
+       province of the <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG> API, a feature of  every  standard  <EM>curses</EM>
+       implementation.
 
        Special windows called <EM>pads</EM> may also be manipulated.  These are windows
-       which are not constrained to the size of the screen and whose  contents
-       need   not   be   completely  displayed.   See  <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>  for  more
-       information.
-
-       In addition to drawing characters on the screen, video  attributes  and
-       colors  may  be  supported,  causing  the characters to show up in such
-       modes as underlined, in reverse video, or in color  on  terminals  that
-       support  such  display  enhancements.   Line  drawing characters may be
-       specified to be output.  On input, <STRONG>curses</STRONG> is  also  able  to  translate
-       arrow  and  function  keys  that  transmit escape sequences into single
-       values.  The video  attributes,  line  drawing  characters,  and  input
-       values  use names, defined in <STRONG>&lt;curses.h&gt;</STRONG>, such as <STRONG>A_REVERSE</STRONG>, <STRONG>ACS_HLINE</STRONG>,
-       and <STRONG>KEY_LEFT</STRONG>.
-
-
-</PRE><H3><a name="h3-Environment-variables">Environment variables</a></H3><PRE>
-       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
-       program   is  executing  in  a  window  environment,  line  and  column
-       information in  the  environment  will  override  information  read  by
-       <EM>terminfo</EM>.   This  would  affect a program running in an AT&amp;T 630 layer,
-       for  example,  where  the  size  of  a  screen   is   changeable   (see
-       <STRONG>ENVIRONMENT</STRONG>).
-
-       If  the  environment  variable  <EM>TERMINFO</EM>  is defined, any program using
-       <STRONG>curses</STRONG> checks for a local terminal definition before  checking  in  the
-       standard  place.   For  example,  if  <EM>TERM</EM>  is set to <STRONG>att4424</STRONG>, then the
-       compiled terminal definition is found in
-
-           <STRONG>/usr/share/terminfo/a/att4424</STRONG>.
-
-       (The <STRONG>a</STRONG> is copied from the first letter of <STRONG>att4424</STRONG> to avoid creation  of
-       huge  directories.)   However,  if  <EM>TERMINFO</EM>  is  set to <STRONG>$HOME/myterms</STRONG>,
-       <STRONG>curses</STRONG> first checks
-
-           <STRONG>$HOME/myterms/a/att4424</STRONG>,
-
-       and if that fails, it then checks
-
-           <STRONG>/usr/share/terminfo/a/att4424</STRONG>.
-
-       This is useful for developing experimental definitions  or  when  write
-       permission in <STRONG>/usr/share/terminfo</STRONG> is not available.
-
-       The integer variables <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG> are defined in <STRONG>&lt;curses.h&gt;</STRONG> and will
-       be filled in by <STRONG>initscr</STRONG> with the size of  the  screen.   The  constants
-       <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG> have the values <STRONG>1</STRONG> and <STRONG>0</STRONG>, respectively.
-
-       The  <STRONG>curses</STRONG>  routines also define the <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> variable <STRONG>curscr</STRONG> which is
-       used for certain low-level operations like  clearing  and  redrawing  a
-       screen  containing  garbage.   The  <STRONG>curscr</STRONG>  can  be  used in only a few
-       routines.
-
-
-</PRE><H3><a name="h3-Routine-and-Argument-Names">Routine and Argument Names</a></H3><PRE>
-       Many <STRONG>curses</STRONG> routines have two or more versions.  The routines  prefixed
-       with <EM>w</EM> require a window argument.  The routines prefixed with <EM>p</EM> require
-       a pad argument.  Those without a prefix generally use <STRONG>stdscr</STRONG>.
-
-       The routines prefixed with <STRONG>mv</STRONG> require a <EM>y</EM> and <EM>x</EM> coordinate to  move  to
-       before performing the appropriate action.  The <STRONG>mv</STRONG> routines imply a call
-       to <STRONG>move</STRONG> before the call to the other routine.  The coordinate <EM>y</EM>  always
-       refers  to  the row (of the window), and <EM>x</EM> always refers to the column.
-       The upper left-hand corner is always (0,0), not (1,1).
-
-       The routines prefixed with <STRONG>mvw</STRONG> take both a window argument and <EM>x</EM> and  <EM>y</EM>
-       coordinates.   The  window  argument  is  always  specified  before the
-       coordinates.
-
-       In each case, <EM>win</EM> is the window affected, and <EM>pad</EM> is the pad  affected;
-       <EM>win</EM> and <EM>pad</EM> are always pointers to type <STRONG>WINDOW</STRONG>.
-
-       Option  setting  routines require a Boolean flag <EM>bf</EM> with the value <STRONG>TRUE</STRONG>
-       or <STRONG>FALSE</STRONG>; <EM>bf</EM> is always of type <STRONG>bool</STRONG>.  Most of the data  types  used  in
-       the  library  routines,  such  as  <STRONG>WINDOW</STRONG>, <STRONG>SCREEN</STRONG>, <STRONG>bool</STRONG>, and <STRONG>chtype</STRONG> are
-       defined in <STRONG>&lt;curses.h&gt;</STRONG>.  Types used for the terminfo  routines  such  as
-       <STRONG>TERMINAL</STRONG> are defined in <STRONG>&lt;term.h&gt;</STRONG>.
-
-       This   manual   page  describes  functions  which  may  appear  in  any
-       configuration of the library.  There are two common  configurations  of
-       the library:
-
-          <EM>ncurses</EM>
-               the  "normal"  library,  which  handles  8-bit characters.  The
-               normal  (8-bit)  library  stores   characters   combined   with
-               attributes in <STRONG>chtype</STRONG> data.
-
-               Attributes  alone (no corresponding character) may be stored in
-               <STRONG>chtype</STRONG> or the equivalent <STRONG>attr_t</STRONG> data.  In either case, the data
-               is stored in something like an integer.
-
-               Each cell (row and column) in a <STRONG>WINDOW</STRONG> is stored as a <STRONG>chtype</STRONG>.
-
-          <EM>ncursesw</EM>
-               the   so-called   "wide"   library,   which  handles  multibyte
-               characters (see the section on <STRONG>ALTERNATE</STRONG> <STRONG>CONFIGURATIONS</STRONG>).   The
-               "wide"  library  includes  all  of  the calls from the "normal"
-               library.  It adds about one third more calls using  data  types
-               which store multibyte characters:
-
-               <STRONG>cchar_t</STRONG>
-                    corresponds to <STRONG>chtype</STRONG>.  However it is a structure, because
-                    more data is stored than can fit  into  an  integer.   The
-                    characters  are  large  enough  to  require a full integer
-                    value - and there may be more than one character per cell.
-                    The  video  attributes  and  color  are stored in separate
-                    fields of the structure.
-
-                    Each cell (row and column) in a  <STRONG>WINDOW</STRONG>  is  stored  as  a
-                    <STRONG>cchar_t</STRONG>.
-
-                    The  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store and
-                    retrieve the data from a <STRONG>cchar_t</STRONG> structure.
-
-               <STRONG>wchar_t</STRONG>
-                    stores a "wide" character.  Like <STRONG>chtype</STRONG>, this  may  be  an
-                    integer.
-
-               <STRONG>wint_t</STRONG>
-                    stores  a  <STRONG>wchar_t</STRONG> or <STRONG>WEOF</STRONG> - not the same, though both may
-                    have the same size.
-
-               The "wide" library provides new functions which  are  analogous
-               to  functions  in  the  "normal"  library.   There  is a naming
-               convention which relates many of the  normal/wide  variants:  a
-               "_w"  is  inserted  into the name.  For example, <STRONG>waddch</STRONG> becomes
-               <STRONG>wadd_wch</STRONG>.
-
-
-</PRE><H3><a name="h3-Routine-Name-Index">Routine Name Index</a></H3><PRE>
-       The following table lists the <STRONG>curses</STRONG> routines provided in the  "normal"
-       and  "wide"  libraries  and the names of the manual pages on which they
-       are described.  Routines flagged with  "*"  are  ncurses-specific,  not
-       described by XPG4 or present in SVr4.
-
-                    <STRONG>curses</STRONG> Routine Name      Manual Page Name
+       that are not constrained to the size of the terminal screen  and  whose
+       contents need not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
+
+       In  addition  to drawing characters on the screen, rendering attributes
+       and colors may be supported, causing the characters to show up in  such
+       modes  as  underlined,  in reverse video, or in color on terminals that
+       support such display enhancements.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
+
+       <EM>curses</EM> predefines symbols for a small set of line graphics  characters,
+       corresponding  to  the  VT100  line  drawing  set.   See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and
+       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+
+       <EM>curses</EM> is implemented using the  operating  system's  terminal  driver;
+       keystroke  events are not received as scan codes but as byte sequences.
+       Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
+       appear  as-is.   Everything  else,  including  the  tab,  enter/return,
+       keypad, arrow, and function keys, appears as a control character  or  a
+       multibyte  <EM>escape</EM>  <EM>sequence.</EM>   <EM>curses</EM>  translates these into unique <EM>key</EM>
+       <EM>codes.</EM>  See <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+
+
+</PRE><H3><a name="h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></H3><PRE>
+       The selection of an approprate value of <EM>TERM</EM> in the process environment
+       is essential to correct <EM>curses</EM> and <EM>terminfo</EM> library operation.  A well-
+       configured system selects a correct <EM>TERM</EM> value  automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+       may assist with troubleshooting exotic situations.
+
+       If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
+       <EM>curses</EM> program is executing in a graphical windowing  environment,  the
+       information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
+       <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
+
+       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
+       checks  first  for  a  terminal  type  description  in  the location it
+       identifies.   <EM>TERMINFO</EM>  is  useful  for  developing  experimental  type
+       descriptions  or  when  write  permission to <EM>/usr/share/terminfo</EM> is not
+       available.
+
+       See section "ENVIRONMENT" below.
+
+
+</PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
+       Many <EM>curses</EM> functions have two or more versions.  Those  prefixed  with
+       "w"  require  a  window  argument.   Four  functions  prefixed with "p"
+       require a pad argument.  Those without a prefix  generally  operate  on
+       <STRONG>stdscr</STRONG>.
+
+       In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
+       parameters.
+
+                        <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
+                        <EM>win</EM>   pointer to <EM>WINDOW</EM>
+                        <EM>pad</EM>   pointer to <EM>WINDOW</EM> that is a pad
+
+
+</PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
+       This manual page describes functions that appear in  any  configuration
+       of  the  library.   There  are  two  common configurations; see section
+       "ALTERNATE CONFIGURATIONS" below.
+
+       <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
+                 eight-bit  characters.   It  stores a character combined with
+                 attributes in a <EM>chtype</EM> datum.
+
+                 Attributes alone (with no  corresponding  character)  can  be
+                 stored  in  variables  of  <EM>chtype</EM>  or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> type.  In either
+                 case, they are represented as an integral bit mask.
+
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype.</EM>
+
+       <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
+                 character encodings requiring a larger data type than <EM>char</EM> (a
+                 byte-sized type) can represent.  It adds about one third more
+                 calls  using  additional  data  types  that  can  store  such
+                 <EM>multibyte</EM> characters.
+
+                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype.</EM>
+                          It  always  a structure type, because it stores more
+                          data than can fit into an integer.  A character code
+                          may be larger than can fit in a C <EM>char,</EM> and moreover
+                          more than one character may occupy a cell  (as  with
+                          accent  marks and other diacritics).  Each character
+                          is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM> a complex character contains one
+                          spacing  character  and  zero  or  more  non-spacing
+                          characters (see below).  Attributes and  color  data
+                          are  stored in separate fields of the structure, not
+                          combined as in <EM>chtype.</EM>
+
+                          Each cell (row and column) <EM>WINDOW</EM>  is  stored  as  a
+                          <EM>cchar</EM><STRONG>_</STRONG><EM>t.</EM>
+
+                 The   <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>   and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store  and
+                 retrieve the data from a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure.  The wide library
+                 API  of <EM>ncurses</EM> depends on two data types standardized by ISO
+                 C95.
+
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype,</EM> this  may  be
+                          an  integer.  Depending on the character encoding, a
+                          wide character  may  be  <EM>spacing,</EM>  meaning  that  it
+                          occupies  a  character  cell by itself and typically
+                          accompanies  cursor   advancement   on   input,   or
+                          <EM>combining,</EM> meaning that it occupies the same cell as
+                          a  spacing  character,  is  often  regarded   as   a
+                          "modifier" of the base glyph with which it combines,
+                          and typically does not advance the cursor on input.
+
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
+                          analogously  to the <EM>int</EM>-sized character manipulation
+                          functions of ISO C and their constant <STRONG>EOF</STRONG>.
+
+                 The  wide  library   provides   additional   functions   that
+                 complement  those  in  the non-wide library where the size of
+                 the underlying character type  is  significant.   A  somewhat
+                 regular  naming  convention relates many of the wide variants
+                 to their non-wide counterparts;  where  a  non-wide  function
+                 name  contains  "ch"  or "str", prefix it with "_w" to obtain
+                 the wide counterpart.  For example, <STRONG>waddch</STRONG> becomes <STRONG>wadd_wch</STRONG>.
+
+                 This convention is inapplicable  to  some  non-wide  function
+                 names,  so  other  transformations  are  used  for  the  wide
+                 configuration: in the window background management functions,
+                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+                 -clearing functions are suffixed with "_set".
+
+
+</PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
+       The following table lists the <EM>curses</EM> functions provided in the non-wide
+       and  wide  APIs  and  the  corresponding  man pages that describe them.
+       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
+       X/Open Curses nor present in SVr4.
+
+                    <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     PAIR_NUMBER              <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -313,7 +326,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     addchnstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     addchstr                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     addnstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
-
                     addnwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     addstr                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     addwstr                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
@@ -370,6 +382,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
                     exit_terminfo            <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
+
                     extended_color_content   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_pair_content    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_slk_color       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
@@ -379,7 +392,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     flushinp                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     free_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
                     get_wch                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
-
                     get_wstr                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     getattrs                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     getbegx                  <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>*
@@ -436,6 +448,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insnstr                  <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     insstr                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+
                     instr                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     intrflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     inwstr                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
@@ -445,7 +458,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     is_idcok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_idlok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_immedok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
-
                     is_keypad                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_leaveok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_linetouched           <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
@@ -502,6 +514,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvin_wchstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvinch                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+
                     mvinchnstr               <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinchstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinnstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
@@ -511,7 +524,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvinsch                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvinsnstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
-
                     mvinsstr                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvinwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
@@ -568,6 +580,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     nofilter                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     nonl                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noqiflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -577,7 +590,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     overwrite                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
-
                     pechochar                <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pnoutrefresh             <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     prefresh                 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
@@ -634,6 +646,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     subpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     subwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     syncok                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     term_attrs               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termattrs                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termname                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
@@ -643,7 +656,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     tgetstr                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgoto                    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tigetflag                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-
                     tigetnum                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -700,6 +712,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     wbkgrndset               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wborder                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wborder_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+
                     wchgat                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wclear                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
                     wclrtobot                <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -709,7 +722,6 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                     wdelch                   <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     wdeleteln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     wecho_wchar              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
-
                     wechochar                <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     wenclose                 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
                     werase                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -789,18 +801,18 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        (i.e., these should not be used as the right-hand  side  of  assignment
        statements).
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the  window  pointer  is  null.   Most  "mv"-prefixed functions (except
-       variadic functions such as <STRONG>mvprintw</STRONG>) are provided both  as  macros  and
-       functions.
+       Functions  with a "mv" prefix first perform cursor movement using <STRONG>wmove</STRONG>
+       and return an error if the position is  outside  the  window,  or  (for
+       "mvw"  functions)  if  the  <EM>WINDOW</EM> pointer is null.  Most "mv"-prefixed
+       functions (except variadic functions such  as  <STRONG>mvprintw</STRONG>)  are  provided
+       both as macros and functions.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
        The  following  environment  symbols  are  useful  for  customizing the
-       runtime behavior of the <STRONG>ncurses</STRONG> library.  The most important ones  have
+       runtime behavior of the <EM>ncurses</EM> library.  The most important ones  have
        been already discussed in detail.
 
 
@@ -810,14 +822,14 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        variable.  Very few terminfo entries provide this feature.
 
        Because this name is also used in development environments to represent
-       the C compiler's name, <STRONG>ncurses</STRONG> ignores it if it does not happen to be a
+       the C compiler's name, <EM>ncurses</EM> ignores it if it does not happen to be a
        single character.
 
 
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
        The  debugging  library  checks  this  environment  variable  when  the
        application has redirected output to a file.   The  variable's  numeric
-       value  is  used  for  the baudrate.  If no value is found, <STRONG>ncurses</STRONG> uses
+       value  is  used  for  the baudrate.  If no value is found, <EM>ncurses</EM> uses
        9600.  This allows testers to construct repeatable test-cases that take
        into account costs that depend on baudrate.
 
@@ -826,7 +838,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        Specify the width of the screen in characters.  Applications running in
        a windowing environment usually are able to obtain  the  width  of  the
        window  in  which they are executing.  If neither the <EM>COLUMNS</EM> value nor
-       the terminal's screen size is available, <STRONG>ncurses</STRONG> uses  the  size  which
+       the terminal's screen size is available, <EM>ncurses</EM> uses  the  size  which
        may be specified in the terminfo database (i.e., the <STRONG>cols</STRONG> capability).
 
        It  is  important  that  your  application  use  a correct size for the
@@ -849,7 +861,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       Specifies the total time, in milliseconds, for which ncurses will await
+       Specifies the total time, in milliseconds, for which <EM>ncurses</EM> will await
        a character sequence, e.g., a function key.  The  default  value,  1000
        milliseconds,  is enough for most uses.  However, it is made a variable
        to accommodate unusual applications.
@@ -874,7 +886,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       Tells <STRONG>ncurses</STRONG> where your home directory is.  That is where it may  read
+       Tells <EM>ncurses</EM> where your home directory is.  That is where it may  read
        and write auxiliary terminal descriptions:
 
            $HOME/.termcap
@@ -897,7 +909,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
        This variable lets you customize the mouse.  The variable must be three
        numeric  digits  1-3  in  any  order,  e.g.,  123 or 321.  If it is not
-       specified, <STRONG>ncurses</STRONG> uses 132.
+       specified, <EM>ncurses</EM> uses 132.
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
@@ -905,13 +917,13 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        are   white-on-black   (see   <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You  may  set  the
        foreground and background color values with this  environment  variable
        by  proving  a  2-element list: foreground,background.  For example, to
-       tell ncurses to not assume anything  about  the  colors,  set  this  to
+       tell <EM>ncurses</EM> to not assume anything  about  the  colors,  set  this  to
        "-1,-1".   To  make  it  green-on-black, set it to "2,0".  Any positive
        value from zero to the terminfo <STRONG>max_colors</STRONG> value is allowed.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       This applies only to the MinGW port of ncurses.
+       This applies only to the MinGW port of <EM>ncurses</EM>.
 
        The <STRONG>Console2</STRONG> program's handling  of  the  Microsoft  Console  API  call
        <STRONG>CreateConsoleScreenBuffer</STRONG>  is  defective.   Applications which use this
@@ -922,29 +934,29 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       This applies only to ncurses configured to use the GPM interface.
+       This applies only to <EM>ncurses</EM> configured to use the GPM interface.
 
        If  present, the environment variable is a list of one or more terminal
        names against which the <EM>TERM</EM> environment variable is matched.   Setting
        it  to  an  empty  value disables the GPM interface; using the built-in
        support for xterm, etc.
 
-       If the environment variable is absent, ncurses will attempt to open GPM
+       If the environment variable is absent, <EM>ncurses</EM> will attempt to open GPM
        if <EM>TERM</EM> contains "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <STRONG>Ncurses</STRONG>  may  use tabs as part of the cursor movement optimization.  In
-       some cases, your terminal driver may not handle  these  properly.   Set
-       this  environment variable to disable the feature.  You can also adjust
-       your <STRONG>stty(1)</STRONG> settings to avoid the problem.
+       <EM>ncurses</EM>  may use tabs as part of cursor movement optimization.  In some
+       cases, your terminal driver may not handle these  properly.   Set  this
+       environment variable to any value to disable the feature.  You can also
+       adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
        Some terminals  use  a  magic-cookie  feature  which  requires  special
        handling  to  make  highlighting  and  other  video  attributes display
        properly.   You  can  suppress  the  highlighting  entirely  for  these
-       terminals by setting this environment variable.
+       terminals by setting this environment variable to any value.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
@@ -977,43 +989,43 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   continued though 5.9 patch 20130126
 
-       <STRONG>ncurses</STRONG> enabled buffered output during terminal  initialization.   This
+       <EM>ncurses</EM> enabled buffered output during terminal  initialization.   This
        was  done  (as  in  SVr4  curses) for performance reasons.  For testing
-       purposes, both of <STRONG>ncurses</STRONG> and certain applications,  this  feature  was
+       purposes, both of <EM>ncurses</EM> and certain applications,  this  feature  was
        made  optional.  Setting the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>SETBUF</EM> variable disabled output
        buffering, leaving the output in the original (usually  line  buffered)
        mode.
 
-       In  the  current implementation, ncurses performs its own buffering and
+       In  the  current implementation, <EM>ncurses</EM> performs its own buffering and
        does not require this workaround.  It does not modify the buffering  of
        the standard output.
 
        The  reason  for the change was to make the behavior for interrupts and
        other  signals   more   robust.    One   drawback   is   that   certain
-       nonconventional  programs  would  mix ordinary stdio calls with ncurses
-       calls and (usually) work.  This is no longer possible since ncurses  is
+       nonconventional  programs  would  mix ordinary stdio calls with <EM>ncurses</EM>
+       calls and (usually) work.  This is no longer possible since <EM>ncurses</EM>  is
        not  using the buffered standard output but its own output (to the same
        file descriptor).  As a special case, the low-level calls such as  <STRONG>putp</STRONG>
        still use the standard output.  But high-level curses calls do not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       During  initialization,  the  <STRONG>ncurses</STRONG>  library checks for special cases
+       During  initialization,  the  <EM>ncurses</EM>  library checks for special cases
        where VT100 line-drawing (and the corresponding alternate character set
        capabilities)  described  in  the  terminfo  are  known  to be missing.
        Specifically, when  running  in  a  UTF-8  locale,  the  Linux  console
-       emulator  and  the GNU screen program ignore these.  Ncurses checks the
-       <EM>TERM</EM> environment variable for these.   For  other  special  cases,  you
-       should  set this environment variable.  Doing this tells ncurses to use
-       Unicode values which correspond to the VT100 line-drawing glyphs.  That
-       works  for  the special cases cited, and is likely to work for terminal
-       emulators.
+       emulator  and  the GNU screen program ignore these.  <EM>ncurses</EM> <EM>checks</EM> <EM>the</EM>
+       <EM>TERM</EM> <EM>environment</EM> <EM>variable</EM> <EM>for</EM> <EM>these.</EM>   <EM>For</EM>  <EM>other</EM>  <EM>special</EM>  <EM>cases,</EM>  <EM>you</EM>
+       <EM>should</EM>  <EM>set</EM> <EM>this</EM> <EM>environment</EM> <EM>variable.</EM>  <EM>Doing</EM> <EM>this</EM> <EM>tells</EM> <EM>ncurses</EM> <EM>to</EM> <EM>use</EM>
+       <EM>Unicode</EM> <EM>values</EM> <EM>which</EM> <EM>correspond</EM> <EM>to</EM> <EM>the</EM> <EM>VT100</EM> <EM>line-drawing</EM> <EM>glyphs.</EM>  <EM>That</EM>
+       <EM>works</EM>  <EM>for</EM>  <EM>the</EM> <EM>special</EM> <EM>cases</EM> <EM>cited,</EM> <EM>and</EM> <EM>is</EM> <EM>likely</EM> <EM>to</EM> <EM>work</EM> <EM>for</EM> <EM>terminal</EM>
+       <EM>emulators.</EM>
 
        When setting this variable, you should  set  it  to  a  nonzero  value.
        Setting  it  to zero (or to a nonnumber) disables the special check for
        "linux" and "screen".
 
-       As an alternative to the environment variable, ncurses  checks  for  an
+       As an alternative to the environment variable, <EM>ncurses</EM>  checks  for  an
        extended  terminfo  capability  <STRONG>U8</STRONG>.  This is a numeric capability which
        can be compiled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>.  For example
 
@@ -1027,13 +1039,13 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                   U8#1, use=xterm,
 
        The name "U8" is chosen to be two characters, to permit it to  be  used
-       by applications that use ncurses' termcap interface.
+       by applications that use <EM>ncurses</EM>' termcap interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       During   initialization,  the  <STRONG>ncurses</STRONG>  debugging  library  checks  the
+       During   initialization,  the  <EM>ncurses</EM>  debugging  library  checks  the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable.  If it is  defined,  to  a  numeric
-       value,  <STRONG>ncurses</STRONG>  calls  the  <STRONG>trace</STRONG>  function,  using  that value as the
+       value,  <EM>ncurses</EM>  calls  the  <STRONG>trace</STRONG>  function,  using  that value as the
        argument.
 
        The argument values, which are defined  in  <STRONG>curses.h</STRONG>,  provide  several
@@ -1062,19 +1074,19 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
-       If the <STRONG>ncurses</STRONG>  library  has  been  configured  with  <EM>termcap</EM>  support,
-       <STRONG>ncurses</STRONG>  will  check for a terminal's description in termcap form if it
+       If the <EM>ncurses</EM>  library  has  been  configured  with  <EM>termcap</EM>  support,
+       <EM>ncurses</EM>  will  check for a terminal's description in termcap form if it
        is not available in the terminfo database.
 
        The <EM>TERMCAP</EM> environment variable contains either a terminal description
        (with  newlines  stripped  out),  or  a  file  name  telling  where the
        information denoted by the <EM>TERM</EM> environment variable exists.  In either
-       case,  setting  it  directs  <STRONG>ncurses</STRONG> to ignore the usual place for this
+       case,  setting  it  directs  <EM>ncurses</EM> to ignore the usual place for this
        information, e.g., /etc/termcap.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <STRONG>ncurses</STRONG> can be configured to read  from  multiple  terminal  databases.
+       <EM>ncurses</EM> can be configured to read  from  multiple  terminal  databases.
        The  <EM>TERMINFO</EM>  variable overrides the location for the default terminal
        database.  Terminal descriptions (in terminal  format)  are  stored  in
        terminal databases:
@@ -1086,7 +1098,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            and  the  <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications on those
            systems to override the default location of the terminal database.
 
-       <STRONG>o</STRONG>   If <STRONG>ncurses</STRONG> is built to use hashed databases,  then  each  entry  in
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built to use hashed databases,  then  each  entry  in
            this list may be the path of a hashed database file, e.g.,
 
                /usr/share/terminfo.db
@@ -1100,11 +1112,11 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            existence  of  the  directory tree, reading it directly rather than
            using the terminfo library calls.
 
-       <STRONG>o</STRONG>   If <STRONG>ncurses</STRONG> is built  with  a  support  for  reading  termcap  files
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  with  a  support  for  reading  termcap  files
            directly,  then  an entry in this list may be the path of a termcap
            file.
 
-       <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <STRONG>ncurses</STRONG> uses
+       <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <EM>ncurses</EM> uses
            the  remainder of that variable as a compiled terminal description.
            You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
 
@@ -1118,7 +1130,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        of the default  terminal  database.   The  complete  list  of  database
        locations in order follows:
 
-          <STRONG>o</STRONG>   the  last  terminal  database to which <STRONG>ncurses</STRONG> wrote, if any, is
+          <STRONG>o</STRONG>   the  last  terminal  database to which <EM>ncurses</EM> wrote, if any, is
               searched first
 
           <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
@@ -1128,7 +1140,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
           <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
 
           <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
-              into the ncurses library, i.e.,
+              into the <EM>ncurses</EM> library, i.e.,
 
              <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
                  variable)
@@ -1143,15 +1155,15 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
        There  is  no  corresponding  feature  in  System  V terminfo; it is an
-       extension developed for <STRONG>ncurses</STRONG>.
+       extension developed for <EM>ncurses</EM>.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
-       If <EM>TERMCAP</EM> does not hold a file name then <STRONG>ncurses</STRONG> checks  the  <EM>TERMPATH</EM>
+       If <EM>TERMCAP</EM> does not hold a file name then <EM>ncurses</EM> checks  the  <EM>TERMPATH</EM>
        environment  variable.  This is a list of filenames separated by spaces
        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       If the <EM>TERMPATH</EM> environment variable is not set, <STRONG>ncurses</STRONG> looks  in  the
+       If the <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks  in  the
        files
 
            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
@@ -1167,17 +1179,17 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
        Several   different  configurations  are  possible,  depending  on  the
-       configure script options used when building <STRONG>ncurses</STRONG>.  There are  a  few
+       configure script options used when building <EM>ncurses</EM>.  There are  a  few
        main  options  whose  effects are visible to the applications developer
-       using <STRONG>ncurses</STRONG>:
+       using <EM>ncurses</EM>:
 
        --disable-overwrite
-            The standard include for <STRONG>ncurses</STRONG> is as noted in <STRONG>SYNOPSIS</STRONG>:
+            The standard include for <EM>ncurses</EM> is as noted in <STRONG>SYNOPSIS</STRONG>:
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This option is used to avoid filename conflicts  when  <STRONG>ncurses</STRONG>  is
-            not the main implementation of curses of the computer.  If <STRONG>ncurses</STRONG>
+            This option is used to avoid filename conflicts  when  <EM>ncurses</EM>  is
+            not the main implementation of curses of the computer.  If <EM>ncurses</EM>
             is installed  disabling  overwrite,  it  puts  its  headers  in  a
             subdirectory, e.g.,
 
@@ -1219,10 +1231,10 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
                 than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The <STRONG>curses.h</STRONG>  file  which  is  installed  for  the  wide-character
-            library  is  designed  to  be compatible with the normal library's
-            header.  Only the size of the <STRONG>WINDOW</STRONG> structure differs,  and  very
-            few applications require more than a pointer to <STRONG>WINDOW</STRONG>s.
+            The <EM>curses.h</EM> header file installed for the wide-character  library
+            is  designed  to be compatible with the non-wide library's header.
+            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
+            require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
             character library's headers should be  installed  last,  to  allow
@@ -1291,7 +1303,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If standard output from a <STRONG>ncurses</STRONG> program is re-directed  to  something
+       If standard output from a <EM>ncurses</EM> program is re-directed  to  something
        which  is not a tty, screen updates will be directed to standard error.
        This was an undocumented feature of AT&amp;T System V Release 3 curses.
 
@@ -1300,28 +1312,28 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  <STRONG>ncurses</STRONG> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
+       The  <EM>ncurses</EM> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
        falls back to the old-style /etc/termcap file  if  the  terminal  setup
        code  cannot  find a terminfo entry corresponding to <EM>TERM</EM>.  Use of this
        feature is not  recommended,  as  it  essentially  includes  an  entire
-       termcap  compiler  in  the <STRONG>ncurses</STRONG> startup code, at significant cost in
+       termcap  compiler  in  the <EM>ncurses</EM> startup code, at significant cost in
        core and startup cycles.
 
-       The <STRONG>ncurses</STRONG> library includes facilities for capturing mouse  events  on
+       The <EM>ncurses</EM> library includes facilities for capturing mouse  events  on
        certain  terminals  (including  xterm).   See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual
        page for details.
 
-       The <STRONG>ncurses</STRONG>  library  includes  facilities  for  responding  to  window
+       The <EM>ncurses</EM>  library  includes  facilities  for  responding  to  window
        resizing   events,   e.g.,   when   running   in  an  xterm.   See  the
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In  addition,
        the library may be configured with a <STRONG>SIGWINCH</STRONG> handler.
 
-       The  <STRONG>ncurses</STRONG> library extends the fixed set of function key capabilities
+       The  <EM>ncurses</EM> library extends the fixed set of function key capabilities
        of terminals by allowing the application designer to define  additional
        key  sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and
        <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> manual pages for details.
 
-       The <STRONG>ncurses</STRONG> library can exploit the  capabilities  of  terminals  which
+       The <EM>ncurses</EM> library can exploit the  capabilities  of  terminals  which
        implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
        application to reset  the  terminal  to  its  original  foreground  and
        background  colors.   From  the  users' perspective, the application is
@@ -1329,18 +1341,18 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        independently,  providing better control over color contrasts.  See the
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
 
-       The <STRONG>ncurses</STRONG> library  includes  a  function  for  directing  application
+       The <EM>ncurses</EM> library  includes  a  function  for  directing  application
        output  to  a  printer  attached  to  the  terminal  device.   See  the
        <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <STRONG>ncurses</STRONG> library is intended to be BASE-level  conformant  with  XSI
+       The <EM>ncurses</EM> library is intended to be BASE-level  conformant  with  XSI
        Curses.    The  EXTENDED  XSI  Curses  functionality  (including  color
        support) is supported.
 
        A small number of local differences (that  is,  individual  differences
-       between  the XSI Curses and <STRONG>ncurses</STRONG> calls) are described in <STRONG>PORTABILITY</STRONG>
+       between  the XSI Curses and <EM>ncurses</EM> calls) are described in <STRONG>PORTABILITY</STRONG>
        sections of the library man pages.
 
 
@@ -1358,7 +1370,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Extensions-versus-portability">Extensions versus portability</a></H3><PRE>
-       Most  of the extensions provided by ncurses have not been standardized.
+       Most  of the extensions provided by <EM>ncurses</EM> have not been standardized.
        Some  have  been  incorporated  into  other  implementations,  such  as
        PDCurses or NetBSD curses.  Here are a few to consider:
 
@@ -1416,7 +1428,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            &lt;stdio.h&gt;.
 
            BSD curses included &lt;curses.h&gt;  and  &lt;unctrl.h&gt;  from  an  internal
-           header "curses.ext" ("ext" was a short name for <EM>externs</EM>).
+           header file <EM>curses.ext</EM> ("ext" abbreviated "externs").
 
            BSD  curses  used  &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG> and <STRONG>scanw</STRONG>), but
            nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
@@ -1437,16 +1449,16 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   X/Open  Curses  is  inconsistent  with  respect  to  SVr4 regarding
            &lt;unctrl.h&gt;.
 
-           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  ncurses  includes  &lt;unctrl.h&gt;   from
+           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <EM>ncurses</EM>  includes  &lt;unctrl.h&gt;   from
            &lt;curses.h&gt; (like SVr4).
 
        <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
            and AIX:
 
            HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
-           in curses.h, but ncurses (and Solaris curses) do not.
+           in curses.h, but <EM>ncurses</EM> (and Solaris curses) do not.
 
-           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, ncurses (and
+           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, <EM>ncurses</EM> (and
            Solaris curses) do not.
 
        <STRONG>o</STRONG>   X/Open says that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there  is  no
@@ -1457,8 +1469,8 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            old  versions  of  AIX  curses required including &lt;curses.h&gt; before
            including &lt;term.h&gt;.
 
-           Because ncurses header files include the headers needed  to  define
-           datatypes used in the headers, ncurses header files can be included
+           Because <EM>ncurses</EM> header files include the headers needed  to  define
+           datatypes used in the headers, <EM>ncurses</EM> header files can be included
            in any order.  But for portability, you should  include  &lt;curses.h&gt;
            before &lt;term.h&gt;.
 
@@ -1466,8 +1478,8 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
            file does not necessarily make all symbols in it visible (there are
            ifdef's to consider).
 
-           For  instance,  in  ncurses &lt;wchar.h&gt; <EM>may</EM> be included if the proper
-           symbol is defined, and if ncurses is configured for  wide-character
+           For  instance,  in  <EM>ncurses</EM> &lt;wchar.h&gt; <EM>may</EM> be included if the proper
+           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
            support.   If  the  header  is  included,  its  symbols may be made
            visible.  That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG>  feature
            test macro.
@@ -1488,7 +1500,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
            None of the X/Open Curses implementations require an application to
            include &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either  have
-           allowed  for  a  special type, or (like ncurses) include &lt;stdarg.h&gt;
+           allowed  for  a  special type, or (like <EM>ncurses</EM>) include &lt;stdarg.h&gt;
            directly to provide a portable interface.
 
 
@@ -1502,7 +1514,7 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-12-17                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1511,10 +1523,11 @@ <H1 class="no-header">ncurses 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Initialization">Initialization</a></li>
-<li><a href="#h3-Datatypes">Datatypes</a></li>
-<li><a href="#h3-Environment-variables">Environment variables</a></li>
-<li><a href="#h3-Routine-and-Argument-Names">Routine and Argument Names</a></li>
-<li><a href="#h3-Routine-Name-Index">Routine Name Index</a></li>
+<li><a href="#h3-Overview">Overview</a></li>
+<li><a href="#h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></li>
+<li><a href="#h3-Naming-Conventions">Naming Conventions</a></li>
+<li><a href="#h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></li>
+<li><a href="#h3-Function-Name-Index">Function Name Index</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index 749c3f215..101b95ac1 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.19 2023/12/02 21:37:31 tom Exp @
+  * @Id: MKncu_config.in,v 1.20 2023/12/16 21:43:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -110,7 +110,7 @@ <H1 class="no-header">ncursesw6-config 1 2023-12-02 ncurses 6.4 User commands</H
 
 
 
-ncurses 6.4                       2023-12-02               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2023-12-16               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 2f13ede8e..f1c708442 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.43 2023/11/25 14:26:30 tom Exp @
+  * @Id: new_pair.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 8a1bc0349..751fe6b8b 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.59 2023/11/25 14:08:47 tom Exp @
+  * @Id: panel.3x,v 1.60 2023/12/16 21:24:43 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -283,7 +283,7 @@ <H1 class="no-header">panel 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 6ec8747c8..9bf622b18 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.53 2023/12/02 20:49:04 tom Exp @
+  * @Id: resizeterm.3x,v 1.54 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-12-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-12-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-12-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-02                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2023-12-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 010df1d57..ce5e2b254 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.39 2023/11/25 14:21:48 tom Exp @
+  * @Id: scr_dump.5,v 1.40 2023/12/16 21:07:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-11-25 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-12-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-ncurses5-_legacy_">ncurses5 (legacy)</a></H3><PRE>
-       The screen-dump feature was added to ncurses in June 1995.  While there
+       The screen-dump feature was added to <EM>ncurses</EM> in June 1995.  While there
        were fixes and improvements in succeeding years, the basic  scheme  was
        unchanged:
 
@@ -209,7 +209,7 @@ <H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   Solaris 10 (13273 bytes)
 
-       <STRONG>o</STRONG>   ncurses5 (12888 bytes)
+       <STRONG>o</STRONG>   <EM>ncurses</EM>5 (12888 bytes)
 
 
 </PRE><H3><a name="h3-Solaris">Solaris</a></H3><PRE>
@@ -321,7 +321,7 @@ <H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
            ensure they are not overlooked.
 
        <STRONG>o</STRONG>   Attributes are written in escaped curly  braces,  e.g.,  "\{BOLD}",
-           and may include a color-pair (C1 or C2 in this example).
+           and may include a color pair (C1 or C2 in this example).
 
        <STRONG>o</STRONG>   The  parameters  in  the  header  are  written out only if they are
            nonzero.  When reading back, order does not matter.
@@ -396,10 +396,10 @@ <H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
-       extended screen-dump format for ncurses 6.0 (2015)
+       extended screen-dump format for <EM>ncurses</EM> 6.0 (2015)
 
        Eric S. Raymond
-       screen dump feature in ncurses 1.9.2d (1995)
+       screen dump feature in <EM>ncurses</EM> 1.9.2d (1995)
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-11-25                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-12-16                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index d9da04b1b..5d8039a46 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,26 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.50 2023/11/25 14:32:36 tom Exp @
+  * @Id: tabs.1,v 1.51 2023/12/17 00:13:57 tom Exp @
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
+  *   tabs.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/src/cmd/tabs.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+  *   tabs.c
+  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=SysVR4/cmd/tabs/tabs.c
+  * https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-11-25 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -97,7 +104,7 @@ <H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
        <STRONG>-n</STRONG>   This  option tells <STRONG>tabs</STRONG> to check the options and run any debugging
             option, but not to modify the terminal settings.
 
-       <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
+       <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
             exits.
 
        The <STRONG>tabs</STRONG> program processes a single list of tab stops.  The last option
@@ -210,48 +217,49 @@ <H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
        The <STRONG>-d</STRONG> (debug) and <STRONG>-n</STRONG> (no-op) options are extensions  not  provided  by
        other implementations.
 
-       A  <STRONG>tabs</STRONG>  utility  appeared in PWB/Unix 1.0 (1977).  There was a reduced
-       version of the <STRONG>tabs</STRONG> 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.
 
-       The PWB/Unix <STRONG>tabs</STRONG> utility, which was included  in  System  III  (1980),
-       used  built-in  tables  rather than the terminal database, to support a
-       half-dozen hardcopy terminal (printer) types.   It  also  had  built-in
-       logic  to support the left-margin, as well as a feature for copying the
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       A  <STRONG>tabs</STRONG>  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
+       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
+       same year); it supported a "-n" option to set the first tab stop at the
+       left margin.  That option is not documented by POSIX.
+
+       The PWB/Unix <STRONG>tabs</STRONG> utility returned  in  System  III  (1980),  and  used
+       built-in  tables  rather than the terminal database, to support a half-
+       dozen hardcopy terminal (printer) types.  It also had built-in logic to
+       support  setting  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 to support the printers.  In an earlier
-       development effort, the tab-stop initialization provided by <STRONG>tset</STRONG> (1982)
-       and incorporated into <STRONG>tput</STRONG> uses the terminal database,
-
-       The  <STRONG>+m</STRONG>  option  was  documented  in  the  Base  Specifications Issue 5
-       (Unix98,  1997),  and  omitted  in  Issue  6  (Unix03,  2004)   without
-       documenting   the   rationale,  though  an  introductory  comment  <EM>"and</EM>
-       <EM>optionally</EM> <EM>adjusts</EM> <EM>the</EM> <EM>margin"</EM> remains, overlooked in the removal.  The
-       documented  <STRONG>tabs</STRONG>  utility  in  Issues  6 and later has no mechanism for
-       setting margins.  The <STRONG>+m</STRONG> option in this implementation differs from the
-       feature  in  SVr4  by  using terminal capabilities rather than built-in
-       tables.
-
-       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 (e.g., 20 in PWB/Unix's <STRONG>tabs</STRONG> 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  <EM>Rationale</EM> section of the POSIX documentation goes into some detail
-       about the ways the committee considered redesigning the <STRONG>tabs</STRONG>  and  <STRONG>tput</STRONG>
-       utilities, without proposing an improved solution.  It comments that
-
-            no  known  historical  version  of tabs supports the capability of
+       Versions of the program in later releases of AT&amp;T Unix, such  as  SVr4,
+       added  support  for  the  terminal database, but retained the tables to
+       support the printers.  In an earlier development effort, the  tab  stop
+       initialization  provided  by  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  (1982),  and  incorporated  into
+       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> uses the terminal database,
+
+       The <STRONG>+m</STRONG> option was documented in the POSIX Base Specifications  Issue  5
+       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
+       motivation, though an introductory comment <EM>"and</EM> <EM>optionally</EM> <EM>adjusts</EM>  <EM>the</EM>
+       <EM>margin"</EM>   remains,   overlooked  in  the  removal.   The  <STRONG>tabs</STRONG>  utility
+       documented in Issues 6 and later has no mechanism for setting  margins.
+       The  <STRONG>+m</STRONG>  option  in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4 feature by using
+       terminal capabilities rather than built-in tables.
+
+       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
+       implementations impose one; the limit is 20 in PWB/Unix's <STRONG>tabs</STRONG> utility.
+       While some terminals may not accept an arbitrary number of  tab  stops,
+       <EM>ncurses</EM>  <STRONG>tabs</STRONG>  attempts  to set tab stops up to the right margin if the
+       list thereof is sufficiently long.
+
+       The "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details  how
+       the  committee  considered  redesigning  the  <STRONG>tabs</STRONG>  and <STRONG>tput</STRONG> utilities,
+       without settling on an improved solution.  It claims that
+
+            no known historical version of tabs  supports  the  capability  of
             setting arbitrary tab stops.
 
-       However,  the  <EM>Explicit</EM>  <EM>Lists</EM>  described  in  this  manual  page  were
-       implemented  in  PWB/Unix.   Those  provide  the  capability of setting
-       abitrary tab stops.
+       Nevertheless,  the  feature  described  in  subsection "Explicit Lists"
+       above was implemented in PWB/Unix, and permits the setting of  abitrary
+       tab stops.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -259,7 +267,7 @@ <H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-11-25                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -277,6 +285,7 @@ <H1 class="no-header">tabs 1 2023-11-25 ncurses 6.4 User commands</H1>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 34b904a13..1f70937c3 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.67 2023/12/02 20:49:04 tom Exp @
+  * @Id: term.5,v 1.68 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-12-02 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-12-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 </PRE><H3><a name="h3-STORAGE-LOCATION">STORAGE LOCATION</a></H3><PRE>
        Compiled   terminfo   descriptions   are  placed  under  the  directory
        <STRONG>/usr/share/terminfo</STRONG>.  Two configurations are supported  (when  building
-       the <STRONG>ncurses</STRONG> libraries):
+       the <EM>ncurses</EM> libraries):
 
        <STRONG>directory</STRONG> <STRONG>tree</STRONG>
             A two-level scheme is used to avoid a linear search of a huge Unix
@@ -76,12 +76,12 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
             with the terminfo's primary name as a key, and records  containing
             only aliases pointing to the primary name.
 
-            If  built  to  write  hashed  databases,  <STRONG>ncurses</STRONG>  can  still read
+            If  built  to  write  hashed  databases,  <EM>ncurses</EM>  can  still read
             terminfo databases organized as a directory tree, but cannot write
             entries  into  the  directory  tree.   It  can  write (or rewrite)
             entries in the hashed database.
 
-            <STRONG>ncurses</STRONG>  distinguishes  the  two  cases  in   the   <EM>TERMINFO</EM>   and
+            <EM>ncurses</EM>  distinguishes  the  two  cases  in   the   <EM>TERMINFO</EM>   and
             <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  environment  variable  by assuming a directory tree
             for entries that correspond to an existing directory,  and  hashed
             database otherwise.
@@ -192,11 +192,11 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
        binary format is used in all modern Unix systems.  Each system  uses  a
        predefined set of boolean, number or string capabilities.
 
-       The <STRONG>ncurses</STRONG> libraries and applications support extended terminfo binary
+       The <EM>ncurses</EM> libraries and applications support extended terminfo binary
        format, allowing users to  define  capabilities  which  are  loaded  at
        runtime.   This  extension  is made possible by using the fact that the
        other implementations stop reading the terminfo  data  when  they  have
-       reached  the  end  of the size given in the header.  <STRONG>ncurses</STRONG> checks the
+       reached  the  end  of the size given in the header.  <EM>ncurses</EM> checks the
        size, and if it exceeds that due to the predefined data,  continues  to
        parse according to its own scheme.
 
@@ -215,7 +215,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
        The  count-  and  size-values for the extended string table include the
        extended capability <EM>names</EM> as well as extended capability <EM>values</EM>.
 
-       Using the counts and sizes, <STRONG>ncurses</STRONG> allocates arrays and reads data for
+       Using the counts and sizes, <EM>ncurses</EM> allocates arrays and reads data for
        the extended capabilities in the same order as the header information.
 
        The  extended  string  table  contains  values for string capabilities.
@@ -223,10 +223,10 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
        extended  capabilities  in  order,  e.g.,  booleans,  then  numbers and
        finally strings.
 
-       By storing terminal descriptions  in  this  way,  <STRONG>ncurses</STRONG>  is  able  to
+       By storing terminal descriptions  in  this  way,  <EM>ncurses</EM>  is  able  to
        provide  a  database  useful  with  legacy  applications,  as  well  as
        providing data for applications which need  more  than  the  predefined
-       capabilities.  See <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for an overview of the way <STRONG>ncurses</STRONG> uses
+       capabilities.  See <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for an overview of the way <EM>ncurses</EM> uses
        this extended information.
 
        Applications which manipulate terminal data  can  use  the  definitions
@@ -235,7 +235,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-EXTENDED-NUMBER-FORMAT">EXTENDED NUMBER FORMAT</a></H3><PRE>
-       On occasion, 16-bit signed integers are not large enough.  With <STRONG>ncurses</STRONG>
+       On occasion, 16-bit signed integers are not large enough.  With <EM>ncurses</EM>
        6.1,  a new format was introduced by making a few changes to the legacy
        format:
 
@@ -288,7 +288,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
        This  implementation  is by default compatible with the binary terminfo
        format used by Solaris curses, except in a few less-used details  where
        it  was  found that the latter did not match X/Open Curses.  The format
-       used by the other Unix versions can be matched by building ncurses with
+       used by the other Unix versions can be matched by building <EM>ncurses</EM> with
        different configuration options.
 
 
@@ -312,13 +312,13 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 </PRE><H3><a name="h3-Mixed-case-terminal-names">Mixed-case terminal names</a></H3><PRE>
        A small number of terminal descriptions  use  uppercase  characters  in
        their  names.   If  the  underlying  filesystem  ignores the difference
-       between  uppercase  and  lowercase,  <STRONG>ncurses</STRONG>  represents   the   "first
+       between  uppercase  and  lowercase,  <EM>ncurses</EM>  represents   the   "first
        character"  of  the  terminal  name used as the intermediate level of a
        directory tree in (two-character) hexadecimal form.
 
 
 </PRE><H3><a name="h3-Limits">Limits</a></H3><PRE>
-       <STRONG>ncurses</STRONG> stores compiled terminal descriptions in three related formats,
+       <EM>ncurses</EM> stores compiled terminal descriptions in three related formats,
        described in the sections
 
        <STRONG>o</STRONG>   <STRONG>LEGACY</STRONG> <STRONG>STORAGE</STRONG> <STRONG>FORMAT</STRONG>, and
@@ -329,7 +329,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 
        The  legacy storage format and the extended number format differ by the
        types of numeric capability which they can store (i.e.,  16-bit  versus
-       32-bit  integers).   The  extended storage format introduced by ncurses
+       32-bit  integers).   The  extended storage format introduced by <EM>ncurses</EM>
        5.0 adds data to either of these formats.
 
        Some limitations apply:
@@ -387,9 +387,9 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
-       extended terminfo format for ncurses 5.0
-       hashed database support for ncurses 5.6
-       extended number support for ncurses 6.1
+       extended terminfo format for <EM>ncurses</EM> 5.0
+       hashed database support for <EM>ncurses</EM> 5.6
+       extended number support for <EM>ncurses</EM> 6.1
 
        Eric S. Raymond
        documented legacy terminfo format, e.g., from <EM>pcurses</EM>.
@@ -400,7 +400,7 @@ <H1 class="no-header">term 5 2023-12-02 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 46f2f093d..6d55396d5 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.55 2023/11/25 19:52:56 tom Exp @
+  * @Id: terminfo.head,v 1.57 2023/12/18 01:15:58 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.137 2023/12/03 00:17:23 tom Exp @
+  * @Id: terminfo.tail,v 1.139 2023/12/17 22:56:21 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-11-25 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-12-17 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <STRONG>ncurses</STRONG> version 6.4 (patch 20231202).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231217).
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -1142,14 +1142,14 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        which are awkward or impossible to represent by reusing the  predefined
        capabilities.
 
-       <STRONG>ncurses</STRONG>    addresses   this   limitation   by   allowing   user-defined
+       <EM>ncurses</EM>    addresses   this   limitation   by   allowing   user-defined
        capabilities.  The <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG>  option  for
        this purpose.  When <STRONG>-x</STRONG> is set, <STRONG>tic</STRONG> treats unknown capabilities as user-
        defined.  That is, if <STRONG>tic</STRONG> encounters a capability name  which  it  does
        not  recognize, it infers its type (boolean, number or string) from the
        syntax and makes an extended table  entry  for  that  capability.   The
        <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  makes  this information conditionally
-       available to applications.   The  ncurses  library  provides  the  data
+       available to applications.   The  <EM>ncurses</EM>  library  provides  the  data
        leaving most of the behavior to applications:
 
        <STRONG>o</STRONG>   User-defined  capability  strings  whose  name  begins with "k" are
@@ -1171,7 +1171,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        numbered keys and the handful of special named keys) is best done using
        the longer names available using terminfo.
 
-       The ncurses library uses a few of these user-defined  capabilities,  as
+       The <EM>ncurses</EM> library uses a few of these user-defined  capabilities,  as
        described  in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities (including
        function keys) are described in the terminal database, in  the  section
        on <EM>NCURSES</EM> <EM>USER-DEFINABLE</EM> <EM>CAPABILITIES</EM>
@@ -1247,7 +1247,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character,
 
-       <STRONG>o</STRONG>   <STRONG>^</STRONG><EM>x</I<STRONG>x</STRONG> maps to a control-<EM>x</EM> for any appropriate <EM>x</EM>, and
+       <STRONG>o</STRONG>   <STRONG>^</STRONG><STRONG><EM>x</EM></STRONG> maps to a control-<EM>x</EM> for any appropriate <EM>x</EM>, and
 
        <STRONG>o</STRONG>   the sequences
 
@@ -1315,26 +1315,26 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-Fetching-Compiled-Descriptions">Fetching Compiled Descriptions</a></H3><PRE>
-       Terminal  descriptions  in  <STRONG>ncurses</STRONG>  are  stored in terminal databases.
+       Terminal  descriptions  in  <EM>ncurses</EM>  are  stored in terminal databases.
        These databases, which are found by their pathname, may  be  configured
        either as directory trees or hashed databases (see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>),
 
        The  library  uses  a  compiled-in  list  of  pathnames,  which  can be
        overridden  by  environment  variables.   Before  starting  to  search,
-       <STRONG>ncurses</STRONG>  checks  the  search list, eliminating duplicates and pathnames
-       where no terminal database is found.  The  <STRONG>ncurses</STRONG>  library  reads  the
+       <EM>ncurses</EM>  checks  the  search list, eliminating duplicates and pathnames
+       where no terminal database is found.  The  <EM>ncurses</EM>  library  reads  the
        first description which passes its consistency checks.
 
        <STRONG>o</STRONG>   The  environment variable <STRONG>TERMINFO</STRONG> is checked first, for a terminal
            database containing the terminal description.
 
-       <STRONG>o</STRONG>   Next, <STRONG>ncurses</STRONG> looks in <EM>$HOME/.terminfo</EM> for a compiled description.
+       <STRONG>o</STRONG>   Next, <EM>ncurses</EM> looks in <EM>$HOME/.terminfo</EM> for a compiled description.
 
            This is an optional feature which may be omitted entirely from  the
            library,  or  limited  to  prevent  accidental  use  by  privileged
            applications.
 
-       <STRONG>o</STRONG>   Next, if the environment variable  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  is  set,  <STRONG>ncurses</STRONG>
+       <STRONG>o</STRONG>   Next, if the environment variable  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  is  set,  <EM>ncurses</EM>
            interprets  the  contents  of  that  variable  as  a list of colon-
            separated pathnames of terminal databases to be searched.
 
@@ -1342,7 +1342,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
            colon,  or  contains  adjacent colons) is interpreted as the system
            location <EM>/usr/share/terminfo</EM>.
 
-       <STRONG>o</STRONG>   Finally, <STRONG>ncurses</STRONG> searches these compiled-in locations:
+       <STRONG>o</STRONG>   Finally, <EM>ncurses</EM> searches these compiled-in locations:
 
            <STRONG>o</STRONG>   a list of directories (/usr/share/terminfo), and
 
@@ -1350,14 +1350,14 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
        The <STRONG>TERMINFO</STRONG> variable can contain a terminal description instead of the
        pathname  of  a terminal database.  If this variable begins with "hex:"
-       or "b64:" then <STRONG>ncurses</STRONG> reads a terminal description  from  hexadecimal-
+       or "b64:" then <EM>ncurses</EM> reads a terminal description  from  hexadecimal-
        or  base64-encoded  data,  and  if  that  description  matches the name
        sought, will use that.  This encoded data can be  set  using  the  "-Q"
        option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG>.
 
-       The  preceding addresses the usual configuration of <STRONG>ncurses</STRONG>, which uses
+       The  preceding addresses the usual configuration of <EM>ncurses</EM>, which uses
        terminal descriptions prepared in <EM>terminfo</EM> format.   While  <EM>termcap</EM>  is
-       less  expressive,  <STRONG>ncurses</STRONG>  can  also  be  configured  to  read <EM>termcap</EM>
+       less  expressive,  <EM>ncurses</EM>  can  also  be  configured  to  read <EM>termcap</EM>
        descriptions.   In  that  configuration,  it  checks  the  <EM>TERMCAP</EM>  and
        <EM>TERMPATH</EM>  variables  (for  content and search path, respectively) after
        the system terminal database.
@@ -1515,16 +1515,16 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
                 <EM>static</EM>  variables.  They are the same.  Like SVr4 curses, XPG4
                 curses does not initialize these explicitly.
 
-            <STRONG>o</STRONG>   Before version 6.3, ncurses stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
+            <STRONG>o</STRONG>   Before version 6.3, <EM>ncurses</EM> stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
                 variables in persistent storage, initialized to zeros.
 
-            <STRONG>o</STRONG>   Beginning  with version 6.3, ncurses stores <EM>static</EM> and <EM>dynamic</EM>
+            <STRONG>o</STRONG>   Beginning  with version 6.3, <EM>ncurses</EM> stores <EM>static</EM> and <EM>dynamic</EM>
                 variables in the same manner as SVr4.
 
-                <STRONG>o</STRONG>   Unlike  other  implementations,  ncurses   zeros   dynamic
+                <STRONG>o</STRONG>   Unlike  other  implementations,  <EM>ncurses</EM>   zeros   dynamic
                     variables before the first <STRONG>%g</STRONG> or <STRONG>%P</STRONG> operator.
 
-                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in ncurses is
+                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in <EM>ncurses</EM> is
                     within the current call to <STRONG>tparm</STRONG>.  Use static variables if
                     persistent storage is needed.
 
@@ -1755,7 +1755,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        available.)
 
 
-</PRE><H3><a name="h3-Insert_delete-line-and-vertical-motions">Insert/delete line and vertical motions</a></H3><PRE>
+</PRE><H3><a name="h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></H3><PRE>
        If  the  terminal  can  open a new blank line before the line where the
        cursor is, this should be given as <STRONG>il1</STRONG>; this  is  done  only  from  the
        first  position  of  a  line.  The cursor must then appear on the newly
@@ -2231,7 +2231,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        The  boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
        etc., work ordinarily in the status line.
 
-       The <STRONG>ncurses</STRONG> implementation does not yet use any of these  capabilities.
+       The <EM>ncurses</EM> implementation does not yet use any of these  capabilities.
        They are documented here in case they ever become important.
 
 
@@ -2314,19 +2314,19 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   Tektronix-like terminals have a predefined set of <EM>N</EM> colors (where <EM>N</EM>
            is usually 8), and can set character-cell foreground and background
-           characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color-pairs.
+           characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
 
        <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
            separately  (foreground  and  background  are   not   independently
-           settable).   Up  to  <EM>M</EM> color-pairs may be set up from 2*<EM>M</EM> different
+           settable).   Up  to  <EM>M</EM> color pairs may be set up from 2*<EM>M</EM> different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
        numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
-       colors and color-pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
+       colors and color pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
        default values for the terminal.  The <STRONG>oc</STRONG> string resets  all  colors  or
-       color-pairs  to  their default values for the terminal.  Some terminals
+       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 <STRONG>bce</STRONG>.
@@ -2353,7 +2353,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
        as  follows (the middle column is the symbolic #define available in the
-       header for the <STRONG>curses</STRONG> or <STRONG>ncurses</STRONG> libraries).  The terminal hardware  is
+       header for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware  is
        free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
@@ -2385,7 +2385,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On an HP-like terminal, use <STRONG>scp</STRONG> with a color-pair number  parameter  to
+       On an HP-like terminal, use <STRONG>scp</STRONG> with a color pair number  parameter  to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
@@ -2399,14 +2399,14 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
            Saturation) indices.  The ranges are terminal-dependent.
 
        <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
-           color-pair value.  It will  take  seven  parameters;  a  color-pair
+           color pair value.  It will take  seven  parameters;  a  color  pair
            number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
            background and then foreground colors.  These  parameters  must  be
            (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
            <STRONG>hls</STRONG>.
 
        On some color terminals,  colors  collide  with  highlights.   You  can
-       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit-mask
+       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit mask
        of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
@@ -2434,7 +2434,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        with the foreground color blue and is  not  available  in  color  mode.
        These should have an <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4  curses does nothing with <STRONG>ncv</STRONG>, ncurses recognizes it and optimizes
+       SVr4  curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and optimizes
        the output in favor of colors.
 
 
@@ -2442,9 +2442,9 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        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 <STRONG>PC</STRONG> variable;
+       npc.   Note that <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG> variable;
        though the application may set this value to  something  other  than  a
-       null,  ncurses will test <STRONG>npc</STRONG> first and use napms if the terminal has no
+       null,  <EM>ncurses</EM> will test <STRONG>npc</STRONG> 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
@@ -2501,7 +2501,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
-</PRE><H3><a name="h3-Glitches-and-Braindamage">Glitches and Braindamage</a></H3><PRE>
+</PRE><H3><a name="h3-Glitches-and-Brain-Damage">Glitches and Brain Damage</a></H3><PRE>
        Hazeltine  terminals, which do not allow "~" characters to be displayed
        should indicate <STRONG>hz</STRONG>.
 
@@ -2517,7 +2517,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        teleray_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 necessary to use delete and insert
-       line.  The ncurses implementation ignores this glitch.
+       line.  The <EM>ncurses</EM> implementation ignores this glitch.
 
        The Beehive Superbee, which is unable to correctly transmit the  escape
        or  control/C  characters,  has <STRONG>xsb</STRONG>, indicating that the f1 key is used
@@ -2602,84 +2602,84 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
        terminal types and users whose <EM>TERM</EM> variable does not  have  a  termcap
        entry.
 
-       When  in  -C (translate to termcap) mode, the <STRONG>ncurses</STRONG> implementation of
+       When  in  -C (translate to termcap) mode, the <EM>ncurses</EM> implementation of
        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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.
 
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
-       between  commercial  Unix  systems.   At  least  two implementations of
-       <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
-       Unices  after  SVr1,  adding extension capabilities to the string table
-       that (in the binary format) collide with subsequent System  V  and  XSI
-       Curses extensions.
+</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
+       <EM>/usr/share/terminfo</EM>
+              compiled terminal description database directory
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching    for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>   and
+       Searching   for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>    and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is not supported by older implementations.
 
-       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
+       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
-       <STRONG>ncurses</STRONG> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
+       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
+       <EM>ncurses</EM>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation may need terminfo entries made for <STRONG>ncurses</STRONG> to have  <STRONG>msgr</STRONG>
+       interpretation  may need terminfo entries made for <EM>ncurses</EM> to have <STRONG>msgr</STRONG>
        turned off.
 
-       The <STRONG>ncurses</STRONG> library handles insert-character and insert-character modes
-       in a slightly non-standard way to get better  update  efficiency.   See
+       The <EM>ncurses</EM> library handles insert-character and insert-character modes
+       in  a  slightly  non-standard way to get better update efficiency.  See
        the <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
-       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
+       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
+       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
        the documentation for the AT&amp;T 505 terminal.
 
-       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <STRONG>ncurses</STRONG> library wants
-       to interpret it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and  emulators  like
-       xterm  that can return mouse-tracking information in the keyboard-input
+       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM>  library  wants
+       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
-       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
-       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
+       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
+       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> value must be
        specified, even if it is zero.
 
-       Different  commercial  ports  of  <EM>terminfo</EM> and <EM>curses</EM> support different
-       subsets of XSI Curses and (in some cases) different  extensions.   Here
-       is  a  summary, accurate as of October 1995, after which the commercial
+       Different commercial ports of <EM>terminfo</EM>  and  <EM>curses</EM>  support  different
+       subsets  of  XSI Curses and (in some cases) different extensions.  Here
+       is a summary, accurate as of October 1995, after which  the  commercial
        Unix market contracted and lost diversity.
 
        <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
-       <STRONG>o</STRONG>   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
+       <STRONG>o</STRONG>   IRIX  supports  the  SVr4  set  and  adds one undocumented extended
            string capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   SVr1   and   Ultrix   support   a  restricted  subset  of  <EM>terminfo</EM>
-           capabilities.  The Booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
+       <STRONG>o</STRONG>   SVr1  and  Ultrix  support  a   restricted   subset   of   <EM>terminfo</EM>
+           capabilities.   The  Booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
-           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
-           through  63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a number
+       <STRONG>o</STRONG>   HP/UX  supports  the  SVr1  subset,  plus  the  SVr[234]   numerics
+           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
+           through 63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a  number
            of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   AIX supports the SVr1 subset, plus function  keys  11  through  63,
+       <STRONG>o</STRONG>   AIX  supports  the  SVr1  subset, plus function keys 11 through 63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
-</PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
-       <EM>/usr/share/terminfo</EM>
-              compiled terminal description database directory
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
+       between  commercial  Unix  systems.   At  least  two implementations of
+       <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
+       Unices  after  SVr1,  adding extension capabilities to the string table
+       that (in the binary format) collide with subsequent System  V  and  XSI
+       Curses extensions.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -2694,7 +2694,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-11-25                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-12-17                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -2716,7 +2716,7 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 <li><a href="#h3-Cursor-Motions">Cursor Motions</a></li>
 <li><a href="#h3-Margins">Margins</a></li>
 <li><a href="#h3-Area-Clears">Area Clears</a></li>
-<li><a href="#h3-Insert_delete-line-and-vertical-motions">Insert/delete line and vertical motions</a></li>
+<li><a href="#h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></li>
 <li><a href="#h3-Insert_Delete-Character">Insert/Delete Character</a></li>
 <li><a href="#h3-Highlighting_-Underlining_-and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></li>
 <li><a href="#h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></li>
@@ -2726,13 +2726,13 @@ <H1 class="no-header">terminfo 5 2023-11-25 ncurses 6.4 File formats</H1>
 <li><a href="#h3-Line-Graphics">Line Graphics</a></li>
 <li><a href="#h3-Color-Handling">Color Handling</a></li>
 <li><a href="#h3-Miscellaneous">Miscellaneous</a></li>
-<li><a href="#h3-Glitches-and-Braindamage">Glitches and Braindamage</a></li>
+<li><a href="#h3-Glitches-and-Brain-Damage">Glitches and Brain Damage</a></li>
 <li><a href="#h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></li>
 </ul>
 </li>
-<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index b934799e8..db6e2ff52 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.103 2023/12/02 20:50:53 tom Exp @
+  * @Id: tic.1m,v 1.104 2023/12/16 20:33:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
        <STRONG>-I</STRONG>     Force source translation to terminfo format.
 
-       <STRONG>-K</STRONG>     Suppress some longstanding ncurses extensions to termcap format,
+       <STRONG>-K</STRONG>     Suppress some longstanding <EM>ncurses</EM> extensions to termcap format,
               e.g., "\s" for space.
 
        <STRONG>-L</STRONG>     Force source translation to terminfo format  using  the  long  C
@@ -260,7 +260,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
             file.  Normally, it infers data which is commonly missing in older
             terminfo data, or in termcaps.
 
-       <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
+       <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
             exits.
 
        <STRONG>-v</STRONG><EM>n</EM>  specifies that (verbose) output be written to standard error trace
@@ -269,7 +269,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
             The  optional  parameter  <EM>n</EM>  is  a  number from 1 to 9, inclusive,
             indicating the desired level of detail of information.
 
-            <STRONG>o</STRONG>   If ncurses is built  without  tracing  support,  the  optional
+            <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  without  tracing  support,  the  optional
                 parameter is ignored.
 
             <STRONG>o</STRONG>   If <EM>n</EM> is omitted, the default level is 1.
@@ -383,7 +383,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
            <STRONG>-0</STRONG> <STRONG>-1</STRONG> <STRONG>-C</STRONG> <STRONG>-G</STRONG> <STRONG>-I</STRONG> <STRONG>-N</STRONG> <STRONG>-R</STRONG> <STRONG>-T</STRONG> <STRONG>-V</STRONG> <STRONG>-a</STRONG> <STRONG>-e</STRONG> <STRONG>-f</STRONG> <STRONG>-g</STRONG> <STRONG>-o</STRONG> <STRONG>-r</STRONG> <STRONG>-s</STRONG> <STRONG>-t</STRONG> <STRONG>-x</STRONG>
 
-       <STRONG>o</STRONG>   The NetBSD <STRONG>tic</STRONG>  supports a few of the ncurses options
+       <STRONG>o</STRONG>   The NetBSD <STRONG>tic</STRONG> supports a few of the <EM>ncurses</EM> options
 
            <STRONG>-a</STRONG> <STRONG>-o</STRONG> <STRONG>-x</STRONG>
 
@@ -404,7 +404,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
        Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
        2019,  the  surviving  implementations  of <STRONG>tic</STRONG> are SVr4 (AIX, HP-UX and
-       Solaris), ncurses and NetBSD curses.  The SVr4 <STRONG>tic</STRONG> programs all support
+       Solaris), <EM>ncurses</EM> and NetBSD curses.  The SVr4 <STRONG>tic</STRONG> programs all support
        the  <STRONG>-v</STRONG> option.  The NetBSD <STRONG>tic</STRONG> program follows X/Open's documentation,
        omitting the <STRONG>-v</STRONG> option.
 
@@ -431,14 +431,14 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
        Release 4, the table of capabilities grew from  180  (<EM>pcurses</EM>)  to  464
        (Solaris).
 
-       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
+       In  early  development of <EM>ncurses</EM> (1993), Zeyd Ben-Halim used the table
        from <EM>mytinfo</EM> to extend the  <EM>pcurses</EM>  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 <STRONG>memory_lock_above</STRONG> and <STRONG>memory_unlock</STRONG> (see
        <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
 
-       Eric Raymond incorporated parts of <EM>mytinfo</EM> into  ncurses  to  implement
+       Eric Raymond incorporated parts of <EM>mytinfo</EM> into  <EM>ncurses</EM>  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
@@ -448,7 +448,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
        capabilities.
 
        In  2010,  Roy  Marples provided a <STRONG>tic</STRONG> program and terminfo library for
-       NetBSD.  That implementation  adapts  several  features  from  ncurses,
+       NetBSD.  That implementation  adapts  several  features  from  <EM>ncurses</EM>,
        including <STRONG>tic</STRONG>'s <STRONG>-x</STRONG> option.
 
        The  <STRONG>-c</STRONG>  option  tells <STRONG>tic</STRONG> to check for problems in the terminfo source
@@ -456,18 +456,18 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
        <STRONG>o</STRONG>   <EM>pcurses</EM> had 8 warnings
 
-       <STRONG>o</STRONG>   ncurses in 1996 had 16 warnings
+       <STRONG>o</STRONG>   <EM>ncurses</EM> in 1996 had 16 warnings
 
        <STRONG>o</STRONG>   Solaris (SVr4) curses has 28 warnings
 
        <STRONG>o</STRONG>   NetBSD tic in 2019 has 19 warnings.
 
-       <STRONG>o</STRONG>   ncurses in 2019 has 96 warnings
+       <STRONG>o</STRONG>   <EM>ncurses</EM> in 2019 has 96 warnings
 
-       The checking done in ncurses' <STRONG>tic</STRONG> helps with the conversion to termcap,
+       The checking done in <EM>ncurses</EM>' <STRONG>tic</STRONG> 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
+       distinct  capabilities  in <EM>ncurses</EM>' terminal database; 128 of those are
        user-defined.
 
 
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index e2128a037..16f073171 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.58 2023/12/02 20:49:04 tom Exp @
+  * @Id: toe.1m,v 1.59 2023/12/16 21:01:59 tom Exp @
   * toe -a | grep -E '^(xterm|vt)'
   * The next row overruns the line length on DWB nroff (65n).
   * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
@@ -40,12 +40,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -67,8 +67,8 @@ <H1 class="no-header">toe 1m 2023-12-02 ncurses 6.4 User commands</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>toe</STRONG>  reports  to  the  standard  output  stream the (primary) names and
        descriptions of the terminal types available to the  <EM>terminfo</EM>  library.
-       Each <EM>directory</EM> operand is scanned; if none are given, <STRONG>toe</STRONG> scans the the
-       default <EM>terminfo</EM> directory.
+       Each  <EM>directory</EM>  is  scanned;  if none are given, <STRONG>toe</STRONG> scans the default
+       <EM>terminfo</EM> directory.
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
@@ -188,7 +188,7 @@ <H1 class="no-header">toe 1m 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index ff5b1c453..409408964 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.91 2023/12/02 20:49:04 tom Exp @
+  * @Id: tput.1,v 1.92 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
               variable <EM>TERM</EM>.  If <STRONG>-T</STRONG> is specified,  then  the  shell  variables
               <EM>LINES</EM> and <EM>COLUMNS</EM> will also be ignored.
 
-       <STRONG>-V</STRONG>     reports  the  version of ncurses which was used in this program,
+       <STRONG>-V</STRONG>     reports  the  version of <EM>ncurses</EM> which was used in this program,
               and exits.
 
        <STRONG>-x</STRONG>     prevents <STRONG>tput</STRONG> from attempting to clear the scrollback buffer.
@@ -212,7 +212,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
        <STRONG>tput</STRONG>  <STRONG>reset</STRONG>.   The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link named <STRONG>reset</STRONG>
        specially.
 
-       Before ncurses 6.1, the two utilities were different from each other:
+       Before <EM>ncurses</EM> 6.1, the two utilities were different from each other:
 
        <STRONG>o</STRONG>   <STRONG>tset</STRONG> utility reset the terminal modes and special  characters  (not
            done with <STRONG>tput</STRONG>).
@@ -225,7 +225,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
        <STRONG>o</STRONG>   The <STRONG>reset</STRONG> program is usually an alias for  <STRONG>tset</STRONG>,  because  of  this
            difference with resetting terminal modes and special characters.
 
-       With  the  changes  made  for ncurses 6.1, the <EM>reset</EM> feature of the two
+       With  the  changes  made  for <EM>ncurses</EM> 6.1, the <EM>reset</EM> feature of the two
        programs is (mostly) the same.  A few differences remain:
 
        <STRONG>o</STRONG>   The <STRONG>tset</STRONG> program waits  one  second  when  resetting,  in  case  it
@@ -335,7 +335,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
            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, <STRONG>tput</STRONG> did not modify terminal
+           Until  changes made after <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify terminal
            modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
            <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
            to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
@@ -355,10 +355,10 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
 
            Besides  providing  more  reliable operation than AT&amp;T's utility, a
            portability problem is introduced  by  this  analysis:  An  OpenBSD
-           developer  adapted  the  internal  library function from ncurses to
+           developer  adapted  the  internal  library function from <EM>ncurses</EM> to
            port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
            modified  to  interpret  multiple  commands  on  a  line.  Portable
-           applications should not rely upon this feature; ncurses provides it
+           applications should not rely upon this feature; <EM>ncurses</EM> provides it
            to support applications written specifically for OpenBSD.
 
        This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
@@ -397,7 +397,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
            2010, NetBSD's <STRONG>tput</STRONG> uses terminfo names.   Before  that,  it  (like
            FreeBSD) recognized termcap names.
 
-           Beginning  in  2021,  FreeBSD uses the ncurses <STRONG>tput</STRONG>, configured for
+           Beginning  in  2021,  FreeBSD uses the <EM>ncurses</EM> <STRONG>tput</STRONG>, configured for
            both terminfo (tested first) and termcap (as a fallback).
 
        Because (apparently) <EM>all</EM> of the certified Unix systems support the full
@@ -431,10 +431,10 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
            absent or cancelled numeric value versus an (unsigned) exit code.
 
        The various Unix systems (AIX, HP-UX, Solaris) use the same  exit-codes
-       as ncurses.
+       as <EM>ncurses</EM>.
 
        NetBSD curses documents different exit codes which do not correspond to
-       either ncurses or X/Open.
+       either <EM>ncurses</EM> or X/Open.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -474,7 +474,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
        BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
        December 1992.  Ridge's program made  more  sophisticated  use  of  the
        terminal  capabilities  than  the  BSD program.  Eric Raymond used that
-       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  ncurses  in  June  1995.
+       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  <EM>ncurses</EM>  in  June  1995.
        Using  the  portions  dealing with terminal capabilities almost without
        change,  Raymond  made  improvements  to  the  way   the   command-line
        parameters were handled.
@@ -543,7 +543,7 @@ <H1 class="no-header">tput 1 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 966068ba1..5064c686d 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.77 2023/12/02 20:52:24 tom Exp @
+  * @Id: tset.1,v 1.78 2023/12/16 20:32:22 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
   *   reset.c
@@ -43,12 +43,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-12-02 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-12-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -261,7 +261,7 @@ <H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
             variable <EM>TERM</EM> to the standard output; see subsection "Setting  the
             Environment".
 
-       <STRONG>-V</STRONG>   reports the version of ncurses which was used in this program, and
+       <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
             exits.
 
        <STRONG>-w</STRONG>   Resize the window to match the  size  deduced  via  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
@@ -319,7 +319,7 @@ <H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
        few exceptions we shall consider now.
 
        A few options are different because the <EM>TERMCAP</EM> variable is  no  longer
-       supported under terminfo-based <STRONG>ncurses</STRONG>:
+       supported under terminfo-based <EM>ncurses</EM>:
 
        <STRONG>o</STRONG>   The  <STRONG>-S</STRONG>  option  of  BSD  <STRONG>tset</STRONG>  no longer works; it prints an error
            message to the standard error and dies.
@@ -360,7 +360,7 @@ <H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
            to  set  the  window  size if <STRONG>tset</STRONG> is not able to obtain the window
            size from the operating system.
 
-       <STRONG>o</STRONG>   In ncurses, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
+       <STRONG>o</STRONG>   In <EM>ncurses</EM>, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
            be  from  the  operating  system, the <EM>LINES</EM> and <EM>COLUMNS</EM> environment
            variables or the terminal description.
 
@@ -403,7 +403,7 @@ <H1 class="no-header">tset 1 2023-12-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 777caad94..0491b60ad 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.41 2023/10/07 21:19:07 tom Exp @
+  * @Id: user_caps.5,v 1.42 2023/12/16 20:32:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-10-07 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-12-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Background">Background</a></H3><PRE>
-       Before  ncurses  5.0,  terminfo  databases  used  a <EM>fixed</EM> <EM>repertoire</EM> of
+       Before  <EM>ncurses</EM>  5.0,  terminfo  databases  used  a <EM>fixed</EM> <EM>repertoire</EM> of
        terminal capabilities designed for the SVr2 terminal database in  1984,
        and  extended  in  stages  through SVr4 (1989), and standardized in the
        Single Unix Specification beginning in 1995.
@@ -92,21 +92,21 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
            needed, while others were added  (out  of  order)  to  comply  with
            X/Open Curses.
 
-           While  ncurses' repertoire of predefined capabilities is closest to
+           While  <EM>ncurses</EM>' repertoire of predefined capabilities is closest to
            Solaris, Solaris's terminfo database has a few differences from the
-           list  published  by  X/Open  Curses.   For  example, ncurses can be
+           list  published  by  X/Open  Curses.   For  example, <EM>ncurses</EM> can be
            configured with tables which match the terminal databases for  AIX,
            HP-UX or OSF/1, rather than the default Solaris-like configuration.
 
-       <STRONG>o</STRONG>   In  SVr4  curses  and  ncurses, the terminal database is defined at
+       <STRONG>o</STRONG>   In  SVr4  curses  and  <EM>ncurses</EM>, the terminal database is defined at
            compile-time using a text file which lists the  different  terminal
            capabilities.
 
            In  principle,  the  text-file  can  be  extended,  but  doing this
            requires recompiling and reinstalling the library.   The  text-file
-           used  in  ncurses  for  terminal  capabilities includes details for
+           used  in  <EM>ncurses</EM>  for  terminal  capabilities includes details for
            various systems past the documented X/Open  Curses  features.   For
-           example, ncurses supports these capabilities in each configuration:
+           example, <EM>ncurses</EM> supports these capabilities in each configuration:
 
                memory_lock
                     (meml) lock memory above cursor
@@ -135,13 +135,13 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
        Although  termcap's  extensibility  was  rarely  used (it was never the
        <EM>speaker</EM> who had actually used the feature), the criticism had a  point.
-       ncurses   5.0  provided  a  way  to  detect  nonstandard  capabilities,
+       <EM>ncurses</EM>   5.0  provided  a  way  to  detect  nonstandard  capabilities,
        determine their type and optionally store and retrieve them  in  a  way
        which did not interfere with other applications.  These are referred to
        as <EM>user-defined</EM> <EM>capabilities</EM> because no modifications to the  toolset's
        predefined capability names are needed.
 
-       The  ncurses  utilities <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> have a command-line option "-x"
+       The  <EM>ncurses</EM>  utilities <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> have a command-line option "-x"
        to  control  whether  the  nonstandard  capabilities  are   stored   or
        retrieved.   A  library function <STRONG>use_extended_names</STRONG> is provided for the
        same purpose.
@@ -150,7 +150,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
        user-defined  capability  if  the  capability  name  is  not one of the
        predefined names.
 
-       Because ncurses provides  a  termcap  library  interface,  these  user-
+       Because <EM>ncurses</EM> provides  a  termcap  library  interface,  these  user-
        defined capabilities may be visible to termcap applications:
 
        <STRONG>o</STRONG>   The   termcap  interface  (like  all  implementations  of  termcap)
@@ -171,7 +171,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
            predefined function-key names, to which a series  of  keys  can  be
            assigned,   that  is  insufficient  for  more  than  a  dozen  keys
            multiplied by more than a couple  of  modifier  combinations.   The
-           ncurses  database  uses  a  convention based on <STRONG>xterm(1)</STRONG> to provide
+           <EM>ncurses</EM>  database  uses  a  convention based on <STRONG>xterm(1)</STRONG> to provide
            extended special-key names.
 
            Fitting that into termcap's limitation of 2-character  names  would
@@ -180,8 +180,8 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-Recognized-capabilities">Recognized capabilities</a></H3><PRE>
-       The ncurses library uses the user-definable  capabilities.   While  the
-       terminfo  database  may  have  other extensions, ncurses makes explicit
+       The <EM>ncurses</EM> library uses the user-definable  capabilities.   While  the
+       terminfo  database  may  have  other extensions, <EM>ncurses</EM> makes explicit
        checks for these:
 
           AX <EM>boolean</EM>, asserts that the terminal interprets SGR 39 and  SGR  49
@@ -197,7 +197,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
              The command "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" does the same thing.
 
           NQ <EM>boolean</EM>, used to suppress a consistency  check  in  tic  for  the
-             ncurses  capabilities  in user6 through user9 (u6, u7, u8 and u9)
+             <EM>ncurses</EM>  capabilities  in user6 through user9 (u6, u7, u8 and u9)
              which tell how to query the terminal's cursor  position  and  its
              device attributes.
 
@@ -209,11 +209,11 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
              appropriate   values   without   requiring   the  application  to
              initialize colors using <STRONG>init_color</STRONG>.
 
-             The capability type determines the values which ncurses sees:
+             The capability type determines the values which <EM>ncurses</EM> sees:
 
              <EM>boolean</EM>
                 implies that the number of bits for red, green  and  blue  are
-                the  same.   Using  the maximum number of colors, ncurses adds
+                the  same.   Using  the maximum number of colors, <EM>ncurses</EM> adds
                 two, divides that sum by three, and assigns the result to red,
                 green and blue in that order.
 
@@ -222,8 +222,8 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
                 comparison to red.
 
              <EM>number</EM>
-                tells  ncurses  what result to add to red, green and blue.  If
-                ncurses runs out of bits, blue (and green) lose just as in the
+                tells  <EM>ncurses</EM>  what result to add to red, green and blue.  If
+                <EM>ncurses</EM> runs out of bits, blue (and green) lose just as in the
                 <EM>boolean</EM> case.
 
              <EM>string</EM>
@@ -236,7 +236,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
              could  define  <STRONG>RGB#1</STRONG> to represent the standard eight ANSI colors,
              i.e., one bit per color.
 
-          U8 <EM>number</EM>, asserts that ncurses must use Unicode  values  for  line-
+          U8 <EM>number</EM>, asserts that <EM>ncurses</EM> must use Unicode  values  for  line-
              drawing  characters,  and  that  it  should  ignore the alternate
              character set capabilities when the locale uses  UTF-8  encoding.
              For  more  information, see the discussion of <STRONG>NCURSES_NO_UTF8_ACS</STRONG>
@@ -244,16 +244,16 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
              Set this capability to a nonzero value to enable it.
 
-          XM <EM>string</EM>, override ncurses's built-in string which enables/disables
+          XM <EM>string</EM>, override <EM>ncurses</EM>'s built-in string which enables/disables
              <STRONG>xterm(1)</STRONG> mouse mode.
 
-             ncurses  sends a character sequence to the terminal to initialize
+             <EM>ncurses</EM>  sends a character sequence to the terminal to initialize
              mouse mode, and when the user clicks the  mouse  buttons  or  (in
              certain  modes) moves the mouse, handles the characters sent back
              by the terminal to tell it what was done with the mouse.
 
              The mouse protocol  is  enabled  when  the  <EM>mask</EM>  passed  in  the
-             <STRONG>mousemask</STRONG>  function  is nonzero.  By default, ncurses handles the
+             <STRONG>mousemask</STRONG>  function  is nonzero.  By default, <EM>ncurses</EM> handles the
              responses for the X11 xterm mouse protocol.  It also knows  about
              the  <EM>SGR</EM>  <EM>1006</EM>  xterm mouse protocol, but must to be told to look
              for this specifically.  It will not be able to guess  which  mode
@@ -262,7 +262,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
              The <STRONG>XM</STRONG> capability has a single parameter.  If nonzero, the  mouse
              protocol  should  be enabled.  If zero, the mouse protocol should
-             be disabled.  ncurses inspects this capability if it is  present,
+             be disabled.  <EM>ncurses</EM> inspects this capability if it is  present,
              to  see whether the 1006 protocol is used.  If so, it expects the
              responses to use the <EM>SGR</EM> <EM>1006</EM> xterm mouse protocol.
 
@@ -321,12 +321,12 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
        Since  1999,  <STRONG>xterm(1)</STRONG>  has  supported  <EM>shift</EM>,  <EM>control</EM>,  <EM>alt</EM>, and <EM>meta</EM>
        modifiers which produce distinct special-key strings.   In  a  terminal
-       description,  ncurses  has  no special knowledge of the modifiers used.
+       description,  <EM>ncurses</EM>  has  no special knowledge of the modifiers used.
        Applications can use the <EM>naming</EM> <EM>convention</EM>  established  for  <STRONG>xterm</STRONG>  to
        find these special keys in the terminal description.
 
        Starting  with  the curses convention that <EM>key</EM> <EM>names</EM> begin with "k" and
-       that shifted special keys are  an  uppercase  name,  ncurses'  terminal
+       that shifted special keys are  an  uppercase  name,  <EM>ncurses</EM>'  terminal
        database defines these names to which a suffix is added:
 
             <STRONG>Name</STRONG>   <STRONG>Description</STRONG>
@@ -362,8 +362,8 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
             16      Meta + Ctrl + Alt + Shift
 
        None  of these are predefined; terminal descriptions can refer to <EM>names</EM>
-       which ncurses will allocate at runtime to <EM>key-codes</EM>.  To use these keys
-       in an ncurses program, an application could do this:
+       which <EM>ncurses</EM> will allocate at runtime to <EM>key-codes</EM>.  To use these keys
+       in an <EM>ncurses</EM> program, an application could do this:
 
        <STRONG>o</STRONG>   using  a  list  of  extended  key <EM>names</EM>, ask <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG> for their
            values, and
@@ -380,7 +380,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
-       beginning with ncurses 5.0 (1999)
+       beginning with <EM>ncurses</EM> 5.0 (1999)
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -396,7 +396,7 @@ <H1 class="no-header">user_caps 5 2023-10-07 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-10-07                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-12-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 2b5fabe6e..4e0a57eb6 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.31 2023/11/25 19:51:50 tom Exp $
-.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-11-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKada_config.in,v 1.32 2023/12/16 21:42:53 tom Exp $
+.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-12-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
 .ie \n(.g \{\
 .ds `` \(lq
@@ -57,7 +57,7 @@ configuration helper for \fI@ADA_LIBNAME@\fP libraries
 .SH DESCRIPTION
 This program development aid simplifies the process of configuring
 applications to use the \fI@ADA_LIBNAME@\fP library binding to
-\fIncurses\fP.
+\fI\%ncurses\fP.
 .SH OPTIONS
 .TP 11 \" "--version" + 2n
 \fB\-\-cflags\fP
@@ -68,7 +68,7 @@ reports the GNAT (Ada compiler) flags needed to compile with
 reports the GNAT libraries needed to link with \fI@ADA_LIBNAME@\fP.
 .TP
 \fB\-\-version\fP
-reports the release and patch date information of the \fIncurses\fP
+reports the release and patch date information of the \fI\%ncurses\fP
 libraries used to configure and build \fI@ADA_LIBNAME@\fP and exits
 successfully.
 .TP
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index fb72802b0..269d34012 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,11 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.19 2023/12/02 21:37:31 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-02 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.20 2023/12/16 21:43:05 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
-configuration helper for \fIncurses\fR libraries
+configuration helper for \fI\%ncurses\fP libraries
 .SH SYNOPSIS
 .B @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
 .I option
@@ -42,45 +42,45 @@ configuration helper for \fIncurses\fR libraries
 .B "@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \-\-help"
 .SH DESCRIPTION
 This program development aid simplifies the process of configuring
-applications against a particular set of \fIncurses\fP libraries.
+applications against a particular set of \fI\%ncurses\fP libraries.
 .SH OPTIONS
 .TP 18 \" "--mouse-version" + 2n + adjustment for PDF
 \fB\-\-prefix\fP
-reports the package prefix of \fIncurses\fP.
+reports the package prefix of \fI\%ncurses\fP.
 .TP
 \fB\-\-exec\-prefix\fP
-reports the executable prefix of \fIncurses\fP.
+reports the executable prefix of \fI\%ncurses\fP.
 .TP
 \fB\-\-cflags\fP
-reports the C compiler flags needed to compile with \fIncurses\fP.
+reports the C compiler flags needed to compile with \fI\%ncurses\fP.
 .TP
 \fB\-\-libs\fP
-reports the libraries needed to link with \fIncurses\fP.
+reports the libraries needed to link with \fI\%ncurses\fP.
 .TP
 \fB\-\-version\fP
-reports the release and patch date information of \fIncurses\fP and
+reports the release and patch date information of \fI\%ncurses\fP and
 exits successfully.
 .TP
 \fB\-\-abi\-version\fP
-reports the ABI version of \fIncurses\fP.
+reports the ABI version of \fI\%ncurses\fP.
 .TP
 \fB\-\-mouse\-version\fP
-reports the mouse\-interface version of \fIncurses\fP.
+reports the mouse\-interface version of \fI\%ncurses\fP.
 .TP
 \fB\-\-bindir\fP
-reports the directory containing \fIncurses\fP programs.
+reports the directory containing \fI\%ncurses\fP programs.
 .TP
 \fB\-\-datadir\fP
-reports the directory containing \fIncurses\fP data.
+reports the directory containing \fI\%ncurses\fP data.
 .TP
 \fB\-\-includedir\fP
-reports the directory containing \fIncurses\fP header files.
+reports the directory containing \fI\%ncurses\fP header files.
 .TP
 \fB\-\-libdir\fP
-reports the directory containing \fIncurses\fP libraries.
+reports the directory containing \fI\%ncurses\fP libraries.
 .TP
 \fB\-\-mandir\fP
-reports the directory containing \fIncurses\fP man pages.
+reports the directory containing \fI\%ncurses\fP man pages.
 .TP
 \fB\-\-terminfo\fP
 reports the \fI\%TERMINFO\fP \fIterminfo\fP database path,
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index b3983b41e..43a0bd6de 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,26 +28,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.56 2023/12/02 20:51:25 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.57 2023/12/16 21:34:23 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
-.ds '  \(aq
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
-.ie t .ds '  \(aq
-.el   .ds '  '
 .\}
 .
 .ds d /etc/termcap
 .SH NAME
 \fB\%@CAPTOINFO@\fP \-
-convert a \fItermcap\fR description into a \fIterminfo\fR description
+convert a \fItermcap\fP description into a \fI\%term\%info\fP description
 .SH SYNOPSIS
 .B @CAPTOINFO@
 .RI [ tic-option ]
@@ -59,9 +56,9 @@ convert a \fItermcap\fR description into a \fIterminfo\fR description
 \fB\%@CAPTOINFO@\fP translates terminal descriptions.
 It looks in each given text \fIfile\fP for \fI\%termcap\fP entries and,
 for each one found,
-writes an equivalent \fI\%terminfo\fP description to the standard output
-stream.
-\fI\%termcap\fP \fBtc\fP capabilities translate to \fI\%terminfo\fP
+writes an equivalent \fI\%\%term\%info\fP description to the standard
+output stream.
+\fI\%termcap\fP \fBtc\fP capabilities translate to \fI\%\%term\%info\fP
 \*(``\fBuse\fP\*('' capabilities.
 .PP
 If no \fIfile\fPs are specified,
@@ -89,12 +86,13 @@ with this program and exits with a successful status.
 \fB\%@CAPTOINFO@\fP translates some obsolete,
 nonstandard capabilities into standard
 (SVr4/XSI Curses)
-\fI\%terminfo\fP capabilities.
+\fI\%\%term\%info\fP capabilities.
 It issues a diagnostic to the standard error stream for each,
 inviting the user to check that it has not mistakenly translated an
 unknown or mistyped capability name.
 .PP
 .TS
+center;
 Cb S
 Cb Cb Cb Cb
 Cb Cb C  Lb.
@@ -137,6 +135,7 @@ corresponding to box drawing characters of CCSID
 as follows.
 .PP
 .TS
+center;
 cb cb
 cb l .
 \f(BItermcap\fP Name	Graphic
@@ -176,12 +175,13 @@ string,
 and discards \fBGG\fP and double-line capabilities with a warning
 diagnostic.
 .PP
-IBM's AIX has a \fI\%terminfo\fP facility descended from SVr1
-\fI\%terminfo\fP,
+IBM's AIX has a \fI\%\%term\%info\fP facility descended from SVr1
+\fI\%\%term\%info\fP,
 but which is incompatible with the SVr4 format.
 \fB\%@CAPTOINFO@\fP translates the following AIX extensions.
 .PP
 .TS
+center;
 cb cb
 l  l .
 IBM	XSI
@@ -198,25 +198,29 @@ Additionally,
 this program translates the AIX \fBbox1\fP capability to an \fBacsc\fP
 string.
 .PP
-The HP-UX \fI\%terminfo\fP library supports two nonstandard
-\fI\%terminfo\fP capabilities,
+The HP-UX \fI\%\%term\%info\fP library supports two nonstandard
+\fI\%\%term\%info\fP capabilities,
 \fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
 \fB\%@CAPTOINFO@\fP discards these with a warning message.
 .SH FILES
 .TP
 .I \*d
 default \fI\%termcap\fP terminal capability database
-.SH NOTES
-The verbose option is not identical to SVr4's.
-Under SVr4,
-instead of following the \fB\-v\fP with a trace level \fIn\fP,
-you repeat it \fIn\fP times.
 .SH PORTABILITY
 X/Open Curses,
 Issue 7 (2009) describes \fBtic\fP briefly,
 but omits this program.
+.PP
 SVr4 systems provide \fB\%captoinfo\fP as a separate application from
 \fBtic\fP.
+Its
+.B \-v
+option does not accept a trace level argument
+.I n;
+repeat
+.B \-v
+.I n
+times instead.
 .PP
 NetBSD does not provide this application.
 .SH AUTHORS
diff --git a/man/clear.1 b/man/clear.1
index 23d31bdf9..66aaa6efc 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.45 2023/12/02 20:49:04 tom Exp $
-.TH @CLEAR@ 1 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp $
+.TH @CLEAR@ 1 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,7 +69,8 @@ that type to determine how to perform these actions.
 The capabilities to clear the screen and scrollback buffer are named
 \*(``clear\*('' and \*(``E3\*('', respectively.
 The latter is a \fIuser-defined capability\fP,
-applying an extension mechanism introduced in \fIncurses\fP 5.0 (1999).
+applying an extension mechanism introduced in \fI\%ncurses\fP 5.0
+(1999).
 .SH OPTIONS
 \fB\%@CLEAR@\fP recognizes the following options.
 .TP 9 \" "-T type" + 2n
@@ -84,7 +85,7 @@ If this option is specified,
 \fI\%COLUMNS\fP as well.
 .TP
 .B \-V
-reports the version of \fIncurses\fP associated with this program and
+reports the version of \fI\%ncurses\fP associated with this program and
 exits with a successful status.
 .TP
 .B \-x
@@ -132,8 +133,8 @@ exec tput clear
 The remainder of the script in each case is a copyright notice.
 .PP
 In 1995,
-\fIncurses\fP's \fBclear\fP began by adapting BSD's original \fBclear\fP
-command to use \fIterminfo\fP.
+\fI\%ncurses\fP's \fBclear\fP began by adapting BSD's original
+\fBclear\fP command to use \fIterminfo\fP.
 The \fBE3\fP extension came later.
 .bP
 In June 1999, \fIxterm\fP provided an extension to the standard control
@@ -171,7 +172,7 @@ motivating the feature.
 .bP
 Subsequently,
 more terminal developers adopted the feature.
-The next relevant step was to change the \fIncurses\fP \fBclear\fP
+The next relevant step was to change the \fI\%ncurses\fP \fBclear\fP
 program in 2013 to incorporate this extension.
 .bP
 In 2013,
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 374597b41..227acc252 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.48 2023/11/25 14:20:05 tom Exp $
-.TH curs_add_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.49 2023/12/16 21:19:37 tom Exp $
+.TH curs_add_wch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,7 +106,7 @@ The \fBecho_wchar\fP
 function is functionally equivalent to a call to
 \fBadd_wch\fP
 followed by a call to
-\fBrefresh\fP(3X).
+\fB\%refresh\fP(3X).
 Similarly, the
 \fBwecho_wchar\fP
 is functionally equivalent to a call to
@@ -118,11 +118,11 @@ 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 *\fBecho\fP* functions instead of their equivalents.
 .SS Line Graphics
-Like \fBaddch\fP(3X),
+Like \fB\%addch\fP(3X),
 \fBaddch_wch\fP 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
-\fBaddch\fP(3X).
+\fB\%addch\fP(3X).
 .PP
 .TS
 l l l l l
@@ -165,7 +165,7 @@ WACS_URCORNER	0x2510 	+	k	upper right-hand corner
 WACS_VLINE	0x2502 	|	x	vertical line
 .TE
 .PP
-The wide-character configuration of ncurses also defines symbols
+The wide-character configuration of \fI\%ncurses\fP also defines symbols
 for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
 .PP
 .TS
@@ -210,7 +210,8 @@ WACS_D_URCORNER	0x2557	+	B	double upper right corner
 WACS_D_VLINE	0x2551	|	Y	double vertical line
 .TE
 .PP
-Unicode's descriptions for these characters differs slightly from ncurses,
+Unicode's descriptions for these characters differs slightly from
+\fI\%ncurses\fP,
 by introducing the term \*(``light\*('' (along with less important details).
 Here are its descriptions for the normal, thick, and double horizontal lines:
 .bP
@@ -231,10 +232,10 @@ if it is not possible to add a complete character in the window.
 .PP
 The latter may be due to different causes:
 .bP
-If \fBscrollok\fP(3X) is not enabled,
+If \fB\%scrollok\fP(3X) is not enabled,
 writing a character at the lower right margin succeeds.
-However, an error is returned because
-it is not possible to wrap to a new line
+However,
+an error is returned because it is not possible to wrap to a new line.
 .bP
 If an error is detected when converting a multibyte character to a sequence
 of bytes,
@@ -282,14 +283,16 @@ Existing implementations of Unix curses (AIX, HP-UX, Solaris)
 use only the \fBacsc\fP character-mapping to provide this feature.
 As a result, those implementations can only use single-byte line-drawing
 characters.
-Ncurses 5.3 (2002) provided a table of Unicode values to solve these problems.
+\fI\%ncurses\fP 5.3 (2002) provided a table of Unicode values to solve
+these problems.
 NetBSD curses incorporated that table in 2010.
 .PP
 In this implementation, the Unicode values are used instead of the
-terminal description's \fBacsc\fP mapping as discussed in ncurses(3X)
-for the environment variable \fBNCURSES_NO_UTF8_ACS\fP.
+terminal description's \fBacsc\fP mapping as discussed in
+\fB\%ncurses\fP(3X) for the environment variable
+\fINCURSES_NO_UTF8_ACS\fP.
 In contrast, for the same cases, the line-drawing characters
-described in \fBcurs_addch\fP(3X) will use only the ASCII default values.
+described in \fB\%addch\fP(3X) will use only the ASCII default values.
 .PP
 Having Unicode available does not solve all of the problems with
 line-drawing for curses:
@@ -338,7 +341,7 @@ describing only the cases where \fIwch\fP is a spacing character
 or a non-spacing character.
 .PP
 This implementation assumes that \fIwch\fP is constructed using
-\fBsetcchar\fP(3X), and in turn that the result
+\fB\%setcchar\fP(3X), and in turn that the result
 .bP
 contains at most one spacing character in the beginning of its list of wide
 characters,
@@ -347,7 +350,8 @@ or
 .bP
 may hold one non-spacing character.
 .PP
-In the latter case, ncurses adds the non-spacing character to the active
+In the latter case,
+\fI\%ncurses\fP adds the non-spacing character to the active
 (base) spacing character.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 1df5b9d92..e61aee2f3 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.74 2023/11/25 14:20:05 tom Exp $
-.TH curs_addch 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.75 2023/12/16 21:19:37 tom Exp $
+.TH curs_addch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -76,13 +76,13 @@ If the advance is at the right margin:
 The cursor automatically wraps to the beginning of the next line.
 .bP
 At the bottom of the current scrolling region,
-and if \fBscrollok\fP(3X) is enabled,
+and if \fB\%scrollok\fP(3X) is enabled,
 the scrolling region is scrolled up one line.
 .bP
-If \fBscrollok\fP(3X) is not enabled,
+If \fB\%scrollok\fP(3X) is not enabled,
 writing a character at the lower right margin succeeds.
-However, an error is returned because
-it is not possible to wrap to a new line
+However,
+an error is returned because it is not possible to wrap to a new line.
 .PP
 If \fIch\fP is a tab, newline, carriage return or backspace,
 the cursor is moved appropriately within the window:
@@ -101,13 +101,13 @@ The tab interval may be altered by setting the \fBTABSIZE\fP variable.
 .PP
 If \fIch\fP is any other nonprintable character,
 it is drawn in printable form,
-using the same convention as \fBunctrl\fR(3X):
+using the same convention as \fB\%unctrl\fP(3X):
 .bP
 Control characters are displayed in the \fB^\fIX\fR notation.
 .bP
 Values above 128 are either meta characters
 (if the screen has not been initialized,
-or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP E parameter),
+or if \fB\%meta\fP(3X) has been called with a \fBTRUE\fP E parameter),
 shown in the \fBM\-\fIX\fR notation, or are displayed as themselves.
 In the latter case, the values may not be printable;
 this follows the X/Open specification.
@@ -119,12 +119,12 @@ but instead returns the printable representation of the character.
 Video attributes can be combined with a character argument passed to
 \fBaddch\fP or related functions by logical-ORing them into the character.
 (Thus, text, including attributes, can be copied from one place to another
-using \fBinch\fP(3X) and \fBaddch\fP.)  See the \fBcurs_attr\fP(3X) page for
-values of predefined video attribute constants that can be usefully OR'ed
-into characters.
+using \fB\%inch\fP(3X) and \fBaddch\fP.)
+See the \fB\%curs_attr\fP(3X) page for values of predefined video
+attribute constants that can be usefully OR'ed into characters.
 .SS Echoing characters
 The \fBechochar\fP and \fBwechochar\fP routines are equivalent to a call to
-\fBaddch\fP followed by a call to \fBrefresh\fP(3X), or a call to \fBwaddch\fP
+\fBaddch\fP followed by a call to \fB\%refresh\fP(3X), or a call to \fBwaddch\fP
 followed by a call to \fBwrefresh\fP.
 The knowledge that only a single
 character is being output is used and, for non-control characters, a
@@ -194,10 +194,10 @@ or if the window pointer is null.
 If it is not possible to add a complete character,
 an error is returned:
 .bP
-If \fBscrollok\fP(3X) is not enabled,
+If \fB\%scrollok\fP(3X) is not enabled,
 writing a character at the lower right margin succeeds.
-However, an error is returned because
-it is not possible to wrap to a new line
+However,
+an error is returned because it is not possible to wrap to a new line.
 .bP
 If an error is detected when converting a multibyte character to a sequence
 of bytes,
@@ -253,23 +253,26 @@ However, many publicly available terminfos
 include \fBacsc\fP strings in which their key characters (pryz{|}) are
 embedded, and a second-hand list of their character descriptions has come
 to light.
-The ACS-prefixed names for them were invented for \fBncurses\fP(3X).
+The ACS-prefixed names for them were invented for \fB\%ncurses\fP(3X).
 .LP
 The \fIdisplayed\fP values for the \fBACS_\fP and \fBWACS_\fP constants
 depend on
 .bP
-the library configuration, i.e., \fBncurses\fP versus \fBncursesw\fP,
+the library configuration,
+i.e.,
+\fI\%ncurses\fP versus \fI\%ncursesw\fP,
 where the latter is capable of displaying Unicode while the former is not, and
 .bP
 whether the \fIlocale\fP uses UTF-8 encoding.
 .LP
 In certain cases, the terminal is unable to display line-drawing characters
-except by using UTF-8 (see the discussion of \fBNCURSES_NO_UTF8_ACS\fP in
-ncurses(3X)).
+except by using UTF-8
+(see the discussion of \fB\%NCURSES_NO_UTF8_ACS\fP in
+\fB\%ncurses\fP(3X)).
 .SS Character Set
 X/Open Curses assumes that the parameter passed to \fBwaddch\fP contains
 a single character.
-As discussed in \fBcurs_attr\fP(3X), that character may have been
+As discussed in \fB\%curs_attr\fP(3X), that character may have been
 more than eight bits in an SVr3 or SVr4 implementation,
 but in the X/Open Curses model, the details are not given.
 The important distinction between SVr4 curses and X/Open Curses is
@@ -278,22 +281,22 @@ separated from the character information which is packed in a \fBchtype\fP
 to pass to \fBwaddch\fP.
 .PP
 In this implementation, \fBchtype\fP holds an eight-bit character.
-But ncurses allows multibyte characters to be passed in a succession
-of calls to \fBwaddch\fP.
+But \fI\%ncurses\fP allows multibyte characters to be passed in a
+succession of calls to \fBwaddch\fP.
 The other implementations do not do this;
 a call to \fBwaddch\fP passes exactly one character
 which may be rendered as one or more cells on the screen
 depending on whether it is printable.
 .PP
 Depending on the locale settings,
-ncurses will inspect the byte passed in each call to \fBwaddch\fP,
+\fI\%ncurses\fP will inspect the byte passed in each call to \fBwaddch\fP,
 and check if the latest call will continue a multibyte sequence.
 When a character is \fIcomplete\fP,
-ncurses displays the character and moves to the next position in the screen.
+\fI\%ncurses\fP displays the character and moves to the next position in the screen.
 .PP
 If the calling application interrupts the succession of bytes in
 a multibyte character by moving the current location (e.g., using \fBwmove\fP),
-ncurses discards the partially built character,
+\fI\%ncurses\fP discards the partially built character,
 starting over again.
 .PP
 For portability to other implementations,
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 1fc7c505d..475d3ab48 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.91 2023/12/02 21:05:24 tom Exp $
-.TH curs_attr 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.92 2023/12/16 21:07:24 tom Exp $
+.TH curs_attr 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -176,7 +176,8 @@ attr_set(A_BOLD, \fIpair\fP, NULL);
 .PP
 However, if the value does not fit, then the \fBCOLOR_PAIR\fP macro
 uses only the bits that fit.
-For example, because in ncurses \fBA_COLOR\fP has eight (8) bits,
+For example,
+because in \fI\%ncurses\fP \fBA_COLOR\fP has eight (8) bits,
 then \fBCOLOR_PAIR(\fI259\fB)\fR is 4
 (i.e., 259 is 4 more than the limit 255).
 .PP
@@ -200,8 +201,10 @@ The remaining \fBattr\fP* functions operate exactly like the corresponding
 \fBattr_\fP* functions, except that they take arguments of type \fBint\fP
 rather than \fBattr_t\fP.
 .PP
-There is no corresponding \fBattrget\fP function as such in X/Open Curses,
-although ncurses provides \fBgetattrs\fP (see curs_legacy(3X)).
+There is no corresponding \fB\%attrget\fP function as such
+in X/Open Curses,
+although \fI\%ncurses\fP provides \fB\%getattrs\fP
+(see \fB\%curs_legacy\fP(3X)).
 .\" ---------------------------------------------------------------------------
 .SS Change character rendition
 The routine \fBchgat\fP changes the attributes of a given number of characters
@@ -215,7 +218,7 @@ The \fBwchgat\fP function generalizes this to any window;
 the \fBmvwchgat\fP function does a cursor move before acting.
 .PP
 In these functions,
-the color \fIpair\fP argument is a color-pair index
+the color \fIpair\fP argument is a color pair index
 (as in the first argument of \fBinit_pair\fP, see \fBcurs_color\fP(3X)).
 .\" ---------------------------------------------------------------------------
 .SS Change window color
@@ -299,7 +302,7 @@ returns an error if the color pair parameter
 for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
 .bP
 does not return an error if either of the parameters of \fBwattr_get\fP
-used for retrieving attribute or color-pair values is \fBNULL\fP.
+used for retrieving attribute or color pair values is \fBNULL\fP.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
@@ -317,9 +320,9 @@ Color pair values can only be OR'd with attributes if the pair
 number is less than 256.
 The alternate functions such as \fBcolor_set\fP can pass a color pair
 value directly.
-However, ncurses ABI 4 and 5 simply OR this value
+However, \fI\%ncurses\fP ABI 4 and 5 simply OR this value
 within the alternate functions.
-You must use ncurses ABI 6 to support more than 256 color pairs.
+You must use \fI\%ncurses\fP ABI 6 to support more than 256 color pairs.
 .\" ---------------------------------------------------------------------------
 .SH EXTENSIONS
 This implementation provides the \fBA_ITALIC\fP attribute for terminals
@@ -335,7 +338,7 @@ Each of the functions added by XSI Curses has a parameter \fIopts\fP,
 which X/Open Curses still (after more than twenty years) documents
 as reserved for future use, saying that it should be \fBNULL\fP.
 This implementation uses that parameter in ABI 6 for the functions which
-have a color-pair parameter to support \fIextended color pairs\fP:
+have a color pair parameter to support \fIextended color pairs\fP:
 .bP
 For functions which modify the color, e.g.,
 \fBwattr_set\fP and \fBwattr_on\fP,
@@ -423,7 +426,7 @@ In this implementation (as in many others), the values happen to be
 the same because it simplifies copying information between
 \fBchtype\fP and \fBcchar_t\fP variables.
 .bP
-Because ncurses's \fBattr_t\fP can hold a color pair
+Because \fI\%ncurses\fP's \fBattr_t\fP can hold a color pair
 (in the \fBA_COLOR\fP field),
 a call to
 \fBwattr_on\fP,
@@ -534,8 +537,9 @@ That version of curses was dropped with HP-UX 11.30 in 2006.
 Regarding OSF/1 (and Tru64),
 .bP
 These used 64-bit hardware.
-Like ncurses, the OSF/1 curses interface is not customized for 32-bit
-and 64-bit versions.
+Like \fI\%ncurses\fP,
+the OSF/1 curses interface is not customized for 32-bit and 64-bit
+versions.
 .bP
 Unlike other systems which evolved from AT&T code,
 OSF/1 provided a new implementation for X/Open curses.
@@ -572,7 +576,8 @@ BSD curses was improved slightly in 1993/1994 using Keith Bostic's
 modification to make the library 8-bit clean for \fBnvi\fP(1).
 He moved \fIstandout\fP attribute to a structure member.
 .IP
-The resulting 4.4BSD curses was replaced by ncurses over the next ten years.
+The resulting 4.4BSD curses was replaced by \fI\%ncurses\fP over the
+next ten years.
 .bP
 U/Win is rarely used now.
 .\" ---------------------------------------------------------------------------
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 04fc2f4c4..159777465 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.51 2023/12/02 21:02:44 tom Exp $
-.TH curs_bkgd 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.54 2023/12/17 23:31:28 tom Exp $
+.TH curs_bkgd 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -55,116 +55,125 @@ manipulate background of a \fIcurses\fR window of characters
 .nf
 \fB#include <curses.h>
 .PP
-\fBvoid bkgdset(chtype \fIch\fP);
-\fBvoid wbkgdset(WINDOW *\fIwin\fP, chtype \fIch\fP);
-.PP
 \fBint bkgd(chtype \fIch\fP);
 \fBint wbkgd(WINDOW *\fIwin\fP, chtype \fIch\fP);
 .PP
+\fBvoid bkgdset(chtype \fIch\fP);
+\fBvoid wbkgdset(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
 \fBchtype getbkgd(WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
-.SS bkgdset
-The \fBbkgdset\fP and \fBwbkgdset\fP routines
-set the \fIbackground\fP for a window.
-A window's background is a \fBchtype\fP consisting of
-any combination of attributes (i.e., rendition) and a character:
-.bP
-The attribute part of the background is combined (OR'ed) with all non-blank
-characters that are written into the window with \fBwaddch\fP.
-.bP
-Both the character and attribute parts of the background are combined with
-blank characters that are written into the window.
-.PP
-The background becomes a property of each
-character and moves with the character through any scrolling and
-insert/delete line/character operations.
-.PP
-To the extent possible on a particular terminal,
-the attribute part of the background is displayed
-as the graphic rendition of the character put on the screen.
-.SS bkgd
-The \fBbkgd\fP and \fBwbkgd\fP functions
-set the background property of the current or specified window
-and then apply this setting to every character position in that window.
-According to X/Open Curses, it should do this:
+The
+.I background
+of a
+.I curses
+window
+(in the library's non-\*(``wide\*('' configuration)
+is a
+.I \%chtype
+combining a set of attributes
+(see \fB\%curs_attr\fP(3X))
+with a character called the
+.I "blank character."
+.PP
+The blank character is a spacing character that populates a window's
+character cells when their contents are erased without replacement.
+The background's attributes are combined with all non-blank characters
+written to the window,
+as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
+functions.
+.PP
+The blank character and attributes of the background combine with
+characters written to the window as described below.
+The background becomes a property of the character and moves with it
+through any scrolling and insert/delete line/character operations.
+.PP
+To the extent possible on a given terminal,
+the attribute part of the background is displayed as the graphic
+rendition of the character put on the screen.
+.SS "bkgd, wbkgd"
+\fB\%bkgd\fP and \fB\%wbkgd\fP set the background property of
+\fB\%stdscr\fP or the specified window and then apply this setting to
+every character cell in that window.
 .bP
-The rendition of every character on the screen is changed to
-the new background rendition.
+The rendition of every character in the window changes to the new
+background rendition.
 .bP
-Wherever the former background character
-appears, it is changed to the new background character.
+Wherever the former background character appears,
+it changes to the new background character.
 .PP
-Neither X/Open Curses nor the SVr4 manual pages give details about
-the way the rendition of characters on the screen is updated when
-\fBbkgd\fP or \fBwbkgd\fP is used to change the background character.
-.PP
-\fI\%ncurses\fP,
-like SVr4 \fIcurses\fP,
-does not store the background and window attribute contributions to each
-cell separately.
-It updates the rendition by comparing the character,
-non-color attributes and colors contained in the background.
-For each cell in the window, whether or not it is blank:
+.I \%ncurses
+updates the rendition of each character cell by comparing the character,
+non-color attributes,
+and colors.
+The library applies to following procedure to each cell in the window,
+whether or not it is blank.
 .bP
-The library first compares the \fIcharacter\fP,
-and if it matches the current character part of the background,
-it replaces that with the new background character.
-.IP
-When \fBbkgdset\fP is used to set the background character,
-that does not update each cell in the window.
-A subsequent call to \fBbkgd\fP will only modify the \fIcharacter\fP in
-cells which match the current background character.
+.I \%ncurses
+first compares the cell's character to the previously specified blank
+character;
+if they match,
+.I \%ncurses
+writes the new blank character to the cell.
 .bP
-The library then checks if the cell uses color,
-i.e., its color pair value is nonzero.
-If not, it simply replaces the attributes and color pair in the
-cell with those from the new background character.
+.I \%ncurses
+then checks if the cell uses color,
+that is,
+its color pair value is nonzero.
+If not,
+it simply replaces the attributes and color pair in the cell with those
+from the new background character.
 .bP
 If the cell uses color,
-and that matches the color in the current background,
-the library removes attributes
-which may have come from the current background
-and adds attributes from the new background.
-It finishes by setting the cell
-to use the color from the new background.
+and its background color matches that of the current window background,
+.I \%ncurses
+removes attributes that may have come from the current background and
+adds those from the new background.
+It finishes by setting the cell's background to use the new window
+background color.
 .bP
 If the cell uses color,
-and that does not match the color in the current background,
-the library updates only the non-color attributes,
-first removing those which may have come from the current background,
+and its background color does not match that of the current window
+background,
+.I \%ncurses
+updates only the non-color attributes,
+first removing those that may have come from the current background,
 and then adding attributes from the new background.
 .PP
-If the background's character value is zero (0), a space is assumed.
+.I \%ncurses
+treats a background character value of zero (0) as a blank character.
 .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.
+or if color has not been initialized with \fB\%start_color\fP(3X),
+.I \%ncurses
+ignores the new background character's color attribute.
+.SS "bkgdset, wbkgdset"
+\fB\%bkgdset\fP and \fB\%wbkgdset\fP manipulate the background of
+the applicable window,
+without updating the character cells as \fB\%bkgd\fP and
+\fB\%wbkgd\fP do;
+only future writes reflect the updated background.
 .SS getbkgd
-The \fBgetbkgd\fP function returns the given window's current background
-character/attribute pair.
+\fB\%getbkgd\fP obtains the given window's background character and
+attribute combination.
 .SH RETURN VALUE
 Functions returning an \fIint\fP return \fBOK\fP on success.
 \fB\%bkgd\fP returns \fBERR\fP if the library has not been initialized.
-\fB\%wbkgd\fP and \fB\%getbkgd\fP return \fBERR\fP if the \fI\%WINDOW\fP
+\fB\%wbkgd\fP and \fB\%getbkgd\fP return \fBERR\fP if a \fI\%WINDOW\fP
 pointer argument is null.
 .PP
-In contrast,
-the SVr4.0 manual says \fB\%bkgd\fP and \fB\%wbkgd\fP may return
-\fBOK\fP
-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
-which refers to the return value from \fB\%wrefresh\fP
-(used to implement the immediate repainting).
-SVr4 \fIcurses\fP \fB\%wrefresh\fP returns the number of characters
-written to the screen during the refresh.
-\fI\%ncurses\fP does not do that.
+\fB\%bkgdset\fP and \fBwbkgdset\fP do not return a value.
+.PP
+\fB\%getbkgd\fP returns a window's background character and attribute
+combination.
 .SH NOTES
 Unusually,
 there is no \fB\%wgetbkgd\fP function;
 \fB\%getbkgd\fP behaves as one would expect \fB\%wgetbkgd\fP to,
 accepting a \fI\%WINDOW\fP pointer argument.
 .PP
-Note that \fBbkgdset\fP and \fBbkgd\fP may be macros.
+\fB\%bkgd\fP and \fB\%bkgdset\fP may be available as macros.
 .PP
 X/Open Curses mentions that the character part of the background must
 be a single-byte value.
@@ -173,12 +182,42 @@ like SVr4 \fIcurses\fP,
 checks to ensure that,
 and will reuse the old background character if the check fails.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-It specifies that \fBbkgd\fP and \fBwbkgd\fP return \fBERR\fP on
-failure,
-but gives no failure conditions.
+X/Open Curses, Issue 4, describes these functions.
+It specifies that
+\fB\%bkgd\fP,
+\fB\%wbkgd\fP,
+and
+\fB\%getbkgd\fP
+return \fBERR\fP on failure
+(in the case of the last,
+this value is cast to
+.IR \%chtype ),
+but describes no failure conditions.
+.PP
+The SVr4.0 manual says that \fB\%bkgd\fP and \fB\%wbkgd\fP may return
+\fBOK\fP
+\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+which refers to the return value from \fB\%wrefresh\fP(3X),
+used to implement the immediate repainting.
+SVr4 \fIcurses\fP's \fB\%wrefresh\fP returns the number of characters
+written to the screen during the refresh.
+\fI\%ncurses\fP does not do that.
+.PP
+Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
+of characters on the screen updates when \fB\%bkgd\fP or \fB\%wbkgd\fP
+changes the background character.
+.I \%ncurses,
+like SVr4
+.I curses,
+does not
+(in its non-\*(``wide\*('' configuration)
+store the background and window attribute contributions to each
+character cell separately.
 .SH SEE ALSO
+\fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
+\*(``wide\*('' configuration of
+.I \%ncurses.
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
-\fB\%curs_attr\fP(3X),
-\fB\%curs_outopts\fP(3X)
+\fB\%curs_attr\fP(3X)
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index d870aa957..f2e75cff0 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.34 2023/12/02 21:30:00 tom Exp $
-.TH curs_bkgrnd 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.35 2023/12/16 23:00:21 tom Exp $
+.TH curs_bkgrnd 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -55,62 +66,150 @@ manipulate background of a \fIcurses\fP window of wide characters
 \fBint wgetbkgrnd(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
 .fi
 .SH DESCRIPTION
-.SS bkgrndset
-The \fBbkgrndset\fP and \fBwbkgrndset\fP routines manipulate the
-background of the named window.
-The window background is a \fBcchar_t\fP consisting of
-any combination of attributes (i.e., rendition) and a complex character.
+The
+.I background
+of a
+.I curses
+window
+(in the library's \*(``wide\*('' configuration)
+is a
+.I \%cchar_t
+combining a set of attributes
+(see \fB\%curs_attr\fP(3X))
+with a complex character called the
+.I "blank character."
+.PP
+The blank character is a spacing character that populates a window's
+character cells when their contents are erased without replacement.
+The background's attributes are combined with all non-blank characters
+written to the window,
+as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
+functions.
+.PP
+The blank character and attributes of the background combine with
+characters written to the window as described below.
+The background becomes a property of the character and moves with it
+through any scrolling and insert/delete line/character operations.
+.PP
+To the extent possible on a given terminal,
+the attribute part of the background is displayed as the graphic
+rendition of the character put on the screen.
+.SS "bkgrnd, wbkgrnd"
+\fB\%bkgrnd\fP and \fB\%wbkgrnd\fP set the background property of
+\fB\%stdscr\fP or the specified window and then apply this setting to
+every character cell in that window.
 .bP
-The attribute part of the background is combined (OR'ed) with all non-blank
-characters that are written into the window with \fBwaddch\fP.
+The rendition of every character in the window changes to the new
+background rendition.
 .bP
-Both
-the character and attribute parts of the background are combined with
-the blank characters.
+Wherever the former background character appears,
+it changes to the new background character.
 .PP
-The background becomes a property of the
-character and moves with the character through any scrolling and
-insert/delete line/character operations.
-.PP
-To the extent possible on a
-particular terminal, the attribute part of the background is displayed
-as the graphic rendition of the character put on the screen.
-.SS bkgrnd
-The \fBbkgrnd\fP and \fBwbkgrnd\fP functions
-set the background property of the current or specified window
-and then apply this setting to every character position in that window:
+.I \%ncurses
+updates the rendition of each character cell by comparing the character,
+non-color attributes,
+and colors.
+The library applies to following procedure to each cell in the window,
+whether or not it is blank.
+.bP
+.I \%ncurses
+first compares the cell's character to the previously specified blank
+character;
+if they match,
+.I \%ncurses
+writes the new blank character to the cell.
+.bP
+.I \%ncurses
+then checks if the cell uses color,
+that is,
+its color pair value is nonzero.
+If not,
+it simply replaces the attributes and color pair in the cell with those
+from the new background character.
 .bP
-The rendition of every character on the screen is changed to
-the new background rendition.
+If the cell uses color,
+and its background color matches that of the current window background,
+.I \%ncurses
+removes attributes that may have come from the current background and
+adds those from the new background.
+It finishes by setting the cell's background to use the new window
+background color.
 .bP
-Wherever the former background character
-appears, it is changed to the new background character.
-.SS getbkgrnd
-The \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP functions obtain the given
-or specified window's current background character and attribute pair
-and store it via the
+If the cell uses color,
+and its background color does not match that of the current window
+background,
+.I \%ncurses
+updates only the non-color attributes,
+first removing those that may have come from the current background,
+and then adding attributes from the new background.
+.PP
+.I \%ncurses
+treats a background character value of zero (0) as a blank character.
+.PP
+If the terminal does not support color,
+or if color has not been initialized with \fB\%start_color\fP(3X),
+.I \%ncurses
+ignores the new background character's color attribute.
+.SS "bkgrndset, wbkgrndset"
+\fB\%bkgrndset\fP and \fB\%wbkgrndset\fP manipulate the background of
+the applicable window,
+without updating the character cells as \fB\%bkgrnd\fP and
+\fB\%wbkgrnd\fP do;
+only future writes reflect the updated background.
+.SS "getbkgrnd, wgetbkgrnd"
+The \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP functions obtain the
+background character and attribute pair of \fB\%stdscr\fP or the
+specified window and store it via the
 .I wch
 pointer.
 .SH RETURN VALUE
-The \fBbkgrndset\fP and \fBwbkgrndset\fP routines do not return a value.
+\fBbkgrndset\fP and \fBwbkgrndset\fP do not return a value.
 .PP
-Upon successful completion, the other functions return \fBOK\fP.
-Otherwise, they return \fBERR\fP:
+The other functions return
+.B ERR
+upon failure and
+.B OK
+upon success.
+In
+.I \%ncurses,
+failure occurs if
 .bP
-A null \fI\%WINDOW\fP pointer is treated as an error.
+a
+.I \%WINDOW
+pointer
+.I win
+is null, or
 .bP
-A null \fI\%cchar_t\fP pointer is treated as an error.
+a
+.I \%cchar_t
+pointer
+.I wch
+is null.
 .SH NOTES
 \fB\%bkgrnd\fP,
 \fB\%bkgrndset\fP, and
 \fB\%getbkgrnd\fP
 may be available as macros.
 .PP
-X/Open Curses does not provide details on how the rendition is changed.
-This implementation follows the approach used in SVr4 curses,
-which is explained in the manual page for \fBwbkgd\fP.
+Unlike their counterparts in the non-\*(``wide\*('' configuration of
+.I \%ncurses,
+\fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
+and attribute in a modifiable
+.I \%cchar_t
+parameter,
+not as the return value.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+X/Open Curses, Issue 4, describes these functions.
+It specifies no error conditions for them.
+.PP
+X/Open Curses does not provide details of how the rendition is updated.
+This implementation follows the approach used in SVr4
+.I curses.
 .SH SEE ALSO
+\fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
+non-\*(``wide\*('' configuration of
+.I \%ncurses.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_bkgd\fP(3X)
+\fB\%curs_add_wch\fP(3X),
+\fB\%curs_attr\fP(3X)
diff --git a/man/curs_border.3x b/man/curs_border.3x
index b8582bfc7..5d5bdcea3 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.43 2023/11/25 11:31:27 tom Exp $
-.TH curs_border 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.44 2023/12/16 21:09:11 tom Exp $
+.TH curs_border 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -137,8 +137,9 @@ The line is at most \fIn\fP characters
 long, or as many as fit into the window.
 .SH RETURN VALUE
 All routines return the integer \fBOK\fP.
-The SVr4.0 manual says "or a
-non-negative integer if \fBimmedok\fP is set", but this appears to be an error.
+The SVr4.0 manual says
+\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+but this appears to be an error.
 .PP
 X/Open does not define any error conditions.
 This implementation returns an error
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 7349a14ca..de9ee2ed6 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.40 2023/11/25 11:31:27 tom Exp $
-.TH curs_clear 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.41 2023/12/16 21:09:11 tom Exp $
+.TH curs_clear 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -95,8 +106,8 @@ Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .PP
-The SVr4.0 manual says that these functions could
-return "a non-negative integer if \fBimmedok\fP(3X) is set",
+The SVr4.0 manual says that these functions could return
+\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
 referring to the return-value of \fBwrefresh\fP.
 In that implementation, \fBwrefresh\fP would return a count of
 the number of characters written to the terminal.
@@ -105,7 +116,7 @@ Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
 \fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
 This will not work under
-ncurses.
+\fI\%ncurses\fP.
 .PP
 This implementation, and others such as Solaris,
 sets the current position to 0,0 after erasing
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 20c0fbde6..9cf9165e5 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.92 2023/11/25 17:36:51 tom Exp $
-.TH curs_color 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.93 2023/12/16 21:07:24 tom Exp $
+.TH curs_color 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,7 +59,17 @@
 \fB\%extended_pair_content\fP,
 \fB\%reset_color_pairs\fP,
 \fB\%COLOR_PAIR\fP,
-\fB\%PAIR_NUMBER\fP \-
+\fB\%PAIR_NUMBER\fP,
+\fB\%COLORS\fP,
+\fB\%COLOR_PAIRS\fP,
+\fB\%COLOR_BLACK\fP,
+\fB\%COLOR_RED\fP,
+\fB\%COLOR_GREEN\fP,
+\fB\%COLOR_YELLOW\fP,
+\fB\%COLOR_BLUE\fP,
+\fB\%COLOR_MAGENTA\fP,
+\fB\%COLOR_CYAN\fP,
+\fB\%COLOR_WHITE\fP \-
 manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
 .nf
@@ -86,17 +96,17 @@ manipulate terminal colors with \fIcurses\fR
 \fBvoid reset_color_pairs(void);
 .PP
 \fBint COLOR_PAIR(int \fIn\fP);
-\fBPAIR_NUMBER(\fIattrs\fP);
+\fBPAIR_NUMBER(int \fIattr\fP);
 .fi
 .SH DESCRIPTION
 .SS Overview
 \fIcurses\fP supports color attributes on terminals with that capability.
 To use these routines \fB\%start_color\fP must be called, usually right after
 \fB\%initscr\fP.
-Colors are always used in pairs (referred to as color-pairs).
-A color-pair consists of a foreground color (for characters) and a background
+Colors are always used in pairs (referred to as color pairs).
+A color pair consists of a foreground color (for characters) and a background
 color (for the blank field on which the characters are displayed).
-A programmer initializes a color-pair with the routine \fB\%init_pair\fP.
+A programmer initializes a color pair with the routine \fB\%init_pair\fP.
 After it has been initialized, \fB\%COLOR_PAIR\fP(\fIn\fP)
 can be used to convert the pair to a video attribute.
 .PP
@@ -110,7 +120,7 @@ The routine \fB\%color_content\fP allows a
 programmer to extract the amounts of red, green, and blue components in an
 initialized color.
 The routine \fB\%pair_content\fP allows a programmer to find
-out how a given color-pair is currently defined.
+out how a given color pair is currently defined.
 .SS Color Rendering
 The \fIcurses\fP library combines these inputs to produce the
 actual foreground and background colors shown on the screen:
@@ -191,7 +201,7 @@ It is good practice to call this routine right after \fB\%initscr\fP.
 .bP
 It initializes two global variables, \fB\%COLORS\fP and
 \fB\%COLOR_PAIRS\fP (respectively defining the maximum number of colors
-and color-pairs the terminal can support).
+and color pairs the terminal can support).
 .bP
 It initializes the special color pair \fB\%0\fP to the default foreground
 and background colors.
@@ -265,9 +275,9 @@ and can change their definitions;
 other, it returns \fBFALSE\fP.
 This routine facilitates writing terminal-independent programs.
 .SS init_pair
-The \fB\%init_pair\fP routine changes the definition of a color-pair.
+The \fB\%init_pair\fP routine changes the definition of a color pair.
 It takes three arguments:
-the number of the color-pair to be changed, the foreground
+the number of the color pair to be changed, the foreground
 color number, and the background color number.
 For portable applications:
 .bP
@@ -278,20 +288,21 @@ a default color in foreground and/or background.
 .bP
 The second and third arguments must be valid color values.
 .PP
-If the color-pair was previously initialized,
-the screen is refreshed and all occurrences of that color-pair
+If the color pair was previously initialized,
+the screen is refreshed and all occurrences of that color pair
 are changed to the new definition.
 .PP
-As an extension, ncurses allows you to set color pair \fB0\fP via
-the \fB\%assume_default_colors\fP(3X) routine, or to specify the use of
+As an extension,
+\fI\%ncurses\fP allows you to set color pair \fB0\fP via the
+\fB\%assume_default_colors\fP(3X) routine, or to specify the use of
 default colors (color number \fB\-1\fP) if you first invoke the
 \fB\%use_default_colors\fP(3X) routine.
 .SS init_extended_pair
 Because \fB\%init_pair\fP uses signed \fBshort\fPs for its parameters,
-that limits color-pairs and color-values
+that limits color pairs and color-values
 to 32767 on modern hardware.
 The extension \fB\%init_extended_pair\fP uses \fBint\fPs
-for the color-pair and color-value,
+for the color pair and color-value,
 allowing a larger number of colors to be supported.
 .SS init_color
 The \fB\%init_color\fP routine changes the definition of a color.
@@ -342,8 +353,8 @@ for returning the red, green, and blue components,
 allowing a larger number of colors to be supported.
 .SS pair_content
 The \fB\%pair_content\fP routine allows programmers to find out what colors a
-given color-pair consists of.
-It requires three arguments: the color-pair
+given color pair consists of.
+It requires three arguments: the color pair
 number, and two addresses of \fBshort\fRs for storing the foreground and the
 background color numbers.
 .bP
@@ -355,26 +366,28 @@ to by the second and third arguments are in the
 range \fB0\fP through \fB\%COLORS\fP, inclusive.
 .SS extended_pair_content
 Because \fB\%pair_content\fP uses signed \fBshort\fPs for its parameters,
-that limits color-pair and color-values to 32767 on modern hardware.
+that limits color pair and color-values to 32767 on modern hardware.
 The extension \fB\%extended_pair_content\fP uses \fBint\fPs
 for the color pair and
 for returning the foreground and background colors,
 allowing a larger number of colors to be supported.
 .SS reset_color_pairs
-The extension \fB\%reset_color_pairs\fP tells ncurses to discard all
-of the color-pair information which was set with \fB\%init_pair\fP.
+The extension \fB\%reset_color_pairs\fP tells \fI\%ncurses\fP to discard
+all of the color pair information which was set with \fB\%init_pair\fP.
 It also touches the current- and standard-screens, allowing an application to
 switch color palettes rapidly.
-.SS PAIR_NUMBER
-\fB\%PAIR_NUMBER(\fIattrs\fR) extracts the color
-value from its \fIattrs\fP parameter and returns it as a color pair number.
 .SS COLOR_PAIR
-Its inverse \fB\%COLOR_PAIR(\fIn\fB)\fR converts a color pair number
-to an attribute.
+\fB\%COLOR_PAIR(\fIn\fB)\fR converts a color pair number to an
+attribute.
 Attributes can hold color pairs in the range 0 to 255.
-If you need a color pair larger than that, you must use functions
-such as \fB\%attr_set\fP (which pass the color pair as a separate parameter)
+If you need a color pair larger than that,
+you must use functions such as \fB\%attr_set\fP
+(which pass the color pair as a separate parameter)
 rather than the legacy functions such as \fB\%attrset\fP.
+.SS PAIR_NUMBER
+\fB\%PAIR_NUMBER(\fIattr\fR) extracts the color information from its
+\fIattr\fP parameter and returns it as a color pair number;
+it is the inverse operation of \fB\%COLOR_PAIR\fP.
 .SH RETURN VALUE
 The routines \fB\%can_change_color\fP and \fB\%has_colors\fP return \fBTRUE\fP
 or \fBFALSE\fP.
@@ -421,7 +434,8 @@ from the terminal description.
 returns an error if the color table cannot be allocated.
 .RE
 .SH NOTES
-In the \fIncurses\fP implementation, there is a separate color activation flag,
+In the \fI\%ncurses\fP implementation,
+there is a separate color activation flag,
 color palette, color pairs table,
 and associated \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP counts
 for each screen; the \fB\%start_color\fP function only affects the current
@@ -449,7 +463,8 @@ Paradise and compatibles) do the wrong thing when you try to set a bright
 .bP
 Color RGB values are not settable.
 .SH EXTENSIONS
-The functions marked as extensions were designed for \fBncurses\fP(3X),
+The functions marked as extensions were designed for
+\fB\%ncurses\fP(3X),
 and are not found in SVr4 curses, 4.4BSD curses,
 or any other previous version of curses.
 .SH PORTABILITY
@@ -478,7 +493,8 @@ This implementation provides extended versions of those functions
 which use \fBshort\fP parameters,
 allowing applications to use larger color- and pair-numbers.
 .PP
-The \fB\%reset_color_pairs\fP function is an extension of ncurses.
+The \fB\%reset_color_pairs\fP function is an extension of
+\fI\%ncurses\fP.
 .SH HISTORY
 SVr3.2 introduced color support to curses in 1987.
 .PP
@@ -503,29 +519,29 @@ along with changing \fB\%chtype\fP from 16-bits to 32-bits.
 .bP
 X/Open Curses (1992-present)
 added a new structure \fB\%cchar_t\fP to store the character,
-attributes and color-pair values, allowing increased range of color-pairs.
-Both color-pairs and color-values used a signed \fBshort\fP,
+attributes and color pair values, allowing increased range of color pairs.
+Both color pairs and color-values used a signed \fBshort\fP,
 limiting values to 15 bits.
 .bP
-ncurses (1992-present) uses eight bits
+\fI\%ncurses\fP (1992-present) uses eight bits
 for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
 .IP
 Version 5.3 provided a wide-character interface (2002),
-but left color-pairs as part of the attributes-field.
+but left color pairs as part of the attributes-field.
 .IP
 Since version 6 (2015),
-ncurses uses a separate \fBint\fP for color-pairs in the \fB\%cchar_t\fP values.
-When those color-pair values fit in 8 bits,
-ncurses allows color-pairs to be manipulated
+ncurses uses a separate \fBint\fP for color pairs in the \fB\%cchar_t\fP values.
+When those color pair values fit in 8 bits,
+ncurses allows color pairs to be manipulated
 via the functions using \fB\%chtype\fP values.
 .bP
 NetBSD curses used 6 bits from
 2000 (when colors were first supported) until 2004.
 At that point, NetBSD changed to use 10 bits.
 As of 2021, that size is unchanged.
-Like ncurses before version 6,
-the NetBSD color-pair information is stored in
-the attributes field of \fB\%cchar_t\fP, limiting the number of color-pairs
+Like \fI\%ncurses\fP before version 6,
+the NetBSD color pair information is stored in
+the attributes field of \fB\%cchar_t\fP, limiting the number of color pairs
 by the size of the bitfield.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 81028fda1..2f42bf020 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.29 2023/10/07 21:19:07 tom Exp $
-.TH curs_delch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_delch.3x,v 1.30 2023/12/16 21:09:11 tom Exp $
+.TH curs_delch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -63,9 +63,10 @@ not change (after moving to \fIy\fP, \fIx\fP, if specified).
 (This does not
 imply use of the hardware delete character feature.)
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
-specifies only "an integer value other than \fBERR\fP") upon successful
-completion.
+All routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 3ef55d723..29b8bb57d 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.33 2023/11/25 14:08:05 tom Exp $
-.TH curs_deleteln 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.34 2023/12/16 21:33:34 tom Exp $
+.TH curs_deleteln 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .SH NAME
 \fB\%deleteln\fP,
 \fB\%wdeleteln\fP,
@@ -69,9 +80,10 @@ The current cursor position remains the same.
 The \fBinsertln\fP and \fBwinsertln\fP routines insert a blank line above the
 current line and the bottom line is lost.
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
-specifies only "an integer value other than \fBERR\fP") upon successful
-completion.
+These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 X/Open defines no error conditions.
 In this implementation,
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 873870662..54cb1e7f5 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.42 2023/11/25 14:26:30 tom Exp $
-.TH curs_extend 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.43 2023/12/16 20:32:22 tom Exp $
+.TH curs_extend 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,7 +81,7 @@ this in your application.
 \fBuse_extended_names\fP returns the previous state, allowing you to
 save this and restore it.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 4ec2c3ec8..6d7a3c3e9 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.41 2023/11/25 14:29:54 tom Exp $
-.TH curs_get_wstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.42 2023/12/16 20:32:22 tom Exp $
+.TH curs_get_wstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -208,12 +208,12 @@ This implementation counts the terminator in the length.
 X/Open Curses does not specify what happens if the length \fIn\fP is negative.
 .bP
 For analogy with \fBwgetnstr\fP,
-ncurses 6.2 uses a limit (based on \fBLINE_MAX\fP).
+\fI\%ncurses\fP 6.2 uses a limit (based on \fBLINE_MAX\fP).
 .bP
 Some other implementations (such as Solaris xcurses) do the same,
 while others (PDCurses) do not allow this.
 .bP
-NetBSD 7 curses imitates ncurses 6.1 in this regard,
+NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
 treating a \fB\-1\fP as an indefinite number of characters.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 1f2f74502..760b85bd2 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.42 2023/11/25 14:30:18 tom Exp $
-.TH curs_getcchar 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.43 2023/12/16 21:07:24 tom Exp $
+.TH curs_getcchar 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -66,7 +66,7 @@ Extracts information from a \fBcchar_t\fP value \fIwcval\fP
 .bP
 Stores the character attributes in the location pointed to by \fIattrs\fP
 .bP
-Stores the color-pair in the location pointed to by \fIcolor_pair\fP
+Stores the color pair in the location pointed to by \fIcolor_pair\fP
 .bP
 Stores the wide-character string,
 characters referenced by \fIwcval\fP, into the array pointed to by \fIwch\fP.
@@ -98,11 +98,11 @@ The string must be L'\e0' terminated,
 contain at most one spacing character,
 which must be the first.
 .IP
-Up to \fBCCHARW_MAX\fP\-1 nonspacing characters may follow.
-Additional nonspacing characters are ignored.
+Up to \fBCCHARW_MAX\fP\-1 non-spacing characters may follow.
+Additional non-spacing characters are ignored.
 .IP
 The string may contain a single control character instead.
-In that case, no nonspacing characters are allowed.
+In that case, no non-spacing characters are allowed.
 .SH RETURN VALUE
 When \fIwch\fP is a null pointer,
 \fBgetcchar\fP returns the number of wide characters referenced by
@@ -123,7 +123,7 @@ If \fIwcval\fP is constructed by any other means, the effect is unspecified.
 X/Open Curses documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
 This implementation
-uses that parameter in ABI 6 for the functions which have a color-pair
+uses that parameter in ABI 6 for the functions which have a color pair
 parameter to support extended color pairs:
 .bP
 For  functions  which modify the color, e.g., \fBsetcchar\fP,
@@ -135,7 +135,7 @@ if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
 and  used  to  retrieve  the color pair as an \fBint\fP value,
 in addition retrieving it via the standard pointer to \fBshort\fP parameter.
 .SH PORTABILITY
-The \fBCCHARW_MAX\fP symbol is specific to ncurses.
+The \fBCCHARW_MAX\fP symbol is specific to \fI\%ncurses\fP.
 X/Open Curses does not provide details for the layout of the \fBcchar_t\fP
 structure.
 It tells what data are stored in it:
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index cf7225b6c..690672971 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.75 2023/10/07 21:19:07 tom Exp $
-.TH curs_getch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.76 2023/12/16 21:01:28 tom Exp $
+.TH curs_getch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,7 +59,6 @@ get (or push back) characters from \fIcurses\fR terminal keyboard
 .PP
 .B int getch(void);
 .B int wgetch(WINDOW *\fIwin\fP);
-.PP
 .B int mvgetch(int \fIy\fP, int \fIx\fP);
 .B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
@@ -129,7 +128,7 @@ otherwise, the function key value is returned.
 For this reason, many terminals experience a delay between the time
 a user presses the escape key and the escape is returned to the program.
 .PP
-In \fBncurses\fP, the timer normally expires after
+In \fI\%ncurses\fP, the timer normally expires after
 the value in \fBESCDELAY\fP (see \fBcurs_variables\fP(3X)).
 If \fBnotimeout\fP is \fBTRUE\fP, the timer does not expire;
 it is an infinite (or very large) value.
@@ -280,8 +279,10 @@ This code is returned whether or not \fBkeypad\fP has been enabled.
 .B KEY_MOUSE
 is returned for mouse-events (see \fBcurs_mouse\fP(3X)).
 This code relies upon whether or not \fBkeypad\fP(3X) has been enabled,
-because (e.g., with \fBxterm\fP(1) mouse prototocol) ncurses must
-read escape sequences,
+because
+(e.g.,
+with \fBxterm\fP(1) mouse prototocol)
+\fI\%ncurses\fP must read escape sequences,
 just like a function key.
 .SS Testing key-codes
 The \fBhas_key\fP routine takes a key-code value from the above list, and
@@ -331,7 +332,7 @@ keys, e.g.,
 Some curses implementations may differ according to whether they
 treat these control keys specially (and ignore the terminfo), or
 use the terminfo definitions.
-\fBNcurses\fP uses the terminfo definition.
+\fI\%ncurses\fP uses the terminfo definition.
 If it says that \fBKEY_ENTER\fP is control/M,
 \fBgetch\fP will return \fBKEY_ENTER\fP
 when you press control/M.
@@ -391,9 +392,9 @@ input timeout or non-blocking mode has been set.
 .PP
 \fBKEY_MOUSE\fP is mentioned in XSI Curses, along with a few related
 terminfo capabilities, but no higher-level functions use the feature.
-The implementation in ncurses is an extension.
+The implementation in \fI\%ncurses\fP is an extension.
 .PP
-\fBKEY_RESIZE\fP is an extension first implemented for ncurses.
+\fBKEY_RESIZE\fP is an extension first implemented for \fI\%ncurses\fP.
 NetBSD curses later added this extension.
 .PP
 Programmers concerned about portability should be prepared for either of two
@@ -401,7 +402,7 @@ cases: (a) signal receipt does not interrupt \fBgetch\fP; (b) signal receipt
 interrupts \fBgetch\fP and causes it to return \fBERR\fP with \fBerrno\fP set to
 \fBEINTR\fP.
 .PP
-The \fBhas_key\fP function is unique to \fBncurses\fP.
+The \fBhas_key\fP function is unique to \fI\%ncurses\fP.
 We recommend that
 any code using it be conditionalized on the \fBNCURSES_VERSION\fP feature macro.
 .SH SEE ALSO
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index a7d0c8ce3..08b39ab4d 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.51 2023/11/25 14:29:54 tom Exp $
-.TH curs_getstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.52 2023/12/16 20:32:22 tom Exp $
+.TH curs_getstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -203,7 +203,7 @@ X/Open Curses, Issue 7 (2009) changed that to say they
 to allow for the terminating NUL.
 As of 2018, some implementations count it, some do not:
 .bP
-ncurses 6.1 and PDCurses do not count the NUL in the given limit, while
+\fI\%ncurses\fP 6.1 and PDCurses do not count the NUL in the given limit, while
 .bP
 Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 .bP
@@ -231,15 +231,15 @@ that it is greater than zero.
 .IP
 A comment in NetBSD's source code states that this is specified in SUSv2.
 .bP
-ncurses (before 6.2) assumes no particular limit for the result
+\fI\%ncurses\fP (before 6.2) assumes no particular limit for the result
 from \fBwgetstr\fP, and treats the \fIn\fP parameter of \fBwgetnstr\fP
 like SVr4 curses.
 .bP
-ncurses 6.2 uses \fBLINE_MAX\fP,
+\fI\%ncurses\fP 6.2 uses \fBLINE_MAX\fP,
 or a larger (system-dependent) value
 which the \fBsysconf\fP function may provide.
 If neither \fBLINE_MAX\fP or \fBsysconf\fP is available,
-ncurses uses the POSIX value for \fBLINE_MAX\fP (a 2048 byte limit).
+\fI\%ncurses\fP uses the POSIX value for \fBLINE_MAX\fP (a 2048 byte limit).
 In either case, it reserves a byte for the terminating NUL.
 .PP
 Although \fBgetnstr\fP is equivalent to a series of calls to \fBgetch\fP,
@@ -269,18 +269,22 @@ They may take the \fIcbreak\fP
 mode set by the caller into account when deciding whether to handle
 echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.
 .bP
-The original ncurses (as \fIpcurses\fP in 1986) set \fBnoraw\fP and \fBcbreak\fP
-when accepting input for \fBgetnstr\fP.
+The original \fI\%ncurses\fP
+(as \fIpcurses\fP in 1986)
+set \fBnoraw\fP and \fBcbreak\fP when accepting input for \fBgetnstr\fP.
 That may have been done to make function- and cursor-keys work;
-it is not necessary with ncurses.
+it is not necessary with \fI\%ncurses\fP.
 .IP
-Since 1995, ncurses has provided signal handlers for INTR and QUIT
+Since 1995,
+\fI\%ncurses\fP has provided signal handlers for INTR and QUIT
 (e.g., \fB^C\fP or \fB^\e\fP).
 With the \fBnoraw\fP and \fBcbreak\fP settings,
 those may catch a signal and stop the program,
 where other implementations allow one to enter those characters in the buffer.
 .bP
-Starting in 2021 (ncurses 6.3), \fBgetnstr\fP sets \fBraw\fP,
+Starting in 2021
+(\fI\%ncurses\fP 6.3),
+\fBgetnstr\fP sets \fBraw\fP,
 rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
 SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
 .SH SEE ALSO
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index d75ebeb68..a358e7500 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.39 2023/10/21 10:28:36 tom Exp $
-.TH curs_getyx 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.40 2023/12/16 21:33:21 tom Exp $
+.TH curs_getyx 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .SH NAME
 \fB\%getyx\fP,
 \fB\%getparyx\fP,
@@ -60,7 +71,7 @@ The return values of these macros are undefined (i.e.,
 they should not be used as the right-hand side of assignment statements).
 .SH NOTES
 All of these interfaces are macros.
-A "\fB&\fP" is not necessary before the variables \fIy\fP and \fIx\fP.
+A \*(``&\*('' is not necessary before the variables \fIy\fP and \fIx\fP.
 .SH PORTABILITY
 The
 \fB\%getyx\fP,
@@ -92,7 +103,7 @@ Besides the problem of opaque structures,
 the data stored in like-named members may not have like-values in
 different implementations.
 For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values
-in \fIncurses\fP have
+in \fI\%ncurses\fP have
 (at least since release 1.8.1)
 differed by one from some other implementations.
 The difference is hidden by means of the macro \fB\%getmaxyx\fP.
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 4e5f14d8a..db92f6dfd 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_inch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.41 2023/12/16 21:08:16 tom Exp $
+.TH curs_inch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,13 +71,13 @@ Constants defined in
 extract the character or attributes alone.
 .
 .SS Attributes
-The following bit-masks may be AND-ed with characters returned by \fBwinch\fP.
+The following bit masks may be AND-ed with characters returned by \fBwinch\fP.
 .PP
 .TS
 l l .
-\fBA_CHARTEXT\fP	Bit-mask to extract character
-\fBA_ATTRIBUTES\fP	Bit-mask to extract attributes
-\fBA_COLOR\fP	Bit-mask to extract color-pair field information
+\fBA_CHARTEXT\fP	Bit mask to extract character
+\fBA_ATTRIBUTES\fP	Bit mask to extract attributes
+\fBA_COLOR\fP	Bit mask to extract color pair field information
 .TE
 .SH RETURN VALUE
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index ea9c516a4..fcb73d677 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.56 2023/12/03 00:09:54 tom Exp $
-.TH curs_initscr 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.59 2023/12/17 23:56:04 tom Exp $
+.TH curs_initscr 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -181,7 +181,7 @@ X/Open specifies that portable applications must not
 call \fBinitscr\fP more than once:
 .bP
 The portable way to use \fBinitscr\fP is once only,
-using \fBrefresh\fP (see curs_refresh(3X))
+using \fB\%refresh\fP(3X)
 to restore the screen after \fBendwin\fP.
 .bP
 This implementation allows using \fBinitscr\fP after \fBendwin\fP.
@@ -208,14 +208,14 @@ SVr4 curses deletes the standard \fBWINDOW\fP structures
 \fBstdscr\fP and \fBcurscr\fP as well as a work area \fBnewscr\fP.
 SVr4 curses ignores other windows.
 .bP
-Since version 4.0 (1996), ncurses has maintained a list of all windows
-for each screen,
+Since version 4.0 (1996),
+\fI\%ncurses\fP has maintained a list of all windows for each screen,
 using that information to delete those windows when \fBdelscreen\fP is called.
 .bP
-NetBSD copied this feature of ncurses in 2001.
+NetBSD copied this feature of \fI\%ncurses\fP in 2001.
 PDCurses follows the SVr4 model,
 deleting only the standard \fBWINDOW\fP structures.
-.SS High-level versus low-level
+.SS "High-level versus Low-level"
 Different implementations may disagree regarding the level of some functions.
 For example, \fBSCREEN\fP (returned by \fBnewterm\fP) and
 \fBTERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
@@ -228,16 +228,16 @@ behavior depending on which structure holds the corresponding descriptor.
 For example
 .bP
 NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fBTERMINAL\fP.
-\fBncurses\fP and SVr4 use the descriptor in \fBSCREEN\fP.
+\fI\%ncurses\fP and SVr4 use the descriptor in \fBSCREEN\fP.
 .bP
-NetBSD and \fBncurses\fP use the descriptor
+NetBSD and \fI\%ncurses\fP use the descriptor
 in \fBTERMINAL\fP
 for terminal I/O modes,
 e.g.,
 \fBdef_shell_mode\fP(3X),
 \fBdef_prog_mode\fP(3X).
 SVr4 curses uses the descriptor in \fBSCREEN\fP.
-.SS Unset TERM Variable
+.SS "Unset \fITERM\fP Variable"
 If the \fITERM\fP variable is missing or empty, \fBinitscr\fP uses the
 value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the \fIgeneric\fP
@@ -245,7 +245,7 @@ which normally corresponds to a terminal entry with the \fIgeneric\fP
 Generic entries are detected by \fBsetupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle a missing/empty \fITERM\fP variable differently.
-.SS Signal Handlers
+.SS "Signal Handlers"
 Quoting from X/Open Curses Issue 7, section 3.1.1:
 .RS 5
 .PP
@@ -292,16 +292,16 @@ purpose than \fBSIGQUIT\fP (which is used in debugging).
 .B SIGTSTP
 This handles the \fIstop\fP signal, used in job control.
 When resuming the process, this implementation discards pending
-input with \fBflushinput\fP (see curs_util(3X)), and repaints the screen
+input with \fB\%flushinp\fP(3X), and repaints the screen
 assuming that it has been completely altered.
-It also updates the saved terminal modes with \fBdef_shell_mode\fP
-(see \fBcurs_kernel\fP(3X)).
+It also updates the saved terminal modes with
+\fB\%def_shell_mode\fP(3X).
 .TP 5
 .B SIGWINCH
 This handles the window-size changes which were ignored in
 the standardization efforts.
 The handler sets a (signal-safe) variable
-which is later tested in \fBwgetch\fP (see curs_getch(3X)).
+which is later tested in \fB\%wgetch\fP(3X).
 If \fBkeypad\fP has been enabled for the corresponding window,
 \fBwgetch\fP returns the key symbol \fBKEY_RESIZE\fP.
 At the same time, \fBwgetch\fP calls \fBresizeterm\fP to adjust the
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index fd07da5f2..d5d9c9685 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.58 2023/11/25 14:30:50 tom Exp $
-.TH curs_inopts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.59 2023/12/16 20:32:22 tom Exp $
+.TH curs_inopts 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,8 +103,8 @@ get and set \fIcurses\fR terminal input options
 \fBint is_raw(void);
 .fi
 .SH DESCRIPTION
-The \fIncurses\fP library provides several functions which let an application
-change the way input from the terminal is handled.
+The \fI\%ncurses\fP library provides several functions which let an
+application change the way input from the terminal is handled.
 Some are global, applying to all windows.
 Others apply only to a specific window.
 Window-specific settings are not automatically applied to new or derived
@@ -333,15 +333,15 @@ if the flag is reset, or
 \-1
 if the \fIcurses\fP library was not initialized.
 .PP
-These routines are specific to \fIncurses\fP.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fIncurses\fP extensions
+It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using NCURSES_VERSION.
 .SH PORTABILITY
 Except as noted in the section on extensions,
 these functions are described in the XSI Curses standard, Issue 4.
 .PP
-The \fIncurses\fP library obeys the XPG4 standard
+The \fI\%ncurses\fP library obeys the XPG4 standard
 and the historical practice of the
 AT&T \fIcurses\fP implementations,
 in that the echo bit is cleared when \fIcurses\fP
@@ -361,10 +361,11 @@ raw input wants a clean (ideally 8-bit clean) connection that the operating
 system will not alter.
 .PP
 When \fB\%keypad\fP is first enabled,
-\fIncurses\fP loads the key-definitions for the current terminal description.
+\fI\%ncurses\fP 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 \fB@TIC@\fP,
-then \fIncurses\fP also defines keys for the capabilities whose names
+then \fI\%ncurses\fP also defines keys for the capabilities whose names
 begin with \*(``k\*(''.
 The corresponding keycodes are generated and (depending on previous
 loads of terminal descriptions) may differ from one execution of a
@@ -386,12 +387,12 @@ and similar functions to return keycodes rely upon the order in which
 the strings are loaded.
 If more than one key definition has the same string value,
 then \fB\%wgetch\fP can return only one keycode.
-Most \fIcurses\fP implementations (including \fIncurses\fP)
+Most \fIcurses\fP implementations (including \fI\%ncurses\fP)
 load key definitions in the order
 defined by the array of string capability names.
 The last key to be loaded determines the keycode which will be returned.
-In \fIncurses\fP, you may also have extended capabilities interpreted as
-key definitions.
+In \fI\%ncurses\fP,
+you may also have extended capabilities interpreted as key definitions.
 These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
 key definition,
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index f059fceec..10000832d 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.29 2023/11/25 11:29:34 tom Exp $
-.TH curs_ins_wstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.30 2023/12/16 20:36:15 tom Exp $
+.TH curs_ins_wstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,9 +104,9 @@ or if the window pointer is null.
 .SH NOTES
 All but \fBwins_nwstr\fP may be macros.
 .PP
-If the first character in the string is a nonspacing character, these
+If the first character in the string is a non-spacing character, these
 functions will fail.
-XSI does not define what will happen if a nonspacing character follows
+XSI does not define what will happen if a non-spacing character follows
 a control character.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4,
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 37903968e..889ea4ac5 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.33 2023/10/07 21:19:07 tom Exp $
-.TH curs_insch 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.34 2023/12/16 21:09:11 tom Exp $
+.TH curs_insch 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -62,10 +62,10 @@ All characters to the right of the cursor are moved one space to the
 right, with the possibility of the rightmost character on the line being lost.
 The insertion operation does not change the cursor position.
 .SH RETURN VALUE
-All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 specifies only "an integer value other than \fBERR\fP")
-upon successful completion,
-unless otherwise noted in the preceding routine descriptions.
+These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 13835a4e8..20f42f38a 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.43 2023/11/25 17:58:25 tom Exp $
-.TH curs_instr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
+.TH curs_instr 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,8 +114,8 @@ is recommended.
 SVr4 does not
 document whether a length limit includes or excludes the trailing NUL.
 .PP
-The ncurses library extends the XSI description by allowing a negative
-value for \fIn\fP.
+The \fI\%ncurses\fP library extends the XSI description by allowing a
+negative value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 3ff80107b..cbb870605 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.49 2023/10/14 22:03:52 tom Exp $
-.TH curs_kernel 3X 2023-10-14 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.50 2023/12/16 20:32:22 tom Exp $
+.TH curs_kernel 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -197,12 +197,12 @@ of \fBcurs_set\fP \*(``is currently incorrect\*(''.
 This implementation gets it right, but it may be unwise to count
 on the correctness of the return value anywhere else.
 .PP
-Both ncurses and SVr4 will call \fBcurs_set\fP in \fBendwin\fP
+Both \fI\%ncurses\fP and SVr4 will call \fBcurs_set\fP in \fBendwin\fP
 if \fBcurs_set\fP
 has been called to make the cursor other than normal, i.e., either
 invisible or very visible.
-There is no way for ncurses to determine the initial cursor state to
-restore that.
+There is no way for \fI\%ncurses\fP to determine the initial cursor
+state to restore that.
 .SH PORTABILITY
 The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
 are not described in the XSI Curses standard, Issue 4.
@@ -213,7 +213,7 @@ as having return type int.
 This is misleading, as they are macros with no documented semantics
 for the return value.
 .PP
-If interrupted, ncurses restarts \fBnapms\fP.
+If interrupted, \fI\%ncurses\fP restarts \fBnapms\fP.
 That, and the limitation to 30 seconds,
 are different from other implementations.
 .SH SEE ALSO
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 0f52899c7..77d05ac34 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.31 2023/11/11 11:46:43 tom Exp $
-.TH curs_memleaks 3X 2023-11-11 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.32 2023/12/16 20:32:22 tom Exp $
+.TH curs_memleaks 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -62,15 +62,16 @@ check for memory leaks in \fIcurses\fR
 \fBvoid _nc_free_tinfo(int \fIcode\fP);
 .fi
 .SH DESCRIPTION
-These functions are used to simplify analysis of memory leaks in the ncurses
-library.
+These functions are used to simplify analysis of memory leaks in the
+\fI\%ncurses\fP library.
 .PP
 Any implementation of curses must not free the memory associated with
 a screen, since (even after calling \fB\%endwin\fP(3X)), it must be available
 for use in the next call to \fB\%refresh\fP(3X).
 There are also chunks of memory held for performance reasons.
 That makes it hard to analyze curses applications for memory leaks.
-When using the specially configured debugging version of the ncurses library,
+When using the specially configured debugging version of the
+\fI\%ncurses\fP library,
 applications can call functions which free those chunks of memory,
 simplifying the process of memory-leak checking.
 .PP
@@ -78,10 +79,11 @@ Some of the functions are named with a \*(``_nc_\*('' prefix
 because they are not intended for use in the non-debugging library:
 .TP 5
 \fB\%_nc_freeall\fP
-This frees (almost) all of the memory allocated by ncurses.
+This frees (almost) all of the memory allocated by \fI\%ncurses\fP.
 .TP 5
 \fB\%_nc_free_and_exit\fP
-This frees the memory allocated by ncurses (like \fB\%_nc_freeall\fP),
+This frees the memory allocated by \fI\%ncurses\fP
+(like \fB\%_nc_freeall\fP),
 and exits the program.
 It is preferred over \fB\%_nc_freeall\fP since some of that memory
 may be required to keep the application running.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index b65403ae2..64c8e0f53 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.81 2023/10/21 10:29:45 tom Exp $
-.TH curs_mouse 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.82 2023/12/16 21:08:16 tom Exp $
+.TH curs_mouse 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -180,11 +180,11 @@ It is useful for determining what subset of
 the screen windows enclose the location of a mouse event.
 .SS wmouse_trafo
 The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
-from stdscr-relative coordinates
+from \fB\%stdscr\fP-relative coordinates
 to coordinates relative to the given window or vice versa.
-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
+The resulting \fB\%stdscr\fP-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 \fB\%ripoffline\fP and \fB\%slk_init\fP(3X) calls, for example).
 .bP
 If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
@@ -200,7 +200,7 @@ not inside the window, \fBFALSE\fP is returned.
 If \fIto_screen\fP is
 \fBFALSE\fP, the pointers \fIpY, pX\fP must reference window-relative
 coordinates.
-They are converted to stdscr-relative coordinates if the
+They are converted to \fB\%stdscr\fP-relative coordinates if the
 window \fIwin\fP encloses this point.
 In this case the function returns \fBTRUE\fP.
 .bP
@@ -212,7 +212,7 @@ successful.
 .SS mouse_trafo
 The \fB\%mouse_trafo\fP function performs the same translation
 as \fB\%wmouse_trafo\fP,
-using stdscr for \fIwin\fP.
+using \fB\%stdscr\fP for \fIwin\fP.
 .SS mouseinterval
 The \fB\%mouseinterval\fP function sets the maximum time (in thousands of a
 second) that can elapse between press and release events for them to
@@ -222,33 +222,36 @@ This function returns the previous interval value.
 Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
 The default is one sixth of a second.
 .SS has_mouse
-The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver has been
-successfully initialized.
+The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
+has been successfully initialized,
+and \fBFALSE\fP otherwise.
 .PP
 Note that mouse events will be ignored when input is in cooked mode, and will
 cause an error beep when cooked mode is being simulated in a window by a
 function such as \fB\%getstr\fP that expects a linefeed for input-loop
 termination.
 .SH RETURN VALUE
+\fB\%has_mouse\fP,
+\fB\%wenclose\fP,
+\fB\%mouse_trafo\fP,
+and
+\fB\%wmouse_trafo\fP
+return \fBTRUE\fP or \fBFALSE\fP as noted above.
+.PP
 \fB\%getmouse\fP and \fB\%ungetmouse\fP
-return the integer \fBERR\fP upon failure or \fBOK\fP
-upon successful completion:
-.RS 3
-.TP 5
-\fB\%getmouse\fP
-returns an error.
+return \fBERR\fP upon failure and \fBOK\fP upon success.
+.PP
+\fB\%getmouse\fP fails if:
 .bP
-If no mouse driver was initialized, or
-if the mask parameter is zero,
+no mouse driver was initialized,
 .bP
-It returns an error if a mouse event was detected which did not match the
-current \fImousemask\fP.
+the mask of reportable events is zero,
 .bP
-It also returns an error if no more events remain in the queue.
-.TP 5
-\fB\%ungetmouse\fP
-returns an error if the FIFO is full.
-.RE
+a mouse event was detected that does not match the mask,
+.bP
+or if no more events remain in the queue.
+.PP
+\fB\%ungetmouse\fP returns an error if the event queue is full.
 .PP
 \fB\%mousemask\fP
 returns the mask of reportable events.
@@ -257,74 +260,13 @@ returns the mask of reportable events.
 returns the previous interval value, unless
 the terminal was not initialized.
 In that case, it returns the maximum interval value (166).
-.PP
-\fB\%wenclose\fP and \fB\%wmouse_trafo\fP
-are boolean functions returning \fBTRUE\fP or \fBFALSE\fP depending
-on their test result.
-.SH PORTABILITY
-These calls were designed for \fIncurses\fP, and are not found in SVr4
-\fIcurses\fP, 4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
-.PP
-SVr4 \fIcurses\fP had support for the mouse in a variant of \fBxterm\fP(1).
-It is mentioned in a few places, but with no supporting documentation:
-.bP
-the \*(``libcurses\*('' manual page lists functions for this feature
-which are prototyped in \fBcurses.h\fP:
-.PP
-.RS 8
-.EX
-extern int mouse_set(long int);
-extern int mouse_on(long int);
-extern int mouse_off(long int);
-extern int request_mouse_pos(void);
-extern int map_button(unsigned long);
-extern void wmouse_position(WINDOW *, int *, int *);
-extern unsigned long getmouse(void), getbmap(void);
-.EE
-.RE
-.bP
-the \*(``terminfo\*('' manual page lists capabilities for the feature
-.PP
-.RS 8
-.EX
-buttons           btns    BT       Number of buttons on the mouse
-get_mouse         getm    Gm       Curses should get button events
-key_mouse         kmous   Km       0631, Mouse event has occurred
-mouse_info        minfo   Mi       Mouse status information
-req_mouse_pos     reqmp   RQ       Request mouse position report
-.EE
-.RE
-.bP
-the interface made assumptions (as does \fIncurses\fP)
-about the escape sequences
-sent to and received from the terminal.
-.IP
-For instance
-the SVr4 \fIcurses\fP library used the \fB\%get_mouse\fP capability to tell the
-terminal which mouse button events it should send,
-passing the mouse-button bit-mask to the terminal.
-Also, it could ask the terminal
-where the mouse was using the \fB\%req_mouse_pos\fP capability.
-.IP
-Those features required a terminal which had been modified
-to work with \fIcurses\fP.
-They were not part of the X Consortium's xterm.
-.PP
-When developing the xterm mouse support for \fIncurses\fP in September 1995,
-Eric Raymond was uninterested in using the same interface due to its
-lack of documentation.
-Later, in 1998, Mark Hesseling provided support in
-PDCurses 2.3 using the SVr4 interface.
-PDCurses, however, does not use video terminals,
-making it unnecessary to be concerned about compatibility with the
-escape sequences.
-.PP
+.SH NOTES
 The feature macro \fB\%NCURSES_MOUSE_VERSION\fP is provided so the preprocessor
 can be used to test whether these features are present.
 If the interface is changed, the value of \fB\%NCURSES_MOUSE_VERSION\fP will be
 incremented.
 These values for \fB\%NCURSES_MOUSE_VERSION\fP may be
-specified when configuring \fIncurses\fP:
+specified when configuring \fI\%ncurses\fP:
 .RS 3
 .TP 3
 1
@@ -340,7 +282,7 @@ The mask uses 29 bits.
 The order of the \fB\%MEVENT\fP structure members is not guaranteed.
 Additional fields may be added to the structure in the future.
 .PP
-Under \fIncurses\fP, these calls are implemented using either
+Under \fI\%ncurses\fP, these calls are implemented using either
 xterm's built-in mouse-tracking API or
 platform-specific drivers including
 .RS 3
@@ -354,7 +296,7 @@ OS/2 EMX
 .PP
 If you are using an unsupported configuration,
 mouse events will not be visible to
-\fIncurses\fP (and the \fB\%mousemask\fP function will always
+\fI\%ncurses\fP (and the \fB\%mousemask\fP function will always
 return \fB0\fP).
 .PP
 If the terminfo entry contains a \fBXM\fP string,
@@ -384,6 +326,65 @@ They are distinct.
 For example, in xterm,
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
+.SH PORTABILITY
+These calls were designed for \fI\%ncurses\fP,
+and are not found in SVr4 \fIcurses\fP,
+4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
+.PP
+SVr4 \fIcurses\fP had support for the mouse in a variant of \fBxterm\fP(1).
+It is mentioned in a few places, but with no supporting documentation:
+.bP
+the \*(``libcurses\*('' manual page lists functions for this feature
+which are prototyped in \fBcurses.h\fP:
+.PP
+.RS 8
+.EX
+extern int mouse_set(long int);
+extern int mouse_on(long int);
+extern int mouse_off(long int);
+extern int request_mouse_pos(void);
+extern int map_button(unsigned long);
+extern void wmouse_position(WINDOW *, int *, int *);
+extern unsigned long getmouse(void), getbmap(void);
+.EE
+.RE
+.bP
+the \*(``terminfo\*('' manual page lists capabilities for the feature
+.PP
+.RS 8
+.EX
+buttons           btns    BT       Number of buttons on the mouse
+get_mouse         getm    Gm       Curses should get button events
+key_mouse         kmous   Km       0631, Mouse event has occurred
+mouse_info        minfo   Mi       Mouse status information
+req_mouse_pos     reqmp   RQ       Request mouse position report
+.EE
+.RE
+.bP
+the interface made assumptions (as does \fI\%ncurses\fP)
+about the escape sequences
+sent to and received from the terminal.
+.IP
+For instance
+the SVr4 \fIcurses\fP library used the \fB\%get_mouse\fP capability to tell the
+terminal which mouse button events it should send,
+passing the mouse-button bit mask to the terminal.
+Also, it could ask the terminal
+where the mouse was using the \fB\%req_mouse_pos\fP capability.
+.IP
+Those features required a terminal which had been modified
+to work with \fIcurses\fP.
+They were not part of the X Consortium's xterm.
+.PP
+When developing the xterm mouse support for \fI\%ncurses\fP in September
+1995,
+Eric Raymond was uninterested in using the same interface due to its
+lack of documentation.
+Later, in 1998, Mark Hesseling provided support in
+PDCurses 2.3 using the SVr4 interface.
+PDCurses, however, does not use video terminals,
+making it unnecessary to be concerned about compatibility with the
+escape sequences.
 .SH BUGS
 Mouse events from \fI\%xterm\fP are \fInot\fP ignored in cooked mode if
 they have been enabled by \fB\%mousemask\fP.
diff --git a/man/curs_move.3x b/man/curs_move.3x
index d3d656a09..41c912edd 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.32 2023/10/07 21:19:07 tom Exp $
-.TH curs_move 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_move.3x,v 1.33 2023/12/16 21:33:08 tom Exp $
+.TH curs_move 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -48,9 +59,10 @@ until \fBrefresh\fP(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\fP upon failure and \fBOK\fP (SVr4
-specifies only "an integer value other than \fBERR\fP") upon successful
-completion.
+These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 Specifically, they return an error
 if the window pointer is null, or
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 3eac44faf..090b490e0 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.40 2023/12/02 20:52:50 tom Exp $
-.TH curs_opaque 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.41 2023/12/16 20:32:22 tom Exp $
+.TH curs_opaque 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -78,7 +78,7 @@ obtain \fIcurses\fR window properties
 \fBint wgetscrreg(const WINDOW *\fIwin\fP, int *\fItop\fP, int *\fIbottom\fP);
 .fi
 .SH DESCRIPTION
-\fIncurses\fP provides functions returning properties of a
+\fI\%ncurses\fP provides functions returning properties of a
 \fI\%WINDOW\fP structure,
 allowing it to be \*(``opaque\*('' if
 the application defines the \fB\%NCURSES_OPAQUE\fP preprocessor symbol.
@@ -146,12 +146,12 @@ completion.
 .SH RETURN VALUE
 These functions return \fBTRUE\fP or \fBFALSE\fP except as noted.
 .SH NOTES
-\fIncurses\fP provides both a C function and a preprocessor macro for
+\fI\%ncurses\fP provides both a C function and a preprocessor macro for
 each function documented in this page.
 .SH PORTABILITY
-These routines are specific to \fIncurses\fP.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fIncurses\fP extensions
+It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 2fa712752..9c559fb5a 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.52 2023/11/25 14:08:05 tom Exp $
-.TH curs_outopts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.53 2023/12/16 20:32:22 tom Exp $
+.TH curs_outopts 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -169,8 +169,9 @@ emulators.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .PP
-From the outset, ncurses used \fBnl\fP/\fBnonl\fP to control the conversion
-of newlines to carriage return/line-feed on output as well as input.
+From the outset,
+\fI\%ncurses\fP used \fBnl\fP/\fBnonl\fP to control the conversion of
+newlines to carriage return/line-feed on output as well as input.
 XSI Curses documents only the use of these functions for input.
 This difference arose from converting the \fIpcurses\fP source
 (which used \fBioctl\fP calls with the \fBsgttyb\fP structure)
@@ -179,18 +180,18 @@ In the former, both input and output were controlled via a single
 option \fBCRMOD\fP,
 while the latter separates these features.
 Because that conversion interferes with output optimization,
-\fBnl\fP/\fBnonl\fP were amended after ncurses 6.2
+\fBnl\fP/\fBnonl\fP were amended after \fI\%ncurses\fP 6.2
 to eliminate their effect on output.
 .PP
 Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
 \fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
-This will not work under ncurses.
+This will not work under \fI\%ncurses\fP.
 .PP
 Earlier System V curses implementations specified that with \fBscrollok\fP
 enabled, any window modification triggering a scroll also forced a physical
 refresh.
-XSI Curses does not require this, and \fBncurses\fP avoids doing
+XSI Curses does not require this, and \fI\%ncurses\fP avoids doing
 it to perform better vertical-motion optimization at \fBwrefresh\fP
 time.
 .PP
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 422824b79..c4e2125ec 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.35 2023/11/25 11:29:34 tom Exp $
-.TH curs_overlay 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.36 2023/12/16 21:32:51 tom Exp $
+.TH curs_overlay 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .SH NAME
 \fB\%overlay\fP,
 \fB\%overwrite\fP,
@@ -63,9 +74,10 @@ If the argument \fIoverlay\fP is \fBtrue\fP,
 then copying is non-destructive,
 as in \fBoverlay\fP.
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure, and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 X/Open defines no error conditions.
 In this implementation,
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index a20c1c369..7c04ca0a1 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.49 2023/11/25 14:08:35 tom Exp $
-.TH curs_pad 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.50 2023/12/16 21:18:02 tom Exp $
+.TH curs_pad 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -57,16 +68,19 @@ create and display \fIcurses\fR pads
 .fi
 .SH DESCRIPTION
 .SS newpad
-The \fB\%newpad\fP routine creates and returns a pointer to a new pad data
-structure with the given number of lines, \fInlines\fP, and columns,
+\fB\%newpad\fP creates and returns a pointer to a new pad data structure
+with the given number of lines,
+\fInlines\fP,
+and columns,
 \fIncols\fP.
-A pad is like a window, except that it is not restricted by the
-screen size, and is not necessarily associated with a particular part of the
-screen.
-Pads can be used when a large window is needed, and only a part of the
-window will be on the screen at one time.
+A pad is like a window,
+except that it is not restricted by the screen size,
+and is not necessarily associated with a particular part of the screen.
+Pads can be used when a large window is needed,
+and only a part of the window will be on the screen at one time.
 Automatic refreshes of pads
-(e.g., from scrolling or echoing of input) do not occur.
+(as from scrolling or echoing of input)
+do not occur.
 .PP
 It is not valid to call \fB\%wrefresh\fP with a \fIpad\fP argument;
 call \fB\%prefresh\fP or \fB\%pnoutrefresh\fP instead.
@@ -126,14 +140,16 @@ It outputs one character to a pad and immediately refreshes the pad.
 It does this by a call to \fB\%wadd_wch\fP followed by a call
 to \fB\%prefresh\fP.
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+Functions that return an integer return \fBERR\fP upon failure and
+\fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
-Routines that return pointers return \fBNULL\fP on error, and set \fB\%errno\fP
-to \fB\%ENOMEM\fP.
+Functions that return pointers return \fBNULL\fP on error,
+and set \fB\%errno\fP to \fB\%ENOMEM\fP.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not define any error conditions.
 In this implementation
 .RS 3
 .TP 5
@@ -155,7 +171,7 @@ if the window is not really a pad, and the associated call
 to \fB\%wecho_wchar\fP returns an error.
 .RE
 .SH NOTES
-Note that \fB\%pechochar\fP may be a macro.
+\fB\%pechochar\fP may be a macro.
 .SH PORTABILITY
 BSD \fIcurses\fP has no \fIpad\fP feature.
 .PP
@@ -181,8 +197,8 @@ The behavior of \fB\%subpad\fP if the parent window is not
 a pad is undocumented,
 and is not checked by the vendor Unix implementations:
 .bP
-SVr4 \fIcurses\fP sets a flag in the \fB\%WINDOW\fP structure in \fB\%newpad\fP
-which tells if the window is a \fIpad\fP.
+SVr4 \fIcurses\fP sets a flag in the \fI\%WINDOW\fP structure in
+\fB\%newpad\fP which tells if the window is a \fIpad\fP.
 .IP
 However, it uses this information only in
 \fB\%waddch\fP (to decide if it should call \fB\%wrefresh\fP) and
@@ -190,10 +206,12 @@ However, it uses this information only in
 and does not check in \fB\%wrefresh\fP to ensure that the pad
 is refreshed properly.
 .bP
-Solaris X/Open Curses checks if a window is a pad in \fB\%wnoutrefresh\fP,
+Solaris \fI\%xcurses\fP checks whether a window is a pad in
+\fB\%wnoutrefresh\fP,
 returning \fBERR\fP in that case.
 .IP
-However, it only sets the flag for subwindows if the parent window is a pad.
+However,
+it only sets the flag for subwindows if the parent window is a pad.
 Its \fB\%newpad\fP function does not set this information.
 Consequently, the check will never fail.
 .IP
@@ -202,7 +220,7 @@ though interestingly enough, a comment in the source code
 states that the lack of a check was an MKS extension.
 .bP
 NetBSD 7 \fIcurses\fP
-sets a flag in the \fB\%WINDOW\fP structure
+sets a flag in the \fI\%WINDOW\fP structure
 for \fB\%newpad\fP and \fB\%subpad\fP,
 using this to help with the distinction between \fB\%wnoutrefresh\fP
 and \fB\%pnoutrefresh\fP.
@@ -216,7 +234,7 @@ data was from a pad.
 .PP
 This implementation
 .bP
-sets a flag in the \fB\%WINDOW\fP structure
+sets a flag in the \fI\%WINDOW\fP structure
 for \fB\%newpad\fP and \fB\%subpad\fP,
 .bP
 allows a \fB\%subwin\fP or \fB\%derwin\fP call to succeed having a pad parent by
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 8c9211cc7..16fac2dd6 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.34 2023/10/21 10:31:22 tom Exp $
-.TH curs_print 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
+.TH curs_print 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
@@ -67,10 +67,11 @@ Couldn't allocate sufficient memory to buffer the printer write.
 When \fB\%mcprint\fP succeeds, it returns the number of characters actually
 sent to the printer.
 .SH PORTABILITY
-The \fB\%mcprint\fP call was designed for \fIncurses\fP, and is not found
-in SVr4 \fIcurses\fP, 4.4BSD \fIcurses\fP,
+The \fB\%mcprint\fP call was designed for \fI\%ncurses\fP,
+and is not found in SVr4 \fIcurses\fP,
+4.4BSD \fIcurses\fP,
 or any other previous version of \fIcurses\fP.
-It is recommended that any code depending on \fIncurses\fP extensions
+It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH BUGS
 Padding in the
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index e9f2f74f5..ea3a6b585 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.43 2023/11/25 11:31:06 tom Exp $
-.TH curs_printw 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.45 2023/12/18 00:03:28 tom Exp $
+.TH curs_printw 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -51,7 +51,7 @@
 \fB\%mvwprintw\fP,
 \fB\%vwprintw\fP,
 \fB\%vw_printw\fP \-
-write formatted output to \fIcurses\fR windows
+write formatted output to a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -60,96 +60,142 @@ write formatted output to \fIcurses\fR windows
 \fBint wprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, ...);
 \fBint mvprintw(int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
 \fBint mvwprintw(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+.PP
 \fBint vw_printw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
 .PP
 \fI/* obsolete */\fP
 \fBint vwprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
 .fi
 .SH DESCRIPTION
-The \fBprintw\fP, \fBwprintw\fP, \fBmvprintw\fP and \fBmvwprintw\fP
-routines are analogous to \fBprintf\fP [see \fBprintf\fP(3)].
-In
-effect, the string that would be output by \fBprintf\fP is output
-instead as though \fBwaddstr\fP were used on the given window.
+\fB\%printw\fP,
+\fB\%wprintw\fP,
+\fB\%mvprintw\fP,
+and
+\fB\%mvwprintw\fP
+are analogous to \fI\%printf\fP(3).
+In effect,
+the string that would be output by \fI\%printf\fP(3) is instead output
+as though \fB\%waddstr\fP(3X) were used with
+.I win
+(or
+.BR \%stdscr )
+as its first argument.
 .PP
-The \fBvwprintw\fP and \fBvw_printw\fP routines are analogous
-to \fBvprintf\fP [see \fBprintf\fP(3)]
-and perform a \fBwprintw\fP using a variable argument list.
-The third argument is a \fBva_list\fP, a pointer to a
-list of arguments, as defined in \fB<stdarg.h>\fP.
+\fB\%vwprintw\fP
+and
+\fB\%vw_printw\fP are analogous to \fI\%vprintf\fP(3),
+and perform a \fB\%wprintw\fP using a variable argument list.
+The third argument is a \fI\%va_list\fP,
+a pointer to a list of arguments,
+as defined in \fI\%stdarg.h\fP.
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+These functions return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-X/Open defines no error conditions.
-In this implementation,
-an error may be returned if it cannot allocate enough memory for the
-buffer used to format the results.
-It will return an error if the window pointer is null.
+In
+.I \%ncurses,
+failure occurs if the library cannot allocate enough memory for the
+buffer into which the output is formatted,
+or if the window pointer
+.I win
+is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions with a \*(``mv\*('' prefix first perform a cursor movement
+using \fB\%wmove\fP,
+and fail if the position is outside the window.
+.SH NOTES
+No wide character counterpart functions are defined by the
+\*(``wide\*(''
+.I \%ncurses
+configuration nor by any standard.
+To format and write a wide-character string to a
+.I curses
+window,
+consider using \fI\%swprintf\fP(3) and \fB\%waddwstr\fP(3X) or similar.
 .SH PORTABILITY
-In this implementation, \fBvw_printw\fP and \fBvwprintw\fP are equivalent,
-to support legacy applications.
-However, the latter (\fBvwprintw\fP) is obsolete:
-.bP
-The XSI Curses standard, Issue 4 described these functions.
-The function
-\fBvwprintw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
-\fBvw_printw\fP using the \fB<stdarg.h>\fP interface.
+X/Open Curses, Issue 4, describes these functions.
+It specifies no error conditions for them.
+.PP
+.I \%ncurses
+defines \fB\%vw_printw\fP and \fB\%vwprintw\fP identically to support
+legacy applications.
+However,
+the latter is obsolete.
 .bP
-The Single Unix Specification, Version 2 states that
-\fBvw_printw\fP  is preferred to \fBvwprintw\fP since the latter requires
-including \fB<varargs.h>\fP, which
-cannot be used in the same file as \fB<stdarg.h>\fP.
-This implementation uses \fB<stdarg.h>\fP for both,
-because that header is included in \fB<curses.h\fP>.
+X/Open Curses, Issue 4, Version 2 (1996),
+marked \fB\%vwprintw\fP as requiring \fI\%varargs.h\fP and
+\*(``TO BE WITHDRAWN\*('',
+and specified \fB\%vw_printw\fP using the \fI\%stdarg.h\fP interface.
 .bP
-X/Open Curses, Issue 5 (December 2007) marked \fBvwprintw\fP (along with
+X/Open Curses, Issue 5, Draft 2
+(December 2007) marked \fBvwprintw\fP (along with
 \fBvwscanw\fP and the termcap interface) as withdrawn.
+After incorporating review comments,
+this became
+X/Open Curses, Issue 7 (2009).
+.bP
+.I \%ncurses
+provides \fB\%vwprintw\fP,
+but marks it as deprecated.
 .SH HISTORY
-While \fBprintw\fP was implemented in 4BSD,
-it was unused until 4.2BSD (which used it in games).
-That early version of curses was before the ANSI C standard.
-It did not use <varargs.h>, though that was available.
-In 1991 (a couple of years after SVr4 was generally available,
+While \fB\%printw\fP was implemented in 4BSD
+(November 1980),
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+.\"   libcurses/printw.c
+it was unused until 4.2BSD
+(August 1983),
+which employed it for games.
+That early version of
+.I curses
+preceded the ANSI C standard of 1989.
+It did not use \fI\%varargs.h\fP,
+though that had been available since Seventh Edition Unix (1979).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
+.\"  varargs.h
+In 1991
+(a couple of years after SVr4 was generally available,
 and after the C standard was published),
 other developers updated the library,
-using <stdarg.h> internally in 4.4BSD curses.
+using \fI\%stdarg.h\fP internally in 4.4BSD
+.I curses.
 Even with this improvement,
-BSD curses did not use function prototypes (or even declare
-functions) in the <curses.h> header until 1992.
+BSD
+.I curses
+did not use function prototypes
+(nor even declare functions)
+in \fI\%curses.h\fP until 1992.
 .PP
-SVr2 documented
-\fBprintw\fP,
-\fBwprintw\fP
-tersely as \*(``printf on \fIstdscr\fP\*('' and
-tersely as \*(``printf on \fIwin\fP\*('', respectively.
+SVr2 (1984) documented \fB\%printw\fP and \fB\%wprintw\fP tersely as
+\*(``printf on \fB\%stdscr\fP\*('' and
+\*(``printf on \fIwin\fP\*('',
+respectively.
 .PP
-SVr3 added
-\fBmvprintw\fP, and
-\fBmvwprintw\fP, with a three-line summary saying that they were analogous
-to \fBprintf\fP(3),
-explaining that the string which would be output from \fBprintf\fP(3) would
-instead be output using \fBwaddstr\fP on the given window.
-SVr3 also added \fBvwprintw\fP, saying that the third parameter
-is a \fBva_list\fP, defined in <varargs.h>,
-and referring the reader to the manual pages for \fIvarargs\fP and
-\fBvprintf\fP for detailed descriptions.
+SVr3 (1987) added \fB\%mvprintw\fP and \fB\%mvwprintw\fP,
+with a three-line summary asserting that they were analogous to
+\fI\%printf\fP(3),
+explaining that the string that \fI\%printf\fP(3) would write to the
+standard output stream would instead be output using \fB\%waddstr\fP to
+the given window.
+SVr3 also implemented \fB\%vwprintw\fP,
+describing its third parameter as a \fI\%va_list\fP,
+defined in \fI\%varargs.h\fP,
+and referred the reader to the manual pages for \fI\%varargs\fP and
+\fI\%vprintf\fP for detailed descriptions.
 .PP
-SVr4 added no new variations of \fBprintw\fP,
-but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
-type.
+SVr4 (1989) introduced no new variations of \fI\%printw\fP,
+but provided for using either \fI\%varargs.h\fP or \fI\%stdarg.h\fP to
+define the \fI\%va_list\fP type.
+.\" either header declares "va_list", but only one can be used
 .PP
-X/Open Curses added \fBvw_printw\fP to replace \fBvwprintw\fP,
-stating that its \fBva_list\fP definition requires <stdarg.h>.
+X/Open Curses, Issue 4 (1995),
+defined \fB\%vw_printw\fP to replace \fB\%vwprintw\fP,
+stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addstr\fP(3X),
 \fB\%curs_scanw\fP(3X),
-\fB\%curs_termcap\fP(3X),
 \fB\%printf\fP(3),
 \fB\%vprintf\fP(3)
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index a32880df4..9dc6f46cc 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.38 2023/10/07 21:19:07 tom Exp $
-.TH curs_refresh 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.39 2023/12/16 21:09:11 tom Exp $
+.TH curs_refresh 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -128,9 +128,10 @@ are corrupted and should be thrown away before anything is written over them.
 It touches the indicated lines (marking them changed).
 The routine \fBredrawwin\fP touches the entire window.
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure, and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+These routines return the integer \fBERR\fP upon failure and \fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
+upon successful completion.
 .PP
 X/Open does not define any error conditions.
 In this implementation
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index 47993a7ed..333263d2c 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.43 2023/11/25 11:31:06 tom Exp $
-.TH curs_scanw 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.44 2023/12/17 22:50:40 tom Exp $
+.TH curs_scanw 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -67,109 +67,184 @@ read formatted input from a \fIcurses\fR window
 \fBint vwscanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list \fIvarglist\fP);
 .fi
 .SH DESCRIPTION
-The \fBscanw\fP, \fBwscanw\fP and \fBmvscanw\fP routines are analogous to
-\fBscanf\fP [see \fBscanf\fP(3)].
-The effect of these routines is as though
-\fBwgetstr\fP were called on the window, and the resulting line used as input
-for \fBsscanf\fP(3).
-Fields which do not map to a variable in the \fIfmt\fP
-field are lost.
+\fB\%scanw\fP,
+\fB\%wscanw\fP,
+\fB\%mvscanw\fP,
+and
+\fB\%mvwscanw\fP
+are analogous to \fI\%scanf\fP(3).
+In effect,
+they call \fB\%wgetstr\fP(3X) with
+.I win
+(or
+.BR \%stdscr )
+as its first argument,
+then attempt conversion of the resulting string with \fI\%vsscanf\fP(3).
+Fields in the string that do not map to a variable in the \fIfmt\fP
+parameter are discarded.
 .PP
-The \fBvwscanw\fP and \fBvw_scanw\fP routines are analogous to \fBvscanf\fP(3).
-They perform a \fBwscanw\fP using a variable argument list.
-The third argument is a \fBva_list\fP,
-a pointer to a list of arguments, as defined in \fB<stdarg.h>\fP.
+\fB\%vwscanw\fP
+and
+\fB\%vw_scanw\fP are analogous to \fI\%vscanf\fP(3),
+and perform a \fB\%wscanw\fP using a variable argument list.
+The third argument is a \fI\%va_list\fP,
+a pointer to a list of arguments,
+as defined in \fI\%stdarg.h\fP.
 .SH RETURN VALUE
-\fBvwscanw\fP returns \fBERR\fP on failure and an integer equal to the
-number of fields scanned on success.
+These functions return
+.B ERR
+upon failure and otherwise a count of successful conversions;
+this quantity may be zero.
+.PP
+In
+.I \%ncurses,
+failure occurs if \fI\%vsscanf\fP(3) returns
+\fBEOF\fP,
+or if the window pointer
+.I win
+is null.
 .PP
-Applications may use the return value from the \fBscanw\fP, \fBwscanw\fP,
-\fBmvscanw\fP and \fBmvwscanw\fP routines to determine the number of fields
-which were mapped in the call.
+Functions with a \*(``mv\*('' prefix first perform a cursor movement
+using \fB\%wmove\fP,
+and fail if the position is outside the window.
+.SH NOTES
+No wide character counterpart functions are defined by the
+\*(``wide\*(''
+.I \%ncurses
+configuration nor by any standard.
+They are unnecessary:
+to retrieve and convert a wide-character string from a
+.I curses
+terminal keyboard,
+use these functions with the \fI\%scanf\fP(3) conversions \*(``%lc\*(''
+and \*(``%ls\*('' for wide characters and strings,
+respectively.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+.I \%ncurses
+implements \fI\%vsscanf\fP(3) internally if it is unavailable when the
+library is configured.
 .SH PORTABILITY
-In this implementation, \fBvw_scanw\fP and \fBvwscanw\fP are equivalent,
-to support legacy applications.
-However, the latter (\fBvwscanw\fP) is obsolete:
+X/Open Curses, Issue 4, describes these functions.
+It specifies no error conditions for them.
+.PP
+.I \%ncurses
+defines \fB\%vw_scanw\fP and \fB\%vwscanw\fP identically to support
+legacy applications.
+However,
+the latter is obsolete.
 .bP
-The XSI Curses standard, Issue 4 described these functions,
-noting that the function
-\fBvwscanw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
-\fBvw_scanw\fP using the \fB<stdarg.h>\fP interface.
+X/Open Curses, Issue 4, Version 2 (1996),
+marked \fB\%vwscanw\fP as requiring \fI\%varargs.h\fP and
+\*(``TO BE WITHDRAWN\*('',
+and specified \fB\%vw_scanw\fP using the \fI\%stdarg.h\fP interface.
 .bP
-The Single Unix Specification, Version 2 states that
-\fBvw_scanw\fP  is preferred to \fBvwscanw\fP since the latter requires
-including \fB<varargs.h>\fP, which
-cannot be used in the same file as \fB<stdarg.h>\fP.
-This implementation uses \fB<stdarg.h>\fP for both, because that header
-is included in \fB<curses.h\fP>.
+X/Open Curses, Issue 5, Draft 2
+(December 2007) marked \fB\%vwscanw\fP (along with
+\fB\%vwscanw\fP and the termcap interface) as withdrawn.
+After incorporating review comments,
+this became
+X/Open Curses, Issue 7 (2009).
 .bP
-X/Open Curses, Issue 5 (December 2007) marked \fBvwscanw\fP (along with
-\fBvwprintw\fP and the termcap interface) as withdrawn.
-.LP
-Both XSI and The Single Unix Specification, Version 2 state that these
-functions return \fBERR\fP or \fBOK\fP.
+.I \%ncurses
+provides \fB\%vwscanw\fP,
+but marks it as deprecated.
+.PP
+X/Open Curses Issues 4 and 7 both state that these functions return
+\fBERR\fP or \fBOK\fP.
+This is likely an erratum.
 .bP
-Since the underlying \fBscanf\fP(3) can return the number of items scanned,
-and the SVr4 code was documented to use this feature,
-this is probably an editing error which was introduced in XSI,
-rather than being done intentionally.
+Since the underlying \fI\%scanf\fP(3) returns the number of successful
+conversions,
+and SVr4
+.I curses
+was documented to use this feature,
+this may have been an editorial solecism introduced by X/Open,
+rather than an intentional change.
 .bP
-This implementation returns the number of items scanned,
-for compatibility with SVr4 curses.
-As of 2018, NetBSD curses also returns the number of items scanned.
-Both ncurses and NetBSD curses call \fBvsscanf\fP to scan the string,
+This implementation retains compatibility with SVr4
+.I curses.
+As of 2018,
+NetBSD
+.I curses
+also returns the number of successful conversions.
+Both
+.I \%ncurses\fP
+and NetBSD
+.I curses
+call \fI\%vsscanf\fP(3) to scan the string,
 which returns \fBEOF\fP on error.
 .bP
-Portable applications should only test if the return value is \fBERR\fP,
-since the \fBOK\fP value (zero) is likely to be misleading.
+Portable applications should test only if the return value is \fBERR\fP,
+and not compare it to \fBOK\fP,
+since that value (zero) might be misleading.
 .IP
-One possible way to get useful results would be to use a "%n" conversion
-at the end of the format string to ensure that something was processed.
+One portable way to get useful results would be to use a \*(``%n\*(''
+conversion at the end of the format string,
+and check the value of the corresponding variable to determine how many
+conversions succeeded.
 .SH HISTORY
-While \fBscanw\fP was implemented in 4BSD,
-none of the BSD releases used it until 4.4BSD (in a game).
-That early version of curses was before the ANSI C standard.
-It did not use <varargs.h>, though that was available.
-In 1991 (a couple of years after SVr4 was generally available,
+\fB\%scanw\fP was implemented in 4BSD
+(November 1980);
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+.\"  libcurses/scanw.c
+that early version of
+.I curses
+preceded the ANSI C standard of 1989.
+The function was unused in Berkeley distributions for over ten years,
+until 4.4BSD,
+which employed it in a game.
+The 4BSD \fB\%scanw\fP did not use \fI\%varargs.h\fP,
+though that had been available since Seventh Edition Unix (1979).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
+.\"  varargs.h
+In 1991
+(a couple of years after SVr4 was generally available,
 and after the C standard was published),
 other developers updated the library,
-using <stdarg.h> internally in 4.4BSD curses.
+using \fI\%stdarg.h\fP internally in 4.4BSD
+.I curses.
 Even with this improvement,
-BSD curses did not use function prototypes (or even declare
-functions) in the <curses.h> header until 1992.
+BSD
+.I curses
+did not use function prototypes
+(nor even declare functions)
+in \fI\%curses.h\fP until 1992.
+.PP
+SVr2 (1984) documented \fB\%scanw\fP and \fB\%wscanw\fP tersely as
+\*(``scanf through \fB\%stdscr\fP\*('' and
+\*(``scanf through \fIwin\fP\*('',
+respectively.
+.PP
+SVr3 (1987) added
+\fB\%mvscanw\fP, and
+\fB\%mvwscanw\fP, stating
+.RS
 .PP
-SVr2 documented
-\fBscanw\fP,
-\fBwscanw\fP
-tersely as \*(``scanf through \fIstdscr\fP\*('' and
-tersely as \*(``scanf through \fIwin\fP\*('', respectively.
+These routines correspond to \fIscanf\fP(3S),
+as do their arguments and return values.
+\fB\%wgetstr\fP() is called on the window,
+and the resulting line is used as input for the scan.
+.RE
 .PP
-SVr3 added
-\fBmvscanw\fP, and
-\fBmvwscanw\fP, with a three-line summary saying that they were analogous
-to \fBscanf\fP(3),
-explaining that the string which would be output from \fBscanf\fP(3) would
-instead be output using \fBwaddstr\fP on the given window.
-SVr3 also added \fBvwscanw\fP, saying that the third parameter
-is a \fBva_list\fP, defined in <varargs.h>,
-and referring the reader to the manual pages for \fIvarargs\fP and
-\fBvprintf\fP for detailed descriptions.
-(Because the SVr3 documentation does not mention \fBvscanf\fP,
-that reference to \fBvprintf\fP may not be an error).
+SVr3 also implemented \fB\%vwscanw\fP,
+describing its third parameter as a \fI\%va_list\fP,
+defined in \fI\%varargs.h\fP,
+and referred the reader to the manual pages for \fI\%varargs\fP and
+\fI\%vprintf\fP for detailed descriptions.
+(Because the SVr3 documentation does not mention \fI\%vscanf\fP,
+the reference to \fI\%vprintf\fP might not be an error).
 .PP
-SVr4 added no new variations of \fBscanw\fP,
-but provided for using <varargs.h> or <stdarg.h> to define the \fBva_list\fP
-type.
+SVr4 (1989) introduced no new variations of \fI\%scanw\fP,
+but provided for using either \fI\%varargs.h\fP or \fI\%stdarg.h\fP to
+define the \fI\%va_list\fP type.
+.\" either header declares "va_list", but only one can be used
 .PP
-X/Open Curses added \fBvw_scanw\fP to replace \fBvwscanw\fP,
-stating that its \fBva_list\fP definition requires <stdarg.h>.
+X/Open Curses, Issue 4 (1995),
+defined \fI\%vw_scanw\fP to replace \fI\%vwscanw\fP,
+stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getstr\fP(3X),
 \fB\%curs_printw\fP(3X),
-\fB\%curs_termcap\fP(3X),
-\fB\%scanf\fP(3)
+\fB\%scanf\fP(3),
+\fB\%vscanf\fP(3)
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 1ef95559b..ceb27fe0c 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.35 2023/11/25 11:29:34 tom Exp $
-.TH curs_scr_dump 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.36 2023/12/16 21:10:18 tom Exp $
+.TH curs_scr_dump 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -94,7 +94,7 @@ This can be thought of as a screen inheritance function.
 To read (write) a window from (to) a file, use the \fBgetwin\fP and
 \fBputwin\fP routines [see \fBcurs_util\fP(3X)].
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and \fBOK\fP
+These routines return the integer \fBERR\fP upon failure and \fBOK\fP
 upon success.
 .PP
 X/Open defines no error conditions.
@@ -107,8 +107,8 @@ These functions are described in the XSI Curses standard, Issue 4,
 which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 The SVr4 docs merely say under \fBscr_init\fP that the dump data is also
-considered invalid "if the time-stamp of the tty is old" but do not define
-\*(``old\*(''.
+considered invalid \*(``if the time-stamp of the tty is old\*('' but do
+not define \*(``old\*(''.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 3f3ce7119..598838031 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.35 2023/10/07 21:19:07 tom Exp $
-.TH curs_scroll 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.36 2023/12/16 22:52:35 tom Exp $
+.TH curs_scroll 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%scroll\fP,
 \fB\%scrl\fP,
@@ -54,46 +59,78 @@ scroll a \fIcurses\fR window
 \fBint wscrl(WINDOW *\fIwin\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-The \fBscroll\fP routine scrolls the window up one line.
-This involves moving
-the lines in the window data structure.
-As an optimization, if the scrolling
-region of the window is the entire screen,
-the \fIphysical screen\fP may be scrolled at the same time.
+\fBscroll\fP scrolls the given window up one line.
+That is,
+every visible line we might number
+.I i
+becomes line
+.IR i \-1.
+The text of the top line in the window disappears and the bottom line
+is populated with blank characters;
+see \fB\%bkgd\fP(3X) or \fB\%bkgrnd\fP(3X).
+As an optimization,
+if the scrolling region of the window is the entire screen,
+the physical screen may be scrolled at the same time;
+see \fB\%curscr\fP(3X).
 .PP
-For positive \fIn\fP, the \fBscrl\fP and \fBwscrl\fP routines scroll the
-window up \fIn\fP lines (line \fIi\fP+\fIn\fP becomes \fIi\fP); otherwise
-scroll the window down \fIn\fP lines.
-This involves moving the lines in the
-window character image structure.
-The current cursor position is not changed.
+\fB\%scrl\fP and \fB\%wscrl\fP scroll
+.B \%stdscr
+or the specified window up or down depending on the sign of
+.I n.
+.bP
+For positive
+.I n,
+line \fIi\fP+\fIn\fP becomes \fIi\fP (scrolling up);
+.bP
+for negative
+.I n,
+line \fIi\fP-\fIn\fP becomes \fIi\fP (scrolling down).
 .PP
-For these functions to work, scrolling must be enabled via \fBscrollok\fP(3X).
-.SH RETURN VALUE
-These routines return \fBERR\fP upon failure, and \fBOK\fP (SVr4 only specifies
-"an integer value other than \fBERR\fP") upon successful completion.
+The cursor does not move.
+These functions perform no operation unless scrolling is enabled for the
+window via \fB\%scrollok\fP(3X).
+.SH "RETURN VALUE"
+These functions return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-X/Open defines no error conditions.
-.PP
-This implementation returns an error
-if the window pointer is null, or
-if scrolling is not enabled in the window, e.g., with \fBscrollok\fP(3X).
+.I \%ncurses
+returns \fBERR\fP if scrolling is not enabled in the window,
+for example with \fB\%scrollok\fP(3X),
+or if the
+.I \%WINDOW
+pointer is null.
 .SH NOTES
-Note that \fBscrl\fP and \fBscroll\fP may be macros.
+Unusually,
+there is no \fB\%wscroll\fP function;
+\fBscroll\fP behaves as one would expect \fB\%wscroll\fP to,
+accepting a \fI\%WINDOW\fP pointer argument.
+.PP
+\fB\%scrl\fP and \fB\%scroll\fP may be implemented as macros.
+.SH PORTABILITY
+X/Open Curses, Issue 4, describes these functions.
+It defines no error conditions.
 .PP
-The SVr4 documentation says that the optimization of physically scrolling
-immediately if the scroll region is the entire screen \*(``is\*('' performed,
+SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('' as a successful return
+value.
+.PP
+SVr4 indicates that the optimization of physically scrolling immediately
+if the scroll region is the entire screen \*(``is\*('' performed,
 not \*(``may be\*('' performed.
-This implementation deliberately does not guarantee
-that this will occur, to leave open the possibility of smarter
-optimization of multiple scroll actions on the next update.
+.I \%ncurses
+deliberately does not guarantee that this will occur,
+to leave open the possibility of smarter optimization of multiple scroll
+actions on the next update.
 .PP
-Neither the SVr4 nor the XSI documentation specify whether the current
-attribute or
-current color-pair of blanks generated by the scroll function is zeroed.
-Under this implementation it is.
-.SH PORTABILITY
-The XSI Curses standard, Issue 4 describes these functions.
+Neither SVr4
+.I curses
+nor X/Open Curses specify whether the current attribute or current color
+pair of blanks generated by the scroll function are zeroed.
+.I \%ncurses
+does so.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 550005c88..e1d39b2d3 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.66 2023/11/25 14:31:07 tom Exp $
-.TH curs_slk 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.67 2023/12/16 21:18:45 tom Exp $
+.TH curs_slk 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,8 +70,8 @@
 .PP
 \fBint slk_init(int \fIfmt\fP);
 .PP
-\fBint slk_set(int \fIlabnum\fP, const char *\fIlabel\fP, int \fIfmt\fP);
-\fBint slk_wset(int \fIlabnum\fP, const wchar_t *\fIlabel\fP, int \fIfmt\fP);
+\fBint slk_set(int \fIlabnum\fP, const char *\fIlabel\fP, int \fIalign\fP);
+\fBint slk_wset(int \fIlabnum\fP, const wchar_t *\fIlabel\fP, int \fIalign\fP);
 .PP
 \fBchar *slk_label(int \fIlabnum\fP);
 .PP
@@ -84,9 +84,9 @@
 \fBint slk_attron(const chtype \fIattrs\fP);
 \fBint slk_attroff(const chtype \fIattrs\fP);
 \fBint slk_attrset(const chtype \fIattrs\fP);
-\fBint slk_attr_on(attr_t \fIattrs\fP, void* \fIopts\fP);
-\fBint slk_attr_off(const attr_t \fIattrs\fP, void * \fIopts\fP);
-\fBint slk_attr_set(const attr_t \fIattrs\fP, short \fIpair\fP, void* \fIopts\fP);
+\fBint slk_attr_on(attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint slk_attr_off(const attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint slk_attr_set(const attr_t \fIattrs\fP, short \fIpair\fP, void*\fIopts\fP);
 \fI/* extension */
 \fBattr_t slk_attr(void);
 .PP
@@ -95,29 +95,28 @@
 \fBint extended_slk_color(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
-The \fBslk\fP* functions manipulate the set
-of soft function-key labels that exist on many terminals.
+These functions manipulate the soft function key labels that some
+hardware terminals support.
 For those terminals that do not have soft labels,
-\fIcurses\fP takes over the bottom line of \fB\%stdscr\fP, reducing the size of
-\fB\%stdscr\fP and the variable \fBLINES\fP.
-\fIcurses\fP standardizes on eight
-labels of up to eight characters each.
-In addition to this, the \fIncurses\fP
-implementation supports a mode where it simulates 12 labels of up to five
-characters each.
-This is useful for PC-like enduser devices.
-\fIncurses\fP simulates this mode by taking over up to two lines at
+\fIcurses\fP takes over the bottom line of \fB\%stdscr\fP,
+reducing its vertical size and the value of \fBLINES\fP by one.
+By default,
+\fIcurses\fP uses eight labels of up to eight characters each.
+.PP
+\fI\%ncurses\fP
+furthermore supports a mode comprising twelve labels of up to five
+characters each,
+following a convention associated with the IBM PC/AT keyboard.
+\fI\%ncurses\fP simulates this mode by taking over up to two lines at
 the bottom of the screen;
 it does not try to use any hardware support for this
 mode.
 .SS Initialization
-The \fB\%slk_init\fP routine must be called
-before \fB\%initscr\fP or \fB\%newterm\fP
-is called.
+\fB\%slk_init\fP must be called before \fB\%initscr\fP or
+\fB\%newterm\fP.
 If \fB\%initscr\fP eventually uses a line from \fB\%stdscr\fP to
 emulate the soft labels,
-then \fIfmt\fP determines how the labels are arranged on the screen:
-.RS 3
+then \fIfmt\fP determines how the labels are arranged on the screen.
 .TP 3
 .B 0
 indicates a 3\-2\-3 arrangement of
@@ -131,15 +130,16 @@ indicates the PC-like 4\-4\-4 mode.
 .TP 3
 .B 3
 is again the PC-like 4\-4\-4 mode,
-but in addition an index line is generated, helping the user to
-identify the key numbers easily.
-.RE
+but in addition an index line is generated,
+helping the user to associate each label with its numbered function key.
+\fBLINES\fP and the vertical size of \fB\%stdscr\fP are further reduced.
 .SS Labels
-The \fB\%slk_set\fP routine
-(and the \fB\%slk_wset\fP routine for the wide-character library)
-has three parameters:
-.RS 3
-.TP 5
+Populate the labels with normal strings
+(\fB\%slk_set\fP)
+or wide-character strings
+(\fB\%slk_wset\fP).
+Each function takes three parameters.
+.TP 8 \" "labnum" + 2n
 .I labnum
 is the label number, from \fB1\fP to \fB8\fP
 (12 if \fIfmt\fP in \fB\%slk_init\fP is \fB2\fP or \fB3\fP);
@@ -149,20 +149,30 @@ is be the string to put on the label,
 up to eight
 (five if \fIfmt\fP in \fB\%slk_init\fP is \fB2\fP or \fB3\fP)
 characters in length.
-A null string or a null pointer sets up a blank label.
+A empty string or a null pointer sets up a blank label.
 .TP
-.I fmt
-is either
-\fB0\fP, \fB1\fP, or \fB2\fP, indicating whether the label is to be
-left-justified, centered, or right-justified, respectively, within the
-label.
-.RE
+.I align
+is
+.BR 0 ,
+.BR 1 ,
+or
+.BR 2 ,
+aligning
+.I label
+to the left,
+center,
+or right,
+respectively,
+within the 8 (5) character cells housing it.
 .PP
-The \fB\%slk_label\fP routine returns the current label for label number
-\fIlabnum\fP, with leading and trailing blanks stripped.
-.SS Screen updates
-The \fB\%slk_refresh\fP and \fB\%slk_noutrefresh\fP routines correspond to
-the \fB\%wrefresh\fP and \fB\%wnoutrefresh\fP routines.
+\fB\%slk_label\fP obtains the string assigned to label number
+\fIlabnum\fP,
+with any leading and trailing blanks stripped.
+.SS "Screen Updates"
+\fB\%slk_refresh\fP and \fB\%slk_noutrefresh\fP affect the soft key
+label lines as \fB\%wrefresh\fP and \fB\%wnoutrefresh\fP do the
+.I curses
+window.
 .PP
 The \fB\%slk_clear\fP routine clears the soft labels from the screen.
 .PP
@@ -171,31 +181,46 @@ after a \fB\%slk_clear\fP has been performed.
 .PP
 The \fB\%slk_touch\fP routine forces all the soft labels to be output
 the next time a \fB\%slk_noutrefresh\fP is performed.
-.SS Video attributes
+.SS "Video Attributes"
 The
-\fB\%slk_attron\fP, \fB\%slk_attrset\fP, \fB\%slk_attroff\fP and \fB\%slk_attr\fP
+\fB\%slk_attron\fP,
+\fB\%slk_attrset\fP,
+\fB\%slk_attroff\fP,
+and
+\fB\%slk_attr\fP
 routines correspond to
-\fB\%attron\fP, \fB\%attrset\fP, \fB\%attroff\fP and \fB\%attr_get\fP, respectively.
-They have an effect only if soft labels are simulated on the bottom line of
-the screen.
-The default highlight for soft keys is A_STANDOUT (as in
-System V \fIcurses\fP, which does not document this fact).
+\fB\%attron\fP,
+\fB\%attrset\fP,
+\fB\%attroff\fP,
+and
+\fB\%attr_get\fP,
+respectively.
+They have an effect only if soft labels are simulated on the bottom line
+of the screen.
+The default highlight for soft key labels is \fB\%A_STANDOUT\fP
+(as in System\ V \fIcurses\fP,
+which does not document this fact).
 .SS Colors
 The \fB\%slk_color\fP routine corresponds to \fB\%color_set\fP.
 It has an effect only
 if soft labels are simulated on the bottom line of the screen.
 .PP
 Because \fB\%slk_color\fP accepts
-only \fBshort\fP (signed 16-bit integer) values,
+only \fIshort\fP
+(signed 16-bit integer)
+values,
 this implementation provides
-\fB\%extended_slk_color\fP which accepts an integer value, e.g., 32-bits.
-.
+\fB\%extended_slk_color\fP,
+which accepts an \fIint\fP value of at least 32 bits.
 .SH RETURN VALUE
-These routines return \fBERR\fP upon failure
-and \fBOK\fP (SVr4 specifies only "an integer value other than \fBERR\fP")
+Routines that return an integer return \fBERR\fP upon failure and
+\fBOK\fP
+(SVr4 specifies only
+\*(``an integer value other than \fBERR\fP\*('')
 upon successful completion.
 .PP
-X/Open defines no error conditions.
+X/Open Curses defines no error conditions.
+.PP
 In this implementation
 .RS 3
 .TP 5
@@ -238,32 +263,41 @@ memory for the labels cannot be allocated.
 Most applications would use \fB\%slk_noutrefresh\fP because a
 \fB\%wrefresh\fP is likely to follow soon.
 .SH EXTENSIONS
-X/Open \fIcurses\fP documents the \fIopts\fP argument
+X/Open Curses documents the \fIopts\fP argument
 as reserved for future use,
 saying that it must be null.
 This implementation
-uses that parameter in ABI 6 for the functions which have a color-pair
+uses that parameter in ABI 6 for the functions which have a color pair
 parameter to support extended color pairs.
 .PP
-For  functions  which modify the color, e.g., \fB\%slk_attr_set\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
+For functions which modify the color,
+e.g.,
+\fB\%slk_attr_set\fP,
+if \fIopts\fP is set it is treated as a pointer to \fIint\fP,
+and used to set the color pair instead of the \fIshort\fP pair
+parameter.
 .SH PORTABILITY
-The XSI \fIcurses\fP standard, Issue 4, described the soft-key functions,
+X/Open Curses, Issue 4, describes these functions,
 with some differences from SVr4 \fIcurses\fP:
 .bP
-It added functions like the SVr4
-attribute-manipulation functions \fB\%slk_attron\fP,
-\fB\%slk_attroff\fP, \fB\%slk_attrset\fP,
-but which use \fBattr_t\fP parameters (rather than \fB\%chtype\fP),
+X/Open added functions like the SVr4 attribute-manipulation functions
+\fB\%slk_attron\fP,
+\fB\%slk_attroff\fP,
+and
+\fB\%slk_attrset\fP,
+but which use \fI\%attr_t\fP parameters
+(rather than \fI\%chtype\fP),
 along with a reserved \fIopts\fP parameter.
 .IP
-Two of these new functions (unlike the SVr4 functions) have no provision
-for color: \fB\%slk_attr_on\fP and \fB\%slk_attr_off\fP.
+Two of these new functions
+(unlike the SVr4 functions)
+have no provision for color:
+\fB\%slk_attr_on\fP and \fB\%slk_attr_off\fP.
 .IP
-The third function \%(\fBslk_attr_set\fP) has a color-pair parameter.
+The third function \%(\fBslk_attr_set\fP) has a color pair parameter.
 .bP
-It added \fBconst\fP qualifiers to parameters (unnecessarily), and
+It added \fIconst\fP qualifiers to parameters (unnecessarily),
+and
 .bP
 It added \fB\%slk_color\fP.
 .PP
@@ -300,18 +334,18 @@ it copies the \fIng\fP elements of the group of soft-keys, up to 16.
 If there are more than 16 elements, \fB\%slk_start\fP returns an error.
 .bP
 The format codes \fB2\fP and \fB3\fP for \fB\%slk_init\fP
-were added by \fIncurses\fP in 1996.
+were added by \fI\%ncurses\fP in 1996.
 PDCurses 2.4 added this feature in 2001.
 .PP
-The function \fB\%slk_attr\fP was added by \fIncurses\fP in 1996.
+The function \fB\%slk_attr\fP was added by \fI\%ncurses\fP in 1996.
 .PP
-X/Open \fIcurses\fP does not specify a limit for the number of colors and
+X/Open Curses does not specify a limit for the number of colors and
 color pairs which a terminal can support.
-However, in its use of \fBshort\fP for the parameters,
+However, in its use of \fIshort\fP for the parameters,
 it carries over SVr4's implementation detail for the compiled
 terminfo database, which uses signed 16-bit numbers.
 This implementation provides extended versions of those functions
-which use \fBint\fP parameters,
+which use \fIint\fP parameters,
 allowing applications to use larger color- and pair-numbers.
 .SH HISTORY
 SVr3 introduced these functions:
@@ -330,7 +364,7 @@ SVr4 added these functions:
   \fBslk_attrset\fP
   \fBslk_start\fP
 .PP
-X/Open \fIcurses\fP added these:
+X/Open Curses added these:
   \fBslk_attr_off\fP
   \fBslk_attr_on\fP
   \fBslk_attr_set\fP
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 1c075cd08..730ce37c6 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.44 2023/11/25 15:48:03 tom Exp $
-.TH curs_sp_funcs 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.45 2023/12/16 20:32:22 tom Exp $
+.TH curs_sp_funcs 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -213,7 +213,8 @@
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
 improve the ability to manage multiple screens.
-This feature can be added to any of the configurations supported by ncurses;
+This feature can be added to any of the configurations supported by
+\fI\%ncurses\fP;
 it adds new entrypoints
 without changing the meaning of any of the existing ones.
 .\" ***************************************************************************
@@ -273,9 +274,9 @@ NCURSES_OUTC
 This is a function-pointer type used for the cases where a function passes
 characters to the output stream, e.g., \fBvidputs\fP(3X).
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\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 \fI\%ncurses\fP extensions
 be conditioned using \fINCURSES_SP_FUNCS\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 09e3384ae..657c83355 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.74 2023/12/02 20:49:04 tom Exp $
-.TH curs_termcap 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.76 2023/12/18 00:22:30 tom Exp $
+.TH curs_termcap 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -62,10 +62,10 @@
 \fB#include <curses.h>
 \fB#include <term.h>
 .PP
-\fBextern char PC;
-\fBextern char * UP;
-\fBextern char * BC;
-\fBextern @NCURSES_OSPEED@ ospeed;
+\fBchar PC;
+\fBchar * UP;
+\fBchar * BC;
+\fB@NCURSES_OSPEED@ ospeed;
 .PP
 \fBint tgetent(char *\fIbp\fP, const char *\fIname\fP);
 \fBint tgetflag(const char *\fIid\fP);
@@ -75,318 +75,465 @@
 \fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
 .fi
 .SH DESCRIPTION
-These routines are included as a conversion aid for programs that use
-the \fItermcap\fP library.
-Their parameters are the same, but the
-routines are emulated using the \fIterminfo\fP database.
-Thus, they
-can only be used to query the capabilities of entries for which a
-terminfo entry has been compiled.
+.I \%ncurses
+provides the foregoing variables and functions as a compatibility layer
+for programs that use the \fItermcap\fP library.
+The API is the same,
+but behavior is emulated using the \fI\%term\%info\fP database.
+Thus,
+it can be used only to query the capabilities of terminal database
+entries for which a \fI\%term\%info\fP entry has been compiled.
 .SS Initialization
-The \fBtgetent\fP routine loads the entry for \fIname\fP.
+\fB\%tgetent\fP loads the terminal database entry for \fIname\fP;
+see \fBterm\fP(7).
+This must be done before calling any of the other functions.
 It returns:
 .RS 3
-.TP 3
+.TP 4
 1
 on success,
-.TP 3
+.TP 4
 0
 if there is no such entry
-(or that it is a generic type, having too little information for curses
-applications to run), and
-.TP 3
+(or if the matching entry describes a generic terminal,
+having too little information for
+.I curses
+applications to run),
+and
+.TP 4
 \-1
-if the terminfo database could not be found.
+if the \fI\%term\%info\fP database could not be found.
 .RE
 .PP
-This differs from the \fItermcap\fP library in two ways:
+This implementation differs from those of historical \fItermcap\fP
+libraries.
 .RS 3
 .bP
-The emulation ignores the buffer pointer \fIbp\fP.
-The \fItermcap\fP library would store a copy of the terminal
+.I \%ncurses
+ignores the buffer pointer \fIbp\fP,
+as do other \fItermcap\fP implementations conforming to portions of
+X/Open Curses now withdrawn.
+The BSD \fItermcap\fP library would store a copy of the terminal type
 description in the area referenced by this pointer.
-However, ncurses stores its terminal descriptions in compiled
-binary form, which is not the same thing.
+\fI\%ncurses\fP stores terminal type descriptions in compiled form,
+which is not the same thing.
 .bP
-There is a difference in return codes.
-The \fItermcap\fP library does not check if the terminal
-description is marked with the \fIgeneric\fP capability,
-or if the terminal description has cursor-addressing.
+The meanings of the return values differ.
+The BSD \fItermcap\fP library does not check whether the terminal type
+description is marked with the
+.B gn
+.RB ( \%generic )
+capability,
+nor whether the terminal type description supports an addressable
+cursor,
+a property essential for any \fIcurses\fP implementation to operate.
 .RE
-.SS Capability Values
-The \fBtgetflag\fP routine gets the boolean entry for \fIid\fP,
+.SS "Retrieving Capability Values"
+\fB\%tgetflag\fP reports the Boolean entry for \fIid\fP,
 or zero if it is not available.
 .PP
-The \fBtgetnum\fP routine gets the numeric entry for \fIid\fP,
+\fB\%tgetnum\fP obtains the numeric entry for \fIid\fP,
 or \-1 if it is not available.
 .PP
-The \fBtgetstr\fP routine returns the string entry for \fIid\fP,
-or zero if it is not available.
-Use \fBtputs\fP to output the returned string.
-The \fIarea\fP parameter is used as follows:
+\fB\%tgetstr\fP returns the string entry for \fIid\fP,
+or
+.B NULL
+if it is not available.
+Use \fB\%tputs\fP to output the string returned.
+The
+.I area
+parameter is used as follows.
 .RS 3
 .bP
 It is assumed to be the address of a pointer to a buffer managed by the
 calling application.
 .bP
-However, ncurses checks to ensure that \fBarea\fP is not NULL,
-and also that the resulting buffer pointer is not NULL.
-If either check fails, the \fIarea\fP parameter is ignored.
+However,
+\fI\%ncurses\fP checks to ensure that
+.I area
+is not
+.BR NULL ,
+and also that the resulting buffer pointer is not
+.BR NULL .
+If either check fails,
+.I area
+is ignored.
 .bP
-If the checks succeed, ncurses also copies the return value to
-the buffer pointed to by \fIarea\fP,
-and the \fIarea\fP value will be updated to point past the null ending
-this value.
+If the checks succeed,
+\fI\%ncurses\fP also copies the return value to the buffer pointed to by
+\fIarea\fP,
+and the library updates
+.I area
+to point past the null character terminating this value.
 .bP
-The return value itself is an address in the terminal description which
-is loaded into memory.
+The return value itself is an address in the terminal type description
+loaded into memory.
 .RE
-.PP
-Only the first two characters of the \fBid\fP parameter of
-\fBtgetflag\fP,
-\fBtgetnum\fP and
-\fBtgetstr\fP are compared in lookups.
-.SS Formatting Capabilities
-The \fBtgoto\fP routine expands the given capability using the parameters.
+.SS "Applying String Capabilities"
+String capabilities can be parameterized;
+see subsection \*(``Parameterized Strings\*('' in  \fB\%terminfo\fP(5).
+\fB\%tgoto\fP applies its second and third arguments to the parametric
+placeholders in the capability stored in the first argument.
 .bP
-Because the capability may have padding characters,
-the output of \fBtgoto\fP should be passed to \fBtputs\fP
-rather than some other output function such as \fBprintf\fP(3).
+The capability may contain padding specifications;
+see subsection \*(``Delays and Padding\*('' of \fB\%terminfo\fP(5).
+The output of \fB\%tgoto\fP should thus be passed to \fB\%tputs\fP
+rather than some other output function such as \fI\%printf\fP(3).
 .bP
-While \fBtgoto\fP is assumed to be used for the two-parameter
+While \fB\%tgoto\fP is assumed to be used for the two-parameter
 cursor positioning capability,
-termcap applications also use it for single-parameter capabilities.
+\fItermcap\fP applications also use it for single-parameter
+capabilities.
 .IP
-Doing this shows a quirk in \fBtgoto\fP: most hardware
-terminals use cursor addressing with \fIrow\fP first,
-but the original developers of the termcap interface chose to
-put the \fIcolumn\fP parameter first.
-The \fBtgoto\fP function swaps the order of parameters.
-It does this also for calls requiring only a single parameter.
-In that case, the first parameter is merely a placeholder.
+Doing so reveals a quirk in \fB\%tgoto\fP:
+most hardware terminals use cursor addressing with \fIrow\fP first,
+but the original developers of the \fItermcap\fP interface chose to
+put the \fIcol\fP (column) parameter first.
+The \fB\%tgoto\fP function swaps the order of parameters.
+It does this even for calls requiring only a single parameter.
+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 an internal version of
-\fBtparm\fP(3X) (a more capable formatter).
+Normally the \fI\%ncurses\fP library is compiled without
+full \fI\%term\%cap\fP support.
+In that case,
+\fB\%tgoto\fP uses an internal version of \fB\%tparm\fP(3X)
+(a more capable function).
 .IP
-With terminfo support, \fBtgoto\fP is able to use some of the terminfo
-features, but not all.
-In particular, it allows only numeric parameters;
-\fBtparm\fP supports string parameters.
+Because it uses \fB\%tparm\fP internally,
+\fB\%tgoto\fP is able to use some \fI\%term\%info\fP features,
+but not all.
+In particular,
+it allows only numeric parameters;
+\fB\%tparm\fP supports string parameters.
 .IP
-However, \fBtparm\fP is not a \fItermcap\fP feature,
-and portable \fItermcap\fP applications should not rely upon its availability.
+However,
+\fB\%tparm\fP is not a \fItermcap\fP feature,
+and portable \fItermcap\fP applications should not rely upon its
+availability.
 .PP
-The \fBtputs\fP routine is described on the \fBcurs_terminfo\fP(3X) manual
-page.
-It can retrieve capabilities by either termcap or terminfo name.
-.SS Global Variables
+\fB\%tputs\fP is described in \fB\%curs_terminfo\fP(3X).
+It can retrieve capabilities by either \fItermcap\fP or
+\fI\%term\%info\fP name.
+.SS "Global Variables"
 The variables
 \fBPC\fP,
 \fBUP\fP and
 \fBBC\fP
-are set by \fBtgetent\fP to the terminfo entry's data for
-\fBpad_char\fP,
-\fBcursor_up\fP and
-\fBbackspace_if_not_bs\fP,
+are set by \fB\%tgetent\fP to the \fI\%term\%info\fP entry's data for
+\fB\%pad_char\fP,
+\fB\%cursor_up\fP and
+\fB\%backspace_if_not_bs\fP,
 respectively.
-\fBUP\fP is not used by ncurses.
-\fBPC\fP is used in the \fBtdelay_output\fP function.
-\fBBC\fP is used in the \fBtgoto\fP emulation.
-The variable \fBospeed\fP is set by ncurses in a system-specific coding
-to reflect the terminal speed.
-.SS Releasing Memory
-The termcap functions provide no means for freeing memory,
-because legacy termcap implementations used only the buffer
-areas provided by the caller via \fBtgetent\fP and \fBtgetstr\fP.
-Those buffers are unused in terminfo.
+\fBUP\fP is not used by \fI\%ncurses\fP.
+\fBPC\fP is used by \fB\%delay_output\fP(3X).
+\fBBC\fP is used by \fB\%tgoto\fP emulation.
+The variable \fB\%ospeed\fP is set by \fI\%ncurses\fP using a
+system-specific encoding to indicate the terminal's data rate.
+.SS "Releasing Memory"
+The \fItermcap\fP functions provide no means of freeing memory,
+because legacy \fItermcap\fP implementations used only the buffer
+areas provided by the caller via \fB\%tgetent\fP and \fB\%tgetstr\fP.
+Those buffers are unused in \fI\%term\%info\fP.
 .PP
-On the other hand, terminfo allocates memory.
-It uses \fBsetupterm\fP to retrieve the data used by \fBtgetent\fP
-and the functions which return capability values such as \fBtgetstr\fP.
+By contrast,
+\fI\%term\%info\fP allocates memory.
+It uses \fB\%setupterm\fP(3X) to obtain the data used by \fB\%tgetent\fP
+and the functions that retrieve capability values.
 One could use
-.sp
-        \fBdel_curterm(cur_term);\fP
-.sp
-.PP
-to free this memory, but there is an additional complication with ncurses.
-It uses a fixed-size \fIpool\fP of storage locations,
-one per setting of the \fITERM\fP variable when \fBtgetent\fP is called.
-The \fBscreen\fP(1) program relies upon this arrangement,
-to improve its performance.
-.PP
-An application which uses only the low-level termcap functions could
-free the memory using \fBdel_curterm\fP,
-because the pool is freed using other functions
-(see \fBcurs_memleaks\fP(3X)).
-.
-.SH RETURN VALUE
-Except where explicitly noted,
-routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+.RS
+.EX
+del_curterm(cur_term);
+.EE
+.RE
+to free this memory,
+but there is an additional complication with \fI\%ncurses\fP.
+It uses a fixed-size pool of storage locations,
+one per value of the \fITERM\fP environment variable when
+\fB\%tgetent\fP is called.
+The \fBscreen\fP(1) program relies upon this arrangement to improve its
+performance.
 .PP
-Routines that return pointers return \fBNULL\fP on error.
+An application that uses only the \fItermcap\fP functions,
+not the higher level
+.I \%curses
+API,
+could release the memory using \fB\%del_curterm\fP(3X),
+because the pool is freed using other functions;
+see \fB\%curs_memleaks\fP(3X).
+.SH "RETURN VALUE"
+The return values of
+\fB\%tgetent\fP,
+\fB\%tgetflag\fP,
+\fB\%tgetname\fP,
+and
+\fB\%tgetstr\fP
+are documented above.
 .PP
-A few special cases apply:
+\fB\%tgoto\fP returns
+.B NULL
+on error.
+Error conditions include:
+.bP
+uninitialized state
+(\fB\%tgetent\fP was not called successfully),
 .bP
-If the terminal database has not been initialized,
-these return an error.
+.I cap
+being a null pointer,
 .bP
-The calls with a string parameter (\fBtgoto\fP, \fBtputs\fP)
-check if the string is null, or cancelled.
-Those return an error.
+.I cap
+referring to a canceled capability,
 .bP
-A call to \fBtgoto\fP using a capability with string parameters is an error.
+.I cap
+being a capability with string-valued parameters
+(a \fI\%term\%info\fP-only feature),
+and
 .bP
-A call to \fBtgoto\fP using a capability with more than two parameters
-is an error.
+.I cap
+being a capability with more than two parameters.
+.PP
+See \fB\%curs_terminfo\fP(3X) regarding \fB\%tputs\fP.
+.SH NOTES
+\fI\%ncurses\fP compares only the first two characters of the \fIid\fP
+parameter of
+\fB\%tgetflag\fP,
+\fB\%tgetnum\fP,
+and
+\fB\%tgetstr\fP to the capability names in the database.
 .SH PORTABILITY
+These functions are no longer standardized
+(and the variables never were);
+\fI\%ncurses\fP provides them to support legacy applications.
+They should not be used in new programs.
 .SS Standards
-These functions are provided for supporting legacy applications,
-and should not be used in new programs:
 .bP
-The XSI Curses standard, Issue 4 describes these functions.
-However, they
-are marked TO BE WITHDRAWN and may be removed in future versions.
+X/Open Curses, Issue 4, Version 2 (1996),
+describes these functions.
+However,
+they are marked
+\*(``TO BE WITHDRAWN\*(''.
 .bP
-X/Open Curses, Issue 5 (December 2007) marked the termcap interface
-(along with \fBvwprintw\fP and \fBvwscanw\fP) as withdrawn.
+X/Open Curses, Issue 7 (2009) marked the \fItermcap\fP interface
+(along with \fB\%vwprintw\fP and \fB\%vwscanw\fP) as withdrawn.
 .PP
-Neither the XSI Curses standard nor the SVr4 man pages documented the return
-values of \fBtgetent\fP correctly, though all three were in fact returned ever
-since SVr1.
-In particular, an omission in the XSI Curses documentation has been
-misinterpreted to mean that \fBtgetent\fP returns \fBOK\fP or \fBERR\fP.
+Neither X/Open Curses nor the SVr4 man pages documented the return
+values of \fB\%tgetent\fP correctly,
+though all three were in fact returned ever since SVr1.
+In particular,
+an omission in the X/Open Curses specification has been misinterpreted
+to mean that \fB\%tgetent\fP returns \fBOK\fP or \fBERR\fP.
 Because the purpose of these functions is to provide compatibility with
-the \fItermcap\fP library, that is a defect in XCurses, Issue 4, Version 2
-rather than in ncurses.
-.SS Compatibility with BSD Termcap
-External variables are provided for support of certain termcap applications.
-However, termcap applications' use of those variables is poorly documented,
-e.g., not distinguishing between input and output.
-In particular, some applications are reported to declare and/or
-modify \fBospeed\fP.
+the \fItermcap\fP library,
+that is a defect in X/Open Curses, Issue 4, Version 2
+rather than in \fI\%ncurses\fP.
+.SS "Compatibility with BSD \fItermcap\fP"
+Externally visible variables are provided for support of certain
+\fItermcap\fP applications.
+However,
+their correct usage is poorly documented;
+for example,
+it is unclear when reading and writing them is meaningful.
+In particular,
+some applications are reported to declare and/or modify \fB\%ospeed\fP.
 .PP
-The comment that only the first two characters of the \fBid\fP parameter
-are used escapes many application developers.
-The original BSD 4.2 termcap library (and historical relics thereof)
-did not require a trailing null NUL on the parameter name passed
-to \fBtgetstr\fP, \fBtgetnum\fP and \fBtgetflag\fP.
-Some applications assume that the termcap interface does not require
-the trailing NUL for the parameter name.
-Taking into account these issues:
-.bP
-As a special case,
-\fBtgetflag\fP matched against a single-character identifier
-provided that was at the end of the terminal description.
-You should not rely upon this behavior in portable programs.
-This implementation disallows matches against single-character capability names.
+The constraint that only the first two characters of the \fIid\fP
+parameter are used escapes many application developers.
+The BSD \fItermcap\fP library did not require a trailing null character
+on the capability identifier passed to \fB\%tgetstr\fP,
+\fB\%tgetnum\fP,
+and
+\fB\%tgetflag\fP.
+.\" See <https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
+.\"   termlib/termcap.c>.
+Some applications thus assume that the \fItermcap\fP interface does not
+require the trailing null character for the capability identifier.
 .bP
-This implementation disallows matches by the termcap interface against
-extended capability names which are longer than two characters.
+.I \%ncurses
+disallows matches by the \fItermcap\fP interface against extended
+capability names that are longer than two characters;
+see \fB\%user_caps\fP(5).
 .PP
-The BSD termcap function \fBtgetent\fP returns the text of a termcap
-entry in the buffer passed as an argument.
-This library (like other terminfo implementations) does not store
-terminal descriptions as text.
+The BSD \fItermcap\fP function \fB\%tgetent\fP returns the text of a
+\fItermcap\fP entry in the buffer passed as an argument.
+This library,
+like other \fI\%term\%info\fP implementations,
+does not store terminal type descriptions as text.
 It sets the buffer contents to a null-terminated string.
-.SS Other Compatibility
-This library includes a termcap.h header,
-for compatibility with other implementations.
-But the header is rarely used because the other implementations
-are not strictly compatible.
+.SS "Header File"
+This library includes a \fI\%termcap.h\fP header for compatibility with
+other implementations,
+but the header is rarely used because the other implementations are not
+strictly compatible.
+.SH HISTORY
+.\" See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
+.\" for much BSD release history.
+Bill Joy originated a forerunner of \fItermcap\fP called
+\*(``ttycap\*('',
+dated September 1977,
+and released in 1BSD
+(March 1978).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s7/ttycap.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
+It used many of the same function names as the later \fItermcap\fP,
+such as
+\fB\%tgetent\fP,
+\fB\%tgetflag\fP,
+\fB\%tgetnum\fP,
+and
+\fB\%tgetstr\fP.
+.PP
+A clear descendant,
+the \fItermlib\fP library,
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/termlib/
+followed in 2BSD
+(May 1979),
+adding \fB\%tgoto\fP and \fB\%tputs\fP.
+The former applied at that time only to cursor positioning capabilities,
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/bin/etc/termcap
+thus the overly specific name.
+Little changed in 3BSD
+(late 1979)
+except the addition of test programs and a \fI\%termlib\fP man page,
+which documented the API shown in section \*(``SYNOPSIS\*('' above.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/lib/\
+.\"   libtermlib/
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/man/man3/\
+.\"   termlib.3
+.PP
+4BSD
+(November 1980)
+renamed \fItermlib\fP to \fItermcap\fP
+.\" ...except in the source tree...
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+.\"   libtermlib/makefile
+and added another test program.
+The library remained much the same though 4.3BSD
+(June 1986).
+4.4BSD-Lite
+(June 1994)
+refactored it
+.\" Observe the `tncktc()`, `tnamatch()`, `tskip()`, and `tdecode()`
+.\" entry points disappearing from termcap.c.
+but left the API unchanged.
 .PP
-The original BSD termcap (through 4.3BSD) had no header file which
-gave function prototypes, because that was a feature of ANSI C.
-BSD termcap was written several years before C was standardized.
-However, there were two different termcap.h header files in the BSD
-sources:
+Function prototypes were a feature of the forthcoming ANSI C (1989).
+Thus the library provided no header file declaring them.
+Nevertheless,
+the BSD sources included two different \fI\%termcap.h\fP header files
+over time.
 .bP
-One was used internally by the \fBjove\fP editor in 2BSD through 4.4BSD.
-It defined global symbols for the termcap variables which it used.
+One was used internally by \fBjove\fP(1) from 4.3BSD onward.
+.\" 2BSD became a branch retaining support for non-virtual memory
+.\" systems (like the PDP-11) whereas most BSD development focused on
+.\" the VAX and other VM-enabled systems starting with 3BSD.
+.\"
+.\" This man page previously located a termcap.h in 2BSD, but that may
+.\" be confusion arising from its backport to 2.9BSD (and still present
+.\" in surviving sources for 2.11BSD, the "end of the line" for that
+.\" branch's development).
+.\"
+.\" Observe the copyright notice in
+.\"   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
+.\"     jove/Makefile
+.\" --much too late for 2BSD (1979).
+It delcared global symbols for the \fItermcap\fP variables that it used.
 .bP
-The other appeared in 4.4BSD Lite Release 2 (mid-1993)
-as part of \fIlibedit\fP (also known as the \fIeditline\fP library).
-The CSRG source history shows that this was added in mid-1992.
-The \fIlibedit\fP header file was used internally,
-as a convenience for compiling the \fIeditline\fP library.
-It declared function prototypes, but no global variables.
-.PP
-The header file from \fIlibedit\fP was added to NetBSD's termcap
-library in mid-1994.
+The other appeared in 4.4BSD-Lite Release 2
+(June 1995)
+as part of \fIlibedit\fP
+(also known as the \fI\%edit\%line\fP library).
+CSRG source history shows that this was added in mid-1992.
+The \fIlibedit\fP header file was used internally as a convenience for
+compiling the \fI\%edit\%line\fP library.
+It declared function prototypes,
+but no global variables.
+This header file was added to NetBSD's \fItermcap\fP library in
+mid-1994.
 .PP
-Meanwhile, GNU termcap was under development, starting in 1990.
-The first release (termcap 1.0) in 1991 included a termcap.h header.
-The second release (termcap 1.1) in September 1992 modified the
-header to use \fBconst\fP for the function prototypes in the header
-where one would expect the parameters to be read-only.
-This was a difference versus the original BSD termcap.
-The prototype for \fBtputs\fP also differed,
-but in that instance, it was \fIlibedit\fP which differed from BSD termcap.
+Meanwhile,
+GNU \fItermcap\fP began development in 1990.
+Its first release (1.0) in 1991 included a \fI\%termcap.h\fP header.
+Its second (1.1) in September 1992 modified the header to use
+\fIconst\fP for the function prototypes in the header where one would
+expect the parameters to be read-only.
+BSD \fItermcap\fP did not.
+The prototype for \fB\%tputs\fP also differed,
+but in that instance,
+it was \fIlibedit\fP that differed from BSD \fItermcap\fP.
 .PP
-A copy of GNU termcap 1.3 was bundled with \fIbash\fP in mid-1993,
-to support the \fBreadline\fP(3) library.
+GNU \fItermcap\fP 1.3 was bundled with \fIbash\fP in mid-1993 to support
+the \fBreadline\fP(3) library.
 .PP
-A termcap.h file was provided in ncurses 1.8.1 (November 1993).
-That reflected influence by \fBemacs\fP(1) (rather than \fBjove\fP(1))
-and GNU termcap:
+\fI\%ncurses\fP 1.8.1
+(November 1993)
+provided a \fI\%termcap.h\fP file.
+It reflected influence from GNU \fItermcap\fP and \fBemacs\fP(1)
+(rather than \fBjove\fP(1)),
+providing the following interface:
 .bP
-it provided declarations for a few global symbols used by \fBemacs\fP
+global symbols used by \fIemacs\fP,
 .bP
-it provided function prototypes (using \fBconst\fP).
+\fIconst\fP-qualified function prototypes,
+and
 .bP
-a prototype for \fBtparam\fP (a GNU termcap feature) was provided.
+a prototype for \fBtparam\fP,
+a GNU \fItermcap\fP feature.
 .PP
-Later (in mid-1996) the \fBtparam\fP function was removed from ncurses.
-As a result, there are differences between any of the four implementations,
-which must be taken into account by programs which can work with all
-termcap library interfaces.
+Later
+(in mid-1996)
+the \fB\%tparam\fP function was removed from \fI\%ncurses\fP.
+Any two of the four implementations thus differ,
+and programs that intend to work with all \fItermcap\fP library
+interfaces must account for that fact.
 .SH BUGS
 If you call \fB\%tgetstr\fP to fetch \fB\%ca\fP or any other
 parameterized string capability,
-be aware that it is returned in \fI\%terminfo\fP notation,
-not the older and not-quite-compatible \fI\%termcap\fP notation.
+be aware that it is returned in \fI\%term\%info\fP notation,
+not the older and not-quite-compatible \fItermcap\fP notation.
 This does not cause problems if all you do with it is call \fB\%tgoto\fP
-or \fB\%tparm\fP, which both expand
-\fI\%terminfo\fP-style strings as \fI\%terminfo\fP does.
-(The \fB\%tgoto\fP function,
-if configured to support \fI\%termcap,\fP
-checks if the string is indeed \fI\%terminfo\fP-style by looking for
-\*(``\fB%p\fP\*('' parameters or \*(``\fB<\fP.\|.\|.\fB>\fP\*('' delays,
-and invokes a \fI\%termcap\fP-style parser if the string appears not to
-use \fI\%terminfo\fP syntax.)
+or \fB\%tparm\fP,
+which both expand \fI\%term\%info\fP-style strings as \fI\%term\%info\fP
+does.
+(If
+.I \%ncurses
+is configured to support \fItermcap,\fP
+\fB\%tgoto\fP checks whether the string is \fI\%term\%info\fP-style by
+looking for \*(``\fB%p\fP\*('' parameters or
+\*(``\fB<\fP.\|.\|.\fB>\fP\*('' delays,
+and invokes a \fItermcap\fP-style parser if the string appears not to
+use \fI\%term\%info\fP syntax.)
 .PP
-Because \fI\%terminfo\fP's syntax for padding in string capabilities
-differs from \fI\%termcap\fP's,
+Because \fI\%term\%info\fP's syntax for padding in string capabilities
+differs from \fItermcap\fP's,
 users can be surprised.
 .IP \(bu 4
-\fB\%tputs("50")\fP in a \fI\%terminfo\fP system transmits \*(``50\*(''
-rather than busy-waiting for 50 milliseconds.
+\fB\%tputs("50")\fP in a \fI\%term\%info\fP system transmits
+\*(``50\*('' rather than busy-waiting for 50 milliseconds.
 .IP \(bu 4
 However,
-if \fI\%ncurses\fP is configured to support \fI\%termcap\fP,
+if \fI\%ncurses\fP is configured to support \fItermcap\fP,
 it may also have been configured to support BSD-style padding.
 .IP
 In that case,
 \fB\%tputs\fP inspects strings passed to it,
 looking for digits at the beginning of the string.
 .IP
-\fB\%tputs("50")\fP in a \fI\%termcap\fP system may busy-wait for 50
+\fB\%tputs("50")\fP in a \fItermcap\fP system may busy-wait for 50
 milliseconds rather than transmitting \*(``50\*(''.
 .PP
-\fI\%termcap\fP has nothing analogous to \fI\%terminfo\fP's \fBsgr\fP
+\fItermcap\fP has nothing analogous to \fI\%term\%info\fP's \fBsgr\fP
 string.
-One consequence is that \fI\%termcap\fP applications assume that
-\fBme\fP
-(equivalent to \fI\%terminfo\fP's \fBsgr0\fP capability)
+One consequence is that \fItermcap\fP applications assume that
+.RB \*(`` me \*(''
+(equivalent to \fI\%term\%info\fP's \fBsgr0\fP capability)
 does not reset the alternate character set.
 \fI\%ncurses\fP checks for,
 and modifies the data shared with,
-the \fI\%termcap\fP interface to accommodate the latter's limitation in
+the \fItermcap\fP interface to accommodate the latter's limitation in
 this respect.
-.SH SEE ALSO
+.SH "SEE ALSO"
 \fB\%curses\fP(3X),
+\fB\%curs_terminfo\fP(3X),
 \fB\%putc\fP(3),
 \fB\%term_variables\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 62d51a65f..aeee9db81 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.122 2023/12/03 00:10:20 tom Exp $
-.TH curs_terminfo 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.123 2023/12/16 21:11:53 tom Exp $
+.TH curs_terminfo 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -88,9 +88,9 @@
 \fBint del_curterm(TERMINAL *\fIoterm\fP);
 \fBint restartterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
 .PP
-\fBchar *tparm(const char *\fIstr\fP, ...);
-	\fIor
-\fBchar *tparm(const char *\fIstr\fP, long \fIp1 ... \fPlong \fIp9\fP);
+\fBchar *tparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
+	\fI/* or */
+\fBchar *tparm(const char *\fIstr\fP, long \fIp1\fP \fR.\|.\|.\fP \fBlong\fP \fIp9\fP);
 .PP
 \fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
 \fBint putp(const char *\fIstr\fP);
@@ -106,7 +106,7 @@
 \fBint tigetnum(const char *\fIcapname\fP);
 \fBchar *tigetstr(const char *\fIcapname\fP);
 .PP
-\fBchar *tiparm(const char *\fIstr\fP, ...);
+\fBchar *tiparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
 .PP
 \fI/* extensions */
 \fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, ...);
@@ -242,7 +242,7 @@ Thus, the simplest call is:
 which uses all the defaults and sends the output to \fBstdout\fP.
 .RE
 .\" ***************************************************************************
-.SS The Terminal State
+.SS "The Terminal State"
 The \fBsetupterm\fP routine stores its information about the terminal
 in a \fBTERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
 If it detects an error,
@@ -277,7 +277,7 @@ but the terminal type and baud rate may be different.
 Accordingly, \fBrestartterm\fP saves various tty state bits,
 calls \fBsetupterm\fP, and then restores the bits.
 .\" ***************************************************************************
-.SS Formatting Output
+.SS "Formatting Output"
 The \fBtparm\fP routine instantiates the string \fIstr\fP with
 parameters \fIpi\fP.  A pointer is returned to the result of \fIstr\fP
 with the parameters applied.
@@ -315,7 +315,7 @@ The \fImask\fP parameter has one bit set for each of the parameters
 The extension \fBtiscan_s\fP allows the application
 to inspect a formatting capability to see what the curses library would assume.
 .\" ***************************************************************************
-.SS Output Functions
+.SS "Output Functions"
 String capabilities can contain padding information,
 a time delay
 (accommodating performance limitations of hardware terminals)
@@ -366,7 +366,7 @@ i.e.,
 .bP
 \fIattrs\fP of type \fBattr_t\fP for the attributes and
 .bP
-\fIpair\fP of type \fBshort\fP for the color-pair number.
+\fIpair\fP of type \fBshort\fP for the color pair number.
 .PP
 The \fBvid_attr\fP and \fBvid_puts\fP routines
 are designed to use the attribute constants with the \fBWA_\fP prefix.
@@ -389,7 +389,7 @@ do not use the high-level curses state,
 they are declared in \fB\%<curses.h>\fP because System\ V did this
 (see \fIHISTORY\fP).
 .\" ***************************************************************************
-.SS Terminal Capability Functions
+.SS "Terminal Capability Functions"
 The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
 the value of the capability corresponding to the \fBterminfo\fP
 \fIcapname\fP passed to them, such as \fBxenl\fP.
@@ -424,7 +424,7 @@ or
 \fB0\fP
 if it is canceled or absent from the terminal description.
 .\" ***************************************************************************
-.SS Terminal Capability Names
+.SS "Terminal Capability Names"
 These null-terminated arrays contain
 .bP
 the short \fIterminfo\fP names (\*(``codes\*(''),
@@ -443,7 +443,7 @@ for each of the predefined \fIterminfo\fP variables:
 .fi
 .RE
 .\" ***************************************************************************
-.SS Releasing Memory
+.SS "Releasing Memory"
 Each successful call to \fBsetupterm\fP allocates memory to hold the terminal
 description.
 As a side-effect, it sets \fBcur_term\fP to point to this memory.
@@ -457,11 +457,12 @@ The formatting functions \fBtparm\fP and \fBtiparm\fP extend the storage
 allocated by \fBsetupterm\fP:
 .bP
 the \*(``static\*('' terminfo variables [a-z].
-Before ncurses 6.3, those were shared by all screens.
-With ncurses 6.3, those are allocated per screen.
+Before \fI\%ncurses\fP 6.3, those were shared by all screens.
+With \fI\%ncurses\fP 6.3, those are allocated per screen.
 See \fBterminfo\fP(5) for details.
 .bP
-to improve performance, ncurses 6.3 caches the result of analyzing terminfo
+to improve performance,
+\fI\%ncurses\fP 6.3 caches the result of analyzing terminfo
 strings for their parameter types.
 That is stored as a binary tree referenced from the \fBTERMINAL\fP structure.
 .PP
@@ -514,7 +515,8 @@ of the output function \fIputc\fP.
 X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
 .\" ***************************************************************************
 .SH EXTENSIONS
-The functions marked as extensions were designed for \fBncurses\fP(3X),
+The functions marked as extensions were designed for
+\fB\%ncurses\fP(3X),
 and are not found in SVr4 curses, 4.4BSD curses,
 or any other previous version of curses.
 .\" ***************************************************************************
@@ -522,7 +524,7 @@ or any other previous version of curses.
 The function \fBsetterm\fP is not described by X/Open and must
 be considered non-portable.
 All other functions are as described by X/Open.
-.SS Compatibility macros
+.SS "Compatibility Macros"
 This implementation provides a few macros for compatibility with systems
 before SVr4 (see \fIHISTORY\fP).
 Those include
@@ -546,7 +548,7 @@ provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
 and is not recommended for new programs.
 This implementation provides each of those symbols
 as macros for BSD compatibility.
-.SS Legacy data
+.SS "Legacy Data"
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
@@ -556,24 +558,25 @@ X/Open does not specify them.
 .PP
 Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
 are not stored in the arrays described here.
-.SS Output buffering
-Older versions of \fBncurses\fP assumed that the file descriptor passed to
-\fBsetupterm\fP from \fBinitscr\fP or \fBnewterm\fP uses buffered I/O,
+.SS "Output Buffering"
+Older versions of \fI\%ncurses\fP assumed that the file descriptor
+passed to \fBsetupterm\fP from \fBinitscr\fP or \fBnewterm\fP uses
+buffered I/O,
 and would write to the corresponding stream.
 In addition to the limitation that the terminal was left in block-buffered
 mode on exit (like System V curses),
-it was problematic because \fBncurses\fP
+it was problematic because \fI\%ncurses\fP
 did not allow a reliable way to cleanup on receiving SIGTSTP.
 .PP
 The current version (ncurses6)
-uses output buffers managed directly by \fBncurses\fP.
+uses output buffers managed directly by \fI\%ncurses\fP.
 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 \fBncurses\fP use
+The high-level functions in \fI\%ncurses\fP use
 alternate versions of these functions
 using the more reliable buffering scheme.
-.SS Function prototypes
+.SS "Function Prototypes"
 The X/Open Curses prototypes are based on the SVr4 curses header declarations,
 which were defined at the same time the C language was first standardized in
 the late 1980s.
@@ -587,7 +590,7 @@ On the other hand, \fIwritable strings\fP are an obsolescent feature.
 .IP
 As an extension, this implementation can be configured to change the
 function prototypes to use the \fBconst\fP keyword.
-The \fIncurses\fP ABI 6 enables this feature by default.
+The \fI\%ncurses\fP ABI 6 enables this feature by default.
 .bP
 X/Open Curses prototypes \fBtparm\fP with a fixed number of parameters,
 rather than a variable argument list.
@@ -600,7 +603,7 @@ zeroes are fine for this purpose.
 In response to review comments by Thomas E. Dickey,
 X/Open Curses Issue 7 proposed the \fBtiparm\fP function in mid-2009.
 .IP
-While \fBtiparm\fP is always provided in ncurses,
+While \fBtiparm\fP is always provided in \fI\%ncurses\fP,
 the older form is only available as a build-time configuration option.
 If not specially configured, \fBtparm\fP is the same as \fBtiparm\fP.
 .PP
@@ -620,14 +623,14 @@ such as \fBtiparm\fP can be a problem, in particular for string parameters.
 However, only a few terminfo capabilities use string parameters
 (e.g., the ones used for programmable function keys).
 .IP
-The ncurses library checks usage of these capabilities,
+The \fI\%ncurses\fP library checks usage of these capabilities,
 and returns an error if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
 places for the \fBtparm\fP calls.
 .IP
 The \fB@TPUT@\fR(1) program checks its use of these capabilities with a table,
 so that it calls \fBtparm\fP correctly.
-.SS Special TERM treatment
+.SS "Special \fITERM\fP treatment"
 If configured to use the terminal-driver,
 e.g., for the MinGW port,
 .bP
@@ -645,7 +648,7 @@ A generic terminal is unsuitable for full-screen applications.
 \fBsetupterm\fP allows explicit use of the
 the windows console driver by checking if \fB$TERM\fP is set to
 \*(``#win32con\*('' or an abbreviation of that string.
-.SS Other portability issues
+.SS "Other Portability Issues"
 In System V Release 4, \fBset_curterm\fP has an \fBint\fP return type and
 returns \fBOK\fP or \fBERR\fP.  We have chosen to implement the X/Open Curses
 semantics.
@@ -660,8 +663,9 @@ That returns the length of the string, and does no error-checking.
 X/Open notes that after calling \fBmvcur\fP, the curses state may not match the
 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
-Both \fBncurses\fP and System V Release 4 curses implement \fBmvcur\fP using
-the SCREEN data allocated in either \fBinitscr\fP or \fBnewterm\fP.
+Both \fI\%ncurses\fP and System V Release 4 curses implement \fBmvcur\fP
+using the SCREEN data allocated in either \fBinitscr\fP or
+\fBnewterm\fP.
 So though it is documented as a terminfo function,
 \fBmvcur\fP is really a curses function which is not well specified.
 .PP
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 1648dee20..c0675b16c 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.49 2023/11/25 14:09:12 tom Exp $
-.TH curs_threads 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.50 2023/12/16 20:32:22 tom Exp $
+.TH curs_threads 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,16 +70,16 @@
 \fBint use_window(WINDOW *\fIwin\fP, NCURSES_WINDOW_CB \fIfunc\fP, void *\fIdata\fP);
 .fi
 .SH DESCRIPTION
-The \fIncurses\fP library can be configured to support multi-threaded
+The \fI\%ncurses\fP library can be configured to support multi-threaded
 applications in a rudimentary way.
 Such configuration produces a different set of libraries,
 named \fIlibncursest\fP,
 for example,
-since doing so alters \fIncurses\fP's application binary interface
+since doing so alters \fI\%ncurses\fP's application binary interface
 (ABI).
 .PP
 Instead of modifying the programming interface (API) to make
-\fIncurses\fP functions expect an additional argument specifying a
+\fI\%ncurses\fP functions expect an additional argument specifying a
 thread,
 the library adds functions,
 usable in any configuration,
@@ -88,8 +88,9 @@ that hide the \fImutexes\fP
 needed to prevent concurrent access to variables shared by multiple
 threads of execution.
 .PP
-\fIncurses\fP threading support requires the use of functions to access
-members of the \fI\%WINDOW\fP structure (see \fBcurs_opaque\fP(3X)).
+\fI\%ncurses\fP threading support requires the use of functions to
+access members of the \fI\%WINDOW\fP structure (see
+\fBcurs_opaque\fP(3X)).
 It further makes functions of the common global variables
 \fB\%COLORS\fP,
 \fB\%COLOR_PAIRS\fP,
@@ -127,7 +128,7 @@ pass it a \fIdata\fP parameter,
 and return the value from the user-supplied function to the application.
 .\" ***************************************************************************
 .SS Usage
-All \fIncurses\fP library functions assume that the locale is not
+All \fI\%ncurses\fP library functions assume that the locale is not
 altered during operation.
 In addition,
 they use data that is maintained within a hierarchy of scopes.
@@ -154,8 +155,9 @@ single screen.
 reentrant data associated with \*(``pure\*('' functions that alter no
 shared variables
 .PP
-The following table lists the scope of each symbol in the \fIncurses\fP
-library when configured to support multi-threaded applications.
+The following table lists the scope of each symbol in the
+\fI\%ncurses\fP library when configured to support multi-threaded
+applications.
 .PP
 .TS
 center tab(/);
@@ -623,12 +625,12 @@ failure and \fBOK\fP upon successful completion.
 \fB\%use_screen\fP and \fB\%use_window\fP return the \fIint\fP returned
 by the user-supplied function they are called with.
 .SH NOTES
-\fIncurses\fP provides both a C function and a preprocessor macro for
+\fI\%ncurses\fP provides both a C function and a preprocessor macro for
 each function documented in this page.
 .SH PORTABILITY
-These routines are specific to \fIncurses\fP.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fIncurses\fP extensions
+It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fB\%NCURSES_VERSION\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 6233edb6c..09e787780 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.40 2023/10/07 21:19:07 tom Exp $
-.TH curs_trace 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.41 2023/12/16 20:50:14 tom Exp $
+.TH curs_trace 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -83,8 +83,9 @@
 \fBvoid trace(const unsigned int \fIparam\fP);
 .fi
 .SH DESCRIPTION
-The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
-as well as applications which use the ncurses libraries.
+The \fIcurses trace\fP routines are used for debugging the
+\fI\%ncurses\fP libraries,
+as well as applications which use the \fI\%ncurses\fP libraries.
 Some limitations apply:
 .bP
 Aside from \fBcurses_trace\fP,
@@ -122,7 +123,7 @@ updates the trace mask,
 and returns the previous trace mask.
 .IP
 When the trace mask is nonzero,
-ncurses creates the file \*(``trace\*('' in the current directory for output.
+\fI\%ncurses\fP creates the file \*(``trace\*('' in the current directory for output.
 If the file already exists, no tracing is done.
 .bP
 If tracing is not available, \fBcurses_trace\fP returns zero (0).
@@ -192,7 +193,7 @@ is nonzero.
 Some features overlap.
 The specific names are used as a guideline.
 .SS Initialization
-These functions check the \fBNCURSES_TRACE\fP environment variable,
+These functions check the \fI\%NCURSES_TRACE\fP environment variable,
 to set the tracing feature as if \fBcurses_trace\fP was called:
 .RS 4
 .PP
@@ -220,13 +221,14 @@ which determines the messages which are written.
 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:
+if the \fI\%NCURSES_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,
+If \fI\%ncurses\fP 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
@@ -235,7 +237,7 @@ to the \fB_tracef\fP routine.
 These functions are not part of the XSI interface.
 Some other curses implementations are known to
 have similar features,
-but they are not compatible with ncurses:
+but they are not compatible with \fI\%ncurses\fP:
 .bP
 SVr4 provided \fBtraceon\fP and \fBtraceoff\fP,
 to control whether debugging information was written
@@ -254,21 +256,22 @@ only when a debug-library is built.
 .IP
 PDCurses has a short description of these functions,
 with a note that they are not present in X/Open Curses,
-ncurses or NetBSD.
+\fI\%ncurses\fP or NetBSD.
 It does not mention SVr4,
 but the functions' inclusion in a header file section
 labeled \*(``Quasi-standard\*('' hints at the origin.
 .bP
 NetBSD does not provide functions for enabling/disabling traces.
 It uses environment variables
-\fBCURSES_TRACE_MASK\fP and
-\fBCURSES_TRACE_FILE\fP to determine what is traced,
+\fI\%CURSES_TRACE_MASK\fP and
+\fI\%CURSES_TRACE_FILE\fP to determine what is traced,
 and where the results are written.
 This is available only when a debug-library is built.
 .IP
 The NetBSD tracing feature is undocumented.
 .PP
-A few ncurses functions are not provided when symbol versioning is used:
+A few \fI\%ncurses\fP functions are not provided when symbol versioning
+is used:
 .RS 4
 .PP
 _nc_tracebits,
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 6878b43e7..d38078dc0 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.90 2023/12/02 21:10:36 tom Exp $
-.TH curs_util 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.91 2023/12/16 20:32:22 tom Exp $
+.TH curs_util 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,10 +167,11 @@ The \fBuse_env\fP routine, if used,
 should be called before \fBinitscr\fP or
 \fBnewterm\fP are called
 (because those compute the screen size).
-It modifies the way \fIncurses\fP treats environment variables
+It modifies the way \fI\%ncurses\fP treats environment variables
 when determining the screen size.
 .bP
-Normally \fIncurses\fP looks first at the terminal database for the screen size.
+Normally \fI\%ncurses\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
@@ -181,12 +182,13 @@ If successful,
 it overrides the values from the terminal database.
 .bP
 Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
-\fBncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
+\fI\%ncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 using a value in those to override the results
 from the operating system or terminal database.
 .IP
-\fBNcurses\fP also updates the screen size in response to \fBSIGWINCH\fP,
+\fI\%curses\fP also updates the screen size in response to
+\fBSIGWINCH\fP,
 unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 .SS use_tioctl
@@ -194,18 +196,18 @@ The \fBuse_tioctl\fP routine, if used,
 should be called before \fBinitscr\fP or \fBnewterm\fP are called
 (because those compute the screen size).
 After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
-\fBncurses\fP modifies the last step in its computation
+\fI\%ncurses\fP modifies the last step in its computation
 of screen size as follows:
 .bP
 checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 are set to a number greater than zero.
 .bP
-for each, \fBncurses\fP updates the corresponding environment variable
+for each, \fI\%ncurses\fP updates the corresponding environment variable
 with the value that it has obtained via operating system call
 or from the terminal database.
 .bP
-\fBncurses\fP re-fetches the value of the environment variables so that
-it is still the environment variables which set the screen size.
+\fI\%ncurses\fP re-fetches the value of the environment variables so
+that it is still the environment variables which set the screen size.
 .PP
 The \fB\%use_env\fP and \fB\%use_tioctl\fP routines combine as follows.
 .IP
@@ -216,17 +218,17 @@ use_env	use_tioctl	Summary
 _
 TRUE	FALSE	T{
 This is the default behavior.
-\fIncurses\fP uses operating system calls
+\fI\%ncurses\fP uses operating system calls
 unless overridden by \fILINES\fP or \fI\%COLUMNS\fP environment
 variables;
 default.
 T}
 TRUE	TRUE	T{
-\fIncurses\fP updates \fILINES\fP and \fI\%COLUMNS\fP based on operating
-system calls.
+\fI\%ncurses\fP updates \fILINES\fP and \fI\%COLUMNS\fP based on
+operating system calls.
 T}
 FALSE	TRUE	T{
-\fIncurses\fP ignores \fILINES\fP and \fI\%COLUMNS\fP,
+\fI\%ncurses\fP ignores \fILINES\fP and \fI\%COLUMNS\fP,
 using operating system calls to obtain size.
 T}
 .TE
@@ -246,8 +248,8 @@ There are a few caveats:
 .bP
 the data written is a copy of the \fBWINDOW\fP structure,
 and its associated character cells.
-The format differs between the wide-character (\fBncursesw\fP) and
-non-wide (\fBncurses\fP) libraries.
+The format differs between the wide-character (\fI\%ncursesw\fP) and
+non-wide (\fI\%ncurses\fP) libraries.
 You can transfer data between the two, however.
 .bP
 the retrieved window is always created as a top-level window (or pad),
@@ -262,7 +264,7 @@ they will not be colored when the window is refreshed.
 The \fBdelay_output\fP routine inserts an \fIms\fP millisecond pause
 in output.
 Employ this function judiciously when terminal output uses padding,
-because \fIncurses\fP transmits null characters
+because \fI\%ncurses\fP transmits null characters
 (consuming CPU and I/O resources)
 instead of sleeping and requesting resumption from the operating system.
 Padding is used unless:
@@ -272,7 +274,7 @@ the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability, or
 the environment variable \fB\%NCURSES_NO_PADDING\fP is set.
 .PP
 If padding is not in use,
-\fIncurses\fP uses \fBnapms\fP to perform the delay.
+\fI\%ncurses\fP uses \fBnapms\fP to perform the delay.
 If the value of \fIms\fP exceeds 30,000
 (thirty seconds),
 it is capped at that value.
@@ -325,9 +327,10 @@ merged from all terminal descriptions which have been loaded.
 The \fBuse_extended_names\fP(3X) function controls whether this data is
 loaded when the terminal description is read by the library.
 .SS nofilter/use_tioctl
-The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to \fBncurses\fP.
+The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to
+\fI\%ncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fBncurses\fP extensions
+It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fBNCURSES_VERSION\fP.
 .SS putwin/getwin file-format
 The \fBputwin\fP and \fBgetwin\fP functions have several issues with
@@ -346,7 +349,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 \fBncurses\fP versions.
+as well as older \fI\%ncurses\fP versions.
 This implementation
 (as well as the X/Open variant of Solaris curses, dated 1995)
 uses textual dumps.
@@ -409,12 +412,12 @@ When treating them as \*(``meta\*('' keys
 this implementation returns strings \*(``M\-^@\*('', \*(``M\-^A\*('', etc.
 .PP
 X/Open Curses documents \fBunctrl\fP as declared in \fB<unctrl.h>\fP,
-which \fBncurses\fP does.
-However, \fBncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
+which \fI\%ncurses\fP does.
+However, \fI\%ncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
 matching the behavior of SVr4 curses.
 Other implementations may not do that.
 .SS use_env/use_tioctl
-If \fBncurses\fP is configured to provide the sp-functions extension,
+If \fI\%ncurses\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\fP(3X)).
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 913ad6b8c..e5265ab1e 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.34 2023/11/25 14:32:36 tom Exp $
-.TH curs_variables 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.35 2023/12/16 21:05:52 tom Exp $
+.TH curs_variables 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,12 +90,13 @@
 \fBint COLOR_PAIRS;
 \fBint COLORS;
 \fBint COLS;
-\fBint ESCDELAY;
 \fBint LINES;
-\fBint TABSIZE;
 \fBWINDOW * curscr;
-\fBWINDOW * newscr;
 \fBWINDOW * stdscr;
+\fI/* extensions */
+\fBint ESCDELAY;
+\fBint TABSIZE;
+\fBWINDOW * newscr;
 .fi
 .SH DESCRIPTION
 This page summarizes data types,
@@ -103,14 +104,14 @@ constants,
 and variables provided by the \fIcurses\fP library.
 Locate further discussion in \fB\%curses\fP(3X).
 .PP
-Depending on \fIncurses\fP's build-time configuration,
+Depending on \fI\%ncurses\fP's build-time configuration,
 the variables may instead be
 macros (see \fB\%curs_threads\fP(3X) and \fB\%curs_opaque\fP(3X))
 that provide read-only access to the library's state.
 In either case,
 applications should treat them as read-only to avoid
 confusing the library.
-.SS bool, TRUE, FALSE
+.SS \fIbool\fP, TRUE, FALSE
 X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
 standards,
 each of which also defined a Boolean data type.
@@ -120,7 +121,7 @@ constants \fBTRUE\fP and \fBFALSE\fP to store its two possible values.
 \fIcurses\fP and \fIterminfo\fP routines frequently return these
 constant integral values indicating failure and success,
 respectively.
-.SS chtype
+.SS \fIchtype\fP
 The \fI\%chtype\fP integral type combines a
 (\*(``narrow\*('',
 8-bit)
@@ -133,7 +134,7 @@ for example,
 \fB\%attron\fP(3X),
 and
 \fB\%inch\fP(3X).
-.SS cchar_t, attr_t
+.SS \fIcchar_t\fP, \fIattr_t\fP
 \fI\%chtype\fP is too small for the standard C library's wide-character
 type,
 \fIwchar_t\fP.
@@ -201,7 +202,7 @@ This object is referred to as the \*(``physical screen\*('' in
 \fB\%curs_refresh\fP(3X) and
 \fB\%curs_outopts\fP(3X).
 .SS newscr
-\fIncurses\fP collects pending updates to the terminal screen in a
+\fI\%ncurses\fP collects pending updates to the terminal screen in a
 \fI\%WINDOW\fP structure named \fB\%newscr\fP.
 .PP
 This object is referred to as the \*(``virtual screen\*('' in the
@@ -222,7 +223,7 @@ Many \fIcurses\fP functions use this window.
 Either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) initializes
 \fIcurses\fP.
 .PP
-If \fIncurses\fP is configured to provide separate \fIcurses\fP and
+If \fI\%ncurses\fP is configured to provide separate \fIcurses\fP and
 \fIterminfo\fP libraries,
 most of these variables reside in the \fIcurses\fP library.
 .SH PORTABILITY
@@ -258,7 +259,7 @@ position of tab stops when updating both
 the virtual screen with \fB\%addch\fP(3X) and
 the physical screen with \fB\%mvcur\fP(3X).
 .bP
-\fIncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
+\fI\%ncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
 virtual screen.
 It uses the terminal description's \*(``\fBit\fP\*(''
 (\fB\%init_tabs\fP) capability for computing hardware tabs
@@ -269,7 +270,7 @@ Other implementations differ.
 For instance,
 NetBSD \fIcurses\fP allows \fB\%TABSIZE\fP to be set through an
 environment variable.
-\fIncurses\fP does not.
+\fI\%ncurses\fP does not.
 .IP
 NetBSD \fIcurses\fP does not support hardware tabs;
 it uses the \fB\%init_tabs\fP capability and the \fB\%TABSIZE\fP
@@ -283,9 +284,10 @@ the units for \fB\%ESCDELAY\fP are \fIfifths\fP of milliseconds.
 The default value for AIX's \fB\%ESCDELAY\fP equals 0.1 seconds.
 .bP
 AIX also enforces a limit of 10,000 seconds for \fB\%ESCDELAY\fP;
-\fIncurses\fP does not enforce any upper limit.
+\fI\%ncurses\fP does not enforce any upper limit.
 .PP
-\fIncurses\fP has long used \fB\%ESCDELAY\fP with units of milliseconds,
+\fI\%ncurses\fP has long used \fB\%ESCDELAY\fP with units of
+milliseconds,
 making it impossible to be completely compatible with AIX.
 Consequently,
 most users have decided either to override the value,
diff --git a/man/curs_window.3x b/man/curs_window.3x
index a4cc25242..e1f842078 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.43 2023/11/25 14:17:29 tom Exp $
-.TH curs_window 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
+.TH curs_window 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -235,10 +235,11 @@ It simply returned \fBERR\fP when asked to delete a subwindow.
 Solaris X/Open curses does not even make that check,
 and will delete a parent window which still has subwindows.
 .bP
-Since release 4.0 (1996), ncurses maintains a list of windows for each screen,
+Since release 4.0 (1996),
+\fI\%ncurses\fP maintains a list of windows for each screen,
 to ensure that a window has no subwindows before allowing deletion.
 .bP
-NetBSD copied this feature of ncurses in 2003.
+NetBSD copied this feature of \fI\%ncurses\fP in 2003.
 .br
 PDCurses follows the scheme used in Solaris X/Open curses.
 .SH BUGS
diff --git a/man/default_colors.3x b/man/default_colors.3x
index b33f8f09e..8e35221fa 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.47 2023/11/25 14:26:30 tom Exp $
-.TH default_colors 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.48 2023/12/16 20:32:22 tom Exp $
+.TH default_colors 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -93,9 +93,9 @@ The following are equivalent:
 .I assume_default_colors(\-1,\-1);
 .RE
 .PP
-These are ncurses extensions.
+These are \fI\%ncurses\fP extensions.
 For other curses implementations, color
-number \-1 does not mean anything, just as for ncurses before a
+number \-1 does not mean anything, just as for \fI\%ncurses\fP before a
 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.
@@ -106,7 +106,7 @@ If your application does not use either
 .B use_default_colors
 or
 .B assume_default_colors
-ncurses will paint a white foreground (text) with black background
+\fI\%ncurses\fP 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
@@ -140,7 +140,7 @@ 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.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/define_key.3x b/man/define_key.3x
index 48e7b61a4..2bbecbdc9 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.39 2023/11/25 14:26:30 tom Exp $
-.TH define_key 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.40 2023/12/16 20:32:22 tom Exp $
+.TH define_key 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
@@ -43,7 +43,8 @@ define a \fIcurses\fR keycode
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to define keycodes with their corresponding control
-strings, so that the \fIncurses\fP library will interpret them just as it would
+strings,
+so that the \fI\%ncurses\fP library will interpret them just as it would
 the predefined codes in the terminfo database.
 .PP
 If \fIdefinition\fP is \fBNULL\fP,
@@ -58,7 +59,7 @@ otherwise \fBERR\fP is returned.
 data to store the definition.
 If no error is detected, \fBOK\fP is returned.
 .SH PORTABILITY
-These routines are specific to \fIncurses\fP.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/form.3x b/man/form.3x
index 0ce6bbb4e..511952933 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.50 2023/11/25 13:59:44 tom Exp $
-.TH form 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.51 2023/12/16 20:32:22 tom Exp $
+.TH form 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,7 +89,7 @@ rendering of fields already created.
 The following table lists each \fBform\fP routine and the name of
 the manual page on which it is described.
 Routines flagged with \*(``*\*(''
-are ncurses-specific, not present in SVr4.
+are \fI\%ncurses\fP-specific, not present in SVr4.
 .PP
 .TS
 l l
@@ -226,19 +226,20 @@ A form facility was documented in SVr4.2's
 .PP
 It is not part of X/Open Curses.
 .PP
-Aside from ncurses, there are few implementations:
+Aside from \fI\%ncurses\fP, there are few implementations:
 .bP
 systems based on SVr4 source code, e.g., Solaris.
 .bP
 NetBSD curses.
 .PP
-A few functions in this implementation are extensions added for ncurses,
+A few functions in this implementation are extensions added for
+\fI\%ncurses\fP,
 but not provided by other implementations, e.g.,
 \fBform_driver_w\fP,
 \fBunfocus_current_field\fP.
 .SH AUTHORS
 Juergen Pfeifer.
-Manual pages and adaptation for ncurses by Eric
+Manual pages and adaptation for \fI\%ncurses\fP by Eric
 S. Raymond.
 .SH SEE ALSO
 \fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index fde890e3e..ec883b6d3 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.42 2023/11/25 13:58:47 tom Exp $
-.TH form_field_buffer 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.43 2023/12/16 20:32:22 tom Exp $
+.TH form_field_buffer 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -136,7 +136,7 @@ These routines emulate the System V forms library.
 They were not supported on
 Version 7 or BSD versions.
 .PP
-The \fBset_max_field\fP function checks for an ncurses extension
+The \fBset_max_field\fP function checks for an \fI\%ncurses\fP extension
 \fBO_INPUT_FIELD\fP which allows a dynamic field to shrink if the new
 limit is smaller than the current field size.
 .SH AUTHORS
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index c037d59ef..0a4f2e99e 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.50 2023/11/25 13:58:47 tom Exp $
-.TH form_field_validation 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.51 2023/12/16 20:32:22 tom Exp $
+.TH form_field_validation 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -184,7 +184,7 @@ where \fIa\fP, \fIb\fP, \fIc\fP, and \fId\fP are numbers in the range 0 to 255.
 Trailing blanks in the buffer are ignored.
 The address itself is not validated.
 .PP
-This is an ncurses extension;
+This is an \fI\%ncurses\fP extension;
 this field type may not be available in other curses implementations.
 .SH RETURN VALUE
 The functions \fBfield_type\fP and \fBfield_arg\fP return \fBNULL\fP on error.
diff --git a/man/form_page.3x b/man/form_page.3x
index a4e94f37d..9d1f2d86a 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH form_page 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
+.TH form_page 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
@@ -88,7 +88,8 @@ 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.
+The \fBunfocus_current_field\fP function is an \fI\%ncurses\fP
+extension.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 68cfb8abd..e1d6e4803 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH form_requestname 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.33 2023/12/16 20:32:22 tom Exp $
+.TH form_requestname 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
@@ -53,7 +53,7 @@ to \fBE_BAD_ARGUMENT\fP.
 \fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 291fe2163..ffe2df3bc 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.101 2023/12/02 20:49:04 tom Exp $
-.TH @INFOCMP@ 1M 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.102 2023/12/16 20:32:22 tom Exp $
+.TH @INFOCMP@ 1M 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -270,7 +270,7 @@ superfluous.
 \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
 were not needed.
 .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
-Like other \fBncurses\fP utilities,
+Like other \fI\%ncurses\fP utilities,
 \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
 You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
 variables to override the compiled-in default list of places to search.
@@ -321,9 +321,10 @@ for a given terminal type.
 The tables are all declared static, and are named according to the type
 and the name of the corresponding terminal entry.
 .sp
-Before ncurses 5.0, the split between the \fB\-e\fP and \fB\-E\fP
-options was not needed; but support for extended names required making
-the arrays of terminal capabilities separate from the TERMTYPE structure.
+Before \fI\%ncurses\fP 5.0,
+the split between the \fB\-e\fP and \fB\-E\fP options was not needed;
+but support for extended names required making the arrays of terminal
+capabilities separate from the TERMTYPE structure.
 .TP 5
 \fB\-e\fP
 Dump the capabilities of the given terminal as a C initializer for a
@@ -551,14 +552,16 @@ since it excludes the inferences that \fB@INFOCMP@\fP makes to fill in missing
 data.
 .TP 5
 \fB\-V\fP
-reports the version of ncurses which was used in this program, and exits.
+reports the version of \fI\%ncurses\fP which was used in this program,
+and exits.
 .TP 5
 \fB\-v\fP \fIn\fP
 prints out tracing information on standard error as the program runs.
 .IP
 The optional parameter \fIn\fP 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 \fI\%ncurses\fP is built without tracing support,
+the optional parameter is ignored.
 .TP
 \fB\-W\fP
 By itself, the \fB\-w\fP option will not force long strings to be wrapped.
@@ -618,7 +621,7 @@ 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.
+\fB@INFOCMP@\fP for \fI\%ncurses\fP.
 In addition, he added a few new features such as:
 .bP
 the \fB\-e\fP option, to support \fIfallback\fP
@@ -633,9 +636,9 @@ user-defined capabilities.
 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
+It is less capable than the SVr4 or \fI\%ncurses\fP versions
 (e.g., it lacks the sorting options documented in X/Open),
-but does include the \fB\-x\fP option adapted from ncurses.
+but does include the \fB\-x\fP option adapted from \fI\%ncurses\fP.
 .SH BUGS
 The \fB\-F\fP option of \fB\%@INFOCMP@\fP(1M) should be a
 \fB\%@TOE@\fP(1M) mode.
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 597fbb1be..c3c98b396 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.37 2023/11/25 14:32:36 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.39 2023/12/10 14:12:43 tom Exp $
+.TH @INFOTOCAP@ 1M 2023-12-10 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -43,8 +43,7 @@
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@INFOTOCAP@\fP \-
-convert a \fI\%terminfo\fR description into a \fI\%termcap\fR
-description
+convert a \fI\%terminfo\fR description into a \fI\%termcap\fR description
 .SH SYNOPSIS
 .B @INFOTOCAP@
 .RI [ tic-option ]
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 311315418..26bf53750 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.31 2023/11/25 14:26:30 tom Exp $
-.TH key_defined 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.32 2023/12/16 20:32:22 tom Exp $
+.TH key_defined 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
@@ -50,7 +50,7 @@ If no keycode is bound, zero is returned.
 If the string conflicts with longer strings
 which are bound to keys, \-1 is returned.
 .SH PORTABILITY
-This routine is specific to \fIncurses\fP.
+This routine is specific to \fI\%ncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/keybound.3x b/man/keybound.3x
index f72cd664d..ca646d1ab 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.33 2023/11/25 14:26:30 tom Exp $
-.TH keybound 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.34 2023/12/16 20:32:22 tom Exp $
+.TH keybound 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
@@ -53,7 +53,7 @@ through multiple definitions, counting from zero.
 When successful,
 the function returns a string which must be freed by the caller.
 .SH PORTABILITY
-This routine is specific to \fIncurses\fP.
+This routine is specific to \fI\%ncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/keyok.3x b/man/keyok.3x
index b2e402d1f..0fe907475 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.37 2023/11/25 14:26:30 tom Exp $
-.TH keyok 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.38 2023/12/16 20:32:22 tom Exp $
+.TH keyok 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
@@ -52,7 +52,7 @@ If the \fIenable\fP parameter is true, then the key must have been disabled,
 and vice versa.
 Otherwise, the function returns \fBOK\fP.
 .SH PORTABILITY
-This routine is specific to \fIncurses\fP.
+This routine is specific to \fI\%ncurses\fP.
 It was not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index fad145c04..e057fa5ff 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.23 2023/11/25 14:26:30 tom Exp $
-.TH legacy_coding 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.24 2023/12/16 20:32:22 tom Exp $
+.TH legacy_coding 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -68,9 +68,9 @@ or the \fIlevel\fP parameter is out of range,
 the function returns \fBERR\fP.
 Otherwise, it returns the previous level: \fB0\fP, \fB1\fP or \fB2\fP.
 .SH PORTABILITY
-This routine is specific to ncurses.
+This routine is specific to \fI\%ncurses\fP.
 It was 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 \fI\%ncurses\fP extensions
 be conditioned using NCURSES_VERSION.
 .SH AUTHORS
 Thomas Dickey (to support lynx's font-switching feature).
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 1616ae18a..433ed5e40 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.61 2023/11/25 14:32:36 tom Exp $
+# $Id: man_db.renames.in,v 1.63 2023/12/17 23:52:59 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -170,6 +170,88 @@ tset.1				tset.1
 user_caps.5			user_caps.5
 wresize.3x			wresize.3ncurses
 #
+# Supplementary topics in the foregoing pages:
+add_wch.3x			add_wch.3ncurses
+addch.3x			addch.3ncurses
+assume_default_colors.3x	assume_default_colors.3ncurses
+attr_on.3x			attr_on.3ncurses
+attron.3x			attron.3ncurses
+baudrate.3x			baudrate.3ncurses
+bkgd.3x				bkgd.3ncurses
+bkgrnd.3x			bkgrnd.3ncurses
+clearok.3x			clearok.3ncurses
+curs_set.3x			curs_set.3ncurses
+curscr.3x			curscr.3ncurses
+def_prog_mode.3x		def_prog_mode.3ncurses
+def_shell_mode.3x		def_shell_mode.3ncurses
+del_curterm.3x			del_curterm.3ncurses
+delay_output.3x			delay_output.3ncurses
+delscreen.3x			delscreen.3ncurses
+derwin.3x			derwin.3ncurses
+doupdate.3x			doupdate.3ncurses
+endwin.3x			endwin.3ncurses
+filter.3x			filter.3ncurses
+flushinp.3x			flushinp.3ncurses
+get_wch.3x			get_wch.3ncurses
+getcchar.3x			getcchar.3ncurses
+getch.3x			getch.3ncurses
+idcok.3x			idcok.3ncurses
+idlok.3x			idlok.3ncurses
+immedok.3x			immedok.3ncurses
+in_wch.3x			in_wch.3ncurses
+inch.3x				inch.3ncurses
+initscr.3x			initscr.3ncurses
+keypad.3x			keypad.3ncurses
+leaveok.3x			leaveok.3ncurses
+longname.3x			longname.3ncurses
+meta.3x				meta.3ncurses
+move.3x				move.3ncurses
+mvcur.3x			mvcur.3ncurses
+mvwin.3x			mvwin.3nwinses
+newpad.3x			newpad.3ncurses
+newterm.3x			newterm.3ncurses
+newwin.3x			newwin.3ncurses
+nodelay.3x			nodelay.3ncurses
+notimeout.3x			notimeout.3ncurses
+refresh.3x			refresh.3ncurses
+reset_shell_mode.3x		reset_shell_mode.3ncurses
+restartterm.3x			restartterm.3ncurses
+scrollok.3x			scrollok.3ncurses
+set_curterm.3x			set_curterm.3ncurses
+set_term.3x			set_term.3nses
+setcchar.3x			setcchar.3ncurses
+setupterm.3x			setupterm.3ncurses
+slk_init.3x			slk_init.3ncurses
+slk_touch.3x			slk_touch.3ncurses
+start_color.3x			start_color.3ncurses
+subwin.3x			subwin.3ncurses
+syncok.3x			syncok.3ncurses
+terminfo.3x			terminfo.3ncurses
+tigetstr.3x			tigetstr.3ncurses
+tparm.3x			tparm.3ncurses
+tputs.3x			tputs.3ncurses
+unctrl.3x			unctrl.3ncurses
+use_default_colors.3x		use_default_colors.3ncurses
+use_env.3x			use_env.3ncurses
+use_extended_names.3x		use_extended_names.3ncurses
+use_legacy_coding.3x		use_legacy_coding.3ncurses
+vidputs.3x			vidputs.3ncurses
+wadd_wch.3x			wadd_wch.3ncurses
+waddch.3x			waddch.3ncurses
+waddstr.3x			waddstr.3ncurses
+waddwstr.3x			waddwstr.3ncurses
+wbkgdset.3x			wbkgdset.3ncurses
+wget_wch.3x			wget_wch.3ncurses
+wgetch.3x			wgetch.3ncurses
+wgetstr.3x			wgetstr.3ncurses
+wins_wch.3x			wins_wch.3ncurses
+winsch.3x			winsch.3ncurses
+wmove.3x			wmove.3ncurses
+wnoutrefresh.3x			wnoutrefresh.3ncurses
+wrefresh.3x			wrefresh.3ncurses
+wsetscrreg.3x			wsetscrreg.3ncurses
+wtimeout.3x			wtimeout.3ncurses
+#
 # Other:
 getty.1				getty.8
 scanf.3				scanf.3
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 5bb9963df..94732df5f 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.28 2023/11/19 00:14:00 tom Exp $
+# $Id: manhtml.aliases,v 1.29 2023/12/18 00:27:56 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -34,15 +34,20 @@ assume_default_colors(3X)	default_colors(3X)
 attr_on(3X)		curs_attr(3X)
 attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
+bkgd(3X)		curs_bkgd(3X)
+bkgrnd(3X)		curs_bkgrnd(3X)
 clearok(3X)		curs_outopts(3X)
 curs_set(3X)		curs_kernel(3X)
+curscr(3X)		curs_variables(3X)
 def_prog_mode(3X)	curs_kernel(3X)
 def_shell_mode(3X)	curs_kernel(3X)
+del_curterm(3X)		curs_terminfo(3X)
 delay_output(3X)	curs_util(3X)
 delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 endwin(3X)		curs_initscr(3X)
 filter(3X)		curs_util(3X)
+flushinp(3X)		curs_util(3X)
 get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
@@ -55,6 +60,7 @@ is_scrollok(3X)		curs_opaque(3X)
 keypad(3X)		curs_inopts(3X)
 longname(3X)		curs_termattrs(3X)
 meta(3X)		curs_inopts(3X)
+move(3X)		curs_move(3X)
 mvcur(3X)		curs_terminfo(3X)
 mvwin(3X)		curs_window(3X)
 newterm(3X)		curs_initscr(3X)
@@ -68,6 +74,8 @@ setcchar(3X)		curs_getcchar(3X)
 setupterm(3X)		curs_terminfo(3X)
 slk_init(3X)		curs_slk(3X)
 slk_touch(3X)		curs_slk(3X)
+start_color(3X)		curs_color(3X)
+terminfo(3X)		curs_terminfo(3X)
 tic(1)			tic(1M)
 tigetstr(3X)		curs_terminfo(3X)
 tparm(3X)		curs_terminfo(3X)
@@ -79,9 +87,12 @@ use_legacy_coding(3X)	legacy_coding(3X)
 vidputs(3X)		curs_terminfo(3X)
 wadd_wch(3X)		curs_add_wch(3X)
 waddch(3X)		curs_addch(3X)
+waddstr(3X)		curs_addstr(3X)
+waddwstr(3X)		curs_addwstr(3X)
 wbkgdset(3X)		curs_bkgd(3X)
 wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
+wgetstr(3X)		curs_getstr(3X)
 wins_wch(3X)		curs_ins_wch(3X)
 winsch(3X)		curs_insch(3X)
 wmove(3X)		curs_move(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 5874b27a5..d800272ae 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,7 +1,7 @@
-# $Id: manhtml.externs,v 1.15 2021/12/26 00:02:52 tom Exp $
+# $Id: manhtml.externs,v 1.18 2023/12/18 00:35:38 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
-# Copyright 2019-2020,2021 Thomas E. Dickey                                *
+# Copyright 2019-2021,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,10 +28,8 @@
 # sale, use or other dealings in this Software without prior written       *
 # authorization.                                                           *
 #***************************************************************************
-ADACURSES(1)
 COLOR_PAIR(1)
 COLOR_PAIR(2)
-COLOR_PAIR(3)
 atoi(3)
 conflict(1)
 cron(1)
@@ -59,10 +57,13 @@ scanf(3)
 screen(1)
 setlocale(3)
 sh(1)
+scanf(3)
+scanf(3S)
 sscanf(3)
 stdio(3)
 stty(1)
 system(3)
+swprintf(3)
 termios(3)
 tmux(1)
 tty(4)
@@ -70,6 +71,7 @@ ttys(5)
 vi(1)
 vprintf(3)
 vscanf(3)
+vsscanf(3)
 wcwidth(3)
 write(2)
 xterm(1)
diff --git a/man/menu.3x b/man/menu.3x
index 601ec050c..247ebcfbe 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.41 2023/11/25 13:59:44 tom Exp $
-.TH menu 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.42 2023/12/16 20:32:22 tom Exp $
+.TH menu 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -202,14 +202,14 @@ A menu facility was documented in SVr4.2's
 .PP
 It is not part of X/Open Curses.
 .PP
-Aside from ncurses, there are few implementations:
+Aside from \fI\%ncurses\fP, there are few implementations:
 .bP
 systems based on SVr4 source code, e.g., Solaris.
 .bP
 NetBSD curses.
 .SH AUTHORS
 Juergen Pfeifer.
-Manual pages and adaptation for ncurses by Eric S. Raymond.
+Manual pages and adaptation for \fI\%ncurses\fP by Eric S. Raymond.
 .SH SEE ALSO
 \fB\%curses\fP(3X) and related pages whose names begin \*(``menu_\*(''
 for detailed descriptions of the entry points.
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 19ab95e53..f3a8f02fb 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.43 2023/11/25 13:58:47 tom Exp $
-.TH menu_driver 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
+.TH menu_driver 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -195,7 +195,7 @@ The menu driver could not process the request.
 These routines emulate the System V menu library.
 They were not supported on
 Version 7 or BSD versions.
-The support for mouse events is ncurses specific.
+The support for mouse events is \fI\%ncurses\fP specific.
 .SH AUTHORS
 Juergen Pfeifer.
 Manual pages and adaptation for new curses by Eric S. Raymond.
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 897fd7354..56105ea17 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH menu_requestname 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.31 2023/12/16 20:32:22 tom Exp $
+.TH menu_requestname 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
@@ -54,7 +54,7 @@ and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
 \fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
 It does not set \fBerrno\fP.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 06a9b03ba..94eab4245 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH menu_spacing 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
+.TH menu_spacing 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
@@ -80,7 +80,7 @@ Both routines return \fBE_OK\fP on success.
 \fBE_POSTED\fP if the menu is posted, or \fBE_BAD_ARGUMENT\fP if one of the
 spacing values is out of range.
 .SH PORTABILITY
-These routines are specific to ncurses.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/ncurses.3x b/man/ncurses.3x
index c8a58fac8..53b83ab26 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.185 2023/12/03 00:14:35 tom Exp $
-.TH ncurses 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.187 2023/12/17 23:44:14 tom Exp $
+.TH ncurses 3X 2023-12-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,6 +40,7 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -54,19 +55,20 @@ character-cell terminal interface with optimized output
 \fB#include <curses.h>
 .fi
 .SH DESCRIPTION
-The \fBncurses\fP library routines give the user a terminal-independent method
-of updating character screens with reasonable optimization.
-This implementation is \*(``new curses\*('' (ncurses) and
+The \fI\%ncurses\fP library routines give the user a
+terminal-independent method of updating character screens with
+reasonable optimization.
+This implementation is \*(``new curses\*('' (\fI\%ncurses\fP) and
 is the approved replacement for
 4.4BSD classic curses, which has been discontinued.
-This describes \fBncurses\fP
+This describes \fI\%ncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .PP
-The \fBncurses\fP library emulates the curses library of
+The \fI\%ncurses\fP library emulates the curses library of
 System V Release 4 Unix (\*(``SVr4\*(''),
 and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
 XSI stands for X/Open System Interfaces Extension.
-The \fBncurses\fP library is freely redistributable in source form.
+The \fI\%ncurses\fP library is freely redistributable in source form.
 .PP
 \fI\%ncurses\fP man pages employ several sections to clarify matters of
 usage and interoperability with other \fIcurses\fP implementations.
@@ -106,7 +108,7 @@ The ncurses_g library generates trace logs
 that describe curses actions.
 See also the section on \fBALTERNATE CONFIGURATIONS\fP.
 .PP
-The \fBncurses\fP package supports: overall screen, window and pad
+The \fI\%ncurses\fP package supports: overall screen, window and pad
 manipulation; output to windows and pads; reading terminal input; control over
 terminal and \fBcurses\fP input and output options; environment query
 routines; color manipulation; use of soft label keys; terminfo capabilities;
@@ -158,209 +160,325 @@ This can be done by executing the \fB@TPUT@ init\fP command
 after the shell environment variable \fITERM\fP has been exported.
 (The BSD-style \fB\%@TSET@\fP(1) utility also performs this function.)
 See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(5).
-.SS Datatypes
-The \fBncurses\fP library permits manipulation of data structures,
-called \fIwindows\fP, which can be thought of as two-dimensional
-arrays of characters representing all or part of a CRT screen.
-A default window called \fBstdscr\fP, which is the size of the terminal
-screen, is supplied.
-Others may be created with \fBnewwin\fP.
-.PP
-Note that \fBcurses\fP does not handle overlapping windows, that's done by
-the \fBpanel\fP(3X) library.
-This means that you can either use
-\fBstdscr\fP or divide the screen into tiled windows and not using
-\fBstdscr\fP at all.
-Mixing the two will result in unpredictable, and undesired, effects.
-.PP
-Windows are referred to by variables declared as \fBWINDOW *\fP.
-These data structures are manipulated with routines described here and
-elsewhere in the \fBncurses\fP manual pages.
-Among those, the most basic
-routines are \fBmove\fP and \fBaddch\fP.
-More general versions of
-these routines are included with names beginning with \fBw\fP,
-allowing the user to specify a window.
-The routines not beginning
-with \fBw\fP affect \fBstdscr\fP.
-.PP
-After using routines to manipulate a window, \fBrefresh\fP(3X) is called,
-telling \fBcurses\fP to make the user's CRT screen look like
-\fBstdscr\fP.
-The characters in a window are actually of type
-\fBchtype\fP, (character and attribute data) so that other information
-about the character may also be stored with each character.
+.SS Overview
+A
+.I curses
+library abstracts the terminal screen by representing all or part of it
+as a
+.I \%WINDOW
+data structure.
+A
+.I window
+is a rectangular grid of character cells,
+addressed by row and column coordinates
+.RI ( y ,
+.IR x ),
+with the upper left corner as (0, 0).
+A window called \fB\%stdscr\fP,
+the same size as the terminal screen,
+is always available.
+Create others with \fB\%newwin\fP(3X).
+.PP
+A
+.I curses
+library does not manage overlapping windows.
+(See \fBpanel\fP(3X) if you desire this.)
+You can either use \fB\%stdscr\fP to manage one screen-filling window,
+or tile the screen into non-overlapping windows and not use
+\fB\%stdscr\fP at all.
+Mixing the two approaches will result in unpredictable,
+and undesired,
+effects.
+.PP
+Functions permit manipulation of a window and the
+.I cursor
+identifying the cell within it at which the next output operation will
+occur.
+Among those,
+the most basic are \fBmove\fP(3X) and \fB\%addch\fP(3X):
+these place the cursor and write a character to
+.BR \%stdscr ,
+respectively.
+As a rule,
+window-addressing functions feature names prefixed
+(or infixed,
+see below)
+with \*(``w\*('';
+these allow the user to specify a pointer to a
+.I \%WINDOW.
+Counterparts not thus prefixed
+(or infixed)
+affect \fB\%stdscr\fP.
+Because moving the cursor prior to another operation is so common,
+.I curses
+generally also provides functions with a \*(``mv\*('' prefix as a
+convenience.
+Thus,
+the library defines all of
+\fB\%addch\fP,
+\fB\%waddch\fP,
+\fB\%mvaddch\fP,
+and
+\fB\%mvwaddch\fP.
+When both prefixes are present,
+the order of arguments is a
+.I \%WINDOW
+pointer first,
+then a
+.I y
+and
+.I x
+coordinate pair.
+.PP
+Updating the terminal screen with every
+.I curses
+call can cause unpleasant flicker or inefficient use of the
+communications channel to the device.
+Therefore,
+after using
+.I curses
+functions to accumulate a set of desired updates that make sense to
+present together,
+call \fB\%refresh\fP(3X) to tell the library to make the user's screen
+look like \fBstdscr\fP.
+.I \%ncurses
+.\" X/Open Curses Issue 7 assumes some optimization will be done, but
+.\" does not mandate it in any way.
+.I optimizes
+its output by computing a minimal number of operations to mutate the
+screen from its state at the previous refresh to the new one.
+Effective optimization demands accurate information about the terminal
+device:
+the management of such information is the province of the
+\fB\%terminfo\fP(3X) API,
+a feature of every standard
+.I curses
+implementation.
 .PP
 Special windows called \fIpads\fP may also be manipulated.
-These are windows
-which are not constrained to the size of the screen and whose contents need not
-be completely displayed.
-See \fBcurs_pad\fP(3X) for more information.
-.PP
-In addition to drawing characters on the screen, video attributes and colors
-may be supported, causing the characters to show up in such modes as
-underlined, in reverse video, or in color on terminals that support such
-display enhancements.
-Line drawing characters may be specified to be output.
-On input, \fBcurses\fP is also able to translate arrow and function keys that
-transmit escape sequences into single values.
-The video attributes, line
-drawing characters, and input values use names, defined in \fB<curses.h>\fP,
-such as \fBA_REVERSE\fP, \fBACS_HLINE\fP, and \fBKEY_LEFT\fP.
-.SS Environment variables
+These are windows that are not constrained to the size of the terminal
+screen and whose contents need not be completely displayed.
+See \fB\%curs_pad\fP(3X).
+.PP
+In addition to drawing characters on the screen,
+rendering attributes and colors may be supported,
+causing the characters to show up in such modes as underlined,
+in reverse video,
+or in color on terminals that support such display enhancements.
+See \fB\%curs_attr\fP(3X).
+.PP
+.I curses
+predefines symbols for a small set of line graphics characters,
+corresponding to the VT100 line drawing set.
+See
+\fB\%waddch\fP(3X) and
+\fB\%wadd_wch\fP(3X).
+.PP
+.I curses
+is implemented using the operating system's terminal driver;
+keystroke events are not received as scan codes but as byte sequences.
+Graphical keycaps
+(alphanumeric and punctuation keys,
+and the space)
+appear as-is.
+Everything else,
+including the tab,
+enter/return,
+keypad,
+arrow,
+and function keys,
+appears as a control character or a multibyte
+.I "escape sequence."
+.I curses
+translates these into unique
+.I "key codes."
+See \fB\%getch\fP(3X).
+.SS "Effects of GUIs and Environment Variables"
+The selection of an approprate value of
+.I TERM
+in the process environment is essential to correct
+.I curses
+and
+.I \%term\%info
+library operation.
+A well-configured system selects a correct
+.I TERM
+value automatically;
+\fB\%tset\fP(1) may assist with troubleshooting exotic situations.
+.PP
 If the environment variables \fILINES\fP and \fI\%COLUMNS\fP are set,
 or if the
-program is executing in a window environment, line and column information in
-the environment will override information read by \fIterminfo\fP.
-This would affect a program running in an AT&T 630 layer,
-for example, where the size of a
-screen is changeable (see \fBENVIRONMENT\fP).
+.I curses
+program is executing in a graphical windowing environment,
+the information obtained thence overrides that obtained by
+.IR \%term\%info .
+An
+.I \%ncurses
+extension supports resizable terminals;
+see \fB\%wresize\fP(3X).
 .PP
 If the environment variable \fI\%TERMINFO\fP is defined,
-any program using
-\fBcurses\fP checks for a local terminal definition before checking in the
-standard place.
-For example, if \fITERM\fP is set to \fBatt4424\fP, then the
-compiled terminal definition is found in
-.PP
-.RS 4
-.EX
-\fB\*d/a/att4424\fP.
-.EE
-.RE
+a
+.I curses
+program checks first for a terminal type description in the location it
+identifies.
+.I \%TERMINFO
+is useful for developing experimental type descriptions or when write
+permission to \fI\*d\fP is not available.
+.PP
+See section \*(``ENVIRONMENT\*('' below.
+.SS "Naming Conventions"
+Many
+.I curses
+functions have two or more versions.
+Those prefixed with \*(``w\*('' require a window argument.
+Four functions prefixed with \*(``p\*('' require a pad argument.
+Those without a prefix generally operate on \fB\%stdscr\fP.
+.PP
+In function synopses,
+.I \%ncurses
+man pages apply the following names to parameters.
 .PP
-(The \fBa\fP is copied from the first letter of \fBatt4424\fP to avoid
-creation of huge directories.)
-However,
-if \fI\%TERMINFO\fP is set to
-\fB$HOME/myterms\fP, \fBcurses\fP first checks
-.PP
-.RS 4
-.EX
-\fB$HOME/myterms/a/att4424\fP,
-.EE
-.RE
-.PP
-and if that fails, it then checks
-.PP
-.RS 4
-.EX
-\fB\*d/a/att4424\fP.
-.EE
-.RE
-.PP
-This is useful for developing experimental definitions or when write
-permission in \fB\*d\fP is not available.
-.PP
-The integer variables \fBLINES\fP and \fBCOLS\fP are defined in
-\fB<curses.h>\fP and will be filled in by \fBinitscr\fP with the size of the
-screen.
-The constants \fBTRUE\fP and \fBFALSE\fP have the values \fB1\fP and
-\fB0\fP, respectively.
-.PP
-The \fBcurses\fP routines also define the \fBWINDOW *\fP variable \fBcurscr\fP
-which is used for certain low-level operations like clearing and redrawing a
-screen containing garbage.
-The \fBcurscr\fP can be used in only a few routines.
-.\"
-.SS Routine and Argument Names
-Many \fBcurses\fP routines have two or more versions.
-The routines prefixed with \fIw\fP require a window argument.
-The routines prefixed with \fIp\fP require a pad argument.
-Those without a prefix generally use \fBstdscr\fP.
-.PP
-The routines prefixed with \fBmv\fP require a \fIy\fP and \fIx\fP
-coordinate to move to before performing the appropriate action.
-The \fBmv\fP routines imply a call to \fBmove\fP before the call to the
-other routine.
-The coordinate \fIy\fP always refers to the row (of
-the window), and \fIx\fP always refers to the column.
-The upper left-hand corner is always (0,0), not (1,1).
-.PP
-The routines prefixed with \fBmvw\fP take both a window argument and
-\fIx\fP and \fIy\fP coordinates.
-The window argument is always specified before the coordinates.
-.PP
-In each case, \fIwin\fP is the window affected, and \fIpad\fP is the
-pad affected; \fIwin\fP and \fIpad\fP are always pointers to type
-\fBWINDOW\fP.
-.PP
-Option setting routines require a Boolean flag \fIbf\fP with the value
-\fBTRUE\fP or \fBFALSE\fP; \fIbf\fP is always of type \fBbool\fP.
-Most of the data types used in the library routines,
-such as \fBWINDOW\fP, \fBSCREEN\fP, \fBbool\fP, and \fBchtype\fP
-are defined in \fB<curses.h>\fP.
-Types used for the terminfo routines such as
-\fBTERMINAL\fP are defined in \fB<term.h>\fP.
-.PP
-This manual page describes functions which may appear in any configuration
+.TS
+center;
+Li L.
+bf	\fIbool\fP (\fBTRUE\fP or \fBFALSE\fP)
+win	pointer to \fIWINDOW\fP
+pad	pointer to \fIWINDOW\fP that is a pad
+.TE
+.SS "Wide and Non-wide Character Configurations"
+This manual page describes functions that appear in any configuration
 of the library.
-There are two common configurations of the library:
-.RS 3
-.TP 5
-.I ncurses
-the \*(``normal\*('' library, which handles 8-bit characters.
-The normal (8-bit) library stores characters combined with attributes
-in \fBchtype\fP data.
+There are two common configurations;
+see section \*(``ALTERNATE CONFIGURATIONS\*('' below.
+.TP 10 \" "ncursesw" + 2n
+.I \%ncurses
+is the library in its \*(``non-wide\*('' configuration,
+handling only eight-bit characters.
+It stores a character combined with attributes in a
+.I \%chtype
+datum.
 .IP
-Attributes alone (no corresponding character) may be stored in \fBchtype\fP
-or the equivalent \fBattr_t\fP data.
-In either case, the data is stored in something like an integer.
+Attributes alone
+(with no corresponding character)
+can be stored in variables of
+.I \%chtype
+or
+.I \%attr_t
+type.
+In either case,
+they are represented as an integral bit mask.
 .IP
-Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBchtype\fP.
-.TP 5
-.I ncursesw
-the so-called \*(``wide\*('' library, which handles multibyte characters
-(see the section on \fBALTERNATE CONFIGURATIONS\fP).
-The \*(``wide\*('' library includes all of the calls
-from the \*(``normal\*('' library.
-It adds about one third more calls using data types which store
-multibyte characters:
-.RS 5
-.TP 5
-.B cchar_t
-corresponds to \fBchtype\fP.
-However it is a structure, because more data is stored than can fit into
-an integer.
-The characters are large enough to require a full integer value \- and there
-may be more than one character per cell.
-The video attributes and color are stored in separate fields of the structure.
+Each cell of a
+.I \%WINDOW
+is stored as a
+.I \%chtype.
+.TP 10
+.I \%ncursesw
+is the library in its \*(``wide\*('' configuration,
+which handles character encodings requiring a larger data type than
+.I \%char
+(a byte-sized type)
+can represent.
+It adds about one third more calls using additional data types that
+can store such
+.I multibyte
+characters.
+.RS 10 \" same as foregoing tag width
+.TP 9 \" "cchar_t" + 2n
+.I \%cchar_t
+corresponds to the non-wide configuration's
+.I \%chtype.
+It always a structure type,
+because it stores more data than can fit into an integer.
+A character code may be larger than can fit in a C
+.I \%char,
+and moreover more than one character may occupy a cell
+(as with accent marks and other diacritics).
+Each character is of type
+.I \%wchar_t;
+a complex character contains one spacing character and zero or more
+non-spacing characters
+(see below).
+Attributes and color data are stored in separate fields of the
+structure,
+not combined as in
+.I \%chtype.
 .IP
-Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBcchar_t\fP.
-.IP
-The \fBsetcchar\fP(3X) and \fBgetcchar\fP(3X)
-functions store and retrieve the data from
-a \fBcchar_t\fP structure.
-.TP 5
-.B wchar_t
-stores a \*(``wide\*('' character.
-Like \fBchtype\fP, this may be an integer.
-.TP 5
-.B wint_t
-stores a \fBwchar_t\fP or \fBWEOF\fP \- not the same, though both may have
-the same size.
+Each cell
+(row and column)
+.I \%WINDOW
+is stored as a
+.I \%cchar_t.
+.PP
+The \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
+functions store and retrieve the data from a
+.I \%cchar_t
+structure.
+The wide library API of
+.I \%ncurses
+depends on two data types standardized by ISO C95.
+.TP 9
+.I \%wchar_t
+stores a wide character.
+Like
+.I \%chtype,
+this may be an integer.
+Depending on the character encoding,
+a wide character may be
+.I spacing,
+meaning that it occupies a character cell by itself and typically
+accompanies cursor advancement on input,
+or
+.I combining,
+meaning that it occupies the same cell as a spacing character,
+is often regarded as a \*(``modifier\*('' of the base glyph with which
+it combines,
+and typically does not advance the cursor on input.
+.TP 9
+.I \%wint_t
+can store a
+.I \%wchar_t
+or the constant
+.BR \%WEOF ,
+analogously to the
+.IR int -sized
+character manipulation functions of ISO C and their constant
+.BR \%EOF .
 .RE
 .IP
-The \*(``wide\*('' library provides new functions which are analogous to
-functions in the \*(``normal\*('' library.
-There is a naming convention which relates many of the normal/wide variants:
-a \*(``_w\*('' is inserted into the name.
-For example, \fBwaddch\fP becomes \fBwadd_wch\fP.
-.RE
+The wide library provides additional functions that complement those in
+the non-wide library where the size of the underlying character type is
+significant.
+A somewhat regular naming convention relates many of the wide variants
+to their non-wide counterparts;
+where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
+prefix it with \*(``_w\*('' to obtain the wide counterpart.
+For example,
+\fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+.IP
+This convention is inapplicable to some non-wide function names,
+so other transformations are used for the wide configuration:
+in the window background management functions,
+\*(``bkgd\*('' becomes \*(``bkgrnd\*('';
+the window border-drawing and -clearing functions are suffixed with
+\*(``_set\*(''.
 .\"
-.SS Routine Name Index
-The following table lists the \fBcurses\fP routines provided in
-the \*(``normal\*('' and \*(``wide\*('' libraries and the names of
-the manual pages on which they are described.
-Routines flagged with \*(``*\*(''
-are ncurses-specific, not described by XPG4 or present in SVr4.
+.SS "Function Name Index"
+The following table lists the
+.I curses
+functions provided in the non-wide and wide APIs and the corresponding
+man pages that describe them.
+Those flagged with \*(``*\*(''
+are
+.IR \%ncurses -specific,
+neither described by X/Open Curses nor present in SVr4.
 .PP
 .TS
 center tab(/);
-l l
 l l .
-\fBcurses\fP Routine Name/Manual Page Name
-=
+\f(BIcurses\fP Function Name/Man Page
+_
 COLOR_PAIR/\fBcurs_color\fP(3X)
 PAIR_NUMBER/\fBcurs_attr\fP(3X)
 add_wch/\fBcurs_add_wch\fP(3X)
@@ -844,17 +962,21 @@ The return values of
 \fBgetmaxyx\fP are undefined (i.e., these should not be used as the
 right-hand side of assignment statements).
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP and return an error if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I \%WINDOW
+pointer is null.
 Most \*(``mv\*(''-prefixed functions
-(except variadic functions such as \fBmvprintw\fP)
+(except variadic functions such as \fB\%mvprintw\fP)
 are provided both as macros and functions.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .SH ENVIRONMENT
 The following environment symbols are useful for customizing the
-runtime behavior of the \fBncurses\fP library.
+runtime behavior of the \fI\%ncurses\fP library.
 The most important ones have been already discussed in detail.
 .SS \fICC\fP command-character
 When set, change occurrences of the command_character
@@ -863,13 +985,14 @@ of the loaded terminfo entries to the value of this variable.
 Very few terminfo entries provide this feature.
 .PP
 Because this name is also used in development environments to represent
-the C compiler's name, \fBncurses\fP ignores it if it does not happen to
-be a single character.
+the C compiler's name,
+\fI\%ncurses\fP ignores it if it does not happen to be a single
+character.
 .SS \fIBAUDRATE\fP
 The debugging library checks this environment variable when the application
 has redirected output to a file.
 The variable's numeric value is used for the baudrate.
-If no value is found, \fBncurses\fP uses 9600.
+If no value is found, \fI\%ncurses\fP uses 9600.
 This allows testers to construct repeatable test-cases
 that take into account costs that depend on baudrate.
 .SS \fICOLUMNS\fP
@@ -877,7 +1000,8 @@ Specify the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
 If neither the \fI\%COLUMNS\fP value nor the terminal's screen size is available,
-\fBncurses\fP uses the size which may be specified in the terminfo database
+\fI\%ncurses\fP uses the size which may be specified in the terminfo
+database
 (i.e., the \fBcols\fP capability).
 .PP
 It is important that your application use a correct size for the screen.
@@ -901,8 +1025,11 @@ Use the \fBuse_tioctl\fP function to update \fI\%COLUMNS\fP or
 \fILINES\fP to match the screen size obtained from system calls or the
 terminal database.
 .SS \fIESCDELAY\fP
-Specifies the total time, in milliseconds, for which ncurses will
-await a character sequence, e.g., a function key.
+Specifies the total time,
+in milliseconds,
+for which \fI\%ncurses\fP will await a character sequence,
+e.g.,
+a function key.
 The default value, 1000 milliseconds, is enough for most uses.
 However, it is made a variable to accommodate unusual applications.
 .PP
@@ -925,7 +1052,7 @@ in either form,
 but setting the environment variable rather than the global variable
 does not create problems when compiling an application.
 .SS \fIHOME\fP
-Tells \fBncurses\fP where your home directory is.
+Tells \fI\%ncurses\fP where your home directory is.
 That is where it may read and write auxiliary terminal descriptions:
 .PP
 .RS 4
@@ -953,19 +1080,19 @@ platforms:
 .PP
 This variable lets you customize the mouse.
 The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
-If it is not specified, \fBncurses\fP uses 132.
+If it is not specified, \fI\%ncurses\fP uses 132.
 .SS \fINCURSES_ASSUMED_COLORS\fP
 Override the compiled-in assumption that the
 terminal's default colors are white-on-black
 (see \fBdefault_colors\fP(3X)).
 You may set the foreground and background color values with this environment
 variable by proving a 2-element list: foreground,background.
-For example, to tell ncurses to not assume anything
+For example, to tell \fI\%ncurses\fP to not assume anything
 about the colors, set this to "\-1,\-1".
 To make it green-on-black, set it to "2,0".
 Any positive value from zero to the terminfo \fBmax_colors\fP value is allowed.
 .SS \fINCURSES_CONSOLE2\fP
-This applies only to the MinGW port of ncurses.
+This applies only to the MinGW port of \fI\%ncurses\fP.
 .PP
 The \fBConsole2\fP program's handling of the Microsoft Console API call
 \fBCreateConsoleScreenBuffer\fP is defective.
@@ -975,7 +1102,8 @@ mapping coordinates,
 explicitly saving and restoring the original screen contents.
 Setting the environment variable \fBNCGDB\fP has the same effect.
 .SS \fINCURSES_GPM_TERMS\fP
-This applies only to ncurses configured to use the GPM interface.
+This applies only to \fI\%ncurses\fP configured to use the GPM
+interface.
 .PP
 If present,
 the environment variable is a list of one or more terminal names
@@ -984,18 +1112,19 @@ Setting it to an empty value disables the GPM interface;
 using the built-in support for xterm, etc.
 .PP
 If the environment variable is absent,
-ncurses will attempt to open GPM if \fITERM\fP contains \*(``linux\*(''.
+\fI\%ncurses\fP will attempt to open GPM if \fITERM\fP contains
+\*(``linux\*(''.
 .SS \fINCURSES_NO_HARD_TABS\fP
-\fBNcurses\fP may use tabs as part of the cursor movement optimization.
+\fI\%ncurses\fP may use tabs as part of cursor movement optimization.
 In some cases,
 your terminal driver may not handle these properly.
-Set this environment variable to disable the feature.
+Set this environment variable to any value to disable the feature.
 You can also adjust your \fBstty\fP(1) settings to avoid the problem.
 .SS \fINCURSES_NO_MAGIC_COOKIE\fP
 Some terminals use a magic-cookie feature which requires special handling
 to make highlighting and other video attributes display properly.
 You can suppress the highlighting entirely for these terminals by
-setting this environment variable.
+setting this environment variable to any value.
 .SS \fINCURSES_NO_PADDING\fP
 Most of the terminal descriptions in the terminfo database are written
 for real \*(``hardware\*('' terminals.
@@ -1034,38 +1163,39 @@ continued
 though 5.9 patch 20130126
 .RE
 .PP
-\fBncurses\fP enabled buffered output during terminal initialization.
+\fI\%ncurses\fP enabled buffered output during terminal initialization.
 This was done (as in SVr4 curses) for performance reasons.
-For testing purposes, both of \fBncurses\fP and certain applications,
+For testing purposes, both of \fI\%ncurses\fP and certain applications,
 this feature was made optional.
 Setting the \fI\%NCURSES_NO_SETBUF\fP variable
 disabled output buffering, leaving the output in the original (usually
 line buffered) mode.
 .PP
 In the current implementation,
-ncurses performs its own buffering and does not require this workaround.
+\fI\%ncurses\fP performs its own buffering and does not require this
+workaround.
 It does not modify the buffering of the standard output.
 .PP
 The reason for the change was to make the behavior for interrupts and
 other signals more robust.
 One drawback is that certain nonconventional programs would mix
-ordinary stdio calls with ncurses calls and (usually) work.
-This is no longer possible since ncurses is not using
+ordinary stdio calls with \fI\%ncurses\fP calls and (usually) work.
+This is no longer possible since \fI\%ncurses\fP is not using
 the buffered standard output but its own output (to the same file descriptor).
 As a special case, the low-level calls such as \fBputp\fP still use the
 standard output.
 But high-level curses calls do not.
 .SS \fINCURSES_NO_UTF8_ACS\fP
-During initialization, the \fBncurses\fP library
+During initialization, the \fI\%ncurses\fP library
 checks for special cases where VT100 line-drawing (and the corresponding
 alternate character set capabilities) described in the terminfo are known
 to be missing.
 Specifically, when running in a UTF\-8 locale,
 the Linux console emulator and the GNU screen program ignore these.
-Ncurses checks the \fITERM\fP environment variable for these.
+\fI\%ncurses checks the \fITERM\fP environment variable for these.
 For other special cases, you should set this environment variable.
-Doing this tells ncurses to use Unicode values which correspond to
-the VT100 line-drawing glyphs.
+Doing this tells \fI\%ncurses\fP to use Unicode values which correspond
+to the VT100 line-drawing glyphs.
 That works for the special cases cited,
 and is likely to work for terminal emulators.
 .PP
@@ -1074,7 +1204,7 @@ Setting it to zero (or to a nonnumber)
 disables the special check for \*(``linux\*('' and \*(``screen\*(''.
 .PP
 As an alternative to the environment variable,
-ncurses checks for an extended terminfo capability \fBU8\fP.
+\fI\%ncurses\fP checks for an extended terminfo capability \fBU8\fP.
 This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
 For example
 .PP
@@ -1092,13 +1222,15 @@ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
 .RE
 .PP
 The name \*(``U8\*('' is chosen to be two characters,
-to permit it to be used by applications that use ncurses'
+to permit it to be used by applications that use \fI\%ncurses\fP'
 termcap interface.
 .SS \fINCURSES_TRACE\fP
-During initialization, the \fBncurses\fP debugging library
+During initialization, the \fI\%ncurses\fP debugging library
 checks the \fI\%NCURSES_TRACE\fP environment variable.
-If it is defined, to a numeric value, \fBncurses\fP calls the \fBtrace\fP
-function, using that value as the argument.
+If it is defined,
+to a numeric value,
+\fI\%ncurses\fP calls the \fBtrace\fP function,
+using that value as the argument.
 .PP
 The argument values, which are defined in \fBcurses.h\fP, provide several
 types of information.
@@ -1125,18 +1257,19 @@ terminal emulators which allow you to
 specify \fITERM\fP as a parameter or configuration value do
 not change their behavior to match that setting.
 .SS \fITERMCAP\fP
-If the \fBncurses\fP library has been configured with \fItermcap\fP
-support, \fBncurses\fP will check for a terminal's description in
+If the \fI\%ncurses\fP library has been configured with \fItermcap\fP
+support, \fI\%ncurses\fP will check for a terminal's description in
 termcap form if it is not available in the terminfo database.
 .PP
 The \fI\%TERMCAP\fP environment variable contains
 either a terminal description (with newlines stripped out),
 or a file name telling where the information denoted by
 the \fITERM\fP environment variable exists.
-In either case, setting it directs \fBncurses\fP to ignore
+In either case, setting it directs \fI\%ncurses\fP to ignore
 the usual place for this information, e.g., /etc/termcap.
 .SS \fITERMINFO\fP
-\fBncurses\fP can be configured to read from multiple terminal databases.
+\fI\%ncurses\fP can be configured to read from multiple terminal
+databases.
 The \fI\%TERMINFO\fP variable overrides the location for
 the default terminal database.
 Terminal descriptions (in terminal format) are stored in terminal databases:
@@ -1149,7 +1282,7 @@ and the \fI\%TERMINFO\fP variable is used by \fIcurses\fP applications
 on those
 systems to override the default location of the terminal database.
 .IP \(bu 4
-If \fBncurses\fP is built to use hashed databases,
+If \fI\%ncurses\fP is built to use hashed databases,
 then each entry in this list may be the path of a hashed database file, e.g.,
 .RS 4
 .PP
@@ -1175,13 +1308,13 @@ reading it directly
 rather than using the terminfo library calls.
 .RE
 .bP
-If \fBncurses\fP is built with a support for reading termcap files
+If \fI\%ncurses\fP is built with a support for reading termcap files
 directly, then an entry in this list may be the path of a termcap file.
 .IP \(bu 4
 If the \fI\%TERMINFO\fP variable begins with
 \*(``hex:\*('' or \*(``b64:\*('',
-\fBncurses\fP uses the remainder of that variable as a compiled terminal
-description.
+\fI\%ncurses\fP uses the remainder of that variable as a compiled
+terminal description.
 You might produce the base64 format using \fBinfocmp\fP(1M):
 .RS 4
 .PP
@@ -1201,7 +1334,7 @@ but not the only way to set location of the default terminal database.
 The complete list of database locations in order follows:
 .RS 3
 .bP
-the last terminal database to which \fBncurses\fP wrote,
+the last terminal database to which \fI\%ncurses\fP wrote,
 if any, is searched first
 .bP
 the location specified by the \fI\%TERMINFO\fP environment variable
@@ -1211,7 +1344,7 @@ $HOME/.terminfo
 locations listed in the \fI\%TERMINFO_DIRS\fP environment variable
 .bP
 one or more locations whose names are configured and compiled into the
-ncurses library, i.e.,
+\fI\%ncurses\fP library, i.e.,
 .RS 3
 .bP
 @TERMINFO_DIRS@ (corresponding to the \fI\%TERMINFO_DIRS\fP variable)
@@ -1226,15 +1359,15 @@ the section on the \fI\%TERMINFO\fP variable.
 The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 .PP
 There is no corresponding feature in System V terminfo;
-it is an extension developed for \fBncurses\fP.
+it is an extension developed for \fI\%ncurses\fP.
 .SS \fITERMPATH\fP
-If \fI\%TERMCAP\fP does not hold a file name then \fBncurses\fP checks
+If \fI\%TERMCAP\fP does not hold a file name then \fI\%ncurses\fP checks
 the \fI\%TERMPATH\fP environment variable.
 This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
 semicolons on OS/2 EMX.
 .PP
 If the \fI\%TERMPATH\fP environment variable is not set,
-\fBncurses\fP looks in the files
+\fI\%ncurses\fP looks in the files
 .PP
 .RS 4
 .EX
@@ -1255,12 +1388,13 @@ $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
 .RE
 .SH ALTERNATE CONFIGURATIONS
 Several different configurations are possible,
-depending on the configure script options used when building \fBncurses\fP.
+depending on the configure script options used when building
+\fI\%ncurses\fP.
 There are a few main options whose effects are visible to the applications
-developer using \fBncurses\fP:
+developer using \fI\%ncurses\fP:
 .TP 5
 \-\-disable\-overwrite
-The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
+The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP:
 .RS 5
 .PP
 .RS 4
@@ -1269,10 +1403,11 @@ The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
 .EE
 .RE
 .PP
-This option is used to avoid filename conflicts when \fBncurses\fP
+This option is used to avoid filename conflicts when \fI\%ncurses\fP
 is not the main implementation of curses of the computer.
-If \fBncurses\fP is installed disabling overwrite, it puts its headers in
-a subdirectory, e.g.,
+If \fI\%ncurses\fP is installed disabling overwrite,
+it puts its headers in a subdirectory,
+e.g.,
 .PP
 .RS 4
 .EX
@@ -1327,10 +1462,10 @@ with the caveat that some other header file than \fBcurses.h\fP
 may require a specific value for \fB_XOPEN_SOURCE\fP
 (or a system-specific symbol).
 .PP
-The \fBcurses.h\fP file which is installed for the wide-character
-library is designed to be compatible with the normal library's header.
-Only the size of the \fBWINDOW\fP structure differs, and very few
-applications require more than a pointer to \fBWINDOW\fPs.
+The \fI\%curses.h\fP header file installed for the wide-character
+library is designed to be compatible with the non-wide library's header.
+Only the size of the \fI\%WINDOW\fP structure differs;
+few applications require more than pointers to \fI\%WINDOW\fPs.
 .PP
 If the headers are installed allowing overwrite,
 the wide-character library's headers should be installed last,
@@ -1400,58 +1535,64 @@ tab stop initialization database
 .I \*d
 compiled terminal capability database
 .SH NOTES
-If standard output from a \fBncurses\fP program is re-directed to something
-which is not a tty, screen updates will be directed to standard error.
+If standard output from a \fI\%ncurses\fP program is re-directed to
+something which is not a tty,
+screen updates will be directed to standard error.
 This was an undocumented feature of AT&T System V Release 3 curses.
 .PP
 See subsection \*(``Header files\*('' below regarding symbols exposed by
 inclusion of \fI\%curses.h\fP.
 .SH EXTENSIONS
-The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
+The \fI\%ncurses\fP library can be compiled with an option
+(\fB\-DUSE_GETCAP\fP)
 that falls back to the old-style /etc/termcap file if the terminal setup code
 cannot find a terminfo entry corresponding to \fITERM\fP.
-Use of this feature
-is not recommended, as it essentially includes an entire termcap compiler in
-the \fBncurses\fP startup code, at significant cost in core and startup cycles.
-.PP
-The \fBncurses\fP library includes facilities for capturing mouse events on
-certain terminals (including xterm).
+Use of this feature is not recommended,
+as it essentially includes an entire termcap compiler in the
+\fI\%ncurses\fP startup code,
+at significant cost in core and startup cycles.
+.PP
+The \fI\%ncurses\fP library includes facilities for capturing mouse
+events on certain terminals
+(including xterm).
 See the \fBcurs_mouse\fP(3X)
 manual page for details.
 .PP
-The \fBncurses\fP library includes facilities for responding to window
+The \fI\%ncurses\fP library includes facilities for responding to window
 resizing events, e.g., when running in an xterm.
 See the \fBresizeterm\fP(3X)
 and \fBwresize\fP(3X) manual pages for details.
 In addition, the library may be configured with a \fBSIGWINCH\fP handler.
 .PP
-The \fBncurses\fP library extends the fixed set of function key capabilities
-of terminals by allowing the application designer to define additional
-key sequences at runtime.
+The \fI\%ncurses\fP library extends the fixed set of function key
+capabilities of terminals by allowing the application designer to define
+additional key sequences at runtime.
 See the \fBdefine_key\fP(3X)
 \fBkey_defined\fP(3X),
 and \fBkeyok\fP(3X) manual pages for details.
 .PP
-The \fBncurses\fP library can exploit the capabilities of terminals which
-implement the ISO\-6429 SGR 39 and SGR 49 controls, which allow an application
-to reset the terminal to its original foreground and background colors.
+The \fI\%ncurses\fP library can exploit the capabilities of terminals
+which implement the ISO\-6429 SGR 39 and SGR 49 controls,
+which allow an application to reset the terminal to its original
+foreground and background colors.
 From the users' perspective, the application is able to draw colored
 text on a background whose color is set independently, providing better
 control over color contrasts.
 See the \fBdefault_colors\fP(3X) manual page for details.
 .PP
-The \fBncurses\fP library includes a function for directing application output
-to a printer attached to the terminal device.
+The \fI\%ncurses\fP library includes a function for directing
+application output to a printer attached to the terminal device.
 See the \fBcurs_print\fP(3X) manual page for details.
 .SH PORTABILITY
-The \fBncurses\fP library is intended to be BASE-level conformant with XSI
-Curses.
+The \fI\%ncurses\fP library is intended to be BASE-level conformant with
+XSI Curses.
 The EXTENDED XSI Curses functionality
 (including color support) is supported.
 .PP
-A small number of local differences (that is, individual differences between
-the XSI Curses and \fBncurses\fP calls) are described in \fBPORTABILITY\fP
-sections of the library man pages.
+A small number of local differences
+(that is,
+individual differences between the XSI Curses and \fI\%ncurses\fP calls)
+are described in \fBPORTABILITY\fP sections of the library man pages.
 .SS Error checking
 In many cases, X/Open Curses is vague about error conditions,
 omitting some of the SVr4 documentation.
@@ -1465,7 +1606,8 @@ to tell an application which of several possible errors were detected.
 Relying on this (or some other) extension will adversely affect the
 portability of curses applications.
 .SS Extensions versus portability
-Most of the extensions provided by ncurses have not been standardized.
+Most of the extensions provided by \fI\%ncurses\fP have not been
+standardized.
 Some have been incorporated into other implementations, such as
 PDCurses or NetBSD curses.
 Here are a few to consider:
@@ -1523,7 +1665,9 @@ Here is a more complete story:
 Starting with BSD curses, all implementations have included <stdio.h>.
 .IP
 BSD curses included <curses.h> and <unctrl.h> from an internal header
-"curses.ext" ("ext" was a short name for \fIexterns\fP).
+file
+.I \%curses.ext
+(\*(``ext\*('' abbreviated \*(``externs\*('').
 .IP
 BSD curses used <stdio.h> internally (for \fBprintw\fP and \fBscanw\fP),
 but nothing in <curses.h> itself relied upon <stdio.h>.
@@ -1543,17 +1687,18 @@ As a result, standard <curses.h> will always include <stdio.h>.
 .bP
 X/Open Curses is inconsistent with respect to SVr4 regarding <unctrl.h>.
 .IP
-As noted in \fBcurs_util\fP(3X), ncurses includes <unctrl.h> from
-<curses.h> (like SVr4).
+As noted in \fBcurs_util\fP(3X),
+\fI\%ncurses\fP includes <unctrl.h> from <curses.h>
+(like SVr4).
 .bP
 X/Open's comments about <term.h> and <termios.h> may refer to HP-UX and AIX:
 .IP
 HP-UX curses includes <term.h> from <curses.h>
 to declare \fBsetupterm\fP in curses.h,
-but ncurses (and Solaris curses) do not.
+but \fI\%ncurses\fP (and Solaris curses) do not.
 .IP
 AIX curses includes <term.h> and <termios.h>.
-Again, ncurses (and Solaris curses) do not.
+Again, \fI\%ncurses\fP (and Solaris curses) do not.
 .bP
 X/Open says that <curses.h> \fImay\fP include <term.h>,
 but there is no requirement that it do that.
@@ -1563,17 +1708,17 @@ and must include both headers in the same module.
 Very old versions of AIX curses required including <curses.h>
 before including <term.h>.
 .IP
-Because ncurses header files include the headers needed to
+Because \fI\%ncurses\fP header files include the headers needed to
 define datatypes used in the headers,
-ncurses header files can be included in any order.
+\fI\%ncurses\fP header files can be included in any order.
 But for portability, you should include <curses.h> before <term.h>.
 .bP
 X/Open Curses says \fI"may make visible"\fP
 because including a header file does not necessarily make all symbols
 in it visible (there are ifdef's to consider).
 .IP
-For instance, in ncurses <wchar.h> \fImay\fP be included if
-the proper symbol is defined, and if ncurses is configured for
+For instance, in \fI\%ncurses\fP <wchar.h> \fImay\fP be included if
+the proper symbol is defined, and if \fI\%ncurses\fP is configured for
 wide-character support.
 If the header is included, its symbols may be made visible.
 That depends on the value used for \fB_XOPEN_SOURCE\fP
@@ -1599,8 +1744,10 @@ because <stdio.h> is always included by <curses.h>.
 .IP
 None of the X/Open Curses implementations require an application
 to include <stdarg.h> before <curses.h> because they either
-have allowed for a special type, or (like ncurses) include <stdarg.h>
-directly to provide a portable interface.
+have allowed for a special type,
+or
+(like \fI\%ncurses\fP)
+include <stdarg.h> directly to provide a portable interface.
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 8da580b30..6aa948f77 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.43 2023/11/25 14:26:30 tom Exp $
-.TH new_pair 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
+.TH new_pair 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -130,7 +130,7 @@ All of the color pairs are allocated from a table of possible color pairs.
 The size of the table is determined by the terminfo \fBpairs\fP capability.
 The table is shared with \fBinit_pair\fP;
 in fact \fBalloc_pair\fP calls \fBinit_pair\fP after
-updating the \fIncurses\fP library's fast index
+updating the \fI\%ncurses\fP library's fast index
 to the colors versus color pairs.
 .SS find_pair
 The \fBfind_pair\fP function accepts parameters for
@@ -155,7 +155,7 @@ or \-1 if not.
 Likewise, \fBfree_pair\fP returns \fBOK\fP unless it encounters an
 error updating the fast index or if no such color pair is in use.
 .SH PORTABILITY
-These routines are specific to \fIncurses\fP.
+These routines are specific to \fI\%ncurses\fP.
 They were not supported on
 Version 7, BSD or System V implementations.
 It is recommended that
diff --git a/man/panel.3x b/man/panel.3x
index 497006ff4..6071b29a3 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.59 2023/11/25 14:08:47 tom Exp $
-.TH panel 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.60 2023/12/16 21:24:43 tom Exp $
+.TH panel 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,7 +46,7 @@
 ..
 .SH NAME
 panel \-
-panel stack extension for \fI\%curses\fP
+panel stack extension for \fIcurses\fP
 .SH SYNOPSIS
 .nf
 \fB#include <panel.h>
@@ -80,7 +80,7 @@ panel stack extension for \fI\%curses\fP
 Panels are \fBcurses\fP(3X) windows with the added property of
 depth.
 Panel functions allow the use of stacked windows and ensure that the
-proper portions of each window and the \fI\%curses\fP \fB\%stdscr\fP
+proper portions of each window and the \fIcurses\fP \fB\%stdscr\fP
 window are hidden or displayed when panels are added,
 moved,
 modified,
@@ -97,9 +97,9 @@ hide,
 and show panels.
 You can relocate a panel to any desired position in the stack.
 .PP
-Panel routines are a functional layer added to \fI\%curses\fP,
-make only high-level \fI\%curses\fP calls,
-and work anywhere \fI\%curses\fP does.
+Panel routines are a functional layer added to \fIcurses\fP,
+make only high-level \fIcurses\fP calls,
+and work anywhere \fIcurses\fP does.
 .SH FUNCTIONS
 .\" ---------
 .SS bottom_panel
@@ -260,7 +260,7 @@ Systems based on SVr4 source code,
 such as Solaris,
 provide this library.
 .bP
-\fIncurses\fP (since version 0.6 in 1993)
+\fI\%ncurses\fP (since version 0.6 in 1993)
 and \fIPDCurses\fP (since version 2.2 in 1995)
 provide a panel library whose common ancestor
 is a public domain implementation by Warren Tucker
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 9b21b819e..9611be60a 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.53 2023/12/02 20:49:04 tom Exp $
-.TH resizeterm 3X 2023-12-02 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.54 2023/12/16 20:32:22 tom Exp $
+.TH resizeterm 3X 2023-12-16 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -50,7 +50,8 @@ manage the terminal dimensions understood by \fIcurses\fR
 .fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
-It provides callers with a hook into the \fIncurses\fP data to resize windows,
+It provides callers with a hook into the \fI\%ncurses\fP data to resize
+windows,
 primarily for use by programs running in an X Window terminal (e.g., xterm)
 when the terminal's screen size is changed by the user:
 .bP
@@ -62,9 +63,9 @@ rows and/or columns can be added to existing windows.
 The added cells should match the current attributes of the windows.
 .PP
 If the calling program has not set up a handler for \fB\%SIGWINCH\fP
-when it initializes \fIncurses\fP
+when it initializes \fI\%ncurses\fP
 (e.g., using \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)),
-then \fIncurses\fP sets a handler for \fB\%SIGWINCH\fP which notifies
+then \fI\%ncurses\fP sets a handler for \fB\%SIGWINCH\fP which notifies
 the library when a window-size event has occurred.
 The library checks for this notification
 .bP
@@ -87,7 +88,7 @@ see \fB\%SIGWINCH\fP, and proper layout will rely upon the application.
 The function \fB\%resizeterm\fP resizes the standard and current windows
 (i.e., \fB\%stdscr\fP and \fB\%curscr\fP)
 to the specified dimensions, and adjusts other bookkeeping data used by
-the \fIncurses\fP library that record the window dimensions
+the \fI\%ncurses\fP library that record the window dimensions
 such as the \fB\%LINES\fP and \fB\%COLS\fP variables.
 .SS resize_term
 Most of the work for \fB\%resizeterm\fP is
@@ -130,7 +131,8 @@ While these functions are intended to be used to support a signal handler
 context where \fB\%malloc\fP or \fB\%realloc\fP may have been interrupted,
 since it uses those functions.
 .PP
-If \fIncurses\fP is configured to supply its own \fB\%SIGWINCH\fP handler,
+If \fI\%ncurses\fP is configured to supply its own \fB\%SIGWINCH\fP
+handler,
 .bP
 on receipt of a \fB\%SIGWINCH\fP, the handler sets a flag
 .bP
@@ -150,8 +152,8 @@ be done automatically.
 .IP
 Calling \fB\%resizeterm\fP or \fB\%resize_term\fP
 directly from a signal handler is unsafe.
-This indirect method is used to provide a safe way to resize the \fIncurses\fP
-data structures.
+This indirect method is used to provide a safe way to resize the
+\fI\%ncurses\fP data structures.
 .PP
 If the environment variables \fILINES\fP or \fI\%COLUMNS\fP are set,
 this overrides the library's use of the window size obtained from
@@ -168,7 +170,7 @@ resuming using \fB\%refresh\fP(3X).
 .PP
 Doing that clears the screen and is visually distracting.
 .PP
-This extension of \fIncurses\fP was introduced in mid-1995.
+This extension of \fI\%ncurses\fP was introduced in mid-1995.
 It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
 .SH AUTHORS
 Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 5d4981807..ff1fa1e0f 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.39 2023/11/25 14:21:48 tom Exp $
-.TH scr_dump 5 2023-11-25 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.40 2023/12/16 21:07:24 tom Exp $
+.TH scr_dump 5 2023-12-16 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,7 +115,7 @@ because the library truncates or fills the screen as necessary.
 .bP
 The ncurses6 \fBgetwin\fP reads the legacy screen dumps from ncurses5.
 .SS ncurses5 (legacy)
-The screen-dump feature was added to ncurses in June 1995.
+The screen-dump feature was added to \fI\%ncurses\fP in June 1995.
 While there were fixes and improvements in succeeding years,
 the basic scheme was unchanged:
 .bP
@@ -228,7 +228,7 @@ HP-UX (90093 bytes)
 .bP
 Solaris 10 (13273 bytes)
 .bP
-ncurses5 (12888 bytes)
+\fI\%ncurses\fP5 (12888 bytes)
 .SS Solaris
 As noted above, Solaris curses has no magic number corresponding
 to SVr4 curses.
@@ -351,7 +351,7 @@ All characters are shown in printable form; spaces are \*(``\es\*('' to
 ensure they are not overlooked.
 .bP
 Attributes are written in escaped curly braces, e.g., \*(``\e{BOLD}\*('',
-and may include a color-pair (C1 or C2 in this example).
+and may include a color pair (C1 or C2 in this example).
 .bP
 The parameters in the header are written out only if they are nonzero.
 When reading back, order does not matter.
@@ -436,11 +436,11 @@ Here is the corresponding dump (using \*(``od \-t x1\*(''):
 .SH AUTHORS
 Thomas E. Dickey
 .br
-extended screen-dump format for ncurses 6.0 (2015)
+extended screen-dump format for \fI\%ncurses\fP 6.0 (2015)
 .sp
 Eric S. Raymond
 .br
-screen dump feature in ncurses 1.9.2d (1995)
+screen dump feature in \fI\%ncurses\fP 1.9.2d (1995)
 .SH SEE ALSO
 \fB\%curs_scr_dump\fP(3X),
 \fB\%curs_util\fP(3X)
diff --git a/man/tabs.1 b/man/tabs.1
index a13fd2409..4bcb457ec 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.50 2023/11/25 14:32:36 tom Exp $
-.TH @TABS@ 1 2023-11-25 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.51 2023/12/17 00:13:57 tom Exp $
+.TH @TABS@ 1 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,7 +104,8 @@ This option tells \fB@TABS@\fP to check the options and run any debugging
 option, but not to modify the terminal settings.
 .TP
 \fB\-V\fP
-reports the version of ncurses which was used in this program, and exits.
+reports the version of \fI\%ncurses\fP which was used in this program,
+and exits.
 .PP
 The \fB@TABS@\fP program processes a single list of tab stops.
 The last option to be processed which defines a list is the one that
@@ -236,60 +237,76 @@ unlike \fB@TPUT@\fP(1).
 .PP
 The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
 by other implementations.
-.PP
+.SH HISTORY
 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).
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
+.\"   tabs.c
+A reduced version shipped in Seventh Edition Unix
+(early 1979)
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/src/cmd/tabs.c
+and in 3BSD
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+.\"   tabs.c
+(later the same year);
+it supported a \*(``\-n\*('' option to set the first tab stop at the
+left margin.
 That option is not documented by POSIX.
 .PP
-The PWB/Unix \fBtabs\fP utility, which was included in System III (1980),
-used built-in tables rather than the terminal database,
+The PWB/Unix \fBtabs\fP utility returned in System III (1980),
+and used built-in tables rather than the terminal database,
 to support a half-dozen hardcopy terminal (printer) types.
-It also had built-in logic to support the left-margin,
+It also had built-in logic to support setting the left margin,
 as well as a feature for copying the tab settings from a file.
 .PP
-Later versions of Unix, e.g., SVr4,
+Versions of the program in later releases of AT&T Unix,
+such as SVr4,
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=SysVR4/cmd/tabs/tabs.c
 added support for the terminal database,
-but kept the tables to support the printers.
+but retained the tables to support the printers.
 In an earlier development effort,
-the tab-stop initialization provided by \fBtset\fP (1982)
-and incorporated into \fBtput\fP uses the terminal database,
+the tab stop initialization provided by \fBtset\fP(1) (1982),
+and incorporated into \fBtput\fP(1) uses the terminal database,
 .PP
-The \fB+m\fP option was documented
-in the Base Specifications Issue 5 (Unix98, 1997),
-and omitted in Issue 6 (Unix03, 2004) without documenting the rationale,
+The \fB+m\fP option was documented in the POSIX
+Base Specifications Issue 5
+(Unix98, 1997),
+then omitted in Issue 6
+(Unix03, 2004)
+without express motivation,
 though an introductory comment
 \fI\*(``and optionally adjusts the margin\*(''\fP remains,
 overlooked in the removal.
-The documented \fBtabs\fP utility in Issues 6 and later has no mechanism
+The \fBtabs\fP utility documented in Issues 6 and later has no mechanism
 for setting margins.
-The \fB+m\fP option in this implementation differs from the feature
-in SVr4 by using terminal capabilities rather than built-in tables.
+The \fB+m\fP option in
+.I \%ncurses
+\fBtabs\fP differs from the SVr4 feature by using terminal capabilities
+rather than built-in tables.
 .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
-(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.
+POSIX documents no limit on the number of tab stops.
+Other implementations impose one;
+the limit is 20 in PWB/Unix's \fBtabs\fP utility.
+While some terminals may not accept an arbitrary number of tab stops,
+.I \%ncurses
+\fBtabs\fP attempts to set tab stops up to the right margin if the list
+thereof is sufficiently 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
+The \*(``Rationale\*('' section of the Issue 6 \fBtabs\fP reference page
+.\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
+details how the committee considered redesigning the \fBtabs\fP and
+\fBtput\fP utilities,
+without settling on an improved solution.
+It claims 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.
+Nevertheless,
+the feature described in subsection \*(``Explicit Lists\*('' above was
+implemented in PWB/Unix,
+and permits the setting of abitrary tab stops.
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TSET@\fP(1),
diff --git a/man/term.5 b/man/term.5
index 000a9da40..e1eaa995e 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.67 2023/12/02 20:49:04 tom Exp $
-.TH term 5 2023-12-02 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.68 2023/12/16 20:32:22 tom Exp $
+.TH term 5 2023-12-16 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,7 +64,8 @@ compiled \fIterminfo\fR terminal description
 .SH DESCRIPTION
 .SS STORAGE LOCATION
 Compiled terminfo descriptions are placed under the directory \fB\*d\fP.
-Two configurations are supported (when building the \fBncurses\fP libraries):
+Two configurations are supported
+(when building the \fI\%ncurses\fP libraries):
 .TP 5
 .B directory tree
 A two-level scheme is used to avoid a linear search
@@ -87,11 +88,12 @@ the terminfo's primary name as a key,
 and records containing only aliases pointing to the primary name.
 .IP
 If built to write hashed databases,
-\fBncurses\fP can still read terminfo databases organized as a directory tree,
+\fI\%ncurses\fP can still read terminfo databases organized as a
+directory tree,
 but cannot write entries into the directory tree.
 It can write (or rewrite) entries in the hashed database.
 .IP
-\fBncurses\fP distinguishes the two cases in the \fI\%TERMINFO\fP and
+\fI\%ncurses\fP distinguishes the two cases in the \fI\%TERMINFO\fP and
 \fI\%TERMINFO_DIRS\fP environment variable by assuming a directory tree
 for entries that correspond to an existing directory,
 and hashed database otherwise.
@@ -219,14 +221,14 @@ With some minor variations of the offsets (see PORTABILITY),
 the same binary format is used in all modern Unix systems.
 Each system uses a predefined set of boolean, number or string capabilities.
 .PP
-The \fBncurses\fP libraries and applications support
+The \fI\%ncurses\fP libraries and applications support
 extended terminfo binary format,
 allowing users to define capabilities which are loaded at runtime.
 This
 extension is made possible by using the fact that the other implementations
 stop reading the terminfo data when they have reached the end of the size given
 in the header.
-\fBncurses\fP checks the size,
+\fI\%ncurses\fP checks the size,
 and if it exceeds that due to the predefined data,
 continues to parse according to its own scheme.
 .PP
@@ -253,8 +255,9 @@ The count- and size-values for the extended string table
 include the extended capability \fInames\fP as well as
 extended capability \fIvalues\fP.
 .PP
-Using the counts and sizes, \fBncurses\fP allocates arrays and reads data
-for the extended capabilities in the same order as the header information.
+Using the counts and sizes,
+\fI\%ncurses\fP allocates arrays and reads data for the extended
+capabilities in the same order as the header information.
 .PP
 The extended string table contains values for string capabilities.
 After the end of these values, it contains the names for each of
@@ -262,11 +265,12 @@ the extended capabilities in order, e.g., booleans, then numbers and
 finally strings.
 .PP
 By storing terminal descriptions in this way,
-\fBncurses\fP is able to provide a database useful with legacy applications,
+\fI\%ncurses\fP is able to provide a database useful with legacy
+applications,
 as well as providing data for applications which need more than the
 predefined capabilities.
 See \fBuser_caps\fP(5) for an overview
-of the way \fBncurses\fP uses this extended information.
+of the way \fI\%ncurses\fP uses this extended information.
 .PP
 Applications which manipulate terminal data can use the definitions
 described in \fBterm_variables\fP(3X) which associate the long capability
@@ -274,7 +278,8 @@ names with members of a \fBTERMTYPE\fP structure.
 .
 .SS EXTENDED NUMBER FORMAT
 On occasion, 16-bit signed integers are not large enough.
-With \fBncurses\fP 6.1, a new format was introduced by making a few changes
+With \fI\%ncurses\fP 6.1,
+a new format was introduced by making a few changes
 to the legacy format:
 .bP
 a different magic number (octal 01036)
@@ -331,7 +336,7 @@ terminfo format used by Solaris curses,
 except in a few less-used details
 where it was found that the latter did not match X/Open Curses.
 The format used by the other Unix versions
-can be matched by building ncurses
+can be matched by building \fI\%ncurses\fP
 with different configuration options.
 .SS Magic codes
 The magic number in a binary terminfo file is the first 16-bits (two bytes).
@@ -352,11 +357,11 @@ A small number of terminal descriptions use uppercase characters in
 their names.
 If the underlying filesystem ignores the difference between
 uppercase and lowercase,
-\fBncurses\fP represents the \*(``first character\*(''
+\fI\%ncurses\fP represents the \*(``first character\*(''
 of the terminal name used as
 the intermediate level of a directory tree in (two-character) hexadecimal form.
 .SS Limits
-\fBncurses\fP stores compiled terminal descriptions
+\fI\%ncurses\fP stores compiled terminal descriptions
 in three related formats,
 described in the sections
 .bP
@@ -369,8 +374,8 @@ described in the sections
 The legacy storage format and the extended number format differ by
 the types of numeric capability which they can store
 (i.e., 16-bit versus 32-bit integers).
-The extended storage format introduced by ncurses 5.0 adds data to
-either of these formats.
+The extended storage format introduced by \fI\%ncurses\fP 5.0 adds data
+to either of these formats.
 .PP
 Some limitations apply:
 .bP
@@ -432,11 +437,11 @@ lp-1f(\*(CW).
 .SH AUTHORS
 Thomas E. Dickey
 .br
-extended terminfo format for ncurses 5.0
+extended terminfo format for \fI\%ncurses\fP 5.0
 .br
-hashed database support for ncurses 5.6
+hashed database support for \fI\%ncurses\fP 5.6
 .br
-extended number support for ncurses 6.1
+extended number support for \fI\%ncurses\fP 6.1
 .sp
 Eric S. Raymond
 .br
diff --git a/man/terminfo.head b/man/terminfo.head
index 45475851c..d4989909f 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.55 2023/11/25 19:52:56 tom Exp $
-.TH terminfo 5 2023-11-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.57 2023/12/18 01:15:58 tom Exp $
+.TH terminfo 5 2023-12-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -75,7 +75,7 @@ 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.
 .PP
-This manual describes \fBncurses\fP
+This manual describes \fI\%ncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .SS Terminfo Entry Syntax
 Entries in
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 3560a461f..eba40996a 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,9 +27,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.137 2023/12/03 00:17:23 tom Exp $
+.\" $Id: terminfo.tail,v 1.139 2023/12/17 22:56:21 tom Exp $
 .ps +1
-.SS User-Defined Capabilities
+.SS "User-Defined Capabilities"
 .
 The preceding section listed the \fIpredefined\fP capabilities.
 They deal with some special features for terminals no longer
@@ -38,7 +38,8 @@ Occasionally there are special features of newer terminals which
 are awkward or impossible to represent by reusing the predefined
 capabilities.
 .PP
-\fBncurses\fP addresses this limitation by allowing user-defined capabilities.
+\fI\%ncurses\fP addresses this limitation by allowing user-defined
+capabilities.
 The \fB@TIC@\fP and \fB@INFOCMP@\fP programs provide
 the \fB\-x\fP option for this purpose.
 When \fB\-x\fP is set,
@@ -49,8 +50,8 @@ it infers its type (boolean, number or string) from the syntax
 and makes an extended table entry for that capability.
 The \fBuse_extended_names\fP(3X) function makes this information
 conditionally available to applications.
-The ncurses library provides the data leaving most of the behavior
-to applications:
+The \fI\%ncurses\fP library provides the data leaving most of the
+behavior to applications:
 .bP
 User-defined capability strings whose name begins
 with \*(``k\*('' are treated as function keys.
@@ -73,13 +74,14 @@ In particular, 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.
 .PP
-The ncurses library uses a few of these user-defined capabilities,
+The \fI\%ncurses\fP library uses a few of these user-defined
+capabilities,
 as described in \fBuser_caps\fR(5).
 Other user-defined capabilities (including function keys) are
 described in the terminal database, in the section on
 .I "NCURSES USER-DEFINABLE CAPABILITIES"
 .
-.SS A Sample Entry
+.SS "A Sample Entry"
 .
 The following entry, describing an ANSI-standard terminal, is representative
 of what a \fBterminfo\fP entry for a modern terminal typically looks like.
@@ -133,7 +135,7 @@ or the size of particular delays, and
 string
 capabilities, which give a sequence which can be used to perform particular
 terminal operations.
-.SS Types of Capabilities
+.SS "Types of Capabilities"
 All capabilities have names.
 For instance, the fact that
 ANSI-standard terminals have
@@ -243,8 +245,9 @@ For example, see the second
 in the example above.
 .br
 .ne 5
-.SS Fetching Compiled Descriptions
-Terminal descriptions in \fBncurses\fP are stored in terminal databases.
+.SS "Fetching Compiled Descriptions"
+Terminal descriptions in \fI\%ncurses\fP are stored in terminal
+databases.
 These databases, which are found by their pathname,
 may be configured either as directory trees or hashed databases
 (see \fBterm\fR(5)),
@@ -252,16 +255,16 @@ may be configured either as directory trees or hashed databases
 The library uses a compiled-in list of pathnames,
 which can be overridden by environment variables.
 Before starting to search,
-\fBncurses\fP checks the search list,
+\fI\%ncurses\fP checks the search list,
 eliminating duplicates and pathnames where no terminal database is found.
-The \fBncurses\fP library reads the first description
+The \fI\%ncurses\fP library reads the first description
 which passes its consistency checks.
 .bP
 The environment variable \fBTERMINFO\fR is checked first, for
 a terminal database containing the terminal description.
 .bP
 Next,
-\fBncurses\fP looks in \fI$HOME/.terminfo\fP
+\fI\%ncurses\fP looks in \fI$HOME/.terminfo\fP
 for a compiled description.
 .IP
 This is an optional feature which may be omitted entirely from
@@ -269,14 +272,14 @@ the library, or limited to prevent accidental use by privileged applications.
 .bP
 Next,
 if the environment variable \fI\%TERMINFO_DIRS\fP is set,
-\fBncurses\fP interprets the contents of that variable
+\fI\%ncurses\fP interprets the contents of that variable
 as a list of colon-separated pathnames of terminal databases to be searched.
 .IP
 An empty pathname (i.e., if the variable begins or ends
 with a colon, or contains adjacent colons)
 is interpreted as the system location \fI\*d\fP.
 .bP
-Finally, \fBncurses\fP searches these compiled-in locations:
+Finally, \fI\%ncurses\fP searches these compiled-in locations:
 .RS
 .bP
 a list of directories (@TERMINFO_DIRS@), and
@@ -287,22 +290,23 @@ the system terminfo directory, \fI\*d\fP
 The \fBTERMINFO\fP variable can contain a terminal description instead
 of the pathname of a terminal database.
 If this variable begins with \*(``hex:\*('' or \*(``b64:\*(''
-then \fBncurses\fP reads a terminal description from
+then \fI\%ncurses\fP reads a terminal description from
 hexadecimal- or base64-encoded data,
 and if that description matches the name sought, will use that.
 This encoded data can be set using the \*(``\-Q\*('' option of
 \fB@TIC@\fR or \fB@INFOCMP@\fR.
 .PP
-The preceding addresses the usual configuration of \fBncurses\fP,
+The preceding addresses the usual configuration of \fI\%ncurses\fP,
 which uses terminal descriptions prepared in \fIterminfo\fP format.
 While \fItermcap\fP is less expressive,
-\fBncurses\fP can also be configured to read \fItermcap\fP descriptions.
+\fI\%ncurses\fP can also be configured to read \fItermcap\fP
+descriptions.
 In that configuration,
 it checks the \fI\%TERMCAP\fP and \fI\%TERMPATH\fP variables
 (for content and search path,
 respectively)
 after the system terminal database.
-.SS Preparing Descriptions
+.SS "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
@@ -323,7 +327,7 @@ 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.
-.SS Basic Capabilities
+.SS "Basic Capabilities"
 The number of columns on each line for the terminal is given by the
 \fBcols\fP numeric capability.
 If the terminal is a \s-1CRT\s0, then the
@@ -450,7 +454,7 @@ while the Lear Siegler \s-1ADM-3\s0 is described as
         ind=\*^J, lines#24,\s+1
 .\".in +2
 .EE
-.SS Parameterized Strings
+.SS "Parameterized Strings"
 Cursor addressing and other strings requiring parameters
 in the terminal are described by a
 parameterized string capability,
@@ -532,18 +536,20 @@ Solaris XPG4 curses does not distinguish between \fIdynamic\fP and
 They are the same.
 Like SVr4 curses, XPG4 curses does not initialize these explicitly.
 .bP
-Before version 6.3, ncurses stores both \fIdynamic\fP and \fIstatic\fP
+Before version 6.3,
+\fI\%ncurses\fP stores both \fIdynamic\fP and \fIstatic\fP
 variables in persistent storage, initialized to zeros.
 .bP
-Beginning with version 6.3, ncurses stores \fIstatic\fP and \fIdynamic\fP
+Beginning with version 6.3,
+\fI\%ncurses\fP stores \fIstatic\fP and \fIdynamic\fP
 variables in the same manner as SVr4.
 .RS
 .bP
-Unlike other implementations, ncurses zeros dynamic variables
+Unlike other implementations, \fI\%ncurses\fP zeros dynamic variables
 before the first \fB%g\fP or \fB%P\fP operator.
 .bP
 Like SVr2,
-the scope of dynamic variables in ncurses
+the scope of dynamic variables in \fI\%ncurses\fP
 is within the current call to
 \fBtparm\fP.
 Use static variables if persistent storage is needed.
@@ -637,7 +643,7 @@ 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 using the stack.
-.SS Cursor Motions
+.SS "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
 \fBhome\fP; similarly a fast way of getting to the lower left-hand corner
@@ -814,7 +820,7 @@ When setting margins, the line- and column-values are zero-based.
 The \fBmgc\fP string capability should be defined.
 Applications such as \fBtabs\fP(1) rely upon this to reset all margins.
 .\"
-.SS Area Clears
+.SS "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 \fBel\fP.
 If the terminal can clear from the beginning of the line to the current
@@ -828,7 +834,7 @@ if a true
 .B ed
 is not available.)
 .\"
-.SS Insert/delete line and vertical motions
+.SS "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 \fBil1\fP; this is done only from the first
 position of a line.
@@ -861,7 +867,7 @@ and
 .B 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 \fBncurses\fP(3X) library does this synthesis
+(Note that the \fB\%ncurses\fP(3X) library does this synthesis
 automatically, so you need not compose insert/delete strings for
 an entry with \fBcsr\fP).
 .PP
@@ -905,7 +911,7 @@ below, then \fBdb\fP should be given.
 These indicate
 that deleting a line or scrolling may bring non-blank lines up from below
 or that scrolling back with \fBri\fP may bring down non-blank lines.
-.SS Insert/Delete Character
+.SS "Insert/Delete Character"
 There are two basic kinds of intelligent terminals with respect to
 insert/delete character which can be described using
 .I terminfo.
@@ -1182,7 +1188,7 @@ If a character overstriking another leaves both characters on the screen,
 specify the capability \fBos\fP.
 If overstrikes are erasable with a blank,
 then this should be indicated by giving \fBeo\fP.
-.SS Keypad and Function Keys
+.SS "Keypad and Function Keys"
 If the terminal has a keypad that transmits codes when the keys are pressed,
 this information can be given.
 Note that it is not possible to handle
@@ -1289,7 +1295,7 @@ If there are commands to turn the labels on and off,
 give them in \fBsmln\fP and \fBrmln\fP.
 \fBsmln\fP is normally output after one or more pln
 sequences to make sure that the change becomes visible.
-.SS Tabs and Initialization
+.SS "Tabs and Initialization"
 A few capabilities are used only for tabs:
 .bP
 If the terminal has hardware tabs, the command to advance to the next
@@ -1473,7 +1479,7 @@ use the
 \fBhts\fP (\fBset_tab\fP) capabilities directly
 only when the \fBit\fP (\fBinit_tabs\fP) capability
 is set to a value other than \fIeight\fP.
-.SS Delays and Padding
+.SS "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).
@@ -1501,7 +1507,7 @@ then this can be given as \fBpad\fP.
 Only the first character of the
 .B pad
 string is used.
-.SS Status Lines
+.SS "Status Lines"
 Some terminals have an extra \*(``status line\*('' which is not normally used by
 software (and thus not counted in the terminal's \fBlines\fP capability).
 .PP
@@ -1533,9 +1539,10 @@ A command to erase or blank the status line may be specified as \fBdsl\fP.
 The boolean capability \fBeslok\fP specifies that escape sequences, tabs,
 etc., work ordinarily in the status line.
 .PP
-The \fBncurses\fP implementation does not yet use any of these capabilities.
+The \fI\%ncurses\fP implementation does not yet use any of these
+capabilities.
 They are documented here in case they ever become important.
-.SS Line Graphics
+.SS "Line Graphics"
 Many terminals have alternate character sets useful for forms-drawing.
 Terminfo and \fBcurses\fP have built-in support
 for most of the drawing characters
@@ -1610,7 +1617,7 @@ to a copy of this table for your terminal, giving the character which
 as the corresponding graphic.
 Then read off the VT100/your terminal
 character pairs right to left in sequence; these become the ACSC string.
-.SS Color Handling
+.SS "Color Handling"
 The curses library functions \fBinit_pair\fP and \fBinit_color\fP
 manipulate the \fIcolor pairs\fP and \fIcolor values\fP discussed in this
 section
@@ -1623,21 +1630,21 @@ 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 \fIN\fP\ *\ \fIN\fP color-pairs.
+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 \fIM\fP color-pairs may be set up from 2*\fIM\fP different colors.
+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
 capabilities \fBcolors\fP and \fBpairs\fP specify the maximum numbers of colors
-and color-pairs that can be displayed simultaneously.
+and color pairs that can be displayed simultaneously.
 The \fBop\fP (original
 pair) string resets foreground and background colors to their default values
 for the terminal.
-The \fBoc\fP string resets all colors or color-pairs to
+The \fBoc\fP 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
@@ -1668,7 +1675,7 @@ The \fBsetaf\fP/\fBsetab\fP and \fBsetf\fP/\fBsetb\fP capabilities take a
 single numeric argument each.
 Argument values 0-7 of \fBsetaf\fP/\fBsetab\fP are portably defined as
 follows (the middle column is the symbolic #define available in the header for
-the \fBcurses\fP or \fBncurses\fP libraries).
+the \fBcurses\fP or \fI\%ncurses\fP libraries).
 The terminal hardware is free to
 map these as it likes, but the RGB values indicate normal locations in color
 space.
@@ -1711,7 +1718,7 @@ white	COLOR_WHITE	7	max,	max,	max
 It is important to not confuse the two sets of color capabilities;
 otherwise red/blue will be interchanged on the display.
 .PP
-On an HP-like terminal, use \fBscp\fP with a color-pair number parameter to set
+On an HP-like terminal, use \fBscp\fP with a color pair number parameter to set
 which color pair is current.
 .PP
 Some terminals allow the \fIcolor values\fP to be modified:
@@ -1729,8 +1736,8 @@ The ranges are
 terminal-dependent.
 .bP
 On an HP-like terminal, \fBinitp\fP may give a capability for changing a
-color-pair value.
-It will take seven parameters; a color-pair number (0 to
+color pair value.
+It will take seven parameters; a color pair number (0 to
 \fBmax_pairs\fP \- 1), and two triples describing first background and then
 foreground colors.
 These parameters must be (Red, Green, Blue) or
@@ -1739,7 +1746,7 @@ These parameters must be (Red, Green, Blue) or
 On some color terminals, colors collide with highlights.
 You can register
 these collisions with the \fBncv\fP capability.
-This is a bit-mask of
+This is a bit mask of
 attributes not to be used when colors are enabled.
 The correspondence with the
 attributes understood by \fBcurses\fP is as follows:
@@ -1773,16 +1780,19 @@ foreground color blue and is not available in color mode.
 These should have
 an \fBncv\fP capability of 2.
 .PP
-SVr4 curses does nothing with \fBncv\fP, ncurses recognizes it and optimizes
+SVr4 curses does nothing with \fBncv\fP,
+\fI\%ncurses\fP recognizes it and optimizes
 the output in favor of colors.
 .SS 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 string is used.
 If the terminal does not have a pad character, specify npc.
-Note that ncurses implements the termcap-compatible \fBPC\fP variable;
+Note that \fI\%ncurses\fP implements the termcap-compatible \fBPC\fP
+variable;
 though the application may set this value to something other than
-a null, ncurses will test \fBnpc\fP first and use napms if the terminal
+a null,
+\fI\%ncurses\fP will test \fBnpc\fP first and use napms if the terminal
 has no pad character.
 .PP
 If the terminal can move up or down half a line,
@@ -1882,7 +1892,7 @@ All text, including
 is transparently passed to the printer while an
 .B mc5p
 is in effect.
-.SS Glitches and Braindamage
+.SS "Glitches and Brain Damage"
 Hazeltine terminals,
 which do not allow \*(``\*~\*('' characters to be displayed should
 indicate \fBhz\fP.
@@ -1905,7 +1915,7 @@ 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 necessary to use
 delete and insert line.
-The ncurses implementation ignores this glitch.
+The \fI\%ncurses\fP implementation ignores this glitch.
 .PP
 The Beehive Superbee, which is unable to correctly transmit the escape
 or control/C characters, has
@@ -1917,7 +1927,7 @@ Note that in older terminfo versions, this capability was called
 .PP
 Other specific terminal problems may be corrected by adding more
 capabilities of the form \fBx\fIx\fR.
-.SS Pitfalls of Long Entries
+.SS "Pitfalls of Long Entries"
 Long terminfo entries are unlikely to be a problem; to date, no entry has even
 approached terminfo's 4096-byte string-table maximum.
 Unfortunately, the termcap
@@ -1999,20 +2009,16 @@ If it is too long even before
 terminal types and users whose \fITERM\fP variable does not have a termcap
 entry.
 .PP
-When in \-C (translate to termcap) mode, the \fBncurses\fP implementation of
+When in \-C (translate to termcap) mode,
+the \fI\%ncurses\fP implementation of
 \fB@TIC@\fP(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.
-.SH PORTABILITY
-Do not count on compiled (binary) \fI\%terminfo\fP entries being
-portable between commercial Unix systems.
-At least two implementations of \fI\%terminfo\fP
-(those of HP-UX and AIX)
-diverged from those of other System V Unices after SVr1,
-adding extension capabilities to the string table that
-(in the binary format)
-collide with subsequent System V and XSI Curses extensions.
+.SH FILES
+.TP
+.I \*d
+compiled terminal description database directory
 .SH EXTENSIONS
 Searching for terminal descriptions in
 \fI$HOME/.terminfo\fP and \fI\%TERMINFO_DIRS\fP
@@ -2024,14 +2030,15 @@ interpret the %A and %O operators in parameter strings.
 SVr4/XPG4 do not specify whether \fBmsgr\fP 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 \fBncurses\fP implementation ignores \fBmsgr\fP in \fBALTCHARSET\fP
-mode.
+The \fI\%ncurses\fP implementation ignores \fBmsgr\fP in
+\fBALTCHARSET\fP mode.
 This raises the possibility that an XPG4
 implementation making the opposite interpretation may need terminfo
-entries made for \fBncurses\fP to have \fBmsgr\fP turned off.
+entries made for \fI\%ncurses\fP to have \fBmsgr\fP turned off.
 .PP
-The \fBncurses\fP library handles insert-character and insert-character modes
-in a slightly non-standard way to get better update efficiency.
+The \fI\%ncurses\fP library handles insert-character and
+insert-character modes in a slightly non-standard way to get better
+update efficiency.
 See
 the \fBInsert/Delete Character\fP subsection above.
 .PP
@@ -2041,7 +2048,7 @@ They are deduced from the
 documentation for the AT&T 505 terminal.
 .PP
 Be careful assigning the \fBkmous\fP capability.
-The \fBncurses\fP library wants to interpret it as \fBKEY_MOUSE\fP,
+The \fI\%ncurses\fP library wants to interpret it as \fBKEY_MOUSE\fP,
 for use by terminals and emulators like xterm
 that can return mouse-tracking information in the keyboard-input stream.
 .PP
@@ -2093,10 +2100,15 @@ plus function keys 11 through 63,
 plus a number of incompatible string table extensions.
 .bP
 OSF/1 supports both the SVr4 set and the AIX extensions.
-.SH FILES
-.TP
-.I \*d
-compiled terminal description database directory
+.SH PORTABILITY
+Do not count on compiled (binary) \fI\%terminfo\fP entries being
+portable between commercial Unix systems.
+At least two implementations of \fI\%terminfo\fP
+(those of HP-UX and AIX)
+diverged from those of other System V Unices after SVr1,
+adding extension capabilities to the string table that
+(in the binary format)
+collide with subsequent System V and XSI Curses extensions.
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
diff --git a/man/tic.1m b/man/tic.1m
index b9a50b37e..384d8d629 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.103 2023/12/02 20:50:53 tom Exp $
-.TH @TIC@ 1M 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.104 2023/12/16 20:33:11 tom Exp $
+.TH @TIC@ 1M 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -86,7 +86,7 @@ x\
 The \fB@TIC@\fP command translates a \fBterminfo\fP file from source
 format into compiled format.
 The compiled format is necessary for use with
-the library routines in \fBncurses\fP(3X).
+the library routines in \fB\%ncurses\fP(3X).
 .PP
 As described in \fBterm\fP(5), the database may be either a directory
 tree (one file per terminal entry) or a hashed database (one record per entry).
@@ -242,7 +242,7 @@ rather than their decimal equivalents.
 Force source translation to terminfo format.
 .TP
 \fB\-K\fP
-Suppress some longstanding ncurses extensions to termcap format,
+Suppress some longstanding \fI\%ncurses\fP extensions to termcap format,
 e.g., "\es" for space.
 .TP
 \fB\-L\fP
@@ -331,7 +331,8 @@ Normally, it infers data which is commonly missing in older terminfo data,
 or in termcaps.
 .TP
 \fB\-V\fP
-reports the version of ncurses which was used in this program, and exits.
+reports the version of \fI\%ncurses\fP which was used in this program,
+and exits.
 .TP
 \fB\-v\fIn\fR
 specifies that (verbose) output be written to standard error trace
@@ -341,7 +342,8 @@ The optional parameter \fIn\fP is a number from 1 to 9, inclusive,
 indicating the desired level of detail of information.
 .RS
 .bP
-If ncurses is built without tracing support, the optional parameter is ignored.
+If \fI\%ncurses\fP is built without tracing support,
+the optional parameter is ignored.
 .bP
 If \fIn\fP is omitted, the default level is 1.
 .bP
@@ -500,7 +502,7 @@ are not supported by SVr4 \fBtic\fP:
 \fB\-x\fP
 .RE
 .bP
-The NetBSD \fBtic\fP  supports a few of the ncurses options
+The NetBSD \fBtic\fP supports a few of the \fI\%ncurses\fP options
 .sp
 .RS
 \fB\-a\fP
@@ -527,7 +529,7 @@ According to its manual pages, that system also supported the \fB\-v\fP option.
 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
+\fI\%ncurses\fP
 and NetBSD curses.
 The SVr4 \fBtic\fP programs all support the \fB\-v\fP option.
 The NetBSD \fBtic\fP program follows X/Open's documentation,
@@ -559,7 +561,7 @@ 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),
+In early development of \fI\%ncurses\fP (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).
@@ -569,7 +571,7 @@ The exceptions were
 \fB\%memory_lock_above\fP and
 \fB\%memory_unlock\fP (see \fB\%user_caps\fP(5)).
 .PP
-Eric Raymond incorporated parts of \fImytinfo\fP into ncurses
+Eric Raymond incorporated parts of \fImytinfo\fP into \fI\%ncurses\fP
 to implement the termcap-to-terminfo source conversion,
 and extended that to begin development of
 the corresponding terminfo-to-termcap source conversion,
@@ -580,7 +582,7 @@ to support user-defined capabilities.
 .PP
 In 2010, Roy Marples provided a \fBtic\fP program
 and terminfo library for NetBSD.
-That implementation adapts several features from ncurses,
+That implementation adapts several features from \fI\%ncurses\fP,
 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
@@ -589,18 +591,20 @@ Continued development provides additional checks:
 .bP
 \fIpcurses\fP had 8 warnings
 .bP
-ncurses in 1996 had 16 warnings
+\fI\%ncurses\fP 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
+\fI\%ncurses\fP 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.
+The checking done in \fI\%ncurses\fP' \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;
+There are 527 distinct capabilities in \fI\%ncurses\fP' terminal
+database;
 128 of those are user-defined.
 .SH AUTHORS
 Eric S. Raymond <esr@snark.thyrsus.com>
diff --git a/man/toe.1m b/man/toe.1m
index 0a462b9dd..47fb61e75 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.58 2023/12/02 20:49:04 tom Exp $
-.TH @TOE@ 1M 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.59 2023/12/16 21:01:59 tom Exp $
+.TH @TOE@ 1M 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,9 +71,9 @@ list table of entries of \fIterminfo\fR terminal types
 \fB\%@TOE@\fP reports to the standard output stream the (primary) names
 and descriptions of the terminal types available to the \fIterminfo\fP
 library.
-Each \fIdirectory\fP operand is scanned;
+Each \fIdirectory\fP is scanned;
 if none are given,
-\fB\%@TOE@\fP scans the the default \fIterminfo\fP directory.
+\fB\%@TOE@\fP scans the default \fIterminfo\fP directory.
 .SH OPTIONS
 The \fB\-h\fP option can be helpful to observe where \fB\%@TOE@\fP is
 looking for terminal descriptions.
@@ -132,11 +132,11 @@ showing \fB\%@TOE@\fP's progress.
 .IP
 The optional parameter \fIn\fP is an integer between 1 and 10 inclusive,
 interpreted as for \fB\%@TIC@\fP(1M).
-If \fIncurses\fP is built without tracing support,
+If \fI\%ncurses\fP is built without tracing support,
 \fIn\fP is ignored.
 .TP
 \fB\-V\fP
-reports the version of \fIncurses\fP associated
+reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
 .SH FILES
 .TP
@@ -147,7 +147,7 @@ compiled terminal description database
 There is no applicable X/Open or POSIX standard for it.
 .PP
 It replaces a \fB\-T\fP option that was briefly supported by
-the \fIncurses\fP \fB\%infocmp\fP utility in 1995.
+the \fI\%ncurses\fP \fB\%infocmp\fP utility in 1995.
 .PP
 The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011,
 respectively.
diff --git a/man/tput.1 b/man/tput.1
index a4da5d049..3811e6ad4 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.91 2023/12/02 20:49:04 tom Exp $
-.TH @TPUT@ 1 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.92 2023/12/16 20:32:22 tom Exp $
+.TH @TPUT@ 1 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -119,7 +119,8 @@ If \fB\-T\fP is specified, then the shell
 variables \fILINES\fP and \fI\%COLUMNS\fP will also be ignored.
 .TP
 \fB\-V\fP
-reports the version of ncurses which was used in this program, and exits.
+reports the version of \fI\%ncurses\fP which was used in this program,
+and exits.
 .TP
 .B \-x
 prevents \fB\%@TPUT@\fP from attempting to clear the scrollback buffer.
@@ -248,7 +249,8 @@ If \fB@TPUT@\fP is invoked by a link named \fBreset\fP, this has the
 same effect as \fB@TPUT@ reset\fP.
 The \fB@TSET@\fP(1) utility also treats a link named \fBreset\fP specially.
 .PP
-Before ncurses 6.1, the two utilities were different from each other:
+Before \fI\%ncurses\fP 6.1,
+the two utilities were different from each other:
 .bP
 \fB@TSET@\fP utility reset the terminal modes and special characters
 (not done with \fB@TPUT@\fP).
@@ -261,8 +263,8 @@ in contrast to the tab-stops and margins which are set by this utility.
 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.
+With the changes made for \fI\%ncurses\fP 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,
@@ -383,7 +385,7 @@ before falling back to \*(``/dev/tty\*('' and finally just assumes
 a 1200Bd terminal.
 When updating terminal modes, it ignores errors.
 .IP
-Until changes made after ncurses 6.0,
+Until changes made after \fI\%ncurses\fP 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
@@ -405,11 +407,11 @@ function to analyze nonstandard \fIcapname\fP operands.
 .IP
 Besides providing more reliable operation than AT&T's utility,
 a portability problem is introduced by this analysis:
-An OpenBSD developer adapted the internal library function from ncurses
-to port NetBSD's termcap-based \fBtput\fP to terminfo.
+An OpenBSD developer adapted the internal library function from
+\fI\%ncurses\fP to port NetBSD's termcap-based \fBtput\fP to terminfo.
 That had been modified to interpret multiple commands on a line.
 Portable applications should not rely upon this feature;
-ncurses provides it to support applications written
+\fI\%ncurses\fP provides it to support applications written
 specifically for OpenBSD.
 .PP
 This implementation (unlike others) can accept both \fItermcap\fP
@@ -454,7 +456,7 @@ than terminfo capability names in their respective \fBtput\fP commands.
 Since 2010, NetBSD's \fBtput\fP uses terminfo names.
 Before that, it (like FreeBSD) recognized termcap names.
 .IP
-Beginning in 2021, FreeBSD uses the ncurses \fBtput\fP,
+Beginning in 2021, FreeBSD uses the \fI\%ncurses\fP \fBtput\fP,
 configured for both terminfo (tested first) and termcap (as a fallback).
 .PP
 Because (apparently) \fIall\fP of the certified Unix systems
@@ -490,10 +492,10 @@ confusing the \fB\-1\fP written to the standard output for an absent
 or cancelled numeric value versus an (unsigned) exit code.
 .PP
 The various Unix systems (AIX, HP-UX, Solaris) use the same exit-codes
-as ncurses.
+as \fI\%ncurses\fP.
 .PP
 NetBSD curses documents different exit codes which do not correspond
-to either ncurses or X/Open.
+to either \fI\%ncurses\fP or X/Open.
 .SH HISTORY
 The \fBtput\fP command was begun by Bill Joy in 1980.
 The initial version only cleared the screen.
@@ -537,7 +539,7 @@ AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on
 Ridge's program made more sophisticated use of the terminal capabilities
 than the BSD program.
 Eric Raymond used that \fBtput\fP program
-(and other parts of \fImytinfo\fP) in ncurses in June 1995.
+(and other parts of \fImytinfo\fP) in \fI\%ncurses\fP in June 1995.
 Using the portions dealing with terminal capabilities
 almost without change,
 Raymond made improvements to the way the command-line parameters
diff --git a/man/tset.1 b/man/tset.1
index ec9610932..4621c8cfa 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.77 2023/12/02 20:52:24 tom Exp $
-.TH @TSET@ 1 2023-12-02 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.78 2023/12/16 20:32:22 tom Exp $
+.TH @TSET@ 1 2023-12-16 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -277,7 +277,8 @@ Print the sequence of shell commands to initialize the environment variable
 see subsection \*(``Setting the Environment\*(''.
 .TP
 .B \-V
-reports the version of ncurses which was used in this program, and exits.
+reports the version of \fI\%ncurses\fP which was used in this program,
+and exits.
 .TP
 .B \-w
 Resize the window to match the size deduced via \fBsetupterm\fP(3X).
@@ -337,7 +338,7 @@ with a few exceptions we shall consider now.
 .PP
 A few options are different
 because the \fI\%TERMCAP\fP variable
-is no longer supported under terminfo-based \fBncurses\fP:
+is no longer supported under terminfo-based \fI\%ncurses\fP:
 .bP
 The \fB\-S\fP option of BSD \fBtset\fP no longer works;
 it prints an error message to the standard error and dies.
@@ -387,7 +388,7 @@ In 4.4BSD, \fBtset\fP uses the window size from the termcap description
 to set the window size if \fBtset\fP is not able to obtain the window
 size from the operating system.
 .bP
-In ncurses, \fB@TSET@\fP obtains the window size using
+In \fI\%ncurses\fP, \fB@TSET@\fP obtains the window size using
 \fBsetupterm\fP, which may be from
 the operating system,
 the \fILINES\fP and \fICOLUMNS\fP environment variables or
diff --git a/man/user_caps.5 b/man/user_caps.5
index 7ffd4b31e..033f9d464 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.41 2023/10/07 21:19:07 tom Exp $
-.TH user_caps 5 2023-10-07 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.42 2023/12/16 20:32:22 tom Exp $
+.TH user_caps 5 2023-12-16 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -54,7 +54,7 @@ user-defined \fIterminfo\fR capability format
 .B @TIC@ \-x
 .SH DESCRIPTION
 .SS Background
-Before ncurses 5.0,
+Before \fI\%ncurses\fP 5.0,
 terminfo databases used a \fIfixed repertoire\fP of terminal
 capabilities designed for the SVr2 terminal database in 1984,
 and extended in stages through SVr4 (1989),
@@ -88,22 +88,24 @@ Although they \fImay\fP provide all of the standard capability names,
 the position in the tables differs because some features were added as needed,
 while others were added (out of order) to comply with X/Open Curses.
 .IP
-While ncurses' repertoire of predefined capabilities is closest to Solaris,
+While \fI\%ncurses\fP' repertoire of predefined capabilities is closest
+to Solaris,
 Solaris's terminfo database has a few differences from
 the list published by X/Open Curses.
-For example, ncurses can be configured with tables which match the
-terminal databases for AIX, HP-UX or OSF/1,
+For example,
+\fI\%ncurses\fP can be configured with tables which match the terminal
+databases for AIX, HP-UX or OSF/1,
 rather than the default Solaris-like configuration.
 .bP
-In SVr4 curses and ncurses,
+In SVr4 curses and \fI\%ncurses\fP,
 the terminal database is defined at compile-time using a text file
 which lists the different terminal capabilities.
 .IP
 In principle, the text-file can be extended,
 but doing this requires recompiling and reinstalling the library.
-The text-file used in ncurses for terminal capabilities includes
+The text-file used in \fI\%ncurses\fP for terminal capabilities includes
 details for various systems past the documented X/Open Curses features.
-For example, ncurses supports these capabilities in each configuration:
+For example, \fI\%ncurses\fP supports these capabilities in each configuration:
 .RS 8
 .TP 5
 memory_lock
@@ -138,16 +140,16 @@ it could represent larger numbers.
 Although termcap's extensibility was rarely used
 (it was never the \fIspeaker\fP who had actually used the feature),
 the criticism had a point.
-ncurses 5.0 provided a way to detect nonstandard capabilities,
+\fI\%ncurses\fP 5.0 provided a way to detect nonstandard capabilities,
 determine their
 type and optionally store and retrieve them in a way which did not interfere
 with other applications.
 These are referred to as \fIuser-defined capabilities\fP because no
 modifications to the toolset's predefined capability names are needed.
 .PP
-The ncurses utilities \fB@TIC@\fP and \fB@INFOCMP@\fP have a command-line
-option \*(``\-x\*('' to control whether the nonstandard capabilities
-are stored or retrieved.
+The \fI\%ncurses\fP utilities \fB@TIC@\fP and \fB@INFOCMP@\fP have a
+command-line option \*(``\-x\*('' to control whether the nonstandard
+capabilities are stored or retrieved.
 A library function \fBuse_extended_names\fP
 is provided for the same purpose.
 .PP
@@ -155,7 +157,7 @@ When compiling a terminal database, if \*(``\-x\*('' is set,
 \fB@TIC@\fP will store a user-defined capability if the capability name is not
 one of the predefined names.
 .PP
-Because ncurses provides a termcap library interface,
+Because \fI\%ncurses\fP provides a termcap library interface,
 these user-defined capabilities may be visible to termcap applications:
 .bP
 The termcap interface (like all implementations of termcap)
@@ -177,16 +179,16 @@ While terminfo and termcap have a set of 60 predefined function-key names,
 to which a series of keys can be assigned,
 that is insufficient for more than a dozen keys multiplied by more than
 a couple of modifier combinations.
-The ncurses database uses a convention based on \fBxterm\fP(1) to
-provide extended special-key names.
+The \fI\%ncurses\fP database uses a convention based on \fBxterm\fP(1)
+to provide extended special-key names.
 .IP
 Fitting that into termcap's limitation of 2-character names
 would be pointless.
 These extended keys are available only with terminfo.
 .SS Recognized capabilities
-The ncurses library uses the user-definable capabilities.
+The \fI\%ncurses\fP library uses the user-definable capabilities.
 While the terminfo database may have other extensions,
-ncurses makes explicit checks for these:
+\fI\%ncurses\fP makes explicit checks for these:
 .RS 3
 .TP 3
 AX
@@ -204,7 +206,8 @@ The command \*(``\fBtput clear\fP\*('' does the same thing.
 .TP 3
 NQ
 \fIboolean\fP,
-used to suppress a consistency check in @TIC@ for the ncurses capabilities
+used to suppress a consistency check in @TIC@ for the \fI\%ncurses\fP
+capabilities
 in user6 through user9 (u6, u7, u8 and u9)
 which tell how to query the terminal's cursor position
 and its device attributes.
@@ -219,21 +222,23 @@ This capability allows the \fBcolor_content\fP function to
 return appropriate values without requiring the application
 to initialize colors using \fBinit_color\fP.
 .IP
-The capability type determines the values which ncurses sees:
+The capability type determines the values which \fI\%ncurses\fP sees:
 .RS 3
 .TP 3
 \fIboolean\fP
 implies that the number of bits for red, green and blue are the same.
 Using the maximum number of colors,
-ncurses adds two, divides that sum by three, and assigns the result
-to red, green and blue in that order.
+\fI\%ncurses\fP adds two,
+divides that sum by three,
+and assigns the result to red,
+green and blue in that order.
 .IP
 If the number of bits needed for the number of colors is not a multiple
 of three, the blue (and green) components lose in comparison to red.
 .TP 3
 \fInumber\fP
-tells ncurses what result to add to red, green and blue.
-If ncurses runs out of bits,
+tells \fI\%ncurses\fP what result to add to red, green and blue.
+If \fI\%ncurses\fP runs out of bits,
 blue (and green) lose just as in the \fIboolean\fP case.
 .TP 3
 \fIstring\fP
@@ -249,27 +254,29 @@ to represent the standard eight ANSI colors, i.e., one bit per color.
 .TP 3
 U8
 \fInumber\fP,
-asserts that ncurses must use Unicode values for line-drawing characters,
+asserts that \fI\%ncurses\fP must use Unicode values for line-drawing
+characters,
 and that it should ignore the alternate character set capabilities
 when the locale uses UTF-8 encoding.
 For more information, see the discussion of
-\fBNCURSES_NO_UTF8_ACS\fP in \fBncurses\fP(3X).
+\fBNCURSES_NO_UTF8_ACS\fP in \fB\%ncurses\fP(3X).
 .IP
 Set this capability to a nonzero value to enable it.
 .TP 3
 XM
 \fIstring\fP,
-override ncurses's built-in string which
+override \fI\%ncurses\fP's built-in string which
 enables/disables \fBxterm\fP(1) mouse mode.
 .IP
-ncurses sends a character sequence to the terminal to initialize mouse mode,
+\fI\%ncurses\fP sends a character sequence to the terminal to initialize mouse mode,
 and when the user clicks the mouse buttons or (in certain modes) moves the
 mouse, handles the characters sent back by the terminal to tell it what
 was done with the mouse.
 .IP
 The mouse protocol is enabled when
 the \fImask\fP passed in the \fBmousemask\fP function is nonzero.
-By default, ncurses handles the responses for the X11 xterm mouse protocol.
+By default,
+\fI\%ncurses\fP handles the responses for the X11 xterm mouse protocol.
 It also knows about the \fISGR 1006\fP xterm mouse protocol,
 but must to be told to look for this specifically.
 It will not be able to guess which mode is used,
@@ -278,7 +285,7 @@ because the responses are enough alike that only confusion would result.
 The \fBXM\fP capability has a single parameter.
 If nonzero, the mouse protocol should be enabled.
 If zero, the mouse protocol should be disabled.
-ncurses inspects this capability if it is present,
+\fI\%ncurses\fP inspects this capability if it is present,
 to see whether the 1006 protocol is used.
 If so, it expects the responses to use the \fISGR 1006\fP xterm mouse protocol.
 .IP
@@ -348,14 +355,15 @@ There is no standard for what those keys can send.
 Since 1999, \fBxterm\fP(1) has supported
 \fIshift\fP, \fIcontrol\fP, \fIalt\fP, and \fImeta\fP modifiers which produce
 distinct special-key strings.
-In a terminal description, ncurses has no special knowledge of the
-modifiers used.
+In a terminal description,
+\fI\%ncurses\fP has no special knowledge of the modifiers used.
 Applications can use the \fInaming convention\fP established for \fBxterm\fP
 to find these special keys in the terminal description.
 .PP
 Starting with the curses convention that \fIkey names\fP begin with \*(``k\*(''
 and that shifted special keys are an uppercase name,
-ncurses' terminal database defines these names to which a suffix is added:
+\fI\%ncurses\fP' terminal database defines these names to which a suffix
+is added:
 .PP
 .RS 5
 .TS
@@ -402,8 +410,9 @@ _
 .RE
 .PP
 None of these are predefined; terminal descriptions can refer to \fInames\fP
-which ncurses will allocate at runtime to \fIkey-codes\fP.
-To use these keys in an ncurses program, an application could do this:
+which \fI\%ncurses\fP will allocate at runtime to \fIkey-codes\fP.
+To use these keys in an \fI\%ncurses\fP program,
+an application could do this:
 .bP
 using a list of extended key \fInames\fP,
 ask \fBtigetstr\fP(3X) for their values, and
@@ -421,7 +430,7 @@ but makes no use of these capabilities itself.
 .SH AUTHORS
 Thomas E. Dickey
 .br
-beginning with ncurses 5.0 (1999)
+beginning with \fI\%ncurses\fP 5.0 (1999)
 .\"
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 91709614a..9f9cb5450 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1083 $
-#	$Date: 2023/12/09 18:07:12 $
+#	$Revision: 1.1085 $
+#	$Date: 2023/12/16 13:48:44 $
 #
 # 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
@@ -6130,7 +6130,7 @@ xterm-sun|xterm with sunFunctionKeys true,
 	kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
 	use=xterm+nofkeys, use=xterm+nopcfkeys,
 xterms-sun|small (80x24) xterm with sunFunctionKeys true,
-	cols#80, lines#24, use=xterm-sun,
+	use=xterm-sun,
 
 #### GNOME (VTE)
 # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0
@@ -8863,7 +8863,7 @@ sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs,
 sun-48|Sun 48-line window,
 	cols#80, lines#48, use=sun,
 sun-34|Sun 34-line window,
-	cols#80, lines#34, use=sun,
+	use=sun,
 sun-24|Sun 24-line window,
 	cols#80, lines#24, use=sun,
 sun-17|Sun 17-line window,
@@ -19983,7 +19983,7 @@ ndr9500-mc|NDR 9500 with magic cookies (enables underline inverse video invisibl
 	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,
-	sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500,
+	smso=\EG4, smul=\EG8, use=ndr9500,
 
 ndr9500-25-mc|NDR 500 with 25 lines and magic cookies,
 	lines#25, use=ndr9500-mc,
@@ -21656,7 +21656,6 @@ minitel2-80|minitel 2 (80cols) avec filets VT100 (DEC),
 	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
@@ -21664,7 +21663,7 @@ minitel12-80|minitel 12 (80cols),
 	.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,
+	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
@@ -27779,4 +27778,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ remove xterm+sm+1006 from tmux (Debian #1057688).
 #	+ used "infocmp -u" to help trim redundant capabilities -TD
 #
+# 2023-12-16
+#	+ used "infocmp -u" to help trim redundant capabilities -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index f208818fb..3eea42af7 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231209) unstable; urgency=low
+ncurses6 (6.4+20231217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index f208818fb..3eea42af7 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231209) unstable; urgency=low
+ncurses6 (6.4+20231217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bbc96461f..794660ba7 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231209) unstable; urgency=low
+ncurses6 (6.4+20231217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Dec 2023 19:13:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ea75563c2..96cb0d310 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.622 2023/12/04 00:13:44 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.624 2023/12/17 23:18:40 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1209"
+!define VERSION_MMDD  "1217"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index eda21ca6e..43652ce49 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231209
+Release: 20231217
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 217f8cd34..faccbf194 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231209
+Release: 20231217
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index efb2f1e22..4312edb7a 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231209
+Release: 20231217
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 62cbb17a8..7932203ac 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.161 2023/12/09 19:56:10 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.163 2023/12/16 17:27:47 tom Exp $")
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -187,9 +187,19 @@ capcmp(PredIdx idx, const char *s, const char *t)
 	return (_nc_capcmp(s, t));
 }
 
+/*
+ * Predicate function to use for "use=" decompilation.
+ *
+ * Return value is used in fmt_entry:
+ *   FAIL  show nothing for this capability.
+ *   FALSE show cancel for booleans (a compromise)
+ *   TRUE  show capability
+ *
+ * The only difference between FALSE/TRUE returns is in the treatment of
+ * booleans.
+ */
 static int
 use_predicate(unsigned type, PredIdx idx)
-/* predicate function to use for use decompilation */
 {
     int result = FAIL;
     ENTRY *ep;
@@ -213,8 +223,7 @@ use_predicate(unsigned type, PredIdx idx)
 	    if (idx < NUM_BOOLEANS(&(entries[0].tterm))) {
 		for (ep = &entries[1]; ep < entries + termcount; ep++) {
 		    if (idx < NUM_BOOLEANS(&(ep->tterm))
-			&& ep->tterm.Booleans[idx] == TRUE) {
-			is_set = entries[0].tterm.Booleans[idx];
+			&& (is_set = ep->tterm.Booleans[idx])) {
 			break;
 		    }
 		}
@@ -267,6 +276,8 @@ use_predicate(unsigned type, PredIdx idx)
 
 		if (usestr == CANCELLED_STRING && termstr == ABSENT_STRING)
 		    result = (FAIL);
+		else if (usestr == CANCELLED_STRING && termstr == CANCELLED_STRING)
+		    result = (TRUE);
 		else if (usestr == ABSENT_STRING && termstr == ABSENT_STRING)
 		    result = (FAIL);
 		else if (!usestr || !termstr || capcmp(idx, usestr, termstr))

From 81b46ebb8be47784a35778d71514d54918e79c7e Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 24 Dec 2023 02:20:29 +0100
Subject: [PATCH 046/106] ncurses-6.4-20231223.patch

---
 NEWS                                 |   5 +-
 VERSION                              |   2 +-
 dist.mk                              |   4 +-
 doc/html/man/captoinfo.1m.html       |  14 +-
 doc/html/man/curs_add_wch.3x.html    |   8 +-
 doc/html/man/curs_addch.3x.html      |  20 +-
 doc/html/man/curs_attr.3x.html       |  24 +-
 doc/html/man/curs_bkgd.3x.html       |  10 +-
 doc/html/man/curs_bkgrnd.3x.html     |  10 +-
 doc/html/man/curs_color.3x.html      | 155 ++++-----
 doc/html/man/curs_extend.3x.html     |  19 +-
 doc/html/man/curs_get_wch.3x.html    |  12 +-
 doc/html/man/curs_getch.3x.html      |  86 ++---
 doc/html/man/curs_initscr.3x.html    |  50 +--
 doc/html/man/curs_inopts.3x.html     | 243 +++++++-------
 doc/html/man/curs_ins_wch.3x.html    |  56 ++--
 doc/html/man/curs_insch.3x.html      |  46 +--
 doc/html/man/curs_legacy.3x.html     |  22 +-
 doc/html/man/curs_memleaks.3x.html   |  10 +-
 doc/html/man/curs_mouse.3x.html      | 107 ++++---
 doc/html/man/curs_print.3x.html      |  20 +-
 doc/html/man/curs_printw.3x.html     |  10 +-
 doc/html/man/curs_scanw.3x.html      |  14 +-
 doc/html/man/curs_sp_funcs.3x.html   |  24 +-
 doc/html/man/curs_termcap.3x.html    | 133 ++++----
 doc/html/man/curs_terminfo.3x.html   |  87 +++--
 doc/html/man/curs_threads.3x.html    |   8 +-
 doc/html/man/curs_trace.3x.html      |   8 +-
 doc/html/man/curs_util.3x.html       |  12 +-
 doc/html/man/curs_variables.3x.html  | 186 ++++++-----
 doc/html/man/form.3x.html            |   8 +-
 doc/html/man/form_driver.3x.html     |  24 +-
 doc/html/man/infocmp.1m.html         |   8 +-
 doc/html/man/menu.3x.html            |   8 +-
 doc/html/man/menu_driver.3x.html     |  16 +-
 doc/html/man/ncurses.3x.html         |  54 ++--
 doc/html/man/ncursesw6-config.1.html |  26 +-
 doc/html/man/panel.3x.html           |   8 +-
 doc/html/man/scr_dump.5.html         |  30 +-
 doc/html/man/tabs.1.html             |  12 +-
 doc/html/man/term.5.html             |  40 ++-
 doc/html/man/term_variables.3x.html  |  16 +-
 doc/html/man/terminfo.5.html         |  22 +-
 doc/html/man/tic.1m.html             |  20 +-
 doc/html/man/tput.1.html             | 384 +++++++++++-----------
 doc/html/man/tset.1.html             | 213 ++++++-------
 doc/html/man/user_caps.5.html        |  16 +-
 man/MKncu_config.in                  |  16 +-
 man/captoinfo.1m                     |  13 +-
 man/curs_add_wch.3x                  |  10 +-
 man/curs_addch.3x                    |  16 +-
 man/curs_attr.3x                     |  12 +-
 man/curs_bkgd.3x                     |   8 +-
 man/curs_bkgrnd.3x                   |   6 +-
 man/curs_color.3x                    | 114 ++++---
 man/curs_extend.3x                   |  21 +-
 man/curs_get_wch.3x                  |   8 +-
 man/curs_getch.3x                    |  85 +++--
 man/curs_initscr.3x                  |  49 +--
 man/curs_inopts.3x                   | 461 +++++++++++++++++----------
 man/curs_ins_wch.3x                  |  77 +++--
 man/curs_insch.3x                    |  74 +++--
 man/curs_legacy.3x                   |  39 ++-
 man/curs_memleaks.3x                 |   6 +-
 man/curs_mouse.3x                    | 181 +++++++----
 man/curs_print.3x                    |  23 +-
 man/curs_printw.3x                   |   6 +-
 man/curs_scanw.3x                    |  10 +-
 man/curs_sp_funcs.3x                 |  16 +-
 man/curs_termcap.3x                  |  69 ++--
 man/curs_terminfo.3x                 | 115 ++++---
 man/curs_threads.3x                  |   6 +-
 man/curs_trace.3x                    |   8 +-
 man/curs_util.3x                     |   8 +-
 man/curs_variables.3x                | 150 +++++----
 man/form.3x                          |   8 +-
 man/form_driver.3x                   |  12 +-
 man/infocmp.1m                       |  16 +-
 man/man_db.renames.in                |  11 +-
 man/manhtml.aliases                  |   6 +-
 man/manhtml.externs                  |  12 +-
 man/menu.3x                          |   8 +-
 man/menu_driver.3x                   |   8 +-
 man/ncurses.3x                       |  49 +--
 man/panel.3x                         |   8 +-
 man/scr_dump.5                       |  30 +-
 man/tabs.1                           |  12 +-
 man/term.5                           |  20 +-
 man/term_variables.3x                |  14 +-
 man/terminfo.head                    |  12 +-
 man/terminfo.tail                    |   4 +-
 man/tic.1m                           |  10 +-
 man/tput.1                           | 284 ++++++++++-------
 man/tset.1                           |  36 ++-
 man/user_caps.5                      |   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 +-
 package/ncursest.spec                |   2 +-
 102 files changed, 2535 insertions(+), 1972 deletions(-)

diff --git a/NEWS b/NEWS
index e598e3ead..ccaddc43f 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4053 2023/12/17 23:18:40 tom Exp $
+-- $Id: NEWS,v 1.4055 2023/12/23 21:00:43 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231223
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+
 20231217
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ correct an assignment in infocmp "-u" for detecting if a boolean
diff --git a/VERSION b/VERSION
index 8ff8be904..a9e6b8e08 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231217
+5:0:10	6.4	20231223
diff --git a/dist.mk b/dist.mk
index 08ff1690a..a8501b024 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1584 2023/12/17 23:18:40 tom Exp $
+# $Id: dist.mk,v 1.1585 2023/12/23 11:35:00 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231217
+NCURSES_PATCH = 20231223
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 281372a19..634df2ec8 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.57 2023/12/16 21:34:23 tom Exp @
+  * @Id: captoinfo.1m,v 1.58 2023/12/23 16:28:31 tom Exp @
   * TODO: There are about 40 box drawing code points in CCSID 437;
   * were there no XENIX capabilities for the mixed single- and double-
   * line intersections?
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
        environment  variable  <EM>TERMCAP</EM>  as  a  file name, and extracts only the
        entry for the terminal named in the environment variable <EM>TERM</EM> from  it.
        If  the  environment  variable  <EM>TERMCAP</EM>  is  not  set,  <STRONG>captoinfo</STRONG> reads
-       <EM>/etc/termcap</EM>.
+       <EM>/etc/termcap.</EM>
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
        option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
@@ -79,7 +79,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
        this program and exits with a successful status.
 
 
-</PRE><H3><a name="h3-Translations-from-nonstandard-capabilities">Translations from nonstandard capabilities</a></H3><PRE>
+</PRE><H3><a name="h3-Translations-from-Nonstandard-Capabilities">Translations from Nonstandard Capabilities</a></H3><PRE>
        <STRONG>captoinfo</STRONG>  translates  some  obsolete,  nonstandard  capabilities  into
        standard  (SVr4/XSI  Curses)  <EM>terminfo</EM>  capabilities.   It   issues   a
        diagnostic  to the standard error stream for each, inviting the user to
@@ -198,7 +198,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2023-12-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -206,7 +206,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Translations-from-nonstandard-capabilities">Translations from nonstandard capabilities</a></li>
+<li><a href="#h3-Translations-from-Nonstandard-Capabilities">Translations from Nonstandard Capabilities</a></li>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index e92b695a1..e9ed953db 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.49 2023/12/16 21:19:37 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.50 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -320,7 +320,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 976fc3e49..0eeb8b94c 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.75 2023/12/16 21:19:37 tom Exp @
+  * @Id: curs_addch.3x,v 1.76 2023/12/23 16:27:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -66,11 +66,11 @@ <H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-Adding-characters">Adding characters</a></H3><PRE>
+</PRE><H3><a name="h3-Adding-Characters">Adding Characters</a></H3><PRE>
        The <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG> and <STRONG>mvwaddch</STRONG> routines put the  character  <EM>ch</EM>
        into  the  given  window  at its current window position, which is then
-       advanced.  They are  analogous  to  <STRONG>putchar(3)</STRONG>  in  <STRONG>stdio(3)</STRONG>.   If  the
-       advance is at the right margin:
+       advanced.  They are analogous to the standard C  library's  <STRONG>putchar(3)</STRONG>.
+       If the advance is at the right margin:
 
        <STRONG>o</STRONG>   The cursor automatically wraps to the beginning of the next line.
 
@@ -119,7 +119,7 @@ <H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        OR'ed into characters.
 
 
-</PRE><H3><a name="h3-Echoing-characters">Echoing characters</a></H3><PRE>
+</PRE><H3><a name="h3-Echoing-Characters">Echoing Characters</a></H3><PRE>
        The  <STRONG>echochar</STRONG>  and <STRONG>wechochar</STRONG> routines are equivalent to a call to <STRONG>addch</STRONG>
        followed by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, or a call to <STRONG>waddch</STRONG>  followed  by  a
        call  to <STRONG>wrefresh</STRONG>.  The knowledge that only a single character is being
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -316,8 +316,8 @@ <H1 class="no-header">curs_addch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Adding-characters">Adding characters</a></li>
-<li><a href="#h3-Echoing-characters">Echoing characters</a></li>
+<li><a href="#h3-Adding-Characters">Adding Characters</a></li>
+<li><a href="#h3-Echoing-Characters">Echoing Characters</a></li>
 <li><a href="#h3-Line-Graphics">Line Graphics</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 56fdf6678..e813235c3 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.92 2023/12/16 21:07:24 tom Exp @
+  * @Id: curs_attr.3x,v 1.93 2023/12/23 16:08:25 tom Exp @
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
   * ---------------------------------------------------------------------------
@@ -50,12 +50,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        attributes used for erasing and clearing.
 
 
-</PRE><H3><a name="h3-Window-attributes">Window attributes</a></H3><PRE>
+</PRE><H3><a name="h3-Window-Attributes">Window Attributes</a></H3><PRE>
        There are two sets of functions:
 
        <STRONG>o</STRONG>   functions   for  manipulating  the  window  attributes  and  color:
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        together in <EM>attr</EM>, without affecting other attributes.
 
 
-</PRE><H3><a name="h3-Legacy-window-attributes">Legacy window attributes</a></H3><PRE>
+</PRE><H3><a name="h3-Legacy-Window-Attributes">Legacy Window Attributes</a></H3><PRE>
        The  X/Open  window attribute routines which <EM>set</EM> or <EM>get</EM>, turn <EM>on</EM> or <EM>off</EM>
        are extensions of older routines which assume that color pairs are OR'd
        into  the attribute parameter.  These newer routines use similar names,
@@ -182,7 +182,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        although <EM>ncurses</EM> provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
 
 
-</PRE><H3><a name="h3-Change-character-rendition">Change character rendition</a></H3><PRE>
+</PRE><H3><a name="h3-Change-Character-Rendition">Change Character Rendition</a></H3><PRE>
        The  routine  <STRONG>chgat</STRONG>  changes  the  attributes  of  a  given  number  of
        characters  starting at the current cursor location of <STRONG>stdscr</STRONG>.  It does
        not update the cursor and does not perform wrapping.  A character count
@@ -195,7 +195,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        in the first argument of <STRONG>init_pair</STRONG>, see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>).
 
 
-</PRE><H3><a name="h3-Change-window-color">Change window color</a></H3><PRE>
+</PRE><H3><a name="h3-Change-Window-Color">Change Window Color</a></H3><PRE>
        The routine <STRONG>color_set</STRONG> sets the current color of the given window to the
        foreground/background  combination  described   by   the   color   <EM>pair</EM>
        parameter.
@@ -511,7 +511,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -519,10 +519,10 @@ <H1 class="no-header">curs_attr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Window-attributes">Window attributes</a></li>
-<li><a href="#h3-Legacy-window-attributes">Legacy window attributes</a></li>
-<li><a href="#h3-Change-character-rendition">Change character rendition</a></li>
-<li><a href="#h3-Change-window-color">Change window color</a></li>
+<li><a href="#h3-Window-Attributes">Window Attributes</a></li>
+<li><a href="#h3-Legacy-Window-Attributes">Legacy Window Attributes</a></li>
+<li><a href="#h3-Change-Character-Rendition">Change Character Rendition</a></li>
+<li><a href="#h3-Change-Window-Color">Change Window Color</a></li>
 <li><a href="#h3-Standout">Standout</a></li>
 <li><a href="#h3-Video-Attributes">Video Attributes</a></li>
 </ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 7642671fc..078fd7938 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.54 2023/12/17 23:31:28 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.55 2023/12/23 16:35:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        Unusually, there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one  would
        expect <STRONG>wgetbkgd</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
-       <STRONG>bkgd</STRONG> and <STRONG>bkgdset</STRONG> may be available as macros.
+       <STRONG>bkgd</STRONG> and <STRONG>bkgdset</STRONG> may be implemented as macros.
 
        X/Open  Curses  mentions that the character part of the background must
        be a single-byte value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>,  checks  to  ensure
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 604fe92dd..8dcd4c412 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.35 2023/12/16 23:00:21 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.36 2023/12/23 16:35:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -154,7 +154,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be available as macros.
+       <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be implemented as macros.
 
        Unlike  their  counterparts in the non-"wide" configuration of <EM>ncurses,</EM>
        <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> supply the background character and  attribute
@@ -177,7 +177,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index df4b22c76..964ef4e0c 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.93 2023/12/16 21:07:24 tom Exp @
+  * @Id: curs_color.3x,v 1.95 2023/12/23 20:18:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -58,6 +58,10 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
+       <EM>/*</EM> <EM>variables</EM> <EM>*/</EM>
+       <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
+       <STRONG>int</STRONG> <STRONG>COLORS;</STRONG>
+
        <STRONG>int</STRONG> <STRONG>start_color(void);</STRONG>
 
        <STRONG>bool</STRONG> <STRONG>has_colors(void);</STRONG>
@@ -85,44 +89,43 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       <EM>curses</EM> supports color attributes on terminals with that capability.  To
-       use  these  routines  <STRONG>start_color</STRONG>  must  be called, usually right after
-       <STRONG>initscr</STRONG>.  Colors are always used in pairs (referred to as color pairs).
-       A  color  pair  consists  of  a foreground color (for characters) and a
-       background color (for the blank  field  on  which  the  characters  are
-       displayed).   A  programmer  initializes  a color pair with the routine
-       <STRONG>init_pair</STRONG>.  After it has been initialized, <STRONG>COLOR_PAIR</STRONG>(<EM>n</EM>) can be used to
-       convert the pair to a video attribute.
-
-       If  a  terminal is capable of redefining colors, the programmer can use
-       the routine <STRONG>init_color</STRONG> to  change  the  definition  of  a  color.   The
-       routines   <STRONG>has_colors</STRONG>   and  <STRONG>can_change_color</STRONG>  return  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG>,
-       depending on whether the terminal has color  capabilities  and  whether
-       the programmer can change the colors.  The routine <STRONG>color_content</STRONG> allows
-       a programmer to extract the amounts of red, green, and blue  components
-       in  an initialized color.  The routine <STRONG>pair_content</STRONG> allows a programmer
-       to find out how a given color pair is currently defined.
+       <EM>curses</EM> supports color attributes on  terminals  with  that  capability.
+       Call  <STRONG>start_color</STRONG>  (typically  right  after <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>) to enable this
+       feature.  Colors are always used in pairs.   A  <EM>color</EM>  <EM>pair</EM>  couples  a
+       foreground  color  for characters with a background color for the blank
+       field on which characters are rendered.  <STRONG>init_pair</STRONG> initializes a  color
+       pair.   The  macro  <STRONG>COLOR_PAIR</STRONG>(<EM>n</EM>)  can then convert the pair to a video
+       attribute.
+
+       If  a  terminal  has  the  relevant  capability,   <STRONG>init_color</STRONG>   permits
+       (re)definition of a color.  <STRONG>has_colors</STRONG> and <STRONG>can_change_color</STRONG> return <STRONG>TRUE</STRONG>
+       or <STRONG>FALSE</STRONG>, depending on whether the terminal has  color  capability  and
+       whether  the  programmer  can change the colors.  <STRONG>color_content</STRONG> permits
+       extraction of the red, green, and blue  components  of  an  initialized
+       color.   <STRONG>pair_content</STRONG>  permits  discovery  of  a  color  pair's current
+       definition.
 
 
-</PRE><H3><a name="h3-Color-Rendering">Color Rendering</a></H3><PRE>
-       The  <EM>curses</EM>  library  combines  these  inputs  to  produce  the  actual
-       foreground and background colors shown on the screen:
+</PRE><H3><a name="h3-Rendering">Rendering</a></H3><PRE>
+       <EM>curses</EM> combines the following data to render a character cell.  Any  of
+       them can include color information.
 
-       <STRONG>o</STRONG>   per-character video attributes (e.g., via <STRONG>waddch</STRONG>),
+       <STRONG>o</STRONG>   <EM>curses</EM> character attributes, as from <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>
 
-       <STRONG>o</STRONG>   the window attribute (e.g., by <STRONG>wattrset</STRONG>), and
+       <STRONG>o</STRONG>   window attributes, as from <STRONG><A HREF="curs_attr.3x.html">wattrset(3x)</A></STRONG> or <STRONG><A HREF="curs_attr.3x.html">wattr_set(3x)</A></STRONG>
 
-       <STRONG>o</STRONG>   the background character (e.g., <STRONG>wbkgdset</STRONG>).
+       <STRONG>o</STRONG>   window  background  character  atttributes, as from <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> or
+           <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>
 
-       Per-character  and  window  attributes  are  usually set by a parameter
-       containing  video  attributes  including  a  color  pair  value.   Some
-       functions such as <STRONG>wattr_set</STRONG> use a separate parameter which is the color
-       pair number.
+       Per-character and window attributes are usually set through a  function
+       parameter  containing  attributes  including  a color pair value.  Some
+       functions,  such  as  <STRONG>wattr_set</STRONG>,  use  a  separate  color  pair  number
+       parameter.
 
-       The background character is a special case:  it  includes  a  character
-       value, just as if it were passed to <STRONG>waddch</STRONG>.
+       The  background  character  is  a special case: it includes a character
+       code, just as if it were passed to <STRONG>waddch</STRONG>.
 
-       The  <EM>curses</EM> library does the actual work of combining these color pairs
+       The <EM>curses</EM> library does the actual work of combining these color  pairs
        in an internal function called from <STRONG>waddch</STRONG>:
 
        <STRONG>o</STRONG>   If the parameter passed to <STRONG>waddch</STRONG> is <EM>blank</EM>, and it uses the special
@@ -130,18 +133,18 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
            <STRONG>o</STRONG>   <EM>curses</EM> next checks the window attribute.
 
-           <STRONG>o</STRONG>   If  the window attribute does not use color pair 0, <EM>curses</EM> uses
+           <STRONG>o</STRONG>   If the window attribute does not use color pair 0, <EM>curses</EM>  uses
                the color pair from the window attribute.
 
            <STRONG>o</STRONG>   Otherwise, <EM>curses</EM> uses the background character.
 
-       <STRONG>o</STRONG>   If the parameter passed to <STRONG>waddch</STRONG> is <EM>not</EM> <EM>blank</EM>, or it does not  use
-           the  special  color  pair 0, <EM>curses</EM> prefers the color pair from the
-           parameter, if it  is  nonzero.   Otherwise,  it  tries  the  window
+       <STRONG>o</STRONG>   If  the parameter passed to <STRONG>waddch</STRONG> is <EM>not</EM> <EM>blank</EM>, or it does not use
+           the special color pair 0, <EM>curses</EM> prefers the color  pair  from  the
+           parameter,  if  it  is  nonzero.   Otherwise,  it  tries the window
            attribute next, and finally the background character.
 
-       Some  <EM>curses</EM>  functions  such  as  <STRONG>wprintw</STRONG>  call  <STRONG>waddch</STRONG>.  Those do not
-       combine its parameter with a color pair.  Consequently those calls  use
+       Some <EM>curses</EM> functions such  as  <STRONG>wprintw</STRONG>  call  <STRONG>waddch</STRONG>.   Those  do  not
+       combine  its parameter with a color pair.  Consequently those calls use
        only the window attribute or the background character.
 
 
@@ -159,20 +162,27 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
              <STRONG>COLOR_CYAN</STRONG>
              <STRONG>COLOR_WHITE</STRONG>
 
-       Some  terminals  support  more than the eight (8) "ANSI" colors.  There
+       Some terminals support more than the eight (8)  "ANSI"  colors.   There
        are no standard names for those additional colors.
 
 
 </PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
-       is initialized by <STRONG>start_color</STRONG> to  the  maximum  number  of  colors  the
+       is  initialized  by  <STRONG>start_color</STRONG>  to  the  maximum number of colors the
        terminal can support.
 
 
 </PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
-       is  initialized by <STRONG>start_color</STRONG> to the maximum number of color pairs the
-       terminal can support.
+       is initialized by <STRONG>start_color</STRONG> to the maximum number of color pairs  the
+       terminal can support.  Often, its value is the product <STRONG>COLORS</STRONG> x <STRONG>COLORS</STRONG>,
+       but this is not always true.
+
+       <STRONG>o</STRONG>   A few terminals use the HLS color space  (see  <STRONG>start_color</STRONG>  below),
+           ignoring this rule; and
+
+       <STRONG>o</STRONG>   terminals  supporting  a  large number of colors are limited to the
+           number of color pairs that a <EM>signed</EM> <EM>short</EM> value can represent.
 
 
 </PRE><H2><a name="h2-FUNCTIONS">FUNCTIONS</a></H2><PRE>
@@ -445,32 +455,35 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
-       are  not  found  in  SVr4  curses, 4.4BSD curses, or any other previous
-       version of curses.
+       are  not  found  in  SVr4  <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous
+       curses implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This implementation satisfies XSI Curses's minimum maximums for  <STRONG>COLORS</STRONG>
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       This  implementation satisfies XSI Curses's minimum maximums for <STRONG>COLORS</STRONG>
        and <STRONG>COLOR_PAIRS</STRONG>.
 
        The  <STRONG>init_pair</STRONG>  routine  accepts  negative  values  of  foreground  and
-       background color to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>  extension,  but
+       background  color  to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but
        only if that routine has been first invoked.
 
        The assumption that <STRONG>COLOR_BLACK</STRONG> is the default background color for all
-       terminals  can  be   modified   using   the   <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
+       terminals   can   be   modified   using  the  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
        extension.
 
-       This  implementation checks the pointers, e.g., for the values returned
-       by <STRONG>color_content</STRONG> and <STRONG>pair_content</STRONG>, and will  treat  those  as  optional
+       This implementation checks the pointers, e.g., for the values  returned
+       by  <STRONG>color_content</STRONG>  and  <STRONG>pair_content</STRONG>,  and will treat those as optional
        parameters when null.
 
-       X/Open  Curses  does  not  specify a limit for the number of colors and
+       X/Open Curses does not specify a limit for the  number  of  colors  and
        color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
-       for  the  parameters,  it carries over SVr4's implementation detail for
+       for the parameters, it carries over SVr4's  implementation  detail  for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation  provides extended versions of those functions which use
-       <STRONG>short</STRONG> parameters, allowing applications to use larger color- and  pair-
+       implementation provides extended versions of those functions which  use
+       <STRONG>short</STRONG>  parameters, allowing applications to use larger color- and pair-
        numbers.
 
        The <STRONG>reset_color_pairs</STRONG> function is an extension of <EM>ncurses</EM>.
@@ -479,13 +492,13 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        SVr3.2 introduced color support to curses in 1987.
 
-       SVr4  made  internal  changes,  e.g.,  moving the storage for the color
-       state  from  <STRONG>SP</STRONG>  (the  <STRONG>SCREEN</STRONG>  structure)  to  <STRONG>cur_term</STRONG>  (the  <STRONG>TERMINAL</STRONG>
+       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
+       state  from  <STRONG>SP</STRONG>  (the  <EM>SCREEN</EM>  structure)  to  <STRONG>cur_term</STRONG>  (the  <EM>TERMINAL</EM>
        structure), but provided the same set of library functions.
 
-       SVr4  curses  limits  the  number of color pairs to 64, reserving color
-       pair zero (0) as the terminal's initial uncolored  state.   This  limit
-       arises  because  the color pair information is a bitfield in the <STRONG>chtype</STRONG>
+       SVr4 curses limits the number of color pairs  to  64,  reserving  color
+       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
+       arises because the color pair information is a bitfield in  the  <STRONG>chtype</STRONG>
        data type (denoted by <STRONG>A_COLOR</STRONG>).
 
        Other implementations of curses had different limits:
@@ -498,35 +511,35 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
            the character, attributes and color pair values, allowing increased
-           range of color pairs.  Both color pairs  and  color-values  used  a
+           range  of  color  pairs.   Both color pairs and color-values used a
            signed <STRONG>short</STRONG>, limiting values to 15 bits.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in <STRONG>chtype</STRONG>
+       <STRONG>o</STRONG>   <EM>ncurses</EM> (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in  <STRONG>chtype</STRONG>
            values.
 
-           Version 5.3 provided a wide-character interface  (2002),  but  left
+           Version  5.3  provided  a wide-character interface (2002), but left
            color pairs as part of the attributes-field.
 
            Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color pairs
            in the <STRONG>cchar_t</STRONG> values.  When those color pair values fit in 8 bits,
-           ncurses  allows  color  pairs  to  be manipulated via the functions
+           ncurses allows color pairs to  be  manipulated  via  the  functions
            using <STRONG>chtype</STRONG> values.
 
-       <STRONG>o</STRONG>   NetBSD curses used  6  bits  from  2000  (when  colors  were  first
-           supported)  until  2004.   At  that point, NetBSD changed to use 10
-           bits.  As of 2021, that size is  unchanged.   Like  <EM>ncurses</EM>  before
-           version  6,  the  NetBSD  color  pair  information is stored in the
-           attributes field of <STRONG>cchar_t</STRONG>, limiting the number of color pairs  by
+       <STRONG>o</STRONG>   NetBSD  curses  used  6  bits  from  2000  (when  colors were first
+           supported) until 2004.  At that point, NetBSD  changed  to  use  10
+           bits.   As  of  2021,  that size is unchanged.  Like <EM>ncurses</EM> before
+           version 6, the NetBSD color  pair  information  is  stored  in  the
+           attributes  field of <STRONG>cchar_t</STRONG>, limiting the number of color pairs by
            the size of the bitfield.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -535,7 +548,7 @@ <H1 class="no-header">curs_color 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Overview">Overview</a></li>
-<li><a href="#h3-Color-Rendering">Color Rendering</a></li>
+<li><a href="#h3-Rendering">Rendering</a></li>
 </ul>
 </li>
 <li><a href="#h2-CONSTANTS">CONSTANTS</a></li>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 8dc4cf759..32b507a33 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.43 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_extend.3x,v 1.44 2023/12/23 16:36:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -88,10 +88,14 @@ <H1 class="no-header">curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        this and restore it.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       These  functions  are <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extensions, and are not found in SVr4
+       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -105,7 +109,7 @@ <H1 class="no-header">curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -118,6 +122,7 @@ <H1 class="no-header">curs_extend 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 38e0e2099..c639d28ac 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.31 2023/12/23 16:35:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -141,8 +141,8 @@ <H1 class="no-header">curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        on  the  state  of  the  tty  driver  when each character is typed, the
        program may produce undesirable results.
 
-       All of these symbols except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be available  as
-       macros.
+       All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
+       as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_get_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 7246a2bd5..a005043c8 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.76 2023/12/16 21:01:28 tom Exp @
+  * @Id: curs_getch.3x,v 1.77 2023/12/23 16:36:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -68,7 +68,7 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-Reading-characters">Reading characters</a></H3><PRE>
+</PRE><H3><a name="h3-Reading-Characters">Reading Characters</a></H3><PRE>
        The <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG> and <STRONG>mvwgetch</STRONG>, routines read a character from
        the window.  In no-delay mode, if no input is waiting, the value <STRONG>ERR</STRONG> is
        returned.  In delay mode, the program waits  until  the  system  passes
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        is read.
 
 
-</PRE><H3><a name="h3-Keypad-mode">Keypad mode</a></H3><PRE>
+</PRE><H3><a name="h3-Keypad-Mode">Keypad Mode</a></H3><PRE>
        If <STRONG>keypad</STRONG> is <STRONG>TRUE</STRONG>, and a function key is pressed, the  token  for  that
        function key is returned instead of the raw characters:
 
@@ -129,13 +129,13 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        pressed.
 
 
-</PRE><H3><a name="h3-Ungetting-characters">Ungetting characters</a></H3><PRE>
+</PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
        The  <STRONG>ungetch</STRONG> routine places <EM>ch</EM> back onto the input queue to be returned
        by the next call to <STRONG>wgetch</STRONG>.  There is just  one  input  queue  for  all
        windows.
 
 
-</PRE><H3><a name="h3-Predefined-key-codes">Predefined key-codes</a></H3><PRE>
+</PRE><H3><a name="h3-Predefined-Key-Codes">Predefined Key Codes</a></H3><PRE>
        The following special keys are defined in <STRONG>&lt;curses.h&gt;</STRONG>.
 
        <STRONG>o</STRONG>   Except  for  the special case <STRONG>KEY_RESIZE</STRONG>, it is necessary to enable
@@ -267,7 +267,7 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
            escape sequences, just like a function key.
 
 
-</PRE><H3><a name="h3-Testing-key-codes">Testing key-codes</a></H3><PRE>
+</PRE><H3><a name="h3-Testing-Key-Codes">Testing Key Codes</a></H3><PRE>
        The <STRONG>has_key</STRONG> routine takes a key-code value from  the  above  list,  and
        returns  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG> according to whether the current terminal type
        recognizes a key with that value.
@@ -342,35 +342,44 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        mapped to <STRONG>KEY_IC</STRONG>.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>has_key</STRONG>  was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4 <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  *get* functions are described in the XSI Curses standard, Issue 4.
-       They read single-byte characters only.   The  standard  specifies  that
-       they return <STRONG>ERR</STRONG> on failure, but specifies no error conditions.
-
-       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
-       characters  was  not  specified  in  the  SVr4   documentation.    This
-       description is adopted from the XSI Curses standard.
-
-       The behavior of <STRONG>getch</STRONG> and friends in the presence of handled signals is
-       unspecified in the SVr4 and XSI Curses documentation.  Under historical
-       curses  implementations,  it  varied depending on whether the operating
-       system's implementation of handled signal receipt interrupts a  <STRONG>read(2)</STRONG>
-       call  in  progress or not, and also (in some implementations) depending
-       on whether an input timeout or non-blocking mode has been set.
-
-       <STRONG>KEY_MOUSE</STRONG> is mentioned in XSI Curses, along with a few related terminfo
-       capabilities,  but  no  higher-level  functions  use  the feature.  The
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open  Curses,  Issue  4, Version 2, describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>,
+       <STRONG>mvwgetch</STRONG>, and <STRONG>ungetch</STRONG>.  They read  single-byte  characters  only.   The
+       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but describes no
+       failure conditions.
+
+       The echo behavior of these functions on  input  of  <STRONG>KEY_</STRONG>  or  backspace
+       characters   was   not  specified  in  the  SVr4  documentation.   This
+       description is adapted from X/Open Curses.
+
+       The behavior of <STRONG>getch</STRONG> and friends in the presence of signal handlers is
+       unspecified  in  the  SVr4  documentation  and  X/Open  Curses.   Under
+       historical curses implementations, it varied depending on  whether  the
+       operating  system's  dispatch  of  a  signal  to a handler interrupts a
+       <STRONG>read(2)</STRONG> call in progress or not, and  also  (in  some  implementations)
+       whether an input timeout or non-blocking mode has been set.
+
+       <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
+       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  <EM>ncurses</EM>.   NetBSD
-       curses later added this extension.
+       <STRONG>KEY_RESIZE</STRONG>  is  an  extension  first  implemented  for <EM>ncurses.</EM>  NetBSD
+       <EM>curses</EM> later added this extension.
 
-       Programmers  concerned  about portability should be prepared for either
-       of two cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>;  (b)  signal
-       receipt  interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to
+       Programmers concerned about portability should be prepared  for  either
+       of  two  cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>; (b) signal
+       receipt interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set  to
        <STRONG>EINTR</STRONG>.
 
-       The <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any  code
+       The  <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any code
        using it be conditionalized on the <STRONG>NCURSES_VERSION</STRONG> feature macro.
 
 
@@ -378,12 +387,12 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
+       Comparable  functions  in  the  wide-character  (ncursesw)  library are
        described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -391,15 +400,16 @@ <H1 class="no-header">curs_getch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Reading-characters">Reading characters</a></li>
-<li><a href="#h3-Keypad-mode">Keypad mode</a></li>
-<li><a href="#h3-Ungetting-characters">Ungetting characters</a></li>
-<li><a href="#h3-Predefined-key-codes">Predefined key-codes</a></li>
-<li><a href="#h3-Testing-key-codes">Testing key-codes</a></li>
+<li><a href="#h3-Reading-Characters">Reading Characters</a></li>
+<li><a href="#h3-Keypad-Mode">Keypad Mode</a></li>
+<li><a href="#h3-Ungetting-Characters">Ungetting Characters</a></li>
+<li><a href="#h3-Predefined-Key-Codes">Predefined Key Codes</a></li>
+<li><a href="#h3-Testing-Key-Codes">Testing Key Codes</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 995f186d6..8179e408f 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.59 2023/12/17 23:56:04 tom Exp @
+  * @Id: curs_initscr.3x,v 1.60 2023/12/23 16:27:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -87,7 +87,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        use <STRONG>newterm</STRONG>.
 
        The  routine  <STRONG>newterm</STRONG>  should  be  called  once  for each terminal.  It
-       returns a variable of  type  <STRONG>SCREEN</STRONG>  <STRONG>*</STRONG>  which  should  be  saved  as  a
+       returns a variable of  type  <EM>SCREEN</EM>  <EM>*</EM>  which  should  be  saved  as  a
        reference to that terminal.  <STRONG>newterm</STRONG>'s arguments are
 
        <STRONG>o</STRONG>   the <EM>type</EM> of the terminal to be used in place of <STRONG>$TERM</STRONG>,
@@ -99,8 +99,8 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        If the <EM>type</EM> parameter is <STRONG>NULL</STRONG>, <STRONG>$TERM</STRONG> will be used.
 
        The  file  descriptor  of the output stream is passed to <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>,
-       which returns a pointer to  a  <STRONG>TERMINAL</STRONG>  structure.   <STRONG>newterm</STRONG>'s  return
-       value holds a pointer to the <STRONG>TERMINAL</STRONG> structure.
+       which returns a pointer to  a  <EM>TERMINAL</EM>  structure.   <STRONG>newterm</STRONG>'s  return
+       value holds a pointer to the <EM>TERMINAL</EM> structure.
 
 
 </PRE><H3><a name="h3-endwin">endwin</a></H3><PRE>
@@ -139,14 +139,14 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        The  <STRONG>set_term</STRONG>  routine  is  used to switch between different terminals.
        The screen  reference  <EM>new</EM>  becomes  the  new  current  terminal.   The
        previous terminal is returned by the routine.  This is the only routine
-       which manipulates <STRONG>SCREEN</STRONG> pointers; all other routines affect  only  the
+       which manipulates <EM>SCREEN</EM> pointers; all other routines affect  only  the
        current terminal.
 
 
 </PRE><H3><a name="h3-delscreen">delscreen</a></H3><PRE>
-       The  <STRONG>delscreen</STRONG>  routine  frees  storage associated with the <STRONG>SCREEN</STRONG> data
+       The  <STRONG>delscreen</STRONG>  routine  frees  storage associated with the <EM>SCREEN</EM> data
        structure.  The <STRONG>endwin</STRONG> routine does not do this, so <STRONG>delscreen</STRONG> should be
-       called after <STRONG>endwin</STRONG> if a particular <STRONG>SCREEN</STRONG> is no longer needed.
+       called after <STRONG>endwin</STRONG> if a particular <EM>SCREEN</EM> is no longer needed.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -191,17 +191,17 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        redundant to check the return value of <STRONG>initscr</STRONG> in XSI Curses.
 
        Calling  <STRONG>endwin</STRONG>  does not dispose of the memory allocated in <STRONG>initscr</STRONG> or
-       <STRONG>newterm</STRONG>.  Deleting a <STRONG>SCREEN</STRONG> provides a way to do this:
+       <STRONG>newterm</STRONG>.  Deleting a <EM>SCREEN</EM> provides a way to do this:
 
-       <STRONG>o</STRONG>   X/Open Curses does not say what happens to <STRONG>WINDOW</STRONG>s  when  <STRONG>delscreen</STRONG>
-           "frees  storage  associated  with  the  <STRONG>SCREEN</STRONG>"  nor  does the SVr4
+       <STRONG>o</STRONG>   X/Open Curses does not say what happens to <EM>WINDOW</EM>s  when  <STRONG>delscreen</STRONG>
+           "frees  storage  associated  with  the  <EM>SCREEN</EM>"  nor  does the SVr4
            documentation help, adding that it should be called after <STRONG>endwin</STRONG> if
-           a <STRONG>SCREEN</STRONG> is no longer needed.
+           a <EM>SCREEN</EM> is no longer needed.
 
-       <STRONG>o</STRONG>   However,  <STRONG>WINDOW</STRONG>s are implicitly associated with a <STRONG>SCREEN</STRONG>.  so that
+       <STRONG>o</STRONG>   However,  <EM>WINDOW</EM>s are implicitly associated with a <EM>SCREEN</EM>.  so that
            it is reasonable to expect <STRONG>delscreen</STRONG> to deal with these.
 
-       <STRONG>o</STRONG>   SVr4 curses deletes  the  standard  <STRONG>WINDOW</STRONG>  structures  <STRONG>stdscr</STRONG>  and
+       <STRONG>o</STRONG>   SVr4 curses deletes  the  standard  <EM>WINDOW</EM>  structures  <STRONG>stdscr</STRONG>  and
            <STRONG>curscr</STRONG>  as  well  as a work area <STRONG>newscr</STRONG>.  SVr4 curses ignores other
            windows.
 
@@ -210,12 +210,12 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            windows when <STRONG>delscreen</STRONG> is called.
 
        <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in  2001.   PDCurses  follows
-           the SVr4 model, deleting only the standard <STRONG>WINDOW</STRONG> structures.
+           the SVr4 model, deleting only the standard <EM>WINDOW</EM> structures.
 
 
 </PRE><H3><a name="h3-High-level-versus-Low-level">High-level versus Low-level</a></H3><PRE>
        Different  implementations  may  disagree  regarding  the level of some
-       functions.  For example, <STRONG>SCREEN</STRONG>  (returned  by  <STRONG>newterm</STRONG>)  and  <STRONG>TERMINAL</STRONG>
+       functions.  For example, <EM>SCREEN</EM>  (returned  by  <STRONG>newterm</STRONG>)  and  <EM>TERMINAL</EM>
        (returned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>)  hold  file  descriptors  for  the output
        stream.  If an application switches screens using <STRONG>set_term</STRONG>, or switches
        terminals using <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>, applications which use the output file
@@ -224,12 +224,12 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
        For example
 
-       <STRONG>o</STRONG>   NetBSD's  <STRONG><A HREF="curs_termattrs.3x.html">baudrate(3x)</A></STRONG>  function  uses  the descriptor in <STRONG>TERMINAL</STRONG>.
-           <EM>ncurses</EM> and SVr4 use the descriptor in <STRONG>SCREEN</STRONG>.
+       <STRONG>o</STRONG>   NetBSD's  <STRONG><A HREF="curs_termattrs.3x.html">baudrate(3x)</A></STRONG>  function  uses  the descriptor in <EM>TERMINAL</EM>.
+           <EM>ncurses</EM> and SVr4 use the descriptor in <EM>SCREEN</EM>.
 
-       <STRONG>o</STRONG>   NetBSD and <EM>ncurses</EM> use the descriptor in <STRONG>TERMINAL</STRONG> for terminal  I/O
+       <STRONG>o</STRONG>   NetBSD and <EM>ncurses</EM> use the descriptor in <EM>TERMINAL</EM> for terminal  I/O
            modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
-           uses the descriptor in <STRONG>SCREEN</STRONG>.
+           uses the descriptor in <EM>SCREEN</EM>.
 
    <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
        If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
@@ -262,14 +262,14 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
             The handler <EM>attempts</EM> to cleanup the screen on exit.   Although  it
             <EM>usually</EM> works as expected, there are limitations:
 
-            <STRONG>o</STRONG>   Walking  the  <STRONG>SCREEN</STRONG> list is unsafe, since all list management
+            <STRONG>o</STRONG>   Walking  the  <EM>SCREEN</EM> list is unsafe, since all list management
                 is done without any signal blocking.
 
             <STRONG>o</STRONG>   On systems which  have  <STRONG>REENTRANT</STRONG>  turned  on,  <STRONG>set_term</STRONG>  uses
                 functions which could deadlock or misbehave in other ways.
 
-            <STRONG>o</STRONG>   <STRONG>endwin</STRONG> calls other functions, many of which use stdio or other
-                library functions which are clearly unsafe.
+            <STRONG>o</STRONG>   <STRONG>endwin</STRONG>  calls  other  functions, many of which use <STRONG>stdio(3)</STRONG> or
+                other library functions which are clearly unsafe.
 
        <STRONG>SIGTERM</STRONG>
             This uses the same handler as <STRONG>SIGINT</STRONG>, with the  same  limitations.
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index d9a8d55ee..76f43fbda 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.59 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_inopts.3x,v 1.60 2023/12/23 16:36:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -92,19 +92,19 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <EM>ncurses</EM> library provides several functions which let an application
-       change  the  way  input from the terminal is handled.  Some are global,
-       applying to all windows.  Others  apply  only  to  a  specific  window.
-       Window-specific  settings  are  not  automatically  applied  to  new or
-       derived windows.  An application must apply these to  each  window,  if
-       the same behavior is needed.
-
-
-</PRE><H3><a name="h3-cbreak_nocbreak">cbreak/nocbreak</a></H3><PRE>
-       Normally,  the  tty  driver buffers typed characters until a newline or
-       carriage return is typed.  The <STRONG>cbreak</STRONG> routine disables  line  buffering
-       and   erase/kill   character-processing  (interrupt  and  flow  control
-       characters  are  unaffected),  making  characters  typed  by  the  user
+       <EM>ncurses</EM> provides several functions that let an application  change  the
+       way  input  from the terminal is handled.  Some are global, applying to
+       all windows.  Others apply only to a specific window.   Window-specific
+       settings  are  not automatically applied to new or derived windows.  An
+       application must apply these to each window if  the  same  behavior  is
+       desired.
+
+
+</PRE><H3><a name="h3-cbreak_-nocbreak">cbreak, nocbreak</a></H3><PRE>
+       Normally,  the terminal driver buffers typed characters until a newline
+       or  carriage  return  is  typed.   The  <STRONG>cbreak</STRONG>  routine  disables  line
+       buffering  and  erase/kill  character-processing  (interrupt  and  flow
+       control characters are unaffected), making characters typed by the user
        immediately available to the program.  The <STRONG>nocbreak</STRONG> routine returns the
        terminal to normal (cooked) mode.
 
@@ -115,15 +115,15 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        discussion of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
 
 
-</PRE><H3><a name="h3-echo_noecho">echo/noecho</a></H3><PRE>
+</PRE><H3><a name="h3-echo_-noecho">echo, noecho</a></H3><PRE>
        The <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> routines control whether characters  typed  by  the
-       user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG> as they are typed.  Echoing by the tty
-       driver is always disabled, but initially <STRONG>getch</STRONG>  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 <STRONG>noecho</STRONG>.  [See
-       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion of how  these  routines  interact  with
-       <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.]
+       user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>  as  they  are  typed.  Echoing by the
+       terminal driver is always disabled, but  initially  <STRONG>getch</STRONG>  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
+       <STRONG>noecho</STRONG>.  [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion  of  how  these  routines
+       interact with <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.]
 
 
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
@@ -138,11 +138,11 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
        If the <STRONG>intrflush</STRONG> option is enabled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), and an  interrupt  key
        is  pressed on the keyboard (interrupt, break, quit), all output in the
-       tty driver queue will be flushed, giving the effect of faster  response
+       terminal driver queue is flushed, giving the effect of faster  response
        to  the interrupt, but causing <EM>curses</EM> to have the wrong idea of what is
-       on the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>) prevents the  flush.
-       The  default  for the option is inherited from the tty driver settings.
-       The window argument is ignored.
+       on the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>), prevents the flush.
+       The  default  for  the  option  is  inherited  from the terminal driver
+       settings.  The <EM>win</EM> argument is ignored.
 
 
 </PRE><H3><a name="h3-keypad">keypad</a></H3><PRE>
@@ -159,18 +159,18 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
        Initially, whether the terminal returns 7  or  8  significant  bits  on
-       input  depends  on the control mode of the tty driver [see <STRONG>termios(3)</STRONG>].
-       To force 8 bits  to  be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>);  this  is
-       equivalent,  under  POSIX, to setting the CS8 flag on the terminal.  To
-       force  7  bits  to  be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>FALSE</STRONG>);  this  is
-       equivalent,  under POSIX, to setting the CS7 flag on the terminal.  The
-       window argument, <EM>win</EM>, is always ignored.  If the terminfo  capabilities
-       <STRONG>smm</STRONG>  (meta_on)  and <STRONG>rmm</STRONG> (meta_off) are defined for the terminal, <STRONG>smm</STRONG> is
-       sent to the terminal when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>TRUE</STRONG>) is called  and  <STRONG>rmm</STRONG>  is  sent
-       when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
-
-
-</PRE><H3><a name="h3-nl_nonl">nl/nonl</a></H3><PRE>
+       input  depends  on  the  control  mode  of  the  terminal  driver  [see
+       <STRONG>termios(3)</STRONG>].  To force 8 bits to be returned, invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>);
+       this  is  equivalent,  under  POSIX,  to  setting  the  CS8 flag on the
+       terminal.  To force 7 bits to be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>FALSE</STRONG>);
+       this  is  equivalent,  under  POSIX,  to  setting  the  CS7 flag on the
+       terminal.  The  window  argument,  <EM>win,</EM>  is  always  ignored.   If  the
+       terminfo  capabilities <STRONG>smm</STRONG> (meta_on) and <STRONG>rmm</STRONG> (meta_off) are defined for
+       the terminal, <STRONG>smm</STRONG> is sent to  the  terminal  when  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>)  is
+       called and <STRONG>rmm</STRONG> is sent when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
+
+
+</PRE><H3><a name="h3-nl_-nonl">nl, nonl</a></H3><PRE>
        The  <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> routines control whether the underlying display device
        translates the return key into newline on input.
 
@@ -185,21 +185,21 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        When interpreting an escape sequence, <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  sets  a  timer  while
        waiting  for  the  next  character.  If <STRONG>notimeout(</STRONG><EM>win</EM>, <STRONG>TRUE</STRONG>) is called,
        then <STRONG>wgetch</STRONG> does not set a timer.  The purpose of  the  timeout  is  to
-       differentiate  between sequences received from a function key and those
-       typed by a user.
+       distinguish  sequences produced by a function key from those typed by a
+       user.
 
 
-</PRE><H3><a name="h3-raw_noraw">raw/noraw</a></H3><PRE>
+</PRE><H3><a name="h3-raw_-noraw">raw, noraw</a></H3><PRE>
        The <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw  mode.
        Raw  mode  is  similar  to  <STRONG>cbreak</STRONG>  mode,  in that characters typed are
        immediately passed through to the user program.   The  differences  are
        that  in  raw  mode,  the  interrupt,  quit,  suspend, and flow control
        characters are all passed through uninterpreted, instead of  generating
        a  signal.   The behavior of the BREAK key depends on other bits in the
-       tty driver that are not set by <EM>curses</EM>.
+       terminal driver that are not set by <EM>curses.</EM>
 
 
-</PRE><H3><a name="h3-qiflush_noqiflush">qiflush/noqiflush</a></H3><PRE>
+</PRE><H3><a name="h3-qiflush_-nqiflush">qiflush, nqiflush</a></H3><PRE>
        When the <STRONG>noqiflush</STRONG> routine is used, normal flush of  input  and  output
        queues  associated  with the <STRONG>INTR</STRONG>, <STRONG>QUIT</STRONG> and <STRONG>SUSP</STRONG> characters will not be
        done [see <STRONG>termios(3)</STRONG>].  When <STRONG>qiflush</STRONG> is  called,  the  queues  will  be
@@ -208,23 +208,23 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        the interrupt had not occurred, after the handler exits.
 
 
-</PRE><H3><a name="h3-timeout_wtimeout">timeout/wtimeout</a></H3><PRE>
+</PRE><H3><a name="h3-timeout_-wtimeout">timeout, wtimeout</a></H3><PRE>
        The <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> routines set blocking or non-blocking read for
-       a given window.  If <EM>delay</EM> is negative, blocking  read  is  used  (i.e.,
-       waits  indefinitely  for  input).   If <EM>delay</EM> is zero, then non-blocking
-       read is used (i.e., read returns <STRONG>ERR</STRONG> if no input is waiting).  If <EM>delay</EM>
-       is  positive,  then read blocks for <EM>delay</EM> milliseconds, and returns <STRONG>ERR</STRONG>
+       a given window.  If <EM>delay</EM> is negative, a blocking read is  used  (i.e.,
+       waits  indefinitely  for input).  If <EM>delay</EM> is zero, then a non-blocking
+       read is used (i.e., <EM>read</EM> returns <STRONG>ERR</STRONG> if no input is waiting).  If <EM>delay</EM>
+       is  positive,  then <EM>read</EM> blocks for <EM>delay</EM> milliseconds, and returns <STRONG>ERR</STRONG>
        if there is still no input.  Hence, these  routines  provide  the  same
        functionality  as <STRONG>nodelay</STRONG>, plus the additional capability of being able
        to block for only <EM>delay</EM> milliseconds (where <EM>delay</EM> is positive).
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
-       The <EM>curses</EM> 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
+       <EM>curses</EM> does  "line-breakout  optimization"  by  looking  for  typeahead
+       periodically  while  updating the screen.  If input is found, and it is
+       coming  from  a  terminal,  the  current  update  is  postponed   until
        <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  or  <STRONG>doupdate</STRONG> is called again.  This allows faster response
-       to commands typed in advance.  Normally, the input FILE pointer  passed
+       to commands typed in advance.  Normally, the input <EM>FILE</EM> pointer  passed
        to <STRONG>newterm</STRONG>, or <STRONG>stdin</STRONG> in the case that <STRONG>initscr</STRONG> was used, will be used to
        do this typeahead checking.  The <STRONG>typeahead</STRONG> routine specifies  that  the
        file descriptor <EM>fd</EM> is to be used to check for typeahead instead.  If <EM>fd</EM>
@@ -247,96 +247,97 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>,  <STRONG>nodelay</STRONG>,
-       <STRONG>notimeout</STRONG>, <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be macros.
+       <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>notimeout</STRONG>,
+       <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
-       The  <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> calls follow historical practice in that they
-       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
-       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
-       driver control states that are hard to predict or understand; it is not
+       <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
+       restore normal ("cooked") mode from raw and cbreak modes  respectively.
+       Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  and  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>  calls leads to terminal driver
+       control states that are hard to predict or understand; doing so is  not
        recommended.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       This implementation provides four functions which may be used to detect
-       if the corresponding flags were set or reset:
+       <EM>ncurses</EM> provides four "is_" functions that may be used to detect if the
+       corresponding flags were set or reset.
 
-       <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
-       ------------------------------
-       is_cbreak   cbreak   nocbreak
-       is_echo     echo     noecho
-       is_nl       nl       nonl
-       is_raw      raw      noraw
+                            <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
+                            ------------------------------
+                            is_cbreak   cbreak   nocbreak
+                            is_echo     echo     noecho
+                            is_nl       nl       nonl
+                            is_raw      raw      noraw
 
        In each case, the function returns
 
-       1    if the flag is set,
+       1   if the flag is set,
 
-       0    if the flag is reset, or
+       0   if the flag is reset, or
 
-       -1   if the <EM>curses</EM> library was not initialized.
+       -1  if the library is not initialized.
 
-       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
-       NCURSES_VERSION.
+       They were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not found in  SVr4  <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Except  as  noted  in  the  section  on extensions, these functions are
-       described in the XSI Curses standard, Issue 4.
-
-       The <EM>ncurses</EM> library obeys the XPG4 standard and the historical practice
-       of  the  AT&amp;T  <EM>curses</EM>  implementations, in that the echo bit is cleared
-       when <EM>curses</EM> initializes the terminal state.  BSD <EM>curses</EM>  differed  from
-       this  slightly;  it left the echo bit on at initialization, but the BSD
-       <STRONG>raw</STRONG> call turned it off as a side-effect.   For  best  portability,  set
-       <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly  just  after  initialization, even if your
-       program remains in cooked mode.
-
-       The XSI Curses standard is ambiguous on the  question  of  whether  <STRONG>raw</STRONG>
-       should  disable  the  CRLF translations controlled by <STRONG>nl</STRONG> and <STRONG>nonl</STRONG>.  BSD
-       <EM>curses</EM> did turn off these translations; AT&amp;T <EM>curses</EM> (at least  as  late
-       as  SVr1)  did not.  We chose to do so, on the theory that a programmer
-       requesting raw input wants a clean  (ideally  8-bit  clean)  connection
-       that the operating system will not alter.
-
-       When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key-definitions for the
-       current terminal description.  If  the  terminal  description  includes
-       extended  string  capabilities,  e.g., from using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>,
-       then <EM>ncurses</EM> also defines keys for the capabilities whose  names  begin
-       with  "k".   The corresponding keycodes are generated and (depending on
-       previous loads of terminal descriptions) may differ from one  execution
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       Except as noted in section "EXTENSIONS" above, X/Open Curses, Issue  4,
+       Version 2 describes these functions.
+
+       <EM>ncurses</EM>  follows  X/Open  Curses  and  the  historical practice of AT&amp;T
+       <EM>curses</EM> implementations, in that the echo bit  is  cleared  when  <EM>curses</EM>
+       initializes   the  terminal  state.   BSD  <EM>curses</EM>  differed  from  this
+       slightly; it left the echo bit on at initialization, but  the  BSD  <STRONG>raw</STRONG>
+       call turned it off as a side effect.  For best portability, set <STRONG>echo</STRONG> or
+       <STRONG>noecho</STRONG> explicitly just  after  initialization,  even  if  your  program
+       remains in cooked mode.
+
+       X/Open  Curses  is  ambiguous  regarding whether <STRONG>raw</STRONG> should disable the
+       CR/LF translations controlled by <STRONG>nl</STRONG> and <STRONG>nonl</STRONG>.  BSD <EM>curses</EM> did turn  off
+       these  translations;  AT&amp;T  <EM>curses</EM>  (at least as late as SVr1) did not.
+       <EM>ncurses</EM> does so, on the assumption that  a  programmer  requesting  raw
+       input  wants  a  clean  (ideally,  8-bit  clean)  connection  that  the
+       operating system will not alter.
+
+       When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key definitions for the
+       current  terminal  description.   If  the terminal description includes
+       extended string capabilities, e.g., from using the <STRONG>-x</STRONG>  option  of  <STRONG>tic</STRONG>,
+       then  <EM>ncurses</EM>  also defines keys for the capabilities whose names begin
+       with "k".  The corresponding keycodes are generated and  (depending  on
+       previous  loads of terminal descriptions) may differ from one execution
        of a program to the next.  The generated keycodes are recognized by the
-       <STRONG>keyname</STRONG> function (which will then return  a  name  beginning  with  "k"
-       denoting  the terminfo capability name rather than "K", used for <EM>curses</EM>
-       key-names).  On the other hand, an application can  use  <STRONG>define_key</STRONG>  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  <STRONG>tigetstr</STRONG>,  and  reassign  the  keycode to match its own
+       <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>  function (which will then return a name beginning with "k"
+       denoting the terminfo capability name rather than "K", used for  <EM>curses</EM>
+       key  names).   On the other hand, an application can use <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+       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 <STRONG>tigetstr</STRONG>, and reassign  the  keycode  to  match  its  own
        needs.
 
        Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
-       particular  string capability.  Higher-level applications which use the
-       <EM>curses</EM> <STRONG>wgetch</STRONG> and similar functions to return keycodes  rely  upon  the
+       particular string capability.  Higher-level applications which use  the
+       <EM>curses</EM>  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
        order in which the strings are loaded.  If more than one key definition
-       has the same string value, then <STRONG>wgetch</STRONG> can  return  only  one  keycode.
+       has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
        Most <EM>curses</EM> implementations (including <EM>ncurses</EM>) load key definitions in
-       the order defined by the array of string capability  names.   The  last
-       key  to  be  loaded  determines the keycode which will be returned.  In
-       <EM>ncurses</EM>, you may also have extended  capabilities  interpreted  as  key
-       definitions.   These  are  loaded  after  the predefined keys, and if a
-       capability's value is the same as a previously-loaded  key  definition,
+       the  order  defined  by the array of string capability names.  The last
+       key to be loaded determines the keycode which  will  be  returned.   In
+       <EM>ncurses,</EM>  you  may  also  have extended capabilities interpreted as key
+       definitions.  These are loaded after the  predefined  keys,  and  if  a
+       capability's  value  is the same as a previously-loaded key definition,
        the later definition is the one used.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -344,18 +345,18 @@ <H1 class="no-header">curs_inopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-cbreak_nocbreak">cbreak/nocbreak</a></li>
-<li><a href="#h3-echo_noecho">echo/noecho</a></li>
+<li><a href="#h3-cbreak_-nocbreak">cbreak, nocbreak</a></li>
+<li><a href="#h3-echo_-noecho">echo, noecho</a></li>
 <li><a href="#h3-halfdelay">halfdelay</a></li>
 <li><a href="#h3-intrflush">intrflush</a></li>
 <li><a href="#h3-keypad">keypad</a></li>
 <li><a href="#h3-meta">meta</a></li>
-<li><a href="#h3-nl_nonl">nl/nonl</a></li>
+<li><a href="#h3-nl_-nonl">nl, nonl</a></li>
 <li><a href="#h3-nodelay">nodelay</a></li>
 <li><a href="#h3-notimeout">notimeout</a></li>
-<li><a href="#h3-raw_noraw">raw/noraw</a></li>
-<li><a href="#h3-qiflush_noqiflush">qiflush/noqiflush</a></li>
-<li><a href="#h3-timeout_wtimeout">timeout/wtimeout</a></li>
+<li><a href="#h3-raw_-noraw">raw, noraw</a></li>
+<li><a href="#h3-qiflush_-nqiflush">qiflush, nqiflush</a></li>
+<li><a href="#h3-timeout_-wtimeout">timeout, wtimeout</a></li>
 <li><a href="#h3-typeahead">typeahead</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 1fbbd02d4..129673020 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.24 2023/11/25 11:32:28 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.26 2023/12/23 16:03:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -48,45 +48,63 @@ <H1 class="no-header">curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>ins_wch</STRONG>,  <STRONG>mvins_wch</STRONG>,  <STRONG>mvwins_wch</STRONG>,  <STRONG>wins_wch</STRONG>  -  insert a <EM>curses</EM> complex
-       character string in a window
+       character in a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       #include &lt;curses.h&gt;
+       <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>ins_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvins_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwins_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines, insert the complex character <EM>wch</EM> with rendition  before
-       the  character  under  the  cursor.  All characters to the right of the
-       cursor are moved one space to the right, with the  possibility  of  the
-       rightmost  character  on  the line being lost.  The insertion operation
-       does not change the cursor position.
+       These functions insert the <EM>curses</EM> complex character <EM>wch</EM> at  the  cursor
+       in  the  specified window <EM>win</EM> (or <STRONG>stdscr</STRONG>).  The character previously at
+       the cursor and any to its  right  move  one  cell  to  the  right;  the
+       rightmost  character  on  the  line  is discarded.  The cursor does not
+       advance.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       If successful, these functions return <STRONG>OK</STRONG>.  If not, they return <STRONG>ERR</STRONG>.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+
+       Functions prefixed with "mv" first perform cursor movement using  <STRONG>wmove</STRONG>
+       and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window.
+
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       A  terminal's  <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is not necessarily
+       employed.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       <STRONG>ins_wch</STRONG>, <STRONG>mvins_wch</STRONG>, and <STRONG>mvwins_wch</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses, Issue 4, describes these functions.
+
+       SVr4 describes successful return values only as "an integer value other
+       than <STRONG>ERR</STRONG>".
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr4  (1989)  implemented  these  functions  under  the  names  <STRONG>inswch</STRONG>,
+       <STRONG>winswch</STRONG>, <STRONG>mvinswch</STRONG>, and <STRONG>mvwinswch</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+       <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG> describes comparable functions in the non-wide-character
+       <EM>curses</EM> configuration.
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -94,7 +112,9 @@ <H1 class="no-header">curs_ins_wch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index f0a1be0df..0e3683c21 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.34 2023/12/16 21:09:11 tom Exp @
+  * @Id: curs_insch.3x,v 1.36 2023/12/23 16:03:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -56,49 +56,49 @@ <H1 class="no-header">curs_insch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>insch(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>winsch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvinsch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwinsch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines insert the character <EM>ch</EM> before the character  under  the
-       cursor.   All characters to the right of the cursor are moved one space
-       to the right, with the possibility of the rightmost  character  on  the
-       line  being  lost.   The insertion operation does not change the cursor
-       position.
+       These functions insert the <EM>curses</EM> character <EM>ch</EM> at  the  cursor  in  the
+       specified  window  <EM>win</EM>  (or  <STRONG>stdscr</STRONG>).   The character previously at the
+       cursor and any to its right move one cell to the right;  the  rightmost
+       character on the line is discarded.  The cursor does not advance.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
-       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
-       completion.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement using <STRONG>wmove</STRONG>
+       and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       These routines do not  necessarily  imply  use  of  a  hardware  insert
-       character feature.
+       A terminal's <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is  not  necessarily
+       employed.
 
-       Note that <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be macros.
+       <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses, Issue 4, describes these functions.
+
+       SVr4 describes successful return values only as "an integer value other
+       than <STRONG>ERR</STRONG>".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+       <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG> describes comparable functions in  the  wide-character
+       <EM>curses</EM> configuration.
 
-       Comparable  functions  in  the  wide-character  (ncursesw)  library are
-       described in <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index b4bf5283e..0996d5f73 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.29 2023/10/21 10:28:36 tom Exp @
+  * @Id: curs_legacy.3x,v 1.30 2023/12/23 16:40:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -102,12 +102,14 @@ <H1 class="no-header">curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these interfaces are provided  as  macros  and  functions.   The
-       macros   are   suppressed   (and  only  the  functions  provided)  when
-       <STRONG>NCURSES_OPAQUE</STRONG> is defined.  The standard forms such as  <STRONG>getyx</STRONG>  must  be
-       implemented  as  macros,  and  (in  this implementation) are defined in
-       terms of the functions described here, to avoid  reliance  on  internal
-       details of the <STRONG>WINDOW</STRONG> structure.
+       All of these interfaces are implemented as macros and  functions.   The
+       macros  are suppressed (and only the functions provided) in an "opaque"
+       <EM>ncurses</EM> build, which defines the  preprocessor  symbol  <STRONG>NCURSES_OPAQUE</STRONG>.
+       See section "ALTERNATE CONFIGURATIONS" in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
+
+       The standard forms such as <STRONG>getyx</STRONG> <EM>must</EM> be implemented as macros, and (in
+       this implementation) are defined in terms of  the  functions  described
+       here, to avoid reliance on internal details of the <EM>WINDOW</EM> structure.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -125,7 +127,7 @@ <H1 class="no-header">curs_legacy 3x 2023-10-21 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-21                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 0572643c8..4c1876f70 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.32 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.33 2023/12/23 16:22:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        the memory allocated by curses:
 
        <STRONG>o</STRONG>   The  portable  part  of  <STRONG>exit_curses</STRONG>  can be freed using <STRONG>delscreen</STRONG>,
-           passing the <STRONG>SCREEN*</STRONG> pointer returned by <STRONG>newterm</STRONG>.
+           passing the <EM>SCREEN</EM> pointer returned by <STRONG>newterm</STRONG>.
 
            In some implementations, there is a global variable <STRONG>sp</STRONG> which  could
            be used, e.g., if the screen were only initialized using <STRONG>initscr</STRONG>.
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 8067e30e5..a608a3503 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.82 2023/12/16 21:08:16 tom Exp @
+  * @Id: curs_mouse.3x,v 1.83 2023/12/23 20:37:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        is device-dependent.
 
 
-</PRE><H3><a name="h3-Mouse-events">Mouse events</a></H3><PRE>
+</PRE><H3><a name="h3-Mouse-Events">Mouse Events</a></H3><PRE>
        Here are the mouse event type masks which may be defined:
 
        <STRONG>Name</STRONG>                     <STRONG>Description</STRONG>
@@ -253,21 +253,10 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the preprocessor
-       can be used to  test  whether  these  features  are  present.   If  the
-       interface  is  changed,  the  value  of  <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will be
-       incremented.  These values for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may  be  specified
-       when configuring <EM>ncurses</EM>:
-
-          1  has definitions for reserved events.  The mask uses 28 bits.
-
-          2  adds  definitions  for  button  5,  removes  the  definitions for
-             reserved events.  The mask uses 29 bits.
-
-       The  order  of  the  <STRONG>MEVENT</STRONG>  structure  members  is   not   guaranteed.
+       The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
        Additional fields may be added to the structure in the future.
 
-       Under  <EM>ncurses</EM>, these calls are implemented using either xterm's built-
+       Under <EM>ncurses,</EM> these calls are implemented using either <EM>xterm</EM>'s  built-
        in mouse-tracking API or platform-specific drivers including
 
           <STRONG>o</STRONG>   Alessandro Rubini's gpm server
@@ -279,36 +268,52 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        If you are using an unsupported configuration, mouse events will not be
        visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
 
-       If  the  terminfo entry contains a <STRONG>XM</STRONG> string, this is used in the xterm
-       mouse driver to control the way the terminal is initialized  for  mouse
-       operation.   The  default,  if  <STRONG>XM</STRONG> is not found, corresponds to private
-       mode 1000 of xterm:
+       If the <EM>terminfo</EM> entry contains a <STRONG>XM</STRONG> string, this is used in  the  <EM>xterm</EM>
+       mouse  driver  to control the way the terminal is initialized for mouse
+       operation.  The default, if <STRONG>XM</STRONG> is not  found,  corresponds  to  private
+       mode 1000 of <EM>xterm:</EM>
 
           \E[?1000%?%p1%{1}%=%th%el%;
 
-       The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
+       The mouse driver also recognizes a newer <EM>xterm</EM> private mode 1006, e.g.,
 
           \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
-       intended  for  use with touch screens (which may be pressure-sensitive)
+       The  <EM>z</EM>  member  in  the  event  structure is not presently used.  It is
+       intended for use with touch screens (which may  be  pressure-sensitive)
        or with 3D-mice/trackballs/power gloves.
 
-       The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
-       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
-       position reports as a sequence of presses of buttons  4  or  5  without
+       The  <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include <STRONG>REPORT_MOUSE_POSITION</STRONG>.
+       They are distinct.  For example, in <EM>xterm,</EM>  wheel/scrolling  mice  send
+       position  reports  as  a  sequence of presses of buttons 4 or 5 without
        matching button-releases.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       These functions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and  are  not  found  in
+       SVr4   <EM>curses</EM>,   4.4BSD   <EM>curses</EM>,   or   any   other   previous  curses
+       implementation.  (SVr4 <EM>curses</EM> did have a <EM>getmouse</EM> function, which  took
+       no argument and returned a different type.)
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  calls  were  designed  for  <EM>ncurses</EM>,  and  are not found in SVr4
-       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous version of <EM>curses</EM>.
+       Applications employing the <EM>ncurses</EM> mouse extension should condition its
+       use on the visibility of the <STRONG>NCURSES_MOUSE_VERSION</STRONG> preprocessor  macro.
+       When  the  interface  changes,  the macro's value increments.  Multiple
+       versions  are  available  when  <EM>ncurses</EM>  is  configured;  see   section
+       "ALTERNATE CONFIGURATIONS" of <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.  The following values may be
+       specified.
+
+          1  has definitions for reserved events.  The mask uses 28 bits.
+
+          2  adds definitions  for  button  5,  removes  the  definitions  for
+             reserved events.  The mask uses 29 bits.
 
-       SVr4 <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It  is
-       mentioned in a few places, but with no supporting documentation:
+       SVr4  <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It is
+       mentioned in a few places, with little supporting documentation.
 
-       <STRONG>o</STRONG>   the  "libcurses" manual page lists functions for this feature which
-           are prototyped in <STRONG>curses.h</STRONG>:
+       <STRONG>o</STRONG>   Its "libcurses"  manual  page  lists  functions  for  this  feature
+           prototyped in <EM>curses.h</EM>.
 
                extern int mouse_set(long int);
                extern int mouse_on(long int);
@@ -318,7 +323,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
                extern void wmouse_position(WINDOW *, int *, int *);
                extern unsigned long getmouse(void), getbmap(void);
 
-       <STRONG>o</STRONG>   the "terminfo" manual page lists capabilities for the feature
+       <STRONG>o</STRONG>   Its "terminfo" manual page lists capabilities for the feature.
 
                buttons           btns    BT       Number of buttons on the mouse
                get_mouse         getm    Gm       Curses should get button events
@@ -326,22 +331,23 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
                mouse_info        minfo   Mi       Mouse status information
                req_mouse_pos     reqmp   RQ       Request mouse position report
 
-       <STRONG>o</STRONG>   the interface made assumptions (as does <EM>ncurses</EM>) about  the  escape
+       <STRONG>o</STRONG>   The  interface  made assumptions (as does <EM>ncurses</EM>) about the escape
            sequences sent to and received from the terminal.
 
-           For  instance the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> capability
-           to tell the terminal which mouse  button  events  it  should  send,
-           passing  the mouse-button bit mask to the terminal.  Also, it could
-           ask the terminal  where  the  mouse  was  using  the  <STRONG>req_mouse_pos</STRONG>
+           For instance, the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> capability
+           to  tell  the  terminal  which  mouse button events it should send,
+           passing the mouse-button bit mask to the terminal.  Also, it  could
+           ask  the  terminal  where  the  mouse  was  using the <STRONG>req_mouse_pos</STRONG>
            capability.
 
-           Those  features required a terminal which had been modified to work
-           with <EM>curses</EM>.  They were not part of the X Consortium's xterm.
+           Those features required a terminal program that had  been  modified
+           to work with SVr4 <EM>curses.</EM>  They were not part of the X Consortium's
+           <EM>xterm.</EM>
 
-       When developing the xterm mouse support for <EM>ncurses</EM> in September  1995,
+       When developing the <EM>xterm</EM> mouse support for <EM>ncurses</EM> in September  1995,
        Eric  Raymond  was  uninterested in using the same interface due to its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
-       in  PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does not
+       in  <EM>PDCurses</EM> 2.3 using the SVr4 interface.  <EM>PDCurses,</EM> however, does not
        use video terminals,  making  it  unnecessary  to  be  concerned  about
        compatibility with the escape sequences.
 
@@ -353,17 +359,17 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        Mouse  event  reports from <EM>xterm</EM> are not detected correctly in a window
        with keypad application mode disabled, since they are interpreted as  a
-       variety  of  function  key.  Set the the terminal's <EM>terminfo</EM> capability
-       <STRONG>kmous</STRONG> to "\E[M" (the beginning of the response  from  <EM>xterm</EM>  for  mouse
-       clicks).    Other   values  of  <STRONG>kmous</STRONG>  are  permitted  under  the  same
-       assumption, that is, the report begins with that sequence.
+       variety  of function key.  Set the terminal's <EM>terminfo</EM> capability <STRONG>kmous</STRONG>
+       to "\E[M" (the beginning of the response from <EM>xterm</EM> for mouse  clicks).
+       Other values of <STRONG>kmous</STRONG> are permitted under the same assumption, that is,
+       the report begins with that sequence.
 
        Because there are no standard response sequences that serve to identify
        terminals  supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that if
        <STRONG>kmous</STRONG> is defined in the terminal description, or if the terminal type's
        primary  name  or aliases contain the string "xterm", then the terminal
        may send mouse events.  The <STRONG>kmous</STRONG> capability is checked first, allowing
-       use of newer <EM>xterm</EM> mouse protocols such as its private mode 1006.
+       use of newer <EM>xterm</EM> mouse protocols, such as its private mode 1006.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -372,7 +378,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -381,7 +387,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-mousemask">mousemask</a></li>
-<li><a href="#h3-Mouse-events">Mouse events</a></li>
+<li><a href="#h3-Mouse-Events">Mouse Events</a></li>
 <li><a href="#h3-getmouse">getmouse</a></li>
 <li><a href="#h3-ungetmouse">ungetmouse</a></li>
 <li><a href="#h3-wenclose">wenclose</a></li>
@@ -393,6 +399,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 97e81782b..3fde9295e 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_print.3x,v 1.36 2023/12/23 16:36:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -84,11 +84,14 @@ <H1 class="no-header">curs_print 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        sent to the printer.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>mcprint</STRONG> was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and was not found in SVr4 <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>mcprint</STRONG>  call  was  designed for <EM>ncurses</EM>, and is not found in SVr4
-       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous version of <EM>curses</EM>.  It  is
-       recommended   that   any   code  depending  on  <EM>ncurses</EM>  extensions  be
-       conditioned using <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing this <EM>ncurses</EM> extension should condition its  use
+       on the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
@@ -100,7 +103,7 @@ <H1 class="no-header">curs_print 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -108,6 +111,7 @@ <H1 class="no-header">curs_print 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 47ac8e5e7..9a312a058 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.45 2023/12/18 00:03:28 tom Exp @
+  * @Id: curs_printw.3x,v 1.47 2023/12/23 14:41:07 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
   *   libcurses/printw.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            using the <EM>stdarg.h</EM> interface.
 
        <STRONG>o</STRONG>   X/Open  Curses,  Issue  5,  Draft 2 (December 2007) marked <STRONG>vwprintw</STRONG>
-           (along with <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.  After
+           (along with <STRONG>vwscanw</STRONG> and the <EM>termcap</EM> interface) as withdrawn.  After
            incorporating  review  comments, this became X/Open Curses, Issue 7
            (2009).
 
@@ -152,7 +152,7 @@ <H1 class="no-header">curs_printw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index a0b8d7ccc..2c549ce4c 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.44 2023/12/17 22:50:40 tom Exp @
+  * @Id: curs_scanw.3x,v 1.47 2023/12/23 14:41:50 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
   *  libcurses/scanw.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            using the <EM>stdarg.h</EM> interface.
 
        <STRONG>o</STRONG>   X/Open Curses, Issue 5, Draft  2  (December  2007)  marked  <STRONG>vwscanw</STRONG>
-           (along with <STRONG>vwscanw</STRONG> and the termcap interface) as withdrawn.  After
+           (along with <STRONG>vwscanw</STRONG> and the <EM>termcap</EM> interface) as withdrawn.  After
            incorporating review comments, this became X/Open Curses,  Issue  7
            (2009).
 
@@ -162,9 +162,9 @@ <H1 class="no-header">curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
        SVr3 (1987) added <STRONG>mvscanw</STRONG>, and <STRONG>mvwscanw</STRONG>, stating
 
-              These  routines  correspond  to <STRONG>scanf(3S)</STRONG>, as do their arguments
+              "[t]hese routines correspond to <STRONG>scanf(3S)</STRONG>, as do their arguments
               and return values.  <STRONG>wgetstr</STRONG>() is called on the window,  and  the
-              resulting line is used as input for the scan.
+              resulting line is used as input for the scan."
 
        SVr3  also  implemented  <STRONG>vwscanw</STRONG>,  describing  its third parameter as a
        <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in <EM>varargs.h</EM>, and referred the reader  to  the  manual
@@ -184,7 +184,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 738695356..e943b6c59 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.45 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.46 2023/12/23 16:26:05 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -225,12 +225,12 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        This  implementation  can  be  configured to provide a set of functions
        which improve the ability to manage multiple screens.  This feature can
        be added to any of the configurations supported by <EM>ncurses</EM>; it adds new
-       entrypoints without changing the meaning of any of the existing ones.
+       symbols without changing the meaning of any of the existing ones.
 
 
-</PRE><H3><a name="h3-IMPROVED-FUNCTIONS">IMPROVED FUNCTIONS</a></H3><PRE>
+</PRE><H3><a name="h3-Improved-Functions">Improved Functions</a></H3><PRE>
        Most of the functions  are  new  versions  of  existing  functions.   A
-       parameter  is added at the front of the parameter list.  It is a SCREEN
+       parameter  is added at the front of the parameter list.  It is a <EM>SCREEN</EM>
        pointer.
 
        The existing functions all use the current screen, which  is  a  static
@@ -239,7 +239,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        multiple screens.
 
 
-</PRE><H3><a name="h3-NEW-FUNCTIONS">NEW FUNCTIONS</a></H3><PRE>
+</PRE><H3><a name="h3-New-Functions">New Functions</a></H3><PRE>
        Here are the new functions:
 
        ceiling_panel
@@ -254,8 +254,8 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
             With  the  screen-pointer extension, there are situations where it
             must create a current screen before the unextended  library  does.
             The  <STRONG>new_prescr</STRONG> function is used internally to handle these cases.
-            It is also provided as an  entrypoint  to  allow  applications  to
-            customize the library initialization.
+            It is also provided to allow  applications  to  customize  library
+            initialization.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -305,8 +305,8 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-IMPROVED-FUNCTIONS">IMPROVED FUNCTIONS</a></li>
-<li><a href="#h3-NEW-FUNCTIONS">NEW FUNCTIONS</a></li>
+<li><a href="#h3-Improved-Functions">Improved Functions</a></li>
+<li><a href="#h3-New-Functions">New Functions</a></li>
 </ul>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 85c315547..fff45be48 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.76 2023/12/18 00:22:30 tom Exp @
+  * @Id: curs_termcap.3x,v 1.80 2023/12/23 20:19:05 tom Exp @
   * See &lt;https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
   *   termlib/termcap.c&gt;.
   * See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
@@ -46,7 +46,7 @@
   * Observe the `tncktc()`, `tnamatch()`, `tskip()`, and `tdecode()`
   * entry points disappearing from termcap.c.
   * 2BSD became a branch retaining support for non-virtual memory
-  * systems (like the PDP-11) whereas most BSD development focused on
+  * systems (such as the PDP-11) whereas most BSD development focused on
   * the VAX and other VM-enabled systems starting with 3BSD.
   * This man page previously located a termcap.h in 2BSD, but that may
   * be confusion arising from its backport to 2.9BSD (and still present
@@ -62,12 +62,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -106,15 +106,15 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        <STRONG>tgetent</STRONG> loads the terminal database entry for <EM>name</EM>; see <STRONG><A HREF="term.7.html">term(7)</A></STRONG>.   This
-       must be done before calling any of the other functions.  It returns:
+       must be done before calling any of the other functions.  It returns
 
-          1   on success,
+          1    on success,
 
-          0   if  there is no such entry (or if the matching entry describes a
-              generic terminal,  having  too  little  information  for  <EM>curses</EM>
-              applications to run), and
+          0    if there is no such entry (or if the matching entry describes a
+               generic terminal, having  too  little  information  for  <EM>curses</EM>
+               applications to run), and
 
-          -1  if the <EM>terminfo</EM> database could not be found.
+          -1   if the <EM>terminfo</EM> database could not be found.
 
        This implementation differs from those of historical <EM>termcap</EM> libraries.
 
@@ -126,10 +126,10 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
               form, which is not the same thing.
 
           <STRONG>o</STRONG>   The meanings of the  return  values  differ.   The  BSD  <EM>termcap</EM>
-              library  does not check whether the terminal type description is
-              marked  with  the  <STRONG>gn</STRONG>  (<STRONG>generic</STRONG>)  capability,  nor  whether  the
-              terminal  type  description  supports  an  addressable cursor, a
-              property essential for any <EM>curses</EM> implementation to operate.
+              library  does  not  check  whether the terminal type description
+              includes the <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability, nor whether  the  terminal
+              type  description  supports  an  addressable  cursor, a property
+              essential for any <EM>curses</EM> implementation to operate.
 
 
 </PRE><H3><a name="h3-Retrieving-Capability-Values">Retrieving Capability Values</a></H3><PRE>
@@ -175,9 +175,9 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            Doing  so  reveals  a  quirk  in <STRONG>tgoto</STRONG>: most hardware terminals use
            cursor addressing with <EM>row</EM> first, but the  original  developers  of
            the  <EM>termcap</EM>  interface  chose  to  put  the <EM>col</EM> (column) parameter
-           first.  The <STRONG>tgoto</STRONG> function swaps the order of parameters.  It  does
-           this  even  for  calls  requiring only a single parameter.  In that
-           case, the first parameter is merely a placeholder.
+           first.  The <STRONG>tgoto</STRONG> function swaps the order of its  parameters.   It
+           does  this  even  for  calls requiring only a single parameter.  In
+           that case, the first parameter is merely a placeholder.
 
        <STRONG>o</STRONG>   Normally the <EM>ncurses</EM>  library  is  compiled  without  full  <EM>termcap</EM>
            support.  In that case, <STRONG>tgoto</STRONG> uses an internal version of <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>
@@ -191,7 +191,7 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            applications should not rely upon its availability.
 
        <STRONG>tputs</STRONG>  is described in <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>.  It can retrieve capabilities
-       by either <EM>termcap</EM> or <EM>terminfo</EM> name.
+       by either <EM>termcap</EM> or <EM>terminfo</EM> code.
 
 
 </PRE><H3><a name="h3-Global-Variables">Global Variables</a></H3><PRE>
@@ -214,8 +214,8 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
               del_curterm(cur_term);
        to  free  this  memory,  but  there  is an additional complication with
        <EM>ncurses</EM>.  It uses a fixed-size pool of storage locations, one per value
-       of the <EM>TERM</EM> environment variable when <STRONG>tgetent</STRONG> is called.  The <STRONG>screen(1)</STRONG>
-       program relies upon this arrangement to improve its performance.
+       of the terminal name parameter given to <STRONG>tgetent</STRONG>.  The <STRONG>screen(1)</STRONG> program
+       relies upon this arrangement to improve its performance.
 
        An application that uses only the <EM>termcap</EM>  functions,  not  the  higher
        level  <EM>curses</EM>  API,  could  release  the  memory using <STRONG><A HREF="curs_terminfo.3x.html">del_curterm(3x)</A></STRONG>,
@@ -255,18 +255,18 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
        <STRONG>o</STRONG>   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
-           functions.  However, they are marked "TO BE WITHDRAWN".
+           functions, marking them as "TO BE WITHDRAWN".
 
-       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) marked the <EM>termcap</EM>  interface  (along
+       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) marks the  <EM>termcap</EM>  interface  (along
            with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
 
        Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
-       values of <STRONG>tgetent</STRONG> correctly, though all three  were  in  fact  returned
-       ever  since  SVr1.   In  particular,  an  omission in the X/Open Curses
-       specification has been misinterpreted to mean that <STRONG>tgetent</STRONG>  returns  <STRONG>OK</STRONG>
-       or  <STRONG>ERR</STRONG>.   Because  the  purpose  of  these  functions  is  to  provide
-       compatibility with the <EM>termcap</EM> library, that  is  a  defect  in  X/Open
-       Curses, Issue 4, Version 2 rather than in <EM>ncurses</EM>.
+       values of <STRONG>tgetent</STRONG> correctly, though all three shown here were  in  fact
+       returned  ever  since  SVr1.   In particular, an omission in the X/Open
+       Curses specification has  been  misinterpreted  to  mean  that  <STRONG>tgetent</STRONG>
+       returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>.   Because  the  purpose  of these functions is to
+       provide compatibility with the <EM>termcap</EM> library, that  is  a  defect  in
+       X/Open Curses, Issue 4, Version 2 rather than in <EM>ncurses</EM>.
 
    <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <EM>termcap</EM>
        Externally  visible  variables  are  provided  for  support  of certain
@@ -313,36 +313,35 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
        4BSD  (November 1980) renamed <EM>termlib</EM> to <EM>termcap</EM> and added another test
        program.  The library remained much the same though 4.3BSD (June 1986).
-       4.4BSD-Lite (June 1994) refactored it but left the API unchanged.
+       4.4BSD-Lite (June 1994) refactored it, leaving the API unchanged.
 
-       Function  prototypes  were  a feature of the forthcoming ANSI C (1989).
-       Thus the library provided no header file declaring them.  Nevertheless,
-       the  BSD  sources  included  two  different <EM>termcap.h</EM> header files over
-       time.
+       Function  prototypes were a feature of ANSI C (1989).  Thus the library
+       itself provided no header file declaring them.  Nevertheless,  the  BSD
+       sources included two different <EM>termcap.h</EM> header files over time.
 
        <STRONG>o</STRONG>   One was used internally by <STRONG>jove(1)</STRONG> from 4.3BSD onward.  It delcared
            global symbols for the <EM>termcap</EM> variables that it used.
 
-       <STRONG>o</STRONG>   The  other appeared in 4.4BSD-Lite Release 2 (June 1995) as part of
-           <EM>libedit</EM> (also known as the <EM>editline</EM> library).  CSRG source  history
+       <STRONG>o</STRONG>   The other appeared in 4.4BSD-Lite Release 2 (June 1995) as part  of
+           <EM>libedit</EM>  (also known as the <EM>editline</EM> library).  CSRG source history
            shows that this was added in mid-1992.  The <EM>libedit</EM> header file was
            used  internally  as  a  convenience  for  compiling  the  <EM>editline</EM>
            library.  It declared function prototypes, but no global variables.
            This header file was added to NetBSD's <EM>termcap</EM> library in mid-1994.
 
-       Meanwhile, GNU <EM>termcap</EM> began development in 1990.   Its  first  release
-       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header.   Its  second (1.1) in
-       September 1992 modified the  header  to  use  <EM>const</EM>  for  the  function
-       prototypes  in  the  header where one would expect the parameters to be
+       Meanwhile,  GNU  <EM>termcap</EM>  began development in 1990.  Its first release
+       (1.0) in 1991  included  a  <EM>termcap.h</EM>  header.   Its  second  (1.1)  in
+       September  1992  modified  the  header  to  use  <EM>const</EM> for the function
+       prototypes in the header where one would expect the  parameters  to  be
        read-only.   BSD  <EM>termcap</EM>  did  not.   The  prototype  for  <STRONG>tputs</STRONG>  also
-       differed,  but  in that instance, it was <EM>libedit</EM> that differed from BSD
+       differed, but in that instance, it was <EM>libedit</EM> that differed  from  BSD
        <EM>termcap</EM>.
 
-       GNU <EM>termcap</EM> 1.3 was bundled  with  <EM>bash</EM>  in  mid-1993  to  support  the
+       GNU  <EM>termcap</EM>  1.3  was  bundled with <STRONG>bash(1)</STRONG> in mid-1993 to support the
        <STRONG>readline(3)</STRONG> library.
 
-       <EM>ncurses</EM>  1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It reflected
-       influence  from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than   <STRONG>jove(1)</STRONG>),
+       <EM>ncurses</EM> 1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It  reflected
+       influence   from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than  <STRONG>jove(1)</STRONG>),
        providing the following interface:
 
        <STRONG>o</STRONG>   global symbols used by <EM>emacs</EM>,
@@ -351,43 +350,43 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG>, a GNU <EM>termcap</EM> feature.
 
-       Later  (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.  Any
-       two of the four implementations thus differ, and programs  that  intend
+       Later (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.   Any
+       two  of  the four implementations thus differ, and programs that intend
        to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>ca</STRONG> or any other parameterized string
-       capability, be aware that it is returned in <EM>terminfo</EM> notation, not  the
-       older  and  not-quite-compatible <EM>termcap</EM> notation.  This does not cause
-       problems if all you do with it is  call  <STRONG>tgoto</STRONG>  or  <STRONG>tparm</STRONG>,  which  both
-       expand  <EM>terminfo</EM>-style  strings  as  <EM>terminfo</EM>  does.   (If  <EM>ncurses</EM>  is
-       configured to support <EM>termcap,</EM> <STRONG>tgoto</STRONG> checks whether the string is <EM>term-</EM>
-       <EM>info</EM>-style  by  looking  for  "<STRONG>%p</STRONG>"  parameters  or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>" delays, and
-       invokes a <EM>termcap</EM>-style parser if the string appears not to  use  <EM>term-</EM>
-       <EM>info</EM> syntax.)
-
-       Because  <EM>terminfo</EM>'s  syntax  for padding in string capabilities differs
+       If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>column_address</STRONG>  (<STRONG>ch</STRONG>)  or  any  other
+       parameterized  string capability, be aware that it is returned in <EM>term-</EM>
+       <EM>info</EM> notation, not the older and not-quite-compatible <EM>termcap</EM> notation.
+       This  does  not  cause  problems if all you do with it is call <STRONG>tgoto</STRONG> or
+       <STRONG>tparm</STRONG>, which both expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.   (If
+       <EM>ncurses</EM>  is  configured  to  support  <EM>termcap,</EM> <STRONG>tgoto</STRONG> checks whether the
+       string is <EM>terminfo</EM>-style by looking  for  "<STRONG>%p</STRONG>"  parameters  or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"
+       delays, and invokes a <EM>termcap</EM>-style parser if the string appears not to
+       use <EM>terminfo</EM> syntax.)
+
+       Because <EM>terminfo</EM>'s syntax for padding in  string  capabilities  differs
        from <EM>termcap</EM>'s, users can be surprised.
 
-       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a <EM>terminfo</EM> system transmits "50" rather  than  busy-
+       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG>  in  a <EM>terminfo</EM> system transmits "50" rather than busy-
            waiting for 50 milliseconds.
 
-       <STRONG>o</STRONG>   However,  if  <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it may also
+       <STRONG>o</STRONG>   However, if <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it  may  also
            have been configured to support BSD-style padding.
 
-           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
+           In  that  case,  <STRONG>tputs</STRONG>  inspects  strings passed to it, looking for
            digits at the beginning of the string.
 
-           <STRONG>tputs("50")</STRONG>  in  a <EM>termcap</EM> system may busy-wait for 50 milliseconds
+           <STRONG>tputs("50")</STRONG> in a <EM>termcap</EM> system may busy-wait for  50  milliseconds
            rather than transmitting "50".
 
-       <EM>termcap</EM>  has  nothing  analogous  to  <EM>terminfo</EM>'s   <STRONG>sgr</STRONG>   string.    One
-       consequence  is  that <EM>termcap</EM> applications assume that "<STRONG>me</STRONG>" (equivalent
-       to <EM>terminfo</EM>'s <STRONG>sgr0</STRONG> capability) does not reset the  alternate  character
-       set.   <EM>ncurses</EM>  checks  for,  and  modifies  the  data shared with, the
-       <EM>termcap</EM> interface  to  accommodate  the  latter's  limitation  in  this
-       respect.
+       <EM>termcap</EM>  has  nothing  analogous  to  <EM>terminfo</EM>'s  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)
+       capability.  One consequence is that <EM>termcap</EM> applications  assume  that
+       "<STRONG>me</STRONG>"  (equivalent  to <EM>terminfo</EM>'s <STRONG>exit_attribute_mode</STRONG> (<STRONG>sgr0</STRONG>) capability)
+       does not reset the alternate character set.  <EM>ncurses</EM>  checks  for,  and
+       modifies the data shared with, the <EM>termcap</EM> interface to accommodate the
+       latter's limitation in this respect.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -397,7 +396,7 @@ <H1 class="no-header">curs_termcap 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index eb8b33e49..a800bfbe4 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.123 2023/12/16 21:11:53 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.124 2023/12/23 17:34:39 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,6 +37,8 @@
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
+  * See X/Open Curses Issue 4, Version 2, pp. 227-234.
+  * See X/Open Curses Issue 7, pp. 311-318.
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -46,12 +48,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -110,6 +112,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>char</STRONG> <STRONG>*tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
        <STRONG>int</STRONG> <STRONG>tiscan_s(int</STRONG> <STRONG>*</STRONG><EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
 
+       <EM>/*</EM> <EM>deprecated</EM> <EM>*/</EM>
+       <STRONG>int</STRONG> <STRONG>setterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>);</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These low-level routines must be called by programs that have  to  deal
@@ -220,7 +225,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
        The  <STRONG>setupterm</STRONG>  routine  stores its information about the terminal in a
-       <STRONG>TERMINAL</STRONG> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
+       <EM>TERMINAL</EM> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
        detects  an error, or decides that the terminal is unsuitable (hardcopy
        or generic), it discards this information, making it not  available  to
        applications.
@@ -306,7 +311,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or 1 if not applicable.
 
-       <STRONG>o</STRONG>   <EM>putc</EM> is a <STRONG>putchar</STRONG>-like routine to which the characters are  passed,
+       <STRONG>o</STRONG>   <EM>putc</EM> is a <EM>putchar</EM>-like function to which the characters are passed,
            one at a time.
 
            If  <STRONG>tputs</STRONG>  processes  a  time-delay,  it  uses the <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
@@ -318,11 +323,11 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        The <STRONG>vidputs</STRONG> routine displays the string on the terminal  in  the  video
        attribute mode <EM>attrs</EM>, which is any combination of the attributes listed
-       in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.  The characters are passed to the  <STRONG>putchar</STRONG>-like  routine
+       in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.  The characters are passed to the <EM>putchar</EM>-like  function
        <EM>putc</EM>.
 
        The <STRONG>vidattr</STRONG> routine is like the <STRONG>vidputs</STRONG> routine, except that it outputs
-       through <STRONG>putchar</STRONG>.
+       through <EM>putchar</EM>.
 
        The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines correspond to vidattr  and  vidputs,
        respectively.   They  use a set of arguments for representing the video
@@ -413,7 +418,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   to improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
            terminfo  strings  for  their parameter types.  That is stored as a
-           binary tree referenced from the <STRONG>TERMINAL</STRONG> structure.
+           binary tree referenced from the <EM>TERMINAL</EM> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
        they  do  not free this memory, but it is possible to do that using the
@@ -456,35 +461,51 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open notes that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros.
+       According to X/Open Curses, any of the <EM>enhanced</EM> <EM>curses</EM> functions may be
+       implemented  as  macros.   The  term  "enhanced" refers to features not
+       found in SVr4 curses.
+
+       <STRONG>ncurses</STRONG> uses macros
+
+       <STRONG>o</STRONG>   for functions which return values via their parameters,
+
+       <STRONG>o</STRONG>   to support obsolete features,
+
+       <STRONG>o</STRONG>   to reuse functions, e.g., those that move the cursor before another
+           operation, and
+
+       <STRONG>o</STRONG>   a few special cases.
+
+       The  <STRONG>vid_puts</STRONG> function in <STRONG>ncurses</STRONG> is a special case.  It was originally
+       implemented based on a draft of X/Open Curses, as a macro, before other
+       parts of the <STRONG>ncurses</STRONG> wide-character API were developed.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
-       are  not  found  in  SVr4  curses, 4.4BSD curses, or any other previous
-       version of curses.
+       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
+       are not found in SVr4 <EM>curses</EM>, 4.4BSD  <EM>curses</EM>,  or  any  other  previous
+       curses implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The function <STRONG>setterm</STRONG> is not described by X/Open and must be  considered
-       non-portable.  All other functions are as described by X/Open.
+       <STRONG>setterm</STRONG> is not described by X/Open and must be considered non-portable.
+       All other functions are as described by X/Open.
 
 
 </PRE><H3><a name="h3-Compatibility-Macros">Compatibility Macros</a></H3><PRE>
-       This  implementation  provides  a  few  macros  for  compatibility with
-       systems before SVr4 (see  <EM>HISTORY</EM>).   Those  include  <STRONG>crmode</STRONG>,  <STRONG>fixterm</STRONG>,
-       <STRONG>gettmode</STRONG>, <STRONG>nocrmode</STRONG>, <STRONG>resetterm</STRONG>, <STRONG>saveterm</STRONG>, and <STRONG>setterm</STRONG>.
+       This implementation  provides  a  few  macros  for  compatibility  with
+       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
+       <STRONG>Bcrmode</STRONG>, <STRONG>Bfixterm</STRONG>, <STRONG>Bgettmode</STRONG>,  <STRONG>Bnocrmode</STRONG>,  <STRONG>Bresetterm</STRONG>,  <STRONG>Bsaveterm</STRONG>,  and
+       <STRONG>Bsetterm</STRONG>.
 
-       In  SVr4,  those  are  found in <STRONG>&lt;curses.h&gt;</STRONG>, but except for <STRONG>setterm</STRONG>, are
+       In  SVr4,  these  are  found  in  <EM>curses.h</EM>, but except for <STRONG>setterm</STRONG>, are
        likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
-       page.   The  manual page notes that the <STRONG>setterm</STRONG> routine was replaced by
-       <STRONG>setupterm</STRONG>, stating that the call
-
-              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
-
-       provides  the  same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,   and   is   not
-       recommended  for  new  programs.   This implementation provides each of
-       those symbols as macros for BSD compatibility.
+       page.  It further notes that <STRONG>setterm</STRONG> was replaced by <STRONG>setupterm</STRONG>, stating
+       that the call
+              setupterm(<EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
+       provides the same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  discouraging  the
+       latter  for  new programs.  <EM>ncurses</EM> implements each of these symbols as
+       macros for BSD <EM>curses</EM> compatibility.
 
 
 </PRE><H3><a name="h3-Legacy-Data">Legacy Data</a></H3><PRE>
@@ -599,7 +620,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the curses state may not match
        the actual terminal state, and that an  application  should  touch  and
        refresh  the  window before resuming normal curses calls.  Both <EM>ncurses</EM>
-       and System V Release 4 curses implement <STRONG>mvcur</STRONG>  using  the  SCREEN  data
+       and System V Release 4 curses implement <STRONG>mvcur</STRONG>  using  the  <EM>SCREEN</EM>  data
        allocated  in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as
        a terminfo function, <STRONG>mvcur</STRONG> is really a curses  function  which  is  not
        well specified.
@@ -618,9 +639,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>fixterm</STRONG>     restore tty to "in curses" state
        <STRONG>gettmode</STRONG>    establish current tty modes
        <STRONG>mvcur</STRONG>       low level cursor motion
-
        <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
-                   <STRONG>putchar</STRONG>.
+                   <EM>putchar</EM>.
        <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
        <STRONG>resetty</STRONG>     reset tty flags to stored value
        <STRONG>saveterm</STRONG>    save current modes as "in curses" state
@@ -629,7 +649,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>setupterm</STRONG>   establish terminal with given type
        <STRONG>tparm</STRONG>       instantiate a string expression with parameters
        <STRONG>tputs</STRONG>       apply padding information to a string
-       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG>
+       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <EM>putchar</EM>
        <STRONG>vidputs</STRONG>     output  a  string  to  put  terminal  in  a specified video
                    attribute mode
 
@@ -646,7 +666,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>tputs</STRONG>      apply  padding  to  capability,  calling  a  function to put
                   characters
 
-       Early terminfo programs obtained capability values  from  the  <STRONG>TERMINAL</STRONG>
+       Early terminfo programs obtained capability values  from  the  <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
        SVr3  extended  terminfo  by  adding  functions  to retrieve capability
@@ -654,6 +674,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
+
        <STRONG>tigetflag</STRONG>   get boolean entry for given <EM>id</EM>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
@@ -680,7 +701,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        descriptions,   e.g.,   <STRONG>set_curterm</STRONG>.   Some  of  that  was  incremental
        improvements to the SVr2 library:
 
-       <STRONG>o</STRONG>   The <STRONG>TERMINAL</STRONG> type definition was introduced  in  SVr3.01,  for  the
+       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
            <STRONG>term</STRONG> structure provided in SVr2.
 
        <STRONG>o</STRONG>   The  various  global  variables such as <STRONG>boolnames</STRONG> were mentioned in
@@ -701,7 +722,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index b7e6078eb..7dad4feaa 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.50 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_threads.3x,v 1.51 2023/12/23 16:22:25 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -619,7 +619,7 @@ <H1 class="no-header">curs_threads 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 295fa5216..5654fbe92 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.41 2023/12/16 20:50:14 tom Exp @
+  * @Id: curs_trace.3x,v 1.42 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index ce1aec47f..af4eeda3b 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.91 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_util.3x,v 1.92 2023/12/23 16:24:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -212,7 +212,7 @@ <H1 class="no-header">curs_util 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        that data.  It returns a pointer to the new window.  There  are  a  few
        caveats:
 
-       <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <STRONG>WINDOW</STRONG> structure, and its
+       <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <EM>WINDOW</EM> structure, and its
            associated character cells.  The format differs between  the  wide-
            character  (<EM>ncursesw</EM>)  and  non-wide  (<EM>ncurses</EM>) libraries.  You can
            transfer data between the two, however.
@@ -317,7 +317,7 @@ <H1 class="no-header">curs_util 3x 2023-12-16 ncurses 6.4 Library calls</H1>
            1988)  incorporated  into SVr4.  Oddly, there are no such functions
            in the 4.3BSD curses sources.
 
-       <STRONG>o</STRONG>   Most implementations simply dump the binary <STRONG>WINDOW</STRONG> structure to the
+       <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
            file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
            older <EM>ncurses</EM> versions.  This implementation (as well as the X/Open
            variant of Solaris curses, dated 1995) uses textual dumps.
@@ -391,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index ed617925d..616d96e0f 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,20 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.35 2023/12/16 21:05:52 tom Exp @
+  * @Id: curs_variables.3x,v 1.40 2023/12/23 23:10:13 tom Exp @
+  * SVID 4, Volume 3, p. 408
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -47,9 +48,9 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <EM>bool</EM>,  <EM>chtype</EM>,  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, <EM>WINDOW</EM>, <STRONG>TRUE</STRONG>, <STRONG>FALSE</STRONG>, <STRONG>ERR</STRONG>, <STRONG>OK</STRONG>, <STRONG>COLORS</STRONG>,
-       <STRONG>COLOR_PAIRS</STRONG>, <STRONG>COLS</STRONG>, <STRONG>ESCDELAY</STRONG>, <STRONG>LINES</STRONG>, <STRONG>TABSIZE</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>,  <STRONG>stdscr</STRONG>  -
-       <EM>curses</EM> data types, constants, and global variables
+       <EM>bool</EM>,  <EM>chtype</EM>,  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, <EM>SCREEN</EM>, <EM>WINDOW</EM>, <STRONG>TRUE</STRONG>, <STRONG>FALSE</STRONG>, <STRONG>ERR</STRONG>, <STRONG>OK</STRONG>,
+       <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, <STRONG>stdscr</STRONG>, <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLS</STRONG>,  <STRONG>LINES</STRONG>,  <STRONG>ESCDELAY</STRONG>,
+       <STRONG>TABSIZE</STRONG> - <EM>curses</EM> data types, constants, and global variables
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -60,6 +61,7 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
        <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>chtype;</STRONG>
        <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>cchar_t;</STRONG>
        <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>attr_t;</STRONG>
+       <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>SCREEN;</STRONG>
        <STRONG>typedef</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>WINDOW;</STRONG>
 
        <EM>/*</EM> <EM>constants</EM> <EM>*/</EM>
@@ -70,12 +72,13 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
        <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>OK;</STRONG>
 
        <EM>/*</EM> <EM>variables</EM> <EM>*/</EM>
-       <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLORS;</STRONG>
+       <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLS;</STRONG>
        <STRONG>int</STRONG> <STRONG>LINES;</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>curscr;</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>stdscr;</STRONG>
+
        <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>ESCDELAY;</STRONG>
        <STRONG>int</STRONG> <STRONG>TABSIZE;</STRONG>
@@ -93,11 +96,11 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
        library.
 
 
-</PRE><H3><a name="h3-bool_-TRUE_-FALSE"><EM>bool,</EM> TRUE, FALSE</a></H3><PRE>
-       X/Open Issue 4 <EM>curses</EM>  (1996)  preceded  the  ISO  C99  and  ISO  C++98
-       standards,  each of which also defined a Boolean data type.  The <EM>curses</EM>
-       library requires an integral type <EM>bool</EM> and constants <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>  to
-       store its two possible values.
+</PRE><H2><a name="h2-CONSTANTS">CONSTANTS</a></H2><PRE>
+
+</PRE><H3><a name="h3-TRUE_-FALSE">TRUE, FALSE</a></H3><PRE>
+       The <EM>curses</EM> library defines <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG> to represent  the  values  of
+       the Boolean data type.
 
 
 </PRE><H3><a name="h3-ERR_-OK">ERR, OK</a></H3><PRE>
@@ -105,109 +108,113 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
        values indicating failure and success, respectively.
 
 
+</PRE><H2><a name="h2-PREDEFINED-TYPES">PREDEFINED TYPES</a></H2><PRE>
+
+</PRE><H3><a name="h3-bool"><EM>bool</EM></a></H3><PRE>
+       X/Open Issue 4 <EM>curses</EM>  (1996)  preceded  the  ISO  C99  and  ISO  C++98
+       standards,  each of which also defined a Boolean data type.  The <EM>curses</EM>
+       library requires an integral type <EM>bool</EM>.
+
+       <STRONG>ncurses</STRONG>' configure script attempts to discover the data  type  used  by
+       the system's C and C++ compilers, to reuse for the <EM>curses</EM> <EM>bool</EM>.
+
+
 </PRE><H3><a name="h3-chtype"><EM>chtype</EM></a></H3><PRE>
-       The <EM>chtype</EM> integral type combines a ("narrow",  8-bit)  character  with
-       attributes  encoding  the character's <EM>rendition</EM>, such as the styling of
+       The  <EM>chtype</EM>  integral  type combines a ("narrow", 8-bit) character with
+       attributes encoding the character's <EM>rendition</EM>, such as the  styling  of
        its  typeface  and/or  foreground  and  background  colors.   See,  for
        example, <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>, and <STRONG><A HREF="curs_inch.3x.html">inch(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-cchar_t_-attr_t"><EM>cchar_t,</EM> attr_t</a></H3><PRE>
-       <EM>chtype</EM>  is  too small for the standard C library's wide-character type,
-       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>.  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> is a type that can accommodate an <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  and  enough
-       wide  characters  to  store  what  Unicode  terms a <EM>grapheme</EM> <EM>cluster</EM> (a
-       "user-perceived character" [UAX #29], which  may  nevertheless  require
-       several  character encoding units to represent).  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> is an integral
-       type storing "wide"  attributes  that  apply  to  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>s.   See,  for
+       <EM>chtype</EM> is too small for the standard C library's  wide-character  type,
+       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>.   <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is a type that can accommodate an <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> and enough
+       wide characters to store what  Unicode  terms  a  <EM>grapheme</EM>  <EM>cluster</EM>  (a
+       "user-perceived  character"  [UAX  #29], which may nevertheless require
+       several character encoding units to represent).  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> is an  integral
+       type  storing  "wide"  attributes  that  apply  to  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>s.  See, for
        example, <STRONG><A HREF="curs_add_wch.3x.html">add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attr_on(3x)</A></STRONG>, and <STRONG><A HREF="curs_in_wch.3x.html">in_wch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
-       Once  <EM>curses</EM>  is  initialized, <STRONG>COLOR_PAIRS</STRONG> contains the number of color
-       pairs supported by the terminal.   Often,  its  value  is  the  product
-       <STRONG>COLORS</STRONG> x <STRONG>COLORS</STRONG>, but this is not always true.
+</PRE><H3><a name="h3-SCREEN"><EM>SCREEN</EM></a></H3><PRE>
+       <EM>curses</EM>  manages  a  terminal  device  with  this  structure  type;  see
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>.
+
 
-       <STRONG>o</STRONG>   A few terminals use HLS colors, ignoring this rule; and
+</PRE><H3><a name="h3-WINDOW"><EM>WINDOW</EM></a></H3><PRE>
+       <EM>curses</EM>  represents rectangular portions of the terminal screen with the
+       <EM>WINDOW</EM> structure type; see subsection "Overview" of <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   terminals  supporting  a  large number of colors are limited by the
-           number of color pairs that a <EM>signed</EM> <EM>short</EM> value can represent.
+
+</PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
+
+</PRE><H3><a name="h3-curscr_-stdscr_-newscr">curscr, stdscr, newscr</a></H3><PRE>
+       The library records updates to the terminal screen in  a  window  named
+       <STRONG>curscr</STRONG>.   This  object  is  referred  to  as  the  "physical screen" in
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
+
+       <EM>ncurses</EM> collects pending updates to the terminal  screen  in  a  window
+       named  <STRONG>newscr</STRONG>.   This  object is referred to as the "virtual screen" in
+       the <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.  When  the
+       screen  is  refreshed, <EM>curses</EM> determines a minimal set of updates using
+       the terminal's capabilities to make <STRONG>curscr</STRONG> look like <STRONG>newscr</STRONG>.
+
+       Once <EM>curses</EM> is initialized, it creates a window named  <STRONG>stdscr</STRONG>.   It  is
+       the  same size as the terminal screen and is the default window used by
+       routines that do not take a parameter  identifying  one.   Many  <EM>curses</EM>
+       functions use this window.
 
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
-       Once <EM>curses</EM> is  initialized,  <STRONG>COLORS</STRONG>  contains  the  number  of  colors
-       supported by the terminal.
+       Once  <EM>curses</EM>  is  initialized,  <STRONG>COLORS</STRONG>  contains  the  number of colors
+       supported by the terminal; see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-COLS">COLS</a></H3><PRE>
-       Once  <EM>curses</EM>  is  initialized,  <STRONG>COLS</STRONG>  contains  the  screen's  width in
-       character cells; that is, the number of columns.
+</PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
+       Once <EM>curses</EM> is initialized, <STRONG>COLOR_PAIRS</STRONG> contains the  number  of  color
+       pairs supported by the terminal; see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
+
+
+</PRE><H3><a name="h3-COLS_-LINES">COLS, LINES</a></H3><PRE>
+       Once  <EM>curses</EM>  is initialized, <STRONG>COLS</STRONG> and <STRONG>LINES</STRONG> contain the screen's width
+       and height in character cells, respectively; that  is,  the  number  of
+       columns and lines.
 
 
 </PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
        For <EM>curses</EM> to distinguish an escape character corresponding to a user's
-       press  of  an  "Escape"  key on the input device from one included in a
+       press of an "Escape" key on the input device from  one  included  in  a
        control sequence used by a cursor movement or function key, the library
-       waits  to  see  if another key event occurs after the escape character.
+       waits to see if another key event occurs after  the  escape  character.
        <STRONG>ESCDELAY</STRONG> stores this interval in milliseconds.
 
 
-</PRE><H3><a name="h3-LINES">LINES</a></H3><PRE>
-       Once <EM>curses</EM> is initialized,  <STRONG>LINES</STRONG>  contains  the  screen's  height  in
-       character cells; that is, the number of lines.
-
-
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
        The <EM>curses</EM> library converts a tab character to this number of spaces as
        it adds a tab to a window; see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-curscr">curscr</a></H3><PRE>
-       <EM>curses</EM> records updates to the terminal screen  in  a  <EM>WINDOW</EM>  structure
-       named <STRONG>curscr</STRONG>.
-
-       This object is referred to as the "physical screen" in <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
-       and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
-
-
-</PRE><H3><a name="h3-newscr">newscr</a></H3><PRE>
-       <EM>ncurses</EM> collects pending updates to the terminal  screen  in  a  <EM>WINDOW</EM>
-       structure named <STRONG>newscr</STRONG>.
-
-       This   object   is   referred   to  as  the  "virtual  screen"  in  the
-       <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  and  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.   When  the
-       screen  is  refreshed, <EM>curses</EM> determines a minimal set of updates using
-       the terminal's capabilities to make <STRONG>curscr</STRONG> look like <STRONG>newscr</STRONG>.
-
-
-</PRE><H3><a name="h3-stdscr">stdscr</a></H3><PRE>
-       Once <EM>curses</EM> is initialized, it creates a <EM>WINDOW</EM> structure named <STRONG>stdscr</STRONG>.
-       It  is  the  same size as the terminal screen and is the default window
-       used by routines that do not take a parameter  identifying  one.   Many
-       <EM>curses</EM> functions use this window.
-
-
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> initializes <EM>curses</EM>.
 
-       If  <EM>ncurses</EM>  is  configured  to  provide  separate  <EM>curses</EM> and <EM>terminfo</EM>
+       If <EM>ncurses</EM> is  configured  to  provide  separate  <EM>curses</EM>  and  <EM>terminfo</EM>
        libraries, most of these variables reside in the <EM>curses</EM> library.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The X/Open Curses standard documents all of  the  foregoing  types  and
+       The  X/Open  Curses  standard  documents all of the foregoing types and
        symbols except for <STRONG>newscr</STRONG>, <STRONG>TABSIZE</STRONG>, and <STRONG>ESCDELAY</STRONG>.
 
-       X/Open  Curses  describes  <STRONG>curscr</STRONG> only as "an internal data structure";
-       SVID  gave  more  details,  noting  its  use  "for  certain   low-level
-       operations  like  clearing  and redrawing a screen containing garbage".
+       X/Open Curses describes <STRONG>curscr</STRONG> only as "an  internal  data  structure";
+       SVr4   gave  more  details,  noting  its  use  "for  certain  low-level
+       operations like clearing and redrawing a  screen  containing  garbage".
        Neither specified its interaction with the rest of the interface beyond
        use as an argument to <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG> and <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>.
 
-       <STRONG>newscr</STRONG>  is  a feature of SVr4 <EM>curses</EM>.  When refreshing the screen, this
-       window is used as a working area  for  combining  the  standard  screen
-       <STRONG>stdscr</STRONG>  with  any  other windows which the application may have created
-       with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.  When the updated <STRONG>newscr</STRONG> is complete,  <EM>curses</EM>  updates
-       <STRONG>curscr</STRONG> to match <STRONG>newscr</STRONG>.
+       <STRONG>newscr</STRONG> is a feature of SVr4 <EM>curses</EM>.  When refreshing the screen, it  is
+       used  as  a  working area for combining the standard window <STRONG>stdscr</STRONG> with
+       any others the application may have created with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.  When  the
+       update of <STRONG>newscr</STRONG> is complete, <EM>curses</EM> modifies <STRONG>curscr</STRONG> to match <STRONG>newscr</STRONG>.
 
        <STRONG>TABSIZE</STRONG> is a feature of SVr4 <EM>curses</EM>.
 
@@ -248,35 +255,44 @@ <H1 class="no-header">curs_variables 3x 2023-12-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
-       <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
        [UAX  #29]  "Unicode  Standard  Annex  #29: Unicode Text Segmentation";
        &lt;https://unicode.org/reports/tr29/&gt;
 
 
 
-ncurses 6.4                       2023-12-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-CONSTANTS">CONSTANTS</a>
 <ul>
-<li><a href="#h3-bool_-TRUE_-FALSE">bool, TRUE, FALSE</a></li>
+<li><a href="#h3-TRUE_-FALSE">TRUE, FALSE</a></li>
 <li><a href="#h3-ERR_-OK">ERR, OK</a></li>
+</ul>
+</li>
+<li><a href="#h2-PREDEFINED-TYPES">PREDEFINED TYPES</a>
+<ul>
+<li><a href="#h3-bool">bool</a></li>
 <li><a href="#h3-chtype">chtype</a></li>
 <li><a href="#h3-cchar_t_-attr_t">cchar_t, attr_t</a></li>
-<li><a href="#h3-COLOR_PAIRS">COLOR_PAIRS</a></li>
+<li><a href="#h3-SCREEN">SCREEN</a></li>
+<li><a href="#h3-WINDOW">WINDOW</a></li>
+</ul>
+</li>
+<li><a href="#h2-VARIABLES">VARIABLES</a>
+<ul>
+<li><a href="#h3-curscr_-stdscr_-newscr">curscr, stdscr, newscr</a></li>
 <li><a href="#h3-COLORS">COLORS</a></li>
-<li><a href="#h3-COLS">COLS</a></li>
+<li><a href="#h3-COLOR_PAIRS">COLOR_PAIRS</a></li>
+<li><a href="#h3-COLS_-LINES">COLS, LINES</a></li>
 <li><a href="#h3-ESCDELAY">ESCDELAY</a></li>
-<li><a href="#h3-LINES">LINES</a></li>
 <li><a href="#h3-TABSIZE">TABSIZE</a></li>
-<li><a href="#h3-curscr">curscr</a></li>
-<li><a href="#h3-newscr">newscr</a></li>
-<li><a href="#h3-stdscr">stdscr</a></li>
 </ul>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 5b2722cee..c24979f13 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.51 2023/12/16 20:32:22 tom Exp @
+  * @Id: form.3x,v 1.52 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 1a59c12c1..fa6d88ac2 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.53 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_driver.3x,v 1.54 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        character or a request.
 
 
-</PRE><H3><a name="h3-Form-driver-requests">Form-driver requests</a></H3><PRE>
+</PRE><H3><a name="h3-Form-Driver-Requests">Form Driver Requests</a></H3><PRE>
        The form driver requests are as follows:
 
        <STRONG>Name</STRONG>               <STRONG>Description</STRONG>
@@ -154,7 +154,7 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        forms requests listed above, that request is executed.
 
 
-</PRE><H3><a name="h3-Field-validation">Field validation</a></H3><PRE>
+</PRE><H3><a name="h3-Field-Validation">Field Validation</a></H3><PRE>
        The  form  library  makes  updates  to  the window associated with form
        fields rather than directly to the field buffers.
 
@@ -181,7 +181,7 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        data from the window associated with the field to the field buffer.
 
 
-</PRE><H3><a name="h3-Mouse-handling">Mouse handling</a></H3><PRE>
+</PRE><H3><a name="h3-Mouse-Handling">Mouse Handling</a></H3><PRE>
        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
@@ -221,7 +221,7 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        translated into a form request an <STRONG>E_REQUEST_DENIED</STRONG> is returned.
 
 
-</PRE><H3><a name="h3-Application-defined-commands">Application-defined commands</a></H3><PRE>
+</PRE><H3><a name="h3-Application-defined-Commands">Application-defined Commands</a></H3><PRE>
        If the second argument is neither printable nor one of the  above  pre-
        defined form requests, the driver assumes it is an application-specific
        command and returns  <STRONG>E_UNKNOWN_COMMAND</STRONG>.   Application-defined  commands
@@ -275,7 +275,7 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -285,10 +285,10 @@ <H1 class="no-header">form_driver 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-form_driver">form_driver</a></li>
 <li><a href="#h3-form_driver_w">form_driver_w</a></li>
-<li><a href="#h3-Form-driver-requests">Form-driver requests</a></li>
-<li><a href="#h3-Field-validation">Field validation</a></li>
-<li><a href="#h3-Mouse-handling">Mouse handling</a></li>
-<li><a href="#h3-Application-defined-commands">Application-defined commands</a></li>
+<li><a href="#h3-Form-Driver-Requests">Form Driver Requests</a></li>
+<li><a href="#h3-Field-Validation">Field Validation</a></li>
+<li><a href="#h3-Mouse-Handling">Mouse Handling</a></li>
+<li><a href="#h3-Application-defined-Commands">Application-defined Commands</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index b3ba683a2..8919c674b 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.102 2023/12/16 20:32:22 tom Exp @
+  * @Id: infocmp.1m,v 1.103 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-12-23                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index b3f14cee2..798d4c71c 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.42 2023/12/16 20:32:22 tom Exp @
+  * @Id: menu.3x,v 1.43 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 57e115431..3a23b6a02 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
+  * @Id: menu_driver.3x,v 1.45 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        corresponding action is performed.
 
 
-</PRE><H3><a name="h3-MOUSE-HANDLING">MOUSE HANDLING</a></H3><PRE>
+</PRE><H3><a name="h3-Mouse-Handling">Mouse Handling</a></H3><PRE>
        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
@@ -172,7 +172,7 @@ <H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        translated into a menu request an <STRONG>E_REQUEST_DENIED</STRONG> is returned.
 
 
-</PRE><H3><a name="h3-APPLICATION-DEFINED-COMMANDS">APPLICATION-DEFINED COMMANDS</a></H3><PRE>
+</PRE><H3><a name="h3-Application-defined-Commands">Application-defined Commands</a></H3><PRE>
        If the second argument is neither printable nor one of the  above  pre-
        defined  menu  requests  or  KEY_MOUSE,  the  drive  assumes  it  is an
        application-specific    command    and    returns    <STRONG>E_UNKNOWN_COMMAND</STRONG>.
@@ -223,7 +223,7 @@ <H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -231,8 +231,8 @@ <H1 class="no-header">menu_driver 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-MOUSE-HANDLING">MOUSE HANDLING</a></li>
-<li><a href="#h3-APPLICATION-DEFINED-COMMANDS">APPLICATION-DEFINED COMMANDS</a></li>
+<li><a href="#h3-Mouse-Handling">Mouse Handling</a></li>
+<li><a href="#h3-Application-defined-Commands">Application-defined Commands</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 5054afdce..714e302c9 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.187 2023/12/17 23:44:14 tom Exp @
+  * @Id: ncurses.3x,v 1.189 2023/12/23 16:32:37 tom Exp @
   * X/Open Curses Issue 7 assumes some optimization will be done, but
   * does not mandate it in any way.
 -->
@@ -37,12 +37,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-12-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -62,7 +62,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20231217).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20231223).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -99,8 +99,8 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        <STRONG>-lncurses_g</STRONG>.   (Your  system  integrator  may also have installed these
        libraries under the names  <STRONG>-lcurses</STRONG>  and  <STRONG>-lcurses_g</STRONG>.)   The  ncurses_g
        library  generates  trace logs (in a file called "trace" in the current
-       directory) that describe curses  actions.   See  also  the  section  on
-       <STRONG>ALTERNATE</STRONG> <STRONG>CONFIGURATIONS</STRONG>.
+       directory)  that  describe  curses  actions.   See  section  "ALTERNATE
+       CONFIGURATIONS" below.
 
        The   <EM>ncurses</EM>   package   supports:  overall  screen,  window  and  pad
        manipulation; output to  windows  and  pads;  reading  terminal  input;
@@ -192,12 +192,12 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        modes  as  underlined,  in reverse video, or in color on terminals that
        support such display enhancements.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
-       <EM>curses</EM> predefines symbols for a small set of line graphics  characters,
-       corresponding  to  the  VT100  line  drawing  set.   See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and
-       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+       <EM>curses</EM> predefines constants for a small set of line-drawing  and  other
+       graphics  corresponding  to  the  DEC  Alternate Character Set (ACS), a
+       feature of VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
        <EM>curses</EM> is implemented using the  operating  system's  terminal  driver;
-       keystroke  events are not received as scan codes but as byte sequences.
+       keystroke  events are received not as scan codes but as byte sequences.
        Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
        appear  as-is.   Everything  else,  including  the  tab,  enter/return,
        keypad, arrow, and function keys, appears as a control character  or  a
@@ -292,7 +292,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
                  <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
                           analogously  to the <EM>int</EM>-sized character manipulation
-                          functions of ISO C and their constant <STRONG>EOF</STRONG>.
+                          functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
                  The  wide  library   provides   additional   functions   that
                  complement  those  in  the non-wide library where the size of
@@ -1002,7 +1002,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
        The  reason  for the change was to make the behavior for interrupts and
        other  signals   more   robust.    One   drawback   is   that   certain
-       nonconventional  programs  would  mix ordinary stdio calls with <EM>ncurses</EM>
+       nonconventional programs would mix ordinary <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM>
        calls and (usually) work.  This is no longer possible since <EM>ncurses</EM>  is
        not  using the buffered standard output but its own output (to the same
        file descriptor).  As a special case, the low-level calls such as  <STRONG>putp</STRONG>
@@ -1178,10 +1178,10 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Several   different  configurations  are  possible,  depending  on  the
-       configure script options used when building <EM>ncurses</EM>.  There are  a  few
-       main  options  whose  effects are visible to the applications developer
-       using <EM>ncurses</EM>:
+       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
+       options given to the <EM>configure</EM> script when building the  library.   Run
+       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
+       particular significance to the application developer employing <EM>ncurses.</EM>
 
        --disable-overwrite
             The standard include for <EM>ncurses</EM> is as noted in <STRONG>SYNOPSIS</STRONG>:
@@ -1356,12 +1356,12 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        sections of the library man pages.
 
 
-</PRE><H3><a name="h3-Error-checking">Error checking</a></H3><PRE>
+</PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
        In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
        Unlike  other  implementations,  this  one  checks  parameters  such as
-       pointers to WINDOW structures to ensure they are not  null.   The  main
+       pointers to <EM>WINDOW</EM> structures to ensure they are not  null.   The  main
        reason  for  providing  this  behavior  is  to guard against programmer
        error.  The standard interface does not provide a way for  the  library
        to  tell an application which of several possible errors were detected.
@@ -1369,7 +1369,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        portability of curses applications.
 
 
-</PRE><H3><a name="h3-Extensions-versus-portability">Extensions versus portability</a></H3><PRE>
+</PRE><H3><a name="h3-Extensions-Versus-Portability">Extensions Versus Portability</a></H3><PRE>
        Most  of the extensions provided by <EM>ncurses</EM> have not been standardized.
        Some  have  been  incorporated  into  other  implementations,  such  as
        PDCurses or NetBSD curses.  Here are a few to consider:
@@ -1391,7 +1391,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The routine <STRONG>wresize</STRONG> is not part of XPG4, nor is it present in SVr4.
            See the <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual page for details.
 
-       <STRONG>o</STRONG>   The  WINDOW  structure's  internal  details  can  be  hidden   from
+       <STRONG>o</STRONG>   The  <EM>WINDOW</EM>  structure's  internal  details  can  be  hidden   from
            application  programs.   See  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for the discussion of
            <STRONG>is_scrollok</STRONG>, etc.
 
@@ -1404,7 +1404,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
            See <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> for details.
 
 
-</PRE><H3><a name="h3-Padding-differences">Padding differences</a></H3><PRE>
+</PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
        In historic curses versions, delays embedded in  the  capabilities  <STRONG>cr</STRONG>,
        <STRONG>ind</STRONG>,  <STRONG>cub1</STRONG>,  <STRONG>ff</STRONG>  and <STRONG>tab</STRONG> activated corresponding delay bits in the Unix
        tty driver.  In this implementation, all padding is done by sending NUL
@@ -1413,7 +1413,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
        portability correspondingly.
 
 
-</PRE><H3><a name="h3-Header-files">Header files</a></H3><PRE>
+</PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
        The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
        <EM>unctrl.h</EM>.
 
@@ -1514,7 +1514,7 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-17                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1562,10 +1562,10 @@ <H1 class="no-header">ncurses 3x 2023-12-17 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
-<li><a href="#h3-Error-checking">Error checking</a></li>
-<li><a href="#h3-Extensions-versus-portability">Extensions versus portability</a></li>
-<li><a href="#h3-Padding-differences">Padding differences</a></li>
-<li><a href="#h3-Header-files">Header files</a></li>
+<li><a href="#h3-Error-Checking">Error Checking</a></li>
+<li><a href="#h3-Extensions-Versus-Portability">Extensions Versus Portability</a></li>
+<li><a href="#h3-Padding-Differences">Padding Differences</a></li>
+<li><a href="#h3-Header-Files">Header Files</a></li>
 </ul>
 </li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index 101b95ac1..f0be19773 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.20 2023/12/16 21:43:05 tom Exp @
+  * @Id: MKncu_config.in,v 1.22 2023/12/23 23:44:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>ncursesw6-config 1 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncursesw6-config 1 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -73,9 +73,6 @@ <H1 class="no-header">ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</H
 
        <STRONG>--libs</STRONG>            reports the libraries needed to link with <EM>ncurses</EM>.
 
-       <STRONG>--version</STRONG>         reports  the  release  and  patch date information of
-                         <EM>ncurses</EM> and exits successfully.
-
        <STRONG>--abi-version</STRONG>     reports the ABI version of <EM>ncurses</EM>.
 
        <STRONG>--mouse-version</STRONG>   reports the mouse-interface version of <EM>ncurses</EM>.
@@ -84,25 +81,30 @@ <H1 class="no-header">ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</H
 
        <STRONG>--datadir</STRONG>         reports the directory containing <EM>ncurses</EM> data.
 
-       <STRONG>--includedir</STRONG>      reports  the  directory  containing  <EM>ncurses</EM>   header
+       <STRONG>--includedir</STRONG>      reports   the  directory  containing  <EM>ncurses</EM>  header
                          files.
 
        <STRONG>--libdir</STRONG>          reports the directory containing <EM>ncurses</EM> libraries.
 
        <STRONG>--mandir</STRONG>          reports the directory containing <EM>ncurses</EM> man pages.
 
-       <STRONG>--terminfo</STRONG>        reports  the  <EM>TERMINFO</EM>  <EM>terminfo</EM>  database  path, for
+       <STRONG>--terminfo</STRONG>        reports the  <EM>TERMINFO</EM>  <EM>terminfo</EM>  database  path,  for
                          example <EM>/usr/share/terminfo</EM>.
 
-       <STRONG>--terminfo-dirs</STRONG>   reports the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  supplemental  search  path
+       <STRONG>--terminfo-dirs</STRONG>   reports  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  supplemental search path
                          for    the    <EM>terminfo</EM>    database,    for    example
                          <EM>/usr/share/terminfo</EM>.
 
        <STRONG>--termpath</STRONG>        reports the <EM>TERMPATH</EM> supplemental search path for the
-                         <EM>termcap</EM>   database,   if   support   for  <EM>termcap</EM>  is
+                         <EM>termcap</EM>  database,  if   support   for   <EM>termcap</EM>   is
                          configured.
 
-       <STRONG>--help</STRONG>            issues a usage message and exits successfully.
+       The following options cause all others to be ignored.
+
+       <STRONG>--help</STRONG>     issues a usage message and exits successfully.
+
+       <STRONG>--version</STRONG>  issues the release and patch date information of <EM>ncurses</EM> and
+                  exits successfully.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -110,7 +112,7 @@ <H1 class="no-header">ncursesw6-config 1 2023-12-16 ncurses 6.4 User commands</H
 
 
 
-ncurses 6.4                       2023-12-16               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2023-12-23               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 751fe6b8b..a6720a407 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.60 2023/12/16 21:24:43 tom Exp @
+  * @Id: panel.3x,v 1.61 2023/12/23 16:22:25 tom Exp @
   * ---------
   * ---------
   * ---------
@@ -51,12 +51,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -283,7 +283,7 @@ <H1 class="no-header">panel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index ce5e2b254..53b9508a6 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.40 2023/12/16 21:07:24 tom Exp @
+  * @Id: scr_dump.5,v 1.41 2023/12/23 16:27:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-12-16 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-12-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -110,18 +110,18 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   The ncurses6 <STRONG>getwin</STRONG> reads the legacy screen dumps from ncurses5.
 
 
-</PRE><H3><a name="h3-ncurses5-_legacy_">ncurses5 (legacy)</a></H3><PRE>
+</PRE><H3><a name="h3-ncurses5-_Legacy_">ncurses5 (Legacy)</a></H3><PRE>
        The screen-dump feature was added to <EM>ncurses</EM> in June 1995.  While there
        were fixes and improvements in succeeding years, the basic  scheme  was
        unchanged:
 
-       <STRONG>o</STRONG>   The <STRONG>WINDOW</STRONG> structure was written in binary form.
+       <STRONG>o</STRONG>   The <EM>WINDOW</EM> structure was written in binary form.
 
-       <STRONG>o</STRONG>   The <STRONG>WINDOW</STRONG> structure refers to lines of data, which were written as
-           an array of binary data following the <STRONG>WINDOW</STRONG>.
+       <STRONG>o</STRONG>   The <EM>WINDOW</EM> structure refers to lines of data, which were written as
+           an array of binary data following the <EM>WINDOW</EM>.
 
        <STRONG>o</STRONG>   When <STRONG>getwin</STRONG> restored the window, it would  keep  track  of  offsets
-           into  the  array of line-data and adjust the <STRONG>WINDOW</STRONG> structure which
+           into  the  array of line-data and adjust the <EM>WINDOW</EM> structure which
            was read back into memory.
 
        This is similar to Unix System V, but does not write a  "magic  number"
@@ -167,7 +167,7 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Unix-System-V">Unix System V</a></H3><PRE>
        Unix System V curses identified the file format  by  writing  a  "magic
-       number" at the beginning of the dump.  The <STRONG>WINDOW</STRONG> data and the lines of
+       number" at the beginning of the dump.  The <EM>WINDOW</EM> data and the lines of
        text follow, all in binary form.
 
        The Solaris curses source has these definitions:
@@ -193,7 +193,7 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 
            \001\035
 
-       After  the magic number, the <STRONG>WINDOW</STRONG> structure and line-data are written
+       After  the magic number, the <EM>WINDOW</EM> structure and line-data are written
        in binary format.  While the magic number used by the Unix systems  can
        be seen using <STRONG>od(1)</STRONG>, none of the Unix systems documents the format used
        for screen-dumps.
@@ -233,7 +233,7 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-PDCurses">PDCurses</a></H3><PRE>
        PDCurses added support for screen dumps in version  2.7  (2005).   Like
-       Unix  System V  and ncurses5, it writes the <STRONG>WINDOW</STRONG> structure in binary,
+       Unix  System V  and ncurses5, it writes the <EM>WINDOW</EM> structure in binary,
        but begins the file with its three-byte identifier "PDC", followed by a
        one-byte version, e.g.,
 
@@ -250,9 +250,9 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   the curses shared library major and minor versions as the first two
            bytes (e.g., 7 and 1),
 
-       <STRONG>o</STRONG>   followed by a binary dump of the <STRONG>WINDOW</STRONG>,
+       <STRONG>o</STRONG>   followed by a binary dump of the <EM>WINDOW</EM>,
 
-       <STRONG>o</STRONG>   some data for wide-characters referenced by the  <STRONG>WINDOW</STRONG>  structure,
+       <STRONG>o</STRONG>   some data for wide-characters referenced by the  <EM>WINDOW</EM>  structure,
            and
 
        <STRONG>o</STRONG>   finally, lines as done by other implementations.
@@ -407,7 +407,7 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-16                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-12-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -416,7 +416,7 @@ <H1 class="no-header">scr_dump 5 2023-12-16 ncurses 6.4 File formats</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-ncurses6">ncurses6</a></li>
-<li><a href="#h3-ncurses5-_legacy_">ncurses5 (legacy)</a></li>
+<li><a href="#h3-ncurses5-_Legacy_">ncurses5 (Legacy)</a></li>
 </ul>
 </li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 5d8039a46..e97dbb15b 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.51 2023/12/17 00:13:57 tom Exp @
+  * @Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
   *   tabs.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/src/cmd/tabs.c
@@ -41,12 +41,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -139,7 +139,7 @@ <H1 class="no-header">tabs 1 2023-12-16 ncurses 6.4 User commands</H1>
        which is equivalent to the 1,6,11,16,21 example.
 
 
-</PRE><H3><a name="h3-Predefined-Tab-Stops">Predefined Tab-Stops</a></H3><PRE>
+</PRE><H3><a name="h3-Predefined-Tab-Stops">Predefined Tab Stops</a></H3><PRE>
        POSIX defines several predefined lists of tab stops.
 
        <STRONG>-a</STRONG>   Assembler, IBM S/370, first format
@@ -267,7 +267,7 @@ <H1 class="no-header">tabs 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -279,7 +279,7 @@ <H1 class="no-header">tabs 1 2023-12-16 ncurses 6.4 User commands</H1>
 <li><a href="#h3-General-Options">General Options</a></li>
 <li><a href="#h3-Implicit-Lists">Implicit Lists</a></li>
 <li><a href="#h3-Explicit-Lists">Explicit Lists</a></li>
-<li><a href="#h3-Predefined-Tab-Stops">Predefined Tab-Stops</a></li>
+<li><a href="#h3-Predefined-Tab-Stops">Predefined Tab Stops</a></li>
 <li><a href="#h3-Margins">Margins</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 1f70937c3..4509b95a6 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.68 2023/12/16 20:32:22 tom Exp @
+  * @Id: term.5,v 1.69 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-12-16 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-12-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -57,7 +57,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-STORAGE-LOCATION">STORAGE LOCATION</a></H3><PRE>
+</PRE><H3><a name="h3-Storage-Location">Storage Location</a></H3><PRE>
        Compiled   terminfo   descriptions   are  placed  under  the  directory
        <STRONG>/usr/share/terminfo</STRONG>.  Two configurations are supported  (when  building
        the <EM>ncurses</EM> libraries):
@@ -87,7 +87,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
             database otherwise.
 
 
-</PRE><H3><a name="h3-LEGACY-STORAGE-FORMAT">LEGACY STORAGE FORMAT</a></H3><PRE>
+</PRE><H3><a name="h3-Legacy-Storage-Format">Legacy Storage Format</a></H3><PRE>
        The format has been chosen so that it will be the same on all hardware.
        An 8 or more bit  byte  is  assumed,  but  no  assumptions  about  byte
        ordering or sign extension are made.
@@ -186,7 +186,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
        uninterpreted form.
 
 
-</PRE><H3><a name="h3-EXTENDED-STORAGE-FORMAT">EXTENDED STORAGE FORMAT</a></H3><PRE>
+</PRE><H3><a name="h3-Extended-Storage-Format">Extended Storage Format</a></H3><PRE>
        The previous section describes the conventional terminfo binary format.
        With  some  minor variations of the offsets (see PORTABILITY), the same
        binary format is used in all modern Unix systems.  Each system  uses  a
@@ -234,7 +234,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
        names with members of a <STRONG>TERMTYPE</STRONG> structure.
 
 
-</PRE><H3><a name="h3-EXTENDED-NUMBER-FORMAT">EXTENDED NUMBER FORMAT</a></H3><PRE>
+</PRE><H3><a name="h3-Extended-Number-Format">Extended Number Format</a></H3><PRE>
        On occasion, 16-bit signed integers are not large enough.  With <EM>ncurses</EM>
        6.1,  a new format was introduced by making a few changes to the legacy
        format:
@@ -270,7 +270,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
        the lists of boolean, number, and string capabilities.
 
 
-</PRE><H3><a name="h3-Binary-format">Binary format</a></H3><PRE>
+</PRE><H3><a name="h3-Binary-Format">Binary Format</a></H3><PRE>
        X/Open  Curses  does  not  specify  a format for the terminfo database.
        System V curses used a directory-tree of binary files, one per terminal
        description.
@@ -292,7 +292,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
        different configuration options.
 
 
-</PRE><H3><a name="h3-Magic-codes">Magic codes</a></H3><PRE>
+</PRE><H3><a name="h3-Magic-Codes">Magic Codes</a></H3><PRE>
        The  magic  number  in a binary terminfo file is the first 16-bits (two
        bytes).  Besides making it more reliable for the library to check  that
        a  file  is  terminfo,  utilities such as <STRONG>file(1)</STRONG> also use that to tell
@@ -301,15 +301,14 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
        uses 01036 as a continuation of that sequence,  but  with  a  different
        high-order byte to avoid confusion.
 
-
-</PRE><H3><a name="h3-The-TERMTYPE-structure">The TERMTYPE structure</a></H3><PRE>
+   <STRONG>The</STRONG> <EM>TERMTYPE</EM> <STRONG>Structure</STRONG>
        Direct  access  to  the  <STRONG>TERMTYPE</STRONG>  structure  is  provided  for  legacy
        applications.  Portable  applications  should  use  the  <STRONG>tigetflag</STRONG>  and
        related  functions  described in <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> for reading terminal
        capabilities.
 
 
-</PRE><H3><a name="h3-Mixed-case-terminal-names">Mixed-case terminal names</a></H3><PRE>
+</PRE><H3><a name="h3-Mixed-case-Terminal-Names">Mixed-case Terminal Names</a></H3><PRE>
        A small number of terminal descriptions  use  uppercase  characters  in
        their  names.   If  the  underlying  filesystem  ignores the difference
        between  uppercase  and  lowercase,  <EM>ncurses</EM>  represents   the   "first
@@ -400,7 +399,7 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-12-23                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -408,20 +407,19 @@ <H1 class="no-header">term 5 2023-12-16 ncurses 6.4 File formats</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-STORAGE-LOCATION">STORAGE LOCATION</a></li>
-<li><a href="#h3-LEGACY-STORAGE-FORMAT">LEGACY STORAGE FORMAT</a></li>
-<li><a href="#h3-EXTENDED-STORAGE-FORMAT">EXTENDED STORAGE FORMAT</a></li>
-<li><a href="#h3-EXTENDED-NUMBER-FORMAT">EXTENDED NUMBER FORMAT</a></li>
+<li><a href="#h3-Storage-Location">Storage Location</a></li>
+<li><a href="#h3-Legacy-Storage-Format">Legacy Storage Format</a></li>
+<li><a href="#h3-Extended-Storage-Format">Extended Storage Format</a></li>
+<li><a href="#h3-Extended-Number-Format">Extended Number Format</a></li>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-setupterm">setupterm</a></li>
-<li><a href="#h3-Binary-format">Binary format</a></li>
-<li><a href="#h3-Magic-codes">Magic codes</a></li>
-<li><a href="#h3-The-TERMTYPE-structure">The TERMTYPE structure</a></li>
-<li><a href="#h3-Mixed-case-terminal-names">Mixed-case terminal names</a></li>
+<li><a href="#h3-Binary-Format">Binary Format</a></li>
+<li><a href="#h3-Magic-Codes">Magic Codes</a></li>
+<li><a href="#h3-Mixed-case-Terminal-Names">Mixed-case Terminal Names</a></li>
 <li><a href="#h3-Limits">Limits</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 4373615f0..e703ea383 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.33 2023/11/25 14:32:36 tom Exp @
+  * @Id: term_variables.3x,v 1.34 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
        <STRONG>set_term</STRONG>.
 
 
-</PRE><H3><a name="h3-Terminfo-Lookup-Tables">Terminfo Lookup Tables</a></H3><PRE>
+</PRE><H3><a name="h3-terminfo-Lookup-Tables"><EM>terminfo</EM> Lookup Tables</a></H3><PRE>
        The <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> and <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG> 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
@@ -136,7 +136,7 @@ <H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
        <STRONG>ttytype</STRONG>.
 
 
-</PRE><H3><a name="h3-Terminfo-Names">Terminfo Names</a></H3><PRE>
+</PRE><H3><a name="h3-terminfo-Names"><EM>terminfo</EM> Names</a></H3><PRE>
        In addition to the variables, <STRONG>&lt;term.h&gt;</STRONG> also defines a symbol  for  each
        terminfo  capability  <EM>long</EM> <EM>name</EM>.  These are in terms of the symbol <STRONG>CUR</STRONG>,
        which is defined
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-25                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2023-12-23                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -186,9 +186,9 @@ <H1 class="no-header">term_variables 3x 2023-11-25 ncurses 6.4 Library calls</H1
 <ul>
 <li><a href="#h3-Alternate-Character-Set-Mapping">Alternate Character Set Mapping</a></li>
 <li><a href="#h3-Current-Terminal-Data">Current Terminal Data</a></li>
-<li><a href="#h3-Terminfo-Lookup-Tables">Terminfo Lookup Tables</a></li>
+<li><a href="#h3-terminfo-Lookup-Tables">terminfo Lookup Tables</a></li>
 <li><a href="#h3-Terminal-Type">Terminal Type</a></li>
-<li><a href="#h3-Terminfo-Names">Terminfo Names</a></li>
+<li><a href="#h3-terminfo-Names">terminfo Names</a></li>
 </ul>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 6d55396d5..813b96f94 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.57 2023/12/18 01:15:58 tom Exp @
+  * @Id: terminfo.head,v 1.59 2023/12/23 23:44:58 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.139 2023/12/17 22:56:21 tom Exp @
+  * @Id: terminfo.tail,v 1.140 2023/12/23 16:23:35 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-12-17 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-12-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,10 +105,10 @@ <H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231217).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231223).
 
 
-</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
+</PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
        Entries in <EM>terminfo</EM> consist of a sequence of fields:
 
        <STRONG>o</STRONG>   Each field ends with a comma "," (embedded commas  may  be  escaped
@@ -178,7 +178,7 @@ <H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
        For more on terminal naming conventions, see the <STRONG><A HREF="term.7.html">term(7)</A></STRONG> manual page.
 
 
-</PRE><H3><a name="h3-Terminfo-Capabilities-Syntax">Terminfo Capabilities Syntax</a></H3><PRE>
+</PRE><H3><a name="h3-terminfo-Capabilities-Syntax"><EM>terminfo</EM> Capabilities Syntax</a></H3><PRE>
        The terminfo entry consists of  several  <EM>capabilities</EM>,  i.e.,  features
        that  the  terminal  has,  or  methods  for  exercising  the terminal's
        features.
@@ -1505,7 +1505,7 @@ <H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
                 stack in the <STRONG>tparm</STRONG> function.
 
             <STRONG>o</STRONG>   SVr3.2  curses supported <EM>static</EM> variables.  Those are an array
-                in the <STRONG>TERMINAL</STRONG> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
+                in the <EM>TERMINAL</EM> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
                 automatically when the <STRONG>setupterm</STRONG> function allocates the data.
 
             <STRONG>o</STRONG>   SVr4 curses made no further improvements to the <EM>dynamic/static</EM>
@@ -2694,7 +2694,7 @@ <H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-17                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-12-23                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -2702,8 +2702,8 @@ <H1 class="no-header">terminfo 5 2023-12-17 ncurses 6.4 File formats</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></li>
-<li><a href="#h3-Terminfo-Capabilities-Syntax">Terminfo Capabilities Syntax</a></li>
+<li><a href="#h3-terminfo-Entry-Syntax">terminfo Entry Syntax</a></li>
+<li><a href="#h3-terminfo-Capabilities-Syntax">terminfo Capabilities Syntax</a></li>
 <li><a href="#h3-Similar-Terminals">Similar Terminals</a></li>
 <li><a href="#h3-Predefined-Capabilities">Predefined Capabilities</a></li>
 <li><a href="#h3-User-Defined-Capabilities">User-Defined Capabilities</a></li>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index db6e2ff52..50fc7fb0e 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.104 2023/12/16 20:33:11 tom Exp @
+  * @Id: tic.1m,v 1.105 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
        goes into further detail.
 
 
-</PRE><H3><a name="h3-ALIASES">ALIASES</a></H3><PRE>
+</PRE><H3><a name="h3-Aliases">Aliases</a></H3><PRE>
        This is the same program as infotocap and captoinfo; usually those  are
        linked to, or copied from this program:
 
@@ -315,7 +315,7 @@ <H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
             as function keys.
 
 
-</PRE><H3><a name="h3-PARAMETERS">PARAMETERS</a></H3><PRE>
+</PRE><H3><a name="h3-Parameters">Parameters</a></H3><PRE>
        <EM>file</EM>   contains  one  or  more <STRONG>terminfo</STRONG> terminal descriptions in source
               format  [see  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].   Each  description  in   the   file
               describes the capabilities of a particular terminal.
@@ -324,7 +324,7 @@ <H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
               The <EM>file</EM> parameter may also be the path of a character-device.
 
 
-</PRE><H3><a name="h3-PROCESSING">PROCESSING</a></H3><PRE>
+</PRE><H3><a name="h3-Processing">Processing</a></H3><PRE>
        All but one of the capabilities recognized by  <STRONG>tic</STRONG>  are  documented  in
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  The exception is the <STRONG>use</STRONG> capability.
 
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -490,13 +490,13 @@ <H1 class="no-header">tic 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-ALIASES">ALIASES</a></li>
+<li><a href="#h3-Aliases">Aliases</a></li>
 </ul>
 </li>
 <li><a href="#h2-OPTIONS">OPTIONS</a>
 <ul>
-<li><a href="#h3-PARAMETERS">PARAMETERS</a></li>
-<li><a href="#h3-PROCESSING">PROCESSING</a></li>
+<li><a href="#h3-Parameters">Parameters</a></li>
+<li><a href="#h3-Processing">Processing</a></li>
 </ul>
 </li>
 <li><a href="#h2-FILES">FILES</a></li>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 409408964..c313b5af7 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,20 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.92 2023/12/16 20:32:22 tom Exp @
+  * @Id: tput.1,v 1.96 2023/12/23 20:55:36 tom Exp @
+  * longname was added in October 1989.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -52,60 +53,62 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <EM>capname</EM> [<EM>parameters</EM>]
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <EM>cap-code</EM> [<EM>parameter</EM> ...]
+
        <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
+
        <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>init</STRONG>
+
        <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>reset</STRONG>
+
        <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>longname</STRONG>
-       <STRONG>tput</STRONG> <STRONG>-S</STRONG>  <STRONG>&lt;&lt;</STRONG>
+
+       <STRONG>tput</STRONG> <STRONG>-S</STRONG>
+
        <STRONG>tput</STRONG> <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>tput</STRONG>  utility  uses  the  <STRONG>terminfo</STRONG>  database to make the values of
-       terminal-dependent capabilities and information available to the  shell
-       (see  <STRONG>sh(1)</STRONG>),  to  initialize or reset the terminal, or return the long
-       name of the requested terminal  type.   The  result  depends  upon  the
-       capability's type:
+       <STRONG>tput</STRONG>  uses  the  <EM>terminfo</EM>  library  and  database to make the values of
+       terminal-specific capabilities and information available to the  shell,
+       to  initialize  or  reset  the terminal, or report the long name of the
+       current (or  specified)  terminal  type.   When  retrieving  capability
+       values, the result depends upon the capability's type.
 
-          string
-               <STRONG>tput</STRONG>  writes  the  string  to the standard output.  No trailing
-               newline is supplied.
+       Boolean  <STRONG>tput</STRONG>  sets its exit status to <STRONG>0</STRONG> if the terminal possesses <EM>cap-</EM>
+                <EM>code,</EM> and <STRONG>1</STRONG> if it does not.
 
-          integer
-               <STRONG>tput</STRONG> writes the decimal value to the standard  output,  with  a
-               trailing newline.
+       integer  <STRONG>tput</STRONG> writes <EM>cap-code</EM>'s decimal value to  the  standard  output
+                stream if defined (<STRONG>-1</STRONG> if it is not) followed by a newline.
 
-          boolean
-               <STRONG>tput</STRONG>  simply sets the exit code (<STRONG>0</STRONG> for TRUE if the terminal has
-               the capability, <STRONG>1</STRONG> for FALSE if it does not), and writes nothing
-               to the standard output.
+       string   <STRONG>tput</STRONG>  writes <EM>cap-code</EM>'s value to the standard output stream if
+                defined, without a trailing newline.
 
-       Before  using  a value returned on the standard output, the application
-       should test the exit code (e.g., <STRONG>$?</STRONG>, see <STRONG>sh(1)</STRONG>) to be  sure  it  is  <STRONG>0</STRONG>.
-       (See the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> and <STRONG>DIAGNOSTICS</STRONG> sections.)  For a complete list of
-       capabilities and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       Before using a value returned on the standard output,  the  application
+       should  test  <STRONG>tput</STRONG>'s exit status (for example, using <STRONG>$?</STRONG> in <STRONG>sh(1)</STRONG>) to be
+       sure it is <STRONG>0</STRONG>; see sections "EXIT STATUS" and "DIAGNOSTICS" below.   For
+       a complete list of <EM>cap-codes,</EM> see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Options">Options</a></H3><PRE>
-       <STRONG>-S</STRONG>     allows more than one capability per  invocation  of  <STRONG>tput</STRONG>.   The
-              capabilities  must  be  passed  to  <STRONG>tput</STRONG> from the standard input
-              instead of from  the  command  line  (see  example).   Only  one
-              <EM>capname</EM>  is allowed per line.  The <STRONG>-S</STRONG> option changes the meaning
-              of the <STRONG>0</STRONG> and <STRONG>1</STRONG> boolean and  string  exit  codes  (see  the  EXIT
-              STATUS section).
-
-              Because  some capabilities may use <EM>string</EM> parameters rather than
+       <STRONG>-S</STRONG>     allows  more  than  one  capability per invocation of <STRONG>tput</STRONG>.  The
+              capabilities must be passed to  <STRONG>tput</STRONG>  from  the  standard  input
+              instead  of  from the command line (see example).  Only one <EM>cap-</EM>
+              <EM>code</EM> is allowed per line.  The <STRONG>-S</STRONG> option changes the meaning  of
+              the  <STRONG>0</STRONG> and <STRONG>1</STRONG> Boolean and string exit statuses (see section "EXIT
+              STATUS" below).
+
+              Because some capabilities may use <EM>string</EM> parameters rather  than
               <EM>numbers</EM>, <STRONG>tput</STRONG> uses a table and the presence of parameters in its
-              input  to  decide whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>, and how to interpret
+              input to decide whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>, and how  to  interpret
               the parameters.
 
        <STRONG>-T</STRONG><EM>type</EM> indicates  the  <EM>type</EM>  of  terminal.   Normally  this  option  is
-              unnecessary,  because  the default is taken from the environment
-              variable <EM>TERM</EM>.  If <STRONG>-T</STRONG> is specified,  then  the  shell  variables
+              unnecessary, because the default is taken from  the  environment
+              variable  <EM>TERM</EM>.   If  <STRONG>-T</STRONG>  is specified, then the shell variables
               <EM>LINES</EM> and <EM>COLUMNS</EM> will also be ignored.
 
-       <STRONG>-V</STRONG>     reports  the  version of <EM>ncurses</EM> which was used in this program,
+       <STRONG>-V</STRONG>     reports the version of <EM>ncurses</EM> which was used in  this  program,
               and exits.
 
        <STRONG>-x</STRONG>     prevents <STRONG>tput</STRONG> from attempting to clear the scrollback buffer.
@@ -114,27 +117,27 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 </PRE><H3><a name="h3-Commands">Commands</a></H3><PRE>
        A few commands (<STRONG>init</STRONG>, <STRONG>reset</STRONG> and <STRONG>longname</STRONG>) are special; they are defined
        by the <STRONG>tput</STRONG> program.  The others are the names of <EM>capabilities</EM> from the
-       terminal database (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for  a  list).   Although  <STRONG>init</STRONG>  and
-       <STRONG>reset</STRONG>  resemble  capability  names,  <STRONG>tput</STRONG>  uses several capabilities to
+       terminal  database  (see  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  a list).  Although <STRONG>init</STRONG> and
+       <STRONG>reset</STRONG> resemble capability names,  <STRONG>tput</STRONG>  uses  several  capabilities  to
        perform these special functions.
 
-       <EM>capname</EM>
+       <EM>cap-code</EM>
               indicates the capability from the terminal database.
 
-              If the  capability  is  a  string  that  takes  parameters,  the
-              arguments  following  the  capability will be used as parameters
+              If  the  capability  is  a  string  that  takes  parameters, the
+              arguments following the capability will be  used  as  parameters
               for the string.
 
-              Most parameters are numbers.  Only a few  terminal  capabilities
-              require  string parameters; <STRONG>tput</STRONG> uses a table to decide which to
-              pass as strings.  Normally <STRONG>tput</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  to  perform  the
-              substitution.   If  no  parameters are given for the capability,
+              Most  parameters  are numbers.  Only a few terminal capabilities
+              require string parameters; <STRONG>tput</STRONG> uses a table to decide which  to
+              pass  as  strings.   Normally <STRONG>tput</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> to perform the
+              substitution.  If no parameters are given  for  the  capability,
               <STRONG>tput</STRONG> writes the string without performing the substitution.
 
-       <STRONG>init</STRONG>   If the terminal database is present and an entry for the  user's
+       <STRONG>init</STRONG>   If  the terminal database is present and an entry for the user's
               terminal exists (see <STRONG>-T</STRONG><EM>type</EM>, above), the following will occur:
 
-              (1)  first,  <STRONG>tput</STRONG>  retrieves  the current terminal mode settings
+              (1)  first, <STRONG>tput</STRONG> retrieves the current  terminal  mode  settings
                    for your terminal.  It does this by successively testing
 
                    <STRONG>o</STRONG>   the standard error,
@@ -145,33 +148,33 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
                    <STRONG>o</STRONG>   ultimately "/dev/tty"
 
-                   to  obtain  terminal  settings.   Having  retrieved   these
-                   settings,  <STRONG>tput</STRONG> remembers which file descriptor to use when
+                   to   obtain  terminal  settings.   Having  retrieved  these
+                   settings, <STRONG>tput</STRONG> remembers which file descriptor to use  when
                    updating settings.
 
-              (2)  if the window size cannot be obtained  from  the  operating
+              (2)  if  the  window  size cannot be obtained from the operating
                    system, but the terminal description (or environment, e.g.,
-                   <EM>LINES</EM> and  <EM>COLUMNS</EM>  variables  specify  this),  update  the
+                   <EM>LINES</EM>  and  <EM>COLUMNS</EM>  variables  specify  this),  update the
                    operating system's notion of the window size.
 
               (3)  the terminal modes will be updated:
 
-                   <STRONG>o</STRONG>   any  delays (e.g., newline) specified in the entry will
+                   <STRONG>o</STRONG>   any delays (e.g., newline) specified in the entry  will
                        be set in the tty driver,
 
-                   <STRONG>o</STRONG>   tabs expansion will be turned on or  off  according  to
+                   <STRONG>o</STRONG>   tabs  expansion  will  be turned on or off according to
                        the specification in the entry, and
 
-                   <STRONG>o</STRONG>   if  tabs  are  not  expanded, standard tabs will be set
+                   <STRONG>o</STRONG>   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 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> section on <EM>Tabs</EM> <EM>and</EM>
+              (4)  if  present,  the terminal's initialization strings will be
+                   output as detailed in the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> section on  <EM>Tabs</EM>  <EM>and</EM>
                    <EM>Initialization</EM>,
 
               (5)  output is flushed.
 
-              If an entry does not contain the information needed for  any  of
+              If  an  entry does not contain the information needed for any of
               these activities, that activity will silently be skipped.
 
        <STRONG>reset</STRONG>  This is similar to <STRONG>init</STRONG>, with two differences:
@@ -185,23 +188,22 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
                    <STRONG>o</STRONG>   turn on newline translation and
 
-                   <STRONG>o</STRONG>   reset any unset special  characters  to  their  default
+                   <STRONG>o</STRONG>   reset  any  unset  special  characters to their default
                        values
 
-              (2)  Instead   of   putting   out  <EM>initialization</EM>  strings,  the
-                   terminal's <EM>reset</EM> strings will be output  if  present  (<STRONG>rs1</STRONG>,
-                   <STRONG>rs2</STRONG>,  <STRONG>rs3</STRONG>,  <STRONG>rf</STRONG>).  If the <EM>reset</EM> strings are not present, but
+              (2)  Instead  of  putting  out   <EM>initialization</EM>   strings,   the
+                   terminal's  <EM>reset</EM>  strings  will be output if present (<STRONG>rs1</STRONG>,
+                   <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, <STRONG>rf</STRONG>).  If the <EM>reset</EM> strings are not  present,  but
                    <EM>initialization</EM> strings are, the <EM>initialization</EM> strings will
                    be output.
 
               Otherwise, <STRONG>reset</STRONG> acts identically to <STRONG>init</STRONG>.
 
        <STRONG>longname</STRONG>
-              If  the terminal database is present and an entry for the user's
-              terminal exists (see <STRONG>-T</STRONG><EM>type</EM> 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  <STRONG>terminfo</STRONG>
-              database [see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>].
+              If the terminal database is present and an entry for the  user's
+              terminal exists (see <STRONG>-T</STRONG> <EM>type</EM> above), <STRONG>tput</STRONG> reports the terminal's
+              description (or "long name") to the standard output,  without  a
+              trailing newline.  See <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Aliases">Aliases</a></H3><PRE>
@@ -268,49 +270,50 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 </PRE><H2><a name="h2-EXIT-STATUS">EXIT STATUS</a></H2><PRE>
        If the <STRONG>-S</STRONG> option is used, <STRONG>tput</STRONG> 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 <STRONG>0</STRONG>.  No
-       indication of which line failed can be given so exit code <STRONG>1</STRONG> will  never
-       appear.   Exit codes <STRONG>2</STRONG>, <STRONG>3</STRONG>, and <STRONG>4</STRONG> retain their usual interpretation.  If
-       the <STRONG>-S</STRONG> option is not used,  the  exit  code  depends  on  the  type  of
-       <EM>capname</EM>:
-
-          <EM>boolean</EM>
+       any errors are found, will set the exit status to 4 plus the number  of
+       lines  with  errors.  If no errors are found, the exit status is <STRONG>0</STRONG>.  No
+       indication of which line failed can be given  so  exit  status  <STRONG>1</STRONG>  will
+       never   appear.    Exit  statuses  <STRONG>2</STRONG>,  <STRONG>3</STRONG>,  and  <STRONG>4</STRONG>  retain  their  usual
+       interpretation.  If the <STRONG>-S</STRONG> option is not used, the exit status  depends
+       on the type of <EM>cap-code</EM>:
+
+          <EM>Boolean</EM>
                  a value of <STRONG>0</STRONG> is set for TRUE and <STRONG>1</STRONG> for FALSE.
 
-          <EM>string</EM> a  value  of  <STRONG>0</STRONG>  is  set  if  the <EM>capname</EM> is defined for this
-                 terminal <EM>type</EM> (the value of <EM>capname</EM> is returned  on  standard
-                 output);  a  value  of <STRONG>1</STRONG> is set if <EM>capname</EM> is not defined for
+          <EM>string</EM> a  value  of  <STRONG>0</STRONG>  is  set  if the <EM>cap-code</EM> is defined for this
+                 terminal <EM>type</EM> (the value of <EM>cap-code</EM> is returned on  standard
+                 output);  a  value of <STRONG>1</STRONG> is set if <EM>cap-code</EM> is not defined for
                  this terminal <EM>type</EM> (nothing is written to standard output).
 
           <EM>integer</EM>
-                 a value of <STRONG>0</STRONG> is always set, whether or not <EM>capname</EM> is defined
-                 for  this  terminal <EM>type</EM>.  To determine if <EM>capname</EM> is defined
-                 for this terminal <EM>type</EM>, the user must test the value  written
-                 to  standard output.  A value of <STRONG>-1</STRONG> means that <EM>capname</EM> is not
-                 defined for this terminal <EM>type</EM>.
+                 a value of <STRONG>0</STRONG> is  always  set,  whether  or  not  <EM>cap-code</EM>  is
+                 defined  for this terminal <EM>type</EM>.  To determine if <EM>cap-code</EM> is
+                 defined for this terminal <EM>type</EM>, the user must test the  value
+                 written  to  standard  output.  A value of <STRONG>-1</STRONG> means that <EM>cap-</EM>
+                 <EM>code</EM> is not defined for this terminal <EM>type</EM>.
 
           <EM>other</EM>  <STRONG>reset</STRONG> or <STRONG>init</STRONG> may fail to find their  respective  files.   In
-                 that case, the exit code is set to 4 + <STRONG>errno</STRONG>.
+                 that case, the exit status is set to 4 + <STRONG>errno</STRONG>.
 
-       Any other exit code indicates an error; see the DIAGNOSTICS section.
+       Any  other  exit  status  indicates an error; see section "DIAGNOSTICS"
+       below.
 
 
 </PRE><H2><a name="h2-DIAGNOSTICS">DIAGNOSTICS</a></H2><PRE>
-       <STRONG>tput</STRONG>  prints  the  following  error messages and sets the corresponding
-       exit codes.
-
-       exit code   error message
-       ----------------------------------------------------------------------
-       <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not  specified  in
-                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for  this terminal type, e.g.
-                   <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
-       <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> section.
-       <STRONG>2</STRONG>           usage error
-       <STRONG>3</STRONG>           unknown terminal <EM>type</EM> or no <STRONG>terminfo</STRONG> database
-       <STRONG>4</STRONG>           unknown <STRONG>terminfo</STRONG> capability <EM>capname</EM>
-       <STRONG>&gt;4</STRONG>          error occurred in -S
-       ----------------------------------------------------------------------
+       <STRONG>tput</STRONG> prints the following error messages  and  sets  the  corresponding
+       exit statuses.
+
+       exit status   error message
+       ------------------------------------------------------------------------
+       <STRONG>0</STRONG>             (<EM>cap-code</EM>  is a numeric variable that is not specified in
+                     the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> database for  this  terminal  type,  e.g.
+                     <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
+       <STRONG>1</STRONG>             no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> section.
+       <STRONG>2</STRONG>             usage error
+       <STRONG>3</STRONG>             unknown terminal <EM>type</EM> or no <EM>terminfo</EM> database
+       <STRONG>4</STRONG>             unknown <EM>terminfo</EM> capability <EM>cap-code</EM>
+       <STRONG>&gt;4</STRONG>            error occurred in -S
+       ------------------------------------------------------------------------
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -322,75 +325,76 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This implementation of <STRONG>tput</STRONG> differs from AT&amp;T  <STRONG>tput</STRONG>  in  two  important
+       This  implementation  of  <STRONG>tput</STRONG>  differs from AT&amp;T <STRONG>tput</STRONG> in two important
        areas:
 
-       <STRONG>o</STRONG>   <STRONG>tput</STRONG>  <EM>capname</EM>  writes  to  the standard output.  That need not be a
-           regular  terminal.   However,  the  subcommands  which   manipulate
+       <STRONG>o</STRONG>   <STRONG>tput</STRONG> <EM>cap-code</EM> 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.
 
-           The  AT&amp;T  implementation's  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands use the BSD
-           (4.1c)  <STRONG>tset</STRONG>  source,  which  manipulates   terminal   modes.    It
-           successively  tries standard output, standard error, standard input
+           The AT&amp;T implementation's <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands  use  the  BSD
+           (4.1c)   <STRONG>tset</STRONG>   source,   which  manipulates  terminal  modes.   It
+           successively tries standard output, standard 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 <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify terminal
+           Until changes made after <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify  terminal
            modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
-           <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
+           <STRONG>tset</STRONG> (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not  able
            to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
            an error.
 
-       <STRONG>o</STRONG>   AT&amp;T <STRONG>tput</STRONG> guesses the type of its <EM>capname</EM> operands by seeing if all
-           of the characters are numeric, or not.
+       <STRONG>o</STRONG>   AT&amp;T <STRONG>tput</STRONG> guesses the type of its <EM>cap-code</EM> operands  by  seeing  if
+           all of the characters are numeric, or not.
 
-           Most implementations which provide support for <EM>capname</EM> operands use
-           the  <STRONG>tparm</STRONG>  function  to  expand  parameters  in it.  That function
-           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
+           Most  implementations  which  provide support for <EM>cap-code</EM> operands
+           use the <STRONG>tparm</STRONG> function to expand parameters in it.   That  function
+           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
            to know which type to use.
 
-           This  implementation  uses a table to determine the parameter types
-           for the standard <EM>capname</EM> operands, and an internal library function
-           to analyze nonstandard <EM>capname</EM> operands.
+           This implementation uses a table to determine the  parameter  types
+           for  the  standard  <EM>cap-code</EM>  operands,  and  an  internal  library
+           function to analyze nonstandard <EM>cap-code</EM> operands.
 
-           Besides  providing  more  reliable operation than AT&amp;T's utility, a
-           portability problem is introduced  by  this  analysis:  An  OpenBSD
-           developer  adapted  the  internal  library function from <EM>ncurses</EM> to
-           port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
-           modified  to  interpret  multiple  commands  on  a  line.  Portable
+           Besides providing more reliable operation than  AT&amp;T's  utility,  a
+           portability  problem  is  introduced  by  this analysis: An OpenBSD
+           developer adapted the internal library  function  from  <EM>ncurses</EM>  to
+           port  NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had been
+           modified to  interpret  multiple  commands  on  a  line.   Portable
            applications should not rely upon this feature; <EM>ncurses</EM> provides it
            to support applications written specifically for OpenBSD.
 
        This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
-       <EM>terminfo</EM> names for the <EM>capname</EM> feature, if <EM>termcap</EM> support is  compiled
-       in.   However,  the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names have two
+       <EM>terminfo</EM> names for the <EM>cap-code</EM> feature, if <EM>termcap</EM> support is compiled
+       in.  However, the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names  have  two
        ambiguities in this case (and the <EM>terminfo</EM> name is assumed):
 
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM>  name  <STRONG>dl1</STRONG>  (delete
+       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM> name <STRONG>dl1</STRONG> (delete
            one line).
-           The  <EM>terminfo</EM>  name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG> (delete a
+           The <EM>terminfo</EM> name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG>  (delete  a
            given number of lines).
 
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>ed</STRONG> corresponds to  the  <EM>terminfo</EM>  name  <STRONG>rmdc</STRONG>  (end
+       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>ed</STRONG>  corresponds  to the <EM>terminfo</EM> name <STRONG>rmdc</STRONG> (end
            delete mode).
-           The  <EM>terminfo</EM>  name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG> (clear to
+           The <EM>terminfo</EM> name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG>  (clear  to
            end of screen).
 
-       The <STRONG>longname</STRONG> and <STRONG>-S</STRONG> options, and  the  parameter-substitution  features
-       used  in  the  <STRONG>cup</STRONG>  example,  were  not  supported in BSD curses before
-       4.3reno (1989) or in AT&amp;T/USL curses before SVr4 (1988).
+       The  <STRONG>longname</STRONG>  and  <STRONG>-S</STRONG> options, and the parameter-substitution features
+       used in the <STRONG>cup</STRONG> example, were not supported in AT&amp;T/USL  <EM>curses</EM>  before
+       SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for <STRONG>longname</STRONG>, and
+       NetBSD (1994) added support for the parameter-substitution features.
 
        IEEE  Std  1003.1/The  Open  Group    Base   Specifications   Issue   7
        (POSIX.1-2008)  documents  only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG>.
        There are a few interesting observations to make regarding that:
 
-       <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>capname</EM> support.   The
+       <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>cap-code</EM> support.  The
            others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
            capabilities.
 
        <STRONG>o</STRONG>   Other  implementations  of  <STRONG>tput</STRONG>  on  SVr4-based  systems  such  as
            Solaris,  IRIX64  and HP-UX as well as others such as AIX and Tru64
-           provide support for <EM>capname</EM> operands.
+           provide support for <EM>cap-code</EM> operands.
 
        <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize termcap names rather than
            terminfo capability names in their respective <STRONG>tput</STRONG> commands.  Since
@@ -404,7 +408,7 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
        set  of  capability names, the reasoning for documenting only a few may
        not be apparent.
 
-       <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>capname</EM>  and
+       <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>cap-code</EM> and
            the other features used in this implementation.
 
        <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: POSIX (a subset) and
@@ -413,87 +417,86 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
            terminal capabilities database.
 
        <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
-           using   curses,   none   of   the   systems  which  have  a  curses
-           implementation provide a <STRONG>tput</STRONG> utility which does  not  provide  the
-           <EM>capname</EM> feature.
+           using  <EM>curses,</EM>  no  system  with a <EM>curses</EM> implementation provides a
+           <STRONG>tput</STRONG> utility that does not also supply the <EM>cap-code</EM> feature.
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
-       practice (i.e., Unix features documented in SVID 3):
+       practice (that is, System V <EM>curses</EM> behavior).
 
-       <STRONG>o</STRONG>   It  assigns exit code 4 to "invalid operand", which may be the same
-           as <EM>unknown</EM> <EM>capability</EM>.  For instance, the source code for  Solaris'
-           xcurses uses the term "invalid" in this case.
+       <STRONG>o</STRONG>   It assigns exit status 4 to "invalid operand",  which  may  be  the
+           same  as  <EM>unknown</EM>  <EM>capability</EM>.   For  instance, the source code for
+           Solaris' xcurses uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It  assigns  exit  code  255  to  a  numeric  variable  that is not
+       <STRONG>o</STRONG>   It assigns exit status 255  to  a  numeric  variable  that  is  not
            specified in the terminfo database.  That likely is a documentation
-           error,  confusing  the  <STRONG>-1</STRONG>  written  to  the standard output for an
-           absent or cancelled numeric value versus an (unsigned) exit code.
+           error, confusing the <STRONG>-1</STRONG> written  to  the  standard  output  for  an
+           absent or cancelled numeric value versus an (unsigned) exit status.
 
-       The various Unix systems (AIX, HP-UX, Solaris) use the same  exit-codes
-       as <EM>ncurses</EM>.
+       The  various  Unix  systems  (AIX,  HP-UX,  Solaris)  use the same exit
+       statuses as <EM>ncurses</EM>.
 
-       NetBSD curses documents different exit codes which do not correspond to
-       either <EM>ncurses</EM> or X/Open.
+       NetBSD curses documents different exit statuses which do not correspond
+       to either <EM>ncurses</EM> or X/Open.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
+       The  <STRONG>tput</STRONG>  command  was begun by Bill Joy in 1980.  The initial version
        only cleared the screen.
 
        AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
 
-       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
-           against each predefined capability and returned  the  corresponding
-           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
+       <STRONG>o</STRONG>   SVr2 provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the  parameter
+           against  each  predefined capability and returned the corresponding
+           value.  This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for  the
            capabilities which are parameterized.
 
        <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
-           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
-           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
+           <STRONG>init</STRONG> and <STRONG>reset</STRONG>  subcommands  (more  than  half  the  program)  were
+           incorporated  from  the  <STRONG>reset</STRONG>  feature of BSD <STRONG>tset</STRONG> written by Eric
            Allman.
 
        <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
            capabilities in the <STRONG>init</STRONG> subcommand.
 
-       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
-       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
-       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
-       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
-       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
-       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
+       Keith  Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a new
+       implementation based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the  AT&amp;T
+       program,  Bostic's  version accepted some parameters named for <EM>terminfo</EM>
+       capabilities (<STRONG>clear</STRONG>, <STRONG>init</STRONG>, <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).   However  (because  he
+       had  only  <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names for other
+       capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal  I/O
        modes as the earlier BSD <STRONG>tset</STRONG> had done.
 
        At the same time, Bostic added a shell script named "clear", which used
        <STRONG>tput</STRONG> to clear the screen.
 
-       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
+       Both  of  these  appeared  in  4.4BSD,  becoming   the   "modern"   BSD
        implementation of <STRONG>tput</STRONG>.
 
-       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
-       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
-       December 1992.  Ridge's program made  more  sophisticated  use  of  the
-       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
-       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  <EM>ncurses</EM>  in  June  1995.
-       Using  the  portions  dealing with terminal capabilities almost without
-       change,  Raymond  made  improvements  to  the  way   the   command-line
+       This  implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T or
+       BSD: Ross Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in
+       December  1992.   Ridge's  program  made  more sophisticated use of the
+       terminal capabilities than the BSD program.   Eric  Raymond  used  that
+       <STRONG>tput</STRONG>  program  (and  other  parts  of <EM>mytinfo</EM>) in <EM>ncurses</EM> in June 1995.
+       Using the portions dealing with terminal  capabilities  almost  without
+       change,   Raymond   made  improvements  to  the  way  the  command-line
        parameters were handled.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
-            Initialize  the  terminal according to the type of terminal in the
-            environmental variable <EM>TERM</EM>.  This command should be  included  in
-            everyone's .profile after the environmental variable <EM>TERM</EM> has been
+            Initialize the terminal according to the type of terminal  in  the
+            environment  variable  <EM>TERM</EM>.   This  command should be included in
+            everyone's .profile after the environment variable <EM>TERM</EM>  has  been
             exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
 
        <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
-            Reset an AT&amp;T 5620 terminal, overriding the type  of  terminal  in
-            the environmental variable <EM>TERM</EM>.
+            Reset  an  AT&amp;T  5620 terminal, overriding the type of terminal in
+            the environment variable <EM>TERM</EM>.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
             Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
-            left corner of the screen, usually  known  as  the  "home"  cursor
+            left  corner  of  the  screen,  usually known as the "home" cursor
             position).
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
@@ -506,36 +509,43 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
             Print the number of columns for the 450 terminal.
 
        <STRONG>bold=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>offbold=`tput</STRONG> <STRONG>rmso`</STRONG>
-            Set  the  shell  variables <STRONG>bold</STRONG>, to begin stand-out mode sequence,
-            and <STRONG>offbold</STRONG>, to  end  standout  mode  sequence,  for  the  current
+            Set the shell variables <STRONG>bold</STRONG>, to begin  stand-out  mode  sequence,
+            and  <STRONG>offbold</STRONG>,  to  end  standout  mode  sequence,  for the current
             terminal.  This might be followed by a prompt: <STRONG>echo</STRONG> <STRONG>"${bold}Please</STRONG>
             <STRONG>type</STRONG> <STRONG>in</STRONG> <STRONG>your</STRONG> <STRONG>name:</STRONG> <STRONG>${offbold}\c"</STRONG>
 
        <STRONG>tput</STRONG> <STRONG>hc</STRONG>
-            Set exit code to indicate if the current terminal is a  hard  copy
+            Set exit status to indicate if the current terminal is a hard copy
             terminal.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
             Send the sequence to move the cursor to row 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-            Send  the  terminfo string for cursor-movement, with no parameters
+            Send the terminfo string for cursor-movement, with  no  parameters
             substituted.
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-            Print the long name from the <STRONG>terminfo</STRONG> database  for  the  type  of
-            terminal specified in the environmental variable <EM>TERM</EM>.
+            Print  the  long  name  from the <EM>terminfo</EM> database for the type of
+            terminal specified in the environment variable <EM>TERM</EM>.
+
+       <STRONG>tput</STRONG> <STRONG>-S</STRONG>
+            The <STRONG>-S</STRONG> option can be profitably used with a shell "here document".
+
+            $ <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
+            &gt; <STRONG>clear</STRONG>
+            &gt; <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
+            &gt; <STRONG>bold</STRONG>
+            &gt; <STRONG>!</STRONG>
+
+            We see <STRONG>tput</STRONG> processing several capabilities in one invocation.  It
+            clears the screen, moves the cursor to position (10, 10) and turns
+            on bold (extra bright) mode.
 
-            <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>clear</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>bold</STRONG>
-            <STRONG>&gt;</STRONG> <STRONG>!</STRONG>
+            The same sequence of commands can be combined  using  the  OpenBSD
+            feature:
 
-            This  example  shows  <STRONG>tput</STRONG>  processing several capabilities 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 (<STRONG>!</STRONG>) on a line by itself.
+            $ <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -543,7 +553,7 @@ <H1 class="no-header">tput 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 5064c686d..c60e2a7f3 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.78 2023/12/16 20:32:22 tom Exp @
+  * @Id: tset.1,v 1.79 2023/12/23 16:20:07 tom Exp @
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
   * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
   *   reset.c
@@ -43,12 +43,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2023-12-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2023-12-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -68,7 +68,7 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-tset---initialization">tset - initialization</a></H3><PRE>
+</PRE><H3><a name="h3-tset----initialization"><EM>tset</EM> -- initialization</a></H3><PRE>
        This program initializes terminals.
 
        First,  <STRONG>tset</STRONG>  retrieves  the  current  terminal  mode settings for your
@@ -90,11 +90,11 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 
        1. The <STRONG>terminal</STRONG> argument specified on the command line.
 
-       2. The value of the <EM>TERM</EM> environmental variable.
+       2. The value of the <EM>TERM</EM> environment variable.
 
        3. (BSD systems only.) The terminal type associated with  the  standard
        error  output  device  in  the  <EM>/etc/ttys</EM> file.  (On System V hosts and
-       systems using that convention, <STRONG>getty(1)</STRONG> does this job by  setting  <EM>TERM</EM>
+       systems using that convention, <STRONG>getty(8)</STRONG> does this job by  setting  <EM>TERM</EM>
        according to the type passed to it by <EM>/etc/inittab</EM>.)
 
        4.  The  default  terminal  type, "unknown", is not suitable for curses
@@ -132,7 +132,7 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
            displayed to the standard error output.
 
 
-</PRE><H3><a name="h3-reset---reinitialization">reset - reinitialization</a></H3><PRE>
+</PRE><H3><a name="h3-reset----reinitialization"><EM>reset</EM> -- reinitialization</a></H3><PRE>
        When invoked as <STRONG>reset</STRONG>, <STRONG>tset</STRONG> sets the terminal modes to "sane" values:
 
        <STRONG>o</STRONG>   sets cooked and echo modes,
@@ -168,61 +168,60 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 
        When the <STRONG>-s</STRONG> option is specified, the commands to enter the  information
        into  the  shell's  environment are written to the standard output.  If
-       the <EM>SHELL</EM> environmental variable ends in "csh", the  commands  are  for
-       <STRONG>csh</STRONG>,  otherwise,  they  are  for <STRONG>sh(1)</STRONG>.  Note, the <STRONG>csh</STRONG> commands set and
-       unset the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following  line
-       in  the  <STRONG>.login</STRONG>  or  <STRONG>.profile</STRONG>  files  will  initialize  the environment
-       correctly:
+       the <EM>SHELL</EM> environment variable ends in  "csh",  the  commands  are  for
+       <STRONG>csh(1)</STRONG>,  otherwise, they are for <STRONG>sh(1)</STRONG>.  The <EM>csh</EM> commands set and unset
+       the shell variable <STRONG>noglob</STRONG>, leaving it unset.  The following line in the
+       <STRONG>.login</STRONG> or <STRONG>.profile</STRONG> files will initialize the environment correctly:
 
            eval `tset -s options ... `
 
 
 </PRE><H3><a name="h3-Terminal-Type-Mapping">Terminal Type Mapping</a></H3><PRE>
-       When the terminal is not hardwired into  the  system  (or  the  current
-       system  information  is  incorrect)  the terminal type derived from the
-       <EM>/etc/ttys</EM> file or the <EM>TERM</EM> environmental variable  is  often  something
-       generic  like  <STRONG>network</STRONG>,  <STRONG>dialup</STRONG>,  or  <STRONG>unknown</STRONG>.   When <STRONG>tset</STRONG> is used in a
-       startup script it is often desirable to provide information  about  the
+       When  the  terminal  is  not  hardwired into the system (or the current
+       system information is incorrect) the terminal  type  derived  from  the
+       <EM>/etc/ttys</EM>  file  or  the  <EM>TERM</EM>  environment variable is often something
+       generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>, or <STRONG>unknown</STRONG>.   When  <STRONG>tset</STRONG>  is  used  in  a
+       startup  script  it is often desirable to provide information about the
        type of terminal used on such ports.
 
-       The  <STRONG>-m</STRONG>  options  maps  from some set of conditions to a terminal type,
+       The <STRONG>-m</STRONG> options maps from some set of conditions  to  a  terminal  type,
        that is, to tell <STRONG>tset</STRONG> "If I'm on this port at a particular speed, guess
        that I'm on that kind of terminal".
 
-       The  argument  to  the  <STRONG>-m</STRONG> option consists of an optional port type, an
-       optional operator, an optional baud  rate  specification,  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 "&gt;", "&lt;", "@", and "!"; "&gt;" means
-       greater than, "&lt;" 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 argument to the <STRONG>-m</STRONG> option consists of an  optional  port  type,  an
+       optional  operator,  an  optional  baud rate specification, 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 "&gt;", "&lt;", "@", and  "!";  "&gt;"  means
+       greater  than,  "&lt;" 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 terminal type is a string.
 
-       If  the  terminal  type  is  not  specified on the command line, the <STRONG>-m</STRONG>
-       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
+       If the terminal type is not specified  on  the  command  line,  the  <STRONG>-m</STRONG>
+       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 applicable mapping is used.
 
-       For  example,  consider  the following mapping: <STRONG>dialup&gt;9600:vt100</STRONG>.  The
+       For example, consider the following  mapping:  <STRONG>dialup&gt;9600:vt100</STRONG>.   The
        port type is dialup , the operator is &gt;, the baud rate specification is
        9600, and the terminal type is vt100.  The result of this mapping is to
-       specify that if the terminal type is  <STRONG>dialup</STRONG>,  and  the  baud  rate  is
+       specify  that  if  the  terminal  type  is <STRONG>dialup</STRONG>, and the baud rate is
        greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> 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,  <STRONG>-m</STRONG>  <STRONG>dialup:vt100</STRONG> <STRONG>-m</STRONG> <STRONG>:?xterm</STRONG> will cause any
+       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, <STRONG>-m</STRONG> <STRONG>dialup:vt100</STRONG>  <STRONG>-m</STRONG>  <STRONG>:?xterm</STRONG>  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
+       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 <STRONG>-m</STRONG> option argument.
-       Also, to avoid problems with meta-characters, it is suggested that  the
+       No whitespace characters are  permitted  in  the  <STRONG>-m</STRONG>  option  argument.
+       Also,  to avoid problems with meta-characters, it is suggested that the
        entire <STRONG>-m</STRONG> option argument be placed within single quote characters, and
-       that  <STRONG>csh</STRONG>  users  insert  a  backslash  character  ("\")   before   any
+       that   <EM>csh</EM>   users  insert  a  backslash  character  ("\")  before  any
        exclamation marks ("!").
 
 
@@ -234,7 +233,7 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
        <STRONG>-e</STRONG> <EM>ch</EM>
             Set the erase character to <EM>ch</EM>.
 
-       <STRONG>-I</STRONG>   Do  not  send  the  terminal  or tab initialization strings to the
+       <STRONG>-I</STRONG>   Do not send the terminal or  tab  initialization  strings  to  the
             terminal.
 
        <STRONG>-i</STRONG> <EM>ch</EM>
@@ -244,32 +243,32 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
             Set the line kill character to <EM>ch</EM>.
 
        <STRONG>-m</STRONG> <EM>mapping</EM>
-            Specify a mapping from a port type to a terminal;  see  subsection
+            Specify  a  mapping from a port type to a terminal; see subsection
             "Terminal Type Mapping".
 
-       <STRONG>-Q</STRONG>   Do  not  display any values for the erase, interrupt and line kill
-            characters.   Normally  <STRONG>tset</STRONG>  displays  the  values  for   control
+       <STRONG>-Q</STRONG>   Do not display any values for the erase, interrupt and  line  kill
+            characters.    Normally  <STRONG>tset</STRONG>  displays  the  values  for  control
             characters which differ from the system's default values.
 
-       <STRONG>-q</STRONG>   The  terminal  type  is  displayed to the standard output, and the
-            terminal is not initialized in any way.  The option "-" by  itself
+       <STRONG>-q</STRONG>   The terminal type is displayed to the  standard  output,  and  the
+            terminal  is not initialized in any way.  The option "-" by itself
             is equivalent but archaic.
 
        <STRONG>-r</STRONG>   Print the terminal type to the standard error output.
 
        <STRONG>-s</STRONG>   Print the sequence of shell commands to initialize the environment
-            variable <EM>TERM</EM> to the standard output; see subsection "Setting  the
+            variable  <EM>TERM</EM> to the standard output; see subsection "Setting the
             Environment".
 
        <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
             exits.
 
-       <STRONG>-w</STRONG>   Resize the window to match the  size  deduced  via  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
-            Normally  this  has  no  effect,  unless  <STRONG>setupterm</STRONG> is not able to
+       <STRONG>-w</STRONG>   Resize  the  window  to  match the size deduced via <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
+            Normally this has no effect,  unless  <STRONG>setupterm</STRONG>  is  not  able  to
             detect the window size.
 
-       The arguments for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be  entered  as
-       actual  characters  or by using the "hat" notation, i.e., control-h may
+       The  arguments  for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be entered as
+       actual characters or by using the "hat" notation, i.e.,  control-h  may
        be specified as "^H" or "^h".
 
        If neither <STRONG>-c</STRONG> or <STRONG>-w</STRONG> is given, both options are assumed.
@@ -279,16 +278,16 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
        The <STRONG>tset</STRONG> command uses these environment variables:
 
        <EM>SHELL</EM>
-            tells <STRONG>tset</STRONG> whether  to  initialize  <EM>TERM</EM>  using  <STRONG>sh(1)</STRONG>  or  <STRONG>csh(1)</STRONG>
+            tells  <STRONG>tset</STRONG>  whether  to  initialize  <EM>TERM</EM>  using  <STRONG>sh(1)</STRONG> or <STRONG>csh(1)</STRONG>
             syntax.
 
-       <EM>TERM</EM> Denotes  your  terminal  type.   Each  terminal  type is distinct,
+       <EM>TERM</EM> Denotes your terminal  type.   Each  terminal  type  is  distinct,
             though many are similar.
 
        <EM>TERMCAP</EM>
-            may denote the location of a termcap database.  If it  is  not  an
-            absolute  pathname,  e.g.,  begins  with  a  "/", <STRONG>tset</STRONG> removes the
-            variable from the environment  before  looking  for  the  terminal
+            may  denote  the  location of a termcap database.  If it is not an
+            absolute pathname, e.g., begins  with  a  "/",  <STRONG>tset</STRONG>  removes  the
+            variable  from  the  environment  before  looking for the terminal
             description.
 
 
@@ -302,108 +301,108 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
+       Neither  IEEE  Std  1003.1/The  Open  Group Base Specifications Issue 7
        (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>tset</STRONG> or <STRONG>reset</STRONG>.
 
-       The  AT&amp;T <STRONG>tput</STRONG> utility (AIX, HP-UX, Solaris) incorporated the terminal-
-       mode manipulation as well as termcap-based features such  as  resetting
-       tabstops  from  <STRONG>tset</STRONG>  in  BSD  (4.1c), presumably with the intention of
-       making <STRONG>tset</STRONG> obsolete.  However, each of those  systems  still  provides
-       <STRONG>tset</STRONG>.   In fact, the commonly-used <STRONG>reset</STRONG> utility is always an alias for
+       The AT&amp;T <STRONG>tput</STRONG> utility (AIX, HP-UX, Solaris) incorporated the  terminal-
+       mode  manipulation  as well as termcap-based features such as resetting
+       tabstops from <STRONG>tset</STRONG> in BSD (4.1c),  presumably  with  the  intention  of
+       making  <STRONG>tset</STRONG>  obsolete.   However, each of those systems still provides
+       <STRONG>tset</STRONG>.  In fact, the commonly-used <STRONG>reset</STRONG> utility is always an alias  for
        <STRONG>tset</STRONG>.
 
        The <STRONG>tset</STRONG> utility provides backward compatibility with BSD environments;
-       under  most  modern  Unices,  <EM>/etc/inittab</EM>  and  <STRONG>getty(1)</STRONG>  can set <EM>TERM</EM>
-       appropriately for each dial-up line, obviating  what  was  <STRONG>tset</STRONG>'s  most
-       important  use.   This  implementation behaves like 4.4BSD <STRONG>tset</STRONG>, with a
+       under most modern  Unices,  <EM>/etc/inittab</EM>  and  <STRONG>getty(8)</STRONG>  can  set  <EM>TERM</EM>
+       appropriately  for  each  dial-up  line, obviating what was <STRONG>tset</STRONG>'s most
+       important use.  This implementation behaves like 4.4BSD  <STRONG>tset</STRONG>,  with  a
        few exceptions we shall consider now.
 
-       A few options are different because the <EM>TERMCAP</EM> variable is  no  longer
+       A  few  options are different because the <EM>TERMCAP</EM> variable is no longer
        supported under terminfo-based <EM>ncurses</EM>:
 
-       <STRONG>o</STRONG>   The  <STRONG>-S</STRONG>  option  of  BSD  <STRONG>tset</STRONG>  no longer works; it prints an error
+       <STRONG>o</STRONG>   The <STRONG>-S</STRONG> option of BSD <STRONG>tset</STRONG> no  longer  works;  it  prints  an  error
            message to the standard error and dies.
 
        <STRONG>o</STRONG>   The <STRONG>-s</STRONG> option only sets <EM>TERM</EM>, not <EM>TERMCAP</EM>.
 
-       There was an undocumented 4.4BSD feature that invoking <STRONG>tset</STRONG> via a  link
-       named  "TSET"  (or  via  any  other  name  beginning with an upper-case
+       There  was an undocumented 4.4BSD feature that invoking <STRONG>tset</STRONG> via a link
+       named "TSET" (or via  any  other  name  beginning  with  an  upper-case
        letter) set the terminal to use upper-case only.  This feature has been
        omitted.
 
        The <STRONG>-A</STRONG>, <STRONG>-E</STRONG>, <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were deleted from the <STRONG>tset</STRONG> utility in
-       4.4BSD.  None of them were documented in 4.3BSD and all are of  limited
-       utility  at  best.   The  <STRONG>-a</STRONG>,  <STRONG>-d</STRONG>,  and  <STRONG>-p</STRONG>  options  are similarly not
-       documented or useful, but  were  retained  as  they  appear  to  be  in
-       widespread  use.   It  is  strongly recommended that any usage of these
+       4.4BSD.   None of them were documented in 4.3BSD and all are of limited
+       utility at best.   The  <STRONG>-a</STRONG>,  <STRONG>-d</STRONG>,  and  <STRONG>-p</STRONG>  options  are  similarly  not
+       documented  or  useful,  but  were  retained  as  they  appear to be in
+       widespread use.  It is strongly recommended that  any  usage  of  these
        three options be changed to use the <STRONG>-m</STRONG> option instead.  The <STRONG>-a</STRONG>, <STRONG>-d</STRONG>, and
        <STRONG>-p</STRONG> options are therefore omitted from the usage summary above.
 
-       Very  old  systems,  e.g., 3BSD, used a different terminal driver which
-       was replaced in 4BSD in the early 1980s.  To  accommodate  these  older
-       systems,  the  4BSD  <STRONG>tset</STRONG>  provided a <STRONG>-n</STRONG> option to specify that the new
-       terminal driver should be used.  This implementation does  not  provide
+       Very old systems, e.g., 3BSD, used a different  terminal  driver  which
+       was  replaced  in  4BSD in the early 1980s.  To accommodate these older
+       systems, the 4BSD <STRONG>tset</STRONG> provided a <STRONG>-n</STRONG> option to  specify  that  the  new
+       terminal  driver  should be used.  This implementation does not provide
        that choice.
 
-       It  is  still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options without
+       It is still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG>  options  without
        arguments, although it is strongly recommended that such usage be fixed
        to explicitly specify the character.
 
-       As  of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies the <STRONG>-Q</STRONG> option.
+       As of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies the <STRONG>-Q</STRONG>  option.
        Also, the interaction between the - option and the <EM>terminal</EM> argument in
        some historic implementations of <STRONG>tset</STRONG> has been removed.
 
-       The  <STRONG>-c</STRONG>  and  <STRONG>-w</STRONG>  options  are  not  found  in earlier implementations.
+       The <STRONG>-c</STRONG> and  <STRONG>-w</STRONG>  options  are  not  found  in  earlier  implementations.
        However, a different window size-change feature was provided in 4.4BSD.
 
-       <STRONG>o</STRONG>   In 4.4BSD, <STRONG>tset</STRONG> uses the window size from the  termcap  description
-           to  set  the  window  size if <STRONG>tset</STRONG> is not able to obtain the window
+       <STRONG>o</STRONG>   In  4.4BSD,  <STRONG>tset</STRONG> uses the window size from the termcap description
+           to set the window size if <STRONG>tset</STRONG> is not able  to  obtain  the  window
            size from the operating system.
 
        <STRONG>o</STRONG>   In <EM>ncurses</EM>, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
-           be  from  the  operating  system, the <EM>LINES</EM> and <EM>COLUMNS</EM> environment
+           be from the operating system, the  <EM>LINES</EM>  and  <EM>COLUMNS</EM>  environment
            variables or the terminal description.
 
-       Obtaining the window size from the terminal description  is  common  to
-       both  implementations,  but considered obsolescent.  Its only practical
+       Obtaining  the  window  size from the terminal description is common to
+       both implementations, but considered obsolescent.  Its  only  practical
        use is for hardware terminals.  Generally speaking, a window size would
-       be  unset  only if there were some problem obtaining the value from the
-       operating system (and <STRONG>setupterm</STRONG> would still fail).   For  that  reason,
-       the  <EM>LINES</EM>  and <EM>COLUMNS</EM> environment variables may be useful for working
-       around window-size problems.  Those  have  the  drawback  that  if  the
-       window  is  resized, those variables must be recomputed and reassigned.
+       be unset only if there were some problem obtaining the value  from  the
+       operating  system  (and  <STRONG>setupterm</STRONG> would still fail).  For that reason,
+       the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables may be useful  for  working
+       around  window-size  problems.   Those  have  the  drawback that if the
+       window is resized, those variables must be recomputed  and  reassigned.
        To do this more easily, use the <STRONG>resize(1)</STRONG> program.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A <STRONG>reset</STRONG> command written by Kurt Shoens appeared in 1BSD  (March  1978).
+       A  <STRONG>reset</STRONG>  command written by Kurt Shoens appeared in 1BSD (March 1978).
        It  set  the  <EM>erase</EM>  and  <EM>kill</EM>  characters  to  <STRONG>^H</STRONG>  (backspace)  and  <STRONG>@</STRONG>
-       respectively.  Mark Horton improved this <STRONG>reset</STRONG> in 3BSD (October  1979),
-       adding  <EM>intr</EM>,  <EM>quit</EM>, <EM>start</EM>/<EM>stop</EM>, and <EM>eof</EM> characters as well as changing
-       the program to avoid modifying any  user  settings.   That  version  of
+       respectively.   Mark Horton improved this <STRONG>reset</STRONG> in 3BSD (October 1979),
+       adding <EM>intr</EM>, <EM>quit</EM>, <EM>start</EM>/<EM>stop</EM>, and <EM>eof</EM> characters as well  as  changing
+       the  program  to  avoid  modifying  any user settings.  That version of
        <STRONG>reset</STRONG> did not use <EM>termcap</EM>.
 
-       Eric  Allman wrote a distinct <STRONG>tset</STRONG> command for 1BSD, using a forerunner
-       of <EM>termcap</EM>  called  <EM>ttycap</EM>.   Allman's  comments  in  the  source  code
-       indicate  that  he  began  work in October 1977, continuing development
-       over the next few years.  By late 1979, it had migrated to <EM>termcap</EM>  and
-       handled  the  <EM>TERMCAP</EM>  variable.  Later comments indicate that <STRONG>tset</STRONG> was
-       modified in September 1980 to use logic copied from  the  3BSD  "reset"
-       program  when  it  was  invoked  as  <STRONG>reset</STRONG>.   This  version appeared in
-       4.1cBSD, late in 1982.  Other developers such as Keith Bostic  and  Jim
+       Eric Allman wrote a distinct <STRONG>tset</STRONG> command for 1BSD, using a  forerunner
+       of  <EM>termcap</EM>  called  <EM>ttycap</EM>.   Allman's  comments  in  the  source code
+       indicate that he began work in  October  1977,  continuing  development
+       over  the next few years.  By late 1979, it had migrated to <EM>termcap</EM> and
+       handled the <EM>TERMCAP</EM> variable.  Later comments indicate  that  <STRONG>tset</STRONG>  was
+       modified  in  September  1980 to use logic copied from the 3BSD "reset"
+       program when it  was  invoked  as  <STRONG>reset</STRONG>.   This  version  appeared  in
+       4.1cBSD,  late  in 1982.  Other developers such as Keith Bostic and Jim
        Bloom continued to modify <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
 
-       The  <EM>ncurses</EM> implementation was lightly adapted from the 4.4BSD sources
+       The <EM>ncurses</EM> implementation was lightly adapted from the 4.4BSD  sources
        to use the <EM>terminfo</EM> API by Eric S. Raymond &lt;esr@snark.thyrsus.com&gt;.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
+       <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -411,8 +410,8 @@ <H1 class="no-header">tset 1 2023-12-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-tset---initialization">tset - initialization</a></li>
-<li><a href="#h3-reset---reinitialization">reset - reinitialization</a></li>
+<li><a href="#h3-tset----initialization">tset -- initialization</a></li>
+<li><a href="#h3-reset----reinitialization">reset -- reinitialization</a></li>
 <li><a href="#h3-Setting-the-Environment">Setting the Environment</a></li>
 <li><a href="#h3-Terminal-Type-Mapping">Terminal Type Mapping</a></li>
 </ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 0491b60ad..98ae2ec93 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.42 2023/12/16 20:32:22 tom Exp @
+  * @Id: user_caps.5,v 1.43 2023/12/23 16:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-12-16 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-12-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -179,7 +179,7 @@ <H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
            terminfo.
 
 
-</PRE><H3><a name="h3-Recognized-capabilities">Recognized capabilities</a></H3><PRE>
+</PRE><H3><a name="h3-Recognized-Capabilities">Recognized Capabilities</a></H3><PRE>
        The <EM>ncurses</EM> library uses the user-definable  capabilities.   While  the
        terminfo  database  may  have  other extensions, <EM>ncurses</EM> makes explicit
        checks for these:
@@ -314,7 +314,7 @@ <H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
                           %?%p4%tM%em%;,
 
 
-</PRE><H3><a name="h3-Extended-key-definitions">Extended key-definitions</a></H3><PRE>
+</PRE><H3><a name="h3-Extended-Key-Definitions">Extended Key Definitions</a></H3><PRE>
        Several  terminals  provide  the  ability  to send distinct strings for
        combinations of modified special keys.  There is no standard  for  what
        those keys can send.
@@ -396,7 +396,7 @@ <H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-12-23                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -405,8 +405,8 @@ <H1 class="no-header">user_caps 5 2023-12-16 ncurses 6.4 File formats</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Background">Background</a></li>
-<li><a href="#h3-Recognized-capabilities">Recognized capabilities</a></li>
-<li><a href="#h3-Extended-key-definitions">Extended key-definitions</a></li>
+<li><a href="#h3-Recognized-Capabilities">Recognized Capabilities</a></li>
+<li><a href="#h3-Extended-Key-Definitions">Extended Key Definitions</a></li>
 </ul>
 </li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 269d34012..ec6aa90ac 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.20 2023/12/16 21:43:05 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.22 2023/12/23 23:44:26 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
 configuration helper for \fI\%ncurses\fP libraries
@@ -57,10 +57,6 @@ reports the C compiler flags needed to compile with \fI\%ncurses\fP.
 \fB\-\-libs\fP
 reports the libraries needed to link with \fI\%ncurses\fP.
 .TP
-\fB\-\-version\fP
-reports the release and patch date information of \fI\%ncurses\fP and
-exits successfully.
-.TP
 \fB\-\-abi\-version\fP
 reports the ABI version of \fI\%ncurses\fP.
 .TP
@@ -95,8 +91,14 @@ for example \fI\%@TERMINFO_DIRS@\fP.
 reports the \fI\%TERMPATH\fP supplemental search path for the
 \fItermcap\fP database,
 if support for \fItermcap\fP is configured.
-.TP
+.PP
+The following options cause all others to be ignored.
+.TP 11 .\" "--version" + 2n
 \fB\-\-help\fP
 issues a usage message and exits successfully.
+.TP
+\fB\-\-version\fP
+issues the release and patch date information of \fI\%ncurses\fP and
+exits successfully.
 .SH "SEE ALSO"
 \fB\%curses\fP(3X)
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 43a0bd6de..bd98b7d05 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.57 2023/12/16 21:34:23 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.58 2023/12/23 16:28:31 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,8 +40,6 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
-.
-.ds d /etc/termcap
 .SH NAME
 \fB\%@CAPTOINFO@\fP \-
 convert a \fItermcap\fP description into a \fI\%term\%info\fP description
@@ -67,7 +65,8 @@ If no \fIfile\fPs are specified,
 and extracts only the entry for the terminal named in the environment
 variable \fITERM\fP from it.
 If the environment variable \fI\%TERMCAP\fP is not set,
-\fB\%@CAPTOINFO@\fP reads \fI\%\*d\fP.
+\fB\%@CAPTOINFO@\fP reads
+.I \%/etc/termcap.
 .PP
 This utility is implemented as a link to \fB\%@TIC@\fP(1M),
 with the latter's
@@ -82,7 +81,7 @@ and
 .BR \-x .
 The \fB\-V\fP option reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
-.SS "Translations from nonstandard capabilities"
+.SS "Translations from Nonstandard Capabilities"
 \fB\%@CAPTOINFO@\fP translates some obsolete,
 nonstandard capabilities into standard
 (SVr4/XSI Curses)
@@ -204,7 +203,7 @@ The HP-UX \fI\%\%term\%info\fP library supports two nonstandard
 \fB\%@CAPTOINFO@\fP discards these with a warning message.
 .SH FILES
 .TP
-.I \*d
+.I /etc/termcap
 default \fI\%termcap\fP terminal capability database
 .SH PORTABILITY
 X/Open Curses,
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 227acc252..2d2c1421e 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.49 2023/12/16 21:19:37 tom Exp $
-.TH curs_add_wch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.50 2023/12/23 16:08:25 tom Exp $
+.TH curs_add_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -117,7 +117,7 @@ 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 *\fBecho\fP* functions instead of their equivalents.
-.SS Line Graphics
+.SS "Line Graphics"
 Like \fB\%addch\fP(3X),
 \fBaddch_wch\fP accepts symbols which make it simple to draw lines and other
 frequently used special characters.
@@ -255,7 +255,7 @@ may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for line-drawing characters apply in the POSIX locale.
-.SS WACS Symbols
+.SS "WACS Symbols"
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
 a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fP.
 A few implementations are problematic:
@@ -333,7 +333,7 @@ Others have suggested these alternatives:
 \[u2327] U+2327 (x in a rectangle),
 \[u256C] U+256C (forms double vertical and horizontal), and
 \[u2612] U+2612 (ballot box with x).
-.SS Complex Characters
+.SS "Complex Characters"
 The complex character type \fBcchar_t\fR
 can store more than one wide character (\fBwchar_t\fR).
 The X/Open Curses description does not mention this possibility,
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index e61aee2f3..b87f76637 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.75 2023/12/16 21:19:37 tom Exp $
-.TH curs_addch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.76 2023/12/23 16:27:51 tom Exp $
+.TH curs_addch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,11 +66,11 @@ add a \fIcurses\fR character to a window and advance the cursor
 \fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
-.SS Adding characters
+.SS "Adding Characters"
 The \fBaddch\fP, \fBwaddch\fP, \fBmvaddch\fP and \fBmvwaddch\fP routines put
 the character \fIch\fP into the given window at its current window position,
 which is then advanced.
-They are analogous to \fBputchar\fP(3) in \fBstdio\fP(3).
+They are analogous to the standard C library's \fI\%putchar\fP(3).
 If the advance is at the right margin:
 .bP
 The cursor automatically wraps to the beginning of the next line.
@@ -122,7 +122,7 @@ Video attributes can be combined with a character argument passed to
 using \fB\%inch\fP(3X) and \fBaddch\fP.)
 See the \fB\%curs_attr\fP(3X) page for values of predefined video
 attribute constants that can be usefully OR'ed into characters.
-.SS Echoing characters
+.SS "Echoing Characters"
 The \fBechochar\fP and \fBwechochar\fP routines are equivalent to a call to
 \fBaddch\fP followed by a call to \fB\%refresh\fP(3X), or a call to \fBwaddch\fP
 followed by a call to \fBwrefresh\fP.
@@ -130,7 +130,7 @@ 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.
-.SS Line Graphics
+.SS "Line Graphics"
 The following variables may be used to add line drawing characters to the
 screen with routines of the \fBaddch\fP family.
 The default character listed
@@ -209,7 +209,7 @@ Note that \fBaddch\fP, \fBmvaddch\fP, \fBmvwaddch\fP, and
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 The defaults specified for forms-drawing characters apply in the POSIX locale.
-.SS ACS Symbols
+.SS "ACS Symbols"
 X/Open Curses states that the \fBACS_\fP definitions are \fBchar\fP constants.
 For the wide-character implementation (see \fBcurs_add_wch\fP),
 there are analogous \fBWACS_\fP definitions which are \fBcchar_t\fP constants.
@@ -269,7 +269,7 @@ In certain cases, the terminal is unable to display line-drawing characters
 except by using UTF-8
 (see the discussion of \fB\%NCURSES_NO_UTF8_ACS\fP in
 \fB\%ncurses\fP(3X)).
-.SS Character Set
+.SS "Character Set"
 X/Open Curses assumes that the parameter passed to \fBwaddch\fP contains
 a single character.
 As discussed in \fB\%curs_attr\fP(3X), that character may have been
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 475d3ab48..daba5c214 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.92 2023/12/16 21:07:24 tom Exp $
-.TH curs_attr 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.93 2023/12/23 16:08:25 tom Exp $
+.TH curs_attr 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,7 +127,7 @@ when erasing portions of the window.
 See \fBcurs_bkgd\fP(3X) for functions which modify the attributes used for
 erasing and clearing.
 .\" ---------------------------------------------------------------------------
-.SS Window attributes
+.SS "Window Attributes"
 There are two sets of functions:
 .bP
 functions for manipulating the window attributes and color:
@@ -148,7 +148,7 @@ Use \fBattr_off\fP and \fBwattr_off\fP to turn off window attributes,
 again values OR'd together in \fIattr\fP,
 without affecting other attributes.
 .\" ---------------------------------------------------------------------------
-.SS Legacy window attributes
+.SS "Legacy Window Attributes"
 The X/Open window attribute routines which \fIset\fP or \fIget\fP,
 turn \fIon\fP or \fIoff\fP
 are extensions of older routines
@@ -206,7 +206,7 @@ in X/Open Curses,
 although \fI\%ncurses\fP provides \fB\%getattrs\fP
 (see \fB\%curs_legacy\fP(3X)).
 .\" ---------------------------------------------------------------------------
-.SS Change character rendition
+.SS "Change Character Rendition"
 The routine \fBchgat\fP changes the attributes of a given number of characters
 starting at the current cursor location of \fBstdscr\fP.
 It does not update
@@ -221,7 +221,7 @@ In these functions,
 the color \fIpair\fP argument is a color pair index
 (as in the first argument of \fBinit_pair\fP, see \fBcurs_color\fP(3X)).
 .\" ---------------------------------------------------------------------------
-.SS Change window color
+.SS "Change Window Color"
 The routine \fBcolor_set\fP sets the current color of the given window to the
 foreground/background combination described by the color \fIpair\fP parameter.
 .\" ---------------------------------------------------------------------------
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 159777465..15a5e6490 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.54 2023/12/17 23:31:28 tom Exp $
-.TH curs_bkgd 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.55 2023/12/23 16:35:10 tom Exp $
+.TH curs_bkgd 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -173,7 +173,9 @@ there is no \fB\%wgetbkgd\fP function;
 \fB\%getbkgd\fP behaves as one would expect \fB\%wgetbkgd\fP to,
 accepting a \fI\%WINDOW\fP pointer argument.
 .PP
-\fB\%bkgd\fP and \fB\%bkgdset\fP may be available as macros.
+\fB\%bkgd\fP and
+\fB\%bkgdset\fP
+may be implemented as macros.
 .PP
 X/Open Curses mentions that the character part of the background must
 be a single-byte value.
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index f2e75cff0..b80bf049b 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.35 2023/12/16 23:00:21 tom Exp $
-.TH curs_bkgrnd 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.36 2023/12/23 16:35:10 tom Exp $
+.TH curs_bkgrnd 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -189,7 +189,7 @@ is null.
 \fB\%bkgrnd\fP,
 \fB\%bkgrndset\fP, and
 \fB\%getbkgrnd\fP
-may be available as macros.
+may be implemented as macros.
 .PP
 Unlike their counterparts in the non-\*(``wide\*('' configuration of
 .I \%ncurses,
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 9cf9165e5..73dce9ca7 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.93 2023/12/16 21:07:24 tom Exp $
-.TH curs_color 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.95 2023/12/23 20:18:13 tom Exp $
+.TH curs_color 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -75,6 +75,10 @@ manipulate terminal colors with \fIcurses\fR
 .nf
 \fB#include <curses.h>
 .PP
+\fI/* variables */
+\fBint COLOR_PAIRS;
+\fBint COLORS;
+.PP
 \fBint start_color(void);
 .PP
 \fBbool has_colors(void);
@@ -100,43 +104,55 @@ manipulate terminal colors with \fIcurses\fR
 .fi
 .SH DESCRIPTION
 .SS Overview
-\fIcurses\fP supports color attributes on terminals with that capability.
-To use these routines \fB\%start_color\fP must be called, usually right after
-\fB\%initscr\fP.
-Colors are always used in pairs (referred to as color pairs).
-A color pair consists of a foreground color (for characters) and a background
-color (for the blank field on which the characters are displayed).
-A programmer initializes a color pair with the routine \fB\%init_pair\fP.
-After it has been initialized, \fB\%COLOR_PAIR\fP(\fIn\fP)
-can be used to convert the pair to a video attribute.
-.PP
-If a terminal is capable of redefining colors, the programmer can use the
-routine \fB\%init_color\fP to change the definition of a color.
-The routines \fB\%has_colors\fP and \fB\%can_change_color\fP
+\fIcurses\fP supports color attributes on terminals with that
+capability.
+Call \fB\%start_color\fP
+(typically right after \fB\%initscr\fP(3X))
+to enable this feature.
+Colors are always used in pairs.
+A
+.I "color pair"
+couples a foreground color for characters with a background color for
+the blank field on which characters are rendered.
+\fB\%init_pair\fP initializes a color pair.
+The macro \fB\%COLOR_PAIR\fP(\fIn\fP) can then convert the pair to a
+video attribute.
+.PP
+If a terminal has the relevant capability,
+\fB\%init_color\fP permits (re)definition of a color.
+\fB\%has_colors\fP and \fB\%can_change_color\fP
 return \fBTRUE\fP or \fBFALSE\fP,
-depending on whether the terminal has color capabilities and whether the
+depending on whether the terminal has color capability and whether the
 programmer can change the colors.
-The routine \fB\%color_content\fP allows a
-programmer to extract the amounts of red, green, and blue components in an
-initialized color.
-The routine \fB\%pair_content\fP allows a programmer to find
-out how a given color pair is currently defined.
-.SS Color Rendering
-The \fIcurses\fP library combines these inputs to produce the
-actual foreground and background colors shown on the screen:
+\fB\%color_content\fP permits extraction of the
+red,
+green,
+and blue components of an initialized color.
+\fB\%pair_content\fP permits discovery of a color pair's current
+definition.
+.SS Rendering
+.I curses
+combines the following data to render a character cell.
+Any of them can include color information.
 .bP
-per-character video attributes (e.g., via \fB\%waddch\fP),
+.I curses
+character attributes,
+as from \fB\%waddch\fP(3X) or \fB\%wadd_wch\fP(3X)
 .bP
-the window attribute (e.g., by \fB\%wattrset\fP), and
+window attributes,
+as from \fB\%wattrset\fP(3X) or \fB\%wattr_set\fP(3X)
 .bP
-the background character (e.g., \fB\%wbkgdset\fP).
+window background character atttributes,
+as from \fB\%wbkgdset\fP(3X) or \fB\%wbkgrndset\fP(3X)
 .PP
-Per-character and window attributes are usually set by a parameter containing
-video attributes including a color pair value.
-Some functions such as \fB\%wattr_set\fP use a separate parameter which
-is the color pair number.
+Per-character and window attributes are usually set through a function
+parameter containing attributes including a color pair value.
+Some functions,
+such as \fB\%wattr_set\fP,
+use a separate color pair number parameter.
 .PP
-The background character is a special case: it includes a character value,
+The background character is a special case:
+it includes a character code,
 just as if it were passed to \fB\%waddch\fP.
 .PP
 The \fIcurses\fP library does the actual work of combining these color
@@ -189,8 +205,21 @@ There are no standard names for those additional colors.
 is initialized by \fB\%start_color\fP to the maximum number of colors
 the terminal can support.
 .SS COLOR_PAIRS
-is initialized by \fB\%start_color\fP to the maximum number of color pairs
-the terminal can support.
+is initialized by \fB\%start_color\fP to the maximum number of color
+pairs the terminal can support.
+Often,
+its value is the product \fB\%COLORS\fP \(mu \fB\%COLORS\fP,
+but this is not always true.
+.bP
+A few terminals use the HLS color space
+(see \fB\%start_color\fP below),
+ignoring this rule;
+and
+.bP
+terminals supporting a large number of colors are limited to the number
+of color pairs that a
+.I "signed short"
+value can represent.
 .SH FUNCTIONS
 .SS start_color
 The \fB\%start_color\fP routine requires no arguments.
@@ -465,9 +494,18 @@ Color RGB values are not settable.
 .SH EXTENSIONS
 The functions marked as extensions were designed for
 \fB\%ncurses\fP(3X),
-and are not found in SVr4 curses, 4.4BSD curses,
-or any other previous version of curses.
+and are not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 This implementation satisfies XSI Curses's minimum maximums
 for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
 .PP
@@ -500,8 +538,8 @@ SVr3.2 introduced color support to curses in 1987.
 .PP
 SVr4 made internal changes,
 e.g., moving the storage for the color state
-from \fBSP\fP (the \fBSCREEN\fP structure)
-to \fB\%cur_term\fP (the \fB\%TERMINAL\fP structure),
+from \fBSP\fP (the \fISCREEN\fP structure)
+to \fB\%cur_term\fP (the \fI\%TERMINAL\fP structure),
 but provided the same set of library functions.
 .PP
 SVr4 curses limits the number of color pairs to 64,
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 54cb1e7f5..05ed5dfb5 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.43 2023/12/16 20:32:22 tom Exp $
-.TH curs_extend 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.44 2023/12/23 16:36:18 tom Exp $
+.TH curs_extend 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -80,12 +80,19 @@ this in your application.
 .PP
 \fBuse_extended_names\fP returns the previous state, allowing you to
 save this and restore it.
+.SH EXTENSIONS
+These functions are \fB\%ncurses\fP(3X) extensions,
+and are not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
 .SH PORTABILITY
-These routines are specific to \fI\%ncurses\fP.
-They were not supported on
-Version 7, BSD or System V implementations.
-It is recommended that
-any code depending on them be conditioned using NCURSES_VERSION.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .SH AUTHORS
 Thomas Dickey.
 .SH SEE ALSO
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 810e8d2fe..dc62c1565 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH curs_get_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.31 2023/12/23 16:35:10 tom Exp $
+.TH curs_get_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -180,10 +180,10 @@ at the same time.
 Depending on the state of the tty driver when each character
 is typed, the program may produce undesirable results.
 .PP
-All of these symbols except
+All of these functions except
 \fB\%wget_wch\fP and
 \fB\%unget_wch\fP
-may be available as macros.
+may be implemented as macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 690672971..a44e57412 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.76 2023/12/16 21:01:28 tom Exp $
-.TH curs_getch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.77 2023/12/23 16:36:18 tom Exp $
+.TH curs_getch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -68,7 +68,7 @@ get (or push back) characters from \fIcurses\fR terminal keyboard
 .B int has_key(int \fIch\fP);
 .fi
 .SH DESCRIPTION
-.SS Reading characters
+.SS "Reading Characters"
 The \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP and \fBmvwgetch\fP, routines read
 a character from the window.
 In no-delay mode, if no input is waiting, the value \fBERR\fP is returned.
@@ -101,7 +101,7 @@ Otherwise the character is simply output to the screen.
 If the window is not a pad, and it has been moved or modified since the last
 call to \fBwrefresh\fP, \fBwrefresh\fP will be called before another character
 is read.
-.SS Keypad mode
+.SS "Keypad Mode"
 If \fBkeypad\fP is \fBTRUE\fP, and a function key is pressed, the token for
 that function key is returned instead of the raw characters:
 .bP
@@ -135,11 +135,11 @@ it is an infinite (or very large) value.
 Because function keys usually begin with an escape character,
 the terminal may appear to hang in notimeout mode after pressing the escape key
 until another key is pressed.
-.SS Ungetting characters
+.SS "Ungetting Characters"
 The \fBungetch\fP routine places \fIch\fP back onto the input queue to be
 returned by the next call to \fBwgetch\fP.
 There is just one input queue for all windows.
-.SS Predefined key-codes
+.SS "Predefined Key Codes"
 The following special keys are defined in \fB<curses.h>\fP.
 .bP
 Except for the special case \fBKEY_RESIZE\fP,
@@ -284,7 +284,7 @@ because
 with \fBxterm\fP(1) mouse prototocol)
 \fI\%ncurses\fP must read escape sequences,
 just like a function key.
-.SS Testing key-codes
+.SS "Testing Key Codes"
 The \fBhas_key\fP routine takes a key-code value from the above list, and
 returns \fBTRUE\fP or \fBFALSE\fP according to whether
 the current terminal type recognizes a key with that value.
@@ -370,32 +370,61 @@ consoles typically support little more than \fBKEY_UP\fP, \fBKEY_DOWN\fP,
 \fBKEY_NPAGE\fP, \fBKEY_PPAGE\fP, and function keys 1 through 12.
 The Ins key
 is usually mapped to \fBKEY_IC\fP.
+.SH EXTENSIONS
+\fB\%has_key\fP was designed for \fB\%ncurses\fP(3X),
+and is not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
 .SH PORTABILITY
-The *get* functions are described in the XSI Curses standard, Issue 4.
-They
-read single-byte characters only.
-The standard specifies that they return
-\fBERR\fP on failure, but specifies no error conditions.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-The echo behavior of these functions on input of \fBKEY_\fP or backspace
-characters was not specified in the SVr4 documentation.
-This description is
-adopted from the XSI Curses standard.
+X/Open Curses, Issue 4, Version 2, describes
+\fB\%getch\fP,
+\fB\%wgetch\fP,
+\fB\%mvgetch\fP,
+\fB\%mvwgetch\fP,
+and
+\fB\%ungetch\fP.
+They read single-byte characters only.
+The standard specifies that they return \fBERR\fP on failure,
+but describes no failure conditions.
 .PP
-The behavior of \fBgetch\fP and friends in the presence of handled signals is
-unspecified in the SVr4 and XSI Curses documentation.
-Under historical curses
-implementations, it varied depending on whether the operating system's
-implementation of handled signal receipt interrupts a \fBread\fP(2) call in
-progress or not, and also (in some implementations) depending on whether an
-input timeout or non-blocking mode has been set.
+The echo behavior of these functions on input of
+.B KEY_
+or backspace characters was not specified in the SVr4 documentation.
+This description is adapted from X/Open Curses.
 .PP
-\fBKEY_MOUSE\fP is mentioned in XSI Curses, along with a few related
-terminfo capabilities, but no higher-level functions use the feature.
-The implementation in \fI\%ncurses\fP is an extension.
+The behavior of \fBgetch\fP and friends in the presence of signal
+handlers is unspecified in the SVr4 documentation and X/Open Curses.
+Under historical curses implementations,
+it varied depending on whether the operating system's dispatch of a
+signal to a handler interrupts a \fBread\fP(2) call in progress or not,
+and also
+(in some implementations)
+whether an input timeout or non-blocking mode has been set.
 .PP
-\fBKEY_RESIZE\fP is an extension first implemented for \fI\%ncurses\fP.
-NetBSD curses later added this extension.
+.B KEY_MOUSE
+is mentioned in X/Open Curses,
+along with a few related
+.I \%term\%info
+capabilities,
+but no higher-level functions use the feature.
+The implementation in
+.I \%ncurses
+is an extension.
+.PP
+.B KEY_RESIZE
+is an extension first implemented for
+.I \%ncurses.
+NetBSD
+.I curses
+later added this extension.
 .PP
 Programmers concerned about portability should be prepared for either of two
 cases: (a) signal receipt does not interrupt \fBgetch\fP; (b) signal receipt
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index fcb73d677..3f7c37d6e 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.59 2023/12/17 23:56:04 tom Exp $
-.TH curs_initscr 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.60 2023/12/23 16:27:25 tom Exp $
+.TH curs_initscr 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -91,7 +91,7 @@ terminal cannot support a screen-oriented program, would also use
 \fBnewterm\fP.
 .PP
 The routine \fBnewterm\fP should be called once for each terminal.
-It returns a variable of type \fBSCREEN *\fP which should be saved
+It returns a variable of type \fISCREEN *\fP which should be saved
 as a reference to that terminal.
 \fBnewterm\fP's arguments are
 .bP
@@ -104,8 +104,8 @@ an input stream connected to the terminal
 If the \fItype\fP parameter is \fBNULL\fP, \fB$TERM\fP will be used.
 .PP
 The file descriptor of the output stream is passed to \fBsetupterm\fP(3X),
-which returns a pointer to a \fBTERMINAL\fP structure.
-\fBnewterm\fP's return value holds a pointer to the \fBTERMINAL\fP structure.
+which returns a pointer to a \fI\%TERMINAL\fP structure.
+\fBnewterm\fP's return value holds a pointer to the \fI\%TERMINAL\fP structure.
 .SS endwin
 The program must also call
 \fBendwin\fP for each terminal being used before exiting from \fBcurses\fP.
@@ -138,14 +138,14 @@ and \fBFALSE\fP otherwise.
 The \fBset_term\fP routine is used to switch between different terminals.
 The screen reference \fInew\fP becomes the new current terminal.
 The previous terminal is returned by the routine.
-This is the only routine which manipulates \fBSCREEN\fP pointers;
+This is the only routine which manipulates \fISCREEN\fP pointers;
 all other routines affect only the current terminal.
 .SS delscreen
 The \fBdelscreen\fP routine frees storage associated with the
-\fBSCREEN\fP data structure.
+\fISCREEN\fP data structure.
 The \fBendwin\fP routine does not do
 this, so \fBdelscreen\fP should be called after \fBendwin\fP if a
-particular \fBSCREEN\fP is no longer needed.
+particular \fISCREEN\fP is no longer needed.
 .SH RETURN VALUE
 \fBendwin\fP returns the integer \fBERR\fP upon failure and \fBOK\fP
 upon successful completion.
@@ -193,18 +193,18 @@ in XSI Curses.
 .PP
 Calling \fBendwin\fP does not dispose of the memory allocated in \fBinitscr\fP
 or \fBnewterm\fP.
-Deleting a \fBSCREEN\fP provides a way to do this:
+Deleting a \fISCREEN\fP provides a way to do this:
 .bP
-X/Open Curses does not say what happens to \fBWINDOW\fPs when \fBdelscreen\fP
-\*(``frees storage associated with the \fBSCREEN\fP\*(''
+X/Open Curses does not say what happens to \fI\%WINDOW\fPs when \fBdelscreen\fP
+\*(``frees storage associated with the \fISCREEN\fP\*(''
 nor does the SVr4 documentation help,
-adding that it should be called after \fBendwin\fP if a \fBSCREEN\fP
+adding that it should be called after \fBendwin\fP if a \fISCREEN\fP
 is no longer needed.
 .bP
-However, \fBWINDOW\fPs are implicitly associated with a \fBSCREEN\fP.
+However, \fI\%WINDOW\fPs are implicitly associated with a \fISCREEN\fP.
 so that it is reasonable to expect \fBdelscreen\fP to deal with these.
 .bP
-SVr4 curses deletes the standard \fBWINDOW\fP structures
+SVr4 curses deletes the standard \fI\%WINDOW\fP structures
 \fBstdscr\fP and \fBcurscr\fP as well as a work area \fBnewscr\fP.
 SVr4 curses ignores other windows.
 .bP
@@ -214,11 +214,11 @@ using that information to delete those windows when \fBdelscreen\fP is called.
 .bP
 NetBSD copied this feature of \fI\%ncurses\fP in 2001.
 PDCurses follows the SVr4 model,
-deleting only the standard \fBWINDOW\fP structures.
+deleting only the standard \fI\%WINDOW\fP structures.
 .SS "High-level versus Low-level"
 Different implementations may disagree regarding the level of some functions.
-For example, \fBSCREEN\fP (returned by \fBnewterm\fP) and
-\fBTERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
+For example, \fISCREEN\fP (returned by \fBnewterm\fP) and
+\fI\%TERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
 the output stream.
 If an application switches screens using \fBset_term\fR,
 or switches terminals using \fBset_curterm\fP(3X),
@@ -227,16 +227,16 @@ behavior depending on which structure holds the corresponding descriptor.
 .PP
 For example
 .bP
-NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fBTERMINAL\fP.
-\fI\%ncurses\fP and SVr4 use the descriptor in \fBSCREEN\fP.
+NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fI\%TERMINAL\fP.
+\fI\%ncurses\fP and SVr4 use the descriptor in \fISCREEN\fP.
 .bP
 NetBSD and \fI\%ncurses\fP use the descriptor
-in \fBTERMINAL\fP
+in \fI\%TERMINAL\fP
 for terminal I/O modes,
 e.g.,
 \fBdef_shell_mode\fP(3X),
 \fBdef_prog_mode\fP(3X).
-SVr4 curses uses the descriptor in \fBSCREEN\fP.
+SVr4 curses uses the descriptor in \fISCREEN\fP.
 .SS "Unset \fITERM\fP Variable"
 If the \fITERM\fP variable is missing or empty, \fBinitscr\fP uses the
 value \*(``unknown\*('',
@@ -274,14 +274,15 @@ The handler \fIattempts\fP to cleanup the screen on exit.
 Although it \fIusually\fP works as expected, there are limitations:
 .RS 5
 .bP
-Walking the \fBSCREEN\fP list is unsafe, since all list management
+Walking the \fISCREEN\fP list is unsafe, since all list management
 is done without any signal blocking.
 .bP
 On systems which have \fBREENTRANT\fP turned on, \fBset_term\fP uses
 functions which could deadlock or misbehave in other ways.
 .bP
-\fBendwin\fP calls other functions, many of which use stdio or
-other library functions which are clearly unsafe.
+\fBendwin\fP calls other functions,
+many of which use \fI\%stdio\fP(3) or other library functions which are
+clearly unsafe.
 .RE
 .TP 5
 .B SIGTERM
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index d5d9c9685..de844c3c3 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.59 2023/12/16 20:32:22 tom Exp $
-.TH curs_inopts 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.60 2023/12/23 16:36:18 tom Exp $
+.TH curs_inopts 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,175 +103,243 @@ get and set \fIcurses\fR terminal input options
 \fBint is_raw(void);
 .fi
 .SH DESCRIPTION
-The \fI\%ncurses\fP library provides several functions which let an
-application change the way input from the terminal is handled.
-Some are global, applying to all windows.
+.I \%ncurses
+provides several functions that let an application change the way input
+from the terminal is handled.
+Some are global,
+applying to all windows.
 Others apply only to a specific window.
 Window-specific settings are not automatically applied to new or derived
 windows.
-An application must apply these to each window, if the same behavior
-is needed.
+An application must apply these to each window if the same behavior is
+desired.
 .\"
-.SS cbreak/nocbreak
-Normally, the tty driver buffers typed characters until a newline or carriage
+.SS "cbreak, nocbreak"
+Normally,
+the terminal driver buffers typed characters until a newline or carriage
 return is typed.
 The \fB\%cbreak\fP routine disables line buffering and
-erase/kill character-processing (interrupt and flow control characters are
-unaffected), making characters typed by the user immediately available to the
+erase/kill character-processing
+(interrupt and flow control characters are unaffected),
+making characters typed by the user immediately available to the
 program.
 The \fB\%nocbreak\fP routine returns the terminal to normal (cooked)
 mode.
 .PP
-Initially the terminal may or may not be in \fB\%cbreak\fP mode, as the mode is
-inherited; therefore, a program should call \fB\%cbreak\fP or \fB\%nocbreak\fP
-explicitly.
-Most interactive programs using \fIcurses\fP set the \fB\%cbreak\fP
-mode.
+Initially the terminal may or may not be in \fB\%cbreak\fP mode,
+as the mode is inherited;
+therefore,
+a program should call \fB\%cbreak\fP or \fB\%nocbreak\fP explicitly.
+Most interactive programs using
+.I curses
+set the \fB\%cbreak\fP mode.
 Note that \fB\%cbreak\fP overrides \fBraw\fP.
-[See \fB\%curs_getch\fP(3X) for a
-discussion of how these routines interact with \fBecho\fP and \fB\%noecho\fP.]
+[See \fB\%curs_getch\fP(3X) for a discussion of how these routines
+interact with \fBecho\fP and \fB\%noecho\fP.]
 .\"
-.SS echo/noecho
-The \fBecho\fP and \fB\%noecho\fP routines control whether characters typed by
-the user are echoed by \fB\%getch\fP(3X) as they are typed.
-Echoing by the tty
-driver is always disabled, but initially \fB\%getch\fP is in echo mode, so
-characters typed are echoed.
+.SS "echo, noecho"
+The \fBecho\fP and \fB\%noecho\fP routines control whether characters
+typed by the user are echoed by \fB\%getch\fP(3X) as they are typed.
+Echoing by the terminal driver is always disabled,
+but initially \fB\%getch\fP 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 \fB\%noecho\fP.
+their own echoing in a controlled area of the screen,
+or not to echo at all,
+so they disable echoing by calling \fB\%noecho\fP.
 [See \fB\%curs_getch\fP(3X) for a
 discussion of how these routines interact with \fB\%cbreak\fP and
 \fB\%nocbreak\fP.]
 .\"
 .SS halfdelay
-The \fB\%halfdelay\fP routine is used for half-delay mode, which is similar to
-\fB\%cbreak\fP mode in that characters typed by the user are immediately
-available to the program.
-However, after blocking for \fItenths\fP tenths of
-seconds, \fBERR\fP is returned if nothing has been typed.
-The value of \fItenths\fP
-must be a number between 1 and 255.
-Use \fB\%nocbreak\fP to leave half-delay
-mode.
+The \fB\%halfdelay\fP routine is used for half-delay mode,
+which is similar to \fB\%cbreak\fP mode in that characters typed by the
+user are immediately available to the program.
+However,
+after blocking for \fItenths\fP tenths of seconds,
+\fBERR\fP is returned if nothing has been typed.
+The value of \fItenths\fP must be a number between 1 and 255.
+Use \fB\%nocbreak\fP to leave half-delay mode.
 .\"
 .SS intrflush
-If the \fB\%intrflush\fP option is enabled (\fIbf\fP is \fBTRUE\fP), and an
-interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
-the tty driver queue will be flushed, giving the effect of faster response to
-the interrupt, but causing \fIcurses\fP to have the wrong idea of what is on
-the screen.
-Disabling the option (\fIbf\fP is \fBFALSE\fP) prevents the
-flush.
-The default for the option is inherited from the tty driver settings.
-The window argument is ignored.
+If the \fB\%intrflush\fP option is enabled
+.RI ( bf
+is
+.BR TRUE ),
+and an interrupt key is pressed on the keyboard
+(interrupt,
+break,
+quit),
+all output in the terminal driver queue is flushed,
+giving the effect of faster response to the interrupt,
+but causing
+.I curses
+to have the wrong idea of what is on the screen.
+Disabling the option
+.RI ( bf
+is
+.BR FALSE ),
+prevents the flush.
+The default for the option is inherited from the terminal driver
+settings.
+The
+.I win
+argument is ignored.
 .\"
 .SS keypad
 The \fB\%keypad\fP option enables the keypad of the user's terminal.
 If
-enabled (\fIbf\fP is \fBTRUE\fP), the user can press a function key
-(such as an arrow key) and \fB\%wgetch\fP(3X) returns a single value
-representing the function key, as in \fB\%KEY_LEFT\fP.
+enabled
+.RI ( bf
+is
+.BR TRUE ),
+the user can press a function key
+(such as an arrow key)
+and \fB\%wgetch\fP(3X) returns a single value representing the function
+key,
+as in \fB\%KEY_LEFT\fP.
 If disabled
-(\fIbf\fP is \fBFALSE\fP), \fIcurses\fP 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 locally), turning on this option
-causes the terminal keypad to be turned on when \fB\%wgetch\fP(3X) is
-called.
+(\fIbf\fP is \fBFALSE\fP),
+.I 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 locally),
+turning on this option causes the terminal keypad to be turned on when
+\fB\%wgetch\fP(3X) is called.
 The default value for keypad is \fBFALSE\fP.
 .\"
 .SS meta
-Initially, whether the terminal returns 7 or 8 significant bits on
-input depends on the control mode of the tty driver [see \fB\%termios\fP(3)].
-To force 8 bits to be returned, invoke \fBmeta\fP(\fIwin\fP,
-\fBTRUE\fP); this is equivalent, under POSIX, to setting the CS8 flag
-on the terminal.
-To force 7 bits to be returned, invoke
-\fBmeta\fP(\fIwin\fP, \fBFALSE\fP); this is equivalent, under POSIX,
+Initially,
+whether the terminal returns 7 or 8 significant bits on input depends on
+the control mode of the terminal driver [see \fI\%termios\fP(3)].
+To force 8 bits to be returned,
+invoke
+\fBmeta\fP(\fIwin\fP, \fBTRUE\fP);
+this is equivalent,
+under POSIX,
+to setting the CS8 flag on the terminal.
+To force 7 bits to be returned,
+invoke
+\fBmeta\fP(\fIwin\fP, \fBFALSE\fP);
+this is equivalent,
+under POSIX,
 to setting the CS7 flag on the terminal.
 The window argument,
-\fIwin\fP, is always ignored.
-If the terminfo capabilities \fBsmm\fP
-(meta_on) and \fBrmm\fP (meta_off) are defined for the terminal,
-\fBsmm\fP is sent to the terminal when \fBmeta\fP(\fIwin\fP,
-\fBTRUE\fP) is called and \fBrmm\fP is sent when \fBmeta\fP(\fIwin\fP,
-\fBFALSE\fP) is called.
+.I win,
+is always ignored.
+If the terminfo capabilities
+\fBsmm\fP (meta_on) and
+\fBrmm\fP (meta_off) are defined for the terminal,
+\fBsmm\fP is sent to the terminal when
+\fBmeta\fP(\fIwin\fP, \fBTRUE\fP)
+is called and \fBrmm\fP is sent when
+\fBmeta\fP(\fIwin\fP, \fBFALSE\fP) is called.
 .\"
-.SS nl/nonl
-The \fBnl\fP and \fBnonl\fP routines control whether the underlying display
-device translates the return key into newline on input.
+.SS "nl, nonl"
+The \fBnl\fP and \fBnonl\fP routines control whether the underlying
+display device translates the return key into newline on input.
 .\"
 .SS nodelay
-The \fB\%nodelay\fP option causes \fB\%getch\fP to be a non-blocking call.
-If no input is ready, \fB\%getch\fP returns \fBERR\fP.
+The \fB\%nodelay\fP option causes \fB\%getch\fP to be a non-blocking
+call.
+If no input is ready,
+\fB\%getch\fP returns \fBERR\fP.
 If disabled
-(\fIbf\fP is \fBFALSE\fP), \fB\%getch\fP waits until a key is pressed.
+.RI ( bf
+is
+.BR FALSE ),
+\fB\%getch\fP waits until a key is pressed.
 .SS notimeout
-When interpreting an escape sequence, \fB\%wgetch\fP(3X) sets a timer
+When interpreting an escape sequence,
+\fB\%wgetch\fP(3X) sets a timer
 while waiting for the next character.
-If \fB\%notimeout(\fIwin\fR,
-\fBTRUE\fP) is called, then \fB\%wgetch\fP does not set a timer.
-The
-purpose of the timeout is to differentiate between sequences received
-from a function key and those typed by a user.
+If
+\fB\%notimeout(\fIwin\fR, \fBTRUE\fP)
+is called,
+then \fB\%wgetch\fP does not set a timer.
+The purpose of the timeout is to distinguish sequences produced by a
+function key from those typed by a user.
 .\"
-.SS raw/noraw
-The \fBraw\fP and \fB\%noraw\fP routines place the terminal into or out of raw
-mode.
-Raw mode is similar to \fB\%cbreak\fP mode, in that characters typed are
-immediately passed through to the user program.
-The differences are that in
-raw mode, the interrupt, quit, suspend, and flow control characters are all
-passed through uninterpreted, instead of generating a signal.
-The behavior of
-the BREAK key depends on other bits in the tty driver that are not set by
-\fIcurses\fP.
+.SS "raw, noraw"
+The \fBraw\fP and \fB\%noraw\fP routines place the terminal into or out
+of raw mode.
+Raw mode is similar to \fB\%cbreak\fP mode,
+in that characters typed are immediately passed through to the user
+program.
+The differences are that in raw mode,
+the interrupt,
+quit,
+suspend,
+and flow control characters are all
+passed through uninterpreted,
+instead of generating a signal.
+The behavior of the BREAK key depends on other bits in the terminal
+driver that are not set by
+.I curses.
 .\"
-.SS qiflush/noqiflush
-When the \fB\%noqiflush\fP routine is used, normal flush of input and
-output queues associated with the \fBINTR\fP, \fBQUIT\fP and
-\fBSUSP\fP characters will not be done [see \fB\%termios\fP(3)].
+.SS "qiflush, nqiflush"
+When the \fB\%noqiflush\fP routine is used,
+normal flush of input and output queues associated with the \fBINTR\fP,
+\fBQUIT\fP and \fBSUSP\fP characters will not be done
+[see \fB\%termios\fP(3)].
 When
-\fB\%qiflush\fP is called, the queues will be flushed when these control
-characters are read.
-You may want to call \fB\%noqiflush\fP in a signal
-handler if you want output to continue as though the interrupt
-had not occurred, after the handler exits.
+\fB\%qiflush\fP is called,
+the queues will be flushed when these control characters are read.
+You may want to call \fB\%noqiflush\fP in a signal handler if you want
+output to continue as though the interrupt had not occurred,
+after the handler exits.
 .\"
-.SS timeout/wtimeout
+.SS "timeout, wtimeout"
 The \fB\%timeout\fP and \fB\%wtimeout\fP routines set blocking or
 non-blocking read for a given window.
 If \fIdelay\fP is negative,
-blocking read is used (i.e., waits indefinitely for
-input).
-If \fIdelay\fP is zero, then non-blocking read is used
-(i.e., read returns \fBERR\fP if no input is waiting).
+a blocking read is used
+(i.e.,
+waits indefinitely for input).
+If \fIdelay\fP is zero,
+then a non-blocking read is used
+(i.e.,
+.I read
+returns \fBERR\fP if no input is waiting).
 If
-\fIdelay\fP is positive, then read blocks for \fIdelay\fP
-milliseconds, and returns \fBERR\fP if there is still no input.
-Hence, these routines provide the same functionality as \fB\%nodelay\fP,
+\fIdelay\fP is positive,
+then
+.I read
+blocks for \fIdelay\fP milliseconds,
+and returns \fBERR\fP if there is still no input.
+Hence,
+these routines provide the same functionality as \fB\%nodelay\fP,
 plus the additional capability of being able to block for only
-\fIdelay\fP milliseconds (where \fIdelay\fP is positive).
+\fIdelay\fP milliseconds
+(where \fIdelay\fP is positive).
 .\"
 .SS typeahead
-The \fIcurses\fP 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,
+.I curses
+does \*(``line-breakout optimization\*('' by looking for typeahead
+periodically while updating the screen.
+If input is found,
+and it is coming from a terminal,
 the current update is postponed until
 \fB\%refresh\fP(3X) or \fB\%doupdate\fP is called again.
 This allows faster response to commands typed in advance.
-Normally, the input FILE
-pointer passed to \fB\%newterm\fP, or \fBstdin\fP in the case that
-\fB\%initscr\fP was used, will be used to do this typeahead checking.
+Normally,
+the input
+.I FILE
+pointer passed to \fB\%newterm\fP,
+or \fBstdin\fP in the case that \fB\%initscr\fP was used,
+will be used to do this typeahead checking.
 The \fB\%typeahead\fP routine specifies that the file descriptor
 \fIfd\fP is to be used to check for typeahead instead.
 If \fIfd\fP is
-\-1, then no typeahead checking is done.
+\-1,
+then no typeahead checking is done.
 .\"
 .SH RETURN VALUE
-All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
+All routines that return an integer return \fBERR\fP upon failure and
+\fBOK\fP
 (SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
 upon successful completion,
 unless otherwise noted in the preceding routine descriptions.
@@ -279,7 +347,8 @@ unless otherwise noted in the preceding routine descriptions.
 X/Open does not define any error conditions.
 In this implementation,
 functions with a window parameter will return an error if it is null.
-Any function will also return an error if the terminal was not initialized.
+Any function will also return an error if the terminal was not
+initialized.
 Also,
 .RS 3
 .TP 5
@@ -288,7 +357,6 @@ returns an error
 if its parameter is outside the range 1..255.
 .RE
 .SH NOTES
-Note that
 \fBecho\fP,
 \fB\%noecho\fP,
 \fB\%halfdelay\fP,
@@ -300,21 +368,28 @@ Note that
 \fB\%notimeout\fP,
 \fB\%noqiflush\fP,
 \fB\%qiflush\fP,
-\fB\%timeout\fP, and
-\fB\%wtimeout\fP may be macros.
+\fB\%timeout\fP,
+and
+\fB\%wtimeout\fP
+may be implemented as macros.
 .PP
-The \fB\%noraw\fP and \fB\%nocbreak\fP calls follow historical practice in that
-they attempt to restore to normal (\*(``cooked\*('') mode
+\fB\%noraw\fP and \fB\%nocbreak\fP follow historical practice in that
+they attempt to restore normal (\*(``cooked\*('') mode
 from raw and cbreak modes respectively.
-Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
-control states that are hard to predict or understand; it is not recommended.
+Mixing \fBraw\fP/\fB\%noraw\fP and \fB\%cbreak\fP/\fB\%nocbreak\fP calls
+leads to terminal driver control states that are hard to predict or
+understand;
+doing so is not recommended.
 .SH EXTENSIONS
-This implementation provides four functions which may be used to detect
-if the corresponding flags were set or reset:
+.I \%ncurses
+provides four \*(``is_\*('' functions that may be used to detect if the
+corresponding flags were set or reset.
 .PP
 .TS
-l l l.
-\fBQuery\fP	\fBSet\fP	\fBReset\fP
+center;
+Lb Lb Lb
+L  L  L .
+Query	Set	Reset
 _
 is_cbreak	cbreak	nocbreak
 is_echo	echo	noecho
@@ -322,59 +397,95 @@ is_nl	nl	nonl
 is_raw	raw	noraw
 .TE
 .PP
-In each case, the function returns
-.TP 5
+In each case,
+the function returns
+.TP 4 \" "-1" + 2n
 1
 if the flag is set,
-.TP 5
+.TP
 0
-if the flag is reset, or
-.TP 5
+if the flag is reset,
+or
+.TP
 \-1
-if the \fIcurses\fP library was not initialized.
+if the library is not initialized.
 .PP
-These routines are specific to \fI\%ncurses\fP.
-They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fI\%ncurses\fP extensions
-be conditioned using NCURSES_VERSION.
+They were designed for
+\fB\%ncurses\fP(3X),
+and are not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
-Except as noted in the section on extensions,
-these functions are described in the XSI Curses standard, Issue 4.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+Except as noted in section \*(``EXTENSIONS\*('' above,
+X/Open Curses, Issue 4, Version 2 describes these functions.
 .PP
-The \fI\%ncurses\fP library obeys the XPG4 standard
-and the historical practice of the
-AT&T \fIcurses\fP implementations,
-in that the echo bit is cleared when \fIcurses\fP
+.I \%ncurses
+follows X/Open Curses
+and the historical practice of AT&T
+.I curses
+implementations,
+in that the echo bit is cleared when
+.I curses
 initializes the terminal state.
-BSD \fIcurses\fP differed from this slightly; it
-left the echo bit on at initialization, but the BSD \fBraw\fP call turned it
-off as a side-effect.
-For best portability, set \fBecho \fPor \fB\%noecho\fP explicitly
-just after initialization, even if your program remains in cooked mode.
+BSD
+.I curses
+differed from this slightly;
+it left the echo bit on at initialization,
+but the BSD \fBraw\fP call turned it off as a side effect.
+For best portability,
+set \fBecho\fP or \fB\%noecho\fP explicitly just after initialization,
+even if your program remains in cooked mode.
 .PP
-The XSI Curses standard is ambiguous on the question of whether \fBraw\fP
-should disable the CRLF translations controlled by \fBnl\fP and \fBnonl\fP.
-BSD \fIcurses\fP did turn off these translations;
-AT&T \fIcurses\fP (at least as late as SVr1) did not.
-We chose to do so, on the theory that a programmer requesting
-raw input wants a clean (ideally 8-bit clean) connection that the operating
-system will not alter.
+X/Open Curses is ambiguous regarding whether \fBraw\fP should disable
+the CR/LF translations controlled by \fBnl\fP and \fBnonl\fP.
+BSD
+.I curses
+did turn off these translations;
+AT&T
+.I curses
+(at least as late as SVr1)
+did not.
+.I \%ncurses
+does so,
+on the assumption that a programmer requesting raw input wants a clean
+(ideally,
+8-bit clean)
+connection that the operating system will not alter.
 .PP
 When \fB\%keypad\fP is first enabled,
-\fI\%ncurses\fP loads the key-definitions for the current terminal
-description.
+.I \%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 \fB@TIC@\fP,
-then \fI\%ncurses\fP also defines keys for the capabilities whose names
-begin with \*(``k\*(''.
-The corresponding keycodes are generated and (depending on previous
-loads of terminal descriptions) may differ from one execution of a
-program to the next.
-The generated keycodes are recognized by the \fB\%keyname\fP function
+e.g.,
+from using the
+.B \-x
+option of \fB\%@TIC@\fP,
+then
+.I \%ncurses
+also defines keys for the capabilities whose names begin with
+\*(``k\*(''.
+The corresponding keycodes are generated and
+(depending on previous loads of terminal descriptions)
+may differ from one execution of a program to the next.
+The generated keycodes are recognized by the \fB\%keyname\fP(3X)
+function
 (which will then return a name beginning with \*(``k\*('' denoting the
 terminfo capability name rather than \*(``K\*('',
-used for \fIcurses\fP key-names).
-On the other hand, an application can use \fB\%define_key\fP to establish
+used for
+.I curses
+key names).
+On the other hand,
+an application can use \fB\%define_key\fP(3X) 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 \fB\%tigetstr\fP,
@@ -382,16 +493,22 @@ and reassign the keycode to match its own needs.
 .PP
 Low-level applications can use \fB\%tigetstr\fP to obtain the definition
 of any particular string capability.
-Higher-level applications which use the \fIcurses\fP \fB\%wgetch\fP
-and similar functions to return keycodes rely upon the order in which
-the strings are loaded.
+Higher-level applications which use the
+.I curses
+\fB\%wgetch\fP and similar functions to return keycodes rely upon the
+order in which the strings are loaded.
 If more than one key definition has the same string value,
 then \fB\%wgetch\fP can return only one keycode.
-Most \fIcurses\fP implementations (including \fI\%ncurses\fP)
+Most
+.I curses
+implementations
+(including
+.IR \%ncurses )
 load key definitions in the order
 defined by the array of string capability names.
 The last key to be loaded determines the keycode which will be returned.
-In \fI\%ncurses\fP,
+In
+.I \%ncurses,
 you may also have extended capabilities interpreted as key definitions.
 These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 8ef12e442..1f2307a16 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.24 2023/11/25 11:32:28 tom Exp $
-.TH curs_ins_wch 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.26 2023/12/23 16:03:24 tom Exp $
+.TH curs_ins_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,32 +44,71 @@
 \fB\%mvins_wch\fP,
 \fB\%mvwins_wch\fP,
 \fB\%wins_wch\fP \-
-insert a \fIcurses\fR complex character string in a window
+insert a \fIcurses\fR complex character in a window
 .SH SYNOPSIS
 .nf
-#include <curses.h>
+\fB#include <curses.h>\fP
 .PP
 \fBint ins_wch(const cchar_t *\fIwch\fP);
 \fBint wins_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
-.PP
 \fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
 \fBint mvwins_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
 .fi
 .SH DESCRIPTION
-These routines, insert the complex character \fIwch\fP with rendition
-before the character under the cursor.
-All characters to the right of the cursor are moved one space to the right,
-with the possibility of the rightmost character on the line being lost.
-The insertion operation does not change the cursor position.
-.SH RETURN VALUE
-If successful, these functions return \fBOK\fP.
-If not, they return \fBERR\fP.
+These functions insert the
+.I curses
+complex character
+.I wch
+at the cursor in the specified window
+.I win
+(or
+.BR \%stdscr ).
+The character previously at the cursor and any to its right move one
+cell to the right;
+the rightmost character on the line is discarded.
+The cursor does not advance.
+.SH "RETURN VALUE"
+These functions return \fBOK\fP on success and \fBERR\fP on failure.
+.PP
+Functions taking a
+.I \%WINDOW
+pointer argument fail if the pointer is
+.BR NULL .
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement using
+\fB\%wmove\fP and fail if the position
+.RI ( y ,
+.IR x )
+is outside the window.
+.SH NOTES
+A terminal's
+.B \%insert_character
+.RB ( ich1 )
+capability
+is not necessarily employed.
+.PP
+\fB\%ins_wch\fP,
+\fB\%mvins_wch\fP,
+and
+\fB\%mvwins_wch\fP
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-.SH SEE ALSO
+X/Open Curses, Issue 4, describes these functions.
+.PP
+SVr4 describes successful return values only as
+\*(``an integer value other than \fBERR\fP\*(''.
+.SH HISTORY
+SVr4 (1989) implemented these functions under the names
+.BR inswch ,
+.BR winswch ,
+.BR mvinswch ,
+and
+.BR mvwinswch .
+.SH "SEE ALSO"
+\fB\%curs_insch\fP(3X) describes comparable functions in the
+non-wide-character
+.I curses
+configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_insch\fP(3X)
+\fB\%terminfo\fP(5)
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 889ea4ac5..4be93c6bb 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.34 2023/12/16 21:09:11 tom Exp $
-.TH curs_insch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.36 2023/12/23 16:03:24 tom Exp $
+.TH curs_insch 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,39 +47,61 @@
 insert a \fIcurses\fR character in a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>
+\fB#include <curses.h>\fP
 .PP
 \fBint insch(chtype \fIch\fP);
 \fBint winsch(WINDOW *\fIwin\fP, chtype \fIch\fP);
-.PP
 \fBint mvinsch(int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
 \fBint mvwinsch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
-These routines insert the character \fIch\fP before the character under the
-cursor.
-All characters to the right of the cursor are moved one space to the
-right, with the possibility of the rightmost character on the line being lost.
-The insertion operation does not change the cursor position.
-.SH RETURN VALUE
-These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
+These functions insert the
+.I curses
+character
+.I ch
+at the cursor in the specified window
+.I win
+(or
+.BR \%stdscr ).
+The character previously at the cursor and any to its right move one
+cell to the right;
+the rightmost character on the line is discarded.
+The cursor does not advance.
+.SH "RETURN VALUE"
+These functions return \fBOK\fP on success and \fBERR\fP on failure.
+.PP
+Functions taking a
+.I \%WINDOW
+pointer argument fail if the pointer is
+.BR NULL .
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement using
+\fB\%wmove\fP and fail if the position
+.RI ( y ,
+.IR x )
+is outside the window.
 .SH NOTES
-These routines do not necessarily imply use of a hardware insert character
-feature.
+A terminal's
+.B \%insert_character
+.RB ( ich1 )
+capability
+is not necessarily employed.
 .PP
-Note that \fBinsch\fP, \fBmvinsch\fP, and \fBmvwinsch\fP may be macros.
+\fB\%insch\fP,
+\fB\%mvinsch\fP,
+and
+\fB\%mvwinsch\fP
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-.SH SEE ALSO
-\fB\%curses\fP(3X)
+X/Open Curses, Issue 4, describes these functions.
+.PP
+SVr4 describes successful return values only as
+\*(``an integer value other than \fBERR\fP\*(''.
+.SH "SEE ALSO"
+\fB\%curs_ins_wch\fP(3X) describes comparable functions in the
+wide-character
+.I curses
+configuration.
 .PP
-Comparable functions in the wide-character (ncursesw) library are
-described in
-\fB\%curs_ins_wch\fP(3X).
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(5)
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index a89337c2f..b503991e0 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.29 2023/10/21 10:28:36 tom Exp $
-.TH curs_legacy 3X 2023-10-21 "ncurses 6.4" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.30 2023/12/23 16:40:10 tom Exp $
+.TH curs_legacy 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -97,13 +108,23 @@ Except as noted,
 these functions return an integer,
 or \fBERR\fP if the window parameter is null.
 .SH NOTES
-All of these interfaces are provided as macros and functions.
-The macros are suppressed (and only the functions provided)
-when \fB\%NCURSES_OPAQUE\fP is defined.
-The standard forms such as \fB\%getyx\fP must be implemented as macros,
-and (in this implementation) are defined in terms of the functions
-described here,
-to avoid reliance on internal details of the \fB\%WINDOW\fP structure.
+All of these interfaces are implemented as macros and functions.
+The macros are suppressed
+(and only the functions provided)
+in an \*(``opaque\*(''
+.I \%ncurses
+build,
+which defines the preprocessor symbol
+.BR \%NCURSES_OPAQUE .
+See section \*(``ALTERNATE CONFIGURATIONS\*('' in \fB\%ncurses\fP(3X).
+.PP
+The standard forms such as \fB\%getyx\fP
+.I must
+be implemented as macros,
+and
+(in this implementation)
+are defined in terms of the functions described here,
+to avoid reliance on internal details of the \fI\%WINDOW\fP structure.
 .SH PORTABILITY
 These functions were supported on Version 7, BSD or System V implementations.
 None of those implementations checked the window parameter.
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 77d05ac34..0f9895029 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.32 2023/12/16 20:32:22 tom Exp $
-.TH curs_memleaks 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.33 2023/12/23 16:22:08 tom Exp $
+.TH curs_memleaks 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,7 +114,7 @@ In any implementation of X/Open Curses, an application can free part
 of the memory allocated by curses:
 .bP
 The portable part of \fB\%exit_curses\fP can be freed using \fB\%delscreen\fP,
-passing the \fBSCREEN*\fP pointer returned by \fB\%newterm\fP.
+passing the \fISCREEN\fP pointer returned by \fB\%newterm\fP.
 .IP
 In some implementations, there is a global variable \fBsp\fP
 which could be used, e.g., if the screen were only initialized
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 64c8e0f53..b7a2d8291 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.82 2023/12/16 21:08:16 tom Exp $
-.TH curs_mouse 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.83 2023/12/23 20:37:56 tom Exp $
+.TH curs_mouse 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,7 +106,7 @@ current screen's mouse event mask.
 As a side effect, setting a zero mousemask may turn off the mouse pointer;
 setting a nonzero mask may turn it on.
 Whether this happens is device-dependent.
-.SS Mouse events
+.SS "Mouse Events"
 Here are the mouse event type masks which may be defined:
 .PP
 .TS
@@ -261,29 +261,14 @@ returns the previous interval value, unless
 the terminal was not initialized.
 In that case, it returns the maximum interval value (166).
 .SH NOTES
-The feature macro \fB\%NCURSES_MOUSE_VERSION\fP is provided so the preprocessor
-can be used to test whether these features are present.
-If the interface is changed, the value of \fB\%NCURSES_MOUSE_VERSION\fP will be
-incremented.
-These values for \fB\%NCURSES_MOUSE_VERSION\fP may be
-specified when configuring \fI\%ncurses\fP:
-.RS 3
-.TP 3
-1
-has definitions for reserved events.
-The mask uses 28 bits.
-.TP 3
-2
-adds definitions for button 5,
-removes the definitions for reserved events.
-The mask uses 29 bits.
-.RE
-.PP
 The order of the \fB\%MEVENT\fP structure members is not guaranteed.
 Additional fields may be added to the structure in the future.
 .PP
-Under \fI\%ncurses\fP, these calls are implemented using either
-xterm's built-in mouse-tracking API or
+Under
+.I \%ncurses,
+these calls are implemented using either
+.IR \%xterm 's
+built-in mouse-tracking API or
 platform-specific drivers including
 .RS 3
 .bP
@@ -299,17 +284,25 @@ mouse events will not be visible to
 \fI\%ncurses\fP (and the \fB\%mousemask\fP function will always
 return \fB0\fP).
 .PP
-If the terminfo entry contains a \fBXM\fP string,
-this is used in the xterm mouse driver to control the
+If the
+.I \%term\%info
+entry contains a \fBXM\fP string,
+this is used in the
+.I \%xterm
+mouse driver to control the
 way the terminal is initialized for mouse operation.
 The default, if \fBXM\fP is not found,
-corresponds to private mode 1000 of xterm:
+corresponds to private mode 1000 of
+.I \%xterm:
 .PP
 .RS 3
 \eE[?1000%?%p1%{1}%=%th%el%;
 .RE
 .PP
-The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
+The mouse driver also recognizes a newer
+.I \%xterm
+private mode 1006,
+e.g.,
 .PP
 .RS 3
 \eE[?1006;1000%?%p1%{1}%=%th%el%;
@@ -323,19 +316,58 @@ for use with touch screens (which may be pressure-sensitive) or with
 The \fB\%ALL_MOUSE_EVENTS\fP class does not
 include \fB\%REPORT_MOUSE_POSITION\fP.
 They are distinct.
-For example, in xterm,
+For example,
+in
+.I \%xterm,
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
+.SH EXTENSIONS
+These functions were designed for
+\fB\%ncurses\fP(3X),
+and are not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
+(SVr4
+.I curses
+did have a
+.I \%getmouse
+function,
+which took no argument and returned a different type.)
 .SH PORTABILITY
-These calls were designed for \fI\%ncurses\fP,
-and are not found in SVr4 \fIcurses\fP,
-4.4BSD \fIcurses\fP, or any other previous version of \fIcurses\fP.
+Applications employing the
+.I \%ncurses
+mouse extension should condition its use on the visibility of the
+.B \%NCURSES_MOUSE_VERSION
+preprocessor macro.
+When the interface changes,
+the macro's value increments.
+Multiple versions are available when
+.I \%ncurses
+is configured;
+see section \*(``ALTERNATE CONFIGURATIONS\*('' of \fB\%ncurses\fP(3X).
+The following values may be specified.
+.RS 3
+.TP 3
+1
+has definitions for reserved events.
+The mask uses 28 bits.
+.TP 3
+2
+adds definitions for button 5,
+removes the definitions for reserved events.
+The mask uses 29 bits.
+.RE
 .PP
-SVr4 \fIcurses\fP had support for the mouse in a variant of \fBxterm\fP(1).
-It is mentioned in a few places, but with no supporting documentation:
+SVr4
+.I curses
+had support for the mouse in a variant of \fI\%xterm\fP(1).
+It is mentioned in a few places,
+with little supporting documentation.
 .bP
-the \*(``libcurses\*('' manual page lists functions for this feature
-which are prototyped in \fBcurses.h\fP:
+Its \*(``libcurses\*('' manual page lists functions for this feature
+prototyped in \fI\%curses.h\fP.
 .PP
 .RS 8
 .EX
@@ -349,7 +381,7 @@ extern unsigned long getmouse(void), getbmap(void);
 .EE
 .RE
 .bP
-the \*(``terminfo\*('' manual page lists capabilities for the feature
+Its \*(``terminfo\*('' manual page lists capabilities for the feature.
 .PP
 .RS 8
 .EX
@@ -361,56 +393,81 @@ req_mouse_pos     reqmp   RQ       Request mouse position report
 .EE
 .RE
 .bP
-the interface made assumptions (as does \fI\%ncurses\fP)
-about the escape sequences
-sent to and received from the terminal.
+The interface made assumptions
+(as does
+.IR \%ncurses )
+about the escape sequences sent to and received from the terminal.
 .IP
-For instance
-the SVr4 \fIcurses\fP library used the \fB\%get_mouse\fP capability to tell the
-terminal which mouse button events it should send,
+For instance,
+the SVr4
+.I curses
+library used the \fB\%get_mouse\fP capability to tell the terminal which
+mouse button events it should send,
 passing the mouse-button bit mask to the terminal.
 Also, it could ask the terminal
 where the mouse was using the \fB\%req_mouse_pos\fP capability.
 .IP
-Those features required a terminal which had been modified
-to work with \fIcurses\fP.
-They were not part of the X Consortium's xterm.
+Those features required a terminal program that had been modified
+to work with SVr4
+.I curses.
+They were not part of the X Consortium's
+.I \%xterm.
 .PP
-When developing the xterm mouse support for \fI\%ncurses\fP in September
-1995,
+When developing the
+.I \%xterm
+mouse support for
+.I \%ncurses
+in September 1995,
 Eric Raymond was uninterested in using the same interface due to its
 lack of documentation.
 Later, in 1998, Mark Hesseling provided support in
-PDCurses 2.3 using the SVr4 interface.
-PDCurses, however, does not use video terminals,
+.I \%PDCurses
+2.3 using the SVr4 interface.
+.I \%PDCurses,
+however,
+does not use video terminals,
 making it unnecessary to be concerned about compatibility with the
 escape sequences.
 .SH BUGS
-Mouse events from \fI\%xterm\fP are \fInot\fP ignored in cooked mode if
-they have been enabled by \fB\%mousemask\fP.
+Mouse events from
+.I \%xterm
+are
+.I not
+ignored in cooked mode if they have been enabled by \fB\%mousemask\fP.
 Instead,
-the \fI\%xterm\fP mouse report sequence appears in the string read.
+the
+.I \%xterm
+mouse report sequence appears in the string read.
 .PP
-Mouse event reports from \fI\%xterm\fP are not detected correctly in
-a window with keypad application mode disabled,
+Mouse event reports from
+.I \%xterm
+are not detected correctly in a window with keypad application mode
+disabled,
 since they are interpreted as a variety of function key.
-Set the the terminal's \fI\%terminfo\fP capability \fB\%kmous\fP to
-\*(``\eE[M\*(''
-(the beginning of the response from \fI\%xterm\fP for mouse clicks).
+Set the terminal's
+.I \%term\%info
+capability \fB\%kmous\fP to \*(``\eE[M\*(''
+(the beginning of the response from
+.I \%xterm
+for mouse clicks).
 Other values of \fB\%kmous\fP are permitted under the same assumption,
 that is,
 the report begins with that sequence.
 .PP
 Because there are no standard response sequences that serve to identify
-terminals supporting the \fI\%xterm\fP mouse protocol,
-\fI\%ncurses\fP assumes that if \fB\%kmous\fP is defined in the terminal
-description,
+terminals supporting the
+.I \%xterm
+mouse protocol,
+.I \%ncurses
+assumes that if \fB\%kmous\fP is defined in the terminal description,
 or if the terminal type's primary name or aliases contain the string
 \%\*(``xterm\*('',
 then the terminal may send mouse events.
 The \fB\%kmous\fP capability is checked first,
-allowing use of newer \fI\%xterm\fP mouse protocols such as its private
-mode 1006.
+allowing use of newer
+.I \%xterm
+mouse protocols,
+such as its private mode 1006.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inopts\fP(3X),
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 16fac2dd6..d98104a20 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
-.TH curs_print 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.36 2023/12/23 16:36:18 tom Exp $
+.TH curs_print 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
@@ -66,13 +66,20 @@ Couldn't allocate sufficient memory to buffer the printer write.
 .PP
 When \fB\%mcprint\fP succeeds, it returns the number of characters actually
 sent to the printer.
+.SH EXTENSIONS
+\fB\%mcprint\fP was designed for
+\fB\%ncurses\fP(3X),
+and was not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
 .SH PORTABILITY
-The \fB\%mcprint\fP call was designed for \fI\%ncurses\fP,
-and is not found in SVr4 \fIcurses\fP,
-4.4BSD \fIcurses\fP,
-or any other previous version of \fIcurses\fP.
-It is recommended that any code depending on \fI\%ncurses\fP extensions
-be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing this
+.I \%ncurses
+extension should condition its use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .SH BUGS
 Padding in the
 \fBmc5p\fP,
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index ea3a6b585..15dd10b53 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.45 2023/12/18 00:03:28 tom Exp $
-.TH curs_printw 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.47 2023/12/23 14:41:07 tom Exp $
+.TH curs_printw 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -132,7 +132,7 @@ and specified \fB\%vw_printw\fP using the \fI\%stdarg.h\fP interface.
 .bP
 X/Open Curses, Issue 5, Draft 2
 (December 2007) marked \fBvwprintw\fP (along with
-\fBvwscanw\fP and the termcap interface) as withdrawn.
+\fBvwscanw\fP and the \fItermcap\fP interface) as withdrawn.
 After incorporating review comments,
 this became
 X/Open Curses, Issue 7 (2009).
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index 333263d2c..cf1977acb 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.44 2023/12/17 22:50:40 tom Exp $
-.TH curs_scanw 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.47 2023/12/23 14:41:50 tom Exp $
+.TH curs_scanw 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -140,7 +140,7 @@ and specified \fB\%vw_scanw\fP using the \fI\%stdarg.h\fP interface.
 .bP
 X/Open Curses, Issue 5, Draft 2
 (December 2007) marked \fB\%vwscanw\fP (along with
-\fB\%vwscanw\fP and the termcap interface) as withdrawn.
+\fB\%vwscanw\fP and the \fItermcap\fP interface) as withdrawn.
 After incorporating review comments,
 this became
 X/Open Curses, Issue 7 (2009).
@@ -220,10 +220,10 @@ SVr3 (1987) added
 \fB\%mvwscanw\fP, stating
 .RS
 .PP
-These routines correspond to \fIscanf\fP(3S),
+\*(``[t]hese routines correspond to \fIscanf\fP(3S),
 as do their arguments and return values.
 \fB\%wgetstr\fP() is called on the window,
-and the resulting line is used as input for the scan.
+and the resulting line is used as input for the scan.\*(''
 .RE
 .PP
 SVr3 also implemented \fB\%vwscanw\fP,
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 730ce37c6..7f4be4017 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.45 2023/12/16 20:32:22 tom Exp $
-.TH curs_sp_funcs 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.46 2023/12/23 16:26:05 tom Exp $
+.TH curs_sp_funcs 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -215,13 +215,13 @@ This implementation can be configured to provide a set of functions which
 improve the ability to manage multiple screens.
 This feature can be added to any of the configurations supported by
 \fI\%ncurses\fP;
-it adds new entrypoints
+it adds new symbols
 without changing the meaning of any of the existing ones.
 .\" ***************************************************************************
-.SS IMPROVED FUNCTIONS
+.SS "Improved Functions"
 Most of the functions are new versions of existing functions.
 A parameter is added at the front of the parameter list.
-It is a SCREEN pointer.
+It is a \fISCREEN\fP pointer.
 .PP
 The existing functions all use the current screen,
 which is a static variable.
@@ -229,7 +229,7 @@ The extended functions use the specified screen,
 thereby reducing the number of variables which must be modified
 to update multiple screens.
 .\" ***************************************************************************
-.SS NEW FUNCTIONS
+.SS "New Functions"
 Here are the new functions:
 .TP 5
 ceiling_panel
@@ -245,8 +245,8 @@ With the screen-pointer extension,
 there are situations where it must create a current screen before
 the unextended library does.
 The \fBnew_prescr\fP function is used internally to handle these cases.
-It is also provided as an entrypoint to allow applications to customize
-the library initialization.
+It is also provided to allow applications to customize library
+initialization.
 .\" ***************************************************************************
 .SH NOTES
 This extension introduces some new names:
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 657c83355..464209f95 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.76 2023/12/18 00:22:30 tom Exp $
-.TH curs_termcap 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.80 2023/12/23 20:19:05 tom Exp $
+.TH curs_termcap 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,12 +87,12 @@ entries for which a \fI\%term\%info\fP entry has been compiled.
 \fB\%tgetent\fP loads the terminal database entry for \fIname\fP;
 see \fBterm\fP(7).
 This must be done before calling any of the other functions.
-It returns:
+It returns
 .RS 3
-.TP 4
+.TP 5 \" "-1" + 2n + adjust for PDF
 1
 on success,
-.TP 4
+.TP
 0
 if there is no such entry
 (or if the matching entry describes a generic terminal,
@@ -100,7 +100,7 @@ having too little information for
 .I curses
 applications to run),
 and
-.TP 4
+.TP
 \-1
 if the \fI\%term\%info\fP database could not be found.
 .RE
@@ -120,9 +120,9 @@ which is not the same thing.
 .bP
 The meanings of the return values differ.
 The BSD \fItermcap\fP library does not check whether the terminal type
-description is marked with the
-.B gn
-.RB ( \%generic )
+description includes the
+.B \%generic
+.RB ( gn )
 capability,
 nor whether the terminal type description supports an addressable
 cursor,
@@ -189,13 +189,13 @@ Doing so reveals a quirk in \fB\%tgoto\fP:
 most hardware terminals use cursor addressing with \fIrow\fP first,
 but the original developers of the \fItermcap\fP interface chose to
 put the \fIcol\fP (column) parameter first.
-The \fB\%tgoto\fP function swaps the order of parameters.
+The \fB\%tgoto\fP function swaps the order of its parameters.
 It does this even for calls requiring only a single parameter.
 In that case,
 the first parameter is merely a placeholder.
 .bP
 Normally the \fI\%ncurses\fP library is compiled without
-full \fI\%term\%cap\fP support.
+full \fI\%termcap\fP support.
 In that case,
 \fB\%tgoto\fP uses an internal version of \fB\%tparm\fP(3X)
 (a more capable function).
@@ -214,7 +214,7 @@ availability.
 .PP
 \fB\%tputs\fP is described in \fB\%curs_terminfo\fP(3X).
 It can retrieve capabilities by either \fItermcap\fP or
-\fI\%term\%info\fP name.
+\fI\%term\%info\fP code.
 .SS "Global Variables"
 The variables
 \fBPC\fP,
@@ -249,9 +249,8 @@ del_curterm(cur_term);
 to free this memory,
 but there is an additional complication with \fI\%ncurses\fP.
 It uses a fixed-size pool of storage locations,
-one per value of the \fITERM\fP environment variable when
-\fB\%tgetent\fP is called.
-The \fBscreen\fP(1) program relies upon this arrangement to improve its
+one per value of the terminal name parameter given to \fB\%tgetent\fP.
+The \fIscreen\fP(1) program relies upon this arrangement to improve its
 performance.
 .PP
 An application that uses only the \fItermcap\fP functions,
@@ -308,17 +307,16 @@ They should not be used in new programs.
 .SS Standards
 .bP
 X/Open Curses, Issue 4, Version 2 (1996),
-describes these functions.
-However,
-they are marked
+describes these functions,
+marking them as
 \*(``TO BE WITHDRAWN\*(''.
 .bP
-X/Open Curses, Issue 7 (2009) marked the \fItermcap\fP interface
+X/Open Curses, Issue 7 (2009) marks the \fItermcap\fP interface
 (along with \fB\%vwprintw\fP and \fB\%vwscanw\fP) as withdrawn.
 .PP
 Neither X/Open Curses nor the SVr4 man pages documented the return
 values of \fB\%tgetent\fP correctly,
-though all three were in fact returned ever since SVr1.
+though all three shown here were in fact returned ever since SVr1.
 In particular,
 an omission in the X/Open Curses specification has been misinterpreted
 to mean that \fB\%tgetent\fP returns \fBOK\fP or \fBERR\fP.
@@ -411,20 +409,20 @@ The library remained much the same though 4.3BSD
 (June 1986).
 4.4BSD-Lite
 (June 1994)
-refactored it
+refactored it,
 .\" Observe the `tncktc()`, `tnamatch()`, `tskip()`, and `tdecode()`
 .\" entry points disappearing from termcap.c.
-but left the API unchanged.
+leaving the API unchanged.
 .PP
-Function prototypes were a feature of the forthcoming ANSI C (1989).
-Thus the library provided no header file declaring them.
+Function prototypes were a feature of ANSI C (1989).
+Thus the library itself provided no header file declaring them.
 Nevertheless,
 the BSD sources included two different \fI\%termcap.h\fP header files
 over time.
 .bP
 One was used internally by \fBjove\fP(1) from 4.3BSD onward.
 .\" 2BSD became a branch retaining support for non-virtual memory
-.\" systems (like the PDP-11) whereas most BSD development focused on
+.\" systems (such as the PDP-11) whereas most BSD development focused on
 .\" the VAX and other VM-enabled systems starting with 3BSD.
 .\"
 .\" This man page previously located a termcap.h in 2BSD, but that may
@@ -461,8 +459,8 @@ The prototype for \fB\%tputs\fP also differed,
 but in that instance,
 it was \fIlibedit\fP that differed from BSD \fItermcap\fP.
 .PP
-GNU \fItermcap\fP 1.3 was bundled with \fIbash\fP in mid-1993 to support
-the \fBreadline\fP(3) library.
+GNU \fItermcap\fP 1.3 was bundled with \fIbash\fP(1) in mid-1993 to
+support the \fI\%readline\fP(3) library.
 .PP
 \fI\%ncurses\fP 1.8.1
 (November 1993)
@@ -486,8 +484,10 @@ Any two of the four implementations thus differ,
 and programs that intend to work with all \fItermcap\fP library
 interfaces must account for that fact.
 .SH BUGS
-If you call \fB\%tgetstr\fP to fetch \fB\%ca\fP or any other
-parameterized string capability,
+If you call \fB\%tgetstr\fP to fetch
+.B \%column_address
+.RB ( ch )
+or any other parameterized string capability,
 be aware that it is returned in \fI\%term\%info\fP notation,
 not the older and not-quite-compatible \fItermcap\fP notation.
 This does not cause problems if all you do with it is call \fB\%tgoto\fP
@@ -521,11 +521,16 @@ looking for digits at the beginning of the string.
 \fB\%tputs("50")\fP in a \fItermcap\fP system may busy-wait for 50
 milliseconds rather than transmitting \*(``50\*(''.
 .PP
-\fItermcap\fP has nothing analogous to \fI\%term\%info\fP's \fBsgr\fP
-string.
+\fItermcap\fP has nothing analogous to \fI\%term\%info\fP's
+.B \%set_attributes
+.RB ( sgr )
+capability.
 One consequence is that \fItermcap\fP applications assume that
 .RB \*(`` me \*(''
-(equivalent to \fI\%term\%info\fP's \fBsgr0\fP capability)
+(equivalent to \fI\%term\%info\fP's
+.B \%exit_attribute_mode
+.RB ( sgr0 )
+capability)
 does not reset the alternate character set.
 \fI\%ncurses\fP checks for,
 and modifies the data shared with,
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index aeee9db81..88f5b97f1 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.123 2023/12/16 21:11:53 tom Exp $
-.TH curs_terminfo 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.124 2023/12/23 17:34:39 tom Exp $
+.TH curs_terminfo 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,6 +111,9 @@
 \fI/* extensions */
 \fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, ...);
 \fBint tiscan_s(int *\fIexpected\fP, int *\fImask\fP, const char *\fIstr\fP);
+.PP
+\fI/* deprecated */
+\fBint setterm(const char *\fIterm\fP);
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
@@ -244,7 +247,7 @@ which uses all the defaults and sends the output to \fBstdout\fP.
 .\" ***************************************************************************
 .SS "The Terminal State"
 The \fBsetupterm\fP routine stores its information about the terminal
-in a \fBTERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
+in a \fI\%TERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
 If it detects an error,
 or decides that the terminal is unsuitable (hardcopy or generic),
 it discards this information,
@@ -339,14 +342,14 @@ which happens to share this function name with the \fIterminfo\fP interface.
 \fIaffcnt\fP is the number of lines affected, or 1 if
 not applicable.
 .bP
-\fIputc\fP is a \fBputchar\fP-like routine to which
+\fIputc\fP is a \fI\%putchar\fP-like function to which
 the characters are passed, one at a time.
 .IP
 If \fBtputs\fP processes a time-delay,
 it uses the \fBdelay_output\fP(3X) function,
 routing any resulting padding characters through this function.
 .PP
-The \fBputp\fR routine calls \fBtputs(\fIstr\fB, 1, putchar)\fR.
+The \fBputp\fR routine calls \fBtputs(\fIstr\fB, 1, \%putchar)\fR.
 The output of \fBputp\fP always goes to \fBstdout\fP, rather than
 the \fIfiledes\fP specified in \fBsetupterm\fP.
 .PP
@@ -354,10 +357,10 @@ The \fBvidputs\fP routine displays the string on the terminal in the
 video attribute mode \fIattrs\fP, which is any combination of the
 attributes listed in \fBcurses\fP(3X).
 The characters are passed to
-the \fBputchar\fP-like routine \fIputc\fP.
+the \fI\%putchar\fP-like function \fIputc\fP.
 .PP
 The \fBvidattr\fP routine is like the \fBvidputs\fP routine, except
-that it outputs through \fBputchar\fP.
+that it outputs through \fI\%putchar\fP.
 .PP
 The \fBvid_attr\fP and \fBvid_puts\fP routines correspond
 to vidattr and vidputs, respectively.
@@ -464,7 +467,7 @@ See \fBterminfo\fP(5) for details.
 to improve performance,
 \fI\%ncurses\fP 6.3 caches the result of analyzing terminfo
 strings for their parameter types.
-That is stored as a binary tree referenced from the \fBTERMINAL\fP structure.
+That is stored as a binary tree referenced from the \fI\%TERMINAL\fP structure.
 .PP
 The higher-level \fBinitscr\fP and \fBnewterm\fP functions use \fBsetupterm\fP.
 Normally they do not free this memory, but it is possible to do that using
@@ -512,42 +515,75 @@ of the output function \fIputc\fP.
 .RE
 .\" ***************************************************************************
 .SH NOTES
-X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
+.\" See X/Open Curses Issue 4, Version 2, pp. 227-234.
+.\" See X/Open Curses Issue 7, pp. 311-318.
+According to X/Open Curses,
+any of the \fIenhanced curses\fP functions may be implemented as macros.
+The term \*(``enhanced\*('' refers to features not found in SVr4 curses.
+.PP
+\fB\%ncurses\fP uses macros
+.bP
+for functions which return values via their parameters,
+.bP
+to support obsolete features,
+.bP
+to reuse functions,
+e.g., those that move the cursor before another operation, and
+.bP
+a few special cases.
+.PP
+The \fB\%vid_puts\fP function in \fB\%ncurses\fP is a special case.
+It was originally implemented based on a draft of X/Open Curses,
+as a macro,
+before other parts of the \fB\%ncurses\fP wide-character API were developed.
 .\" ***************************************************************************
 .SH EXTENSIONS
 The functions marked as extensions were designed for
 \fB\%ncurses\fP(3X),
-and are not found in SVr4 curses, 4.4BSD curses,
-or any other previous version of curses.
+and are not found in SVr4
+.IR curses ,
+4.4BSD
+.IR curses ,
+or any other previous curses implementation.
 .\" ***************************************************************************
 .SH PORTABILITY
-The function \fBsetterm\fP is not described by X/Open and must
-be considered non-portable.
+\fBsetterm\fP is not described by X/Open and must be considered
+non-portable.
 All other functions are as described by X/Open.
 .SS "Compatibility Macros"
 This implementation provides a few macros for compatibility with systems
-before SVr4 (see \fIHISTORY\fP).
-Those include
-\fBcrmode\fP,
-\fBfixterm\fP,
-\fBgettmode\fP,
-\fBnocrmode\fP,
-\fBresetterm\fP,
-\fBsaveterm\fP, and
-\fBsetterm\fP.
-.PP
-In SVr4, those are found in \fB<curses.h>\fP,
-but except for \fBsetterm\fP, are likewise macros.
-The one function, \fBsetterm\fP, is mentioned in the manual page.
-The manual page notes that the \fBsetterm\fP routine
-was replaced by \fB\%setupterm\fP, stating that the call
-.IP
-\fBsetupterm(\fIterm\fB, 1, (int *)0)\fR
-.PP
+before SVr4
+(see section \*(``HISTORY\*('' below).
+They include
+\fB\%Bcrmode\fP,
+\fB\%Bfixterm\fP,
+\fB\%Bgettmode\fP,
+\fB\%Bnocrmode\fP,
+\fB\%Bresetterm\fP,
+\fB\%Bsaveterm\fP, and
+\fB\%Bsetterm\fP.
+.PP
+In SVr4,
+these are found in
+.IR \%curses.h ,
+but except for \fB\%setterm\fP,
+are likewise macros.
+The one function,
+\fB\%setterm\fP,
+is mentioned in the manual page.
+It further notes that \fB\%setterm\fP was replaced by \fB\%setupterm\fP,
+stating that the call
+.RS
+.EX
+setupterm(\fIterm\fB, 1, (int *)0)\fP
+.EE
+.RE
 provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
-and is not recommended for new programs.
-This implementation provides each of those symbols
-as macros for BSD compatibility.
+discouraging the latter for new programs.
+.I \%ncurses
+implements each of these symbols as macros for BSD
+.I curses
+compatibility.
 .SS "Legacy Data"
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
@@ -664,7 +700,7 @@ X/Open notes that after calling \fBmvcur\fP, the curses state may not match the
 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
 Both \fI\%ncurses\fP and System V Release 4 curses implement \fBmvcur\fP
-using the SCREEN data allocated in either \fBinitscr\fP or
+using the \fISCREEN\fP data allocated in either \fBinitscr\fP or
 \fBnewterm\fP.
 So though it is documented as a terminfo function,
 \fBmvcur\fP is really a curses function which is not well specified.
@@ -686,7 +722,8 @@ fixterm	restore tty to \*(``in curses\*('' state
 gettmode	establish current tty modes
 mvcur	low level cursor motion
 putp	T{
-utility function that uses \fBtputs\fP to send characters via \fBputchar\fP.
+utility function that uses \fBtputs\fP to send characters via
+\fI\%putchar\fP.
 T}
 resetterm	set tty modes to \*(``out of curses\*('' state
 resetty	reset tty flags to stored value
@@ -696,7 +733,7 @@ setterm	establish terminal with given type
 setupterm	establish terminal with given type
 tparm	instantiate a string expression with parameters
 tputs	apply padding information to a string
-vidattr	like \fBvidputs\fP, but outputs through \fBputchar\fP
+vidattr	like \fBvidputs\fP, but outputs through \fIputchar\fP
 vidputs	T{
 output a string to put terminal in a specified video attribute mode
 T}
@@ -722,7 +759,7 @@ T}
 .TE
 .PP
 Early terminfo programs obtained capability values from the
-\fBTERMINAL\fP structure initialized by \fBsetupterm\fP.
+\fI\%TERMINAL\fP structure initialized by \fBsetupterm\fP.
 .PP
 SVr3 extended terminfo by adding functions to retrieve capability values
 (like the termcap interface),
@@ -766,7 +803,7 @@ SVr3 introduced the functions for switching between terminal
 descriptions, e.g., \fBset_curterm\fP.
 Some of that was incremental improvements to the SVr2 library:
 .bP
-The \fBTERMINAL\fP type definition was introduced in SVr3.01,
+The \fI\%TERMINAL\fP type definition was introduced in SVr3.01,
 for the \fBterm\fP structure provided in SVr2.
 .bP
 The various global variables such as \fBboolnames\fP were mentioned
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index c0675b16c..1e4254406 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.50 2023/12/16 20:32:22 tom Exp $
-.TH curs_threads 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.51 2023/12/23 16:22:25 tom Exp $
+.TH curs_threads 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -122,7 +122,7 @@ Other global variables are not modifiable.
 .PP
 The \fBuse_window\fP and \fBuse_screen\fP functions provide
 coarse-grained mutexes for their respective \fI\%WINDOW\fP and
-\fI\%SCREEN\fP parameters;
+\fISCREEN\fP parameters;
 they call a user-supplied function,
 pass it a \fIdata\fP parameter,
 and return the value from the user-supplied function to the application.
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 09e787780..2a55275c2 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.41 2023/12/16 20:50:14 tom Exp $
-.TH curs_trace 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.42 2023/12/23 16:08:25 tom Exp $
+.TH curs_trace 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,7 +127,7 @@ When the trace mask is nonzero,
 If the file already exists, no tracing is done.
 .bP
 If tracing is not available, \fBcurses_trace\fP returns zero (0).
-.SS Trace Parameter
+.SS "Trace Parameter"
 The trace parameter is formed by OR'ing
 values from the list of \fBTRACE_\fIxxx\fR definitions in \fB<curses.h>\fR.
 These include:
@@ -211,7 +211,7 @@ use_env,
 use_extended_names,
 use_tioctl
 .RE
-.SS Command-line Utilities
+.SS "Command-line Utilities"
 The command-line utilities such as \fBtic\fP(1) provide a verbose option
 which extends the set of messages written using the \fBcurses_trace\fP function.
 Both of these (\fB\-v\fP and \fBcurses_trace\fP)
diff --git a/man/curs_util.3x b/man/curs_util.3x
index d38078dc0..e5f96738e 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.91 2023/12/16 20:32:22 tom Exp $
-.TH curs_util 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.92 2023/12/23 16:24:15 tom Exp $
+.TH curs_util 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -246,7 +246,7 @@ data.
 It returns a pointer to the new window.
 There are a few caveats:
 .bP
-the data written is a copy of the \fBWINDOW\fP structure,
+the data written is a copy of the \fI\%WINDOW\fP structure,
 and its associated character cells.
 The format differs between the wide-character (\fI\%ncursesw\fP) and
 non-wide (\fI\%ncurses\fP) libraries.
@@ -347,7 +347,7 @@ the University of California, Berkeley (in 1982)
 and were later (in 1988) incorporated into SVr4.
 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.
+Most implementations simply dump the binary \fI\%WINDOW\fP structure to the file.
 These include SVr4 curses, NetBSD and PDCurses,
 as well as older \fI\%ncurses\fP versions.
 This implementation
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index e5265ab1e..02d1b1488 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.35 2023/12/16 21:05:52 tom Exp $
-.TH curs_variables 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.40 2023/12/23 23:10:13 tom Exp $
+.TH curs_variables 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,20 +53,21 @@
 \fI\%chtype\fP,
 \fI\%cchar_t\fP,
 \fI\%attr_t\fP,
+\fI\%SCREEN\fP,
 \fI\%WINDOW\fP,
 \fB\%TRUE\fP,
 \fB\%FALSE\fP,
 \fB\%ERR\fP,
 \fB\%OK\fP,
+\fB\%curscr\fP,
+\fB\%newscr\fP,
+\fB\%stdscr\fP,
 \fB\%COLORS\fP,
 \fB\%COLOR_PAIRS\fP,
 \fB\%COLS\fP,
-\fB\%ESCDELAY\fP,
 \fB\%LINES\fP,
-\fB\%TABSIZE\fP,
-\fB\%curscr\fP,
-\fB\%newscr\fP,
-\fB\%stdscr\fP \-
+\fB\%ESCDELAY\fP,
+\fB\%TABSIZE\fP \-
 \fIcurses\fR data types, constants, and global variables
 .SH SYNOPSIS
 .nf
@@ -77,6 +78,7 @@
 \fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;
 \fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;
 \fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP SCREEN;
 \fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;
 .PP
 \fI/* constants */
@@ -87,12 +89,13 @@
 \fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;
 .PP
 \fI/* variables */
-\fBint COLOR_PAIRS;
 \fBint COLORS;
+\fBint COLOR_PAIRS;
 \fBint COLS;
 \fBint LINES;
 \fBWINDOW * curscr;
 \fBWINDOW * stdscr;
+.PP
 \fI/* extensions */
 \fBint ESCDELAY;
 \fBint TABSIZE;
@@ -111,16 +114,24 @@ that provide read-only access to the library's state.
 In either case,
 applications should treat them as read-only to avoid
 confusing the library.
-.SS \fIbool\fP, TRUE, FALSE
-X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
-standards,
-each of which also defined a Boolean data type.
-The \fIcurses\fP library requires an integral type \fIbool\fP and
-constants \fBTRUE\fP and \fBFALSE\fP to store its two possible values.
+.SH "CONSTANTS"
+.SS "TRUE, FALSE"
+The \fIcurses\fP library defines \fBTRUE\fP and \fBFALSE\fP
+to represent the values of the Boolean data type.
 .SS ERR, OK
 \fIcurses\fP and \fIterminfo\fP routines frequently return these
 constant integral values indicating failure and success,
 respectively.
+.SH "PREDEFINED TYPES"
+.SS \fIbool\fP
+X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
+standards,
+each of which also defined a Boolean data type.
+The \fIcurses\fP library requires an integral type \fIbool\fP.
+.PP
+\fB\%ncurses\fP' configure script attempts to discover the
+data type used by the system's C and C++ compilers,
+to reuse for the \fIcurses\fP \fIbool\fP.
 .SS \fIchtype\fP
 The \fI\%chtype\fP integral type combines a
 (\*(``narrow\*('',
@@ -151,30 +162,59 @@ for example,
 \fB\%attr_on\fP(3X),
 and
 \fB\%in_wch\fP(3X).
-.SS COLOR_PAIRS
-Once \fIcurses\fP is initialized,
-\fB\%COLOR_PAIRS\fP
-contains the number of color pairs supported by the terminal.
-Often,
-its value is the product \fB\%COLORS\fP \(mu \fB\%COLORS\fP,
-but this is not always true.
-.bP
-A few terminals use HLS colors,
-ignoring this rule;
+.SS \fISCREEN\fP
+.I curses
+manages a terminal device with this structure type;
+see \fB\%initscr\fP(3X).
+.SS "\fIWINDOW\fP"
+.I curses
+represents rectangular portions of the terminal screen with the
+.I \%WINDOW
+structure type;
+see subsection \*(``Overview\*('' of \fB\%ncurses\fP(3X).
+.SH "VARIABLES"
+.SS "curscr, stdscr, newscr"
+The library records updates to the terminal screen in a window named
+\fB\%curscr\fP.
+This object is referred to as the \*(``physical screen\*('' in
+\fB\%curs_refresh\fP(3X) and
+\fB\%curs_outopts\fP(3X).
+.PP
+\fI\%ncurses\fP collects pending updates to the terminal screen in a
+window named \fB\%newscr\fP.
+This object is referred to as the \*(``virtual screen\*('' in the
+\fB\%curs_kernel\fP(3X),
+\fB\%curs_refresh\fP(3X),
 and
-.bP
-terminals supporting a large number of colors are limited by the number
-of color pairs that a \fIsigned short\fP value can represent.
+\fB\%curs_outopts\fP(3X).
+When the screen is refreshed,
+\fIcurses\fP determines a minimal set of updates using the terminal's
+capabilities to make \fB\%curscr\fP look like \fB\%newscr\fP.
+.PP
+Once \fIcurses\fP is initialized,
+it creates a window named \fB\%stdscr\fP.
+It is the same size as the terminal screen and is the default window
+used by routines that do not take a parameter identifying one.
+Many \fIcurses\fP functions use this window.
 .SS COLORS
 Once \fIcurses\fP is initialized,
 \fB\%COLORS\fP
-contains the number of colors supported by the terminal.
-.SS COLS
+contains the number of colors supported by the terminal;
+see \fB\%curs_color\fP(3X).
+.SS COLOR_PAIRS
 Once \fIcurses\fP is initialized,
-\fB\%COLS\fP
-contains the screen's width in character cells;
+\fB\%COLOR_PAIRS\fP
+contains the number of color pairs supported by the terminal;
+see \fB\%curs_color\fP(3X).
+.SS "COLS, LINES"
+Once \fIcurses\fP is initialized,
+.B \%COLS
+and
+.B LINES
+contain the screen's width and height in character cells,
+respectively;
 that is,
-the number of columns.
+the number of columns and lines.
 .SS ESCDELAY
 For \fIcurses\fP to distinguish an escape character corresponding to a
 user's press of an \*(``Escape\*('' key on the input device from one
@@ -184,41 +224,10 @@ the library waits to see if another key event occurs after the escape
 character.
 \fB\%ESCDELAY\fP
 stores this interval in milliseconds.
-.SS LINES
-Once \fIcurses\fP is initialized,
-\fB\%LINES\fP
-contains the screen's height in character cells;
-that is,
-the number of lines.
 .SS TABSIZE
 The \fIcurses\fP library converts a tab character to this number of
 spaces as it adds a tab to a window;
 see \fB\%curs_addch\fP(3X).
-.SS curscr
-\fIcurses\fP records updates to the terminal screen in a \fI\%WINDOW\fP
-structure named \fB\%curscr\fP.
-.PP
-This object is referred to as the \*(``physical screen\*('' in
-\fB\%curs_refresh\fP(3X) and
-\fB\%curs_outopts\fP(3X).
-.SS newscr
-\fI\%ncurses\fP collects pending updates to the terminal screen in a
-\fI\%WINDOW\fP structure named \fB\%newscr\fP.
-.PP
-This object is referred to as the \*(``virtual screen\*('' in the
-\fB\%curs_kernel\fP(3X),
-\fB\%curs_refresh\fP(3X),
-and
-\fB\%curs_outopts\fP(3X).
-When the screen is refreshed,
-\fIcurses\fP determines a minimal set of updates using the terminal's
-capabilities to make \fB\%curscr\fP look like \fB\%newscr\fP.
-.SS stdscr
-Once \fIcurses\fP is initialized,
-it creates a \fI\%WINDOW\fP structure named \fB\%stdscr\fP.
-It is the same size as the terminal screen and is the default window
-used by routines that do not take a parameter identifying one.
-Many \fIcurses\fP functions use this window.
 .SH NOTES
 Either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) initializes
 \fIcurses\fP.
@@ -234,18 +243,20 @@ and \fB\%ESCDELAY\fP.
 .PP
 X/Open Curses describes \fB\%curscr\fP only as \*(``an internal data
 structure\*('';
-SVID gave more details,
+SVr4 gave more details,
 noting its use \*(``for certain low-level operations like clearing and
 redrawing a screen containing garbage\*(''.
+.\" SVID 4, Volume 3, p. 408
 Neither specified its interaction with the rest of the interface beyond
 use as an argument to \fB\%clearok\fP(3X) and \fB\%wrefresh\fP(3X).
 .PP
 \fB\%newscr\fP is a feature of SVr4 \fIcurses\fP.
-When refreshing the screen, this window is used as a working area
-for combining the standard screen \fB\%stdscr\fP with any other windows
-which the application may have created with \fB\%newwin\fP(3X).
-When the updated \fB\%newscr\fP is complete,
-\fIcurses\fP updates \fB\%curscr\fP to match \fB\%newscr\fP.
+When refreshing the screen,
+it is used as a working area for combining the standard window
+\fB\%stdscr\fP with any others the application may have created with
+\fB\%newwin\fP(3X).
+When the update of \fB\%newscr\fP is complete,
+\fIcurses\fP modifies \fB\%curscr\fP to match \fB\%newscr\fP.
 .PP
 \fB\%TABSIZE\fP is a feature of SVr4 \fIcurses\fP.
 .bP
@@ -294,6 +305,7 @@ most users have decided either to override the value,
 or to rely upon its default.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
+\fB\%curs_color\fP(3X),
 \fB\%curs_opaque\fP(3X),
 \fB\%curs_terminfo\fP(3X),
 \fB\%curs_threads\fP(3X),
diff --git a/man/form.3x b/man/form.3x
index 511952933..f00dfbc93 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.51 2023/12/16 20:32:22 tom Exp $
-.TH form 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.52 2023/12/23 16:08:25 tom Exp $
+.TH form 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -73,7 +73,7 @@ so that input/output processing will work.
 A curses initialization routine such as \fBinitscr\fP must be called
 before using any of these functions.
 .
-.SS Current Default Values for Field Attributes
+.SS "Current Default Values for Field Attributes"
 .
 The \fBform\fP library maintains a default value for field attributes.
 You
@@ -84,7 +84,7 @@ Changing this default with a
 \fBset_\fP function affects future field creations, but does not change the
 rendering of fields already created.
 .
-.SS Routine Name Index
+.SS "Routine Name Index"
 .
 The following table lists each \fBform\fP routine and the name of
 the manual page on which it is described.
diff --git a/man/form_driver.3x b/man/form_driver.3x
index d8434a818..43b59b647 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.53 2023/11/25 13:58:47 tom Exp $
-.TH form_driver 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.54 2023/12/23 16:08:25 tom Exp $
+.TH form_driver 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -67,7 +67,7 @@ returned by \fBget_wch\fP(3X).
 The type must be passed as well,
 to enable the library to determine whether the parameter
 is a wide character or a request.
-.SS Form-driver requests
+.SS "Form Driver Requests"
 The form driver requests are as follows:
 .PP
 .TS
@@ -139,7 +139,7 @@ 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
+.SS "Field Validation"
 The form library makes updates to the window associated
 with form fields rather than directly to the field buffers.
 .PP
@@ -166,7 +166,7 @@ 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.
-.SS Mouse handling
+.SS "Mouse Handling"
 If the second argument is the KEY_MOUSE special key, the associated
 mouse event is translated into one of the above pre-defined requests.
 Currently only clicks in the user window (e.g., inside the form display
@@ -213,7 +213,7 @@ into a request was done, \fBform_driver\fP 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 \fBE_REQUEST_DENIED\fP is returned.
-.SS Application-defined commands
+.SS "Application-defined Commands"
 If the second argument is neither printable nor one of the above
 pre-defined form requests, the driver assumes it is an application-specific
 command and returns \fBE_UNKNOWN_COMMAND\fP.  Application-defined commands
diff --git a/man/infocmp.1m b/man/infocmp.1m
index ffe2df3bc..11241bdef 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.102 2023/12/16 20:32:22 tom Exp $
-.TH @INFOCMP@ 1M 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.103 2023/12/23 16:08:25 tom Exp $
+.TH @INFOCMP@ 1M 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,14 +90,14 @@ binary file (\fBterm\fP) in a variety of formats.
 In all cases, the boolean
 fields will be printed first, followed by the numeric fields, followed by the
 string fields.
-.SS Default Options
+.SS "Default Options"
 If no options are specified and zero or one \fIterminal-types\fP are
 specified,
 the
 \fB\-I\fP option will be assumed.
 If more than one \fIterminal-type\fP is specified,
 the \fB\-d\fP option will be assumed.
-.SS Comparison Options [\-d] [\-c] [\-n]
+.SS "Comparison Options [\-d] [\-c] [\-n]"
 \fB@INFOCMP@\fP compares the \fBterminfo\fP description of the first terminal
 \fIterminal-type\fP with each of the descriptions given by the entries
 for the other terminal's \fIterminal-types\fP.
@@ -142,7 +142,7 @@ capabilities (names prefixed with \*(``OT\*('').
 If no \fIterminal-types\fP are given,
 \fB@INFOCMP@\fP uses the environment variable \fITERM\fP
 for each of the \fIterminal-types\fP.
-.SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
+.SS "Source Listing Options [\-I] [\-L] [\-C] [\-r]"
 The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
 a source listing for each terminal named.
 .PP
@@ -222,7 +222,7 @@ l l l.
 \fB%p1%?%'x'%>%t%p1%'y'%+%;/%>xy\fP/concept
 \fB%p2\fP is printed before \fB%p1/%r\fP/hp
 .TE
-.SS Use= Option [\-u]
+.SS "Use= Option [\-u]"
 The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
 terminal \fIterminal-type\fP which is relative to the sum of the
 descriptions given by the entries for the other \fIterminal-types\fP.
@@ -269,7 +269,7 @@ the compilation time, is specifying extra \fBuse=\fP fields that are
 superfluous.
 \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
 were not needed.
-.SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
+.SS "Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]"
 Like other \fI\%ncurses\fP utilities,
 \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
 You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
@@ -292,7 +292,7 @@ databases.
 For instance,
 you can use this feature for comparing descriptions for the same terminal
 created by different people.
-.SS Other Options
+.SS "Other Options"
 .TP 5
 \fB\-0\fP
 causes the fields to be printed on one line, without wrapping.
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 433ed5e40..7780b9d41 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.63 2023/12/17 23:52:59 tom Exp $
+# $Id: man_db.renames.in,v 1.66 2023/12/23 16:14:04 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -151,7 +151,7 @@ mitem_value.3x			menu_value.3menu
 mitem_visible.3x		menu_visible.3menu
 ncurses.3x			ncurses.3ncurses
 new_pair.3x			new_pair.3ncurses
-panel.3x			panel.3curses
+panel.3x			panel.3ncurses
 printf.3s			printf.3
 putc.3s 			putc.3
 resizeterm.3x			resizeterm.3ncurses
@@ -207,7 +207,7 @@ longname.3x			longname.3ncurses
 meta.3x				meta.3ncurses
 move.3x				move.3ncurses
 mvcur.3x			mvcur.3ncurses
-mvwin.3x			mvwin.3nwinses
+mvwin.3x			mvwin.3ncurses
 newpad.3x			newpad.3ncurses
 newterm.3x			newterm.3ncurses
 newwin.3x			newwin.3ncurses
@@ -240,7 +240,10 @@ wadd_wch.3x			wadd_wch.3ncurses
 waddch.3x			waddch.3ncurses
 waddstr.3x			waddstr.3ncurses
 waddwstr.3x			waddwstr.3ncurses
+wattrset.3x			wattrset.3ncurses
+wattr_set.3x			wattr_set.3ncurses
 wbkgdset.3x			wbkgdset.3ncurses
+wbkgrndset.3x			wbkgrndset.3ncurses
 wget_wch.3x			wget_wch.3ncurses
 wgetch.3x			wgetch.3ncurses
 wgetstr.3x			wgetstr.3ncurses
@@ -253,7 +256,7 @@ wsetscrreg.3x			wsetscrreg.3ncurses
 wtimeout.3x			wtimeout.3ncurses
 #
 # Other:
-getty.1				getty.8
+getty.8				getty.8
 scanf.3				scanf.3
 ttys.5				ttys.4
 system.3			system.3
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 94732df5f..dd0997514 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.29 2023/12/18 00:27:56 tom Exp $
+# $Id: manhtml.aliases,v 1.30 2023/12/23 21:21:06 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -57,6 +57,7 @@ inch(3X)		curs_inch(3X)
 infocmp(1)		infocmp(1M)
 initscr(3X)		curs_initscr(3X)
 is_scrollok(3X)		curs_opaque(3X)
+keyname(3X)		curs_util(3X)
 keypad(3X)		curs_inopts(3X)
 longname(3X)		curs_termattrs(3X)
 meta(3X)		curs_inopts(3X)
@@ -89,7 +90,10 @@ wadd_wch(3X)		curs_add_wch(3X)
 waddch(3X)		curs_addch(3X)
 waddstr(3X)		curs_addstr(3X)
 waddwstr(3X)		curs_addwstr(3X)
+wattr_set(3X)		curs_attr(3X)
+wattrset(3X)		curs_attr(3X)
 wbkgdset(3X)		curs_bkgd(3X)
+wbkgrndset(3X)		curs_bkgrnd(3X)
 wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
 wgetstr(3X)		curs_getstr(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index d800272ae..946348e4d 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.18 2023/12/18 00:35:38 tom Exp $
+# $Id: manhtml.externs,v 1.20 2023/12/23 23:49:04 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2021,2023 Thomas E. Dickey                                *
@@ -31,6 +31,7 @@
 COLOR_PAIR(1)
 COLOR_PAIR(2)
 atoi(3)
+bash(1)
 conflict(1)
 cron(1)
 csh(1)
@@ -39,11 +40,11 @@ emacs(1)
 environ(7)
 errno(3)
 file(1)
-getty(1)
+getty(8)
 jove(1)
 lynx(1)
-nvi(1)
 mutt(1)
+nvi(1)
 od(1)
 printf(3)
 profile(5)
@@ -54,16 +55,15 @@ read(2)
 readline(3)
 resize(1)
 scanf(3)
+scanf(3S)
 screen(1)
 setlocale(3)
 sh(1)
-scanf(3)
-scanf(3S)
 sscanf(3)
 stdio(3)
 stty(1)
-system(3)
 swprintf(3)
+system(3)
 termios(3)
 tmux(1)
 tty(4)
diff --git a/man/menu.3x b/man/menu.3x
index 247ebcfbe..57dae6656 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.42 2023/12/16 20:32:22 tom Exp $
-.TH menu 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.43 2023/12/23 16:08:25 tom Exp $
+.TH menu 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -65,7 +65,7 @@ these functions.
 To use the \fBmenu\fP library, link with the options
 \fB\-lmenu \-lcurses\fP.
 .
-.SS Current Default Values for Item Attributes
+.SS "Current Default Values for Item Attributes"
 .
 The \fBmenu\fP library maintains a default value for item attributes.
 You can
@@ -75,7 +75,7 @@ Changing this default with a
 \fBset_\fP function affects future item creations, but does not change the
 rendering of items already created.
 .
-.SS Routine Name Index
+.SS "Routine Name Index"
 .
 The following table lists each \fBmenu\fP routine and the name of
 the manual page on which it is described.
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index f3a8f02fb..3204d1f5f 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
-.TH menu_driver 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.45 2023/12/23 16:08:25 tom Exp $
+.TH menu_driver 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -118,7 +118,7 @@ If there is no such match, \fBmenu_driver\fP returns
 .PP
 If the second argument is one of the above pre-defined requests, the
 corresponding action is performed.
-.SS MOUSE HANDLING
+.SS "Mouse Handling"
 If the second argument is the KEY_MOUSE special key, the associated
 mouse event is translated into one of the above pre-defined requests.
 Currently only clicks in the user window (e.g., inside the menu display
@@ -158,7 +158,7 @@ into a request was done, \fBmenu_driver\fP returns the result of this request.
 If you clicked outside the user window
 or the mouse event could not be translated
 into a menu request an \fBE_REQUEST_DENIED\fP is returned.
-.SS APPLICATION-DEFINED COMMANDS
+.SS "Application-defined Commands"
 If the second argument is neither printable nor one of the above
 pre-defined menu requests or KEY_MOUSE,
 the drive assumes it is an application-specific
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 53b83ab26..ec0e39ba6 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.187 2023/12/17 23:44:14 tom Exp $
-.TH ncurses 3X 2023-12-17 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.189 2023/12/23 16:32:37 tom Exp $
+.TH ncurses 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,7 +106,7 @@ the names \fB\-lcurses\fP and \fB\-lcurses_g\fP.)
 The ncurses_g library generates trace logs
 (in a file called \*(``trace\*('' in the current directory)
 that describe curses actions.
-See also the section on \fBALTERNATE CONFIGURATIONS\fP.
+See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
 .PP
 The \fI\%ncurses\fP package supports: overall screen, window and pad
 manipulation; output to windows and pads; reading terminal input; control over
@@ -268,15 +268,16 @@ or in color on terminals that support such display enhancements.
 See \fB\%curs_attr\fP(3X).
 .PP
 .I curses
-predefines symbols for a small set of line graphics characters,
-corresponding to the VT100 line drawing set.
+predefines constants for a small set of line-drawing and other graphics
+corresponding to the DEC Alternate Character Set (ACS),
+a feature of VT100 and other terminals.
 See
 \fB\%waddch\fP(3X) and
 \fB\%wadd_wch\fP(3X).
 .PP
 .I curses
 is implemented using the operating system's terminal driver;
-keystroke events are not received as scan codes but as byte sequences.
+keystroke events are received not as scan codes but as byte sequences.
 Graphical keycaps
 (alphanumeric and punctuation keys,
 and the space)
@@ -443,7 +444,7 @@ or the constant
 .BR \%WEOF ,
 analogously to the
 .IR int -sized
-character manipulation functions of ISO C and their constant
+character manipulation functions of ISO C and its constant
 .BR \%EOF .
 .RE
 .IP
@@ -1179,7 +1180,8 @@ It does not modify the buffering of the standard output.
 The reason for the change was to make the behavior for interrupts and
 other signals more robust.
 One drawback is that certain nonconventional programs would mix
-ordinary stdio calls with \fI\%ncurses\fP calls and (usually) work.
+ordinary \fI\%stdio\fP(3) calls with \fI\%ncurses\fP calls and (usually)
+work.
 This is no longer possible since \fI\%ncurses\fP is not using
 the buffered standard output but its own output (to the same file descriptor).
 As a special case, the low-level calls such as \fBputp\fP still use the
@@ -1386,12 +1388,19 @@ setgid permissions:
 $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
 .EE
 .RE
-.SH ALTERNATE CONFIGURATIONS
-Several different configurations are possible,
-depending on the configure script options used when building
-\fI\%ncurses\fP.
-There are a few main options whose effects are visible to the applications
-developer using \fI\%ncurses\fP:
+.SH "ALTERNATE CONFIGURATIONS"
+Many different
+.I \%ncurses
+configurations are possible,
+determined by the options given to the
+.I \%configure
+script when building the library.
+Run the script with the
+.B \-\-help
+option to peruse them all.
+A few are of particular significance to the application developer
+employing
+.I \%ncurses.
 .TP 5
 \-\-disable\-overwrite
 The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP:
@@ -1593,19 +1602,19 @@ A small number of local differences
 (that is,
 individual differences between the XSI Curses and \fI\%ncurses\fP calls)
 are described in \fBPORTABILITY\fP sections of the library man pages.
-.SS Error checking
+.SS "Error Checking"
 In many cases, X/Open Curses is vague about error conditions,
 omitting some of the SVr4 documentation.
 .PP
 Unlike other implementations, this one checks parameters such as pointers
-to WINDOW structures to ensure they are not null.
+to \fI\%WINDOW\fP structures to ensure they are not null.
 The main reason for providing this behavior is to guard against programmer
 error.
 The standard interface does not provide a way for the library
 to tell an application which of several possible errors were detected.
 Relying on this (or some other) extension will adversely affect the
 portability of curses applications.
-.SS Extensions versus portability
+.SS "Extensions Versus Portability"
 Most of the extensions provided by \fI\%ncurses\fP have not been
 standardized.
 Some have been incorporated into other implementations, such as
@@ -1629,7 +1638,7 @@ See the \fBcurs_print\fP(3X) manual page for details.
 The routine \fBwresize\fP is not part of XPG4, nor is it present in SVr4.
 See the \fBwresize\fP(3X) manual page for details.
 .bP
-The WINDOW structure's internal details can be hidden from application
+The \fI\%WINDOW\fP structure's internal details can be hidden from application
 programs.
 See \fBcurs_opaque\fP(3X) for the discussion of \fBis_scrollok\fP, etc.
 .bP
@@ -1640,7 +1649,7 @@ See \fBcurs_threads\fP(3X) for details.
 This implementation can also be configured to provide a set of functions which
 improve the ability to manage multiple screens.
 See \fBcurs_sp_funcs\fP(3X) for details.
-.SS Padding differences
+.SS "Padding Differences"
 In historic curses versions, delays embedded in the capabilities \fBcr\fP,
 \fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
 bits in the Unix tty driver.
@@ -1648,7 +1657,7 @@ In this implementation, all padding is done by sending NUL bytes.
 This method is slightly more expensive, but narrows the interface
 to the Unix kernel significantly and increases the package's portability
 correspondingly.
-.SS Header files
+.SS "Header Files"
 The header file \fI\%curses.h\fP itself includes the header files
 \fI\%stdio.h\fP and \fI\%unctrl.h\fP.
 .PP
diff --git a/man/panel.3x b/man/panel.3x
index 6071b29a3..9f4bf26f8 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.60 2023/12/16 21:24:43 tom Exp $
-.TH panel 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.61 2023/12/23 16:22:25 tom Exp $
+.TH panel 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,7 +109,7 @@ puts panel \fIpan\fP at the bottom of all panels.
 .SS ceiling_panel
 \fB\%ceiling_panel(\fIsp\fB)\fR
 acts like \fB\%panel_below(NULL)\fP
-for the given \fI\%SCREEN\fP \fIsp\fP.
+for the given \fISCREEN\fP \fIsp\fP.
 .\" ---------
 .SS del_panel
 \fB\%del_panel(\fIpan\fB)\fR
@@ -119,7 +119,7 @@ removes the given panel \fIpan\fP from the stack and deallocates the
 .SS ground_panel
 \fB\%ground_panel(\fIsp\fB)\fR
 acts like \fB\%panel_above(NULL)\fP
-for the given \fI\%SCREEN\fP \fIsp\fP.
+for the given \fISCREEN\fP \fIsp\fP.
 .\" ---------
 .SS hide_panel
 \fB\%hide_panel(\fIpan\fB)\fR
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index ff1fa1e0f..d976fae88 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.40 2023/12/16 21:07:24 tom Exp $
-.TH scr_dump 5 2023-12-16 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.41 2023/12/23 16:27:25 tom Exp $
+.TH scr_dump 5 2023-12-23 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,26 +114,26 @@ screen-size,
 because the library truncates or fills the screen as necessary.
 .bP
 The ncurses6 \fBgetwin\fP reads the legacy screen dumps from ncurses5.
-.SS ncurses5 (legacy)
+.SS "ncurses5 (Legacy)"
 The screen-dump feature was added to \fI\%ncurses\fP in June 1995.
 While there were fixes and improvements in succeeding years,
 the basic scheme was unchanged:
 .bP
-The \fBWINDOW\fP structure was written in binary form.
+The \fI\%WINDOW\fP structure was written in binary form.
 .bP
-The \fBWINDOW\fP structure refers to lines of data,
-which were written as an array of binary data following the \fBWINDOW\fP.
+The \fI\%WINDOW\fP structure refers to lines of data,
+which were written as an array of binary data following the \fI\%WINDOW\fP.
 .bP
 When \fBgetwin\fP restored the window,
 it would keep track of offsets into the array of line-data
-and adjust the \fBWINDOW\fP structure which was read back into memory.
+and adjust the \fI\%WINDOW\fP structure which was read back into memory.
 .PP
 This is similar to Unix System\ V,
 but does not write a \*(``magic number\*('' to identify the file format.
 .SH PORTABILITY
 There is no standard format for \fBputwin\fP.
 This section gives a brief description of the existing formats.
-.SS X/Open Curses
+.SS "X/Open Curses"
 Refer to \fIX/Open Curses, Issue 7\fP (2009).
 .PP
 X/Open's documentation for \fIenhanced curses\fP says only:
@@ -145,7 +145,7 @@ The function
 then creates and initializes a new window using that data.
 .PP
 The \fBputwin(\ )\fP function writes all data associated
-with \fIwin\fP into the \fBstdio\fP(3) stream to which \fIfilep\fP
+with \fIwin\fP into the \fI\%stdio\fP(3) stream to which \fIfilep\fP
 points, using an \fBunspecified format\fP.
 This information can be retrieved later using \fBgetwin(\ )\fP.
 .RE
@@ -170,10 +170,10 @@ or more specific portability warnings about use of the material.
 In the foregoing, emphasis was added to \fBunspecified format\fP
 and to \fBXPG4 or to earlier XPG releases\fP,
 for clarity.
-.SS Unix System V
+.SS "Unix System V"
 Unix System\ V curses identified the file format by writing a
 \*(``magic number\*('' at the beginning of the dump.
-The \fBWINDOW\fP data and the lines of text follow, all in binary form.
+The \fI\%WINDOW\fP data and the lines of text follow, all in binary form.
 .PP
 The Solaris curses source has these definitions:
 .PP
@@ -211,7 +211,7 @@ the magic number is written with the high-order byte first, e.g.,
 .EE
 .RE
 .PP
-After the magic number, the \fBWINDOW\fP structure and line-data are
+After the magic number, the \fI\%WINDOW\fP structure and line-data are
 written in binary format.
 While the magic number used by the Unix systems can be seen using \fBod\fP(1),
 none of the Unix systems documents the format used for screen-dumps.
@@ -251,7 +251,7 @@ than writing the whole window from top to bottom.
 .SS PDCurses
 PDCurses added support for screen dumps in version 2.7 (2005).
 Like Unix System\ V and ncurses5,
-it writes the \fBWINDOW\fP structure in binary,
+it writes the \fI\%WINDOW\fP structure in binary,
 but begins the file with its three-byte identifier \*(``PDC\*('',
 followed by a one-byte version,
 e.g.,
@@ -274,9 +274,9 @@ It writes
 the curses shared library major and minor versions
 as the first two bytes (e.g., 7 and 1),
 .bP
-followed by a binary dump of the \fBWINDOW\fP,
+followed by a binary dump of the \fI\%WINDOW\fP,
 .bP
-some data for wide-characters referenced by the \fBWINDOW\fP structure, and
+some data for wide-characters referenced by the \fI\%WINDOW\fP structure, and
 .bP
 finally, lines as done by other implementations.
 .SH EXAMPLES
diff --git a/man/tabs.1 b/man/tabs.1
index 4bcb457ec..01ed44e4a 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.51 2023/12/17 00:13:57 tom Exp $
-.TH @TABS@ 1 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp $
+.TH @TABS@ 1 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -86,7 +86,7 @@ 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
+.SS "General Options"
 .TP 5
 .BI \-T "name"
 Tell \fB@TABS@\fP which terminal type to use.
@@ -110,7 +110,7 @@ and exits.
 The \fB@TABS@\fP 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.
-.SS Implicit Lists
+.SS "Implicit Lists"
 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.).
@@ -119,7 +119,7 @@ Tabs are repeated up to the right margin of the screen.
 Use \*(``\fB\-0\fP\*('' to clear all tabs.
 .PP
 Use \*(``\fB\-8\fP\*('' to set tabs to the standard interval.
-.SS Explicit Lists
+.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,
@@ -144,7 +144,7 @@ tabs 1,+5,+5,+5,+5
 .RE
 .PP
 which is equivalent to the 1,6,11,16,21 example.
-.SS Predefined Tab-Stops
+.SS "Predefined Tab Stops"
 POSIX defines several predefined lists of tab stops.
 .TP 5
 .B \-a
diff --git a/man/term.5 b/man/term.5
index e1eaa995e..ede2eb1c2 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.68 2023/12/16 20:32:22 tom Exp $
-.TH term 5 2023-12-16 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.69 2023/12/23 16:08:25 tom Exp $
+.TH term 5 2023-12-23 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -62,7 +62,7 @@ compiled \fIterminfo\fR terminal description
 .SH SYNOPSIS
 .B term
 .SH DESCRIPTION
-.SS STORAGE LOCATION
+.SS "Storage Location"
 Compiled terminfo descriptions are placed under the directory \fB\*d\fP.
 Two configurations are supported
 (when building the \fI\%ncurses\fP libraries):
@@ -97,7 +97,7 @@ It can write (or rewrite) entries in the hashed database.
 \fI\%TERMINFO_DIRS\fP environment variable by assuming a directory tree
 for entries that correspond to an existing directory,
 and hashed database otherwise.
-.SS LEGACY STORAGE FORMAT
+.SS "Legacy Storage Format"
 The format has been chosen so that it will be the same on all hardware.
 An 8 or more bit byte is assumed, but no assumptions about byte ordering
 or sign extension are made.
@@ -215,7 +215,7 @@ Special characters in \*^X or \ec notation are stored in their
 interpreted form, not the printing representation.
 Padding information $<nn> and parameter information %x are
 stored intact in uninterpreted form.
-.SS EXTENDED STORAGE FORMAT
+.SS "Extended Storage Format"
 The previous section describes the conventional terminfo binary format.
 With some minor variations of the offsets (see PORTABILITY),
 the same binary format is used in all modern Unix systems.
@@ -276,7 +276,7 @@ Applications which manipulate terminal data can use the definitions
 described in \fBterm_variables\fP(3X) which associate the long capability
 names with members of a \fBTERMTYPE\fP structure.
 .
-.SS EXTENDED NUMBER FORMAT
+.SS "Extended Number Format"
 On occasion, 16-bit signed integers are not large enough.
 With \fI\%ncurses\fP 6.1,
 a new format was introduced by making a few changes
@@ -315,7 +315,7 @@ 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, number, and string capabilities.
-.SS Binary format
+.SS "Binary Format"
 X/Open Curses does not specify a format for the terminfo database.
 System V curses used a directory-tree of binary files,
 one per terminal description.
@@ -338,7 +338,7 @@ where it was found that the latter did not match X/Open Curses.
 The format used by the other Unix versions
 can be matched by building \fI\%ncurses\fP
 with different configuration options.
-.SS Magic codes
+.SS "Magic Codes"
 The magic number in a binary terminfo file is the first 16-bits (two bytes).
 Besides making it more reliable for the library to check that a file
 is terminfo,
@@ -347,12 +347,12 @@ System V defined more than one magic number,
 with 0433, 0435 as screen-dumps (see \fBscr_dump\fP(5)).
 This implementation uses 01036 as a continuation of that sequence,
 but with a different high-order byte to avoid confusion.
-.SS The TERMTYPE structure
+.SS "The \fITERMTYPE\fP Structure"
 Direct access to the \fBTERMTYPE\fP structure is provided for legacy
 applications.
 Portable applications should use the \fBtigetflag\fP and related functions
 described in \fBcurs_terminfo\fP(3X) for reading terminal capabilities.
-.SS Mixed-case terminal names
+.SS "Mixed-case Terminal Names"
 A small number of terminal descriptions use uppercase characters in
 their names.
 If the underlying filesystem ignores the difference between
diff --git a/man/term_variables.3x b/man/term_variables.3x
index d0360642e..b256f8991 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.33 2023/11/25 14:32:36 tom Exp $
-.TH term_variables 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.34 2023/12/23 16:08:25 tom Exp $
+.TH term_variables 3X 2023-12-23 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,7 +90,7 @@ or macros (see \fBcurs_threads\fP(3X))
 which provide read-only access to \fIcurses\fP's state.
 In either case, applications should treat them as read-only to avoid
 confusing the library.
-.SS Alternate Character Set Mapping
+.SS "Alternate Character Set Mapping"
 After initializing the curses or terminfo interfaces,
 the \fBacs_map\fP array holds information used to translate cells
 with the \fBA_ALTCHARSET\fP video attribute into line-drawing characters.
@@ -100,7 +100,7 @@ Application developers need only know that it is used for the \*(``ACS_\*(''
 constants in <curses.h>.
 .PP
 The comparable data for the wide-character library is a private variable.
-.SS Current Terminal Data
+.SS "Current Terminal Data"
 After initializing the curses or terminfo interfaces,
 the \fBcur_term\fP contains data describing the current terminal.
 This variable is also set as a side-effect of \fBset_term\fP(3X)
@@ -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(3X) to reuse in \fBset_term\fP.
-.SS Terminfo Lookup Tables
+.SS "\fIterminfo\fP Lookup Tables"
 The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for
 the long and short names of terminfo capabilities,
 as well as the corresponding names for termcap capabilities.
@@ -133,13 +133,13 @@ These are the corresponding names used for termcap descriptions:
 \fBnumcodes\fP, and
 \fBstrcodes\fP.
 .\"
-.SS Terminal Type
+.SS "Terminal Type"
 A terminal description begins with one or more terminal names
 separated by \*(``|\*('' (vertical bars).
 On initialization of the curses or terminfo interfaces,
 \fBsetupterm\fP(3X) copies the terminal names to the array \fBttytype\fP.
 .\"
-.SS Terminfo Names
+.SS "\fIterminfo\fP Names"
 In addition to the variables, \fB<term.h>\fP also defines a symbol for each
 terminfo capability \fIlong name\fP.
 These are in terms of the symbol \fBCUR\fP,
diff --git a/man/terminfo.head b/man/terminfo.head
index d4989909f..712da62c9 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.57 2023/12/18 01:15:58 tom Exp $
-.TH terminfo 5 2023-12-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.59 2023/12/23 23:44:58 tom Exp $
+.TH terminfo 5 2023-12-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -77,7 +77,7 @@ specifying padding requirements and initialization sequences.
 .PP
 This manual describes \fI\%ncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
-.SS Terminfo Entry Syntax
+.SS "\fIterminfo\fP Entry Syntax"
 Entries in
 .I terminfo
 consist of a sequence of fields:
@@ -156,7 +156,7 @@ _
 .TE
 .PP
 For more on terminal naming conventions, see the \fBterm\fP(7) manual page.
-.SS Terminfo Capabilities Syntax
+.SS "\fIterminfo\fP Capabilities Syntax"
 The terminfo entry consists of several \fIcapabilities\fP,
 i.e., features that the terminal has,
 or methods for exercising the terminal's features.
@@ -185,7 +185,7 @@ Any capability can be \fIcanceled\fP,
 i.e., suppressed from the terminal entry,
 by following its name with \*(``@\*(''
 rather than a capability value.
-.SS Similar Terminals
+.SS "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
@@ -220,6 +220,6 @@ user preferences.
 An entry included via \fBuse\fP can contain canceled capabilities,
 which have the same effect as if those cancels were inline in the
 using terminal entry.
-.SS Predefined Capabilities
+.SS "Predefined Capabilities"
 .\" Head of terminfo man page ends here
 .ps -1
diff --git a/man/terminfo.tail b/man/terminfo.tail
index eba40996a..dc527831a 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.139 2023/12/17 22:56:21 tom Exp $
+.\" $Id: terminfo.tail,v 1.140 2023/12/23 16:23:35 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -523,7 +523,7 @@ will give unpredictable results, because dynamic variables are
 an uninitialized local array on the stack in the \fBtparm\fP function.
 .bP
 SVr3.2 curses supported \fIstatic\fP variables.
-Those are an array in the \fBTERMINAL\fP
+Those are an array in the \fI\%TERMINAL\fP
 structure (declared in \fBterm.h\fP),
 and are zeroed automatically when the \fBsetupterm\fP function
 allocates the data.
diff --git a/man/tic.1m b/man/tic.1m
index 384d8d629..7471ad8b7 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.104 2023/12/16 20:33:11 tom Exp $
-.TH @TIC@ 1M 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.105 2023/12/23 16:08:25 tom Exp $
+.TH @TIC@ 1M 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -139,7 +139,7 @@ the system terminfo database (\fI\*d\fP).
 .PP
 The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(5)
 manual goes into further detail.
-.SS ALIASES
+.SS Aliases
 This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
 usually those are linked to, or copied from this program:
 .bP
@@ -402,7 +402,7 @@ it will infer its type (boolean, number or 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 keys.
-.SS PARAMETERS
+.SS Parameters
 .TP
 \fIfile\fP
 contains one or more \fBterminfo\fP terminal descriptions in source
@@ -412,7 +412,7 @@ describes the capabilities of a particular terminal.
 .IP
 If \fIfile\fP is \*(``-\*('', then the data is read from the standard input.
 The \fIfile\fP parameter may also be the path of a character-device.
-.SS PROCESSING
+.SS Processing
 All but one of the capabilities recognized by \fB@TIC@\fP are documented
 in \fBterminfo\fP(5).
 The exception is the \fBuse\fP capability.
diff --git a/man/tput.1 b/man/tput.1
index 3811e6ad4..e1e9d9d41 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.92 2023/12/16 20:32:22 tom Exp $
-.TH @TPUT@ 1 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.96 2023/12/23 20:55:36 tom Exp $
+.TH @TPUT@ 1 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,60 +49,75 @@
 .SH NAME
 \fB\%@TPUT@\fP,
 \fB\%reset\fP \-
-initialize a terminal or query \fIterminfo\fR database
+initialize a terminal or query \fI\%term\%info\fP database
 .SH SYNOPSIS
-\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fIcapname\fR [\fIparameters\fR]
-.br
-\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] [\fB\-x\fR] \fBclear\fR
-.br
-\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBinit\fR
-.br
-\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBreset\fR
-.br
-\fB@TPUT@\fR [\fB\-T \fIterminal-type\fR] \fBlongname\fR
-.br
-\fB@TPUT@ \-S\fP  \fB<<\fP
-.br
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fIcap-code\fP [\fIparameter\fP .\|.\|.]
+.PP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
+.PP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
+.PP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBreset\fP
+.PP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBlongname\fP
+.PP
+\fB@TPUT@ \-S\fP
+.PP
 \fB@TPUT@ \-V\fP
 .SH DESCRIPTION
-The \fB@TPUT@\fP utility uses the \fBterminfo\fP database to make the
-values of terminal-dependent capabilities and information available to
-the shell (see \fBsh\fP(1)), to initialize or reset the terminal, or
-return the long name of the requested terminal type.
-The result depends upon the capability's type:
-.RS 3
-.TP 5
-string
-\fB@TPUT@\fP writes the string to the standard output.
-No trailing newline is supplied.
+\fB@TPUT@\fP uses the \fI\%term\%info\fP library and database to make
+the values of terminal-specific capabilities and information available
+to the shell,
+to initialize or reset the terminal,
+or report the long name of the current
+(or specified)
+terminal type.
+When retrieving capability values,
+the result depends upon the capability's type.
+.TP 9 \" "Boolean" + 2n
+Boolean
+\fB@TPUT@\fP sets its exit status to
+.B 0
+if the terminal possesses
+.I cap-code,
+and
+.B 1
+if it does not.
 .TP
 integer
-\fB@TPUT@\fP writes the decimal value to the standard output,
-with a trailing newline.
+\fB@TPUT@\fP writes
+.IR cap-code 's
+decimal value to the standard output stream if defined
+.RB ( \-1
+if it is not)
+followed by a newline.
 .TP
-boolean
-\fB@TPUT@\fP simply sets the exit code
-(\fB0\fP for TRUE if the terminal has the capability,
-\fB1\fP for FALSE if it does not),
-and writes nothing to the standard output.
-.RE
+string
+\fB@TPUT@\fP writes
+.IR cap-code 's
+value to the standard output stream if defined,
+without a trailing newline.
 .PP
 Before using a value returned on the standard output,
-the application should test the exit code
-(e.g., \fB$?\fP, see \fBsh\fP(1)) to be sure it is \fB0\fP.
-(See the \fBEXIT STATUS\fP and \fBDIAGNOSTICS\fP sections.)
-For a complete list of capabilities
-and the \fIcapname\fP associated with each, see \fBterminfo\fP(5).
+the application should test \fB@TPUT@\fP's exit status
+(for example,
+using \fB$?\fP in \fIsh\fP(1))
+to be sure it is \fB0\fP;
+see sections \*(``EXIT STATUS\*('' and \*(``DIAGNOSTICS\*('' below.
+For a complete list of
+.I cap-codes,
+see \fB\%terminfo\fP(5).
 .SS Options
 .TP
 \fB\-S\fP
-allows more than one capability per invocation of \fB@TPUT@\fP.  The
-capabilities must be passed to \fB@TPUT@\fP from the standard input
-instead of from the command line (see example).
-Only one \fIcapname\fP is allowed per line.
+allows more than one capability per invocation of \fB@TPUT@\fP.
+The capabilities must be passed to \fB@TPUT@\fP from the standard input
+instead of from the command line
+(see example).
+Only one \fIcap-code\fP is allowed per line.
 The \fB\-S\fP option changes the
-meaning of the \fB0\fP and \fB1\fP boolean and string exit codes (see the
-EXIT STATUS section).
+meaning of the \fB0\fP and \fB1\fP Boolean and string exit statuses
+(see section \*(``EXIT STATUS\*('' below).
 .IP
 Because some capabilities may use
 \fIstring\fP parameters rather than \fInumbers\fP,
@@ -128,11 +143,11 @@ prevents \fB\%@TPUT@\fP from attempting to clear the scrollback buffer.
 A few commands (\fBinit\fP, \fBreset\fP and \fBlongname\fP) are
 special; they are defined by the \fB@TPUT@\fP program.
 The others are the names of \fIcapabilities\fP from the terminal database
-(see \fBterminfo\fP(5) for a list).
+(see \fB\%terminfo\fP(5) for a list).
 Although \fBinit\fP and \fBreset\fP resemble capability names,
 \fB@TPUT@\fP uses several capabilities to perform these special functions.
 .TP
-\fIcapname\fP
+\fIcap-code\fP
 indicates the capability from the terminal database.
 .IP
 If the capability is a string that takes parameters, the arguments
@@ -194,7 +209,7 @@ standard tabs will be set (every 8 spaces).
 .TP
 (4)
 if present, the terminal's initialization strings will be
-output as detailed in the \fBterminfo\fP(5) section on
+output as detailed in the \fB\%terminfo\fP(5) section on
 .IR "Tabs and Initialization" ,
 .TP
 (5)
@@ -233,13 +248,18 @@ strings are, the \fIinitialization\fP strings will be output.
 .IP
 Otherwise, \fBreset\fP acts identically to \fBinit\fP.
 .TP
-\fBlongname\fP
-If the terminal database is present and an entry for the
-user's terminal exists (see \fB\-T\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
-\fBterminfo\fP database [see \fBterm\fP(5)].
+.B longname
+If the terminal database is present and an entry for the user's terminal
+exists
+(see
+.B \-T
+.I type
+above),
+\fB\%@TPUT@\fP reports the terminal's description
+(or \*(``long name\*('')
+to the standard output,
+without a trailing newline.
+See \fBterm\fP(5).
 .SS Aliases
 \fB@TPUT@\fP handles the \fBclear\fP, \fBinit\fP and \fBreset\fP
 commands specially:
@@ -282,7 +302,7 @@ If \fB@TPUT@\fP is invoked by a link named \fBinit\fP, this has the
 same effect as \fB@TPUT@ init\fP.
 Again, you are less likely to use that link because another program
 named \fBinit\fP has a more well-established use.
-.SS Terminal Size
+.SS "Terminal Size"
 Besides the special commands (e.g., \fBclear\fP),
 @TPUT@ treats certain terminfo capabilities specially:
 \fBlines\fP and \fBcols\fP.
@@ -305,60 +325,61 @@ relying upon the operating system (or finally, the terminal database).
 .SH EXIT STATUS
 If the \fB\-S\fP option is used,
 \fB@TPUT@\fP checks for errors from each line,
-and if any errors are found, will set the exit code to 4 plus the
+and if any errors are found, will set the exit status to 4 plus the
 number of lines with errors.
-If no errors are found, the exit code is \fB0\fP.
+If no errors are found, the exit status is \fB0\fP.
 No indication of which line failed can be given so
-exit code \fB1\fP will never appear.
-Exit codes \fB2\fP, \fB3\fP, and
+exit status \fB1\fP will never appear.
+Exit statuses \fB2\fP, \fB3\fP, and
 \fB4\fP retain their usual interpretation.
 If the \fB\-S\fP option is not used,
-the exit code depends on the type of \fIcapname\fP:
+the exit status depends on the type of \fIcap-code\fP:
 .RS 3
 .TP
-.I boolean
+.I Boolean
 a value of \fB0\fP is set for TRUE and \fB1\fP for FALSE.
 .TP
 .I string
 a value of \fB0\fP is set if the
-\fIcapname\fP is defined for this terminal \fItype\fP (the value of
-\fIcapname\fP is returned on standard output);
-a value of \fB1\fP is set if \fIcapname\fP
+\fIcap-code\fP is defined for this terminal \fItype\fP (the value of
+\fIcap-code\fP is returned on standard output);
+a value of \fB1\fP is set if \fIcap-code\fP
 is not defined for this terminal \fItype\fP
 (nothing is written to standard output).
 .TP
 .I integer
 a value of \fB0\fP is always set,
-whether or not \fIcapname\fP is defined for this terminal \fItype\fP.
-To determine if \fIcapname\fP is defined for this terminal \fItype\fP,
+whether or not \fIcap-code\fP is defined for this terminal \fItype\fP.
+To determine if \fIcap-code\fP is defined for this terminal \fItype\fP,
 the user must test the value written to standard output.
 A value of \fB\-1\fP
-means that \fIcapname\fP is not defined for this terminal \fItype\fP.
+means that \fIcap-code\fP is not defined for this terminal \fItype\fP.
 .TP
 .I other
 \fBreset\fP or \fBinit\fP may fail to find their respective files.
-In that case, the exit code is set to 4 + \fBerrno\fP.
+In that case, the exit status is set to 4 + \fBerrno\fP.
 .RE
 .PP
-Any other exit code indicates an error; see the DIAGNOSTICS section.
+Any other exit status indicates an error;
+see section \*(``DIAGNOSTICS\*('' below.
 .SH DIAGNOSTICS
-\fB@TPUT@\fP prints the following error messages and sets the corresponding exit
-codes.
+\fB@TPUT@\fP prints the following error messages and sets the
+corresponding exit statuses.
 .PP
 .ne 15
 .TS
 l l.
-exit code	error message
+exit status	error message
 =
 \fB0\fP	T{
-(\fIcapname\fP is a numeric variable that is not specified in the
-\fBterminfo\fP(5) database for this terminal type, e.g.
+(\fIcap-code\fP is a numeric variable that is not specified in the
+\fB\%terminfo\fP(5) database for this terminal type, e.g.
 \fB@TPUT@ \-T450 lines\fP and \fB@TPUT@ \-Thp2621 xmc\fP)
 T}
 \fB1\fP	no error message is printed, see the \fBEXIT STATUS\fP section.
 \fB2\fP	usage error
-\fB3\fP	unknown terminal \fItype\fP or no \fBterminfo\fP database
-\fB4\fP	unknown \fBterminfo\fP capability \fIcapname\fP
+\fB3\fP	unknown terminal \fItype\fP or no \fI\%term\%info\fP database
+\fB4\fP	unknown \fI\%term\%info\fP capability \fIcap-code\fP
 \fB>4\fP	error occurred in \-S
 =
 .TE
@@ -373,7 +394,7 @@ compiled terminal description database
 This implementation of \fBtput\fP differs from AT&T \fBtput\fP in
 two important areas:
 .bP
-\fB@TPUT@\fP \fIcapname\fP writes to the standard output.
+\fB@TPUT@\fP \fIcap-code\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.
@@ -393,17 +414,18 @@ using functions shared with \fB@TSET@\fP
 If it is not able to open a terminal, e.g., when running in \fBcron\fP(1),
 \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.
+AT&T \fBtput\fP guesses the type of its \fIcap-code\fP operands by
+seeing if all of the characters are numeric,
+or not.
 .IP
-Most implementations which provide support for \fIcapname\fP operands
+Most implementations which provide support for \fIcap-code\fP operands
 use the \fBtparm\fP function to expand parameters in it.
 That function expects a mixture of numeric and string parameters,
 requiring \fB@TPUT@\fP to know which type to use.
 .IP
 This implementation uses a table to determine the parameter types for
-the standard \fIcapname\fP operands, and an internal library
-function to analyze nonstandard \fIcapname\fP operands.
+the standard \fIcap-code\fP operands, and an internal library
+function to analyze nonstandard \fIcap-code\fP operands.
 .IP
 Besides providing more reliable operation than AT&T's utility,
 a portability problem is introduced by this analysis:
@@ -415,7 +437,7 @@ Portable applications should not rely upon this feature;
 specifically for OpenBSD.
 .PP
 This implementation (unlike others) can accept both \fItermcap\fP
-and \fIterminfo\fP names for the \fIcapname\fP feature,
+and \fIterminfo\fP names for the \fIcap-code\fP feature,
 if
 \fItermcap\fP support is compiled in.
 However, the predefined \fItermcap\fP and \fIterminfo\fP names have two
@@ -435,21 +457,27 @@ the \fItermcap\fP name \fBcd\fP (clear to end of screen).
 .PP
 The \fBlongname\fP and \fB\-S\fP options, and the parameter-substitution
 features used in the \fBcup\fP example,
-were not supported in BSD curses before 4.3reno (1989) or in
-AT&T/USL curses before SVr4 (1988).
+were not supported in
+AT&T/USL
+.I curses
+before SVr4 (1989).
+Later, 4.3BSD-Reno (1990) added support for \fBlongname\fP,
+.\" longname was added in October 1989.
+and NetBSD (1994) added support for the parameter-substitution features.
 .PP
 IEEE Std 1003.1/The Open Group  Base Specifications Issue 7 (POSIX.1-2008)
 documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
 There are a few interesting observations to make regarding that:
 .bP
-In this implementation, \fBclear\fP is part of the \fIcapname\fP support.
+In this implementation,
+\fBclear\fP is part of the \fIcap-code\fP support.
 The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal
 capabilities.
 .bP
 Other implementations of \fBtput\fP on
 SVr4-based systems such as Solaris, IRIX64 and HP-UX
 as well as others such as AIX and Tru64
-provide support for \fIcapname\fP operands.
+provide support for \fIcap-code\fP operands.
 .bP
 A few platforms such as FreeBSD recognize termcap names rather
 than terminfo capability names in their respective \fBtput\fP commands.
@@ -463,8 +491,8 @@ Because (apparently) \fIall\fP of the certified Unix systems
 support the full set of capability names, the reasoning for documenting
 only a few may not be apparent.
 .bP
-X/Open Curses Issue 7 documents \fBtput\fP differently, with \fIcapname\fP
-and the other features used in this implementation.
+X/Open Curses Issue 7 documents \fBtput\fP differently,
+with \fIcap-code\fP and the other features used in this implementation.
 .bP
 That is, there are two standards for \fBtput\fP:
 POSIX (a subset) and X/Open Curses (the full implementation).
@@ -472,29 +500,35 @@ POSIX documents a subset to avoid the complication of including X/Open Curses
 and the terminal capabilities database.
 .bP
 While it is certainly possible to write a \fBtput\fP program
-without using curses,
-none of the systems which have a curses implementation provide
-a \fBtput\fP utility which does not provide the \fIcapname\fP feature.
+without using
+.I curses,
+no system with a
+.I curses
+implementation provides a \fBtput\fP utility that does not also supply
+the \fIcap-code\fP feature.
 .PP
 X/Open Curses Issue 7 (2009) is the first version to document utilities.
 However that part of X/Open Curses does not follow existing practice
-(i.e., Unix features documented in SVID 3):
+(that is,
+System\ V
+.I curses
+behavior).
 .bP
-It assigns exit code 4 to \*(``invalid operand\*('',
+It assigns exit status 4 to \*(``invalid operand\*('',
 which may be the same as \fIunknown capability\fP.
 For instance, the source code for Solaris' xcurses uses the term
 \*(``invalid\*('' in this case.
 .bP
-It assigns exit code 255 to a numeric variable that is not specified in
+It assigns exit status 255 to a numeric variable that is not specified in
 the terminfo database.
 That likely is a documentation error,
 confusing the \fB\-1\fP written to the standard output for an absent
-or cancelled numeric value versus an (unsigned) exit code.
+or cancelled numeric value versus an (unsigned) exit status.
 .PP
-The various Unix systems (AIX, HP-UX, Solaris) use the same exit-codes
+The various Unix systems (AIX, HP-UX, Solaris) use the same exit statuses
 as \fI\%ncurses\fP.
 .PP
-NetBSD curses documents different exit codes which do not correspond
+NetBSD curses documents different exit statuses which do not correspond
 to either \fI\%ncurses\fP or X/Open.
 .SH HISTORY
 The \fBtput\fP command was begun by Bill Joy in 1980.
@@ -548,14 +582,14 @@ were handled.
 .TP 5
 \fB@TPUT@ init\fP
 Initialize the terminal according to the type of
-terminal in the environmental variable \fITERM\fP.
+terminal in the environment variable \fITERM\fP.
 This command should be included in everyone's .profile after
-the environmental variable \fITERM\fP has been exported,
+the environment variable \fITERM\fP has been exported,
 as illustrated on the \fBprofile\fP(5) manual page.
 .TP 5
 \fB@TPUT@ \-T5620 reset\fP
 Reset an AT&T 5620 terminal, overriding the type of
-terminal in the environmental variable \fITERM\fP.
+terminal in the environment variable \fITERM\fP.
 .TP 5
 \fB@TPUT@ cup 0 0\fP
 Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
@@ -579,7 +613,7 @@ This might be followed by a
 prompt: \fBecho "${bold}Please type in your name: ${offbold}\ec"\fP
 .TP 5
 \fB@TPUT@ hc\fP
-Set exit code to indicate if the current terminal is a hard copy terminal.
+Set exit status to indicate if the current terminal is a hard copy terminal.
 .TP 5
 \fB@TPUT@ cup 23 4\fP
 Send the sequence to move the cursor to row 23, column 4.
@@ -588,29 +622,35 @@ Send the sequence to move the cursor to row 23, column 4.
 Send the terminfo string for cursor-movement, with no parameters substituted.
 .TP 5
 \fB@TPUT@ longname\fP
-Print the long name from the \fBterminfo\fP database for the
-type of terminal specified in the environmental
+Print the long name from the \fI\%term\%info\fP database for the
+type of terminal specified in the environment
 variable \fITERM\fP.
-.PP
-.RS 5
-\fB@TPUT@ \-S <<!\fP
-.br
-\fB> clear\fP
-.br
-\fB> cup 10 10\fP
-.br
-\fB> bold\fP
-.br
-\fB> !\fP
-.RE
 .TP 5
-\&
-This example shows \fB@TPUT@\fP processing several capabilities
-in one invocation.
+\fB@TPUT@ \-S\fP
+The \fB\-S\fP option can be profitably used with a shell
+\*(``here document\*(''.
+.IP
+.EX
+$ \fB@TPUT@ \-S <<!\fP
+> \fBclear\fP
+> \fBcup 10 10\fP
+> \fBbold\fP
+> \fB!\fP
+.EE
+.IP
+We see \fB@TPUT@\fP processing several capabilities 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 (\fB!\fP) on a line by itself.
+moves the cursor to position
+(10, 10)
+and turns on bold
+(extra bright)
+mode.
+.IP
+The same sequence of commands can be combined using the OpenBSD feature:
+.IP
+.EX
+$ \fB@TPUT@ \fBclear\fP \fBcup 10 10\fP \fBbold\fP
+.EE
 .SH SEE ALSO
 \fB\%@CLEAR@\fP(1),
 \fB\%stty\fP(1),
diff --git a/man/tset.1 b/man/tset.1
index 4621c8cfa..cf76c26e8 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.78 2023/12/16 20:32:22 tom Exp $
-.TH @TSET@ 1 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.79 2023/12/23 16:20:07 tom Exp $
+.TH @TSET@ 1 2023-12-23 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,7 +57,7 @@ initialize or reset terminal state
 .br
 \fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal-type\fP]
 .SH DESCRIPTION
-.SS tset - initialization
+.SS "\fItset\fP \(em initialization"
 This program initializes terminals.
 .PP
 First, \fB@TSET@\fP retrieves the current terminal mode settings
@@ -81,12 +81,12 @@ This determination is done as follows, using the first terminal type found.
 .PP
 1. The \fBterminal\fP argument specified on the command line.
 .PP
-2. The value of the \fITERM\fP environmental variable.
+2. The value of the \fITERM\fP environment variable.
 .PP
 3. (BSD systems only.) The terminal type associated with the standard
 error output device in the \fI/etc/ttys\fP file.
 (On System\ V hosts and systems using that convention,
-\fBgetty\fP(1) does this job by setting
+\fI\%getty\fP(8) does this job by setting
 \fITERM\fP according to the type passed to it by \fI\%/etc/inittab\fP.)
 .PP
 4. The default terminal type, \*(``unknown\*('',
@@ -129,7 +129,7 @@ and \fB@TSET@\fP waits one second (in case a hardware reset was issued).
 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
+.SS "\fIreset\fP \(em reinitialization"
 When invoked as \fB@RESET@\fP, \fB@TSET@\fP sets the terminal
 modes to \*(``sane\*('' values:
 .bP
@@ -164,11 +164,13 @@ This is done using the \fB\-s\fP option.
 .PP
 When the \fB\-s\fP option is specified, the commands to enter the information
 into the shell's environment are written to the standard output.
-If the \fISHELL\fP environmental variable ends in \*(``csh\*('',
+If the \fISHELL\fP environment variable ends in \*(``csh\*('',
 the commands
-are for \fBcsh\fP, otherwise, they are for \fBsh\fP(1).
-Note, the \fBcsh\fP commands set and unset the shell variable
-\fBnoglob\fP, leaving it unset.
+are for \fIcsh\fP(1),
+otherwise,
+they are for \fIsh\fP(1).
+The \fIcsh\fP commands set and unset the shell variable \fBnoglob\fP,
+leaving it unset.
 The following line in the \fB.login\fP
 or \fB.profile\fP files will initialize the environment correctly:
 .sp
@@ -177,7 +179,7 @@ or \fB.profile\fP files will initialize the environment correctly:
 .SS "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
-\fI/etc/ttys\fP file or the \fITERM\fP environmental variable is often
+\fI/etc/ttys\fP file or the \fITERM\fP environment variable is often
 something generic like \fBnetwork\fP, \fBdialup\fP, or \fBunknown\fP.
 When \fB@TSET@\fP is used in a startup script it is often desirable to
 provide information about the type of terminal used on such ports.
@@ -234,8 +236,8 @@ terminal.
 No whitespace characters are permitted in the \fB\-m\fP option argument.
 Also, to avoid problems with meta-characters, it is suggested that the
 entire \fB\-m\fP option argument be placed within single quote characters,
-and that \fBcsh\fP users insert a backslash character (\*(``\e\*('') before
-any exclamation marks (\*(``!\*('').
+and that \fIcsh\fP users insert a backslash character (\*(``\e\*('')
+before any exclamation marks (\*(``!\*('').
 .SH OPTIONS
 The options are as follows:
 .TP 5
@@ -295,8 +297,8 @@ If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed.
 The \fB@TSET@\fP command uses these environment variables:
 .TP 5
 .I SHELL
-tells \fB@TSET@\fP whether to initialize \fITERM\fP using \fBsh\fP(1) or
-\fBcsh\fP(1) syntax.
+tells \fB@TSET@\fP whether to initialize \fITERM\fP using \fIsh\fP(1) or
+\fIcsh\fP(1) syntax.
 .TP 5
 .I TERM
 Denotes your terminal type.
@@ -330,8 +332,8 @@ is always an alias for \fBtset\fP.
 The \fB\%@TSET@\fP utility provides backward compatibility with BSD
 environments;
 under most modern Unices,
-\fI\%/etc/inittab\fP and \fBgetty\fP(1) can set \fITERM\fP appropriately
-for each dial-up line,
+\fI\%/etc/inittab\fP and \fI\%getty\fP(8) can set \fITERM\fP
+appropriately for each dial-up line,
 obviating what was \fB\%@TSET@\fP's most important use.
 This implementation behaves like 4.4BSD \fBtset\fP,
 with a few exceptions we shall consider now.
diff --git a/man/user_caps.5 b/man/user_caps.5
index 033f9d464..978edbc49 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.42 2023/12/16 20:32:22 tom Exp $
-.TH user_caps 5 2023-12-16 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.43 2023/12/23 16:08:25 tom Exp $
+.TH user_caps 5 2023-12-23 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -185,7 +185,7 @@ to provide extended special-key names.
 Fitting that into termcap's limitation of 2-character names
 would be pointless.
 These extended keys are available only with terminfo.
-.SS Recognized capabilities
+.SS "Recognized Capabilities"
 The \fI\%ncurses\fP library uses the user-definable capabilities.
 While the terminfo database may have other extensions,
 \fI\%ncurses\fP makes explicit checks for these:
@@ -347,7 +347,7 @@ xterm mouse protocols:
              %?%p4%tM%em%;,
 .fi
 .
-.SS Extended key-definitions
+.SS "Extended Key Definitions"
 Several terminals provide the ability to send distinct strings for
 combinations of modified special keys.
 There is no standard for what those keys can send.
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 3eea42af7..604dfb490 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231217) unstable; urgency=low
+ncurses6 (6.4+20231223) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 3eea42af7..604dfb490 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231217) unstable; urgency=low
+ncurses6 (6.4+20231223) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 794660ba7..523158415 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231217) unstable; urgency=low
+ncurses6 (6.4+20231223) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 17 Dec 2023 18:18:40 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 96cb0d310..d6da23ae3 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.624 2023/12/17 23:18:40 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.625 2023/12/23 11:35:00 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1217"
+!define VERSION_MMDD  "1223"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 43652ce49..9f0736e32 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231217
+Release: 20231223
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index faccbf194..391eed7ae 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231217
+Release: 20231223
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 4312edb7a..cfe212cb3 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231217
+Release: 20231223
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 78e74e7376d2c99ee3dd26b679b1a335a3de7aa6 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 31 Dec 2023 02:40:02 +0100
Subject: [PATCH 047/106] ncurses-6.4-20231230.patch

---
 NEWS                               |   9 +-
 VERSION                            |   2 +-
 announce.html.in                   |  11 +-
 dist.mk                            |   4 +-
 doc/html/man/curs_color.3x.html    |  10 +-
 doc/html/man/curs_inwstr.3x.html   |  21 +-
 doc/html/man/curs_scr_dump.3x.html |  72 ++--
 doc/html/man/curs_termcap.3x.html  |  67 ++--
 doc/html/man/curs_terminfo.3x.html | 311 ++++++++---------
 doc/html/man/infocmp.1m.html       |  12 +-
 doc/html/man/ncurses.3x.html       | 441 ++++++++++++-----------
 doc/html/man/scr_dump.5.html       | 151 ++++----
 doc/html/man/term.5.html           |  32 +-
 doc/html/man/terminfo.5.html       |  32 +-
 doc/html/man/tic.1m.html           |  10 +-
 doc/html/man/tput.1.html           | 253 +++++++-------
 doc/html/man/user_caps.5.html      |  20 +-
 include/Caps                       |   6 +-
 include/Caps.aix4                  |   6 +-
 include/Caps.hpux11                |   8 +-
 include/Caps.keys                  |   6 +-
 include/Caps.osf1r5                |   6 +-
 include/Caps.uwin                  |   6 +-
 man/curs_color.3x                  |   6 +-
 man/curs_inwstr.3x                 |   9 +-
 man/curs_scr_dump.3x               | 103 ++++--
 man/curs_termcap.3x                |   9 +-
 man/curs_terminfo.3x               | 539 ++++++++++++++++++-----------
 man/infocmp.1m                     |   8 +-
 man/man_db.renames.in              |  11 +-
 man/manhtml.aliases                |   9 +-
 man/ncurses.3x                     | 300 +++++++++-------
 man/scr_dump.5                     | 194 ++++++-----
 man/term.5                         |  28 +-
 man/terminfo.head                  |   8 +-
 man/terminfo.tail                  |  16 +-
 man/tic.1m                         |   6 +-
 man/tput.1                         |  33 +-
 man/user_caps.5                    |  16 +-
 misc/terminfo.src                  | 249 ++++++++++++-
 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 +-
 47 files changed, 1784 insertions(+), 1278 deletions(-)

diff --git a/NEWS b/NEWS
index ccaddc43f..8f115f89c 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4055 2023/12/23 21:00:43 tom Exp $
+-- $Id: NEWS,v 1.4057 2023/12/31 00:17:55 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20231230
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ add ms-vt100-16color, winconsole -TD
+	+ add rio, rio-direct -TD
+	+ add mostlike -TD
+	+ add wezterm, contour -TD
+
 20231223
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 
diff --git a/VERSION b/VERSION
index a9e6b8e08..d7b546150 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231223
+5:0:10	6.4	20231230
diff --git a/announce.html.in b/announce.html.in
index da2b2fc5c..9da511910 100644
--- a/announce.html.in
+++ b/announce.html.in
@@ -1,5 +1,5 @@
 <!--
-  $Id: announce.html.in,v 1.105 2023/12/02 21:45:06 tom Exp $
+  $Id: announce.html.in,v 1.106 2023/12/30 21:24:48 tom Exp $
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
   *                                                                          *
@@ -1136,10 +1136,11 @@
     </li>
 
     <li>
-      <p>The library meets the XSI requirement that every macro
-      entry point has a corresponding function which may be linked
-      (and will be prototype-checked) if the macro definition is
-      disabled with <code>#undef</code>.</p>
+      <p>The library meets the X/Open Curses requirement that every
+      function declared in a header file has a macro equivalent.
+      If the macro definition is disabled with <code>#undef</code>,
+      the function may be linked (and its calls will be checked
+      against the prototype).</p>
     </li>
 
     <li>
diff --git a/dist.mk b/dist.mk
index a8501b024..69ec2bfea 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1585 2023/12/23 11:35:00 tom Exp $
+# $Id: dist.mk,v 1.1586 2023/12/30 11:24:34 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231223
+NCURSES_PATCH = 20231230
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 964ef4e0c..3bd3fbac8 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.95 2023/12/23 20:18:13 tom Exp @
+  * @Id: curs_color.3x,v 1.96 2023/12/30 21:20:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_color 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   window attributes, as from <STRONG><A HREF="curs_attr.3x.html">wattrset(3x)</A></STRONG> or <STRONG><A HREF="curs_attr.3x.html">wattr_set(3x)</A></STRONG>
 
-       <STRONG>o</STRONG>   window  background  character  atttributes, as from <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> or
+       <STRONG>o</STRONG>   window  background  character  attributes,  as from <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> or
            <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>
 
        Per-character and window attributes are usually set through a  function
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index c6c08b29a..b6030e3eb 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.35 2023/11/25 11:31:49 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.36 2023/12/30 21:32:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -100,13 +100,14 @@ <H1 class="no-header">curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All routines except <STRONG>winnwstr</STRONG> may be macros.
 
-       Each cell in the window holds a  complex  character  (i.e.,  base-  and
-       combining-characters)   together  with  attributes  and  color.   These
-       functions store only  the  wide  characters,  ignoring  attributes  and
-       color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters from a window.
+       Each cell in the window holds a complex character (a spacing  character
+       and  zero  or more non-spacing characters) together with attributes and
+       color.  These  functions  store  only  the  wide  characters,  ignoring
+       attributes  and  color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters
+       from a window.
 
        Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
-       <STRONG>mvinwstr</STRONG>, <STRONG>mvwinwstr</STRONG> or <STRONG>winwstr</STRONG> causes  undefined  results.   Therefore,
+       <STRONG>mvinwstr</STRONG>,  <STRONG>mvwinwstr</STRONG>  or  <STRONG>winwstr</STRONG> causes undefined results.  Therefore,
        the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
 
 
@@ -115,12 +116,12 @@ <H1 class="no-header">curs_inwstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 0a7e003bc..298722f18 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,20 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.36 2023/12/16 21:10:18 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.37 2023/12/30 21:34:11 tom Exp @
+  * SVID 4, p. 529
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -61,62 +62,67 @@ <H1 class="no-header">curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       <EM>curses</EM> provides applications the ability to write the contents  of  the
+       screen  to  a  file and read them back.  To read/write a window (rather
+       than the whole screen) from/to a file, use <STRONG><A HREF="curs_util.3x.html">getwin(3x)</A></STRONG>  and  <STRONG><A HREF="curs_util.3x.html">putwin(3x)</A></STRONG>,
+       respectively.
+
 
 </PRE><H3><a name="h3-scr_dump">scr_dump</a></H3><PRE>
-       The <STRONG>scr_dump</STRONG> routine dumps the current contents of the  <EM>virtual</EM>  <EM>screen</EM>
-       to the file <EM>filename</EM>.
+       <STRONG>scr_dump</STRONG>  writes  to  <EM>filename</EM>  the contents of the virtual screen; see
+       <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-scr_restore">scr_restore</a></H3><PRE>
-       The  <STRONG>scr_restore</STRONG>  routine  sets  the  <EM>virtual</EM> <EM>screen</EM> to the contents of
-       <EM>filename</EM>, which must have been written using <STRONG>scr_dump</STRONG>.  The  next  call
-       to  <STRONG>doupdate</STRONG>  restores  the <EM>physical</EM> <EM>screen</EM> to the way it looked in the
-       dump file.
+       <STRONG>scr_restore</STRONG> updates the virtual  screen  to  contain  the  contents  of
+       <EM>filename</EM>  (if  it  was  validly  written with <STRONG>scr_dump</STRONG>).  No refresh is
+       performed;  after  performing  any  further   desired   updates,   call
+       <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> or similar.
 
 
 </PRE><H3><a name="h3-scr_init">scr_init</a></H3><PRE>
-       The <STRONG>scr_init</STRONG> routine reads in the contents of <EM>filename</EM> and uses them to
-       initialize the <STRONG>curses</STRONG> data structures about what the terminal currently
-       has on its screen.  If the data is determined to be valid, <STRONG>curses</STRONG> bases
-       its  next update of the screen on this information rather than clearing
-       the  screen  and  starting  from  scratch.   <STRONG>scr_init</STRONG>  is  used   after
-       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  a  <STRONG>system(3)</STRONG>  call  to  share  the screen with another
-       process which has done a <STRONG>scr_dump</STRONG> after its <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> call.  The  data
-       is declared invalid
+       <STRONG>scr_init</STRONG>  reads <EM>filename,</EM> using it to initialize <EM>curses</EM> data structures
+       describing the state of the terminal screen.  If these data are  valid,
+       <EM>curses</EM>  bases  its next update of the screen on this information rather
+       than clearing it and starting from scratch.
+
+       The data fail the validity check
+
+       <STRONG>o</STRONG>   if the terminal employs <EM>terminfo</EM> capabilities <STRONG>exit_ca_mode</STRONG>  (<STRONG>rmcup</STRONG>)
+           or <STRONG>non_rev_rmcup</STRONG> (<STRONG>nrrmc</STRONG>) are defined, or
 
-       <STRONG>o</STRONG>   if the terminfo capabilities <STRONG>rmcup</STRONG> and <STRONG>nrrmc</STRONG> exist, also
+       <STRONG>o</STRONG>   if  <EM>curses</EM>  knows  that  the terminal has been written to since the
+           preceding <STRONG>scr_dump</STRONG> call.
 
-       <STRONG>o</STRONG>   if  the  terminal  has been written to since the preceding <STRONG>scr_dump</STRONG>
-           call.
+       <STRONG>scr_init</STRONG> could be used after <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG>system(3)</STRONG>  to  share  the
+       screen with another process that has done a <STRONG>scr_dump</STRONG> after <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-scr_set">scr_set</a></H3><PRE>
-       The <STRONG>scr_set</STRONG> routine is a combination of <STRONG>scr_restore</STRONG> and  <STRONG>scr_init</STRONG>.   It
+       The  <STRONG>scr_set</STRONG>  routine is a combination of <STRONG>scr_restore</STRONG> and <STRONG>scr_init</STRONG>.  It
        tells the program that the information in <EM>filename</EM> is what is currently
        on the screen, and also what the program wants on the screen.  This can
        be thought of as a screen inheritance function.
 
-       To  read  (write)  a window from (to) a file, use the <STRONG>getwin</STRONG> and <STRONG>putwin</STRONG>
-       routines [see <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>].
-
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no error conditions.  In this implementation, each  will
-       return an error if the file cannot be opened.
+       X/Open defines no failure conditions.   In  this  implementation,  each
+       function fails if it cannot open <EM>filename.</EM>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG>, and <STRONG>scr_restore</STRONG> may be macros.
+       <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG>, and <STRONG>scr_restore</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in  the XSI Curses standard, Issue 4,
-       which adds <EM>const</EM> qualifiers to the arguments.
+       X/Open Curses, Issue 4, describes these functions.
+
+       SVr4 omitted the <EM>const</EM> qualifiers.
 
-       The SVr4 docs merely say under <STRONG>scr_init</STRONG> that  the  dump  data  is  also
-       considered  invalid  "if  the  time-stamp of the tty is old" but do not
+       SVr4  documentation  describes <STRONG>scr_init</STRONG> such that the dump data is also
+       considered invalid "if the time-stamp of the tty is old" but  does  not
        define "old".
 
 
@@ -126,7 +132,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index fff45be48..5babcda79 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.80 2023/12/23 20:19:05 tom Exp @
+  * @Id: curs_termcap.3x,v 1.81 2023/12/30 21:27:22 tom Exp @
   * See &lt;https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
   *   termlib/termcap.c&gt;.
   * See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
@@ -62,12 +62,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -315,33 +315,34 @@ <H1 class="no-header">curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        program.  The library remained much the same though 4.3BSD (June 1986).
        4.4BSD-Lite (June 1994) refactored it, leaving the API unchanged.
 
-       Function  prototypes were a feature of ANSI C (1989).  Thus the library
-       itself provided no header file declaring them.  Nevertheless,  the  BSD
-       sources included two different <EM>termcap.h</EM> header files over time.
+       Function  prototypes were a feature of ANSI C (1989).  The library long
+       antedated the standard and thus provided no header file declaring them.
+       Nevertheless,  the  BSD sources included two different <EM>termcap.h</EM> header
+       files over time.
 
-       <STRONG>o</STRONG>   One was used internally by <STRONG>jove(1)</STRONG> from 4.3BSD onward.  It delcared
+       <STRONG>o</STRONG>   One was used internally by <STRONG>jove(1)</STRONG> from 4.3BSD onward.  It declared
            global symbols for the <EM>termcap</EM> variables that it used.
 
-       <STRONG>o</STRONG>   The other appeared in 4.4BSD-Lite Release 2 (June 1995) as part  of
-           <EM>libedit</EM>  (also known as the <EM>editline</EM> library).  CSRG source history
+       <STRONG>o</STRONG>   The  other appeared in 4.4BSD-Lite Release 2 (June 1995) as part of
+           <EM>libedit</EM> (also known as the <EM>editline</EM> library).  CSRG source  history
            shows that this was added in mid-1992.  The <EM>libedit</EM> header file was
            used  internally  as  a  convenience  for  compiling  the  <EM>editline</EM>
            library.  It declared function prototypes, but no global variables.
            This header file was added to NetBSD's <EM>termcap</EM> library in mid-1994.
 
-       Meanwhile,  GNU  <EM>termcap</EM>  began development in 1990.  Its first release
-       (1.0) in 1991  included  a  <EM>termcap.h</EM>  header.   Its  second  (1.1)  in
-       September  1992  modified  the  header  to  use  <EM>const</EM> for the function
-       prototypes in the header where one would expect the  parameters  to  be
+       Meanwhile, GNU <EM>termcap</EM> began development in 1990.   Its  first  release
+       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header.   Its  second (1.1) in
+       September 1992 modified the  header  to  use  <EM>const</EM>  for  the  function
+       prototypes  in  the  header where one would expect the parameters to be
        read-only.   BSD  <EM>termcap</EM>  did  not.   The  prototype  for  <STRONG>tputs</STRONG>  also
-       differed, but in that instance, it was <EM>libedit</EM> that differed  from  BSD
+       differed,  but  in that instance, it was <EM>libedit</EM> that differed from BSD
        <EM>termcap</EM>.
 
-       GNU  <EM>termcap</EM>  1.3  was  bundled with <STRONG>bash(1)</STRONG> in mid-1993 to support the
+       GNU <EM>termcap</EM> 1.3 was bundled with <STRONG>bash(1)</STRONG> in  mid-1993  to  support  the
        <STRONG>readline(3)</STRONG> library.
 
-       <EM>ncurses</EM> 1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It  reflected
-       influence   from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than  <STRONG>jove(1)</STRONG>),
+       <EM>ncurses</EM>  1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It reflected
+       influence  from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than   <STRONG>jove(1)</STRONG>),
        providing the following interface:
 
        <STRONG>o</STRONG>   global symbols used by <EM>emacs</EM>,
@@ -350,41 +351,41 @@ <H1 class="no-header">curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG>, a GNU <EM>termcap</EM> feature.
 
-       Later (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.   Any
-       two  of  the four implementations thus differ, and programs that intend
+       Later  (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.  Any
+       two of the four implementations thus differ, and programs  that  intend
        to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
        If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>column_address</STRONG>  (<STRONG>ch</STRONG>)  or  any  other
-       parameterized  string capability, be aware that it is returned in <EM>term-</EM>
+       parameterized string capability, be aware that it is returned in  <EM>term-</EM>
        <EM>info</EM> notation, not the older and not-quite-compatible <EM>termcap</EM> notation.
-       This  does  not  cause  problems if all you do with it is call <STRONG>tgoto</STRONG> or
-       <STRONG>tparm</STRONG>, which both expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.   (If
-       <EM>ncurses</EM>  is  configured  to  support  <EM>termcap,</EM> <STRONG>tgoto</STRONG> checks whether the
-       string is <EM>terminfo</EM>-style by looking  for  "<STRONG>%p</STRONG>"  parameters  or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"
+       This does not cause problems if all you do with it  is  call  <STRONG>tgoto</STRONG>  or
+       <STRONG>tparm</STRONG>,  which both expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.  (If
+       <EM>ncurses</EM> is configured to support  <EM>termcap,</EM>  <STRONG>tgoto</STRONG>  checks  whether  the
+       string  is  <EM>terminfo</EM>-style  by  looking  for "<STRONG>%p</STRONG>" parameters or "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"
        delays, and invokes a <EM>termcap</EM>-style parser if the string appears not to
        use <EM>terminfo</EM> syntax.)
 
-       Because <EM>terminfo</EM>'s syntax for padding in  string  capabilities  differs
+       Because  <EM>terminfo</EM>'s  syntax  for padding in string capabilities differs
        from <EM>termcap</EM>'s, users can be surprised.
 
-       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG>  in  a <EM>terminfo</EM> system transmits "50" rather than busy-
+       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a <EM>terminfo</EM> system transmits "50" rather  than  busy-
            waiting for 50 milliseconds.
 
-       <STRONG>o</STRONG>   However, if <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it  may  also
+       <STRONG>o</STRONG>   However,  if  <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it may also
            have been configured to support BSD-style padding.
 
-           In  that  case,  <STRONG>tputs</STRONG>  inspects  strings passed to it, looking for
+           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
            digits at the beginning of the string.
 
-           <STRONG>tputs("50")</STRONG> in a <EM>termcap</EM> system may busy-wait for  50  milliseconds
+           <STRONG>tputs("50")</STRONG>  in  a <EM>termcap</EM> system may busy-wait for 50 milliseconds
            rather than transmitting "50".
 
        <EM>termcap</EM>  has  nothing  analogous  to  <EM>terminfo</EM>'s  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)
-       capability.  One consequence is that <EM>termcap</EM> applications  assume  that
-       "<STRONG>me</STRONG>"  (equivalent  to <EM>terminfo</EM>'s <STRONG>exit_attribute_mode</STRONG> (<STRONG>sgr0</STRONG>) capability)
-       does not reset the alternate character set.  <EM>ncurses</EM>  checks  for,  and
+       capability.   One  consequence is that <EM>termcap</EM> applications assume that
+       "<STRONG>me</STRONG>" (equivalent to <EM>terminfo</EM>'s <STRONG>exit_attribute_mode</STRONG>  (<STRONG>sgr0</STRONG>)  capability)
+       does  not  reset  the alternate character set.  <EM>ncurses</EM> checks for, and
        modifies the data shared with, the <EM>termcap</EM> interface to accommodate the
        latter's limitation in this respect.
 
@@ -396,7 +397,7 @@ <H1 class="no-header">curs_termcap 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index a800bfbe4..6084b51ee 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.124 2023/12/23 17:34:39 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.125 2023/12/30 23:46:56 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -37,10 +37,9 @@
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
-  * See X/Open Curses Issue 4, Version 2, pp. 227-234.
-  * See X/Open Curses Issue 7, pp. 311-318.
   * ***************************************************************************
   * ***************************************************************************
+  * X/Open Curses Issue 7, p. 161
   * ***************************************************************************
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -48,12 +47,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -124,39 +123,39 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        recommended.
 
        None of these functions use  (or  are  aware  of)  multibyte  character
-       strings such as UTF-8:
+       strings such as UTF-8.
 
-       <STRONG>o</STRONG>   capability names use the POSIX portable character set
+       <STRONG>o</STRONG>   Capability names and codes use the POSIX portable character set.
 
-       <STRONG>o</STRONG>   capability  string  values  have  no  associated encoding; they are
+       <STRONG>o</STRONG>   Capability  string  values  have  no  associated encoding; they are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       Initially, <STRONG>setupterm</STRONG> should be called.  The high-level curses functions
+       Initially, <STRONG>setupterm</STRONG> should be called.  The high-level <EM>curses</EM> functions
        <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
-       terminal-dependent variables [listed in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].
+       terminal-dependent variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
 
        Applications can use the terminal  capabilities  either  directly  (via
        header  definitions),  or  by  special  functions.   The  header  files
-       <STRONG>curses.h</STRONG> and <STRONG>term.h</STRONG> should be included  (in  this  order)  to  get  the
+       <EM>curses.h</EM> and <EM>term.h</EM> should be included  (in  that  order)  to  get  the
        definitions for these strings, numbers, and flags.
 
-       The  <STRONG>terminfo</STRONG>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
+       The  <EM>terminfo</EM>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
        as follows:
 
        <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
-           specified in <STRONG>terminfo</STRONG> are used.
+           specified in <EM>terminfo</EM> are used.
 
        <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <EM>LINES</EM> and <EM>COLUMNS</EM> exist,
            their values are used.  If these environment variables do not exist
            and  the program is running in a window, the current window size is
            used.  Otherwise, if the environment variables do  not  exist,  the
-           values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <STRONG>terminfo</STRONG> database are
+           values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <EM>terminfo</EM> database are
            used.
 
        Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
-       them.   All  <STRONG>terminfo</STRONG> strings (including the output of <STRONG>tparm</STRONG>) should be
+       them.   All  <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>) should be
        printed with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore  the  tty
        modes before exiting [see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>].
 
@@ -174,9 +173,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
            the shell.
 
-       The  <STRONG>setupterm</STRONG> routine reads in the <STRONG>terminfo</STRONG> database, initializing the
-       <STRONG>terminfo</STRONG> structures, but does not  set  up  the  output  virtualization
-       structures used by <STRONG>curses</STRONG>.  These are its parameters:
+       The  <STRONG>setupterm</STRONG> routine reads in the <EM>terminfo</EM> database, initializing the
+       <EM>terminfo</EM> structures, but does not  set  up  the  output  virtualization
+       structures used by <EM>curses.</EM>  These are its parameters:
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <EM>TERM</EM> is used.
@@ -218,9 +217,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                If <EM>errret</EM> is null,  <STRONG>setupterm</STRONG>  prints  an  error  message  upon
                finding an error and exits.  Thus, the simplest call is:
 
-               <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>,
+                      <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>
 
-          which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
+               which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
@@ -236,13 +235,13 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        terminal types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set  of
        terminal capabilities.
 
-       The  <STRONG>set_curterm</STRONG>  routine  sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, and makes all of the
-       <STRONG>terminfo</STRONG> boolean, numeric, and string variables  use  the  values  from
-       <EM>nterm</EM>.  It returns the old value of <STRONG>cur_term</STRONG>.
+       <STRONG>set_curterm</STRONG>  sets  <STRONG>cur_term</STRONG>  to  <EM>nterm,</EM>  and  makes all of the <EM>terminfo</EM>
+       Boolean, numeric, and string variables use the values from  <EM>nterm.</EM>   It
+       returns the old value of <STRONG>cur_term</STRONG>.
 
-       The  <STRONG>del_curterm</STRONG>  routine frees the space pointed to by <EM>oterm</EM> and makes
-       it available for further use.   If  <EM>oterm</EM>  is  the  same  as  <STRONG>cur_term</STRONG>,
-       references  to  any  of  the  <STRONG>terminfo</STRONG>  boolean,  numeric,  and  string
+       <STRONG>del_curterm</STRONG>  routine  frees  the space pointed to by <EM>oterm</EM> and makes it
+       available  for  further  use.   If  <EM>oterm</EM>  is  the  same  as  <STRONG>cur_term</STRONG>,
+       references  to  any  of  the  <EM>terminfo</EM>  Boolean,  numeric,  and  string
        variables thereafter  may  refer  to  invalid  memory  locations  until
        another <STRONG>setupterm</STRONG> has been called.
 
@@ -273,9 +272,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG> which uses  <EM>&lt;stdarg.h&gt;</EM>  rather  than  a
-       fixed-parameter list.  Its numeric parameters are integers (int) rather
-       than longs.
+       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG>  which  uses  <EM>stdarg.h</EM>  rather  than  a
+       fixed-parameter  list.   Its  numeric  parameters  are <EM>int</EM>s rather than
+       <EM>long</EM>s.
 
        Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
        consistent  with the terminal description.  Two extensions are provided
@@ -329,44 +328,43 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        The <STRONG>vidattr</STRONG> routine is like the <STRONG>vidputs</STRONG> routine, except that it outputs
        through <EM>putchar</EM>.
 
-       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines correspond to vidattr  and  vidputs,
-       respectively.   They  use a set of arguments for representing the video
-       attributes plus color, i.e.,
+       <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>,  respectively.
+       They  use multiple parameters to represent the character attributes and
+       color; namely,
 
-       <STRONG>o</STRONG>   <EM>attrs</EM> of type <STRONG>attr_t</STRONG> for the attributes and
+       <STRONG>o</STRONG>   <EM>attrs,</EM> of type <EM>attr</EM><STRONG>_</STRONG><EM>t,</EM> for the attributes and
 
-       <STRONG>o</STRONG>   <EM>pair</EM> of type <STRONG>short</STRONG> for the color pair number.
+       <STRONG>o</STRONG>   <EM>pair,</EM> of type <EM>short,</EM> for the color pair number.
 
-       The <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> routines are designed to  use  the  attribute
-       constants with the <STRONG>WA_</STRONG> prefix.
+       Use the attribute constants  prefixed  with  "<STRONG>WA_</STRONG>"  with  <STRONG>vid_attr</STRONG>  and
+       <STRONG>vid_puts</STRONG>.
 
        X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
-       applications must provide a null pointer  for  that  argument.   As  an
-       extension,  this  implementation allows <EM>opts</EM> to be used as a pointer to
-       <STRONG>int</STRONG>, which overrides the <EM>pair</EM> (<STRONG>short</STRONG>) argument.
+       applications must provide a null pointer for  that  argument;  but  see
+       section "EXTENSIONS" below.
 
-       The <STRONG>mvcur</STRONG> routine provides low-level cursor motion.   It  takes  effect
-       immediately  (rather  than at the next refresh).  Unlike the other low-
-       level output functions, which either write to the  standard  output  or
+       The  <STRONG>mvcur</STRONG>  routine  provides low-level cursor motion.  It takes effect
+       immediately (rather than at the next refresh).  Unlike the  other  low-
+       level  output  functions,  which either write to the standard output or
        pass an output function parameter, <STRONG>mvcur</STRONG> uses an output file descriptor
        derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
        While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions which do not use the high-
-       level  curses  state,  they are declared in <STRONG>&lt;curses.h&gt;</STRONG> because System V
-       did this (see <EM>HISTORY</EM>).
+       level curses state, they are declared in <EM>curses.h</EM> because System V  did
+       this (see <EM>HISTORY</EM>).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
-       The <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG> and <STRONG>tigetstr</STRONG> routines return the value  of  the
-       capability  corresponding  to the <STRONG>terminfo</STRONG> <EM>capname</EM> passed to them, such
-       as <STRONG>xenl</STRONG>.  The <EM>capname</EM> for each capability is given in the table  column
+       The  <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG> and <STRONG>tigetstr</STRONG> routines return the value of the
+       capability corresponding to the <EM>terminfo</EM> <EM>capname</EM> passed to  them,  such
+       as  <STRONG>xenl</STRONG>.  The <EM>capname</EM> for each capability is given in the table column
        entitled <EM>capname</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        These routines return special values to denote errors.
 
        The <STRONG>tigetflag</STRONG> routine returns
 
-       <STRONG>-1</STRONG>     if <EM>capname</EM> is not a boolean capability, or
+       <STRONG>-1</STRONG>     if <EM>capname</EM> is not a Boolean capability, or
 
        <STRONG>0</STRONG>      if it is canceled or absent from the terminal description.
 
@@ -402,89 +400,72 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
-       description.  As a side-effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
+       description.   As  a  side-effect,  it  sets  <STRONG>cur_term</STRONG> to point to this
        memory.  If an application calls
 
               <STRONG>del_curterm(cur_term);</STRONG>
 
        the memory will be freed.
 
-       The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
+       The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
        by <STRONG>setupterm</STRONG>:
 
-       <STRONG>o</STRONG>   the "static" terminfo variables [a-z].  Before <EM>ncurses</EM>  6.3,  those
-           were  shared by all screens.  With <EM>ncurses</EM> 6.3, those are allocated
+       <STRONG>o</STRONG>   the  "static"  terminfo variables [a-z].  Before <EM>ncurses</EM> 6.3, those
+           were shared by all screens.  With <EM>ncurses</EM> 6.3, those are  allocated
            per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
 
-       <STRONG>o</STRONG>   to improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
-           terminfo  strings  for  their parameter types.  That is stored as a
+       <STRONG>o</STRONG>   to  improve performance, <EM>ncurses</EM> 6.3 caches the result of analyzing
+           terminfo strings for their parameter types.  That is  stored  as  a
            binary tree referenced from the <EM>TERMINAL</EM> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
-       they  do  not free this memory, but it is possible to do that using the
+       they do not free this memory, but it is possible to do that  using  the
        <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG> function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines that return an integer return <STRONG>ERR</STRONG> upon failure  and  <STRONG>OK</STRONG>  (SVr4
-       only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       X/Open defines no failure conditions.  In <EM>ncurses,</EM>
 
-       Routines that return pointers always return <STRONG>NULL</STRONG> on error.
+       <STRONG>del_curterm</STRONG>
+            returns an error if its terminal parameter is null.
 
-       X/Open defines no error conditions.  In this implementation
+       <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error-codes.
 
-          <STRONG>del_curterm</STRONG>
-               returns an error if its terminal parameter is null.
+       <STRONG>restartterm</STRONG>
+            returns  an  error  if the associated call to <STRONG>setupterm</STRONG> returns an
+            error.
 
-          <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error-codes.
+       <STRONG>setupterm</STRONG>
+            returns an error if it cannot allocate enough  memory,  or  create
+            the  initial  windows  (<STRONG>stdscr</STRONG>,  <STRONG>curscr</STRONG>,  and  <STRONG>newscr</STRONG>) Other error
+            conditions are documented above.
 
-          <STRONG>restartterm</STRONG>
-               returns an error if the associated call to <STRONG>setupterm</STRONG> returns an
-               error.
+       <STRONG>tparm</STRONG>
+            returns  a  null  if  the  capability  would  require   unexpected
+            parameters,  e.g.,  too many, too few, or incorrect types (strings
+            where integers are expected, or vice versa).
 
-          <STRONG>setupterm</STRONG>
-               returns an error if it cannot allocate enough memory, or create
-               the  initial  windows  (stdscr,  curscr,  newscr).  Other error
-               conditions are documented above.
-
-          <STRONG>tparm</STRONG>
-               returns a null  if  the  capability  would  require  unexpected
-               parameters,  e.g.,  too  many,  too  few,  or  incorrect  types
-               (strings where integers are expected, or vice versa).
-
-          <STRONG>tputs</STRONG>
-               returns an error if the string parameter is null.  It does  not
-               detect  I/O errors: X/Open states that <STRONG>tputs</STRONG> ignores the return
-               value of the output function <EM>putc</EM>.
+       <STRONG>tputs</STRONG>
+            returns an error if the string parameter is  null.   It  does  not
+            detect  I/O  errors:  X/Open  Curses states that <STRONG>tputs</STRONG> ignores the
+            return value of the output function <EM>putc</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       According to X/Open Curses, any of the <EM>enhanced</EM> <EM>curses</EM> functions may be
-       implemented  as  macros.   The  term  "enhanced" refers to features not
-       found in SVr4 curses.
-
-       <STRONG>ncurses</STRONG> uses macros
-
-       <STRONG>o</STRONG>   for functions which return values via their parameters,
-
-       <STRONG>o</STRONG>   to support obsolete features,
-
-       <STRONG>o</STRONG>   to reuse functions, e.g., those that move the cursor before another
-           operation, and
-
-       <STRONG>o</STRONG>   a few special cases.
-
-       The  <STRONG>vid_puts</STRONG> function in <STRONG>ncurses</STRONG> is a special case.  It was originally
+       The <STRONG>vid_attr</STRONG> function in <EM>ncurses</EM> is a special case.  It was  originally
        implemented based on a draft of X/Open Curses, as a macro, before other
-       parts of the <STRONG>ncurses</STRONG> wide-character API were developed.
+       parts of the <EM>ncurses</EM> wide-character API were developed, and unlike  the
+       other  wide-character  functions,  is  also  provided  in the non-wide-
+       character configuration.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  functions  marked as extensions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and
-       are not found in SVr4 <EM>curses</EM>, 4.4BSD  <EM>curses</EM>,  or  any  other  previous
-       curses implementation.
+       The functions marked as extensions were designed for <EM>ncurses,</EM>  and  are
+       not  found  in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous curses
+       implementation.
+
+       <EM>ncurses</EM> allows <EM>opts</EM> to be a pointer to <EM>int,</EM> which  overrides  the  <EM>pair</EM>
+       (<EM>short</EM>) argument.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -502,7 +483,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
        page.  It further notes that <STRONG>setterm</STRONG> was replaced by <STRONG>setupterm</STRONG>, stating
        that the call
-              setupterm(<EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
+              setupterm(<EM>term</EM>, 1, (int *)0)
        provides the same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  discouraging  the
        latter  for  new programs.  <EM>ncurses</EM> implements each of these symbols as
        macros for BSD <EM>curses</EM> compatibility.
@@ -515,7 +496,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        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 <STRONG>tic</STRONG> <STRONG>-x</STRONG>, are not
+       Extended terminal capability names, as defined  by  "<STRONG>tic</STRONG> <STRONG>-x</STRONG>",  are  not
        stored in the arrays described here.
 
 
@@ -523,31 +504,31 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
        <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
        the  corresponding  stream.   In  addition  to  the limitation that the
-       terminal was left  in  block-buffered  mode  on  exit  (like  System  V
-       curses),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
-       way to cleanup on receiving SIGTSTP.
+       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+       <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
+       way to cleanup on receiving <STRONG>SIGTSTP</STRONG>.
 
        The current version (ncurses6) uses output buffers managed directly  by
-       <EM>ncurses</EM>.  Some of the low-level functions described in this manual page
+       <EM>ncurses.</EM>  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  <EM>ncurses</EM> use alternate versions of these functions
+       level functions in <EM>ncurses</EM> employ alternate versions of these functions
        using the more reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
-       The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
+       The X/Open Curses prototypes  are  based  on  the  SVr4  <EM>curses</EM>  header
        declarations,  which  were  defined at the same time the C language was
        first standardized in the late 1980s.
 
-       <STRONG>o</STRONG>   X/Open Curses uses <STRONG>const</STRONG>  less  effectively  than  a  later  design
+       <STRONG>o</STRONG>   X/Open Curses uses <EM>const</EM>  less  effectively  than  a  later  design
            might,  in  some cases applying it needlessly to values are already
            constant, and in most cases overlooking parameters  which  normally
-           would  use <STRONG>const</STRONG>.  Using constant parameters for functions which do
-           not use <STRONG>const</STRONG> may prevent the program from compiling.  On the other
-           hand, <EM>writable</EM> <EM>strings</EM> are an obsolescent feature.
+           would  use <EM>const.</EM>  Using constant parameters for functions which do
+           not use <EM>const</EM> may prevent the program from compiling.  On the other
+           hand, "writable strings" are an obsolescent feature.
 
            As  an  extension,  this implementation can be configured to change
-           the function prototypes to use the <STRONG>const</STRONG> keyword.  The <EM>ncurses</EM>  ABI
+           the function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM>  ABI
            6 enables this feature by default.
 
        <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
@@ -570,7 +551,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
            nine on each call is awkward.
 
-           Using  <STRONG>long</STRONG>  for the numeric parameter type is a workaround to make
+           Using  <EM>long</EM>  for the numeric parameter type is a workaround to make
            the parameter use the same amount of  stack  as  a  pointer.   That
            approach  dates  back  to the mid-1980s, before C was standardized.
            Since then, there is a standard (and pointers are not  required  to
@@ -597,8 +578,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
            SVr4 curses uses the special value "dumb".
 
-           The  difference  between  the  two  is  that the former uses the <STRONG>gn</STRONG>
-           (<STRONG>generic_type</STRONG>) terminfo capability, while the latter does  not.   A
+           The  difference  between  the two is that the former uses the <STRONG>gn</STRONG> (-
+           <STRONG>generic_type</STRONG>) terminfo capability, while the latter  does  not.   A
            generic terminal is unsuitable for full-screen applications.
 
        <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
@@ -607,15 +588,21 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In  System  V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type and returns
-       <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to implement the X/Open Curses semantics.
+       In  SVr4,  <STRONG>set_curterm</STRONG>  returns  an  <EM>int,</EM> <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
+       implement the X/Open Curses semantics.
 
-       In System V Release 4, the third argument of <STRONG>tputs</STRONG>  has  the  type  <STRONG>int</STRONG>
-       <STRONG>(*putc)(char)</STRONG>.
+       In SVr4, the third argument of <STRONG>tputs</STRONG> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
 
-       At  least one implementation of X/Open Curses (Solaris) returns a value
-       other than <STRONG>OK</STRONG>/<STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  That returns the length of  the  string,
-       and does no error-checking.
+       At least one implementation of X/Open Curses (Solaris) returns a  value
+       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of the
+       string, and does no error checking.
+
+       X/Open Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not
+       match  the  actual terminal state, and that an application should touch
+       and refresh the window  before  resuming  normal  <EM>curses</EM>  calls.   Both
+       <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data allocated
+       in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
+       function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
        X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the curses state may not match
        the actual terminal state, and that an  application  should  touch  and
@@ -625,61 +612,61 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        a terminfo function, <STRONG>mvcur</STRONG> is really a curses  function  which  is  not
        well specified.
 
-       X/Open  states  that  the  old  location must be given for <STRONG>mvcur</STRONG>.  This
-       implementation allows the caller to use -1's for the old ordinates.  In
-       that case, the old location is unknown.
+       X/Open  Curses  states that the old location must be given for <STRONG>mvcur</STRONG> to
+       accommodate terminals that lack absolute cursor  positioning.   <EM>ncurses</EM>
+       allows the caller to use -1 for either or both old coordinates.  The -1
+       tells <EM>ncurses</EM> that the old location is unknown, and that  it  must  use
+       only  absolute  motion  (such  as <EM>cursor</EM><STRONG>_</STRONG><EM>address</EM>) rather than the least
+       costly combination of absolute and relative motion.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 introduced the terminfo feature.  Its programming manual mentioned
-       the following low-level functions.
+       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
+       mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
        <STRONG>fixterm</STRONG>     restore tty to "in curses" state
        <STRONG>gettmode</STRONG>    establish current tty modes
        <STRONG>mvcur</STRONG>       low level cursor motion
-       <STRONG>putp</STRONG>        utility function that uses <STRONG>tputs</STRONG>  to  send  characters  via
-                   <EM>putchar</EM>.
+       <STRONG>putp</STRONG>        use <STRONG>tputs</STRONG> to send characters via <EM>putchar</EM>
        <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
        <STRONG>resetty</STRONG>     reset tty flags to stored value
        <STRONG>saveterm</STRONG>    save current modes as "in curses" state
        <STRONG>savetty</STRONG>     store current tty flags
        <STRONG>setterm</STRONG>     establish terminal with given type
        <STRONG>setupterm</STRONG>   establish terminal with given type
-       <STRONG>tparm</STRONG>       instantiate a string expression with parameters
+       <STRONG>tparm</STRONG>       interpolate parameters into string capability
        <STRONG>tputs</STRONG>       apply padding information to a string
-       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but outputs through <EM>putchar</EM>
-       <STRONG>vidputs</STRONG>     output  a  string  to  put  terminal  in  a specified video
-                   attribute mode
+       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
+       <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
 
-       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
        <STRONG>tgetent</STRONG>    look up <EM>termcap</EM> entry for given <EM>name</EM>
-       <STRONG>tgetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tgetflag</STRONG>   get Boolean entry for given <EM>id</EM>
        <STRONG>tgetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tgetstr</STRONG>    get string entry for given <EM>id</EM>
        <STRONG>tgoto</STRONG>      apply parameters to given capability
-       <STRONG>tputs</STRONG>      apply  padding  to  capability,  calling  a  function to put
-                  characters
+       <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
 
-       Early terminfo programs obtained capability values  from  the  <EM>TERMINAL</EM>
+       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3  extended  terminfo  by  adding  functions  to retrieve capability
-       values (like the termcap interface), and reusing <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>:
+       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
+       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
+       <STRONG>tputs</STRONG>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-
-       <STRONG>tigetflag</STRONG>   get boolean entry for given <EM>id</EM>
+       <STRONG>tigetflag</STRONG>   get Boolean entry for given <EM>id</EM>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions which had  no
+       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -692,37 +679,37 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        saveterm    def_prog_mode
        setterm     setupterm
 
-       SVr3  kept  the  <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>.  The  latter  were  needed  to  support  padding,  and
-       handling  functions  such  as  <STRONG>vidattr</STRONG>  (which  used  more than the two
-       parameters supported by <STRONG>tgoto</STRONG>).
+       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
+       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
+       more than the two parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3  introduced  the  functions   for   switching   between   terminal
-       descriptions,   e.g.,   <STRONG>set_curterm</STRONG>.   Some  of  that  was  incremental
-       improvements to the SVr2 library:
+       SVr3   introduced   the   functions   for  switching  between  terminal
+       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
+       incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
-           <STRONG>term</STRONG> structure provided in SVr2.
+       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
+           <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   The  various  global  variables such as <STRONG>boolnames</STRONG> were mentioned in
-           the programming manual at this point,  though  the  variables  were
+       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
+           programming  manual  at  this  point, though the variables had been
            provided in SVr2.
 
-       SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
+       SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       There are other low-level functions declared in the <EM>curses</EM> header files
-       on Unix systems,  but  none  were  documented.   The  functions  marked
-       "obsolete" remained in use by the Unix <STRONG>vi(1)</STRONG> editor.
+       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
+       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+       SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 8919c674b..3d0b4abaf 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.103 2023/12/23 16:08:25 tom Exp @
+  * @Id: infocmp.1m,v 1.104 2023/12/30 21:36:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2023-12-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -62,7 +62,7 @@ <H1 class="no-header">infocmp 1m 2023-12-23 ncurses 6.4 User commands</H1>
        <STRONG>infocmp</STRONG>  can  be  used  to  compare  a binary <STRONG>terminfo</STRONG> entry with other
        terminfo entries, rewrite a <STRONG>terminfo</STRONG> description to take  advantage  of
        the  <STRONG>use=</STRONG>  terminfo field, or print out a <STRONG>terminfo</STRONG> description from the
-       binary file (<STRONG>term</STRONG>) in a variety of formats.  In all cases, the  boolean
+       binary file (<STRONG>term</STRONG>) in a variety of formats.  In all cases, the  Boolean
        fields  will be printed first, followed by the numeric fields, followed
        by the string fields.
 
@@ -80,7 +80,7 @@ <H1 class="no-header">infocmp 1m 2023-12-23 ncurses 6.4 User commands</H1>
        only  one  of  the terminals, the value returned depends on the type of
        the capability:
 
-       <STRONG>o</STRONG>   <STRONG>F</STRONG> for missing boolean variables
+       <STRONG>o</STRONG>   <STRONG>F</STRONG> for missing Boolean variables
 
        <STRONG>o</STRONG>   <STRONG>NULL</STRONG> for missing integer or string variables
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2023-12-30                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 714e302c9..75e66f4f7 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,21 +28,24 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.189 2023/12/23 16:32:37 tom Exp @
+  * @Id: ncurses.3x,v 1.192 2023/12/31 00:46:04 tom Exp @
   * X/Open Curses Issue 7 assumes some optimization will be done, but
   * does not mandate it in any way.
+  * See X/Open Curses Issue 4, Version 2, pp. 227-234.
+  * See X/Open Curses Issue 7, pp. 311-318.
+  * XXX: What's missing?  GBR counts untic(1), and that's all.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -62,7 +65,7 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20231223).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20231230).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -75,58 +78,59 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   "NOTES"  describes  matters  and  caveats  of which any user of the
            <EM>ncurses</EM> API should be aware, such as limitations on the size of  an
            underlying  integral  type  or  the  availability of a preprocessor
-           macro for a function (which prevents its address from being taken).
-           This  section  also  describes  implementation details that will be
-           significant to the programmer but which are not standardized.
-
-       <STRONG>o</STRONG>   "EXTENSIONS" presents <EM>ncurses</EM> innovations beyond the X/Open  Curses
-           standard  and/or  the  SVr4 <EM>curses</EM> implementation.  They are termed
-           <EM>extensions</EM> to indicate that they cannot be  implemented  solely  by
+           macro exclusive  of  a  function  definition  (which  prevents  its
+           address   from   being   taken).    This   section  also  describes
+           implementation details that will be significant to  the  programmer
+           but which are not standardized.
+
+       <STRONG>o</STRONG>   "EXTENSIONS"  presents <EM>ncurses</EM> innovations beyond the X/Open Curses
+           standard and/or the SVr4 <EM>curses</EM> implementation.   They  are  termed
+           <EM>extensions</EM>  to  indicate  that they cannot be implemented solely by
            using the library API, but require access to the library's internal
            state.
 
        <STRONG>o</STRONG>   "PORTABILITY" discusses matters (beyond the exercise of extensions)
-           that  should be considered when writing to a <EM>curses</EM> standard, or to
+           that should be considered when writing to a <EM>curses</EM> standard, or  to
            multiple implementations.
 
-       <STRONG>o</STRONG>   "HISTORY" examines points of detail in  <EM>ncurses</EM>  and  other  <EM>curses</EM>
+       <STRONG>o</STRONG>   "HISTORY"  examines  points  of  detail in <EM>ncurses</EM> and other <EM>curses</EM>
            implementations over the decades of their development, particularly
            where precedent or inertia have frustrated better design (and, in a
            few cases, where such inertia has been overcome).
 
-       A  program  using  these  routines  must  be  linked with the <STRONG>-lncurses</STRONG>
-       option, or (if it  has  been  generated)  with  the  debugging  library
-       <STRONG>-lncurses_g</STRONG>.   (Your  system  integrator  may also have installed these
-       libraries under the names  <STRONG>-lcurses</STRONG>  and  <STRONG>-lcurses_g</STRONG>.)   The  ncurses_g
-       library  generates  trace logs (in a file called "trace" in the current
+       A program using these  routines  must  be  linked  with  the  <STRONG>-lncurses</STRONG>
+       option,  or  (if  it  has  been  generated)  with the debugging library
+       <STRONG>-lncurses_g</STRONG>.  (Your system integrator may  also  have  installed  these
+       libraries  under  the  names  <STRONG>-lcurses</STRONG>  and <STRONG>-lcurses_g</STRONG>.)  The ncurses_g
+       library generates trace logs (in a file called "trace" in  the  current
        directory)  that  describe  curses  actions.   See  section  "ALTERNATE
        CONFIGURATIONS" below.
 
-       The   <EM>ncurses</EM>   package   supports:  overall  screen,  window  and  pad
-       manipulation; output to  windows  and  pads;  reading  terminal  input;
-       control  over terminal and <STRONG>curses</STRONG> input and output options; environment
-       query routines; color manipulation; use of soft  label  keys;  terminfo
+       The  <EM>ncurses</EM>  package  supports:  overall  screen,   window   and   pad
+       manipulation;  output  to  windows  and  pads;  reading terminal input;
+       control over terminal and <STRONG>curses</STRONG> input and output options;  environment
+       query  routines;  color  manipulation; use of soft label keys; terminfo
        capabilities; and access to low-level terminal-manipulation routines.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The  library uses the locale which the calling program has initialized.
+       The library uses the locale which the calling program has  initialized.
        That is normally done with <STRONG>setlocale(3)</STRONG>:
 
            <STRONG>setlocale(LC_ALL,</STRONG> <STRONG>"");</STRONG>
 
-       If the locale is not initialized, the library assumes  that  characters
-       are  printable  as in ISO-8859-1, to work with certain legacy programs.
-       You should initialize the locale and not rely on  specific  details  of
+       If  the  locale is not initialized, the library assumes that characters
+       are printable as in ISO-8859-1, to work with certain  legacy  programs.
+       You  should  initialize  the locale and not rely on specific details of
        the library when the locale has not been setup.
 
-       The  function  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>  must  be  called to initialize the
-       library before any of the other routines that  deal  with  windows  and
-       screens  are  used.   The  routine  <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>  must  be  called before
+       The function <STRONG>initscr</STRONG> or  <STRONG>newterm</STRONG>  must  be  called  to  initialize  the
+       library  before  any  of  the other routines that deal with windows and
+       screens are  used.   The  routine  <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>  must  be  called  before
        exiting.
 
-       To get character-at-a-time input  without  echoing  (most  interactive,
-       screen  oriented  programs want this), the following sequence should be
+       To  get  character-at-a-time  input  without echoing (most interactive,
+       screen oriented programs want this), the following sequence  should  be
        used:
 
            <STRONG>initscr();</STRONG> <STRONG>cbreak();</STRONG> <STRONG>noecho();</STRONG>
@@ -137,101 +141,101 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
            <STRONG>keypad(stdscr,</STRONG> <STRONG>TRUE);</STRONG>
 
        Before a <STRONG>curses</STRONG> program is run, the tab stops of the terminal should be
-       set  and  its initialization strings, if defined, must be output.  This
-       can be done  by  executing  the  <STRONG>tput</STRONG>  <STRONG>init</STRONG>  command  after  the  shell
-       environment  variable  <EM>TERM</EM>  has been exported.  (The BSD-style <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+       set and its initialization strings, if defined, must be  output.   This
+       can  be  done  by  executing  the  <STRONG>tput</STRONG>  <STRONG>init</STRONG>  command  after the shell
+       environment variable <EM>TERM</EM> has been exported.   (The  BSD-style  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
        utility  also  performs  this  function.)   See  subsection  "Tabs  and
        Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       A  <EM>curses</EM>  library abstracts the terminal screen by representing all or
-       part of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular  grid
-       of  character  cells,  addressed  by row and column coordinates (<EM>y</EM>, <EM>x</EM>),
+       A <EM>curses</EM> library abstracts the terminal screen by representing  all  or
+       part  of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular grid
+       of character cells, addressed by row and  column  coordinates  (<EM>y</EM>,  <EM>x</EM>),
        with the upper left corner as (0, 0).  A window called <STRONG>stdscr</STRONG>, the same
-       size  as  the terminal screen, is always available.  Create others with
+       size as the terminal screen, is always available.  Create  others  with
        <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
 
-       A <EM>curses</EM> library does not manage overlapping windows.   (See  <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
-       if  you  desire this.)  You can either use <STRONG>stdscr</STRONG> to manage one screen-
+       A  <EM>curses</EM>  library does not manage overlapping windows.  (See <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+       if you desire this.)  You can either use <STRONG>stdscr</STRONG> to manage  one  screen-
        filling window, or tile the screen into non-overlapping windows and not
-       use   <STRONG>stdscr</STRONG>  at  all.   Mixing  the  two  approaches  will  result  in
+       use  <STRONG>stdscr</STRONG>  at  all.   Mixing  the  two  approaches  will  result   in
        unpredictable, and undesired, effects.
 
-       Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
-       the  cell  within  it  at  which  the next output operation will occur.
+       Functions  permit  manipulation  of a window and the <EM>cursor</EM> identifying
+       the cell within it at which  the  next  output  operation  will  occur.
        Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
-       cursor  and  write  a  character  to  <STRONG>stdscr</STRONG>, respectively.  As a rule,
-       window-addressing functions feature names  prefixed  (or  infixed,  see
+       cursor and write a character  to  <STRONG>stdscr</STRONG>,  respectively.   As  a  rule,
+       window-addressing  functions  feature  names  prefixed (or infixed, see
        below) with "w"; these allow the user to specify a pointer to a <EM>WINDOW.</EM>
-       Counterparts not thus prefixed (or  infixed)  affect  <STRONG>stdscr</STRONG>.   Because
-       moving  the  cursor  prior  to  another  operation is so common, <EM>curses</EM>
-       generally also provides functions with a "mv" prefix as a  convenience.
-       Thus,  the library defines all of <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG>, and <STRONG>mvwaddch</STRONG>.
-       When both prefixes are present, the order  of  arguments  is  a  <EM>WINDOW</EM>
+       Counterparts  not  thus  prefixed  (or infixed) affect <STRONG>stdscr</STRONG>.  Because
+       moving the cursor prior to  another  operation  is  so  common,  <EM>curses</EM>
+       generally  also provides functions with a "mv" prefix as a convenience.
+       Thus, the library defines all of <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG>, and  <STRONG>mvwaddch</STRONG>.
+       When  both  prefixes  are  present,  the order of arguments is a <EM>WINDOW</EM>
        pointer first, then a <EM>y</EM> and <EM>x</EM> coordinate pair.
 
-       Updating   the  terminal  screen  with  every  <EM>curses</EM>  call  can  cause
-       unpleasant flicker or inefficient use of the communications channel  to
-       the  device.   Therefore,  after using <EM>curses</EM> functions to accumulate a
-       set of desired updates  that  make  sense  to  present  together,  call
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to  tell  the  library to make the user's screen look like
-       <STRONG>stdscr</STRONG>.  <EM>ncurses</EM> <EM>optimizes</EM> its output by computing a minimal number  of
-       operations  to mutate the screen from its state at the previous refresh
-       to the new one.  Effective optimization  demands  accurate  information
-       about  the  terminal  device: the management of such information is the
-       province of the <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG> API, a feature of  every  standard  <EM>curses</EM>
+       Updating  the  terminal  screen  with  every  <EM>curses</EM>  call  can   cause
+       unpleasant  flicker or inefficient use of the communications channel to
+       the device.  Therefore, after using <EM>curses</EM> functions  to  accumulate  a
+       set  of  desired  updates  that  make  sense  to present together, call
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to tell the library to make the  user's  screen  look  like
+       <STRONG>stdscr</STRONG>.   <EM>ncurses</EM> <EM>optimizes</EM> its output by computing a minimal number of
+       operations to mutate the screen from its state at the previous  refresh
+       to  the  new  one.  Effective optimization demands accurate information
+       about the terminal device: the management of such  information  is  the
+       province  of  the  <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG> API, a feature of every standard <EM>curses</EM>
        implementation.
 
        Special windows called <EM>pads</EM> may also be manipulated.  These are windows
-       that are not constrained to the size of the terminal screen  and  whose
+       that  are  not constrained to the size of the terminal screen and whose
        contents need not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
-       In  addition  to drawing characters on the screen, rendering attributes
-       and colors may be supported, causing the characters to show up in  such
-       modes  as  underlined,  in reverse video, or in color on terminals that
+       In addition to drawing characters on the screen,  rendering  attributes
+       and  colors may be supported, causing the characters to show up in such
+       modes as underlined, in reverse video, or in color  on  terminals  that
        support such display enhancements.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
-       <EM>curses</EM> predefines constants for a small set of line-drawing  and  other
-       graphics  corresponding  to  the  DEC  Alternate Character Set (ACS), a
+       <EM>curses</EM>  predefines  constants for a small set of line-drawing and other
+       graphics corresponding to the DEC  Alternate  Character  Set  (ACS),  a
        feature of VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
-       <EM>curses</EM> is implemented using the  operating  system's  terminal  driver;
-       keystroke  events are received not as scan codes but as byte sequences.
-       Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
+       <EM>curses</EM>  is  implemented  using  the operating system's terminal driver;
+       keystroke events are received not as scan codes but as byte  sequences.
+       Graphical  keycaps  (alphanumeric  and punctuation keys, and the space)
        appear  as-is.   Everything  else,  including  the  tab,  enter/return,
-       keypad, arrow, and function keys, appears as a control character  or  a
-       multibyte  <EM>escape</EM>  <EM>sequence.</EM>   <EM>curses</EM>  translates these into unique <EM>key</EM>
+       keypad,  arrow,  and function keys, appears as a control character or a
+       multibyte <EM>escape</EM> <EM>sequence.</EM>  <EM>curses</EM> translates  these  into  unique  <EM>key</EM>
        <EM>codes.</EM>  See <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></H3><PRE>
        The selection of an approprate value of <EM>TERM</EM> in the process environment
        is essential to correct <EM>curses</EM> and <EM>terminfo</EM> library operation.  A well-
-       configured system selects a correct <EM>TERM</EM> value  automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+       configured  system  selects a correct <EM>TERM</EM> value automatically; <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
        may assist with troubleshooting exotic situations.
 
-       If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
-       <EM>curses</EM> program is executing in a graphical windowing  environment,  the
-       information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
+       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
+       <EM>curses</EM>  program  is executing in a graphical windowing environment, the
+       information obtained thence overrides that obtained  by  <EM>terminfo</EM>.   An
        <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
-       checks  first  for  a  terminal  type  description  in  the location it
+       If  the  environment  variable  <EM>TERMINFO</EM>  is  defined, a <EM>curses</EM> program
+       checks first for  a  terminal  type  description  in  the  location  it
        identifies.   <EM>TERMINFO</EM>  is  useful  for  developing  experimental  type
-       descriptions  or  when  write  permission to <EM>/usr/share/terminfo</EM> is not
+       descriptions or when write permission  to  <EM>/usr/share/terminfo</EM>  is  not
        available.
 
        See section "ENVIRONMENT" below.
 
 
 </PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
-       Many <EM>curses</EM> functions have two or more versions.  Those  prefixed  with
-       "w"  require  a  window  argument.   Four  functions  prefixed with "p"
-       require a pad argument.  Those without a prefix  generally  operate  on
+       Many  <EM>curses</EM>  functions have two or more versions.  Those prefixed with
+       "w" require a  window  argument.   Four  functions  prefixed  with  "p"
+       require  a  pad  argument.  Those without a prefix generally operate on
        <STRONG>stdscr</STRONG>.
 
-       In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
+       In function synopses, <EM>ncurses</EM> man pages apply the  following  names  to
        parameters.
 
                         <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
@@ -240,55 +244,54 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
-       This manual page describes functions that appear in  any  configuration
-       of  the  library.   There  are  two  common configurations; see section
+       This  manual  page describes functions that appear in any configuration
+       of the library.  There  are  two  common  configurations;  see  section
        "ALTERNATE CONFIGURATIONS" below.
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
-                 eight-bit  characters.   It  stores a character combined with
-                 attributes in a <EM>chtype</EM> datum.
+                 eight-bit characters.  It stores a  character  combined  with
+                 attributes in a <EM>chtype</EM> datum, which is often an alias of <EM>int.</EM>
 
-                 Attributes alone (with no  corresponding  character)  can  be
-                 stored  in  variables  of  <EM>chtype</EM>  or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> type.  In either
+                 Attributes  alone  (with  no  corresponding character) can be
+                 stored in variables of <EM>chtype</EM>  or  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  type.   In  either
                  case, they are represented as an integral bit mask.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype.</EM>
 
-       <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
+       <EM>ncursesw</EM>  is  the  library  in  its "wide" configuration, which handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
                  byte-sized type) can represent.  It adds about one third more
                  calls  using  additional  data  types  that  can  store  such
                  <EM>multibyte</EM> characters.
 
-                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype.</EM>
-                          It  always  a structure type, because it stores more
-                          data than can fit into an integer.  A character code
-                          may be larger than can fit in a C <EM>char,</EM> and moreover
-                          more than one character may occupy a cell  (as  with
-                          accent  marks and other diacritics).  Each character
-                          is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM> a complex character contains one
-                          spacing  character  and  zero  or  more  non-spacing
-                          characters (see below).  Attributes and  color  data
-                          are  stored in separate fields of the structure, not
-                          combined as in <EM>chtype.</EM>
-
-                          Each cell (row and column) <EM>WINDOW</EM>  is  stored  as  a
-                          <EM>cchar</EM><STRONG>_</STRONG><EM>t.</EM>
+                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds  to the non-wide configuration's <EM>chtype.</EM>
+                          It always a structure type, because it  stores  more
+                          data  than  fits into an integral type.  A character
+                          code  may  not  be  representable  as  a  <EM>char,</EM>  and
+                          moreover  more  than one character may occupy a cell
+                          (as with accent marks and other  diacritics).   Each
+                          character  is  of  type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM> a complex character
+                          contains one spacing character and zero or more non-
+                          spacing  characters  (see  below).   Attributes  and
+                          color data are stored  in  separate  fields  of  the
+                          structure, not combined as in <EM>chtype.</EM>
+
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t.</EM>
 
                  The   <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>   and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store  and
                  retrieve the data from a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure.  The wide library
                  API  of <EM>ncurses</EM> depends on two data types standardized by ISO
                  C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype,</EM> this  may  be
-                          an  integer.  Depending on the character encoding, a
-                          wide character  may  be  <EM>spacing,</EM>  meaning  that  it
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype,</EM> it may be  an
+                          alias  of <EM>int.</EM>  Depending on the character encoding,
+                          a wide character may be  <EM>spacing,</EM>  meaning  that  it
                           occupies  a  character  cell by itself and typically
-                          accompanies  cursor   advancement   on   input,   or
-                          <EM>combining,</EM> meaning that it occupies the same cell as
-                          a  spacing  character,  is  often  regarded   as   a
-                          "modifier" of the base glyph with which it combines,
-                          and typically does not advance the cursor on input.
+                          accompanies  cursor  advancement,  or   <EM>non-spacing,</EM>
+                          meaning  that it occupies the same cell as a spacing
+                          character, is often regarded as a "modifier" of  the
+                          base  glyph  with  which  it combines, and typically
+                          does not advance the cursor.
 
                  <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
                           analogously  to the <EM>int</EM>-sized character manipulation
@@ -318,7 +321,8 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
-                    PAIR_NUMBER              <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
+                    PAIR_NUMBER              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     add_wch                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     add_wchnstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     add_wchstr               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
@@ -382,9 +386,9 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
                     exit_terminfo            <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
-
                     extended_color_content   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_pair_content    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
+
                     extended_slk_color       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     filter                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     find_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
@@ -448,10 +452,10 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insnstr                  <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     insstr                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
-
                     instr                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     intrflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     inwstr                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+
                     is_cbreak                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_cleared               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_echo                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
@@ -514,11 +518,11 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvin_wchstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvinch                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
-
                     mvinchnstr               <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinchstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinnstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvinnwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+
                     mvins_nwstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvins_wch                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
@@ -580,12 +584,12 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     nofilter                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     nonl                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noqiflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noraw                    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     notimeout                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     overlay                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     overwrite                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -646,13 +650,13 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     subpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     subwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     syncok                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     term_attrs               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termattrs                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termname                 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     tgetent                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgetflag                 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgetnum                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+
                     tgetstr                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgoto                    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tigetflag                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
@@ -712,7 +716,6 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     wbkgrndset               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wborder                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wborder_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
-
                     wchgat                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wclear                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
                     wclrtobot                <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -720,6 +723,7 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                     wcolor_set               <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wcursyncup               <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wdelch                   <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+
                     wdeleteln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     wecho_wchar              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     wechochar                <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -788,26 +792,14 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines that return an integer return <STRONG>ERR</STRONG> upon failure and an  integer
-       value other than <STRONG>ERR</STRONG> upon successful completion, unless otherwise noted
-       in the routine descriptions.
-
-       As  a  general  rule,  routines  check  for  null  pointers  passed  as
-       parameters, and handle this as an error.
-
-       All  macros  return  the  value  of  the  <STRONG>w</STRONG>  version, except <STRONG>setscrreg</STRONG>,
-       <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG>.   The  return  values  of
-       <STRONG>setscrreg</STRONG>,  <STRONG>wsetscrreg</STRONG>,  <STRONG>getyx</STRONG>,  <STRONG>getbegyx</STRONG>,  and  <STRONG>getmaxyx</STRONG> are undefined
-       (i.e., these should not be used as the right-hand  side  of  assignment
-       statements).
+       Unless otherwise noted, functions that return an integer return  <STRONG>OK</STRONG>  on
+       success and <STRONG>ERR</STRONG> on failure.  Functions that return pointers return <STRONG>NULL</STRONG>
+       on failure.  Typically, <EM>ncurses</EM> treats  a  null  pointer  passed  as  a
+       function parameter as a failure.
 
        Functions  with a "mv" prefix first perform cursor movement using <STRONG>wmove</STRONG>
-       and return an error if the position is  outside  the  window,  or  (for
-       "mvw"  functions)  if  the  <EM>WINDOW</EM> pointer is null.  Most "mv"-prefixed
-       functions (except variadic functions such  as  <STRONG>mvprintw</STRONG>)  are  provided
-       both as macros and functions.
-
-       Routines that return pointers return <STRONG>NULL</STRONG> on error.
+       and fail  if  the  position  is  outside  the  window,  or  (for  "mvw"
+       functions) if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
@@ -817,9 +809,9 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-CC-command-character"><EM>CC</EM> command-character</a></H3><PRE>
-       When  set, change occurrences of the command_character (i.e., the <STRONG>cmdch</STRONG>
-       capability) of the  loaded  terminfo  entries  to  the  value  of  this
-       variable.  Very few terminfo entries provide this feature.
+       When  set,  change  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>) capability value of
+       loaded <EM>terminfo</EM> entries to the value of this variable.  Very few  <EM>term-</EM>
+       <EM>info</EM> entries provide this feature.
 
        Because this name is also used in development environments to represent
        the C compiler's name, <EM>ncurses</EM> ignores it if it does not happen to be a
@@ -1273,19 +1265,19 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
             Those functions are described in these pages:
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG> - miscellaneous curses extensions
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG> - miscellaneous <EM>curses</EM> extensions
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG> - <STRONG>curses</STRONG> input options
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG> - <EM>curses</EM> input options
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> - low-level <STRONG>curses</STRONG> routines
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG> - low-level <EM>curses</EM> routines
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> - <STRONG>curses</STRONG> environment query routines
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG> - <EM>curses</EM> environment query routines
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG> - <STRONG>curses</STRONG> emulation of termcap
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG> - <EM>curses</EM> emulation of <EM>termcap</EM>
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> - <STRONG>curses</STRONG> interfaces to terminfo database
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> - <EM>curses</EM> interface to <EM>terminfo</EM> database
 
-            <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <STRONG>curses</STRONG> utility routines
+            <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        --with-trace
             The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
@@ -1303,105 +1295,103 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If standard output from a <EM>ncurses</EM> program is re-directed  to  something
-       which  is not a tty, screen updates will be directed to standard error.
-       This was an undocumented feature of AT&amp;T System V Release 3 curses.
+       X/Open Curses permits most functions it specifies to be made  available
+       as macros as well.  <EM>ncurses</EM> does so
+
+       <STRONG>o</STRONG>   for functions that return values via their parameters,
+
+       <STRONG>o</STRONG>   to support obsolete features,
+
+       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
+           another operation), and
 
-       See subsection  "Header  files"  below  regarding  symbols  exposed  by
+       <STRONG>o</STRONG>   a few special cases.
+
+       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
+       redirected  to  something  that  is  not a terminal device, the library
+       writes screen updates to the standard error file descriptor.  This  was
+       an undocumented feature of SVr3.
+
+       See  subsection  "Header  files"  below  regarding  symbols  exposed by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  <EM>ncurses</EM> library can be compiled with an option (<STRONG>-DUSE_GETCAP</STRONG>) that
-       falls back to the old-style /etc/termcap file  if  the  terminal  setup
-       code  cannot  find a terminfo entry corresponding to <EM>TERM</EM>.  Use of this
-       feature is not  recommended,  as  it  essentially  includes  an  entire
-       termcap  compiler  in  the <EM>ncurses</EM> startup code, at significant cost in
-       core and startup cycles.
-
-       The <EM>ncurses</EM> library includes facilities for capturing mouse  events  on
-       certain  terminals  (including  xterm).   See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual
-       page for details.
-
-       The <EM>ncurses</EM>  library  includes  facilities  for  responding  to  window
-       resizing   events,   e.g.,   when   running   in  an  xterm.   See  the
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for details.  In  addition,
-       the library may be configured with a <STRONG>SIGWINCH</STRONG> handler.
-
-       The  <EM>ncurses</EM> library extends the fixed set of function key capabilities
-       of terminals by allowing the application designer to define  additional
-       key  sequences at runtime.  See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and
-       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> manual pages for details.
-
-       The <EM>ncurses</EM> library can exploit the  capabilities  of  terminals  which
-       implement  the  ISO-6429  SGR  39  and  SGR 49 controls, which allow an
-       application to reset  the  terminal  to  its  original  foreground  and
-       background  colors.   From  the  users' perspective, the application is
-       able  to  draw  colored  text  on  a  background  whose  color  is  set
-       independently,  providing better control over color contrasts.  See the
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details.
-
-       The <EM>ncurses</EM> library  includes  a  function  for  directing  application
-       output  to  a  printer  attached  to  the  terminal  device.   See  the
-       <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
+       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
+       terminals, including <EM>xterm;</EM> see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
+       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
+       when running in a GUI terminal emulator application such as <EM>xterm;</EM>  see
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <EM>ncurses</EM> library is intended to be BASE-level  conformant  with  XSI
-       Curses.    The  EXTENDED  XSI  Curses  functionality  (including  color
-       support) is supported.
+       <EM>ncurses</EM> allows an application to query the terminal for the presence of
+       a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
-       A small number of local differences (that  is,  individual  differences
-       between  the XSI Curses and <EM>ncurses</EM> calls) are described in <STRONG>PORTABILITY</STRONG>
-       sections of the library man pages.
+       <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
+       X/Open   Curses  by  allowing  the  application  programmer  to  define
+       additional   key   sequences   at    runtime;    see    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
+       <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
+       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
+       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From a user's perspective, the application is  able
+       to  draw colored text on a background whose color is set independently,
+       providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-</PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
-       some of the SVr4 documentation.
+       An <EM>ncurses</EM> application can choose  to  hide  the  internal  details  of
+       <EM>WINDOW</EM>   structures,   instead   using   accessor   functions  such  as
+       <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       Unlike  other  implementations,  this  one  checks  parameters  such as
-       pointers to <EM>WINDOW</EM> structures to ensure they are not  null.   The  main
-       reason  for  providing  this  behavior  is  to guard against programmer
-       error.  The standard interface does not provide a way for  the  library
-       to  tell an application which of several possible errors were detected.
-       Relying on this (or some other) extension  will  adversely  affect  the
-       portability of curses applications.
+       <EM>ncurses</EM> enables an  application  to  direct  application  output  to  a
+       printer attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
+
+       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
+       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that  can  gather  color  information  from  them  when many colors are
+       supported.
+
+       Some extensions are only available if <EM>ncurses</EM> is  compiled  to  support
+       them; see section "ALTERNATE CONFIGURATIONS" above.
 
+       <STRONG>o</STRONG>   Rudimentary   support   for   multi-threaded  applications  may  be
+           available; see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-</PRE><H3><a name="h3-Extensions-Versus-Portability">Extensions Versus Portability</a></H3><PRE>
-       Most  of the extensions provided by <EM>ncurses</EM> have not been standardized.
-       Some  have  been  incorporated  into  other  implementations,  such  as
-       PDCurses or NetBSD curses.  Here are a few to consider:
+       <STRONG>o</STRONG>   Functions that ease the  management  of  multiple  screens  can  be
+           exposed; see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   The routine <STRONG>has_key</STRONG> is not part of XPG4, nor is it present in SVr4.
-           See the <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> manual page for details.
+       <STRONG>o</STRONG>   The compiler option <STRONG>-DUSE_GETCAP</STRONG> causes the library to fall back to
+           reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
+           <EM>info</EM>  entry  corresponding  to  <EM>TERM.</EM>   Use  of this feature is not
+           recommended, as it essentially includes an entire <EM>termcap</EM>  compiler
+           in  the  <EM>ncurses</EM>  startup  code,  at  a  cost  in  memory usage and
+           application launch latency.
 
-       <STRONG>o</STRONG>   The routine <STRONG>slk_attr</STRONG> is not part of XPG4,  nor  is  it  present  in
-           SVr4.  See the <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG> manual page for details.
+       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
+       Individual man pages indicate where this is the case.
 
-       <STRONG>o</STRONG>   The  routines  <STRONG>getmouse</STRONG>,  <STRONG>mousemask</STRONG>, <STRONG>ungetmouse</STRONG>, <STRONG>mouseinterval</STRONG>, and
-           <STRONG>wenclose</STRONG> relating to mouse interfacing are not part  of  XPG4,  nor
-           are  they  present in SVr4.  See the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for
-           details.
 
-       <STRONG>o</STRONG>   The  routine  <STRONG>mcprint</STRONG>  was  not  present  in  any  previous  curses
-           implementation.  See the <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open Curses defines two levels of conformance, "base" and "enhanced".
+       The latter includes several additional features, such as wide-character
+       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
+       Curses, and supports nearly all its enhanced features.
 
-       <STRONG>o</STRONG>   The routine <STRONG>wresize</STRONG> is not part of XPG4, nor is it present in SVr4.
-           See the <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual page for details.
+       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
+       "PORTABILITY" sections of applicable man pages.
 
-       <STRONG>o</STRONG>   The  <EM>WINDOW</EM>  structure's  internal  details  can  be  hidden   from
-           application  programs.   See  <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG> for the discussion of
-           <STRONG>is_scrollok</STRONG>, etc.
 
-       <STRONG>o</STRONG>   This  implementation  can  be  configured  to  provide  rudimentary
-           support  for multi-threaded applications.  See <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> for
-           details.
+</PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
+       In  many cases, X/Open Curses is vague about error conditions, omitting
+       some of the SVr4 documentation.
 
-       <STRONG>o</STRONG>   This implementation can also be configured  to  provide  a  set  of
-           functions  which  improve  the  ability to manage multiple screens.
-           See <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> for details.
+       Unlike other  implementations,  this  one  checks  parameters  such  as
+       pointers  to  <EM>WINDOW</EM>  structures to ensure they are not null.  The main
+       reason for providing this  behavior  is  to  guard  against  programmer
+       error.   The  standard interface does not provide a way for the library
+       to tell an application which of several possible errors were  detected.
+       Relying  on  this  (or  some other) extension will adversely affect the
+       portability of curses applications.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
@@ -1514,7 +1504,7 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2023-12-30                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1563,7 +1553,6 @@ <H1 class="no-header">ncurses 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Error-Checking">Error Checking</a></li>
-<li><a href="#h3-Extensions-Versus-Portability">Extensions Versus Portability</a></li>
 <li><a href="#h3-Padding-Differences">Padding Differences</a></li>
 <li><a href="#h3-Header-Files">Header Files</a></li>
 </ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 53b9508a6..e460448cb 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,20 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.41 2023/12/23 16:27:25 tom Exp @
+  * @Id: scr_dump.5,v 1.42 2023/12/30 22:06:36 tom Exp @
+  *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-12-23 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2023-12-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2023-12-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -50,10 +51,6 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
        scr_dump - <EM>curses</EM> screen dump
 
 
-</PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>scr_dump</STRONG>
-
-
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The  curses library provides applications with the ability to write the
        contents of a window to an external file using <STRONG>scr_dump</STRONG> or <STRONG>putwin</STRONG>,  and
@@ -129,48 +126,34 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       There  is  no  standard  format for <STRONG>putwin</STRONG>.  This section gives a brief
-       description of the existing formats.
+       There is no standard format for <EM>curses</EM> screen dumps.  A brief survey of
+       the existing implementations follows.
 
 
 </PRE><H3><a name="h3-X_Open-Curses">X/Open Curses</a></H3><PRE>
-       Refer to <EM>X/Open</EM> <EM>Curses,</EM> <EM>Issue</EM> <EM>7</EM> (2009).
-
-       X/Open's documentation for <EM>enhanced</EM> <EM>curses</EM> says only:
+       X/Open Curses, Issue 7 specifies little.  It  says  (boldface  emphasis
+       added)
 
-          The <STRONG>getwin(</STRONG> <STRONG>)</STRONG> function reads window-related data stored in the  file
-          by  <EM>putwin(</EM> <EM>)</EM>.   The  function  then  creates  and initializes a new
+          "[t]he  <EM>getwin()</EM>  function  reads  window-related data stored in the
+          file by <EM>putwin()</EM>.  The function then creates and initializes  a  new
           window using that data.
 
-          The <STRONG>putwin(</STRONG> <STRONG>)</STRONG> function writes all data associated with <EM>win</EM> into  the
-          <STRONG>stdio(3)</STRONG>  stream to which <EM>filep</EM> points, using an <STRONG>unspecified</STRONG> <STRONG>format</STRONG>.
-          This information can be retrieved later using <STRONG>getwin(</STRONG> <STRONG>)</STRONG>.
-
-       In the mid-1990s when the X/Open Curses  document  was  written,  there
-       were  still  systems  using older, less capable curses libraries (aside
-       from the BSD curses library which was not relevant to X/Open because it
-       did not meet the criteria for <EM>base</EM> <EM>curses</EM>).  The document explained the
-       term "enhanced" as follows:
-
-          <STRONG>o</STRONG>   Shading is used to identify  <EM>X/Open</EM>  <EM>Enhanced</EM>  <EM>Curses</EM>  material,
-              relating to interfaces included to provide enhanced capabilities
-              for applications originally written to be  compiled  on  systems
-              based  on  the  Unix  operating system.  Therefore, the features
-              described may not be present on systems that conform to <STRONG>XPG4</STRONG>  <STRONG>or</STRONG>
-              <STRONG>to</STRONG>  <STRONG>earlier</STRONG>  <STRONG>XPG</STRONG>  <STRONG>releases</STRONG>.   The  relevant  reference pages may
-              provide additional or more specific portability  warnings  about
-              use of the material.
+          The  <EM>putwin()</EM>  function writes all data associated with <EM>win</EM> into the
+          <EM>stdio</EM> stream to which <EM>filep</EM> points,  using  an  <STRONG>unspecified</STRONG>  <STRONG>format</STRONG>.
+          This information can be retrieved later using <EM>getwin()</EM>."
 
-       In  the foregoing, emphasis was added to <STRONG>unspecified</STRONG> <STRONG>format</STRONG> and to <STRONG>XPG4</STRONG>
-       <STRONG>or</STRONG> <STRONG>to</STRONG> <STRONG>earlier</STRONG> <STRONG>XPG</STRONG> <STRONG>releases</STRONG>, for clarity.
+       In  the  mid-1990s  when  the X/Open Curses document was written, there
+       were still System V systems using older, less capable <EM>curses</EM> libraries.
+       BSD  <EM>curses</EM>  was  not  relevant  to  X/Open because it did not meet the
+       criteria for base-level conformance; see <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-Unix-System-V">Unix System V</a></H3><PRE>
-       Unix System V curses identified the file format  by  writing  a  "magic
-       number" at the beginning of the dump.  The <EM>WINDOW</EM> data and the lines of
-       text follow, all in binary form.
+</PRE><H3><a name="h3-System-V">System V</a></H3><PRE>
+       System V <EM>curses</EM> identified the file format by writing a "magic  number"
+       at  the  beginning  of the dump.  The <EM>WINDOW</EM> data and the lines of text
+       follow, all in binary form.
 
-       The Solaris curses source has these definitions:
+       Solaris <EM>curses</EM> has the following definitions.
 
            /* terminfo magic number */
            #define MAGNUM  0432
@@ -180,28 +163,28 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
            #define SVR3_DUMP_MAGIC_NUMBER  0434
 
        That is, the feature was likely introduced in SVr2 (1984), and improved
-       in SVr3 (1987).  The Solaris curses source has no magic number for SVr4
-       (1989).  Other operating systems (AIX and HP-UX)  use  a  magic  number
-       which would correspond to this definition:
+       in  SVr3  (1987).   Solaris <EM>curses</EM> has no magic number for SVr4 (1989).
+       Other System V operating systems (AIX and HP-UX)  use  a  magic  number
+       that would correspond to the following.
 
            /* curses screen dump magic number */
            #define SVR4_DUMP_MAGIC_NUMBER  0435
 
-       That  octal number in bytes is 001, 035.  Because most Unix vendors use
-       big-endian hardware, the magic number is written  with  the  high-order
-       byte first, e.g.,
+       That  octal  number in bytes is 001, 035.  Because most Unix vendors at
+       the time used big-endian hardware, the magic number is written with the
+       high-order byte first.
 
            \001\035
 
-       After  the magic number, the <EM>WINDOW</EM> structure and line-data are written
-       in binary format.  While the magic number used by the Unix systems  can
-       be seen using <STRONG>od(1)</STRONG>, none of the Unix systems documents the format used
-       for screen-dumps.
+       After  the magic number, the <EM>WINDOW</EM> structure and line data are written
+       in binary format.  While the magic number used by these systems can  be
+       observed  with <STRONG>od(1)</STRONG>, none of them documents the format used for screen
+       dumps.
 
-       The Unix systems  do  not  use  identical  formats.   While  collecting
-       information  for  for  this  manual  page,  the <EM>savescreen</EM> test-program
-       produced dumps of different size (all  on  64-bit  hardware,  on  40x80
-       screens):
+       Nor do they use an identical format, even  with  the  System V  family.
+       The <EM>ncurses</EM> <EM>savescreen</EM> test program was used to collect information for
+       this manual page.  It produced dumps of different size (all  on  64-bit
+       hardware, on 40x80 screens):
 
        <STRONG>o</STRONG>   AIX (51817 bytes)
 
@@ -213,53 +196,54 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-Solaris">Solaris</a></H3><PRE>
-       As  noted  above,  Solaris  curses has no magic number corresponding to
-       SVr4 curses.  This is odd since Solaris was the first operating  system
-       to pass the SVr4 guidelines.  Solaris has two versions of curses:
+       As  noted  above,  Solaris  <EM>curses</EM> has no magic number corresponding to
+       SVr4 <EM>curses.</EM>  This is odd, since Solaris was the first operating system
+       to meet the SVr4 guidelines.  Solaris furthermore supplies two versions
+       of <EM>curses.</EM>
 
-       <STRONG>o</STRONG>   The default curses library uses the SVr3 magic number.
+       <STRONG>o</STRONG>   The default <EM>curses</EM> library uses the SVr3 magic number.
 
-       <STRONG>o</STRONG>   There  is  an  alternate  curses library in <STRONG>/usr/xpg4</STRONG>.  This uses a
-           textual format with no magic number.
+       <STRONG>o</STRONG>   An alternate <EM>curses</EM> library (which we term <EM>xcurses),</EM>  available  in
+           <EM>/usr/xpg4,</EM> uses a textual format with no magic number.
 
-           According to the copyright notice, the <EM>xpg4</EM> Solaris curses  library
-           was developed by MKS (Mortice Kern Systems) from 1990 to 1995.
+           According  to  its  copyright  notice,  this  <EM>xcurses</EM>  library  was
+           developed by MKS (Mortice Kern Systems) from 1990 to 1995.
 
-           Like  ncurses6,  there  is  a  file-header with parameters.  Unlike
-           ncurses6, the contents of the window are  written  piecemeal,  with
-           coordinates  and  attributes  for  each  chunk  of text rather than
+           Like ncurses6,  it  includes  a  header  with  parameters.   Unlike
+           ncurses6,  the  contents  of the window are written piecemeal, with
+           coordinates and attributes for  each  chunk  of  text  rather  than
            writing the whole window from top to bottom.
 
 
 </PRE><H3><a name="h3-PDCurses">PDCurses</a></H3><PRE>
-       PDCurses added support for screen dumps in version  2.7  (2005).   Like
-       Unix  System V  and ncurses5, it writes the <EM>WINDOW</EM> structure in binary,
-       but begins the file with its three-byte identifier "PDC", followed by a
-       one-byte version, e.g.,
+       <EM>PDCurses</EM>  added  support  for screen dumps in version 2.7 (2005).  Like
+       System V and ncurses5, it writes the <EM>WINDOW</EM> structure  in  binary,  but
+       begins  the  file  with  its three-byte identifier "PDC", followed by a
+       single-byte version number.
 
                 "PDC\001"
 
 
 </PRE><H3><a name="h3-NetBSD">NetBSD</a></H3><PRE>
-       As  of  April  2017,  NetBSD  curses  does  not  support  <STRONG>scr_dump</STRONG>  and
+       As  of  April  2017,  NetBSD  <EM>curses</EM>  does  not  support  <STRONG>scr_dump</STRONG>  and
        <STRONG>scr_restore</STRONG> (or <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG>), although it has <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>.
 
-       Like ncurses5, NetBSD <STRONG>putwin</STRONG> does not identify its dumps with a  useful
+       Like  ncurses5, NetBSD <STRONG>putwin</STRONG> does not identify its dumps with a useful
        magic number.  It writes
 
-       <STRONG>o</STRONG>   the curses shared library major and minor versions as the first two
-           bytes (e.g., 7 and 1),
+       <STRONG>o</STRONG>   the <EM>curses</EM> shared library major and minor versions as the first two
+           bytes (for example, 7 and 1),
 
        <STRONG>o</STRONG>   followed by a binary dump of the <EM>WINDOW</EM>,
 
-       <STRONG>o</STRONG>   some data for wide-characters referenced by the  <EM>WINDOW</EM>  structure,
+       <STRONG>o</STRONG>   some  data  for wide characters referenced by the <EM>WINDOW</EM> structure,
            and
 
        <STRONG>o</STRONG>   finally, lines as done by other implementations.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
-       Given  a  simple  program  which writes text to the screen (and for the
+       Given a simple program which writes text to the  screen  (and  for  the
        sake of example, limiting the screen-size to 10x20):
 
            #include &lt;curses.h&gt;
@@ -317,13 +301,13 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   The actual color pair values are not written to the file.
 
-       <STRONG>o</STRONG>   All  characters  are  shown  in  printable form; spaces are "\s" to
+       <STRONG>o</STRONG>   All characters are shown in printable  form;  spaces  are  "\s"  to
            ensure they are not overlooked.
 
-       <STRONG>o</STRONG>   Attributes are written in escaped curly  braces,  e.g.,  "\{BOLD}",
+       <STRONG>o</STRONG>   Attributes  are  written  in escaped curly braces, e.g., "\{BOLD}",
            and may include a color pair (C1 or C2 in this example).
 
-       <STRONG>o</STRONG>   The  parameters  in  the  header  are  written out only if they are
+       <STRONG>o</STRONG>   The parameters in the header are  written  out  only  if  they  are
            nonzero.  When reading back, order does not matter.
 
        Running the same program with Solaris <EM>xpg4</EM> curses gives this dump:
@@ -362,12 +346,12 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
            9,19,0,0,
            CUR=11,5
 
-       Solaris <STRONG>getwin</STRONG> requires that all parameters are  present,  and  in  the
-       same  order.  The <EM>xpg4</EM> curses library does not know about the <STRONG>bce</STRONG> (back
+       Solaris  <STRONG>getwin</STRONG>  requires  that  all parameters are present, and in the
+       same order.  The <EM>xpg4</EM> curses library does not know about the <STRONG>bce</STRONG>  (back
        color erase) capability, and does not color the window background.
 
-       On the other  hand,  the  SVr4  curses  library  does  know  about  the
-       background  color.   However,  its screen dumps are in binary.  Here is
+       On  the  other  hand,  the  SVr4  curses  library  does  know about the
+       background color.  However, its screen dumps are in  binary.   Here  is
        the corresponding dump (using "od -t x1"):
 
            0000000 1c 01 c3 d6 f3 58 05 00 0b 00 0a 00 14 00 00 00
@@ -407,12 +391,11 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2023-12-30                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
-<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-ncurses6">ncurses6</a></li>
@@ -422,7 +405,7 @@ <H1 class="no-header">scr_dump 5 2023-12-23 ncurses 6.4 File formats</H1>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-X_Open-Curses">X/Open Curses</a></li>
-<li><a href="#h3-Unix-System-V">Unix System V</a></li>
+<li><a href="#h3-System-V">System V</a></li>
 <li><a href="#h3-Solaris">Solaris</a></li>
 <li><a href="#h3-PDCurses">PDCurses</a></li>
 <li><a href="#h3-NetBSD">NetBSD</a></li>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 4509b95a6..6c5b96a6b 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.69 2023/12/23 16:08:25 tom Exp @
+  * @Id: term.5,v 1.70 2023/12/30 21:36:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-12-23 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2023-12-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2023-12-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
             b) <EM>terminal</EM> <EM>names</EM>,
 
-            c) <EM>boolean</EM> <EM>flags</EM>,
+            c) <EM>Boolean</EM> <EM>flags</EM>,
 
             d) <EM>numbers</EM>,
 
@@ -114,7 +114,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
             (2) the size, in bytes, of the <EM>terminal</EM> <EM>names</EM> section;
 
-            (3) the number of bytes in the <EM>boolean</EM> <EM>flags</EM> section;
+            (3) the number of bytes in the <EM>Boolean</EM> <EM>flags</EM> section;
 
             (4) the number of short integers in the <EM>numbers</EM> section;
 
@@ -122,7 +122,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
             (6) the size, in bytes, of the <EM>string</EM> <EM>table</EM>.
 
-       The  capabilities  in  the <EM>boolean</EM> <EM>flags</EM>, <EM>numbers</EM>, and <EM>strings</EM> sections
+       The  capabilities  in  the <EM>Boolean</EM> <EM>flags</EM>, <EM>numbers</EM>, and <EM>strings</EM> sections
        are in the same order as the file &lt;term.h&gt;.
 
        Short integers are signed, in the range  -32768  to  32767.   They  are
@@ -145,13 +145,13 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
            the corresponding table.
 
            The integer value -1 is represented by two bytes 0377, 0377.
-           Absent boolean values are represented by the byte 0 (false).
+           Absent Boolean values are represented by the byte 0 (false).
 
        <STRONG>o</STRONG>   If  a capability has been canceled from this terminal, tic stores a
            -2 in the corresponding table.
 
            The integer value -2 is represented by two bytes 0377, 0376.
-           The boolean value -2 is represented by the byte 0376.
+           The Boolean value -2 is represented by the byte 0376.
 
        <STRONG>o</STRONG>   Other negative values are illegal.
 
@@ -160,18 +160,18 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
        the terminal, separated by  the  "|"  character.   The  <EM>terminal</EM>  <EM>names</EM>
        section is terminated with an ASCII NUL character.
 
-       The  <EM>boolean</EM>  <EM>flags</EM>  section  has  one  byte  for  each  flag.  Boolean
+       The  <EM>Boolean</EM>  <EM>flags</EM>  section  has  one  byte  for  each  flag.  Boolean
        capabilities are either 1 or 0 (true or false) according to whether the
        terminal supports the given capability or not.
 
-       Between  the  <EM>boolean</EM> <EM>flags</EM> section and the <EM>number</EM> section, a null byte
+       Between  the  <EM>Boolean</EM> <EM>flags</EM> section and the <EM>number</EM> section, a null byte
        will be inserted, if necessary,  to  ensure  that  the  <EM>number</EM>  section
        begins  on  an even byte This is a relic of the PDP-11's word-addressed
        architecture, originally designed to avoid traps induced by  addressing
        a  word  on  an odd byte boundary.  All short integers are aligned on a
        short word boundary.
 
-       The <EM>numbers</EM> section is similar to  the  <EM>boolean</EM>  <EM>flags</EM>  section.   Each
+       The <EM>numbers</EM> section is similar to  the  <EM>Boolean</EM>  <EM>flags</EM>  section.   Each
        capability  takes  up two bytes, and is stored as a little-endian short
        integer.
 
@@ -190,7 +190,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
        The previous section describes the conventional terminfo binary format.
        With  some  minor variations of the offsets (see PORTABILITY), the same
        binary format is used in all modern Unix systems.  Each system  uses  a
-       predefined set of boolean, number or string capabilities.
+       predefined set of Boolean, number or string capabilities.
 
        The <EM>ncurses</EM> libraries and applications support extended terminfo binary
        format, allowing users to  define  capabilities  which  are  loaded  at
@@ -202,7 +202,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
        First, it reads the extended header (5 short integers):
 
-            (1)  count of extended boolean capabilities
+            (1)  count of extended Boolean capabilities
 
             (2)  count of extended numeric capabilities
 
@@ -220,7 +220,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
        The  extended  string  table  contains  values for string capabilities.
        After the end of these values, it contains the names for  each  of  the
-       extended  capabilities  in  order,  e.g.,  booleans,  then  numbers and
+       extended  capabilities  in  order,  e.g.,  Booleans,  then  numbers and
        finally strings.
 
        By storing terminal descriptions  in  this  way,  <EM>ncurses</EM>  is  able  to
@@ -267,7 +267,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
        (resulting in missing entries).  The routine <STRONG>setupterm</STRONG> 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, number, and string capabilities.
+       the lists of Boolean, number, and string capabilities.
 
 
 </PRE><H3><a name="h3-Binary-Format">Binary Format</a></H3><PRE>
@@ -399,7 +399,7 @@ <H1 class="no-header">term 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-23                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2023-12-30                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 813b96f94..fc98e7fab 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.59 2023/12/23 23:44:58 tom Exp @
+  * @Id: terminfo.head,v 1.60 2023/12/30 22:21:45 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.140 2023/12/23 16:23:35 tom Exp @
+  * @Id: terminfo.tail,v 1.141 2023/12/30 21:36:32 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -73,12 +73,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-12-23 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2023-12-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231223).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231230).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -184,11 +184,11 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        features.
 
        After the first field (giving the name(s) of the terminal entry), there
-       should be one or more <EM>capability</EM> fields.  These are boolean, numeric or
+       should be one or more <EM>capability</EM> fields.  These are Boolean, numeric or
        string names with corresponding values:
 
        <STRONG>o</STRONG>   Boolean capabilities are true  when  present,  false  when  absent.
-           There is no explicit value for boolean capabilities.
+           There is no explicit value for Boolean capabilities.
 
        <STRONG>o</STRONG>   Numeric  capabilities  have  a  "#"  following  the  name,  then an
            unsigned decimal integer value.
@@ -282,7 +282,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        (#<EM>i</EM>)   indicates the <EM>i</EM>th parameter.
 
 
-       These are the boolean capabilities:
+       These are the Boolean capabilities:
 
 
                   <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
@@ -1146,7 +1146,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        capabilities.  The <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG>  option  for
        this purpose.  When <STRONG>-x</STRONG> is set, <STRONG>tic</STRONG> treats unknown capabilities as user-
        defined.  That is, if <STRONG>tic</STRONG> encounters a capability name  which  it  does
-       not  recognize, it infers its type (boolean, number or string) from the
+       not  recognize, it infers its type (Boolean, number or string) from the
        syntax and makes an extended table  entry  for  that  capability.   The
        <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  makes  this information conditionally
        available to applications.   The  <EM>ncurses</EM>  library  provides  the  data
@@ -1155,7 +1155,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   User-defined  capability  strings  whose  name  begins with "k" are
            treated as function keys.
 
-       <STRONG>o</STRONG>   The types (boolean,  number,  string)  determined  by  <STRONG>tic</STRONG>  can  be
+       <STRONG>o</STRONG>   The types (Boolean,  number,  string)  determined  by  <STRONG>tic</STRONG>  can  be
            inferred by successful calls on <STRONG>tigetflag</STRONG>, etc.
 
        <STRONG>o</STRONG>   If the capability name happens to be two characters, the capability
@@ -1165,7 +1165,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        predefined  set of capabilities, in practice it has been limited to the
        capabilities 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
+       limited to Booleans and numbers to avoid running  past  the  1023  byte
        limit  assumed  by  termcap implementations and their applications.  In
        particular, providing extended sets  of  function  keys  (past  the  60
        numbered keys and the handful of special named keys) is best done using
@@ -1786,7 +1786,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
        and is often faster even on terminals with those features.
 
-       The  boolean  <STRONG>non_dest_scroll_region</STRONG>  should  be  set if each scrolling
+       The  Boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
@@ -2228,7 +2228,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The  boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
+       The  Boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
        etc., work ordinarily in the status line.
 
        The <EM>ncurses</EM> implementation does not yet use any of these  capabilities.
@@ -2329,7 +2329,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
        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 <STRONG>bce</STRONG>.
+       these should have the Boolean capability <STRONG>bce</STRONG>.
 
        While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
        inability  of  some  devices  to  set  foreground and background colors
@@ -2394,7 +2394,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
            indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           interpreted  as  RGB  (Red,  Green,  Blue)  values.  If the Boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
@@ -2694,7 +2694,7 @@ <H1 class="no-header">terminfo 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-23                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2023-12-30                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 50fc7fb0e..1d5b8f476 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.105 2023/12/23 16:08:25 tom Exp @
+  * @Id: tic.1m,v 1.106 2023/12/30 21:36:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2023-12-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2023-12-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -309,7 +309,7 @@ <H1 class="no-header">tic 1m 2023-12-23 ncurses 6.4 User commands</H1>
 
        <STRONG>-x</STRONG>   Treat unknown capabilities  as  user-defined  (see  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
             That  is,  if  you  supply  a  capability  name which <STRONG>tic</STRONG> does not
-            recognize, it will infer its type (boolean, number or string) from
+            recognize, it will infer its type (Boolean, number or 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 keys.
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2023-12-30                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index c313b5af7..ecca62eb5 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.96 2023/12/23 20:55:36 tom Exp @
+  * @Id: tput.1,v 1.97 2023/12/31 00:16:41 tom Exp @
   * longname was added in October 1989.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -36,12 +36,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2023-12-30 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -53,7 +53,7 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <EM>cap-code</EM> [<EM>parameter</EM> ...]
+       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] {<EM>cap-code</EM> [<EM>parameter</EM> ...]} ...
 
        <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
 
@@ -200,113 +200,124 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
               Otherwise, <STRONG>reset</STRONG> acts identically to <STRONG>init</STRONG>.
 
        <STRONG>longname</STRONG>
-              If the terminal database is present and an entry for the  user's
+              A terminfo entry begins with one  or  more  names  by  which  an
+              application  can refer to the entry, before the list of terminal
+              capabilities.   The  names  are  separated  by  "|"  characters.
+              X/Open  states  that  the  last name is the "long name" and also
+              that it may include blanks.
+
+              <STRONG>tic</STRONG>  warns  if  the  last  name  does  not  include  blanks,  to
+              accommodate  old terminfo entries which treated the long name as
+              an optional feature.  The long name is often referred to as  the
+              description field.
+
+              If  the terminal database is present and an entry for the user's
               terminal exists (see <STRONG>-T</STRONG> <EM>type</EM> above), <STRONG>tput</STRONG> reports the terminal's
-              description (or "long name") to the standard output,  without  a
-              trailing newline.  See <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
+              description  (or  "long name") to the standard output, without a
+              trailing newline.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Aliases">Aliases</a></H3><PRE>
-       <STRONG>tput</STRONG>  handles  the  <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG> commands specially: it allows
+       <STRONG>tput</STRONG> handles the <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG> commands  specially:  it  allows
        for the possibility that it is invoked by a link with those names.
 
-       If <STRONG>tput</STRONG> is invoked by a link named <STRONG>reset</STRONG>, this has the same  effect  as
-       <STRONG>tput</STRONG>  <STRONG>reset</STRONG>.   The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link named <STRONG>reset</STRONG>
+       If  <STRONG>tput</STRONG>  is invoked by a link named <STRONG>reset</STRONG>, this has the same effect as
+       <STRONG>tput</STRONG> <STRONG>reset</STRONG>.  The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link  named  <STRONG>reset</STRONG>
        specially.
 
        Before <EM>ncurses</EM> 6.1, the two utilities were different from each other:
 
-       <STRONG>o</STRONG>   <STRONG>tset</STRONG> utility reset the terminal modes and special  characters  (not
+       <STRONG>o</STRONG>   <STRONG>tset</STRONG>  utility  reset the terminal modes and special characters (not
            done with <STRONG>tput</STRONG>).
 
-       <STRONG>o</STRONG>   On  the  other hand, <STRONG>tset</STRONG>'s repertoire of terminal capabilities for
-           resetting the terminal was more limited, i.e., only  <STRONG>reset_1string</STRONG>,
-           <STRONG>reset_2string</STRONG>  and  <STRONG>reset_file</STRONG>  in  contrast  to  the tab-stops and
+       <STRONG>o</STRONG>   On the other hand, <STRONG>tset</STRONG>'s repertoire of terminal  capabilities  for
+           resetting  the terminal was more limited, i.e., only <STRONG>reset_1string</STRONG>,
+           <STRONG>reset_2string</STRONG> and <STRONG>reset_file</STRONG>  in  contrast  to  the  tab-stops  and
            margins which are set by this utility.
 
-       <STRONG>o</STRONG>   The <STRONG>reset</STRONG> program is usually an alias for  <STRONG>tset</STRONG>,  because  of  this
+       <STRONG>o</STRONG>   The  <STRONG>reset</STRONG>  program  is  usually an alias for <STRONG>tset</STRONG>, because of this
            difference with resetting terminal modes and special characters.
 
-       With  the  changes  made  for <EM>ncurses</EM> 6.1, the <EM>reset</EM> feature of the two
+       With the changes made for <EM>ncurses</EM> 6.1, the <EM>reset</EM>  feature  of  the  two
        programs is (mostly) the same.  A few differences remain:
 
-       <STRONG>o</STRONG>   The <STRONG>tset</STRONG> program waits  one  second  when  resetting,  in  case  it
+       <STRONG>o</STRONG>   The  <STRONG>tset</STRONG>  program  waits  one  second  when  resetting, in case it
            happens to be a hardware terminal.
 
-       <STRONG>o</STRONG>   The  two  programs  write  the  terminal  initialization strings to
-           different streams (i.e.,  the  standard  error  for  <STRONG>tset</STRONG>  and  the
+       <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
+           different  streams  (i.e.,  the  standard  error  for  <STRONG>tset</STRONG> and the
            standard output for <STRONG>tput</STRONG>).
 
-           <STRONG>Note:</STRONG>   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
+           <STRONG>Note:</STRONG>  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.
 
-       If <STRONG>tput</STRONG> is invoked by a link named <STRONG>init</STRONG>, this has the  same  effect  as
+       If  <STRONG>tput</STRONG>  is  invoked by a link named <STRONG>init</STRONG>, this has the same effect as
        <STRONG>tput</STRONG> <STRONG>init</STRONG>.  Again, you are less likely to use that link because another
        program named <STRONG>init</STRONG> has a more well-established use.
 
 
 </PRE><H3><a name="h3-Terminal-Size">Terminal Size</a></H3><PRE>
        Besides  the  special  commands  (e.g.,  <STRONG>clear</STRONG>),  tput  treats  certain
-       terminfo   capabilities   specially:   <STRONG>lines</STRONG>   and  <STRONG>cols</STRONG>.   tput  calls
+       terminfo  capabilities  specially:  <STRONG>lines</STRONG>   and   <STRONG>cols</STRONG>.    tput   calls
        <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to obtain the terminal size:
 
        <STRONG>o</STRONG>   first, it gets the size from the terminal database (which generally
-           is  not  provided  for terminal emulators which do not have a fixed
+           is not provided for terminal emulators which do not  have  a  fixed
            window size)
 
-       <STRONG>o</STRONG>   then it asks the operating system for the  terminal's  size  (which
+       <STRONG>o</STRONG>   then  it  asks  the operating system for the terminal's size (which
            generally works, unless connecting via a serial line which does not
            support <EM>NAWS</EM>: negotiations about window size).
 
-       <STRONG>o</STRONG>   finally, it inspects the environment variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM>
+       <STRONG>o</STRONG>   finally,  it  inspects  the environment variables <EM>LINES</EM> and <EM>COLUMNS</EM>
            which may override the terminal size.
 
-       If  the  <STRONG>-T</STRONG>  option  is given tput ignores the environment variables by
-       calling  <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system   (or
+       If the <STRONG>-T</STRONG> option is given tput ignores  the  environment  variables  by
+       calling   <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system  (or
        finally, the terminal database).
 
 
 </PRE><H2><a name="h2-EXIT-STATUS">EXIT STATUS</a></H2><PRE>
        If the <STRONG>-S</STRONG> option is used, <STRONG>tput</STRONG> checks for errors from each line, and if
-       any errors are found, will set the exit status to 4 plus the number  of
-       lines  with  errors.  If no errors are found, the exit status is <STRONG>0</STRONG>.  No
-       indication of which line failed can be given  so  exit  status  <STRONG>1</STRONG>  will
-       never   appear.    Exit  statuses  <STRONG>2</STRONG>,  <STRONG>3</STRONG>,  and  <STRONG>4</STRONG>  retain  their  usual
-       interpretation.  If the <STRONG>-S</STRONG> option is not used, the exit status  depends
+       any  errors are found, will set the exit status to 4 plus the number of
+       lines with errors.  If no errors are found, the exit status is  <STRONG>0</STRONG>.   No
+       indication  of  which  line  failed  can be given so exit status <STRONG>1</STRONG> will
+       never  appear.   Exit  statuses  <STRONG>2</STRONG>,  <STRONG>3</STRONG>,  and  <STRONG>4</STRONG>  retain   their   usual
+       interpretation.   If the <STRONG>-S</STRONG> option is not used, the exit status depends
        on the type of <EM>cap-code</EM>:
 
           <EM>Boolean</EM>
                  a value of <STRONG>0</STRONG> is set for TRUE and <STRONG>1</STRONG> for FALSE.
 
-          <EM>string</EM> a  value  of  <STRONG>0</STRONG>  is  set  if the <EM>cap-code</EM> is defined for this
-                 terminal <EM>type</EM> (the value of <EM>cap-code</EM> is returned on  standard
-                 output);  a  value of <STRONG>1</STRONG> is set if <EM>cap-code</EM> is not defined for
+          <EM>string</EM> a value of <STRONG>0</STRONG> is set if  the  <EM>cap-code</EM>  is  defined  for  this
+                 terminal  <EM>type</EM> (the value of <EM>cap-code</EM> is returned on standard
+                 output); a value of <STRONG>1</STRONG> is set if <EM>cap-code</EM> is not  defined  for
                  this terminal <EM>type</EM> (nothing is written to standard output).
 
           <EM>integer</EM>
-                 a value of <STRONG>0</STRONG> is  always  set,  whether  or  not  <EM>cap-code</EM>  is
-                 defined  for this terminal <EM>type</EM>.  To determine if <EM>cap-code</EM> is
-                 defined for this terminal <EM>type</EM>, the user must test the  value
-                 written  to  standard  output.  A value of <STRONG>-1</STRONG> means that <EM>cap-</EM>
+                 a  value  of  <STRONG>0</STRONG>  is  always  set,  whether or not <EM>cap-code</EM> is
+                 defined for this terminal <EM>type</EM>.  To determine if <EM>cap-code</EM>  is
+                 defined  for this terminal <EM>type</EM>, the user must test the value
+                 written to standard output.  A value of <STRONG>-1</STRONG>  means  that  <EM>cap-</EM>
                  <EM>code</EM> is not defined for this terminal <EM>type</EM>.
 
-          <EM>other</EM>  <STRONG>reset</STRONG> or <STRONG>init</STRONG> may fail to find their  respective  files.   In
+          <EM>other</EM>  <STRONG>reset</STRONG>  or  <STRONG>init</STRONG>  may fail to find their respective files.  In
                  that case, the exit status is set to 4 + <STRONG>errno</STRONG>.
 
-       Any  other  exit  status  indicates an error; see section "DIAGNOSTICS"
+       Any other exit status indicates an  error;  see  section  "DIAGNOSTICS"
        below.
 
 
 </PRE><H2><a name="h2-DIAGNOSTICS">DIAGNOSTICS</a></H2><PRE>
-       <STRONG>tput</STRONG> prints the following error messages  and  sets  the  corresponding
+       <STRONG>tput</STRONG>  prints  the  following  error messages and sets the corresponding
        exit statuses.
 
        exit status   error message
        ------------------------------------------------------------------------
-       <STRONG>0</STRONG>             (<EM>cap-code</EM>  is a numeric variable that is not specified in
-                     the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> database for  this  terminal  type,  e.g.
+       <STRONG>0</STRONG>             (<EM>cap-code</EM> is a numeric variable that is not specified  in
+                     the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for  this terminal type, e.g.
                      <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
        <STRONG>1</STRONG>             no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> section.
        <STRONG>2</STRONG>             usage error
@@ -325,115 +336,115 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  implementation  of  <STRONG>tput</STRONG>  differs from AT&amp;T <STRONG>tput</STRONG> in two important
+       This implementation of <STRONG>tput</STRONG> differs from AT&amp;T  <STRONG>tput</STRONG>  in  two  important
        areas:
 
-       <STRONG>o</STRONG>   <STRONG>tput</STRONG> <EM>cap-code</EM> writes to the standard output.  That need  not  be  a
-           regular   terminal.   However,  the  subcommands  which  manipulate
+       <STRONG>o</STRONG>   <STRONG>tput</STRONG>  <EM>cap-code</EM>  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.
 
-           The AT&amp;T implementation's <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands  use  the  BSD
-           (4.1c)   <STRONG>tset</STRONG>   source,   which  manipulates  terminal  modes.   It
-           successively tries standard output, standard error, standard  input
+           The  AT&amp;T  implementation's  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands use the BSD
+           (4.1c)  <STRONG>tset</STRONG>  source,  which  manipulates   terminal   modes.    It
+           successively  tries standard output, standard 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 <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify  terminal
+           Until  changes made after <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify terminal
            modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
-           <STRONG>tset</STRONG> (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not  able
+           <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
            to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
            an error.
 
-       <STRONG>o</STRONG>   AT&amp;T <STRONG>tput</STRONG> guesses the type of its <EM>cap-code</EM> operands  by  seeing  if
+       <STRONG>o</STRONG>   AT&amp;T  <STRONG>tput</STRONG>  guesses  the type of its <EM>cap-code</EM> operands by seeing if
            all of the characters are numeric, or not.
 
-           Most  implementations  which  provide support for <EM>cap-code</EM> operands
-           use the <STRONG>tparm</STRONG> function to expand parameters in it.   That  function
-           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
+           Most implementations which provide support  for  <EM>cap-code</EM>  operands
+           use  the  <STRONG>tparm</STRONG> function to expand parameters in it.  That function
+           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
            to know which type to use.
 
-           This implementation uses a table to determine the  parameter  types
+           This  implementation  uses a table to determine the parameter types
            for  the  standard  <EM>cap-code</EM>  operands,  and  an  internal  library
            function to analyze nonstandard <EM>cap-code</EM> operands.
 
-           Besides providing more reliable operation than  AT&amp;T's  utility,  a
-           portability  problem  is  introduced  by  this analysis: An OpenBSD
-           developer adapted the internal library  function  from  <EM>ncurses</EM>  to
-           port  NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had been
-           modified to  interpret  multiple  commands  on  a  line.   Portable
+           Besides  providing  more  reliable operation than AT&amp;T's utility, a
+           portability problem is introduced  by  this  analysis:  An  OpenBSD
+           developer  adapted  the  internal  library function from <EM>ncurses</EM> to
+           port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
+           modified  to  interpret  multiple  commands  on  a  line.  Portable
            applications should not rely upon this feature; <EM>ncurses</EM> provides it
            to support applications written specifically for OpenBSD.
 
        This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
        <EM>terminfo</EM> names for the <EM>cap-code</EM> feature, if <EM>termcap</EM> support is compiled
-       in.  However, the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names  have  two
+       in.   However,  the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names have two
        ambiguities in this case (and the <EM>terminfo</EM> name is assumed):
 
-       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM> name <STRONG>dl1</STRONG> (delete
+       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM>  name  <STRONG>dl1</STRONG>  (delete
            one line).
-           The <EM>terminfo</EM> name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG>  (delete  a
+           The  <EM>terminfo</EM>  name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG> (delete a
            given number of lines).
 
-       <STRONG>o</STRONG>   The  <EM>termcap</EM>  name  <STRONG>ed</STRONG>  corresponds  to the <EM>terminfo</EM> name <STRONG>rmdc</STRONG> (end
+       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>ed</STRONG> corresponds to  the  <EM>terminfo</EM>  name  <STRONG>rmdc</STRONG>  (end
            delete mode).
-           The <EM>terminfo</EM> name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG>  (clear  to
+           The  <EM>terminfo</EM>  name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG> (clear to
            end of screen).
 
-       The  <STRONG>longname</STRONG>  and  <STRONG>-S</STRONG> options, and the parameter-substitution features
-       used in the <STRONG>cup</STRONG> example, were not supported in AT&amp;T/USL  <EM>curses</EM>  before
+       The <STRONG>longname</STRONG> and <STRONG>-S</STRONG> options, and  the  parameter-substitution  features
+       used  in  the <STRONG>cup</STRONG> example, were not supported in AT&amp;T/USL <EM>curses</EM> before
        SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for <STRONG>longname</STRONG>, and
        NetBSD (1994) added support for the parameter-substitution features.
 
-       IEEE  Std  1003.1/The  Open  Group    Base   Specifications   Issue   7
-       (POSIX.1-2008)  documents  only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG>.
+       IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
+       (POSIX.1-2008) documents only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>.
        There are a few interesting observations to make regarding that:
 
        <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>cap-code</EM> support.  The
-           others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
+           others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
            capabilities.
 
        <STRONG>o</STRONG>   Other  implementations  of  <STRONG>tput</STRONG>  on  SVr4-based  systems  such  as
-           Solaris,  IRIX64  and HP-UX as well as others such as AIX and Tru64
+           Solaris, IRIX64 and HP-UX as well as others such as AIX  and  Tru64
            provide support for <EM>cap-code</EM> operands.
 
        <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize termcap names rather than
            terminfo capability names in their respective <STRONG>tput</STRONG> commands.  Since
-           2010, NetBSD's <STRONG>tput</STRONG> uses terminfo names.   Before  that,  it  (like
+           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  terminfo names.  Before that, it (like
            FreeBSD) recognized termcap names.
 
-           Beginning  in  2021,  FreeBSD uses the <EM>ncurses</EM> <STRONG>tput</STRONG>, configured for
+           Beginning in 2021, FreeBSD uses the <EM>ncurses</EM>  <STRONG>tput</STRONG>,  configured  for
            both terminfo (tested first) and termcap (as a fallback).
 
        Because (apparently) <EM>all</EM> of the certified Unix systems support the full
-       set  of  capability names, the reasoning for documenting only a few may
+       set of capability names, the reasoning for documenting only a  few  may
        not be apparent.
 
        <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>cap-code</EM> and
            the other features used in this implementation.
 
-       <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: 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
+       <STRONG>o</STRONG>   That is, there are two standards for <STRONG>tput</STRONG>:  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.
 
-       <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
-           using  <EM>curses,</EM>  no  system  with a <EM>curses</EM> implementation provides a
+       <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <STRONG>tput</STRONG> program without
+           using <EM>curses,</EM> no system with a  <EM>curses</EM>  implementation  provides  a
            <STRONG>tput</STRONG> utility that does not also supply the <EM>cap-code</EM> feature.
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (that is, System V <EM>curses</EM> behavior).
 
-       <STRONG>o</STRONG>   It assigns exit status 4 to "invalid operand",  which  may  be  the
-           same  as  <EM>unknown</EM>  <EM>capability</EM>.   For  instance, the source code for
+       <STRONG>o</STRONG>   It  assigns  exit  status  4 to "invalid operand", which may be the
+           same as <EM>unknown</EM> <EM>capability</EM>.  For  instance,  the  source  code  for
            Solaris' xcurses uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It assigns exit status 255  to  a  numeric  variable  that  is  not
+       <STRONG>o</STRONG>   It  assigns  exit  status  255  to  a  numeric variable that is not
            specified in the terminfo database.  That likely is a documentation
-           error, confusing the <STRONG>-1</STRONG> written  to  the  standard  output  for  an
+           error,  confusing  the  <STRONG>-1</STRONG>  written  to  the standard output for an
            absent or cancelled numeric value versus an (unsigned) exit status.
 
-       The  various  Unix  systems  (AIX,  HP-UX,  Solaris)  use the same exit
+       The various Unix systems  (AIX,  HP-UX,  Solaris)  use  the  same  exit
        statuses as <EM>ncurses</EM>.
 
        NetBSD curses documents different exit statuses which do not correspond
@@ -441,62 +452,62 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The  <STRONG>tput</STRONG>  command  was begun by Bill Joy in 1980.  The initial version
+       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
        only cleared the screen.
 
        AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
 
-       <STRONG>o</STRONG>   SVr2 provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the  parameter
-           against  each  predefined capability and returned the corresponding
-           value.  This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for  the
+       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
+           against each predefined capability and returned  the  corresponding
+           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
            capabilities which are parameterized.
 
        <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
-           <STRONG>init</STRONG> and <STRONG>reset</STRONG>  subcommands  (more  than  half  the  program)  were
-           incorporated  from  the  <STRONG>reset</STRONG>  feature of BSD <STRONG>tset</STRONG> written by Eric
+           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
+           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
            Allman.
 
        <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
            capabilities in the <STRONG>init</STRONG> subcommand.
 
-       Keith  Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a new
-       implementation based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the  AT&amp;T
-       program,  Bostic's  version accepted some parameters named for <EM>terminfo</EM>
-       capabilities (<STRONG>clear</STRONG>, <STRONG>init</STRONG>, <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).   However  (because  he
-       had  only  <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names for other
-       capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal  I/O
+       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
+       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
+       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
+       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
+       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
+       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
        modes as the earlier BSD <STRONG>tset</STRONG> had done.
 
        At the same time, Bostic added a shell script named "clear", which used
        <STRONG>tput</STRONG> to clear the screen.
 
-       Both  of  these  appeared  in  4.4BSD,  becoming   the   "modern"   BSD
+       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
        implementation of <STRONG>tput</STRONG>.
 
-       This  implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T or
-       BSD: Ross Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in
-       December  1992.   Ridge's  program  made  more sophisticated use of the
-       terminal capabilities than the BSD program.   Eric  Raymond  used  that
-       <STRONG>tput</STRONG>  program  (and  other  parts  of <EM>mytinfo</EM>) in <EM>ncurses</EM> in June 1995.
-       Using the portions dealing with terminal  capabilities  almost  without
-       change,   Raymond   made  improvements  to  the  way  the  command-line
+       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
+       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
+       December 1992.  Ridge's program made  more  sophisticated  use  of  the
+       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
+       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  <EM>ncurses</EM>  in  June  1995.
+       Using  the  portions  dealing with terminal capabilities almost without
+       change,  Raymond  made  improvements  to  the  way   the   command-line
        parameters were handled.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
-            Initialize the terminal according to the type of terminal  in  the
-            environment  variable  <EM>TERM</EM>.   This  command should be included in
-            everyone's .profile after the environment variable <EM>TERM</EM>  has  been
+            Initialize  the  terminal according to the type of terminal in the
+            environment variable <EM>TERM</EM>.  This command  should  be  included  in
+            everyone's  .profile  after the environment variable <EM>TERM</EM> has been
             exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
 
        <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
-            Reset  an  AT&amp;T  5620 terminal, overriding the type of terminal in
+            Reset an AT&amp;T 5620 terminal, overriding the type  of  terminal  in
             the environment variable <EM>TERM</EM>.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
             Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
-            left  corner  of  the  screen,  usually known as the "home" cursor
+            left corner of the screen, usually  known  as  the  "home"  cursor
             position).
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
@@ -509,8 +520,8 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
             Print the number of columns for the 450 terminal.
 
        <STRONG>bold=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>offbold=`tput</STRONG> <STRONG>rmso`</STRONG>
-            Set the shell variables <STRONG>bold</STRONG>, to begin  stand-out  mode  sequence,
-            and  <STRONG>offbold</STRONG>,  to  end  standout  mode  sequence,  for the current
+            Set  the  shell  variables <STRONG>bold</STRONG>, to begin stand-out mode sequence,
+            and <STRONG>offbold</STRONG>, to  end  standout  mode  sequence,  for  the  current
             terminal.  This might be followed by a prompt: <STRONG>echo</STRONG> <STRONG>"${bold}Please</STRONG>
             <STRONG>type</STRONG> <STRONG>in</STRONG> <STRONG>your</STRONG> <STRONG>name:</STRONG> <STRONG>${offbold}\c"</STRONG>
 
@@ -522,11 +533,11 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
             Send the sequence to move the cursor to row 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-            Send the terminfo string for cursor-movement, with  no  parameters
+            Send  the  terminfo string for cursor-movement, with no parameters
             substituted.
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-            Print  the  long  name  from the <EM>terminfo</EM> database for the type of
+            Print the long name from the <EM>terminfo</EM> database  for  the  type  of
             terminal specified in the environment variable <EM>TERM</EM>.
 
        <STRONG>tput</STRONG> <STRONG>-S</STRONG>
@@ -542,10 +553,8 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
             clears the screen, moves the cursor to position (10, 10) and turns
             on bold (extra bright) mode.
 
-            The same sequence of commands can be combined  using  the  OpenBSD
-            feature:
-
-            $ <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
+       <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
+            Perform the same actions as the foregoing "<STRONG>tput</STRONG> <STRONG>-S</STRONG>" example.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -553,7 +562,7 @@ <H1 class="no-header">tput 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2023-12-30                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 98ae2ec93..4fa5bd0a2 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.43 2023/12/23 16:08:25 tom Exp @
+  * @Id: user_caps.5,v 1.44 2023/12/30 21:36:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-12-23 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2023-12-30 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2023-12-30 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -66,7 +66,7 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
        Single Unix Specification beginning in 1995.
 
        Most of the <EM>extensions</EM> in this fixed repertoire were additions  to  the
-       tables of boolean, numeric and string capabilities.  Rather than change
+       tables of Boolean, numeric and string capabilities.  Rather than change
        the meaning of an existing capability,  a  new  name  was  added.   The
        terminfo  database  uses  a  binary  format;  binary  compatibility was
        ensured by using a header which gave the number of items in the  tables
@@ -184,7 +184,7 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
        terminfo  database  may  have  other extensions, <EM>ncurses</EM> makes explicit
        checks for these:
 
-          AX <EM>boolean</EM>, asserts that the terminal interprets SGR 39 and  SGR  49
+          AX <EM>Boolean</EM>, asserts that the terminal interprets SGR 39 and  SGR  49
              by  resetting  the foreground and background color, respectively,
              to the default.
 
@@ -196,13 +196,13 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
 
              The command "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" does the same thing.
 
-          NQ <EM>boolean</EM>, used to suppress a consistency  check  in  tic  for  the
+          NQ <EM>Boolean</EM>, used to suppress a consistency  check  in  tic  for  the
              <EM>ncurses</EM>  capabilities  in user6 through user9 (u6, u7, u8 and u9)
              which tell how to query the terminal's cursor  position  and  its
              device attributes.
 
           RGB
-             <EM>boolean</EM>,   <EM>number</EM>   <STRONG>or</STRONG>   <EM>string</EM>,   used   to   assert   that  the
+             <EM>Boolean</EM>,   <EM>number</EM>   <STRONG>or</STRONG>   <EM>string</EM>,   used   to   assert   that  the
              <STRONG>set_a_foreground</STRONG> and <STRONG>set_a_background</STRONG> capabilities correspond  to
              <EM>direct</EM>  <EM>colors</EM>,  using  an RGB (red/green/blue) convention.  This
              capability  allows   the   <STRONG>color_content</STRONG>   function   to   return
@@ -211,7 +211,7 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
 
              The capability type determines the values which <EM>ncurses</EM> sees:
 
-             <EM>boolean</EM>
+             <EM>Boolean</EM>
                 implies that the number of bits for red, green  and  blue  are
                 the  same.   Using  the maximum number of colors, <EM>ncurses</EM> adds
                 two, divides that sum by three, and assigns the result to red,
@@ -224,7 +224,7 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
              <EM>number</EM>
                 tells  <EM>ncurses</EM>  what result to add to red, green and blue.  If
                 <EM>ncurses</EM> runs out of bits, blue (and green) lose just as in the
-                <EM>boolean</EM> case.
+                <EM>Boolean</EM> case.
 
              <EM>string</EM>
                 explicitly  list  the  number  of bits used for red, green and
@@ -396,7 +396,7 @@ <H1 class="no-header">user_caps 5 2023-12-23 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-23                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2023-12-30                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index ceff65af0..e21d59243 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.49 2023/10/14 20:54:32 tom Exp $
+# $Id: Caps,v 1.50 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -48,7 +48,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -206,7 +206,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index ce6069f0b..3b2389be3 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.21 2023/10/14 21:47:17 tom Exp $
+# $Id: Caps.aix4,v 1.22 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -48,7 +48,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -206,7 +206,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 4d61364df..f9633f4c5 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.19 2023/10/14 21:50:28 tom Exp $
+# $Id: Caps.hpux11,v 1.20 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -48,7 +48,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -206,7 +206,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
@@ -237,7 +237,7 @@ dest_tabs_magic_smso		xt	bool	xt	-	-	YBCGE	tabs destructive, magic so char (t106
 tilde_glitch			hz	bool	hz	-	-	YB-GE	cannot print ~'s (Hazeltine)
 transparent_underline		ul	bool	ul	-	-	YBCGE	underline character overstrikes
 xon_xoff			xon	bool	xo	-	-	YB---	terminal uses xon/xoff handshaking
-# end booleans for HPUX 9, 10 (non-color curses)
+# end Booleans for HPUX 9, 10 (non-color curses)
 needs_xon_xoff			nxon	bool	nx	-	-	-----	padding will not work, xon/xoff required
 prtr_silent			mc5i	bool	5i	-	-	-----	printer will not echo on screen
 hard_cursor			chts	bool	HC	-	-	-----	cursor is hard to see
diff --git a/include/Caps.keys b/include/Caps.keys
index f3e6dc3bd..48da83bcb 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.18 2023/10/14 21:48:29 tom Exp $
+# $Id: Caps.keys,v 1.19 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -50,7 +50,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -208,7 +208,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index 30e350a24..04d8f55fd 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.17 2023/10/14 21:48:39 tom Exp $
+# $Id: Caps.osf1r5,v 1.18 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -48,7 +48,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -206,7 +206,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 59332c4e6..6214f59a0 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.16 2023/10/14 21:48:58 tom Exp $
+# $Id: Caps.uwin,v 1.17 2023/12/30 21:36:32 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -48,7 +48,7 @@
 #
 # Column 1: terminfo variable name
 # Column 2: terminfo capability name
-# Column 3: capability type (boolean, numeric, or string)
+# Column 3: capability type (Boolean, numeric, or string)
 # Column 4: termcap capability name
 # Column 5: KEY_xxx name, if any, `-' otherwise
 # Column 6: value for KEY_xxx name, if any, `-' otherwise
@@ -206,7 +206,7 @@
 #%indicates the \fIi\fP\uth\d parameter.
 #%
 #%.PP
-#% These are the boolean capabilities:
+#% These are the Boolean capabilities:
 #%
 #%.na
 #%.TS H
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 73dce9ca7..0fb6dcc4b 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.95 2023/12/23 20:18:13 tom Exp $
-.TH curs_color 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.96 2023/12/30 21:20:01 tom Exp $
+.TH curs_color 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,7 +142,7 @@ as from \fB\%waddch\fP(3X) or \fB\%wadd_wch\fP(3X)
 window attributes,
 as from \fB\%wattrset\fP(3X) or \fB\%wattr_set\fP(3X)
 .bP
-window background character atttributes,
+window background character attributes,
 as from \fB\%wbkgdset\fP(3X) or \fB\%wbkgrndset\fP(3X)
 .PP
 Per-character and window attributes are usually set through a function
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index fd748d088..b11cb21fa 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.35 2023/11/25 11:31:49 tom Exp $
-.TH curs_inwstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.36 2023/12/30 21:32:48 tom Exp $
+.TH curs_inwstr 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -107,8 +107,9 @@ All routines except
 \fBwinnwstr\fP
 may be macros.
 .PP
-Each cell in the window holds a complex character (i.e., base-
-and combining-characters) together with attributes and color.
+Each cell in the window holds a complex character
+(a spacing character and zero or more non-spacing characters)
+together with attributes and color.
 These functions store only the wide characters,
 ignoring attributes and color.
 Use \fBin_wchstr\fP to return the complex characters from a window.
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index ceb27fe0c..16c802a15 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.36 2023/12/16 21:10:18 tom Exp $
-.TH curs_scr_dump 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.37 2023/12/30 21:34:11 tom Exp $
+.TH curs_scr_dump 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -60,55 +60,88 @@ read/write a \fIcurses\fR screen from/to a file
 \fBint scr_set(const char *\fIfilename\fP);
 .fi
 .SH DESCRIPTION
+.I curses
+provides applications the ability to write the contents of the screen
+to a file and read them back.
+To read/write a window
+(rather than the whole screen)
+from/to a file,
+use \fB\%getwin\fP(3X) and
+\fB\%putwin\fP(3X),
+respectively.
 .SS scr_dump
-The \fBscr_dump\fP routine dumps the current contents
-of the \fIvirtual screen\fP
-to the file \fIfilename\fP.
+\fB\%scr_dump\fP writes to
+.I filename
+the contents of the virtual screen;
+see \fB\%curscr\fP(3X).
 .SS scr_restore
-The \fBscr_restore\fP routine sets the \fIvirtual screen\fP to the contents
-of \fIfilename\fP, which must have been written using \fBscr_dump\fP.
-The next call to \fBdoupdate\fP restores
-the \fIphysical screen\fP to the way it looked in the dump file.
+\fB\%scr_restore\fP updates the virtual screen to contain the contents
+of
+.I filename
+(if it was validly written with \fB\%scr_dump\fP).
+No refresh is performed;
+after performing any further desired updates,
+call \fB\%doupdate\fP(3X) or similar.
 .SS scr_init
-The \fBscr_init\fP routine reads in the contents of \fIfilename\fP and uses
-them to initialize the \fBcurses\fP data structures about what the terminal
-currently has on its screen.
-If the data is determined to be valid,
-\fBcurses\fP bases its next update of the screen on this information rather
-than clearing the screen and starting from scratch.
-\fBscr_init\fP is used
-after \fBinitscr\fP(3X) or a \fBsystem\fP(3) call to share
-the screen with another process which has done a \fBscr_dump\fP after its
-\fBendwin\fP(3X) call.
-The data is declared invalid
+\fB\%scr_init\fP reads
+.I filename,
+using it to initialize
+.I curses
+data structures describing the state of the terminal screen.
+If these data are valid,
+.I curses
+bases its next update of the screen on this information rather than
+clearing it and starting from scratch.
+.PP
+The data fail the validity check
 .bP
-if the terminfo capabilities \fBrmcup\fP and \fBnrrmc\fP exist, also
+if the terminal employs
+.I \%term\%info
+capabilities
+.B \%exit_ca_mode
+.RB ( \%rmcup )
+or
+.B \%non_rev_rmcup
+.RB ( \%nrrmc )
+are defined,
+or
 .bP
-if the terminal has been written to since the preceding \fBscr_dump\fP call.
+if
+.I curses
+knows that the terminal has been written to since the preceding
+\fB\%scr_dump\fP call.
+.PP
+\fB\%scr_init\fP could be used after \fB\%initscr\fP(3X) or
+\fB\%system\fP(3) to share the screen with another process that has
+done a \fBscr_dump\fP after \fB\%endwin\fP(3X).
 .SS scr_set
 The \fBscr_set\fP routine is a combination of \fBscr_restore\fP and
 \fBscr_init\fP.  It tells the program that the information in \fIfilename\fP is
 what is currently on the screen, and also what the program wants on the screen.
 This can be thought of as a screen inheritance function.
-.PP
-To read (write) a window from (to) a file, use the \fBgetwin\fP and
-\fBputwin\fP routines [see \fBcurs_util\fP(3X)].
 .SH RETURN VALUE
-These routines return the integer \fBERR\fP upon failure and \fBOK\fP
-upon success.
+These functions return \fBOK\fP on success and \fBERR\fP on failure.
 .PP
-X/Open defines no error conditions.
+X/Open defines no failure conditions.
 In this implementation,
-each will return an error if the file cannot be opened.
+each function fails if it cannot open
+.I filename.
 .SH NOTES
-Note that \fBscr_init\fP, \fBscr_set\fP, and \fBscr_restore\fP may be macros.
+\fB\%scr_init\fP,
+\fB\%scr_set\fP,
+and
+\fB\%scr_restore\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses, Issue 4, describes these functions.
+.PP
+.\" SVID 4, p. 529
+SVr4 omitted the
+.I \%const
+qualifiers.
 .PP
-The SVr4 docs merely say under \fBscr_init\fP that the dump data is also
-considered invalid \*(``if the time-stamp of the tty is old\*('' but do
-not define \*(``old\*(''.
+SVr4 documentation describes \fB\%scr_init\fP such that the dump data is
+also considered invalid \*(``if the time-stamp of the tty is old\*(''
+but does not define \*(``old\*(''.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 464209f95..1c176e012 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.80 2023/12/23 20:19:05 tom Exp $
-.TH curs_termcap 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.81 2023/12/30 21:27:22 tom Exp $
+.TH curs_termcap 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -415,7 +415,8 @@ refactored it,
 leaving the API unchanged.
 .PP
 Function prototypes were a feature of ANSI C (1989).
-Thus the library itself provided no header file declaring them.
+The library long antedated the standard and thus provided no header file
+declaring them.
 Nevertheless,
 the BSD sources included two different \fI\%termcap.h\fP header files
 over time.
@@ -434,7 +435,7 @@ One was used internally by \fBjove\fP(1) from 4.3BSD onward.
 .\"   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
 .\"     jove/Makefile
 .\" --much too late for 2BSD (1979).
-It delcared global symbols for the \fItermcap\fP variables that it used.
+It declared global symbols for the \fItermcap\fP variables that it used.
 .bP
 The other appeared in 4.4BSD-Lite Release 2
 (June 1995)
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 88f5b97f1..e5affc46f 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.124 2023/12/23 17:34:39 tom Exp $
-.TH curs_terminfo 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.125 2023/12/30 23:46:56 tom Exp $
+.TH curs_terminfo 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -65,7 +65,7 @@
 \fB\%vid_puts\fP,
 \fB\%vidattr\fP,
 \fB\%vidputs\fP \-
-\fIcurses\fR interfaces to \fIterminfo\fR database
+\fIcurses\fR interfaces to \fI\%term\%info\fR database
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -117,38 +117,53 @@
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
-directly with the \fIterminfo\fP database to handle certain terminal
-capabilities, such as programming function keys.
-For all other
-functionality, \fIcurses\fP routines are more suitable and their use is
-recommended.
+directly with the
+.I \%term\%info
+database to handle certain terminal capabilities,
+such as programming function keys.
+For all other functionality,
+.I curses
+routines are more suitable and their use is recommended.
 .PP
-None of these functions use (or are aware of) multibyte character strings
-such as UTF-8:
+None of these functions use
+(or are aware of)
+multibyte character strings such as UTF-8.
 .bP
-capability names use the POSIX portable character set
+Capability names and codes use the POSIX portable character set.
 .bP
-capability string values have no associated encoding;
+Capability string values have no associated encoding;
 they are strings of 8-bit characters.
 .SS Initialization
-Initially, \fBsetupterm\fP should be called.
-The high-level curses functions \fBinitscr\fP and
-\fBnewterm\fP call \fBsetupterm\fP to initialize the
-low-level set of terminal-dependent variables
-[listed in \fBterminfo\fP(5)].
+Initially,
+\fB\%setupterm\fP should be called.
+The high-level
+.I curses
+functions \fB\%initscr\fP and \fB\%newterm\fP call \fB\%setupterm\fP to
+initialize the low-level set of terminal-dependent variables
+listed in \fB\%term_variables\fP(3X).
 .PP
 Applications can use the
-terminal capabilities either directly (via header definitions),
+terminal capabilities either directly
+(via header definitions),
 or by special functions.
-The header files \fBcurses.h\fP and \fBterm.h\fP should be included (in this
-order) to get the definitions for these strings, numbers, and flags.
-.PP
-The \fBterminfo\fP variables
-\fBlines\fP and \fBcolumns\fP are initialized by \fBsetupterm\fP as
+The header files
+.I \%curses.h
+and
+.I \%term.h
+should be included
+(in that order)
+to get the definitions for these strings, numbers, and flags.
+.PP
+The
+.I \%term\%info
+variables
+\fBlines\fP and \fBcolumns\fP are initialized by \fB\%setupterm\fP as
 follows:
 .bP
-If \fBuse_env(FALSE)\fP has been called, values for
-\fBlines\fP and \fBcolumns\fP specified in \fBterminfo\fP are used.
+If \fB\%use_env(FALSE)\fP has been called,
+values for \fBlines\fP and \fBcolumns\fP specified in
+.I \%term\%info
+are used.
 .bP
 Otherwise,
 if the environment variables \fILINES\fP and \fI\%COLUMNS\fP exist,
@@ -158,10 +173,13 @@ exist and the program is running in a window, the current window size
 is used.
 Otherwise, if the environment variables do not exist, the
 values for \fBlines\fP and \fBcolumns\fP specified in the
-\fBterminfo\fP database are used.
+.I \%term\%info
+database are used.
 .PP
 Parameterized strings should be passed through \fBtparm\fP to instantiate them.
-All \fBterminfo\fP strings
+All
+.I \%term\%info
+strings
 (including the output of \fBtparm\fP)
 should be printed
 with \fBtputs\fP or \fBputp\fP.
@@ -184,9 +202,14 @@ is called and
 output \fBenter_ca_mode\fP and
 call \fBreset_prog_mode\fP after returning from the shell.
 .PP
-The \fBsetupterm\fP routine reads in the \fBterminfo\fP database,
-initializing the \fBterminfo\fP structures, but does not set up the
-output virtualization structures used by \fBcurses\fP.
+The \fB\%setupterm\fP routine reads in the
+.I \%term\%info
+database,
+initializing the
+.I \%term\%info
+structures,
+but does not set up the output virtualization structures used by
+.I curses.
 These are its parameters:
 .RS 3
 .TP 5
@@ -232,16 +255,20 @@ having too little information for \fIcurses\fP applications to run.
 checking the \fBgn\fP \%(\fBgeneric_type\fP) capability.
 .TP 5
 .B \-1
-means that the \fIterminfo\fP database could not be found.
+means that the
+.I \%term\%info
+database could not be found.
 .RE
 .IP
 If \fIerrret\fP is
 null, \fB\%setupterm\fP prints an error message upon finding an error
 and exits.
 Thus, the simplest call is:
+.RS
+.IP
+\fBsetupterm((char *)0, 1, (int *)0);\fP
+.RE
 .IP
-\fBsetupterm((char *)0, 1, (int *)0);\fP,
-.PP
 which uses all the defaults and sends the output to \fBstdout\fP.
 .RE
 .\" ***************************************************************************
@@ -259,17 +286,29 @@ It maintains only one copy of a given terminal's capabilities in memory.
 If it is called for different terminal types,
 \fBsetupterm\fP allocates new storage for each set of terminal capabilities.
 .PP
-The \fBset_curterm\fP routine sets \fBcur_term\fP to
-\fInterm\fP, and makes all of the \fBterminfo\fP boolean, numeric, and
-string variables use the values from \fInterm\fP.
-It returns the old value of \fBcur_term\fP.
-.PP
-The \fBdel_curterm\fP routine frees the space pointed to by
-\fIoterm\fP and makes it available for further use.
-If \fIoterm\fP is
-the same as \fBcur_term\fP, references to any of the \fBterminfo\fP
-boolean, numeric, and string variables thereafter may refer to invalid
-memory locations until another \fBsetupterm\fP has been called.
+\fB\%set_curterm\fP sets \fB\%cur_term\fP to
+.I \%nterm,
+and makes all of the
+.I \%term\%info
+Boolean,
+numeric,
+and string variables use the values from
+.I \%nterm.
+It returns the old value of \fB\%cur_term\fP.
+.PP
+\fB\%del_curterm\fP routine frees the space pointed to by
+.I \%oterm
+and makes it available for further use.
+If
+.I \%oterm
+is
+the same as \fB\%cur_term\fP,
+references to any of the
+.I \%term\%info
+Boolean,
+numeric,
+and string variables thereafter may refer to invalid memory locations
+until another \fB\%setupterm\fP has been called.
 .PP
 The \fBrestartterm\fP routine is similar to \fBsetupterm\fP and \fBinitscr\fP,
 except that it is called after restoring memory to a previous state (for
@@ -298,9 +337,13 @@ it is interpreted by \fBtputs\fP.
 The capability string is null-terminated.
 Use \*(``\e200\*('' where an ASCII NUL is needed in the output.
 .PP
-\fBtiparm\fP is a newer form of \fBtparm\fP which uses \fI<stdarg.h>\fP
+\fB\%tiparm\fP is a newer form of \fB\%tparm\fP which uses
+.I \%stdarg.h
 rather than a fixed-parameter list.
-Its numeric parameters are integers (int) rather than longs.
+Its numeric parameters are
+.IR int s
+rather than
+.IR long s.
 .PP
 Both \fBtparm\fP and \fBtiparm\fP assume that the application passes
 parameters consistent with the terminal description.
@@ -337,7 +380,9 @@ variable or the return value from
 .IP
 The \fBtgetstr\fP and \fBtgoto\fP functions are part of the \fItermcap\fP
 interface,
-which happens to share this function name with the \fIterminfo\fP interface.
+which happens to share this function name with the
+.I \%term\%info
+interface.
 .bP
 \fIaffcnt\fP is the number of lines affected, or 1 if
 not applicable.
@@ -362,23 +407,40 @@ the \fI\%putchar\fP-like function \fIputc\fP.
 The \fBvidattr\fP routine is like the \fBvidputs\fP routine, except
 that it outputs through \fI\%putchar\fP.
 .PP
-The \fBvid_attr\fP and \fBvid_puts\fP routines correspond
-to vidattr and vidputs, respectively.
-They use a set of arguments for representing the video attributes plus color,
-i.e.,
-.bP
-\fIattrs\fP of type \fBattr_t\fP for the attributes and
-.bP
-\fIpair\fP of type \fBshort\fP for the color pair number.
-.PP
-The \fBvid_attr\fP and \fBvid_puts\fP routines
-are designed to use the attribute constants with the \fBWA_\fP prefix.
-.PP
-X/Open Curses reserves the \fIopts\fP argument for future use,
-saying that applications must provide a null pointer for that argument.
-As an extension,
-this implementation allows \fIopts\fP to be used as a pointer to \fBint\fP,
-which overrides the \fIpair\fP (\fBshort\fP) argument.
+.B \%vid_attr
+and
+.B \%vid_puts
+correspond to
+.B \%vidattr
+and
+.BR \%vidputs ,
+respectively.
+They use multiple parameters to represent the character attributes and
+color;
+namely,
+.bP
+.I \%attrs,
+of type
+.I \%attr_t,
+for the attributes and
+.bP
+.I pair,
+of type
+.I short,
+for the color pair number.
+.PP
+Use the attribute constants prefixed with
+.RB \*(`` WA_ \*(''
+with
+.B \%vid_attr
+and
+.BR \%vid_puts .
+.PP
+X/Open Curses reserves the
+.I opts
+argument for future use,
+saying that applications must provide a null pointer for that argument;
+but see section \*(``EXTENSIONS\*('' below.
 .PP
 The \fBmvcur\fP routine provides low-level cursor motion.
 It takes effect immediately (rather than at the next refresh).
@@ -389,22 +451,25 @@ the output stream parameter of \fBnewterm\fP(3X).
 .PP
 While \fBputp\fP and \fBmvcur\fP are low-level functions which
 do not use the high-level curses state,
-they are declared in \fB\%<curses.h>\fP because System\ V did this
+they are declared in
+.I \%curses.h
+because System\ V did this
 (see \fIHISTORY\fP).
 .\" ***************************************************************************
 .SS "Terminal Capability Functions"
 The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
-the value of the capability corresponding to the \fBterminfo\fP
+the value of the capability corresponding to the
+.I \%term\%info
 \fIcapname\fP passed to them, such as \fBxenl\fP.
 The \fIcapname\fP for each capability is given in the table column entitled
-\fIcapname\fP code in the capabilities section of \fBterminfo\fP(5).
+\fIcapname\fP code in the capabilities section of \fB\%terminfo\fP(5).
 .PP
 These routines return special values to denote errors.
 .PP
 The \fBtigetflag\fP routine returns
 .TP
 \fB\-1\fP
-if \fIcapname\fP is not a boolean capability,
+if \fIcapname\fP is not a Boolean capability,
 or
 .TP
 \fB0\fP
@@ -430,13 +495,15 @@ if it is canceled or absent from the terminal description.
 .SS "Terminal Capability Names"
 These null-terminated arrays contain
 .bP
-the short \fIterminfo\fP names (\*(``codes\*(''),
+the short \fI\%term\%info\fP names (\*(``codes\*(''),
 .bP
 the \fItermcap\fP names (\*(``names\*(''), and
 .bP
-the long \fIterminfo\fP names (\*(``fnames\*('')
+the long \fI\%term\%info\fP names (\*(``fnames\*('')
 .PP
-for each of the predefined \fIterminfo\fP variables:
+for each of the predefined
+.I \%term\%info
+variables:
 .PP
 .RS
 .nf
@@ -462,7 +529,7 @@ allocated by \fBsetupterm\fP:
 the \*(``static\*('' terminfo variables [a-z].
 Before \fI\%ncurses\fP 6.3, those were shared by all screens.
 With \fI\%ncurses\fP 6.3, those are allocated per screen.
-See \fBterminfo\fP(5) for details.
+See \fB\%terminfo\fP(5) for details.
 .bP
 to improve performance,
 \fI\%ncurses\fP 6.3 caches the result of analyzing terminfo
@@ -474,16 +541,9 @@ Normally they do not free this memory, but it is possible to do that using
 the \fBdelscreen\fP(3X) function.
 .\" ***************************************************************************
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 only specifies \*(``an integer value other than \fBERR\fP\*('')
-upon successful completion,
-unless otherwise noted in the preceding routine descriptions.
-.PP
-Routines that return pointers always return \fBNULL\fP on error.
-.PP
-X/Open defines no error conditions.
-In this implementation
-.RS 3
+X/Open defines no failure conditions.
+In
+.I \%ncurses,
 .TP 5
 \fBdel_curterm\fP
 returns an error
@@ -499,7 +559,11 @@ if the associated call to \fBsetupterm\fP returns an error.
 \fBsetupterm\fP
 returns an error
 if it cannot allocate enough memory, or
-create the initial windows (stdscr, curscr, newscr).
+create the initial windows
+.RB ( \%stdscr ,
+.BR \%curscr ,
+and
+.BR \%newscr )
 Other error conditions are documented above.
 .TP 5
 \fBtparm\fP
@@ -510,44 +574,44 @@ e.g., too many, too few, or incorrect types
 \fBtputs\fP
 returns an error if the string parameter is null.
 It does not detect I/O errors:
-X/Open states that \fBtputs\fP ignores the return value
+X/Open Curses states that \fBtputs\fP ignores the return value
 of the output function \fIputc\fP.
-.RE
 .\" ***************************************************************************
 .SH NOTES
-.\" See X/Open Curses Issue 4, Version 2, pp. 227-234.
-.\" See X/Open Curses Issue 7, pp. 311-318.
-According to X/Open Curses,
-any of the \fIenhanced curses\fP functions may be implemented as macros.
-The term \*(``enhanced\*('' refers to features not found in SVr4 curses.
-.PP
-\fB\%ncurses\fP uses macros
-.bP
-for functions which return values via their parameters,
-.bP
-to support obsolete features,
-.bP
-to reuse functions,
-e.g., those that move the cursor before another operation, and
-.bP
-a few special cases.
-.PP
-The \fB\%vid_puts\fP function in \fB\%ncurses\fP is a special case.
+The
+.B \%vid_attr
+function in
+.I \%ncurses
+is a special case.
 It was originally implemented based on a draft of X/Open Curses,
 as a macro,
-before other parts of the \fB\%ncurses\fP wide-character API were developed.
+before other parts of the
+.I \%ncurses
+wide-character API were developed,
+and unlike the other wide-character functions,
+is also provided in the non-wide-character configuration.
 .\" ***************************************************************************
 .SH EXTENSIONS
 The functions marked as extensions were designed for
-\fB\%ncurses\fP(3X),
+.I \%ncurses,
 and are not found in SVr4
 .IR curses ,
 4.4BSD
 .IR curses ,
 or any other previous curses implementation.
+.PP
+.I \%ncurses
+allows
+.I opts
+to be a pointer to
+.I int,
+which overrides the
+.I pair
+.RI ( short )
+argument.
 .\" ***************************************************************************
 .SH PORTABILITY
-\fBsetterm\fP is not described by X/Open and must be considered
+\fB\%setterm\fP is not described by X/Open and must be considered
 non-portable.
 All other functions are as described by X/Open.
 .SS "Compatibility Macros"
@@ -575,60 +639,81 @@ It further notes that \fB\%setterm\fP was replaced by \fB\%setupterm\fP,
 stating that the call
 .RS
 .EX
-setupterm(\fIterm\fB, 1, (int *)0)\fP
+setupterm(\fIterm\fP, 1, (int *)0)
 .EE
 .RE
-provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
+provides the same functionality as \fB\%setterm(\fIterm\fB)\fR,
 discouraging the latter for new programs.
 .I \%ncurses
 implements each of these symbols as macros for BSD
 .I curses
 compatibility.
 .SS "Legacy Data"
-\fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
+\fB\%setupterm\fP copies the terminal name to the array \fB\%ttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
 Other implementions may not declare the capability name arrays.
 Some provide them without declaring them.
 X/Open does not specify them.
 .PP
-Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
+Extended terminal capability names,
+as defined by
+.RB \%\*(`` "@TIC@\ \-x" \*('',
 are not stored in the arrays described here.
 .SS "Output Buffering"
 Older versions of \fI\%ncurses\fP assumed that the file descriptor
-passed to \fBsetupterm\fP from \fBinitscr\fP or \fBnewterm\fP uses
+passed to \fB\%setupterm\fP from \fB\%initscr\fP or \fB\%newterm\fP uses
 buffered I/O,
 and would write to the corresponding stream.
-In addition to the limitation that the terminal was left in block-buffered
-mode on exit (like System V curses),
-it was problematic because \fI\%ncurses\fP
-did not allow a reliable way to cleanup on receiving SIGTSTP.
+In addition to the limitation that the terminal was left in
+block-buffered mode on exit
+(like System\ V
+.IR curses ),
+it was problematic because
+.I \%ncurses
+did not allow a reliable way to cleanup on receiving
+.BR SIGTSTP .
 .PP
 The current version (ncurses6)
-uses output buffers managed directly by \fI\%ncurses\fP.
+uses output buffers managed directly by
+.I \%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 \fI\%ncurses\fP use
-alternate versions of these functions
-using the more reliable buffering scheme.
+The high-level functions in
+.I \%ncurses
+employ alternate versions of these functions using the more reliable
+buffering scheme.
 .SS "Function Prototypes"
-The X/Open Curses prototypes are based on the SVr4 curses header declarations,
-which were defined at the same time the C language was first standardized in
-the late 1980s.
+The X/Open Curses prototypes are based on the SVr4
+.I curses
+header declarations,
+which were defined at the same time the C language was first
+standardized in the late 1980s.
 .bP
-X/Open Curses uses \fBconst\fP less effectively than a later design might,
+X/Open Curses uses
+.I \%const
+less effectively than a later design might,
 in some cases applying it needlessly to values are already constant,
-and in most cases overlooking parameters which normally would use \fBconst\fP.
-Using constant parameters for functions which do not use \fBconst\fP
+and in most cases overlooking parameters which normally would use
+.I \%const.
+Using constant parameters for functions which do not use
+.I \%const
 may prevent the program from compiling.
-On the other hand, \fIwritable strings\fP are an obsolescent feature.
+On the other hand,
+\*(``writable strings\*('' are an obsolescent feature.
 .IP
-As an extension, this implementation can be configured to change the
-function prototypes to use the \fBconst\fP keyword.
-The \fI\%ncurses\fP ABI 6 enables this feature by default.
+As an extension,
+this implementation can be configured to change the function prototypes
+to use the
+.I \%const
+keyword.
+The
+.I \%ncurses
+ABI 6 enables this feature by default.
 .bP
-X/Open Curses prototypes \fBtparm\fP with a fixed number of parameters,
+X/Open Curses prototypes \fB\%tparm\fP with a fixed number of
+parameters,
 rather than a variable argument list.
 .IP
 This implementation uses a variable argument list, but can be
@@ -637,64 +722,101 @@ Portable applications should provide 9 parameters after the format;
 zeroes are fine for this purpose.
 .IP
 In response to review comments by Thomas E. Dickey,
-X/Open Curses Issue 7 proposed the \fBtiparm\fP function in mid-2009.
+X/Open Curses Issue 7 proposed the \fB\%tiparm\fP function in mid-2009.
 .IP
-While \fBtiparm\fP is always provided in \fI\%ncurses\fP,
+While \fB\%tiparm\fP is always provided in \fI\%ncurses\fP,
 the older form is only available as a build-time configuration option.
-If not specially configured, \fBtparm\fP is the same as \fBtiparm\fP.
+If not specially configured,
+\fB\%tparm\fP is the same as \fB\%tiparm\fP.
 .PP
-Both forms of \fBtparm\fP have drawbacks:
+Both forms of \fB\%tparm\fP have drawbacks:
 .bP
-Most of the calls to \fBtparm\fP use only one or two parameters.
+Most of the calls to \fB\%tparm\fP use only one or two parameters.
 Passing nine on each call is awkward.
 .IP
-Using \fBlong\fP for the numeric parameter type is a workaround
-to make the parameter use the same amount of stack as a pointer.
+Using
+.I long
+for the numeric parameter type is a workaround to make the parameter use
+the same amount of stack as a pointer.
 That approach dates back to the mid-1980s, before C was standardized.
 Since then, there is a standard
 (and pointers are not required to fit in a long).
 .bP
 Providing the right number of parameters for a variadic function
-such as \fBtiparm\fP can be a problem, in particular for string parameters.
+such as \fB\%tiparm\fP can be a problem,
+in particular for string parameters.
 However, only a few terminfo capabilities use string parameters
 (e.g., the ones used for programmable function keys).
 .IP
 The \fI\%ncurses\fP library checks usage of these capabilities,
 and returns an error if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
-places for the \fBtparm\fP calls.
+places for the \fB\%tparm\fP calls.
 .IP
-The \fB@TPUT@\fR(1) program checks its use of these capabilities with a table,
-so that it calls \fBtparm\fP correctly.
+The \fB\%@TPUT@\fR(1) program checks its use of these capabilities with
+a table,
+so that it calls \fB\%tparm\fP correctly.
 .SS "Special \fITERM\fP treatment"
 If configured to use the terminal-driver,
 e.g., for the MinGW port,
 .bP
-\fBsetupterm\fP interprets a missing/empty \fITERM\fP variable as the
+\fB\%setupterm\fP interprets a missing/empty \fITERM\fP variable as the
 special value \*(``unknown\*(''.
 .IP
 SVr4 curses uses the
 special value \*(``dumb\*(''.
 .IP
 The difference between the two is that
-the former uses the \fBgn\fP (\fBgeneric_type\fR) terminfo capability,
+the former uses the \fBgn\fP (\fB\%generic_type\fR) terminfo capability,
 while the latter does not.
 A generic terminal is unsuitable for full-screen applications.
 .bP
-\fBsetupterm\fP allows explicit use of the
+\fB\%setupterm\fP allows explicit use of the
 the windows console driver by checking if \fB$TERM\fP is set to
 \*(``#win32con\*('' or an abbreviation of that string.
 .SS "Other Portability Issues"
-In System V Release 4, \fBset_curterm\fP has an \fBint\fP return type and
-returns \fBOK\fP or \fBERR\fP.  We have chosen to implement the X/Open Curses
-semantics.
+In SVr4,
+\fB\%set_curterm\fP returns an
+.I int,
+.B OK
+or
+.BR ERR .
+We have chosen to implement the X/Open Curses semantics.
 .PP
-In System V Release 4, the third argument of \fBtputs\fP has the type
-\fBint (*putc)(char)\fP.
+In SVr4,
+the third argument of \fB\%tputs\fP has the type
+.RB \*(`` "int (*putc)(char)" \*(''.
 .PP
 At least one implementation of X/Open Curses (Solaris) returns a value
-other than \fBOK\fP/\fBERR\fP from \fBtputs\fP.
-That returns the length of the string, and does no error-checking.
+other than
+.B OK
+or
+.B ERR
+from \fB\%tputs\fP.
+It instead returns the length of the string,
+and does no error checking.
+.PP
+X/Open Curses notes that after calling \fB\%mvcur\fP,
+the
+.I curses
+state may not match the actual terminal state,
+and that an application should touch and refresh the window before
+resuming normal
+.I curses
+calls.
+Both
+.I \%ncurses
+and SVr4
+.I curses
+implement \fB\%mvcur\fP using the
+.I SCREEN
+data allocated in either \fB\%initscr\fP or \fB\%newterm\fP.
+So though it is documented as a
+.I \%term\%info
+function,
+\fB\%mvcur\fP is really a
+.I curses
+function that is not well specified.
 .PP
 X/Open notes that after calling \fBmvcur\fP, the curses state may not match the
 actual terminal state, and that an application should touch and refresh
@@ -705,12 +827,23 @@ using the \fISCREEN\fP data allocated in either \fBinitscr\fP or
 So though it is documented as a terminfo function,
 \fBmvcur\fP is really a curses function which is not well specified.
 .PP
-X/Open states that the old location must be given for \fBmvcur\fP.
-This implementation allows the caller to use \-1's for the old ordinates.
-In that case, the old location is unknown.
+X/Open Curses states that the old location must be given for
+\fB\%mvcur\fP to accommodate terminals that lack absolute cursor
+positioning.
+.\" X/Open Curses Issue 7, p. 161
+.I \%ncurses
+allows the caller to use \-1 for either or both old coordinates.
+The \-1 tells
+.I \%ncurses
+that the old location is unknown,
+and that it must use only absolute motion
+(such as \fI\%cursor_address\fP)
+rather than the least costly combination of absolute and relative motion.
 .\" ***************************************************************************
 .SH HISTORY
-SVr2 introduced the terminfo feature.
+SVr2 (1984) introduced the
+.I \%term\%info
+feature.
 Its programming manual mentioned the following low-level functions.
 .PP
 .TS
@@ -721,26 +854,23 @@ _
 fixterm	restore tty to \*(``in curses\*('' state
 gettmode	establish current tty modes
 mvcur	low level cursor motion
-putp	T{
-utility function that uses \fBtputs\fP to send characters via
-\fI\%putchar\fP.
-T}
+putp	use \fBtputs\fP to send characters via \fI\%putchar\fP
 resetterm	set tty modes to \*(``out of curses\*('' state
 resetty	reset tty flags to stored value
 saveterm	save current modes as \*(``in curses\*('' state
 savetty	store current tty flags
 setterm	establish terminal with given type
 setupterm	establish terminal with given type
-tparm	instantiate a string expression with parameters
+tparm	interpolate parameters into string capability
 tputs	apply padding information to a string
-vidattr	like \fBvidputs\fP, but outputs through \fIputchar\fP
-vidputs	T{
-output a string to put terminal in a specified video attribute mode
-T}
+vidattr	like \fBvidputs\fP, but output through \fIputchar\fP
+vidputs	write string to terminal, applying specified attributes
 .TE
 .PP
 The programming manual also mentioned
-functions provided for \fItermcap\fP compatibility
+functions provided for
+.I termcap
+compatibility
 (commenting that they \*(``may go away at a later date\*('').
 .PP
 .TS
@@ -749,34 +879,42 @@ lB lx.
 Function	Description
 _
 tgetent	look up \fItermcap\fP entry for given \fIname\fP
-tgetflag	get boolean entry for given \fIid\fP
+tgetflag	get Boolean entry for given \fIid\fP
 tgetnum	get numeric entry for given \fIid\fP
 tgetstr	get string entry for given \fIid\fP
 tgoto	apply parameters to given capability
-tputs	T{
-apply padding to capability, calling a function to put characters
-T}
+tputs	write characters via a function parameter, applying padding
 .TE
 .PP
-Early terminfo programs obtained capability values from the
-\fI\%TERMINAL\fP structure initialized by \fBsetupterm\fP.
+Early
+.I \%term\%info
+programs obtained capability values from the
+.I \%TERMINAL
+structure initialized by \fB\%setupterm\fP.
 .PP
-SVr3 extended terminfo by adding functions to retrieve capability values
-(like the termcap interface),
-and reusing \fBtgoto\fP and \fBtputs\fP:
+SVr3 (1987) extended
+.I \%term\%info
+by adding functions to retrieve capability values
+(like the
+.I termcap
+interface),
+and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
 .PP
 .TS
 lB lB
 lB lx.
 Function	Description
 _
-tigetflag	get boolean entry for given \fIid\fP
+tigetflag	get Boolean entry for given \fIid\fP
 tigetnum	get numeric entry for given \fIid\fP
 tigetstr	get string entry for given \fIid\fP
 .TE
 .PP
-SVr3 also replaced several of the SVr2 \fIterminfo\fP functions
-which had no counterpart in the \fItermcap\fP interface,
+SVr3 also replaced several of the SVr2
+.I \%term\%info
+functions that had no counterpart in the
+.I termcap
+interface,
 documenting them as obsolete.
 .PP
 .TS
@@ -793,30 +931,41 @@ saveterm	def_prog_mode
 setterm	setupterm
 .TE
 .PP
-SVr3 kept the \fBmvcur\fP, \fBvidattr\fP and \fBvidputs\fP functions,
-along with \fBputp\fP, \fBtparm\fP and \fBtputs\fP.
+SVr3 kept the \fB\%mvcur\fP,
+\fB\%vidattr\fP,
+and \fB\%vidputs\fP functions,
+along with \fB\%putp\fP,
+\fB\%tparm\fP,
+and \fB\%tputs\fP.
 The latter were needed to support padding,
-and handling functions such as \fBvidattr\fP
-(which used more than the two parameters supported by \fBtgoto\fP).
+and to handle capabilities accessed by functions such as \fB\%vidattr\fP
+(which used more than the two parameters supported by \fB\%tgoto\fP).
 .PP
 SVr3 introduced the functions for switching between terminal
-descriptions, e.g., \fBset_curterm\fP.
-Some of that was incremental improvements to the SVr2 library:
-.bP
-The \fI\%TERMINAL\fP type definition was introduced in SVr3.01,
-for the \fBterm\fP structure provided in SVr2.
-.bP
-The various global variables such as \fBboolnames\fP were mentioned
+descriptions;
+for example,
+\fB\%set_curterm\fP.
+Some changes reflected incremental improvements to the SVr2 library.
+.bP
+The
+.I \%TERMINAL
+type definition was introduced in SVr3.01,
+for the
+.I term
+structure provided in SVr2.
+.bP
+Various global variables such as \fB\%boolnames\fP were mentioned
 in the programming manual at this point,
-though the variables were provided in SVr2.
+though the variables had been provided in SVr2.
 .PP
-SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions.
+SVr4 (1989) added the \fB\%vid_attr\fP and \fB\%vid_puts\fP functions.
 .PP
-There are other low-level functions declared in the \fIcurses\fP header files
-on Unix systems,
-but none were documented.
-The functions marked \*(``obsolete\*('' remained in use
-by the Unix \fBvi\fP(1) editor.
+Other low-level functions are declared in the
+.I curses
+header files of Unix systems,
+but none are documented.
+Those noted as \*(``obsolete\*('' by SVr3 remained in use by System\ V's
+\fIvi\fP(1) editor.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 11241bdef..a6818944c 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.103 2023/12/23 16:08:25 tom Exp $
-.TH @INFOCMP@ 1M 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.104 2023/12/30 21:36:32 tom Exp $
+.TH @INFOCMP@ 1M 2023-12-30 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,7 +87,7 @@ x\
 terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
 \fBuse=\fP terminfo field, or print out a \fBterminfo\fP description from the
 binary file (\fBterm\fP) in a variety of formats.
-In all cases, the boolean
+In all cases, the Boolean
 fields will be printed first, followed by the numeric fields, followed by the
 string fields.
 .SS "Default Options"
@@ -104,7 +104,7 @@ for the other terminal's \fIterminal-types\fP.
 If a capability is defined for only one of the
 terminals, the value returned depends on the type of the capability:
 .bP
-\fBF\fP for missing boolean variables
+\fBF\fP for missing Boolean variables
 .bP
 \fBNULL\fP for missing integer or string variables
 .PP
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 7780b9d41..801892fdd 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.66 2023/12/23 16:14:04 tom Exp $
+# $Id: man_db.renames.in,v 1.67 2023/12/30 21:34:11 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -190,17 +190,23 @@ delscreen.3x			delscreen.3ncurses
 derwin.3x			derwin.3ncurses
 doupdate.3x			doupdate.3ncurses
 endwin.3x			endwin.3ncurses
+extended_slk_color.3x		extended_slk_color.3ncurses
 filter.3x			filter.3ncurses
 flushinp.3x			flushinp.3ncurses
 get_wch.3x			get_wch.3ncurses
+getattr.3x			getattr.3ncurses
 getcchar.3x			getcchar.3ncurses
 getch.3x			getch.3ncurses
+getwin.3x			getwin.3ncurses
+has_key.3x			has_key.3ncurses
 idcok.3x			idcok.3ncurses
 idlok.3x			idlok.3ncurses
 immedok.3x			immedok.3ncurses
 in_wch.3x			in_wch.3ncurses
 inch.3x				inch.3ncurses
 initscr.3x			initscr.3ncurses
+is_scrollok.3x			is_scrollok.3ncurses
+keyname.3x			keyname.3ncurses
 keypad.3x			keypad.3ncurses
 leaveok.3x			leaveok.3ncurses
 longname.3x			longname.3ncurses
@@ -213,6 +219,7 @@ newterm.3x			newterm.3ncurses
 newwin.3x			newwin.3ncurses
 nodelay.3x			nodelay.3ncurses
 notimeout.3x			notimeout.3ncurses
+putwin.3x			putwin.3ncurses
 refresh.3x			refresh.3ncurses
 reset_shell_mode.3x		reset_shell_mode.3ncurses
 restartterm.3x			restartterm.3ncurses
@@ -221,6 +228,8 @@ set_curterm.3x			set_curterm.3ncurses
 set_term.3x			set_term.3nses
 setcchar.3x			setcchar.3ncurses
 setupterm.3x			setupterm.3ncurses
+slk_attr.3x			slk_attr.3ncurses
+slk_color.3x			slk_color.3ncurses
 slk_init.3x			slk_init.3ncurses
 slk_touch.3x			slk_touch.3ncurses
 start_color.3x			start_color.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index dd0997514..4baaaad3f 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.30 2023/12/23 21:21:06 tom Exp $
+# $Id: manhtml.aliases,v 1.31 2023/12/31 00:46:44 tom Exp $
 #***************************************************************************
 # Copyright 2019-2022,2023 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -31,6 +31,7 @@
 add_wch(3X)		curs_add_wch(3X)
 addch(3X)		curs_addch(3X)
 assume_default_colors(3X)	default_colors(3X)
+attr_get(3X)		curs_attr(3X)
 attr_on(3X)		curs_attr(3X)
 attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
@@ -46,11 +47,14 @@ delay_output(3X)	curs_util(3X)
 delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 endwin(3X)		curs_initscr(3X)
+extended_slk_color(3X)	curs_slk(3X)
 filter(3X)		curs_util(3X)
 flushinp(3X)		curs_util(3X)
 get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
+getwin(3X)		curs_util(3X)
+has_key(3X)		curs_getch(3X)
 immedok(3X)		curs_outopts(3X)
 in_wch(3X)		curs_in_wch(3X)
 inch(3X)		curs_inch(3X)
@@ -66,6 +70,7 @@ mvcur(3X)		curs_terminfo(3X)
 mvwin(3X)		curs_window(3X)
 newterm(3X)		curs_initscr(3X)
 newwin(3X)		curs_window(3X)
+putwin(3X)		curs_util(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
@@ -73,6 +78,8 @@ set_curterm(3X)		curs_terminfo(3X)
 set_term(3X)		curs_initscr(3X)
 setcchar(3X)		curs_getcchar(3X)
 setupterm(3X)		curs_terminfo(3X)
+slk_attr(3X)		curs_slk(3X)
+slk_color(3X)		curs_slk(3X)
 slk_init(3X)		curs_slk(3X)
 slk_touch(3X)		curs_slk(3X)
 start_color(3X)		curs_color(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index ec0e39ba6..9f937aaf1 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.189 2023/12/23 16:32:37 tom Exp $
-.TH ncurses 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.192 2023/12/31 00:46:04 tom Exp $
+.TH ncurses 3X 2023-12-30 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -76,7 +76,7 @@ usage and interoperability with other \fIcurses\fP implementations.
 \*(``NOTES\*('' describes matters and caveats of which any user of the
 \fI\%ncurses\fP API should be aware,
 such as limitations on the size of an underlying integral type or the
-availability of a preprocessor macro for a function
+availability of a preprocessor macro exclusive of a function definition
 (which prevents its address from being taken).
 This section also describes implementation details that will be
 significant to the programmer but which are not standardized.
@@ -358,7 +358,9 @@ is the library in its \*(``non-wide\*('' configuration,
 handling only eight-bit characters.
 It stores a character combined with attributes in a
 .I \%chtype
-datum.
+datum,
+which is often an alias of
+.I int.
 .IP
 Attributes alone
 (with no corresponding character)
@@ -391,8 +393,8 @@ characters.
 corresponds to the non-wide configuration's
 .I \%chtype.
 It always a structure type,
-because it stores more data than can fit into an integer.
-A character code may be larger than can fit in a C
+because it stores more data than fits into an integral type.
+A character code may not be representable as a
 .I \%char,
 and moreover more than one character may occupy a cell
 (as with accent marks and other diacritics).
@@ -405,9 +407,8 @@ Attributes and color data are stored in separate fields of the
 structure,
 not combined as in
 .I \%chtype.
-.IP
-Each cell
-(row and column)
+.PP
+Each cell of a
 .I \%WINDOW
 is stored as a
 .I \%cchar_t.
@@ -424,18 +425,19 @@ depends on two data types standardized by ISO C95.
 stores a wide character.
 Like
 .I \%chtype,
-this may be an integer.
+it may be an alias of
+.I int.
 Depending on the character encoding,
 a wide character may be
 .I spacing,
 meaning that it occupies a character cell by itself and typically
-accompanies cursor advancement on input,
+accompanies cursor advancement,
 or
-.I combining,
+.I non-spacing,
 meaning that it occupies the same cell as a spacing character,
 is often regarded as a \*(``modifier\*('' of the base glyph with which
 it combines,
-and typically does not advance the cursor on input.
+and typically does not advance the cursor.
 .TP 9
 .I \%wint_t
 can store a
@@ -481,7 +483,7 @@ l l .
 \f(BIcurses\fP Function Name/Man Page
 _
 COLOR_PAIR/\fBcurs_color\fP(3X)
-PAIR_NUMBER/\fBcurs_attr\fP(3X)
+PAIR_NUMBER/\fBcurs_color\fP(3X)
 add_wch/\fBcurs_add_wch\fP(3X)
 add_wchnstr/\fBcurs_add_wchstr\fP(3X)
 add_wchstr/\fBcurs_add_wchstr\fP(3X)
@@ -946,44 +948,36 @@ additional sets of functions may be available:
 \fBcurs_trace\fP(3X) - curses debugging routines
 .RE
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure and an
-integer value other than \fBERR\fP upon successful completion, unless
-otherwise noted in the routine descriptions.
-.PP
-As a general rule, routines check for null pointers passed as parameters,
-and handle this as an error.
-.PP
-All macros return the value of the \fBw\fP version, except \fBsetscrreg\fP,
-\fBwsetscrreg\fP, \fBgetyx\fP, \fBgetbegyx\fP, and \fBgetmaxyx\fP.
-The return values of
-\fBsetscrreg\fP,
-\fBwsetscrreg\fP,
-\fBgetyx\fP,
-\fBgetbegyx\fP, and
-\fBgetmaxyx\fP are undefined (i.e., these should not be used as the
-right-hand side of assignment statements).
+Unless otherwise noted,
+functions that return an integer return \fBOK\fP on success and
+\fBERR\fP on failure.
+Functions that return pointers return \fBNULL\fP on failure.
+Typically,
+.I \%ncurses
+treats a null pointer passed as a function parameter as a failure.
 .PP
 Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP and return an error if the position is outside the window,
+\fB\%wmove\fP and fail if the position is outside the window,
 or
 (for \*(``mvw\*('' functions)
 if the
 .I \%WINDOW
 pointer is null.
-Most \*(``mv\*(''-prefixed functions
-(except variadic functions such as \fB\%mvprintw\fP)
-are provided both as macros and functions.
-.PP
-Routines that return pointers return \fBNULL\fP on error.
 .SH ENVIRONMENT
 The following environment symbols are useful for customizing the
 runtime behavior of the \fI\%ncurses\fP library.
 The most important ones have been already discussed in detail.
 .SS \fICC\fP command-character
-When set, change occurrences of the command_character
-(i.e., the \fBcmdch\fP capability)
-of the loaded terminfo entries to the value of this variable.
-Very few terminfo entries provide this feature.
+When set,
+change the
+.B \%command_character
+.RB ( \%cmdch )
+capability value of loaded
+.I \%term\%info
+entries to the value of this variable.
+Very few
+.I \%term\%info
+entries provide this feature.
 .PP
 Because this name is also used in development environments to represent
 the C compiler's name,
@@ -1516,19 +1510,20 @@ when only low-level functions are needed.
 Those functions are described in these pages:
 .RS
 .bP
-\fBcurs_extend\fP(3X) \- miscellaneous curses extensions
+\fB\%curs_extend\fP(3X) \- miscellaneous \fIcurses\fP extensions
 .bP
-\fBcurs_inopts\fP(3X) \- \fBcurses\fP input options
+\fB\%curs_inopts\fP(3X) \- \fIcurses\fP input options
 .bP
-\fBcurs_kernel\fP(3X) \- low-level \fBcurses\fP routines
+\fB\%curs_kernel\fP(3X) \- low-level \fIcurses\fP routines
 .bP
-\fBcurs_termattrs\fP(3X) \- \fBcurses\fP environment query routines
+\fB\%curs_termattrs\fP(3X) \- \fIcurses\fP environment query routines
 .bP
-\fBcurs_termcap\fP(3X) \- \fBcurses\fP emulation of termcap
+\fB\%curs_termcap\fP(3X) \- \fIcurses\fP emulation of \fItermcap\fP
 .bP
-\fBcurs_terminfo\fP(3X) \- \fBcurses\fP interfaces to terminfo database
+\fB\%curs_terminfo\fP(3X) \- \fIcurses\fP interface to \fIterminfo\fP
+database
 .bP
-\fBcurs_util\fP(3X) \- miscellaneous \fBcurses\fP utility routines
+\fB\%curs_util\fP(3X) \- miscellaneous \fIcurses\fP utility routines
 .RE
 .TP 5
 \-\-with\-trace
@@ -1544,64 +1539,138 @@ tab stop initialization database
 .I \*d
 compiled terminal capability database
 .SH NOTES
-If standard output from a \fI\%ncurses\fP program is re-directed to
-something which is not a tty,
-screen updates will be directed to standard error.
-This was an undocumented feature of AT&T System V Release 3 curses.
+X/Open Curses permits most functions it specifies to be made available
+as macros as well.
+.\" See X/Open Curses Issue 4, Version 2, pp. 227-234.
+.\" See X/Open Curses Issue 7, pp. 311-318.
+\fI\%ncurses\fP does so
+.bP
+for functions that return values via their parameters,
+.bP
+to support obsolete features,
+.bP
+to reuse functions
+(for example,
+those that move the cursor before another operation),
+and
+.bP
+a few special cases.
+.PP
+If the standard output file descriptor of an
+.I \%ncurses
+program is redirected to something that is not a terminal device,
+the library writes screen updates to the standard error file descriptor.
+This was an undocumented feature of SVr3.
 .PP
 See subsection \*(``Header files\*('' below regarding symbols exposed by
 inclusion of \fI\%curses.h\fP.
 .SH EXTENSIONS
-The \fI\%ncurses\fP library can be compiled with an option
-(\fB\-DUSE_GETCAP\fP)
-that falls back to the old-style /etc/termcap file if the terminal setup code
-cannot find a terminfo entry corresponding to \fITERM\fP.
-Use of this feature is not recommended,
-as it essentially includes an entire termcap compiler in the
-\fI\%ncurses\fP startup code,
-at significant cost in core and startup cycles.
-.PP
-The \fI\%ncurses\fP library includes facilities for capturing mouse
-events on certain terminals
-(including xterm).
-See the \fBcurs_mouse\fP(3X)
-manual page for details.
-.PP
-The \fI\%ncurses\fP library includes facilities for responding to window
-resizing events, e.g., when running in an xterm.
-See the \fBresizeterm\fP(3X)
-and \fBwresize\fP(3X) manual pages for details.
-In addition, the library may be configured with a \fBSIGWINCH\fP handler.
-.PP
-The \fI\%ncurses\fP library extends the fixed set of function key
-capabilities of terminals by allowing the application designer to define
-additional key sequences at runtime.
-See the \fBdefine_key\fP(3X)
-\fBkey_defined\fP(3X),
-and \fBkeyok\fP(3X) manual pages for details.
-.PP
-The \fI\%ncurses\fP library can exploit the capabilities of terminals
-which implement the ISO\-6429 SGR 39 and SGR 49 controls,
+.I \%ncurses
+enables an application to capture mouse events on certain terminals,
+including
+.I \%xterm;
+see \fB\%curs_mouse\fP(3X).
+.PP
+.I \%ncurses
+provides a means of responding to window resizing events,
+as when running in a GUI terminal emulator application such as
+.I \%xterm;
+see \fB\%resizeterm\fP(3X) and \fB\%wresize\fP(3X).
+.PP
+.I \%ncurses
+allows an application to query the terminal for the presence of a wide
+variety of special keys;
+see \fB\%has_key\fP(3X).
+.PP
+.I \%ncurses
+extends the fixed set of function key capabilities specified by X/Open
+Curses by allowing the application programmer to define additional key
+sequences at runtime;
+see
+\fB\%define_key\fP(3X),
+\fB\%key_defined\fP(3X),
+and
+\fB\%keyok\fP(3X).
+.PP
+.I \%ncurses
+can exploit the capabilities of terminals implementing ISO\ 6429/ECMA-48
+SGR\ 39 and SGR\ 49 sequences,
 which allow an application to reset the terminal to its original
 foreground and background colors.
-From the users' perspective, the application is able to draw colored
-text on a background whose color is set independently, providing better
-control over color contrasts.
-See the \fBdefault_colors\fP(3X) manual page for details.
-.PP
-The \fI\%ncurses\fP library includes a function for directing
-application output to a printer attached to the terminal device.
-See the \fBcurs_print\fP(3X) manual page for details.
+From a user's perspective,
+the application is able to draw colored text on a background whose color
+is set independently,
+providing better control over color contrasts.
+See \fB\%default_colors\fP(3X).
+.PP
+An
+.I \%ncurses
+application can choose to hide the internal details of
+.I \%WINDOW
+structures,
+instead using accessor functions such as
+\fB\%is_scrollok\fP(3X).
+.PP
+.I \%ncurses
+enables an application to direct application output to a printer
+attached to the terminal device;
+see \fB\%curs_print\fP(3X).
+.PP
+.I \%ncurses
+offers \fB\%slk_attr\fP(3X) as a counterpart of \fB\%attr_get\fP(3X) for
+soft-label key lines,
+and \fB\%extended_slk_color\fP(3X) as a form of \fB\%slk_color\fP(3X)
+that can gather color information from them when many colors are
+supported.
+.PP
+Some extensions are only available if
+.I \%ncurses
+is compiled to support them;
+see section \*(``ALTERNATE CONFIGURATIONS\*('' above.
+.bP
+Rudimentary support for multi-threaded applications may be available;
+see \fBcurs_threads\fP(3X).
+.bP
+Functions that ease the management of multiple screens can be exposed;
+see \fBcurs_sp_funcs\fP(3X).
+.bP
+The compiler option
+.B \%\-DUSE_GETCAP
+causes the library to fall back to reading
+.I \%/etc/termcap
+if the terminal setup code cannot find a
+.I \%term\%info
+entry corresponding to
+.I TERM.
+Use of this feature is not recommended,
+as it essentially includes an entire
+.I termcap
+compiler in the
+.I \%ncurses
+startup code,
+at a cost in memory usage and application launch latency.
+.PP
+.I \%PDCurses
+and NetBSD
+.I curses
+incorporate some
+.I \%ncurses
+extensions.
+Individual man pages indicate where this is the case.
 .SH PORTABILITY
-The \fI\%ncurses\fP library is intended to be BASE-level conformant with
-XSI Curses.
-The EXTENDED XSI Curses functionality
-(including color support) is supported.
-.PP
-A small number of local differences
-(that is,
-individual differences between the XSI Curses and \fI\%ncurses\fP calls)
-are described in \fBPORTABILITY\fP sections of the library man pages.
+X/Open Curses defines two levels of conformance,
+\*(``base\*('' and \*(``enhanced\*(''.
+The latter includes several additional features,
+such as wide-character and color support.
+.I \%ncurses
+intends base-level conformance with X/Open Curses,
+and supports nearly all its enhanced features.
+.\" XXX: What's missing?  GBR counts untic(1), and that's all.
+.PP
+Differences between X/Open Curses and
+.I \%ncurses
+are documented in the \*(``PORTABILITY\*('' sections of applicable man
+pages.
 .SS "Error Checking"
 In many cases, X/Open Curses is vague about error conditions,
 omitting some of the SVr4 documentation.
@@ -1614,41 +1683,6 @@ The standard interface does not provide a way for the library
 to tell an application which of several possible errors were detected.
 Relying on this (or some other) extension will adversely affect the
 portability of curses applications.
-.SS "Extensions Versus Portability"
-Most of the extensions provided by \fI\%ncurses\fP have not been
-standardized.
-Some have been incorporated into other implementations, such as
-PDCurses or NetBSD curses.
-Here are a few to consider:
-.bP
-The routine \fBhas_key\fP is not part of XPG4, nor is it present in SVr4.
-See the \fBcurs_getch\fP(3X) manual page for details.
-.bP
-The routine \fBslk_attr\fP is not part of XPG4, nor is it present in SVr4.
-See the \fBcurs_slk\fP(3X) manual page for details.
-.bP
-The routines \fBgetmouse\fP, \fBmousemask\fP, \fBungetmouse\fP,
-\fBmouseinterval\fP, and \fBwenclose\fP relating to mouse interfacing are not
-part of XPG4, nor are they present in SVr4.
-See the \fBcurs_mouse\fP(3X) manual page for details.
-.bP
-The routine \fBmcprint\fP was not present in any previous curses implementation.
-See the \fBcurs_print\fP(3X) manual page for details.
-.bP
-The routine \fBwresize\fP is not part of XPG4, nor is it present in SVr4.
-See the \fBwresize\fP(3X) manual page for details.
-.bP
-The \fI\%WINDOW\fP structure's internal details can be hidden from application
-programs.
-See \fBcurs_opaque\fP(3X) for the discussion of \fBis_scrollok\fP, etc.
-.bP
-This implementation can be configured to provide rudimentary support
-for multi-threaded applications.
-See \fBcurs_threads\fP(3X) for details.
-.bP
-This implementation can also be configured to provide a set of functions which
-improve the ability to manage multiple screens.
-See \fBcurs_sp_funcs\fP(3X) for details.
 .SS "Padding Differences"
 In historic curses versions, delays embedded in the capabilities \fBcr\fP,
 \fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index d976fae88..505fca52c 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.41 2023/12/23 16:27:25 tom Exp $
-.TH scr_dump 5 2023-12-23 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.42 2023/12/30 22:06:36 tom Exp $
+.TH scr_dump 5 2023-12-30 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,8 +47,7 @@
 .SH NAME
 scr_dump \-
 \fIcurses\fR screen dump
-.SH SYNOPSIS
-.B scr_dump
+.\"SH SYNOPSIS
 .SH DESCRIPTION
 The curses library provides applications with the ability to write the
 contents of a window to an external file using \fBscr_dump\fP or \fBputwin\fP,
@@ -131,51 +130,46 @@ and adjust the \fI\%WINDOW\fP structure which was read back into memory.
 This is similar to Unix System\ V,
 but does not write a \*(``magic number\*('' to identify the file format.
 .SH PORTABILITY
-There is no standard format for \fBputwin\fP.
-This section gives a brief description of the existing formats.
+There is no standard format for
+.I curses
+screen dumps.
+A brief survey of the existing implementations follows.
 .SS "X/Open Curses"
-Refer to \fIX/Open Curses, Issue 7\fP (2009).
-.PP
-X/Open's documentation for \fIenhanced curses\fP says only:
+X/Open Curses, Issue 7 specifies little.
+It says
+(boldface emphasis added)
 .RS 3
 .PP
-The \fBgetwin(\ ) \fPfunction reads window-related data
-stored in the file by \fIputwin(\ )\fP.
-The function
-then creates and initializes a new window using that data.
+\*(``[t]he \fI\%getwin()\fP function reads window-related data stored in
+the file by \fI\%putwin()\fP.
+The function then creates and initializes a new window using that data.
 .PP
-The \fBputwin(\ )\fP function writes all data associated
-with \fIwin\fP into the \fI\%stdio\fP(3) stream to which \fIfilep\fP
-points, using an \fBunspecified format\fP.
-This information can be retrieved later using \fBgetwin(\ )\fP.
+The \fI\%putwin()\fP function writes all data associated with \fIwin\fP
+into the \fI\%stdio\fP stream to which \fIfilep\fP points,
+using an \fBunspecified format\fP.
+This information can be retrieved later using \fI\%getwin()\fP.\*(''
 .RE
 .PP
 In the mid-1990s when the X/Open Curses document was written,
-there were still systems using older, less capable curses libraries
-(aside from the BSD curses library which was not relevant to X/Open
-because it did not meet the criteria for \fIbase curses\fP).
-The document explained the term \*(``enhanced\*('' as follows:
-.RS 3
-.bP
-Shading is used to identify \fIX/Open Enhanced Curses\fP material,
-relating to interfaces included to provide enhanced capabilities
-for applications originally written to be compiled on systems
-based on the Unix operating system.
-Therefore, the features described may not be present on systems
-that conform to \fBXPG4 or to earlier XPG releases\fP.
-The relevant reference pages may provide additional
-or more specific portability warnings about use of the material.
-.RE
-.PP
-In the foregoing, emphasis was added to \fBunspecified format\fP
-and to \fBXPG4 or to earlier XPG releases\fP,
-for clarity.
-.SS "Unix System V"
-Unix System\ V curses identified the file format by writing a
-\*(``magic number\*('' at the beginning of the dump.
+there were still System\ V systems using older,
+less capable
+.I curses
+libraries.
+BSD
+.I curses
+was not relevant to X/Open because it did not meet the criteria
+for base-level conformance;
+see \fB\%ncurses\fP(3X).
+.SS "System V"
+System\ V
+.I curses
+identified the file format by writing a \*(``magic number\*('' at the
+beginning of the dump.
 The \fI\%WINDOW\fP data and the lines of text follow, all in binary form.
 .PP
-The Solaris curses source has these definitions:
+Solaris
+.I curses
+has the following definitions.
 .PP
 .RS 4
 .EX
@@ -190,9 +184,12 @@ The Solaris curses source has these definitions:
 .PP
 That is, the feature was likely introduced in SVr2 (1984),
 and improved in SVr3 (1987).
-The Solaris curses source has no magic number for SVr4 (1989).
-Other operating systems (AIX and HP-UX) use a magic number which would
-correspond to this definition:
+Solaris
+.I curses
+has no magic number for SVr4 (1989).
+Other System\ V operating systems
+(AIX and HP-UX)
+use a magic number that would correspond to the following.
 .PP
 .RS 4
 .EX
@@ -202,8 +199,8 @@ correspond to this definition:
 .RE
 .PP
 That octal number in bytes is 001, 035.
-Because most Unix vendors use big-endian hardware,
-the magic number is written with the high-order byte first, e.g.,
+Because most Unix vendors at the time used big-endian hardware,
+the magic number is written with the high-order byte first.
 .PP
 .RS 4
 .EX
@@ -211,16 +208,21 @@ the magic number is written with the high-order byte first, e.g.,
 .EE
 .RE
 .PP
-After the magic number, the \fI\%WINDOW\fP structure and line-data are
-written in binary format.
-While the magic number used by the Unix systems can be seen using \fBod\fP(1),
-none of the Unix systems documents the format used for screen-dumps.
+After the magic number,
+the \fI\%WINDOW\fP structure and line data are written in binary format.
+While the magic number used by these systems can be observed with
+\fIod\fP(1),
+none of them documents the format used for screen dumps.
 .PP
-The Unix systems do not use identical formats.
-While collecting information for for this manual page,
-the \fIsavescreen\fP test-program
-produced dumps of different size
-(all on 64-bit hardware, on 40x80 screens):
+Nor do they use an identical format,
+even with the System\ V family.
+The
+.I \%ncurses
+.I \%savescreen
+test program was used to collect information for this manual page.
+It produced dumps of different size
+(all on 64-bit hardware,
+on 40x80 screens):
 .bP
 AIX (51817 bytes)
 .bP
@@ -230,31 +232,49 @@ Solaris 10 (13273 bytes)
 .bP
 \fI\%ncurses\fP5 (12888 bytes)
 .SS Solaris
-As noted above, Solaris curses has no magic number corresponding
-to SVr4 curses.
-This is odd since Solaris was the first operating system
-to pass the SVr4 guidelines.
-Solaris has two versions of curses:
+As noted above,
+Solaris
+.I curses
+has no magic number corresponding to SVr4
+.I curses.
+This is odd,
+since Solaris was the first operating system to meet the SVr4
+guidelines.
+Solaris furthermore supplies two versions of
+.I curses.
 .bP
-The default curses library uses the SVr3 magic number.
+The default
+.I curses
+library uses the SVr3 magic number.
 .bP
-There is an alternate curses library in \fB/usr/xpg4\fP.
-This uses a textual format with no magic number.
+An alternate
+.I curses
+library
+(which we term
+.I \%xcurses),
+available in
+.I /usr/xpg4,
+uses a textual format with no magic number.
 .IP
-According to the copyright notice, the \fIxpg4\fP Solaris curses library was
-developed by MKS (Mortice Kern Systems) from 1990 to 1995.
+According to its copyright notice,
+this
+.I \%xcurses
+library was developed by MKS
+(Mortice Kern Systems) from 1990 to 1995.
 .IP
-Like ncurses6, there is a file-header with parameters.
-Unlike ncurses6, the contents of the window are written piecemeal,
-with coordinates and attributes for each chunk of text rather
-than writing the whole window from top to bottom.
+Like ncurses6,
+it includes a header with parameters.
+Unlike ncurses6,
+the contents of the window are written piecemeal,
+with coordinates and attributes for each chunk of text rather than
+writing the whole window from top to bottom.
 .SS PDCurses
-PDCurses added support for screen dumps in version 2.7 (2005).
-Like Unix System\ V and ncurses5,
+.I \%PDCurses
+added support for screen dumps in version 2.7 (2005).
+Like System\ V and ncurses5,
 it writes the \fI\%WINDOW\fP structure in binary,
 but begins the file with its three-byte identifier \*(``PDC\*('',
-followed by a one-byte version,
-e.g.,
+followed by a single-byte version number.
 .PP
 .RS 4
 .EX
@@ -262,23 +282,33 @@ e.g.,
 .EE
 .RE
 .SS NetBSD
-As of April 2017, NetBSD curses does
-not support \fBscr_dump\fP and \fBscr_restore\fP
-(or \fBscr_init\fP, \fBscr_set\fP),
-although it has \fBputwin\fP and \fBgetwin\fP.
+As of April 2017,
+NetBSD
+.I curses
+does not support \fB\%scr_dump\fP and \fB\%scr_restore\fP
+(or \fB\%scr_init\fP,
+\fB\%scr_set\fP),
+although it has \fB\%putwin\fP and \fB\%getwin\fP.
 .PP
-Like ncurses5, NetBSD \fBputwin\fP does not identify its dumps with a
-useful magic number.
+Like ncurses5,
+NetBSD \fB\%putwin\fP does not identify its dumps with a useful magic
+number.
 It writes
 .bP
-the curses shared library major and minor versions
-as the first two bytes (e.g., 7 and 1),
+the
+.I curses
+shared library major and minor versions as the first two bytes
+(for example,
+7 and 1),
 .bP
 followed by a binary dump of the \fI\%WINDOW\fP,
 .bP
-some data for wide-characters referenced by the \fI\%WINDOW\fP structure, and
+some data for wide characters referenced by the \fI\%WINDOW\fP
+structure,
+and
 .bP
-finally, lines as done by other implementations.
+finally,
+lines as done by other implementations.
 .SH EXAMPLES
 Given a simple program which writes text to the screen
 (and for the sake of example, limiting the screen-size to 10x20):
diff --git a/man/term.5 b/man/term.5
index ede2eb1c2..79aa21646 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.69 2023/12/23 16:08:25 tom Exp $
-.TH term 5 2023-12-23 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.70 2023/12/30 21:36:32 tom Exp $
+.TH term 5 2023-12-30 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,7 +111,7 @@ a) \fIheader\fP,
 .TP 3
 b) \fIterminal names\fP,
 .TP 3
-c) \fIboolean flags\fP,
+c) \fIBoolean flags\fP,
 .TP 3
 d) \fInumbers\fP,
 .TP 3
@@ -130,7 +130,7 @@ These integers are
 .TP 5
 (2) the size, in bytes, of the \fIterminal names\fP section;
 .TP 5
-(3) the number of bytes in the \fIboolean flags\fP section;
+(3) the number of bytes in the \fIBoolean flags\fP section;
 .TP 5
 (4) the number of short integers in the \fInumbers\fP section;
 .TP 5
@@ -140,7 +140,7 @@ These integers are
 .RE
 .PP
 The capabilities in the
-\fIboolean flags\fP,
+\fIBoolean flags\fP,
 \fInumbers\fP, and
 \fIstrings\fP
 sections are in the same order as the file <term.h>.
@@ -168,14 +168,14 @@ If a capability is absent from this terminal,
 .IP
 The integer value \-1 is represented by two bytes 0377, 0377.
 .br
-Absent boolean values are represented by the byte 0 (false).
+Absent Boolean values are represented by the byte 0 (false).
 .bP
 If a capability has been canceled from this terminal,
 @TIC@ stores a \-2 in the corresponding table.
 .IP
 The integer value \-2 is represented by two bytes 0377, 0376.
 .br
-The boolean value \-2 is represented by the byte 0376.
+The Boolean value \-2 is represented by the byte 0376.
 .br
 .bP
 Other negative values are illegal.
@@ -187,11 +187,11 @@ separated by the \*(``|\*('' character.
 The \fIterminal names\fP section is terminated
 with an \s-1ASCII NUL\s+1 character.
 .PP
-The \fIboolean flags\fP section has one byte for each flag.
+The \fIBoolean flags\fP section has one byte for each flag.
 Boolean capabilities are either 1 or 0 (true or false)
 according to whether the terminal supports the given capability or not.
 .PP
-Between the \fIboolean flags\fP section and the \fInumber\fP section,
+Between the \fIBoolean flags\fP section and the \fInumber\fP section,
 a null byte will be inserted, if necessary,
 to ensure that the \fInumber\fP section begins on an even byte
 This is a relic of the PDP\-11's word-addressed architecture,
@@ -199,7 +199,7 @@ originally designed to avoid traps induced
 by addressing a word on an odd byte boundary.
 All short integers are aligned on a short word boundary.
 .PP
-The \fInumbers\fP section is similar to the \fIboolean flags\fP section.
+The \fInumbers\fP section is similar to the \fIBoolean flags\fP section.
 Each capability takes up two bytes,
 and is stored as a little-endian short integer.
 .PP
@@ -219,7 +219,7 @@ stored intact in uninterpreted form.
 The previous section describes the conventional terminfo binary format.
 With some minor variations of the offsets (see PORTABILITY),
 the same binary format is used in all modern Unix systems.
-Each system uses a predefined set of boolean, number or string capabilities.
+Each system uses a predefined set of Boolean, number or string capabilities.
 .PP
 The \fI\%ncurses\fP libraries and applications support
 extended terminfo binary format,
@@ -236,7 +236,7 @@ First, it reads the extended header (5 short integers):
 .RS 5
 .TP 5
 (1)
-count of extended boolean capabilities
+count of extended Boolean capabilities
 .TP 5
 (2)
 count of extended numeric capabilities
@@ -261,7 +261,7 @@ capabilities in the same order as the header information.
 .PP
 The extended string table contains values for string capabilities.
 After the end of these values, it contains the names for each of
-the extended capabilities in order, e.g., booleans, then numbers and
+the extended capabilities in order, e.g., Booleans, then numbers and
 finally strings.
 .PP
 By storing terminal descriptions in this way,
@@ -314,7 +314,7 @@ The routine
 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, number, and string capabilities.
+of Boolean, number, and string capabilities.
 .SS "Binary Format"
 X/Open Curses does not specify a format for the terminfo database.
 System V curses used a directory-tree of binary files,
diff --git a/man/terminfo.head b/man/terminfo.head
index 712da62c9..ae3d7e54e 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.59 2023/12/23 23:44:58 tom Exp $
-.TH terminfo 5 2023-12-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.60 2023/12/30 22:21:45 tom Exp $
+.TH terminfo 5 2023-12-30 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -163,10 +163,10 @@ or methods for exercising the terminal's features.
 .PP
 After the first field (giving the name(s) of the terminal entry),
 there should be one or more \fIcapability\fP fields.
-These are boolean, numeric or string names with corresponding values:
+These are Boolean, numeric or string names with corresponding values:
 .bP
 Boolean capabilities are true when present, false when absent.
-There is no explicit value for boolean capabilities.
+There is no explicit value for Boolean capabilities.
 .bP
 Numeric capabilities have a \*(``#\*('' following the name,
 then an unsigned decimal integer value.
diff --git a/man/terminfo.tail b/man/terminfo.tail
index dc527831a..bc7614048 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.140 2023/12/23 16:23:35 tom Exp $
+.\" $Id: terminfo.tail,v 1.141 2023/12/30 21:36:32 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -46,7 +46,7 @@ When \fB\-x\fP is set,
 \fB@TIC@\fP treats unknown capabilities as user-defined.
 That is, if \fB@TIC@\fP encounters a capability name
 which it does not recognize,
-it infers its type (boolean, number or string) from the syntax
+it infers its type (Boolean, number or string) from the syntax
 and makes an extended table entry for that capability.
 The \fBuse_extended_names\fP(3X) function makes this information
 conditionally available to applications.
@@ -56,7 +56,7 @@ behavior to applications:
 User-defined capability strings whose name begins
 with \*(``k\*('' are treated as function keys.
 .bP
-The types (boolean, number, string) determined by \fB@TIC@\fP
+The types (Boolean, number, string) determined by \fB@TIC@\fP
 can be inferred by successful calls on \fBtigetflag\fP, etc.
 .bP
 If the capability name happens to be two characters,
@@ -68,7 +68,7 @@ in practice it has been limited to the capabilities 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
+be limited to Booleans and numbers to avoid running past the 1023 byte
 limit assumed by termcap implementations and their applications.
 In particular, providing extended sets of function keys (past the 60
 numbered keys and the handful of special named keys) is best done using
@@ -883,7 +883,7 @@ or
 on many terminals without a true insert/delete line,
 and is often faster even on terminals with those features.
 .PP
-The boolean \fBnon_dest_scroll_region\fP should be set if each scrolling
+The Boolean \fBnon_dest_scroll_region\fP 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,
@@ -1536,7 +1536,7 @@ capability \fBwsl\fP.
 .PP
 A command to erase or blank the status line may be specified as \fBdsl\fP.
 .PP
-The boolean capability \fBeslok\fP specifies that escape sequences, tabs,
+The Boolean capability \fBeslok\fP specifies that escape sequences, tabs,
 etc., work ordinarily in the status line.
 .PP
 The \fI\%ncurses\fP implementation does not yet use any of these
@@ -1648,7 +1648,7 @@ The \fBoc\fP 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
+than the power-up default background; these should have the Boolean capability
 \fBbce\fP.
 .PP
 While the curses library works with \fIcolor pairs\fP
@@ -1730,7 +1730,7 @@ take a color number (0 to \fBcolors\fP \- 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 \fBhls\fP is present,
+If the Boolean capability \fBhls\fP is present,
 they are instead as HLS (Hue, Lightness, Saturation) indices.
 The ranges are
 terminal-dependent.
diff --git a/man/tic.1m b/man/tic.1m
index 7471ad8b7..b14768235 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.105 2023/12/23 16:08:25 tom Exp $
-.TH @TIC@ 1M 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.106 2023/12/30 21:36:32 tom Exp $
+.TH @TIC@ 1M 2023-12-30 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -398,7 +398,7 @@ If it is omitted, it defaults to 60.
 \fB\-x\fP
 Treat unknown capabilities as user-defined (see \fBuser_caps\fP(5)).
 That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
-it will infer its type (boolean, number or string) from the syntax and
+it will infer its type (Boolean, number or 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 keys.
diff --git a/man/tput.1 b/man/tput.1
index e1e9d9d41..48ad00c9d 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.96 2023/12/23 20:55:36 tom Exp $
-.TH @TPUT@ 1 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.97 2023/12/31 00:16:41 tom Exp $
+.TH @TPUT@ 1 2023-12-30 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -51,7 +51,8 @@
 \fB\%reset\fP \-
 initialize a terminal or query \fI\%term\%info\fP database
 .SH SYNOPSIS
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fIcap-code\fP [\fIparameter\fP .\|.\|.]
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
+{\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|.
 .PP
 \fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
 .PP
@@ -249,6 +250,18 @@ strings are, the \fIinitialization\fP strings will be output.
 Otherwise, \fBreset\fP acts identically to \fBinit\fP.
 .TP
 .B longname
+A terminfo entry begins with one or more names by which an
+application can refer to the entry,
+before the list of terminal capabilities.
+The names are separated by \*(``|\*('' characters.
+X/Open states that the last name is the \*(``long name\*(''
+and also that it may include blanks.
+.IP
+\fB\%@TIC@\fP warns if the last name does not include blanks,
+to accommodate old terminfo entries which treated
+the long name as an optional feature.
+The long name is often referred to as the description field.
+.IP
 If the terminal database is present and an entry for the user's terminal
 exists
 (see
@@ -259,7 +272,7 @@ above),
 (or \*(``long name\*('')
 to the standard output,
 without a trailing newline.
-See \fBterm\fP(5).
+See \fB\%term\%info\fP(5).
 .SS Aliases
 \fB@TPUT@\fP handles the \fBclear\fP, \fBinit\fP and \fBreset\fP
 commands specially:
@@ -645,12 +658,12 @@ moves the cursor to position
 and turns on bold
 (extra bright)
 mode.
-.IP
-The same sequence of commands can be combined using the OpenBSD feature:
-.IP
-.EX
-$ \fB@TPUT@ \fBclear\fP \fBcup 10 10\fP \fBbold\fP
-.EE
+.TP 5
+.B @TPUT@ clear cup 10 10 bold
+Perform the same actions as the foregoing
+.RB \%\[lq] @TPUT@
+.BR \-S \[rq]
+example.
 .SH SEE ALSO
 \fB\%@CLEAR@\fP(1),
 \fB\%stty\fP(1),
diff --git a/man/user_caps.5 b/man/user_caps.5
index 978edbc49..ac4da9f71 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.43 2023/12/23 16:08:25 tom Exp $
-.TH user_caps 5 2023-12-23 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.44 2023/12/30 21:36:32 tom Exp $
+.TH user_caps 5 2023-12-30 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,7 +61,7 @@ and extended in stages through SVr4 (1989),
 and standardized in the Single Unix Specification beginning in 1995.
 .PP
 Most of the \fIextensions\fP in this fixed repertoire were additions
-to the tables of boolean, numeric and string capabilities.
+to the tables of Boolean, numeric and string capabilities.
 Rather than change the meaning of an existing capability, a new name was added.
 The terminfo database uses a binary format; binary compatibility was
 ensured by using a header which gave the number of items in the
@@ -192,7 +192,7 @@ While the terminfo database may have other extensions,
 .RS 3
 .TP 3
 AX
-\fIboolean\fP, asserts that the terminal interprets SGR 39 and SGR 49
+\fIBoolean\fP, asserts that the terminal interprets SGR 39 and SGR 49
 by resetting the foreground and background color, respectively, to the default.
 .IP
 This is a feature recognized by the \fBscreen\fP program as well.
@@ -205,7 +205,7 @@ the terminal.
 The command \*(``\fBtput clear\fP\*('' does the same thing.
 .TP 3
 NQ
-\fIboolean\fP,
+\fIBoolean\fP,
 used to suppress a consistency check in @TIC@ for the \fI\%ncurses\fP
 capabilities
 in user6 through user9 (u6, u7, u8 and u9)
@@ -213,7 +213,7 @@ which tell how to query the terminal's cursor position
 and its device attributes.
 .TP 3
 RGB
-\fIboolean\fP, \fInumber\fP \fBor\fP \fIstring\fP,
+\fIBoolean\fP, \fInumber\fP \fBor\fP \fIstring\fP,
 used to assert that the
 \fBset_a_foreground\fP and
 \fBset_a_background\fP capabilities correspond to \fIdirect colors\fP,
@@ -225,7 +225,7 @@ to initialize colors using \fBinit_color\fP.
 The capability type determines the values which \fI\%ncurses\fP sees:
 .RS 3
 .TP 3
-\fIboolean\fP
+\fIBoolean\fP
 implies that the number of bits for red, green and blue are the same.
 Using the maximum number of colors,
 \fI\%ncurses\fP adds two,
@@ -239,7 +239,7 @@ of three, the blue (and green) components lose in comparison to red.
 \fInumber\fP
 tells \fI\%ncurses\fP what result to add to red, green and blue.
 If \fI\%ncurses\fP runs out of bits,
-blue (and green) lose just as in the \fIboolean\fP case.
+blue (and green) lose just as in the \fIBoolean\fP case.
 .TP 3
 \fIstring\fP
 explicitly list the number of bits used for red, green and blue components
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 9f9cb5450..fc14735ec 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1085 $
-#	$Date: 2023/12/16 13:48:44 $
+#	$Revision: 1.1092 $
+#	$Date: 2023/12/30 18:05:02 $
 #
 # 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
@@ -4632,6 +4632,78 @@ ms-vt100+|vt100+|windows XP VT100+ (sic),
 ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+,
 	use=ms-vt100+,
 
+# VT-UTF-8 and VT100+ Protocols
+# https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-vuvp/969416c0-ccd6-4a75-a9b3-597d7713845b
+#
+# This Microsoft "protocol" adapted the aixterm 16-color feature from xterm's
+# documentation in 2015, as seen in successive revisions:
+#
+# 2013/07/22 has 8 colors
+# 2015/10/16 has 16 colors using SGR 90-97, 100-107 as well as SGR 24 and 27,
+#            adds "informative" reference to xterm's ctlseqs
+#
+# The cnorm/civis definitions added in 2015 are unrelated to any standard.
+ms-vt100-16color|VT-UTF-8 and VT100+,
+	civis=\E[?h, cnorm=\E[?l, rmso=\E[27m, rmul=\E[24m,
+	use=ibm+16color, use=ms-vt100+,
+
+# Based on
+# https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
+# We use this scheme to map function keys
+#       terminfo        modifier        code    keys
+#       kf13-kf24       shift           2       F1 to F12
+#       kf25-kf36       alt             3       F1 to F12
+#       kf37-kf48       control         4       F1 to F12
+#       kf49-kf60       ctrl-alt        7       F1 to F12
+#
+# Unclear: smam and rmam implemented?
+# Unclear: rmkx, smkx, rmir, smir - irrelevant?
+#
+# TD:
+# +	According to tack, tbc and cbt fail.
+# +	The line-drawing (acsc) does not work in telnet or ssh.  I added the
+#	U8 extension to tell ncurses to use UTF-8 for line-drawing (when the
+#	locale uses UTF-8).  That won't work for telnet (which uses ASCII),
+#	but seems to work for OpenSSH's ssh.  I set the codepage to 65001,
+#	of course.
+# +	Function keys... do not work consistently in telnet and ssh.  With
+#	telnet, kf1-kf4 are \EOP to \EOS, and kf5-kf12 match the terminfo.
+#	But with ssh, it's entirely different (reminds me of rxvt).
+winconsole|Windows 10 new console,
+	am, km, mir, msgr, xenl, AX,
+	ncv@, U8#1,
+	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+	     yzz~~,
+	bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n,
+	invis@, is1=\E[!p, kdch1=\E[3~, kend=\E[4~, kf1=\E[11~,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[11;2~,
+	kf14=\E[12;2~, kf15=\E[13;2~, kf16=\E[14;2~,
+	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\E[12~,
+	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
+	kf23=\E[24;2~, kf24=\E[25;2~, kf25=\E[11;3~,
+	kf26=\E[12;3~, kf27=\E[13;3~, kf28=\E[14;3~,
+	kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~, kf31=\E[18;3~,
+	kf32=\E[19;3~, kf33=\E[20;3~, kf34=\E[21;3~,
+	kf35=\E[24;3~, kf36=\E[25;3~, kf37=\E[11;4~,
+	kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~, kf40=\E[14;4~,
+	kf41=\E[15;4~, kf42=\E[17;4~, kf43=\E[18;4~,
+	kf44=\E[19;4~, kf45=\E[20;4~, kf46=\E[21;4~,
+	kf47=\E[24;4~, kf48=\E[25;4~, kf49=\E[11;7~, kf5=\E[15~,
+	kf50=\E[12;7~, kf51=\E[13;7~, kf52=\E[14;7~,
+	kf53=\E[15;7~, kf54=\E[17;7~, kf55=\E[18;7~,
+	kf56=\E[19;7~, kf57=\E[20;7~, kf58=\E[21;7~,
+	kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
+	knp=\E[6~, kpp=\E[5~, nel=\r\n, ri=\E[T, rmacs=\E(B, rmir@,
+	rmpch@, rs1=\E[!p,
+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
+	    \E(0%e\E(B%;,
+	sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ecma+index, use=ansi+inittabs,
+	use=ansi+local, use=ecma+sgr, use=ecma+color,
+	use=vt220+cvis,
+
 # Windows Terminal (Preview)
 # https://github.com/microsoft/terminal
 #
@@ -6035,6 +6107,23 @@ xterm-pcolor|xterm with color used for highlights and status line,
 	    %t;7;31%;%?%p3%t;7;34%;m,
 	smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6,
 
+# This was mentioned
+#	http://unix.stackexchange.com/questions/119/colors-in-man-pages
+# pointing to
+#	http://nion.modprobe.de/blog/archives/569-colored-manpages.html
+#	(blog posting by Nico Golde, June 24 2007)
+# archive:
+#	https://web-beta.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
+# The comment hints where it started, but there are differences:
+#	Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor
+mostlike|manpages with color looking like most,
+	OTbs@,
+	bold=\E[1m\E[31m,
+	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H,
+	meml@, memu@, rev=\E[7m\E[34m,
+	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sgr@,
+	smso=\E[1;30m\E[47m, smul=\E[32m, TS@, use=xterm-pcolor,
+
 # This describes the capabilities of color_xterm, an xterm variant from
 # before ECMA-48 color support was folded into the main-line xterm release.
 # This entry is straight from color_xterm's maintainer.
@@ -7806,6 +7895,13 @@ alacritty+common|base fragment for alacritty,
 	use=xterm+sl-twm, use=ecma+italics, use=xterm+pce2,
 	use=xterm+pcc2, use=xterm+pcf2, use=bracketed+paste,
 
+# https://github.com/raphamorim/rio
+# derived from alacritty
+rio|fork of alacritty,
+	use=alacritty,
+rio-direct|fork of alacritty,
+	use=alacritty-direct,
+
 #### Kitty
 # https://github.com/kovidgoyal/kitty
 # Project started in 2016/10 (see alacritty), but is a Python script rather
@@ -8069,6 +8165,149 @@ domterm|DomTerm web client,
 	use=xterm+pcfkeys, use=xterm-basic,
 	use=bracketed+paste,
 
+######## Miscellaneous
+
+#### WezTerm
+# https://wezfurlong.org/wezterm/
+# https://github.com/wez/wezterm
+#
+# which says:
+# "wezterm is a terminal emulator with support for modern features
+#  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
+#
+# wezterm-20230712_072601_f4abf8fd-1.fedora38.x86_64
+# tested with MacOS and Fedora 38/39.
+#
+# General:
+# + written in Rust.
+# + initial screensize is odd, i.e., 81x24
+#   provides no visual feedback on resize
+#   ignores "resize -s"
+#   manual resize and then running resize got off-by-one adjustment
+# + leaves debris (unerased cells) when switching between normal/alternate
+#   screens.
+# + sets TERM=xterm-256color
+# tack:
+# + misplaced message in "am" screen
+# + fails xenl (should be false)
+# + cvvis is same as cnorm, block
+# + has blink and dim
+# + in bce test, blue isn't really blue but some pale purple
+# + modified keys mostly work, but its tab control interferes with some
+# + rmm/smm don't work (always uses escape-prefix)
+# wraptest:
+# + poor (doesn't copy anyone, most of the results are wrong)
+# vttest:
+# + DA is VT5xx with sixel, selective erase, user windows, color
+# + DA2 is VT220 version 277
+# + only the VT100 character set works, contrary to DA/DA2.
+# + no NRCS, either
+# + double-sized character work, with some debris
+# + doesn't switch between 80/132 columns.
+# + numeric keypad ANSI application mode escapes don't work.
+# + numeric keypad ANSI mode misses "0", ".", ","
+# + uses PC-style editing keypad \E[H and \E[F for Find and Select
+# + no VT52
+# + DECSED selective erase doesn't work
+# + SRM doesn't work
+# + 8-bit controls don't work
+# + DECNCSM doesn't work
+# + most DECRQSS do not work (DECSCL, DECSTBM, DECSLRM respond)
+# + DECRQM/DECRPM don't work (most reply permanently reset)
+# + DECLRMM responds to DECRPM, but VT420 rectangle tests do not work.
+#   Some of the left/right margin tests work with the cursor-movement screen,
+#   but DECFI/DECBI do not work.  The other cursor-movement tests are buggy.
+# + implements ECMA-48 cursor movement, but not SL/SR or protected area
+# + implements xterm normal, any-event and button-event mouse, none of the rest
+# + reports window size, none of the other window reports
+wezterm|Wez's Terminal Emulator,
+	km@, xenl@,
+	cvvis@, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
+	use=xterm-256color,
+
+#### Contour
+# https://github.com/contour-terminal/contour
+#
+# "Modern C++ Terminal Emulator"
+# Contour is a modern and actually fast, modal, virtual terminal emulator,
+# for everyday use. It is aiming for power users with a modern feature mindset.
+#
+# That is three occurrences of "modern" too many -TD
+#
+# MacOS
+# - cannot run, because the package is not signed.
+#
+# Fedora rawhide
+# contour-terminal-0.3.12.262-6.fc39.x86_64
+# - dumps core, cannot test
+#
+# Fedora 39
+# contour-terminal-0.4.0.6245-1.fc38.x86_64
+# - starts but doesn't display
+#
+# Fedora 38
+# contour-terminal-0.4.0.6245-1.fc38.x86_64
+# - starts but doesn't display
+# contour-terminal-0.3.12.262-1.fc38.x86_64
+# + testable (see below)
+# + initial screensize 62x23, no visual feedback on resize, no "resize -s"
+#
+# Sets TERM=contour (which is preferable to xterm).
+#
+# tack:
+# + cvvis is same as cnorm, "|"
+# + sitm/ritm don't work
+# + rmm/smm don't work (always uses escape, but terminfo defines km)
+# + initp interchanges red/blue (bug in tack?)
+# + modified F1-F4 are wrong, sending SS3 with modifier numbers
+# + shifted editing-keypad doesn't send anything
+# + meta key doesn't work
+# + status-line works (based on xterm, including window-resizing)
+# + dots don't line up for home test
+#
+# wraptest:
+# + poor 7/25 differences from xterm (perhaps copying iTerm2)
+#
+# vttest:
+# + hangs in menu 1, etc., when it tries to resize
+#
+# infocmp vs xterm-256color
+# + missing XM/xm
+# + rmcup/smcup doesn't use title-stack (but is implemented)
+# + doesn't use SGR mouse (but is implemented)
+# + sgr doesn't define dim, but dim capability is in terminfo (implemented)
+#
+# Developer's terminfo (compiled-in) uses some extensions.
+contour|contour-latest|Contour Terminal Emulator,
+	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
+	cols#80, it#8, lines#24, pairs#0x7fff,
+	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
+	ht=^I, hts=\EH, ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=,
+	ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z, kend=\EOF, khlp=,
+	kmous=\E[M, kund=, oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m,
+	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l,
+	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	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(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
+	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
+	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl, use=ansi+rep,
+	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
+	use=xterm+256color, use=xterm+alt1049, use=xterm+pcc2,
+	use=xterm+pce2, use=xterm+pcf2,
+
+contour-direct|Contour terminal with direct colors,
+	use=xterm+direct, use=contour,
+
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
 
@@ -27781,4 +28020,10 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2023-12-16
 #	+ used "infocmp -u" to help trim redundant capabilities -TD
 #
+# 2023-12-30
+#	+ add ms-vt100-16color, winconsole -TD
+#	+ add rio, rio-direct -TD
+#	+ add mostlike -TD
+#	+ add wezterm, contour -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 604dfb490..9459746b4 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231223) unstable; urgency=low
+ncurses6 (6.4+20231230) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:26 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 604dfb490..9459746b4 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231223) unstable; urgency=low
+ncurses6 (6.4+20231230) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:26 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 523158415..c761be365 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231223) unstable; urgency=low
+ncurses6 (6.4+20231230) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Dec 2023 06:35:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:25 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d6da23ae3..d3d794f7a 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.625 2023/12/23 11:35:00 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.626 2023/12/29 10:35:26 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1223"
+!define VERSION_MMDD  "1230"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9f0736e32..bb2342127 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231223
+Release: 20231230
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 391eed7ae..38bf5ff59 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231223
+Release: 20231230
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index cfe212cb3..274293d4e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231223
+Release: 20231230
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 6c1e6cbf4fc8fdf04327a2e01f5def671fc07de9 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 7 Jan 2024 01:49:18 +0100
Subject: [PATCH 048/106] ncurses-6.4-20240106.patch

---
 Ada95/package/debian/copyright        |    4 +-
 COPYING                               |    4 +-
 NEWS                                  |   11 +-
 VERSION                               |    2 +-
 dist.mk                               |   17 +-
 doc/html/man/curs_bkgd.3x.html        |    8 +-
 doc/html/man/curs_bkgrnd.3x.html      |   12 +-
 doc/html/man/curs_clear.3x.html       |   26 +-
 doc/html/man/curs_inopts.3x.html      |   24 +-
 doc/html/man/curs_kernel.3x.html      |   22 +-
 doc/html/man/curs_outopts.3x.html     |   14 +-
 doc/html/man/curs_overlay.3x.html     |   14 +-
 doc/html/man/curs_pad.3x.html         |   14 +-
 doc/html/man/curs_refresh.3x.html     |   22 +-
 doc/html/man/curs_termattrs.3x.html   |   26 +-
 doc/html/man/curs_util.3x.html        |   34 +-
 doc/html/man/curs_variables.3x.html   |   30 +-
 doc/html/man/form_hook.3x.html        |   10 +-
 doc/html/man/infocmp.1m.html          |   12 +-
 doc/html/man/ncurses.3x.html          |   12 +-
 doc/html/man/terminfo.5.html          |    6 +-
 man/curs_clear.3x                     |   14 +-
 man/curs_kernel.3x                    |   12 +-
 man/curs_outopts.3x                   |    8 +-
 man/curs_overlay.3x                   |    8 +-
 man/curs_pad.3x                       |    8 +-
 man/curs_refresh.3x                   |   12 +-
 man/curs_termattrs.3x                 |   14 +-
 man/curs_util.3x                      |   22 +-
 man/curs_variables.3x                 |   16 +-
 man/form_hook.3x                      |    8 +-
 man/man_db.renames.in                 |    7 +-
 man/ncurses.3x                        |   48 +-
 misc/terminfo.src                     | 3707 ++++++++++++-------------
 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/debian/rules                  |    6 +-
 package/mingw-ncurses.nsi             |    6 +-
 package/mingw-ncurses.spec            |    2 +-
 package/ncurses.spec                  |    2 +-
 package/ncursest.spec                 |    2 +-
 test/package/debian-mingw/copyright   |    4 +-
 test/package/debian-mingw64/copyright |    4 +-
 test/package/debian/copyright         |    4 +-
 48 files changed, 2049 insertions(+), 2213 deletions(-)

diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright
index 3c8e52563..b4060150e 100644
--- a/Ada95/package/debian/copyright
+++ b/Ada95/package/debian/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 by Thomas E. Dickey
+Copyright: 2017-2023,2024 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2010-2020,2021 by Thomas E. Dickey
+Copyright: 2010-2023,2024 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/COPYING b/COPYING
index 2abcc60d6..540047f12 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright 2018-2022,2023 Thomas E. Dickey
+Copyright 2018-2023,2024 Thomas E. Dickey
 Copyright 1998-2017,2018 Free Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written
 authorization.
 
 -- vile:txtmode fc=72
--- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $
+-- $Id: COPYING,v 1.13 2024/01/05 21:13:17 tom Exp $
diff --git a/NEWS b/NEWS
index 8f115f89c..cfcc1d3bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2018-2022,2023 Thomas E. Dickey                                 --
+-- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
 -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4057 2023/12/31 00:17:55 tom Exp $
+-- $Id: NEWS,v 1.4062 2024/01/06 23:40:56 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240106
+	+ use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc,
+	  ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD
+	+ minor manpage formatting changes for consistency.
+	+ modify doc-html test package's install-directory, per lintian.
+	+ add attr_get.3x to man_db.renames.in (patch by Sven Joachim).
+
 20231230
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ add ms-vt100-16color, winconsole -TD
diff --git a/VERSION b/VERSION
index d7b546150..bb21a273b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20231230
+5:0:10	6.4	20240106
diff --git a/dist.mk b/dist.mk
index 69ec2bfea..ba3338a46 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1586 2023/12/30 11:24:34 tom Exp $
+# $Id: dist.mk,v 1.1591 2024/01/06 11:19:36 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20231230
+NCURSES_PATCH = 20240106
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -63,7 +63,7 @@ GNATHTML= gnathtml
 # would remove some text.  The man program on Redhat 6.1 appears to work with
 # man2html if we set the top/bottom margins to 6 (the default is 7).  Newer
 # versions of 'man' leave no margin (and make it harder to sync with pages).
-MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index
+MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index -mixsecs
 
 ALL	= ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml
 
@@ -124,9 +124,10 @@ manhtml:
 	@echo 's/<I>/<EM>/g'         >> subst.tmp
 	@echo 's/<\/I>/<\/EM>/g'     >> subst.tmp
 	@misc/csort < subst.tmp | uniq > subst.sed
-	@echo '/<\/TITLE>/a\' >> subst.sed
-	@echo '<link rel="author" href="mailto:bug-ncurses@gnu.org">\' >> subst.sed
-	#@rm -f subst.tmp
+	@echo 's%[_-]*_-[_-]*%_%g'   >> subst.sed
+	@echo '/<\/TITLE>/a\\'       >> subst.sed
+	@echo '<link rel="author" href="mailto:bug-ncurses@gnu.org">\\' >> subst.sed
+	@rm -f subst.tmp
 	@for f in man/*.[0-9]* ; do \
 	   m=`basename $$f` ;\
 	   T=`$${EGREP-grep -E} '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[ 	]\+$$//'` ; \
@@ -152,7 +153,7 @@ manhtml:
 		   sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \
 	   >> doc/html/man/$$g ;\
 	done
-	#@rm -f subst.sed
+	@rm -f subst.sed
 
 #
 # Please note that this target can only be properly built if the build of the
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 078fd7938..6a487215c 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        on the screen.
 
 
-</PRE><H3><a name="h3-bkgd_-wbkgd">bkgd, wbkgd</a></H3><PRE>
+</PRE><H3><a name="h3-bkgd_wbkgd">bkgd, wbkgd</a></H3><PRE>
        <STRONG>bkgd</STRONG>  and  <STRONG>wbkgd</STRONG> set the background property of <STRONG>stdscr</STRONG> or the specified
        window and then apply this setting to  every  character  cell  in  that
        window.
@@ -129,7 +129,7 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        character's color attribute.
 
 
-</PRE><H3><a name="h3-bkgdset_-wbkgdset">bkgdset, wbkgdset</a></H3><PRE>
+</PRE><H3><a name="h3-bkgdset_wbkgdset">bkgdset, wbkgdset</a></H3><PRE>
        <STRONG>bkgdset</STRONG> and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the  applicable
        window, without updating the character cells as <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> do; only
        future writes reflect the updated background.
@@ -197,8 +197,8 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-bkgd_-wbkgd">bkgd, wbkgd</a></li>
-<li><a href="#h3-bkgdset_-wbkgdset">bkgdset, wbkgdset</a></li>
+<li><a href="#h3-bkgd_wbkgd">bkgd, wbkgd</a></li>
+<li><a href="#h3-bkgdset_wbkgdset">bkgdset, wbkgdset</a></li>
 <li><a href="#h3-getbkgd">getbkgd</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 8dcd4c412..376210a53 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        on the screen.
 
 
-</PRE><H3><a name="h3-bkgrnd_-wbkgrnd">bkgrnd, wbkgrnd</a></H3><PRE>
+</PRE><H3><a name="h3-bkgrnd_wbkgrnd">bkgrnd, wbkgrnd</a></H3><PRE>
        <STRONG>bkgrnd</STRONG>  and  <STRONG>wbkgrnd</STRONG>  set  the  background  property  of  <STRONG>stdscr</STRONG> or the
        specified window and then apply this setting to every character cell in
        that window.
@@ -130,13 +130,13 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        character's color attribute.
 
 
-</PRE><H3><a name="h3-bkgrndset_-wbkgrndset">bkgrndset, wbkgrndset</a></H3><PRE>
+</PRE><H3><a name="h3-bkgrndset_wbkgrndset">bkgrndset, wbkgrndset</a></H3><PRE>
        <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> manipulate the background  of  the  applicable
        window,  without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG> do;
        only future writes reflect the updated background.
 
 
-</PRE><H3><a name="h3-getbkgrnd_-wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
+</PRE><H3><a name="h3-getbkgrnd_wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
        The <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the background  character
        and  attribute  pair of <STRONG>stdscr</STRONG> or the specified window and store it via
        the <EM>wch</EM> pointer.
@@ -185,9 +185,9 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-bkgrnd_-wbkgrnd">bkgrnd, wbkgrnd</a></li>
-<li><a href="#h3-bkgrndset_-wbkgrndset">bkgrndset, wbkgrndset</a></li>
-<li><a href="#h3-getbkgrnd_-wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></li>
+<li><a href="#h3-bkgrnd_wbkgrnd">bkgrnd, wbkgrnd</a></li>
+<li><a href="#h3-bkgrndset_wbkgrndset">bkgrndset, wbkgrndset</a></li>
+<li><a href="#h3-getbkgrnd_wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 359c94412..e63e5583c 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.41 2023/12/16 21:09:11 tom Exp @
+  * @Id: curs_clear.3x,v 1.44 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -69,7 +69,7 @@ <H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-erase_werase">erase/werase</a></H3><PRE>
+</PRE><H3><a name="h3-erase_werase">erase, werase</a></H3><PRE>
        The <STRONG>erase</STRONG> and <STRONG>werase</STRONG> routines copy blanks  to  every  position  in  the
        window, clearing the screen.
 
@@ -77,20 +77,20 @@ <H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>) merged into them.
 
 
-</PRE><H3><a name="h3-clear_wclear">clear/wclear</a></H3><PRE>
+</PRE><H3><a name="h3-clear_wclear">clear, wclear</a></H3><PRE>
        The <STRONG>clear</STRONG> and <STRONG>wclear</STRONG> routines are like <STRONG>erase</STRONG> and <STRONG>werase</STRONG>, but they  also
        call  <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG>, so that the screen is cleared completely on the next
        call to <STRONG>wrefresh</STRONG> for that window and repainted from scratch.
 
 
-</PRE><H3><a name="h3-clrtobot_wclrtobot">clrtobot/wclrtobot</a></H3><PRE>
+</PRE><H3><a name="h3-clrtobot_wclrtobot">clrtobot, wclrtobot</a></H3><PRE>
        The <STRONG>clrtobot</STRONG> and <STRONG>wclrtobot</STRONG> routines erase from the cursor to the end of
        screen.   That is, they erase all lines below the cursor in the window.
        Also, the current line to  the  right  of  the  cursor,  inclusive,  is
        erased.
 
 
-</PRE><H3><a name="h3-clrtoeol_wclrtoeol">clrtoeol/wclrtoeol</a></H3><PRE>
+</PRE><H3><a name="h3-clrtoeol_wclrtoeol">clrtoeol, wclrtoeol</a></H3><PRE>
        The <STRONG>clrtoeol</STRONG> and <STRONG>wclrtoeol</STRONG> routines erase the current line to the right
        of the cursor, inclusive, to the end of the current line.
 
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -146,10 +146,10 @@ <H1 class="no-header">curs_clear 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-erase_werase">erase/werase</a></li>
-<li><a href="#h3-clear_wclear">clear/wclear</a></li>
-<li><a href="#h3-clrtobot_wclrtobot">clrtobot/wclrtobot</a></li>
-<li><a href="#h3-clrtoeol_wclrtoeol">clrtoeol/wclrtoeol</a></li>
+<li><a href="#h3-erase_werase">erase, werase</a></li>
+<li><a href="#h3-clear_wclear">clear, wclear</a></li>
+<li><a href="#h3-clrtobot_wclrtobot">clrtobot, wclrtobot</a></li>
+<li><a href="#h3-clrtoeol_wclrtoeol">clrtoeol, wclrtoeol</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 76f43fbda..fbfec3cdc 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        desired.
 
 
-</PRE><H3><a name="h3-cbreak_-nocbreak">cbreak, nocbreak</a></H3><PRE>
+</PRE><H3><a name="h3-cbreak_nocbreak">cbreak, nocbreak</a></H3><PRE>
        Normally,  the terminal driver buffers typed characters until a newline
        or  carriage  return  is  typed.   The  <STRONG>cbreak</STRONG>  routine  disables  line
        buffering  and  erase/kill  character-processing  (interrupt  and  flow
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        discussion of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
 
 
-</PRE><H3><a name="h3-echo_-noecho">echo, noecho</a></H3><PRE>
+</PRE><H3><a name="h3-echo_noecho">echo, noecho</a></H3><PRE>
        The <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> routines control whether characters  typed  by  the
        user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>  as  they  are  typed.  Echoing by the
        terminal driver is always disabled, but  initially  <STRONG>getch</STRONG>  is  in  echo
@@ -170,7 +170,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        called and <STRONG>rmm</STRONG> is sent when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
 
 
-</PRE><H3><a name="h3-nl_-nonl">nl, nonl</a></H3><PRE>
+</PRE><H3><a name="h3-nl_nonl">nl, nonl</a></H3><PRE>
        The  <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> routines control whether the underlying display device
        translates the return key into newline on input.
 
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        user.
 
 
-</PRE><H3><a name="h3-raw_-noraw">raw, noraw</a></H3><PRE>
+</PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
        The <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw  mode.
        Raw  mode  is  similar  to  <STRONG>cbreak</STRONG>  mode,  in that characters typed are
        immediately passed through to the user program.   The  differences  are
@@ -199,7 +199,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        terminal driver that are not set by <EM>curses.</EM>
 
 
-</PRE><H3><a name="h3-qiflush_-nqiflush">qiflush, nqiflush</a></H3><PRE>
+</PRE><H3><a name="h3-qiflush_nqiflush">qiflush, nqiflush</a></H3><PRE>
        When the <STRONG>noqiflush</STRONG> routine is used, normal flush of  input  and  output
        queues  associated  with the <STRONG>INTR</STRONG>, <STRONG>QUIT</STRONG> and <STRONG>SUSP</STRONG> characters will not be
        done [see <STRONG>termios(3)</STRONG>].  When <STRONG>qiflush</STRONG> is  called,  the  queues  will  be
@@ -208,7 +208,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        the interrupt had not occurred, after the handler exits.
 
 
-</PRE><H3><a name="h3-timeout_-wtimeout">timeout, wtimeout</a></H3><PRE>
+</PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
        The <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> routines set blocking or non-blocking read for
        a given window.  If <EM>delay</EM> is negative, a blocking read is  used  (i.e.,
        waits  indefinitely  for input).  If <EM>delay</EM> is zero, then a non-blocking
@@ -345,18 +345,18 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-cbreak_-nocbreak">cbreak, nocbreak</a></li>
-<li><a href="#h3-echo_-noecho">echo, noecho</a></li>
+<li><a href="#h3-cbreak_nocbreak">cbreak, nocbreak</a></li>
+<li><a href="#h3-echo_noecho">echo, noecho</a></li>
 <li><a href="#h3-halfdelay">halfdelay</a></li>
 <li><a href="#h3-intrflush">intrflush</a></li>
 <li><a href="#h3-keypad">keypad</a></li>
 <li><a href="#h3-meta">meta</a></li>
-<li><a href="#h3-nl_-nonl">nl, nonl</a></li>
+<li><a href="#h3-nl_nonl">nl, nonl</a></li>
 <li><a href="#h3-nodelay">nodelay</a></li>
 <li><a href="#h3-notimeout">notimeout</a></li>
-<li><a href="#h3-raw_-noraw">raw, noraw</a></li>
-<li><a href="#h3-qiflush_-nqiflush">qiflush, nqiflush</a></li>
-<li><a href="#h3-timeout_-wtimeout">timeout, wtimeout</a></li>
+<li><a href="#h3-raw_noraw">raw, noraw</a></li>
+<li><a href="#h3-qiflush_nqiflush">qiflush, nqiflush</a></li>
+<li><a href="#h3-timeout_wtimeout">timeout, wtimeout</a></li>
 <li><a href="#h3-typeahead">typeahead</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index c13997e4a..35a505efd 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.50 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_kernel.3x,v 1.53 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -78,7 +78,7 @@ <H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        routines.
 
 
-</PRE><H3><a name="h3-def_prog_mode_-def_shell_mode">def_prog_mode, def_shell_mode</a></H3><PRE>
+</PRE><H3><a name="h3-def_prog_mode_def_shell_mode">def_prog_mode, def_shell_mode</a></H3><PRE>
        The <STRONG>def_prog_mode</STRONG> and <STRONG>def_shell_mode</STRONG> routines save the current terminal
        modes as the "program" (in <STRONG>curses</STRONG>) or "shell" (not in <STRONG>curses</STRONG>) state for
        use by the <STRONG>reset_prog_mode</STRONG> and <STRONG>reset_shell_mode</STRONG> routines.  This is done
@@ -86,14 +86,14 @@ <H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        context allocated by <STRONG>newterm</STRONG>.
 
 
-</PRE><H3><a name="h3-reset_prog_mode_-reset_shell_mode">reset_prog_mode, reset_shell_mode</a></H3><PRE>
+</PRE><H3><a name="h3-reset_prog_mode_reset_shell_mode">reset_prog_mode, reset_shell_mode</a></H3><PRE>
        The  <STRONG>reset_prog_mode</STRONG> and <STRONG>reset_shell_mode</STRONG> routines restore the terminal
        to "program" (in <STRONG>curses</STRONG>) or "shell" (out of <STRONG>curses</STRONG>) state.   These  are
        done  automatically by <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> and, after an <STRONG>endwin</STRONG>, by <STRONG>doupdate</STRONG>, so
        they normally are not called.
 
 
-</PRE><H3><a name="h3-resetty_-savetty">resetty, savetty</a></H3><PRE>
+</PRE><H3><a name="h3-resetty_savetty">resetty, savetty</a></H3><PRE>
        The <STRONG>resetty</STRONG> and <STRONG>savetty</STRONG> routines save and  restore  the  state  of  the
        terminal  modes.   <STRONG>savetty</STRONG>  saves  the  current  state  in a buffer and
        <STRONG>resetty</STRONG> restores the state to what it was at the last call to <STRONG>savetty</STRONG>.
@@ -209,7 +209,7 @@ <H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -217,9 +217,9 @@ <H1 class="no-header">curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-def_prog_mode_-def_shell_mode">def_prog_mode, def_shell_mode</a></li>
-<li><a href="#h3-reset_prog_mode_-reset_shell_mode">reset_prog_mode, reset_shell_mode</a></li>
-<li><a href="#h3-resetty_-savetty">resetty, savetty</a></li>
+<li><a href="#h3-def_prog_mode_def_shell_mode">def_prog_mode, def_shell_mode</a></li>
+<li><a href="#h3-reset_prog_mode_reset_shell_mode">reset_prog_mode, reset_shell_mode</a></li>
+<li><a href="#h3-resetty_savetty">resetty, savetty</a></li>
 <li><a href="#h3-getsyx">getsyx</a></li>
 <li><a href="#h3-setsyx">setsyx</a></li>
 <li><a href="#h3-ripoffline">ripoffline</a></li>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 9ca36cfc4..0d9dafe78 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.53 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_outopts.3x,v 1.56 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        the terminal, it is also necessary to call <STRONG>idlok</STRONG>).
 
 
-</PRE><H3><a name="h3-setscrreg_wsetscrreg">setscrreg/wsetscrreg</a></H3><PRE>
+</PRE><H3><a name="h3-setscrreg_wsetscrreg">setscrreg, wsetscrreg</a></H3><PRE>
        The  <STRONG>setscrreg</STRONG> and <STRONG>wsetscrreg</STRONG> routines allow the application programmer
        to set a software scrolling region  in  a  window.   The  <EM>top</EM>  and  <EM>bot</EM>
        parameters  are  the  line  numbers of the top and bottom margin of the
@@ -205,7 +205,7 @@ <H1 class="no-header">curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_outopts 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-immedok">immedok</a></li>
 <li><a href="#h3-leaveok">leaveok</a></li>
 <li><a href="#h3-scrollok">scrollok</a></li>
-<li><a href="#h3-setscrreg_wsetscrreg">setscrreg/wsetscrreg</a></li>
+<li><a href="#h3-setscrreg_wsetscrreg">setscrreg, wsetscrreg</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 868c4224f..72b96675e 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.36 2023/12/16 21:32:51 tom Exp @
+  * @Id: curs_overlay.3x,v 1.39 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-overlay_-overwrite">overlay, overwrite</a></H3><PRE>
+</PRE><H3><a name="h3-overlay_overwrite">overlay, overwrite</a></H3><PRE>
        The <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> routines overlay <EM>srcwin</EM>  on  top  of  <EM>dstwin</EM>.
        <EM>scrwin</EM> and <EM>dstwin</EM> are not required to be the same size; only text where
        the two windows overlap is copied.  The difference is that  <STRONG>overlay</STRONG>  is
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_overlay 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-overlay_-overwrite">overlay, overwrite</a></li>
+<li><a href="#h3-overlay_overwrite">overlay, overwrite</a></li>
 <li><a href="#h3-copywin">copywin</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index f4062cf74..50f00ef43 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.50 2023/12/16 21:18:02 tom Exp @
+  * @Id: curs_pad.3x,v 1.53 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>prefresh</STRONG>.
 
 
-</PRE><H3><a name="h3-prefresh_-pnoutrefresh">prefresh, pnoutrefresh</a></H3><PRE>
+</PRE><H3><a name="h3-prefresh_pnoutrefresh">prefresh, pnoutrefresh</a></H3><PRE>
        The  <STRONG>prefresh</STRONG>  and  <STRONG>pnoutrefresh</STRONG> routines are analogous to <STRONG>wrefresh</STRONG> and
        <STRONG>wnoutrefresh</STRONG> except that they relate to pads instead of  windows.   The
        additional  parameters  are needed to indicate what part of the pad and
@@ -231,7 +231,7 @@ <H1 class="no-header">curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -241,7 +241,7 @@ <H1 class="no-header">curs_pad 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-newpad">newpad</a></li>
 <li><a href="#h3-subpad">subpad</a></li>
-<li><a href="#h3-prefresh_-pnoutrefresh">prefresh, pnoutrefresh</a></li>
+<li><a href="#h3-prefresh_pnoutrefresh">prefresh, pnoutrefresh</a></li>
 <li><a href="#h3-pechochar">pechochar</a></li>
 <li><a href="#h3-pecho_wchar">pecho_wchar</a></li>
 </ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 74985fb11..d4d25951b 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.39 2023/12/16 21:09:11 tom Exp @
+  * @Id: curs_refresh.3x,v 1.42 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-refresh_wrefresh">refresh/wrefresh</a></H3><PRE>
+</PRE><H3><a name="h3-refresh_wrefresh">refresh, wrefresh</a></H3><PRE>
        The <STRONG>refresh</STRONG> and <STRONG>wrefresh</STRONG> routines (or <STRONG>wnoutrefresh</STRONG> and  <STRONG>doupdate</STRONG>)  must
        be  called  to  get  actual  output  to the terminal, as other routines
        merely manipulate data structures.  The  routine  <STRONG>wrefresh</STRONG>  copies  the
@@ -76,7 +76,7 @@ <H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        the cursor for that window.
 
 
-</PRE><H3><a name="h3-wnoutrefresh_doupdate">wnoutrefresh/doupdate</a></H3><PRE>
+</PRE><H3><a name="h3-wnoutrefresh_doupdate">wnoutrefresh, doupdate</a></H3><PRE>
        The <STRONG>wnoutrefresh</STRONG> and <STRONG>doupdate</STRONG> routines allow multiple updates with more
        efficiency  than  <STRONG>wrefresh</STRONG>  alone.   In  addition  to  all  the  window
        structures,  <STRONG>curses</STRONG> keeps two data structures representing the terminal
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        <STRONG>PORTABILITY</STRONG> below for a warning about exploiting this behavior.)
 
 
-</PRE><H3><a name="h3-wredrawln_redrawwin">wredrawln/redrawwin</a></H3><PRE>
+</PRE><H3><a name="h3-wredrawln_redrawwin">wredrawln, redrawwin</a></H3><PRE>
        The <STRONG>wredrawln</STRONG> routine indicates to <STRONG>curses</STRONG> 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
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -167,9 +167,9 @@ <H1 class="no-header">curs_refresh 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-refresh_wrefresh">refresh/wrefresh</a></li>
-<li><a href="#h3-wnoutrefresh_doupdate">wnoutrefresh/doupdate</a></li>
-<li><a href="#h3-wredrawln_redrawwin">wredrawln/redrawwin</a></li>
+<li><a href="#h3-refresh_wrefresh">refresh, wrefresh</a></li>
+<li><a href="#h3-wnoutrefresh_doupdate">wnoutrefresh, doupdate</a></li>
+<li><a href="#h3-wredrawln_redrawwin">wredrawln, redrawwin</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 0640554c1..c7abf66eb 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.31 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.34 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -76,7 +76,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
        integer.
 
 
-</PRE><H3><a name="h3-erasechar_-erasewchar">erasechar, erasewchar</a></H3><PRE>
+</PRE><H3><a name="h3-erasechar_erasewchar">erasechar, erasewchar</a></H3><PRE>
        The <STRONG>erasechar</STRONG> routine returns the user's current erase character.
 
        The  <STRONG>erasewchar</STRONG>  routine  stores  the  current  erase  character in the
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
        routine fails and the location referenced by <EM>ch</EM> is not changed.
 
 
-</PRE><H3><a name="h3-has_is_-has_il">has_is, has_il</a></H3><PRE>
+</PRE><H3><a name="h3-has_is_has_il">has_is, has_il</a></H3><PRE>
        The  <STRONG>has_ic</STRONG>  routine  is  true  if the terminal has insert- and delete-
        character capabilities.
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
        scrolling using <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-killchar_-killwchar">killchar, killwchar</a></H3><PRE>
+</PRE><H3><a name="h3-killchar_killwchar">killchar, killwchar</a></H3><PRE>
        The <STRONG>killchar</STRONG> routine returns the user's current line kill character.
 
        The  <STRONG>killwchar</STRONG>  routine  stores  the current line-kill character in the
@@ -112,7 +112,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
        terminals.
 
 
-</PRE><H3><a name="h3-termattrs_-term_attrs">termattrs, term_attrs</a></H3><PRE>
+</PRE><H3><a name="h3-termattrs_term_attrs">termattrs, term_attrs</a></H3><PRE>
        If  a  given  terminal  does  not  support  a  video  attribute that an
        application program is trying to use, <STRONG>curses</STRONG> may substitute a different
        video  attribute for it.  The <STRONG>termattrs</STRONG> and <STRONG>term_attrs</STRONG> functions return
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -158,11 +158,11 @@ <H1 class="no-header">curs_termattrs 3x 2023-10-07 ncurses 6.4 Library calls</H1
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-baudrate">baudrate</a></li>
-<li><a href="#h3-erasechar_-erasewchar">erasechar, erasewchar</a></li>
-<li><a href="#h3-has_is_-has_il">has_is, has_il</a></li>
-<li><a href="#h3-killchar_-killwchar">killchar, killwchar</a></li>
+<li><a href="#h3-erasechar_erasewchar">erasechar, erasewchar</a></li>
+<li><a href="#h3-has_is_has_il">has_is, has_il</a></li>
+<li><a href="#h3-killchar_killwchar">killchar, killwchar</a></li>
 <li><a href="#h3-longname">longname</a></li>
-<li><a href="#h3-termattrs_-term_attrs">termattrs, term_attrs</a></li>
+<li><a href="#h3-termattrs_term_attrs">termattrs, term_attrs</a></li>
 <li><a href="#h3-termname">termname</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index af4eeda3b..25eaacd31 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.92 2023/12/23 16:24:15 tom Exp @
+  * @Id: curs_util.3x,v 1.95 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        character parameter are ignored.
 
 
-</PRE><H3><a name="h3-keyname_key_name">keyname/key_name</a></H3><PRE>
+</PRE><H3><a name="h3-keyname_key_name">keyname, key_name</a></H3><PRE>
        The <STRONG>keyname</STRONG> routine returns a character string corresponding to the key
        <EM>c</EM>.  Key codes are different from character codes.
 
@@ -129,7 +129,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>key_name</STRONG> does not return the name of a function key.
 
 
-</PRE><H3><a name="h3-filter_nofilter">filter/nofilter</a></H3><PRE>
+</PRE><H3><a name="h3-filter_nofilter">filter, nofilter</a></H3><PRE>
        The  <STRONG>filter</STRONG>  routine, if used, must be called before <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>
        are called.  Calling <STRONG>filter</STRONG> causes these changes in initialization:
 
@@ -202,7 +202,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                                      operating system calls to obtain size.
 
 
-</PRE><H3><a name="h3-putwin_getwin">putwin/getwin</a></H3><PRE>
+</PRE><H3><a name="h3-putwin_getwin">putwin, getwin</a></H3><PRE>
        The <STRONG>putwin</STRONG> routine writes all data associated with window (or pad)  <EM>win</EM>
        into  the  file  to  which <EM>filep</EM> points.  This information can be later
        retrieved using the <STRONG>getwin</STRONG> function.
@@ -297,7 +297,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        the library.
 
 
-</PRE><H3><a name="h3-nofilter_use_tioctl">nofilter/use_tioctl</a></H3><PRE>
+</PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
        The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
        were not supported on Version 7, BSD or System V  implementations.   It
        is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
@@ -331,7 +331,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
            file written using mixed schemes may not be successful.
 
 
-</PRE><H3><a name="h3-unctrl_wunctrl">unctrl/wunctrl</a></H3><PRE>
+</PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
        The  XSI Curses standard, Issue 4 describes these functions.  It states
        that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but
        does  not  define any error conditions.  This implementation checks for
@@ -377,7 +377,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
-</PRE><H3><a name="h3-use_env_use_tioctl">use_env/use_tioctl</a></H3><PRE>
+</PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
        If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
        state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
        <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
@@ -391,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -400,11 +400,11 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-unctrl">unctrl</a></li>
-<li><a href="#h3-keyname_key_name">keyname/key_name</a></li>
-<li><a href="#h3-filter_nofilter">filter/nofilter</a></li>
+<li><a href="#h3-keyname_key_name">keyname, key_name</a></li>
+<li><a href="#h3-filter_nofilter">filter, nofilter</a></li>
 <li><a href="#h3-use_env">use_env</a></li>
 <li><a href="#h3-use_tioctl">use_tioctl</a></li>
-<li><a href="#h3-putwin_getwin">putwin/getwin</a></li>
+<li><a href="#h3-putwin_getwin">putwin, getwin</a></li>
 <li><a href="#h3-delay_output">delay_output</a></li>
 <li><a href="#h3-flushinp">flushinp</a></li>
 </ul>
@@ -415,10 +415,10 @@ <H1 class="no-header">curs_util 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-filter">filter</a></li>
 <li><a href="#h3-delay_output-padding">delay_output padding</a></li>
 <li><a href="#h3-keyname">keyname</a></li>
-<li><a href="#h3-nofilter_use_tioctl">nofilter/use_tioctl</a></li>
+<li><a href="#h3-nofilter_use_tioctl">nofilter, use_tioctl</a></li>
 <li><a href="#h3-putwin_getwin-file-format">putwin/getwin file-format</a></li>
-<li><a href="#h3-unctrl_wunctrl">unctrl/wunctrl</a></li>
-<li><a href="#h3-use_env_use_tioctl">use_env/use_tioctl</a></li>
+<li><a href="#h3-unctrl_wunctrl">unctrl, wunctrl</a></li>
+<li><a href="#h3-use_env_use_tioctl">use_env, use_tioctl</a></li>
 </ul>
 </li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 616d96e0f..bf2818203 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.40 2023/12/23 23:10:13 tom Exp @
+  * @Id: curs_variables.3x,v 1.43 2024/01/05 21:46:58 tom Exp @
   * SVID 4, Volume 3, p. 408
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -98,12 +98,12 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
 
 </PRE><H2><a name="h2-CONSTANTS">CONSTANTS</a></H2><PRE>
 
-</PRE><H3><a name="h3-TRUE_-FALSE">TRUE, FALSE</a></H3><PRE>
+</PRE><H3><a name="h3-TRUE_FALSE">TRUE, FALSE</a></H3><PRE>
        The <EM>curses</EM> library defines <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG> to represent  the  values  of
        the Boolean data type.
 
 
-</PRE><H3><a name="h3-ERR_-OK">ERR, OK</a></H3><PRE>
+</PRE><H3><a name="h3-ERR_OK">ERR, OK</a></H3><PRE>
        <EM>curses</EM>  and <EM>terminfo</EM> routines frequently return these constant integral
        values indicating failure and success, respectively.
 
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
        example, <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>, and <STRONG><A HREF="curs_inch.3x.html">inch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-cchar_t_-attr_t"><EM>cchar_t,</EM> attr_t</a></H3><PRE>
+</PRE><H3><a name="h3-cchar_t_attr_t"><EM>cchar_t,</EM> attr_t</a></H3><PRE>
        <EM>chtype</EM> is too small for the standard C library's  wide-character  type,
        <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>.   <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is a type that can accommodate an <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> and enough
        wide characters to store what  Unicode  terms  a  <EM>grapheme</EM>  <EM>cluster</EM>  (a
@@ -148,7 +148,7 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
 
 </PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
 
-</PRE><H3><a name="h3-curscr_-stdscr_-newscr">curscr, stdscr, newscr</a></H3><PRE>
+</PRE><H3><a name="h3-curscr_stdscr_newscr">curscr, stdscr, newscr</a></H3><PRE>
        The library records updates to the terminal screen in  a  window  named
        <STRONG>curscr</STRONG>.   This  object  is  referred  to  as  the  "physical screen" in
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
@@ -175,7 +175,7 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
        pairs supported by the terminal; see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-COLS_-LINES">COLS, LINES</a></H3><PRE>
+</PRE><H3><a name="h3-COLS_LINES">COLS, LINES</a></H3><PRE>
        Once  <EM>curses</EM>  is initialized, <STRONG>COLS</STRONG> and <STRONG>LINES</STRONG> contain the screen's width
        and height in character cells, respectively; that  is,  the  number  of
        columns and lines.
@@ -263,7 +263,7 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-12-23                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -272,25 +272,25 @@ <H1 class="no-header">curs_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-CONSTANTS">CONSTANTS</a>
 <ul>
-<li><a href="#h3-TRUE_-FALSE">TRUE, FALSE</a></li>
-<li><a href="#h3-ERR_-OK">ERR, OK</a></li>
+<li><a href="#h3-TRUE_FALSE">TRUE, FALSE</a></li>
+<li><a href="#h3-ERR_OK">ERR, OK</a></li>
 </ul>
 </li>
 <li><a href="#h2-PREDEFINED-TYPES">PREDEFINED TYPES</a>
 <ul>
 <li><a href="#h3-bool">bool</a></li>
 <li><a href="#h3-chtype">chtype</a></li>
-<li><a href="#h3-cchar_t_-attr_t">cchar_t, attr_t</a></li>
+<li><a href="#h3-cchar_t_attr_t">cchar_t, attr_t</a></li>
 <li><a href="#h3-SCREEN">SCREEN</a></li>
 <li><a href="#h3-WINDOW">WINDOW</a></li>
 </ul>
 </li>
 <li><a href="#h2-VARIABLES">VARIABLES</a>
 <ul>
-<li><a href="#h3-curscr_-stdscr_-newscr">curscr, stdscr, newscr</a></li>
+<li><a href="#h3-curscr_stdscr_newscr">curscr, stdscr, newscr</a></li>
 <li><a href="#h3-COLORS">COLORS</a></li>
 <li><a href="#h3-COLOR_PAIRS">COLOR_PAIRS</a></li>
-<li><a href="#h3-COLS_-LINES">COLS, LINES</a></li>
+<li><a href="#h3-COLS_LINES">COLS, LINES</a></li>
 <li><a href="#h3-ESCDELAY">ESCDELAY</a></li>
 <li><a href="#h3-TABSIZE">TABSIZE</a></li>
 </ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 59a6d4fe2..4620cd720 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_hook.3x,v 1.34 2024/01/05 21:46:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -137,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 3d0b4abaf..4752033ba 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -73,7 +73,7 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
        <EM>type</EM> is specified, the <STRONG>-d</STRONG> option will be assumed.
 
 
-</PRE><H3><a name="h3-Comparison-Options-_-d_-_-c_-_-n_">Comparison Options [-d] [-c] [-n]</a></H3><PRE>
+</PRE><H3><a name="h3-Comparison-Options_d_c_n_">Comparison Options [-d] [-c] [-n]</a></H3><PRE>
        <STRONG>infocmp</STRONG>  compares  the  <STRONG>terminfo</STRONG>  description  of  the  first  terminal
        <EM>terminal-type</EM>  with  each  of the descriptions given by the entries for
        the other terminal's <EM>terminal-types</EM>.  If a capability  is  defined  for
@@ -115,7 +115,7 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
             variable <EM>TERM</EM> for each of the <EM>terminal-types</EM>.
 
 
-</PRE><H3><a name="h3-Source-Listing-Options-_-I_-_-L_-_-C_-_-r_">Source Listing Options [-I] [-L] [-C] [-r]</a></H3><PRE>
+</PRE><H3><a name="h3-Source-Listing-Options_I_L_C_r_">Source Listing Options [-I] [-L] [-C] [-r]</a></H3><PRE>
        The <STRONG>-I</STRONG>, <STRONG>-L</STRONG>, and <STRONG>-C</STRONG> options will  produce  a  source  listing  for  each
        terminal named.
 
@@ -178,7 +178,7 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
            <STRONG>%p2</STRONG> is printed before <STRONG>%p1</STRONG>   <STRONG>%r</STRONG>        hp
 
 
-</PRE><H3><a name="h3-Use_-Option-_-u_">Use= Option [-u]</a></H3><PRE>
+</PRE><H3><a name="h3-Use_Option_u_">Use= Option [-u]</a></H3><PRE>
        The <STRONG>-u</STRONG> option produces a  <STRONG>terminfo</STRONG>  source  description  of  the  first
        terminal <EM>terminal-type</EM> which is relative to the sum of the descriptions
        given by the entries for the other <EM>terminal-types</EM>.   It  does  this  by
@@ -540,9 +540,9 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Default-Options">Default Options</a></li>
-<li><a href="#h3-Comparison-Options-_-d_-_-c_-_-n_">Comparison Options [-d] [-c] [-n]</a></li>
-<li><a href="#h3-Source-Listing-Options-_-I_-_-L_-_-C_-_-r_">Source Listing Options [-I] [-L] [-C] [-r]</a></li>
-<li><a href="#h3-Use_-Option-_-u_">Use= Option [-u]</a></li>
+<li><a href="#h3-Comparison-Options_d_c_n_">Comparison Options [-d] [-c] [-n]</a></li>
+<li><a href="#h3-Source-Listing-Options_I_L_C_r_">Source Listing Options [-I] [-L] [-C] [-r]</a></li>
+<li><a href="#h3-Use_Option_u_">Use= Option [-u]</a></li>
 <li><a href="#h3-Other-Options">Other Options</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 75e66f4f7..adc7badbc 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.192 2023/12/31 00:46:04 tom Exp @
+  * @Id: ncurses.3x,v 1.195 2024/01/05 21:46:58 tom Exp @
   * X/Open Curses Issue 7 assumes some optimization will be done, but
   * does not mandate it in any way.
   * See X/Open Curses Issue 4, Version 2, pp. 227-234.
@@ -40,12 +40,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">ncurses 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20231230).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240106).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -1504,7 +1504,7 @@ <H1 class="no-header">ncurses 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-30                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-01-05                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index fc98e7fab..a223e7e97 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -105,7 +105,7 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20231230).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240106).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -1887,7 +1887,7 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
-</PRE><H3><a name="h3-Highlighting_-Underlining_-and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
+</PRE><H3><a name="h3-Highlighting_Underlining_and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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  <EM>standout</EM>  <EM>mode</EM>,  representing a good, high contrast,
@@ -2718,7 +2718,7 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 <li><a href="#h3-Area-Clears">Area Clears</a></li>
 <li><a href="#h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></li>
 <li><a href="#h3-Insert_Delete-Character">Insert/Delete Character</a></li>
-<li><a href="#h3-Highlighting_-Underlining_-and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></li>
+<li><a href="#h3-Highlighting_Underlining_and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></li>
 <li><a href="#h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></li>
 <li><a href="#h3-Tabs-and-Initialization">Tabs and Initialization</a></li>
 <li><a href="#h3-Delays-and-Padding">Delays and Padding</a></li>
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index de9ee2ed6..b81273e86 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.41 2023/12/16 21:09:11 tom Exp $
-.TH curs_clear 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.44 2024/01/05 21:46:58 tom Exp $
+.TH curs_clear 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,23 +71,23 @@ clear all or part of a \fIcurses\fR window
 \fBint wclrtoeol(WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
-.SS erase/werase
+.SS "erase, werase"
 The \fBerase\fP and \fBwerase\fP routines copy blanks to every
 position in the window, clearing the screen.
 .PP
 Blanks created by erasure have the current background rendition (as set
 by \fBwbkgdset\fP(3X)) merged into them.
-.SS clear/wclear
+.SS "clear, wclear"
 The \fBclear\fP and \fBwclear\fP routines are like \fBerase\fP and
 \fBwerase\fP, but they also call \fBclearok\fP(3X), so that the screen is
 cleared completely on the next call to \fBwrefresh\fP for that window
 and repainted from scratch.
-.SS clrtobot/wclrtobot
+.SS "clrtobot, wclrtobot"
 The \fBclrtobot\fP and \fBwclrtobot\fP routines erase from the cursor to the
 end of screen.
 That is, they erase all lines below the cursor in the window.
 Also, the current line to the right of the cursor, inclusive, is erased.
-.SS clrtoeol/wclrtoeol
+.SS "clrtoeol, wclrtoeol"
 The \fBclrtoeol\fP and \fBwclrtoeol\fP routines erase the current line
 to the right of the cursor, inclusive, to the end of the current line.
 .SH RETURN VALUE
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index cbb870605..929439c2e 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.50 2023/12/16 20:32:22 tom Exp $
-.TH curs_kernel 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.53 2024/01/05 21:46:58 tom Exp $
+.TH curs_kernel 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,7 +81,7 @@ low-level \fIcurses\fR routines
 The following routines give low-level access
 to various \fBcurses\fP capabilities.
 These routines typically are used inside library routines.
-.SS def_prog_mode, def_shell_mode
+.SS "def_prog_mode, def_shell_mode"
 The \fBdef_prog_mode\fP and \fBdef_shell_mode\fP routines save the
 current terminal modes as the \*(``program\*(''
 (in \fBcurses\fP) or \*(``shell\*(''
@@ -90,14 +90,14 @@ current terminal modes as the \*(``program\*(''
 This is done automatically by \fBinitscr\fP.
 There is one such save area for each screen context
 allocated by \fBnewterm\fP.
-.SS reset_prog_mode, reset_shell_mode
+.SS "reset_prog_mode, reset_shell_mode"
 The \fBreset_prog_mode\fP and \fBreset_shell_mode\fP routines restore
 the terminal to \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*('' (out of
 \fBcurses\fP) state.
 These are done automatically by \fBendwin\fP(3X) and,
 after an \fBendwin\fP, by \fBdoupdate\fP,
 so they normally are not called.
-.SS resetty, savetty
+.SS "resetty, savetty"
 The \fBresetty\fP and \fBsavetty\fP routines save and restore the
 state of the terminal modes.
 \fBsavetty\fP saves the current state in
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 9c559fb5a..0a2b38fa4 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.53 2023/12/16 20:32:22 tom Exp $
-.TH curs_outopts 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.56 2024/01/05 21:46:58 tom Exp $
+.TH curs_outopts 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -119,7 +119,7 @@ line.
 If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
 (Note that to get the physical scrolling effect on the terminal, it is
 also necessary to call \fBidlok\fP).
-.SS  setscrreg/wsetscrreg
+.SS  "setscrreg, wsetscrreg"
 The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
 programmer to set a software scrolling region in a window.
 The \fItop\fP and
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index c4e2125ec..6df8b6211 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.36 2023/12/16 21:32:51 tom Exp $
-.TH curs_overlay 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.39 2024/01/05 21:46:58 tom Exp $
+.TH curs_overlay 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -56,7 +56,7 @@ overlay \fIcurses\fR windows and manipulate them
       \fBint \fIdmaxcol\fB, int \fIoverlay\fB);\fR
 .fi
 .SH DESCRIPTION
-.SS overlay, overwrite
+.SS "overlay, overwrite"
 The \fBoverlay\fP and \fBoverwrite\fP routines overlay \fIsrcwin\fP on
 top of \fIdstwin\fP.
 \fIscrwin\fP and \fIdstwin\fP are not required
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 7c04ca0a1..072cbd591 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.50 2023/12/16 21:18:02 tom Exp $
-.TH curs_pad 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.53 2024/01/05 21:46:58 tom Exp $
+.TH curs_pad 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -97,7 +97,7 @@ affect both windows.
 During the use of this routine, it will often be
 necessary to call \fB\%touchwin\fP or \fB\%touchline\fP on \fIorig\fP before
 calling \fB\%prefresh\fP.
-.SS prefresh, pnoutrefresh
+.SS "prefresh, pnoutrefresh"
 The \fB\%prefresh\fP and \fB\%pnoutrefresh\fP routines are analogous to
 \fB\%wrefresh\fP and \fB\%wnoutrefresh\fP except that they relate to pads instead
 of windows.
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 9dc6f46cc..605282578 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.39 2023/12/16 21:09:11 tom Exp $
-.TH curs_refresh 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.42 2024/01/05 21:46:58 tom Exp $
+.TH curs_refresh 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -65,7 +65,7 @@ refresh \fIcurses\fR windows or lines thereupon
 \fBint wredrawln(WINDOW *\fIwin\fP, int \fIbeg_line\fP, int \fInum_lines\fP);
 .fi
 .SH DESCRIPTION
-.SS refresh/wrefresh
+.SS "refresh, wrefresh"
 The \fBrefresh\fP and \fBwrefresh\fP routines (or \fBwnoutrefresh\fP and
 \fBdoupdate\fP) must be called to get actual output to the terminal,
 as other routines merely manipulate data structures.
@@ -77,7 +77,7 @@ same, using \fBstdscr\fP as the default window.
 Unless \fBleaveok\fP(3X) has been
 enabled, the physical cursor of the terminal is left at the location of the
 cursor for that window.
-.SS wnoutrefresh/doupdate
+.SS "wnoutrefresh, doupdate"
 The \fBwnoutrefresh\fP and \fBdoupdate\fP routines allow multiple updates with
 more efficiency than \fBwrefresh\fP alone.
 In addition to all the window
@@ -122,7 +122,7 @@ order and the overlap region will be modified only when it is explicitly
 changed.
 (But see the section on \fBPORTABILITY\fP below for a warning about
 exploiting this behavior.)
-.SS wredrawln/redrawwin
+.SS "wredrawln, redrawwin"
 The \fBwredrawln\fP routine indicates to \fBcurses\fP 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).
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 8df5e357c..c0f9aef02 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.31 2023/10/07 21:19:07 tom Exp $
-.TH curs_termattrs 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.34 2024/01/05 21:46:58 tom Exp $
+.TH curs_termattrs 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -64,14 +64,14 @@ The \fBbaudrate\fP routine returns the output speed of the terminal.
 The
 number returned is in bits per second, for example \fB9600\fP, and is an
 integer.
-.SS erasechar, erasewchar
+.SS "erasechar, erasewchar"
 The \fBerasechar\fP routine returns the user's current erase character.
 .PP
 The \fBerasewchar\fP routine stores the current erase character
 in the location referenced by \fIch\fP.
 If no erase character has been defined, the routine fails
 and the location referenced by \fIch\fP is not changed.
-.SS has_is, has_il
+.SS "has_is, has_il"
 The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
 character capabilities.
 .PP
@@ -80,7 +80,7 @@ capabilities, or can simulate them using scrolling regions.
 This might
 be used to determine if it would be appropriate to turn on physical
 scrolling using \fBscrollok\fP(3X).
-.SS killchar, killwchar
+.SS "killchar, killwchar"
 The \fBkillchar\fP routine returns the user's current line kill character.
 .PP
 The \fBkillwchar\fP routine stores the current line-kill character
@@ -98,7 +98,7 @@ overwritten by each call to \fBnewterm\fP and is not restored by
 \fBset_term\fP, so the value should be saved between calls to
 \fBnewterm\fP if \fBlongname\fP is going to be used with multiple
 terminals.
-.SS termattrs, term_attrs
+.SS "termattrs, term_attrs"
 If a given terminal does not support a video attribute that an
 application program is trying to use, \fBcurses\fP may substitute a
 different video attribute for it.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index e5f96738e..d922fa803 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.92 2023/12/23 16:24:15 tom Exp $
-.TH curs_util 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.95 2024/01/05 21:46:58 tom Exp $
+.TH curs_util 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,7 +110,7 @@ a complex character \fIc\fP.
 .PP
 In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
 with the character parameter are ignored.
-.SS keyname/key_name
+.SS "keyname, key_name"
 The \fBkeyname\fP routine returns a character string
 corresponding to the key \fIc\fP.
 Key codes are different from character codes.
@@ -135,7 +135,7 @@ do not return the same set of strings:
 \fBkeyname\fP returns null where \fBkey_name\fP would display a meta character.
 .bP
 \fBkey_name\fP does not return the name of a function key.
-.SS filter/nofilter
+.SS "filter, nofilter"
 The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
 \fBnewterm\fP are called.
 Calling \fBfilter\fP causes these changes in initialization:
@@ -232,7 +232,7 @@ FALSE	TRUE	T{
 using operating system calls to obtain size.
 T}
 .TE
-.SS putwin/getwin
+.SS "putwin, getwin"
 The \fBputwin\fP routine writes all data associated
 with window (or pad) \fIwin\fP into
 the file to which \fIfilep\fP points.
@@ -304,7 +304,7 @@ The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
 terms.
 The description here is adapted from the XSI Curses standard (which
 erroneously fails to describe the disabling of \fBcuu\fP).
-.SS delay_output padding
+.SS "delay_output padding"
 The limitation to 30 seconds
 and the use of \fBnapms\fP
 differ from other implementations.
@@ -326,13 +326,13 @@ the same value for different runs because user-defined codes are
 merged from all terminal descriptions which have been loaded.
 The \fBuse_extended_names\fP(3X) function controls whether this data is
 loaded when the terminal description is read by the library.
-.SS nofilter/use_tioctl
+.SS "nofilter, use_tioctl"
 The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to
 \fI\%ncurses\fP.
 They were not supported on Version 7, BSD or System V implementations.
 It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fBNCURSES_VERSION\fP.
-.SS putwin/getwin file-format
+.SS "putwin/getwin file-format"
 The \fBputwin\fP and \fBgetwin\fP functions have several issues with
 portability:
 .bP
@@ -362,7 +362,7 @@ 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.
 However, reading from a file written using mixed schemes may not be successful.
-.SS unctrl/wunctrl
+.SS "unctrl, wunctrl"
 The XSI Curses standard, Issue 4 describes these functions.
 It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
 unsuccessful, but does not define any error conditions.
@@ -416,7 +416,7 @@ which \fI\%ncurses\fP does.
 However, \fI\%ncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
 matching the behavior of SVr4 curses.
 Other implementations may not do that.
-.SS use_env/use_tioctl
+.SS "use_env, use_tioctl"
 If \fI\%ncurses\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
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 02d1b1488..3a09c40ac 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.40 2023/12/23 23:10:13 tom Exp $
-.TH curs_variables 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.43 2024/01/05 21:46:58 tom Exp $
+.TH curs_variables 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,12 +118,12 @@ confusing the library.
 .SS "TRUE, FALSE"
 The \fIcurses\fP library defines \fBTRUE\fP and \fBFALSE\fP
 to represent the values of the Boolean data type.
-.SS ERR, OK
+.SS "ERR, OK"
 \fIcurses\fP and \fIterminfo\fP routines frequently return these
 constant integral values indicating failure and success,
 respectively.
 .SH "PREDEFINED TYPES"
-.SS \fIbool\fP
+.SS "\fIbool\fP"
 X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
 standards,
 each of which also defined a Boolean data type.
@@ -132,7 +132,7 @@ The \fIcurses\fP library requires an integral type \fIbool\fP.
 \fB\%ncurses\fP' configure script attempts to discover the
 data type used by the system's C and C++ compilers,
 to reuse for the \fIcurses\fP \fIbool\fP.
-.SS \fIchtype\fP
+.SS "\fIchtype\fP"
 The \fI\%chtype\fP integral type combines a
 (\*(``narrow\*('',
 8-bit)
@@ -145,7 +145,7 @@ for example,
 \fB\%attron\fP(3X),
 and
 \fB\%inch\fP(3X).
-.SS \fIcchar_t\fP, \fIattr_t\fP
+.SS "\fIcchar_t\fP, \fIattr_t\fP"
 \fI\%chtype\fP is too small for the standard C library's wide-character
 type,
 \fIwchar_t\fP.
@@ -162,7 +162,7 @@ for example,
 \fB\%attr_on\fP(3X),
 and
 \fB\%in_wch\fP(3X).
-.SS \fISCREEN\fP
+.SS "\fISCREEN\fP"
 .I curses
 manages a terminal device with this structure type;
 see \fB\%initscr\fP(3X).
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 4d7cb5f2b..a37ba1a2a 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
-.TH form_hook 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.34 2024/01/05 21:46:58 tom Exp $
+.TH form_hook 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
@@ -51,7 +51,7 @@ set hooks for automatic invocation by applications
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBform_driver\fP.
-.SS set_field_init\fP
+.SS set_field_init
 sets a hook to be called at form-post time
 and each time the selected field changes (after the change).
 .SS field_init
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 801892fdd..5df0468c5 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.67 2023/12/30 21:34:11 tom Exp $
+# $Id: man_db.renames.in,v 1.69 2024/01/05 21:46:58 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -174,6 +174,7 @@ wresize.3x			wresize.3ncurses
 add_wch.3x			add_wch.3ncurses
 addch.3x			addch.3ncurses
 assume_default_colors.3x	assume_default_colors.3ncurses
+attr_get.3x			attr_get.3ncurses
 attr_on.3x			attr_on.3ncurses
 attron.3x			attron.3ncurses
 baudrate.3x			baudrate.3ncurses
@@ -249,8 +250,8 @@ wadd_wch.3x			wadd_wch.3ncurses
 waddch.3x			waddch.3ncurses
 waddstr.3x			waddstr.3ncurses
 waddwstr.3x			waddwstr.3ncurses
-wattrset.3x			wattrset.3ncurses
 wattr_set.3x			wattr_set.3ncurses
+wattrset.3x			wattrset.3ncurses
 wbkgdset.3x			wbkgdset.3ncurses
 wbkgrndset.3x			wbkgrndset.3ncurses
 wget_wch.3x			wget_wch.3ncurses
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 9f937aaf1..3ef1436fb 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.192 2023/12/31 00:46:04 tom Exp $
-.TH ncurses 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.195 2024/01/05 21:46:58 tom Exp $
+.TH ncurses 3X 2024-01-05 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -967,7 +967,7 @@ pointer is null.
 The following environment symbols are useful for customizing the
 runtime behavior of the \fI\%ncurses\fP library.
 The most important ones have been already discussed in detail.
-.SS \fICC\fP command-character
+.SS "\fICC\fP command-character"
 When set,
 change the
 .B \%command_character
@@ -983,14 +983,14 @@ Because this name is also used in development environments to represent
 the C compiler's name,
 \fI\%ncurses\fP ignores it if it does not happen to be a single
 character.
-.SS \fIBAUDRATE\fP
+.SS "\fIBAUDRATE\fP"
 The debugging library checks this environment variable when the application
 has redirected output to a file.
 The variable's numeric value is used for the baudrate.
 If no value is found, \fI\%ncurses\fP uses 9600.
 This allows testers to construct repeatable test-cases
 that take into account costs that depend on baudrate.
-.SS \fICOLUMNS\fP
+.SS "\fICOLUMNS\fP"
 Specify the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
@@ -1019,7 +1019,7 @@ Use the \fBuse_env\fP function to disable all use of external environment
 Use the \fBuse_tioctl\fP function to update \fI\%COLUMNS\fP or
 \fILINES\fP to match the screen size obtained from system calls or the
 terminal database.
-.SS \fIESCDELAY\fP
+.SS "\fIESCDELAY\fP"
 Specifies the total time,
 in milliseconds,
 for which \fI\%ncurses\fP will await a character sequence,
@@ -1046,7 +1046,7 @@ Portable applications should not rely upon the presence of \fB\%ESCDELAY\fP
 in either form,
 but setting the environment variable rather than the global variable
 does not create problems when compiling an application.
-.SS \fIHOME\fP
+.SS "\fIHOME\fP"
 Tells \fI\%ncurses\fP where your home directory is.
 That is where it may read and write auxiliary terminal descriptions:
 .PP
@@ -1056,10 +1056,10 @@ $HOME/.termcap
 $HOME/.terminfo
 .EE
 .RE
-.SS \fILINES\fP
+.SS "\fILINES\fP"
 Like \fI\%COLUMNS\fP, specify the height of the screen in characters.
 See \fI\%COLUMNS\fP for a detailed description.
-.SS \fIMOUSE_BUTTONS_123\fP
+.SS "\fIMOUSE_BUTTONS_123\fP"
 This applies only to the OS/2 EMX port.
 It specifies the order of buttons on the mouse.
 OS/2 numbers a 3-button mouse inconsistently from other
@@ -1076,7 +1076,7 @@ platforms:
 This variable lets you customize the mouse.
 The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
 If it is not specified, \fI\%ncurses\fP uses 132.
-.SS \fINCURSES_ASSUMED_COLORS\fP
+.SS "\fINCURSES_ASSUMED_COLORS\fP"
 Override the compiled-in assumption that the
 terminal's default colors are white-on-black
 (see \fBdefault_colors\fP(3X)).
@@ -1086,7 +1086,7 @@ For example, to tell \fI\%ncurses\fP to not assume anything
 about the colors, set this to "\-1,\-1".
 To make it green-on-black, set it to "2,0".
 Any positive value from zero to the terminfo \fBmax_colors\fP value is allowed.
-.SS \fINCURSES_CONSOLE2\fP
+.SS "\fINCURSES_CONSOLE2\fP"
 This applies only to the MinGW port of \fI\%ncurses\fP.
 .PP
 The \fBConsole2\fP program's handling of the Microsoft Console API call
@@ -1096,7 +1096,7 @@ However, it is possible to simulate the action of this call by
 mapping coordinates,
 explicitly saving and restoring the original screen contents.
 Setting the environment variable \fBNCGDB\fP has the same effect.
-.SS \fINCURSES_GPM_TERMS\fP
+.SS "\fINCURSES_GPM_TERMS\fP"
 This applies only to \fI\%ncurses\fP configured to use the GPM
 interface.
 .PP
@@ -1109,18 +1109,18 @@ using the built-in support for xterm, etc.
 If the environment variable is absent,
 \fI\%ncurses\fP will attempt to open GPM if \fITERM\fP contains
 \*(``linux\*(''.
-.SS \fINCURSES_NO_HARD_TABS\fP
+.SS "\fINCURSES_NO_HARD_TABS\fP"
 \fI\%ncurses\fP may use tabs as part of cursor movement optimization.
 In some cases,
 your terminal driver may not handle these properly.
 Set this environment variable to any value to disable the feature.
 You can also adjust your \fBstty\fP(1) settings to avoid the problem.
-.SS \fINCURSES_NO_MAGIC_COOKIE\fP
+.SS "\fINCURSES_NO_MAGIC_COOKIE\fP"
 Some terminals use a magic-cookie feature which requires special handling
 to make highlighting and other video attributes display properly.
 You can suppress the highlighting entirely for these terminals by
 setting this environment variable to any value.
-.SS \fINCURSES_NO_PADDING\fP
+.SS "\fINCURSES_NO_PADDING\fP"
 Most of the terminal descriptions in the terminfo database are written
 for real \*(``hardware\*('' terminals.
 Many people use terminal emulators
@@ -1146,7 +1146,7 @@ Set the \fI\%NCURSES_NO_PADDING\fP environment variable
 to disable all but mandatory padding.
 Mandatory padding is used as a part of special control
 sequences such as \fBflash\fP.
-.SS \fINCURSES_NO_SETBUF\fP
+.SS "\fINCURSES_NO_SETBUF\fP"
 This setting is obsolete.
 Before changes
 .RS 3
@@ -1181,7 +1181,7 @@ the buffered standard output but its own output (to the same file descriptor).
 As a special case, the low-level calls such as \fBputp\fP still use the
 standard output.
 But high-level curses calls do not.
-.SS \fINCURSES_NO_UTF8_ACS\fP
+.SS "\fINCURSES_NO_UTF8_ACS\fP"
 During initialization, the \fI\%ncurses\fP library
 checks for special cases where VT100 line-drawing (and the corresponding
 alternate character set capabilities) described in the terminfo are known
@@ -1220,7 +1220,7 @@ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
 The name \*(``U8\*('' is chosen to be two characters,
 to permit it to be used by applications that use \fI\%ncurses\fP'
 termcap interface.
-.SS \fINCURSES_TRACE\fP
+.SS "\fINCURSES_TRACE\fP"
 During initialization, the \fI\%ncurses\fP debugging library
 checks the \fI\%NCURSES_TRACE\fP environment variable.
 If it is defined,
@@ -1234,7 +1234,7 @@ When running with traces enabled, your application will write the
 file \fBtrace\fP to the current directory.
 .PP
 See \fBcurs_trace\fP(3X) for more information.
-.SS \fITERM\fP
+.SS "\fITERM\fP"
 Denotes your terminal type.
 Each terminal type is distinct, though many are similar.
 .PP
@@ -1252,7 +1252,7 @@ Likewise, as a general rule (\fBxterm\fP(1) being a rare exception),
 terminal emulators which allow you to
 specify \fITERM\fP as a parameter or configuration value do
 not change their behavior to match that setting.
-.SS \fITERMCAP\fP
+.SS "\fITERMCAP\fP"
 If the \fI\%ncurses\fP library has been configured with \fItermcap\fP
 support, \fI\%ncurses\fP will check for a terminal's description in
 termcap form if it is not available in the terminfo database.
@@ -1263,7 +1263,7 @@ or a file name telling where the information denoted by
 the \fITERM\fP environment variable exists.
 In either case, setting it directs \fI\%ncurses\fP to ignore
 the usual place for this information, e.g., /etc/termcap.
-.SS \fITERMINFO\fP
+.SS "\fITERMINFO\fP"
 \fI\%ncurses\fP can be configured to read from multiple terminal
 databases.
 The \fI\%TERMINFO\fP variable overrides the location for
@@ -1348,7 +1348,7 @@ one or more locations whose names are configured and compiled into the
 @TERMINFO@ (corresponding to the \fITERMINFO\fP variable)
 .RE
 .RE
-.SS \fITERMINFO_DIRS\fP
+.SS "\fITERMINFO_DIRS\fP"
 Specifies a list of locations to search for terminal descriptions.
 Each location in the list is a terminal database as described in
 the section on the \fI\%TERMINFO\fP variable.
@@ -1356,7 +1356,7 @@ The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 .PP
 There is no corresponding feature in System V terminfo;
 it is an extension developed for \fI\%ncurses\fP.
-.SS \fITERMPATH\fP
+.SS "\fITERMPATH\fP"
 If \fI\%TERMCAP\fP does not hold a file name then \fI\%ncurses\fP checks
 the \fI\%TERMPATH\fP environment variable.
 This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
diff --git a/misc/terminfo.src b/misc/terminfo.src
index fc14735ec..87a7ef05d 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1092 $
-#	$Date: 2023/12/30 18:05:02 $
+#	$Revision: 1.1102 $
+#	$Date: 2024/01/06 23:37:36 $
 #
 # 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
@@ -563,14 +563,13 @@ ansi-mtabs|any ANSI terminal with pessimistic assumptions (relative addressing),
 ansi77|ANSI 3.64 standard 1977 version,
 	OTbs, am, mir,
 	cols#80, it#8, lines#24,
-	bel=^G, clear=\E[;H\E[2J, cr=\r, 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, dl1=\E[M$<5*/>, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf2=\EOR, kf4=\EOS, khome=\E[H, nel=\r\ED, rc=\E8, ri=\EM,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sc=\E7, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m,
+	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H, cud1=\E[B,
+	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+	dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	il1=\E[L$<5*/>, ind=\ED, kf1=\EOP, kf2=\EOR, kf4=\EOS,
+	nel=\r\ED, ri=\EM, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
+	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+csr,
 
 # Procomm and some other ANSI emulations don't recognize all of the ANSI-
 # standard capabilities.  This entry deletes <cuu>, <cuf>, <cud>, <cub>, and
@@ -584,13 +583,12 @@ ansi77|ANSI 3.64 standard 1977 version,
 # From: Eric S. Raymond <esr@snark.thyrsus.com> Oct 30 1995
 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
 	OTbs, am, mir, msgr,
-	cols#80, it#8, lines#24,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, 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, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, il1=\E[L, ind=\n, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g,
-	use=klone+sgr-dumb,
+	cols#80, lines#24,
+	bel=^G, cr=\r, 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,
+	home=\E[H, ht=^I, il1=\E[L, ind=\n, use=ansi+arrows,
+	use=ansi+erase, use=ansi+inittabs, use=klone+sgr-dumb,
+
 pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
 	lines#25, use=pcansi-m,
 pcansi-33-m|pcansi33m|ibm-pc terminal programs with 33 lines (mono mode),
@@ -724,7 +722,7 @@ ansi.sys-old|ANSI.SYS under PC-DOS 2.0,
 #
 # <pfkey> capability for F1-F48 -TD
 ansi.sys|ANSI.SYS 3.1 and later versions,
-	el=\E[K, ka1=\0G, ka3=\0I, kb2=\0L, kbs=^H, kc1=\0O, kc3=\0Q,
+	el=\E[K, ka1=\0G, ka3=\0I, kb2=\0L, kc1=\0O, kc3=\0Q,
 	kcbt=\0^O, kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H,
 	kdch1=\0S, kend=\0O, kf1=\0;, kf10=\0D, kf11=\0\205,
 	kf12=\0\206, kf13=\0T, kf14=\0U, kf15=\0V, kf16=\0W,
@@ -739,7 +737,7 @@ ansi.sys|ANSI.SYS 3.1 and later versions,
 	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,
+	use=ansi+arrows, use=ansi.sys-old,
 
 #
 # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS.
@@ -847,23 +845,20 @@ tw100|Toswin VT100 window manager,
 	acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
-	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\EB,
-	cuf=\E[%p1%dC, cuf1=\EC, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea, dim=\E[2m, 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@, il1=\EL, ind=\n, is2=\E<\E)0, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=^?,
-	kf1=\EOP, kf10=\EOY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es,
-	kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EOQ,
-	kf20=\Ey, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
-	kf8=\EOW, kf9=\EOX, khlp=\EH, khome=\E\EE, kich1=\EI,
-	knp=\Eb, kpp=\E\Ea, kund=\EK, ll=\E[24H, nel=\EE,
-	oc=\E[30;47m, op=\E[30;47m, rc=\E8, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
+	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\EB, cuf=\E[%p1%dC, cuf1=\EC,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea,
+	dim=\E[2m, 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@, il1=\EL,
+	ind=\n, is2=\E<\E)0, kdch1=^?, kf1=\EOP, kf10=\EOY, kf11=\Ep,
+	kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev,
+	kf18=\Ew, kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS,
+	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
+	khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK,
+	ll=\E[24H, nel=\EE, oc=\E[30;47m, op=\E[30;47m, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
 	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,
@@ -872,6 +867,8 @@ tw100|Toswin VT100 window manager,
 	     %=%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,
+	use=ansi+apparrows, use=ansi+csr,
+
 # The entries for stv52 and stv52pc probably need a revision.
 stv52|MiNT virtual console,
 	am, msgr,
@@ -947,25 +944,21 @@ st52-old|Atari ST with VT52 emulation,
 beterm|BeOS Terminal,
 	am, eo, mir, msgr, xenl, xon,
 	colors#8, cols#80, it#8, lines#25, ncv#5, pairs#64,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, 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, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[11~,
-	kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf2=\E[12~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~, kf7=\E[17~,
-	kf8=\E[18~, kf9=\E[19~, kspd=^Z, nel=\r\n, op=\E[m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?4l, rmso=\E[m,
-	rmul=\E[24m, rs1=\Ec, sc=\E7, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm, setb=\E[%p1%{40}%+%cm,
-	setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smir=\E[4h,
-	smkx=\E[?4h, smso=\E[7m, smul=\E[4m,
+	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, hts=\EH, ind=\n, kf1=\E[11~, kf10=\E[20~, kf11=\E[21~,
+	kf12=\E[22~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+	kf5=\E[15~, kf6=\E[16~, kf7=\E[17~, kf8=\E[18~, kf9=\E[19~,
+	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM,
+	rmkx=\E[?4l, rmso=\E[m, rmul=\E[24m, rs1=\Ec,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	setb=\E[%p1%{40}%+%cm, setf=\E[%p1%{30}%+%cm,
+	sgr0=\E[0;10m, smkx=\E[?4h, smso=\E[7m, smul=\E[4m,
 	u6=\E[%i%p1%d;%p2%dR, u7=\E[6n, vpa=\E[%i%p1%dd,
-	use=vt220+pcedit,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idc, use=ansi+idl, use=vt220+pcedit,
 
 #### Linux consoles
 #
@@ -1001,23 +994,20 @@ linux-basic|Linux console (basic),
 	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=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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$<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=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, kmous=\E[M, kspd=^Z, nel=\r\n,
-	rc=\E8, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
+	bel=^G, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
+	cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, home=\E[H,
+	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?,
+	kcbt=\E[Z, 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~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM,
+	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
 	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, tbc=\E[3g, vpa=\E[%i%p1%dd,
+	smam=\E[?7h, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=vt220+pcedit, use=vt102+enq, use=klone+sgr,
 	use=ecma+color, use=linux+sfkeys,
 
@@ -1185,31 +1175,27 @@ kon|kon2|Kanji ON Linux console,
 	     \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=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	cnorm=\E[?25h, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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, dsl=\E[?H\E[?E, ed=\E[J, el=\E[K, el1=\E[1K,
-	fsl=\E[?F, 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,
+	dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
+	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, invis=\E[8m,
-	kb2=\E[G, kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A,
+	kb2=\E[G, kbs=^?, kdch1=\E[3~, kend=\E[4~, 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~,
 	knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, op=\E[37;40m,
-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l,
-	rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	rev=\E[7m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m, rmso=\E[27m,
+	rmul=\E[24m, rs1=\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%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smpch=\E[11m,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
-	vpa=\E[%i%p1%dd, use=ansi+enq,
+	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
+	smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 
 # release: 0.4.7 2005/05
 #
@@ -1281,15 +1267,15 @@ bterm|bogl virtual terminal,
 	acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J,
 	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
 	el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, kmous=\E[M, kspd=^Z, nel=\r\n,
-	op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
-	rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
+	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~,
+	kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[49m\E[39m, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 	use=vt220+pcedit, use=vt220+cvis,
 
 #### Mach
@@ -1302,14 +1288,13 @@ mach|Mach console,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r,
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	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, home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kdch1=\E[9, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-	kf9=\EOX, khome=\E[H, kich1=\E[@, kll=\E[F, knp=\E[U,
-	kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m,
-	smso=\E[7m, smul=\E[4m,
+	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y, kf1=\EOP, kf10=\EOY,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
+	kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V,
+	rev=\E[7m, rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m, smso=\E[7m,
+	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
+
 mach-bold|Mach console with bold instead of underline,
 	rmul=\E[0m, smul=\E[1m, use=mach,
 mach-color|Mach console with ANSI color,
@@ -1371,29 +1356,27 @@ hurd|The GNU Hurd console server,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
 	cvvis=\E[34l, 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=\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,
-	invis=\E[8m, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~,
-	kich1=\E[2~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m,
-	rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7,
+	ech=\E[%p1%dX, el1=\E[1K, flash=\Eg, hpa=\E[%i%p1%dG,
+	ht=^I, ich=\E[%p1%d@, ind=\E[S, invis=\E[8m, kb2=\E[G,
+	kbs=^?, kcbt=\E[Z, 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, kspd=^Z, nel=\r\n,
+	op=\E[39;49m, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l,
 	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=vt220+pcedit, use=ecma+index, use=ecma+italics,
-	use=vt220+cvis,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=vt220+pcedit,
+	use=ecma+index, use=ecma+italics, use=vt220+cvis,
 
 #### QNX
 #
@@ -1496,25 +1479,23 @@ qnxt2|QNX 2.15 serial terminal,
 # QNX ANSI terminal definition
 qansi-g|QNX ANSI,
 	am, eslok, hs, xon,
-	colors#8, cols#80, it#8, lines#25, ncv#19, pairs#64, wsl#80,
+	colors#8, cols#80, lines#25, ncv#19, pairs#64, wsl#80,
 	acsc=Oa``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, cuu1=\E[A,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J,
 	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, invis=\E[9m,
+	fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
+	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, 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,
 	kLFT=\E[d, kNXT=\E[u, kOPT=\ENz, kPRV=\E[v, kRIT=\E[c,
-	kbs=^H, kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa,
-	kcmd=\E[G, kcpy=\E[g, kctab=\E[z, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[p, kend=\E[Y,
+	kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa, kcmd=\E[G,
+	kcpy=\E[g, kctab=\E[z, kdch1=\E[P, kdl1=\E[p, kend=\E[Y,
 	kext=\E[y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
 	kf13=\EOp, kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt,
 	kf18=\EOu, kf19=\EOv, kf2=\EOQ, kf20=\EOw, kf21=\EOx,
@@ -1526,13 +1507,13 @@ qansi-g|QNX ANSI,
 	kf42=\E[22~, kf43=\E[23~, kf44=\E[24~, kf45=\E[25~,
 	kf46=\E[26~, kf47=\E[27~, kf48=\E[28~, kf5=\EOT, kf6=\EOU,
 	kf7=\EOV, kf8=\EOW, kf9=\EOX, kfnd=\ENf, khlp=\ENh,
-	khome=\E[H, khts=\ENb, kich1=\E[@, kil1=\E[`, kind=\E[a,
-	kmov=\ENi, kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo,
-	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,
-	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,
+	khts=\ENb, kich1=\E[@, kil1=\E[`, kind=\E[a, kmov=\ENi,
+	kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo, 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, 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,
@@ -1541,9 +1522,9 @@ qansi-g|QNX ANSI,
 	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, use=decid+cpr,
-	use=ansi+rep, use=att610+cvis0, use=ecma+index,
+	smul=\E[4m, tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
+	use=ansi+arrows, use=ansi+rep, use=ansi+inittabs,
+	use=att610+cvis0, use=decid+cpr, use=ecma+index,
 #
 qansi|QNX ANSI with console writes,
 	daisy, xhpa, use=qansi-g,
@@ -1602,26 +1583,25 @@ scoansi-old|SCO Extended ANSI standard crt (5.0.5),
 	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, cuu1=\E[A, cvvis=\E[=0;12C, dch=\E[%p1%dP,
-	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, 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,
+	dch1=\E[P, dispc=\E[=%p1%dg, 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[@, ind=\E[S, invis=\E[8m, kbeg=\E[E, kcbt=\E[Z,
+	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, 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=ansi+arrows, use=ansi+idl, 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,
@@ -1681,22 +1661,21 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cub=\E[%p1%dD,
 	cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC,
 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
-	cuu1=\E[A, cvvis=\E[10/y\E[=1h\E[=2l\E[=6h,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
-	home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+	cuu1=\E[A, cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J,
+	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED,
 	is2=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8, kDC=\E[P,
 	kEND=\E[147q, kHOM=\E[143q, kLFT=\E[158q, kPRT=\E[210q,
-	kRIT=\E[167q, kSPD=\E[218q, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[146q,
-	kent=\r, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
-	kf12=\E[012q, kf2=\E[002q, kf3=\E[003q, kf4=\E[004q,
-	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
-	kf9=\E[009q, khome=\E[H, kich1=\E[139q, knp=\E[154q,
+	kRIT=\E[167q, kSPD=\E[218q, kcbt=\E[Z, kdch1=^?,
+	kend=\E[146q, kent=\r, kf1=\E[001q, kf10=\E[010q,
+	kf11=\E[011q, kf12=\E[012q, kf2=\E[002q, kf3=\E[003q,
+	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
+	kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, knp=\E[154q,
 	kpp=\E[150q, kprt=\E[209q, krmir=\E[146q, kspd=\E[217q,
 	nel=\EE, pfkey=\EP101;%p1%d.y%p2%s\E\\, rc=\E8,
 	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
 	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m,
-	tbc=\E[3g,
+	tbc=\E[3g, use=ansi+arrows, use=ansi+idl,
+
 iris-ansi-ap|IRIS ANSI in application-keypad mode,
 	is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi,
 
@@ -1732,15 +1711,14 @@ iris-color|xwsh|IRIX ANSI with color,
 #		CSI ? 5 h Reverse Video (DECSCNM).
 #
 pccon+keys|OpenBSD PC keyboard keys,
-	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kdch1=\E[3~, kend=\E[8~, kent=\r, 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~, kf21=\E[35~,
-	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	krfr=^R,
+	kbs=^?, kdch1=\E[3~, kend=\E[8~, kent=\r, 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~,
+	kf21=\E[35~, kf22=\E[36~, kf23=\E[37~, kf24=\E[38~,
+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~,
+	knp=\E[6~, kpp=\E[5~, krfr=^R, use=ansi+arrows,
 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,
@@ -1765,15 +1743,14 @@ pccon+colors|ANSI colors for OpenBSD PC console,
 pccon+base|base capabilities for OpenBSD PC console,
 	am, km, mc5i, msgr, npc, nxon, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	bel=^G, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
+	cud1=\n, 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, ech=\E[%p1%dX, 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, nel=\EE, rc=\E8, ri=\EM,
-	rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, sc=\E7, smam=\E[?7h,
-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr,
+	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ind=\ED, nel=\EE, ri=\EM, rmam=\E[?7l,
+	rmul=\E[24m, rs2=\Ec, smam=\E[?7h, smul=\E[4m, tbc=\E[3g,
+	use=ansi+cpr, use=ansi+csr, use=ansi+erase, use=ansi+idl,
+
 pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
 	use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
 pccon0|OpenBSD PC console with simple ASCII pseudographics,
@@ -1802,24 +1779,22 @@ pcvtXX|pcvt VT200 emulator (DEC VT220),
 	it#8, vt#3,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, 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, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
+	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, 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, 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,
+	nel=\EE, rev=\E[7m, rf=/usr/share/tabset/vt100, 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, 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=ansi+apparrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
 	use=decid+cpr, use=ecma+index, use=vt220+cvis,
 
 #	NetBSD/FreeBSD VT220 terminal emulator console (pc keyboard & monitor)
@@ -1886,9 +1861,8 @@ arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
 	cols#80, it#8, lines#30,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C$<2>,
+	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
 	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n,
@@ -1896,15 +1870,14 @@ arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
 	kc1=\E[p, kc3=\E[n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
 	kcuu1=\E[A, kent=\E[M, kf0=\E[y, kf1=\E[P, kf10=\E[x,
 	kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t, kf6=\E[u, kf7=\E[v,
-	kf8=\E[l, kf9=\E[w, rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>,
-	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+	kf8=\E[l, kf9=\E[w, 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
 	    %;%?%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,
+	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
+	use=ecma+sgr, use=klone+color,
 
 arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768),
 	cols#132, lines#50, use=arm100,
@@ -2016,22 +1989,20 @@ rcons-color|BSD rasterconsole with ANSI color,
 mgterm|MGL/MGL2 MobileGear Graphic Library,
 	OTbs, OTpt, am, bce, bw, eo, km, msgr, npc,
 	colors#8, cols#80, it#8, lines#18, pairs#64,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
-	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, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
+	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[30;1m, ech=\E[%p1%dX, el1=\E[1K, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
+	kb2=\E[E, kcbt=\E[Z, 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,
+	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rev=\E[7m,
+	ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, setb=\E[4%p1%dm,
+	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ecma+index,
 
 #### FreeBSD console entries
 
@@ -2068,32 +2039,30 @@ mgterm|MGL/MGL2 MobileGear Graphic Library,
 cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode),
 	am, bce, bw, eo, msgr, npc,
 	colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cnorm=\E[=0C, cr=\r, 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, cuu1=\E[A,
-	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, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C,
+	cr=\r, 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, cuu1=\E[A, cvvis=\E[=1C, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
+	kb2=\E[E, kcbt=\E[Z, 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, 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, use=ecma+index,
+	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idl, 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~
@@ -2320,9 +2289,8 @@ oldpc3|oldibmpc3|old IBM PC BSD/386 console,
 	OTbs, km,
 	lines#25,
 	bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, dl1=\E[M,
-	ht=^I, il1=\E[L, ind=\n, 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=\r\n, sgr0=\E[=R,
+	ht=^I, il1=\E[L, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G,
+	kpp=\E[I, nel=\r\n, sgr0=\E[=R, use=ansi+arrows,
 
 # Description of BSD/OS console emulator in version 1.1, 2.0, 2.1
 # Note, the emulator supports many of the additional console features
@@ -2345,14 +2313,12 @@ bsdos-pc-m|bsdos-pc-mono|BSD/OS PC console mono,
 	cols#80, it#8, lines#25,
 	bel=^G, clear=\Ec, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, 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=\r\n, rc=\E8, sc=\E7,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ind=\n, kich1=\E[L, kll=\E[F,
+	knp=\E[G, kpp=\E[I, nel=\r\n, 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,
+	use=ansi+arrows, use=ansi+idl, use=klone+sgr8,
 
 # Old names for BSD/OS PC console used in releases before 4.1.
 pc3|BSD/OS on the PC console,
@@ -2591,15 +2557,16 @@ vt102+enq|ncurses extension for VT102-style ENQ,
 vt100|vt100-am|DEC VT100 (w/advanced video),
 	OTbs, mc5i, xenl, xon,
 	vt#3,
-	csr=\E[%i%p1%d;%p2%dr, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
-	mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r,
-	sc=\E7,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;$<2>,
 	smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>,
-	use=decid+cpr, use=vt100+4bsd, use=vt100+fnkeys,
+	use=ansi+csr, use=decid+cpr, use=vt100+4bsd,
+	use=vt100+fnkeys,
+
 vt100+4bsd|DEC VT100 from 4.0BSD,
 	am, msgr,
 	cols#80, it#8, lines#24,
@@ -2617,6 +2584,7 @@ vt100+4bsd|DEC VT100 from 4.0BSD,
 	    %;m%?%p9%t\016%e\017%;$<2>,
 	sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>,
 	smul=\E[4m$<2>, tbc=\E[3g,
+
 vt100nam|vt100-nam|VT100 no automargins,
 	am@, xenl@,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am,
@@ -2690,18 +2658,17 @@ vt131|DEC VT131,
 	OTbs, am, xenl,
 	cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>,
-	clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, cuf1=\E[C$<2/>,
-	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
-	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
-	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, nel=\r\n, rc=\E8, rev=\E[7m$<2/>, ri=\EM$<5/>,
+	clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
+	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
+	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, nel=\r\n, rev=\E[7m$<2/>, ri=\EM$<5/>,
 	rmam=\E[?7h, rmkx=\E[?1l\E>, rmso=\E[m$<2/>,
 	rmul=\E[m$<2/>,
-	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr0=\E[m$<2/>, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m$<2/>, smul=\E[4m$<2/>,
+	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
 
 # vt132 - like vt100 but slower and has ins/del line and such.
 # I'm told that <smir>/<rmir> are backwards in the terminal from the
@@ -2726,23 +2693,22 @@ vt220-old|vt200-old|DEC VT220 in VT100 emulation mode,
 	OTnl=\n,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\E[B, cuf1=\E[C,
+	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
-	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>,
-	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
+	ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+	if=/usr/share/tabset/vt100, ind=\ED$<20/>,
+	is2=\E[1;24r\E[24;1H, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
-	kf8=\E[20~, kf9=\E[21~, kich1=\E[2~, rc=\E8, rev=\E[7m$<2>,
-	rf=/usr/share/tabset/vt100, 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,
+	kf8=\E[20~, kf9=\E[21~, khome=\E[1~, kich1=\E[2~,
+	rev=\E[7m$<2>, rf=/usr/share/tabset/vt100,
+	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,
 	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, use=vt220+pcedit, use=vt220+cvis,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl1, use=vt220+pcedit, use=vt220+cvis,
 
 # Here's a picture of the Sun/PC editing keypad:
 #	+--------+--------+--------+
@@ -2785,15 +2751,12 @@ vt220-base|DEC VT220 as emulated,
 	OTbs, am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	flash=\E[?5h$<200/>\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=\ED,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, el1=\E[1K, enacs=\E)0,
+	flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH, ich=\E[%p1%d@,
+	if=/usr/share/tabset/vt100, ind=\ED,
 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -2801,13 +2764,15 @@ vt220-base|DEC VT220 as emulated,
 	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
 	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, 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,
+	rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l,
 	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=vt220+vtedit,
-	use=ansi+pp, use=ansi+enq,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
+	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
+	use=ansi+idl, use=vt220+vtedit,
+
 vt220|vt200|DEC VT220,
 	use=vt220+cvis, use=vt220-base,
 vt220-w|vt200-w|DEC VT220 in wide mode,
@@ -2879,19 +2844,18 @@ vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins,
 vt200-js|vt220-js|DEC VT200 series with jump scroll,
 	am, msgr,
 	cols#80,
-	bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, 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,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+	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,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED,
 	rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l,
 	rmkx=\E[?1l\E>, rmso=\E[27m$<5/>, rmul=\E[24m,
-	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, smdc=,
+	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smdc=,
 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m,
-	use=vt220+cvis,
+	use=ansi+csr, use=ansi+erase, use=vt220+cvis,
 
 # This was DEC's VT320.  Use the purpose-built one below instead
 #vt320|DEC VT320 in VT100 emulation mode,
@@ -2922,31 +2886,30 @@ vt320|vt300|DEC VT320 7 bit terminal,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
 	ech=\E[%p1%dX, 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,
+	hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
-	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~,
+	kbs=^?, kdch1=\E[3~, kel=\E[4~, 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~,
 	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
 	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
-	kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m,
+	kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rev=\E[7m,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
 	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>,
 	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+cvis, use=vt220+keypad, use=dec+sl,
-	use=ansi+enq,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=dec+pp, use=vt220+cvis,
+	use=vt220+keypad, use=dec+sl,
+
 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,
@@ -2985,28 +2948,27 @@ vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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,
-	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
+	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$},
 	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+	hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	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,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m,
+	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	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,
+	rmul=\E[24m, rs1=\E[?3l,
 	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=vt220+cvis,
+	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=vt220+cvis,
 
 # Left/right margins are supported in xterm since patch #279 (2012/05/10)
 vt420+lrmm|VT420 left/right margins,
@@ -3040,28 +3002,26 @@ vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<10/>, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
 	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J$<10/>,
 	el=\E[K$<4/>, flash=\E[?5h$<200/>\E[?5l, fsl=\E[$},
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
-	il=\E[%p1%dL, il1=\E[L, ind=\ED,
+	ht=^I, hts=\EH, ind=\ED,
 	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,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m,
+	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	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,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	rs1=\E<\E[?3l\E[!p\E[?7h,
 	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, use=vt220+cvis,
+	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup,
+	use=ansi+idc, use=ansi+idl, use=dec+sl, use=vt220+cvis,
 
 # (vt420: I removed <kf0>, it collided with <kf10>.  I also restored
 # a missing <sc> -- esr)
@@ -3071,29 +3031,28 @@ vt420|DEC VT420,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<10>,
-	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[J$<50>,
+	clear=\E[H\E[2J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA, cuu1=\E[A,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J$<50>,
 	el=\E[K$<3>, el1=\E[1K, enacs=\E)0,
 	flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
-	il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[1;24r\E[24;1H,
-	is3=\E[?67h\E[64;1"p, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
-	kf8=\E[20~, kf9=\E[21~, nel=\EE, rc=\E8, rev=\E[7m$<2>,
-	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+	ich=\E[%p1%d@, if=/usr/share/tabset/vt300, ind=\ED,
+	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
+	kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
+	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, nel=\EE,
+	rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, 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,
+	rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p,
 	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=vt220+vtedit, use=ansi+pp, use=dec+sl, use=ansi+enq,
-	use=vt220+cvis, use=vt420+lrmm,
+	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp,
+	use=dec+sl, use=vt220+cvis, use=vt420+lrmm,
+	use=vt220+vtedit,
 
 # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
 # takes two parameters, the key and the string.  Translating the key is
@@ -3438,20 +3397,19 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset,
 	am, bw, msgr, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
-	ind=\n, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, rc=\E8, rev=\E[7m, ri=\EM,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, el1=\E[1K, ht=^I,
+	hts=\EH, ind=\n, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, 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,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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,
+	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=vt100+enq,
+	use=vt100+pfkeys,
 
 nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
@@ -3559,14 +3517,13 @@ nsterm-c-s|AppKit Terminal.app v51+ w/MacRoman charset (full color w/statusline)
 # vt52, vt100, vt102 and xterm.
 nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
 	bw@, mir, npc,
-	dch=\E[%p1%dP, dch1=\E[P, flash=\E[?5h$<200/>\E[?5l,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@, kdch1=\E[3~,
-	kend=\E[F, 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[22~, kf19=\E[33~, kf20=\E[34~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[H, knp=\E[6~, kpp=\E[5~, rmir=\E[4l, smir=\E[4h,
-	vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+	kdch1=\E[3~, kend=\E[F, 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[22~, kf19=\E[33~,
+	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
+	vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc,
 	use=xterm+alt47, use=nsterm-c-s-acs, use=vt220+cvis,
 
 # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
@@ -3738,30 +3695,26 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	am, bce, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lines#24, wsl#50,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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(B\E)0,
-	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=\n, kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?,
-	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kdch1=\E[3~, kend=\EOF, kent=\EOM, 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=\EOH, knp=\E[6~, kpp=\E[5~, op=\E[0m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200/>\E[?5l,
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
+	kend=\EOF, kent=\EOM, 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~, knp=\E[6~,
+	kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM, rmacs=^O,
+	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,
 	sgr=\E[0%?%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, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, kEND5=\E[1;5F, kHOM5=\E[1;5H,
-	use=xterm+alt47, use=ansi+enq, use=xterm+sl-twm,
-	use=vt100+keypad, use=xterm+x11mouse,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=vt100+keypad, use=xterm+alt47,
+	use=xterm+sl-twm, use=xterm+x11mouse,
 	use=xterm+256setaf, use=vt220+cvis,
 
 # iTerm2 3.0.15
@@ -3918,18 +3871,17 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 xnuppc+basic|Darwin PowerPC console basic capabilities,
 	am, bce, mir, xenl, NQ,
 	it#8,
-	bold=\E[1m, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=\E[D, 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, dsl=\E]2;\007, ed=\E[J, el=\E[K,
-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^?,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rc=\E8,
+	bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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,
+	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
+	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	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%;m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=vt100+keypad,
+	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+erase,
+	use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	colors#8, ncv#32, pairs#64,
@@ -4267,9 +4219,8 @@ putty|PuTTY terminal emulator,
 	am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
 	colors#8, it#8, ncv#22, pairs#64, U8#1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, 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
@@ -4278,30 +4229,32 @@ putty|PuTTY terminal emulator,
 	      \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$<100/>\E[?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\n,
+	ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	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,
-	kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kind=\E[B, kri=\E[A, kspd=^Z, nel=\r\n, oc=\E]R,
-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	kbs=^?, kcbt=\E[Z, khome=\E[1~, kind=\E[B, kri=\E[A, kspd=^Z,
+	nel=\r\n, oc=\E]R, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=^O,
 	rmam=\E[?7l, 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,
+	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, E3=\E[3J, use=vt220+pcedit,
+	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
 	use=ansi+tabs, use=ansi+rep, use=ecma+index,
-	use=xterm+alt1049, use=xterm+sm+1006, use=putty+fnkeys,
-	use=vt102+enq, use=xterm+sl, use=vt100+fnkeys,
-	use=putty+keypad, use=vt220+cvis, use=bracketed+paste,
-	use=putty+cursor, use=ecma+strikeout,
+	use=vt220+pcedit, use=xterm+alt1049, use=xterm+sm+1006,
+	use=putty+fnkeys, use=vt102+enq, use=xterm+sl,
+	use=vt100+fnkeys, use=putty+keypad, use=vt220+cvis,
+	use=bracketed+paste, use=putty+cursor,
+	use=ecma+strikeout,
+
 # older versions (e.g., before 0.71) of PuTTY used a shift-modifier to toggle
 # between normal- and application-mode for the cursor-keys.  That was dropped,
 # and a few years later (after 0.74) restored as the control-modifier.
@@ -4502,18 +4455,17 @@ teraterm2.3|Tera Term Pro 2.3,
 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, 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, flash=\E[?5h$<200/>\E[?5l,
-	hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kf1=\E[11~,
+	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, 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~, op=\E[100m, rev=\E[7m, ri=\EM,
 	rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, use=vt220+vtedit,
-	use=vt100+enq, use=klone+color, use=vt100,
-	use=vt220+cvis,
+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+idl,
+	use=vt220+vtedit, use=vt100+enq, use=klone+color,
+	use=vt100, use=vt220+cvis,
 
 # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary
 # to choose a Windows OEM font).
@@ -4889,14 +4841,14 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system),
 	cols#80, it#8, lines#65,
 	bold=\E[1m, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr,
 	cub1=^H, cud1=\n, cuf1=\E[C, 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, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H,
+	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
+	home=\E[H, ht=^I, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmam=\E[?7l,
 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m,
+	smso=\E[7m, smul=\E[4m, use=ansi+idl,
+
 # csl is extension which clears the status line
 x10term+sl|status-line for X10 xterm,
 	eslok, hs,
@@ -4910,26 +4862,22 @@ x10term+sl|status-line for X10 xterm,
 xterm-r5|xterm R5 version,
 	OTbs, am, km, msgr, xenl,
 	cols#80, it#8, lines#24,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
-	kil1=\E[30~, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM,
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, hts=\EH, ind=\n, kdl1=\E[31~,
+	kel=\E[8~, kf0=\EOq, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM,
+	rmkx=\E[?1l\E>, rmso=\E[m, 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,
-	sgr0=\E[m, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=vt220+pcedit, use=vt100+enq,
-	use=xterm+kbs,
+	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+idc, use=ansi+idl,
+	use=vt220+pcedit, use=vt100+enq,
 
 # Compatible with the R6 xterm
 # (from XFree86 3.2 distribution, <acsc> and <it> added, <blink@> removed)
@@ -4940,13 +4888,11 @@ xterm-r6|xterm X11R6 version,
 	OTbs, am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL,
-	il1=\E[L, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, enacs=\E)0,
+	home=\E[H, ht=^I, hts=\EH, ind=\n,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -4954,12 +4900,13 @@ xterm-r6|xterm X11R6 version,
 	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~, kmous=\E[M, meml=\El, memu=\Em,
-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, sc=\E7,
+	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
+	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=xterm+alt47,
-	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
+	use=ansi+csr, use=ansi+idl, use=vt220+vtedit,
+	use=xterm+kbs, use=vt100+enq,
 xterm-old|antique xterm version,
 	use=xterm-r6,
 # The monochrome version began as a copy of "xtermm" (from Solaris), and was
@@ -4975,40 +4922,36 @@ xterm-mono|monochrome xterm,
 # The name has been changed and some aliases have been removed.
 xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	OTbs, am, bce, km, mir, msgr, xenl, XT,
-	cols#80, it#8, lines#24, ncv@,
+	cols#80, lines#24, ncv@,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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,
 	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, ich=\E[%p1%d@, 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>,
-	kbeg=\EOE, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kdch1=^?, kend=\EOF, 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~, khome=\EOH, kich1=\E[2~, kmous=\E[M, knp=\E[6~,
-	kpp=\E[5~, kslt=\E[4~, meml=\El, memu=\Em, rc=\E8, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, 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,
+	ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
+	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, 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~,
+	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El,
+	memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	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>,
 	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, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, use=xterm+alt47, use=xterm+kbs,
-	use=vt100+enq, use=ecma+color, use=vt220+cvis,
-	use=vt220+keypad,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=xterm+alt47,
+	use=xterm+kbs, use=vt100+enq, use=ecma+color,
+	use=vt220+cvis, use=vt220+keypad,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -5372,22 +5315,20 @@ xterm+acs|ISO-2022 alternate character-switching for xterm,
 # This chunk is used for building the VT220/Sun/PC keyboard variants.
 xterm-basic|modern xterm terminal emulator - common,
 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
-	colors#8, cols#80, it#8, lines#24, pairs#64,
+	colors#8, cols#80, lines#24, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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, 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, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>,
-	kmous=\E[M, meml=\El, memu=\Em, 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=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	ich=\E[%p1%d@, ind=\n, invis=\E[8m,
+	is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El,
+	memu=\Em, op=\E[39;49m, 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=\E[!p\E[?3;4l\E[4l\E>,
+	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}
@@ -5395,10 +5336,10 @@ xterm-basic|modern xterm terminal emulator - common,
 	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, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+pp, use=xterm+kbs,
-	use=xterm+alt+title, use=ansi+enq, use=att610+cvis,
-	use=xterm+meta,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+	E3=\E[3J, use=ansi+csr, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+pp, use=xterm+kbs,
+	use=xterm+alt+title, use=att610+cvis, use=xterm+meta,
 
 xterm+meta|meta mode for xterm,
 	km,
@@ -5715,19 +5656,18 @@ xterm-hp|xterm with hpterm function keys,
 	use=hp+pfk-cr, use=xterm+nofkeys, use=xterm+nopcfkeys,
 
 xterm-sco|xterm with SCO function keys,
-	kbeg=\E[E, 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,
+	kbeg=\E[E, kbs=^?, 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,
 	kich1=\E[L, kmous=\E[>M, knp=\E[G, kpp=\E[I,
-	use=xterm+nofkeys,
+	use=ansi+arrows, use=xterm+nofkeys,
 
 # The xterm-new description has all of the features, but is not completely
 # compatible with VT220.  If you are using a Sun or PC keyboard, set the
@@ -6067,24 +6007,22 @@ xtermm|xterm terminal emulator (monochrome),
 	btns#3, cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	cud=\E[%p1%dB, cud1=\n, 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$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy,
-	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU,
-	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_,
-	knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
+	cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K$<3>, enacs=\E(B\E)0,
+	getm=\E[%p1%dY, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, kend=\E[Y, kf0=\EOy, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
+	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H,
+	kmous=\E[^_, knp=\E[U, kpp=\E[V, reqmp=\E[492Z, rev=\E[7m,
+	ri=\EM, 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,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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=decid+cpr, use=vt100+fnkeys,
+	smso=\E[7m, tbc=\E[3g, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=decid+cpr, use=vt100+fnkeys,
 
 xtermc|xterm terminal emulator (color),
 	colors#8, ncv#7, pairs#64,
@@ -6134,28 +6072,25 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X,
 	OTbs, am, km, mir, msgr, xenl, XT,
 	cols#80, it#8, lines#65, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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(B\E)0, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[8~, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~,
-	kmous=\E[M, knp=\E[6~, kpp=\E[5~, rc=\E8, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K,
+	enacs=\E(B\E)0, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
+	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kend=\E[8~,
+	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[7~,
+	kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E>\E[?41;1r,
+	rmir=\E[4l, 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%;,
 	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=decid+cpr, use=ecma+color,
+	smul=\E[4m, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+idl, use=decid+cpr, use=ecma+color,
 	use=vt220+keypad,
 
 # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
@@ -6205,8 +6140,7 @@ xterm-color|nxterm|generic color xterm,
 # with their Sun keyboard labels instead.
 # From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
 xterm-sun|xterm with sunFunctionKeys true,
-	kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z,
+	kb2=\E[218z, kcpy=\E[197z, kdch1=\E[3z, kend=\E[220z,
 	kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z,
 	kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z,
 	kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z,
@@ -6217,7 +6151,9 @@ xterm-sun|xterm with sunFunctionKeys true,
 	kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z,
 	kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z,
 	kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
-	use=xterm+nofkeys, use=xterm+nopcfkeys,
+	use=xterm+kbs, use=ansi+apparrows, use=xterm+nofkeys,
+	use=xterm+nopcfkeys,
+
 xterms-sun|small (80x24) xterm with sunFunctionKeys true,
 	use=xterm-sun,
 
@@ -6476,28 +6412,26 @@ hterm-256color|Chromium hterm with xterm 256-colors,
 # VTE, it lacks a few more features (again, trimmed).
 termite|VTE-based terminal,
 	am, km, mir, msgr, npc, xenl,
-	cols#80, it#8, lines#24, ncv@,
+	cols#80, lines#24, ncv@,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
 	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, 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, 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,
+	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, 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>,
 	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, 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=vt220+cvis,
-	use=xterm+pcfkeys, use=xterm+sl-twm,
+	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr,
+	use=ansi+enq, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ecma+index, use=ecma+italics,
+	use=xterm+alt1049, use=xterm+256color, use=ecma+color,
+	use=vt220+cvis, use=xterm+pcfkeys, use=xterm+sl-twm,
 
 #### Other GNOME
 # Multi-GNOME-Terminal 1.6.2
@@ -6767,29 +6701,27 @@ mlterm3|multi lingual terminal emulator 3.x,
 #
 mlterm2|multi lingual terminal emulator 2.x,
 	am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
-	colors#8, cols#80, it#8, lines#24, pairs#64,
+	colors#8, cols#80, lines#24, pairs#64,
 	acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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,
-	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@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=, home=\E[H, hpa=\E[%i%p1%dG,
+	ich=\E[%p1%d@, 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,
-	kend=\EOF, kent=\EOM, khome=\EOH, kind=\EO1;2B, kmous=\E[M,
-	kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+	kcbt=\E[Z, kend=\EOF, kent=\EOM, kind=\EO1;2B, kmous=\E[M,
+	kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, 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,
+	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, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	u8=\E[?1;2c, vpa=\E[%i%p1%dd, use=ansi+enq,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u8=\E[?1;2c,
+	vpa=\E[%i%p1%dd, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
 	use=vt220+vtedit, use=xterm+alt1049, use=ecma+index,
 	use=mlterm+pcfkeys, use=vt220+cvis, use=xterm+r6f2,
 
@@ -6837,25 +6769,25 @@ rxvt-basic|rxvt terminal base (X Window System),
 	cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
-	ind=\n, is1=\E[?47l\E=\E[?1l,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, 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=^H,
-	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=^O,
 	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,
-	s0ds=\E(B, s1ds=\E(0, sc=\E7,
+	s0ds=\E(B, s1ds=\E(0,
 	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, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+enq,
-	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
+	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
+	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
+	use=vt220+cvis, use=vt220+keypad,
 # Key Codes from rxvt reference:
 #
 # Note: Shift + F1-F10 generates F11-F20
@@ -7082,28 +7014,27 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
 	btns#5, cols#80, it#8, lines#24, lm#0, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\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=\n, 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, kNXT@,
 	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
 	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
-	mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM, rmacs=^O,
 	rmam=\E[?7l, 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,
-	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%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, smkx=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
-	use=ecma+color, use=vt220+cvis,
+	use=ansi+csr, use=ansi+idl, use=xterm+alt47,
+	use=vt100+enq, use=rxvt+pcfkeys, use=ecma+color,
+	use=vt220+cvis,
 
 Eterm-256color|Eterm with xterm 256-colors,
 	use=xterm+256color, use=Eterm,
@@ -7249,28 +7180,28 @@ emu-220|Emu-220 (vt200-7bit mode),
 	cols#80, it#8, lines#24, vt#200,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[0;5m, bold=\E[0;1m, clear=\E[2J\E[H, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[1D,
-	cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
-	dch=\E[%p1%dP, dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M,
-	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I,
-	hts=\EH, if=/usr/share/tabset/vt300, il=\E[%p1%dL,
-	il1=\E[1L, ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h,
-	kbs=^H, kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	cub=\E[%p1%dD, cub1=\E[1D, cud=\E[%p1%dB, cud1=\E[1B,
+	cuf=\E[%p1%dC, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[1A, dch=\E[%p1%dP, dch1=\E[1P,
+	dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	enacs=\E)0, home=\E[H, ht=^I, hts=\EH,
+	if=/usr/share/tabset/vt300, il=\E[%p1%dL, il1=\E[1L,
+	ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, kbs=^H,
+	kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
 	kcuu1=\E[A, kent=\EOM, kf0=\EOp, kf1=\EOq, kf10=\EOl,
 	kf11=\EOm, kf12=\EOn, kf13=\EOP, kf14=\EOQ, kf15=\EOR,
 	kf16=\EOS, kf2=\EOr, kf26=\E[17~, kf27=\E[18~, kf28=\E[19~,
 	kf29=\E[20~, kf3=\EOs, kf30=\E[21~, kf34=\E[26~,
 	kf37=\E[31~, kf38=\E[32~, kf39=\E[33~, kf4=\EOt,
 	kf40=\E[34~, kf5=\EOu, kf6=\EOv, kf7=\EOw, kf8=\EOx,
-	kf9=\EOy, khlp=\E[28~, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O,
+	kf9=\EOy, khlp=\E[28~, 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,
+	rs2=\E[4l\E[34l\E[?1l\E[?3l\E[?5l\E[?7h,
 	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\017, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
-	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=vt220+vtedit,
-	use=vt220+cvis,
+	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=ansi+csr,
+	use=vt220+vtedit, use=vt220+cvis,
 
 #### MVTERM
 # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
@@ -7288,22 +7219,21 @@ mvterm|vv100|SwitchTerm aka mvTERM,
 	colors#8, cols#80, it#8, lines#24, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
-	ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, op=\E[100m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
+	ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n, kbs=^H,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, op=\E[100m,
+	rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[?1l\E>, rmso=\E[m,
+	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,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+fnkeys,
-	use=x10term+sl,
+	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
+	use=xterm+alt47, use=vt100+fnkeys, use=x10term+sl,
 
 #### MTERM
 #
@@ -7314,19 +7244,19 @@ mterm-ansi|ANSI emulation,
 	am, bw, mir, msgr,
 	it#8,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	cub=\E[%p1%dD, cub1=\E[D, 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%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, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=\E[D, 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%dP, dim=\E[2m, ech=\E[%p1%dX,
+	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
+	invis=\E[8m, is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m,
+	ri=\E[T, rmacs=^O, 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, use=ecma+index,
+	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
+	vpa=\E[%i%p1%dd, use=ansi+erase, use=ansi+idc1,
+	use=ansi+idl, use=ecma+index,
+
 # mterm normally sets $TERM to "mterm"
 mterm|mouse-sun|Der Mouse term,
 	am, bw, mir,
@@ -7342,28 +7272,27 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	am, mir, msgr, xenl,
 	colors#8, it#8, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	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%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, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=\E[D, 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%dP, dim=\E[2m, ech=\E[%p1%dX,
+	enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=,
+	ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~, 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,
+	kf8=\E[19~, kf9=\E[20~, nel=\EE, op=\E[0m, rev=\E[7m,
+	ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, 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, vpa=\E[%i%p1%dd,
-	use=ansi+cpr, use=vt220+vtedit, use=ecma+index,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+cpr,
+	use=ansi+csr, use=ansi+erase, use=ansi+idc1,
+	use=ansi+idl, use=vt220+vtedit, use=ecma+index,
 	use=vt220+cvis,
 
 #### VWM
@@ -7376,22 +7305,23 @@ vwmterm|VWM terminal,
 	am, bce, ccc, mir, msgr, npc, xenl, xon,
 	colors#8, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	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, cuu1=\E[A, cvvis=\E[?25h, dim=\E[2m,
-	ed=\E[J, el=\E[K, home=\E[H, il1=\E[L, ind=\n, invis=\E[8m,
-	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[22~, 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, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
+	cuu1=\E[A, cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L,
+	ind=\n, invis=\E[8m, 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[22~, 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,
+	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, smso=\E[3m,
-	smul=\E[4m, use=vt220+cvis, use=xterm+alt1049,
+	smul=\E[4m, use=ansi+erase, use=vt220+cvis,
+	use=xterm+alt1049,
 
 #### MGR
 #
@@ -7503,23 +7433,20 @@ st-0.7|simpleterm 0.7,
 # no application keypad mode, e.g, kent.
 st-0.6|simpleterm 0.6,
 	am, bce, mir, msgr, npc, xenl, XT,
-	colors#8, cols#80, it#8, lines#24, pairs#64,
+	colors#8, cols#80, lines#24, pairs#64,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
 	     zz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E)0, 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, invis=\E[8m,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, 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,
 	kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, 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,
@@ -7538,12 +7465,12 @@ st-0.6|simpleterm 0.6,
 	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~, kil1=\E[2;5~, kind=\E[1;2B,
-	kmous=\E[M, 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,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kil1=\E[2;5~,
+	kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A, krmir=\E[2;2~,
+	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, rev=\E[7m,
 	ri=\EM, 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,
+	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}
@@ -7551,11 +7478,13 @@ st-0.6|simpleterm 0.6,
 	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%;%?%p7%t;8%;m,
 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?1;2c,
-	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+enq,
-	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
-	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
-	use=ecma+strikeout, use=bracketed+paste,
+	smso=\E[7m, smul=\E[4m, u8=\E[?1;2c, vpa=\E[%i%p1%dd,
+	Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+enq, use=ansi+idl,
+	use=ansi+inittabs, use=vt220+pcedit, use=ecma+index,
+	use=xterm+alt1049, use=vt220+cvis, use=xterm+sl,
+	use=ecma+italics, use=ecma+strikeout,
+	use=bracketed+paste,
 #
 # st-0.1.1
 #
@@ -7579,23 +7508,23 @@ simpleterm|old-st|simpleterm 0.1.1,
 	am, eo, mir, msgr, ul, xenl,
 	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, 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, 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,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, 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, rev=\E[7m,
+	rmacs=\E(B, rmso=\E[m, rmul=\E[m, 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=ansi+arrows, use=ansi+csr, use=ansi+idl,
 	use=vt220+cvis, use=ecma+index,
+
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
 # Tested with st 0.8.2
@@ -7685,26 +7614,25 @@ terminator|Terminator no line wrap,
 	bce, eo, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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, 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, is1=\E[?47l\E=\E[?1l,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, 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, 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, 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~, 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,
+	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~, 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,
 	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, smacs=\E(0, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+enq,
+	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+csr, use=ansi+enq, use=ansi+idl,
 	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
 	use=xterm+256setaf, use=xterm+sl-twm,
 	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
@@ -8020,28 +7948,26 @@ kitty-direct|KovId's TTY using direct colors,
 	oc=\E]104\007, use=xterm+direct2, use=kitty+common,
 kitty+common|KovId's TTY common properties,
 	am, mc5i, mir, msgr, npc, xenl,
-	cols#80, it#8, lines#24,
+	cols#80, lines#24,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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$<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, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z,
-	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=\E]\E\\\Ec, sc=\E7,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, 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, ich=\E[%p1%d@, ind=\n,
+	kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z, op=\E[39;49m,
+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%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, Smulx=\E[4:%p1%dm, use=ansi+enq,
-	use=ansi+rep, use=xterm+focus, use=xterm+sm+1006,
-	use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm,
+	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+	Smulx=\E[4:%p1%dm, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+rep,
+	use=xterm+focus, use=xterm+sm+1006, use=ecma+index,
+	use=xterm+pcfkeys, use=xterm+sl-twm,
 	use=ecma+strikeout, use=ecma+italics,
 	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
 	use=bracketed+paste, use=report+version,
@@ -8280,28 +8206,28 @@ wezterm|Wez's Terminal Emulator,
 # Developer's terminfo (compiled-in) uses some extensions.
 contour|contour-latest|Contour Terminal Emulator,
 	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
-	cols#80, it#8, lines#24, pairs#0x7fff,
+	cols#80, lines#24, pairs#0x7fff,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
-	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
-	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=,
-	ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z, kend=\EOF, khlp=,
-	kmous=\E[M, kund=, oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m,
-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l,
-	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, dsl=\E[$~,
+	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+	fsl=\E[$}, hpa=\E[%i%p1%dG, ind=\n, indn=\E[%p1%dS,
+	invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z,
+	kend=\EOF, khlp=, kmous=\E[M, kund=, oc=\E]104\E\\,
+	op=\E[39;49m, rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmacs=\E(B,
+	rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
+	rs1=\E]\E\\\Ec,
 	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(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
-	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
-	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
-	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl, use=ansi+rep,
-	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
+	smso=\E[7m, smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J,
+	vpa=\E[%i%p1%dd, Cs=\E]12;%p1%s\E\\, E3=\E[3J,
+	Rmol=\E[55m, Se=\E[ q, Smol=\E[53m, Smulx=\E[4:%p1%dm,
+	Ss=\E[%p1%d q, use=ansi+apparrows, use=ansi+cup,
+	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+rep, use=att610+cvis,
+	use=ecma+italics, use=ecma+strikeout,
 	use=xterm+256color, use=xterm+alt1049, use=xterm+pcc2,
 	use=xterm+pce2, use=xterm+pcf2,
 
@@ -8340,27 +8266,26 @@ pty|4bsd pseudo teletype,
 eterm|GNU Emacs term.el terminal emulation,
 	am, mir, xenl,
 	cols#80, lines#24,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, rev=\E[7m, rmir=\E[4l,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, use=xterm+alt47, use=ansi+cpr,
+	bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
+	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
+	rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr,
+	use=ansi+erase, use=ansi+idl, use=xterm+alt47,
 
 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 	msgr,
 	colors#8, pairs#64,
-	blink=\E[5m, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, op=\E[39;49m, rc=\E8, ri=\EM,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
+	blink=\E[5m, invis=\E[8m, kbs=^?, khome=\E[1~,
+	op=\E[39;49m, ri=\EM, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
 	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,
-	sgr0=\E[m, use=vt220+pcedit, use=eterm,
+	sgr0=\E[m, use=ansi+apparrows, use=ansi+csr,
+	use=vt220+pcedit, use=eterm,
 
 # shell.el can "do" color, though not nearly as well.
 #
@@ -8456,31 +8381,30 @@ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 # terminfo entries (which list about 60% of the control sequences).
 screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
-	cols#80, it#8, lines#24, ncv@, U8#1,
+	cols#80, lines#24, ncv@, U8#1,
 	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=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
 	cvvis=\E[34l, 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,
-	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, kcbt=\E[Z, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dS,
+	is2=\E)0, kbs=^?, kcbt=\E[Z, 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~,
-	kmous=\E[M, 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,
+	khome=\E[1~, kmous=\E[M, nel=\EE, 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,
 	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, 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=xterm+kbs, use=vt220+pcedit,
-	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
+	smso=\E[3m, smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B,
+	S0=\E(%p1%c, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
+	use=ecma+color, use=vt100+enq,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8682,34 +8606,32 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
 	cols#132, use=screen,
 
 screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x),
-	cols#80, it#8, lines#24,
-	cbt=\E[Z, clear=\E[2J\E[H, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cols#80, lines#24,
+	clear=\E[2J\E[H, cr=\r, 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, cuu1=\E[A,
-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
-	el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
-	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
-	nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
-	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smir=\E[4h,
-	smso=\E[3m, smul=\E[4m, tbc=\E[3g,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
+	el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
+	kcuf1=\EC, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU,
+	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I,
+	khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
+	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m,
+	smul=\E[4m, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs,
+
 # (screen3: removed unknown ":xv:LP:G0:" -- esr)
 screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
 	km, mir, msgr,
-	cols#80, it#8, lines#24,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cols#80, lines#24,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
-	rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m, rs1=\Ec,
-	sc=\E7, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m,
-	smul=\E[4m, tbc=\E[3g,
+	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n,
+	is2=\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE,
+	rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m,
+	rmul=\E[24m, rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=,
+	smso=\E[3m, smul=\E[4m, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs,
 
 # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file
 # was last updated in 2009 to include 256-color support.  The most recent
@@ -8835,36 +8757,33 @@ dvtm|dynamic virtual terminal manager,
 	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E(B\E)0, 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,
-	is1=\E[?47l\E=\E[?1l,
+	ich=\E[%p1%d@, ich1=\E[@, 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,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
-	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
-	kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
+	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^,
+	kend=\E[8~, kent=\EOM, kf0=\E[21~, 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~, kf21=\E[23$,
 	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, op=\E[39;49m,
-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
+	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, 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,
-	s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	s0ds=\E(B, s1ds=\E(0, 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%;m%?
 	    %p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+alt47,
+	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+csr, use=ansi+idl, use=xterm+alt47,
 	use=vt220+vtedit, use=vt220+cvis, use=ecma+italics,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
@@ -8915,31 +8834,30 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	am, km, mir, msgr, xenl,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
+	ed=\E[J, 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,
+	ind=\n$<150*>,
+	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>,
 	kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
 	kf11=\E[29~, kf12=\E[31~, kf13=\E[32~, kf14=\E[33~,
 	kf15=\E[34~, kf2=\E[18, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~,
 	kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~,
 	khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i,
-	rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
+	rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
 	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,
+	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>,
 	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=vt220+cvis, use=xterm+sl,
-	use=ansi+enq,
+	u8=\E[?62;1;6c, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=vt220+cvis, use=xterm+sl, use=ansi+enq,
+
 ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
 	use=ncsa-m, use=klone+color,
 ncsa-ns|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color w/o status line),
@@ -9024,9 +8942,9 @@ pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation,
 	cols#80, lines#25,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
-	nel=\r\n, rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m,
+	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, nel=\r\n,
+	rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m,
+	use=ansi+arrows,
 
 #### Sun consoles
 #
@@ -9037,11 +8955,11 @@ oldsun|Sun Microsystems Workstation console,
 	cols#80, it#8, lines#34,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C,
 	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, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	is1=\E[1r, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H,
-	rmso=\E[m, sgr0=\E[m, smso=\E[7m,
+	dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, is1=\E[1r, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	khome=\E[H, rmso=\E[m, sgr0=\E[m, smso=\E[7m, use=ansi+idl,
+
 # From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
 # <lines> capability later corrected by J.T. Conklin <jtc@cygnus.com>
 # SGR 1, 4 aren't supported - removed bold/underline (T.Dickey 17 Jan 1998)
@@ -9050,17 +8968,17 @@ sun-il|Sun Microsystems console with working insert-line,
 	cols#80, lines#34,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	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, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	kb2=\E[218z, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kdch1=^?, kend=\E[220z, kf1=\E[224z,
+	dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, kb2=\E[218z, kdch1=^?, kend=\E[220z, kf1=\E[224z,
 	kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, kf2=\E[225z,
 	kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z,
 	kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z,
 	kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z,
 	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@,
 	rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-	smso=\E[7m, u8=\E[1t, u9=\E[11t,
+	smso=\E[7m, u8=\E[1t, u9=\E[11t, use=ansi+arrows,
+	use=ansi+idl,
+
 # On some versions of CGSIX framebuffer firmware (SparcStation 5), <il1>/<il>
 # flake out on the last line.  Unfortunately, without them the terminal has no
 # way to scroll.
@@ -9244,17 +9162,17 @@ news-unk|Sony NEWS VT100 emulator common entry,
 	OTbs, OTpt, am, xenl,
 	cols#80,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L,
+	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	if=/usr/share/tabset/vt100,
 	is2=\E[?7h\E[?1h\E[?3l\E7\E8, kbs=^H, kcub1=\EOD,
 	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf1=\EOP,
 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
-	kf8=\EOW, kf9=\EOX, rc=\E8, rev=\E[7m, ri=\EM,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sc=\E7,
-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	kf8=\EOW, kf9=\EOX, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sgr0=\E[m,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	use=ansi+idl,
 #
 # (news-29: this had :TY=ascii: --esr)
 news-29|Sony NEWS VT100 emulator with 29 lines,
@@ -9293,14 +9211,14 @@ news-old-unk|old Sony NEWS VT100 emulator common entry,
 	OTbs, OTpt, am, xenl,
 	cols#80, vt#3,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
-	home=\E[H, ht=^I, if=/usr/share/tabset/vt100, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m, ri=\EM,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	if=/usr/share/tabset/vt100, kbs=^H, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
 #
 # (nwp512: this had :DE=^H:, which I think means <OTbs> --esr)
 nwp512|news|nwp514|news40|vt100-bm|nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|old Sony VT100 emulator 40 lines,
@@ -9387,28 +9305,26 @@ dtterm|CDE desktop terminal,
 	am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, lm#0, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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,
-	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, 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 F\E>\E[?1l\E[?7h\E[?45l,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	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~,
-	khlp=\E[28~, 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,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	invis=\E[8m, is2=\E F\E>\E[?1l\E[?7h\E[?45l, kbs=^H,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, khlp=\E[28~, nel=\EE, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmso=\E[22;27m,
+	rmul=\E[24m,
 	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=decid+cpr,
+	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
 
 ######## Non-Unix Consoles
@@ -9531,26 +9447,24 @@ cygwin|ANSI emulation for Cygwin,
 	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=\r, 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,
-	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, fsl=^G, home=\E[H,
-	hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, kb2=\E[G,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	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~, kspd=^Z, nel=\r\n,
-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m,
-	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,
+	bel=^G, bold=\E[1m, cr=\r, 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, cuu1=\E[A,
+	el1=\E[1K, fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ind=\n,
+	invis=\E[8m, kb2=\E[G, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
+	rev=\E[7m, ri=\EM, rmacs=\E[10m, 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,
-	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smpch=\E[11m,
-	smso=\E[7m, smul=\E[4m, tsl=\E];, vpa=\E[%i%p1%dd,
+	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
+	smul=\E[4m, tsl=\E];, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=xterm+alt47, use=vt220+pcedit, use=vt102+enq,
 
 # I've supplied this so that you can help test new values and add other
@@ -9561,32 +9475,30 @@ cygwin|ANSI emulation for Cygwin,
 # this list, but DOES cause problems so it has been removed
 cygwinDBG|Debug Version for Cygwin,
 	am, eo, mir, msgr, xon,
-	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
+	colors#8, cols#80, 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,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\E[P,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, 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=\n, invis=\E[8m, kNXT=\E[6$,
-	kPRV=\E[5$, kb2=\E[G, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~,
-	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-	rmacs=\E[10m, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=\E[D, 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, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\n, invis=\E[8m, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G,
+	kcbt=\E[Z, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
+	rev=\E[7m, ri=\EM, rmacs=\E[10m, 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,
-	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=vt220+pcedit,
-	use=vt220+cvis, use=vt102+enq,
+	sgr0=\E[0;10m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
+	use=vt220+pcedit, use=vt220+cvis, use=vt102+enq,
 
 #### DJGPP
 
@@ -9715,22 +9627,21 @@ djgpp|ANSI emulation for DJGPP alpha,
 	     \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=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+	cnorm=\E[v, cr=\r, 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, 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, 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, invis=\E[8m,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	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~, nel=\r\n, op=\E[37;40m,
-	rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
+	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, 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~, nel=\r\n,
+	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=ansi+arrows, use=ansi+erase, use=ansi+idl,
 	use=vt220+pcedit, use=ecma+index,
 
 djgpp203|entry for DJGPP 2.03,
@@ -9747,15 +9658,14 @@ djgpp204|entry for DJGPP 2.04,
 	cub1=\E[D, 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, 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, invis=\E[8m, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, kll=\E[4~,
-	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=vt220+pcedit, use=ecma+index,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+	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~, kll=\E[4~, 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=ansi+arrows,
+	use=ansi+idl, use=vt220+pcedit, use=ecma+index,
 
 #### U/Win
 
@@ -9768,20 +9678,18 @@ uwin|U/Win 3.2 console,
 	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, clear=\E[H\E[J, cr=\r,
-	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, 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[@, nel=\r\n, op=\E[39;49m,
-	rc=\E8, rev=\E[7m, rmacs=\E[10m, rmir=\E[4l, rmpch=\E[10m,
-	rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dim=\E[2m,
+	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
+	kdch1=^?, 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, kich1=\E[@, nel=\r\n,
+	op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
+	rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m,
-	smacs=\E[11m, smir=\E[4h, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=vt220+cvis,
+	smacs=\E[11m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+	tbc=\E[3g, use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+	use=ansi+idc, use=vt220+cvis,
 
 #### Microsoft (miscellaneous)
 
@@ -9875,10 +9783,8 @@ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with colo
 	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cub=\E[%p1%dD,
 	cub1=\E[D, cud=\E[%p1%dB, cud1=\n, 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,
-	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
-	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,
+	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ind=\E[S,
+	kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, 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,
@@ -9891,11 +9797,12 @@ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with colo
 	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,
+	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=ansi+arrows, use=ansi+idl,
+	use=ecma+index, use=klone+color,
 
 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
 	lines#35, use=opennt,
@@ -9977,15 +9884,15 @@ altos2|alt2|altos-2|Altos II,
 	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
 	if=/usr/share/tabset/vt100, il1=\E[L, ind=\n,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kDL=^Am\r,
-	kEOL=^An\r, kbs=^H, kcbt=^AK\r, kclr=^AL\r, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^AM\r, kel=^AN\r,
+	kEOL=^An\r, kcbt=^AK\r, kclr=^AL\r, kdch1=^AM\r, kel=^AN\r,
 	kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf32=^A`\r,
 	kf33=^Aa\r, kf34=^Ab\r, kf35=^Ac\r, kf36=^Ad\r, kf37=^Ae\r,
 	kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, kf41=^Ai\r,
 	kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
 	kf8=^AG\r, kf9=^AH\r, khome=\E[f, kil1=^AJ\r, kind=^AO\r,
 	nel=\r\n, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smam=\E[?7h, smso=\E[7m, smul=\E[4m,
+	smam=\E[?7h, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+
 # (altos3: had extension capabilities
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
 #	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
@@ -10476,15 +10383,14 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode,
 	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
 	ich1=\E[@, il1=\E[L, ind=\n,
 	is2=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\,
-	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kend=\E[4~, kf1=\E[17~, kf10=\E[28~,
-	kf2=\E[18~, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~,
-	kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~,
-	kpp=\E[5~, rmam=\E[?7l,
-	rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
+	kcbt=\E[Z, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, kf2=\E[18~,
+	kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~,
+	kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
+	rmam=\E[?7l, rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\,
+	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
 	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m,
-	smul=\E[4m, xoffc=g, xonc=e, use=vt220+cvis,
+	smul=\E[4m, xoffc=g, xonc=e, use=ansi+arrows,
+	use=vt220+cvis,
 #
 # (hp2392: copied <rmir> here from hpex -- esr)
 hp2392|239x series,
@@ -10591,30 +10497,31 @@ hp9845|HP 9845,
 # added empty <acsc> to avoid warnings re <smacs>/<rmacs> --esr)
 hp98550|hp98550a|HP 9000 Series 300 color console,
 	OTbs, am, da, db, mir, xhp,
-	cols#128, it#8, lines#49, lm#0,
+	cols#128, lines#49, lm#0,
 	acsc=, bel=^G, blink=\E&dA, bold=\E&dJ, cbt=\Ei, civis=\E*dR,
 	clear=\EH\EJ, cnorm=\E*dQ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, dim=\E&dH,
-	dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, hts=\E1,
+	dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, hts=\E1,
 	if=/usr/share/tabset/std, il1=\EL, ind=\n, invis=\E&ds,
 	kbs=^H, kclr=\EJ, kctab=\E2, kdch1=\EP, kdl1=\EM, ked=\EJ,
 	kel=\EK, khts=\E1, kich1=\EQ, kil1=\EL, kll=\EF, knp=\EU,
 	kpp=\EV, krmir=\ER, ktbc=\E3, rev=\E&dJ, rmacs=^O, rmir=\ER,
 	rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, smacs=^N,
 	smir=\EQ, smkx=\E&s1A, smso=\E&dJ, smul=\E&dD, tbc=\E3,
-	vpa=\E&a%p1%dY, use=hp+pfk-cr, use=hp+arrows,
+	vpa=\E&a%p1%dY, use=hp+pfk-cr, use=ansi+inittabs,
+	use=hp+arrows,
 
 # From: Martin Trusler
 hp98550-color|hp98550a-color|HP 9000 Series 300 color console (Trusler),
 	OTbs, am, ccc, da, db, km, mir, xhp,
-	colors#8, cols#128, it#8, lh#2, lines#49, lm#0, lw#8, nlab#8,
-	pairs#8, xmc#0,
+	colors#8, cols#128, lh#2, lines#49, lm#0, lw#8, nlab#8, pairs#8,
+	xmc#0,
 	acsc=+>\,<-\^.v0\374``a\374f\372g\376h\374j+k+l+m+n+o-q-s-t+
 	     u+v+w+x|y<z>{*|!}\273~\362,
 	bel=^G, bold=\E&dD, cbt=\Ei, clear=\EH\EJ, cr=\r, cub1=^H,
 	cud1=\EB, cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA,
 	dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, home=\E&a0y0C,
-	hpa=\E&a%p1%dC, ht=^I, hts=\E1, il1=\EL, ind=\ES,
+	hpa=\E&a%p1%dC, hts=\E1, il1=\EL, ind=\ES,
 	initp=\E&v0m%?%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}%=
@@ -10637,7 +10544,7 @@ hp98550-color|hp98550a-color|HP 9000 Series 300 color console (Trusler),
 	smir=\EQ, smkx=\E&s1A, smln=\E&jB, smm=\E&k1I, smso=\E&dB,
 	smul=\E&dD, tbc=\E3, u6=\Ea%dc%dR\r, u7=\Ea,
 	u8=\E%[0123456789/], u9=\E*s1\^, vpa=\E&a%p1%dY,
-	use=hp+pfk-cr, use=hp+arrows,
+	use=hp+pfk-cr, use=ansi+inittabs, use=hp+arrows,
 
 # From: Victor Duchovni <vic@fine.princeton.edu>
 # (hp700-wy: removed obsolete ":nl=^J:";
@@ -10685,14 +10592,15 @@ gator-t|HP 9000 model 237 emulating extra-tall AAA,
 gator|HP 9000 model 237 emulating AAA,
 	bw, km, mir, ul,
 	cols#128, it#8, lines#47,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	dch=\E[%p1%dP$<4/>, dch1=\E[P, dl=\E[%p1%dM$<1*/>,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%d`,
-	ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@, il=\E[%p1%dL$<1*/>,
-	il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n,
-	rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP$<4/>,
+	dch1=\E[P, dl=\E[%p1%dM$<1*/>, dl1=\E[M, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@,
+	il=\E[%p1%dL$<1*/>, il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n,
+	nel=\r\n, rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m,
 	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+	use=ansi+erase,
+
 gator-52|HP 9000 model 237 emulating VT52,
 	cols#128, lines#47, use=vt52-basic,
 gator-52t|HP 9000 model 237 emulating extra-tall VT52,
@@ -11103,13 +11011,14 @@ pt100|pt200|wren|fenix|Prime pt100/pt200,
 	cup=\E0%p1%{33}%+%c%p2%{33}%+%c, cuu=\E[%p1%dA,
 	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M,
 	ed=\E[J\E[r, el=\E[K\E[t, flash=\E$$<200/>\E$P,
-	home=\E$B, ht=^I, il1=\E[L\E[t, ind=\n, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E$A, nel=\r\n,
+	home=\E$B, ht=^I, il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n,
 	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[>12
 	      l\E[1Q,
 	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m,
+	use=ansi+arrows,
+
 pt100w|pt200w|wrenw|fenixw|Prime pt100/pt200 in 132-column mode,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH, use=pt100,
@@ -11184,20 +11093,20 @@ qvt103|Qume qvt 103,
 	am, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C$<2>,
+	clear=\E[H\E[2J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
 	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
 	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8,
+	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	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,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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,
+	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
+
 qvt103-w|Qume qvt103 132 cols,
 	cols#132, lines#24,
 	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, use=qvt103,
@@ -12242,13 +12151,13 @@ tvi970|TeleVideo 970,
 	ed=\E[J, el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H,
 	hpa=\E[%i%p1%dG, ht=^I, il1=\E[L,
 	is2=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kf1=\E?a, kf2=\E?b, kf3=\E?c, kf4=\E?d, kf5=\E?e, kf6=\E?f,
-	kf7=\E?g, kf8=\E?h, kf9=\E?i, khome=\E[H, ri=\EM, rmacs=\E(B,
+	kf7=\E?g, kf8=\E?h, kf9=\E?i, ri=\EM, rmacs=\E(B,
 	rmam=\E[?7h, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smacs=\E(B, smam=\E[?7l,
 	smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd,
+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+
 tvi970-vb|TeleVideo 970 with visual bell,
 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
 	use=tvi970,
@@ -12462,12 +12371,12 @@ vi603|visual603|Visual 603,
 	hs, mir,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
 	csr=\E[%i%p1%d;%p2%dr, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, il1=\E[L,
-	ind=\ED, is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r,
-	rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+	dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, ind=\ED,
+	is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m,
+	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
 	sgr0=\E[m\017$<2>, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	tsl=\EP2~, use=decid+cpr, use=vt100+4bsd,
+	tsl=\EP2~, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
 
 #### Wyse (wy)
 #
@@ -12915,15 +12824,13 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
 	clear=\E[H\E[J$<200>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD$<1>,
-	cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED,
-	cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
+	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
-	cvvis=\E[34l\E[?25h, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
-	ech=\E[%p1%dX, ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>,
-	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,
+	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
+	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
+	flash=\E[?5h$<30/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, ich=\E[%p1%d@, 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,
 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
@@ -12932,17 +12839,17 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
 	kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h,
-	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,
+	mc4=\E[4i, mc5=\E[5i, nel=\EE, prot=\E[1"q, 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,
-	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%;,
 	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,
+	use=ansi+csr, use=ansi+idl,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
@@ -13110,17 +13017,16 @@ wy75|wyse75|Wyse 75,
 	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>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
-	is2=\E>\E(B\E)0\017, is3=\E[m, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\E[M, kel=\E[K,
+	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
 	kf1=\E[?5i, 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[?3i,
 	kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
-	khlp=\E[28~, khome=\E[H, kich1=\E[@, kil1=\E[L, knp=\E[6~,
-	kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, mc4=\E[4i,
-	mc5=\E[5i, rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+	khlp=\E[28~, kich1=\E[@, kil1=\E[L, knp=\E[6~, kpp=\E[5~,
+	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, 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$<80>, rs3=\E[?5l,
 	sc=\E7,
 	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t
@@ -13128,8 +13034,8 @@ wy75|wyse75|Wyse 75,
 	    \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=decid+cpr, use=vt220+cvis,
-	use=vt220+keypad,
+	tbc=\E[3g, tsl=\E[>\,\001, use=ansi+arrows,
+	use=decid+cpr, use=vt220+cvis, use=vt220+keypad,
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -13168,36 +13074,35 @@ wy75-wvb|wyse75-wvb|Wyse 75 with visible bell 132 columns,
 #
 wy85|wyse85|Wyse 85,
 	am, hs, mc5i, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, wsl#80,
+	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	clear=\E[H\E[J$<110>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<110>,
+	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
 	cuu=\E[%p1%dA, cuu1=\E[A, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, ht=\011$<1>, hts=\EH, ich=\E[%p1%d@$<4*>,
+	home=\E[H, ht=\011$<1>, 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,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
-	is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf10=\E[21~, kf11=\E[23~,
+	is3=\E>\E(B\E)0\017\E[m, 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~,
 	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
 	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8,
-	rev=\E[7m, ri=\EM$<3>, 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,
+	lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
+	ri=\EM$<3>, 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,
 	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=decid+cpr,
+	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+arrows,
+	use=ansi+csr, use=ansi+inittabs, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
 #
 #	Wyse 85 with visual bell.
@@ -13225,18 +13130,17 @@ wy85-wvb|wyse85-wvb|Wyse 85 with visible bell 132-columns,
 # or the actual."
 wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 	am, hs, mc5i, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, wsl#80,
+	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	clear=\E[H\E[J$<110>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<110>,
+	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
 	cuu=\E[%p1%dA, cuu1=\E[A, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, ht=\011$<1>, hts=\EH, ich=\E[%p1%d@$<4*>,
+	home=\E[H, ht=\011$<1>, 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,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
@@ -13250,16 +13154,15 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
 	khome=\23326~, kich1=\2332~, knp=\2336~, kpp=\2335~,
 	kslt=\2334~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM$<3>,
-	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,
+	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM$<3>, 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,
 	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=decid+cpr,
-	use=vt220+cvis,
+	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+csr,
+	use=ansi+inittabs, use=decid+cpr, use=vt220+cvis,
 #
 #	Wyse 185 emulating a VT320 7 bit mode.
 #
@@ -13273,9 +13176,9 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 #
 wy185|wyse185|Wyse 185,
 	am, hs, km, mc5i, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, wsl#80,
+	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
 	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr$<20>, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
@@ -13285,12 +13188,11 @@ wy185|wyse185|Wyse 185,
 	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\,$<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,
+	home=\E[H, hpa=\E[%i%p1%d`, 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,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
-	is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf10=\E[21~,
+	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, 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~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
@@ -13304,8 +13206,9 @@ wy185|wyse185|Wyse 185,
 	    %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,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+	tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+inittabs, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+keypad,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|Wyse 185 with 24 data lines,
@@ -13451,19 +13354,19 @@ wy325-43w-vb|wy325-43wvb|Wyse-325 43 lines wide mode visual bell,
 # Bug: The <op> capability resets attributes.
 wy370-nk|Wyse 370 without function keys,
 	am, ccc, hs, mc5i, mir, msgr, xenl, xon,
-	colors#64, cols#80, it#8, lines#24, ncv#48, pairs#64, wsl#80,
+	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
 	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH$<1>, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>,
-	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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h\E[34l,
+	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, hts=\EH,
+	home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>,
 	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
@@ -13477,52 +13380,50 @@ wy370-nk|Wyse 370 without function keys,
 	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,
-	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,
+	op=\E[m, 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, 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%;,
 	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,
-	u0=\E[?38h\E8, u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B,
-	u4=\E[92;76"p, u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd,
-	use=decid+cpr,
+	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
+	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
+	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
+	use=ansi+inittabs, use=decid+cpr,
 #
 #	Function key set for the ASCII (wy-50 compatible) keyboard
 #	This is the default 370.
 #
 wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard,
-	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i,
+	kcbt=\E[Z, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
 	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\E[?3i,
 	kf3=\E[2i, kf4=\E[@, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[H, kich1=\EOP, kil1=\EOP,
-	knp=\E[U, kpp=\E[V, use=wy370-nk,
+	kf8=\E[19~, kf9=\E[20~, kich1=\EOP, kil1=\EOP, knp=\E[U,
+	kpp=\E[V, use=ansi+arrows, use=wy370-nk,
 #
 #	Function key set for the VT-320 (and wy85) compatible keyboard
 #
 wy370-105k|Wyse 370 with 105 key keyboard,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\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~, kf20=\E[34~, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
 	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, use=vt220+vtedit, use=wy370-nk,
+	lf4=PF4, use=ansi+arrows, use=vt220+vtedit, use=wy370-nk,
 	use=vt220+keypad,
 #
 #	Function key set for the PC compatible keyboard
 #
 wy370-EPC|Wyse 370 with 102 key keyboard,
-	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
+	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[H, kich1=\E[2~, knp=\E[U, kpp=\E[V, use=wy370-nk,
+	kich1=\E[2~, knp=\E[U, kpp=\E[V, use=ansi+arrows,
+	use=wy370-nk,
 #
 #	Wyse 370 with visual bell.
 wy370-vb|Wyse 370 with visible bell,
@@ -13619,35 +13520,34 @@ wy520|wyse520|Wyse 520,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
 	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr$<20>, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
-	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h\E[34l,
+	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
+	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
 	enacs=\E)0, fsl=\E[0$}, 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,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
-	is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ked=\E[1~, kel=\E[4~,
+	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
 	kent=\EOM, 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~, kf20=\E[34~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m,
+	lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
 	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, 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,
+	rs3=\E[?5l\E[47h\E[40l\E[r,
 	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`,
-	vpa=\E[%i%p1%dd, use=decid+cpr, use=vt220+vtedit,
-	use=vt220+keypad,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13883,28 +13783,28 @@ vt320-k3|MS-Kermit 3.00's VT320 emulation,
 	am, eslok, hs, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cmdch=\E,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
-	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
+	dsl=\E[0$~, ech=\E[%p1%dX,
 	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=\n,
+	ich=\E[%p1%d@, ind=\n,
 	is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD,
 	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~,
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~,
-	kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, nel=\r\n, rc=\E8,
+	kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, nel=\r\n,
 	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\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,
+	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, use=vt220+cvis,
+	tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=vt220+cvis,
 
 # From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
 # ACS capabilities from Philippe De Muyter  <phdm@info.ucl.ac.be> 30 May 1996
@@ -13914,25 +13814,23 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	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,
 	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
 	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,
+	hts=\EH, ich=\E[%p1%d@, 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~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
-	lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m,
+	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EM, rmacs=^O,
 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[?3l, sc=\E7, sgr0=\E[m, smacs=^N,
-	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=vt220+cvis,
+	rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, 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=ansi+csr,
+	use=ansi+idl, use=vt220+cvis,
 
 ######## NON-ANSI TERMINAL EMULATIONS
 #
@@ -14027,17 +13925,18 @@ rbcomm|IBM PC with RBcomm and EMACS keybindings,
 	am, bw, mir, msgr, xenl,
 	cols#80, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=^L, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^C, cuf1=^B,
+	cub1=^H, cud1=^C, cuf1=^B,
 	cup=\037%p2%{32}%+%c%p1%{32}%+%c, cuu1=^^, dch1=^W,
 	dl=\E[%p1%dM, dl1=^Z, ech=\E[%p1%dX, ed=^F5, el=^P^P, ht=^I,
 	il=\E[%p1%dL, il1=^K, ind=\ED, invis=\E[8m,
 	is2=\017\035\E(B\E)0\E[?7h\E[?3l\E[>8g, kbs=^H,
 	kcub1=^B, kcud1=^N, kcuf1=^F, kcuu1=^P, khome=^A, nel=\r\ED,
-	rc=\E8, rep=\030%p1%c%p2%c, rev=^R, ri=\EM, rmcup=, rmdc=,
-	rmir=^], rmkx=\E>, rmso=^U, rmul=^U,
-	rs1=\017\E(B\E)0\025\E[?3l\E[>8g, sc=\E7, sgr0=\E[m,
-	smcup=, smdc=, smir=^\, smkx=\E=, smso=^R, smul=^T,
+	rep=\030%p1%c%p2%c, rev=^R, ri=\EM, rmcup=, rmdc=, rmir=^],
+	rmkx=\E>, rmso=^U, rmul=^U,
+	rs1=\017\E(B\E)0\025\E[?3l\E[>8g, sgr0=\E[m, smcup=,
+	smdc=, smir=^\, smkx=\E=, smso=^R, smul=^T, use=ansi+csr,
 	use=vt220+cvis,
+
 rbcomm-nam|IBM PC with RBcomm without autowrap,
 	am@,
 	cud1=\n, ind=\n,
@@ -14106,20 +14005,19 @@ MtxOrb162|16x2 Matrix Orbital LCD display,
 att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode,
 	am, eo, mir, msgr, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, clear=\E[H\E[J, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, 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, kf1=\E[1r, kf10=\E[10r, kf11=\E[11r,
-	kf12=\E[12r, kf13=\E[13r, kf14=\E[14r, kf15=\E[15r,
-	kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r, kf5=\E[5r,
-	kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, khome=\E[H,
-	kich1=\E[@, kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
-	rev=\E[7m, rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h,
-	smso=\E[7m, use=ansi+cpr,
+	bel=^G, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
+	cud1=\n, 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,
+	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
+	kcbt=\E[Z, kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\E[1r,
+	kf10=\E[10r, kf11=\E[11r, kf12=\E[12r, kf13=\E[13r,
+	kf14=\E[14r, kf15=\E[15r, kf16=\E[16r, kf2=\E[2r,
+	kf3=\E[3r, kf4=\E[4r, kf5=\E[5r, kf6=\E[6r, kf7=\E[7r,
+	kf8=\E[8r, kf9=\E[9r, kich1=\E[@, kil1=\E[L, mc0=\E[0i,
+	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, rmir=\E[4l, rmso=\E[m,
+	sgr0=\E[m, smir=\E[4h, smso=\E[7m, use=ansi+arrows,
+	use=ansi+cpr, use=ansi+erase, use=ansi+idl,
+
 att2350|AT&T 2350 Video Information Terminal 80 column mode,
 	mc0@, mc4@, mc5@, use=att2300,
 
@@ -14139,11 +14037,10 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, clear=\E[H\E[J, cr=\r,
-	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=\n, invis=\E[8m, is1=\E[?3l\E)0,
+	bel=^G, blink=\E[5m, bold=\E[2;7m, cr=\r, 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, fsl=\E8, home=\E[H, ht=^I, ich1=\E[@,
+	il1=\E[L, ind=\n, invis=\E[8m, is1=\E[?3l\E)0,
 	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
@@ -14151,19 +14048,18 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	    \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=\r\n,
+	kclr=\E[2J, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
+	kf6=\EOU, kf7=\EOV, kf8=\EOW, kll=\E[24;1H, ll=\E[24H,
+	nel=\r\n,
 	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,
+	pln=\E[%p1%d;00q%p2%:-16s, rev=\E[7m, ri=\EM, rmacs=^O,
+	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
 	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,
+	tsl=\E7\E[25;%p1%{1}%+%dH, use=ansi+arrows,
+	use=ansi+csr, use=ansi+erase,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -14185,21 +14081,20 @@ v5410|att5410 in terms of a VT100,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, dch1=\E[P,
-	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ich1=\E[@,
-	il1=\E[L, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, 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,
+	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
+	cuu1=\E[A$<2>, dch1=\E[P, dl1=\E[M, ed=\E[J$<50>,
+	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
+	ht=^I, hts=\EH, ich1=\E[@, il1=\E[L, ind=\n, kbs=^H,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	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,
 	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=decid+cpr, use=vt100+fnkeys,
+	use=ansi+csr, use=decid+cpr, use=vt100+fnkeys,
 
 #
 # Teletype Model 5420 -- A souped up 5410, with multiple windows,
@@ -14241,13 +14136,12 @@ v5410|att5410 in terms of a VT100,
 att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
 	db,
 	lm#78, wsl#55,
-	cbt=\E[Z, clear=\E[x\E[J, cnorm=\E[11;0j, cub=\E[%p1%dD,
+	clear=\E[x\E[J, cnorm=\E[11;0j, cub=\E[%p1%dD,
 	cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dx,
-	cuu=\E[%p1%dA, cvvis=\E[11;1j, dch=\E[%p1%dP,
-	dl=\E[%p1%dM, ech=\E[%p1%ds\E[%p1%dD,
+	cuu=\E[%p1%dA, cvvis=\E[11;1j, ech=\E[%p1%ds\E[%p1%dD,
 	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>,
+	hpa=\E[%p1%{1}%+%dG, ich1@, 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,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M,
@@ -14259,14 +14153,14 @@ att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
 	mc5=\E[?4i, mrcup=\E[%i%p1%d;%p2%dt,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%d           %p2%s,
 	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|,
+	rin=\E[%p1%dF, rmam=\E[?7l, 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%;,
-	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,
-	use=att4410,
+	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[19;1j\E[21;4j\Eent,
+	smln=\E~, tsl=\E7\E[25;%p1%{8}%+%dH,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=att4410,
 
 att4415-w|tty5420-w|att5420-w|AT&T 4415/5420 132 cols,
 	cols#132, lm#54, wsl#97,
@@ -14307,41 +14201,38 @@ att4415-w-rv-n|tty5420-w-rv-n|att5420-w-rv-n|AT&T 4415/5420 132 cols reverse wit
 
 att5420_2|AT&T 5420 model 2 80 cols,
 	am, db, hs, mir, msgr, xon,
-	cols#80, it#8, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
+	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	blink=\E[5m, cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j,
-	cr=\EG, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
-	cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J,
+	cr=\EG, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[1B,
+	cuf=\E[%p1%dC, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J,
 	el=\E[0K, el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8,
-	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=\n,
-	indn=\E[%p1%dE, invis=\E[8m,
+	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, 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,
-	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,
+	kbeg=\Et, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M,
 	kel=\E[2K, kend=\Ez, kent=\n, kf1=\EOc, kf2=\EOd, kf3=\EOe,
-	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, khome=\E[H,
+	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj,
 	kich1=\E[4h, kil1=\E[L, kind=\E[T, kll=\Eu, knp=\E[U,
 	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=\r\n,
 	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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV,
 	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%;%?%p8%t\EV%;,
 	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,
-	use=decid+cpr,
+	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=ansi+inittabs, use=decid+cpr,
+
 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
@@ -14356,17 +14247,18 @@ att4418|att5418|AT&T 5418 80 cols,
 	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
 	cub1=\E[D, 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%dP, dch1=\E[1P, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K, home=\E[H,
-	ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\n,
-	is1=\E[?3l, is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@,
-	kcud1=\EU, kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h,
-	kf10=\E[m, kf11=\E[n, kf12=\E[o, kf13=\E[H, kf14=\E[I,
-	kf15=\E[J, kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E,
-	kf21=\E[_, kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j,
-	kf6=\E[k, kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8,
-	rev=\E[7m, rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7,
+	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, ed=\E[0J,
+	el=\E[0K, home=\E[H, ich=\E[%p1%d@, ich1=\E[1@, il1=\E[1L,
+	ind=\n, is1=\E[?3l, is2=\E)0\E?6l\E?5l, kclr=\E[%%,
+	kcub1=\E@, kcud1=\EU, kcuf1=\EA, kcuu1=\ES, kent=\E[,
+	kf1=\E[h, kf10=\E[m, kf11=\E[n, kf12=\E[o, kf13=\E[H,
+	kf14=\E[I, kf15=\E[J, kf18=\E[K, kf19=\E[L, kf2=\E[i,
+	kf20=\E[E, kf21=\E[_, kf22=\E[M, kf23=\E[N, kf24=\E[O,
+	kf3=\E[j, kf6=\E[k, kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec,
+	rc=\E8, rev=\E[7m, rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7,
 	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
+	use=ansi+idl,
+
 att4418-w|att5418-w|AT&T 5418 132 cols,
 	cols#132,
 	is1=\E[?3h, use=att5418,
@@ -14409,14 +14301,12 @@ att4424|tty4424|Teletype 4424,
 	dch=\E[%p1%dP, dch1=\EP, dim=\EW, dl=\E[%p1%dM, dl1=\EM,
 	ed=\EJ, el=\Ez, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
 	ich1=\E\^, il=\E[%p1%dL, il1=\EL, ind=\n, is2=\E[20l\E[?7h,
-	kbs=^H, kclr=\EJ, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	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,
+	kclr=\EJ, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE,
+	rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, rmul=\EZ,
 	sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%|
 	    %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;,
 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
-	tbc=\EF,
+	tbc=\EF, use=ansi+arrows,
 
 att4424-1|tty4424-1|Teletype 4424 in display function group I,
 	kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@,
@@ -14434,10 +14324,9 @@ att4424m|tty4424m|Teletype 4424M,
 	bel=^G, clear=\E[2;H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	cup=\E[%i%p1%2d;%p2%2dH\E[B, cuu1=\E[A, dch1=\EP,
 	dl1=\EM, el=\E[K, ht=^I, ich1=\E\^, il1=\EL, ind=\n, ip=$<2/>,
-	is2=\E[m\E[2;24r, 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, nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+	is2=\E[m\E[2;24r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 
 # The Teletype 5425 is really version 2 of the Teletype 5420. It
 # is quite similar, except for some minor differences. No page
@@ -14450,40 +14339,36 @@ att4424m|tty4424m|Teletype 4424M,
 # (att5425: added <rmam>/<smam> based on the init string -- esr)
 att5425|tty5425|att4425|AT&T 4425/5425,
 	am, da, db, hs, mir, msgr, xenl, xon,
-	cols#80, it#8, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
+	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	clear=\E[H\E[J, cnorm=\E[12;0j, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[12;1j, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%ds\E[%p1%dD, ed=\E[J,
-	el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, 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%dE,
-	invis=\E[8m, is1=\E<\E[?3l$<100>,
+	bel=^G, blink=\E[5m, bold=\E[2;7m, cnorm=\E[12;0j, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[12;1j, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8,
+	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	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,
-	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,
+	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, 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, khome=\E[H, kich1=\E[4h, kil1=\E[L, kind=\E[T,
-	kri=\E[S, ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i,
-	nel=\r\n,
+	kf8=\EOj, kich1=\E[4h, kil1=\E[L, kind=\E[T, kri=\E[S,
+	ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, nel=\r\n,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
-	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, rc=\E8,
-	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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, 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,
 	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,
-	vpa=\E[%p1%{1}%+%dd, use=decid+cpr,
+	smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+	use=decid+cpr,
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
 	smkx=\E[21;1j\E[25;4j\Eent, use=att4425,
@@ -14501,10 +14386,9 @@ att4426|tty4426|Teletype 4426S,
 	bel=^G, bold=\E[5m, clear=\E[H\E[2J\E[1U\E[H\E[2J\E[1V,
 	cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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%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, is1=\Ec\E[?7h,
+	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EP, ed=\E[J,
+	el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
+	ich=\E[%p1%d@, ich1=\E\^, 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,
@@ -14512,7 +14396,7 @@ att4426|tty4426|Teletype 4426S,
 	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,
+	vpa=\E[%p1%dd, use=ansi+idl, use=ecma+index,
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
 # Function keys 9 - 16 are available only after the
@@ -14531,21 +14415,21 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	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, cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP,
-	dch1=\E[P, 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, ht=^I,
-	hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E(B\E)1\E[2l,
-	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,
-	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,
+	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, hts=\EH, ind=\n,
+	is1=\E(B\E)1\E[2l, 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, 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%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr,
+	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+idl,
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -14565,17 +14449,15 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	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,
 	cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P,
-	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, 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,
+	dim=\E[2m, 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@, 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, 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,
@@ -14584,7 +14466,7 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	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=ansi+cpr, use=ansi+rep, use=ecma+index,
+	use=ansi+cpr, use=ansi+idl, use=ansi+rep, use=ecma+index,
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 att500|att513|AT&T 513 using page mode,
@@ -14592,28 +14474,25 @@ att500|att513|AT&T 513 using page mode,
 	cols#80, lh#2, lines#24, lw#8, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	clear=\E[H\E[J, cnorm=\E[11;0|, cr=\r,
-	csr=%i\E[%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[11;1|, dch=\E[%p1%dP, dch1=\E[P$<1>, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E(B\E)1, 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%dE, invis=\E[8m,
+	cnorm=\E[11;0|, cr=\r, csr=%i\E[%p1%d;%p2%dr,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[11;1|, dch=\E[%p1%dP,
+	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
+	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE, invis=\E[8m,
 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
 	kFND=\EOX, kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK,
 	kMOV=\ENC, kMSG=\EOL, kNXT=\ENH, kOPT=\EOR, kPRT=\EOZ,
 	kPRV=\ENG, kRDO=\EOT, kRES=\EOQ, kRIT=\ENL, kRPL=\EOY,
-	kSAV=\EOO, kSPD=\EOP, kUND=\EOS, kbeg=\E9, kbs=^H, kcan=\EOw,
+	kSAV=\EOO, kSPD=\EOP, kUND=\EOS, kbeg=\E9, kcan=\EOw,
 	kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd,
-	kcrt=\EOn, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kdch1=\ENf, kdl1=\ENe, kel=\EOa, kend=\E0, kent=\Eent,
-	kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg,
-	kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm,
-	khome=\E[H, kich1=\ENj, kind=\E[S, kmov=\ENc, kmrk=\ENi,
+	kcrt=\EOn, kdch1=\ENf, kdl1=\ENe, kel=\EOa, kend=\E0,
+	kent=\Eent, kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe,
+	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx,
+	khlp=\EOm, kich1=\ENj, kind=\E[S, kmov=\ENc, kmrk=\ENi,
 	kmsg=\EOl, knp=\E[U, knxt=\ENh, kopn=\EOv, kopt=\EOr,
 	kpp=\E[V, kprt=\EOz, kprv=\ENg, krdo=\EOt, kref=\EOb,
 	kres=\EOq, krfr=\ENa, kri=\E[T, krpl=\EOy, krst=\EOB,
@@ -14637,7 +14516,8 @@ att500|att513|AT&T 513 using page mode,
 	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,
-	use=decid+cpr, use=ansi+rep,
+	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
+	use=ansi+rep, use=decid+cpr,
 
 # 01-07-88:
 # printer must be set to EMUL ANSI to accept ESC codes
@@ -14687,13 +14567,12 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer,
 att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 	am, xon,
 	cols#88, it#8, lines#70, vt#3,
-	bel=^G, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
 	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, 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,
+	dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T,
+	rs1=\Ec, sc=\E7, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ecma+index,
 
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
 # The following SET-UP modes are assumed for normal operation:
@@ -14710,16 +14589,15 @@ att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 att5620|dmd|tty5620|ttydmd|5620|AT&T 5620 terminal 88 columns,
 	OTbs, am, msgr, npc, xon,
 	cols#88, it#8, lines#70,
-	bel=^G, bold=\E[2m, clear=\E[H\E[J, cr=\r, cub1=^H,
-	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, 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,
+	bel=^G, bold=\E[2m, cr=\r, cub1=^H, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\E[S, kclr=\E[2J, kll=\E[70;1H, nel=\n,
 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
 	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
-	smso=\E[7m, smul=\E[4m, use=ecma+index,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, 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,
@@ -14730,9 +14608,8 @@ att5620-s|tty5620-s|layer|vitty|AT&T 5620 S layer,
 	cols#80, it#8, lines#72,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n,
 	cup=\EY%p2%{32}%+%c%p1%{32}%+%c, cuu1=^K, dl1=\ED,
-	el=\EK, flash=\E^G, ht=^I, il1=\EI, 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,
+	el=\EK, flash=\E^G, ht=^I, il1=\EI, ind=\n, kclr=\E[2J,
+	khome=\E[H, kll=\E[70;1H, use=ansi+arrows,
 
 # Entries for <kf15> thru <kf28> refer to the shifted system pf keys.
 #
@@ -14742,15 +14619,12 @@ att605|AT&T 605 80 column 102key keyboard,
 	am, eo, xon,
 	cols#80, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, cub1=^H, 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, el1=\E[1K, fsl=\E8, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
+	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, el1=\E[1K, fsl=\E8, ht=^I,
 	il1=\E[L, ind=\n, invis=\E[8m,
 	is1=\E[8;0|\E[?\E[13;20l\E[?\E[12h, is2=\E[m\017,
-	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,
+	kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
 	kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, kf11=\ENq,
 	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD,
 	kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH,
@@ -14760,15 +14634,17 @@ att605|AT&T 605 80 column 102key keyboard,
 	kf35=\EOy, kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv,
 	kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs,
 	kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh,
-	kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, kich1=\E[@,
-	kil1=\E[L, kind=\E[S, knp=\E[U, kpp=\E[V, ll=\E[24H,
-	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+	kf7=\EOi, kf8=\EOj, kf9=\ENo, kich1=\E[@, kil1=\E[L,
+	kind=\E[S, knp=\E[U, kpp=\E[V, ll=\E[24H, 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,
-	rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
-	rs2=\Ec\E[?3l, sc=\E7, sgr0=\E[m\017, smacs=\E)0\016,
-	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
-	tsl=\E7\E[25;%i%p1%dx, use=ansi+cpr,
+	rmacs=^O, rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l,
+	sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, smln=\E[p,
+	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+	use=ansi+idc,
+
 att605-pc|AT&T 605 in pc term mode,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
@@ -14787,32 +14663,31 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
 	cvvis=\E[?12;25h, 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,
-	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,
-	invis=\E[8m,
+	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
+	ich=\E[%p1%d@, ind=\ED, 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,
-	kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr,
-	kf13=\ENs, kf14=\ENt, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg,
-	kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H,
+	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
+	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf2=\EOd, kf3=\EOe,
+	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo,
 	kind=\E[S, kri=\E[T, ll=\E[24H, 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, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rev=\E[7m, ri=\EM,
+	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rmso=\E[m,
+	rmul=\E[m, rs2=\Ec\E[?3l,
 	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=decid+cpr, use=ecma+index, use=att610+cvis,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=decid+cpr,
+	use=ecma+index, use=att610+cvis,
+
 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,
@@ -14862,39 +14737,37 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
 	cvvis=\E[?12;25h, 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,
-	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,
-	invis=\E[8m,
+	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
+	ich=\E[%p1%d@, ind=\ED, 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,
-	kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr,
-	kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD, kf17=\EOE,
-	kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH, kf21=\EOI,
-	kf22=\EOJ, kf23=\ENO, kf24=\ENP, kf25=\ENQ, kf26=\ENR,
-	kf27=\ENS, kf28=\ENT, kf29=\EOP, kf3=\EOe, kf30=\EOQ,
-	kf31=\EOR, kf32=\EOS, kf33=\EOw, kf34=\EOx, kf35=\EOy,
-	kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv, kf4=\EOf,
-	kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs, kf44=\EOp,
-	kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj,
-	kf9=\ENo, khome=\E[H, kind=\E[S, kri=\E[T, ll=\E[24H,
+	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @,
+	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD,
+	kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH,
+	kf21=\EOI, kf22=\EOJ, kf23=\ENO, kf24=\ENP, kf25=\ENQ,
+	kf26=\ENR, kf27=\ENS, kf28=\ENT, kf29=\EOP, kf3=\EOe,
+	kf30=\EOQ, kf31=\EOR, kf32=\EOS, kf33=\EOw, kf34=\EOx,
+	kf35=\EOy, kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv,
+	kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs,
+	kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh,
+	kf7=\EOi, kf8=\EOj, kf9=\ENo, kind=\E[S, kri=\E[T, ll=\E[24H,
 	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, 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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rev=\E[7m, 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,
 	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, use=decid+cpr, use=ecma+index,
-	use=att610+cvis,
+	tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=decid+cpr, use=ecma+index, use=att610+cvis,
+
 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,
@@ -14935,25 +14808,23 @@ att620-103k-w|AT&T 620; 132 column; 103key keyboard,
 att630|AT&T 630 windowing terminal,
 	OTbs, am, da, db, mir, msgr, npc, xon,
 	cols#80, it#8, lines#60, lm#0,
-	bel=^G, blink=\E[5m, cbt=\E[Z, clear=\E[H\E[J, cr=\r,
-	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, 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, 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,
+	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, 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, cuu1=\E[A,
+	dim=\E[2m, el1=\E[1K, home=\E[H, ht=^I, ind=\ED, is2=\E[m,
+	kcbt=\E[Z, kclr=\E[2J, 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, 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, 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=ansi+cpr, use=ecma+index,
+	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+cpr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ecma+index,
+
 att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
 	lines#24, use=att630,
 
@@ -15036,45 +14907,42 @@ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
 #
 att700|AT&T 700 24x80 column display w/102key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
-	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
+	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
-	cvvis=\E[?12;25h, 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,
-	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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
+	cuu1=\E[A, cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200>\E[?5l, fln=4\,4, fsl=\E8, home=\E[H,
+	ich=\E[%p1%d@, 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,
-	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,
-	kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC,
-	kf16=\EOD, kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd,
-	kf20=\EOH, kf21=\EOI, kf22=\EOJ, kf23=\ENO, kf24=\ENP,
-	kf25=\ENQ, kf26=\ENR, kf27=\ENS, kf28=\ENT, kf29=\EOq,
-	kf3=\EOe, kf30=\EOr, kf31=\EOs, kf32=\EOt, kf33=\EOu,
-	kf34=\EOv, kf35=\EOw, kf36=\EOx, kf37=\EOy, kf38=\EOu,
-	kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr,
-	kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg,
-	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,
+	is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z,
+	kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kend=\E[24;1H, kf1=\EOc,
+	kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt,
+	kf15=\EOC, kf16=\EOD, kf17=\EOE, kf18=\EOF, kf19=\EOG,
+	kf2=\EOd, kf20=\EOH, kf21=\EOI, kf22=\EOJ, kf23=\ENO,
+	kf24=\ENP, kf25=\ENQ, kf26=\ENR, kf27=\ENS, kf28=\ENT,
+	kf29=\EOq, kf3=\EOe, kf30=\EOr, kf31=\EOs, kf32=\EOt,
+	kf33=\EOu, kf34=\EOv, kf35=\EOw, kf36=\EOx, kf37=\EOy,
+	kf38=\EOu, kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq,
+	kf42=\EOr, kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM,
+	kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, 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\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, 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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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|,
 	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, use=decid+cpr, use=ansi+rep,
-	use=att610+cvis0,
+	smul=\E[4m, smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+rep,
+	use=decid+cpr, use=att610+cvis0,
 
 # This entry was modified 3/13/90 by JWE.
 # fixes include additions of <enacs>, correcting <rep>, and modification
@@ -15093,43 +14961,40 @@ att730|AT&T 730 windowing terminal,
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
 	cvvis=\E[?12;25h, 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,
-	enacs=\E(B\E)0, 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, invis=\E[8m,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
+	fsl=\E8, ht=^I, ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B,
-	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,
-	kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr,
-	kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, kf17=\ENw,
-	kf18=\ENx, kf19=\ENy, kf2=\EOd, kf20=\ENz, kf21=\EN{,
-	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf25=\EOC, kf26=\EOD,
-	kf27=\EOE, kf28=\EOF, kf29=\EOG, kf3=\EOe, kf30=\EOH,
-	kf31=\EOI, kf32=\EOJ, kf33=\ENO, kf34=\ENP, kf35=\ENQ,
-	kf36=\ENR, kf37=\ENS, kf38=\ENT, kf39=\EOU, kf4=\EOf,
-	kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY, kf44=\EOZ,
-	kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^, kf5=\EOg,
-	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,
+	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
+	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
+	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf2=\EOd, kf20=\ENz,
+	kf21=\EN{, kf22=\EN|, kf23=\EN}, kf24=\EN~, kf25=\EOC,
+	kf26=\EOD, kf27=\EOE, kf28=\EOF, kf29=\EOG, kf3=\EOe,
+	kf30=\EOH, kf31=\EOI, kf32=\EOJ, kf33=\ENO, kf34=\ENP,
+	kf35=\ENQ, kf36=\ENR, kf37=\ENS, kf38=\ENT, kf39=\EOU,
+	kf4=\EOf, kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY,
+	kf44=\EOZ, kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^,
+	kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, 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,
 	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, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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%;,
 	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, use=decid+cpr,
-	use=ansi+rep, use=att610+cvis,
+	swidm=\E#6, tsl=\E7\E[;%i%p1%dx, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+rep, use=decid+cpr, use=att610+cvis,
+
 # "MGT" is "Multi-Tasking Graphics Terminal"
 att730-41|730MTG-41|AT&T 730-41 windowing terminal,
 	lines#41, use=att730,
@@ -15313,9 +15178,8 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal,
 	cnorm=\E[>l, cr=\r, cub=\E[%p1%dD, cub1=\E[D,
 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[>h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
-	dl1=\E[M, ed=\E[0J, el=\E[0K, el1=\E[2K, home=\E[H, ht=^I,
-	il=\E[%p1%dL, il1=\E[L, ind=\n,
+	cvvis=\E[>h, dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[0K,
+	el1=\E[2K, home=\E[H, ht=^I, ind=\n,
 	is1=\EPr\\E[0u\E[2J\E[0;0H\E[m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l,
 	kbs=^H, kcmd=\E!, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
 	kcuu1=\E[A, kf0=\E[00s, kf1=\E[01s, kf18=\E[18s,
@@ -15326,7 +15190,7 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal,
 	rmacs=\E[10m, rmam=\E[11;1j, rmir=\E[4l, rmso=\E[m,
 	rmul=\E[m, rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m,
 	smam=\E[11;0j, smir=\E[4h, smso=\E[1m, smul=\E[4m,
-	use=ansi+cpr,
+	use=ansi+cpr, use=ansi+idl,
 
 # The following Terminfo entry describes functions which are supported by
 # the AT&T 5430/pt505 terminal software version 1.
@@ -15588,24 +15452,22 @@ aas1901|Ann Arbor K4080 w/S1901 mod,
 # The generic Ann Arbor entry is the only one that uses this.
 aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
-	cols#80, it#8,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	clear=\E[H\E[J$<156>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=^K, 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$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I,
-	hts=\EH, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il=\E[%p1%dL,
-	il1=\E[L$<3>, ind=^K, invis=\E[8m, is1=\E[m\E7\E[H\E9\E8,
-	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kbs=^H, kcbt=\E[Z,
-	kclr=\E[J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	cols#80,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<156>,
+	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^K,
+	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,
+	ed=\E[J, el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
+	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
+	invis=\E[8m, is1=\E[m\E7\E[H\E9\E8,
+	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
 	kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK,
 	kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP,
 	kf17=\EOQ, kf18=\EOR, kf19=\EOS, kf2=\EOB, kf20=\EOT,
 	kf21=\EOU, kf22=\EOV, kf23=\EOW, kf24=\EOX, kf3=\EOC,
 	kf4=\EOD, kf5=\EOE, kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI,
-	khome=\E[H, kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i,
-	mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m,
+	kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i, mc4=^C,
+	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
 	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
@@ -15614,8 +15476,9 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	sgr0=\E[m,
 	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, use=ansi+rep,
+	smm=\E[>52h, smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+rep,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -16021,15 +15884,16 @@ cit101|citc|C. Itoh fast VT100,
 cit101e|C. Itoh CIT-101e,
 	OTbs, OTpt, am, mir, msgr,
 	cols#80, it#8, lines#24,
-	acsc=, clear=\E[H\E[J, cnorm=, csr=\E[%i%p1%2d;%p2%2dr,
-	cub1=\E[D, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH,
-	cuu1=\E[A, cvvis=\E[?1l\E[?4l\E[?7h, dch1=\E[P, dl1=\E[M,
-	ed=\E[J, el=\E[K, if=/usr/share/tabset/vt100, il1=\E[L,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, kf6=\EOl,
-	kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, rmir=\E[4l,
-	rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, smir=\E[4h,
-	smkx=\E=, smso=\E[7m, smul=\E[4m,
+	acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr, cub1=\E[D,
+	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A,
+	cvvis=\E[?1l\E[?4l\E[?7h, dch1=\E[P, dl1=\E[M,
+	if=/usr/share/tabset/vt100, il1=\E[L, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, kf1=\EOP,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, kf6=\EOl, kf7=\EOM,
+	kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E>,
+	rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=,
+	smso=\E[7m, smul=\E[4m, use=ansi+erase,
+
 # From: David S. Lawyer, June 1997:
 # The CIT 101-e was made in Japan in 1983-4 and imported by CIE
 # Terminals in Irvine, CA.  It was part of CITOH Electronics.  In the
@@ -16049,25 +15913,23 @@ cit101e|C. Itoh CIT-101e,
 # (cit101e-rv: added empty <rmcup> to suppress a tic warning. --esr)
 cit101e-rv|C. Itoh CIT-101e (sets reverse video),
 	am, eo, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24,
-	OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	civis=\E[1v, clear=\E[H\E[J, cnorm=\E[0;3;4v, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+	cols#80, lines#24,
+	OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[1v,
+	cnorm=\E[0;3;4v, cr=\r, 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, cuu1=\E[A,
-	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,
+	cvvis=\E[3;5v, flash=\E[?5l$<200/>\E[?5h, home=\E[H,
+	hpa=\E[%i%p1%dG, 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, 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, u8=\E[?6c,
-	use=ansi+enq, use=ecma+index,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
+	ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g,
+	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m,
+	smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c,
+	use=ansi+enq, use=ansi+csr, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ecma+index,
+
 cit101e-n|CIT-101e w/o am,
 	am@,
 	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=\n,
@@ -16093,25 +15955,24 @@ cit101e-n132|CIT-101e with 132 cols w/o am,
 # (cit500: I added <rmam>/<smam> based on the init string -- esr)
 cit500|CIE Terminals CIT-500,
 	OTbs, OTpt, mir, msgr, xon,
-	OTkn#10, cols#80, it#8, lines#64, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	OTkn#10, cols#80, lines#64, vt#3,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
+	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
-	ed=\EJ, el=\EK, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, is2=\E<\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[P, kdl1=\E[M,
-	ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS,
-	kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, kf9=\EOZ,
-	khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, lf0=PF1,
-	lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, lf7=F18,
-	lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rc=\E8, rev=\E[7m,
+	cuu=\E[%p1%dA, cuu1=\EM, dch1=\E[P, ed=\EJ, el=\EK,
+	home=\E[H, ind=\n, is2=\E<\E)0, kcbt=\E[Z, kdch1=\E[P,
+	kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
+	kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY,
+	kf9=\EOZ, khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l,
+	lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17,
+	lf7=F18, lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rev=\E[7m,
 	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rmso=\E[m, rmul=\E[m,
 	rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>,
-	sc=\E7, sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+idl,
+	use=ansi+inittabs,
 
 # C. Itoh printers begin here
 citoh|ci8510|8510|C. Itoh 8510a,
@@ -16252,23 +16113,21 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode,
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
 	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$<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=\n, invis=\E[8m,
+	dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, ed=\E[J, el=\E[K,
+	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, ind=\n, 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=^?,
+	ka1=\E[f, ka3=\EOQ, kb2=\EOP, kc1=\EOR, kc3=\EOS, kdch1=^?,
 	kdl1=\EOS, kf0=\E010, kf1=\E001, kf10=\E011, kf2=\E002,
 	kf3=\E003, kf4=\E004, kf5=\E005, kf6=\E006, kf7=\E007,
 	kf8=\E008, kf9=\E009, khome=\E[f, lf2=A delete char,
 	lf3=A insert line, lf4=A delete line, lf5=A clear,
 	lf6=A ce of/cf gn, lf7=A print, lf8=A on-line,
 	lf9=A funcl0=A send, nel=\r\n, rev=\E[7m, rmacs=\E[3l,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[0;2m,
-	rmul=\E[0m, sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h,
-	smir=\E[4h, smkx=\E=, smso=\E[2;7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%i%p1%dd,
+	rmam=\E[?7l, rmkx=\E>, rmso=\E[0;2m, rmul=\E[0m,
+	sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, smkx=\E=,
+	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+idc, use=ansi+idl,
 
 #### Human Designed Systems (Concept)
 #
@@ -16655,26 +16514,21 @@ oc100|oconcept|c100-1p|old 1-page Concept 100,
 
 hds200|Human Designed Systems HDS200,
 	am, bw, eslok, hs, km, mir, msgr, xenl, xon, NQ,
-	cols#80, it#8, lines#24, lm#0,
+	cols#80, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[0;5m, bold=\E[0;1m, cbt=\E[Z, civis=\E[6+{,
-	clear=\E[H\E[J, cnorm=\E[+{, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	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%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
-	dsl=\E[2!w\r\n\E[!w, ed=\E[J, el=\E[K, el1=\E[1K,
-	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,
+	blink=\E[0;5m, bold=\E[0;1m, civis=\E[6+{, cnorm=\E[+{,
+	cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\E[P,
+	dsl=\E[2!w\r\n\E[!w, el1=\E[1K, fsl=\E[!w, home=\E[H,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, 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+},
-	kDC=\E$^?, 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,
+	kDC=\E$^?, kHOM=\E$H, kLFT=\E$D, kRIT=\E$C, kcbt=\E$I,
 	kdch1=^?, kent=\r, kf1=^\001\r, kf10=^\010\r, kf11=^\011\r,
 	kf12=^\012\r, kf13=\EOP, kf14=\EOQ, kf15=\EOR, kf16=\EOS,
 	kf17=^\017\r, kf18=^\018\r, kf19=^\019\r, kf2=^\002\r,
@@ -16686,49 +16540,49 @@ hds200|Human Designed Systems HDS200,
 	kf45=\E$R, kf46=\E$S, kf47=^\047\r, kf48=^\048\r,
 	kf49=^\049\r, kf5=^\005\r, kf50=^\050\r, kf51=^\051\r,
 	kf52=^\052\r, kf53=^\053\r, kf6=^\006\r, kf7=^\007\r,
-	kf8=^\008\r, kf9=^\009\r, khome=\E[H, 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,
+	kf8=^\008\r, kf9=^\009\r, kind=\E[T, knp=\E[U, kpp=\E[V,
+	kri=\E[S, ll=\E[H\E[A, nel=\E[E, rev=\E[0;7m, ri=\EM,
+	rmacs=^O, rmir=\E[4l, rmso=\E[m\017, rmul=\E[m\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,
+	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+pp,
 
 # <ht> through <el> included to specify padding needed in raw mode.
 # (avt-ns: added empty <acsc> to suppress a tic warning --esr)
 avt-ns|Concept AVT no status line,
 	OTbs, am, eo, mir, ul, xenl, xon,
-	cols#80, it#8, lines#24, lm#192,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
+	cols#80, lines#24, lm#192,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
 	clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[=119h, dch1=\E[P, dim=\E[1!{, dl=\E[%p1%dM$<4*>,
-	dl1=\E[M$<4>, ed=\E[J$<96>, el=\E[K$<6>, home=\E[H,
-	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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[=119h, dim=\E[1!{,
+	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
+	el=\E[K$<6>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=\011$<4>,
+	ich=\E[%p1%d@, 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,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kdch1=\E\002\r, ked=\E\004\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, khome=\E[H, kich1=\E\001\r, kil1=\E\003\r,
-	ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+	kf4=\EOS, kich1=\E\001\r, kil1=\E\003\r, ll=\E[24H,
+	mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
 	pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
-	prot=\E[99m, rc=\E8, rev=\E[7m, 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,
+	prot=\E[99m, rev=\E[7m, ri=\EM$<4>, rmacs=\016$<1>,
+	rmcup=\E[w\E2\r\n, rmkx=\E[!z\E[0;2u, rmso=\E[7!{,
+	rmul=\E[4!{,
 	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,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
+	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
+	smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+idc1,
+	use=ansi+inittabs, use=ansi+rep,
+
 avt-rv-ns|Concept AVT in reverse video mode/no status line,
 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
 	use=avt-ns,
@@ -17045,16 +16899,16 @@ dg460-ansi|Data General Dasher 460 in ANSI-mode,
 	cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, dch1=\E[P,
 	dim=\E[2m, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
 	ich1=\E[@, il1=\E[L, ind=\E[S, is2=^^F@, kbs=\E[D,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
 	kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,
-	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,
+	kf8=\E[009z, kf9=\E[00:z, 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,
 	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
-	use=ansi+cpr,
+	use=ansi+arrows, use=ansi+cpr,
+
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
 # Data General 605x
 # Ought to work for a Model 6242, Type D210 as well as a 605x.
@@ -17303,8 +17157,8 @@ d400|d400-dg|d450|d450-dg|Data General DASHER D400/D450 series,
 d410|d411|d460|d461|Data General DASHER D410/D460 series,
 	mc5i,
 	acsc=j$k"l!m#n)q+t'u&v(w%x*, civis=\E[3;0v,
-	cnorm=\E[3;2v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
-	dl1=\E[M, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+	cnorm=\E[3;2v, dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@,
+	ich1=\E[@,
 	is1=\E[<0;<1;<2;<4l\E[5;0v\E[1;1;80w\E[1;6;<2h,
 	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,
@@ -17312,6 +17166,7 @@ d410|d411|d460|d461|Data General DASHER D410/D460 series,
 	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,
+	use=ansi+idl,
 
 # Initialization string 2 sets:
 #	\E[3;2;2;0;1;0v
@@ -17574,11 +17429,12 @@ d578-7b|Data General DASHER D578 in 7-bit mode,
 cs10|colorscan|Datamedia Color Scan 10,
 	msgr,
 	cols#80, lines#24,
-	bel=^G, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ed=\E[J, el=\E[K,
-	ind=\n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+	cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ind=\n, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smso=\E[7m, smul=\E[4m, use=ansi+erase,
+
 cs10-w|Datamedia Color Scan 10 with 132 columns,
 	cols#132,
 	cup=\E[%i%p1%02d;%p2%03dH, use=cs10,
@@ -17751,22 +17607,22 @@ ts100|ts100-sp|Falco ts100-sp,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C$<2>,
+	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
 	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
 	cuu1=\E[A$<2>, dch1=\E~W, dl1=\E~R, ed=\E[J$<50>,
 	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
 	ht=^I, hts=\EH, ich1=\E~Q, il1=\E~E, ind=\n, is1=\E~)\E~ea,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
+	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,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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=decid+cpr, use=vt100+fnkeys,
+	use=ansi+csr, use=decid+cpr, use=vt100+fnkeys,
+
 ts100-ctxt|Falco ts-100 saving context,
 	rmcup=\E~_b, smcup=\E~_d\E[2J, use=ts100,
 
@@ -17930,18 +17786,17 @@ go140w|graphon go-140 in 132 column mode,
 go225|go-225|Graphon 225,
 	OTbs, am, mir, xenl,
 	cols#80, it#8, lines#25, vt#3,
-	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C,
+	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, 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>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 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, rc=\E8, rev=\E[7m,
+	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
+	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kf1=\EOP,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
 	rmcup=\E[!p\E[?7h\E[2;1;1#w, rmir=\E[4l, rmkx=\E>,
 	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p\E[?7h\E[2;1;1#w,
-	sc=\E7, sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r,
+	sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r,
 	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
 
 #### Harris (Beehive)
 #
@@ -18268,18 +18123,17 @@ hazel|exec80|h80|he80|Hazeltine Executive 80,
 	OTbs, OTpt, am,
 	cols#80, it#8, lines#24, vt#3,
 	OTnl=\n, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>,
-	clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, cuf1=\E[C$<2/>,
-	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
-	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
-	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, rc=\E8, rev=\E[7m$<2/>,
+	clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
+	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
+	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
 	rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
-	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>,
-	smul=\E[4m$<2/>,
+	smul=\E[4m$<2/>, use=ansi+csr,
 
 #### IBM
 #
@@ -18360,30 +18214,28 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
 	cols#80, it#8, lines#25,
 	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=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	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,
-	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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\E[S, invis=\E[8m, is2=\Ec, kcbt=\E[Z, kclr=\E[144q,
+	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,
 	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=ansi+arrows, use=ansi+erase, use=ansi+idl,
 	use=ecma+index,
 
 ibmaed|IBM Experimental display,
@@ -18485,16 +18337,16 @@ hft-c-old|HFT with Color PC850,
 hft-old|AIWS High Function Terminal,
 	am, xon,
 	cols#80, lines#25,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	cub1=^H, cud1=\n, 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, ich1=\E[@, il1=\E[L, ind=\n, invis=\E[8m, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf1=\E[001q, kf2=\E[002q, kf3=\E[003q, kf4=\E[004q,
-	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
-	kf9=\E[009q, khome=\E[H, knp=\E[153q, kpp=\E[159q,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+	dl1=\E[M, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	invis=\E[8m, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q,
+	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
+	kf8=\E[008q, kf9=\E[009q, knp=\E[153q, kpp=\E[159q,
 	ktbc=\E[010q, rev=\E[7m, rmir=\E6, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m, use=ibm+color,
+	sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m,
+	use=ansi+arrows, use=ansi+erase, use=ibm+color,
+
 ibm-system1|system1|IBM system/1 computer,
 	am, xt,
 	cols#80, lines#24,
@@ -18514,28 +18366,27 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	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, 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, 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,
+	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
+	is2=\Ec, kcbt=\E[Z, kclr=\E[144q, 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, 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, use=ecma+index,
+	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, 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,
@@ -19051,13 +18902,13 @@ kt7ix|kimtron model kt-7 or 70 in IX mode,
 	cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
 	dch1=\EW, dim=\EG@, dl1=\ER, dsl=\Ef\r, ed=\EY, el=\ET, fsl=\r,
 	home=^^, ht=^I, ich1=\EQ, il1=\EE, ind=\n,
-	is2=\EG0\E s\017\E~, kbs=^H, kcbt=\EI, kclr=\E*,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\ER,
-	ked=\EY, kel=\ET, kend=\EY, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r,
+	is2=\EG0\E s\017\E~, kcbt=\EI, kclr=\E*, kdl1=\ER, ked=\EY,
+	kel=\ET, kend=\EY, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r,
 	kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
 	kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, knp=\EJ,
 	nel=\r\n, pulse=\EK, rmacs=\E%%, rmir=, rmso=\EG0, rmul=\EG0,
 	sgr0=\EG0, smacs=\E$, smir=, smso=\EG4, smul=\EG8, tsl=\Ef,
+	use=ansi+arrows,
 
 #### Microdata/MDIS
 #
@@ -19234,32 +19085,29 @@ prism8-w|p8-w|P8-W|MDC Prism-8 in 132 column mode,
 #
 prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	am, bw, hs, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#72,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l,
-	clear=^L, cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v,
+	cols#80, lines#24, vt#3, wsl#72,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[<4l, clear=^L,
+	cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v,
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	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, dsl=\E[%}\024, ech=\E[%p1%dX,
-	ed=\E[J$<10>, el=\E[K, fsl=^T, home=\E[H, hpa=\E[%i%p1%d`,
-	ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	is2=\E[&p\E[<12l\E F, kbs=^H, kclr=^L, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[H, nel=\r\n, 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,
+	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
+	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
+	is2=\E[&p\E[<12l\E F, kclr=^L, 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~,
+	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\r\n, 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\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%;,
 	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,
+	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+pp,
 
 # p9-w: Prism-9 in 132 column mode
 # --------------------------------
@@ -19279,8 +19127,8 @@ prism9-w|p9-w|P9-W|MDC Prism-9 in 132 column mode,
 # Insertion and deletion operations possible.
 #
 prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode,
-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8,
+	dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ich1=\E[@,
+	use=ansi+idl, use=p8,
 
 # p9-8-w: Prism-9 in P8 and 132 column modes
 # ------------------------------------------
@@ -19288,8 +19136,8 @@ prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode,
 # P9 terminal in P8 emulation mode and 132 column mode.
 #
 prism9-8-w|p9-8-w|P9-8-W|MDC Prism-9 in Prism 8 emulation and 132 column mode,
-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8-w,
+	dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ich1=\E[@,
+	use=ansi+idl, use=p8-w,
 
 # p12: Prism-12 in ANSI mode
 # ---------------------------
@@ -19477,23 +19325,21 @@ mm340|mime340|mime 340,
 mt4520-rv|micro-term 4520 reverse video,
 	am, hs, msgr, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
-	bel=^G, clear=\E[H\E[J, cnorm=\E[0V\E8, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
+	bel=^G, cnorm=\E[0V\E8, cr=\r, cub=\E[%p1%dD, cub1=\E[D,
 	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,
-	cvvis=\E7\E[0U, 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,
-	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,
+	cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P,
+	flash=\E[?5l$<200/>\E[?5h, fsl=\E[?5l\E[?5h, home=\E[H,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 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,
-	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,
-	ri=\EM, rmam=\E[?7l, rmso=\E[0m, rmul=\E[24m,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ll=\E[24;1H, nel=\EE,
+	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
+	rmso=\E[0m, rmul=\E[24m,
 	rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J,
-	sc=\E7, sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m,
-	tbc=\E[g, tsl=\E[25;1H,
+	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g,
+	tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl,
 
 # Fri Aug  5 08:11:57 1983
 # This entry works for the ergo 4000 with the following setups:
@@ -19613,31 +19459,31 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>,
-	cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD$<5>,
-	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
-	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
-	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
-	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
-	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX,
-	ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>, home=\E[H$<1>,
-	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,
+	cr=\r$<1>, cub=\E[%p1%dD$<5>, cub1=\E[D$<5>,
+	cud=\E[%p1%dB$<5>, cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>,
+	cuf1=\E[C$<5>, cup=\E[%i%p1%d;%p2%dH$<10>,
+	cuu=\E[%p1%dA$<5>, cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>,
+	dch1=\E[1P$<5>, dl=\E[%p1%dM$<5>, dl1=\E[M$<5>,
+	ech=\E[%p1%dX, ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>,
+	home=\E[H$<1>, 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>,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	khlp=\E[28~, kich1=\E[2~, krdo=\E[29~, nel=\EE$<5>, rc=\E8,
+	khlp=\E[28~, kich1=\E[2~, krdo=\E[29~, nel=\EE$<5>,
 	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>,
-	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>,
 	sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h,
 	smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%p1%dd$<40>, use=decid+cpr, use=vt220+vtedit,
-	use=vt220+cvis, use=vt220+keypad, use=ncr260vt+sl,
+	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ncr260vt+sl,
+
 ncr260vt+sl|NCR 2900/260 VT100 status line,
 	hs,
 	dsl=\E[0$~\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$},
@@ -20310,13 +20156,12 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EM,
 	dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r, home=\E[H,
 	ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL, il1=\EN,
-	ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
+	ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H, khome=\E[H,
 	rc=\EX, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EI,
 	rin=\E[%p1%dA, rmacs=\Ed, rmam=\E[?7l, rmso=\E[m,
 	rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sc=\EW, sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m,
-	smul=\E[4m, tsl=\E], uc=\EPB,
+	smul=\E[4m, tsl=\E], uc=\EPB, use=ansi+apparrows,
 
 #### Tandem
 #
@@ -20557,21 +20402,20 @@ tek4105-30|Tektronix 4015 emulating 30 line VT100,
 	cols#80, it#8, lines#30, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C$<2>,
+	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
 	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rc=\E8,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	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,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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,
+	use=ansi+csr, use=vt100+fnkeys,
 
 # Tektronix 4105 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20596,30 +20440,27 @@ tek4105-30|Tektronix 4015 emulating 30 line VT100,
 # "tek4105a" is just a guess:
 tek4105a|Tektronix 4105 (BRL),
 	OTbs, OTpt, msgr, xon,
-	OTkn#8, cols#80, it#8, lines#30, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J,
-	cnorm=\E%!0\ETD10\E%!1, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	OTkn#8, cols#80, lines#30, vt#3,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
+	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	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, 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,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, home=\E[H, 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, 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,
+	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
 	use=ecma+index,
 
-#
 # Tektronix 4106/4107/4109 from BRL
 # The following setup modes are assumed for normal operation:
 #	CODE ansi		COLUMNMODE 80		CRLF no
@@ -20643,27 +20484,25 @@ tek4105a|Tektronix 4105 (BRL),
 # "IC" cannot be used in combination with "im" & "ei".
 tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
 	msgr, xon,
-	cols#80, it#8, lines#32, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J,
-	cnorm=\E%!0\ETD10\E%!1, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cols#80, lines#32, vt#3,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
+	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	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, 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,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, home=\E[H, 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, 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,
+	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
 	use=ecma+index,
 
 # Refer to:
@@ -20790,19 +20629,18 @@ otek4115|Tektronix 4115 (old),
 tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
 	am, xon,
 	cols#80, lines#34,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, 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[%p1%{1}%+%dG,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, invis=\E[8m, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rev=\E[7m,
-	rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	dch1=\E[P, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\n, invis=\E[8m, kcuu1=\E[A,
+	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,
 	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+rep,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+rep,
+
 # The tek4125 emulates a VT100 incorrectly - the scrolling region
 # command is ignored.  The following entry replaces <csr> with the needed
 # <il>, <il>, and <smir>; removes some cursor pad commands that the tek4125
@@ -20846,15 +20684,15 @@ tek4207|Tektronix 4207 graphics terminal with memory,
 tek4404|Tektronix 4404,
 	OTbs,
 	cols#80, it#8, lines#32,
-	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[1M,
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I, il1=\E[1L,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rc=\E8,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+	dl1=\E[1M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I,
+	il1=\E[1L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	rmcup=\E[1;1H\E[0J\E[?6h\E[?1l, rmir=\E[4l,
-	rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sc=\E7, sgr0=\E[m,
+	rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sgr0=\E[m,
 	smcup=\E%\E!1\E[1;32r\E[?6l\E>, smir=\E[4h,
-	smkx=\E[?1l, smso=\E[7m, smul=\E[4m,
+	smkx=\E[?1l, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+
 # Some unknown person wrote:
 # I added the is string - straight Unix has ESC ; in the login
 # string which sets a ct8500 into monitor mode (aka 4025 snoopy
@@ -21072,16 +20910,15 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	cuu=\E[%p1%dA, cuu1=\E[A, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S\E[B,
-	indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kbs=^H,
-	kcbt=^], kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kcbt=^],
 	kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, kf3=\242,
 	kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247, kf9=\250,
-	khome=\E[H, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H,
-	nel=\r, rev=\E[7m, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
+	kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H, nel=\r,
+	rev=\E[7m, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
 	rmso=\E[m, rmul=\E[m,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 
 #### Apple II
 #
@@ -21278,16 +21115,17 @@ lisaterm|Apple Lisa or Lisa/2 running LisaTerm VT100 emulation,
 	OTbs, OTpt, am, xenl, xon,
 	OTkn#4, cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ,
-	kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rc=\E8,
-	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=F1,
+	lf1=F2, lf2=F3, lf3=F4, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
 	rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r,
-	sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g,
+	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	tbc=\E[3g, use=ansi+csr,
+
 # Lisaterm in 132 column ("wide") mode.
 lisaterm-w|Apple Lisa with Lisaterm in 132 column mode,
 	cols#132,
@@ -21378,18 +21216,17 @@ amiga|Amiga ANSI,
 	OTbs, am, bw, xenl,
 	cols#80, lines#24,
 	acsc=, bel=^G, blink=\E[7;2m, bold=\E[1m, cbt=\E[Z,
-	civis=\E[0 p, clear=\E[H\E[J, cnorm=\E[ p, cub=\E[%p1%dD,
-	cub1=\E[D, 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%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,
-	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,
+	civis=\E[0 p, cnorm=\E[ p, cub=\E[%p1%dD, cub1=\E[D,
+	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%dP, dch1=\E[P, dim=\E[2m, home=\E[H,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, 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=ansi+erase, use=ansi+idl, use=ecma+index,
 
 # From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
 # (amiga: added empty <acsc> to suppress a warning.
@@ -21432,17 +21269,15 @@ amiga-vnc|Amiga using VNC console (black on light gray),
 	am, da, db, msgr, ndscr,
 	btns#1, colors#16, cols#80, lines#24, lm#0, ncv#0, pairs#0x100,
 	bel=^G, blink=\E[7;2m, bold=\E[1m, civis=\E[0p,
-	clear=\E[H\E[J, cnorm=\E[p\E[>?6l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	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,
-	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,
+	cnorm=\E[p\E[>?6l, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cub=\E[%p1%dD, cub1=\E[D, 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, cvvis=\E[>?6h, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, flash=^G,
 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
 	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~,
+	kcbt=\233Z, 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,
@@ -21452,7 +21287,8 @@ amiga-vnc|Amiga using VNC console (black on light gray),
 	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, use=ecma+index,
+	smso=\E[1m, smul=\E[4m, use=ansi+arrows, use=ansi+erase,
+	use=ecma+index,
 
 # MorphOS on Genesi Pegasos
 # By Pavel Fedin <sonic_amiga@rambler.ru>
@@ -21594,12 +21430,12 @@ minix-old|minix-1.5|minix console (v1.5),
 	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[K, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T, kf4=\E[S, kf5=\E[G,
-	khome=\E[H, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m,
+	ed=\E[0J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T,
+	kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m,
 	rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
+	use=ansi+arrows, use=ansi+idl,
+
 # The linewrap option can be specified by editing /usr/include/minix/config.h
 # before recompiling the minix 1.5 kernel.
 minix-old-am|minix console with linewrap,
@@ -21651,16 +21487,17 @@ mai|basic4|MAI Basic Four in ANSI mode,
 	am, da, db, mir, msgr,
 	cols#82, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=^]^_, cnorm=\E[?7h,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=^X,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P,
-	dl1=\E[M, ed=^_, el=^^, home=^], ht=^I,
-	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED,
+	cr=\r, cub1=^H, cud1=\n, cuf1=^X, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, dl1=\E[M, ed=^_, el=^^,
+	home=^], ht=^I, if=/usr/share/tabset/vt100, il1=\E[L,
+	ind=\ED,
 	is2=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
-	kf7=\EOV, kf8=\EOW, nel=\r\ED, rc=\E8, rev=\E[7m, ri=\E[T,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
-	smir=\E[4h, smso=\E[7m, smul=\E[4m,
+	kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m, ri=\E[T,
+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h,
+	smso=\E[7m, smul=\E[4m, use=ansi+csr,
+
 # basis from Peter Harrison, Computer Graphics Lab, San Francisco
 #   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
 #
@@ -21710,24 +21547,21 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'infor
 	OTbs, eslok, hs, xenl,
 	cols#80, it#8, lines#24, wsl#72, xmc#0,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G,
-	blink=\E[5m, bold=\E[1m, civis=\E[<1h, clear=\E[H\E[J,
-	cnorm=\E[<1l, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	blink=\E[5m, bold=\E[1m, civis=\E[<1h, cnorm=\E[<1l, cr=\r,
 	cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\E[P,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, flash=^G, fsl=\n,
-	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\n, ip=$<7/>,
+	flash=^G, fsl=\n, home=\E[H, ht=^I, ind=\n, ip=$<7/>,
 	is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
-	is3=\E[?3l, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, kf0=\EOp,
+	is3=\E[?3l, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kf0=\EOp,
 	kf1=\EOq, kf10=\EOp, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
-	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khome=\E[H,
-	kich1=\E[4h, kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H,
-	mc0=\E[i, nel=\r\n, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec\E[?4l\E[12h, rs2=\Ec\E)0, sc=\E7, sgr0=\E[m,
-	smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A,
-	use=ansi+cpr,
+	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, kich1=\E[4h,
+	kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, mc0=\E[i,
+	nel=\r\n, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E[?4l\E[12h,
+	rs2=\Ec\E)0, sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m,
+	smul=\E[4m, tsl=^_@A, use=ansi+arrows, use=ansi+cpr,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
 
 # From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998, updated 19 Sep 2016
 #
@@ -21774,23 +21608,22 @@ minitel1|minitel 1,
 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, 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,
+	cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el1=\E[1K, is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J,
+	kctab=^I, 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@, 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=^ACu<^D,
-	use=minitel1,
+	use=ansi+arrows, use=ansi+idl, use=minitel1,
+
 # rmkx posait des problemes (logout en sortant de vi).
 minitel1b-80|minitel 1-bistandard (standard teleinformatique),
 	am@, bw@, eslok@, hz@, msgr,
@@ -21971,31 +21804,29 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	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, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, 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$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%d`,
-	ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	ech=\E[%p1%dX, el1=\E[1K, enacs=\E)U,
+	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%d`, ht=^I,
+	hts=\EH, ind=\n,
 	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=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\E\E[A, 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~, kil1=\E\E[B,
-	kmous=\E[M, 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, 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,
+	kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r,
+	kdl1=\E\E[A, 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~, kil1=\E\E[B, kmous=\E[M, nel=\EE,
+	oc=\E]R\E]P3FFFF80, op=\E[39;49m, 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],
+	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, 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
@@ -22005,7 +21836,9 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\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=vt220+pcedit, use=vt220+cvis, use=linux+decid,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=vt220+pcedit,
+	use=vt220+cvis, use=linux+decid,
 
 # 1. Using double-shapes for VT100 graphical chars (eg: mc).
 # 2. Native brown color corrected to good yellow color.
@@ -22273,14 +22106,13 @@ bg2.0rv|bg3.10rv|BBn BitGraph 2.0 (reverse video),
 bg2.0|bg3.10|BBN BitGraph 2.0 or later (no init),
 	OTbs, xenl,
 	cols#85, lines#64,
-	bel=^G, clear=\E[H\E[J$<150>, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, dl1=\E[M$<2*>,
-	ed=\E[J$<150>, el=\E[K$<2>, ht=^I, il1=\E[L$<2*>,
-	ind=\n$<280>, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1,
-	lf2=PF2, lf3=PF3, lf4=PF4, rc=\E8, rmkx=\E>, rmso=\E[m, sc=\E7,
-	sgr0=\E[m, smkx=\E=, smso=\E[7m,
+	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, cud1=\E[B,
+	cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A,
+	dl1=\E[M$<2*>, ed=\E[J$<150>, el=\E[K$<2>, ht=^I,
+	il1=\E[L$<2*>, ind=\n$<280>, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+	kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>,
+	rmso=\E[m, sgr0=\E[m, smkx=\E=, smso=\E[7m, use=ansi+csr,
 
 bg1.25rv|BBN BitGraph 1.25 (reverse video),
 	flash=\E[?5l$<200/>\E[?5h, is2=\E>\E[?5h\E[?7h,
@@ -22369,32 +22201,32 @@ bg1.25|BBN BitGraph 1.25,
 # dku7102, tws2102, and tws models 2105 to 2112
 tws-generic|dku7102|Bull Questar tws terminals,
 	am, eslok, hs, mir, msgr, xenl, xhp@, xon,
-	cols#80, it#8, lines#24, wsl#80,
+	cols#80, lines#24, wsl#80,
 	acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~,
-	bel=^G, blink=\E[0;5m, cbt=\E[Z, civis=\E[1r, clear=\E[2J,
+	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
 	cnorm=\E[r, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
 	cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df,
 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[0;2m, dl=\E[%p1%dM, dl1=\E[M,
-	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, ed=\E[J, el=\E[K,
-	fsl=\E[v, home=\E[H, ht=\E[I, hts=\EH, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, invis=\E[0;8m,
+	dim=\E[0;2m, dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v,
+	fsl=\E[v, home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m,
 	is1=\E[?=h\Ec\E`\E[?>h\EPY99:98\E\\,
 	is2=\E[5;>;12;18;?<l\E[=h\EP1s\E\\\E[\027p,
-	is3=\Eb\E[?<h, kbs=^H, kcbt=\E[Z, kctab=\E[g, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
-	ked=\E[J, kel=\E[K, kf1=\E[1u\027, kf2=\E[2u\027,
-	kf3=\E[3u\027, kf4=\E[4u\027, kf5=\E[5u\027,
-	kf6=\E[6u\027, kf7=\E[7u\027, kf8=\E[8u\027, khome=\E[H,
-	khts=\EH, kil1=\E[L, krmir=\E[4l, ll=\E[H\E[A, mc0=\E[0i,
-	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,
+	is3=\Eb\E[?<h, kcbt=\E[Z, kctab=\E[g, kdch1=\E[P,
+	kdl1=\E[M, ked=\E[J, kel=\E[K, kf1=\E[1u\027,
+	kf2=\E[2u\027, kf3=\E[3u\027, kf4=\E[4u\027,
+	kf5=\E[5u\027, kf6=\E[6u\027, kf7=\E[7u\027,
+	kf8=\E[8u\027, khts=\EH, kil1=\E[L, krmir=\E[4l,
+	ll=\E[H\E[A, mc0=\E[0i, 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%;,
 	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,
+	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
+	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
 	use=tws-generic,
@@ -22493,15 +22325,13 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	am, eo, eslok, hs, km, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	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%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
-	dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, ed=\E[J,
-	el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
-	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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=\E[D, 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%dP, dch1=\E[P,
+	dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\E[?5h$<50>\E[?5l, fsl=\E[0$},
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is1=\E[63;1"p\E[2h,
 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
 	    l,
@@ -22513,16 +22343,17 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
 	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
-	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,
+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, 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,
 	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+enq,
-	use=vt220+vtedit, use=ansi+pp, use=vt220+cvis,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl, use=ansi+pp,
+	use=vt220+cvis, use=vt220+vtedit,
+
 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
@@ -22757,13 +22588,13 @@ bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns,
 # This covers the vip7800 and BQ3155-vip7800
 vip|Bull Questar 3155-7800,
 	am, eslok, hs, km, mc5i, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#80,
+	cols#80, lines#24, vt#3, wsl#80,
 	acsc=0pjdkblamcnkqitgufvhwexj, bel=^G, blink=\EsB,
-	cbt=\E[Z, clear=\E`, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
+	clear=\E`, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\E[%i%p1%03d%p2%03df, cuu1=\EA, dch1=\E[P, dim=\EsL,
 	dl1=\E[M, dsl=\Ev, ed=\EJ, el=\EK,
-	flash=\007$<80>\007$<80>\007, fsl=\EO, home=\EH, ht=^I,
-	hts=\Ep, ich1=\E[I, ind=\n, invis=\EsH,
+	flash=\007$<80>\007$<80>\007, fsl=\EO, home=\EH, hts=\Ep,
+	ich1=\E[I, ind=\n, invis=\EsH,
 	is2=\E[00u\E[<>001001024080024080u\E[01u,
 	is3=\Er\E[W\E`, kHOM=\EH, kLFT=\Eo, kRIT=\Eu, kbs=^H,
 	kcbt=\E[Z, kclr=\E`, kctab=\E[g, kcub1=\ED, kcud1=\EB,
@@ -22780,7 +22611,7 @@ vip|Bull Questar 3155-7800,
 	ri=\EA\EJ\EH\E[L$<10>, rmacs=\EF, rmir=\E[J, rmso=\EsR,
 	rmul=\EsR, rs1=\Ec, rs2=\E[G, s0ds=\EF, s1ds=\EG,
 	sgr0=\EsR\EsU\EF, smacs=\EG, smir=\E[I, smso=\EsI,
-	smul=\Es_, tbc=\E[N, tsl=\Ew,
+	smul=\Es_, tbc=\E[N, tsl=\Ew, use=ansi+inittabs,
 # normal screen, 8 bits, 132 columns terminal.
 vip-w|vip7800-w|Q310-vip-w|Q310-vip-w-am|Questar 3155-vip7800 wide,
 	cols#132, wsl#132,
@@ -23075,17 +22906,17 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 VT100 emulator,
 	OTbs, am, xenl,
 	cols#80, it#8, lines#24, vt#3,
 	blink=\E[5m$<2/>, bold=\E[1m$<2/>,
-	clear=\E[H\E[2J$<50/>, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
-	cud1=\n, cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
-	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
-	ht=^I, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m$<2/>,
+	clear=\E[H\E[2J$<50/>, cub1=^H, cud1=\n, cuf1=\E[C$<2/>,
+	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
+	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
+	ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmam=\E[7l,
 	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m$<2/>,
-	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m$<2/>,
+	smul=\E[4m$<2/>, use=ansi+csr,
 
 #### Evans & Sutherland
 #
@@ -23273,11 +23104,9 @@ z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode,
 	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, 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[1P, dim=\E[2m, dl=\E[%p1%dM,
-	dl1=\E[M, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
-	home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
-	il=\E[%p1%dL, il1=\E[L, ind=\ED, kbs=^H, kclr=\E[J,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ked=\E[J,
+	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dsl=\E[>1l, ed=\E[J,
+	el=\E[K, fsl=\E[u\E[>5l, home=\E[H, ht=^I, hts=\EH,
+	if=/usr/share/tabset/vt100, ind=\ED, kclr=\E[J, ked=\E[J,
 	kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
 	kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
 	mc0=\E#7, nel=\r\ED, rc=\E[r, rev=\E[7m, ri=\EM,
@@ -23286,6 +23115,8 @@ z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode,
 	    \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,
+	use=ansi+apparrows, use=ansi+idl,
+
 z29a-kc-uc|h29a-kc-uc|Zenith z29 ANSI mode with keyclick 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,
@@ -23312,15 +23143,14 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
 	fsl=\E[u, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[1L,
 	ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw,
-	ka3=\EOu, kb2=\EOy, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ked=\E[J, kf1=\EOS,
+	ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS,
 	kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
-	kf8=\EOR, kf9=\EOX, khlp=\E[~, khome=\E[H, ll=\E[24;1H,
+	kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
 	mc0=\E[?19h\E[i, mc4=\E[4i, mc5=\E[5i, rc=\E[u, rev=\E[7m,
 	rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m,
 	rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0,
 	smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	tsl=\E[s\E[>1h\E[25;%i%p1%dH,
+	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
@@ -23444,13 +23274,12 @@ graphos|graphos III,
 	cr=\r, 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, cuu1=\E[A,
-	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, 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=\ED, 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, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
+	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
 	rmir=\E[4l, rmso=\E[m, sc=\E7, sgr0=\E[m, smdc=\E[4h,
-	smir=\E[4h, smso=\E[7m,
+	smir=\E[4h, smso=\E[7m, use=ansi+arrows, use=ansi+idl,
+
 graphos-30|graphos III with 30 lines,
 	lines#30,
 	cvvis=\Ez4;2;1z\Ez56;2;80;30z, use=graphos,
@@ -23514,15 +23343,15 @@ modgraph48|mod|Modgraph w/48 lines,
 	OTbs, OTpt, am, xenl,
 	cols#80, it#8, lines#48, vt#3,
 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
+	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[A, ed=\E[J, el=\E[K,
 	flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
 	home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m,
-	ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
-	rs1=\E=\E[0q\E>, sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM,
+	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E=\E[0q\E>,
+	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+csr,
 
 #### Morrow Designs
 #
@@ -23604,20 +23433,20 @@ rt6221|Ramtek 6221 80x24,
 	OTkn#4, cols#80, it#8, lines#24, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[>5l,
 	clear=\E[1;1H\E[J, cnorm=\E[>5h\E[>9h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=^K, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
-	cvvis=\E[>7h\E[>9l, ed=\E[J, el=\E[K, home=\E[1;1H, ht=^I,
-	hts=\EH, ind=\n, is2=\E)0, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
-	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,
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^K,
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E[>7h\E[>9l, ed=\E[J,
+	el=\E[K, home=\E[1;1H, ht=^I, hts=\EH, ind=\n, is2=\E)0,
+	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2,
+	lf2=PF3, lf3=PF4, ll=\E[24;1H, nel=\EE, 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>,
-	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g,
+	sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, smul=\E[4m,
+	tbc=\E[3g, use=ansi+csr,
+
 # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
 rt6221-w|Ramtek 6221 160x48,
 	cols#160, lines#48,
@@ -23652,21 +23481,20 @@ rca|RCA vp3301/vp3501,
 hirez100|Selanar HiREZ-100,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#4, cols#80, it#8, lines#48, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, il=\E[%p1%dL, il1=\E[L, is2=\E<\E)0, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP,
-	kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3,
-	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,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, hts=\EH,
+	is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
+	lf1=PF2, lf2=PF3, 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;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,
+	smul=\E[4m, tbc=\E[3g, use=ansi+erase, use=ansi+idl,
+
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
 
@@ -24017,13 +23845,11 @@ ti_ansi|basic entry for ti928,
 	cr=\r, 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,
 	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
-	il1=\E[L, ind=\E[S, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kend=\E[F, kf0=\E[V, kf1=\E[M,
-	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, knp=\E[G, kpp=\E[I,
-	op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\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, kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N,
+	kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
+	kf9=\E[U, knp=\E[G, kpp=\E[I, op=\E[37;40m, ri=\E[T,
+	rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 #
 #       928 VDT 7 bit control mode
 #
@@ -24124,28 +23950,28 @@ apollo_color|Apollo color display,
 # From: Eric Raymond <esr@snark.thyrsus.com> Mon Nov 27 19:00:53 EST 1995
 att6386|at386|386at|AT&T WGS 6386 console,
 	am, bw, eo, xon,
-	cols#80, it#8, lines#25,
+	cols#80, lines#25,
 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[=C,
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C,
 	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub=\E[%p1%dD,
 	cub1=\E[D, 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%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, 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,
+	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[1@,
+	il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+	is2=\E[0;10;39m, kcbt=^], 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,
+	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=ecma+index,
-	use=klone+color,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+inittabs,
+	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,
@@ -24285,25 +24111,23 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300,
 	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, 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,
-	cuu1=\E[A, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
-	ed=\E[0J, el=\E[0K, home=\E[H, ich1=\E[@, il=\E[%p1%dL,
-	il1=\E[L, ind=\n, invis=\E[9m, is1=\017\E[=1w, kBEG=\ENB,
-	kCAN=\EOW, kCPY=\END, kCRT=\EON, kDC=\ENF, kDL=\ENE,
-	kEND=\ENN, kEOL=\EOA, kFND=\EOX, kHLP=\EOM, kHOM=\ENM,
-	kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, kNXT=\ENH, kOPT=\EOR,
-	kPRV=\ENG, kRDO=\EOT, kRIT=\ENL, kRPL=\EOY, kSAV=\EOO,
-	kUND=\EOS, kbeg=\ENb, kbs=^H, kcan=\EOw, kcbt=\E[Z,
+	cuu1=\E[A, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
+	home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m, is1=\017\E[=1w,
+	kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON, kDC=\ENF,
+	kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX, kHLP=\EOM,
+	kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, kNXT=\ENH,
+	kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL, kRPL=\EOY,
+	kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw, kcbt=\E[Z,
 	kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd, kcrt=\EOn,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\ENf,
-	ked=\E[J, kel=\EOa, kend=\E0, kext=\EOk, kf1=\EOc, kf2=\EOd,
-	kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj,
-	kfnd=\EOx, khlp=\EOm, khome=\E[H, kich1=\ENj, kind=\E[B,
-	kmov=\ENc, kmrk=\ENi, knp=\E[U, knxt=\ENh, kopn=\EOv,
-	kopt=\EOr, kpp=\E[V, kprt=\EOz, kprv=\ENg, krdo=\EOt,
-	kref=\EOb, krfr=\ENa, kri=\E[A, krpl=\EOy, krst=\EOB,
-	ksav=\EOo, kslt=\ENI, kund=\EOs, nel=\EE, rev=\E[7m, ri=\EM,
-	rmso=\E[m, rmul=\E[m, sgr0=\E[0;10m, smso=\E[7m,
-	smul=\E[4m,
+	kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0, kext=\EOk,
+	kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh,
+	kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm, kich1=\ENj,
+	kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U, knxt=\ENh,
+	kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz, kprv=\ENg,
+	krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A, krpl=\EOy,
+	krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs, nel=\EE,
+	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[0;10m,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+idl,
 
 #### Convergent Technology
 #
@@ -24452,10 +24276,9 @@ ibmpcx|xenix|ibmx|IBM PC xenix console display,
 	cols#80, lines#25,
 	clear=^L, cub1=^H, cud1=\E[B, cuf1=\E[C,
 	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[d,
+	ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L, kend=\E[d,
 	kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N, khome=\E[Y, knp=\E[e,
-	kpp=\E[Z, use=klone+acs, use=klone+sgr8,
+	kpp=\E[Z, use=ansi+arrows, use=klone+acs, use=klone+sgr8,
 
 ######## OTHER OBSOLETE TYPES
 #
@@ -24532,19 +24355,18 @@ gs6300|emots|AT&T PC6300 with EMOTS terminal emulator,
 	colors#8, cols#80, it#8, lines#24, pairs#63,
 	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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, home=\E[H, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	is2=\E[m, kbs=^H, kcbt=^R^I, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s,
-	kf4=\E[23s, kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s,
-	khome=\E[H, mc4=\E[4i, mc5=\E[5i, op=\E[?;m, rev=\E[7m,
-	ri=\E[L, rmacs=\E[10m, rs1=\Ec, setb=\E[?;%p1%dm,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\n, is2=\E[m, kcbt=^R^I, kf1=\E[0s,
+	kf2=\E[24s, kf3=\E[1s, kf4=\E[23s, kf5=\E[2s, kf6=\E[22s,
+	kf7=\E[3s, kf8=\E[21s, mc4=\E[4i, mc5=\E[5i, op=\E[?;m,
+	rev=\E[7m, ri=\E[L, rmacs=\E[10m, rs1=\Ec,
+	setb=\E[?;%p1%dm,
 	setf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m,
 	sgr0=\E[m\E[10m, smacs=\E[11m, smso=\E[1m, smul=\E[4m,
+	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
 
 # From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
 # MS-Kermit with Heath-19 emulation mode enabled
@@ -24562,18 +24384,17 @@ versaterm|VersaTerm VT100 emulator for the Macintosh,
 	am, xenl,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>,
-	clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub1=^H, cud1=\n, cuf1=\E[C$<2/>,
-	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
-	dch1=\E[1P$<7/>, dl1=\E[1M$<9/>, ed=\E[J$<50/>,
-	el=\E[K$<3/>, home=\E[H, ht=^I, ich1=\E[1@$<7/>,
-	il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, nel=\r\n, rc=\E8, rev=\E[7m$<2/>,
-	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
-	rmkx=\E>\E[?1l, rmso=\E[m$<2/>, rmul=\E[m$<2/>, rs1=\E>,
-	sc=\E7, sgr0=\E[m$<2/>, smkx=\E=\E[?1h, smso=\E[7m$<2/>,
-	smul=\E[4m$<2/>,
+	clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
+	cuu1=\E[A$<2/>, dch1=\E[1P$<7/>, dl1=\E[1M$<9/>,
+	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
+	ich1=\E[1@$<7/>, il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\n,
+	rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
+	ri=\EM$<5/>, rmkx=\E>\E[?1l, rmso=\E[m$<2/>,
+	rmul=\E[m$<2/>, rs1=\E>, sgr0=\E[m$<2/>, smkx=\E=\E[?1h,
+	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
 
 # From: Rick Thomas <ihnp4!btlunix!rbt>
 # (xtalk: I added <rmam>/<smam> based on the init string.
@@ -24815,14 +24636,13 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys,
 	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,
-	kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r,
-	kf16=^AO\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r,
-	kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^,
-	kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er,
-	mc0=\EP, mc4=^T, mc5=^R, nel=\r\n$<3>,
+	kHOM=\E{, kcbt=\EI, kdch1=\EW, kdl1=\ER, ked=\EY, kel=\ET,
+	kend=\E[F, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
+	kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, kf16=^AO\r,
+	kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r,
+	kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ,
+	kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, mc0=\EP,
+	mc4=^T, mc5=^R, nel=\r\n$<3>,
 	pfloc=\EZ2%p1%{63}%+%c%p2%s\177,
 	pfx=\EZ1%p1%{63}%+%c%p2%s\177,
 	pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\E), ri=\Ej$<7>,
@@ -24836,7 +24656,8 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys,
 	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,
+	uc=\EG8\EG0, use=ansi+arrows, use=adm+sgr,
+
 teletec|Teletec Datascreen,
 	OTbs, am,
 	cols#80, lines#24,
@@ -24871,15 +24692,15 @@ teletec|Teletec Datascreen,
 v3220|LANPAR Vision II model 3220/3221/3222,
 	OTbs, am, mir, xenl,
 	cols#80, it#8, lines#24,
-	clear=\E[H\E[J, cub1=^H, cud1=\E[B, 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, ht=^I, il1=\E[L,
+	cub1=^H, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[A, dch1=\E[P, dl1=\E[M, ht=^I, il1=\E[L,
 	is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, kf2=\E[3~,
 	kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, kf7=\E[OQ,
 	kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, rmam=\E[?7l,
 	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
 	smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+erase,
 ######## ICH/ICH1 VERSUS RMIR/SMIR
 #
 # Some non-curses applications get confused if both ich/ich1 and rmir/smir
@@ -28026,4 +27847,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ add mostlike -TD
 #	+ add wezterm, contour -TD
 #
+# 2024-01-06
+#	+ use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc,
+#	  ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9459746b4..7654959d3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231230) unstable; urgency=low
+ncurses6 (6.4+20240106) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:26 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright
index 3abe75f82..32396640b 100644
--- a/package/debian-mingw/copyright
+++ b/package/debian-mingw/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 by Thomas E. Dickey
+Copyright: 2017-2023,2024 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2022,2023 by Thomas E. Dickey
+Copyright: 1996-2023,2024 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9459746b4..7654959d3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231230) unstable; urgency=low
+ncurses6 (6.4+20240106) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:26 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright
index 3abe75f82..32396640b 100644
--- a/package/debian-mingw64/copyright
+++ b/package/debian-mingw64/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 by Thomas E. Dickey
+Copyright: 2017-2023,2024 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2022,2023 by Thomas E. Dickey
+Copyright: 1996-2023,2024 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian/changelog b/package/debian/changelog
index c761be365..535901415 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20231230) unstable; urgency=low
+ncurses6 (6.4+20240106) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Dec 2023 05:35:25 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/copyright b/package/debian/copyright
index 3abe75f82..32396640b 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 by Thomas E. Dickey
+Copyright: 2017-2023,2024 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2022,2023 by Thomas E. Dickey
+Copyright: 1996-2023,2024 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian/rules b/package/debian/rules
index 7bfabfe0c..e5b9c3315 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.49 2023/10/16 23:06:26 tom Exp $
+# $Id: rules,v 1.52 2024/01/05 23:34:30 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -222,7 +222,7 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
 
 	touch $@
 
-HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/ncurses6-doc-html
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
 install-ncurses6-doc-html-stamp: build-ncurses6-stamp
 	dh_testdir
 	dh_testroot
@@ -231,6 +231,8 @@ install-ncurses6-doc-html-stamp: build-ncurses6-stamp
 
 	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
 	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
+	find $(HTML_DESTDIR) -type d -empty -delete -print
+	find $(HTML_DESTDIR) -type d -empty -delete -print
 
 	touch $@
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d3d794f7a..11c53df1c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.626 2023/12/29 10:35:26 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.627 2023/12/31 11:24:52 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -9,8 +9,8 @@
 
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
-!define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "1230"
+!define VERSION_YYYY  "2024"
+!define VERSION_MMDD  "0106"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index bb2342127..209572d8c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20231230
+Release: 20240106
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 38bf5ff59..383cbb77b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20231230
+Release: 20240106
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 274293d4e..1c4ff3e1c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20231230
+Release: 20240106
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright
index 9e87bbe97..7546e1cc1 100644
--- a/test/package/debian-mingw/copyright
+++ b/test/package/debian-mingw/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2020,2023 by Thomas E. Dickey
+Copyright: 2003-2023,2024 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright
index 9e87bbe97..7546e1cc1 100644
--- a/test/package/debian-mingw64/copyright
+++ b/test/package/debian-mingw64/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2020,2023 by Thomas E. Dickey
+Copyright: 2003-2023,2024 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/test/package/debian/copyright b/test/package/debian/copyright
index 9e87bbe97..7546e1cc1 100644
--- a/test/package/debian/copyright
+++ b/test/package/debian/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2022,2023 Thomas E. Dickey
+Copyright: 2017-2023,2024 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2020,2023 by Thomas E. Dickey
+Copyright: 2003-2023,2024 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a

From a83a5c0e40fea3b3d3b71247d632d804f27582ad Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 14 Jan 2024 02:19:03 +0100
Subject: [PATCH 049/106] ncurses-6.4-20240113.patch

---
 NEWS                                |   10 +-
 VERSION                             |    2 +-
 dist.mk                             |    9 +-
 doc/html/man/captoinfo.1m.html      |    4 -
 doc/html/man/clear.1.html           |    3 -
 doc/html/man/curs_add_wch.3x.html   |  135 +-
 doc/html/man/curs_attr.3x.html      |   60 +-
 doc/html/man/curs_inch.3x.html      |   18 +-
 doc/html/man/curs_mouse.3x.html     |   34 +-
 doc/html/man/curs_printw.3x.html    |    5 -
 doc/html/man/curs_scanw.3x.html     |    5 -
 doc/html/man/curs_scr_dump.3x.html  |    1 -
 doc/html/man/curs_sp_funcs.3x.html  |    3 -
 doc/html/man/curs_termcap.3x.html   |   28 -
 doc/html/man/curs_terminfo.3x.html  |  424 ++--
 doc/html/man/curs_threads.3x.html   |  932 +++++----
 doc/html/man/curs_variables.3x.html |    1 -
 doc/html/man/form_driver.3x.html    |  130 +-
 doc/html/man/infocmp.1m.html        |   36 +-
 doc/html/man/ncurses.3x.html        |  621 +++---
 doc/html/man/panel.3x.html          |   17 -
 doc/html/man/scr_dump.5.html        |    1 -
 doc/html/man/tabs.1.html            |    7 -
 doc/html/man/term.5.html            |   66 +-
 doc/html/man/term.7.html            |    1 -
 doc/html/man/terminfo.5.html        | 2862 +++++++++++++--------------
 doc/html/man/toe.1m.html            |   33 +-
 doc/html/man/tput.1.html            |  682 ++++---
 doc/html/man/tset.1.html            |    9 -
 doc/html/man/user_caps.5.html       |   63 +-
 include/Caps                        |  145 +-
 include/Caps.aix4                   |  139 +-
 include/Caps.hpux11                 |  141 +-
 include/Caps.keys                   |  139 +-
 include/Caps.osf1r5                 |   68 +-
 include/Caps.uwin                   |   75 +-
 man/MKterminfo.sh                   |    6 +-
 man/curs_add_wch.3x                 |  220 +-
 man/curs_attr.3x                    |  124 +-
 man/curs_inch.3x                    |   17 +-
 man/curs_mouse.3x                   |   53 +-
 man/curs_terminfo.3x                |  652 +++---
 man/curs_threads.3x                 |  918 ++++-----
 man/form_driver.3x                  |   54 +-
 man/infocmp.1m                      |  126 +-
 man/manhtml.externs                 |    5 +-
 man/ncurses.3x                      |    8 +-
 man/term.5                          |   15 +-
 man/terminfo.head                   |   38 +-
 man/terminfo.tail                   |   78 +-
 man/toe.1m                          |   30 +-
 man/tput.1                          | 1207 ++++++-----
 man/user_caps.5                     |   54 +-
 misc/terminfo.src                   | 2649 ++++++++++++-------------
 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 +-
 61 files changed, 6652 insertions(+), 6533 deletions(-)

diff --git a/NEWS b/NEWS
index cfcc1d3bd..49bbd33c0 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4062 2024/01/06 23:40:56 tom Exp $
+-- $Id: NEWS,v 1.4064 2024/01/13 22:02:10 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240113
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ modify dist.mk to avoid passing developer's comments in manpages into
+	  the generated html documentation.
+	+ use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr
+	  to trim -TD
+	+ restore padding for wy520* and vt320-k311 (report by Sven Joachim).
+
 20240106
 	+ use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc,
 	  ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD
diff --git a/VERSION b/VERSION
index bb21a273b..4b0762cf3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240106
+5:0:10	6.4	20240113
diff --git a/dist.mk b/dist.mk
index ba3338a46..cd175e624 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1591 2024/01/06 11:19:36 tom Exp $
+# $Id: dist.mk,v 1.1593 2024/01/13 21:07:51 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240106
+NCURSES_PATCH = 20240113
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -135,8 +135,9 @@ manhtml:
 	   if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\
 	   echo "Converting $$m to HTML" ;\
 	   echo '<!--' > doc/html/man/$$g ;\
-	   $${EGREP-grep -E} '^.\\"[^#]' $$f | \
-	   	sed	-e 's/\$$/@/g' \
+		sed	-e '/^\.[a-zA-Z]/,99999d' $$f | \
+		$${EGREP-grep -E} '^.\\"[^#]' | \
+		sed	-e 's/\$$/@/g' \
 			-e 's/^.../  */' \
 			-e 's/</\&lt;/g' \
 			-e 's/>/\&gt;/g' \
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 634df2ec8..fea882a22 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -29,10 +29,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: captoinfo.1m,v 1.58 2023/12/23 16:28:31 tom Exp @
-  * TODO: There are about 40 box drawing code points in CCSID 437;
-  * were there no XENIX capabilities for the mixed single- and double-
-  * line intersections?
-  * TODO: GG doesn't seem to fit with the others; explain it.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 528a60bcc..0d64aea2b 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -28,9 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp @
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\
-  *   tput/clear.sh
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index e9ed953db..565227c3b 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.50 2023/12/23 16:08:25 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.53 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -111,78 +111,79 @@ <H1 class="no-header">curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        lines  and  other  frequently  used  special characters.  These symbols
        correspond to the same VT100 line-drawing set as <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
-       <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>    <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
-       <STRONG>Name</STRONG>              <STRONG>Default</STRONG>    <STRONG>Default</STRONG>   <STRONG>char</STRONG>    <STRONG>Name</STRONG>
+                       <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
 
+
+       <STRONG>ACS</STRONG> <STRONG>Name</STRONG>        <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
-       WACS_BLOCK        0x25ae     #         0       solid square block
-       WACS_BOARD        0x2592     #         h       board of squares
-       WACS_BTEE         0x2534     +         v       bottom tee
-       WACS_BULLET       0x00b7     o         ~       bullet
-       WACS_CKBOARD      0x2592     :         a       checker board (stipple)
-       WACS_DARROW       0x2193     v         .       arrow pointing down
-       WACS_DEGREE       0x00b0     '         f       degree symbol
-       WACS_DIAMOND      0x25c6     +         `       diamond
-       WACS_GEQUAL       0x2265     &gt;         &gt;       greater-than-or-equal-to
-       WACS_HLINE        0x2500     -         q       horizontal line
-       WACS_LANTERN      0x2603     #         i       lantern symbol
-       WACS_LARROW       0x2190     &lt;         ,       arrow pointing left
-       WACS_LEQUAL       0x2264     &lt;         y       less-than-or-equal-to
-       WACS_LLCORNER     0x2514     +         m       lower left-hand corner
-       WACS_LRCORNER     0x2518     +         j       lower right-hand corner
-       WACS_LTEE         0x2524     +         t       left tee
-       WACS_NEQUAL       0x2260     !         |       not-equal
-       WACS_PI           0x03c0     *         {       greek pi
-       WACS_PLMINUS      0x00b1     #         g       plus/minus
-       WACS_PLUS         0x253c     +         n       plus
-       WACS_RARROW       0x2192     &gt;         +       arrow pointing right
-       WACS_RTEE         0x251c     +         u       right tee
-       WACS_S1           0x23ba     -         o       scan line 1
-       WACS_S3           0x23bb     -         p       scan line 3
-       WACS_S7           0x23bc     -         r       scan line 7
-       WACS_S9           0x23bd     _         s       scan line 9
-       WACS_STERLING     0x00a3     f         }       pound-sterling symbol
-       WACS_TTEE         0x252c     +         w       top tee
-       WACS_UARROW       0x2191     ^         -       arrow pointing up
-       WACS_ULCORNER     0x250c     +         l       upper left-hand corner
-       WACS_URCORNER     0x2510     +         k       upper right-hand corner
-       WACS_VLINE        0x2502     |         x       vertical line
+       <STRONG>WACS_BLOCK</STRONG>      0x25ae    #         0      solid square block
+       <STRONG>WACS_BOARD</STRONG>      0x2592    #         h      board of squares
+       <STRONG>WACS_BTEE</STRONG>       0x2534    +         v      bottom tee
+       <STRONG>WACS_BULLET</STRONG>     0x00b7    o         ~      bullet
+       <STRONG>WACS_CKBOARD</STRONG>    0x2592    :         a      checker board (stipple)
+       <STRONG>WACS_DARROW</STRONG>     0x2193    v         .      arrow pointing down
+       <STRONG>WACS_DEGREE</STRONG>     0x00b0    '         f      degree symbol
+       <STRONG>WACS_DIAMOND</STRONG>    0x25c6    +         `      diamond
+       <STRONG>WACS_GEQUAL</STRONG>     0x2265    &gt;         &gt;      greater-than-or-equal-to
+       <STRONG>WACS_HLINE</STRONG>      0x2500    -         q      horizontal line
+       <STRONG>WACS_LANTERN</STRONG>    0x2603    #         i      lantern symbol
+       <STRONG>WACS_LARROW</STRONG>     0x2190    &lt;         ,      arrow pointing left
+       <STRONG>WACS_LEQUAL</STRONG>     0x2264    &lt;         y      less-than-or-equal-to
+       <STRONG>WACS_LLCORNER</STRONG>   0x2514    +         m      lower left-hand corner
+       <STRONG>WACS_LRCORNER</STRONG>   0x2518    +         j      lower right-hand corner
+       <STRONG>WACS_LTEE</STRONG>       0x2524    +         t      left tee
+       <STRONG>WACS_NEQUAL</STRONG>     0x2260    !         |      not-equal
+       <STRONG>WACS_PI</STRONG>         0x03c0    *         {      greek pi
+       <STRONG>WACS_PLMINUS</STRONG>    0x00b1    #         g      plus/minus
+       <STRONG>WACS_PLUS</STRONG>       0x253c    +         n      plus
+       <STRONG>WACS_RARROW</STRONG>     0x2192    &gt;         +      arrow pointing right
+       <STRONG>WACS_RTEE</STRONG>       0x251c    +         u      right tee
+       <STRONG>WACS_S1</STRONG>         0x23ba    -         o      scan line 1
+       <STRONG>WACS_S3</STRONG>         0x23bb    -         p      scan line 3
+       <STRONG>WACS_S7</STRONG>         0x23bc    -         r      scan line 7
+       <STRONG>WACS_S9</STRONG>         0x23bd    _         s      scan line 9
+       <STRONG>WACS_STERLING</STRONG>   0x00a3    f         }      pound-sterling symbol
+       <STRONG>WACS_TTEE</STRONG>       0x252c    +         w      top tee
+       <STRONG>WACS_UARROW</STRONG>     0x2191    ^         -      arrow pointing up
+       <STRONG>WACS_ULCORNER</STRONG>   0x250c    +         l      upper left-hand corner
+       <STRONG>WACS_URCORNER</STRONG>   0x2510    +         k      upper right-hand corner
+       <STRONG>WACS_VLINE</STRONG>      0x2502    |         x      vertical line
 
        The wide-character configuration of <EM>ncurses</EM> also  defines  symbols  for
        thick lines (<STRONG>acsc</STRONG> "J" to "V"):
 
-       <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
-       <STRONG>Name</STRONG>              <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>char</STRONG>    <STRONG>Name</STRONG>
-       -----------------------------------------------------------------------
-       WACS_T_BTEE       0x253b    +         V       thick tee pointing up
-       WACS_T_HLINE      0x2501    -         Q       thick horizontal line
-       WACS_T_LLCORNER   0x2517    +         M       thick lower left corner
-       WACS_T_LRCORNER   0x251b    +         J       thick lower right corner
-       WACS_T_LTEE       0x252b    +         T       thick tee pointing right
-       WACS_T_PLUS       0x254b    +         N       thick large plus
-       WACS_T_RTEE       0x2523    +         U       thick tee pointing left
-       WACS_T_TTEE       0x2533    +         W       thick tee pointing down
-       WACS_T_ULCORNER   0x250f    +         L       thick upper left corner
-       WACS_T_URCORNER   0x2513    +         K       thick upper right corner
-       WACS_T_VLINE      0x2503    |         X       thick vertical line
+                         <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
+       <STRONG>ACS</STRONG> <STRONG>Name</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>WACS_T_BTEE</STRONG>       0x253b    +         V      thick tee pointing up
+       <STRONG>WACS_T_HLINE</STRONG>      0x2501    -         Q      thick horizontal line
+       <STRONG>WACS_T_LLCORNER</STRONG>   0x2517    +         M      thick lower left corner
+       <STRONG>WACS_T_LRCORNER</STRONG>   0x251b    +         J      thick lower right corner
+       <STRONG>WACS_T_LTEE</STRONG>       0x252b    +         T      thick tee pointing right
+       <STRONG>WACS_T_PLUS</STRONG>       0x254b    +         N      thick large plus
+       <STRONG>WACS_T_RTEE</STRONG>       0x2523    +         U      thick tee pointing left
+       <STRONG>WACS_T_TTEE</STRONG>       0x2533    +         W      thick tee pointing down
+       <STRONG>WACS_T_ULCORNER</STRONG>   0x250f    +         L      thick upper left corner
+       <STRONG>WACS_T_URCORNER</STRONG>   0x2513    +         K      thick upper right corner
+       <STRONG>WACS_T_VLINE</STRONG>      0x2503    |         X      thick vertical line
 
        and for double-lines (<STRONG>acsc</STRONG> "A" to "I"):
 
-       <STRONG>ACS</STRONG>               <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>    <STRONG>Glyph</STRONG>
-       <STRONG>Name</STRONG>              <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>char</STRONG>    <STRONG>Name</STRONG>
+                         <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
+       <STRONG>ACS</STRONG> <STRONG>Name</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
-       WACS_D_BTEE       0x2569    +         H       double tee pointing up
-       WACS_D_HLINE      0x2550    -         R       double horizontal line
-       WACS_D_LLCORNER   0x255a    +         D       double lower left corner
-       WACS_D_LRCORNER   0x255d    +         A       double lower right corner
-       WACS_D_LTEE       0x2560    +         F       double tee pointing right
-       WACS_D_PLUS       0x256c    +         E       double large plus
-       WACS_D_RTEE       0x2563    +         G       double tee pointing left
-       WACS_D_TTEE       0x2566    +         I       double tee pointing down
-
-       WACS_D_ULCORNER   0x2554    +         C       double upper left corner
-       WACS_D_URCORNER   0x2557    +         B       double upper right corner
-       WACS_D_VLINE      0x2551    |         Y       double vertical line
+       <STRONG>WACS_D_BTEE</STRONG>       0x2569    +         H      double tee pointing up
+       <STRONG>WACS_D_HLINE</STRONG>      0x2550    -         R      double horizontal line
+       <STRONG>WACS_D_LLCORNER</STRONG>   0x255a    +         D      double lower left corner
+       <STRONG>WACS_D_LRCORNER</STRONG>   0x255d    +         A      double lower right corner
+       <STRONG>WACS_D_LTEE</STRONG>       0x2560    +         F      double tee pointing right
+       <STRONG>WACS_D_PLUS</STRONG>       0x256c    +         E      double large plus
+       <STRONG>WACS_D_RTEE</STRONG>       0x2563    +         G      double tee pointing left
+
+       <STRONG>WACS_D_TTEE</STRONG>       0x2566    +         I      double tee pointing down
+       <STRONG>WACS_D_ULCORNER</STRONG>   0x2554    +         C      double upper left corner
+       <STRONG>WACS_D_URCORNER</STRONG>   0x2557    +         B      double upper right corner
+       <STRONG>WACS_D_VLINE</STRONG>      0x2551    |         Y      double vertical line
 
        Unicode's  descriptions  for  these  characters  differs  slightly from
        <EM>ncurses</EM>, by introducing the term "light"  (along  with  less  important
@@ -320,7 +321,7 @@ <H1 class="no-header">curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index e813235c3..a497bf8f5 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,34 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.93 2023/12/23 16:08:25 tom Exp @
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
-  * ---------------------------------------------------------------------------
+  * @Id: curs_attr.3x,v 1.96 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -222,7 +207,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
               <STRONG>Name</STRONG>           <STRONG>Description</STRONG>
               -----------------------------------------------------------------
               <STRONG>A_NORMAL</STRONG>       Normal display (no highlight)
-              <STRONG>A_STANDOUT</STRONG>     Best highlighting mode of the terminal.
+              <STRONG>A_STANDOUT</STRONG>     Best highlighting mode of the terminal
               <STRONG>A_UNDERLINE</STRONG>    Underlining
               <STRONG>A_REVERSE</STRONG>      Reverse video
               <STRONG>A_BLINK</STRONG>        Blinking
@@ -239,7 +224,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        (which also support the attributes recognized by <STRONG>attron</STRONG>, etc.):
 
               <STRONG>Name</STRONG>            <STRONG>Description</STRONG>
-              -----------------------------------------
+              -----------------------------------------------------------------
               <STRONG>WA_HORIZONTAL</STRONG>   Horizontal highlight
               <STRONG>WA_LEFT</STRONG>         Left highlight
               <STRONG>WA_LOW</STRONG>          Low highlight
@@ -340,9 +325,9 @@ <H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        the newer set of names:
 
               <STRONG>Name</STRONG>            <STRONG>Description</STRONG>
-              ------------------------------------------------------------
+              -----------------------------------------------------------------
               <STRONG>WA_NORMAL</STRONG>       Normal display (no highlight)
-              <STRONG>WA_STANDOUT</STRONG>     Best highlighting mode of the terminal.
+              <STRONG>WA_STANDOUT</STRONG>     Best highlighting mode of the terminal
               <STRONG>WA_UNDERLINE</STRONG>    Underlining
               <STRONG>WA_REVERSE</STRONG>      Reverse video
               <STRONG>WA_BLINK</STRONG>        Blinking
@@ -436,19 +421,20 @@ <H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        alternate  character  set implementation.  A 32-bit library can be used
        on a 64-bit system, but not necessarily the reverse.
 
-              <STRONG>Year</STRONG>   <STRONG>System</STRONG>        <STRONG>Arch</STRONG>    <STRONG>Color</STRONG>   <STRONG>Char</STRONG>   <STRONG>Notes</STRONG>
-              ----------------------------------------------------------------
-              1992   Solaris 5.2   32      6       17     SVr4 curses
-              1992   HP-UX 9       32      no      8      SVr2 curses
-              1992   AIX 3.2       32      no      23     SVr2 curses
-              1994   OSF/1 r3      32      no      23     SVr2 curses
-              1995   HP-UX 10.00   32      6       16     SVr3 "curses_colr"
-              1995   HP-UX 10.00   32      6       8      SVr4, X/Open curses
-              1995   Solaris 5.4   32/64   7       16     X/Open curses
-              1996   AIX 4.2       32      7       16     X/Open curses
-              1996   OSF/1 r4      32      6       16     X/Open curses
-              1997   HP-UX 11.00   32      6       8      X/Open curses
-              2000   U/Win         32/64   7/31    16     uses <STRONG>chtype</STRONG>
+                                     <STRONG>Bits</STRONG>
+       <STRONG>Year</STRONG>  <STRONG>System</STRONG>        <STRONG>Arch</STRONG>   <STRONG>Color</STRONG>  <STRONG>Char</STRONG>  <STRONG>Notes</STRONG>
+       ------------------------------------------------------------------------
+       1992  Solaris 5.2   32     6      17    SVr4 <EM>curses</EM>
+       1992  HP-UX 9       32     no     8     SVr2 <EM>curses</EM>
+       1992  AIX 3.2       32     no     23    SVr2 <EM>curses</EM>
+       1994  OSF/1 r3      32     no     23    SVr2 <EM>curses</EM>
+       1995  HP-UX 10.00   32     6      16    SVr3 <EM>curses</EM><STRONG>_</STRONG><EM>colr</EM>
+       1995  HP-UX 10.00   32     6      8     SVr4, X/Open <EM>curses</EM>
+       1995  Solaris 5.4   32/64  7      16    X/Open <EM>curses</EM>
+       1996  AIX 4.2       32     7      16    X/Open <EM>curses</EM>
+       1996  OSF/1 r4      32     6      16    X/Open <EM>curses</EM>
+       1997  HP-UX 11.00   32     6      8     X/Open <EM>curses</EM>
+       2000  U/Win         32/64  7/31   16    uses <EM>chtype</EM>
 
        Notes:
 
@@ -511,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index b4bcd57bf..669392867 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.41 2023/12/16 21:08:16 tom Exp @
+  * @Id: curs_inch.3x,v 1.44 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -73,9 +73,11 @@ <H1 class="no-header">curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        The  following  bit  masks  may  be  AND-ed with characters returned by
        <STRONG>winch</STRONG>.
 
-       <STRONG>A_CHARTEXT</STRONG>     Bit mask to extract character
-       <STRONG>A_ATTRIBUTES</STRONG>   Bit mask to extract attributes
-       <STRONG>A_COLOR</STRONG>        Bit mask to extract color pair field information
+       <STRONG>Name</STRONG>           <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>A_CHARTEXT</STRONG>     Extract character
+       <STRONG>A_ATTRIBUTES</STRONG>   Extract attributes
+       <STRONG>A_COLOR</STRONG>        Extract color pair information
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -133,7 +135,7 @@ <H1 class="no-header">curs_inch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index a608a3503..4ea351f3d 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.83 2023/12/23 20:37:56 tom Exp @
+  * @Id: curs_mouse.3x,v 1.86 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -108,44 +108,44 @@ <H1 class="no-header">curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        Here are the mouse event type masks which may be defined:
 
        <STRONG>Name</STRONG>                     <STRONG>Description</STRONG>
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON1_PRESSED</STRONG>          mouse button 1 down
        <STRONG>BUTTON1_RELEASED</STRONG>         mouse button 1 up
        <STRONG>BUTTON1_CLICKED</STRONG>          mouse button 1 clicked
 
        <STRONG>BUTTON1_DOUBLE_CLICKED</STRONG>   mouse button 1 double clicked
        <STRONG>BUTTON1_TRIPLE_CLICKED</STRONG>   mouse button 1 triple clicked
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON2_PRESSED</STRONG>          mouse button 2 down
        <STRONG>BUTTON2_RELEASED</STRONG>         mouse button 2 up
        <STRONG>BUTTON2_CLICKED</STRONG>          mouse button 2 clicked
        <STRONG>BUTTON2_DOUBLE_CLICKED</STRONG>   mouse button 2 double clicked
        <STRONG>BUTTON2_TRIPLE_CLICKED</STRONG>   mouse button 2 triple clicked
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON3_PRESSED</STRONG>          mouse button 3 down
        <STRONG>BUTTON3_RELEASED</STRONG>         mouse button 3 up
        <STRONG>BUTTON3_CLICKED</STRONG>          mouse button 3 clicked
        <STRONG>BUTTON3_DOUBLE_CLICKED</STRONG>   mouse button 3 double clicked
        <STRONG>BUTTON3_TRIPLE_CLICKED</STRONG>   mouse button 3 triple clicked
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON4_PRESSED</STRONG>          mouse button 4 down
        <STRONG>BUTTON4_RELEASED</STRONG>         mouse button 4 up
        <STRONG>BUTTON4_CLICKED</STRONG>          mouse button 4 clicked
        <STRONG>BUTTON4_DOUBLE_CLICKED</STRONG>   mouse button 4 double clicked
        <STRONG>BUTTON4_TRIPLE_CLICKED</STRONG>   mouse button 4 triple clicked
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON5_PRESSED</STRONG>          mouse button 5 down
        <STRONG>BUTTON5_RELEASED</STRONG>         mouse button 5 up
        <STRONG>BUTTON5_CLICKED</STRONG>          mouse button 5 clicked
        <STRONG>BUTTON5_DOUBLE_CLICKED</STRONG>   mouse button 5 double clicked
        <STRONG>BUTTON5_TRIPLE_CLICKED</STRONG>   mouse button 5 triple clicked
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
        <STRONG>BUTTON_SHIFT</STRONG>             shift was down during button state change
        <STRONG>BUTTON_CTRL</STRONG>              control was down during button state change
        <STRONG>BUTTON_ALT</STRONG>               alt was down during button state change
        <STRONG>ALL_MOUSE_EVENTS</STRONG>         report all button state changes
        <STRONG>REPORT_MOUSE_POSITION</STRONG>    report mouse movement
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
 
 
 </PRE><H3><a name="h3-getmouse">getmouse</a></H3><PRE>
@@ -325,11 +325,11 @@ <H1 class="no-header">curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   Its "terminfo" manual page lists capabilities for the feature.
 
-               buttons           btns    BT       Number of buttons on the mouse
-               get_mouse         getm    Gm       Curses should get button events
-               key_mouse         kmous   Km       0631, Mouse event has occurred
-               mouse_info        minfo   Mi       Mouse status information
-               req_mouse_pos     reqmp   RQ       Request mouse position report
+               <STRONG>buttons</STRONG>         <STRONG>btns</STRONG>    <STRONG>BT</STRONG>   Number of buttons on the mouse
+               <STRONG>get_mouse</STRONG>       <STRONG>getm</STRONG>    <STRONG>Gm</STRONG>   Curses should get button events
+               <STRONG>key_mouse</STRONG>       <STRONG>kmous</STRONG>   <STRONG>Km</STRONG>   0631, Mouse event has occurred
+               <STRONG>mouse_info</STRONG>      <STRONG>minfo</STRONG>   <STRONG>Mi</STRONG>   Mouse status information
+               <STRONG>req_mouse_pos</STRONG>   <STRONG>reqmp</STRONG>   <STRONG>RQ</STRONG>   Request mouse position report
 
        <STRONG>o</STRONG>   The  interface  made assumptions (as does <EM>ncurses</EM>) about the escape
            sequences sent to and received from the terminal.
@@ -378,7 +378,7 @@ <H1 class="no-header">curs_mouse 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 9a312a058..44ada64dc 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -28,11 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_printw.3x,v 1.47 2023/12/23 14:41:07 tom Exp @
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
-  *   libcurses/printw.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
-  *  varargs.h
-  * either header declares "va_list", but only one can be used
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 2c549ce4c..b7da265df 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -28,11 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_scanw.3x,v 1.47 2023/12/23 14:41:50 tom Exp @
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
-  *  libcurses/scanw.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
-  *  varargs.h
-  * either header declares "va_list", but only one can be used
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 298722f18..15753f736 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -28,7 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_scr_dump.3x,v 1.37 2023/12/30 21:34:11 tom Exp @
-  * SVID 4, p. 529
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index e943b6c59..480f998aa 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -28,9 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_sp_funcs.3x,v 1.46 2023/12/23 16:26:05 tom Exp @
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 5babcda79..f7d0608c3 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -28,34 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_termcap.3x,v 1.81 2023/12/30 21:27:22 tom Exp @
-  * See &lt;https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
-  *   termlib/termcap.c&gt;.
-  * See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
-  * for much BSD release history.
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s7/ttycap.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/termlib/
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/bin/etc/termcap
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/lib/\
-  *   libtermlib/
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/man/man3/\
-  *   termlib.3
-  * ...except in the source tree...
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
-  *   libtermlib/makefile
-  * Observe the `tncktc()`, `tnamatch()`, `tskip()`, and `tdecode()`
-  * entry points disappearing from termcap.c.
-  * 2BSD became a branch retaining support for non-virtual memory
-  * systems (such as the PDP-11) whereas most BSD development focused on
-  * the VAX and other VM-enabled systems starting with 3BSD.
-  * This man page previously located a termcap.h in 2BSD, but that may
-  * be confusion arising from its backport to 2.9BSD (and still present
-  * in surviving sources for 2.11BSD, the "end of the line" for that
-  * branch's development).
-  * Observe the copyright notice in
-  *   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
-  *     jove/Makefile
-  * --much too late for 2BSD (1979).
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 6084b51ee..4ae87c03a 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,31 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.125 2023/12/30 23:46:56 tom Exp @
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * ***************************************************************************
-  * X/Open Curses Issue 7, p. 161
-  * ***************************************************************************
+  * @Id: curs_terminfo.3x,v 1.129 2024/01/13 22:15:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -101,9 +89,9 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
        <STRONG>int</STRONG> <STRONG>mvcur(int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
 
        <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
 
@@ -116,152 +104,150 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These low-level routines must be called by programs that have  to  deal
-       directly   with  the  <EM>terminfo</EM>  database  to  handle  certain  terminal
-       capabilities,  such  as  programming  function  keys.   For  all  other
-       functionality,  <EM>curses</EM>  routines  are  more  suitable  and their use is
-       recommended.
+       These low-level functions must be called by programs that deal directly
+       with  the  <EM>terminfo</EM>  database  to handle certain terminal capabilities,
+       such as programming function keys.  For all other functionality, <EM>curses</EM>
+       functions are more suitable and their use is recommended.
 
-       None of these functions use  (or  are  aware  of)  multibyte  character
+       None  of  these  functions  use  (or  are aware of) multibyte character
        strings such as UTF-8.
 
        <STRONG>o</STRONG>   Capability names and codes use the POSIX portable character set.
 
-       <STRONG>o</STRONG>   Capability  string  values  have  no  associated encoding; they are
+       <STRONG>o</STRONG>   Capability string values have  no  associated  encoding;  they  are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        Initially, <STRONG>setupterm</STRONG> should be called.  The high-level <EM>curses</EM> functions
-       <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
+       <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level  set  of
        terminal-dependent variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
 
-       Applications can use the terminal  capabilities  either  directly  (via
+       Applications  can  use  the  terminal capabilities either directly (via
        header  definitions),  or  by  special  functions.   The  header  files
-       <EM>curses.h</EM> and <EM>term.h</EM> should be included  (in  that  order)  to  get  the
+       <EM>curses.h</EM>  and  <EM>term.h</EM>  should  be  included  (in that order) to get the
        definitions for these strings, numbers, and flags.
 
-       The  <EM>terminfo</EM>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
-       as follows:
+       The <EM>terminfo</EM> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized  by  <STRONG>setupterm</STRONG>
+       as follows.
 
-       <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
+       <STRONG>o</STRONG>   If  <STRONG>use_env(FALSE)</STRONG>  has  been  called, values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG>
            specified in <EM>terminfo</EM> are used.
 
-       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <EM>LINES</EM> and <EM>COLUMNS</EM> exist,
+       <STRONG>o</STRONG>   Otherwise, if the environment variables <EM>LINES</EM>  and  <EM>COLUMNS</EM>  exist,
            their values are used.  If these environment variables do not exist
-           and  the program is running in a window, the current window size is
-           used.  Otherwise, if the environment variables do  not  exist,  the
+           and the program is running in a window, the current window size  is
+           used.   Otherwise,  if  the environment variables do not exist, the
            values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <EM>terminfo</EM> database are
            used.
 
-       Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
-       them.   All  <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>) should be
-       printed with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG> to restore  the  tty
-       modes before exiting [see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>].
+       Parameterized  strings  should  be  passed through <STRONG>tparm</STRONG> to instantiate
+       them.  All <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>)  should  be
+       sent  to the terminal device with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG>
+       to restore the terminal modes before exiting; see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>.
 
-       Programs which use cursor addressing should
+       Programs that use cursor addressing should
 
        <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> upon startup and
 
        <STRONG>o</STRONG>   output <STRONG>exit_ca_mode</STRONG> before exiting.
 
-       Programs which execute shell subprocesses should
+       Programs that execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call  <STRONG>reset_shell_mode</STRONG>  and output <STRONG>exit_ca_mode</STRONG> before the shell is
+       <STRONG>o</STRONG>   call <STRONG>reset_shell_mode</STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell  is
            called and
 
-       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
+       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning from
            the shell.
 
-       The  <STRONG>setupterm</STRONG> routine reads in the <EM>terminfo</EM> database, initializing the
-       <EM>terminfo</EM> structures, but does not  set  up  the  output  virtualization
-       structures used by <EM>curses.</EM>  These are its parameters:
+       <STRONG>setupterm</STRONG> reads in the <EM>terminfo</EM>  database,  initializing  the  <EM>terminfo</EM>
+       structures,  but  does  not set up the output virtualization structures
+       used by <EM>curses.</EM>  Its parameters follow.
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
-               environment variable <EM>TERM</EM> is used.
+               environment variable <EM>TERM</EM> is read.
 
           <EM>filedes</EM>
-               is the file descriptor used for getting  and  setting  terminal
+               is  the  file  descriptor used for getting and setting terminal
                I/O modes.
 
-               Higher-level  applications use <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> for initializing the
-               terminal, passing an output <EM>stream</EM> rather  than  a  <EM>descriptor</EM>.
-               In   curses,  the  two  are  the  same  because  <STRONG>newterm</STRONG>  calls
-               <STRONG>setupterm</STRONG>, passing the file descriptor derived from its  output
+               Higher-level applications use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to  initialize  the
+               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor.</EM>
+               In  <EM>curses,</EM>  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
+               <STRONG>setupterm</STRONG>,  passing the file descriptor derived from its output
                stream parameter.
 
           <EM>errret</EM>
-               points  to  an  optional  location where an error status can be
-               returned to the caller.  If <EM>errret</EM> is not null, then  <STRONG>setupterm</STRONG>
-               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
-               pointed to by <EM>errret</EM>.  A  return  value  of  <STRONG>OK</STRONG>  combined  with
+               points to an optional location where an  error  status  can  be
+               returned  to the caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
+               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
+               pointed  to  by  <EM>errret.</EM>   A  return  value of <STRONG>OK</STRONG> combined with
                status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
-               If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>:
+               If <STRONG>ERR</STRONG> is returned, examine <EM>errret:</EM>
 
-               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, cannot be used for
-                    <EM>curses</EM> applications.
+               <STRONG>1</STRONG>    means that the terminal is hardcopy, and  cannot  be  used
+                    for <EM>curses</EM> applications.
 
-                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
-                    checking the <STRONG>hc</STRONG> (<STRONG>hardcopy</STRONG>) capability.
+                    <STRONG>setupterm</STRONG>  determines  if  the entry is a hardcopy type by
+                    checking the <STRONG>hardcopy</STRONG> (<STRONG>hc</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
-                    a generic type, having too little information  for  <EM>curses</EM>
+               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
+                    a  generic  type, having too little information for <EM>curses</EM>
                     applications to run.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
-                    checking the <STRONG>gn</STRONG> (<STRONG>generic_type</STRONG>) capability.
+                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
+                    checking the <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <EM>terminfo</EM> database could not be found.
 
-               If <EM>errret</EM> is null,  <STRONG>setupterm</STRONG>  prints  an  error  message  upon
+               If  <EM>errret</EM>  is  null,  <STRONG>setupterm</STRONG>  reports an error message upon
                finding an error and exits.  Thus, the simplest call is:
 
-                      <STRONG>setupterm((char</STRONG> <STRONG>*)0,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0);</STRONG>
+                      setupterm((char *)0, 1, (int *)0);
 
                which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       The  <STRONG>setupterm</STRONG>  routine  stores its information about the terminal in a
-       <EM>TERMINAL</EM> structure pointed to by the global variable <STRONG>cur_term</STRONG>.   If  it
-       detects  an error, or decides that the terminal is unsuitable (hardcopy
-       or generic), it discards this information, making it not  available  to
+       <STRONG>setupterm</STRONG> stores its information  about  the  terminal  in  a  <EM>TERMINAL</EM>
+       structure pointed to by the global variable <STRONG>cur_term</STRONG>.  If it detects an
+       error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
+       generic),  it  discards  this  information,  making it not available to
        applications.
 
-       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
+       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type,  it  will
        reuse  the  information.   It  maintains  only  one  copy  of  a  given
-       terminal's  capabilities  in  memory.   If  it  is called for different
-       terminal types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set  of
+       terminal's capabilities in memory.   If  it  is  called  for  different
+       terminal  types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set of
        terminal capabilities.
 
-       <STRONG>set_curterm</STRONG>  sets  <STRONG>cur_term</STRONG>  to  <EM>nterm,</EM>  and  makes all of the <EM>terminfo</EM>
-       Boolean, numeric, and string variables use the values from  <EM>nterm.</EM>   It
+       <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm,</EM>  and  makes  all  of  the  <EM>terminfo</EM>
+       Boolean,  numeric,  and string variables use the values from <EM>nterm.</EM>  It
        returns the old value of <STRONG>cur_term</STRONG>.
 
-       <STRONG>del_curterm</STRONG>  routine  frees  the space pointed to by <EM>oterm</EM> and makes it
-       available  for  further  use.   If  <EM>oterm</EM>  is  the  same  as  <STRONG>cur_term</STRONG>,
-       references  to  any  of  the  <EM>terminfo</EM>  Boolean,  numeric,  and  string
-       variables thereafter  may  refer  to  invalid  memory  locations  until
-       another <STRONG>setupterm</STRONG> has been called.
+       <STRONG>del_curterm</STRONG> frees the space pointed to by <EM>oterm</EM> and makes it  available
+       for  further  use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references to any
+       of the <EM>terminfo</EM> Boolean, numeric, and string variables  thereafter  may
+       refer  to  invalid  memory  locations  until another <STRONG>setupterm</STRONG> has been
+       called.
 
-       The  <STRONG>restartterm</STRONG>  routine  is  similar to <STRONG>setupterm</STRONG> and <STRONG>initscr</STRONG>, except
-       that it is called after restoring  memory  to  a  previous  state  (for
-       example,   when   reloading  a  game  saved  as  a  core  image  dump).
-       <STRONG>restartterm</STRONG> assumes that the windows and the input and  output  options
-       are  the  same as when memory was saved, but the terminal type and baud
-       rate may be different.   Accordingly,  <STRONG>restartterm</STRONG>  saves  various  tty
-       state bits, calls <STRONG>setupterm</STRONG>, and then restores the bits.
+       <STRONG>restartterm</STRONG> is similar to <STRONG>setupterm</STRONG> and  <STRONG>initscr</STRONG>,  except  that  it  is
+       called  after  restoring  memory to a previous state (for example, when
+       reloading a game saved as a core image dump).  <STRONG>restartterm</STRONG> assumes that
+       the  windows  and  the  input  and  output options are the same as when
+       memory was saved, but the terminal type and baud rate may be different.
+       Accordingly,  <STRONG>restartterm</STRONG>  saves  various  terminal  state  bits, calls
+       <STRONG>setupterm</STRONG>, and then restores the bits.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       The  <STRONG>tparm</STRONG>  routine  instantiates the string <EM>str</EM> with parameters <EM>pi</EM>.  A
-       pointer is returned to the result of <EM>str</EM> with the  parameters  applied.
-       Application  developers  should  keep  in  mind  these  quirks  of  the
-       interface:
+       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi.</EM>   A  pointer  is
+       returned to the result of <EM>str</EM> with the parameters applied.  Application
+       developers should keep in mind these quirks of the interface:
 
        <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
-           prototype expects <STRONG>long</STRONG> (integer) values.
+           prototype expects <EM>long</EM> (integer) values.
 
        <STRONG>o</STRONG>   Aside  from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most terminal
            capabilities require no more than one or two parameters.
@@ -278,18 +264,18 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
        Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
        consistent  with the terminal description.  Two extensions are provided
-       as alternatives to deal with untrusted data:
+       as alternatives to deal with untrusted data.
 
        <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
-           <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the curses
+           <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the <EM>curses</EM>
            library how many parameters to expect in the  parameter  list,  and
            which may be string parameters.
 
            The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
-           to 9) which will be passed as char* rather than numbers.
+           to 9) passed as <EM>char</EM> pointers rather than numbers.
 
        <STRONG>o</STRONG>   The  extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect   a
-           formatting capability to see what the curses library would assume.
+           formatting capability to see what the <EM>curses</EM> library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
@@ -298,86 +284,83 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM>
        exceeds 30,000 (thirty seconds), it is capped at that value.
 
-       The <STRONG>tputs</STRONG> routine interprets time-delay information in the  string  <EM>str</EM>
-       and outputs it, executing the delays:
+       <STRONG>tputs</STRONG> interprets time-delay information in the string <EM>str</EM>  and  outputs
+       it, executing the delays:
 
-       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a terminfo string variable or the return
-           value from <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
+       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the return
+           value of <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
 
            The <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM>  interface,
-           which  happens  to  share  this  function  name  with  the <EM>terminfo</EM>
-           interface.
+           which happens to share these function names with the <EM>terminfo</EM> API.
 
-       <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or 1 if not applicable.
+       <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or <STRONG>1</STRONG> if not applicable.
 
        <STRONG>o</STRONG>   <EM>putc</EM> is a <EM>putchar</EM>-like function to which the characters are passed,
            one at a time.
 
-           If  <STRONG>tputs</STRONG>  processes  a  time-delay,  it  uses the <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
-           function, routing any resulting  padding  characters  through  this
+           If <STRONG>tputs</STRONG> processes  a  time-delay,  it  uses  the  <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
+           function,  routing  any  resulting  padding characters through this
            function.
 
-       The  <STRONG>putp</STRONG>  routine  calls  <STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG>  <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>.  The output of <STRONG>putp</STRONG>
-       always goes to <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
+       <STRONG>putp</STRONG> calls "<STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>".  The output of <STRONG>putp</STRONG> always goes to
+       <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
-       The <STRONG>vidputs</STRONG> routine displays the string on the terminal  in  the  video
-       attribute mode <EM>attrs</EM>, which is any combination of the attributes listed
-       in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.  The characters are passed to the <EM>putchar</EM>-like  function
-       <EM>putc</EM>.
+       <STRONG>vidputs</STRONG> displays the string on the terminal in the video attribute mode
+       <EM>attrs,</EM> which is any combination of the attributes listed in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       The characters are passed to the <EM>putchar</EM>-like function <EM>putc.</EM>
 
-       The <STRONG>vidattr</STRONG> routine is like the <STRONG>vidputs</STRONG> routine, except that it outputs
-       through <EM>putchar</EM>.
+       <STRONG>vidattr</STRONG> is like <STRONG>vidputs</STRONG>, except that it outputs through <STRONG>putchar(3)</STRONG>.
 
-       <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>,  respectively.
-       They  use multiple parameters to represent the character attributes and
+       <STRONG>vid_attr</STRONG>  and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>, respectively.
+       They use multiple parameters to represent the character attributes  and
        color; namely,
 
        <STRONG>o</STRONG>   <EM>attrs,</EM> of type <EM>attr</EM><STRONG>_</STRONG><EM>t,</EM> for the attributes and
 
        <STRONG>o</STRONG>   <EM>pair,</EM> of type <EM>short,</EM> for the color pair number.
 
-       Use the attribute constants  prefixed  with  "<STRONG>WA_</STRONG>"  with  <STRONG>vid_attr</STRONG>  and
+       Use  the  attribute  constants  prefixed  with  "<STRONG>WA_</STRONG>" with <STRONG>vid_attr</STRONG> and
        <STRONG>vid_puts</STRONG>.
 
-       X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
-       applications must provide a null pointer for  that  argument;  but  see
+       X/Open Curses reserves the <EM>opts</EM> argument for future  use,  saying  that
+       applications  must  provide  a  null pointer for that argument; but see
        section "EXTENSIONS" below.
 
-       The  <STRONG>mvcur</STRONG>  routine  provides low-level cursor motion.  It takes effect
-       immediately (rather than at the next refresh).  Unlike the  other  low-
-       level  output  functions,  which either write to the standard output or
-       pass an output function parameter, <STRONG>mvcur</STRONG> uses an output file descriptor
-       derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
+       <STRONG>mvcur</STRONG> provides low-level cursor motion.  It  takes  effect  immediately
+       (rather  than  at the next refresh).  Unlike the other low-level output
+       functions, which either write to the standard output or pass an  output
+       function  parameter,  <STRONG>mvcur</STRONG> uses an output file descriptor derived from
+       the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
-       While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions which do not use the high-
-       level curses state, they are declared in <EM>curses.h</EM> because System V  did
-       this (see <EM>HISTORY</EM>).
+       While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions that do not use high-level
+       <EM>curses</EM>  state,  <EM>ncurses</EM>  declares them in <EM>curses.h</EM> because System V did
+       this (see section "HISTORY" below).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
-       The  <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG> and <STRONG>tigetstr</STRONG> routines return the value of the
-       capability corresponding to the <EM>terminfo</EM> <EM>capname</EM> passed to  them,  such
-       as  <STRONG>xenl</STRONG>.  The <EM>capname</EM> for each capability is given in the table column
-       entitled <EM>capname</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, and <STRONG>tigetstr</STRONG> return the value  of  the  capability
+       corresponding  to  the <EM>terminfo</EM> <EM>cap-code,</EM> such as <STRONG>xenl</STRONG>, passed to them.
+       The <EM>cap-code</EM> for each capability is given in the table column  entitled
+       <EM>cap-code</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       These routines return special values to denote errors.
+       These functions return special values to denote errors.
 
-       The <STRONG>tigetflag</STRONG> routine returns
+       <STRONG>tigetflag</STRONG> returns
 
-       <STRONG>-1</STRONG>     if <EM>capname</EM> is not a Boolean capability, or
+       <STRONG>-1</STRONG>     if <EM>cap-code</EM> is not a Boolean capability, or
 
        <STRONG>0</STRONG>      if it is canceled or absent from the terminal description.
 
-       The <STRONG>tigetnum</STRONG> routine returns
+       <STRONG>tigetnum</STRONG> returns
 
-       <STRONG>-2</STRONG>     if <EM>capname</EM> is not a numeric capability, or
+       <STRONG>-2</STRONG>     if <EM>cap-code</EM> is not a numeric capability, or
 
        <STRONG>-1</STRONG>     if it is canceled or absent from the terminal description.
 
-       The <STRONG>tigetstr</STRONG> routine returns
+       <STRONG>tigetstr</STRONG> returns
 
        <STRONG>(char</STRONG> <STRONG>*)-1</STRONG>
-              if <EM>capname</EM> is not a string capability, or
+              if <EM>cap-code</EM> is not a string capability, or
 
        <STRONG>0</STRONG>      if it is canceled or absent from the terminal description.
 
@@ -400,55 +383,54 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
-       description.   As  a  side-effect,  it  sets  <STRONG>cur_term</STRONG> to point to this
+       description.  As a side effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
        memory.  If an application calls
 
-              <STRONG>del_curterm(cur_term);</STRONG>
+              del_curterm(cur_term);
 
        the memory will be freed.
 
-       The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
-       by <STRONG>setupterm</STRONG>:
+       The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
+       by <STRONG>setupterm</STRONG> as follows.
 
-       <STRONG>o</STRONG>   the  "static"  terminfo variables [a-z].  Before <EM>ncurses</EM> 6.3, those
-           were shared by all screens.  With <EM>ncurses</EM> 6.3, those are  allocated
-           per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
+       <STRONG>o</STRONG>   They add the "static" <EM>terminfo</EM>  variables  [a-z].   Before  <EM>ncurses</EM>
+           6.3, those were shared by all screens.  With <EM>ncurses</EM> 6.3, those are
+           allocated per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       <STRONG>o</STRONG>   to  improve performance, <EM>ncurses</EM> 6.3 caches the result of analyzing
-           terminfo strings for their parameter types.  That is  stored  as  a
+       <STRONG>o</STRONG>   To improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
+           <EM>terminfo</EM>  strings  for  their parameter types.  That is stored as a
            binary tree referenced from the <EM>TERMINAL</EM> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
-       they do not free this memory, but it is possible to do that  using  the
+       they  do  not free this memory, but it is possible to do that using the
        <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG> function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       X/Open defines no failure conditions.  In <EM>ncurses,</EM>
+       X/Open Curses defines no failure conditions.  In <EM>ncurses,</EM>
 
-       <STRONG>del_curterm</STRONG>
-            returns an error if its terminal parameter is null.
+       <STRONG>del_curtem</STRONG>
+            fails if its terminal parameter is null.
 
-       <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error-codes.
+       <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error codes.
 
        <STRONG>restartterm</STRONG>
-            returns  an  error  if the associated call to <STRONG>setupterm</STRONG> returns an
-            error.
+            fails if the associated call to <STRONG>setupterm</STRONG> returns an error.
 
        <STRONG>setupterm</STRONG>
-            returns an error if it cannot allocate enough  memory,  or  create
-            the  initial  windows  (<STRONG>stdscr</STRONG>,  <STRONG>curscr</STRONG>,  and  <STRONG>newscr</STRONG>) Other error
-            conditions are documented above.
+            fails if it cannot allocate enough memory, or create  the  initial
+            windows  (<STRONG>stdscr</STRONG>,  <STRONG>curscr</STRONG>,  and <STRONG>newscr</STRONG>) Other error conditions are
+            documented above.
 
        <STRONG>tparm</STRONG>
-            returns  a  null  if  the  capability  would  require   unexpected
-            parameters,  e.g.,  too many, too few, or incorrect types (strings
-            where integers are expected, or vice versa).
+            returns a null pointer if the capability would require  unexpected
+            parameters;  that  is,  too  many,  too  few,  or  incorrect types
+            (strings where integers are expected, or vice versa).
 
        <STRONG>tputs</STRONG>
-            returns an error if the string parameter is  null.   It  does  not
-            detect  I/O  errors:  X/Open  Curses states that <STRONG>tputs</STRONG> ignores the
-            return value of the output function <EM>putc</EM>.
+            fails if the string parameter is null.  It  does  not  detect  I/O
+            errors:  X/Open  Curses states that <STRONG>tputs</STRONG> ignores the return value
+            of the output function <EM>putc</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -461,7 +443,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        The functions marked as extensions were designed for <EM>ncurses,</EM>  and  are
-       not  found  in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous curses
+       not  found  in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM>
        implementation.
 
        <EM>ncurses</EM> allows <EM>opts</EM> to be a pointer to <EM>int,</EM> which  overrides  the  <EM>pair</EM>
@@ -496,7 +478,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        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, as defined  by  "<STRONG>tic</STRONG> <STRONG>-x</STRONG>",  are  not
+       Extended terminal capability names, as defined by  "<STRONG>tic</STRONG>  <STRONG>-x</STRONG>",  are  not
        stored in the arrays described here.
 
 
@@ -536,8 +518,8 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
            This implementation uses a  variable  argument  list,  but  can  be
            configured  to use the fixed-parameter list.  Portable applications
-           should provide 9 parameters after the format; zeroes are  fine  for
-           this purpose.
+           should provide nine parameters after the format;  zeroes  are  fine
+           for this purpose.
 
            In  response  to review comments by Thomas E. Dickey, X/Open Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
@@ -555,85 +537,87 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
            the parameter use the same amount of  stack  as  a  pointer.   That
            approach  dates  back  to the mid-1980s, before C was standardized.
            Since then, there is a standard (and pointers are not  required  to
-           fit in a long).
+           fit in a <EM>long</EM>).
 
        <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
            such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
-           parameters.   However,  only a few terminfo capabilities use string
-           parameters (e.g., the ones used for programmable function keys).
+           parameters.   However,  only a few <EM>terminfo</EM> capabilities use string
+           parameters (for instance, the ones used for  programmable  function
+           keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           an  error  if  the capability mishandles string parameters.  But it
-           cannot check if a calling program provides  strings  in  the  right
+           an error if the capability mishandles string  parameters.   But  it
+           cannot  check  if  a  calling program provides strings in the right
            places for the <STRONG>tparm</STRONG> calls.
 
-           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
+           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of  these  capabilities  with  a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
-       If configured to use the terminal-driver, e.g., for the MinGW port,
+       If configured to use the terminal driver, as with the MinGW port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
            value "unknown".
 
-           SVr4 curses uses the special value "dumb".
+           SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The  difference  between  the two is that the former uses the <STRONG>gn</STRONG> (-
-           <STRONG>generic_type</STRONG>) terminfo capability, while the latter  does  not.   A
-           generic terminal is unsuitable for full-screen applications.
+           The difference  between  the  two  is  that  the  former  uses  the
+           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
+           A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
-           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver  by
+           checking  if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of that
            string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In  SVr4,  <STRONG>set_curterm</STRONG>  returns  an  <EM>int,</EM> <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
+       In SVr4, <STRONG>set_curterm</STRONG> returns an <EM>int,</EM> <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
        implement the X/Open Curses semantics.
 
        In SVr4, the third argument of <STRONG>tputs</STRONG> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
 
-       At least one implementation of X/Open Curses (Solaris) returns a  value
-       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of the
+       At  least one implementation of X/Open Curses (Solaris) returns a value
+       other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of  the
        string, and does no error checking.
 
-       X/Open Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not
-       match  the  actual terminal state, and that an application should touch
-       and refresh the window  before  resuming  normal  <EM>curses</EM>  calls.   Both
+       X/Open  Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not
+       match the actual terminal state, and that an application  should  touch
+       and  refresh  the  window  before  resuming  normal <EM>curses</EM> calls.  Both
        <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data allocated
        in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
        function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
-       X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the curses state may not match
-       the actual terminal state, and that an  application  should  touch  and
-       refresh  the  window before resuming normal curses calls.  Both <EM>ncurses</EM>
-       and System V Release 4 curses implement <STRONG>mvcur</STRONG>  using  the  <EM>SCREEN</EM>  data
-       allocated  in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as
-       a terminfo function, <STRONG>mvcur</STRONG> is really a curses  function  which  is  not
-       well specified.
+       X/Open notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not  match
+       the  actual  terminal  state,  and that an application should touch and
+       refresh the window before resuming normal <EM>curses</EM> calls.   Both  <EM>ncurses</EM>
+       and  SVr4  <EM>curses</EM>  implement  <STRONG>mvcur</STRONG>  using the <EM>SCREEN</EM> data allocated in
+       either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented  as  a  <EM>terminfo</EM>
+       function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
        X/Open  Curses  states that the old location must be given for <STRONG>mvcur</STRONG> to
        accommodate terminals that lack absolute cursor  positioning.   <EM>ncurses</EM>
        allows the caller to use -1 for either or both old coordinates.  The -1
        tells <EM>ncurses</EM> that the old location is unknown, and that  it  must  use
-       only  absolute  motion  (such  as <EM>cursor</EM><STRONG>_</STRONG><EM>address</EM>) rather than the least
-       costly combination of absolute and relative motion.
+       only  absolute  motion,  as  with  the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability,
+       rather than the least  costly  combination  of  absolute  and  relative
+       motion.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
+       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>fixterm</STRONG>     restore tty to "in curses" state
-       <STRONG>gettmode</STRONG>    establish current tty modes
+
+       <STRONG>fixterm</STRONG>     restore terminal to "in <EM>curses</EM>" state
+       <STRONG>gettmode</STRONG>    establish current terminal modes
        <STRONG>mvcur</STRONG>       low level cursor motion
        <STRONG>putp</STRONG>        use <STRONG>tputs</STRONG> to send characters via <EM>putchar</EM>
-       <STRONG>resetterm</STRONG>   set tty modes to "out of curses" state
-       <STRONG>resetty</STRONG>     reset tty flags to stored value
-       <STRONG>saveterm</STRONG>    save current modes as "in curses" state
-       <STRONG>savetty</STRONG>     store current tty flags
+       <STRONG>resetterm</STRONG>   set terminal modes to "out of <EM>curses</EM>" state
+       <STRONG>resetty</STRONG>     reset terminal flags to stored value
+       <STRONG>saveterm</STRONG>    save current modes as "in <EM>curses</EM>" state
+       <STRONG>savetty</STRONG>     store current terminal flags
        <STRONG>setterm</STRONG>     establish terminal with given type
        <STRONG>setupterm</STRONG>   establish terminal with given type
        <STRONG>tparm</STRONG>       interpolate parameters into string capability
@@ -641,7 +625,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
        <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
 
-       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
+       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
@@ -653,11 +637,11 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        <STRONG>tgoto</STRONG>      apply parameters to given capability
        <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
 
-       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
+       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
-       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
+       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
+       capability  values  (like the <EM>termcap</EM> interface), and reusing <STRONG>tgoto</STRONG> and
        <STRONG>tputs</STRONG>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -666,7 +650,7 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
+       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -679,37 +663,37 @@ <H1 class="no-header">curs_terminfo 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        saveterm    def_prog_mode
        setterm     setupterm
 
-       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
-       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
+       SVr3  kept  the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG>, and <STRONG>tputs</STRONG>.  The latter were needed to support  padding,  and  to
+       handle  capabilities  accessed by functions such as <STRONG>vidattr</STRONG> (which used
        more than the two parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3   introduced   the   functions   for  switching  between  terminal
-       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
+       SVr3  introduced  the  functions   for   switching   between   terminal
+       descriptions;   for   example,  <STRONG>set_curterm</STRONG>.   Some  changes  reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
+       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
-           programming  manual  at  this  point, though the variables had been
+       <STRONG>o</STRONG>   Various  global  variables  such as <STRONG>boolnames</STRONG> were mentioned in the
+           programming manual at this point, though  the  variables  had  been
            provided in SVr2.
 
        SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
+       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-30                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 7dad4feaa..b2ed03c30 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2021-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2021-2023,2024 Thomas E. Dickey                                *
   * Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,21 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.51 2023/12/23 16:22:25 tom Exp @
-  * ***************************************************************************
-  * ***************************************************************************
+  * @Id: curs_threads.3x,v 1.54 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -133,466 +131,466 @@ <H1 class="no-header">curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        The following table lists the scope  of  each  symbol  in  the  <EM>ncurses</EM>
        library when configured to support multi-threaded applications.
 
-            <STRONG>Symbol</STRONG>                  <STRONG>Scope</STRONG>
-            -------------------------------------------------------------
-            <STRONG>BC</STRONG>                      global
-            <STRONG>COLORS</STRONG>                  screen (read-only)
-            <STRONG>COLOR_PAIR</STRONG>              reentrant
-            <STRONG>COLOR_PAIRS</STRONG>             screen (read-only)
-            <STRONG>COLS</STRONG>                    screen (read-only)
-            <STRONG>ESCDELAY</STRONG>                screen (read-only; see <STRONG>set_escdelay</STRONG>)
-            <STRONG>LINES</STRONG>                   screen (read-only)
-            <STRONG>PAIR_NUMBER</STRONG>             reentrant
-            <STRONG>PC</STRONG>                      global
-            <STRONG>SP</STRONG>                      global
-            <STRONG>TABSIZE</STRONG>                 screen (read-only; see <STRONG>set_tabsize</STRONG>)
-            <STRONG>UP</STRONG>                      global
-            <STRONG>acs_map</STRONG>                 screen (read-only)
-            <STRONG>add_wch</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>add_wchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>add_wchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>addch</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>addchnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>addchstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>addnstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>addnwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>addstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>addwstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>assume_default_colors</STRONG>   screen
-            <STRONG>attr_get</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>attr_off</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>attr_on</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>attr_set</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>attroff</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>attron</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>attrset</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>baudrate</STRONG>                screen
-            <STRONG>beep</STRONG>                    screen
-            <STRONG>bkgd</STRONG>                    window (<STRONG>stdscr</STRONG>)
-            <STRONG>bkgdset</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>bkgrnd</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>bkgrndset</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>boolcodes</STRONG>               global (read-only)
-            <STRONG>boolfnames</STRONG>              global (read-only)
-            <STRONG>boolnames</STRONG>               global (read-only)
-            <STRONG>border</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>border_set</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>box</STRONG>                     window (<STRONG>stdscr</STRONG>)
-            <STRONG>box_set</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>can_change_color</STRONG>        terminal
-            <STRONG>cbreak</STRONG>                  screen
-
-            <STRONG>chgat</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>clear</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>clearok</STRONG>                 window
-            <STRONG>clrtobot</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>clrtoeol</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>color_content</STRONG>           screen
-            <STRONG>color_set</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>copywin</STRONG>                 window (locks source, target)
-            <STRONG>cur_term</STRONG>                terminal
-            <STRONG>curs_set</STRONG>                screen
-            <STRONG>curscr</STRONG>                  screen (read-only)
-            <STRONG>curses_version</STRONG>          global (read-only)
-            <STRONG>def_prog_mode</STRONG>           terminal
-            <STRONG>def_shell_mode</STRONG>          terminal
-            <STRONG>define_key</STRONG>              screen
-            <STRONG>del_curterm</STRONG>             screen
-            <STRONG>delay_output</STRONG>            screen
-            <STRONG>delch</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>deleteln</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>delscreen</STRONG>               global (locks screen list, screen)
-            <STRONG>delwin</STRONG>                  global (locks window list)
-            <STRONG>derwin</STRONG>                  screen
-            <STRONG>doupdate</STRONG>                screen
-            <STRONG>dupwin</STRONG>                  screen (locks window)
-            <STRONG>echo</STRONG>                    screen
-            <STRONG>echo_wchar</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>echochar</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>endwin</STRONG>                  screen
-            <STRONG>erase</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>erasechar</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>erasewchar</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>filter</STRONG>                  global
-            <STRONG>flash</STRONG>                   terminal
-            <STRONG>flushinp</STRONG>                screen
-            <STRONG>get_wch</STRONG>                 screen (input operation)
-            <STRONG>get_wstr</STRONG>                screen (input operation)
-            <STRONG>getattrs</STRONG>                window
-            <STRONG>getbegx</STRONG>                 window
-            <STRONG>getbegy</STRONG>                 window
-            <STRONG>getbkgd</STRONG>                 window
-            <STRONG>getbkgrnd</STRONG>               window
-            <STRONG>getcchar</STRONG>                reentrant
-            <STRONG>getch</STRONG>                   screen (input operation)
-            <STRONG>getcurx</STRONG>                 window
-            <STRONG>getcury</STRONG>                 window
-            <STRONG>getmaxx</STRONG>                 window
-            <STRONG>getmaxy</STRONG>                 window
-            <STRONG>getmouse</STRONG>                screen (input operation)
-            <STRONG>getn_wstr</STRONG>               screen (input operation)
-            <STRONG>getnstr</STRONG>                 screen (input operation)
-            <STRONG>getparx</STRONG>                 window
-            <STRONG>getpary</STRONG>                 window
-            <STRONG>getstr</STRONG>                  screen (input operation)
-            <STRONG>getwin</STRONG>                  screen (input operation)
-            <STRONG>halfdelay</STRONG>               screen
-            <STRONG>has_colors</STRONG>              terminal
-            <STRONG>has_ic</STRONG>                  terminal
-            <STRONG>has_il</STRONG>                  terminal
-            <STRONG>has_key</STRONG>                 screen
-            <STRONG>hline</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>hline_set</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>idcok</STRONG>                   window
-            <STRONG>idlok</STRONG>                   window
-            <STRONG>immedok</STRONG>                 window
-            <STRONG>in_wch</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>in_wchnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-
-            <STRONG>in_wchstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>inch</STRONG>                    window (<STRONG>stdscr</STRONG>)
-            <STRONG>inchnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>inchstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>init_color</STRONG>              screen
-            <STRONG>init_pair</STRONG>               screen
-            <STRONG>initscr</STRONG>                 global (locks screen list)
-            <STRONG>innstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>innwstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>ins_nwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>ins_wch</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>ins_wstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>insch</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>insdelln</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>insertln</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>insnstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>insstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>instr</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>intrflush</STRONG>               terminal
-            <STRONG>inwstr</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>is_cleared</STRONG>              window
-            <STRONG>is_idcok</STRONG>                window
-            <STRONG>is_idlok</STRONG>                window
-            <STRONG>is_immedok</STRONG>              window
-            <STRONG>is_keypad</STRONG>               window
-            <STRONG>is_leaveok</STRONG>              window
-            <STRONG>is_linetouched</STRONG>          window
-            <STRONG>is_nodelay</STRONG>              window
-            <STRONG>is_notimeout</STRONG>            window
-            <STRONG>is_scrollok</STRONG>             window
-            <STRONG>is_syncok</STRONG>               window
-            <STRONG>is_term_resized</STRONG>         terminal
-            <STRONG>is_wintouched</STRONG>           window
-            <STRONG>isendwin</STRONG>                screen
-            <STRONG>key_defined</STRONG>             screen
-            <STRONG>key_name</STRONG>                global (static data)
-            <STRONG>keybound</STRONG>                screen
-            <STRONG>keyname</STRONG>                 global (static data)
-            <STRONG>keyok</STRONG>                   screen
-            <STRONG>keypad</STRONG>                  window
-            <STRONG>killchar</STRONG>                terminal
-            <STRONG>killwchar</STRONG>               terminal
-            <STRONG>leaveok</STRONG>                 window
-            <STRONG>longname</STRONG>                screen
-            <STRONG>mcprint</STRONG>                 terminal
-            <STRONG>meta</STRONG>                    screen
-            <STRONG>mouse_trafo</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mouseinterval</STRONG>           screen
-            <STRONG>mousemask</STRONG>               screen
-            <STRONG>move</STRONG>                    window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvadd_wch</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvadd_wchnstr</STRONG>           window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvadd_wchstr</STRONG>            window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddch</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddnwstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvaddwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvchgat</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvcur</STRONG>                   screen
-            <STRONG>mvdelch</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvderwin</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvget_wch</STRONG>               screen (input operation)
-            <STRONG>mvget_wstr</STRONG>              screen (input operation)
-
-            <STRONG>mvgetch</STRONG>                 screen (input operation)
-            <STRONG>mvgetn_wstr</STRONG>             screen (input operation)
-            <STRONG>mvgetnstr</STRONG>               screen (input operation)
-            <STRONG>mvgetstr</STRONG>                screen (input operation)
-            <STRONG>mvhline</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvhline_set</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvin_wch</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvin_wchnstr</STRONG>            window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvin_wchstr</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinch</STRONG>                  window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinchnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinchstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinnwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvins_nwstr</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvins_wch</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvins_wstr</STRONG>              window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinsch</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinsnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinsstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvinwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvprintw</STRONG>                window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvscanw</STRONG>                 screen
-            <STRONG>mvvline</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvvline_set</STRONG>             window (<STRONG>stdscr</STRONG>)
-            <STRONG>mvwadd_wch</STRONG>              window
-            <STRONG>mvwadd_wchnstr</STRONG>          window
-            <STRONG>mvwadd_wchstr</STRONG>           window
-            <STRONG>mvwaddch</STRONG>                window
-            <STRONG>mvwaddchnstr</STRONG>            window
-            <STRONG>mvwaddchstr</STRONG>             window
-            <STRONG>mvwaddnstr</STRONG>              window
-            <STRONG>mvwaddnwstr</STRONG>             window
-            <STRONG>mvwaddstr</STRONG>               window
-            <STRONG>mvwaddwstr</STRONG>              window
-            <STRONG>mvwchgat</STRONG>                window
-            <STRONG>mvwdelch</STRONG>                window
-            <STRONG>mvwget_wch</STRONG>              screen (input operation)
-            <STRONG>mvwget_wstr</STRONG>             screen (input operation)
-            <STRONG>mvwgetch</STRONG>                screen (input operation)
-            <STRONG>mvwgetn_wstr</STRONG>            screen (input operation)
-            <STRONG>mvwgetnstr</STRONG>              screen (input operation)
-            <STRONG>mvwgetstr</STRONG>               screen (input operation)
-            <STRONG>mvwhline</STRONG>                window
-            <STRONG>mvwhline_set</STRONG>            window
-            <STRONG>mvwin</STRONG>                   window
-            <STRONG>mvwin_wch</STRONG>               window
-            <STRONG>mvwin_wchnstr</STRONG>           window
-            <STRONG>mvwin_wchstr</STRONG>            window
-            <STRONG>mvwinch</STRONG>                 window
-            <STRONG>mvwinchnstr</STRONG>             window
-            <STRONG>mvwinchstr</STRONG>              window
-            <STRONG>mvwinnstr</STRONG>               window
-            <STRONG>mvwinnwstr</STRONG>              window
-            <STRONG>mvwins_nwstr</STRONG>            window
-            <STRONG>mvwins_wch</STRONG>              window
-            <STRONG>mvwins_wstr</STRONG>             window
-            <STRONG>mvwinsch</STRONG>                window
-            <STRONG>mvwinsnstr</STRONG>              window
-            <STRONG>mvwinsstr</STRONG>               window
-            <STRONG>mvwinstr</STRONG>                window
-            <STRONG>mvwinwstr</STRONG>               window
-            <STRONG>mvwprintw</STRONG>               window
-            <STRONG>mvwscanw</STRONG>                screen
-            <STRONG>mvwvline</STRONG>                window
-
-            <STRONG>mvwvline_set</STRONG>            window
-            <STRONG>napms</STRONG>                   reentrant
-            <STRONG>newpad</STRONG>                  global (locks window list)
-            <STRONG>newscr</STRONG>                  screen (read-only)
-            <STRONG>newterm</STRONG>                 global (locks screen list)
-            <STRONG>newwin</STRONG>                  global (locks window list)
-            <STRONG>nl</STRONG>                      screen
-            <STRONG>nocbreak</STRONG>                screen
-            <STRONG>nodelay</STRONG>                 window
-            <STRONG>noecho</STRONG>                  screen
-            <STRONG>nofilter</STRONG>                global
-            <STRONG>nonl</STRONG>                    screen
-            <STRONG>noqiflush</STRONG>               terminal
-            <STRONG>noraw</STRONG>                   screen
-            <STRONG>notimeout</STRONG>               window
-            <STRONG>numcodes</STRONG>                global (read-only)
-            <STRONG>numfnames</STRONG>               global (read-only)
-            <STRONG>numnames</STRONG>                global (read-only)
-            <STRONG>ospeed</STRONG>                  global
-            <STRONG>overlay</STRONG>                 window (locks source, target)
-            <STRONG>overwrite</STRONG>               window (locks source, target)
-            <STRONG>pair_content</STRONG>            screen
-            <STRONG>pecho_wchar</STRONG>             screen
-            <STRONG>pechochar</STRONG>               screen
-            <STRONG>pnoutrefresh</STRONG>            screen
-            <STRONG>prefresh</STRONG>                screen
-            <STRONG>printw</STRONG>                  window
-            <STRONG>putp</STRONG>                    global
-            <STRONG>putwin</STRONG>                  window
-            <STRONG>qiflush</STRONG>                 terminal
-            <STRONG>raw</STRONG>                     screen
-            <STRONG>redrawwin</STRONG>               window
-            <STRONG>refresh</STRONG>                 screen
-            <STRONG>reset_prog_mode</STRONG>         screen
-            <STRONG>reset_shell_mode</STRONG>        screen
-            <STRONG>resetty</STRONG>                 terminal
-            <STRONG>resize_term</STRONG>             screen (locks window list)
-            <STRONG>resizeterm</STRONG>              screen
-            <STRONG>restartterm</STRONG>             screen
-            <STRONG>ripoffline</STRONG>              global (static data)
-            <STRONG>savetty</STRONG>                 terminal
-            <STRONG>scanw</STRONG>                   screen
-            <STRONG>scr_dump</STRONG>                screen
-            <STRONG>scr_init</STRONG>                screen
-            <STRONG>scr_restore</STRONG>             screen
-            <STRONG>scr_set</STRONG>                 screen
-            <STRONG>scrl</STRONG>                    window (<STRONG>stdscr</STRONG>)
-            <STRONG>scroll</STRONG>                  window
-            <STRONG>scrollok</STRONG>                window
-            <STRONG>set_curterm</STRONG>             screen
-            <STRONG>set_escdelay</STRONG>            screen
-            <STRONG>set_tabsize</STRONG>             screen
-            <STRONG>set_term</STRONG>                global (locks screen list, screen)
-            <STRONG>setcchar</STRONG>                reentrant
-            <STRONG>setscrreg</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>setupterm</STRONG>               global
-            <STRONG>slk_attr</STRONG>                screen
-            <STRONG>slk_attr_off</STRONG>            screen
-            <STRONG>slk_attr_on</STRONG>             screen
-            <STRONG>slk_attr_set</STRONG>            screen
-            <STRONG>slk_attroff</STRONG>             screen
-            <STRONG>slk_attron</STRONG>              screen
-            <STRONG>slk_attrset</STRONG>             screen
-            <STRONG>slk_clear</STRONG>               screen
-            <STRONG>slk_color</STRONG>               screen
-            <STRONG>slk_init</STRONG>                screen
-
-            <STRONG>slk_label</STRONG>               screen
-            <STRONG>slk_noutrefresh</STRONG>         screen
-            <STRONG>slk_refresh</STRONG>             screen
-            <STRONG>slk_restore</STRONG>             screen
-            <STRONG>slk_set</STRONG>                 screen
-            <STRONG>slk_touch</STRONG>               screen
-            <STRONG>slk_wset</STRONG>                screen
-            <STRONG>standend</STRONG>                window
-            <STRONG>standout</STRONG>                window
-            <STRONG>start_color</STRONG>             screen
-            <STRONG>stdscr</STRONG>                  screen (read-only)
-            <STRONG>strcodes</STRONG>                global (read-only)
-            <STRONG>strfnames</STRONG>               global (read-only)
-            <STRONG>strnames</STRONG>                global (read-only)
-            <STRONG>subpad</STRONG>                  window
-            <STRONG>subwin</STRONG>                  window
-            <STRONG>syncok</STRONG>                  window
-            <STRONG>term_attrs</STRONG>              screen
-            <STRONG>termattrs</STRONG>               screen
-            <STRONG>termname</STRONG>                terminal
-            <STRONG>tgetent</STRONG>                 global
-            <STRONG>tgetflag</STRONG>                global
-            <STRONG>tgetnum</STRONG>                 global
-            <STRONG>tgetstr</STRONG>                 global
-            <STRONG>tgoto</STRONG>                   global
-            <STRONG>tigetflag</STRONG>               terminal
-            <STRONG>tigetnum</STRONG>                terminal
-            <STRONG>tigetstr</STRONG>                terminal
-            <STRONG>timeout</STRONG>                 window (<STRONG>stdscr</STRONG>)
-            <STRONG>touchline</STRONG>               window
-            <STRONG>touchwin</STRONG>                window
-            <STRONG>tparm</STRONG>                   global (static data)
-            <STRONG>tputs</STRONG>                   screen
-            <STRONG>trace</STRONG>                   global (static data)
-            <STRONG>ttytype</STRONG>                 screen (read-only)
-            <STRONG>typeahead</STRONG>               screen
-            <STRONG>unctrl</STRONG>                  screen
-            <STRONG>unget_wch</STRONG>               screen (input operation)
-            <STRONG>ungetch</STRONG>                 screen (input operation)
-            <STRONG>ungetmouse</STRONG>              screen (input operation)
-            <STRONG>untouchwin</STRONG>              window
-            <STRONG>use_default_colors</STRONG>      screen
-            <STRONG>use_env</STRONG>                 global (static data)
-            <STRONG>use_extended_names</STRONG>      global (static data)
-            <STRONG>use_legacy_coding</STRONG>       screen
-            <STRONG>use_screen</STRONG>              global (locks screen list, screen)
-            <STRONG>use_window</STRONG>              global (locks window list, window)
-            <STRONG>vid_attr</STRONG>                screen
-            <STRONG>vid_puts</STRONG>                screen
-            <STRONG>vidattr</STRONG>                 screen
-            <STRONG>vidputs</STRONG>                 screen
-            <STRONG>vline</STRONG>                   window (<STRONG>stdscr</STRONG>)
-            <STRONG>vline_set</STRONG>               window (<STRONG>stdscr</STRONG>)
-            <STRONG>vw_printw</STRONG>               window
-            <STRONG>vw_scanw</STRONG>                screen
-            <STRONG>vwprintw</STRONG>                window
-            <STRONG>vwscanw</STRONG>                 screen
-            <STRONG>wadd_wch</STRONG>                window
-            <STRONG>wadd_wchnstr</STRONG>            window
-            <STRONG>wadd_wchstr</STRONG>             window
-            <STRONG>waddch</STRONG>                  window
-            <STRONG>waddchnstr</STRONG>              window
-            <STRONG>waddchstr</STRONG>               window
-            <STRONG>waddnstr</STRONG>                window
-            <STRONG>waddnwstr</STRONG>               window
-            <STRONG>waddstr</STRONG>                 window
-
-            <STRONG>waddwstr</STRONG>                window
-            <STRONG>wattr_get</STRONG>               window
-            <STRONG>wattr_off</STRONG>               window
-            <STRONG>wattr_on</STRONG>                window
-            <STRONG>wattr_set</STRONG>               window
-            <STRONG>wattroff</STRONG>                window
-            <STRONG>wattron</STRONG>                 window
-            <STRONG>wattrset</STRONG>                window
-            <STRONG>wbkgd</STRONG>                   window
-            <STRONG>wbkgdset</STRONG>                window
-            <STRONG>wbkgrnd</STRONG>                 window
-            <STRONG>wbkgrndset</STRONG>              window
-            <STRONG>wborder</STRONG>                 window
-            <STRONG>wborder_set</STRONG>             window
-            <STRONG>wchgat</STRONG>                  window
-            <STRONG>wclear</STRONG>                  window
-            <STRONG>wclrtobot</STRONG>               window
-            <STRONG>wclrtoeol</STRONG>               window
-            <STRONG>wcolor_set</STRONG>              window
-            <STRONG>wcursyncup</STRONG>              screen (affects window plus parents)
-            <STRONG>wdelch</STRONG>                  window
-            <STRONG>wdeleteln</STRONG>               window
-            <STRONG>wecho_wchar</STRONG>             window
-            <STRONG>wechochar</STRONG>               window
-            <STRONG>wenclose</STRONG>                window
-            <STRONG>werase</STRONG>                  window
-            <STRONG>wget_wch</STRONG>                screen (input operation)
-            <STRONG>wget_wstr</STRONG>               screen (input operation)
-            <STRONG>wgetbkgrnd</STRONG>              window
-            <STRONG>wgetch</STRONG>                  screen (input operation)
-            <STRONG>wgetdelay</STRONG>               window
-            <STRONG>wgetn_wstr</STRONG>              screen (input operation)
-            <STRONG>wgetnstr</STRONG>                screen (input operation)
-            <STRONG>wgetparent</STRONG>              window
-            <STRONG>wgetscrreg</STRONG>              window
-            <STRONG>wgetstr</STRONG>                 screen (input operation)
-            <STRONG>whline</STRONG>                  window
-            <STRONG>whline_set</STRONG>              window
-            <STRONG>win_wch</STRONG>                 window
-            <STRONG>win_wchnstr</STRONG>             window
-            <STRONG>win_wchstr</STRONG>              window
-            <STRONG>winch</STRONG>                   window
-            <STRONG>winchnstr</STRONG>               window
-            <STRONG>winchstr</STRONG>                window
-            <STRONG>winnstr</STRONG>                 window
-            <STRONG>winnwstr</STRONG>                window
-            <STRONG>wins_nwstr</STRONG>              window
-            <STRONG>wins_wch</STRONG>                window
-            <STRONG>wins_wstr</STRONG>               window
-            <STRONG>winsch</STRONG>                  window
-            <STRONG>winsdelln</STRONG>               window
-            <STRONG>winsertln</STRONG>               window
-            <STRONG>winsnstr</STRONG>                window
-            <STRONG>winsstr</STRONG>                 window
-            <STRONG>winstr</STRONG>                  window
-            <STRONG>winwstr</STRONG>                 window
-            <STRONG>wmouse_trafo</STRONG>            window
-            <STRONG>wmove</STRONG>                   window
-            <STRONG>wnoutrefresh</STRONG>            screen
-            <STRONG>wprintw</STRONG>                 window
-            <STRONG>wredrawln</STRONG>               window
-            <STRONG>wrefresh</STRONG>                screen
-            <STRONG>wresize</STRONG>                 window (locks window list)
-            <STRONG>wscanw</STRONG>                  screen
-            <STRONG>wscrl</STRONG>                   window
-            <STRONG>wsetscrreg</STRONG>              window
-
-            <STRONG>wstandend</STRONG>               window
-            <STRONG>wstandout</STRONG>               window
-            <STRONG>wsyncdown</STRONG>               screen (affects window plus parents)
-            <STRONG>wsyncup</STRONG>                 screen (affects window plus parents)
-            <STRONG>wtimeout</STRONG>                window
-            <STRONG>wtouchln</STRONG>                window
-            <STRONG>wunctrl</STRONG>                 global (static data)
-            <STRONG>wvline</STRONG>                  window
-            <STRONG>wvline_set</STRONG>              window
+       <STRONG>Symbol</STRONG>                 <STRONG>Scope</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>BC</STRONG>                     global
+       <STRONG>COLORS</STRONG>                 screen (read-only)
+       <STRONG>COLOR_PAIR</STRONG>             reentrant
+       <STRONG>COLOR_PAIRS</STRONG>            screen (read-only)
+       <STRONG>COLS</STRONG>                   screen (read-only)
+       <STRONG>ESCDELAY</STRONG>               screen (read-only; see <STRONG>set_escdelay</STRONG>)
+       <STRONG>LINES</STRONG>                  screen (read-only)
+       <STRONG>PAIR_NUMBER</STRONG>            reentrant
+       <STRONG>PC</STRONG>                     global
+       <STRONG>SP</STRONG>                     global
+       <STRONG>TABSIZE</STRONG>                screen (read-only; see <STRONG>set_tabsize</STRONG>)
+       <STRONG>UP</STRONG>                     global
+       <STRONG>acs_map</STRONG>                screen (read-only)
+       <STRONG>add_wch</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>add_wchnstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>add_wchstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>addch</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>addchnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>addchstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>addnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>addnwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>addstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>addwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>assume_default_colors</STRONG>  screen
+       <STRONG>attr_get</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>attr_off</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>attr_on</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>attr_set</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>attroff</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>attron</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>attrset</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>baudrate</STRONG>               screen
+       <STRONG>beep</STRONG>                   screen
+       <STRONG>bkgd</STRONG>                   window (<STRONG>stdscr</STRONG>)
+       <STRONG>bkgdset</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>bkgrnd</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>bkgrndset</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>boolcodes</STRONG>              global (read-only)
+       <STRONG>boolfnames</STRONG>             global (read-only)
+       <STRONG>boolnames</STRONG>              global (read-only)
+       <STRONG>border</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>border_set</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>box</STRONG>                    window (<STRONG>stdscr</STRONG>)
+       <STRONG>box_set</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>can_change_color</STRONG>       terminal
+       <STRONG>cbreak</STRONG>                 screen
+
+       <STRONG>chgat</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>clear</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>clearok</STRONG>                window
+       <STRONG>clrtobot</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>clrtoeol</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>color_content</STRONG>          screen
+       <STRONG>color_set</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>copywin</STRONG>                window (locks source, target)
+       <STRONG>cur_term</STRONG>               terminal
+       <STRONG>curs_set</STRONG>               screen
+       <STRONG>curscr</STRONG>                 screen (read-only)
+       <STRONG>curses_version</STRONG>         global (read-only)
+       <STRONG>def_prog_mode</STRONG>          terminal
+       <STRONG>def_shell_mode</STRONG>         terminal
+       <STRONG>define_key</STRONG>             screen
+       <STRONG>del_curterm</STRONG>            screen
+       <STRONG>delay_output</STRONG>           screen
+       <STRONG>delch</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>deleteln</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>delscreen</STRONG>              global (locks screen list, screen)
+       <STRONG>delwin</STRONG>                 global (locks window list)
+       <STRONG>derwin</STRONG>                 screen
+       <STRONG>doupdate</STRONG>               screen
+       <STRONG>dupwin</STRONG>                 screen (locks window)
+       <STRONG>echo</STRONG>                   screen
+       <STRONG>echo_wchar</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>echochar</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>endwin</STRONG>                 screen
+       <STRONG>erase</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>erasechar</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>erasewchar</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>filter</STRONG>                 global
+       <STRONG>flash</STRONG>                  terminal
+       <STRONG>flushinp</STRONG>               screen
+       <STRONG>get_wch</STRONG>                screen (input operation)
+       <STRONG>get_wstr</STRONG>               screen (input operation)
+       <STRONG>getattrs</STRONG>               window
+       <STRONG>getbegx</STRONG>                window
+       <STRONG>getbegy</STRONG>                window
+       <STRONG>getbkgd</STRONG>                window
+       <STRONG>getbkgrnd</STRONG>              window
+       <STRONG>getcchar</STRONG>               reentrant
+       <STRONG>getch</STRONG>                  screen (input operation)
+       <STRONG>getcurx</STRONG>                window
+       <STRONG>getcury</STRONG>                window
+       <STRONG>getmaxx</STRONG>                window
+       <STRONG>getmaxy</STRONG>                window
+       <STRONG>getmouse</STRONG>               screen (input operation)
+       <STRONG>getn_wstr</STRONG>              screen (input operation)
+       <STRONG>getnstr</STRONG>                screen (input operation)
+       <STRONG>getparx</STRONG>                window
+       <STRONG>getpary</STRONG>                window
+       <STRONG>getstr</STRONG>                 screen (input operation)
+       <STRONG>getwin</STRONG>                 screen (input operation)
+       <STRONG>halfdelay</STRONG>              screen
+       <STRONG>has_colors</STRONG>             terminal
+       <STRONG>has_ic</STRONG>                 terminal
+       <STRONG>has_il</STRONG>                 terminal
+       <STRONG>has_key</STRONG>                screen
+       <STRONG>hline</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>hline_set</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>idcok</STRONG>                  window
+       <STRONG>idlok</STRONG>                  window
+       <STRONG>immedok</STRONG>                window
+       <STRONG>in_wch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>in_wchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+
+       <STRONG>in_wchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>inch</STRONG>                   window (<STRONG>stdscr</STRONG>)
+       <STRONG>inchnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>inchstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>init_color</STRONG>             screen
+       <STRONG>init_pair</STRONG>              screen
+       <STRONG>initscr</STRONG>                global (locks screen list)
+       <STRONG>innstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>innwstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>ins_nwstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>ins_wch</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>ins_wstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>insch</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>insdelln</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>insertln</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>insnstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>insstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>instr</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>intrflush</STRONG>              terminal
+       <STRONG>inwstr</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>is_cleared</STRONG>             window
+       <STRONG>is_idcok</STRONG>               window
+       <STRONG>is_idlok</STRONG>               window
+       <STRONG>is_immedok</STRONG>             window
+       <STRONG>is_keypad</STRONG>              window
+       <STRONG>is_leaveok</STRONG>             window
+       <STRONG>is_linetouched</STRONG>         window
+       <STRONG>is_nodelay</STRONG>             window
+       <STRONG>is_notimeout</STRONG>           window
+       <STRONG>is_scrollok</STRONG>            window
+       <STRONG>is_syncok</STRONG>              window
+       <STRONG>is_term_resized</STRONG>        terminal
+       <STRONG>is_wintouched</STRONG>          window
+       <STRONG>isendwin</STRONG>               screen
+       <STRONG>key_defined</STRONG>            screen
+       <STRONG>key_name</STRONG>               global (static data)
+       <STRONG>keybound</STRONG>               screen
+       <STRONG>keyname</STRONG>                global (static data)
+       <STRONG>keyok</STRONG>                  screen
+       <STRONG>keypad</STRONG>                 window
+       <STRONG>killchar</STRONG>               terminal
+       <STRONG>killwchar</STRONG>              terminal
+       <STRONG>leaveok</STRONG>                window
+       <STRONG>longname</STRONG>               screen
+       <STRONG>mcprint</STRONG>                terminal
+       <STRONG>meta</STRONG>                   screen
+       <STRONG>mouse_trafo</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mouseinterval</STRONG>          screen
+       <STRONG>mousemask</STRONG>              screen
+       <STRONG>move</STRONG>                   window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvadd_wch</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvadd_wchnstr</STRONG>          window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvadd_wchstr</STRONG>           window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddch</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddchnstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddchstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddnwstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvaddwstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvchgat</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvcur</STRONG>                  screen
+       <STRONG>mvdelch</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvderwin</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvget_wch</STRONG>              screen (input operation)
+       <STRONG>mvget_wstr</STRONG>             screen (input operation)
+
+       <STRONG>mvgetch</STRONG>                screen (input operation)
+       <STRONG>mvgetn_wstr</STRONG>            screen (input operation)
+       <STRONG>mvgetnstr</STRONG>              screen (input operation)
+       <STRONG>mvgetstr</STRONG>               screen (input operation)
+       <STRONG>mvhline</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvhline_set</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvin_wch</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvin_wchnstr</STRONG>           window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvin_wchstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinch</STRONG>                 window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinchnstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinchstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinnstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinnwstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvins_nwstr</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvins_wch</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvins_wstr</STRONG>             window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinsch</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinsnstr</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinsstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinstr</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvinwstr</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvprintw</STRONG>               window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvscanw</STRONG>                screen
+       <STRONG>mvvline</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvvline_set</STRONG>            window (<STRONG>stdscr</STRONG>)
+       <STRONG>mvwadd_wch</STRONG>             window
+       <STRONG>mvwadd_wchnstr</STRONG>         window
+       <STRONG>mvwadd_wchstr</STRONG>          window
+       <STRONG>mvwaddch</STRONG>               window
+       <STRONG>mvwaddchnstr</STRONG>           window
+       <STRONG>mvwaddchstr</STRONG>            window
+       <STRONG>mvwaddnstr</STRONG>             window
+       <STRONG>mvwaddnwstr</STRONG>            window
+       <STRONG>mvwaddstr</STRONG>              window
+       <STRONG>mvwaddwstr</STRONG>             window
+       <STRONG>mvwchgat</STRONG>               window
+       <STRONG>mvwdelch</STRONG>               window
+       <STRONG>mvwget_wch</STRONG>             screen (input operation)
+       <STRONG>mvwget_wstr</STRONG>            screen (input operation)
+       <STRONG>mvwgetch</STRONG>               screen (input operation)
+       <STRONG>mvwgetn_wstr</STRONG>           screen (input operation)
+       <STRONG>mvwgetnstr</STRONG>             screen (input operation)
+       <STRONG>mvwgetstr</STRONG>              screen (input operation)
+       <STRONG>mvwhline</STRONG>               window
+       <STRONG>mvwhline_set</STRONG>           window
+       <STRONG>mvwin</STRONG>                  window
+       <STRONG>mvwin_wch</STRONG>              window
+       <STRONG>mvwin_wchnstr</STRONG>          window
+       <STRONG>mvwin_wchstr</STRONG>           window
+       <STRONG>mvwinch</STRONG>                window
+       <STRONG>mvwinchnstr</STRONG>            window
+       <STRONG>mvwinchstr</STRONG>             window
+       <STRONG>mvwinnstr</STRONG>              window
+       <STRONG>mvwinnwstr</STRONG>             window
+       <STRONG>mvwins_nwstr</STRONG>           window
+       <STRONG>mvwins_wch</STRONG>             window
+       <STRONG>mvwins_wstr</STRONG>            window
+       <STRONG>mvwinsch</STRONG>               window
+       <STRONG>mvwinsnstr</STRONG>             window
+       <STRONG>mvwinsstr</STRONG>              window
+       <STRONG>mvwinstr</STRONG>               window
+       <STRONG>mvwinwstr</STRONG>              window
+       <STRONG>mvwprintw</STRONG>              window
+       <STRONG>mvwscanw</STRONG>               screen
+       <STRONG>mvwvline</STRONG>               window
+
+       <STRONG>mvwvline_set</STRONG>           window
+       <STRONG>napms</STRONG>                  reentrant
+       <STRONG>newpad</STRONG>                 global (locks window list)
+       <STRONG>newscr</STRONG>                 screen (read-only)
+       <STRONG>newterm</STRONG>                global (locks screen list)
+       <STRONG>newwin</STRONG>                 global (locks window list)
+       <STRONG>nl</STRONG>                     screen
+       <STRONG>nocbreak</STRONG>               screen
+       <STRONG>nodelay</STRONG>                window
+       <STRONG>noecho</STRONG>                 screen
+       <STRONG>nofilter</STRONG>               global
+       <STRONG>nonl</STRONG>                   screen
+       <STRONG>noqiflush</STRONG>              terminal
+       <STRONG>noraw</STRONG>                  screen
+       <STRONG>notimeout</STRONG>              window
+       <STRONG>numcodes</STRONG>               global (read-only)
+       <STRONG>numfnames</STRONG>              global (read-only)
+       <STRONG>numnames</STRONG>               global (read-only)
+       <STRONG>ospeed</STRONG>                 global
+       <STRONG>overlay</STRONG>                window (locks source, target)
+       <STRONG>overwrite</STRONG>              window (locks source, target)
+       <STRONG>pair_content</STRONG>           screen
+       <STRONG>pecho_wchar</STRONG>            screen
+       <STRONG>pechochar</STRONG>              screen
+       <STRONG>pnoutrefresh</STRONG>           screen
+       <STRONG>prefresh</STRONG>               screen
+       <STRONG>printw</STRONG>                 window
+       <STRONG>putp</STRONG>                   global
+       <STRONG>putwin</STRONG>                 window
+       <STRONG>qiflush</STRONG>                terminal
+       <STRONG>raw</STRONG>                    screen
+       <STRONG>redrawwin</STRONG>              window
+       <STRONG>refresh</STRONG>                screen
+       <STRONG>reset_prog_mode</STRONG>        screen
+       <STRONG>reset_shell_mode</STRONG>       screen
+       <STRONG>resetty</STRONG>                terminal
+       <STRONG>resize_term</STRONG>            screen (locks window list)
+       <STRONG>resizeterm</STRONG>             screen
+       <STRONG>restartterm</STRONG>            screen
+       <STRONG>ripoffline</STRONG>             global (static data)
+       <STRONG>savetty</STRONG>                terminal
+       <STRONG>scanw</STRONG>                  screen
+       <STRONG>scr_dump</STRONG>               screen
+       <STRONG>scr_init</STRONG>               screen
+       <STRONG>scr_restore</STRONG>            screen
+       <STRONG>scr_set</STRONG>                screen
+       <STRONG>scrl</STRONG>                   window (<STRONG>stdscr</STRONG>)
+       <STRONG>scroll</STRONG>                 window
+       <STRONG>scrollok</STRONG>               window
+       <STRONG>set_curterm</STRONG>            screen
+       <STRONG>set_escdelay</STRONG>           screen
+       <STRONG>set_tabsize</STRONG>            screen
+       <STRONG>set_term</STRONG>               global (locks screen list, screen)
+       <STRONG>setcchar</STRONG>               reentrant
+       <STRONG>setscrreg</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>setupterm</STRONG>              global
+       <STRONG>slk_attr</STRONG>               screen
+       <STRONG>slk_attr_off</STRONG>           screen
+       <STRONG>slk_attr_on</STRONG>            screen
+       <STRONG>slk_attr_set</STRONG>           screen
+       <STRONG>slk_attroff</STRONG>            screen
+       <STRONG>slk_attron</STRONG>             screen
+       <STRONG>slk_attrset</STRONG>            screen
+       <STRONG>slk_clear</STRONG>              screen
+       <STRONG>slk_color</STRONG>              screen
+       <STRONG>slk_init</STRONG>               screen
+
+       <STRONG>slk_label</STRONG>              screen
+       <STRONG>slk_noutrefresh</STRONG>        screen
+       <STRONG>slk_refresh</STRONG>            screen
+       <STRONG>slk_restore</STRONG>            screen
+       <STRONG>slk_set</STRONG>                screen
+       <STRONG>slk_touch</STRONG>              screen
+       <STRONG>slk_wset</STRONG>               screen
+       <STRONG>standend</STRONG>               window
+       <STRONG>standout</STRONG>               window
+       <STRONG>start_color</STRONG>            screen
+       <STRONG>stdscr</STRONG>                 screen (read-only)
+       <STRONG>strcodes</STRONG>               global (read-only)
+       <STRONG>strfnames</STRONG>              global (read-only)
+       <STRONG>strnames</STRONG>               global (read-only)
+       <STRONG>subpad</STRONG>                 window
+       <STRONG>subwin</STRONG>                 window
+       <STRONG>syncok</STRONG>                 window
+       <STRONG>term_attrs</STRONG>             screen
+       <STRONG>termattrs</STRONG>              screen
+       <STRONG>termname</STRONG>               terminal
+       <STRONG>tgetent</STRONG>                global
+       <STRONG>tgetflag</STRONG>               global
+       <STRONG>tgetnum</STRONG>                global
+       <STRONG>tgetstr</STRONG>                global
+       <STRONG>tgoto</STRONG>                  global
+       <STRONG>tigetflag</STRONG>              terminal
+       <STRONG>tigetnum</STRONG>               terminal
+       <STRONG>tigetstr</STRONG>               terminal
+       <STRONG>timeout</STRONG>                window (<STRONG>stdscr</STRONG>)
+       <STRONG>touchline</STRONG>              window
+       <STRONG>touchwin</STRONG>               window
+       <STRONG>tparm</STRONG>                  global (static data)
+       <STRONG>tputs</STRONG>                  screen
+       <STRONG>trace</STRONG>                  global (static data)
+       <STRONG>ttytype</STRONG>                screen (read-only)
+       <STRONG>typeahead</STRONG>              screen
+       <STRONG>unctrl</STRONG>                 screen
+       <STRONG>unget_wch</STRONG>              screen (input operation)
+       <STRONG>ungetch</STRONG>                screen (input operation)
+       <STRONG>ungetmouse</STRONG>             screen (input operation)
+       <STRONG>untouchwin</STRONG>             window
+       <STRONG>use_default_colors</STRONG>     screen
+       <STRONG>use_env</STRONG>                global (static data)
+       <STRONG>use_extended_names</STRONG>     global (static data)
+       <STRONG>use_legacy_coding</STRONG>      screen
+       <STRONG>use_screen</STRONG>             global (locks screen list, screen)
+       <STRONG>use_window</STRONG>             global (locks window list, window)
+       <STRONG>vid_attr</STRONG>               screen
+       <STRONG>vid_puts</STRONG>               screen
+       <STRONG>vidattr</STRONG>                screen
+       <STRONG>vidputs</STRONG>                screen
+       <STRONG>vline</STRONG>                  window (<STRONG>stdscr</STRONG>)
+       <STRONG>vline_set</STRONG>              window (<STRONG>stdscr</STRONG>)
+       <STRONG>vw_printw</STRONG>              window
+       <STRONG>vw_scanw</STRONG>               screen
+       <STRONG>vwprintw</STRONG>               window
+       <STRONG>vwscanw</STRONG>                screen
+       <STRONG>wadd_wch</STRONG>               window
+       <STRONG>wadd_wchnstr</STRONG>           window
+       <STRONG>wadd_wchstr</STRONG>            window
+       <STRONG>waddch</STRONG>                 window
+       <STRONG>waddchnstr</STRONG>             window
+       <STRONG>waddchstr</STRONG>              window
+       <STRONG>waddnstr</STRONG>               window
+       <STRONG>waddnwstr</STRONG>              window
+       <STRONG>waddstr</STRONG>                window
+
+       <STRONG>waddwstr</STRONG>               window
+       <STRONG>wattr_get</STRONG>              window
+       <STRONG>wattr_off</STRONG>              window
+       <STRONG>wattr_on</STRONG>               window
+       <STRONG>wattr_set</STRONG>              window
+       <STRONG>wattroff</STRONG>               window
+       <STRONG>wattron</STRONG>                window
+       <STRONG>wattrset</STRONG>               window
+       <STRONG>wbkgd</STRONG>                  window
+       <STRONG>wbkgdset</STRONG>               window
+       <STRONG>wbkgrnd</STRONG>                window
+       <STRONG>wbkgrndset</STRONG>             window
+       <STRONG>wborder</STRONG>                window
+       <STRONG>wborder_set</STRONG>            window
+       <STRONG>wchgat</STRONG>                 window
+       <STRONG>wclear</STRONG>                 window
+       <STRONG>wclrtobot</STRONG>              window
+       <STRONG>wclrtoeol</STRONG>              window
+       <STRONG>wcolor_set</STRONG>             window
+       <STRONG>wcursyncup</STRONG>             screen (affects window plus parents)
+       <STRONG>wdelch</STRONG>                 window
+       <STRONG>wdeleteln</STRONG>              window
+       <STRONG>wecho_wchar</STRONG>            window
+       <STRONG>wechochar</STRONG>              window
+       <STRONG>wenclose</STRONG>               window
+       <STRONG>werase</STRONG>                 window
+       <STRONG>wget_wch</STRONG>               screen (input operation)
+       <STRONG>wget_wstr</STRONG>              screen (input operation)
+       <STRONG>wgetbkgrnd</STRONG>             window
+       <STRONG>wgetch</STRONG>                 screen (input operation)
+       <STRONG>wgetdelay</STRONG>              window
+       <STRONG>wgetn_wstr</STRONG>             screen (input operation)
+       <STRONG>wgetnstr</STRONG>               screen (input operation)
+       <STRONG>wgetparent</STRONG>             window
+       <STRONG>wgetscrreg</STRONG>             window
+       <STRONG>wgetstr</STRONG>                screen (input operation)
+       <STRONG>whline</STRONG>                 window
+       <STRONG>whline_set</STRONG>             window
+       <STRONG>win_wch</STRONG>                window
+       <STRONG>win_wchnstr</STRONG>            window
+       <STRONG>win_wchstr</STRONG>             window
+       <STRONG>winch</STRONG>                  window
+       <STRONG>winchnstr</STRONG>              window
+       <STRONG>winchstr</STRONG>               window
+       <STRONG>winnstr</STRONG>                window
+       <STRONG>winnwstr</STRONG>               window
+       <STRONG>wins_nwstr</STRONG>             window
+       <STRONG>wins_wch</STRONG>               window
+       <STRONG>wins_wstr</STRONG>              window
+       <STRONG>winsch</STRONG>                 window
+       <STRONG>winsdelln</STRONG>              window
+       <STRONG>winsertln</STRONG>              window
+       <STRONG>winsnstr</STRONG>               window
+       <STRONG>winsstr</STRONG>                window
+       <STRONG>winstr</STRONG>                 window
+       <STRONG>winwstr</STRONG>                window
+       <STRONG>wmouse_trafo</STRONG>           window
+       <STRONG>wmove</STRONG>                  window
+       <STRONG>wnoutrefresh</STRONG>           screen
+       <STRONG>wprintw</STRONG>                window
+       <STRONG>wredrawln</STRONG>              window
+       <STRONG>wrefresh</STRONG>               screen
+       <STRONG>wresize</STRONG>                window (locks window list)
+       <STRONG>wscanw</STRONG>                 screen
+       <STRONG>wscrl</STRONG>                  window
+       <STRONG>wsetscrreg</STRONG>             window
+
+       <STRONG>wstandend</STRONG>              window
+       <STRONG>wstandout</STRONG>              window
+       <STRONG>wsyncdown</STRONG>              screen (affects window plus parents)
+       <STRONG>wsyncup</STRONG>                screen (affects window plus parents)
+       <STRONG>wtimeout</STRONG>               window
+       <STRONG>wtouchln</STRONG>               window
+       <STRONG>wunctrl</STRONG>                global (static data)
+       <STRONG>wvline</STRONG>                 window
+       <STRONG>wvline_set</STRONG>             window
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -619,7 +617,7 @@ <H1 class="no-header">curs_threads 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index bf2818203..03274343e 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -28,7 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: curs_variables.3x,v 1.43 2024/01/05 21:46:58 tom Exp @
-  * SVID 4, Volume 3, p. 408
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index fa6d88ac2..623208562 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.54 2023/12/23 16:08:25 tom Exp @
+  * @Id: form_driver.3x,v 1.57 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -88,66 +88,66 @@ <H1 class="no-header">form_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        The form driver requests are as follows:
 
        <STRONG>Name</STRONG>               <STRONG>Description</STRONG>
-       ---------------------------------------------------------------------
-       REQ_BEG_FIELD      Move to the beginning of the field.
-       REQ_BEG_LINE       Move to the beginning of the line.
-       REQ_CLR_EOF        Clear to end of field from cursor.
-       REQ_CLR_EOL        Clear to end of line from cursor.
-       REQ_CLR_FIELD      Clear the entire field.
-       REQ_DEL_CHAR       Delete character at the cursor.
-       REQ_DEL_LINE       Delete line at the cursor.
-       REQ_DEL_PREV       Delete character before the cursor.
-       REQ_DEL_WORD       Delete blank-delimited word at the cursor.
-       REQ_DOWN_CHAR      Move down in the field.
-       REQ_DOWN_FIELD     Move down to a field.
-       REQ_END_FIELD      Move to the end of the field.
-       REQ_END_LINE       Move to the end of the line.
-       REQ_FIRST_FIELD    Move to the first field.
-       REQ_FIRST_PAGE     Move to the first page.
-       REQ_INS_CHAR       Insert a blank at the cursor.
-       REQ_INS_LINE       Insert a blank line at the cursor.
-       REQ_INS_MODE       Enter insert mode.
-       REQ_LAST_FIELD     Move to the last field.
-       REQ_LAST_PAGE      Move to the last field.
-       REQ_LEFT_CHAR      Move left in the field.
-       REQ_LEFT_FIELD     Move left to a field.
-       REQ_NEW_LINE       Insert or overlay a new line.
-       REQ_NEXT_CHAR      Move to the next char.
-
-       REQ_NEXT_CHOICE    Display next field choice.
-       REQ_NEXT_FIELD     Move to the next field.
-       REQ_NEXT_LINE      Move to the next line.
-       REQ_NEXT_PAGE      Move to the next page.
-       REQ_NEXT_PAGE      Move to the next page.
-       REQ_NEXT_WORD      Move to the next word.
-       REQ_OVL_MODE       Enter overlay mode.
-       REQ_PREV_CHAR      Move to the previous char.
-       REQ_PREV_CHOICE    Display previous field choice.
-       REQ_PREV_FIELD     Move to the previous field.
-       REQ_PREV_LINE      Move to the previous line.
-       REQ_PREV_PAGE      Move to the previous page.
-       REQ_PREV_WORD      Move to the previous word.
-       REQ_RIGHT_CHAR     Move right in the field.
-       REQ_RIGHT_FIELD    Move right to a field.
-       REQ_SCR_BCHAR      Scroll the field backward a character.
-       REQ_SCR_BHPAGE     Scroll the field backward half a page.
-       REQ_SCR_BLINE      Scroll the field backward a line.
-       REQ_SCR_BPAGE      Scroll the field backward a page.
-       REQ_SCR_FCHAR      Scroll the field forward a character.
-       REQ_SCR_FHPAGE     Scroll the field forward half a page.
-       REQ_SCR_FLINE      Scroll the field forward a line.
-       REQ_SCR_FPAGE      Scroll the field forward a page.
-       REQ_SCR_HBHALF     Horizontal scroll the field backward half a line.
-       REQ_SCR_HBLINE     Horizontal scroll the field backward a line.
-       REQ_SCR_HFHALF     Horizontal scroll the field forward half a line.
-       REQ_SCR_HFLINE     Horizontal scroll the field forward a line.
-       REQ_SFIRST_FIELD   Move to the sorted first field.
-       REQ_SLAST_FIELD    Move to the sorted last field.
-       REQ_SNEXT_FIELD    Move to the sorted next field.
-       REQ_SPREV_FIELD    Move to the sorted previous field.
-       REQ_UP_CHAR        Move up in the field.
-       REQ_UP_FIELD       Move up to a field.
-       REQ_VALIDATION     Validate field.
+       ------------------------------------------------------------------------
+       <STRONG>REQ_BEG_FIELD</STRONG>      Move to beginning of field.
+       <STRONG>REQ_BEG_LINE</STRONG>       Move to beginning of the line.
+       <STRONG>REQ_CLR_EOF</STRONG>        Clear to end of field from cursor.
+       <STRONG>REQ_CLR_EOL</STRONG>        Clear to end of line from cursor.
+       <STRONG>REQ_CLR_FIELD</STRONG>      Clear the entire field.
+       <STRONG>REQ_DEL_CHAR</STRONG>       Delete character at the cursor.
+       <STRONG>REQ_DEL_LINE</STRONG>       Delete line at the cursor.
+       <STRONG>REQ_DEL_PREV</STRONG>       Delete character before the cursor.
+       <STRONG>REQ_DEL_WORD</STRONG>       Delete blank-delimited word at cursor.
+       <STRONG>REQ_DOWN_CHAR</STRONG>      Move down in field.
+       <STRONG>REQ_DOWN_FIELD</STRONG>     Move down to a field.
+       <STRONG>REQ_END_FIELD</STRONG>      Move to the end of field.
+       <STRONG>REQ_END_LINE</STRONG>       Move to the end of the line.
+       <STRONG>REQ_FIRST_FIELD</STRONG>    Move to the first field.
+       <STRONG>REQ_FIRST_PAGE</STRONG>     Move to the first page.
+       <STRONG>REQ_INS_CHAR</STRONG>       Insert a blank at the cursor.
+       <STRONG>REQ_INS_LINE</STRONG>       Insert a blank line at the cursor.
+       <STRONG>REQ_INS_MODE</STRONG>       Enter insert mode.
+       <STRONG>REQ_LAST_FIELD</STRONG>     Move to the last field.
+       <STRONG>REQ_LAST_PAGE</STRONG>      Move to the last field.
+       <STRONG>REQ_LEFT_CHAR</STRONG>      Move left in field.
+       <STRONG>REQ_LEFT_FIELD</STRONG>     Move left to a field.
+       <STRONG>REQ_NEW_LINE</STRONG>       Insert or overlay a new line.
+       <STRONG>REQ_NEXT_CHAR</STRONG>      Move to the next char.
+
+       <STRONG>REQ_NEXT_CHOICE</STRONG>    Display next field choice.
+       <STRONG>REQ_NEXT_FIELD</STRONG>     Move to the next field.
+       <STRONG>REQ_NEXT_LINE</STRONG>      Move to the next line.
+       <STRONG>REQ_NEXT_PAGE</STRONG>      Move to the next page.
+       <STRONG>REQ_NEXT_PAGE</STRONG>      Move to the next page.
+       <STRONG>REQ_NEXT_WORD</STRONG>      Move to the next word.
+       <STRONG>REQ_OVL_MODE</STRONG>       Enter overlay mode.
+       <STRONG>REQ_PREV_CHAR</STRONG>      Move to the previous char.
+       <STRONG>REQ_PREV_CHOICE</STRONG>    Display previous field choice.
+       <STRONG>REQ_PREV_FIELD</STRONG>     Move to the previous field.
+       <STRONG>REQ_PREV_LINE</STRONG>      Move to the previous line.
+       <STRONG>REQ_PREV_PAGE</STRONG>      Move to the previous page.
+       <STRONG>REQ_PREV_WORD</STRONG>      Move to the previous word.
+       <STRONG>REQ_RIGHT_CHAR</STRONG>     Move right in field.
+       <STRONG>REQ_RIGHT_FIELD</STRONG>    Move right to a field.
+       <STRONG>REQ_SCR_BCHAR</STRONG>      Scroll field backward 1 character.
+       <STRONG>REQ_SCR_BHPAGE</STRONG>     Scroll field backward 1/2 page.
+       <STRONG>REQ_SCR_BLINE</STRONG>      Scroll field backward 1 line.
+       <STRONG>REQ_SCR_BPAGE</STRONG>      Scroll field backward 1 page.
+       <STRONG>REQ_SCR_FCHAR</STRONG>      Scroll field forward 1 character.
+       <STRONG>REQ_SCR_FHPAGE</STRONG>     Scroll field forward 1/2 page.
+       <STRONG>REQ_SCR_FLINE</STRONG>      Scroll field forward 1 line.
+       <STRONG>REQ_SCR_FPAGE</STRONG>      Scroll field forward 1 page.
+       <STRONG>REQ_SCR_HBHALF</STRONG>     Horizontal scroll field backward 1/2 line.
+       <STRONG>REQ_SCR_HBLINE</STRONG>     Horizontal scroll field backward 1 line.
+       <STRONG>REQ_SCR_HFHALF</STRONG>     Horizontal scroll field forward 1/2 line.
+       <STRONG>REQ_SCR_HFLINE</STRONG>     Horizontal scroll field forward 1 line.
+       <STRONG>REQ_SFIRST_FIELD</STRONG>   Move to the sorted first field.
+       <STRONG>REQ_SLAST_FIELD</STRONG>    Move to the sorted last field.
+       <STRONG>REQ_SNEXT_FIELD</STRONG>    Move to the sorted next field.
+       <STRONG>REQ_SPREV_FIELD</STRONG>    Move to the sorted previous field.
+       <STRONG>REQ_UP_CHAR</STRONG>        Move up in field.
+       <STRONG>REQ_UP_FIELD</STRONG>       Move up to a field.
+       <STRONG>REQ_VALIDATION</STRONG>     Validate field.
 
        If  the  second argument is a printable character, the driver places it
        in the current position in the current field.  If  it  is  one  of  the
@@ -275,7 +275,7 @@ <H1 class="no-header">form_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 4752033ba..a7caa52c5 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.104 2023/12/30 21:36:32 tom Exp @
+  * @Id: infocmp.1m,v 1.107 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2023-12-30 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2024-01-13 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-01-13 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -119,11 +119,11 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
        The <STRONG>-I</STRONG>, <STRONG>-L</STRONG>, and <STRONG>-C</STRONG> options will  produce  a  source  listing  for  each
        terminal named.
 
-            <STRONG>-I</STRONG>   use the <STRONG>terminfo</STRONG> names
-            <STRONG>-L</STRONG>   use the long C variable name listed in &lt;<STRONG>term.h</STRONG>&gt;
-            <STRONG>-C</STRONG>   use the <STRONG>termcap</STRONG> names
-            <STRONG>-r</STRONG>   when using <STRONG>-C</STRONG>, put out all capabilities in <STRONG>termcap</STRONG> form
-            <STRONG>-K</STRONG>   modifies the <STRONG>-C</STRONG> option, improving BSD-compatibility.
+                   <STRONG>-I</STRONG>   use <EM>terminfo</EM> capability codes
+                   <STRONG>-L</STRONG>   use "long" capability names
+                   <STRONG>-C</STRONG>   use <EM>termcap</EM> capability codes
+                   <STRONG>-r</STRONG>   with <STRONG>-C</STRONG>, include nonstandard capabilities
+                   <STRONG>-K</STRONG>   with <STRONG>-C</STRONG>, improve BSD compatibility
 
        If  no  <EM>terminal-types</EM> are given, the environment variable <EM>TERM</EM> will be
        used for the terminal name.
@@ -168,14 +168,14 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
        Some  common  <STRONG>terminfo</STRONG>  parameter sequences, their <STRONG>termcap</STRONG> equivalents,
        and some terminal types which commonly have such sequences, are:
 
-           <STRONG>terminfo</STRONG>                    <STRONG>termcap</STRONG>   Representative Terminals
-           ---------------------------------------------------------------
-           <STRONG>%p1%c</STRONG>                       <STRONG>%.</STRONG>        adm
-           <STRONG>%p1%d</STRONG>                       <STRONG>%d</STRONG>        hp, ANSI standard, vt100
-           <STRONG>%p1%'x'%+%c</STRONG>                 <STRONG>%+x</STRONG>       concept
-           <STRONG>%i</STRONG>                          <STRONG>%i</STRONG>q       ANSI standard, vt100
-           <STRONG>%p1%?%'x'%&gt;%t%p1%'y'%+%;</STRONG>    <STRONG>%&gt;xy</STRONG>      concept
-           <STRONG>%p2</STRONG> is printed before <STRONG>%p1</STRONG>   <STRONG>%r</STRONG>        hp
+                 <STRONG><EM>terminfo</EM></STRONG>                   <STRONG><EM>termcap</EM></STRONG>   Terminal Types
+                 ----------------------------------------------------
+                 <STRONG>%p1%c</STRONG>                      <STRONG>%.</STRONG>        ansi-m
+                 <STRONG>%p1%d</STRONG>                      <STRONG>%d</STRONG>        ansi, vt100
+                 <STRONG>%p1%'</STRONG> <STRONG>'%+%c</STRONG>                <STRONG>%+x</STRONG>       vt52
+                 <STRONG>%i</STRONG>                         <STRONG>%iq</STRONG>       ansi, vt100
+                 <STRONG>%p1%?%'x'%&gt;%t%p1%'y'%+%;</STRONG>   <STRONG>%&gt;xy</STRONG>      annarbor4080
+                 <STRONG>%p2</STRONG>...<STRONG>%p1</STRONG>                  <STRONG>%r</STRONG>        hpgeneric
 
 
 </PRE><H3><a name="h3-Use_Option_u_">Use= Option [-u]</a></H3><PRE>
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-30                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2024-01-13                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index adc7badbc..1192282dd 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,24 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.195 2024/01/05 21:46:58 tom Exp @
-  * X/Open Curses Issue 7 assumes some optimization will be done, but
-  * does not mandate it in any way.
-  * See X/Open Curses Issue 4, Version 2, pp. 227-234.
-  * See X/Open Curses Issue 7, pp. 311-318.
-  * XXX: What's missing?  GBR counts untic(1), and that's all.
+  * @Id: ncurses.3x,v 1.197 2024/01/13 20:30:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -65,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240106).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240113).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -210,32 +205,33 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></H3><PRE>
-       The selection of an approprate value of <EM>TERM</EM> in the process environment
-       is essential to correct <EM>curses</EM> and <EM>terminfo</EM> library operation.  A well-
-       configured  system  selects a correct <EM>TERM</EM> value automatically; <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
-       may assist with troubleshooting exotic situations.
-
-       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
-       <EM>curses</EM>  program  is executing in a graphical windowing environment, the
-       information obtained thence overrides that obtained  by  <EM>terminfo</EM>.   An
+       The   selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the  process
+       environment  is  essential  to  correct  <EM>curses</EM>  and  <EM>terminfo</EM>  library
+       operation.   A  well-configured  system  selects  a  correct <EM>TERM</EM> value
+       automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  may   assist   with   troubleshooting   exotic
+       situations.
+
+       If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
+       <EM>curses</EM> program is executing in a graphical windowing  environment,  the
+       information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
        <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-       If  the  environment  variable  <EM>TERMINFO</EM>  is  defined, a <EM>curses</EM> program
-       checks first for  a  terminal  type  description  in  the  location  it
+       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
+       checks  first  for  a  terminal  type  description  in  the location it
        identifies.   <EM>TERMINFO</EM>  is  useful  for  developing  experimental  type
-       descriptions or when write permission  to  <EM>/usr/share/terminfo</EM>  is  not
+       descriptions  or  when  write  permission to <EM>/usr/share/terminfo</EM> is not
        available.
 
        See section "ENVIRONMENT" below.
 
 
 </PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
-       Many  <EM>curses</EM>  functions have two or more versions.  Those prefixed with
-       "w" require a  window  argument.   Four  functions  prefixed  with  "p"
-       require  a  pad  argument.  Those without a prefix generally operate on
+       Many <EM>curses</EM> functions have two or more versions.  Those  prefixed  with
+       "w"  require  a  window  argument.   Four  functions  prefixed with "p"
+       require a pad argument.  Those without a prefix  generally  operate  on
        <STRONG>stdscr</STRONG>.
 
-       In function synopses, <EM>ncurses</EM> man pages apply the  following  names  to
+       In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
        parameters.
 
                         <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
@@ -244,84 +240,83 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
-       This  manual  page describes functions that appear in any configuration
-       of the library.  There  are  two  common  configurations;  see  section
+       This manual page describes functions that appear in  any  configuration
+       of  the  library.   There  are  two  common configurations; see section
        "ALTERNATE CONFIGURATIONS" below.
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
-                 eight-bit characters.  It stores a  character  combined  with
+                 eight-bit  characters.   It  stores a character combined with
                  attributes in a <EM>chtype</EM> datum, which is often an alias of <EM>int.</EM>
 
-                 Attributes  alone  (with  no  corresponding character) can be
-                 stored in variables of <EM>chtype</EM>  or  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  type.   In  either
+                 Attributes alone (with no  corresponding  character)  can  be
+                 stored  in  variables  of  <EM>chtype</EM>  or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> type.  In either
                  case, they are represented as an integral bit mask.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype.</EM>
 
-       <EM>ncursesw</EM>  is  the  library  in  its "wide" configuration, which handles
+       <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
                  byte-sized type) can represent.  It adds about one third more
                  calls  using  additional  data  types  that  can  store  such
                  <EM>multibyte</EM> characters.
 
-                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds  to the non-wide configuration's <EM>chtype.</EM>
-                          It always a structure type, because it  stores  more
-                          data  than  fits into an integral type.  A character
+                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype.</EM>
+                          It  always  a structure type, because it stores more
+                          data than fits into an integral type.   A  character
                           code  may  not  be  representable  as  a  <EM>char,</EM>  and
-                          moreover  more  than one character may occupy a cell
-                          (as with accent marks and other  diacritics).   Each
-                          character  is  of  type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM> a complex character
+                          moreover more than one character may occupy  a  cell
+                          (as  with  accent marks and other diacritics).  Each
+                          character is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM>  a  complex  character
                           contains one spacing character and zero or more non-
                           spacing  characters  (see  below).   Attributes  and
-                          color data are stored  in  separate  fields  of  the
+                          color  data  are  stored  in  separate fields of the
                           structure, not combined as in <EM>chtype.</EM>
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t.</EM>
 
-                 The   <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>   and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions  store  and
+                 The  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions   store   and
                  retrieve the data from a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure.  The wide library
-                 API  of <EM>ncurses</EM> depends on two data types standardized by ISO
+                 API of <EM>ncurses</EM> depends on two data types standardized by  ISO
                  C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype,</EM> it may be  an
-                          alias  of <EM>int.</EM>  Depending on the character encoding,
-                          a wide character may be  <EM>spacing,</EM>  meaning  that  it
-                          occupies  a  character  cell by itself and typically
-                          accompanies  cursor  advancement,  or   <EM>non-spacing,</EM>
-                          meaning  that it occupies the same cell as a spacing
-                          character, is often regarded as a "modifier" of  the
-                          base  glyph  with  which  it combines, and typically
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype,</EM> it may be an
+                          alias of <EM>int.</EM>  Depending on the character  encoding,
+                          a  wide  character  may  be <EM>spacing,</EM> meaning that it
+                          occupies a character cell by  itself  and  typically
+                          accompanies   cursor  advancement,  or  <EM>non-spacing,</EM>
+                          meaning that it occupies the same cell as a  spacing
+                          character,  is often regarded as a "modifier" of the
+                          base glyph with which  it  combines,  and  typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
-                          analogously  to the <EM>int</EM>-sized character manipulation
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can   store   a   <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or  the  constant  <STRONG>WEOF</STRONG>,
+                          analogously to the <EM>int</EM>-sized character  manipulation
                           functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
-                 The  wide  library   provides   additional   functions   that
-                 complement  those  in  the non-wide library where the size of
-                 the underlying character type  is  significant.   A  somewhat
-                 regular  naming  convention relates many of the wide variants
-                 to their non-wide counterparts;  where  a  non-wide  function
-                 name  contains  "ch"  or "str", prefix it with "_w" to obtain
+                 The   wide   library   provides   additional  functions  that
+                 complement those in the non-wide library where  the  size  of
+                 the  underlying  character  type  is significant.  A somewhat
+                 regular naming convention relates many of the  wide  variants
+                 to  their  non-wide  counterparts;  where a non-wide function
+                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
                  the wide counterpart.  For example, <STRONG>waddch</STRONG> becomes <STRONG>wadd_wch</STRONG>.
 
-                 This convention is inapplicable  to  some  non-wide  function
+                 This  convention  is  inapplicable  to some non-wide function
                  names,  so  other  transformations  are  used  for  the  wide
                  configuration: in the window background management functions,
-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
                  -clearing functions are suffixed with "_set".
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
-       and  wide  APIs  and  the  corresponding  man pages that describe them.
-       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
+       and wide APIs and the  corresponding  man  pages  that  describe  them.
+       Those  flagged  with  "*"  are  <EM>ncurses</EM>-specific,  neither described by
        X/Open Curses nor present in SVr4.
 
                     <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
-
                     PAIR_NUMBER              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     add_wch                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     add_wchnstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
@@ -385,10 +380,10 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     erasechar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
+
                     exit_terminfo            <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
                     extended_color_content   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_pair_content    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
-
                     extended_slk_color       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     filter                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     find_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
@@ -451,11 +446,11 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     insdelln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insnstr                  <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+
                     insstr                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     instr                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     intrflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     inwstr                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
-
                     is_cbreak                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_cleared               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_echo                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
@@ -517,12 +512,12 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     mvin_wch                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvin_wchstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+
                     mvinch                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     mvinchnstr               <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinchstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinnstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvinnwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
-
                     mvins_nwstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvins_wch                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
@@ -583,13 +578,13 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nofilter                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     nonl                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noqiflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noraw                    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     notimeout                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     overlay                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     overwrite                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -649,6 +644,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     start_color              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     subpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     subwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     syncok                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     term_attrs               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termattrs                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
@@ -656,7 +652,6 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     tgetent                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgetflag                 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgetnum                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
-
                     tgetstr                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tgoto                    <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
                     tigetflag                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
@@ -715,6 +710,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     wbkgrnd                  <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wbkgrndset               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wborder                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+
                     wborder_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     wchgat                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wclear                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -723,7 +719,6 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     wcolor_set               <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wcursyncup               <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wdelch                   <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
-
                     wdeleteln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     wecho_wchar              <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     wechochar                <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -779,7 +774,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       Depending  on  the  configuration,  additional sets of functions may be
+       Depending on the configuration, additional sets  of  functions  may  be
        available:
 
           <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG> - curses memory-leak checking
@@ -792,25 +787,25 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Unless otherwise noted, functions that return an integer return  <STRONG>OK</STRONG>  on
+       Unless  otherwise  noted, functions that return an integer return <STRONG>OK</STRONG> on
        success and <STRONG>ERR</STRONG> on failure.  Functions that return pointers return <STRONG>NULL</STRONG>
-       on failure.  Typically, <EM>ncurses</EM> treats  a  null  pointer  passed  as  a
+       on  failure.   Typically,  <EM>ncurses</EM>  treats  a  null pointer passed as a
        function parameter as a failure.
 
-       Functions  with a "mv" prefix first perform cursor movement using <STRONG>wmove</STRONG>
-       and fail  if  the  position  is  outside  the  window,  or  (for  "mvw"
+       Functions with a "mv" prefix first perform cursor movement using  <STRONG>wmove</STRONG>
+       and  fail  if  the  position  is  outside  the  window,  or  (for "mvw"
        functions) if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The  following  environment  symbols  are  useful  for  customizing the
-       runtime behavior of the <EM>ncurses</EM> library.  The most important ones  have
+       The following  environment  symbols  are  useful  for  customizing  the
+       runtime  behavior of the <EM>ncurses</EM> library.  The most important ones have
        been already discussed in detail.
 
 
-</PRE><H3><a name="h3-CC-command-character"><EM>CC</EM> command-character</a></H3><PRE>
-       When  set,  change  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>) capability value of
-       loaded <EM>terminfo</EM> entries to the value of this variable.  Very few  <EM>term-</EM>
+</PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
+       When set, change the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of
+       loaded  <EM>terminfo</EM> entries to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
        Because this name is also used in development environments to represent
@@ -820,33 +815,33 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
        The  debugging  library  checks  this  environment  variable  when  the
-       application has redirected output to a file.   The  variable's  numeric
-       value  is  used  for  the baudrate.  If no value is found, <EM>ncurses</EM> uses
+       application  has  redirected  output to a file.  The variable's numeric
+       value is used for the baudrate.  If no value  is  found,  <EM>ncurses</EM>  uses
        9600.  This allows testers to construct repeatable test-cases that take
        into account costs that depend on baudrate.
 
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        Specify the width of the screen in characters.  Applications running in
-       a windowing environment usually are able to obtain  the  width  of  the
-       window  in  which they are executing.  If neither the <EM>COLUMNS</EM> value nor
-       the terminal's screen size is available, <EM>ncurses</EM> uses  the  size  which
+       a  windowing  environment  usually  are able to obtain the width of the
+       window in which they are executing.  If neither the <EM>COLUMNS</EM>  value  nor
+       the  terminal's  screen  size is available, <EM>ncurses</EM> uses the size which
        may be specified in the terminfo database (i.e., the <STRONG>cols</STRONG> capability).
 
-       It  is  important  that  your  application  use  a correct size for the
-       screen.  This is not always possible because your  application  may  be
-       running  on a host which does not honor NAWS (Negotiations About Window
+       It is important that your  application  use  a  correct  size  for  the
+       screen.   This  is  not always possible because your application may be
+       running on a host which does not honor NAWS (Negotiations About  Window
        Size),  or  because  you  are  temporarily  running  as  another  user.
-       However,  setting  <EM>COLUMNS</EM>  and/or <EM>LINES</EM> overrides the library's use of
+       However, setting <EM>COLUMNS</EM> and/or <EM>LINES</EM> overrides the  library's  use  of
        the screen size obtained from the operating system.
 
-       Either <EM>COLUMNS</EM> or <EM>LINES</EM> symbols may be specified  independently.   This
-       is   mainly   useful  to  circumvent  legacy  misfeatures  of  terminal
-       descriptions, e.g., xterm which commonly specifies a  65  line  screen.
-       For  best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a terminal
+       Either  <EM>COLUMNS</EM>  or <EM>LINES</EM> symbols may be specified independently.  This
+       is  mainly  useful  to  circumvent  legacy  misfeatures   of   terminal
+       descriptions,  e.g.,  xterm  which commonly specifies a 65 line screen.
+       For best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a  terminal
        description for terminals which are run as emulations.
 
-       Use the <STRONG>use_env</STRONG> function to disable all  use  of  external  environment
+       Use  the  <STRONG>use_env</STRONG>  function  to disable all use of external environment
        (but not including system calls) to determine the screen size.  Use the
        <STRONG>use_tioctl</STRONG> function to update <EM>COLUMNS</EM> or <EM>LINES</EM> to match the screen size
        obtained from system calls or the terminal database.
@@ -854,31 +849,31 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
        Specifies the total time, in milliseconds, for which <EM>ncurses</EM> will await
-       a character sequence, e.g., a function key.  The  default  value,  1000
-       milliseconds,  is enough for most uses.  However, it is made a variable
+       a  character  sequence,  e.g., a function key.  The default value, 1000
+       milliseconds, is enough for most uses.  However, it is made a  variable
        to accommodate unusual applications.
 
-       The most common instance where you may wish to change this value is  to
-       work  with  slow hosts, e.g., running on a network.  If the host cannot
-       read characters rapidly enough, it will have the same effect as if  the
-       terminal  did  not  send  characters  rapidly enough.  The library will
+       The  most common instance where you may wish to change this value is to
+       work with slow hosts, e.g., running on a network.  If the  host  cannot
+       read  characters rapidly enough, it will have the same effect as if the
+       terminal did not send characters  rapidly  enough.   The  library  will
        still see a timeout.
 
-       Note that xterm mouse events are  built  up  from  character  sequences
-       received  from  the  xterm.   If  your  application  makes heavy use of
-       multiple-clicking, you may wish to lengthen this default value  because
-       the  timeout  applies  to the composed multi-click event as well as the
+       Note  that  xterm  mouse  events  are built up from character sequences
+       received from the xterm.   If  your  application  makes  heavy  use  of
+       multiple-clicking,  you may wish to lengthen this default value because
+       the timeout applies to the composed multi-click event as  well  as  the
        individual clicks.
 
        In addition to the environment variable, this implementation provides a
-       global  variable  with the same name.  Portable applications should not
-       rely upon the presence of <STRONG>ESCDELAY</STRONG> in  either  form,  but  setting  the
-       environment  variable  rather  than the global variable does not create
+       global variable with the same name.  Portable applications  should  not
+       rely  upon  the  presence  of  <STRONG>ESCDELAY</STRONG> in either form, but setting the
+       environment variable rather than the global variable  does  not  create
        problems when compiling an application.
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       Tells <EM>ncurses</EM> where your home directory is.  That is where it may  read
+       Tells  <EM>ncurses</EM> where your home directory is.  That is where it may read
        and write auxiliary terminal descriptions:
 
            $HOME/.termcap
@@ -886,13 +881,13 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       Like  <EM>COLUMNS</EM>,  specify  the  height  of the screen in characters.  See
+       Like <EM>COLUMNS</EM>, specify the height of  the  screen  in  characters.   See
        <EM>COLUMNS</EM> for a detailed description.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       This applies only to the OS/2 EMX port.   It  specifies  the  order  of
-       buttons  on  the  mouse.   OS/2 numbers a 3-button mouse inconsistently
+       This  applies  only  to  the  OS/2 EMX port.  It specifies the order of
+       buttons on the mouse.  OS/2 numbers  a  3-button  mouse  inconsistently
        from other platforms:
 
            1 = left
@@ -900,37 +895,37 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
            3 = middle.
 
        This variable lets you customize the mouse.  The variable must be three
-       numeric  digits  1-3  in  any  order,  e.g.,  123 or 321.  If it is not
+       numeric digits 1-3 in any order, e.g.,  123  or  321.   If  it  is  not
        specified, <EM>ncurses</EM> uses 132.
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       Override the compiled-in assumption that the terminal's default  colors
-       are   white-on-black   (see   <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You  may  set  the
-       foreground and background color values with this  environment  variable
-       by  proving  a  2-element list: foreground,background.  For example, to
-       tell <EM>ncurses</EM> to not assume anything  about  the  colors,  set  this  to
-       "-1,-1".   To  make  it  green-on-black, set it to "2,0".  Any positive
+       Override  the compiled-in assumption that the terminal's default colors
+       are  white-on-black  (see  <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You   may   set   the
+       foreground  and  background color values with this environment variable
+       by proving a 2-element list: foreground,background.   For  example,  to
+       tell  <EM>ncurses</EM>  to  not  assume  anything  about the colors, set this to
+       "-1,-1".  To make it green-on-black, set it  to  "2,0".   Any  positive
        value from zero to the terminfo <STRONG>max_colors</STRONG> value is allowed.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
        This applies only to the MinGW port of <EM>ncurses</EM>.
 
-       The <STRONG>Console2</STRONG> program's handling  of  the  Microsoft  Console  API  call
-       <STRONG>CreateConsoleScreenBuffer</STRONG>  is  defective.   Applications which use this
+       The  <STRONG>Console2</STRONG>  program's  handling  of  the  Microsoft Console API call
+       <STRONG>CreateConsoleScreenBuffer</STRONG> is defective.  Applications  which  use  this
        will hang.  However, it is possible to simulate the action of this call
-       by  mapping  coordinates,  explicitly saving and restoring the original
-       screen contents.  Setting the environment variable <STRONG>NCGDB</STRONG> has  the  same
+       by mapping coordinates, explicitly saving and  restoring  the  original
+       screen  contents.   Setting the environment variable <STRONG>NCGDB</STRONG> has the same
        effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
        This applies only to <EM>ncurses</EM> configured to use the GPM interface.
 
-       If  present, the environment variable is a list of one or more terminal
-       names against which the <EM>TERM</EM> environment variable is matched.   Setting
-       it  to  an  empty  value disables the GPM interface; using the built-in
+       If present, the environment variable is a list of one or more  terminal
+       names  against which the <EM>TERM</EM> environment variable is matched.  Setting
+       it to an empty value disables the GPM  interface;  using  the  built-in
        support for xterm, etc.
 
        If the environment variable is absent, <EM>ncurses</EM> will attempt to open GPM
@@ -938,39 +933,39 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM>  may use tabs as part of cursor movement optimization.  In some
-       cases, your terminal driver may not handle these  properly.   Set  this
+       <EM>ncurses</EM> may use tabs as part of cursor movement optimization.  In  some
+       cases,  your  terminal  driver may not handle these properly.  Set this
        environment variable to any value to disable the feature.  You can also
        adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Some terminals  use  a  magic-cookie  feature  which  requires  special
-       handling  to  make  highlighting  and  other  video  attributes display
+       Some  terminals  use  a  magic-cookie  feature  which  requires special
+       handling to  make  highlighting  and  other  video  attributes  display
        properly.   You  can  suppress  the  highlighting  entirely  for  these
        terminals by setting this environment variable to any value.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
-       Most  of the terminal descriptions in the terminfo database are written
-       for real "hardware" terminals.   Many  people  use  terminal  emulators
+       Most of the terminal descriptions in the terminfo database are  written
+       for  real  "hardware"  terminals.   Many  people use terminal emulators
        which run in a windowing environment and use curses-based applications.
-       Terminal emulators can duplicate all of  the  important  aspects  of  a
-       hardware  terminal,  but  they  do  not have the same limitations.  The
-       chief limitation of a hardware terminal from  the  standpoint  of  your
-       application  is  the  management  of  dataflow, i.e., timing.  Unless a
-       hardware terminal is interfaced into  a  terminal  concentrator  (which
-       does  flow  control),  it  (or  your application) must manage dataflow,
-       preventing overruns.  The cheapest solution (no hardware cost)  is  for
-       your  program  to do this by pausing after operations that the terminal
+       Terminal  emulators  can  duplicate  all  of the important aspects of a
+       hardware terminal, but they do not  have  the  same  limitations.   The
+       chief  limitation  of  a  hardware terminal from the standpoint of your
+       application is the management of  dataflow,  i.e.,  timing.   Unless  a
+       hardware  terminal  is  interfaced  into a terminal concentrator (which
+       does flow control), it (or  your  application)  must  manage  dataflow,
+       preventing  overruns.   The cheapest solution (no hardware cost) is for
+       your program to do this by pausing after operations that  the  terminal
        does slowly, such as clearing the display.
 
-       As a result, many terminal  descriptions  (including  the  vt100)  have
-       delay  times embedded.  You may wish to use these descriptions, but not
+       As  a  result,  many  terminal  descriptions (including the vt100) have
+       delay times embedded.  You may wish to use these descriptions, but  not
        want to pay the performance penalty.
 
-       Set the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> environment  variable  to  disable  all  but
-       mandatory  padding.   Mandatory  padding  is  used as a part of special
+       Set  the  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM>  environment  variable  to disable all but
+       mandatory padding.  Mandatory padding is used  as  a  part  of  special
        control sequences such as <STRONG>flash</STRONG>.
 
 
@@ -981,44 +976,44 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   continued though 5.9 patch 20130126
 
-       <EM>ncurses</EM> enabled buffered output during terminal  initialization.   This
-       was  done  (as  in  SVr4  curses) for performance reasons.  For testing
-       purposes, both of <EM>ncurses</EM> and certain applications,  this  feature  was
-       made  optional.  Setting the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>SETBUF</EM> variable disabled output
-       buffering, leaving the output in the original (usually  line  buffered)
+       <EM>ncurses</EM>  enabled  buffered output during terminal initialization.  This
+       was done (as in SVr4 curses)  for  performance  reasons.   For  testing
+       purposes,  both  of  <EM>ncurses</EM> and certain applications, this feature was
+       made optional.  Setting the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>SETBUF</EM> variable disabled  output
+       buffering,  leaving  the output in the original (usually line buffered)
        mode.
 
-       In  the  current implementation, <EM>ncurses</EM> performs its own buffering and
-       does not require this workaround.  It does not modify the buffering  of
+       In the current implementation, <EM>ncurses</EM> performs its own  buffering  and
+       does  not require this workaround.  It does not modify the buffering of
        the standard output.
 
-       The  reason  for the change was to make the behavior for interrupts and
-       other  signals   more   robust.    One   drawback   is   that   certain
+       The reason for the change was to make the behavior for  interrupts  and
+       other   signals   more   robust.    One   drawback   is   that  certain
        nonconventional programs would mix ordinary <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM>
-       calls and (usually) work.  This is no longer possible since <EM>ncurses</EM>  is
-       not  using the buffered standard output but its own output (to the same
-       file descriptor).  As a special case, the low-level calls such as  <STRONG>putp</STRONG>
+       calls  and (usually) work.  This is no longer possible since <EM>ncurses</EM> is
+       not using the buffered standard output but its own output (to the  same
+       file  descriptor).  As a special case, the low-level calls such as <STRONG>putp</STRONG>
        still use the standard output.  But high-level curses calls do not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       During  initialization,  the  <EM>ncurses</EM>  library checks for special cases
+       During initialization, the <EM>ncurses</EM> library  checks  for  special  cases
        where VT100 line-drawing (and the corresponding alternate character set
-       capabilities)  described  in  the  terminfo  are  known  to be missing.
-       Specifically, when  running  in  a  UTF-8  locale,  the  Linux  console
-       emulator  and  the GNU screen program ignore these.  <EM>ncurses</EM> <EM>checks</EM> <EM>the</EM>
-       <EM>TERM</EM> <EM>environment</EM> <EM>variable</EM> <EM>for</EM> <EM>these.</EM>   <EM>For</EM>  <EM>other</EM>  <EM>special</EM>  <EM>cases,</EM>  <EM>you</EM>
-       <EM>should</EM>  <EM>set</EM> <EM>this</EM> <EM>environment</EM> <EM>variable.</EM>  <EM>Doing</EM> <EM>this</EM> <EM>tells</EM> <EM>ncurses</EM> <EM>to</EM> <EM>use</EM>
+       capabilities) described in  the  terminfo  are  known  to  be  missing.
+       Specifically,  when  running  in  a  UTF-8  locale,  the  Linux console
+       emulator and the GNU screen program ignore these.  <EM>ncurses</EM>  <EM>checks</EM>  <EM>the</EM>
+       <EM>TERM</EM>  <EM>environment</EM>  <EM>variable</EM>  <EM>for</EM>  <EM>these.</EM>   <EM>For</EM> <EM>other</EM> <EM>special</EM> <EM>cases,</EM> <EM>you</EM>
+       <EM>should</EM> <EM>set</EM> <EM>this</EM> <EM>environment</EM> <EM>variable.</EM>  <EM>Doing</EM> <EM>this</EM> <EM>tells</EM> <EM>ncurses</EM> <EM>to</EM>  <EM>use</EM>
        <EM>Unicode</EM> <EM>values</EM> <EM>which</EM> <EM>correspond</EM> <EM>to</EM> <EM>the</EM> <EM>VT100</EM> <EM>line-drawing</EM> <EM>glyphs.</EM>  <EM>That</EM>
-       <EM>works</EM>  <EM>for</EM>  <EM>the</EM> <EM>special</EM> <EM>cases</EM> <EM>cited,</EM> <EM>and</EM> <EM>is</EM> <EM>likely</EM> <EM>to</EM> <EM>work</EM> <EM>for</EM> <EM>terminal</EM>
+       <EM>works</EM> <EM>for</EM> <EM>the</EM> <EM>special</EM> <EM>cases</EM> <EM>cited,</EM> <EM>and</EM> <EM>is</EM> <EM>likely</EM> <EM>to</EM> <EM>work</EM>  <EM>for</EM>  <EM>terminal</EM>
        <EM>emulators.</EM>
 
-       When setting this variable, you should  set  it  to  a  nonzero  value.
-       Setting  it  to zero (or to a nonnumber) disables the special check for
+       When  setting  this  variable,  you  should  set it to a nonzero value.
+       Setting it to zero (or to a nonnumber) disables the special  check  for
        "linux" and "screen".
 
-       As an alternative to the environment variable, <EM>ncurses</EM>  checks  for  an
-       extended  terminfo  capability  <STRONG>U8</STRONG>.  This is a numeric capability which
+       As  an  alternative  to the environment variable, <EM>ncurses</EM> checks for an
+       extended terminfo capability <STRONG>U8</STRONG>.  This is a  numeric  capability  which
        can be compiled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>.  For example
 
           # linux console, if patched to provide working
@@ -1030,67 +1025,67 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The name "U8" is chosen to be two characters, to permit it to  be  used
+       The  name  "U8" is chosen to be two characters, to permit it to be used
        by applications that use <EM>ncurses</EM>' termcap interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       During   initialization,  the  <EM>ncurses</EM>  debugging  library  checks  the
-       <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable.  If it is  defined,  to  a  numeric
-       value,  <EM>ncurses</EM>  calls  the  <STRONG>trace</STRONG>  function,  using  that value as the
+       During  initialization,  the  <EM>ncurses</EM>  debugging  library  checks   the
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM>  environment  variable.   If  it is defined, to a numeric
+       value, <EM>ncurses</EM> calls the  <STRONG>trace</STRONG>  function,  using  that  value  as  the
        argument.
 
-       The argument values, which are defined  in  <STRONG>curses.h</STRONG>,  provide  several
-       types   of   information.   When  running  with  traces  enabled,  your
+       The  argument  values,  which  are defined in <STRONG>curses.h</STRONG>, provide several
+       types  of  information.   When  running  with  traces   enabled,   your
        application will write the file <STRONG>trace</STRONG> to the current directory.
 
        See <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> for more information.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       Denotes your terminal type.  Each terminal  type  is  distinct,  though
+       Denotes  your  terminal  type.   Each terminal type is distinct, though
        many are similar.
 
-       <EM>TERM</EM>  is commonly set by terminal emulators to help applications find a
-       workable  terminal  description.   Some  of  those  choose  a   popular
+       <EM>TERM</EM> is commonly set by terminal emulators to help applications find  a
+       workable   terminal  description.   Some  of  those  choose  a  popular
        approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
        Not  infrequently,  your  application  will  have  problems  with  that
        approach, e.g., incorrect function-key definitions.
 
-       If  you set <EM>TERM</EM> in your environment, it has no effect on the operation
-       of the terminal emulator.  It only affects the  way  applications  work
-       within  the  terminal.   Likewise,  as a general rule (<STRONG>xterm(1)</STRONG> being a
-       rare exception), terminal emulators which allow you to specify <EM>TERM</EM>  as
-       a  parameter  or  configuration  value  do not change their behavior to
+       If you set <EM>TERM</EM> in your environment, it has no effect on the  operation
+       of  the  terminal  emulator.  It only affects the way applications work
+       within the terminal.  Likewise, as a general  rule  (<STRONG>xterm(1)</STRONG>  being  a
+       rare  exception), terminal emulators which allow you to specify <EM>TERM</EM> as
+       a parameter or configuration value do  not  change  their  behavior  to
        match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
-       If the <EM>ncurses</EM>  library  has  been  configured  with  <EM>termcap</EM>  support,
-       <EM>ncurses</EM>  will  check for a terminal's description in termcap form if it
+       If  the  <EM>ncurses</EM>  library  has  been  configured  with <EM>termcap</EM> support,
+       <EM>ncurses</EM> will check for a terminal's description in termcap form  if  it
        is not available in the terminfo database.
 
        The <EM>TERMCAP</EM> environment variable contains either a terminal description
-       (with  newlines  stripped  out),  or  a  file  name  telling  where the
+       (with newlines  stripped  out),  or  a  file  name  telling  where  the
        information denoted by the <EM>TERM</EM> environment variable exists.  In either
-       case,  setting  it  directs  <EM>ncurses</EM> to ignore the usual place for this
+       case, setting it directs <EM>ncurses</EM> to ignore the  usual  place  for  this
        information, e.g., /etc/termcap.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM> can be configured to read  from  multiple  terminal  databases.
-       The  <EM>TERMINFO</EM>  variable overrides the location for the default terminal
-       database.  Terminal descriptions (in terminal  format)  are  stored  in
+       <EM>ncurses</EM>  can  be  configured  to read from multiple terminal databases.
+       The <EM>TERMINFO</EM> variable overrides the location for the  default  terminal
+       database.   Terminal  descriptions  (in  terminal format) are stored in
        terminal databases:
 
        <STRONG>o</STRONG>   Normally these are stored in a directory tree, using subdirectories
            named by the first letter of the terminal names therein.
 
            This is the scheme used in System V, which legacy Unix systems use,
-           and  the  <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications on those
+           and the <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications  on  those
            systems to override the default location of the terminal database.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built to use hashed databases,  then  each  entry  in
+       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  built  to use hashed databases, then each entry in
            this list may be the path of a hashed database file, e.g.,
 
                /usr/share/terminfo.db
@@ -1099,30 +1094,30 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
                /usr/share/terminfo/
 
-           The  hashed  database  uses  less disk-space and is a little faster
-           than the directory tree.  However,  some  applications  assume  the
-           existence  of  the  directory tree, reading it directly rather than
+           The hashed database uses less disk-space and  is  a  little  faster
+           than  the  directory  tree.   However, some applications assume the
+           existence of the directory tree, reading it  directly  rather  than
            using the terminfo library calls.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  with  a  support  for  reading  termcap  files
-           directly,  then  an entry in this list may be the path of a termcap
+       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  built  with  a  support  for reading termcap files
+           directly, then an entry in this list may be the path of  a  termcap
            file.
 
        <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <EM>ncurses</EM> uses
-           the  remainder of that variable as a compiled terminal description.
+           the remainder of that variable as a compiled terminal  description.
            You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
 
                TERMINFO="$(infocmp -0 -Q2 -q)"
                export TERMINFO
 
-           The compiled description is used if it corresponds to the  terminal
+           The  compiled description is used if it corresponds to the terminal
            identified by the <EM>TERM</EM> variable.
 
-       Setting  <EM>TERMINFO</EM> is the simplest, but not the only way to set location
-       of the default  terminal  database.   The  complete  list  of  database
+       Setting <EM>TERMINFO</EM> is the simplest, but not the only way to set  location
+       of  the  default  terminal  database.   The  complete  list of database
        locations in order follows:
 
-          <STRONG>o</STRONG>   the  last  terminal  database to which <EM>ncurses</EM> wrote, if any, is
+          <STRONG>o</STRONG>   the last terminal database to which <EM>ncurses</EM> wrote,  if  any,  is
               searched first
 
           <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
@@ -1131,31 +1126,31 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
 
-          <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
+          <STRONG>o</STRONG>   one  or  more  locations whose names are configured and compiled
               into the <EM>ncurses</EM> library, i.e.,
 
-             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
+             <STRONG>o</STRONG>   /usr/share/terminfo  (corresponding  to   the   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
                  variable)
 
              <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the <EM>TERMINFO</EM> variable)
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       Specifies a list of locations  to  search  for  terminal  descriptions.
-       Each  location  in  the list is a terminal database as described in the
-       section on the <EM>TERMINFO</EM> variable.  The  list  is  separated  by  colons
+       Specifies  a  list  of  locations  to search for terminal descriptions.
+       Each location in the list is a terminal database as  described  in  the
+       section  on  the  <EM>TERMINFO</EM>  variable.   The list is separated by colons
        (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       There  is  no  corresponding  feature  in  System  V terminfo; it is an
+       There is no corresponding feature  in  System  V  terminfo;  it  is  an
        extension developed for <EM>ncurses</EM>.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
-       If <EM>TERMCAP</EM> does not hold a file name then <EM>ncurses</EM> checks  the  <EM>TERMPATH</EM>
-       environment  variable.  This is a list of filenames separated by spaces
+       If  <EM>TERMCAP</EM>  does not hold a file name then <EM>ncurses</EM> checks the <EM>TERMPATH</EM>
+       environment variable.  This is a list of filenames separated by  spaces
        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       If the <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks  in  the
+       If  the  <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks in the
        files
 
            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
@@ -1163,16 +1158,16 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        in that order.
 
        The library may be configured to disregard the following variables when
-       the current user is the superuser (root), or if  the  application  uses
+       the  current  user  is the superuser (root), or if the application uses
        setuid or setgid permissions:
 
            $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
-       options given to the <EM>configure</EM> script when building the  library.   Run
-       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
+       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
+       options  given  to the <EM>configure</EM> script when building the library.  Run
+       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
        particular significance to the application developer employing <EM>ncurses.</EM>
 
        --disable-overwrite
@@ -1180,20 +1175,20 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This option is used to avoid filename conflicts  when  <EM>ncurses</EM>  is
+            This  option  is  used to avoid filename conflicts when <EM>ncurses</EM> is
             not the main implementation of curses of the computer.  If <EM>ncurses</EM>
-            is installed  disabling  overwrite,  it  puts  its  headers  in  a
+            is  installed  disabling  overwrite,  it  puts  its  headers  in a
             subdirectory, e.g.,
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            It  also  omits  a  symbolic  link  which  would  allow you to use
+            It also omits a  symbolic  link  which  would  allow  you  to  use
             <STRONG>-lcurses</STRONG> to build executables.
 
        --enable-widec
-            The  configure  script   renames   the   library   and   (if   the
-            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
-            different subdirectory.  All of  the  library  names  have  a  "w"
+            The   configure   script   renames   the   library   and  (if  the
+            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
+            different  subdirectory.   All  of  the  library  names have a "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1202,45 +1197,45 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You  must  also  enable  the wide-character features in the header
-            file when compiling for the  wide-character  library  to  use  the
-            extended  (wide-character)  functions.   The  symbol which enables
+            You must also enable the wide-character  features  in  the  header
+            file  when  compiling  for  the  wide-character library to use the
+            extended (wide-character) functions.   The  symbol  which  enables
             these features has changed since XSI Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
+            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
+            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
                 to 500.
 
-            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
-                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
+            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
+                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
-                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
-                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
+                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
+                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The <EM>curses.h</EM> header file installed for the wide-character  library
-            is  designed  to be compatible with the non-wide library's header.
-            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
+            The  <EM>curses.h</EM> header file installed for the wide-character library
+            is designed to be compatible with the non-wide  library's  header.
+            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character library's headers should be  installed  last,  to  allow
+            character  library's  headers  should  be installed last, to allow
             applications to be built using either library from the same set of
             headers.
 
        --with-pthread
-            The configure script renames the  library.   All  of  the  library
-            names  have  a  "t"  appended  to  them  (before  any "w" added by
+            The  configure  script  renames  the  library.  All of the library
+            names have a "t"  appended  to  them  (before  any  "w"  added  by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to set these values.  Some applications  (very  few)  may  require
+            to  set  these  values.   Some applications (very few) may require
             changes to work with this convention.
 
        --with-shared
@@ -1250,17 +1245,17 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        --with-debug
 
        --with-profile
-            The  shared  and  normal  (static)  library  names differ by their
-            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+            The shared and normal  (static)  library  names  differ  by  their
+            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
+            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        --with-termlib
-            Low-level functions which do not depend upon whether  the  library
+            Low-level  functions  which do not depend upon whether the library
             supports wide-characters, are provided in the tinfo library.
 
-            By  doing  this, it is possible to share the tinfo library between
-            wide/normal configurations as well  as  reduce  the  size  of  the
+            By doing this, it is possible to share the tinfo  library  between
+            wide/normal  configurations  as  well  as  reduce  the size of the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1280,8 +1275,8 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        --with-trace
-            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
-            is sometimes useful to  configure  this  in  the  shared  library.
+            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
+            is  sometimes  useful  to  configure  this  in the shared library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1295,151 +1290,151 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open Curses permits most functions it specifies to be made  available
+       X/Open  Curses permits most functions it specifies to be made available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
+       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
            another operation), and
 
        <STRONG>o</STRONG>   a few special cases.
 
-       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
-       redirected  to  something  that  is  not a terminal device, the library
-       writes screen updates to the standard error file descriptor.  This  was
+       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
+       redirected to something that is not  a  terminal  device,  the  library
+       writes  screen updates to the standard error file descriptor.  This was
        an undocumented feature of SVr3.
 
-       See  subsection  "Header  files"  below  regarding  symbols  exposed by
+       See subsection  "Header  files"  below  regarding  symbols  exposed  by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
+       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
        terminals, including <EM>xterm;</EM> see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
-       when running in a GUI terminal emulator application such as <EM>xterm;</EM>  see
+       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
+       when  running in a GUI terminal emulator application such as <EM>xterm;</EM> see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open   Curses  by  allowing  the  application  programmer  to  define
-       additional   key   sequences   at    runtime;    see    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
+       X/Open  Curses  by  allowing  the  application  programmer  to   define
+       additional    key    sequences    at   runtime;   see   <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
        <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From a user's perspective, the application is  able
-       to  draw colored text on a background whose color is set independently,
+       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
+       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
+       application to reset  the  terminal  to  its  original  foreground  and
+       background  colors.  From a user's perspective, the application is able
+       to draw colored text on a background whose color is set  independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An <EM>ncurses</EM> application can choose  to  hide  the  internal  details  of
-       <EM>WINDOW</EM>   structures,   instead   using   accessor   functions  such  as
+       An  <EM>ncurses</EM>  application  can  choose  to  hide the internal details of
+       <EM>WINDOW</EM>  structures,  instead   using   accessor   functions   such   as
        <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> enables an  application  to  direct  application  output  to  a
+       <EM>ncurses</EM>  enables  an  application  to  direct  application  output to a
        printer attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
-       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that  can  gather  color  information  from  them  when many colors are
+       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
+       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that can gather color  information  from  them  when  many  colors  are
        supported.
 
-       Some extensions are only available if <EM>ncurses</EM> is  compiled  to  support
+       Some  extensions  are  only available if <EM>ncurses</EM> is compiled to support
        them; see section "ALTERNATE CONFIGURATIONS" above.
 
-       <STRONG>o</STRONG>   Rudimentary   support   for   multi-threaded  applications  may  be
+       <STRONG>o</STRONG>   Rudimentary  support  for  multi-threaded   applications   may   be
            available; see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   Functions that ease the  management  of  multiple  screens  can  be
+       <STRONG>o</STRONG>   Functions  that  ease  the  management  of  multiple screens can be
            exposed; see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
        <STRONG>o</STRONG>   The compiler option <STRONG>-DUSE_GETCAP</STRONG> causes the library to fall back to
            reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
-           <EM>info</EM>  entry  corresponding  to  <EM>TERM.</EM>   Use  of this feature is not
-           recommended, as it essentially includes an entire <EM>termcap</EM>  compiler
-           in  the  <EM>ncurses</EM>  startup  code,  at  a  cost  in  memory usage and
+           <EM>info</EM> entry corresponding to <EM>TERM.</EM>   Use  of  this  feature  is  not
+           recommended,  as it essentially includes an entire <EM>termcap</EM> compiler
+           in the <EM>ncurses</EM>  startup  code,  at  a  cost  in  memory  usage  and
            application launch latency.
 
-       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
+       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
+       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
        Curses, and supports nearly all its enhanced features.
 
-       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
+       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other  implementations,  this  one  checks  parameters  such  as
-       pointers  to  <EM>WINDOW</EM>  structures to ensure they are not null.  The main
-       reason for providing this  behavior  is  to  guard  against  programmer
-       error.   The  standard interface does not provide a way for the library
-       to tell an application which of several possible errors were  detected.
-       Relying  on  this  (or  some other) extension will adversely affect the
+       Unlike  other  implementations,  this  one  checks  parameters  such as
+       pointers to <EM>WINDOW</EM> structures to ensure they are not  null.   The  main
+       reason  for  providing  this  behavior  is  to guard against programmer
+       error.  The standard interface does not provide a way for  the  library
+       to  tell an application which of several possible errors were detected.
+       Relying on this (or some other) extension  will  adversely  affect  the
        portability of curses applications.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In historic curses versions, delays embedded in  the  capabilities  <STRONG>cr</STRONG>,
-       <STRONG>ind</STRONG>,  <STRONG>cub1</STRONG>,  <STRONG>ff</STRONG>  and <STRONG>tab</STRONG> activated corresponding delay bits in the Unix
+       In  historic  curses  versions, delays embedded in the capabilities <STRONG>cr</STRONG>,
+       <STRONG>ind</STRONG>, <STRONG>cub1</STRONG>, <STRONG>ff</STRONG> and <STRONG>tab</STRONG> activated corresponding delay bits  in  the  Unix
        tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.   This  method  is  slightly  more  expensive,  but  narrows the
-       interface to the Unix kernel significantly and increases the  package's
+       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
+       interface  to the Unix kernel significantly and increases the package's
        portability correspondingly.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say, but does not finish the story:
 
-           The inclusion of &lt;curses.h&gt; may make visible all symbols  from  the
+           The  inclusion  of &lt;curses.h&gt; may make visible all symbols from the
            headers &lt;stdio.h&gt;, &lt;term.h&gt;, &lt;termios.h&gt;, and &lt;wchar.h&gt;.
 
        Here is a more complete story:
 
-       <STRONG>o</STRONG>   Starting   with  BSD  curses,  all  implementations  have  included
+       <STRONG>o</STRONG>   Starting  with  BSD  curses,  all  implementations  have   included
            &lt;stdio.h&gt;.
 
-           BSD curses included &lt;curses.h&gt;  and  &lt;unctrl.h&gt;  from  an  internal
+           BSD  curses  included  &lt;curses.h&gt;  and  &lt;unctrl.h&gt; from an internal
            header file <EM>curses.ext</EM> ("ext" abbreviated "externs").
 
-           BSD  curses  used  &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG> and <STRONG>scanw</STRONG>), but
+           BSD curses used &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG>  and  <STRONG>scanw</STRONG>),  but
            nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   SVr2 curses added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon  &lt;stdio.h&gt;.   That
+       <STRONG>o</STRONG>   SVr2  curses  added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon &lt;stdio.h&gt;.  That
            is, the function prototype uses <STRONG>FILE</STRONG>.
 
            SVr4 curses added <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>, which also use &lt;stdio.h&gt;.
 
            X/Open Curses documents all three of these functions.
 
-           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
            include  &lt;stdio.h&gt;  before  including  &lt;curses.h&gt;.   Both  document
            curses showing &lt;curses.h&gt; as the only required header.
 
            As a result, standard &lt;curses.h&gt; will always include &lt;stdio.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open  Curses  is  inconsistent  with  respect  to  SVr4 regarding
+       <STRONG>o</STRONG>   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
            &lt;unctrl.h&gt;.
 
-           As  noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <EM>ncurses</EM>  includes  &lt;unctrl.h&gt;   from
+           As   noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <EM>ncurses</EM>  includes  &lt;unctrl.h&gt;  from
            &lt;curses.h&gt; (like SVr4).
 
        <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
@@ -1448,49 +1443,49 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
            HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
            in curses.h, but <EM>ncurses</EM> (and Solaris curses) do not.
 
-           AIX  curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, <EM>ncurses</EM> (and
+           AIX curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, <EM>ncurses</EM>  (and
            Solaris curses) do not.
 
-       <STRONG>o</STRONG>   X/Open says that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there  is  no
+       <STRONG>o</STRONG>   X/Open  says  that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there is no
            requirement that it do that.
 
            Some  programs  use  functions  declared  in  both  &lt;curses.h&gt;  and
-           &lt;term.h&gt;, and must include both headers in the same  module.   Very
-           old  versions  of  AIX  curses required including &lt;curses.h&gt; before
+           &lt;term.h&gt;,  and  must include both headers in the same module.  Very
+           old versions of AIX curses  required  including  &lt;curses.h&gt;  before
            including &lt;term.h&gt;.
 
-           Because <EM>ncurses</EM> header files include the headers needed  to  define
+           Because  <EM>ncurses</EM>  header files include the headers needed to define
            datatypes used in the headers, <EM>ncurses</EM> header files can be included
-           in any order.  But for portability, you should  include  &lt;curses.h&gt;
+           in  any  order.  But for portability, you should include &lt;curses.h&gt;
            before &lt;term.h&gt;.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says  <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because including a header
+       <STRONG>o</STRONG>   X/Open Curses says <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because  including  a  header
            file does not necessarily make all symbols in it visible (there are
            ifdef's to consider).
 
-           For  instance,  in  <EM>ncurses</EM> &lt;wchar.h&gt; <EM>may</EM> be included if the proper
-           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
-           support.   If  the  header  is  included,  its  symbols may be made
-           visible.  That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG>  feature
+           For instance, in <EM>ncurses</EM> &lt;wchar.h&gt; <EM>may</EM> be included  if  the  proper
+           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
+           support.  If the header  is  included,  its  symbols  may  be  made
+           visible.   That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature
            test macro.
 
-       <STRONG>o</STRONG>   X/Open  Curses  documents  one  required header, in a special case:
-           &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>   and
-           <STRONG>vw_scanw</STRONG>  functions  (as  well  as  the  obsolete  the <STRONG>vwprintw</STRONG> and
+       <STRONG>o</STRONG>   X/Open Curses documents one required header,  in  a  special  case:
+           &lt;stdarg.h&gt;   before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>  and
+           <STRONG>vw_scanw</STRONG> functions (as  well  as  the  obsolete  the  <STRONG>vwprintw</STRONG>  and
            <STRONG>vwscanw</STRONG> functions).  Each of those uses a <STRONG>va_list</STRONG> parameter.
 
-           The two obsolete functions were  introduced  in  SVr3.   The  other
-           functions  were  introduced  in  X/Open  Curses.   In between, SVr4
-           curses provided for  the  possibility  that  an  application  might
+           The  two  obsolete  functions  were  introduced in SVr3.  The other
+           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
+           curses  provided  for  the  possibility  that  an application might
            include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;.  Initially, that was done
-           by using <STRONG>void*</STRONG> for the <STRONG>va_list</STRONG> parameter.  Later,  a  special  type
-           (defined  in &lt;stdio.h&gt;) was introduced, to allow for compiler type-
+           by  using  <STRONG>void*</STRONG>  for the <STRONG>va_list</STRONG> parameter.  Later, a special type
+           (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler  type-
            checking.  That special type is always available, because &lt;stdio.h&gt;
            is always included by &lt;curses.h&gt;.
 
            None of the X/Open Curses implementations require an application to
-           include &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either  have
-           allowed  for  a  special type, or (like <EM>ncurses</EM>) include &lt;stdarg.h&gt;
+           include  &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either have
+           allowed for a special type, or (like  <EM>ncurses</EM>)  include  &lt;stdarg.h&gt;
            directly to provide a portable interface.
 
 
@@ -1504,7 +1499,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-01-13                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1523,7 +1518,7 @@ <H1 class="no-header">ncurses 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-ENVIRONMENT">ENVIRONMENT</a>
 <ul>
-<li><a href="#h3-CC-command-character">CC command-character</a></li>
+<li><a href="#h3-CC-_command-character_">CC (command character)</a></li>
 <li><a href="#h3-BAUDRATE">BAUDRATE</a></li>
 <li><a href="#h3-COLUMNS">COLUMNS</a></li>
 <li><a href="#h3-ESCDELAY">ESCDELAY</a></li>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index a6720a407..501165372 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -28,23 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: panel.3x,v 1.61 2023/12/23 16:22:25 tom Exp @
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
-  * ---------
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index e460448cb..0295c9d53 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -28,7 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: scr_dump.5,v 1.42 2023/12/30 22:06:36 tom Exp @
-  *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index e97dbb15b..c279313bb 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -28,13 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp @
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
-  *   tabs.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/src/cmd/tabs.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
-  *   tabs.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=SysVR4/cmd/tabs/tabs.c
-  * https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 6c5b96a6b..bbcbe644c 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.70 2023/12/30 21:36:32 tom Exp @
+  * @Id: term.5,v 1.73 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2023-12-30 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2024-01-13 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2023-12-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2024-01-13 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -351,37 +351,37 @@ <H1 class="no-header">term 5 2023-12-30 ncurses 6.4 File formats</H1>
        As  an  example,  here  is  a description for the Lear-Siegler ADM-3, a
        popular though rather stupid early terminal:
 
-           adm3a|lsi adm3a,
-                   am,
-                   cols#80, lines#24,
-                   bel=^G, clear=\032$&lt;1&gt;, cr=^M, cub1=^H, cud1=^J,
-                   cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
-                   home=^^, ind=^J,
+       adm3a|lsi adm3a,
+               am,
+               cols#80, lines#24,
+               bel=^G, clear=\032$&lt;1&gt;, cr=^M, cub1=^H, cud1=^J,
+               cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
+               home=^^, ind=^J,
 
        and a hexadecimal dump of the compiled terminal description:
 
-     0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
-     0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
-     0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
-     0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
-     0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
-     0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-     0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$&lt;1
-     0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  &gt;..=%p1% {32}%+%c
-     0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-     0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
+       0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+       0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
+       0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
+       0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
+       0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
+       0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$&lt;1
+       0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  &gt;..=%p1% {32}%+%c
+       0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
+       0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -399,7 +399,7 @@ <H1 class="no-header">term 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-30                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2024-01-13                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 616f52646..9f834d26c 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -28,7 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: term.7,v 1.46 2023/12/02 20:51:25 tom Exp @
-  *SH SYNOPSIS
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a223e7e97..5c8bc28be 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -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 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,53 +32,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.60 2023/12/30 22:21:45 tom Exp @
-  * Head of terminfo man page ends here
-  ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
-  * Copyright 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"), 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.141 2023/12/30 21:36:32 tom Exp @
-  *.in -2
-  *.in +2
-  *.in -2
-  *.in +2
+  * @Id: terminfo.head,v 1.63 2024/01/13 23:07:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2023-12-30 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2024-01-13 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -105,7 +71,7 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240106).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240113).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -159,21 +125,21 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        suffix.   Thus,  a  vt100  in  132-column  mode  would be vt100-w.  The
        following suffixes should be used where possible:
 
-            <STRONG>Suffix</STRONG>                  <STRONG>Meaning</STRONG>                   <STRONG>Example</STRONG>
-            -------------------------------------------------------------
-            -<EM>nn</EM>      Number of lines on the screen            aaa-60
-            -<EM>n</EM>p      Number of pages of memory                c100-4p
-            -am      With automargins (usually the default)   vt100-am
-            -m       Mono mode; suppress color                ansi-m
-            -mc      Magic cookie; spaces when highlighting   wy30-mc
-            -na      No arrow keys (leave them in local)      c100-na
-            -nam     Without automatic margins                vt100-nam
-            -nl      No status line                           att4415-nl
-            -ns      No status line                           hp2626-ns
-            -rv      Reverse video                            c100-rv
-            -s       Enable status line                       vt100-s
-            -vb      Use visible bell instead of beep         wy370-vb
-            -w       Wide mode (&gt; 80 columns, usually 132)    vt100-w
+       <STRONG>Suffix</STRONG>   <STRONG>Example</STRONG>     <STRONG>Meaning</STRONG>
+       ------------------------------------------------------------------------
+       -<EM>nn</EM>      aaa-60      Number of lines on the screen
+       -<EM>n</EM>p      c100-4p     Number of pages of memory
+       -am      vt100-am    With automargins (usually the default)
+       -m       ansi-m      Mono mode; suppress color
+       -mc      wy30-mc     Magic cookie; spaces when highlighting
+       -na      c100-na     No arrow keys (leave them in local)
+       -nam     vt100-nam   Without automatic margins
+       -nl      hp2621-nl   No status line
+       -ns      hp2626-ns   No status line
+       -rv      c100-rv     Reverse video
+       -s       vt100-s     Enable status line
+       -vb      wy370-vb    Use visible bell instead of beep
+       -w       vt100-w     Wide mode (&gt; 80 columns, usually 132)
 
        For more on terminal naming conventions, see the <STRONG><A HREF="term.7.html">term(7)</A></STRONG> manual page.
 
@@ -281,904 +247,732 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
        (#<EM>i</EM>)   indicates the <EM>i</EM>th parameter.
 
-
-       These are the Boolean capabilities:
-
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
-                  <STRONG>Booleans</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-          auto_left_margin            bw        bw     cub1 wraps from
-                                                       column 0 to last
-                                                       column
-          auto_right_margin           am        am     terminal has
-                                                       automatic margins
-          back_color_erase            bce       ut     screen erased with
-                                                       background color
-          can_change                  ccc       cc     terminal can re-
-                                                       define existing
-                                                       colors
-          ceol_standout_glitch        xhp       xs     standout not erased
-                                                       by overwriting (hp)
-          col_addr_glitch             xhpa      YA     only positive motion
-                                                       for hpa/mhpa caps
-          cpi_changes_res             cpix      YF     changing character
-                                                       pitch changes
-                                                       resolution
-          cr_cancels_micro_mode       crxm      YB     using cr turns off
-                                                       micro mode
-          dest_tabs_magic_smso        xt        xt     tabs destructive,
-                                                       magic so char
-                                                       (t1061)
-          eat_newline_glitch          xenl      xn     newline ignored
-                                                       after 80 cols
-                                                       (concept)
-          erase_overstrike            eo        eo     can erase
-                                                       overstrikes with a
-                                                       blank
-          generic_type                gn        gn     generic line type
-          hard_copy                   hc        hc     hardcopy terminal
-          hard_cursor                 chts      HC     cursor is hard to
-                                                       see
-          has_meta_key                km        km     Has a meta key
-                                                       (i.e., sets 8th-bit)
-          has_print_wheel             daisy     YC     printer needs
-                                                       operator to change
-                                                       character set
-          has_status_line             hs        hs     has extra status
-                                                       line
-          hue_lightness_saturation    hls       hl     terminal uses only
-                                                       HLS color notation
-                                                       (Tektronix)
-          insert_null_glitch          in        in     insert mode
-                                                       distinguishes nulls
-          lpi_changes_res             lpix      YG     changing line pitch
-                                                       changes resolution
-          memory_above                da        da     display may be
-                                                       retained above the
-                                                       screen
-          memory_below                db        db     display may be
-                                                       retained below the
-                                                       screen
-          move_insert_mode            mir       mi     safe to move while
-                                                       in insert mode
-          move_standout_mode          msgr      ms     safe to move while
-                                                       in standout mode
-          needs_xon_xoff              nxon      nx     padding will not
-                                                       work, xon/xoff
-                                                       required
-          no_esc_ctlc                 xsb       xb     beehive (f1=escape,
-                                                       f2=ctrl C)
-          no_pad_char                 npc       NP     pad character does
-                                                       not exist
-
-          non_dest_scroll_region      ndscr     ND     scrolling region is
-                                                       non-destructive
-          non_rev_rmcup               nrrmc     NR     smcup does not
-                                                       reverse rmcup
-          over_strike                 os        os     terminal can
-                                                       overstrike
-          prtr_silent                 mc5i      5i     printer will not
-                                                       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
-                                                       xon/xoff handshaking
-
-       These are the numeric capabilities:
-
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
-                   <STRONG>Numeric</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-          columns                     cols      co     number of columns in
-                                                       a line
-          init_tabs                   it        it     tabs initially every
-                                                       # spaces
-          label_height                lh        lh     rows in each label
-          label_width                 lw        lw     columns in each
-                                                       label
-          lines                       lines     li     number of lines on
-                                                       screen or page
-          lines_of_memory             lm        lm     lines of memory if &gt;
-                                                       line. 0 means varies
-          magic_cookie_glitch         xmc       sg     number of blank
-                                                       characters left by
-                                                       smso or rmso
-          max_attributes              ma        ma     maximum combined
-                                                       attributes terminal
-                                                       can handle
-          max_colors                  colors    Co     maximum number of
-                                                       colors on screen
-          max_pairs                   pairs     pa     maximum number of
-                                                       color-pairs on the
-                                                       screen
-          maximum_windows             wnum      MW     maximum number of
-                                                       definable windows
-          no_color_video              ncv       NC     video attributes
-                                                       that cannot be used
-                                                       with colors
-          num_labels                  nlab      Nl     number of labels on
-                                                       screen
-          padding_baud_rate           pb        pb     lowest baud rate
-                                                       where padding needed
-          virtual_terminal            vt        vt     virtual terminal
-                                                       number (CB/unix)
-          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
+                                     <STRONG>Code</STRONG>
+       <STRONG>Boolean</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>      <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+
+       <STRONG>auto_left_margin</STRONG>           <STRONG>bw</STRONG>      <STRONG>bw</STRONG>   cub1 wraps from column 0 to
+                                               last column
+       <STRONG>auto_right_margin</STRONG>          <STRONG>am</STRONG>      <STRONG>am</STRONG>   terminal has automatic margins
+       <STRONG>no_esc_ctlc</STRONG>                <STRONG>xsb</STRONG>     <STRONG>xb</STRONG>   beehive (f1=escape, f2=ctrl C)
+       <STRONG>ceol_standout_glitch</STRONG>       <STRONG>xhp</STRONG>     <STRONG>xs</STRONG>   standout not erased by
+                                               overwriting (hp)
+       <STRONG>eat_newline_glitch</STRONG>         <STRONG>xenl</STRONG>    <STRONG>xn</STRONG>   newline ignored after 80 cols
+                                               (concept)
+       <STRONG>erase_overstrike</STRONG>           <STRONG>eo</STRONG>      <STRONG>eo</STRONG>   can erase overstrikes with a
+                                               blank
+       <STRONG>generic_type</STRONG>               <STRONG>gn</STRONG>      <STRONG>gn</STRONG>   generic line type
+       <STRONG>hard_copy</STRONG>                  <STRONG>hc</STRONG>      <STRONG>hc</STRONG>   hardcopy terminal
+       <STRONG>has_meta_key</STRONG>               <STRONG>km</STRONG>      <STRONG>km</STRONG>   Has a meta key (i.e., sets 8th-
+                                               bit)
+       <STRONG>has_status_line</STRONG>            <STRONG>hs</STRONG>      <STRONG>hs</STRONG>   has extra status line
+       <STRONG>insert_null_glitch</STRONG>         <STRONG>in</STRONG>      <STRONG>in</STRONG>   insert mode distinguishes nulls
+       <STRONG>memory_above</STRONG>               <STRONG>da</STRONG>      <STRONG>da</STRONG>   display may be retained above
+                                               the screen
+       <STRONG>memory_below</STRONG>               <STRONG>db</STRONG>      <STRONG>db</STRONG>   display may be retained below
+                                               the screen
+       <STRONG>move_insert_mode</STRONG>           <STRONG>mir</STRONG>     <STRONG>mi</STRONG>   safe to move while in insert
+                                               mode
+       <STRONG>move_standout_mode</STRONG>         <STRONG>msgr</STRONG>    <STRONG>ms</STRONG>   safe to move while in standout
+                                               mode
+       <STRONG>over_strike</STRONG>                <STRONG>os</STRONG>      <STRONG>os</STRONG>   terminal can overstrike
+       <STRONG>status_line_esc_ok</STRONG>         <STRONG>eslok</STRONG>   <STRONG>es</STRONG>   escape can be used on the
+                                               status line
+       <STRONG>dest_tabs_magic_smso</STRONG>       <STRONG>xt</STRONG>      <STRONG>xt</STRONG>   tabs destructive, magic so char
+                                               (t1061)
+       <STRONG>tilde_glitch</STRONG>               <STRONG>hz</STRONG>      <STRONG>hz</STRONG>   cannot print ~'s (Hazeltine)
+       <STRONG>transparent_underline</STRONG>      <STRONG>ul</STRONG>      <STRONG>ul</STRONG>   underline character overstrikes
+       <STRONG>xon_xoff</STRONG>                   <STRONG>xon</STRONG>     <STRONG>xo</STRONG>   terminal uses xon/xoff
+                                               handshaking
+       <STRONG>needs_xon_xoff</STRONG>             <STRONG>nxon</STRONG>    <STRONG>nx</STRONG>   padding will not work, xon/xoff
+                                               required
+       <STRONG>prtr_silent</STRONG>                <STRONG>mc5i</STRONG>    <STRONG>5i</STRONG>   printer will not echo on screen
+       <STRONG>hard_cursor</STRONG>                <STRONG>chts</STRONG>    <STRONG>HC</STRONG>   cursor is hard to see
+       <STRONG>non_rev_rmcup</STRONG>              <STRONG>nrrmc</STRONG>   <STRONG>NR</STRONG>   smcup does not reverse rmcup
+       <STRONG>no_pad_char</STRONG>                <STRONG>npc</STRONG>     <STRONG>NP</STRONG>   pad character does not exist
+       <STRONG>non_dest_scroll_region</STRONG>     <STRONG>ndscr</STRONG>   <STRONG>ND</STRONG>   scrolling region is non-
+                                               destructive
+       <STRONG>can_change</STRONG>                 <STRONG>ccc</STRONG>     <STRONG>cc</STRONG>   terminal can re-define existing
+                                               colors
+       <STRONG>back_color_erase</STRONG>           <STRONG>bce</STRONG>     <STRONG>ut</STRONG>   screen erased with background
+                                               color
+       <STRONG>hue_lightness_saturation</STRONG>   <STRONG>hls</STRONG>     <STRONG>hl</STRONG>   terminal uses only HLS color
+                                               notation (Tektronix)
+       <STRONG>col_addr_glitch</STRONG>            <STRONG>xhpa</STRONG>    <STRONG>YA</STRONG>   only positive motion for
+                                               hpa/mhpa caps
+       <STRONG>cr_cancels_micro_mode</STRONG>      <STRONG>crxm</STRONG>    <STRONG>YB</STRONG>   using cr turns off micro mode
+       <STRONG>has_print_wheel</STRONG>            <STRONG>daisy</STRONG>   <STRONG>YC</STRONG>   printer needs operator to
+                                               change character set
+       <STRONG>row_addr_glitch</STRONG>            <STRONG>xvpa</STRONG>    <STRONG>YD</STRONG>   only positive motion for
+                                               vpa/mvpa caps
+       <STRONG>semi_auto_right_margin</STRONG>     <STRONG>sam</STRONG>     <STRONG>YE</STRONG>   printing in last column causes
+                                               cr
+       <STRONG>cpi_changes_res</STRONG>            <STRONG>cpix</STRONG>    <STRONG>YF</STRONG>   changing character pitch
+                                               changes resolution
+       <STRONG>lpi_changes_res</STRONG>            <STRONG>lpix</STRONG>    <STRONG>YG</STRONG>   changing line pitch changes
+                                               resolution
+
+                                    <STRONG>Code</STRONG>
+       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>   <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>columns</STRONG>                   <STRONG>cols</STRONG>     <STRONG>co</STRONG>   number of columns in a line
+
+       <STRONG>init_tabs</STRONG>                 <STRONG>it</STRONG>       <STRONG>it</STRONG>   tabs initially every # spaces
+       <STRONG>lines</STRONG>                     <STRONG>lines</STRONG>    <STRONG>li</STRONG>   number of lines on screen or
+                                               page
+       <STRONG>lines_of_memory</STRONG>           <STRONG>lm</STRONG>       <STRONG>lm</STRONG>   lines of memory if &gt; line. 0
+                                               means varies
+       <STRONG>magic_cookie_glitch</STRONG>       <STRONG>xmc</STRONG>      <STRONG>sg</STRONG>   number of blank characters left
+                                               by smso or rmso
+       <STRONG>padding_baud_rate</STRONG>         <STRONG>pb</STRONG>       <STRONG>pb</STRONG>   lowest baud rate where padding
+                                               needed
+       <STRONG>virtual_terminal</STRONG>          <STRONG>vt</STRONG>       <STRONG>vt</STRONG>   virtual terminal number
+                                               (CB/unix)
+       <STRONG>width_status_line</STRONG>         <STRONG>wsl</STRONG>      <STRONG>ws</STRONG>   number of columns in status
+                                               line
+       <STRONG>num_labels</STRONG>                <STRONG>nlab</STRONG>     <STRONG>Nl</STRONG>   number of labels on screen
+       <STRONG>label_height</STRONG>              <STRONG>lh</STRONG>       <STRONG>lh</STRONG>   rows in each label
+       <STRONG>label_width</STRONG>               <STRONG>lw</STRONG>       <STRONG>lw</STRONG>   columns in each label
+       <STRONG>max_attributes</STRONG>            <STRONG>ma</STRONG>       <STRONG>ma</STRONG>   maximum combined attributes
+                                               terminal can handle
+       <STRONG>maximum_windows</STRONG>           <STRONG>wnum</STRONG>     <STRONG>MW</STRONG>   maximum number of definable
+                                               windows
+       <STRONG>max_colors</STRONG>                <STRONG>colors</STRONG>   <STRONG>Co</STRONG>   maximum number of colors on
+                                               screen
+       <STRONG>max_pairs</STRONG>                 <STRONG>pairs</STRONG>    <STRONG>pa</STRONG>   maximum number of color-pairs
+                                               on the screen
+       <STRONG>no_color_video</STRONG>            <STRONG>ncv</STRONG>      <STRONG>NC</STRONG>   video attributes that cannot be
+                                               used with colors
+
+       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.
 
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
-                   <STRONG>Numeric</STRONG>            <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-          bit_image_entwining         bitwin    Yo     number of passes for
-                                                       each bit-image row
-          bit_image_type              bitype    Yp     type of bit-image
-                                                       device
-          buffer_capacity             bufsz     Ya     numbers of bytes
-                                                       buffered before
-                                                       printing
-          buttons                     btns      BT     number of buttons on
-                                                       mouse
-          dot_horz_spacing            spinh     Yc     spacing of dots
-                                                       horizontally in dots
-                                                       per inch
-          dot_vert_spacing            spinv     Yb     spacing of pins
-                                                       vertically in pins
-                                                       per inch
-          max_micro_address           maddr     Yd     maximum value in
-                                                       micro_..._address
-          max_micro_jump              mjump     Ye     maximum value in
-                                                       parm_..._micro
-          micro_col_size              mcs       Yf     character step size
-                                                       when in micro mode
-          micro_line_size             mls       Yg     line step size when
-                                                       in micro mode
-          number_of_pins              npins     Yh     numbers of pins in
-                                                       print-head
-          output_res_char             orc       Yi     horizontal
-                                                       resolution in units
-                                                       per line
-          output_res_horz_inch        orhi      Yk     horizontal
-                                                       resolution in units
-                                                       per inch
-          output_res_line             orl       Yj     vertical resolution
-                                                       in units per line
-          output_res_vert_inch        orvi      Yl     vertical resolution
-                                                       in units per inch
-          print_rate                  cps       Ym     print rate in
-                                                       characters per
-                                                       second
-          wide_char_size              widcs     Yn     character step size
-                                                       when in double wide
-                                                       mode
-
-       These are the string capabilities:
-
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
-                   <STRONG>String</STRONG>             <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-          acs_chars                   acsc      ac     graphics charset
-                                                       pairs, based on
-                                                       vt100
-          back_tab                    cbt       bt     back tab (P)
-          bell                        bel       bl     audible signal
-                                                       (bell) (P)
-          carriage_return             cr        cr     carriage return (P*)
-                                                       (P*)
-          change_char_pitch           cpi       ZA     Change number of
-                                                       characters per inch
-                                                       to #1
-          change_line_pitch           lpi       ZB     Change number of
-                                                       lines per inch to #1
-          change_res_horz             chr       ZC     Change horizontal
-                                                       resolution to #1
-
-          change_res_vert             cvr       ZD     Change vertical
-                                                       resolution to #1
-          change_scroll_region        csr       cs     change region to
-                                                       line #1 to line #2
-                                                       (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
-                                                       soft margins
-          clear_screen                clear     cl     clear screen and
-                                                       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
-                                                       screen (P*)
-          column_address              hpa       ch     horizontal position
-                                                       #1, absolute (P)
-          command_character           cmdch     CC     terminal settable
-                                                       cmd character in
-                                                       prototype !?
-          create_window               cwin      CW     define a window #1
-                                                       from #2,#3 to #4,#5
-          cursor_address              cup       cm     move to row #1
-                                                       columns #2
-          cursor_down                 cud1      do     down one line
-          cursor_home                 home      ho     home cursor (if no
-                                                       cup)
-          cursor_invisible            civis     vi     make cursor
-                                                       invisible
-          cursor_left                 cub1      le     move left one space
-          cursor_mem_address          mrcup     CM     memory relative
-                                                       cursor addressing,
-                                                       move to row #1
-                                                       columns #2
-          cursor_normal               cnorm     ve     make cursor appear
-                                                       normal (undo
-                                                       civis/cvvis)
-          cursor_right                cuf1      nd     non-destructive
-                                                       space (move right
-                                                       one space)
-          cursor_to_ll                ll        ll     last line, first
-                                                       column (if no cup)
-          cursor_up                   cuu1      up     up one line
-          cursor_visible              cvvis     vs     make cursor very
-                                                       visible
-          define_char                 defc      ZE     Define a character
-                                                       #1, #2 dots wide,
-                                                       descender #3
-          delete_character            dch1      dc     delete character
-                                                       (P*)
-          delete_line                 dl1       dl     delete line (P*)
-          dial_phone                  dial      DI     dial number #1
-          dis_status_line             dsl       ds     disable status line
-          display_clock               dclk      DK     display clock
-          down_half_line              hd        hd     half a line down
-          ena_acs                     enacs     eA     enable alternate
-                                                       char set
-          enter_alt_charset_mode      smacs     as     start alternate
-                                                       character set (P)
-          enter_am_mode               smam      SA     turn on automatic
-                                                       margins
-
-          enter_blink_mode            blink     mb     turn on blinking
-          enter_bold_mode             bold      md     turn on bold (extra
-                                                       bright) mode
-          enter_ca_mode               smcup     ti     string to start
-                                                       programs using cup
-          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
-                                                       mode
-          enter_insert_mode           smir      im     enter insert mode
-          enter_italics_mode          sitm      ZH     Enter italic mode
-          enter_leftward_mode         slm       ZI     Start leftward
-                                                       carriage motion
-          enter_micro_mode            smicm     ZJ     Start micro-motion
-                                                       mode
-          enter_near_letter_quality   snlq      ZK     Enter NLQ mode
-          enter_normal_quality        snrmq     ZL     Enter normal-quality
-                                                       mode
-          enter_protected_mode        prot      mp     turn on protected
-                                                       mode
-          enter_reverse_mode          rev       mr     turn on reverse
-                                                       video mode
-          enter_secure_mode           invis     mk     turn on blank mode
-                                                       (characters
-                                                       invisible)
-          enter_shadow_mode           sshm      ZM     Enter shadow-print
-                                                       mode
-          enter_standout_mode         smso      so     begin standout mode
-          enter_subscript_mode        ssubm     ZN     Enter subscript mode
-          enter_superscript_mode      ssupm     ZO     Enter superscript
-                                                       mode
-          enter_underline_mode        smul      us     begin underline mode
-          enter_upward_mode           sum       ZP     Start upward
-                                                       carriage motion
-          enter_xon_mode              smxon     SX     turn on xon/xoff
-                                                       handshaking
-          erase_chars                 ech       ec     erase #1 characters
-                                                       (P)
-          exit_alt_charset_mode       rmacs     ae     end alternate
-                                                       character set (P)
-          exit_am_mode                rmam      RA     turn off automatic
-                                                       margins
-          exit_attribute_mode         sgr0      me     turn off all
-                                                       attributes
-          exit_ca_mode                rmcup     te     strings to end
-                                                       programs using cup
-          exit_delete_mode            rmdc      ed     end delete mode
-          exit_doublewide_mode        rwidm     ZQ     End double-wide mode
-          exit_insert_mode            rmir      ei     exit insert mode
-          exit_italics_mode           ritm      ZR     End italic mode
-          exit_leftward_mode          rlm       ZS     End left-motion mode
-          exit_micro_mode             rmicm     ZT     End micro-motion
-                                                       mode
-          exit_shadow_mode            rshm      ZU     End shadow-print
-                                                       mode
-          exit_standout_mode          rmso      se     exit standout mode
-          exit_subscript_mode         rsubm     ZV     End subscript mode
-          exit_superscript_mode       rsupm     ZW     End superscript mode
-          exit_underline_mode         rmul      ue     exit underline mode
-          exit_upward_mode            rum       ZX     End reverse
-                                                       character motion
-
-
-          exit_xon_mode               rmxon     RX     turn off xon/xoff
-                                                       handshaking
-          fixed_pause                 pause     PA     pause for 2-3
-                                                       seconds
-          flash_hook                  hook      fh     flash switch hook
-          flash_screen                flash     vb     visible bell (may
-                                                       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
-          hangup                      hup       HU     hang-up phone
-          init_1string                is1       i1     initialization
-                                                       string
-          init_2string                is2       is     initialization
-                                                       string
-          init_3string                is3       i3     initialization
-                                                       string
-          init_file                   if        if     name of
-                                                       initialization file
-          init_prog                   iprog     iP     path name of program
-                                                       for initialization
-          initialize_color            initc     Ic     initialize color #1
-                                                       to (#2,#3,#4)
-          initialize_pair             initp     Ip     Initialize color
-                                                       pair #1 to
-                                                       fg=(#2,#3,#4),
-                                                       bg=(#5,#6,#7)
-          insert_character            ich1      ic     insert character (P)
-          insert_line                 il1       al     insert line (P*)
-          insert_padding              ip        ip     insert padding after
-                                                       inserted character
-          key_a1                      ka1       K1     upper left of keypad
-          key_a3                      ka3       K3     upper right of
-                                                       keypad
-          key_b2                      kb2       K2     center of keypad
-          key_backspace               kbs       kb     backspace key
-          key_beg                     kbeg      @1     begin key
-          key_btab                    kcbt      kB     back-tab key
-          key_c1                      kc1       K4     lower left of keypad
-          key_c3                      kc3       K5     lower right of
-                                                       keypad
-          key_cancel                  kcan      @2     cancel key
-          key_catab                   ktbc      ka     clear-all-tabs key
-          key_clear                   kclr      kC     clear-screen or
-                                                       erase key
-          key_close                   kclo      @3     close key
-          key_command                 kcmd      @4     command key
-          key_copy                    kcpy      @5     copy key
-          key_create                  kcrt      @6     create key
-          key_ctab                    kctab     kt     clear-tab key
-          key_dc                      kdch1     kD     delete-character key
-          key_dl                      kdl1      kL     delete-line key
-          key_down                    kcud1     kd     down-arrow key
-          key_eic                     krmir     kM     sent by rmir or smir
-                                                       in insert mode
-          key_end                     kend      @7     end key
-          key_enter                   kent      @8     enter/send key
-          key_eol                     kel       kE     clear-to-end-of-line
-                                                       key
-          key_eos                     ked       kS     clear-to-end-of-
-                                                       screen key
-          key_exit                    kext      @9     exit key
-          key_f0                      kf0       k0     F0 function key
-
-          key_f1                      kf1       k1     F1 function key
-          key_f10                     kf10      k;     F10 function key
-          key_f11                     kf11      F1     F11 function key
-          key_f12                     kf12      F2     F12 function key
-          key_f13                     kf13      F3     F13 function key
-          key_f14                     kf14      F4     F14 function key
-          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
-          key_f20                     kf20      FA     F20 function key
-          key_f21                     kf21      FB     F21 function key
-          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
-          key_f28                     kf28      FI     F28 function key
-          key_f29                     kf29      FJ     F29 function key
-          key_f3                      kf3       k3     F3 function key
-          key_f30                     kf30      FK     F30 function key
-          key_f31                     kf31      FL     F31 function key
-          key_f32                     kf32      FM     F32 function key
-          key_f33                     kf33      FN     F33 function key
-          key_f34                     kf34      FO     F34 function key
-          key_f35                     kf35      FP     F35 function key
-          key_f36                     kf36      FQ     F36 function key
-          key_f37                     kf37      FR     F37 function key
-          key_f38                     kf38      FS     F38 function key
-          key_f39                     kf39      FT     F39 function key
-          key_f4                      kf4       k4     F4 function key
-          key_f40                     kf40      FU     F40 function key
-          key_f41                     kf41      FV     F41 function key
-          key_f42                     kf42      FW     F42 function key
-          key_f43                     kf43      FX     F43 function key
-          key_f44                     kf44      FY     F44 function key
-          key_f45                     kf45      FZ     F45 function key
-          key_f46                     kf46      Fa     F46 function key
-          key_f47                     kf47      Fb     F47 function key
-          key_f48                     kf48      Fc     F48 function key
-          key_f49                     kf49      Fd     F49 function key
-          key_f5                      kf5       k5     F5 function key
-          key_f50                     kf50      Fe     F50 function key
-          key_f51                     kf51      Ff     F51 function key
-          key_f52                     kf52      Fg     F52 function key
-          key_f53                     kf53      Fh     F53 function key
-          key_f54                     kf54      Fi     F54 function key
-          key_f55                     kf55      Fj     F55 function key
-          key_f56                     kf56      Fk     F56 function key
-          key_f57                     kf57      Fl     F57 function key
-          key_f58                     kf58      Fm     F58 function key
-          key_f59                     kf59      Fn     F59 function key
-          key_f6                      kf6       k6     F6 function key
-          key_f60                     kf60      Fo     F60 function key
-          key_f61                     kf61      Fp     F61 function key
-          key_f62                     kf62      Fq     F62 function key
-          key_f63                     kf63      Fr     F63 function key
-          key_f7                      kf7       k7     F7 function key
-          key_f8                      kf8       k8     F8 function key
-          key_f9                      kf9       k9     F9 function key
-          key_find                    kfnd      @0     find key
-          key_help                    khlp      %1     help key
-
-          key_home                    khome     kh     home key
-          key_ic                      kich1     kI     insert-character key
-          key_il                      kil1      kA     insert-line key
-          key_left                    kcub1     kl     left-arrow key
-          key_ll                      kll       kH     lower-left key (home
-                                                       down)
-          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
-          key_options                 kopt      %7     options key
-          key_ppage                   kpp       kP     previous-page key
-          key_previous                kprv      %8     previous key
-          key_print                   kprt      %9     print key
-          key_redo                    krdo      %0     redo key
-          key_reference               kref      &amp;1     reference key
-          key_refresh                 krfr      &amp;2     refresh key
-          key_replace                 krpl      &amp;3     replace key
-          key_restart                 krst      &amp;4     restart key
-          key_resume                  kres      &amp;5     resume key
-          key_right                   kcuf1     kr     right-arrow key
-          key_save                    ksav      &amp;6     save key
-          key_sbeg                    kBEG      &amp;9     shifted begin key
-          key_scancel                 kCAN      &amp;0     shifted cancel key
-          key_scommand                kCMD      *1     shifted command key
-          key_scopy                   kCPY      *2     shifted copy key
-          key_screate                 kCRT      *3     shifted create key
-          key_sdc                     kDC       *4     shifted delete-
-                                                       character key
-          key_sdl                     kDL       *5     shifted delete-line
-                                                       key
-          key_select                  kslt      *6     select key
-          key_send                    kEND      *7     shifted end key
-          key_seol                    kEOL      *8     shifted clear-to-
-                                                       end-of-line key
-          key_sexit                   kEXT      *9     shifted exit key
-          key_sf                      kind      kF     scroll-forward key
-          key_sfind                   kFND      *0     shifted find key
-          key_shelp                   kHLP      #1     shifted help key
-          key_shome                   kHOM      #2     shifted home key
-          key_sic                     kIC       #3     shifted insert-
-                                                       character key
-          key_sleft                   kLFT      #4     shifted left-arrow
-                                                       key
-          key_smessage                kMSG      %a     shifted message key
-          key_smove                   kMOV      %b     shifted move key
-          key_snext                   kNXT      %c     shifted next key
-          key_soptions                kOPT      %d     shifted options key
-          key_sprevious               kPRV      %e     shifted previous key
-          key_sprint                  kPRT      %f     shifted print key
-          key_sr                      kri       kR     scroll-backward key
-          key_sredo                   kRDO      %g     shifted redo key
-          key_sreplace                kRPL      %h     shifted replace key
-          key_sright                  kRIT      %i     shifted right-arrow
-                                                       key
-          key_srsume                  kRES      %j     shifted resume key
-          key_ssave                   kSAV      !1     shifted save key
-          key_ssuspend                kSPD      !2     shifted suspend key
-          key_stab                    khts      kT     set-tab key
-          key_sundo                   kUND      !3     shifted undo key
-          key_suspend                 kspd      &amp;7     suspend key
-          key_undo                    kund      &amp;8     undo key
-          key_up                      kcuu1     ku     up-arrow key
-
-          keypad_local                rmkx      ke     leave
-                                                       'keyboard_transmit'
-                                                       mode
-          keypad_xmit                 smkx      ks     enter
-                                                       'keyboard_transmit'
-                                                       mode
-          lab_f0                      lf0       l0     label on function
-                                                       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
-                                                       key f2 if not f2
-          lab_f3                      lf3       l3     label on function
-                                                       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
-                                                       key f6 if not f6
-          lab_f7                      lf7       l7     label on function
-                                                       key f7 if not f7
-          lab_f8                      lf8       l8     label on function
-                                                       key f8 if not f8
-          lab_f9                      lf9       l9     label on function
-                                                       key f9 if not f9
-          label_format                fln       Lf     label format
-          label_off                   rmln      LF     turn off soft labels
-          label_on                    smln      LO     turn on soft labels
-          meta_off                    rmm       mo     turn off meta mode
-          meta_on                     smm       mm     turn on meta mode
-                                                       (8th-bit on)
-          micro_column_address        mhpa      ZY     Like column_address
-                                                       in micro mode
-          micro_down                  mcud1     ZZ     Like cursor_down in
-                                                       micro mode
-          micro_left                  mcub1     Za     Like cursor_left in
-                                                       micro mode
-          micro_right                 mcuf1     Zb     Like cursor_right in
-                                                       micro mode
-          micro_row_address           mvpa      Zc     Like row_address #1
-                                                       in micro mode
-          micro_up                    mcuu1     Zd     Like cursor_up in
-                                                       micro mode
-          newline                     nel       nw     newline (behave like
-                                                       cr followed by lf)
-          order_of_pins               porder    Ze     Match software bits
-                                                       to print-head pins
-          orig_colors                 oc        oc     Set all color pairs
-                                                       to the original ones
-          orig_pair                   op        op     Set default pair to
-                                                       its original value
-          pad_char                    pad       pc     padding char
-                                                       (instead of null)
-          parm_dch                    dch       DC     delete #1 characters
-                                                       (P*)
-          parm_delete_line            dl        DL     delete #1 lines (P*)
-          parm_down_cursor            cud       DO     down #1 lines (P*)
-          parm_down_micro             mcud      Zf     Like
-                                                       parm_down_cursor in
-                                                       micro mode
-          parm_ich                    ich       IC     insert #1 characters
-                                                       (P*)
-
-          parm_index                  indn      SF     scroll forward #1
-                                                       lines (P)
-          parm_insert_line            il        AL     insert #1 lines (P*)
-          parm_left_cursor            cub       LE     move #1 characters
-                                                       to the left (P)
-          parm_left_micro             mcub      Zg     Like
-                                                       parm_left_cursor in
-                                                       micro mode
-          parm_right_cursor           cuf       RI     move #1 characters
-                                                       to the right (P*)
-          parm_right_micro            mcuf      Zh     Like
-                                                       parm_right_cursor in
-                                                       micro mode
-          parm_rindex                 rin       SR     scroll back #1 lines
-                                                       (P)
-          parm_up_cursor              cuu       UP     up #1 lines (P*)
-          parm_up_micro               mcuu      Zi     Like parm_up_cursor
-                                                       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
-          pkey_xmit                   pfx       px     program function key
-                                                       #1 to transmit
-                                                       string #2
-          plab_norm                   pln       pn     program label #1 to
-                                                       show string #2
-          print_screen                mc0       ps     print contents of
-                                                       screen
-          prtr_non                    mc5p      pO     turn on printer for
-                                                       #1 bytes
-          prtr_off                    mc4       pf     turn off printer
-          prtr_on                     mc5       po     turn on printer
-          pulse                       pulse     PU     select pulse dialing
-          quick_dial                  qdial     QD     dial number #1
-                                                       without checking
-          remove_clock                rmclk     RC     remove clock
-          repeat_char                 rep       rp     repeat char #1 #2
-                                                       times (P*)
-          req_for_input               rfi       RF     send next input char
-                                                       (for ptys)
-          reset_1string               rs1       r1     reset string
-          reset_2string               rs2       r2     reset string
-          reset_3string               rs3       r3     reset string
-          reset_file                  rf        rf     name of reset file
-          restore_cursor              rc        rc     restore cursor to
-                                                       position of last
-                                                       save_cursor
-          row_address                 vpa       cv     vertical position #1
-                                                       absolute (P)
-          save_cursor                 sc        sc     save current cursor
-                                                       position (P)
-          scroll_forward              ind       sf     scroll text up (P)
-          scroll_reverse              ri        sr     scroll text down (P)
-          select_char_set             scs       Zj     Select character
-                                                       set, #1
-          set_attributes              sgr       sa     define video
-                                                       attributes #1-#9
-                                                       (PG9)
-          set_background              setb      Sb     Set background color
-                                                       #1
-          set_bottom_margin           smgb      Zk     Set bottom margin at
-                                                       current line
-
-
-          set_bottom_margin_parm      smgbp     Zl     Set bottom margin at
-                                                       line #1 or (if smgtp
-                                                       is not given) #2
-                                                       lines from bottom
-          set_clock                   sclk      SC     set clock, #1 hrs #2
-                                                       mins #3 secs
-          set_color_pair              scp       sp     Set current color
-                                                       pair to #1
-          set_foreground              setf      Sf     Set foreground color
-                                                       #1
-          set_left_margin             smgl      ML     set left soft margin
-                                                       at current
-                                                       column.     (ML is
-                                                       not in BSD termcap).
-          set_left_margin_parm        smglp     Zm     Set left (right)
-                                                       margin at column #1
-          set_right_margin            smgr      MR     set right soft
-                                                       margin at current
-                                                       column
-          set_right_margin_parm       smgrp     Zn     Set right margin at
-                                                       column #1
-          set_tab                     hts       st     set a tab in every
-                                                       row, current columns
-          set_top_margin              smgt      Zo     Set top margin at
-                                                       current line
-          set_top_margin_parm         smgtp     Zp     Set top (bottom)
-                                                       margin at row #1
-          set_window                  wind      wi     current window is
-                                                       lines #1-#2 cols
-                                                       #3-#4
-          start_bit_image             sbim      Zq     Start printing bit
-                                                       image graphics
-          start_char_set_def          scsd      Zr     Start character set
-                                                       definition #1, with
-                                                       #2 characters in the
-                                                       set
-          stop_bit_image              rbim      Zs     Stop printing bit
-                                                       image graphics
-          stop_char_set_def           rcsd      Zt     End definition of
-                                                       character set #1
-          subscript_characters        subcs     Zu     List of
-                                                       subscriptable
-                                                       characters
-          superscript_characters      supcs     Zv     List of
-                                                       superscriptable
-                                                       characters
-          tab                         ht        ta     tab to next 8-space
-                                                       hardware tab stop
-          these_cause_cr              docr      Zw     Printing any of
-                                                       these characters
-                                                       causes CR
-          to_status_line              tsl       ts     move to status line,
-                                                       column #1
-          tone                        tone      TO     select touch tone
-                                                       dialing
-          underline_char              uc        uc     underline char and
-                                                       move past it
-          up_half_line                hu        hu     half a line up
-          user0                       u0        u0     User string #0
-          user1                       u1        u1     User string #1
-          user2                       u2        u2     User string #2
-          user3                       u3        u3     User string #3
-          user4                       u4        u4     User string #4
-          user5                       u5        u5     User string #5
-          user6                       u6        u6     User string #6
-
-          user7                       u7        u7     User string #7
-          user8                       u8        u8     User string #8
-          user9                       u9        u9     User string #9
-          wait_tone                   wait      WA     wait for dial-tone
-          xoff_character              xoffc     XF     XOFF character
-          xon_character               xonc      XN     XON character
-          zero_motion                 zerom     Zx     No motion for
-                                                       subsequent character
+                                    <STRONG>Code</STRONG>
+       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>   <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>buffer_capacity</STRONG>           <STRONG>bufsz</STRONG>    <STRONG>Ya</STRONG>   numbers of bytes buffered
+                                               before printing
+       <STRONG>dot_vert_spacing</STRONG>          <STRONG>spinv</STRONG>    <STRONG>Yb</STRONG>   spacing of pins vertically in
+                                               pins per inch
+       <STRONG>dot_horz_spacing</STRONG>          <STRONG>spinh</STRONG>    <STRONG>Yc</STRONG>   spacing of dots horizontally in
+                                               dots per inch
+       <STRONG>max_micro_address</STRONG>         <STRONG>maddr</STRONG>    <STRONG>Yd</STRONG>   maximum value in
+                                               micro_..._address
+       <STRONG>max_micro_jump</STRONG>            <STRONG>mjump</STRONG>    <STRONG>Ye</STRONG>   maximum value in parm_..._micro
+       <STRONG>micro_col_size</STRONG>            <STRONG>mcs</STRONG>      <STRONG>Yf</STRONG>   character step size when in
+                                               micro mode
+       <STRONG>micro_line_size</STRONG>           <STRONG>mls</STRONG>      <STRONG>Yg</STRONG>   line step size when in micro
+                                               mode
+       <STRONG>number_of_pins</STRONG>            <STRONG>npins</STRONG>    <STRONG>Yh</STRONG>   numbers of pins in print-head
+       <STRONG>output_res_char</STRONG>           <STRONG>orc</STRONG>      <STRONG>Yi</STRONG>   horizontal resolution in units
+                                               per line
+       <STRONG>output_res_line</STRONG>           <STRONG>orl</STRONG>      <STRONG>Yj</STRONG>   vertical resolution in units
+                                               per line
+       <STRONG>output_res_horz_inch</STRONG>      <STRONG>orhi</STRONG>     <STRONG>Yk</STRONG>   horizontal resolution in units
+                                               per inch
+       <STRONG>output_res_vert_inch</STRONG>      <STRONG>orvi</STRONG>     <STRONG>Yl</STRONG>   vertical resolution in units
+                                               per inch
+       <STRONG>print_rate</STRONG>                <STRONG>cps</STRONG>      <STRONG>Ym</STRONG>   print rate in characters per
+                                               second
+       <STRONG>wide_char_size</STRONG>            <STRONG>widcs</STRONG>    <STRONG>Yn</STRONG>   character step size when in
+                                               double wide mode
+       <STRONG>buttons</STRONG>                   <STRONG>btns</STRONG>     <STRONG>BT</STRONG>   number of buttons on mouse
+       <STRONG>bit_image_entwining</STRONG>       <STRONG>bitwin</STRONG>   <STRONG>Yo</STRONG>   number of passes for each bit-
+                                               image row
+       <STRONG>bit_image_type</STRONG>            <STRONG>bitype</STRONG>   <STRONG>Yp</STRONG>   type of bit-image device
+
+                                      <STRONG>Code</STRONG>
+
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>      <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>back_tab</STRONG>                    <STRONG>cbt</STRONG>      <STRONG>bt</STRONG>   back tab (P)
+       <STRONG>bell</STRONG>                        <STRONG>bel</STRONG>      <STRONG>bl</STRONG>   audible signal (bell) (P)
+       <STRONG>carriage_return</STRONG>             <STRONG>cr</STRONG>       <STRONG>cr</STRONG>   carriage return (P*) (P*)
+       <STRONG>change_scroll_region</STRONG>        <STRONG>csr</STRONG>      <STRONG>cs</STRONG>   change region to line #1 to
+                                                 line #2 (P)
+       <STRONG>clear_all_tabs</STRONG>              <STRONG>tbc</STRONG>      <STRONG>ct</STRONG>   clear all tab stops (P)
+       <STRONG>clear_screen</STRONG>                <STRONG>clear</STRONG>    <STRONG>cl</STRONG>   clear screen and home cursor
+                                                 (P*)
+       <STRONG>clr_eol</STRONG>                     <STRONG>el</STRONG>       <STRONG>ce</STRONG>   clear to end of line (P)
+       <STRONG>clr_eos</STRONG>                     <STRONG>ed</STRONG>       <STRONG>cd</STRONG>   clear to end of screen (P*)
+       <STRONG>column_address</STRONG>              <STRONG>hpa</STRONG>      <STRONG>ch</STRONG>   horizontal position #1,
+                                                 absolute (P)
+       <STRONG>command_character</STRONG>           <STRONG>cmdch</STRONG>    <STRONG>CC</STRONG>   terminal settable cmd
+                                                 character in prototype !?
+       <STRONG>cursor_address</STRONG>              <STRONG>cup</STRONG>      <STRONG>cm</STRONG>   move to row #1 columns #2
+       <STRONG>cursor_down</STRONG>                 <STRONG>cud1</STRONG>     <STRONG>do</STRONG>   down one line
+       <STRONG>cursor_home</STRONG>                 <STRONG>home</STRONG>     <STRONG>ho</STRONG>   home cursor (if no cup)
+       <STRONG>cursor_invisible</STRONG>            <STRONG>civis</STRONG>    <STRONG>vi</STRONG>   make cursor invisible
+       <STRONG>cursor_left</STRONG>                 <STRONG>cub1</STRONG>     <STRONG>le</STRONG>   move left one space
+       <STRONG>cursor_mem_address</STRONG>          <STRONG>mrcup</STRONG>    <STRONG>CM</STRONG>   memory relative cursor
+                                                 addressing, move to row #1
+                                                 columns #2
+       <STRONG>cursor_normal</STRONG>               <STRONG>cnorm</STRONG>    <STRONG>ve</STRONG>   make cursor appear normal
+                                                 (undo civis/cvvis)
+       <STRONG>cursor_right</STRONG>                <STRONG>cuf1</STRONG>     <STRONG>nd</STRONG>   non-destructive space (move
+                                                 right one space)
+       <STRONG>cursor_to_ll</STRONG>                <STRONG>ll</STRONG>       <STRONG>ll</STRONG>   last line, first column (if
+                                                 no cup)
+       <STRONG>cursor_up</STRONG>                   <STRONG>cuu1</STRONG>     <STRONG>up</STRONG>   up one line
+       <STRONG>cursor_visible</STRONG>              <STRONG>cvvis</STRONG>    <STRONG>vs</STRONG>   make cursor very visible
+       <STRONG>delete_character</STRONG>            <STRONG>dch1</STRONG>     <STRONG>dc</STRONG>   delete character (P*)
+       <STRONG>delete_line</STRONG>                 <STRONG>dl1</STRONG>      <STRONG>dl</STRONG>   delete line (P*)
+       <STRONG>dis_status_line</STRONG>             <STRONG>dsl</STRONG>      <STRONG>ds</STRONG>   disable status line
+       <STRONG>down_half_line</STRONG>              <STRONG>hd</STRONG>       <STRONG>hd</STRONG>   half a line down
+       <STRONG>enter_alt_charset_mode</STRONG>      <STRONG>smacs</STRONG>    <STRONG>as</STRONG>   start alternate character set
+                                                 (P)
+       <STRONG>enter_blink_mode</STRONG>            <STRONG>blink</STRONG>    <STRONG>mb</STRONG>   turn on blinking
+       <STRONG>enter_bold_mode</STRONG>             <STRONG>bold</STRONG>     <STRONG>md</STRONG>   turn on bold (extra bright)
+                                                 mode
+       <STRONG>enter_ca_mode</STRONG>               <STRONG>smcup</STRONG>    <STRONG>ti</STRONG>   string to start programs
+                                                 using cup
+       <STRONG>enter_delete_mode</STRONG>           <STRONG>smdc</STRONG>     <STRONG>dm</STRONG>   enter delete mode
+       <STRONG>enter_dim_mode</STRONG>              <STRONG>dim</STRONG>      <STRONG>mh</STRONG>   turn on half-bright mode
+       <STRONG>enter_insert_mode</STRONG>           <STRONG>smir</STRONG>     <STRONG>im</STRONG>   enter insert mode
+       <STRONG>enter_secure_mode</STRONG>           <STRONG>invis</STRONG>    <STRONG>mk</STRONG>   turn on blank mode
+                                                 (characters invisible)
+       <STRONG>enter_protected_mode</STRONG>        <STRONG>prot</STRONG>     <STRONG>mp</STRONG>   turn on protected mode
+       <STRONG>enter_reverse_mode</STRONG>          <STRONG>rev</STRONG>      <STRONG>mr</STRONG>   turn on reverse video mode
+       <STRONG>enter_standout_mode</STRONG>         <STRONG>smso</STRONG>     <STRONG>so</STRONG>   begin standout mode
+       <STRONG>enter_underline_mode</STRONG>        <STRONG>smul</STRONG>     <STRONG>us</STRONG>   begin underline mode
+       <STRONG>erase_chars</STRONG>                 <STRONG>ech</STRONG>      <STRONG>ec</STRONG>   erase #1 characters (P)
+       <STRONG>exit_alt_charset_mode</STRONG>       <STRONG>rmacs</STRONG>    <STRONG>ae</STRONG>   end alternate character set
+                                                 (P)
+       <STRONG>exit_attribute_mode</STRONG>         <STRONG>sgr0</STRONG>     <STRONG>me</STRONG>   turn off all attributes
+       <STRONG>exit_ca_mode</STRONG>                <STRONG>rmcup</STRONG>    <STRONG>te</STRONG>   strings to end programs using
+                                                 cup
+       <STRONG>exit_delete_mode</STRONG>            <STRONG>rmdc</STRONG>     <STRONG>ed</STRONG>   end delete mode
+       <STRONG>exit_insert_mode</STRONG>            <STRONG>rmir</STRONG>     <STRONG>ei</STRONG>   exit insert mode
+       <STRONG>exit_standout_mode</STRONG>          <STRONG>rmso</STRONG>     <STRONG>se</STRONG>   exit standout mode
+       <STRONG>exit_underline_mode</STRONG>         <STRONG>rmul</STRONG>     <STRONG>ue</STRONG>   exit underline mode
+       <STRONG>flash_screen</STRONG>                <STRONG>flash</STRONG>    <STRONG>vb</STRONG>   visible bell (may not move
+                                                 cursor)
+
+
+       <STRONG>form_feed</STRONG>                   <STRONG>ff</STRONG>       <STRONG>ff</STRONG>   hardcopy terminal page eject
+                                                 (P*)
+       <STRONG>from_status_line</STRONG>            <STRONG>fsl</STRONG>      <STRONG>fs</STRONG>   return from status line
+       <STRONG>init_1string</STRONG>                <STRONG>is1</STRONG>      <STRONG>i1</STRONG>   initialization string
+       <STRONG>init_2string</STRONG>                <STRONG>is2</STRONG>      <STRONG>is</STRONG>   initialization string
+       <STRONG>init_3string</STRONG>                <STRONG>is3</STRONG>      <STRONG>i3</STRONG>   initialization string
+       <STRONG>init_file</STRONG>                   <STRONG>if</STRONG>       <STRONG>if</STRONG>   name of initialization file
+       <STRONG>insert_character</STRONG>            <STRONG>ich1</STRONG>     <STRONG>ic</STRONG>   insert character (P)
+       <STRONG>insert_line</STRONG>                 <STRONG>il1</STRONG>      <STRONG>al</STRONG>   insert line (P*)
+       <STRONG>insert_padding</STRONG>              <STRONG>ip</STRONG>       <STRONG>ip</STRONG>   insert padding after inserted
+                                                 character
+       <STRONG>key_backspace</STRONG>               <STRONG>kbs</STRONG>      <STRONG>kb</STRONG>   backspace key
+       <STRONG>key_catab</STRONG>                   <STRONG>ktbc</STRONG>     <STRONG>ka</STRONG>   clear-all-tabs key
+       <STRONG>key_clear</STRONG>                   <STRONG>kclr</STRONG>     <STRONG>kC</STRONG>   clear-screen or erase key
+       <STRONG>key_ctab</STRONG>                    <STRONG>kctab</STRONG>    <STRONG>kt</STRONG>   clear-tab key
+       <STRONG>key_dc</STRONG>                      <STRONG>kdch1</STRONG>    <STRONG>kD</STRONG>   delete-character key
+       <STRONG>key_dl</STRONG>                      <STRONG>kdl1</STRONG>     <STRONG>kL</STRONG>   delete-line key
+       <STRONG>key_down</STRONG>                    <STRONG>kcud1</STRONG>    <STRONG>kd</STRONG>   down-arrow key
+       <STRONG>key_eic</STRONG>                     <STRONG>krmir</STRONG>    <STRONG>kM</STRONG>   sent by rmir or smir in
+                                                 insert mode
+       <STRONG>key_eol</STRONG>                     <STRONG>kel</STRONG>      <STRONG>kE</STRONG>   clear-to-end-of-line key
+       <STRONG>key_eos</STRONG>                     <STRONG>ked</STRONG>      <STRONG>kS</STRONG>   clear-to-end-of-screen key
+       <STRONG>key_f0</STRONG>                      <STRONG>kf0</STRONG>      <STRONG>k0</STRONG>   F0 function key
+       <STRONG>key_f1</STRONG>                      <STRONG>kf1</STRONG>      <STRONG>k1</STRONG>   F1 function key
+       <STRONG>key_f10</STRONG>                     <STRONG>kf10</STRONG>     <STRONG>k;</STRONG>   F10 function key
+       <STRONG>key_f2</STRONG>                      <STRONG>kf2</STRONG>      <STRONG>k2</STRONG>   F2 function key
+       <STRONG>key_f3</STRONG>                      <STRONG>kf3</STRONG>      <STRONG>k3</STRONG>   F3 function key
+       <STRONG>key_f4</STRONG>                      <STRONG>kf4</STRONG>      <STRONG>k4</STRONG>   F4 function key
+       <STRONG>key_f5</STRONG>                      <STRONG>kf5</STRONG>      <STRONG>k5</STRONG>   F5 function key
+       <STRONG>key_f6</STRONG>                      <STRONG>kf6</STRONG>      <STRONG>k6</STRONG>   F6 function key
+       <STRONG>key_f7</STRONG>                      <STRONG>kf7</STRONG>      <STRONG>k7</STRONG>   F7 function key
+       <STRONG>key_f8</STRONG>                      <STRONG>kf8</STRONG>      <STRONG>k8</STRONG>   F8 function key
+       <STRONG>key_f9</STRONG>                      <STRONG>kf9</STRONG>      <STRONG>k9</STRONG>   F9 function key
+       <STRONG>key_home</STRONG>                    <STRONG>khome</STRONG>    <STRONG>kh</STRONG>   home key
+       <STRONG>key_ic</STRONG>                      <STRONG>kich1</STRONG>    <STRONG>kI</STRONG>   insert-character key
+       <STRONG>key_il</STRONG>                      <STRONG>kil1</STRONG>     <STRONG>kA</STRONG>   insert-line key
+       <STRONG>key_left</STRONG>                    <STRONG>kcub1</STRONG>    <STRONG>kl</STRONG>   left-arrow key
+       <STRONG>key_ll</STRONG>                      <STRONG>kll</STRONG>      <STRONG>kH</STRONG>   lower-left key (home down)
+       <STRONG>key_npage</STRONG>                   <STRONG>knp</STRONG>      <STRONG>kN</STRONG>   next-page key
+       <STRONG>key_ppage</STRONG>                   <STRONG>kpp</STRONG>      <STRONG>kP</STRONG>   previous-page key
+       <STRONG>key_right</STRONG>                   <STRONG>kcuf1</STRONG>    <STRONG>kr</STRONG>   right-arrow key
+       <STRONG>key_sf</STRONG>                      <STRONG>kind</STRONG>     <STRONG>kF</STRONG>   scroll-forward key
+       <STRONG>key_sr</STRONG>                      <STRONG>kri</STRONG>      <STRONG>kR</STRONG>   scroll-backward key
+       <STRONG>key_stab</STRONG>                    <STRONG>khts</STRONG>     <STRONG>kT</STRONG>   set-tab key
+       <STRONG>key_up</STRONG>                      <STRONG>kcuu1</STRONG>    <STRONG>ku</STRONG>   up-arrow key
+       <STRONG>keypad_local</STRONG>                <STRONG>rmkx</STRONG>     <STRONG>ke</STRONG>   leave keyboard transmit mode
+       <STRONG>keypad_xmit</STRONG>                 <STRONG>smkx</STRONG>     <STRONG>ks</STRONG>   enter keyboard transmit mode
+       <STRONG>lab_f0</STRONG>                      <STRONG>lf0</STRONG>      <STRONG>l0</STRONG>   label on function key f0 if
+                                                 not f0
+       <STRONG>lab_f1</STRONG>                      <STRONG>lf1</STRONG>      <STRONG>l1</STRONG>   label on function key f1 if
+                                                 not f1
+       <STRONG>lab_f10</STRONG>                     <STRONG>lf10</STRONG>     <STRONG>la</STRONG>   label on function key f10 if
+                                                 not f10
+       <STRONG>lab_f2</STRONG>                      <STRONG>lf2</STRONG>      <STRONG>l2</STRONG>   label on function key f2 if
+                                                 not f2
+       <STRONG>lab_f3</STRONG>                      <STRONG>lf3</STRONG>      <STRONG>l3</STRONG>   label on function key f3 if
+                                                 not f3
+       <STRONG>lab_f4</STRONG>                      <STRONG>lf4</STRONG>      <STRONG>l4</STRONG>   label on function key f4 if
+                                                 not f4
+       <STRONG>lab_f5</STRONG>                      <STRONG>lf5</STRONG>      <STRONG>l5</STRONG>   label on function key f5 if
+                                                 not f5
+       <STRONG>lab_f6</STRONG>                      <STRONG>lf6</STRONG>      <STRONG>l6</STRONG>   label on function key f6 if
+                                                 not f6
+       <STRONG>lab_f7</STRONG>                      <STRONG>lf7</STRONG>      <STRONG>l7</STRONG>   label on function key f7 if
+                                                 not f7
+
+       <STRONG>lab_f8</STRONG>                      <STRONG>lf8</STRONG>      <STRONG>l8</STRONG>   label on function key f8 if
+                                                 not f8
+       <STRONG>lab_f9</STRONG>                      <STRONG>lf9</STRONG>      <STRONG>l9</STRONG>   label on function key f9 if
+                                                 not f9
+       <STRONG>meta_off</STRONG>                    <STRONG>rmm</STRONG>      <STRONG>mo</STRONG>   turn off meta mode
+       <STRONG>meta_on</STRONG>                     <STRONG>smm</STRONG>      <STRONG>mm</STRONG>   turn on meta mode (8th-bit
+                                                 on)
+       <STRONG>newline</STRONG>                     <STRONG>nel</STRONG>      <STRONG>nw</STRONG>   newline (behave like cr
+                                                 followed by lf)
+       <STRONG>pad_char</STRONG>                    <STRONG>pad</STRONG>      <STRONG>pc</STRONG>   padding char (instead of
+                                                 null)
+       <STRONG>parm_dch</STRONG>                    <STRONG>dch</STRONG>      <STRONG>DC</STRONG>   delete #1 characters (P*)
+       <STRONG>parm_delete_line</STRONG>            <STRONG>dl</STRONG>       <STRONG>DL</STRONG>   delete #1 lines (P*)
+       <STRONG>parm_down_cursor</STRONG>            <STRONG>cud</STRONG>      <STRONG>DO</STRONG>   down #1 lines (P*)
+       <STRONG>parm_ich</STRONG>                    <STRONG>ich</STRONG>      <STRONG>IC</STRONG>   insert #1 characters (P*)
+       <STRONG>parm_index</STRONG>                  <STRONG>indn</STRONG>     <STRONG>SF</STRONG>   scroll forward #1 lines (P)
+       <STRONG>parm_insert_line</STRONG>            <STRONG>il</STRONG>       <STRONG>AL</STRONG>   insert #1 lines (P*)
+       <STRONG>parm_left_cursor</STRONG>            <STRONG>cub</STRONG>      <STRONG>LE</STRONG>   move #1 characters to the
+                                                 left (P)
+       <STRONG>parm_right_cursor</STRONG>           <STRONG>cuf</STRONG>      <STRONG>RI</STRONG>   move #1 characters to the
+                                                 right (P*)
+       <STRONG>parm_rindex</STRONG>                 <STRONG>rin</STRONG>      <STRONG>SR</STRONG>   scroll back #1 lines (P)
+       <STRONG>parm_up_cursor</STRONG>              <STRONG>cuu</STRONG>      <STRONG>UP</STRONG>   up #1 lines (P*)
+       <STRONG>pkey_key</STRONG>                    <STRONG>pfkey</STRONG>    <STRONG>pk</STRONG>   program function key #1 to
+                                                 type string #2
+       <STRONG>pkey_local</STRONG>                  <STRONG>pfloc</STRONG>    <STRONG>pl</STRONG>   program function key #1 to
+                                                 execute string #2
+       <STRONG>pkey_xmit</STRONG>                   <STRONG>pfx</STRONG>      <STRONG>px</STRONG>   program function key #1 to
+                                                 transmit string #2
+       <STRONG>print_screen</STRONG>                <STRONG>mc0</STRONG>      <STRONG>ps</STRONG>   print contents of screen
+       <STRONG>prtr_off</STRONG>                    <STRONG>mc4</STRONG>      <STRONG>pf</STRONG>   turn off printer
+       <STRONG>prtr_on</STRONG>                     <STRONG>mc5</STRONG>      <STRONG>po</STRONG>   turn on printer
+       <STRONG>repeat_char</STRONG>                 <STRONG>rep</STRONG>      <STRONG>rp</STRONG>   repeat char #1 #2 times (P*)
+       <STRONG>reset_1string</STRONG>               <STRONG>rs1</STRONG>      <STRONG>r1</STRONG>   reset string
+       <STRONG>reset_2string</STRONG>               <STRONG>rs2</STRONG>      <STRONG>r2</STRONG>   reset string
+       <STRONG>reset_3string</STRONG>               <STRONG>rs3</STRONG>      <STRONG>r3</STRONG>   reset string
+       <STRONG>reset_file</STRONG>                  <STRONG>rf</STRONG>       <STRONG>rf</STRONG>   name of reset file
+       <STRONG>restore_cursor</STRONG>              <STRONG>rc</STRONG>       <STRONG>rc</STRONG>   restore cursor to position of
+                                                 last save_cursor
+       <STRONG>row_address</STRONG>                 <STRONG>vpa</STRONG>      <STRONG>cv</STRONG>   vertical position #1 absolute
+                                                 (P)
+       <STRONG>save_cursor</STRONG>                 <STRONG>sc</STRONG>       <STRONG>sc</STRONG>   save current cursor position
+                                                 (P)
+       <STRONG>scroll_forward</STRONG>              <STRONG>ind</STRONG>      <STRONG>sf</STRONG>   scroll text up (P)
+       <STRONG>scroll_reverse</STRONG>              <STRONG>ri</STRONG>       <STRONG>sr</STRONG>   scroll text down (P)
+       <STRONG>set_attributes</STRONG>              <STRONG>sgr</STRONG>      <STRONG>sa</STRONG>   define video attributes #1-#9
+                                                 (PG9)
+       <STRONG>set_tab</STRONG>                     <STRONG>hts</STRONG>      <STRONG>st</STRONG>   set a tab in every row,
+                                                 current columns
+       <STRONG>set_window</STRONG>                  <STRONG>wind</STRONG>     <STRONG>wi</STRONG>   current window is lines #1-#2
+                                                 cols #3-#4
+       <STRONG>tab</STRONG>                         <STRONG>ht</STRONG>       <STRONG>ta</STRONG>   tab to next 8-space hardware
+                                                 tab stop
+       <STRONG>to_status_line</STRONG>              <STRONG>tsl</STRONG>      <STRONG>ts</STRONG>   move to status line, column
+                                                 #1
+       <STRONG>underline_char</STRONG>              <STRONG>uc</STRONG>       <STRONG>uc</STRONG>   underline char and move past
+                                                 it
+       <STRONG>up_half_line</STRONG>                <STRONG>hu</STRONG>       <STRONG>hu</STRONG>   half a line up
+       <STRONG>init_prog</STRONG>                   <STRONG>iprog</STRONG>    <STRONG>iP</STRONG>   path name of program for
+                                                 initialization
+       <STRONG>key_a1</STRONG>                      <STRONG>ka1</STRONG>      <STRONG>K1</STRONG>   upper left of keypad
+       <STRONG>key_a3</STRONG>                      <STRONG>ka3</STRONG>      <STRONG>K3</STRONG>   upper right of keypad
+       <STRONG>key_b2</STRONG>                      <STRONG>kb2</STRONG>      <STRONG>K2</STRONG>   center of keypad
+       <STRONG>key_c1</STRONG>                      <STRONG>kc1</STRONG>      <STRONG>K4</STRONG>   lower left of keypad
+       <STRONG>key_c3</STRONG>                      <STRONG>kc3</STRONG>      <STRONG>K5</STRONG>   lower right of keypad
+
+       <STRONG>prtr_non</STRONG>                    <STRONG>mc5p</STRONG>     <STRONG>pO</STRONG>   turn on printer for #1 bytes
+       <STRONG>char_padding</STRONG>                <STRONG>rmp</STRONG>      <STRONG>rP</STRONG>   like ip but when in insert
+                                                 mode
+       <STRONG>acs_chars</STRONG>                   <STRONG>acsc</STRONG>     <STRONG>ac</STRONG>   graphics charset pairs, based
+                                                 on vt100
+       <STRONG>plab_norm</STRONG>                   <STRONG>pln</STRONG>      <STRONG>pn</STRONG>   program label #1 to show
+                                                 string #2
+       <STRONG>key_btab</STRONG>                    <STRONG>kcbt</STRONG>     <STRONG>kB</STRONG>   back-tab key
+       <STRONG>enter_xon_mode</STRONG>              <STRONG>smxon</STRONG>    <STRONG>SX</STRONG>   turn on xon/xoff handshaking
+       <STRONG>exit_xon_mode</STRONG>               <STRONG>rmxon</STRONG>    <STRONG>RX</STRONG>   turn off xon/xoff handshaking
+       <STRONG>enter_am_mode</STRONG>               <STRONG>smam</STRONG>     <STRONG>SA</STRONG>   turn on automatic margins
+       <STRONG>exit_am_mode</STRONG>                <STRONG>rmam</STRONG>     <STRONG>RA</STRONG>   turn off automatic margins
+       <STRONG>xon_character</STRONG>               <STRONG>xonc</STRONG>     <STRONG>XN</STRONG>   XON character
+       <STRONG>xoff_character</STRONG>              <STRONG>xoffc</STRONG>    <STRONG>XF</STRONG>   XOFF character
+       <STRONG>ena_acs</STRONG>                     <STRONG>enacs</STRONG>    <STRONG>eA</STRONG>   enable alternate char set
+       <STRONG>label_on</STRONG>                    <STRONG>smln</STRONG>     <STRONG>LO</STRONG>   turn on soft labels
+       <STRONG>label_off</STRONG>                   <STRONG>rmln</STRONG>     <STRONG>LF</STRONG>   turn off soft labels
+       <STRONG>key_beg</STRONG>                     <STRONG>kbeg</STRONG>     <STRONG>@1</STRONG>   begin key
+       <STRONG>key_cancel</STRONG>                  <STRONG>kcan</STRONG>     <STRONG>@2</STRONG>   cancel key
+       <STRONG>key_close</STRONG>                   <STRONG>kclo</STRONG>     <STRONG>@3</STRONG>   close key
+       <STRONG>key_command</STRONG>                 <STRONG>kcmd</STRONG>     <STRONG>@4</STRONG>   command key
+       <STRONG>key_copy</STRONG>                    <STRONG>kcpy</STRONG>     <STRONG>@5</STRONG>   copy key
+       <STRONG>key_create</STRONG>                  <STRONG>kcrt</STRONG>     <STRONG>@6</STRONG>   create key
+       <STRONG>key_end</STRONG>                     <STRONG>kend</STRONG>     <STRONG>@7</STRONG>   end key
+       <STRONG>key_enter</STRONG>                   <STRONG>kent</STRONG>     <STRONG>@8</STRONG>   enter/send key
+       <STRONG>key_exit</STRONG>                    <STRONG>kext</STRONG>     <STRONG>@9</STRONG>   exit key
+       <STRONG>key_find</STRONG>                    <STRONG>kfnd</STRONG>     <STRONG>@0</STRONG>   find key
+       <STRONG>key_help</STRONG>                    <STRONG>khlp</STRONG>     <STRONG>%1</STRONG>   help key
+       <STRONG>key_mark</STRONG>                    <STRONG>kmrk</STRONG>     <STRONG>%2</STRONG>   mark key
+       <STRONG>key_message</STRONG>                 <STRONG>kmsg</STRONG>     <STRONG>%3</STRONG>   message key
+       <STRONG>key_move</STRONG>                    <STRONG>kmov</STRONG>     <STRONG>%4</STRONG>   move key
+       <STRONG>key_next</STRONG>                    <STRONG>knxt</STRONG>     <STRONG>%5</STRONG>   next key
+       <STRONG>key_open</STRONG>                    <STRONG>kopn</STRONG>     <STRONG>%6</STRONG>   open key
+       <STRONG>key_options</STRONG>                 <STRONG>kopt</STRONG>     <STRONG>%7</STRONG>   options key
+       <STRONG>key_previous</STRONG>                <STRONG>kprv</STRONG>     <STRONG>%8</STRONG>   previous key
+       <STRONG>key_print</STRONG>                   <STRONG>kprt</STRONG>     <STRONG>%9</STRONG>   print key
+       <STRONG>key_redo</STRONG>                    <STRONG>krdo</STRONG>     <STRONG>%0</STRONG>   redo key
+       <STRONG>key_reference</STRONG>               <STRONG>kref</STRONG>     <STRONG>&amp;1</STRONG>   reference key
+       <STRONG>key_refresh</STRONG>                 <STRONG>krfr</STRONG>     <STRONG>&amp;2</STRONG>   refresh key
+       <STRONG>key_replace</STRONG>                 <STRONG>krpl</STRONG>     <STRONG>&amp;3</STRONG>   replace key
+       <STRONG>key_restart</STRONG>                 <STRONG>krst</STRONG>     <STRONG>&amp;4</STRONG>   restart key
+       <STRONG>key_resume</STRONG>                  <STRONG>kres</STRONG>     <STRONG>&amp;5</STRONG>   resume key
+       <STRONG>key_save</STRONG>                    <STRONG>ksav</STRONG>     <STRONG>&amp;6</STRONG>   save key
+       <STRONG>key_suspend</STRONG>                 <STRONG>kspd</STRONG>     <STRONG>&amp;7</STRONG>   suspend key
+       <STRONG>key_undo</STRONG>                    <STRONG>kund</STRONG>     <STRONG>&amp;8</STRONG>   undo key
+       <STRONG>key_sbeg</STRONG>                    <STRONG>kBEG</STRONG>     <STRONG>&amp;9</STRONG>   shifted begin key
+       <STRONG>key_scancel</STRONG>                 <STRONG>kCAN</STRONG>     <STRONG>&amp;0</STRONG>   shifted cancel key
+       <STRONG>key_scommand</STRONG>                <STRONG>kCMD</STRONG>     <STRONG>*1</STRONG>   shifted command key
+       <STRONG>key_scopy</STRONG>                   <STRONG>kCPY</STRONG>     <STRONG>*2</STRONG>   shifted copy key
+       <STRONG>key_screate</STRONG>                 <STRONG>kCRT</STRONG>     <STRONG>*3</STRONG>   shifted create key
+       <STRONG>key_sdc</STRONG>                     <STRONG>kDC</STRONG>      <STRONG>*4</STRONG>   shifted delete-character key
+       <STRONG>key_sdl</STRONG>                     <STRONG>kDL</STRONG>      <STRONG>*5</STRONG>   shifted delete-line key
+       <STRONG>key_select</STRONG>                  <STRONG>kslt</STRONG>     <STRONG>*6</STRONG>   select key
+       <STRONG>key_send</STRONG>                    <STRONG>kEND</STRONG>     <STRONG>*7</STRONG>   shifted end key
+       <STRONG>key_seol</STRONG>                    <STRONG>kEOL</STRONG>     <STRONG>*8</STRONG>   shifted clear-to-end-of-line
+                                                 key
+       <STRONG>key_sexit</STRONG>                   <STRONG>kEXT</STRONG>     <STRONG>*9</STRONG>   shifted exit key
+       <STRONG>key_sfind</STRONG>                   <STRONG>kFND</STRONG>     <STRONG>*0</STRONG>   shifted find key
+       <STRONG>key_shelp</STRONG>                   <STRONG>kHLP</STRONG>     <STRONG>#1</STRONG>   shifted help key
+       <STRONG>key_shome</STRONG>                   <STRONG>kHOM</STRONG>     <STRONG>#2</STRONG>   shifted home key
+       <STRONG>key_sic</STRONG>                     <STRONG>kIC</STRONG>      <STRONG>#3</STRONG>   shifted insert-character key
+       <STRONG>key_sleft</STRONG>                   <STRONG>kLFT</STRONG>     <STRONG>#4</STRONG>   shifted left-arrow key
+       <STRONG>key_smessage</STRONG>                <STRONG>kMSG</STRONG>     <STRONG>%a</STRONG>   shifted message key
+       <STRONG>key_smove</STRONG>                   <STRONG>kMOV</STRONG>     <STRONG>%b</STRONG>   shifted move key
+       <STRONG>key_snext</STRONG>                   <STRONG>kNXT</STRONG>     <STRONG>%c</STRONG>   shifted next key
+
+       <STRONG>key_soptions</STRONG>                <STRONG>kOPT</STRONG>     <STRONG>%d</STRONG>   shifted options key
+       <STRONG>key_sprevious</STRONG>               <STRONG>kPRV</STRONG>     <STRONG>%e</STRONG>   shifted previous key
+       <STRONG>key_sprint</STRONG>                  <STRONG>kPRT</STRONG>     <STRONG>%f</STRONG>   shifted print key
+       <STRONG>key_sredo</STRONG>                   <STRONG>kRDO</STRONG>     <STRONG>%g</STRONG>   shifted redo key
+       <STRONG>key_sreplace</STRONG>                <STRONG>kRPL</STRONG>     <STRONG>%h</STRONG>   shifted replace key
+       <STRONG>key_sright</STRONG>                  <STRONG>kRIT</STRONG>     <STRONG>%i</STRONG>   shifted right-arrow key
+       <STRONG>key_srsume</STRONG>                  <STRONG>kRES</STRONG>     <STRONG>%j</STRONG>   shifted resume key
+       <STRONG>key_ssave</STRONG>                   <STRONG>kSAV</STRONG>     <STRONG>!1</STRONG>   shifted save key
+       <STRONG>key_ssuspend</STRONG>                <STRONG>kSPD</STRONG>     <STRONG>!2</STRONG>   shifted suspend key
+       <STRONG>key_sundo</STRONG>                   <STRONG>kUND</STRONG>     <STRONG>!3</STRONG>   shifted undo key
+       <STRONG>req_for_input</STRONG>               <STRONG>rfi</STRONG>      <STRONG>RF</STRONG>   send next input char (for
+                                                 ptys)
+       <STRONG>key_f11</STRONG>                     <STRONG>kf11</STRONG>     <STRONG>F1</STRONG>   F11 function key
+       <STRONG>key_f12</STRONG>                     <STRONG>kf12</STRONG>     <STRONG>F2</STRONG>   F12 function key
+       <STRONG>key_f13</STRONG>                     <STRONG>kf13</STRONG>     <STRONG>F3</STRONG>   F13 function key
+       <STRONG>key_f14</STRONG>                     <STRONG>kf14</STRONG>     <STRONG>F4</STRONG>   F14 function key
+       <STRONG>key_f15</STRONG>                     <STRONG>kf15</STRONG>     <STRONG>F5</STRONG>   F15 function key
+       <STRONG>key_f16</STRONG>                     <STRONG>kf16</STRONG>     <STRONG>F6</STRONG>   F16 function key
+       <STRONG>key_f17</STRONG>                     <STRONG>kf17</STRONG>     <STRONG>F7</STRONG>   F17 function key
+       <STRONG>key_f18</STRONG>                     <STRONG>kf18</STRONG>     <STRONG>F8</STRONG>   F18 function key
+       <STRONG>key_f19</STRONG>                     <STRONG>kf19</STRONG>     <STRONG>F9</STRONG>   F19 function key
+       <STRONG>key_f20</STRONG>                     <STRONG>kf20</STRONG>     <STRONG>FA</STRONG>   F20 function key
+       <STRONG>key_f21</STRONG>                     <STRONG>kf21</STRONG>     <STRONG>FB</STRONG>   F21 function key
+       <STRONG>key_f22</STRONG>                     <STRONG>kf22</STRONG>     <STRONG>FC</STRONG>   F22 function key
+       <STRONG>key_f23</STRONG>                     <STRONG>kf23</STRONG>     <STRONG>FD</STRONG>   F23 function key
+       <STRONG>key_f24</STRONG>                     <STRONG>kf24</STRONG>     <STRONG>FE</STRONG>   F24 function key
+       <STRONG>key_f25</STRONG>                     <STRONG>kf25</STRONG>     <STRONG>FF</STRONG>   F25 function key
+       <STRONG>key_f26</STRONG>                     <STRONG>kf26</STRONG>     <STRONG>FG</STRONG>   F26 function key
+       <STRONG>key_f27</STRONG>                     <STRONG>kf27</STRONG>     <STRONG>FH</STRONG>   F27 function key
+       <STRONG>key_f28</STRONG>                     <STRONG>kf28</STRONG>     <STRONG>FI</STRONG>   F28 function key
+       <STRONG>key_f29</STRONG>                     <STRONG>kf29</STRONG>     <STRONG>FJ</STRONG>   F29 function key
+       <STRONG>key_f30</STRONG>                     <STRONG>kf30</STRONG>     <STRONG>FK</STRONG>   F30 function key
+       <STRONG>key_f31</STRONG>                     <STRONG>kf31</STRONG>     <STRONG>FL</STRONG>   F31 function key
+       <STRONG>key_f32</STRONG>                     <STRONG>kf32</STRONG>     <STRONG>FM</STRONG>   F32 function key
+       <STRONG>key_f33</STRONG>                     <STRONG>kf33</STRONG>     <STRONG>FN</STRONG>   F33 function key
+       <STRONG>key_f34</STRONG>                     <STRONG>kf34</STRONG>     <STRONG>FO</STRONG>   F34 function key
+       <STRONG>key_f35</STRONG>                     <STRONG>kf35</STRONG>     <STRONG>FP</STRONG>   F35 function key
+       <STRONG>key_f36</STRONG>                     <STRONG>kf36</STRONG>     <STRONG>FQ</STRONG>   F36 function key
+       <STRONG>key_f37</STRONG>                     <STRONG>kf37</STRONG>     <STRONG>FR</STRONG>   F37 function key
+       <STRONG>key_f38</STRONG>                     <STRONG>kf38</STRONG>     <STRONG>FS</STRONG>   F38 function key
+       <STRONG>key_f39</STRONG>                     <STRONG>kf39</STRONG>     <STRONG>FT</STRONG>   F39 function key
+       <STRONG>key_f40</STRONG>                     <STRONG>kf40</STRONG>     <STRONG>FU</STRONG>   F40 function key
+       <STRONG>key_f41</STRONG>                     <STRONG>kf41</STRONG>     <STRONG>FV</STRONG>   F41 function key
+       <STRONG>key_f42</STRONG>                     <STRONG>kf42</STRONG>     <STRONG>FW</STRONG>   F42 function key
+       <STRONG>key_f43</STRONG>                     <STRONG>kf43</STRONG>     <STRONG>FX</STRONG>   F43 function key
+       <STRONG>key_f44</STRONG>                     <STRONG>kf44</STRONG>     <STRONG>FY</STRONG>   F44 function key
+       <STRONG>key_f45</STRONG>                     <STRONG>kf45</STRONG>     <STRONG>FZ</STRONG>   F45 function key
+       <STRONG>key_f46</STRONG>                     <STRONG>kf46</STRONG>     <STRONG>Fa</STRONG>   F46 function key
+       <STRONG>key_f47</STRONG>                     <STRONG>kf47</STRONG>     <STRONG>Fb</STRONG>   F47 function key
+       <STRONG>key_f48</STRONG>                     <STRONG>kf48</STRONG>     <STRONG>Fc</STRONG>   F48 function key
+       <STRONG>key_f49</STRONG>                     <STRONG>kf49</STRONG>     <STRONG>Fd</STRONG>   F49 function key
+       <STRONG>key_f50</STRONG>                     <STRONG>kf50</STRONG>     <STRONG>Fe</STRONG>   F50 function key
+       <STRONG>key_f51</STRONG>                     <STRONG>kf51</STRONG>     <STRONG>Ff</STRONG>   F51 function key
+       <STRONG>key_f52</STRONG>                     <STRONG>kf52</STRONG>     <STRONG>Fg</STRONG>   F52 function key
+       <STRONG>key_f53</STRONG>                     <STRONG>kf53</STRONG>     <STRONG>Fh</STRONG>   F53 function key
+       <STRONG>key_f54</STRONG>                     <STRONG>kf54</STRONG>     <STRONG>Fi</STRONG>   F54 function key
+       <STRONG>key_f55</STRONG>                     <STRONG>kf55</STRONG>     <STRONG>Fj</STRONG>   F55 function key
+       <STRONG>key_f56</STRONG>                     <STRONG>kf56</STRONG>     <STRONG>Fk</STRONG>   F56 function key
+       <STRONG>key_f57</STRONG>                     <STRONG>kf57</STRONG>     <STRONG>Fl</STRONG>   F57 function key
+       <STRONG>key_f58</STRONG>                     <STRONG>kf58</STRONG>     <STRONG>Fm</STRONG>   F58 function key
+       <STRONG>key_f59</STRONG>                     <STRONG>kf59</STRONG>     <STRONG>Fn</STRONG>   F59 function key
+       <STRONG>key_f60</STRONG>                     <STRONG>kf60</STRONG>     <STRONG>Fo</STRONG>   F60 function key
+       <STRONG>key_f61</STRONG>                     <STRONG>kf61</STRONG>     <STRONG>Fp</STRONG>   F61 function key
+       <STRONG>key_f62</STRONG>                     <STRONG>kf62</STRONG>     <STRONG>Fq</STRONG>   F62 function key
+       <STRONG>key_f63</STRONG>                     <STRONG>kf63</STRONG>     <STRONG>Fr</STRONG>   F63 function key
+
+       <STRONG>clr_bol</STRONG>                     <STRONG>el1</STRONG>      <STRONG>cb</STRONG>   Clear to beginning of line
+       <STRONG>clear_margins</STRONG>               <STRONG>mgc</STRONG>      <STRONG>MC</STRONG>   clear right and left soft
+                                                 margins
+       <STRONG>set_left_margin</STRONG>             <STRONG>smgl</STRONG>     <STRONG>ML</STRONG>   set left soft margin at
+                                                 current column. (ML is not in
+                                                 BSD termcap).
+       <STRONG>set_right_margin</STRONG>            <STRONG>smgr</STRONG>     <STRONG>MR</STRONG>   set right soft margin at
+                                                 current column
+       <STRONG>label_format</STRONG>                <STRONG>fln</STRONG>      <STRONG>Lf</STRONG>   label format
+       <STRONG>set_clock</STRONG>                   <STRONG>sclk</STRONG>     <STRONG>SC</STRONG>   set clock, #1 hrs #2 mins #3
+                                                 secs
+       <STRONG>display_clock</STRONG>               <STRONG>dclk</STRONG>     <STRONG>DK</STRONG>   display clock
+       <STRONG>remove_clock</STRONG>                <STRONG>rmclk</STRONG>    <STRONG>RC</STRONG>   remove clock
+       <STRONG>create_window</STRONG>               <STRONG>cwin</STRONG>     <STRONG>CW</STRONG>   define a window #1 from #2,#3
+                                                 to #4,#5
+       <STRONG>goto_window</STRONG>                 <STRONG>wingo</STRONG>    <STRONG>WG</STRONG>   go to window #1
+       <STRONG>hangup</STRONG>                      <STRONG>hup</STRONG>      <STRONG>HU</STRONG>   hang-up phone
+       <STRONG>dial_phone</STRONG>                  <STRONG>dial</STRONG>     <STRONG>DI</STRONG>   dial number #1
+       <STRONG>quick_dial</STRONG>                  <STRONG>qdial</STRONG>    <STRONG>QD</STRONG>   dial number #1 without
+                                                 checking
+       <STRONG>tone</STRONG>                        <STRONG>tone</STRONG>     <STRONG>TO</STRONG>   select touch tone dialing
+       <STRONG>pulse</STRONG>                       <STRONG>pulse</STRONG>    <STRONG>PU</STRONG>   select pulse dialing
+       <STRONG>flash_hook</STRONG>                  <STRONG>hook</STRONG>     <STRONG>fh</STRONG>   flash switch hook
+       <STRONG>fixed_pause</STRONG>                 <STRONG>pause</STRONG>    <STRONG>PA</STRONG>   pause for 2-3 seconds
+       <STRONG>wait_tone</STRONG>                   <STRONG>wait</STRONG>     <STRONG>WA</STRONG>   wait for dial-tone
+       <STRONG>user0</STRONG>                       <STRONG>u0</STRONG>       <STRONG>u0</STRONG>   User string #0
+       <STRONG>user1</STRONG>                       <STRONG>u1</STRONG>       <STRONG>u1</STRONG>   User string #1
+       <STRONG>user2</STRONG>                       <STRONG>u2</STRONG>       <STRONG>u2</STRONG>   User string #2
+       <STRONG>user3</STRONG>                       <STRONG>u3</STRONG>       <STRONG>u3</STRONG>   User string #3
+       <STRONG>user4</STRONG>                       <STRONG>u4</STRONG>       <STRONG>u4</STRONG>   User string #4
+       <STRONG>user5</STRONG>                       <STRONG>u5</STRONG>       <STRONG>u5</STRONG>   User string #5
+       <STRONG>user6</STRONG>                       <STRONG>u6</STRONG>       <STRONG>u6</STRONG>   User string #6
+       <STRONG>user7</STRONG>                       <STRONG>u7</STRONG>       <STRONG>u7</STRONG>   User string #7
+       <STRONG>user8</STRONG>                       <STRONG>u8</STRONG>       <STRONG>u8</STRONG>   User string #8
+       <STRONG>user9</STRONG>                       <STRONG>u9</STRONG>       <STRONG>u9</STRONG>   User string #9
+       <STRONG>orig_pair</STRONG>                   <STRONG>op</STRONG>       <STRONG>op</STRONG>   Set default pair to its
+                                                 original value
+       <STRONG>orig_colors</STRONG>                 <STRONG>oc</STRONG>       <STRONG>oc</STRONG>   Set all color pairs to the
+                                                 original ones
+       <STRONG>initialize_color</STRONG>            <STRONG>initc</STRONG>    <STRONG>Ic</STRONG>   initialize color #1 to
+                                                 (#2,#3,#4)
+       <STRONG>initialize_pair</STRONG>             <STRONG>initp</STRONG>    <STRONG>Ip</STRONG>   Initialize color pair #1 to
+                                                 fg=(#2,#3,#4), bg=(#5,#6,#7)
+       <STRONG>set_color_pair</STRONG>              <STRONG>scp</STRONG>      <STRONG>sp</STRONG>   Set current color pair to #1
+       <STRONG>set_foreground</STRONG>              <STRONG>setf</STRONG>     <STRONG>Sf</STRONG>   Set foreground color #1
+       <STRONG>set_background</STRONG>              <STRONG>setb</STRONG>     <STRONG>Sb</STRONG>   Set background color #1
+       <STRONG>change_char_pitch</STRONG>           <STRONG>cpi</STRONG>      <STRONG>ZA</STRONG>   Change number of characters
+                                                 per inch to #1
+       <STRONG>change_line_pitch</STRONG>           <STRONG>lpi</STRONG>      <STRONG>ZB</STRONG>   Change number of lines per
+                                                 inch to #1
+       <STRONG>change_res_horz</STRONG>             <STRONG>chr</STRONG>      <STRONG>ZC</STRONG>   Change horizontal resolution
+                                                 to #1
+       <STRONG>change_res_vert</STRONG>             <STRONG>cvr</STRONG>      <STRONG>ZD</STRONG>   Change vertical resolution to
+                                                 #1
+       <STRONG>define_char</STRONG>                 <STRONG>defc</STRONG>     <STRONG>ZE</STRONG>   Define a character #1, #2
+                                                 dots wide, descender #3
+       <STRONG>enter_doublewide_mode</STRONG>       <STRONG>swidm</STRONG>    <STRONG>ZF</STRONG>   Enter double-wide mode
+       <STRONG>enter_draft_quality</STRONG>         <STRONG>sdrfq</STRONG>    <STRONG>ZG</STRONG>   Enter draft-quality mode
+       <STRONG>enter_italics_mode</STRONG>          <STRONG>sitm</STRONG>     <STRONG>ZH</STRONG>   Enter italic mode
+       <STRONG>enter_leftward_mode</STRONG>         <STRONG>slm</STRONG>      <STRONG>ZI</STRONG>   Start leftward carriage
+                                                 motion
+       <STRONG>enter_micro_mode</STRONG>            <STRONG>smicm</STRONG>    <STRONG>ZJ</STRONG>   Start micro-motion mode
+       <STRONG>enter_near_letter_quality</STRONG>   <STRONG>snlq</STRONG>     <STRONG>ZK</STRONG>   Enter NLQ mode
+       <STRONG>enter_normal_quality</STRONG>        <STRONG>snrmq</STRONG>    <STRONG>ZL</STRONG>   Enter normal-quality mode
+       <STRONG>enter_shadow_mode</STRONG>           <STRONG>sshm</STRONG>     <STRONG>ZM</STRONG>   Enter shadow-print mode
+
+       <STRONG>enter_subscript_mode</STRONG>        <STRONG>ssubm</STRONG>    <STRONG>ZN</STRONG>   Enter subscript mode
+       <STRONG>enter_superscript_mode</STRONG>      <STRONG>ssupm</STRONG>    <STRONG>ZO</STRONG>   Enter superscript mode
+       <STRONG>enter_upward_mode</STRONG>           <STRONG>sum</STRONG>      <STRONG>ZP</STRONG>   Start upward carriage motion
+       <STRONG>exit_doublewide_mode</STRONG>        <STRONG>rwidm</STRONG>    <STRONG>ZQ</STRONG>   End double-wide mode
+       <STRONG>exit_italics_mode</STRONG>           <STRONG>ritm</STRONG>     <STRONG>ZR</STRONG>   End italic mode
+       <STRONG>exit_leftward_mode</STRONG>          <STRONG>rlm</STRONG>      <STRONG>ZS</STRONG>   End left-motion mode
+       <STRONG>exit_micro_mode</STRONG>             <STRONG>rmicm</STRONG>    <STRONG>ZT</STRONG>   End micro-motion mode
+       <STRONG>exit_shadow_mode</STRONG>            <STRONG>rshm</STRONG>     <STRONG>ZU</STRONG>   End shadow-print mode
+       <STRONG>exit_subscript_mode</STRONG>         <STRONG>rsubm</STRONG>    <STRONG>ZV</STRONG>   End subscript mode
+       <STRONG>exit_superscript_mode</STRONG>       <STRONG>rsupm</STRONG>    <STRONG>ZW</STRONG>   End superscript mode
+       <STRONG>exit_upward_mode</STRONG>            <STRONG>rum</STRONG>      <STRONG>ZX</STRONG>   End reverse character motion
+       <STRONG>micro_column_address</STRONG>        <STRONG>mhpa</STRONG>     <STRONG>ZY</STRONG>   Like column_address in micro
+                                                 mode
+       <STRONG>micro_down</STRONG>                  <STRONG>mcud1</STRONG>    <STRONG>ZZ</STRONG>   Like cursor_down in micro
+                                                 mode
+       <STRONG>micro_left</STRONG>                  <STRONG>mcub1</STRONG>    <STRONG>Za</STRONG>   Like cursor_left in micro
+                                                 mode
+       <STRONG>micro_right</STRONG>                 <STRONG>mcuf1</STRONG>    <STRONG>Zb</STRONG>   Like cursor_right in micro
+                                                 mode
+       <STRONG>micro_row_address</STRONG>           <STRONG>mvpa</STRONG>     <STRONG>Zc</STRONG>   Like row_address #1 in micro
+                                                 mode
+       <STRONG>micro_up</STRONG>                    <STRONG>mcuu1</STRONG>    <STRONG>Zd</STRONG>   Like cursor_up in micro mode
+       <STRONG>order_of_pins</STRONG>               <STRONG>porder</STRONG>   <STRONG>Ze</STRONG>   Match software bits to print-
+                                                 head pins
+       <STRONG>parm_down_micro</STRONG>             <STRONG>mcud</STRONG>     <STRONG>Zf</STRONG>   Like parm_down_cursor in
+                                                 micro mode
+       <STRONG>parm_left_micro</STRONG>             <STRONG>mcub</STRONG>     <STRONG>Zg</STRONG>   Like parm_left_cursor in
+                                                 micro mode
+       <STRONG>parm_right_micro</STRONG>            <STRONG>mcuf</STRONG>     <STRONG>Zh</STRONG>   Like parm_right_cursor in
+                                                 micro mode
+       <STRONG>parm_up_micro</STRONG>               <STRONG>mcuu</STRONG>     <STRONG>Zi</STRONG>   Like parm_up_cursor in micro
+                                                 mode
+       <STRONG>select_char_set</STRONG>             <STRONG>scs</STRONG>      <STRONG>Zj</STRONG>   Select character set, #1
+       <STRONG>set_bottom_margin</STRONG>           <STRONG>smgb</STRONG>     <STRONG>Zk</STRONG>   Set bottom margin at current
+                                                 line
+       <STRONG>set_bottom_margin_parm</STRONG>      <STRONG>smgbp</STRONG>    <STRONG>Zl</STRONG>   Set bottom margin at line #1
+                                                 or (if smgtp is not given) #2
+                                                 lines from bottom
+       <STRONG>set_left_margin_parm</STRONG>        <STRONG>smglp</STRONG>    <STRONG>Zm</STRONG>   Set left (right) margin at
+                                                 column #1
+       <STRONG>set_right_margin_parm</STRONG>       <STRONG>smgrp</STRONG>    <STRONG>Zn</STRONG>   Set right margin at column #1
+       <STRONG>set_top_margin</STRONG>              <STRONG>smgt</STRONG>     <STRONG>Zo</STRONG>   Set top margin at current
+                                                 line
+       <STRONG>set_top_margin_parm</STRONG>         <STRONG>smgtp</STRONG>    <STRONG>Zp</STRONG>   Set top (bottom) margin at
+                                                 row #1
+       <STRONG>start_bit_image</STRONG>             <STRONG>sbim</STRONG>     <STRONG>Zq</STRONG>   Start printing bit image
+                                                 graphics
+       <STRONG>start_char_set_def</STRONG>          <STRONG>scsd</STRONG>     <STRONG>Zr</STRONG>   Start character set
+                                                 definition #1, with #2
+                                                 characters in the set
+       <STRONG>stop_bit_image</STRONG>              <STRONG>rbim</STRONG>     <STRONG>Zs</STRONG>   Stop printing bit image
+                                                 graphics
+       <STRONG>stop_char_set_def</STRONG>           <STRONG>rcsd</STRONG>     <STRONG>Zt</STRONG>   End definition of character
+                                                 set #1
+       <STRONG>subscript_characters</STRONG>        <STRONG>subcs</STRONG>    <STRONG>Zu</STRONG>   List of subscriptable
+                                                 characters
+       <STRONG>superscript_characters</STRONG>      <STRONG>supcs</STRONG>    <STRONG>Zv</STRONG>   List of superscriptable
+                                                 characters
+       <STRONG>these_cause_cr</STRONG>              <STRONG>docr</STRONG>     <STRONG>Zw</STRONG>   Printing any of these
+                                                 characters causes CR
+       <STRONG>zero_motion</STRONG>                 <STRONG>zerom</STRONG>    <STRONG>Zx</STRONG>   No motion for subsequent
+                                                 character
 
        The following string  capabilities  are  present  in  the  SVr4.0  term
        structure, but were originally not documented in the man page.
 
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>       <STRONG>TCap</STRONG>      <STRONG>Description</STRONG>
-                   <STRONG>String</STRONG>             <STRONG>name</STRONG>       <STRONG>Code</STRONG>
-          alt_scancode_esc            scesa      S8     Alternate escape
-                                                        for scancode
-                                                        emulation
-          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
-                                                        cell #1 #2 times
-          char_set_names              csnm       Zy     Produce #1'th item
-                                                        from list of
-                                                        character set
-                                                        names
-          code_set_init               csin       ci     Init sequence for
-                                                        multiple codesets
-          color_names                 colornm    Yw     Give name for
-                                                        color #1
-          define_bit_image_region     defbi      Yx     Define rectangular
-                                                        bit image region
-          device_type                 devt       dv     Indicate
-                                                        language/codeset
-                                                        support
-          display_pc_char             dispc      S1     Display PC
-                                                        character #1
-          end_bit_image_region        endbi      Yy     End a bit-image
-                                                        region
-          enter_pc_charset_mode       smpch      S2     Enter PC character
-                                                        display mode
-          enter_scancode_mode         smsc       S4     Enter PC scancode
-                                                        mode
-          exit_pc_charset_mode        rmpch      S3     Exit PC character
-                                                        display mode
-          exit_scancode_mode          rmsc       S5     Exit PC scancode
-                                                        mode
-          get_mouse                   getm       Gm     Curses should get
-                                                        button events,
-                                                        parameter #1 not
-                                                        documented.
-          key_mouse                   kmous      Km     Mouse event has
-                                                        occurred
-          mouse_info                  minfo      Mi     Mouse status
-                                                        information
-          pc_term_options             pctrm      S6     PC terminal
-                                                        options
-          pkey_plab                   pfxl       xl     Program function
-                                                        key #1 to type
-                                                        string #2 and show
-                                                        string #3
-          req_mouse_pos               reqmp      RQ     Request mouse
-                                                        position
-
-          scancode_escape             scesc      S7     Escape for
-                                                        scancode emulation
-          set0_des_seq                s0ds       s0     Shift to codeset 0
-                                                        (EUC set 0, ASCII)
-          set1_des_seq                s1ds       s1     Shift to codeset 1
-          set2_des_seq                s2ds       s2     Shift to codeset 2
-          set3_des_seq                s3ds       s3     Shift to codeset 3
-          set_a_background            setab      AB     Set background
-                                                        color to #1, using
-                                                        ANSI escape
-          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
-                                                        right margins to
-                                                        #1, #2.  (ML is
-                                                        not in BSD
-                                                        termcap).
-          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 <STRONG>YI</STRONG>, the <STRONG>ncurses</STRONG> 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!
-
-
-                  <STRONG>Variable</STRONG>            <STRONG>Cap-</STRONG>      <STRONG>TCap</STRONG>       <STRONG>Description</STRONG>
-                   <STRONG>String</STRONG>             <STRONG>name</STRONG>      <STRONG>Code</STRONG>
-          enter_horizontal_hl_mode    ehhlm     Xh     Enter horizontal
-                                                       highlight mode
-          enter_left_hl_mode          elhlm     Xl     Enter left highlight
-                                                       mode
-          enter_low_hl_mode           elohlm    Xo     Enter low highlight
-                                                       mode
-          enter_right_hl_mode         erhlm     Xr     Enter right
-                                                       highlight mode
-          enter_top_hl_mode           ethlm     Xt     Enter top highlight
-                                                       mode
-          enter_vertical_hl_mode      evhlm     Xv     Enter vertical
-                                                       highlight mode
-          set_a_attributes            sgr1      sA     Define second set of
-                                                       video attributes
-                                                       #1-#6
-          set_pglen_inch              slength   YI     Set page length to
-                                                       #1 hundredth of an
-                                                       inch (some
-                                                       implementations use
-                                                       sL for termcap).
+                                       <STRONG>Code</STRONG>
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>      <STRONG>TI</STRONG>         <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>char_set_names</STRONG>              <STRONG>csnm</STRONG>       <STRONG>Zy</STRONG>   Produce #1'th item from
+                                                   list of character set names
+       <STRONG>key_mouse</STRONG>                   <STRONG>kmous</STRONG>      <STRONG>Km</STRONG>   Mouse event has occurred
+       <STRONG>mouse_info</STRONG>                  <STRONG>minfo</STRONG>      <STRONG>Mi</STRONG>   Mouse status information
+       <STRONG>req_mouse_pos</STRONG>               <STRONG>reqmp</STRONG>      <STRONG>RQ</STRONG>   Request mouse position
+       <STRONG>get_mouse</STRONG>                   <STRONG>getm</STRONG>       <STRONG>Gm</STRONG>   Curses should get button
+                                                   events, parameter #1 not
+                                                   documented.
+       <STRONG>set_a_foreground</STRONG>            <STRONG>setaf</STRONG>      <STRONG>AF</STRONG>   Set foreground color to #1,
+                                                   using ANSI escape
+       <STRONG>set_a_background</STRONG>            <STRONG>setab</STRONG>      <STRONG>AB</STRONG>   Set background color to #1,
+                                                   using ANSI escape
+       <STRONG>pkey_plab</STRONG>                   <STRONG>pfxl</STRONG>       <STRONG>xl</STRONG>   Program function key #1 to
+                                                   type string #2 and show
+                                                   string #3
+       <STRONG>device_type</STRONG>                 <STRONG>devt</STRONG>       <STRONG>dv</STRONG>   Indicate language, codeset
+                                                   support
+       <STRONG>code_set_init</STRONG>               <STRONG>csin</STRONG>       <STRONG>ci</STRONG>   Init sequence for multiple
+                                                   codesets
+       <STRONG>set0_des_seq</STRONG>                <STRONG>s0ds</STRONG>       <STRONG>s0</STRONG>   Shift to codeset 0 (EUC set
+                                                   0, ASCII)
+       <STRONG>set1_des_seq</STRONG>                <STRONG>s1ds</STRONG>       <STRONG>s1</STRONG>   Shift to codeset 1
+       <STRONG>set2_des_seq</STRONG>                <STRONG>s2ds</STRONG>       <STRONG>s2</STRONG>   Shift to codeset 2
+       <STRONG>set3_des_seq</STRONG>                <STRONG>s3ds</STRONG>       <STRONG>s3</STRONG>   Shift to codeset 3
+       <STRONG>set_lr_margin</STRONG>               <STRONG>smglr</STRONG>      <STRONG>ML</STRONG>   Set both left and right
+                                                   margins to #1, #2.  (ML is
+                                                   not in BSD termcap).
+       <STRONG>set_tb_margin</STRONG>               <STRONG>smgtb</STRONG>      <STRONG>MT</STRONG>   Sets both top and bottom
+                                                   margins to #1, #2
+       <STRONG>bit_image_repeat</STRONG>            <STRONG>birep</STRONG>      <STRONG>Xy</STRONG>   Repeat bit image cell #1 #2
+                                                   times
+       <STRONG>bit_image_newline</STRONG>           <STRONG>binel</STRONG>      <STRONG>Zz</STRONG>   Move to next row of the bit
+                                                   image
+       <STRONG>bit_image_carriage_return</STRONG>   <STRONG>bicr</STRONG>       <STRONG>Yv</STRONG>   Move to beginning of same
+                                                   row
+       <STRONG>color_names</STRONG>                 <STRONG>colornm</STRONG>    <STRONG>Yw</STRONG>   Give name for color #1
+       <STRONG>define_bit_image_region</STRONG>     <STRONG>defbi</STRONG>      <STRONG>Yx</STRONG>   Define rectangular bit
+                                                   image region
+       <STRONG>end_bit_image_region</STRONG>        <STRONG>endbi</STRONG>      <STRONG>Yy</STRONG>   End a bit-image region
+       <STRONG>set_color_band</STRONG>              <STRONG>setcolor</STRONG>   <STRONG>Yz</STRONG>   Change to ribbon color #1
+       <STRONG>set_page_length</STRONG>             <STRONG>slines</STRONG>     <STRONG>YZ</STRONG>   Set page length to #1 lines
+       <STRONG>display_pc_char</STRONG>             <STRONG>dispc</STRONG>      <STRONG>S1</STRONG>   Display PC character #1
+       <STRONG>enter_pc_charset_mode</STRONG>       <STRONG>smpch</STRONG>      <STRONG>S2</STRONG>   Enter PC character display
+                                                   mode
+       <STRONG>exit_pc_charset_mode</STRONG>        <STRONG>rmpch</STRONG>      <STRONG>S3</STRONG>   Exit PC character display
+                                                   mode
+       <STRONG>enter_scancode_mode</STRONG>         <STRONG>smsc</STRONG>       <STRONG>S4</STRONG>   Enter PC scancode mode
+       <STRONG>exit_scancode_mode</STRONG>          <STRONG>rmsc</STRONG>       <STRONG>S5</STRONG>   Exit PC scancode mode
+       <STRONG>pc_term_options</STRONG>             <STRONG>pctrm</STRONG>      <STRONG>S6</STRONG>   PC terminal options
+       <STRONG>scancode_escape</STRONG>             <STRONG>scesc</STRONG>      <STRONG>S7</STRONG>   Escape for scancode
+                                                   emulation
+       <STRONG>alt_scancode_esc</STRONG>            <STRONG>scesa</STRONG>      <STRONG>S8</STRONG>   Alternate escape for
+                                                   scancode emulation
+
+       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 <STRONG>YI</STRONG>, the <STRONG>ncurses</STRONG> 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!
+
+                                      <STRONG>Code</STRONG>
+
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>enter_horizontal_hl_mode</STRONG>   <STRONG>ehhlm</STRONG>     <STRONG>Xh</STRONG>   Enter horizontal highlight
+                                                 mode
+       <STRONG>enter_left_hl_mode</STRONG>         <STRONG>elhlm</STRONG>     <STRONG>Xl</STRONG>   Enter left highlight mode
+       <STRONG>enter_low_hl_mode</STRONG>          <STRONG>elohlm</STRONG>    <STRONG>Xo</STRONG>   Enter low highlight mode
+       <STRONG>enter_right_hl_mode</STRONG>        <STRONG>erhlm</STRONG>     <STRONG>Xr</STRONG>   Enter right highlight mode
+       <STRONG>enter_top_hl_mode</STRONG>          <STRONG>ethlm</STRONG>     <STRONG>Xt</STRONG>   Enter top highlight mode
+       <STRONG>enter_vertical_hl_mode</STRONG>     <STRONG>evhlm</STRONG>     <STRONG>Xv</STRONG>   Enter vertical highlight mode
+       <STRONG>set_a_attributes</STRONG>           <STRONG>sgr1</STRONG>      <STRONG>sA</STRONG>   Define second set of video
+                                                 attributes #1-#6
+       <STRONG>set_pglen_inch</STRONG>             <STRONG>slength</STRONG>   <STRONG>YI</STRONG>   Set page length to #1
+                                                 hundredth of an inch (some
+                                                 implementations use sL for
+                                                 termcap).
 
 
 </PRE><H3><a name="h3-User-Defined-Capabilities">User-Defined Capabilities</a></H3><PRE>
-       The  preceding  section  listed the <EM>predefined</EM> 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 <EM>predefined</EM>  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.
 
-       <EM>ncurses</EM>    addresses   this   limitation   by   allowing   user-defined
-       capabilities.  The <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG>  option  for
+       <EM>ncurses</EM>   addresses   this   limitation   by   allowing    user-defined
+       capabilities.   The  <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG> option for
        this purpose.  When <STRONG>-x</STRONG> is set, <STRONG>tic</STRONG> treats unknown capabilities as user-
-       defined.  That is, if <STRONG>tic</STRONG> encounters a capability name  which  it  does
-       not  recognize, it infers its type (Boolean, number or string) from the
-       syntax and makes an extended table  entry  for  that  capability.   The
-       <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  makes  this information conditionally
-       available to applications.   The  <EM>ncurses</EM>  library  provides  the  data
+       defined.   That  is,  if <STRONG>tic</STRONG> encounters a capability name which it does
+       not recognize, it infers its type (Boolean, number or string) from  the
+       syntax  and  makes  an  extended  table entry for that capability.  The
+       <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function makes  this  information  conditionally
+       available  to  applications.   The  <EM>ncurses</EM>  library  provides the data
        leaving most of the behavior to applications:
 
-       <STRONG>o</STRONG>   User-defined  capability  strings  whose  name  begins with "k" are
+       <STRONG>o</STRONG>   User-defined capability strings whose  name  begins  with  "k"  are
            treated as function keys.
 
-       <STRONG>o</STRONG>   The types (Boolean,  number,  string)  determined  by  <STRONG>tic</STRONG>  can  be
+       <STRONG>o</STRONG>   The  types  (Boolean,  number,  string)  determined  by  <STRONG>tic</STRONG> can be
            inferred by successful calls on <STRONG>tigetflag</STRONG>, etc.
 
        <STRONG>o</STRONG>   If the capability name happens to be two characters, the capability
            is also available through the termcap interface.
 
-       While termcap is said to be  extensible  because  it  does  not  use  a
-       predefined  set of capabilities, in practice it has been limited to the
-       capabilities defined by terminfo implementations.   As  a  rule,  user-
+       While  termcap  is  said  to  be  extensible  because it does not use a
+       predefined set of capabilities, in practice it has been limited to  the
+       capabilities  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  assumed  by  termcap implementations and their applications.  In
-       particular, providing extended sets  of  function  keys  (past  the  60
+       limited  to  Booleans  and  numbers to avoid running past the 1023 byte
+       limit assumed by termcap implementations and  their  applications.   In
+       particular,  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.
 
-       The <EM>ncurses</EM> library uses a few of these user-defined  capabilities,  as
-       described  in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities (including
-       function keys) are described in the terminal database, in  the  section
+       The  <EM>ncurses</EM>  library uses a few of these user-defined capabilities, as
+       described in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities  (including
+       function  keys)  are described in the terminal database, in the section
        on <EM>NCURSES</EM> <EM>USER-DEFINABLE</EM> <EM>CAPABILITIES</EM>
 
 
 </PRE><H3><a name="h3-A-Sample-Entry">A Sample Entry</a></H3><PRE>
-       The   following   entry,   describing  an  ANSI-standard  terminal,  is
+       The  following  entry,  describing  an   ANSI-standard   terminal,   is
        representative of what a <STRONG>terminfo</STRONG> entry for a modern terminal typically
        looks like.
 
@@ -1213,36 +1007,36 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
                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 <EM>terminfo</EM> are of three types:
 
-       <STRONG>o</STRONG>   Boolean  capabilities  which  indicate  that  the terminal has some
+       <STRONG>o</STRONG>   Boolean capabilities which indicate  that  the  terminal  has  some
            particular feature,
 
        <STRONG>o</STRONG>   numeric capabilities giving the size of the terminal or the size of
            particular delays, and
 
-       <STRONG>o</STRONG>   string  capabilities,  which  give  a sequence which can be used to
+       <STRONG>o</STRONG>   string capabilities, which give a sequence which  can  be  used  to
            perform particular terminal operations.
 
 
 </PRE><H3><a name="h3-Types-of-Capabilities">Types of Capabilities</a></H3><PRE>
        All capabilities have names.  For instance, the fact that ANSI-standard
-       terminals  have  <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return and line-
-       feed when the end of a line is reached) is indicated by the  capability
-       <STRONG>am</STRONG>.   Hence  the description of ansi includes <STRONG>am</STRONG>.  Numeric capabilities
-       are followed by the character "#" and  then  a  positive  value.   Thus
+       terminals have <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return  and  line-
+       feed  when the end of a line is reached) is indicated by the capability
+       <STRONG>am</STRONG>.  Hence the description of ansi includes <STRONG>am</STRONG>.   Numeric  capabilities
+       are  followed  by  the  character  "#" and then a positive value.  Thus
        <STRONG>cols</STRONG>, which indicates the number of columns the terminal has, gives the
-       value "80" for ansi.  Values for numeric capabilities may be  specified
-       in  decimal,  octal,  or  hexadecimal, using the C programming language
+       value  "80" for ansi.  Values for numeric capabilities may be specified
+       in decimal, octal, or hexadecimal, using  the  C  programming  language
        conventions (e.g., 255, 0377 and 0xff or 0xFF).
 
-       Finally, string valued capabilities, such as <STRONG>el</STRONG> (clear to end  of  line
-       sequence)  are  given  by  the  two-character  code, an "=", and then a
+       Finally,  string  valued capabilities, such as <STRONG>el</STRONG> (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
+       A  number  of  escape  sequences  are  provided  in  the  string valued
        capabilities for easy encoding of characters there:
 
        <STRONG>o</STRONG>   Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character,
@@ -1260,9 +1054,9 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
            respectively.
 
        X/Open Curses does not say what "appropriate <EM>x</EM>" 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
@@ -1278,68 +1072,68 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   and <STRONG>\0</STRONG> for null.
 
            <STRONG>\0</STRONG> 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 <STRONG>stty(1)</STRONG>.
 
-           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
+           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
            implementations.
 
        Finally, characters may be given as three octal digits after a <STRONG>\</STRONG>.
 
-       A delay in milliseconds may appear anywhere  in  a  string  capability,
-       enclosed  in  $&lt;..&gt;  brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;, and padding characters
+       A  delay  in  milliseconds  may appear anywhere in a string capability,
+       enclosed in $&lt;..&gt; brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;,  and  padding  characters
        are supplied by <STRONG><A HREF="curs_terminfo.3x.html">tputs(3x)</A></STRONG> to provide this delay.
 
-       <STRONG>o</STRONG>   The delay must be a number  with  at  most  one  decimal  place  of
+       <STRONG>o</STRONG>   The  delay  must  be  a  number  with  at most one decimal place of
            precision; it may be followed by suffixes "*" or "/" or both.
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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 <EM>lines</EM> affected.)
 
            Normally, padding is advisory if the device has the <STRONG>xon</STRONG> capability;
            it is used for cost computation but does not trigger delays.
 
-       <STRONG>o</STRONG>   A  "/"  suffix indicates that the padding is mandatory and forces a
+       <STRONG>o</STRONG>   A "/" suffix indicates that the padding is mandatory and  forces  a
            delay of the given number of milliseconds even on devices for which
            <STRONG>xon</STRONG> 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
        <STRONG>ind</STRONG> in the example above.
 
 
 </PRE><H3><a name="h3-Fetching-Compiled-Descriptions">Fetching Compiled Descriptions</a></H3><PRE>
-       Terminal  descriptions  in  <EM>ncurses</EM>  are  stored in terminal databases.
-       These databases, which are found by their pathname, may  be  configured
+       Terminal descriptions in <EM>ncurses</EM>  are  stored  in  terminal  databases.
+       These  databases,  which are found by their pathname, may be configured
        either as directory trees or hashed databases (see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>),
 
-       The  library  uses  a  compiled-in  list  of  pathnames,  which  can be
+       The library  uses  a  compiled-in  list  of  pathnames,  which  can  be
        overridden  by  environment  variables.   Before  starting  to  search,
-       <EM>ncurses</EM>  checks  the  search list, eliminating duplicates and pathnames
-       where no terminal database is found.  The  <EM>ncurses</EM>  library  reads  the
+       <EM>ncurses</EM> checks the search list, eliminating  duplicates  and  pathnames
+       where  no  terminal  database  is found.  The <EM>ncurses</EM> library reads the
        first description which passes its consistency checks.
 
-       <STRONG>o</STRONG>   The  environment variable <STRONG>TERMINFO</STRONG> is checked first, for a terminal
+       <STRONG>o</STRONG>   The environment variable <STRONG>TERMINFO</STRONG> is checked first, for a  terminal
            database containing the terminal description.
 
        <STRONG>o</STRONG>   Next, <EM>ncurses</EM> looks in <EM>$HOME/.terminfo</EM> for a compiled description.
 
-           This is an optional feature which may be omitted entirely from  the
+           This  is an optional feature which may be omitted entirely from the
            library,  or  limited  to  prevent  accidental  use  by  privileged
            applications.
 
-       <STRONG>o</STRONG>   Next, if the environment variable  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  is  set,  <EM>ncurses</EM>
-           interprets  the  contents  of  that  variable  as  a list of colon-
+       <STRONG>o</STRONG>   Next,  if  the  environment  variable <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is set, <EM>ncurses</EM>
+           interprets the contents of  that  variable  as  a  list  of  colon-
            separated pathnames of terminal databases to be searched.
 
-           An empty pathname (i.e., if the variable  begins  or  ends  with  a
-           colon,  or  contains  adjacent colons) is interpreted as the system
+           An  empty  pathname  (i.e.,  if  the variable begins or ends with a
+           colon, or contains adjacent colons) is interpreted  as  the  system
            location <EM>/usr/share/terminfo</EM>.
 
        <STRONG>o</STRONG>   Finally, <EM>ncurses</EM> searches these compiled-in locations:
@@ -1349,89 +1143,89 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the system terminfo directory, <EM>/usr/share/terminfo</EM>
 
        The <STRONG>TERMINFO</STRONG> variable can contain a terminal description instead of the
-       pathname  of  a terminal database.  If this variable begins with "hex:"
-       or "b64:" then <EM>ncurses</EM> reads a terminal description  from  hexadecimal-
-       or  base64-encoded  data,  and  if  that  description  matches the name
-       sought, will use that.  This encoded data can be  set  using  the  "-Q"
+       pathname of a terminal database.  If this variable begins  with  "hex:"
+       or  "b64:"  then <EM>ncurses</EM> reads a terminal description from hexadecimal-
+       or base64-encoded data,  and  if  that  description  matches  the  name
+       sought,  will  use  that.   This encoded data can be set using the "-Q"
        option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG>.
 
-       The  preceding addresses the usual configuration of <EM>ncurses</EM>, which uses
-       terminal descriptions prepared in <EM>terminfo</EM> format.   While  <EM>termcap</EM>  is
-       less  expressive,  <EM>ncurses</EM>  can  also  be  configured  to  read <EM>termcap</EM>
+       The preceding addresses the usual configuration of <EM>ncurses</EM>, which  uses
+       terminal  descriptions  prepared  in <EM>terminfo</EM> format.  While <EM>termcap</EM> is
+       less expressive,  <EM>ncurses</EM>  can  also  be  configured  to  read  <EM>termcap</EM>
        descriptions.   In  that  configuration,  it  checks  the  <EM>TERMCAP</EM>  and
-       <EM>TERMPATH</EM>  variables  (for  content and search path, respectively) after
+       <EM>TERMPATH</EM> variables (for content and search  path,  respectively)  after
        the system terminal database.
 
 
 </PRE><H3><a name="h3-Preparing-Descriptions">Preparing Descriptions</a></H3><PRE>
-       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  <EM>terminfo</EM>  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  <EM>terminfo</EM>  and  to build up a
        description gradually, using partial descriptions with <EM>vi</EM> 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
        <EM>terminfo</EM> 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.
 
 
 </PRE><H3><a name="h3-Basic-Capabilities">Basic Capabilities</a></H3><PRE>
-       The  number  of  columns  on each line for the terminal is given by the
-       <STRONG>cols</STRONG> numeric capability.  If the terminal is a CRT, then the number  of
-       lines  on the screen is given by the <STRONG>lines</STRONG> capability.  If the terminal
-       wraps around to the beginning of the next  line  when  it  reaches  the
-       right  margin,  then it should have the <STRONG>am</STRONG> capability.  If the terminal
-       can clear its screen, leaving the cursor in  the  home  position,  then
-       this  is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the terminal
+       The number of columns on each line for the terminal  is  given  by  the
+       <STRONG>cols</STRONG>  numeric capability.  If the terminal is a CRT, then the number of
+       lines on the screen is given by the <STRONG>lines</STRONG> capability.  If the  terminal
+       wraps  around  to  the  beginning  of the next line when it reaches the
+       right margin, then it should have the <STRONG>am</STRONG> capability.  If  the  terminal
+       can  clear  its  screen,  leaving the cursor in the home position, then
+       this is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the  terminal
        overstrikes (rather than clearing a position when a character is struck
-       over)  then  it  should  have  the <STRONG>os</STRONG> capability.  If the terminal is a
+       over) then it should have the <STRONG>os</STRONG> capability.   If  the  terminal  is  a
        printing terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.  (<STRONG>os</STRONG>
-       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 <STRONG>cr</STRONG>.  (Normally
-       this will be carriage return,  control/M.)   If  there  is  a  code  to
+       this  will  be  carriage  return,  control/M.)   If  there is a code to
        produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
 
        If there is a code to move the cursor one position to the left (such as
-       backspace) that capability should be given as <STRONG>cub1</STRONG>.   Similarly,  codes
-       to  move  to the right, up, and down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and
-       <STRONG>cud1</STRONG>.  These local cursor motions should not alter the text  they  pass
-       over,  for  example,  you  would  not normally use "<STRONG>cuf1</STRONG>= " because the
+       backspace)  that  capability should be given as <STRONG>cub1</STRONG>.  Similarly, codes
+       to move to the right, up, and down should be given as <STRONG>cuf1</STRONG>,  <STRONG>cuu1</STRONG>,  and
+       <STRONG>cud1</STRONG>.   These  local cursor motions should not alter the text they pass
+       over, for example, you would not  normally  use  "<STRONG>cuf1</STRONG>= "  because  the
        space would erase the character moved over.
 
        A very important point here is that the local cursor motions encoded in
-       <EM>terminfo</EM>  are  undefined  at  the left and top edges of a CRT terminal.
+       <EM>terminfo</EM> are undefined at the left and top edges  of  a  CRT  terminal.
        Programs should never attempt to backspace around the left edge, unless
-       <STRONG>bw</STRONG>  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
+       <STRONG>bw</STRONG> 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 <STRONG>ind</STRONG> (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 <STRONG>ri</STRONG> (reverse index) string.  The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG>
        are undefined when not on their respective corners of the screen.
 
-       Parameterized  versions  of  the  scrolling  sequences are <STRONG>indn</STRONG> and <STRONG>rin</STRONG>
-       which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they  take  one
-       parameter,  and scroll that many lines.  They are also undefined except
+       Parameterized versions of the scrolling  sequences  are  <STRONG>indn</STRONG>  and  <STRONG>rin</STRONG>
+       which  have  the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they take one
+       parameter, and scroll that many lines.  They are also undefined  except
        at the appropriate edge of the screen.
 
-       The <STRONG>am</STRONG> 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 <STRONG>cuf1</STRONG> from the last column.  The only local motion  which  is  defined
-       from  the  left  edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge
-       will move to the right edge of the previous row.  If <STRONG>bw</STRONG> is  not  given,
-       the  effect  is undefined.  This is useful for drawing a box around the
+       The  <STRONG>am</STRONG> 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  <STRONG>cuf1</STRONG>  from  the last column.  The only local motion which is defined
+       from the left edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from  the  left  edge
+       will  move  to the right edge of the previous row.  If <STRONG>bw</STRONG> 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 <EM>terminfo</EM> file usually assumes that this is on;
-       i.e., <STRONG>am</STRONG>.  If the terminal has a  command  which  moves  to  the  first
-       column  of  the  next line, that command can be given as <STRONG>nel</STRONG> (newline).
-       It does not matter if the command clears the remainder of  the  current
-       line,  so  if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to
+       automatic margins, the <EM>terminfo</EM> file usually assumes that this  is  on;
+       i.e.,  <STRONG>am</STRONG>.   If  the  terminal  has  a command which moves to the first
+       column of the next line, that command can be given  as  <STRONG>nel</STRONG>  (newline).
+       It  does  not matter if the command clears the remainder of the current
+       line, so if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be  possible  to
        craft a working <STRONG>nel</STRONG> out of one or both of them.
 
        These  capabilities  suffice  to  describe  hard-copy  and  "glass-tty"
@@ -1449,19 +1243,19 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Parameterized-Strings">Parameterized Strings</a></H3><PRE>
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
-       terminal are described  by  a  parameterized  string  capability,  with
-       <EM>printf</EM>-like  escapes  such  as  <EM>%x</EM>  in it.  For example, to address the
-       cursor, the <STRONG>cup</STRONG> 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
+       terminal  are  described  by  a  parameterized  string capability, with
+       <EM>printf</EM>-like escapes such as <EM>%x</EM> in it.   For  example,  to  address  the
+       cursor,  the <STRONG>cup</STRONG> 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 by <STRONG>mrcup</STRONG>.
 
-       The parameter mechanism uses a stack and special <STRONG>%</STRONG> 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
+       The  parameter mechanism uses a stack and special <STRONG>%</STRONG> 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 <STRONG>sgr</STRONG> string.
 
        The <STRONG>%</STRONG> encodings have the following meanings:
@@ -1469,7 +1263,7 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        <STRONG>%%</STRONG>   outputs "%"
 
        <STRONG>%</STRONG><EM>[[</EM>:<EM>]flags][width[.precision]][</EM><STRONG>doxXs</STRONG><EM>]</EM>
-            as  in  <STRONG>printf(3)</STRONG>,  flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a ":" to allow
+            as in <STRONG>printf(3)</STRONG>, flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a  ":"  to  allow
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
@@ -1492,39 +1286,39 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        <STRONG>%g</STRONG><EM>[A-Z]</EM>
             get static variable <EM>[a-z]</EM> 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 <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact is not
+            not reset between calls to <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact  is  not
             documented in other implementations.  Relying on it will adversely
             impact portability to other implementations:
 
-            <STRONG>o</STRONG>   SVr2  curses  supported <EM>dynamic</EM> variables.  Those are set only
-                by a <STRONG>%P</STRONG> operator.  A <STRONG>%g</STRONG> for a  given  variable  without  first
-                setting  it  with  <STRONG>%P</STRONG> will give unpredictable results, because
-                dynamic variables are an  uninitialized  local  array  on  the
+            <STRONG>o</STRONG>   SVr2 curses supported <EM>dynamic</EM> variables.  Those are  set  only
+                by  a  <STRONG>%P</STRONG>  operator.   A <STRONG>%g</STRONG> for a given variable without first
+                setting it with <STRONG>%P</STRONG> will give  unpredictable  results,  because
+                dynamic  variables  are  an  uninitialized  local array on the
                 stack in the <STRONG>tparm</STRONG> function.
 
-            <STRONG>o</STRONG>   SVr3.2  curses supported <EM>static</EM> variables.  Those are an array
+            <STRONG>o</STRONG>   SVr3.2 curses supported <EM>static</EM> variables.  Those are an  array
                 in the <EM>TERMINAL</EM> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
                 automatically when the <STRONG>setupterm</STRONG> function allocates the data.
 
             <STRONG>o</STRONG>   SVr4 curses made no further improvements to the <EM>dynamic/static</EM>
                 variable feature.
 
-            <STRONG>o</STRONG>   Solaris XPG4 curses does not distinguish between  <EM>dynamic</EM>  and
-                <EM>static</EM>  variables.  They are the same.  Like SVr4 curses, XPG4
+            <STRONG>o</STRONG>   Solaris  XPG4  curses does not distinguish between <EM>dynamic</EM> and
+                <EM>static</EM> variables.  They are the same.  Like SVr4 curses,  XPG4
                 curses does not initialize these explicitly.
 
-            <STRONG>o</STRONG>   Before version 6.3, <EM>ncurses</EM> stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
+            <STRONG>o</STRONG>   Before  version  6.3,  <EM>ncurses</EM>  stores both <EM>dynamic</EM> and <EM>static</EM>
                 variables in persistent storage, initialized to zeros.
 
-            <STRONG>o</STRONG>   Beginning  with version 6.3, <EM>ncurses</EM> stores <EM>static</EM> and <EM>dynamic</EM>
+            <STRONG>o</STRONG>   Beginning with version 6.3, <EM>ncurses</EM> stores <EM>static</EM> and  <EM>dynamic</EM>
                 variables in the same manner as SVr4.
 
-                <STRONG>o</STRONG>   Unlike  other  implementations,  <EM>ncurses</EM>   zeros   dynamic
+                <STRONG>o</STRONG>   Unlike   other   implementations,  <EM>ncurses</EM>  zeros  dynamic
                     variables before the first <STRONG>%g</STRONG> or <STRONG>%P</STRONG> operator.
 
-                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in <EM>ncurses</EM> is
+                <STRONG>o</STRONG>   Like SVr2, the scope of dynamic variables  in  <EM>ncurses</EM>  is
                     within the current call to <STRONG>tparm</STRONG>.  Use static variables if
                     persistent storage is needed.
 
@@ -1554,8 +1348,8 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
        <STRONG>%?</STRONG> <EM>expr</EM> <STRONG>%t</STRONG> <EM>thenpart</EM> <STRONG>%e</STRONG> <EM>elsepart</EM> <STRONG>%;</STRONG>
             This forms an if-then-else.  The <STRONG>%e</STRONG> <EM>elsepart</EM> is optional.  Usually
-            the <STRONG>%?</STRONG> <EM>expr</EM> part pushes a value onto the stack,  and  <STRONG>%t</STRONG>  pops  it
-            from  the  stack,  testing if it is nonzero (true).  If it is zero
+            the  <STRONG>%?</STRONG>  <EM>expr</EM>  part  pushes a value onto the stack, and <STRONG>%t</STRONG> pops it
+            from the stack, testing if it is nonzero (true).  If  it  is  zero
             (false), control passes to the <STRONG>%e</STRONG> (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1563,84 +1357,84 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
             where ci are conditions, bi are bodies.
 
-            Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the  structure  of  if-
+            Use  the  <STRONG>-f</STRONG>  option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the structure of if-
             then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can be very complicated when
-            written on one line.  The <STRONG>-f</STRONG> option splits the string  into  lines
+            written  on  one line.  The <STRONG>-f</STRONG> 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}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
+       Binary operations are in postfix form with the operands  in  the  usual
+       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  <STRONG>%P</STRONG> and <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the  rows  and
-       columns  is  inverted  here,  and the row and column are printed as two
+       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
+       sent  \E&amp;a12c03Y  padded for 6 milliseconds.  The order of the rows and
+       columns is inverted here, and the row and column  are  printed  as  two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
 
-       The Microterm ACT-IV needs the current row and column sent preceded  by
+       The  Microterm ACT-IV needs the current row and column sent preceded by
        a <STRONG>^T</STRONG>, 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
-       (<STRONG>cub1</STRONG>), and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).   This
+       Terminals which use "%c" need  to  be  able  to  backspace  the  cursor
+       (<STRONG>cub1</STRONG>),  and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This
        is necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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
+       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 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
+       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
+       character.   Then  the  same  is  done  for the second parameter.  More
        complex arithmetic is possible using the stack.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
-       If  the  terminal has a fast way to home the cursor (to very upper left
-       corner of screen) then this can be given as <STRONG>home</STRONG>; similarly a fast  way
-       of  getting  to the lower left-hand corner can be given as <STRONG>ll</STRONG>; 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 <STRONG>home</STRONG>; similarly a fast way
+       of getting to the lower left-hand corner can be given as <STRONG>ll</STRONG>;  this  may
        involve going up with <STRONG>cuu1</STRONG> from the home position, but a program should
        never do this itself (unless <STRONG>ll</STRONG> 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
+       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 cannot be used for <STRONG>home</STRONG>.)
 
        If the terminal has row or column absolute cursor addressing, these can
-       be given as single  parameter  capabilities  <STRONG>hpa</STRONG>  (horizontal  position
-       absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
-       parameterized local motions (e.g., move <EM>n</EM> spaces to  the  right)  these
-       can  be  given  as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with a single parameter
-       indicating how many spaces to move.  These are primarily useful if  the
+       be  given  as  single  parameter  capabilities <STRONG>hpa</STRONG> (horizontal position
+       absolute) and <STRONG>vpa</STRONG> (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  <STRONG>cup</STRONG>.   If  there   are
+       parameterized  local  motions  (e.g., move <EM>n</EM> spaces to the right) these
+       can be given as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with  a  single  parameter
+       indicating  how many spaces to move.  These are primarily useful if the
        terminal does not have <STRONG>cup</STRONG>, 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 <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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
+       be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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.  This is also used for
-       the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets the command character  to  be  the
-       one  used  by  terminfo.   If  the  <STRONG>smcup</STRONG> sequence will not restore the
-       screen after an <STRONG>rmcup</STRONG>  sequence  is  output  (to  the  state  prior  to
+       the  TEKTRONIX  4025,  where <STRONG>smcup</STRONG> sets the command character to be the
+       one used by terminfo.  If the  <STRONG>smcup</STRONG>  sequence  will  not  restore  the
+       screen  after  an  <STRONG>rmcup</STRONG>  sequence  is  output  (to  the state prior to
        outputting <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       SVr4  (and  X/Open Curses) list several string capabilities for setting
-       margins.  Two were intended for use with  terminals,  and  another  six
+       SVr4 (and X/Open Curses) list several string capabilities  for  setting
+       margins.   Two  were  intended  for use with terminals, and another six
        were intended for use with printers.
 
        <STRONG>o</STRONG>   The two terminal capabilities assume that the terminal may have the
-           capability of setting the left and/or right margin at  the  current
+           capability  of  setting the left and/or right margin at the current
            cursor column position.
 
        <STRONG>o</STRONG>   The printer capabilities assume that the printer may have two types
@@ -1649,31 +1443,31 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
+           <STRONG>o</STRONG>   parameterized capabilities for setting the top,  bottom,  left,
                right margins given the number of rows or columns.
 
-       In practice, the categorization into "terminal" and  "printer"  is  not
+       In  practice,  the  categorization into "terminal" and "printer" is not
        suitable:
 
-       <STRONG>o</STRONG>   The  AT&amp;T  SVr4  terminal  database  uses <STRONG>smgl</STRONG> four times, for AT&amp;T
+       <STRONG>o</STRONG>   The AT&amp;T SVr4 terminal database uses  <STRONG>smgl</STRONG>  four  times,  for  AT&amp;T
            hardware.
 
-           Three of the four are printers.   They  lack  the  ability  to  set
+           Three  of  the  four  are  printers.   They lack the ability to set
            left/right margins by specifying the column.
 
-       <STRONG>o</STRONG>   Other  (non-AT&amp;T) terminals may support margins but using different
+       <STRONG>o</STRONG>   Other (non-AT&amp;T) terminals may support margins but using  different
            assumptions from AT&amp;T.
 
-           For instance, the DEC VT420 supports left/right margins,  but  only
+           For  instance,  the DEC VT420 supports left/right margins, but only
            using a column parameter.  As an added complication, the VT420 uses
-           two settings to fully enable left/right margins (left/right  margin
-           mode,  and  origin  mode).   The  former enables the margins, which
-           causes printed text to wrap  within  margins,  but  the  latter  is
+           two  settings to fully enable left/right margins (left/right margin
+           mode, and origin mode).  The  former  enables  the  margins,  which
+           causes  printed  text  to  wrap  within  margins, but the latter is
            needed to prevent cursor-addressing outside those margins.
 
-       <STRONG>o</STRONG>   Both  DEC  VT420  left/right  margins are set with a single control
+       <STRONG>o</STRONG>   Both DEC VT420 left/right margins are set  with  a  single  control
            sequence.  If either is omitted, the corresponding margin is set to
-           the  left  or  right  edge  of the display (rather than leaving the
+           the left or right edge of the  display  (rather  than  leaving  the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1691,231 +1485,231 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
                  <STRONG>smglr</STRONG>   Set both left and right margins to <EM>L</EM> and <EM>R</EM>
                  <STRONG>smgtb</STRONG>   Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
-       When writing an application that uses these  string  capabilities,  the
-       pairs  should be first checked to see if each capability in the pair is
+       When  writing  an  application that uses these string capabilities, the
+       pairs should be first checked to see if each capability in the pair  is
        set or only one is set:
 
-       <STRONG>o</STRONG>   If both <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG>  are  set,  each  is  used  with  a  single
-           argument,  <EM>N</EM>,  that  gives  the column number of the left and right
+       <STRONG>o</STRONG>   If  both  <STRONG>smglp</STRONG>  and  <STRONG>smgrp</STRONG>  are  set,  each  is used with a single
+           argument, <EM>N</EM>, that gives the column number of  the  left  and  right
            margin, respectively.
 
-       <STRONG>o</STRONG>   If both <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> are set, each is used to set  the  top  and
+       <STRONG>o</STRONG>   If  both  <STRONG>smgtp</STRONG>  and <STRONG>smgbp</STRONG> are set, each is used to set the top and
            bottom margin, respectively:
 
            <STRONG>o</STRONG>   <STRONG>smgtp</STRONG> is used with a single argument, <EM>N</EM>, the line number of the
                top margin.
 
-           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG> is used with two arguments, <EM>N</EM> and <EM>M</EM>, that give  the  line
+           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG>  is  used with two arguments, <EM>N</EM> and <EM>M</EM>, that give the line
                number of the bottom margin, the first counting from the top of
-               the page  and  the  second  counting  from  the  bottom.   This
-               accommodates  the two styles of specifying the bottom margin in
+               the  page  and  the  second  counting  from  the  bottom.  This
+               accommodates the two styles of specifying the bottom margin  in
                different manufacturers' printers.
 
-           When designing a terminfo entry for a printer that has  a  settable
-           bottom  margin,  only  the first or second argument should be used,
+           When  designing  a terminfo entry for a printer that has a settable
+           bottom margin, only the first or second argument  should  be  used,
            depending on the printer.  When developing an application that uses
            <STRONG>smgbp</STRONG> to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       <STRONG>o</STRONG>   If  only  one  of  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it is used with two
+       <STRONG>o</STRONG>   If only one of <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it  is  used  with  two
            arguments, the column number of the left and right margins, in that
            order.
 
-       <STRONG>o</STRONG>   Likewise,  if  only  one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then it is used
-           with two arguments that give the top and bottom  margins,  in  that
+       <STRONG>o</STRONG>   Likewise, if only one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then  it  is  used
+           with  two  arguments  that give the top and bottom margins, in that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both left and right or top and bottom margins simultaneously,  only
-           one  capability  in  the  pairs  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG>
+           both  left and right or top and bottom margins simultaneously, only
+           one capability in the pairs <STRONG>smglp</STRONG> and  <STRONG>smgrp</STRONG>  or  <STRONG>smgtp</STRONG>  and  <STRONG>smgbp</STRONG>
            should be defined, leaving the other unset.
 
-       Except for very old terminal descriptions, e.g.,  those  developed  for
-       SVr4,  the  scheme  just  described  should be considered obsolete.  An
+       Except  for  very  old terminal descriptions, e.g., those developed for
+       SVr4, the scheme just described  should  be  considered  obsolete.   An
        improved set of capabilities was added late in the SVr4 releases (<STRONG>smglr</STRONG>
-       and  <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting the
+       and <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting  the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The <STRONG>mgc</STRONG> string capability should  be  defined.   Applications  such  as
+       The  <STRONG>mgc</STRONG>  string  capability  should  be defined.  Applications such as
        <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG> rely upon this to reset all margins.
 
 
 </PRE><H3><a name="h3-Area-Clears">Area Clears</a></H3><PRE>
-       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  <STRONG>el</STRONG>.   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  <STRONG>el1</STRONG>.  If the terminal can clear from the current position to
-       the end of the display, then this should be given as <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  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 <STRONG>el</STRONG>.  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 <STRONG>el1</STRONG>.  If the terminal can clear from the current  position  to
+       the  end  of  the display, then this should be given as <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> 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  <STRONG>ed</STRONG>  is  not
+       a  request  to  delete  a  large  number  of lines, if a true <STRONG>ed</STRONG> is not
        available.)
 
 
 </PRE><H3><a name="h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></H3><PRE>
-       If  the  terminal  can  open a new blank line before the line where the
-       cursor is, this should be given as <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; 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 <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; this is done only from the  first
        position on the line to be deleted.  Versions of <STRONG>il1</STRONG> and <STRONG>dl1</STRONG> which take
        a single parameter and insert or delete that many lines can be given as
        <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
 
-       If the terminal has a settable scrolling region (like  the  vt100)  the
-       command  to  set  this  can be described with the <STRONG>csr</STRONG> capability, which
+       If  the  terminal  has a settable scrolling region (like the vt100) the
+       command to set this can be described with  the  <STRONG>csr</STRONG>  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 <STRONG>csr</STRONG> on
-       a properly chosen region; the <STRONG>sc</STRONG>  and  <STRONG>rc</STRONG>  (save  and  restore  cursor)
+       It is possible to get the effect of insert or delete line using <STRONG>csr</STRONG>  on
+       a  properly  chosen  region;  the  <STRONG>sc</STRONG>  and <STRONG>rc</STRONG> (save and restore cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string does not move the cursor.  (Note that  the  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  library
-       does   this   synthesis   automatically,   so   you  need  not  compose
+       string  does  not  move the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library
+       does  this  synthesis  automatically,   so   you   need   not   compose
        insert/delete strings for an entry with <STRONG>csr</STRONG>).
 
-       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   however   also   has
+       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  however  also  has
        insert/delete).
 
-       Inserting  lines  at  the  top or bottom of the screen can also be done
-       using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
+       Inserting lines at the top or bottom of the screen  can  also  be  done
+       using  <STRONG>ri</STRONG>  or  <STRONG>ind</STRONG> on many terminals without a true insert/delete line,
        and is often faster even on terminals with those features.
 
-       The  Boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
-       of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
-       off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
-       non-destructive.   System  V  and XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
+       The Boolean <STRONG>non_dest_scroll_region</STRONG> 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 something to the bottom line, move the cursor to the top
+       of the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data  scrolled
+       off  the  bottom  of the region by the <STRONG>ri</STRONG> re-appears, then scrolling is
+       non-destructive.  System V and XSI Curses expect that  <STRONG>ind</STRONG>,  <STRONG>ri</STRONG>,  <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
-       cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
-       implementation is more  liberal  and  will  do  explicit  erases  after
+       cautions you not to define  <STRONG>csr</STRONG>  unless  this  is  true.   This  <STRONG>curses</STRONG>
+       implementation  is  more  liberal  and  will  do  explicit erases after
        scrolling if <STRONG>ndsrc</STRONG> 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  <STRONG>wind</STRONG>.  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 <STRONG>wind</STRONG>.  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 <STRONG>da</STRONG> capability
-       should  be  given;  if  display  memory  can be retained below, then <STRONG>db</STRONG>
-       should be given.  These indicate that deleting a line or scrolling  may
-       bring  non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG> may
+       should be given; if display memory  can  be  retained  below,  then  <STRONG>db</STRONG>
+       should  be given.  These indicate that deleting a line or scrolling may
+       bring non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG>  may
        bring down non-blank lines.
 
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
-       There are two basic kinds of  intelligent  terminals  with  respect  to
-       insert/delete  character  which  can  be described using <EM>terminfo.</EM>  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
+       There  are  two  basic  kinds  of intelligent terminals with respect to
+       insert/delete character which can be  described  using  <EM>terminfo.</EM>   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 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
-       second  type  of  terminal,  and  should  give the capability <STRONG>in</STRONG>, which
+       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
+       second type of terminal, and  should  give  the  capability  <STRONG>in</STRONG>,  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 <STRONG>smir</STRONG> the sequence to get into insert mode.  Give
-       as <STRONG>rmir</STRONG> the sequence to leave  insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
-       sequence  needed  to  be  sent  just before sending the character to be
-       inserted.  Most terminals with a true insert mode will not  give  <STRONG>ich1</STRONG>;
-       terminals  which  send a sequence to open a screen position should give
+       as  <STRONG>rmir</STRONG>  the  sequence  to  leave  insert  mode.  Now give as <STRONG>ich1</STRONG> any
+       sequence needed to be sent just before  sending  the  character  to  be
+       inserted.   Most  terminals with a true insert mode will not give <STRONG>ich1</STRONG>;
+       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  <STRONG>ich1</STRONG>.
-       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  <STRONG>ich</STRONG>  sequences do not require previous smir, and most smir insert
-       modes do not require <STRONG>ich1</STRONG> before each character.   Therefore,  the  new
-       <STRONG>curses</STRONG>  actually  assumes this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or
-       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> 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 <STRONG>ich1</STRONG>.
+       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 <STRONG>ich</STRONG> sequences do not require previous smir, and most  smir  insert
+       modes  do  not  require <STRONG>ich1</STRONG> before each character.  Therefore, the new
+       <STRONG>curses</STRONG> actually assumes this is the case and uses either  <STRONG>rmir</STRONG>/<STRONG>smir</STRONG>  or
+       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  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 <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in  <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be sent
+       in <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be  sent
        after an insert of a single character may also be given in <STRONG>ip</STRONG>.  If your
-       terminal  needs  both  to be placed into an "insert mode" and a special
-       code to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>  and  <STRONG>ich1</STRONG>
-       can  be  given,  and  both  will be used.  The <STRONG>ich</STRONG> capability, with one
+       terminal needs both to be placed into an "insert mode"  and  a  special
+       code  to  precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> and <STRONG>ich1</STRONG>
+       can be given, and both will be used.   The  <STRONG>ich</STRONG>  capability,  with  one
        parameter, <EM>n</EM>, will repeat the effects of <STRONG>ich1</STRONG> <EM>n</EM> 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 <STRONG>rmp</STRONG>.
 
-       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 <STRONG>mir</STRONG> to  speed  up  inserting  in  this
-       case.   Omitting  <STRONG>mir</STRONG>  will affect only speed.  Some terminals (notably
-       Datamedia's) must not have <STRONG>mir</STRONG> 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 <STRONG>mir</STRONG> to speed up inserting in this
+       case.  Omitting <STRONG>mir</STRONG> will affect only speed.   Some  terminals  (notably
+       Datamedia's)  must  not  have  <STRONG>mir</STRONG> because of the way their insert mode
        works.
 
-       Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
-       one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> and  delete  mode  by  giving
-       <STRONG>smdc</STRONG>  and  <STRONG>rmdc</STRONG>  to  enter  and exit delete mode (any mode the terminal
+       Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
+       one  parameter,  <EM>n</EM>,  to  delete <EM>n</EM> <EM>characters,</EM> and delete mode by giving
+       <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit delete  mode  (any  mode  the  terminal
        needs to be placed in for <STRONG>dch1</STRONG> to work).
 
-       A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
+       A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
 </PRE><H3><a name="h3-Highlighting_Underlining_and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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  <EM>standout</EM>  <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, 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 <EM>standout</EM> <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>,  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
        <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as <STRONG>smul</STRONG> and
        <STRONG>rmul</STRONG> 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 <STRONG>uc</STRONG>.
 
-       Other  capabilities  to  enter various highlighting modes include <STRONG>blink</STRONG>
-       (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> (dim or  half-bright)  <STRONG>invis</STRONG>
-       (blanking  or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>
-       (turn off <EM>all</EM> attribute modes) <STRONG>smacs</STRONG>  (enter  alternate  character  set
+       Other capabilities to enter various highlighting  modes  include  <STRONG>blink</STRONG>
+       (blinking)  <STRONG>bold</STRONG>  (bold or extra bright) <STRONG>dim</STRONG> (dim or half-bright) <STRONG>invis</STRONG>
+       (blanking or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video)  <STRONG>sgr0</STRONG>
+       (turn  off  <EM>all</EM>  attribute  modes) <STRONG>smacs</STRONG> (enter alternate character set
        mode) and <STRONG>rmacs</STRONG> (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  <STRONG>sgr</STRONG> (set attributes), taking 9 parameters.  Each
+       If  there  is  a  sequence to set arbitrary combinations of modes, this
+       should be given as <STRONG>sgr</STRONG> (set attributes),  taking  9  parameters.   Each
        parameter is either zero (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.
+       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  <STRONG>sgr</STRONG>,  only  those  for  which
        corresponding separate attribute commands exist.
 
@@ -1934,17 +1728,17 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
                    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
-       terminal  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
+       terminal 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
-       output when either p1 or p3 is true, that is,  if  either  standout  or
+       Some sequences are common to  different  modes.   For  example,  ;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 dependencies yields
@@ -1965,54 +1759,54 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
            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
+       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
+       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  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> capability, asserting that it  is
+       Terminals   with  the  "magic  cookie"  glitch  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> 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 <STRONG>flash</STRONG>;  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 <STRONG>flash</STRONG>; 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
        <STRONG>cvvis</STRONG>.  If there is a way to make the cursor completely invisible, give
-       that  as  <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which undoes the
+       that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> 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 <STRONG>ul</STRONG>.  If  a  character  overstriking  another
-       leaves  both  characters  on the screen, specify the capability <STRONG>os</STRONG>.  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  <STRONG>ul</STRONG>.  If a character overstriking another
+       leaves both characters on the screen, specify the  capability  <STRONG>os</STRONG>.   If
        overstrikes are erasable with a blank, then this should be indicated by
        giving <STRONG>eo</STRONG>.
 
 
 </PRE><H3><a name="h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></H3><PRE>
-       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
-       to  transmit  or  not  transmit,  give  these  codes  as <STRONG>smkx</STRONG> and <STRONG>rmkx</STRONG>.
+       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
+       to transmit or not  transmit,  give  these  codes  as  <STRONG>smkx</STRONG>  and  <STRONG>rmkx</STRONG>.
        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 <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG>
+       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
+       and home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>  <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG>  and  <STRONG>khome</STRONG>
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes  they  send  can  be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys
-       have labels other than the default f0 through f10, the  labels  can  be
+       codes they send can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG>  <STRONG>kf10</STRONG>.   If  these  keys
+       have  labels  other  than the default f0 through f10, the labels can be
        given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.
 
        The codes transmitted by certain other special keys can be given:
@@ -2051,64 +1845,64 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   <STRONG>khts</STRONG> (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  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,
-       <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.   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 <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>,
+       <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  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 <STRONG>pfkey</STRONG>, <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>.
-       A  string to program screen labels should be specified as <STRONG>pln</STRONG>.  Each of
-       these strings takes two parameters: the function key number to  program
+       A string to program screen labels should be specified as <STRONG>pln</STRONG>.  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 <STRONG>pfkey</STRONG> causes
-       pressing the given key to be the same as  the  user  typing  the  given
-       string;  <STRONG>pfloc</STRONG>  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  <STRONG>pfkey</STRONG>  causes
+       pressing  the  given  key  to  be the same as the user typing the given
+       string; <STRONG>pfloc</STRONG> causes the string to  be  executed  by  the  terminal  in
        local; and <STRONG>pfx</STRONG> causes the string to be transmitted to the computer.
 
-       The capabilities <STRONG>nlab</STRONG>, <STRONG>lw</STRONG> and <STRONG>lh</STRONG>  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  <STRONG>smln</STRONG>  and  <STRONG>rmln</STRONG>.   <STRONG>smln</STRONG>  is
-       normally  output  after one or more pln sequences to make sure that the
+       The  capabilities  <STRONG>nlab</STRONG>,  <STRONG>lw</STRONG>  and  <STRONG>lh</STRONG> 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 <STRONG>smln</STRONG> and <STRONG>rmln</STRONG>.  <STRONG>smln</STRONG> is
+       normally output after one or more pln sequences to make sure  that  the
        change becomes visible.
 
 
 </PRE><H3><a name="h3-Tabs-and-Initialization">Tabs and Initialization</a></H3><PRE>
        A few capabilities are used only for tabs:
 
-       <STRONG>o</STRONG>   If the terminal has hardware tabs, the command to  advance  to  the
+       <STRONG>o</STRONG>   If  the  terminal  has hardware tabs, the command to advance to the
            next tab stop can be given as <STRONG>ht</STRONG> (usually control/I).
 
        <STRONG>o</STRONG>   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as <STRONG>cbt</STRONG>.
 
-           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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> 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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> even if they are present, since
            the user may not have the tab stops properly set.
 
-       <STRONG>o</STRONG>   If  the  terminal has hardware tabs which are initially set every <EM>n</EM>
+       <STRONG>o</STRONG>   If the terminal has hardware tabs which are initially set  every  <EM>n</EM>
            spaces when the terminal is powered up, the numeric parameter <STRONG>it</STRONG> is
            given, showing the number of spaces the tabs are set to.
 
            The <STRONG>it</STRONG> capability is normally used by the <STRONG>tset</STRONG> 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
 
        <STRONG>o</STRONG>   <STRONG>is1</STRONG>, <STRONG>is2</STRONG>, and <STRONG>is3</STRONG>, initialization strings for the terminal,
 
-       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>,  the  path  name  of  a  program to be run to initialize the
+       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>, the path name of a program  to  be  run  to  initialize  the
            terminal,
 
        <STRONG>o</STRONG>   and <STRONG>if</STRONG>, 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 <EM>init</EM> option of the <STRONG>tput</STRONG>  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  <EM>init</EM> option of the <STRONG>tput</STRONG> program, each time the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -2132,34 +1926,34 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
               and finally output
                      <STRONG>is3</STRONG>.
 
-       Most  initialization  is  done with <STRONG>is2</STRONG>.  Special terminal modes can be
-       set up without duplicating strings by putting the common  sequences  in
+       Most initialization is done with <STRONG>is2</STRONG>.  Special terminal  modes  can  be
+       set  up  without duplicating strings by putting the common sequences in
        <STRONG>is2</STRONG> and special cases in <STRONG>is1</STRONG> and <STRONG>is3</STRONG>.
 
-       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 <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
-       and  <STRONG>is3</STRONG>  respectively.   These  strings  are output by <EM>reset</EM> option of
-       <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which  is  used  when
+       and <STRONG>is3</STRONG> respectively.  These strings are  output  by  <EM>reset</EM>  option  of
+       <STRONG>tput</STRONG>,  or  by  the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
        the terminal gets into a wedged state.  Commands are normally placed in
        <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> 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  <STRONG>is2</STRONG>,  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 <STRONG>is2</STRONG>, 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 <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>,  etc.,  in  the  same
-       order  as  the  <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc.  If
-       any of <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are  missing,  the
-       <STRONG>reset</STRONG>   program   falls  back  upon  the  corresponding  initialization
+       The  <STRONG>reset</STRONG>  program  writes  strings including <STRONG>iprog</STRONG>, etc., in the same
+       order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of  <STRONG>is1</STRONG>,  etc.   If
+       any  of  <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are missing, the
+       <STRONG>reset</STRONG>  program  falls  back  upon  the   corresponding   initialization
        capability 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
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (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 <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
-       The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
-       command, although the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>)  provide  different
+       The <STRONG>tput</STRONG> <STRONG>reset</STRONG> command uses the same capability strings  as  the  <STRONG>reset</STRONG>
+       command,  although  the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>) provide different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -2168,146 +1962,147 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every <EM>eight</EM> columns:
 
-           The  only  exception  was  the  AT&amp;T 2300 series, which set tabs to
+           The only exception was the AT&amp;T 2300  series,  which  set  tabs  to
            every <EM>five</EM> columns.
 
-       <STRONG>o</STRONG>   In particular, developers  of  the  hardware  terminals  which  are
-           commonly  used  as  models  for  modern terminal emulators provided
+       <STRONG>o</STRONG>   In  particular,  developers  of  the  hardware  terminals which are
+           commonly used as models  for  modern  terminal  emulators  provided
            documentation demonstrating that <EM>eight</EM> columns were the standard.
 
        <STRONG>o</STRONG>   Because of this, the terminal initialization programs <STRONG>tput</STRONG> and <STRONG>tset</STRONG>
-           use   the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)  capabilities
-           directly only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a  value
+           use  the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)   capabilities
+           directly  only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a value
            other than <EM>eight</EM>.
 
 
 </PRE><H3><a name="h3-Delays-and-Padding">Delays and Padding</a></H3><PRE>
-       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
+       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 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 <STRONG>xon</STRONG>.  This capability suppresses  the  emission  of
-       padding.   You  can  also  set  it  for  memory-mapped  console devices
+       automatically emits ^S back to the host  when  its  input  buffers  are
+       close  to  full),  set <STRONG>xon</STRONG>.  This capability 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 decisions about
+       still be included so that routines  can  make  better  decisions  about
        relative costs, but actual pad characters will not be transmitted.
 
        If <STRONG>pb</STRONG> (padding baud rate) is given, padding is suppressed at baud rates
-       below  the  value  of  <STRONG>pb</STRONG>.  If the entry has no padding baud rate, then
+       below the value of <STRONG>pb</STRONG>.  If the entry has no  padding  baud  rate,  then
        whether padding is emitted or not is completely controlled by <STRONG>xon</STRONG>.
 
-       If the terminal requires other than a null (zero) character as  a  pad,
-       then  this  can  be  given as <STRONG>pad</STRONG>.  Only the first character of the <STRONG>pad</STRONG>
+       If  the  terminal requires other than a null (zero) character as a pad,
+       then this can be given as <STRONG>pad</STRONG>.  Only the first  character  of  the  <STRONG>pad</STRONG>
        string is used.
 
 
 </PRE><H3><a name="h3-Status-Lines">Status Lines</a></H3><PRE>
-       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 <STRONG>lines</STRONG> 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 <STRONG>hs</STRONG> capability.
 
-       Some  terminals  with status lines need special sequences to access the
-       status line.  These may be expressed as a string with single  parameter
-       <STRONG>tsl</STRONG>  which takes the cursor to a given zero-origin column on the status
-       line.  The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen  cursor
+       Some terminals with status lines need special sequences to  access  the
+       status  line.  These may be expressed as a string with single parameter
+       <STRONG>tsl</STRONG> which takes the cursor to a given zero-origin column on the  status
+       line.   The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen cursor
        positions before the last <STRONG>tsl</STRONG>.  You may need to embed the string values
-       of <STRONG>sc</STRONG> (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and  <STRONG>fsl</STRONG>  to
+       of  <STRONG>sc</STRONG>  (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and <STRONG>fsl</STRONG> 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 <STRONG>wsl</STRONG>.
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The  Boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
+       The Boolean capability <STRONG>eslok</STRONG> specifies  that  escape  sequences,  tabs,
        etc., work ordinarily in the status line.
 
-       The <EM>ncurses</EM> implementation does not yet use any of these  capabilities.
+       The  <EM>ncurses</EM> implementation does not yet use any of these capabilities.
        They are documented here in case they ever become important.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Many  terminals have alternate character sets useful for forms-drawing.
-       Terminfo and <STRONG>curses</STRONG> have built-in  support  for  most  of  the  drawing
-       characters  supported  by the VT100, with some characters from the AT&amp;T
-       4410v1 added.  This alternate character set may  be  specified  by  the
+       Many terminals have alternate character sets useful for  forms-drawing.
+       Terminfo  and  <STRONG>curses</STRONG>  have  built-in  support  for most of the drawing
+       characters supported by the VT100, with some characters from  the  AT&amp;T
+       4410v1  added.   This  alternate  character set may be specified by the
        <STRONG>acsc</STRONG> capability.
 
-                                                   <STRONG>ASCII</STRONG>      <STRONG>acsc</STRONG>     <STRONG>acsc</STRONG>
-         <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>                 <STRONG>ACS</STRONG> <STRONG>Name</STRONG>       <STRONG>Fallback</STRONG>   <STRONG>Symbol</STRONG>   <STRONG>Value</STRONG>
-         --------------------------------------------------------------------
-         arrow pointing right       <STRONG>ACS_RARROW</STRONG>     &gt;          +        0x2b
-         arrow pointing left        <STRONG>ACS_LARROW</STRONG>     &lt;          ,        0x2c
-         arrow pointing up          <STRONG>ACS_UARROW</STRONG>     ^          -        0x2d
-         arrow pointing down        <STRONG>ACS_DARROW</STRONG>     v          .        0x2e
-         solid square block         <STRONG>ACS_BLOCK</STRONG>      #          0        0x30
-         diamond                    <STRONG>ACS_DIAMOND</STRONG>    +          `        0x60
-         checker board (stipple)    <STRONG>ACS_CKBOARD</STRONG>    :          a        0x61
-         degree symbol              <STRONG>ACS_DEGREE</STRONG>     \          f        0x66
-         plus/minus                 <STRONG>ACS_PLMINUS</STRONG>    #          g        0x67
-         board of squares           <STRONG>ACS_BOARD</STRONG>      #          h        0x68
-         lantern symbol             <STRONG>ACS_LANTERN</STRONG>    #          i        0x69
-         lower right corner         <STRONG>ACS_LRCORNER</STRONG>   +          j        0x6a
-         upper right corner         <STRONG>ACS_URCORNER</STRONG>   +          k        0x6b
-         upper left corner          <STRONG>ACS_ULCORNER</STRONG>   +          l        0x6c
-         lower left corner          <STRONG>ACS_LLCORNER</STRONG>   +          m        0x6d
-         large plus or crossover    <STRONG>ACS_PLUS</STRONG>       +          n        0x6e
-         scan line 1                <STRONG>ACS_S1</STRONG>         ~          o        0x6f
-         scan line 3                <STRONG>ACS_S3</STRONG>         -          p        0x70
-         horizontal line            <STRONG>ACS_HLINE</STRONG>      -          q        0x71
-         scan line 7                <STRONG>ACS_S7</STRONG>         -          r        0x72
-         scan line 9                <STRONG>ACS_S9</STRONG>         _          s        0x73
-         tee pointing right         <STRONG>ACS_LTEE</STRONG>       +          t        0x74
-         tee pointing left          <STRONG>ACS_RTEE</STRONG>       +          u        0x75
-         tee pointing up            <STRONG>ACS_BTEE</STRONG>       +          v        0x76
-         tee pointing down          <STRONG>ACS_TTEE</STRONG>       +          w        0x77
-         vertical line              <STRONG>ACS_VLINE</STRONG>      |          x        0x78
-         less-than-or-equal-to      <STRONG>ACS_LEQUAL</STRONG>     &lt;          y        0x79
-         greater-than-or-equal-to   <STRONG>ACS_GEQUAL</STRONG>     &gt;          z        0x7a
-         greek pi                   <STRONG>ACS_PI</STRONG>         *          {        0x7b
-         not-equal                  <STRONG>ACS_NEQUAL</STRONG>     !          |        0x7c
-         UK pound sign              <STRONG>ACS_STERLING</STRONG>   f          }        0x7d
-         bullet                     <STRONG>ACS_BULLET</STRONG>     o          ~        0x7e
+                          <STRONG>acsc</STRONG>
+       <STRONG>ACS</STRONG> <STRONG>Name</STRONG>      <STRONG>Value</STRONG>   <STRONG>Symbol</STRONG>   <STRONG>ASCII</STRONG> <STRONG>Fallback</STRONG> <STRONG>/</STRONG> <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>ACS_RARROW</STRONG>    0x2b      +      <STRONG>&gt;</STRONG>  arrow pointing right
+       <STRONG>ACS_LARROW</STRONG>    0x2c      ,      <STRONG>&lt;</STRONG>  arrow pointing left
+       <STRONG>ACS_UARROW</STRONG>    0x2d      -      <STRONG>^</STRONG>  arrow pointing up
+       <STRONG>ACS_DARROW</STRONG>    0x2e      .      <STRONG>v</STRONG>  arrow pointing down
+       <STRONG>ACS_BLOCK</STRONG>     0x30      0      <STRONG>#</STRONG>  solid square block
+       <STRONG>ACS_DIAMOND</STRONG>   0x60      `      <STRONG>+</STRONG>  diamond
+       <STRONG>ACS_CKBOARD</STRONG>   0x61      a      <STRONG>:</STRONG>  checker board (stipple)
+       <STRONG>ACS_DEGREE</STRONG>    0x66      f      <STRONG>\</STRONG>  degree symbol
+       <STRONG>ACS_PLMINUS</STRONG>   0x67      g      <STRONG>#</STRONG>  plus/minus
+       <STRONG>ACS_BOARD</STRONG>     0x68      h      <STRONG>#</STRONG>  board of squares
+       <STRONG>ACS_LANTERN</STRONG>   0x69      i      <STRONG>#</STRONG>  lantern symbol
+       <STRONG>ACS_LRCORNER</STRONG>  0x6a      j      <STRONG>+</STRONG>  lower right corner
+
+       <STRONG>ACS_URCORNER</STRONG>  0x6b      k      <STRONG>+</STRONG>  upper right corner
+       <STRONG>ACS_ULCORNER</STRONG>  0x6c      l      <STRONG>+</STRONG>  upper left corner
+       <STRONG>ACS_LLCORNER</STRONG>  0x6d      m      <STRONG>+</STRONG>  lower left corner
+       <STRONG>ACS_PLUS</STRONG>      0x6e      n      <STRONG>+</STRONG>  large plus or crossover
+       <STRONG>ACS_S1</STRONG>        0x6f      o      <STRONG>~</STRONG>  scan line 1
+       <STRONG>ACS_S3</STRONG>        0x70      p      <STRONG>-</STRONG>  scan line 3
+       <STRONG>ACS_HLINE</STRONG>     0x71      q      <STRONG>-</STRONG>  horizontal line
+       <STRONG>ACS_S7</STRONG>        0x72      r      <STRONG>-</STRONG>  scan line 7
+       <STRONG>ACS_S9</STRONG>        0x73      s      <STRONG>_</STRONG>  scan line 9
+       <STRONG>ACS_LTEE</STRONG>      0x74      t      <STRONG>+</STRONG>  tee pointing right
+       <STRONG>ACS_RTEE</STRONG>      0x75      u      <STRONG>+</STRONG>  tee pointing left
+       <STRONG>ACS_BTEE</STRONG>      0x76      v      <STRONG>+</STRONG>  tee pointing up
+       <STRONG>ACS_TTEE</STRONG>      0x77      w      <STRONG>+</STRONG>  tee pointing down
+       <STRONG>ACS_VLINE</STRONG>     0x78      x      <STRONG>|</STRONG>  vertical line
+       <STRONG>ACS_LEQUAL</STRONG>    0x79      y      <STRONG>&lt;</STRONG>  less-than-or-equal-to
+       <STRONG>ACS_GEQUAL</STRONG>    0x7a      z      <STRONG>&gt;</STRONG>  greater-than-or-equal-to
+       <STRONG>ACS_PI</STRONG>        0x7b      {      <STRONG>*</STRONG>  greek pi
+       <STRONG>ACS_NEQUAL</STRONG>    0x7c      |      <STRONG>!</STRONG>  not-equal
+       <STRONG>ACS_STERLING</STRONG>  0x7d      }      <STRONG>f</STRONG>  UK pound sign
+       <STRONG>ACS_BULLET</STRONG>    0x7e      ~      <STRONG>o</STRONG>  bullet
 
        A few notes apply to the table itself:
 
-       <STRONG>o</STRONG>   X/Open  Curses  incorrectly  states that the mapping for <EM>lantern</EM> is
-           uppercase "I" although Unix implementations use the  lowercase  "i"
+       <STRONG>o</STRONG>   X/Open Curses incorrectly states that the mapping  for  <EM>lantern</EM>  is
+           uppercase  "I"  although Unix implementations use the lowercase "i"
            mapping.
 
-       <STRONG>o</STRONG>   The  DEC  VT100  implemented graphics using the alternate character
-           set feature, temporarily switching <EM>modes</EM> and sending characters  in
-           the  range  0x60  (96)  to 0x7e (126) (the <STRONG>acsc</STRONG> <STRONG>Value</STRONG> column in the
+       <STRONG>o</STRONG>   The DEC VT100 implemented graphics using  the  alternate  character
+           set  feature, temporarily switching <EM>modes</EM> and sending characters in
+           the range 0x60 (96) to 0x7e (126) (the <STRONG>acsc</STRONG>  <STRONG>Value</STRONG>  column  in  the
            table).
 
        <STRONG>o</STRONG>   The AT&amp;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&amp;T terminal: <EM>board</EM> <EM>of</EM> <EM>squares</EM>
-           replaces the VT100 <EM>newline</EM> symbol, while  <EM>lantern</EM>  <EM>symbol</EM>  replaces
+           Some  of  the  characters  within the range do not match the VT100;
+           presumably they were used in the AT&amp;T terminal:  <EM>board</EM>  <EM>of</EM>  <EM>squares</EM>
+           replaces  the  VT100  <EM>newline</EM> symbol, while <EM>lantern</EM> <EM>symbol</EM> replaces
            the VT100 <EM>vertical</EM> <EM>tab</EM> symbol.  The other VT100 symbols for control
-           characters (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) are  not
+           characters  (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) 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  <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG>  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 <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG> 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.
 
 
 </PRE><H3><a name="h3-Color-Handling">Color Handling</a></H3><PRE>
-       The  curses  library  functions <STRONG>init_pair</STRONG> and <STRONG>init_color</STRONG> manipulate the
-       <EM>color</EM>  <EM>pairs</EM>  and  <EM>color</EM>  <EM>values</EM>  discussed  in   this   section   (see
+       The curses library functions <STRONG>init_pair</STRONG> and  <STRONG>init_color</STRONG>  manipulate  the
+       <EM>color</EM>   <EM>pairs</EM>   and   <EM>color</EM>  <EM>values</EM>  discussed  in  this  section  (see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2316,45 +2111,45 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
            is usually 8), and can set character-cell foreground and background
            characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
 
-       <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
-           separately  (foreground  and  background  are   not   independently
-           settable).   Up  to  <EM>M</EM> color pairs may be set up from 2*<EM>M</EM> different
+       <STRONG>o</STRONG>   On HP-like  terminals,  the  user  must  set  each  color  pair  up
+           separately   (foreground   and  background  are  not  independently
+           settable).  Up to <EM>M</EM> color pairs may be set up  from  2*<EM>M</EM>  different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
-       colors and color pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
+       numeric capabilities <STRONG>colors</STRONG> and <STRONG>pairs</STRONG> specify the  maximum  numbers  of
+       colors  and  color  pairs that can be displayed simultaneously.  The <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
-       default values for the terminal.  The <STRONG>oc</STRONG> 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;
+       default  values  for  the terminal.  The <STRONG>oc</STRONG> 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 <STRONG>bce</STRONG>.
 
-       While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
-       inability  of  some  devices  to  set  foreground and background colors
-       independently), there  are  separate  capabilities  for  setting  these
+       While  the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting the
+       inability of some devices  to  set  foreground  and  background  colors
+       independently),  there  are  separate  capabilities  for  setting these
        features:
 
-       <STRONG>o</STRONG>   To   change  the  current  foreground  or  background  color  on  a
-           Tektronix-type terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and  <STRONG>setab</STRONG>
-           (set  ANSI  background)  or  <STRONG>setf</STRONG>  (set  foreground)  and <STRONG>setb</STRONG> (set
+       <STRONG>o</STRONG>   To  change  the  current  foreground  or  background  color  on   a
+           Tektronix-type  terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and <STRONG>setab</STRONG>
+           (set ANSI background)  or  <STRONG>setf</STRONG>  (set  foreground)  and  <STRONG>setb</STRONG>  (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation  describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says that
-           "If the terminal supports ANSI escape sequences to  set  background
-           and   foreground,   they  should  be  coded  as  <STRONG>setaf</STRONG>  and  <STRONG>setab</STRONG>,
+           documentation describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says  that
+           "If  the  terminal supports ANSI escape sequences to set background
+           and  foreground,  they  should  be  coded  as  <STRONG>setaf</STRONG>   and   <STRONG>setab</STRONG>,
            respectively.
 
-       <STRONG>o</STRONG>   If the terminal supports other escape sequences to  set  background
-           and   foreground,   they   should   be  coded  as  <STRONG>setf</STRONG>  and  <STRONG>setb</STRONG>,
-           respectively.  The <STRONG>vidputs</STRONG> and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  functions  use  the
+       <STRONG>o</STRONG>   If  the  terminal supports other escape sequences to set background
+           and  foreground,  they  should  be  coded   as   <STRONG>setf</STRONG>   and   <STRONG>setb</STRONG>,
+           respectively.   The  <STRONG>vidputs</STRONG>  and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> functions use the
            <STRONG>setaf</STRONG> and <STRONG>setab</STRONG> capabilities if they are defined.
 
-       The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
+       The <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single  numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
-       as  follows (the middle column is the symbolic #define available in the
-       header for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware  is
-       free  to  map  these  as  it  likes, but the RGB values indicate normal
+       as follows (the middle column is the symbolic #define available in  the
+       header  for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware is
+       free to map these as it likes,  but  the  RGB  values  indicate  normal
        locations in color space.
 
                     <STRONG>Color</STRONG>      <STRONG>#define</STRONG>       <STRONG>Value</STRONG>        <STRONG>RGB</STRONG>
@@ -2382,32 +2177,32 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
                    yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max, max, 0
                    white     <STRONG>COLOR_WHITE</STRONG>       7     max, max, max
 
-       It  is  important  to  not  confuse the two sets of color capabilities;
+       It is important to not confuse the  two  sets  of  color  capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On an HP-like terminal, use <STRONG>scp</STRONG> with a color pair number  parameter  to
+       On  an  HP-like terminal, use <STRONG>scp</STRONG> with a color pair number parameter to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
 
-       <STRONG>o</STRONG>   On  a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present to
-           indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
+       <STRONG>o</STRONG>   On a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present  to
+           indicate  that colors can be modified.  If so, the <STRONG>initc</STRONG> capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           which  describe the color.  These three parameters default to being
+           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  Boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
-           color pair value.  It will take  seven  parameters;  a  color  pair
-           number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
-           background and then foreground colors.  These  parameters  must  be
-           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
+       <STRONG>o</STRONG>   On an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing  a
+           color  pair  value.   It  will  take seven parameters; a color pair
+           number (0 to <STRONG>max_pairs</STRONG> -  1),  and  two  triples  describing  first
+           background  and  then  foreground colors.  These parameters must be
+           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
            <STRONG>hls</STRONG>.
 
-       On some color terminals,  colors  collide  with  highlights.   You  can
-       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit mask
-       of  attributes  not  to  be  used  when  colors   are   enabled.    The
+       On  some  color  terminals,  colors  collide  with highlights.  You can
+       register these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit  mask
+       of   attributes   not   to  be  used  when  colors  are  enabled.   The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
                          <STRONG>Attribute</STRONG>     <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>   <STRONG>Set</STRONG> <STRONG>by</STRONG>
@@ -2426,122 +2221,121 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
                         <STRONG>A_LOW</STRONG>          11      2048    <STRONG>sgr1</STRONG>
                         <STRONG>A_RIGHT</STRONG>        12      4096    <STRONG>sgr1</STRONG>
                         <STRONG>A_TOP</STRONG>          13      8192    <STRONG>sgr1</STRONG>
-
                         <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
                         <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
-       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 <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4  curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and optimizes
+       SVr4 curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and  optimizes
        the output in favor of colors.
 
 
 </PRE><H3><a name="h3-Miscellaneous">Miscellaneous</a></H3><PRE>
-       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 <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG> variable;
-       though the application may set this value to  something  other  than  a
-       null,  <EM>ncurses</EM> will test <STRONG>npc</STRONG> first and use napms if the terminal has no
+       npc.  Note that <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG>  variable;
+       though  the  application  may  set this value to something other than a
+       null, <EM>ncurses</EM> will test <STRONG>npc</STRONG> 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  <STRONG>hu</STRONG>  (half-line  up)  and  <STRONG>hd</STRONG> (half-line down).  This is primarily
-       useful for superscripts and subscripts on hard-copy  terminals.   If  a
+       If  the terminal can move up or down half a line, this can be indicated
+       with <STRONG>hu</STRONG> (half-line up) and <STRONG>hd</STRONG>  (half-line  down).   This  is  primarily
+       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
        hard-copy terminal can eject to the next page (form feed), give this as
        <STRONG>ff</STRONG> (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  <STRONG>rep</STRONG>.
-       The  first  parameter is the character to be repeated and the second 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 <STRONG>rep</STRONG>.
+       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 <STRONG>cmdch</STRONG>.  A prototype command  character
-       is  chosen  which is used in all capabilities.  This character is given
-       in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
+       4025,  this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command character
+       is chosen which is used in all capabilities.  This character  is  given
+       in  the  <STRONG>cmdch</STRONG>  capability to identify it.  The following convention is
        supported on some Unix systems: The environment is to be searched for a
-       <STRONG>CC</STRONG> variable, and if found, all occurrences of the  prototype  character
+       <STRONG>CC</STRONG>  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 <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and  <EM>network</EM>,  should  include
-       the  <STRONG>gn</STRONG> (generic) capability so that programs can complain that they do
-       not know how to talk to the terminal.  (This capability does not  apply
-       to  <EM>virtual</EM>  terminal  descriptions  for which the escape sequences are
+       Terminal descriptions that do not represent a specific  kind  of  known
+       terminal,  such  as  <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and <EM>network</EM>, should include
+       the <STRONG>gn</STRONG> (generic) capability so that programs can complain that they  do
+       not  know how to talk to the terminal.  (This capability does not apply
+       to <EM>virtual</EM> 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
-       <STRONG>km</STRONG>.  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
+       <STRONG>km</STRONG>.   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 <STRONG>smm</STRONG> and <STRONG>rmm</STRONG>.
 
        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 <STRONG>lm</STRONG>.  A value
+       once, the number of lines of memory can be indicated with <STRONG>lm</STRONG>.  A  value
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
-       Media copy strings which control an auxiliary printer connected to  the
-       terminal  can  be  given as <STRONG>mc0</STRONG>: print the contents of the screen, <STRONG>mc4</STRONG>:
-       turn off the printer, and <STRONG>mc5</STRONG>: 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 <STRONG>mc5p</STRONG> takes one parameter, and
-       leaves the printer on for as  many  characters  as  the  value  of  the
+       Media  copy strings which control an auxiliary printer connected to the
+       terminal can be given as <STRONG>mc0</STRONG>: print the contents of  the  screen,  <STRONG>mc4</STRONG>:
+       turn  off  the printer, and <STRONG>mc5</STRONG>: 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  <STRONG>mc5p</STRONG>  takes  one  parameter,  and
+       leaves  the  printer  on  for  as  many  characters as the value of the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.  All text, including <STRONG>mc4</STRONG>, is transparently passed to  the  printer
+       255.   All  text, including <STRONG>mc4</STRONG>, is transparently passed to the printer
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
 </PRE><H3><a name="h3-Glitches-and-Brain-Damage">Glitches and Brain Damage</a></H3><PRE>
-       Hazeltine  terminals, which do not allow "~" characters to be displayed
+       Hazeltine terminals, which do not allow "~" characters to be  displayed
        should indicate <STRONG>hz</STRONG>.
 
-       Terminals which ignore a line-feed immediately after an <STRONG>am</STRONG>  wrap,  such
+       Terminals  which  ignore a line-feed immediately after an <STRONG>am</STRONG> wrap, such
        as the Concept and vt100, should indicate <STRONG>xenl</STRONG>.
 
-       If  <STRONG>el</STRONG>  is  required  to get rid of standout (instead of merely writing
+       If <STRONG>el</STRONG> is required to get rid of standout  (instead  of  merely  writing
        normal text on top of it), <STRONG>xhp</STRONG> should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should  indicate  <STRONG>xt</STRONG> (destructive tabs).  Note: the variable indicating
-       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
-       teleray_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 necessary to use delete and insert
+       should indicate <STRONG>xt</STRONG> (destructive tabs).  Note: the  variable  indicating
+       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
+       teleray_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 necessary to use  delete  and  insert
        line.  The <EM>ncurses</EM> implementation ignores this glitch.
 
-       The Beehive Superbee, which is unable to correctly transmit the  escape
-       or  control/C  characters,  has <STRONG>xsb</STRONG>, 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 <STRONG>xsb</STRONG>, 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
+       Other  specific  terminal  problems  may  be  corrected  by adding more
        capabilities of the form <STRONG>x</STRONG><EM>x</EM>.
 
 
 </PRE><H3><a name="h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></H3><PRE>
-       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 translations are much more strictly limited
+       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 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 <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> is  searching  for  is,
+       The man pages for 4.3BSD and older versions  of  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> is searching for is,
        several bad things can happen:
 
        <STRONG>o</STRONG>   some termcap libraries print a warning message,
@@ -2555,15 +2349,15 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
        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 <STRONG>tgetent</STRONG> strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2572,39 +2366,39 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   and the application has only allocated a 1k buffer,
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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,
 
-       <STRONG>o</STRONG>   and  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> has to search
+       <STRONG>o</STRONG>   and <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> has  to  search
            the whole termcap file).
 
-       Then <STRONG>tgetent</STRONG> 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
+       Then  <STRONG>tgetent</STRONG>  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.
 
-       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 <EM>TERM</EM> to that terminal type,
-       since  <STRONG>tgetent</STRONG>  only  does "tc" expansion once it is found the terminal
+       since <STRONG>tgetent</STRONG> 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 <EM>TERM</EM> 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 <EM>TERM</EM> variable does not have a termcap
        entry.
 
-       When  in  -C (translate to termcap) mode, the <EM>ncurses</EM> implementation of
-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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 <EM>ncurses</EM>  implementation  of
+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>  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.
 
 
@@ -2614,71 +2408,71 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching   for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>    and
+       Searching    for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>   and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is not supported by older implementations.
 
-       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
+       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
-       <EM>ncurses</EM>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
+       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
+       <EM>ncurses</EM> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for <EM>ncurses</EM> to have <STRONG>msgr</STRONG>
+       interpretation may need terminfo entries made for <EM>ncurses</EM> to have  <STRONG>msgr</STRONG>
        turned off.
 
        The <EM>ncurses</EM> 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 <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
-       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
+       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
+       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
        the documentation for the AT&amp;T 505 terminal.
 
-       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM>  library  wants
-       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and emulators like
-       xterm that can return mouse-tracking information in the  keyboard-input
+       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM> library wants
+       to interpret it as <STRONG>KEY_MOUSE</STRONG>, 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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
-       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
-       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
+       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
+       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  value  must  be
        specified, even if it is zero.
 
-       Different commercial ports of <EM>terminfo</EM>  and  <EM>curses</EM>  support  different
-       subsets  of  XSI Curses and (in some cases) different extensions.  Here
-       is a summary, accurate as of October 1995, after which  the  commercial
+       Different  commercial  ports  of  <EM>terminfo</EM> and <EM>curses</EM> support different
+       subsets of XSI Curses and (in some cases) different  extensions.   Here
+       is  a  summary, accurate as of October 1995, after which the commercial
        Unix market contracted and lost diversity.
 
        <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
-       <STRONG>o</STRONG>   IRIX  supports  the  SVr4  set  and  adds one undocumented extended
+       <STRONG>o</STRONG>   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
            string capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   SVr1  and  Ultrix  support  a   restricted   subset   of   <EM>terminfo</EM>
-           capabilities.   The  Booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
+       <STRONG>o</STRONG>   SVr1   and   Ultrix   support   a  restricted  subset  of  <EM>terminfo</EM>
+           capabilities.  The Booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   HP/UX  supports  the  SVr1  subset,  plus  the  SVr[234]   numerics
-           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
-           through 63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a  number
+       <STRONG>o</STRONG>   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
+           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
+           through  63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a number
            of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   AIX  supports  the  SVr1  subset, plus function keys 11 through 63,
+       <STRONG>o</STRONG>   AIX supports the SVr1 subset, plus function  keys  11  through  63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
-       between  commercial  Unix  systems.   At  least  two implementations of
+       Do  not  count  on  compiled  (binary)  <EM>terminfo</EM> entries being portable
+       between commercial Unix  systems.   At  least  two  implementations  of
        <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
-       Unices  after  SVr1,  adding extension capabilities to the string table
-       that (in the binary format) collide with subsequent System  V  and  XSI
+       Unices after SVr1, adding extension capabilities to  the  string  table
+       that  (in  the  binary format) collide with subsequent System V and XSI
        Curses extensions.
 
 
@@ -2688,13 +2482,13 @@ <H1 class="no-header">terminfo 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,     <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-30                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2024-01-13                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 16f073171..7faba6132 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,24 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.59 2023/12/16 21:01:59 tom Exp @
-  * toe -a | grep -E '^(xterm|vt)'
-  * The next row overruns the line length on DWB nroff (65n).
-  * toe -as | grep -E '(^-+&gt;|:.(xterm|vt))'
-  * The next row overruns the line length on DWB nroff (65n).
-  * The next row overruns the line length on DWB nroff (65n).
+  * @Id: toe.1m,v 1.62 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2024-01-13 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2024-01-13 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -123,11 +118,13 @@ <H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
               compiled terminal description database
 
 
-</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        <STRONG>toe</STRONG>  is  not provided by other implementations.  There is no applicable
        X/Open or POSIX standard for it.
 
-       It replaces a <STRONG>-T</STRONG> option that  was  briefly  supported  by  the  <EM>ncurses</EM>
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <STRONG>toe</STRONG> replaces a <STRONG>-T</STRONG> option that was  briefly  supported  by  the  <EM>ncurses</EM>
        <STRONG>infocmp</STRONG> utility in 1995.
 
        The <STRONG>-a</STRONG> and <STRONG>-s</STRONG> options were added in 2006 and 2011, respectively.
@@ -153,14 +150,15 @@ <H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
            xterm-r6        xterm X11R6 version
            xterm-r5        xterm R5 version
            xterm-mono      monochrome xterm
-           xterm           xterm terminal emulator (X Window System)
+           xterm           xterm terminal emulator (X Window
+                           System)
            vt220           dec vt220
            vt102           dec vt102
            vt100           dec vt100 (w/advanced video)
            vt52            dec vt52
            ...
 
-       Use  the  <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where each terminal
+       Use the <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where  each  terminal
        description was found.
 
            --&gt; /etc/terminfo
@@ -171,14 +169,16 @@ <H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
            --*---: vt102           dec vt102
            --*---: vt220           dec vt220
            --*---: vt52            dec vt52
-           --*---: xterm           xterm terminal emulator (X Window System)
+           --*---: xterm           xterm terminal emulator (X
+                                   Window System)
            --*---: xterm-256color  xterm with 256 colors
            --*---: xterm-color     generic color xterm
            --*---: xterm-mono      monochrome xterm
            --*---: xterm-r5        xterm R5 version
            --*---: xterm-r6        xterm X11R6 version
            --*---: xterm-vt220     xterm emulating vt220
-           --*---: xterm-xfree86   xterm terminal emulator (XFree86)
+           --*---: xterm-xfree86   xterm terminal emulator
+                                   (XFree86)
            ...
 
 
@@ -188,7 +188,7 @@ <H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2024-01-13                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -197,6 +197,7 @@ <H1 class="no-header">toe 1m 2023-12-16 ncurses 6.4 User commands</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-OPTIONS">OPTIONS</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-EXAMPLES">EXAMPLES</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index ecca62eb5..8f5fbb361 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,20 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.97 2023/12/31 00:16:41 tom Exp @
-  * longname was added in October 1989.
+  * @Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2023-12-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-01-13 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -49,7 +48,8 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tput</STRONG>, <STRONG>reset</STRONG> - initialize a terminal or query <EM>terminfo</EM> database
+       <STRONG>tput</STRONG>,  <STRONG>init</STRONG>,  <STRONG>reset</STRONG> - initialize a terminal, exercise its capabilities,
+       or query <EM>terminfo</EM> database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -69,262 +69,224 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>tput</STRONG>  uses  the  <EM>terminfo</EM>  library  and  database to make the values of
-       terminal-specific capabilities and information available to the  shell,
-       to  initialize  or  reset  the terminal, or report the long name of the
-       current (or  specified)  terminal  type.   When  retrieving  capability
-       values, the result depends upon the capability's type.
+       <STRONG>tput</STRONG> uses the <EM>terminfo</EM> library and database to  make  terminal-specific
+       capabilities  and  information available to the shell, to initialize or
+       reset the terminal, or to report  a  description  of  the  current  (or
+       specified)  terminal  type.  Terminal capabilities are accessed by <EM>cap-</EM>
+       <EM>code</EM>.
 
-       Boolean  <STRONG>tput</STRONG>  sets its exit status to <STRONG>0</STRONG> if the terminal possesses <EM>cap-</EM>
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> discusses terminal capabilities at length  and  presents  a
+       complete list of <EM>cap-codes.</EM>
+
+       When   retrieving  capability  values,  the  result  depends  upon  the
+       capability's type.
+
+       Boolean  <STRONG>tput</STRONG> sets its exit status to <STRONG>0</STRONG> if the terminal possesses  <EM>cap-</EM>
                 <EM>code,</EM> and <STRONG>1</STRONG> if it does not.
 
-       integer  <STRONG>tput</STRONG> writes <EM>cap-code</EM>'s decimal value to  the  standard  output
+       numeric  <STRONG>tput</STRONG>  writes  <EM>cap-code</EM>'s  decimal value to the standard output
                 stream if defined (<STRONG>-1</STRONG> if it is not) followed by a newline.
 
-       string   <STRONG>tput</STRONG>  writes <EM>cap-code</EM>'s value to the standard output stream if
+       string   <STRONG>tput</STRONG> writes <EM>cap-code</EM>'s value to the standard output stream  if
                 defined, without a trailing newline.
 
-       Before using a value returned on the standard output,  the  application
-       should  test  <STRONG>tput</STRONG>'s exit status (for example, using <STRONG>$?</STRONG> in <STRONG>sh(1)</STRONG>) to be
-       sure it is <STRONG>0</STRONG>; see sections "EXIT STATUS" and "DIAGNOSTICS" below.   For
-       a complete list of <EM>cap-codes,</EM> see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-
-
-</PRE><H3><a name="h3-Options">Options</a></H3><PRE>
-       <STRONG>-S</STRONG>     allows  more  than  one  capability per invocation of <STRONG>tput</STRONG>.  The
-              capabilities must be passed to  <STRONG>tput</STRONG>  from  the  standard  input
-              instead  of  from the command line (see example).  Only one <EM>cap-</EM>
-              <EM>code</EM> is allowed per line.  The <STRONG>-S</STRONG> option changes the meaning  of
-              the  <STRONG>0</STRONG> and <STRONG>1</STRONG> Boolean and string exit statuses (see section "EXIT
-              STATUS" below).
-
-              Because some capabilities may use <EM>string</EM> parameters rather  than
-              <EM>numbers</EM>, <STRONG>tput</STRONG> uses a table and the presence of parameters in its
-              input to decide whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>, and how  to  interpret
-              the parameters.
-
-       <STRONG>-T</STRONG><EM>type</EM> indicates  the  <EM>type</EM>  of  terminal.   Normally  this  option  is
-              unnecessary, because the default is taken from  the  environment
-              variable  <EM>TERM</EM>.   If  <STRONG>-T</STRONG>  is specified, then the shell variables
-              <EM>LINES</EM> and <EM>COLUMNS</EM> will also be ignored.
-
-       <STRONG>-V</STRONG>     reports the version of <EM>ncurses</EM> which was used in  this  program,
-              and exits.
-
-       <STRONG>-x</STRONG>     prevents <STRONG>tput</STRONG> from attempting to clear the scrollback buffer.
+       Before  using  a value returned on the standard output, the application
+       should test <STRONG>tput</STRONG>'s exit status to be sure it is 0;  see  section  "EXIT
+       STATUS" below.
 
 
-</PRE><H3><a name="h3-Commands">Commands</a></H3><PRE>
-       A few commands (<STRONG>init</STRONG>, <STRONG>reset</STRONG> and <STRONG>longname</STRONG>) are special; they are defined
-       by the <STRONG>tput</STRONG> program.  The others are the names of <EM>capabilities</EM> from the
-       terminal  database  (see  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  a list).  Although <STRONG>init</STRONG> and
-       <STRONG>reset</STRONG> resemble capability names,  <STRONG>tput</STRONG>  uses  several  capabilities  to
-       perform these special functions.
+</PRE><H3><a name="h3-Operands">Operands</a></H3><PRE>
+       Generally,  an  operand  is  a  <EM>cap-code,</EM>  a  capability  code from the
+       terminal database, or a parameter thereto.  Three others are  specially
+       recognized by <STRONG>tput</STRONG>: <STRONG>init</STRONG>, <STRONG>reset</STRONG>, and <STRONG>longname</STRONG>.  Although these resemble
+       capability codes, they in fact receive special handling; we  term  them
+       "pseudo-capabilities".
 
-       <EM>cap-code</EM>
-              indicates the capability from the terminal database.
+       <EM>cap-code</EM>   indicates a capability from the terminal database.
 
-              If  the  capability  is  a  string  that  takes  parameters, the
-              arguments following the capability will be  used  as  parameters
-              for the string.
+                  If  the  capability  is of string type and takes parameters,
+                  the arguments following the capability will be used  as  its
+                  parameters.
 
-              Most  parameters  are numbers.  Only a few terminal capabilities
-              require string parameters; <STRONG>tput</STRONG> uses a table to decide which  to
-              pass  as  strings.   Normally <STRONG>tput</STRONG> uses <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> to perform the
-              substitution.  If no parameters are given  for  the  capability,
-              <STRONG>tput</STRONG> writes the string without performing the substitution.
+                  Most   parameters   are   numeric.    Only  a  few  terminal
+                  capabilities require string parameters; <STRONG>tput</STRONG> uses a table to
+                  decide  which  to  pass  as  strings.   Normally  <STRONG>tput</STRONG>  uses
+                  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> to perform the substitution.  If no parameters are
+                  given  for  the  capability,  <STRONG>tput</STRONG> writes the string without
+                  performing the substitution.
 
-       <STRONG>init</STRONG>   If  the terminal database is present and an entry for the user's
-              terminal exists (see <STRONG>-T</STRONG><EM>type</EM>, above), the following will occur:
+       <STRONG>init</STRONG>       initializes the  terminal.   If  the  terminal  database  is
+                  present  and  an  entry for the user's terminal type exists,
+                  the following occur.
 
-              (1)  first, <STRONG>tput</STRONG> retrieves the current  terminal  mode  settings
-                   for your terminal.  It does this by successively testing
+                  (1)  <STRONG>tput</STRONG>  retrieves  the  terminal's  mode  settings.    It
+                       successively  tests  the file descriptors corresponding
+                       to
 
-                   <STRONG>o</STRONG>   the standard error,
+                       <STRONG>o</STRONG>   the standard error stream,
 
-                   <STRONG>o</STRONG>   standard output,
+                       <STRONG>o</STRONG>   the standard output stream,
 
-                   <STRONG>o</STRONG>   standard input and
+                       <STRONG>o</STRONG>   the standard input stream, and
 
-                   <STRONG>o</STRONG>   ultimately "/dev/tty"
+                       <STRONG>o</STRONG>   <EM>/dev/tty</EM>
 
-                   to   obtain  terminal  settings.   Having  retrieved  these
-                   settings, <STRONG>tput</STRONG> remembers which file descriptor to use  when
-                   updating settings.
+                       to obtain terminal settings.   Having  retrieved  them,
+                       <STRONG>tput</STRONG>  remembers  which  descriptor  to  use for further
+                       updates.
 
-              (2)  if  the  window  size cannot be obtained from the operating
-                   system, but the terminal description (or environment, e.g.,
-                   <EM>LINES</EM>  and  <EM>COLUMNS</EM>  variables  specify  this),  update the
-                   operating system's notion of the window size.
+                  (2)  If the terminal dimensions cannot be obtained from  the
+                       operating  system, but the environment or terminal type
+                       database  entry  describes  them,  <STRONG>tput</STRONG>   updates   the
+                       operating system's notion of them.
 
-              (3)  the terminal modes will be updated:
+                  (3)  <STRONG>tput</STRONG> updates the terminal modes.
 
-                   <STRONG>o</STRONG>   any delays (e.g., newline) specified in the entry  will
-                       be set in the tty driver,
+                       <STRONG>o</STRONG>   Any  delays  specified  in  the entry (for example,
+                           when a newline is sent) are  set  in  the  terminal
+                           driver.
 
-                   <STRONG>o</STRONG>   tabs  expansion  will  be turned on or off according to
-                       the specification in the entry, and
+                       <STRONG>o</STRONG>   Tab   expansion   is  turned  on  or  off  per  the
+                           specification in the entry, and
 
-                   <STRONG>o</STRONG>   if tabs are not expanded, standard  tabs  will  be  set
-                       (every 8 spaces).
+                       <STRONG>o</STRONG>   if tabs are not expanded, standard  tabs  (every  8
+                           spaces) are set.
 
-              (4)  if  present,  the terminal's initialization strings will be
-                   output as detailed in the <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> section on  <EM>Tabs</EM>  <EM>and</EM>
-                   <EM>Initialization</EM>,
+                  (4)  If  initialization capabilities, detailed in subsection
+                       "Tabs and Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, are  present,
+                       <STRONG>tput</STRONG> writes them to the standard output stream.
 
-              (5)  output is flushed.
+                  (5)  <STRONG>tput</STRONG> flushes the standard output stream.
 
-              If  an  entry does not contain the information needed for any of
-              these activities, that activity will silently be skipped.
+                  If  an  entry  lacks  the information needed for an activity
+                  above, that activity is silently skipped.
 
-       <STRONG>reset</STRONG>  This is similar to <STRONG>init</STRONG>, with two differences:
+       <STRONG>reset</STRONG>      re-initializes  the  terminal.    A   reset   differs   from
+                  initialization in two ways.
 
-              (1)  before any other initialization, the terminal modes will be
-                   reset to a "sane" state:
+                  (1)  <STRONG>tput</STRONG> sets the the terminal modes to a "sane" state,
 
-                   <STRONG>o</STRONG>   set cooked and echo modes,
+                       <STRONG>o</STRONG>   enabling cooked and echo modes,
 
-                   <STRONG>o</STRONG>   turn off cbreak and raw modes,
+                       <STRONG>o</STRONG>   disabling cbreak and raw modes,
 
-                   <STRONG>o</STRONG>   turn on newline translation and
+                       <STRONG>o</STRONG>   enabling newline translation, and
 
-                   <STRONG>o</STRONG>   reset  any  unset  special  characters to their default
-                       values
+                       <STRONG>o</STRONG>   setting  any  unset  special  characters  to  their
+                           default values.
 
-              (2)  Instead  of  putting  out   <EM>initialization</EM>   strings,   the
-                   terminal's  <EM>reset</EM>  strings  will be output if present (<STRONG>rs1</STRONG>,
-                   <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, <STRONG>rf</STRONG>).  If the <EM>reset</EM> strings are not  present,  but
-                   <EM>initialization</EM> strings are, the <EM>initialization</EM> strings will
-                   be output.
+                  (2)  If any reset capabilities are defined for the  terminal
+                       type,   <STRONG>tput</STRONG>   writes   them   to  the  output  stream.
+                       Otherwise,  <STRONG>tput</STRONG>  uses   any   defined   initialization
+                       capabilities.    Reset  capabilities  are  detailed  in
+                       subsection "Tabs and Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-              Otherwise, <STRONG>reset</STRONG> acts identically to <STRONG>init</STRONG>.
+       <STRONG>longname</STRONG>   A <EM>terminfo</EM> entry begins with one or more names by  which  an
+                  application  can  refer  to  the  entry,  before the list of
+                  terminal capabilities.   The  names  are  separated  by  "|"
+                  characters.   X/Open  Curses  terms  the last name the "long
+                  name", and indicates that it may include blanks.
 
-       <STRONG>longname</STRONG>
-              A terminfo entry begins with one  or  more  names  by  which  an
-              application  can refer to the entry, before the list of terminal
-              capabilities.   The  names  are  separated  by  "|"  characters.
-              X/Open  states  that  the  last name is the "long name" and also
-              that it may include blanks.
+                  <STRONG>tic</STRONG> warns if the last  name  does  not  include  blanks,  to
+                  accommodate  old <EM>terminfo</EM> entries that treated the long name
+                  as an optional feature.  The long name is often referred  to
+                  as the description field.
 
-              <STRONG>tic</STRONG>  warns  if  the  last  name  does  not  include  blanks,  to
-              accommodate  old terminfo entries which treated the long name as
-              an optional feature.  The long name is often referred to as  the
-              description field.
+                  If  the  terminal  database  is present and an entry for the
+                  user's terminal type exists, <STRONG>tput</STRONG> reports its description to
+                  the standard output stream, without a trailing newline.  See
+                  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-              If  the terminal database is present and an entry for the user's
-              terminal exists (see <STRONG>-T</STRONG> <EM>type</EM> above), <STRONG>tput</STRONG> reports the terminal's
-              description  (or  "long name") to the standard output, without a
-              trailing newline.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       <EM>Note:</EM> Redirecting the output of "<STRONG>tput</STRONG> <STRONG>init</STRONG>" or "<STRONG>tput</STRONG> <STRONG>reset</STRONG>" to  a  file
+       will capture only part of their actions.  Changes to the terminal modes
+       are not affected by file descriptor  redirection,  since  the  terminal
+       modes are altered via <STRONG>ioctl(2)</STRONG>.
 
 
 </PRE><H3><a name="h3-Aliases">Aliases</a></H3><PRE>
-       <STRONG>tput</STRONG> handles the <STRONG>clear</STRONG>, <STRONG>init</STRONG> and <STRONG>reset</STRONG> commands  specially:  it  allows
-       for the possibility that it is invoked by a link with those names.
+       If  <STRONG>tput</STRONG>  is  invoked  via  link  with any of the names <STRONG>clear</STRONG>, <STRONG>init</STRONG>, or
+       <STRONG>reset</STRONG>, it operates as if run with the corresponding (pseudo-)capability
+       operand.  For example, executing a link named <STRONG>reset</STRONG> that points to <STRONG>tput</STRONG>
+       has the same effect as "<STRONG>tput</STRONG> <STRONG>reset</STRONG>".  (The <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG> utility also  treats
+       a link named <STRONG>reset</STRONG> specially.)
 
-       If  <STRONG>tput</STRONG>  is invoked by a link named <STRONG>reset</STRONG>, this has the same effect as
-       <STRONG>tput</STRONG> <STRONG>reset</STRONG>.  The  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  also  treats  a  link  named  <STRONG>reset</STRONG>
-       specially.
-
-       Before <EM>ncurses</EM> 6.1, the two utilities were different from each other:
-
-       <STRONG>o</STRONG>   <STRONG>tset</STRONG>  utility  reset the terminal modes and special characters (not
-           done with <STRONG>tput</STRONG>).
+       If  <STRONG>tput</STRONG>  is  invoked by a link named <STRONG>init</STRONG>, this has the same effect as
+       "<STRONG>tput</STRONG> <STRONG>init</STRONG>".  Such a link is seldom employed because another program of
+       that name is in widespread use.
 
-       <STRONG>o</STRONG>   On the other hand, <STRONG>tset</STRONG>'s repertoire of terminal  capabilities  for
-           resetting  the terminal was more limited, i.e., only <STRONG>reset_1string</STRONG>,
-           <STRONG>reset_2string</STRONG> and <STRONG>reset_file</STRONG>  in  contrast  to  the  tab-stops  and
-           margins which are set by this utility.
 
-       <STRONG>o</STRONG>   The  <STRONG>reset</STRONG>  program  is  usually an alias for <STRONG>tset</STRONG>, because of this
-           difference with resetting terminal modes and special characters.
+</PRE><H3><a name="h3-Terminal-Size">Terminal Size</a></H3><PRE>
+       Besides  the  pseudo-capabilities (such as <STRONG>init</STRONG>), <STRONG>tput</STRONG> treats the <STRONG>lines</STRONG>
+       and <STRONG>cols</STRONG> <EM>cap-codes</EM> specially: it may call <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to  obtain  the
+       terminal size.
 
-       With the changes made for <EM>ncurses</EM> 6.1, the <EM>reset</EM>  feature  of  the  two
-       programs is (mostly) the same.  A few differences remain:
+       <STRONG>o</STRONG>   First, <STRONG>tput</STRONG> attempts to obtain these capabilities from the terminal
+           database.  This generally fails for terminal emulators, which  lack
+           a fixed window size and thus omit the capabilities.
 
-       <STRONG>o</STRONG>   The  <STRONG>tset</STRONG>  program  waits  one  second  when  resetting, in case it
-           happens to be a hardware terminal.
+       <STRONG>o</STRONG>   It  then  asks  the operating system for the terminal's size, which
+           generally works, unless the connection is via a  serial  line  that
+           does not support "NAWS": negotiations about window size.
 
-       <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
-           different  streams  (i.e.,  the  standard  error  for  <STRONG>tset</STRONG> and the
-           standard output for <STRONG>tput</STRONG>).
+       <STRONG>o</STRONG>   Finally,  it  inspects the environment variables <EM>LINES</EM> and <EM>COLUMNS,</EM>
+           which may override the terminal size.
 
-           <STRONG>Note:</STRONG>  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.
+       If the <STRONG>-T</STRONG> option is given, <STRONG>tput</STRONG> ignores the  environment  variables  by
+       calling  <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system  (or,
+       ultimately, the terminal database).
 
-       If  <STRONG>tput</STRONG>  is  invoked by a link named <STRONG>init</STRONG>, this has the same effect as
-       <STRONG>tput</STRONG> <STRONG>init</STRONG>.  Again, you are less likely to use that link because another
-       program named <STRONG>init</STRONG> has a more well-established use.
 
+</PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
+       <STRONG>-S</STRONG>       retrieves more than one capability  per  invocation  of  <STRONG>tput</STRONG>.
+                The  capabilities  must  be  passed  to <STRONG>tput</STRONG> from the standard
+                input stream instead of from the  command  line  (see  section
+                "EXAMPLES"  below).   Only  one  <EM>cap-code</EM> is allowed per line.
+                The <STRONG>-S</STRONG> option changes  the  meanings  of  the  <STRONG>0</STRONG>  and  <STRONG>1</STRONG>  exit
+                statuses (see section "EXIT STATUS" below).
 
-</PRE><H3><a name="h3-Terminal-Size">Terminal Size</a></H3><PRE>
-       Besides  the  special  commands  (e.g.,  <STRONG>clear</STRONG>),  tput  treats  certain
-       terminfo  capabilities  specially:  <STRONG>lines</STRONG>   and   <STRONG>cols</STRONG>.    tput   calls
-       <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to obtain the terminal size:
+                Some  capabilities  use  string parameters rather than numeric
+                ones.  <STRONG>tput</STRONG> employs a  built-in  table  and  the  presence  of
+                parameters  in  its input to decide how to interpret them, and
+                whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   first, it gets the size from the terminal database (which generally
-           is not provided for terminal emulators which do not  have  a  fixed
-           window size)
+       <STRONG>-T</STRONG> <EM>type</EM>  indicates  the  terminal's  <EM>type.</EM>   Normally  this  option  is
+                unnecessary,   because  a  default  is  taken  from  the  <EM>TERM</EM>
+                environment variable.  If specified, the environment variables
+                <EM>LINES</EM> and <EM>COLUMNS</EM> are also ignored.
 
-       <STRONG>o</STRONG>   then  it  asks  the operating system for the terminal's size (which
-           generally works, unless connecting via a serial line which does not
-           support <EM>NAWS</EM>: negotiations about window size).
+       <STRONG>-V</STRONG>       reports the version of <EM>ncurses</EM> associated with <STRONG>tput</STRONG>, and exits
+                with a successful status.
 
-       <STRONG>o</STRONG>   finally,  it  inspects  the environment variables <EM>LINES</EM> and <EM>COLUMNS</EM>
-           which may override the terminal size.
-
-       If the <STRONG>-T</STRONG> option is given tput ignores  the  environment  variables  by
-       calling   <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system  (or
-       finally, the terminal database).
+       <STRONG>-x</STRONG>       prevents "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" from attempting to clear the  scrollback
+                buffer.
 
 
 </PRE><H2><a name="h2-EXIT-STATUS">EXIT STATUS</a></H2><PRE>
-       If the <STRONG>-S</STRONG> option is used, <STRONG>tput</STRONG> checks for errors from each line, and if
-       any  errors are found, will set the exit status to 4 plus the number of
-       lines with errors.  If no errors are found, the exit status is  <STRONG>0</STRONG>.   No
-       indication  of  which  line  failed  can be given so exit status <STRONG>1</STRONG> will
-       never  appear.   Exit  statuses  <STRONG>2</STRONG>,  <STRONG>3</STRONG>,  and  <STRONG>4</STRONG>  retain   their   usual
-       interpretation.   If the <STRONG>-S</STRONG> option is not used, the exit status depends
-       on the type of <EM>cap-code</EM>:
-
-          <EM>Boolean</EM>
-                 a value of <STRONG>0</STRONG> is set for TRUE and <STRONG>1</STRONG> for FALSE.
+       Normally, one should interpret <STRONG>tput</STRONG>'s exit statuses as follows.
 
-          <EM>string</EM> a value of <STRONG>0</STRONG> is set if  the  <EM>cap-code</EM>  is  defined  for  this
-                 terminal  <EM>type</EM> (the value of <EM>cap-code</EM> is returned on standard
-                 output); a value of <STRONG>1</STRONG> is set if <EM>cap-code</EM> is not  defined  for
-                 this terminal <EM>type</EM> (nothing is written to standard output).
-
-          <EM>integer</EM>
-                 a  value  of  <STRONG>0</STRONG>  is  always  set,  whether or not <EM>cap-code</EM> is
-                 defined for this terminal <EM>type</EM>.  To determine if <EM>cap-code</EM>  is
-                 defined  for this terminal <EM>type</EM>, the user must test the value
-                 written to standard output.  A value of <STRONG>-1</STRONG>  means  that  <EM>cap-</EM>
-                 <EM>code</EM> is not defined for this terminal <EM>type</EM>.
+       <STRONG>Status</STRONG>   <STRONG>Meaning</STRONG> <STRONG>When</STRONG> <STRONG>-S</STRONG> <STRONG>Not</STRONG> <STRONG>Specified</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>0</STRONG>        Boolean or string capability present
+       <STRONG>1</STRONG>        Boolean or numeric capability absent
+       <STRONG>2</STRONG>        usage error or no terminal type specified
+       <STRONG>3</STRONG>        unrecognized terminal type
+       <STRONG>4</STRONG>        unrecognized capability code
+       <STRONG>&gt;4</STRONG>       system error (4 + <STRONG>errno</STRONG>)
 
-          <EM>other</EM>  <STRONG>reset</STRONG>  or  <STRONG>init</STRONG>  may fail to find their respective files.  In
-                 that case, the exit status is set to 4 + <STRONG>errno</STRONG>.
+       When the <STRONG>-S</STRONG> option is used, some statuses change meanings.
 
-       Any other exit status indicates an  error;  see  section  "DIAGNOSTICS"
-       below.
+       <STRONG>Status</STRONG>   <STRONG>Meaning</STRONG> <STRONG>When</STRONG> <STRONG>-S</STRONG> <STRONG>Specified</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>0</STRONG>        all operands interpreted
+       <STRONG>1</STRONG>        unused
+       <STRONG>4</STRONG>        some operands not interpreted
 
 
-</PRE><H2><a name="h2-DIAGNOSTICS">DIAGNOSTICS</a></H2><PRE>
-       <STRONG>tput</STRONG>  prints  the  following  error messages and sets the corresponding
-       exit statuses.
+</PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
+       <STRONG>tput</STRONG> command reads one environment variable.
 
-       exit status   error message
-       ------------------------------------------------------------------------
-       <STRONG>0</STRONG>             (<EM>cap-code</EM> is a numeric variable that is not specified  in
-                     the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for  this terminal type, e.g.
-                     <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-Thp2621</STRONG> <STRONG>xmc</STRONG>)
-       <STRONG>1</STRONG>             no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>STATUS</STRONG> section.
-       <STRONG>2</STRONG>             usage error
-       <STRONG>3</STRONG>             unknown terminal <EM>type</EM> or no <EM>terminfo</EM> database
-       <STRONG>4</STRONG>             unknown <EM>terminfo</EM> capability <EM>cap-code</EM>
-       <STRONG>&gt;4</STRONG>            error occurred in -S
-       ------------------------------------------------------------------------
+       <EM>TERM</EM>    denotes  the  terminal  type.   Each terminal type is distinct,
+               though many are similar.  The <STRONG>-T</STRONG> option overrides its value.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -336,88 +298,88 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This implementation of <STRONG>tput</STRONG> differs from AT&amp;T  <STRONG>tput</STRONG>  in  two  important
-       areas:
+       Over time <EM>ncurses</EM> <STRONG>tput</STRONG> has  differed  from  that  of  System V  in  two
+       important respects, one now mostly historical.
 
-       <STRONG>o</STRONG>   <STRONG>tput</STRONG>  <EM>cap-code</EM>  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.
+       <STRONG>o</STRONG>   "<STRONG>tput</STRONG>  <EM>cap-code</EM>" writes to the standard output, which need not be a
+           terminal device.  However, the operands  that  manipulate  terminal
+           modes might not use the standard output.
 
-           The  AT&amp;T  implementation's  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  commands use the BSD
-           (4.1c)  <STRONG>tset</STRONG>  source,  which  manipulates   terminal   modes.    It
-           successively  tries standard output, standard error, standard input
-           before falling back to "/dev/tty" and finally just assumes a 1200Bd
+           System V  <STRONG>tput</STRONG>'s  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  operands use logic from 4.1cBSD
+           <STRONG>tset</STRONG>,  manipulating  terminal  modes.   It  checks  the  same  file
+           descriptors  (and  <EM>/dev/tty</EM>) for association with a terminal device
+           as <EM>ncurses</EM> now does, and if none are, finally assumes a  1200  baud
            terminal.  When updating terminal modes, it ignores errors.
 
-           Until  changes made after <EM>ncurses</EM> 6.0, <STRONG>tput</STRONG> did not modify terminal
-           modes.  <STRONG>tput</STRONG> now uses a similar scheme, using functions shared with
-           <STRONG>tset</STRONG>  (and ultimately based on the 4.4BSD <STRONG>tset</STRONG>).  If it is not able
-           to open a terminal, e.g., when running in <STRONG>cron(1)</STRONG>, <STRONG>tput</STRONG> will return
-           an error.
+           Until  <EM>ncurses</EM>  6.1  (see  section  "HISTORY"  below), <STRONG>tput</STRONG> did not
+           modify  terminal  modes.   It  now  employs  a  scheme  similar  to
+           System V, using functions shared with <STRONG>tset</STRONG> (and ultimately based on
+           4.4BSD <STRONG>tset</STRONG>).  If it is not able to open a terminal (for  instance,
+           when run by <STRONG>cron(1)</STRONG>), <STRONG>tput</STRONG> exits with an error status.
 
-       <STRONG>o</STRONG>   AT&amp;T  <STRONG>tput</STRONG>  guesses  the type of its <EM>cap-code</EM> operands by seeing if
-           all of the characters are numeric, or not.
+       <STRONG>o</STRONG>   System V  <STRONG>tput</STRONG>  assumes  that  the  type  of  a <EM>cap-code</EM> operand is
+           numeric if all the characters of its value are decimal numbers;  if
+           they are not, it treats <EM>cap-code</EM> as a string capability.
 
-           Most implementations which provide support  for  <EM>cap-code</EM>  operands
-           use  the  <STRONG>tparm</STRONG> function to expand parameters in it.  That function
-           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
+           Most implementations that provide support for <EM>cap-code</EM> operands use
+           the <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> function to expand  its  parameters.   That  function
+           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
            to know which type to use.
 
-           This  implementation  uses a table to determine the parameter types
-           for  the  standard  <EM>cap-code</EM>  operands,  and  an  internal  library
-           function to analyze nonstandard <EM>cap-code</EM> operands.
-
-           Besides  providing  more  reliable operation than AT&amp;T's utility, a
-           portability problem is introduced  by  this  analysis:  An  OpenBSD
-           developer  adapted  the  internal  library function from <EM>ncurses</EM> to
-           port NetBSD's  termcap-based  <STRONG>tput</STRONG>  to  terminfo.   That  had  been
-           modified  to  interpret  multiple  commands  on  a  line.  Portable
-           applications should not rely upon this feature; <EM>ncurses</EM> provides it
-           to support applications written specifically for OpenBSD.
-
-       This  implementation  (unlike  others)  can  accept  both  <EM>termcap</EM>  and
-       <EM>terminfo</EM> names for the <EM>cap-code</EM> feature, if <EM>termcap</EM> support is compiled
-       in.   However,  the  predefined  <EM>termcap</EM>  and  <EM>terminfo</EM>  names have two
-       ambiguities in this case (and the <EM>terminfo</EM> name is assumed):
-
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>dl</STRONG> corresponds to the <EM>terminfo</EM>  name  <STRONG>dl1</STRONG>  (delete
-           one line).
-           The  <EM>terminfo</EM>  name <STRONG>dl</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>DL</STRONG> (delete a
-           given number of lines).
-
-       <STRONG>o</STRONG>   The <EM>termcap</EM> name <STRONG>ed</STRONG> corresponds to  the  <EM>terminfo</EM>  name  <STRONG>rmdc</STRONG>  (end
-           delete mode).
-           The  <EM>terminfo</EM>  name <STRONG>ed</STRONG> corresponds to the <EM>termcap</EM> name <STRONG>cd</STRONG> (clear to
-           end of screen).
-
-       The <STRONG>longname</STRONG> and <STRONG>-S</STRONG> options, and  the  parameter-substitution  features
-       used  in  the <STRONG>cup</STRONG> example, were not supported in AT&amp;T/USL <EM>curses</EM> before
-       SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for <STRONG>longname</STRONG>, and
-       NetBSD (1994) added support for the parameter-substitution features.
+           <EM>ncurses</EM> <STRONG>tput</STRONG> uses a table to determine the parameter types for  the
+           standard  <EM>cap-code</EM>  operands,  and  an internal function to analyze
+           nonstandard <EM>cap-code</EM> operands.
+
+           While more reliable than System V's utility, a portability  problem
+           is  introduced  by this analysis.  An OpenBSD developer adapted the
+           internal library function from <EM>ncurses</EM> to  port  NetBSD's  <EM>termcap</EM>-
+           based  <STRONG>tput</STRONG> to <EM>terminfo,</EM> and modified it to interpret multiple <EM>cap-</EM>
+           <EM>codes</EM> (and parameters) on the command line.  Portable  applications
+           should  not  rely  upon  this feature; <EM>ncurses</EM> offers it to support
+           applications written specifically for OpenBSD.
+
+       This implementation, unlike others, accepts both <EM>termcap</EM>  and  <EM>terminfo</EM>
+       <EM>cap-codes</EM>  if  <EM>termcap</EM>  support is compiled in.  In that case, however,
+       the predefined <EM>termcap</EM> and <EM>terminfo</EM> codes have two ambiguities; <EM>ncurses</EM>
+       assumes the <EM>terminfo</EM> code.
+
+       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM> but <STRONG>parm_delete_line</STRONG>
+           to <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
+           <EM>info</EM> uses the code <STRONG>dch1</STRONG> for <STRONG>delete_line</STRONG>.
+
+       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>ed</STRONG>  means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM> but <STRONG>clr_eos</STRONG> to
+           <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
+           code <STRONG>rmdc</STRONG> for <STRONG>exit_delete_mode</STRONG>.
+
+       The   <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the  parameter-substitution
+       features used in the <STRONG>cup</STRONG> example below, were not supported in  AT&amp;T/USL
+       <EM>curses</EM> before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
+       <STRONG>longname</STRONG>,  and  in  1994,  NetBSD  added  support  for  the  parameter-
+       substitution features.
 
        IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
-       (POSIX.1-2008) documents only the operands for <STRONG>clear</STRONG>, <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>.
-       There are a few interesting observations to make regarding that:
+       (POSIX.1-2008) documents only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG>  operands.   A
+       few observations of interest arise from that selection.
 
-       <STRONG>o</STRONG>   In this implementation, <STRONG>clear</STRONG> is part of the <EM>cap-code</EM> support.  The
+       <STRONG>o</STRONG>   <EM>ncurses</EM> supports <STRONG>clear</STRONG> as it does any other standard <EM>cap-code.</EM>  The
            others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
            capabilities.
 
-       <STRONG>o</STRONG>   Other  implementations  of  <STRONG>tput</STRONG>  on  SVr4-based  systems  such  as
-           Solaris, IRIX64 and HP-UX as well as others such as AIX  and  Tru64
-           provide support for <EM>cap-code</EM> operands.
+       <STRONG>o</STRONG>   The  <STRONG>tput</STRONG> on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
+           as well as others such as AIX and Tru64, also support standard <EM>cap-</EM>
+           <EM>code</EM> operands.
 
-       <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize termcap names rather than
-           terminfo capability names in their respective <STRONG>tput</STRONG> commands.  Since
-           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  terminfo names.  Before that, it (like
-           FreeBSD) recognized termcap names.
+       <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize <EM>termcap</EM> names rather than
+           <EM>terminfo</EM> capability names in their respective <STRONG>tput</STRONG> commands.  Since
+           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  <EM>terminfo</EM> names.  Before that, it (like
+           FreeBSD) recognized <EM>termcap</EM> names.
 
-           Beginning in 2021, FreeBSD uses the <EM>ncurses</EM>  <STRONG>tput</STRONG>,  configured  for
-           both terminfo (tested first) and termcap (as a fallback).
+           Beginning in 2021, FreeBSD uses <EM>ncurses</EM> <STRONG>tput</STRONG>, configured  for  both
+           <EM>terminfo</EM> (tested first) and <EM>termcap</EM> (as a fallback).
 
-       Because (apparently) <EM>all</EM> of the certified Unix systems support the full
-       set of capability names, the reasoning for documenting only a  few  may
-       not be apparent.
+       Because (apparently) all <EM>certified</EM> Unix systems support the full set of
+       capability codes, the reason for documenting only  a  few  may  not  be
+       apparent.
 
        <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>cap-code</EM> and
            the other features used in this implementation.
@@ -425,136 +387,162 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
        <STRONG>o</STRONG>   That is, there are two standards for <STRONG>tput</STRONG>:  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.
+           terminal capability database.
 
        <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <STRONG>tput</STRONG> program without
            using <EM>curses,</EM> no system with a  <EM>curses</EM>  implementation  provides  a
-           <STRONG>tput</STRONG> utility that does not also supply the <EM>cap-code</EM> feature.
+           <STRONG>tput</STRONG> utility that does not also support standard <EM>cap-codes.</EM>
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (that is, System V <EM>curses</EM> behavior).
 
-       <STRONG>o</STRONG>   It  assigns  exit  status  4 to "invalid operand", which may be the
-           same as <EM>unknown</EM> <EM>capability</EM>.  For  instance,  the  source  code  for
-           Solaris' xcurses uses the term "invalid" in this case.
+       <STRONG>o</STRONG>   It  assigns  exit status 4 to "invalid operand", which may have the
+           same meaning as "unknown capability".   For  instance,  the  source
+           code for Solaris <EM>xcurses</EM> uses the term "invalid" in this case.
 
        <STRONG>o</STRONG>   It  assigns  exit  status  255  to  a  numeric variable that is not
-           specified in the terminfo database.  That likely is a documentation
-           error,  confusing  the  <STRONG>-1</STRONG>  written  to  the standard output for an
-           absent or cancelled numeric value versus an (unsigned) exit status.
+           specified in the <EM>terminfo</EM> database.  That likely is a documentation
+           error,  mistaking  the  "-1"  written  to  the  standard  output to
+           indicate  an  absent  or  cancelled  numeric  capability   for   an
+           (unsigned) exit status.
 
-       The various Unix systems  (AIX,  HP-UX,  Solaris)  use  the  same  exit
-       statuses as <EM>ncurses</EM>.
+       The various System V implementations (AIX, HP-UX, Solaris) use the same
+       exit statuses as <EM>ncurses.</EM>
 
-       NetBSD curses documents different exit statuses which do not correspond
-       to either <EM>ncurses</EM> or X/Open.
+       NetBSD <EM>curses</EM>  documents  exit  statuses  that  correspond  to  neither
+       <EM>ncurses</EM> nor X/Open Curses.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The <STRONG>tput</STRONG> command was begun by Bill Joy in 1980.   The  initial  version
-       only cleared the screen.
+       Bill  Joy  wrote  a  <STRONG>tput</STRONG> command during development of 4BSD in October
+       1980.  This initial version only cleared the screen, and did  not  ship
+       with official distributions.
 
-       AT&amp;T System V provided a different <STRONG>tput</STRONG> command:
+       System V developed a different <STRONG>tput</STRONG> command.
 
-       <STRONG>o</STRONG>   SVr2  provided  a  rudimentary  <STRONG>tput</STRONG>  which  checked  the parameter
+       <STRONG>o</STRONG>   SVr2  (1984) provided a rudimentary <STRONG>tput</STRONG> that checked the parameter
            against each predefined capability and returned  the  corresponding
-           value.   This  version  of  <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for the
-           capabilities which are parameterized.
+           value.    This   version   of   <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for
+           parameterized capabilities.
+
+       <STRONG>o</STRONG>   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
+           support  for  <STRONG>init</STRONG>  and <STRONG>reset</STRONG> operands (more than half the program)
+           incorporated the <STRONG>reset</STRONG> feature of BSD <STRONG>tset</STRONG> written by Eric Allman.
 
-       <STRONG>o</STRONG>   SVr3 replaced that, a year later, by a more extensive program whose
-           <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  subcommands  (more  than  half  the program) were
-           incorporated from the <STRONG>reset</STRONG> feature of BSD  <STRONG>tset</STRONG>  written  by  Eric
-           Allman.
+       <STRONG>o</STRONG>   SVr4 (1989) added color initialization  by  using  the  <STRONG>orig_colors</STRONG>
+           (<STRONG>oc</STRONG>) and <STRONG>orig_pair</STRONG> (<STRONG>op</STRONG>) capabilities in its <STRONG>init</STRONG> logic.
 
-       <STRONG>o</STRONG>   SVr4 added color initialization using the <STRONG>orig_colors</STRONG> and <STRONG>orig_pair</STRONG>
-           capabilities in the <STRONG>init</STRONG> subcommand.
+       Keith  Bostic  refactored BSD <STRONG>tput</STRONG> for shipment in 4.3BSD-Tahoe (1988),
+       then replaced it the next year  with  a  new  implementation  based  on
+       System V  <STRONG>tput</STRONG>.   Bostic's  version  similarly accepted some parameters
+       named for <EM>terminfo</EM> (pseudo-)capabilities: <STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG>,  and
+       <STRONG>reset</STRONG>.   However,  because  he  had only <EM>termcap</EM> available, it accepted
+       <EM>termcap</EM> names for other capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did  not
+       modify the terminal modes as the earlier BSD <STRONG>tset</STRONG> had done.
 
-       Keith Bostic  replaced  the  BSD  <STRONG>tput</STRONG>  command  in  1989  with  a  new
-       implementation  based on the AT&amp;T System V program <STRONG>tput</STRONG>.  Like the AT&amp;T
-       program, Bostic's version accepted some parameters named  for  <EM>terminfo</EM>
-       capabilities  (<STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG> and <STRONG>reset</STRONG>).  However (because he
-       had only <EM>termcap</EM>  available),  it  accepted  <EM>termcap</EM>  names  for  other
-       capabilities.   Also, Bostic's BSD <STRONG>tput</STRONG> did not modify the terminal I/O
-       modes as the earlier BSD <STRONG>tset</STRONG> had done.
+       At  the  same time, Bostic added a shell script named "clear" that used
+       <STRONG>tput</STRONG> to clear the screen.  Both of these appeared in  4.4BSD,  becoming
+       the "modern" BSD implementation of <STRONG>tput</STRONG>.
 
-       At the same time, Bostic added a shell script named "clear", which used
-       <STRONG>tput</STRONG> to clear the screen.
+       The  origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in Ross
+       Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in  December
+       1992.   Ridge's  program  made  more  sophisticated use of the terminal
+       capabilities than the BSD program.  Eric Raymond used that <STRONG>tput</STRONG> program
+       (and  other  parts  of <EM>mytinfo</EM>) in <EM>ncurses</EM> in June 1995.  Incorporating
+       the portions dealing with terminal capabilities almost without  change,
+       Raymond  made  improvements  to  the  way  command-line parameters were
+       handled.
 
-       Both   of   these   appeared  in  4.4BSD,  becoming  the  "modern"  BSD
-       implementation of <STRONG>tput</STRONG>.
+       Before <EM>ncurses</EM> 6.1 (2018), its <STRONG>tset</STRONG> and <STRONG>tput</STRONG> utilities differed.
 
-       This implementation of <STRONG>tput</STRONG> began from a different source than AT&amp;T  or
-       BSD:  Ross  Ridge's  <EM>mytinfo</EM> package, published on <EM>comp.sources.unix</EM> in
-       December 1992.  Ridge's program made  more  sophisticated  use  of  the
-       terminal  capabilities  than  the  BSD program.  Eric Raymond used that
-       <STRONG>tput</STRONG> program (and other parts of <EM>mytinfo</EM>)  in  <EM>ncurses</EM>  in  June  1995.
-       Using  the  portions  dealing with terminal capabilities almost without
-       change,  Raymond  made  improvements  to  the  way   the   command-line
-       parameters were handled.
+       <STRONG>o</STRONG>   <STRONG>tset</STRONG> was more effective, resetting the terminal modes  and  special
+           characters.
+
+       <STRONG>o</STRONG>   On  the  other hand, <STRONG>tset</STRONG>'s repertoire of terminal capabilities for
+           resetting the terminal was more limited; it had only equivalents of
+           <STRONG>reset_1string</STRONG>  (<STRONG>rs1</STRONG>), <STRONG>reset_2string</STRONG> (<STRONG>rs2</STRONG>), and <STRONG>reset_file</STRONG> (<STRONG>rf</STRONG>), and
+           not the tab stop and margin update features of <STRONG>tput</STRONG>.
+
+       The <STRONG>reset</STRONG> program is traditionally an alias for <STRONG>tset</STRONG> due to its ability
+       to reset terminal modes and special characters.
+
+       As  of  <EM>ncurses</EM>  6.1,  the  "reset"  features  of  the two programs are
+       (mostly) the same.  Two minor differences remain.
+
+       <STRONG>o</STRONG>   The <STRONG>tset</STRONG> program waits one  second  when  resetting,  in  case  the
+           terminal happens to be a hardware device.
+
+       <STRONG>o</STRONG>   The  two  programs  write  the  terminal  initialization strings to
+           different streams; that is, standard error for  <STRONG>tset</STRONG>  and  standard
+           output for <STRONG>tput</STRONG>.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
-            Initialize  the  terminal according to the type of terminal in the
-            environment variable <EM>TERM</EM>.  This command  should  be  included  in
-            everyone's  .profile  after the environment variable <EM>TERM</EM> has been
-            exported, as illustrated on the <STRONG>profile(5)</STRONG> manual page.
+              Initialize the terminal according to the type of terminal in the
+              <EM>TERM</EM> environment variable.  If  the  system  does  not  reliably
+              initialize the terminal upon login, this command can be included
+              in <EM>$HOME/.profile</EM> after exporting the <EM>TERM</EM> environment variable.
 
        <STRONG>tput</STRONG> <STRONG>-T5620</STRONG> <STRONG>reset</STRONG>
-            Reset an AT&amp;T 5620 terminal, overriding the type  of  terminal  in
-            the environment variable <EM>TERM</EM>.
+              Reset an AT&amp;T 5620 terminal, overriding the terminal type in the
+              <EM>TERM</EM> environment variable.
+
+       <STRONG>tput</STRONG> <STRONG>cnorm</STRONG>
+              Set cursor to normal visibility.
 
-       <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>0</STRONG> <STRONG>0</STRONG>
-            Send the sequence to move the cursor to row <STRONG>0</STRONG>, column <STRONG>0</STRONG> (the upper
-            left corner of the screen, usually  known  as  the  "home"  cursor
-            position).
+       <STRONG>tput</STRONG> <STRONG>home</STRONG>
+              Move the cursor to row 0, column 0: the upper left corner of the
+              screen, usually known as the "home" cursor position.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
-            Echo the clear-screen sequence for the current terminal.
+              Clear the screen: write the <STRONG>clear_screen</STRONG> capability's  value  to
+              the standard output stream.
 
        <STRONG>tput</STRONG> <STRONG>cols</STRONG>
-            Print the number of columns for the current terminal.
+              Report the number of columns used by the current terminal type.
+
+       <STRONG>tput</STRONG> <STRONG>-Tadm3a</STRONG> <STRONG>cols</STRONG>
+              Report the number of columns used by an ADM-3A terminal.
 
-       <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>cols</STRONG>
-            Print the number of columns for the 450 terminal.
+       <STRONG>strong=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>normal=`tput</STRONG> <STRONG>rmso`</STRONG>
+              Set  shell variables to capability values: <STRONG>strong</STRONG> and <STRONG>normal</STRONG>, to
+              begin and end, respectively, stand-out mode  for  the  terminal.
+              One might use these to present a prompt.
 
-       <STRONG>bold=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>offbold=`tput</STRONG> <STRONG>rmso`</STRONG>
-            Set  the  shell  variables <STRONG>bold</STRONG>, to begin stand-out mode sequence,
-            and <STRONG>offbold</STRONG>, to  end  standout  mode  sequence,  for  the  current
-            terminal.  This might be followed by a prompt: <STRONG>echo</STRONG> <STRONG>"${bold}Please</STRONG>
-            <STRONG>type</STRONG> <STRONG>in</STRONG> <STRONG>your</STRONG> <STRONG>name:</STRONG> <STRONG>${offbold}\c"</STRONG>
+                     printf "${strong}Username:${normal} "
 
        <STRONG>tput</STRONG> <STRONG>hc</STRONG>
-            Set exit status to indicate if the current terminal is a hard copy
-            terminal.
+              Indicate  via  exit  status  whether the terminal is a hard copy
+              device.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
-            Send the sequence to move the cursor to row 23, column 4.
+              Move the cursor to row 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-            Send  the  terminfo string for cursor-movement, with no parameters
-            substituted.
+              Report the value of the <STRONG>cursor_address</STRONG>  (<STRONG>cup</STRONG>)  capability  (used
+              for cursor movement), with no parameters substituted.
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-            Print the long name from the <EM>terminfo</EM> database  for  the  type  of
-            terminal specified in the environment variable <EM>TERM</EM>.
+              Report  the <EM>terminfo</EM> database's description of the terminal type
+              specified in the <EM>TERM</EM> environment variable.
 
        <STRONG>tput</STRONG> <STRONG>-S</STRONG>
-            The <STRONG>-S</STRONG> option can be profitably used with a shell "here document".
+              Process multiple capabilities.  The <STRONG>-S</STRONG> option can be  profitably
+              used with a shell "here document".
 
-            $ <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
-            &gt; <STRONG>clear</STRONG>
-            &gt; <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
-            &gt; <STRONG>bold</STRONG>
-            &gt; <STRONG>!</STRONG>
+              $ <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
+              &gt; <STRONG>clear</STRONG>
+              &gt; <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG>
+              &gt; <STRONG>bold</STRONG>
+              &gt; <STRONG>!</STRONG>
 
-            We see <STRONG>tput</STRONG> processing several capabilities in one invocation.  It
-            clears the screen, moves the cursor to position (10, 10) and turns
-            on bold (extra bright) mode.
+              The  foregoing  clears  the screen, moves the cursor to position
+              (10, 10) and turns on bold (extra bright) mode.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
-            Perform the same actions as the foregoing "<STRONG>tput</STRONG> <STRONG>-S</STRONG>" example.
+              Perform the same actions as the foregoing "<STRONG>tput</STRONG> <STRONG>-S</STRONG>" example.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -562,7 +550,7 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-30                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2024-01-13                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -570,14 +558,14 @@ <H1 class="no-header">tput 1 2023-12-30 ncurses 6.4 User commands</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Options">Options</a></li>
-<li><a href="#h3-Commands">Commands</a></li>
+<li><a href="#h3-Operands">Operands</a></li>
 <li><a href="#h3-Aliases">Aliases</a></li>
 <li><a href="#h3-Terminal-Size">Terminal Size</a></li>
 </ul>
 </li>
+<li><a href="#h2-OPTIONS">OPTIONS</a></li>
 <li><a href="#h2-EXIT-STATUS">EXIT STATUS</a></li>
-<li><a href="#h2-DIAGNOSTICS">DIAGNOSTICS</a></li>
+<li><a href="#h2-ENVIRONMENT">ENVIRONMENT</a></li>
 <li><a href="#h2-FILES">FILES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index c60e2a7f3..4f293c125 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -28,15 +28,6 @@
   * authorization.                                                           *
   ****************************************************************************
   * @Id: tset.1,v 1.79 2023/12/23 16:20:07 tom Exp @
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
-  *   reset.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/tset.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
-  *   tset/tset.c
-  * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2.9BSD/usr/src/ucb/\
-  *   tset/tset.c
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 4fa5bd0a2..cb25c15e1 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.44 2023/12/30 21:36:32 tom Exp @
+  * @Id: user_caps.5,v 1.47 2024/01/13 22:05:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2023-12-30 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2024-01-13 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2023-12-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2024-01-13 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -325,21 +325,28 @@ <H1 class="no-header">user_caps 5 2023-12-30 ncurses 6.4 File formats</H1>
        Applications can use the <EM>naming</EM> <EM>convention</EM>  established  for  <STRONG>xterm</STRONG>  to
        find these special keys in the terminal description.
 
-       Starting  with  the curses convention that <EM>key</EM> <EM>names</EM> begin with "k" and
-       that shifted special keys are  an  uppercase  name,  <EM>ncurses</EM>'  terminal
-       database defines these names to which a suffix is added:
-
-            <STRONG>Name</STRONG>   <STRONG>Description</STRONG>
-            ---------------------------------------------------------------
-            kDC    special form of kdch1 (delete character)
-            kDN    special form of kcud1 (cursor down)
-            kEND   special form of kend (End)
-            kHOM   special form of khome (Home)
-            kLFT   special form of kcub1 (cursor-left or cursor-back)
-            kNXT   special form of knext (Next, or Page-Down)
-            kPRV   special form of kprev (Prev, or Page-Up)
-            kRIT   special form of kcuf1 (cursor-right, or cursor-forward)
-            kUP    special form of kcuu1 (cursor-up)
+       Starting  with  the  <EM>curses</EM> convention that capability codes describing
+       the input generated by a terminal's key caps begin with "k",  and  that
+       shifted  special  keys  use uppercase letters in their names, <EM>ncurses</EM>'s
+       terminal database defines the following names  and  codes  to  which  a
+       suffix is added.
+
+            <STRONG>Code</STRONG>   <STRONG>Description</STRONG>
+            -------------------------------------------------------------------
+            <STRONG>kDC</STRONG>    shifted kdch1 (delete character)
+            <STRONG>kDN</STRONG>    shifted kcud1 (cursor down)
+            <STRONG>kEND</STRONG>   shifted kend (end)
+            <STRONG>kHOM</STRONG>   shifted khome (home)
+            <STRONG>kLFT</STRONG>   shifted kcub1 (cursor back)
+            <STRONG>kNXT</STRONG>   shifted knext (next)
+            <STRONG>kPRV</STRONG>   shifted kprev (previous)
+            <STRONG>kRIT</STRONG>   shifted kcuf1 (cursor forward)
+            <STRONG>kUP</STRONG>    shifted kcuu1 (cursor up)
+
+       Keycap  nomenclature on the Unix systems for which <EM>curses</EM> was developed
+       differs from today's ubiquitous descendants of the IBM  PC/AT  keyboard
+       layout.  In the foregoing, interpret "backward" as "left", "forward" as
+       "right", "next" as "page down", and "prev(ious)" as "page up".
 
        These are the suffixes used to denote the modifiers:
 
@@ -361,20 +368,20 @@ <H1 class="no-header">user_caps 5 2023-12-30 ncurses 6.4 File formats</H1>
             15      Meta + Ctrl + Alt
             16      Meta + Ctrl + Alt + Shift
 
-       None  of these are predefined; terminal descriptions can refer to <EM>names</EM>
+       None of these are predefined; terminal descriptions can refer to  <EM>names</EM>
        which <EM>ncurses</EM> will allocate at runtime to <EM>key-codes</EM>.  To use these keys
        in an <EM>ncurses</EM> program, an application could do this:
 
-       <STRONG>o</STRONG>   using  a  list  of  extended  key <EM>names</EM>, ask <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG> for their
+       <STRONG>o</STRONG>   using a list of extended key  <EM>names</EM>,  ask  <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>  for  their
            values, and
 
-       <STRONG>o</STRONG>   given the list of values,  ask  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>  for  the  <EM>key-code</EM>
+       <STRONG>o</STRONG>   given  the  list  of  values,  ask <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG> for the <EM>key-code</EM>
            which would be returned for those keys by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  "-x"  extension  feature  of  <STRONG>tic</STRONG>  and <STRONG>infocmp</STRONG> has been adopted in
-       NetBSD curses.  That implementation stores  user-defined  capabilities,
+       The "-x" extension feature of <STRONG>tic</STRONG>  and  <STRONG>infocmp</STRONG>  has  been  adopted  in
+       NetBSD  curses.   That implementation stores user-defined capabilities,
        but makes no use of these capabilities itself.
 
 
@@ -387,16 +394,16 @@ <H1 class="no-header">user_caps 5 2023-12-30 ncurses 6.4 File formats</H1>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
        The  terminal  database  section  <EM>NCURSES</EM>  <EM>USER-DEFINABLE</EM>  <EM>CAPABILITIES</EM>
-       summarizes commonly-used user-defined capabilities which  are  used  in
-       the  terminal  descriptions.   Some  of those features are mentioned in
+       summarizes  commonly-used  user-defined  capabilities which are used in
+       the terminal descriptions.  Some of those  features  are  mentioned  in
        <STRONG>screen(1)</STRONG> or <STRONG>tmux(1)</STRONG>.
 
-       <EM>XTerm</EM> <EM>Control</EM> <EM>Sequences</EM> provides further information  on  the  <STRONG>xterm(1)</STRONG>
+       <EM>XTerm</EM>  <EM>Control</EM>  <EM>Sequences</EM>  provides further information on the <STRONG>xterm(1)</STRONG>
        features that are used in these extended capabilities.
 
 
 
-ncurses 6.4                       2023-12-30                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2024-01-13                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index e21d59243..00b08350c 100644
--- a/include/Caps
+++ b/include/Caps
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.50 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps,v 1.52 2024/01/13 22:05:39 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -204,18 +204,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 cpi_changes_res			cpix	bool	YF	-	-	-----	changing character pitch changes resolution
 lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -284,20 +280,21 @@ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
 no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with colors
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%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.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 buffer_capacity			bufsz	num	Ya	-	-	-----	numbers of bytes buffered before printing
 dot_vert_spacing		spinv	num	Yb	-	-	-----	spacing of pins vertically in pins per inch
 dot_horz_spacing		spinh	num	Yc	-	-	-----	spacing of dots horizontally in dots per inch
@@ -316,18 +313,16 @@ buttons				btns	num	BT	-	-	-----	number of buttons on mouse
 bit_image_entwining		bitwin	num	Yo	-	-	-----	number of passes for each bit-image row
 bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
@@ -416,8 +411,8 @@ key_sf				kind	str	kF	KEY_SF		0520	-B-G-*	scroll-forward key
 key_sr				kri	str	kR	KEY_SR		0521	-B-G-*	scroll-backward key
 key_stab			khts	str	kT	KEY_STAB	0524	-B-G-*	set-tab key
 key_up				kcuu1	str	ku	KEY_UP		0403	YBCGE	up-arrow key
-keypad_local			rmkx	str	ke	-		-	YBCGE	leave 'keyboard_transmit' mode
-keypad_xmit			smkx	str	ks	-		-	YBCGE	enter 'keyboard_transmit' mode
+keypad_local			rmkx	str	ke	-		-	YBCGE	leave keyboard transmit mode
+keypad_xmit			smkx	str	ks	-		-	YBCGE	enter keyboard transmit mode
 lab_f0				lf0	str	l0	-		-	-B-G-*	label on function key f0 if not f0
 lab_f1				lf1	str	l1	-		-	-B-G-*	label on function key f1 if not f1
 lab_f10				lf10	str	la	-		-	-----	label on function key f10 if not f10
@@ -693,19 +688,20 @@ superscript_characters		supcs	str	Zv	-		-	-----	List of superscriptable characte
 these_cause_cr			docr	str	Zw	-		-	-----	Printing any of these characters causes CR
 zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%The following string capabilities are present in the SVr4.0 term structure,
 #%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 char_set_names			csnm	str	Zy	-		-	-----	Produce #1'th item from list of character set names
 key_mouse			kmous	str	Km	KEY_MOUSE	0631	-----	Mouse event has occurred
 mouse_info			minfo	str	Mi	-		-	-----	Mouse status information
@@ -714,7 +710,7 @@ get_mouse			getm	str	Gm	-		-	-----	Curses should get button events, parameter #1
 set_a_foreground		setaf	str	AF	-		-	-----	Set foreground color to #1, using ANSI escape
 set_a_background		setab	str	AB	-		-	-----	Set background color to #1, using ANSI escape
 pkey_plab			pfxl	str	xl	-		-	-----	Program function key #1 to type string #2 and show string #3
-device_type			devt	str	dv	-		-	-----	Indicate language/codeset support
+device_type			devt	str	dv	-		-	-----	Indicate language, codeset support
 code_set_init			csin	str	ci	-		-	-----	Init sequence for multiple codesets
 set0_des_seq			s0ds	str	s0	-		-	-----	Shift to codeset 0 (EUC set 0, ASCII)
 set1_des_seq			s1ds	str	s1	-		-	-----	Shift to codeset 1
@@ -742,9 +738,8 @@ pc_term_options			pctrm	str	S6	-		-	-----	PC terminal options
 scancode_escape			scesc	str	S7	-		-	-----	Escape for scancode emulation
 alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulation
 #%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
 #%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.
@@ -753,15 +748,16 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%If your compiled terminfo entries use these,
 #%they may not be binary-compatible with System V terminfo
 #%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 enter_horizontal_hl_mode	ehhlm	str	Xh	-		-	-----	Enter horizontal highlight mode
 enter_left_hl_mode		elhlm	str	Xl	-		-	-----	Enter left highlight mode
 enter_low_hl_mode		elohlm	str	Xo	-		-	-----	Enter low highlight mode
@@ -771,7 +767,6 @@ enter_vertical_hl_mode		evhlm	str	Xv	-		-	-----	Enter vertical highlight mode
 set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
 set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 #%.TE
-#%.ad
 #
 # The magic token below tells the tic compiler-generator code that all the caps
 # past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 3b2389be3..726005a7d 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.22 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps.aix4,v 1.24 2024/01/13 22:05:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -204,18 +204,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 cpi_changes_res			cpix	bool	YF	-	-	-----	changing character pitch changes resolution
 lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -284,20 +280,21 @@ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
 no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with colors
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%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.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 buffer_capacity			bufsz	num	Ya	-	-	-----	numbers of bytes buffered before printing
 dot_vert_spacing		spinv	num	Yb	-	-	-----	spacing of pins vertically in pins per inch
 dot_horz_spacing		spinh	num	Yc	-	-	-----	spacing of dots horizontally in dots per inch
@@ -316,18 +313,16 @@ buttons				btns	num	BT	-	-	-----	number of buttons on mouse
 bit_image_entwining		bitwin	num	Yo	-	-	-----	number of passes for each bit-image row
 bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
@@ -795,19 +790,20 @@ superscript_characters		supcs	str	Zv	-		-	-----	List of superscriptable characte
 these_cause_cr			docr	str	Zw	-		-	-----	Printing any of these characters causes CR
 zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%The following string capabilities are present in the SVr4.0 term structure,
 #%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 char_set_names			csnm	str	Zy	-		-	-----	Produce #1'th item from list of character set names
 key_mouse			kmous	str	Km	KEY_MOUSE	0631	-----	Mouse event has occurred
 mouse_info			minfo	str	Mi	-		-	-----	Mouse status information
@@ -844,9 +840,8 @@ pc_term_options			pctrm	str	S6	-		-	-----	PC terminal options
 scancode_escape			scesc	str	S7	-		-	-----	Escape for scancode emulation
 alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulation
 #%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
 #%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.
@@ -855,15 +850,16 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%If your compiled terminfo entries use these,
 #%they may not be binary-compatible with System V terminfo
 #%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 #enter_horizontal_hl_mode	ehhlm	str	Xh	-		-	-----	Enter horizontal highlight mode
 #enter_left_hl_mode		elhlm	str	Xl	-		-	-----	Enter left highlight mode
 #enter_low_hl_mode		elohlm	str	Xo	-		-	-----	Enter low highlight mode
@@ -873,7 +869,6 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
 set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 #%.TE
-#%.ad
 #
 # The magic token below tells the tic compiler-generator code that all the caps
 # past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index f9633f4c5..e90a1860e 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2002-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.20 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps.hpux11,v 1.22 2024/01/13 22:05:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -204,18 +204,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -255,18 +253,16 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 cpi_changes_res			cpix	bool	YF	-	-	-----	changing character pitch changes resolution
 lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -286,20 +282,21 @@ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
 no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with colors
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%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.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 buffer_capacity			bufsz	num	Ya	-	-	-----	numbers of bytes buffered before printing
 dot_vert_spacing		spinv	num	Yb	-	-	-----	spacing of pins vertically in pins per inch
 dot_horz_spacing		spinh	num	Yc	-	-	-----	spacing of dots horizontally in dots per inch
@@ -318,18 +315,16 @@ buttons				btns	num	BT	-	-	-----	number of buttons on mouse
 bit_image_entwining		bitwin	num	Yo	-	-	-----	number of passes for each bit-image row
 bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
@@ -701,19 +696,20 @@ superscript_characters		supcs	str	Zv	-		-	-----	List of superscriptable characte
 these_cause_cr			docr	str	Zw	-		-	-----	Printing any of these characters causes CR
 zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%The following string capabilities are present in the SVr4.0 term structure,
 #%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 char_set_names			csnm	str	Zy	-		-	-----	Produce #1'th item from list of character set names
 key_mouse			kmous	str	Km	KEY_MOUSE	0631	-----	Mouse event has occurred
 mouse_info			minfo	str	Mi	-		-	-----	Mouse status information
@@ -750,9 +746,8 @@ pc_term_options			pctrm	str	S6	-		-	-----	PC terminal options
 scancode_escape			scesc	str	S7	-		-	-----	Escape for scancode emulation
 alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulation
 #%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
 #%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.
@@ -761,17 +756,18 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%If your compiled terminfo entries use these,
 #%they may not be binary-compatible with System V terminfo
 #%entries after SVr4.1; beware!
-#%
+#%.
 #%AIX and Solaris do not provide termcap names for these; HPUX does.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 enter_horizontal_hl_mode	ehhlm	str	Q1	-		-	-----	Enter horizontal highlight mode
 enter_left_hl_mode		elhlm	str	Q2	-		-	-----	Enter left highlight mode
@@ -787,7 +783,6 @@ exit_right_hl_mode 		rmrhlm	str	Qb	-		-	----K	Exit right highlight mode
 exit_top_hl_mode 		rmthlm	str	Qc	-		-	----K	Exit top highlight mode
 exit_vertical_hl_mode 		rmvhlm	str	Qd	-		-	----K	Exit vertical highlight mode
 #%.TE
-#%.ad
 #
 # The magic token below tells the tic compiler-generator code that all the caps
 # past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.keys b/include/Caps.keys
index 48da83bcb..d9a9c4cb4 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.19 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps.keys,v 1.21 2024/01/13 22:05:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -206,18 +206,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -256,18 +254,16 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 cpi_changes_res			cpix	bool	YF	-	-	-----	changing character pitch changes resolution
 lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -286,20 +282,21 @@ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
 no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with colors
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%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.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 buffer_capacity			bufsz	num	Ya	-	-	-----	numbers of bytes buffered before printing
 dot_vert_spacing		spinv	num	Yb	-	-	-----	spacing of pins vertically in pins per inch
 dot_horz_spacing		spinh	num	Yc	-	-	-----	spacing of dots horizontally in dots per inch
@@ -318,18 +315,16 @@ buttons				btns	num	BT	-	-	-----	number of buttons on mouse
 bit_image_entwining		bitwin	num	Yo	-	-	-----	number of passes for each bit-image row
 bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
@@ -783,19 +778,20 @@ superscript_characters		supcs	str	Zv	-		-	-----	List of superscriptable characte
 these_cause_cr			docr	str	Zw	-		-	-----	Printing any of these characters causes CR
 zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.TE
-#%.ad
-#%
+#%.PP
+#%.
 #%The following string capabilities are present in the SVr4.0 term structure,
 #%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 char_set_names			csnm	str	Zy	-		-	-----	Produce #1'th item from list of character set names
 key_mouse			kmous	str	Km	KEY_MOUSE	0631	-----	Mouse event has occurred
 mouse_info			minfo	str	Mi	-		-	-----	Mouse status information
@@ -832,9 +828,8 @@ pc_term_options			pctrm	str	S6	-		-	-----	PC terminal options
 scancode_escape			scesc	str	S7	-		-	-----	Escape for scancode emulation
 alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulation
 #%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
 #%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.
@@ -843,15 +838,16 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%If your compiled terminfo entries use these,
 #%they may not be binary-compatible with System V terminfo
 #%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 enter_horizontal_hl_mode	ehhlm	str	Xh	-		-	-----	Enter horizontal highlight mode
 enter_left_hl_mode		elhlm	str	Xl	-		-	-----	Enter left highlight mode
 enter_low_hl_mode		elohlm	str	Xo	-		-	-----	Enter low highlight mode
@@ -861,7 +857,6 @@ enter_vertical_hl_mode		evhlm	str	Xv	-		-	-----	Enter vertical highlight mode
 set_a_attributes		sgr1	str	sA	-		-	-----	Define second set of video attributes #1-#6
 set_pglen_inch			slength	str	YI	-		-	-----	Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 #%.TE
-#%.ad
 #
 # The magic token below tells the tic compiler-generator code that all the caps
 # past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index 04d8f55fd..d5b8c4e61 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2002-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.18 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps.osf1r5,v 1.20 2024/01/13 22:05:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -204,18 +204,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ prtr_silent			mc5i	bool	5i	-	-	-----	printer will not echo on screen
 row_addr_glitch			xvpa	bool	YD	-	-	-----	only positive motion for vpa/mvpa caps
 semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -300,18 +296,16 @@ output_res_vert_inch		orvi	num	Yl	-	-	-----	vertical resolution in units per inc
 print_rate			cps	num	Ym	-	-	-----	print rate in characters per second
 wide_char_size			widcs	num	Yn	-	-	-----	character step size when in double wide mode
 #%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 6214f59a0..a12770f2e 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.17 2023/12/30 21:36:32 Branden.Robinson Exp $
+# $Id: Caps.uwin,v 1.19 2024/01/13 22:05:39 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -204,18 +204,16 @@
 #%.TP
 #%(#\d\fIi\fP\u)
 #%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
 #%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBBooleans	name	Code\fR
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Boolean Capability Name	TI	TC	Description
+#%_
 auto_left_margin		bw	bool	bw	-	-	YB-G-	cub1 wraps from column 0 to last column
 auto_right_margin		am	bool	am	-	-	YBCGE	terminal has automatic margins
 no_esc_ctlc			xsb	bool	xb	-	-	YBCG-	beehive (f1=escape, f2=ctrl C)
@@ -247,18 +245,16 @@ back_color_erase		bce	bool	ut	-	-	-----	screen erased with background color
 can_change			ccc	bool	cc	-	-	-----	terminal can re-define existing colors
 hue_lightness_saturation	hls	bool	hl	-	-	-----	terminal uses only HLS color notation (Tektronix)
 #%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBNumeric	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%Numeric Capability Name	TI	TC	Description
+#%_
 columns				cols	num	co	-	-	YBCGE	number of columns in a line
 init_tabs			it	num	it	-	-	YB-G-	tabs initially every # spaces
 lines				lines	num	li	-	-	YBCGE	number of lines on screen or page
@@ -278,24 +274,16 @@ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
 no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with colors
 #%.TE
-#%.ad
-#%
-#%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.
-#%
-#%.na
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable	Cap-	TCap	Description\fR
-#%\fBString	name	Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S  Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\&	Code	\&
+#%String Capability Name	TI	TC	Description
+#%_
 back_tab			cbt	str	bt	-		-	YBCGE	back tab (P)
 bell				bel	str	bl	-		-	YB-GE	audible signal (bell) (P)
 carriage_return			cr	str	cr	-		-	YBCGE	carriage return (P*) (P*)
@@ -595,7 +583,6 @@ set_background			setb	str	Sb	-		-	-----	Set background color #1
 set_color_pair			scp	str	sp	-		-	-----	Set current color pair to #1
 set_foreground			setf	str	Sf	-		-	-----	Set foreground color #1
 #%.TE
-#%.ad
 #%
 # The magic token below tells the tic compiler-generator code that all the caps
 # past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 323c525f3..882ef2ad0 100755
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: MKterminfo.sh,v 1.19 2022/07/16 17:55:20 tom Exp $
+# $Id: MKterminfo.sh,v 1.20 2024/01/13 20:37:40 tom Exp $
 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
@@ -83,7 +83,9 @@ cat $caps | sed -n "\
 /^#/d
 s/[	][	]*/	/g
 s/$/T}/
-s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{/
+s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{\\
+.ad l\
+/
 s/	bool	/	/p
 s/	num	/	/p
 s/	str	/	/p
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 2d2c1421e..70d849f1c 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.50 2023/12/23 16:08:25 tom Exp $
-.TH curs_add_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.53 2024/01/13 22:05:39 tom Exp $
+.TH curs_add_wch 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -125,89 +125,159 @@ These symbols correspond to the same VT100 line-drawing set as
 \fB\%addch\fP(3X).
 .PP
 .TS
-l l l l l
-l l l l l
-_ _ _ _ _
-lw(1.5i) lw5 lw5 lw5 lw20.
-\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
-\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
-WACS_BLOCK	0x25ae 	#	0	solid square block
-WACS_BOARD	0x2592 	#	h	board of squares
-WACS_BTEE	0x2534 	+	v	bottom tee
-WACS_BULLET	0x00b7 	o	~	bullet
-WACS_CKBOARD	0x2592 	:	a	checker board (stipple)
-WACS_DARROW	0x2193 	v	.	arrow pointing down
-WACS_DEGREE	0x00b0 	'	f	degree symbol
-WACS_DIAMOND	0x25c6 	+	\(ga	diamond
-WACS_GEQUAL	0x2265 	>	>	greater-than-or-equal-to
-WACS_HLINE	0x2500 	\-	q	horizontal line
-WACS_LANTERN	0x2603 	#	i	lantern symbol
-WACS_LARROW	0x2190 	<	,	arrow pointing left
-WACS_LEQUAL	0x2264 	<	y	less-than-or-equal-to
-WACS_LLCORNER	0x2514 	+	m	lower left-hand corner
-WACS_LRCORNER	0x2518 	+	j	lower right-hand corner
-WACS_LTEE	0x2524 	+	t	left tee
-WACS_NEQUAL	0x2260 	!	|	not-equal
-WACS_PI	0x03c0 	*	{	greek pi
-WACS_PLMINUS	0x00b1 	#	g	plus/minus
-WACS_PLUS	0x253c 	+	n	plus
-WACS_RARROW	0x2192 	>	+	arrow pointing right
-WACS_RTEE	0x251c 	+	u	right tee
-WACS_S1	0x23ba 	\-	o	scan line 1
-WACS_S3	0x23bb 	\-	p	scan line 3
-WACS_S7	0x23bc 	\-	r	scan line 7
-WACS_S9	0x23bd 	\&_	s	scan line 9
-WACS_STERLING	0x00a3 	f	}	pound-sterling symbol
-WACS_TTEE	0x252c 	+	w	top tee
-WACS_UARROW	0x2191  	^	\-	arrow pointing up
-WACS_ULCORNER	0x250c 	+	l	upper left-hand corner
-WACS_URCORNER	0x2510 	+	k	upper right-hand corner
-WACS_VLINE	0x2502 	|	x	vertical line
+Lb Lb Lb Lb Lb
+Lb Lb Lb Lb Lb
+Lb L  L  L  Lx.
+\&	Unicode	ASCII	acsc	\&
+ACS Name	Default	Default	Char	Glyph Name
+_
+WACS_BLOCK	0x25ae	#	0	T{
+solid square block
+T}
+WACS_BOARD	0x2592	#	h	board of squares
+WACS_BTEE	0x2534	+	v	bottom tee
+WACS_BULLET	0x00b7	o	~	bullet
+WACS_CKBOARD	0x2592	:	a	T{
+checker board (stipple)
+T}
+WACS_DARROW	0x2193	v	.	T{
+arrow pointing down
+T}
+WACS_DEGREE	0x00b0	'	f	degree symbol
+WACS_DIAMOND	0x25c6	+	\(ga	diamond
+WACS_GEQUAL	0x2265	>	>	T{
+greater-than-or-equal-to
+T}
+WACS_HLINE	0x2500	\-	q	horizontal line
+WACS_LANTERN	0x2603	#	i	lantern symbol
+WACS_LARROW	0x2190	<	,	T{
+arrow pointing left
+T}
+WACS_LEQUAL	0x2264	<	y	T{
+less-than-or-equal-to
+T}
+WACS_LLCORNER	0x2514	+	m	T{
+lower left-hand corner
+T}
+WACS_LRCORNER	0x2518	+	j	T{
+lower right-hand corner
+T}
+WACS_LTEE	0x2524	+	t	left tee
+WACS_NEQUAL	0x2260	!	|	not-equal
+WACS_PI	0x03c0	*	{	greek pi
+WACS_PLMINUS	0x00b1	#	g	plus/minus
+WACS_PLUS	0x253c	+	n	plus
+WACS_RARROW	0x2192	>	+	T{
+arrow pointing right
+T}
+WACS_RTEE	0x251c	+	u	right tee
+WACS_S1	0x23ba	\-	o	scan line 1
+WACS_S3	0x23bb	\-	p	scan line 3
+WACS_S7	0x23bc	\-	r	scan line 7
+WACS_S9	0x23bd	\&_	s	scan line 9
+WACS_STERLING	0x00a3	f	}	T{
+pound-sterling symbol
+T}
+WACS_TTEE	0x252c	+	w	top tee
+WACS_UARROW	0x2191 	^	\-	T{
+arrow pointing up
+T}
+WACS_ULCORNER	0x250c	+	l	T{
+upper left-hand corner
+T}
+WACS_URCORNER	0x2510	+	k	T{
+upper right-hand corner
+T}
+WACS_VLINE	0x2502	|	x	vertical line
 .TE
 .PP
 The wide-character configuration of \fI\%ncurses\fP also defines symbols
 for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
 .PP
 .TS
-l l l l l
-l l l l l
-_ _ _ _ _
-lw(1.5i) lw5 lw5 lw5 lw20.
-\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
-\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
-WACS_T_BTEE	0x253b	+	V	thick tee pointing up
-WACS_T_HLINE	0x2501	-	Q	thick horizontal line
-WACS_T_LLCORNER	0x2517	+	M	thick lower left corner
-WACS_T_LRCORNER	0x251b	+	J	thick lower right corner
-WACS_T_LTEE	0x252b	+	T	thick tee pointing right
-WACS_T_PLUS	0x254b	+	N	thick large plus
-WACS_T_RTEE	0x2523	+	U	thick tee pointing left
-WACS_T_TTEE	0x2533	+	W	thick tee pointing down
-WACS_T_ULCORNER	0x250f	+	L	thick upper left corner
-WACS_T_URCORNER	0x2513	+	K	thick upper right corner
-WACS_T_VLINE	0x2503	|	X	thick vertical line
+Lb Lb Lb Lb Lb
+Lb Lb Lb Lb Lb
+Lb L  L  L  Lx.
+\&	Unicode	ASCII	acsc	\&
+ACS Name	Default	Default	Char	Glyph Name
+_
+WACS_T_BTEE	0x253b	+	V	T{
+thick tee pointing up
+T}
+WACS_T_HLINE	0x2501	-	Q	T{
+thick horizontal line
+T}
+WACS_T_LLCORNER	0x2517	+	M	T{
+thick lower left corner
+T}
+WACS_T_LRCORNER	0x251b	+	J	T{
+thick lower right corner
+T}
+WACS_T_LTEE	0x252b	+	T	T{
+thick tee pointing right
+T}
+WACS_T_PLUS	0x254b	+	N	T{
+thick large plus
+T}
+WACS_T_RTEE	0x2523	+	U	T{
+thick tee pointing left
+T}
+WACS_T_TTEE	0x2533	+	W	T{
+thick tee pointing down
+T}
+WACS_T_ULCORNER	0x250f	+	L	T{
+thick upper left corner
+T}
+WACS_T_URCORNER	0x2513	+	K	T{
+thick upper right corner
+T}
+WACS_T_VLINE	0x2503	|	X	T{
+thick vertical line
+T}
 .TE
 .PP
 and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
 .PP
 .TS
-l l l l l
-l l l l l
-_ _ _ _ _
-lw(1.5i) lw5 lw5 lw5 lw20.
-\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
-\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
-WACS_D_BTEE	0x2569	+	H	double tee pointing up
-WACS_D_HLINE	0x2550	-	R	double horizontal line
-WACS_D_LLCORNER	0x255a	+	D	double lower left corner
-WACS_D_LRCORNER	0x255d	+	A	double lower right corner
-WACS_D_LTEE	0x2560	+	F	double tee pointing right
-WACS_D_PLUS	0x256c	+	E	double large plus
-WACS_D_RTEE	0x2563	+	G	double tee pointing left
-WACS_D_TTEE	0x2566	+	I	double tee pointing down
-WACS_D_ULCORNER	0x2554	+	C	double upper left corner
-WACS_D_URCORNER	0x2557	+	B	double upper right corner
-WACS_D_VLINE	0x2551	|	Y	double vertical line
+Lb Lb Lb Lb Lb
+Lb Lb Lb Lb Lb
+Lb L  L  L  Lx.
+\&	Unicode	ASCII	acsc	\&
+ACS Name	Default	Default	Char	Glyph Name
+_
+WACS_D_BTEE	0x2569	+	H	T{
+double tee pointing up
+T}
+WACS_D_HLINE	0x2550	-	R	T{
+double horizontal line
+T}
+WACS_D_LLCORNER	0x255a	+	D	T{
+double lower left corner
+T}
+WACS_D_LRCORNER	0x255d	+	A	T{
+double lower right corner
+T}
+WACS_D_LTEE	0x2560	+	F	T{
+double tee pointing right
+T}
+WACS_D_PLUS	0x256c	+	E	T{
+double large plus
+T}
+WACS_D_RTEE	0x2563	+	G	T{
+double tee pointing left
+T}
+WACS_D_TTEE	0x2566	+	I	T{
+double tee pointing down
+T}
+WACS_D_ULCORNER	0x2554	+	C	T{
+double upper left corner
+T}
+WACS_D_URCORNER	0x2557	+	B	T{
+double upper right corner
+T}
+WACS_D_VLINE	0x2551	|	Y	T{
+double vertical line
+T}
 .TE
 .PP
 Unicode's descriptions for these characters differs slightly from
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index daba5c214..3053c350b 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.93 2023/12/23 16:08:25 tom Exp $
-.TH curs_attr 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.96 2024/01/13 22:05:39 tom Exp $
+.TH curs_attr 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -247,23 +247,27 @@ characters passed to \fBaddch\fP (see \fBcurs_addch\fP(3X)).
 .ne 15
 .RS
 .TS
-l l
-_ _ _
-l l .
-\fBName\fP	\fBDescription\fP
-\fBA_NORMAL\fP	Normal display (no highlight)
-\fBA_STANDOUT\fP	Best highlighting mode of the terminal.
-\fBA_UNDERLINE\fP	Underlining
-\fBA_REVERSE\fP	Reverse video
-\fBA_BLINK\fP	Blinking
-\fBA_DIM\fP	Half bright
-\fBA_BOLD\fP	Extra bright or bold
-\fBA_PROTECT\fP	Protected mode
-\fBA_INVIS\fP	Invisible or blank mode
-\fBA_ALTCHARSET\fP	Alternate character set
-\fBA_ITALIC\fP	Italics (non-X/Open extension)
-\fBA_CHARTEXT\fP	Bit-mask to extract a character
-\fBA_COLOR\fP	Bit-mask to extract a color (legacy routines)
+Lb Lb
+Lb Lx.
+Name	Description
+_
+A_NORMAL	Normal display (no highlight)
+A_STANDOUT	T{
+Best highlighting mode of the terminal
+T}
+A_UNDERLINE	Underlining
+A_REVERSE	Reverse video
+A_BLINK	Blinking
+A_DIM	Half bright
+A_BOLD	Extra bright or bold
+A_PROTECT	Protected mode
+A_INVIS	Invisible or blank mode
+A_ALTCHARSET	Alternate character set
+A_ITALIC	Italics (non-X/Open extension)
+A_CHARTEXT	Bit-mask to extract a character
+A_COLOR	T{
+Bit-mask to extract a color (legacy routines)
+T}
 .TE
 .RE
 .PP
@@ -272,16 +276,16 @@ These video attributes are supported by \fBattr_on\fP and related functions
 .PP
 .RS
 .TS
-l l
-_ _ _
-l l .
-\fBName\fP	\fBDescription\fP
-\fBWA_HORIZONTAL\fP	Horizontal highlight
-\fBWA_LEFT\fP	Left highlight
-\fBWA_LOW\fP	Low highlight
-\fBWA_RIGHT\fP	Right highlight
-\fBWA_TOP\fP	Top highlight
-\fBWA_VERTICAL\fP	Vertical highlight
+Lb Lb
+Lb Lx.
+Name	Description
+_
+WA_HORIZONTAL	Horizontal highlight
+WA_LEFT	Left highlight
+WA_LOW	Low highlight
+WA_RIGHT	Right highlight
+WA_TOP	Top highlight
+WA_VERTICAL	Vertical highlight
 .TE
 .RE
 .PP
@@ -390,18 +394,20 @@ The older macros have direct counterparts in the newer set of names:
 .RS
 .ne 9
 .TS
-l l
-_ _ _
-l l .
-\fBName\fP	\fBDescription\fP
-\fBWA_NORMAL\fP	Normal display (no highlight)
-\fBWA_STANDOUT\fP	Best highlighting mode of the terminal.
-\fBWA_UNDERLINE\fP	Underlining
-\fBWA_REVERSE\fP	Reverse video
-\fBWA_BLINK\fP	Blinking
-\fBWA_DIM\fP	Half bright
-\fBWA_BOLD\fP	Extra bright or bold
-\fBWA_ALTCHARSET\fP	Alternate character set
+Lb Lb
+Lb Lx.
+Name	Description
+_
+WA_NORMAL	Normal display (no highlight)
+WA_STANDOUT	T{
+Best highlighting mode of the terminal
+T}
+WA_UNDERLINE	Underlining
+WA_REVERSE	Reverse video
+WA_BLINK	Blinking
+WA_DIM	Half bright
+WA_BOLD	Extra bright or bold
+WA_ALTCHARSET	Alternate character set
 .TE
 .RE
 .PP
@@ -504,25 +510,25 @@ as well as clues such as the alternate character set implementation.
 A 32-bit library can be used on a 64-bit system,
 but not necessarily the reverse.
 .PP
-.RS
 .TS
-l l l l l l
-_ _ _ _ _ _
-l l l l l l .
-\fBYear\fP	\fBSystem\fP	\fBArch\fP	\fBColor\fP	\fBChar\fP	\fBNotes\fP
-1992	Solaris 5.2	32	6	17	SVr4 curses
-1992	HP-UX 9	32	no	8	SVr2 curses
-1992	AIX 3.2	32	no	23	SVr2 curses
-1994	OSF/1 r3	32	no	23	SVr2 curses
-1995	HP-UX 10.00	32	6	16	SVr3 \*(``curses_colr\*(''
-1995	HP-UX 10.00	32	6	8	SVr4, X/Open curses
-1995	Solaris 5.4	32/64	7	16	X/Open curses
-1996	AIX 4.2	32	7	16	X/Open curses
-1996	OSF/1 r4	32	6	16	X/Open curses
-1997	HP-UX 11.00	32	6	8	X/Open curses
-2000	U/Win	32/64	7/31	16	uses \fBchtype\fP
+Lb  Lb Lb  Cb  S   Lb
+Lb2 Lb Lb2 Lbz Lb2 Lb
+L   L  L   L   L   Lx.
+\&	\&	\&	Bits	\&
+Year	System	Arch	Color	Char	Notes
+_
+1992	Solaris 5.2	32	6	17	SVr4 \fIcurses\fP
+1992	HP-UX 9	32	no	8	SVr2 \fIcurses\fP
+1992	AIX 3.2	32	no	23	SVr2 \fIcurses\fP
+1994	OSF/1 r3	32	no	23	SVr2 \fIcurses\fP
+1995	HP-UX 10.00	32	6	16	SVr3 \fIcurses_colr\fP
+1995	HP-UX 10.00	32	6	8	SVr4, X/Open \fIcurses\fP
+1995	Solaris 5.4	32/64	7	16	X/Open \fIcurses\fP
+1996	AIX 4.2	32	7	16	X/Open \fIcurses\fP
+1996	OSF/1 r4	32	6	16	X/Open \fIcurses\fP
+1997	HP-UX 11.00	32	6	8	X/Open \fIcurses\fP
+2000	U/Win	32/64	7/31	16	uses \fIchtype\fP
 .TE
-.RE
 .PP
 Notes:
 .RS 3
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index db92f6dfd..54a57228f 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.41 2023/12/16 21:08:16 tom Exp $
-.TH curs_inch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.44 2024/01/13 22:05:39 tom Exp $
+.TH curs_inch 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -74,10 +74,13 @@ extract the character or attributes alone.
 The following bit masks may be AND-ed with characters returned by \fBwinch\fP.
 .PP
 .TS
-l l .
-\fBA_CHARTEXT\fP	Bit mask to extract character
-\fBA_ATTRIBUTES\fP	Bit mask to extract attributes
-\fBA_COLOR\fP	Bit mask to extract color pair field information
+Lb Lb
+Lb Lx.
+Name	Description
+_
+A_CHARTEXT	Extract character
+A_ATTRIBUTES	Extract attributes
+A_COLOR	Extract color pair information
 .TE
 .SH RETURN VALUE
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index b7a2d8291..677f708ae 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.83 2023/12/23 20:37:56 tom Exp $
-.TH curs_mouse 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.86 2024/01/13 22:05:39 tom Exp $
+.TH curs_mouse 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,10 +110,10 @@ Whether this happens is device-dependent.
 Here are the mouse event type masks which may be defined:
 .PP
 .TS
-lB lB
-lB l .
+Lb Lb
+Lb Lx.
 Name	Description
-_
+=
 BUTTON1_PRESSED	mouse button 1 down
 BUTTON1_RELEASED	mouse button 1 up
 BUTTON1_CLICKED	mouse button 1 clicked
@@ -144,9 +144,15 @@ BUTTON5_CLICKED	mouse button 5 clicked
 BUTTON5_DOUBLE_CLICKED	mouse button 5 double clicked
 BUTTON5_TRIPLE_CLICKED	mouse button 5 triple clicked
 _
-BUTTON_SHIFT	shift was down during button state change
-BUTTON_CTRL	control was down during button state change
-BUTTON_ALT	alt was down during button state change
+BUTTON_SHIFT	T{
+shift was down during button state change
+T}
+BUTTON_CTRL	T{
+control was down during button state change
+T}
+BUTTON_ALT	T{
+alt was down during button state change
+T}
 ALL_MOUSE_EVENTS	report all button state changes
 REPORT_MOUSE_POSITION	report mouse movement
 _
@@ -382,15 +388,28 @@ extern unsigned long getmouse(void), getbmap(void);
 .RE
 .bP
 Its \*(``terminfo\*('' manual page lists capabilities for the feature.
-.PP
+.\" These don't appear in in the SVID 4th edition, Volume 3,
+.\" terminfo(TI_ENV) man page.  They can be found in, e.g., the "z/OS
+.\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
 .RS 8
-.EX
-buttons           btns    BT       Number of buttons on the mouse
-get_mouse         getm    Gm       Curses should get button events
-key_mouse         kmous   Km       0631, Mouse event has occurred
-mouse_info        minfo   Mi       Mouse status information
-req_mouse_pos     reqmp   RQ       Request mouse position report
-.EE
+.TS
+Lb Lb Lb Lx.
+buttons	btns	BT	T{
+Number of buttons on the mouse
+T}
+get_mouse	getm	Gm	T{
+Curses should get button events
+T}
+key_mouse	kmous	Km	T{
+0631, Mouse event has occurred
+T}
+mouse_info	minfo	Mi	T{
+Mouse status information
+T}
+req_mouse_pos	reqmp	RQ	T{
+Request mouse position report
+T}
+.TE
 .RE
 .bP
 The interface made assumptions
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index e5affc46f..4975914d8 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.125 2023/12/30 23:46:56 tom Exp $
-.TH curs_terminfo 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.129 2024/01/13 22:15:55 tom Exp $
+.TH curs_terminfo 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -102,9 +102,9 @@
 .PP
 \fBint mvcur(int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
 .PP
-\fBint tigetflag(const char *\fIcapname\fP);
-\fBint tigetnum(const char *\fIcapname\fP);
-\fBchar *tigetstr(const char *\fIcapname\fP);
+\fBint tigetflag(const char *\fIcap-code\fP);
+\fBint tigetnum(const char *\fIcap-code\fP);
+\fBchar *tigetstr(const char *\fIcap-code\fP);
 .PP
 \fBchar *tiparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
 .PP
@@ -116,14 +116,14 @@
 \fBint setterm(const char *\fIterm\fP);
 .fi
 .SH DESCRIPTION
-These low-level routines must be called by programs that have to deal
-directly with the
+These low-level functions must be called by programs that deal directly
+with the
 .I \%term\%info
 database to handle certain terminal capabilities,
 such as programming function keys.
 For all other functionality,
 .I curses
-routines are more suitable and their use is recommended.
+functions are more suitable and their use is recommended.
 .PP
 None of these functions use
 (or are aware of)
@@ -139,11 +139,10 @@ Initially,
 The high-level
 .I curses
 functions \fB\%initscr\fP and \fB\%newterm\fP call \fB\%setupterm\fP to
-initialize the low-level set of terminal-dependent variables
-listed in \fB\%term_variables\fP(3X).
+initialize the low-level set of terminal-dependent variables listed in
+\fB\%term_variables\fP(3X).
 .PP
-Applications can use the
-terminal capabilities either directly
+Applications can use the terminal capabilities either directly
 (via header definitions),
 or by special functions.
 The header files
@@ -152,57 +151,77 @@ and
 .I \%term.h
 should be included
 (in that order)
-to get the definitions for these strings, numbers, and flags.
+to get the definitions for these strings,
+numbers,
+and flags.
 .PP
 The
 .I \%term\%info
 variables
-\fBlines\fP and \fBcolumns\fP are initialized by \fB\%setupterm\fP as
-follows:
+.B \%lines
+and
+.B \%columns
+are initialized by \fB\%setupterm\fP as follows.
 .bP
 If \fB\%use_env(FALSE)\fP has been called,
-values for \fBlines\fP and \fBcolumns\fP specified in
+values for
+.B \%lines
+and
+.B \%columns
+specified in
 .I \%term\%info
 are used.
 .bP
 Otherwise,
-if the environment variables \fILINES\fP and \fI\%COLUMNS\fP exist,
+if the environment variables
+.I LINES
+and
+.I \%COLUMNS
+exist,
 their values are used.
-If these environment variables do not
-exist and the program is running in a window, the current window size
+If these environment variables do not exist and the program is running
+in a window,
+the current window size
 is used.
-Otherwise, if the environment variables do not exist, the
-values for \fBlines\fP and \fBcolumns\fP specified in the
+Otherwise,
+if the environment variables do not exist,
+the values for
+.B \%lines
+and
+.B \%columns
+specified in the
 .I \%term\%info
 database are used.
 .PP
-Parameterized strings should be passed through \fBtparm\fP to instantiate them.
+Parameterized strings should be passed through \fB\%tparm\fP to
+instantiate them.
 All
 .I \%term\%info
 strings
-(including the output of \fBtparm\fP)
-should be printed
-with \fBtputs\fP or \fBputp\fP.
-Call \fBreset_shell_mode\fP to restore the
-tty modes before exiting [see \fBcurs_kernel\fP(3X)].
-.PP
-Programs which use
+(including the output of \fB\%tparm\fP)
+should be sent to the terminal device with \fB\%tputs\fP or
+\fB\%putp\fP.
+Call \fB\%reset_shell_mode\fP to restore the terminal modes before
+exiting;
+see \fB\%curs_kernel\fP(3X).
+.PP
+Programs that use
 cursor addressing should
 .bP
-output \fBenter_ca_mode\fP upon startup and
+output \fB\%enter_ca_mode\fP upon startup and
 .bP
-output \fBexit_ca_mode\fP before exiting.
+output \fB\%exit_ca_mode\fP before exiting.
 .PP
-Programs which execute shell subprocesses should
+Programs that execute shell subprocesses should
 .bP
-call \fBreset_shell_mode\fP and
-output \fBexit_ca_mode\fP before the shell
+call \fB\%reset_shell_mode\fP and
+output \fB\%exit_ca_mode\fP before the shell
 is called and
 .bP
-output \fBenter_ca_mode\fP and
-call \fBreset_prog_mode\fP after returning from the shell.
+output \fB\%enter_ca_mode\fP and
+call \fB\%reset_prog_mode\fP after returning from the shell.
 .PP
-The \fB\%setupterm\fP routine reads in the
+\fB\%setupterm\fP reads in the
 .I \%term\%info
 database,
 initializing the
@@ -210,49 +229,84 @@ initializing the
 structures,
 but does not set up the output virtualization structures used by
 .I curses.
-These are its parameters:
+Its parameters follow.
 .RS 3
 .TP 5
-\fIterm\fP
-is the terminal type, a character string.
-If \fIterm\fP is null,
-the environment variable \fITERM\fP is used.
+.I term
+is the terminal type,
+a character string.
+If
+.I term
+is null,
+the environment variable
+.I TERM
+is read.
 .TP 5
-\fIfiledes\fP
+.I filedes
 is the file descriptor used for getting and setting terminal I/O modes.
 .IP
-Higher-level applications use \fBnewterm\fP(3X) for initializing the terminal,
-passing an output \fIstream\fP rather than a \fIdescriptor\fP.
-In curses, the two are the same because \fBnewterm\fP calls \fBsetupterm\fP,
+Higher-level applications use \fB\%newterm\fP(3X) to initialize the
+terminal,
+passing an output
+.I stream
+rather than a
+.I descriptor.
+In
+.I curses,
+the two are the same because \fB\%newterm\fP calls \fB\%setupterm\fP,
 passing the file descriptor derived from its output stream parameter.
 .TP 5
-\fIerrret\fP
+.I errret
 points to an optional location where an error status can be returned to
 the caller.
-If \fIerrret\fP is not null,
-then \fBsetupterm\fP returns \fBOK\fP or
-\fBERR\fP and stores a status value in the integer pointed to by
-\fIerrret\fP.
-A return value of \fBOK\fP combined with status of \fB1\fP in \fIerrret\fP
+If
+.I errret
+is not null,
+then \fB\%setupterm\fP returns
+.B OK
+or
+.B ERR
+and stores a status value in the integer pointed to by
+.I errret.
+A return value of
+.B OK
+combined with status of
+.B 1
+in
+.I errret
 is normal.
 .IP
-If \fBERR\fP is returned, examine \fIerrret\fP:
+If
+.B ERR
+is returned,
+examine
+.I errret:
 .RS
 .TP 5
 .B 1
-means that the terminal is hardcopy, cannot be used
-for \fIcurses\fP applications.
+means that the terminal is hardcopy,
+and cannot be used for
+.I curses
+applications.
 .IP
 \fB\%setupterm\fP determines if the entry is a hardcopy type by
-checking the \fBhc\fP (\fBhardcopy\fP) capability.
+checking the
+.B \%hardcopy
+.RB ( hc )
+capability.
 .TP 5
 .B 0
 means that the terminal could not be found,
 or that it is a generic type,
-having too little information for \fIcurses\fP applications to run.
+having too little information for
+.I curses
+applications to run.
 .IP
 \fB\%setupterm\fP determines if the entry is a generic type by
-checking the \fBgn\fP \%(\fBgeneric_type\fP) capability.
+checking the
+.B \%generic_type
+.RB ( gn )
+capability.
 .TP 5
 .B \-1
 means that the
@@ -260,31 +314,40 @@ means that the
 database could not be found.
 .RE
 .IP
-If \fIerrret\fP is
-null, \fB\%setupterm\fP prints an error message upon finding an error
-and exits.
-Thus, the simplest call is:
+If
+.I errret
+is null,
+\fB\%setupterm\fP reports an error message upon finding an error and
+exits.
+Thus,
+the simplest call is:
 .RS
 .IP
-\fBsetupterm((char *)0, 1, (int *)0);\fP
+.EX
+setupterm((char *)0, 1, (int *)0);
+.EE
 .RE
 .IP
-which uses all the defaults and sends the output to \fBstdout\fP.
+which uses all the defaults and sends the output to
+.BR stdout .
 .RE
-.\" ***************************************************************************
+.\" ********************************************************************
 .SS "The Terminal State"
-The \fBsetupterm\fP routine stores its information about the terminal
-in a \fI\%TERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
+\fB\%setupterm\fP stores its information about the terminal in a
+.I \%TERMINAL
+structure pointed to by the global variable \fB\%cur_term\fP.
 If it detects an error,
-or decides that the terminal is unsuitable (hardcopy or generic),
+or decides that the terminal is unsuitable
+(hardcopy or generic),
 it discards this information,
 making it not available to applications.
 .PP
-If \fBsetupterm\fP is called repeatedly for the same terminal type,
+If \fB\%setupterm\fP is called repeatedly for the same terminal type,
 it will reuse the information.
 It maintains only one copy of a given terminal's capabilities in memory.
 If it is called for different terminal types,
-\fBsetupterm\fP allocates new storage for each set of terminal capabilities.
+\fB\%setupterm\fP allocates new storage for each set of terminal
+capabilities.
 .PP
 \fB\%set_curterm\fP sets \fB\%cur_term\fP to
 .I \%nterm,
@@ -296,7 +359,7 @@ and string variables use the values from
 .I \%nterm.
 It returns the old value of \fB\%cur_term\fP.
 .PP
-\fB\%del_curterm\fP routine frees the space pointed to by
+\fB\%del_curterm\fP frees the space pointed to by
 .I \%oterm
 and makes it available for further use.
 If
@@ -310,29 +373,42 @@ numeric,
 and string variables thereafter may refer to invalid memory locations
 until another \fB\%setupterm\fP has been called.
 .PP
-The \fBrestartterm\fP routine is similar to \fBsetupterm\fP and \fBinitscr\fP,
-except that it is called after restoring memory to a previous state (for
-example, when reloading a game saved as a core image dump).
-\fBrestartterm\fP assumes that the windows and the input and output options
-are the same as when memory was saved,
+\fB\%restartterm\fP is similar to \fB\%setupterm\fP and \fB\%initscr\fP,
+except that it is called after restoring memory to a previous state
+(for example,
+when reloading a game saved as a core image dump).
+\fB\%restartterm\fP assumes that the windows and the input and output
+options are the same as when memory was saved,
 but the terminal type and baud rate may be different.
-Accordingly, \fBrestartterm\fP saves various tty state bits,
-calls \fBsetupterm\fP, and then restores the bits.
-.\" ***************************************************************************
+Accordingly,
+\fB\%restartterm\fP saves various terminal state bits,
+calls \fB\%setupterm\fP,
+and then restores the bits.
+.\" ********************************************************************
 .SS "Formatting Output"
-The \fBtparm\fP routine instantiates the string \fIstr\fP with
-parameters \fIpi\fP.  A pointer is returned to the result of \fIstr\fP
+\fB\%tparm\fP instantiates the string
+.I str
+with parameters
+.I pi.
+A pointer is returned to the result of
+.I str
 with the parameters applied.
-Application developers should keep in mind these quirks of the interface:
+Application developers should keep in mind these quirks of the
+interface:
 .bP
-Although \fBtparm\fP's actual parameters may be integers or strings,
-the prototype expects \fBlong\fP (integer) values.
+Although \fB\%tparm\fP's actual parameters may be integers or strings,
+the prototype expects
+.I long
+(integer) values.
 .bP
-Aside from the \fBset_attributes\fP (\fBsgr\fP) capability,
+Aside from the
+.B \%set_attributes\fP
+.RB ( sgr )
+capability,
 most terminal capabilities require no more than one or two parameters.
 .bP
-Padding information is ignored by \fBtparm\fP;
-it is interpreted by \fBtputs\fP.
+Padding information is ignored by \fB\%tparm\fP;
+it is interpreted by \fB\%tputs\fP.
 .bP
 The capability string is null-terminated.
 Use \*(``\e200\*('' where an ASCII NUL is needed in the output.
@@ -345,22 +421,28 @@ Its numeric parameters are
 rather than
 .IR long s.
 .PP
-Both \fBtparm\fP and \fBtiparm\fP assume that the application passes
+Both \fB\%tparm\fP and \fB\%tiparm\fP assume that the application passes
 parameters consistent with the terminal description.
-Two extensions are provided as alternatives to deal with untrusted data:
+Two extensions are provided as alternatives to deal with untrusted data.
 .bP
-\fBtiparm_s\fP is an extension which is a safer formatting function
-than \fBtparm\fR or \fBtiparm\fR,
-because it allows the developer to tell the curses
+\fB\%tiparm_s\fP is an extension which is a safer formatting function
+than \fB\%tparm\fR or \fB\%tiparm\fR,
+because it allows the developer to tell the
+.I curses
 library how many parameters to expect in the parameter list,
 and which may be string parameters.
 .IP
 The \fImask\fP parameter has one bit set for each of the parameters
-(up to 9) which will be passed as char* rather than numbers.
+(up to 9)
+passed as
+.I char
+pointers rather than numbers.
 .bP
-The extension \fBtiscan_s\fP allows the application
-to inspect a formatting capability to see what the curses library would assume.
-.\" ***************************************************************************
+The extension \fB\%tiscan_s\fP allows the application to inspect a
+formatting capability to see what the
+.I curses
+library would assume.
+.\" ********************************************************************
 .SS "Output Functions"
 String capabilities can contain padding information,
 a time delay
@@ -371,41 +453,65 @@ If \fIn\fP exceeds 30,000
 (thirty seconds),
 it is capped at that value.
 .PP
-The \fBtputs\fP routine interprets time-delay information in the string
-\fIstr\fP and outputs it, executing the delays:
+\fB\%tputs\fP interprets time-delay information in the string
+.I str
+and outputs it,
+executing the delays:
 .bP
-The \fIstr\fP parameter must be a terminfo string
-variable or the return value from
-\fBtparm\fP, \fBtiparm\fP, \fBtgetstr\fP, or \fBtgoto\fP.
+The
+.I str
+parameter must be a
+.I \%term\%info
+string variable or the return value of
+\fB\%tparm\fP,
+\fB\%tiparm\fP,
+\fB\%tgetstr\fP,
+or \fB\%tgoto\fP.
 .IP
-The \fBtgetstr\fP and \fBtgoto\fP functions are part of the \fItermcap\fP
+The \fB\%tgetstr\fP and \fB\%tgoto\fP functions are part of the
+.I termcap
 interface,
-which happens to share this function name with the
+which happens to share these function names with the
 .I \%term\%info
-interface.
+API.
 .bP
-\fIaffcnt\fP is the number of lines affected, or 1 if
-not applicable.
+.I affcnt
+is the number of lines affected,
+or
+.B 1
+if not applicable.
 .bP
-\fIputc\fP is a \fI\%putchar\fP-like function to which
-the characters are passed, one at a time.
+.I putc
+is a
+.IR \%putchar -like
+function to which the characters are passed,
+one at a time.
 .IP
-If \fBtputs\fP processes a time-delay,
-it uses the \fBdelay_output\fP(3X) function,
+If \fB\%tputs\fP processes a time-delay,
+it uses the \fB\%delay_output\fP(3X) function,
 routing any resulting padding characters through this function.
 .PP
-The \fBputp\fR routine calls \fBtputs(\fIstr\fB, 1, \%putchar)\fR.
-The output of \fBputp\fP always goes to \fBstdout\fP, rather than
-the \fIfiledes\fP specified in \fBsetupterm\fP.
-.PP
-The \fBvidputs\fP routine displays the string on the terminal in the
-video attribute mode \fIattrs\fP, which is any combination of the
-attributes listed in \fBcurses\fP(3X).
-The characters are passed to
-the \fI\%putchar\fP-like function \fIputc\fP.
-.PP
-The \fBvidattr\fP routine is like the \fBvidputs\fP routine, except
-that it outputs through \fI\%putchar\fP.
+\fB\%putp\fR calls
+.RB \%\*(`` tputs(\c
+.IB str ", 1, putchar)\c"
+\*(''.
+The output of \fB\%putp\fP always goes to
+.BR stdout ,
+rather than the
+.I \%file\%des
+specified in \fB\%setupterm\fP.
+.PP
+\fB\%vidputs\fP displays the string on the terminal in the video
+attribute mode
+.I attrs,
+which is any combination of the attributes listed in \fB\%curses\fP(3X).
+The characters are passed to the
+.IR \%putchar -like
+function
+.I putc.
+.PP
+\fB\%vidattr\fP is like \fB\%vidputs\fP,
+except that it outputs through \fI\%putchar\fP(3).
 .PP
 .B \%vid_attr
 and
@@ -442,62 +548,83 @@ argument for future use,
 saying that applications must provide a null pointer for that argument;
 but see section \*(``EXTENSIONS\*('' below.
 .PP
-The \fBmvcur\fP routine provides low-level cursor motion.
-It takes effect immediately (rather than at the next refresh).
+\fB\%mvcur\fP provides low-level cursor motion.
+It takes effect immediately
+(rather than at the next refresh).
 Unlike the other low-level output functions,
-which either write to the standard output or pass an output function parameter,
-\fBmvcur\fP uses an output file descriptor derived from
-the output stream parameter of \fBnewterm\fP(3X).
+which either write to the standard output or pass an output function
+parameter,
+\fB\%mvcur\fP uses an output file descriptor derived from
+the output stream parameter of \fB\%newterm\fP(3X).
 .PP
-While \fBputp\fP and \fBmvcur\fP are low-level functions which
-do not use the high-level curses state,
-they are declared in
+While \fB\%putp\fP and \fB\%mvcur\fP are low-level functions that do not
+use high-level
+.I curses
+state,
+.I \%ncurses
+declares them in
 .I \%curses.h
 because System\ V did this
-(see \fIHISTORY\fP).
-.\" ***************************************************************************
+(see section \*(``HISTORY\*('' below).
+.\" ********************************************************************
 .SS "Terminal Capability Functions"
-The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
-the value of the capability corresponding to the
+\fB\%tigetflag\fP,
+\fB\%tigetnum\fP,
+and \fB\%tigetstr\fP return the value of the capability corresponding to
+the
 .I \%term\%info
-\fIcapname\fP passed to them, such as \fBxenl\fP.
-The \fIcapname\fP for each capability is given in the table column entitled
-\fIcapname\fP code in the capabilities section of \fB\%terminfo\fP(5).
+.I cap-code,
+such as
+.BR xenl ,
+passed to them.
+The
+.I cap-code
+for each capability is given in the table column entitled
+.I cap-code
+code in the capabilities section of \fB\%terminfo\fP(5).
 .PP
-These routines return special values to denote errors.
+These functions return special values to denote errors.
 .PP
-The \fBtigetflag\fP routine returns
+\fB\%tigetflag\fP returns
 .TP
-\fB\-1\fP
-if \fIcapname\fP is not a Boolean capability,
+.B \-1
+if
+.I cap-code
+is not a Boolean capability,
 or
 .TP
-\fB0\fP
+.B 0
 if it is canceled or absent from the terminal description.
 .PP
-The \fBtigetnum\fP routine returns
+\fB\%tigetnum\fP returns
 .TP
-\fB\-2\fP
-if \fIcapname\fP is not a numeric capability, or
+.B \-2
+if
+.I cap-code
+is not a numeric capability,
+or
 .TP
-\fB\-1\fP
+.B \-1
 if it is canceled or absent from the terminal description.
 .PP
-The \fBtigetstr\fP routine returns
+\fB\%tigetstr\fP returns
 .TP
-\fB(char *)\-1\fP
-if \fIcapname\fP is not a string capability,
+.B "(char *)\-1"
+if
+.I cap-code
+is not a string capability,
 or
 .TP
-\fB0\fP
+.B 0
 if it is canceled or absent from the terminal description.
-.\" ***************************************************************************
+.\" ********************************************************************
 .SS "Terminal Capability Names"
 These null-terminated arrays contain
 .bP
 the short \fI\%term\%info\fP names (\*(``codes\*(''),
 .bP
-the \fItermcap\fP names (\*(``names\*(''), and
+the \fItermcap\fP names (\*(``names\*(''),
+and
 .bP
 the long \fI\%term\%info\fP names (\*(``fnames\*('')
 .PP
@@ -512,71 +639,90 @@ variables:
 \fBconst char *strnames[]\fP, \fB*strcodes[]\fP, \fB*strfnames[]\fP
 .fi
 .RE
-.\" ***************************************************************************
+.\" ********************************************************************
 .SS "Releasing Memory"
-Each successful call to \fBsetupterm\fP allocates memory to hold the terminal
-description.
-As a side-effect, it sets \fBcur_term\fP to point to this memory.
+Each successful call to \fB\%setupterm\fP allocates memory to hold the
+terminal description.
+As a side effect,
+it sets \fB\%cur_term\fP to point to this memory.
 If an application calls
 .IP
-\fBdel_curterm(cur_term);\fP
+.EX
+del_curterm(cur_term);
+.EE
 .PP
 the memory will be freed.
 .PP
-The formatting functions \fBtparm\fP and \fBtiparm\fP extend the storage
-allocated by \fBsetupterm\fP:
+The formatting functions \fB\%tparm\fP and \fB\%tiparm\fP extend the
+storage allocated by \fB\%setupterm\fP as follows.
 .bP
-the \*(``static\*('' terminfo variables [a-z].
-Before \fI\%ncurses\fP 6.3, those were shared by all screens.
-With \fI\%ncurses\fP 6.3, those are allocated per screen.
-See \fB\%terminfo\fP(5) for details.
+They add the \*(``static\*(''
+.I \%term\%info
+variables [a-z].
+Before
+.I \%ncurses
+6.3,
+those were shared by all screens.
+With
+.I \%ncurses
+6.3,
+those are allocated per screen.
+See \fB\%terminfo\fP(5).
 .bP
-to improve performance,
-\fI\%ncurses\fP 6.3 caches the result of analyzing terminfo
+To improve performance,
+.I \%ncurses
+6.3 caches the result of analyzing
+.I \%term\%info
 strings for their parameter types.
-That is stored as a binary tree referenced from the \fI\%TERMINAL\fP structure.
+That is stored as a binary tree referenced from the
+.I \%TERMINAL
+structure.
 .PP
-The higher-level \fBinitscr\fP and \fBnewterm\fP functions use \fBsetupterm\fP.
-Normally they do not free this memory, but it is possible to do that using
-the \fBdelscreen\fP(3X) function.
-.\" ***************************************************************************
+The higher-level \fB\%initscr\fP and \fB\%newterm\fP functions use
+\fB\%setupterm\fP.
+Normally they do not free this memory,
+but it is possible to do that using the \fB\%delscreen\fP(3X) function.
+.\" ********************************************************************
 .SH RETURN VALUE
-X/Open defines no failure conditions.
+X/Open Curses defines no failure conditions.
 In
 .I \%ncurses,
 .TP 5
-\fBdel_curterm\fP
-returns an error
-if its terminal parameter is null.
+.B del_curtem
+fails if its terminal parameter is null.
 .TP 5
-\fBputp\fP
-calls \fBtputs\fP, returning the same error-codes.
+.B putp
+calls \fB\%tputs\fP,
+returning the same error codes.
 .TP 5
-\fBrestartterm\fP
-returns an error
-if the associated call to \fBsetupterm\fP returns an error.
+.B restartterm
+fails if the associated call to \fB\%setupterm\fP returns an error.
 .TP 5
-\fBsetupterm\fP
-returns an error
-if it cannot allocate enough memory, or
-create the initial windows
+.B setupterm
+fails if it cannot allocate enough memory,
+or create the initial windows
 .RB ( \%stdscr ,
 .BR \%curscr ,
 and
 .BR \%newscr )
 Other error conditions are documented above.
 .TP 5
-\fBtparm\fP
-returns a null if the capability would require unexpected parameters,
-e.g., too many, too few, or incorrect types
-(strings where integers are expected, or vice versa).
+.B tparm
+returns a null pointer if the capability would require unexpected
+parameters;
+that is,
+too many,
+too few,
+or incorrect types
+(strings where integers are expected,
+or vice versa).
 .TP 5
-\fBtputs\fP
-returns an error if the string parameter is null.
+.B tputs
+fails if the string parameter is null.
 It does not detect I/O errors:
-X/Open Curses states that \fBtputs\fP ignores the return value
-of the output function \fIputc\fP.
-.\" ***************************************************************************
+X/Open Curses states that \fB\%tputs\fP ignores the return value
+of the output function \fI\%putc\fP.
+.\" ********************************************************************
 .SH NOTES
 The
 .B \%vid_attr
@@ -590,7 +736,7 @@ before other parts of the
 wide-character API were developed,
 and unlike the other wide-character functions,
 is also provided in the non-wide-character configuration.
-.\" ***************************************************************************
+.\" ********************************************************************
 .SH EXTENSIONS
 The functions marked as extensions were designed for
 .I \%ncurses,
@@ -598,7 +744,9 @@ and are not found in SVr4
 .IR curses ,
 4.4BSD
 .IR curses ,
-or any other previous curses implementation.
+or any other previous
+.I curses
+implementation.
 .PP
 .I \%ncurses
 allows
@@ -609,7 +757,7 @@ which overrides the
 .I pair
 .RI ( short )
 argument.
-.\" ***************************************************************************
+.\" ********************************************************************
 .SH PORTABILITY
 \fB\%setterm\fP is not described by X/Open and must be considered
 non-portable.
@@ -624,7 +772,8 @@ They include
 \fB\%Bgettmode\fP,
 \fB\%Bnocrmode\fP,
 \fB\%Bresetterm\fP,
-\fB\%Bsaveterm\fP, and
+\fB\%Bsaveterm\fP,
+and
 \fB\%Bsetterm\fP.
 .PP
 In SVr4,
@@ -650,7 +799,8 @@ implements each of these symbols as macros for BSD
 compatibility.
 .SS "Legacy Data"
 \fB\%setupterm\fP copies the terminal name to the array \fB\%ttytype\fP.
-This is not part of X/Open Curses, but is assumed by some applications.
+This is not part of X/Open Curses,
+but is assumed by some applications.
 .PP
 Other implementions may not declare the capability name arrays.
 Some provide them without declaring them.
@@ -658,7 +808,7 @@ X/Open does not specify them.
 .PP
 Extended terminal capability names,
 as defined by
-.RB \%\*(`` "@TIC@\ \-x" \*('',
+.RB \%\*(`` "@TIC@ \-x" \*('',
 are not stored in the arrays described here.
 .SS "Output Buffering"
 Older versions of \fI\%ncurses\fP assumed that the file descriptor
@@ -716,9 +866,9 @@ X/Open Curses prototypes \fB\%tparm\fP with a fixed number of
 parameters,
 rather than a variable argument list.
 .IP
-This implementation uses a variable argument list, but can be
-configured to use the fixed-parameter list.
-Portable applications should provide 9 parameters after the format;
+This implementation uses a variable argument list,
+but can be configured to use the fixed-parameter list.
+Portable applications should provide nine parameters after the format;
 zeroes are fine for this purpose.
 .IP
 In response to review comments by Thomas E. Dickey,
@@ -738,15 +888,22 @@ Using
 .I long
 for the numeric parameter type is a workaround to make the parameter use
 the same amount of stack as a pointer.
-That approach dates back to the mid-1980s, before C was standardized.
-Since then, there is a standard
-(and pointers are not required to fit in a long).
+That approach dates back to the mid-1980s,
+before C was standardized.
+Since then,
+there is a standard
+(and pointers are not required to fit in a
+.IR long ).
 .bP
 Providing the right number of parameters for a variadic function
 such as \fB\%tiparm\fP can be a problem,
 in particular for string parameters.
-However, only a few terminfo capabilities use string parameters
-(e.g., the ones used for programmable function keys).
+However,
+only a few
+.I \%term\%info
+capabilities use string parameters
+(for instance,
+the ones used for programmable function keys).
 .IP
 The \fI\%ncurses\fP library checks usage of these capabilities,
 and returns an error if the capability mishandles string parameters.
@@ -757,17 +914,22 @@ The \fB\%@TPUT@\fR(1) program checks its use of these capabilities with
 a table,
 so that it calls \fB\%tparm\fP correctly.
 .SS "Special \fITERM\fP treatment"
-If configured to use the terminal-driver,
-e.g., for the MinGW port,
+If configured to use the terminal driver,
+.\" XXX: as opposed to the Unix terminal driver, termio(s)?
+as with the MinGW port,
 .bP
 \fB\%setupterm\fP interprets a missing/empty \fITERM\fP variable as the
 special value \*(``unknown\*(''.
 .IP
-SVr4 curses uses the
-special value \*(``dumb\*(''.
+SVr4
+.I curses
+uses the special value \*(``dumb\*(''.
 .IP
-The difference between the two is that
-the former uses the \fBgn\fP (\fB\%generic_type\fR) terminfo capability,
+The difference between the two is that the former uses the
+.B \%generic_type
+.RB ( gn )
+.I \%term\%info
+capability,
 while the latter does not.
 A generic terminal is unsuitable for full-screen applications.
 .bP
@@ -818,14 +980,27 @@ function,
 .I curses
 function that is not well specified.
 .PP
-X/Open notes that after calling \fBmvcur\fP, the curses state may not match the
-actual terminal state, and that an application should touch and refresh
-the window before resuming normal curses calls.
-Both \fI\%ncurses\fP and System V Release 4 curses implement \fBmvcur\fP
-using the \fISCREEN\fP data allocated in either \fBinitscr\fP or
-\fBnewterm\fP.
-So though it is documented as a terminfo function,
-\fBmvcur\fP is really a curses function which is not well specified.
+X/Open notes that after calling \fB\%mvcur\fP,
+the
+.I curses
+state may not match the actual terminal state,
+and that an application should touch and refresh the window before
+resuming normal
+.I curses
+calls.
+Both
+.I \%ncurses
+and SVr4
+.I curses
+implement \fB\%mvcur\fP using the
+.I SCREEN
+data allocated in either \fB\%initscr\fP or \fB\%newterm\fP.
+So though it is documented as a
+.I \%term\%info
+function,
+\fB\%mvcur\fP is really a
+.I curses
+function that is not well specified.
 .PP
 X/Open Curses states that the old location must be given for
 \fB\%mvcur\fP to accommodate terminals that lack absolute cursor
@@ -836,10 +1011,14 @@ allows the caller to use \-1 for either or both old coordinates.
 The \-1 tells
 .I \%ncurses
 that the old location is unknown,
-and that it must use only absolute motion
-(such as \fI\%cursor_address\fP)
-rather than the least costly combination of absolute and relative motion.
-.\" ***************************************************************************
+and that it must use only absolute motion,
+as with the
+.B \%cursor_address
+.RB ( cup )
+capability,
+rather than the least costly combination of absolute and relative
+motion.
+.\" ********************************************************************
 .SH HISTORY
 SVr2 (1984) introduced the
 .I \%term\%info
@@ -851,20 +1030,23 @@ lB lB
 lB lx.
 Function	Description
 _
-fixterm	restore tty to \*(``in curses\*('' state
-gettmode	establish current tty modes
+fixterm	restore terminal to \*(``in \fIcurses\fP\*('' state
+gettmode	establish current terminal modes
 mvcur	low level cursor motion
-putp	use \fBtputs\fP to send characters via \fI\%putchar\fP
-resetterm	set tty modes to \*(``out of curses\*('' state
-resetty	reset tty flags to stored value
-saveterm	save current modes as \*(``in curses\*('' state
-savetty	store current tty flags
+putp	use \fBtputs\fP to send characters via \fIputchar\fP
+resetterm	set terminal modes to \*(``out of \fIcurses\fP\*(''\
+ state
+resetty	reset terminal flags to stored value
+saveterm	save current modes as \*(``in \fIcurses\fP\*('' state
+savetty	store current terminal flags
 setterm	establish terminal with given type
 setupterm	establish terminal with given type
 tparm	interpolate parameters into string capability
 tputs	apply padding information to a string
 vidattr	like \fBvidputs\fP, but output through \fIputchar\fP
-vidputs	write string to terminal, applying specified attributes
+vidputs	T{
+write string to terminal, applying specified attributes
+T}
 .TE
 .PP
 The programming manual also mentioned
@@ -883,7 +1065,9 @@ tgetflag	get Boolean entry for given \fIid\fP
 tgetnum	get numeric entry for given \fIid\fP
 tgetstr	get string entry for given \fIid\fP
 tgoto	apply parameters to given capability
-tputs	write characters via a function parameter, applying padding
+tputs	T{
+write characters via a function parameter, applying padding
+T}
 .TE
 .PP
 Early
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 1e4254406..0d327c293 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2021-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2021-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.51 2023/12/23 16:22:25 tom Exp $
-.TH curs_threads 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.54 2024/01/13 22:05:39 tom Exp $
+.TH curs_threads 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -160,462 +160,462 @@ The following table lists the scope of each symbol in the
 applications.
 .PP
 .TS
-center tab(/);
-lb lb
-lb l .
-Symbol/Scope
-=
-BC/global
-COLORS/screen (read-only)
-COLOR_PAIR/reentrant
-COLOR_PAIRS/screen (read-only)
-COLS/screen (read-only)
-ESCDELAY/screen (read-only; see \fBset_escdelay\fP)
-LINES/screen (read-only)
-PAIR_NUMBER/reentrant
-PC/global
-SP/global
-TABSIZE/screen (read-only; see \fBset_tabsize\fP)
-UP/global
-acs_map/screen (read-only)
-add_wch/window (\fBstdscr\fP)
-add_wchnstr/window (\fBstdscr\fP)
-add_wchstr/window (\fBstdscr\fP)
-addch/window (\fBstdscr\fP)
-addchnstr/window (\fBstdscr\fP)
-addchstr/window (\fBstdscr\fP)
-addnstr/window (\fBstdscr\fP)
-addnwstr/window (\fBstdscr\fP)
-addstr/window (\fBstdscr\fP)
-addwstr/window (\fBstdscr\fP)
-assume_default_colors/screen
-attr_get/window (\fBstdscr\fP)
-attr_off/window (\fBstdscr\fP)
-attr_on/window (\fBstdscr\fP)
-attr_set/window (\fBstdscr\fP)
-attroff/window (\fBstdscr\fP)
-attron/window (\fBstdscr\fP)
-attrset/window (\fBstdscr\fP)
-baudrate/screen
-beep/screen
-bkgd/window (\fBstdscr\fP)
-bkgdset/window (\fBstdscr\fP)
-bkgrnd/window (\fBstdscr\fP)
-bkgrndset/window (\fBstdscr\fP)
-boolcodes/global (read-only)
-boolfnames/global (read-only)
-boolnames/global (read-only)
-border/window (\fBstdscr\fP)
-border_set/window (\fBstdscr\fP)
-box/window (\fBstdscr\fP)
-box_set/window (\fBstdscr\fP)
-can_change_color/terminal
-cbreak/screen
-chgat/window (\fBstdscr\fP)
-clear/window (\fBstdscr\fP)
-clearok/window
-clrtobot/window (\fBstdscr\fP)
-clrtoeol/window (\fBstdscr\fP)
-color_content/screen
-color_set/window (\fBstdscr\fP)
-copywin/window (locks source, target)
-cur_term/terminal
-curs_set/screen
-curscr/screen (read-only)
-curses_version/global (read-only)
-def_prog_mode/terminal
-def_shell_mode/terminal
-define_key/screen
-del_curterm/screen
-delay_output/screen
-delch/window (\fBstdscr\fP)
-deleteln/window (\fBstdscr\fP)
-delscreen/global (locks screen list, screen)
-delwin/global (locks window list)
-derwin/screen
-doupdate/screen
-dupwin/screen (locks window)
-echo/screen
-echo_wchar/window (\fBstdscr\fP)
-echochar/window (\fBstdscr\fP)
-endwin/screen
-erase/window (\fBstdscr\fP)
-erasechar/window (\fBstdscr\fP)
-erasewchar/window (\fBstdscr\fP)
-filter/global
-flash/terminal
-flushinp/screen
-get_wch/screen (input operation)
-get_wstr/screen (input operation)
-getattrs/window
-getbegx/window
-getbegy/window
-getbkgd/window
-getbkgrnd/window
-getcchar/reentrant
-getch/screen (input operation)
-getcurx/window
-getcury/window
-getmaxx/window
-getmaxy/window
-getmouse/screen (input operation)
-getn_wstr/screen (input operation)
-getnstr/screen (input operation)
-getparx/window
-getpary/window
-getstr/screen (input operation)
-getwin/screen (input operation)
-halfdelay/screen
-has_colors/terminal
-has_ic/terminal
-has_il/terminal
-has_key/screen
-hline/window (\fBstdscr\fP)
-hline_set/window (\fBstdscr\fP)
-idcok/window
-idlok/window
-immedok/window
-in_wch/window (\fBstdscr\fP)
-in_wchnstr/window (\fBstdscr\fP)
-in_wchstr/window (\fBstdscr\fP)
-inch/window (\fBstdscr\fP)
-inchnstr/window (\fBstdscr\fP)
-inchstr/window (\fBstdscr\fP)
-init_color/screen
-init_pair/screen
-initscr/global (locks screen list)
-innstr/window (\fBstdscr\fP)
-innwstr/window (\fBstdscr\fP)
-ins_nwstr/window (\fBstdscr\fP)
-ins_wch/window (\fBstdscr\fP)
-ins_wstr/window (\fBstdscr\fP)
-insch/window (\fBstdscr\fP)
-insdelln/window (\fBstdscr\fP)
-insertln/window (\fBstdscr\fP)
-insnstr/window (\fBstdscr\fP)
-insstr/window (\fBstdscr\fP)
-instr/window (\fBstdscr\fP)
-intrflush/terminal
-inwstr/window (\fBstdscr\fP)
-is_cleared/window
-is_idcok/window
-is_idlok/window
-is_immedok/window
-is_keypad/window
-is_leaveok/window
-is_linetouched/window
-is_nodelay/window
-is_notimeout/window
-is_scrollok/window
-is_syncok/window
-is_term_resized/terminal
-is_wintouched/window
-isendwin/screen
-key_defined/screen
-key_name/global (static data)
-keybound/screen
-keyname/global (static data)
-keyok/screen
-keypad/window
-killchar/terminal
-killwchar/terminal
-leaveok/window
-longname/screen
-mcprint/terminal
-meta/screen
-mouse_trafo/window (\fBstdscr\fP)
-mouseinterval/screen
-mousemask/screen
-move/window (\fBstdscr\fP)
-mvadd_wch/window (\fBstdscr\fP)
-mvadd_wchnstr/window (\fBstdscr\fP)
-mvadd_wchstr/window (\fBstdscr\fP)
-mvaddch/window (\fBstdscr\fP)
-mvaddchnstr/window (\fBstdscr\fP)
-mvaddchstr/window (\fBstdscr\fP)
-mvaddnstr/window (\fBstdscr\fP)
-mvaddnwstr/window (\fBstdscr\fP)
-mvaddstr/window (\fBstdscr\fP)
-mvaddwstr/window (\fBstdscr\fP)
-mvchgat/window (\fBstdscr\fP)
-mvcur/screen
-mvdelch/window (\fBstdscr\fP)
-mvderwin/window (\fBstdscr\fP)
-mvget_wch/screen (input operation)
-mvget_wstr/screen (input operation)
-mvgetch/screen (input operation)
-mvgetn_wstr/screen (input operation)
-mvgetnstr/screen (input operation)
-mvgetstr/screen (input operation)
-mvhline/window (\fBstdscr\fP)
-mvhline_set/window (\fBstdscr\fP)
-mvin_wch/window (\fBstdscr\fP)
-mvin_wchnstr/window (\fBstdscr\fP)
-mvin_wchstr/window (\fBstdscr\fP)
-mvinch/window (\fBstdscr\fP)
-mvinchnstr/window (\fBstdscr\fP)
-mvinchstr/window (\fBstdscr\fP)
-mvinnstr/window (\fBstdscr\fP)
-mvinnwstr/window (\fBstdscr\fP)
-mvins_nwstr/window (\fBstdscr\fP)
-mvins_wch/window (\fBstdscr\fP)
-mvins_wstr/window (\fBstdscr\fP)
-mvinsch/window (\fBstdscr\fP)
-mvinsnstr/window (\fBstdscr\fP)
-mvinsstr/window (\fBstdscr\fP)
-mvinstr/window (\fBstdscr\fP)
-mvinwstr/window (\fBstdscr\fP)
-mvprintw/window (\fBstdscr\fP)
-mvscanw/screen
-mvvline/window (\fBstdscr\fP)
-mvvline_set/window (\fBstdscr\fP)
-mvwadd_wch/window
-mvwadd_wchnstr/window
-mvwadd_wchstr/window
-mvwaddch/window
-mvwaddchnstr/window
-mvwaddchstr/window
-mvwaddnstr/window
-mvwaddnwstr/window
-mvwaddstr/window
-mvwaddwstr/window
-mvwchgat/window
-mvwdelch/window
-mvwget_wch/screen (input operation)
-mvwget_wstr/screen (input operation)
-mvwgetch/screen (input operation)
-mvwgetn_wstr/screen (input operation)
-mvwgetnstr/screen (input operation)
-mvwgetstr/screen (input operation)
-mvwhline/window
-mvwhline_set/window
-mvwin/window
-mvwin_wch/window
-mvwin_wchnstr/window
-mvwin_wchstr/window
-mvwinch/window
-mvwinchnstr/window
-mvwinchstr/window
-mvwinnstr/window
-mvwinnwstr/window
-mvwins_nwstr/window
-mvwins_wch/window
-mvwins_wstr/window
-mvwinsch/window
-mvwinsnstr/window
-mvwinsstr/window
-mvwinstr/window
-mvwinwstr/window
-mvwprintw/window
-mvwscanw/screen
-mvwvline/window
-mvwvline_set/window
-napms/reentrant
-newpad/global (locks window list)
-newscr/screen (read-only)
-newterm/global (locks screen list)
-newwin/global (locks window list)
-nl/screen
-nocbreak/screen
-nodelay/window
-noecho/screen
-nofilter/global
-nonl/screen
-noqiflush/terminal
-noraw/screen
-notimeout/window
-numcodes/global (read-only)
-numfnames/global (read-only)
-numnames/global (read-only)
-ospeed/global
-overlay/window (locks source, target)
-overwrite/window (locks source, target)
-pair_content/screen
-pecho_wchar/screen
-pechochar/screen
-pnoutrefresh/screen
-prefresh/screen
-printw/window
-putp/global
-putwin/window
-qiflush/terminal
-raw/screen
-redrawwin/window
-refresh/screen
-reset_prog_mode/screen
-reset_shell_mode/screen
-resetty/terminal
-resize_term/screen (locks window list)
-resizeterm/screen
-restartterm/screen
-ripoffline/global (static data)
-savetty/terminal
-scanw/screen
-scr_dump/screen
-scr_init/screen
-scr_restore/screen
-scr_set/screen
-scrl/window (\fBstdscr\fP)
-scroll/window
-scrollok/window
-set_curterm/screen
-set_escdelay/screen
-set_tabsize/screen
-set_term/global (locks screen list, screen)
-setcchar/reentrant
-setscrreg/window (\fBstdscr\fP)
-setupterm/global
-slk_attr/screen
-slk_attr_off/screen
-slk_attr_on/screen
-slk_attr_set/screen
-slk_attroff/screen
-slk_attron/screen
-slk_attrset/screen
-slk_clear/screen
-slk_color/screen
-slk_init/screen
-slk_label/screen
-slk_noutrefresh/screen
-slk_refresh/screen
-slk_restore/screen
-slk_set/screen
-slk_touch/screen
-slk_wset/screen
-standend/window
-standout/window
-start_color/screen
-\fBstdscr\fP/screen (read-only)
-strcodes/global (read-only)
-strfnames/global (read-only)
-strnames/global (read-only)
-subpad/window
-subwin/window
-syncok/window
-term_attrs/screen
-termattrs/screen
-termname/terminal
-tgetent/global
-tgetflag/global
-tgetnum/global
-tgetstr/global
-tgoto/global
-tigetflag/terminal
-tigetnum/terminal
-tigetstr/terminal
-timeout/window (\fBstdscr\fP)
-touchline/window
-touchwin/window
-tparm/global (static data)
-tputs/screen
-trace/global (static data)
-ttytype/screen (read-only)
-typeahead/screen
-unctrl/screen
-unget_wch/screen (input operation)
-ungetch/screen (input operation)
-ungetmouse/screen (input operation)
-untouchwin/window
-use_default_colors/screen
-use_env/global (static data)
-use_extended_names/global (static data)
-use_legacy_coding/screen
-use_screen/global (locks screen list, screen)
-use_window/global (locks window list, window)
-vid_attr/screen
-vid_puts/screen
-vidattr/screen
-vidputs/screen
-vline/window (\fBstdscr\fP)
-vline_set/window (\fBstdscr\fP)
-vw_printw/window
-vw_scanw/screen
-vwprintw/window
-vwscanw/screen
-wadd_wch/window
-wadd_wchnstr/window
-wadd_wchstr/window
-waddch/window
-waddchnstr/window
-waddchstr/window
-waddnstr/window
-waddnwstr/window
-waddstr/window
-waddwstr/window
-wattr_get/window
-wattr_off/window
-wattr_on/window
-wattr_set/window
-wattroff/window
-wattron/window
-wattrset/window
-wbkgd/window
-wbkgdset/window
-wbkgrnd/window
-wbkgrndset/window
-wborder/window
-wborder_set/window
-wchgat/window
-wclear/window
-wclrtobot/window
-wclrtoeol/window
-wcolor_set/window
-wcursyncup/screen (affects window plus parents)
-wdelch/window
-wdeleteln/window
-wecho_wchar/window
-wechochar/window
-wenclose/window
-werase/window
-wget_wch/screen (input operation)
-wget_wstr/screen (input operation)
-wgetbkgrnd/window
-wgetch/screen (input operation)
-wgetdelay/window
-wgetn_wstr/screen (input operation)
-wgetnstr/screen (input operation)
-wgetparent/window
-wgetscrreg/window
-wgetstr/screen (input operation)
-whline/window
-whline_set/window
-win_wch/window
-win_wchnstr/window
-win_wchstr/window
-winch/window
-winchnstr/window
-winchstr/window
-winnstr/window
-winnwstr/window
-wins_nwstr/window
-wins_wch/window
-wins_wstr/window
-winsch/window
-winsdelln/window
-winsertln/window
-winsnstr/window
-winsstr/window
-winstr/window
-winwstr/window
-wmouse_trafo/window
-wmove/window
-wnoutrefresh/screen
-wprintw/window
-wredrawln/window
-wrefresh/screen
-wresize/window (locks window list)
-wscanw/screen
-wscrl/window
-wsetscrreg/window
-wstandend/window
-wstandout/window
-wsyncdown/screen (affects window plus parents)
-wsyncup/screen (affects window plus parents)
-wtimeout/window
-wtouchln/window
-wunctrl/global (static data)
-wvline/window
-wvline_set/window
+center;
+Lb2 Lb
+Lb2 Lx.
+Symbol	Scope
+_
+BC	global
+COLORS	screen (read-only)
+COLOR_PAIR	reentrant
+COLOR_PAIRS	screen (read-only)
+COLS	screen (read-only)
+ESCDELAY	screen (read-only; see \fBset_escdelay\fP)
+LINES	screen (read-only)
+PAIR_NUMBER	reentrant
+PC	global
+SP	global
+TABSIZE	screen (read-only; see \fBset_tabsize\fP)
+UP	global
+acs_map	screen (read-only)
+add_wch	window (\fBstdscr\fP)
+add_wchnstr	window (\fBstdscr\fP)
+add_wchstr	window (\fBstdscr\fP)
+addch	window (\fBstdscr\fP)
+addchnstr	window (\fBstdscr\fP)
+addchstr	window (\fBstdscr\fP)
+addnstr	window (\fBstdscr\fP)
+addnwstr	window (\fBstdscr\fP)
+addstr	window (\fBstdscr\fP)
+addwstr	window (\fBstdscr\fP)
+assume_default_colors	screen
+attr_get	window (\fBstdscr\fP)
+attr_off	window (\fBstdscr\fP)
+attr_on	window (\fBstdscr\fP)
+attr_set	window (\fBstdscr\fP)
+attroff	window (\fBstdscr\fP)
+attron	window (\fBstdscr\fP)
+attrset	window (\fBstdscr\fP)
+baudrate	screen
+beep	screen
+bkgd	window (\fBstdscr\fP)
+bkgdset	window (\fBstdscr\fP)
+bkgrnd	window (\fBstdscr\fP)
+bkgrndset	window (\fBstdscr\fP)
+boolcodes	global (read-only)
+boolfnames	global (read-only)
+boolnames	global (read-only)
+border	window (\fBstdscr\fP)
+border_set	window (\fBstdscr\fP)
+box	window (\fBstdscr\fP)
+box_set	window (\fBstdscr\fP)
+can_change_color	terminal
+cbreak	screen
+chgat	window (\fBstdscr\fP)
+clear	window (\fBstdscr\fP)
+clearok	window
+clrtobot	window (\fBstdscr\fP)
+clrtoeol	window (\fBstdscr\fP)
+color_content	screen
+color_set	window (\fBstdscr\fP)
+copywin	window (locks source, target)
+cur_term	terminal
+curs_set	screen
+curscr	screen (read-only)
+curses_version	global (read-only)
+def_prog_mode	terminal
+def_shell_mode	terminal
+define_key	screen
+del_curterm	screen
+delay_output	screen
+delch	window (\fBstdscr\fP)
+deleteln	window (\fBstdscr\fP)
+delscreen	global (locks screen list, screen)
+delwin	global (locks window list)
+derwin	screen
+doupdate	screen
+dupwin	screen (locks window)
+echo	screen
+echo_wchar	window (\fBstdscr\fP)
+echochar	window (\fBstdscr\fP)
+endwin	screen
+erase	window (\fBstdscr\fP)
+erasechar	window (\fBstdscr\fP)
+erasewchar	window (\fBstdscr\fP)
+filter	global
+flash	terminal
+flushinp	screen
+get_wch	screen (input operation)
+get_wstr	screen (input operation)
+getattrs	window
+getbegx	window
+getbegy	window
+getbkgd	window
+getbkgrnd	window
+getcchar	reentrant
+getch	screen (input operation)
+getcurx	window
+getcury	window
+getmaxx	window
+getmaxy	window
+getmouse	screen (input operation)
+getn_wstr	screen (input operation)
+getnstr	screen (input operation)
+getparx	window
+getpary	window
+getstr	screen (input operation)
+getwin	screen (input operation)
+halfdelay	screen
+has_colors	terminal
+has_ic	terminal
+has_il	terminal
+has_key	screen
+hline	window (\fBstdscr\fP)
+hline_set	window (\fBstdscr\fP)
+idcok	window
+idlok	window
+immedok	window
+in_wch	window (\fBstdscr\fP)
+in_wchnstr	window (\fBstdscr\fP)
+in_wchstr	window (\fBstdscr\fP)
+inch	window (\fBstdscr\fP)
+inchnstr	window (\fBstdscr\fP)
+inchstr	window (\fBstdscr\fP)
+init_color	screen
+init_pair	screen
+initscr	global (locks screen list)
+innstr	window (\fBstdscr\fP)
+innwstr	window (\fBstdscr\fP)
+ins_nwstr	window (\fBstdscr\fP)
+ins_wch	window (\fBstdscr\fP)
+ins_wstr	window (\fBstdscr\fP)
+insch	window (\fBstdscr\fP)
+insdelln	window (\fBstdscr\fP)
+insertln	window (\fBstdscr\fP)
+insnstr	window (\fBstdscr\fP)
+insstr	window (\fBstdscr\fP)
+instr	window (\fBstdscr\fP)
+intrflush	terminal
+inwstr	window (\fBstdscr\fP)
+is_cleared	window
+is_idcok	window
+is_idlok	window
+is_immedok	window
+is_keypad	window
+is_leaveok	window
+is_linetouched	window
+is_nodelay	window
+is_notimeout	window
+is_scrollok	window
+is_syncok	window
+is_term_resized	terminal
+is_wintouched	window
+isendwin	screen
+key_defined	screen
+key_name	global (static data)
+keybound	screen
+keyname	global (static data)
+keyok	screen
+keypad	window
+killchar	terminal
+killwchar	terminal
+leaveok	window
+longname	screen
+mcprint	terminal
+meta	screen
+mouse_trafo	window (\fBstdscr\fP)
+mouseinterval	screen
+mousemask	screen
+move	window (\fBstdscr\fP)
+mvadd_wch	window (\fBstdscr\fP)
+mvadd_wchnstr	window (\fBstdscr\fP)
+mvadd_wchstr	window (\fBstdscr\fP)
+mvaddch	window (\fBstdscr\fP)
+mvaddchnstr	window (\fBstdscr\fP)
+mvaddchstr	window (\fBstdscr\fP)
+mvaddnstr	window (\fBstdscr\fP)
+mvaddnwstr	window (\fBstdscr\fP)
+mvaddstr	window (\fBstdscr\fP)
+mvaddwstr	window (\fBstdscr\fP)
+mvchgat	window (\fBstdscr\fP)
+mvcur	screen
+mvdelch	window (\fBstdscr\fP)
+mvderwin	window (\fBstdscr\fP)
+mvget_wch	screen (input operation)
+mvget_wstr	screen (input operation)
+mvgetch	screen (input operation)
+mvgetn_wstr	screen (input operation)
+mvgetnstr	screen (input operation)
+mvgetstr	screen (input operation)
+mvhline	window (\fBstdscr\fP)
+mvhline_set	window (\fBstdscr\fP)
+mvin_wch	window (\fBstdscr\fP)
+mvin_wchnstr	window (\fBstdscr\fP)
+mvin_wchstr	window (\fBstdscr\fP)
+mvinch	window (\fBstdscr\fP)
+mvinchnstr	window (\fBstdscr\fP)
+mvinchstr	window (\fBstdscr\fP)
+mvinnstr	window (\fBstdscr\fP)
+mvinnwstr	window (\fBstdscr\fP)
+mvins_nwstr	window (\fBstdscr\fP)
+mvins_wch	window (\fBstdscr\fP)
+mvins_wstr	window (\fBstdscr\fP)
+mvinsch	window (\fBstdscr\fP)
+mvinsnstr	window (\fBstdscr\fP)
+mvinsstr	window (\fBstdscr\fP)
+mvinstr	window (\fBstdscr\fP)
+mvinwstr	window (\fBstdscr\fP)
+mvprintw	window (\fBstdscr\fP)
+mvscanw	screen
+mvvline	window (\fBstdscr\fP)
+mvvline_set	window (\fBstdscr\fP)
+mvwadd_wch	window
+mvwadd_wchnstr	window
+mvwadd_wchstr	window
+mvwaddch	window
+mvwaddchnstr	window
+mvwaddchstr	window
+mvwaddnstr	window
+mvwaddnwstr	window
+mvwaddstr	window
+mvwaddwstr	window
+mvwchgat	window
+mvwdelch	window
+mvwget_wch	screen (input operation)
+mvwget_wstr	screen (input operation)
+mvwgetch	screen (input operation)
+mvwgetn_wstr	screen (input operation)
+mvwgetnstr	screen (input operation)
+mvwgetstr	screen (input operation)
+mvwhline	window
+mvwhline_set	window
+mvwin	window
+mvwin_wch	window
+mvwin_wchnstr	window
+mvwin_wchstr	window
+mvwinch	window
+mvwinchnstr	window
+mvwinchstr	window
+mvwinnstr	window
+mvwinnwstr	window
+mvwins_nwstr	window
+mvwins_wch	window
+mvwins_wstr	window
+mvwinsch	window
+mvwinsnstr	window
+mvwinsstr	window
+mvwinstr	window
+mvwinwstr	window
+mvwprintw	window
+mvwscanw	screen
+mvwvline	window
+mvwvline_set	window
+napms	reentrant
+newpad	global (locks window list)
+newscr	screen (read-only)
+newterm	global (locks screen list)
+newwin	global (locks window list)
+nl	screen
+nocbreak	screen
+nodelay	window
+noecho	screen
+nofilter	global
+nonl	screen
+noqiflush	terminal
+noraw	screen
+notimeout	window
+numcodes	global (read-only)
+numfnames	global (read-only)
+numnames	global (read-only)
+ospeed	global
+overlay	window (locks source, target)
+overwrite	window (locks source, target)
+pair_content	screen
+pecho_wchar	screen
+pechochar	screen
+pnoutrefresh	screen
+prefresh	screen
+printw	window
+putp	global
+putwin	window
+qiflush	terminal
+raw	screen
+redrawwin	window
+refresh	screen
+reset_prog_mode	screen
+reset_shell_mode	screen
+resetty	terminal
+resize_term	screen (locks window list)
+resizeterm	screen
+restartterm	screen
+ripoffline	global (static data)
+savetty	terminal
+scanw	screen
+scr_dump	screen
+scr_init	screen
+scr_restore	screen
+scr_set	screen
+scrl	window (\fBstdscr\fP)
+scroll	window
+scrollok	window
+set_curterm	screen
+set_escdelay	screen
+set_tabsize	screen
+set_term	global (locks screen list, screen)
+setcchar	reentrant
+setscrreg	window (\fBstdscr\fP)
+setupterm	global
+slk_attr	screen
+slk_attr_off	screen
+slk_attr_on	screen
+slk_attr_set	screen
+slk_attroff	screen
+slk_attron	screen
+slk_attrset	screen
+slk_clear	screen
+slk_color	screen
+slk_init	screen
+slk_label	screen
+slk_noutrefresh	screen
+slk_refresh	screen
+slk_restore	screen
+slk_set	screen
+slk_touch	screen
+slk_wset	screen
+standend	window
+standout	window
+start_color	screen
+\fBstdscr\fP	screen (read-only)
+strcodes	global (read-only)
+strfnames	global (read-only)
+strnames	global (read-only)
+subpad	window
+subwin	window
+syncok	window
+term_attrs	screen
+termattrs	screen
+termname	terminal
+tgetent	global
+tgetflag	global
+tgetnum	global
+tgetstr	global
+tgoto	global
+tigetflag	terminal
+tigetnum	terminal
+tigetstr	terminal
+timeout	window (\fBstdscr\fP)
+touchline	window
+touchwin	window
+tparm	global (static data)
+tputs	screen
+trace	global (static data)
+ttytype	screen (read-only)
+typeahead	screen
+unctrl	screen
+unget_wch	screen (input operation)
+ungetch	screen (input operation)
+ungetmouse	screen (input operation)
+untouchwin	window
+use_default_colors	screen
+use_env	global (static data)
+use_extended_names	global (static data)
+use_legacy_coding	screen
+use_screen	global (locks screen list, screen)
+use_window	global (locks window list, window)
+vid_attr	screen
+vid_puts	screen
+vidattr	screen
+vidputs	screen
+vline	window (\fBstdscr\fP)
+vline_set	window (\fBstdscr\fP)
+vw_printw	window
+vw_scanw	screen
+vwprintw	window
+vwscanw	screen
+wadd_wch	window
+wadd_wchnstr	window
+wadd_wchstr	window
+waddch	window
+waddchnstr	window
+waddchstr	window
+waddnstr	window
+waddnwstr	window
+waddstr	window
+waddwstr	window
+wattr_get	window
+wattr_off	window
+wattr_on	window
+wattr_set	window
+wattroff	window
+wattron	window
+wattrset	window
+wbkgd	window
+wbkgdset	window
+wbkgrnd	window
+wbkgrndset	window
+wborder	window
+wborder_set	window
+wchgat	window
+wclear	window
+wclrtobot	window
+wclrtoeol	window
+wcolor_set	window
+wcursyncup	screen (affects window plus parents)
+wdelch	window
+wdeleteln	window
+wecho_wchar	window
+wechochar	window
+wenclose	window
+werase	window
+wget_wch	screen (input operation)
+wget_wstr	screen (input operation)
+wgetbkgrnd	window
+wgetch	screen (input operation)
+wgetdelay	window
+wgetn_wstr	screen (input operation)
+wgetnstr	screen (input operation)
+wgetparent	window
+wgetscrreg	window
+wgetstr	screen (input operation)
+whline	window
+whline_set	window
+win_wch	window
+win_wchnstr	window
+win_wchstr	window
+winch	window
+winchnstr	window
+winchstr	window
+winnstr	window
+winnwstr	window
+wins_nwstr	window
+wins_wch	window
+wins_wstr	window
+winsch	window
+winsdelln	window
+winsertln	window
+winsnstr	window
+winsstr	window
+winstr	window
+winwstr	window
+wmouse_trafo	window
+wmove	window
+wnoutrefresh	screen
+wprintw	window
+wredrawln	window
+wrefresh	screen
+wresize	window (locks window list)
+wscanw	screen
+wscrl	window
+wsetscrreg	window
+wstandend	window
+wstandout	window
+wsyncdown	screen (affects window plus parents)
+wsyncup	screen (affects window plus parents)
+wtimeout	window
+wtouchln	window
+wunctrl	global (static data)
+wvline	window
+wvline_set	window
 .TE
 .\" ***************************************************************************
 .SH RETURN VALUE
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 43b59b647..1b8abcc6b 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.54 2023/12/23 16:08:25 tom Exp $
-.TH form_driver 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.57 2024/01/13 22:05:39 tom Exp $
+.TH form_driver 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -71,22 +71,22 @@ is a wide character or a request.
 The form driver requests are as follows:
 .PP
 .TS
-l l
-_ _
-l l.
-\fBName\fP	\fBDescription\fP
-REQ_BEG_FIELD	Move to the beginning of the field.
-REQ_BEG_LINE	Move to the beginning of the line.
+Lb Lb
+Lb Lx.
+Name	Description
+_
+REQ_BEG_FIELD	Move to beginning of field.
+REQ_BEG_LINE	Move to beginning of the line.
 REQ_CLR_EOF	Clear to end of field from cursor.
 REQ_CLR_EOL	Clear to end of line from cursor.
 REQ_CLR_FIELD	Clear the entire field.
 REQ_DEL_CHAR	Delete character at the cursor.
 REQ_DEL_LINE	Delete line at the cursor.
 REQ_DEL_PREV	Delete character before the cursor.
-REQ_DEL_WORD	Delete blank-delimited word at the cursor.
-REQ_DOWN_CHAR	Move down in the field.
+REQ_DEL_WORD	Delete blank-delimited word at cursor.
+REQ_DOWN_CHAR	Move down in field.
 REQ_DOWN_FIELD	Move down to a field.
-REQ_END_FIELD	Move to the end of the field.
+REQ_END_FIELD	Move to the end of field.
 REQ_END_LINE	Move to the end of the line.
 REQ_FIRST_FIELD	Move to the first field.
 REQ_FIRST_PAGE	Move to the first page.
@@ -95,7 +95,7 @@ REQ_INS_LINE	Insert a blank line at the cursor.
 REQ_INS_MODE	Enter insert mode.
 REQ_LAST_FIELD	Move to the last field.
 REQ_LAST_PAGE	Move to the last field.
-REQ_LEFT_CHAR	Move left in the field.
+REQ_LEFT_CHAR	Move left in field.
 REQ_LEFT_FIELD	Move left to a field.
 REQ_NEW_LINE	Insert or overlay a new line.
 REQ_NEXT_CHAR	Move to the next char.
@@ -112,25 +112,25 @@ REQ_PREV_FIELD	Move to the previous field.
 REQ_PREV_LINE	Move to the previous line.
 REQ_PREV_PAGE	Move to the previous page.
 REQ_PREV_WORD	Move to the previous word.
-REQ_RIGHT_CHAR	Move right in the field.
+REQ_RIGHT_CHAR	Move right in field.
 REQ_RIGHT_FIELD	Move right to a field.
-REQ_SCR_BCHAR	Scroll the field backward a character.
-REQ_SCR_BHPAGE	Scroll the field backward half a page.
-REQ_SCR_BLINE	Scroll the field backward a line.
-REQ_SCR_BPAGE	Scroll the field backward a page.
-REQ_SCR_FCHAR	Scroll the field forward a character.
-REQ_SCR_FHPAGE	Scroll the field forward half a page.
-REQ_SCR_FLINE	Scroll the field forward a line.
-REQ_SCR_FPAGE	Scroll the field forward a page.
-REQ_SCR_HBHALF	Horizontal scroll the field backward half a line.
-REQ_SCR_HBLINE	Horizontal scroll the field backward a line.
-REQ_SCR_HFHALF	Horizontal scroll the field forward half a line.
-REQ_SCR_HFLINE	Horizontal scroll the field forward a line.
+REQ_SCR_BCHAR	Scroll field backward 1 character.
+REQ_SCR_BHPAGE	Scroll field backward \(12 page.
+REQ_SCR_BLINE	Scroll field backward 1 line.
+REQ_SCR_BPAGE	Scroll field backward 1 page.
+REQ_SCR_FCHAR	Scroll field forward 1 character.
+REQ_SCR_FHPAGE	Scroll field forward \(12 page.
+REQ_SCR_FLINE	Scroll field forward 1 line.
+REQ_SCR_FPAGE	Scroll field forward 1 page.
+REQ_SCR_HBHALF	Horizontal scroll field backward \(12 line.
+REQ_SCR_HBLINE	Horizontal scroll field backward 1 line.
+REQ_SCR_HFHALF	Horizontal scroll field forward \(12 line.
+REQ_SCR_HFLINE	Horizontal scroll field forward 1 line.
 REQ_SFIRST_FIELD	Move to the sorted first field.
 REQ_SLAST_FIELD	Move to the sorted last field.
 REQ_SNEXT_FIELD	Move to the sorted next field.
 REQ_SPREV_FIELD	Move to the sorted previous field.
-REQ_UP_CHAR	Move up in the field.
+REQ_UP_CHAR	Move up in field.
 REQ_UP_FIELD	Move up to a field.
 REQ_VALIDATION	Validate field.
 .TE
diff --git a/man/infocmp.1m b/man/infocmp.1m
index a6818944c..494282e42 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,17 +28,20 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.104 2023/12/30 21:36:32 tom Exp $
-.TH @INFOCMP@ 1M 2023-12-30 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.107 2024/01/13 22:05:39 tom Exp $
+.TH @INFOCMP@ 1M 2024-01-13 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds '  \(aq
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ie t .ds '  \(aq
+.el   .ds '  '
 .\}
 .
 .de bP
@@ -147,13 +150,13 @@ The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
 a source listing for each terminal named.
 .PP
 .TS
-center tab(/) ;
-l l .
-\fB\-I\fP/use the \fBterminfo\fP names
-\fB\-L\fP/use the long C variable name listed in <\fBterm.h\fP>
-\fB\-C\fP/use the \fBtermcap\fP names
-\fB\-r\fP/when using \fB\-C\fP, put out all capabilities in \fBtermcap\fP form
-\fB\-K\fP/modifies the \fB\-C\fP option, improving BSD-compatibility.
+center;
+Lb L.
+\-I	use \fIterminfo\fP capability codes
+\-L	use \*(``long\*('' capability names
+\-C	use \fItermcap\fP capability codes
+\-r	with \fB\-C\fP, include nonstandard capabilities
+\-K	with \fB\-C\fP, improve BSD compatibility
 .TE
 .PP
 If no \fIterminal-types\fP are given,
@@ -210,17 +213,23 @@ Some common \fBterminfo\fP parameter sequences, their \fBtermcap\fP
 equivalents, and some terminal types which commonly have such sequences, are:
 .PP
 .TS
-center tab(/) ;
-l c l
-l l l.
-\fBterminfo/termcap\fP/Representative Terminals
-=
-\fB%p1%c/%.\fP/adm
-\fB%p1%d/%d\fP/hp, ANSI standard, vt100
-\fB%p1%'x'%+%c/%+x\fP/concept
-\fB%i/%i\fPq/ANSI standard, vt100
-\fB%p1%?%'x'%>%t%p1%'y'%+%;/%>xy\fP/concept
-\fB%p2\fP is printed before \fB%p1/%r\fP/hp
+center;
+Lf(BI) Lf(BI) L
+Lb     Lb     L.
+terminfo	termcap	Terminal Types
+_
+.\" ansi-m cup (adm3a has other stuff in between, more like concept)
+%p1%c	%.	ansi\-m
+.\" ansi cub, vt100 cub
+%p1%d	%d	ansi, vt100
+.\" vt52 cup (via vt52-basic)
+%p1%\*' \*'%+%c	%+x	vt52
+.\" ansi cup, vt100 cup
+%i	%iq	ansi, vt100
+.\" annarbor4080 cup
+%p1%?%\*'x\*'%>%t%p1%\*'y\*'%+%;	%>xy	annarbor4080
+.\" hpgeneric cup
+%p2\fR\|.\|.\|.\|\fP%p1	%r	hpgeneric
 .TE
 .SS "Use= Option [\-u]"
 The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
@@ -379,44 +388,43 @@ Here is a list of the DEC/ANSI
 special sequences recognized:
 .PP
 .TS
-center tab(/) ;
-l l
-l l.
-Action/Meaning
-=
-RIS/full reset
-SC/save cursor
-RC/restore cursor
-LL/home-down
-RSR/reset scroll region
-=
-DECSTR/soft reset (VT320)
-S7C1T/7-bit controls (VT220)
-=
-ISO DEC G0/enable DEC graphics for G0
-ISO UK G0/enable UK chars for G0
-ISO US G0/enable US chars for G0
-ISO DEC G1/enable DEC graphics for G1
-ISO UK G1/enable UK chars for G1
-ISO US G1/enable US chars for G1
-=
-DECPAM/application keypad mode
-DECPNM/normal keypad mode
-DECANSI/enter ANSI mode
-=
-ECMA[+\-]AM/keyboard action mode
-ECMA[+\-]IRM/insert replace mode
-ECMA[+\-]SRM/send receive mode
-ECMA[+\-]LNM/linefeed mode
-=
-DEC[+\-]CKM/application cursor keys
-DEC[+\-]ANM/set VT52 mode
-DEC[+\-]COLM/132-column mode
-DEC[+\-]SCLM/smooth scroll
-DEC[+\-]SCNM/reverse video mode
-DEC[+\-]OM/origin mode
-DEC[+\-]AWM/wraparound mode
-DEC[+\-]ARM/auto-repeat mode
+center;
+L L.
+Action	Meaning
+_
+RIS	full reset
+SC	save cursor
+RC	restore cursor
+LL	home-down
+RSR	reset scroll region
+_
+DECSTR	soft reset (VT320)
+S7C1T	7-bit controls (VT220)
+_
+ISO DEC G0	enable DEC graphics for G0
+ISO UK G0	enable UK chars for G0
+ISO US G0	enable US chars for G0
+ISO DEC G1	enable DEC graphics for G1
+ISO UK G1	enable UK chars for G1
+ISO US G1	enable US chars for G1
+_
+DECPAM	application keypad mode
+DECPNM	normal keypad mode
+DECANSI	enter ANSI mode
+_
+ECMA[+\-]AM	keyboard action mode
+ECMA[+\-]IRM	insert replace mode
+ECMA[+\-]SRM	send receive mode
+ECMA[+\-]LNM	linefeed mode
+_
+DEC[+\-]CKM	application cursor keys
+DEC[+\-]ANM	set VT52 mode
+DEC[+\-]COLM	132-column mode
+DEC[+\-]SCLM	smooth scroll
+DEC[+\-]SCNM	reverse video mode
+DEC[+\-]OM	origin mode
+DEC[+\-]AWM	wraparound mode
+DEC[+\-]ARM	auto-repeat mode
 .TE
 .sp
 It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 946348e4d..7043c3188 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,7 +1,7 @@
-# $Id: manhtml.externs,v 1.20 2023/12/23 23:49:04 tom Exp $
+# $Id: manhtml.externs,v 1.21 2024/01/13 22:54:54 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
-# Copyright 2019-2021,2023 Thomas E. Dickey                                *
+# Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -46,6 +46,7 @@ lynx(1)
 mutt(1)
 nvi(1)
 od(1)
+ioctl(2)
 printf(3)
 profile(5)
 putc(3)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 3ef1436fb..3d395795c 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.195 2024/01/05 21:46:58 tom Exp $
-.TH ncurses 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.197 2024/01/13 20:30:39 tom Exp $
+.TH ncurses 3X 2024-01-13 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -295,7 +295,7 @@ translates these into unique
 .I "key codes."
 See \fB\%getch\fP(3X).
 .SS "Effects of GUIs and Environment Variables"
-The selection of an approprate value of
+The selection of an appropriate value of
 .I TERM
 in the process environment is essential to correct
 .I curses
@@ -967,7 +967,7 @@ pointer is null.
 The following environment symbols are useful for customizing the
 runtime behavior of the \fI\%ncurses\fP library.
 The most important ones have been already discussed in detail.
-.SS "\fICC\fP command-character"
+.SS "\fICC\fP (command character)"
 When set,
 change the
 .B \%command_character
diff --git a/man/term.5 b/man/term.5
index 79aa21646..ebd929aa7 100644
--- a/man/term.5
+++ b/man/term.5
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.70 2023/12/30 21:36:32 tom Exp $
-.TH term 5 2023-12-30 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.73 2024/01/13 22:05:39 tom Exp $
+.TH term 5 2024-01-13 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -393,7 +393,6 @@ but was limited to a virtual memory page's 4096 bytes.
 As an example, here is a description for the Lear-Siegler
 ADM\-3, a popular though rather stupid early terminal:
 .PP
-.RS 4
 .EX
 adm3a|lsi adm3a,
         am,
@@ -402,14 +401,13 @@ adm3a|lsi adm3a,
         cuf1=\*^L, cup=\eE=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\*^K,
         home=\*^\*^, ind=\*^J,
 .EE
-.RE
 .PP
 and a hexadecimal dump of the compiled terminal description:
 .PP
-.ie n .in -2n
-.el   .in +4n
+.if t .in +4n
+.ft \*(CW
 .TS
-lp-1f(\*(CW).
+Lp-1.
 0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
 0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
 0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
@@ -433,6 +431,7 @@ lp-1f(\*(CW).
 0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
 0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 .TE
+.ft
 .in
 .SH AUTHORS
 Thomas E. Dickey
diff --git a/man/terminfo.head b/man/terminfo.head
index ae3d7e54e..b0f49edaa 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.60 2023/12/30 22:21:45 tom Exp $
-.TH terminfo 5 2023-12-30 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.63 2024/01/13 23:07:27 tom Exp $
+.TH terminfo 5 2024-01-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -136,23 +136,23 @@ The following suffixes should be used where possible:
 .PP
 .TS
 center;
-lb cb lb
-l  l  l .
-Suffix	Meaning	Example
+Lb Lb Lb
+L  L  Lx.
+Suffix	Example	Meaning
 _
-\-\fInn\fP	Number of lines on the screen	aaa\-60
-\-\fIn\fPp	Number of pages of memory	c100\-4p
-\-am	With automargins (usually the default)	vt100\-am
-\-m	Mono mode; suppress color       	ansi\-m
-\-mc	Magic cookie; spaces when highlighting	wy30\-mc
-\-na	No arrow keys (leave them in local)	c100\-na
-\-nam	Without automatic margins       	vt100\-nam
-\-nl	No status line                  	att4415\-nl
-\-ns	No status line                  	hp2626\-ns
-\-rv	Reverse video                   	c100\-rv
-\-s	Enable status line              	vt100\-s
-\-vb	Use visible bell instead of beep	wy370\-vb
-\-w	Wide mode (> 80 columns, usually 132)	vt100\-w
+\-\fInn\fP	aaa\-60	Number of lines on the screen
+\-\fIn\fPp	c100\-4p	Number of pages of memory
+\-am	vt100\-am	With automargins (usually the default)
+\-m	ansi\-m	Mono mode; suppress color
+\-mc	wy30\-mc	Magic cookie; spaces when highlighting
+\-na	c100\-na	No arrow keys (leave them in local)
+\-nam	vt100\-nam	Without automatic margins
+\-nl	hp2621\-nl	No status line
+\-ns	hp2626\-ns	No status line
+\-rv	c100\-rv	Reverse video
+\-s	vt100\-s	Enable status line
+\-vb	wy370\-vb	Use visible bell instead of beep
+\-w	vt100\-w	Wide mode (> 80 columns, usually 132)
 .TE
 .PP
 For more on terminal naming conventions, see the \fBterm\fP(7) manual page.
diff --git a/man/terminfo.tail b/man/terminfo.tail
index bc7614048..6f48d1600 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.141 2023/12/30 21:36:32 tom Exp $
+.\" $Id: terminfo.tail,v 1.143 2024/01/13 22:05:39 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -1551,44 +1551,44 @@ This alternate character set may be specified by the \fBacsc\fP capability.
 .PP
 .TS
 center;
-lb lb lb lb lb.
-\&	\&	ASCII	acsc	acsc
-Glyph Name	ACS Name	Fallback	Symbol	Value
+Lb  Cb  S  L   Lb
+Lb2 Lb2 Lb Lb1 S
+Lb  L   C  Lb  Lx.
+\&	acsc	\&	\&
+ACS Name	Value	Symbol	ASCII Fallback / Glyph Name
 _
-.T&
-l  lb l  l  l .
-arrow pointing right	ACS_RARROW	>	+	0x2b
-arrow pointing left	ACS_LARROW	<	,	0x2c
-arrow pointing up	ACS_UARROW	\*^	\-	0x2d
-arrow pointing down	ACS_DARROW	v	.	0x2e
-solid square block	ACS_BLOCK	#	0	0x30
-diamond         	ACS_DIAMOND	+	\(ga	0x60
-checker board (stipple)	ACS_CKBOARD	:	a	0x61
-degree symbol   	ACS_DEGREE	\e	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
-upper left corner	ACS_ULCORNER	+	l	0x6c
-lower left corner	ACS_LLCORNER	+	m	0x6d
-large plus or crossover	ACS_PLUS	+	n	0x6e
-scan line 1     	ACS_S1  	\*~	o	0x6f
-scan line 3     	ACS_S3  	\-	p	0x70
-horizontal line 	ACS_HLINE	\-	q	0x71
-scan line 7     	ACS_S7  	\-	r	0x72
-scan line 9     	ACS_S9  	\&_	s	0x73
-tee pointing right	ACS_LTEE	+	t	0x74
-tee pointing left	ACS_RTEE	+	u	0x75
-tee pointing up 	ACS_BTEE	+	v	0x76
-tee pointing down	ACS_TTEE	+	w	0x77
-vertical line   	ACS_VLINE	|	x	0x78
-less-than-or-equal-to	ACS_LEQUAL	<	y	0x79
-greater-than-or-equal-to	ACS_GEQUAL	>	z	0x7a
-greek pi        	ACS_PI	*	{	0x7b
-not-equal       	ACS_NEQUAL	!	|	0x7c
-UK pound sign        	ACS_STERLING	f	}	0x7d
-bullet          	ACS_BULLET	o	\*~	0x7e
+ACS_RARROW	0x2b	+	>	arrow pointing right
+ACS_LARROW	0x2c	,	<	arrow pointing left
+ACS_UARROW	0x2d	\-	\*^	arrow pointing up
+ACS_DARROW	0x2e	.	v	arrow pointing down
+ACS_BLOCK	0x30	0	#	solid square block
+ACS_DIAMOND	0x60	\(ga	+	diamond
+ACS_CKBOARD	0x61	a	:	checker board (stipple)
+ACS_DEGREE	0x66	f	\e	degree symbol
+ACS_PLMINUS	0x67	g	#	plus/minus
+ACS_BOARD	0x68	h	#	board of squares
+ACS_LANTERN	0x69	i	#	lantern symbol
+ACS_LRCORNER	0x6a	j	+	lower right corner
+ACS_URCORNER	0x6b	k	+	upper right corner
+ACS_ULCORNER	0x6c	l	+	upper left corner
+ACS_LLCORNER	0x6d	m	+	lower left corner
+ACS_PLUS	0x6e	n	+	large plus or crossover
+ACS_S1	0x6f	o	\*~	scan line 1
+ACS_S3	0x70	p	\-	scan line 3
+ACS_HLINE	0x71	q	\-	horizontal line
+ACS_S7	0x72	r	\-	scan line 7
+ACS_S9	0x73	s	\&_	scan line 9
+ACS_LTEE	0x74	t	+	tee pointing right
+ACS_RTEE	0x75	u	+	tee pointing left
+ACS_BTEE	0x76	v	+	tee pointing up
+ACS_TTEE	0x77	w	+	tee pointing down
+ACS_VLINE	0x78	x	|	vertical line
+ACS_LEQUAL	0x79	y	<	less-than-or-equal-to
+ACS_GEQUAL	0x7a	z	>	greater-than-or-equal-to
+ACS_PI	0x7b	{	*	greek pi
+ACS_NEQUAL	0x7c	|	!	not-equal
+ACS_STERLING	0x7d	}	f	UK pound sign
+ACS_BULLET	0x7e	\*~	o	bullet
 .TE
 .PP
 A few notes apply to the table itself:
diff --git a/man/toe.1m b/man/toe.1m
index 47fb61e75..4f8032113 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.59 2023/12/16 21:01:59 tom Exp $
-.TH @TOE@ 1M 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.62 2024/01/13 22:05:39 tom Exp $
+.TH @TOE@ 1M 2024-01-13 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,11 +142,11 @@ with this program and exits with a successful status.
 .TP
 .I \*d
 compiled terminal description database
-.SH HISTORY
+.SH PORTABILITY
 \fB\%@TOE@\fP is not provided by other implementations.
 There is no applicable X/Open or POSIX standard for it.
-.PP
-It replaces a \fB\-T\fP option that was briefly supported by
+.SH HISTORY
+\fB\%@TOE@\fP replaces a \fB\-T\fP option that was briefly supported by
 the \fI\%ncurses\fP \fB\%infocmp\fP utility in 1995.
 .PP
 The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011,
@@ -176,8 +176,10 @@ xterm\-256color	xterm with 256 colors
 xterm\-r6	xterm X11R6 version
 xterm\-r5	xterm R5 version
 xterm\-mono	monochrome xterm
-.\" The next row overruns the line length on DWB nroff (65n).
-xterm	xterm terminal emulator (X Window System)
+xterm	T{
+.ad l
+xterm terminal emulator (X Window System)
+T}
 vt220	dec vt220
 vt102	dec vt102
 vt100	dec vt100 (w/advanced video)
@@ -205,16 +207,20 @@ lf(\*(CW)1 lf(\*(CW)2 lf(\*(CW).
 \-\-*\-\-\-:	vt102	dec vt102
 \-\-*\-\-\-:	vt220	dec vt220
 \-\-*\-\-\-:	vt52	dec vt52
-.\" The next row overruns the line length on DWB nroff (65n).
-\-\-*\-\-\-:	xterm	xterm terminal emulator (X Window System)
+\-\-*\-\-\-:	xterm	T{
+.ad l
+xterm terminal emulator (X Window System)
+T}
 \-\-*\-\-\-:	xterm\-256color	xterm with 256 colors
 \-\-*\-\-\-:	xterm\-color	generic color xterm
 \-\-*\-\-\-:	xterm\-mono	monochrome xterm
 \-\-*\-\-\-:	xterm\-r5	xterm R5 version
 \-\-*\-\-\-:	xterm\-r6	xterm X11R6 version
 \-\-*\-\-\-:	xterm\-vt220	xterm emulating vt220
-.\" The next row overruns the line length on DWB nroff (65n).
-\-\-*\-\-\-:	xterm\-xfree86	xterm terminal emulator (XFree86)
+\-\-*\-\-\-:	xterm\-xfree86	T{
+.ad l
+xterm terminal emulator (XFree86)
+T}
 .T&
 l.
 \&.\|.\|.
diff --git a/man/tput.1 b/man/tput.1
index 48ad00c9d..0cf0b129f 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.97 2023/12/31 00:16:41 tom Exp $
-.TH @TPUT@ 1 2023-12-30 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp $
+.TH @TPUT@ 1 2024-01-13 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,8 +48,9 @@
 .ds d @TERMINFO@
 .SH NAME
 \fB\%@TPUT@\fP,
+\fB\%init\fP,
 \fB\%reset\fP \-
-initialize a terminal or query \fI\%term\%info\fP database
+initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
 .SH SYNOPSIS
 \fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
 {\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|.
@@ -58,26 +59,35 @@ initialize a terminal or query \fI\%term\%info\fP database
 .PP
 \fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBreset\fP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBlongname\fP
+\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
 .PP
 \fB@TPUT@ \-S\fP
 .PP
 \fB@TPUT@ \-V\fP
 .SH DESCRIPTION
-\fB@TPUT@\fP uses the \fI\%term\%info\fP library and database to make
-the values of terminal-specific capabilities and information available
-to the shell,
+\fB\%@TPUT@\fP uses the
+.I \%term\%info
+library and database to make terminal-specific capabilities and
+information available to the shell,
 to initialize or reset the terminal,
-or report the long name of the current
+or
+to report a description of the current
 (or specified)
 terminal type.
+Terminal capabilities are accessed by
+.IR cap-code .
+.PP
+\fB\%terminfo\fP(5) discusses terminal capabilities at length
+and presents a complete list of
+.I cap-codes.
+.PP
 When retrieving capability values,
 the result depends upon the capability's type.
 .TP 9 \" "Boolean" + 2n
 Boolean
-\fB@TPUT@\fP sets its exit status to
+\fB\%@TPUT@\fP sets its exit status to
 .B 0
 if the terminal possesses
 .I cap-code,
@@ -85,8 +95,8 @@ and
 .B 1
 if it does not.
 .TP
-integer
-\fB@TPUT@\fP writes
+numeric
+\fB\%@TPUT@\fP writes
 .IR cap-code 's
 decimal value to the standard output stream if defined
 .RB ( \-1
@@ -94,308 +104,321 @@ if it is not)
 followed by a newline.
 .TP
 string
-\fB@TPUT@\fP writes
+\fB\%@TPUT@\fP writes
 .IR cap-code 's
 value to the standard output stream if defined,
 without a trailing newline.
 .PP
 Before using a value returned on the standard output,
-the application should test \fB@TPUT@\fP's exit status
-(for example,
-using \fB$?\fP in \fIsh\fP(1))
-to be sure it is \fB0\fP;
-see sections \*(``EXIT STATUS\*('' and \*(``DIAGNOSTICS\*('' below.
-For a complete list of
-.I cap-codes,
-see \fB\%terminfo\fP(5).
-.SS Options
-.TP
-\fB\-S\fP
-allows more than one capability per invocation of \fB@TPUT@\fP.
-The capabilities must be passed to \fB@TPUT@\fP from the standard input
-instead of from the command line
-(see example).
-Only one \fIcap-code\fP is allowed per line.
-The \fB\-S\fP option changes the
-meaning of the \fB0\fP and \fB1\fP Boolean and string exit statuses
-(see section \*(``EXIT STATUS\*('' below).
-.IP
-Because some capabilities may use
-\fIstring\fP parameters rather than \fInumbers\fP,
-\fB@TPUT@\fP uses a table and the presence of parameters in its input
-to decide whether to use \fBtparm\fP(3X),
-and how to interpret the parameters.
-.TP
-\fB\-T\fItype\fR
-indicates the \fItype\fP of terminal.
-Normally this option is
-unnecessary, because the default is taken from the environment
-variable \fITERM\fP.
-If \fB\-T\fP is specified, then the shell
-variables \fILINES\fP and \fI\%COLUMNS\fP will also be ignored.
-.TP
-\fB\-V\fP
-reports the version of \fI\%ncurses\fP which was used in this program,
-and exits.
-.TP
-.B \-x
-prevents \fB\%@TPUT@\fP from attempting to clear the scrollback buffer.
-.SS Commands
-A few commands (\fBinit\fP, \fBreset\fP and \fBlongname\fP) are
-special; they are defined by the \fB@TPUT@\fP program.
-The others are the names of \fIcapabilities\fP from the terminal database
-(see \fB\%terminfo\fP(5) for a list).
-Although \fBinit\fP and \fBreset\fP resemble capability names,
-\fB@TPUT@\fP uses several capabilities to perform these special functions.
-.TP
-\fIcap-code\fP
-indicates the capability from the terminal database.
+the application should test \fB\%@TPUT@\fP's exit status
+to be sure it is 0;
+see section \*(``EXIT STATUS\*('' below.
+.SS Operands
+Generally,
+an operand is a
+.I cap-code,
+a capability code from the terminal database,
+or a parameter thereto.
+Three others are specially recognized by \fB\%@TPUT@\fP:
+.BR init ,
+.BR \%reset ,
+and
+.BR \%longname .
+Although these resemble capability codes,
+they in fact receive special handling;
+we term them \*(``pseudo-capabilities\*(''.
+.TP 11n \" "longname" + 2n + adjustment for PDF
+.I cap-code
+indicates a 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.
+If the capability is of string type and takes parameters,
+the arguments following the capability will be used as its parameters.
 .IP
-Most parameters are numbers.
+Most parameters are numeric.
 Only a few terminal capabilities require string parameters;
-\fB@TPUT@\fP uses a table to decide which to pass as strings.
-Normally \fB@TPUT@\fP uses \fBtparm\fP(3X) to perform the substitution.
+\fB\%@TPUT@\fP uses a table to decide which to pass as strings.
+Normally \fB\%@TPUT@\fP uses \fB\%tparm\fP(3X) to perform the
+substitution.
 If no parameters are given for the capability,
-\fB@TPUT@\fP writes the string without performing the substitution.
+\fB\%@TPUT@\fP writes the string without performing the substitution.
 .TP
-\fBinit\fP
-If the terminal database is present and an entry for the user's
-terminal exists (see \fB\-T\fItype\fR, above), the following will
-occur:
+.B init
+initializes the terminal.
+If the terminal database is present
+and an entry for the user's terminal type exists,
+the following occur.
 .RS
 .TP 5
 (1)
-first, \fB@TPUT@\fP retrieves the current terminal mode settings
-for your terminal.
-It does this by successively testing
+\fB\%@TPUT@\fP retrieves the terminal's mode settings.
+It successively tests the file descriptors corresponding to
 .RS
 .bP
-the standard error,
+the standard error stream,
 .bP
-standard output,
+the standard output stream,
 .bP
-standard input and
+the standard input stream,
+and
 .bP
-ultimately \*(``/dev/tty\*(''
+.I \%/dev/tty
 .RE
 .IP
 to obtain terminal settings.
-Having retrieved these settings, \fB@TPUT@\fP remembers which
-file descriptor to use when updating settings.
+Having retrieved them,
+\fB\%@TPUT@\fP remembers which descriptor to use for further updates.
 .TP
 (2)
-if the window size cannot be obtained from the operating system,
-but the terminal description
-(or environment,
-e.g.,
-\fILINES\fP and \fI\%COLUMNS\fP variables specify this),
-update the operating system's notion of the window size.
+If the terminal dimensions cannot be obtained from the operating system,
+but the environment or terminal type database entry describes them,
+\fB\%@TPUT@\fP updates the operating system's notion of them.
 .TP
 (3)
-the terminal modes will be updated:
+\fB\%@TPUT@\fP updates the terminal modes.
 .RS
 .bP
-any delays (e.g., newline) specified in the entry will
-be set in the tty driver,
+Any delays specified in the entry
+(for example,
+when a newline is sent)
+are set in the terminal driver.
 .bP
-tabs expansion will be turned on or off according to
-the specification in the entry, and
+Tab expansion is turned on or off per the specification in the entry,
+and
 .bP
 if tabs are not expanded,
-standard tabs will be set (every 8 spaces).
+standard tabs
+(every 8 spaces)
+are set.
 .RE
 .TP
 (4)
-if present, the terminal's initialization strings will be
-output as detailed in the \fB\%terminfo\fP(5) section on
-.IR "Tabs and Initialization" ,
+If initialization capabilities,
+detailed in subsection \*(``Tabs and Initialization\*('' of
+\fB\%terminfo\fP(5),
+are present,
+\fB\%@TPUT@\fP writes them to the standard output stream.
 .TP
 (5)
-output is flushed.
+\fB\%@TPUT@\fP flushes the standard output stream.
 .RE
 .IP
-If an entry does not
-contain the information needed for any of these activities,
-that activity will silently be skipped.
+If an entry lacks the information needed for an activity above,
+that activity is silently skipped.
 .TP
-\fBreset\fP
-This is similar to \fBinit\fP, with two differences:
+.B reset
+re-initializes the terminal.
+A reset differs from initialization in two ways.
 .RS
 .TP 5
 (1)
-before any other initialization,
-the terminal modes will be reset to a \*(``sane\*('' state:
+\fB\%@TPUT@\fP sets the the terminal modes to a \*(``sane\*('' state,
 .RS
 .bP
-set cooked and echo modes,
+enabling cooked and echo modes,
 .bP
-turn off cbreak and raw modes,
+disabling cbreak and raw modes,
 .bP
-turn on newline translation and
+enabling newline translation,
+and
 .bP
-reset any unset special characters to their default values
+setting 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\fP, \fBrs2\fP, \fBrs3\fP, \fBrf\fP).
-If the \fIreset\fP strings are not present, but \fIinitialization\fP
-strings are, the \fIinitialization\fP strings will be output.
+If any reset capabilities are defined for the terminal type,
+\fB\%@TPUT@\fP writes them to the output stream.
+Otherwise,
+\fB\%@TPUT@\fP uses any defined initialization capabilities.
+Reset capabilities are detailed in subsection
+\*(``Tabs and Initialization\*('' of \fB\%terminfo\fP(5).
 .RE
-.IP
-Otherwise, \fBreset\fP acts identically to \fBinit\fP.
 .TP
 .B longname
-A terminfo entry begins with one or more names by which an
-application can refer to the entry,
+A
+.I \%term\%info
+entry begins with one or more names by which an application
+can refer to the entry,
 before the list of terminal capabilities.
 The names are separated by \*(``|\*('' characters.
-X/Open states that the last name is the \*(``long name\*(''
-and also that it may include blanks.
+X/Open Curses terms the last name the \*(``long name\*('',
+and indicates that it may include blanks.
 .IP
 \fB\%@TIC@\fP warns if the last name does not include blanks,
-to accommodate old terminfo entries which treated
-the long name as an optional feature.
+to accommodate old
+.I \%term\%info
+entries that treated the long name as an optional feature.
 The long name is often referred to as the description field.
 .IP
 If the terminal database is present and an entry for the user's terminal
-exists
-(see
-.B \-T
-.I type
-above),
-\fB\%@TPUT@\fP reports the terminal's description
-(or \*(``long name\*('')
-to the standard output,
+type exists,
+\fB\%@TPUT@\fP reports its description to the standard output stream,
 without a trailing newline.
-See \fB\%term\%info\fP(5).
-.SS Aliases
-\fB@TPUT@\fP 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@\fP is invoked by a link named \fBreset\fP, this has the
-same effect as \fB@TPUT@ reset\fP.
-The \fB@TSET@\fP(1) utility also treats a link named \fBreset\fP specially.
+See \fB\%terminfo\fP(5).
 .PP
-Before \fI\%ncurses\fP 6.1,
-the two utilities were different from each other:
-.bP
-\fB@TSET@\fP utility reset the terminal modes and special characters
-(not done with \fB@TPUT@\fP).
-.bP
-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 \fB@TSET@\fP,
-because of this difference with resetting terminal modes and special characters.
-.PP
-With the changes made for \fI\%ncurses\fP 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.
+.I Note:
+Redirecting the output of
+.RB \%\*(`` "@TPUT@ init" \*(''
+or
+.RB \%\*(`` "@TPUT@ reset" \*(''
+to a file will capture only part of their actions.
+Changes to the terminal modes are not affected by file descriptor
+redirection,
+since the terminal modes are altered via \fB\%ioctl\fP(2).
+.SS Aliases
+If \fB\%@TPUT@\fP is invoked via link with any of the names
+.BR clear ,
+.BR init ,
+or
+.BR \%reset ,
+it operates as if run with the corresponding (pseudo-)capability
+operand.
+For example,
+executing a link named
+.B \%reset
+that points to \fB\%@TPUT@\fP has the same effect as
+.RB \%\*(`` "@TPUT@ \%reset" \*(''.
+(The \fB\%@TSET@\fP(1) utility also treats a link named
+.B \%reset
+specially.)
 .PP
-If \fB@TPUT@\fP is invoked by a link named \fBinit\fP, this has the
-same effect as \fB@TPUT@ init\fP.
-Again, you are less likely to use that link because another program
-named \fBinit\fP has a more well-established use.
+If \fB\%@TPUT@\fP is invoked by a link named
+.BR \%init ,
+this has the same effect as
+.RB \%\*(`` "@TPUT@ init" \*(''.
+Such a link is seldom employed because another program of that name
+is in widespread use.
 .SS "Terminal Size"
-Besides the special commands (e.g., \fBclear\fP),
-@TPUT@ treats certain terminfo capabilities specially:
-\fBlines\fP and \fBcols\fP.
-@TPUT@ calls \fBsetupterm\fP(3X) to obtain the terminal size:
-.bP
-first, it gets the size from the terminal database
-(which generally is not provided for terminal emulators
-which do not have a fixed window size)
-.bP
-then it asks the operating system for the terminal's size
-(which generally works, unless connecting via a serial line which
-does not support \fINAWS\fP: negotiations about window size).
-.bP
-finally, it inspects the environment variables \fILINES\fP and
-\fI\%COLUMNS\fP which may override the terminal size.
+Besides the pseudo-capabilities
+(such as
+.BR init ),
+\fB\%@TPUT@\fP treats the
+.B lines
+and
+.B cols
+.I cap-codes
+specially:
+it may call \fB\%setupterm\fP(3X) to obtain the terminal size.
+.bP
+First,
+\fB\%@TPUT@\fP attempts to obtain these capabilities from the terminal
+database.
+This generally fails for terminal emulators,
+which lack a fixed window size and thus omit the capabilities.
+.bP
+It then asks the operating system for the terminal's size,
+which generally works,
+unless the connection is via a serial line that
+does not support \*(``NAWS\*('': negotiations about window size.
+.bP
+Finally,
+it inspects the environment variables
+.I LINES
+and
+.I \%COLUMNS,
+which may override the terminal size.
 .PP
-If the \fB\-T\fP option is given
-@TPUT@ ignores the environment variables by calling \fBuse_tioctl(TRUE)\fP,
-relying upon the operating system (or finally, the terminal database).
-.SH EXIT STATUS
-If the \fB\-S\fP option is used,
-\fB@TPUT@\fP checks for errors from each line,
-and if any errors are found, will set the exit status to 4 plus the
-number of lines with errors.
-If no errors are found, the exit status is \fB0\fP.
-No indication of which line failed can be given so
-exit status \fB1\fP will never appear.
-Exit statuses \fB2\fP, \fB3\fP, and
-\fB4\fP retain their usual interpretation.
-If the \fB\-S\fP option is not used,
-the exit status depends on the type of \fIcap-code\fP:
-.RS 3
-.TP
-.I Boolean
-a value of \fB0\fP is set for TRUE and \fB1\fP for FALSE.
+If the
+.B \-T
+option is given,
+\fB\%@TPUT@\fP ignores the environment variables by calling
+.BR \%use_tioctl(TRUE) ,
+relying upon the operating system
+(or,
+ultimately,
+the terminal database).
+.SH OPTIONS
+.TP 9n \" "-T type" + 2n
+.B \-S
+retrieves more than one capability per invocation of \fB\%@TPUT@\fP.
+The capabilities must be passed to \fB\%@TPUT@\fP from the standard
+input stream instead of from the command line
+(see section \*(``EXAMPLES\*('' below).
+Only one
+.I cap-code
+is allowed per line.
+The
+.B \-S
+option changes the meanings of the
+.B 0
+and
+.B 1
+exit statuses
+(see section \*(``EXIT STATUS\*('' below).
+.IP
+Some capabilities use string parameters rather than numeric ones.
+\fB\%@TPUT@\fP employs a built-in table and the presence of parameters
+in its input to decide how to interpret them,
+and whether to use \fB\%tparm\fP(3X).
 .TP
-.I string
-a value of \fB0\fP is set if the
-\fIcap-code\fP is defined for this terminal \fItype\fP (the value of
-\fIcap-code\fP is returned on standard output);
-a value of \fB1\fP is set if \fIcap-code\fP
-is not defined for this terminal \fItype\fP
-(nothing is written to standard output).
+.BI \-T\  type
+indicates the terminal's
+.I type.
+Normally this option is unnecessary,
+because a default is taken from the
+.I TERM
+environment variable.
+If specified,
+the environment variables
+.I LINES
+and
+.I \%COLUMNS
+are also ignored.
 .TP
-.I integer
-a value of \fB0\fP is always set,
-whether or not \fIcap-code\fP is defined for this terminal \fItype\fP.
-To determine if \fIcap-code\fP is defined for this terminal \fItype\fP,
-the user must test the value written to standard output.
-A value of \fB\-1\fP
-means that \fIcap-code\fP is not defined for this terminal \fItype\fP.
+.B \-V
+reports the version of
+.I \%ncurses
+associated with \fB\%@TPUT@\fP,
+and exits with a successful status.
 .TP
-.I other
-\fBreset\fP or \fBinit\fP may fail to find their respective files.
-In that case, the exit status is set to 4 + \fBerrno\fP.
-.RE
+.B \-x
+prevents
+.RB \%\*(`` "@TPUT@ clear" \*(''
+from attempting to clear the scrollback buffer.
+.SH EXIT STATUS
+Normally,
+one should interpret \fB\%@TPUT@\fP's exit statuses as follows.
+.PP
+.if n .ne 3
+.if t .ne 2
+.TS
+Lb Lb
+Lb Lx.
+Status	Meaning When \-S Not Specified
+_
+0	Boolean or string capability present
+1	Boolean or numeric capability absent
+2	usage error or no terminal type specified
+3	unrecognized terminal type
+4	unrecognized capability code
+>4	system error (4 + \fBerrno\fP)
+.TE
 .PP
-Any other exit status indicates an error;
-see section \*(``DIAGNOSTICS\*('' below.
-.SH DIAGNOSTICS
-\fB@TPUT@\fP prints the following error messages and sets the
-corresponding exit statuses.
+When the
+.B \-S
+option is used,
+some statuses change meanings.
 .PP
-.ne 15
+.if n .ne 4
+.if t .ne 3
 .TS
-l l.
-exit status	error message
-=
-\fB0\fP	T{
-(\fIcap-code\fP is a numeric variable that is not specified in the
-\fB\%terminfo\fP(5) database for this terminal type, e.g.
-\fB@TPUT@ \-T450 lines\fP and \fB@TPUT@ \-Thp2621 xmc\fP)
-T}
-\fB1\fP	no error message is printed, see the \fBEXIT STATUS\fP section.
-\fB2\fP	usage error
-\fB3\fP	unknown terminal \fItype\fP or no \fI\%term\%info\fP database
-\fB4\fP	unknown \fI\%term\%info\fP capability \fIcap-code\fP
-\fB>4\fP	error occurred in \-S
-=
+Lb Lb
+Lb Lx.
+Status	Meaning When \-S Specified
+_
+0	all operands interpreted
+1	unused
+4	some operands not interpreted
 .TE
+.SH ENVIRONMENT
+\fB@TPUT@\fP command reads one environment variable.
+.TP 8n \" "TERM" + 2n + adjustment for PDF
+.I TERM
+denotes the terminal type.
+Each terminal type is distinct,
+though many are similar.
+The
+.B \-T
+option overrides its value.
 .SH FILES
 .TP
 .I @DATADIR@/tabset
@@ -404,121 +427,274 @@ tab stop initialization database
 .I \*d
 compiled terminal description database
 .SH PORTABILITY
-This implementation of \fBtput\fP differs from AT&T \fBtput\fP in
-two important areas:
-.bP
-\fB@TPUT@\fP \fIcap-code\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.
+Over time
+.I \%ncurses
+\fB\%@TPUT@\fP
+has differed from that of System\ V in two important respects,
+one now mostly historical.
+.bP
+\%\*(``\fB@TPUT@\fP
+.IR cap-code \*(''
+writes to the standard output,
+which need not be a terminal device.
+However,
+the operands that manipulate terminal modes might not use the standard
+output.
 .IP
-The AT&T implementation's \fBinit\fP and \fBreset\fP commands
-use the BSD (4.1c) \fBtset\fP source, which manipulates terminal modes.
-It successively tries standard output, standard error, standard input
-before falling back to \*(``/dev/tty\*('' and finally just assumes
-a 1200Bd terminal.
-When updating terminal modes, it ignores errors.
+System\ V
+.BR tput 's
+.B init
+and
+.B \%reset
+operands use logic from 4.1cBSD
+.BR tset ,
+manipulating terminal modes.
+It checks the same file descriptors
+(and
+.IR \%/dev/tty )
+for association with a terminal device as
+.I \%ncurses
+now does,
+and if none are,
+finally assumes a 1200 baud terminal.
+When updating terminal modes,
+it ignores errors.
 .IP
-Until changes made after \fI\%ncurses\fP 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(1),
-\fB@TPUT@\fP will return an error.
-.bP
-AT&T \fBtput\fP guesses the type of its \fIcap-code\fP operands by
-seeing if all of the characters are numeric,
-or not.
+Until
+.I \%ncurses
+6.1
+(see section \*(``HISTORY\*('' below),
+\fB\%@TPUT@\fP did not modify terminal modes.
+It now employs a scheme similar to System\ V,
+using functions shared with \fB\%@TSET@\fP
+(and ultimately based on 4.4BSD
+.BR tset ).
+If it is not able to open a terminal
+(for instance,
+when run by \fIcron\fP(1)),
+\fB\%@TPUT@\fP exits with an error status.
+.bP
+System\ V
+.B tput
+assumes that the type of a
+.I cap-code
+operand is numeric if all the characters of its value are decimal
+numbers;
+if they are not,
+it treats
+.I cap-code
+as a string capability.
 .IP
-Most implementations which provide support for \fIcap-code\fP operands
-use the \fBtparm\fP function to expand parameters in it.
+Most implementations that provide support for
+.I cap-code
+operands use the \fB\%tparm\fP(3X) function to expand its parameters.
 That function expects a mixture of numeric and string parameters,
-requiring \fB@TPUT@\fP to know which type to use.
+requiring \fB\%@TPUT@\fP to know which type to use.
 .IP
-This implementation uses a table to determine the parameter types for
-the standard \fIcap-code\fP operands, and an internal library
-function to analyze nonstandard \fIcap-code\fP operands.
+.I \%ncurses
+\fB\%@TPUT@\fP
+uses a table to determine the parameter types for
+the standard
+.I cap-code
+operands,
+and an internal function to analyze nonstandard
+.I cap-code
+operands.
 .IP
-Besides providing more reliable operation than AT&T's utility,
-a portability problem is introduced by this analysis:
+While more reliable than System\ V's utility,
+a portability problem is introduced by this analysis.
 An OpenBSD developer adapted the internal library function from
-\fI\%ncurses\fP to port NetBSD's termcap-based \fBtput\fP to terminfo.
-That had been modified to interpret multiple commands on a line.
+.I \%ncurses
+to port NetBSD's
+.IR termcap -based
+.B tput
+to
+.I \%term\%info,
+and modified it to interpret multiple
+.I cap-codes
+(and parameters)
+on the command line.
 Portable applications should not rely upon this feature;
-\fI\%ncurses\fP provides it to support applications written
-specifically for OpenBSD.
+.I \%ncurses
+offers it to support applications written specifically for OpenBSD.
 .PP
-This implementation (unlike others) can accept both \fItermcap\fP
-and \fIterminfo\fP names for the \fIcap-code\fP feature,
+This implementation,
+unlike others,
+accepts both
+.I termcap
+and
+.I \%term\%info
+.I cap-codes
 if
-\fItermcap\fP 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).
+.I termcap
+support is compiled in.
+In that case,
+however,
+the predefined
+.I termcap
+and
+.I \%term\%info
+codes have two
+ambiguities;
+.I \%ncurses
+assumes the
+.I \%term\%info
+code.
+.bP
+The
+.I cap-code
+.B dl
+means
+.B \%delete_line
+to
+.I termcap
+but
+.B \%parm_delete_line
+to
+.I \%term\%info.
+.I termcap
+uses the code
+.B DL
+for
+.BR \%parm_delete_line .
+.I \%term\%info
+uses the code
+.B dch1
+for
+.BR \%delete_line .
+.bP
+The
+.I cap-code
+.B ed
+means
+.B \%exit_delete_mode
+to
+.I termcap
+but
+.B \%clr_eos
+to
+.I \%term\%info.
+.I termcap
+uses the code
+.B cd
+for
+.BR \%clr_eos .
+.I \%term\%info
+uses the code
+.B rmdc
+for
+.BR \%exit_delete_mode .
 .PP
-The \fBlongname\fP and \fB\-S\fP options, and the parameter-substitution
-features used in the \fBcup\fP example,
+The
+.B \%longname
+operand,
+.B \-S
+option,
+and the parameter-substitution features used in the
+.B cup
+example below,
 were not supported in
 AT&T/USL
 .I curses
 before SVr4 (1989).
-Later, 4.3BSD-Reno (1990) added support for \fBlongname\fP,
+Later,
+4.3BSD-Reno (1990) added support for
+.BR \%longname ,
 .\" longname was added in October 1989.
-and NetBSD (1994) added support for the parameter-substitution features.
+and in 1994,
+NetBSD added support for the parameter-substitution features.
 .PP
-IEEE Std 1003.1/The Open Group  Base Specifications Issue 7 (POSIX.1-2008)
-documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
-There are a few interesting observations to make regarding that:
-.bP
-In this implementation,
-\fBclear\fP is part of the \fIcap-code\fP support.
-The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal
-capabilities.
-.bP
-Other implementations of \fBtput\fP on
-SVr4-based systems such as Solaris, IRIX64 and HP-UX
-as well as others such as AIX and Tru64
-provide support for \fIcap-code\fP operands.
-.bP
-A few platforms such as FreeBSD recognize termcap names rather
-than terminfo capability names in their respective \fBtput\fP commands.
-Since 2010, NetBSD's \fBtput\fP uses terminfo names.
-Before that, it (like FreeBSD) recognized termcap names.
+IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+(POSIX.1-2008)
+documents only the
+.BR clear ,
+.BR init ,
+and
+.B \%reset
+operands.
+A few observations of interest arise from that selection.
+.bP
+.I \%ncurses
+supports
+.B clear
+as it does any other standard
+.I cap-code.
+The others
+.RB ( init
+and
+.BR \%longname )
+do not correspond to terminal capabilities.
+.bP
+The
+.B tput
+on SVr4-based systems such as Solaris,
+IRIX64,
+and HP-UX,
+as well as others such as AIX and Tru64,
+also support standard
+.I cap-code
+operands.
+.bP
+A few platforms such as FreeBSD recognize
+.I termcap
+names rather than
+.I \%term\%info
+capability names in their respective
+.B tput
+commands.
+Since 2010,
+NetBSD's
+.B tput
+uses
+.I \%term\%info
+names.
+Before that,
+it
+(like FreeBSD)
+recognized
+.I termcap
+names.
 .IP
-Beginning in 2021, FreeBSD uses the \fI\%ncurses\fP \fBtput\fP,
-configured for both terminfo (tested first) and termcap (as a fallback).
+Beginning in 2021,
+FreeBSD uses
+.I \%ncurses
+.BR tput ,
+configured for both
+.I \%term\%info
+(tested first)
+and
+.I termcap
+(as a fallback).
 .PP
-Because (apparently) \fIall\fP of the certified Unix systems
-support the full set of capability names, the reasoning for documenting
-only a few may not be apparent.
-.bP
-X/Open Curses Issue 7 documents \fBtput\fP differently,
-with \fIcap-code\fP and the other features used in this implementation.
-.bP
-That is, there are two standards for \fBtput\fP:
+Because (apparently) all
+.I certified
+Unix systems support the full set of capability codes,
+the reason for documenting only a few may not be apparent.
+.bP
+X/Open Curses Issue 7 documents
+.B tput
+differently,
+with
+.I cap-code
+and the other features used in this implementation.
+.bP
+That is,
+there are two standards for
+.BR 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.
+POSIX documents a subset to avoid the complication of including
+X/Open Curses and the terminal capability database.
 .bP
-While it is certainly possible to write a \fBtput\fP program
-without using
+While it is certainly possible to write a
+.B tput
+program without using
 .I curses,
 no system with a
 .I curses
-implementation provides a \fBtput\fP utility that does not also supply
-the \fIcap-code\fP feature.
+implementation provides a
+.B tput
+utility that does not also support standard
+.I cap-codes.
 .PP
 X/Open Curses Issue 7 (2009) is the first version to document utilities.
 However that part of X/Open Curses does not follow existing practice
@@ -528,141 +704,286 @@ System\ V
 behavior).
 .bP
 It assigns exit status 4 to \*(``invalid operand\*('',
-which may be the same as \fIunknown capability\fP.
-For instance, the source code for Solaris' xcurses uses the term
-\*(``invalid\*('' in this case.
-.bP
-It assigns exit status 255 to a numeric variable that is not specified in
-the terminfo database.
+which may have the same meaning as \*(``unknown capability\*(''.
+For instance,
+the source code for
+Solaris
+.I xcurses
+uses the term \*(``invalid\*('' in this case.
+.bP
+It assigns exit status 255 to a numeric variable that is not specified
+in the
+.I \%term\%info
+database.
 That likely is a documentation error,
-confusing the \fB\-1\fP written to the standard output for an absent
-or cancelled numeric value versus an (unsigned) exit status.
+mistaking the \*(``\-1\*('' written to the standard output to indicate
+an absent or cancelled numeric capability for an (unsigned) exit status.
 .PP
-The various Unix systems (AIX, HP-UX, Solaris) use the same exit statuses
-as \fI\%ncurses\fP.
+The various System\ V implementations
+(AIX,
+HP-UX,
+Solaris)
+use the same exit statuses as
+.I \%ncurses.
 .PP
-NetBSD curses documents different exit statuses which do not correspond
-to either \fI\%ncurses\fP or X/Open.
+NetBSD
+.I curses
+documents exit statuses that correspond to neither
+.I \%ncurses
+nor X/Open Curses.
 .SH HISTORY
-The \fBtput\fP command was begun by Bill Joy in 1980.
-The initial version only cleared the screen.
+Bill Joy wrote a
+.B tput
+command during development of 4BSD in October 1980.
+This initial version only cleared the screen,
+and did not ship with official distributions.
+.\" It also exited with backwards exit status (1 on success, 0 on
+.\" failure), and was characterized by Bostic in 1988 as "pretty
+.\" unreasonable".
+.\" See Spinellis's "unix-history-repo" on GitHub.
 .PP
-AT&T System V provided a different \fBtput\fP command:
+System\ V developed a different
+.B tput
+command.
 .bP
-SVr2 provided a rudimentary \fBtput\fP
-which checked the parameter against each
+SVr2 (1984) provided a rudimentary
+.B tput
+that checked the parameter against each
 predefined capability and returned the corresponding value.
-This version of \fBtput\fP did not use \fBtparm\fP(3X) for
-the capabilities which are parameterized.
-.bP
-SVr3 replaced that, a year later, by a more extensive program
-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.
-.bP
-SVr4 added color initialization using the \fBorig_colors\fP and
-\fBorig_pair\fP capabilities in the \fBinit\fP subcommand.
-.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.
-Like the AT&T program, Bostic's version
-accepted some parameters named for \fIterminfo\fP capabilities
-(\fBclear\fP, \fBinit\fP, \fBlongname\fP and \fBreset\fP).
-However (because he had only \fItermcap\fP available),
-it accepted \fItermcap\fP names for other capabilities.
-Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes
-as the earlier BSD \fBtset\fP had done.
+This version of
+.B tput
+did not use \fB\%tparm\fP(3X) for parameterized capabilities.
+.bP
+SVr3 (1987) replaced that
+.\" SVr3 released in 1987, not 1985.
+.\" https://unix.org/what_is_unix/history_timeline.html
+with a more extensive program
+whose support for
+.B init
+and
+.B \%reset
+operands
+(more than half the program)
+incorporated the
+.B \%reset
+feature of BSD
+.B tset
+written by Eric Allman.
+.bP
+SVr4 (1989) added color initialization by using the
+.B \%orig_colors
+.RB ( oc )
+and
+.B \%orig_pair
+.RB ( op )
+capabilities in its
+.B init
+logic.
 .PP
-At the same time, Bostic added a shell script named \*(``clear\*('',
-which used \fBtput\fP to clear the screen.
+Keith Bostic refactored BSD
+.B tput
+for shipment in 4.3BSD-Tahoe (1988),
+then replaced it the next year with a new implementation based on
+System\ V
+.BR tput .
+Bostic's version similarly accepted some parameters named for
+.I \%term\%info
+(pseudo-)capabilities:
+.BR clear ,
+.BR init ,
+.BR \%longname ,
+and
+.BR \%reset .
+However,
+because he had only
+.I termcap
+available,
+it accepted
+.I termcap
+names for other capabilities.
+Also,
+Bostic's BSD
+.B tput
+did not modify the terminal modes as the earlier BSD
+.B tset
+had done.
 .PP
+At the same time,
+Bostic added a shell script named \*(``clear\*('' that used
+.B tput
+to clear the screen.
 Both of these appeared in 4.4BSD,
-becoming the \*(``modern\*('' BSD implementation of \fBtput\fP.
+becoming the \*(``modern\*('' BSD implementation of
+.BR tput .
 .PP
-This implementation of \fBtput\fP began from a different source than
-AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on
-\fIcomp.sources.unix\fP in December 1992.
+The origin of
+.I \%ncurses
+\fB\%@TPUT@\fP lies outside both System\ V and BSD,
+in Ross Ridge's
+.I \%mytinfo
+package,
+published on
+.I comp.sources.unix
+in December 1992.
 Ridge's program made more sophisticated use of the terminal capabilities
 than the BSD program.
-Eric Raymond used that \fBtput\fP program
-(and other parts of \fImytinfo\fP) in \fI\%ncurses\fP in June 1995.
-Using the portions dealing with terminal capabilities
+Eric Raymond used that
+.B tput
+program
+(and other parts of
+.IR \%mytinfo )
+in
+.I \%ncurses
+in June 1995.
+Incorporating the portions dealing with terminal capabilities
 almost without change,
-Raymond made improvements to the way the command-line parameters
+Raymond made improvements to the way command-line parameters
 were handled.
+.PP
+Before
+.I \%ncurses
+6.1 (2018),
+its \fB\%@TSET@\fP and \fB\%@TPUT@\fP utilities differed.
+.bP
+\fB\%@TSET@\fP was more effective,
+resetting the terminal modes and special characters.
+.bP
+On the other hand,
+\fB\%@TSET@\fP's repertoire of terminal capabilities for resetting the
+terminal was more limited;
+it had only equivalents of
+.B \%reset_1string
+.RB ( rs1 ),
+.B \%reset_2string
+.RB ( rs2 ),
+and
+.B \%reset_file
+.RB ( rf ),
+and not the tab stop and margin update features of \fB\%@TPUT@\fP.
+.PP
+The
+.B \%reset
+program is traditionally an alias for \fB\%@TSET@\fP due to its ability
+to reset terminal modes and special characters.
+.PP
+As of
+.I \%ncurses
+6.1,
+the \*(``reset\*('' features of the two programs are (mostly) the same.
+Two minor differences remain.
+.bP
+The \fB\%@TSET@\fP program waits one second when resetting,
+in case the terminal happens to be a hardware device.
+.bP
+The two programs write the terminal initialization strings
+to different streams;
+that is,
+standard error for \fB\%@TSET@\fP and
+standard output for \fB\%@TPUT@\fP.
 .SH EXAMPLES
-.TP 5
-\fB@TPUT@ init\fP
+.TP
+.B "@TPUT@ init"
 Initialize the terminal according to the type of
-terminal in the environment variable \fITERM\fP.
-This command should be included in everyone's .profile after
-the environment variable \fITERM\fP has been exported,
-as illustrated on the \fBprofile\fP(5) manual page.
-.TP 5
-\fB@TPUT@ \-T5620 reset\fP
-Reset an AT&T 5620 terminal, overriding the type of
-terminal in the environment variable \fITERM\fP.
-.TP 5
-\fB@TPUT@ cup 0 0\fP
-Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
-(the upper left corner of the screen, usually known as the \*(``home\*(''
-cursor position).
-.TP 5
-\fB@TPUT@ clear\fP
-Echo the clear-screen sequence for the current terminal.
-.TP 5
-\fB@TPUT@ cols\fP
-Print the number of columns for the current terminal.
-.TP 5
-\fB@TPUT@ \-T450 cols\fP
-Print the number of columns for the 450 terminal.
-.TP 5
-\fBbold=\(ga@TPUT@ smso\(ga offbold=\(ga@TPUT@ rmso\(ga\fP
-Set the shell variables \fBbold\fP, to begin stand-out mode
-sequence, and \fBoffbold\fP, to end standout mode sequence,
-for the current terminal.
-This might be followed by a
-prompt: \fBecho "${bold}Please type in your name: ${offbold}\ec"\fP
-.TP 5
-\fB@TPUT@ hc\fP
-Set exit status to indicate if the current terminal is a hard copy terminal.
-.TP 5
-\fB@TPUT@ cup 23 4\fP
-Send the sequence to move the cursor to row 23, column 4.
-.TP 5
-\fB@TPUT@ cup\fP
-Send the terminfo string for cursor-movement, with no parameters substituted.
-.TP 5
-\fB@TPUT@ longname\fP
-Print the long name from the \fI\%term\%info\fP database for the
-type of terminal specified in the environment
-variable \fITERM\fP.
-.TP 5
-\fB@TPUT@ \-S\fP
-The \fB\-S\fP option can be profitably used with a shell
-\*(``here document\*(''.
+terminal in the
+.I TERM
+environment variable.
+If the system does not reliably initialize the terminal upon login,
+this command can be included in
+.I \%$HOME/.profile
+after exporting the
+.I TERM
+environment variable.
+.TP
+.B "@TPUT@ \-T5620 reset"
+Reset an AT&T 5620 terminal,
+overriding the terminal type in the
+.I TERM
+environment variable.
+.TP
+.B "@TPUT@ cnorm"
+Set cursor to normal visibility.
+.TP
+.B "@TPUT@ home"
+Move the cursor to row 0,
+column 0:
+the upper left corner of the screen,
+usually known as the \*(``home\*('' cursor position.
+.TP
+.B "@TPUT@ clear"
+Clear the screen:
+write the
+.B \%clear_screen
+capability's value to the standard output stream.
+.TP
+.B "@TPUT@ cols"
+Report the number of columns used by the current terminal type.
+.TP
+.B "@TPUT@ \-Tadm3a cols"
+Report the number of columns used by an ADM-3A terminal.
+.TP
+.B "strong=\(ga@TPUT@ smso\(ga normal=\(ga@TPUT@ rmso\(ga"
+Set shell variables to capability values:
+.B strong
+and
+.BR normal ,
+to begin and end,
+respectively,
+stand-out mode for the terminal.
+One might use these to present a prompt.
+.IP
+.EX
+.RS 14
+printf "${strong}Username:${normal} "
+.RE
+.EE
+.TP
+.B "@TPUT@ hc"
+Indicate via exit status whether the terminal is a hard copy device.
+.TP
+.B "@TPUT@ cup 23 4"
+Move the cursor to row 23,
+column 4.
+.TP
+.B "@TPUT@ cup"
+Report the value of the
+.B \%cursor_address
+.RB ( cup )
+capability
+(used for cursor movement),
+with no parameters substituted.
+.TP
+.B "@TPUT@ longname"
+Report the
+.I \%term\%info
+database's description of the terminal type specified in the
+.I TERM
+environment variable.
+.TP
+.B "@TPUT@ \-S"
+Process multiple capabilities.
+The
+.B \-S
+option can be profitably used with a shell \*(``here document\*(''.
 .IP
 .EX
-$ \fB@TPUT@ \-S <<!\fP
-> \fBclear\fP
-> \fBcup 10 10\fP
-> \fBbold\fP
-> \fB!\fP
+.RB $\  "@TPUT@ \-S <<!"
+.RB >\  clear
+.RB >\  "cup 10 10"
+.RB >\  bold
+.RB >\  !
 .EE
 .IP
-We see \fB@TPUT@\fP processing several capabilities in one invocation.
-It clears the screen,
+The foregoing
+clears the screen,
 moves the cursor to position
 (10, 10)
 and turns on bold
 (extra bright)
 mode.
-.TP 5
-.B @TPUT@ clear cup 10 10 bold
+.TP
+.B "@TPUT@ clear cup 10 10 bold"
 Perform the same actions as the foregoing
-.RB \%\[lq] @TPUT@
-.BR \-S \[rq]
+.RB \%\*(`` "@TPUT@ \-S" \*(''
 example.
 .SH SEE ALSO
 \fB\%@CLEAR@\fP(1),
diff --git a/man/user_caps.5 b/man/user_caps.5
index ac4da9f71..1b434c7c3 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.44 2023/12/30 21:36:32 tom Exp $
-.TH user_caps 5 2023-12-30 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.47 2024/01/13 22:05:39 tom Exp $
+.TH user_caps 5 2024-01-13 "ncurses 6.4" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -360,29 +360,45 @@ In a terminal description,
 Applications can use the \fInaming convention\fP established for \fBxterm\fP
 to find these special keys in the terminal description.
 .PP
-Starting with the curses convention that \fIkey names\fP begin with \*(``k\*(''
-and that shifted special keys are an uppercase name,
-\fI\%ncurses\fP' terminal database defines these names to which a suffix
-is added:
+Starting with the
+.I curses
+convention that capability codes describing the input generated by a
+terminal's key caps begin with \*(``k\*('',
+and that shifted special keys use uppercase letters in their names,
+.IR \%ncurses 's
+terminal database defines the following names and codes to which a
+suffix is added.
 .PP
 .RS 5
 .TS
-tab(/) ;
-l l .
-\fBName\fP/\fBDescription\fP
+Lb Lb
+Lb Lx.
+Code	Description
 _
-kDC/special form of kdch1 (delete character)
-kDN/special form of kcud1 (cursor down)
-kEND/special form of kend (End)
-kHOM/special form of khome (Home)
-kLFT/special form of kcub1 (cursor-left or cursor-back)
-kNXT/special form of knext (Next, or Page-Down)
-kPRV/special form of kprev (Prev, or Page-Up)
-kRIT/special form of kcuf1 (cursor-right, or cursor-forward)
-kUP/special form of kcuu1 (cursor-up)
+kDC	shifted kdch1 (delete character)
+.\" kDC is a standard capability; see X/Open Curses Issue 7, p. 345.
+kDN	shifted kcud1 (cursor down)
+kEND	shifted kend (end)
+kHOM	shifted khome (home)
+kLFT	shifted kcub1 (cursor back)
+kNXT	shifted knext (next)
+kPRV	shifted kprev (previous)
+kRIT	shifted kcuf1 (cursor forward)
+kUP	shifted kcuu1 (cursor up)
 .TE
 .RE
 .PP
+Keycap nomenclature on the Unix systems for which
+.I curses
+was developed differs from today's ubiquitous descendants of the IBM
+PC/AT keyboard layout.
+In the foregoing,
+interpret \*(``backward\*('' as \*(``left\*('',
+\*(``forward\*('' as \*(``right\*('',
+\*(``next\*('' as \*(``page down\*('',
+and
+\*(``prev(ious)\*('' as \*(``page up\*(''.
+.PP
 These are the suffixes used to denote the modifiers:
 .PP
 .RS 5
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 87a7ef05d..3b7a2229a 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1102 $
-#	$Date: 2024/01/06 23:37:36 $
+#	$Revision: 1.1109 $
+#	$Date: 2024/01/13 19:45:34 $
 #
 # 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
@@ -441,12 +441,11 @@ klone+sgr8|attribute control for ansi.sys displays with invis,
 # work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
 # diamond and arrow characters under curses.
 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,
+	bold=\E[1m, 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,
 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
-	use=klone+acs,
+	use=ansi+sgr, use=klone+acs,
 
 # KOI8-R (RFC1489) acs (alternate character set)
 # From: Qing Long <qinglong@Bolizm.ihep.su>, 24 Feb 1996.
@@ -495,13 +494,12 @@ ecma+index|ECMA-48 scroll up/down,
 # For more detail on this rather pathetic standard, see the comments
 # near the end of this file.
 ibcs2|Intel Binary Compatibility Standard prescriptions,
-	cbt=\E[Z, clear=\Ec, cub=\E[%p1%dD, cub1=\E[1D,
-	cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C,
-	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, rc=\E7, rmam=\E[?7l, sc=\E7, smam=\E[?7h,
-	tbc=\E[g, vpa=\E[%i%p1%dd, use=ecma+index,
+	cbt=\E[Z, clear=\Ec, cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
+	cup=\E[%i%p1%d;%p2%dH, 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, rc=\E7,
+	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
+	vpa=\E[%i%p1%dd, use=ansi+local, use=ecma+index,
 
 #### ANSI/ECMA-48 terminals and terminal emulators
 #
@@ -563,13 +561,12 @@ ansi-mtabs|any ANSI terminal with pessimistic assumptions (relative addressing),
 ansi77|ANSI 3.64 standard 1977 version,
 	OTbs, am, mir,
 	cols#80, it#8, lines#24,
-	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
-	dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	il1=\E[L$<5*/>, ind=\ED, kf1=\EOP, kf2=\EOR, kf4=\EOS,
-	nel=\r\ED, ri=\EM, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
-	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+csr,
+	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M$<5*/>,
+	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED,
+	kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM, rmir=\E[4l,
+	rmso=\E[m, rmul=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+	use=ansi+arrows, use=ansi+csr, use=ansi+local1,
 
 # Procomm and some other ANSI emulations don't recognize all of the ANSI-
 # standard capabilities.  This entry deletes <cuu>, <cuf>, <cud>, <cub>, and
@@ -584,10 +581,10 @@ ansi77|ANSI 3.64 standard 1977 version,
 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
 	OTbs, am, mir, msgr,
 	cols#80, lines#24,
-	bel=^G, cr=\r, 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,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M,
 	home=\E[H, ht=^I, il1=\E[L, ind=\n, use=ansi+arrows,
-	use=ansi+erase, use=ansi+inittabs, use=klone+sgr-dumb,
+	use=ansi+erase, use=ansi+inittabs, use=ansi+local1,
+	use=klone+sgr-dumb,
 
 pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
 	lines#25, use=pcansi-m,
@@ -611,14 +608,12 @@ pcansi-43|pcansi43|ibm-pc terminal programs with 43 lines,
 # From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
 ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
 	mc5i,
-	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, kcbt=\E[Z, kich1=\E[L,
-	mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+	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,
+	kcbt=\E[Z, 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, vpa=\E[%i%p1%dd, use=ecma+index,
-	use=pcansi-m,
+	s2ds=\E*B, s3ds=\E+B, vpa=\E[%i%p1%dd, use=ansi+local,
+	use=ecma+index, use=pcansi-m,
 
 # ECMA-48 addresses three of the four capabilities here:
 #
@@ -694,12 +689,11 @@ ansi-generic|ansiterm|generic ANSI standard terminal,
 ansi.sys-old|ANSI.SYS under PC-DOS 2.0,
 	OTbs, am, mir, msgr, xon,
 	cols#80, lines#25,
-	clear=\E[2J, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[k, home=\E[H,
-	is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K,
-	khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, rc=\E[u,
-	rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr,
-	use=klone+color, use=klone+sgr8,
+	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, el=\E[k,
+	home=\E[H, is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L,
+	kcuu1=^K, khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p,
+	rc=\E[u, rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr,
+	use=ansi+local1, use=klone+color, use=klone+sgr8,
 
 # Keypad:	Home=\0G	Up=\0H	PrPag=\0I
 #		ka1,kh		kcuu1		kpp,ka3
@@ -845,9 +839,8 @@ tw100|Toswin VT100 window manager,
 	acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
-	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\EB, cuf=\E[%p1%dC, cuf1=\EC,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea,
+	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub1=^H, cud1=\EB,
+	cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch1=\Ea,
 	dim=\E[2m, 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@, il1=\EL,
 	ind=\n, is2=\E<\E)0, kdch1=^?, kf1=\EOP, kf10=\EOY, kf11=\Ep,
@@ -867,7 +860,7 @@ tw100|Toswin VT100 window manager,
 	     %=%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,
-	use=ansi+apparrows, use=ansi+csr,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+local,
 
 # The entries for stv52 and stv52pc probably need a revision.
 stv52|MiNT virtual console,
@@ -944,21 +937,20 @@ st52-old|Atari ST with VT52 emulation,
 beterm|BeOS Terminal,
 	am, eo, mir, msgr, xenl, xon,
 	colors#8, cols#80, it#8, lines#25, ncv#5, pairs#64,
-	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, kf1=\E[11~, kf10=\E[20~, kf11=\E[21~,
-	kf12=\E[22~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[16~, kf7=\E[17~, kf8=\E[18~, kf9=\E[19~,
-	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM,
-	rmkx=\E[?4l, rmso=\E[m, rmul=\E[24m, rs1=\Ec,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+	kf1=\E[11~, kf10=\E[20~, kf11=\E[21~, kf12=\E[22~,
+	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~,
+	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
+	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
+	rmul=\E[24m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	setb=\E[%p1%{40}%+%cm, setf=\E[%p1%{30}%+%cm,
 	sgr0=\E[0;10m, smkx=\E[?4h, smso=\E[7m, smul=\E[4m,
 	u6=\E[%i%p1%d;%p2%dR, u7=\E[6n, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idc, use=ansi+idl, use=vt220+pcedit,
+	use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=vt220+pcedit,
 
 #### Linux consoles
 #
@@ -994,22 +986,21 @@ linux-basic|Linux console (basic),
 	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, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
-	cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ech=\E[%p1%dX,
-	el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, home=\E[H,
-	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?,
-	kcbt=\E[Z, 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~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM,
-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, 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~, kmous=\E[M, kspd=^Z,
+	nel=\r\n, ri=\EM, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+	rs1=\Ec\E]R,
 	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, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
 	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=vt220+pcedit, use=vt102+enq, use=klone+sgr,
-	use=ecma+color, use=linux+sfkeys,
+	use=ansi+local, use=vt220+pcedit, use=vt102+enq,
+	use=klone+sgr, use=ecma+color, use=linux+sfkeys,
 
 linux+decid|ncurses extension for Linux console DECID,
 	u8=\E[?6c, use=decid+cpr,
@@ -1174,28 +1165,27 @@ kon|kon2|Kanji ON Linux console,
 	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, civis=\E[?25l,
-	cnorm=\E[?25h, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
+	bel=^G, bold=\E[1m, civis=\E[?25l, cnorm=\E[?25h, cr=\r,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
+	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
-	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, invis=\E[8m,
-	kb2=\E[G, kbs=^?, kdch1=\E[3~, kend=\E[4~, 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~,
-	knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, op=\E[37;40m,
-	rev=\E[7m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
+	kdch1=\E[3~, kend=\E[4~, 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~, knp=\E[6~, kpp=\E[5~, kspd=^Z,
+	nel=\r\n, op=\E[37;40m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m,
+	rmso=\E[27m, rmul=\E[24m, rs1=\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%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
 	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=ansi+sgr,
 
 # release: 0.4.7 2005/05
 #
@@ -1285,15 +1275,14 @@ bterm|bogl virtual terminal,
 mach|Mach console,
 	am, km, NQ,
 	cols#80, it#8, lines#25,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y, kf1=\EOP, kf10=\EOY,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
-	kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V,
-	rev=\E[7m, rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m, smso=\E[7m,
-	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+	home=\E[H, ht=^I, ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y,
+	kf1=\EOP, kf10=\EOY, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
+	kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F,
+	knp=\E[U, kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m,
+	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+idl, use=ansi+local,
 
 mach-bold|Mach console with bold instead of underline,
 	rmul=\E[0m, smul=\E[1m, use=mach,
@@ -1355,27 +1344,25 @@ hurd|The GNU Hurd console server,
 	colors#8, it#8, ncv#18, pairs#64,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H,
 	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%dX, el1=\E[1K, flash=\Eg, hpa=\E[%i%p1%dG,
-	ht=^I, ich=\E[%p1%d@, ind=\E[S, invis=\E[8m, kb2=\E[G,
-	kbs=^?, kcbt=\E[Z, 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~,
+	ech=\E[%p1%dX, el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@,
+	ind=\E[S, kb2=\E[G, kbs=^?, kcbt=\E[Z, 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, kspd=^Z, nel=\r\n,
-	op=\E[39;49m, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l,
+	op=\E[39;49m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l,
 	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l,
 	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,
+	smul=\E[4m, grbom=\E[>1l, gsbom=\E[>1h,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=vt220+pcedit,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+rca2, use=ansi+sgr, use=vt220+pcedit,
 	use=ecma+index, use=ecma+italics, use=vt220+cvis,
 
 #### QNX
@@ -1482,9 +1469,7 @@ qansi-g|QNX ANSI,
 	colors#8, cols#80, lines#25, ncv#19, pairs#64, wsl#80,
 	acsc=Oa``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, cuu1=\E[A,
+	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J,
 	el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l,
@@ -1523,8 +1508,9 @@ qansi-g|QNX ANSI,
 	    %|%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, tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
-	use=ansi+arrows, use=ansi+rep, use=ansi+inittabs,
-	use=att610+cvis0, use=decid+cpr, use=ecma+index,
+	use=ansi+arrows, use=ansi+local, use=ansi+rep,
+	use=ansi+inittabs, use=att610+cvis0, use=decid+cpr,
+	use=ecma+index,
 #
 qansi|QNX ANSI with console writes,
 	daisy, xhpa, use=qansi-g,
@@ -1580,27 +1566,26 @@ scoansi-old|SCO Extended ANSI standard crt (5.0.5),
 	     yszr{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,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[=0;12C, dch=\E[%p1%dP,
-	dch1=\E[P, dispc=\E[=%p1%dg, 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[@, ind=\E[S, invis=\E[8m, kbeg=\E[E, kcbt=\E[Z,
-	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, 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=ansi+arrows, use=ansi+idl, use=ecma+index,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=0;12C,
+	dch=\E[%p1%dP, dch1=\E[P, dispc=\E[=%p1%dg, 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[@, ind=\E[S, invis=\E[8m, kbeg=\E[E,
+	kcbt=\E[Z, 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, 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=ansi+arrows, use=ansi+idl,
+	use=ansi+local, use=ecma+index,
 
 scoansi-new|SCO Extended ANSI standard crt (5.0.6),
 	km,
@@ -1658,11 +1643,10 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	am,
 	cols#80, it#8, lines#40,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
-	cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
-	cuu1=\E[A, cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J,
-	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED,
+	cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J, el=\E[K,
+	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED,
 	is2=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8, kDC=\E[P,
 	kEND=\E[147q, kHOM=\E[143q, kLFT=\E[158q, kPRT=\E[210q,
 	kRIT=\E[167q, kSPD=\E[218q, kcbt=\E[Z, kdch1=^?,
@@ -1674,7 +1658,7 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100),
 	nel=\EE, pfkey=\EP101;%p1%d.y%p2%s\E\\, rc=\E8,
 	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
 	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+arrows, use=ansi+idl,
+	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local,
 
 iris-ansi-ap|IRIS ANSI in application-keypad mode,
 	is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi,
@@ -1743,13 +1727,12 @@ pccon+colors|ANSI colors for OpenBSD PC console,
 pccon+base|base capabilities for OpenBSD PC console,
 	am, km, mc5i, msgr, npc, nxon, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
-	cud1=\n, 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,
-	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ind=\ED, nel=\EE, ri=\EM, rmam=\E[?7l,
-	rmul=\E[24m, rs2=\Ec, smam=\E[?7h, smul=\E[4m, tbc=\E[3g,
-	use=ansi+cpr, use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, nel=\EE,
+	ri=\EM, rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, smam=\E[?7h,
+	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
 
 pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
 	use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
@@ -1779,11 +1762,9 @@ pcvtXX|pcvt VT200 emulator (DEC VT220),
 	it#8, vt#3,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
-	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
 	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~,
@@ -1795,7 +1776,8 @@ pcvtXX|pcvt VT200 emulator (DEC VT220),
 	smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+apparrows,
 	use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=decid+cpr, use=ecma+index, use=vt220+cvis,
+	use=ansi+local, use=decid+cpr, use=ecma+index,
+	use=vt220+cvis,
 
 #	NetBSD/FreeBSD VT220 terminal emulator console (pc keyboard & monitor)
 #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
@@ -1861,9 +1843,8 @@ arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
 	cols#80, it#8, lines#30,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n,
 	invis=\E[8m$<2>, ka1=\E[q, ka3=\E[s, kb2=\E[r, kbs=^H,
@@ -1877,7 +1858,7 @@ arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
 	    %;%?%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=ansi+csr,
-	use=ecma+sgr, use=klone+color,
+	use=ansi+local, use=ecma+sgr, use=klone+color,
 
 arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768),
 	cols#132, lines#50, use=arm100,
@@ -1989,10 +1970,8 @@ rcons-color|BSD rasterconsole with ANSI color,
 mgterm|MGL/MGL2 MobileGear Graphic Library,
 	OTbs, OTpt, am, bce, bw, eo, km, msgr, npc,
 	colors#8, cols#80, it#8, lines#18, pairs#64,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
-	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[30;1m, ech=\E[%p1%dX, el1=\E[1K, home=\E[H,
 	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
 	kb2=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M,
@@ -2002,7 +1981,7 @@ mgterm|MGL/MGL2 MobileGear Graphic Library,
 	ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, setb=\E[4%p1%dm,
 	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ecma+index,
+	use=ansi+idl, use=ansi+local, use=ecma+index,
 
 #### FreeBSD console entries
 
@@ -2040,28 +2019,28 @@ cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode),
 	am, bce, bw, eo, msgr, npc,
 	colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C,
-	cr=\r, 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, cuu1=\E[A, cvvis=\E[=1C, dch=\E[%p1%dP,
-	dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX, home=\E[H,
-	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
-	kb2=\E[E, kcbt=\E[Z, 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, 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,
+	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=1C,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
+	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, 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, 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, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idl, use=ecma+index,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ecma+index,
 
 cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode),
 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
@@ -2277,12 +2256,12 @@ origpc3|origibmpc3|IBM PC 386BSD console,
 	cols#80, lines#25,
 	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,
-	kcuu1=\E[A, khome=\E[Y, ri=\E[T, rmso=\E[1;0x\E[2;7x,
-	rmul=\E[1;0x\E[2;7x, sgr0=\E[m\E[1;0x\E[2;7x,
-	smso=\E[1;7x\E[2;0x, smul=\E[1;7x\E[2;0x,
+	bold=\E[7m, clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH,
+	ed=\E[J, el=\E[K, home=\E[H, ind=\E[S, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[Y, ri=\E[T,
+	rmso=\E[1;0x\E[2;7x, rmul=\E[1;0x\E[2;7x,
+	sgr0=\E[m\E[1;0x\E[2;7x, smso=\E[1;7x\E[2;0x,
+	smul=\E[1;7x\E[2;0x, use=ansi+local1,
 
 # description of BSD/386 console emulator in version 1.0 (supplied by BSDI)
 oldpc3|oldibmpc3|old IBM PC BSD/386 console,
@@ -2311,14 +2290,14 @@ bsdos-pc-nobold|BSD/OS PC console w/o bold,
 bsdos-pc-m|bsdos-pc-mono|BSD/OS PC console mono,
 	OTbs, am, eo, km, xon,
 	cols#80, it#8, lines#25,
-	bel=^G, clear=\Ec, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ind=\n, kich1=\E[L, kll=\E[F,
-	knp=\E[G, kpp=\E[I, nel=\r\n, rc=\E8, sc=\E7,
+	bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n,
+	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=ansi+arrows, use=ansi+idl, use=klone+sgr8,
+	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=klone+sgr8,
 
 # Old names for BSD/OS PC console used in releases before 4.1.
 pc3|BSD/OS on the PC console,
@@ -2555,16 +2534,15 @@ vt102+enq|ncurses extension for VT102-style ENQ,
 #
 # (vt100: I added <rmam>/<smam> based on the init string, also <OTbs>. -- esr)
 vt100|vt100-am|DEC VT100 (w/advanced video),
-	OTbs, mc5i, xenl, xon,
+	OTbs, xenl, xon,
 	vt#3,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, lf1=pf1,
-	lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
-	rmam=\E[?7l, rmkx=\E[?1l\E>,
-	rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r,
+	lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;$<2>,
 	smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>,
-	use=ansi+csr, use=decid+cpr, use=vt100+4bsd,
+	use=ansi+csr, use=ansi+pp, use=decid+cpr, use=vt100+4bsd,
 	use=vt100+fnkeys,
 
 vt100+4bsd|DEC VT100 from 4.0BSD,
@@ -2572,9 +2550,8 @@ vt100+4bsd|DEC VT100 from 4.0BSD,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
@@ -2583,7 +2560,7 @@ vt100+4bsd|DEC VT100 from 4.0BSD,
 	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, smso=\E[1;7m$<2>,
-	smul=\E[4m$<2>, tbc=\E[3g,
+	smul=\E[4m$<2>, tbc=\E[3g, use=ansi+local,
 
 vt100nam|vt100-nam|VT100 no automargins,
 	am@, xenl@,
@@ -2693,9 +2670,9 @@ vt220-old|vt200-old|DEC VT220 in VT100 emulation mode,
 	OTnl=\n,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
-	ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH$<10>, dch1=\E[P, ed=\E[J$<50>,
+	el=\E[K$<3>, home=\E[H, ht=^I,
 	if=/usr/share/tabset/vt100, ind=\ED$<20/>,
 	is2=\E[1;24r\E[24;1H, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
@@ -2708,7 +2685,8 @@ vt220-old|vt200-old|DEC VT220 in VT100 emulation mode,
 	    %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, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl1, use=vt220+pcedit, use=vt220+cvis,
+	use=ansi+idl1, use=ansi+local1, use=vt220+pcedit,
+	use=vt220+cvis,
 
 # Here's a picture of the Sun/PC editing keypad:
 #	+--------+--------+--------+
@@ -2751,27 +2729,25 @@ vt220-base|DEC VT220 as emulated,
 	OTbs, am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, el1=\E[1K, enacs=\E)0,
-	flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	if=/usr/share/tabset/vt100, ind=\ED,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED,
 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
-	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
-	rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
+	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, lf1=pf1,
+	lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
+	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
+	rmul=\E[24m, rs1=\E[?3l,
 	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+csr,
 	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
-	use=ansi+idl, use=vt220+vtedit,
+	use=ansi+idl, use=ansi+local, use=vt220+vtedit,
 
 vt220|vt200|DEC VT220,
 	use=vt220+cvis, use=vt220-base,
@@ -2886,11 +2862,9 @@ vt320|vt300|DEC VT320 7 bit terminal,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
 	kbs=^?, kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~,
 	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
@@ -2907,7 +2881,7 @@ vt320|vt300|DEC VT320 7 bit terminal,
 	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=ansi+apparrows, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=dec+pp, use=vt220+cvis,
+	use=ansi+idl, use=ansi+local, use=dec+pp, use=vt220+cvis,
 	use=vt220+keypad, use=dec+sl,
 
 vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy,
@@ -2948,10 +2922,9 @@ vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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, dsl=\E[2$~\r\E[1$}\E[K\E[$},
+	blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	dsl=\E[2$~\r\E[1$}\E[K\E[$},
 	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
 	hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
@@ -2968,7 +2941,7 @@ vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page,
 	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=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=vt220+cvis,
+	use=ansi+idl, use=ansi+local, use=vt220+cvis,
 
 # Left/right margins are supported in xterm since patch #279 (2012/05/10)
 vt420+lrmm|VT420 left/right margins,
@@ -3002,11 +2975,9 @@ vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<10/>, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
-	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J$<10/>,
-	el=\E[K$<4/>, flash=\E[?5h$<200/>\E[?5l, fsl=\E[$},
-	ht=^I, hts=\EH, ind=\ED,
+	cub1=^H, cud1=\n, dsl=\E[2$~\r\E[1$}\E[K\E[$},
+	ed=\E[J$<10/>, el=\E[K$<4/>, flash=\E[?5h$<200/>\E[?5l,
+	fsl=\E[$}, ht=^I, hts=\EH, ind=\ED,
 	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,
@@ -3021,7 +2992,8 @@ vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap,
 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
 	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup,
-	use=ansi+idc, use=ansi+idl, use=dec+sl, use=vt220+cvis,
+	use=ansi+idc, use=ansi+idl, use=ansi+local, use=dec+sl,
+	use=vt220+cvis,
 
 # (vt420: I removed <kf0>, it collided with <kf10>.  I also restored
 # a missing <sc> -- esr)
@@ -3031,19 +3003,17 @@ vt420|DEC VT420,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA, cuu1=\E[A,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J$<50>,
-	el=\E[K$<3>, el1=\E[1K, enacs=\E)0,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, if=/usr/share/tabset/vt300, ind=\ED,
-	is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
-	kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
-	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, nel=\EE,
-	rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, ri=\EM,
-	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<10>, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K,
+	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I,
+	hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
+	ind=\ED, is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p,
+	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
+	nel=\EE, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+	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,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
@@ -3051,8 +3021,8 @@ vt420|DEC VT420,
 	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+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp,
-	use=dec+sl, use=vt220+cvis, use=vt420+lrmm,
-	use=vt220+vtedit,
+	use=ansi+local, use=dec+sl, use=vt220+cvis,
+	use=vt420+lrmm, use=vt220+vtedit,
 
 # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
 # takes two parameters, the key and the string.  Translating the key is
@@ -3397,19 +3367,17 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset,
 	am, bw, msgr, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, el1=\E[1K, ht=^I,
-	hts=\EH, ind=\n, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, rev=\E[7m, ri=\EM,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+	el1=\E[1K, ht=^I, hts=\EH, ind=\n, kbs=^?, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, 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,
 	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=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=vt100+enq,
-	use=vt100+pfkeys,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgr, use=vt100+enq, use=vt100+pfkeys,
 
 nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
@@ -3695,26 +3663,24 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	am, bce, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lines#24, wsl#50,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200/>\E[?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
-	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
-	kend=\EOF, kent=\EOM, 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~, knp=\E[6~,
-	kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM, rmacs=^O,
-	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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, hts=\EH, ind=\n, kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?,
+	kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, kent=\EOM, 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~, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m,
+	ri=\EM, rmacs=^O, 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,
 	sgr=\E[0%?%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, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
 	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
 	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=vt100+keypad, use=xterm+alt47,
-	use=xterm+sl-twm, use=xterm+x11mouse,
+	use=ansi+idl, use=ansi+local, use=vt100+keypad,
+	use=xterm+alt47, use=xterm+sl-twm, use=xterm+x11mouse,
 	use=xterm+256setaf, use=vt220+cvis,
 
 # iTerm2 3.0.15
@@ -3871,9 +3837,7 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 xnuppc+basic|Darwin PowerPC console basic capabilities,
 	am, bce, mir, xenl, NQ,
 	it#8,
-	bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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,
+	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
 	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m,
@@ -3881,7 +3845,7 @@ xnuppc+basic|Darwin PowerPC console basic capabilities,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+erase,
-	use=vt100+keypad,
+	use=ansi+local, use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	colors#8, ncv#32, pairs#64,
@@ -4219,10 +4183,9 @@ putty|PuTTY terminal emulator,
 	am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
 	colors#8, it#8, ncv#22, pairs#64, U8#1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, 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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\ED,
+	cup=\E[%i%p1%d;%p2%dH, 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
@@ -4248,11 +4211,11 @@ putty|PuTTY terminal emulator,
 	smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
 	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+apparrows,
 	use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=ansi+tabs, use=ansi+rep, use=ecma+index,
-	use=vt220+pcedit, use=xterm+alt1049, use=xterm+sm+1006,
-	use=putty+fnkeys, use=vt102+enq, use=xterm+sl,
-	use=vt100+fnkeys, use=putty+keypad, use=vt220+cvis,
-	use=bracketed+paste, use=putty+cursor,
+	use=ansi+local, use=ansi+tabs, use=ansi+rep,
+	use=ecma+index, use=vt220+pcedit, use=xterm+alt1049,
+	use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq,
+	use=xterm+sl, use=vt100+fnkeys, use=putty+keypad,
+	use=vt220+cvis, use=bracketed+paste, use=putty+cursor,
 	use=ecma+strikeout,
 
 # older versions (e.g., before 0.71) of PuTTY used a shift-modifier to toggle
@@ -4862,21 +4825,20 @@ x10term+sl|status-line for X10 xterm,
 xterm-r5|xterm R5 version,
 	OTbs, am, km, msgr, xenl,
 	cols#80, it#8, lines#24,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, hts=\EH, ind=\n, kdl1=\E[31~,
-	kel=\E[8~, kf0=\EOq, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM,
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
+	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
+	kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m,
 	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
 	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+idc, use=ansi+idl,
+	use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local,
 	use=vt220+pcedit, use=vt100+enq,
 
 # Compatible with the R6 xterm
@@ -4888,11 +4850,10 @@ xterm-r6|xterm X11R6 version,
 	OTbs, am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, ed=\E[J, el=\E[K, enacs=\E)0,
-	home=\E[H, ht=^I, hts=\EH, ind=\n,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+	dch1=\E[P, ed=\E[J, el=\E[K, enacs=\E)0, home=\E[H, ht=^I,
+	hts=\EH, ind=\n,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -4905,8 +4866,9 @@ xterm-r6|xterm X11R6 version,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=xterm+alt47,
-	use=ansi+csr, use=ansi+idl, use=vt220+vtedit,
-	use=xterm+kbs, use=vt100+enq,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
+
 xterm-old|antique xterm version,
 	use=xterm-r6,
 # The monochrome version began as a copy of "xtermm" (from Solaris), and was
@@ -4924,12 +4886,11 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	OTbs, am, bce, km, mir, msgr, xenl, XT,
 	cols#80, lines#24, ncv@,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	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,
-	ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, 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, ind=\n,
+	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
 	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, 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~,
@@ -4949,9 +4910,9 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
-	use=ansi+idl, use=ansi+inittabs, use=xterm+alt47,
-	use=xterm+kbs, use=vt100+enq, use=ecma+color,
-	use=vt220+cvis, use=vt220+keypad,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
+	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -5317,18 +5278,16 @@ xterm-basic|modern xterm terminal emulator - common,
 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
 	colors#8, cols#80, lines#24, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[2m, 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,
-	ich=\E[%p1%d@, ind=\n, invis=\E[8m,
-	is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El,
-	memu=\Em, op=\E[39;49m, 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=\E[!p\E[?3;4l\E[4l\E>,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>,
+	kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM,
+	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	rs2=\E[!p\E[?3;4l\E[4l\E>, 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}
@@ -5338,8 +5297,9 @@ xterm-basic|modern xterm terminal emulator - common,
 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
 	E3=\E[3J, use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+pp, use=xterm+kbs,
-	use=xterm+alt+title, use=att610+cvis, use=xterm+meta,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+sgr, use=xterm+kbs, use=xterm+alt+title,
+	use=att610+cvis, use=xterm+meta,
 
 xterm+meta|meta mode for xterm,
 	km,
@@ -6006,9 +5966,7 @@ xtermm|xterm terminal emulator (monochrome),
 	OTbs, am, km, mir, msgr, xenl,
 	btns#3, cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cud1=\n,
 	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K$<3>, enacs=\E(B\E)0,
 	getm=\E[%p1%dY, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
 	ind=\n, kend=\E[Y, kf0=\EOy, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
@@ -6022,7 +5980,7 @@ xtermm|xterm terminal emulator (monochrome),
 	sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1,
 	smso=\E[7m, tbc=\E[3g, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=decid+cpr, use=vt100+fnkeys,
+	use=ansi+local, use=decid+cpr, use=vt100+fnkeys,
 
 xtermc|xterm terminal emulator (color),
 	colors#8, ncv#7, pairs#64,
@@ -6072,26 +6030,24 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X,
 	OTbs, am, km, mir, msgr, xenl, XT,
 	cols#80, it#8, lines#65, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
-	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kend=\E[8~,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[7~,
-	kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E>\E[?41;1r,
-	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I,
+	ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l,
+	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	rmcup=\E>\E[?41;1r, rmir=\E[4l, 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<,
 	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=ansi+apparrows, use=ansi+csr,
-	use=ansi+idl, use=decid+cpr, use=ecma+color,
-	use=vt220+keypad,
+	use=ansi+idl, use=ansi+local, use=decid+cpr,
+	use=ecma+color, use=vt220+keypad,
 
 # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
 # work in that case.  This entry uses xterm+acs, to work around that problem.
@@ -6415,23 +6371,23 @@ termite|VTE-based terminal,
 	cols#80, lines#24, ncv@,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	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,
-	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, 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>,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, 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, 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, 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>,
 	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, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr,
 	use=ansi+enq, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ecma+index, use=ecma+italics,
-	use=xterm+alt1049, use=xterm+256color, use=ecma+color,
-	use=vt220+cvis, use=xterm+pcfkeys, use=xterm+sl-twm,
+	use=ansi+local, use=xterm+alt1049, use=xterm+256color,
+	use=ecma+color, use=vt220+cvis, use=xterm+pcfkeys,
+	use=xterm+sl-twm,
 
 #### Other GNOME
 # Multi-GNOME-Terminal 1.6.2
@@ -6703,12 +6659,10 @@ mlterm2|multi lingual terminal emulator 2.x,
 	am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
 	colors#8, cols#80, lines#24, pairs#64,
 	acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=, home=\E[H, hpa=\E[%i%p1%dG,
-	ich=\E[%p1%d@, ind=\n,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
+	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
 	kcbt=\E[Z, kend=\EOF, kent=\EOM, kind=\EO1;2B, kmous=\E[M,
 	kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rev=\E[7m,
@@ -6722,8 +6676,9 @@ mlterm2|multi lingual terminal emulator 2.x,
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u8=\E[?1;2c,
 	vpa=\E[%i%p1%dd, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
-	use=vt220+vtedit, use=xterm+alt1049, use=ecma+index,
-	use=mlterm+pcfkeys, use=vt220+cvis, use=xterm+r6f2,
+	use=ansi+local, use=vt220+vtedit, use=xterm+alt1049,
+	use=ecma+index, use=mlterm+pcfkeys, use=vt220+cvis,
+	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
@@ -6769,11 +6724,9 @@ rxvt-basic|rxvt terminal base (X Window System),
 	cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\n,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, 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=^H,
 	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=^O,
@@ -6786,8 +6739,9 @@ rxvt-basic|rxvt terminal base (X Window System),
 	    %p9%t\016%e\017%;,
 	sgr0=\E[0m\017, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
-	use=vt220+cvis, use=vt220+keypad,
+	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
+
 # Key Codes from rxvt reference:
 #
 # Note: Shift + F1-F10 generates F11-F20
@@ -7014,9 +6968,7 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
 	btns#5, cols#80, it#8, lines#24, lm#0, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
 	ind=\n, is1=\E[?47l\E>\E[?1l,
@@ -7032,9 +6984,9 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, smkx=,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=ansi+csr, use=ansi+idl, use=xterm+alt47,
-	use=vt100+enq, use=rxvt+pcfkeys, use=ecma+color,
-	use=vt220+cvis,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
+	use=ecma+color, use=vt220+cvis,
 
 Eterm-256color|Eterm with xterm 256-colors,
 	use=xterm+256color, use=Eterm,
@@ -7180,11 +7132,10 @@ emu-220|Emu-220 (vt200-7bit mode),
 	cols#80, it#8, lines#24, vt#200,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[0;5m, bold=\E[0;1m, clear=\E[2J\E[H, cr=\r,
-	cub=\E[%p1%dD, cub1=\E[1D, cud=\E[%p1%dB, cud1=\E[1B,
-	cuf=\E[%p1%dC, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[1A, dch=\E[%p1%dP, dch1=\E[1P,
-	dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	enacs=\E)0, home=\E[H, ht=^I, hts=\EH,
+	cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP,
+	dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K,
+	el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH,
 	if=/usr/share/tabset/vt300, il=\E[%p1%dL, il1=\E[1L,
 	ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, kbs=^H,
 	kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
@@ -7201,7 +7152,7 @@ emu-220|Emu-220 (vt200-7bit mode),
 	    2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
 	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=ansi+csr,
-	use=vt220+vtedit, use=vt220+cvis,
+	use=ansi+local, use=vt220+vtedit, use=vt220+cvis,
 
 #### MVTERM
 # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
@@ -7219,21 +7170,20 @@ mvterm|vv100|SwitchTerm aka mvTERM,
 	colors#8, cols#80, it#8, lines#24, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
-	ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, op=\E[100m,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0,
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	op=\E[100m, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[?1l\E>,
+	rmso=\E[m, rmul=\E[m,
 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=xterm+alt47, use=vt100+fnkeys, use=x10term+sl,
+	use=ansi+local, use=xterm+alt47, use=vt100+fnkeys,
+	use=x10term+sl,
 
 #### MTERM
 #
@@ -7244,18 +7194,16 @@ mterm-ansi|ANSI emulation,
 	am, bw, mir, msgr,
 	it#8,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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%dP, dim=\E[2m, ech=\E[%p1%dX,
-	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
-	invis=\E[8m, is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m,
-	ri=\E[T, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\017,
+	kbs=^H, nel=\EE, ri=\E[T, rmacs=^O, 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, smso=\E[7m, smul=\E[4m,
 	vpa=\E[%i%p1%dd, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=ecma+index,
+	use=ansi+idl, use=ansi+local, use=ansi+sgr,
+	use=ecma+index,
 
 # mterm normally sets $TERM to "mterm"
 mterm|mouse-sun|Der Mouse term,
@@ -7272,28 +7220,25 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	am, mir, msgr, xenl,
 	colors#8, it#8, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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%dP, dim=\E[2m, ech=\E[%p1%dX,
-	enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=,
-	ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~, nel=\EE, op=\E[0m, rev=\E[7m,
-	ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0,
+	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
+	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, 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~, nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	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, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+cpr,
 	use=ansi+csr, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=vt220+vtedit, use=ecma+index,
-	use=vt220+cvis,
+	use=ansi+idl, use=ansi+local, use=ansi+sgr,
+	use=vt220+vtedit, use=ecma+index, use=vt220+cvis,
 
 #### VWM
 # http://vwm.sourceforge.net/
@@ -7305,23 +7250,20 @@ vwmterm|VWM terminal,
 	am, bce, ccc, mir, msgr, npc, xenl, xon,
 	colors#8, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
-	cuu1=\E[A, cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L,
-	ind=\n, invis=\E[8m, 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[22~, 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,
-	rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
+	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[22~, 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~, rmacs=\E[10m,
+	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, smso=\E[3m,
-	smul=\E[4m, use=ansi+erase, use=vt220+cvis,
-	use=xterm+alt1049,
+	smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr,
+	use=vt220+cvis, use=xterm+alt1049,
 
 #### MGR
 #
@@ -7436,13 +7378,11 @@ st-0.6|simpleterm 0.6,
 	colors#8, cols#80, lines#24, pairs#64,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
 	     zz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n, invis=\E[8m,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
 	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,
@@ -7467,9 +7407,9 @@ st-0.6|simpleterm 0.6,
 	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kil1=\E[2;5~,
 	kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A, krmir=\E[2;2~,
-	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, rev=\E[7m,
-	ri=\EM, rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
+	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, ri=\EM,
+	rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
 	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,
@@ -7481,10 +7421,10 @@ st-0.6|simpleterm 0.6,
 	smso=\E[7m, smul=\E[4m, u8=\E[?1;2c, vpa=\E[%i%p1%dd,
 	Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+apparrows,
 	use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=vt220+pcedit, use=ecma+index,
-	use=xterm+alt1049, use=vt220+cvis, use=xterm+sl,
-	use=ecma+italics, use=ecma+strikeout,
-	use=bracketed+paste,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgr,
+	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
+	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
+	use=ecma+strikeout, use=bracketed+paste,
 #
 # st-0.1.1
 #
@@ -7614,12 +7554,10 @@ terminator|Terminator no line wrap,
 	bce, eo, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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, 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, ind=\n,
+	bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, 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, 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=^?,
 	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -7632,7 +7570,7 @@ terminator|Terminator no line wrap,
 	    %;m%?%p9%t\E(0%e\E(B%;,
 	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+idl,
+	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
 	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
 	use=xterm+256setaf, use=xterm+sl-twm,
 	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
@@ -7951,23 +7889,22 @@ kitty+common|KovId's TTY common properties,
 	cols#80, lines#24,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, 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, ich=\E[%p1%d@, ind=\n,
-	kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z, op=\E[39;49m,
-	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
-	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, 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,
+	ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?,
+	kcbt=\E[Z, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m,
+	rmul=\E[24m, rs1=\E]\E\\\Ec,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%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, vpa=\E[%i%p1%dd,
 	Smulx=\E[4:%p1%dm, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+rep,
-	use=xterm+focus, use=xterm+sm+1006, use=ecma+index,
-	use=xterm+pcfkeys, use=xterm+sl-twm,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=xterm+focus, use=xterm+sm+1006,
+	use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm,
 	use=ecma+strikeout, use=ecma+italics,
 	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
 	use=bracketed+paste, use=report+version,
@@ -8015,24 +7952,24 @@ foot+base|foot base fragment,
 	am, bce, bw, mir, msgr, npc, xenl, AX, XT,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m,
-	is2=\E[!p\E[4l\E>, kbs=^?, kcbt=\E[Z, oc=\E]104\E\\,
-	op=\E[39;49m, 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[4l\E>,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
+	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmacs=\E(B,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	rs1=\Ec, rs2=\E[!p\E[4l\E>,
 	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis,
 	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
 	use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
-	use=ansi+tabs, use=ecma+index, use=ecma+italics,
-	use=ecma+strikeout, use=xterm+alt+title,
-	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
-	use=xterm+sl-alt, use=bracketed+paste,
-	use=report+version, use=xterm+focus,
+	use=ansi+tabs, use=ansi+sgr, use=ecma+index,
+	use=ecma+italics, use=ecma+strikeout,
+	use=xterm+alt+title, use=xterm+pcfkeys,
+	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
+	use=bracketed+paste, use=report+version,
+	use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -8208,16 +8145,14 @@ contour|contour-latest|Contour Terminal Emulator,
 	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
 	cols#80, lines#24, pairs#0x7fff,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, dsl=\E[$~,
-	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
-	fsl=\E[$}, hpa=\E[%i%p1%dG, ind=\n, indn=\E[%p1%dS,
-	invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z,
-	kend=\EOF, khlp=, kmous=\E[M, kund=, oc=\E]104\E\\,
-	op=\E[39;49m, rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmacs=\E(B,
-	rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\E]\E\\\Ec,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
+	ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=,
+	kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=,
+	oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM,
+	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmkx=\E[?1l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
 	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(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h,
@@ -8226,8 +8161,8 @@ contour|contour-latest|Contour Terminal Emulator,
 	Rmol=\E[55m, Se=\E[ q, Smol=\E[53m, Smulx=\E[4:%p1%dm,
 	Ss=\E[%p1%d q, use=ansi+apparrows, use=ansi+cup,
 	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+rep, use=att610+cvis,
-	use=ecma+italics, use=ecma+strikeout,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
 	use=xterm+256color, use=xterm+alt1049, use=xterm+pcc2,
 	use=xterm+pce2, use=xterm+pcf2,
 
@@ -8266,26 +8201,25 @@ pty|4bsd pseudo teletype,
 eterm|GNU Emacs term.el terminal emulation,
 	am, mir, xenl,
 	cols#80, lines#24,
-	bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
 	rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
 	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr,
-	use=ansi+erase, use=ansi+idl, use=xterm+alt47,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47,
 
 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 	msgr,
 	colors#8, pairs#64,
-	blink=\E[5m, invis=\E[8m, kbs=^?, khome=\E[1~,
-	op=\E[39;49m, ri=\EM, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-	setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
+	kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec, 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,
 	sgr0=\E[m, use=ansi+apparrows, use=ansi+csr,
-	use=vt220+pcedit, use=eterm,
+	use=ansi+sgr, use=vt220+pcedit, use=eterm,
 
 # shell.el can "do" color, though not nearly as well.
 #
@@ -8385,26 +8319,25 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
-	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dS,
-	is2=\E)0, kbs=^?, kcbt=\E[Z, 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~, kmous=\E[M, nel=\EE, 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,
+	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
+	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?,
+	kcbt=\E[Z, 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~,
+	kmous=\E[M, nel=\EE, 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,
 	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, smir=\E[4h, smkx=\E[?1h\E=,
 	smso=\E[3m, smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B,
 	S0=\E(%p1%c, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
-	use=ecma+color, use=vt100+enq,
+	use=ansi+local, use=xterm+kbs, use=vt220+pcedit,
+	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8607,31 +8540,28 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
 
 screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x),
 	cols#80, lines#24,
-	clear=\E[2J\E[H, cr=\r, 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, cuu1=\E[A, ed=\E[J,
-	el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
+	clear=\E[2J\E[H, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
 	kcuf1=\EC, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU,
 	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I,
 	khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
 	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m,
 	smul=\E[4m, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs,
+	use=ansi+inittabs, use=ansi+local,
 
 # (screen3: removed unknown ":xv:LP:G0:" -- esr)
 screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
 	km, mir, msgr,
 	cols#80, lines#24,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ich=\E[%p1%d@, ind=\n,
-	is2=\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE,
-	rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m,
-	rmul=\E[24m, rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=,
-	smso=\E[3m, smul=\E[4m, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP,
+	dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n, is2=\E)0,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
+	ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m,
+	rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m,
+	smul=\E[4m, use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local,
 
 # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file
 # was last updated in 2009 to include 256-color support.  The most recent
@@ -8757,11 +8687,10 @@ dvtm|dynamic virtual terminal manager,
 	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[?47l\E=\E[?1l,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 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,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
@@ -8783,8 +8712,9 @@ dvtm|dynamic virtual terminal manager,
 	    %p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+idl, use=xterm+alt47,
-	use=vt220+vtedit, use=vt220+cvis, use=ecma+italics,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt220+vtedit, use=vt220+cvis,
+	use=ecma+italics,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
 	colors#0x100, pairs#0x10000,
@@ -8834,10 +8764,8 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	am, km, mir, msgr, xenl,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
-	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dch1=\E[P, ed=\E[J, 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,
 	ind=\n$<150*>,
@@ -8856,7 +8784,8 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	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=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=vt220+cvis, use=xterm+sl, use=ansi+enq,
+	use=ansi+idl, use=ansi+local, use=vt220+cvis,
+	use=xterm+sl, use=ansi+enq,
 
 ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
 	use=ncsa-m, use=klone+color,
@@ -8914,9 +8843,9 @@ elks-vt52|ELKS VT52 console,
 	home=\EH, use=elks-glasstty,
 
 elks-ansi|ELKS ANSI console,
-	clear=\E[H\E[2J, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
-	rmso=\E[m, smso=\E[7m, use=elks-glasstty,
+	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+	el=\E[K, home=\E[H, rmso=\E[m, smso=\E[7m, use=ansi+local1,
+	use=elks-glasstty,
 
 # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
 # instead of VT52, but the "elks" entry still refers to the latter.
@@ -8953,12 +8882,12 @@ pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation,
 oldsun|Sun Microsystems Workstation console,
 	OTbs, am, km, mir, msgr,
 	cols#80, it#8, lines#34,
-	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
-	ind=\n, is1=\E[1r, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	khome=\E[H, rmso=\E[m, sgr0=\E[m, smso=\E[7m, use=ansi+idl,
+	bel=^G, clear=^L, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[1r, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, khome=\E[H, rmso=\E[m, sgr0=\E[m,
+	smso=\E[7m, use=ansi+idl, use=ansi+local1,
 
 # From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
 # <lines> capability later corrected by J.T. Conklin <jtc@cygnus.com>
@@ -9063,15 +8992,14 @@ sun-type4|Sun Workstation console with type 4 keyboard,
 # It supports bold, but not underline -TD (2009-09-19)
 sun-color|Sun Microsystems Workstation console with color support (IA systems),
 	colors#8, ncv#3, pairs#64,
-	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, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	bold=\E[1m, cub1=^H, cud1=\n, home=\E[H, op=\E[0m,
+	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=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-	use=sun,
+	use=ansi+local, use=sun,
 
 #### Iris consoles
 #
@@ -9270,16 +9198,15 @@ news29|news28-a|old Sony VT100 emulator 29 lines,
 nwp511|nwp-511|nwp-511 VT100,
 	OTbs, OTpt, am, xenl,
 	cols#80, lines#24,
-	clear=\E[;H\E[2J$<20/>, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A$<2/>, dl1=\E[M,
-	ed=\E[J$<30/>, el=\E[K$<3/>,
+	clear=\E[;H\E[2J$<20/>, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[A$<2/>, dl1=\E[M, ed=\E[J$<30/>, el=\E[K$<3/>,
 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
 	il1=\E[L, is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\E#W, khome=\E[H,
 	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
 	rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h,
-	smso=\E[7m$<2/>, smul=\E[4m$<2/>,
+	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1,
 # (news517: this had :TY=sjis:. --esr)
 nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
 	eslok, hs,
@@ -9305,27 +9232,26 @@ dtterm|CDE desktop terminal,
 	am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, lm#0, ncv@,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, ech=\E[%p1%dX,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
-	invis=\E[8m, is2=\E F\E>\E[?1l\E[?7h\E[?45l, kbs=^H,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 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~, khlp=\E[28~, nel=\EE, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmso=\E[22;27m,
-	rmul=\E[24m,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH,
+	ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l,
+	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	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~,
+	khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
 	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=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgr, use=decid+cpr, use=vt220+vtedit,
+	use=vt220+cvis, use=ecma+color,
 
 ######## Non-Unix Consoles
 #
@@ -9368,13 +9294,12 @@ ansi-color-3-emx|ANSI.SYS color 3,
 mono-emx|stupid monochrome ANSI terminal with only one kind of emphasis,
 	am,
 	cols#80, it#8, lines#24,
-	clear=\E[H\E[2J$<50>, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
-	ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P, kcuf1=\0M,
-	kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=, kf4=\0>,
-	kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C, khome=\0G,
-	kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n, rev=\E[7m,
-	sgr0=\E[0m,
+	clear=\E[H\E[2J$<50>, cup=\E[%i%p1%d;%p2%dH, el=\E[K,
+	home=\E[H, ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P,
+	kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=,
+	kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C,
+	khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n,
+	rev=\E[7m, sgr0=\E[0m, use=ansi+local1,
 
 #### Cygwin
 
@@ -9448,14 +9373,12 @@ cygwin|ANSI emulation for Cygwin,
 	     \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, cr=\r, 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, cuu1=\E[A,
-	el1=\E[1K, fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ind=\n,
-	invis=\E[8m, kb2=\E[G, 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~,
+	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, fsl=^G, home=\E[H, ht=^I,
+	ind=\n, invis=\E[8m, kb2=\E[G, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
 	rev=\E[7m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m, rmso=\E[27m,
 	rmul=\E[24m, rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm,
@@ -9463,9 +9386,10 @@ cygwin|ANSI emulation for Cygwin,
 	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, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tsl=\E];, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=xterm+alt47, use=vt220+pcedit, use=vt102+enq,
+	smul=\E[4m, tsl=\E];, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=ansi+rca2, use=xterm+alt47, use=vt220+pcedit,
+	use=vt102+enq,
 
 # I've supplied this so that you can help test new values and add other
 # features.  Cheers, earnie_boyd@yahoo.com.
@@ -9479,26 +9403,24 @@ cygwinDBG|Debug Version for Cygwin,
 	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, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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, dim=\E[2m, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\n, invis=\E[8m, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G,
-	kcbt=\E[Z, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+	dim=\E[2m, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l,
+	home=\E[H, hpa=\E[%i%p1%dG, ind=\n, kNXT=\E[6$, kPRV=\E[5$,
+	kb2=\E[G, kcbt=\E[Z, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
-	rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM,
+	rmacs=\E[10m, 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,
 	sgr0=\E[0;10m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+erase,
 	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
-	use=vt220+pcedit, use=vt220+cvis, use=vt102+enq,
+	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
+	use=vt220+cvis, use=vt102+enq,
 
 #### DJGPP
 
@@ -9626,23 +9548,21 @@ djgpp|ANSI emulation for DJGPP alpha,
 	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,
-	cnorm=\E[v, cr=\r, 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, cuu1=\E[A,
-	cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
-	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG, ht=^I,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, 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~, nel=\r\n,
-	op=\E[37;40m, rev=\E[7m, ri=\E[T, rmso=\E[m,
+	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[1v, cnorm=\E[v, cr=\r,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v,
+	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\E[S, 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~, nel=\r\n, op=\E[37;40m, 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=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=vt220+pcedit, use=ecma+index,
+	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
+	use=ecma+index,
 
 djgpp203|entry for DJGPP 2.03,
 	OTbs, am,
@@ -9654,18 +9574,17 @@ djgpp204|entry for DJGPP 2.04,
 	OTbs, am, AX,
 	colors#8, cols#80, it#8, lines#25, ncv#3, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v,
-	clear=\E[H\E[2J, cnorm=\E[v, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	clear=\E[H\E[2J, cnorm=\E[v, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP,
+	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
 	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
 	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~, kll=\E[4~, 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=ansi+arrows,
-	use=ansi+idl, use=vt220+pcedit, use=ecma+index,
+	use=ansi+idl, use=ansi+local, use=vt220+pcedit,
+	use=ecma+index,
 
 #### U/Win
 
@@ -9780,29 +9699,28 @@ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with colo
 	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[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
-	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ind=\E[S,
-	kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, 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,
-	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=ansi+arrows, use=ansi+idl,
-	use=ecma+index, use=klone+color,
+	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, 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, 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=ansi+arrows,
+	use=ansi+idl, use=ansi+local, use=ecma+index,
+	use=klone+color,
 
 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
 	lines#35, use=opennt,
@@ -10378,10 +10296,9 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode,
 	cols#80, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r, 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, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ich1=\E[@, il1=\E[L, ind=\n,
+	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
 	is2=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\,
 	kcbt=\E[Z, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, kf2=\E[18~,
 	kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~,
@@ -10390,7 +10307,7 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode,
 	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
 	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m,
 	smul=\E[4m, xoffc=g, xonc=e, use=ansi+arrows,
-	use=vt220+cvis,
+	use=ansi+local1, use=vt220+cvis,
 #
 # (hp2392: copied <rmir> here from hpex -- esr)
 hp2392|239x series,
@@ -11006,18 +10923,16 @@ adm1178|1178|LSI adm1178,
 pt100|pt200|wren|fenix|Prime pt100/pt200,
 	am, bw, mir, msgr,
 	cols#80, it#8, lines#24,
-	cbt=\E[Z, clear=\E?, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E0%p1%{33}%+%c%p2%{33}%+%c, cuu=\E[%p1%dA,
-	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M,
-	ed=\E[J\E[r, el=\E[K\E[t, flash=\E$$<200/>\E$P,
-	home=\E$B, ht=^I, il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n,
-	rmcup=, rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m,
+	cbt=\E[Z, clear=\E?, cr=\r, cub1=^H, cud1=\ED,
+	cup=\E0%p1%{33}%+%c%p2%{33}%+%c, cuu1=\EM,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M, ed=\E[J\E[r,
+	el=\E[K\E[t, flash=\E$$<200/>\E$P, home=\E$B, ht=^I,
+	il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n, 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[>12
 	      l\E[1Q,
 	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m,
-	use=ansi+arrows,
+	use=ansi+arrows, use=ansi+local,
 
 pt100w|pt200w|wrenw|fenixw|Prime pt100/pt200 in 132-column mode,
 	cols#132,
@@ -11093,9 +11008,8 @@ qvt103|Qume qvt 103,
 	am, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[2J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
 	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
 	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
@@ -11106,6 +11020,7 @@ qvt103|Qume qvt 103,
 	    %;m$<2>,
 	sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E[?1h\E=,
 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
+	use=ansi+local,
 
 qvt103-w|Qume qvt103 132 cols,
 	cols#132, lines#24,
@@ -12189,10 +12104,9 @@ tvi9065|TeleVideo 9065,
 	wnum#0, wsl#30,
 	acsc='r0_jhkglfmeniopqksqtmulvownxj, bel=^G,
 	blink=\EG2, bold=\EG\,, cbt=\EI, civis=\E.0, clear=^Z,
-	cnorm=\E.3, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=^V, cuf=\E[%p1%dC, cuf1=^L,
-	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu=\E[%p1%dA,
-	cuu1=^K, cvvis=\E.2, dch=\E[%p1%dP, dch1=\EW, dim=\EGp,
+	cnorm=\E.3, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^V,
+	cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
+	cvvis=\E.2, dch=\E[%p1%dP, dch1=\EW, dim=\EGp,
 	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,
@@ -12224,7 +12138,8 @@ tvi9065|TeleVideo 9065,
 	    %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, use=ecma+index,
+	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ansi+local,
+	use=ecma+index,
 
 #### Visual (vi)
 #
@@ -12321,17 +12236,17 @@ vi200-rv|Visual 200 reverse video,
 vi300|Visual 300 ANSI x3.64,
 	am, bw, mir, xenl,
 	cols#80, lines#24,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	dch1=\E[P$<40>, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	il1=\E[L, ind=\n,
+	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P$<40>, dl1=\E[M, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\n,
 	is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kf1=\E_A\E\\, kf2=\E_B\E\\, kf3=\E_C\E\\, kf4=\E_D\E\\,
 	kf5=\E_E\E\\, kf6=\E_F\E\\, kf7=\E_G\E\\, kf8=\E_H\E\\,
 	kf9=\E_I\E\\, khome=\E[H, ri=\EM, rmam=\E[?7l, rmir=\E[4l,
 	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
-	smso=\E[1m, smul=\E[4m,
+	smso=\E[1m, smul=\E[4m, use=ansi+local1,
+
 # 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),
@@ -12819,10 +12734,10 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell,
 # not, so smir and rmir are commented out as well.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
 wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
-	am, km, mc5i, mir, msgr, xenl,
+	am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#25, vt#3,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
 	clear=\E[H\E[J$<200>, cnorm=\E[34h\E[?25h, cr=\r,
 	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
 	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
@@ -12830,7 +12745,7 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
 	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
 	flash=\E[?5h$<30/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, ich=\E[%p1%d@, ind=\n$<1>, invis=\E[8m,
+	ht=^I, ich=\E[%p1%d@, ind=\n$<1>,
 	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,
@@ -12839,9 +12754,8 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
 	kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, prot=\E[1"q, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
-	rmso=\E[27m, rmul=\E[24m,
+	nel=\EE, prot=\E[1"q, 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,
@@ -12849,7 +12763,7 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	    %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,
-	use=ansi+csr, use=ansi+idl,
+	use=ansi+csr, use=ansi+idl, use=ansi+pp, use=ansi+sgr,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
@@ -13002,20 +12916,19 @@ wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell,
 #	to correctly handle multiple attributes on a screen.
 #
 wy75|wyse75|Wyse 75,
-	am, hs, mc5i, mir, msgr, xenl, xon,
+	am, hs, mir, msgr, xenl, xon,
 	cols#80, lines#24, ma#1, pb#1201, wsl#78,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<30>, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr$<2>, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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$<3*>, 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\,$<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>,
+	csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>,
+	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\,$<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>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
 	kf1=\E[?5i, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -13024,18 +12937,18 @@ wy75|wyse75|Wyse 75,
 	kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
 	khlp=\E[28~, kich1=\E[@, kil1=\E[L, knp=\E[6~, kpp=\E[5~,
-	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
-	rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, 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$<80>, rs3=\E[?5l,
-	sc=\E7,
+	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, rc=\E8, rev=\E[1t\E[7m,
+	ri=\EM$<2>, 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$<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%;,
 	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=ansi+arrows,
-	use=decid+cpr, use=vt220+cvis, use=vt220+keypad,
+	use=ansi+local, use=ansi+pp, use=decid+cpr,
+	use=vt220+cvis, use=vt220+keypad,
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -13073,36 +12986,34 @@ wy75-wvb|wyse75-wvb|Wyse 75 with visible bell 132 columns,
 #	<dch> leave trash on the screen when used without XON/XOFF.
 #
 wy85|wyse85|Wyse 85,
-	am, hs, mc5i, mir, msgr, xenl, xon,
+	am, hs, mir, msgr, xenl, xon,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<110>,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
-	cuu=\E[%p1%dA, cuu1=\E[A, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, ht=\011$<1>, 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,
+	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
+	cud=\E[%p1%dB, cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>,
+	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\,$<300/>\E[30l,
+	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>,
+	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>,
+	ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, 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~,
 	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
 	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
-	ri=\EM$<3>, 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,
+	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, 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,
 	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,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+arrows,
-	use=ansi+csr, use=ansi+inittabs, use=decid+cpr,
+	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
 #
 #	Wyse 85 with visual bell.
@@ -13129,20 +13040,18 @@ wy85-wvb|wyse85-wvb|Wyse 85 with visible bell 132-columns,
 # terminfo should reflect the manufacturer's intended behaviour of the terminal
 # or the actual."
 wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
-	am, hs, mc5i, mir, msgr, xenl, xon,
+	am, hs, mir, msgr, xenl, xon,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<110>,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
-	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP$<3*>,
+	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
 	home=\E[H, ht=\011$<1>, 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,
+	il=\E[%p1%dL$<5*>, il1=\E[L$<5>, ind=\n$<3>, ip=$<3>,
+	is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, ka1=\EOw, ka3=\EOy, kb2=\EOu,
 	kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B,
@@ -13154,15 +13063,16 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
 	khome=\23326~, kich1=\2332~, knp=\2336~, kpp=\2335~,
 	kslt=\2334~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM$<3>, 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,
+	ri=\EM$<3>, 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,
 	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,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+csr,
-	use=ansi+inittabs, use=decid+cpr, use=vt220+cvis,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+sgr, use=decid+cpr, use=vt220+cvis,
 #
 #	Wyse 185 emulating a VT320 7 bit mode.
 #
@@ -13175,39 +13085,38 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 #	by set-up.
 #
 wy185|wyse185|Wyse 185,
-	am, hs, km, mc5i, mir, msgr, xenl, xon,
+	am, hs, km, mir, msgr, xenl, xon,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr$<20>, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>,
 	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\,$<100/>\E[30l, fsl=\E[1;24r\E8,
 	home=\E[H, hpa=\E[%i%p1%d`, 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,
+	il=\E[%p1%dL$<3*>, il1=\E[L$<3>, ind=\n$<2>, ip=$<4>,
+	is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, 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~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
-	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
-	rc=\E8, rev=\E[7m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
-	rmcup=\E[ R, rmir=\E[4l, 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,
+	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
+	rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, 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%;,
 	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,
 	tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+inittabs, use=decid+cpr,
+	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+keypad,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
@@ -13353,14 +13262,12 @@ wy325-43w-vb|wy325-43wvb|Wyse-325 43 lines wide mode visual bell,
 #
 # Bug: The <op> capability resets attributes.
 wy370-nk|Wyse 370 without function keys,
-	am, ccc, hs, mc5i, mir, msgr, xenl, xon,
+	am, ccc, hs, mir, msgr, xenl, xon,
 	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h\E[34l,
+	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l,
 	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, 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>,
@@ -13374,15 +13281,14 @@ wy370-nk|Wyse 370 without function keys,
 	      %{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>,
+	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,
+	is3=\E>\017\E)0\E(B\E[63;0w\E[m, mc0=\E[0i,
 	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, 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,
+	op=\E[m, 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, 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%;%?
@@ -13392,7 +13298,8 @@ wy370-nk|Wyse 370 without function keys,
 	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
 	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
-	use=ansi+inittabs, use=decid+cpr,
+	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+	use=ansi+sgr, use=decid+cpr,
 #
 #	Function key set for the ASCII (wy-50 compatible) keyboard
 #	This is the default 370.
@@ -13515,28 +13422,26 @@ wy370-tek|Wyse 370 Tektronix 4010/4014 emulator,
 #         with SCO applications.
 #
 wy520|wyse520|Wyse 520,
-	am, hs, km, mc5i, mir, xenl, xon,
+	am, hs, km, mir, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
 	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h\E[34l,
+	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l,
 	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
 	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
 	enacs=\E)0, fsl=\E[0$}, 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,
+	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
-	kent=\EOM, 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~, kf20=\E[34~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
+	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~, kf20=\E[34~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
+	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
 	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, 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,
@@ -13547,7 +13452,8 @@ wy520|wyse520|Wyse 520,
 	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`,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+	use=ansi+local, use=ansi+pp, use=ansi+sgr, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+keypad,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13783,10 +13689,8 @@ vt320-k3|MS-Kermit 3.00's VT320 emulation,
 	am, eslok, hs, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dsl=\E[0$~, ech=\E[%p1%dX,
 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
 	      ?5l,
@@ -13804,7 +13708,8 @@ vt320-k3|MS-Kermit 3.00's VT320 emulation,
 	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, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=vt220+cvis,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=vt220+cvis,
 
 # From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
 # ACS capabilities from Philippe De Muyter  <phdm@info.ucl.ac.be> 30 May 1996
@@ -13814,12 +13719,10 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
-	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
 	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
-	hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	hts=\EH, ich=\E[%p1%d@, 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~,
@@ -13830,7 +13733,7 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11,
 	rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, 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=ansi+csr,
-	use=ansi+idl, use=vt220+cvis,
+	use=ansi+idl, use=ansi+local, use=vt220+cvis,
 
 ######## NON-ANSI TERMINAL EMULATIONS
 #
@@ -14005,18 +13908,17 @@ MtxOrb162|16x2 Matrix Orbital LCD display,
 att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode,
 	am, eo, mir, msgr, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
-	cud1=\n, 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,
-	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
-	kcbt=\E[Z, kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\E[1r,
-	kf10=\E[10r, kf11=\E[11r, kf12=\E[12r, kf13=\E[13r,
-	kf14=\E[14r, kf15=\E[15r, kf16=\E[16r, kf2=\E[2r,
-	kf3=\E[3r, kf4=\E[4r, kf5=\E[5r, kf6=\E[6r, kf7=\E[7r,
-	kf8=\E[8r, kf9=\E[9r, kich1=\E[@, kil1=\E[L, mc0=\E[0i,
-	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, rmir=\E[4l, rmso=\E[m,
-	sgr0=\E[m, smir=\E[4h, smso=\E[7m, use=ansi+arrows,
-	use=ansi+cpr, use=ansi+erase, use=ansi+idl,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H, ht=^I,
+	ich=\E[%p1%d@, ind=\n, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
+	kdl1=\E[M, kf1=\E[1r, kf10=\E[10r, kf11=\E[11r,
+	kf12=\E[12r, kf13=\E[13r, kf14=\E[14r, kf15=\E[15r,
+	kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r, kf5=\E[5r,
+	kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, kich1=\E[@,
+	kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
+	rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+	use=ansi+idl, use=ansi+local,
 
 att2350|AT&T 2350 Video Information Terminal 80 column mode,
 	mc0@, mc4@, mc5@, use=att2300,
@@ -14037,10 +13939,10 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cr=\r, 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, fsl=\E8, home=\E[H, ht=^I, ich1=\E[@,
-	il1=\E[L, ind=\n, invis=\E[8m, is1=\E[?3l\E)0,
+	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, cuf1=\E[C,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
+	fsl=\E8, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	is1=\E[?3l\E)0,
 	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
@@ -14053,13 +13955,14 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	nel=\r\n,
 	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, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O, rmso=\E[m,
+	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
 	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, use=ansi+arrows,
-	use=ansi+csr, use=ansi+erase,
+	use=ansi+csr, use=ansi+erase, use=ansi+local1,
+	use=ansi+sgr,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -14136,12 +14039,10 @@ v5410|att5410 in terms of a VT100,
 att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
 	db,
 	lm#78, wsl#55,
-	clear=\E[x\E[J, cnorm=\E[11;0j, cub=\E[%p1%dD,
-	cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dx,
-	cuu=\E[%p1%dA, cvvis=\E[11;1j, ech=\E[%p1%ds\E[%p1%dD,
-	flash=\E[?5h$<200>\E[?5l, home=\E[x,
-	hpa=\E[%p1%{1}%+%dG, ich1@, indn=\E[%p1%dE,
-	is1=\E[?3l$<100>,
+	clear=\E[x\E[J, cnorm=\E[11;0j, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dx, cvvis=\E[11;1j,
+	ech=\E[%p1%ds\E[%p1%dD, flash=\E[?5h$<200>\E[?5l,
+	home=\E[x, ich1@, 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,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M,
@@ -14158,9 +14059,9 @@ att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
 	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, smkx=\E[19;1j\E[21;4j\Eent,
-	smln=\E~, tsl=\E7\E[25;%p1%{8}%+%dH,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=att4410,
+	smln=\E~, tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rca, use=att4410,
 
 att4415-w|tty5420-w|att5420-w|AT&T 4415/5420 132 cols,
 	cols#132, lm#54, wsl#97,
@@ -14203,14 +14104,13 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	am, db, hs, mir, msgr, xon,
 	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	blink=\E[5m, cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j,
-	cr=\EG, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[1B,
-	cuf=\E[%p1%dC, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP,
-	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J,
-	el=\E[0K, el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@,
-	ind=\n, indn=\E[%p1%dE, invis=\E[8m,
+	cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H,
+	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
+	cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K,
+	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+	indn=\E[%p1%dE,
 	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,
@@ -14223,15 +14123,16 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	mc5=\E[5i, mrcup=\E[%i%p1%d;%p2%dt, nel=\r\n,
 	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,
-	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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, 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,
 	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%;%?%p8%t\EV%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
 	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
 	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+inittabs, use=decid+cpr,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgr, use=decid+cpr,
 
 att5420_2-w|AT&T 5420 model 2 in 132 column mode,
 	cols#132,
@@ -14244,20 +14145,19 @@ att4418|att5418|AT&T 5418 80 cols,
 	am, xon,
 	cols#80, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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%dP, dch1=\E[1P, dim=\E[2m, ed=\E[0J,
-	el=\E[0K, home=\E[H, ich=\E[%p1%d@, ich1=\E[1@, il1=\E[1L,
-	ind=\n, is1=\E[?3l, is2=\E)0\E?6l\E?5l, kclr=\E[%%,
-	kcub1=\E@, kcud1=\EU, kcuf1=\EA, kcuu1=\ES, kent=\E[,
-	kf1=\E[h, kf10=\E[m, kf11=\E[n, kf12=\E[o, kf13=\E[H,
-	kf14=\E[I, kf15=\E[J, kf18=\E[K, kf19=\E[L, kf2=\E[i,
-	kf20=\E[E, kf21=\E[_, kf22=\E[M, kf23=\E[N, kf24=\E[O,
-	kf3=\E[j, kf6=\E[k, kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec,
-	rc=\E8, rev=\E[7m, rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7,
-	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
-	use=ansi+idl,
+	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+	dim=\E[2m, ed=\E[0J, el=\E[0K, home=\E[H, ich=\E[%p1%d@,
+	ich1=\E[1@, il1=\E[1L, ind=\n, is1=\E[?3l,
+	is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@, kcud1=\EU,
+	kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h, kf10=\E[m,
+	kf11=\E[n, kf12=\E[o, kf13=\E[H, kf14=\E[I, kf15=\E[J,
+	kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E, kf21=\E[_,
+	kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j, kf6=\E[k,
+	kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8, rev=\E[7m,
+	rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m\017,
+	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+idl,
+	use=ansi+local,
 
 att4418-w|att5418-w|AT&T 5418 132 cols,
 	cols#132,
@@ -14295,18 +14195,17 @@ att4424|tty4424|Teletype 4424,
 	cols#80, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E3, bold=\E3, cbt=\EO, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\EB, cuf=\E[%p1%dC, cuf1=\EC,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EA,
-	dch=\E[%p1%dP, dch1=\EP, dim=\EW, dl=\E[%p1%dM, dl1=\EM,
-	ed=\EJ, el=\Ez, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	ich1=\E\^, il=\E[%p1%dL, il1=\EL, ind=\n, is2=\E[20l\E[?7h,
-	kclr=\EJ, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE,
-	rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, rmul=\EZ,
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\EB, cuf1=\EC,
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch=\E[%p1%dP, dch1=\EP,
+	dim=\EW, dl=\E[%p1%dM, dl1=\EM, ed=\EJ, el=\Ez, home=\E[H,
+	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E\^, il=\E[%p1%dL,
+	il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, kf1=\EOP,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E}, ri=\ET,
+	rmacs=\E(B, rmso=\E~, rmul=\EZ,
 	sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%|
 	    %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;,
 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
-	tbc=\EF, use=ansi+arrows,
+	tbc=\EF, use=ansi+arrows, use=ansi+local,
 
 att4424-1|tty4424-1|Teletype 4424 in display function group I,
 	kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@,
@@ -14341,14 +14240,13 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	am, da, db, hs, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cnorm=\E[12;0j, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[12;1j, dch=\E[%p1%dP,
-	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
-	indn=\E[%p1%dE, invis=\E[8m, is1=\E<\E[?3l$<100>,
+	bel=^G, bold=\E[2;7m, cnorm=\E[12;0j, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	indn=\E[%p1%dE, 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,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
@@ -14357,8 +14255,8 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	kf8=\EOj, kich1=\E[4h, kil1=\E[L, kind=\E[T, kri=\E[S,
 	ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, nel=\r\n,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
-	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, rev=\E[7m,
-	ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, 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,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
@@ -14368,7 +14266,7 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
 	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=decid+cpr,
+	use=ansi+local, use=ansi+sgr, use=decid+cpr,
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
 	smkx=\E[21;1j\E[25;4j\Eent, use=att4425,
@@ -14384,10 +14282,8 @@ att4426|tty4426|Teletype 4426S,
 	cols#80, lines#24, lm#48,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[5m, clear=\E[H\E[2J\E[1U\E[H\E[2J\E[1V,
-	cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\EP, ed=\E[J,
-	el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
+	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP,
+	ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
 	ich=\E[%p1%d@, ich1=\E\^, 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,
@@ -14396,7 +14292,8 @@ att4426|tty4426|Teletype 4426S,
 	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=ansi+idl, use=ecma+index,
+	vpa=\E[%p1%dd, use=ansi+idl, use=ansi+local,
+	use=ecma+index,
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
 # Function keys 9 - 16 are available only after the
@@ -14412,12 +14309,10 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
 	civis=\E[11;0|, clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r,
-	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, cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP,
-	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, hts=\EH, ind=\n,
-	is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
+	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, hts=\EH,
+	ind=\n, is1=\E(B\E)1\E[2l, 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,
@@ -14430,6 +14325,7 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	    %|%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, use=ansi+cpr, use=ansi+idl,
+	use=ansi+local,
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -14444,43 +14340,40 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	am, da, db, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, 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,
-	cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, 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@, ind=\n, invis=\E[8m, is1=\E(B\E)1\E[5;0|,
+	bel=^G, bold=\E[2;7m, cbt=\E[Z, clear=\E[H\E[J,
+	cnorm=\E[11;3|, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	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@, ind=\n, 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, 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,
+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, 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=ansi+cpr, use=ansi+idl, use=ansi+rep, use=ecma+index,
+	use=ansi+cpr, use=ansi+idl, use=ansi+local, use=ansi+rep,
+	use=ansi+sgr, use=ecma+index,
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 att500|att513|AT&T 513 using page mode,
 	am, chts, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	cnorm=\E[11;0|, cr=\r, csr=%i\E[%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[11;1|, dch=\E[%p1%dP,
+	bel=^G, bold=\E[2;7m, cbt=\E[Z, cnorm=\E[11;0|, cr=\r,
+	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP,
 	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
 	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE, invis=\E[8m,
+	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE,
 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
@@ -14504,10 +14397,9 @@ att500|att513|AT&T 513 using page mode,
 	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, 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,
+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, 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,
 	rs2=\E[5;0|, sc=\E7,
@@ -14517,7 +14409,8 @@ att500|att513|AT&T 513 using page mode,
 	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
 	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+rep, use=decid+cpr,
+	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	use=decid+cpr,
 
 # 01-07-88:
 # printer must be set to EMUL ANSI to accept ESC codes
@@ -14567,12 +14460,12 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer,
 att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 	am, xon,
 	cols#88, it#8, lines#70, vt#3,
-	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
-	dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
-	ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T,
-	rs1=\Ec, sc=\E7, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idl, use=ecma+index,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n,
+	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+	use=ecma+index,
 
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
 # The following SET-UP modes are assumed for normal operation:
@@ -14589,14 +14482,14 @@ att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
 att5620|dmd|tty5620|ttydmd|5620|AT&T 5620 terminal 88 columns,
 	OTbs, am, msgr, npc, xon,
 	cols#88, it#8, lines#70,
-	bel=^G, bold=\E[2m, cr=\r, cub1=^H, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\E[S, kclr=\E[2J, kll=\E[70;1H, nel=\n,
-	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
-	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idl, use=ecma+index,
+	bel=^G, bold=\E[2m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H, ht=^I,
+	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kclr=\E[2J,
+	kll=\E[70;1H, nel=\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
+	rev=\E[7m, ri=\E[T, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
+	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+	use=ecma+index,
 
 att5620-24|tty5620-24|dmd-24|Teletype dmd 5620 in a 24x80 layer,
 	lines#24, use=att5620,
@@ -14620,9 +14513,8 @@ att605|AT&T 605 80 column 102key keyboard,
 	cols#80, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, el1=\E[1K, fsl=\E8, ht=^I,
-	il1=\E[L, ind=\n, invis=\E[8m,
+	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
+	el1=\E[1K, fsl=\E8, ht=^I, il1=\E[L, ind=\n, invis=\E[8m,
 	is1=\E[8;0|\E[?\E[13;20l\E[?\E[12h, is2=\E[m\017,
 	kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
 	kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14643,7 +14535,7 @@ att605|AT&T 605 80 column 102key keyboard,
 	sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, smln=\E[p,
 	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
 	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
-	use=ansi+idc,
+	use=ansi+idc, use=ansi+local1,
 
 att605-pc|AT&T 605 in pc term mode,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
@@ -14663,12 +14555,10 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
+	ich=\E[%p1%d@, ind=\ED,
 	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,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14677,16 +14567,17 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	kind=\E[S, kri=\E[T, ll=\E[24H, 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, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rmso=\E[m,
-	rmul=\E[m, rs2=\Ec\E[?3l,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
+	rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
+	rs2=\Ec\E[?3l,
 	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=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=decid+cpr,
-	use=ecma+index, use=att610+cvis,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgr, use=decid+cpr, use=ecma+index,
+	use=att610+cvis,
 
 att610-w|AT&T 610; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14737,12 +14628,10 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
+	ich=\E[%p1%d@, ind=\ED,
 	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[ @,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14757,7 +14646,7 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	kf7=\EOi, kf8=\EOj, kf9=\ENo, kind=\E[S, kri=\E[T, ll=\E[24H,
 	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, rev=\E[7m, ri=\EM,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
@@ -14766,7 +14655,8 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
 	tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=decid+cpr, use=ecma+index, use=att610+cvis,
+	use=ansi+local, use=ansi+sgr, use=decid+cpr,
+	use=ecma+index, use=att610+cvis,
 
 att620-w|AT&T 620; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14808,22 +14698,21 @@ att620-103k-w|AT&T 620; 132 column; 103key keyboard,
 att630|AT&T 630 windowing terminal,
 	OTbs, am, da, db, mir, msgr, npc, xon,
 	cols#80, it#8, lines#60, lm#0,
-	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, 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, cuu1=\E[A,
-	dim=\E[2m, el1=\E[1K, home=\E[H, ht=^I, ind=\ED, is2=\E[m,
-	kcbt=\E[Z, kclr=\E[2J, 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, 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, rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7,
+	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K, home=\E[H,
+	ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J, 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, 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,
+	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, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 	use=ansi+cpr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ecma+index,
+	use=ansi+local, use=ecma+index,
 
 att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
 	lines#24, use=att630,
@@ -14909,13 +14798,10 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, 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,
-	cuu1=\E[A, cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200>\E[?5l, fln=4\,4, fsl=\E8, home=\E[H,
-	ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
+	fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED,
 	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[ @, kcbt=\E[Z,
@@ -14933,16 +14819,17 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
 	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, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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|,
 	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|, tsl=\E7\E[99;%i%p1%dx,
 	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+rep,
-	use=decid+cpr, use=att610+cvis0,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=ansi+sgr, use=decid+cpr,
+	use=att610+cvis0,
 
 # This entry was modified 3/13/90 by JWE.
 # fixes include additions of <enacs>, correcting <rep>, and modification
@@ -14961,12 +14848,10 @@ att730|AT&T 730 windowing terminal,
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
+	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
-	fsl=\E8, ht=^I, ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
+	fsl=\E8, ht=^I, ich=\E[%p1%d@, ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14984,16 +14869,17 @@ att730|AT&T 730 windowing terminal,
 	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, 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,
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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,
 	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, use=ansi+arrows,
 	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+rep, use=decid+cpr, use=att610+cvis,
+	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	use=decid+cpr, use=att610+cvis,
 
 # "MGT" is "Multi-Tasking Graphics Terminal"
 att730-41|730MTG-41|AT&T 730-41 windowing terminal,
@@ -15175,11 +15061,9 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H,
-	cnorm=\E[>l, cr=\r, cub=\E[%p1%dD, cub1=\E[D,
-	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	cvvis=\E[>h, dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[0K,
-	el1=\E[2K, home=\E[H, ht=^I, ind=\n,
+	cnorm=\E[>l, cr=\r, cup=\E[%p1%d;%p2%dH, cvvis=\E[>h,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[0K, el1=\E[2K,
+	home=\E[H, ht=^I, ind=\n,
 	is1=\EPr\\E[0u\E[2J\E[0;0H\E[m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l,
 	kbs=^H, kcmd=\E!, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
 	kcuu1=\E[A, kf0=\E[00s, kf1=\E[01s, kf18=\E[18s,
@@ -15190,7 +15074,7 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal,
 	rmacs=\E[10m, rmam=\E[11;1j, rmir=\E[4l, rmso=\E[m,
 	rmul=\E[m, rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m,
 	smam=\E[11;0j, smir=\E[4h, smso=\E[1m, smul=\E[4m,
-	use=ansi+cpr, use=ansi+idl,
+	use=ansi+cpr, use=ansi+idl, use=ansi+local,
 
 # The following Terminfo entry describes functions which are supported by
 # the AT&T 5430/pt505 terminal software version 1.
@@ -15453,13 +15337,11 @@ aas1901|Ann Arbor K4080 w/S1901 mod,
 aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
 	cols#80,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<156>,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^K,
-	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,
+	bel=^G, bold=\E[1m, clear=\E[H\E[J$<156>, cr=\r, cub1=^H,
+	cud1=^K, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ed=\E[J, el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
 	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
-	invis=\E[8m, is1=\E[m\E7\E[H\E9\E8,
+	is1=\E[m\E7\E[H\E9\E8,
 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
 	kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK,
 	kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP,
@@ -15467,7 +15349,7 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	kf21=\EOU, kf22=\EOV, kf23=\EOW, kf24=\EOX, kf3=\EOC,
 	kf4=\EOD, kf5=\EOE, kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI,
 	kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i, mc4=^C,
-	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m,
+	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
 	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
@@ -15478,7 +15360,7 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	     \\,
 	smm=\E[>52h, smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
 	use=ansi+arrows, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+rep,
+	use=ansi+local, use=ansi+rep, use=ansi+sgr,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -15856,24 +15738,26 @@ adds980|a980|ADDS Consul 980,
 cit80|cit-80|citoh 80,
 	OTbs, am,
 	cols#80, lines#24,
-	clear=\E[H\EJ, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, ed=\EJ, el=\EK, ff=^L,
-	ind=\n, is2=\E>, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, rmkx=\E[?1l\E>, smkx=\E[?1h\E=,
+	clear=\E[H\EJ, cr=\r, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH,
+	ed=\EJ, el=\EK, ff=^L, ind=\n, is2=\E>, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, rmkx=\E[?1l\E>, smkx=\E[?1h\E=,
+	use=ansi+local1,
+
 # From: Tim Wood <mtxinu!sybase!tim> Fri Sep 27 09:39:12 PDT 1985
 # (cit101: added <rmam>/<smam> based on init string, merged this with c101 -- esr)
 cit101|citc|C. Itoh fast VT100,
 	OTbs, am, xenl,
 	cols#80, lines#24,
-	bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	cvvis=\E7\E[U, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K,
-	flash=\E[?5h$<200/>\E[?5l, ich1=\E[@, il1=\E[L,
+	bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P,
+	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<200/>\E[?5l,
+	ich1=\E[@, il1=\E[L,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m,
+	smul=\E[4m, use=ansi+local1,
+
 # CIE Terminals CIT-101e from Geoff Kuenning <callan!geoff> via BRL
 # The following termcap entry was created from the Callan cd100 entry.  The
 # last two lines (with the capabilities in caps) are used by RM-cobol to allow
@@ -15884,15 +15768,15 @@ cit101|citc|C. Itoh fast VT100,
 cit101e|C. Itoh CIT-101e,
 	OTbs, OTpt, am, mir, msgr,
 	cols#80, it#8, lines#24,
-	acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr, cub1=\E[D,
-	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A,
-	cvvis=\E[?1l\E[?4l\E[?7h, dch1=\E[P, dl1=\E[M,
-	if=/usr/share/tabset/vt100, il1=\E[L, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, kf6=\EOl, kf7=\EOM,
-	kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=,
-	smso=\E[7m, smul=\E[4m, use=ansi+erase,
+	acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr,
+	cup=\E[%i%p1%2d;%p2%2dH, cvvis=\E[?1l\E[?4l\E[?7h,
+	dch1=\E[P, dl1=\E[M, if=/usr/share/tabset/vt100,
+	il1=\E[L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	kf0=\EOT, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm,
+	kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O,
+	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N,
+	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+erase, use=ansi+local1,
 
 # From: David S. Lawyer, June 1997:
 # The CIT 101-e was made in Japan in 1983-4 and imported by CIE
@@ -15915,9 +15799,7 @@ cit101e-rv|C. Itoh CIT-101e (sets reverse video),
 	am, eo, mir, msgr, xenl, xon,
 	cols#80, lines#24,
 	OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[1v,
-	cnorm=\E[0;3;4v, cr=\r, 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, cuu1=\E[A,
+	cnorm=\E[0;3;4v, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[3;5v, flash=\E[?5l$<200/>\E[?5h, home=\E[H,
 	hpa=\E[%i%p1%dG, ind=\n,
 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
@@ -15928,7 +15810,8 @@ cit101e-rv|C. Itoh CIT-101e (sets reverse video),
 	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m,
 	smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c,
 	use=ansi+enq, use=ansi+csr, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+inittabs, use=ecma+index,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ecma+index,
 
 cit101e-n|CIT-101e w/o am,
 	am@,
@@ -15957,22 +15840,20 @@ cit500|CIE Terminals CIT-500,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#10, cols#80, lines#64, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
-	cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, dch1=\E[P, ed=\EJ, el=\EK,
-	home=\E[H, ind=\n, is2=\E<\E)0, kcbt=\E[Z, kdch1=\E[P,
-	kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
-	kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY,
-	kf9=\EOZ, khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l,
-	lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17,
-	lf7=F18, lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+	dch1=\E[P, ed=\EJ, el=\EK, home=\E[H, ind=\n, is2=\E<\E)0,
+	kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP,
+	kf1=\EOQ, kf2=\EOR, kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW,
+	kf7=\EOX, kf8=\EOY, kf9=\EOZ, khome=\E[H, kich1=\E[4h,
+	kil1=\E[L, krmir=\E[4l, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4,
+	lf4=F15, lf5=F16, lf6=F17, lf7=F18, lf8=F19, lf9=F20,
+	ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>,
 	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+idl,
-	use=ansi+inittabs,
+	use=ansi+inittabs, use=ansi+local,
 
 # C. Itoh printers begin here
 citoh|ci8510|8510|C. Itoh 8510a,
@@ -16110,9 +15991,7 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode,
 	cols#80, lines#25,
 	acsc=0_aaffggh jjkkllmmnnooqqssttuuvvwwxx, bel=^G,
 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
-	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,
+	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, ed=\E[J, el=\E[K,
 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
 	ht=^I, ind=\n, invis=\E[8m,
@@ -16128,6 +16007,7 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode,
 	sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, smkx=\E=,
 	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+idc, use=ansi+idl,
+	use=ansi+local,
 
 #### Human Designed Systems (Concept)
 #
@@ -16517,9 +16397,7 @@ hds200|Human Designed Systems HDS200,
 	cols#80, lines#24, lm#0,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[0;5m, bold=\E[0;1m, civis=\E[6+{, cnorm=\E[+{,
-	cr=\r, cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\E[P,
+	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dsl=\E[2!w\r\n\E[!w, el1=\E[1K, fsl=\E[!w, home=\E[H,
 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, 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
@@ -16548,22 +16426,21 @@ hds200|Human Designed Systems HDS200,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
 	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+pp,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp,
 
 # <ht> through <el> included to specify padding needed in raw mode.
 # (avt-ns: added empty <acsc> to suppress a tic warning --esr)
 avt-ns|Concept AVT no status line,
 	OTbs, am, eo, mir, ul, xenl, xon,
 	cols#80, lines#24, lm#192,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
-	clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[=119h, dim=\E[1!{,
+	acsc=, bel=^G, bold=\E[1m, clear=\E[H\E[J$<38>,
+	cnorm=\E[=119l, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h, dim=\E[1!{,
 	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
 	el=\E[K$<6>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=\011$<4>,
 	ich=\E[%p1%d@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>,
-	ind=\n$<8>, invis=\E[8m, ip=$<4>, is1=\E[=103l\E[=205l,
+	ind=\n$<8>, 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,
@@ -16571,7 +16448,7 @@ avt-ns|Concept AVT no status line,
 	kf4=\EOS, kich1=\E\001\r, kil1=\E\003\r, ll=\E[24H,
 	mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
 	pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
-	prot=\E[99m, rev=\E[7m, ri=\EM$<4>, rmacs=\016$<1>,
+	prot=\E[99m, ri=\EM$<4>, rmacs=\016$<1>,
 	rmcup=\E[w\E2\r\n, rmkx=\E[!z\E[0;2u, rmso=\E[7!{,
 	rmul=\E[4!{,
 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
@@ -16581,7 +16458,8 @@ avt-ns|Concept AVT no status line,
 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
 	smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
 	use=ansi+arrows, use=ansi+csr, use=ansi+idc1,
-	use=ansi+inittabs, use=ansi+rep,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+	use=ansi+sgr,
 
 avt-rv-ns|Concept AVT in reverse video mode/no status line,
 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
@@ -16865,11 +16743,11 @@ dg200|Data General DASHER 200,
 dg210|dg-ansi|Data General 210/211,
 	am,
 	cols#80, lines#24,
-	OTnl=\E[B, clear=\E[2J, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
-	home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m, rmul=\E[0;m,
-	smso=\E[7;m, smul=\E[4;m,
+	OTnl=\E[B, clear=\E[2J, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
+	el=\E[K, home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m,
+	rmul=\E[0;m, smso=\E[7;m, smul=\E[4;m, use=ansi+local1,
+
 # From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
 # courtesy of Carlos Rucalde of Vantage Software, Inc.
 # (dg211: this had <cup=\020%r%.%>., which was an ancient termcap hangover.
@@ -16895,19 +16773,18 @@ dg450|dg6134|Data General 6134,
 dg460-ansi|Data General Dasher 460 in ANSI-mode,
 	OTbs, am, msgr, ul,
 	cols#80, it#8, lines#24,
-	OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, dch1=\E[P,
-	dim=\E[2m, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	ich1=\E[@, il1=\E[L, ind=\E[S, is2=^^F@, kbs=\E[D,
-	kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
-	kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,
-	kf8=\E[009z, kf9=\E[00:z, 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,
+	OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H,
+	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
+	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L,
+	ind=\E[S, is2=^^F@, kbs=\E[D, kf0=\E[001z, kf1=\E[002z,
+	kf2=\E[003z, kf3=\E[004z, kf4=\E[005z, kf5=\E[006z,
+	kf6=\E[007z, kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, 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,
 	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
-	use=ansi+arrows, use=ansi+cpr,
+	use=ansi+arrows, use=ansi+cpr, use=ansi+local1,
 
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
 # Data General 605x
@@ -16950,14 +16827,13 @@ d210|d214|Data General DASHER D210 series,
 	am, bw, msgr, xon,
 	cols#80, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[4;7m, clear=\E[2J, cr=\r,
-	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, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K,
-	el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, ed=\E[J,
+	el=\E[K, el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l,
 	ll=\E[H\E[A, nel=\n, rev=\E[7m, rmso=\E[m, rmul=\E[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,
+	sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=ansi+local,
+	use=dgkeys+7b,
 
 # DASHER D210 series terminals in DG mode.
 # Like D200, but adds clear to end-of-screen and needs XON/XOFF.
@@ -17155,18 +17031,17 @@ d400|d400-dg|d450|d450-dg|Data General DASHER D400/D450 series,
 #	\E)4		- default secondary character set (international)
 #
 d410|d411|d460|d461|Data General DASHER D410/D460 series,
-	mc5i,
 	acsc=j$k"l!m#n)q+t'u&v(w%x*, civis=\E[3;0v,
 	cnorm=\E[3;2v, dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@,
 	ich1=\E[@,
 	is1=\E[<0;<1;<2;<4l\E[5;0v\E[1;1;80w\E[1;6;<2h,
-	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,
+	is2=\E[3;2;2;1;1;1v\E(B\E)4\017, 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%;,
 	sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211,
-	use=ansi+idl,
+	use=ansi+idl, use=ansi+pp,
 
 # Initialization string 2 sets:
 #	\E[3;2;2;0;1;0v
@@ -17594,22 +17469,22 @@ falco|ts1|ts-1|Falco ts-1,
 falco-p|ts1p|ts-1p|Falco ts-1 with paging option,
 	OTbs, am, da, db, mir, msgr, ul,
 	cols#80, it#8, lines#24,
-	bel=^G, cbt=\EI, clear=\E*, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\E[A,
-	dch1=\EW, dl1=\ER, ed=\EY, el=\ET\EG0\010\Eg0, ht=^I,
-	il1=\EE, ind=\n, is2=\EZ\E3\E_c, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rmcup=\E_b, rmir=\Er,
-	rmso=\Eg0, rmul=\Eg0, sgr0=\Eg0, smcup=\E_d, smir=\Eq,
-	smso=\Eg4, smul=\Eg1,
+	bel=^G, cbt=\EI, clear=\E*, cr=\r, cub1=^H,
+	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, dch1=\EW, dl1=\ER,
+	ed=\EY, el=\ET\EG0\010\Eg0, ht=^I, il1=\EE, ind=\n,
+	is2=\EZ\E3\E_c, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, khome=\E[H, rmcup=\E_b, rmir=\Er, rmso=\Eg0,
+	rmul=\Eg0, sgr0=\Eg0, smcup=\E_d, smir=\Eq, smso=\Eg4,
+	smul=\Eg1, use=ansi+local1,
+
 # (ts100: I added <rmam>/<smam> based on the init string -- esr)
 ts100|ts100-sp|Falco ts100-sp,
 	am, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, dch1=\E~W, dl1=\E~R, ed=\E[J$<50>,
 	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
 	ht=^I, hts=\EH, ich1=\E~Q, il1=\E~E, ind=\n, is1=\E~)\E~ea,
@@ -17621,7 +17496,8 @@ ts100|ts100-sp|Falco ts100-sp,
 	    %;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=ansi+csr, use=decid+cpr, use=vt100+fnkeys,
+	use=ansi+csr, use=ansi+local, use=decid+cpr,
+	use=vt100+fnkeys,
 
 ts100-ctxt|Falco ts-100 saving context,
 	rmcup=\E~_b, smcup=\E~_d\E[2J, use=ts100,
@@ -17659,11 +17535,11 @@ beacon|FCG Beacon System,
 f1720|f1720a|fluke 1720A,
 	xt,
 	cols#80, lines#16, xmc#1,
-	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J,
-	el=\E[K, ind=\ED, is2=\E[H\E[2J, kcub1=^_, kcud1=^],
-	kcuf1=^^, kcuu1=^\, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ind=\ED,
+	is2=\E[H\E[2J, kcub1=^_, kcud1=^], kcuf1=^^, kcuu1=^\,
+	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m,
+	smul=\E[4m, use=ansi+local1,
 
 #### Liberty Electronics (Freedom)
 #
@@ -17765,8 +17641,8 @@ f200vi-w|Liberty Freedom 200 - 132 cols for vi,
 go140|graphon go-140,
 	OTbs,
 	cols#80, it#8, lines#24,
-	clear=\E[H\E[2J$<10/>, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+	clear=\E[H\E[2J$<10/>, cub1=^H,
+	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dl1=\E[M,
 	ed=\E[J$<10/>, el=\E[K, ht=^I,
 	if=/usr/share/tabset/vt100, il1=\E[L,
 	is2=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q,
@@ -17774,7 +17650,8 @@ go140|graphon go-140,
 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
 	rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+local1,
+
 go140w|graphon go-140 in 132 column mode,
 	am,
 	cols#132,
@@ -18214,29 +18091,27 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\E[S, invis=\E[8m, is2=\Ec, kcbt=\E[Z, kclr=\E[144q,
-	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,
-	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,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ech=\E[%p1%dX,
+	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S, is2=\Ec, kcbt=\E[Z,
+	kclr=\E[144q, 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, kich1=\E[139q, kil1=\E[140q, kind=\E[151q,
+	knp=\E[154q, kpp=\E[150q, kri=\E[155q, krmir=\E[4l,
+	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=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ecma+index,
+	use=ansi+local, use=ansi+sgr, use=ecma+index,
 
 ibmaed|IBM Experimental display,
 	OTbs, am, eo, msgr,
@@ -18362,13 +18237,11 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	cols#80, it#8, lines#25,
 	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=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, invis=\E[8m,
-	is2=\Ec, kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
+	kcbt=\E[Z, kclr=\E[144q, 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,
@@ -18380,12 +18253,13 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
 	kf8=\E[008q, kf9=\E[009q, 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,
+	krmir=\E[4l, 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, use=ansi+arrows, use=ansi+idl, use=ecma+index,
+	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=ansi+sgr, use=ecma+index,
 
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@@ -18789,9 +18663,9 @@ intext|Interactive Systems Corporation modified owl 1200,
 intext2|intextii|INTERACTIVE modified owl 1251,
 	am, bw, ul,
 	cols#80, lines#24, xmc#0,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, 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, ed=\E[J, el=\E[K,
+	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+	el=\E[K,
 	flash=\E[;;;;;;;;;2;;u$<200/>\E[;;;;;;;;;1;;u,
 	hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
 	kbs=^H, kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r,
@@ -18800,7 +18674,7 @@ intext2|intextii|INTERACTIVE modified owl 1251,
 	khome=\ER\r, lf0=REFRSH, lf1=DEL CH, lf2=TABSET, lf3=GOTO,
 	lf4=+PAGE, lf5=+SRCH, lf6=-PAGE, lf7=-SRCH, lf8=LEFT,
 	lf9=RIGHT, ri=\E[T, rmso=\E[2 D, rmul=\E[2 D, smso=\E[6 D,
-	smul=\E[18 D,
+	smul=\E[18 D, use=ansi+local1,
 
 #### Kimtron (abm, kt)
 #
@@ -19087,10 +18961,8 @@ prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	am, bw, hs, msgr, xenl, xon,
 	cols#80, lines#24, vt#3, wsl#72,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[<4l, clear=^L,
-	cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	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,
+	cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
 	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
 	is2=\E[&p\E[<12l\E F, kclr=^L, kf1=\E[11~, kf10=\E[21~,
@@ -19107,7 +18979,8 @@ prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	    %p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+pp,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp,
 
 # p9-w: Prism-9 in 132 column mode
 # --------------------------------
@@ -19325,9 +19198,7 @@ mm340|mime340|mime 340,
 mt4520-rv|micro-term 4520 reverse video,
 	am, hs, msgr, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
-	bel=^G, cnorm=\E[0V\E8, cr=\r, cub=\E[%p1%dD, cub1=\E[D,
-	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,
+	bel=^G, cnorm=\E[0V\E8, cr=\r, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P,
 	flash=\E[?5l$<200/>\E[?5h, fsl=\E[?5l\E[?5h, home=\E[H,
 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\ED,
@@ -19339,7 +19210,7 @@ mt4520-rv|micro-term 4520 reverse video,
 	rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J,
 	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g,
 	tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
 
 # Fri Aug  5 08:11:57 1983
 # This entry works for the ergo 4000 with the following setups:
@@ -19353,17 +19224,17 @@ mt4520-rv|micro-term 4520 reverse video,
 ergo4000|microterm ergo 4000,
 	da, db, msgr,
 	cols#80, lines#66,
-	bel=^G, clear=\E[H\E[2J$<80>, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	dch1=\E[1P$<80>, dl1=\E[1M$<5*>, ed=\E[0J$<15>,
-	el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>, ind=\ED$<20*>,
+	bel=^G, clear=\E[H\E[2J$<80>, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[1P$<80>, dl1=\E[1M$<5*>,
+	ed=\E[0J$<15>, el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>,
+	ind=\ED$<20*>,
 	is2=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h$<300>,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=pf1, lf2=pf2, lf3=pf3,
 	lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l, rmir=\E[4l,
 	rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>,
 	smam=\E[?7m, smir=\E[4h$<6>, smkx=\E=$<4>,
-	smso=\E[7m$<20>,
+	smso=\E[7m$<20>, use=ansi+local1,
 
 #### NCR
 #
@@ -19458,31 +19329,31 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>,
-	cr=\r$<1>, cub=\E[%p1%dD$<5>, cub1=\E[D$<5>,
-	cud=\E[%p1%dB$<5>, cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>,
-	cuf1=\E[C$<5>, cup=\E[%i%p1%d;%p2%dH$<10>,
-	cuu=\E[%p1%dA$<5>, cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>,
-	dch1=\E[1P$<5>, dl=\E[%p1%dM$<5>, dl1=\E[M$<5>,
-	ech=\E[%p1%dX, ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>,
-	home=\E[H$<1>, 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,
+	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>,
+	cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
+	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
+	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
+	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX,
+	ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>, home=\E[H$<1>,
+	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>,
 	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,
 	khlp=\E[28~, kich1=\E[2~, krdo=\E[29~, nel=\EE$<5>,
-	rev=\E[7m, ri=\EM$<5>, rmacs=^O, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m,
+	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>,
 	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,
-	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgr,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
+	use=vt220+keypad, use=ncr260vt+sl,
 
 ncr260vt+sl|NCR 2900/260 VT100 status line,
 	hs,
@@ -19513,17 +19384,17 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>,
-	cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr$<5>,
-	cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>,
-	cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
+	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
+	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
+	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
 	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
 	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>,
 	ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, 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,
+	indn=\E[%p1%dE$<5>,
 	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,
@@ -19535,7 +19406,7 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
 	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM$<5>,
+	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, 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>$<
@@ -19545,9 +19416,10 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	    %;%?%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, vpa=\E[%p1%dd$<40>, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
+	use=vt220+keypad, use=ncr260vt+sl,
+
 ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH$<30>,
@@ -19570,17 +19442,17 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>,
-	cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr$<5>,
-	cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>,
-	cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
+	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
+	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
+	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
 	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
 	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>,
 	ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, 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,
+	indn=\E[%p1%dE$<5>,
 	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,
@@ -19592,7 +19464,7 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
 	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM$<5>,
+	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, 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
@@ -19602,9 +19474,10 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	    %;%?%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, vpa=\E[%p1%dd$<40>, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
+	use=vt220+keypad, use=ncr260vt+sl,
+
 ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 	cols#132,
 	cup=\E[%i%p1%d;%p2%dH$<30>,
@@ -20151,17 +20024,16 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\ER, clear=^L,
 	cnorm=\ES, cr=\r, csr=\EU%p1%{32}%+%c%p2%{32}%+%c,
-	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EM,
-	dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r, home=\E[H,
-	ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL, il1=\EN,
-	ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H, khome=\E[H,
-	rc=\EX, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EI,
-	rin=\E[%p1%dA, rmacs=\Ed, rmam=\E[?7l, rmso=\E[m,
-	rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	sc=\EW, sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m,
-	smul=\E[4m, tsl=\E], uc=\EPB, use=ansi+apparrows,
+	cub1=^H, cud1=\E[B, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dch1=\EM, dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r,
+	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
+	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
+	khome=\E[H, rc=\EX, rev=\E[7m,
+	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
+	rmacs=\Ed, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
+	sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m, smul=\E[4m,
+	tsl=\E], uc=\EPB, use=ansi+apparrows, use=ansi+local,
 
 #### Tandem
 #
@@ -20208,34 +20080,33 @@ dt100|dt-100|Tandy DT-100 terminal,
 	xon,
 	cols#80, lines#24, xmc#1,
 	acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J,
-	cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\010\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,
-	ich1=\E[@, il1=\E[L, ind=\n, is2=\E[?3l\E)0\E(B,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[?3i,
-	kf10=\E[?5i, kf2=\E[2i, kf3=\E[@, kf4=\E[M, kf5=\E[17~,
-	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, khome=\E[H,
-	knp=\E[29~, kpp=\E[28~, lf1=f1, lf2=f2, lf3=f3, lf4=f4, lf5=f5,
-	lf6=f6, lf7=f7, lf8=f8, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m,
-	sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m,
-	use=vt220+cvis,
+	cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H,
+	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+	kcuu1=\E[A, kf1=\E[?3i, kf10=\E[?5i, kf2=\E[2i, kf3=\E[@,
+	kf4=\E[M, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+	kf9=\E[21~, khome=\E[H, knp=\E[29~, kpp=\E[28~, lf1=f1,
+	lf2=f2, lf3=f3, lf4=f4, lf5=f5, lf6=f6, lf7=f7, lf8=f8, ri=\EM,
+	rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=^N,
+	smso=\E[7m, smul=\E[4m, use=ansi+local1, use=vt220+cvis,
 dt100w|dt-100w|Tandy DT-100 terminal (wide mode),
 	cols#132, use=dt100,
 dt110|Tandy DT-110 emulating ANSI,
 	xon,
 	cols#80, lines#24,
 	acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\010\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	dch1=\E[0P, dl1=\E[0M, ed=\E[0J, el=\E[0K, enacs=\E(B\E)0,
-	home=\E[H, ht=^I, ich1=\E[0@, il1=\E[0L, ind=\n,
-	is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kend=\E[K, kf1=\E[1~, kf10=\E[10~, kf2=\E[2~,
-	kf3=\E[3~, kf4=\E[4~, kf5=\E[5~, kf6=\E[6~, kf7=\E[7~,
-	kf8=\E[8~, kf9=\E[9~, khome=\E[G, kich1=\E[@, knp=\E[26~,
-	kpp=\E[25~, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6,
-	lf6=f7, lf7=f8, lf8=f9, lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m,
+	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[0P, dl1=\E[0M,
+	ed=\E[0J, el=\E[0K, enacs=\E(B\E)0, home=\E[H, ht=^I,
+	ich1=\E[0@, il1=\E[0L, ind=\n, is2=\E[?3l\E)0\E(B,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[K,
+	kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~, kf4=\E[4~,
+	kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~, kf9=\E[9~,
+	khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~, lf0=f1,
+	lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf8=f9,
+	lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+local1,
 	use=vt220+cvis,
 pt210|TRS-80 PT-210 printing terminal,
 	hc, os,
@@ -20402,9 +20273,8 @@ tek4105-30|Tektronix 4015 emulating 30 line VT100,
 	cols#80, it#8, lines#30, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
@@ -20415,7 +20285,7 @@ tek4105-30|Tektronix 4015 emulating 30 line VT100,
 	    %;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=ansi+csr, use=vt100+fnkeys,
+	use=ansi+csr, use=ansi+local, use=vt100+fnkeys,
 
 # Tektronix 4105 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20443,23 +20313,22 @@ tek4105a|Tektronix 4105 (BRL),
 	OTkn#8, cols#80, lines#30, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, home=\E[H, 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, 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,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, home=\E[H, 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, 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>,
 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ecma+index,
+	use=ansi+local, use=ecma+index,
 
 # Tektronix 4106/4107/4109 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20487,23 +20356,22 @@ tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
 	cols#80, lines#32, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, home=\E[H, 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, 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,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, home=\E[H, 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, 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>,
 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
 	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ecma+index,
+	use=ansi+local, use=ecma+index,
 
 # Refer to:
 # TEK Programmer's Reference
@@ -20614,32 +20482,29 @@ otek4115|Tektronix 4115 (old),
 	OTbs, am, da, db, eo,
 	cols#80, it#8, lines#34,
 	cbt=\E[Z, clear=\E[H\E[2J,
-	cnorm=\E%!0\ELBG8\E%!1\E[34;1H, cub1=\E[D, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	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,
+	cnorm=\E%!0\ELBG8\E%!1\E[34;1H,
+	cup=\E[%i%p1%d;%p2%dH, 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,
 	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,
 	smcup=\E%!0\ELBB2\E%!1, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m,
+	smul=\E[4m, use=ansi+local1,
 tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
 	am, xon,
 	cols#80, lines#34,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cuu=\E[%p1%dA, cuu1=\E[A,
-	dch1=\E[P, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ich1=\E[@, ind=\n, invis=\E[8m, kcuu1=\E[A,
-	rev=\E[7m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n,
+	dch1=\E[P, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+	kcuu1=\E[A, rmam=\E[?7l, rmso=\E[m, rmul=\E[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, use=ansi+arrows, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+rep,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+rep, use=ansi+rca,
+	use=ansi+sgr,
 
 # The tek4125 emulates a VT100 incorrectly - the scrolling region
 # command is ignored.  The following entry replaces <csr> with the needed
@@ -20725,9 +20590,7 @@ tek4205|Tektronix 4205,
 	colors#8, cols#80, it#8, lines#30, ncv#49, pairs#63,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[=7;<4m, cbt=\E[Z,
-	clear=\E[2J\E[H, cr=\r, cub=\E[%p1%dD, cub1=\E[D,
-	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,
+	clear=\E[2J\E[H, cr=\r, cup=\E[%i%p1%d;%p2%dH,
 	dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M,
 	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,
@@ -20758,7 +20621,7 @@ tek4205|Tektronix 4205,
 	     %e1m%;,
 	sgr0=\E[=0;<1m\E[24;25;27m\017, smacs=^N,
 	smcup=\E%%!1\E[?6l\E[2J, smir=\E[4h, smso=\E[=2;<3m,
-	smul=\E[4m, tbc=\E[1g,
+	smul=\E[4m, tbc=\E[1g, use=ansi+local,
 
 #### Teletype (tty)
 #
@@ -20906,9 +20769,7 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r,
-	cub=\E[%p1%dD, cub1=\E[D, 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, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S\E[B,
 	indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kcbt=^],
 	kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, kf3=\242,
@@ -20919,6 +20780,7 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+local,
 
 #### Apple II
 #
@@ -21090,12 +20952,12 @@ lisa|Apple Lisa console display (black on white),
 	OTbs, am, eo, msgr,
 	cols#88, it#8, lines#32,
 	acsc=jdkclfmenbqattuvvuwsx`, civis=\E[5h, clear=^L,
-	cnorm=\E[5l, cub1=^H, cud1=\E[B, 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, ich1=\E[@, il1=\E[L,
-	is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+	cnorm=\E[5l, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
+	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
+	il1=\E[L, is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
+	use=ansi+local1,
 liswb|Apple Lisa console display (white on black),
 	is2=\E>\E[0;7m\014, rmso=\E[0;7m, rmul=\E[0;7m,
 	smso=\E[m, smul=\E[4m, use=lisa,
@@ -21115,16 +20977,14 @@ lisaterm|Apple Lisa or Lisa/2 running LisaTerm VT100 emulation,
 	OTbs, OTpt, am, xenl, xon,
 	OTkn#4, cols#80, it#8, lines#24, vt#3,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
-	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=F1,
-	lf1=F2, lf2=F3, lf3=F4, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+	home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ,
+	kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rev=\E[7m,
+	ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r,
 	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+csr,
+	tbc=\E[3g, use=ansi+csr, use=ansi+local,
 
 # Lisaterm in 132 column ("wide") mode.
 lisaterm-w|Apple Lisa with Lisaterm in 132 column mode,
@@ -21216,9 +21076,7 @@ amiga|Amiga ANSI,
 	OTbs, am, bw, xenl,
 	cols#80, lines#24,
 	acsc=, bel=^G, blink=\E[7;2m, bold=\E[1m, cbt=\E[Z,
-	civis=\E[0 p, cnorm=\E[ p, cub=\E[%p1%dD, cub1=\E[D,
-	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,
+	civis=\E[0 p, cnorm=\E[ p, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H,
 	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
 	is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
@@ -21226,7 +21084,8 @@ amiga|Amiga ANSI,
 	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=ansi+erase, use=ansi+idl, use=ecma+index,
+	smul=\E[4m, use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ecma+index,
 
 # From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
 # (amiga: added empty <acsc> to suppress a warning.
@@ -21270,9 +21129,7 @@ amiga-vnc|Amiga using VNC console (black on light gray),
 	btns#1, colors#16, cols#80, lines#24, lm#0, ncv#0, pairs#0x100,
 	bel=^G, blink=\E[7;2m, bold=\E[1m, civis=\E[0p,
 	cnorm=\E[p\E[>?6l, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=\E[D, 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, cvvis=\E[>?6h, dch=\E[%p1%dP,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[>?6h, dch=\E[%p1%dP,
 	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, flash=^G,
 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
 	invis=\E8m,
@@ -21288,7 +21145,7 @@ amiga-vnc|Amiga using VNC console (black on light gray),
 	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, use=ansi+arrows, use=ansi+erase,
-	use=ecma+index,
+	use=ansi+local, use=ecma+index,
 
 # MorphOS on Genesi Pegasos
 # By Pavel Fedin <sonic_amiga@rambler.ru>
@@ -21427,14 +21284,12 @@ minix-old|minix-1.5|minix console (v1.5),
 	xon, NQ,
 	cols#80, it#8, lines#25,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=\r,
-	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, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ed=\E[0J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
 	ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T,
 	kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m,
 	rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+idl,
+	use=ansi+arrows, use=ansi+idl, use=ansi+local,
 
 # The linewrap option can be specified by editing /usr/include/minix/config.h
 # before recompiling the minix 1.5 kernel.
@@ -21548,9 +21403,7 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'infor
 	cols#80, it#8, lines#24, wsl#72, xmc#0,
 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G,
 	blink=\E[5m, bold=\E[1m, civis=\E[<1h, cnorm=\E[<1l, cr=\r,
-	cub=\E[%p1%dD, cub1=\E[D, 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%dP, dch1=\E[P,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	flash=^G, fsl=\n, home=\E[H, ht=^I, ind=\n, ip=$<7/>,
 	is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
 	is3=\E[?3l, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kf0=\EOp,
@@ -21562,6 +21415,7 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'infor
 	rs2=\Ec\E)0, sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m, tsl=^_@A, use=ansi+arrows, use=ansi+cpr,
 	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+local,
 
 # From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998, updated 19 Sep 2016
 #
@@ -21607,22 +21461,22 @@ minitel1|minitel 1,
 	   \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, ed=\E[J,
-	el1=\E[1K, is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J,
-	kctab=^I, 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@, 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,
+	cub1=^H, cud1=\n, cuf1=^I, cuu1=^K, dch=\E[%p1%dP, dch1=\E[P,
+	ed=\E[J, el1=\E[1K, is1=\E;iYA\E;jYC, kbs@, kcan@,
+	kclr=\E[2J, kctab=^I, 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@, 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=^ACu<^D,
-	use=ansi+arrows, use=ansi+idl, use=minitel1,
+	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=minitel1,
 
 # rmkx posait des problemes (logout en sortant de vi).
 minitel1b-80|minitel 1-bistandard (standard teleinformatique),
@@ -21805,10 +21659,9 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	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, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%dX, el1=\E[1K, enacs=\E)U,
-	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%d`, ht=^I,
-	hts=\EH, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, enacs=\E)U, flash=\E[?5h$<100/>\E[?5l,
+	hpa=\E[%i%p1%d`, ht=^I, hts=\EH, ind=\n,
 	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,
@@ -21837,8 +21690,8 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\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=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=vt220+pcedit,
-	use=vt220+cvis, use=linux+decid,
+	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+	use=vt220+pcedit, use=vt220+cvis, use=linux+decid,
 
 # 1. Using double-shapes for VT100 graphical chars (eg: mc).
 # 2. Native brown color corrected to good yellow color.
@@ -22106,13 +21959,13 @@ bg2.0rv|bg3.10rv|BBn BitGraph 2.0 (reverse video),
 bg2.0|bg3.10|BBN BitGraph 2.0 or later (no init),
 	OTbs, xenl,
 	cols#85, lines#64,
-	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A,
-	dl1=\E[M$<2*>, ed=\E[J$<150>, el=\E[K$<2>, ht=^I,
-	il1=\E[L$<2*>, ind=\n$<280>, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>,
-	rmso=\E[m, sgr0=\E[m, smkx=\E=, smso=\E[7m, use=ansi+csr,
+	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H,
+	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
+	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3,
+	lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smkx=\E=,
+	smso=\E[7m, use=ansi+csr, use=ansi+local1,
 
 bg1.25rv|BBN BitGraph 1.25 (reverse video),
 	flash=\E[?5l$<200/>\E[?5h, is2=\E>\E[?5h\E[?7h,
@@ -22123,14 +21976,13 @@ bg1.25nv|BBN BitGraph 1.25 (normal video),
 # (bg1.25: I added <rmam>/<smam> based on the init string -- esr)
 bg1.25|BBN BitGraph 1.25,
 	cols#85, lines#64,
-	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A,
-	dl1=\E[M$<2*>, ed=\E[J$<150>, el=\E[K$<2>, ht=^I,
-	il1=\E[L$<2*>, ind=\n$<280>, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\ES,
-	lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, ll=\E[64;1H, rmam=\E[?7l,
-	rmkx=\E>, rmso=\E[m, sgr0=\E[m, smam=\E[?7h, smkx=\E=,
-	smso=\E[7m,
+	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H,
+	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
+	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kcub1=\ED,
+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER,
+	kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, ll=\E[64;1H,
+	rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smam=\E[?7h,
+	smkx=\E=, smso=\E[7m, use=ansi+local1,
 
 #### Bull (bq, dku, vip)
 #
@@ -22204,11 +22056,10 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~,
 	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
-	cnorm=\E[r, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB,
-	cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df,
-	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[0;2m, dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v,
-	fsl=\E[v, home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m,
+	cnorm=\E[r, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%df,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[0;2m,
+	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v,
+	home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m,
 	is1=\E[?=h\Ec\E`\E[?>h\EPY99:98\E\\,
 	is2=\E[5;>;12;18;?<l\E[=h\EP1s\E\\\E[\027p,
 	is3=\Eb\E[?<h, kcbt=\E[Z, kctab=\E[g, kdch1=\E[P,
@@ -22226,6 +22077,7 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local,
 
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
@@ -22325,10 +22177,8 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	am, eo, eslok, hs, km, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, vt#3, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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%dP, dch1=\E[P,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, el1=\E[1K,
 	enacs=\E(B\E)0, flash=\E[?5h$<50>\E[?5l, fsl=\E[0$},
 	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
@@ -22351,8 +22201,9 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	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+enq,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl, use=ansi+pp,
-	use=vt220+cvis, use=vt220+vtedit,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+pp, use=vt220+cvis,
+	use=vt220+vtedit,
 
 bq300-rv|Bull VT320 reverse 80 columns,
 	flash=\E[?5l$<50>\E[?5h,
@@ -22807,16 +22658,14 @@ vt61|vt-61|vt61.5|DEC VT61,
 gigi|vk100|DEC gigi graphics terminal,
 	OTbs, am, xenl,
 	cols#84, lines#24,
-	bel=^G, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J,
-	el=\E[K, ht=^I, ind=\n,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ht=^I, ind=\n,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
 	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
-	smul=\E[4m,
+	smul=\E[4m, use=ansi+local,
 
 # DEC PRO-350 console (VT220-style).  The 350 was DEC's attempt to produce
 # a PC differentiated from the IBM clones.  It was a total, ludicrous,
@@ -23101,21 +22950,19 @@ z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode,
 	OTbs, OTpt, am, eslok, hs, mir, msgr,
 	OTkn#10, cols#80, it#8, lines#24,
 	OTbc=\ED, bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J,
-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, 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[1P, dim=\E[2m, dsl=\E[>1l, ed=\E[J,
-	el=\E[K, fsl=\E[u\E[>5l, home=\E[H, ht=^I, hts=\EH,
-	if=/usr/share/tabset/vt100, ind=\ED, kclr=\E[J, ked=\E[J,
-	kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
-	kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
-	mc0=\E#7, nel=\r\ED, rc=\E[r, rev=\E[7m, ri=\EM,
-	rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
+	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+	dim=\E[2m, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
+	home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
+	ind=\ED, kclr=\E[J, ked=\E[J, kf0=\E[~, kf1=\EOS, kf2=\EOT,
+	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
+	kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7, nel=\r\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,
 	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,
-	use=ansi+apparrows, use=ansi+idl,
+	use=ansi+apparrows, use=ansi+idl, use=ansi+local,
 
 z29a-kc-uc|h29a-kc-uc|Zenith z29 ANSI mode with keyclick 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
@@ -23131,14 +22978,12 @@ z29a-nkc-uc|h29a-nkc-uc|Zenith z29 ANSI mode with underscore cursor and no keycl
 	use=z29a,
 # From: Jeff Bartig <jeffb@dont.doit.wisc.edu> 31 Mar 1995
 z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
-	am, eslok, hs, mc5i, mir, msgr, xon,
+	am, eslok, hs, mir, msgr, xon,
 	cols#80, lines#24,
 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
 	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
 	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, 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, cuu1=\E[A,
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
 	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
 	fsl=\E[u, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[1L,
@@ -23146,11 +22991,12 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS,
 	kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
 	kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
-	mc0=\E[?19h\E[i, mc4=\E[4i, mc5=\E[5i, rc=\E[u, rev=\E[7m,
-	rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m,
-	rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0,
-	smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
+	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
+	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
+	smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
+	use=ansi+local, use=ansi+pp,
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
@@ -23271,14 +23117,13 @@ graphos|graphos III,
 	am, mir,
 	cols#80, it#8, lines#24,
 	clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z,
-	cr=\r, 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, cuu1=\E[A,
+	cr=\r, cub1=^H, cud=\E[%p1%dB, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
 	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
 	rmir=\E[4l, rmso=\E[m, sc=\E7, sgr0=\E[m, smdc=\E[4h,
 	smir=\E[4h, smso=\E[7m, use=ansi+arrows, use=ansi+idl,
+	use=ansi+local,
 
 graphos-30|graphos III with 30 lines,
 	lines#30,
@@ -23432,20 +23277,19 @@ rt6221|Ramtek 6221 80x24,
 	OTbs, OTpt, msgr, xon,
 	OTkn#4, cols#80, it#8, lines#24, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[>5l,
-	clear=\E[1;1H\E[J, cnorm=\E[>5h\E[>9h, cr=\r,
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^K,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E[>7h\E[>9l, ed=\E[J,
-	el=\E[K, home=\E[1;1H, ht=^I, hts=\EH, ind=\n, is2=\E)0,
-	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2,
-	lf2=PF3, lf3=PF4, ll=\E[24;1H, nel=\EE, rev=\E[7m, ri=\EM,
-	rmacs=^O, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+	clear=\E[1;1H\E[J, cnorm=\E[>5h\E[>9h, cr=\r, cub1=^H,
+	cud1=^K, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+	cvvis=\E[>7h\E[>9l, ed=\E[J, el=\E[K, home=\E[1;1H, ht=^I,
+	hts=\EH, ind=\n, is2=\E)0, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
+	kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[24;1H,
+	nel=\EE, 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>,
 	sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+csr,
+	tbc=\E[3g, use=ansi+csr, use=ansi+local,
 
 # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
 rt6221-w|Ramtek 6221 160x48,
@@ -23482,8 +23326,7 @@ hirez100|Selanar HiREZ-100,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#4, cols#80, it#8, lines#48, vt#3,
 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
 	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, hts=\EH,
 	is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
@@ -23494,6 +23337,7 @@ hirez100|Selanar HiREZ-100,
 	    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, use=ansi+erase, use=ansi+idl,
+	use=ansi+local,
 
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
@@ -23715,14 +23559,14 @@ t10|Teleray 10 special,
 t16|Teleray 16,
 	am, da, db, mir, xhp, xt,
 	cols#80, lines#24,
-	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=%i\E[%p1%d;%p2%df, cuu1=\E[A, dch1=\E[P,
-	dl1=\E[M, ed=\E[0J, el=\E[0K, home=\E[H, ht=^I, il1=\E[L,
-	ind=\n, kf1=^Z1, kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5,
-	kf6=^Z6, kf7=^Z7, kf8=^Z8, kf9=^Z9, ri=\E[T,
-	rmcup=\E[V\E[24;1f\E[?38h, rmir=\E[4l, rmso=\E[m,
-	rmul=\E[m, sgr0=\E[m, smcup=\E[U\E[?38l, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
+	cup=%i\E[%p1%d;%p2%df, dch1=\E[P, dl1=\E[M, ed=\E[0J,
+	el=\E[0K, home=\E[H, ht=^I, il1=\E[L, ind=\n, kf1=^Z1,
+	kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7,
+	kf8=^Z8, kf9=^Z9, ri=\E[T, rmcup=\E[V\E[24;1f\E[?38h,
+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smcup=\E[U\E[?38l, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+	use=ansi+local1,
 
 #### Texas Instruments (ti)
 #
@@ -23795,28 +23639,27 @@ ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL,
 	OTbs, am, xon,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
-	csr=%i\E[%p1%d;%p2%dr, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, cvvis=\E[?31h,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
-	il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
+	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf1=\EOP, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8, rev=\E[7m,
 	ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=vt220+cvis,
+	smul=\E[4m, tbc=\E[3g, use=ansi+local1, use=vt220+cvis,
 ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL,
 	am, xon,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
-	csr=%i\E[%p1%d;%p2%dr, cub1=\E[D, cud1=\E[B, cuf1=\E[C,
-	cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, cvvis=\E[?31h,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
-	il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
+	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q,
 	kf3=\217R, kf4=\217S, kf5=\23316~, kf6=\23317~,
 	kf7=\23318~, kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8,
 	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt220+cvis,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1,
+	use=vt220+cvis,
 ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode,
 	cols#132, use=ti924,
 ti924-8w|Texas Instruments 924 VDT 8 bit - 132 column mode,
@@ -23842,14 +23685,14 @@ ti_ansi|basic entry for ti928,
 	am, bce, eo, xenl, xon,
 	colors#8, cols#80, it#8, lines#25, pairs#64,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H,
-	cr=\r, 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,
-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
-	il1=\E[L, ind=\E[S, kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N,
-	kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
-	kf9=\E[U, knp=\E[G, kpp=\E[I, op=\E[37;40m, ri=\E[T,
-	rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
+	kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P,
+	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G,
+	kpp=\E[I, op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\E[m,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
+	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+local1,
 #
 #       928 VDT 7 bit control mode
 #
@@ -23953,13 +23796,11 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	cols#80, lines#25,
 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C,
-	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub=\E[%p1%dD,
-	cub1=\E[D, 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%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, ich=\E[%p1%d@, ich1=\E[1@,
-	il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
+	cup=\E[%i%p1%d;%p2%dH, 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, ich=\E[%p1%d@,
+	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
 	is2=\E[0;10;39m, kcbt=^], 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,
@@ -23970,22 +23811,22 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	    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,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+inittabs,
-	use=ecma+index, use=klone+color,
+	use=ansi+local, 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,
 	cols#80, lines#24,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C,
-	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub1=^H, cud1=\E[B,
-	cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A,
-	dch1=\E[1P, dim=\E[2m, dl1=\E[1M, ed=\E[0J, el=\E[0K,
-	home=\E[H, hts=\EH, ich1=\E[1@, il1=\E[1L, ind=\n,
-	invis=\E[9m, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kf1=\EOc, kf10=\EOu, kf2=\EOd, kf3=\EOe,
-	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\EOk,
-	nel=\r\n, rev=\E[7m, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub1=^H,
+	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[1P, dim=\E[2m,
+	dl1=\E[1M, ed=\E[0J, el=\E[0K, home=\E[H, hts=\EH,
+	ich1=\E[1@, il1=\E[1L, ind=\n, invis=\E[9m, kbs=^H,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOc,
+	kf10=\EOu, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh,
+	kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, rmso=\E[m,
+	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	use=ansi+local1,
 
 # From: Benjamin C. W. Sittler <bsittler@nmt.edu>
 #
@@ -24108,26 +23949,25 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300,
 	am, xon,
 	cols#80, it#8, lines#24,
 	bel=^G, blink=\E[9m, bold=\E[1m, cbt=\E^I, civis=\E[=1C,
-	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, 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,
-	cuu1=\E[A, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
-	home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m, is1=\017\E[=1w,
-	kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON, kDC=\ENF,
-	kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX, kHLP=\EOM,
-	kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, kNXT=\ENH,
-	kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL, kRPL=\EOY,
-	kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw, kcbt=\E[Z,
-	kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd, kcrt=\EOn,
-	kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0, kext=\EOk,
-	kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh,
-	kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm, kich1=\ENj,
-	kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U, knxt=\ENh,
-	kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz, kprv=\ENg,
-	krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A, krpl=\EOy,
-	krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs, nel=\EE,
-	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[0;10m,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+idl,
+	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, ed=\E[0J,
+	el=\E[0K, home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m,
+	is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON,
+	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX,
+	kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC,
+	kNXT=\ENH, kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL,
+	kRPL=\EOY, kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw,
+	kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd,
+	kcrt=\EOn, kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0,
+	kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg,
+	kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm,
+	kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U,
+	knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz,
+	kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A,
+	krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs,
+	nel=\EE, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m,
+	sgr0=\E[0;10m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+idl, use=ansi+local,
 
 #### Convergent Technology
 #
@@ -24223,11 +24063,11 @@ fos|fortune|Fortune system,
 masscomp|masscomp workstation console,
 	OTbs, km, mir,
 	cols#80, it#8, lines#24,
-	clear=\E[2J, cub1=^H, cud1=\E[B, 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, ht=^I, il1=\E[L, is2=\EGc\EGb\EGw, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l,
-	rmso=\E[m, rmul=\EGau, smir=\E[4h, smso=\E[7m, smul=\EGu,
+	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
+	dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, il1=\E[L,
+	is2=\EGc\EGb\EGw, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l, rmso=\E[m, rmul=\EGau,
+	smir=\E[4h, smso=\E[7m, smul=\EGu, use=ansi+local1,
 masscomp1|masscomp large screen version 1,
 	cols#104, lines#36, use=masscomp,
 masscomp2|masscomp large screen version 2,
@@ -24255,10 +24095,9 @@ pmcons|pmconsole|PMAX console,
 pcix|PC/IX console,
 	am, bw, eo,
 	cols#80, lines#24,
-	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, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m,
-	smul=\E[4m,
+	clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, ed=\E[J,
+	el=\E[K, home=\E[H, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+	smso=\E[7m, smul=\E[4m, use=ansi+local1,
 
 # (ibmpcx: this entry used to be known as ibmx.
 # It formerly included the following extension capabilities:
@@ -24274,11 +24113,11 @@ pcix|PC/IX console,
 ibmpcx|xenix|ibmx|IBM PC xenix console display,
 	OTbs, am, msgr,
 	cols#80, lines#25,
-	clear=^L, cub1=^H, cud1=\E[B, cuf1=\E[C,
-	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L, kend=\E[d,
-	kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N, khome=\E[Y, knp=\E[e,
-	kpp=\E[Z, use=ansi+arrows, use=klone+acs, use=klone+sgr8,
+	clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P,
+	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L,
+	kend=\E[d, kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N,
+	khome=\E[Y, knp=\E[e, kpp=\E[Z, use=ansi+arrows,
+	use=ansi+local1, use=klone+acs, use=klone+sgr8,
 
 ######## OTHER OBSOLETE TYPES
 #
@@ -24355,18 +24194,17 @@ gs6300|emots|AT&T PC6300 with EMOTS terminal emulator,
 	colors#8, cols#80, it#8, lines#24, pairs#63,
 	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud=\E[%p1%dB, cud1=\n, 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, home=\E[H, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\n, is2=\E[m, kcbt=^R^I, kf1=\E[0s,
-	kf2=\E[24s, kf3=\E[1s, kf4=\E[23s, kf5=\E[2s, kf6=\E[22s,
-	kf7=\E[3s, kf8=\E[21s, mc4=\E[4i, mc5=\E[5i, op=\E[?;m,
-	rev=\E[7m, ri=\E[L, rmacs=\E[10m, rs1=\Ec,
-	setb=\E[?;%p1%dm,
+	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, is2=\E[m,
+	kcbt=^R^I, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s, kf4=\E[23s,
+	kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s, mc4=\E[4i,
+	mc5=\E[5i, op=\E[?;m, rev=\E[7m, ri=\E[L, rmacs=\E[10m,
+	rs1=\Ec, setb=\E[?;%p1%dm,
 	setf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m,
 	sgr0=\E[m\E[10m, smacs=\E[11m, smso=\E[1m, smul=\E[4m,
 	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
+	use=ansi+local,
 
 # From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
 # MS-Kermit with Heath-19 emulation mode enabled
@@ -24402,9 +24240,8 @@ xtalk|IBM PC with xtalk communication program (versions up to 3.4),
 	am, mir, msgr, xon,
 	cols#80, it#8, lines#24, vt#3, xmc#1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA,
+	bel=^G, clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
 	cuu1=\E[A$<2>, dl1=\E[M$<99>, ed=\E[J$<50>, el=\E[K$<3>,
 	el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH,
 	il1=\E[L$<99>, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB,
@@ -24412,7 +24249,7 @@ xtalk|IBM PC with xtalk communication program (versions up to 3.4),
 	rmkx=\E[?1l\E>, rmso=\E[m\s,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
 	smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m\s,
-	tbc=\E[3g, use=vt100+fnkeys,
+	tbc=\E[3g, use=ansi+local, use=vt100+fnkeys,
 
 # The official PC terminal emulator program of the AT&T Product Centers.
 # Note - insert mode commented out - doesn't seem to work on AT&T PC.
@@ -24692,15 +24529,14 @@ teletec|Teletec Datascreen,
 v3220|LANPAR Vision II model 3220/3221/3222,
 	OTbs, am, mir, xenl,
 	cols#80, it#8, lines#24,
-	cub1=^H, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu1=\E[A, dch1=\E[P, dl1=\E[M, ht=^I, il1=\E[L,
-	is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, kf2=\E[3~,
-	kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, kf7=\E[OQ,
-	kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
-	smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
-	use=ansi+erase,
+	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ht=^I,
+	il1=\E[L, is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~,
+	kf2=\E[3~, kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP,
+	kf7=\E[OQ, kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m,
+	smul=\E[4m, use=ansi+erase, use=ansi+local1,
 ######## ICH/ICH1 VERSUS RMIR/SMIR
 #
 # Some non-curses applications get confused if both ich/ich1 and rmir/smir
@@ -27851,4 +27687,11 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc,
 #	  ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD
 #
+# 2024-01-07
+#	+ restore padding for wy520* and vt320-k311 (report by Sven Joachim).
+#
+# 2024-01-13
+#	+ use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr
+#	  to trim -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 7654959d3..93de69c0a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240106) unstable; urgency=low
+ncurses6 (6.4+20240113) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7654959d3..93de69c0a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240106) unstable; urgency=low
+ncurses6 (6.4+20240113) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 535901415..2bbe1c660 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240106) unstable; urgency=low
+ncurses6 (6.4+20240113) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 31 Dec 2023 06:24:52 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 11c53df1c..803262a2c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.627 2023/12/31 11:24:52 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.628 2024/01/13 10:52:13 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0106"
+!define VERSION_MMDD  "0113"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 209572d8c..6e43bd2fa 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240106
+Release: 20240113
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 383cbb77b..22af400a0 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240106
+Release: 20240113
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 1c4ff3e1c..b32a9607d 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240106
+Release: 20240113
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 582d6636c74aa4228007722c79d7fea18df3d77b Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 20 Jan 2024 23:06:16 +0100
Subject: [PATCH 050/106] ncurses-6.4-20240120.patch

---
 Ada95/aclocal.m4                              |    8 +-
 Ada95/configure                               |  716 ++---
 Ada95/gen/Makefile.in                         |   17 +-
 Ada95/gen/gen.c                               |    6 +-
 Ada95/gen/terminal_interface-curses.ads.m4    |   12 +-
 NEWS                                          |   11 +-
 VERSION                                       |    2 +-
 configure                                     | 2758 +++++++++--------
 configure.in                                  |   15 +-
 dist.mk                                       |    4 +-
 .../ada/terminal_interface-curses__ads.htm    |    6 +-
 doc/html/man/form_hook.3x.html                |   12 +-
 doc/html/man/ncurses.3x.html                  |    2 +-
 doc/html/man/tabs.1.html                      |  107 +-
 doc/html/man/terminfo.5.html                  | 1315 ++++----
 doc/html/man/toe.1m.html                      |   19 +-
 doc/html/man/tput.1.html                      |  235 +-
 include/Caps                                  |   55 +-
 include/Caps.aix4                             |   55 +-
 include/Caps.hpux11                           |   55 +-
 include/Caps.keys                             |   56 +-
 include/Caps.osf1r5                           |   37 +-
 include/Caps.uwin                             |   37 +-
 include/MKkey_defs.sh                         |    8 +-
 include/curses.events                         |    2 +-
 include/curses.h.in                           |   18 +-
 man/form_hook.3x                              |    6 +-
 man/tabs.1                                    |  146 +-
 man/toe.1m                                    |   16 +-
 man/tput.1                                    |   45 +-
 misc/terminfo.src                             | 1440 ++++-----
 ncurses/Makefile.in                           |    8 +-
 ncurses/tinfo/MKkeys_list.sh                  |    7 +-
 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/aclocal.m4                               |   24 +-
 test/configure                                | 1034 +++---
 test/demo_defkey.c                            |   10 +-
 43 files changed, 4216 insertions(+), 4110 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 50df70fb8..2ca7a95f8 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.207 2023/12/04 00:09:59 tom Exp $
+dnl $Id: aclocal.m4,v 1.209 2024/01/19 18:06:12 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3359,7 +3359,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02
+dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -3389,7 +3389,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
diff --git a/Ada95/configure b/Ada95/configure
index 27b6afa52..80aa515ed 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.91 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230903.
+# Generated by Autoconf 2.52.20231210.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -823,7 +823,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230903.  Invocation command line was
+generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
 
@@ -6187,7 +6187,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -6246,7 +6246,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -6296,7 +6296,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -6358,7 +6358,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -8901,7 +8901,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -8960,7 +8960,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -9010,7 +9010,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -9072,7 +9072,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -10987,7 +10987,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -11046,7 +11046,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -11096,7 +11096,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -11158,7 +11158,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -14571,7 +14571,7 @@ int
 main (void)
 {
 #ifndef exit
-  char *p = (char *) exit; (void) p;
+  (void) exit;
 #endif
 
   ;
@@ -14896,25 +14896,28 @@ else
 #line 14896 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+    #include <sys/types.h>
 int
 main (void)
 {
-return !fseeko;
+
+    int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+    return my_fseeko(stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14911: \$? = $ac_status" >&5
+  echo "$as_me:14914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14917: \$? = $ac_status" >&5
+  echo "$as_me:14920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14923,29 +14926,32 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14926 "configure"
+#line 14929 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
+    #include <sys/types.h>
 int
 main (void)
 {
-return !fseeko;
+
+    int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+    return my_fseeko(stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14942: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14948: \$? = $ac_status" >&5
+  echo "$as_me:14954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14956,7 +14962,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14959: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14965: 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
 
@@ -14970,34 +14976,36 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14973: checking for fseeko" >&5
+echo "$as_me:14979: 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 14979 "configure"
+#line 14985 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+                             #include <sys/types.h>
 int
 main (void)
 {
-return fseeko && fseeko (stdin, 0, 0);
+int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+                            return my_fseeko && my_fseeko (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14994: \$? = $ac_status" >&5
+  echo "$as_me:15002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15000: \$? = $ac_status" >&5
+  echo "$as_me:15008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15007,7 +15015,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15010: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15046,14 +15054,14 @@ fi
 
 	fi
 
-	echo "$as_me:15049: checking whether to use struct dirent64" >&5
+	echo "$as_me:15057: 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 15056 "configure"
+#line 15064 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15080,16 +15088,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15086: \$? = $ac_status" >&5
+  echo "$as_me:15094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15092: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15100,7 +15108,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15103: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15110,7 +15118,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15113: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15121: 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.
@@ -15120,7 +15128,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15123: result: $with_rcs_ids" >&5
+echo "$as_me:15131: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15130,7 +15138,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15133: checking if you want to build with function extensions" >&5
+echo "$as_me:15141: 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.
@@ -15140,7 +15148,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15143: result: $with_ext_funcs" >&5
+echo "$as_me:15151: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15158,7 +15166,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15161: checking for extended use of const keyword" >&5
+echo "$as_me:15169: 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.
@@ -15168,7 +15176,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15171: result: $with_ext_const" >&5
+echo "$as_me:15179: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15178,7 +15186,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15181: checking if you want all development code" >&5
+echo "$as_me:15189: 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.
@@ -15188,7 +15196,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15191: result: $with_develop" >&5
+echo "$as_me:15199: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15197,7 +15205,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15200: checking if you want to link with the pthread library" >&5
+echo "$as_me:15208: 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.
@@ -15207,27 +15215,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15210: result: $with_pthread" >&5
+echo "$as_me:15218: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15214: checking for pthread.h" >&5
+	echo "$as_me:15222: 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 15220 "configure"
+#line 15228 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15232: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15230: \$? = $ac_status" >&5
+  echo "$as_me:15238: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15246,7 +15254,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15249: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15257: 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
 
@@ -15256,7 +15264,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15259: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15267: 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"
 
@@ -15277,7 +15285,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15280 "configure"
+#line 15288 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15294,16 +15302,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15300: \$? = $ac_status" >&5
+  echo "$as_me:15308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15306: \$? = $ac_status" >&5
+  echo "$as_me:15314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15313,7 +15321,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15316: result: $with_pthread" >&5
+	    echo "$as_me:15324: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15341,7 +15349,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15344: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15352: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15350,7 +15358,7 @@ fi
 
 fi
 
-echo "$as_me:15353: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15361: 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.
@@ -15360,18 +15368,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15363: result: $use_weak_symbols" >&5
+echo "$as_me:15371: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15367: checking if $CC supports weak symbols" >&5
+echo "$as_me:15375: 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 15374 "configure"
+#line 15382 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15397,16 +15405,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15403: \$? = $ac_status" >&5
+  echo "$as_me:15411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15409: \$? = $ac_status" >&5
+  echo "$as_me:15417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15417,7 +15425,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15420: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15446,13 +15454,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15449: checking for _nc_TABSIZE" >&5
+echo "$as_me:15457: 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 15455 "configure"
+#line 15463 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15483,16 +15491,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15489: \$? = $ac_status" >&5
+  echo "$as_me:15497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15495: \$? = $ac_status" >&5
+  echo "$as_me:15503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15502,7 +15510,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15505: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15513: 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
@@ -15514,7 +15522,7 @@ fi
 # 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:15517: checking if you want experimental reentrant code" >&5
+echo "$as_me:15525: 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.
@@ -15524,7 +15532,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15527: result: $with_reentrant" >&5
+echo "$as_me:15535: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15547,7 +15555,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15550: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15558: 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.
@@ -15557,7 +15565,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15560: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15571,7 +15579,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15574: checking if you want to see long compiling messages" >&5
+echo "$as_me:15582: 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.
@@ -15605,10 +15613,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15608: result: $enableval" >&5
+echo "$as_me:15616: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15611: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15625,17 +15633,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15628: result: $enable_stdnoreturn" >&5
+echo "$as_me:15636: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15632: checking for C11 _Noreturn feature" >&5
+echo "$as_me:15640: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15638 "configure"
+#line 15646 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15651,16 +15659,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15657: \$? = $ac_status" >&5
+  echo "$as_me:15665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15663: \$? = $ac_status" >&5
+  echo "$as_me:15671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -15671,7 +15679,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15674: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -15727,16 +15735,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15730: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15735: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15739: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15775,16 +15783,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15778: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15783: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15787: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15823,23 +15831,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15826: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15831: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15835: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:15842: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:15850: 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.
@@ -15856,7 +15864,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:15859: result: $enable_warnings" >&5
+echo "$as_me:15867: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -15880,7 +15888,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15883 "configure"
+#line 15891 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15895,26 +15903,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15901: \$? = $ac_status" >&5
+  echo "$as_me:15909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15907: \$? = $ac_status" >&5
+  echo "$as_me:15915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:15910: checking for X11/Xt const-feature" >&5
+echo "$as_me:15918: 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 15917 "configure"
+#line 15925 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -15932,16 +15940,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15938: \$? = $ac_status" >&5
+  echo "$as_me:15946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15944: \$? = $ac_status" >&5
+  echo "$as_me:15952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -15956,7 +15964,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15959: result: $cf_cv_const_x_string" >&5
+echo "$as_me:15967: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -15985,7 +15993,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 15988 "${as_me:-configure}"
+#line 15996 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16001,7 +16009,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16004: checking for $CC warning options..." >&5
+	{ echo "$as_me:16012: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16017,12 +16025,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16020: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16023: \$? = $ac_status" >&5
+  echo "$as_me:16031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16025: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16030,7 +16038,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16033: checking for $CC warning options..." >&5
+	{ echo "$as_me:16041: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16053,12 +16061,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16056: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16059: \$? = $ac_status" >&5
+  echo "$as_me:16067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16061: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16066,7 +16074,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16069: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16076,7 +16084,7 @@ echo "${as_me:-configure}:16069: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16079: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16109,10 +16117,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16112: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16120: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16115 "${as_me:-configure}"
+#line 16123 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16162,12 +16170,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16165: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16168: \$? = $ac_status" >&5
+  echo "$as_me:16176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16170: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16235,7 +16243,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16238: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16246: 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.
@@ -16245,7 +16253,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16248: result: $with_assertions" >&5
+echo "$as_me:16256: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16298,7 +16306,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16301: checking whether to add trace feature to all models" >&5
+echo "$as_me:16309: 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.
@@ -16308,7 +16316,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16311: result: $cf_with_trace" >&5
+echo "$as_me:16319: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16416,7 +16424,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16419: checking if we want to use GNAT projects" >&5
+echo "$as_me:16427: 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.
@@ -16433,21 +16441,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16436: result: $enable_gnat_projects" >&5
+echo "$as_me:16444: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16443: checking if ssp library is needed" >&5
+echo "$as_me:16451: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16450 "configure"
+#line 16458 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16464,16 +16472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16470: \$? = $ac_status" >&5
+  echo "$as_me:16478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16476: \$? = $ac_status" >&5
+  echo "$as_me:16484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16483,7 +16491,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16486 "configure"
+#line 16494 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16500,16 +16508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16506: \$? = $ac_status" >&5
+  echo "$as_me:16514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16512: \$? = $ac_status" >&5
+  echo "$as_me:16520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16523,7 +16531,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16526: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16534: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16550,14 +16558,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:16553: checking for clock_gettime" >&5
+echo "$as_me:16561: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16560 "configure"
+#line 16568 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -16570,16 +16578,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16576: \$? = $ac_status" >&5
+  echo "$as_me:16584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16582: \$? = $ac_status" >&5
+  echo "$as_me:16590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16590,7 +16598,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16593: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -16601,13 +16609,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:16604: checking for gettimeofday" >&5
+echo "$as_me:16612: 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 16610 "configure"
+#line 16618 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16638,16 +16646,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16644: \$? = $ac_status" >&5
+  echo "$as_me:16652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16650: \$? = $ac_status" >&5
+  echo "$as_me:16658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -16657,7 +16665,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16660: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -16667,7 +16675,7 @@ EOF
 
 else
 
-echo "$as_me:16670: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:16678: 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
@@ -16675,7 +16683,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16678 "configure"
+#line 16686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16684,7 +16692,7 @@ 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 gettimeofday ();
+char gettimeofday (void);
 int
 main (void)
 {
@@ -16694,16 +16702,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16700: \$? = $ac_status" >&5
+  echo "$as_me:16708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16706: \$? = $ac_status" >&5
+  echo "$as_me:16714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -16714,7 +16722,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16717: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:16725: 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
 
@@ -16747,13 +16755,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:16750: checking for signed char" >&5
+echo "$as_me:16758: 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 16756 "configure"
+#line 16764 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16768,16 +16776,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16774: \$? = $ac_status" >&5
+  echo "$as_me:16782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16780: \$? = $ac_status" >&5
+  echo "$as_me:16788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -16787,10 +16795,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16790: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:16793: checking size of signed char" >&5
+echo "$as_me:16801: 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
@@ -16799,7 +16807,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16802 "configure"
+#line 16810 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16811,21 +16819,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16817: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16823: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16828 "configure"
+#line 16836 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16837,16 +16845,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16843: \$? = $ac_status" >&5
+  echo "$as_me:16851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16849: \$? = $ac_status" >&5
+  echo "$as_me:16857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -16862,7 +16870,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16865 "configure"
+#line 16873 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16874,16 +16882,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16880: \$? = $ac_status" >&5
+  echo "$as_me:16888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16886: \$? = $ac_status" >&5
+  echo "$as_me:16894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -16899,7 +16907,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16902 "configure"
+#line 16910 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16911,16 +16919,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16917: \$? = $ac_status" >&5
+  echo "$as_me:16925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16923: \$? = $ac_status" >&5
+  echo "$as_me:16931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -16933,12 +16941,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16936: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16944: 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 16941 "configure"
+#line 16949 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16954,15 +16962,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16960: \$? = $ac_status" >&5
+  echo "$as_me:16968: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16965: \$? = $ac_status" >&5
+  echo "$as_me:16973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -16978,7 +16986,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:16981: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -16987,13 +16995,13 @@ EOF
 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:16990: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:16998: 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 16996 "configure"
+#line 17004 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17008,16 +17016,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17014: \$? = $ac_status" >&5
+  echo "$as_me:17022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17020: \$? = $ac_status" >&5
+  echo "$as_me:17028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17027,7 +17035,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17038: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17040,7 +17048,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17043: checking for opendir in -ldir" >&5
+  echo "$as_me:17051: 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
@@ -17048,7 +17056,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17051 "configure"
+#line 17059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17057,7 +17065,7 @@ 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 opendir ();
+char opendir (void);
 int
 main (void)
 {
@@ -17067,16 +17075,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17073: \$? = $ac_status" >&5
+  echo "$as_me:17081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17079: \$? = $ac_status" >&5
+  echo "$as_me:17087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17087,14 +17095,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17090: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17098: 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:17097: checking for opendir in -lx" >&5
+  echo "$as_me:17105: 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
@@ -17102,7 +17110,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17105 "configure"
+#line 17113 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17111,7 +17119,7 @@ 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 opendir ();
+char opendir (void);
 int
 main (void)
 {
@@ -17121,16 +17129,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17127: \$? = $ac_status" >&5
+  echo "$as_me:17135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17133: \$? = $ac_status" >&5
+  echo "$as_me:17141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17141,7 +17149,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17144: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17152: 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"
@@ -17149,13 +17157,13 @@ fi
 
 fi
 
-echo "$as_me:17152: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17160: 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 17158 "configure"
+#line 17166 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17171,16 +17179,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17177: \$? = $ac_status" >&5
+  echo "$as_me:17185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17183: \$? = $ac_status" >&5
+  echo "$as_me:17191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17190,7 +17198,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17193: result: $ac_cv_header_time" >&5
+echo "$as_me:17201: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17208,13 +17216,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17211: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17219: 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 17217 "configure"
+#line 17225 "configure"
 #include "confdefs.h"
 
 int
@@ -17224,13 +17232,13 @@ main (void)
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset x; (void)x;
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *ccp;
   char **p;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
-  static struct point const zero = {0,0};
+  static struct point const zero = {0,0}; (void)zero;
   /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
@@ -17246,16 +17254,19 @@ main (void)
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+	(void)s;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
     const int *foo = &x[0];
     ++foo;
+	(void)foo;
   }
   { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
     typedef const int *iptr;
     iptr p = 0;
     ++p;
+	(void)p;
   }
   { /* AIX XL C 1.02.0.0 rejects this saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
@@ -17264,6 +17275,7 @@ main (void)
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+	(void)foo;
   }
 #endif
 
@@ -17272,16 +17284,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17278: \$? = $ac_status" >&5
+  echo "$as_me:17290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17284: \$? = $ac_status" >&5
+  echo "$as_me:17296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17291,7 +17303,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17294: result: $ac_cv_c_const" >&5
+echo "$as_me:17306: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17303,7 +17315,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17306: checking if data-only library module links" >&5
+echo "$as_me:17318: 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
@@ -17311,20 +17323,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17314 "configure"
+#line 17326 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17317: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17320: \$? = $ac_status" >&5
+  echo "$as_me:17332: \$? = $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 <<EOF
-#line 17327 "configure"
+#line 17339 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17341,10 +17353,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17344: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17347: \$? = $ac_status" >&5
+  echo "$as_me:17359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17357,7 +17369,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17360 "configure"
+#line 17372 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17368,15 +17380,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17383: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17374: \$? = $ac_status" >&5
+  echo "$as_me:17386: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17379: \$? = $ac_status" >&5
+  echo "$as_me:17391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17391,7 +17403,7 @@ fi
 
 fi
 
-echo "$as_me:17394: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17410,23 +17422,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17413: checking for $ac_header" >&5
+echo "$as_me:17425: 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 17419 "configure"
+#line 17431 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17423: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17435: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17429: \$? = $ac_status" >&5
+  echo "$as_me:17441: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17445,7 +17457,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17460: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17455,7 +17467,7 @@ EOF
 fi
 done
 
-echo "$as_me:17458: checking for working mkstemp" >&5
+echo "$as_me:17470: 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
@@ -17466,7 +17478,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17469 "configure"
+#line 17481 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17501,15 +17513,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17507: \$? = $ac_status" >&5
+  echo "$as_me:17519: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17512: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17524,16 +17536,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17527: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17539: 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:17530: checking for mkstemp" >&5
+	echo "$as_me:17542: 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 17536 "configure"
+#line 17548 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17564,16 +17576,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17570: \$? = $ac_status" >&5
+  echo "$as_me:17582: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17576: \$? = $ac_status" >&5
+  echo "$as_me:17588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17583,7 +17595,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17586: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -17612,7 +17624,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:17615: checking for $ac_word" >&5
+echo "$as_me:17627: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17629,7 +17641,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:17632: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17644: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17641,10 +17653,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:17644: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:17656: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:17647: result: no" >&5
+  echo "$as_me:17659: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17654,7 +17666,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:17657: checking for $cf_prog_gnat version" >&5
+echo "$as_me:17669: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17665,7 +17677,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17668: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17680: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -17694,7 +17706,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:17697: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:17709: 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
@@ -17713,10 +17725,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:17716: result: $cf_gprconfig_value" >&5
+					echo "$as_me:17728: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:17719: result: missing" >&5
+					echo "$as_me:17731: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -17729,7 +17741,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:17732: checking for gnat version" >&5
+echo "$as_me:17744: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17740,7 +17752,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:17743: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17755: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -17749,7 +17761,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:17752: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:17764: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -17757,7 +17769,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:17760: checking for $ac_word" >&5
+echo "$as_me:17772: 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
@@ -17772,7 +17784,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:17775: found $ac_dir/$ac_word" >&5
+echo "$as_me:17787: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17781,20 +17793,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:17784: result: $M4_exists" >&5
+  echo "$as_me:17796: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:17787: result: no" >&5
+  echo "$as_me:17799: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:17793: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:17805: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:17797: checking if GNAT works" >&5
+			echo "$as_me:17809: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -17822,7 +17834,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:17825: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -17832,7 +17844,7 @@ fi
 
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:17835: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -17849,10 +17861,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:17852: result: $ADAFLAGS" >&5
+	echo "$as_me:17864: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:17855: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17867: 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
@@ -17862,11 +17874,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:17865: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17877: 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:17869: checking if GNAT supports generics" >&5
+echo "$as_me:17881: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -17876,7 +17888,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:17879: result: $cf_gnat_generics" >&5
+echo "$as_me:17891: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -17888,7 +17900,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:17891: checking if GNAT supports SIGINT" >&5
+echo "$as_me:17903: 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
@@ -17936,7 +17948,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:17939: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -17949,7 +17961,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:17952: checking if GNAT supports project files" >&5
+echo "$as_me:17964: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18012,15 +18024,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18015: result: $cf_gnat_projects" >&5
+echo "$as_me:18027: 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:18021: checking if GNAT supports libraries" >&5
+	echo "$as_me:18033: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18023: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18035: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18040,7 +18052,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18043: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18052,7 +18064,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18055: checking for Ada95 compiler" >&5
+echo "$as_me:18067: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18063,12 +18075,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18066: result: $cf_ada_compiler" >&5
+echo "$as_me:18078: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18071: checking for Ada95 include directory" >&5
+echo "$as_me:18083: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18104,7 +18116,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18107: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18113,10 +18125,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18116: result: $ADA_INCLUDE" >&5
+echo "$as_me:18128: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18119: checking for Ada95 object directory" >&5
+echo "$as_me:18131: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18152,7 +18164,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18155: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18161,10 +18173,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18164: result: $ADA_OBJECTS" >&5
+echo "$as_me:18176: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18167: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18185,11 +18197,11 @@ then
 	fi
 fi
 
-echo "$as_me:18188: result: $with_ada_sharedlib" >&5
+echo "$as_me:18200: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18192: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18207,7 +18219,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18210: checking for Ada95 curses library name" >&5
+echo "$as_me:18222: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18223,16 +18235,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18226: result: $ADA_LIBNAME" >&5
+echo "$as_me:18238: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18230: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18242: 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:18235: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18247: 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
@@ -18272,7 +18284,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18275: checking default library suffix" >&5
+echo "$as_me:18287: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18283,10 +18295,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18286: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18289: checking default library-dependency suffix" >&5
+echo "$as_me:18301: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18369,10 +18381,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18372: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18384: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18375: checking default object directory" >&5
+echo "$as_me:18387: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18388,7 +18400,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18391: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18461,7 +18473,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -18530,7 +18542,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18533: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18545: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18666,7 +18678,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230903,
+configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -18711,7 +18723,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18714: error: ambiguous option: $1
+    { { echo "$as_me:18726: 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;}
@@ -18730,7 +18742,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18733: error: unrecognized option: $1
+  -*) { { echo "$as_me:18745: 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;}
@@ -18749,7 +18761,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230903, executed with
+This file was extended by $as_me 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -18805,7 +18817,7 @@ do
   "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:18808: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18820: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19166,7 +19178,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19169: creating $ac_file" >&5
+    { echo "$as_me:19181: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19184,7 +19196,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19187: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19197,7 +19209,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19200: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19212: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19213,7 +19225,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19216: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19228: 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;}
@@ -19222,7 +19234,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19225: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19237: 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;}
@@ -19267,7 +19279,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19270: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19282: 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;}
@@ -19278,7 +19290,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19281: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19293: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19327,7 +19339,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19330: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19342: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19338,7 +19350,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19341: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19351,7 +19363,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19354: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19366: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19409,7 +19421,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19412: $ac_file is unchanged" >&5
+      { echo "$as_me:19424: $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/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 05331374c..525ce9987 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #     and:  Thomas E. Dickey, 1997
 #
-#  $Id: Makefile.in,v 1.101 2022/12/03 19:45:12 Nicolas.Boulenguez Exp $
+#  $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $
 #
 .SUFFIXES:
 
@@ -183,7 +183,8 @@ $(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) $@"
 ################################################################################
 $(ADA_SRCDIR)/$(ABASE).ads: 	$(srcdir)/$(ABASE).ads.m4 \
-				$(srcdir)/normal.m4
+				$(srcdir)/normal.m4 \
+				options.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE).ads.m4 |\
 	$(DEL_ADAMODE) >$@
@@ -284,6 +285,7 @@ mostlyclean ::
 	-rm -f a.out core $(PROG_GENERATE) *.o
 
 clean :: mostlyclean
+	-rm -f options.m4
 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
 
 distclean :: clean
@@ -294,6 +296,15 @@ realclean :: distclean
 
 HTML_DIR = @ADAHTML_DIR@
 
+options.m4 :
+	$(SHELL) -c "if [ @cf_cv_enable_sigwinch@ = 0 ]; \
+		then \
+			dashes='   --'; \
+		else \
+			dashes='';\
+		fi; \
+		echo \"define(OPT_KEY_RESIZE,\\\`\$$dashes')dnl\" > $@"
+
 instab.tmp : table.m4 $(GEN_SRC)
 	@rm -f $@
 	@for f in $(GEN_SRC) ; do \
diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index d92fa68e5..b37de1b02 100644
--- a/Ada95/gen/gen.c
+++ b/Ada95/gen/gen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 /*
     Version Control
-    $Id: gen.c,v 1.78 2021/12/11 21:03:21 tom Exp $
+    $Id: gen.c,v 1.79 2024/01/19 13:41:45 tom Exp $
   --------------------------------------------------------------------------*/
 /*
   This program prints on its standard output the source for the
@@ -424,7 +424,9 @@ main(int argc, const char *argv[])
   PRINT_NAMED_CONSTANT(KEY_SUSPEND);
   PRINT_NAMED_CONSTANT(KEY_UNDO);
   PRINT_NAMED_CONSTANT(KEY_MOUSE);
+#ifdef KEY_RESIZE
   PRINT_NAMED_CONSTANT(KEY_RESIZE);
+#endif
 
   print_comment(fp, "alternate character codes (ACS) from addch(3NCURSES)");
 #define PRINT_ACS(name) print_size_of (fp, #name, (size_t)(&name - &acs_map[0]))
diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4
index a5e910368..d6b18e587 100644
--- a/Ada95/gen/terminal_interface-curses.ads.m4
+++ b/Ada95/gen/terminal_interface-curses.ads.m4
@@ -1,6 +1,6 @@
 --  -*- ada -*-
 define(`HTMLNAME',`terminal_interface-curses__ads.htm')dnl
-include(M4MACRO)------------------------------------------------------------------------------
+include(M4MACRO)include(options.m4)------------------------------------------------------------------------------
 --                                                                          --
 --                           GNAT ncurses Binding                           --
 --                                                                          --
@@ -9,7 +9,7 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2020,2024 Thomas E. Dickey                                     --
 -- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -38,8 +38,8 @@ include(M4MACRO)----------------------------------------------------------------
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.48 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.49 $
+--  $Date: 2024/01/19 16:51:30 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System.Storage_Elements;
@@ -377,8 +377,8 @@ package Terminal_Interface.Curses is
      := Curses_Constants.KEY_UNDO;
    Key_Mouse                   : constant Special_Key_Code
      := Curses_Constants.KEY_MOUSE;
-   Key_Resize                  : constant Special_Key_Code
-     := Curses_Constants.KEY_RESIZE;
+OPT_KEY_RESIZE   Key_Resize                  : constant Special_Key_Code
+OPT_KEY_RESIZE     := Curses_Constants.KEY_RESIZE;
    Key_Max                     : constant Special_Key_Code
      := Special_Key_Code'Last;
 
diff --git a/NEWS b/NEWS
index 49bbd33c0..819868ecf 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4064 2024/01/13 22:02:10 tom Exp $
+-- $Id: NEWS,v 1.4069 2024/01/20 19:46:10 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240120
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ amend discussion of aliases in tput.1
+	+ use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs
+	  ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit
+	  xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD
+	+ modify configure scripts/makefiles to omit KEY_RESIZE if the
+	  corresponding SIGWINCH feature is disabled.
+
 20240113
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ modify dist.mk to avoid passing developer's comments in manpages into
diff --git a/VERSION b/VERSION
index 4b0762cf3..1c4709a55 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240113
+5:0:10	6.4	20240120
diff --git a/configure b/configure
index 655c5f226..814eb2fc2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.773 .
+# From configure.in Revision: 1.774 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230903.
+# Generated by Autoconf 2.52.20231210.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -949,7 +949,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230903.  Invocation command line was
+generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
 
@@ -6150,7 +6150,7 @@ int
 main (void)
 {
 #ifndef exit
-  char *p = (char *) exit; (void) p;
+  (void) exit;
 #endif
 
   ;
@@ -6253,7 +6253,7 @@ 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 opendir ();
+char opendir (void);
 int
 main (void)
 {
@@ -6307,7 +6307,7 @@ 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 opendir ();
+char opendir (void);
 int
 main (void)
 {
@@ -7537,7 +7537,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -7693,7 +7693,7 @@ 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 dlsym ();
+char dlsym (void);
 int
 main (void)
 {
@@ -7952,7 +7952,7 @@ 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 Gpm_Wgetch ();
+char Gpm_Wgetch (void);
 int
 main (void)
 {
@@ -8226,7 +8226,7 @@ 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 regcomp ();
+char regcomp (void);
 int
 main (void)
 {
@@ -8294,7 +8294,7 @@ 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 regcomp ();
+char regcomp (void);
 int
 main (void)
 {
@@ -14150,25 +14150,28 @@ else
 #line 14150 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+    #include <sys/types.h>
 int
 main (void)
 {
-return !fseeko;
+
+    int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+    return my_fseeko(stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14165: \$? = $ac_status" >&5
+  echo "$as_me:14168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14171: \$? = $ac_status" >&5
+  echo "$as_me:14174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14177,29 +14180,32 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14180 "configure"
+#line 14183 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
+    #include <sys/types.h>
 int
 main (void)
 {
-return !fseeko;
+
+    int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+    return my_fseeko(stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14196: \$? = $ac_status" >&5
+  echo "$as_me:14202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14202: \$? = $ac_status" >&5
+  echo "$as_me:14208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14210,7 +14216,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14213: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14219: 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
 
@@ -14224,34 +14230,36 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14227: checking for fseeko" >&5
+echo "$as_me:14233: 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 14233 "configure"
+#line 14239 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+                             #include <sys/types.h>
 int
 main (void)
 {
-return fseeko && fseeko (stdin, 0, 0);
+int (*my_fseeko)(FILE *, off_t, int) = fseeko;
+                            return my_fseeko && my_fseeko (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14248: \$? = $ac_status" >&5
+  echo "$as_me:14256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14254: \$? = $ac_status" >&5
+  echo "$as_me:14262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14261,7 +14269,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14264: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14272: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14300,14 +14308,14 @@ fi
 
 	fi
 
-	echo "$as_me:14303: checking whether to use struct dirent64" >&5
+	echo "$as_me:14311: 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 14310 "configure"
+#line 14318 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14334,16 +14342,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14340: \$? = $ac_status" >&5
+  echo "$as_me:14348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14346: \$? = $ac_status" >&5
+  echo "$as_me:14354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14354,7 +14362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14357: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14365: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14364,7 +14372,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14367: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14375: 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.
@@ -14374,14 +14382,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14377: result: $with_tparm_varargs" >&5
+echo "$as_me:14385: 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:14384: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14392: 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.
@@ -14391,14 +14399,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14394: result: $with_tic_depends" >&5
+echo "$as_me:14402: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14401: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14409: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14410,15 +14418,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14413: result: no" >&5
+	echo "$as_me:14421: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14417: result: yes" >&5
+	echo "$as_me:14425: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14421: checking for X11 rgb file" >&5
+echo "$as_me:14429: 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.
@@ -14482,7 +14490,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14485: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14493: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14490,7 +14498,7 @@ esac
 
 fi
 
-echo "$as_me:14493: result: $RGB_PATH" >&5
+echo "$as_me:14501: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14505,7 +14513,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14508: checking for type of bool" >&5
+echo "$as_me:14516: 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.
@@ -14515,17 +14523,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14518: result: $NCURSES_BOOL" >&5
+echo "$as_me:14526: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14522: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14530: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14528: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14536: 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.
@@ -14537,16 +14545,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14540: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14548: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14544: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14552: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14549: checking for type of chtype" >&5
+echo "$as_me:14557: 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.
@@ -14556,11 +14564,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14559: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14567: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14563: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14571: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14568,7 +14576,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14571: checking for type of ospeed" >&5
+echo "$as_me:14579: 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.
@@ -14578,11 +14586,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14581: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14589: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14585: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14593: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14590,7 +14598,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14593: checking for type of mmask-t" >&5
+echo "$as_me:14601: 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.
@@ -14600,18 +14608,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14603: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14611: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14607: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14615: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14614: checking for size CCHARW_MAX" >&5
+echo "$as_me:14622: 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.
@@ -14621,16 +14629,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14624: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14632: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14627: checking for signed char" >&5
+echo "$as_me:14635: 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 14633 "configure"
+#line 14641 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14645,16 +14653,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14651: \$? = $ac_status" >&5
+  echo "$as_me:14659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14657: \$? = $ac_status" >&5
+  echo "$as_me:14665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14664,10 +14672,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14667: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14675: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14670: checking size of signed char" >&5
+echo "$as_me:14678: 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
@@ -14676,7 +14684,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14679 "configure"
+#line 14687 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14688,21 +14696,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14700: \$? = $ac_status" >&5
+  echo "$as_me:14708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14705 "configure"
+#line 14713 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14714,16 +14722,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14720: \$? = $ac_status" >&5
+  echo "$as_me:14728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14726: \$? = $ac_status" >&5
+  echo "$as_me:14734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14739,7 +14747,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14742 "configure"
+#line 14750 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14751,16 +14759,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14757: \$? = $ac_status" >&5
+  echo "$as_me:14765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14763: \$? = $ac_status" >&5
+  echo "$as_me:14771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14776,7 +14784,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14779 "configure"
+#line 14787 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14788,16 +14796,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14794: \$? = $ac_status" >&5
+  echo "$as_me:14802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14800: \$? = $ac_status" >&5
+  echo "$as_me:14808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14810,12 +14818,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14813: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14821: 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 14818 "configure"
+#line 14826 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14831,15 +14839,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14837: \$? = $ac_status" >&5
+  echo "$as_me:14845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14842: \$? = $ac_status" >&5
+  echo "$as_me:14850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14855,7 +14863,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14858: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14866: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14866,7 +14874,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14869: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:14877: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -14876,13 +14884,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14879: result: $with_signed_char" >&5
+echo "$as_me:14887: 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:14885: checking for type of tparm-arg" >&5
+echo "$as_me:14893: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -14892,18 +14900,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14895: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14903: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:14899: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:14907: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14906: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14914: 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.
@@ -14913,7 +14921,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14916: result: $with_rcs_ids" >&5
+echo "$as_me:14924: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14922,7 +14930,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14925: checking format of man-pages" >&5
+echo "$as_me:14933: 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.
@@ -15013,10 +15021,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15016: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15024: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15019: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15027: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15055,7 +15063,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15058: checking for manpage renaming" >&5
+echo "$as_me:15066: 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.
@@ -15084,15 +15092,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15087: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15095: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15092: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15100: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15095: checking if manpage aliases will be installed" >&5
+echo "$as_me:15103: 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.
@@ -15103,7 +15111,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15106: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15114: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15117,7 +15125,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15120: checking if manpage symlinks should be used" >&5
+echo "$as_me:15128: 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.
@@ -15130,17 +15138,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15133: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15141: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15139: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15147: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15143: checking for manpage tbl" >&5
+echo "$as_me:15151: 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.
@@ -15151,7 +15159,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15154: result: $MANPAGE_TBL" >&5
+echo "$as_me:15162: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15469,7 +15477,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15472: checking if you want to build with function extensions" >&5
+echo "$as_me:15480: 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.
@@ -15479,7 +15487,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15482: result: $with_ext_funcs" >&5
+echo "$as_me:15490: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15535,7 +15543,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15538: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15546: 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.
@@ -15545,7 +15553,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15548: result: $with_sp_funcs" >&5
+echo "$as_me:15556: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15564,7 +15572,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15567: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15575: 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.
@@ -15574,7 +15582,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15577: result: $with_term_driver" >&5
+echo "$as_me:15585: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15583,19 +15591,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15586: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15594: 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:15591: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15599: 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:15598: checking for extended use of const keyword" >&5
+echo "$as_me:15606: 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.
@@ -15605,7 +15613,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15608: result: $with_ext_const" >&5
+echo "$as_me:15616: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15613,7 +15621,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15616: checking if you want to use extended colors" >&5
+echo "$as_me:15624: 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.
@@ -15623,12 +15631,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15626: result: $with_ext_colors" >&5
+echo "$as_me:15634: 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:15631: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15639: 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)
@@ -15639,7 +15647,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15650: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15667,7 +15675,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15670: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15678: 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.
@@ -15677,7 +15685,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15680: result: $with_ext_mouse" >&5
+echo "$as_me:15688: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15687,7 +15695,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15690: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15698: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15704,7 +15712,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15707: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15715: 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.
@@ -15714,7 +15722,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15717: result: $with_ext_putwin" >&5
+echo "$as_me:15725: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15724,7 +15732,7 @@ EOF
 
 fi
 
-echo "$as_me:15727: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15735: 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.
@@ -15734,7 +15742,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15737: result: $with_no_padding" >&5
+echo "$as_me:15745: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15742,7 +15750,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15745: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15753: 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.
@@ -15752,15 +15760,22 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15755: result: $with_sigwinch" >&5
+echo "$as_me:15763: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
-test "x$with_sigwinch" = xyes &&
+if test "x$with_sigwinch" = xyes
+then
+
 cat >>confdefs.h <<\EOF
 #define USE_SIGWINCH 1
 EOF
 
+	cf_cv_enable_sigwinch=1
+else
+	cf_cv_enable_sigwinch=0
+fi
+
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15763: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15778: 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.
@@ -15770,7 +15785,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15773: result: $with_tcap_names" >&5
+echo "$as_me:15788: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15784,7 +15799,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15787: checking if you want to link with the pthread library" >&5
+echo "$as_me:15802: 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.
@@ -15794,27 +15809,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15797: result: $with_pthread" >&5
+echo "$as_me:15812: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15801: checking for pthread.h" >&5
+	echo "$as_me:15816: 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 15807 "configure"
+#line 15822 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15811: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15826: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15817: \$? = $ac_status" >&5
+  echo "$as_me:15832: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15833,7 +15848,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15836: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15851: 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
 
@@ -15843,7 +15858,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15846: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15861: 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"
 
@@ -15864,7 +15879,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15867 "configure"
+#line 15882 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15881,16 +15896,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15887: \$? = $ac_status" >&5
+  echo "$as_me:15902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15893: \$? = $ac_status" >&5
+  echo "$as_me:15908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15900,7 +15915,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15903: result: $with_pthread" >&5
+	    echo "$as_me:15918: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15928,7 +15943,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15931: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15946: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15938,13 +15953,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15941: checking for pthread_kill" >&5
+	echo "$as_me:15956: 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 15947 "configure"
+#line 15962 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15975,16 +15990,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15981: \$? = $ac_status" >&5
+  echo "$as_me:15996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15987: \$? = $ac_status" >&5
+  echo "$as_me:16002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -15994,11 +16009,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15997: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16012: 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:16001: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16016: 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.
@@ -16008,7 +16023,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16011: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16026: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16019,7 +16034,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16022: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16037: 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.
@@ -16029,18 +16044,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16032: result: $use_weak_symbols" >&5
+	echo "$as_me:16047: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16036: checking if $CC supports weak symbols" >&5
+echo "$as_me:16051: 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 16043 "configure"
+#line 16058 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16066,16 +16081,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16072: \$? = $ac_status" >&5
+  echo "$as_me:16087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16078: \$? = $ac_status" >&5
+  echo "$as_me:16093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16086,7 +16101,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16089: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16104: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16136,7 +16151,7 @@ fi
 # 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:16139: checking if you want reentrant code" >&5
+echo "$as_me:16154: 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.
@@ -16146,7 +16161,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16149: result: $with_reentrant" >&5
+echo "$as_me:16164: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16235,7 +16250,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16238: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16253: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16247,7 +16262,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16250: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16265: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16269,16 +16284,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16272: result: $enable_opaque_curses" >&5
+echo "$as_me:16287: 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:16277: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16292: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16281: checking whether form library structures should be opaque" >&5
+echo "$as_me:16296: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16288,10 +16303,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16291: result: $enable_opaque_form" >&5
+echo "$as_me:16306: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16294: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16309: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16301,10 +16316,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16304: result: $enable_opaque_menu" >&5
+echo "$as_me:16319: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16307: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16322: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16314,7 +16329,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16317: result: $enable_opaque_panel" >&5
+echo "$as_me:16332: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16324,7 +16339,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16327: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16342: 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.
@@ -16334,7 +16349,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16337: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16352: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16347,7 +16362,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16350: checking if you want all development code" >&5
+echo "$as_me:16365: 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.
@@ -16357,11 +16372,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16360: result: $with_develop" >&5
+echo "$as_me:16375: 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:16364: checking if you want hard-tabs code" >&5
+echo "$as_me:16379: 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.
@@ -16371,7 +16386,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16374: result: $enable_hard_tabs" >&5
+echo "$as_me:16389: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16379,7 +16394,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16382: checking if you want limited support for xmc" >&5
+echo "$as_me:16397: 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.
@@ -16389,7 +16404,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16392: result: $enable_xmc_glitch" >&5
+echo "$as_me:16407: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16399,7 +16414,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16402: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16417: 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.
@@ -16409,7 +16424,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16412: result: $with_assumed_color" >&5
+echo "$as_me:16427: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16417,7 +16432,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16420: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16435: 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.
@@ -16427,7 +16442,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16430: result: $with_hashmap" >&5
+echo "$as_me:16445: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16435,7 +16450,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16438: checking if you want code to check screensize" >&5
+echo "$as_me:16453: checking if you want code to check screensize" >&5
 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16445,7 +16460,7 @@ if test "${enable_check_size+set}" = set; then
 else
   with_check_size=no
 fi;
-echo "$as_me:16448: result: $with_check_size" >&5
+echo "$as_me:16463: result: $with_check_size" >&5
 echo "${ECHO_T}$with_check_size" >&6
 test "x$with_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16453,7 +16468,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16456: checking if you want colorfgbg code" >&5
+echo "$as_me:16471: 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.
@@ -16463,7 +16478,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16466: result: $with_colorfgbg" >&5
+echo "$as_me:16481: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16471,7 +16486,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16474: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16489: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16481,14 +16496,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16484: result: $cf_with_fvisibility" >&5
+echo "$as_me:16499: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16491: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16506: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16497,7 +16512,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16500 "configure"
+#line 16515 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16513,16 +16528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16519: \$? = $ac_status" >&5
+  echo "$as_me:16534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16525: \$? = $ac_status" >&5
+  echo "$as_me:16540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16534,7 +16549,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16537: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16552: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16649,7 +16664,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16652: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16667: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16658,7 +16673,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16661 "configure"
+#line 16676 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16674,16 +16689,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16680: \$? = $ac_status" >&5
+  echo "$as_me:16695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16686: \$? = $ac_status" >&5
+  echo "$as_me:16701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16695,7 +16710,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16698: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16713: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16818,7 +16833,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16821: checking if you want interop bindings" >&5
+echo "$as_me:16836: 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.
@@ -16828,13 +16843,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16831: result: $with_exp_interop" >&5
+echo "$as_me:16846: 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:16837: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16852: 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.
@@ -16844,13 +16859,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16847: result: $with_safe_sprintf" >&5
+echo "$as_me:16862: 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:16853: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16868: 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.
@@ -16860,7 +16875,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16863: result: $with_scroll_hints" >&5
+echo "$as_me:16878: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16869,7 +16884,7 @@ EOF
 
 fi
 
-echo "$as_me:16872: checking if you want wgetch-events code" >&5
+echo "$as_me:16887: 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.
@@ -16879,7 +16894,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16882: result: $with_wgetch_events" >&5
+echo "$as_me:16897: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16894,7 +16909,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16897: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16912: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16904,7 +16919,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16907: result: $with_exp_win32" >&5
+	echo "$as_me:16922: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16930,7 +16945,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16933: checking if you want to see long compiling messages" >&5
+echo "$as_me:16948: 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.
@@ -16964,7 +16979,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16967: result: $enableval" >&5
+echo "$as_me:16982: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16977,7 +16992,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16980: checking if you want to install stripped executables" >&5
+echo "$as_me:16995: 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.
@@ -16994,7 +17009,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:16997: result: $enable_stripping" >&5
+echo "$as_me:17012: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17005,7 +17020,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17008: checking if install accepts -p option" >&5
+echo "$as_me:17023: 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
@@ -17036,10 +17051,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17039: result: $cf_cv_install_p" >&5
+echo "$as_me:17054: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17042: checking if install needs to be told about ownership" >&5
+echo "$as_me:17057: 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)
@@ -17050,7 +17065,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17053: result: $with_install_o" >&5
+echo "$as_me:17068: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17061,7 +17076,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17064: checking if you want to specify strip-program" >&5
+	echo "$as_me:17079: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17071,11 +17086,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17074: result: $with_strip_program" >&5
+	echo "$as_me:17089: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17078: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17093: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17096,11 +17111,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17099: result: $check_install_strip" >&5
+		echo "$as_me:17114: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17103: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17118: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17115,7 +17130,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17118: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17133: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17141,7 +17156,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17144: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17159: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17158,17 +17173,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17161: result: $enable_stdnoreturn" >&5
+echo "$as_me:17176: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17165: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17180: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17171 "configure"
+#line 17186 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17184,16 +17199,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17190: \$? = $ac_status" >&5
+  echo "$as_me:17205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17196: \$? = $ac_status" >&5
+  echo "$as_me:17211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17204,7 +17219,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17207: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17222: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17260,16 +17275,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17263: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17278: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17268: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17283: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17272: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17287: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17308,16 +17323,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17311: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17326: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17316: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17331: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17320: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17335: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17356,23 +17371,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17374: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17364: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17379: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17368: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17383: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17375: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17390: 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.
@@ -17389,7 +17404,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17392: result: $enable_warnings" >&5
+echo "$as_me:17407: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17413,7 +17428,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17416 "configure"
+#line 17431 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17428,26 +17443,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17434: \$? = $ac_status" >&5
+  echo "$as_me:17449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17440: \$? = $ac_status" >&5
+  echo "$as_me:17455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17443: checking for X11/Xt const-feature" >&5
+echo "$as_me:17458: 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 17450 "configure"
+#line 17465 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17465,16 +17480,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17471: \$? = $ac_status" >&5
+  echo "$as_me:17486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17477: \$? = $ac_status" >&5
+  echo "$as_me:17492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17489,7 +17504,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17492: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17507: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17518,7 +17533,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17521 "${as_me:-configure}"
+#line 17536 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17534,7 +17549,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17537: checking for $CC warning options..." >&5
+	{ echo "$as_me:17552: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17550,12 +17565,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17553: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17556: \$? = $ac_status" >&5
+  echo "$as_me:17571: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17558: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17573: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17563,7 +17578,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17566: checking for $CC warning options..." >&5
+	{ echo "$as_me:17581: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17586,12 +17601,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17589: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17592: \$? = $ac_status" >&5
+  echo "$as_me:17607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17594: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17609: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17599,7 +17614,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17602: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17617: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17609,7 +17624,7 @@ echo "${as_me:-configure}:17602: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17612: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17627: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17642,10 +17657,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17645: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17660: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17648 "${as_me:-configure}"
+#line 17663 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17695,12 +17710,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17698: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17701: \$? = $ac_status" >&5
+  echo "$as_me:17716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17703: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17718: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17772,12 +17787,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17775: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17790: 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 17780 "configure"
+#line 17795 "configure"
 #include "confdefs.h"
 
 int
@@ -17794,16 +17809,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17800: \$? = $ac_status" >&5
+  echo "$as_me:17815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17806: \$? = $ac_status" >&5
+  echo "$as_me:17821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17814,7 +17829,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17817: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17832: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17823,11 +17838,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17826: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17841: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17830 "configure"
+#line 17845 "configure"
 #include "confdefs.h"
 
 int
@@ -17844,16 +17859,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17850: \$? = $ac_status" >&5
+  echo "$as_me:17865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17856: \$? = $ac_status" >&5
+  echo "$as_me:17871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17863,7 +17878,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17866: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17881: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17872,30 +17887,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17875: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17890: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17882: checking version of $CC" >&5
+	echo "$as_me:17897: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17886: result: $CLANG_VERSION" >&5
+	echo "$as_me:17901: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17893: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17908: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17898 "configure"
+#line 17913 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17909,16 +17924,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17915: \$? = $ac_status" >&5
+  echo "$as_me:17930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17921: \$? = $ac_status" >&5
+  echo "$as_me:17936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17929,13 +17944,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17932: result: $cf_clang_optok" >&5
+		echo "$as_me:17947: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17938: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17953: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17952,7 +17967,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17955 "configure"
+#line 17970 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17970,7 +17985,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17973: checking for $CC warning options..." >&5
+	{ echo "$as_me:17988: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -17987,12 +18002,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17993: \$? = $ac_status" >&5
+  echo "$as_me:18008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17995: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18010: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18001,7 +18016,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18004: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18019: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18031,16 +18046,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18037: \$? = $ac_status" >&5
+  echo "$as_me:18052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18039: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18054: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18043: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18058: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18058,7 +18073,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18061: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18076: 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.
@@ -18068,7 +18083,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18071: result: $enable_string_hacks" >&5
+echo "$as_me:18086: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18077,15 +18092,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18080: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18095: 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:18082: checking for strlcat" >&5
+	echo "$as_me:18097: 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 18088 "configure"
+#line 18103 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18116,16 +18131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18122: \$? = $ac_status" >&5
+  echo "$as_me:18137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18128: \$? = $ac_status" >&5
+  echo "$as_me:18143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18135,7 +18150,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18138: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18153: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18145,7 +18160,7 @@ EOF
 
 else
 
-		echo "$as_me:18148: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18163: 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
@@ -18153,7 +18168,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18156 "configure"
+#line 18171 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18162,7 +18177,7 @@ 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 strlcat ();
+char strlcat (void);
 int
 main (void)
 {
@@ -18172,16 +18187,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18178: \$? = $ac_status" >&5
+  echo "$as_me:18193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18184: \$? = $ac_status" >&5
+  echo "$as_me:18199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18192,7 +18207,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18195: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18210: 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
 
@@ -18215,23 +18230,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18218: checking for $ac_header" >&5
+echo "$as_me:18233: 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 18224 "configure"
+#line 18239 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18228: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18243: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18234: \$? = $ac_status" >&5
+  echo "$as_me:18249: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18250,7 +18265,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18253: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18268: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18271,13 +18286,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18274: checking for $ac_func" >&5
+echo "$as_me:18289: 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 18280 "configure"
+#line 18295 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18308,16 +18323,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18314: \$? = $ac_status" >&5
+  echo "$as_me:18329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18320: \$? = $ac_status" >&5
+  echo "$as_me:18335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18327,7 +18342,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18330: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18345: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18340,7 +18355,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18343: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18358: 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.
@@ -18350,7 +18365,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18353: result: $with_assertions" >&5
+echo "$as_me:18368: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18366,7 +18381,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18369: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18384: 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.
@@ -18388,7 +18403,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18391: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18406: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18502,23 +18517,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18505: checking for dmalloc.h" >&5
+	echo "$as_me:18520: 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 18511 "configure"
+#line 18526 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18530: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18521: \$? = $ac_status" >&5
+  echo "$as_me:18536: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18537,11 +18552,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18540: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18555: 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:18544: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18559: 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
@@ -18549,7 +18564,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18552 "configure"
+#line 18567 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18558,7 +18573,7 @@ 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 dmalloc_debug ();
+char dmalloc_debug (void);
 int
 main (void)
 {
@@ -18568,16 +18583,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18574: \$? = $ac_status" >&5
+  echo "$as_me:18589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18580: \$? = $ac_status" >&5
+  echo "$as_me:18595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18588,7 +18603,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18591: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18606: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18603,7 +18618,7 @@ fi
 
 fi
 
-echo "$as_me:18606: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18621: 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.
@@ -18625,7 +18640,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18628: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18643: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18739,23 +18754,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18742: checking for dbmalloc.h" >&5
+	echo "$as_me:18757: 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 18748 "configure"
+#line 18763 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18752: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18758: \$? = $ac_status" >&5
+  echo "$as_me:18773: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18774,11 +18789,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18777: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18792: 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:18781: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18796: 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
@@ -18786,7 +18801,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18789 "configure"
+#line 18804 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18795,7 +18810,7 @@ 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 debug_malloc ();
+char debug_malloc (void);
 int
 main (void)
 {
@@ -18805,16 +18820,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18811: \$? = $ac_status" >&5
+  echo "$as_me:18826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18817: \$? = $ac_status" >&5
+  echo "$as_me:18832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18825,7 +18840,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18828: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18843: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18840,7 +18855,7 @@ fi
 
 fi
 
-echo "$as_me:18843: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18858: 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.
@@ -18862,7 +18877,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18865: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18880: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18975,7 +18990,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18978: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18993: 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.
@@ -18986,7 +19001,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:18989: result: $with_no_leaks" >&5
+echo "$as_me:19004: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19038,7 +19053,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19041: checking whether to add trace feature to all models" >&5
+echo "$as_me:19056: 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.
@@ -19048,7 +19063,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19051: result: $cf_with_trace" >&5
+echo "$as_me:19066: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19162,7 +19177,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19165: checking if we want to use GNAT projects" >&5
+echo "$as_me:19180: 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.
@@ -19179,7 +19194,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19182: result: $enable_gnat_projects" >&5
+echo "$as_me:19197: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19192,14 +19207,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19195: checking if ssp library is needed" >&5
+echo "$as_me:19210: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19202 "configure"
+#line 19217 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19216,16 +19231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19222: \$? = $ac_status" >&5
+  echo "$as_me:19237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19228: \$? = $ac_status" >&5
+  echo "$as_me:19243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19235,7 +19250,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19238 "configure"
+#line 19253 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19252,16 +19267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19258: \$? = $ac_status" >&5
+  echo "$as_me:19273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19264: \$? = $ac_status" >&5
+  echo "$as_me:19279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19275,7 +19290,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19278: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19293: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19304,14 +19319,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19307: checking if -lm needed for math functions" >&5
+echo "$as_me:19322: 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 19314 "configure"
+#line 19329 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19327,16 +19342,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19333: \$? = $ac_status" >&5
+  echo "$as_me:19348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19339: \$? = $ac_status" >&5
+  echo "$as_me:19354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19346,7 +19361,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19349: result: $cf_cv_need_libm" >&5
+echo "$as_me:19364: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19354,14 +19369,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19357: checking if -lm is available for math functions" >&5
+	echo "$as_me:19372: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19364 "configure"
+#line 19379 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19377,16 +19392,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19383: \$? = $ac_status" >&5
+  echo "$as_me:19398: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19389: \$? = $ac_status" >&5
+  echo "$as_me:19404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19396,7 +19411,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19399: result: $cf_cv_have_libm" >&5
+echo "$as_me:19414: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19418,13 +19433,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19421: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19436: 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 19427 "configure"
+#line 19442 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19440,16 +19455,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19446: \$? = $ac_status" >&5
+  echo "$as_me:19461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19452: \$? = $ac_status" >&5
+  echo "$as_me:19467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19459,7 +19474,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19462: result: $ac_cv_header_time" >&5
+echo "$as_me:19477: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19474,7 +19489,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19477: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19492: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19482,7 +19497,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19485 "configure"
+#line 19500 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19491,7 +19506,7 @@ 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 regcomp ();
+char regcomp (void);
 int
 main (void)
 {
@@ -19501,16 +19516,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19513: \$? = $ac_status" >&5
+  echo "$as_me:19528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19521,11 +19536,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19524: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19539: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19528: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19543: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19533,7 +19548,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19536 "configure"
+#line 19551 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19542,7 +19557,7 @@ 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 libiconv_open ();
+char libiconv_open (void);
 int
 main (void)
 {
@@ -19552,16 +19567,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19558: \$? = $ac_status" >&5
+  echo "$as_me:19573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19564: \$? = $ac_status" >&5
+  echo "$as_me:19579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19572,7 +19587,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19575: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19590: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19594,7 +19609,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19597: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19612: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19602,7 +19617,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19605 "configure"
+#line 19620 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19611,7 +19626,7 @@ 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 libintl_gettext ();
+char libintl_gettext (void);
 int
 main (void)
 {
@@ -19621,16 +19636,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19627: \$? = $ac_status" >&5
+  echo "$as_me:19642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19633: \$? = $ac_status" >&5
+  echo "$as_me:19648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19641,7 +19656,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19644: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19659: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19663,7 +19678,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19666: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19681: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19671,7 +19686,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19674 "configure"
+#line 19689 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19680,7 +19695,7 @@ 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 tre_regcomp ();
+char tre_regcomp (void);
 int
 main (void)
 {
@@ -19690,16 +19705,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19696: \$? = $ac_status" >&5
+  echo "$as_me:19711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19702: \$? = $ac_status" >&5
+  echo "$as_me:19717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19710,7 +19725,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19713: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19728: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19752,7 +19767,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19755: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19770: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19760,7 +19775,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19763 "configure"
+#line 19778 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19769,7 +19784,7 @@ 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 regcomp ();
+char regcomp (void);
 int
 main (void)
 {
@@ -19779,16 +19794,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19785: \$? = $ac_status" >&5
+  echo "$as_me:19800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19791: \$? = $ac_status" >&5
+  echo "$as_me:19806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19799,7 +19814,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19802: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19817: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19827,13 +19842,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19830: checking for regcomp" >&5
+	echo "$as_me:19845: 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 19836 "configure"
+#line 19851 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19864,16 +19879,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19870: \$? = $ac_status" >&5
+  echo "$as_me:19885: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19891: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19883,7 +19898,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19886: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19901: 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
@@ -19892,7 +19907,7 @@ else
 		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:19895: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19910: 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
@@ -19900,7 +19915,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19903 "configure"
+#line 19918 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19909,7 +19924,7 @@ 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 regcomp ();
+char regcomp (void);
 int
 main (void)
 {
@@ -19919,16 +19934,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19925: \$? = $ac_status" >&5
+  echo "$as_me:19940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19931: \$? = $ac_status" >&5
+  echo "$as_me:19946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19939,7 +19954,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19942: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19957: 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
 
@@ -19971,13 +19986,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19974: checking for compile" >&5
+	echo "$as_me:19989: 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 19980 "configure"
+#line 19995 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20008,16 +20023,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20014: \$? = $ac_status" >&5
+  echo "$as_me:20029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20020: \$? = $ac_status" >&5
+  echo "$as_me:20035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20027,13 +20042,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20030: result: $ac_cv_func_compile" >&5
+echo "$as_me:20045: 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:20036: checking for compile in -lgen" >&5
+		echo "$as_me:20051: 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
@@ -20041,7 +20056,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20044 "configure"
+#line 20059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20050,7 +20065,7 @@ 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 compile ();
+char compile (void);
 int
 main (void)
 {
@@ -20060,16 +20075,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20066: \$? = $ac_status" >&5
+  echo "$as_me:20081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20072: \$? = $ac_status" >&5
+  echo "$as_me:20087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20080,7 +20095,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20083: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20098: 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
 
@@ -20108,11 +20123,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20111: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20126: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20115: checking for regular-expression headers" >&5
+echo "$as_me:20130: 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
@@ -20124,7 +20139,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20127 "configure"
+#line 20142 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20141,16 +20156,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20147: \$? = $ac_status" >&5
+  echo "$as_me:20162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20153: \$? = $ac_status" >&5
+  echo "$as_me:20168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20167,7 +20182,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20170 "configure"
+#line 20185 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20187,16 +20202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20193: \$? = $ac_status" >&5
+  echo "$as_me:20208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20199: \$? = $ac_status" >&5
+  echo "$as_me:20214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20212,11 +20227,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20215: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20230: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20219: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20234: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20254,23 +20269,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20257: checking for $ac_header" >&5
+echo "$as_me:20272: 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 20263 "configure"
+#line 20278 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20273: \$? = $ac_status" >&5
+  echo "$as_me:20288: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20289,7 +20304,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20307: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20302,23 +20317,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20305: checking for $ac_header" >&5
+echo "$as_me:20320: 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 20311 "configure"
+#line 20326 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20330: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20321: \$? = $ac_status" >&5
+  echo "$as_me:20336: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20337,7 +20352,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20340: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20355: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20347,7 +20362,7 @@ EOF
 fi
 done
 
-echo "$as_me:20350: checking for header declaring getopt variables" >&5
+echo "$as_me:20365: 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
@@ -20357,7 +20372,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20360 "configure"
+#line 20375 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20370,16 +20385,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20373: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20376: \$? = $ac_status" >&5
+  echo "$as_me:20391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20382: \$? = $ac_status" >&5
+  echo "$as_me:20397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20391,7 +20406,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20394: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20409: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20408,14 +20423,14 @@ EOF
 
 fi
 
-echo "$as_me:20411: checking if external environ is declared" >&5
+echo "$as_me:20426: 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 20418 "configure"
+#line 20433 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20428,16 +20443,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20434: \$? = $ac_status" >&5
+  echo "$as_me:20449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20440: \$? = $ac_status" >&5
+  echo "$as_me:20455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20448,7 +20463,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20451: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20466: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20463,14 +20478,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20466: checking if external environ exists" >&5
+echo "$as_me:20481: 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 20473 "configure"
+#line 20488 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20485,16 +20500,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20497: \$? = $ac_status" >&5
+  echo "$as_me:20512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20505,7 +20520,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20508: result: $cf_cv_have_environ" >&5
+echo "$as_me:20523: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20518,13 +20533,13 @@ EOF
 
 fi
 
-echo "$as_me:20521: checking for getenv" >&5
+echo "$as_me:20536: 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 20527 "configure"
+#line 20542 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20555,16 +20570,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20561: \$? = $ac_status" >&5
+  echo "$as_me:20576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20567: \$? = $ac_status" >&5
+  echo "$as_me:20582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20574,19 +20589,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20577: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20592: 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:20583: checking for $ac_func" >&5
+echo "$as_me:20598: 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 20589 "configure"
+#line 20604 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20617,16 +20632,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20623: \$? = $ac_status" >&5
+  echo "$as_me:20638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20629: \$? = $ac_status" >&5
+  echo "$as_me:20644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20636,7 +20651,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20639: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20654: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20646,7 +20661,7 @@ EOF
 fi
 done
 
-echo "$as_me:20649: checking if getenv returns consistent values" >&5
+echo "$as_me:20664: 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
@@ -20656,7 +20671,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20659 "configure"
+#line 20674 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20761,15 +20776,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20782: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20772: \$? = $ac_status" >&5
+  echo "$as_me:20787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20782,7 +20797,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20785: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20800: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20797,18 +20812,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20800: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20815: 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
 
-echo "$as_me:20804: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20819: 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 20811 "configure"
+#line 20826 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20828,16 +20843,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20834: \$? = $ac_status" >&5
+  echo "$as_me:20849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20840: \$? = $ac_status" >&5
+  echo "$as_me:20855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20849,7 +20864,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20852: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20867: 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
@@ -20864,13 +20879,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20867: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20882: 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 20873 "configure"
+#line 20888 "configure"
 #include "confdefs.h"
 
 int
@@ -20880,13 +20895,13 @@ main (void)
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset x; (void)x;
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *ccp;
   char **p;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
-  static struct point const zero = {0,0};
+  static struct point const zero = {0,0}; (void)zero;
   /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
@@ -20902,16 +20917,19 @@ main (void)
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+	(void)s;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
     const int *foo = &x[0];
     ++foo;
+	(void)foo;
   }
   { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
     typedef const int *iptr;
     iptr p = 0;
     ++p;
+	(void)p;
   }
   { /* AIX XL C 1.02.0.0 rejects this saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
@@ -20920,6 +20938,7 @@ main (void)
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+	(void)foo;
   }
 #endif
 
@@ -20928,16 +20947,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20934: \$? = $ac_status" >&5
+  echo "$as_me:20953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20940: \$? = $ac_status" >&5
+  echo "$as_me:20959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20947,7 +20966,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20950: result: $ac_cv_c_const" >&5
+echo "$as_me:20969: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20957,7 +20976,7 @@ EOF
 
 fi
 
-echo "$as_me:20960: checking for inline" >&5
+echo "$as_me:20979: 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
@@ -20965,25 +20984,25 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20968 "configure"
+#line 20987 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
+static $ac_kw int static_foo (void) {return 0; }
+$ac_kw int foo (void) {return 0; }
 #endif
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20980: \$? = $ac_status" >&5
+  echo "$as_me:20999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20986: \$? = $ac_status" >&5
+  echo "$as_me:21005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -20994,7 +21013,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20997: result: $ac_cv_c_inline" >&5
+echo "$as_me:21016: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21020,7 +21039,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21023: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21042: 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
@@ -21029,7 +21048,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21032 "configure"
+#line 21051 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21041,16 +21060,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21047: \$? = $ac_status" >&5
+  echo "$as_me:21066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21053: \$? = $ac_status" >&5
+  echo "$as_me:21072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21062,7 +21081,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21065: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21084: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21168,7 +21187,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21171: checking for signal global datatype" >&5
+echo "$as_me:21190: 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
@@ -21180,7 +21199,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21183 "configure"
+#line 21202 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21204,16 +21223,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21210: \$? = $ac_status" >&5
+  echo "$as_me:21229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21216: \$? = $ac_status" >&5
+  echo "$as_me:21235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21227,7 +21246,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21230: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21249: 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 <<EOF
@@ -21236,7 +21255,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21239: checking for type of chtype" >&5
+echo "$as_me:21258: 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
@@ -21246,7 +21265,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21249 "configure"
+#line 21268 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21281,15 +21300,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21287: \$? = $ac_status" >&5
+  echo "$as_me:21306: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21292: \$? = $ac_status" >&5
+  echo "$as_me:21311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21304,7 +21323,7 @@ fi
 
 fi
 
-echo "$as_me:21307: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21326: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21316,14 +21335,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21319: checking if unsigned literals are legal" >&5
+echo "$as_me:21338: 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 21326 "configure"
+#line 21345 "configure"
 #include "confdefs.h"
 
 int
@@ -21335,16 +21354,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21341: \$? = $ac_status" >&5
+  echo "$as_me:21360: \$? = $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:21363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21347: \$? = $ac_status" >&5
+  echo "$as_me:21366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21356,7 +21375,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21359: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21378: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21372,14 +21391,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21375: checking if external errno is declared" >&5
+echo "$as_me:21394: 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 21382 "configure"
+#line 21401 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21393,16 +21412,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21399: \$? = $ac_status" >&5
+  echo "$as_me:21418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21405: \$? = $ac_status" >&5
+  echo "$as_me:21424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21413,7 +21432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21416: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21435: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21428,14 +21447,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21431: checking if external errno exists" >&5
+echo "$as_me:21450: 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 21438 "configure"
+#line 21457 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21450,16 +21469,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21456: \$? = $ac_status" >&5
+  echo "$as_me:21475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21462: \$? = $ac_status" >&5
+  echo "$as_me:21481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21470,7 +21489,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21473: result: $cf_cv_have_errno" >&5
+echo "$as_me:21492: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21483,7 +21502,7 @@ EOF
 
 fi
 
-echo "$as_me:21486: checking if data-only library module links" >&5
+echo "$as_me:21505: 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
@@ -21491,20 +21510,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21494 "configure"
+#line 21513 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21497: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21500: \$? = $ac_status" >&5
+  echo "$as_me:21519: \$? = $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 <<EOF
-#line 21507 "configure"
+#line 21526 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21521,10 +21540,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21524: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21527: \$? = $ac_status" >&5
+  echo "$as_me:21546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21537,7 +21556,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21540 "configure"
+#line 21559 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21548,15 +21567,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21554: \$? = $ac_status" >&5
+  echo "$as_me:21573: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21559: \$? = $ac_status" >&5
+  echo "$as_me:21578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21571,7 +21590,7 @@ fi
 
 fi
 
-echo "$as_me:21574: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21593: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21585,14 +21604,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21588: checking for clock_gettime" >&5
+echo "$as_me:21607: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21595 "configure"
+#line 21614 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21605,16 +21624,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21611: \$? = $ac_status" >&5
+  echo "$as_me:21630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21617: \$? = $ac_status" >&5
+  echo "$as_me:21636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21625,7 +21644,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21628: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21647: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21636,13 +21655,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21639: checking for gettimeofday" >&5
+echo "$as_me:21658: 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 21645 "configure"
+#line 21664 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21673,16 +21692,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21679: \$? = $ac_status" >&5
+  echo "$as_me:21698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21685: \$? = $ac_status" >&5
+  echo "$as_me:21704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21692,7 +21711,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21695: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21714: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21702,7 +21721,7 @@ EOF
 
 else
 
-echo "$as_me:21705: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21724: 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
@@ -21710,7 +21729,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21713 "configure"
+#line 21732 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21719,7 +21738,7 @@ 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 gettimeofday ();
+char gettimeofday (void);
 int
 main (void)
 {
@@ -21729,16 +21748,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21735: \$? = $ac_status" >&5
+  echo "$as_me:21754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21741: \$? = $ac_status" >&5
+  echo "$as_me:21760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21749,7 +21768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21752: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21771: 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
 
@@ -21810,13 +21829,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21813: checking for $ac_func" >&5
+echo "$as_me:21832: 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 21819 "configure"
+#line 21838 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21847,16 +21866,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21853: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21859: \$? = $ac_status" >&5
+  echo "$as_me:21878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21866,7 +21885,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21869: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21876,14 +21895,14 @@ EOF
 fi
 done
 
-echo "$as_me:21879: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21898: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21886 "configure"
+#line 21905 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21898,16 +21917,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21904: \$? = $ac_status" >&5
+  echo "$as_me:21923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21910: \$? = $ac_status" >&5
+  echo "$as_me:21929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21917,7 +21936,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21920: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21939: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21939,7 +21958,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21942: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21961: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21949,7 +21968,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21952 "configure"
+#line 21971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21962,15 +21981,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21968: \$? = $ac_status" >&5
+  echo "$as_me:21987: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21973: \$? = $ac_status" >&5
+  echo "$as_me:21992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21982,7 +22001,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:21985: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22004: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -21994,14 +22013,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:21997: checking for getttynam" >&5
+	echo "$as_me:22016: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22004 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22013,16 +22032,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22019: \$? = $ac_status" >&5
+  echo "$as_me:22038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22025: \$? = $ac_status" >&5
+  echo "$as_me:22044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22032,7 +22051,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22035: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22054: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22042,7 +22061,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22045: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22064: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22051,7 +22070,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22054: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22073: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22064,14 +22083,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22067: checking for terminal-capability database functions" >&5
+echo "$as_me:22086: 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 22074 "configure"
+#line 22093 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22091,16 +22110,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22097: \$? = $ac_status" >&5
+  echo "$as_me:22116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22103: \$? = $ac_status" >&5
+  echo "$as_me:22122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22111,7 +22130,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22114: result: $cf_cv_cgetent" >&5
+echo "$as_me:22133: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22121,14 +22140,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22124: checking if cgetent uses const parameter" >&5
+echo "$as_me:22143: 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 22131 "configure"
+#line 22150 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22151,16 +22170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22157: \$? = $ac_status" >&5
+  echo "$as_me:22176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22163: \$? = $ac_status" >&5
+  echo "$as_me:22182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22171,7 +22190,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22174: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22193: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22185,14 +22204,14 @@ fi
 
 fi
 
-echo "$as_me:22188: checking for isascii" >&5
+echo "$as_me:22207: 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 22195 "configure"
+#line 22214 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22204,16 +22223,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22216: \$? = $ac_status" >&5
+  echo "$as_me:22235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22224,7 +22243,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22227: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22246: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22232,10 +22251,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22235: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22254: 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 22238 "configure"
+#line 22257 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22249,16 +22268,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22255: \$? = $ac_status" >&5
+  echo "$as_me:22274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22261: \$? = $ac_status" >&5
+  echo "$as_me:22280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22266,7 +22285,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22269 "configure"
+#line 22288 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22281,16 +22300,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22287: \$? = $ac_status" >&5
+  echo "$as_me:22306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22293: \$? = $ac_status" >&5
+  echo "$as_me:22312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22306,11 +22325,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22309: result: $sigact_bad" >&5
+echo "$as_me:22328: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22313: checking if nanosleep really works" >&5
+echo "$as_me:22332: 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
@@ -22320,7 +22339,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22323 "configure"
+#line 22342 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22346,15 +22365,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22352: \$? = $ac_status" >&5
+  echo "$as_me:22371: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22357: \$? = $ac_status" >&5
+  echo "$as_me:22376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22366,7 +22385,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22369: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22388: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22383,23 +22402,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22386: checking for $ac_header" >&5
+echo "$as_me:22405: 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 22392 "configure"
+#line 22411 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22396: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22402: \$? = $ac_status" >&5
+  echo "$as_me:22421: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22418,7 +22437,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22435,10 +22454,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22438: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22457: 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 22441 "configure"
+#line 22460 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22450,16 +22469,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22456: \$? = $ac_status" >&5
+  echo "$as_me:22475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22462: \$? = $ac_status" >&5
+  echo "$as_me:22481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22467,7 +22486,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22470 "configure"
+#line 22489 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22481,16 +22500,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22487: \$? = $ac_status" >&5
+  echo "$as_me:22506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22493: \$? = $ac_status" >&5
+  echo "$as_me:22512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22506,19 +22525,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22509: result: $termios_bad" >&5
+	echo "$as_me:22528: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22514: checking for tcgetattr" >&5
+echo "$as_me:22533: 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 22521 "configure"
+#line 22540 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22546,16 +22565,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22552: \$? = $ac_status" >&5
+  echo "$as_me:22571: \$? = $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:22574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22558: \$? = $ac_status" >&5
+  echo "$as_me:22577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22565,21 +22584,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22568: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22587: 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:22575: checking for vsscanf function or workaround" >&5
+echo "$as_me:22594: 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 22582 "configure"
+#line 22601 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22605,16 +22624,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22611: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22617: \$? = $ac_status" >&5
+  echo "$as_me:22636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22622,7 +22641,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22625 "configure"
+#line 22644 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22644,16 +22663,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22650: \$? = $ac_status" >&5
+  echo "$as_me:22669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22656: \$? = $ac_status" >&5
+  echo "$as_me:22675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22661,7 +22680,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22664 "configure"
+#line 22683 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22683,16 +22702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22689: \$? = $ac_status" >&5
+  echo "$as_me:22708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22695: \$? = $ac_status" >&5
+  echo "$as_me:22714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22707,7 +22726,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22710: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22729: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22733,23 +22752,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22736: checking for $ac_header" >&5
+echo "$as_me:22755: 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 22742 "configure"
+#line 22761 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22746: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22752: \$? = $ac_status" >&5
+  echo "$as_me:22771: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22768,7 +22787,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22771: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22778,7 +22797,7 @@ EOF
 fi
 done
 
-echo "$as_me:22781: checking for working mkstemp" >&5
+echo "$as_me:22800: 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
@@ -22789,7 +22808,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22792 "configure"
+#line 22811 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22824,15 +22843,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22830: \$? = $ac_status" >&5
+  echo "$as_me:22849: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22835: \$? = $ac_status" >&5
+  echo "$as_me:22854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22847,16 +22866,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22850: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22869: 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:22853: checking for mkstemp" >&5
+	echo "$as_me:22872: 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 22859 "configure"
+#line 22878 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22887,16 +22906,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22893: \$? = $ac_status" >&5
+  echo "$as_me:22912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22899: \$? = $ac_status" >&5
+  echo "$as_me:22918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22906,7 +22925,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22909: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22928: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22927,21 +22946,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22930: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22949: 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:22933: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22952: 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:22939: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22958: 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 22944 "configure"
+#line 22963 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22958,15 +22977,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22983: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22969: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22979,7 +22998,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22982: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23001: 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
 
@@ -22990,13 +23009,13 @@ EOF
 fi
 
 fi
-echo "$as_me:22993: checking for intptr_t" >&5
+echo "$as_me:23012: 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 22999 "configure"
+#line 23018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23011,16 +23030,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23017: \$? = $ac_status" >&5
+  echo "$as_me:23036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23023: \$? = $ac_status" >&5
+  echo "$as_me:23042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23030,7 +23049,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23033: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23052: 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
   :
@@ -23042,13 +23061,13 @@ EOF
 
 fi
 
-echo "$as_me:23045: checking for ssize_t" >&5
+echo "$as_me:23064: 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 23051 "configure"
+#line 23070 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23063,16 +23082,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23069: \$? = $ac_status" >&5
+  echo "$as_me:23088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23075: \$? = $ac_status" >&5
+  echo "$as_me:23094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23082,7 +23101,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23085: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23104: 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
   :
@@ -23094,14 +23113,14 @@ EOF
 
 fi
 
-echo "$as_me:23097: checking for type sigaction_t" >&5
+echo "$as_me:23116: 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 23104 "configure"
+#line 23123 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23114,16 +23133,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23120: \$? = $ac_status" >&5
+  echo "$as_me:23139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23126: \$? = $ac_status" >&5
+  echo "$as_me:23145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23134,14 +23153,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23137: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23156: 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:23144: checking declaration of size-change" >&5
+echo "$as_me:23163: 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
@@ -23162,7 +23181,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23165 "configure"
+#line 23184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23212,16 +23231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23218: \$? = $ac_status" >&5
+  echo "$as_me:23237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23224: \$? = $ac_status" >&5
+  echo "$as_me:23243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23240,7 +23259,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23243: result: $cf_cv_sizechange" >&5
+echo "$as_me:23262: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23258,13 +23277,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23261: checking for memmove" >&5
+echo "$as_me:23280: 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 23267 "configure"
+#line 23286 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23295,16 +23314,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23301: \$? = $ac_status" >&5
+  echo "$as_me:23320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23307: \$? = $ac_status" >&5
+  echo "$as_me:23326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23314,19 +23333,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23317: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23336: 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:23323: checking for bcopy" >&5
+echo "$as_me:23342: 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 23329 "configure"
+#line 23348 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23357,16 +23376,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23363: \$? = $ac_status" >&5
+  echo "$as_me:23382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23369: \$? = $ac_status" >&5
+  echo "$as_me:23388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23376,11 +23395,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23379: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23398: 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:23383: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23402: 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
@@ -23390,7 +23409,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23393 "configure"
+#line 23412 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23406,15 +23425,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23412: \$? = $ac_status" >&5
+  echo "$as_me:23431: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23417: \$? = $ac_status" >&5
+  echo "$as_me:23436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23427,7 +23446,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23430: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23449: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23454,13 +23473,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23457: checking for $ac_func" >&5
+echo "$as_me:23476: 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 23463 "configure"
+#line 23482 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23491,16 +23510,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23497: \$? = $ac_status" >&5
+  echo "$as_me:23516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23503: \$? = $ac_status" >&5
+  echo "$as_me:23522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23510,7 +23529,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23513: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23532: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23520,7 +23539,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23523: checking if poll really works" >&5
+echo "$as_me:23542: 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
@@ -23530,7 +23549,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23533 "configure"
+#line 23552 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23583,15 +23602,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23589: \$? = $ac_status" >&5
+  echo "$as_me:23608: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23594: \$? = $ac_status" >&5
+  echo "$as_me:23613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23603,21 +23622,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23606: result: $cf_cv_working_poll" >&5
+echo "$as_me:23625: 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:23613: checking for va_copy" >&5
+echo "$as_me:23632: 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 23620 "configure"
+#line 23639 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23634,16 +23653,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23640: \$? = $ac_status" >&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23646: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23653,7 +23672,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23656: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23675: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23665,14 +23684,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23668: checking for __va_copy" >&5
+echo "$as_me:23687: 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 23675 "configure"
+#line 23694 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23689,16 +23708,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23695: \$? = $ac_status" >&5
+  echo "$as_me:23714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23701: \$? = $ac_status" >&5
+  echo "$as_me:23720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23708,7 +23727,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23711: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23730: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23720,14 +23739,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23723: checking for __builtin_va_copy" >&5
+echo "$as_me:23742: 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 23730 "configure"
+#line 23749 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23744,16 +23763,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23750: \$? = $ac_status" >&5
+  echo "$as_me:23769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23756: \$? = $ac_status" >&5
+  echo "$as_me:23775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23763,7 +23782,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23766: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23785: 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 &&
@@ -23781,14 +23800,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23784: checking if we can simply copy va_list" >&5
+	echo "$as_me:23803: 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 23791 "configure"
+#line 23810 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23805,16 +23824,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23811: \$? = $ac_status" >&5
+  echo "$as_me:23830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23817: \$? = $ac_status" >&5
+  echo "$as_me:23836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23824,19 +23843,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23827: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23846: 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:23832: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23851: 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 23839 "configure"
+#line 23858 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23853,16 +23872,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23859: \$? = $ac_status" >&5
+  echo "$as_me:23878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23865: \$? = $ac_status" >&5
+  echo "$as_me:23884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23872,7 +23891,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23875: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23894: 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
@@ -23883,13 +23902,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23886: checking for pid_t" >&5
+echo "$as_me:23905: 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 23892 "configure"
+#line 23911 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23904,16 +23923,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23910: \$? = $ac_status" >&5
+  echo "$as_me:23929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23916: \$? = $ac_status" >&5
+  echo "$as_me:23935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23923,7 +23942,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23926: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23945: 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
   :
@@ -23938,23 +23957,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23941: checking for $ac_header" >&5
+echo "$as_me:23960: 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 23947 "configure"
+#line 23966 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23957: \$? = $ac_status" >&5
+  echo "$as_me:23976: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23973,7 +23992,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23986,13 +24005,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23989: checking for $ac_func" >&5
+echo "$as_me:24008: 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 23995 "configure"
+#line 24014 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24023,16 +24042,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24029: \$? = $ac_status" >&5
+  echo "$as_me:24048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24035: \$? = $ac_status" >&5
+  echo "$as_me:24054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24042,7 +24061,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24045: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24064: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24054,7 +24073,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24057: checking for working fork" >&5
+  echo "$as_me:24076: 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
@@ -24077,15 +24096,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24083: \$? = $ac_status" >&5
+  echo "$as_me:24102: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24088: \$? = $ac_status" >&5
+  echo "$as_me:24107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24097,7 +24116,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24100: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24119: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24111,12 +24130,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24114: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24133: 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:24119: checking for working vfork" >&5
+  echo "$as_me:24138: 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
@@ -24125,7 +24144,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24128 "configure"
+#line 24147 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24218,15 +24237,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24224: \$? = $ac_status" >&5
+  echo "$as_me:24243: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24229: \$? = $ac_status" >&5
+  echo "$as_me:24248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24238,13 +24257,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24241: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24260: 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:24247: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24266: 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
 
@@ -24269,7 +24288,7 @@ EOF
 
 fi
 
-echo "$as_me:24272: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24291: 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
@@ -24279,7 +24298,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24282 "configure"
+#line 24301 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24314,15 +24333,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24320: \$? = $ac_status" >&5
+  echo "$as_me:24339: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24325: \$? = $ac_status" >&5
+  echo "$as_me:24344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24335,7 +24354,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24338: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24357: 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
@@ -24344,7 +24363,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24347: checking for openpty in -lutil" >&5
+echo "$as_me:24366: 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
@@ -24352,7 +24371,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24355 "configure"
+#line 24374 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24361,7 +24380,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char openpty ();
+char openpty (void);
 int
 main (void)
 {
@@ -24371,16 +24390,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24377: \$? = $ac_status" >&5
+  echo "$as_me:24396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24383: \$? = $ac_status" >&5
+  echo "$as_me:24402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24391,7 +24410,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24394: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24413: 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
@@ -24399,7 +24418,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24402: checking for openpty header" >&5
+echo "$as_me:24421: 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
@@ -24426,7 +24445,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24429 "configure"
+#line 24448 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24444,16 +24463,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24450: \$? = $ac_status" >&5
+  echo "$as_me:24469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24456: \$? = $ac_status" >&5
+  echo "$as_me:24475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24471,7 +24490,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24474: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24493: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24544,7 +24563,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24547 "configure"
+#line 24566 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24556,16 +24575,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24578: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24562: \$? = $ac_status" >&5
+  echo "$as_me:24581: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24568: \$? = $ac_status" >&5
+  echo "$as_me:24587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24582,7 +24601,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24585: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24604: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24618,7 +24637,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24621: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24640: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24629,7 +24648,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24632: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24651: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24701,7 +24720,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24704 "configure"
+#line 24723 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24713,16 +24732,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24719: \$? = $ac_status" >&5
+  echo "$as_me:24738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24725: \$? = $ac_status" >&5
+  echo "$as_me:24744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24739,7 +24758,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24742: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24761: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24819,7 +24838,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24822: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24841: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24836,23 +24855,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24839: checking for db.h" >&5
+echo "$as_me:24858: 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 24845 "configure"
+#line 24864 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24849: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24868: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24855: \$? = $ac_status" >&5
+  echo "$as_me:24874: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24871,11 +24890,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24874: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24893: 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:24878: checking for version of db" >&5
+echo "$as_me:24897: 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
@@ -24886,10 +24905,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24889: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24908: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24892 "configure"
+#line 24911 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24919,16 +24938,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24925: \$? = $ac_status" >&5
+  echo "$as_me:24944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24931: \$? = $ac_status" >&5
+  echo "$as_me:24950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24942,16 +24961,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24945: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24964: 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:24949: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:24968: 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:24954: checking for db libraries" >&5
+echo "$as_me:24973: 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
@@ -24981,10 +25000,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:24984: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25003: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24987 "configure"
+#line 25006 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25039,16 +25058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25045: \$? = $ac_status" >&5
+  echo "$as_me:25064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25051: \$? = $ac_status" >&5
+  echo "$as_me:25070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25068,11 +25087,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25071: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25090: 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:25075: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25094: 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
@@ -25098,7 +25117,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25101: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25120: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25113,7 +25132,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25116: checking if we should include stdbool.h" >&5
+echo "$as_me:25135: 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
@@ -25121,7 +25140,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25124 "configure"
+#line 25143 "configure"
 #include "confdefs.h"
 
 int
@@ -25133,23 +25152,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25139: \$? = $ac_status" >&5
+  echo "$as_me:25158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25145: \$? = $ac_status" >&5
+  echo "$as_me:25164: \$? = $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 25152 "configure"
+#line 25171 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25165,16 +25184,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25171: \$? = $ac_status" >&5
+  echo "$as_me:25190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25177: \$? = $ac_status" >&5
+  echo "$as_me:25196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25188,13 +25207,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25191: result: yes" >&5
+then	echo "$as_me:25210: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25193: result: no" >&5
+else	echo "$as_me:25212: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25197: checking for builtin bool type" >&5
+echo "$as_me:25216: 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
@@ -25202,7 +25221,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25205 "configure"
+#line 25224 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25217,16 +25236,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25223: \$? = $ac_status" >&5
+  echo "$as_me:25242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25229: \$? = $ac_status" >&5
+  echo "$as_me:25248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25239,9 +25258,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25242: result: yes" >&5
+then	echo "$as_me:25261: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25244: result: no" >&5
+else	echo "$as_me:25263: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25258,10 +25277,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25261: checking if we already have C++ library" >&5
+	echo "$as_me:25280: 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 25264 "configure"
+#line 25283 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25275,16 +25294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25281: \$? = $ac_status" >&5
+  echo "$as_me:25300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25287: \$? = $ac_status" >&5
+  echo "$as_me:25306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25293,7 +25312,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25296: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25315: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25312,7 +25331,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25315: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25334: 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
@@ -25338,7 +25357,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25341 "configure"
+#line 25360 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25352,16 +25371,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25358: \$? = $ac_status" >&5
+  echo "$as_me:25377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25364: \$? = $ac_status" >&5
+  echo "$as_me:25383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25373,7 +25392,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25376: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25395: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25395,7 +25414,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25398: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25417: 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
@@ -25410,15 +25429,15 @@ CF_EOF
 # 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:25413: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25416: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25418: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25421: \$? = $ac_status" >&5
+  echo "$as_me:25440: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25429,10 +25448,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25432: result: yes" >&5
+  echo "$as_me:25451: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25435: result: no" >&5
+  echo "$as_me:25454: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25452,7 +25471,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25455: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25474: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25473,7 +25492,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25476 "configure"
+#line 25495 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25487,16 +25506,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25493: \$? = $ac_status" >&5
+  echo "$as_me:25512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25499: \$? = $ac_status" >&5
+  echo "$as_me:25518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25533,7 +25552,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25536 "configure"
+#line 25555 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25547,16 +25566,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25553: \$? = $ac_status" >&5
+  echo "$as_me:25572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25559: \$? = $ac_status" >&5
+  echo "$as_me:25578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25589,7 +25608,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25592: result: $cf_cxx_library" >&5
+	echo "$as_me:25611: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25605,7 +25624,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25608: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25627: 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
@@ -25622,18 +25641,18 @@ do
   # 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 25625 "configure"
+#line 25644 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25630: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25649: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25636: \$? = $ac_status" >&5
+  echo "$as_me:25655: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25656,17 +25675,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25659 "configure"
+#line 25678 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25663: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25682: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25669: \$? = $ac_status" >&5
+  echo "$as_me:25688: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25703,7 +25722,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25706: result: $CXXCPP" >&5
+echo "$as_me:25725: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25713,18 +25732,18 @@ do
   # 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 25716 "configure"
+#line 25735 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25721: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25727: \$? = $ac_status" >&5
+  echo "$as_me:25746: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25747,17 +25766,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25750 "configure"
+#line 25769 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25754: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25760: \$? = $ac_status" >&5
+  echo "$as_me:25779: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25785,7 +25804,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25788: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25807: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25800,23 +25819,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25803: checking for $ac_header" >&5
+echo "$as_me:25822: 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 25809 "configure"
+#line 25828 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25813: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25832: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25819: \$? = $ac_status" >&5
+  echo "$as_me:25838: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25835,7 +25854,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25838: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25848,23 +25867,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25851: checking for $ac_header" >&5
+echo "$as_me:25870: 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 25857 "configure"
+#line 25876 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25861: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25880: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25867: \$? = $ac_status" >&5
+  echo "$as_me:25886: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25883,7 +25902,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25886: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25894,10 +25913,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25897: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25916: 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 25900 "configure"
+#line 25919 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25914,16 +25933,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25920: \$? = $ac_status" >&5
+  echo "$as_me:25939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25926: \$? = $ac_status" >&5
+  echo "$as_me:25945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25932,7 +25951,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25935: result: $cf_iostream_namespace" >&5
+	echo "$as_me:25954: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25943,7 +25962,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25946: checking if we should include stdbool.h" >&5
+echo "$as_me:25965: 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
@@ -25951,7 +25970,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25954 "configure"
+#line 25973 "configure"
 #include "confdefs.h"
 
 int
@@ -25963,23 +25982,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25969: \$? = $ac_status" >&5
+  echo "$as_me:25988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25975: \$? = $ac_status" >&5
+  echo "$as_me:25994: \$? = $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 25982 "configure"
+#line 26001 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25995,16 +26014,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26001: \$? = $ac_status" >&5
+  echo "$as_me:26020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26007: \$? = $ac_status" >&5
+  echo "$as_me:26026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26018,13 +26037,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26021: result: yes" >&5
+then	echo "$as_me:26040: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26023: result: no" >&5
+else	echo "$as_me:26042: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26027: checking for builtin bool type" >&5
+echo "$as_me:26046: 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
@@ -26032,7 +26051,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26035 "configure"
+#line 26054 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26047,16 +26066,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26053: \$? = $ac_status" >&5
+  echo "$as_me:26072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26059: \$? = $ac_status" >&5
+  echo "$as_me:26078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26069,19 +26088,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26072: result: yes" >&5
+then	echo "$as_me:26091: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26074: result: no" >&5
+else	echo "$as_me:26093: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26078: checking for bool" >&5
+echo "$as_me:26097: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26084 "configure"
+#line 26103 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26116,16 +26135,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26122: \$? = $ac_status" >&5
+  echo "$as_me:26141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26128: \$? = $ac_status" >&5
+  echo "$as_me:26147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26135,10 +26154,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26138: result: $ac_cv_type_bool" >&5
+echo "$as_me:26157: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26141: checking size of bool" >&5
+echo "$as_me:26160: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26147,7 +26166,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26150 "configure"
+#line 26169 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26179,21 +26198,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26185: \$? = $ac_status" >&5
+  echo "$as_me:26204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26191: \$? = $ac_status" >&5
+  echo "$as_me:26210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26196 "configure"
+#line 26215 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26225,16 +26244,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26228: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26231: \$? = $ac_status" >&5
+  echo "$as_me:26250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26237: \$? = $ac_status" >&5
+  echo "$as_me:26256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26250,7 +26269,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26253 "configure"
+#line 26272 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26282,16 +26301,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26288: \$? = $ac_status" >&5
+  echo "$as_me:26307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26294: \$? = $ac_status" >&5
+  echo "$as_me:26313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26307,7 +26326,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26310 "configure"
+#line 26329 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26339,16 +26358,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26345: \$? = $ac_status" >&5
+  echo "$as_me:26364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26351: \$? = $ac_status" >&5
+  echo "$as_me:26370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26361,12 +26380,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26364: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26383: 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 26369 "configure"
+#line 26388 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26402,15 +26421,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26408: \$? = $ac_status" >&5
+  echo "$as_me:26427: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26413: \$? = $ac_status" >&5
+  echo "$as_me:26432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26426,13 +26445,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26429: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26448: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26435: checking for type of bool" >&5
+echo "$as_me:26454: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26451,7 +26470,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26454 "configure"
+#line 26473 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26492,15 +26511,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26498: \$? = $ac_status" >&5
+  echo "$as_me:26517: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26503: \$? = $ac_status" >&5
+  echo "$as_me:26522: \$? = $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
@@ -26517,19 +26536,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26520: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26539: 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:26527: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26546: 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:26532: checking for special defines needed for etip.h" >&5
+echo "$as_me:26551: 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"
@@ -26547,7 +26566,7 @@ do
 	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 26550 "configure"
+#line 26569 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26561,16 +26580,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26567: \$? = $ac_status" >&5
+  echo "$as_me:26586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26573: \$? = $ac_status" >&5
+  echo "$as_me:26592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26591,12 +26610,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26594: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26613: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26599: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26618: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26613,7 +26632,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26616 "configure"
+#line 26635 "configure"
 #include "confdefs.h"
 
 class base
@@ -26632,15 +26651,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26638: \$? = $ac_status" >&5
+  echo "$as_me:26657: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26643: \$? = $ac_status" >&5
+  echo "$as_me:26662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26659,7 +26678,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26662: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26681: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26668,7 +26687,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26671: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26690: 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
@@ -26685,7 +26704,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26688 "configure"
+#line 26707 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26704,15 +26723,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26710: \$? = $ac_status" >&5
+  echo "$as_me:26729: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26715: \$? = $ac_status" >&5
+  echo "$as_me:26734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26731,7 +26750,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26734: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26753: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26741,7 +26760,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26744: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26763: 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
@@ -26755,7 +26774,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26758 "configure"
+#line 26777 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26799,16 +26818,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26805: \$? = $ac_status" >&5
+  echo "$as_me:26824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26811: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26826,7 +26845,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26829: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26848: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26875,13 +26894,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26878: checking for bool" >&5
+echo "$as_me:26897: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26884 "configure"
+#line 26903 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26916,16 +26935,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26922: \$? = $ac_status" >&5
+  echo "$as_me:26941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26928: \$? = $ac_status" >&5
+  echo "$as_me:26947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26935,10 +26954,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26938: result: $ac_cv_type_bool" >&5
+echo "$as_me:26957: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26941: checking size of bool" >&5
+echo "$as_me:26960: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26947,7 +26966,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26950 "configure"
+#line 26969 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26979,21 +26998,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26982: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26985: \$? = $ac_status" >&5
+  echo "$as_me:27004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26991: \$? = $ac_status" >&5
+  echo "$as_me:27010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26996 "configure"
+#line 27015 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27025,16 +27044,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27031: \$? = $ac_status" >&5
+  echo "$as_me:27050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27037: \$? = $ac_status" >&5
+  echo "$as_me:27056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27050,7 +27069,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27053 "configure"
+#line 27072 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27082,16 +27101,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27088: \$? = $ac_status" >&5
+  echo "$as_me:27107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27094: \$? = $ac_status" >&5
+  echo "$as_me:27113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27107,7 +27126,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27110 "configure"
+#line 27129 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27139,16 +27158,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27145: \$? = $ac_status" >&5
+  echo "$as_me:27164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27151: \$? = $ac_status" >&5
+  echo "$as_me:27170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27161,12 +27180,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27164: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27183: 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 27169 "configure"
+#line 27188 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27202,15 +27221,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27208: \$? = $ac_status" >&5
+  echo "$as_me:27227: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27213: \$? = $ac_status" >&5
+  echo "$as_me:27232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27226,13 +27245,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27229: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27248: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27235: checking for type of bool" >&5
+echo "$as_me:27254: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27251,7 +27270,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27254 "configure"
+#line 27273 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27292,15 +27311,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27298: \$? = $ac_status" >&5
+  echo "$as_me:27317: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27303: \$? = $ac_status" >&5
+  echo "$as_me:27322: \$? = $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
@@ -27317,26 +27336,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27320: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27339: 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:27327: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27346: 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:27333: checking for fallback type of bool" >&5
+			echo "$as_me:27352: 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:27339: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27358: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27365,7 +27384,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27368: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27387: 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
@@ -27382,7 +27401,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27385: checking for $ac_word" >&5
+echo "$as_me:27404: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27399,7 +27418,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27421: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27411,10 +27430,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27414: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27433: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27417: result: no" >&5
+  echo "$as_me:27436: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27424,7 +27443,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27427: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27446: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27435,7 +27454,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27438: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27457: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27464,7 +27483,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27467: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27486: 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
@@ -27483,10 +27502,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27486: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27505: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27489: result: missing" >&5
+					echo "$as_me:27508: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27499,7 +27518,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27502: checking for gnat version" >&5
+echo "$as_me:27521: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27510,7 +27529,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27513: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27532: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27519,7 +27538,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27541: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27527,7 +27546,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27530: checking for $ac_word" >&5
+echo "$as_me:27549: 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
@@ -27542,7 +27561,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27545: found $ac_dir/$ac_word" >&5
+echo "$as_me:27564: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27551,20 +27570,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27554: result: $M4_exists" >&5
+  echo "$as_me:27573: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27557: result: no" >&5
+  echo "$as_me:27576: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27582: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27567: checking if GNAT works" >&5
+			echo "$as_me:27586: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27592,7 +27611,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27595: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27614: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27604,7 +27623,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27607: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27626: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27621,10 +27640,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27624: result: $ADAFLAGS" >&5
+	echo "$as_me:27643: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27627: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27646: 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
@@ -27634,11 +27653,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27637: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27656: 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:27641: checking if GNAT supports generics" >&5
+echo "$as_me:27660: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27648,7 +27667,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27651: result: $cf_gnat_generics" >&5
+echo "$as_me:27670: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27660,7 +27679,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27663: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27682: 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
@@ -27708,7 +27727,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27711: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27730: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27721,7 +27740,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27724: checking if GNAT supports project files" >&5
+echo "$as_me:27743: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27784,15 +27803,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27787: result: $cf_gnat_projects" >&5
+echo "$as_me:27806: 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:27793: checking if GNAT supports libraries" >&5
+	echo "$as_me:27812: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27795: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27814: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27812,7 +27831,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27815: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27834: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27824,7 +27843,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27827: checking for Ada95 compiler" >&5
+echo "$as_me:27846: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27835,12 +27854,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27838: result: $cf_ada_compiler" >&5
+echo "$as_me:27857: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27843: checking for Ada95 include directory" >&5
+echo "$as_me:27862: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27876,7 +27895,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27879: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27898: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27885,10 +27904,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27888: result: $ADA_INCLUDE" >&5
+echo "$as_me:27907: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27891: checking for Ada95 object directory" >&5
+echo "$as_me:27910: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -27924,7 +27943,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27927: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27946: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27933,10 +27952,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27936: result: $ADA_OBJECTS" >&5
+echo "$as_me:27955: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27939: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:27958: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -27957,11 +27976,11 @@ then
 	fi
 fi
 
-echo "$as_me:27960: result: $with_ada_sharedlib" >&5
+echo "$as_me:27979: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:27964: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:27983: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -27979,7 +27998,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:27982: checking for Ada95 curses library name" >&5
+echo "$as_me:28001: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -27995,7 +28014,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:27998: result: $ADA_LIBNAME" >&5
+echo "$as_me:28017: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28006,13 +28025,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28009: checking for wchar_t" >&5
+	echo "$as_me:28028: 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 28015 "configure"
+#line 28034 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28027,16 +28046,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28033: \$? = $ac_status" >&5
+  echo "$as_me:28052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28039: \$? = $ac_status" >&5
+  echo "$as_me:28058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28046,10 +28065,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28049: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28068: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28052: checking size of wchar_t" >&5
+echo "$as_me:28071: 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
@@ -28058,7 +28077,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28061 "configure"
+#line 28080 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28070,21 +28089,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28076: \$? = $ac_status" >&5
+  echo "$as_me:28095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28082: \$? = $ac_status" >&5
+  echo "$as_me:28101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28087 "configure"
+#line 28106 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28096,16 +28115,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28102: \$? = $ac_status" >&5
+  echo "$as_me:28121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28108: \$? = $ac_status" >&5
+  echo "$as_me:28127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28121,7 +28140,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28124 "configure"
+#line 28143 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28133,16 +28152,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28139: \$? = $ac_status" >&5
+  echo "$as_me:28158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28145: \$? = $ac_status" >&5
+  echo "$as_me:28164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28158,7 +28177,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28161 "configure"
+#line 28180 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28170,16 +28189,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28176: \$? = $ac_status" >&5
+  echo "$as_me:28195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28182: \$? = $ac_status" >&5
+  echo "$as_me:28201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28192,12 +28211,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28195: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28214: 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 28200 "configure"
+#line 28219 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28213,15 +28232,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28219: \$? = $ac_status" >&5
+  echo "$as_me:28238: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28224: \$? = $ac_status" >&5
+  echo "$as_me:28243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28237,7 +28256,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28240: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28259: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28250,7 +28269,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28253: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28272: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28268,7 +28287,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28271: checking for library subsets" >&5
+echo "$as_me:28290: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28322,7 +28341,7 @@ fi
 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:28325: result: $LIB_SUBSETS" >&5
+echo "$as_me:28344: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28353,7 +28372,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28356: checking default library suffix" >&5
+echo "$as_me:28375: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28364,10 +28383,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28367: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28386: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28370: checking default library-dependency suffix" >&5
+echo "$as_me:28389: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28450,10 +28469,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28453: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28472: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28456: checking default object directory" >&5
+echo "$as_me:28475: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28469,11 +28488,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28472: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28491: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28476: checking c++ library-dependency suffix" >&5
+echo "$as_me:28495: 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++)
@@ -28566,7 +28585,7 @@ else
 	fi
 
 fi
-echo "$as_me:28569: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28588: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28742,19 +28761,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28745: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28764: 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 <<EOF
-#line 28750 "configure"
+#line 28769 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28754: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28757: \$? = $ac_status" >&5
+  echo "$as_me:28776: \$? = $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
@@ -28765,10 +28784,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28768 "configure"
+#line 28787 "configure"
 #include "confdefs.h"
 
-#line 28771 "configure"
+#line 28790 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28783,16 +28802,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28789: \$? = $ac_status" >&5
+  echo "$as_me:28808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28795: \$? = $ac_status" >&5
+  echo "$as_me:28814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28815,7 +28834,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28818: result: $cf_ldflags_static" >&5
+	echo "$as_me:28837: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28831,7 +28850,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28834: checking where we will install curses.h" >&5
+echo "$as_me:28853: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28841,7 +28860,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28844: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28863: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28849,7 +28868,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28852: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28871: 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
@@ -28874,7 +28893,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28877: checking for desired basename for form library" >&5
+echo "$as_me:28896: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28894,10 +28913,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28897: result: $FORM_NAME" >&5
+echo "$as_me:28916: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28900: checking for desired basename for menu library" >&5
+echo "$as_me:28919: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28917,10 +28936,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28920: result: $MENU_NAME" >&5
+echo "$as_me:28939: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28923: checking for desired basename for panel library" >&5
+echo "$as_me:28942: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28940,10 +28959,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28943: result: $PANEL_NAME" >&5
+echo "$as_me:28962: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28946: checking for desired basename for cxx library" >&5
+echo "$as_me:28965: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28963,13 +28982,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28966: result: $CXX_NAME" >&5
+echo "$as_me:28985: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28972: checking for src modules" >&5
+echo "$as_me:28991: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29028,7 +29047,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29031: result: $cf_cv_src_modules" >&5
+echo "$as_me:29050: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29189,7 +29208,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29192: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29211: 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//'`
@@ -29200,7 +29219,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29203: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29222: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29216,7 +29235,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29219: result: $PKG_CFLAGS" >&5
+echo "$as_me:29238: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29277,7 +29296,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29280: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29299: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29304,7 +29323,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29307: checking for linker search path" >&5
+echo "$as_me:29326: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29352,7 +29371,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29355: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29374: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29393,7 +29412,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29396: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29415: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29410,7 +29429,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -29479,7 +29498,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29482: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29501: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29615,7 +29634,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230903,
+configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -29660,7 +29679,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29663: error: ambiguous option: $1
+    { { echo "$as_me:29682: 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;}
@@ -29679,7 +29698,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29682: error: unrecognized option: $1
+  -*) { { echo "$as_me:29701: 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;}
@@ -29698,7 +29717,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230903, executed with
+This file was extended by $as_me 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -29809,7 +29828,7 @@ do
   "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:29812: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29831: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30074,6 +30093,7 @@ s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t
 s,@NCURSES_CONST@,$NCURSES_CONST,;t t
 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
+s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t
 s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
 s,@PTHREAD@,$PTHREAD,;t t
 s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
@@ -30328,7 +30348,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30331: creating $ac_file" >&5
+    { echo "$as_me:30351: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30346,7 +30366,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30349: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30369: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30359,7 +30379,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30362: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30382: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30375,7 +30395,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30378: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30398: 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;}
@@ -30384,7 +30404,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30387: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30407: 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;}
@@ -30429,7 +30449,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30432: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30452: 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;}
@@ -30440,7 +30460,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30443: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30463: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30489,7 +30509,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30492: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30512: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30500,7 +30520,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30503: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30523: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30513,7 +30533,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30516: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30536: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30571,7 +30591,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30574: $ac_file is unchanged" >&5
+      { echo "$as_me:30594: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30958,7 +30978,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30961: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30981: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 565c909cc..023df69dc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.773 2023/12/03 11:07:25 tom Exp $
+dnl $Id: configure.in,v 1.774 2024/01/19 11:22:46 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.773 $)
+AC_REVISION($Revision: 1.774 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1288,7 +1288,14 @@ AC_ARG_ENABLE(sigwinch,
 	[with_sigwinch=$enableval],
 	[with_sigwinch=$with_ext_funcs])
 AC_MSG_RESULT($with_sigwinch)
-test "x$with_sigwinch" = xyes && AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler])
+if test "x$with_sigwinch" = xyes
+then
+	AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler])
+	cf_cv_enable_sigwinch=1
+else
+	cf_cv_enable_sigwinch=0
+fi
+AC_SUBST(cf_cv_enable_sigwinch)
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
 AC_MSG_CHECKING(if you want user-definable terminal capabilities like termcap)
diff --git a/dist.mk b/dist.mk
index cd175e624..000fb9bfc 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1593 2024/01/13 21:07:51 tom Exp $
+# $Id: dist.mk,v 1.1594 2024/01/20 11:52:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240113
+NCURSES_PATCH = 20240120
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/ada/terminal_interface-curses__ads.htm b/doc/html/ada/terminal_interface-curses__ads.htm
index c39b2f41d..c506fdd5d 100644
--- a/doc/html/ada/terminal_interface-curses__ads.htm
+++ b/doc/html/ada/terminal_interface-curses__ads.htm
@@ -24,7 +24,7 @@
 <span class="comment"><em>--                                 S P E C                                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
-<span class="comment"><em>-- Copyright 2020 Thomas E. Dickey                                          --</em></span>
+<span class="comment"><em>-- Copyright 2020,2024 Thomas E. Dickey                                     --</em></span>
 <span class="comment"><em>-- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>-- Permission is hereby granted, free of charge, to any person obtaining a  --</em></span>
@@ -53,8 +53,8 @@
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <span class="comment"><em>--  Author:  Juergen Pfeifer, 1996</em></span>
 <span class="comment"><em>--  Version Control:</em></span>
-<span class="comment"><em>--  @Revision: 1.48 @</em></span>
-<span class="comment"><em>--  @Date: 2020/02/02 23:34:34 @</em></span>
+<span class="comment"><em>--  @Revision: 1.49 @</em></span>
+<span class="comment"><em>--  @Date: 2024/01/19 16:51:30 @</em></span>
 <span class="comment"><em>--  Binding Version 01.00</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <b>with</b> System.Storage_Elements;
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 4620cd720..bf7a2d76b 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.34 2024/01/05 21:46:58 tom Exp @
+  * @Id: form_hook.3x,v 1.35 2024/01/20 18:12:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2024-01-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2024-01-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">form_hook 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        change once it is posted.
 
 
-</PRE><H3><a name="h3-form_init">form_init</a></H3><PRE>
+</PRE><H3><a name="h3-form_term">form_term</a></H3><PRE>
        returns the current form term hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
        hook).
 
@@ -137,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2024-01-20                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -152,7 +152,7 @@ <H1 class="no-header">form_hook 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-set_form_init">set_form_init</a></li>
 <li><a href="#h3-form_init">form_init</a></li>
 <li><a href="#h3-set_form_term">set_form_term</a></li>
-<li><a href="#h3-form_init">form_init</a></li>
+<li><a href="#h3-form_term">form_term</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 1192282dd..1e14fdc9f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240113).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240120).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index c279313bb..1735f9317 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp @
+  * @Id: tabs.1,v 1.54 2024/01/20 16:54:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2024-01-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2024-01-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -164,30 +164,29 @@ <H1 class="no-header">tabs 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       A  few  terminals  provide the capability for changing their left/right
-       margins.  The tabs program has an option to use this feature:
+       A  few  terminals  expose  a  means  of  changing  their left and right
+       margins.  <STRONG>tabs</STRONG> supports this feature with an option.
 
        <STRONG>+m</STRONG> <EM>margin</EM>
             The  effect  depends  on  whether  the  terminal  has  the  margin
             capabilities:
 
             <STRONG>o</STRONG>   If  the  terminal provides the capability for setting the left
-                margin, tabs uses this, and adjusts the  available  width  for
-                tab-stops.
+                margin, <STRONG>tabs</STRONG> uses this, and adjusts  the  available  tab  stop
+                widths.
 
-            <STRONG>o</STRONG>   If the terminal does not provide the margin capabilities, tabs
-                imitates the effect, putting the tab stops at the  appropriate
-                place  on  each  line.   The  terminal's  left-margin  is  not
-                modified.
+            <STRONG>o</STRONG>   If the terminal does not provide the margin capabilities, <STRONG>tabs</STRONG>
+                imitates their effect, putting tab stops at appropriate places
+                on each line.  The terminal's left margin is not modified.
 
             If the <EM>margin</EM> parameter is omitted, the default is 10.  Use <STRONG>+m0</STRONG> to
-            reset  the  left  margin, i.e., to the left edge of the terminal's
-            display.  Before setting a left-margin, tabs resets the margin  to
-            reduce  problems which might arise on moving the cursor before the
-            current left-margin.
+            reset the left margin, that is, to make it the left  edge  of  the
+            terminal's display.  Before setting a left margin, <STRONG>tabs</STRONG> resets the
+            margin to reduce problems that might arise from moving the  cursor
+            to the left of the current left margin.
 
-       When setting or resetting the left-margin, tabs may  reset  the  right-
-       margin.
+       When  setting  or  resetting  the  left margin, <STRONG>tabs</STRONG> may also reset the
+       right margin.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -196,63 +195,63 @@ <H1 class="no-header">tabs 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       <EM>IEEE</EM>   <EM>Std</EM>   <EM>1003.1/The</EM>   <EM>Open</EM>   <EM>Group</EM>   <EM>Base</EM>  <EM>Specifications</EM>  <EM>Issue</EM>  <EM>7</EM>
-       (POSIX.1-2008) describes a <STRONG>tabs</STRONG> utility.  However
+       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+       (POSIX.1-2008) describes a <STRONG>tabs</STRONG> utility.  However,
 
-       <STRONG>o</STRONG>   This standard describes a <STRONG>+m</STRONG> option,  to  set  a  terminal's  left-
-           margin.   Very  few of the entries in the terminal database provide
-           the  <STRONG>smgl</STRONG>   (<STRONG>set_left_margin</STRONG>)   or   <STRONG>smglp</STRONG>   (<STRONG>set_left_margin_parm</STRONG>)
-           capability needed to support the feature.
+       <STRONG>o</STRONG>   this  standard  describes  a  <STRONG>+m</STRONG>  option  to  set a terminal's left
+           margin.  Very few of the entries in the terminal  database  provide
+           the   <STRONG>set_left_margin</STRONG>   (<STRONG>smgl</STRONG>)   or   <STRONG>set_left_margin_parm</STRONG>  (<STRONG>smglp</STRONG>)
+           capabilities needed to support the feature.
 
-       <STRONG>o</STRONG>   There  is no counterpart in X/Open Curses Issue 7 for this utility,
+       <STRONG>o</STRONG>   There is no counterpart in X/Open Curses Issue 7 for this  utility,
            unlike <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>.
 
-       The <STRONG>-d</STRONG> (debug) and <STRONG>-n</STRONG> (no-op) options are extensions  not  provided  by
-       other implementations.
+       The  <STRONG>-d</STRONG>  (debug)  and  <STRONG>-n</STRONG>  (no-op)  options  are <EM>ncurses</EM> extensions not
+       provided by other implementations.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A  <STRONG>tabs</STRONG>  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
-       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
+       A <STRONG>tabs</STRONG> utility appeared in PWB/Unix  1.0  (1977).   A  reduced  version
+       shipped  in  Seventh  Edition  Unix (early 1979) and in 3BSD (later the
        same year); it supported a "-n" option to set the first tab stop at the
        left margin.  That option is not documented by POSIX.
 
-       The PWB/Unix <STRONG>tabs</STRONG> utility returned  in  System  III  (1980),  and  used
-       built-in  tables  rather than the terminal database, to support a half-
+       The  PWB/Unix  <STRONG>tabs</STRONG>  utility  returned  in  System III (1980), and used
+       built-in tables, rather than the terminal database, to support a  half-
        dozen hardcopy terminal (printer) types.  It also had built-in logic to
-       support  setting  the left margin, as well as a feature for copying the
+       support setting the left margin, as well as a feature for  copying  the
        tab settings from a file.
 
-       Versions of the program in later releases of AT&amp;T Unix, such  as  SVr4,
-       added  support  for  the  terminal database, but retained the tables to
-       support the printers.  In an earlier development effort, the  tab  stop
-       initialization  provided  by  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  (1982),  and  incorporated  into
-       <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> uses the terminal database,
-
-       The <STRONG>+m</STRONG> option was documented in the POSIX Base Specifications  Issue  5
-       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
-       motivation, though an introductory comment <EM>"and</EM> <EM>optionally</EM> <EM>adjusts</EM>  <EM>the</EM>
-       <EM>margin"</EM>   remains,   overlooked  in  the  removal.   The  <STRONG>tabs</STRONG>  utility
-       documented in Issues 6 and later has no mechanism for setting  margins.
-       The  <STRONG>+m</STRONG>  option  in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4 feature by using
+       Versions  of  the program in later releases of AT&amp;T Unix, such as SVr4,
+       added support for the terminal database, but  retained  the  tables  to
+       support the printers.  By this time, System V <STRONG>tput</STRONG> had incorporated the
+       tab stop initialization feature of BSD's <STRONG>tset</STRONG> from 1982,  but  employed
+       the <EM>terminfo</EM> database to do so.
+
+       The  <STRONG>+m</STRONG>  option was documented in the POSIX Base Specifications Issue 5
+       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
+       motivation,  though an introductory comment "and optionally adjusts the
+       margin"  remains,  overlooked  in  the  removal.   The   <STRONG>tabs</STRONG>   utility
+       documented  in Issues 6 and later has no mechanism for setting margins.
+       The <STRONG>+m</STRONG> option in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4  feature  by  using
        terminal capabilities rather than built-in tables.
 
-       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
+       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
        implementations impose one; the limit is 20 in PWB/Unix's <STRONG>tabs</STRONG> utility.
-       While some terminals may not accept an arbitrary number of  tab  stops,
-       <EM>ncurses</EM>  <STRONG>tabs</STRONG>  attempts  to set tab stops up to the right margin if the
+       While  some  terminals may not accept an arbitrary number of tab stops,
+       <EM>ncurses</EM> <STRONG>tabs</STRONG> attempts to set tab stops up to the right  margin  if  the
        list thereof is sufficiently long.
 
-       The "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details  how
-       the  committee  considered  redesigning  the  <STRONG>tabs</STRONG>  and <STRONG>tput</STRONG> utilities,
+       The  "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details how
+       the committee considered  redesigning  the  <STRONG>tabs</STRONG>  and  <STRONG>tput</STRONG>  utilities,
        without settling on an improved solution.  It claims that
 
-            no known historical version of tabs  supports  the  capability  of
-            setting arbitrary tab stops.
+           "no  known  historical  version  of <EM>tabs</EM> supports the capability of
+           setting arbitrary tab stops."
 
-       Nevertheless,  the  feature  described  in  subsection "Explicit Lists"
-       above was implemented in PWB/Unix, and permits the setting of  abitrary
-       tab stops.
+       The  feature  described  in  subsection  "Explicit  Lists"  above   was
+       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
+       stops nevertheless.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -260,7 +259,7 @@ <H1 class="no-header">tabs 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2024-01-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 5c8bc28be..f12c3e601 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240113).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240120).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -247,661 +247,656 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
        (#<EM>i</EM>)   indicates the <EM>i</EM>th parameter.
 
-                                     <STRONG>Code</STRONG>
-       <STRONG>Boolean</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>      <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+                                      <STRONG>Code</STRONG>
+       <STRONG>Boolean</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
 
-       <STRONG>auto_left_margin</STRONG>           <STRONG>bw</STRONG>      <STRONG>bw</STRONG>   cub1 wraps from column 0 to
-                                               last column
-       <STRONG>auto_right_margin</STRONG>          <STRONG>am</STRONG>      <STRONG>am</STRONG>   terminal has automatic margins
-       <STRONG>no_esc_ctlc</STRONG>                <STRONG>xsb</STRONG>     <STRONG>xb</STRONG>   beehive (f1=escape, f2=ctrl C)
-       <STRONG>ceol_standout_glitch</STRONG>       <STRONG>xhp</STRONG>     <STRONG>xs</STRONG>   standout not erased by
-                                               overwriting (hp)
-       <STRONG>eat_newline_glitch</STRONG>         <STRONG>xenl</STRONG>    <STRONG>xn</STRONG>   newline ignored after 80 cols
-                                               (concept)
-       <STRONG>erase_overstrike</STRONG>           <STRONG>eo</STRONG>      <STRONG>eo</STRONG>   can erase overstrikes with a
-                                               blank
-       <STRONG>generic_type</STRONG>               <STRONG>gn</STRONG>      <STRONG>gn</STRONG>   generic line type
-       <STRONG>hard_copy</STRONG>                  <STRONG>hc</STRONG>      <STRONG>hc</STRONG>   hardcopy terminal
-       <STRONG>has_meta_key</STRONG>               <STRONG>km</STRONG>      <STRONG>km</STRONG>   Has a meta key (i.e., sets 8th-
-                                               bit)
-       <STRONG>has_status_line</STRONG>            <STRONG>hs</STRONG>      <STRONG>hs</STRONG>   has extra status line
-       <STRONG>insert_null_glitch</STRONG>         <STRONG>in</STRONG>      <STRONG>in</STRONG>   insert mode distinguishes nulls
-       <STRONG>memory_above</STRONG>               <STRONG>da</STRONG>      <STRONG>da</STRONG>   display may be retained above
-                                               the screen
-       <STRONG>memory_below</STRONG>               <STRONG>db</STRONG>      <STRONG>db</STRONG>   display may be retained below
-                                               the screen
-       <STRONG>move_insert_mode</STRONG>           <STRONG>mir</STRONG>     <STRONG>mi</STRONG>   safe to move while in insert
-                                               mode
-       <STRONG>move_standout_mode</STRONG>         <STRONG>msgr</STRONG>    <STRONG>ms</STRONG>   safe to move while in standout
-                                               mode
-       <STRONG>over_strike</STRONG>                <STRONG>os</STRONG>      <STRONG>os</STRONG>   terminal can overstrike
-       <STRONG>status_line_esc_ok</STRONG>         <STRONG>eslok</STRONG>   <STRONG>es</STRONG>   escape can be used on the
-                                               status line
-       <STRONG>dest_tabs_magic_smso</STRONG>       <STRONG>xt</STRONG>      <STRONG>xt</STRONG>   tabs destructive, magic so char
-                                               (t1061)
-       <STRONG>tilde_glitch</STRONG>               <STRONG>hz</STRONG>      <STRONG>hz</STRONG>   cannot print ~'s (Hazeltine)
-       <STRONG>transparent_underline</STRONG>      <STRONG>ul</STRONG>      <STRONG>ul</STRONG>   underline character overstrikes
-       <STRONG>xon_xoff</STRONG>                   <STRONG>xon</STRONG>     <STRONG>xo</STRONG>   terminal uses xon/xoff
-                                               handshaking
-       <STRONG>needs_xon_xoff</STRONG>             <STRONG>nxon</STRONG>    <STRONG>nx</STRONG>   padding will not work, xon/xoff
-                                               required
-       <STRONG>prtr_silent</STRONG>                <STRONG>mc5i</STRONG>    <STRONG>5i</STRONG>   printer will not echo on screen
-       <STRONG>hard_cursor</STRONG>                <STRONG>chts</STRONG>    <STRONG>HC</STRONG>   cursor is hard to see
-       <STRONG>non_rev_rmcup</STRONG>              <STRONG>nrrmc</STRONG>   <STRONG>NR</STRONG>   smcup does not reverse rmcup
-       <STRONG>no_pad_char</STRONG>                <STRONG>npc</STRONG>     <STRONG>NP</STRONG>   pad character does not exist
-       <STRONG>non_dest_scroll_region</STRONG>     <STRONG>ndscr</STRONG>   <STRONG>ND</STRONG>   scrolling region is non-
-                                               destructive
-       <STRONG>can_change</STRONG>                 <STRONG>ccc</STRONG>     <STRONG>cc</STRONG>   terminal can re-define existing
-                                               colors
-       <STRONG>back_color_erase</STRONG>           <STRONG>bce</STRONG>     <STRONG>ut</STRONG>   screen erased with background
-                                               color
-       <STRONG>hue_lightness_saturation</STRONG>   <STRONG>hls</STRONG>     <STRONG>hl</STRONG>   terminal uses only HLS color
-                                               notation (Tektronix)
-       <STRONG>col_addr_glitch</STRONG>            <STRONG>xhpa</STRONG>    <STRONG>YA</STRONG>   only positive motion for
-                                               hpa/mhpa caps
-       <STRONG>cr_cancels_micro_mode</STRONG>      <STRONG>crxm</STRONG>    <STRONG>YB</STRONG>   using cr turns off micro mode
-       <STRONG>has_print_wheel</STRONG>            <STRONG>daisy</STRONG>   <STRONG>YC</STRONG>   printer needs operator to
-                                               change character set
-       <STRONG>row_addr_glitch</STRONG>            <STRONG>xvpa</STRONG>    <STRONG>YD</STRONG>   only positive motion for
-                                               vpa/mvpa caps
-       <STRONG>semi_auto_right_margin</STRONG>     <STRONG>sam</STRONG>     <STRONG>YE</STRONG>   printing in last column causes
-                                               cr
-       <STRONG>cpi_changes_res</STRONG>            <STRONG>cpix</STRONG>    <STRONG>YF</STRONG>   changing character pitch
-                                               changes resolution
-       <STRONG>lpi_changes_res</STRONG>            <STRONG>lpix</STRONG>    <STRONG>YG</STRONG>   changing line pitch changes
-                                               resolution
-
-                                    <STRONG>Code</STRONG>
-       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>   <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       <STRONG>auto_left_margin</STRONG>           <STRONG>bw</STRONG>        <STRONG>bw</STRONG>  cub1 wraps from column 0 to
+                                                last column
+       <STRONG>auto_right_margin</STRONG>          <STRONG>am</STRONG>        <STRONG>am</STRONG>  terminal has automatic margins
+       <STRONG>no_esc_ctlc</STRONG>                <STRONG>xsb</STRONG>       <STRONG>xb</STRONG>  beehive (f1=escape, f2=ctrl C)
+       <STRONG>ceol_standout_glitch</STRONG>       <STRONG>xhp</STRONG>       <STRONG>xs</STRONG>  standout not erased by
+                                                overwriting (hp)
+       <STRONG>eat_newline_glitch</STRONG>         <STRONG>xenl</STRONG>      <STRONG>xn</STRONG>  newline ignored after 80 cols
+                                                (concept)
+       <STRONG>erase_overstrike</STRONG>           <STRONG>eo</STRONG>        <STRONG>eo</STRONG>  can erase overstrikes with a
+                                                blank
+       <STRONG>generic_type</STRONG>               <STRONG>gn</STRONG>        <STRONG>gn</STRONG>  generic line type
+       <STRONG>hard_copy</STRONG>                  <STRONG>hc</STRONG>        <STRONG>hc</STRONG>  hardcopy terminal
+       <STRONG>has_meta_key</STRONG>               <STRONG>km</STRONG>        <STRONG>km</STRONG>  Has a meta key (i.e., sets
+                                                8th-bit)
+       <STRONG>has_status_line</STRONG>            <STRONG>hs</STRONG>        <STRONG>hs</STRONG>  has extra status line
+       <STRONG>insert_null_glitch</STRONG>         <STRONG>in</STRONG>        <STRONG>in</STRONG>  insert mode distinguishes
+                                                nulls
+       <STRONG>memory_above</STRONG>               <STRONG>da</STRONG>        <STRONG>da</STRONG>  display may be retained above
+                                                the screen
+       <STRONG>memory_below</STRONG>               <STRONG>db</STRONG>        <STRONG>db</STRONG>  display may be retained below
+                                                the screen
+       <STRONG>move_insert_mode</STRONG>           <STRONG>mir</STRONG>       <STRONG>mi</STRONG>  safe to move while in insert
+                                                mode
+       <STRONG>move_standout_mode</STRONG>         <STRONG>msgr</STRONG>      <STRONG>ms</STRONG>  safe to move while in standout
+                                                mode
+       <STRONG>over_strike</STRONG>                <STRONG>os</STRONG>        <STRONG>os</STRONG>  terminal can overstrike
+       <STRONG>status_line_esc_ok</STRONG>         <STRONG>eslok</STRONG>     <STRONG>es</STRONG>  escape can be used on the
+                                                status line
+       <STRONG>dest_tabs_magic_smso</STRONG>       <STRONG>xt</STRONG>        <STRONG>xt</STRONG>  tabs destructive, magic so
+                                                char (t1061)
+       <STRONG>tilde_glitch</STRONG>               <STRONG>hz</STRONG>        <STRONG>hz</STRONG>  cannot print ~'s (Hazeltine)
+       <STRONG>transparent_underline</STRONG>      <STRONG>ul</STRONG>        <STRONG>ul</STRONG>  underline character
+                                                overstrikes
+       <STRONG>xon_xoff</STRONG>                   <STRONG>xon</STRONG>       <STRONG>xo</STRONG>  terminal uses xon/xoff
+                                                handshaking
+       <STRONG>needs_xon_xoff</STRONG>             <STRONG>nxon</STRONG>      <STRONG>nx</STRONG>  padding will not work,
+                                                xon/xoff required
+       <STRONG>prtr_silent</STRONG>                <STRONG>mc5i</STRONG>      <STRONG>5i</STRONG>  printer will not echo on
+                                                screen
+       <STRONG>hard_cursor</STRONG>                <STRONG>chts</STRONG>      <STRONG>HC</STRONG>  cursor is hard to see
+       <STRONG>non_rev_rmcup</STRONG>              <STRONG>nrrmc</STRONG>     <STRONG>NR</STRONG>  smcup does not reverse rmcup
+       <STRONG>no_pad_char</STRONG>                <STRONG>npc</STRONG>       <STRONG>NP</STRONG>  pad character does not exist
+       <STRONG>non_dest_scroll_region</STRONG>     <STRONG>ndscr</STRONG>     <STRONG>ND</STRONG>  scrolling region is non-
+                                                destructive
+       <STRONG>can_change</STRONG>                 <STRONG>ccc</STRONG>       <STRONG>cc</STRONG>  terminal can re-define
+                                                existing colors
+       <STRONG>back_color_erase</STRONG>           <STRONG>bce</STRONG>       <STRONG>ut</STRONG>  screen erased with background
+                                                color
+       <STRONG>hue_lightness_saturation</STRONG>   <STRONG>hls</STRONG>       <STRONG>hl</STRONG>  terminal uses only HLS color
+                                                notation (Tektronix)
+       <STRONG>col_addr_glitch</STRONG>            <STRONG>xhpa</STRONG>      <STRONG>YA</STRONG>  only positive motion for
+                                                hpa/mhpa caps
+       <STRONG>cr_cancels_micro_mode</STRONG>      <STRONG>crxm</STRONG>      <STRONG>YB</STRONG>  using cr turns off micro mode
+       <STRONG>has_print_wheel</STRONG>            <STRONG>daisy</STRONG>     <STRONG>YC</STRONG>  printer needs operator to
+                                                change character set
+       <STRONG>row_addr_glitch</STRONG>            <STRONG>xvpa</STRONG>      <STRONG>YD</STRONG>  only positive motion for
+                                                vpa/mvpa caps
+       <STRONG>semi_auto_right_margin</STRONG>     <STRONG>sam</STRONG>       <STRONG>YE</STRONG>  printing in last column causes
+                                                cr
+       <STRONG>cpi_changes_res</STRONG>            <STRONG>cpix</STRONG>      <STRONG>YF</STRONG>  changing character pitch
+                                                changes resolution
+       <STRONG>lpi_changes_res</STRONG>            <STRONG>lpix</STRONG>      <STRONG>YG</STRONG>  changing line pitch changes
+                                                resolution
+
+                                      <STRONG>Code</STRONG>
+
+       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>columns</STRONG>                   <STRONG>cols</STRONG>     <STRONG>co</STRONG>   number of columns in a line
-
-       <STRONG>init_tabs</STRONG>                 <STRONG>it</STRONG>       <STRONG>it</STRONG>   tabs initially every # spaces
-       <STRONG>lines</STRONG>                     <STRONG>lines</STRONG>    <STRONG>li</STRONG>   number of lines on screen or
-                                               page
-       <STRONG>lines_of_memory</STRONG>           <STRONG>lm</STRONG>       <STRONG>lm</STRONG>   lines of memory if &gt; line. 0
-                                               means varies
-       <STRONG>magic_cookie_glitch</STRONG>       <STRONG>xmc</STRONG>      <STRONG>sg</STRONG>   number of blank characters left
-                                               by smso or rmso
-       <STRONG>padding_baud_rate</STRONG>         <STRONG>pb</STRONG>       <STRONG>pb</STRONG>   lowest baud rate where padding
-                                               needed
-       <STRONG>virtual_terminal</STRONG>          <STRONG>vt</STRONG>       <STRONG>vt</STRONG>   virtual terminal number
-                                               (CB/unix)
-       <STRONG>width_status_line</STRONG>         <STRONG>wsl</STRONG>      <STRONG>ws</STRONG>   number of columns in status
-                                               line
-       <STRONG>num_labels</STRONG>                <STRONG>nlab</STRONG>     <STRONG>Nl</STRONG>   number of labels on screen
-       <STRONG>label_height</STRONG>              <STRONG>lh</STRONG>       <STRONG>lh</STRONG>   rows in each label
-       <STRONG>label_width</STRONG>               <STRONG>lw</STRONG>       <STRONG>lw</STRONG>   columns in each label
-       <STRONG>max_attributes</STRONG>            <STRONG>ma</STRONG>       <STRONG>ma</STRONG>   maximum combined attributes
-                                               terminal can handle
-       <STRONG>maximum_windows</STRONG>           <STRONG>wnum</STRONG>     <STRONG>MW</STRONG>   maximum number of definable
-                                               windows
-       <STRONG>max_colors</STRONG>                <STRONG>colors</STRONG>   <STRONG>Co</STRONG>   maximum number of colors on
-                                               screen
-       <STRONG>max_pairs</STRONG>                 <STRONG>pairs</STRONG>    <STRONG>pa</STRONG>   maximum number of color-pairs
-                                               on the screen
-       <STRONG>no_color_video</STRONG>            <STRONG>ncv</STRONG>      <STRONG>NC</STRONG>   video attributes that cannot be
-                                               used with colors
-
-       The following numeric capabilities  are  present  in  the  SVr4.0  term
-       structure,  but  are  not yet documented in the man page.  They came in
+       <STRONG>columns</STRONG>                    <STRONG>cols</STRONG>      <STRONG>co</STRONG>  number of columns in a line
+       <STRONG>init_tabs</STRONG>                  <STRONG>it</STRONG>        <STRONG>it</STRONG>  tabs initially every # spaces
+       <STRONG>lines</STRONG>                      <STRONG>lines</STRONG>     <STRONG>li</STRONG>  number of lines on screen or
+                                                page
+       <STRONG>lines_of_memory</STRONG>            <STRONG>lm</STRONG>        <STRONG>lm</STRONG>  lines of memory if &gt; line. 0
+                                                means varies
+       <STRONG>magic_cookie_glitch</STRONG>        <STRONG>xmc</STRONG>       <STRONG>sg</STRONG>  number of blank characters
+                                                left by smso or rmso
+       <STRONG>padding_baud_rate</STRONG>          <STRONG>pb</STRONG>        <STRONG>pb</STRONG>  lowest baud rate where padding
+                                                needed
+       <STRONG>virtual_terminal</STRONG>           <STRONG>vt</STRONG>        <STRONG>vt</STRONG>  virtual terminal number
+                                                (CB/unix)
+       <STRONG>width_status_line</STRONG>          <STRONG>wsl</STRONG>       <STRONG>ws</STRONG>  number of columns in status
+                                                line
+       <STRONG>num_labels</STRONG>                 <STRONG>nlab</STRONG>      <STRONG>Nl</STRONG>  number of labels on screen
+       <STRONG>label_height</STRONG>               <STRONG>lh</STRONG>        <STRONG>lh</STRONG>  rows in each label
+       <STRONG>label_width</STRONG>                <STRONG>lw</STRONG>        <STRONG>lw</STRONG>  columns in each label
+       <STRONG>max_attributes</STRONG>             <STRONG>ma</STRONG>        <STRONG>ma</STRONG>  maximum combined attributes
+                                                terminal can handle
+       <STRONG>maximum_windows</STRONG>            <STRONG>wnum</STRONG>      <STRONG>MW</STRONG>  maximum number of definable
+                                                windows
+       <STRONG>max_colors</STRONG>                 <STRONG>colors</STRONG>    <STRONG>Co</STRONG>  maximum number of colors on
+                                                screen
+       <STRONG>max_pairs</STRONG>                  <STRONG>pairs</STRONG>     <STRONG>pa</STRONG>  maximum number of color-pairs
+                                                on the screen
+       <STRONG>no_color_video</STRONG>             <STRONG>ncv</STRONG>       <STRONG>NC</STRONG>  video attributes that cannot
+                                                be used with colors
+
+       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.
 
-                                    <STRONG>Code</STRONG>
-       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>   <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+                                      <STRONG>Code</STRONG>
+       <STRONG>Numeric</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>buffer_capacity</STRONG>           <STRONG>bufsz</STRONG>    <STRONG>Ya</STRONG>   numbers of bytes buffered
-                                               before printing
-       <STRONG>dot_vert_spacing</STRONG>          <STRONG>spinv</STRONG>    <STRONG>Yb</STRONG>   spacing of pins vertically in
-                                               pins per inch
-       <STRONG>dot_horz_spacing</STRONG>          <STRONG>spinh</STRONG>    <STRONG>Yc</STRONG>   spacing of dots horizontally in
-                                               dots per inch
-       <STRONG>max_micro_address</STRONG>         <STRONG>maddr</STRONG>    <STRONG>Yd</STRONG>   maximum value in
-                                               micro_..._address
-       <STRONG>max_micro_jump</STRONG>            <STRONG>mjump</STRONG>    <STRONG>Ye</STRONG>   maximum value in parm_..._micro
-       <STRONG>micro_col_size</STRONG>            <STRONG>mcs</STRONG>      <STRONG>Yf</STRONG>   character step size when in
-                                               micro mode
-       <STRONG>micro_line_size</STRONG>           <STRONG>mls</STRONG>      <STRONG>Yg</STRONG>   line step size when in micro
-                                               mode
-       <STRONG>number_of_pins</STRONG>            <STRONG>npins</STRONG>    <STRONG>Yh</STRONG>   numbers of pins in print-head
-       <STRONG>output_res_char</STRONG>           <STRONG>orc</STRONG>      <STRONG>Yi</STRONG>   horizontal resolution in units
-                                               per line
-       <STRONG>output_res_line</STRONG>           <STRONG>orl</STRONG>      <STRONG>Yj</STRONG>   vertical resolution in units
-                                               per line
-       <STRONG>output_res_horz_inch</STRONG>      <STRONG>orhi</STRONG>     <STRONG>Yk</STRONG>   horizontal resolution in units
-                                               per inch
-       <STRONG>output_res_vert_inch</STRONG>      <STRONG>orvi</STRONG>     <STRONG>Yl</STRONG>   vertical resolution in units
-                                               per inch
-       <STRONG>print_rate</STRONG>                <STRONG>cps</STRONG>      <STRONG>Ym</STRONG>   print rate in characters per
-                                               second
-       <STRONG>wide_char_size</STRONG>            <STRONG>widcs</STRONG>    <STRONG>Yn</STRONG>   character step size when in
-                                               double wide mode
-       <STRONG>buttons</STRONG>                   <STRONG>btns</STRONG>     <STRONG>BT</STRONG>   number of buttons on mouse
-       <STRONG>bit_image_entwining</STRONG>       <STRONG>bitwin</STRONG>   <STRONG>Yo</STRONG>   number of passes for each bit-
-                                               image row
-       <STRONG>bit_image_type</STRONG>            <STRONG>bitype</STRONG>   <STRONG>Yp</STRONG>   type of bit-image device
+       <STRONG>buffer_capacity</STRONG>            <STRONG>bufsz</STRONG>     <STRONG>Ya</STRONG>  numbers of bytes buffered
+                                                before printing
+       <STRONG>dot_vert_spacing</STRONG>           <STRONG>spinv</STRONG>     <STRONG>Yb</STRONG>  spacing of pins vertically in
+                                                pins per inch
+       <STRONG>dot_horz_spacing</STRONG>           <STRONG>spinh</STRONG>     <STRONG>Yc</STRONG>  spacing of dots horizontally
+                                                in dots per inch
+       <STRONG>max_micro_address</STRONG>          <STRONG>maddr</STRONG>     <STRONG>Yd</STRONG>  maximum value in
+                                                micro_..._address
+       <STRONG>max_micro_jump</STRONG>             <STRONG>mjump</STRONG>     <STRONG>Ye</STRONG>  maximum value in
+                                                parm_..._micro
+       <STRONG>micro_col_size</STRONG>             <STRONG>mcs</STRONG>       <STRONG>Yf</STRONG>  character step size when in
+                                                micro mode
+       <STRONG>micro_line_size</STRONG>            <STRONG>mls</STRONG>       <STRONG>Yg</STRONG>  line step size when in micro
+                                                mode
+       <STRONG>number_of_pins</STRONG>             <STRONG>npins</STRONG>     <STRONG>Yh</STRONG>  numbers of pins in print-head
+       <STRONG>output_res_char</STRONG>            <STRONG>orc</STRONG>       <STRONG>Yi</STRONG>  horizontal resolution in units
+                                                per line
+       <STRONG>output_res_line</STRONG>            <STRONG>orl</STRONG>       <STRONG>Yj</STRONG>  vertical resolution in units
+                                                per line
+       <STRONG>output_res_horz_inch</STRONG>       <STRONG>orhi</STRONG>      <STRONG>Yk</STRONG>  horizontal resolution in units
+                                                per inch
+       <STRONG>output_res_vert_inch</STRONG>       <STRONG>orvi</STRONG>      <STRONG>Yl</STRONG>  vertical resolution in units
+                                                per inch
+       <STRONG>print_rate</STRONG>                 <STRONG>cps</STRONG>       <STRONG>Ym</STRONG>  print rate in characters per
+                                                second
+       <STRONG>wide_char_size</STRONG>             <STRONG>widcs</STRONG>     <STRONG>Yn</STRONG>  character step size when in
+                                                double wide mode
+       <STRONG>buttons</STRONG>                    <STRONG>btns</STRONG>      <STRONG>BT</STRONG>  number of buttons on mouse
+
+       <STRONG>bit_image_entwining</STRONG>        <STRONG>bitwin</STRONG>    <STRONG>Yo</STRONG>  number of passes for each bit-
+                                                image row
+       <STRONG>bit_image_type</STRONG>             <STRONG>bitype</STRONG>    <STRONG>Yp</STRONG>  type of bit-image device
 
                                       <STRONG>Code</STRONG>
-
-       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>      <STRONG>TI</STRONG>       <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>back_tab</STRONG>                    <STRONG>cbt</STRONG>      <STRONG>bt</STRONG>   back tab (P)
-       <STRONG>bell</STRONG>                        <STRONG>bel</STRONG>      <STRONG>bl</STRONG>   audible signal (bell) (P)
-       <STRONG>carriage_return</STRONG>             <STRONG>cr</STRONG>       <STRONG>cr</STRONG>   carriage return (P*) (P*)
-       <STRONG>change_scroll_region</STRONG>        <STRONG>csr</STRONG>      <STRONG>cs</STRONG>   change region to line #1 to
-                                                 line #2 (P)
-       <STRONG>clear_all_tabs</STRONG>              <STRONG>tbc</STRONG>      <STRONG>ct</STRONG>   clear all tab stops (P)
-       <STRONG>clear_screen</STRONG>                <STRONG>clear</STRONG>    <STRONG>cl</STRONG>   clear screen and home cursor
-                                                 (P*)
-       <STRONG>clr_eol</STRONG>                     <STRONG>el</STRONG>       <STRONG>ce</STRONG>   clear to end of line (P)
-       <STRONG>clr_eos</STRONG>                     <STRONG>ed</STRONG>       <STRONG>cd</STRONG>   clear to end of screen (P*)
-       <STRONG>column_address</STRONG>              <STRONG>hpa</STRONG>      <STRONG>ch</STRONG>   horizontal position #1,
-                                                 absolute (P)
-       <STRONG>command_character</STRONG>           <STRONG>cmdch</STRONG>    <STRONG>CC</STRONG>   terminal settable cmd
-                                                 character in prototype !?
-       <STRONG>cursor_address</STRONG>              <STRONG>cup</STRONG>      <STRONG>cm</STRONG>   move to row #1 columns #2
-       <STRONG>cursor_down</STRONG>                 <STRONG>cud1</STRONG>     <STRONG>do</STRONG>   down one line
-       <STRONG>cursor_home</STRONG>                 <STRONG>home</STRONG>     <STRONG>ho</STRONG>   home cursor (if no cup)
-       <STRONG>cursor_invisible</STRONG>            <STRONG>civis</STRONG>    <STRONG>vi</STRONG>   make cursor invisible
-       <STRONG>cursor_left</STRONG>                 <STRONG>cub1</STRONG>     <STRONG>le</STRONG>   move left one space
-       <STRONG>cursor_mem_address</STRONG>          <STRONG>mrcup</STRONG>    <STRONG>CM</STRONG>   memory relative cursor
-                                                 addressing, move to row #1
-                                                 columns #2
-       <STRONG>cursor_normal</STRONG>               <STRONG>cnorm</STRONG>    <STRONG>ve</STRONG>   make cursor appear normal
-                                                 (undo civis/cvvis)
-       <STRONG>cursor_right</STRONG>                <STRONG>cuf1</STRONG>     <STRONG>nd</STRONG>   non-destructive space (move
-                                                 right one space)
-       <STRONG>cursor_to_ll</STRONG>                <STRONG>ll</STRONG>       <STRONG>ll</STRONG>   last line, first column (if
-                                                 no cup)
-       <STRONG>cursor_up</STRONG>                   <STRONG>cuu1</STRONG>     <STRONG>up</STRONG>   up one line
-       <STRONG>cursor_visible</STRONG>              <STRONG>cvvis</STRONG>    <STRONG>vs</STRONG>   make cursor very visible
-       <STRONG>delete_character</STRONG>            <STRONG>dch1</STRONG>     <STRONG>dc</STRONG>   delete character (P*)
-       <STRONG>delete_line</STRONG>                 <STRONG>dl1</STRONG>      <STRONG>dl</STRONG>   delete line (P*)
-       <STRONG>dis_status_line</STRONG>             <STRONG>dsl</STRONG>      <STRONG>ds</STRONG>   disable status line
-       <STRONG>down_half_line</STRONG>              <STRONG>hd</STRONG>       <STRONG>hd</STRONG>   half a line down
-       <STRONG>enter_alt_charset_mode</STRONG>      <STRONG>smacs</STRONG>    <STRONG>as</STRONG>   start alternate character set
-                                                 (P)
-       <STRONG>enter_blink_mode</STRONG>            <STRONG>blink</STRONG>    <STRONG>mb</STRONG>   turn on blinking
-       <STRONG>enter_bold_mode</STRONG>             <STRONG>bold</STRONG>     <STRONG>md</STRONG>   turn on bold (extra bright)
-                                                 mode
-       <STRONG>enter_ca_mode</STRONG>               <STRONG>smcup</STRONG>    <STRONG>ti</STRONG>   string to start programs
-                                                 using cup
-       <STRONG>enter_delete_mode</STRONG>           <STRONG>smdc</STRONG>     <STRONG>dm</STRONG>   enter delete mode
-       <STRONG>enter_dim_mode</STRONG>              <STRONG>dim</STRONG>      <STRONG>mh</STRONG>   turn on half-bright mode
-       <STRONG>enter_insert_mode</STRONG>           <STRONG>smir</STRONG>     <STRONG>im</STRONG>   enter insert mode
-       <STRONG>enter_secure_mode</STRONG>           <STRONG>invis</STRONG>    <STRONG>mk</STRONG>   turn on blank mode
-                                                 (characters invisible)
-       <STRONG>enter_protected_mode</STRONG>        <STRONG>prot</STRONG>     <STRONG>mp</STRONG>   turn on protected mode
-       <STRONG>enter_reverse_mode</STRONG>          <STRONG>rev</STRONG>      <STRONG>mr</STRONG>   turn on reverse video mode
-       <STRONG>enter_standout_mode</STRONG>         <STRONG>smso</STRONG>     <STRONG>so</STRONG>   begin standout mode
-       <STRONG>enter_underline_mode</STRONG>        <STRONG>smul</STRONG>     <STRONG>us</STRONG>   begin underline mode
-       <STRONG>erase_chars</STRONG>                 <STRONG>ech</STRONG>      <STRONG>ec</STRONG>   erase #1 characters (P)
-       <STRONG>exit_alt_charset_mode</STRONG>       <STRONG>rmacs</STRONG>    <STRONG>ae</STRONG>   end alternate character set
-                                                 (P)
-       <STRONG>exit_attribute_mode</STRONG>         <STRONG>sgr0</STRONG>     <STRONG>me</STRONG>   turn off all attributes
-       <STRONG>exit_ca_mode</STRONG>                <STRONG>rmcup</STRONG>    <STRONG>te</STRONG>   strings to end programs using
-                                                 cup
-       <STRONG>exit_delete_mode</STRONG>            <STRONG>rmdc</STRONG>     <STRONG>ed</STRONG>   end delete mode
-       <STRONG>exit_insert_mode</STRONG>            <STRONG>rmir</STRONG>     <STRONG>ei</STRONG>   exit insert mode
-       <STRONG>exit_standout_mode</STRONG>          <STRONG>rmso</STRONG>     <STRONG>se</STRONG>   exit standout mode
-       <STRONG>exit_underline_mode</STRONG>         <STRONG>rmul</STRONG>     <STRONG>ue</STRONG>   exit underline mode
-       <STRONG>flash_screen</STRONG>                <STRONG>flash</STRONG>    <STRONG>vb</STRONG>   visible bell (may not move
-                                                 cursor)
-
-
-       <STRONG>form_feed</STRONG>                   <STRONG>ff</STRONG>       <STRONG>ff</STRONG>   hardcopy terminal page eject
-                                                 (P*)
-       <STRONG>from_status_line</STRONG>            <STRONG>fsl</STRONG>      <STRONG>fs</STRONG>   return from status line
-       <STRONG>init_1string</STRONG>                <STRONG>is1</STRONG>      <STRONG>i1</STRONG>   initialization string
-       <STRONG>init_2string</STRONG>                <STRONG>is2</STRONG>      <STRONG>is</STRONG>   initialization string
-       <STRONG>init_3string</STRONG>                <STRONG>is3</STRONG>      <STRONG>i3</STRONG>   initialization string
-       <STRONG>init_file</STRONG>                   <STRONG>if</STRONG>       <STRONG>if</STRONG>   name of initialization file
-       <STRONG>insert_character</STRONG>            <STRONG>ich1</STRONG>     <STRONG>ic</STRONG>   insert character (P)
-       <STRONG>insert_line</STRONG>                 <STRONG>il1</STRONG>      <STRONG>al</STRONG>   insert line (P*)
-       <STRONG>insert_padding</STRONG>              <STRONG>ip</STRONG>       <STRONG>ip</STRONG>   insert padding after inserted
-                                                 character
-       <STRONG>key_backspace</STRONG>               <STRONG>kbs</STRONG>      <STRONG>kb</STRONG>   backspace key
-       <STRONG>key_catab</STRONG>                   <STRONG>ktbc</STRONG>     <STRONG>ka</STRONG>   clear-all-tabs key
-       <STRONG>key_clear</STRONG>                   <STRONG>kclr</STRONG>     <STRONG>kC</STRONG>   clear-screen or erase key
-       <STRONG>key_ctab</STRONG>                    <STRONG>kctab</STRONG>    <STRONG>kt</STRONG>   clear-tab key
-       <STRONG>key_dc</STRONG>                      <STRONG>kdch1</STRONG>    <STRONG>kD</STRONG>   delete-character key
-       <STRONG>key_dl</STRONG>                      <STRONG>kdl1</STRONG>     <STRONG>kL</STRONG>   delete-line key
-       <STRONG>key_down</STRONG>                    <STRONG>kcud1</STRONG>    <STRONG>kd</STRONG>   down-arrow key
-       <STRONG>key_eic</STRONG>                     <STRONG>krmir</STRONG>    <STRONG>kM</STRONG>   sent by rmir or smir in
-                                                 insert mode
-       <STRONG>key_eol</STRONG>                     <STRONG>kel</STRONG>      <STRONG>kE</STRONG>   clear-to-end-of-line key
-       <STRONG>key_eos</STRONG>                     <STRONG>ked</STRONG>      <STRONG>kS</STRONG>   clear-to-end-of-screen key
-       <STRONG>key_f0</STRONG>                      <STRONG>kf0</STRONG>      <STRONG>k0</STRONG>   F0 function key
-       <STRONG>key_f1</STRONG>                      <STRONG>kf1</STRONG>      <STRONG>k1</STRONG>   F1 function key
-       <STRONG>key_f10</STRONG>                     <STRONG>kf10</STRONG>     <STRONG>k;</STRONG>   F10 function key
-       <STRONG>key_f2</STRONG>                      <STRONG>kf2</STRONG>      <STRONG>k2</STRONG>   F2 function key
-       <STRONG>key_f3</STRONG>                      <STRONG>kf3</STRONG>      <STRONG>k3</STRONG>   F3 function key
-       <STRONG>key_f4</STRONG>                      <STRONG>kf4</STRONG>      <STRONG>k4</STRONG>   F4 function key
-       <STRONG>key_f5</STRONG>                      <STRONG>kf5</STRONG>      <STRONG>k5</STRONG>   F5 function key
-       <STRONG>key_f6</STRONG>                      <STRONG>kf6</STRONG>      <STRONG>k6</STRONG>   F6 function key
-       <STRONG>key_f7</STRONG>                      <STRONG>kf7</STRONG>      <STRONG>k7</STRONG>   F7 function key
-       <STRONG>key_f8</STRONG>                      <STRONG>kf8</STRONG>      <STRONG>k8</STRONG>   F8 function key
-       <STRONG>key_f9</STRONG>                      <STRONG>kf9</STRONG>      <STRONG>k9</STRONG>   F9 function key
-       <STRONG>key_home</STRONG>                    <STRONG>khome</STRONG>    <STRONG>kh</STRONG>   home key
-       <STRONG>key_ic</STRONG>                      <STRONG>kich1</STRONG>    <STRONG>kI</STRONG>   insert-character key
-       <STRONG>key_il</STRONG>                      <STRONG>kil1</STRONG>     <STRONG>kA</STRONG>   insert-line key
-       <STRONG>key_left</STRONG>                    <STRONG>kcub1</STRONG>    <STRONG>kl</STRONG>   left-arrow key
-       <STRONG>key_ll</STRONG>                      <STRONG>kll</STRONG>      <STRONG>kH</STRONG>   lower-left key (home down)
-       <STRONG>key_npage</STRONG>                   <STRONG>knp</STRONG>      <STRONG>kN</STRONG>   next-page key
-       <STRONG>key_ppage</STRONG>                   <STRONG>kpp</STRONG>      <STRONG>kP</STRONG>   previous-page key
-       <STRONG>key_right</STRONG>                   <STRONG>kcuf1</STRONG>    <STRONG>kr</STRONG>   right-arrow key
-       <STRONG>key_sf</STRONG>                      <STRONG>kind</STRONG>     <STRONG>kF</STRONG>   scroll-forward key
-       <STRONG>key_sr</STRONG>                      <STRONG>kri</STRONG>      <STRONG>kR</STRONG>   scroll-backward key
-       <STRONG>key_stab</STRONG>                    <STRONG>khts</STRONG>     <STRONG>kT</STRONG>   set-tab key
-       <STRONG>key_up</STRONG>                      <STRONG>kcuu1</STRONG>    <STRONG>ku</STRONG>   up-arrow key
-       <STRONG>keypad_local</STRONG>                <STRONG>rmkx</STRONG>     <STRONG>ke</STRONG>   leave keyboard transmit mode
-       <STRONG>keypad_xmit</STRONG>                 <STRONG>smkx</STRONG>     <STRONG>ks</STRONG>   enter keyboard transmit mode
-       <STRONG>lab_f0</STRONG>                      <STRONG>lf0</STRONG>      <STRONG>l0</STRONG>   label on function key f0 if
-                                                 not f0
-       <STRONG>lab_f1</STRONG>                      <STRONG>lf1</STRONG>      <STRONG>l1</STRONG>   label on function key f1 if
-                                                 not f1
-       <STRONG>lab_f10</STRONG>                     <STRONG>lf10</STRONG>     <STRONG>la</STRONG>   label on function key f10 if
-                                                 not f10
-       <STRONG>lab_f2</STRONG>                      <STRONG>lf2</STRONG>      <STRONG>l2</STRONG>   label on function key f2 if
-                                                 not f2
-       <STRONG>lab_f3</STRONG>                      <STRONG>lf3</STRONG>      <STRONG>l3</STRONG>   label on function key f3 if
-                                                 not f3
-       <STRONG>lab_f4</STRONG>                      <STRONG>lf4</STRONG>      <STRONG>l4</STRONG>   label on function key f4 if
-                                                 not f4
-       <STRONG>lab_f5</STRONG>                      <STRONG>lf5</STRONG>      <STRONG>l5</STRONG>   label on function key f5 if
-                                                 not f5
-       <STRONG>lab_f6</STRONG>                      <STRONG>lf6</STRONG>      <STRONG>l6</STRONG>   label on function key f6 if
-                                                 not f6
-       <STRONG>lab_f7</STRONG>                      <STRONG>lf7</STRONG>      <STRONG>l7</STRONG>   label on function key f7 if
-                                                 not f7
-
-       <STRONG>lab_f8</STRONG>                      <STRONG>lf8</STRONG>      <STRONG>l8</STRONG>   label on function key f8 if
-                                                 not f8
-       <STRONG>lab_f9</STRONG>                      <STRONG>lf9</STRONG>      <STRONG>l9</STRONG>   label on function key f9 if
-                                                 not f9
-       <STRONG>meta_off</STRONG>                    <STRONG>rmm</STRONG>      <STRONG>mo</STRONG>   turn off meta mode
-       <STRONG>meta_on</STRONG>                     <STRONG>smm</STRONG>      <STRONG>mm</STRONG>   turn on meta mode (8th-bit
-                                                 on)
-       <STRONG>newline</STRONG>                     <STRONG>nel</STRONG>      <STRONG>nw</STRONG>   newline (behave like cr
-                                                 followed by lf)
-       <STRONG>pad_char</STRONG>                    <STRONG>pad</STRONG>      <STRONG>pc</STRONG>   padding char (instead of
-                                                 null)
-       <STRONG>parm_dch</STRONG>                    <STRONG>dch</STRONG>      <STRONG>DC</STRONG>   delete #1 characters (P*)
-       <STRONG>parm_delete_line</STRONG>            <STRONG>dl</STRONG>       <STRONG>DL</STRONG>   delete #1 lines (P*)
-       <STRONG>parm_down_cursor</STRONG>            <STRONG>cud</STRONG>      <STRONG>DO</STRONG>   down #1 lines (P*)
-       <STRONG>parm_ich</STRONG>                    <STRONG>ich</STRONG>      <STRONG>IC</STRONG>   insert #1 characters (P*)
-       <STRONG>parm_index</STRONG>                  <STRONG>indn</STRONG>     <STRONG>SF</STRONG>   scroll forward #1 lines (P)
-       <STRONG>parm_insert_line</STRONG>            <STRONG>il</STRONG>       <STRONG>AL</STRONG>   insert #1 lines (P*)
-       <STRONG>parm_left_cursor</STRONG>            <STRONG>cub</STRONG>      <STRONG>LE</STRONG>   move #1 characters to the
-                                                 left (P)
-       <STRONG>parm_right_cursor</STRONG>           <STRONG>cuf</STRONG>      <STRONG>RI</STRONG>   move #1 characters to the
-                                                 right (P*)
-       <STRONG>parm_rindex</STRONG>                 <STRONG>rin</STRONG>      <STRONG>SR</STRONG>   scroll back #1 lines (P)
-       <STRONG>parm_up_cursor</STRONG>              <STRONG>cuu</STRONG>      <STRONG>UP</STRONG>   up #1 lines (P*)
-       <STRONG>pkey_key</STRONG>                    <STRONG>pfkey</STRONG>    <STRONG>pk</STRONG>   program function key #1 to
-                                                 type string #2
-       <STRONG>pkey_local</STRONG>                  <STRONG>pfloc</STRONG>    <STRONG>pl</STRONG>   program function key #1 to
-                                                 execute string #2
-       <STRONG>pkey_xmit</STRONG>                   <STRONG>pfx</STRONG>      <STRONG>px</STRONG>   program function key #1 to
-                                                 transmit string #2
-       <STRONG>print_screen</STRONG>                <STRONG>mc0</STRONG>      <STRONG>ps</STRONG>   print contents of screen
-       <STRONG>prtr_off</STRONG>                    <STRONG>mc4</STRONG>      <STRONG>pf</STRONG>   turn off printer
-       <STRONG>prtr_on</STRONG>                     <STRONG>mc5</STRONG>      <STRONG>po</STRONG>   turn on printer
-       <STRONG>repeat_char</STRONG>                 <STRONG>rep</STRONG>      <STRONG>rp</STRONG>   repeat char #1 #2 times (P*)
-       <STRONG>reset_1string</STRONG>               <STRONG>rs1</STRONG>      <STRONG>r1</STRONG>   reset string
-       <STRONG>reset_2string</STRONG>               <STRONG>rs2</STRONG>      <STRONG>r2</STRONG>   reset string
-       <STRONG>reset_3string</STRONG>               <STRONG>rs3</STRONG>      <STRONG>r3</STRONG>   reset string
-       <STRONG>reset_file</STRONG>                  <STRONG>rf</STRONG>       <STRONG>rf</STRONG>   name of reset file
-       <STRONG>restore_cursor</STRONG>              <STRONG>rc</STRONG>       <STRONG>rc</STRONG>   restore cursor to position of
-                                                 last save_cursor
-       <STRONG>row_address</STRONG>                 <STRONG>vpa</STRONG>      <STRONG>cv</STRONG>   vertical position #1 absolute
-                                                 (P)
-       <STRONG>save_cursor</STRONG>                 <STRONG>sc</STRONG>       <STRONG>sc</STRONG>   save current cursor position
-                                                 (P)
-       <STRONG>scroll_forward</STRONG>              <STRONG>ind</STRONG>      <STRONG>sf</STRONG>   scroll text up (P)
-       <STRONG>scroll_reverse</STRONG>              <STRONG>ri</STRONG>       <STRONG>sr</STRONG>   scroll text down (P)
-       <STRONG>set_attributes</STRONG>              <STRONG>sgr</STRONG>      <STRONG>sa</STRONG>   define video attributes #1-#9
-                                                 (PG9)
-       <STRONG>set_tab</STRONG>                     <STRONG>hts</STRONG>      <STRONG>st</STRONG>   set a tab in every row,
-                                                 current columns
-       <STRONG>set_window</STRONG>                  <STRONG>wind</STRONG>     <STRONG>wi</STRONG>   current window is lines #1-#2
-                                                 cols #3-#4
-       <STRONG>tab</STRONG>                         <STRONG>ht</STRONG>       <STRONG>ta</STRONG>   tab to next 8-space hardware
-                                                 tab stop
-       <STRONG>to_status_line</STRONG>              <STRONG>tsl</STRONG>      <STRONG>ts</STRONG>   move to status line, column
-                                                 #1
-       <STRONG>underline_char</STRONG>              <STRONG>uc</STRONG>       <STRONG>uc</STRONG>   underline char and move past
-                                                 it
-       <STRONG>up_half_line</STRONG>                <STRONG>hu</STRONG>       <STRONG>hu</STRONG>   half a line up
-       <STRONG>init_prog</STRONG>                   <STRONG>iprog</STRONG>    <STRONG>iP</STRONG>   path name of program for
-                                                 initialization
-       <STRONG>key_a1</STRONG>                      <STRONG>ka1</STRONG>      <STRONG>K1</STRONG>   upper left of keypad
-       <STRONG>key_a3</STRONG>                      <STRONG>ka3</STRONG>      <STRONG>K3</STRONG>   upper right of keypad
-       <STRONG>key_b2</STRONG>                      <STRONG>kb2</STRONG>      <STRONG>K2</STRONG>   center of keypad
-       <STRONG>key_c1</STRONG>                      <STRONG>kc1</STRONG>      <STRONG>K4</STRONG>   lower left of keypad
-       <STRONG>key_c3</STRONG>                      <STRONG>kc3</STRONG>      <STRONG>K5</STRONG>   lower right of keypad
-
-       <STRONG>prtr_non</STRONG>                    <STRONG>mc5p</STRONG>     <STRONG>pO</STRONG>   turn on printer for #1 bytes
-       <STRONG>char_padding</STRONG>                <STRONG>rmp</STRONG>      <STRONG>rP</STRONG>   like ip but when in insert
-                                                 mode
-       <STRONG>acs_chars</STRONG>                   <STRONG>acsc</STRONG>     <STRONG>ac</STRONG>   graphics charset pairs, based
-                                                 on vt100
-       <STRONG>plab_norm</STRONG>                   <STRONG>pln</STRONG>      <STRONG>pn</STRONG>   program label #1 to show
-                                                 string #2
-       <STRONG>key_btab</STRONG>                    <STRONG>kcbt</STRONG>     <STRONG>kB</STRONG>   back-tab key
-       <STRONG>enter_xon_mode</STRONG>              <STRONG>smxon</STRONG>    <STRONG>SX</STRONG>   turn on xon/xoff handshaking
-       <STRONG>exit_xon_mode</STRONG>               <STRONG>rmxon</STRONG>    <STRONG>RX</STRONG>   turn off xon/xoff handshaking
-       <STRONG>enter_am_mode</STRONG>               <STRONG>smam</STRONG>     <STRONG>SA</STRONG>   turn on automatic margins
-       <STRONG>exit_am_mode</STRONG>                <STRONG>rmam</STRONG>     <STRONG>RA</STRONG>   turn off automatic margins
-       <STRONG>xon_character</STRONG>               <STRONG>xonc</STRONG>     <STRONG>XN</STRONG>   XON character
-       <STRONG>xoff_character</STRONG>              <STRONG>xoffc</STRONG>    <STRONG>XF</STRONG>   XOFF character
-       <STRONG>ena_acs</STRONG>                     <STRONG>enacs</STRONG>    <STRONG>eA</STRONG>   enable alternate char set
-       <STRONG>label_on</STRONG>                    <STRONG>smln</STRONG>     <STRONG>LO</STRONG>   turn on soft labels
-       <STRONG>label_off</STRONG>                   <STRONG>rmln</STRONG>     <STRONG>LF</STRONG>   turn off soft labels
-       <STRONG>key_beg</STRONG>                     <STRONG>kbeg</STRONG>     <STRONG>@1</STRONG>   begin key
-       <STRONG>key_cancel</STRONG>                  <STRONG>kcan</STRONG>     <STRONG>@2</STRONG>   cancel key
-       <STRONG>key_close</STRONG>                   <STRONG>kclo</STRONG>     <STRONG>@3</STRONG>   close key
-       <STRONG>key_command</STRONG>                 <STRONG>kcmd</STRONG>     <STRONG>@4</STRONG>   command key
-       <STRONG>key_copy</STRONG>                    <STRONG>kcpy</STRONG>     <STRONG>@5</STRONG>   copy key
-       <STRONG>key_create</STRONG>                  <STRONG>kcrt</STRONG>     <STRONG>@6</STRONG>   create key
-       <STRONG>key_end</STRONG>                     <STRONG>kend</STRONG>     <STRONG>@7</STRONG>   end key
-       <STRONG>key_enter</STRONG>                   <STRONG>kent</STRONG>     <STRONG>@8</STRONG>   enter/send key
-       <STRONG>key_exit</STRONG>                    <STRONG>kext</STRONG>     <STRONG>@9</STRONG>   exit key
-       <STRONG>key_find</STRONG>                    <STRONG>kfnd</STRONG>     <STRONG>@0</STRONG>   find key
-       <STRONG>key_help</STRONG>                    <STRONG>khlp</STRONG>     <STRONG>%1</STRONG>   help key
-       <STRONG>key_mark</STRONG>                    <STRONG>kmrk</STRONG>     <STRONG>%2</STRONG>   mark key
-       <STRONG>key_message</STRONG>                 <STRONG>kmsg</STRONG>     <STRONG>%3</STRONG>   message key
-       <STRONG>key_move</STRONG>                    <STRONG>kmov</STRONG>     <STRONG>%4</STRONG>   move key
-       <STRONG>key_next</STRONG>                    <STRONG>knxt</STRONG>     <STRONG>%5</STRONG>   next key
-       <STRONG>key_open</STRONG>                    <STRONG>kopn</STRONG>     <STRONG>%6</STRONG>   open key
-       <STRONG>key_options</STRONG>                 <STRONG>kopt</STRONG>     <STRONG>%7</STRONG>   options key
-       <STRONG>key_previous</STRONG>                <STRONG>kprv</STRONG>     <STRONG>%8</STRONG>   previous key
-       <STRONG>key_print</STRONG>                   <STRONG>kprt</STRONG>     <STRONG>%9</STRONG>   print key
-       <STRONG>key_redo</STRONG>                    <STRONG>krdo</STRONG>     <STRONG>%0</STRONG>   redo key
-       <STRONG>key_reference</STRONG>               <STRONG>kref</STRONG>     <STRONG>&amp;1</STRONG>   reference key
-       <STRONG>key_refresh</STRONG>                 <STRONG>krfr</STRONG>     <STRONG>&amp;2</STRONG>   refresh key
-       <STRONG>key_replace</STRONG>                 <STRONG>krpl</STRONG>     <STRONG>&amp;3</STRONG>   replace key
-       <STRONG>key_restart</STRONG>                 <STRONG>krst</STRONG>     <STRONG>&amp;4</STRONG>   restart key
-       <STRONG>key_resume</STRONG>                  <STRONG>kres</STRONG>     <STRONG>&amp;5</STRONG>   resume key
-       <STRONG>key_save</STRONG>                    <STRONG>ksav</STRONG>     <STRONG>&amp;6</STRONG>   save key
-       <STRONG>key_suspend</STRONG>                 <STRONG>kspd</STRONG>     <STRONG>&amp;7</STRONG>   suspend key
-       <STRONG>key_undo</STRONG>                    <STRONG>kund</STRONG>     <STRONG>&amp;8</STRONG>   undo key
-       <STRONG>key_sbeg</STRONG>                    <STRONG>kBEG</STRONG>     <STRONG>&amp;9</STRONG>   shifted begin key
-       <STRONG>key_scancel</STRONG>                 <STRONG>kCAN</STRONG>     <STRONG>&amp;0</STRONG>   shifted cancel key
-       <STRONG>key_scommand</STRONG>                <STRONG>kCMD</STRONG>     <STRONG>*1</STRONG>   shifted command key
-       <STRONG>key_scopy</STRONG>                   <STRONG>kCPY</STRONG>     <STRONG>*2</STRONG>   shifted copy key
-       <STRONG>key_screate</STRONG>                 <STRONG>kCRT</STRONG>     <STRONG>*3</STRONG>   shifted create key
-       <STRONG>key_sdc</STRONG>                     <STRONG>kDC</STRONG>      <STRONG>*4</STRONG>   shifted delete-character key
-       <STRONG>key_sdl</STRONG>                     <STRONG>kDL</STRONG>      <STRONG>*5</STRONG>   shifted delete-line key
-       <STRONG>key_select</STRONG>                  <STRONG>kslt</STRONG>     <STRONG>*6</STRONG>   select key
-       <STRONG>key_send</STRONG>                    <STRONG>kEND</STRONG>     <STRONG>*7</STRONG>   shifted end key
-       <STRONG>key_seol</STRONG>                    <STRONG>kEOL</STRONG>     <STRONG>*8</STRONG>   shifted clear-to-end-of-line
-                                                 key
-       <STRONG>key_sexit</STRONG>                   <STRONG>kEXT</STRONG>     <STRONG>*9</STRONG>   shifted exit key
-       <STRONG>key_sfind</STRONG>                   <STRONG>kFND</STRONG>     <STRONG>*0</STRONG>   shifted find key
-       <STRONG>key_shelp</STRONG>                   <STRONG>kHLP</STRONG>     <STRONG>#1</STRONG>   shifted help key
-       <STRONG>key_shome</STRONG>                   <STRONG>kHOM</STRONG>     <STRONG>#2</STRONG>   shifted home key
-       <STRONG>key_sic</STRONG>                     <STRONG>kIC</STRONG>      <STRONG>#3</STRONG>   shifted insert-character key
-       <STRONG>key_sleft</STRONG>                   <STRONG>kLFT</STRONG>     <STRONG>#4</STRONG>   shifted left-arrow key
-       <STRONG>key_smessage</STRONG>                <STRONG>kMSG</STRONG>     <STRONG>%a</STRONG>   shifted message key
-       <STRONG>key_smove</STRONG>                   <STRONG>kMOV</STRONG>     <STRONG>%b</STRONG>   shifted move key
-       <STRONG>key_snext</STRONG>                   <STRONG>kNXT</STRONG>     <STRONG>%c</STRONG>   shifted next key
-
-       <STRONG>key_soptions</STRONG>                <STRONG>kOPT</STRONG>     <STRONG>%d</STRONG>   shifted options key
-       <STRONG>key_sprevious</STRONG>               <STRONG>kPRV</STRONG>     <STRONG>%e</STRONG>   shifted previous key
-       <STRONG>key_sprint</STRONG>                  <STRONG>kPRT</STRONG>     <STRONG>%f</STRONG>   shifted print key
-       <STRONG>key_sredo</STRONG>                   <STRONG>kRDO</STRONG>     <STRONG>%g</STRONG>   shifted redo key
-       <STRONG>key_sreplace</STRONG>                <STRONG>kRPL</STRONG>     <STRONG>%h</STRONG>   shifted replace key
-       <STRONG>key_sright</STRONG>                  <STRONG>kRIT</STRONG>     <STRONG>%i</STRONG>   shifted right-arrow key
-       <STRONG>key_srsume</STRONG>                  <STRONG>kRES</STRONG>     <STRONG>%j</STRONG>   shifted resume key
-       <STRONG>key_ssave</STRONG>                   <STRONG>kSAV</STRONG>     <STRONG>!1</STRONG>   shifted save key
-       <STRONG>key_ssuspend</STRONG>                <STRONG>kSPD</STRONG>     <STRONG>!2</STRONG>   shifted suspend key
-       <STRONG>key_sundo</STRONG>                   <STRONG>kUND</STRONG>     <STRONG>!3</STRONG>   shifted undo key
-       <STRONG>req_for_input</STRONG>               <STRONG>rfi</STRONG>      <STRONG>RF</STRONG>   send next input char (for
-                                                 ptys)
-       <STRONG>key_f11</STRONG>                     <STRONG>kf11</STRONG>     <STRONG>F1</STRONG>   F11 function key
-       <STRONG>key_f12</STRONG>                     <STRONG>kf12</STRONG>     <STRONG>F2</STRONG>   F12 function key
-       <STRONG>key_f13</STRONG>                     <STRONG>kf13</STRONG>     <STRONG>F3</STRONG>   F13 function key
-       <STRONG>key_f14</STRONG>                     <STRONG>kf14</STRONG>     <STRONG>F4</STRONG>   F14 function key
-       <STRONG>key_f15</STRONG>                     <STRONG>kf15</STRONG>     <STRONG>F5</STRONG>   F15 function key
-       <STRONG>key_f16</STRONG>                     <STRONG>kf16</STRONG>     <STRONG>F6</STRONG>   F16 function key
-       <STRONG>key_f17</STRONG>                     <STRONG>kf17</STRONG>     <STRONG>F7</STRONG>   F17 function key
-       <STRONG>key_f18</STRONG>                     <STRONG>kf18</STRONG>     <STRONG>F8</STRONG>   F18 function key
-       <STRONG>key_f19</STRONG>                     <STRONG>kf19</STRONG>     <STRONG>F9</STRONG>   F19 function key
-       <STRONG>key_f20</STRONG>                     <STRONG>kf20</STRONG>     <STRONG>FA</STRONG>   F20 function key
-       <STRONG>key_f21</STRONG>                     <STRONG>kf21</STRONG>     <STRONG>FB</STRONG>   F21 function key
-       <STRONG>key_f22</STRONG>                     <STRONG>kf22</STRONG>     <STRONG>FC</STRONG>   F22 function key
-       <STRONG>key_f23</STRONG>                     <STRONG>kf23</STRONG>     <STRONG>FD</STRONG>   F23 function key
-       <STRONG>key_f24</STRONG>                     <STRONG>kf24</STRONG>     <STRONG>FE</STRONG>   F24 function key
-       <STRONG>key_f25</STRONG>                     <STRONG>kf25</STRONG>     <STRONG>FF</STRONG>   F25 function key
-       <STRONG>key_f26</STRONG>                     <STRONG>kf26</STRONG>     <STRONG>FG</STRONG>   F26 function key
-       <STRONG>key_f27</STRONG>                     <STRONG>kf27</STRONG>     <STRONG>FH</STRONG>   F27 function key
-       <STRONG>key_f28</STRONG>                     <STRONG>kf28</STRONG>     <STRONG>FI</STRONG>   F28 function key
-       <STRONG>key_f29</STRONG>                     <STRONG>kf29</STRONG>     <STRONG>FJ</STRONG>   F29 function key
-       <STRONG>key_f30</STRONG>                     <STRONG>kf30</STRONG>     <STRONG>FK</STRONG>   F30 function key
-       <STRONG>key_f31</STRONG>                     <STRONG>kf31</STRONG>     <STRONG>FL</STRONG>   F31 function key
-       <STRONG>key_f32</STRONG>                     <STRONG>kf32</STRONG>     <STRONG>FM</STRONG>   F32 function key
-       <STRONG>key_f33</STRONG>                     <STRONG>kf33</STRONG>     <STRONG>FN</STRONG>   F33 function key
-       <STRONG>key_f34</STRONG>                     <STRONG>kf34</STRONG>     <STRONG>FO</STRONG>   F34 function key
-       <STRONG>key_f35</STRONG>                     <STRONG>kf35</STRONG>     <STRONG>FP</STRONG>   F35 function key
-       <STRONG>key_f36</STRONG>                     <STRONG>kf36</STRONG>     <STRONG>FQ</STRONG>   F36 function key
-       <STRONG>key_f37</STRONG>                     <STRONG>kf37</STRONG>     <STRONG>FR</STRONG>   F37 function key
-       <STRONG>key_f38</STRONG>                     <STRONG>kf38</STRONG>     <STRONG>FS</STRONG>   F38 function key
-       <STRONG>key_f39</STRONG>                     <STRONG>kf39</STRONG>     <STRONG>FT</STRONG>   F39 function key
-       <STRONG>key_f40</STRONG>                     <STRONG>kf40</STRONG>     <STRONG>FU</STRONG>   F40 function key
-       <STRONG>key_f41</STRONG>                     <STRONG>kf41</STRONG>     <STRONG>FV</STRONG>   F41 function key
-       <STRONG>key_f42</STRONG>                     <STRONG>kf42</STRONG>     <STRONG>FW</STRONG>   F42 function key
-       <STRONG>key_f43</STRONG>                     <STRONG>kf43</STRONG>     <STRONG>FX</STRONG>   F43 function key
-       <STRONG>key_f44</STRONG>                     <STRONG>kf44</STRONG>     <STRONG>FY</STRONG>   F44 function key
-       <STRONG>key_f45</STRONG>                     <STRONG>kf45</STRONG>     <STRONG>FZ</STRONG>   F45 function key
-       <STRONG>key_f46</STRONG>                     <STRONG>kf46</STRONG>     <STRONG>Fa</STRONG>   F46 function key
-       <STRONG>key_f47</STRONG>                     <STRONG>kf47</STRONG>     <STRONG>Fb</STRONG>   F47 function key
-       <STRONG>key_f48</STRONG>                     <STRONG>kf48</STRONG>     <STRONG>Fc</STRONG>   F48 function key
-       <STRONG>key_f49</STRONG>                     <STRONG>kf49</STRONG>     <STRONG>Fd</STRONG>   F49 function key
-       <STRONG>key_f50</STRONG>                     <STRONG>kf50</STRONG>     <STRONG>Fe</STRONG>   F50 function key
-       <STRONG>key_f51</STRONG>                     <STRONG>kf51</STRONG>     <STRONG>Ff</STRONG>   F51 function key
-       <STRONG>key_f52</STRONG>                     <STRONG>kf52</STRONG>     <STRONG>Fg</STRONG>   F52 function key
-       <STRONG>key_f53</STRONG>                     <STRONG>kf53</STRONG>     <STRONG>Fh</STRONG>   F53 function key
-       <STRONG>key_f54</STRONG>                     <STRONG>kf54</STRONG>     <STRONG>Fi</STRONG>   F54 function key
-       <STRONG>key_f55</STRONG>                     <STRONG>kf55</STRONG>     <STRONG>Fj</STRONG>   F55 function key
-       <STRONG>key_f56</STRONG>                     <STRONG>kf56</STRONG>     <STRONG>Fk</STRONG>   F56 function key
-       <STRONG>key_f57</STRONG>                     <STRONG>kf57</STRONG>     <STRONG>Fl</STRONG>   F57 function key
-       <STRONG>key_f58</STRONG>                     <STRONG>kf58</STRONG>     <STRONG>Fm</STRONG>   F58 function key
-       <STRONG>key_f59</STRONG>                     <STRONG>kf59</STRONG>     <STRONG>Fn</STRONG>   F59 function key
-       <STRONG>key_f60</STRONG>                     <STRONG>kf60</STRONG>     <STRONG>Fo</STRONG>   F60 function key
-       <STRONG>key_f61</STRONG>                     <STRONG>kf61</STRONG>     <STRONG>Fp</STRONG>   F61 function key
-       <STRONG>key_f62</STRONG>                     <STRONG>kf62</STRONG>     <STRONG>Fq</STRONG>   F62 function key
-       <STRONG>key_f63</STRONG>                     <STRONG>kf63</STRONG>     <STRONG>Fr</STRONG>   F63 function key
-
-       <STRONG>clr_bol</STRONG>                     <STRONG>el1</STRONG>      <STRONG>cb</STRONG>   Clear to beginning of line
-       <STRONG>clear_margins</STRONG>               <STRONG>mgc</STRONG>      <STRONG>MC</STRONG>   clear right and left soft
-                                                 margins
-       <STRONG>set_left_margin</STRONG>             <STRONG>smgl</STRONG>     <STRONG>ML</STRONG>   set left soft margin at
-                                                 current column. (ML is not in
-                                                 BSD termcap).
-       <STRONG>set_right_margin</STRONG>            <STRONG>smgr</STRONG>     <STRONG>MR</STRONG>   set right soft margin at
-                                                 current column
-       <STRONG>label_format</STRONG>                <STRONG>fln</STRONG>      <STRONG>Lf</STRONG>   label format
-       <STRONG>set_clock</STRONG>                   <STRONG>sclk</STRONG>     <STRONG>SC</STRONG>   set clock, #1 hrs #2 mins #3
-                                                 secs
-       <STRONG>display_clock</STRONG>               <STRONG>dclk</STRONG>     <STRONG>DK</STRONG>   display clock
-       <STRONG>remove_clock</STRONG>                <STRONG>rmclk</STRONG>    <STRONG>RC</STRONG>   remove clock
-       <STRONG>create_window</STRONG>               <STRONG>cwin</STRONG>     <STRONG>CW</STRONG>   define a window #1 from #2,#3
-                                                 to #4,#5
-       <STRONG>goto_window</STRONG>                 <STRONG>wingo</STRONG>    <STRONG>WG</STRONG>   go to window #1
-       <STRONG>hangup</STRONG>                      <STRONG>hup</STRONG>      <STRONG>HU</STRONG>   hang-up phone
-       <STRONG>dial_phone</STRONG>                  <STRONG>dial</STRONG>     <STRONG>DI</STRONG>   dial number #1
-       <STRONG>quick_dial</STRONG>                  <STRONG>qdial</STRONG>    <STRONG>QD</STRONG>   dial number #1 without
-                                                 checking
-       <STRONG>tone</STRONG>                        <STRONG>tone</STRONG>     <STRONG>TO</STRONG>   select touch tone dialing
-       <STRONG>pulse</STRONG>                       <STRONG>pulse</STRONG>    <STRONG>PU</STRONG>   select pulse dialing
-       <STRONG>flash_hook</STRONG>                  <STRONG>hook</STRONG>     <STRONG>fh</STRONG>   flash switch hook
-       <STRONG>fixed_pause</STRONG>                 <STRONG>pause</STRONG>    <STRONG>PA</STRONG>   pause for 2-3 seconds
-       <STRONG>wait_tone</STRONG>                   <STRONG>wait</STRONG>     <STRONG>WA</STRONG>   wait for dial-tone
-       <STRONG>user0</STRONG>                       <STRONG>u0</STRONG>       <STRONG>u0</STRONG>   User string #0
-       <STRONG>user1</STRONG>                       <STRONG>u1</STRONG>       <STRONG>u1</STRONG>   User string #1
-       <STRONG>user2</STRONG>                       <STRONG>u2</STRONG>       <STRONG>u2</STRONG>   User string #2
-       <STRONG>user3</STRONG>                       <STRONG>u3</STRONG>       <STRONG>u3</STRONG>   User string #3
-       <STRONG>user4</STRONG>                       <STRONG>u4</STRONG>       <STRONG>u4</STRONG>   User string #4
-       <STRONG>user5</STRONG>                       <STRONG>u5</STRONG>       <STRONG>u5</STRONG>   User string #5
-       <STRONG>user6</STRONG>                       <STRONG>u6</STRONG>       <STRONG>u6</STRONG>   User string #6
-       <STRONG>user7</STRONG>                       <STRONG>u7</STRONG>       <STRONG>u7</STRONG>   User string #7
-       <STRONG>user8</STRONG>                       <STRONG>u8</STRONG>       <STRONG>u8</STRONG>   User string #8
-       <STRONG>user9</STRONG>                       <STRONG>u9</STRONG>       <STRONG>u9</STRONG>   User string #9
-       <STRONG>orig_pair</STRONG>                   <STRONG>op</STRONG>       <STRONG>op</STRONG>   Set default pair to its
-                                                 original value
-       <STRONG>orig_colors</STRONG>                 <STRONG>oc</STRONG>       <STRONG>oc</STRONG>   Set all color pairs to the
-                                                 original ones
-       <STRONG>initialize_color</STRONG>            <STRONG>initc</STRONG>    <STRONG>Ic</STRONG>   initialize color #1 to
-                                                 (#2,#3,#4)
-       <STRONG>initialize_pair</STRONG>             <STRONG>initp</STRONG>    <STRONG>Ip</STRONG>   Initialize color pair #1 to
-                                                 fg=(#2,#3,#4), bg=(#5,#6,#7)
-       <STRONG>set_color_pair</STRONG>              <STRONG>scp</STRONG>      <STRONG>sp</STRONG>   Set current color pair to #1
-       <STRONG>set_foreground</STRONG>              <STRONG>setf</STRONG>     <STRONG>Sf</STRONG>   Set foreground color #1
-       <STRONG>set_background</STRONG>              <STRONG>setb</STRONG>     <STRONG>Sb</STRONG>   Set background color #1
-       <STRONG>change_char_pitch</STRONG>           <STRONG>cpi</STRONG>      <STRONG>ZA</STRONG>   Change number of characters
-                                                 per inch to #1
-       <STRONG>change_line_pitch</STRONG>           <STRONG>lpi</STRONG>      <STRONG>ZB</STRONG>   Change number of lines per
-                                                 inch to #1
-       <STRONG>change_res_horz</STRONG>             <STRONG>chr</STRONG>      <STRONG>ZC</STRONG>   Change horizontal resolution
-                                                 to #1
-       <STRONG>change_res_vert</STRONG>             <STRONG>cvr</STRONG>      <STRONG>ZD</STRONG>   Change vertical resolution to
-                                                 #1
-       <STRONG>define_char</STRONG>                 <STRONG>defc</STRONG>     <STRONG>ZE</STRONG>   Define a character #1, #2
-                                                 dots wide, descender #3
-       <STRONG>enter_doublewide_mode</STRONG>       <STRONG>swidm</STRONG>    <STRONG>ZF</STRONG>   Enter double-wide mode
-       <STRONG>enter_draft_quality</STRONG>         <STRONG>sdrfq</STRONG>    <STRONG>ZG</STRONG>   Enter draft-quality mode
-       <STRONG>enter_italics_mode</STRONG>          <STRONG>sitm</STRONG>     <STRONG>ZH</STRONG>   Enter italic mode
-       <STRONG>enter_leftward_mode</STRONG>         <STRONG>slm</STRONG>      <STRONG>ZI</STRONG>   Start leftward carriage
-                                                 motion
-       <STRONG>enter_micro_mode</STRONG>            <STRONG>smicm</STRONG>    <STRONG>ZJ</STRONG>   Start micro-motion mode
-       <STRONG>enter_near_letter_quality</STRONG>   <STRONG>snlq</STRONG>     <STRONG>ZK</STRONG>   Enter NLQ mode
-       <STRONG>enter_normal_quality</STRONG>        <STRONG>snrmq</STRONG>    <STRONG>ZL</STRONG>   Enter normal-quality mode
-       <STRONG>enter_shadow_mode</STRONG>           <STRONG>sshm</STRONG>     <STRONG>ZM</STRONG>   Enter shadow-print mode
-
-       <STRONG>enter_subscript_mode</STRONG>        <STRONG>ssubm</STRONG>    <STRONG>ZN</STRONG>   Enter subscript mode
-       <STRONG>enter_superscript_mode</STRONG>      <STRONG>ssupm</STRONG>    <STRONG>ZO</STRONG>   Enter superscript mode
-       <STRONG>enter_upward_mode</STRONG>           <STRONG>sum</STRONG>      <STRONG>ZP</STRONG>   Start upward carriage motion
-       <STRONG>exit_doublewide_mode</STRONG>        <STRONG>rwidm</STRONG>    <STRONG>ZQ</STRONG>   End double-wide mode
-       <STRONG>exit_italics_mode</STRONG>           <STRONG>ritm</STRONG>     <STRONG>ZR</STRONG>   End italic mode
-       <STRONG>exit_leftward_mode</STRONG>          <STRONG>rlm</STRONG>      <STRONG>ZS</STRONG>   End left-motion mode
-       <STRONG>exit_micro_mode</STRONG>             <STRONG>rmicm</STRONG>    <STRONG>ZT</STRONG>   End micro-motion mode
-       <STRONG>exit_shadow_mode</STRONG>            <STRONG>rshm</STRONG>     <STRONG>ZU</STRONG>   End shadow-print mode
-       <STRONG>exit_subscript_mode</STRONG>         <STRONG>rsubm</STRONG>    <STRONG>ZV</STRONG>   End subscript mode
-       <STRONG>exit_superscript_mode</STRONG>       <STRONG>rsupm</STRONG>    <STRONG>ZW</STRONG>   End superscript mode
-       <STRONG>exit_upward_mode</STRONG>            <STRONG>rum</STRONG>      <STRONG>ZX</STRONG>   End reverse character motion
-       <STRONG>micro_column_address</STRONG>        <STRONG>mhpa</STRONG>     <STRONG>ZY</STRONG>   Like column_address in micro
-                                                 mode
-       <STRONG>micro_down</STRONG>                  <STRONG>mcud1</STRONG>    <STRONG>ZZ</STRONG>   Like cursor_down in micro
-                                                 mode
-       <STRONG>micro_left</STRONG>                  <STRONG>mcub1</STRONG>    <STRONG>Za</STRONG>   Like cursor_left in micro
-                                                 mode
-       <STRONG>micro_right</STRONG>                 <STRONG>mcuf1</STRONG>    <STRONG>Zb</STRONG>   Like cursor_right in micro
-                                                 mode
-       <STRONG>micro_row_address</STRONG>           <STRONG>mvpa</STRONG>     <STRONG>Zc</STRONG>   Like row_address #1 in micro
-                                                 mode
-       <STRONG>micro_up</STRONG>                    <STRONG>mcuu1</STRONG>    <STRONG>Zd</STRONG>   Like cursor_up in micro mode
-       <STRONG>order_of_pins</STRONG>               <STRONG>porder</STRONG>   <STRONG>Ze</STRONG>   Match software bits to print-
-                                                 head pins
-       <STRONG>parm_down_micro</STRONG>             <STRONG>mcud</STRONG>     <STRONG>Zf</STRONG>   Like parm_down_cursor in
-                                                 micro mode
-       <STRONG>parm_left_micro</STRONG>             <STRONG>mcub</STRONG>     <STRONG>Zg</STRONG>   Like parm_left_cursor in
-                                                 micro mode
-       <STRONG>parm_right_micro</STRONG>            <STRONG>mcuf</STRONG>     <STRONG>Zh</STRONG>   Like parm_right_cursor in
-                                                 micro mode
-       <STRONG>parm_up_micro</STRONG>               <STRONG>mcuu</STRONG>     <STRONG>Zi</STRONG>   Like parm_up_cursor in micro
-                                                 mode
-       <STRONG>select_char_set</STRONG>             <STRONG>scs</STRONG>      <STRONG>Zj</STRONG>   Select character set, #1
-       <STRONG>set_bottom_margin</STRONG>           <STRONG>smgb</STRONG>     <STRONG>Zk</STRONG>   Set bottom margin at current
-                                                 line
-       <STRONG>set_bottom_margin_parm</STRONG>      <STRONG>smgbp</STRONG>    <STRONG>Zl</STRONG>   Set bottom margin at line #1
-                                                 or (if smgtp is not given) #2
-                                                 lines from bottom
-       <STRONG>set_left_margin_parm</STRONG>        <STRONG>smglp</STRONG>    <STRONG>Zm</STRONG>   Set left (right) margin at
-                                                 column #1
-       <STRONG>set_right_margin_parm</STRONG>       <STRONG>smgrp</STRONG>    <STRONG>Zn</STRONG>   Set right margin at column #1
-       <STRONG>set_top_margin</STRONG>              <STRONG>smgt</STRONG>     <STRONG>Zo</STRONG>   Set top margin at current
-                                                 line
-       <STRONG>set_top_margin_parm</STRONG>         <STRONG>smgtp</STRONG>    <STRONG>Zp</STRONG>   Set top (bottom) margin at
-                                                 row #1
-       <STRONG>start_bit_image</STRONG>             <STRONG>sbim</STRONG>     <STRONG>Zq</STRONG>   Start printing bit image
-                                                 graphics
-       <STRONG>start_char_set_def</STRONG>          <STRONG>scsd</STRONG>     <STRONG>Zr</STRONG>   Start character set
-                                                 definition #1, with #2
-                                                 characters in the set
-       <STRONG>stop_bit_image</STRONG>              <STRONG>rbim</STRONG>     <STRONG>Zs</STRONG>   Stop printing bit image
-                                                 graphics
-       <STRONG>stop_char_set_def</STRONG>           <STRONG>rcsd</STRONG>     <STRONG>Zt</STRONG>   End definition of character
-                                                 set #1
-       <STRONG>subscript_characters</STRONG>        <STRONG>subcs</STRONG>    <STRONG>Zu</STRONG>   List of subscriptable
-                                                 characters
-       <STRONG>superscript_characters</STRONG>      <STRONG>supcs</STRONG>    <STRONG>Zv</STRONG>   List of superscriptable
-                                                 characters
-       <STRONG>these_cause_cr</STRONG>              <STRONG>docr</STRONG>     <STRONG>Zw</STRONG>   Printing any of these
-                                                 characters causes CR
-       <STRONG>zero_motion</STRONG>                 <STRONG>zerom</STRONG>    <STRONG>Zx</STRONG>   No motion for subsequent
-                                                 character
-
-       The following string  capabilities  are  present  in  the  SVr4.0  term
+       <STRONG>back_tab</STRONG>                   <STRONG>cbt</STRONG>       <STRONG>bt</STRONG>  back tab (P)
+       <STRONG>bell</STRONG>                       <STRONG>bel</STRONG>       <STRONG>bl</STRONG>  audible signal (bell) (P)
+       <STRONG>carriage_return</STRONG>            <STRONG>cr</STRONG>        <STRONG>cr</STRONG>  carriage return (P*) (P*)
+       <STRONG>change_scroll_region</STRONG>       <STRONG>csr</STRONG>       <STRONG>cs</STRONG>  change region to line #1 to
+                                                line #2 (P)
+       <STRONG>clear_all_tabs</STRONG>             <STRONG>tbc</STRONG>       <STRONG>ct</STRONG>  clear all tab stops (P)
+       <STRONG>clear_screen</STRONG>               <STRONG>clear</STRONG>     <STRONG>cl</STRONG>  clear screen and home cursor
+                                                (P*)
+       <STRONG>clr_eol</STRONG>                    <STRONG>el</STRONG>        <STRONG>ce</STRONG>  clear to end of line (P)
+       <STRONG>clr_eos</STRONG>                    <STRONG>ed</STRONG>        <STRONG>cd</STRONG>  clear to end of screen (P*)
+       <STRONG>column_address</STRONG>             <STRONG>hpa</STRONG>       <STRONG>ch</STRONG>  horizontal position #1,
+                                                absolute (P)
+       <STRONG>command_character</STRONG>          <STRONG>cmdch</STRONG>     <STRONG>CC</STRONG>  terminal settable cmd
+                                                character in prototype !?
+       <STRONG>cursor_address</STRONG>             <STRONG>cup</STRONG>       <STRONG>cm</STRONG>  move to row #1 columns #2
+       <STRONG>cursor_down</STRONG>                <STRONG>cud1</STRONG>      <STRONG>do</STRONG>  down one line
+       <STRONG>cursor_home</STRONG>                <STRONG>home</STRONG>      <STRONG>ho</STRONG>  home cursor (if no cup)
+       <STRONG>cursor_invisible</STRONG>           <STRONG>civis</STRONG>     <STRONG>vi</STRONG>  make cursor invisible
+       <STRONG>cursor_left</STRONG>                <STRONG>cub1</STRONG>      <STRONG>le</STRONG>  move left one space
+       <STRONG>cursor_mem_address</STRONG>         <STRONG>mrcup</STRONG>     <STRONG>CM</STRONG>  memory relative cursor
+                                                addressing, move to row #1
+                                                columns #2
+       <STRONG>cursor_normal</STRONG>              <STRONG>cnorm</STRONG>     <STRONG>ve</STRONG>  make cursor appear normal
+                                                (undo civis/cvvis)
+       <STRONG>cursor_right</STRONG>               <STRONG>cuf1</STRONG>      <STRONG>nd</STRONG>  non-destructive space (move
+                                                right one space)
+       <STRONG>cursor_to_ll</STRONG>               <STRONG>ll</STRONG>        <STRONG>ll</STRONG>  last line, first column (if no
+                                                cup)
+       <STRONG>cursor_up</STRONG>                  <STRONG>cuu1</STRONG>      <STRONG>up</STRONG>  up one line
+       <STRONG>cursor_visible</STRONG>             <STRONG>cvvis</STRONG>     <STRONG>vs</STRONG>  make cursor very visible
+       <STRONG>delete_character</STRONG>           <STRONG>dch1</STRONG>      <STRONG>dc</STRONG>  delete character (P*)
+       <STRONG>delete_line</STRONG>                <STRONG>dl1</STRONG>       <STRONG>dl</STRONG>  delete line (P*)
+       <STRONG>dis_status_line</STRONG>            <STRONG>dsl</STRONG>       <STRONG>ds</STRONG>  disable status line
+       <STRONG>down_half_line</STRONG>             <STRONG>hd</STRONG>        <STRONG>hd</STRONG>  half a line down
+       <STRONG>enter_alt_charset_mode</STRONG>     <STRONG>smacs</STRONG>     <STRONG>as</STRONG>  start alternate character set
+                                                (P)
+       <STRONG>enter_blink_mode</STRONG>           <STRONG>blink</STRONG>     <STRONG>mb</STRONG>  turn on blinking
+       <STRONG>enter_bold_mode</STRONG>            <STRONG>bold</STRONG>      <STRONG>md</STRONG>  turn on bold (extra bright)
+                                                mode
+       <STRONG>enter_ca_mode</STRONG>              <STRONG>smcup</STRONG>     <STRONG>ti</STRONG>  string to start programs using
+                                                cup
+       <STRONG>enter_delete_mode</STRONG>          <STRONG>smdc</STRONG>      <STRONG>dm</STRONG>  enter delete mode
+       <STRONG>enter_dim_mode</STRONG>             <STRONG>dim</STRONG>       <STRONG>mh</STRONG>  turn on half-bright mode
+       <STRONG>enter_insert_mode</STRONG>          <STRONG>smir</STRONG>      <STRONG>im</STRONG>  enter insert mode
+       <STRONG>enter_secure_mode</STRONG>          <STRONG>invis</STRONG>     <STRONG>mk</STRONG>  turn on blank mode (characters
+                                                invisible)
+       <STRONG>enter_protected_mode</STRONG>       <STRONG>prot</STRONG>      <STRONG>mp</STRONG>  turn on protected mode
+       <STRONG>enter_reverse_mode</STRONG>         <STRONG>rev</STRONG>       <STRONG>mr</STRONG>  turn on reverse video mode
+       <STRONG>enter_standout_mode</STRONG>        <STRONG>smso</STRONG>      <STRONG>so</STRONG>  begin standout mode
+       <STRONG>enter_underline_mode</STRONG>       <STRONG>smul</STRONG>      <STRONG>us</STRONG>  begin underline mode
+       <STRONG>erase_chars</STRONG>                <STRONG>ech</STRONG>       <STRONG>ec</STRONG>  erase #1 characters (P)
+       <STRONG>exit_alt_charset_mode</STRONG>      <STRONG>rmacs</STRONG>     <STRONG>ae</STRONG>  end alternate character set
+                                                (P)
+       <STRONG>exit_attribute_mode</STRONG>        <STRONG>sgr0</STRONG>      <STRONG>me</STRONG>  turn off all attributes
+       <STRONG>exit_ca_mode</STRONG>               <STRONG>rmcup</STRONG>     <STRONG>te</STRONG>  strings to end programs using
+                                                cup
+       <STRONG>exit_delete_mode</STRONG>           <STRONG>rmdc</STRONG>      <STRONG>ed</STRONG>  end delete mode
+       <STRONG>exit_insert_mode</STRONG>           <STRONG>rmir</STRONG>      <STRONG>ei</STRONG>  exit insert mode
+
+       <STRONG>exit_standout_mode</STRONG>         <STRONG>rmso</STRONG>      <STRONG>se</STRONG>  exit standout mode
+       <STRONG>exit_underline_mode</STRONG>        <STRONG>rmul</STRONG>      <STRONG>ue</STRONG>  exit underline mode
+       <STRONG>flash_screen</STRONG>               <STRONG>flash</STRONG>     <STRONG>vb</STRONG>  visible bell (may not move
+                                                cursor)
+       <STRONG>form_feed</STRONG>                  <STRONG>ff</STRONG>        <STRONG>ff</STRONG>  hardcopy terminal page eject
+                                                (P*)
+       <STRONG>from_status_line</STRONG>           <STRONG>fsl</STRONG>       <STRONG>fs</STRONG>  return from status line
+       <STRONG>init_1string</STRONG>               <STRONG>is1</STRONG>       <STRONG>i1</STRONG>  initialization string
+       <STRONG>init_2string</STRONG>               <STRONG>is2</STRONG>       <STRONG>is</STRONG>  initialization string
+       <STRONG>init_3string</STRONG>               <STRONG>is3</STRONG>       <STRONG>i3</STRONG>  initialization string
+       <STRONG>init_file</STRONG>                  <STRONG>if</STRONG>        <STRONG>if</STRONG>  name of initialization file
+       <STRONG>insert_character</STRONG>           <STRONG>ich1</STRONG>      <STRONG>ic</STRONG>  insert character (P)
+       <STRONG>insert_line</STRONG>                <STRONG>il1</STRONG>       <STRONG>al</STRONG>  insert line (P*)
+       <STRONG>insert_padding</STRONG>             <STRONG>ip</STRONG>        <STRONG>ip</STRONG>  insert padding after inserted
+                                                character
+       <STRONG>key_backspace</STRONG>              <STRONG>kbs</STRONG>       <STRONG>kb</STRONG>  backspace key
+       <STRONG>key_catab</STRONG>                  <STRONG>ktbc</STRONG>      <STRONG>ka</STRONG>  clear-all-tabs key
+       <STRONG>key_clear</STRONG>                  <STRONG>kclr</STRONG>      <STRONG>kC</STRONG>  clear-screen or erase key
+       <STRONG>key_ctab</STRONG>                   <STRONG>kctab</STRONG>     <STRONG>kt</STRONG>  clear-tab key
+       <STRONG>key_dc</STRONG>                     <STRONG>kdch1</STRONG>     <STRONG>kD</STRONG>  delete-character key
+       <STRONG>key_dl</STRONG>                     <STRONG>kdl1</STRONG>      <STRONG>kL</STRONG>  delete-line key
+       <STRONG>key_down</STRONG>                   <STRONG>kcud1</STRONG>     <STRONG>kd</STRONG>  down-arrow key
+       <STRONG>key_eic</STRONG>                    <STRONG>krmir</STRONG>     <STRONG>kM</STRONG>  sent by rmir or smir in insert
+                                                mode
+       <STRONG>key_eol</STRONG>                    <STRONG>kel</STRONG>       <STRONG>kE</STRONG>  clear-to-end-of-line key
+       <STRONG>key_eos</STRONG>                    <STRONG>ked</STRONG>       <STRONG>kS</STRONG>  clear-to-end-of-screen key
+       <STRONG>key_f0</STRONG>                     <STRONG>kf0</STRONG>       <STRONG>k0</STRONG>  F0 function key
+       <STRONG>key_f1</STRONG>                     <STRONG>kf1</STRONG>       <STRONG>k1</STRONG>  F1 function key
+       <STRONG>key_f10</STRONG>                    <STRONG>kf10</STRONG>      <STRONG>k;</STRONG>  F10 function key
+       <STRONG>key_f2</STRONG>                     <STRONG>kf2</STRONG>       <STRONG>k2</STRONG>  F2 function key
+       <STRONG>key_f3</STRONG>                     <STRONG>kf3</STRONG>       <STRONG>k3</STRONG>  F3 function key
+       <STRONG>key_f4</STRONG>                     <STRONG>kf4</STRONG>       <STRONG>k4</STRONG>  F4 function key
+       <STRONG>key_f5</STRONG>                     <STRONG>kf5</STRONG>       <STRONG>k5</STRONG>  F5 function key
+       <STRONG>key_f6</STRONG>                     <STRONG>kf6</STRONG>       <STRONG>k6</STRONG>  F6 function key
+       <STRONG>key_f7</STRONG>                     <STRONG>kf7</STRONG>       <STRONG>k7</STRONG>  F7 function key
+       <STRONG>key_f8</STRONG>                     <STRONG>kf8</STRONG>       <STRONG>k8</STRONG>  F8 function key
+       <STRONG>key_f9</STRONG>                     <STRONG>kf9</STRONG>       <STRONG>k9</STRONG>  F9 function key
+       <STRONG>key_home</STRONG>                   <STRONG>khome</STRONG>     <STRONG>kh</STRONG>  home key
+       <STRONG>key_ic</STRONG>                     <STRONG>kich1</STRONG>     <STRONG>kI</STRONG>  insert-character key
+       <STRONG>key_il</STRONG>                     <STRONG>kil1</STRONG>      <STRONG>kA</STRONG>  insert-line key
+       <STRONG>key_left</STRONG>                   <STRONG>kcub1</STRONG>     <STRONG>kl</STRONG>  left-arrow key
+       <STRONG>key_ll</STRONG>                     <STRONG>kll</STRONG>       <STRONG>kH</STRONG>  lower-left key (home down)
+       <STRONG>key_npage</STRONG>                  <STRONG>knp</STRONG>       <STRONG>kN</STRONG>  next-page key
+       <STRONG>key_ppage</STRONG>                  <STRONG>kpp</STRONG>       <STRONG>kP</STRONG>  previous-page key
+       <STRONG>key_right</STRONG>                  <STRONG>kcuf1</STRONG>     <STRONG>kr</STRONG>  right-arrow key
+       <STRONG>key_sf</STRONG>                     <STRONG>kind</STRONG>      <STRONG>kF</STRONG>  scroll-forward key
+       <STRONG>key_sr</STRONG>                     <STRONG>kri</STRONG>       <STRONG>kR</STRONG>  scroll-backward key
+       <STRONG>key_stab</STRONG>                   <STRONG>khts</STRONG>      <STRONG>kT</STRONG>  set-tab key
+       <STRONG>key_up</STRONG>                     <STRONG>kcuu1</STRONG>     <STRONG>ku</STRONG>  up-arrow key
+       <STRONG>keypad_local</STRONG>               <STRONG>rmkx</STRONG>      <STRONG>ke</STRONG>  leave keyboard transmit mode
+       <STRONG>keypad_xmit</STRONG>                <STRONG>smkx</STRONG>      <STRONG>ks</STRONG>  enter keyboard transmit mode
+       <STRONG>lab_f0</STRONG>                     <STRONG>lf0</STRONG>       <STRONG>l0</STRONG>  label on function key f0 if
+                                                not f0
+       <STRONG>lab_f1</STRONG>                     <STRONG>lf1</STRONG>       <STRONG>l1</STRONG>  label on function key f1 if
+                                                not f1
+       <STRONG>lab_f10</STRONG>                    <STRONG>lf10</STRONG>      <STRONG>la</STRONG>  label on function key f10 if
+                                                not f10
+       <STRONG>lab_f2</STRONG>                     <STRONG>lf2</STRONG>       <STRONG>l2</STRONG>  label on function key f2 if
+                                                not f2
+       <STRONG>lab_f3</STRONG>                     <STRONG>lf3</STRONG>       <STRONG>l3</STRONG>  label on function key f3 if
+                                                not f3
+       <STRONG>lab_f4</STRONG>                     <STRONG>lf4</STRONG>       <STRONG>l4</STRONG>  label on function key f4 if
+                                                not f4
+       <STRONG>lab_f5</STRONG>                     <STRONG>lf5</STRONG>       <STRONG>l5</STRONG>  label on function key f5 if
+                                                not f5
+
+       <STRONG>lab_f6</STRONG>                     <STRONG>lf6</STRONG>       <STRONG>l6</STRONG>  label on function key f6 if
+                                                not f6
+       <STRONG>lab_f7</STRONG>                     <STRONG>lf7</STRONG>       <STRONG>l7</STRONG>  label on function key f7 if
+                                                not f7
+       <STRONG>lab_f8</STRONG>                     <STRONG>lf8</STRONG>       <STRONG>l8</STRONG>  label on function key f8 if
+                                                not f8
+       <STRONG>lab_f9</STRONG>                     <STRONG>lf9</STRONG>       <STRONG>l9</STRONG>  label on function key f9 if
+                                                not f9
+       <STRONG>meta_off</STRONG>                   <STRONG>rmm</STRONG>       <STRONG>mo</STRONG>  turn off meta mode
+       <STRONG>meta_on</STRONG>                    <STRONG>smm</STRONG>       <STRONG>mm</STRONG>  turn on meta mode (8th-bit on)
+       <STRONG>newline</STRONG>                    <STRONG>nel</STRONG>       <STRONG>nw</STRONG>  newline (behave like cr
+                                                followed by lf)
+       <STRONG>pad_char</STRONG>                   <STRONG>pad</STRONG>       <STRONG>pc</STRONG>  padding char (instead of null)
+       <STRONG>parm_dch</STRONG>                   <STRONG>dch</STRONG>       <STRONG>DC</STRONG>  delete #1 characters (P*)
+       <STRONG>parm_delete_line</STRONG>           <STRONG>dl</STRONG>        <STRONG>DL</STRONG>  delete #1 lines (P*)
+       <STRONG>parm_down_cursor</STRONG>           <STRONG>cud</STRONG>       <STRONG>DO</STRONG>  down #1 lines (P*)
+       <STRONG>parm_ich</STRONG>                   <STRONG>ich</STRONG>       <STRONG>IC</STRONG>  insert #1 characters (P*)
+       <STRONG>parm_index</STRONG>                 <STRONG>indn</STRONG>      <STRONG>SF</STRONG>  scroll forward #1 lines (P)
+       <STRONG>parm_insert_line</STRONG>           <STRONG>il</STRONG>        <STRONG>AL</STRONG>  insert #1 lines (P*)
+       <STRONG>parm_left_cursor</STRONG>           <STRONG>cub</STRONG>       <STRONG>LE</STRONG>  move #1 characters to the left
+                                                (P)
+       <STRONG>parm_right_cursor</STRONG>          <STRONG>cuf</STRONG>       <STRONG>RI</STRONG>  move #1 characters to the
+                                                right (P*)
+       <STRONG>parm_rindex</STRONG>                <STRONG>rin</STRONG>       <STRONG>SR</STRONG>  scroll back #1 lines (P)
+       <STRONG>parm_up_cursor</STRONG>             <STRONG>cuu</STRONG>       <STRONG>UP</STRONG>  up #1 lines (P*)
+       <STRONG>pkey_key</STRONG>                   <STRONG>pfkey</STRONG>     <STRONG>pk</STRONG>  program function key #1 to
+                                                type string #2
+       <STRONG>pkey_local</STRONG>                 <STRONG>pfloc</STRONG>     <STRONG>pl</STRONG>  program function key #1 to
+                                                execute string #2
+       <STRONG>pkey_xmit</STRONG>                  <STRONG>pfx</STRONG>       <STRONG>px</STRONG>  program function key #1 to
+                                                transmit string #2
+       <STRONG>print_screen</STRONG>               <STRONG>mc0</STRONG>       <STRONG>ps</STRONG>  print contents of screen
+       <STRONG>prtr_off</STRONG>                   <STRONG>mc4</STRONG>       <STRONG>pf</STRONG>  turn off printer
+       <STRONG>prtr_on</STRONG>                    <STRONG>mc5</STRONG>       <STRONG>po</STRONG>  turn on printer
+       <STRONG>repeat_char</STRONG>                <STRONG>rep</STRONG>       <STRONG>rp</STRONG>  repeat char #1 #2 times (P*)
+       <STRONG>reset_1string</STRONG>              <STRONG>rs1</STRONG>       <STRONG>r1</STRONG>  reset string
+       <STRONG>reset_2string</STRONG>              <STRONG>rs2</STRONG>       <STRONG>r2</STRONG>  reset string
+       <STRONG>reset_3string</STRONG>              <STRONG>rs3</STRONG>       <STRONG>r3</STRONG>  reset string
+       <STRONG>reset_file</STRONG>                 <STRONG>rf</STRONG>        <STRONG>rf</STRONG>  name of reset file
+       <STRONG>restore_cursor</STRONG>             <STRONG>rc</STRONG>        <STRONG>rc</STRONG>  restore cursor to position of
+                                                last save_cursor
+       <STRONG>row_address</STRONG>                <STRONG>vpa</STRONG>       <STRONG>cv</STRONG>  vertical position #1 absolute
+                                                (P)
+       <STRONG>save_cursor</STRONG>                <STRONG>sc</STRONG>        <STRONG>sc</STRONG>  save current cursor position
+                                                (P)
+       <STRONG>scroll_forward</STRONG>             <STRONG>ind</STRONG>       <STRONG>sf</STRONG>  scroll text up (P)
+       <STRONG>scroll_reverse</STRONG>             <STRONG>ri</STRONG>        <STRONG>sr</STRONG>  scroll text down (P)
+       <STRONG>set_attributes</STRONG>             <STRONG>sgr</STRONG>       <STRONG>sa</STRONG>  define video attributes #1-#9
+                                                (PG9)
+       <STRONG>set_tab</STRONG>                    <STRONG>hts</STRONG>       <STRONG>st</STRONG>  set a tab in every row,
+                                                current columns
+       <STRONG>set_window</STRONG>                 <STRONG>wind</STRONG>      <STRONG>wi</STRONG>  current window is lines #1-#2
+                                                cols #3-#4
+       <STRONG>tab</STRONG>                        <STRONG>ht</STRONG>        <STRONG>ta</STRONG>  tab to next 8-space hardware
+                                                tab stop
+       <STRONG>to_status_line</STRONG>             <STRONG>tsl</STRONG>       <STRONG>ts</STRONG>  move to status line, column #1
+       <STRONG>underline_char</STRONG>             <STRONG>uc</STRONG>        <STRONG>uc</STRONG>  underline char and move past
+                                                it
+       <STRONG>up_half_line</STRONG>               <STRONG>hu</STRONG>        <STRONG>hu</STRONG>  half a line up
+       <STRONG>init_prog</STRONG>                  <STRONG>iprog</STRONG>     <STRONG>iP</STRONG>  path name of program for
+                                                initialization
+       <STRONG>key_a1</STRONG>                     <STRONG>ka1</STRONG>       <STRONG>K1</STRONG>  upper left of keypad
+       <STRONG>key_a3</STRONG>                     <STRONG>ka3</STRONG>       <STRONG>K3</STRONG>  upper right of keypad
+       <STRONG>key_b2</STRONG>                     <STRONG>kb2</STRONG>       <STRONG>K2</STRONG>  center of keypad
+       <STRONG>key_c1</STRONG>                     <STRONG>kc1</STRONG>       <STRONG>K4</STRONG>  lower left of keypad
+
+       <STRONG>key_c3</STRONG>                     <STRONG>kc3</STRONG>       <STRONG>K5</STRONG>  lower right of keypad
+       <STRONG>prtr_non</STRONG>                   <STRONG>mc5p</STRONG>      <STRONG>pO</STRONG>  turn on printer for #1 bytes
+       <STRONG>char_padding</STRONG>               <STRONG>rmp</STRONG>       <STRONG>rP</STRONG>  like ip but when in insert
+                                                mode
+       <STRONG>acs_chars</STRONG>                  <STRONG>acsc</STRONG>      <STRONG>ac</STRONG>  graphics charset pairs, based
+                                                on vt100
+       <STRONG>plab_norm</STRONG>                  <STRONG>pln</STRONG>       <STRONG>pn</STRONG>  program label #1 to show
+                                                string #2
+       <STRONG>key_btab</STRONG>                   <STRONG>kcbt</STRONG>      <STRONG>kB</STRONG>  back-tab key
+       <STRONG>enter_xon_mode</STRONG>             <STRONG>smxon</STRONG>     <STRONG>SX</STRONG>  turn on xon/xoff handshaking
+       <STRONG>exit_xon_mode</STRONG>              <STRONG>rmxon</STRONG>     <STRONG>RX</STRONG>  turn off xon/xoff handshaking
+       <STRONG>enter_am_mode</STRONG>              <STRONG>smam</STRONG>      <STRONG>SA</STRONG>  turn on automatic margins
+       <STRONG>exit_am_mode</STRONG>               <STRONG>rmam</STRONG>      <STRONG>RA</STRONG>  turn off automatic margins
+       <STRONG>xon_character</STRONG>              <STRONG>xonc</STRONG>      <STRONG>XN</STRONG>  XON character
+       <STRONG>xoff_character</STRONG>             <STRONG>xoffc</STRONG>     <STRONG>XF</STRONG>  XOFF character
+       <STRONG>ena_acs</STRONG>                    <STRONG>enacs</STRONG>     <STRONG>eA</STRONG>  enable alternate char set
+       <STRONG>label_on</STRONG>                   <STRONG>smln</STRONG>      <STRONG>LO</STRONG>  turn on soft labels
+       <STRONG>label_off</STRONG>                  <STRONG>rmln</STRONG>      <STRONG>LF</STRONG>  turn off soft labels
+       <STRONG>key_beg</STRONG>                    <STRONG>kbeg</STRONG>      <STRONG>@1</STRONG>  begin key
+       <STRONG>key_cancel</STRONG>                 <STRONG>kcan</STRONG>      <STRONG>@2</STRONG>  cancel key
+       <STRONG>key_close</STRONG>                  <STRONG>kclo</STRONG>      <STRONG>@3</STRONG>  close key
+       <STRONG>key_command</STRONG>                <STRONG>kcmd</STRONG>      <STRONG>@4</STRONG>  command key
+       <STRONG>key_copy</STRONG>                   <STRONG>kcpy</STRONG>      <STRONG>@5</STRONG>  copy key
+       <STRONG>key_create</STRONG>                 <STRONG>kcrt</STRONG>      <STRONG>@6</STRONG>  create key
+       <STRONG>key_end</STRONG>                    <STRONG>kend</STRONG>      <STRONG>@7</STRONG>  end key
+       <STRONG>key_enter</STRONG>                  <STRONG>kent</STRONG>      <STRONG>@8</STRONG>  enter/send key
+       <STRONG>key_exit</STRONG>                   <STRONG>kext</STRONG>      <STRONG>@9</STRONG>  exit key
+       <STRONG>key_find</STRONG>                   <STRONG>kfnd</STRONG>      <STRONG>@0</STRONG>  find key
+       <STRONG>key_help</STRONG>                   <STRONG>khlp</STRONG>      <STRONG>%1</STRONG>  help key
+       <STRONG>key_mark</STRONG>                   <STRONG>kmrk</STRONG>      <STRONG>%2</STRONG>  mark key
+       <STRONG>key_message</STRONG>                <STRONG>kmsg</STRONG>      <STRONG>%3</STRONG>  message key
+       <STRONG>key_move</STRONG>                   <STRONG>kmov</STRONG>      <STRONG>%4</STRONG>  move key
+       <STRONG>key_next</STRONG>                   <STRONG>knxt</STRONG>      <STRONG>%5</STRONG>  next key
+       <STRONG>key_open</STRONG>                   <STRONG>kopn</STRONG>      <STRONG>%6</STRONG>  open key
+       <STRONG>key_options</STRONG>                <STRONG>kopt</STRONG>      <STRONG>%7</STRONG>  options key
+       <STRONG>key_previous</STRONG>               <STRONG>kprv</STRONG>      <STRONG>%8</STRONG>  previous key
+       <STRONG>key_print</STRONG>                  <STRONG>kprt</STRONG>      <STRONG>%9</STRONG>  print key
+       <STRONG>key_redo</STRONG>                   <STRONG>krdo</STRONG>      <STRONG>%0</STRONG>  redo key
+       <STRONG>key_reference</STRONG>              <STRONG>kref</STRONG>      <STRONG>&amp;1</STRONG>  reference key
+       <STRONG>key_refresh</STRONG>                <STRONG>krfr</STRONG>      <STRONG>&amp;2</STRONG>  refresh key
+       <STRONG>key_replace</STRONG>                <STRONG>krpl</STRONG>      <STRONG>&amp;3</STRONG>  replace key
+       <STRONG>key_restart</STRONG>                <STRONG>krst</STRONG>      <STRONG>&amp;4</STRONG>  restart key
+       <STRONG>key_resume</STRONG>                 <STRONG>kres</STRONG>      <STRONG>&amp;5</STRONG>  resume key
+       <STRONG>key_save</STRONG>                   <STRONG>ksav</STRONG>      <STRONG>&amp;6</STRONG>  save key
+       <STRONG>key_suspend</STRONG>                <STRONG>kspd</STRONG>      <STRONG>&amp;7</STRONG>  suspend key
+       <STRONG>key_undo</STRONG>                   <STRONG>kund</STRONG>      <STRONG>&amp;8</STRONG>  undo key
+       <STRONG>key_sbeg</STRONG>                   <STRONG>kBEG</STRONG>      <STRONG>&amp;9</STRONG>  shifted begin key
+       <STRONG>key_scancel</STRONG>                <STRONG>kCAN</STRONG>      <STRONG>&amp;0</STRONG>  shifted cancel key
+       <STRONG>key_scommand</STRONG>               <STRONG>kCMD</STRONG>      <STRONG>*1</STRONG>  shifted command key
+       <STRONG>key_scopy</STRONG>                  <STRONG>kCPY</STRONG>      <STRONG>*2</STRONG>  shifted copy key
+       <STRONG>key_screate</STRONG>                <STRONG>kCRT</STRONG>      <STRONG>*3</STRONG>  shifted create key
+       <STRONG>key_sdc</STRONG>                    <STRONG>kDC</STRONG>       <STRONG>*4</STRONG>  shifted delete-character key
+       <STRONG>key_sdl</STRONG>                    <STRONG>kDL</STRONG>       <STRONG>*5</STRONG>  shifted delete-line key
+       <STRONG>key_select</STRONG>                 <STRONG>kslt</STRONG>      <STRONG>*6</STRONG>  select key
+       <STRONG>key_send</STRONG>                   <STRONG>kEND</STRONG>      <STRONG>*7</STRONG>  shifted end key
+       <STRONG>key_seol</STRONG>                   <STRONG>kEOL</STRONG>      <STRONG>*8</STRONG>  shifted clear-to-end-of-line
+                                                key
+       <STRONG>key_sexit</STRONG>                  <STRONG>kEXT</STRONG>      <STRONG>*9</STRONG>  shifted exit key
+       <STRONG>key_sfind</STRONG>                  <STRONG>kFND</STRONG>      <STRONG>*0</STRONG>  shifted find key
+       <STRONG>key_shelp</STRONG>                  <STRONG>kHLP</STRONG>      <STRONG>#1</STRONG>  shifted help key
+       <STRONG>key_shome</STRONG>                  <STRONG>kHOM</STRONG>      <STRONG>#2</STRONG>  shifted home key
+       <STRONG>key_sic</STRONG>                    <STRONG>kIC</STRONG>       <STRONG>#3</STRONG>  shifted insert-character key
+       <STRONG>key_sleft</STRONG>                  <STRONG>kLFT</STRONG>      <STRONG>#4</STRONG>  shifted left-arrow key
+       <STRONG>key_smessage</STRONG>               <STRONG>kMSG</STRONG>      <STRONG>%a</STRONG>  shifted message key
+       <STRONG>key_smove</STRONG>                  <STRONG>kMOV</STRONG>      <STRONG>%b</STRONG>  shifted move key
+
+       <STRONG>key_snext</STRONG>                  <STRONG>kNXT</STRONG>      <STRONG>%c</STRONG>  shifted next key
+       <STRONG>key_soptions</STRONG>               <STRONG>kOPT</STRONG>      <STRONG>%d</STRONG>  shifted options key
+       <STRONG>key_sprevious</STRONG>              <STRONG>kPRV</STRONG>      <STRONG>%e</STRONG>  shifted previous key
+       <STRONG>key_sprint</STRONG>                 <STRONG>kPRT</STRONG>      <STRONG>%f</STRONG>  shifted print key
+       <STRONG>key_sredo</STRONG>                  <STRONG>kRDO</STRONG>      <STRONG>%g</STRONG>  shifted redo key
+       <STRONG>key_sreplace</STRONG>               <STRONG>kRPL</STRONG>      <STRONG>%h</STRONG>  shifted replace key
+       <STRONG>key_sright</STRONG>                 <STRONG>kRIT</STRONG>      <STRONG>%i</STRONG>  shifted right-arrow key
+       <STRONG>key_srsume</STRONG>                 <STRONG>kRES</STRONG>      <STRONG>%j</STRONG>  shifted resume key
+       <STRONG>key_ssave</STRONG>                  <STRONG>kSAV</STRONG>      <STRONG>!1</STRONG>  shifted save key
+       <STRONG>key_ssuspend</STRONG>               <STRONG>kSPD</STRONG>      <STRONG>!2</STRONG>  shifted suspend key
+       <STRONG>key_sundo</STRONG>                  <STRONG>kUND</STRONG>      <STRONG>!3</STRONG>  shifted undo key
+       <STRONG>req_for_input</STRONG>              <STRONG>rfi</STRONG>       <STRONG>RF</STRONG>  send next input char (for
+                                                ptys)
+       <STRONG>key_f11</STRONG>                    <STRONG>kf11</STRONG>      <STRONG>F1</STRONG>  F11 function key
+       <STRONG>key_f12</STRONG>                    <STRONG>kf12</STRONG>      <STRONG>F2</STRONG>  F12 function key
+       <STRONG>key_f13</STRONG>                    <STRONG>kf13</STRONG>      <STRONG>F3</STRONG>  F13 function key
+       <STRONG>key_f14</STRONG>                    <STRONG>kf14</STRONG>      <STRONG>F4</STRONG>  F14 function key
+       <STRONG>key_f15</STRONG>                    <STRONG>kf15</STRONG>      <STRONG>F5</STRONG>  F15 function key
+       <STRONG>key_f16</STRONG>                    <STRONG>kf16</STRONG>      <STRONG>F6</STRONG>  F16 function key
+       <STRONG>key_f17</STRONG>                    <STRONG>kf17</STRONG>      <STRONG>F7</STRONG>  F17 function key
+       <STRONG>key_f18</STRONG>                    <STRONG>kf18</STRONG>      <STRONG>F8</STRONG>  F18 function key
+       <STRONG>key_f19</STRONG>                    <STRONG>kf19</STRONG>      <STRONG>F9</STRONG>  F19 function key
+       <STRONG>key_f20</STRONG>                    <STRONG>kf20</STRONG>      <STRONG>FA</STRONG>  F20 function key
+       <STRONG>key_f21</STRONG>                    <STRONG>kf21</STRONG>      <STRONG>FB</STRONG>  F21 function key
+       <STRONG>key_f22</STRONG>                    <STRONG>kf22</STRONG>      <STRONG>FC</STRONG>  F22 function key
+       <STRONG>key_f23</STRONG>                    <STRONG>kf23</STRONG>      <STRONG>FD</STRONG>  F23 function key
+       <STRONG>key_f24</STRONG>                    <STRONG>kf24</STRONG>      <STRONG>FE</STRONG>  F24 function key
+       <STRONG>key_f25</STRONG>                    <STRONG>kf25</STRONG>      <STRONG>FF</STRONG>  F25 function key
+       <STRONG>key_f26</STRONG>                    <STRONG>kf26</STRONG>      <STRONG>FG</STRONG>  F26 function key
+       <STRONG>key_f27</STRONG>                    <STRONG>kf27</STRONG>      <STRONG>FH</STRONG>  F27 function key
+       <STRONG>key_f28</STRONG>                    <STRONG>kf28</STRONG>      <STRONG>FI</STRONG>  F28 function key
+       <STRONG>key_f29</STRONG>                    <STRONG>kf29</STRONG>      <STRONG>FJ</STRONG>  F29 function key
+       <STRONG>key_f30</STRONG>                    <STRONG>kf30</STRONG>      <STRONG>FK</STRONG>  F30 function key
+       <STRONG>key_f31</STRONG>                    <STRONG>kf31</STRONG>      <STRONG>FL</STRONG>  F31 function key
+       <STRONG>key_f32</STRONG>                    <STRONG>kf32</STRONG>      <STRONG>FM</STRONG>  F32 function key
+       <STRONG>key_f33</STRONG>                    <STRONG>kf33</STRONG>      <STRONG>FN</STRONG>  F33 function key
+       <STRONG>key_f34</STRONG>                    <STRONG>kf34</STRONG>      <STRONG>FO</STRONG>  F34 function key
+       <STRONG>key_f35</STRONG>                    <STRONG>kf35</STRONG>      <STRONG>FP</STRONG>  F35 function key
+       <STRONG>key_f36</STRONG>                    <STRONG>kf36</STRONG>      <STRONG>FQ</STRONG>  F36 function key
+       <STRONG>key_f37</STRONG>                    <STRONG>kf37</STRONG>      <STRONG>FR</STRONG>  F37 function key
+       <STRONG>key_f38</STRONG>                    <STRONG>kf38</STRONG>      <STRONG>FS</STRONG>  F38 function key
+       <STRONG>key_f39</STRONG>                    <STRONG>kf39</STRONG>      <STRONG>FT</STRONG>  F39 function key
+       <STRONG>key_f40</STRONG>                    <STRONG>kf40</STRONG>      <STRONG>FU</STRONG>  F40 function key
+       <STRONG>key_f41</STRONG>                    <STRONG>kf41</STRONG>      <STRONG>FV</STRONG>  F41 function key
+       <STRONG>key_f42</STRONG>                    <STRONG>kf42</STRONG>      <STRONG>FW</STRONG>  F42 function key
+       <STRONG>key_f43</STRONG>                    <STRONG>kf43</STRONG>      <STRONG>FX</STRONG>  F43 function key
+       <STRONG>key_f44</STRONG>                    <STRONG>kf44</STRONG>      <STRONG>FY</STRONG>  F44 function key
+       <STRONG>key_f45</STRONG>                    <STRONG>kf45</STRONG>      <STRONG>FZ</STRONG>  F45 function key
+       <STRONG>key_f46</STRONG>                    <STRONG>kf46</STRONG>      <STRONG>Fa</STRONG>  F46 function key
+       <STRONG>key_f47</STRONG>                    <STRONG>kf47</STRONG>      <STRONG>Fb</STRONG>  F47 function key
+       <STRONG>key_f48</STRONG>                    <STRONG>kf48</STRONG>      <STRONG>Fc</STRONG>  F48 function key
+       <STRONG>key_f49</STRONG>                    <STRONG>kf49</STRONG>      <STRONG>Fd</STRONG>  F49 function key
+       <STRONG>key_f50</STRONG>                    <STRONG>kf50</STRONG>      <STRONG>Fe</STRONG>  F50 function key
+       <STRONG>key_f51</STRONG>                    <STRONG>kf51</STRONG>      <STRONG>Ff</STRONG>  F51 function key
+       <STRONG>key_f52</STRONG>                    <STRONG>kf52</STRONG>      <STRONG>Fg</STRONG>  F52 function key
+       <STRONG>key_f53</STRONG>                    <STRONG>kf53</STRONG>      <STRONG>Fh</STRONG>  F53 function key
+       <STRONG>key_f54</STRONG>                    <STRONG>kf54</STRONG>      <STRONG>Fi</STRONG>  F54 function key
+       <STRONG>key_f55</STRONG>                    <STRONG>kf55</STRONG>      <STRONG>Fj</STRONG>  F55 function key
+       <STRONG>key_f56</STRONG>                    <STRONG>kf56</STRONG>      <STRONG>Fk</STRONG>  F56 function key
+       <STRONG>key_f57</STRONG>                    <STRONG>kf57</STRONG>      <STRONG>Fl</STRONG>  F57 function key
+       <STRONG>key_f58</STRONG>                    <STRONG>kf58</STRONG>      <STRONG>Fm</STRONG>  F58 function key
+       <STRONG>key_f59</STRONG>                    <STRONG>kf59</STRONG>      <STRONG>Fn</STRONG>  F59 function key
+       <STRONG>key_f60</STRONG>                    <STRONG>kf60</STRONG>      <STRONG>Fo</STRONG>  F60 function key
+       <STRONG>key_f61</STRONG>                    <STRONG>kf61</STRONG>      <STRONG>Fp</STRONG>  F61 function key
+       <STRONG>key_f62</STRONG>                    <STRONG>kf62</STRONG>      <STRONG>Fq</STRONG>  F62 function key
+
+       <STRONG>key_f63</STRONG>                    <STRONG>kf63</STRONG>      <STRONG>Fr</STRONG>  F63 function key
+       <STRONG>clr_bol</STRONG>                    <STRONG>el1</STRONG>       <STRONG>cb</STRONG>  Clear to beginning of line
+       <STRONG>clear_margins</STRONG>              <STRONG>mgc</STRONG>       <STRONG>MC</STRONG>  clear right and left soft
+                                                margins
+       <STRONG>set_left_margin</STRONG>            <STRONG>smgl</STRONG>      <STRONG>ML</STRONG>  set left soft margin at
+                                                current column.  (ML is not in
+                                                BSD termcap).
+       <STRONG>set_right_margin</STRONG>           <STRONG>smgr</STRONG>      <STRONG>MR</STRONG>  set right soft margin at
+                                                current column
+       <STRONG>label_format</STRONG>               <STRONG>fln</STRONG>       <STRONG>Lf</STRONG>  label format
+       <STRONG>set_clock</STRONG>                  <STRONG>sclk</STRONG>      <STRONG>SC</STRONG>  set clock, #1 hrs #2 mins #3
+                                                secs
+       <STRONG>display_clock</STRONG>              <STRONG>dclk</STRONG>      <STRONG>DK</STRONG>  display clock
+       <STRONG>remove_clock</STRONG>               <STRONG>rmclk</STRONG>     <STRONG>RC</STRONG>  remove clock
+       <STRONG>create_window</STRONG>              <STRONG>cwin</STRONG>      <STRONG>CW</STRONG>  define a window #1 from #2,#3
+                                                to #4,#5
+       <STRONG>goto_window</STRONG>                <STRONG>wingo</STRONG>     <STRONG>WG</STRONG>  go to window #1
+       <STRONG>hangup</STRONG>                     <STRONG>hup</STRONG>       <STRONG>HU</STRONG>  hang-up phone
+       <STRONG>dial_phone</STRONG>                 <STRONG>dial</STRONG>      <STRONG>DI</STRONG>  dial number #1
+       <STRONG>quick_dial</STRONG>                 <STRONG>qdial</STRONG>     <STRONG>QD</STRONG>  dial number #1 without
+                                                checking
+       <STRONG>tone</STRONG>                       <STRONG>tone</STRONG>      <STRONG>TO</STRONG>  select touch tone dialing
+       <STRONG>pulse</STRONG>                      <STRONG>pulse</STRONG>     <STRONG>PU</STRONG>  select pulse dialing
+       <STRONG>flash_hook</STRONG>                 <STRONG>hook</STRONG>      <STRONG>fh</STRONG>  flash switch hook
+       <STRONG>fixed_pause</STRONG>                <STRONG>pause</STRONG>     <STRONG>PA</STRONG>  pause for 2-3 seconds
+       <STRONG>wait_tone</STRONG>                  <STRONG>wait</STRONG>      <STRONG>WA</STRONG>  wait for dial-tone
+       <STRONG>user0</STRONG>                      <STRONG>u0</STRONG>        <STRONG>u0</STRONG>  User string #0
+       <STRONG>user1</STRONG>                      <STRONG>u1</STRONG>        <STRONG>u1</STRONG>  User string #1
+       <STRONG>user2</STRONG>                      <STRONG>u2</STRONG>        <STRONG>u2</STRONG>  User string #2
+       <STRONG>user3</STRONG>                      <STRONG>u3</STRONG>        <STRONG>u3</STRONG>  User string #3
+       <STRONG>user4</STRONG>                      <STRONG>u4</STRONG>        <STRONG>u4</STRONG>  User string #4
+       <STRONG>user5</STRONG>                      <STRONG>u5</STRONG>        <STRONG>u5</STRONG>  User string #5
+       <STRONG>user6</STRONG>                      <STRONG>u6</STRONG>        <STRONG>u6</STRONG>  User string #6
+       <STRONG>user7</STRONG>                      <STRONG>u7</STRONG>        <STRONG>u7</STRONG>  User string #7
+       <STRONG>user8</STRONG>                      <STRONG>u8</STRONG>        <STRONG>u8</STRONG>  User string #8
+       <STRONG>user9</STRONG>                      <STRONG>u9</STRONG>        <STRONG>u9</STRONG>  User string #9
+       <STRONG>orig_pair</STRONG>                  <STRONG>op</STRONG>        <STRONG>op</STRONG>  Set default pair to its
+                                                original value
+       <STRONG>orig_colors</STRONG>                <STRONG>oc</STRONG>        <STRONG>oc</STRONG>  Set all color pairs to the
+                                                original ones
+       <STRONG>initialize_color</STRONG>           <STRONG>initc</STRONG>     <STRONG>Ic</STRONG>  initialize color #1 to
+                                                (#2,#3,#4)
+       <STRONG>initialize_pair</STRONG>            <STRONG>initp</STRONG>     <STRONG>Ip</STRONG>  Initialize color pair #1 to
+                                                fg=(#2,#3,#4), bg=(#5,#6,#7)
+       <STRONG>set_color_pair</STRONG>             <STRONG>scp</STRONG>       <STRONG>sp</STRONG>  Set current color pair to #1
+       <STRONG>set_foreground</STRONG>             <STRONG>setf</STRONG>      <STRONG>Sf</STRONG>  Set foreground color #1
+       <STRONG>set_background</STRONG>             <STRONG>setb</STRONG>      <STRONG>Sb</STRONG>  Set background color #1
+       <STRONG>change_char_pitch</STRONG>          <STRONG>cpi</STRONG>       <STRONG>ZA</STRONG>  Change number of characters
+                                                per inch to #1
+       <STRONG>change_line_pitch</STRONG>          <STRONG>lpi</STRONG>       <STRONG>ZB</STRONG>  Change number of lines per
+                                                inch to #1
+       <STRONG>change_res_horz</STRONG>            <STRONG>chr</STRONG>       <STRONG>ZC</STRONG>  Change horizontal resolution
+                                                to #1
+       <STRONG>change_res_vert</STRONG>            <STRONG>cvr</STRONG>       <STRONG>ZD</STRONG>  Change vertical resolution to
+                                                #1
+       <STRONG>define_char</STRONG>                <STRONG>defc</STRONG>      <STRONG>ZE</STRONG>  Define a character #1, #2 dots
+                                                wide, descender #3
+       <STRONG>enter_doublewide_mode</STRONG>      <STRONG>swidm</STRONG>     <STRONG>ZF</STRONG>  Enter double-wide mode
+       <STRONG>enter_draft_quality</STRONG>        <STRONG>sdrfq</STRONG>     <STRONG>ZG</STRONG>  Enter draft-quality mode
+       <STRONG>enter_italics_mode</STRONG>         <STRONG>sitm</STRONG>      <STRONG>ZH</STRONG>  Enter italic mode
+       <STRONG>enter_leftward_mode</STRONG>        <STRONG>slm</STRONG>       <STRONG>ZI</STRONG>  Start leftward carriage motion
+       <STRONG>enter_micro_mode</STRONG>           <STRONG>smicm</STRONG>     <STRONG>ZJ</STRONG>  Start micro-motion mode
+       <STRONG>enter_near_letter_quality</STRONG>  <STRONG>snlq</STRONG>      <STRONG>ZK</STRONG>  Enter NLQ mode
+       <STRONG>enter_normal_quality</STRONG>       <STRONG>snrmq</STRONG>     <STRONG>ZL</STRONG>  Enter normal-quality mode
+       <STRONG>enter_shadow_mode</STRONG>          <STRONG>sshm</STRONG>      <STRONG>ZM</STRONG>  Enter shadow-print mode
+
+       <STRONG>enter_subscript_mode</STRONG>       <STRONG>ssubm</STRONG>     <STRONG>ZN</STRONG>  Enter subscript mode
+       <STRONG>enter_superscript_mode</STRONG>     <STRONG>ssupm</STRONG>     <STRONG>ZO</STRONG>  Enter superscript mode
+       <STRONG>enter_upward_mode</STRONG>          <STRONG>sum</STRONG>       <STRONG>ZP</STRONG>  Start upward carriage motion
+       <STRONG>exit_doublewide_mode</STRONG>       <STRONG>rwidm</STRONG>     <STRONG>ZQ</STRONG>  End double-wide mode
+       <STRONG>exit_italics_mode</STRONG>          <STRONG>ritm</STRONG>      <STRONG>ZR</STRONG>  End italic mode
+       <STRONG>exit_leftward_mode</STRONG>         <STRONG>rlm</STRONG>       <STRONG>ZS</STRONG>  End left-motion mode
+       <STRONG>exit_micro_mode</STRONG>            <STRONG>rmicm</STRONG>     <STRONG>ZT</STRONG>  End micro-motion mode
+       <STRONG>exit_shadow_mode</STRONG>           <STRONG>rshm</STRONG>      <STRONG>ZU</STRONG>  End shadow-print mode
+       <STRONG>exit_subscript_mode</STRONG>        <STRONG>rsubm</STRONG>     <STRONG>ZV</STRONG>  End subscript mode
+       <STRONG>exit_superscript_mode</STRONG>      <STRONG>rsupm</STRONG>     <STRONG>ZW</STRONG>  End superscript mode
+       <STRONG>exit_upward_mode</STRONG>           <STRONG>rum</STRONG>       <STRONG>ZX</STRONG>  End reverse character motion
+       <STRONG>micro_column_address</STRONG>       <STRONG>mhpa</STRONG>      <STRONG>ZY</STRONG>  Like column_address in micro
+                                                mode
+       <STRONG>micro_down</STRONG>                 <STRONG>mcud1</STRONG>     <STRONG>ZZ</STRONG>  Like cursor_down in micro mode
+       <STRONG>micro_left</STRONG>                 <STRONG>mcub1</STRONG>     <STRONG>Za</STRONG>  Like cursor_left in micro mode
+       <STRONG>micro_right</STRONG>                <STRONG>mcuf1</STRONG>     <STRONG>Zb</STRONG>  Like cursor_right in micro
+                                                mode
+       <STRONG>micro_row_address</STRONG>          <STRONG>mvpa</STRONG>      <STRONG>Zc</STRONG>  Like row_address #1 in micro
+                                                mode
+       <STRONG>micro_up</STRONG>                   <STRONG>mcuu1</STRONG>     <STRONG>Zd</STRONG>  Like cursor_up in micro mode
+       <STRONG>order_of_pins</STRONG>              <STRONG>porder</STRONG>    <STRONG>Ze</STRONG>  Match software bits to print-
+                                                head pins
+       <STRONG>parm_down_micro</STRONG>            <STRONG>mcud</STRONG>      <STRONG>Zf</STRONG>  Like parm_down_cursor in micro
+                                                mode
+       <STRONG>parm_left_micro</STRONG>            <STRONG>mcub</STRONG>      <STRONG>Zg</STRONG>  Like parm_left_cursor in micro
+                                                mode
+       <STRONG>parm_right_micro</STRONG>           <STRONG>mcuf</STRONG>      <STRONG>Zh</STRONG>  Like parm_right_cursor in
+                                                micro mode
+       <STRONG>parm_up_micro</STRONG>              <STRONG>mcuu</STRONG>      <STRONG>Zi</STRONG>  Like parm_up_cursor in micro
+                                                mode
+       <STRONG>select_char_set</STRONG>            <STRONG>scs</STRONG>       <STRONG>Zj</STRONG>  Select character set, #1
+       <STRONG>set_bottom_margin</STRONG>          <STRONG>smgb</STRONG>      <STRONG>Zk</STRONG>  Set bottom margin at current
+                                                line
+       <STRONG>set_bottom_margin_parm</STRONG>     <STRONG>smgbp</STRONG>     <STRONG>Zl</STRONG>  Set bottom margin at line #1
+                                                or (if smgtp is not given) #2
+                                                lines from bottom
+       <STRONG>set_left_margin_parm</STRONG>       <STRONG>smglp</STRONG>     <STRONG>Zm</STRONG>  Set left (right) margin at
+                                                column #1
+       <STRONG>set_right_margin_parm</STRONG>      <STRONG>smgrp</STRONG>     <STRONG>Zn</STRONG>  Set right margin at column #1
+       <STRONG>set_top_margin</STRONG>             <STRONG>smgt</STRONG>      <STRONG>Zo</STRONG>  Set top margin at current line
+       <STRONG>set_top_margin_parm</STRONG>        <STRONG>smgtp</STRONG>     <STRONG>Zp</STRONG>  Set top (bottom) margin at row
+                                                #1
+       <STRONG>start_bit_image</STRONG>            <STRONG>sbim</STRONG>      <STRONG>Zq</STRONG>  Start printing bit image
+                                                graphics
+       <STRONG>start_char_set_def</STRONG>         <STRONG>scsd</STRONG>      <STRONG>Zr</STRONG>  Start character set definition
+                                                #1, with #2 characters in the
+                                                set
+       <STRONG>stop_bit_image</STRONG>             <STRONG>rbim</STRONG>      <STRONG>Zs</STRONG>  Stop printing bit image
+                                                graphics
+       <STRONG>stop_char_set_def</STRONG>          <STRONG>rcsd</STRONG>      <STRONG>Zt</STRONG>  End definition of character
+                                                set #1
+       <STRONG>subscript_characters</STRONG>       <STRONG>subcs</STRONG>     <STRONG>Zu</STRONG>  List of subscriptable
+                                                characters
+       <STRONG>superscript_characters</STRONG>     <STRONG>supcs</STRONG>     <STRONG>Zv</STRONG>  List of superscriptable
+                                                characters
+       <STRONG>these_cause_cr</STRONG>             <STRONG>docr</STRONG>      <STRONG>Zw</STRONG>  Printing any of these
+                                                characters causes CR
+       <STRONG>zero_motion</STRONG>                <STRONG>zerom</STRONG>     <STRONG>Zx</STRONG>  No motion for subsequent
+                                                character
+
+       The  following  string  capabilities  are  present  in  the SVr4.0 term
        structure, but were originally not documented in the man page.
 
-                                       <STRONG>Code</STRONG>
-       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>      <STRONG>TI</STRONG>         <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+                                      <STRONG>Code</STRONG>
+
+
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>char_set_names</STRONG>              <STRONG>csnm</STRONG>       <STRONG>Zy</STRONG>   Produce #1'th item from
-                                                   list of character set names
-       <STRONG>key_mouse</STRONG>                   <STRONG>kmous</STRONG>      <STRONG>Km</STRONG>   Mouse event has occurred
-       <STRONG>mouse_info</STRONG>                  <STRONG>minfo</STRONG>      <STRONG>Mi</STRONG>   Mouse status information
-       <STRONG>req_mouse_pos</STRONG>               <STRONG>reqmp</STRONG>      <STRONG>RQ</STRONG>   Request mouse position
-       <STRONG>get_mouse</STRONG>                   <STRONG>getm</STRONG>       <STRONG>Gm</STRONG>   Curses should get button
-                                                   events, parameter #1 not
-                                                   documented.
-       <STRONG>set_a_foreground</STRONG>            <STRONG>setaf</STRONG>      <STRONG>AF</STRONG>   Set foreground color to #1,
-                                                   using ANSI escape
-       <STRONG>set_a_background</STRONG>            <STRONG>setab</STRONG>      <STRONG>AB</STRONG>   Set background color to #1,
-                                                   using ANSI escape
-       <STRONG>pkey_plab</STRONG>                   <STRONG>pfxl</STRONG>       <STRONG>xl</STRONG>   Program function key #1 to
-                                                   type string #2 and show
-                                                   string #3
-       <STRONG>device_type</STRONG>                 <STRONG>devt</STRONG>       <STRONG>dv</STRONG>   Indicate language, codeset
-                                                   support
-       <STRONG>code_set_init</STRONG>               <STRONG>csin</STRONG>       <STRONG>ci</STRONG>   Init sequence for multiple
-                                                   codesets
-       <STRONG>set0_des_seq</STRONG>                <STRONG>s0ds</STRONG>       <STRONG>s0</STRONG>   Shift to codeset 0 (EUC set
-                                                   0, ASCII)
-       <STRONG>set1_des_seq</STRONG>                <STRONG>s1ds</STRONG>       <STRONG>s1</STRONG>   Shift to codeset 1
-       <STRONG>set2_des_seq</STRONG>                <STRONG>s2ds</STRONG>       <STRONG>s2</STRONG>   Shift to codeset 2
-       <STRONG>set3_des_seq</STRONG>                <STRONG>s3ds</STRONG>       <STRONG>s3</STRONG>   Shift to codeset 3
-       <STRONG>set_lr_margin</STRONG>               <STRONG>smglr</STRONG>      <STRONG>ML</STRONG>   Set both left and right
-                                                   margins to #1, #2.  (ML is
-                                                   not in BSD termcap).
-       <STRONG>set_tb_margin</STRONG>               <STRONG>smgtb</STRONG>      <STRONG>MT</STRONG>   Sets both top and bottom
-                                                   margins to #1, #2
-       <STRONG>bit_image_repeat</STRONG>            <STRONG>birep</STRONG>      <STRONG>Xy</STRONG>   Repeat bit image cell #1 #2
-                                                   times
-       <STRONG>bit_image_newline</STRONG>           <STRONG>binel</STRONG>      <STRONG>Zz</STRONG>   Move to next row of the bit
-                                                   image
-       <STRONG>bit_image_carriage_return</STRONG>   <STRONG>bicr</STRONG>       <STRONG>Yv</STRONG>   Move to beginning of same
-                                                   row
-       <STRONG>color_names</STRONG>                 <STRONG>colornm</STRONG>    <STRONG>Yw</STRONG>   Give name for color #1
-       <STRONG>define_bit_image_region</STRONG>     <STRONG>defbi</STRONG>      <STRONG>Yx</STRONG>   Define rectangular bit
-                                                   image region
-       <STRONG>end_bit_image_region</STRONG>        <STRONG>endbi</STRONG>      <STRONG>Yy</STRONG>   End a bit-image region
-       <STRONG>set_color_band</STRONG>              <STRONG>setcolor</STRONG>   <STRONG>Yz</STRONG>   Change to ribbon color #1
-       <STRONG>set_page_length</STRONG>             <STRONG>slines</STRONG>     <STRONG>YZ</STRONG>   Set page length to #1 lines
-       <STRONG>display_pc_char</STRONG>             <STRONG>dispc</STRONG>      <STRONG>S1</STRONG>   Display PC character #1
-       <STRONG>enter_pc_charset_mode</STRONG>       <STRONG>smpch</STRONG>      <STRONG>S2</STRONG>   Enter PC character display
-                                                   mode
-       <STRONG>exit_pc_charset_mode</STRONG>        <STRONG>rmpch</STRONG>      <STRONG>S3</STRONG>   Exit PC character display
-                                                   mode
-       <STRONG>enter_scancode_mode</STRONG>         <STRONG>smsc</STRONG>       <STRONG>S4</STRONG>   Enter PC scancode mode
-       <STRONG>exit_scancode_mode</STRONG>          <STRONG>rmsc</STRONG>       <STRONG>S5</STRONG>   Exit PC scancode mode
-       <STRONG>pc_term_options</STRONG>             <STRONG>pctrm</STRONG>      <STRONG>S6</STRONG>   PC terminal options
-       <STRONG>scancode_escape</STRONG>             <STRONG>scesc</STRONG>      <STRONG>S7</STRONG>   Escape for scancode
-                                                   emulation
-       <STRONG>alt_scancode_esc</STRONG>            <STRONG>scesa</STRONG>      <STRONG>S8</STRONG>   Alternate escape for
-                                                   scancode emulation
+       <STRONG>char_set_names</STRONG>             <STRONG>csnm</STRONG>      <STRONG>Zy</STRONG>  Produce #1'th item from list
+                                                of character set names
+       <STRONG>key_mouse</STRONG>                  <STRONG>kmous</STRONG>     <STRONG>Km</STRONG>  Mouse event has occurred
+       <STRONG>mouse_info</STRONG>                 <STRONG>minfo</STRONG>     <STRONG>Mi</STRONG>  Mouse status information
+       <STRONG>req_mouse_pos</STRONG>              <STRONG>reqmp</STRONG>     <STRONG>RQ</STRONG>  Request mouse position
+       <STRONG>get_mouse</STRONG>                  <STRONG>getm</STRONG>      <STRONG>Gm</STRONG>  Curses should get button
+                                                events, parameter #1 not
+                                                documented.
+       <STRONG>set_a_foreground</STRONG>           <STRONG>setaf</STRONG>     <STRONG>AF</STRONG>  Set foreground color to #1,
+                                                using ANSI escape
+       <STRONG>set_a_background</STRONG>           <STRONG>setab</STRONG>     <STRONG>AB</STRONG>  Set background color to #1,
+                                                using ANSI escape
+       <STRONG>pkey_plab</STRONG>                  <STRONG>pfxl</STRONG>      <STRONG>xl</STRONG>  Program function key #1 to
+                                                type string #2 and show string
+                                                #3
+       <STRONG>device_type</STRONG>                <STRONG>devt</STRONG>      <STRONG>dv</STRONG>  Indicate language, codeset
+                                                support
+       <STRONG>code_set_init</STRONG>              <STRONG>csin</STRONG>      <STRONG>ci</STRONG>  Init sequence for multiple
+                                                codesets
+       <STRONG>set0_des_seq</STRONG>               <STRONG>s0ds</STRONG>      <STRONG>s0</STRONG>  Shift to codeset 0 (EUC set 0,
+                                                ASCII)
+       <STRONG>set1_des_seq</STRONG>               <STRONG>s1ds</STRONG>      <STRONG>s1</STRONG>  Shift to codeset 1
+       <STRONG>set2_des_seq</STRONG>               <STRONG>s2ds</STRONG>      <STRONG>s2</STRONG>  Shift to codeset 2
+       <STRONG>set3_des_seq</STRONG>               <STRONG>s3ds</STRONG>      <STRONG>s3</STRONG>  Shift to codeset 3
+       <STRONG>set_lr_margin</STRONG>              <STRONG>smglr</STRONG>     <STRONG>ML</STRONG>  Set both left and right
+                                                margins to #1, #2.  (ML is not
+                                                in BSD termcap).
+       <STRONG>set_tb_margin</STRONG>              <STRONG>smgtb</STRONG>     <STRONG>MT</STRONG>  Sets both top and bottom
+                                                margins to #1, #2
+       <STRONG>bit_image_repeat</STRONG>           <STRONG>birep</STRONG>     <STRONG>Xy</STRONG>  Repeat bit image cell #1 #2
+                                                times
+       <STRONG>bit_image_newline</STRONG>          <STRONG>binel</STRONG>     <STRONG>Zz</STRONG>  Move to next row of the bit
+                                                image
+       <STRONG>bit_image_carriage_return</STRONG>  <STRONG>bicr</STRONG>      <STRONG>Yv</STRONG>  Move to beginning of same row
+       <STRONG>color_names</STRONG>                <STRONG>colornm</STRONG>   <STRONG>Yw</STRONG>  Give name for color #1
+       <STRONG>define_bit_image_region</STRONG>    <STRONG>defbi</STRONG>     <STRONG>Yx</STRONG>  Define rectangular bit image
+                                                region
+       <STRONG>end_bit_image_region</STRONG>       <STRONG>endbi</STRONG>     <STRONG>Yy</STRONG>  End a bit-image region
+       <STRONG>set_color_band</STRONG>             <STRONG>setcolor</STRONG>  <STRONG>Yz</STRONG>  Change to ribbon color #1
+       <STRONG>set_page_length</STRONG>            <STRONG>slines</STRONG>    <STRONG>YZ</STRONG>  Set page length to #1 lines
+       <STRONG>display_pc_char</STRONG>            <STRONG>dispc</STRONG>     <STRONG>S1</STRONG>  Display PC character #1
+       <STRONG>enter_pc_charset_mode</STRONG>      <STRONG>smpch</STRONG>     <STRONG>S2</STRONG>  Enter PC character display
+                                                mode
+       <STRONG>exit_pc_charset_mode</STRONG>       <STRONG>rmpch</STRONG>     <STRONG>S3</STRONG>  Exit PC character display mode
+       <STRONG>enter_scancode_mode</STRONG>        <STRONG>smsc</STRONG>      <STRONG>S4</STRONG>  Enter PC scancode mode
+       <STRONG>exit_scancode_mode</STRONG>         <STRONG>rmsc</STRONG>      <STRONG>S5</STRONG>  Exit PC scancode mode
+       <STRONG>pc_term_options</STRONG>            <STRONG>pctrm</STRONG>     <STRONG>S6</STRONG>  PC terminal options
+       <STRONG>scancode_escape</STRONG>            <STRONG>scesc</STRONG>     <STRONG>S7</STRONG>  Escape for scancode emulation
+       <STRONG>alt_scancode_esc</STRONG>           <STRONG>scesa</STRONG>     <STRONG>S8</STRONG>  Alternate escape for scancode
+                                                emulation
 
        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
@@ -911,22 +906,22 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        binary-compatible with System V terminfo entries after SVr4.1; beware!
 
                                       <STRONG>Code</STRONG>
-
-       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>   <STRONG>Description</STRONG>
+       <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>enter_horizontal_hl_mode</STRONG>   <STRONG>ehhlm</STRONG>     <STRONG>Xh</STRONG>   Enter horizontal highlight
-                                                 mode
-       <STRONG>enter_left_hl_mode</STRONG>         <STRONG>elhlm</STRONG>     <STRONG>Xl</STRONG>   Enter left highlight mode
-       <STRONG>enter_low_hl_mode</STRONG>          <STRONG>elohlm</STRONG>    <STRONG>Xo</STRONG>   Enter low highlight mode
-       <STRONG>enter_right_hl_mode</STRONG>        <STRONG>erhlm</STRONG>     <STRONG>Xr</STRONG>   Enter right highlight mode
-       <STRONG>enter_top_hl_mode</STRONG>          <STRONG>ethlm</STRONG>     <STRONG>Xt</STRONG>   Enter top highlight mode
-       <STRONG>enter_vertical_hl_mode</STRONG>     <STRONG>evhlm</STRONG>     <STRONG>Xv</STRONG>   Enter vertical highlight mode
-       <STRONG>set_a_attributes</STRONG>           <STRONG>sgr1</STRONG>      <STRONG>sA</STRONG>   Define second set of video
-                                                 attributes #1-#6
-       <STRONG>set_pglen_inch</STRONG>             <STRONG>slength</STRONG>   <STRONG>YI</STRONG>   Set page length to #1
-                                                 hundredth of an inch (some
-                                                 implementations use sL for
-                                                 termcap).
+       <STRONG>enter_horizontal_hl_mode</STRONG>   <STRONG>ehhlm</STRONG>     <STRONG>Xh</STRONG>  Enter horizontal highlight
+                                                mode
+
+       <STRONG>enter_left_hl_mode</STRONG>         <STRONG>elhlm</STRONG>     <STRONG>Xl</STRONG>  Enter left highlight mode
+       <STRONG>enter_low_hl_mode</STRONG>          <STRONG>elohlm</STRONG>    <STRONG>Xo</STRONG>  Enter low highlight mode
+       <STRONG>enter_right_hl_mode</STRONG>        <STRONG>erhlm</STRONG>     <STRONG>Xr</STRONG>  Enter right highlight mode
+       <STRONG>enter_top_hl_mode</STRONG>          <STRONG>ethlm</STRONG>     <STRONG>Xt</STRONG>  Enter top highlight mode
+       <STRONG>enter_vertical_hl_mode</STRONG>     <STRONG>evhlm</STRONG>     <STRONG>Xv</STRONG>  Enter vertical highlight mode
+       <STRONG>set_a_attributes</STRONG>           <STRONG>sgr1</STRONG>      <STRONG>sA</STRONG>  Define second set of video
+                                                attributes #1-#6
+       <STRONG>set_pglen_inch</STRONG>             <STRONG>slength</STRONG>   <STRONG>YI</STRONG>  Set page length to #1
+                                                hundredth of an inch (some
+                                                implementations use sL for
+                                                termcap).
 
 
 </PRE><H3><a name="h3-User-Defined-Capabilities">User-Defined Capabilities</a></H3><PRE>
@@ -2051,7 +2046,6 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>ACS_BOARD</STRONG>     0x68      h      <STRONG>#</STRONG>  board of squares
        <STRONG>ACS_LANTERN</STRONG>   0x69      i      <STRONG>#</STRONG>  lantern symbol
        <STRONG>ACS_LRCORNER</STRONG>  0x6a      j      <STRONG>+</STRONG>  lower right corner
-
        <STRONG>ACS_URCORNER</STRONG>  0x6b      k      <STRONG>+</STRONG>  upper right corner
        <STRONG>ACS_ULCORNER</STRONG>  0x6c      l      <STRONG>+</STRONG>  upper left corner
        <STRONG>ACS_LLCORNER</STRONG>  0x6d      m      <STRONG>+</STRONG>  lower left corner
@@ -2221,6 +2215,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                         <STRONG>A_LOW</STRONG>          11      2048    <STRONG>sgr1</STRONG>
                         <STRONG>A_RIGHT</STRONG>        12      4096    <STRONG>sgr1</STRONG>
                         <STRONG>A_TOP</STRONG>          13      8192    <STRONG>sgr1</STRONG>
+
                         <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
                         <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 7faba6132..80b1fb2f7 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.62 2024/01/13 22:05:39 tom Exp @
+  * @Id: toe.1m,v 1.64 2024/01/20 16:51:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-01-13 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2024-01-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-01-13 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2024-01-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -150,15 +150,14 @@ <H1 class="no-header">toe 1m 2024-01-13 ncurses 6.4 User commands</H1>
            xterm-r6        xterm X11R6 version
            xterm-r5        xterm R5 version
            xterm-mono      monochrome xterm
-           xterm           xterm terminal emulator (X Window
-                           System)
+           xterm           xterm terminal emulator (X Window System)
            vt220           dec vt220
            vt102           dec vt102
            vt100           dec vt100 (w/advanced video)
            vt52            dec vt52
            ...
 
-       Use the <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where  each  terminal
+       Use  the  <STRONG>-a</STRONG>  and  <STRONG>-s</STRONG>  options  together  to  show  where each terminal
        description was found.
 
            --&gt; /etc/terminfo
@@ -169,16 +168,14 @@ <H1 class="no-header">toe 1m 2024-01-13 ncurses 6.4 User commands</H1>
            --*---: vt102           dec vt102
            --*---: vt220           dec vt220
            --*---: vt52            dec vt52
-           --*---: xterm           xterm terminal emulator (X
-                                   Window System)
+           --*---: xterm           xterm terminal emulator (X Window System)
            --*---: xterm-256color  xterm with 256 colors
            --*---: xterm-color     generic color xterm
            --*---: xterm-mono      monochrome xterm
            --*---: xterm-r5        xterm R5 version
            --*---: xterm-r6        xterm X11R6 version
            --*---: xterm-vt220     xterm emulating vt220
-           --*---: xterm-xfree86   xterm terminal emulator
-                                   (XFree86)
+           --*---: xterm-xfree86   xterm terminal emulator (XFree86)
            ...
 
 
@@ -188,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-13                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2024-01-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 8f5fbb361..d60ad9823 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp @
+  * @Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-01-13 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-01-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>tput</STRONG>,  <STRONG>init</STRONG>,  <STRONG>reset</STRONG> - initialize a terminal, exercise its capabilities,
-       or query <EM>terminfo</EM> database
+       <STRONG>tput</STRONG> - initialize a terminal, exercise its capabilities, or query <EM>term-</EM>
+       <EM>info</EM> database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -207,57 +207,62 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
        If  <STRONG>tput</STRONG>  is  invoked  via  link  with any of the names <STRONG>clear</STRONG>, <STRONG>init</STRONG>, or
        <STRONG>reset</STRONG>, it operates as if run with the corresponding (pseudo-)capability
        operand.  For example, executing a link named <STRONG>reset</STRONG> that points to <STRONG>tput</STRONG>
-       has the same effect as "<STRONG>tput</STRONG> <STRONG>reset</STRONG>".  (The <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG> utility also  treats
-       a link named <STRONG>reset</STRONG> specially.)
+       has the same effect as "<STRONG>tput</STRONG> <STRONG>reset</STRONG>".
 
-       If  <STRONG>tput</STRONG>  is  invoked by a link named <STRONG>init</STRONG>, this has the same effect as
-       "<STRONG>tput</STRONG> <STRONG>init</STRONG>".  Such a link is seldom employed because another program of
-       that name is in widespread use.
+       This feature was introduced by <EM>ncurses</EM> 5.2 in 2000.  It is rarely used:
+
+       <STRONG>clear</STRONG>  is a separate program, which is both smaller and more frequently
+              executed.
+
+       <STRONG>init</STRONG>   has the same name as another program in widespread use.
+
+       <STRONG>reset</STRONG>  is  provided  by  the  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  utility  (also  via a link named
+              <STRONG>reset</STRONG>).
 
 
 </PRE><H3><a name="h3-Terminal-Size">Terminal Size</a></H3><PRE>
-       Besides  the  pseudo-capabilities (such as <STRONG>init</STRONG>), <STRONG>tput</STRONG> treats the <STRONG>lines</STRONG>
-       and <STRONG>cols</STRONG> <EM>cap-codes</EM> specially: it may call <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to  obtain  the
+       Besides the pseudo-capabilities (such as <STRONG>init</STRONG>), <STRONG>tput</STRONG> treats  the  <STRONG>lines</STRONG>
+       and  <STRONG>cols</STRONG>  <EM>cap-codes</EM> specially: it may call <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to obtain the
        terminal size.
 
        <STRONG>o</STRONG>   First, <STRONG>tput</STRONG> attempts to obtain these capabilities from the terminal
-           database.  This generally fails for terminal emulators, which  lack
+           database.   This generally fails for terminal emulators, which lack
            a fixed window size and thus omit the capabilities.
 
-       <STRONG>o</STRONG>   It  then  asks  the operating system for the terminal's size, which
-           generally works, unless the connection is via a  serial  line  that
+       <STRONG>o</STRONG>   It then asks the operating system for the  terminal's  size,  which
+           generally  works,  unless  the connection is via a serial line that
            does not support "NAWS": negotiations about window size.
 
-       <STRONG>o</STRONG>   Finally,  it  inspects the environment variables <EM>LINES</EM> and <EM>COLUMNS,</EM>
+       <STRONG>o</STRONG>   Finally, it inspects the environment variables <EM>LINES</EM>  and  <EM>COLUMNS,</EM>
            which may override the terminal size.
 
-       If the <STRONG>-T</STRONG> option is given, <STRONG>tput</STRONG> ignores the  environment  variables  by
+       If  the  <STRONG>-T</STRONG>  option is given, <STRONG>tput</STRONG> ignores the environment variables by
        calling  <STRONG>use_tioctl(TRUE)</STRONG>,  relying  upon  the  operating  system  (or,
        ultimately, the terminal database).
 
 
 </PRE><H2><a name="h2-OPTIONS">OPTIONS</a></H2><PRE>
-       <STRONG>-S</STRONG>       retrieves more than one capability  per  invocation  of  <STRONG>tput</STRONG>.
-                The  capabilities  must  be  passed  to <STRONG>tput</STRONG> from the standard
-                input stream instead of from the  command  line  (see  section
-                "EXAMPLES"  below).   Only  one  <EM>cap-code</EM> is allowed per line.
-                The <STRONG>-S</STRONG> option changes  the  meanings  of  the  <STRONG>0</STRONG>  and  <STRONG>1</STRONG>  exit
+       <STRONG>-S</STRONG>       retrieves  more  than  one  capability per invocation of <STRONG>tput</STRONG>.
+                The capabilities must be passed  to  <STRONG>tput</STRONG>  from  the  standard
+                input  stream  instead  of  from the command line (see section
+                "EXAMPLES" below).  Only one <EM>cap-code</EM>  is  allowed  per  line.
+                The  <STRONG>-S</STRONG>  option  changes  the  meanings  of  the  <STRONG>0</STRONG> and <STRONG>1</STRONG> exit
                 statuses (see section "EXIT STATUS" below).
 
-                Some  capabilities  use  string parameters rather than numeric
-                ones.  <STRONG>tput</STRONG> employs a  built-in  table  and  the  presence  of
-                parameters  in  its input to decide how to interpret them, and
+                Some capabilities use string parameters  rather  than  numeric
+                ones.   <STRONG>tput</STRONG>  employs  a  built-in  table  and the presence of
+                parameters in its input to decide how to interpret  them,  and
                 whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.
 
        <STRONG>-T</STRONG> <EM>type</EM>  indicates  the  terminal's  <EM>type.</EM>   Normally  this  option  is
-                unnecessary,   because  a  default  is  taken  from  the  <EM>TERM</EM>
+                unnecessary,  because  a  default  is  taken  from  the   <EM>TERM</EM>
                 environment variable.  If specified, the environment variables
                 <EM>LINES</EM> and <EM>COLUMNS</EM> are also ignored.
 
        <STRONG>-V</STRONG>       reports the version of <EM>ncurses</EM> associated with <STRONG>tput</STRONG>, and exits
                 with a successful status.
 
-       <STRONG>-x</STRONG>       prevents "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" from attempting to clear the  scrollback
+       <STRONG>-x</STRONG>       prevents  "<STRONG>tput</STRONG> <STRONG>clear</STRONG>" from attempting to clear the scrollback
                 buffer.
 
 
@@ -283,9 +288,9 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       <STRONG>tput</STRONG> command reads one environment variable.
+       <STRONG>tput</STRONG> reads one environment variable.
 
-       <EM>TERM</EM>    denotes  the  terminal  type.   Each terminal type is distinct,
+       <EM>TERM</EM>    denotes the terminal type.  Each  terminal  type  is  distinct,
                though many are similar.  The <STRONG>-T</STRONG> option overrides its value.
 
 
@@ -298,190 +303,190 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Over time <EM>ncurses</EM> <STRONG>tput</STRONG> has  differed  from  that  of  System V  in  two
+       Over  time  <EM>ncurses</EM>  <STRONG>tput</STRONG>  has  differed  from  that of System V in two
        important respects, one now mostly historical.
 
-       <STRONG>o</STRONG>   "<STRONG>tput</STRONG>  <EM>cap-code</EM>" writes to the standard output, which need not be a
-           terminal device.  However, the operands  that  manipulate  terminal
+       <STRONG>o</STRONG>   "<STRONG>tput</STRONG> <EM>cap-code</EM>" writes to the standard output, which need not be  a
+           terminal  device.   However,  the operands that manipulate terminal
            modes might not use the standard output.
 
-           System V  <STRONG>tput</STRONG>'s  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  operands use logic from 4.1cBSD
+           System V <STRONG>tput</STRONG>'s <STRONG>init</STRONG> and <STRONG>reset</STRONG>  operands  use  logic  from  4.1cBSD
            <STRONG>tset</STRONG>,  manipulating  terminal  modes.   It  checks  the  same  file
-           descriptors  (and  <EM>/dev/tty</EM>) for association with a terminal device
-           as <EM>ncurses</EM> now does, and if none are, finally assumes a  1200  baud
+           descriptors (and <EM>/dev/tty</EM>) for association with a  terminal  device
+           as  <EM>ncurses</EM>  now does, and if none are, finally assumes a 1200 baud
            terminal.  When updating terminal modes, it ignores errors.
 
-           Until  <EM>ncurses</EM>  6.1  (see  section  "HISTORY"  below), <STRONG>tput</STRONG> did not
+           Until <EM>ncurses</EM> 6.1 (see  section  "HISTORY"  below),  <STRONG>tput</STRONG>  did  not
            modify  terminal  modes.   It  now  employs  a  scheme  similar  to
            System V, using functions shared with <STRONG>tset</STRONG> (and ultimately based on
-           4.4BSD <STRONG>tset</STRONG>).  If it is not able to open a terminal (for  instance,
+           4.4BSD  <STRONG>tset</STRONG>).  If it is not able to open a terminal (for instance,
            when run by <STRONG>cron(1)</STRONG>), <STRONG>tput</STRONG> exits with an error status.
 
-       <STRONG>o</STRONG>   System V  <STRONG>tput</STRONG>  assumes  that  the  type  of  a <EM>cap-code</EM> operand is
-           numeric if all the characters of its value are decimal numbers;  if
+       <STRONG>o</STRONG>   System V <STRONG>tput</STRONG> assumes that  the  type  of  a  <EM>cap-code</EM>  operand  is
+           numeric  if all the characters of its value are decimal numbers; if
            they are not, it treats <EM>cap-code</EM> as a string capability.
 
            Most implementations that provide support for <EM>cap-code</EM> operands use
-           the <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> function to expand  its  parameters.   That  function
-           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
+           the  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  function  to  expand its parameters.  That function
+           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
            to know which type to use.
 
-           <EM>ncurses</EM> <STRONG>tput</STRONG> uses a table to determine the parameter types for  the
-           standard  <EM>cap-code</EM>  operands,  and  an internal function to analyze
+           <EM>ncurses</EM>  <STRONG>tput</STRONG> uses a table to determine the parameter types for the
+           standard <EM>cap-code</EM> operands, and an  internal  function  to  analyze
            nonstandard <EM>cap-code</EM> operands.
 
-           While more reliable than System V's utility, a portability  problem
-           is  introduced  by this analysis.  An OpenBSD developer adapted the
-           internal library function from <EM>ncurses</EM> to  port  NetBSD's  <EM>termcap</EM>-
-           based  <STRONG>tput</STRONG> to <EM>terminfo,</EM> and modified it to interpret multiple <EM>cap-</EM>
-           <EM>codes</EM> (and parameters) on the command line.  Portable  applications
-           should  not  rely  upon  this feature; <EM>ncurses</EM> offers it to support
+           While  more reliable than System V's utility, a portability problem
+           is introduced by this analysis.  An OpenBSD developer  adapted  the
+           internal  library  function  from <EM>ncurses</EM> to port NetBSD's <EM>termcap</EM>-
+           based <STRONG>tput</STRONG> to <EM>terminfo,</EM> and modified it to interpret multiple  <EM>cap-</EM>
+           <EM>codes</EM>  (and parameters) on the command line.  Portable applications
+           should not rely upon this feature; <EM>ncurses</EM>  offers  it  to  support
            applications written specifically for OpenBSD.
 
-       This implementation, unlike others, accepts both <EM>termcap</EM>  and  <EM>terminfo</EM>
-       <EM>cap-codes</EM>  if  <EM>termcap</EM>  support is compiled in.  In that case, however,
+       This  implementation,  unlike others, accepts both <EM>termcap</EM> and <EM>terminfo</EM>
+       <EM>cap-codes</EM> if <EM>termcap</EM> support is compiled in.  In  that  case,  however,
        the predefined <EM>termcap</EM> and <EM>terminfo</EM> codes have two ambiguities; <EM>ncurses</EM>
        assumes the <EM>terminfo</EM> code.
 
-       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM> but <STRONG>parm_delete_line</STRONG>
+       <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM>  but  <STRONG>parm_delete_line</STRONG>
            to <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
            <EM>info</EM> uses the code <STRONG>dch1</STRONG> for <STRONG>delete_line</STRONG>.
 
-       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>ed</STRONG>  means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM> but <STRONG>clr_eos</STRONG> to
+       <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>ed</STRONG> means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM>  but  <STRONG>clr_eos</STRONG>  to
            <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
            code <STRONG>rmdc</STRONG> for <STRONG>exit_delete_mode</STRONG>.
 
-       The   <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the  parameter-substitution
-       features used in the <STRONG>cup</STRONG> example below, were not supported in  AT&amp;T/USL
+       The  <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the   parameter-substitution
+       features  used in the <STRONG>cup</STRONG> example below, were not supported in AT&amp;T/USL
        <EM>curses</EM> before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
        <STRONG>longname</STRONG>,  and  in  1994,  NetBSD  added  support  for  the  parameter-
        substitution features.
 
-       IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
-       (POSIX.1-2008) documents only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG>  operands.   A
+       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+       (POSIX.1-2008)  documents  only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG> operands.  A
        few observations of interest arise from that selection.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> supports <STRONG>clear</STRONG> as it does any other standard <EM>cap-code.</EM>  The
-           others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
+           others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
            capabilities.
 
-       <STRONG>o</STRONG>   The  <STRONG>tput</STRONG> on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
+       <STRONG>o</STRONG>   The <STRONG>tput</STRONG> on SVr4-based systems such as Solaris, IRIX64, and  HP-UX,
            as well as others such as AIX and Tru64, also support standard <EM>cap-</EM>
            <EM>code</EM> operands.
 
-       <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize <EM>termcap</EM> names rather than
-           <EM>terminfo</EM> capability names in their respective <STRONG>tput</STRONG> commands.  Since
-           2010,  NetBSD's  <STRONG>tput</STRONG>  uses  <EM>terminfo</EM> names.  Before that, it (like
-           FreeBSD) recognized <EM>termcap</EM> names.
+       <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize <EM>termcap</EM> codes rather than
+           <EM>terminfo</EM> capability codes in their respective <STRONG>tput</STRONG> commands.  Since
+           2010, NetBSD's <STRONG>tput</STRONG> uses <EM>terminfo</EM> codes.   Before  that,  it  (like
+           FreeBSD) recognized <EM>termcap</EM> codes.
 
-           Beginning in 2021, FreeBSD uses <EM>ncurses</EM> <STRONG>tput</STRONG>, configured  for  both
+           Beginning  in  2021, FreeBSD uses <EM>ncurses</EM> <STRONG>tput</STRONG>, configured for both
            <EM>terminfo</EM> (tested first) and <EM>termcap</EM> (as a fallback).
 
        Because (apparently) all <EM>certified</EM> Unix systems support the full set of
-       capability codes, the reason for documenting only  a  few  may  not  be
+       capability  codes,  the  reason  for  documenting only a few may not be
        apparent.
 
        <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>cap-code</EM> and
            the other features used in this implementation.
 
-       <STRONG>o</STRONG>   That is, there are two standards for <STRONG>tput</STRONG>:  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
+       <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: 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 capability database.
 
-       <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <STRONG>tput</STRONG> program without
-           using <EM>curses,</EM> no system with a  <EM>curses</EM>  implementation  provides  a
+       <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
+           using  <EM>curses,</EM>  no  system  with a <EM>curses</EM> implementation provides a
            <STRONG>tput</STRONG> utility that does not also support standard <EM>cap-codes.</EM>
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (that is, System V <EM>curses</EM> behavior).
 
-       <STRONG>o</STRONG>   It  assigns  exit status 4 to "invalid operand", which may have the
-           same meaning as "unknown capability".   For  instance,  the  source
+       <STRONG>o</STRONG>   It assigns exit status 4 to "invalid operand", which may  have  the
+           same  meaning  as  "unknown  capability".  For instance, the source
            code for Solaris <EM>xcurses</EM> uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It  assigns  exit  status  255  to  a  numeric variable that is not
+       <STRONG>o</STRONG>   It assigns exit status 255  to  a  numeric  variable  that  is  not
            specified in the <EM>terminfo</EM> database.  That likely is a documentation
-           error,  mistaking  the  "-1"  written  to  the  standard  output to
-           indicate  an  absent  or  cancelled  numeric  capability   for   an
+           error, mistaking  the  "-1"  written  to  the  standard  output  to
+           indicate   an   absent  or  cancelled  numeric  capability  for  an
            (unsigned) exit status.
 
        The various System V implementations (AIX, HP-UX, Solaris) use the same
        exit statuses as <EM>ncurses.</EM>
 
-       NetBSD <EM>curses</EM>  documents  exit  statuses  that  correspond  to  neither
+       NetBSD  <EM>curses</EM>  documents  exit  statuses  that  correspond  to neither
        <EM>ncurses</EM> nor X/Open Curses.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Bill  Joy  wrote  a  <STRONG>tput</STRONG> command during development of 4BSD in October
-       1980.  This initial version only cleared the screen, and did  not  ship
+       Bill Joy wrote a <STRONG>tput</STRONG> command during development  of  4BSD  in  October
+       1980.   This  initial version only cleared the screen, and did not ship
        with official distributions.
 
        System V developed a different <STRONG>tput</STRONG> command.
 
-       <STRONG>o</STRONG>   SVr2  (1984) provided a rudimentary <STRONG>tput</STRONG> that checked the parameter
-           against each predefined capability and returned  the  corresponding
-           value.    This   version   of   <STRONG>tput</STRONG>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for
+       <STRONG>o</STRONG>   SVr2 (1984) provided a rudimentary <STRONG>tput</STRONG> that checked the  parameter
+           against  each  predefined capability and returned the corresponding
+           value.   This  version  of  <STRONG>tput</STRONG>  did   not   use   <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>   for
            parameterized capabilities.
 
-       <STRONG>o</STRONG>   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
-           support  for  <STRONG>init</STRONG>  and <STRONG>reset</STRONG> operands (more than half the program)
+       <STRONG>o</STRONG>   SVr3  (1987)  replaced  that  with  a  more extensive program whose
+           support for <STRONG>init</STRONG> and <STRONG>reset</STRONG> operands (more than  half  the  program)
            incorporated the <STRONG>reset</STRONG> feature of BSD <STRONG>tset</STRONG> written by Eric Allman.
 
-       <STRONG>o</STRONG>   SVr4 (1989) added color initialization  by  using  the  <STRONG>orig_colors</STRONG>
+       <STRONG>o</STRONG>   SVr4  (1989)  added  color  initialization by using the <STRONG>orig_colors</STRONG>
            (<STRONG>oc</STRONG>) and <STRONG>orig_pair</STRONG> (<STRONG>op</STRONG>) capabilities in its <STRONG>init</STRONG> logic.
 
-       Keith  Bostic  refactored BSD <STRONG>tput</STRONG> for shipment in 4.3BSD-Tahoe (1988),
-       then replaced it the next year  with  a  new  implementation  based  on
-       System V  <STRONG>tput</STRONG>.   Bostic's  version  similarly accepted some parameters
-       named for <EM>terminfo</EM> (pseudo-)capabilities: <STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG>,  and
-       <STRONG>reset</STRONG>.   However,  because  he  had only <EM>termcap</EM> available, it accepted
-       <EM>termcap</EM> names for other capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did  not
+       Keith Bostic refactored BSD <STRONG>tput</STRONG> for shipment in  4.3BSD-Tahoe  (1988),
+       then  replaced  it  the  next  year  with a new implementation based on
+       System V <STRONG>tput</STRONG>.  Bostic's version  similarly  accepted  some  parameters
+       named  for  <EM>terminfo</EM>  (pseudo-)capabilities: <STRONG>clear</STRONG>, <STRONG>init</STRONG>, <STRONG>longname</STRONG>, and
+       <STRONG>reset</STRONG>.  However, because he had only  <EM>termcap</EM>  available,  it  accepted
+       <EM>termcap</EM>  codes for other capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did not
        modify the terminal modes as the earlier BSD <STRONG>tset</STRONG> had done.
 
-       At  the  same time, Bostic added a shell script named "clear" that used
-       <STRONG>tput</STRONG> to clear the screen.  Both of these appeared in  4.4BSD,  becoming
+       At the same time, Bostic added a shell script named "clear"  that  used
+       <STRONG>tput</STRONG>  to  clear the screen.  Both of these appeared in 4.4BSD, becoming
        the "modern" BSD implementation of <STRONG>tput</STRONG>.
 
-       The  origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in Ross
-       Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in  December
-       1992.   Ridge's  program  made  more  sophisticated use of the terminal
+       The origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in  Ross
+       Ridge's  <EM>mytinfo</EM>  package,  published  on <EM>comp.sources.unix</EM> in December
+       1992.  Ridge's program made more  sophisticated  use  of  the  terminal
        capabilities than the BSD program.  Eric Raymond used that <STRONG>tput</STRONG> program
-       (and  other  parts  of <EM>mytinfo</EM>) in <EM>ncurses</EM> in June 1995.  Incorporating
-       the portions dealing with terminal capabilities almost without  change,
-       Raymond  made  improvements  to  the  way  command-line parameters were
+       (and other parts of <EM>mytinfo</EM>) in <EM>ncurses</EM> in  June  1995.   Incorporating
+       the  portions dealing with terminal capabilities almost without change,
+       Raymond made improvements  to  the  way  command-line  parameters  were
        handled.
 
        Before <EM>ncurses</EM> 6.1 (2018), its <STRONG>tset</STRONG> and <STRONG>tput</STRONG> utilities differed.
 
-       <STRONG>o</STRONG>   <STRONG>tset</STRONG> was more effective, resetting the terminal modes  and  special
+       <STRONG>o</STRONG>   <STRONG>tset</STRONG>  was  more effective, resetting the terminal modes and special
            characters.
 
-       <STRONG>o</STRONG>   On  the  other hand, <STRONG>tset</STRONG>'s repertoire of terminal capabilities for
+       <STRONG>o</STRONG>   On the other hand, <STRONG>tset</STRONG>'s repertoire of terminal  capabilities  for
            resetting the terminal was more limited; it had only equivalents of
-           <STRONG>reset_1string</STRONG>  (<STRONG>rs1</STRONG>), <STRONG>reset_2string</STRONG> (<STRONG>rs2</STRONG>), and <STRONG>reset_file</STRONG> (<STRONG>rf</STRONG>), and
+           <STRONG>reset_1string</STRONG> (<STRONG>rs1</STRONG>), <STRONG>reset_2string</STRONG> (<STRONG>rs2</STRONG>), and <STRONG>reset_file</STRONG> (<STRONG>rf</STRONG>),  and
            not the tab stop and margin update features of <STRONG>tput</STRONG>.
 
        The <STRONG>reset</STRONG> program is traditionally an alias for <STRONG>tset</STRONG> due to its ability
        to reset terminal modes and special characters.
 
-       As  of  <EM>ncurses</EM>  6.1,  the  "reset"  features  of  the two programs are
+       As of <EM>ncurses</EM> 6.1,  the  "reset"  features  of  the  two  programs  are
        (mostly) the same.  Two minor differences remain.
 
-       <STRONG>o</STRONG>   The <STRONG>tset</STRONG> program waits one  second  when  resetting,  in  case  the
+       <STRONG>o</STRONG>   The  <STRONG>tset</STRONG>  program  waits  one  second  when resetting, in case the
            terminal happens to be a hardware device.
 
-       <STRONG>o</STRONG>   The  two  programs  write  the  terminal  initialization strings to
-           different streams; that is, standard error for  <STRONG>tset</STRONG>  and  standard
+       <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
+           different  streams;  that  is, standard error for <STRONG>tset</STRONG> and standard
            output for <STRONG>tput</STRONG>.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
               Initialize the terminal according to the type of terminal in the
-              <EM>TERM</EM> environment variable.  If  the  system  does  not  reliably
+              <EM>TERM</EM>  environment  variable.   If  the  system does not reliably
               initialize the terminal upon login, this command can be included
               in <EM>$HOME/.profile</EM> after exporting the <EM>TERM</EM> environment variable.
 
@@ -497,7 +502,7 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
               screen, usually known as the "home" cursor position.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
-              Clear the screen: write the <STRONG>clear_screen</STRONG> capability's  value  to
+              Clear  the  screen: write the <STRONG>clear_screen</STRONG> capability's value to
               the standard output stream.
 
        <STRONG>tput</STRONG> <STRONG>cols</STRONG>
@@ -507,29 +512,29 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
               Report the number of columns used by an ADM-3A terminal.
 
        <STRONG>strong=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>normal=`tput</STRONG> <STRONG>rmso`</STRONG>
-              Set  shell variables to capability values: <STRONG>strong</STRONG> and <STRONG>normal</STRONG>, to
-              begin and end, respectively, stand-out mode  for  the  terminal.
+              Set shell variables to capability values: <STRONG>strong</STRONG> and <STRONG>normal</STRONG>,  to
+              begin  and  end,  respectively, stand-out mode for the terminal.
               One might use these to present a prompt.
 
                      printf "${strong}Username:${normal} "
 
        <STRONG>tput</STRONG> <STRONG>hc</STRONG>
-              Indicate  via  exit  status  whether the terminal is a hard copy
+              Indicate via exit status whether the terminal  is  a  hard  copy
               device.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
               Move the cursor to row 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-              Report the value of the <STRONG>cursor_address</STRONG>  (<STRONG>cup</STRONG>)  capability  (used
+              Report  the  value  of the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability (used
               for cursor movement), with no parameters substituted.
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-              Report  the <EM>terminfo</EM> database's description of the terminal type
+              Report the <EM>terminfo</EM> database's description of the terminal  type
               specified in the <EM>TERM</EM> environment variable.
 
        <STRONG>tput</STRONG> <STRONG>-S</STRONG>
-              Process multiple capabilities.  The <STRONG>-S</STRONG> option can be  profitably
+              Process  multiple capabilities.  The <STRONG>-S</STRONG> option can be profitably
               used with a shell "here document".
 
               $ <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
@@ -538,7 +543,7 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
               &gt; <STRONG>bold</STRONG>
               &gt; <STRONG>!</STRONG>
 
-              The  foregoing  clears  the screen, moves the cursor to position
+              The foregoing clears the screen, moves the  cursor  to  position
               (10, 10) and turns on bold (extra bright) mode.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
@@ -550,7 +555,7 @@ <H1 class="no-header">tput 1 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-13                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2024-01-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index 00b08350c..b20820347 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.52 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps,v 1.53 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -289,9 +306,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -317,9 +334,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -696,9 +713,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -752,9 +769,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 726005a7d..591c6efa2 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.24 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.aix4,v 1.25 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -289,9 +306,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -317,9 +334,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -798,9 +815,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -854,9 +871,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index e90a1860e..594f03223 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.22 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.hpux11,v 1.23 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -257,9 +274,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -291,9 +308,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -319,9 +336,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -704,9 +721,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -762,9 +779,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.keys b/include/Caps.keys
index d9a9c4cb4..0017f1841 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.21 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.keys,v 1.22 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -155,6 +155,24 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo codes are "setcolor", "kcdelete",
+# "kcinsert", "kadelete", and "kcinsert" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -210,9 +228,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -258,9 +276,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -291,9 +309,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -319,9 +337,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -786,9 +804,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -842,9 +860,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index d5b8c4e61..c766a2519 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.20 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.osf1r5,v 1.21 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -300,9 +317,9 @@ wide_char_size			widcs	num	Yn	-	-	-----	character step size when in double wide
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.uwin b/include/Caps.uwin
index a12770f2e..755c76974 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.19 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.uwin,v 1.20 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variable) is
+# "hue_lightness_saturation" (24n), and the longest terminfo code is
+# "colornm" (7n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -249,9 +266,9 @@ hue_lightness_saturation	hls	bool	hl	-	-	-----	terminal uses only HLS color nota
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -278,9 +295,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/MKkey_defs.sh b/include/MKkey_defs.sh
index 360570027..e58ee2b65 100755
--- a/include/MKkey_defs.sh
+++ b/include/MKkey_defs.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Id: MKkey_defs.sh,v 1.23 2022/07/16 16:54:02 tom Exp $
+# $Id: MKkey_defs.sh,v 1.24 2024/01/19 12:26:17 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2013,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -64,7 +64,7 @@ fi
 
 # add keys that we generate automatically:
 cat >>$data <<EOF
-key_resize	kr1	str	R1	KEY_RESIZE	+	NCURSES_EXT_FUNCS 	Terminal resize event
+key_resize	kr1	str	R1	KEY_RESIZE	+	NCURSES_SIGWINCH 	Terminal resize event
 EOF
 
 THIS=./`basename "$0"`
@@ -146,7 +146,7 @@ $5 != "-" && $6 != "-" {
 			if (index($7,"NCURSES_") == 1) {
 				ifdef = 1;
 				printf "\n";
-				printf "#ifdef %s\n", $7;
+				printf "#if %s\n", $7;
 			}
 			if ($5 == "KEY_F(0)" ) {
 				printf "#define "
diff --git a/include/curses.events b/include/curses.events
index 468bde18e..2509b1bf7 100644
--- a/include/curses.events
+++ b/include/curses.events
@@ -1,4 +1,4 @@
-/* $Id*/
+/* $Id: curses.events,v 1.4 2024/01/19 09:24:17 tom Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
diff --git a/include/curses.h.in b/include/curses.h.in
index f5426da18..8cfa0b9ff 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.281 2023/08/12 14:20:15 tom Exp $ */
+/* $Id: curses.h.in,v 1.282 2024/01/19 11:50:07 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -64,6 +64,7 @@
  NCURSES_OSPEED_COMPAT
  NCURSES_PATHSEP
  NCURSES_REENTRANT
+ NCURSES_SIGWINCH
  */
 
 #define CURSES 1
@@ -170,6 +171,19 @@
 #define NCURSES_REENTRANT @cf_cv_enable_reentrant@
 #endif
 
+/*
+ * KEY_RESIZE is an extended feature that relies upon the SIGWINCH handler
+ * in ncurses.
+ */
+#if @NCURSES_EXT_FUNCS@
+#ifndef NCURSES_SIGWINCH
+#define NCURSES_SIGWINCH @cf_cv_enable_sigwinch@
+#endif
+#else
+#undef NCURSES_SIGWINCH
+#define NCURSES_SIGWINCH 0
+#endif
+
 /*
  * In certain environments, we must work around linker problems for data
  */
diff --git a/man/form_hook.3x b/man/form_hook.3x
index a37ba1a2a..d1ae78a65 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.34 2024/01/05 21:46:58 tom Exp $
-.TH form_hook 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.35 2024/01/20 18:12:04 tom Exp $
+.TH form_hook 3X 2024-01-20 "ncurses 6.4" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
@@ -72,7 +72,7 @@ if any (\fBNULL\fP if there is no such hook).
 .SS set_form_term
 sets a hook to be called at form-unpost time
 and just before a page change once it is posted.
-.SS form_init
+.SS form_term
 returns the current form term hook, if any (\fBNULL\fP if there is no such
 hook).
 .SH RETURN VALUE
diff --git a/man/tabs.1 b/man/tabs.1
index 01ed44e4a..eedb1d2b0 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp $
-.TH @TABS@ 1 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.54 2024/01/20 16:54:03 tom Exp $
+.TH @TABS@ 1 2024-01-20 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -192,53 +192,75 @@ UNIVAC 1100 Assembler
 .br
 1,12,20,44
 .SS Margins
-A few terminals provide the capability for changing their left/right margins.
-The @TABS@ program has an option to use this feature:
+A few terminals expose a means of changing their left and right margins.
+\fB@TABS@\fP supports this feature with an option.
 .TP 5
 .BI +m \ margin
 The effect depends on whether the terminal has the margin capabilities:
 .RS
 .bP
 If the terminal provides the capability for setting the left margin,
-@TABS@ uses this, and adjusts the available width for tab-stops.
+\fB@TABS@\fP uses this,
+and adjusts the available tab stop widths.
 .bP
 If the terminal does not provide the margin capabilities,
-@TABS@ imitates the effect, putting the tab stops at the appropriate
-place on each line.
-The terminal's left-margin is not modified.
+\fB@TABS@\fP imitates their effect,
+putting tab stops at appropriate places on each line.
+The terminal's left margin is not modified.
 .RE
 .IP
-If the \fImargin\fP parameter is omitted, the default is 10.
-Use \fB+m0\fP to reset the left margin,
-i.e., to the left edge of the terminal's display.
-Before setting a left-margin,
-@TABS@ resets the margin to reduce problems which might arise
-on moving the cursor before the current left-margin.
+If the
+.I margin
+parameter is omitted,
+the default is 10.
+Use
+.B +m0
+to reset the left margin,
+that is,
+to make it the left edge of the terminal's display.
+Before setting a left margin,
+\fB@TABS@\fP resets the margin to reduce problems that might arise
+from moving the cursor to the left of the current left margin.
 .PP
-When setting or resetting the left-margin,
-@TABS@ may reset the right-margin.
+When setting or resetting the left margin,
+\fB@TABS@\fP may also reset the right margin.
 .SH FILES
 .TP
 .I @DATADIR@/tabset
 tab stop initialization database
 .SH PORTABILITY
-\fIIEEE Std 1003.1/The Open Group Base Specifications Issue 7\fP (POSIX.1-2008)
-describes a \fBtabs\fP utility.
-However
+IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+(POSIX.1-2008)
+describes a
+.B tabs
+utility.
+However,
 .bP
-This standard describes a \fB+m\fP option, to set a terminal's left-margin.
+this standard describes a
+.B +m
+option to set a terminal's left margin.
 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.
+.B \%set_left_margin
+.RB ( smgl )
+or
+.B \%set_left_margin_parm
+.RB \%( smglp )
+capabilities needed to support the feature.
 .bP
 There is no counterpart in X/Open Curses Issue 7 for this utility,
 unlike \fB@TPUT@\fP(1).
 .PP
-The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
-by other implementations.
+The
+.B \-d
+(debug) and
+.B \-n
+(no-op) options are
+.I \%ncurses
+extensions not provided by other implementations.
 .SH HISTORY
-A \fBtabs\fP utility appeared in PWB/Unix 1.0 (1977).
+A
+.B tabs
+utility appeared in PWB/Unix 1.0 (1977).
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
 .\"   tabs.c
 A reduced version shipped in Seventh Edition Unix
@@ -252,8 +274,11 @@ it supported a \*(``\-n\*('' option to set the first tab stop at the
 left margin.
 That option is not documented by POSIX.
 .PP
-The PWB/Unix \fBtabs\fP utility returned in System III (1980),
-and used built-in tables rather than the terminal database,
+The PWB/Unix
+.B tabs
+utility returned in System III (1980),
+and used built-in tables,
+rather than the terminal database,
 to support a half-dozen hardcopy terminal (printer) types.
 It also had built-in logic to support setting the left margin,
 as well as a feature for copying the tab settings from a file.
@@ -263,50 +288,69 @@ such as SVr4,
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=SysVR4/cmd/tabs/tabs.c
 added support for the terminal database,
 but retained the tables to support the printers.
-In an earlier development effort,
-the tab stop initialization provided by \fBtset\fP(1) (1982),
-and incorporated into \fBtput\fP(1) uses the terminal database,
+By this time,
+System\ V
+.B tput
+had incorporated the tab stop initialization feature of BSD's
+.B tset
+from 1982,
+but employed the
+.I \%term\%info
+database to do so.
 .PP
-The \fB+m\fP option was documented in the POSIX
-Base Specifications Issue 5
+The
+.B +m
+option was documented in the POSIX Base Specifications Issue 5
 (Unix98, 1997),
 then omitted in Issue 6
 (Unix03, 2004)
 without express motivation,
 though an introductory comment
-\fI\*(``and optionally adjusts the margin\*(''\fP remains,
+\*(``and optionally adjusts the margin\*('' remains,
 overlooked in the removal.
-The \fBtabs\fP utility documented in Issues 6 and later has no mechanism
-for setting margins.
-The \fB+m\fP option in
+The
+.B tabs
+utility documented in Issues 6 and later has no mechanism for setting
+margins.
+The
+.B +m
+option in
 .I \%ncurses
-\fBtabs\fP differs from the SVr4 feature by using terminal capabilities
-rather than built-in tables.
+\fB\%@TABS@\fP differs from the SVr4 feature by using terminal
+capabilities rather than built-in tables.
 .PP
 POSIX documents no limit on the number of tab stops.
 Other implementations impose one;
-the limit is 20 in PWB/Unix's \fBtabs\fP utility.
+the limit is 20 in PWB/Unix's
+.B tabs
+utility.
 While some terminals may not accept an arbitrary number of tab stops,
 .I \%ncurses
-\fBtabs\fP attempts to set tab stops up to the right margin if the list
-thereof is sufficiently long.
+\fB\%@TABS@\fP attempts to set tab stops up to the right margin if the
+list thereof is sufficiently long.
 .PP
-The \*(``Rationale\*('' section of the Issue 6 \fBtabs\fP reference page
+The \*(``Rationale\*('' section of the Issue 6
+.B tabs
+reference page
 .\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
-details how the committee considered redesigning the \fBtabs\fP and
-\fBtput\fP utilities,
+details how the committee considered redesigning the
+.B tabs
+and
+.B tput
+utilities,
 without settling on an improved solution.
 It claims that
-.RS 5
 .PP
-no known historical version of tabs supports the capability of setting
-arbitrary tab stops.
+.RS 4
+\*(``no known historical version of
+.I tabs
+supports the capability of setting arbitrary tab stops.\*(''
 .RE
 .PP
-Nevertheless,
-the feature described in subsection \*(``Explicit Lists\*('' above was
+The feature described in subsection \*(``Explicit Lists\*('' above was
 implemented in PWB/Unix,
-and permits the setting of abitrary tab stops.
+.\" see URL above
+and permitted the setting of abitrary tab stops nevertheless.
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TSET@\fP(1),
diff --git a/man/toe.1m b/man/toe.1m
index 4f8032113..26383553f 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.62 2024/01/13 22:05:39 tom Exp $
-.TH @TOE@ 1M 2024-01-13 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.64 2024/01/20 16:51:21 tom Exp $
+.TH @TOE@ 1M 2024-01-20 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,8 +167,9 @@ terminal database directories named in the \fI\%TERMINFO\fP and
 .RS 4
 .PP
 .\" toe -a | grep -E '^(xterm|vt)'
+.ft \*(CW
 .TS
-Lf(\*(CW)2 Lf(\*(CW).
+L2 Lx.
 xterm\-color	generic color xterm
 xterm\-xfree86	xterm terminal emulator (XFree86)
 xterm\-vt220	xterm emulating vt220
@@ -188,6 +189,7 @@ vt52	dec vt52
 L.
 \&.\|.\|.
 .TE
+.ft
 .RE
 .PP
 Use the \fB\-a\fP and \fB\-s\fP options together to show where each
@@ -195,14 +197,15 @@ terminal description was found.
 .RS 4
 .PP
 .\" toe -as | grep -E '(^-+>|:.(xterm|vt))'
+.ft \*(CW
 .TS
-lf(\*(CW).
+Lx.
 \-\-> /etc/terminfo
 \-\-\-\-> /lib/terminfo
 \-\-\-\-\-\-> /usr/share/terminfo
 .TE
 .TS
-lf(\*(CW)1 lf(\*(CW)2 lf(\*(CW).
+L1 L2 Lx.
 \-\-*\-\-\-:	vt100	dec vt100 (w/advanced video)
 \-\-*\-\-\-:	vt102	dec vt102
 \-\-*\-\-\-:	vt220	dec vt220
@@ -222,9 +225,10 @@ T}
 xterm terminal emulator (XFree86)
 T}
 .T&
-l.
+L.
 \&.\|.\|.
 .TE
+.ft
 .RE
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
diff --git a/man/tput.1 b/man/tput.1
index 0cf0b129f..b4ea45925 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp $
-.TH @TPUT@ 1 2024-01-13 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp $
+.TH @TPUT@ 1 2024-01-20 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,9 +47,7 @@
 ..
 .ds d @TERMINFO@
 .SH NAME
-\fB\%@TPUT@\fP,
-\fB\%init\fP,
-\fB\%reset\fP \-
+\fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
 .SH SYNOPSIS
 \fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
@@ -277,16 +275,23 @@ executing a link named
 .B \%reset
 that points to \fB\%@TPUT@\fP has the same effect as
 .RB \%\*(`` "@TPUT@ \%reset" \*(''.
-(The \fB\%@TSET@\fP(1) utility also treats a link named
-.B \%reset
-specially.)
 .PP
-If \fB\%@TPUT@\fP is invoked by a link named
-.BR \%init ,
-this has the same effect as
-.RB \%\*(`` "@TPUT@ init" \*(''.
-Such a link is seldom employed because another program of that name
-is in widespread use.
+This feature was introduced by
+.I \%ncurses
+5.2 in 2000.
+It is rarely used:
+.TP
+.B \%clear
+is a separate program,
+which is both smaller and more frequently executed.
+.TP
+.B init
+has the same name as another program in widespread use.
+.TP
+.B \%reset
+is provided
+by the \fB\%@TSET@\fP(1) utility (also via a link named
+.BR \%reset ")."
 .SS "Terminal Size"
 Besides the pseudo-capabilities
 (such as
@@ -410,7 +415,7 @@ _
 4	some operands not interpreted
 .TE
 .SH ENVIRONMENT
-\fB@TPUT@\fP command reads one environment variable.
+\fB@TPUT@\fP reads one environment variable.
 .TP 8n \" "TERM" + 2n + adjustment for PDF
 .I TERM
 denotes the terminal type.
@@ -637,9 +642,9 @@ operands.
 .bP
 A few platforms such as FreeBSD recognize
 .I termcap
-names rather than
+codes rather than
 .I \%term\%info
-capability names in their respective
+capability codes in their respective
 .B tput
 commands.
 Since 2010,
@@ -647,13 +652,13 @@ NetBSD's
 .B tput
 uses
 .I \%term\%info
-names.
+codes.
 Before that,
 it
 (like FreeBSD)
 recognized
 .I termcap
-names.
+codes.
 .IP
 Beginning in 2021,
 FreeBSD uses
@@ -800,7 +805,7 @@ because he had only
 available,
 it accepted
 .I termcap
-names for other capabilities.
+codes for other capabilities.
 Also,
 Bostic's BSD
 .B tput
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 3b7a2229a..0892a3063 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1109 $
-#	$Date: 2024/01/13 19:45:34 $
+#	$Revision: 1.1123 $
+#	$Date: 2024/01/14 18:08:23 $
 #
 # 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
@@ -441,11 +441,10 @@ klone+sgr8|attribute control for ansi.sys displays with invis,
 # work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
 # diamond and arrow characters under curses.
 klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m),
-	bold=\E[1m, 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,
-	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
-	use=ansi+sgr, use=klone+acs,
+	sgr0=\E[0;10m, smacs=\E[12m, use=ansi+sgrbold,
+	use=klone+acs,
 
 # KOI8-R (RFC1489) acs (alternate character set)
 # From: Qing Long <qinglong@Bolizm.ihep.su>, 24 Feb 1996.
@@ -1162,30 +1161,25 @@ linux-vt|Linux console using VT codes for graphics,
 kon|kon2|Kanji ON Linux console,
 	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
 	colors#8, it#8, ncv#18, 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,
-	bel=^G, bold=\E[1m, civis=\E[?25l, cnorm=\E[?25h, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
+	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
 	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
-	kdch1=\E[3~, kend=\E[4~, 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~, knp=\E[6~, kpp=\E[5~, kspd=^Z,
-	nel=\r\n, op=\E[37;40m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	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~, kspd=^Z,
+	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
+	rs1=\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%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr,
+	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
+	use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -1344,10 +1338,10 @@ hurd|The GNU Hurd console server,
 	colors#8, it#8, ncv#18, pairs#64,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H,
-	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%dX, el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@,
-	ind=\E[S, kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~,
+	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
+	kb2=\E[G, kbs=^?, kcbt=\E[Z, 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,
@@ -1358,11 +1352,10 @@ hurd|The GNU Hurd console server,
 	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, grbom=\E[>1l, gsbom=\E[>1h,
+	smacs=\E[11m, smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+rca2, use=ansi+sgr, use=vt220+pcedit,
+	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
 	use=ecma+index, use=ecma+italics, use=vt220+cvis,
 
 #### QNX
@@ -1468,13 +1461,13 @@ qansi-g|QNX ANSI,
 	am, eslok, hs, xon,
 	colors#8, cols#80, lines#25, ncv#19, pairs#64, wsl#80,
 	acsc=Oa``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J,
-	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, ich=\E[%p1%d@,
-	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+	bel=^G, clear=\E[2J\E[H, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cup=\E[%i%p1%d;%p2%dH$<5>, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
+	dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J, 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, ich=\E[%p1%d@, ich1=\E[1@,
+	il=\E[%p1%dL, il1=\E[1L, 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,
@@ -1496,8 +1489,8 @@ qansi-g|QNX ANSI,
 	kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo, 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, rev=\E[7m,
-	ri=\E[T, rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+	kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, 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}
@@ -1506,10 +1499,10 @@ qansi-g|QNX ANSI,
 	     %=%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, tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
-	use=ansi+arrows, use=ansi+local, use=ansi+rep,
-	use=ansi+inittabs, use=att610+cvis0, use=decid+cpr,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows,
+	use=ansi+local, use=ansi+rep, use=ansi+inittabs,
+	use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr,
 	use=ecma+index,
 #
 qansi|QNX ANSI with console writes,
@@ -1695,14 +1688,14 @@ iris-color|xwsh|IRIX ANSI with color,
 #		CSI ? 5 h Reverse Video (DECSCNM).
 #
 pccon+keys|OpenBSD PC keyboard keys,
-	kbs=^?, kdch1=\E[3~, kend=\E[8~, kent=\r, 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~,
-	kf21=\E[35~, kf22=\E[36~, kf23=\E[37~, kf24=\E[38~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~,
-	knp=\E[6~, kpp=\E[5~, krfr=^R, use=ansi+arrows,
+	kbs=^?, kend=\E[8~, kent=\r, 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~, kf21=\E[35~,
+	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
+	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+	kf9=\E[20~, khome=\E[7~, krfr=^R, use=ansi+arrows,
+	use=vt220+pcedit,
 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,
@@ -1839,26 +1832,22 @@ pcvt25-color|DEC VT220 emulation with 25 lines and color,
 # modified codes for setf/setb to setaf/setab, then to klone+color, corrected
 # typo in invis - TD
 arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
-	am, bce, msgr, xenl, xon,
-	cols#80, it#8, lines#30,
+	bce, xenl, xon,
+	lines#30,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n,
-	invis=\E[8m$<2>, ka1=\E[q, ka3=\E[s, kb2=\E[r, kbs=^H,
-	kc1=\E[p, kc3=\E[n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kent=\E[M, kf0=\E[y, kf1=\E[P, kf10=\E[x,
-	kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t, kf6=\E[u, kf7=\E[v,
-	kf8=\E[l, kf9=\E[w, 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,
+	blink=\E[5m$<2>, bold=\E[1m$<2>, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cuu1=\E[A$<2>, invis=\E[8m$<2>, ka1=\E[q,
+	ka3=\E[s, kb2=\E[r, kc1=\E[p, kc3=\E[n, kent=\E[M, kf0=\E[y,
+	kf1=\E[P, kf10=\E[x, kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t,
+	kf6=\E[u, kf7=\E[v, kf8=\E[l, kf9=\E[w, rev=\E[7m$<2>,
+	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+	rmul=\E[m$<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=ansi+csr,
-	use=ansi+local, use=ecma+sgr, use=klone+color,
+	smso=\E[7m$<2>, smul=\E[4m$<2>, use=ansi+csr,
+	use=ansi+local, use=ecma+sgr, use=vt100+4bsd,
+	use=klone+color,
 
 arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768),
 	cols#132, lines#50, use=arm100,
@@ -2224,10 +2213,10 @@ teken-2022|teken as of 2022,
 	use=ansi+tabs,
 
 teken-vt+fkeys|teken's xterm special keys,
-	kdch1=\E[3~, kend=\E[F, 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[H,
-	kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+	kend=\E[F, 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[H,
+	use=vt220+pcedit,
 
 teken-sc+fkeys|teken's syscons special keys,
 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
@@ -2490,9 +2479,8 @@ vt100+fnkeys|DEC VT100 numeric keypad (kf0-kf10),
 #  |___________________|_________|_kent_@8_|
 #
 vt220+keypad|DEC VT220 numeric keypad,
-	ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, kent=\EOM,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ka2=\EOx, kb1=\EOt,
-	kb3=\EOv, kc2=\EOr,
+	ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, ka2=\EOx,
+	kb1=\EOt, kb3=\EOv, kc2=\EOr, use=vt100+pfkeys,
 #
 vt100+enq|ncurses extension for VT100-style ENQ,
 	u8=\E[?1;2c, use=ansi+enq,
@@ -3367,33 +3355,29 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset,
 	am, bw, msgr, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
-	el1=\E[1K, ht=^I, hts=\EH, ind=\n, kbs=^?, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, el1=\E[1K, ht=^I,
+	hts=\EH, ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, kent=\EOM, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	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=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=vt100+enq, use=vt100+pfkeys,
+	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, 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%;,
-	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+	sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd,
 
 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,
-	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%;,
-	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+	sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd,
 
 # compare with xterm+sl-twm
 nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support,
@@ -3660,28 +3644,25 @@ nsterm|nsterm-256color|Apple_Terminal|AppKit Terminal.app,
 #	can display/alter xterm-256color cube
 #	can display/alter xterm-88color cube
 iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
-	am, bce, mir, msgr, npc, xenl, xon,
-	cols#80, it#8, lines#24, wsl#50,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?,
-	kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, kent=\EOM, 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~, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m,
-	ri=\EM, rmacs=^O, 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,
+	bce, mir, npc, xenl, xon,
+	wsl#50,
+	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
+	kend=\EOF, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr=\E[0%?%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, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+local, use=vt100+keypad,
-	use=xterm+alt47, use=xterm+sl-twm, use=xterm+x11mouse,
-	use=xterm+256setaf, use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, kEND5=\E[1;5F,
+	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
+	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
+	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
 
 # iTerm2 3.0.15
 #
@@ -3840,12 +3821,12 @@ xnuppc+basic|Darwin PowerPC console basic capabilities,
 	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
 	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	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,
+	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+erase,
-	use=ansi+local, use=vt100+keypad,
+	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+csr, use=ansi+erase, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	colors#8, ncv#32, pairs#64,
@@ -4585,39 +4566,37 @@ ms-vt100-16color|VT-UTF-8 and VT100+,
 #	telnet, kf1-kf4 are \EOP to \EOS, and kf5-kf12 match the terminfo.
 #	But with ssh, it's entirely different (reminds me of rxvt).
 winconsole|Windows 10 new console,
-	am, km, mir, msgr, xenl, AX,
+	am, km, mir, msgr, xenl,
 	ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
 	bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n,
-	invis@, is1=\E[!p, kdch1=\E[3~, kend=\E[4~, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[11;2~,
-	kf14=\E[12;2~, kf15=\E[13;2~, kf16=\E[14;2~,
-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\E[12~,
-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-	kf23=\E[24;2~, kf24=\E[25;2~, kf25=\E[11;3~,
-	kf26=\E[12;3~, kf27=\E[13;3~, kf28=\E[14;3~,
-	kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~, kf31=\E[18;3~,
-	kf32=\E[19;3~, kf33=\E[20;3~, kf34=\E[21;3~,
-	kf35=\E[24;3~, kf36=\E[25;3~, kf37=\E[11;4~,
-	kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~, kf40=\E[14;4~,
-	kf41=\E[15;4~, kf42=\E[17;4~, kf43=\E[18;4~,
-	kf44=\E[19;4~, kf45=\E[20;4~, kf46=\E[21;4~,
-	kf47=\E[24;4~, kf48=\E[25;4~, kf49=\E[11;7~, kf5=\E[15~,
-	kf50=\E[12;7~, kf51=\E[13;7~, kf52=\E[14;7~,
-	kf53=\E[15;7~, kf54=\E[17;7~, kf55=\E[18;7~,
-	kf56=\E[19;7~, kf57=\E[20;7~, kf58=\E[21;7~,
-	kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
-	knp=\E[6~, kpp=\E[5~, nel=\r\n, ri=\E[T, rmacs=\E(B, rmir@,
-	rmpch@, rs1=\E[!p,
+	invis@, is1=\E[!p, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
+	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
+	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
+	kf22=\E[21;2~, kf23=\E[24;2~, kf24=\E[25;2~,
+	kf25=\E[11;3~, kf26=\E[12;3~, kf27=\E[13;3~,
+	kf28=\E[14;3~, kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~,
+	kf31=\E[18;3~, kf32=\E[19;3~, kf33=\E[20;3~,
+	kf34=\E[21;3~, kf35=\E[24;3~, kf36=\E[25;3~,
+	kf37=\E[11;4~, kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~,
+	kf40=\E[14;4~, kf41=\E[15;4~, kf42=\E[17;4~,
+	kf43=\E[18;4~, kf44=\E[19;4~, kf45=\E[20;4~,
+	kf46=\E[21;4~, kf47=\E[24;4~, kf48=\E[25;4~,
+	kf49=\E[11;7~, kf5=\E[15~, kf50=\E[12;7~, kf51=\E[13;7~,
+	kf52=\E[14;7~, kf53=\E[15;7~, kf54=\E[17;7~,
+	kf55=\E[18;7~, kf56=\E[19;7~, kf57=\E[20;7~,
+	kf58=\E[21;7~, kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, nel=\r\n,
+	ri=\E[T, rmacs=\E(B, rmir@, rmpch@, rs1=\E[!p,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
 	    \E(0%e\E(B%;,
 	sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows,
 	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
 	use=ansi+idl, use=ecma+index, use=ansi+inittabs,
 	use=ansi+local, use=ecma+sgr, use=ecma+color,
-	use=vt220+cvis,
+	use=vt220+cvis, use=vt220+pcedit,
 
 # Windows Terminal (Preview)
 # https://github.com/microsoft/terminal
@@ -4862,11 +4841,10 @@ xterm-r6|xterm X11R6 version,
 	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em,
 	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
-	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=xterm+alt47,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=xterm+alt47, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
 
 xterm-old|antique xterm version,
@@ -4896,9 +4874,8 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	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~,
-	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El,
-	memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kmous=\E[M, kslt=\E[4~,
+	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
 	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>,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
@@ -4913,6 +4890,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
 	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
 	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
+	use=vt220+pcedit,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -5187,8 +5165,7 @@ xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
 	kPRV6=\E[5;6~, kPRV7=\E[5;7~, use=xterm+edit,
 
 xterm+edit|fragment for 6-key editing-keypad,
-	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	use=xterm+pc+edit,
+	use=xterm+pc+edit, use=vt220+pcedit,
 
 xterm+pc+edit|fragment for pc-style editing keypad,
 	kend=\E[4~, khome=\E[1~,
@@ -5277,29 +5254,27 @@ xterm+acs|ISO-2022 alternate character-switching for xterm,
 xterm-basic|modern xterm terminal emulator - common,
 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
 	colors#8, cols#80, lines#24, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[2m, 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,
 	ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>,
 	kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM,
-	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-	rs2=\E[!p\E[?3;4l\E[4l\E>, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	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,
-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	E3=\E[3J, use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=xterm+kbs, use=xterm+alt+title,
-	use=att610+cvis, use=xterm+meta,
+	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
+	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp, use=ansi+sgrbold, use=xterm+kbs,
+	use=xterm+alt+title, use=att610+cvis, use=xterm+acs,
+	use=xterm+meta,
 
 xterm+meta|meta mode for xterm,
 	km,
@@ -5550,7 +5525,6 @@ xterm+tmux2|advanced xterm features used in tmux,
 xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	OTbs, am, bce, km, mc5i, mir, msgr, npc, xenl, AX,
 	colors#8, cols#80, it#8, lines#24, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\2335m, bold=\2331m, cbt=\233Z,
 	civis=\233?25l, clear=\233H\2332J,
 	cnorm=\233?25l\233?25h, cr=\r, csr=\233%i%p1%d;%p2%dr,
@@ -5575,9 +5549,8 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	kf9=\23320~, khome=\2331~, kich1=\2332~, kmous=\233M,
 	knp=\2336~, kpp=\2335~, mc0=\233i, mc4=\2334i, mc5=\2335i,
 	meml=\El, memu=\Em, op=\23339;49m, rc=\E8, rev=\2337m,
-	ri=\215, rmacs=\E(B, rmam=\233?7l, rmcup=\233?1049l,
-	rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m,
-	rs1=\Ec,
+	ri=\215, rmam=\233?7l, rmcup=\233?1049l, rmir=\2334l,
+	rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, rs1=\Ec,
 	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,
@@ -5587,11 +5560,11 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	     %{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,
-	u8=\233[?%[;0123456789]c, vpa=\233%i%p1%dd,
-	use=ansi+enq, use=xterm+kbs,
+	sgr0=\2330m\E(B, smam=\233?7h, smcup=\233?1049h,
+	smir=\2334h, smkx=\233?1h\E=, smso=\2337m, smul=\2334m,
+	tbc=\2333g, u6=\233[%i%d;%dR, u8=\233[?%[;0123456789]c,
+	vpa=\233%i%p1%dd, use=ansi+enq, use=xterm+acs,
+	use=xterm+kbs,
 
 # Note: normally xterm supports modified function-keys as described in
 #	XTerm - "Other" modified keys
@@ -5972,15 +5945,16 @@ xtermm|xterm terminal emulator (monochrome),
 	ind=\n, kend=\E[Y, kf0=\EOy, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
 	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H,
 	kmous=\E[^_, knp=\E[U, kpp=\E[V, reqmp=\E[492Z, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
+	ri=\EM, rmacs=^O, rmcup=\E@0\E[?4r,
 	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,
 	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=ansi+apparrows, use=ansi+csr,
+	tbc=\E[3g, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=decid+cpr, use=vt100+fnkeys,
+	use=ansi+local, use=ansi+sgrso, use=decid+cpr,
+	use=vt100+fnkeys,
 
 xtermc|xterm terminal emulator (color),
 	colors#8, ncv#7, pairs#64,
@@ -6461,19 +6435,19 @@ kvt|KDE terminal,
 konsole-base|KDE console window (common),
 	bce, km@, npc, XT,
 	ncv@,
-	blink=\E[5m, dim=\E[2m, ech=\E[%p1%dX,
-	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
-	invis=\E[8m, 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,
+	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+	hpa=\E[%i%p1%dG, 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=ecma+index, use=xterm+focus, use=xterm+sm+1006,
-	use=ecma+strikeout, use=ecma+italics, use=ecma+color,
-	use=xterm-r6, use=vt220+cvis, use=bracketed+paste,
+	use=ansi+sgrdim, use=ecma+index, use=xterm+focus,
+	use=xterm+sm+1006, use=ecma+strikeout,
+	use=ecma+italics, use=ecma+color, use=xterm-r6,
+	use=vt220+cvis, use=bracketed+paste,
 	use=report+version,
 
 # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
@@ -6720,26 +6694,23 @@ mlterm-256color|mlterm 3.0 with xterm 256-colors,
 # removed dch/dch1 because they are inconsistent with bce/ech -TD
 # remove km as per tack test -TD
 rxvt-basic|rxvt terminal base (X Window System),
-	OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
-	cols#80, it#8, lines#24,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\n,
+	OTbs, bce, eo, mir, xenl, xon, XT,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
 	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, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, 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,
 	s0ds=\E(B, s1ds=\E(0,
 	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, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smso=\E[7m,
+	smul=\E[4m, use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt100+enq, use=vt100+4bsd,
 	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
 
 # Key Codes from rxvt reference:
@@ -6825,23 +6796,19 @@ rxvt-basic|rxvt terminal base (X Window System),
 rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, 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~,
+	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
 	kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^,
 	kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^,
-	kf29=\E[18\^, kf3=\E[13~, kf30=\E[19\^, kf31=\E[20\^,
-	kf32=\E[21\^, kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^,
-	kf36=\E[26\^, kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^,
-	kf4=\E[14~, kf40=\E[32\^, kf41=\E[33\^, kf42=\E[34\^,
-	kf43=\E[23@, kf44=\E[24@, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kind=\E[a,
-	kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@, kDN=\E[b, kDN5=\EOb,
-	kEND5=\E[8\^, kEND6=\E[8@, kHOM5=\E[7\^, kHOM6=\E[7@,
-	kIC5=\E[2\^, kIC6=\E[2@, kLFT5=\EOd, kNXT5=\E[6\^,
-	kNXT6=\E[6@, kPRV5=\E[5\^, kPRV6=\E[5@, kRIT5=\EOc,
-	kUP=\E[a, kUP5=\EOa, use=vt220+vtedit,
+	kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^,
+	kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^, kf36=\E[26\^,
+	kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^, kf40=\E[32\^,
+	kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@,
+	khome=\E[7~, kind=\E[a, kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@,
+	kDN=\E[b, kDN5=\EOb, kEND5=\E[8\^, kEND6=\E[8@,
+	kHOM5=\E[7\^, kHOM6=\E[7@, kIC5=\E[2\^, kIC6=\E[2@,
+	kLFT5=\EOd, kNXT5=\E[6\^, kNXT6=\E[6@, kPRV5=\E[5\^,
+	kPRV6=\E[5@, kRIT5=\EOc, kUP=\E[a, kUP5=\EOa,
+	use=vt220+vtedit, use=xterm+nopcfkeys,
 
 # rxvt was originally "xvt", first announced in April 1993:
 #	http://www.krsaborio.net/linux-desktops/research/1993/0416.html
@@ -6964,29 +6931,27 @@ mrxvt-256color|multitabbed rxvt with 256 colors,
 # remove nonworking flash -TD
 # remove km as per tack test -TD
 Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
-	am, bce, bw, eo, mc5i, mir, msgr, xenl, xon, XT,
-	btns#5, cols#80, it#8, lines#24, lm#0, ncv@,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	bce, bw, eo, mc5i, mir, xenl, xon, XT,
+	btns#5, lm#0, ncv@,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	ind=\n, is1=\E[?47l\E>\E[?1l,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
-	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
-	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
-	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m,
+	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kc1=\E[8~,
+	kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i,
+	mc5=\E[5i, rev=\E[7m, ri=\EM, rmam=\E[?7l, 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,
 	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, smir=\E[4h, smkx=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
-	use=ecma+color, use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smso=\E[7m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+	use=rxvt+pcfkeys, use=ecma+color, use=vt100+4bsd,
+	use=vt220+cvis,
 
 Eterm-256color|Eterm with xterm 256-colors,
 	use=xterm+256color, use=Eterm,
@@ -7166,23 +7131,20 @@ emu-220|Emu-220 (vt200-7bit mode),
 #	apparently implements alternate screen like xterm
 #	does not use padding, of course.
 mvterm|vv100|SwitchTerm aka mvTERM,
-	am, km, mir, msgr, xenl, xon,
-	colors#8, cols#80, it#8, lines#24, pairs#64,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	op=\E[100m, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	km, mir, xenl, xon,
+	colors#8, pairs#64,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el=\E[K, ich=\E[%p1%d@, ich1=\E[@, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, op=\E[100m, rev=\E[7m, ri=\EM,
+	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=xterm+alt47, use=vt100+fnkeys,
+	sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt100+fnkeys, use=vt100+4bsd,
 	use=x10term+sl,
 
 #### MTERM
@@ -7194,16 +7156,15 @@ mterm-ansi|ANSI emulation,
 	am, bw, mir, msgr,
 	it#8,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, home=\E[H,
-	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\017,
-	kbs=^H, nel=\EE, ri=\E[T, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dim=\E[2m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`,
+	ht=^I, ich1=, ind=\E[S, is2=\E)0\017, kbs=^H, nel=\EE, ri=\E[T,
+	rmacs=^O, 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, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
-	use=ecma+index,
+	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd, use=ansi+erase,
+	use=ansi+idc1, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=ecma+index,
 
 # mterm normally sets $TERM to "mterm"
 mterm|mouse-sun|Der Mouse term,
@@ -7220,25 +7181,25 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	am, mir, msgr, xenl,
 	colors#8, it#8, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0,
-	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
-	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, 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~, nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	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~, nel=\EE,
+	op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, 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, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+cpr,
-	use=ansi+csr, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
-	use=vt220+vtedit, use=ecma+index, use=vt220+cvis,
+	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
+	use=ecma+index, use=vt220+cvis,
 
 #### VWM
 # http://vwm.sourceforge.net/
@@ -7335,15 +7296,12 @@ st-0.8|simpleterm 0.8,
 #	provided with the source is incorrect, since Se/Ss are mis-coded
 #	as booleans rather than strings.
 st-0.7|simpleterm 0.7,
-	ccc,
-	initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
-	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-	kcbt@, kent@, oc=\E]104\007, Ms=\E]52;%p1%s;%p2%s\007,
-	kDN3=\E[1;3B, kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
+	kcbt@, kent@, Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B,
+	kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
 	kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~,
 	kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C,
 	kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout,
-	use=st-0.6,
+	use=st-0.6, use=xterm+256color,
 
 # st-0.4.1
 #
@@ -7374,57 +7332,40 @@ st-0.7|simpleterm 0.7,
 # still has no function keys past kf36 (no combinations of modifiers)
 # no application keypad mode, e.g, kent.
 st-0.6|simpleterm 0.6,
-	am, bce, mir, msgr, npc, xenl, XT,
-	colors#8, cols#80, lines#24, pairs#64,
+	bce, mir, npc, xenl, XT,
+	colors#8, pairs#64,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
 	     zz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
-	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~,
-	kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, 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~, kil1=\E[2;5~,
-	kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A, krmir=\E[2;2~,
-	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, ri=\EM,
-	rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	clear=\E[H\E[2J, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
+	ich=\E[%p1%d@, 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~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
+	khome=\E[1~, kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M,
+	kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	rs2=\E[4l\E>\E[?1034l, 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%;%?%p5%t;2%;%?%p7%t;8%;m,
-	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, u8=\E[?1;2c, vpa=\E[%i%p1%dd,
-	Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+sgr,
+	smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, u8=\E[?1;2c,
+	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=vt100+4bsd, use=vt100+pfkeys,
 	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
 	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
 	use=ecma+strikeout, use=bracketed+paste,
+	use=xterm+pcf2,
 #
 # st-0.1.1
 #
@@ -7447,7 +7388,6 @@ st-0.6|simpleterm 0.6,
 simpleterm|old-st|simpleterm 0.1.1,
 	am, eo, mir, msgr, ul, xenl,
 	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -7457,13 +7397,12 @@ simpleterm|old-st|simpleterm 0.1.1,
 	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, rev=\E[7m,
-	rmacs=\E(B, rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	rmso=\E[m, rmul=\E[m, 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=ansi+arrows, use=ansi+csr, use=ansi+idl,
-	use=vt220+cvis, use=ecma+index,
+	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
+	use=ecma+index, use=xterm+acs,
 
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
@@ -7951,25 +7890,23 @@ foot-direct|foot with direct color indexing,
 foot+base|foot base fragment,
 	am, bce, bw, mir, msgr, npc, xenl, AX, XT,
 	cols#80, it#8, lines#24,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
-	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmacs=\E(B,
+	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
 	rs1=\Ec, rs2=\E[!p\E[4l\E>,
 	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis,
-	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
-	use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
-	use=ansi+tabs, use=ansi+sgr, use=ecma+index,
-	use=ecma+italics, use=ecma+strikeout,
-	use=xterm+alt+title, use=xterm+pcfkeys,
-	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
-	use=bracketed+paste, use=report+version,
-	use=xterm+focus,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
+	use=att610+cvis, use=ansi+csr, use=ansi+cup,
+	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
+	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
+	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
+	use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
+	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
+	use=xterm+sl-alt, use=bracketed+paste,
+	use=report+version, use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -8144,27 +8081,26 @@ wezterm|Wez's Terminal Emulator,
 contour|contour-latest|Contour Terminal Emulator,
 	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
 	cols#80, lines#24, pairs#0x7fff,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
 	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
 	ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=,
 	kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=,
 	oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM,
-	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmkx=\E[?1l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	rin=\E[%p1%dT, rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m,
+	rmul=\E[24m, rs1=\E]\E\\\Ec,
 	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(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h,
-	smso=\E[7m, smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J,
-	vpa=\E[%i%p1%dd, Cs=\E]12;%p1%s\E\\, E3=\E[3J,
-	Rmol=\E[55m, Se=\E[ q, Smol=\E[53m, Smulx=\E[4:%p1%dm,
-	Ss=\E[%p1%d q, use=ansi+apparrows, use=ansi+cup,
-	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h, smso=\E[7m,
+	smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
+	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
+	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
 	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
-	use=xterm+256color, use=xterm+alt1049, use=xterm+pcc2,
-	use=xterm+pce2, use=xterm+pcf2,
+	use=xterm+256color, use=xterm+acs, use=xterm+alt1049,
+	use=xterm+pcc2, use=xterm+pce2, use=xterm+pcf2,
 
 contour-direct|Contour terminal with direct colors,
 	use=xterm+direct, use=contour,
@@ -8314,30 +8250,29 @@ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 # the (Siemens Nixdorf) 97801 terminal.  It was not shown in the termcap or
 # terminfo entries (which list about 60% of the control sequences).
 screen-base|VT 100/ANSI X3.64 virtual terminal (base),
-	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
-	cols#80, lines#24, ncv@, U8#1,
+	OTbs, OTpt, km, mir, xenl, G0,
+	ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+	cnorm=\E[34h\E[?25h, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
-	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?,
-	kcbt=\E[Z, 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~,
-	kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+	kbs=^?, kcbt=\E[Z, 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~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
 	rs2=\Ec\E[?1000l\E[?25h,
 	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, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[3m, smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B,
-	S0=\E(%p1%c, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=xterm+kbs, use=vt220+pcedit,
-	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
+	sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
+	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8683,13 +8618,11 @@ mosh-256color|mosh using 256-colors,
 # + Most of the mode-settings in the initialization/reset strings are not
 #   implemented; dvtm copies its description from rxvt.
 dvtm|dynamic virtual terminal manager,
-	am, eo, mir, msgr, xenl, AX,
-	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+	eo, mir, xenl,
+	ncv@,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
 	is1=\E[?47l\E=\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
@@ -8701,20 +8634,19 @@ dvtm|dynamic virtual terminal manager,
 	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[23$,
 	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, op=\E[39;49m,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m,
+	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, rev=\E[7m,
+	ri=\EM, rmir=\E[4l, 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,
-	s0ds=\E(B, s1ds=\E(0, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%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, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47, use=vt220+vtedit, use=vt220+cvis,
-	use=ecma+italics,
+	sgr0=\E[m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=xterm+alt47,
+	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
+	use=ecma+italics, use=vt100+4bsd,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
 	colors#0x100, pairs#0x10000,
@@ -8762,7 +8694,6 @@ dvtm-256color|dynamic virtual terminal manager with 256 colors,
 # pairs, since the latter ends the string that is loaded to the window-title.
 ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	am, km, mir, msgr, xenl,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
 	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
@@ -8776,15 +8707,15 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~,
 	khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i,
 	rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
-	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m,
+	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>,
 	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=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
+	sgr0=\E[m\E(B, smam=\E[?7h, smcup=\E7, smir=\E[4h,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c,
+	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=vt220+cvis, use=xterm+acs,
 	use=xterm+sl, use=ansi+enq,
 
 ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
@@ -8844,7 +8775,7 @@ elks-vt52|ELKS VT52 console,
 
 elks-ansi|ELKS ANSI console,
 	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	el=\E[K, home=\E[H, rmso=\E[m, smso=\E[7m, use=ansi+local1,
+	el=\E[K, home=\E[H, use=ansi+local1, use=ansi+sgrso,
 	use=elks-glasstty,
 
 # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
@@ -9403,24 +9334,23 @@ cygwinDBG|Debug Version for Cygwin,
 	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, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dim=\E[2m, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\n, kNXT=\E[6$, kPRV=\E[5$,
-	kb2=\E[G, kcbt=\E[Z, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM,
-	rmacs=\E[10m, rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
+	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~, kspd=^Z,
+	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rmacs=\E[10m,
+	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,
-	sgr0=\E[0;10m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
-	use=vt220+cvis, use=vt102+enq,
+	sgr0=\E[0;10m, smacs=\E[11m, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=vt220+pcedit, use=vt220+cvis,
+	use=vt102+enq,
 
 #### DJGPP
 
@@ -12737,10 +12667,10 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#25, vt#3,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-	clear=\E[H\E[J$<200>, cnorm=\E[34h\E[?25h, cr=\r,
-	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
-	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+	bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J$<200>,
+	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD$<1>,
+	cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED,
+	cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
 	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
 	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
@@ -12762,8 +12692,8 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	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,
-	use=ansi+csr, use=ansi+idl, use=ansi+pp, use=ansi+sgr,
+	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+	use=ansi+pp, use=ansi+sgrbold,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
@@ -12919,16 +12849,15 @@ wy75|wyse75|Wyse 75,
 	am, hs, mir, msgr, xenl, xon,
 	cols#80, lines#24, ma#1, pb#1201, wsl#78,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<30>, cr=\r,
+	bel=^G, clear=\E[H\E[J$<30>, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>,
 	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\,$<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>,
+	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@$<1*>,
+	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
 	kf1=\E[?5i, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -12946,8 +12875,8 @@ wy75|wyse75|Wyse 75,
 	    \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=ansi+arrows,
-	use=ansi+local, use=ansi+pp, use=decid+cpr,
+	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
+	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
 	use=vt220+cvis, use=vt220+keypad,
 #
 #	This terminal description uses the non-hidden attribute mode
@@ -12986,35 +12915,33 @@ wy75-wvb|wyse75-wvb|Wyse 75 with visible bell 132 columns,
 #	<dch> leave trash on the screen when used without XON/XOFF.
 #
 wy85|wyse85|Wyse 85,
-	am, hs, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>,
-	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\,$<300/>\E[30l,
-	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>,
-	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>,
-	ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
+	hs, mir, xenl, xon,
+	wsl#80,
+	clear=\E[H\E[J$<110>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<1>, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
+	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
+	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, 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~,
 	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
 	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, 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,
+	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
+	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	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,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+arrows,
 	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+	use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis,
+	use=vt220+keypad,
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|Wyse 85 with visible bell,
@@ -13040,39 +12967,35 @@ wy85-wvb|wyse85-wvb|Wyse 85 with visible bell 132-columns,
 # terminfo should reflect the manufacturer's intended behaviour of the terminal
 # or the actual."
 wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
-	am, hs, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>,
+	hs, mir, xenl, xon,
+	wsl#80,
+	clear=\E[H\E[J$<110>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<1>, 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\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, ht=\011$<1>, ich=\E[%p1%d@$<4*>,
-	il=\E[%p1%dL$<5*>, il1=\E[L$<5>, ind=\n$<3>, ip=$<3>,
-	is1=\E[62;1"p\E[?5W,
+	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
+	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, ka1=\EOw, ka3=\EOy, kb2=\EOu,
-	kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B,
-	kcuf1=\233C, kcuu1=\233A, kdch1=\2333~, kent=\EOM,
-	kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~,
-	kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~,
-	kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\EOQ,
-	kf20=\23334~, kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~,
-	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
-	khome=\23326~, kich1=\2332~, knp=\2336~, kpp=\2335~,
-	kslt=\2334~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	ri=\EM$<3>, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p,
+	kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B, kcuf1=\233C,
+	kcuu1=\233A, kdch1=\2333~, kf10=\23321~, kf11=\23323~,
+	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
+	kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~,
+	kf20=\23334~, kf6=\23317~, kf7=\23318~, kf8=\23319~,
+	kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\23326~,
+	kich1=\2332~, knp=\2336~, kpp=\2335~, kslt=\2334~, lf1=PF1,
+	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
 	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	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,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+csr,
 	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=decid+cpr, use=vt220+cvis,
+	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
+	use=vt100+pfkeys, use=vt220+cvis,
 #
 #	Wyse 185 emulating a VT320 7 bit mode.
 #
@@ -13085,20 +13008,18 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 #	by set-up.
 #
 wy185|wyse185|Wyse 185,
-	am, hs, km, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
-	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+	hs, km, mir, xenl, xon,
+	wsl#80,
+	civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, csr=\E[%i%p1%d;%p2%dr$<20>,
 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>,
 	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\,$<100/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>,
-	il=\E[%p1%dL$<3*>, il1=\E[L$<3>, ind=\n$<2>, ip=$<4>,
-	is1=\E[?5W,
+	hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
+	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
@@ -13106,18 +13027,17 @@ wy185|wyse185|Wyse 185,
 	kf19=\E[33~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
 	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
-	rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
+	rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, 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%;,
-	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,
-	tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
+	sgr0=\E[m\017, smam=\E[?7h, smcup=\E[ Q, smir=\E[4h,
+	smkx=\E[?1l\E=, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+keypad,
+	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|Wyse 185 with 24 data lines,
@@ -13265,7 +13185,7 @@ wy370-nk|Wyse 370 without function keys,
 	am, ccc, hs, mir, msgr, xenl, xon,
 	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
 	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l,
 	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, dclk=\E[31h,
@@ -13294,12 +13214,12 @@ wy370-nk|Wyse 370 without function keys,
 	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,
+	smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
 	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
 	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=decid+cpr,
+	use=ansi+sgrbold, use=decid+cpr,
 #
 #	Function key set for the ASCII (wy-50 compatible) keyboard
 #	This is the default 370.
@@ -13425,16 +13345,15 @@ wy520|wyse520|Wyse 520,
 	am, hs, km, mir, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l,
-	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
-	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
+	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
+	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
-	enacs=\E)0, fsl=\E[0$}, 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>, ip=$<4>, is1=\E[?5W,
+	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`,
+	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
+	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -13443,17 +13362,16 @@ wy520|wyse520|Wyse 520,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
 	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
 	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, 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,
+	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,
 	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`,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+local, use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+keypad,
+	smcup=\E[ Q\E[?67;8h, smir=\E[4h,
+	tsl=\E[2$~\E[1$}\E[%i%p1%d`, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+local,
+	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13955,14 +13873,13 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	nel=\r\n,
 	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, ri=\EM, rmacs=^O, rmso=\E[m,
-	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O,
+	rs2=\Ec\E[?3l\E[2;0y,
 	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, use=ansi+arrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+local1,
-	use=ansi+sgr,
+	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+local1, use=ansi+sgrbold,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -14107,8 +14024,8 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H,
 	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
 	cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
+	ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
 	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
 	indn=\E[%p1%dE,
 	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j
@@ -14125,14 +14042,14 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	    %s\E~,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, 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,
+	rs2=\Ec\E[?3l\E[2;0y,
 	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%;%?%p8%t\EV%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
-	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr,
+	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
+	use=decid+cpr,
 
 att5420_2-w|AT&T 5420 model 2 in 132 column mode,
 	cols#132,
@@ -14237,16 +14154,13 @@ att4424m|tty4424m|Teletype 4424M,
 #
 # (att5425: added <rmam>/<smam> based on the init string -- esr)
 att5425|tty5425|att4425|AT&T 4425/5425,
-	am, da, db, hs, mir, msgr, xenl, xon,
-	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[2;7m, cnorm=\E[12;0j, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
-	indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
+	da, db, hs, mir, xenl, xon,
+	lh#2, lm#78, lw#8, nlab#8, wsl#55,
+	bold=\E[2;7m, cnorm=\E[12;0j, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, hpa=\E[%p1%{1}%+%dG,
+	ich=\E[%p1%d@, indn=\E[%p1%dE, 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,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
@@ -14256,17 +14170,17 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, nel=\r\n,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, 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,
+	rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
+	rs2=\Ec\E[?3l\E[2;0y,
 	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, tsl=\E7\E[25;%p1%{8}%+%dH,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgr, use=decid+cpr,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~,
+	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
 	smkx=\E[21;1j\E[25;4j\Eent, use=att4425,
@@ -14307,12 +14221,12 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	am, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	civis=\E[11;0|, clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, hts=\EH,
-	ind=\n, is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
+	bel=^G, blink=\E[5m, bold=\E[2;7m, civis=\E[11;0|,
+	clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	enacs=\E(B\E)1, ff=^L, home=\E[H, ind=\n,
+	is1=\E(B\E)1\E[2l, 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,
@@ -14324,8 +14238,8 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	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, use=ansi+cpr, use=ansi+idl,
-	use=ansi+local,
+	smul=\E[4m, use=ansi+cpr, use=ansi+idl, use=ansi+local,
+	use=ansi+tabs,
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -14340,40 +14254,40 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	am, da, db, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[2;7m, cbt=\E[Z, clear=\E[H\E[J,
-	cnorm=\E[11;3|, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	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@, ind=\n, 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,
+	bel=^G, bold=\E[2;7m, clear=\E[H\E[J, cnorm=\E[11;3|,
+	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
+	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	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, 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,
+	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, 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=ansi+cpr, use=ansi+idl, use=ansi+local, use=ansi+rep,
-	use=ansi+sgr, use=ecma+index,
+	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+cpr, use=ansi+idl,
+	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
+	use=ansi+tabs, use=ecma+index,
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 att500|att513|AT&T 513 using page mode,
 	am, chts, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[2;7m, cbt=\E[Z, cnorm=\E[11;0|, cr=\r,
+	bel=^G, bold=\E[2;7m, cnorm=\E[11;0|, cr=\r,
 	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP,
 	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE,
+	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	indn=\E[%p1%dE,
 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
@@ -14399,18 +14313,17 @@ att500|att513|AT&T 513 using page mode,
 	pfx=\E[%p1%d;%p2%l%d;1;0p   F%p1%d           %p2%s,
 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, 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,
+	rmln=\E<,
 	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%|%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, 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,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
-	use=decid+cpr,
+	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+rep,
+	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
 
 # 01-07-88:
 # printer must be set to EMUL ANSI to accept ESC codes
@@ -14555,10 +14468,10 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@,
+	ind=\ED,
 	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,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14568,16 +14481,14 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	nel=\EE,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
-	rs2=\Ec\E[?3l,
+	rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rs2=\Ec\E[?3l,
 	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=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr, use=ecma+index,
-	use=att610+cvis,
+	smln=\E[p, tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=decid+cpr,
+	use=ecma+index, use=att610+cvis,
 
 att610-w|AT&T 610; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14628,10 +14539,10 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@,
+	ind=\ED,
 	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[ @,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14648,15 +14559,15 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, 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,
+	rs2=\Ec\E[?3l,
 	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, use=ansi+arrows, use=ansi+csr,
-	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=decid+cpr,
-	use=ecma+index, use=att610+cvis,
+	smir=\E[4h, smln=\E[p, tsl=\E7\E[25;%i%p1%dx,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=decid+cpr, use=ecma+index,
+	use=att610+cvis,
 
 att620-w|AT&T 620; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14798,7 +14709,7 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	bel=^G, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
 	fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED,
@@ -14824,12 +14735,11 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
 	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|, tsl=\E7\E[99;%i%p1%dx,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+rep, use=ansi+sgr, use=decid+cpr,
-	use=att610+cvis0,
+	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p,
+	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+	use=ansi+sgrbold, use=decid+cpr, use=att610+cvis0,
 
 # This entry was modified 3/13/90 by JWE.
 # fixes include additions of <enacs>, correcting <rep>, and modification
@@ -14848,10 +14758,10 @@ att730|AT&T 730 windowing terminal,
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
-	fsl=\E8, ht=^I, ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
+	ich=\E[%p1%d@, ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14875,10 +14785,10 @@ att730|AT&T 730 windowing terminal,
 	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, use=ansi+arrows,
-	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	smln=\E[?13l, smxon=\E[?21h, swidm=\E#6,
+	tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
 	use=decid+cpr, use=att610+cvis,
 
 # "MGT" is "Multi-Tasking Graphics Terminal"
@@ -15337,9 +15247,9 @@ aas1901|Ann Arbor K4080 w/S1901 mod,
 aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
 	cols#80,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<156>, cr=\r, cub1=^H,
-	cud1=^K, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ed=\E[J, el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
+	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
 	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
 	is1=\E[m\E7\E[H\E9\E8,
 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
@@ -15352,15 +15262,15 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
-	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
+	rmm=\E[>52l, sc=\E7,
 	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
 	     \\,
-	smm=\E[>52h, smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=ansi+sgrbold,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -16434,13 +16344,13 @@ hds200|Human Designed Systems HDS200,
 avt-ns|Concept AVT no status line,
 	OTbs, am, eo, mir, ul, xenl, xon,
 	cols#80, lines#24, lm#192,
-	acsc=, bel=^G, bold=\E[1m, clear=\E[H\E[J$<38>,
-	cnorm=\E[=119l, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h, dim=\E[1!{,
-	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
-	el=\E[K$<6>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=\011$<4>,
-	ich=\E[%p1%d@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>,
-	ind=\n$<8>, ip=$<4>, is1=\E[=103l\E[=205l,
+	acsc=, bel=^G, clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h,
+	dim=\E[1!{, dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>,
+	ed=\E[J$<96>, el=\E[K$<6>, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, ich=\E[%p1%d@,
+	il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, 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,
@@ -16456,10 +16366,9 @@ avt-ns|Concept AVT no status line,
 	    \016%;$<1>,
 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+idc1,
-	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
-	use=ansi+sgr,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idc1, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=ansi+sgrbold,
 
 avt-rv-ns|Concept AVT in reverse video mode/no status line,
 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
@@ -17479,25 +17388,15 @@ falco-p|ts1p|ts-1p|Falco ts-1 with paging option,
 
 # (ts100: I added <rmam>/<smam> based on the init string -- esr)
 ts100|ts100-sp|Falco ts100-sp,
-	am, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, dch1=\E~W, dl1=\E~R, ed=\E[J$<50>,
-	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
-	ht=^I, hts=\EH, ich1=\E~Q, il1=\E~E, ind=\n, is1=\E~)\E~ea,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	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,
-	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=ansi+csr, use=ansi+local, use=decid+cpr,
-	use=vt100+fnkeys,
+	mir, xenl, xon,
+	vt#3,
+	cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, dch1=\E~W,
+	dl1=\E~R, ich1=\E~Q, il1=\E~E, is1=\E~)\E~ea, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l,
+	rmkx=\E[?1l\E>,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smam=\E[?7h,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local,
+	use=decid+cpr, use=vt100+4bsd, use=vt100+fnkeys,
 
 ts100-ctxt|Falco ts-100 saving context,
 	rmcup=\E~_b, smcup=\E~_d\E[2J, use=ts100,
@@ -18091,27 +17990,26 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ech=\E[%p1%dX,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S, is2=\Ec, kcbt=\E[Z,
-	kclr=\E[144q, 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, kich1=\E[139q, kil1=\E[140q, kind=\E[151q,
-	knp=\E[154q, kpp=\E[150q, kri=\E[155q, krmir=\E[4l,
-	ri=\E[T, rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\E[S, is2=\Ec, kcbt=\E[Z, kclr=\E[144q, 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, kich1=\E[139q,
+	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
+	kri=\E[155q, krmir=\E[4l, ri=\E[T, rmir=\E[4l, 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=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=ecma+index,
+	smir=\E[4h, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+	use=ecma+index,
 
 ibmaed|IBM Experimental display,
 	OTbs, am, eo, msgr,
@@ -18237,8 +18135,8 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
 	kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q,
@@ -18257,9 +18155,9 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	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, use=ansi+arrows, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=ecma+index,
+	smacs=\E(0, smir=\E[4h, tbc=\E[3g, use=ansi+arrows,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+	use=ecma+index,
 
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@@ -19329,9 +19227,9 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
-	cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>,
-	cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>, cub=\E[%p1%dD$<5>,
+	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
+	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
 	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
 	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX,
@@ -19350,8 +19248,8 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	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,
-	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgr,
+	smkx=\E[?1h\E=, smso=\E[1;7m, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgrbold,
 	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
 	use=vt220+keypad, use=ncr260vt+sl,
 
@@ -19384,7 +19282,7 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
 	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
 	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
 	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
@@ -19415,10 +19313,10 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	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, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad, use=ncr260vt+sl,
+	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ncr260vt+sl,
 
 ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 	cols#132,
@@ -19442,7 +19340,7 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
 	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
 	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
 	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
@@ -19473,10 +19371,10 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	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, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad, use=ncr260vt+sl,
+	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ncr260vt+sl,
 
 ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 	cols#132,
@@ -19746,26 +19644,24 @@ ncr160wy60pp|NCR 2900/160 Wyse 60,
 ncr160wy60wpp|NCR 2900/160 Wyse 60 wide mode,
 	use=ncr260wy60wpp,
 ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
-	am, hs, mc5i, mir, msgr, xon,
-	cols#80, it#8, lines#24, nlab#32,
+	hs, mc5i, mir, xon,
+	nlab#32,
 	acsc=``aaffgghhiijjkkllmmnnqqttuuvvwwxxyyzz~~,
-	bel=^G, blink=\E[5m$<30>, bold=\E[1m$<30>,
-	clear=\E[2J\E[1;1H$<300>, cr=\r,
+	blink=\E[5m$<30>, bold=\E[1m$<30>,
+	clear=\E[2J\E[1;1H$<300>,
 	csr=\E[%i%p1%d;%p2%dr$<100>, cub=\E[%p1%dD$<30>,
 	cub1=\E[D$<2>, cud=\E[%p1%dB$<30>, cud1=\E[B$<2>,
-	cuf=\E[%p1%dC$<30>, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<100>, cuu=\E[%p1%dA$<30>,
-	cuu1=\E[A$<2>, dch=\E[%p1%dP$<40>, dch1=\E[1P$<10>,
-	dl=\E[%p1%dM$<70>, dl1=\E[M$<40>, dsl=\E[31l$<25>,
-	ed=\E[0J$<300>, el=\E[0K$<30>, el1=\E[1K$<30>,
-	enacs=\E(B\E)0$<40>, fsl=1$<10>, home=\E[H$<2>$<80>,
-	ht=^I, hts=\EH, il=\E[%p1%dL$<80>, il1=\E[B\E[L$<80>,
-	ind=\ED,
+	cuf=\E[%p1%dC$<30>, cup=\E[%i%p1%d;%p2%dH$<100>,
+	cuu=\E[%p1%dA$<30>, dch=\E[%p1%dP$<40>,
+	dch1=\E[1P$<10>, dl=\E[%p1%dM$<70>, dl1=\E[M$<40>,
+	dsl=\E[31l$<25>, ed=\E[0J$<300>, el=\E[0K$<30>,
+	el1=\E[1K$<30>, enacs=\E(B\E)0$<40>, fsl=1$<10>,
+	home=\E[H$<2>$<80>, il=\E[%p1%dL$<80>,
+	il1=\E[B\E[L$<80>, ind=\ED,
 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0$<200>,
-	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kent=\r, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE,
-	rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
+	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, kf1=\EOP, 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>,
@@ -19774,7 +19670,7 @@ ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
 	    %p3%|%t;7%;%?%p4%t;5%;m$<120>,
 	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>, use=decid+cpr,
+	tsl=\E[>+1$<70>, use=decid+cpr, use=vt100+4bsd,
 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>,
@@ -20030,10 +19926,11 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
 	khome=\E[H, rc=\EX, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
-	rmacs=\Ed, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	rmacs=\Ed, rmam=\E[?7l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
-	sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m, smul=\E[4m,
-	tsl=\E], uc=\EPB, use=ansi+apparrows, use=ansi+local,
+	sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB,
+	use=ansi+apparrows, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 #### Tandem
 #
@@ -20269,23 +20166,13 @@ tek4105|Tektronix 4105,
 
 # (tek4105-30: I added <rmam>/<smam> based on the init string -- esr)
 tek4105-30|Tektronix 4015 emulating 30 line VT100,
-	am, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#30, vt#3,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	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,
-	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=ansi+csr, use=ansi+local, use=vt100+fnkeys,
+	mir, xenl, xon,
+	lines#30, vt#3,
+	cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rmso=\E[m$<2>, smam=\E[?7h,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local,
+	use=vt100+4bsd, use=vt100+fnkeys,
 
 # Tektronix 4105 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20496,15 +20383,12 @@ otek4115|Tektronix 4115 (old),
 tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
 	am, xon,
 	cols#80, lines#34,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n,
-	dch1=\E[P, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
-	kcuu1=\E[A, rmam=\E[?7l, rmso=\E[m, rmul=\E[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,
-	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+rep, use=ansi+rca,
-	use=ansi+sgr,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch1=\E[P, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\n, kcuu1=\E[A, rmam=\E[?7l, sgr0=\E[m,
+	smam=\E[?7h, use=ansi+arrows, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+rep, use=ansi+rca, use=ansi+sgrbold,
+	use=ansi+tabs,
 
 # The tek4125 emulates a VT100 incorrectly - the scrolling region
 # command is ignored.  The following entry replaces <csr> with the needed
@@ -20768,19 +20652,18 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	cols#80, it#8, lines#24,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S\E[B,
-	indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kcbt=^],
-	kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, kf3=\242,
-	kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247, kf9=\250,
-	kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H, nel=\r,
-	rev=\E[7m, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
-	rmso=\E[m, rmul=\E[m,
+	bel=^G, clear=\Ec, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
+	hpa=\E[%i%p1%dG, ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB,
+	invis=\E[30;40m, kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240,
+	kf10=\251, kf2=\241, kf3=\242, kf4=\243, kf5=\244, kf6=\245,
+	kf7=\246, kf8=\247, kf9=\250, kich1=\E[^H, knp=\E[U,
+	kpp=\E[V, ll=\E[24;1H, nel=\r, rev=\E[7m, ri=\E[T\E[A,
+	rin=\E[%p1%dT\E[%p1%dA,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+local,
+	sgr0=\E[m, use=ansi+arrows, use=ansi+local,
+	use=ansi+sgrbold,
 
 #### Apple II
 #
@@ -22069,15 +21952,14 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	kf8=\E[8u\027, khts=\EH, kil1=\E[L, krmir=\E[4l,
 	ll=\E[H\E[A, mc0=\E[0i, 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,
+	rmir=\E[4l, 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%;,
 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99:98\E\\,
 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local,
+	use=ansi+local, use=ansi+sgrdim,
 
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
@@ -22174,35 +22056,31 @@ dku7202|Bull Questar 200 DKU7202 (colour/character attributes),
 
 # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
 bq300|Bull VT320 ISO Latin 1 80 columns terminal,
-	am, eo, eslok, hs, km, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\E[?5h$<50>\E[?5l, fsl=\E[0$},
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
-	is1=\E[63;1"p\E[2h,
+	eo, eslok, hs, km, mir, xenl, xon,
+	vt#3, wsl#80,
+	blink=\E[5m, bold=\E[1m, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[1$}\E[2$~\n\E[0$},
+	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<50>\E[?5l,
+	fsl=\E[0$}, ich=\E[%p1%d@, ind=\ED, is1=\E[63;1"p\E[2h,
 	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, 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, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
-	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
-	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, 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,
+	kb2=\EOu, kc1=\EOq, kc3=\EOs, 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,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+	nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+	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,
 	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+enq,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+pp, use=vt220+cvis,
+	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+pp, use=vt100+4bsd, use=vt220+cvis,
 	use=vt220+vtedit,
 
 bq300-rv|Bull VT320 reverse 80 columns,
@@ -22277,28 +22155,26 @@ bq300-w-rv|Bull VT320 reverse mode 132 columns,
 # and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off
 # (bq300-8: <cub1>,<cuf1>,<cuu1>,<cud1>,<dl1>,<il1> to get under 1024 --esr)
 bq300-8|Bull VT320 full 8 bits 80 columns,
-	am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\2335m, bold=\2331m, clear=\233H\233J, cr=\r,
+	eo, eslok, hs, km, mc5i, mir, xenl, xon,
+	vt#3, wsl#80,
+	blink=\2335m, bold=\2331m, clear=\233H\233J,
 	csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D,
 	cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C,
 	cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A,
 	dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M,
 	dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J,
-	el=\233K, el1=\2331K, enacs=\E(B\E)0,
-	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,
+	el=\233K, el1=\2331K, flash=\233?5h$<50>\233?5l,
+	fsl=\2330$}, home=\233H, 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\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,
-	kdch1=\2333~, kf1=\217P, kf10=\23321~, kf11=\23323~,
-	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
-	kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~,
-	kf2=\217Q, kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~,
+	ka3=\217y, kb2=\217u, kc1=\217q, kc3=\217s, kcub1=\233D,
+	kcud1=\233B, kcuf1=\233C, kcuu1=\233A, kdch1=\2333~,
+	kf1=\217P, kf10=\23321~, kf11=\23323~, kf12=\23324~,
+	kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~,
+	kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\217Q,
+	kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~,
 	kf7=\23318~, kf8=\23319~, kf9=\23320~, kfnd=\2331~,
 	khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~,
 	krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
@@ -22312,7 +22188,7 @@ bq300-8|Bull VT320 full 8 bits 80 columns,
 	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$~,
-	use=vt220+cvis8,
+	use=vt100+4bsd, use=vt220+cvis8,
 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
@@ -22981,22 +22857,21 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	am, eslok, hs, mir, msgr, xon,
 	cols#80, lines#24,
 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
-	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
-	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	fsl=\E[u, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[1L,
-	ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw,
-	ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS,
-	kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
-	kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
+	blink=\E[5m, bold=\E[1m, civis=\E[>5h, clear=\E[2J\E[H,
+	cnorm=\E[>5l, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l, ed=\E[0J,
+	el=\E[0K, el1=\E[1K, fsl=\E[u, home=\E[H, il=\E[%p1%dL,
+	il1=\E[1L, ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J,
+	ka1=\EOw, ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J,
+	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
+	kf7=\EOQ, kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
 	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
 	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
 	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
-	smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
-	use=ansi+local, use=ansi+pp,
+	use=ansi+local, use=ansi+pp, use=ansi+tabs,
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
@@ -23121,9 +22996,9 @@ graphos|graphos III,
 	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
 	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
-	rmir=\E[4l, rmso=\E[m, sc=\E7, sgr0=\E[m, smdc=\E[4h,
-	smir=\E[4h, smso=\E[7m, use=ansi+arrows, use=ansi+idl,
-	use=ansi+local,
+	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
+	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso,
 
 graphos-30|graphos III with 30 lines,
 	lines#30,
@@ -23332,12 +23207,12 @@ hirez100|Selanar HiREZ-100,
 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
 	lf1=PF2, lf2=PF3, 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,
+	rev=\E[7m, rmacs=^O, rmkx=\E[?1l\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, use=ansi+erase, use=ansi+idl,
-	use=ansi+local,
+	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
@@ -23795,8 +23670,7 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	am, bw, eo, xon,
 	cols#80, lines#25,
 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C,
-	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
+	bel=^G, civis=\E[=C, clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
 	cup=\E[%i%p1%d;%p2%dH, 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, ich=\E[%p1%d@,
@@ -23805,13 +23679,12 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
 	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
 	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,
+	rc=\E8, ri=\E[T, rmacs=\E[10m, 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,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+inittabs,
-	use=ansi+local, use=ecma+index, use=klone+color,
+	sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, 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,
@@ -27694,4 +27567,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr
 #	  to trim -TD
 #
+# 2024-01-14
+#	+ use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs
+#	  ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit
+#	  xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 59e80d05f..ae198df67 100644
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.183 2022/10/01 12:47:39 tom Exp $
+# $Id: Makefile.in,v 1.184 2024/01/19 12:00:00 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -251,7 +251,7 @@ init_keytry.h : make_keys$(BUILD_EXEEXT) keys.list
 	./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :	$(tinfo)/MKkeys_list.sh
-	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@
+	AWK=$(AWK) USE_SIGWINCH=@cf_cv_enable_sigwinch@ $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@
 
 make_keys$(BUILD_EXEEXT) : \
 		build.priv.h \
@@ -288,7 +288,7 @@ report_offsets$(BUILD_EXEEXT) : \
 	$(SHELL) -e $(tinfo)/MKuserdefs.sh $(AWK) $(USE_BIG_STRINGS) $(CAPLIST) > $@
 
 ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
-	$(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
+	$(AWK) -f $(base)/MKkeyname.awk use_sigwinch=@cf_cv_enable_sigwinch@ bigstrings=$(USE_BIG_STRINGS) keys.list > $@
 
 ./codes.c: $(tinfo)/MKcodes.awk
 	$(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@
diff --git a/ncurses/tinfo/MKkeys_list.sh b/ncurses/tinfo/MKkeys_list.sh
index 0facfbb81..05ac8cf62 100755
--- a/ncurses/tinfo/MKkeys_list.sh
+++ b/ncurses/tinfo/MKkeys_list.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Id: MKkeys_list.sh,v 1.8 2022/02/05 20:40:20 tom Exp $
+# $Id: MKkeys_list.sh,v 1.9 2024/01/19 12:26:30 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2003,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -36,6 +36,7 @@
 # Extract function-key names from the Caps file
 #
 : ${AWK-awk}
+: ${USE_SIGWINCH-0}
 if test $# != 0
 then
 	DATA="$*"
@@ -53,8 +54,8 @@ cat <<EOF
 KEY_BREAK
 KEY_SRESET
 KEY_RESET
-KEY_RESIZE
 EOF
+test "$USE_SIGWINCH" = 1 && echo KEY_RESIZE
 
 ${AWK-awk} <$data '
 /^#/		{next;}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 93de69c0a..0a77de595 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240113) unstable; urgency=low
+ncurses6 (6.4+20240120) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 93de69c0a..0a77de595 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240113) unstable; urgency=low
+ncurses6 (6.4+20240120) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2bbe1c660..b3b725619 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240113) unstable; urgency=low
+ncurses6 (6.4+20240120) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 803262a2c..23076414c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.628 2024/01/13 10:52:13 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.629 2024/01/19 11:23:02 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0113"
+!define VERSION_MMDD  "0120"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6e43bd2fa..051376730 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 22af400a0..142275f7b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index b32a9607d..88c58ee2c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 3bdd8e739..fdab359ae 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.220 2023/12/03 14:21:34 tom Exp $
+dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1098,7 +1098,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 15 updated: 2021/01/02 09:31:20
+dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -1144,7 +1144,7 @@ case "$cf_cv_term_header" in
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
-make an error
+#error expected NCURSES_VERSION to be defined
 #endif],
 			[WINDOW *x; (void)x],
 			[cf_cv_term_header=$cf_header
@@ -3074,7 +3074,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02
+dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -3104,7 +3104,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -4386,7 +4386,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 18 updated: 2023/01/11 04:05:23
+dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -4403,15 +4403,16 @@ $ac_includes_default
 #include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(NCURSES_VERSION_PATCH)
 #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
-	make an error
+	#error disallow ncurses versions between 2020/04/03 and 2010/05/01
 #endif
 #endif
 #ifdef NCURSES_WIDECHAR
-make an error	/* prefer to fall-through on the second checks */
+#error prefer to fall-through on the second checks
 #endif
+	static char dummy[10];
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
-	long x = winnstr(stdscr, "", 0);
+	long x = winnstr(stdscr, dummy, 5);
 	int x1, y1;
 	(void)check2;
 	getbegyx(stdscr, y1, x1);
@@ -4427,9 +4428,10 @@ make an error	/* prefer to fall-through on the second checks */
 #define $cf_try_xopen_extension 1
 $ac_includes_default
 #include <${cf_cv_ncurses_header:-curses.h}>],[
+		static char dummy[10];
 		cchar_t check;
 		int check2 = curs_set((int)sizeof(check));
-		long x = winnstr(stdscr, "", 0);
+		long x = winnstr(stdscr, dummy, 5);
 		int x1, y1;
 		getbegyx(stdscr, y1, x1);
 		(void)check2;
diff --git a/test/configure b/test/configure
index dfc9112e9..d20e3c768 100755
--- a/test/configure
+++ b/test/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230903.
+# Generated by Autoconf 2.52.20231210.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -809,7 +809,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230903.  Invocation command line was
+generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
 
@@ -2447,8 +2447,8 @@ for ac_kw in inline __inline__ __inline; do
 #line 2447 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
+static $ac_kw int static_foo (void) {return 0; }
+$ac_kw int foo (void) {return 0; }
 #endif
 
 _ACEOF
@@ -3881,7 +3881,7 @@ 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 strlcat ();
+char strlcat (void);
 int
 main (void)
 {
@@ -6171,7 +6171,7 @@ int
 main (void)
 {
 #ifndef exit
-  char *p = (char *) exit; (void) p;
+  (void) exit;
 #endif
 
   ;
@@ -7188,7 +7188,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -7280,7 +7280,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -7357,7 +7357,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -7428,7 +7428,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -7737,7 +7737,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -10074,7 +10074,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -10133,7 +10133,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -10183,7 +10183,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -10245,7 +10245,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -12161,7 +12161,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -12220,7 +12220,7 @@ 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 Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -12270,7 +12270,7 @@ 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 initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -12332,7 +12332,7 @@ 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 tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -13039,7 +13039,7 @@ 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 XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -13081,7 +13081,7 @@ 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 dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -13135,7 +13135,7 @@ 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 dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -13261,7 +13261,7 @@ 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 gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -13315,7 +13315,7 @@ 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 gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -13438,7 +13438,7 @@ 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 connect ();
+char connect (void);
 int
 main (void)
 {
@@ -13554,7 +13554,7 @@ 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 remove ();
+char remove (void);
 int
 main (void)
 {
@@ -13670,7 +13670,7 @@ 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 shmat ();
+char shmat (void);
 int
 main (void)
 {
@@ -13735,7 +13735,7 @@ 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 IceConnectionNumber ();
+char IceConnectionNumber (void);
 int
 main (void)
 {
@@ -14408,7 +14408,7 @@ 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 XextCreateExtension ();
+char XextCreateExtension (void);
 int
 main (void)
 {
@@ -15953,7 +15953,7 @@ 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 XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -16086,7 +16086,7 @@ 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 XtAppInitialize ();
+char XtAppInitialize (void);
 int
 main (void)
 {
@@ -16756,7 +16756,7 @@ 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 XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -16959,7 +16959,7 @@ 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 _nc_init_pthreads ();
+char _nc_init_pthreads (void);
 int
 main (void)
 {
@@ -17487,7 +17487,7 @@ 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 new_panel ();
+char new_panel (void);
 int
 main (void)
 {
@@ -17892,7 +17892,7 @@ 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 menu_driver ();
+char menu_driver (void);
 int
 main (void)
 {
@@ -18298,7 +18298,7 @@ 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 form_driver ();
+char form_driver (void);
 int
 main (void)
 {
@@ -18763,7 +18763,7 @@ 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 gettimeofday ();
+char gettimeofday (void);
 int
 main (void)
 {
@@ -19119,15 +19119,16 @@ main (void)
 
 #if defined(NCURSES_VERSION_PATCH)
 #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
-	make an error
+	#error disallow ncurses versions between 2020/04/03 and 2010/05/01
 #endif
 #endif
 #ifdef NCURSES_WIDECHAR
-make an error	/* prefer to fall-through on the second checks */
+#error prefer to fall-through on the second checks
 #endif
+	static char dummy[10];
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
-	long x = winnstr(stdscr, "", 0);
+	long x = winnstr(stdscr, dummy, 5);
 	int x1, y1;
 	(void)check2;
 	getbegyx(stdscr, y1, x1);
@@ -19140,16 +19141,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19146: \$? = $ac_status" >&5
+  echo "$as_me:19147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19152: \$? = $ac_status" >&5
+  echo "$as_me:19153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19159,7 +19160,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19162 "configure"
+#line 19163 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19169,9 +19170,10 @@ int
 main (void)
 {
 
+		static char dummy[10];
 		cchar_t check;
 		int check2 = curs_set((int)sizeof(check));
-		long x = winnstr(stdscr, "", 0);
+		long x = winnstr(stdscr, dummy, 5);
 		int x1, y1;
 		getbegyx(stdscr, y1, x1);
 		(void)check2;
@@ -19184,16 +19186,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19196: \$? = $ac_status" >&5
+  echo "$as_me:19198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19207,7 +19209,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19210: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19212: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19219,7 +19221,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19222: checking for term.h" >&5
+echo "$as_me:19224: 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
@@ -19240,7 +19242,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19243 "configure"
+#line 19245 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19254,16 +19256,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19260: \$? = $ac_status" >&5
+  echo "$as_me:19262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19266: \$? = $ac_status" >&5
+  echo "$as_me:19268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19282,14 +19284,14 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19285 "configure"
+#line 19287 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
-make an error
+#error expected NCURSES_VERSION to be defined
 #endif
 int
 main (void)
@@ -19300,16 +19302,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19306: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19312: \$? = $ac_status" >&5
+  echo "$as_me:19314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19324,7 +19326,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19327: result: $cf_cv_term_header" >&5
+echo "$as_me:19329: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19351,7 +19353,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19354: checking for unctrl.h" >&5
+echo "$as_me:19356: 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
@@ -19372,7 +19374,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19375 "configure"
+#line 19377 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19386,16 +19388,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19392: \$? = $ac_status" >&5
+  echo "$as_me:19394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19398: \$? = $ac_status" >&5
+  echo "$as_me:19400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19408,12 +19410,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19411: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19413: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19416: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19418: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19511,10 +19513,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19514: checking for ${cf_func}" >&5
+	echo "$as_me:19516: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19517: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19519: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19523,7 +19525,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19526 "configure"
+#line 19528 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19556,16 +19558,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19562: \$? = $ac_status" >&5
+  echo "$as_me:19564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19568: \$? = $ac_status" >&5
+  echo "$as_me:19570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19581,7 +19583,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19584: result: $cf_result" >&5
+	echo "$as_me:19586: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19596,10 +19598,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19599: checking for ${cf_func}" >&5
+	echo "$as_me:19601: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19602: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19604: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19608,7 +19610,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19611 "configure"
+#line 19613 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19641,16 +19643,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19647: \$? = $ac_status" >&5
+  echo "$as_me:19649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19653: \$? = $ac_status" >&5
+  echo "$as_me:19655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19666,7 +19668,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19669: result: $cf_result" >&5
+	echo "$as_me:19671: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19690,7 +19692,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19693 "configure"
+#line 19695 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19710,21 +19712,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:19718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19722: \$? = $ac_status" >&5
+  echo "$as_me:19724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19727: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19729: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19744,14 +19746,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19747: checking for ncurses extended functions" >&5
+echo "$as_me:19749: 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 19754 "configure"
+#line 19756 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19766,16 +19768,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19772: \$? = $ac_status" >&5
+  echo "$as_me:19774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19778: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19783,7 +19785,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19786 "configure"
+#line 19788 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19808,16 +19810,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19814: \$? = $ac_status" >&5
+  echo "$as_me:19816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19820: \$? = $ac_status" >&5
+  echo "$as_me:19822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19831,7 +19833,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19834: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19836: 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
@@ -19845,11 +19847,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19848: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19850: 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 19852 "configure"
+#line 19854 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19862,16 +19864,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19868: \$? = $ac_status" >&5
+  echo "$as_me:19870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19874: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19880,7 +19882,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19883 "configure"
+#line 19885 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19893,16 +19895,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19899: \$? = $ac_status" >&5
+  echo "$as_me:19901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19905: \$? = $ac_status" >&5
+  echo "$as_me:19907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19913,7 +19915,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19916: result: $cf_define_xpg5" >&5
+		echo "$as_me:19918: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19922,14 +19924,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19925: checking for wide-character functions" >&5
+	echo "$as_me:19927: 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 19932 "configure"
+#line 19934 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19946,16 +19948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19952: \$? = $ac_status" >&5
+  echo "$as_me:19954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19958: \$? = $ac_status" >&5
+  echo "$as_me:19960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19966,7 +19968,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19969: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19971: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19987,14 +19989,14 @@ EOF
 
 fi
 
-echo "$as_me:19990: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19992: 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 19997 "configure"
+#line 19999 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20012,16 +20014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20018: \$? = $ac_status" >&5
+  echo "$as_me:20020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20024: \$? = $ac_status" >&5
+  echo "$as_me:20026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20032,21 +20034,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20035: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20037: 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:20042: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20044: 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 20049 "configure"
+#line 20051 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20066,16 +20068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20072: \$? = $ac_status" >&5
+  echo "$as_me:20074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20078: \$? = $ac_status" >&5
+  echo "$as_me:20080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20087,7 +20089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20090: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20092: 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
@@ -20096,7 +20098,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20099: checking for openpty in -lutil" >&5
+echo "$as_me:20101: 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
@@ -20104,7 +20106,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20107 "configure"
+#line 20109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20113,7 +20115,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char openpty ();
+char openpty (void);
 int
 main (void)
 {
@@ -20123,16 +20125,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20129: \$? = $ac_status" >&5
+  echo "$as_me:20131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20135: \$? = $ac_status" >&5
+  echo "$as_me:20137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20143,7 +20145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20146: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20148: 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
@@ -20151,7 +20153,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20154: checking for openpty header" >&5
+echo "$as_me:20156: 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
@@ -20178,7 +20180,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20181 "configure"
+#line 20183 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20196,16 +20198,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20202: \$? = $ac_status" >&5
+  echo "$as_me:20204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20208: \$? = $ac_status" >&5
+  echo "$as_me:20210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20223,7 +20225,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20226: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20228: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20257,7 +20259,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20260: checking for function curses_version" >&5
+echo "$as_me:20262: 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
@@ -20267,7 +20269,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20270 "configure"
+#line 20272 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20283,15 +20285,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20289: \$? = $ac_status" >&5
+  echo "$as_me:20291: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20306,14 +20308,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20309: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20311: 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:20316: checking for alternate character set array" >&5
+echo "$as_me:20318: 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
@@ -20323,7 +20325,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20326 "configure"
+#line 20328 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20339,16 +20341,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20351: \$? = $ac_status" >&5
+  echo "$as_me:20353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20359,7 +20361,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20362: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20364: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20369,7 +20371,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20372: checking for wide alternate character set array" >&5
+echo "$as_me:20374: 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
@@ -20379,7 +20381,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20382 "configure"
+#line 20384 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20395,16 +20397,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20401: \$? = $ac_status" >&5
+  echo "$as_me:20403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20407: \$? = $ac_status" >&5
+  echo "$as_me:20409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20415,7 +20417,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20418: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20420: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20423,7 +20425,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20426: checking for wide alternate character constants" >&5
+echo "$as_me:20428: 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
@@ -20433,7 +20435,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20436 "configure"
+#line 20438 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20450,16 +20452,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20456: \$? = $ac_status" >&5
+  echo "$as_me:20458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20462: \$? = $ac_status" >&5
+  echo "$as_me:20464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20469,7 +20471,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20472 "configure"
+#line 20474 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20485,16 +20487,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20497: \$? = $ac_status" >&5
+  echo "$as_me:20499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20505,7 +20507,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20508: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20510: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20515,10 +20517,10 @@ EOF
 
 fi
 
-echo "$as_me:20518: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20520: 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 20521 "configure"
+#line 20523 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20536,16 +20538,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20542: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20548: \$? = $ac_status" >&5
+  echo "$as_me:20550: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20554,7 +20556,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20557: result: $cf_result" >&5
+echo "$as_me:20559: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20575,14 +20577,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20578: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20580: 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 20585 "configure"
+#line 20587 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20600,23 +20602,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20606: \$? = $ac_status" >&5
+  echo "$as_me:20608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20612: \$? = $ac_status" >&5
+  echo "$as_me:20614: \$? = $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 20619 "configure"
+#line 20621 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20635,16 +20637,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20641: \$? = $ac_status" >&5
+  echo "$as_me:20643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20647: \$? = $ac_status" >&5
+  echo "$as_me:20649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20656,7 +20658,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20659: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20661: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20679,14 +20681,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20682: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20684: 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 20689 "configure"
+#line 20691 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20704,23 +20706,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20710: \$? = $ac_status" >&5
+  echo "$as_me:20712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20716: \$? = $ac_status" >&5
+  echo "$as_me:20718: \$? = $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 20723 "configure"
+#line 20725 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20739,16 +20741,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20745: \$? = $ac_status" >&5
+  echo "$as_me:20747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20751: \$? = $ac_status" >&5
+  echo "$as_me:20753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20760,7 +20762,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20763: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20765: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20783,14 +20785,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20786: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20788: 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 20793 "configure"
+#line 20795 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20808,23 +20810,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20814: \$? = $ac_status" >&5
+  echo "$as_me:20816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20820: \$? = $ac_status" >&5
+  echo "$as_me:20822: \$? = $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 20827 "configure"
+#line 20829 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20843,16 +20845,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20849: \$? = $ac_status" >&5
+  echo "$as_me:20851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20855: \$? = $ac_status" >&5
+  echo "$as_me:20857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20864,7 +20866,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20867: result: $cf_cv_wint_t" >&5
+echo "$as_me:20869: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20888,10 +20890,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20891: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20893: 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 20894 "configure"
+#line 20896 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20909,16 +20911,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20915: \$? = $ac_status" >&5
+  echo "$as_me:20917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20921: \$? = $ac_status" >&5
+  echo "$as_me:20923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20927,7 +20929,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20930: result: $cf_result" >&5
+echo "$as_me:20932: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20949,10 +20951,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20952: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20954: 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 20955 "configure"
+#line 20957 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20970,16 +20972,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20976: \$? = $ac_status" >&5
+  echo "$as_me:20978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20982: \$? = $ac_status" >&5
+  echo "$as_me:20984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20988,7 +20990,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20991: result: $cf_result" >&5
+echo "$as_me:20993: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21010,10 +21012,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21013: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21015: 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 21016 "configure"
+#line 21018 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21031,16 +21033,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21037: \$? = $ac_status" >&5
+  echo "$as_me:21039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21043: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21049,7 +21051,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21052: result: $cf_result" >&5
+echo "$as_me:21054: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21078,11 +21080,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21081: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21083: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21085 "configure"
+#line 21087 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21115,16 +21117,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21121: \$? = $ac_status" >&5
+  echo "$as_me:21123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21127: \$? = $ac_status" >&5
+  echo "$as_me:21129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21134,7 +21136,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21137: result: $cf_result" >&5
+echo "$as_me:21139: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21146,14 +21148,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21149: checking for data $cf_data in library" >&5
+	echo "$as_me:21151: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21156 "configure"
+#line 21158 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21192,16 +21194,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21198: \$? = $ac_status" >&5
+  echo "$as_me:21200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21204: \$? = $ac_status" >&5
+  echo "$as_me:21206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21213,7 +21215,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21216 "configure"
+#line 21218 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21245,15 +21247,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21251: \$? = $ac_status" >&5
+  echo "$as_me:21253: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21256: \$? = $ac_status" >&5
+  echo "$as_me:21258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21265,7 +21267,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21268: result: $cf_result" >&5
+	echo "$as_me:21270: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21282,7 +21284,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21285: checking for X" >&5
+	echo "$as_me:21287: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21386,17 +21388,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21389 "configure"
+#line 21391 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21393: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21395: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21399: \$? = $ac_status" >&5
+  echo "$as_me:21401: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21429,7 +21431,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21432 "configure"
+#line 21434 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21441,16 +21443,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21447: \$? = $ac_status" >&5
+  echo "$as_me:21449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21453: \$? = $ac_status" >&5
+  echo "$as_me:21455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21488,7 +21490,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21491: result: $have_x" >&5
+  echo "$as_me:21493: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21498,7 +21500,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21501: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21503: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21525,11 +21527,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21528: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21530: 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 21532 "configure"
+#line 21534 "configure"
 #include "confdefs.h"
 
 int
@@ -21541,16 +21543,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21547: \$? = $ac_status" >&5
+  echo "$as_me:21549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21553: \$? = $ac_status" >&5
+  echo "$as_me:21555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21560,13 +21562,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21563: result: no" >&5
+	echo "$as_me:21565: 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 21569 "configure"
+#line 21571 "configure"
 #include "confdefs.h"
 
 int
@@ -21578,16 +21580,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21584: \$? = $ac_status" >&5
+  echo "$as_me:21586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21590: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21597,11 +21599,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21600: result: yes" >&5
+	  echo "$as_me:21602: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21604: result: neither works" >&5
+	  echo "$as_me:21606: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21621,7 +21623,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21624 "configure"
+#line 21626 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21630,7 +21632,7 @@ 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 XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -21640,22 +21642,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21646: \$? = $ac_status" >&5
+  echo "$as_me:21648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21652: \$? = $ac_status" >&5
+  echo "$as_me:21654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21658: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21660: 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
@@ -21663,7 +21665,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21666 "configure"
+#line 21668 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21672,7 +21674,7 @@ 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 dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -21682,16 +21684,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21688: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21694: \$? = $ac_status" >&5
+  echo "$as_me:21696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21702,14 +21704,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21705: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21707: 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:21712: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21714: 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
@@ -21717,7 +21719,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21720 "configure"
+#line 21722 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21726,7 +21728,7 @@ 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 dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -21736,16 +21738,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21742: \$? = $ac_status" >&5
+  echo "$as_me:21744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21748: \$? = $ac_status" >&5
+  echo "$as_me:21750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21756,7 +21758,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21759: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21761: 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"
@@ -21775,13 +21777,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21778: checking for gethostbyname" >&5
+    echo "$as_me:21780: 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 21784 "configure"
+#line 21786 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21812,16 +21814,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21818: \$? = $ac_status" >&5
+  echo "$as_me:21820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21824: \$? = $ac_status" >&5
+  echo "$as_me:21826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21831,11 +21833,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21834: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21836: 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:21838: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21840: 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
@@ -21843,7 +21845,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21846 "configure"
+#line 21848 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21852,7 +21854,7 @@ 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 gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -21862,16 +21864,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21868: \$? = $ac_status" >&5
+  echo "$as_me:21870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21874: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21882,14 +21884,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21885: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21887: 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:21892: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21894: 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
@@ -21897,7 +21899,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21900 "configure"
+#line 21902 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21906,7 +21908,7 @@ 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 gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -21916,16 +21918,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21922: \$? = $ac_status" >&5
+  echo "$as_me:21924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21928: \$? = $ac_status" >&5
+  echo "$as_me:21930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21936,7 +21938,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21939: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21941: 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"
@@ -21952,13 +21954,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21955: checking for connect" >&5
+    echo "$as_me:21957: 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 21961 "configure"
+#line 21963 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21989,16 +21991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21995: \$? = $ac_status" >&5
+  echo "$as_me:21997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22001: \$? = $ac_status" >&5
+  echo "$as_me:22003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22008,11 +22010,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22011: result: $ac_cv_func_connect" >&5
+echo "$as_me:22013: 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:22015: checking for connect in -lsocket" >&5
+      echo "$as_me:22017: 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
@@ -22020,7 +22022,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22023 "configure"
+#line 22025 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22029,7 +22031,7 @@ 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 connect ();
+char connect (void);
 int
 main (void)
 {
@@ -22039,16 +22041,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22059,7 +22061,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22062: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22064: 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"
@@ -22068,13 +22070,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22071: checking for remove" >&5
+    echo "$as_me:22073: 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 22077 "configure"
+#line 22079 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22105,16 +22107,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22111: \$? = $ac_status" >&5
+  echo "$as_me:22113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22117: \$? = $ac_status" >&5
+  echo "$as_me:22119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22124,11 +22126,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22127: result: $ac_cv_func_remove" >&5
+echo "$as_me:22129: 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:22131: checking for remove in -lposix" >&5
+      echo "$as_me:22133: 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
@@ -22136,7 +22138,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22139 "configure"
+#line 22141 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22145,7 +22147,7 @@ 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 remove ();
+char remove (void);
 int
 main (void)
 {
@@ -22155,16 +22157,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22161: \$? = $ac_status" >&5
+  echo "$as_me:22163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22167: \$? = $ac_status" >&5
+  echo "$as_me:22169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22175,7 +22177,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22178: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22180: 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"
@@ -22184,13 +22186,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22187: checking for shmat" >&5
+    echo "$as_me:22189: 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 22193 "configure"
+#line 22195 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22221,16 +22223,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22227: \$? = $ac_status" >&5
+  echo "$as_me:22229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22233: \$? = $ac_status" >&5
+  echo "$as_me:22235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22240,11 +22242,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22243: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22245: 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:22247: checking for shmat in -lipc" >&5
+      echo "$as_me:22249: 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
@@ -22252,7 +22254,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22255 "configure"
+#line 22257 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22261,7 +22263,7 @@ 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 shmat ();
+char shmat (void);
 int
 main (void)
 {
@@ -22271,16 +22273,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22283: \$? = $ac_status" >&5
+  echo "$as_me:22285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22291,7 +22293,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22294: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22296: 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"
@@ -22309,7 +22311,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22312: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22314: 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
@@ -22317,7 +22319,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22320 "configure"
+#line 22322 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22326,7 +22328,7 @@ 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 IceConnectionNumber ();
+char IceConnectionNumber (void);
 int
 main (void)
 {
@@ -22336,16 +22338,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22348: \$? = $ac_status" >&5
+  echo "$as_me:22350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22356,7 +22358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22359: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22361: 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"
@@ -22403,16 +22405,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22406: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22408: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22411: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22413: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22415: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22417: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22451,16 +22453,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22456: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22459: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22461: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22463: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22465: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22499,23 +22501,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22502: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22504: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22507: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22509: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22511: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22513: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22518: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22520: 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.
@@ -22532,7 +22534,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22535: result: $enable_warnings" >&5
+echo "$as_me:22537: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22555,10 +22557,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22558: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22560: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22561 "${as_me:-configure}"
+#line 22563 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22608,12 +22610,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22611: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22614: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22616: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22618: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22691,7 +22693,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22694 "configure"
+#line 22696 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22706,26 +22708,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22718: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22721: checking for X11/Xt const-feature" >&5
+echo "$as_me:22723: 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 22728 "configure"
+#line 22730 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22743,16 +22745,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22749: \$? = $ac_status" >&5
+  echo "$as_me:22751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22755: \$? = $ac_status" >&5
+  echo "$as_me:22757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22767,7 +22769,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22770: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22772: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22796,7 +22798,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22799 "${as_me:-configure}"
+#line 22801 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22812,7 +22814,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22815: checking for $CC warning options..." >&5
+	{ echo "$as_me:22817: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22828,12 +22830,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22831: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22834: \$? = $ac_status" >&5
+  echo "$as_me:22836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22836: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22838: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22841,7 +22843,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22844: checking for $CC warning options..." >&5
+	{ echo "$as_me:22846: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22864,12 +22866,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:22872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22872: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22874: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22877,7 +22879,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22880: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22882: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22887,7 +22889,7 @@ echo "${as_me:-configure}:22880: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22890: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22892: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22904,7 +22906,7 @@ fi
 
 fi
 
-echo "$as_me:22907: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22909: 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.
@@ -22926,7 +22928,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22929: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22931: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23040,23 +23042,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23043: checking for dmalloc.h" >&5
+	echo "$as_me:23045: 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 23049 "configure"
+#line 23051 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23053: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23055: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23059: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23075,11 +23077,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23078: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23080: 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:23082: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23084: 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
@@ -23087,7 +23089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23090 "configure"
+#line 23092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23096,7 +23098,7 @@ 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 dmalloc_debug ();
+char dmalloc_debug (void);
 int
 main (void)
 {
@@ -23106,16 +23108,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23112: \$? = $ac_status" >&5
+  echo "$as_me:23114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23118: \$? = $ac_status" >&5
+  echo "$as_me:23120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23126,7 +23128,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23129: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23131: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23141,7 +23143,7 @@ fi
 
 fi
 
-echo "$as_me:23144: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23146: 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.
@@ -23163,7 +23165,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23166: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23168: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23277,23 +23279,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23280: checking for dbmalloc.h" >&5
+	echo "$as_me:23282: 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 23286 "configure"
+#line 23288 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23290: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23292: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23296: \$? = $ac_status" >&5
+  echo "$as_me:23298: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23312,11 +23314,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23315: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23317: 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:23319: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23321: 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
@@ -23324,7 +23326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23327 "configure"
+#line 23329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23333,7 +23335,7 @@ 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 debug_malloc ();
+char debug_malloc (void);
 int
 main (void)
 {
@@ -23343,16 +23345,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23349: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23355: \$? = $ac_status" >&5
+  echo "$as_me:23357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23363,7 +23365,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23366: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23368: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23378,7 +23380,7 @@ fi
 
 fi
 
-echo "$as_me:23381: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23383: 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.
@@ -23400,7 +23402,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23403: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23405: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23513,7 +23515,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23516: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23518: 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.
@@ -23524,7 +23526,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23527: result: $with_no_leaks" >&5
+echo "$as_me:23529: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23542,7 +23544,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23545: checking for an rpath option" >&5
+	echo "$as_me:23547: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23573,12 +23575,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23576: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23578: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23581: checking if we need a space after rpath option" >&5
+		echo "$as_me:23583: 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"
 
@@ -23599,7 +23601,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23602 "configure"
+#line 23604 "configure"
 #include "confdefs.h"
 
 int
@@ -23611,16 +23613,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23617: \$? = $ac_status" >&5
+  echo "$as_me:23619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23623: \$? = $ac_status" >&5
+  echo "$as_me:23625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23630,14 +23632,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23633: result: $cf_rpath_space" >&5
+		echo "$as_me:23635: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23640: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23642: 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.
@@ -23655,22 +23657,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23658: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23660: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23663: checking for updated LDFLAGS" >&5
+echo "$as_me:23665: 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:23666: result: maybe" >&5
+	echo "$as_me:23668: 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:23673: checking for $ac_word" >&5
+echo "$as_me:23675: 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
@@ -23685,7 +23687,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23688: found $ac_dir/$ac_word" >&5
+echo "$as_me:23690: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23693,10 +23695,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23696: result: $cf_ldd_prog" >&5
+  echo "$as_me:23698: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23699: result: no" >&5
+  echo "$as_me:23701: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23710,7 +23712,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23713 "configure"
+#line 23715 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23722,16 +23724,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23728: \$? = $ac_status" >&5
+  echo "$as_me:23730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23734: \$? = $ac_status" >&5
+  echo "$as_me:23736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23759,7 +23761,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23762: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23764: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23771,11 +23773,11 @@ echo "${as_me:-configure}:23762: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23776: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23778: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23780: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23812,7 +23814,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23815: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23817: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23825,11 +23827,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23828: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23830: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23832: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23834: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23866,7 +23868,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23869: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23871: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23879,14 +23881,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23882: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23884: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23888: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23889: result: no" >&5
+	echo "$as_me:23891: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23907,7 +23909,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -23976,7 +23978,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23979: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23981: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24112,7 +24114,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230903,
+configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -24157,7 +24159,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24160: error: ambiguous option: $1
+    { { echo "$as_me:24162: 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;}
@@ -24176,7 +24178,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24179: error: unrecognized option: $1
+  -*) { { echo "$as_me:24181: 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;}
@@ -24195,7 +24197,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230903, executed with
+This file was extended by $as_me 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -24226,7 +24228,7 @@ do
   "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:24229: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24231: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24534,7 +24536,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24537: creating $ac_file" >&5
+    { echo "$as_me:24539: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24552,7 +24554,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24555: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24557: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24565,7 +24567,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24568: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24570: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24581,7 +24583,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24584: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24586: 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;}
@@ -24590,7 +24592,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24593: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24595: 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;}
@@ -24635,7 +24637,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24638: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24640: 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;}
@@ -24646,7 +24648,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24649: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24651: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24695,7 +24697,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24698: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24700: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24706,7 +24708,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24709: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24711: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24719,7 +24721,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24722: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24724: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24777,7 +24779,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24780: $ac_file is unchanged" >&5
+      { echo "$as_me:24782: $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/test/demo_defkey.c b/test/demo_defkey.c
index bb8126389..441667263 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.34 2023/06/24 15:37:17 tom Exp $
+ * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -148,11 +148,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     }
     log_last_line(win);
 
-    if (vis_string != 0) {
-	free(vis_string);
-	vis_string = 0;
-    }
-
+    free(vis_string);
     vis_string = visible(new_string);
     if ((rc = key_defined(new_string)) > 0) {
 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));

From 2e347c6176b856f8ff52c6e6d705795e04632805 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 28 Jan 2024 01:32:56 +0100
Subject: [PATCH 051/106] ncurses-6.4-20240127.patch

---
 NEWS                             |   9 +-
 VERSION                          |   2 +-
 dist.mk                          |   4 +-
 misc/terminfo.src                | 898 ++++++++++++++-----------------
 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, 427 insertions(+), 508 deletions(-)

diff --git a/NEWS b/NEWS
index 819868ecf..05e5aeeaa 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4069 2024/01/20 19:46:10 tom Exp $
+-- $Id: NEWS,v 1.4071 2024/01/27 22:04:17 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240127
+	+ amend change to z39-a (report by Sven Joachim).
+	+ use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows,
+	  hp+pfk+cr, klone+acs, klone+color, klone+sgr, ncr160wy50+pp
+	  to trim -TD
+	+ NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner)
+
 20240120
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ amend discussion of aliases in tput.1
diff --git a/VERSION b/VERSION
index 1c4709a55..25dee1cdc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240120
+5:0:10	6.4	20240127
diff --git a/dist.mk b/dist.mk
index 000fb9bfc..8f193da0f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1594 2024/01/20 11:52:33 tom Exp $
+# $Id: dist.mk,v 1.1595 2024/01/27 11:04:16 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240120
+NCURSES_PATCH = 20240127
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 0892a3063..18f0bc2fd 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1123 $
-#	$Date: 2024/01/14 18:08:23 $
+#	$Revision: 1.1137 $
+#	$Date: 2024/01/27 21:52:22 $
 #
 # 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
@@ -470,8 +470,7 @@ klone+color|color control for ansi.sys and ISO6429-compatible displays,
 # default color pair,  but many `ANSI' terminals don't grok the <op> cap.
 ecma+color|color control for ECMA-48-compatible terminals,
 	AX,
-	colors#8, ncv#3, pairs#64,
-	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	op=\E[39;49m, use=klone+color,
 
 ecma+italics|ECMA-48 italics,
 	ritm=\E[23m, sitm=\E[3m,
@@ -820,18 +819,14 @@ st52-color|at-color|atari-color|atari_st-color|Atari ST with color,
 	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,
-	bel=^G, civis=\Ef, clear=\EE, cnorm=\Ee, cr=\r, cub1=\ED,
-	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
-	cuu1=\EA, dl1=\EM, ed=\EJ, el=\EK, el1=\Eo, home=\EH, ht=^I,
-	il1=\EL, ind=\n, is2=\Ev\Eq\Ee, kLFT=\Ed, kRIT=\Ec, kbs=^H,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=^?,
-	kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es,
-	kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EQ,
-	kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, kf8=\EW,
-	kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, kpp=\Ea,
-	kund=\EK, nel=\r\n, rc=\Ek, rev=\Ep, ri=\EI, rmso=\Eq,
-	rs2=\Ev\Eq\Ee, sc=\Ej, sgr0=\Eq, smso=\Ep,
+	civis=\Ef, clear=\EE, cnorm=\Ee, dl1=\EM, el1=\Eo, il1=\EL,
+	is2=\Ev\Eq\Ee, kLFT=\Ed, kRIT=\Ec, kdch1=^?, kf1=\EP,
+	kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et,
+	kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EQ, kf20=\Ey,
+	kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX,
+	khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK,
+	rc=\Ek, rev=\Ep, rmso=\Eq, rs2=\Ev\Eq\Ee, sc=\Ej, sgr0=\Eq,
+	smso=\Ep, use=vt52-basic,
 tw100|Toswin VT100 window manager,
 	eo, mir, msgr, xon,
 	colors#8, cols#80, it#8, lines#24, pairs#64, vt#3,
@@ -864,39 +859,33 @@ tw100|Toswin VT100 window manager,
 # The entries for stv52 and stv52pc probably need a revision.
 stv52|MiNT virtual console,
 	am, msgr,
-	cols#80, it#8, lines#30,
-	bel=^G, blink=\Er, bold=\EyA, civis=\Ef, clear=\EE,
-	cnorm=\E. \Ee, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.",
-	dim=\Em, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL,
-	ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq,
-	kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
-	kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET,
-	kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE,
-	kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>,
-	op=\Eb@\EcO, rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_,
-	rmso=\Eq, rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_,
-	smcup=\Ev\Ee\Ez_, smso=\Ep, smul=\EyH,
+	lines#30,
+	blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee,
+	cub1=^H, cvvis=\E.", dim=\Em, dl1=\EM, il1=\EL, ind=\n$<2*/>,
+	kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er,
+	kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex,
+	kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV,
+	kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb,
+	kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, op=\Eb@\EcO, rev=\Ep,
+	ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, rmul=\EzH,
+	rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, smso=\Ep,
+	smul=\EyH, use=vt52-basic,
 stv52pc|MiNT virtual console with PC charset,
 	am, msgr,
-	cols#80, it#8, lines#30,
+	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,
-	bel=^G, blink=\Er, bold=\EyA, civis=\Ef, clear=\EE,
-	cnorm=\E. \Ee, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.",
-	dim=\Em, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL,
-	ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq,
-	kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
-	kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET,
-	kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE,
-	kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>,
-	rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq,
-	rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_,
-	smso=\Ep, smul=\EyH,
+	blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee,
+	cub1=^H, cvvis=\E.", dim=\Em, dl1=\EM, il1=\EL, ind=\n$<2*/>,
+	kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er,
+	kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex,
+	kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV,
+	kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb,
+	kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, rev=\Ep, ri=\EI$<2*/>,
+	rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, rmul=\EzH,
+	rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, smso=\Ep,
+	smul=\EyH, use=vt52-basic,
 
 # From: Simson L. Garfinkel <simsong@media-lab.mit.edu>
 atari-old|Atari st,
@@ -904,8 +893,8 @@ atari-old|Atari st,
 	cols#80, it#8, lines#25,
 	clear=\EH\EJ, cub1=\ED, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM,
-	ed=\EJ, el=\EK, ht=^I, il1=\EL, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, ri=\EI, rmso=\Eq, sgr0=\Eq, smso=\Ep,
+	ed=\EJ, el=\EK, ht=^I, il1=\EL, ri=\EI, rmso=\Eq, sgr0=\Eq,
+	smso=\Ep, use=vt52+arrows,
 # UniTerm terminal program for the Atari ST:  49-line VT220 emulation mode
 # From: Paul M. Aoki <aoki@ucbvax.berkeley.edu>
 uniterm|uniterm49|UniTerm VT220 emulator with 49 lines,
@@ -935,7 +924,7 @@ st52-old|Atari ST with VT52 emulation,
 # BeOS entry for Terminal program Seems to be almost ANSI
 beterm|BeOS Terminal,
 	am, eo, mir, msgr, xenl, xon,
-	colors#8, cols#80, it#8, lines#25, ncv#5, pairs#64,
+	cols#80, it#8, lines#25, ncv#5,
 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
@@ -943,13 +932,12 @@ beterm|BeOS Terminal,
 	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~,
 	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
 	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
-	rmul=\E[24m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	setb=\E[%p1%{40}%+%cm, setf=\E[%p1%{30}%+%cm,
-	sgr0=\E[0;10m, smkx=\E[?4h, smso=\E[7m, smul=\E[4m,
-	u6=\E[%i%p1%d;%p2%dR, u7=\E[6n, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idc, use=ansi+idl, use=ansi+local,
-	use=vt220+pcedit,
+	rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm,
+	setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smkx=\E[?4h,
+	smso=\E[7m, smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=klone+color, use=vt220+pcedit,
 
 #### Linux consoles
 #
@@ -1160,7 +1148,7 @@ linux-vt|Linux console using VT codes for graphics,
 # Note: The status-line support is buggy (dsl does not work).
 kon|kon2|Kanji ON Linux console,
 	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
-	colors#8, it#8, ncv#18, pairs#64,
+	it#8, ncv#18,
 	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
 	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
 	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
@@ -1172,14 +1160,14 @@ kon|kon2|Kanji ON Linux console,
 	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~, kspd=^Z,
 	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	rs1=\Ec,
 	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;11%;m,
 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
-	use=vt220+pcedit,
+	use=klone+color, use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -1335,7 +1323,7 @@ mach-gnu-color|GNU Mach console with ANSI color,
 # Reading the source, RIS resets cnorm, but not xmous.
 hurd|The GNU Hurd console server,
 	am, bce, bw, eo, km, mir, msgr, xenl, xon, NQ,
-	colors#8, it#8, ncv#18, pairs#64,
+	it#8, ncv#18,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
 	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
@@ -1346,17 +1334,17 @@ hurd|The GNU Hurd console server,
 	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, kspd=^Z, nel=\r\n,
-	op=\E[39;49m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m,
+	ri=\E[T, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	rs1=\EM\E[?1000l,
 	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,
-	smacs=\E[11m, smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
+	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
-	use=ecma+index, use=ecma+italics, use=vt220+cvis,
+	use=ecma+index, use=ecma+italics, use=klone+acs,
+	use=klone+color, use=vt220+cvis,
 
 #### QNX
 #
@@ -1711,8 +1699,8 @@ pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
 # underline renders as color
 pccon+colors|ANSI colors for OpenBSD PC console,
 	bce,
-	colors#8, ncv#2, pairs#64,
-	op=\E[49;39m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	ncv#2,
+	op=\E[49;39m, use=klone+color,
 # OpenBSD uses wscons,
 # + which does not implement DECSCNM or anything comparable, so it does not
 #   support flash.
@@ -1857,7 +1845,7 @@ arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768),
 # From Minoura Makoto <minoura@netlaputa.or.jp>, 12 May 1996
 x68k|x68k-ite|NetBSD/x68k ITE,
 	cols#96, lines#32,
-	kclr=\E[9~, khlp=\E[28~, use=vt220-base,
+	kbs=^?, kclr=\E[9~, khlp=\E[28~, use=vt220-base,
 
 # <tv@pobox.com>:
 # Entry for the DNARD OpenFirmware console, close to ANSI but not quite.
@@ -1883,8 +1871,9 @@ ofcons|DNARD OpenFirmware console,
 	sgr0=\2330m, smso=\2337m, smul=\2334m,
 
 # NetBSD "wscons" emulator in VT220 mode.
-# This entry is based on the NetBSD termcap entry, correcting the ncv value.
-# The emulator renders underlined text in red.  Colors are otherwise usable.
+# This entry is based on the NetBSD termcap entry.  The emulator renders
+# underlined text in red.  Colors are otherwise usable.  NetBSD developers
+# prefer to not specify the corresponding ncv value.
 #
 # Testing the emulator and reading the source code (NetBSD 2.0), it appears
 # that "vt220" is inaccurate.  There are a few VT220-features, but most of the
@@ -1896,7 +1885,7 @@ ofcons|DNARD OpenFirmware console,
 # work.  Don't use it on a VMS system -TD
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
 	bce,
-	colors#8, lines#25, ncv#2, pairs#64,
+	colors#8, lines#25, pairs#64,
 	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~,
 	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 	khome=\E[7~, op=\E[m, rs1=\Ec, setab=\E[4%p1%dm,
@@ -2006,7 +1995,7 @@ mgterm|MGL/MGL2 MobileGear Graphic Library,
 #	F37-F48 are shift+control F1-F12
 cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode),
 	am, bce, bw, eo, msgr, npc,
-	colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64,
+	cols#80, it#8, lines#25, ncv#21,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C,
 	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=1C,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
@@ -2023,13 +2012,12 @@ cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode),
 	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
 	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, 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,
+	rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
 	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, use=ansi+arrows,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ecma+index,
+	use=ecma+index, use=klone+color,
 
 cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode),
 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
@@ -2200,17 +2188,16 @@ teken-2018|teken as of 2018,
 
 teken-2022|teken as of 2022,
 	am, bce, eo, mir, msgr, npc, NQ,
-	colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64, U8#1,
+	cols#80, it#8, lines#25, ncv#21, U8#1,
 	bold=\E[1m, cr=\r, cub1=^H, dim=\E[30;1m, ech=\E[%p1%dX,
-	ind=\E[S, kbs=^H, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m,
-	ri=\E[T, rmso=\E[27m, rs2=\E[x\E[m\Ec, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	ind=\E[S, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, ri=\E[T,
+	rmso=\E[27m, rs2=\E[x\E[m\Ec,
 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p5%t;30;1%;%?%p6%t;1%;m,
 	sgr0=\E[m, use=vt220+cvis, use=ecma+index,
 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=ansi+rca2, use=ansi+sgrso,
-	use=ansi+tabs,
+	use=ansi+tabs, use=klone+color,
 
 teken-vt+fkeys|teken's xterm special keys,
 	kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -2322,11 +2309,9 @@ bsdos-ppc|PowerPC BSD/OS console,
 # that VT52 does not support line-drawing characters (the scan-X values refer
 # to a crude plotting feature) -TD
 vt52|DEC VT52,
-	OTbs,
-	it#8, lines#24,
-	acsc=+h.k0affggolpnqprrss, home=\EH, kbs=^H, nel=\r\n,
-	ri=\EI, rmacs=\EG, rmkx=\E>, smacs=\EF, smkx=\E=, u8=\E/[KL],
-	use=vt50h,
+	lines#24,
+	acsc=+h.k0affggolpnqprrss, rmacs=\EG, rmkx=\E>,
+	smacs=\EF, smkx=\E=, u8=\E/[KL], use=vt50h, use=vt52-basic,
 
 # This is more likely the "vt52" that you would see in emulation, i.e., no
 # keypad, no graphics.
@@ -2334,8 +2319,11 @@ vt52-basic|VT52 for emulators,
 	cols#80, it#8, lines#24,
 	bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK,
-	home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI,
+	home=\EH, ht=^I, ind=\n, kbs=^H, nel=\r\n, ri=\EI,
+	use=vt52+arrows,
+
+vt52+arrows|cursor keys for VT52,
+	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
 
 #### DEC VT100 and compatibles
 #
@@ -3387,8 +3375,8 @@ nsterm+c|AppKit Terminal.app v51+ full color support (including 16 colors),
 	op=\E[0m, use=ibm+16color,
 
 nsterm+c41|AppKit Terminal.app v41 color support,
-	colors#8, ncv#37, pairs#64,
-	op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	ncv#37,
+	op=\E[0m, use=klone+color,
 
 # These are different combinations of the building blocks
 
@@ -3829,8 +3817,7 @@ xnuppc+basic|Darwin PowerPC console basic capabilities,
 	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
-	colors#8, ncv#32, pairs#64,
-	op=\E[37;40m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	ncv#32, use=klone+color,
 
 xnuppc+b|Darwin PowerPC console color-bold support,
 	ncv#32,
@@ -4162,11 +4149,10 @@ absolute|Absolute Telnet emulating xterm,
 #	http://stackoverflow.com/questions/24613237/terminal-retains-bg-color-after-closing-vim-using-color-scheme-and-putty-256co/37869114#37869114
 putty|PuTTY terminal emulator,
 	am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
-	colors#8, it#8, ncv#22, pairs#64, U8#1,
+	it#8, ncv#22, U8#1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\ED,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP,
-	dch1=\E[P,
+	bel=^G, cr=\r, cub1=^H, cud1=\ED, cup=\E[%i%p1%d;%p2%dH,
+	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
@@ -4180,24 +4166,23 @@ putty|PuTTY terminal emulator,
 	      %02x%p4%{255}%*%{1000}%/%02x,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
 	kbs=^?, kcbt=\E[Z, khome=\E[1~, kind=\E[B, kri=\E[A, kspd=^Z,
-	nel=\r\n, oc=\E]R, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m,
-	rmso=\E[27m, rmul=\E[24m,
+	nel=\r\n, oc=\E]R, op=\E[39;49m, ri=\EM, rmacs=^O,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, 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, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m,
 	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, smir=\E[4h,
-	smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+tabs, use=ansi+rep,
-	use=ecma+index, use=vt220+pcedit, use=xterm+alt1049,
-	use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq,
+	smkx=\E[?1h\E=, vpa=\E[%i%p1%dd, E3=\E[3J,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+tabs,
+	use=ansi+rep, use=bracketed+paste, use=ecma+index,
+	use=ecma+strikeout, use=klone+color, use=klone+sgr,
+	use=putty+cursor, use=putty+fnkeys, use=vt220+pcedit,
+	use=xterm+alt1049, use=vt102+enq, use=xterm+sm+1006,
 	use=xterm+sl, use=vt100+fnkeys, use=putty+keypad,
-	use=vt220+cvis, use=bracketed+paste, use=putty+cursor,
-	use=ecma+strikeout,
+	use=vt220+cvis,
 
 # older versions (e.g., before 0.71) of PuTTY used a shift-modifier to toggle
 # between normal- and application-mode for the cursor-keys.  That was dropped,
@@ -4571,32 +4556,31 @@ winconsole|Windows 10 new console,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
 	bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n,
-	invis@, is1=\E[!p, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
-	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
-	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
-	kf22=\E[21;2~, kf23=\E[24;2~, kf24=\E[25;2~,
-	kf25=\E[11;3~, kf26=\E[12;3~, kf27=\E[13;3~,
-	kf28=\E[14;3~, kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~,
-	kf31=\E[18;3~, kf32=\E[19;3~, kf33=\E[20;3~,
-	kf34=\E[21;3~, kf35=\E[24;3~, kf36=\E[25;3~,
-	kf37=\E[11;4~, kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~,
-	kf40=\E[14;4~, kf41=\E[15;4~, kf42=\E[17;4~,
-	kf43=\E[18;4~, kf44=\E[19;4~, kf45=\E[20;4~,
-	kf46=\E[21;4~, kf47=\E[24;4~, kf48=\E[25;4~,
-	kf49=\E[11;7~, kf5=\E[15~, kf50=\E[12;7~, kf51=\E[13;7~,
-	kf52=\E[14;7~, kf53=\E[15;7~, kf54=\E[17;7~,
-	kf55=\E[18;7~, kf56=\E[19;7~, kf57=\E[20;7~,
-	kf58=\E[21;7~, kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, nel=\r\n,
-	ri=\E[T, rmacs=\E(B, rmir@, rmpch@, rs1=\E[!p,
+	invis@, is1=\E[!p, kf13=\E[11;2~, kf14=\E[12;2~,
+	kf15=\E[13;2~, kf16=\E[14;2~, kf17=\E[15;2~,
+	kf18=\E[17;2~, kf19=\E[18;2~, kf20=\E[19;2~,
+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[24;2~,
+	kf24=\E[25;2~, kf25=\E[11;3~, kf26=\E[12;3~,
+	kf27=\E[13;3~, kf28=\E[14;3~, kf29=\E[15;3~,
+	kf30=\E[17;3~, kf31=\E[18;3~, kf32=\E[19;3~,
+	kf33=\E[20;3~, kf34=\E[21;3~, kf35=\E[24;3~,
+	kf36=\E[25;3~, kf37=\E[11;4~, kf38=\E[12;4~,
+	kf39=\E[13;4~, kf40=\E[14;4~, kf41=\E[15;4~,
+	kf42=\E[17;4~, kf43=\E[18;4~, kf44=\E[19;4~,
+	kf45=\E[20;4~, kf46=\E[21;4~, kf47=\E[24;4~,
+	kf48=\E[25;4~, kf49=\E[11;7~, kf50=\E[12;7~,
+	kf51=\E[13;7~, kf52=\E[14;7~, kf53=\E[15;7~,
+	kf54=\E[17;7~, kf55=\E[18;7~, kf56=\E[19;7~,
+	kf57=\E[20;7~, kf58=\E[21;7~, kf59=\E[24;7~,
+	kf60=\E[25;7~, khome=\E[1~, nel=\r\n, ri=\E[T, rmacs=\E(B,
+	rmir@, rmpch@, rs1=\E[!p,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
 	    \E(0%e\E(B%;,
 	sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows,
 	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
 	use=ansi+idl, use=ecma+index, use=ansi+inittabs,
 	use=ansi+local, use=ecma+sgr, use=ecma+color,
-	use=vt220+cvis, use=vt220+pcedit,
+	use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys,
 
 # Windows Terminal (Preview)
 # https://github.com/microsoft/terminal
@@ -5112,8 +5096,7 @@ xterm+pcc0|fragment with modifyCursorKeys:0,
 # Here are corresponding fragments from xterm patch #216:
 #
 xterm+pcf0|fragment with modifyFunctionKeys:0,
-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
+	kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
 	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=\EO5P, kf26=\EO5Q,
@@ -5124,31 +5107,30 @@ xterm+pcf0|fragment with modifyFunctionKeys:0,
 	kf4=\EOS, 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~, kf49=\EO3P,
-	kf5=\E[15~, kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S,
-	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=\EO4P,
-	kf62=\EO4Q, kf63=\EO4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S, 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~,
+	kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q, kf63=\EO4R,
+	use=xterm+nopcfkeys,
 #
 xterm+pcf2|fragment with modifyFunctionKeys:2,
-	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,
+	kf1=\EOP, 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, 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~,
+	kf58=\E[21;3~, kf59=\E[23;3~, kf60=\E[24;3~,
+	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R,
+	use=xterm+nopcfkeys,
 #
 # Chunks from xterm #230:
 xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
@@ -5584,9 +5566,9 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 #		-e tack
 # e.g., "foo sun" if the script is named "foo" -TD
 xterm-hp|xterm with hpterm function keys,
-	kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	kdch1=\EP, kend=\EF, khome=\Eh, kich1=\EQ, knp=\ES, kpp=\ET,
-	use=hp+pfk-cr, use=xterm+nofkeys, use=xterm+nopcfkeys,
+	kclr=\EJ, kdch1=\EP, kend=\EF, khome=\Eh, kich1=\EQ, knp=\ES,
+	kpp=\ET, use=hp+pfk-cr, use=vt52+arrows,
+	use=xterm+nofkeys, use=xterm+nopcfkeys,
 
 xterm-sco|xterm with SCO function keys,
 	kbeg=\E[E, kbs=^?, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
@@ -5624,13 +5606,9 @@ xterm-vt220|xterm emulating VT220,
 	use=xterm+tmux, use=xterm+keypad, use=xterm-basic,
 
 xterm-vt52|xterm emulating DEC VT52,
-	cols#80, it#8, lines#24,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK,
-	home=\EH, ht=^I, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, nel=\r\n, ri=\EI, rmacs=\EG, smacs=\EF,
-	use=xterm+kbs, use=vt52+keypad,
+	clear=\EH\EJ, rmacs=\EG, smacs=\EF, use=xterm+kbs,
+	use=vt52+keypad, use=vt52-basic,
 
 xterm-noapp|xterm with cursor keys in normal mode,
 	rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp,
@@ -5957,13 +5935,13 @@ xtermm|xterm terminal emulator (monochrome),
 	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,
+	ncv#7,
+	op=\E[100m,
 	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,
+	use=xtermm, use=klone+color,
 
 # From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
 # Here's a termcap entry I've been using for xterm_color, which comes
@@ -7387,7 +7365,7 @@ st-0.6|simpleterm 0.6,
 # Fixes: add eo and xenl per tack, remove nonworking cbt, hts and tbc, invis
 simpleterm|old-st|simpleterm 0.1.1,
 	am, eo, mir, msgr, ul, xenl,
-	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
+	cols#80, it#8, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -7396,13 +7374,13 @@ simpleterm|old-st|simpleterm 0.1.1,
 	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, rev=\E[7m,
-	rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m,
+	rmul=\E[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, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
-	use=ecma+index, use=xterm+acs,
+	use=ecma+index, use=klone+color, use=xterm+acs,
 
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
@@ -8116,9 +8094,8 @@ cbunix|cb unix virtual terminal,
 	cols#80, lines#24, lm#0,
 	bel=^G, clear=\EL, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\EG%p2%c%p1%c, cuu1=\EA, dch1=\EM, dl1=\EN, ed=\EL,
-	el=\EK, ich1=\EO, il1=\EP, ind=\n, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, khome=\EE, rmso=\Eb^D, rmul=\Eb^A,
-	smso=\Ea^D, smul=\Ea^A,
+	el=\EK, ich1=\EO, il1=\EP, ind=\n, khome=\EE, rmso=\Eb^D,
+	rmul=\Eb^A, smso=\Ea^D, smul=\Ea^A, use=vt52+arrows,
 # (vremote: removed obsolete ":nl@:" -- esr)
 vremote|virtual remote terminal,
 	am@,
@@ -8172,10 +8149,10 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 # italics but does not lose the color information -TD 2017/01/28.
 dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 	am, hc,
-	colors#8, it#8, ncv#13, pairs#64,
+	it#8, ncv#13,
 	bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m,
-	rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-	sgr0=\E[m, smul=\E[4m, use=ecma+italics,
+	rmul=\E[24m, sgr0=\E[m, smul=\E[4m, use=ecma+italics,
+	use=klone+color,
 
 #### Screen
 
@@ -8476,13 +8453,12 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
 screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x),
 	cols#80, lines#24,
 	clear=\E[2J\E[H, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU,
-	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I,
-	khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
+	ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kf0=\E~, kf1=\ES,
+	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
+	kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
 	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m,
 	smul=\E[4m, use=ansi+idc, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local,
+	use=ansi+inittabs, use=ansi+local, use=vt52+arrows,
 
 # (screen3: removed unknown ":xv:LP:G0:" -- esr)
 screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
@@ -8922,15 +8898,13 @@ sun-type4|Sun Workstation console with type 4 keyboard,
 #	blink=\E[5m
 # It supports bold, but not underline -TD (2009-09-19)
 sun-color|Sun Microsystems Workstation console with color support (IA systems),
-	colors#8, ncv#3, pairs#64,
 	bold=\E[1m, cub1=^H, cud1=\n, home=\E[H, op=\E[0m,
-	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=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m,
-	use=ansi+local, use=sun,
+	sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, use=ansi+local,
+	use=sun, use=klone+color,
 
 #### Iris consoles
 #
@@ -8948,11 +8922,10 @@ wsiris|iris40|IRIS emulating a 40 line Visual 50 (approximately),
 	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA,
 	cvvis=\E;, dim=\E7F2, dl1=\EM, ed=\EJ, el=\EK,
 	flash=\E7F4\E7B1\013\E7F7\E7B0, home=\EH, ht=^I, il1=\EL,
-	ind=\n, is2=\E7B0\E7F7\E7C2\E7R3, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3,
-	kf4=\E4, kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8, kf9=\E9, ri=\EI,
-	rmso=\E0@, rmul=\E7R3\E0@, sgr0=\E7F7, smso=\E9P,
-	smul=\E7R2\E9P,
+	ind=\n, is2=\E7B0\E7F7\E7C2\E7R3, kf0=\E0, kf1=\E1,
+	kf2=\E2, kf3=\E3, kf4=\E4, kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8,
+	kf9=\E9, ri=\EI, rmso=\E0@, rmul=\E7R3\E0@, sgr0=\E7F7,
+	smso=\E9P, smul=\E7R2\E9P, use=vt52+arrows,
 
 #### NeWS consoles
 #
@@ -9140,11 +9113,10 @@ nwp511|nwp-511|nwp-511 VT100,
 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1,
 # (news517: this had :TY=sjis:. --esr)
 nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
-	eslok, hs,
 	cols#80, lines#30,
-	OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$},
+	OTi2=\E[2$~\n, dsl=\E[1$~,
 	is2=\E7\E[r\E8\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	tsl=\E[1$}\E[;%df, use=vt220-base,
+	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
 # (news517-w: this had :TY=sjis:. --esr)
 nwp517-w|nwp-517-w|nwp-517 VT200 132 cols 50 rows,
 	eslok, hs,
@@ -9300,9 +9272,6 @@ cygwinB19|ANSI emulation for cygwin32,
 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,
 	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
 	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, fsl=^G, home=\E[H, ht=^I,
 	ind=\n, invis=\E[8m, kb2=\E[G, kf1=\E[[A, kf10=\E[21~,
@@ -9311,16 +9280,15 @@ cygwin|ANSI emulation for Cygwin,
 	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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
-	rev=\E[7m, ri=\EM, rmacs=\E[10m, 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,
+	rev=\E[7m, ri=\EM, 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,
-	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tsl=\E];, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idc, use=ansi+idl, use=ansi+local,
-	use=ansi+rca2, use=xterm+alt47, use=vt220+pcedit,
-	use=vt102+enq,
+	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+	tsl=\E];, use=ansi+arrows, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=vt220+pcedit, use=vt102+enq, use=klone+acs,
+	use=xterm+alt47,
 
 # I've supplied this so that you can help test new values and add other
 # features.  Cheers, earnie_boyd@yahoo.com.
@@ -9330,10 +9298,7 @@ cygwin|ANSI emulation for Cygwin,
 # this list, but DOES cause problems so it has been removed
 cygwinDBG|Debug Version for Cygwin,
 	am, eo, mir, msgr, xon,
-	colors#8, cols#80, 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,
+	cols#80, lines#24, ncv#3,
 	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
 	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
 	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
@@ -9342,15 +9307,14 @@ cygwinDBG|Debug Version for Cygwin,
 	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~, kspd=^Z,
-	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rmacs=\E[10m,
-	rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, 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%;%?%p7%t;8%;%?%p9%t;12%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, vpa=\E[%i%p1%dd,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+sgrbold, use=vt220+pcedit, use=vt220+cvis,
-	use=vt102+enq,
+	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
+	use=klone+acs, use=klone+color, use=vt220+pcedit,
+	use=vt220+cvis, use=vt102+enq,
 
 #### DJGPP
 
@@ -9523,7 +9487,7 @@ djgpp204|entry for DJGPP 2.04,
 # set (the emulator spits out error messages).  Compare with att6386 -TD
 uwin|U/Win 3.2 console,
 	am, eo, in, msgr, xenl, xon,
-	colors#8, it#8, ncv#58, pairs#64,
+	it#8, ncv#58,
 	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,
@@ -9535,10 +9499,10 @@ uwin|U/Win 3.2 console,
 	kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, nel=\r\n,
 	op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
 	rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m,
-	smacs=\E[11m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
-	use=ansi+idc, use=vt220+cvis,
+	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
+	smul=\E[4m, tbc=\E[3g, use=ansi+arrows, use=ansi+cpr,
+	use=ansi+erase, use=ansi+idc, use=klone+color,
+	use=vt220+cvis,
 
 #### Microsoft (miscellaneous)
 
@@ -9831,21 +9795,21 @@ hp+pfk+arrows|HP alternate arrow definitions,
 	kll=\Eq\r, kri=\Es\r,
 
 hp+arrows|HP arrow definitions,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh,
-	kind=\ES, kll=\EF, kri=\ET,
+	khome=\Eh, kind=\ES, kll=\EF, kri=\ET, use=vt52+arrows,
 
 # Generic stuff from the HP 262x series
 #
 hp262x|HP 262x terminals,
 	xhp,
 	blink=\E&dA, dch1=\EP$<2>, ed=\EJ, ht=\011$<2>, ind=\ES,
-	invis=\E&dS, ip=$<2>, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	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@,
+	invis=\E&dS, ip=$<2>, 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,
 	sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, smul=\E&dD,
+	use=vt52+arrows,
 
 # Note: no <home> on HPs since that homes to top of memory, not screen.
 # Due to severe 2621 braindamage, the only way to get the arrow keys to
@@ -9887,8 +9851,8 @@ hp2621p-a|HP 2621p with fn as arrows,
 
 # hp2621 with k45 keyboard
 hp2621-k45|hp2621k45|k45|HP 2621 with 45 keyboard,
-	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	khome=\Eh, rmkx=\E&s0A, smkx=\E&s1A, use=hp2621,
+	kbs=^H, khome=\Eh, rmkx=\E&s0A, smkx=\E&s1A, use=hp2621,
+	use=vt52+arrows,
 
 # 2621 using all 48 lines of memory, only 24 visible at any time.
 hp2621-48|HP 48 line 2621,
@@ -10044,14 +10008,13 @@ hp2641a|hp2645a|hp2647a|HP 264?A series BRL entry,
 # software to support it.
 hp2645|hp45|HP 2645 series,
 	pb#9600,
-	blink=\E&dA, cr=\r$<20>, dim=\E&dH, kctab=\E2, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\EP, kdl1=\EM,
-	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,
+	blink=\E&dA, cr=\r$<20>, dim=\E&dH, kctab=\E2, kdch1=\EP,
+	kdl1=\EM, 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,
-	sgr0=\E&d@, smkx=\E&s1A, use=hpgeneric,
+	sgr0=\E&d@, smkx=\E&s1A, use=hpgeneric, use=vt52+arrows,
 # You should use this terminal at 4800 baud or less.
 hp2648|hp2648a|HP 2648a graphics terminal,
 	clear=\EH\EJ$<50>, cup=\E&a%p2%dc%p1%dY$<20>,
@@ -10085,11 +10048,10 @@ hp2621-a|hp2621a-a|hp2621 with fn as arrows,
 # newer hewlett packard terminals
 
 newhpkeyboard|generic entry for HP extended keyboard,
-	kbs=^H, kcbt=\Ei, kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh,
-	kich1=\EQ, kil1=\EL, kind=\ET, kll=\EF, knp=\EU, kpp=\EV,
-	kri=\ES, krmir=\ER, rmkx=\E&s0A, smkx=\E&s1A,
-	use=hp+pfk-cr,
+	kbs=^H, kcbt=\Ei, kclr=\EJ, kdch1=\EP, kdl1=\EM, ked=\EJ,
+	kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL, kind=\ET, kll=\EF,
+	knp=\EU, kpp=\EV, kri=\ES, krmir=\ER, rmkx=\E&s0A,
+	smkx=\E&s1A, use=hp+pfk-cr, use=vt52+arrows,
 
 newhp|generic entry for new Hewlett Packard terminals,
 	am, bw, mir, xhp, xon,
@@ -10143,11 +10105,10 @@ hp+printer|"standard" printer info for HP ttys,
 # length label, the following character is eaten!
 hp2621b|HP 2621b with old style keyboard,
 	lh#1, lm#48, lw#8, nlab#8,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh,
-	kind=\ET, kll=\EF, kri=\ES,
+	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,
-	smln=\E&jB, use=hp2621,
+	smln=\E&jB, use=hp2621, use=vt52+arrows,
 
 hp2621b-p|HP 2621b with printer,
 	use=hp+printer, use=hp2621b,
@@ -10242,11 +10203,9 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode,
 # (hp2392: copied <rmir> here from hpex -- esr)
 hp2392|239x series,
 	cols#80,
-	cbt=\Ei, cup=\E&a%p1%dy%p2%dC, 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=\Eh, kind=\EU, knp=\Eu, kpp=\Ev, kri=\EV,
-	rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY,
-	use=hpsub,
+	cbt=\Ei, cup=\E&a%p1%dy%p2%dC, khome=\Eh, kind=\EU,
+	knp=\Eu, kpp=\Ev, kri=\EV, rmir=\ER, rmul=\E&d@, smir=\EQ,
+	smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub, use=hp+pfk+cr,
 
 hpsub|HP terminals -- capability subset,
 	am, da, db, mir, xhp, xon,
@@ -10254,9 +10213,9 @@ hpsub|HP terminals -- capability subset,
 	bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
 	cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC,
 	ht=^I, if=/usr/share/tabset/stdcrt, il1=\EL, ind=\n,
-	is2=\E&s1A\E<\E&k0\\, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, khome=\Eh, rmkx=\E&s0A, rmso=\E&d@,
-	sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB,
+	is2=\E&s1A\E<\E&k0\\, kbs=^H, khome=\Eh, rmkx=\E&s0A,
+	rmso=\E&d@, sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB,
+	use=vt52+arrows,
 
 # hpex:
 #	May be used for most 24 x 80 hp terminals,
@@ -10313,10 +10272,9 @@ hp300h|HP Catseye console,
 	cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP,
 	dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I,
 	if=/usr/share/tabset/stdcrt, il1=\EL, ind=\n, kbs=^H,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh,
-	rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@,
-	smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, tbc=\E3,
-	vpa=\E&a%p1%dY,
+	khome=\Eh, rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@,
+	sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD,
+	tbc=\E3, vpa=\E&a%p1%dY, use=vt52+arrows,
 # From: Greg Couch <gregc@ernie.berkeley.edu>
 hp9837|hp98720|hp98721|HP 9000/300 workstations,
 	OTbs, am, da, db, mir, xhp,
@@ -10324,12 +10282,11 @@ hp9837|hp98720|hp98721|HP 9000/300 workstations,
 	bel=^G, cbt=\Ei, clear=\E&a0y0C\EJ, cub1=^H, cud1=\EB,
 	cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP,
 	dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, hts=\E1,
-	il1=\EL, ind=\n, is2=\E&v0m1b0i&j@, kbs=^H, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\EP, kdl1=\EM,
-	ked=\EJ, kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL, knp=\EU,
-	kpp=\EV, rmir=\ER, rmkx=\E&s0A, rmso=\E&v0S, rmul=\E&d@,
-	sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&v5S, smul=\E&dD,
-	tbc=\E3, vpa=\E&a%p1%dY,
+	il1=\EL, ind=\n, is2=\E&v0m1b0i&j@, kbs=^H, kdch1=\EP,
+	kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL,
+	knp=\EU, kpp=\EV, rmir=\ER, rmkx=\E&s0A, rmso=\E&v0S,
+	rmul=\E&d@, sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&v5S,
+	smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY, use=vt52+arrows,
 # HP 9845 desktop computer from BRL
 # (hp9845: removed unknown capability :gu: -- esr)
 hp9845|HP 9845,
@@ -10430,10 +10387,10 @@ bobcat|sbobcat|HP 9000 model 300 console,
 	cbt=\Ei, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\E&a%p1%dy%p2%dC$<6/>, cuu1=\EA, dch1=\EP,
 	dl1=\EM$<10*/>, ed=\EJ, el=\EK, hpa=\E&a%p1%dC$<6/>, ht=^I,
-	il1=\EL$<10*/>, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, khome=\Eh, nel=\r\n, rmir=\ER,
-	rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, smir=\EQ,
-	smkx=\E&s1A, smso=\E&dB, smul=\E&dD, vpa=\E&a%p1%dY$<6/>,
+	il1=\EL$<10*/>, ind=\n, kbs=^H, khome=\Eh, nel=\r\n,
+	rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@,
+	smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD,
+	vpa=\E&a%p1%dY$<6/>, use=vt52+arrows,
 gator-t|HP 9000 model 237 emulating extra-tall AAA,
 	lines#94, use=gator,
 gator|HP 9000 model 237 emulating AAA,
@@ -12096,14 +12053,10 @@ tvi9065|TeleVideo 9065,
 # disguise; <kf7>-<kf9> are really l1-l3.
 vi50|Visual 50,
 	OTbs, OTpt, am, da, db, msgr,
-	cols#80, it#8, lines#24,
-	OTnl=\n, bel=^G, cbt=\Ez$<4/>, clear=\EH\EJ, cr=\r, cub1=^H,
-	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
-	cuu1=\EA, dl1=\EM$<3*/>, ed=\EJ, el=\EK$<16/>, home=\EH,
-	ht=^I, il1=\EL, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\EV,
+	OTnl=\n, cbt=\Ez$<4/>, cub1=^H, dl1=\EM$<3*/>,
+	el=\EK$<16/>, il1=\EL, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\EV,
 	kf5=\EE, kf6=\E], kf7=\EL, kf8=\Ev, kf9=\EM, khome=\EH,
-	nel=\r\n, ri=\EI, rmso=\ET, rmul=\EW, smso=\EU, smul=\ES,
+	rmso=\ET, rmul=\EW, smso=\EU, smul=\ES, use=vt52-basic,
 # this one was BSD & SCO's vi50
 vi50adm|Visual 50 in adm3a mode,
 	am, msgr,
@@ -12111,8 +12064,7 @@ vi50adm|Visual 50 in adm3a mode,
 	bel=^G, clear=^Z, cr=\r, cub1=^H, cud1=\n, cuf1=^L,
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dl1=\EM,
 	ed=\Ek, el=\EK, home=\EH, ht=^I, il1=\EL, ind=\n, kbs=^H,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH,
-	rmso=\ET, smso=\EU,
+	khome=\EH, rmso=\ET, smso=\EU, use=vt52+arrows,
 # From: Jeff Siegal <jbs@quiotix.com>
 vi55|Visual 55,
 	OTbs, am, mir, msgr,
@@ -12120,9 +12072,8 @@ vi55|Visual 55,
 	clear=\Ev, csr=\E_%p1%{65}%+%c%p2%{65}%+%c, cub1=^H,
 	cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
 	cuu1=\EA, dch1=\Ew, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I,
-	il1=\EL, is2=\Ev\E_AX\Eb\EW\E9P\ET, kbs=^H, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, ri=\EI, rmir=\Eb, rmso=\ET,
-	smir=\Ea, smso=\EU,
+	il1=\EL, is2=\Ev\E_AX\Eb\EW\E9P\ET, kbs=^H, ri=\EI,
+	rmir=\Eb, rmso=\ET, smir=\Ea, smso=\EU, use=vt52+arrows,
 
 # Visual 200 from BRL
 # The following switch settings are assumed for normal operation:
@@ -12142,13 +12093,13 @@ vi200|Visual 200,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ed,
 	dch1=\EO, dim=\E4, dl1=\EM, ed=\Ey, el=\Ex, home=\EH, ht=^I,
 	hts=\E1, il1=\EL, ind=\n, invis=\Ea, kbs=^H, kclr=\Ev,
-	kctab=\E2, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p, kf1=\E?q,
-	kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w,
-	kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei, kil1=\EL,
-	krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI, rmacs=\EG,
-	rmkx=\E>, rmso=\E3, rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX,
-	sgr0=\E3\Eb, smacs=\EF, smkx=\E=, smso=\E4, tbc=\Eg,
+	kctab=\E2, kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p,
+	kf1=\E?q, kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v,
+	kf7=\E?w, kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei,
+	kil1=\EL, krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI,
+	rmacs=\EG, rmkx=\E>, rmso=\E3,
+	rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX, sgr0=\E3\Eb, smacs=\EF,
+	smkx=\E=, smso=\E4, tbc=\Eg, use=vt52+arrows,
 # The older Visuals didn't come with function keys. This entry uses
 # <smkx> and <rmkx> so that the keypad keys can be used as function keys.
 # If your version of vi doesn't support function keys you may want
@@ -12201,9 +12152,9 @@ vi500|Visual 500,
 	el=\Ex$<16/>, home=\EH, ht=\011$<8/>, il1=\EL\Ex$<3*/>,
 	ind=\n,
 	is2=\E3\E\001\E\007\E\003\Ek\EG\Ed\EX\El\E>\Eb\E\\,
-	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	khome=\EH, nel=\r\n, rmacs=^O, rmir=\Ej, rmso=\E^G,
+	kbs=^H, khome=\EH, nel=\r\n, rmacs=^O, rmir=\Ej, rmso=\E^G,
 	rmul=\E^C, smacs=^N, smir=\Ei, smso=\E^H, smul=\E^D,
+	use=vt52+arrows,
 
 # The visual 550 is a visual 300 with Tektronix graphics,
 # and with 33 lines. clear screen is modified here to
@@ -13604,29 +13555,29 @@ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC,
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
 # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
 vt320-k3|MS-Kermit 3.00's VT320 emulation,
-	am, eslok, hs, km, mir, msgr, xenl,
+	am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r, cub1=^H,
 	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[0$~, ech=\E[%p1%dX,
+	ech=\E[%p1%dX,
 	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@, ind=\n,
-	is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~,
-	kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, nel=\r\n,
-	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,
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+	ind=\n, is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~,
+	kf0=\E[21~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, mc0=\E[0i, mc4=\E[4i,
+	mc5=\E[5i, nel=\r\n, 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\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$~,
 	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, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+erase, use=ansi+idl, use=ansi+local, use=dec+sl,
 	use=vt220+cvis,
 
 # From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
@@ -14086,11 +14037,10 @@ att4420|tty4420|Teletype 4420,
 	bel=^G, clear=\EH\EJ, cr=\EG, cub1=\ED, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP,
 	dl1=\EM, ed=\EJ, el=\Ez, home=\EH, il1=\EL, ind=\EH\EM\EY7\s,
-	kcbt=\EO, kclr=\EJ, kcub1=^H, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=\EP, kdl1=\EM, kf0=\EU, kf3=\E@, khome=\EH,
-	kich1=\E\^, kil1=\EL, kind=\ES, kri=\ET,
+	kcbt=\EO, kclr=\EJ, kcub1=^H, kdch1=\EP, kdl1=\EM, kf0=\EU,
+	kf3=\E@, khome=\EH, kich1=\E\^, kil1=\EL, kind=\ES, kri=\ET,
 	lf0=segment advance, lf3=cursor tab, rmdc@, rmso=\E~,
-	rmul=\EZ, smdc@, smso=\E}, smul=\E\\,
+	rmul=\EZ, smdc@, smso=\E}, smul=\E\\, use=vt52+arrows,
 
 #  The following is a terminfo entry for the Teletype 4424
 #  asynchronous keyboard-display terminal.  It supports
@@ -14199,15 +14149,14 @@ att4426|tty4426|Teletype 4426S,
 	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP,
 	ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
 	ich=\E[%p1%d@, ich1=\E\^, 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=ansi+idl, use=ansi+local,
-	use=ecma+index,
+	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, 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=ansi+idl,
+	use=ansi+local, use=ecma+index, use=vt52+arrows,
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
 # Function keys 9 - 16 are available only after the
@@ -14726,8 +14675,7 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	kf38=\EOu, kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq,
 	kf42=\EOr, kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM,
 	kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, 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,
+	kil1=\E[L, knp=\E[U, kpp=\E[V, ll=\E[24H, nel=\EE,
 	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, ri=\EM, rmacs=^O,
@@ -14739,7 +14687,8 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows,
 	use=ansi+csr, use=ansi+erase, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
-	use=ansi+sgrbold, use=decid+cpr, use=att610+cvis0,
+	use=ansi+sgrbold, use=decid+cpr, use=dec+pp,
+	use=att610+cvis0,
 
 # This entry was modified 3/13/90 by JWE.
 # fixes include additions of <enacs>, correcting <rep>, and modification
@@ -14758,10 +14707,10 @@ att730|AT&T 730 windowing terminal,
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, dch=\E[%p1%dP, dch1=\E[P,
+	dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@,
+	ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14774,8 +14723,7 @@ att730|AT&T 730 windowing terminal,
 	kf4=\EOf, kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY,
 	kf44=\EOZ, kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^,
 	kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, kich1=\E[@,
-	kil1=\E[L, kind=\E[S, kri=\E[T, mc0=\E[?19h\E[0i,
-	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
+	kil1=\E[L, kind=\E[S, kri=\E[T, mc0=\E[?19h\E[0i, 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,
 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
@@ -14789,7 +14737,7 @@ att730|AT&T 730 windowing terminal,
 	tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
 	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
-	use=decid+cpr, use=att610+cvis,
+	use=decid+cpr, use=dec+pp, use=att610+cvis,
 
 # "MGT" is "Multi-Tasking Graphics Terminal"
 att730-41|730MTG-41|AT&T 730-41 windowing terminal,
@@ -16532,14 +16480,7 @@ dgkeys+15|Private entry describing 15 DG mode special keys,
 #	u8=^^F}20^^Fi^^F}21,
 #
 dgunix+fixed|Fixed color info for DG D430C terminals in DG-UNIX mode,
-	bce,
-	colors#16, ncv#53, pairs#0x100,
-	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,
-	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
+	ncv#53, use=dgmode+color,
 
 dg+fixed|Fixed color info for DG D430C terminals in DG mode,
 	use=dgunix+fixed,
@@ -17265,10 +17206,8 @@ dm3025|Datamedia 3025a,
 dm3045|Datamedia 3045a,
 	am, eo, km@, ul, xenl,
 	dch1=\EB$<6>, dl1@, il1@, is2=\EU\EV, kcuf1=\EC, kcuu1=\EA,
-	kf0=\Ey\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, kf9=\Ex\r,
-	khome=\EH, pad=^?, rmdc@, rmir=\EP, rmso@, smdc@, smso@,
-	use=dm3025,
+	kf0=\Ey\r, kf9=\Ex\r, khome=\EH, pad=^?, rmdc@, rmir=\EP,
+	rmso@, smdc@, smso@, use=dm3025, use=hp+pfk+cr,
 # Datamedia DT80 soft switches:
 # 1	0=Jump  1=Smooth
 #	Autorepeat	0=off  1=on
@@ -17650,12 +17589,12 @@ sb1|Beehive SuperBee,
 	    \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=\n, 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, kf9=\E1, khome=\EH, kich1=\EQ\EO, krmir=\ER,
-	lf0=TAB CLEAR, lf9=TAB SET, rmcup=, rmir=\ER, rmso=\E_3,
-	rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO, smso=\E_1,
-	smul=\E_0, tbc=\E3, use=hp+pfk-cr,
+	ind=\n, is2=\EE$<3>\EX\EZ\EO\Eb\Eg\ER, kbs=^_, kdl1=\EM,
+	ked=\EJ, kel=\EK, kf0=\E2, kf9=\E1, khome=\EH, kich1=\EQ\EO,
+	krmir=\ER, lf0=TAB CLEAR, lf9=TAB SET, rmcup=, rmir=\ER,
+	rmso=\E_3, rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO,
+	smso=\E_1, smul=\E_0, tbc=\E3, use=hp+pfk-cr,
+	use=vt52+arrows,
 sbi|superbee|Beehive SuperBee at Indiana U.,
 	xsb,
 	cr=\r$<1>, il1=\EN$<1>\EL$<9>\EQ \EP$<9> \EO\ER\EA,
@@ -17678,8 +17617,8 @@ superbee-xsb|Beehive SuperBee (improved),
 	dch1=\EP$<3>, dl1=\EM$<100>, ed=\EJ$<3>, el=\EK$<3>,
 	home=\EH, ht=^I, hts=\E1,
 	ind=\n\0\0\0\n\0\0\0\EA\EK\0\0\0\ET\ET, is2=\EH\EJ,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH,
-	rmso=\E_3, sgr0=\E_3, smso=\E_1, tbc=\E3, use=hp+pfk-cr,
+	khome=\EH, rmso=\E_3, sgr0=\E_3, smso=\E_1, tbc=\E3,
+	use=hp+pfk-cr, use=vt52+arrows,
 # This loses on lines > 80 chars long, use at your own risk
 superbeeic|SuperBee with insert char,
 	ich1=, rmir=\ER, smir=\EQ, use=superbee-xsb,
@@ -17706,10 +17645,9 @@ beehive|bee|Harris Beehive,
 	cbt=\E>, clear=\EE, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EF%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP,
 	dl1=\EM, ed=\EJ, el=\EK, home=\EH, il1=\EL, kbs=^H, kcbt=\E>,
-	kclr=\EE, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	kdch1=\EP, kdl1=\EM, kel=\EK, khome=\EH, kich1=\EQ, kil1=\EL,
-	krmir=\E@, rmir=\E@, rmso=\Ed@, rmul=\Ed@, sgr0=\Ed@,
-	smir=\EQ, smso=\EdP, smul=\Ed`,
+	kclr=\EE, kdch1=\EP, kdl1=\EM, kel=\EK, khome=\EH, kich1=\EQ,
+	kil1=\EL, krmir=\E@, rmir=\E@, rmso=\Ed@, rmul=\Ed@,
+	sgr0=\Ed@, smir=\EQ, smso=\EdP, smul=\Ed`, use=vt52+arrows,
 # set tab is ^F, clear (one) tab is ^V, no way to clear all tabs.
 # good grief - does this entry make :sg:/:ug: when it doesn't have to?
 # look at those spaces in <rmso>/<smso>.  Seems strange to me...
@@ -17734,9 +17672,9 @@ microb|microbee|Micro Bee series,
 	cols#80, it#8, lines#24,
 	bel=^G, clear=\EE, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\EF%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
-	el=\EK, ht=^I, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kf9=\Ex, khome=\EH, rmso=\Ed@, rmul=\Ed@,
-	sgr0=\Ed@, smso=\s\EdP, smul=\Ed`, use=hp+pfk-cr,
+	el=\EK, ht=^I, ind=\n, kf9=\Ex, khome=\EH, rmso=\Ed@,
+	rmul=\Ed@, sgr0=\Ed@, smso=\s\EdP, smul=\Ed`,
+	use=hp+pfk-cr, use=vt52+arrows,
 
 # 8675, 8686, and bee from Cyrus Rahman
 # (8675: changed k10, k11...k16 to k;, F1...F6 -- esr)
@@ -17923,8 +17861,8 @@ ibm3101|i3101|IBM 3101-10,
 	cols#80, lines#24,
 	bel=^G, clear=\EK, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
-	el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH,
+	el=\EI, home=\EH, hts=\E0, ind=\n, nel=\r\n, tbc=\EH,
+	use=vt52+arrows,
 ibm3151|IBM 3151 display,
 	is2=\E S, rmacs=\E>B, rs2=\E S,
 	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
@@ -17948,9 +17886,8 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display,
 	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
 	cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, home=\EH,
 	ich1=\EP \010, il1=\EN, ind=\n, invis=\E4P, kbs=^H, kcbt=\E2,
-	kclr=\EL\r, kctab=\E1, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=\EQ, kdl1=\EO, ked=\EJ, kel=\EI, kf1=\Ea\r,
-	kf10=\Ej\r, kf11=\Ek\r, kf12=\El\r, kf13=\E!a\r,
+	kclr=\EL\r, kctab=\E1, kdch1=\EQ, kdl1=\EO, ked=\EJ, kel=\EI,
+	kf1=\Ea\r, kf10=\Ej\r, kf11=\Ek\r, kf12=\El\r, kf13=\E!a\r,
 	kf14=\E!b\r, kf15=\E!c\r, kf16=\E!d\r, kf17=\E!e\r,
 	kf18=\E!f\r, kf19=\E!g\r, kf2=\Eb\r, kf20=\E!h\r,
 	kf21=\E!i\r, kf22=\E!j\r, kf23=\E!k\r, kf24=\E!l\r,
@@ -17962,6 +17899,7 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display,
 	    %?%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,
+	use=vt52+arrows,
 
 ibm3161-C|IBM 3161-C NLS terminal using cartridge,
 	rmcup=\E>B, s0ds=\E>B, s1ds=\E>A, smcup=\E>B, use=ibm3161,
@@ -18017,8 +17955,8 @@ ibmaed|IBM Experimental display,
 	clear=\EH\EK, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ,
 	dl1=\EO, ed=\EJ, el=\EI, flash=\EG, home=\EH, ht=^I, ich1=\EP,
-	il1=\EN, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	rmso=\E0, sgr0=\E0, smso=\E0,
+	il1=\EN, kbs=^H, rmso=\E0, sgr0=\E0, smso=\E0,
+	use=vt52+arrows,
 ibm-apl|apl|IBM apl terminal simulator,
 	lines#25, use=dm1520,
 # (ibmmono: this had an unknown `sb' boolean, I changed it to `bs'.
@@ -19057,9 +18995,9 @@ mime2a|mime2a-v|microterm mime2a (emulating an enhanced VT52),
 	bel=^G, clear=\EL, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=^N,
 	dl1=\027$<20*>, ed=\EQ$<20*>, el=\EP, home=\EH, ht=^I,
-	il1=\001$<20*>, ind=\n, ip=$<2>, is2=^Y, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, ri=\EA, rmir=^Z, rmso=\E9,
-	rmul=\E5, smir=^O, smso=\E8, smul=\E4,
+	il1=\001$<20*>, ind=\n, ip=$<2>, is2=^Y, ri=\EA, rmir=^Z,
+	rmso=\E9, rmul=\E5, smir=^O, smso=\E8, smul=\E4,
+	use=vt52+arrows,
 # (mime3a: removed obsolete ":ma=^X ^K^J^Z^P:" -- esr)
 mime3a|mime1 emulating 3a,
 	am@,
@@ -19474,31 +19412,14 @@ ncr260wy325wpp|NCR 2900/260 Wyse 325 wide mode,
 #	    have it included, Un-comment it and recompile (using 'tic').
 #
 ncr260wy350pp|NCR 2900/260 Wyse 350,
-	am, bw, km, mc5i, mir, msgr, xon,
-	colors#16, cols#80, lines#24, ncv#33, nlab#32, pairs#16, xmc#1,
-	acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2,
-	cbt=\EI, civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r,
-	cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>,
-	cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<40>, cuu1=\013$<5>,
-	cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>,
-	ed=\Ey$<5>, el=\Et$<5>, home=\036$<10>, ht=^I, hts=\E1,
-	il1=\EE$<5>, ind=\n$<5>, invis=\EG1,
+	colors#16, ncv#33, pairs#16,
+	acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, cbt=\EI,
+	cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<40>, ed=\Ey$<5>,
+	el=\Et$<5>, ht=^I, hts=\E1,
 	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=\n, kcuf1=^L,
-	kcuu1=^K, kdch1=\EW, kend=\ET, kf1=^A@\r, kf10=^AI\r,
-	kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r,
-	kf16=^AO\r, kf17=^A`\r, kf18=^Aa\r, kf19=^Ab\r, kf2=^AA\r,
-	kf20=^Ac\r, kf21=^Ad\r, kf22=^Ae\r, kf23=^Af\r, kf24=^Ag\r,
-	kf25=^Ah\r, kf26=^Ai\r, kf27=^Aj\r, kf28=^Ak\r, kf29=^Al\r,
-	kf3=^AB\r, kf30=^Am\r, kf31=^An\r, kf32=^Ao\r, kf4=^AC\r,
-	kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r,
-	khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ, kprt=\EP,
-	mc0=\EP$<10>, mc4=^T, mc5=^R,
 	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,
+	rmacs=\EH\003\EcB0,
 	rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9
 	    \Ee7$<100>,
 	setb=\s,
@@ -19508,9 +19429,8 @@ ncr260wy350pp|NCR 2900/260 Wyse 350,
 	     %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,
-	use=ncr260vp+sl,
+	sgr0=\EG0\EH\003\EcD, smacs=\EH\002\EcB1, tbc=\E0,
+	use=ncr260vp+sl, use=ncr160wy50+pp,
 ncr260wy350wpp|NCR 2900/260 Wyse 350 wide mode,
 	cols#132,
 	cup=\Ea%i%p1%dR%p2%dC$<30>,
@@ -19750,10 +19670,9 @@ ncr7900iv|NCR 7900 model 4,
 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n,
 	cup=\013%p1%{64}%+%c\E\005%p2%02d, dl1=\E^O, dsl=\Ey1,
 	fsl=\Ek\Ey5, home=\013@\E^E00, il1=\E^N, ind=\n, kbs=^H,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\ES, kf2=\ET,
-	kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
-	khome=\EH, lf6=blue, lf7=red, lf8=white, nel=\r\n,
-	tsl=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo,
+	kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ,
+	kf8=\ER, khome=\EH, lf6=blue, lf7=red, lf8=white, nel=\r\n,
+	tsl=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo, use=vt52+arrows,
 # Warning: This terminal will lock out the keyboard when it receives a CTRL-D.
 #	   The user can enter a CTRL-B to get out of this locked state.
 # In <hpa>, we want to output the character given by the formula:
@@ -19967,12 +19886,11 @@ dmterm|deskmate terminal,
 	bel=^G, civis=\EG5, clear=\Ej, cnorm=\EG6, cr=\r, cub1=^H,
 	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
 	cuu1=\EA, dch1=\ES, dl1=\ER, ed=\EJ, el=\EK, home=\EH, ht=^I,
-	ich1=\EQ, il1=\EP, ind=\EX, invis@, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf0=\E1, kf1=\E2, kf2=\E3, kf3=\E4,
-	kf4=\E5, kf5=\E6, kf6=\E7, kf7=\E8, kf8=\E9, kf9=\E0,
+	ich1=\EQ, il1=\EP, ind=\EX, invis@, kf0=\E1, kf1=\E2, kf2=\E3,
+	kf3=\E4, kf4=\E5, kf5=\E6, kf6=\E7, kf7=\E8, kf8=\E9, kf9=\E0,
 	khome=\EH, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6,
 	lf6=f7, lf7=f8, lf8=f9, lf9=f10, ll=\EE, rmul@, smul@,
-	use=adm+sgr,
+	use=adm+sgr, use=vt52+arrows,
 dt100|dt-100|Tandy DT-100 terminal,
 	xon,
 	cols#80, lines#24, xmc#1,
@@ -20286,13 +20204,12 @@ tek4107|tek4109|Tektronix terminals 4107 4109,
 	cub1=^H, cud1=\n, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E%!3,
 	dim=\E%!1\E[<0m$<2>\E%!0, ed=\EJ, el=\EK, ht=^I, ind=\n,
-	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	rev=\E%!1\E[7m$<2>\E%!0, ri=\EI,
+	kbs=^H, 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,
 	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,
+	smul=\E%!1\E[4m$<2>\E%!0, use=vt52+arrows,
 # Tektronix 4207 with sysline.  In the ancestral termcap file this was 4107-s;
 # see the note attached to tek4207.
 tek4207-s|Tektronix 4207 with sysline but no memory,
@@ -20562,9 +20479,9 @@ scanset|sc410|sc415|Tymshare Scan Set,
 	cols#80, lines#24,
 	acsc=j%k4l<m-q\,x5, bel=^G, clear=\EH\EJ, cr=\r, cub1=^H,
 	cud1=\n, cuf1=^I, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
-	cuu1=^K, ed=\EJ, el=\EK, home=\EH, ind=\n, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, mc0=\E;3, mc4=\E;0,
+	cuu1=^K, ed=\EJ, el=\EK, home=\EH, ind=\n, mc0=\E;3, mc4=\E;0,
 	mc5=\E;0, rc=^C, rmacs=^O, rs1=\E>, sc=^B, smacs=^N,
+	use=vt52+arrows,
 
 #### Volker-Craig (vc)
 #
@@ -20809,9 +20726,9 @@ apple-videx3|vapple|Apple II with 80 col card,
 	cols#80, lines#24,
 	clear=\Ev, cub1=\ED, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, el=\Ex,
-	home=\EH, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E\s, kf4=\E!, kf5=\E", kf6=\E#,
-	kf7=\E$, kf8=\E%%, kf9=\E&, khome=\EH,
+	home=\EH, kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E\s, kf4=\E!,
+	kf5=\E", kf6=\E#, kf7=\E$, kf8=\E%%, kf9=\E&, khome=\EH,
+	use=vt52+arrows,
 #From: decvax!cbosgd!cbdkc1!mww Mike Warren via BRL
 aepro|Apple II+ running ASCII Express Pro--vt52,
 	OTbs,
@@ -20922,11 +20839,11 @@ trs16|trs-80 model 16 console,
 	cnorm=\ERC, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ,
 	dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, ich1=\EP, il1=\EL,
-	ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	kf0=^A, kf1=^B, kf2=^D, kf3=^L, kf4=^U, kf5=^P, kf6=^N, kf7=^S,
-	khome=^W, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7,
-	lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg, rmso=\ER@, sgr0=\ER@,
-	smacs=\ERG, smso=\ERD,
+	ind=\n, kbs=^H, kf0=^A, kf1=^B, kf2=^D, kf3=^L, kf4=^U, kf5=^P,
+	kf6=^N, kf7=^S, khome=^W, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5,
+	lf5=f6, lf6=f7, lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg,
+	rmso=\ER@, sgr0=\ER@, smacs=\ERG, smso=\ERD,
+	use=vt52+arrows,
 
 #### Commodore Business Machines
 #
@@ -21191,9 +21108,9 @@ pc-coherent|pcz19|coherent|IBM PC console running Coherent,
 	cols#80, it#8, lines#25,
 	bel=^G, clear=\EE, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EN,
-	ed=\EJ, el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, ri=\EI, rmir=\EO,
-	rmso=\Eq, sgr0=\Eq, smir=\E@, smso=\Ep,
+	ed=\EJ, el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, khome=\EH,
+	ri=\EI, rmir=\EO, rmso=\Eq, sgr0=\Eq, smir=\E@, smso=\Ep,
+	use=vt52+arrows,
 
 # According to the Venix 1.1 manual, the PC console is similar
 # to a DEC VT52.  Differences seem to be (1) arrow keys send
@@ -21538,7 +21455,7 @@ screen.minitel1b-nb|Screen specific for minitel1b-nb,
 
 linux-m1|Linux Minitel 1 "like" Couleurs,
 	am, bw@, ccc, mir, msgr, xenl,
-	colors#8, it#8, ncv#16, pairs#64,
+	it#8, ncv#16,
 	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, cr=\r, cub1=^H, cud1=\n,
@@ -21557,12 +21474,11 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	khome=\E[1~, kil1=\E\E[B, kmous=\E[M, nel=\EE,
 	oc=\E]R\E]P3FFFF80, op=\E[39;49m, 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],
-	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, 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,
+	rmso=\E[27m, rs1=\Ec, rs3=\E[37;40m\E[8], sgr0=\E[m,
+	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m,
+	smso=\E[7m, tbc=\E[3g, 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
@@ -21574,7 +21490,8 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	   \n\n\n\n\n\n\n\n\n\n,
 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local1,
-	use=vt220+pcedit, use=vt220+cvis, use=linux+decid,
+	use=klone+color, use=vt220+pcedit, use=vt220+cvis,
+	use=linux+decid,
 
 # 1. Using double-shapes for VT100 graphical chars (eg: mc).
 # 2. Native brown color corrected to good yellow color.
@@ -21784,8 +21701,8 @@ blit|jerq|blit running teletype rom,
 	cup=\EY%p2%{32}%+%c%p1%{32}%+%c, cuu1=\EA,
 	dch=\Ee%p1%{32}%+%c, dch1=\Ee!, dl=\EE%p1%{32}%+%c,
 	dl1=\EE!, el=\EK, ht=^I, ich=\Ef%p1%{32}%+%c, ich1=\Ef!,
-	il=\EF%p1%{32}%+%c, il1=\EF!, ind=\n, kbs=^H, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\Ex, kf2=\Ey, kf3=\Ez,
+	il=\EF%p1%{32}%+%c, il1=\EF!, ind=\n, kbs=^H, kf1=\Ex,
+	kf2=\Ey, kf3=\Ez, use=vt52+arrows,
 
 # (cbblit: here's a BSD termcap that says <cud1=\EG> -- esr)
 cbblit|fixterm|blit running columbus code,
@@ -21861,11 +21778,11 @@ bg1.25|BBN BitGraph 1.25,
 	cols#85, lines#64,
 	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H,
 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
-	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER,
-	kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, ll=\E[64;1H,
-	rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smam=\E[?7h,
-	smkx=\E=, smso=\E[7m, use=ansi+local1,
+	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kf1=\EP,
+	kf2=\EQ, kf3=\ER, kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4,
+	ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m,
+	smam=\E[?7h, smkx=\E=, smso=\E[7m, use=ansi+local1,
+	use=vt52+arrows,
 
 #### Bull (bq, dku, vip)
 #
@@ -22056,12 +21973,12 @@ dku7202|Bull Questar 200 DKU7202 (colour/character attributes),
 
 # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
 bq300|Bull VT320 ISO Latin 1 80 columns terminal,
-	eo, eslok, hs, km, mir, xenl, xon,
+	eo, km, mir, xenl, xon,
 	vt#3, wsl#80,
 	blink=\E[5m, bold=\E[1m, cup=\E[%i%p1%d;%p2%dH,
 	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[1$}\E[2$~\n\E[0$},
 	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<50>\E[?5l,
-	fsl=\E[0$}, ich=\E[%p1%d@, ind=\ED, is1=\E[63;1"p\E[2h,
+	ich=\E[%p1%d@, ind=\ED, is1=\E[63;1"p\E[2h,
 	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,
@@ -22080,7 +21997,7 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+pp, use=vt100+4bsd, use=vt220+cvis,
+	use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis,
 	use=vt220+vtedit,
 
 bq300-rv|Bull VT320 reverse 80 columns,
@@ -22315,17 +22232,15 @@ bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns,
 # This covers the vip7800 and BQ3155-vip7800
 vip|Bull Questar 3155-7800,
 	am, eslok, hs, km, mc5i, msgr, xenl, xon,
-	cols#80, lines#24, vt#3, wsl#80,
-	acsc=0pjdkblamcnkqitgufvhwexj, bel=^G, blink=\EsB,
-	clear=\E`, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
-	cup=\E[%i%p1%03d%p2%03df, cuu1=\EA, dch1=\E[P, dim=\EsL,
-	dl1=\E[M, dsl=\Ev, ed=\EJ, el=\EK,
-	flash=\007$<80>\007$<80>\007, fsl=\EO, home=\EH, hts=\Ep,
-	ich1=\E[I, ind=\n, invis=\EsH,
+	vt#3, wsl#80,
+	acsc=0pjdkblamcnkqitgufvhwexj, blink=\EsB, clear=\E`,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%03d%p2%03df, dch1=\E[P,
+	dim=\EsL, dl1=\E[M, dsl=\Ev,
+	flash=\007$<80>\007$<80>\007, fsl=\EO, hts=\Ep,
+	ich1=\E[I, invis=\EsH,
 	is2=\E[00u\E[<>001001024080024080u\E[01u,
-	is3=\Er\E[W\E`, kHOM=\EH, kLFT=\Eo, kRIT=\Eu, kbs=^H,
-	kcbt=\E[Z, kclr=\E`, kctab=\E[g, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kdch1=\E[P, kdl1=\E[M, ked=\EJ,
+	is3=\Er\E[W\E`, kHOM=\EH, kLFT=\Eo, kRIT=\Eu, kcbt=\E[Z,
+	kclr=\E`, kctab=\E[g, kdch1=\E[P, kdl1=\E[M, ked=\EJ,
 	kel=\EK, kf1=\E0, kf10=\ET, kf11=\E\\, kf12=\E\^, kf13@, kf14@,
 	kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\E2, kf20@, kf21=\E1,
 	kf22=\E5, kf23=\E7, kf24=\E9, kf25=\E;, kf26=\E=, kf27=\E?,
@@ -22339,6 +22254,7 @@ vip|Bull Questar 3155-7800,
 	rmul=\EsR, rs1=\Ec, rs2=\E[G, s0ds=\EF, s1ds=\EG,
 	sgr0=\EsR\EsU\EF, smacs=\EG, smir=\E[I, smso=\EsI,
 	smul=\Es_, tbc=\E[N, tsl=\Ew, use=ansi+inittabs,
+	use=vt52-basic,
 # normal screen, 8 bits, 132 columns terminal.
 vip-w|vip7800-w|Q310-vip-w|Q310-vip-w-am|Questar 3155-vip7800 wide,
 	cols#132, wsl#132,
@@ -22517,8 +22433,7 @@ vt50|DEC VT50,
 	cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, u8=\E/A, u9=\EZ,
 vt50h|DEC VT50h,
 	cub1=\ED, cud1=\EB, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, u8=\E/[HJ],
-	use=vt52+keypad, use=vt50,
+	u8=\E/[HJ], use=vt52+keypad, use=vt50, use=vt52+arrows,
 
 # (vt61: there's a BSD termcap that claims <dl1=\EPd>, <il1=\EPf.> <kbs=^H>)
 vt61|vt-61|vt61.5|DEC VT61,
@@ -22526,8 +22441,7 @@ vt61|vt-61|vt61.5|DEC VT61,
 	bel=^G, clear=\EH\EJ$<120>, cr=\r$<20>, cub1=^H, cud1=\n,
 	cuf1=\EC$<20>, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<20>,
 	cuu1=\EA$<20>, ed=\EJ$<120>, el=\EK$<70>, ht=^I,
-	ind=\n$<20>, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
-	ri=\E$<20>I,
+	ind=\n$<20>, ri=\E$<20>I, use=vt52+arrows,
 
 # The gigi does standout with red!
 # (gigi: I added <rmam>/<smam> based on the init string, corrected cub1 -- esr)
@@ -22554,10 +22468,10 @@ pro350|decpro|DEC pro console,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	clear=\EH\EJ, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
-	el=\EK, home=\EH, ht=^I, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kf0=\EE, kf1=\EF, kf2=\EG, kf3=\EH, kf4=\EI,
-	kf5=\EJ, kf6=\Ei, kf7=\Ej, khome=\EH, ri=\EI, rmacs=\EG,
-	rmso=\E^N, rmul=\E^C, smacs=\EF, smso=\E^H, smul=\E^D,
+	el=\EK, home=\EH, ht=^I, kf0=\EE, kf1=\EF, kf2=\EG, kf3=\EH,
+	kf4=\EI, kf5=\EJ, kf6=\Ei, kf7=\Ej, khome=\EH, ri=\EI,
+	rmacs=\EG, rmso=\E^N, rmul=\E^C, smacs=\EF, smso=\E^H,
+	smul=\E^D, use=vt52+arrows,
 
 dw1|DECwriter I,
 	OTbs, hc, os,
@@ -22747,11 +22661,11 @@ h19|heath|h19-b|heathkit|heath-19|z19|zenith|Heathkit h19,
 	clear=\EE, cnorm=\Ey4, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ex4,
 	dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I, ind=\n,
-	ip=$<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW,
-	kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue, lf7=red,
-	lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-	smir=\E@, smso=\Ep, tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo,
+	ip=$<1.5/>, kbs=^H, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
+	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue,
+	lf7=red, lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
+	smacs=\EF, smir=\E@, smso=\Ep,
+	tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo, use=vt52+arrows,
 h19-u|Heathkit with underscore cursor,
 	cnorm@, cvvis@, use=h19-b,
 h19-g|h19g|Heathkit w/block cursor,
@@ -22809,12 +22723,11 @@ z29|zenith29|z29b|Zenith z29b,
 	cvvis=\Ex4, dch1=\EN$<0.1*>, dl1=\EM$<1/>, dsl=\Ey1,
 	ed=\EJ$<14>, el=\EK$<1>, fsl=\Ek\Ey5, home=\EH, ht=^I,
 	ich1=\E<\E[1@\E[?2h$<1>, il1=\EL$<1/>, ind=\n$<2>,
-	is2=\E<\E[?2h\Ev, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
-	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
-	lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO, rmso=\Eq,
-	rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep, smul=\Es8,
-	tsl=\Ej\Ex5\Ex1\EY8%+ \Eo,
+	is2=\E<\E[?2h\Ev, kbs=^H, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU,
+	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I,
+	khome=\EH, lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO,
+	rmso=\Eq, rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep,
+	smul=\Es8, tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, use=vt52+arrows,
 # z29 in ANSI mode. Assumes that the cursor is in the correct state, and that
 # the world is stable. <rs1> causes the terminal to be reset to the state
 # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore
@@ -22857,19 +22770,19 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	am, eslok, hs, mir, msgr, xon,
 	cols#80, lines#24,
 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, civis=\E[>5h, clear=\E[2J\E[H,
-	cnorm=\E[>5l, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l, ed=\E[0J,
-	el=\E[0K, el1=\E[1K, fsl=\E[u, home=\E[H, il=\E[%p1%dL,
-	il1=\E[1L, ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J,
-	ka1=\EOw, ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J,
-	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
-	kf7=\EOQ, kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
-	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
-	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
-	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
-	smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
+	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
+	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
+	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	fsl=\E[u, home=\E[H, il=\E[%p1%dL, il1=\E[1L, ind=\n,
+	is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw, ka3=\EOu,
+	kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS, kf2=\EOT,
+	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
+	kf9=\EOX, khlp=\E[~, ll=\E[24;1H, mc0=\E[?19h\E[i, rc=\E[u,
+	rev=\E[7m, rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m,
+	rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0,
+	smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
 	use=ansi+local, use=ansi+pp, use=ansi+tabs,
 
@@ -22884,11 +22797,10 @@ z100bw|h100bw|z110bw|z-100bw|h-100bw|Heath/Zenith z-100 pc,
 	clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB, cuf1=\EC,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>, cuu1=\EA,
 	cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>, ed=\EJ, el=\EK,
-	home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kcub1=\ED, kcud1=\EB,
-	kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES, kf2=\ET, kf3=\EU,
-	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\EOI,
-	khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-	smir=\E@, smso=\Ep,
+	home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kf0=\EJ, kf1=\ES,
+	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
+	kf9=\EOI, khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
+	smacs=\EF, smir=\E@, smso=\Ep, use=vt52+arrows,
 p19|h19-b with il1/dl1,
 	dl1=\EM$<2*/>, il1=\EL$<2*/>, use=h19-b,
 # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
@@ -22900,10 +22812,9 @@ ztx|ztx11|zt-1|htx11|ztx-1-a|Heath/Zenith ztx-10 or 11,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM,
 	dsl=\Ey1, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I,
 	il1=\EL, is2=\Ej\EH\Eq\Ek\Ev\Ey1\Ey5\EG\Ey8\Ey9\Ey>,
-	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf0=\ES,
-	kf1=\EB, kf2=\EU, kf3=\EV, kf4=\EW, kf5=\EP, kf6=\EQ, kf7=\ER,
-	ri=\EI, rmso=\Eq, rmul=\Eq, smso=\Es5, smul=\Es2,
-	tsl=\Ej\Ex5\Ex1\EY8%+ \Eo,
+	kbs=^H, kf0=\ES, kf1=\EB, kf2=\EU, kf3=\EV, kf4=\EW, kf5=\EP,
+	kf6=\EQ, kf7=\ER, ri=\EI, rmso=\Eq, rmul=\Eq, smso=\Es5,
+	smul=\Es2, tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, use=vt52+arrows,
 
 #### IMS International (ims)
 #
@@ -23546,11 +23457,11 @@ ti931|Texas Instruments 931 VDT,
 	cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
 	cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, home=\EH,
 	ich1=\ER\EP\EM, il1=\EN, ind=\Ea, invis=\E4H,
-	is2=\EGB\E(@B@@\E), kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-	kcuu1=\EA, kdch1=\EQ, kdl1=\EO, kf1=\Ei1, kf2=\Ei2, kf3=\Ei3,
-	kf4=\Ei4, kf5=\Ei5, kf6=\Ei6, kf7=\Ei7, kf8=\Ei8, kf9=\Ei9,
-	kich1=\EP, kil1=\EN, rev=\E4B, ri=\Eb, rmso=\E4@, rmul=\E4@,
-	sgr0=\E4@, smso=\E4A, smul=\E4D,
+	is2=\EGB\E(@B@@\E), kdch1=\EQ, kdl1=\EO, kf1=\Ei1,
+	kf2=\Ei2, kf3=\Ei3, kf4=\Ei4, kf5=\Ei5, kf6=\Ei6, kf7=\Ei7,
+	kf8=\Ei8, kf9=\Ei9, kich1=\EP, kil1=\EN, rev=\E4B, ri=\Eb,
+	rmso=\E4@, rmul=\E4@, sgr0=\E4@, smso=\E4A, smul=\E4D,
+	use=vt52+arrows,
 ti926|Texas Instruments 926 VDT 8859/1 7 bit CTRL,
 	csr@, ind=\E[1S, ri=\E[1T, use=ti924,
 # (ti926-8: I corrected this from the broken SCO entry -- esr)
@@ -23624,10 +23535,9 @@ cci|cci1|z8001|zen8001|CCI Custom Zentec 8001,
 	csr=\ER%p1%{32}%+%c%p2%{32}%+%c, cub1=^H, cud1=\n,
 	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA,
 	cvvis=\EF\EQ\EM \ER 7, dim=\EM!, ed=\EJ, el=\EK, home=\EH,
-	invis=\EM(, is2=\EM \EF\ET\EP\ER 7, kbs=^H, kcub1=\ED,
-	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, mc4=^T, mc5=^R,
-	rev=\EM$, ri=\EI, rmso=\EM\s, rmul=\EM\s, sgr0=\EM\s,
-	smso=\EM$, smul=\EM0,
+	invis=\EM(, is2=\EM \EF\ET\EP\ER 7, kbs=^H, khome=\EH,
+	mc4=^T, mc5=^R, rev=\EM$, ri=\EI, rmso=\EM\s, rmul=\EM\s,
+	sgr0=\EM\s, smso=\EM$, smul=\EM0, use=vt52+arrows,
 
 ######## OBSOLETE UNIX CONSOLES
 #
@@ -24038,9 +23948,7 @@ ctrm|C terminal emulator,
 	cup=\E&a%p2%dc%p1%dY, cuu1=\EA, dch1=\EP$<2>, dl1=\EM,
 	ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=\011$<2>, hts=\E1,
 	il1=\EL, ind=\n, ip=$<2>, is2=\E&jA\r, kbs=^H, kcub1=\Eu\r,
-	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,
+	kcud1=\Ew\r, kcuf1=\Ev\r, kcuu1=\Et\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,
 	rev=%?%gB%{0}%=%t\E&dB%{1}%PB%;, rmir=\ER, rmkx=\E&jA,
@@ -24057,6 +23965,7 @@ ctrm|C terminal emulator,
 	    %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,
+	use=hp+pfk+cr,
 
 # gs6300 - can't use blue foreground, it clashes with underline;
 # it's simulated with cyan
@@ -24287,17 +24196,13 @@ digilog|digilog 333,
 # The DWK was a terminal manufactured in the Soviet Union c.1986
 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~
 	     _,
-	bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, 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=\n, kbs=^?,
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\Ee,
-	kf1=\Ef1, kf10=\Ef0, kf2=\Ef2, kf3=\Ef3, kf4=\Ef4, kf5=\Ef5,
-	kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kich1=\Ed, knp=\Eh,
-	kpp=\Eg, nel=\r\n, rev=\ET, ri=\ES, rmacs=\EG, rmso=\EX,
-	sgr0=\EX, smacs=\EF, smso=\ET,
+	clear=\EH\EJ, cub1=^H, cud1=\n, dch1=\EP, ich1=\EQ, kbs=^?,
+	kdch1=\Ee, kf1=\Ef1, kf10=\Ef0, kf2=\Ef2, kf3=\Ef3, kf4=\Ef4,
+	kf5=\Ef5, kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kich1=\Ed,
+	knp=\Eh, kpp=\Eg, rev=\ET, ri=\ES, rmacs=\EG, rmso=\EX,
+	sgr0=\EX, smacs=\EF, smso=\ET, use=vt52-basic,
 env230|envision230|envision 230 graphics terminal,
 	xenl@,
 	enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@,
@@ -25420,7 +25325,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	* Replaced Qume QVT and Freedom-series entries with purpose-built
 #	  terminfo entries.
 #	* Enhanced vt220, tvi910, tvi924, hpterm, hp2645, adm42, tek
-#	  and dg200 entries using caps from from SCO.
+#	  and dg200 entries using caps from SCO.
 #	* Added the usual set of function-key mappings to ANSI entry.
 #	* Corrected xterm's function-key capabilities.
 # 9.4.5 (Tue Mar 28 14:27:49 EST 1995):
@@ -27572,4 +27477,11 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit
 #	  xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD
 #
+# 2024-01-27
+#	+ amend change to z39-a (report by Sven Joachim).
+#	+ use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows,
+#	  hp+pfk+cr, klone+acs, klone+color, klone+sgr, ncr160wy50+pp
+#	  to trim -TD
+#	+ NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner)
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0a77de595..190ac14d0 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240120) unstable; urgency=low
+ncurses6 (6.4+20240127) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0a77de595..190ac14d0 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240120) unstable; urgency=low
+ncurses6 (6.4+20240127) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index b3b725619..fde413931 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240120) unstable; urgency=low
+ncurses6 (6.4+20240127) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 19 Jan 2024 06:23:02 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 23076414c..4c4122c0f 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.629 2024/01/19 11:23:02 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.630 2024/01/27 11:04:16 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0120"
+!define VERSION_MMDD  "0127"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 051376730..ad5a7f28f 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240120
+Release: 20240127
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 142275f7b..775f770c3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240120
+Release: 20240127
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 88c58ee2c..59460a5a3 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240120
+Release: 20240127
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From e8a42919675a5d26d1c660745f39bae32b31b3fb Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 4 Feb 2024 01:57:23 +0100
Subject: [PATCH 052/106] ncurses-6.4-20240203.patch

---
 NEWS                             |  5 ++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 ncurses/base/MKunctrl.awk        |  7 ++++---
 ncurses/tinfo/lib_setup.c        | 31 ++++++++++++++++++-------------
 ncurses/trace/lib_traceatr.c     |  9 +++++----
 ncurses/trace/lib_tracechr.c     | 16 +++++++++-------
 ncurses/tty/tty_update.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 +-
 package/ncursest.spec            |  2 +-
 15 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/NEWS b/NEWS
index 05e5aeeaa..33feec26d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4071 2024/01/27 22:04:17 tom Exp $
+-- $Id: NEWS,v 1.4075 2024/02/04 00:53:44 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240203
+	+ minor changes to tracing and locale-checks.
+
 20240127
 	+ amend change to z39-a (report by Sven Joachim).
 	+ use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows,
diff --git a/VERSION b/VERSION
index 25dee1cdc..3ad455475 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240127
+5:0:10	6.4	20240203
diff --git a/dist.mk b/dist.mk
index 8f193da0f..163c0b51f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1595 2024/01/27 11:04:16 tom Exp $
+# $Id: dist.mk,v 1.1596 2024/02/03 10:52:10 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240127
+NCURSES_PATCH = 20240203
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk
index 9a2a6db63..e5362bd60 100644
--- a/ncurses/base/MKunctrl.awk
+++ b/ncurses/base/MKunctrl.awk
@@ -1,6 +1,6 @@
-# $Id: MKunctrl.awk,v 1.29 2020/02/02 23:34:34 tom Exp $
+# $Id: MKunctrl.awk,v 1.30 2024/02/03 21:09:14 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 1998-2012,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -144,7 +144,7 @@ END	{
 		print  "\tint check = (int) ChCharOf(ch);"
 		print  "\tconst char *result;"
 		print  ""
-		print  "(void) sp;"
+		print  "\t(void) sp;"
 		print  "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
 		print  "#if NCURSES_EXT_FUNCS"
 		print  "\t\tif ((sp != 0)"
@@ -155,6 +155,7 @@ END	{
 		print  "\t\telse"
 		print  "\t\tif ((check >= 160)"
 		print  "\t\t && (check < 256)"
+		print  "\t\t && !_nc_unicode_locale()"
 		print  "\t\t && ((sp != 0)"
 		print  "\t\t  && ((sp->_legacy_coding > 0)"
 		print  "\t\t   || (sp->_legacy_coding == 0"
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index f2d2bb363..4752ba899 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.230 2023/11/04 21:02:27 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.231 2024/02/04 00:09:34 tom Exp $")
 
 /****************************************************************************
  *
@@ -707,22 +707,27 @@ _nc_get_locale(void)
 NCURSES_EXPORT(int)
 _nc_unicode_locale(void)
 {
-    int result = 0;
+    static bool initialized = FALSE;
+    static int result = 0;
+
+    if (!initialized) {
 #if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT
-    result = 1;
+	result = 1;
 #elif HAVE_LANGINFO_CODESET
-    char *env = nl_langinfo(CODESET);
-    result = !strcmp(env, "UTF-8");
-    T(("_nc_unicode_locale(%s) ->%d", env, result));
+	char *env = nl_langinfo(CODESET);
+	result = !strcmp(env, "UTF-8");
+	T(("_nc_unicode_locale(%s) ->%d", env, result));
 #else
-    char *env = _nc_get_locale();
-    if (env != 0) {
-	if (strstr(env, ".UTF-8") != 0) {
-	    result = 1;
-	    T(("_nc_unicode_locale(%s) ->%d", env, result));
+	char *env = _nc_get_locale();
+	if (env != 0) {
+	    if (strstr(env, ".UTF-8") != 0) {
+		result = 1;
+		T(("_nc_unicode_locale(%s) ->%d", env, result));
+	    }
 	}
-    }
 #endif
+	initialized = TRUE;
+    }
     return result;
 }
 
diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index d397fb21c..b36286253 100644
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.95 2022/06/11 22:40:56 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.96 2024/02/04 00:11:35 tom Exp $")
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
@@ -343,6 +343,7 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
 	    } else {
 		PUTC_DATA;
 		int n;
+		int assume_unicode = _nc_unicode_locale()? 128 : 255;
 
 		(void) _nc_trace_bufcat(bufnum, "{ ");
 		for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
@@ -362,10 +363,10 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
 								  UChar(ch->chars[PUTC_i])));
 			}
 			break;
-		    } else if (ch->chars[PUTC_i] > 255) {
+		    } else if (ch->chars[PUTC_i] > assume_unicode) {
 			char temp[80];
 			_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
-				    "{%d:\\u%lx}",
+				    "{%d:\\u%04lx}",
 				    _nc_wacs_width(ch->chars[PUTC_i]),
 				    (unsigned long) ch->chars[PUTC_i]);
 			(void) _nc_trace_bufcat(bufnum, temp);
diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index 36158d6f4..9c879dc67 100644
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracechr.c,v 1.23 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.24 2024/02/04 00:11:35 tom Exp $")
 
 #ifdef TRACE
 
@@ -54,26 +54,28 @@ _nc_tracechar(SCREEN *sp, int ch)
 		      ? sp->tracechr_buf
 		      : _nc_globals.tracechr_buf);
 
-    if (ch > KEY_MIN || ch < 0) {
+    if ((ch > KEY_MIN && !_nc_unicode_locale()) || ch < 0) {
 	name = safe_keyname(SP_PARM, ch);
 	if (name == 0 || *name == '\0')
 	    name = "NULL";
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
-		    "'%.30s' = %#03o", name, ch);
-    } else if (!is8bits(ch) || !isprint(UChar(ch))) {
+		    "'%.30s' = \\x%02x", name, ch);
+    } else if (!is8bits(ch)
+	       || (_nc_unicode_locale() && !is7bits(ch))
+	       || !isprint(UChar(ch))) {
 	/*
 	 * workaround for glibc bug:
 	 * sprintf changes the result from unctrl() to an empty string if it
 	 * does not correspond to a valid multibyte sequence.
 	 */
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
-		    "%#03o", ch);
+		    "\\x%02x", ch);
     } else {
 	name = safe_unctrl(SP_PARM, (chtype) ch);
 	if (name == 0 || *name == 0)
 	    name = "null";	/* shouldn't happen */
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
-		    "'%.30s' = %#03o", name, ch);
+		    "'%.30s' = \\x%02x", name, ch);
     }
     return (MyBuffer);
 }
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 066b7fce3..0427024cb 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -85,7 +85,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: tty_update.c,v 1.315 2023/09/16 16:38:41 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.316 2024/02/04 00:09:34 tom Exp $")
 
 /*
  * This define controls the line-breakout optimization.  Every once in a
@@ -256,6 +256,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
 	 *    not checked.
 	 */
 	if (is8bits(CharOf(CHDEREF(ch)))
+	    && (!is7bits(CharOf(CHDEREF(ch))) && _nc_unicode_locale())
 	    && (isprint(CharOf(CHDEREF(ch)))
 		|| (SP_PARM->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160)
 		|| (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 190ac14d0..619876e3e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240127) unstable; urgency=low
+ncurses6 (6.4+20240203) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 190ac14d0..619876e3e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240127) unstable; urgency=low
+ncurses6 (6.4+20240203) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index fde413931..deb1c258e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240127) unstable; urgency=low
+ncurses6 (6.4+20240203) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jan 2024 06:04:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 4c4122c0f..05db54159 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.630 2024/01/27 11:04:16 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.631 2024/02/03 10:52:10 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0127"
+!define VERSION_MMDD  "0203"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ad5a7f28f..488246143 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240127
+Release: 20240203
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 775f770c3..6af03fb99 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240127
+Release: 20240203
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 59460a5a3..c14511b62 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240127
+Release: 20240203
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From da3a7ac19ef36e5978d374ef86e2c04b421a0466 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 11 Feb 2024 02:30:51 +0100
Subject: [PATCH 053/106] ncurses-6.4-20240210.patch

---
 NEWS                             |  8 +++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 man/tabs.1                       |  4 ++--
 ncurses/tinfo/comp_parse.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 +-
 package/ncursest.spec            |  2 +-
 test/test.priv.h                 | 28 +++++++++++++++-------------
 test/test_mouse.c                | 10 ++++++----
 14 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/NEWS b/NEWS
index 33feec26d..331b4cda2 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4075 2024/02/04 00:53:44 tom Exp $
+-- $Id: NEWS,v 1.4078 2024/02/10 23:48:51 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240210
+	+ compiler-warning fixes, while investigating an optimizer bug in
+	  "gcc (MacPorts gcc13 13.2.0_4+stdlib_flag) 13.2.0"
+	  which results in only the first byte of a multibyte character being
+	  printed to the screen.
+
 20240203
 	+ minor changes to tracing and locale-checks.
 
diff --git a/VERSION b/VERSION
index 3ad455475..cd1c0655c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240203
+5:0:10	6.4	20240210
diff --git a/dist.mk b/dist.mk
index 163c0b51f..8a24cb7d6 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1596 2024/02/03 10:52:10 tom Exp $
+# $Id: dist.mk,v 1.1597 2024/02/10 12:26:54 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240203
+NCURSES_PATCH = 20240210
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/man/tabs.1 b/man/tabs.1
index eedb1d2b0..3e683d684 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.54 2024/01/20 16:54:03 tom Exp $
+.\" $Id: tabs.1,v 1.55 2024/01/20 16:54:03 tom Exp $
 .TH @TABS@ 1 2024-01-20 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 4244df4ef..dec4b9256 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.133 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.134 2024/02/10 15:52:11 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -404,7 +404,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
     unsigned i, j;
-    int unresolved, total_unresolved, multiples;
+    int total_unresolved, multiples;
 
     DEBUG(2, (T_CALLED("_nc_resolve_uses2")));
 
@@ -444,7 +444,6 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
     total_unresolved = 0;
     _nc_curr_col = -1;
     for_entry_list(qp) {
-	unresolved = 0;
 	for (i = 0; i < qp->nuses; i++) {
 	    bool foundit;
 	    char *child = _nc_first_name(qp->tterm.term_names);
@@ -513,7 +512,6 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 
 	    /* no good, mark this one unresolvable and complain */
 	    if (!foundit) {
-		unresolved++;
 		total_unresolved++;
 
 		_nc_curr_line = (int) lookline;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 619876e3e..935c5a271 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240203) unstable; urgency=low
+ncurses6 (6.4+20240210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 619876e3e..935c5a271 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240203) unstable; urgency=low
+ncurses6 (6.4+20240210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index deb1c258e..3ba3b2219 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240203) unstable; urgency=low
+ncurses6 (6.4+20240210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Feb 2024 05:52:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 05db54159..8c34878fa 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.631 2024/02/03 10:52:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.632 2024/02/10 12:26:54 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0203"
+!define VERSION_MMDD  "0210"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 488246143..72b2e7b4b 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240203
+Release: 20240210
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 6af03fb99..df5949af7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240203
+Release: 20240210
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c14511b62..719ebada2 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240203
+Release: 20240210
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/test.priv.h b/test/test.priv.h
index 7b18557d2..a901185b8 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.217 2023/11/11 00:23:26 tom Exp $ */
+/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -752,25 +752,27 @@ extern int optind;
 ," -V       show version of curses"
 
 #if HAVE_CURSES_VERSION
-#define format_version(buffer) strcpy(buffer, curses_version())
+#define format_version(buffer, size) strcpy(buffer, curses_version())
 #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH)
-#define format_version(buffer) sprintf(buffer, "ncurses %d.%d.%d", \
-	NCURSES_VERSION_MAJOR, \
-	NCURSES_VERSION_MINOR, \
-	NCURSES_VERSION_PATCH)
+#define format_version(buffer, size) \
+	_nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \
+		    NCURSES_VERSION_MAJOR, \
+		    NCURSES_VERSION_MINOR, \
+		    NCURSES_VERSION_PATCH)
 #else
-#define format_version(buffer) strcpy(buffer, "ncurses-examples")
+#define format_version(buffer, size) strcpy(buffer, "ncurses-examples")
 #endif
 
 #define VERSION_COMMON() \
 static char *version_common(char **argv) { \
 	char *base = argv[0]; \
 	char *part = strrchr(base, '/'); \
-	char *result = malloc(strlen(base) + 80); \
+	size_t need = strlen(base) + 80; \
+	char *result = malloc(need); \
 	if (result != NULL) { \
 	    if (part++ == NULL) part = base; \
-	    sprintf(result, "%.20s: ", part); \
-	    format_version(result + strlen(result)); \
+	    _nc_SPRINTF(result, _nc_SLIMIT(need) "%.20s: ", part); \
+	    format_version(result + strlen(result), need - strlen(result)); \
 	} \
 	return result; \
 } \
@@ -1112,14 +1114,14 @@ extern int TABSIZE;
 #if HAVE_CLOCK_GETTIME
 # define GetClockTime(t) clock_gettime(CLOCK_REALTIME, t)
 # define TimeType struct timespec
-# define TimeScale 1000000000L		/* 1e9 */
+# define TimeScale 1000000000L	/* 1e9 */
 # define ElapsedSeconds(b,e) \
 	    (double) (((e)->tv_sec - (b)->tv_sec) \
 		    + ((e)->tv_nsec - (b)->tv_nsec) / TimeScale)
 #elif HAVE_GETTIMEOFDAY
 # define GetClockTime(t) gettimeofday(t, 0)
 # define TimeType struct timeval
-# define TimeScale 1000000L		/* 1e6 */
+# define TimeScale 1000000L	/* 1e6 */
 # define ElapsedSeconds(b,e) \
 	    (double) (((e)->tv_sec - (b)->tv_sec) \
 		    + ((e)->tv_usec - (b)->tv_usec) / TimeScale)
diff --git a/test/test_mouse.c b/test/test_mouse.c
index 917910500..126d2d6de 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2022,2023 Thomas E. Dickey                                     *
+ * Copyright 2022-2023,2024 Thomas E. Dickey                                *
  * Copyright 2022 Leonid S. Usov <leonid.s.usov at gmail.com>               *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.28 2023/04/16 17:36:47 tom Exp $
+ * $Id: test_mouse.c,v 1.29 2024/02/10 14:39:40 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -152,6 +152,7 @@ main(int argc, char *argv[])
     int interval = 0;
     int ch;
     MEVENT event;
+    size_t my_len;
     char *my_environ = NULL;
     const char *term_format = "TERM=%s";
 
@@ -164,9 +165,10 @@ main(int argc, char *argv[])
 	    rawmode = TRUE;
 	    break;
 	case 'T':
-	    my_environ = malloc(strlen(term_format) + strlen(optarg));
+	    my_len = strlen(term_format) + strlen(optarg) + 1;
+	    my_environ = malloc(my_len);
 	    if (my_environ != NULL) {
-		sprintf(my_environ, term_format, optarg);
+		_nc_SPRINTF(my_environ, _nc_SLIMIT(my_len) term_format, optarg);
 		putenv(my_environ);
 	    }
 	    break;

From d6cfa8322e473d6fdaf5050ce24814c6e74a3c91 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 18 Feb 2024 02:08:55 +0100
Subject: [PATCH 054/106] ncurses-6.4-20240217.patch

---
 NEWS                             |   9 +-
 VERSION                          |   2 +-
 dist.mk                          |   4 +-
 doc/html/man/curs_getch.3x.html  |  91 +++++++++---------
 doc/html/man/curs_mouse.3x.html  | 157 +++++++++++++++++--------------
 doc/html/man/ncurses.3x.html     |   2 +-
 doc/html/man/tabs.1.html         |   4 +-
 doc/html/man/terminfo.5.html     |   2 +-
 man/curs_getch.3x                |  11 ++-
 man/curs_mouse.3x                |  51 +++++++---
 man/manhtml.aliases              |   6 +-
 misc/terminfo.src                |  26 ++++-
 ncurses/base/lib_mouse.c         |  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 +-
 20 files changed, 253 insertions(+), 164 deletions(-)

diff --git a/NEWS b/NEWS
index 331b4cda2..50fb97b76 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4078 2024/02/10 23:48:51 tom Exp $
+-- $Id: NEWS,v 1.4081 2024/02/17 22:44:28 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240217
+	+ add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from
+	  xterm #389 -TD
+	+ fix inconsistent description of wmouse_trafo() (Debian #1059778).
+	+ modify wenclose() to handle pads (Debian #1059783).
+	+ improve manpage discussion of mouseinterval() (Debian #1058560).
+
 20240210
 	+ compiler-warning fixes, while investigating an optimizer bug in
 	  "gcc (MacPorts gcc13 13.2.0_4+stdlib_flag) 13.2.0"
diff --git a/VERSION b/VERSION
index cd1c0655c..43ce880ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240210
+5:0:10	6.4	20240217
diff --git a/dist.mk b/dist.mk
index 8a24cb7d6..8a6afe693 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1597 2024/02/10 12:26:54 tom Exp $
+# $Id: dist.mk,v 1.1598 2024/02/17 11:23:23 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240210
+NCURSES_PATCH = 20240217
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index a005043c8..3b04f52fd 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.77 2023/12/23 16:36:18 tom Exp @
+  * @Id: curs_getch.3x,v 1.78 2024/02/17 19:27:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -290,60 +290,65 @@ <H1 class="no-header">curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
                returns <STRONG>ERR</STRONG> if there is no more room in the FIFO.
 
           <STRONG>wgetch</STRONG>
-               returns <STRONG>ERR</STRONG> if the window pointer is null, or  if  its  timeout
-               expires  without  having  any  data,  or  if  the execution was
-               interrupted by a signal (<STRONG>errno</STRONG> will be set to <STRONG>EINTR</STRONG>).
+               returns <STRONG>ERR</STRONG>
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+               <STRONG>o</STRONG>   if the window pointer is null, or
+
+               <STRONG>o</STRONG>   if its timeout expires without having any data, or
+
+               <STRONG>o</STRONG>   if the execution was interrupted by a signal (<STRONG>errno</STRONG> will be
+                   set to <STRONG>EINTR</STRONG>).
+
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Use of the escape key by a programmer for a single  character  function
-       is  discouraged, as it will cause a delay of up to one second while the
+       Use  of  the escape key by a programmer for a single character function
+       is discouraged, as it will cause a delay of up to one second while  the
        keypad code looks for a following function-key sequence.
 
-       Some keys may  be  the  same  as  commonly  used  control  keys,  e.g.,
+       Some  keys  may  be  the  same  as  commonly  used  control keys, e.g.,
        <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG>  versus  control/H.   Some
        curses implementations may differ according to whether they treat these
-       control  keys  specially (and ignore the terminfo), or use the terminfo
-       definitions.  <EM>ncurses</EM> uses the terminfo definition.  If  it  says  that
-       <STRONG>KEY_ENTER</STRONG>  is  control/M,  <STRONG>getch</STRONG>  will  return <STRONG>KEY_ENTER</STRONG> when you press
+       control keys specially (and ignore the terminfo), or use  the  terminfo
+       definitions.   <EM>ncurses</EM>  uses  the terminfo definition.  If it says that
+       <STRONG>KEY_ENTER</STRONG> is control/M, <STRONG>getch</STRONG> will  return  <STRONG>KEY_ENTER</STRONG>  when  you  press
        control/M.
 
-       Generally, <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the <EM>Enter</EM> key  on
+       Generally,  <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the <EM>Enter</EM> key on
        the numeric keypad:
 
        <STRONG>o</STRONG>   the terminal description lists the most useful keys,
 
-       <STRONG>o</STRONG>   the  <EM>Enter</EM>  key  on  the regular keyboard is already handled by the
+       <STRONG>o</STRONG>   the <EM>Enter</EM> key on the regular keyboard is  already  handled  by  the
            standard ASCII characters for carriage-return and line-feed,
 
        <STRONG>o</STRONG>   depending on whether <STRONG>nl</STRONG> or <STRONG>nonl</STRONG> was called, pressing "Enter" on the
-           regular  keyboard may return either a carriage-return or line-feed,
+           regular keyboard may return either a carriage-return or  line-feed,
            and finally
 
        <STRONG>o</STRONG>   "Enter or send" is the standard description for this key.
 
-       When  using  <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,  or  <STRONG>mvwgetch</STRONG>,   nocbreak   mode
-       (<STRONG>nocbreak</STRONG>)  and  echo  mode (<STRONG>echo</STRONG>) should not be used at the same time.
-       Depending on the state of the tty driver when each character is  typed,
+       When   using   <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,  or  <STRONG>mvwgetch</STRONG>,  nocbreak  mode
+       (<STRONG>nocbreak</STRONG>) and echo mode (<STRONG>echo</STRONG>) should not be used at  the  same  time.
+       Depending  on the state of the tty driver when each character is typed,
        the program may produce undesirable results.
 
        Note that <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be macros.
 
-       Historically,  the  set  of  keypad  macros  was largely defined by the
-       extremely function-key-rich keyboard of the AT&amp;T  7300,  aka  3B1,  aka
-       Safari  4.   Modern personal computers usually have only a small subset
-       of these.  IBM PC-style consoles typically  support  little  more  than
-       <STRONG>KEY_UP</STRONG>,  <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>, <STRONG>KEY_HOME</STRONG>, <STRONG>KEY_END</STRONG>, <STRONG>KEY_NPAGE</STRONG>,
-       <STRONG>KEY_PPAGE</STRONG>, and function keys 1 through 12.   The  Ins  key  is  usually
+       Historically, the set of keypad  macros  was  largely  defined  by  the
+       extremely  function-key-rich  keyboard  of  the AT&amp;T 7300, aka 3B1, aka
+       Safari 4.  Modern personal computers usually have only a  small  subset
+       of  these.   IBM  PC-style  consoles typically support little more than
+       <STRONG>KEY_UP</STRONG>, <STRONG>KEY_DOWN</STRONG>, <STRONG>KEY_LEFT</STRONG>, <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,  <STRONG>KEY_NPAGE</STRONG>,
+       <STRONG>KEY_PPAGE</STRONG>,  and  function  keys  1  through 12.  The Ins key is usually
        mapped to <STRONG>KEY_IC</STRONG>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>has_key</STRONG>  was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4 <EM>curses</EM>,
+       <STRONG>has_key</STRONG> was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4  <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous curses implementation.
 
 
@@ -351,35 +356,35 @@ <H1 class="no-header">curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open  Curses,  Issue  4, Version 2, describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>,
-       <STRONG>mvwgetch</STRONG>, and <STRONG>ungetch</STRONG>.  They read  single-byte  characters  only.   The
-       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but describes no
+       X/Open Curses, Issue 4, Version 2, describes  <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,
+       <STRONG>mvwgetch</STRONG>,  and  <STRONG>ungetch</STRONG>.   They  read single-byte characters only.  The
+       standard specifies that they return <STRONG>ERR</STRONG> on failure,  but  describes  no
        failure conditions.
 
-       The echo behavior of these functions on  input  of  <STRONG>KEY_</STRONG>  or  backspace
-       characters   was   not  specified  in  the  SVr4  documentation.   This
+       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
+       characters  was  not  specified  in  the  SVr4   documentation.    This
        description is adapted from X/Open Curses.
 
        The behavior of <STRONG>getch</STRONG> and friends in the presence of signal handlers is
        unspecified  in  the  SVr4  documentation  and  X/Open  Curses.   Under
-       historical curses implementations, it varied depending on  whether  the
-       operating  system's  dispatch  of  a  signal  to a handler interrupts a
-       <STRONG>read(2)</STRONG> call in progress or not, and  also  (in  some  implementations)
+       historical  curses  implementations, it varied depending on whether the
+       operating system's dispatch of a  signal  to  a  handler  interrupts  a
+       <STRONG>read(2)</STRONG>  call  in  progress  or not, and also (in some implementations)
        whether an input timeout or non-blocking mode has been set.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
+       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG>  is  an  extension  first  implemented  for <EM>ncurses.</EM>  NetBSD
+       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  <EM>ncurses.</EM>   NetBSD
        <EM>curses</EM> later added this extension.
 
-       Programmers concerned about portability should be prepared  for  either
-       of  two  cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>; (b) signal
-       receipt interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set  to
+       Programmers  concerned  about portability should be prepared for either
+       of two cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>;  (b)  signal
+       receipt  interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to
        <STRONG>EINTR</STRONG>.
 
-       The  <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any code
+       The <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any  code
        using it be conditionalized on the <STRONG>NCURSES_VERSION</STRONG> feature macro.
 
 
@@ -387,12 +392,12 @@ <H1 class="no-header">curs_getch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
-       Comparable  functions  in  the  wide-character  (ncursesw)  library are
+       Comparable functions  in  the  wide-character  (ncursesw)  library  are
        described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2024-02-17                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 4ea351f3d..167ed4ff0 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.86 2024/01/13 22:05:39 tom Exp @
+  * @Id: curs_mouse.3x,v 1.89 2024/02/17 21:43:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -174,33 +174,37 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        <STRONG>TRUE</STRONG>  if  it is and <STRONG>FALSE</STRONG> otherwise.  It is useful for determining what
        subset of the screen windows enclose the location of a mouse event.
 
+       If the parameter is  a  pad,  <STRONG>wenclose</STRONG>  uses  the  most  recent  screen
+       coordinates used for this pad in <STRONG><A HREF="curs_pad.3x.html">prefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_pad.3x.html">pnoutrefresh(3x)</A></STRONG>.
+
 
 </PRE><H3><a name="h3-wmouse_trafo">wmouse_trafo</a></H3><PRE>
-       The <STRONG>wmouse_trafo</STRONG> function transforms a given pair of  coordinates  from
+       The  <STRONG>wmouse_trafo</STRONG>  function transforms a given pair of coordinates from
        <STRONG>stdscr</STRONG>-relative coordinates to coordinates relative to the given window
-       or vice versa.   The  resulting  <STRONG>stdscr</STRONG>-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 <STRONG>ripoffline</STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
-
-       <STRONG>o</STRONG>   If  the  parameter  <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>TRUE</STRONG>,  the  pointers <EM>pY,</EM> <EM>pX</EM> must
-           reference the coordinates of a  location  inside  the  window  <EM>win</EM>.
-           They  are  converted  to  window-relative  coordinates and returned
-           through the  pointers.   If  the  conversion  was  successful,  the
+       or  vice  versa.   The  resulting  <STRONG>stdscr</STRONG>-relative  coordinates are not
+       always identical to screen coordinates due to the mechanism to  reserve
+       lines  on  top  or  bottom  of  the  screen for other purposes (see the
+       <STRONG>ripoffline</STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
+
+       <STRONG>o</STRONG>   If the parameter <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>TRUE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must
+           reference  the  coordinates  of  a  location inside the window <EM>win</EM>.
+           They are converted  to  <STRONG>stdscr</STRONG>-relative  coordinates  and  returned
+           through  the  pointers.   If  the  conversion  was  successful, the
            function returns <STRONG>TRUE</STRONG>.
 
-       <STRONG>o</STRONG>   If one of the parameters was <STRONG>NULL</STRONG> or the location is not inside the
+           If one of the parameters was <STRONG>NULL</STRONG> or the location is not inside the
            window, <STRONG>FALSE</STRONG> is returned.
 
-       <STRONG>o</STRONG>   If <EM>to</EM><STRONG>_</STRONG><EM>screen</EM> is <STRONG>FALSE</STRONG>, the pointers <EM>pY,</EM> <EM>pX</EM> must  reference  window-
-           relative   coordinates.   They  are  converted  to  <STRONG>stdscr</STRONG>-relative
-           coordinates if the window <EM>win</EM> encloses this point.   In  this  case
+       <STRONG>o</STRONG>   If   <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>FALSE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must  reference
+           <STRONG>stdscr</STRONG>-relative coordinates.  They are converted to window-relative
+           coordinates  if  the  window <EM>win</EM> encloses this point.  In this case
            the function returns <STRONG>TRUE</STRONG>.
 
-       <STRONG>o</STRONG>   If  one  of  the  parameters is <STRONG>NULL</STRONG> or the point is not inside the
-           window, <STRONG>FALSE</STRONG> is returned.  The  referenced  coordinates  are  only
-           replaced  by  the  converted  coordinates if the transformation was
-           successful.
+           If one of the parameters is <STRONG>NULL</STRONG> or the point  is  not  inside  the
+           window, <STRONG>FALSE</STRONG> is returned.
+
+       The   referenced   coordinates  are  only  replaced  by  the  converted
+       coordinates if the transformation was successful.
 
 
 </PRE><H3><a name="h3-mouse_trafo">mouse_trafo</a></H3><PRE>
@@ -211,20 +215,31 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
        The  <STRONG>mouseinterval</STRONG>  function  sets  the maximum time (in thousands of a
        second) that can elapse between press and release events for them to be
-       recognized   as   a  click.   Use  <STRONG>mouseinterval(0)</STRONG>  to  disable  click
-       resolution.  This function returns the previous  interval  value.   Use
-       <STRONG>mouseinterval(-1)</STRONG>  to  obtain  the  interval  without altering it.  The
-       default is one sixth of a second.
+       resolved as a click.
+
+       Calling  <STRONG>mouseinterval(0)</STRONG>  disables  click  resolution.   When  ncurses
+       detects a mouse event, it awaits further  input  activity  up  to  this
+       interval,  and  then  checks  for a subsequent mouse event which can be
+       combined with the first event.  If the timeout  expires  without  input
+       activity  (which  would  happen  with  a  zero interval), then no click
+       resolution will occur.
+
+       This   function   returns   the   previous   interval    value.     Use
+       <STRONG>mouseinterval(-1)</STRONG> to obtain the interval without altering it.
+
+       The  mouse  interval  is  set  to  one  sixth  of  a  second  when  the
+       corresponding  screen  is  initialized,   e.g.,   in   <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>   or
+       <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
-       The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
+       The  <STRONG>has_mouse</STRONG>  function  returns  <STRONG>TRUE</STRONG>  if  the  mouse driver has been
        successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
 
-       Note  that  mouse  events will be ignored when input is in cooked mode,
-       and will cause an error beep when cooked mode is being simulated  in  a
-       window  by a function such as <STRONG>getstr</STRONG> that expects a linefeed for input-
-       loop termination.
+       Mouse events are ignored when input is in cooked  mode,  and  cause  an
+       error  beep  when  cooked  mode  is  being  simulated  in a window by a
+       function  such  as  <STRONG>getstr</STRONG>  that  expects  a  linefeed  for  input-loop
+       termination.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -247,16 +262,16 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>mousemask</STRONG> returns the mask of reportable events.
 
-       <STRONG>mouseinterval</STRONG>  returns the previous interval value, unless the terminal
-       was not initialized.  In that case, it  returns  the  maximum  interval
+       <STRONG>mouseinterval</STRONG> returns the previous interval value, unless the  terminal
+       was  not  initialized.   In  that case, it returns the maximum interval
        value (166).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
+       The  order  of  the  <STRONG>MEVENT</STRONG>  structure  members  is   not   guaranteed.
        Additional fields may be added to the structure in the future.
 
-       Under <EM>ncurses,</EM> these calls are implemented using either <EM>xterm</EM>'s  built-
+       Under  <EM>ncurses,</EM> these calls are implemented using either <EM>xterm</EM>'s built-
        in mouse-tracking API or platform-specific drivers including
 
           <STRONG>o</STRONG>   Alessandro Rubini's gpm server
@@ -268,9 +283,9 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        If you are using an unsupported configuration, mouse events will not be
        visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
 
-       If the <EM>terminfo</EM> entry contains a <STRONG>XM</STRONG> string, this is used in  the  <EM>xterm</EM>
-       mouse  driver  to control the way the terminal is initialized for mouse
-       operation.  The default, if <STRONG>XM</STRONG> is not  found,  corresponds  to  private
+       If  the  <EM>terminfo</EM> entry contains a <STRONG>XM</STRONG> string, this is used in the <EM>xterm</EM>
+       mouse driver to control the way the terminal is initialized  for  mouse
+       operation.   The  default,  if  <STRONG>XM</STRONG> is not found, corresponds to private
        mode 1000 of <EM>xterm:</EM>
 
           \E[?1000%?%p1%{1}%=%th%el%;
@@ -279,40 +294,40 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
           \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-       The  <EM>z</EM>  member  in  the  event  structure is not presently used.  It is
-       intended for use with touch screens (which may  be  pressure-sensitive)
+       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
+       intended  for  use with touch screens (which may be pressure-sensitive)
        or with 3D-mice/trackballs/power gloves.
 
-       The  <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include <STRONG>REPORT_MOUSE_POSITION</STRONG>.
-       They are distinct.  For example, in <EM>xterm,</EM>  wheel/scrolling  mice  send
-       position  reports  as  a  sequence of presses of buttons 4 or 5 without
+       The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
+       They  are  distinct.   For example, in <EM>xterm,</EM> wheel/scrolling mice send
+       position reports as a sequence of presses of buttons  4  or  5  without
        matching button-releases.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       These functions were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and  are  not  found  in
-       SVr4   <EM>curses</EM>,   4.4BSD   <EM>curses</EM>,   or   any   other   previous  curses
-       implementation.  (SVr4 <EM>curses</EM> did have a <EM>getmouse</EM> function, which  took
+       These  functions  were  designed  for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not found in
+       SVr4  <EM>curses</EM>,   4.4BSD   <EM>curses</EM>,   or   any   other   previous   curses
+       implementation.   (SVr4 <EM>curses</EM> did have a <EM>getmouse</EM> function, which took
        no argument and returned a different type.)
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing the <EM>ncurses</EM> mouse extension should condition its
-       use on the visibility of the <STRONG>NCURSES_MOUSE_VERSION</STRONG> preprocessor  macro.
-       When  the  interface  changes,  the macro's value increments.  Multiple
-       versions  are  available  when  <EM>ncurses</EM>  is  configured;  see   section
+       use  on the visibility of the <STRONG>NCURSES_MOUSE_VERSION</STRONG> preprocessor macro.
+       When the interface changes, the  macro's  value  increments.   Multiple
+       versions   are  available  when  <EM>ncurses</EM>  is  configured;  see  section
        "ALTERNATE CONFIGURATIONS" of <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.  The following values may be
        specified.
 
           1  has definitions for reserved events.  The mask uses 28 bits.
 
-          2  adds definitions  for  button  5,  removes  the  definitions  for
+          2  adds  definitions  for  button  5,  removes  the  definitions for
              reserved events.  The mask uses 29 bits.
 
-       SVr4  <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It is
+       SVr4 <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It  is
        mentioned in a few places, with little supporting documentation.
 
-       <STRONG>o</STRONG>   Its "libcurses"  manual  page  lists  functions  for  this  feature
+       <STRONG>o</STRONG>   Its  "libcurses"  manual  page  lists  functions  for  this feature
            prototyped in <EM>curses.h</EM>.
 
                extern int mouse_set(long int);
@@ -331,54 +346,54 @@ <H1 class="no-header">curs_mouse 3x 2024-01-13 ncurses 6.4 Library calls</H1>
                <STRONG>mouse_info</STRONG>      <STRONG>minfo</STRONG>   <STRONG>Mi</STRONG>   Mouse status information
                <STRONG>req_mouse_pos</STRONG>   <STRONG>reqmp</STRONG>   <STRONG>RQ</STRONG>   Request mouse position report
 
-       <STRONG>o</STRONG>   The  interface  made assumptions (as does <EM>ncurses</EM>) about the escape
+       <STRONG>o</STRONG>   The interface made assumptions (as does <EM>ncurses</EM>) about  the  escape
            sequences sent to and received from the terminal.
 
            For instance, the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> capability
-           to  tell  the  terminal  which  mouse button events it should send,
-           passing the mouse-button bit mask to the terminal.  Also, it  could
-           ask  the  terminal  where  the  mouse  was  using the <STRONG>req_mouse_pos</STRONG>
+           to tell the terminal which mouse  button  events  it  should  send,
+           passing  the mouse-button bit mask to the terminal.  Also, it could
+           ask the terminal  where  the  mouse  was  using  the  <STRONG>req_mouse_pos</STRONG>
            capability.
 
-           Those features required a terminal program that had  been  modified
+           Those  features  required a terminal program that had been modified
            to work with SVr4 <EM>curses.</EM>  They were not part of the X Consortium's
            <EM>xterm.</EM>
 
-       When developing the <EM>xterm</EM> mouse support for <EM>ncurses</EM> in September  1995,
-       Eric  Raymond  was  uninterested in using the same interface due to its
+       When  developing the <EM>xterm</EM> mouse support for <EM>ncurses</EM> in September 1995,
+       Eric Raymond was uninterested in using the same interface  due  to  its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
-       in  <EM>PDCurses</EM> 2.3 using the SVr4 interface.  <EM>PDCurses,</EM> however, does not
-       use video terminals,  making  it  unnecessary  to  be  concerned  about
+       in <EM>PDCurses</EM> 2.3 using the SVr4 interface.  <EM>PDCurses,</EM> however, does  not
+       use  video  terminals,  making  it  unnecessary  to  be concerned about
        compatibility with the escape sequences.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse  events  from  <EM>xterm</EM>  are <EM>not</EM> ignored in cooked mode if they have
-       been enabled by <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM>  mouse  report  sequence
+       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in cooked  mode  if  they  have
+       been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
        appears in the string read.
 
-       Mouse  event  reports from <EM>xterm</EM> are not detected correctly in a window
-       with keypad application mode disabled, since they are interpreted as  a
-       variety  of function key.  Set the terminal's <EM>terminfo</EM> capability <STRONG>kmous</STRONG>
-       to "\E[M" (the beginning of the response from <EM>xterm</EM> for mouse  clicks).
+       Mouse event reports from <EM>xterm</EM> are not detected correctly in  a  window
+       with  keypad application mode disabled, since they are interpreted as a
+       variety of function key.  Set the terminal's <EM>terminfo</EM> capability  <STRONG>kmous</STRONG>
+       to  "\E[M" (the beginning of the response from <EM>xterm</EM> for mouse clicks).
        Other values of <STRONG>kmous</STRONG> are permitted under the same assumption, that is,
        the report begins with that sequence.
 
        Because there are no standard response sequences that serve to identify
-       terminals  supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that if
+       terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
        <STRONG>kmous</STRONG> is defined in the terminal description, or if the terminal type's
-       primary  name  or aliases contain the string "xterm", then the terminal
+       primary name or aliases contain the string "xterm", then  the  terminal
        may send mouse events.  The <STRONG>kmous</STRONG> capability is checked first, allowing
        use of newer <EM>xterm</EM> mouse protocols, such as its private mode 1006.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-01-13                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2024-02-17                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 1e14fdc9f..78ff4777f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240120).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240217).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 1735f9317..368306241 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.54 2024/01/20 16:54:03 tom Exp @
+  * @Id: tabs.1,v 1.55 2024/01/20 16:54:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index f12c3e601..09a765b61 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240120).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240217).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index a44e57412..fed7fa703 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.77 2023/12/23 16:36:18 tom Exp $
-.TH curs_getch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.78 2024/02/17 19:27:03 tom Exp $
+.TH curs_getch 3X 2024-02-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -311,11 +311,16 @@ if there is no more room in the FIFO.
 .TP
 \fBwgetch\fP
 returns \fBERR\fP
+.RS
+.bP
 if the window pointer is null, or
+.bP
 if its timeout expires without having any data, or
+.bP
 if the execution was interrupted by a signal (\fBerrno\fP will be set to
 \fBEINTR\fP).
 .RE
+.RE
 .PP
 Functions with a \*(``mv\*('' prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 677f708ae..9c9048f7f 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.86 2024/01/13 22:05:39 tom Exp $
-.TH curs_mouse 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.89 2024/02/17 21:43:03 tom Exp $
+.TH curs_mouse 3X 2024-02-17 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -184,34 +184,41 @@ character-cell coordinates is enclosed by a given window, returning \fBTRUE\fP
 if it is and \fBFALSE\fP otherwise.
 It is useful for determining what subset of
 the screen windows enclose the location of a mouse event.
+.PP
+If the parameter is a pad,
+\fB\%wenclose\fP uses the most recent screen coordinates used for
+this pad in
+\fP\%prefresh\fP(3X) or
+\fP\%pnoutrefresh\fP(3X).
 .SS wmouse_trafo
 The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
 from \fB\%stdscr\fP-relative coordinates
 to coordinates relative to the given window or vice versa.
 The resulting \fB\%stdscr\fP-relative coordinates are not always
-identical to window-relative coordinates due to the mechanism to reserve
+identical to screen coordinates due to the mechanism to reserve
 lines on top or bottom of the screen for other purposes
 (see the \fB\%ripoffline\fP and \fB\%slk_init\fP(3X) calls, for example).
 .bP
 If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
 \fIpY, pX\fP must reference the coordinates of a location
 inside the window \fIwin\fP.
-They are converted to window-relative coordinates and returned
+They are converted to \fB\%stdscr\fP-relative coordinates and returned
 through the pointers.
 If the conversion was successful, the function returns \fBTRUE\fP.
-.bP
+.IP
 If one of the parameters was \fBNULL\fP or the location is
 not inside the window, \fBFALSE\fP is returned.
 .bP
 If \fIto_screen\fP is
-\fBFALSE\fP, the pointers \fIpY, pX\fP must reference window-relative
-coordinates.
-They are converted to \fB\%stdscr\fP-relative coordinates if the
+\fBFALSE\fP, the pointers \fIpY, pX\fP must reference
+\fB\%stdscr\fP-relative coordinates.
+They are converted to window-relative coordinates if the
 window \fIwin\fP encloses this point.
 In this case the function returns \fBTRUE\fP.
-.bP
+.IP
 If one of the parameters is \fBNULL\fP or the point is not inside the
 window, \fBFALSE\fP is returned.
+.PP
 The referenced coordinates
 are only replaced by the converted coordinates if the transformation was
 successful.
@@ -220,19 +227,32 @@ The \fB\%mouse_trafo\fP function performs the same translation
 as \fB\%wmouse_trafo\fP,
 using \fB\%stdscr\fP for \fIwin\fP.
 .SS mouseinterval
-The \fB\%mouseinterval\fP function sets the maximum time (in thousands of a
-second) that can elapse between press and release events for them to
-be recognized as a click.
-Use \fB\%mouseinterval(0)\fP to disable click resolution.
+The \fB\%mouseinterval\fP function sets the maximum time
+(in thousands of a second)
+that can elapse between press and release events for them to
+be resolved as a click.
+.PP
+Calling \fB\%mouseinterval(0)\fP disables click resolution.
+When ncurses detects a mouse event,
+it awaits further input activity up to this interval,
+and then checks for a subsequent mouse event which can be combined
+with the first event.
+If the timeout expires without input activity
+(which would happen with a zero interval),
+then no click resolution will occur.
+.PP
 This function returns the previous interval value.
 Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
-The default is one sixth of a second.
+.PP
+The mouse interval is set to one sixth of a second
+when the corresponding screen is initialized,
+e.g., in \fBinitscr\fP(3X) or \fBsetupterm\fP(3X).
 .SS has_mouse
 The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
 has been successfully initialized,
 and \fBFALSE\fP otherwise.
 .PP
-Note that mouse events will be ignored when input is in cooked mode, and will
+Mouse events are ignored when input is in cooked mode, and
 cause an error beep when cooked mode is being simulated in a window by a
 function such as \fB\%getstr\fP that expects a linefeed for input-loop
 termination.
@@ -491,5 +511,6 @@ such as its private mode 1006.
 \fB\%curses\fP(3X),
 \fB\%curs_inopts\fP(3X),
 \fB\%curs_kernel\fP(3X),
+\fB\%curs_pad\fP(3X),
 \fB\%curs_slk\fP(3X),
 \fB\%curs_variables\fP(3X)
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 4baaaad3f..ec7f0c58c 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,6 +1,6 @@
-# $Id: manhtml.aliases,v 1.31 2023/12/31 00:46:44 tom Exp $
+# $Id: manhtml.aliases,v 1.32 2024/02/17 21:58:32 tom Exp $
 #***************************************************************************
-# Copyright 2019-2022,2023 Thomas E. Dickey                                *
+# Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -70,6 +70,8 @@ mvcur(3X)		curs_terminfo(3X)
 mvwin(3X)		curs_window(3X)
 newterm(3X)		curs_initscr(3X)
 newwin(3X)		curs_window(3X)
+pnoutrefresh(3X)	curs_pad(3X)
+prefresh(3X)		curs_pad(3X)
 putwin(3X)		curs_util(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 18f0bc2fd..182b8936f 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1137 $
-#	$Date: 2024/01/27 21:52:22 $
+#	$Revision: 1.1140 $
+#	$Date: 2024/02/11 20:09:01 $
 #
 # 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
@@ -5017,13 +5017,23 @@ xterm+nopcfkeys|fragment without PC-style fkeys,
 	kf42=\E[63~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~,
 
+vt100+noapp|fragment with cursor keys in normal mode,
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+	use=vt100+noapp+pc,
+
 xterm+noapp|fragment with cursor keys in normal mode,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F,
 	khome=\E[H,
 
 xterm+app|fragment with cursor keys in application mode,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF,
-	khome=\EOH,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	use=xterm+app+pc,
+
+vt100+noapp+pc|fragment for noapp pc-style home/end,
+	kend=\E[F, khome=\E[H,
+
+xterm+app+pc|fragment for app pc-style home/end,
+	kend=\EOF, khome=\EOH,
 #
 # The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27)
 # and revised in xterm patch #167 (2002/8/24).  Some other terminal emulators
@@ -5149,6 +5159,10 @@ xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
 xterm+edit|fragment for 6-key editing-keypad,
 	use=xterm+pc+edit, use=vt220+pcedit,
 
+xterm+decedit|fragment for vt220 6-key editing-keypad,
+	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+	use=xterm+vt+edit,
+
 xterm+pc+edit|fragment for pc-style editing keypad,
 	kend=\E[4~, khome=\E[1~,
 
@@ -27484,4 +27498,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  to trim -TD
 #	+ NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner)
 #
+# 2024-02011
+#	+ add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from
+#	  xterm #389 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index b35ac7500..a03d8b8e1 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.199 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.200 2024/02/17 21:13:01 tom Exp $")
 
 #include <tic.h>
 
@@ -776,7 +776,7 @@ _nc_mouse_init(SCREEN *sp)
 {
     bool result = FALSE;
 
-    T((T_CALLED("_nc_mouse_init(%p)"), (void *)sp));
+    T((T_CALLED("_nc_mouse_init(%p)"), (void *) sp));
 
     if (sp != 0) {
 	if (!sp->_mouse_initialized) {
@@ -1990,10 +1990,24 @@ wenclose(const WINDOW *win, int y, int x)
 
     if (win != 0) {
 	y -= win->_yoffset;
-	result = ((win->_begy <= y &&
-		   win->_begx <= x &&
-		   (win->_begx + win->_maxx) >= x &&
-		   (win->_begy + win->_maxy) >= y) ? TRUE : FALSE);
+	if (IS_PAD(win)) {
+	    if (win->_pad._pad_y >= 0 &&
+		win->_pad._pad_x >= 0 &&
+		win->_pad._pad_top >= 0 &&
+		win->_pad._pad_left >= 0 &&
+		win->_pad._pad_right >= 0 &&
+		win->_pad._pad_bottom >= 0) {
+		result = ((win->_pad._pad_top <= y &&
+			   win->_pad._pad_left <= x &&
+			   win->_pad._pad_right >= x &&
+			   win->_pad._pad_bottom >= y) ? TRUE : FALSE);
+	    }
+	} else {
+	    result = ((win->_begy <= y &&
+		       win->_begx <= x &&
+		       (win->_begx + win->_maxx) >= x &&
+		       (win->_begy + win->_maxy) >= y) ? TRUE : FALSE);
+	}
     }
     returnBool(result);
 }
@@ -2062,6 +2076,7 @@ wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen)
 	int y = *pY;
 	int x = *pX;
 
+	T(("transform input %d,%d", y, x));
 	if (to_screen) {
 	    y += win->_begy + win->_yoffset;
 	    x += win->_begx;
@@ -2077,6 +2092,7 @@ wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen)
 	if (result) {
 	    *pX = x;
 	    *pY = y;
+	    T(("output transform %d,%d", y, x));
 	}
     }
     returnBool(result);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 935c5a271..0be1f476b 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240210) unstable; urgency=low
+ncurses6 (6.4+20240217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 935c5a271..0be1f476b 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240210) unstable; urgency=low
+ncurses6 (6.4+20240217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 3ba3b2219..c2247069f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240210) unstable; urgency=low
+ncurses6 (6.4+20240217) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Feb 2024 07:26:54 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 8c34878fa..79ee92bf9 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.632 2024/02/10 12:26:54 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.633 2024/02/17 11:23:23 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0210"
+!define VERSION_MMDD  "0217"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 72b2e7b4b..94913ffe1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240210
+Release: 20240217
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index df5949af7..140c882cd 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240210
+Release: 20240217
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 719ebada2..fdd44f44b 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240210
+Release: 20240217
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From c7ba87e8fa45bd136ba90c4ab1c2ea4c256a3202 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 25 Feb 2024 01:28:48 +0100
Subject: [PATCH 055/106] ncurses-6.4-20240224.patch

---
 NEWS                               | 10 +++++-
 VERSION                            |  2 +-
 dist.mk                            |  4 +--
 doc/html/man/curs_initscr.3x.html  | 12 +++----
 doc/html/man/curs_kernel.3x.html   |  8 ++---
 doc/html/man/curs_mouse.3x.html    | 18 +++++-----
 doc/html/man/curs_terminfo.3x.html | 10 +++---
 doc/html/man/curs_trace.3x.html    | 16 ++++-----
 doc/html/man/curs_util.3x.html     |  8 ++---
 doc/html/man/ncurses.3x.html       | 16 ++++-----
 doc/html/man/terminfo.5.html       |  2 +-
 form/form.priv.h                   |  8 ++---
 man/curs_initscr.3x                | 11 +++---
 man/curs_kernel.3x                 |  6 ++--
 man/curs_mouse.3x                  | 24 ++++++++-----
 man/curs_terminfo.3x               |  6 ++--
 man/curs_trace.3x                  | 34 ++++++++++---------
 man/curs_util.3x                   |  7 ++--
 man/manhtml.aliases                |  3 +-
 man/ncurses.3x                     | 13 +++----
 ncurses/curses.priv.h              | 54 ++++++++++++------------------
 ncurses/report_offsets.c           | 27 +++++++++++++--
 ncurses/term.priv.h                | 34 ++++++++++++++++---
 ncurses/tinfo/lib_data.c           |  5 ++-
 ncurses/trace/lib_trace.c          | 26 +++++---------
 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 +-
 32 files changed, 218 insertions(+), 168 deletions(-)

diff --git a/NEWS b/NEWS
index 50fb97b76..c902a5fcf 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4081 2024/02/17 22:44:28 tom Exp $
+-- $Id: NEWS,v 1.4086 2024/02/24 20:06:19 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240224
+	+ improve man/curs_mouse.3x style (Brandon Robinson, Sven Joachim).
+	+ provide for CCHARW_MAX greater than 1
+	+ eliminate use of PATH_MAX in lib_trace.c
+	+ work around misconfiguration of MacPorts gcc13, which exposes invalid
+	  definition of MB_LEN_MAX in gcc's fallback copy of limits.h (MacPorts
+	  #69374).
+
 20240217
 	+ add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from
 	  xterm #389 -TD
diff --git a/VERSION b/VERSION
index 43ce880ae..b2f8a5212 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240217
+5:0:10	6.4	20240224
diff --git a/dist.mk b/dist.mk
index 8a6afe693..7c1251190 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1598 2024/02/17 11:23:23 tom Exp $
+# $Id: dist.mk,v 1.1599 2024/02/24 11:49:33 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240217
+NCURSES_PATCH = 20240224
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 8179e408f..88d17fedb 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.60 2023/12/23 16:27:25 tom Exp @
+  * @Id: curs_initscr.3x,v 1.62 2024/02/24 20:03:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        library:
 
        <STRONG>SIGINT</STRONG>
-            The handler <EM>attempts</EM> to cleanup the screen on exit.   Although  it
+            The handler <EM>attempts</EM> to clean up the screen on exit.  Although  it
             <EM>usually</EM> works as expected, there are limitations:
 
             <STRONG>o</STRONG>   Walking  the  <EM>SCREEN</EM> list is unsafe, since all list management
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 35a505efd..4cd5599a6 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.53 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_kernel.3x,v 1.54 2024/02/24 19:57:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -209,7 +209,7 @@ <H1 class="no-header">curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 167ed4ff0..16771c76b 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.89 2024/02/17 21:43:03 tom Exp @
+  * @Id: curs_mouse.3x,v 1.92 2024/02/24 19:54:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-<STRONG>NULL</STRONG>, this function fills the indicated  location
            with the previous value of the current screen's mouse event mask.
 
-       As  a  side  effect,  setting  a  zero mousemask may turn off the mouse
+       As  a  side  effect,  setting  a zero mouse mask may turn off the mouse
        pointer; setting a nonzero mask may turn it on.  Whether  this  happens
        is device-dependent.
 
@@ -184,7 +184,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
        or  vice  versa.   The  resulting  <STRONG>stdscr</STRONG>-relative  coordinates are not
        always identical to screen coordinates due to the mechanism to  reserve
        lines  on  top  or  bottom  of  the  screen for other purposes (see the
-       <STRONG>ripoffline</STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
+       <STRONG><A HREF="curs_kernel.3x.html">ripoffline(3x)</A></STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
 
        <STRONG>o</STRONG>   If the parameter <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>TRUE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must
            reference  the  coordinates  of  a  location inside the window <EM>win</EM>.
@@ -215,9 +215,11 @@ <H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
        The  <STRONG>mouseinterval</STRONG>  function  sets  the maximum time (in thousands of a
        second) that can elapse between press and release events for them to be
-       resolved as a click.
+       resolved  as  a <EM>click.</EM>  An application might interpret button press and
+       release events separated by more than the mouse  interval  as  a  "long
+       press", or, with motion, as a "drag".
 
-       Calling  <STRONG>mouseinterval(0)</STRONG>  disables  click  resolution.   When  ncurses
+       Calling  <STRONG>mouseinterval(0)</STRONG>  disables  click  resolution.   When  <EM>ncurses</EM>
        detects a mouse event, it awaits further  input  activity  up  to  this
        interval,  and  then  checks  for a subsequent mouse event which can be
        combined with the first event.  If the timeout  expires  without  input
@@ -393,7 +395,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-17 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-17                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 4ae87c03a..76831d356 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.129 2024/01/13 22:15:55 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.130 2024/02/24 20:04:09 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -488,7 +488,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        the  corresponding  stream.   In  addition  to  the limitation that the
        terminal was  left  in  block-buffered  mode  on  exit  (like  System V
        <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
-       way to cleanup on receiving <STRONG>SIGTSTP</STRONG>.
+       way to clean up on receiving <STRONG>SIGTSTP</STRONG>.
 
        The current version (ncurses6) uses output buffers managed directly  by
        <EM>ncurses.</EM>  Some of the low-level functions described in this manual page
@@ -693,7 +693,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 5654fbe92..0c22ceb5f 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.42 2023/12/23 16:08:25 tom Exp @
+  * @Id: curs_trace.3x,v 1.44 2024/02/24 20:01:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -187,9 +187,9 @@ <H1 class="no-header">curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        These  functions  check  the <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable, to set
        the tracing feature as if <STRONG>curses_trace</STRONG> was called:
 
-           filter,  initscr,  new_prescr,  newterm,   nofilter,   restartterm,
-           ripoffline,      setupterm,     slk_init,     tgetent,     use_env,
-           use_extended_names, use_tioctl
+           <STRONG>filter</STRONG>, <STRONG>initscr</STRONG>, <STRONG>new_prescr</STRONG>, <STRONG>newterm</STRONG>, <STRONG>nofilter</STRONG>, <STRONG>restartterm</STRONG>,
+           <STRONG>ripoffline</STRONG>, <STRONG>setupterm</STRONG>, <STRONG>slk_init</STRONG>, <STRONG>tgetent</STRONG>, <STRONG>use_env</STRONG>,
+           <STRONG>use_extended_names</STRONG>, <STRONG>use_tioctl</STRONG>
 
 
 </PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_trace 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 25eaacd31..e6d8fe14d 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.95 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_util.3x,v 1.96 2024/02/24 19:22:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -391,7 +391,7 @@ <H1 class="no-header">curs_util 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 78ff4777f..e144aa4b6 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.197 2024/01/13 20:30:39 tom Exp @
+  * @Id: ncurses.3x,v 1.200 2024/02/24 20:03:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240217).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240224).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
@@ -117,7 +117,7 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        If  the  locale is not initialized, the library assumes that characters
        are printable as in ISO-8859-1, to work with certain  legacy  programs.
        You  should  initialize  the locale and not rely on specific details of
-       the library when the locale has not been setup.
+       the library when the locale has not been set up.
 
        The function <STRONG>initscr</STRONG> or  <STRONG>newterm</STRONG>  must  be  called  to  initialize  the
        library  before  any  of  the other routines that deal with windows and
@@ -816,9 +816,9 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
        The  debugging  library  checks  this  environment  variable  when  the
        application  has  redirected  output to a file.  The variable's numeric
-       value is used for the baudrate.  If no value  is  found,  <EM>ncurses</EM>  uses
+       value is used for the baud rate.  If no value is  found,  <EM>ncurses</EM>  uses
        9600.  This allows testers to construct repeatable test-cases that take
-       into account costs that depend on baudrate.
+       into account costs that depend on baud rate.
 
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
@@ -1499,7 +1499,7 @@ <H1 class="no-header">ncurses 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-02-24                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 09a765b61..374e70348 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240217).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240224).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/form/form.priv.h b/form/form.priv.h
index 4cf307135..ad5af63ad 100644
--- a/form/form.priv.h
+++ b/form/form.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: form.priv.h,v 0.48 2021/06/17 21:30:22 tom Exp $ */
+/* $Id: form.priv.h,v 0.49 2024/02/24 12:17:31 tom Exp $ */
 
 #ifndef FORM_PRIV_H
 #define FORM_PRIV_H 1
@@ -47,10 +47,6 @@
 #include <wctype.h>
 #endif
 
-#ifndef MB_LEN_MAX
-#define MB_LEN_MAX 8 /* should be >= MB_CUR_MAX, but that may be a function */
-#endif
-
 #define FIELD_CELL NCURSES_CH_T
 
 #define NCURSES_FIELD_INTERNALS char** expanded; WINDOW *working;
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 3f7c37d6e..15f4e8b96 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.60 2023/12/23 16:27:25 tom Exp $
-.TH curs_initscr 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.62 2024/02/24 20:03:50 tom Exp $
+.TH curs_initscr 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -244,7 +244,8 @@ which normally corresponds to a terminal entry with the \fIgeneric\fP
 (\fIgn\fP) capability.
 Generic entries are detected by \fBsetupterm\fP(3X)
 and cannot be used for full-screen operation.
-Other implementations may handle a missing/empty \fITERM\fP variable differently.
+Other implementations may handle
+a missing/empty \fITERM\fP variable differently.
 .SS "Signal Handlers"
 Quoting from X/Open Curses Issue 7, section 3.1.1:
 .RS 5
@@ -270,7 +271,7 @@ Applications which must handle these signals should set up the corresponding
 handlers \fIafter\fP initializing the library:
 .TP 5
 .B SIGINT
-The handler \fIattempts\fP to cleanup the screen on exit.
+The handler \fIattempts\fP to clean up the screen on exit.
 Although it \fIusually\fP works as expected, there are limitations:
 .RS 5
 .bP
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 929439c2e..40e3e3a34 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.53 2024/01/05 21:46:58 tom Exp $
-.TH curs_kernel 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.54 2024/02/24 19:57:34 tom Exp $
+.TH curs_kernel 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,7 +135,7 @@ most use \fBwmove\fP instead.
 The \fBripoffline\fP routine provides access to the same facility that
 \fBslk_init\fP [see \fBcurs_slk\fP(3X)] uses to reduce the size of the
 screen.
-\fBripoffline\fP must be called before \fBinitscr\fP or
+\fB\%ripoffline\fP must be called before \fBinitscr\fP or
 \fBnewterm\fP is called, to prepare these initial actions:
 .bP
 If \fIline\fP is positive, a line is removed from the top of \fBstdscr\fP.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 9c9048f7f..f8b666c8f 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.89 2024/02/17 21:43:03 tom Exp $
-.TH curs_mouse 3X 2024-02-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.92 2024/02/24 19:54:30 tom Exp $
+.TH curs_mouse 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,7 +103,7 @@ If \fIoldmask\fP is non-\fBNULL\fP,
 this function fills the indicated location with the previous value of the
 current screen's mouse event mask.
 .PP
-As a side effect, setting a zero mousemask may turn off the mouse pointer;
+As a side effect, setting a zero mouse mask may turn off the mouse pointer;
 setting a nonzero mask may turn it on.
 Whether this happens is device-dependent.
 .SS "Mouse Events"
@@ -188,8 +188,8 @@ the screen windows enclose the location of a mouse event.
 If the parameter is a pad,
 \fB\%wenclose\fP uses the most recent screen coordinates used for
 this pad in
-\fP\%prefresh\fP(3X) or
-\fP\%pnoutrefresh\fP(3X).
+\fB\%prefresh\fP(3X) or
+\fB\%pnoutrefresh\fP(3X).
 .SS wmouse_trafo
 The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
 from \fB\%stdscr\fP-relative coordinates
@@ -197,7 +197,7 @@ to coordinates relative to the given window or vice versa.
 The resulting \fB\%stdscr\fP-relative coordinates are not always
 identical to screen coordinates due to the mechanism to reserve
 lines on top or bottom of the screen for other purposes
-(see the \fB\%ripoffline\fP and \fB\%slk_init\fP(3X) calls, for example).
+(see the \fB\%ripoffline\fP(3X) and \fB\%slk_init\fP(3X) calls, for example).
 .bP
 If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
 \fIpY, pX\fP must reference the coordinates of a location
@@ -230,10 +230,18 @@ using \fB\%stdscr\fP for \fIwin\fP.
 The \fB\%mouseinterval\fP function sets the maximum time
 (in thousands of a second)
 that can elapse between press and release events for them to
-be resolved as a click.
+be resolved as a
+.I click.
+An application might interpret button press and release events separated
+by more than the mouse interval as a \*(``long press\*('',
+or,
+with motion,
+as a \*(``drag\*(''.
 .PP
 Calling \fB\%mouseinterval(0)\fP disables click resolution.
-When ncurses detects a mouse event,
+When
+.I \%ncurses
+detects a mouse event,
 it awaits further input activity up to this interval,
 and then checks for a subsequent mouse event which can be combined
 with the first event.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 4975914d8..6fdc89991 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.129 2024/01/13 22:15:55 tom Exp $
-.TH curs_terminfo 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.130 2024/02/24 20:04:09 tom Exp $
+.TH curs_terminfo 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -821,7 +821,7 @@ block-buffered mode on exit
 .IR curses ),
 it was problematic because
 .I \%ncurses
-did not allow a reliable way to cleanup on receiving
+did not allow a reliable way to clean up on receiving
 .BR SIGTSTP .
 .PP
 The current version (ncurses6)
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 2a55275c2..f2a737cbc 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.42 2023/12/23 16:08:25 tom Exp $
-.TH curs_trace 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.44 2024/02/24 20:01:11 tom Exp $
+.TH curs_trace 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -196,21 +196,23 @@ The specific names are used as a guideline.
 These functions check the \fI\%NCURSES_TRACE\fP environment variable,
 to set the tracing feature as if \fBcurses_trace\fP was called:
 .RS 4
+.na
 .PP
-filter,
-initscr,
-new_prescr,
-newterm,
-nofilter,
-restartterm,
-ripoffline,
-setupterm,
-slk_init,
-tgetent,
-use_env,
-use_extended_names,
-use_tioctl
+\fB\%filter\fP,
+\fB\%initscr\fP,
+\fB\%new_prescr\fP,
+\fB\%newterm\fP,
+\fB\%nofilter\fP,
+\fB\%restartterm\fP,
+\fB\%ripoffline\fP,
+\fB\%setupterm\fP,
+\fB\%slk_init\fP,
+\fB\%tgetent\fP,
+\fB\%use_env\fP,
+\fB\%use_extended_names\fP,
+\fB\%use_tioctl\fP
 .RE
+.ad
 .SS "Command-line Utilities"
 The command-line utilities such as \fBtic\fP(1) provide a verbose option
 which extends the set of messages written using the \fBcurses_trace\fP function.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index d922fa803..a6a082b11 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.95 2024/01/05 21:46:58 tom Exp $
-.TH curs_util 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.96 2024/02/24 19:22:01 tom Exp $
+.TH curs_util 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -347,7 +347,8 @@ the University of California, Berkeley (in 1982)
 and were later (in 1988) incorporated into SVr4.
 Oddly, there are no such functions in the 4.3BSD curses sources.
 .bP
-Most implementations simply dump the binary \fI\%WINDOW\fP structure to the file.
+Most implementations simply dump the binary \fI\%WINDOW\fP structure
+to the file.
 These include SVr4 curses, NetBSD and PDCurses,
 as well as older \fI\%ncurses\fP versions.
 This implementation
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index ec7f0c58c..6a538f10c 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.32 2024/02/17 21:58:32 tom Exp $
+# $Id: manhtml.aliases,v 1.33 2024/02/24 20:02:49 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -76,6 +76,7 @@ putwin(3X)		curs_util(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
+ripoffline(3X)		curs_kernel(3X)
 set_curterm(3X)		curs_terminfo(3X)
 set_term(3X)		curs_initscr(3X)
 setcchar(3X)		curs_getcchar(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 3d395795c..cced2bcab 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.197 2024/01/13 20:30:39 tom Exp $
-.TH ncurses 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.200 2024/02/24 20:03:50 tom Exp $
+.TH ncurses 3X 2024-02-24 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,7 +127,7 @@ If the locale is not initialized,
 the library assumes that characters are printable as in ISO\-8859\-1,
 to work with certain legacy programs.
 You should initialize the locale and not rely on specific details of
-the library when the locale has not been setup.
+the library when the locale has not been set up.
 .PP
 The function \fBinitscr\fP or \fBnewterm\fP
 must be called to initialize the library
@@ -986,15 +986,16 @@ character.
 .SS "\fIBAUDRATE\fP"
 The debugging library checks this environment variable when the application
 has redirected output to a file.
-The variable's numeric value is used for the baudrate.
+The variable's numeric value is used for the baud rate.
 If no value is found, \fI\%ncurses\fP uses 9600.
 This allows testers to construct repeatable test-cases
-that take into account costs that depend on baudrate.
+that take into account costs that depend on baud rate.
 .SS "\fICOLUMNS\fP"
 Specify the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
-If neither the \fI\%COLUMNS\fP value nor the terminal's screen size is available,
+If neither the \fI\%COLUMNS\fP value
+nor the terminal's screen size is available,
 \fI\%ncurses\fP uses the size which may be specified in the terminfo
 database
 (i.e., the \fBcols\fP capability).
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 0889a3418..29b8b661f 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.677 2023/11/10 15:11:11 tom Exp $
+ * $Id: curses.priv.h,v 1.685 2024/02/24 18:46:40 tom Exp $
  *
  *	curses.priv.h
  *
@@ -72,12 +72,6 @@ extern "C" {
 #include <unistd.h>
 #endif
 
-#if HAVE_LIMITS_H
-# include <limits.h>
-#elif HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
 #include <assert.h>
 #include <stdio.h>
 
@@ -89,16 +83,6 @@ extern "C" {
 #  endif
 #endif
 
-#ifndef PATH_MAX
-# if defined(_POSIX_PATH_MAX)
-#  define PATH_MAX _POSIX_PATH_MAX
-# elif defined(MAXPATHLEN)
-#  define PATH_MAX MAXPATHLEN
-# else
-#  define PATH_MAX 255	/* the Posix minimum path-size */
-# endif
-#endif
-
 #if DECL_ERRNO
 extern int errno;
 #endif
@@ -921,6 +905,7 @@ typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *);
  * string is less than 80 columns, but this buffer size is an absolute
  * limit.
  */
+#define TRACECHR_BUF	40
 #define TRACEMSE_MAX	(80 + (5 * 10) + (32 * 15))
 #define TRACEMSE_FMT	"id %2d  at (%2d, %2d, %2d) state %4lx = {" /* } */
 
@@ -1251,7 +1236,7 @@ typedef struct screen {
 #endif
 
 #ifdef TRACE
-	char		tracechr_buf[40];
+	char		tracechr_buf[TRACECHR_BUF];
 	char		tracemse_buf[TRACEMSE_MAX];
 #if USE_REENTRANT
 	long		_outchars;
@@ -1378,10 +1363,6 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 
 #define TR_PUTC(c)	TR(TRACE_CHARPUT, ("PUTC %#x", UChar(c)))
 
-#ifndef MB_LEN_MAX
-#define MB_LEN_MAX 16	/* should be >= MB_CUR_MAX, but that may be a function */
-#endif
-
 #if USE_WIDEC_SUPPORT /* { */
 /* true if the status/errno indicate an illegal multibyte sequence */
 #define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))
@@ -1394,7 +1375,20 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define NulColor	/* nothing */
 #endif
 
-#define NulChar		0,0,0,0	/* FIXME: see CCHARW_MAX */
+#if CCHARW_MAX > 6
+#define NulChar		0,0,0,0,0
+#elif CCHARW_MAX > 5
+#define NulChar		0,0,0,0		/* ncurses7 */
+#elif CCHARW_MAX > 4
+#define NulChar		0,0,0		/* ncurses6 */
+#elif CCHARW_MAX > 3
+#define NulChar		0,0
+#elif CCHARW_MAX > 2
+#define NulChar		0
+#else
+#define NulChar		/* nothing */
+#endif
+
 #define CharOf(c)	((c).chars[0])
 #define AttrOf(c)	((c).attr)
 
@@ -1405,16 +1399,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define NewChar2(c,a)	{ a, { c, NulChar } NulColor }
 #define NewChar(ch)	NewChar2(ChCharOf(ch), ChAttrOf(ch))
 
-#if CCHARW_MAX == 5
+#if CCHARW_MAX > 1
 #define CharEq(a,b)	(((a).attr == (b).attr) \
-		       && (a).chars[0] == (b).chars[0] \
-		       && (a).chars[1] == (b).chars[1] \
-		       && (a).chars[2] == (b).chars[2] \
-		       && (a).chars[3] == (b).chars[3] \
-		       && (a).chars[4] == (b).chars[4] \
+			 && !memcmp((a).chars, \
+				    (b).chars, \
+				    CCHARW_MAX * sizeof((b).chars[0])) \
 			if_EXT_COLORS(&& (a).ext_color == (b).ext_color))
-#elif CCHARW_MAX > 0
-#error Inconsistent values for CCHARW_MAX
 #else
 #define CharEq(a,b)	(!memcmp(&(a), &(b), sizeof(a)))
 #endif
diff --git a/ncurses/report_offsets.c b/ncurses/report_offsets.c
index cef8a8ec3..0f82dcf35 100644
--- a/ncurses/report_offsets.c
+++ b/ncurses/report_offsets.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,14 +31,17 @@
  *  Author: Thomas E. Dickey                                                *
  ****************************************************************************/
 
+#define NEW_PAIR_INTERNAL 1
 #include <curses.priv.h>
 
-MODULE_ID("$Id: report_offsets.c,v 1.23 2023/09/23 16:47:57 tom Exp $")
+MODULE_ID("$Id: report_offsets.c,v 1.28 2024/02/24 15:59:09 tom Exp $")
 
 #define show_size(type) \
 	flag = 0; \
 	last = 0; \
 	printf("%5lu   " #type "\n", (unsigned long)sizeof(type))
+#define show_name(name) \
+	printf("%5lu   " #name "\n", (unsigned long)(name))
 #define show_offset(type,member) \
 	next = (unsigned long)offsetof(type,member); \
 	if (last > next) \
@@ -111,9 +114,28 @@ main(void)
 #if USE_WIDEC_SUPPORT
     show_size(cchar_t);
 #endif
+    show_size(color_t);
+    show_size(colorpair_t);
     show_size(mmask_t);
+    show_size(rgb_bits_t);
     show_size(MEVENT);
     show_size(NCURSES_BOOL);
+    show_size(TRIES);
+
+    printf("\n");
+    printf("Sizes of buffers/arrays:\n");
+#if USE_WIDEC_SUPPORT
+    show_name(CCHARW_MAX);
+#endif
+    show_name(EV_MAX);
+    show_name(FIFO_SIZE);
+    show_name(NAMESIZE);
+    show_name(MB_LEN_MAX);
+    show_name(PATH_MAX);
+#ifdef TRACE
+    show_name(TRACECHR_BUF);
+    show_name(TRACEMSE_MAX);
+#endif
 
     printf("\n");
     show_size(SCREEN);
@@ -222,6 +244,7 @@ main(void)
 #endif
     show_WIDECH(NCURSES_GLOBALS, key_name);
     show_TRACES(NCURSES_GLOBALS, trace_opened);
+    show_TRACES(NCURSES_GLOBALS, trace_level);
     show_MLEAKS(NCURSES_GLOBALS, leak_checking);
 
     printf("\n");
diff --git a/ncurses/term.priv.h b/ncurses/term.priv.h
index 37547180a..7b2579c85 100644
--- a/ncurses/term.priv.h
+++ b/ncurses/term.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2021,2023 Thomas E. Dickey                                     *
+ * Copyright 2021-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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 @@
  ****************************************************************************/
 
 /*
- * $Id: term.priv.h,v 1.8 2023/09/16 15:16:38 tom Exp $
+ * $Id: term.priv.h,v 1.12 2024/02/24 18:11:38 tom Exp $
  *
  *	term.priv.h
  *
@@ -53,7 +53,12 @@ extern "C" {
 #define NCURSES_INTERNALS 1
 #define NCURSES_OPAQUE 0
 
-#include <limits.h>		/* PATH_MAX */
+#if HAVE_LIMITS_H
+# include <limits.h>		/* PATH_MAX, MB_LEN_MAX, etc */
+#elif HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
 #include <signal.h>		/* sig_atomic_t */
 #include <time.h>		/* time_t */
 #include <term.h>		/* time_t */
@@ -64,6 +69,28 @@ extern "C" {
 #endif
 #endif
 
+/*
+ * If not properly configured to use the system's limits.h, we get gcc's
+ * fallback for limits.h which sets MB_LEN_MAX to 1, which is never correct.
+ */
+#if defined(MB_LEN_MAX) && (MB_LEN_MAX < 6)
+#undef MB_LEN_MAX
+#endif
+
+#ifndef MB_LEN_MAX
+#define MB_LEN_MAX 16	/* should be >= MB_CUR_MAX, but that may be a function */
+#endif
+
+#ifndef PATH_MAX
+# if defined(_POSIX_PATH_MAX)
+#  define PATH_MAX _POSIX_PATH_MAX
+# elif defined(MAXPATHLEN)
+#  define PATH_MAX MAXPATHLEN
+# else
+#  define PATH_MAX 255	/* the Posix minimum path-size */
+# endif
+#endif
+
 /*
  * State of tparm().
  */
@@ -241,7 +268,6 @@ typedef struct {
 
 #ifdef TRACE
 	bool		trace_opened;
-	char		trace_fname[PATH_MAX];
 	int		trace_level;
 	FILE *		trace_fp;
 	int		trace_fd;
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 6f6c583a1..b817f49bd 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.87 2022/07/09 22:03:21 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.89 2024/02/24 18:11:38 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -196,7 +196,6 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #endif
 #ifdef TRACE
     FALSE,			/* trace_opened */
-    CHARS_0s,			/* trace_fname */
     0,				/* trace_level */
     NULL,			/* trace_fp */
     -1,				/* trace_fd */
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index c73ab9040..0904c132f 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.103 2023/05/28 14:39:10 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.106 2024/02/24 18:28:19 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -89,7 +89,6 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 #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
 #endif /* TRACE */
@@ -141,22 +140,15 @@ curses_trace(unsigned tracelevel)
 	if (MyFD >= 0) {
 	    MyFP = fdopen(MyFD, BIN_W);
 	} 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));
-		}
+	    char myFile[80];
+
+	    _nc_STRCPY(myFile, "trace", sizeof(myFile));
+	    if (_nc_is_dir_path(myFile)) {
+		_nc_STRCAT(myFile, ".log", sizeof(myFile));
 	    }
 #define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR)
-	    if (_nc_access(MyPath, W_OK) < 0
-		|| (MyFD = safe_open3(MyPath, SAFE_MODE, 0600)) < 0
+	    if (_nc_access(myFile, W_OK) < 0
+		|| (MyFD = safe_open3(myFile, SAFE_MODE, 0600)) < 0
 		|| (MyFP = fdopen(MyFD, BIN_W)) == 0) {
 		;		/* EMPTY */
 	    }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0be1f476b..a50d96d3c 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240217) unstable; urgency=low
+ncurses6 (6.4+20240224) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0be1f476b..a50d96d3c 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240217) unstable; urgency=low
+ncurses6 (6.4+20240224) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index c2247069f..d28223a10 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240217) unstable; urgency=low
+ncurses6 (6.4+20240224) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Feb 2024 06:23:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 79ee92bf9..33343eb58 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.633 2024/02/17 11:23:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.634 2024/02/24 11:49:33 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0217"
+!define VERSION_MMDD  "0224"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 94913ffe1..cefc47874 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240217
+Release: 20240224
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 140c882cd..1a45e4ae3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240217
+Release: 20240224
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index fdd44f44b..03ff7bd04 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240217
+Release: 20240224
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 19927641f0372f8ed0f85f4320fbcc579cad8ed8 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 3 Mar 2024 01:21:22 +0100
Subject: [PATCH 056/106] ncurses-6.4-20240302.patch

---
 NEWS                             |    9 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   29 +-
 config.guess                     |    7 +-
 config.sub                       |   27 +-
 configure                        | 1450 ++++++++++++++++--------------
 configure.in                     |    7 +-
 dist.mk                          |    4 +-
 doc/html/man/captoinfo.1m.html   |   10 +-
 doc/html/man/curs_attr.3x.html   |    8 +-
 doc/html/man/curs_trace.3x.html  |   46 +-
 doc/html/man/ncurses.3x.html     |    2 +-
 doc/html/man/terminfo.5.html     |   24 +-
 include/Caps                     |   22 +-
 include/Caps.aix4                |   22 +-
 include/Caps.hpux11              |   22 +-
 include/Caps.keys                |   22 +-
 include/Caps.osf1r5              |   22 +-
 include/Caps.uwin                |   18 +-
 include/ncurses_defs             |    5 +-
 man/captoinfo.1m                 |    9 +-
 man/curs_attr.3x                 |    6 +-
 man/curs_trace.3x                |   60 +-
 man/man_db.renames.in            |    5 +-
 man/terminfo.tail                |    4 +-
 ncurses/term.priv.h              |    4 +-
 ncurses/tinfo/lib_setup.c        |    6 +-
 ncurses/tinfo/make_hash.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 +-
 progs/tic.c                      |    6 +-
 progs/tput.c                     |    6 +-
 37 files changed, 1072 insertions(+), 820 deletions(-)

diff --git a/NEWS b/NEWS
index c902a5fcf..75b4bf1f4 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4086 2024/02/24 20:06:19 tom Exp $
+-- $Id: NEWS,v 1.4089 2024/03/02 20:47:38 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240302
+	+ add configure check for MB_LEN_MAX, to provide warning as needed.
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ fix regression in tput which disallowed hex/octal parameters (report
+	  by Werner Fink, cf:  20230408)
+	+ update config.guess, config.sub
+
 20240224
 	+ improve man/curs_mouse.3x style (Brandon Robinson, Sven Joachim).
 	+ provide for CCHARW_MAX greater than 1
diff --git a/VERSION b/VERSION
index b2f8a5212..6269f3b73 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240224
+5:0:10	6.4	20240302
diff --git a/aclocal.m4 b/aclocal.m4
index b2b9c3f8f..96d04519d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1062 2023/12/04 00:39:37 tom Exp $
+dnl $Id: aclocal.m4,v 1.1063 2024/03/02 20:46:07 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5938,6 +5938,31 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
+dnl -------------
+dnl Check if <limits.h> defines a usable MB_LEN_MAX.  That may be because it is
+dnl not defined, or it may be a bogus value.
+AC_DEFUN([CF_MB_LEN_MAX],[
+AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
+AC_TRY_COMPILE([
+$ac_includes_default
+#include <limits.h>],
+[
+#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+	${cf_cv_main_return:-return}(0);
+#else
+#error MB_LEN_MAX is not usable
+#endif
+],	[cf_cv_mb_len_max=yes],
+	[cf_cv_mb_len_max=no])])
+if test "$cf_cv_mb_len_max" = yes
+then
+	AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
+else
+	AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_MAN_PAGES version: 58 updated: 2023/07/28 20:13:29
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
diff --git a/config.guess b/config.guess
index cdfc43920..f47d666d3 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-08-22'
+timestamp='2023-10-19'
 
 # 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
@@ -165,6 +165,8 @@ Linux|GNU|GNU/*)
 	LIBC=dietlibc
 	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#elif defined(__LLVM_LIBC__)
+	LIBC=llvm
 	#else
 	#include <stdarg.h>
 	/* First heuristic to detect musl libc.  */
@@ -1593,6 +1595,9 @@ EOF
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
+    *:Ironclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad
+	;;
 esac
 
 # Do we have a guess based on uname results?
diff --git a/config.sub b/config.sub
index 51394d320..e4c4e09b6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-09-15'
+timestamp='2023-12-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1222,6 +1222,7 @@ case $cpu-$vendor in
 			| moxie \
 			| mt \
 			| msp430 \
+			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1253,6 +1254,7 @@ case $cpu-$vendor in
 			| ubicom32 \
 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 			| vax \
+			| vc4 \
 			| visium \
 			| w65 \
 			| wasm32 | wasm64 \
@@ -1597,7 +1599,7 @@ case $cpu-$vendor in
 		os=
 		obj=elf
 		;;
-	mips*-*)
+	mips*-*|nanomips*-*)
 		os=
 		obj=elf
 		;;
@@ -1721,7 +1723,7 @@ fi
 
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
+	llvm* | musl* | newlib* | relibc* | uclibc*)
 		;;
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
@@ -1766,12 +1768,19 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* )
+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
+	# This refers to builds using the UEFI calling convention
+	# (which depends on the architecture) and PE file format.
+	# Note that this is both a different calling convention and
+	# different file format than that of GNU-EFI
+	# (x86_64-w64-mingw32).
+	uefi)
+		;;
 	none)
 		;;
 	kernel* | msvc* )
@@ -1818,16 +1827,18 @@ esac
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
 case $kernel-$os-$obj in
-	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
-		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
+	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+		    | linux-relibc*- | linux-uclibc*- )
 		;;
 	uclinux-uclibc*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
-	windows*-gnu*- | windows*-msvc*-)
+	windows*-msvc*-)
 		;;
-	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
+	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+		    | -uclibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
 		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
diff --git a/configure b/configure
index 814eb2fc2..c16320864 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.774 .
+# From configure.in Revision: 1.775 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -21808,12 +21808,10 @@ getuid \
 issetugid \
 localeconv \
 poll \
-putenv \
 remove \
 select \
 setbuf \
 setbuffer \
-setenv \
 setfsuid \
 setvbuf \
 sigaction \
@@ -21829,13 +21827,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21832: checking for $ac_func" >&5
+echo "$as_me:21830: 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 21838 "configure"
+#line 21836 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21866,16 +21864,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21872: \$? = $ac_status" >&5
+  echo "$as_me:21870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21878: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21885,7 +21883,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21886: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21895,14 +21893,14 @@ EOF
 fi
 done
 
-echo "$as_me:21898: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21896: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21905 "configure"
+#line 21903 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21917,16 +21915,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21923: \$? = $ac_status" >&5
+  echo "$as_me:21921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21936,7 +21934,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21939: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21937: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21958,7 +21956,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21961: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21959: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21968,7 +21966,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21971 "configure"
+#line 21969 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21981,15 +21979,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21987: \$? = $ac_status" >&5
+  echo "$as_me:21985: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21992: \$? = $ac_status" >&5
+  echo "$as_me:21990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22001,7 +21999,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22004: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22002: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22013,14 +22011,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22016: checking for getttynam" >&5
+	echo "$as_me:22014: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22023 "configure"
+#line 22021 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22032,16 +22030,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22038: \$? = $ac_status" >&5
+  echo "$as_me:22036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22044: \$? = $ac_status" >&5
+  echo "$as_me:22042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22051,7 +22049,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22054: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22052: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22061,7 +22059,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22064: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22062: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22070,7 +22068,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22073: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22071: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22083,14 +22081,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22086: checking for terminal-capability database functions" >&5
+echo "$as_me:22084: 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 22093 "configure"
+#line 22091 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22110,16 +22108,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22116: \$? = $ac_status" >&5
+  echo "$as_me:22114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22122: \$? = $ac_status" >&5
+  echo "$as_me:22120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22130,7 +22128,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22133: result: $cf_cv_cgetent" >&5
+echo "$as_me:22131: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22140,14 +22138,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22143: checking if cgetent uses const parameter" >&5
+echo "$as_me:22141: 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 22150 "configure"
+#line 22148 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22170,16 +22168,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22176: \$? = $ac_status" >&5
+  echo "$as_me:22174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22182: \$? = $ac_status" >&5
+  echo "$as_me:22180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22190,7 +22188,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22193: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22191: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22204,14 +22202,14 @@ fi
 
 fi
 
-echo "$as_me:22207: checking for isascii" >&5
+echo "$as_me:22205: 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 22214 "configure"
+#line 22212 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22223,16 +22221,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22229: \$? = $ac_status" >&5
+  echo "$as_me:22227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22235: \$? = $ac_status" >&5
+  echo "$as_me:22233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22243,7 +22241,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22246: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22244: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22251,10 +22249,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22254: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22252: 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 22257 "configure"
+#line 22255 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22268,16 +22266,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22274: \$? = $ac_status" >&5
+  echo "$as_me:22272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22285,7 +22283,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22288 "configure"
+#line 22286 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22300,16 +22298,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22306: \$? = $ac_status" >&5
+  echo "$as_me:22304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22312: \$? = $ac_status" >&5
+  echo "$as_me:22310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22325,11 +22323,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22328: result: $sigact_bad" >&5
+echo "$as_me:22326: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22332: checking if nanosleep really works" >&5
+echo "$as_me:22330: 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
@@ -22339,7 +22337,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22342 "configure"
+#line 22340 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22365,15 +22363,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22371: \$? = $ac_status" >&5
+  echo "$as_me:22369: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22376: \$? = $ac_status" >&5
+  echo "$as_me:22374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22385,7 +22383,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22388: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22386: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22402,23 +22400,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22405: checking for $ac_header" >&5
+echo "$as_me:22403: 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 22411 "configure"
+#line 22409 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22413: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22421: \$? = $ac_status" >&5
+  echo "$as_me:22419: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22437,7 +22435,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22438: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22454,10 +22452,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22457: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22455: 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 22460 "configure"
+#line 22458 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22469,16 +22467,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22472: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22475: \$? = $ac_status" >&5
+  echo "$as_me:22473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22481: \$? = $ac_status" >&5
+  echo "$as_me:22479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22486,7 +22484,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22489 "configure"
+#line 22487 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22500,16 +22498,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22506: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22512: \$? = $ac_status" >&5
+  echo "$as_me:22510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22525,19 +22523,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22528: result: $termios_bad" >&5
+	echo "$as_me:22526: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22533: checking for tcgetattr" >&5
+echo "$as_me:22531: 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 22540 "configure"
+#line 22538 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22565,16 +22563,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22571: \$? = $ac_status" >&5
+  echo "$as_me:22569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22577: \$? = $ac_status" >&5
+  echo "$as_me:22575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22584,21 +22582,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22587: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22585: 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:22594: checking for vsscanf function or workaround" >&5
+echo "$as_me:22592: 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 22601 "configure"
+#line 22599 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22624,16 +22622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22630: \$? = $ac_status" >&5
+  echo "$as_me:22628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22636: \$? = $ac_status" >&5
+  echo "$as_me:22634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22641,7 +22639,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22644 "configure"
+#line 22642 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22663,16 +22661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22669: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22675: \$? = $ac_status" >&5
+  echo "$as_me:22673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22680,7 +22678,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22683 "configure"
+#line 22681 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22702,16 +22700,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22708: \$? = $ac_status" >&5
+  echo "$as_me:22706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22714: \$? = $ac_status" >&5
+  echo "$as_me:22712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22726,7 +22724,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22729: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22727: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22752,23 +22750,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22755: checking for $ac_header" >&5
+echo "$as_me:22753: 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 22761 "configure"
+#line 22759 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22771: \$? = $ac_status" >&5
+  echo "$as_me:22769: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22787,7 +22785,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22788: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22797,7 +22795,7 @@ EOF
 fi
 done
 
-echo "$as_me:22800: checking for working mkstemp" >&5
+echo "$as_me:22798: 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
@@ -22808,7 +22806,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22811 "configure"
+#line 22809 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22843,15 +22841,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22849: \$? = $ac_status" >&5
+  echo "$as_me:22847: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22854: \$? = $ac_status" >&5
+  echo "$as_me:22852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22866,16 +22864,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22869: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22867: 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:22872: checking for mkstemp" >&5
+	echo "$as_me:22870: 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 22878 "configure"
+#line 22876 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22906,16 +22904,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22912: \$? = $ac_status" >&5
+  echo "$as_me:22910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22918: \$? = $ac_status" >&5
+  echo "$as_me:22916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22925,7 +22923,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22928: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22926: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22946,21 +22944,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22949: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22947: 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:22952: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22950: 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:22958: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22956: 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 22963 "configure"
+#line 22961 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22977,15 +22975,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22983: \$? = $ac_status" >&5
+  echo "$as_me:22981: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22988: \$? = $ac_status" >&5
+  echo "$as_me:22986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22998,7 +22996,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23001: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22999: 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
 
@@ -23009,13 +23007,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23012: checking for intptr_t" >&5
+echo "$as_me:23010: 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 23018 "configure"
+#line 23016 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23030,16 +23028,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23036: \$? = $ac_status" >&5
+  echo "$as_me:23034: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23042: \$? = $ac_status" >&5
+  echo "$as_me:23040: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23049,7 +23047,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23052: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23050: 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
   :
@@ -23061,13 +23059,13 @@ EOF
 
 fi
 
-echo "$as_me:23064: checking for ssize_t" >&5
+echo "$as_me:23062: 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 23070 "configure"
+#line 23068 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23082,16 +23080,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23088: \$? = $ac_status" >&5
+  echo "$as_me:23086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23094: \$? = $ac_status" >&5
+  echo "$as_me:23092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23101,7 +23099,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23104: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23102: 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
   :
@@ -23113,14 +23111,14 @@ EOF
 
 fi
 
-echo "$as_me:23116: checking for type sigaction_t" >&5
+echo "$as_me:23114: 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 23123 "configure"
+#line 23121 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23133,16 +23131,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23139: \$? = $ac_status" >&5
+  echo "$as_me:23137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23145: \$? = $ac_status" >&5
+  echo "$as_me:23143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23153,14 +23151,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23156: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23154: 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:23163: checking declaration of size-change" >&5
+echo "$as_me:23161: 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
@@ -23181,7 +23179,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23184 "configure"
+#line 23182 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23231,16 +23229,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23235: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23243: \$? = $ac_status" >&5
+  echo "$as_me:23241: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23259,7 +23257,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23262: result: $cf_cv_sizechange" >&5
+echo "$as_me:23260: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23277,13 +23275,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23280: checking for memmove" >&5
+echo "$as_me:23278: 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 23286 "configure"
+#line 23284 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23314,16 +23312,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23320: \$? = $ac_status" >&5
+  echo "$as_me:23318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23326: \$? = $ac_status" >&5
+  echo "$as_me:23324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23333,19 +23331,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23336: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23334: 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:23342: checking for bcopy" >&5
+echo "$as_me:23340: 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 23348 "configure"
+#line 23346 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23376,16 +23374,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23382: \$? = $ac_status" >&5
+  echo "$as_me:23380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23388: \$? = $ac_status" >&5
+  echo "$as_me:23386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23395,11 +23393,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23398: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23396: 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:23402: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23400: 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
@@ -23409,7 +23407,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23412 "configure"
+#line 23410 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23425,15 +23423,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23431: \$? = $ac_status" >&5
+  echo "$as_me:23429: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23436: \$? = $ac_status" >&5
+  echo "$as_me:23434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23446,7 +23444,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23449: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23447: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23473,13 +23471,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23476: checking for $ac_func" >&5
+echo "$as_me:23474: 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 23482 "configure"
+#line 23480 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23510,16 +23508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23516: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23522: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23529,7 +23527,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23532: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23530: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23539,7 +23537,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23542: checking if poll really works" >&5
+echo "$as_me:23540: 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
@@ -23549,7 +23547,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23552 "configure"
+#line 23550 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23602,15 +23600,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23608: \$? = $ac_status" >&5
+  echo "$as_me:23606: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23613: \$? = $ac_status" >&5
+  echo "$as_me:23611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23622,21 +23620,81 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23625: result: $cf_cv_working_poll" >&5
+echo "$as_me:23623: 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:23632: checking for va_copy" >&5
+echo "$as_me:23630: checking if MB_LEN_MAX is usable" >&5
+echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+if test "${cf_cv_mb_len_max+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 23637 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+#include <limits.h>
+int
+main (void)
+{
+
+#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+	${cf_cv_main_return:-return}(0);
+#else
+#error MB_LEN_MAX is not usable
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:23657: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:23660: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:23663: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:23666: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_mb_len_max=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_mb_len_max=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:23676: result: $cf_cv_mb_len_max" >&5
+echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+if test "$cf_cv_mb_len_max" = yes
+then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_CONSISTENT_MB_LEN_MAX 1
+EOF
+
+else
+	{ echo "$as_me:23686: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+fi
+
+echo "$as_me:23690: 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 23639 "configure"
+#line 23697 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23653,16 +23711,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23714: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23659: \$? = $ac_status" >&5
+  echo "$as_me:23717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23665: \$? = $ac_status" >&5
+  echo "$as_me:23723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23672,7 +23730,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23675: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23733: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23684,14 +23742,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23687: checking for __va_copy" >&5
+echo "$as_me:23745: 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 23694 "configure"
+#line 23752 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23708,16 +23766,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23714: \$? = $ac_status" >&5
+  echo "$as_me:23772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23720: \$? = $ac_status" >&5
+  echo "$as_me:23778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23727,7 +23785,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23730: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23788: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23739,14 +23797,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23742: checking for __builtin_va_copy" >&5
+echo "$as_me:23800: 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 23749 "configure"
+#line 23807 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23763,16 +23821,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23769: \$? = $ac_status" >&5
+  echo "$as_me:23827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23775: \$? = $ac_status" >&5
+  echo "$as_me:23833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23782,7 +23840,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23785: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23843: 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 &&
@@ -23800,14 +23858,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23803: checking if we can simply copy va_list" >&5
+	echo "$as_me:23861: 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 23810 "configure"
+#line 23868 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23824,16 +23882,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23830: \$? = $ac_status" >&5
+  echo "$as_me:23888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23836: \$? = $ac_status" >&5
+  echo "$as_me:23894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23843,19 +23901,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23846: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23904: 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:23851: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23909: 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 23858 "configure"
+#line 23916 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23872,16 +23930,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23933: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23878: \$? = $ac_status" >&5
+  echo "$as_me:23936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23884: \$? = $ac_status" >&5
+  echo "$as_me:23942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23891,7 +23949,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23894: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23952: 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
@@ -23902,13 +23960,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23905: checking for pid_t" >&5
+echo "$as_me:23963: 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 23911 "configure"
+#line 23969 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23923,16 +23981,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23929: \$? = $ac_status" >&5
+  echo "$as_me:23987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23935: \$? = $ac_status" >&5
+  echo "$as_me:23993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -23942,7 +24000,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23945: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24003: 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
   :
@@ -23957,23 +24015,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23960: checking for $ac_header" >&5
+echo "$as_me:24018: 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 23966 "configure"
+#line 24024 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24028: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23976: \$? = $ac_status" >&5
+  echo "$as_me:24034: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23992,7 +24050,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24053: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24005,13 +24063,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24008: checking for $ac_func" >&5
+echo "$as_me:24066: 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 24014 "configure"
+#line 24072 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24042,16 +24100,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24048: \$? = $ac_status" >&5
+  echo "$as_me:24106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24054: \$? = $ac_status" >&5
+  echo "$as_me:24112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24061,7 +24119,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24064: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24122: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24073,7 +24131,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24076: checking for working fork" >&5
+  echo "$as_me:24134: 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
@@ -24096,15 +24154,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24102: \$? = $ac_status" >&5
+  echo "$as_me:24160: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24107: \$? = $ac_status" >&5
+  echo "$as_me:24165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24116,7 +24174,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24119: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24177: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24130,12 +24188,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24133: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24191: 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:24138: checking for working vfork" >&5
+  echo "$as_me:24196: 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
@@ -24144,7 +24202,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24147 "configure"
+#line 24205 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24237,15 +24295,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24243: \$? = $ac_status" >&5
+  echo "$as_me:24301: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24248: \$? = $ac_status" >&5
+  echo "$as_me:24306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24257,13 +24315,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24260: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24318: 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:24266: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24324: 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
 
@@ -24288,7 +24346,7 @@ EOF
 
 fi
 
-echo "$as_me:24291: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24349: 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
@@ -24298,7 +24356,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24301 "configure"
+#line 24359 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24333,15 +24391,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24339: \$? = $ac_status" >&5
+  echo "$as_me:24397: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24344: \$? = $ac_status" >&5
+  echo "$as_me:24402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24354,7 +24412,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24357: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24415: 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
@@ -24363,7 +24421,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24366: checking for openpty in -lutil" >&5
+echo "$as_me:24424: 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
@@ -24371,7 +24429,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24374 "configure"
+#line 24432 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24390,16 +24448,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24396: \$? = $ac_status" >&5
+  echo "$as_me:24454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24402: \$? = $ac_status" >&5
+  echo "$as_me:24460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24410,7 +24468,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24413: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24471: 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
@@ -24418,7 +24476,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24421: checking for openpty header" >&5
+echo "$as_me:24479: 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
@@ -24445,7 +24503,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24448 "configure"
+#line 24506 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24463,16 +24521,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24469: \$? = $ac_status" >&5
+  echo "$as_me:24527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24475: \$? = $ac_status" >&5
+  echo "$as_me:24533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24490,7 +24548,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24493: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24551: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24563,7 +24621,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24566 "configure"
+#line 24624 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24575,16 +24633,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24581: \$? = $ac_status" >&5
+  echo "$as_me:24639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24587: \$? = $ac_status" >&5
+  echo "$as_me:24645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24601,7 +24659,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24604: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24662: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24637,7 +24695,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24640: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24648,7 +24706,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24651: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24709: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24720,7 +24778,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24723 "configure"
+#line 24781 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24732,16 +24790,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24738: \$? = $ac_status" >&5
+  echo "$as_me:24796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24744: \$? = $ac_status" >&5
+  echo "$as_me:24802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24758,7 +24816,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24761: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24819: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24838,7 +24896,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24841: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24899: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24855,23 +24913,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24858: checking for db.h" >&5
+echo "$as_me:24916: 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 24864 "configure"
+#line 24922 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24868: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24874: \$? = $ac_status" >&5
+  echo "$as_me:24932: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24890,11 +24948,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24893: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24951: 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:24897: checking for version of db" >&5
+echo "$as_me:24955: 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
@@ -24905,10 +24963,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24908: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24966: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24911 "configure"
+#line 24969 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24938,16 +24996,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24944: \$? = $ac_status" >&5
+  echo "$as_me:25002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24950: \$? = $ac_status" >&5
+  echo "$as_me:25008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -24961,16 +25019,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24964: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25022: 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:24968: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25026: 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:24973: checking for db libraries" >&5
+echo "$as_me:25031: 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
@@ -25000,10 +25058,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25003: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25061: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25006 "configure"
+#line 25064 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25058,16 +25116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25064: \$? = $ac_status" >&5
+  echo "$as_me:25122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25070: \$? = $ac_status" >&5
+  echo "$as_me:25128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25087,11 +25145,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25090: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25148: 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:25094: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25152: 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
@@ -25117,7 +25175,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25120: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25178: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25132,7 +25190,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25135: checking if we should include stdbool.h" >&5
+echo "$as_me:25193: 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
@@ -25140,7 +25198,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25143 "configure"
+#line 25201 "configure"
 #include "confdefs.h"
 
 int
@@ -25152,23 +25210,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25158: \$? = $ac_status" >&5
+  echo "$as_me:25216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25164: \$? = $ac_status" >&5
+  echo "$as_me:25222: \$? = $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 25171 "configure"
+#line 25229 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25184,16 +25242,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25190: \$? = $ac_status" >&5
+  echo "$as_me:25248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25196: \$? = $ac_status" >&5
+  echo "$as_me:25254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25207,13 +25265,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25210: result: yes" >&5
+then	echo "$as_me:25268: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25212: result: no" >&5
+else	echo "$as_me:25270: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25216: checking for builtin bool type" >&5
+echo "$as_me:25274: 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
@@ -25221,7 +25279,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25224 "configure"
+#line 25282 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25236,16 +25294,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25242: \$? = $ac_status" >&5
+  echo "$as_me:25300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25248: \$? = $ac_status" >&5
+  echo "$as_me:25306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25258,9 +25316,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25261: result: yes" >&5
+then	echo "$as_me:25319: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25263: result: no" >&5
+else	echo "$as_me:25321: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25277,10 +25335,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25280: checking if we already have C++ library" >&5
+	echo "$as_me:25338: 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 25283 "configure"
+#line 25341 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25294,16 +25352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25300: \$? = $ac_status" >&5
+  echo "$as_me:25358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25306: \$? = $ac_status" >&5
+  echo "$as_me:25364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25312,7 +25370,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25315: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25373: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25331,7 +25389,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25334: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25392: 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
@@ -25357,7 +25415,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25360 "configure"
+#line 25418 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25371,16 +25429,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25377: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25383: \$? = $ac_status" >&5
+  echo "$as_me:25441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25392,7 +25450,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25395: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25453: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25414,7 +25472,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25417: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25475: 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
@@ -25429,15 +25487,15 @@ CF_EOF
 # 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:25432: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25435: \$? = $ac_status" >&5
+  echo "$as_me:25493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25437: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25440: \$? = $ac_status" >&5
+  echo "$as_me:25498: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25448,10 +25506,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25451: result: yes" >&5
+  echo "$as_me:25509: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25454: result: no" >&5
+  echo "$as_me:25512: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25471,7 +25529,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25474: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25532: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25492,7 +25550,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25495 "configure"
+#line 25553 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25506,16 +25564,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25512: \$? = $ac_status" >&5
+  echo "$as_me:25570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25518: \$? = $ac_status" >&5
+  echo "$as_me:25576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25552,7 +25610,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25555 "configure"
+#line 25613 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25566,16 +25624,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25572: \$? = $ac_status" >&5
+  echo "$as_me:25630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25578: \$? = $ac_status" >&5
+  echo "$as_me:25636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25608,7 +25666,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25611: result: $cf_cxx_library" >&5
+	echo "$as_me:25669: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25624,7 +25682,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25627: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25685: 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
@@ -25641,18 +25699,18 @@ do
   # 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 25644 "configure"
+#line 25702 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25649: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25707: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25655: \$? = $ac_status" >&5
+  echo "$as_me:25713: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25675,17 +25733,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25678 "configure"
+#line 25736 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25682: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25688: \$? = $ac_status" >&5
+  echo "$as_me:25746: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25722,7 +25780,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25725: result: $CXXCPP" >&5
+echo "$as_me:25783: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25732,18 +25790,18 @@ do
   # 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 25735 "configure"
+#line 25793 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25746: \$? = $ac_status" >&5
+  echo "$as_me:25804: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25766,17 +25824,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25769 "configure"
+#line 25827 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25831: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25779: \$? = $ac_status" >&5
+  echo "$as_me:25837: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25804,7 +25862,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25807: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25865: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25819,23 +25877,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25822: checking for $ac_header" >&5
+echo "$as_me:25880: 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 25828 "configure"
+#line 25886 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25832: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25890: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25838: \$? = $ac_status" >&5
+  echo "$as_me:25896: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25854,7 +25912,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25915: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25867,23 +25925,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25870: checking for $ac_header" >&5
+echo "$as_me:25928: 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 25876 "configure"
+#line 25934 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25880: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25938: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25886: \$? = $ac_status" >&5
+  echo "$as_me:25944: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25902,7 +25960,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25963: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25913,10 +25971,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25916: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25974: 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 25919 "configure"
+#line 25977 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25933,16 +25991,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25939: \$? = $ac_status" >&5
+  echo "$as_me:25997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25945: \$? = $ac_status" >&5
+  echo "$as_me:26003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -25951,7 +26009,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:25954: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26012: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -25962,7 +26020,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25965: checking if we should include stdbool.h" >&5
+echo "$as_me:26023: 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
@@ -25970,7 +26028,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25973 "configure"
+#line 26031 "configure"
 #include "confdefs.h"
 
 int
@@ -25982,23 +26040,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25988: \$? = $ac_status" >&5
+  echo "$as_me:26046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25994: \$? = $ac_status" >&5
+  echo "$as_me:26052: \$? = $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 26001 "configure"
+#line 26059 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26014,16 +26072,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26037,13 +26095,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26040: result: yes" >&5
+then	echo "$as_me:26098: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26042: result: no" >&5
+else	echo "$as_me:26100: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26046: checking for builtin bool type" >&5
+echo "$as_me:26104: 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
@@ -26051,7 +26109,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26054 "configure"
+#line 26112 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26066,16 +26124,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26072: \$? = $ac_status" >&5
+  echo "$as_me:26130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26078: \$? = $ac_status" >&5
+  echo "$as_me:26136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26088,19 +26146,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26091: result: yes" >&5
+then	echo "$as_me:26149: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26093: result: no" >&5
+else	echo "$as_me:26151: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26097: checking for bool" >&5
+echo "$as_me:26155: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26103 "configure"
+#line 26161 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26135,16 +26193,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26141: \$? = $ac_status" >&5
+  echo "$as_me:26199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26147: \$? = $ac_status" >&5
+  echo "$as_me:26205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26154,10 +26212,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26157: result: $ac_cv_type_bool" >&5
+echo "$as_me:26215: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26160: checking size of bool" >&5
+echo "$as_me:26218: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26166,7 +26224,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26169 "configure"
+#line 26227 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26198,21 +26256,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26204: \$? = $ac_status" >&5
+  echo "$as_me:26262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26210: \$? = $ac_status" >&5
+  echo "$as_me:26268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26215 "configure"
+#line 26273 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26244,16 +26302,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26250: \$? = $ac_status" >&5
+  echo "$as_me:26308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26256: \$? = $ac_status" >&5
+  echo "$as_me:26314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26269,7 +26327,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26272 "configure"
+#line 26330 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26301,16 +26359,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26307: \$? = $ac_status" >&5
+  echo "$as_me:26365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26313: \$? = $ac_status" >&5
+  echo "$as_me:26371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26326,7 +26384,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26329 "configure"
+#line 26387 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26358,16 +26416,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26364: \$? = $ac_status" >&5
+  echo "$as_me:26422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26370: \$? = $ac_status" >&5
+  echo "$as_me:26428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26380,12 +26438,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26383: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26441: 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 26388 "configure"
+#line 26446 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26421,15 +26479,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26427: \$? = $ac_status" >&5
+  echo "$as_me:26485: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26432: \$? = $ac_status" >&5
+  echo "$as_me:26490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26445,13 +26503,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26448: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26506: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26454: checking for type of bool" >&5
+echo "$as_me:26512: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26470,7 +26528,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26473 "configure"
+#line 26531 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26511,15 +26569,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26517: \$? = $ac_status" >&5
+  echo "$as_me:26575: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26522: \$? = $ac_status" >&5
+  echo "$as_me:26580: \$? = $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
@@ -26536,19 +26594,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26539: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26597: 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:26546: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26604: 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:26551: checking for special defines needed for etip.h" >&5
+echo "$as_me:26609: 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"
@@ -26566,7 +26624,7 @@ do
 	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 26569 "configure"
+#line 26627 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26580,16 +26638,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26586: \$? = $ac_status" >&5
+  echo "$as_me:26644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26592: \$? = $ac_status" >&5
+  echo "$as_me:26650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26610,12 +26668,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26613: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26671: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26618: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26676: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26632,7 +26690,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26635 "configure"
+#line 26693 "configure"
 #include "confdefs.h"
 
 class base
@@ -26651,15 +26709,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26657: \$? = $ac_status" >&5
+  echo "$as_me:26715: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26662: \$? = $ac_status" >&5
+  echo "$as_me:26720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26678,7 +26736,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26681: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26739: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26687,7 +26745,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26690: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26748: 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
@@ -26704,7 +26762,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26707 "configure"
+#line 26765 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26723,15 +26781,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26729: \$? = $ac_status" >&5
+  echo "$as_me:26787: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26734: \$? = $ac_status" >&5
+  echo "$as_me:26792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26750,7 +26808,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26753: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26811: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26760,7 +26818,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26763: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26821: 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
@@ -26774,7 +26832,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26777 "configure"
+#line 26835 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26818,16 +26876,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26879: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26824: \$? = $ac_status" >&5
+  echo "$as_me:26882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26830: \$? = $ac_status" >&5
+  echo "$as_me:26888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26845,7 +26903,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26848: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26906: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26894,13 +26952,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26897: checking for bool" >&5
+echo "$as_me:26955: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26903 "configure"
+#line 26961 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26935,16 +26993,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26941: \$? = $ac_status" >&5
+  echo "$as_me:26999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26947: \$? = $ac_status" >&5
+  echo "$as_me:27005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26954,10 +27012,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26957: result: $ac_cv_type_bool" >&5
+echo "$as_me:27015: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26960: checking size of bool" >&5
+echo "$as_me:27018: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26966,7 +27024,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26969 "configure"
+#line 27027 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26998,21 +27056,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27004: \$? = $ac_status" >&5
+  echo "$as_me:27062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27010: \$? = $ac_status" >&5
+  echo "$as_me:27068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27015 "configure"
+#line 27073 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27044,16 +27102,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27050: \$? = $ac_status" >&5
+  echo "$as_me:27108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27056: \$? = $ac_status" >&5
+  echo "$as_me:27114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27069,7 +27127,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27072 "configure"
+#line 27130 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27101,16 +27159,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27107: \$? = $ac_status" >&5
+  echo "$as_me:27165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27113: \$? = $ac_status" >&5
+  echo "$as_me:27171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27126,7 +27184,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27129 "configure"
+#line 27187 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27158,16 +27216,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27164: \$? = $ac_status" >&5
+  echo "$as_me:27222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27170: \$? = $ac_status" >&5
+  echo "$as_me:27228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27180,12 +27238,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27183: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27241: 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 27188 "configure"
+#line 27246 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27221,15 +27279,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27227: \$? = $ac_status" >&5
+  echo "$as_me:27285: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27232: \$? = $ac_status" >&5
+  echo "$as_me:27290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27245,13 +27303,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27248: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27306: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27254: checking for type of bool" >&5
+echo "$as_me:27312: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27270,7 +27328,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27273 "configure"
+#line 27331 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27311,15 +27369,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27317: \$? = $ac_status" >&5
+  echo "$as_me:27375: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27322: \$? = $ac_status" >&5
+  echo "$as_me:27380: \$? = $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
@@ -27336,26 +27394,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27339: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27397: 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:27346: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27404: 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:27352: checking for fallback type of bool" >&5
+			echo "$as_me:27410: 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:27358: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27416: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27384,7 +27442,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27387: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27445: 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
@@ -27401,7 +27459,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27404: checking for $ac_word" >&5
+echo "$as_me:27462: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27418,7 +27476,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27421: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27479: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27430,10 +27488,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27433: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27491: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27436: result: no" >&5
+  echo "$as_me:27494: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27443,7 +27501,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27446: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27504: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27454,7 +27512,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27457: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27515: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27483,7 +27541,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27486: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27544: 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
@@ -27502,10 +27560,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27505: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27563: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27508: result: missing" >&5
+					echo "$as_me:27566: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27518,7 +27576,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27521: checking for gnat version" >&5
+echo "$as_me:27579: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27529,7 +27587,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27532: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27590: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27538,7 +27596,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27541: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27599: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27546,7 +27604,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27549: checking for $ac_word" >&5
+echo "$as_me:27607: 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
@@ -27561,7 +27619,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27564: found $ac_dir/$ac_word" >&5
+echo "$as_me:27622: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27570,20 +27628,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27573: result: $M4_exists" >&5
+  echo "$as_me:27631: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27576: result: no" >&5
+  echo "$as_me:27634: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27582: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27640: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27586: checking if GNAT works" >&5
+			echo "$as_me:27644: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27611,7 +27669,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27614: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27672: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27623,7 +27681,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27626: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27684: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27640,10 +27698,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27643: result: $ADAFLAGS" >&5
+	echo "$as_me:27701: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27646: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27704: 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
@@ -27653,11 +27711,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27656: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27714: 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:27660: checking if GNAT supports generics" >&5
+echo "$as_me:27718: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27667,7 +27725,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27670: result: $cf_gnat_generics" >&5
+echo "$as_me:27728: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27679,7 +27737,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27682: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27740: 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
@@ -27727,7 +27785,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27730: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27788: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27740,7 +27798,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27743: checking if GNAT supports project files" >&5
+echo "$as_me:27801: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27803,15 +27861,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27806: result: $cf_gnat_projects" >&5
+echo "$as_me:27864: 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:27812: checking if GNAT supports libraries" >&5
+	echo "$as_me:27870: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27814: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27872: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27831,7 +27889,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27834: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27892: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27843,7 +27901,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27846: checking for Ada95 compiler" >&5
+echo "$as_me:27904: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27854,12 +27912,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27857: result: $cf_ada_compiler" >&5
+echo "$as_me:27915: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27862: checking for Ada95 include directory" >&5
+echo "$as_me:27920: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27895,7 +27953,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27898: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27956: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27904,10 +27962,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27907: result: $ADA_INCLUDE" >&5
+echo "$as_me:27965: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27910: checking for Ada95 object directory" >&5
+echo "$as_me:27968: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -27943,7 +28001,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27946: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28004: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27952,10 +28010,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:27955: result: $ADA_OBJECTS" >&5
+echo "$as_me:28013: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:27958: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28016: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -27976,11 +28034,11 @@ then
 	fi
 fi
 
-echo "$as_me:27979: result: $with_ada_sharedlib" >&5
+echo "$as_me:28037: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:27983: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28041: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -27998,7 +28056,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28001: checking for Ada95 curses library name" >&5
+echo "$as_me:28059: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28014,7 +28072,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28017: result: $ADA_LIBNAME" >&5
+echo "$as_me:28075: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28025,13 +28083,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28028: checking for wchar_t" >&5
+	echo "$as_me:28086: 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 28034 "configure"
+#line 28092 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28046,16 +28104,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28052: \$? = $ac_status" >&5
+  echo "$as_me:28110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28058: \$? = $ac_status" >&5
+  echo "$as_me:28116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28065,10 +28123,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28068: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28126: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28071: checking size of wchar_t" >&5
+echo "$as_me:28129: 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
@@ -28077,7 +28135,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28080 "configure"
+#line 28138 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28089,21 +28147,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28095: \$? = $ac_status" >&5
+  echo "$as_me:28153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28101: \$? = $ac_status" >&5
+  echo "$as_me:28159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28106 "configure"
+#line 28164 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28115,16 +28173,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28121: \$? = $ac_status" >&5
+  echo "$as_me:28179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28127: \$? = $ac_status" >&5
+  echo "$as_me:28185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28140,7 +28198,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28143 "configure"
+#line 28201 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28152,16 +28210,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28158: \$? = $ac_status" >&5
+  echo "$as_me:28216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28164: \$? = $ac_status" >&5
+  echo "$as_me:28222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28177,7 +28235,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28180 "configure"
+#line 28238 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28189,16 +28247,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28195: \$? = $ac_status" >&5
+  echo "$as_me:28253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28201: \$? = $ac_status" >&5
+  echo "$as_me:28259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28211,12 +28269,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28214: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28272: 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 28219 "configure"
+#line 28277 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28232,15 +28290,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28238: \$? = $ac_status" >&5
+  echo "$as_me:28296: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28243: \$? = $ac_status" >&5
+  echo "$as_me:28301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28256,7 +28314,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28259: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28317: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28269,7 +28327,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28272: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28330: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28287,7 +28345,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28290: checking for library subsets" >&5
+echo "$as_me:28348: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28341,7 +28399,7 @@ fi
 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:28344: result: $LIB_SUBSETS" >&5
+echo "$as_me:28402: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28372,7 +28430,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28375: checking default library suffix" >&5
+echo "$as_me:28433: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28383,10 +28441,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28386: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28444: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28389: checking default library-dependency suffix" >&5
+echo "$as_me:28447: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28469,10 +28527,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28472: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28530: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28475: checking default object directory" >&5
+echo "$as_me:28533: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28488,11 +28546,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28491: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28549: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28495: checking c++ library-dependency suffix" >&5
+echo "$as_me:28553: 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++)
@@ -28585,7 +28643,7 @@ else
 	fi
 
 fi
-echo "$as_me:28588: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28646: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28761,19 +28819,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28764: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28822: 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 <<EOF
-#line 28769 "configure"
+#line 28827 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28773: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28776: \$? = $ac_status" >&5
+  echo "$as_me:28834: \$? = $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
@@ -28784,10 +28842,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28787 "configure"
+#line 28845 "configure"
 #include "confdefs.h"
 
-#line 28790 "configure"
+#line 28848 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28802,16 +28860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28808: \$? = $ac_status" >&5
+  echo "$as_me:28866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28814: \$? = $ac_status" >&5
+  echo "$as_me:28872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28834,7 +28892,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28837: result: $cf_ldflags_static" >&5
+	echo "$as_me:28895: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28850,7 +28908,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28853: checking where we will install curses.h" >&5
+echo "$as_me:28911: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28860,7 +28918,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28863: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28921: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28868,7 +28926,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28871: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28929: 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
@@ -28893,7 +28951,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28896: checking for desired basename for form library" >&5
+echo "$as_me:28954: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28913,10 +28971,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28916: result: $FORM_NAME" >&5
+echo "$as_me:28974: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28919: checking for desired basename for menu library" >&5
+echo "$as_me:28977: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28936,10 +28994,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28939: result: $MENU_NAME" >&5
+echo "$as_me:28997: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:28942: checking for desired basename for panel library" >&5
+echo "$as_me:29000: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -28959,10 +29017,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:28962: result: $PANEL_NAME" >&5
+echo "$as_me:29020: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:28965: checking for desired basename for cxx library" >&5
+echo "$as_me:29023: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -28982,13 +29040,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:28985: result: $CXX_NAME" >&5
+echo "$as_me:29043: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:28991: checking for src modules" >&5
+echo "$as_me:29049: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29047,7 +29105,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29050: result: $cf_cv_src_modules" >&5
+echo "$as_me:29108: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29208,7 +29266,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29211: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29269: 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//'`
@@ -29219,7 +29277,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29222: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29280: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29235,7 +29293,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29238: result: $PKG_CFLAGS" >&5
+echo "$as_me:29296: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29296,7 +29354,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29299: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29357: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29323,7 +29381,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29326: checking for linker search path" >&5
+echo "$as_me:29384: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29371,7 +29429,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29374: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29432: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29412,7 +29470,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29415: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29473: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29498,7 +29556,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29501: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29559: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29679,7 +29737,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29682: error: ambiguous option: $1
+    { { echo "$as_me:29740: 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;}
@@ -29698,7 +29756,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29701: error: unrecognized option: $1
+  -*) { { echo "$as_me:29759: 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;}
@@ -29828,7 +29886,7 @@ do
   "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:29831: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29889: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30348,7 +30406,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30351: creating $ac_file" >&5
+    { echo "$as_me:30409: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30366,7 +30424,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30369: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30427: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30379,7 +30437,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30382: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30440: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30395,7 +30453,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30398: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30456: 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;}
@@ -30404,7 +30462,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30407: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30465: 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;}
@@ -30449,7 +30507,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30452: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30510: 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;}
@@ -30460,7 +30518,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30463: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30521: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30509,7 +30567,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30512: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30570: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30520,7 +30578,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30523: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30581: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30533,7 +30591,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30536: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30594: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30591,7 +30649,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30594: $ac_file is unchanged" >&5
+      { echo "$as_me:30652: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30978,7 +31036,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30981: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31039: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 023df69dc..1d70ea0f0 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.774 2024/01/19 11:22:46 tom Exp $
+dnl $Id: configure.in,v 1.775 2024/03/02 20:22:33 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.774 $)
+AC_REVISION($Revision: 1.775 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1831,12 +1831,10 @@ getuid \
 issetugid \
 localeconv \
 poll \
-putenv \
 remove \
 select \
 setbuf \
 setbuffer \
-setenv \
 setfsuid \
 setvbuf \
 sigaction \
@@ -1894,6 +1892,7 @@ CF_TYPE_SIGACTION
 CF_SIZECHANGE
 CF_FUNC_MEMMOVE
 CF_FUNC_POLL
+CF_MB_LEN_MAX
 CF_VA_COPY
 AC_FUNC_VFORK
 CF_FOPEN_BIN_R
diff --git a/dist.mk b/dist.mk
index 7c1251190..8cd1e5e80 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1599 2024/02/24 11:49:33 tom Exp $
+# $Id: dist.mk,v 1.1600 2024/03/02 11:13:41 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240224
+NCURSES_PATCH = 20240302
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fea882a22..7b12b0ee5 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.58 2023/12/23 16:28:31 tom Exp @
+  * @Id: captoinfo.1m,v 1.59 2024/03/02 16:34:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2024-03-02 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2024-03-02 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -194,7 +194,7 @@ <H1 class="no-header">captoinfo 1m 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2024-03-02                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index a497bf8f5..1aaa8fc6b 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.96 2024/01/13 22:05:39 tom Exp @
+  * @Id: curs_attr.3x,v 1.97 2024/03/02 16:34:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-02                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 0c22ceb5f..dbd3cb1a2 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.44 2024/02/24 20:01:11 tom Exp @
+  * @Id: curs_trace.3x,v 1.45 2024/03/02 16:34:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-03-02 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-03-02 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -183,22 +183,13 @@ <H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        guideline.
 
 
-</PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       These  functions  check  the <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM> environment variable, to set
-       the tracing feature as if <STRONG>curses_trace</STRONG> was called:
-
-           <STRONG>filter</STRONG>, <STRONG>initscr</STRONG>, <STRONG>new_prescr</STRONG>, <STRONG>newterm</STRONG>, <STRONG>nofilter</STRONG>, <STRONG>restartterm</STRONG>,
-           <STRONG>ripoffline</STRONG>, <STRONG>setupterm</STRONG>, <STRONG>slk_init</STRONG>, <STRONG>tgetent</STRONG>, <STRONG>use_env</STRONG>,
-           <STRONG>use_extended_names</STRONG>, <STRONG>use_tioctl</STRONG>
-
-
 </PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
-       The command-line utilities such as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>  provide  a  verbose  option
-       which  extends  the  set  of  messages  written  using the <STRONG>curses_trace</STRONG>
-       function.  Both of these (<STRONG>-v</STRONG> and <STRONG>curses_trace</STRONG>) use  the  same  variable
+       The  command-line  utilities  such  as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> provide a verbose option
+       which extends the  set  of  messages  written  using  the  <STRONG>curses_trace</STRONG>
+       function.   Both  of  these (<STRONG>-v</STRONG> and <STRONG>curses_trace</STRONG>) use the same variable
        (<STRONG>_nc_tracing</STRONG>), which determines the messages which are written.
 
-       Because  the  command-line  utilities may call initialization functions
+       Because the command-line utilities may  call  initialization  functions
        such  as  <STRONG>setupterm</STRONG>,  <STRONG>tgetent</STRONG>  or  <STRONG>use_extended_names</STRONG>,  some  of  their
        debugging output may be directed to the <EM>trace</EM> file if the <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM>
        environment variable is set:
@@ -207,15 +198,26 @@ <H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   messages produced by the underlying library are written to <EM>trace</EM>.
 
-       If <EM>ncurses</EM> is built without tracing, none of the latter  are  produced,
+       If  <EM>ncurses</EM>  is built without tracing, none of the latter are produced,
        and fewer diagnostics are provided by the command-line utilities.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  which return a value are designed to be used as parameters to
+       Routines which return a value are designed to be used as parameters  to
        the <STRONG>_tracef</STRONG> routine.
 
 
+</PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
+
+</PRE><H3><a name="h3-NCURSES_TRACE">NCURSES_TRACE</a></H3><PRE>
+       A  positive integral value stored in this variable causes the following
+       functions to enable the tracing feature as if <STRONG>curses_trace</STRONG> were called.
+
+           <STRONG>filter</STRONG>, <STRONG>initscr</STRONG>, <STRONG>new_prescr</STRONG>, <STRONG>newterm</STRONG>, <STRONG>nofilter</STRONG>, <STRONG>restartterm</STRONG>,
+           <STRONG>ripoffline</STRONG>, <STRONG>setupterm</STRONG>, <STRONG>slk_init</STRONG>, <STRONG>tgetent</STRONG>, <STRONG>use_env</STRONG>,
+           <STRONG>use_extended_names</STRONG>, <STRONG>use_tioctl</STRONG>
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are not part of the XSI interface.  Some  other  curses
        implementations  are  known  to have similar features, but they are not
@@ -259,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-24                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2024-03-02                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -269,11 +271,15 @@ <H1 class="no-header">curs_trace 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-Functions">Functions</a></li>
 <li><a href="#h3-Trace-Parameter">Trace Parameter</a></li>
-<li><a href="#h3-Initialization">Initialization</a></li>
 <li><a href="#h3-Command-line-Utilities">Command-line Utilities</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-ENVIRONMENT">ENVIRONMENT</a>
+<ul>
+<li><a href="#h3-NCURSES_TRACE">NCURSES_TRACE</a></li>
+</ul>
+</li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index e144aa4b6..5a1ac2391 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240224).
+       This describes <EM>ncurses</EM> version 6.4 (patch 20240302).
 
        The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
        Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 374e70348..a2d9f0218 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240224).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240302).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -471,6 +471,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>key_dc</STRONG>                     <STRONG>kdch1</STRONG>     <STRONG>kD</STRONG>  delete-character key
        <STRONG>key_dl</STRONG>                     <STRONG>kdl1</STRONG>      <STRONG>kL</STRONG>  delete-line key
        <STRONG>key_down</STRONG>                   <STRONG>kcud1</STRONG>     <STRONG>kd</STRONG>  down-arrow key
+
        <STRONG>key_eic</STRONG>                    <STRONG>krmir</STRONG>     <STRONG>kM</STRONG>  sent by rmir or smir in insert
                                                 mode
        <STRONG>key_eol</STRONG>                    <STRONG>kel</STRONG>       <STRONG>kE</STRONG>  clear-to-end-of-line key
@@ -512,9 +513,10 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                                                 not f3
        <STRONG>lab_f4</STRONG>                     <STRONG>lf4</STRONG>       <STRONG>l4</STRONG>  label on function key f4 if
                                                 not f4
+
+
        <STRONG>lab_f5</STRONG>                     <STRONG>lf5</STRONG>       <STRONG>l5</STRONG>  label on function key f5 if
                                                 not f5
-
        <STRONG>lab_f6</STRONG>                     <STRONG>lf6</STRONG>       <STRONG>l6</STRONG>  label on function key f6 if
                                                 not f6
        <STRONG>lab_f7</STRONG>                     <STRONG>lf7</STRONG>       <STRONG>l7</STRONG>  label on function key f7 if
@@ -552,6 +554,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>repeat_char</STRONG>                <STRONG>rep</STRONG>       <STRONG>rp</STRONG>  repeat char #1 #2 times (P*)
        <STRONG>reset_1string</STRONG>              <STRONG>rs1</STRONG>       <STRONG>r1</STRONG>  reset string
        <STRONG>reset_2string</STRONG>              <STRONG>rs2</STRONG>       <STRONG>r2</STRONG>  reset string
+
        <STRONG>reset_3string</STRONG>              <STRONG>rs3</STRONG>       <STRONG>r3</STRONG>  reset string
        <STRONG>reset_file</STRONG>                 <STRONG>rf</STRONG>        <STRONG>rf</STRONG>  name of reset file
        <STRONG>restore_cursor</STRONG>             <STRONG>rc</STRONG>        <STRONG>rc</STRONG>  restore cursor to position of
@@ -577,10 +580,10 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>init_prog</STRONG>                  <STRONG>iprog</STRONG>     <STRONG>iP</STRONG>  path name of program for
                                                 initialization
        <STRONG>key_a1</STRONG>                     <STRONG>ka1</STRONG>       <STRONG>K1</STRONG>  upper left of keypad
+
        <STRONG>key_a3</STRONG>                     <STRONG>ka3</STRONG>       <STRONG>K3</STRONG>  upper right of keypad
        <STRONG>key_b2</STRONG>                     <STRONG>kb2</STRONG>       <STRONG>K2</STRONG>  center of keypad
        <STRONG>key_c1</STRONG>                     <STRONG>kc1</STRONG>       <STRONG>K4</STRONG>  lower left of keypad
-
        <STRONG>key_c3</STRONG>                     <STRONG>kc3</STRONG>       <STRONG>K5</STRONG>  lower right of keypad
        <STRONG>prtr_non</STRONG>                   <STRONG>mc5p</STRONG>      <STRONG>pO</STRONG>  turn on printer for #1 bytes
        <STRONG>char_padding</STRONG>               <STRONG>rmp</STRONG>       <STRONG>rP</STRONG>  like ip but when in insert
@@ -627,6 +630,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>key_save</STRONG>                   <STRONG>ksav</STRONG>      <STRONG>&amp;6</STRONG>  save key
        <STRONG>key_suspend</STRONG>                <STRONG>kspd</STRONG>      <STRONG>&amp;7</STRONG>  suspend key
        <STRONG>key_undo</STRONG>                   <STRONG>kund</STRONG>      <STRONG>&amp;8</STRONG>  undo key
+
        <STRONG>key_sbeg</STRONG>                   <STRONG>kBEG</STRONG>      <STRONG>&amp;9</STRONG>  shifted begin key
        <STRONG>key_scancel</STRONG>                <STRONG>kCAN</STRONG>      <STRONG>&amp;0</STRONG>  shifted cancel key
        <STRONG>key_scommand</STRONG>               <STRONG>kCMD</STRONG>      <STRONG>*1</STRONG>  shifted command key
@@ -642,11 +646,11 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>key_sfind</STRONG>                  <STRONG>kFND</STRONG>      <STRONG>*0</STRONG>  shifted find key
        <STRONG>key_shelp</STRONG>                  <STRONG>kHLP</STRONG>      <STRONG>#1</STRONG>  shifted help key
        <STRONG>key_shome</STRONG>                  <STRONG>kHOM</STRONG>      <STRONG>#2</STRONG>  shifted home key
+
        <STRONG>key_sic</STRONG>                    <STRONG>kIC</STRONG>       <STRONG>#3</STRONG>  shifted insert-character key
        <STRONG>key_sleft</STRONG>                  <STRONG>kLFT</STRONG>      <STRONG>#4</STRONG>  shifted left-arrow key
        <STRONG>key_smessage</STRONG>               <STRONG>kMSG</STRONG>      <STRONG>%a</STRONG>  shifted message key
        <STRONG>key_smove</STRONG>                  <STRONG>kMOV</STRONG>      <STRONG>%b</STRONG>  shifted move key
-
        <STRONG>key_snext</STRONG>                  <STRONG>kNXT</STRONG>      <STRONG>%c</STRONG>  shifted next key
        <STRONG>key_soptions</STRONG>               <STRONG>kOPT</STRONG>      <STRONG>%d</STRONG>  shifted options key
        <STRONG>key_sprevious</STRONG>              <STRONG>kPRV</STRONG>      <STRONG>%e</STRONG>  shifted previous key
@@ -692,6 +696,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>key_f40</STRONG>                    <STRONG>kf40</STRONG>      <STRONG>FU</STRONG>  F40 function key
        <STRONG>key_f41</STRONG>                    <STRONG>kf41</STRONG>      <STRONG>FV</STRONG>  F41 function key
        <STRONG>key_f42</STRONG>                    <STRONG>kf42</STRONG>      <STRONG>FW</STRONG>  F42 function key
+
        <STRONG>key_f43</STRONG>                    <STRONG>kf43</STRONG>      <STRONG>FX</STRONG>  F43 function key
        <STRONG>key_f44</STRONG>                    <STRONG>kf44</STRONG>      <STRONG>FY</STRONG>  F44 function key
        <STRONG>key_f45</STRONG>                    <STRONG>kf45</STRONG>      <STRONG>FZ</STRONG>  F45 function key
@@ -707,12 +712,12 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>key_f55</STRONG>                    <STRONG>kf55</STRONG>      <STRONG>Fj</STRONG>  F55 function key
        <STRONG>key_f56</STRONG>                    <STRONG>kf56</STRONG>      <STRONG>Fk</STRONG>  F56 function key
        <STRONG>key_f57</STRONG>                    <STRONG>kf57</STRONG>      <STRONG>Fl</STRONG>  F57 function key
+
        <STRONG>key_f58</STRONG>                    <STRONG>kf58</STRONG>      <STRONG>Fm</STRONG>  F58 function key
        <STRONG>key_f59</STRONG>                    <STRONG>kf59</STRONG>      <STRONG>Fn</STRONG>  F59 function key
        <STRONG>key_f60</STRONG>                    <STRONG>kf60</STRONG>      <STRONG>Fo</STRONG>  F60 function key
        <STRONG>key_f61</STRONG>                    <STRONG>kf61</STRONG>      <STRONG>Fp</STRONG>  F61 function key
        <STRONG>key_f62</STRONG>                    <STRONG>kf62</STRONG>      <STRONG>Fq</STRONG>  F62 function key
-
        <STRONG>key_f63</STRONG>                    <STRONG>kf63</STRONG>      <STRONG>Fr</STRONG>  F63 function key
        <STRONG>clr_bol</STRONG>                    <STRONG>el1</STRONG>       <STRONG>cb</STRONG>  Clear to beginning of line
        <STRONG>clear_margins</STRONG>              <STRONG>mgc</STRONG>       <STRONG>MC</STRONG>  clear right and left soft
@@ -771,14 +776,15 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>define_char</STRONG>                <STRONG>defc</STRONG>      <STRONG>ZE</STRONG>  Define a character #1, #2 dots
                                                 wide, descender #3
        <STRONG>enter_doublewide_mode</STRONG>      <STRONG>swidm</STRONG>     <STRONG>ZF</STRONG>  Enter double-wide mode
+
        <STRONG>enter_draft_quality</STRONG>        <STRONG>sdrfq</STRONG>     <STRONG>ZG</STRONG>  Enter draft-quality mode
+
        <STRONG>enter_italics_mode</STRONG>         <STRONG>sitm</STRONG>      <STRONG>ZH</STRONG>  Enter italic mode
        <STRONG>enter_leftward_mode</STRONG>        <STRONG>slm</STRONG>       <STRONG>ZI</STRONG>  Start leftward carriage motion
        <STRONG>enter_micro_mode</STRONG>           <STRONG>smicm</STRONG>     <STRONG>ZJ</STRONG>  Start micro-motion mode
        <STRONG>enter_near_letter_quality</STRONG>  <STRONG>snlq</STRONG>      <STRONG>ZK</STRONG>  Enter NLQ mode
        <STRONG>enter_normal_quality</STRONG>       <STRONG>snrmq</STRONG>     <STRONG>ZL</STRONG>  Enter normal-quality mode
        <STRONG>enter_shadow_mode</STRONG>          <STRONG>sshm</STRONG>      <STRONG>ZM</STRONG>  Enter shadow-print mode
-
        <STRONG>enter_subscript_mode</STRONG>       <STRONG>ssubm</STRONG>     <STRONG>ZN</STRONG>  Enter subscript mode
        <STRONG>enter_superscript_mode</STRONG>     <STRONG>ssupm</STRONG>     <STRONG>ZO</STRONG>  Enter superscript mode
        <STRONG>enter_upward_mode</STRONG>          <STRONG>sum</STRONG>       <STRONG>ZP</STRONG>  Start upward carriage motion
@@ -843,8 +849,6 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        structure, but were originally not documented in the man page.
 
                                       <STRONG>Code</STRONG>
-
-
        <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
        <STRONG>char_set_names</STRONG>             <STRONG>csnm</STRONG>      <STRONG>Zy</STRONG>  Produce #1'th item from list
@@ -906,11 +910,11 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        binary-compatible with System V terminfo entries after SVr4.1; beware!
 
                                       <STRONG>Code</STRONG>
+
        <STRONG>String</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>     <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
        <STRONG>enter_horizontal_hl_mode</STRONG>   <STRONG>ehhlm</STRONG>     <STRONG>Xh</STRONG>  Enter horizontal highlight
                                                 mode
-
        <STRONG>enter_left_hl_mode</STRONG>         <STRONG>elhlm</STRONG>     <STRONG>Xl</STRONG>  Enter left highlight mode
        <STRONG>enter_low_hl_mode</STRONG>          <STRONG>elohlm</STRONG>    <STRONG>Xo</STRONG>  Enter low highlight mode
        <STRONG>enter_right_hl_mode</STRONG>        <STRONG>erhlm</STRONG>     <STRONG>Xr</STRONG>  Enter right highlight mode
@@ -2046,6 +2050,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>ACS_BOARD</STRONG>     0x68      h      <STRONG>#</STRONG>  board of squares
        <STRONG>ACS_LANTERN</STRONG>   0x69      i      <STRONG>#</STRONG>  lantern symbol
        <STRONG>ACS_LRCORNER</STRONG>  0x6a      j      <STRONG>+</STRONG>  lower right corner
+
        <STRONG>ACS_URCORNER</STRONG>  0x6b      k      <STRONG>+</STRONG>  upper right corner
        <STRONG>ACS_ULCORNER</STRONG>  0x6c      l      <STRONG>+</STRONG>  upper left corner
        <STRONG>ACS_LLCORNER</STRONG>  0x6d      m      <STRONG>+</STRONG>  lower left corner
@@ -2215,7 +2220,6 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                         <STRONG>A_LOW</STRONG>          11      2048    <STRONG>sgr1</STRONG>
                         <STRONG>A_RIGHT</STRONG>        12      4096    <STRONG>sgr1</STRONG>
                         <STRONG>A_TOP</STRONG>          13      8192    <STRONG>sgr1</STRONG>
-
                         <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
                         <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
diff --git a/include/Caps b/include/Caps
index b20820347..11b019c43 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.53 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps,v 1.54 2024/03/02 14:35:19 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -402,6 +402,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -464,6 +468,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -530,6 +538,10 @@ key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
 key_suspend			kspd	str	&7	KEY_SUSPEND	0627	-----	suspend key
 key_undo			kund	str	&8	KEY_UNDO	0630	-----	undo key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
@@ -592,6 +604,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
@@ -660,6 +676,10 @@ change_res_horz			chr	str	ZC	-		-	-----	Change horizontal resolution to #1
 change_res_vert			cvr	str	ZD	-		-	-----	Change vertical resolution to #1
 define_char			defc	str	ZE	-		-	-----	Define a character #1, #2 dots wide, descender #3
 enter_doublewide_mode		swidm	str	ZF	-		-	-----	Enter double-wide mode
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality		sdrfq	str	ZG	-		-	-----	Enter draft-quality mode
 enter_italics_mode		sitm	str	ZH	-		-	-----	Enter italic mode
 enter_leftward_mode		slm	str	ZI	-		-	-----	Start leftward carriage motion
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 591c6efa2..71b295a18 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.25 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps.aix4,v 1.26 2024/03/02 14:35:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -402,6 +402,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -464,6 +468,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -612,6 +620,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
@@ -685,6 +697,10 @@ key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
 key_suspend			kspd	str	&7	KEY_SUSPEND	0627	-----	suspend key
 key_undo			kund	str	&8	KEY_UNDO	0630	-----	undo key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
@@ -762,6 +778,10 @@ change_res_horz			chr	str	ZC	-		-	-----	Change horizontal resolution to #1
 change_res_vert			cvr	str	ZD	-		-	-----	Change vertical resolution to #1
 define_char			defc	str	ZE	-		-	-----	Define a character #1, #2 dots wide, descender #3
 enter_doublewide_mode		swidm	str	ZF	-		-	-----	Enter double-wide mode
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality		sdrfq	str	ZG	-		-	-----	Enter draft-quality mode
 enter_italics_mode		sitm	str	ZH	-		-	-----	Enter italic mode
 enter_leftward_mode		slm	str	ZI	-		-	-----	Start leftward carriage motion
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 594f03223..7876b2d88 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.23 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps.hpux11,v 1.24 2024/03/02 14:35:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -404,6 +404,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -466,6 +470,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -531,6 +539,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
@@ -591,6 +603,10 @@ key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
 key_suspend			kspd	str	&7	KEY_SUSPEND	0627	-----	suspend key
 key_undo			kund	str	&8	KEY_UNDO	0630	-----	undo key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
@@ -668,6 +684,10 @@ change_res_horz			chr	str	ZC	-		-	-----	Change horizontal resolution to #1
 change_res_vert			cvr	str	ZD	-		-	-----	Change vertical resolution to #1
 define_char			defc	str	ZE	-		-	-----	Define a character #1, #2 dots wide, descender #3
 enter_doublewide_mode		swidm	str	ZF	-		-	-----	Enter double-wide mode
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality		sdrfq	str	ZG	-		-	-----	Enter draft-quality mode
 enter_italics_mode		sitm	str	ZH	-		-	-----	Enter italic mode
 enter_leftward_mode		slm	str	ZI	-		-	-----	Start leftward carriage motion
diff --git a/include/Caps.keys b/include/Caps.keys
index 0017f1841..1ee3b1e40 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.22 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps.keys,v 1.23 2024/03/02 14:35:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -405,6 +405,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -467,6 +471,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -533,6 +541,10 @@ key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
 key_suspend			kspd	str	&7	KEY_SUSPEND	0627	-----	suspend key
 key_undo			kund	str	&8	KEY_UNDO	0630	-----	undo key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
@@ -595,6 +607,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
@@ -751,6 +767,10 @@ change_res_horz			chr	str	ZC	-		-	-----	Change horizontal resolution to #1
 change_res_vert			cvr	str	ZD	-		-	-----	Change vertical resolution to #1
 define_char			defc	str	ZE	-		-	-----	Define a character #1, #2 dots wide, descender #3
 enter_doublewide_mode		swidm	str	ZF	-		-	-----	Enter double-wide mode
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality		sdrfq	str	ZG	-		-	-----	Enter draft-quality mode
 enter_italics_mode		sitm	str	ZH	-		-	-----	Enter italic mode
 enter_leftward_mode		slm	str	ZI	-		-	-----	Start leftward carriage motion
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index c766a2519..245d2d2ce 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.21 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps.osf1r5,v 1.22 2024/03/02 14:35:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -385,6 +385,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -447,6 +451,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -602,6 +610,10 @@ ena_acs				enacs	str	eA	-		-	-----	enable alternate char set
 end_bit_image_region		endbi	str	Yy	-		-	-----	End a bit-image region
 enter_am_mode			smam	str	SA	-		-	-----	turn on automatic margins
 enter_doublewide_mode		swidm	str	ZF	-		-	-----	Enter double-wide mode
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality		sdrfq	str	ZG	-		-	-----	Enter draft-quality mode
 enter_italics_mode		sitm	str	ZH	-		-	-----	Enter italic mode
 enter_leftward_mode		slm	str	ZI	-		-	-----	Start leftward carriage motion
@@ -648,6 +660,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
@@ -686,6 +702,10 @@ key_replace			krpl	str	&3	KEY_REPLACE	0566	-----	replace key
 key_restart			krst	str	&4	KEY_RESTART	0567	-----	restart key
 key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 755c76974..4539109ba 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.20 2024/01/20 16:51:41 Branden.Robinson Exp $
+# $Id: Caps.uwin,v 1.21 2024/03/02 14:35:19 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -363,6 +363,10 @@ key_ctab			kctab	str	kt	KEY_CTAB	0525	-B-G-*	clear-tab key
 key_dc				kdch1	str	kD	KEY_DC		0512	YB-G-	delete-character key
 key_dl				kdl1	str	kL	KEY_DL		0510	-B-G-*	delete-line key
 key_down			kcud1	str	kd	KEY_DOWN	0402	YBCGE	down-arrow key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 key_eic				krmir	str	kM	KEY_EIC		0514	-B-G-*	sent by rmir or smir in insert mode
 key_eol				kel	str	kE	KEY_EOL		0517	-B-G-*	clear-to-end-of-line key
 key_eos				ked	str	kS	KEY_EOS		0516	-B-G-*	clear-to-end-of-screen key
@@ -425,6 +429,10 @@ prtr_on				mc5	str	po	-		-	-B-G-*	turn on printer
 repeat_char			rep	str	rp	-		-	YB-GE	repeat char #1 #2 times (P*)
 reset_1string			rs1	str	r1	-		-	-B---	reset string
 reset_2string			rs2	str	r2	-		-	-B---	reset string
+#%.TE
+#%.TS
+#%center;
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 reset_3string			rs3	str	r3	-		-	-B---	reset string
 reset_file			rf	str	rf	-		-	-B---	name of reset file
 restore_cursor			rc	str	rc	-		-	YBCG-	restore cursor to position of last save_cursor
@@ -491,6 +499,10 @@ key_resume			kres	str	&5	KEY_RESUME	0570	-----	resume key
 key_save			ksav	str	&6	KEY_SAVE	0571	-----	save key
 key_suspend			kspd	str	&7	KEY_SUSPEND	0627	-----	suspend key
 key_undo			kund	str	&8	KEY_UNDO	0630	-----	undo key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 key_sbeg			kBEG	str	&9	KEY_SBEG	0572	-----	shifted begin key
 key_scancel			kCAN	str	&0	KEY_SCANCEL	0573	-----	shifted cancel key
 key_scommand			kCMD	str	*1	KEY_SCOMMAND	0574	-----	shifted command key
@@ -553,6 +565,10 @@ key_f39				kf39	str	FT	KEY_F(39)	-	----E	F39 function key
 key_f40				kf40	str	FU	KEY_F(40)	-	----E	F40 function key
 key_f41				kf41	str	FV	KEY_F(41)	-	----E	F41 function key
 key_f42				kf42	str	FW	KEY_F(42)	-	----E	F42 function key
+#%.TE
+#%.TS
+#%center;
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 key_f43				kf43	str	FX	KEY_F(43)	-	----E	F43 function key
 key_f44				kf44	str	FY	KEY_F(44)	-	----E	F44 function key
 key_f45				kf45	str	FZ	KEY_F(45)	-	----E	F45 function key
diff --git a/include/ncurses_defs b/include/ncurses_defs
index d2400c335..c0da3ad53 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,6 +1,6 @@
-# $Id: ncurses_defs,v 1.109 2023/05/06 17:07:27 tom Exp $
+# $Id: ncurses_defs,v 1.110 2024/03/02 20:38:23 tom Exp $
 ##############################################################################
-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -55,6 +55,7 @@ HAVE_CLOCK_GETTIME
 HAVE_COLOR_CONTENT	1
 HAVE_COLOR_SET	1
 HAVE_CONSISTENT_GETENV
+HAVE_CONSISTENT_MB_LEN_MAX
 HAVE_COPYWIN	1
 HAVE_CURSCR	1
 HAVE_CURSES_DATA_TABSIZE	1
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index bd98b7d05..040c7c9b6 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.58 2023/12/23 16:28:31 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.59 2024/03/02 16:34:25 tom Exp $
+.TH @CAPTOINFO@ 1M 2024-03-02 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,9 +90,10 @@ It issues a diagnostic to the standard error stream for each,
 inviting the user to check that it has not mistakenly translated an
 unknown or mistyped capability name.
 .PP
+.\" DWB 3.3 tbl requires the two junk "L" specifiers in the first row.
 .TS
 center;
-Cb S
+Cb S  L  L
 Cb Cb Cb Cb
 Cb Cb C  Lb.
 Name
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 3053c350b..17df9d799 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.96 2024/01/13 22:05:39 tom Exp $
-.TH curs_attr 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.97 2024/03/02 16:34:00 tom Exp $
+.TH curs_attr 3X 2024-03-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -512,7 +512,7 @@ but not necessarily the reverse.
 .PP
 .TS
 Lb  Lb Lb  Cb  S   Lb
-Lb2 Lb Lb2 Lbz Lb2 Lb
+Lb2 Lb Lb2 Lb2 Lb2 Lb
 L   L  L   L   L   Lx.
 \&	\&	\&	Bits	\&
 Year	System	Arch	Color	Char	Notes
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index f2a737cbc..64dbd10e1 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.44 2024/02/24 20:01:11 tom Exp $
-.TH curs_trace 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.45 2024/03/02 16:34:00 tom Exp $
+.TH curs_trace 3X 2024-03-02 "ncurses 6.4" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,6 +44,17 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.
+.de dS \" Start unfilled display.
+.nr aD \n(.j
+.na
+..
+.
+.de dE \" End unfilled display.
+.ad \n(.j
+.rr aD
+..
+.
 .SH NAME
 \fB\%curses_trace\fP,
 \fB\%trace\fP,
@@ -192,27 +203,6 @@ Some tracing features are enabled whenever the \fBcurses_trace\fP parameter
 is nonzero.
 Some features overlap.
 The specific names are used as a guideline.
-.SS Initialization
-These functions check the \fI\%NCURSES_TRACE\fP environment variable,
-to set the tracing feature as if \fBcurses_trace\fP was called:
-.RS 4
-.na
-.PP
-\fB\%filter\fP,
-\fB\%initscr\fP,
-\fB\%new_prescr\fP,
-\fB\%newterm\fP,
-\fB\%nofilter\fP,
-\fB\%restartterm\fP,
-\fB\%ripoffline\fP,
-\fB\%setupterm\fP,
-\fB\%slk_init\fP,
-\fB\%tgetent\fP,
-\fB\%use_env\fP,
-\fB\%use_extended_names\fP,
-\fB\%use_tioctl\fP
-.RE
-.ad
 .SS "Command-line Utilities"
 The command-line utilities such as \fBtic\fP(1) provide a verbose option
 which extends the set of messages written using the \fBcurses_trace\fP function.
@@ -235,6 +225,30 @@ 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\fP routine.
+.SH ENVIRONMENT
+.SS NCURSES_TRACE
+A positive integral value stored in this variable causes the following
+functions to enable the tracing feature as if
+.B \%curses_trace
+were called.
+.PP
+.dS
+.RS 4
+\fB\%filter\fP,
+\fB\%initscr\fP,
+\fB\%new_prescr\fP,
+\fB\%newterm\fP,
+\fB\%nofilter\fP,
+\fB\%restartterm\fP,
+\fB\%ripoffline\fP,
+\fB\%setupterm\fP,
+\fB\%slk_init\fP,
+\fB\%tgetent\fP,
+\fB\%use_env\fP,
+\fB\%use_extended_names\fP,
+\fB\%use_tioctl\fP
+.RE
+.dE
 .SH PORTABILITY
 These functions are not part of the XSI interface.
 Some other curses implementations are known to
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 5df0468c5..19a5c7494 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.69 2024/01/05 21:46:58 tom Exp $
+# $Id: man_db.renames.in,v 1.70 2024/03/02 14:23:26 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -220,10 +220,13 @@ newterm.3x			newterm.3ncurses
 newwin.3x			newwin.3ncurses
 nodelay.3x			nodelay.3ncurses
 notimeout.3x			notimeout.3ncurses
+pnoutrefresh.3x			pnoutrefresh.3ncurses
+prefresh.3x			prefresh.3ncurses
 putwin.3x			putwin.3ncurses
 refresh.3x			refresh.3ncurses
 reset_shell_mode.3x		reset_shell_mode.3ncurses
 restartterm.3x			restartterm.3ncurses
+ripoffline.3x			ripoffline.3ncurses
 scrollok.3x			scrollok.3ncurses
 set_curterm.3x			set_curterm.3ncurses
 set_term.3x			set_term.3nses
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 6f48d1600..9bc31e4d8 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.143 2024/01/13 22:05:39 tom Exp $
+.\" $Id: terminfo.tail,v 1.144 2024/03/02 14:36:39 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -1695,6 +1695,8 @@ magenta	COLOR_MAGENTA	5	max,	0,	max
 cyan	COLOR_CYAN	6	0,	max,	max
 white	COLOR_WHITE	7	max,	max,	max
 .TE
+.br
+.if t .ne 6v
 .PP
 The argument values of \fBsetf\fP/\fBsetb\fP historically correspond to
 a different mapping, i.e.,
diff --git a/ncurses/term.priv.h b/ncurses/term.priv.h
index 7b2579c85..1f436b5f8 100644
--- a/ncurses/term.priv.h
+++ b/ncurses/term.priv.h
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /*
- * $Id: term.priv.h,v 1.12 2024/02/24 18:11:38 tom Exp $
+ * $Id: term.priv.h,v 1.13 2024/03/02 20:43:06 tom Exp $
  *
  *	term.priv.h
  *
@@ -73,7 +73,7 @@ extern "C" {
  * If not properly configured to use the system's limits.h, we get gcc's
  * fallback for limits.h which sets MB_LEN_MAX to 1, which is never correct.
  */
-#if defined(MB_LEN_MAX) && (MB_LEN_MAX < 6)
+#if !HAVE_CONSISTENT_MB_LEN_MAX
 #undef MB_LEN_MAX
 #endif
 
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 4752ba899..f50c1cf16 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.231 2024/02/04 00:09:34 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.232 2024/03/02 19:42:13 tom Exp $")
 
 /****************************************************************************
  *
@@ -384,8 +384,8 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
 	&& is_expected(user7, "6n")
 	&& is_expected(user6, "%i%d;%dR")
 	&& GET_TTY(fd, &saved) == OK) {
-	int current_y, current_x;
-	int updated_y, updated_x;
+	int current_y = -1, current_x = -1;
+	int updated_y = -1, updated_x = -1;
 	TTY alter = saved;
 
 	alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN);
diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 9980279b2..78a684cc8 100644
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2009-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: make_hash.c,v 1.33 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.34 2024/03/02 19:35:40 tom Exp $")
 
 /*
  *	_nc_make_hash_table()
@@ -250,7 +250,7 @@ main(int argc, char **argv)
     struct user_table_entry *name_table = typeCalloc(struct
 						     user_table_entry, tablesize);
     HashValue *hash_table = typeCalloc(HashValue, HASHTABSIZE);
-    const char *root_name = "";
+    const char *root_name;
     int column = 0;
     int bigstring = 0;
     unsigned n;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index a50d96d3c..6b7284094 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240224) unstable; urgency=low
+ncurses6 (6.4+20240302) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index a50d96d3c..6b7284094 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240224) unstable; urgency=low
+ncurses6 (6.4+20240302) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d28223a10..0ba1f2db6 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240224) unstable; urgency=low
+ncurses6 (6.4+20240302) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Feb 2024 06:49:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 33343eb58..710d81a57 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.634 2024/02/24 11:49:33 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.635 2024/03/02 11:13:41 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0224"
+!define VERSION_MMDD  "0302"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index cefc47874..0c5a4a167 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240224
+Release: 20240302
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1a45e4ae3..29163b358 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240224
+Release: 20240302
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 03ff7bd04..5fb77d73b 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240224
+Release: 20240302
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tic.c b/progs/tic.c
index ae65e6317..fc77b3444 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.324 2023/11/04 19:43:43 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.325 2024/03/02 19:33:22 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -704,7 +704,7 @@ main(int argc, char *argv[])
     bool forceresolve = FALSE;	/* force resolution */
     bool limited = TRUE;
     char *tversion = (char *) NULL;
-    const char *source_file = "terminfo";
+    const char *source_file;
     char *outdir = (char *) NULL;
     bool check_only = FALSE;
     bool suppress_untranslatable = FALSE;
diff --git a/progs/tput.c b/progs/tput.c
index 41508b727..46fcafbe3 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.102 2023/04/08 16:26:36 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.103 2024/03/02 13:22:26 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -283,7 +283,7 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	    provided = 0;
 	    for (narg = 1; narg < argc; ++narg) {
 		char *ending = NULL;
-		long check = strtol(argv[narg], &ending, 10);
+		long check = strtol(argv[narg], &ending, 0);
 		if (check < 0 || ending == argv[narg] || *ending != '\0')
 		    break;
 		provided = narg;

From dd2d60372843d2eae502cef4035d37764de9777c Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 10 Mar 2024 01:28:08 +0100
Subject: [PATCH 057/106] ncurses-6.4-20240309.patch

---
 NEWS                             |  6 +++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 misc/terminfo.src                | 18 +++++++++++++-----
 package/debian-mingw/changelog   |  4 ++--
 package/debian-mingw64/changelog |  4 ++--
 package/debian/changelog         |  4 ++--
 package/mingw-ncurses.nsi        |  4 ++--
 package/mingw-ncurses.spec       |  2 +-
 package/ncurses.spec             |  2 +-
 package/ncursest.spec            |  2 +-
 11 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index 75b4bf1f4..710de1b87 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4089 2024/03/02 20:47:38 tom Exp $
+-- $Id: NEWS,v 1.4091 2024/03/09 22:33:41 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240309
+	+ modify xgterm to work around line-drawing bug -TD
+	+ use CSI 3J in vte-2017 (report by Sven Joachim)
+
 20240302
 	+ add configure check for MB_LEN_MAX, to provide warning as needed.
 	+ improve formatting/style of manpages (patches by Branden Robinson).
diff --git a/VERSION b/VERSION
index 6269f3b73..89ea57d36 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240302
+5:0:10	6.4	20240309
diff --git a/dist.mk b/dist.mk
index 8cd1e5e80..510fc5192 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1600 2024/03/02 11:13:41 tom Exp $
+# $Id: dist.mk,v 1.1601 2024/03/09 13:05:08 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240302
+NCURSES_PATCH = 20240309
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 182b8936f..5d575b8eb 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1140 $
-#	$Date: 2024/02/11 20:09:01 $
+#	$Revision: 1.1143 $
+#	$Date: 2024/03/09 20:01:40 $
 #
 # 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
@@ -6037,7 +6037,11 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X,
 # does nothing with those, even after installing the app-defaults file which
 # was overlooked by the Debian packager.
 xgterm|graphic terminal for IRAF,
-	use=xterm+acs, use=xterm-r5, use=xterm+keypad,
+	enacs=\E(B\E)0, rmacs=^O,
+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
+	    \016%e\017%;,
+	sgr0=\E[m\017, smacs=^N, use=xterm+acs, use=xterm-r5,
+	use=xterm+keypad,
 
 # The 'nxterm' distributed with Redhat Linux 5.2 is a slight rehack of
 # xterm-sb_right-ansi-3d, which implements ANSI colors, but does not support
@@ -6248,7 +6252,7 @@ vte-2014|VTE 0.35.1,
 # As of January 2018, this was the  most recent release,
 # e.g., with gnome-terminal 3.26.2
 vte-2017|VTE 0.50.2,
-	use=ecma+strikeout, use=vte-2014,
+	E3=\E[3J, use=ecma+strikeout, use=vte-2014,
 
 # VTE 0.51.2 and gnome-terminal 3.28.2 copied a feature from KovId's TTY
 # late in 2017 for changing the appearance of underlines, which was
@@ -27498,8 +27502,12 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  to trim -TD
 #	+ NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner)
 #
-# 2024-02011
+# 2024-02-11
 #	+ add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from
 #	  xterm #389 -TD
 #
+# 2024-03-09
+#	+ modify xgterm to work around line-drawing bug -TD
+#	+ use CSI 3J in vte-2017 (report by Sven Joachim)
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6b7284094..9bdf93892 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240302) unstable; urgency=low
+ncurses6 (6.4+20240309) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6b7284094..9bdf93892 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240302) unstable; urgency=low
+ncurses6 (6.4+20240309) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 0ba1f2db6..7343f67d2 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240302) unstable; urgency=low
+ncurses6 (6.4+20240309) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Mar 2024 06:13:41 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 710d81a57..317763812 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.635 2024/03/02 11:13:41 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.636 2024/03/09 13:05:08 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0302"
+!define VERSION_MMDD  "0309"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0c5a4a167..22d7abf6d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240302
+Release: 20240309
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 29163b358..2203a0776 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240302
+Release: 20240309
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 5fb77d73b..5b35f300c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240302
+Release: 20240309
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 013c48629d3ed2545ed7290a6deaaa94571aff0d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 24 Mar 2024 00:41:05 +0100
Subject: [PATCH 058/106] ncurses-6.4-20240323.patch

---
 NEWS                                       |   13 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |    8 +-
 configure                                  |   60 +-
 configure.in                               |   21 +-
 dist.mk                                    |    4 +-
 doc/html/man/captoinfo.1m.html             |   12 +-
 doc/html/man/clear.1.html                  |   10 +-
 doc/html/man/curs_add_wch.3x.html          |   29 +-
 doc/html/man/curs_add_wchstr.3x.html       |   14 +-
 doc/html/man/curs_addch.3x.html            |  356 +++---
 doc/html/man/curs_addchstr.3x.html         |   20 +-
 doc/html/man/curs_addstr.3x.html           |   60 +-
 doc/html/man/curs_addwstr.3x.html          |   68 +-
 doc/html/man/curs_attr.3x.html             |   12 +-
 doc/html/man/curs_beep.3x.html             |   10 +-
 doc/html/man/curs_bkgd.3x.html             |   14 +-
 doc/html/man/curs_bkgrnd.3x.html           |   18 +-
 doc/html/man/curs_border.3x.html           |   14 +-
 doc/html/man/curs_border_set.3x.html       |   10 +-
 doc/html/man/curs_clear.3x.html            |    8 +-
 doc/html/man/curs_color.3x.html            |   10 +-
 doc/html/man/curs_delch.3x.html            |   10 +-
 doc/html/man/curs_deleteln.3x.html         |   10 +-
 doc/html/man/curs_extend.3x.html           |   10 +-
 doc/html/man/curs_get_wch.3x.html          |  170 +--
 doc/html/man/curs_get_wstr.3x.html         |   10 +-
 doc/html/man/curs_getcchar.3x.html         |   10 +-
 doc/html/man/curs_getch.3x.html            |  547 +++++----
 doc/html/man/curs_getstr.3x.html           |   10 +-
 doc/html/man/curs_getyx.3x.html            |   10 +-
 doc/html/man/curs_in_wch.3x.html           |   10 +-
 doc/html/man/curs_in_wchstr.3x.html        |   10 +-
 doc/html/man/curs_inch.3x.html             |    8 +-
 doc/html/man/curs_inchstr.3x.html          |   10 +-
 doc/html/man/curs_initscr.3x.html          |    8 +-
 doc/html/man/curs_inopts.3x.html           |   24 +-
 doc/html/man/curs_ins_wch.3x.html          |   10 +-
 doc/html/man/curs_ins_wstr.3x.html         |   14 +-
 doc/html/man/curs_insch.3x.html            |   10 +-
 doc/html/man/curs_insstr.3x.html           |   14 +-
 doc/html/man/curs_instr.3x.html            |   10 +-
 doc/html/man/curs_inwstr.3x.html           |   10 +-
 doc/html/man/curs_kernel.3x.html           |    8 +-
 doc/html/man/curs_legacy.3x.html           |   10 +-
 doc/html/man/curs_memleaks.3x.html         |   10 +-
 doc/html/man/curs_mouse.3x.html            |   20 +-
 doc/html/man/curs_move.3x.html             |   10 +-
 doc/html/man/curs_opaque.3x.html           |   10 +-
 doc/html/man/curs_outopts.3x.html          |   14 +-
 doc/html/man/curs_overlay.3x.html          |    8 +-
 doc/html/man/curs_pad.3x.html              |   10 +-
 doc/html/man/curs_print.3x.html            |   10 +-
 doc/html/man/curs_printw.3x.html           |   14 +-
 doc/html/man/curs_refresh.3x.html          |   23 +-
 doc/html/man/curs_scanw.3x.html            |   16 +-
 doc/html/man/curs_scr_dump.3x.html         |   14 +-
 doc/html/man/curs_scroll.3x.html           |   16 +-
 doc/html/man/curs_slk.3x.html              |   10 +-
 doc/html/man/curs_sp_funcs.3x.html         |   10 +-
 doc/html/man/curs_termattrs.3x.html        |    8 +-
 doc/html/man/curs_termcap.3x.html          |   10 +-
 doc/html/man/curs_terminfo.3x.html         |  184 +--
 doc/html/man/curs_threads.3x.html          |    8 +-
 doc/html/man/curs_touch.3x.html            |   27 +-
 doc/html/man/curs_trace.3x.html            |    8 +-
 doc/html/man/curs_util.3x.html             |  111 +-
 doc/html/man/curs_variables.3x.html        |    8 +-
 doc/html/man/curs_window.3x.html           |   10 +-
 doc/html/man/default_colors.3x.html        |   10 +-
 doc/html/man/define_key.3x.html            |   10 +-
 doc/html/man/form.3x.html                  |   10 +-
 doc/html/man/form_cursor.3x.html           |   10 +-
 doc/html/man/form_data.3x.html             |   10 +-
 doc/html/man/form_driver.3x.html           |    8 +-
 doc/html/man/form_field.3x.html            |   10 +-
 doc/html/man/form_field_attributes.3x.html |   10 +-
 doc/html/man/form_field_buffer.3x.html     |   10 +-
 doc/html/man/form_field_info.3x.html       |   10 +-
 doc/html/man/form_field_just.3x.html       |   10 +-
 doc/html/man/form_field_new.3x.html        |   10 +-
 doc/html/man/form_field_opts.3x.html       |   10 +-
 doc/html/man/form_field_userptr.3x.html    |   10 +-
 doc/html/man/form_field_validation.3x.html |   10 +-
 doc/html/man/form_fieldtype.3x.html        |   10 +-
 doc/html/man/form_hook.3x.html             |    8 +-
 doc/html/man/form_new.3x.html              |   10 +-
 doc/html/man/form_new_page.3x.html         |   10 +-
 doc/html/man/form_opts.3x.html             |   10 +-
 doc/html/man/form_page.3x.html             |   10 +-
 doc/html/man/form_post.3x.html             |   10 +-
 doc/html/man/form_requestname.3x.html      |   10 +-
 doc/html/man/form_userptr.3x.html          |   10 +-
 doc/html/man/form_variables.3x.html        |   10 +-
 doc/html/man/form_win.3x.html              |   10 +-
 doc/html/man/infocmp.1m.html               |    8 +-
 doc/html/man/infotocap.1m.html             |   10 +-
 doc/html/man/key_defined.3x.html           |   10 +-
 doc/html/man/keybound.3x.html              |   10 +-
 doc/html/man/keyok.3x.html                 |   10 +-
 doc/html/man/legacy_coding.3x.html         |   10 +-
 doc/html/man/menu.3x.html                  |   10 +-
 doc/html/man/menu_attributes.3x.html       |   10 +-
 doc/html/man/menu_cursor.3x.html           |   10 +-
 doc/html/man/menu_driver.3x.html           |   10 +-
 doc/html/man/menu_format.3x.html           |   10 +-
 doc/html/man/menu_hook.3x.html             |   10 +-
 doc/html/man/menu_items.3x.html            |   10 +-
 doc/html/man/menu_mark.3x.html             |   10 +-
 doc/html/man/menu_new.3x.html              |   10 +-
 doc/html/man/menu_opts.3x.html             |   10 +-
 doc/html/man/menu_pattern.3x.html          |   10 +-
 doc/html/man/menu_post.3x.html             |   10 +-
 doc/html/man/menu_requestname.3x.html      |   10 +-
 doc/html/man/menu_spacing.3x.html          |   10 +-
 doc/html/man/menu_userptr.3x.html          |   10 +-
 doc/html/man/menu_win.3x.html              |   10 +-
 doc/html/man/mitem_current.3x.html         |   10 +-
 doc/html/man/mitem_name.3x.html            |   10 +-
 doc/html/man/mitem_new.3x.html             |   10 +-
 doc/html/man/mitem_opts.3x.html            |   10 +-
 doc/html/man/mitem_userptr.3x.html         |   10 +-
 doc/html/man/mitem_value.3x.html           |   10 +-
 doc/html/man/mitem_visible.3x.html         |   10 +-
 doc/html/man/ncurses.3x.html               |   87 +-
 doc/html/man/new_pair.3x.html              |   10 +-
 doc/html/man/panel.3x.html                 |   10 +-
 doc/html/man/resizeterm.3x.html            |   10 +-
 doc/html/man/scr_dump.5.html               |   16 +-
 doc/html/man/tabs.1.html                   |    8 +-
 doc/html/man/term.5.html                   |    8 +-
 doc/html/man/term.7.html                   |   10 +-
 doc/html/man/term_variables.3x.html        |   10 +-
 doc/html/man/terminfo.5.html               | 1268 ++++++++++----------
 doc/html/man/tic.1m.html                   |   10 +-
 doc/html/man/toe.1m.html                   |    8 +-
 doc/html/man/tput.1.html                   |   32 +-
 doc/html/man/tset.1.html                   |   10 +-
 doc/html/man/user_caps.5.html              |    8 +-
 doc/html/man/wresize.3x.html               |   10 +-
 include/Caps                               |   91 +-
 include/Caps.aix4                          |   91 +-
 include/Caps.hpux11                        |   91 +-
 include/Caps.keys                          |   91 +-
 include/Caps.osf1r5                        |   91 +-
 include/Caps.uwin                          |   91 +-
 man/captoinfo.1m                           |    8 +-
 man/clear.1                                |    6 +-
 man/curs_add_wch.3x                        |   18 +-
 man/curs_add_wchstr.3x                     |    8 +-
 man/curs_addch.3x                          |  513 +++++---
 man/curs_addchstr.3x                       |   17 +-
 man/curs_addstr.3x                         |   89 +-
 man/curs_addwstr.3x                        |  105 +-
 man/curs_attr.3x                           |    8 +-
 man/curs_beep.3x                           |    6 +-
 man/curs_bkgd.3x                           |   12 +-
 man/curs_bkgrnd.3x                         |   14 +-
 man/curs_border.3x                         |    8 +-
 man/curs_border_set.3x                     |    6 +-
 man/curs_clear.3x                          |    4 +-
 man/curs_color.3x                          |    6 +-
 man/curs_delch.3x                          |    6 +-
 man/curs_deleteln.3x                       |    6 +-
 man/curs_extend.3x                         |    6 +-
 man/curs_get_wch.3x                        |  293 +++--
 man/curs_get_wstr.3x                       |    6 +-
 man/curs_getcchar.3x                       |    6 +-
 man/curs_getch.3x                          |  815 ++++++++-----
 man/curs_getstr.3x                         |    6 +-
 man/curs_getyx.3x                          |    6 +-
 man/curs_in_wch.3x                         |    6 +-
 man/curs_in_wchstr.3x                      |    6 +-
 man/curs_inch.3x                           |    4 +-
 man/curs_inchstr.3x                        |    6 +-
 man/curs_initscr.3x                        |    4 +-
 man/curs_inopts.3x                         |   14 +-
 man/curs_ins_wch.3x                        |    6 +-
 man/curs_ins_wstr.3x                       |    8 +-
 man/curs_insch.3x                          |    6 +-
 man/curs_insstr.3x                         |    8 +-
 man/curs_instr.3x                          |    6 +-
 man/curs_inwstr.3x                         |    6 +-
 man/curs_kernel.3x                         |    4 +-
 man/curs_legacy.3x                         |    6 +-
 man/curs_memleaks.3x                       |    6 +-
 man/curs_mouse.3x                          |   16 +-
 man/curs_move.3x                           |    6 +-
 man/curs_opaque.3x                         |    6 +-
 man/curs_outopts.3x                        |    8 +-
 man/curs_overlay.3x                        |    4 +-
 man/curs_pad.3x                            |    6 +-
 man/curs_print.3x                          |    6 +-
 man/curs_printw.3x                         |   10 +-
 man/curs_refresh.3x                        |    6 +-
 man/curs_scanw.3x                          |   12 +-
 man/curs_scr_dump.3x                       |   10 +-
 man/curs_scroll.3x                         |   12 +-
 man/curs_slk.3x                            |    6 +-
 man/curs_sp_funcs.3x                       |    6 +-
 man/curs_termattrs.3x                      |    4 +-
 man/curs_termcap.3x                        |    6 +-
 man/curs_terminfo.3x                       |   46 +-
 man/curs_threads.3x                        |    4 +-
 man/curs_touch.3x                          |    8 +-
 man/curs_trace.3x                          |    4 +-
 man/curs_util.3x                           |    6 +-
 man/curs_variables.3x                      |    4 +-
 man/curs_window.3x                         |    6 +-
 man/default_colors.3x                      |    6 +-
 man/define_key.3x                          |    6 +-
 man/form.3x                                |    6 +-
 man/form_cursor.3x                         |    6 +-
 man/form_data.3x                           |    6 +-
 man/form_driver.3x                         |    4 +-
 man/form_field.3x                          |    6 +-
 man/form_field_attributes.3x               |    6 +-
 man/form_field_buffer.3x                   |    6 +-
 man/form_field_info.3x                     |    6 +-
 man/form_field_just.3x                     |    6 +-
 man/form_field_new.3x                      |    6 +-
 man/form_field_opts.3x                     |    6 +-
 man/form_field_userptr.3x                  |    6 +-
 man/form_field_validation.3x               |    6 +-
 man/form_fieldtype.3x                      |    6 +-
 man/form_hook.3x                           |    4 +-
 man/form_new.3x                            |    6 +-
 man/form_new_page.3x                       |    6 +-
 man/form_opts.3x                           |    6 +-
 man/form_page.3x                           |    6 +-
 man/form_post.3x                           |    6 +-
 man/form_requestname.3x                    |    6 +-
 man/form_userptr.3x                        |    6 +-
 man/form_variables.3x                      |    6 +-
 man/form_win.3x                            |    6 +-
 man/infocmp.1m                             |    4 +-
 man/infotocap.1m                           |    6 +-
 man/key_defined.3x                         |    6 +-
 man/keybound.3x                            |    6 +-
 man/keyok.3x                               |    6 +-
 man/legacy_coding.3x                       |    6 +-
 man/man_db.renames.in                      |   14 +-
 man/manhtml.aliases                        |   14 +-
 man/manhtml.externs                        |    3 +-
 man/menu.3x                                |    6 +-
 man/menu_attributes.3x                     |    6 +-
 man/menu_cursor.3x                         |    6 +-
 man/menu_driver.3x                         |    6 +-
 man/menu_format.3x                         |    6 +-
 man/menu_hook.3x                           |    6 +-
 man/menu_items.3x                          |    6 +-
 man/menu_mark.3x                           |    6 +-
 man/menu_new.3x                            |    6 +-
 man/menu_opts.3x                           |    6 +-
 man/menu_pattern.3x                        |    6 +-
 man/menu_post.3x                           |    6 +-
 man/menu_requestname.3x                    |    6 +-
 man/menu_spacing.3x                        |    6 +-
 man/menu_userptr.3x                        |    6 +-
 man/menu_win.3x                            |    6 +-
 man/mitem_current.3x                       |    6 +-
 man/mitem_name.3x                          |    6 +-
 man/mitem_new.3x                           |    6 +-
 man/mitem_opts.3x                          |    6 +-
 man/mitem_userptr.3x                       |    6 +-
 man/mitem_value.3x                         |    6 +-
 man/mitem_visible.3x                       |    6 +-
 man/ncurses.3x                             |   95 +-
 man/new_pair.3x                            |    6 +-
 man/panel.3x                               |    6 +-
 man/resizeterm.3x                          |    6 +-
 man/scr_dump.5                             |   12 +-
 man/tabs.1                                 |    4 +-
 man/term.5                                 |    4 +-
 man/term.7                                 |    6 +-
 man/term_variables.3x                      |    6 +-
 man/tic.1m                                 |    6 +-
 man/toe.1m                                 |    4 +-
 man/tput.1                                 |   28 +-
 man/tset.1                                 |    6 +-
 man/user_caps.5                            |    4 +-
 man/wresize.3x                             |    6 +-
 ncurses/tinfo/lib_setup.c                  |   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 +-
 package/ncursest.spec                      |    2 +-
 progs/tset.c                               |   12 +-
 291 files changed, 4295 insertions(+), 3503 deletions(-)

diff --git a/NEWS b/NEWS
index 710de1b87..ffa3b362b 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4091 2024/03/09 22:33:41 tom Exp $
+-- $Id: NEWS,v 1.4097 2024/03/23 10:33:40 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240323
+	+ modify tput/tset reset feature to avoid 1-second sleep if running in
+	  a pseudo-terminal.
+	+ modify check-size feature to avoid using it in a pseudoterminal
+	  (cf: 20231016)
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ trim a space after some "-R" options, fixing builds for applications
+	  built using clang and ncurses on Solaris.
+
 20240309
 	+ modify xgterm to work around line-drawing bug -TD
 	+ use CSI 3J in vte-2017 (report by Sven Joachim)
@@ -58,7 +67,7 @@ it is not possible to add this information.
 	+ update config.guess, config.sub
 
 20240224
-	+ improve man/curs_mouse.3x style (Brandon Robinson, Sven Joachim).
+	+ improve man/curs_mouse.3x style (Branden Robinson, Sven Joachim).
 	+ provide for CCHARW_MAX greater than 1
 	+ eliminate use of PATH_MAX in lib_trace.c
 	+ work around misconfiguration of MacPorts gcc13, which exposes invalid
diff --git a/VERSION b/VERSION
index 89ea57d36..bd59079dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240309
+5:0:10	6.4	20240323
diff --git a/aclocal.m4 b/aclocal.m4
index 96d04519d..8335b4fd9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1063 2024/03/02 20:46:07 tom Exp $
+dnl $Id: aclocal.m4,v 1.1065 2024/03/12 23:45:44 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -7420,7 +7420,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 109 updated: 2023/12/03 09:21:34
+dnl CF_SHARED_OPTS version: 110 updated: 2024/03/12 19:44:02
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -7880,11 +7880,11 @@ CF_EOF
 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
 		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
 		if test "$DFT_LWR_MODEL" = "shared" ; then
-			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+			LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}"
 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
 		fi
 		if test "$cf_cv_enable_rpath" = yes ; then
-			EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+			EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS"
 		fi
 		CF_SHARED_SONAME
 		if test "$GCC" != yes; then
diff --git a/configure b/configure
index c16320864..097331866 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.775 .
+# From configure.in Revision: 1.776 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -836,12 +836,12 @@ Reentrant Code:
   --with-wrap-prefix=XXX  override prefix used for public variables
 Development Code:
   --without-develop       disable development options
+  --enable-check-size     compile-in code to detect screensize of serial terminals
   --enable-hard-tabs      compile with hard-tabs code
   --enable-xmc-glitch     compile with support for xmc (magic-cookie)
 Experimental Code:
   --disable-assumed-color do not assume anything about default-colors
   --disable-hashmap       compile without hashmap scrolling-optimization
-  --enable-check-size     compile-in code to detect screensize
   --enable-colorfgbg      compile-in experimental $COLORFGBG code
   --enable-fvisibility    compile with -fvisibility=hidden
   --enable-interop        compile-in interop bindings
@@ -7070,11 +7070,11 @@ CF_EOF
 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
 		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
 		if test "$DFT_LWR_MODEL" = "shared" ; then
-			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+			LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}"
 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
 		fi
 		if test "$cf_cv_enable_rpath" = yes ; then
-			EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+			EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS"
 		fi
 
 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -16375,8 +16375,26 @@ fi;
 echo "$as_me:16375: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
+###   use option --enable-check-size to detect screensize with CPR
+echo "$as_me:16379: checking if you want to check screensize of serial terminals" >&5
+echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+
+# Check whether --enable-check-size or --disable-check-size was given.
+if test "${enable_check_size+set}" = set; then
+  enableval="$enable_check_size"
+
+else
+  enable_check_size=$with_develop
+fi;
+echo "$as_me:16389: result: $enable_check_size" >&5
+echo "${ECHO_T}$enable_check_size" >&6
+test "x$enable_check_size" = xyes &&
+cat >>confdefs.h <<\EOF
+#define USE_CHECK_SIZE 1
+EOF
+
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16379: checking if you want hard-tabs code" >&5
+echo "$as_me:16397: 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.
@@ -16386,7 +16404,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16389: result: $enable_hard_tabs" >&5
+echo "$as_me:16407: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16394,7 +16412,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16397: checking if you want limited support for xmc" >&5
+echo "$as_me:16415: 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.
@@ -16404,7 +16422,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16407: result: $enable_xmc_glitch" >&5
+echo "$as_me:16425: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16414,7 +16432,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16417: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16435: 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.
@@ -16424,7 +16442,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16427: result: $with_assumed_color" >&5
+echo "$as_me:16445: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16432,7 +16450,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16435: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16453: 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.
@@ -16442,31 +16460,13 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16445: result: $with_hashmap" >&5
+echo "$as_me:16463: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_HASHMAP 1
 EOF
 
-###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16453: checking if you want code to check screensize" >&5
-echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6
-
-# Check whether --enable-check-size or --disable-check-size was given.
-if test "${enable_check_size+set}" = set; then
-  enableval="$enable_check_size"
-  with_check_size=$enableval
-else
-  with_check_size=no
-fi;
-echo "$as_me:16463: result: $with_check_size" >&5
-echo "${ECHO_T}$with_check_size" >&6
-test "x$with_check_size" = xyes &&
-cat >>confdefs.h <<\EOF
-#define USE_CHECK_SIZE 1
-EOF
-
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 echo "$as_me:16471: checking if you want colorfgbg code" >&5
 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 1d70ea0f0..280313058 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.775 2024/03/02 20:22:33 tom Exp $
+dnl $Id: configure.in,v 1.776 2024/03/17 00:08:03 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.775 $)
+AC_REVISION($Revision: 1.776 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1470,6 +1470,14 @@ AC_ARG_WITH(develop,
 	[with_develop=no])
 AC_MSG_RESULT($with_develop)
 
+###   use option --enable-check-size to detect screensize with CPR
+AC_MSG_CHECKING(if you want to check screensize of serial terminals)
+AC_ARG_ENABLE(check-size,
+	[  --enable-check-size     compile-in code to detect screensize of serial terminals],,
+	[enable_check_size=$with_develop])
+AC_MSG_RESULT($enable_check_size)
+test "x$enable_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize])
+
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
 AC_MSG_CHECKING(if you want hard-tabs code)
 AC_ARG_ENABLE(hard-tabs,
@@ -1507,15 +1515,6 @@ AC_ARG_ENABLE(hashmap,
 AC_MSG_RESULT($with_hashmap)
 test "x$with_hashmap" = xyes && AC_DEFINE(USE_HASHMAP,1,[Define to 1 to compile with hashmap scrolling-optimization])
 
-###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-AC_MSG_CHECKING(if you want code to check screensize)
-AC_ARG_ENABLE(check-size,
-	[  --enable-check-size     compile-in code to detect screensize],
-	[with_check_size=$enableval],
-	[with_check_size=no])
-AC_MSG_RESULT($with_check_size)
-test "x$with_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize])
-
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 AC_MSG_CHECKING(if you want colorfgbg code)
 AC_ARG_ENABLE(colorfgbg,
diff --git a/dist.mk b/dist.mk
index 510fc5192..9f1a1f43f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1601 2024/03/09 13:05:08 tom Exp $
+# $Id: dist.mk,v 1.1603 2024/03/23 10:33:40 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240309
+NCURSES_PATCH = 20240323
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 7b12b0ee5..fcf71ff7c 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.59 2024/03/02 16:34:25 tom Exp @
+  * @Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2024-03-02 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2024-03-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2024-03-02 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -67,7 +67,7 @@ <H1 class="no-header">captoinfo 1m 2024-03-02 ncurses 6.4 User commands</H1>
        environment  variable  <EM>TERMCAP</EM>  as  a  file name, and extracts only the
        entry for the terminal named in the environment variable <EM>TERM</EM> from  it.
        If  the  environment  variable  <EM>TERMCAP</EM>  is  not  set,  <STRONG>captoinfo</STRONG> reads
-       <EM>/etc/termcap.</EM>
+       <EM>/etc/termcap</EM>.
 
        This utility is implemented as a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, with the latter's  <STRONG>-I</STRONG>
        option  implied.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-1</STRONG>, <STRONG>-f</STRONG>, <STRONG>-v</STRONG>, <STRONG>-w</STRONG>,
@@ -178,7 +178,7 @@ <H1 class="no-header">captoinfo 1m 2024-03-02 ncurses 6.4 User commands</H1>
        program.
 
        SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from <STRONG>tic</STRONG>.  Its
-       <STRONG>-v</STRONG> option does not accept a trace level argument <EM>n;</EM> repeat <STRONG>-v</STRONG>  <EM>n</EM>  times
+       <STRONG>-v</STRONG> option does not accept a trace level argument <EM>n</EM>; repeat <STRONG>-v</STRONG>  <EM>n</EM>  times
        instead.
 
        NetBSD does not provide this application.
@@ -194,7 +194,7 @@ <H1 class="no-header">captoinfo 1m 2024-03-02 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-02                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.4                       2024-03-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 0d64aea2b..a6dbfb607 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp @
+  * @Id: clear.1,v 1.48 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -148,7 +148,7 @@ <H1 class="no-header">clear 1 2023-12-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.4                       2024-03-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 565227c3b..a9bd6c504 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.53 2024/01/13 22:05:39 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.57 2024/03/23 19:58:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -200,8 +200,8 @@ <H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error
+       X/Open  Curses  does  not   specify   any   error   conditions.    This
+       implementation returns an error
 
        <STRONG>o</STRONG>   if the window pointer is null or
 
@@ -244,9 +244,9 @@ <H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
            misdefined  symbols  are the arrows and other symbols which are not
            used for line-drawing.
 
-       X/Open Curses does not define symbols for thick- or double-lines.  SVr4
-       curses  implementations  defined their line-drawing symbols in terms of
-       intermediate  symbols.   This  implementation  extends  those  symbols,
+       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
+       SVr4 curses implementations defined their line-drawing symbols in terms
+       of intermediate symbols.  This implementation  extends  those  symbols,
        providing new definitions which are not in the SVr4 implementations.
 
        Not  all  Unicode-capable  terminals  provide  support  for VT100-style
@@ -315,13 +315,19 @@ <H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
        active (base) spacing character.
 
 
+</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
+       The <STRONG>TABSIZE</STRONG> variable is implemented  in  SVr4  and  other  versions  of
+       <EM>curses</EM>, but is not specified by X/Open Curses (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,      <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,  <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
 
-ncurses 6.4                       2024-01-13                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -340,6 +346,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-WACS-Symbols">WACS Symbols</a></li>
 <li><a href="#h3-Complex-Characters">Complex Characters</a></li>
+<li><a href="#h3-TABSIZE">TABSIZE</a></li>
 </ul>
 </li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 3bced1827..ae3aa244a 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.32 2023/11/25 14:01:49 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.34 2024/03/16 19:44:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -97,8 +97,8 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</H
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
-       returns an error
+       X/Open   Curses   does   not   specify   any  error  conditions.   This
+       implementation returns an error
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -123,7 +123,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 0eeb8b94c..be7a59bb2 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.76 2023/12/23 16:27:51 tom Exp @
+  * @Id: curs_addch.3x,v 1.81 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -67,248 +67,242 @@ <H1 class="no-header">curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Adding-Characters">Adding Characters</a></H3><PRE>
-       The <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG> and <STRONG>mvwaddch</STRONG> routines put the  character  <EM>ch</EM>
-       into  the  given  window  at its current window position, which is then
-       advanced.  They are analogous to the standard C  library's  <STRONG>putchar(3)</STRONG>.
-       If the advance is at the right margin:
+       <STRONG>waddch</STRONG> puts the character <EM>ch</EM> at the cursor position of window <EM>win</EM>, then
+       advances  the  cursor position, analogously to the standard C library's
+       <STRONG>putchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
-       <STRONG>o</STRONG>   The cursor automatically wraps to the beginning of the next line.
+       If advancement occurs at the right margin,
 
-       <STRONG>o</STRONG>   At  the bottom of the current scrolling region, and if <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>
-           is enabled, the scrolling region is scrolled up one line.
+       <STRONG>o</STRONG>   the cursor automatically wraps to the beginning of the  next  line;
+           and
 
-       <STRONG>o</STRONG>   If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is not enabled, writing a character  at  the  lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line.
+       <STRONG>o</STRONG>   at  the bottom of the current scrolling region, and if <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>
+           is enabled for <EM>win</EM>, the scrolling region scrolls up one line.
 
-       If <EM>ch</EM> is a tab, newline, carriage return or backspace,  the  cursor  is
-       moved appropriately within the window:
+       If <EM>ch</EM> is a backspace, carriage return, line feed, or  tab,  the  cursor
+       moves appropriately within the window.
 
-       <STRONG>o</STRONG>   Backspace  moves the cursor one character left; at the left edge of
-           a window it does nothing.
+       <STRONG>o</STRONG>   Backspace  moves  the cursor one character left; at the left margin
+           of a window, it does nothing.
 
-       <STRONG>o</STRONG>   Carriage return moves the cursor to the window left margin  on  the
-           current line.
+       <STRONG>o</STRONG>   Carriage return moves the cursor to the left margin on the  current
+           line of the window.
 
-       <STRONG>o</STRONG>   Newline  does  a <STRONG>clrtoeol</STRONG>, then moves the cursor to the window left
-           margin on the next line, scrolling the window if on the last line.
+       <STRONG>o</STRONG>   Line  feed  does  a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then moves the cursor to the left
+           margin on the next line of the window, scrolling the window if  the
+           cursor was already on the last line.
 
-       <STRONG>o</STRONG>   Tabs are considered to be at every eighth column.  The tab interval
-           may be altered by setting the <STRONG>TABSIZE</STRONG> variable.
+       <STRONG>o</STRONG>   Tab  advances the cursor to the next tab stop (possibly on the next
+           line); these are placed at every eighth column by  default.   Alter
+           the    tab    interval    with    the    <STRONG>TABSIZE</STRONG>   extension;   see
+           <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       If  <EM>ch</EM>  is  any  other nonprintable character, it is drawn in printable
-       form, using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>:
+       If <EM>ch</EM> is any other nonprintable character, it  is  drawn  in  printable
+       form, using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   Control characters are displayed in the <STRONG>^</STRONG><EM>X</EM> notation.
+       <STRONG>o</STRONG>   <STRONG>waddch</STRONG> displays control characters in <STRONG>^</STRONG><EM>X</EM> notation.
 
-       <STRONG>o</STRONG>   Values above 128 are either meta characters (if the screen has  not
-           been  initialized,  or  if  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  has been called with a <STRONG>TRUE</STRONG> E
-           parameter),  shown  in  the  <STRONG>M-</STRONG><EM>X</EM>  notation,  or  are  displayed  as
-           themselves.   In  the latter case, the values may not be printable;
+       <STRONG>o</STRONG>   Character codes above 127 are either meta characters (if the screen
+           has not been initialized, or if <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> has  been  called  with  a
+           <STRONG>TRUE</STRONG>  <EM>bf</EM> parameter) that render in <STRONG>M-</STRONG><EM>X</EM> notation, or they display as
+           themselves.  In the latter case, the values may not  be  printable;
            this follows the X/Open specification.
 
-       Calling <STRONG>winch</STRONG> after adding a nonprintable character does not return the
-       character  itself,  but instead returns the printable representation of
-       the character.
+       Calling  <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does not
+       return the character itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
 
        Video attributes can be combined with a character  argument  passed  to
-       <STRONG>addch</STRONG>  or  related  functions by logical-ORing them into the character.
-       (Thus, text, including attributes, can be  copied  from  one  place  to
-       another  using  <STRONG><A HREF="curs_inch.3x.html">inch(3x)</A></STRONG>  and  <STRONG>addch</STRONG>.)   See the <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> page for
-       values of predefined video attribute constants  that  can  be  usefully
-       OR'ed into characters.
+       <STRONG>waddch</STRONG>   by  logical-ORing  them  into  the  character.   (Thus,  text,
+       including attributes, can be copied from one  place  to  another  using
+       <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>  and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined
+       video attribute constants that can be usefully OR'ed with characters.
 
 
 </PRE><H3><a name="h3-Echoing-Characters">Echoing Characters</a></H3><PRE>
-       The  <STRONG>echochar</STRONG>  and <STRONG>wechochar</STRONG> routines are equivalent to a call to <STRONG>addch</STRONG>
-       followed by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, or a call to <STRONG>waddch</STRONG>  followed  by  a
-       call  to <STRONG>wrefresh</STRONG>.  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.
-
-
-</PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       The following variables may be used to add line drawing  characters  to
-       the  screen  with  routines of the <STRONG>addch</STRONG> family.  The default character
-       listed below is used if the <STRONG>acsc</STRONG> capability does not define a terminal-
-       specific   replacement   for   it,   or  if  the  terminal  and  locale
-       configuration requires  Unicode  but  the  library  is  unable  to  use
-       Unicode.
-
-       The names are taken from VT100 nomenclature.
-
-       <STRONG>ACS</STRONG>            <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>   <STRONG>Glyph</STRONG>
-       <STRONG>Name</STRONG>           <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Name</STRONG>
-       ---------------------------------------------------------
-       ACS_BLOCK      #         0      solid square block
-       ACS_BOARD      #         h      board of squares
-       ACS_BTEE       +         v      bottom tee
-       ACS_BULLET     o         ~      bullet
-       ACS_CKBOARD    :         a      checker board (stipple)
-       ACS_DARROW     v         .      arrow pointing down
-       ACS_DEGREE     '         f      degree symbol
-       ACS_DIAMOND    +         `      diamond
-       ACS_GEQUAL     &gt;         &gt;      greater-than-or-equal-to
-       ACS_HLINE      -         q      horizontal line
-       ACS_LANTERN    #         i      lantern symbol
-       ACS_LARROW     &lt;         ,      arrow pointing left
-       ACS_LEQUAL     &lt;         y      less-than-or-equal-to
-       ACS_LLCORNER   +         m      lower left-hand corner
-       ACS_LRCORNER   +         j      lower right-hand corner
-       ACS_LTEE       +         t      left tee
-       ACS_NEQUAL     !         |      not-equal
-       ACS_PI         *         {      greek pi
-       ACS_PLMINUS    #         g      plus/minus
-       ACS_PLUS       +         n      plus
-       ACS_RARROW     &gt;         +      arrow pointing right
-       ACS_RTEE       +         u      right tee
-       ACS_S1         -         o      scan line 1
-       ACS_S3         -         p      scan line 3
-       ACS_S7         -         r      scan line 7
-       ACS_S9         _         s      scan line 9
-       ACS_STERLING   f         }      pound-sterling symbol
-       ACS_TTEE       +         w      top tee
-       ACS_UARROW     ^         -      arrow pointing up
-       ACS_ULCORNER   +         l      upper left-hand corner
-       ACS_URCORNER   +         k      upper right-hand corner
-       ACS_VLINE      |         x      vertical line
+       <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these functions as a hint that only a
+       single  character  is  being  output;  for  non-control  characters,  a
+       considerable performance gain may be enjoyed by employing them.
+
+
+</PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
+       <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
+       to write line-drawing and  other  special  characters  to  the  screen.
+       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
+       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
+       define  a  terminal-specific replacement for it, or if the terminal and
+       locale configuration requires Unicode to access  these  characters  but
+       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+       corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> string
+       capability,  and  the  characters in it may appear on the screen if the
+       terminal's database entry incorrectly advertises ACS support.  The name
+       "ACS"  originates  in  the  Alternate  Character Set feature of the DEC
+       VT100 terminal.
+
+                      <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
+       <STRONG>Symbol</STRONG>         <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
+       ------------------------------------------------------------------------
+       <STRONG>ACS_BLOCK</STRONG>      #         0      solid square block
+       <STRONG>ACS_BOARD</STRONG>      #         h      board of squares
+       <STRONG>ACS_BTEE</STRONG>       +         v      bottom tee
+       <STRONG>ACS_BULLET</STRONG>     o         ~      bullet
+       <STRONG>ACS_CKBOARD</STRONG>    :         a      checker board (stipple)
+       <STRONG>ACS_DARROW</STRONG>     v         .      arrow pointing down
+       <STRONG>ACS_DEGREE</STRONG>     '         f      degree symbol
+       <STRONG>ACS_DIAMOND</STRONG>    +         `      diamond
+       <STRONG>ACS_GEQUAL</STRONG>     &gt;         &gt;      greater-than-or-equal-to
+       <STRONG>ACS_HLINE</STRONG>      -         q      horizontal line
+       <STRONG>ACS_LANTERN</STRONG>    #         i      lantern symbol
+       <STRONG>ACS_LARROW</STRONG>     &lt;         ,      arrow pointing left
+       <STRONG>ACS_LEQUAL</STRONG>     &lt;         y      less-than-or-equal-to
+       <STRONG>ACS_LLCORNER</STRONG>   +         m      lower left-hand corner
+       <STRONG>ACS_LRCORNER</STRONG>   +         j      lower right-hand corner
+       <STRONG>ACS_LTEE</STRONG>       +         t      left tee
+       <STRONG>ACS_NEQUAL</STRONG>     !         |      not-equal
+       <STRONG>ACS_PI</STRONG>         *         {      greek pi
+       <STRONG>ACS_PLMINUS</STRONG>    #         g      plus/minus
+       <STRONG>ACS_PLUS</STRONG>       +         n      plus
+       <STRONG>ACS_RARROW</STRONG>     &gt;         +      arrow pointing right
+       <STRONG>ACS_RTEE</STRONG>       +         u      right tee
+       <STRONG>ACS_S1</STRONG>         -         o      scan line 1
+       <STRONG>ACS_S3</STRONG>         -         p      scan line 3
+       <STRONG>ACS_S7</STRONG>         -         r      scan line 7
+       <STRONG>ACS_S9</STRONG>         _         s      scan line 9
+       <STRONG>ACS_STERLING</STRONG>   f         }      pound-sterling symbol
+       <STRONG>ACS_TTEE</STRONG>       +         w      top tee
+       <STRONG>ACS_UARROW</STRONG>     ^         -      arrow pointing up
+       <STRONG>ACS_ULCORNER</STRONG>   +         l      upper left-hand corner
+       <STRONG>ACS_URCORNER</STRONG>   +         k      upper right-hand corner
+       <STRONG>ACS_VLINE</STRONG>      |         x      vertical line
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success (the
-       SVr4 manuals specify only "an  integer  value  other  than  <STRONG>ERR</STRONG>")  upon
-       successful  completion, unless otherwise noted in the preceding routine
-       descriptions.
-
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       If it is not  possible  to  add  a  complete  character,  an  error  is
-       returned:
+       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if it is not possible to add a  complete
+       character  at  the  cursor  position, as when conversion of a multibyte
+       character to a byte sequence fails, or at least one  of  the  resulting
+       bytes  cannot  be added to the window.  See section "PORTABILITY" below
+       regarding the use of <STRONG>waddch</STRONG> with multibyte characters.
 
-       <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line.
+       If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not  enabled,  <STRONG>waddch</STRONG>  can  successfully  write  a
+       character at the bottom right location of the window.  However, <EM>ncurses</EM>
+       returns <STRONG>ERR</STRONG> because it is not possible to wrap to a new line.
 
-       <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
-           sequence of bytes, or if it is not  possible  to  add  all  of  the
-           resulting bytes in the window, an error is returned.
+       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
+       functions) if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>addch</STRONG>, <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, and <STRONG>echochar</STRONG> may be macros.
+       <STRONG>addch</STRONG>, <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, and <STRONG>echochar</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       defaults specified for forms-drawing  characters  apply  in  the  POSIX
-       locale.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error  conditions  for  them.  The defaults specified for forms-drawing
+       characters apply in the POSIX locale.
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open Curses states that the <STRONG>ACS_</STRONG> definitions are <STRONG>char</STRONG> constants.  For
-       the  wide-character  implementation  (see  <STRONG>curs_add_wch</STRONG>),   there   are
-       analogous   <STRONG>WACS_</STRONG>   definitions  which  are  <STRONG>cchar_t</STRONG>  constants.   Some
-       implementations are problematic:
+       X/Open Curses states that the <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
+
+       Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Some implementations define the ACS symbols to a constant (such  as
-           Solaris), while others define those to entries in an array.
+       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, define the ACS symbols  as  constants;
+           others define them as elements of an array.
 
-           This  implementation uses an array <STRONG>acs_map</STRONG>, as done in SVr4 curses.
+           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
-           misdefined  symbols  are the arrows and other symbols which are not
-           used for line-drawing.
+       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
+           others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open Curses (issues 2 through 7) has a  typographical  error  for
-           the  ACS_LANTERN  symbol,  equating  its  "VT100+  Character"  to <STRONG>I</STRONG>
-           (capital I), while the header files for SVr4 curses and the various
-           implementations use <STRONG>i</STRONG> (lowercase).
+       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
+           implementations use "i" (small i).
 
-           None  of the terminal descriptions on Unix platforms use uppercase-
-           I,  except  for  Solaris  (i.e.,  <STRONG>screen</STRONG>'s  terminal   description,
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
            apparently  based on the X/Open documentation around 1995).  On the
-           other hand, the terminal description <EM>gs6300</EM> (AT&amp;T PC6300 with EMOTS
-           Terminal Emulator) uses lowercase-i.
+           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
+           description uses lowercase i.
 
-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
-       ACS_NEQUAL, ACS_STERLING) were not documented in any publicly  released
-       System  V.   However,  many  publicly  available terminfos include <STRONG>acsc</STRONG>
-       strings in which their key characters (pryz{|})  are  embedded,  and  a
-       second-hand  list  of  their  character descriptions has come to light.
-       The ACS-prefixed names for them were invented for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
+       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
+       released  System V.   However, many publicly available <EM>terminfo</EM> entries
+       include <STRONG>acsc</STRONG> strings  in  which  their  key  characters  (pryz{|})  are
+       embedded,  and  a  second-hand list of their character descriptions has
+       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
+       them.
 
-       The <EM>displayed</EM> values for the <STRONG>ACS_</STRONG> and <STRONG>WACS_</STRONG> constants depend on
+       The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
-       <STRONG>o</STRONG>   the library configuration, i.e., <EM>ncurses</EM> versus <EM>ncursesw</EM>, where the
-           latter  is  capable  of displaying Unicode while the former is not,
-           and
+       <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
+           character configurations  (the  former  is  capable  of  displaying
+           Unicode while the latter is not), and
 
-       <STRONG>o</STRONG>   whether the <EM>locale</EM> uses UTF-8 encoding.
+       <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In certain cases,  the  terminal  is  unable  to  display  line-drawing
-       characters   except   by   using   UTF-8   (see   the   discussion   of
-       <STRONG>NCURSES_NO_UTF8_ACS</STRONG> in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>).
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
-       single  character.   As  discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, that character may
-       have been more than eight bits in an SVr3 or SVr4  implementation,  but
-       in  the  X/Open Curses model, the details are not given.  The important
-       distinction between SVr4 curses and X/Open  Curses  is  that  the  non-
-       character  information  (attributes  and  color) was separated from the
-       character information which is packed in a <STRONG>chtype</STRONG> to pass to <STRONG>waddch</STRONG>.
-
-       In this implementation,  <STRONG>chtype</STRONG>  holds  an  eight-bit  character.   But
-       <EM>ncurses</EM>  allows  multibyte  characters  to be passed in a succession of
-       calls to <STRONG>waddch</STRONG>.  The other implementations do not do this; a  call  to
-       <STRONG>waddch</STRONG>  passes  exactly  one  character which may be rendered as one or
-       more cells on the screen depending on whether it is printable.
-
-       Depending on the locale settings, <EM>ncurses</EM> will inspect the byte  passed
-       in  each  call  to <STRONG>waddch</STRONG>, and check if the latest call will continue a
+       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
+       single character.  As discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,  that  character  may
+       have  been more than eight bits wide in an SVr3 or SVr4 implementation,
+       but in the X/Open  Curses  model,  the  details  are  not  given.   The
+       important distinction between SVr4 <EM>curses</EM> and X/Open Curses is that the
+       latter separates non-character information (attributes and color)  from
+       the  character  code,  which  SVr4  packs  into a <EM>chtype</EM> for passage to
+       <STRONG>waddch</STRONG>.
+
+       In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character.  But <EM>ncurses</EM> allows  a
+       multibyte  character  to  be passed in a succession of calls to <STRONG>waddch</STRONG>.
+       Other implementations do not;  a  <STRONG>waddch</STRONG>  call  transmits  exactly  one
+       character,  which  may  be  rendered  in  one  or more screen locations
+       depending on whether it is printable.
+
+       Depending on the locale settings, <EM>ncurses</EM> inspects the byte  passed  in
+       each  <STRONG>waddch</STRONG>  call,  and  checks  whether  the  latest call continues a
        multibyte sequence.  When a character is <EM>complete</EM>, <EM>ncurses</EM> displays the
-       character and moves to the next position in the screen.
+       character and advances the window's current location.
 
        If  the  calling  application  interrupts  the succession of bytes in a
-       multibyte character by moving the current location (e.g., using <STRONG>wmove</STRONG>),
-       <EM>ncurses</EM> discards the partially built character, starting over again.
+       multibyte character  sequence  by  moving  the  current  location  (for
+       example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>), <EM>ncurses</EM> discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon this
-       behavior:
+       behavior.  Check whether a character can be  represented  as  a  single
+       byte in the current locale.
 
-       <STRONG>o</STRONG>   check if a character can be represented as a  single  byte  in  the
-           current locale before attempting call <STRONG>waddch</STRONG>, and
+       <STRONG>o</STRONG>   If it can, call either <STRONG>waddch</STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   call <STRONG>wadd_wch</STRONG> for characters which cannot be handled by <STRONG>waddch</STRONG>.
+       <STRONG>o</STRONG>   If it cannot, use only <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       The  <STRONG>TABSIZE</STRONG>  variable  is  implemented  in  SVr4 and other versions of
-       curses, but is not part of X/Open curses  (see  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>  for
-       more details).
-
-       If <EM>ch</EM> is a carriage return, the cursor is moved to the beginning of the
-       current row of the window.  This is true of other implementations,  but
-       is not documented.
+       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
+       X/Open Curses does not specify it (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,      <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,      <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       in its wide-character configuration (<EM>ncursesw</EM>).
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -318,7 +312,7 @@ <H1 class="no-header">curs_addch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <ul>
 <li><a href="#h3-Adding-Characters">Adding Characters</a></li>
 <li><a href="#h3-Echoing-Characters">Echoing Characters</a></li>
-<li><a href="#h3-Line-Graphics">Line Graphics</a></li>
+<li><a href="#h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index e428bb067..8bd9fc2f3 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.38 2023/11/25 14:01:49 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.40 2024/03/16 15:37:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -90,8 +90,8 @@ <H1 class="no-header">curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error
+       X/Open  Curses  does  not   specify   any   error   conditions.    This
+       implementation returns an error
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -111,12 +111,14 @@ <H1 class="no-header">curs_addchstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
+       <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>  describes  comparable  functions  of  the  <EM>ncurses</EM>
+       library in its wide-character configuration (<EM>ncursesw</EM>).
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 285ebbb0a..0f7a29917 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.37 2023/11/18 21:18:55 tom Exp @
+  * @Id: curs_addstr.3x,v 1.41 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -55,45 +55,43 @@ <H1 class="no-header">curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions write the (null-terminated) character string <EM>str</EM> on the
-       given  window.   It  is similar to calling <STRONG>waddch</STRONG> once for each byte in
-       the string.
+       <STRONG>waddstr</STRONG> writes the characters of the (null-terminated)  string  <EM>str</EM>  to
+       the  window <EM>win</EM>.  Its process is similar to calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> for each
+       <EM>char</EM> in <EM>str</EM>.  Control characters are processed as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
 
-       The <EM>mv</EM> functions perform  cursor  movement  once,  before  writing  any
-       characters.   Thereafter,  the  cursor  is advanced as a side-effect of
-       writing to the window.
+       <STRONG>waddnstr</STRONG> writes at most <EM>n</EM>  characters,  or  until  a  terminating  null
+       character  occurs  in  <EM>str</EM>.   If  <EM>n</EM>  is  -1, <STRONG>waddnstr</STRONG> writes the entire
+       string.
 
-       The four functions with <EM>n</EM> as the last argument write at most  <EM>n</EM>  bytes,
-       or  until  a  terminating null is reached.  If <EM>n</EM> is -1, then the entire
-       string will be added.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error
+       X/Open Curses does not specify any error conditions.   <EM>ncurses</EM>  returns
+       an error
 
-       <STRONG>o</STRONG>   if the window pointer is null or
+       <STRONG>o</STRONG>   if the window pointer is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the string pointer is null or
+       <STRONG>o</STRONG>   if the string pointer is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if the corresponding calls to <STRONG>waddch</STRONG> return an error.
+       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> call returns an error.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  with  a  "mv"  prefix  first  perform  cursor movement using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
+       functions) if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -101,16 +99,18 @@ <H1 class="no-header">curs_addstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses, Issue 4 describes these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,   <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+
+       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       in its wide-character configuration (<EM>ncursesw</EM>).
 
 
 
-ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 4f4805c7c..d5f8eebaa 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.29 2023/11/18 21:18:55 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.33 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -56,68 +56,68 @@ <H1 class="no-header">curs_addwstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  functions  write the characters of the (null-terminated) <STRONG>wchar_t</STRONG>
-       character  string  <EM>wstr</EM>  on  the  given  window.   It  is  similar   to
-       constructing  a  <STRONG>cchar_t</STRONG>  for  each <STRONG>wchar_t</STRONG> in the string, then calling
-       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> for the resulting <STRONG>cchar_t</STRONG>:
+       <STRONG>waddwstr</STRONG>  writes  the  characters  of  the (wide-null-terminated) wide-
+       character string <EM>wstr</EM> to the window <EM>win</EM>.  Its  process  is  similar  to
+       constructing   a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  for  each  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  in  <EM>wstr</EM>,  then  calling
+       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> with the resulting <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
-       <STRONG>o</STRONG>   spacing and non-spacing characters in the string are processed  one
+       <STRONG>o</STRONG>   Spacing and non-spacing characters in the string are processed  one
            at a time, and
 
-       <STRONG>o</STRONG>   control characters are processed as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   control characters are processed as in <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
-       The  <EM>mv</EM>  functions  perform  cursor  movement  once, before writing any
-       characters.  Thereafter, the cursor is advanced  as  a  side-effect  of
-       writing to the window.
+       <STRONG>waddnwstr</STRONG> writes at most <EM>n</EM> wide characters, or until a terminating wide
+       null character occurs in <EM>wstr</EM>.  If <EM>n</EM> is -1, <STRONG>waddnwstr</STRONG> writes the entire
+       wide string.
 
-       The  four functions with <EM>n</EM> as the last argument write at most <EM>n</EM> <STRONG>wchar_t</STRONG>
-       characters, or until a terminating null is reached.  If <EM>n</EM> is  -1,  then
-       the entire string will be added.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
-       returns an error
+       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
+       an error
 
-       <STRONG>o</STRONG>   if the window pointer is null or
+       <STRONG>o</STRONG>   if the window pointer is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the string pointer is null or
+       <STRONG>o</STRONG>   if the string pointer is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if the corresponding calls to <STRONG>wadd_wch</STRONG> return an error.
+       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns an error.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
+       functions) if the <EM>WINDOW</EM> pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these functions except <STRONG>waddnwstr</STRONG> may be macros.
+       All of these functions except <STRONG>waddnwstr</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses, Issue 4 describes these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+
+       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       in its non-wide-character configuration.
 
 
 
-ncurses 6.4                       2023-11-18                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 1aaa8fc6b..2742e4cf0 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.97 2024/03/02 16:34:00 tom Exp @
+  * @Id: curs_attr.3x,v 1.99 2024/03/16 15:38:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -191,7 +191,7 @@ <H1 class="no-header">curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</H1>
        <STRONG>standend</STRONG> is the same as <STRONG>attrset(A_NORMAL)</STRONG> or <STRONG>attrset(0)</STRONG>,  that  is,  it
        turns off all attributes.
 
-       X/Open does not mark these "restricted", because
+       X/Open Curses does not mark these "restricted", because
 
        <STRONG>o</STRONG>   they have well established legacy use, and
 
@@ -241,7 +241,7 @@ <H1 class="no-header">curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines return the integer <STRONG>OK</STRONG> on success, or <STRONG>ERR</STRONG> on failure.
 
-       X/Open does not define any error conditions.
+       X/Open Curses does not specify any error conditions.
 
        This implementation
 
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-03-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-02                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 8fe5d5d33..474522879 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.25 2023/10/07 21:19:07 tom Exp @
+  * @Id: curs_beep.3x,v 1.27 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2023-10-07 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-10-07                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 6a487215c..ba9e68546 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.55 2023/12/23 16:35:10 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.59 2024/03/23 19:58:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -176,20 +176,20 @@ <H1 class="no-header">curs_bkgd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
        Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
        rendition  of  characters  on  the  screen  updates  when <STRONG>bkgd</STRONG> or <STRONG>wbkgd</STRONG>
-       changes the background character.  <EM>ncurses,</EM> like SVr4 <EM>curses,</EM> does  not
+       changes the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does  not
        (in  its  non-"wide"  configuration)  store  the  background and window
        attribute contributions to each character cell separately.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes the corresponding  functions  in  the  "wide"
-       configuration of <EM>ncurses.</EM>
+       configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-23                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 376210a53..97878f91c 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.36 2023/12/23 16:35:10 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.40 2024/03/23 19:59:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -146,7 +146,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> do not return a value.
 
        The other functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG>  upon  success.   In
-       <EM>ncurses,</EM> failure occurs if
+       <EM>ncurses</EM>, failure occurs if
 
        <STRONG>o</STRONG>   a <EM>WINDOW</EM> pointer <EM>win</EM> is null, or
 
@@ -156,7 +156,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be implemented as macros.
 
-       Unlike  their  counterparts in the non-"wide" configuration of <EM>ncurses,</EM>
+       Unlike  their  counterparts in the non-"wide" configuration of <EM>ncurses</EM>,
        <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> supply the background character and  attribute
        in a modifiable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, not as the return value.
 
@@ -166,18 +166,18 @@ <H1 class="no-header">curs_bkgrnd 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        error conditions for them.
 
        X/Open Curses does not provide details of how the rendition is updated.
-       This implementation follows the approach used in SVr4 <EM>curses.</EM>
+       This implementation follows the approach used in SVr4 <EM>curses</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the corresponding functions in the non-"wide"
-       configuration of <EM>ncurses.</EM>
+       configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index e03b5f10e..56d76bd74 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.44 2023/12/16 21:09:11 tom Exp @
+  * @Id: curs_border.3x,v 1.46 2024/03/16 15:38:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -118,8 +118,8 @@ <H1 class="no-header">curs_border 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        All  routines return the integer <STRONG>OK</STRONG>.  The SVr4.0 manual says "or a non-
        negative integer if <STRONG>immedok</STRONG> is set", but this appears to be an error.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error if the window pointer is null.
+       X/Open  Curses  does  not   specify   any   error   conditions.    This
+       implementation returns an error if the window pointer is null.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
@@ -142,7 +142,7 @@ <H1 class="no-header">curs_border 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 8d8a204b5..ad00d4ee9 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.31 2023/11/25 15:39:56 tom Exp @
+  * @Id: curs_border_set.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">curs_border_set 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index e63e5583c..2eb714ef1 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.44 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_clear.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 3bd3fbac8..de3fff15b 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.96 2023/12/30 21:20:01 tom Exp @
+  * @Id: curs_color.3x,v 1.98 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-30                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 46b96d62b..2b385da7f 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.30 2023/12/16 21:09:11 tom Exp @
+  * @Id: curs_delch.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_delch 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 2d33ccaf8..387479dd2 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.34 2023/12/16 21:33:34 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 32b507a33..4bf9c804d 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.44 2023/12/23 16:36:18 tom Exp @
+  * @Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_extend 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index c639d28ac..ea72c340f 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.31 2023/12/23 16:35:10 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.36 2024/03/23 20:00:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -64,98 +64,111 @@ <H1 class="no-header">curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-wget_wch">wget_wch</a></H3><PRE>
-       The <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>,  <STRONG>mvget_wch</STRONG>,  and  <STRONG>mvwget_wch</STRONG>  functions  read  a
-       character  from  the  terminal associated with the current or specified
-       window.  In no-delay mode, if no input is waiting,  the  value  <STRONG>ERR</STRONG>  is
-       returned.   In  delay  mode,  the program waits until the system passes
-       text through to the program.  Depending on the setting of <STRONG>cbreak</STRONG>,  this
-       is  after  one  character  (cbreak  mode),  or  after the first newline
-       (nocbreak mode).  In half-delay mode, the program waits until the  user
-       types a character or the specified timeout interval has elapsed.
-
-       Unless  <STRONG>noecho</STRONG> has been set, these routines echo the character into the
-       designated window.
-
-       If the window is not a pad and has been moved  or  modified  since  the
-       last call to <STRONG>wrefresh</STRONG>, <STRONG>wrefresh</STRONG> will be called before another character
-       is read.
-
-       If <STRONG>keypad</STRONG> is enabled, these functions respond  to  the  pressing  of  a
-       function  key  by  setting  the object pointed to by <EM>wch</EM> to the keycode
-       assigned to  the  function  key,  and  returning  <STRONG>KEY_CODE_YES</STRONG>.   If  a
-       character  (such  as  escape) that could be the beginning of a function
-       key is received, curses sets a timer.  If the remainder of the sequence
-       does  arrive  within  the  designated  time,  curses passes through the
-       character; otherwise, curses returns the function key value.  For  this
-       reason,  many  terminals  experience  a  delay  between the time a user
-       presses the escape key and the time  the  escape  is  returned  to  the
-       program.
-
-       The keycodes returned by these functions are the same as those returned
-       by <STRONG>wgetch</STRONG>:
-
-       <STRONG>o</STRONG>   The predefined function keys are listed  in  <STRONG>&lt;curses.h&gt;</STRONG>  as  macros
-           with  values  outside  the  range of 8-bit characters.  Their names
-           begin with <STRONG>KEY_</STRONG>.
-
-       <STRONG>o</STRONG>   Other (user-defined) function  keys  which  may  be  defined  using
-           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>  have no names, but also are expected to have values
-           outside the range of 8-bit characters.
-
-
-</PRE><H3><a name="h3-unget_wch">unget_wch</a></H3><PRE>
-       The <STRONG>unget_wch</STRONG> function pushes the wide character <EM>wch</EM> back onto the head
-       of  the input queue, so the wide character is returned by the next call
-       to <STRONG>get_wch</STRONG>.  The pushback of  one  character  is  guaranteed.   If  the
-       program  calls  <STRONG>unget_wch</STRONG> too many times without an intervening call to
-       <STRONG>get_wch</STRONG>, the operation may fail.
-
-       Unlike  <STRONG>ungetch</STRONG>  and  <STRONG>wgetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish   special
-       characters   returned   by   <STRONG>wget_wch</STRONG>  from  ordinary  characters.   An
-       application can push special keys which it may  read  via  <STRONG>wget_wch</STRONG>  by
-       checking  for  the  <STRONG>KEY_CODE_YES</STRONG>  result,  and  using <STRONG>ungetch</STRONG> for those
-       special keys.
+</PRE><H3><a name="h3-Reading-Characters">Reading Characters</a></H3><PRE>
+       <STRONG>wget_wch</STRONG> gathers a key stroke <EM>wch</EM> from the terminal keyboard associated
+       with  a  <EM>curses</EM>  window  <EM>win</EM>, returning <STRONG>OK</STRONG> if a wide character is read,
+       <STRONG>KEY_CODE_YES</STRONG> if a function key is read, and <STRONG>ERR</STRONG>  if  no  key  event  is
+       available.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
+
+       When  input  is pending, <STRONG>wget_wch</STRONG> stores an integer identifying the key
+       stroke in <EM>wch</EM>;  for  alphanumeric  and  punctuation  keys,  this  value
+       corresponds to the character encoding used by the terminal.  Use of the
+       control key as a modifier  often  results  in  a  distinct  code.   The
+       behavior  of  other  keys depends on whether <EM>win</EM> is in keypad mode; see
+       subsections "Keypad Mode" and "Predefined Key Codes" in <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+
+       If no input is pending, then if the no-delay flag is set in the  window
+       (see  <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>),  the  function returns <STRONG>ERR</STRONG>; otherwise, <EM>curses</EM> waits
+       until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
+       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been called,
+       it occurs when the next newline is read.   If  <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG>  has  been
+       called,  <EM>curses</EM> waits until a character is typed or the specified delay
+       elapses.
+
+       If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
+       <EM>wch</EM> to the window (at the cursor position) per the following rules.
+
+       <STRONG>o</STRONG>   If  <EM>wch</EM>  matches  the  terminal's erase character, the cursor moves
+           leftward one  position  and  the  new  position  is  erased  as  if
+           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>  and  then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When the window's
+           keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are
+           handled the same way.
+
+       <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>wch</EM> to the window, as with <STRONG><A HREF="curs_add_wch.3x.html">wecho_wchar(3x)</A></STRONG>.
+
+       <STRONG>o</STRONG>   If  the  window  has  been moved or modified since the last call to
+           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG>.
+
+       If <EM>wch</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,  <STRONG>wgetch</STRONG>  stores
+       the the character code for newline (line feed) in <EM>wch</EM> instead.
+
+
+</PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
+       <STRONG>unget_wch</STRONG>  places  <EM>wch</EM>  into the input queue to be returned by the next
+       call to <STRONG>wget_wch</STRONG>.  A single input queue serves all windows.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       When   <STRONG>get_wch</STRONG>,   <STRONG>wget_wch</STRONG>,   <STRONG>mvget_wch</STRONG>,   and   <STRONG>mvwget_wch</STRONG>   functions
-       successfully  report  the  pressing  of  a  function  key,  they return
-       <STRONG>KEY_CODE_YES</STRONG>.  When they successfully report  a  wide  character,  they
-       return <STRONG>OK</STRONG>.  Otherwise, they return <STRONG>ERR</STRONG>.
+       <STRONG>wget_wch</STRONG> returns <STRONG>OK</STRONG> when it reads a  wide  character  and  <STRONG>KEY_CODE_YES</STRONG>
+       when it reads a function key code.  It returns <STRONG>ERR</STRONG> if
 
-       Upon  successful  completion,  <STRONG>unget_wch</STRONG>  returns  <STRONG>OK</STRONG>.   Otherwise, the
-       function returns <STRONG>ERR</STRONG>.
+       <STRONG>o</STRONG>   the <EM>WINDOW</EM> pointer is <STRONG>NULL</STRONG>, or
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
+       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
+           to <STRONG>EINTR</STRONG>.
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Applications should not define the escape key by itself  as  a  single-
-       character function.
+       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
+       functions) if the <EM>win</EM> parameter is a null pointer.
 
-       When  using  <STRONG>get_wch</STRONG>,  <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, or <STRONG>mvwget_wch</STRONG>, applications
-       should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending
-       on  the  state  of  the  tty  driver  when each character is typed, the
-       program may produce undesirable results.
+       <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
+       input queue.
+
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       See the "NOTES" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>.
 
        All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
        as macros.
 
+       Unlike <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>, <STRONG>wget_wch</STRONG> and its variants store  the  value  of  the
+       input  character  in  an additional <EM>wch</EM> parameter instead of the return
+       value.
+
+       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish  function  key   codes
+       <STRONG>wget_wch</STRONG>   from  conventional  character  codes.   An  application  can
+       overcome this limitation by pushing function key codes with <STRONG>ungetch</STRONG> and
+       subsequently  checking  the  return  value of <STRONG>wget_wch</STRONG> for a match with
+       <STRONG>KEY_CODE_YES</STRONG>.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       See the "EXTENSIONS" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>.
+
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       error conditions for them.
+
+       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
+       of <STRONG>wget_wch</STRONG> with signal handlers.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+
+       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
+       its non-wide-character configuration.
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -163,12 +176,13 @@ <H1 class="no-header">curs_get_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-wget_wch">wget_wch</a></li>
-<li><a href="#h3-unget_wch">unget_wch</a></li>
+<li><a href="#h3-Reading-Characters">Reading Characters</a></li>
+<li><a href="#h3-Ungetting-Characters">Ungetting Characters</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 1dd9a9c23..e1035e021 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.42 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.44 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -187,7 +187,7 @@ <H1 class="no-header">curs_get_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 29c0b5c04..b0a1abf6e 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.43 2023/12/16 21:07:24 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 3b04f52fd..4fd0541d3 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.78 2024/02/17 19:27:03 tom Exp @
+  * @Id: curs_getch.3x,v 1.83 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -69,285 +69,307 @@ <H1 class="no-header">curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Reading-Characters">Reading Characters</a></H3><PRE>
-       The <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG> and <STRONG>mvwgetch</STRONG>, routines read a character from
-       the window.  In no-delay mode, if no input is waiting, the value <STRONG>ERR</STRONG> is
-       returned.  In delay mode, the program waits  until  the  system  passes
-       text  through to the program.  Depending on the setting of <STRONG>cbreak</STRONG>, this
-       is after one character  (cbreak  mode),  or  after  the  first  newline
-       (nocbreak  mode).   In  half-delay  mode,  the  program  waits  until a
-       character is typed or the specified timeout has been reached.
+       <STRONG>wgetch</STRONG> gathers a key stroke from the terminal keyboard associated  with
+       a  <EM>curses</EM>  window  <EM>win</EM>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants of this
+       function.
 
-       If <STRONG>echo</STRONG> is enabled, and the window is not a  pad,  then  the  character
-       will  also  be  echoed  into  the  designated  window  according to the
-       following rules:
+       When input is pending, <STRONG>wgetch</STRONG> returns an integer  identifying  the  key
+       stroke;  for  alphanumeric and punctuation keys, this value corresponds
+       to the character encoding used by the terminal.  Use of the control key
+       as  a modifier often results in a distinct code.  The behavior of other
+       keys depends on whether <EM>win</EM> is in keypad mode; see  subsection  "Keypad
+       Mode" below.
 
-       <STRONG>o</STRONG>   If the character is the current erase  character,  left  arrow,  or
-           backspace,  the  cursor  is  moved  one  space to the left and that
-           screen position is erased as if <STRONG>delch</STRONG> had been called.
+       If  no input is pending, then if the no-delay flag is set in the window
+       (see <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>), the function returns <STRONG>ERR</STRONG>;  otherwise,  <EM>curses</EM>  waits
+       until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
+       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been  called,
+       it  occurs  when  the  next newline is read.  If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been
+       called, <EM>curses</EM> waits until a character is typed or the specified  delay
+       elapses.
 
-       <STRONG>o</STRONG>   If the character value is  any  other  <STRONG>KEY_</STRONG>  define,  the  user  is
-           alerted with a <STRONG>beep</STRONG> call.
+       If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
+       the returned character <EM>ch</EM> to the window (at the  cursor  position)  per
+       the following rules.
 
-       <STRONG>o</STRONG>   If  the character is a carriage-return, and if <STRONG>nl</STRONG> is enabled, it is
-           translated to a line-feed after echoing.
+       <STRONG>o</STRONG>   If  <EM>ch</EM>  matches  the  terminal's  erase character, the cursor moves
+           leftward one  position  and  the  new  position  is  erased  as  if
+           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>  and  then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When the window's
+           keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are
+           handled the same way.
 
-       <STRONG>o</STRONG>   Otherwise the character is simply output to the screen.
+       <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>ch</EM> to the window, as with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.
 
-       If the window is not a pad, and it has been moved or modified since the
-       last call to <STRONG>wrefresh</STRONG>, <STRONG>wrefresh</STRONG> will be called before another character
-       is read.
+       <STRONG>o</STRONG>   If  the  window  has  been moved or modified since the last call to
+           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG>.
 
+       If <EM>ch</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,  <STRONG>wgetch</STRONG>  returns
+       the character code for newline (line feed) instead.
 
-</PRE><H3><a name="h3-Keypad-Mode">Keypad Mode</a></H3><PRE>
-       If <STRONG>keypad</STRONG> is <STRONG>TRUE</STRONG>, and a function key is pressed, the  token  for  that
-       function key is returned instead of the raw characters:
-
-       <STRONG>o</STRONG>   The  predefined  function  keys  are listed in <STRONG>&lt;curses.h&gt;</STRONG> as macros
-           with values outside the range of  8-bit  characters.   Their  names
-           begin with <STRONG>KEY_</STRONG>.
-
-       <STRONG>o</STRONG>   Other  (user-defined)  function  keys  which  may  be defined using
-           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> have no names, but also are expected to have  values
-           outside the range of 8-bit characters.
-
-       Thus,  a  variable  intended to hold the return value of a function key
-       must be of short size or larger.
 
-       When a character that could be the  beginning  of  a  function  key  is
-       received  (which,  on  modern  terminals,  means  an escape character),
-       <STRONG>curses</STRONG> sets a timer.  If the remainder of the sequence does not come in
-       within the designated time, the character is passed through; otherwise,
-       the function key value is returned.  For this  reason,  many  terminals
-       experience  a  delay between the time a user presses the escape key and
-       the escape is returned to the program.
-
-       In <EM>ncurses</EM>, the timer normally expires after the value in <STRONG>ESCDELAY</STRONG> (see
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).   If <STRONG>notimeout</STRONG> is <STRONG>TRUE</STRONG>, the timer does not expire;
-       it is an infinite (or very large) value.  Because function keys usually
-       begin  with  an  escape  character,  the terminal may appear to hang in
-       notimeout mode after pressing the  escape  key  until  another  key  is
-       pressed.
+</PRE><H3><a name="h3-Keypad-Mode">Keypad Mode</a></H3><PRE>
+       To  <EM>curses</EM>, key strokes not from the alphabetic section of the keyboard
+       (those    corresponding    to    the    ECMA-6    character    set--see
+       <STRONG>ascii(7)</STRONG>--optionally  modified by either the control or shift keys) are
+       treated as <EM>function</EM> keys.  (In <EM>curses</EM>, the term "function key" includes
+       but  is  not  limited to keycaps engraved with "F1", "PF1", and so on.)
+       If the  window  is  in  keypad  mode,  these  produce  a  numeric  code
+       corresponding  to the <STRONG>KEY_</STRONG> symbols listed in subsection "Predefined Key
+       Codes" below; otherwise, they transmit a sequence  of  codes  typically
+       starting  with  the  escape character, and which must be collected with
+       multiple <STRONG>wgetch</STRONG> calls.
+
+       <STRONG>o</STRONG>   The <EM>curses.h</EM> header file declares  many  <EM>predefined</EM>  <EM>function</EM>  <EM>keys</EM>
+           whose  names  begin with <STRONG>KEY_</STRONG>; these object-like macros have values
+           outside the range of eight-bit character codes.
+
+       <STRONG>o</STRONG>   In  <EM>ncurses</EM>,  <EM>user-defined</EM>  <EM>function</EM>  <EM>keys</EM>  are   configured   with
+           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>;  they  have no names, but are also expected to have
+           values outside the range of eight-bit codes.
+
+       A variable intended to hold a function key code must thus  be  of  type
+       <EM>short</EM> or larger.
+
+       Most  terminals  one  encounters follow the ECMA-48 standard insofar as
+       their function keys  produce  character  sequences  prefixed  with  the
+       escape  character  ESC.   This  fact  implies  that  <EM>curses</EM> cannot know
+       whether the terminal has sent an ESC key stroke or the beginning  of  a
+       function  key's  character  sequence without waiting to see if, and how
+       soon, further input arrives.   When  <EM>curses</EM>  reads  such  an  ambiguous
+       character,  it sets a timer.  If the remainder of the sequence does not
+       arrive within the designated time, <STRONG>wgetch</STRONG> returns the prefix character;
+       otherwise, it returns the function key code corresponding to the unique
+       sequence defined by the terminal.  Consequently, a  user  of  a  <EM>curses</EM>
+       application  may  experience  a  delay  after pressing ESC while <EM>curses</EM>
+       disambiguates the input.   See  section  "EXTENSIONS"  below.   If  the
+       window  is  in  "no time-out" mode, the timer does not expire; it is an
+       infinite (or very large) value.  See <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.   Because  function
+       key  sequences usually begin with an escape character, the terminal may
+       appear to hang in no time-out mode after  the  user  has  pressed  ESC.
+       Generally, further typing "awakens" <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       The  <STRONG>ungetch</STRONG> routine places <EM>ch</EM> back onto the input queue to be returned
-       by the next call to <STRONG>wgetch</STRONG>.  There is just  one  input  queue  for  all
-       windows.
+       <STRONG>ungetch</STRONG>  places <EM>ch</EM> into the input queue to be returned by the next call
+       to <STRONG>wgetch</STRONG>.  A single input queue serves all windows.
 
 
 </PRE><H3><a name="h3-Predefined-Key-Codes">Predefined Key Codes</a></H3><PRE>
-       The following special keys are defined in <STRONG>&lt;curses.h&gt;</STRONG>.
+       The header file <EM>curses.h</EM> defines the following function key codes.
 
-       <STRONG>o</STRONG>   Except  for  the special case <STRONG>KEY_RESIZE</STRONG>, it is necessary to enable
-           <STRONG>keypad</STRONG> for <STRONG>getch</STRONG> to return these codes.
+       <STRONG>o</STRONG>   Except for the special case of <STRONG>KEY_RESIZE</STRONG>, a window's  keypad  mode
+           must be enabled for <STRONG>wgetch</STRONG> to read these codes from it.
 
-       <STRONG>o</STRONG>   Not all of  these  are  necessarily  supported  on  any  particular
+       <STRONG>o</STRONG>   Not  all  of  these  are  necessarily  supported  on any particular
            terminal.
 
-       <STRONG>o</STRONG>   The   naming  convention  may  seem  obscure,  with  some  apparent
-           misspellings (such as "RSUME" for "resume").  The names  correspond
-           to  the  long  terminfo  capability  names  for  the keys, and were
-           defined long ago, in the 1980s.
-
-              <STRONG>Name</STRONG>            <STRONG>Key</STRONG> <STRONG>name</STRONG>
-              -------------------------------------------------
-              KEY_BREAK       Break key
-              KEY_DOWN        The four arrow keys ...
-              KEY_UP
-              KEY_LEFT
-              KEY_RIGHT
-              KEY_HOME        Home key (upward+left arrow)
-              KEY_BACKSPACE   Backspace
-              KEY_F0          Function keys; space for 64 keys
-                              is reserved.
-              KEY_F(<EM>n</EM>)        For 0 &lt;= <EM>n</EM> &lt;= 63
-              KEY_DL          Delete line
-              KEY_IL          Insert line
-              KEY_DC          Delete character
-              KEY_IC          Insert char or enter insert mode
-              KEY_EIC         Exit insert char mode
-              KEY_CLEAR       Clear screen
-              KEY_EOS         Clear to end of screen
-              KEY_EOL         Clear to end of line
-              KEY_SF          Scroll 1 line forward
-              KEY_SR          Scroll 1 line backward (reverse)
-              KEY_NPAGE       Next page
-              KEY_PPAGE       Previous page
-              KEY_STAB        Set tab
-              KEY_CTAB        Clear tab
-              KEY_CATAB       Clear all tabs
-              KEY_ENTER       Enter or send
-              KEY_SRESET      Soft (partial) reset
-              KEY_RESET       Reset or hard reset
-              KEY_PRINT       Print or copy
-
-              KEY_LL          Home down or bottom (lower left)
-              KEY_A1          Upper left of keypad
-              KEY_A3          Upper right of keypad
-              KEY_B2          Center of keypad
-              KEY_C1          Lower left of keypad
-              KEY_C3          Lower right of keypad
-              KEY_BTAB        Back tab key
-              KEY_BEG         Beg(inning) key
-              KEY_CANCEL      Cancel key
-              KEY_CLOSE       Close key
-              KEY_COMMAND     Cmd (command) key
-              KEY_COPY        Copy key
-              KEY_CREATE      Create key
-              KEY_END         End key
-              KEY_EXIT        Exit key
-              KEY_FIND        Find key
-              KEY_HELP        Help key
-              KEY_MARK        Mark key
-              KEY_MESSAGE     Message key
-              KEY_MOUSE       Mouse event occurred
-              KEY_MOVE        Move key
-              KEY_NEXT        Next object key
-              KEY_OPEN        Open key
-              KEY_OPTIONS     Options key
-              KEY_PREVIOUS    Previous object key
-              KEY_REDO        Redo key
-              KEY_REFERENCE   Ref(erence) key
-              KEY_REFRESH     Refresh key
-              KEY_REPLACE     Replace key
-              KEY_RESIZE      Screen resized
-              KEY_RESTART     Restart key
-              KEY_RESUME      Resume key
-              KEY_SAVE        Save key
-              KEY_SBEG        Shifted beginning key
-              KEY_SCANCEL     Shifted cancel key
-              KEY_SCOMMAND    Shifted command key
-              KEY_SCOPY       Shifted copy key
-              KEY_SCREATE     Shifted create key
-              KEY_SDC         Shifted delete char key
-              KEY_SDL         Shifted delete line key
-              KEY_SELECT      Select key
-              KEY_SEND        Shifted end key
-              KEY_SEOL        Shifted clear line key
-              KEY_SEXIT       Shifted exit key
-              KEY_SFIND       Shifted find key
-              KEY_SHELP       Shifted help key
-              KEY_SHOME       Shifted home key
-              KEY_SIC         Shifted insert key
-              KEY_SLEFT       Shifted left arrow key
-              KEY_SMESSAGE    Shifted message key
-              KEY_SMOVE       Shifted move key
-              KEY_SNEXT       Shifted next key
-              KEY_SOPTIONS    Shifted options key
-              KEY_SPREVIOUS   Shifted prev key
-              KEY_SPRINT      Shifted print key
-              KEY_SREDO       Shifted redo key
-              KEY_SREPLACE    Shifted replace key
-              KEY_SRIGHT      Shifted right arrow key
-              KEY_SRSUME      Shifted resume key
-              KEY_SSAVE       Shifted save key
-              KEY_SSUSPEND    Shifted suspend key
-              KEY_SUNDO       Shifted undo key
-              KEY_SUSPEND     Suspend key
-              KEY_UNDO        Undo key
-
-       Keypad is arranged like this:
-
-              +-----+------+-------+
-              | <STRONG>A1</STRONG>  |  <STRONG>up</STRONG>  |  <STRONG>A3</STRONG>   |
-              +-----+------+-------+
-              |<STRONG>left</STRONG> |  <STRONG>B2</STRONG>  | <STRONG>right</STRONG> |
-              +-----+------+-------+
-              | <STRONG>C1</STRONG>  | <STRONG>down</STRONG> |  <STRONG>C3</STRONG>   |
-              +-----+------+-------+
-       A few of these predefined values do <EM>not</EM> correspond to a real key:
-
-       <STRONG>o</STRONG>   <STRONG>KEY_RESIZE</STRONG>  is  returned when the <STRONG>SIGWINCH</STRONG> signal has been detected
-           (see  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  and  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>).   This  code  is  returned
-           whether or not <STRONG>keypad</STRONG> has been enabled.
-
-       <STRONG>o</STRONG>   <STRONG>KEY_MOUSE</STRONG>  is returned for mouse-events (see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>).  This
-           code relies upon  whether  or  not  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  has  been  enabled,
-           because  (e.g.,  with  <STRONG>xterm(1)</STRONG> mouse prototocol) <EM>ncurses</EM> must read
-           escape sequences, just like a function key.
+       <STRONG>o</STRONG>   The  naming  convention  may  seem  obscure,  with  some   apparent
+           misspellings  (such  as "RSUME" for "resume"); The names correspond
+           to  the  <EM>terminfo</EM>  capability  names  for  the   keys,   and   were
+           standardized  before  the  IBM  PC/AT  keyboard  layout  achieved a
+           dominant position in industry.
+
+              <STRONG>Symbol</STRONG>          <STRONG>Key</STRONG> <STRONG>name</STRONG>
+              -----------------------------------------------------------------
+              <STRONG>KEY_BREAK</STRONG>       Break key
+              <STRONG>KEY_DOWN</STRONG>
+              <STRONG>KEY_UP</STRONG>          Arrow keys
+              <STRONG>KEY_LEFT</STRONG>
+              <STRONG>KEY_RIGHT</STRONG>
+              <STRONG>KEY_HOME</STRONG>        Home key (upward+left arrow)
+              <STRONG>KEY_BACKSPACE</STRONG>   Backspace
+              <STRONG>KEY_F0</STRONG>          Function keys; space for 64 keys is reserved
+              <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG>        Function key <EM>n</EM> where 0 &lt;= <EM>n</EM> &lt;= 63
+
+              <STRONG>KEY_DL</STRONG>          Delete line
+              <STRONG>KEY_IL</STRONG>          Insert line
+              <STRONG>KEY_DC</STRONG>          Delete character
+              <STRONG>KEY_IC</STRONG>          Insert character/Enter insert mode
+              <STRONG>KEY_EIC</STRONG>         Exit insert character mode
+              <STRONG>KEY_CLEAR</STRONG>       Clear screen
+              <STRONG>KEY_EOS</STRONG>         Clear to end of screen
+              <STRONG>KEY_EOL</STRONG>         Clear to end of line
+              <STRONG>KEY_SF</STRONG>          Scroll one line forward
+              <STRONG>KEY_SR</STRONG>          Scroll one line backward (reverse)
+              <STRONG>KEY_NPAGE</STRONG>       Next page/Page up
+              <STRONG>KEY_PPAGE</STRONG>       Previous page/Page down
+              <STRONG>KEY_STAB</STRONG>        Set tab
+              <STRONG>KEY_CTAB</STRONG>        Clear tab
+              <STRONG>KEY_CATAB</STRONG>       Clear all tabs
+              <STRONG>KEY_ENTER</STRONG>       Enter/Send
+              <STRONG>KEY_SRESET</STRONG>      Soft (partial) reset
+              <STRONG>KEY_RESET</STRONG>       (Hard) reset
+              <STRONG>KEY_PRINT</STRONG>       Print/Copy
+              <STRONG>KEY_LL</STRONG>          Home down/Bottom (lower left)
+              <STRONG>KEY_A1</STRONG>          Upper left of keypad
+              <STRONG>KEY_A3</STRONG>          Upper right of keypad
+              <STRONG>KEY_B2</STRONG>          Center of keypad
+              <STRONG>KEY_C1</STRONG>          Lower left of keypad
+              <STRONG>KEY_C3</STRONG>          Lower right of keypad
+              <STRONG>KEY_BTAB</STRONG>        Back tab key
+              <STRONG>KEY_BEG</STRONG>         Beg(inning) key
+              <STRONG>KEY_CANCEL</STRONG>      Cancel key
+              <STRONG>KEY_CLOSE</STRONG>       Close key
+              <STRONG>KEY_COMMAND</STRONG>     Cmd (command) key
+              <STRONG>KEY_COPY</STRONG>        Copy key
+              <STRONG>KEY_CREATE</STRONG>      Create key
+              <STRONG>KEY_END</STRONG>         End key
+              <STRONG>KEY_EXIT</STRONG>        Exit key
+              <STRONG>KEY_FIND</STRONG>        Find key
+              <STRONG>KEY_HELP</STRONG>        Help key
+              <STRONG>KEY_MARK</STRONG>        Mark key
+              <STRONG>KEY_MESSAGE</STRONG>     Message key
+              <STRONG>KEY_MOUSE</STRONG>       Mouse event occurred
+              <STRONG>KEY_MOVE</STRONG>        Move key
+              <STRONG>KEY_NEXT</STRONG>        Next object key
+              <STRONG>KEY_OPEN</STRONG>        Open key
+              <STRONG>KEY_OPTIONS</STRONG>     Options key
+              <STRONG>KEY_PREVIOUS</STRONG>    Previous object key
+              <STRONG>KEY_REDO</STRONG>        Redo key
+              <STRONG>KEY_REFERENCE</STRONG>   Ref(erence) key
+              <STRONG>KEY_REFRESH</STRONG>     Refresh key
+              <STRONG>KEY_REPLACE</STRONG>     Replace key
+              <STRONG>KEY_RESIZE</STRONG>      Screen resized
+              <STRONG>KEY_RESTART</STRONG>     Restart key
+              <STRONG>KEY_RESUME</STRONG>      Resume key
+              <STRONG>KEY_SAVE</STRONG>        Save key
+              <STRONG>KEY_SELECT</STRONG>      Select key
+              <STRONG>KEY_SUSPEND</STRONG>     Suspend key
+              <STRONG>KEY_UNDO</STRONG>        Undo key
+              -----------------------------------------------------------------
+              <STRONG>KEY_SBEG</STRONG>        Shifted beginning key
+              <STRONG>KEY_SCANCEL</STRONG>     Shifted cancel key
+              <STRONG>KEY_SCOMMAND</STRONG>    Shifted command key
+              <STRONG>KEY_SCOPY</STRONG>       Shifted copy key
+              <STRONG>KEY_SCREATE</STRONG>     Shifted create key
+              <STRONG>KEY_SDC</STRONG>         Shifted delete character key
+              <STRONG>KEY_SDL</STRONG>         Shifted delete line key
+              <STRONG>KEY_SEND</STRONG>        Shifted end key
+              <STRONG>KEY_SEOL</STRONG>        Shifted clear line key
+
+              <STRONG>KEY_SEXIT</STRONG>       Shifted exit key
+              <STRONG>KEY_SFIND</STRONG>       Shifted find key
+              <STRONG>KEY_SHELP</STRONG>       Shifted help key
+              <STRONG>KEY_SHOME</STRONG>       Shifted home key
+              <STRONG>KEY_SIC</STRONG>         Shifted insert key
+              <STRONG>KEY_SLEFT</STRONG>       Shifted left arrow key
+              <STRONG>KEY_SMESSAGE</STRONG>    Shifted message key
+              <STRONG>KEY_SMOVE</STRONG>       Shifted move key
+              <STRONG>KEY_SNEXT</STRONG>       Shifted next object key
+              <STRONG>KEY_SOPTIONS</STRONG>    Shifted options key
+              <STRONG>KEY_SPREVIOUS</STRONG>   Shifted previous object key
+              <STRONG>KEY_SPRINT</STRONG>      Shifted print key
+              <STRONG>KEY_SREDO</STRONG>       Shifted redo key
+              <STRONG>KEY_SREPLACE</STRONG>    Shifted replace key
+              <STRONG>KEY_SRIGHT</STRONG>      Shifted right arrow key
+              <STRONG>KEY_SRSUME</STRONG>      Shifted resume key
+              <STRONG>KEY_SSAVE</STRONG>       Shifted save key
+              <STRONG>KEY_SSUSPEND</STRONG>    Shifted suspend key
+              <STRONG>KEY_SUNDO</STRONG>       Shifted undo key
+
+       The keypad is arranged as follows.
+
+                                   +-----+------+-------+
+                                   | A1  |  up  |  A3   |
+                                   +-----+------+-------+
+                                   |left |  B2  | right |
+                                   +-----+------+-------+
+                                   | C1  | down |  C3   |
+                                   +-----+------+-------+
+       Two of these symbols do <EM>not</EM> correspond to a real key.
+
+       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns <STRONG>KEY_RESIZE</STRONG> (even if  the  window's  keypad  mode  is
+           disabled) when <EM>ncurses</EM> detects the <STRONG>SIGWINCH</STRONG> signal; see <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>
+           and <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
+
+       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is  pending
+           collection;  see  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.   Receipt of this code requires a
+           window's keypad mode to be  enabled,  because  to  interpret  mouse
+           input (as with with <STRONG>xterm(1)</STRONG>'s mouse prototocol), <EM>ncurses</EM> must read
+           an escape sequence, as with a function key.
 
 
 </PRE><H3><a name="h3-Testing-Key-Codes">Testing Key Codes</a></H3><PRE>
-       The <STRONG>has_key</STRONG> routine takes a key-code value from  the  above  list,  and
-       returns  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG> according to whether the current terminal type
-       recognizes a key with that value.
-
-       The library also supports these extensions:
-
-          <STRONG>define_key</STRONG>
-               defines a key-code for a given string (see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>).
-
-          <STRONG>key_defined</STRONG>
-               checks if there is a key-code defined for a given  string  (see
-               <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>).
+       In <EM>ncurses</EM>, <STRONG>has_key</STRONG> takes a key code value from  the  above  list,  and
+       returns  a  Boolean  value indicating the terminal's recognition of it.
+       See also <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> and <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines  return the integer <STRONG>ERR</STRONG> upon failure and an integer value
-       other than <STRONG>ERR</STRONG> (<STRONG>OK</STRONG> in the case of <STRONG>ungetch</STRONG>) upon successful completion.
+       <STRONG>wgetch</STRONG> returns <STRONG>ERR</STRONG> if
 
-          <STRONG>ungetch</STRONG>
-               returns <STRONG>ERR</STRONG> if there is no more room in the FIFO.
+       <STRONG>o</STRONG>   the <EM>WINDOW</EM> pointer is <STRONG>NULL</STRONG>, or
 
-          <STRONG>wgetch</STRONG>
-               returns <STRONG>ERR</STRONG>
+       <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
-               <STRONG>o</STRONG>   if the window pointer is null, or
+       <STRONG>o</STRONG>   execution was interrupted by a signal, in which case <STRONG>errno</STRONG>  is  set
+           to <STRONG>EINTR</STRONG>.
 
-               <STRONG>o</STRONG>   if its timeout expires without having any data, or
+       Functions  with  a  "mv"  prefix  first  perform  cursor movement using
+       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
+       functions) if the <EM>win</EM> parameter is a null pointer.
 
-               <STRONG>o</STRONG>   if the execution was interrupted by a signal (<STRONG>errno</STRONG> will be
-                   set to <STRONG>EINTR</STRONG>).
+       <STRONG>ungetch</STRONG>  returns  <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
+       input queue.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       <STRONG>has_key</STRONG> returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Use  of  the escape key by a programmer for a single character function
-       is discouraged, as it will cause a delay of up to one second while  the
-       keypad code looks for a following function-key sequence.
+       <EM>curses</EM> discourages assignment of the ESC key to a discrete function  by
+       the programmer because the library requires a delay while it awaits the
+       potential remainder of a terminal escape sequence.
 
-       Some  keys  may  be  the  same  as  commonly  used  control keys, e.g.,
-       <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG>  versus  control/H.   Some
-       curses implementations may differ according to whether they treat these
-       control keys specially (and ignore the terminfo), or use  the  terminfo
-       definitions.   <EM>ncurses</EM>  uses  the terminfo definition.  If it says that
-       <STRONG>KEY_ENTER</STRONG> is control/M, <STRONG>getch</STRONG> will  return  <STRONG>KEY_ENTER</STRONG>  when  you  press
-       control/M.
+       Some key strokes are indistinguishable  from  control  characters;  for
+       example,  <STRONG>KEY_ENTER</STRONG> may be the same as <STRONG>^M</STRONG>, and <STRONG>KEY_BACKSPACE</STRONG> may be the
+       same as <STRONG>^H</STRONG> or <STRONG>^?</STRONG>.  Consult the terminal's <EM>terminfo</EM> entry  to  determine
+       whether this is the case; see <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG>.  Some <EM>curses</EM> implementations,
+       including <EM>ncurses</EM>, honor the <EM>terminfo</EM>  key  definitions;  others  treat
+       such control characters specially.
 
-       Generally,  <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the <EM>Enter</EM> key on
-       the numeric keypad:
+       <EM>curses</EM>  distinguishes  the  Enter  keys  in  the alphabetic and numeric
+       keypad sections of a keyboard because (most) terminals  do.   <STRONG>KEY_ENTER</STRONG>
+       refers  to  the  key  on  the (numeric) keypad and, like other function
+       keys, is reliably recognized  only  if  the  window's  keypad  mode  is
+       enabled.
 
-       <STRONG>o</STRONG>   the terminal description lists the most useful keys,
+       <STRONG>o</STRONG>   The  <EM>terminfo</EM>  <STRONG>key_enter</STRONG>  (<STRONG>kent</STRONG>) capability describes the character
+           (sequence) sent by the terminal's keypad Enter key.
 
-       <STRONG>o</STRONG>   the <EM>Enter</EM> key on the regular keyboard is  already  handled  by  the
-           standard ASCII characters for carriage-return and line-feed,
+       <STRONG>o</STRONG>   "Enter or send" is X/Open Curses's description of this key.
 
-       <STRONG>o</STRONG>   depending on whether <STRONG>nl</STRONG> or <STRONG>nonl</STRONG> was called, pressing "Enter" on the
-           regular keyboard may return either a carriage-return or  line-feed,
-           and finally
+       <EM>curses</EM> treats the Enter or Return key in the <EM>alphabetic</EM> section of  the
+       keyboard differently.
 
-       <STRONG>o</STRONG>   "Enter or send" is the standard description for this key.
+       <STRONG>o</STRONG>   It usually produces a control code for carriage return (<STRONG>^M</STRONG>) or line
+           feed (<STRONG>^J</STRONG>).
 
-       When   using   <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,  or  <STRONG>mvwgetch</STRONG>,  nocbreak  mode
-       (<STRONG>nocbreak</STRONG>) and echo mode (<STRONG>echo</STRONG>) should not be used at  the  same  time.
-       Depending  on the state of the tty driver when each character is typed,
-       the program may produce undesirable results.
+       <STRONG>o</STRONG>   Depending on the terminal mode  (raw,  cbreak,  or  "cooked"),  and
+           whether  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  or  <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG>  has  been  called, <STRONG>wgetch</STRONG> may return
+           either a carriage return or line feed upon an Enter or  Return  key
+           stroke.
 
-       Note that <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be macros.
+       Use  of  <STRONG>wgetch</STRONG> with <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> and neither <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> nor <STRONG><A HREF="curs_inopts.3x.html">raw(3x)</A></STRONG> is not
+       well-defined.
 
-       Historically, the set of keypad  macros  was  largely  defined  by  the
-       extremely  function-key-rich  keyboard  of  the AT&amp;T 7300, aka 3B1, aka
-       Safari 4.  Modern personal computers usually have only a  small  subset
-       of  these.   IBM  PC-style  consoles typically support little more than
-       <STRONG>KEY_UP</STRONG>, <STRONG>KEY_DOWN</STRONG>, <STRONG>KEY_LEFT</STRONG>, <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,  <STRONG>KEY_NPAGE</STRONG>,
-       <STRONG>KEY_PPAGE</STRONG>,  and  function  keys  1  through 12.  The Ins key is usually
-       mapped to <STRONG>KEY_IC</STRONG>.
+       Historically, the list of key code macros above was influenced  by  the
+       function-key-rich  keyboard  of  the AT&amp;T 7300 (also known variously as
+       the "3B1", "Safari  4",  and  "UNIX  PC"),  a  1985  machine.   Today's
+       computer keyboards are based on the IBM PC/AT keyboard and tend to have
+       fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
+       codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
+       <STRONG>KEY_PPAGE</STRONG> (Page Up), <STRONG>KEY_NPAGE</STRONG> (Page  Down),  <STRONG>KEY_IC</STRONG>  (Insert),  <STRONG>KEY_DC</STRONG>
+       (Delete), and <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG> for 1 &lt;= <EM>n</EM> &lt;= 12.
+
+       <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       In <EM>ncurses</EM>, when a window's "no time-out" mode is <EM>not</EM> set, the <STRONG>ESCDELAY</STRONG>
+       variable configures the duration of the timer used  to  disambiguate  a
+       function  key character sequence from a series of key strokes beginning
+       with ESC typed by the user; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+
        <STRONG>has_key</STRONG> was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4  <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous curses implementation.
 
@@ -356,48 +378,51 @@ <H1 class="no-header">curs_getch 3x 2024-02-17 ncurses 6.4 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4, Version 2, describes  <STRONG>getch</STRONG>,  <STRONG>wgetch</STRONG>,  <STRONG>mvgetch</STRONG>,
-       <STRONG>mvwgetch</STRONG>,  and  <STRONG>ungetch</STRONG>.   They  read single-byte characters only.  The
-       standard specifies that they return <STRONG>ERR</STRONG> on failure,  but  describes  no
-       failure conditions.
+       X/Open Curses, Issue 4, describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>, and
+       <STRONG>ungetch</STRONG>.  It specifies no error conditions for them.
+
+       <STRONG>wgetch</STRONG> reads only single-byte characters.
 
        The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
        characters  was  not  specified  in  the  SVr4   documentation.    This
        description is adapted from X/Open Curses.
 
-       The behavior of <STRONG>getch</STRONG> and friends in the presence of signal handlers is
-       unspecified  in  the  SVr4  documentation  and  X/Open  Curses.   Under
-       historical  curses  implementations, it varied depending on whether the
-       operating system's dispatch of a  signal  to  a  handler  interrupts  a
-       <STRONG>read(2)</STRONG>  call  in  progress  or not, and also (in some implementations)
-       whether an input timeout or non-blocking mode has been set.
+       The   behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of  signal  handlers  is
+       unspecified in the SVr4 documentation and X/Open Curses.  In historical
+       <EM>curses</EM>  implementations,  it  varied depending on whether the operating
+       system's dispatch of a signal to a handler interrupts a <STRONG>read(2)</STRONG> call in
+       progress  or  not,  and also (in some implementations) whether an input
+       timeout or non-blocking mode has been set.  Programmers concerned about
+       portability  should  be  prepared  for  either of two cases: (a) signal
+       receipt does not interrupt <STRONG>wgetch</STRONG>; or  (b)  signal  receipt  interrupts
+       <STRONG>wgetch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
+       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> is an  extension  first  implemented  for  <EM>ncurses.</EM>   NetBSD
-       <EM>curses</EM> later added this extension.
+       <STRONG>KEY_RESIZE</STRONG>  and  <STRONG>has_key</STRONG>  are extensions first implemented for <EM>ncurses</EM>.
+       By  2022,  <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  had  added  them  along  with
+       <STRONG>KEY_MOUSE</STRONG>.
 
-       Programmers  concerned  about portability should be prepared for either
-       of two cases: (a) signal receipt does not interrupt <STRONG>getch</STRONG>;  (b)  signal
-       receipt  interrupts <STRONG>getch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to
-       <STRONG>EINTR</STRONG>.
 
-       The <STRONG>has_key</STRONG> function is unique to <EM>ncurses</EM>.  We recommend that any  code
-       using it be conditionalized on the <STRONG>NCURSES_VERSION</STRONG> feature macro.
+</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
+       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       in its wide-character configuration (<EM>ncursesw</EM>).
 
-</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
+       publications-and-standards/standards/ecma-6/&gt;
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
+       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
+       ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
 
 
 
-ncurses 6.4                       2024-02-17                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index d74d8317d..ef4ad6882 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.52 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_getstr.3x,v 1.54 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -240,7 +240,7 @@ <H1 class="no-header">curs_getstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index be5b1c2e6..bc69247f0 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.40 2023/12/16 21:33:21 tom Exp @
+  * @Id: curs_getyx.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index dde1ae01a..c5c4ac6af 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.24 2023/11/18 18:00:11 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.26 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">curs_in_wch 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 099d6d5e9..1c671d35d 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.32 2023/11/18 20:55:18 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-18                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 669392867..e4690a1c3 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.44 2024/01/13 22:05:39 tom Exp @
+  * @Id: curs_inch.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -135,7 +135,7 @@ <H1 class="no-header">curs_inch 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 93ed74bb7..4dfe5f7c4 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.40 2023/11/19 00:08:58 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2023-11-18 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_inchstr 3x 2023-11-18 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-18                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 88d17fedb..5f741d30d 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.62 2024/02/24 20:03:50 tom Exp @
+  * @Id: curs_initscr.3x,v 1.64 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-24                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index fbfec3cdc..966b645a2 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.60 2023/12/23 16:36:18 tom Exp @
+  * @Id: curs_inopts.3x,v 1.64 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        this  is  equivalent,  under  POSIX,  to  setting  the  CS8 flag on the
        terminal.  To force 7 bits to be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>FALSE</STRONG>);
        this  is  equivalent,  under  POSIX,  to  setting  the  CS7 flag on the
-       terminal.  The  window  argument,  <EM>win,</EM>  is  always  ignored.   If  the
+       terminal.  The  window  argument,  <EM>win</EM>,  is  always  ignored.   If  the
        terminfo  capabilities <STRONG>smm</STRONG> (meta_on) and <STRONG>rmm</STRONG> (meta_off) are defined for
        the terminal, <STRONG>smm</STRONG> is sent to  the  terminal  when  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>)  is
        called and <STRONG>rmm</STRONG> is sent when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        that  in  raw  mode,  the  interrupt,  quit,  suspend, and flow control
        characters are all passed through uninterpreted, instead of  generating
        a  signal.   The behavior of the BREAK key depends on other bits in the
-       terminal driver that are not set by <EM>curses.</EM>
+       terminal driver that are not set by <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-qiflush_nqiflush">qiflush, nqiflush</a></H3><PRE>
@@ -237,10 +237,10 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        completion,  unless  otherwise   noted   in   the   preceding   routine
        descriptions.
 
-       X/Open  does  not define any error conditions.  In this implementation,
-       functions with a window parameter will return an error if it  is  null.
-       Any  function  will  also  return  an  error  if  the  terminal was not
-       initialized.  Also,
+       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       implementation, functions with a window parameter will return an  error
+       if  it is null.  Any function will also return an error if the terminal
+       was not initialized.  Also,
 
           <STRONG>halfdelay</STRONG>
                returns an error if its parameter is outside the range 1..255.
@@ -325,7 +325,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        Most <EM>curses</EM> implementations (including <EM>ncurses</EM>) load key definitions in
        the  order  defined  by the array of string capability names.  The last
        key to be loaded determines the keycode which  will  be  returned.   In
-       <EM>ncurses,</EM>  you  may  also  have extended capabilities interpreted as key
+       <EM>ncurses</EM>,  you  may  also  have extended capabilities interpreted as key
        definitions.  These are loaded after the  predefined  keys,  and  if  a
        capability's  value  is the same as a previously-loaded key definition,
        the later definition is the one used.
@@ -337,7 +337,7 @@ <H1 class="no-header">curs_inopts 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 129673020..914017a0d 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.26 2023/12/23 16:03:24 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.28 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_ins_wch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index b542bf8e0..6cf946dc8 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.30 2023/12/16 20:36:15 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.32 2024/03/16 15:48:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -86,8 +86,8 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error
+       X/Open  Curses  does  not   specify   any   error   conditions.    This
+       implementation returns an error
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -122,7 +122,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 0e3683c21..f8575018e 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.36 2023/12/23 16:03:24 tom Exp @
+  * @Id: curs_insch.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_insch 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index b92975ae4..1a763d28e 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.46 2023/11/25 11:29:34 tom Exp @
+  * @Id: curs_insstr.3x,v 1.48 2024/03/16 15:49:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -84,8 +84,8 @@ <H1 class="no-header">curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
-       X/Open  does  not  define  any  error  conditions.  This implementation
-       returns an error
+       X/Open   Curses   does   not   specify   any  error  conditions.   This
+       implementation returns an error
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -122,7 +122,7 @@ <H1 class="no-header">curs_insstr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index efc2a3913..0c3b755bf 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_instr.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_instr 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index b6030e3eb..7b034b202 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.36 2023/12/30 21:32:48 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_inwstr 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-30                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 4cd5599a6..8d91ff0b9 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.54 2024/02/24 19:57:34 tom Exp @
+  * @Id: curs_kernel.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -209,7 +209,7 @@ <H1 class="no-header">curs_kernel 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-24                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 0996d5f73..c4f34e9c7 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.30 2023/12/23 16:40:10 tom Exp @
+  * @Id: curs_legacy.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -127,7 +127,7 @@ <H1 class="no-header">curs_legacy 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 4c1876f70..5ebb8dc22 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_memleaks.3x,v 1.33 2023/12/23 16:22:08 tom Exp @
+  * @Id: curs_memleaks.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 16771c76b..de0d7be9b 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.92 2024/02/24 19:54:30 tom Exp @
+  * @Id: curs_mouse.3x,v 1.96 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -215,7 +215,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
        The  <STRONG>mouseinterval</STRONG>  function  sets  the maximum time (in thousands of a
        second) that can elapse between press and release events for them to be
-       resolved  as  a <EM>click.</EM>  An application might interpret button press and
+       resolved  as  a <EM>click</EM>.  An application might interpret button press and
        release events separated by more than the mouse  interval  as  a  "long
        press", or, with motion, as a "drag".
 
@@ -273,7 +273,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        The  order  of  the  <STRONG>MEVENT</STRONG>  structure  members  is   not   guaranteed.
        Additional fields may be added to the structure in the future.
 
-       Under  <EM>ncurses,</EM> these calls are implemented using either <EM>xterm</EM>'s built-
+       Under  <EM>ncurses</EM>, these calls are implemented using either <EM>xterm</EM>'s built-
        in mouse-tracking API or platform-specific drivers including
 
           <STRONG>o</STRONG>   Alessandro Rubini's gpm server
@@ -301,7 +301,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        or with 3D-mice/trackballs/power gloves.
 
        The <STRONG>ALL_MOUSE_EVENTS</STRONG>  class  does  not  include  <STRONG>REPORT_MOUSE_POSITION</STRONG>.
-       They  are  distinct.   For example, in <EM>xterm,</EM> wheel/scrolling mice send
+       They  are  distinct.   For example, in <EM>xterm</EM>, wheel/scrolling mice send
        position reports as a sequence of presses of buttons  4  or  5  without
        matching button-releases.
 
@@ -358,13 +358,13 @@ <H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
            capability.
 
            Those  features  required a terminal program that had been modified
-           to work with SVr4 <EM>curses.</EM>  They were not part of the X Consortium's
-           <EM>xterm.</EM>
+           to work with SVr4 <EM>curses</EM>.  They were not part of the X Consortium's
+           <EM>xterm</EM>.
 
        When  developing the <EM>xterm</EM> mouse support for <EM>ncurses</EM> in September 1995,
        Eric Raymond was uninterested in using the same interface  due  to  its
        lack of documentation.  Later, in 1998, Mark Hesseling provided support
-       in <EM>PDCurses</EM> 2.3 using the SVr4 interface.  <EM>PDCurses,</EM> however, does  not
+       in <EM>PDCurses</EM> 2.3 using the SVr4 interface.  <EM>PDCurses</EM>, however, does  not
        use  video  terminals,  making  it  unnecessary  to  be concerned about
        compatibility with the escape sequences.
 
@@ -395,7 +395,7 @@ <H1 class="no-header">curs_mouse 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-24                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 284ff7862..53047bef7 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.33 2023/12/16 21:33:08 tom Exp @
+  * @Id: curs_move.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 89126bad7..7a72b4823 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.41 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_opaque 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 0d9dafe78..783379846 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.56 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_outopts.3x,v 1.58 2024/03/16 15:49:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -148,7 +148,7 @@ <H1 class="no-header">curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        upon  failure.  All other routines that return an integer always return
        <STRONG>OK</STRONG>.
 
-       X/Open Curses does not define any error conditions.
+       X/Open Curses does not specify any error conditions.
 
        In this implementation,
 
@@ -158,8 +158,8 @@ <H1 class="no-header">curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
            outside the window.
 
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error if the window pointer is null.
+       X/Open  Curses  does  not   specify   any   error   conditions.    This
+       implementation returns an error if the window pointer is null.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -205,7 +205,7 @@ <H1 class="no-header">curs_outopts 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 72b96675e..6b9c9c54f 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.39 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_overlay.3x,v 1.41 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 50f00ef43..511572aa1 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.53 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_pad.3x,v 1.55 2024/03/16 15:49:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -137,7 +137,7 @@ <H1 class="no-header">curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        Functions that return pointers return <STRONG>NULL</STRONG> on error, and set  <STRONG>errno</STRONG>  to
        <STRONG>ENOMEM</STRONG>.
 
-       X/Open   Curses   does  not  define  any  error  conditions.   In  this
+       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
        implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
@@ -231,7 +231,7 @@ <H1 class="no-header">curs_pad 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 3fde9295e..9dafeabf4 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.36 2023/12/23 16:36:18 tom Exp @
+  * @Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_print 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 44ada64dc..ab4b2997d 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.47 2023/12/23 14:41:07 tom Exp @
+  * @Id: curs_printw.3x,v 1.51 2024/03/23 20:38:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -79,7 +79,7 @@ <H1 class="no-header">curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
-       In <EM>ncurses,</EM> failure occurs if the library cannot allocate enough memory
+       In <EM>ncurses</EM>, failure occurs if the library cannot allocate enough memory
        for the buffer into which the output is formatted,  or  if  the  window
        pointer <EM>win</EM> is null.
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        <EM>varargs.h</EM>,  though  that  had been available since Seventh Edition Unix
        (1979).  In 1991 (a couple of years after SVr4 was generally available,
        and  after  the C standard was published), other developers updated the
-       library, using <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses.</EM>   Even  with  this
+       library, using <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses</EM>.   Even  with  this
        improvement,  BSD  <EM>curses</EM>  did  not  use  function prototypes (nor even
        declare functions) in <EM>curses.h</EM> until 1992.
 
@@ -147,7 +147,7 @@ <H1 class="no-header">curs_printw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index d4d25951b..3f6369474 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.42 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_refresh.3x,v 1.44 2024/03/16 15:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -127,14 +127,15 @@ <H1 class="no-header">curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</H1>
        specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       X/Open does not define any error conditions.  In this implementation
+       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       implementation
 
           <STRONG>wnoutrefresh</STRONG>
-               returns  an  error  if  the  window  pointer is null, or if the
+               returns an error if the window  pointer  is  null,  or  if  the
                window is really a pad.
 
           <STRONG>wredrawln</STRONG>
-               returns an error if the associated call to <STRONG>touchln</STRONG>  returns  an
+               returns  an  error if the associated call to <STRONG>touchln</STRONG> returns an
                error.
 
 
@@ -145,12 +146,12 @@ <H1 class="no-header">curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The XSI Curses standard, Issue 4 describes these functions.
 
-       Whether  <STRONG>wnoutrefresh</STRONG>  copies to the virtual screen the entire contents
+       Whether <STRONG>wnoutrefresh</STRONG> 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
+       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 <STRONG>touchwin</STRONG>
-       before the <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an  entire-contents  copy
+       before  the  <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an entire-contents copy
        anywhere.
 
 
@@ -159,7 +160,7 @@ <H1 class="no-header">curs_refresh 3x 2024-01-05 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-05                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index b7da265df..9e1d30910 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.47 2023/12/23 14:41:50 tom Exp @
+  * @Id: curs_scanw.3x,v 1.51 2024/03/23 20:41:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        These functions return <STRONG>ERR</STRONG>  upon  failure  and  otherwise  a  count  of
        successful conversions; this quantity may be zero.
 
-       In  <EM>ncurses,</EM> failure occurs if <STRONG>vsscanf(3)</STRONG> returns <STRONG>EOF</STRONG>, or if the window
+       In  <EM>ncurses</EM>, failure occurs if <STRONG>vsscanf(3)</STRONG> returns <STRONG>EOF</STRONG>, or if the window
        pointer <EM>win</EM> is null.
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
            this may have been an  editorial  solecism  introduced  by  X/Open,
            rather than an intentional change.
 
-       <STRONG>o</STRONG>   This  implementation retains compatibility with SVr4 <EM>curses.</EM>  As of
+       <STRONG>o</STRONG>   This  implementation retains compatibility with SVr4 <EM>curses</EM>.  As of
            2018,  NetBSD  <EM>curses</EM>  also  returns  the  number   of   successful
            conversions.   Both  <EM>ncurses</EM>  and  NetBSD <EM>curses</EM> call <STRONG>vsscanf(3)</STRONG> to
            scan the string, which returns <STRONG>EOF</STRONG> on error.
@@ -148,7 +148,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
        that  had been available since Seventh Edition Unix (1979).  In 1991 (a
        couple of years after SVr4 was generally available,  and  after  the  C
        standard  was  published),  other developers updated the library, using
-       <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses.</EM>  Even with this improvement,  BSD
+       <EM>stdarg.h</EM> internally in 4.4BSD <EM>curses</EM>.  Even with this improvement,  BSD
        <EM>curses</EM>  did not use function prototypes (nor even declare functions) in
        <EM>curses.h</EM> until 1992.
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_scanw 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 15753f736..66806000d 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.37 2023/12/30 21:34:11 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.41 2024/03/23 20:41:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -80,7 +80,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-scr_init">scr_init</a></H3><PRE>
-       <STRONG>scr_init</STRONG>  reads <EM>filename,</EM> using it to initialize <EM>curses</EM> data structures
+       <STRONG>scr_init</STRONG>  reads <EM>filename</EM>, using it to initialize <EM>curses</EM> data structures
        describing the state of the terminal screen.  If these data are  valid,
        <EM>curses</EM>  bases  its next update of the screen on this information rather
        than clearing it and starting from scratch.
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</H1>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
        X/Open defines no failure conditions.   In  this  implementation,  each
-       function fails if it cannot open <EM>filename.</EM>
+       function fails if it cannot open <EM>filename</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_scr_dump 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-30                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 48e7865fd..6656b0400 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.36 2023/12/16 22:52:35 tom Exp @
+  * @Id: curs_scroll.3x,v 1.40 2024/03/23 20:41:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -68,11 +68,11 @@ <H1 class="no-header">curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</H1>
        screen may be scrolled at the same time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
        <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scroll  <STRONG>stdscr</STRONG>  or  the  specified  window  up  or  down
-       depending on the sign of <EM>n.</EM>
+       depending on the sign of <EM>n</EM>.
 
-       <STRONG>o</STRONG>   For positive <EM>n,</EM> line <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM> (scrolling up);
+       <STRONG>o</STRONG>   For positive <EM>n</EM>, line <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM> (scrolling up);
 
-       <STRONG>o</STRONG>   for negative <EM>n,</EM> line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling down).
+       <STRONG>o</STRONG>   for negative <EM>n</EM>, line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling down).
 
        The  cursor does not move.  These functions perform no operation unless
        scrolling is enabled for the window via <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 2ef16489e..f0851713e 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.67 2023/12/16 21:18:45 tom Exp @
+  * @Id: curs_slk.3x,v 1.69 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -313,7 +313,7 @@ <H1 class="no-header">curs_slk 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 480f998aa..116325126 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.46 2023/12/23 16:26:05 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.48 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index c7abf66eb..f3d8eabe1 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.34 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-01-05 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-01-05                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index f7d0608c3..b35ae8cb3 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.81 2023/12/30 21:27:22 tom Exp @
+  * @Id: curs_termcap.3x,v 1.83 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2023-12-30 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2023-12-30 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_termcap 3x 2023-12-30 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-30                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 76831d356..9ee551e50 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.130 2024/02/24 20:04:09 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.134 2024/03/23 20:41:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -162,7 +162,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
        <STRONG>setupterm</STRONG> reads in the <EM>terminfo</EM>  database,  initializing  the  <EM>terminfo</EM>
        structures,  but  does  not set up the output virtualization structures
-       used by <EM>curses.</EM>  Its parameters follow.
+       used by <EM>curses</EM>.  Its parameters follow.
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <EM>TERM</EM> is read.
@@ -172,8 +172,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                I/O modes.
 
                Higher-level applications use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to  initialize  the
-               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor.</EM>
-               In  <EM>curses,</EM>  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
+               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
+               In  <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
                <STRONG>setupterm</STRONG>,  passing the file descriptor derived from its output
                stream parameter.
 
@@ -181,7 +181,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                points to an optional location where an  error  status  can  be
                returned  to the caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
                returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
-               pointed  to  by  <EM>errret.</EM>   A  return  value of <STRONG>OK</STRONG> combined with
+               pointed  to  by  <EM>errret</EM>.   A  return  value of <STRONG>OK</STRONG> combined with
                status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret:</EM>
@@ -222,8 +222,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        terminal  types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set of
        terminal capabilities.
 
-       <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm,</EM>  and  makes  all  of  the  <EM>terminfo</EM>
-       Boolean,  numeric,  and string variables use the values from <EM>nterm.</EM>  It
+       <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>,  and  makes  all  of  the  <EM>terminfo</EM>
+       Boolean,  numeric,  and string variables use the values from <EM>nterm</EM>.  It
        returns the old value of <STRONG>cur_term</STRONG>.
 
        <STRONG>del_curterm</STRONG> frees the space pointed to by <EM>oterm</EM> and makes it  available
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi.</EM>   A  pointer  is
+       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi</EM>.   A  pointer  is
        returned to the result of <EM>str</EM> with the parameters applied.  Application
        developers should keep in mind these quirks of the interface:
 
@@ -306,8 +306,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
        <STRONG>vidputs</STRONG> displays the string on the terminal in the video attribute mode
-       <EM>attrs,</EM> which is any combination of the attributes listed in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
-       The characters are passed to the <EM>putchar</EM>-like function <EM>putc.</EM>
+       <EM>attrs</EM>, which is any combination of the attributes listed in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
+       The characters are passed to the <EM>putchar</EM>-like function <EM>putc</EM>.
 
        <STRONG>vidattr</STRONG> is like <STRONG>vidputs</STRONG>, except that it outputs through <STRONG>putchar(3)</STRONG>.
 
@@ -315,9 +315,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        They use multiple parameters to represent the character attributes  and
        color; namely,
 
-       <STRONG>o</STRONG>   <EM>attrs,</EM> of type <EM>attr</EM><STRONG>_</STRONG><EM>t,</EM> for the attributes and
+       <STRONG>o</STRONG>   <EM>attrs</EM>, of type <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, for the attributes and
 
-       <STRONG>o</STRONG>   <EM>pair,</EM> of type <EM>short,</EM> for the color pair number.
+       <STRONG>o</STRONG>   <EM>pair</EM>, of type <EM>short</EM>, for the color pair number.
 
        Use  the  attribute  constants  prefixed  with  "<STRONG>WA_</STRONG>" with <STRONG>vid_attr</STRONG> and
        <STRONG>vid_puts</STRONG>.
@@ -339,7 +339,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
        <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, and <STRONG>tigetstr</STRONG> return the value  of  the  capability
-       corresponding  to  the <EM>terminfo</EM> <EM>cap-code,</EM> such as <STRONG>xenl</STRONG>, passed to them.
+       corresponding  to  the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed to them.
        The <EM>cap-code</EM> for each capability is given in the table column  entitled
        <EM>cap-code</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
@@ -407,7 +407,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       X/Open Curses defines no failure conditions.  In <EM>ncurses,</EM>
+       X/Open Curses defines no failure conditions.  In <EM>ncurses</EM>,
 
        <STRONG>del_curtem</STRONG>
             fails if its terminal parameter is null.
@@ -442,11 +442,11 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The functions marked as extensions were designed for <EM>ncurses,</EM>  and  are
+       The functions marked as extensions were designed for <EM>ncurses</EM>,  and  are
        not  found  in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM>
        implementation.
 
-       <EM>ncurses</EM> allows <EM>opts</EM> to be a pointer to <EM>int,</EM> which  overrides  the  <EM>pair</EM>
+       <EM>ncurses</EM> allows <EM>opts</EM> to be a pointer to <EM>int</EM>, which  overrides  the  <EM>pair</EM>
        (<EM>short</EM>) argument.
 
 
@@ -476,56 +476,57 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        part of X/Open Curses, but is assumed by some applications.
 
        Other  implementions  may not declare the capability name arrays.  Some
-       provide them without declaring them.  X/Open does not specify them.
+       provide them without declaring them.  X/Open Curses  does  not  specify
+       them.
 
-       Extended terminal capability names, as defined by  "<STRONG>tic</STRONG>  <STRONG>-x</STRONG>",  are  not
+       Extended  terminal  capability  names,  as defined by "<STRONG>tic</STRONG> <STRONG>-x</STRONG>", are not
        stored in the arrays described here.
 
 
 </PRE><H3><a name="h3-Output-Buffering">Output Buffering</a></H3><PRE>
-       Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
+       Older versions of <EM>ncurses</EM> assumed that the file  descriptor  passed  to
        <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
-       the  corresponding  stream.   In  addition  to  the limitation that the
-       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
-       <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
+       the corresponding stream.  In  addition  to  the  limitation  that  the
+       terminal  was  left  in  block-buffered  mode  on  exit  (like System V
+       <EM>curses</EM>), it was problematic because <EM>ncurses</EM> did not  allow  a  reliable
        way to clean up on receiving <STRONG>SIGTSTP</STRONG>.
 
-       The current version (ncurses6) uses output buffers managed directly  by
-       <EM>ncurses.</EM>  Some of the low-level functions described in this manual page
-       write to the standard output.  They are  not  signal-safe.   The  high-
+       The  current version (ncurses6) uses output buffers managed directly by
+       <EM>ncurses</EM>.  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 <EM>ncurses</EM> employ alternate versions of these functions
        using the more reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
-       The X/Open Curses prototypes  are  based  on  the  SVr4  <EM>curses</EM>  header
-       declarations,  which  were  defined at the same time the C language was
+       The  X/Open  Curses  prototypes  are  based  on  the SVr4 <EM>curses</EM> header
+       declarations, which were defined at the same time the  C  language  was
        first standardized in the late 1980s.
 
-       <STRONG>o</STRONG>   X/Open Curses uses <EM>const</EM>  less  effectively  than  a  later  design
-           might,  in  some cases applying it needlessly to values are already
-           constant, and in most cases overlooking parameters  which  normally
-           would  use <EM>const.</EM>  Using constant parameters for functions which do
+       <STRONG>o</STRONG>   X/Open  Curses  uses  <EM>const</EM>  less  effectively  than a later design
+           might, in some cases applying it needlessly to values  are  already
+           constant,  and  in most cases overlooking parameters which normally
+           would use <EM>const</EM>.  Using constant parameters for functions which  do
            not use <EM>const</EM> may prevent the program from compiling.  On the other
            hand, "writable strings" are an obsolescent feature.
 
-           As  an  extension,  this implementation can be configured to change
-           the function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM>  ABI
+           As an extension, this implementation can be  configured  to  change
+           the  function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI
            6 enables this feature by default.
 
-       <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
+       <STRONG>o</STRONG>   X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number  of  parameters,
            rather than a variable argument list.
 
-           This implementation uses a  variable  argument  list,  but  can  be
-           configured  to use the fixed-parameter list.  Portable applications
-           should provide nine parameters after the format;  zeroes  are  fine
+           This  implementation  uses  a  variable  argument  list, but can be
+           configured to use the fixed-parameter list.  Portable  applications
+           should  provide  nine  parameters after the format; zeroes are fine
            for this purpose.
 
-           In  response  to review comments by Thomas E. Dickey, X/Open Curses
+           In response to review comments by Thomas E. Dickey,  X/Open  Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
 
-           While <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is  only
-           available  as  a build-time configuration option.  If not specially
+           While  <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is only
+           available as a build-time configuration option.  If  not  specially
            configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
 
        Both forms of <STRONG>tparm</STRONG> have drawbacks:
@@ -533,83 +534,82 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
            nine on each call is awkward.
 
-           Using  <EM>long</EM>  for the numeric parameter type is a workaround to make
-           the parameter use the same amount of  stack  as  a  pointer.   That
-           approach  dates  back  to the mid-1980s, before C was standardized.
-           Since then, there is a standard (and pointers are not  required  to
+           Using <EM>long</EM> for the numeric parameter type is a workaround  to  make
+           the  parameter  use  the  same  amount of stack as a pointer.  That
+           approach dates back to the mid-1980s, before  C  was  standardized.
+           Since  then,  there is a standard (and pointers are not required to
            fit in a <EM>long</EM>).
 
-       <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
+       <STRONG>o</STRONG>   Providing the right number of parameters for  a  variadic  function
            such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
-           parameters.   However,  only a few <EM>terminfo</EM> capabilities use string
-           parameters (for instance, the ones used for  programmable  function
+           parameters.  However, only a few <EM>terminfo</EM> capabilities  use  string
+           parameters  (for  instance, the ones used for programmable function
            keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           an error if the capability mishandles string  parameters.   But  it
-           cannot  check  if  a  calling program provides strings in the right
+           an  error  if  the capability mishandles string parameters.  But it
+           cannot check if a calling program provides  strings  in  the  right
            places for the <STRONG>tparm</STRONG> calls.
 
-           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of  these  capabilities  with  a
+           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
        If configured to use the terminal driver, as with the MinGW port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
            value "unknown".
 
            SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The difference  between  the  two  is  that  the  former  uses  the
-           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
+           The  difference  between  the  two  is  that  the  former  uses the
+           <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) <EM>terminfo</EM> capability, while the latter  does  not.
            A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver  by
-           checking  if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of that
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
+           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
            string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In SVr4, <STRONG>set_curterm</STRONG> returns an <EM>int,</EM> <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
+       In  SVr4,  <STRONG>set_curterm</STRONG>  returns  an  <EM>int</EM>, <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
        implement the X/Open Curses semantics.
 
        In SVr4, the third argument of <STRONG>tputs</STRONG> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
 
-       At  least one implementation of X/Open Curses (Solaris) returns a value
-       other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of  the
+       At least one implementation of X/Open Curses (Solaris) returns a  value
+       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of the
        string, and does no error checking.
 
-       X/Open  Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not
-       match the actual terminal state, and that an application  should  touch
-       and  refresh  the  window  before  resuming  normal <EM>curses</EM> calls.  Both
+       X/Open Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not
+       match  the  actual terminal state, and that an application should touch
+       and refresh the window  before  resuming  normal  <EM>curses</EM>  calls.   Both
        <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data allocated
        in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
        function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
-       X/Open notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not  match
-       the  actual  terminal  state,  and that an application should touch and
-       refresh the window before resuming normal <EM>curses</EM> calls.   Both  <EM>ncurses</EM>
-       and  SVr4  <EM>curses</EM>  implement  <STRONG>mvcur</STRONG>  using the <EM>SCREEN</EM> data allocated in
-       either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented  as  a  <EM>terminfo</EM>
+       X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not match
+       the actual terminal state, and that an  application  should  touch  and
+       refresh  the  window before resuming normal <EM>curses</EM> calls.  Both <EM>ncurses</EM>
+       and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using  the  <EM>SCREEN</EM>  data  allocated  in
+       either  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
        function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
-       X/Open  Curses  states that the old location must be given for <STRONG>mvcur</STRONG> to
-       accommodate terminals that lack absolute cursor  positioning.   <EM>ncurses</EM>
+       X/Open Curses states that the old location must be given for  <STRONG>mvcur</STRONG>  to
+       accommodate  terminals  that lack absolute cursor positioning.  <EM>ncurses</EM>
        allows the caller to use -1 for either or both old coordinates.  The -1
-       tells <EM>ncurses</EM> that the old location is unknown, and that  it  must  use
-       only  absolute  motion,  as  with  the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability,
-       rather than the least  costly  combination  of  absolute  and  relative
+       tells  <EM>ncurses</EM>  that  the old location is unknown, and that it must use
+       only absolute motion, as  with  the  <STRONG>cursor_address</STRONG>  (<STRONG>cup</STRONG>)  capability,
+       rather  than  the  least  costly  combination  of absolute and relative
        motion.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
+       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-
        <STRONG>fixterm</STRONG>     restore terminal to "in <EM>curses</EM>" state
        <STRONG>gettmode</STRONG>    establish current terminal modes
        <STRONG>mvcur</STRONG>       low level cursor motion
@@ -625,7 +625,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
        <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
 
-       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
@@ -637,11 +637,11 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        <STRONG>tgoto</STRONG>      apply parameters to given capability
        <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
 
-       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
+       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
-       capability  values  (like the <EM>termcap</EM> interface), and reusing <STRONG>tgoto</STRONG> and
+       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
+       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
        <STRONG>tputs</STRONG>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -650,7 +650,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
+       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -663,37 +663,37 @@ <H1 class="no-header">curs_terminfo 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        saveterm    def_prog_mode
        setterm     setupterm
 
-       SVr3  kept  the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG>, and <STRONG>tputs</STRONG>.  The latter were needed to support  padding,  and  to
-       handle  capabilities  accessed by functions such as <STRONG>vidattr</STRONG> (which used
+       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
+       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
        more than the two parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3  introduced  the  functions   for   switching   between   terminal
-       descriptions;   for   example,  <STRONG>set_curterm</STRONG>.   Some  changes  reflected
+       SVr3   introduced   the   functions   for  switching  between  terminal
+       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
+       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various  global  variables  such as <STRONG>boolnames</STRONG> were mentioned in the
-           programming manual at this point, though  the  variables  had  been
+       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
+           programming  manual  at  this  point, though the variables had been
            provided in SVr2.
 
        SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
-       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
+       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-02-24                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index b2ed03c30..a8570f99f 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.54 2024/01/13 22:05:39 tom Exp @
+  * @Id: curs_threads.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -617,7 +617,7 @@ <H1 class="no-header">curs_threads 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index f51c55c9f..a0c23473d 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.42 2023/11/25 14:08:05 tom Exp @
+  * @Id: curs_touch.3x,v 1.44 2024/03/16 15:49:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -93,23 +93,24 @@ <H1 class="no-header">curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
        other than <STRONG>ERR</STRONG> upon successful completion, unless  otherwise  noted  in
        the preceding routine descriptions.
 
-       X/Open does not define any error conditions.  In this implementation
+       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       implementation
 
           <STRONG>is_linetouched</STRONG>
-               returns  an error if the window pointer is null, or if the line
+               returns an error if the window pointer is null, or if the  line
                number is outside the window.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
-               normal  return  values  of this function.  Because the function
+               normal return values of this function.   Because  the  function
                returns a <STRONG>bool</STRONG>, returning <STRONG>ERR</STRONG> (which is neither <STRONG>TRUE</STRONG> nor <STRONG>FALSE</STRONG>)
                may not be supported by the compiler.
 
-               To  provide  error-checking  and also match the X/Open function
+               To provide error-checking and also match  the  X/Open  function
                prototype, the <STRONG>ERR</STRONG> is provided by a macro named <STRONG>is_linetouched</STRONG>.
                The actual function returns <STRONG>FALSE</STRONG> when it detects an error.
 
           <STRONG>wtouchln</STRONG>
-               returns  an error if the window pointer is null, or if the line
+               returns an error if the window pointer is null, or if the  line
                number is outside the window.
 
 
@@ -118,10 +119,10 @@ <H1 class="no-header">curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
+       These  functions  were  introduced  by SVr4.  The Solaris <EM>curses</EM> header
        file, for instance, defines both an actual function and macro for each.
-       The macros give the same result as the actual functions.   SVr4  <EM>curses</EM>
-       does  not check the window parameter <EM>win</EM> to ensure that it is not <STRONG>NULL</STRONG>;
+       The  macros  give the same result as the actual functions.  SVr4 <EM>curses</EM>
+       does not check the window parameter <EM>win</EM> to ensure that it is not  <STRONG>NULL</STRONG>;
        otherwise this implementation behaves the same as SVr4.
 
        The XSI Curses standard, Issue 4 describes these functions, but defines
@@ -133,7 +134,7 @@ <H1 class="no-header">curs_touch 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index dbd3cb1a2..dbbf128c1 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.45 2024/03/02 16:34:00 tom Exp @
+  * @Id: curs_trace.3x,v 1.47 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-03-02 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-03-02 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -261,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-03-02 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-02                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index e6d8fe14d..a923c7654 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.96 2024/02/24 19:22:01 tom Exp @
+  * @Id: curs_util.3x,v 1.98 2024/03/16 15:50:09 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -254,96 +254,97 @@ <H1 class="no-header">curs_util 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
-       X/Open does not define any error conditions.  In this implementation
+       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       implementation
 
           <STRONG>flushinp</STRONG>
                returns an error if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns  an  error  if  the  associated  <STRONG>fwrite</STRONG> calls return an
+               returns an error if  the  associated  <STRONG>fwrite</STRONG>  calls  return  an
                error.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
-       vaguest  terms.   The  description  here is adapted from the XSI Curses
+       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
+       vaguest terms.  The description here is adapted  from  the  XSI  Curses
        standard (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
-       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
+       The  limitation  to  30  seconds and the use of <STRONG>napms</STRONG> differ from other
        implementations.
 
        <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
 
-       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
-           but does not take  timing  into  account  when  using  the  padding
+       <STRONG>o</STRONG>   NetBSD curses uses <STRONG>napms</STRONG> when no padding  character  is  available,
+           but  does  not  take  timing  into  account  when using the padding
            character.
 
        Neither limits the delay.
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
-       capabilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option
+       The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
+       capabilities  which are defined in the terminfo entry via the <STRONG>-x</STRONG> option
        of <STRONG>tic</STRONG>.  This implementation automatically assigns at run-time keycodes
-       to user-defined strings which begin with "k".  The  keycodes  start  at
+       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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function controls
-       whether this data is loaded when the terminal description  is  read  by
+       because  user-defined  codes  are merged from all terminal descriptions
+       which have been loaded.  The <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  controls
+       whether  this  data  is loaded when the terminal description is read by
        the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
-       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
-       were not supported on Version 7, BSD or System V  implementations.   It
-       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
+       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <EM>ncurses</EM>.   They
+       were  not  supported on Version 7, BSD or System V implementations.  It
+       is recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions  be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The  files  written  and   read   by   these   functions   use   an
-           implementation-specific  format.  Although the format is an obvious
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.) originated with
+           Interestingly  enough,  according to the copyright dates in Solaris
+           source, the functions (along with <STRONG>scr_init</STRONG>, etc.)  originated  with
            the University of California, Berkeley (in 1982) and were later (in
-           1988)  incorporated  into SVr4.  Oddly, there are no such functions
+           1988) incorporated into SVr4.  Oddly, there are no  such  functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
+           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
            older <EM>ncurses</EM> versions.  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
-           <STRONG>fwrite</STRONG> and <STRONG>fread</STRONG> functions).  Those  that  use  textual  dumps  use
+           The implementations which  use  binary  dumps  use  block-I/O  (the
+           <STRONG>fwrite</STRONG>  and  <STRONG>fread</STRONG>  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.  However, reading from  a
+           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.  However, reading from a
            file written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       The  XSI Curses standard, Issue 4 describes these functions.  It states
+       The XSI Curses standard, Issue 4 describes these functions.  It  states
        that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but
-       does  not  define any error conditions.  This implementation checks for
+       does not define any error conditions.  This implementation  checks  for
        three cases:
 
-       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
-           returns  the  parameter,  i.e.,  a  one-character  string  with the
-           parameter as the first  character.   Otherwise,  it  returns  "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -354,44 +355,44 @@ <H1 class="no-header">curs_util 3x 2024-02-24 ncurses 6.4 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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 printable.
-       This implementation uses 8 bits but  does  not  modify  the  string  to
-       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
+       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  printable.
+       This  implementation  uses  8  bits  but  does not modify the string to
+       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
-       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
-       "meta"   keys   (codes   in   the   range   128    to    255).     Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses  is
-       initialized.  X/Open Curses does not document the  treatment  of  codes
+       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
+       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
+       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before  initializing  curses),  this  implementation  returns   strings
+       before   initializing  curses),  this  implementation  returns  strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
+       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
-       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
-       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
+       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
+       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
+       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-02-24                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 03274343e..984ad8e20 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.43 2024/01/05 21:46:58 tom Exp @
+  * @Id: curs_variables.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-01-05 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-01-05 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -262,7 +262,7 @@ <H1 class="no-header">curs_variables 3x 2024-01-05 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-01-05                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 763ae7c74..b456816cf 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
+  * @Id: curs_window.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -256,7 +256,7 @@ <H1 class="no-header">curs_window 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index 3f79ad1f3..a6670e517 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.48 2023/12/16 20:32:22 tom Exp @
+  * @Id: default_colors.3x,v 1.50 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2023-12-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-12-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index ad69c1185..344af2c31 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.40 2023/12/16 20:32:22 tom Exp @
+  * @Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index c24979f13..3a3c20199 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.52 2023/12/23 16:08:25 tom Exp @
+  * @Id: form.3x,v 1.54 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 16a757db4..845d5d580 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_cursor.3x,v 1.29 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_cursor.3x,v 1.31 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">form_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index 5ae5f555c..de14710e9 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_data.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_data.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">form_data 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 623208562..ef8bc8866 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.57 2024/01/13 22:05:39 tom Exp @
+  * @Id: form_driver.3x,v 1.59 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2024-01-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2024-01-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -275,7 +275,7 @@ <H1 class="no-header">form_driver 3x 2024-01-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-13                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index d01adb72b..0c1004bdd 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_field 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 46ace2a1c..2d92d04cb 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_attributes.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_attributes.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_field_attributes 3x 2023-11-25 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-11-25         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 8c1ac74c3..90918414c 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.43 2023/12/16 20:32:22 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -152,7 +152,7 @@ <H1 class="no-header">form_field_buffer 3x 2023-12-16 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2023-12-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index a11ab8892..3c4eb1f51 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_info.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_info.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">form_field_info 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 626e1e69c..0a092c4c4 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_just.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_just.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_field_just 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index f7520b452..461def91d 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.39 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -122,7 +122,7 @@ <H1 class="no-header">form_field_new 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-25                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 96e53f4b4..3e66b8817 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.42 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_opts.3x,v 1.44 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">form_field_opts 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index e58f34357..1a55d6e10 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.28 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_field_userptr 3x 2023-11-25 ncurses 6.4 Library calls
 
 
 
-ncurses 6.4                       2023-11-25            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 9780e0a95..e3d728068 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.51 2023/12/16 20:32:22 tom Exp @
+  * @Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2023-12-16 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2023-12-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index ed0aa4309..167b762c9 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.44 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -183,7 +183,7 @@ <H1 class="no-header">form_fieldtype 3x 2023-11-25 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-11-25                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index bf7a2d76b..0c41e893d 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.35 2024/01/20 18:12:04 tom Exp @
+  * @Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2024-01-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2024-01-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -137,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2024-01-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-01-20                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 43a013a6e..798551d43 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">form_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 081022449..75e3db41f 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new_page.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_new_page.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">form_new_page 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 276bb7d6e..33c8de233 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_opts.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 4ceeb10be..7d1cc2af7 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
+  * @Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">form_page 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 0cb58df1a..2c1e4b590 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_post.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">form_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index fa8f05097..e0ba32106 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.33 2023/12/16 20:32:22 tom Exp @
+  * @Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_requestname 3x 2023-12-16 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-12-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 72992e9f0..5ccd94f07 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index 7227ca7b0..8d31e086e 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010-2013,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_variables.3x,v 1.16 2023/10/07 21:19:07 tom Exp @
+  * @Id: form_variables.3x,v 1.18 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x 2023-10-07 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_variables 3x 2023-10-07 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-10-07                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 2085ddf61..cb6b8d9c3 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index a7caa52c5..505de42e6 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.107 2024/01/13 22:05:39 tom Exp @
+  * @Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-01-13 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-01-13 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2024-01-13 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-13                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.4                       2024-03-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 8f507c239..d89146480 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.39 2023/12/10 14:12:43 tom Exp @
+  * @Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2023-12-10 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2023-12-10 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2023-12-10 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-10                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 7bdce9de9..8592ad1bf 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.32 2023/12/16 20:32:22 tom Exp @
+  * @Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index ddea78d39..ed1e8d59e 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.34 2023/12/16 20:32:22 tom Exp @
+  * @Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 3f0f1f246..51ccad84a 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.38 2023/12/16 20:32:22 tom Exp @
+  * @Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index d81dc9947..ec0995139 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.24 2023/12/16 20:32:22 tom Exp @
+  * @Id: legacy_coding.3x,v 1.26 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 798d4c71c..9f491d486 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.43 2023/12/23 16:08:25 tom Exp @
+  * @Id: menu.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index cd00c0804..8577269a8 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_attributes.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_attributes.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">menu_attributes 3x 2023-11-25 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2023-11-25               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 52263b8d5..5b3fd70d2 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_cursor.3x,v 1.28 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_cursor.3x,v 1.30 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -93,7 +93,7 @@ <H1 class="no-header">menu_cursor 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 3a23b6a02..a34004287 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.45 2023/12/23 16:08:25 tom Exp @
+  * @Id: menu_driver.3x,v 1.47 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -223,7 +223,7 @@ <H1 class="no-header">menu_driver 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 8a61d6339..9723b60c6 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_format.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_format.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">menu_format 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index c2ed60073..478fcddf6 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_hook 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 01254b680..7e192c3fc 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">menu_items 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index a79dcd01b..bb83b9e4d 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_mark 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index a8e36becf..b4414da86 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 52243b317..a1e6c1226 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.33 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_opts.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">menu_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index eb57dbbd9..cffb79fa6 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.36 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_pattern 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index 3a458b761..cb204211d 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_post.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_post.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">menu_post 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 8b4d4d471..234f7a410 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.31 2023/12/16 20:32:22 tom Exp @
+  * @Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_requestname 3x 2023-12-16 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2023-12-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 1521ee4c6..6857baf48 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.35 2023/12/16 20:32:22 tom Exp @
+  * @Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">menu_spacing 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index f97739f08..5aa7e8f29 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index aa1dfeb72..b30b2c213 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_win 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index 08dd8226a..dab17faaf 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.35 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">mitem_current 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index 7aac9ebe7..e35568d4e 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.29 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_name 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index aef0f5635..acc2a0f88 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.34 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">mitem_new 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 9dac6ef7a..5b59f6532 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.31 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_opts.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -102,7 +102,7 @@ <H1 class="no-header">mitem_opts 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index a3888d8a6..c1d5b26db 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.32 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_userptr 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index f14df7fbe..164b53d19 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_value.3x,v 1.30 2023/11/25 13:58:47 tom Exp @
+  * @Id: mitem_value.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">mitem_value 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index 9c9a3d31c..c0758e3d8 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998,2010 Free Software Foundation, Inc.                       *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_visible.3x,v 1.25 2023/11/25 14:18:16 tom Exp @
+  * @Id: mitem_visible.3x,v 1.27 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -77,7 +77,7 @@ <H1 class="no-header">mitem_visible 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 5a1ac2391..330628ed9 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.200 2024/02/24 20:03:50 tom Exp @
+  * @Id: ncurses.3x,v 1.204 2024/03/23 20:42:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-02-24 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -56,16 +56,24 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <EM>ncurses</EM>  library  routines  give  the  user a terminal-independent
-       method of updating  character  screens  with  reasonable  optimization.
-       This  implementation  is  "new  curses"  (<EM>ncurses</EM>)  and is the approved
-       replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes <EM>ncurses</EM> version 6.4 (patch 20240302).
-
-       The  <EM>ncurses</EM>  library emulates the curses library of System V Release 4
-       Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses  (also  known
-       as  XSI  curses).   XSI  stands for X/Open System Interfaces Extension.
-       The <EM>ncurses</EM> library is freely redistributable in source form.
+       The  "new  curses" library offers the programmer a terminal-independent
+       means of reading keyboard and mouse input and  updating  character-cell
+       terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
+       replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
+       4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+       describes <EM>ncurses</EM> version 6.4 (patch 20240323).
+
+       <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
+       and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; the reading of terminal
+       input; control of terminal input and output options; environment  query
+       routines;  color  manipulation;  the  definition  and use of <EM>soft</EM> <EM>label</EM>
+       keys; <EM>terminfo</EM> capabilities; a  <EM>termcap</EM>  compatibility  interface;  and
+       access to low-level terminal-manipulation routines.
+
+       <EM>ncurses</EM>  implements  the  standard interface described by X/Open Curses
+       Issue 7.  In  many  behavioral  details  not  standardized  by  X/Open,
+       <EM>ncurses</EM>  emulates  the  <EM>curses</EM>  library  of  SVr4 and provides numerous
+       useful extensions.
 
        <EM>ncurses</EM> man pages employ several sections to clarify matters  of  usage
        and interoperability with other <EM>curses</EM> implementations.
@@ -101,12 +109,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        directory)  that  describe  curses  actions.   See  section  "ALTERNATE
        CONFIGURATIONS" below.
 
-       The  <EM>ncurses</EM>  package  supports:  overall  screen,   window   and   pad
-       manipulation;  output  to  windows  and  pads;  reading terminal input;
-       control over terminal and <STRONG>curses</STRONG> input and output options;  environment
-       query  routines;  color  manipulation; use of soft label keys; terminfo
-       capabilities; and access to low-level terminal-manipulation routines.
-
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        The library uses the locale which the calling program has  initialized.
@@ -162,7 +164,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
        cursor and write a character  to  <STRONG>stdscr</STRONG>,  respectively.   As  a  rule,
        window-addressing  functions  feature  names  prefixed (or infixed, see
-       below) with "w"; these allow the user to specify a pointer to a <EM>WINDOW.</EM>
+       below) with "w"; these allow the user to specify a pointer to a <EM>WINDOW</EM>.
        Counterparts  not  thus  prefixed  (or infixed) affect <STRONG>stdscr</STRONG>.  Because
        moving the cursor prior to  another  operation  is  so  common,  <EM>curses</EM>
        generally  also provides functions with a "mv" prefix as a convenience.
@@ -246,13 +248,13 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
                  eight-bit  characters.   It  stores a character combined with
-                 attributes in a <EM>chtype</EM> datum, which is often an alias of <EM>int.</EM>
+                 attributes in a <EM>chtype</EM> datum, which is often an alias of <EM>int</EM>.
 
                  Attributes alone (with no  corresponding  character)  can  be
                  stored  in  variables  of  <EM>chtype</EM>  or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> type.  In either
                  case, they are represented as an integral bit mask.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype.</EM>
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.
 
        <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
@@ -260,30 +262,30 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                  calls  using  additional  data  types  that  can  store  such
                  <EM>multibyte</EM> characters.
 
-                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype.</EM>
+                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype</EM>.
                           It  always  a structure type, because it stores more
                           data than fits into an integral type.   A  character
-                          code  may  not  be  representable  as  a  <EM>char,</EM>  and
+                          code  may  not  be  representable  as  a  <EM>char</EM>,  and
                           moreover more than one character may occupy  a  cell
                           (as  with  accent marks and other diacritics).  Each
-                          character is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t;</EM>  a  complex  character
+                          character is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a  complex  character
                           contains one spacing character and zero or more non-
                           spacing  characters  (see  below).   Attributes  and
                           color  data  are  stored  in  separate fields of the
-                          structure, not combined as in <EM>chtype.</EM>
+                          structure, not combined as in <EM>chtype</EM>.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t.</EM>
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
                  The  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions   store   and
                  retrieve the data from a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure.  The wide library
                  API of <EM>ncurses</EM> depends on two data types standardized by  ISO
                  C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype,</EM> it may be an
-                          alias of <EM>int.</EM>  Depending on the character  encoding,
-                          a  wide  character  may  be <EM>spacing,</EM> meaning that it
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype</EM>, it may be an
+                          alias of <EM>int</EM>.  Depending on the character  encoding,
+                          a  wide  character  may  be <EM>spacing</EM>, meaning that it
                           occupies a character cell by  itself  and  typically
-                          accompanies   cursor  advancement,  or  <EM>non-spacing,</EM>
+                          accompanies   cursor  advancement,  or  <EM>non-spacing</EM>,
                           meaning that it occupies the same cell as a  spacing
                           character,  is often regarded as a "modifier" of the
                           base glyph with which  it  combines,  and  typically
@@ -318,6 +320,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     PAIR_NUMBER              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+
                     add_wch                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     add_wchnstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     add_wchstr               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
@@ -380,12 +383,12 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     erasechar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
-
                     exit_terminfo            <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
                     extended_color_content   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_pair_content    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_slk_color       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     filter                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+
                     find_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
                     flash                    <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
                     flushinp                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
@@ -446,7 +449,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     insdelln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insnstr                  <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
-
                     insstr                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     instr                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     intrflush                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -454,6 +456,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     is_cbreak                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_cleared               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_echo                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
+
                     is_idcok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_idlok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_immedok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
@@ -512,7 +515,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     mvin_wch                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     mvin_wchstr              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
-
                     mvinch                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     mvinchnstr               <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     mvinchstr                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
@@ -522,6 +524,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     mvins_wch                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvinsch                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+
                     mvinsnstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinsstr                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
@@ -578,7 +581,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nofilter                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     nonl                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -590,6 +592,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pechochar                <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+
                     pnoutrefresh             <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     prefresh                 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     printw                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -644,7 +647,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     start_color              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     subpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     subwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     syncok                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     term_attrs               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     termattrs                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
@@ -658,6 +660,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     tigetnum                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     tiparm                   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tiparm_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
                     tiscan_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
@@ -710,7 +713,6 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     wbkgrnd                  <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wbkgrndset               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wborder                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
-
                     wborder_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     wchgat                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wclear                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
@@ -726,6 +728,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
                     werase                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
                     wget_wch                 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     wget_wstr                <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+
                     wgetbkgrnd               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wgetch                   <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     wgetdelay                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
@@ -1168,7 +1171,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
        Many different <EM>ncurses</EM> configurations are possible, determined  by  the
        options  given  to the <EM>configure</EM> script when building the library.  Run
        the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
-       particular significance to the application developer employing <EM>ncurses.</EM>
+       particular significance to the application developer employing <EM>ncurses</EM>.
 
        --disable-overwrite
             The standard include for <EM>ncurses</EM> is as noted in <STRONG>SYNOPSIS</STRONG>:
@@ -1313,10 +1316,10 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
-       terminals, including <EM>xterm;</EM> see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
+       terminals, including <EM>xterm</EM>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
        <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
-       when  running in a GUI terminal emulator application such as <EM>xterm;</EM> see
+       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
@@ -1357,7 +1360,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   The compiler option <STRONG>-DUSE_GETCAP</STRONG> causes the library to fall back to
            reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
-           <EM>info</EM> entry corresponding to <EM>TERM.</EM>   Use  of  this  feature  is  not
+           <EM>info</EM> entry corresponding to <EM>TERM</EM>.   Use  of  this  feature  is  not
            recommended,  as it essentially includes an entire <EM>termcap</EM> compiler
            in the <EM>ncurses</EM>  startup  code,  at  a  cost  in  memory  usage  and
            application launch latency.
@@ -1499,7 +1502,7 @@ <H1 class="no-header">ncurses 3x 2024-02-24 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-02-24                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-03-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index f1c708442..495f6e656 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.44 2023/12/16 20:32:22 tom Exp @
+  * @Id: new_pair.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 501165372..e585b33c4 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.61 2023/12/23 16:22:25 tom Exp @
+  * @Id: panel.3x,v 1.63 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -266,7 +266,7 @@ <H1 class="no-header">panel 3x 2023-12-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-23                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 9bf622b18..8cca761cf 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.54 2023/12/16 20:32:22 tom Exp @
+  * @Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2023-12-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2023-12-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2023-12-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-12-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index 0295c9d53..bb38e5e00 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.42 2023/12/30 22:06:36 tom Exp @
+  * @Id: scr_dump.5,v 1.46 2024/03/23 20:42:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2023-12-30 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2024-03-23 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2023-12-30 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -196,14 +196,14 @@ <H1 class="no-header">scr_dump 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Solaris">Solaris</a></H3><PRE>
        As  noted  above,  Solaris  <EM>curses</EM> has no magic number corresponding to
-       SVr4 <EM>curses.</EM>  This is odd, since Solaris was the first operating system
+       SVr4 <EM>curses</EM>.  This is odd, since Solaris was the first operating system
        to meet the SVr4 guidelines.  Solaris furthermore supplies two versions
-       of <EM>curses.</EM>
+       of <EM>curses</EM>.
 
        <STRONG>o</STRONG>   The default <EM>curses</EM> library uses the SVr3 magic number.
 
        <STRONG>o</STRONG>   An alternate <EM>curses</EM> library (which we term <EM>xcurses),</EM>  available  in
-           <EM>/usr/xpg4,</EM> uses a textual format with no magic number.
+           <EM>/usr/xpg4</EM>, uses a textual format with no magic number.
 
            According  to  its  copyright  notice,  this  <EM>xcurses</EM>  library  was
            developed by MKS (Mortice Kern Systems) from 1990 to 1995.
@@ -390,7 +390,7 @@ <H1 class="no-header">scr_dump 5 2023-12-30 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2023-12-30                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.4                       2024-03-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 368306241..9f409908c 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.55 2024/01/20 16:54:03 tom Exp @
+  * @Id: tabs.1,v 1.57 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-01-20 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-01-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -259,7 +259,7 @@ <H1 class="no-header">tabs 1 2024-01-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index bbcbe644c..9a62438e2 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.73 2024/01/13 22:05:39 tom Exp @
+  * @Id: term.5,v 1.75 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2024-01-13 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2024-03-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2024-01-13 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2024-03-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -399,7 +399,7 @@ <H1 class="no-header">term 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-01-13                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 9f834d26c..10f65ad26 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.46 2023/12/02 20:51:25 tom Exp @
+  * @Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2023-12-02 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2024-03-16 ncurses 6.4 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2023-12-02 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2024-03-16 ncurses 6.4 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -216,7 +216,7 @@ <H1 class="no-header">term 7 2023-12-02 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2023-12-02                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index e703ea383..e58834687 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.34 2023/12/23 16:08:25 tom Exp @
+  * @Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2023-12-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2023-12-23 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2023-12-23                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a2d9f0218..e39d615fe 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240302).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240323).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -205,52 +205,52 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-Predefined-Capabilities">Predefined Capabilities</a></H3><PRE>
-       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,
+       Tables of capabilities <EM>ncurses</EM> recognizes in a <EM>terminfo</EM>  terminal  type
+       description and available to <EM>terminfo</EM>-using code follow.
 
-       <STRONG>o</STRONG>   The <STRONG>variable</STRONG> is the name by which the programmer (at  the  terminfo
-           level) accesses the capability.
+       <STRONG>o</STRONG>   The  capability  name identifies the symbol by which the programmer
+           using the <EM>terminfo</EM> API accesses the capability.
 
-       <STRONG>o</STRONG>   The  <STRONG>capname</STRONG>  (<EM>Cap-name</EM>)  is the short name used in the text of the
-           database, and is used by a person updating the database.
+       <STRONG>o</STRONG>   The TI (<EM>terminfo</EM>) code is the short name used by a person composing
+           or updating a terminal type entry.
 
-           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
+           Whenever  possible, these codes are the same as or similar to those
+           of 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 specification.
 
-           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 <STRONG>Caps</STRONG> to line up nicely.
+           <EM>terminfo</EM> codes have no hard length limit, but <EM>ncurses</EM> maintains  an
+           informal  one  of  5 characters to keep them short and to allow the
+           tabs in the source file <EM>Caps</EM> to line  up  nicely.   (Some  standard
+           codes exceed this limit regardless.)
 
-       <STRONG>o</STRONG>   The   <STRONG>termcap</STRONG>   (<EM>Tcap</EM>)  code  is  the  old  capability  name  (some
-           capabilities  are  new,  and  have  names  which  termcap  did  not
-           originate).
+       <STRONG>o</STRONG>   The  TC  (<EM>termcap</EM>)  code  is  that used by the corresponding API of
+           <EM>ncurses.</EM>  (Some capabilities are new, and have names that BSD <EM>term-</EM>
+           <EM>cap</EM> did not originate.)
 
-       <STRONG>o</STRONG>   Finally,  the <STRONG>description</STRONG> field attempts to convey the semantics of
-           the capability.
+       <STRONG>o</STRONG>   The   description   field   attempts  to  convey  the  capability's
+           semantics.
 
-       You may find some codes in the description field:
+       The description field employs a handful of notations.
 
-       (P)    indicates that padding may be specified
+       <STRONG>(P)</STRONG>    indicates that padding may be specified.
 
-       #[1-9] in the description field indicates that  the  string  is  passed
-              through <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> with parameters as given (#<EM>i</EM>).
+       <STRONG>(P*)</STRONG>   indicates that padding may vary in proportion to the  number  of
+              output lines affected.
 
-              If  no  parameters  are  listed  in the description, passing the
-              string through <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> may give unexpected results,  e.g.,  if
-              it contains percent (%%) signs.
+       <STRONG>#</STRONG><EM>i</EM>     indicates   the  <EM>i</EM>th  parameter  of  a  string  capability;  the
+              programmer  should  pass  the  string  to  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  with   the
+              parameters listed.
 
-       (P*)   indicates  that  padding may vary in proportion to the number of
-              lines affected
-
-       (#<EM>i</EM>)   indicates the <EM>i</EM>th parameter.
+              If  the  description  lists no parameters, passing the string to
+              <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> may produce unexpected behavior, for instance  if  the
+              string contains percent signs.
 
                                       <STRONG>Code</STRONG>
        <STRONG>Boolean</STRONG> <STRONG>Capability</STRONG> <STRONG>Name</STRONG>    <STRONG>TI</STRONG>        <STRONG>TC</STRONG>  <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
 
+
        <STRONG>auto_left_margin</STRONG>           <STRONG>bw</STRONG>        <STRONG>bw</STRONG>  cub1 wraps from column 0 to
                                                 last column
        <STRONG>auto_right_margin</STRONG>          <STRONG>am</STRONG>        <STRONG>am</STRONG>  terminal has automatic margins
@@ -347,8 +347,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>no_color_video</STRONG>             <STRONG>ncv</STRONG>       <STRONG>NC</STRONG>  video attributes that cannot
                                                 be used with colors
 
-       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.
 
                                       <STRONG>Code</STRONG>
@@ -845,7 +845,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>zero_motion</STRONG>                <STRONG>zerom</STRONG>     <STRONG>Zx</STRONG>  No motion for subsequent
                                                 character
 
-       The  following  string  capabilities  are  present  in  the SVr4.0 term
+       The following string  capabilities  are  present  in  the  SVr4.0  term
        structure, but were originally not documented in the man page.
 
                                       <STRONG>Code</STRONG>
@@ -902,11 +902,11 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>alt_scancode_esc</STRONG>           <STRONG>scesa</STRONG>     <STRONG>S8</STRONG>  Alternate escape for scancode
                                                 emulation
 
-       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 <STRONG>YI</STRONG>, the <STRONG>ncurses</STRONG> 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 <STRONG>YI</STRONG>, the <STRONG>ncurses</STRONG> 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!
 
                                       <STRONG>Code</STRONG>
@@ -929,49 +929,49 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 </PRE><H3><a name="h3-User-Defined-Capabilities">User-Defined Capabilities</a></H3><PRE>
-       The preceding section listed the <EM>predefined</EM>  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 <EM>predefined</EM> 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.
 
-       <EM>ncurses</EM>   addresses   this   limitation   by   allowing    user-defined
-       capabilities.   The  <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG> option for
+       <EM>ncurses</EM>    addresses   this   limitation   by   allowing   user-defined
+       capabilities.  The <STRONG>tic</STRONG> and <STRONG>infocmp</STRONG> programs provide the <STRONG>-x</STRONG>  option  for
        this purpose.  When <STRONG>-x</STRONG> is set, <STRONG>tic</STRONG> treats unknown capabilities as user-
-       defined.   That  is,  if <STRONG>tic</STRONG> encounters a capability name which it does
-       not recognize, it infers its type (Boolean, number or string) from  the
-       syntax  and  makes  an  extended  table entry for that capability.  The
-       <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function makes  this  information  conditionally
-       available  to  applications.   The  <EM>ncurses</EM>  library  provides the data
+       defined.  That is, if <STRONG>tic</STRONG> encounters a capability name  which  it  does
+       not  recognize, it infers its type (Boolean, number or string) from the
+       syntax and makes an extended table  entry  for  that  capability.   The
+       <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  makes  this information conditionally
+       available to applications.   The  <EM>ncurses</EM>  library  provides  the  data
        leaving most of the behavior to applications:
 
-       <STRONG>o</STRONG>   User-defined capability strings whose  name  begins  with  "k"  are
+       <STRONG>o</STRONG>   User-defined  capability  strings  whose  name  begins with "k" are
            treated as function keys.
 
-       <STRONG>o</STRONG>   The  types  (Boolean,  number,  string)  determined  by  <STRONG>tic</STRONG> can be
+       <STRONG>o</STRONG>   The types (Boolean,  number,  string)  determined  by  <STRONG>tic</STRONG>  can  be
            inferred by successful calls on <STRONG>tigetflag</STRONG>, etc.
 
        <STRONG>o</STRONG>   If the capability name happens to be two characters, the capability
            is also available through the termcap interface.
 
-       While  termcap  is  said  to  be  extensible  because it does not use a
-       predefined set of capabilities, in practice it has been limited to  the
-       capabilities  defined  by  terminfo  implementations.  As a rule, user-
+       While termcap is said to be  extensible  because  it  does  not  use  a
+       predefined  set of capabilities, in practice it has been limited to the
+       capabilities 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 assumed by termcap implementations and  their  applications.   In
-       particular,  providing  extended  sets  of  function  keys (past the 60
+       limited to Booleans and numbers to avoid running  past  the  1023  byte
+       limit  assumed  by  termcap implementations and their applications.  In
+       particular, 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.
 
-       The  <EM>ncurses</EM>  library uses a few of these user-defined capabilities, as
-       described in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities  (including
-       function  keys)  are described in the terminal database, in the section
+       The <EM>ncurses</EM> library uses a few of these user-defined  capabilities,  as
+       described  in <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.  Other user-defined capabilities (including
+       function keys) are described in the terminal database, in  the  section
        on <EM>NCURSES</EM> <EM>USER-DEFINABLE</EM> <EM>CAPABILITIES</EM>
 
 
 </PRE><H3><a name="h3-A-Sample-Entry">A Sample Entry</a></H3><PRE>
-       The  following  entry,  describing  an   ANSI-standard   terminal,   is
+       The   following   entry,   describing  an  ANSI-standard  terminal,  is
        representative of what a <STRONG>terminfo</STRONG> entry for a modern terminal typically
        looks like.
 
@@ -1006,36 +1006,36 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                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 <EM>terminfo</EM> are of three types:
 
-       <STRONG>o</STRONG>   Boolean capabilities which indicate  that  the  terminal  has  some
+       <STRONG>o</STRONG>   Boolean  capabilities  which  indicate  that  the terminal has some
            particular feature,
 
        <STRONG>o</STRONG>   numeric capabilities giving the size of the terminal or the size of
            particular delays, and
 
-       <STRONG>o</STRONG>   string capabilities, which give a sequence which  can  be  used  to
+       <STRONG>o</STRONG>   string  capabilities,  which  give  a sequence which can be used to
            perform particular terminal operations.
 
 
 </PRE><H3><a name="h3-Types-of-Capabilities">Types of Capabilities</a></H3><PRE>
        All capabilities have names.  For instance, the fact that ANSI-standard
-       terminals have <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return  and  line-
-       feed  when the end of a line is reached) is indicated by the capability
-       <STRONG>am</STRONG>.  Hence the description of ansi includes <STRONG>am</STRONG>.   Numeric  capabilities
-       are  followed  by  the  character  "#" and then a positive value.  Thus
+       terminals  have  <EM>automatic</EM> <EM>margins</EM> (i.e., an automatic return and line-
+       feed when the end of a line is reached) is indicated by the  capability
+       <STRONG>am</STRONG>.   Hence  the description of ansi includes <STRONG>am</STRONG>.  Numeric capabilities
+       are followed by the character "#" and  then  a  positive  value.   Thus
        <STRONG>cols</STRONG>, which indicates the number of columns the terminal has, gives the
-       value  "80" for ansi.  Values for numeric capabilities may be specified
-       in decimal, octal, or hexadecimal, using  the  C  programming  language
+       value "80" for ansi.  Values for numeric capabilities may be  specified
+       in  decimal,  octal,  or  hexadecimal, using the C programming language
        conventions (e.g., 255, 0377 and 0xff or 0xFF).
 
-       Finally,  string  valued capabilities, such as <STRONG>el</STRONG> (clear to end of line
-       sequence) are given by the two-character  code,  an  "=",  and  then  a
+       Finally, string valued capabilities, such as <STRONG>el</STRONG> (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
+       A number  of  escape  sequences  are  provided  in  the  string  valued
        capabilities for easy encoding of characters there:
 
        <STRONG>o</STRONG>   Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character,
@@ -1053,9 +1053,9 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            respectively.
 
        X/Open Curses does not say what "appropriate <EM>x</EM>" 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
@@ -1071,68 +1071,68 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   and <STRONG>\0</STRONG> for null.
 
            <STRONG>\0</STRONG> 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 <STRONG>stty(1)</STRONG>.
 
-           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
+           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
            implementations.
 
        Finally, characters may be given as three octal digits after a <STRONG>\</STRONG>.
 
-       A  delay  in  milliseconds  may appear anywhere in a string capability,
-       enclosed in $&lt;..&gt; brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;,  and  padding  characters
+       A delay in milliseconds may appear anywhere  in  a  string  capability,
+       enclosed  in  $&lt;..&gt;  brackets, as in <STRONG>el</STRONG>=\EK$&lt;5&gt;, and padding characters
        are supplied by <STRONG><A HREF="curs_terminfo.3x.html">tputs(3x)</A></STRONG> to provide this delay.
 
-       <STRONG>o</STRONG>   The  delay  must  be  a  number  with  at most one decimal place of
+       <STRONG>o</STRONG>   The delay must be a number  with  at  most  one  decimal  place  of
            precision; it may be followed by suffixes "*" or "/" or both.
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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 <EM>lines</EM> affected.)
 
            Normally, padding is advisory if the device has the <STRONG>xon</STRONG> capability;
            it is used for cost computation but does not trigger delays.
 
-       <STRONG>o</STRONG>   A "/" suffix indicates that the padding is mandatory and  forces  a
+       <STRONG>o</STRONG>   A  "/"  suffix indicates that the padding is mandatory and forces a
            delay of the given number of milliseconds even on devices for which
            <STRONG>xon</STRONG> 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
        <STRONG>ind</STRONG> in the example above.
 
 
 </PRE><H3><a name="h3-Fetching-Compiled-Descriptions">Fetching Compiled Descriptions</a></H3><PRE>
-       Terminal descriptions in <EM>ncurses</EM>  are  stored  in  terminal  databases.
-       These  databases,  which are found by their pathname, may be configured
+       Terminal  descriptions  in  <EM>ncurses</EM>  are  stored in terminal databases.
+       These databases, which are found by their pathname, may  be  configured
        either as directory trees or hashed databases (see <STRONG><A HREF="term.5.html">term(5)</A></STRONG>),
 
-       The library  uses  a  compiled-in  list  of  pathnames,  which  can  be
+       The  library  uses  a  compiled-in  list  of  pathnames,  which  can be
        overridden  by  environment  variables.   Before  starting  to  search,
-       <EM>ncurses</EM> checks the search list, eliminating  duplicates  and  pathnames
-       where  no  terminal  database  is found.  The <EM>ncurses</EM> library reads the
+       <EM>ncurses</EM>  checks  the  search list, eliminating duplicates and pathnames
+       where no terminal database is found.  The  <EM>ncurses</EM>  library  reads  the
        first description which passes its consistency checks.
 
-       <STRONG>o</STRONG>   The environment variable <STRONG>TERMINFO</STRONG> is checked first, for a  terminal
+       <STRONG>o</STRONG>   The  environment variable <STRONG>TERMINFO</STRONG> is checked first, for a terminal
            database containing the terminal description.
 
        <STRONG>o</STRONG>   Next, <EM>ncurses</EM> looks in <EM>$HOME/.terminfo</EM> for a compiled description.
 
-           This  is an optional feature which may be omitted entirely from the
+           This is an optional feature which may be omitted entirely from  the
            library,  or  limited  to  prevent  accidental  use  by  privileged
            applications.
 
-       <STRONG>o</STRONG>   Next,  if  the  environment  variable <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is set, <EM>ncurses</EM>
-           interprets the contents of  that  variable  as  a  list  of  colon-
+       <STRONG>o</STRONG>   Next, if the environment variable  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  is  set,  <EM>ncurses</EM>
+           interprets  the  contents  of  that  variable  as  a list of colon-
            separated pathnames of terminal databases to be searched.
 
-           An  empty  pathname  (i.e.,  if  the variable begins or ends with a
-           colon, or contains adjacent colons) is interpreted  as  the  system
+           An empty pathname (i.e., if the variable  begins  or  ends  with  a
+           colon,  or  contains  adjacent colons) is interpreted as the system
            location <EM>/usr/share/terminfo</EM>.
 
        <STRONG>o</STRONG>   Finally, <EM>ncurses</EM> searches these compiled-in locations:
@@ -1142,89 +1142,89 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the system terminfo directory, <EM>/usr/share/terminfo</EM>
 
        The <STRONG>TERMINFO</STRONG> variable can contain a terminal description instead of the
-       pathname of a terminal database.  If this variable begins  with  "hex:"
-       or  "b64:"  then <EM>ncurses</EM> reads a terminal description from hexadecimal-
-       or base64-encoded data,  and  if  that  description  matches  the  name
-       sought,  will  use  that.   This encoded data can be set using the "-Q"
+       pathname  of  a terminal database.  If this variable begins with "hex:"
+       or "b64:" then <EM>ncurses</EM> reads a terminal description  from  hexadecimal-
+       or  base64-encoded  data,  and  if  that  description  matches the name
+       sought, will use that.  This encoded data can be  set  using  the  "-Q"
        option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG>.
 
-       The preceding addresses the usual configuration of <EM>ncurses</EM>, which  uses
-       terminal  descriptions  prepared  in <EM>terminfo</EM> format.  While <EM>termcap</EM> is
-       less expressive,  <EM>ncurses</EM>  can  also  be  configured  to  read  <EM>termcap</EM>
+       The  preceding addresses the usual configuration of <EM>ncurses</EM>, which uses
+       terminal descriptions prepared in <EM>terminfo</EM> format.   While  <EM>termcap</EM>  is
+       less  expressive,  <EM>ncurses</EM>  can  also  be  configured  to  read <EM>termcap</EM>
        descriptions.   In  that  configuration,  it  checks  the  <EM>TERMCAP</EM>  and
-       <EM>TERMPATH</EM> variables (for content and search  path,  respectively)  after
+       <EM>TERMPATH</EM>  variables  (for  content and search path, respectively) after
        the system terminal database.
 
 
 </PRE><H3><a name="h3-Preparing-Descriptions">Preparing Descriptions</a></H3><PRE>
-       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  <EM>terminfo</EM>  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  <EM>terminfo</EM>  and  to  build  up  a
        description gradually, using partial descriptions with <EM>vi</EM> 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
        <EM>terminfo</EM> 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.
 
 
 </PRE><H3><a name="h3-Basic-Capabilities">Basic Capabilities</a></H3><PRE>
-       The number of columns on each line for the terminal  is  given  by  the
-       <STRONG>cols</STRONG>  numeric capability.  If the terminal is a CRT, then the number of
-       lines on the screen is given by the <STRONG>lines</STRONG> capability.  If the  terminal
-       wraps  around  to  the  beginning  of the next line when it reaches the
-       right margin, then it should have the <STRONG>am</STRONG> capability.  If  the  terminal
-       can  clear  its  screen,  leaving the cursor in the home position, then
-       this is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the  terminal
+       The  number  of  columns  on each line for the terminal is given by the
+       <STRONG>cols</STRONG> numeric capability.  If the terminal is a CRT, then the number  of
+       lines  on the screen is given by the <STRONG>lines</STRONG> capability.  If the terminal
+       wraps around to the beginning of the next  line  when  it  reaches  the
+       right  margin,  then it should have the <STRONG>am</STRONG> capability.  If the terminal
+       can clear its screen, leaving the cursor in  the  home  position,  then
+       this  is  given  by  the  <STRONG>clear</STRONG>  string  capability.   If  the terminal
        overstrikes (rather than clearing a position when a character is struck
-       over) then it should have the <STRONG>os</STRONG> capability.   If  the  terminal  is  a
+       over)  then  it  should  have  the <STRONG>os</STRONG> capability.  If the terminal is a
        printing terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.  (<STRONG>os</STRONG>
-       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 <STRONG>cr</STRONG>.  (Normally
-       this  will  be  carriage  return,  control/M.)   If  there is a code to
+       this will be carriage return,  control/M.)   If  there  is  a  code  to
        produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
 
        If there is a code to move the cursor one position to the left (such as
-       backspace)  that  capability should be given as <STRONG>cub1</STRONG>.  Similarly, codes
-       to move to the right, up, and down should be given as <STRONG>cuf1</STRONG>,  <STRONG>cuu1</STRONG>,  and
-       <STRONG>cud1</STRONG>.   These  local cursor motions should not alter the text they pass
-       over, for example, you would not  normally  use  "<STRONG>cuf1</STRONG>= "  because  the
+       backspace) that capability should be given as <STRONG>cub1</STRONG>.   Similarly,  codes
+       to  move  to the right, up, and down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and
+       <STRONG>cud1</STRONG>.  These local cursor motions should not alter the text  they  pass
+       over,  for  example,  you  would  not normally use "<STRONG>cuf1</STRONG>= " because the
        space would erase the character moved over.
 
        A very important point here is that the local cursor motions encoded in
-       <EM>terminfo</EM> are undefined at the left and top edges  of  a  CRT  terminal.
+       <EM>terminfo</EM>  are  undefined  at  the left and top edges of a CRT terminal.
        Programs should never attempt to backspace around the left edge, unless
-       <STRONG>bw</STRONG> 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
+       <STRONG>bw</STRONG>  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 <STRONG>ind</STRONG> (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 <STRONG>ri</STRONG> (reverse index) string.  The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG>
        are undefined when not on their respective corners of the screen.
 
-       Parameterized versions of the scrolling  sequences  are  <STRONG>indn</STRONG>  and  <STRONG>rin</STRONG>
-       which  have  the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they take one
-       parameter, and scroll that many lines.  They are also undefined  except
+       Parameterized  versions  of  the  scrolling  sequences are <STRONG>indn</STRONG> and <STRONG>rin</STRONG>
+       which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except that they  take  one
+       parameter,  and scroll that many lines.  They are also undefined except
        at the appropriate edge of the screen.
 
-       The  <STRONG>am</STRONG> 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  <STRONG>cuf1</STRONG>  from  the last column.  The only local motion which is defined
-       from the left edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from  the  left  edge
-       will  move  to the right edge of the previous row.  If <STRONG>bw</STRONG> is not given,
-       the effect is undefined.  This is useful for drawing a box  around  the
+       The <STRONG>am</STRONG> 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 <STRONG>cuf1</STRONG> from the last column.  The only local motion  which  is  defined
+       from  the  left  edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge
+       will move to the right edge of the previous row.  If <STRONG>bw</STRONG> 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 <EM>terminfo</EM> file usually assumes that this  is  on;
-       i.e.,  <STRONG>am</STRONG>.   If  the  terminal  has  a command which moves to the first
-       column of the next line, that command can be given  as  <STRONG>nel</STRONG>  (newline).
-       It  does  not matter if the command clears the remainder of the current
-       line, so if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be  possible  to
+       automatic  margins,  the <EM>terminfo</EM> file usually assumes that this is on;
+       i.e., <STRONG>am</STRONG>.  If the terminal has a  command  which  moves  to  the  first
+       column  of  the  next line, that command can be given as <STRONG>nel</STRONG> (newline).
+       It does not matter if the command clears the remainder of  the  current
+       line,  so  if the terminal has no <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to
        craft a working <STRONG>nel</STRONG> out of one or both of them.
 
        These  capabilities  suffice  to  describe  hard-copy  and  "glass-tty"
@@ -1242,19 +1242,19 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Parameterized-Strings">Parameterized Strings</a></H3><PRE>
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
-       terminal  are  described  by  a  parameterized  string capability, with
-       <EM>printf</EM>-like escapes such as <EM>%x</EM> in it.   For  example,  to  address  the
-       cursor,  the <STRONG>cup</STRONG> 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
+       terminal are described  by  a  parameterized  string  capability,  with
+       <EM>printf</EM>-like  escapes  such  as  <EM>%x</EM>  in it.  For example, to address the
+       cursor, the <STRONG>cup</STRONG> 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 by <STRONG>mrcup</STRONG>.
 
-       The  parameter mechanism uses a stack and special <STRONG>%</STRONG> 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
+       The parameter mechanism uses a stack and special <STRONG>%</STRONG> 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 <STRONG>sgr</STRONG> string.
 
        The <STRONG>%</STRONG> encodings have the following meanings:
@@ -1262,7 +1262,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>%%</STRONG>   outputs "%"
 
        <STRONG>%</STRONG><EM>[[</EM>:<EM>]flags][width[.precision]][</EM><STRONG>doxXs</STRONG><EM>]</EM>
-            as in <STRONG>printf(3)</STRONG>, flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a  ":"  to  allow
+            as  in  <STRONG>printf(3)</STRONG>,  flags are <EM>[-+#]</EM> and <EM>space</EM>.  Use a ":" to allow
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
@@ -1285,39 +1285,39 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>%g</STRONG><EM>[A-Z]</EM>
             get static variable <EM>[a-z]</EM> 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 <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact  is  not
+            not  reset  between calls to <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.  However, that fact is not
             documented in other implementations.  Relying on it will adversely
             impact portability to other implementations:
 
-            <STRONG>o</STRONG>   SVr2 curses supported <EM>dynamic</EM> variables.  Those are  set  only
-                by  a  <STRONG>%P</STRONG>  operator.   A <STRONG>%g</STRONG> for a given variable without first
-                setting it with <STRONG>%P</STRONG> will give  unpredictable  results,  because
-                dynamic  variables  are  an  uninitialized  local array on the
+            <STRONG>o</STRONG>   SVr2  curses  supported <EM>dynamic</EM> variables.  Those are set only
+                by a <STRONG>%P</STRONG> operator.  A <STRONG>%g</STRONG> for a  given  variable  without  first
+                setting  it  with  <STRONG>%P</STRONG> will give unpredictable results, because
+                dynamic variables are an  uninitialized  local  array  on  the
                 stack in the <STRONG>tparm</STRONG> function.
 
-            <STRONG>o</STRONG>   SVr3.2 curses supported <EM>static</EM> variables.  Those are an  array
+            <STRONG>o</STRONG>   SVr3.2  curses supported <EM>static</EM> variables.  Those are an array
                 in the <EM>TERMINAL</EM> structure (declared in <STRONG>term.h</STRONG>), and are zeroed
                 automatically when the <STRONG>setupterm</STRONG> function allocates the data.
 
             <STRONG>o</STRONG>   SVr4 curses made no further improvements to the <EM>dynamic/static</EM>
                 variable feature.
 
-            <STRONG>o</STRONG>   Solaris  XPG4  curses does not distinguish between <EM>dynamic</EM> and
-                <EM>static</EM> variables.  They are the same.  Like SVr4 curses,  XPG4
+            <STRONG>o</STRONG>   Solaris XPG4 curses does not distinguish between  <EM>dynamic</EM>  and
+                <EM>static</EM>  variables.  They are the same.  Like SVr4 curses, XPG4
                 curses does not initialize these explicitly.
 
-            <STRONG>o</STRONG>   Before  version  6.3,  <EM>ncurses</EM>  stores both <EM>dynamic</EM> and <EM>static</EM>
+            <STRONG>o</STRONG>   Before version 6.3, <EM>ncurses</EM> stores  both  <EM>dynamic</EM>  and  <EM>static</EM>
                 variables in persistent storage, initialized to zeros.
 
-            <STRONG>o</STRONG>   Beginning with version 6.3, <EM>ncurses</EM> stores <EM>static</EM> and  <EM>dynamic</EM>
+            <STRONG>o</STRONG>   Beginning  with version 6.3, <EM>ncurses</EM> stores <EM>static</EM> and <EM>dynamic</EM>
                 variables in the same manner as SVr4.
 
-                <STRONG>o</STRONG>   Unlike   other   implementations,  <EM>ncurses</EM>  zeros  dynamic
+                <STRONG>o</STRONG>   Unlike  other  implementations,  <EM>ncurses</EM>   zeros   dynamic
                     variables before the first <STRONG>%g</STRONG> or <STRONG>%P</STRONG> operator.
 
-                <STRONG>o</STRONG>   Like SVr2, the scope of dynamic variables  in  <EM>ncurses</EM>  is
+                <STRONG>o</STRONG>   Like  SVr2,  the  scope of dynamic variables in <EM>ncurses</EM> is
                     within the current call to <STRONG>tparm</STRONG>.  Use static variables if
                     persistent storage is needed.
 
@@ -1347,8 +1347,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
        <STRONG>%?</STRONG> <EM>expr</EM> <STRONG>%t</STRONG> <EM>thenpart</EM> <STRONG>%e</STRONG> <EM>elsepart</EM> <STRONG>%;</STRONG>
             This forms an if-then-else.  The <STRONG>%e</STRONG> <EM>elsepart</EM> is optional.  Usually
-            the  <STRONG>%?</STRONG>  <EM>expr</EM>  part  pushes a value onto the stack, and <STRONG>%t</STRONG> pops it
-            from the stack, testing if it is nonzero (true).  If  it  is  zero
+            the <STRONG>%?</STRONG> <EM>expr</EM> part pushes a value onto the stack,  and  <STRONG>%t</STRONG>  pops  it
+            from  the  stack,  testing if it is nonzero (true).  If it is zero
             (false), control passes to the <STRONG>%e</STRONG> (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1356,84 +1356,84 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
             where ci are conditions, bi are bodies.
 
-            Use  the  <STRONG>-f</STRONG>  option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the structure of if-
+            Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the  structure  of  if-
             then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can be very complicated when
-            written  on  one line.  The <STRONG>-f</STRONG> option splits the string into lines
+            written on one line.  The <STRONG>-f</STRONG> 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}%-".  <STRONG>%P</STRONG> and <STRONG>%g</STRONG>
+       Binary  operations  are  in postfix form with the operands in the usual
+       order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
-       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
-       sent  \E&amp;a12c03Y  padded for 6 milliseconds.  The order of the rows and
-       columns is inverted here, and the row and column  are  printed  as  two
+       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
+       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the  rows  and
+       columns  is  inverted  here,  and the row and column are printed as two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
 
-       The  Microterm ACT-IV needs the current row and column sent preceded by
+       The Microterm ACT-IV needs the current row and column sent preceded  by
        a <STRONG>^T</STRONG>, 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
-       (<STRONG>cub1</STRONG>),  and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This
+       Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
+       (<STRONG>cub1</STRONG>), and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).   This
        is necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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
+       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  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
+       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
+       character.  Then the same is  done  for  the  second  parameter.   More
        complex arithmetic is possible using the stack.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
-       If the terminal has a fast way to home the cursor (to very  upper  left
-       corner  of screen) then this can be given as <STRONG>home</STRONG>; similarly a fast way
-       of getting to the lower left-hand corner can be given as <STRONG>ll</STRONG>;  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 <STRONG>home</STRONG>; similarly a fast  way
+       of  getting  to the lower left-hand corner can be given as <STRONG>ll</STRONG>; this may
        involve going up with <STRONG>cuu1</STRONG> from the home position, but a program should
        never do this itself (unless <STRONG>ll</STRONG> 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
+       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 cannot be used for <STRONG>home</STRONG>.)
 
        If the terminal has row or column absolute cursor addressing, these can
-       be  given  as  single  parameter  capabilities <STRONG>hpa</STRONG> (horizontal position
-       absolute) and <STRONG>vpa</STRONG> (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  <STRONG>cup</STRONG>.   If  there   are
-       parameterized  local  motions  (e.g., move <EM>n</EM> spaces to the right) these
-       can be given as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with  a  single  parameter
-       indicating  how many spaces to move.  These are primarily useful if the
+       be given as single  parameter  capabilities  <STRONG>hpa</STRONG>  (horizontal  position
+       absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
+       parameterized local motions (e.g., move <EM>n</EM> spaces to  the  right)  these
+       can  be  given  as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with a single parameter
+       indicating how many spaces to move.  These are primarily useful if  the
        terminal does not have <STRONG>cup</STRONG>, 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 <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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
+       be  given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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.  This is also used for
-       the  TEKTRONIX  4025,  where <STRONG>smcup</STRONG> sets the command character to be the
-       one used by terminfo.  If the  <STRONG>smcup</STRONG>  sequence  will  not  restore  the
-       screen  after  an  <STRONG>rmcup</STRONG>  sequence  is  output  (to  the state prior to
+       the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets the command character  to  be  the
+       one  used  by  terminfo.   If  the  <STRONG>smcup</STRONG> sequence will not restore the
+       screen after an <STRONG>rmcup</STRONG>  sequence  is  output  (to  the  state  prior  to
        outputting <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       SVr4 (and X/Open Curses) list several string capabilities  for  setting
-       margins.   Two  were  intended  for use with terminals, and another six
+       SVr4  (and  X/Open Curses) list several string capabilities for setting
+       margins.  Two were intended for use with  terminals,  and  another  six
        were intended for use with printers.
 
        <STRONG>o</STRONG>   The two terminal capabilities assume that the terminal may have the
-           capability  of  setting the left and/or right margin at the current
+           capability of setting the left and/or right margin at  the  current
            cursor column position.
 
        <STRONG>o</STRONG>   The printer capabilities assume that the printer may have two types
@@ -1442,31 +1442,31 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            <STRONG>o</STRONG>   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           <STRONG>o</STRONG>   parameterized capabilities for setting the top,  bottom,  left,
+           <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
                right margins given the number of rows or columns.
 
-       In  practice,  the  categorization into "terminal" and "printer" is not
+       In practice, the categorization into "terminal" and  "printer"  is  not
        suitable:
 
-       <STRONG>o</STRONG>   The AT&amp;T SVr4 terminal database uses  <STRONG>smgl</STRONG>  four  times,  for  AT&amp;T
+       <STRONG>o</STRONG>   The  AT&amp;T  SVr4  terminal  database  uses <STRONG>smgl</STRONG> four times, for AT&amp;T
            hardware.
 
-           Three  of  the  four  are  printers.   They lack the ability to set
+           Three of the four are printers.   They  lack  the  ability  to  set
            left/right margins by specifying the column.
 
-       <STRONG>o</STRONG>   Other (non-AT&amp;T) terminals may support margins but using  different
+       <STRONG>o</STRONG>   Other  (non-AT&amp;T) terminals may support margins but using different
            assumptions from AT&amp;T.
 
-           For  instance,  the DEC VT420 supports left/right margins, but only
+           For instance, the DEC VT420 supports left/right margins,  but  only
            using a column parameter.  As an added complication, the VT420 uses
-           two  settings to fully enable left/right margins (left/right margin
-           mode, and origin mode).  The  former  enables  the  margins,  which
-           causes  printed  text  to  wrap  within  margins, but the latter is
+           two settings to fully enable left/right margins (left/right  margin
+           mode,  and  origin  mode).   The  former enables the margins, which
+           causes printed text to wrap  within  margins,  but  the  latter  is
            needed to prevent cursor-addressing outside those margins.
 
-       <STRONG>o</STRONG>   Both DEC VT420 left/right margins are set  with  a  single  control
+       <STRONG>o</STRONG>   Both  DEC  VT420  left/right  margins are set with a single control
            sequence.  If either is omitted, the corresponding margin is set to
-           the left or right edge of the  display  (rather  than  leaving  the
+           the  left  or  right  edge  of the display (rather than leaving the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1484,231 +1484,231 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                  <STRONG>smglr</STRONG>   Set both left and right margins to <EM>L</EM> and <EM>R</EM>
                  <STRONG>smgtb</STRONG>   Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
-       When  writing  an  application that uses these string capabilities, the
-       pairs should be first checked to see if each capability in the pair  is
+       When writing an application that uses these  string  capabilities,  the
+       pairs  should be first checked to see if each capability in the pair is
        set or only one is set:
 
-       <STRONG>o</STRONG>   If  both  <STRONG>smglp</STRONG>  and  <STRONG>smgrp</STRONG>  are  set,  each  is used with a single
-           argument, <EM>N</EM>, that gives the column number of  the  left  and  right
+       <STRONG>o</STRONG>   If both <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG>  are  set,  each  is  used  with  a  single
+           argument,  <EM>N</EM>,  that  gives  the column number of the left and right
            margin, respectively.
 
-       <STRONG>o</STRONG>   If  both  <STRONG>smgtp</STRONG>  and <STRONG>smgbp</STRONG> are set, each is used to set the top and
+       <STRONG>o</STRONG>   If both <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> are set, each is used to set  the  top  and
            bottom margin, respectively:
 
            <STRONG>o</STRONG>   <STRONG>smgtp</STRONG> is used with a single argument, <EM>N</EM>, the line number of the
                top margin.
 
-           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG>  is  used with two arguments, <EM>N</EM> and <EM>M</EM>, that give the line
+           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG> is used with two arguments, <EM>N</EM> and <EM>M</EM>, that give  the  line
                number of the bottom margin, the first counting from the top of
-               the  page  and  the  second  counting  from  the  bottom.  This
-               accommodates the two styles of specifying the bottom margin  in
+               the page  and  the  second  counting  from  the  bottom.   This
+               accommodates  the two styles of specifying the bottom margin in
                different manufacturers' printers.
 
-           When  designing  a terminfo entry for a printer that has a settable
-           bottom margin, only the first or second argument  should  be  used,
+           When designing a terminfo entry for a printer that has  a  settable
+           bottom  margin,  only  the first or second argument should be used,
            depending on the printer.  When developing an application that uses
            <STRONG>smgbp</STRONG> to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       <STRONG>o</STRONG>   If only one of <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it  is  used  with  two
+       <STRONG>o</STRONG>   If  only  one  of  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it is used with two
            arguments, the column number of the left and right margins, in that
            order.
 
-       <STRONG>o</STRONG>   Likewise, if only one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then  it  is  used
-           with  two  arguments  that give the top and bottom margins, in that
+       <STRONG>o</STRONG>   Likewise,  if  only  one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then it is used
+           with two arguments that give the top and bottom  margins,  in  that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both  left and right or top and bottom margins simultaneously, only
-           one capability in the pairs <STRONG>smglp</STRONG> and  <STRONG>smgrp</STRONG>  or  <STRONG>smgtp</STRONG>  and  <STRONG>smgbp</STRONG>
+           both left and right or top and bottom margins simultaneously,  only
+           one  capability  in  the  pairs  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG>
            should be defined, leaving the other unset.
 
-       Except  for  very  old terminal descriptions, e.g., those developed for
-       SVr4, the scheme just described  should  be  considered  obsolete.   An
+       Except for very old terminal descriptions, e.g.,  those  developed  for
+       SVr4,  the  scheme  just  described  should be considered obsolete.  An
        improved set of capabilities was added late in the SVr4 releases (<STRONG>smglr</STRONG>
-       and <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting  the
+       and  <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The  <STRONG>mgc</STRONG>  string  capability  should  be defined.  Applications such as
+       The <STRONG>mgc</STRONG> string capability should  be  defined.   Applications  such  as
        <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG> rely upon this to reset all margins.
 
 
 </PRE><H3><a name="h3-Area-Clears">Area Clears</a></H3><PRE>
-       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 <STRONG>el</STRONG>.  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 <STRONG>el1</STRONG>.  If the terminal can clear from the current  position  to
-       the  end  of  the display, then this should be given as <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> 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  <STRONG>el</STRONG>.   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  <STRONG>el1</STRONG>.  If the terminal can clear from the current position to
+       the end of the display, then this should be given as <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  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 <STRONG>ed</STRONG> is not
+       a request to delete a large number of  lines,  if  a  true  <STRONG>ed</STRONG>  is  not
        available.)
 
 
 </PRE><H3><a name="h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></H3><PRE>
-       If the terminal can open a new blank line before  the  line  where  the
-       cursor  is,  this  should  be  given as <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; 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 <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; this is done only from the first
        position on the line to be deleted.  Versions of <STRONG>il1</STRONG> and <STRONG>dl1</STRONG> which take
        a single parameter and insert or delete that many lines can be given as
        <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
 
-       If  the  terminal  has a settable scrolling region (like the vt100) the
-       command to set this can be described with  the  <STRONG>csr</STRONG>  capability,  which
+       If the terminal has a settable scrolling region (like  the  vt100)  the
+       command  to  set  this  can be described with the <STRONG>csr</STRONG> 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 <STRONG>csr</STRONG>  on
-       a  properly  chosen  region;  the  <STRONG>sc</STRONG>  and <STRONG>rc</STRONG> (save and restore cursor)
+       It  is possible to get the effect of insert or delete line using <STRONG>csr</STRONG> on
+       a properly chosen region; the <STRONG>sc</STRONG>  and  <STRONG>rc</STRONG>  (save  and  restore  cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string  does  not  move the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library
-       does  this  synthesis  automatically,   so   you   need   not   compose
+       string does not move the cursor.  (Note that  the  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  library
+       does   this   synthesis   automatically,   so   you  need  not  compose
        insert/delete strings for an entry with <STRONG>csr</STRONG>).
 
-       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  however  also  has
+       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   however   also   has
        insert/delete).
 
-       Inserting lines at the top or bottom of the screen  can  also  be  done
-       using  <STRONG>ri</STRONG>  or  <STRONG>ind</STRONG> on many terminals without a true insert/delete line,
+       Inserting  lines  at  the  top or bottom of the screen can also be done
+       using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
        and is often faster even on terminals with those features.
 
-       The Boolean <STRONG>non_dest_scroll_region</STRONG> 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 something to the bottom line, move the cursor to the top
-       of the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data  scrolled
-       off  the  bottom  of the region by the <STRONG>ri</STRONG> re-appears, then scrolling is
-       non-destructive.  System V and XSI Curses expect that  <STRONG>ind</STRONG>,  <STRONG>ri</STRONG>,  <STRONG>indn</STRONG>,
+       The  Boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
+       of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
+       off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
+       non-destructive.   System  V  and XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
-       cautions you not to define  <STRONG>csr</STRONG>  unless  this  is  true.   This  <STRONG>curses</STRONG>
-       implementation  is  more  liberal  and  will  do  explicit erases after
+       cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
+       implementation is more  liberal  and  will  do  explicit  erases  after
        scrolling if <STRONG>ndsrc</STRONG> 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 <STRONG>wind</STRONG>.  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  <STRONG>wind</STRONG>.  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 <STRONG>da</STRONG> capability
-       should be given; if display memory  can  be  retained  below,  then  <STRONG>db</STRONG>
-       should  be given.  These indicate that deleting a line or scrolling may
-       bring non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG>  may
+       should  be  given;  if  display  memory  can be retained below, then <STRONG>db</STRONG>
+       should be given.  These indicate that deleting a line or scrolling  may
+       bring  non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG> may
        bring down non-blank lines.
 
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
-       There  are  two  basic  kinds  of intelligent terminals with respect to
-       insert/delete character which can be  described  using  <EM>terminfo.</EM>   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
+       There are two basic kinds of  intelligent  terminals  with  respect  to
+       insert/delete  character  which  can  be described using <EM>terminfo.</EM>  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 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
-       second type of terminal, and  should  give  the  capability  <STRONG>in</STRONG>,  which
+       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
+       second  type  of  terminal,  and  should  give the capability <STRONG>in</STRONG>, 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 <STRONG>smir</STRONG> the sequence to get into insert mode.  Give
-       as  <STRONG>rmir</STRONG>  the  sequence  to  leave  insert  mode.  Now give as <STRONG>ich1</STRONG> any
-       sequence needed to be sent just before  sending  the  character  to  be
-       inserted.   Most  terminals with a true insert mode will not give <STRONG>ich1</STRONG>;
-       terminals which send a sequence to open a screen position  should  give
+       as <STRONG>rmir</STRONG> the sequence to leave  insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
+       sequence  needed  to  be  sent  just before sending the character to be
+       inserted.  Most terminals with a true insert mode will not  give  <STRONG>ich1</STRONG>;
+       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 <STRONG>ich1</STRONG>.
-       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 <STRONG>ich</STRONG> sequences do not require previous smir, and most  smir  insert
-       modes  do  not  require <STRONG>ich1</STRONG> before each character.  Therefore, the new
-       <STRONG>curses</STRONG> actually assumes this is the case and uses either  <STRONG>rmir</STRONG>/<STRONG>smir</STRONG>  or
-       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  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  <STRONG>ich1</STRONG>.
+       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  <STRONG>ich</STRONG>  sequences do not require previous smir, and most smir insert
+       modes do not require <STRONG>ich1</STRONG> before each character.   Therefore,  the  new
+       <STRONG>curses</STRONG>  actually  assumes this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or
+       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> 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 <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be  sent
+       in  <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be sent
        after an insert of a single character may also be given in <STRONG>ip</STRONG>.  If your
-       terminal needs both to be placed into an "insert mode"  and  a  special
-       code  to  precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> and <STRONG>ich1</STRONG>
-       can be given, and both will be used.   The  <STRONG>ich</STRONG>  capability,  with  one
+       terminal  needs  both  to be placed into an "insert mode" and a special
+       code to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>  and  <STRONG>ich1</STRONG>
+       can  be  given,  and  both  will be used.  The <STRONG>ich</STRONG> capability, with one
        parameter, <EM>n</EM>, will repeat the effects of <STRONG>ich1</STRONG> <EM>n</EM> 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 <STRONG>rmp</STRONG>.
 
-       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 <STRONG>mir</STRONG> to speed up inserting in this
-       case.  Omitting <STRONG>mir</STRONG> will affect only speed.   Some  terminals  (notably
-       Datamedia's)  must  not  have  <STRONG>mir</STRONG> 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 <STRONG>mir</STRONG> to  speed  up  inserting  in  this
+       case.   Omitting  <STRONG>mir</STRONG>  will affect only speed.  Some terminals (notably
+       Datamedia's) must not have <STRONG>mir</STRONG> because of the  way  their  insert  mode
        works.
 
-       Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
-       one  parameter,  <EM>n</EM>,  to  delete <EM>n</EM> <EM>characters,</EM> and delete mode by giving
-       <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit delete  mode  (any  mode  the  terminal
+       Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
+       one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> and  delete  mode  by  giving
+       <STRONG>smdc</STRONG>  and  <STRONG>rmdc</STRONG>  to  enter  and exit delete mode (any mode the terminal
        needs to be placed in for <STRONG>dch1</STRONG> to work).
 
-       A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
+       A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
 </PRE><H3><a name="h3-Highlighting_Underlining_and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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 <EM>standout</EM> <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>,  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  <EM>standout</EM>  <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, 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
        <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as <STRONG>smul</STRONG> and
        <STRONG>rmul</STRONG> 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 <STRONG>uc</STRONG>.
 
-       Other capabilities to enter various highlighting  modes  include  <STRONG>blink</STRONG>
-       (blinking)  <STRONG>bold</STRONG>  (bold or extra bright) <STRONG>dim</STRONG> (dim or half-bright) <STRONG>invis</STRONG>
-       (blanking or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video)  <STRONG>sgr0</STRONG>
-       (turn  off  <EM>all</EM>  attribute  modes) <STRONG>smacs</STRONG> (enter alternate character set
+       Other  capabilities  to  enter various highlighting modes include <STRONG>blink</STRONG>
+       (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> (dim or  half-bright)  <STRONG>invis</STRONG>
+       (blanking  or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>
+       (turn off <EM>all</EM> attribute modes) <STRONG>smacs</STRONG>  (enter  alternate  character  set
        mode) and <STRONG>rmacs</STRONG> (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 <STRONG>sgr</STRONG> (set attributes),  taking  9  parameters.   Each
+       If there is a sequence to set arbitrary  combinations  of  modes,  this
+       should  be  given  as  <STRONG>sgr</STRONG> (set attributes), taking 9 parameters.  Each
        parameter is either zero (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.
+       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  <STRONG>sgr</STRONG>,  only  those  for  which
        corresponding separate attribute commands exist.
 
@@ -1727,17 +1727,17 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                    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
-       terminal 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
+       terminal  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
-       output  when  either  p1  or p3 is true, that is, if either standout or
+       Some  sequences  are  common  to  different  modes.  For example, ;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 dependencies yields
@@ -1758,54 +1758,54 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            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
+       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
+       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  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> capability, asserting that it is
+       Terminals  with  the  "magic  cookie"  glitch  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> 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 <STRONG>flash</STRONG>; 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 <STRONG>flash</STRONG>;  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
        <STRONG>cvvis</STRONG>.  If there is a way to make the cursor completely invisible, give
-       that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which  undoes  the
+       that  as  <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> 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  <STRONG>ul</STRONG>.  If a character overstriking another
-       leaves both characters on the screen, specify the  capability  <STRONG>os</STRONG>.   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 <STRONG>ul</STRONG>.  If  a  character  overstriking  another
+       leaves  both  characters  on the screen, specify the capability <STRONG>os</STRONG>.  If
        overstrikes are erasable with a blank, then this should be indicated by
        giving <STRONG>eo</STRONG>.
 
 
 </PRE><H3><a name="h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></H3><PRE>
-       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
-       to transmit or not  transmit,  give  these  codes  as  <STRONG>smkx</STRONG>  and  <STRONG>rmkx</STRONG>.
+       for example, to the unshifted HP 2621 keys).  If the keypad can be  set
+       to  transmit  or  not  transmit,  give  these  codes  as <STRONG>smkx</STRONG> and <STRONG>rmkx</STRONG>.
        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 <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>  <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG>  and  <STRONG>khome</STRONG>
+       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
+       and  home  keys  can  be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG>
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes they send can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG>  <STRONG>kf10</STRONG>.   If  these  keys
-       have  labels  other  than the default f0 through f10, the labels can be
+       codes  they  send  can  be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys
+       have labels other than the default f0 through f10, the  labels  can  be
        given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.
 
        The codes transmitted by certain other special keys can be given:
@@ -1844,64 +1844,64 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   <STRONG>khts</STRONG> (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 <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>,
-       <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  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  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,
+       <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.   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 <STRONG>pfkey</STRONG>, <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>.
-       A string to program screen labels should be specified as <STRONG>pln</STRONG>.  Each  of
-       these  strings takes two parameters: the function key number to program
+       A  string to program screen labels should be specified as <STRONG>pln</STRONG>.  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  <STRONG>pfkey</STRONG>  causes
-       pressing  the  given  key  to  be the same as the user typing the given
-       string; <STRONG>pfloc</STRONG> 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 <STRONG>pfkey</STRONG> causes
+       pressing the given key to be the same as  the  user  typing  the  given
+       string;  <STRONG>pfloc</STRONG>  causes  the  string  to  be executed by the terminal in
        local; and <STRONG>pfx</STRONG> causes the string to be transmitted to the computer.
 
-       The  capabilities  <STRONG>nlab</STRONG>,  <STRONG>lw</STRONG>  and  <STRONG>lh</STRONG> 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 <STRONG>smln</STRONG> and <STRONG>rmln</STRONG>.  <STRONG>smln</STRONG> is
-       normally output after one or more pln sequences to make sure  that  the
+       The capabilities <STRONG>nlab</STRONG>, <STRONG>lw</STRONG> and <STRONG>lh</STRONG>  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  <STRONG>smln</STRONG>  and  <STRONG>rmln</STRONG>.   <STRONG>smln</STRONG>  is
+       normally  output  after one or more pln sequences to make sure that the
        change becomes visible.
 
 
 </PRE><H3><a name="h3-Tabs-and-Initialization">Tabs and Initialization</a></H3><PRE>
        A few capabilities are used only for tabs:
 
-       <STRONG>o</STRONG>   If  the  terminal  has hardware tabs, the command to advance to the
+       <STRONG>o</STRONG>   If the terminal has hardware tabs, the command to  advance  to  the
            next tab stop can be given as <STRONG>ht</STRONG> (usually control/I).
 
        <STRONG>o</STRONG>   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as <STRONG>cbt</STRONG>.
 
-           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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> 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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> even if they are  present,  since
            the user may not have the tab stops properly set.
 
-       <STRONG>o</STRONG>   If the terminal has hardware tabs which are initially set  every  <EM>n</EM>
+       <STRONG>o</STRONG>   If  the  terminal has hardware tabs which are initially set every <EM>n</EM>
            spaces when the terminal is powered up, the numeric parameter <STRONG>it</STRONG> is
            given, showing the number of spaces the tabs are set to.
 
            The <STRONG>it</STRONG> capability is normally used by the <STRONG>tset</STRONG> 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
 
        <STRONG>o</STRONG>   <STRONG>is1</STRONG>, <STRONG>is2</STRONG>, and <STRONG>is3</STRONG>, initialization strings for the terminal,
 
-       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>, the path name of a program  to  be  run  to  initialize  the
+       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>,  the  path  name  of  a  program to be run to initialize the
            terminal,
 
        <STRONG>o</STRONG>   and <STRONG>if</STRONG>, 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  <EM>init</EM> option of the <STRONG>tput</STRONG> 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 <EM>init</EM> option of the <STRONG>tput</STRONG>  program,  each  time  the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -1925,34 +1925,34 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
               and finally output
                      <STRONG>is3</STRONG>.
 
-       Most initialization is done with <STRONG>is2</STRONG>.  Special terminal  modes  can  be
-       set  up  without duplicating strings by putting the common sequences in
+       Most  initialization  is  done with <STRONG>is2</STRONG>.  Special terminal modes can be
+       set up without duplicating strings by putting the common  sequences  in
        <STRONG>is2</STRONG> and special cases in <STRONG>is1</STRONG> and <STRONG>is3</STRONG>.
 
-       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 <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
-       and <STRONG>is3</STRONG> respectively.  These strings are  output  by  <EM>reset</EM>  option  of
-       <STRONG>tput</STRONG>,  or  by  the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
+       and  <STRONG>is3</STRONG>  respectively.   These  strings  are output by <EM>reset</EM> option of
+       <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which  is  used  when
        the terminal gets into a wedged state.  Commands are normally placed in
        <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> 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 <STRONG>is2</STRONG>, 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  <STRONG>is2</STRONG>,  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  <STRONG>reset</STRONG>  program  writes  strings including <STRONG>iprog</STRONG>, etc., in the same
-       order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of  <STRONG>is1</STRONG>,  etc.   If
-       any  of  <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are missing, the
-       <STRONG>reset</STRONG>  program  falls  back  upon  the   corresponding   initialization
+       The <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>,  etc.,  in  the  same
+       order  as  the  <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc.  If
+       any of <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are  missing,  the
+       <STRONG>reset</STRONG>   program   falls  back  upon  the  corresponding  initialization
        capability 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
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (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 <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
-       The <STRONG>tput</STRONG> <STRONG>reset</STRONG> command uses the same capability strings  as  the  <STRONG>reset</STRONG>
-       command,  although  the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>) provide different
+       The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
+       command, although the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>)  provide  different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -1961,78 +1961,78 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>o</STRONG>   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every <EM>eight</EM> columns:
 
-           The only exception was the AT&amp;T 2300  series,  which  set  tabs  to
+           The  only  exception  was  the  AT&amp;T 2300 series, which set tabs to
            every <EM>five</EM> columns.
 
-       <STRONG>o</STRONG>   In  particular,  developers  of  the  hardware  terminals which are
-           commonly used as models  for  modern  terminal  emulators  provided
+       <STRONG>o</STRONG>   In particular, developers  of  the  hardware  terminals  which  are
+           commonly  used  as  models  for  modern terminal emulators provided
            documentation demonstrating that <EM>eight</EM> columns were the standard.
 
        <STRONG>o</STRONG>   Because of this, the terminal initialization programs <STRONG>tput</STRONG> and <STRONG>tset</STRONG>
-           use  the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)   capabilities
-           directly  only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a value
+           use   the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)  capabilities
+           directly only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a  value
            other than <EM>eight</EM>.
 
 
 </PRE><H3><a name="h3-Delays-and-Padding">Delays and Padding</a></H3><PRE>
-       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
+       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 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 <STRONG>xon</STRONG>.  This capability suppresses the emission of
-       padding.  You  can  also  set  it  for  memory-mapped  console  devices
+       automatically  emits  ^S  back  to  the host when its input buffers are
+       close to full), set <STRONG>xon</STRONG>.  This capability 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  decisions  about
+       still  be  included  so  that  routines can make better decisions about
        relative costs, but actual pad characters will not be transmitted.
 
        If <STRONG>pb</STRONG> (padding baud rate) is given, padding is suppressed at baud rates
-       below the value of <STRONG>pb</STRONG>.  If the entry has no  padding  baud  rate,  then
+       below  the  value  of  <STRONG>pb</STRONG>.  If the entry has no padding baud rate, then
        whether padding is emitted or not is completely controlled by <STRONG>xon</STRONG>.
 
-       If  the  terminal requires other than a null (zero) character as a pad,
-       then this can be given as <STRONG>pad</STRONG>.  Only the first  character  of  the  <STRONG>pad</STRONG>
+       If the terminal requires other than a null (zero) character as  a  pad,
+       then  this  can  be  given as <STRONG>pad</STRONG>.  Only the first character of the <STRONG>pad</STRONG>
        string is used.
 
 
 </PRE><H3><a name="h3-Status-Lines">Status Lines</a></H3><PRE>
-       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 <STRONG>lines</STRONG> 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 <STRONG>hs</STRONG> capability.
 
-       Some terminals with status lines need special sequences to  access  the
-       status  line.  These may be expressed as a string with single parameter
-       <STRONG>tsl</STRONG> which takes the cursor to a given zero-origin column on the  status
-       line.   The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen cursor
+       Some  terminals  with status lines need special sequences to access the
+       status line.  These may be expressed as a string with single  parameter
+       <STRONG>tsl</STRONG>  which takes the cursor to a given zero-origin column on the status
+       line.  The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen  cursor
        positions before the last <STRONG>tsl</STRONG>.  You may need to embed the string values
-       of  <STRONG>sc</STRONG>  (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and <STRONG>fsl</STRONG> to
+       of <STRONG>sc</STRONG> (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and  <STRONG>fsl</STRONG>  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 <STRONG>wsl</STRONG>.
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The Boolean capability <STRONG>eslok</STRONG> specifies  that  escape  sequences,  tabs,
+       The  Boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
        etc., work ordinarily in the status line.
 
-       The  <EM>ncurses</EM> implementation does not yet use any of these capabilities.
+       The <EM>ncurses</EM> implementation does not yet use any of these  capabilities.
        They are documented here in case they ever become important.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Many terminals have alternate character sets useful for  forms-drawing.
-       Terminfo  and  <STRONG>curses</STRONG>  have  built-in  support  for most of the drawing
-       characters supported by the VT100, with some characters from  the  AT&amp;T
-       4410v1  added.   This  alternate  character set may be specified by the
+       Many  terminals have alternate character sets useful for forms-drawing.
+       Terminfo and <STRONG>curses</STRONG> have built-in  support  for  most  of  the  drawing
+       characters  supported  by the VT100, with some characters from the AT&amp;T
+       4410v1 added.  This alternate character set may  be  specified  by  the
        <STRONG>acsc</STRONG> capability.
 
                           <STRONG>acsc</STRONG>
@@ -2074,34 +2074,34 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
        A few notes apply to the table itself:
 
-       <STRONG>o</STRONG>   X/Open Curses incorrectly states that the mapping  for  <EM>lantern</EM>  is
-           uppercase  "I"  although Unix implementations use the lowercase "i"
+       <STRONG>o</STRONG>   X/Open  Curses  incorrectly  states that the mapping for <EM>lantern</EM> is
+           uppercase "I" although Unix implementations use the  lowercase  "i"
            mapping.
 
-       <STRONG>o</STRONG>   The DEC VT100 implemented graphics using  the  alternate  character
-           set  feature, temporarily switching <EM>modes</EM> and sending characters in
-           the range 0x60 (96) to 0x7e (126) (the <STRONG>acsc</STRONG>  <STRONG>Value</STRONG>  column  in  the
+       <STRONG>o</STRONG>   The  DEC  VT100  implemented graphics using the alternate character
+           set feature, temporarily switching <EM>modes</EM> and sending characters  in
+           the  range  0x60  (96)  to 0x7e (126) (the <STRONG>acsc</STRONG> <STRONG>Value</STRONG> column in the
            table).
 
        <STRONG>o</STRONG>   The AT&amp;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&amp;T terminal:  <EM>board</EM>  <EM>of</EM>  <EM>squares</EM>
-           replaces  the  VT100  <EM>newline</EM> symbol, while <EM>lantern</EM> <EM>symbol</EM> replaces
+           Some of the characters within the range do  not  match  the  VT100;
+           presumably  they  were  used in the AT&amp;T terminal: <EM>board</EM> <EM>of</EM> <EM>squares</EM>
+           replaces the VT100 <EM>newline</EM> symbol, while  <EM>lantern</EM>  <EM>symbol</EM>  replaces
            the VT100 <EM>vertical</EM> <EM>tab</EM> symbol.  The other VT100 symbols for control
-           characters  (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) are not
+           characters (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) 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 <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG> 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  <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG>  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.
 
 
 </PRE><H3><a name="h3-Color-Handling">Color Handling</a></H3><PRE>
-       The curses library functions <STRONG>init_pair</STRONG> and  <STRONG>init_color</STRONG>  manipulate  the
-       <EM>color</EM>   <EM>pairs</EM>   and   <EM>color</EM>  <EM>values</EM>  discussed  in  this  section  (see
+       The  curses  library  functions <STRONG>init_pair</STRONG> and <STRONG>init_color</STRONG> manipulate the
+       <EM>color</EM>  <EM>pairs</EM>  and  <EM>color</EM>  <EM>values</EM>  discussed  in   this   section   (see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2110,45 +2110,45 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            is usually 8), and can set character-cell foreground and background
            characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
 
-       <STRONG>o</STRONG>   On HP-like  terminals,  the  user  must  set  each  color  pair  up
-           separately   (foreground   and  background  are  not  independently
-           settable).  Up to <EM>M</EM> color pairs may be set up  from  2*<EM>M</EM>  different
+       <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
+           separately  (foreground  and  background  are   not   independently
+           settable).   Up  to  <EM>M</EM> color pairs may be set up from 2*<EM>M</EM> different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric capabilities <STRONG>colors</STRONG> and <STRONG>pairs</STRONG> specify the  maximum  numbers  of
-       colors  and  color  pairs that can be displayed simultaneously.  The <STRONG>op</STRONG>
+       numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
+       colors and color pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
-       default  values  for  the terminal.  The <STRONG>oc</STRONG> 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;
+       default values for the terminal.  The <STRONG>oc</STRONG> 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 <STRONG>bce</STRONG>.
 
-       While  the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting the
-       inability of some devices  to  set  foreground  and  background  colors
-       independently),  there  are  separate  capabilities  for  setting these
+       While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
+       inability  of  some  devices  to  set  foreground and background colors
+       independently), there  are  separate  capabilities  for  setting  these
        features:
 
-       <STRONG>o</STRONG>   To  change  the  current  foreground  or  background  color  on   a
-           Tektronix-type  terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and <STRONG>setab</STRONG>
-           (set ANSI background)  or  <STRONG>setf</STRONG>  (set  foreground)  and  <STRONG>setb</STRONG>  (set
+       <STRONG>o</STRONG>   To   change  the  current  foreground  or  background  color  on  a
+           Tektronix-type terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and  <STRONG>setab</STRONG>
+           (set  ANSI  background)  or  <STRONG>setf</STRONG>  (set  foreground)  and <STRONG>setb</STRONG> (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says  that
-           "If  the  terminal supports ANSI escape sequences to set background
-           and  foreground,  they  should  be  coded  as  <STRONG>setaf</STRONG>   and   <STRONG>setab</STRONG>,
+           documentation  describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says that
+           "If the terminal supports ANSI escape sequences to  set  background
+           and   foreground,   they  should  be  coded  as  <STRONG>setaf</STRONG>  and  <STRONG>setab</STRONG>,
            respectively.
 
-       <STRONG>o</STRONG>   If  the  terminal supports other escape sequences to set background
-           and  foreground,  they  should  be  coded   as   <STRONG>setf</STRONG>   and   <STRONG>setb</STRONG>,
-           respectively.   The  <STRONG>vidputs</STRONG>  and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> functions use the
+       <STRONG>o</STRONG>   If the terminal supports other escape sequences to  set  background
+           and   foreground,   they   should   be  coded  as  <STRONG>setf</STRONG>  and  <STRONG>setb</STRONG>,
+           respectively.  The <STRONG>vidputs</STRONG> and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  functions  use  the
            <STRONG>setaf</STRONG> and <STRONG>setab</STRONG> capabilities if they are defined.
 
-       The <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single  numeric
+       The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
-       as follows (the middle column is the symbolic #define available in  the
-       header  for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware is
-       free to map these as it likes,  but  the  RGB  values  indicate  normal
+       as  follows (the middle column is the symbolic #define available in the
+       header for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware  is
+       free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
                     <STRONG>Color</STRONG>      <STRONG>#define</STRONG>       <STRONG>Value</STRONG>        <STRONG>RGB</STRONG>
@@ -2176,32 +2176,32 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                    yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max, max, 0
                    white     <STRONG>COLOR_WHITE</STRONG>       7     max, max, max
 
-       It is important to not confuse the  two  sets  of  color  capabilities;
+       It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On  an  HP-like terminal, use <STRONG>scp</STRONG> with a color pair number parameter to
+       On an HP-like terminal, use <STRONG>scp</STRONG> with a color pair number  parameter  to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
 
-       <STRONG>o</STRONG>   On a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present  to
-           indicate  that colors can be modified.  If so, the <STRONG>initc</STRONG> capability
+       <STRONG>o</STRONG>   On  a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present to
+           indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           which describe the color.  These three parameters default to  being
+           interpreted  as  RGB  (Red,  Green,  Blue)  values.  If the Boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       <STRONG>o</STRONG>   On an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing  a
-           color  pair  value.   It  will  take seven parameters; a color pair
-           number (0 to <STRONG>max_pairs</STRONG> -  1),  and  two  triples  describing  first
-           background  and  then  foreground colors.  These parameters must be
-           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
+       <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
+           color pair value.  It will take  seven  parameters;  a  color  pair
+           number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
+           background and then foreground colors.  These  parameters  must  be
+           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
            <STRONG>hls</STRONG>.
 
-       On  some  color  terminals,  colors  collide  with highlights.  You can
-       register these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit  mask
-       of   attributes   not   to  be  used  when  colors  are  enabled.   The
+       On some color terminals,  colors  collide  with  highlights.   You  can
+       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit mask
+       of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
                          <STRONG>Attribute</STRONG>     <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>   <STRONG>Set</STRONG> <STRONG>by</STRONG>
@@ -2223,118 +2223,118 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
                         <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
                         <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
-       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 <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4 curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and  optimizes
+       SVr4  curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and optimizes
        the output in favor of colors.
 
 
 </PRE><H3><a name="h3-Miscellaneous">Miscellaneous</a></H3><PRE>
-       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 <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG>  variable;
-       though  the  application  may  set this value to something other than a
-       null, <EM>ncurses</EM> will test <STRONG>npc</STRONG> first and use napms if the terminal has  no
+       npc.   Note that <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG> variable;
+       though the application may set this value to  something  other  than  a
+       null,  <EM>ncurses</EM> will test <STRONG>npc</STRONG> 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 <STRONG>hu</STRONG> (half-line up) and <STRONG>hd</STRONG>  (half-line  down).   This  is  primarily
-       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
+       If the terminal can move up or down half a line, this can be  indicated
+       with  <STRONG>hu</STRONG>  (half-line  up)  and  <STRONG>hd</STRONG> (half-line down).  This is primarily
+       useful for superscripts and subscripts on hard-copy  terminals.   If  a
        hard-copy terminal can eject to the next page (form feed), give this as
        <STRONG>ff</STRONG> (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 <STRONG>rep</STRONG>.
-       The first parameter is the character to be repeated and the  second  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  <STRONG>rep</STRONG>.
+       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 <STRONG>cmdch</STRONG>.  A prototype command character
-       is chosen which is used in all capabilities.  This character  is  given
-       in  the  <STRONG>cmdch</STRONG>  capability to identify it.  The following convention is
+       4025, this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command  character
+       is  chosen  which is used in all capabilities.  This character is given
+       in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
        supported on some Unix systems: The environment is to be searched for a
-       <STRONG>CC</STRONG>  variable,  and if found, all occurrences of the prototype character
+       <STRONG>CC</STRONG> 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  <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and <EM>network</EM>, should include
-       the <STRONG>gn</STRONG> (generic) capability so that programs can complain that they  do
-       not  know how to talk to the terminal.  (This capability does not apply
-       to <EM>virtual</EM> terminal descriptions for which  the  escape  sequences  are
+       Terminal  descriptions  that  do not represent a specific kind of known
+       terminal, such as <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and  <EM>network</EM>,  should  include
+       the  <STRONG>gn</STRONG> (generic) capability so that programs can complain that they do
+       not know how to talk to the terminal.  (This capability does not  apply
+       to  <EM>virtual</EM>  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
-       <STRONG>km</STRONG>.   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
+       <STRONG>km</STRONG>.  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 <STRONG>smm</STRONG> and <STRONG>rmm</STRONG>.
 
        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 <STRONG>lm</STRONG>.  A  value
+       once,  the number of lines of memory can be indicated with <STRONG>lm</STRONG>.  A value
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
-       Media  copy strings which control an auxiliary printer connected to the
-       terminal can be given as <STRONG>mc0</STRONG>: print the contents of  the  screen,  <STRONG>mc4</STRONG>:
-       turn  off  the printer, and <STRONG>mc5</STRONG>: 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  <STRONG>mc5p</STRONG>  takes  one  parameter,  and
-       leaves  the  printer  on  for  as  many  characters as the value of the
+       Media copy strings which control an auxiliary printer connected to  the
+       terminal  can  be  given as <STRONG>mc0</STRONG>: print the contents of the screen, <STRONG>mc4</STRONG>:
+       turn off the printer, and <STRONG>mc5</STRONG>: 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 <STRONG>mc5p</STRONG> takes one parameter, and
+       leaves the printer on for as  many  characters  as  the  value  of  the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.   All  text, including <STRONG>mc4</STRONG>, is transparently passed to the printer
+       255.  All text, including <STRONG>mc4</STRONG>, is transparently passed to  the  printer
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
 </PRE><H3><a name="h3-Glitches-and-Brain-Damage">Glitches and Brain Damage</a></H3><PRE>
-       Hazeltine terminals, which do not allow "~" characters to be  displayed
+       Hazeltine  terminals, which do not allow "~" characters to be displayed
        should indicate <STRONG>hz</STRONG>.
 
-       Terminals  which  ignore a line-feed immediately after an <STRONG>am</STRONG> wrap, such
+       Terminals which ignore a line-feed immediately after an <STRONG>am</STRONG>  wrap,  such
        as the Concept and vt100, should indicate <STRONG>xenl</STRONG>.
 
-       If <STRONG>el</STRONG> is required to get rid of standout  (instead  of  merely  writing
+       If  <STRONG>el</STRONG>  is  required  to get rid of standout (instead of merely writing
        normal text on top of it), <STRONG>xhp</STRONG> should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should indicate <STRONG>xt</STRONG> (destructive tabs).  Note: the  variable  indicating
-       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
-       teleray_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 necessary to use  delete  and  insert
+       should  indicate  <STRONG>xt</STRONG> (destructive tabs).  Note: the variable indicating
+       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
+       teleray_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 necessary to use delete and insert
        line.  The <EM>ncurses</EM> implementation ignores this glitch.
 
-       The  Beehive Superbee, which is unable to correctly transmit the escape
-       or control/C characters, has <STRONG>xsb</STRONG>, 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 <STRONG>xsb</STRONG>, 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
+       Other specific terminal  problems  may  be  corrected  by  adding  more
        capabilities of the form <STRONG>x</STRONG><EM>x</EM>.
 
 
 </PRE><H3><a name="h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></H3><PRE>
-       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 translations are much more strictly  limited
+       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 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  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> is searching for is,
+       The  man  pages  for  4.3BSD and older versions of <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> is  searching  for  is,
        several bad things can happen:
 
        <STRONG>o</STRONG>   some termcap libraries print a warning message,
@@ -2348,15 +2348,15 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        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 <STRONG>tgetent</STRONG> strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2365,39 +2365,39 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
        <STRONG>o</STRONG>   and the application has only allocated a 1k buffer,
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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,
 
-       <STRONG>o</STRONG>   and <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> has  to  search
+       <STRONG>o</STRONG>   and  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> has to search
            the whole termcap file).
 
-       Then  <STRONG>tgetent</STRONG>  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
+       Then <STRONG>tgetent</STRONG> 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.
 
-       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 <EM>TERM</EM> to that terminal type,
-       since <STRONG>tgetent</STRONG> only does "tc" expansion once it is  found  the  terminal
+       since  <STRONG>tgetent</STRONG>  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 <EM>TERM</EM> 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 <EM>TERM</EM> variable does not  have  a  termcap
        entry.
 
-       When in -C (translate to termcap) mode, the <EM>ncurses</EM>  implementation  of
-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>  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 <EM>ncurses</EM> implementation of
+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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.
 
 
@@ -2407,71 +2407,71 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching    for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>   and
+       Searching   for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>    and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is not supported by older implementations.
 
-       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
+       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
-       <EM>ncurses</EM> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
+       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
+       <EM>ncurses</EM>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation may need terminfo entries made for <EM>ncurses</EM> to have  <STRONG>msgr</STRONG>
+       interpretation  may need terminfo entries made for <EM>ncurses</EM> to have <STRONG>msgr</STRONG>
        turned off.
 
        The <EM>ncurses</EM> 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 <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
-       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
+       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
+       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
        the documentation for the AT&amp;T 505 terminal.
 
-       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM> library wants
-       to interpret it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and  emulators  like
-       xterm  that can return mouse-tracking information in the keyboard-input
+       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM>  library  wants
+       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
-       used  for  italics with <STRONG>ncv</STRONG> can be confused with an absent or cancelled
-       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
+       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
+       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> value must be
        specified, even if it is zero.
 
-       Different  commercial  ports  of  <EM>terminfo</EM> and <EM>curses</EM> support different
-       subsets of XSI Curses and (in some cases) different  extensions.   Here
-       is  a  summary, accurate as of October 1995, after which the commercial
+       Different commercial ports of <EM>terminfo</EM>  and  <EM>curses</EM>  support  different
+       subsets  of  XSI Curses and (in some cases) different extensions.  Here
+       is a summary, accurate as of October 1995, after which  the  commercial
        Unix market contracted and lost diversity.
 
        <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
-       <STRONG>o</STRONG>   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
+       <STRONG>o</STRONG>   IRIX  supports  the  SVr4  set  and  adds one undocumented extended
            string capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   SVr1   and   Ultrix   support   a  restricted  subset  of  <EM>terminfo</EM>
-           capabilities.  The Booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
+       <STRONG>o</STRONG>   SVr1  and  Ultrix  support  a   restricted   subset   of   <EM>terminfo</EM>
+           capabilities.   The  Booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
-           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
-           through  63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a number
+       <STRONG>o</STRONG>   HP/UX  supports  the  SVr1  subset,  plus  the  SVr[234]   numerics
+           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
+           through 63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a  number
            of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   AIX supports the SVr1 subset, plus function  keys  11  through  63,
+       <STRONG>o</STRONG>   AIX  supports  the  SVr1  subset, plus function keys 11 through 63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Do  not  count  on  compiled  (binary)  <EM>terminfo</EM> entries being portable
-       between commercial Unix  systems.   At  least  two  implementations  of
+       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
+       between  commercial  Unix  systems.   At  least  two implementations of
        <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
-       Unices after SVr1, adding extension capabilities to  the  string  table
-       that  (in  the  binary format) collide with subsequent System V and XSI
+       Unices  after  SVr1,  adding extension capabilities to the string table
+       that (in the binary format) collide with subsequent System  V  and  XSI
        Curses extensions.
 
 
@@ -2481,8 +2481,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,     <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 1d5b8f476..f2e197d35 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.106 2023/12/30 21:36:32 tom Exp @
+  * @Id: tic.1m,v 1.108 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2023-12-30 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2023-12-30 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2023-12-30 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-30                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 80b1fb2f7..46578230e 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.64 2024/01/20 16:51:21 tom Exp @
+  * @Id: toe.1m,v 1.66 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-01-20 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-01-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -185,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-01-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index d60ad9823..4ebb0d708 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp @
+  * @Id: tput.1,v 1.109 2024/03/23 20:42:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-01-20 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-03-23 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-03-23 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -76,13 +76,13 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
        <EM>code</EM>.
 
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> discusses terminal capabilities at length  and  presents  a
-       complete list of <EM>cap-codes.</EM>
+       complete list of <EM>cap-codes</EM>.
 
        When   retrieving  capability  values,  the  result  depends  upon  the
        capability's type.
 
        Boolean  <STRONG>tput</STRONG> sets its exit status to <STRONG>0</STRONG> if the terminal possesses  <EM>cap-</EM>
-                <EM>code,</EM> and <STRONG>1</STRONG> if it does not.
+                <EM>code</EM>, and <STRONG>1</STRONG> if it does not.
 
        numeric  <STRONG>tput</STRONG>  writes  <EM>cap-code</EM>'s  decimal value to the standard output
                 stream if defined (<STRONG>-1</STRONG> if it is not) followed by a newline.
@@ -96,7 +96,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
 
 
 </PRE><H3><a name="h3-Operands">Operands</a></H3><PRE>
-       Generally,  an  operand  is  a  <EM>cap-code,</EM>  a  capability  code from the
+       Generally,  an  operand  is  a  <EM>cap-code</EM>,  a  capability  code from the
        terminal database, or a parameter thereto.  Three others are  specially
        recognized by <STRONG>tput</STRONG>: <STRONG>init</STRONG>, <STRONG>reset</STRONG>, and <STRONG>longname</STRONG>.  Although these resemble
        capability codes, they in fact receive special handling; we  term  them
@@ -233,7 +233,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
            generally  works,  unless  the connection is via a serial line that
            does not support "NAWS": negotiations about window size.
 
-       <STRONG>o</STRONG>   Finally, it inspects the environment variables <EM>LINES</EM>  and  <EM>COLUMNS,</EM>
+       <STRONG>o</STRONG>   Finally, it inspects the environment variables <EM>LINES</EM>  and  <EM>COLUMNS</EM>,
            which may override the terminal size.
 
        If  the  <STRONG>-T</STRONG>  option is given, <STRONG>tput</STRONG> ignores the environment variables by
@@ -254,7 +254,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
                 parameters in its input to decide how to interpret  them,  and
                 whether to use <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>.
 
-       <STRONG>-T</STRONG> <EM>type</EM>  indicates  the  terminal's  <EM>type.</EM>   Normally  this  option  is
+       <STRONG>-T</STRONG> <EM>type</EM>  indicates  the  terminal's  <EM>type</EM>.   Normally  this  option  is
                 unnecessary,  because  a  default  is  taken  from  the   <EM>TERM</EM>
                 environment variable.  If specified, the environment variables
                 <EM>LINES</EM> and <EM>COLUMNS</EM> are also ignored.
@@ -338,7 +338,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
            While  more reliable than System V's utility, a portability problem
            is introduced by this analysis.  An OpenBSD developer  adapted  the
            internal  library  function  from <EM>ncurses</EM> to port NetBSD's <EM>termcap</EM>-
-           based <STRONG>tput</STRONG> to <EM>terminfo,</EM> and modified it to interpret multiple  <EM>cap-</EM>
+           based <STRONG>tput</STRONG> to <EM>terminfo</EM>, and modified it to interpret multiple  <EM>cap-</EM>
            <EM>codes</EM>  (and parameters) on the command line.  Portable applications
            should not rely upon this feature; <EM>ncurses</EM>  offers  it  to  support
            applications written specifically for OpenBSD.
@@ -349,11 +349,11 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
        assumes the <EM>terminfo</EM> code.
 
        <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM>  but  <STRONG>parm_delete_line</STRONG>
-           to <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
+           to <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
            <EM>info</EM> uses the code <STRONG>dch1</STRONG> for <STRONG>delete_line</STRONG>.
 
        <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>ed</STRONG> means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM>  but  <STRONG>clr_eos</STRONG>  to
-           <EM>terminfo.</EM>  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
+           <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
            code <STRONG>rmdc</STRONG> for <STRONG>exit_delete_mode</STRONG>.
 
        The  <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the   parameter-substitution
@@ -366,7 +366,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
        (POSIX.1-2008)  documents  only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG> operands.  A
        few observations of interest arise from that selection.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> supports <STRONG>clear</STRONG> as it does any other standard <EM>cap-code.</EM>  The
+       <STRONG>o</STRONG>   <EM>ncurses</EM> supports <STRONG>clear</STRONG> as it does any other standard <EM>cap-code</EM>.  The
            others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
            capabilities.
 
@@ -395,8 +395,8 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
            terminal capability database.
 
        <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
-           using  <EM>curses,</EM>  no  system  with a <EM>curses</EM> implementation provides a
-           <STRONG>tput</STRONG> utility that does not also support standard <EM>cap-codes.</EM>
+           using  <EM>curses</EM>,  no  system  with a <EM>curses</EM> implementation provides a
+           <STRONG>tput</STRONG> utility that does not also support standard <EM>cap-codes</EM>.
 
        X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
@@ -413,7 +413,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
            (unsigned) exit status.
 
        The various System V implementations (AIX, HP-UX, Solaris) use the same
-       exit statuses as <EM>ncurses.</EM>
+       exit statuses as <EM>ncurses</EM>.
 
        NetBSD  <EM>curses</EM>  documents  exit  statuses  that  correspond  to neither
        <EM>ncurses</EM> nor X/Open Curses.
@@ -555,7 +555,7 @@ <H1 class="no-header">tput 1 2024-01-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-01-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2024-03-23                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 4f293c125..ed1ca6129 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.79 2023/12/23 16:20:07 tom Exp @
+  * @Id: tset.1,v 1.81 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2024-03-16 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2024-03-16 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -393,7 +393,7 @@ <H1 class="no-header">tset 1 2023-12-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2023-12-23                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index cb25c15e1..1c1dac333 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.47 2024/01/13 22:05:39 tom Exp @
+  * @Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2024-01-13 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2024-03-16 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2024-01-13 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -403,7 +403,7 @@ <H1 class="no-header">user_caps 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-01-13                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.4                       2024-03-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index b19309875..38e3ef3c7 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.34 2023/11/25 14:26:30 tom Exp @
+  * @Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2023-11-25 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2023-11-25 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2023-11-25 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2023-11-25                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.4                       2024-03-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index 11b019c43..ffd620d2b 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.54 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps,v 1.55 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -174,53 +174,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 71b295a18..9b1ab8c90 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.26 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps.aix4,v 1.27 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -174,53 +174,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 7876b2d88..6087346b5 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.24 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps.hpux11,v 1.25 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -174,53 +174,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/include/Caps.keys b/include/Caps.keys
index 1ee3b1e40..dccb357f7 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.23 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps.keys,v 1.24 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -177,53 +177,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index 245d2d2ce..df641c2ab 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.22 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps.osf1r5,v 1.23 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -174,53 +174,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 4539109ba..6f4f083d9 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.21 2024/03/02 14:35:19 tom Exp $
+# $Id: Caps.uwin,v 1.22 2024/03/16 15:26:09 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -174,53 +174,72 @@
 #
 # STANDARD CAPABILITIES
 #
-#%The following is a complete table of the capabilities included in a
-#%terminfo description block and available to terminfo-using code.
-#%In each line of the table,
+#%Tables of capabilities
+#%.I \%ncurses
+#%recognizes in a
+#%.I \%term\%info
+#%terminal type description and available to
+#%.IR \%term\%info -using
+#%code follow.
 #%.bP
-#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-#%accesses the capability.
+#%The capability name identifies the symbol by which the programmer
+#%using the
+#%.I \%term\%info
+#%API accesses the capability.
 #%.bP
-#%The \fBcapname\fR (\fICap-name\fP)
-#%is the short name used in the text of the database,
-#%and is used by a person updating the database.
+#%The TI
+#%.RI ( \%term\%info )
+#%code is the short name used by a person composing or updating a
+#%terminal type entry.
 #%.IP
-#%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).
+#%Whenever possible,
+#%these codes are the same as or similar to those of 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 specification.
 #%.IP
-#%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
-#%.B Caps
+#%.I \%term\%info
+#%codes have no hard length limit,
+#%but
+#%.I \%ncurses
+#%maintains an informal one of 5 characters to keep them short and to
+#%allow the tabs in the source file
+#%.I Caps
 #%to line up nicely.
+#%(Some standard codes exceed this limit regardless.)
 #%.bP
-#%The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-#%(some capabilities are new, and have names which termcap did not originate).
+#%The TC
+#%.RI ( \%term\%cap )
+#%code is that used by the corresponding API of
+#%.I \%ncurses.
+#%(Some capabilities are new,
+#%and have names that BSD
+#%.I \%term\%cap
+#%did not originate.)
 #%.bP
-#%Finally, the \fBdescription\fP field attempts to convey the semantics of the
-#%capability.
+#%The description field attempts to convey the capability's semantics.
 #%.PP
-#%You may find some codes in the description field:
+#%The description field employs a handful of notations.
 #%.TP
-#%(P)
-#%indicates that padding may be specified
+#%.B (P)
+#%indicates that padding may be specified.
 #%.TP
-#%#[1-9]
-#%in the description field indicates that the string is passed
-#%through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-#%.IP
-#%If no parameters are listed in the description,
-#%passing the string through \fBtparm\fP(3X) may give unexpected results,
-#%e.g., if it contains percent (%%) signs.
-#%.TP
-#%(P*)
-#%indicates that padding may vary in proportion to the number of
-#%lines affected
+#%.B (P*)
+#%indicates that padding may vary in proportion to the number of output
+#%lines affected.
 #%.TP
-#%(#\d\fIi\fP\u)
-#%indicates the \fIi\fP\uth\d parameter.
+#%.BI # i
+#%indicates the
+#%.IR i th
+#%parameter of a string capability;
+#%the programmer should pass the string to \fB\%tparm\fP(3X) with the
+#%parameters listed.
+#%.IP
+#%If the description lists no parameters,
+#%passing the string to \fB\%tparm\fP(3X) may produce unexpected
+#%behavior,
+#%for instance if the string contains percent signs.
 #%.
 #%.PP
 #%.TS
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 040c7c9b6..4693b06b3 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.59 2024/03/02 16:34:25 tom Exp $
-.TH @CAPTOINFO@ 1M 2024-03-02 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp $
+.TH @CAPTOINFO@ 1M 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,7 +66,7 @@ and extracts only the entry for the terminal named in the environment
 variable \fITERM\fP from it.
 If the environment variable \fI\%TERMCAP\fP is not set,
 \fB\%@CAPTOINFO@\fP reads
-.I \%/etc/termcap.
+.IR \%/etc/termcap .
 .PP
 This utility is implemented as a link to \fB\%@TIC@\fP(1M),
 with the latter's
@@ -216,7 +216,7 @@ SVr4 systems provide \fB\%captoinfo\fP as a separate application from
 Its
 .B \-v
 option does not accept a trace level argument
-.I n;
+.IR n ;
 repeat
 .B \-v
 .I n
diff --git a/man/clear.1 b/man/clear.1
index 66aaa6efc..a1034db7c 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp $
-.TH @CLEAR@ 1 2023-12-16 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.48 2024/03/16 15:35:01 tom Exp $
+.TH @CLEAR@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 70d849f1c..01fd9225e 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.53 2024/01/13 22:05:39 tom Exp $
-.TH curs_add_wch 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.57 2024/03/23 19:58:15 tom Exp $
+.TH curs_add_wch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -293,7 +293,7 @@ U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
 .SH RETURN VALUE
 All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the window pointer is null or
@@ -338,7 +338,7 @@ wide characters.
 The misdefined symbols are the arrows
 and other symbols which are not used for line-drawing.
 .PP
-X/Open Curses does not define symbols for thick- or double-lines.
+X/Open Curses does not specify symbols for thick- or double-lines.
 SVr4 curses implementations defined their line-drawing symbols in
 terms of intermediate symbols.
 This implementation extends those symbols, providing new definitions
@@ -423,12 +423,22 @@ may hold one non-spacing character.
 In the latter case,
 \fI\%ncurses\fP adds the non-spacing character to the active
 (base) spacing character.
+.SS TABSIZE
+The
+.B TABSIZE
+variable is implemented in SVr4 and other versions of
+.IR curses ,
+but is not specified by X/Open Curses
+(see \fBcurs_variables\fP(3X)).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
+\fB\%curs_addwstr\fP(3X),
+\fB\%curs_add_wchstr\fP(3X),
 \fB\%curs_attr\fP(3X),
 \fB\%curs_clear\fP(3X),
 \fB\%curs_getcchar\fP(3X),
 \fB\%curs_outopts\fP(3X),
 \fB\%curs_refresh\fP(3X),
+\fB\%curs_variables\fP(3X),
 \fB\%putwc\fP(3)
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index c53b812c4..5493dd858 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.32 2023/11/25 14:01:49 tom Exp $
-.TH curs_add_wchstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.34 2024/03/16 19:44:53 tom Exp $
+.TH curs_add_wchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -102,7 +102,7 @@ the remaining columns are filled with the background character and rendition.
 .SH RETURN VALUE
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the \fIwin\fP parameter is null or
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index b87f76637..f3eab27c8 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,17 +28,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.76 2023/12/23 16:27:51 tom Exp $
-.TH curs_addch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addch.3x,v 1.81 2024/03/23 20:38:57 tom Exp $
+.TH curs_addch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds '  \(aq
+.ds ^  \(ha
+.ds ~  \(ti
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       '  '
+.ds       ^  ^
+.ds       ~  ~
 .\}
 .
 .de bP
@@ -67,94 +73,149 @@ add a \fIcurses\fR character to a window and advance the cursor
 .fi
 .SH DESCRIPTION
 .SS "Adding Characters"
-The \fBaddch\fP, \fBwaddch\fP, \fBmvaddch\fP and \fBmvwaddch\fP routines put
-the character \fIch\fP into the given window at its current window position,
-which is then advanced.
-They are analogous to the standard C library's \fI\%putchar\fP(3).
-If the advance is at the right margin:
-.bP
-The cursor automatically wraps to the beginning of the next line.
+.B \%waddch
+puts the character
+.I ch
+at the cursor position of window
+.IR win ,
+then advances the cursor position,
+analogously to the standard C library's \fI\%putchar\fP(3).
+\fB\%ncurses\fP(3X) describes the variants of this function.
+.PP
+If advancement occurs at the right margin,
 .bP
-At the bottom of the current scrolling region,
-and if \fB\%scrollok\fP(3X) is enabled,
-the scrolling region is scrolled up one line.
+the cursor automatically wraps to the beginning of the next line;
+and
 .bP
-If \fB\%scrollok\fP(3X) is not enabled,
-writing a character at the lower right margin succeeds.
-However,
-an error is returned because it is not possible to wrap to a new line.
+at the bottom of the current scrolling region,
+and if \fB\%scrollok\fP(3X) is enabled for
+.IR win ,
+the scrolling region scrolls up one line.
 .PP
-If \fIch\fP is a tab, newline, carriage return or backspace,
-the cursor is moved appropriately within the window:
+If
+.I ch
+is a
+backspace,
+carriage return,
+line feed,
+or
+tab,
+the cursor moves appropriately within the window.
 .bP
-Backspace moves the cursor one character left; at the left
-edge of a window it does nothing.
+Backspace moves the cursor one character left;
+at the left margin of a window,
+it does nothing.
 .bP
-Carriage return moves the cursor to the window left margin on the current line.
+Carriage return moves the cursor to the left margin on the current line
+of the window.
 .bP
-Newline does a \fBclrtoeol\fP,
-then moves the cursor to the window left margin on the next line,
-scrolling the window if on the last line.
+Line feed does a \fB\%clrtoeol\fP(3X),
+then moves the cursor to the left margin on the next line of the window,
+scrolling the window if the cursor was already on the last line.
 .bP
-Tabs are considered to be at every eighth column.
-The tab interval may be altered by setting the \fBTABSIZE\fP variable.
+Tab advances the cursor to the next tab stop
+(possibly on the next line);
+these are placed at every eighth column by default.
+Alter the tab interval with the
+.B \%TABSIZE
+extension;
+see \fB\%curs_variables\fP(3X).
 .PP
-If \fIch\fP is any other nonprintable character,
+If
+.I ch
+is any other nonprintable character,
 it is drawn in printable form,
-using the same convention as \fB\%unctrl\fP(3X):
+using the same convention as \fB\%unctrl\fP(3X).
 .bP
-Control characters are displayed in the \fB^\fIX\fR notation.
+.B \%waddch
+displays control characters in
+.BI \*^ X
+notation.
 .bP
-Values above 128 are either meta characters
+Character codes above 127 are either meta characters
 (if the screen has not been initialized,
-or if \fB\%meta\fP(3X) has been called with a \fBTRUE\fP E parameter),
-shown in the \fBM\-\fIX\fR notation, or are displayed as themselves.
-In the latter case, the values may not be printable;
+or if \fB\%meta\fP(3X) has been called with a
+.B TRUE
+.I bf
+parameter)
+that render in
+.BI M\- X
+notation,
+or they display as themselves.
+In the latter case,
+the values may not be printable;
+.\" XXX: The following claim could be clearer.
 this follows the X/Open specification.
 .PP
-Calling \fBwinch\fP after adding a
-nonprintable character does not return the character itself,
-but instead returns the printable representation of the character.
+Calling \fB\%winch\fP(3X) on the location of a nonprintable character
+does not return the character itself,
+but its \fB\%unctrl\fP(3X) representation.
 .PP
 Video attributes can be combined with a character argument passed to
-\fBaddch\fP or related functions by logical-ORing them into the character.
-(Thus, text, including attributes, can be copied from one place to another
-using \fB\%inch\fP(3X) and \fBaddch\fP.)
-See the \fB\%curs_attr\fP(3X) page for values of predefined video
-attribute constants that can be usefully OR'ed into characters.
+.B \%waddch
+by logical-ORing them into the character.
+(Thus,
+text,
+including attributes,
+can be copied from one place to another using \fB\%winch\fP(3X) and
+.BR \%waddch .)
+See \fB\%curs_attr\fP(3X) for values of predefined video attribute
+constants that can be usefully OR'ed with characters.
 .SS "Echoing Characters"
-The \fBechochar\fP and \fBwechochar\fP routines are equivalent to a call to
-\fBaddch\fP followed by a call to \fB\%refresh\fP(3X), or a call to \fBwaddch\fP
-followed by a call to \fBwrefresh\fP.
-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.
-.SS "Line Graphics"
-The following variables may be used to add line drawing characters to the
-screen with routines of the \fBaddch\fP family.
-The default character listed
-below is used if the \fBacsc\fP capability does not define a terminal-specific
-replacement for it,
-or if the terminal and locale configuration requires Unicode but the
-library is unable to use Unicode.
-.PP
-The names are taken from VT100 nomenclature.
+.B \%echochar
+and
+.B \%wechochar
+are equivalent to calling
+.RB \%( w ) addch
+followed by
+.RB \%( w ) refresh .
+.I curses
+interprets these functions as a hint that only a single character is
+being output;
+for non-control characters,
+a considerable performance gain may be enjoyed by employing them.
+.\" TODO: Combine the following with the "Line Drawing" subsection of
+.\" terminfo(5) and replace this with a cross reference there.
+.SS "Forms-Drawing Characters"
+.I curses
+defines macros starting with
+.B \%ACS_
+that can be used with
+.B \%waddch
+to write line-drawing and other special characters to the screen.
+.I \%ncurses
+terms these
+.I "forms-drawing characters."
+The ACS default listed below is used if the
+.B \%acs_chars
+.RB ( \%acsc )
+.I \%term\%info
+capability does not define a terminal-specific replacement for it,
+or if the terminal and locale configuration requires Unicode to access
+these characters but the library is unable to use Unicode.
+The \*(``acsc char\*('' column corresponds to how the characters are
+specified in the
+.B \%acs_chars
+string capability,
+and the characters in it may appear on the screen if the terminal's
+database entry incorrectly advertises ACS support.
+The name \*(``ACS\*('' originates in the Alternate Character Set feature
+of the DEC VT100 terminal.
 .PP
 .TS
-l l l l
-l l l l
-_ _ _ _
-l l l l.
-\fBACS\fP	\fBACS\fP	\fBacsc\fP	\fBGlyph\fP
-\fBName\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
+Lb Lb Lb Lb
+Lb Lb Lb Lb
+Lb L  L  Lx.
+\&	ACS	acsc	\&
+Symbol	Default	char	Glyph Name
+_
 ACS_BLOCK	#	0	solid square block
 ACS_BOARD	#	h	board of squares
 ACS_BTEE	+	v	bottom tee
-ACS_BULLET	o	~	bullet
+ACS_BULLET	o	\*~	bullet
 ACS_CKBOARD	:	a	checker board (stipple)
 ACS_DARROW	v	.	arrow pointing down
-ACS_DEGREE	'	f	degree symbol
+ACS_DEGREE	\*'	f	degree symbol
 ACS_DIAMOND	+	\(ga	diamond
 ACS_GEQUAL	>	>	greater-than-or-equal-to
 ACS_HLINE	\-	q	horizontal line
@@ -176,154 +237,254 @@ ACS_S7	\-	r	scan line 7
 ACS_S9	\&_	s	scan line 9
 ACS_STERLING	f	}	pound-sterling symbol
 ACS_TTEE	+	w	top tee
-ACS_UARROW	^	\-	arrow pointing up
+ACS_UARROW	\*^	\-	arrow pointing up
 ACS_ULCORNER	+	l	upper left-hand corner
 ACS_URCORNER	+	k	upper right-hand corner
 ACS_VLINE	|	x	vertical line
 .TE
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success
-(the SVr4 manuals specify only
-\*(``an integer value other than \fBERR\fP\*('') upon successful completion,
-unless otherwise noted in the preceding routine descriptions.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+In
+.IR \%ncurses ,
+.B \%waddch
+returns
+.B ERR
+if it is not possible to add a complete character at the cursor
+position,
+as when conversion of a multibyte character to a byte sequence fails,
+or at least one of the resulting bytes cannot be added to the window.
+See section \*(``PORTABILITY\*('' below regarding the use of
+.B \%waddch
+with multibyte characters.
 .PP
-If it is not possible to add a complete character,
-an error is returned:
-.bP
 If \fB\%scrollok\fP(3X) is not enabled,
-writing a character at the lower right margin succeeds.
+.B \%waddch
+can successfully write a character at the bottom right location of the
+window.
 However,
-an error is returned because it is not possible to wrap to a new line.
-.bP
-If an error is detected when converting a multibyte character to a sequence
-of bytes,
-or if it is not possible to add all of the resulting bytes in the window,
-an error is returned.
+.I \%ncurses
+returns
+.B ERR
+because it is not possible to wrap to a new line.
+.PP
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X) and fail if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I \%WINDOW
+pointer is null.
 .SH NOTES
-Note that \fBaddch\fP, \fBmvaddch\fP, \fBmvwaddch\fP, and
-\fBechochar\fP may be macros.
+.BR \%addch ,
+.BR \%mvaddch ,
+.BR \%mvwaddch ,
+and
+.B \%echochar
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-The defaults specified for forms-drawing characters apply in the POSIX locale.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+The defaults specified for forms-drawing characters apply in the POSIX
+locale.
 .SS "ACS Symbols"
-X/Open Curses states that the \fBACS_\fP definitions are \fBchar\fP constants.
-For the wide-character implementation (see \fBcurs_add_wch\fP),
-there are analogous \fBWACS_\fP definitions which are \fBcchar_t\fP constants.
-Some implementations are problematic:
+X/Open Curses states that the
+.B \%ACS_
+definitions are
+.I char
+constants.
+.PP
+Some implementations are problematic.
 .bP
-Some implementations define the ACS symbols to a constant
-(such as Solaris), while others define those to entries in an array.
+Solaris
+.IR curses ,
+for example,
+define the ACS symbols as constants;
+others define them as elements of an array.
 .IP
-This implementation uses an array \fBacs_map\fP, as done in SVr4 curses.
-NetBSD also uses an array, actually named \fB_acs_char\fP, with a \fB#define\fP
+This implementation uses an array,
+.BR \%acs_map ,
+as did SVr4
+.IR curses .
+NetBSD also uses an array,
+actually named
+.BR \%_acs_char ,
+with a
+.B \%#define
 for compatibility.
 .bP
-HP-UX curses equates some of the \fBACS_\fP symbols
-to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
-wide characters.
-The misdefined symbols are the arrows
-and other symbols which are not used for line-drawing.
+HP-UX
+.I curses
+equates some of the
+.B \%ACS_
+symbols to the analogous
+.B \%WACS_
+symbols as if the
+.B \%ACS_
+symbols were wide characters
+(see \fB\%curs_add_wch\fP(3X)).
+The misdefined symbols are the arrows and others that are not used for
+line drawing.
 .bP
-X/Open Curses (issues 2 through 7) has a typographical error
-for the ACS_LANTERN symbol, equating its \*(``VT100+ Character\*(''
-to \fBI\fP (capital I), while the header files for SVr4 curses
-and the various implementations use \fBi\fP (lowercase).
+X/Open Curses
+(Issues 2 through 7)
+has a typographical error
+for the
+.B \%ACS_LANTERN
+symbol, equating its \*(``VT100+ Character\*('' to \*(``I\*(''
+(capital I),
+while the header files for SVr4
+.I curses
+and other implementations use \*(``i\*(''
+(small i).
 .IP
-None of the terminal descriptions on Unix platforms use uppercase-I,
-except for Solaris (i.e., \fBscreen\fP's terminal description,
+None of the terminal descriptions on Unix platforms use uppercase I,
+except for Solaris
+(in its
+.I \%term\%info
+entry for \fI\%screen\fP(1),
 apparently based on the X/Open documentation around 1995).
-On the other hand, the terminal description \fIgs6300\fP
-(AT&T PC6300 with EMOTS Terminal Emulator) uses lowercase-i.
-.LP
+On the other hand,
+its
+.B \%gs6300
+(AT&T PC6300 with EMOTS Terminal Emulator)
+description uses lowercase i.
+.PP
 Some ACS symbols
-(ACS_S3,
-ACS_S7,
-ACS_LEQUAL,
-ACS_GEQUAL,
-ACS_PI,
-ACS_NEQUAL,
-ACS_STERLING)
-were not documented in
-any publicly released System V.
-However, many publicly available terminfos
-include \fBacsc\fP strings in which their key characters (pryz{|}) are
-embedded, and a second-hand list of their character descriptions has come
-to light.
-The ACS-prefixed names for them were invented for \fB\%ncurses\fP(3X).
-.LP
-The \fIdisplayed\fP values for the \fBACS_\fP and \fBWACS_\fP constants
-depend on
+.RB ( \%ACS_S3 ,
+.BR \%ACS_S7 ,
+.BR \%ACS_LEQUAL ,
+.BR \%ACS_GEQUAL ,
+.BR \%ACS_PI ,
+.BR \%ACS_NEQUAL ,
+and
+.BR \%ACS_STERLING )
+were not documented in any publicly released System\ V.
+However,
+many publicly available
+.I \%term\%info
+entries include
+.B \%acsc
+strings in which their key characters (pryz{|}) are embedded,
+and a second-hand list of their character descriptions has come to
+light.
+The
+.I \%ncurses
+developers invented ACS-prefixed names for them.
+.PP
+The
+.I displayed
+values of
+.B \%ACS_
+constants depend on
 .bP
-the library configuration,
-i.e.,
-\fI\%ncurses\fP versus \fI\%ncursesw\fP,
-where the latter is capable of displaying Unicode while the former is not, and
+the
+.I \%ncurses
+ABI\(emfor example,
+wide-character versus non-wide-character configurations
+(the former is capable of displaying Unicode while the latter is not),
+and
 .bP
-whether the \fIlocale\fP uses UTF-8 encoding.
-.LP
-In certain cases, the terminal is unable to display line-drawing characters
-except by using UTF-8
-(see the discussion of \fB\%NCURSES_NO_UTF8_ACS\fP in
-\fB\%ncurses\fP(3X)).
+whether the locale uses UTF-8 encoding.
+.PP
+In certain cases,
+the terminal is unable to display forms-drawing characters
+.I except
+by using UTF-8;
+see the discussion of the
+.I \%NCURSES_NO_UTF8_ACS
+environment variable in \fB\%ncurses\fP(3X)).
 .SS "Character Set"
-X/Open Curses assumes that the parameter passed to \fBwaddch\fP contains
-a single character.
-As discussed in \fB\%curs_attr\fP(3X), that character may have been
-more than eight bits in an SVr3 or SVr4 implementation,
-but in the X/Open Curses model, the details are not given.
-The important distinction between SVr4 curses and X/Open Curses is
-that the non-character information (attributes and color) was
-separated from the character information which is packed in a \fBchtype\fP
-to pass to \fBwaddch\fP.
+X/Open Curses assumes that the parameter passed to
+.B \%waddch
+contains a single character.
+As discussed in \fB\%curs_attr\fP(3X),
+that character may have been more than eight bits wide in an SVr3 or
+SVr4 implementation,
+but in the X/Open Curses model,
+the details are not given.
+The important distinction between SVr4
+.I curses
+and X/Open Curses is that the latter separates non-character information
+(attributes and color)
+from the character code,
+which SVr4 packs into a
+.I \%chtype
+for passage to
+.BR \%waddch .
 .PP
-In this implementation, \fBchtype\fP holds an eight-bit character.
-But \fI\%ncurses\fP allows multibyte characters to be passed in a
-succession of calls to \fBwaddch\fP.
-The other implementations do not do this;
-a call to \fBwaddch\fP passes exactly one character
-which may be rendered as one or more cells on the screen
-depending on whether it is printable.
+In
+.IR \%ncurses ,
+.I \%chtype
+holds an eight-bit character.
+But
+.I \%ncurses
+allows a multibyte character to be passed in a succession of calls to
+.BR \%waddch .
+Other implementations do not;
+a
+.B \%waddch
+call transmits exactly one character,
+which may be rendered in one or more screen locations depending on
+whether it is printable.
 .PP
 Depending on the locale settings,
-\fI\%ncurses\fP will inspect the byte passed in each call to \fBwaddch\fP,
-and check if the latest call will continue a multibyte sequence.
-When a character is \fIcomplete\fP,
-\fI\%ncurses\fP displays the character and moves to the next position in the screen.
+.I \%ncurses
+inspects the byte passed in each
+.B \%waddch
+call,
+and checks whether the latest call continues a multibyte sequence.
+When a character is
+.IR complete ,
+.I \%ncurses
+displays the character and advances the window's current location.
 .PP
 If the calling application interrupts the succession of bytes in
-a multibyte character by moving the current location (e.g., using \fBwmove\fP),
-\fI\%ncurses\fP discards the partially built character,
-starting over again.
+a multibyte character sequence by moving the current location
+(for example,
+with \fB\%wmove\fP(3X)),
+.I \%ncurses
+discards the incomplete character.
 .PP
 For portability to other implementations,
-do not rely upon this behavior:
+do not rely upon this behavior.
+Check whether a character can be represented as a single byte in the
+current locale.
 .bP
-check if a character can be represented as a single byte in the current locale
-before attempting call \fBwaddch\fP, and
+If it can,
+call either
+.B \%waddch
+or \fB\%wadd_wch\fP(3X).
 .bP
-call \fBwadd_wch\fP for characters which cannot be handled by \fBwaddch\fP.
+If it cannot,
+use only
+\fB\%wadd_wch\fP(3X).
 .SS TABSIZE
-The \fBTABSIZE\fP variable is implemented in SVr4 and other versions of curses,
-but is not part of X/Open curses
-(see \fBcurs_variables\fP(3X) for more details).
-.LP
-If \fIch\fP is a carriage return,
-the cursor is moved to the beginning of the current row of the window.
-This is true of other implementations, but is not documented.
+SVr4 and other versions of
+.I curses
+implement the
+.B \%TABSIZE
+variable,
+but X/Open Curses does not specify it
+(see \fB\%curs_variables\fP(3X)).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
+\fB\%curs_addchstr\fP(3X),
+\fB\%curs_addstr\fP(3X),
 \fB\%curs_attr\fP(3X),
 \fB\%curs_clear\fP(3X),
 \fB\%curs_inch\fP(3X),
 \fB\%curs_outopts\fP(3X),
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_variables\fP(3X),
-\fB\%putc\fP(3)
+\fB\%putchar\fP(3)
 .PP
-Comparable functions in the wide-character (ncursesw) library are
-described in
-\fB\%curs_add_wch\fP(3X).
+\fB\%curs_add_wch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 9e8db9860..9286885e3 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.38 2023/11/25 14:01:49 tom Exp $
-.TH curs_addchstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.40 2024/03/16 15:37:51 tom Exp $
+.TH curs_addchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,7 +96,7 @@ rather than wrapping it around to the new line.
 .SH RETURN VALUE
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the \fIwin\fP parameter is null or
@@ -113,6 +113,9 @@ These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
-\fB\%curs_addstr\fP(3X),
-\fB\%curs_addwstr\fP(3X),
-\fB\%curs_add_wchstr\fP(3X)
+\fB\%curs_addstr\fP(3X)
+.PP
+\fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 8db64ada9..928a4d493 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.37 2023/11/18 21:18:55 tom Exp $
-.TH curs_addstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.41 2024/03/23 20:38:57 tom Exp $
+.TH curs_addstr 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,50 +59,79 @@ add a string to a \fIcurses\fR window and advance the cursor
 \fB#include <curses.h>
 .PP
 \fBint addstr(const char *\fIstr\fP);
-\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
+\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
 \fBint waddstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
-\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
 .PP
-\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
 \fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
-\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
 \fBint mvwaddnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These functions write the (null-terminated) character string
-\fIstr\fP on the given window.
-It is similar to calling \fBwaddch\fP once for each byte in the string.
+.B waddstr
+writes the characters of the (null-terminated) string
+.I str
+to the window
+.IR win .
+Its process is similar to calling \fB\%waddch\fP(3X) for each
+.I char
+in
+.IR str .
+Control characters are processed as in \fB\%waddch\fP(3X).
 .PP
-The \fImv\fP functions perform cursor movement once, before writing any
-characters.
-Thereafter, the cursor is advanced as a side-effect of writing to the window.
+.B waddnstr
+writes at most
+.I n
+characters,
+or until a terminating null character occurs in
+.IR str .
+If
+.I n
+is \-1,
+.B
+.B waddnstr
+writes the entire string.
 .PP
-The four functions with \fIn\fP as the last argument
-write at most \fIn\fP bytes,
-or until a terminating null is reached.
-If \fIn\fP is \-1, then the entire string will be added.
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open does not define any error conditions.
-This implementation returns an error
+X/Open Curses does not specify any error conditions.
+.I \%ncurses
+returns an error
 .bP
-if the window pointer is null or
+if the window pointer is
+.BR NULL ,
 .bP
-if the string pointer is null or
+if the string pointer is
+.BR NULL ,
+or
 .bP
-if the corresponding calls to \fBwaddch\fP return an error.
+if an internal \fB\%waddch\fP(3X) call returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X) and fail if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I \%WINDOW
+pointer is null.
 .SH NOTES
 All of these functions except \fBwaddnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
-\fB\%curs_addchstr\fP(3X),
-\fB\%curs_addwstr\fP(3X),
-\fB\%curs_add_wchstr\fP(3X)
+\fB\%curs_addchstr\fP(3X)
+.PP
+\fB\%curs_addwstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index ff8240bc9..866c05dc5 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.29 2023/11/18 21:18:55 tom Exp $
-.TH curs_addwstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.33 2024/03/23 20:38:57 tom Exp $
+.TH curs_addwstr 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,59 +59,90 @@ add a wide-character string to a \fIcurses\fR window and advance the cursor
 \fB#include <curses.h>
 .PP
 \fBint addwstr(const wchar_t *\fIwstr\fP);
-\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
 \fBint waddwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
-\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
 .PP
-\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
 \fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
 \fBint mvwaddnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These functions write the characters of the
-(null-terminated) \fBwchar_t\fP character string
-\fIwstr\fP on the given window.
-It is similar to constructing a \fBcchar_t\fP for
-each \fBwchar_t\fR in the string,
-then calling \fBwadd_wch\fP(3X) for the resulting \fBcchar_t\fP:
+.B waddwstr
+writes the characters of the (wide-null-terminated) wide-character
+string
+.I wstr
+to the window
+.IR win .
+Its process is similar to constructing a
+.I cchar_t
+for each
+.I wchar_t
+in
+.IR wstr ,
+then calling \fB\%wadd_wch\fP(3X) with the resulting
+.IR cchar_t .
 .bP
-spacing and non-spacing characters in the string
-are processed one at a time, and
+Spacing and non-spacing characters in the string
+are processed one at a time,
+and
 .bP
-control characters are processed as in \fBwaddch\fP(3X).
+control characters are processed as in \fB\%wadd_wch\fP(3X).
 .PP
-The \fImv\fP functions perform cursor movement once, before writing any
-characters.
-Thereafter, the cursor is advanced as a side-effect of writing to the window.
+.B waddnwstr
+writes at most
+.I n
+wide characters,
+or until a terminating wide null character occurs in
+.IR wstr .
+If
+.I n
+is \-1,
+.B
+.B waddnwstr
+writes the entire wide string.
 .PP
-The four functions with \fIn\fP as the last argument
-write at most \fIn\fP \fBwchar_t\fP characters,
-or until a terminating null is reached.
-If \fIn\fP is \-1, then the entire string will be added.
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open does not define any error conditions.
-This implementation returns an error
+X/Open Curses does not specify any error conditions.
+.I \%ncurses
+returns an error
 .bP
-if the window pointer is null or
+if the window pointer is
+.BR NULL ,
 .bP
-if the string pointer is null or
+if the string pointer is
+.BR NULL ,
+or
 .bP
-if the corresponding calls to \fBwadd_wch\fP return an error.
+if an internal \fB\%wadd_wch\fP(3X) call returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X) and fail if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I \%WINDOW
+pointer is null.
 .SH NOTES
-All of these functions except \fBwaddnwstr\fP may be macros.
+All of these functions except
+.B waddnwstr
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X),
-\fB\%curs_addchstr\fP(3X),
-\fB\%curs_addstr\fP(3X),
 \fB\%curs_add_wch\fP(3X),
 \fB\%curs_add_wchstr\fP(3X)
+.PP
+\fB\%curs_addstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 17df9d799..7ff66bbb0 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.97 2024/03/02 16:34:00 tom Exp $
-.TH curs_attr 3X 2024-03-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.99 2024/03/16 15:38:33 tom Exp $
+.TH curs_attr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -232,7 +232,7 @@ The routine \fBstandend\fP is the same
 as \fBattrset(A_NORMAL)\fP or \fBattrset(0)\fP, that is, it turns off all
 attributes.
 .PP
-X/Open does not mark these \*(``restricted\*('', because
+X/Open Curses does not mark these \*(``restricted\*('', because
 .bP
 they have well established legacy use, and
 .bP
@@ -296,7 +296,7 @@ The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
 .SH RETURN VALUE
 All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 .PP
 This implementation
 .bP
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index f5bd11aea..1ba3fdd98 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.25 2023/10/07 21:19:07 tom Exp $
-.TH curs_beep 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: curs_beep.3x,v 1.27 2024/03/16 15:35:01 tom Exp $
+.TH curs_beep 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 15a5e6490..ec9fe3768 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.55 2023/12/23 16:35:10 tom Exp $
-.TH curs_bkgd 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.59 2024/03/23 19:58:58 tom Exp $
+.TH curs_bkgd 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -208,9 +208,9 @@ written to the screen during the refresh.
 Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
 of characters on the screen updates when \fB\%bkgd\fP or \fB\%wbkgd\fP
 changes the background character.
-.I \%ncurses,
+.IR \%ncurses ,
 like SVr4
-.I curses,
+.IR curses ,
 does not
 (in its non-\*(``wide\*('' configuration)
 store the background and window attribute contributions to each
@@ -218,7 +218,7 @@ character cell separately.
 .SH SEE ALSO
 \fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
 \*(``wide\*('' configuration of
-.I \%ncurses.
+.IR \%ncurses .
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index b80bf049b..2b49db04c 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.36 2023/12/23 16:35:10 tom Exp $
-.TH curs_bkgrnd 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.40 2024/03/23 19:59:45 tom Exp $
+.TH curs_bkgrnd 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -171,7 +171,7 @@ upon failure and
 .B OK
 upon success.
 In
-.I \%ncurses,
+.IR \%ncurses ,
 failure occurs if
 .bP
 a
@@ -192,7 +192,7 @@ is null.
 may be implemented as macros.
 .PP
 Unlike their counterparts in the non-\*(``wide\*('' configuration of
-.I \%ncurses,
+.IR \%ncurses ,
 \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
 and attribute in a modifiable
 .I \%cchar_t
@@ -204,11 +204,11 @@ It specifies no error conditions for them.
 .PP
 X/Open Curses does not provide details of how the rendition is updated.
 This implementation follows the approach used in SVr4
-.I curses.
+.IR curses .
 .SH SEE ALSO
 \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
 non-\*(``wide\*('' configuration of
-.I \%ncurses.
+.IR \%ncurses .
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 5d5bdcea3..bd6f040c8 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.44 2023/12/16 21:09:11 tom Exp $
-.TH curs_border 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border.3x,v 1.46 2024/03/16 15:38:43 tom Exp $
+.TH curs_border 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -141,7 +141,7 @@ The SVr4.0 manual says
 \*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
 but this appears to be an error.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 if the window pointer is null.
 .PP
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 16a66ce50..da9b14480 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.31 2023/11/25 15:39:56 tom Exp $
-.TH curs_border_set 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+.TH curs_border_set 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index b81273e86..2e3f2be68 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.44 2024/01/05 21:46:58 tom Exp $
-.TH curs_clear 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_clear.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH curs_clear 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 0fb6dcc4b..eb4958705 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.96 2023/12/30 21:20:01 tom Exp $
-.TH curs_color 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_color.3x,v 1.98 2024/03/16 15:35:01 tom Exp $
+.TH curs_color 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 2f42bf020..7a3cb2027 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.30 2023/12/16 21:09:11 tom Exp $
-.TH curs_delch 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_delch.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH curs_delch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 29b8bb57d..cf1be3f86 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.34 2023/12/16 21:33:34 tom Exp $
-.TH curs_deleteln 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH curs_deleteln 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 05ed5dfb5..01cf9d2ec 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.44 2023/12/23 16:36:18 tom Exp $
-.TH curs_extend 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH curs_extend 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index dc62c1565..b0d69166f 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.31 2023/12/23 16:35:10 tom Exp $
-.TH curs_get_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.36 2024/03/23 20:00:03 tom Exp $
+.TH curs_get_wch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -63,133 +63,198 @@ get (or push back) a wide character from \fIcurses\fR terminal keyboard
 \fBint unget_wch(const wchar_t \fIwch\fP);
 .fi
 .SH DESCRIPTION
-.SS wget_wch
-The
-\fBget_wch\fP,
-\fBwget_wch\fP,
-\fBmvget_wch\fP, and
-\fBmvwget_wch\fP
-functions read a character
-from the terminal associated with the current or specified window.
-In no-delay mode,
-if no input is waiting, the value \fBERR\fP is returned.
-In delay mode,
-the program waits until the system passes text through to the program.
-Depending on the setting of \fBcbreak\fP,
-this is after one character (cbreak mode),
-or after the first newline (nocbreak mode).
-In half-delay mode,
-the program waits until the user types a character or the specified
-timeout interval has elapsed.
+.SS "Reading Characters"
+.B \%wget_wch
+gathers a key stroke
+.I wch
+from the terminal keyboard associated with a
+.I curses
+window
+.IR win ,
+returning
+.B OK
+if a wide character is read,
+.B \%KEY_CODE_YES
+if a function key is read,
+and
+.B ERR
+if no key event is available.
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
-Unless \fBnoecho\fP has been set,
-these routines echo the character into the designated window.
+When input is pending,
+.B \%wget_wch
+stores an integer
+identifying the key stroke in
+.IR wch ;
+for alphanumeric and punctuation keys,
+this value corresponds to the character encoding used by the terminal.
+Use of the control key as a modifier often results in a distinct code.
+The behavior of other keys depends on whether
+.I win
+is in keypad mode;
+see subsections \*(``Keypad Mode\*('' and \*(``Predefined Key Codes\*(''
+in \fB\%getch\fP(3X).
 .PP
-If the window is not a pad and has been moved or modified since the
-last call to \fBwrefresh\fP,
-\fBwrefresh\fP will be called before another character is read.
+If no input is pending,
+then if the no-delay flag is set in the window
+(see \fB\%nodelay\fP(3X)),
+the function returns
+.BR ERR ;
+otherwise,
+.I curses
+waits until the terminal has input.
+If \fB\%cbreak\fP(3X)
+has been called,
+this happens after one character is read.
+If \fB\%nocbreak\fP(3X)
+has been called,
+it occurs when the next newline is read.
+If \fB\%halfdelay\fP(3X)
+has been called,
+.I curses
+waits until a character is typed or the specified delay elapses.
 .PP
-If \fBkeypad\fP is enabled,
-these functions respond to
-the pressing of a function key by setting the object pointed to by
-\fIwch\fP
-to the keycode assigned to the function key,
-and returning \fBKEY_CODE_YES\fP.
-If a character (such as escape) that could be the
-beginning of a function key is received, curses sets a timer.
-If the remainder
-of the sequence does arrive within the designated time, curses passes through
-the character; otherwise, curses returns the function key value.
-For this
-reason, many terminals experience a delay between the time a user presses
-the escape key and the time the escape is returned to the program.
-.PP
-The keycodes returned by these functions are the same as those
-returned by \fBwgetch\fP:
+If \fB\%echo\fP(3X) has been called,
+and the window is not a pad,
+.I curses
+writes
+.I wch
+to the window
+(at the cursor position)
+per the following rules.
+.bP
+If
+.I wch
+matches the terminal's erase character,
+the cursor moves leftward one position
+and the new position is erased
+as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
+When the window's keypad mode is enabled
+(see below),
+.B \%KEY_LEFT
+and
+.B \%KEY_BACKSPACE
+are handled the same way.
 .bP
-The predefined function
-keys are listed in \fB<curses.h>\fP as macros with values outside the range
-of 8-bit characters.
-Their names begin with \fBKEY_\fP.
+.I curses
+writes any other
+.I wch
+to the window,
+as with \fB\%wecho_wchar\fP(3X).
 .bP
-Other (user-defined) function keys
-which may be defined using \fBdefine_key\fP(3X) have no names,
-but also are expected to have values outside the range of 8-bit characters.
-.SS unget_wch
-The
-\fBunget_wch\fP
-function pushes the wide character
-\fIwch\fP
-back onto the head of the input queue, so the wide character
-is returned by the next call to
-\fBget_wch\fP.
-The pushback of
-one character is guaranteed.
-If the program calls
-\fBunget_wch\fP
-too many times without an intervening call to
-\fBget_wch\fP,
-the operation may fail.
+If the window has been moved or modified since the last call to
+\fB\%wrefresh\fP(3X),
+.I curses
+calls
+.BR \%wrefresh .
 .PP
-Unlike \fBungetch\fP and \fBwgetch\fP,
-\fBunget_wch\fP cannot distinguish special characters
-returned by \fBwget_wch\fP from ordinary characters.
-An application can push special keys
-which it may read via \fBwget_wch\fP
-by checking for the \fBKEY_CODE_YES\fP result,
-and using \fBungetch\fP for those special keys.
+If
+.I wch
+is a carriage return and \fBnl\fP(3X) has been called,
+.B \%wgetch
+stores the the character code for newline
+(line feed)
+in
+.I wch
+instead.
+.SS "Ungetting Characters"
+.B \%unget_wch
+places
+.I wch
+into the input queue to be returned by the next call to
+.BR \%wget_wch .
+A single input queue serves all windows.
 .SH RETURN VALUE
-When
-\fBget_wch\fP,
-\fBwget_wch\fP,
-\fBmvget_wch\fP, and
-\fBmvwget_wch\fP
-functions successfully
-report the pressing of a function key, they return
-\fBKEY_CODE_YES\fP.
-When they successfully report a wide character, they return
-\fBOK\fP.
-Otherwise, they return
-\fBERR\fP.
-.PP
-Upon successful completion,
-\fBunget_wch\fP
+.B \%wget_wch
 returns
-\fBOK\fP.
-Otherwise, the function returns
-\fBERR\fP.
+.B OK
+when it reads a wide character and
+.B \%KEY_CODE_YES
+when it reads a function key code.
+It returns
+.B ERR
+if
+.bP
+the
+.I \%WINDOW
+pointer is
+.BR NULL ,
+or
+.bP
+its timeout expires without any data arriving,
+or
+.bP
+execution was interrupted by a signal,
+in which case
+.B \%errno
+is set to
+.BR \%EINTR .
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
-.SH NOTES
-Applications should not define the escape key by itself as a single-character
-function.
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X) and fail if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I win
+parameter is a null pointer.
 .PP
-When using
-\fBget_wch\fP,
-\fBwget_wch\fP,
-\fBmvget_wch\fP, or
-\fBmvwget_wch\fP, applications should
-not use
-\fBnocbreak\fP
-mode and
-\fBecho\fP
-mode
-at the same time.
-Depending on the state of the tty driver when each character
-is typed, the program may produce undesirable results.
+.B \%unget_wch
+returns
+.B OK
+on success and
+.B ERR
+if there is no more room in the input queue.
+.SH NOTES
+See the \*(``NOTES\*('' section of \fB\%wgetch\fP(3X).
 .PP
 All of these functions except
-\fB\%wget_wch\fP and
-\fB\%unget_wch\fP
+.B \%wget_wch
+and
+.B \%unget_wch
 may be implemented as macros.
+.PP
+Unlike \fB\%wgetch\fP(3X),
+.B \%wget_wch
+and its variants store the value of the input character in an additional
+.I wch
+parameter instead of the return value.
+.PP
+Unlike
+.BR \%ungetch ,
+.B \%unget_wch
+cannot distinguish function key codes
+.B \%wget_wch
+from conventional character codes.
+An application can overcome this limitation by pushing function key
+codes with
+.B \%ungetch
+and subsequently checking the return value of
+.B \%wget_wch
+for a match with
+.BR \%KEY_CODE_YES .
+.SH EXTENSIONS
+See the \*(``EXTENSIONS\*('' section of \fB\%wgetch\fP(3X).
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+X/Open Curses, Issue 4, describes these functions.
+It specifies no error conditions for them.
+.PP
+See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
+the interaction of
+.B \%wget_wch
+with signal handlers.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_getch\fP(3X),
+\fB\%curs_add_wch\fP(3X),
 \fB\%curs_inopts\fP(3X),
-\fB\%curs_ins_wch\fP(3X),
 \fB\%curs_move\fP(3X),
 \fB\%curs_refresh\fP(3X)
+.PP
+\fB\%curs_getch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 6d7a3c3e9..48d270873 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.42 2023/12/16 20:32:22 tom Exp $
-.TH curs_get_wstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.44 2024/03/16 15:35:01 tom Exp $
+.TH curs_get_wstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 760b85bd2..61b9f19ec 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.43 2023/12/16 21:07:24 tom Exp $
-.TH curs_getcchar 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
+.TH curs_getcchar 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index fed7fa703..30e10699b 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,19 +28,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.78 2024/02/17 19:27:03 tom Exp $
-.TH curs_getch 3X 2024-02-17 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getch.3x,v 1.83 2024/03/23 20:38:57 tom Exp $
+.TH curs_getch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds ^  \(ha
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       ^  ^
 .\}
 .
+.ie \n(.g .ds : \:
+.el       .ds : \" empty
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -64,318 +69,528 @@ get (or push back) characters from \fIcurses\fR terminal keyboard
 .PP
 .B int ungetch(int \fIch\fP);
 .PP
+.\" XXX: Move has_key into its own page like define_key and key_defined?
 \fI/* extension */\fP
 .B int has_key(int \fIch\fP);
 .fi
 .SH DESCRIPTION
 .SS "Reading Characters"
-The \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP and \fBmvwgetch\fP, routines read
-a character from the window.
-In no-delay mode, if no input is waiting, the value \fBERR\fP is returned.
-In delay mode, the program waits until the system
-passes text through to the program.
-Depending on the setting of \fBcbreak\fP,
-this is after one character (cbreak mode),
-or after the first newline (nocbreak mode).
-In half-delay mode,
-the program waits until a character is typed or the
-specified timeout has been reached.
+.B \%wgetch
+gathers a key stroke from the terminal keyboard associated with a
+.I curses
+window
+.IR win .
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
-If \fBecho\fP is enabled, and the window is not a pad,
-then the character will also be echoed into the
-designated window according to the following rules:
-.bP
-If the character is the current erase character, left arrow, or backspace,
-the cursor is moved one space to the left and that screen position is erased
-as if \fBdelch\fP had been called.
+When input is pending,
+.B \%wgetch
+returns an integer identifying the key stroke;
+for alphanumeric and punctuation keys,
+this value corresponds to the character encoding used by the terminal.
+Use of the control key as a modifier often results in a distinct code.
+The behavior of other keys depends on whether
+.I win
+is in keypad mode;
+see subsection \*(``Keypad Mode\*('' below.
+.PP
+If no input is pending,
+then if the no-delay flag is set in the window
+(see \fB\%nodelay\fP(3X)),
+the function returns
+.BR ERR ;
+otherwise,
+.I curses
+waits until the terminal has input.
+If \fB\%cbreak\fP(3X)
+has been called,
+this happens after one character is read.
+If \fB\%nocbreak\fP(3X)
+has been called,
+it occurs when the next newline is read.
+If \fB\%halfdelay\fP(3X)
+has been called,
+.I curses
+waits until a character is typed or the specified delay elapses.
+.PP
+If \fB\%echo\fP(3X) has been called,
+and the window is not a pad,
+.I curses
+writes the returned character
+.I ch
+to the window
+(at the cursor position)
+per the following rules.
 .bP
-If the character value is any other \fBKEY_\fP define, the user is alerted
-with a \fBbeep\fP call.
+If
+.I ch
+matches the terminal's erase character,
+the cursor moves leftward one position
+and the new position is erased
+as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
+When the window's keypad mode is enabled
+(see below),
+.B \%KEY_LEFT
+and
+.B \%KEY_BACKSPACE
+are handled the same way.
 .bP
-If the character is a carriage-return,
-and if \fBnl\fP is enabled,
-it is translated to a line-feed after echoing.
+.I curses
+writes any other
+.I ch
+to the window,
+as with \fB\%wechochar\fP(3X).
 .bP
-Otherwise the character is simply output to the screen.
+If the window has been moved or modified since the last call to
+\fB\%wrefresh\fP(3X),
+.I curses
+calls
+.BR \%wrefresh .
 .PP
-If the window is not a pad, and it has been moved or modified since the last
-call to \fBwrefresh\fP, \fBwrefresh\fP will be called before another character
-is read.
+If
+.I ch
+is a carriage return and \fBnl\fP(3X) has been called,
+.B \%wgetch
+returns the character code for newline
+(line feed)
+instead.
 .SS "Keypad Mode"
-If \fBkeypad\fP is \fBTRUE\fP, and a function key is pressed, the token for
-that function key is returned instead of the raw characters:
+To
+.IR curses ,
+key strokes not from the alphabetic section of the keyboard
+(those corresponding to the ECMA-6 character set\(emsee
+\fIascii\fP(7)\(emoptionally modified by either the control or shift
+keys)
+are treated as
+.I function
+keys.
+(In
+.IR curses ,
+the term \*(``function key\*('' includes but is not limited to keycaps
+engraved with \*(``F1\*('',
+\*(``PF1\*('',
+and so on.)
+If the window is in keypad mode,
+these produce a numeric code corresponding to the
+.B KEY_
+symbols listed in subsection \*(``Predefined Key Codes\*('' below;
+otherwise,
+they transmit a sequence of codes typically starting with the escape
+character,
+and which must be collected with multiple
+.B \%wgetch
+calls.
 .bP
-The predefined function
-keys are listed in \fB<curses.h>\fP as macros with values outside the range
-of 8-bit characters.
-Their names begin with \fBKEY_\fP.
+The
+.I \%curses.h
+header file declares many
+.I "predefined function keys"
+whose names begin with
+.BR KEY_ ;
+these object-like macros have values outside the range of eight-bit
+character codes.
 .bP
-Other (user-defined) function keys which may be defined
-using \fBdefine_key\fP(3X)
-have no names, but also are expected to have values outside the range of
-8-bit characters.
+In
+.IR \%ncurses ,
+.I "user-defined function keys"
+are configured with \fBdefine_key\fP(3X);
+they have no names,
+but are also expected to have values outside the range of eight-bit
+codes.
 .PP
-Thus, a variable
-intended to hold the return value of a function key must be of short size or
-larger.
+A variable intended to hold a function key code must thus be of type
+.I short
+or larger.
 .PP
-When a character that could be the beginning of a function key is received
-(which, on modern terminals, means an escape character),
-\fBcurses\fP sets a timer.
-If the remainder of the sequence does not come in within the designated
-time, the character is passed through;
-otherwise, the function key value is returned.
-For this reason, many terminals experience a delay between the time
-a user presses the escape key and the escape is returned to the program.
-.PP
-In \fI\%ncurses\fP, the timer normally expires after
-the value in \fBESCDELAY\fP (see \fBcurs_variables\fP(3X)).
-If \fBnotimeout\fP is \fBTRUE\fP, the timer does not expire;
-it is an infinite (or very large) value.
-Because function keys usually begin with an escape character,
-the terminal may appear to hang in notimeout mode after pressing the escape key
-until another key is pressed.
+Most terminals one encounters follow the ECMA-48 standard insofar as
+their function keys produce character sequences prefixed with the
+escape character ESC.
+This fact implies that
+.I curses
+cannot know whether the terminal has sent an ESC key stroke or the
+beginning of a function key's character sequence without waiting to see
+if,
+and how soon,
+further input arrives.
+When
+.I curses
+reads such an ambiguous character,
+it sets a timer.
+If the remainder of the sequence does not arrive within the designated
+time,
+.B \%wgetch
+returns the prefix character;
+otherwise,
+it returns the function key code corresponding to the unique sequence
+defined by the terminal.
+Consequently,
+a user of a
+.I curses
+application may experience a delay after pressing ESC while
+.I curses
+disambiguates the input.
+See section \*(``EXTENSIONS\*('' below.
+If the window is in \*(``no time-out\*('' mode,
+the timer does not expire;
+it is an infinite
+(or very large)
+value.
+See \fB\%notimeout\fP(3X).
+Because function key sequences usually begin with an escape character,
+the terminal may appear to hang in no time-out mode after the user has
+pressed ESC.
+Generally,
+further typing \*(``awakens\*(''
+.IR curses .
 .SS "Ungetting Characters"
-The \fBungetch\fP routine places \fIch\fP back onto the input queue to be
-returned by the next call to \fBwgetch\fP.
-There is just one input queue for all windows.
+.B \%ungetch
+places
+.I ch
+into the input queue to be returned by the next call to
+.BR \%wgetch .
+A single input queue serves all windows.
 .SS "Predefined Key Codes"
-The following special keys are defined in \fB<curses.h>\fP.
+The header file
+.I \%curses.h
+defines the following function key codes.
 .bP
-Except for the special case \fBKEY_RESIZE\fP,
-it is necessary to enable \fBkeypad\fP for \fBgetch\fP to return these codes.
+Except for the special case of
+.BR \%KEY_RESIZE ,
+a window's keypad mode must be enabled for
+.B \%wgetch
+to read these codes from it.
 .bP
 Not all of these are necessarily supported on any particular terminal.
 .bP
-The naming convention may seem obscure, with some apparent
-misspellings (such as \*(``RSUME\*('' for \*(``resume\*('').
-The names correspond to the long terminfo capability names for the keys,
-and were defined long ago, in the 1980s.
+The naming convention may seem obscure,
+with some apparent misspellings
+(such as \*(``RSUME\*('' for \*(``resume\*('');
+The names correspond to the
+.I \%term\%info
+capability names for the keys,
+and were standardized before the IBM PC/AT keyboard layout achieved a
+dominant position in industry.
 .PP
 .RS
+.\" XXX: Move this list into ncurses(3X), rather than duplicating it in
+.\" get_wch(3X) or having that page cross reference this one?
 .TS
-tab(/) ;
-l l .
-\fBName\fP/\fBKey\fP \fBname\fP
-_
-KEY_BREAK/Break key
-KEY_DOWN/The four arrow keys ...
-KEY_UP
-KEY_LEFT
-KEY_RIGHT
-KEY_HOME/Home key (upward+left arrow)
-KEY_BACKSPACE/Backspace
-KEY_F0/T{
-Function keys; space for 64 keys is reserved.
+Lb Lb
+Lb Lx.
+Symbol	Key name
+=
+KEY_BREAK	Break key
+KEY_DOWN	Arrow keys
+KEY_UP	\^
+KEY_LEFT	\^
+KEY_RIGHT	\^
+KEY_HOME	Home key (upward+left arrow)
+KEY_BACKSPACE	Backspace
+KEY_F0	T{
+Function keys; space for 64 keys is reserved
 T}
-KEY_F(\fIn\fP)/T{
-For 0 \(<= \fIn\fP \(<= 63
+KEY_F(\fIn\fP)	T{
+Function key \fIn\fP where 0 \(<= \fIn\fP \(<= 63
 T}
-KEY_DL/Delete line
-KEY_IL/Insert line
-KEY_DC/Delete character
-KEY_IC/Insert char or enter insert mode
-KEY_EIC/Exit insert char mode
-KEY_CLEAR/Clear screen
-KEY_EOS/Clear to end of screen
-KEY_EOL/Clear to end of line
-KEY_SF/Scroll 1 line forward
-KEY_SR/Scroll 1 line backward (reverse)
-KEY_NPAGE/Next page
-KEY_PPAGE/Previous page
-KEY_STAB/Set tab
-KEY_CTAB/Clear tab
-KEY_CATAB/Clear all tabs
-KEY_ENTER/Enter or send
-KEY_SRESET/Soft (partial) reset
-KEY_RESET/Reset or hard reset
-KEY_PRINT/Print or copy
-KEY_LL/Home down or bottom (lower left)
-KEY_A1/Upper left of keypad
-KEY_A3/Upper right of keypad
-KEY_B2/Center of keypad
-KEY_C1/Lower left of keypad
-KEY_C3/Lower right of keypad
-KEY_BTAB/Back tab key
-KEY_BEG/Beg(inning) key
-KEY_CANCEL/Cancel key
-KEY_CLOSE/Close key
-KEY_COMMAND/Cmd (command) key
-KEY_COPY/Copy key
-KEY_CREATE/Create key
-KEY_END/End key
-KEY_EXIT/Exit key
-KEY_FIND/Find key
-KEY_HELP/Help key
-KEY_MARK/Mark key
-KEY_MESSAGE/Message key
-KEY_MOUSE/Mouse event occurred
-KEY_MOVE/Move key
-KEY_NEXT/Next object key
-KEY_OPEN/Open key
-KEY_OPTIONS/Options key
-KEY_PREVIOUS/Previous object key
-KEY_REDO/Redo key
-KEY_REFERENCE/Ref(erence) key
-KEY_REFRESH/Refresh key
-KEY_REPLACE/Replace key
-KEY_RESIZE/Screen resized
-KEY_RESTART/Restart key
-KEY_RESUME/Resume key
-KEY_SAVE/Save key
-KEY_SBEG/Shifted beginning key
-KEY_SCANCEL/Shifted cancel key
-KEY_SCOMMAND/Shifted command key
-KEY_SCOPY/Shifted copy key
-KEY_SCREATE/Shifted create key
-KEY_SDC/Shifted delete char key
-KEY_SDL/Shifted delete line key
-KEY_SELECT/Select key
-KEY_SEND/Shifted end key
-KEY_SEOL/Shifted clear line key
-KEY_SEXIT/Shifted exit key
-KEY_SFIND/Shifted find key
-KEY_SHELP/Shifted help key
-KEY_SHOME/Shifted home key
-KEY_SIC/Shifted insert key
-KEY_SLEFT/Shifted left arrow key
-KEY_SMESSAGE/Shifted message key
-KEY_SMOVE/Shifted move key
-KEY_SNEXT/Shifted next key
-KEY_SOPTIONS/Shifted options key
-KEY_SPREVIOUS/Shifted prev key
-KEY_SPRINT/Shifted print key
-KEY_SREDO/Shifted redo key
-KEY_SREPLACE/Shifted replace key
-KEY_SRIGHT/Shifted right arrow key
-KEY_SRSUME/Shifted resume key
-KEY_SSAVE/Shifted save key
-KEY_SSUSPEND/Shifted suspend key
-KEY_SUNDO/Shifted undo key
-KEY_SUSPEND/Suspend key
-KEY_UNDO/Undo key
+KEY_DL	Delete line
+KEY_IL	Insert line
+KEY_DC	Delete character
+KEY_IC	Insert character/Enter insert mode
+KEY_EIC	Exit insert character mode
+KEY_CLEAR	Clear screen
+KEY_EOS	Clear to end of screen
+KEY_EOL	Clear to end of line
+KEY_SF	Scroll one line forward
+KEY_SR	Scroll one line backward (reverse)
+KEY_NPAGE	Next page/Page up
+KEY_PPAGE	Previous page/Page down
+KEY_STAB	Set tab
+KEY_CTAB	Clear tab
+KEY_CATAB	Clear all tabs
+KEY_ENTER	Enter/Send
+KEY_SRESET	Soft (partial) reset
+KEY_RESET	(Hard) reset
+KEY_PRINT	Print/Copy
+KEY_LL	Home down/Bottom (lower left)
+KEY_A1	Upper left of keypad
+KEY_A3	Upper right of keypad
+KEY_B2	Center of keypad
+KEY_C1	Lower left of keypad
+KEY_C3	Lower right of keypad
+KEY_BTAB	Back tab key
+KEY_BEG	Beg(inning) key
+KEY_CANCEL	Cancel key
+KEY_CLOSE	Close key
+KEY_COMMAND	Cmd (command) key
+KEY_COPY	Copy key
+KEY_CREATE	Create key
+KEY_END	End key
+KEY_EXIT	Exit key
+KEY_FIND	Find key
+KEY_HELP	Help key
+KEY_MARK	Mark key
+KEY_MESSAGE	Message key
+KEY_MOUSE	Mouse event occurred
+KEY_MOVE	Move key
+KEY_NEXT	Next object key
+KEY_OPEN	Open key
+KEY_OPTIONS	Options key
+KEY_PREVIOUS	Previous object key
+KEY_REDO	Redo key
+KEY_REFERENCE	Ref(erence) key
+KEY_REFRESH	Refresh key
+KEY_REPLACE	Replace key
+KEY_RESIZE	Screen resized
+KEY_RESTART	Restart key
+KEY_RESUME	Resume key
+KEY_SAVE	Save key
+KEY_SELECT	Select key
+KEY_SUSPEND	Suspend key
+KEY_UNDO	Undo key
+_
+KEY_SBEG	Shifted beginning key
+KEY_SCANCEL	Shifted cancel key
+KEY_SCOMMAND	Shifted command key
+KEY_SCOPY	Shifted copy key
+KEY_SCREATE	Shifted create key
+KEY_SDC	Shifted delete character key
+KEY_SDL	Shifted delete line key
+KEY_SEND	Shifted end key
+KEY_SEOL	Shifted clear line key
+KEY_SEXIT	Shifted exit key
+KEY_SFIND	Shifted find key
+KEY_SHELP	Shifted help key
+KEY_SHOME	Shifted home key
+KEY_SIC	Shifted insert key
+KEY_SLEFT	Shifted left arrow key
+KEY_SMESSAGE	Shifted message key
+KEY_SMOVE	Shifted move key
+KEY_SNEXT	Shifted next object key
+KEY_SOPTIONS	Shifted options key
+KEY_SPREVIOUS	Shifted previous object key
+KEY_SPRINT	Shifted print key
+KEY_SREDO	Shifted redo key
+KEY_SREPLACE	Shifted replace key
+KEY_SRIGHT	Shifted right arrow key
+KEY_SRSUME	Shifted resume key
+KEY_SSAVE	Shifted save key
+KEY_SSUSPEND	Shifted suspend key
+KEY_SUNDO	Shifted undo key
 .TE
 .RE
 .PP
-Keypad is arranged like this:
+The keypad is arranged as follows.
 .PP
 .RS
 .TS
-allbox tab(/) ;
-c c c .
-\fBA1\fP/\fBup\fP/\fBA3\fP
-\fBleft\fP/\fBB2\fP/\fBright\fP
-\fBC1\fP/\fBdown\fP/\fBC3\fP
+allbox center;
+C C C.
+A1	up	A3
+left	B2	right
+C1	down	C3
 .TE
 .RE
 .sp
-A few of these predefined values do \fInot\fP correspond to a real key:
+Two of these symbols do
+.I not
+correspond to a real key.
 .bP
-.B KEY_RESIZE
-is returned when the \fBSIGWINCH\fP signal has been detected
-(see \fBinitscr\fP(3X) and \fBresizeterm\fP(3X)).
-This code is returned whether or not \fBkeypad\fP has been enabled.
+.B \%wgetch
+returns
+.B \%KEY_RESIZE
+(even if the window's keypad mode is disabled)
+when
+.I \%ncurses
+detects the
+.B \%SIGWINCH
+signal;
+see \fBinitscr\fP(3X) and \fBresizeterm\fP(3X).
 .bP
-.B KEY_MOUSE
-is returned for mouse-events (see \fBcurs_mouse\fP(3X)).
-This code relies upon whether or not \fBkeypad\fP(3X) has been enabled,
-because
-(e.g.,
-with \fBxterm\fP(1) mouse prototocol)
-\fI\%ncurses\fP must read escape sequences,
-just like a function key.
+.B \%wgetch
+returns
+.B \%KEY_MOUSE
+to indicate that a mouse event is pending collection;
+see \fBcurs_mouse\fP(3X).
+Receipt of this code requires a window's keypad mode to be enabled,
+because to interpret mouse input
+(as with with \fIxterm\fP(1)'s mouse prototocol),
+.I \%ncurses
+must read an escape sequence,
+as with a function key.
 .SS "Testing Key Codes"
-The \fBhas_key\fP routine takes a key-code value from the above list, and
-returns \fBTRUE\fP or \fBFALSE\fP according to whether
-the current terminal type recognizes a key with that value.
-.PP
-The library also supports these extensions:
-.RS 3
-.TP 5
-.B define_key
-defines a key-code for a given string (see \fBdefine_key\fP(3X)).
-.TP 5
-.B key_defined
-checks if there is a key-code defined for a given
-string (see \fBkey_defined\fP(3X)).
-.RE
+In
+.IR \%ncurses ,
+.B \%has_key
+takes a key code value from the above list,
+and returns a Boolean value indicating the terminal's recognition of it.
+See also
+\fBdefine_key\fP(3X) and \fBkey_defined\fP(3X).
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an integer value
-other than \fBERR\fP (\fBOK\fP in the case of \fBungetch\fP) upon successful
-completion.
-.RS 3
-.TP 5
-\fBungetch\fP
-returns \fBERR\fP
-if there is no more room in the FIFO.
-.TP
-\fBwgetch\fP
-returns \fBERR\fP
-.RS
+.B \%wgetch
+returns
+.B ERR
+if
 .bP
-if the window pointer is null, or
+the
+.I \%WINDOW
+pointer is
+.BR NULL ,
+or
 .bP
-if its timeout expires without having any data, or
+its timeout expires without any data arriving,
+or
 .bP
-if the execution was interrupted by a signal (\fBerrno\fP will be set to
-\fBEINTR\fP).
-.RE
-.RE
+execution was interrupted by a signal,
+in which case
+.B \%errno
+is set to
+.BR \%EINTR .
+.PP
+Functions with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X) and fail if the position is outside the window,
+or
+(for \*(``mvw\*('' functions)
+if the
+.I win
+parameter is a null pointer.
+.PP
+.B \%ungetch
+returns
+.B OK
+on success and
+.B ERR
+if there is no more room in the input queue.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+.B \%has_key
+returns
+.B TRUE
+or
+.BR FALSE .
 .SH NOTES
-Use of the escape key by a programmer for a single character function is
-discouraged, as it will cause a delay of up to one second while the
-keypad code looks for a following function-key sequence.
+.I curses
+discourages assignment of the ESC key to a discrete function by the
+programmer because the library requires a delay while it awaits the
+potential remainder of a terminal escape sequence.
 .PP
-Some keys may be the same as commonly used control
-keys, e.g.,
-\fBKEY_ENTER\fP versus control/M,
-\fBKEY_BACKSPACE\fP versus control/H.
-Some curses implementations may differ according to whether they
-treat these control keys specially (and ignore the terminfo), or
-use the terminfo definitions.
-\fI\%ncurses\fP uses the terminfo definition.
-If it says that \fBKEY_ENTER\fP is control/M,
-\fBgetch\fP will return \fBKEY_ENTER\fP
-when you press control/M.
+Some key strokes are indistinguishable from control characters;
+for example,
+.B \%KEY_ENTER
+may be the same as
+.BR \*^M ,
+.\" as with att630 or pccon+keys
+and
+.B \%KEY_BACKSPACE
+may be the same as
+.B \*^H
+.\" as with att505 or vt52-basic
+or
+.BR \*^? .
+.\" as with pccon+keys or vt320
+Consult the terminal's
+.I \%term\%info
+entry to determine whether this is the case;
+see \fB\%infocmp\fP(1).
+Some
+.I curses
+implementations,
+including
+.IR \%ncurses ,
+honor the
+.I \%term\%info
+key definitions;
+others treat such control characters specially.
 .PP
-Generally, \fBKEY_ENTER\fP denotes the character(s) sent by the \fIEnter\fP
-key on the numeric keypad:
+.I curses
+distinguishes the Enter keys in the alphabetic and numeric keypad
+sections of a keyboard because (most) terminals do.
+.B \%KEY_ENTER
+refers to the key on the (numeric) keypad and,
+like other function keys,
+is reliably recognized only if the window's keypad mode is enabled.
 .bP
-the terminal description lists the most useful keys,
+The
+.I \%term\%info
+.B \%key_enter
+.RB ( kent )
+capability describes the character (sequence) sent by the terminal's
+keypad Enter key.
 .bP
-the \fIEnter\fP key on the regular keyboard is already handled by
-the standard ASCII characters for carriage-return and line-feed,
+\*(``Enter or send\*('' is X/Open Curses's description of this key.
+.PP
+.I curses
+treats the Enter or Return key in the
+.I alphabetic
+section of the keyboard differently.
 .bP
-depending on whether \fBnl\fP or \fBnonl\fP was called,
-pressing \*(``Enter\*('' on the regular keyboard
-may return either a carriage-return or line-feed, and finally
+It usually produces a control code for carriage return
+.RB ( \*^M )
+or line feed
+.RB ( \*^J ).
 .bP
-\*(``Enter or send\*('' is the standard description for this key.
+Depending on the terminal mode
+(raw,
+cbreak,
+or
+\*(``cooked\*(''),
+and whether \fB\%nl\fP(3X) or \fB\%nonl\fP(3X) has been called,
+.B \%wgetch
+may return either a carriage return or line feed upon an Enter or Return
+key stroke.
 .PP
-When using \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP, or
-\fBmvwgetch\fP, nocbreak mode (\fBnocbreak\fP) and echo mode
-(\fBecho\fP) should not be used at the same time.
-Depending on the
-state of the tty driver when each character is typed, the program may
-produce undesirable results.
+Use of
+.B \%wgetch
+with \fB\%echo\fP(3X) and neither \fB\%cbreak\fP(3X) nor \fB\%raw\fP(3X)
+is not well-defined.
 .PP
-Note that \fBgetch\fP, \fBmvgetch\fP, and \fBmvwgetch\fP may be macros.
+Historically,
+the list of key code macros above was influenced by the
+function-key-rich keyboard of the AT&T 7300
+(also known variously as the \*(``3B1\*('', \*(``Safari 4\*('', and
+\*(``UNIX PC\*(''),
+a 1985 machine.
+Today's computer keyboards are based on the IBM PC/AT keyboard and tend
+to have fewer.
+A
+.I curses
+application can expect such a keyboard to transmit key codes
+.BR \%KEY_UP ,
+.BR \%KEY_DOWN ,
+.BR \%KEY_LEFT ,
+.BR \%KEY_RIGHT ,
+.BR \%KEY_HOME ,
+.BR \%KEY_END ,
+.B \%KEY_PPAGE
+(Page Up),
+.B \%KEY_NPAGE
+(Page Down),
+.B \%KEY_IC
+(Insert),
+.B \%KEY_DC
+(Delete),
+and
+.BI \%KEY_F( n )
+for 1 \(<=
+.I n
+\(<= 12.
 .PP
-Historically, the set of keypad macros was largely defined by the extremely
-function-key-rich keyboard of the AT&T 7300, aka 3B1, aka Safari 4.
-Modern
-personal computers usually have only a small subset of these.
-IBM PC-style
-consoles typically support little more than \fBKEY_UP\fP, \fBKEY_DOWN\fP,
-\fBKEY_LEFT\fP, \fBKEY_RIGHT\fP, \fBKEY_HOME\fP, \fBKEY_END\fP,
-\fBKEY_NPAGE\fP, \fBKEY_PPAGE\fP, and function keys 1 through 12.
-The Ins key
-is usually mapped to \fBKEY_IC\fP.
+.BR \%getch ,
+.BR \%mvgetch ,
+and
+.B \%mvwgetch
+may be implemented as macros.
 .SH EXTENSIONS
+In
+.IR \%ncurses ,
+when a window's \*(``no time-out\*('' mode is
+.I not
+set,
+the
+.B \%ESCDELAY
+variable configures the duration of the timer used to disambiguate a
+function key character sequence from a series of key strokes beginning
+with ESC typed by the user;
+see
+\fB\%curs_variables\fP(3X).
+.PP
 \fB\%has_key\fP was designed for \fB\%ncurses\fP(3X),
 and is not found in SVr4
 .IR curses ,
@@ -389,32 +604,50 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses, Issue 4, Version 2, describes
+X/Open Curses, Issue 4, describes
 \fB\%getch\fP,
 \fB\%wgetch\fP,
 \fB\%mvgetch\fP,
 \fB\%mvwgetch\fP,
 and
 \fB\%ungetch\fP.
-They read single-byte characters only.
-The standard specifies that they return \fBERR\fP on failure,
-but describes no failure conditions.
+It specifies no error conditions for them.
+.PP
+.B \%wgetch
+reads only single-byte characters.
 .PP
 The echo behavior of these functions on input of
 .B KEY_
 or backspace characters was not specified in the SVr4 documentation.
 This description is adapted from X/Open Curses.
 .PP
-The behavior of \fBgetch\fP and friends in the presence of signal
-handlers is unspecified in the SVr4 documentation and X/Open Curses.
-Under historical curses implementations,
+The behavior of
+.B \%wgetch
+in the presence of signal handlers is unspecified in the SVr4
+documentation and X/Open Curses.
+In historical
+.I curses
+implementations,
 it varied depending on whether the operating system's dispatch of a
-signal to a handler interrupts a \fBread\fP(2) call in progress or not,
+signal to a handler interrupts a \fIread\fP(2) call in progress or not,
 and also
 (in some implementations)
 whether an input timeout or non-blocking mode has been set.
+Programmers concerned about portability should be prepared for either of
+two cases:
+(a) signal receipt does not interrupt
+.BR \%wgetch ;
+or
+(b) signal receipt interrupts
+.B \%wgetch
+and causes it to return
+.B ERR
+with
+.B \%errno
+set to
+.BR \%EINTR .
 .PP
-.B KEY_MOUSE
+.B \%KEY_MOUSE
 is mentioned in X/Open Curses,
 along with a few related
 .I \%term\%info
@@ -424,31 +657,41 @@ The implementation in
 .I \%ncurses
 is an extension.
 .PP
-.B KEY_RESIZE
-is an extension first implemented for
-.I \%ncurses.
+.B \%KEY_RESIZE
+and
+.B \%has_key
+are extensions first implemented for
+.IR \%ncurses .
+By 2022,
+.I \%PDCurses
+.\" https://web.archive.org/web/20220117232009/https://pdcurses.org/docs/MANUAL.html
+and
 NetBSD
 .I curses
-later added this extension.
-.PP
-Programmers concerned about portability should be prepared for either of two
-cases: (a) signal receipt does not interrupt \fBgetch\fP; (b) signal receipt
-interrupts \fBgetch\fP and causes it to return \fBERR\fP with \fBerrno\fP set to
-\fBEINTR\fP.
-.PP
-The \fBhas_key\fP function is unique to \fI\%ncurses\fP.
-We recommend that
-any code using it be conditionalized on the \fBNCURSES_VERSION\fP feature macro.
+.\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3
+had added them along with
+.BR \%KEY_MOUSE .
 .SH SEE ALSO
 \fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
 \fB\%curs_inopts\fP(3X),
 \fB\%curs_mouse\fP(3X),
 \fB\%curs_move\fP(3X),
 \fB\%curs_outopts\fP(3X),
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_variables\fP(3X),
-\fB\%resizeterm\fP(3X)
+\fB\%resizeterm\fP(3X),
+\fB\%ascii\fP(7)
+.PP
+\fB\%curs_get_wch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
+ECMA-6 \*(``7-bit coded Character Set\*(''
+\%<https://\*:ecma\-international\*:.org/\
+\*:publications\-and\-standards/\*:standards/\*:ecma\-6/>
 .PP
-Comparable functions in the wide-character (ncursesw) library are
-described in
-\fB\%curs_get_wch\fP(3X).
+ECMA-48 \*(``Control Functions for Coded Character Sets\*(''
+\%<https://\*:ecma\-international\*:.org/\
+\*:publications\-and\-standards/\*:standards/\*:ecma\-48/>
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 08b39ab4d..33563ab68 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.52 2023/12/16 20:32:22 tom Exp $
-.TH curs_getstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.54 2024/03/16 15:35:01 tom Exp $
+.TH curs_getstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index a358e7500..7b1830c98 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.40 2023/12/16 21:33:21 tom Exp $
-.TH curs_getyx 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
+.TH curs_getyx 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index d7af7b585..e061df200 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.24 2023/11/18 18:00:11 tom Exp $
-.TH curs_in_wch 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.26 2024/03/16 15:35:01 tom Exp $
+.TH curs_in_wch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 995f4f863..fa012b21d 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.32 2023/11/18 20:55:18 tom Exp $
-.TH curs_in_wchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH curs_in_wchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 54a57228f..66f488f8a 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.44 2024/01/13 22:05:39 tom Exp $
-.TH curs_inch 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inch.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH curs_inch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 89d4bd1e3..d019fc618 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.40 2023/11/19 00:08:58 tom Exp $
-.TH curs_inchstr 3X 2023-11-18 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
+.TH curs_inchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 15f4e8b96..997ca521e 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.62 2024/02/24 20:03:50 tom Exp $
-.TH curs_initscr 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.64 2024/03/16 15:35:01 tom Exp $
+.TH curs_initscr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index de844c3c3..ad9e280b3 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.60 2023/12/23 16:36:18 tom Exp $
-.TH curs_inopts 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.64 2024/03/23 20:38:57 tom Exp $
+.TH curs_inopts 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -228,7 +228,7 @@ this is equivalent,
 under POSIX,
 to setting the CS7 flag on the terminal.
 The window argument,
-.I win,
+.IR win ,
 is always ignored.
 If the terminfo capabilities
 \fBsmm\fP (meta_on) and
@@ -278,7 +278,7 @@ passed through uninterpreted,
 instead of generating a signal.
 The behavior of the BREAK key depends on other bits in the terminal
 driver that are not set by
-.I curses.
+.IR curses .
 .\"
 .SS "qiflush, nqiflush"
 When the \fB\%noqiflush\fP routine is used,
@@ -344,7 +344,7 @@ All routines that return an integer return \fBERR\fP upon failure and
 upon successful completion,
 unless otherwise noted in the preceding routine descriptions.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 In this implementation,
 functions with a window parameter will return an error if it is null.
 Any function will also return an error if the terminal was not
@@ -508,7 +508,7 @@ load key definitions in the order
 defined by the array of string capability names.
 The last key to be loaded determines the keycode which will be returned.
 In
-.I \%ncurses,
+.IR \%ncurses ,
 you may also have extended capabilities interpreted as key definitions.
 These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 1f2307a16..6730a7704 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.26 2023/12/23 16:03:24 tom Exp $
-.TH curs_ins_wch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.28 2024/03/16 15:35:01 tom Exp $
+.TH curs_ins_wch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 10000832d..3bf9b9d08 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.30 2023/12/16 20:36:15 tom Exp $
-.TH curs_ins_wstr 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.32 2024/03/16 15:48:54 tom Exp $
+.TH curs_ins_wstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,7 +89,7 @@ Special characters are handled as in \fBwadd_wch\fP(3X).
 .SH RETURN VALUE
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the \fIwin\fP parameter is null or
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 4be93c6bb..73c34a908 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.36 2023/12/23 16:03:24 tom Exp $
-.TH curs_insch 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insch.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+.TH curs_insch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index ef338ade9..6c7035365 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.46 2023/11/25 11:29:34 tom Exp $
-.TH curs_insstr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.48 2024/03/16 15:49:07 tom Exp $
+.TH curs_insstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -88,7 +88,7 @@ Special characters are handled as in \fBwaddch\fP(3X).
 .SH RETURN VALUE
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the \fIwin\fP parameter is null or
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 20f42f38a..d35a3615b 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
-.TH curs_instr 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_instr.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH curs_instr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index b11cb21fa..095c2fa1c 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.36 2023/12/30 21:32:48 tom Exp $
-.TH curs_inwstr 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+.TH curs_inwstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 40e3e3a34..0a7916120 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.54 2024/02/24 19:57:34 tom Exp $
-.TH curs_kernel 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
+.TH curs_kernel 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index b503991e0..24be01b85 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.30 2023/12/23 16:40:10 tom Exp $
-.TH curs_legacy 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH curs_legacy 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 0f9895029..0626d7740 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_memleaks.3x,v 1.33 2023/12/23 16:22:08 tom Exp $
-.TH curs_memleaks 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_memleaks.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH curs_memleaks 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index f8b666c8f..04df96f18 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.92 2024/02/24 19:54:30 tom Exp $
-.TH curs_mouse 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.96 2024/03/23 20:38:57 tom Exp $
+.TH curs_mouse 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -231,7 +231,7 @@ The \fB\%mouseinterval\fP function sets the maximum time
 (in thousands of a second)
 that can elapse between press and release events for them to
 be resolved as a
-.I click.
+.IR click .
 An application might interpret button press and release events separated
 by more than the mouse interval as a \*(``long press\*('',
 or,
@@ -299,7 +299,7 @@ The order of the \fB\%MEVENT\fP structure members is not guaranteed.
 Additional fields may be added to the structure in the future.
 .PP
 Under
-.I \%ncurses,
+.IR \%ncurses ,
 these calls are implemented using either
 .IR \%xterm 's
 built-in mouse-tracking API or
@@ -352,7 +352,7 @@ include \fB\%REPORT_MOUSE_POSITION\fP.
 They are distinct.
 For example,
 in
-.I \%xterm,
+.IR \%xterm ,
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
 .SH EXTENSIONS
@@ -456,9 +456,9 @@ where the mouse was using the \fB\%req_mouse_pos\fP capability.
 .IP
 Those features required a terminal program that had been modified
 to work with SVr4
-.I curses.
+.IR curses .
 They were not part of the X Consortium's
-.I \%xterm.
+.IR \%xterm .
 .PP
 When developing the
 .I \%xterm
@@ -470,7 +470,7 @@ lack of documentation.
 Later, in 1998, Mark Hesseling provided support in
 .I \%PDCurses
 2.3 using the SVr4 interface.
-.I \%PDCurses,
+.IR \%PDCurses ,
 however,
 does not use video terminals,
 making it unnecessary to be concerned about compatibility with the
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 41c912edd..cb244bd1a 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.33 2023/12/16 21:33:08 tom Exp $
-.TH curs_move 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_move.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH curs_move 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 090b490e0..fa623eea1 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.41 2023/12/16 20:32:22 tom Exp $
-.TH curs_opaque 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp $
+.TH curs_opaque 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 0a2b38fa4..8f670df9a 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.56 2024/01/05 21:46:58 tom Exp $
-.TH curs_outopts 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.58 2024/03/16 15:49:18 tom Exp $
+.TH curs_outopts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -143,7 +143,7 @@ and \fBERR\fP upon failure.
 All other routines that return an integer always
 return \fBOK\fP.
 .PP
-X/Open Curses does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 .PP
 In this implementation,
 .bP
@@ -153,7 +153,7 @@ will return an error if the window pointer is null
 \fBwsetscrreg\fP
 returns an error if the scrolling region limits extend outside the window.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 if the window pointer is null.
 .SH NOTES
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 6df8b6211..cfeccc792 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.39 2024/01/05 21:46:58 tom Exp $
-.TH curs_overlay 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.41 2024/03/16 15:35:01 tom Exp $
+.TH curs_overlay 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 072cbd591..a7b4a94a0 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.53 2024/01/05 21:46:58 tom Exp $
-.TH curs_pad 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_pad.3x,v 1.55 2024/03/16 15:49:29 tom Exp $
+.TH curs_pad 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -149,7 +149,7 @@ upon successful completion.
 Functions that return pointers return \fBNULL\fP on error,
 and set \fB\%errno\fP to \fB\%ENOMEM\fP.
 .PP
-X/Open Curses does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
diff --git a/man/curs_print.3x b/man/curs_print.3x
index d98104a20..3694beffc 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.36 2023/12/23 16:36:18 tom Exp $
-.TH curs_print 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+.TH curs_print 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 15dd10b53..a9fabc5cd 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.47 2023/12/23 14:41:07 tom Exp $
-.TH curs_printw 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_printw.3x,v 1.51 2024/03/23 20:38:57 tom Exp $
+.TH curs_printw 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,7 +96,7 @@ upon failure and
 upon success.
 .PP
 In
-.I \%ncurses,
+.IR \%ncurses ,
 failure occurs if the library cannot allocate enough memory for the
 buffer into which the output is formatted,
 or if the window pointer
@@ -160,7 +160,7 @@ In 1991
 and after the C standard was published),
 other developers updated the library,
 using \fI\%stdarg.h\fP internally in 4.4BSD
-.I curses.
+.IR curses .
 Even with this improvement,
 BSD
 .I curses
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 605282578..b193d28ec 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.42 2024/01/05 21:46:58 tom Exp $
-.TH curs_refresh 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.44 2024/03/16 15:49:39 tom Exp $
+.TH curs_refresh 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -133,7 +133,7 @@ These routines return the integer \fBERR\fP upon failure and \fBOK\fP
 \*(``an integer value other than \fBERR\fP\*('')
 upon successful completion.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index cf1977acb..e5dcae6f4 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.47 2023/12/23 14:41:50 tom Exp $
-.TH curs_scanw 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.51 2024/03/23 20:41:15 tom Exp $
+.TH curs_scanw 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -97,7 +97,7 @@ upon failure and otherwise a count of successful conversions;
 this quantity may be zero.
 .PP
 In
-.I \%ncurses,
+.IR \%ncurses ,
 failure occurs if \fI\%vsscanf\fP(3) returns
 \fBEOF\fP,
 or if the window pointer
@@ -162,7 +162,7 @@ this may have been an editorial solecism introduced by X/Open,
 rather than an intentional change.
 .bP
 This implementation retains compatibility with SVr4
-.I curses.
+.IR curses .
 As of 2018,
 NetBSD
 .I curses
@@ -202,7 +202,7 @@ In 1991
 and after the C standard was published),
 other developers updated the library,
 using \fI\%stdarg.h\fP internally in 4.4BSD
-.I curses.
+.IR curses .
 Even with this improvement,
 BSD
 .I curses
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 16c802a15..427ae2eba 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.37 2023/12/30 21:34:11 tom Exp $
-.TH curs_scr_dump 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.41 2024/03/23 20:41:15 tom Exp $
+.TH curs_scr_dump 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -84,7 +84,7 @@ after performing any further desired updates,
 call \fB\%doupdate\fP(3X) or similar.
 .SS scr_init
 \fB\%scr_init\fP reads
-.I filename,
+.IR filename ,
 using it to initialize
 .I curses
 data structures describing the state of the terminal screen.
@@ -125,7 +125,7 @@ These functions return \fBOK\fP on success and \fBERR\fP on failure.
 X/Open defines no failure conditions.
 In this implementation,
 each function fails if it cannot open
-.I filename.
+.IR filename .
 .SH NOTES
 \fB\%scr_init\fP,
 \fB\%scr_set\fP,
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 598838031..8c29dd567 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.36 2023/12/16 22:52:35 tom Exp $
-.TH curs_scroll 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.40 2024/03/23 20:41:15 tom Exp $
+.TH curs_scroll 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -76,14 +76,14 @@ see \fB\%curscr\fP(3X).
 \fB\%scrl\fP and \fB\%wscrl\fP scroll
 .B \%stdscr
 or the specified window up or down depending on the sign of
-.I n.
+.IR n .
 .bP
 For positive
-.I n,
+.IR n ,
 line \fIi\fP+\fIn\fP becomes \fIi\fP (scrolling up);
 .bP
 for negative
-.I n,
+.IR n ,
 line \fIi\fP-\fIn\fP becomes \fIi\fP (scrolling down).
 .PP
 The cursor does not move.
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index e1d39b2d3..33119b64d 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.67 2023/12/16 21:18:45 tom Exp $
-.TH curs_slk 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_slk.3x,v 1.69 2024/03/16 15:35:01 tom Exp $
+.TH curs_slk 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 7f4be4017..c4c2b1320 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.46 2023/12/23 16:26:05 tom Exp $
-.TH curs_sp_funcs 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.48 2024/03/16 15:35:01 tom Exp $
+.TH curs_sp_funcs 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index c0f9aef02..2c1f274ab 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.34 2024/01/05 21:46:58 tom Exp $
-.TH curs_termattrs 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH curs_termattrs 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 1c176e012..f292f9d8f 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.81 2023/12/30 21:27:22 tom Exp $
-.TH curs_termcap 3X 2023-12-30 "ncurses 6.4" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.83 2024/03/16 15:35:01 tom Exp $
+.TH curs_termcap 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 6fdc89991..2d235677d 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.130 2024/02/24 20:04:09 tom Exp $
-.TH curs_terminfo 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.134 2024/03/23 20:41:15 tom Exp $
+.TH curs_terminfo 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -228,7 +228,7 @@ initializing the
 .I \%term\%info
 structures,
 but does not set up the output virtualization structures used by
-.I curses.
+.IR curses .
 Its parameters follow.
 .RS 3
 .TP 5
@@ -250,9 +250,9 @@ terminal,
 passing an output
 .I stream
 rather than a
-.I descriptor.
+.IR descriptor .
 In
-.I curses,
+.IR curses ,
 the two are the same because \fB\%newterm\fP calls \fB\%setupterm\fP,
 passing the file descriptor derived from its output stream parameter.
 .TP 5
@@ -267,7 +267,7 @@ then \fB\%setupterm\fP returns
 or
 .B ERR
 and stores a status value in the integer pointed to by
-.I errret.
+.IR errret .
 A return value of
 .B OK
 combined with status of
@@ -350,13 +350,13 @@ If it is called for different terminal types,
 capabilities.
 .PP
 \fB\%set_curterm\fP sets \fB\%cur_term\fP to
-.I \%nterm,
+.IR \%nterm ,
 and makes all of the
 .I \%term\%info
 Boolean,
 numeric,
 and string variables use the values from
-.I \%nterm.
+.IR \%nterm .
 It returns the old value of \fB\%cur_term\fP.
 .PP
 \fB\%del_curterm\fP frees the space pointed to by
@@ -389,7 +389,7 @@ and then restores the bits.
 \fB\%tparm\fP instantiates the string
 .I str
 with parameters
-.I pi.
+.IR pi .
 A pointer is returned to the result of
 .I str
 with the parameters applied.
@@ -503,12 +503,12 @@ specified in \fB\%setupterm\fP.
 .PP
 \fB\%vidputs\fP displays the string on the terminal in the video
 attribute mode
-.I attrs,
+.IR attrs ,
 which is any combination of the attributes listed in \fB\%curses\fP(3X).
 The characters are passed to the
 .IR \%putchar -like
 function
-.I putc.
+.IR putc .
 .PP
 \fB\%vidattr\fP is like \fB\%vidputs\fP,
 except that it outputs through \fI\%putchar\fP(3).
@@ -525,14 +525,14 @@ They use multiple parameters to represent the character attributes and
 color;
 namely,
 .bP
-.I \%attrs,
+.IR \%attrs ,
 of type
-.I \%attr_t,
+.IR \%attr_t ,
 for the attributes and
 .bP
-.I pair,
+.IR pair ,
 of type
-.I short,
+.IR short ,
 for the color pair number.
 .PP
 Use the attribute constants prefixed with
@@ -573,7 +573,7 @@ because System\ V did this
 and \fB\%tigetstr\fP return the value of the capability corresponding to
 the
 .I \%term\%info
-.I cap-code,
+.IR cap-code ,
 such as
 .BR xenl ,
 passed to them.
@@ -686,7 +686,7 @@ but it is possible to do that using the \fB\%delscreen\fP(3X) function.
 .SH RETURN VALUE
 X/Open Curses defines no failure conditions.
 In
-.I \%ncurses,
+.IR \%ncurses ,
 .TP 5
 .B del_curtem
 fails if its terminal parameter is null.
@@ -739,7 +739,7 @@ is also provided in the non-wide-character configuration.
 .\" ********************************************************************
 .SH EXTENSIONS
 The functions marked as extensions were designed for
-.I \%ncurses,
+.IR \%ncurses ,
 and are not found in SVr4
 .IR curses ,
 4.4BSD
@@ -752,7 +752,7 @@ implementation.
 allows
 .I opts
 to be a pointer to
-.I int,
+.IR int ,
 which overrides the
 .I pair
 .RI ( short )
@@ -804,7 +804,7 @@ but is assumed by some applications.
 .PP
 Other implementions may not declare the capability name arrays.
 Some provide them without declaring them.
-X/Open does not specify them.
+X/Open Curses does not specify them.
 .PP
 Extended terminal capability names,
 as defined by
@@ -826,7 +826,7 @@ did not allow a reliable way to clean up on receiving
 .PP
 The current version (ncurses6)
 uses output buffers managed directly by
-.I \%ncurses.
+.IR \%ncurses .
 Some of the low-level functions described in this manual page write
 to the standard output.
 They are not signal-safe.
@@ -846,7 +846,7 @@ X/Open Curses uses
 less effectively than a later design might,
 in some cases applying it needlessly to values are already constant,
 and in most cases overlooking parameters which normally would use
-.I \%const.
+.IR \%const .
 Using constant parameters for functions which do not use
 .I \%const
 may prevent the program from compiling.
@@ -939,7 +939,7 @@ the windows console driver by checking if \fB$TERM\fP is set to
 .SS "Other Portability Issues"
 In SVr4,
 \fB\%set_curterm\fP returns an
-.I int,
+.IR int ,
 .B OK
 or
 .BR ERR .
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 0d327c293..d49c16e71 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.54 2024/01/13 22:05:39 tom Exp $
-.TH curs_threads 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
+.TH curs_threads 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 61adaf0f9..22391fd66 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.42 2023/11/25 14:08:05 tom Exp $
-.TH curs_touch 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: curs_touch.3x,v 1.44 2024/03/16 15:49:58 tom Exp $
+.TH curs_touch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -81,7 +81,7 @@ All routines return the integer \fBERR\fP upon failure and an integer value
 other than \fBERR\fP upon successful completion, unless otherwise noted in the
 preceding routine descriptions.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 64dbd10e1..b985ffb32 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.45 2024/03/02 16:34:00 tom Exp $
-.TH curs_trace 3X 2024-03-02 "ncurses 6.4" "Library calls"
+.\" $Id: curs_trace.3x,v 1.47 2024/03/16 15:35:01 tom Exp $
+.TH curs_trace 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_util.3x b/man/curs_util.3x
index a6a082b11..7e162e959 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.96 2024/02/24 19:22:01 tom Exp $
-.TH curs_util 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.98 2024/03/16 15:50:09 tom Exp $
+.TH curs_util 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -288,7 +288,7 @@ upon failure and \fBOK\fP (SVr4 specifies only "an integer value other than
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 3a09c40ac..f88cbed02 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.43 2024/01/05 21:46:58 tom Exp $
-.TH curs_variables 3X 2024-01-05 "ncurses 6.4" "Library calls"
+.\" $Id: curs_variables.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
+.TH curs_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_window.3x b/man/curs_window.3x
index e1f842078..1bb1a57d8 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
-.TH curs_window 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_window.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH curs_window 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 8e35221fa..5e14bd99d 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.48 2023/12/16 20:32:22 tom Exp $
-.TH default_colors 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: default_colors.3x,v 1.50 2024/03/16 15:35:01 tom Exp $
+.TH default_colors 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/define_key.3x b/man/define_key.3x
index 2bbecbdc9..667d8cd31 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.40 2023/12/16 20:32:22 tom Exp $
-.TH define_key 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
+.TH define_key 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
diff --git a/man/form.3x b/man/form.3x
index f00dfbc93..2f8f88486 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.52 2023/12/23 16:08:25 tom Exp $
-.TH form 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: form.3x,v 1.54 2024/03/16 15:35:01 tom Exp $
+.TH form 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index 04afa9a10..ed8bab15f 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.29 2023/11/25 13:58:47 tom Exp $
-.TH form_cursor 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_cursor.3x,v 1.31 2024/03/16 15:35:01 tom Exp $
+.TH form_cursor 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBpos_form_cursor\fP \-
 position a form window cursor
diff --git a/man/form_data.3x b/man/form_data.3x
index c062ecf19..ded82eba1 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH form_data 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_data.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH form_data 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBdata_ahead\fP,
 \fBdata_behind\fP \-
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 1b8abcc6b..893f7d816 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.57 2024/01/13 22:05:39 tom Exp $
-.TH form_driver 3X 2024-01-13 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.59 2024/03/16 15:35:01 tom Exp $
+.TH form_driver 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/form_field.3x b/man/form_field.3x
index a43625392..9799d0c0c 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH form_field 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH form_field 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index ecd4c31ba..687e909e5 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_attributes.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH form_field_attributes 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_attributes.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH form_field_attributes 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index ec883b6d3..ba176d3e1 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.43 2023/12/16 20:32:22 tom Exp $
-.TH form_field_buffer 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
+.TH form_field_buffer 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index a40b605fb..84b10d96d 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH form_field_info 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_info.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH form_field_info 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index 7294a1796..c1fd5545e 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH form_field_just 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_just.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH form_field_just 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 78f77ac59..9cf08adb5 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.39 2023/11/25 13:58:47 tom Exp $
-.TH form_field_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp $
+.TH form_field_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 796710295..9ab3ad0cb 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.42 2023/11/25 13:58:47 tom Exp $
-.TH form_field_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.44 2024/03/16 15:35:01 tom Exp $
+.TH form_field_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index d667ca123..6eea09201 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.28 2023/11/25 13:58:47 tom Exp $
-.TH form_field_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp $
+.TH form_field_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \-
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 0a4f2e99e..54fa2a72a 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.51 2023/12/16 20:32:22 tom Exp $
-.TH form_field_validation 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp $
+.TH form_field_validation 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index b94ff965f..81a58b1d8 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.44 2023/11/25 13:58:47 tom Exp $
-.TH form_fieldtype 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH form_fieldtype 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/form_hook.3x b/man/form_hook.3x
index d1ae78a65..d93d8d875 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.35 2024/01/20 18:12:04 tom Exp $
-.TH form_hook 3X 2024-01-20 "ncurses 6.4" "Library calls"
+.\" $Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+.TH form_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
diff --git a/man/form_new.3x b/man/form_new.3x
index edc3ac03f..dc45e183f 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH form_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH form_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \-
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 234a4ed6e..c47a959d3 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH form_new_page 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_new_page.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH form_new_page 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/form_opts.3x b/man/form_opts.3x
index 1b60d9ba5..74a36d2b3 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH form_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_opts.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH form_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
diff --git a/man/form_page.3x b/man/form_page.3x
index 9d1f2d86a..fa538c620 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
-.TH form_page 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+.TH form_page 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
diff --git a/man/form_post.3x b/man/form_post.3x
index ec5272a09..77e086e45 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
-.TH form_post 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_post.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+.TH form_post 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBpost_form\fP,
 \fBunpost_form\fP \-
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index e1d6e4803..4075ea73c 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.33 2023/12/16 20:32:22 tom Exp $
-.TH form_requestname 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH form_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index ada886294..11c990c00 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH form_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH form_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \-
diff --git a/man/form_variables.3x b/man/form_variables.3x
index ad4d609f5..7b11a1ab7 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010-2013,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_variables.3x,v 1.16 2023/10/07 21:19:07 tom Exp $
-.TH form_variables 3X 2023-10-07 "ncurses 6.4" "Library calls"
+.\" $Id: form_variables.3x,v 1.18 2024/03/16 15:35:01 tom Exp $
+.TH form_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%TYPE_ALNUM\fP,
 \fB\%TYPE_ALPHA\fP,
diff --git a/man/form_win.3x b/man/form_win.3x
index 600185a4a..4a75b294c 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH form_win 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH form_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 494282e42..5f92c96dd 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.107 2024/01/13 22:05:39 tom Exp $
-.TH @INFOCMP@ 1M 2024-01-13 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp $
+.TH @INFOCMP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/infotocap.1m b/man/infotocap.1m
index c3c98b396..0f0335d44 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.39 2023/12/10 14:12:43 tom Exp $
-.TH @INFOTOCAP@ 1M 2023-12-10 "ncurses 6.4" "User commands"
+.\" $Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp $
+.TH @INFOTOCAP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/key_defined.3x b/man/key_defined.3x
index 26bf53750..f0184aa77 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.32 2023/12/16 20:32:22 tom Exp $
-.TH key_defined 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH key_defined 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
diff --git a/man/keybound.3x b/man/keybound.3x
index ca646d1ab..bd8bb80f3 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.34 2023/12/16 20:32:22 tom Exp $
-.TH keybound 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH keybound 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
diff --git a/man/keyok.3x b/man/keyok.3x
index 0fe907475..b4c7de2b4 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.38 2023/12/16 20:32:22 tom Exp $
-.TH keyok 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp $
+.TH keyok 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index e057fa5ff..7bf1cdcca 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.24 2023/12/16 20:32:22 tom Exp $
-.TH legacy_coding 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.26 2024/03/16 15:35:01 tom Exp $
+.TH legacy_coding 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 19a5c7494..11332a87d 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.70 2024/03/02 14:23:26 tom Exp $
+# $Id: man_db.renames.in,v 1.72 2024/03/23 18:05:08 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -180,7 +180,9 @@ attron.3x			attron.3ncurses
 baudrate.3x			baudrate.3ncurses
 bkgd.3x				bkgd.3ncurses
 bkgrnd.3x			bkgrnd.3ncurses
+cbreak.3x			cbreak.3ncurses
 clearok.3x			clearok.3ncurses
+clrtoeol.3x			clrtoeol.3ncurses
 curs_set.3x			curs_set.3ncurses
 curscr.3x			curscr.3ncurses
 def_prog_mode.3x		def_prog_mode.3ncurses
@@ -190,6 +192,7 @@ delay_output.3x			delay_output.3ncurses
 delscreen.3x			delscreen.3ncurses
 derwin.3x			derwin.3ncurses
 doupdate.3x			doupdate.3ncurses
+echo.3x				echo.3ncurses
 endwin.3x			endwin.3ncurses
 extended_slk_color.3x		extended_slk_color.3ncurses
 filter.3x			filter.3ncurses
@@ -199,6 +202,7 @@ getattr.3x			getattr.3ncurses
 getcchar.3x			getcchar.3ncurses
 getch.3x			getch.3ncurses
 getwin.3x			getwin.3ncurses
+halfdelay.3x			halfdelay.3ncurses
 has_key.3x			has_key.3ncurses
 idcok.3x			idcok.3ncurses
 idlok.3x			idlok.3ncurses
@@ -218,11 +222,15 @@ mvwin.3x			mvwin.3ncurses
 newpad.3x			newpad.3ncurses
 newterm.3x			newterm.3ncurses
 newwin.3x			newwin.3ncurses
+nl.3x				nl.3ncurses
+nocbreak.3x			nocbreak.3ncurses
 nodelay.3x			nodelay.3ncurses
+nonl.3x				nonl.3ncurses
 notimeout.3x			notimeout.3ncurses
 pnoutrefresh.3x			pnoutrefresh.3ncurses
 prefresh.3x			prefresh.3ncurses
 putwin.3x			putwin.3ncurses
+raw.3x				raw.3ncurses
 refresh.3x			refresh.3ncurses
 reset_shell_mode.3x		reset_shell_mode.3ncurses
 restartterm.3x			restartterm.3ncurses
@@ -257,9 +265,13 @@ wattr_set.3x			wattr_set.3ncurses
 wattrset.3x			wattrset.3ncurses
 wbkgdset.3x			wbkgdset.3ncurses
 wbkgrndset.3x			wbkgrndset.3ncurses
+wdelch.3x			wdelch.3ncurses
+wecho_wchar.3x			wecho_wchar.3ncurses
+wechochar.3x			wechochar.3ncurses
 wget_wch.3x			wget_wch.3ncurses
 wgetch.3x			wgetch.3ncurses
 wgetstr.3x			wgetstr.3ncurses
+winch.3x			winch.3ncurses
 wins_wch.3x			wins_wch.3ncurses
 winsch.3x			winsch.3ncurses
 wmove.3x			wmove.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 6a538f10c..8f9e3d147 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.33 2024/02/24 20:02:49 tom Exp $
+# $Id: manhtml.aliases,v 1.34 2024/03/23 21:10:33 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -37,7 +37,9 @@ attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
 bkgd(3X)		curs_bkgd(3X)
 bkgrnd(3X)		curs_bkgrnd(3X)
+cbreak(3X)		curs_inopts(3X)
 clearok(3X)		curs_outopts(3X)
+clrtoeol(3X)		curs_clear(3X)
 curs_set(3X)		curs_kernel(3X)
 curscr(3X)		curs_variables(3X)
 def_prog_mode(3X)	curs_kernel(3X)
@@ -46,6 +48,7 @@ del_curterm(3X)		curs_terminfo(3X)
 delay_output(3X)	curs_util(3X)
 delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
+echo(3X)		curs_inopts(3X)
 endwin(3X)		curs_initscr(3X)
 extended_slk_color(3X)	curs_slk(3X)
 filter(3X)		curs_util(3X)
@@ -54,6 +57,7 @@ get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
 getwin(3X)		curs_util(3X)
+halfdelay(3X)		curs_inopts(3X)
 has_key(3X)		curs_getch(3X)
 immedok(3X)		curs_outopts(3X)
 in_wch(3X)		curs_in_wch(3X)
@@ -70,9 +74,13 @@ mvcur(3X)		curs_terminfo(3X)
 mvwin(3X)		curs_window(3X)
 newterm(3X)		curs_initscr(3X)
 newwin(3X)		curs_window(3X)
+nl(3X)			curs_inopts(3X)
+nocbreak(3X)		curs_inopts(3X)
+nonl(3X)		curs_inopts(3X)
 pnoutrefresh(3X)	curs_pad(3X)
 prefresh(3X)		curs_pad(3X)
 putwin(3X)		curs_util(3X)
+raw(3X)			curs_inopts(3X)
 refresh(3X)		curs_refresh(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
@@ -104,9 +112,13 @@ wattr_set(3X)		curs_attr(3X)
 wattrset(3X)		curs_attr(3X)
 wbkgdset(3X)		curs_bkgd(3X)
 wbkgrndset(3X)		curs_bkgrnd(3X)
+wdelch(3X)		curs_delch(3X)
+wecho_wchar(3X)		curs_add_wch(3X)
+wechochar(3X)		curs_addch(3X)
 wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
 wgetstr(3X)		curs_getstr(3X)
+winch(3X)		curs_inch(3X)
 wins_wch(3X)		curs_ins_wch(3X)
 winsch(3X)		curs_insch(3X)
 wmove(3X)		curs_move(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 7043c3188..91ee6f53c 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.21 2024/01/13 22:54:54 tom Exp $
+# $Id: manhtml.externs,v 1.22 2024/03/16 20:46:05 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -30,6 +30,7 @@
 #***************************************************************************
 COLOR_PAIR(1)
 COLOR_PAIR(2)
+ascii(7)
 atoi(3)
 bash(1)
 conflict(1)
diff --git a/man/menu.3x b/man/menu.3x
index 57dae6656..a833c3b55 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.43 2023/12/23 16:08:25 tom Exp $
-.TH menu 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: menu.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
+.TH menu 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 397a72bf5..7bce42d24 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH menu_attributes 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_attributes.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH menu_attributes 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 5319e08c4..d92d8c3ad 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.28 2023/11/25 13:58:47 tom Exp $
-.TH menu_cursor 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_cursor.3x,v 1.30 2024/03/16 15:35:01 tom Exp $
+.TH menu_cursor 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBpos_menu_cursor\fP \-
 position a menu's cursor
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 3204d1f5f..6a1172837 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.45 2023/12/23 16:08:25 tom Exp $
-.TH menu_driver 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: menu_driver.3x,v 1.47 2024/03/16 15:35:01 tom Exp $
+.TH menu_driver 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/menu_format.3x b/man/menu_format.3x
index 8372b18d3..9781878f7 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH menu_format 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_format.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH menu_format 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_format\fP,
 \fBmenu_format\fP \-
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index a2d23526a..839e199b8 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH menu_hook 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH menu_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 6c6d1cdfa..43409fef8 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH menu_items 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH menu_items 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index bcdf33405..e3f3a9286 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH menu_mark 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH menu_mark 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \-
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 30bd686d2..1a133745a 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH menu_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH menu_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \-
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index ad7a392cb..ad7fe97f3 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.33 2023/11/25 13:58:47 tom Exp $
-.TH menu_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_opts.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+.TH menu_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index 2b00fb774..a66a368dd 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.36 2023/11/25 13:58:47 tom Exp $
-.TH menu_pattern 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+.TH menu_pattern 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \-
diff --git a/man/menu_post.3x b/man/menu_post.3x
index d33a98c37..4a0827a16 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH menu_post 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_post.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH menu_post 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBpost_menu\fP,
 \fBunpost_menu\fP \-
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 56105ea17..a0363fb28 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.31 2023/12/16 20:32:22 tom Exp $
-.TH menu_requestname 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+.TH menu_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 94eab4245..d15e77d54 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.35 2023/12/16 20:32:22 tom Exp $
-.TH menu_spacing 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+.TH menu_spacing 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 52efb3349..292bbd6b8 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
-.TH menu_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+.TH menu_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \-
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 71798787c..36f6129dc 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH menu_win 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH menu_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 59f77b1ba..42d36c397 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.35 2023/11/25 13:58:47 tom Exp $
-.TH mitem_current 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+.TH mitem_current 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index fe1b90cf8..3606bb5d2 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.29 2023/11/25 13:58:47 tom Exp $
-.TH mitem_name 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp $
+.TH mitem_name 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \-
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index f93ef3a1d..66bd29bce 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.34 2023/11/25 13:58:47 tom Exp $
-.TH mitem_new 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH mitem_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \-
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 0c14c252f..5a86516f5 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.31 2023/11/25 13:58:47 tom Exp $
-.TH mitem_opts 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+.TH mitem_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index d1a2530d4..f0eab8bd8 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.32 2023/11/25 13:58:47 tom Exp $
-.TH mitem_userptr 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+.TH mitem_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \-
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 8bec8644a..daa383dae 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.30 2023/11/25 13:58:47 tom Exp $
-.TH mitem_value 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_value.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+.TH mitem_value 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_item_value\fP,
 \fBitem_value\fP \-
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 98f924afd..c28c603fa 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998,2010 Free Software Foundation, Inc.                       *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_visible.3x,v 1.25 2023/11/25 14:18:16 tom Exp $
-.TH mitem_visible 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: mitem_visible.3x,v 1.27 2024/03/16 15:35:01 tom Exp $
+.TH mitem_visible 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBitem_visible\fP \-
 check visibility of a menu item
diff --git a/man/ncurses.3x b/man/ncurses.3x
index cced2bcab..0dd20c793 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.200 2024/02/24 20:03:50 tom Exp $
-.TH ncurses 3X 2024-02-24 "ncurses 6.4" "Library calls"
+.\" $Id: ncurses.3x,v 1.204 2024/03/23 20:42:29 tom Exp $
+.TH ncurses 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -55,20 +55,49 @@ character-cell terminal interface with optimized output
 \fB#include <curses.h>
 .fi
 .SH DESCRIPTION
-The \fI\%ncurses\fP library routines give the user a
-terminal-independent method of updating character screens with
-reasonable optimization.
-This implementation is \*(``new curses\*('' (\fI\%ncurses\fP) and
-is the approved replacement for
-4.4BSD classic curses, which has been discontinued.
+The \*(``new curses\*('' library offers the programmer a
+terminal-independent means of reading keyboard and mouse input and
+updating character-cell terminals with output optimized to minimize
+screen updates.
+.I \%ncurses
+replaces the
+.I curses
+libraries from
+System V Release 4 Unix (\*(``SVr4\*('')
+and
+4.4BSD Unix,
+the development of which ceased in the 1990s.
 This describes \fI\%ncurses\fP
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .PP
-The \fI\%ncurses\fP library emulates the curses library of
-System V Release 4 Unix (\*(``SVr4\*(''),
-and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
-XSI stands for X/Open System Interfaces Extension.
-The \fI\%ncurses\fP library is freely redistributable in source form.
+.I \%ncurses
+permits control of the terminal screen's contents;
+abstraction and subdivision thereof with
+.I windows
+and
+.IR pads ;
+the reading of terminal input;
+control of terminal input and output options;
+environment query routines;
+color manipulation;
+the definition and use of
+.I "soft label"
+keys;
+.I \%term\%info
+capabilities;
+a
+.I \%term\%cap
+compatibility interface;
+and access to low-level terminal-manipulation routines.
+.PP
+.I \%ncurses
+implements the standard interface described by
+X/Open Curses Issue\ 7.
+In many behavioral details not standardized by X/Open,
+.I \%ncurses
+emulates the
+.I curses
+library of SVr4 and provides numerous useful extensions.
 .PP
 \fI\%ncurses\fP man pages employ several sections to clarify matters of
 usage and interoperability with other \fIcurses\fP implementations.
@@ -107,12 +136,6 @@ The ncurses_g library generates trace logs
 (in a file called \*(``trace\*('' in the current directory)
 that describe curses actions.
 See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
-.PP
-The \fI\%ncurses\fP package supports: overall screen, window and pad
-manipulation; output to windows and pads; reading terminal input; control over
-terminal and \fBcurses\fP input and output options; environment query
-routines; color manipulation; use of soft label keys; terminfo capabilities;
-and access to low-level terminal-manipulation routines.
 .SS Initialization
 The library uses the locale which the calling program has initialized.
 That is normally done with \fBsetlocale\fP(3):
@@ -205,7 +228,7 @@ window-addressing functions feature names prefixed
 see below)
 with \*(``w\*('';
 these allow the user to specify a pointer to a
-.I \%WINDOW.
+.IR \%WINDOW .
 Counterparts not thus prefixed
 (or infixed)
 affect \fB\%stdscr\fP.
@@ -360,7 +383,7 @@ It stores a character combined with attributes in a
 .I \%chtype
 datum,
 which is often an alias of
-.I int.
+.IR int .
 .IP
 Attributes alone
 (with no corresponding character)
@@ -375,7 +398,7 @@ they are represented as an integral bit mask.
 Each cell of a
 .I \%WINDOW
 is stored as a
-.I \%chtype.
+.IR \%chtype .
 .TP 10
 .I \%ncursesw
 is the library in its \*(``wide\*('' configuration,
@@ -391,27 +414,27 @@ characters.
 .TP 9 \" "cchar_t" + 2n
 .I \%cchar_t
 corresponds to the non-wide configuration's
-.I \%chtype.
+.IR \%chtype .
 It always a structure type,
 because it stores more data than fits into an integral type.
 A character code may not be representable as a
-.I \%char,
+.IR \%char ,
 and moreover more than one character may occupy a cell
 (as with accent marks and other diacritics).
 Each character is of type
-.I \%wchar_t;
+.IR \%wchar_t ;
 a complex character contains one spacing character and zero or more
 non-spacing characters
 (see below).
 Attributes and color data are stored in separate fields of the
 structure,
 not combined as in
-.I \%chtype.
+.IR \%chtype .
 .PP
 Each cell of a
 .I \%WINDOW
 is stored as a
-.I \%cchar_t.
+.IR \%cchar_t .
 .PP
 The \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
 functions store and retrieve the data from a
@@ -424,16 +447,16 @@ depends on two data types standardized by ISO C95.
 .I \%wchar_t
 stores a wide character.
 Like
-.I \%chtype,
+.IR \%chtype ,
 it may be an alias of
-.I int.
+.IR int .
 Depending on the character encoding,
 a wide character may be
-.I spacing,
+.IR spacing ,
 meaning that it occupies a character cell by itself and typically
 accompanies cursor advancement,
 or
-.I non-spacing,
+.IR non-spacing ,
 meaning that it occupies the same cell as a spacing character,
 is often regarded as a \*(``modifier\*('' of the base glyph with which
 it combines,
@@ -1211,7 +1234,7 @@ For example
 # VT100 shift\-in/shift\-out, with corresponding font.
 linux\-vt100|linux console with VT100 line\-graphics,
         U8#0, use=linux,
-
+\&
 # uxterm with vt100Graphics resource set to false
 xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
         U8#1, use=xterm,
@@ -1395,7 +1418,7 @@ Run the script with the
 option to peruse them all.
 A few are of particular significance to the application developer
 employing
-.I \%ncurses.
+.IR \%ncurses .
 .TP 5
 \-\-disable\-overwrite
 The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP:
@@ -1569,13 +1592,13 @@ inclusion of \fI\%curses.h\fP.
 .I \%ncurses
 enables an application to capture mouse events on certain terminals,
 including
-.I \%xterm;
+.IR \%xterm ;
 see \fB\%curs_mouse\fP(3X).
 .PP
 .I \%ncurses
 provides a means of responding to window resizing events,
 as when running in a GUI terminal emulator application such as
-.I \%xterm;
+.IR \%xterm ;
 see \fB\%resizeterm\fP(3X) and \fB\%wresize\fP(3X).
 .PP
 .I \%ncurses
@@ -1642,7 +1665,7 @@ causes the library to fall back to reading
 if the terminal setup code cannot find a
 .I \%term\%info
 entry corresponding to
-.I TERM.
+.IR TERM .
 Use of this feature is not recommended,
 as it essentially includes an entire
 .I termcap
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 6aa948f77..5e844bf8f 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.44 2023/12/16 20:32:22 tom Exp $
-.TH new_pair 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+.TH new_pair 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/panel.3x b/man/panel.3x
index 9f4bf26f8..c63b43156 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.61 2023/12/23 16:22:25 tom Exp $
-.TH panel 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: panel.3x,v 1.63 2024/03/16 15:35:01 tom Exp $
+.TH panel 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 9611be60a..5e23d9fb3 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.54 2023/12/16 20:32:22 tom Exp $
-.TH resizeterm 3X 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
+.TH resizeterm 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 505fca52c..95b2142ee 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.42 2023/12/30 22:06:36 tom Exp $
-.TH scr_dump 5 2023-12-30 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.46 2024/03/23 20:42:29 tom Exp $
+.TH scr_dump 5 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -236,12 +236,12 @@ As noted above,
 Solaris
 .I curses
 has no magic number corresponding to SVr4
-.I curses.
+.IR curses .
 This is odd,
 since Solaris was the first operating system to meet the SVr4
 guidelines.
 Solaris furthermore supplies two versions of
-.I curses.
+.IR curses .
 .bP
 The default
 .I curses
@@ -253,7 +253,7 @@ library
 (which we term
 .I \%xcurses),
 available in
-.I /usr/xpg4,
+.IR /usr/xpg4 ,
 uses a textual format with no magic number.
 .IP
 According to its copyright notice,
diff --git a/man/tabs.1 b/man/tabs.1
index 3e683d684..e942125b1 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.55 2024/01/20 16:54:03 tom Exp $
-.TH @TABS@ 1 2024-01-20 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.57 2024/03/16 15:35:01 tom Exp $
+.TH @TABS@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/term.5 b/man/term.5
index ebd929aa7..3527c3cac 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.73 2024/01/13 22:05:39 tom Exp $
-.TH term 5 2024-01-13 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.75 2024/03/16 15:35:01 tom Exp $
+.TH term 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/term.7 b/man/term.7
index 503bd7810..84d100d84 100644
--- a/man/term.7
+++ b/man/term.7
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.46 2023/12/02 20:51:25 tom Exp $
-.TH term 7 2023-12-02 "ncurses 6.4" Miscellaneous
+.\" $Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp $
+.TH term 7 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/term_variables.3x b/man/term_variables.3x
index b256f8991..6aee63f48 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.34 2023/12/23 16:08:25 tom Exp $
-.TH term_variables 3X 2023-12-23 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH term_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/tic.1m b/man/tic.1m
index b14768235..f949e5a68 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.106 2023/12/30 21:36:32 tom Exp $
-.TH @TIC@ 1M 2023-12-30 "ncurses 6.4" "User commands"
+.\" $Id: tic.1m,v 1.108 2024/03/16 15:35:01 tom Exp $
+.TH @TIC@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/toe.1m b/man/toe.1m
index 26383553f..ab8e73403 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.64 2024/01/20 16:51:21 tom Exp $
-.TH @TOE@ 1M 2024-01-20 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.66 2024/03/16 15:35:01 tom Exp $
+.TH @TOE@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/tput.1 b/man/tput.1
index b4ea45925..01b68d1fe 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp $
-.TH @TPUT@ 1 2024-01-20 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.109 2024/03/23 20:42:29 tom Exp $
+.TH @TPUT@ 1 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,7 +79,7 @@ Terminal capabilities are accessed by
 .PP
 \fB\%terminfo\fP(5) discusses terminal capabilities at length
 and presents a complete list of
-.I cap-codes.
+.IR cap-codes .
 .PP
 When retrieving capability values,
 the result depends upon the capability's type.
@@ -88,7 +88,7 @@ Boolean
 \fB\%@TPUT@\fP sets its exit status to
 .B 0
 if the terminal possesses
-.I cap-code,
+.IR cap-code ,
 and
 .B 1
 if it does not.
@@ -114,7 +114,7 @@ see section \*(``EXIT STATUS\*('' below.
 .SS Operands
 Generally,
 an operand is a
-.I cap-code,
+.IR cap-code ,
 a capability code from the terminal database,
 or a parameter thereto.
 Three others are specially recognized by \fB\%@TPUT@\fP:
@@ -319,7 +319,7 @@ Finally,
 it inspects the environment variables
 .I LINES
 and
-.I \%COLUMNS,
+.IR \%COLUMNS ,
 which may override the terminal size.
 .PP
 If the
@@ -357,7 +357,7 @@ and whether to use \fB\%tparm\fP(3X).
 .TP
 .BI \-T\  type
 indicates the terminal's
-.I type.
+.IR type .
 Normally this option is unnecessary,
 because a default is taken from the
 .I TERM
@@ -514,7 +514,7 @@ to port NetBSD's
 .IR termcap -based
 .B tput
 to
-.I \%term\%info,
+.IR \%term\%info ,
 and modified it to interpret multiple
 .I cap-codes
 (and parameters)
@@ -556,7 +556,7 @@ to
 but
 .B \%parm_delete_line
 to
-.I \%term\%info.
+.IR \%term\%info .
 .I termcap
 uses the code
 .B DL
@@ -578,7 +578,7 @@ to
 but
 .B \%clr_eos
 to
-.I \%term\%info.
+.IR \%term\%info .
 .I termcap
 uses the code
 .B cd
@@ -623,7 +623,7 @@ A few observations of interest arise from that selection.
 supports
 .B clear
 as it does any other standard
-.I cap-code.
+.IR cap-code .
 The others
 .RB ( init
 and
@@ -693,13 +693,13 @@ X/Open Curses and the terminal capability database.
 While it is certainly possible to write a
 .B tput
 program without using
-.I curses,
+.IR curses ,
 no system with a
 .I curses
 implementation provides a
 .B tput
 utility that does not also support standard
-.I cap-codes.
+.IR cap-codes .
 .PP
 X/Open Curses Issue 7 (2009) is the first version to document utilities.
 However that part of X/Open Curses does not follow existing practice
@@ -729,7 +729,7 @@ The various System\ V implementations
 HP-UX,
 Solaris)
 use the same exit statuses as
-.I \%ncurses.
+.IR \%ncurses .
 .PP
 NetBSD
 .I curses
diff --git a/man/tset.1 b/man/tset.1
index cf76c26e8..14bcb16e2 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.79 2023/12/23 16:20:07 tom Exp $
-.TH @TSET@ 1 2023-12-23 "ncurses 6.4" "User commands"
+.\" $Id: tset.1,v 1.81 2024/03/16 15:35:01 tom Exp $
+.TH @TSET@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/user_caps.5 b/man/user_caps.5
index 1b434c7c3..219bbf5f9 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.47 2024/01/13 22:05:39 tom Exp $
-.TH user_caps 5 2024-01-13 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp $
+.TH user_caps 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/wresize.3x b/man/wresize.3x
index 6990a38c1..b67feada0 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.34 2023/11/25 14:26:30 tom Exp $
-.TH wresize 3X 2023-11-25 "ncurses 6.4" "Library calls"
+.\" $Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+.TH wresize 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index f50c1cf16..e62aad794 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.232 2024/03/02 19:42:13 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.233 2024/03/16 23:39:28 tom Exp $")
 
 /****************************************************************************
  *
@@ -332,7 +332,9 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 	int y, x;
 	char buf[20];
 	char *s;
-	char ignore;
+	char cc;
+	const char *skipped;
+	int scanned;
 
 	s = memset(buf, '\0', sizeof(buf));
 	do {
@@ -343,15 +345,19 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 	    s += got;
 	    *s = '\0';
 	} while (strchr(buf, 'R') == NULL && (size_t) (s + 1 - buf) < sizeof(buf));
-	T(("response %s", _nc_visbuf(buf)));
-	if (sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &ignore) != 2
-	    || (ignore != 'R' && ignore != ';')) {
+	T(("CPR response %s", _nc_visbuf(buf)));
+	skipped = skip_csi(buf);
+	cc = '\0';
+	if (skipped != buf
+	    && *skipped != '\0'
+	    && (scanned = sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc)) == 3
+	    && (cc == 'R')) {
 	    *row = y;
 	    *col = x;
 	    result = TRUE;
 	}
     }
-    T(("get_position %d,%d", *row, *col));
+    T(("get_position %s %d,%d", result ? "OK" : "ERR", *row, *col));
     return result;
 }
 
@@ -371,23 +377,40 @@ set_position(TERMINAL *termp, int fd, int row, int col)
 
 /*
  * This is a little more complicated than one might expect, because we do this
- * before setting up the terminal modes, etc.
+ * before setting up the terminal modes, etc., and cannot use the timeout or
+ * buffering functions.
+ *
+ * We check if the terminal description has the ECMA-48 CPR (cursor position
+ * report) in u7 and the response in u6.  The two variations of is_expected()
+ * cover the termcap style and terminfo style, and are equivalent as far as we
+ * are concerned.  For analyzing the response, we wait (a short time) for 'R'
+ * to be echoed, and then check if we received two integers in the response.
+ *
+ * In principle, this could run on "any" ECMA-48 terminal, but in practice,
+ * there is a scenario using GNU screen where it uses ncurses with a partially
+ * configured pseudo-terminal, and the CPR response goes to the wrong place.
+ * So we do a simple check to exclude pseudo-terminals.
  */
 static void
 _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
 {
-    int fd = fileno(stderr);
+    int fd = termp->Filedes;
     TTY saved;
+    const char *name;
 
     if (NC_ISATTY(fd)
+	&& (name = ttyname(fd)) != NULL
+	&& strncmp(name, "/dev/pts/", 9)
 	&& VALID_STRING(cursor_address)
 	&& is_expected(user7, "6n")
-	&& is_expected(user6, "%i%d;%dR")
+	&& (is_expected(user6, "%i%d;%dR") ||
+	    is_expected(user6, "%i%p1%d;%p2%dR"))
 	&& GET_TTY(fd, &saved) == OK) {
 	int current_y = -1, current_x = -1;
 	int updated_y = -1, updated_x = -1;
 	TTY alter = saved;
 
+	T(("checking screensize of %s", name));
 	alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN);
 	alter.c_iflag &= (unsigned) ~(IXON | BRKINT | PARMRK);
 	alter.c_cc[VMIN] = 0;
@@ -445,6 +468,7 @@ _nc_get_screensize(SCREEN *sp,
     bool useEnv = _nc_prescreen.use_env;
     bool useTioctl = _nc_prescreen.use_tioctl;
 
+    T((T_CALLED("_nc_get_screensize (%p)"), sp));
 #ifdef EXP_WIN32_DRIVER
     /* If we are here, then Windows console is used in terminfo mode.
        We need to figure out the size using the console API
@@ -466,6 +490,7 @@ _nc_get_screensize(SCREEN *sp,
     }
 #endif
 
+    T(("useEnv:%d useTioctl:%d", useEnv, useTioctl));
     if (useEnv || useTioctl) {
 #ifdef __EMX__
 	{
@@ -565,6 +590,7 @@ _nc_get_screensize(SCREEN *sp,
     TABSIZE = my_tabsize;
 #endif
     T(("TABSIZE = %d", TABSIZE));
+    returnVoid;
 #endif /* USE_TERM_DRIVER */
 }
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9bdf93892..0fef8b24f 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240309) unstable; urgency=low
+ncurses6 (6.4+20240323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9bdf93892..0fef8b24f 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240309) unstable; urgency=low
+ncurses6 (6.4+20240323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 7343f67d2..c47010897 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240309) unstable; urgency=low
+ncurses6 (6.4+20240323) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2024 08:05:08 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 317763812..70a09a759 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.636 2024/03/09 13:05:08 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.638 2024/03/23 10:33:40 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0309"
+!define VERSION_MMDD  "0323"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 22d7abf6d..6233693ce 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240309
+Release: 20240323
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2203a0776..803fa5639 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240309
+Release: 20240323
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 5b35f300c..2a540270f 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240309
+Release: 20240323
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tset.c b/progs/tset.c
index 0ba522cbc..5255ef476 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.131 2021/12/04 23:02:13 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.132 2024/03/17 00:15:54 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -878,9 +878,15 @@ main(int argc, char **argv)
 
 	    if (!noinit) {
 		if (send_init_strings(my_fd, &oldmode)) {
+		    const char *name;
+
 		    (void) putc('\r', stderr);
 		    (void) fflush(stderr);
-		    (void) napms(1000);		/* Settle the terminal. */
+		    if (isatty(my_fd)
+			&& (name = ttyname(my_fd)) != NULL
+			&& strncmp(name, "/dev/pts/", 9)) {
+			(void) napms(1000);	/* Settle the terminal. */
+		    }
 		}
 	    }
 

From 85b1d477a55e3d57d1496fef740aaecb973d9a42 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 31 Mar 2024 00:47:54 +0100
Subject: [PATCH 059/106] ncurses-6.4-20240330.patch

---
 Ada95/aclocal.m4                           |   12 +-
 Ada95/configure                            |    8 +-
 Ada95/gen/terminal_interface-curses.adb.m4 |    8 +-
 Ada95/samples/ncurses2-overlap_test.adb    |   10 +-
 NEWS                                       |   10 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   17 +-
 configure                                  | 2503 ++++++++++----------
 dist.mk                                    |    4 +-
 ncurses/tinfo/lib_raw.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 +-
 package/ncursest.spec                      |    2 +-
 test/configure                             |  981 ++++----
 test/configure.in                          |    5 +-
 test/test_mouse.c                          |  177 +-
 20 files changed, 1883 insertions(+), 1881 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 2ca7a95f8..6fe1f946e 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.209 2024/01/19 18:06:12 tom Exp $
+dnl $Id: aclocal.m4,v 1.210 2024/03/30 22:17:13 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3983,7 +3983,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 109 updated: 2023/12/03 09:21:34
+dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4443,11 +4443,11 @@ CF_EOF
 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
 		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
 		if test "$DFT_LWR_MODEL" = "shared" ; then
-			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+			LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}"
 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
 		fi
 		if test "$cf_cv_enable_rpath" = yes ; then
-			EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+			EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS"
 		fi
 		CF_SHARED_SONAME
 		if test "$GCC" != yes; then
@@ -4459,9 +4459,9 @@ CF_EOF
 			done
 			CFLAGS="$cf_save_CFLAGS"
 			CC_SHARED_OPTS=$cf_shared_opts
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
 		else
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
 		fi
 		;;
 	(sysv5uw7*|unix_sv*)
diff --git a/Ada95/configure b/Ada95/configure
index 80aa515ed..8c01a2936 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -12274,11 +12274,11 @@ CF_EOF
 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
 		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
 		if test "$DFT_LWR_MODEL" = "shared" ; then
-			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+			LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}"
 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
 		fi
 		if test "$cf_cv_enable_rpath" = yes ; then
-			EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+			EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS"
 		fi
 
 	test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -12326,9 +12326,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			done
 			CFLAGS="$cf_save_CFLAGS"
 			CC_SHARED_OPTS=$cf_shared_opts
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@'
 		else
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@'
 		fi
 		;;
 	(sysv5uw7*|unix_sv*)
diff --git a/Ada95/gen/terminal_interface-curses.adb.m4 b/Ada95/gen/terminal_interface-curses.adb.m4
index 3f34d203d..c966f9b98 100644
--- a/Ada95/gen/terminal_interface-curses.adb.m4
+++ b/Ada95/gen/terminal_interface-curses.adb.m4
@@ -9,7 +9,7 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2018-2020,2024 Thomas E. Dickey                                --
 -- Copyright 2007-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -38,8 +38,8 @@ include(M4MACRO)----------------------------------------------------------------
 ------------------------------------------------------------------------------
 --  Author: Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.16 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.17 $
+--  $Date: 2024/03/30 13:24:07 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
@@ -564,7 +564,7 @@ package body Terminal_Interface.Curses is
       L : constant Special_Key_Code  := Special_Key_Code (Natural (Key_F0) +
         Natural (Function_Key_Number'Last));
    begin
-      if (Key >= Key_F0) and then (Key <= L) then
+      if Key >= Key_F0 and then Key <= L then
          return True;
       else
          return False;
diff --git a/Ada95/samples/ncurses2-overlap_test.adb b/Ada95/samples/ncurses2-overlap_test.adb
index c0fd6209b..6f3341ba2 100644
--- a/Ada95/samples/ncurses2-overlap_test.adb
+++ b/Ada95/samples/ncurses2-overlap_test.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020,2021 Thomas E. Dickey                                     --
+-- Copyright 2020-2021,2024 Thomas E. Dickey                                --
 -- Copyright 2000-2014,2015 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.9 $
---  $Date: 2021/09/04 10:52:55 $
+--  $Revision: 1.10 $
+--  $Date: 2024/03/30 13:21:15 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
@@ -73,8 +73,8 @@ procedure ncurses2.overlap_test is
       Get_Size (win, y1, x1);
       for y in 0 .. y1 - 1 loop
          for x in 0 .. x1 - 1 loop
-            if ((x > (x1 - 1) / 3) and (x <= (2 * (x1 - 1)) / 3)) or
-               (((y > (y1 - 1) / 3) and (y <= (2 * (y1 - 1)) / 3)))
+            if (x > (x1 - 1) / 3 and x <= (2 * (x1 - 1)) / 3) or
+               (y > (y1 - 1) / 3 and y <= (2 * (y1 - 1)) / 3)
             then
                Move_Cursor (win, y, x);
                Add (win, Ch => ch);
diff --git a/NEWS b/NEWS
index ffa3b362b..619e9ea05 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4097 2024/03/23 10:33:40 tom Exp $
+-- $Id: NEWS,v 1.4101 2024/03/30 23:44:22 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240330
+	+ remove masking of ISIG in cbreak() (report by Benno Schulenberg).
+	+ modify test/test_mouse.c to use curses api for raw/noraw.
+	> improved configure macros from other program development:
+	  + build-fix for clang on Solaris
+	  + suppress filename/timestamp in gzip'd manpages (suggested for
+	    byacc by Andrin Geiger)
+
 20240323
 	+ modify tput/tset reset feature to avoid 1-second sleep if running in
 	  a pseudo-terminal.
diff --git a/VERSION b/VERSION
index bd59079dd..72196423c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240323
+5:0:10	6.4	20240330
diff --git a/aclocal.m4 b/aclocal.m4
index 8335b4fd9..1c2b788bf 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1065 2024/03/12 23:45:44 tom Exp $
+dnl $Id: aclocal.m4,v 1.1069 2024/03/30 22:15:45 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5681,7 +5681,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02
+dnl CF_MANPAGE_FORMAT version: 19 updated: 2024/03/30 08:27:40
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
@@ -5799,6 +5799,7 @@ cf_manpage_format=no
 cf_manpage_inboth=no
 cf_manpage_so_strip=
 cf_manpage_compress=
+cf_manpage_coptions=
 
 for cf_item in $MANPAGE_FORMAT
 do
@@ -5818,6 +5819,7 @@ case "$cf_item" in
 (gzip)
 	cf_manpage_so_strip="gz"
 	cf_manpage_compress=gzip
+	cf_manpage_coptions=-n
 	;;
 (bzip2)
 	cf_manpage_so_strip="bz2"
@@ -5834,6 +5836,7 @@ AC_SUBST(cf_manpage_format)
 AC_SUBST(cf_manpage_inboth)
 AC_SUBST(cf_manpage_so_strip)
 AC_SUBST(cf_manpage_compress)
+AC_SUBST(cf_manpage_coptions)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -5963,7 +5966,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 58 updated: 2023/07/28 20:13:29
+dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -6237,7 +6240,7 @@ CF_EOF
 if test -n "$cf_manpage_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 						if test -n "$cf_manpage_so_strip" ; then
-							"$cf_manpage_compress" -f \$TMP
+							"$cf_manpage_compress" $cf_manpage_coptions -f \$TMP
 							mv \$TMP.$cf_manpage_so_strip \$TMP
 						fi
 CF_EOF
@@ -7420,7 +7423,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 110 updated: 2024/03/12 19:44:02
+dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -7896,9 +7899,9 @@ CF_EOF
 			done
 			CFLAGS="$cf_save_CFLAGS"
 			CC_SHARED_OPTS=$cf_shared_opts
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
 		else
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
 		fi
 		;;
 	(sysv5uw7*|unix_sv*)
diff --git a/configure b/configure
index 097331866..e3486ba79 100755
--- a/configure
+++ b/configure
@@ -7122,9 +7122,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			done
 			CFLAGS="$cf_save_CFLAGS"
 			CC_SHARED_OPTS=$cf_shared_opts
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@'
 		else
-			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+			MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@'
 		fi
 		;;
 	(sysv5uw7*|unix_sv*)
@@ -15032,6 +15032,7 @@ cf_manpage_format=no
 cf_manpage_inboth=no
 cf_manpage_so_strip=
 cf_manpage_compress=
+cf_manpage_coptions=
 
 for cf_item in $MANPAGE_FORMAT
 do
@@ -15051,6 +15052,7 @@ case "$cf_item" in
 (gzip)
 	cf_manpage_so_strip="gz"
 	cf_manpage_compress=gzip
+	cf_manpage_coptions=-n
 	;;
 (bzip2)
 	cf_manpage_so_strip="bz2"
@@ -15063,7 +15065,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15066: checking for manpage renaming" >&5
+echo "$as_me:15068: 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.
@@ -15092,15 +15094,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15095: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15097: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15100: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15102: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15103: checking if manpage aliases will be installed" >&5
+echo "$as_me:15105: 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.
@@ -15111,7 +15113,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15114: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15116: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15125,7 +15127,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15128: checking if manpage symlinks should be used" >&5
+echo "$as_me:15130: 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.
@@ -15138,17 +15140,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15141: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15143: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15147: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15149: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15151: checking for manpage tbl" >&5
+echo "$as_me:15153: 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.
@@ -15159,7 +15161,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15162: result: $MANPAGE_TBL" >&5
+echo "$as_me:15164: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15423,7 +15425,7 @@ CF_EOF
 if test -n "$cf_manpage_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 						if test -n "$cf_manpage_so_strip" ; then
-							"$cf_manpage_compress" -f \$TMP
+							"$cf_manpage_compress" $cf_manpage_coptions -f \$TMP
 							mv \$TMP.$cf_manpage_so_strip \$TMP
 						fi
 CF_EOF
@@ -15477,7 +15479,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15480: checking if you want to build with function extensions" >&5
+echo "$as_me:15482: 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.
@@ -15487,7 +15489,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15490: result: $with_ext_funcs" >&5
+echo "$as_me:15492: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15543,7 +15545,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15546: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15548: 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.
@@ -15553,7 +15555,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15556: result: $with_sp_funcs" >&5
+echo "$as_me:15558: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15572,7 +15574,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15575: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15577: 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.
@@ -15582,7 +15584,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15585: result: $with_term_driver" >&5
+echo "$as_me:15587: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15591,19 +15593,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15594: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15596: 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:15599: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15601: 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:15606: checking for extended use of const keyword" >&5
+echo "$as_me:15608: 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.
@@ -15613,7 +15615,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15616: result: $with_ext_const" >&5
+echo "$as_me:15618: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15621,7 +15623,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15624: checking if you want to use extended colors" >&5
+echo "$as_me:15626: 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.
@@ -15631,12 +15633,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15634: result: $with_ext_colors" >&5
+echo "$as_me:15636: 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:15639: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15641: 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)
@@ -15647,7 +15649,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15650: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15652: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15675,7 +15677,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15678: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15680: 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.
@@ -15685,7 +15687,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15688: result: $with_ext_mouse" >&5
+echo "$as_me:15690: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15695,7 +15697,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15698: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15700: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15712,7 +15714,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15715: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15717: 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.
@@ -15722,7 +15724,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15725: result: $with_ext_putwin" >&5
+echo "$as_me:15727: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15732,7 +15734,7 @@ EOF
 
 fi
 
-echo "$as_me:15735: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15737: 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.
@@ -15742,7 +15744,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15745: result: $with_no_padding" >&5
+echo "$as_me:15747: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15750,7 +15752,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15753: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15755: 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.
@@ -15760,7 +15762,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15763: result: $with_sigwinch" >&5
+echo "$as_me:15765: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -15775,7 +15777,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15778: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15780: 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.
@@ -15785,7 +15787,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15788: result: $with_tcap_names" >&5
+echo "$as_me:15790: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15799,7 +15801,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15802: checking if you want to link with the pthread library" >&5
+echo "$as_me:15804: 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.
@@ -15809,27 +15811,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15812: result: $with_pthread" >&5
+echo "$as_me:15814: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15816: checking for pthread.h" >&5
+	echo "$as_me:15818: 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 15822 "configure"
+#line 15824 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15826: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15828: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15832: \$? = $ac_status" >&5
+  echo "$as_me:15834: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15848,7 +15850,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15851: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15853: 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
 
@@ -15858,7 +15860,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15861: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15863: 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"
 
@@ -15879,7 +15881,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15882 "configure"
+#line 15884 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15896,16 +15898,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15902: \$? = $ac_status" >&5
+  echo "$as_me:15904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15908: \$? = $ac_status" >&5
+  echo "$as_me:15910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15915,7 +15917,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15918: result: $with_pthread" >&5
+	    echo "$as_me:15920: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15943,7 +15945,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15946: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15948: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15953,13 +15955,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15956: checking for pthread_kill" >&5
+	echo "$as_me:15958: 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 15962 "configure"
+#line 15964 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15990,16 +15992,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15996: \$? = $ac_status" >&5
+  echo "$as_me:15998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16002: \$? = $ac_status" >&5
+  echo "$as_me:16004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16009,11 +16011,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16012: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16014: 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:16016: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16018: 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.
@@ -16023,7 +16025,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16026: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16028: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16034,7 +16036,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16037: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16039: 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.
@@ -16044,18 +16046,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16047: result: $use_weak_symbols" >&5
+	echo "$as_me:16049: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16051: checking if $CC supports weak symbols" >&5
+echo "$as_me:16053: 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 16058 "configure"
+#line 16060 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16081,16 +16083,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16087: \$? = $ac_status" >&5
+  echo "$as_me:16089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16093: \$? = $ac_status" >&5
+  echo "$as_me:16095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16101,7 +16103,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16104: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16106: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16151,7 +16153,7 @@ fi
 # 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:16154: checking if you want reentrant code" >&5
+echo "$as_me:16156: 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.
@@ -16161,7 +16163,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16164: result: $with_reentrant" >&5
+echo "$as_me:16166: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16250,7 +16252,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16253: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16255: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16262,7 +16264,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16265: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16267: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16284,16 +16286,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16287: result: $enable_opaque_curses" >&5
+echo "$as_me:16289: 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:16292: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16294: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16296: checking whether form library structures should be opaque" >&5
+echo "$as_me:16298: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16303,10 +16305,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16306: result: $enable_opaque_form" >&5
+echo "$as_me:16308: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16309: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16311: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16316,10 +16318,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16319: result: $enable_opaque_menu" >&5
+echo "$as_me:16321: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16322: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16324: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16329,7 +16331,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=$cf_dft_opaque_curses
 fi;
-echo "$as_me:16332: result: $enable_opaque_panel" >&5
+echo "$as_me:16334: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16339,7 +16341,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16342: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16344: 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.
@@ -16349,7 +16351,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16352: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16354: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16362,7 +16364,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16365: checking if you want all development code" >&5
+echo "$as_me:16367: 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.
@@ -16372,11 +16374,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16375: result: $with_develop" >&5
+echo "$as_me:16377: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16379: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16381: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16386,7 +16388,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16389: result: $enable_check_size" >&5
+echo "$as_me:16391: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16394,7 +16396,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16397: checking if you want hard-tabs code" >&5
+echo "$as_me:16399: 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.
@@ -16404,7 +16406,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16407: result: $enable_hard_tabs" >&5
+echo "$as_me:16409: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16412,7 +16414,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16415: checking if you want limited support for xmc" >&5
+echo "$as_me:16417: 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.
@@ -16422,7 +16424,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16425: result: $enable_xmc_glitch" >&5
+echo "$as_me:16427: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16432,7 +16434,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16435: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16437: 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.
@@ -16442,7 +16444,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16445: result: $with_assumed_color" >&5
+echo "$as_me:16447: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16450,7 +16452,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16453: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16455: 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.
@@ -16460,7 +16462,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16463: result: $with_hashmap" >&5
+echo "$as_me:16465: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16468,7 +16470,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16471: checking if you want colorfgbg code" >&5
+echo "$as_me:16473: 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.
@@ -16478,7 +16480,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16481: result: $with_colorfgbg" >&5
+echo "$as_me:16483: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16486,7 +16488,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16489: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16491: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16496,14 +16498,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16499: result: $cf_with_fvisibility" >&5
+echo "$as_me:16501: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16506: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16508: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16512,7 +16514,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16515 "configure"
+#line 16517 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16528,16 +16530,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16534: \$? = $ac_status" >&5
+  echo "$as_me:16536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16540: \$? = $ac_status" >&5
+  echo "$as_me:16542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16549,7 +16551,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16552: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16554: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16664,7 +16666,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16667: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16669: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16673,7 +16675,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16676 "configure"
+#line 16678 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16689,16 +16691,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16695: \$? = $ac_status" >&5
+  echo "$as_me:16697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16701: \$? = $ac_status" >&5
+  echo "$as_me:16703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16710,7 +16712,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16713: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16715: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16833,7 +16835,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16836: checking if you want interop bindings" >&5
+echo "$as_me:16838: 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.
@@ -16843,13 +16845,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16846: result: $with_exp_interop" >&5
+echo "$as_me:16848: 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:16852: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16854: 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.
@@ -16859,13 +16861,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16862: result: $with_safe_sprintf" >&5
+echo "$as_me:16864: 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:16868: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16870: 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.
@@ -16875,7 +16877,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16878: result: $with_scroll_hints" >&5
+echo "$as_me:16880: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16884,7 +16886,7 @@ EOF
 
 fi
 
-echo "$as_me:16887: checking if you want wgetch-events code" >&5
+echo "$as_me:16889: 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.
@@ -16894,7 +16896,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16897: result: $with_wgetch_events" >&5
+echo "$as_me:16899: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16909,7 +16911,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16912: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16914: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16919,7 +16921,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16922: result: $with_exp_win32" >&5
+	echo "$as_me:16924: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16945,7 +16947,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16948: checking if you want to see long compiling messages" >&5
+echo "$as_me:16950: 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.
@@ -16979,7 +16981,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16982: result: $enableval" >&5
+echo "$as_me:16984: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16992,7 +16994,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16995: checking if you want to install stripped executables" >&5
+echo "$as_me:16997: 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.
@@ -17009,7 +17011,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17012: result: $enable_stripping" >&5
+echo "$as_me:17014: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17020,7 +17022,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17023: checking if install accepts -p option" >&5
+echo "$as_me:17025: 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
@@ -17051,10 +17053,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17054: result: $cf_cv_install_p" >&5
+echo "$as_me:17056: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17057: checking if install needs to be told about ownership" >&5
+echo "$as_me:17059: 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)
@@ -17065,7 +17067,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17068: result: $with_install_o" >&5
+echo "$as_me:17070: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17076,7 +17078,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17079: checking if you want to specify strip-program" >&5
+	echo "$as_me:17081: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17086,11 +17088,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17089: result: $with_strip_program" >&5
+	echo "$as_me:17091: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17093: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17095: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17111,11 +17113,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17114: result: $check_install_strip" >&5
+		echo "$as_me:17116: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17118: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17120: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17130,7 +17132,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17133: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17135: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17156,7 +17158,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17159: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17161: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17173,17 +17175,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17176: result: $enable_stdnoreturn" >&5
+echo "$as_me:17178: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17180: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17182: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17186 "configure"
+#line 17188 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17199,16 +17201,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17205: \$? = $ac_status" >&5
+  echo "$as_me:17207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17211: \$? = $ac_status" >&5
+  echo "$as_me:17213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17219,7 +17221,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17222: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17224: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17275,16 +17277,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17278: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17280: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17283: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17285: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17287: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17289: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17323,16 +17325,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17326: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17328: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17331: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17333: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17335: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17337: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17371,23 +17373,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17374: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17376: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17379: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17381: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17383: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17385: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17390: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17392: 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.
@@ -17404,7 +17406,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17407: result: $enable_warnings" >&5
+echo "$as_me:17409: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17428,7 +17430,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17431 "configure"
+#line 17433 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17443,26 +17445,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17449: \$? = $ac_status" >&5
+  echo "$as_me:17451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17455: \$? = $ac_status" >&5
+  echo "$as_me:17457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17458: checking for X11/Xt const-feature" >&5
+echo "$as_me:17460: 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 17465 "configure"
+#line 17467 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17480,16 +17482,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17486: \$? = $ac_status" >&5
+  echo "$as_me:17488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17492: \$? = $ac_status" >&5
+  echo "$as_me:17494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17504,7 +17506,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17507: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17509: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17533,7 +17535,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17536 "${as_me:-configure}"
+#line 17538 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17549,7 +17551,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17552: checking for $CC warning options..." >&5
+	{ echo "$as_me:17554: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17565,12 +17567,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17571: \$? = $ac_status" >&5
+  echo "$as_me:17573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17573: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17575: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17578,7 +17580,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17581: checking for $CC warning options..." >&5
+	{ echo "$as_me:17583: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17601,12 +17603,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17604: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17607: \$? = $ac_status" >&5
+  echo "$as_me:17609: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17609: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17611: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17614,7 +17616,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17617: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17619: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17624,7 +17626,7 @@ echo "${as_me:-configure}:17617: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17627: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17629: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17657,10 +17659,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17660: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17662: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17663 "${as_me:-configure}"
+#line 17665 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17710,12 +17712,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17713: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17716: \$? = $ac_status" >&5
+  echo "$as_me:17718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17718: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17720: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17787,12 +17789,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17790: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17792: 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 17795 "configure"
+#line 17797 "configure"
 #include "confdefs.h"
 
 int
@@ -17809,16 +17811,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17815: \$? = $ac_status" >&5
+  echo "$as_me:17817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17821: \$? = $ac_status" >&5
+  echo "$as_me:17823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17829,7 +17831,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17832: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17834: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17838,11 +17840,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17841: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17843: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17845 "configure"
+#line 17847 "configure"
 #include "confdefs.h"
 
 int
@@ -17859,16 +17861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17865: \$? = $ac_status" >&5
+  echo "$as_me:17867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17871: \$? = $ac_status" >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17878,7 +17880,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17881: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17883: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17887,30 +17889,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17890: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17892: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17897: checking version of $CC" >&5
+	echo "$as_me:17899: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17901: result: $CLANG_VERSION" >&5
+	echo "$as_me:17903: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17908: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17910: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17913 "configure"
+#line 17915 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17924,16 +17926,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17930: \$? = $ac_status" >&5
+  echo "$as_me:17932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17936: \$? = $ac_status" >&5
+  echo "$as_me:17938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17944,13 +17946,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17947: result: $cf_clang_optok" >&5
+		echo "$as_me:17949: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17953: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17955: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17967,7 +17969,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17970 "configure"
+#line 17972 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17985,7 +17987,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17988: checking for $CC warning options..." >&5
+	{ echo "$as_me:17990: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18002,12 +18004,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18005: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18008: \$? = $ac_status" >&5
+  echo "$as_me:18010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18010: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18012: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18016,7 +18018,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18019: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18021: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18046,16 +18048,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18049: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18052: \$? = $ac_status" >&5
+  echo "$as_me:18054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18054: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18056: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18058: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18060: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18073,7 +18075,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18076: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18078: 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.
@@ -18083,7 +18085,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18086: result: $enable_string_hacks" >&5
+echo "$as_me:18088: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18092,15 +18094,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18095: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18097: 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:18097: checking for strlcat" >&5
+	echo "$as_me:18099: 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 18103 "configure"
+#line 18105 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18131,16 +18133,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18137: \$? = $ac_status" >&5
+  echo "$as_me:18139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18143: \$? = $ac_status" >&5
+  echo "$as_me:18145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18150,7 +18152,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18153: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18155: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18160,7 +18162,7 @@ EOF
 
 else
 
-		echo "$as_me:18163: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18165: 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
@@ -18168,7 +18170,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18171 "configure"
+#line 18173 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18187,16 +18189,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18193: \$? = $ac_status" >&5
+  echo "$as_me:18195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18199: \$? = $ac_status" >&5
+  echo "$as_me:18201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18207,7 +18209,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18210: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18212: 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
 
@@ -18230,23 +18232,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18233: checking for $ac_header" >&5
+echo "$as_me:18235: 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 18239 "configure"
+#line 18241 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18243: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18245: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18249: \$? = $ac_status" >&5
+  echo "$as_me:18251: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18265,7 +18267,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18268: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18270: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18286,13 +18288,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18289: checking for $ac_func" >&5
+echo "$as_me:18291: 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 18295 "configure"
+#line 18297 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18323,16 +18325,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18329: \$? = $ac_status" >&5
+  echo "$as_me:18331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18335: \$? = $ac_status" >&5
+  echo "$as_me:18337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18342,7 +18344,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18345: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18347: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18355,7 +18357,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18358: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18360: 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.
@@ -18365,7 +18367,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18368: result: $with_assertions" >&5
+echo "$as_me:18370: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18381,7 +18383,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18384: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18386: 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.
@@ -18403,7 +18405,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18406: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18408: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18517,23 +18519,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18520: checking for dmalloc.h" >&5
+	echo "$as_me:18522: 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 18526 "configure"
+#line 18528 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18530: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18532: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18536: \$? = $ac_status" >&5
+  echo "$as_me:18538: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18552,11 +18554,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18555: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18557: 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:18559: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18561: 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
@@ -18564,7 +18566,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18567 "configure"
+#line 18569 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18583,16 +18585,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18589: \$? = $ac_status" >&5
+  echo "$as_me:18591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18595: \$? = $ac_status" >&5
+  echo "$as_me:18597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18603,7 +18605,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18606: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18618,7 +18620,7 @@ fi
 
 fi
 
-echo "$as_me:18621: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18623: 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.
@@ -18640,7 +18642,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18643: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18645: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18754,23 +18756,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18757: checking for dbmalloc.h" >&5
+	echo "$as_me:18759: 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 18763 "configure"
+#line 18765 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18773: \$? = $ac_status" >&5
+  echo "$as_me:18775: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18789,11 +18791,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18792: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18794: 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:18796: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18798: 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
@@ -18801,7 +18803,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18804 "configure"
+#line 18806 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18820,16 +18822,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18826: \$? = $ac_status" >&5
+  echo "$as_me:18828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18832: \$? = $ac_status" >&5
+  echo "$as_me:18834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18840,7 +18842,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18843: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18845: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18855,7 +18857,7 @@ fi
 
 fi
 
-echo "$as_me:18858: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18860: 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.
@@ -18877,7 +18879,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18880: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18882: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18990,7 +18992,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18993: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18995: 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.
@@ -19001,7 +19003,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19004: result: $with_no_leaks" >&5
+echo "$as_me:19006: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19053,7 +19055,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19056: checking whether to add trace feature to all models" >&5
+echo "$as_me:19058: 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.
@@ -19063,7 +19065,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19066: result: $cf_with_trace" >&5
+echo "$as_me:19068: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19177,7 +19179,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19180: checking if we want to use GNAT projects" >&5
+echo "$as_me:19182: 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.
@@ -19194,7 +19196,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19197: result: $enable_gnat_projects" >&5
+echo "$as_me:19199: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19207,14 +19209,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19210: checking if ssp library is needed" >&5
+echo "$as_me:19212: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19217 "configure"
+#line 19219 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19231,16 +19233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19237: \$? = $ac_status" >&5
+  echo "$as_me:19239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19243: \$? = $ac_status" >&5
+  echo "$as_me:19245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19250,7 +19252,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19253 "configure"
+#line 19255 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19267,16 +19269,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19273: \$? = $ac_status" >&5
+  echo "$as_me:19275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19279: \$? = $ac_status" >&5
+  echo "$as_me:19281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19290,7 +19292,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19293: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19295: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19319,14 +19321,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19322: checking if -lm needed for math functions" >&5
+echo "$as_me:19324: 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 19329 "configure"
+#line 19331 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19342,16 +19344,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19348: \$? = $ac_status" >&5
+  echo "$as_me:19350: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19354: \$? = $ac_status" >&5
+  echo "$as_me:19356: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19361,7 +19363,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19364: result: $cf_cv_need_libm" >&5
+echo "$as_me:19366: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19369,14 +19371,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19372: checking if -lm is available for math functions" >&5
+	echo "$as_me:19374: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19379 "configure"
+#line 19381 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19392,16 +19394,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19398: \$? = $ac_status" >&5
+  echo "$as_me:19400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19404: \$? = $ac_status" >&5
+  echo "$as_me:19406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19411,7 +19413,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19414: result: $cf_cv_have_libm" >&5
+echo "$as_me:19416: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19433,13 +19435,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19436: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19438: 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 19442 "configure"
+#line 19444 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19455,16 +19457,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19461: \$? = $ac_status" >&5
+  echo "$as_me:19463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19467: \$? = $ac_status" >&5
+  echo "$as_me:19469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19474,7 +19476,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19477: result: $ac_cv_header_time" >&5
+echo "$as_me:19479: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19489,7 +19491,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19492: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19494: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19497,7 +19499,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19500 "configure"
+#line 19502 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19516,16 +19518,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19522: \$? = $ac_status" >&5
+  echo "$as_me:19524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19528: \$? = $ac_status" >&5
+  echo "$as_me:19530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19536,11 +19538,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19539: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19541: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19543: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19545: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19548,7 +19550,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19551 "configure"
+#line 19553 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19567,16 +19569,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19573: \$? = $ac_status" >&5
+  echo "$as_me:19575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19579: \$? = $ac_status" >&5
+  echo "$as_me:19581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19587,7 +19589,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19590: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19592: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19609,7 +19611,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19612: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19614: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19617,7 +19619,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19620 "configure"
+#line 19622 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19636,16 +19638,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19642: \$? = $ac_status" >&5
+  echo "$as_me:19644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19648: \$? = $ac_status" >&5
+  echo "$as_me:19650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19656,7 +19658,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19659: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19661: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19678,7 +19680,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19681: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19683: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19686,7 +19688,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19689 "configure"
+#line 19691 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19705,16 +19707,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19711: \$? = $ac_status" >&5
+  echo "$as_me:19713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19717: \$? = $ac_status" >&5
+  echo "$as_me:19719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19725,7 +19727,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19728: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19730: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19767,7 +19769,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19770: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19772: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19775,7 +19777,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19778 "configure"
+#line 19780 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19794,16 +19796,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19800: \$? = $ac_status" >&5
+  echo "$as_me:19802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19806: \$? = $ac_status" >&5
+  echo "$as_me:19808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19814,7 +19816,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19817: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19819: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19842,13 +19844,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19845: checking for regcomp" >&5
+	echo "$as_me:19847: 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 19851 "configure"
+#line 19853 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19879,16 +19881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19885: \$? = $ac_status" >&5
+  echo "$as_me:19887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19891: \$? = $ac_status" >&5
+  echo "$as_me:19893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19898,7 +19900,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19901: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19903: 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
@@ -19907,7 +19909,7 @@ else
 		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:19910: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19912: 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
@@ -19915,7 +19917,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19918 "configure"
+#line 19920 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19934,16 +19936,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19940: \$? = $ac_status" >&5
+  echo "$as_me:19942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19946: \$? = $ac_status" >&5
+  echo "$as_me:19948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19954,7 +19956,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19957: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19959: 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
 
@@ -19986,13 +19988,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19989: checking for compile" >&5
+	echo "$as_me:19991: 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 19995 "configure"
+#line 19997 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20023,16 +20025,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20029: \$? = $ac_status" >&5
+  echo "$as_me:20031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20035: \$? = $ac_status" >&5
+  echo "$as_me:20037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20042,13 +20044,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20045: result: $ac_cv_func_compile" >&5
+echo "$as_me:20047: 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:20051: checking for compile in -lgen" >&5
+		echo "$as_me:20053: 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
@@ -20056,7 +20058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20059 "configure"
+#line 20061 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20075,16 +20077,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20081: \$? = $ac_status" >&5
+  echo "$as_me:20083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20087: \$? = $ac_status" >&5
+  echo "$as_me:20089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20095,7 +20097,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20098: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20100: 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
 
@@ -20123,11 +20125,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20126: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20128: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20130: checking for regular-expression headers" >&5
+echo "$as_me:20132: 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
@@ -20139,7 +20141,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20142 "configure"
+#line 20144 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20156,16 +20158,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20162: \$? = $ac_status" >&5
+  echo "$as_me:20164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20168: \$? = $ac_status" >&5
+  echo "$as_me:20170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20182,7 +20184,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20185 "configure"
+#line 20187 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20202,16 +20204,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20208: \$? = $ac_status" >&5
+  echo "$as_me:20210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20214: \$? = $ac_status" >&5
+  echo "$as_me:20216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20227,11 +20229,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20230: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20232: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20234: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20236: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20269,23 +20271,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20272: checking for $ac_header" >&5
+echo "$as_me:20274: 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 20278 "configure"
+#line 20280 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20284: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20288: \$? = $ac_status" >&5
+  echo "$as_me:20290: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20304,7 +20306,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20307: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20309: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20317,23 +20319,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20320: checking for $ac_header" >&5
+echo "$as_me:20322: 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 20326 "configure"
+#line 20328 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20330: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20336: \$? = $ac_status" >&5
+  echo "$as_me:20338: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20352,7 +20354,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20355: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20357: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20362,7 +20364,7 @@ EOF
 fi
 done
 
-echo "$as_me:20365: checking for header declaring getopt variables" >&5
+echo "$as_me:20367: 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
@@ -20372,7 +20374,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20375 "configure"
+#line 20377 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20385,16 +20387,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20391: \$? = $ac_status" >&5
+  echo "$as_me:20393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20397: \$? = $ac_status" >&5
+  echo "$as_me:20399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20406,7 +20408,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20409: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20411: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20423,14 +20425,14 @@ EOF
 
 fi
 
-echo "$as_me:20426: checking if external environ is declared" >&5
+echo "$as_me:20428: 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 20433 "configure"
+#line 20435 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20443,16 +20445,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20449: \$? = $ac_status" >&5
+  echo "$as_me:20451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20455: \$? = $ac_status" >&5
+  echo "$as_me:20457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20463,7 +20465,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20466: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20468: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20478,14 +20480,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20481: checking if external environ exists" >&5
+echo "$as_me:20483: 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 20488 "configure"
+#line 20490 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20500,16 +20502,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20506: \$? = $ac_status" >&5
+  echo "$as_me:20508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20512: \$? = $ac_status" >&5
+  echo "$as_me:20514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20520,7 +20522,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20523: result: $cf_cv_have_environ" >&5
+echo "$as_me:20525: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20533,13 +20535,13 @@ EOF
 
 fi
 
-echo "$as_me:20536: checking for getenv" >&5
+echo "$as_me:20538: 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 20542 "configure"
+#line 20544 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20570,16 +20572,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20576: \$? = $ac_status" >&5
+  echo "$as_me:20578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20582: \$? = $ac_status" >&5
+  echo "$as_me:20584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20589,19 +20591,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20592: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20594: 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:20598: checking for $ac_func" >&5
+echo "$as_me:20600: 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 20604 "configure"
+#line 20606 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20632,16 +20634,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20644: \$? = $ac_status" >&5
+  echo "$as_me:20646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20651,7 +20653,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20654: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20656: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20661,7 +20663,7 @@ EOF
 fi
 done
 
-echo "$as_me:20664: checking if getenv returns consistent values" >&5
+echo "$as_me:20666: 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
@@ -20671,7 +20673,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20674 "configure"
+#line 20676 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20776,15 +20778,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20782: \$? = $ac_status" >&5
+  echo "$as_me:20784: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20787: \$? = $ac_status" >&5
+  echo "$as_me:20789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20797,7 +20799,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20800: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20802: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20812,18 +20814,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20815: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20817: 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
 
-echo "$as_me:20819: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20821: 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 20826 "configure"
+#line 20828 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20843,16 +20845,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20849: \$? = $ac_status" >&5
+  echo "$as_me:20851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20855: \$? = $ac_status" >&5
+  echo "$as_me:20857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20864,7 +20866,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20867: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20869: 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
@@ -20879,13 +20881,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20882: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20884: 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 20888 "configure"
+#line 20890 "configure"
 #include "confdefs.h"
 
 int
@@ -20947,16 +20949,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20950: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20953: \$? = $ac_status" >&5
+  echo "$as_me:20955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20959: \$? = $ac_status" >&5
+  echo "$as_me:20961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20966,7 +20968,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20969: result: $ac_cv_c_const" >&5
+echo "$as_me:20971: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20976,7 +20978,7 @@ EOF
 
 fi
 
-echo "$as_me:20979: checking for inline" >&5
+echo "$as_me:20981: 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
@@ -20984,7 +20986,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20987 "configure"
+#line 20989 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -20993,16 +20995,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20999: \$? = $ac_status" >&5
+  echo "$as_me:21001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21005: \$? = $ac_status" >&5
+  echo "$as_me:21007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21013,7 +21015,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21016: result: $ac_cv_c_inline" >&5
+echo "$as_me:21018: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21039,7 +21041,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21042: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21044: 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
@@ -21048,7 +21050,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21051 "configure"
+#line 21053 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21060,16 +21062,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21066: \$? = $ac_status" >&5
+  echo "$as_me:21068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21072: \$? = $ac_status" >&5
+  echo "$as_me:21074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21081,7 +21083,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21084: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21086: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21187,7 +21189,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21190: checking for signal global datatype" >&5
+echo "$as_me:21192: 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
@@ -21199,7 +21201,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21202 "configure"
+#line 21204 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21223,16 +21225,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21229: \$? = $ac_status" >&5
+  echo "$as_me:21231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21235: \$? = $ac_status" >&5
+  echo "$as_me:21237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21246,7 +21248,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21249: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21251: 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 <<EOF
@@ -21255,7 +21257,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21258: checking for type of chtype" >&5
+echo "$as_me:21260: 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
@@ -21265,7 +21267,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21268 "configure"
+#line 21270 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21300,15 +21302,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21306: \$? = $ac_status" >&5
+  echo "$as_me:21308: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21311: \$? = $ac_status" >&5
+  echo "$as_me:21313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21323,7 +21325,7 @@ fi
 
 fi
 
-echo "$as_me:21326: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21328: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21335,14 +21337,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21338: checking if unsigned literals are legal" >&5
+echo "$as_me:21340: 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 21345 "configure"
+#line 21347 "configure"
 #include "confdefs.h"
 
 int
@@ -21354,16 +21356,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21360: \$? = $ac_status" >&5
+  echo "$as_me:21362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21366: \$? = $ac_status" >&5
+  echo "$as_me:21368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21375,7 +21377,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21378: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21380: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21391,14 +21393,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21394: checking if external errno is declared" >&5
+echo "$as_me:21396: 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 21401 "configure"
+#line 21403 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21412,16 +21414,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21417: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21418: \$? = $ac_status" >&5
+  echo "$as_me:21420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21424: \$? = $ac_status" >&5
+  echo "$as_me:21426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21432,7 +21434,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21435: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21437: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21447,14 +21449,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21450: checking if external errno exists" >&5
+echo "$as_me:21452: 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 21457 "configure"
+#line 21459 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21469,16 +21471,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21475: \$? = $ac_status" >&5
+  echo "$as_me:21477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21481: \$? = $ac_status" >&5
+  echo "$as_me:21483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21489,7 +21491,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21492: result: $cf_cv_have_errno" >&5
+echo "$as_me:21494: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21502,7 +21504,7 @@ EOF
 
 fi
 
-echo "$as_me:21505: checking if data-only library module links" >&5
+echo "$as_me:21507: 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
@@ -21510,20 +21512,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21513 "configure"
+#line 21515 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21519: \$? = $ac_status" >&5
+  echo "$as_me:21521: \$? = $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 <<EOF
-#line 21526 "configure"
+#line 21528 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21540,10 +21542,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21543: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21546: \$? = $ac_status" >&5
+  echo "$as_me:21548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21556,7 +21558,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21559 "configure"
+#line 21561 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21567,15 +21569,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21573: \$? = $ac_status" >&5
+  echo "$as_me:21575: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21578: \$? = $ac_status" >&5
+  echo "$as_me:21580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21590,7 +21592,7 @@ fi
 
 fi
 
-echo "$as_me:21593: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21595: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21604,14 +21606,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21607: checking for clock_gettime" >&5
+echo "$as_me:21609: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21614 "configure"
+#line 21616 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21624,16 +21626,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21630: \$? = $ac_status" >&5
+  echo "$as_me:21632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21636: \$? = $ac_status" >&5
+  echo "$as_me:21638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21644,7 +21646,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21647: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21649: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21655,13 +21657,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21658: checking for gettimeofday" >&5
+echo "$as_me:21660: 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 21664 "configure"
+#line 21666 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21692,16 +21694,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21698: \$? = $ac_status" >&5
+  echo "$as_me:21700: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21704: \$? = $ac_status" >&5
+  echo "$as_me:21706: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21711,7 +21713,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21714: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21716: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21721,7 +21723,7 @@ EOF
 
 else
 
-echo "$as_me:21724: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21726: 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
@@ -21729,7 +21731,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21732 "configure"
+#line 21734 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21748,16 +21750,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21754: \$? = $ac_status" >&5
+  echo "$as_me:21756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21760: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21768,7 +21770,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21771: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21773: 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
 
@@ -21827,13 +21829,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21830: checking for $ac_func" >&5
+echo "$as_me:21832: 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 21836 "configure"
+#line 21838 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21864,16 +21866,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21870: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21876: \$? = $ac_status" >&5
+  echo "$as_me:21878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21883,7 +21885,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21886: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21893,14 +21895,14 @@ EOF
 fi
 done
 
-echo "$as_me:21896: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21898: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21903 "configure"
+#line 21905 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21915,16 +21917,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21921: \$? = $ac_status" >&5
+  echo "$as_me:21923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21934,7 +21936,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21937: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21939: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21956,7 +21958,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21959: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21961: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21966,7 +21968,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21969 "configure"
+#line 21971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21979,15 +21981,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21985: \$? = $ac_status" >&5
+  echo "$as_me:21987: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21990: \$? = $ac_status" >&5
+  echo "$as_me:21992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -21999,7 +22001,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22002: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22004: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22011,14 +22013,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22014: checking for getttynam" >&5
+	echo "$as_me:22016: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22021 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22030,16 +22032,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22036: \$? = $ac_status" >&5
+  echo "$as_me:22038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22042: \$? = $ac_status" >&5
+  echo "$as_me:22044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22049,7 +22051,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22052: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22054: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22059,7 +22061,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22062: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22064: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22068,7 +22070,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22071: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22073: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22081,14 +22083,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22084: checking for terminal-capability database functions" >&5
+echo "$as_me:22086: 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 22091 "configure"
+#line 22093 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22108,16 +22110,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22114: \$? = $ac_status" >&5
+  echo "$as_me:22116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22120: \$? = $ac_status" >&5
+  echo "$as_me:22122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22128,7 +22130,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22131: result: $cf_cv_cgetent" >&5
+echo "$as_me:22133: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22138,14 +22140,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22141: checking if cgetent uses const parameter" >&5
+echo "$as_me:22143: 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 22148 "configure"
+#line 22150 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22168,16 +22170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22174: \$? = $ac_status" >&5
+  echo "$as_me:22176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22180: \$? = $ac_status" >&5
+  echo "$as_me:22182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22188,7 +22190,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22191: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22193: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22202,14 +22204,14 @@ fi
 
 fi
 
-echo "$as_me:22205: checking for isascii" >&5
+echo "$as_me:22207: 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 22212 "configure"
+#line 22214 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22221,16 +22223,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22227: \$? = $ac_status" >&5
+  echo "$as_me:22229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22233: \$? = $ac_status" >&5
+  echo "$as_me:22235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22241,7 +22243,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22244: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22246: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22249,10 +22251,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22252: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22254: 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 22255 "configure"
+#line 22257 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22266,16 +22268,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22272: \$? = $ac_status" >&5
+  echo "$as_me:22274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22278: \$? = $ac_status" >&5
+  echo "$as_me:22280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22283,7 +22285,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22286 "configure"
+#line 22288 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22298,16 +22300,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22304: \$? = $ac_status" >&5
+  echo "$as_me:22306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22310: \$? = $ac_status" >&5
+  echo "$as_me:22312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22323,11 +22325,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22326: result: $sigact_bad" >&5
+echo "$as_me:22328: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22330: checking if nanosleep really works" >&5
+echo "$as_me:22332: 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
@@ -22337,7 +22339,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22340 "configure"
+#line 22342 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22363,15 +22365,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22369: \$? = $ac_status" >&5
+  echo "$as_me:22371: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22374: \$? = $ac_status" >&5
+  echo "$as_me:22376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22383,7 +22385,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22386: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22388: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22400,23 +22402,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22403: checking for $ac_header" >&5
+echo "$as_me:22405: 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 22409 "configure"
+#line 22411 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22413: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22419: \$? = $ac_status" >&5
+  echo "$as_me:22421: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22435,7 +22437,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22438: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22452,10 +22454,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22455: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22457: 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 22458 "configure"
+#line 22460 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22467,16 +22469,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22473: \$? = $ac_status" >&5
+  echo "$as_me:22475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22479: \$? = $ac_status" >&5
+  echo "$as_me:22481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22484,7 +22486,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22487 "configure"
+#line 22489 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22498,16 +22500,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22510: \$? = $ac_status" >&5
+  echo "$as_me:22512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22523,19 +22525,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22526: result: $termios_bad" >&5
+	echo "$as_me:22528: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22531: checking for tcgetattr" >&5
+echo "$as_me:22533: 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 22538 "configure"
+#line 22540 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22563,16 +22565,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22569: \$? = $ac_status" >&5
+  echo "$as_me:22571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22575: \$? = $ac_status" >&5
+  echo "$as_me:22577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22582,21 +22584,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22585: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22587: 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:22592: checking for vsscanf function or workaround" >&5
+echo "$as_me:22594: 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 22599 "configure"
+#line 22601 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22622,16 +22624,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22628: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22634: \$? = $ac_status" >&5
+  echo "$as_me:22636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22639,7 +22641,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22642 "configure"
+#line 22644 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22661,16 +22663,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22667: \$? = $ac_status" >&5
+  echo "$as_me:22669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22673: \$? = $ac_status" >&5
+  echo "$as_me:22675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22678,7 +22680,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22681 "configure"
+#line 22683 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22700,16 +22702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22706: \$? = $ac_status" >&5
+  echo "$as_me:22708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22724,7 +22726,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22727: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22729: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22750,23 +22752,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22753: checking for $ac_header" >&5
+echo "$as_me:22755: 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 22759 "configure"
+#line 22761 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22769: \$? = $ac_status" >&5
+  echo "$as_me:22771: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22785,7 +22787,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22788: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22795,7 +22797,7 @@ EOF
 fi
 done
 
-echo "$as_me:22798: checking for working mkstemp" >&5
+echo "$as_me:22800: 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
@@ -22806,7 +22808,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22809 "configure"
+#line 22811 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22841,15 +22843,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22847: \$? = $ac_status" >&5
+  echo "$as_me:22849: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22852: \$? = $ac_status" >&5
+  echo "$as_me:22854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22864,16 +22866,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22867: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22869: 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:22870: checking for mkstemp" >&5
+	echo "$as_me:22872: 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 22876 "configure"
+#line 22878 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22904,16 +22906,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22910: \$? = $ac_status" >&5
+  echo "$as_me:22912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22923,7 +22925,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22926: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22928: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22944,21 +22946,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22947: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22949: 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:22950: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22952: 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:22956: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22958: 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 22961 "configure"
+#line 22963 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22975,15 +22977,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22981: \$? = $ac_status" >&5
+  echo "$as_me:22983: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22996,7 +22998,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:22999: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23001: 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
 
@@ -23007,13 +23009,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23010: checking for intptr_t" >&5
+echo "$as_me:23012: 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 23016 "configure"
+#line 23018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23028,16 +23030,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23034: \$? = $ac_status" >&5
+  echo "$as_me:23036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23040: \$? = $ac_status" >&5
+  echo "$as_me:23042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23047,7 +23049,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23050: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23052: 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
   :
@@ -23059,13 +23061,13 @@ EOF
 
 fi
 
-echo "$as_me:23062: checking for ssize_t" >&5
+echo "$as_me:23064: 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 23068 "configure"
+#line 23070 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23080,16 +23082,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23086: \$? = $ac_status" >&5
+  echo "$as_me:23088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23092: \$? = $ac_status" >&5
+  echo "$as_me:23094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23099,7 +23101,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23102: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23104: 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
   :
@@ -23111,14 +23113,14 @@ EOF
 
 fi
 
-echo "$as_me:23114: checking for type sigaction_t" >&5
+echo "$as_me:23116: 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 23121 "configure"
+#line 23123 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23131,16 +23133,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23137: \$? = $ac_status" >&5
+  echo "$as_me:23139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23143: \$? = $ac_status" >&5
+  echo "$as_me:23145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23151,14 +23153,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23154: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23156: 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:23161: checking declaration of size-change" >&5
+echo "$as_me:23163: 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
@@ -23179,7 +23181,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23182 "configure"
+#line 23184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23229,16 +23231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23235: \$? = $ac_status" >&5
+  echo "$as_me:23237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23241: \$? = $ac_status" >&5
+  echo "$as_me:23243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23257,7 +23259,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23260: result: $cf_cv_sizechange" >&5
+echo "$as_me:23262: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23275,13 +23277,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23278: checking for memmove" >&5
+echo "$as_me:23280: 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 23284 "configure"
+#line 23286 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23312,16 +23314,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23318: \$? = $ac_status" >&5
+  echo "$as_me:23320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23324: \$? = $ac_status" >&5
+  echo "$as_me:23326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23331,19 +23333,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23334: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23336: 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:23340: checking for bcopy" >&5
+echo "$as_me:23342: 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 23346 "configure"
+#line 23348 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23374,16 +23376,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23380: \$? = $ac_status" >&5
+  echo "$as_me:23382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23386: \$? = $ac_status" >&5
+  echo "$as_me:23388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23393,11 +23395,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23396: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23398: 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:23400: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23402: 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
@@ -23407,7 +23409,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23410 "configure"
+#line 23412 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23423,15 +23425,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23429: \$? = $ac_status" >&5
+  echo "$as_me:23431: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23434: \$? = $ac_status" >&5
+  echo "$as_me:23436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23444,7 +23446,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23447: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23449: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23471,13 +23473,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23474: checking for $ac_func" >&5
+echo "$as_me:23476: 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 23480 "configure"
+#line 23482 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23508,16 +23510,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23514: \$? = $ac_status" >&5
+  echo "$as_me:23516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:23522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23527,7 +23529,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23530: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23532: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23537,7 +23539,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23540: checking if poll really works" >&5
+echo "$as_me:23542: 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
@@ -23547,7 +23549,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23550 "configure"
+#line 23552 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23600,15 +23602,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23606: \$? = $ac_status" >&5
+  echo "$as_me:23608: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23611: \$? = $ac_status" >&5
+  echo "$as_me:23613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23620,21 +23622,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23623: result: $cf_cv_working_poll" >&5
+echo "$as_me:23625: 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:23630: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23632: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23637 "configure"
+#line 23639 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23654,16 +23656,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23660: \$? = $ac_status" >&5
+  echo "$as_me:23662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23666: \$? = $ac_status" >&5
+  echo "$as_me:23668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -23673,7 +23675,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23676: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:23678: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -23683,18 +23685,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:23686: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:23688: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:23690: checking for va_copy" >&5
+echo "$as_me:23692: 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 23697 "configure"
+#line 23699 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23711,16 +23713,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23717: \$? = $ac_status" >&5
+  echo "$as_me:23719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23723: \$? = $ac_status" >&5
+  echo "$as_me:23725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23730,7 +23732,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23733: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23735: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23742,14 +23744,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23745: checking for __va_copy" >&5
+echo "$as_me:23747: 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 23752 "configure"
+#line 23754 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23766,16 +23768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23772: \$? = $ac_status" >&5
+  echo "$as_me:23774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23778: \$? = $ac_status" >&5
+  echo "$as_me:23780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23785,7 +23787,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23788: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23790: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23797,14 +23799,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23800: checking for __builtin_va_copy" >&5
+echo "$as_me:23802: 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 23807 "configure"
+#line 23809 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23821,16 +23823,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23827: \$? = $ac_status" >&5
+  echo "$as_me:23829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23833: \$? = $ac_status" >&5
+  echo "$as_me:23835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23840,7 +23842,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23843: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23845: 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 &&
@@ -23858,14 +23860,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23861: checking if we can simply copy va_list" >&5
+	echo "$as_me:23863: 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 23868 "configure"
+#line 23870 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23882,16 +23884,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23888: \$? = $ac_status" >&5
+  echo "$as_me:23890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23894: \$? = $ac_status" >&5
+  echo "$as_me:23896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23901,19 +23903,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23904: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23906: 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:23909: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23911: 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 23916 "configure"
+#line 23918 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23930,16 +23932,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23936: \$? = $ac_status" >&5
+  echo "$as_me:23938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23942: \$? = $ac_status" >&5
+  echo "$as_me:23944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23949,7 +23951,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23952: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23954: 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
@@ -23960,13 +23962,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23963: checking for pid_t" >&5
+echo "$as_me:23965: 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 23969 "configure"
+#line 23971 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23981,16 +23983,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23987: \$? = $ac_status" >&5
+  echo "$as_me:23989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23993: \$? = $ac_status" >&5
+  echo "$as_me:23995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24000,7 +24002,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24003: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24005: 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
   :
@@ -24015,23 +24017,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24018: checking for $ac_header" >&5
+echo "$as_me:24020: 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 24024 "configure"
+#line 24026 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24028: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24030: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24034: \$? = $ac_status" >&5
+  echo "$as_me:24036: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24050,7 +24052,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24053: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24055: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24063,13 +24065,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24066: checking for $ac_func" >&5
+echo "$as_me:24068: 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 24072 "configure"
+#line 24074 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24100,16 +24102,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24105: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24106: \$? = $ac_status" >&5
+  echo "$as_me:24108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24112: \$? = $ac_status" >&5
+  echo "$as_me:24114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24119,7 +24121,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24122: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24124: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24131,7 +24133,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24134: checking for working fork" >&5
+  echo "$as_me:24136: 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
@@ -24154,15 +24156,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24160: \$? = $ac_status" >&5
+  echo "$as_me:24162: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24165: \$? = $ac_status" >&5
+  echo "$as_me:24167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24174,7 +24176,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24177: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24179: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24188,12 +24190,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24191: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24193: 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:24196: checking for working vfork" >&5
+  echo "$as_me:24198: 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
@@ -24202,7 +24204,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24205 "configure"
+#line 24207 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24295,15 +24297,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24301: \$? = $ac_status" >&5
+  echo "$as_me:24303: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24308: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24315,13 +24317,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24318: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24320: 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:24324: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24326: 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
 
@@ -24346,7 +24348,7 @@ EOF
 
 fi
 
-echo "$as_me:24349: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24351: 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
@@ -24356,7 +24358,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24359 "configure"
+#line 24361 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24391,15 +24393,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24397: \$? = $ac_status" >&5
+  echo "$as_me:24399: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24402: \$? = $ac_status" >&5
+  echo "$as_me:24404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24412,7 +24414,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24415: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24417: 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
@@ -24421,7 +24423,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24424: checking for openpty in -lutil" >&5
+echo "$as_me:24426: 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
@@ -24429,7 +24431,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24432 "configure"
+#line 24434 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24448,16 +24450,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24454: \$? = $ac_status" >&5
+  echo "$as_me:24456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24460: \$? = $ac_status" >&5
+  echo "$as_me:24462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24468,7 +24470,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24471: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24473: 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
@@ -24476,7 +24478,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24479: checking for openpty header" >&5
+echo "$as_me:24481: 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
@@ -24503,7 +24505,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24506 "configure"
+#line 24508 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24521,16 +24523,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24527: \$? = $ac_status" >&5
+  echo "$as_me:24529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24533: \$? = $ac_status" >&5
+  echo "$as_me:24535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24548,7 +24550,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24551: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24553: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24621,7 +24623,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24624 "configure"
+#line 24626 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24633,16 +24635,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24639: \$? = $ac_status" >&5
+  echo "$as_me:24641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24645: \$? = $ac_status" >&5
+  echo "$as_me:24647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24659,7 +24661,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24662: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24664: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24695,7 +24697,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24698: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24700: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24706,7 +24708,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24709: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24711: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24778,7 +24780,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24781 "configure"
+#line 24783 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24790,16 +24792,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24796: \$? = $ac_status" >&5
+  echo "$as_me:24798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24802: \$? = $ac_status" >&5
+  echo "$as_me:24804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24816,7 +24818,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24819: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24821: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24896,7 +24898,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24899: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24901: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24913,23 +24915,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24916: checking for db.h" >&5
+echo "$as_me:24918: 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 24922 "configure"
+#line 24924 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24928: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24932: \$? = $ac_status" >&5
+  echo "$as_me:24934: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24948,11 +24950,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24951: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24953: 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:24955: checking for version of db" >&5
+echo "$as_me:24957: 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
@@ -24963,10 +24965,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24966: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24968: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24969 "configure"
+#line 24971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24996,16 +24998,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25002: \$? = $ac_status" >&5
+  echo "$as_me:25004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25008: \$? = $ac_status" >&5
+  echo "$as_me:25010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25019,16 +25021,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25022: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25024: 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:25026: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25028: 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:25031: checking for db libraries" >&5
+echo "$as_me:25033: 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
@@ -25058,10 +25060,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25061: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25063: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25064 "configure"
+#line 25066 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25116,16 +25118,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25122: \$? = $ac_status" >&5
+  echo "$as_me:25124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25128: \$? = $ac_status" >&5
+  echo "$as_me:25130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25145,11 +25147,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25148: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25150: 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:25152: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25154: 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
@@ -25175,7 +25177,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25178: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25180: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25190,7 +25192,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25193: checking if we should include stdbool.h" >&5
+echo "$as_me:25195: 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
@@ -25198,7 +25200,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25201 "configure"
+#line 25203 "configure"
 #include "confdefs.h"
 
 int
@@ -25210,23 +25212,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25216: \$? = $ac_status" >&5
+  echo "$as_me:25218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25222: \$? = $ac_status" >&5
+  echo "$as_me:25224: \$? = $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 25229 "configure"
+#line 25231 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25242,16 +25244,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25248: \$? = $ac_status" >&5
+  echo "$as_me:25250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25254: \$? = $ac_status" >&5
+  echo "$as_me:25256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25265,13 +25267,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25268: result: yes" >&5
+then	echo "$as_me:25270: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25270: result: no" >&5
+else	echo "$as_me:25272: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25274: checking for builtin bool type" >&5
+echo "$as_me:25276: 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
@@ -25279,7 +25281,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25282 "configure"
+#line 25284 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25294,16 +25296,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25299: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25300: \$? = $ac_status" >&5
+  echo "$as_me:25302: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25306: \$? = $ac_status" >&5
+  echo "$as_me:25308: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25316,9 +25318,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25319: result: yes" >&5
+then	echo "$as_me:25321: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25321: result: no" >&5
+else	echo "$as_me:25323: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25335,10 +25337,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25338: checking if we already have C++ library" >&5
+	echo "$as_me:25340: 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 25341 "configure"
+#line 25343 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25352,16 +25354,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25358: \$? = $ac_status" >&5
+  echo "$as_me:25360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25364: \$? = $ac_status" >&5
+  echo "$as_me:25366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25370,7 +25372,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25373: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25375: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25389,7 +25391,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25392: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25394: 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
@@ -25415,7 +25417,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25418 "configure"
+#line 25420 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25429,16 +25431,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25435: \$? = $ac_status" >&5
+  echo "$as_me:25437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25441: \$? = $ac_status" >&5
+  echo "$as_me:25443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25450,7 +25452,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25453: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25455: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25472,7 +25474,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25475: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25477: 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
@@ -25487,15 +25489,15 @@ CF_EOF
 # 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:25490: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25493: \$? = $ac_status" >&5
+  echo "$as_me:25495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25495: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25498: \$? = $ac_status" >&5
+  echo "$as_me:25500: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25506,10 +25508,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25509: result: yes" >&5
+  echo "$as_me:25511: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25512: result: no" >&5
+  echo "$as_me:25514: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25529,7 +25531,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25532: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25534: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25550,7 +25552,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25553 "configure"
+#line 25555 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25564,16 +25566,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25570: \$? = $ac_status" >&5
+  echo "$as_me:25572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25576: \$? = $ac_status" >&5
+  echo "$as_me:25578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25610,7 +25612,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25613 "configure"
+#line 25615 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25624,16 +25626,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25630: \$? = $ac_status" >&5
+  echo "$as_me:25632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25636: \$? = $ac_status" >&5
+  echo "$as_me:25638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25666,7 +25668,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25669: result: $cf_cxx_library" >&5
+	echo "$as_me:25671: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25682,7 +25684,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25685: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25687: 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
@@ -25699,18 +25701,18 @@ do
   # 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 25702 "configure"
+#line 25704 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25707: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25713: \$? = $ac_status" >&5
+  echo "$as_me:25715: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25733,17 +25735,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25736 "configure"
+#line 25738 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25742: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25746: \$? = $ac_status" >&5
+  echo "$as_me:25748: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25780,7 +25782,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25783: result: $CXXCPP" >&5
+echo "$as_me:25785: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25790,18 +25792,18 @@ do
   # 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 25793 "configure"
+#line 25795 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25804: \$? = $ac_status" >&5
+  echo "$as_me:25806: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25824,17 +25826,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25827 "configure"
+#line 25829 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25831: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25837: \$? = $ac_status" >&5
+  echo "$as_me:25839: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25862,7 +25864,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25865: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25867: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25877,23 +25879,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25880: checking for $ac_header" >&5
+echo "$as_me:25882: 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 25886 "configure"
+#line 25888 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25890: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25896: \$? = $ac_status" >&5
+  echo "$as_me:25898: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25912,7 +25914,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25915: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25917: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25925,23 +25927,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25928: checking for $ac_header" >&5
+echo "$as_me:25930: 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 25934 "configure"
+#line 25936 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25938: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25940: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25944: \$? = $ac_status" >&5
+  echo "$as_me:25946: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25960,7 +25962,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25963: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25965: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25971,10 +25973,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25974: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25976: 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 25977 "configure"
+#line 25979 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25991,16 +25993,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25997: \$? = $ac_status" >&5
+  echo "$as_me:25999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26003: \$? = $ac_status" >&5
+  echo "$as_me:26005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26009,7 +26011,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26012: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26014: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26020,7 +26022,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26023: checking if we should include stdbool.h" >&5
+echo "$as_me:26025: 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
@@ -26028,7 +26030,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26031 "configure"
+#line 26033 "configure"
 #include "confdefs.h"
 
 int
@@ -26040,23 +26042,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26043: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26046: \$? = $ac_status" >&5
+  echo "$as_me:26048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26052: \$? = $ac_status" >&5
+  echo "$as_me:26054: \$? = $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 26059 "configure"
+#line 26061 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26072,16 +26074,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26078: \$? = $ac_status" >&5
+  echo "$as_me:26080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26084: \$? = $ac_status" >&5
+  echo "$as_me:26086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26095,13 +26097,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26098: result: yes" >&5
+then	echo "$as_me:26100: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26100: result: no" >&5
+else	echo "$as_me:26102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26104: checking for builtin bool type" >&5
+echo "$as_me:26106: 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
@@ -26109,7 +26111,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26112 "configure"
+#line 26114 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26124,16 +26126,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26130: \$? = $ac_status" >&5
+  echo "$as_me:26132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26136: \$? = $ac_status" >&5
+  echo "$as_me:26138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26146,19 +26148,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26149: result: yes" >&5
+then	echo "$as_me:26151: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26151: result: no" >&5
+else	echo "$as_me:26153: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26155: checking for bool" >&5
+echo "$as_me:26157: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26161 "configure"
+#line 26163 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26193,16 +26195,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26199: \$? = $ac_status" >&5
+  echo "$as_me:26201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26205: \$? = $ac_status" >&5
+  echo "$as_me:26207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26212,10 +26214,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26215: result: $ac_cv_type_bool" >&5
+echo "$as_me:26217: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26218: checking size of bool" >&5
+echo "$as_me:26220: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26224,7 +26226,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26227 "configure"
+#line 26229 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26256,21 +26258,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26262: \$? = $ac_status" >&5
+  echo "$as_me:26264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26268: \$? = $ac_status" >&5
+  echo "$as_me:26270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26273 "configure"
+#line 26275 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26302,16 +26304,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26308: \$? = $ac_status" >&5
+  echo "$as_me:26310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26314: \$? = $ac_status" >&5
+  echo "$as_me:26316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26327,7 +26329,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26330 "configure"
+#line 26332 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26359,16 +26361,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26365: \$? = $ac_status" >&5
+  echo "$as_me:26367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26371: \$? = $ac_status" >&5
+  echo "$as_me:26373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26384,7 +26386,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26387 "configure"
+#line 26389 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26416,16 +26418,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26422: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26428: \$? = $ac_status" >&5
+  echo "$as_me:26430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26438,12 +26440,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26441: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26443: 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 26446 "configure"
+#line 26448 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26479,15 +26481,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26485: \$? = $ac_status" >&5
+  echo "$as_me:26487: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26490: \$? = $ac_status" >&5
+  echo "$as_me:26492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26503,13 +26505,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26506: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26508: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26512: checking for type of bool" >&5
+echo "$as_me:26514: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26528,7 +26530,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26531 "configure"
+#line 26533 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26569,15 +26571,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26575: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26580: \$? = $ac_status" >&5
+  echo "$as_me:26582: \$? = $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
@@ -26594,19 +26596,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26597: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26599: 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:26604: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26606: 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:26609: checking for special defines needed for etip.h" >&5
+echo "$as_me:26611: 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"
@@ -26624,7 +26626,7 @@ do
 	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 26627 "configure"
+#line 26629 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26638,16 +26640,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26644: \$? = $ac_status" >&5
+  echo "$as_me:26646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26650: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26668,12 +26670,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26671: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26673: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26676: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26678: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26690,7 +26692,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26693 "configure"
+#line 26695 "configure"
 #include "confdefs.h"
 
 class base
@@ -26709,15 +26711,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26714: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26715: \$? = $ac_status" >&5
+  echo "$as_me:26717: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26720: \$? = $ac_status" >&5
+  echo "$as_me:26722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26736,7 +26738,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26739: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26741: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26745,7 +26747,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26748: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26750: 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
@@ -26762,7 +26764,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26765 "configure"
+#line 26767 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26781,15 +26783,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26787: \$? = $ac_status" >&5
+  echo "$as_me:26789: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26792: \$? = $ac_status" >&5
+  echo "$as_me:26794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26808,7 +26810,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26811: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26813: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26818,7 +26820,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26821: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26823: 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
@@ -26832,7 +26834,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26835 "configure"
+#line 26837 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26876,16 +26878,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26882: \$? = $ac_status" >&5
+  echo "$as_me:26884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26888: \$? = $ac_status" >&5
+  echo "$as_me:26890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26903,7 +26905,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26906: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26908: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26952,13 +26954,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26955: checking for bool" >&5
+echo "$as_me:26957: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26961 "configure"
+#line 26963 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26993,16 +26995,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26999: \$? = $ac_status" >&5
+  echo "$as_me:27001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27005: \$? = $ac_status" >&5
+  echo "$as_me:27007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27012,10 +27014,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27015: result: $ac_cv_type_bool" >&5
+echo "$as_me:27017: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27018: checking size of bool" >&5
+echo "$as_me:27020: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27024,7 +27026,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27027 "configure"
+#line 27029 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27056,21 +27058,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27062: \$? = $ac_status" >&5
+  echo "$as_me:27064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27068: \$? = $ac_status" >&5
+  echo "$as_me:27070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27073 "configure"
+#line 27075 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27102,16 +27104,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27108: \$? = $ac_status" >&5
+  echo "$as_me:27110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27114: \$? = $ac_status" >&5
+  echo "$as_me:27116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27127,7 +27129,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27130 "configure"
+#line 27132 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27159,16 +27161,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27165: \$? = $ac_status" >&5
+  echo "$as_me:27167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27171: \$? = $ac_status" >&5
+  echo "$as_me:27173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27184,7 +27186,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27187 "configure"
+#line 27189 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27216,16 +27218,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27222: \$? = $ac_status" >&5
+  echo "$as_me:27224: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27228: \$? = $ac_status" >&5
+  echo "$as_me:27230: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27238,12 +27240,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27241: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27243: 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 27246 "configure"
+#line 27248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27279,15 +27281,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27285: \$? = $ac_status" >&5
+  echo "$as_me:27287: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27290: \$? = $ac_status" >&5
+  echo "$as_me:27292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27303,13 +27305,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27306: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27308: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27312: checking for type of bool" >&5
+echo "$as_me:27314: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27328,7 +27330,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27331 "configure"
+#line 27333 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27369,15 +27371,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27375: \$? = $ac_status" >&5
+  echo "$as_me:27377: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27380: \$? = $ac_status" >&5
+  echo "$as_me:27382: \$? = $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
@@ -27394,26 +27396,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27397: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27399: 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:27404: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27406: 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:27410: checking for fallback type of bool" >&5
+			echo "$as_me:27412: 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:27416: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27418: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27442,7 +27444,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27445: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27447: 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
@@ -27459,7 +27461,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27462: checking for $ac_word" >&5
+echo "$as_me:27464: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27476,7 +27478,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27479: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27481: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27488,10 +27490,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27491: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27493: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27494: result: no" >&5
+  echo "$as_me:27496: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27501,7 +27503,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27504: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27506: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27512,7 +27514,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27515: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27517: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27541,7 +27543,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27544: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27546: 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
@@ -27560,10 +27562,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27563: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27565: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27566: result: missing" >&5
+					echo "$as_me:27568: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27576,7 +27578,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27579: checking for gnat version" >&5
+echo "$as_me:27581: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27587,7 +27589,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27590: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27592: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27596,7 +27598,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27599: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27601: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27604,7 +27606,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27607: checking for $ac_word" >&5
+echo "$as_me:27609: 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
@@ -27619,7 +27621,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27622: found $ac_dir/$ac_word" >&5
+echo "$as_me:27624: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27628,20 +27630,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27631: result: $M4_exists" >&5
+  echo "$as_me:27633: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27634: result: no" >&5
+  echo "$as_me:27636: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27640: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27642: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27644: checking if GNAT works" >&5
+			echo "$as_me:27646: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27669,7 +27671,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27672: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27674: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27681,7 +27683,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27684: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27686: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27698,10 +27700,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27701: result: $ADAFLAGS" >&5
+	echo "$as_me:27703: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27704: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27706: 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
@@ -27711,11 +27713,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27714: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27716: 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:27718: checking if GNAT supports generics" >&5
+echo "$as_me:27720: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27725,7 +27727,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27728: result: $cf_gnat_generics" >&5
+echo "$as_me:27730: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27737,7 +27739,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27740: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27742: 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
@@ -27785,7 +27787,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27788: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27790: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27798,7 +27800,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27801: checking if GNAT supports project files" >&5
+echo "$as_me:27803: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27861,15 +27863,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27864: result: $cf_gnat_projects" >&5
+echo "$as_me:27866: 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:27870: checking if GNAT supports libraries" >&5
+	echo "$as_me:27872: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27872: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27874: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27889,7 +27891,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27892: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27894: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27901,7 +27903,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27904: checking for Ada95 compiler" >&5
+echo "$as_me:27906: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27912,12 +27914,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27915: result: $cf_ada_compiler" >&5
+echo "$as_me:27917: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27920: checking for Ada95 include directory" >&5
+echo "$as_me:27922: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27953,7 +27955,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27956: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27958: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27962,10 +27964,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27965: result: $ADA_INCLUDE" >&5
+echo "$as_me:27967: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27968: checking for Ada95 object directory" >&5
+echo "$as_me:27970: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28001,7 +28003,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28004: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28006: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28010,10 +28012,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28013: result: $ADA_OBJECTS" >&5
+echo "$as_me:28015: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28016: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28018: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28034,11 +28036,11 @@ then
 	fi
 fi
 
-echo "$as_me:28037: result: $with_ada_sharedlib" >&5
+echo "$as_me:28039: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28041: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28043: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28056,7 +28058,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28059: checking for Ada95 curses library name" >&5
+echo "$as_me:28061: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28072,7 +28074,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28075: result: $ADA_LIBNAME" >&5
+echo "$as_me:28077: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28083,13 +28085,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28086: checking for wchar_t" >&5
+	echo "$as_me:28088: 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 28092 "configure"
+#line 28094 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28104,16 +28106,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28110: \$? = $ac_status" >&5
+  echo "$as_me:28112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28116: \$? = $ac_status" >&5
+  echo "$as_me:28118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28123,10 +28125,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28126: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28128: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28129: checking size of wchar_t" >&5
+echo "$as_me:28131: 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
@@ -28135,7 +28137,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28138 "configure"
+#line 28140 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28147,21 +28149,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28152: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28153: \$? = $ac_status" >&5
+  echo "$as_me:28155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28159: \$? = $ac_status" >&5
+  echo "$as_me:28161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28164 "configure"
+#line 28166 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28173,16 +28175,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28179: \$? = $ac_status" >&5
+  echo "$as_me:28181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28185: \$? = $ac_status" >&5
+  echo "$as_me:28187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28198,7 +28200,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28201 "configure"
+#line 28203 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28210,16 +28212,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28216: \$? = $ac_status" >&5
+  echo "$as_me:28218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28222: \$? = $ac_status" >&5
+  echo "$as_me:28224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28235,7 +28237,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28238 "configure"
+#line 28240 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28247,16 +28249,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28253: \$? = $ac_status" >&5
+  echo "$as_me:28255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28259: \$? = $ac_status" >&5
+  echo "$as_me:28261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28269,12 +28271,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28272: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28274: 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 28277 "configure"
+#line 28279 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28290,15 +28292,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28296: \$? = $ac_status" >&5
+  echo "$as_me:28298: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28301: \$? = $ac_status" >&5
+  echo "$as_me:28303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28314,7 +28316,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28317: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28319: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28327,7 +28329,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28330: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28332: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28345,7 +28347,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28348: checking for library subsets" >&5
+echo "$as_me:28350: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28399,7 +28401,7 @@ fi
 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:28402: result: $LIB_SUBSETS" >&5
+echo "$as_me:28404: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28430,7 +28432,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28433: checking default library suffix" >&5
+echo "$as_me:28435: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28441,10 +28443,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28444: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28446: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28447: checking default library-dependency suffix" >&5
+echo "$as_me:28449: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28527,10 +28529,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28530: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28532: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28533: checking default object directory" >&5
+echo "$as_me:28535: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28546,11 +28548,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28549: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28551: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28553: checking c++ library-dependency suffix" >&5
+echo "$as_me:28555: 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++)
@@ -28643,7 +28645,7 @@ else
 	fi
 
 fi
-echo "$as_me:28646: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28648: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28819,19 +28821,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28822: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28824: 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 <<EOF
-#line 28827 "configure"
+#line 28829 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28831: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28834: \$? = $ac_status" >&5
+  echo "$as_me:28836: \$? = $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
@@ -28842,10 +28844,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28845 "configure"
+#line 28847 "configure"
 #include "confdefs.h"
 
-#line 28848 "configure"
+#line 28850 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28860,16 +28862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28866: \$? = $ac_status" >&5
+  echo "$as_me:28868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28872: \$? = $ac_status" >&5
+  echo "$as_me:28874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28892,7 +28894,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28895: result: $cf_ldflags_static" >&5
+	echo "$as_me:28897: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28908,7 +28910,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28911: checking where we will install curses.h" >&5
+echo "$as_me:28913: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28918,7 +28920,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28921: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28923: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28926,7 +28928,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28929: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28931: 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
@@ -28951,7 +28953,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28954: checking for desired basename for form library" >&5
+echo "$as_me:28956: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28971,10 +28973,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28974: result: $FORM_NAME" >&5
+echo "$as_me:28976: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28977: checking for desired basename for menu library" >&5
+echo "$as_me:28979: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28994,10 +28996,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28997: result: $MENU_NAME" >&5
+echo "$as_me:28999: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29000: checking for desired basename for panel library" >&5
+echo "$as_me:29002: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29017,10 +29019,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29020: result: $PANEL_NAME" >&5
+echo "$as_me:29022: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29023: checking for desired basename for cxx library" >&5
+echo "$as_me:29025: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29040,13 +29042,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29043: result: $CXX_NAME" >&5
+echo "$as_me:29045: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29049: checking for src modules" >&5
+echo "$as_me:29051: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29105,7 +29107,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29108: result: $cf_cv_src_modules" >&5
+echo "$as_me:29110: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29266,7 +29268,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29269: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29271: 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//'`
@@ -29277,7 +29279,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29280: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29282: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29293,7 +29295,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29296: result: $PKG_CFLAGS" >&5
+echo "$as_me:29298: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29354,7 +29356,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29357: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29359: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29381,7 +29383,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29384: checking for linker search path" >&5
+echo "$as_me:29386: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29429,7 +29431,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29432: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29434: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29470,7 +29472,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29473: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29475: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29556,7 +29558,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29559: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29561: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29737,7 +29739,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29740: error: ambiguous option: $1
+    { { echo "$as_me:29742: 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;}
@@ -29756,7 +29758,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29759: error: unrecognized option: $1
+  -*) { { echo "$as_me:29761: 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;}
@@ -29886,7 +29888,7 @@ do
   "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:29889: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29891: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30143,6 +30145,7 @@ s,@cf_manpage_format@,$cf_manpage_format,;t t
 s,@cf_manpage_inboth@,$cf_manpage_inboth,;t t
 s,@cf_manpage_so_strip@,$cf_manpage_so_strip,;t t
 s,@cf_manpage_compress@,$cf_manpage_compress,;t t
+s,@cf_manpage_coptions@,$cf_manpage_coptions,;t t
 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
 s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
@@ -30406,7 +30409,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30409: creating $ac_file" >&5
+    { echo "$as_me:30412: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30424,7 +30427,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30427: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30430: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30437,7 +30440,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30440: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30443: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30453,7 +30456,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30456: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30459: 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;}
@@ -30462,7 +30465,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30465: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30468: 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;}
@@ -30507,7 +30510,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30510: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30513: 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;}
@@ -30518,7 +30521,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30521: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30524: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30567,7 +30570,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30570: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30573: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30578,7 +30581,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30581: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30584: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30591,7 +30594,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30594: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30597: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30649,7 +30652,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30652: $ac_file is unchanged" >&5
+      { echo "$as_me:30655: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31036,7 +31039,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31039: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31042: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index 9f1a1f43f..53ae31cfc 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1603 2024/03/23 10:33:40 tom Exp $
+# $Id: dist.mk,v 1.1604 2024/03/30 09:26:39 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240323
+NCURSES_PATCH = 20240330
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 2fcc4dd85..fda6deada 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.29 2023/09/09 23:14:48 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.30 2024/03/30 15:54:17 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -151,7 +151,6 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
 #ifdef TERMIOS
 	buf.c_lflag &= (unsigned) ~ICANON;
 	buf.c_iflag &= (unsigned) ~ICRNL;
-	buf.c_lflag |= ISIG;
 	buf.c_cc[VMIN] = 1;
 	buf.c_cc[VTIME] = 0;
 #elif defined(EXP_WIN32_DRIVER)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0fef8b24f..7717fe29e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240323) unstable; urgency=low
+ncurses6 (6.4+20240330) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0fef8b24f..7717fe29e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240323) unstable; urgency=low
+ncurses6 (6.4+20240330) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index c47010897..5337ef8e5 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240323) unstable; urgency=low
+ncurses6 (6.4+20240330) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Mar 2024 06:33:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 70a09a759..8175cd3a4 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.638 2024/03/23 10:33:40 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.639 2024/03/29 22:09:01 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0323"
+!define VERSION_MMDD  "0330"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6233693ce..67b438933 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240323
+Release: 20240330
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 803fa5639..a71558218 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240323
+Release: 20240330
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 2a540270f..b39b89e62 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240323
+Release: 20240330
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/configure b/test/configure
index d20e3c768..4f155cd78 100755
--- a/test/configure
+++ b/test/configure
@@ -18823,7 +18823,6 @@ fi
 fi
 
 for ac_func in \
-cfmakeraw \
 getopt \
 snprintf \
 strdup \
@@ -18832,13 +18831,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18835: checking for $ac_func" >&5
+echo "$as_me:18834: 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 18841 "configure"
+#line 18840 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18869,16 +18868,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18875: \$? = $ac_status" >&5
+  echo "$as_me:18874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18881: \$? = $ac_status" >&5
+  echo "$as_me:18880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18888,7 +18887,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18891: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18899,14 +18898,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:18902: checking if we can use termcap.h" >&5
+echo "$as_me:18901: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18909 "configure"
+#line 18908 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -18927,16 +18926,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18933: \$? = $ac_status" >&5
+  echo "$as_me:18932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18939: \$? = $ac_status" >&5
+  echo "$as_me:18938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -18946,7 +18945,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18949: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:18948: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -18956,14 +18955,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18959: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:18958: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18966 "configure"
+#line 18965 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -18984,16 +18983,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18990: \$? = $ac_status" >&5
+  echo "$as_me:18989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18996: \$? = $ac_status" >&5
+  echo "$as_me:18995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19003,7 +19002,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19006: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19005: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19013,7 +19012,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19016: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19015: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19032,13 +19031,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19035: checking for $ac_func" >&5
+echo "$as_me:19034: 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 19041 "configure"
+#line 19040 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19069,16 +19068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19075: \$? = $ac_status" >&5
+  echo "$as_me:19074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19081: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19088,7 +19087,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19091: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19090: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19100,7 +19099,7 @@ done
 
 fi
 
-echo "$as_me:19103: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19102: 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
@@ -19108,7 +19107,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19111 "configure"
+#line 19110 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19141,16 +19140,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19147: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19153: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19160,7 +19159,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19163 "configure"
+#line 19162 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19186,16 +19185,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19192: \$? = $ac_status" >&5
+  echo "$as_me:19191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19198: \$? = $ac_status" >&5
+  echo "$as_me:19197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19209,7 +19208,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19212: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19211: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19221,7 +19220,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19224: checking for term.h" >&5
+echo "$as_me:19223: 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
@@ -19242,7 +19241,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19245 "configure"
+#line 19244 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19256,16 +19255,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19258: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19262: \$? = $ac_status" >&5
+  echo "$as_me:19261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19268: \$? = $ac_status" >&5
+  echo "$as_me:19267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19284,7 +19283,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19287 "configure"
+#line 19286 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19302,16 +19301,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19308: \$? = $ac_status" >&5
+  echo "$as_me:19307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19314: \$? = $ac_status" >&5
+  echo "$as_me:19313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19326,7 +19325,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19329: result: $cf_cv_term_header" >&5
+echo "$as_me:19328: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19353,7 +19352,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19356: checking for unctrl.h" >&5
+echo "$as_me:19355: 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
@@ -19374,7 +19373,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19377 "configure"
+#line 19376 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19388,16 +19387,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19394: \$? = $ac_status" >&5
+  echo "$as_me:19393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19400: \$? = $ac_status" >&5
+  echo "$as_me:19399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19410,12 +19409,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19413: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19412: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19418: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19417: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19513,10 +19512,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19516: checking for ${cf_func}" >&5
+	echo "$as_me:19515: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19519: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19518: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19525,7 +19524,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19528 "configure"
+#line 19527 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19558,16 +19557,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19564: \$? = $ac_status" >&5
+  echo "$as_me:19563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19570: \$? = $ac_status" >&5
+  echo "$as_me:19569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19583,7 +19582,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19586: result: $cf_result" >&5
+	echo "$as_me:19585: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19598,10 +19597,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19601: checking for ${cf_func}" >&5
+	echo "$as_me:19600: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19604: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19603: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19610,7 +19609,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19613 "configure"
+#line 19612 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19643,16 +19642,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19649: \$? = $ac_status" >&5
+  echo "$as_me:19648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19655: \$? = $ac_status" >&5
+  echo "$as_me:19654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19668,7 +19667,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19671: result: $cf_result" >&5
+	echo "$as_me:19670: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19692,7 +19691,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19695 "configure"
+#line 19694 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19712,21 +19711,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19718: \$? = $ac_status" >&5
+  echo "$as_me:19717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19724: \$? = $ac_status" >&5
+  echo "$as_me:19723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19729: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19728: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19746,14 +19745,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19749: checking for ncurses extended functions" >&5
+echo "$as_me:19748: 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 19756 "configure"
+#line 19755 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19768,16 +19767,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19774: \$? = $ac_status" >&5
+  echo "$as_me:19773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:19779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19785,7 +19784,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19788 "configure"
+#line 19787 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19810,16 +19809,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19816: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19822: \$? = $ac_status" >&5
+  echo "$as_me:19821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19833,7 +19832,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19836: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19835: 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
@@ -19847,11 +19846,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19850: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19849: 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 19854 "configure"
+#line 19853 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19864,16 +19863,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19870: \$? = $ac_status" >&5
+  echo "$as_me:19869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19882,7 +19881,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19885 "configure"
+#line 19884 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19895,16 +19894,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19901: \$? = $ac_status" >&5
+  echo "$as_me:19900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19907: \$? = $ac_status" >&5
+  echo "$as_me:19906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19915,7 +19914,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19918: result: $cf_define_xpg5" >&5
+		echo "$as_me:19917: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19924,14 +19923,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19927: checking for wide-character functions" >&5
+	echo "$as_me:19926: 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 19934 "configure"
+#line 19933 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19948,16 +19947,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19954: \$? = $ac_status" >&5
+  echo "$as_me:19953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19960: \$? = $ac_status" >&5
+  echo "$as_me:19959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19968,7 +19967,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19971: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19970: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19989,14 +19988,14 @@ EOF
 
 fi
 
-echo "$as_me:19992: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19991: 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 19999 "configure"
+#line 19998 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20014,16 +20013,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20020: \$? = $ac_status" >&5
+  echo "$as_me:20019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20026: \$? = $ac_status" >&5
+  echo "$as_me:20025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20034,21 +20033,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20037: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20036: 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:20044: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20043: 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 20051 "configure"
+#line 20050 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20068,16 +20067,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20074: \$? = $ac_status" >&5
+  echo "$as_me:20073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20080: \$? = $ac_status" >&5
+  echo "$as_me:20079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20089,7 +20088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20092: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20091: 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
@@ -20098,7 +20097,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20101: checking for openpty in -lutil" >&5
+echo "$as_me:20100: 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
@@ -20106,7 +20105,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20109 "configure"
+#line 20108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20125,16 +20124,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20131: \$? = $ac_status" >&5
+  echo "$as_me:20130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20137: \$? = $ac_status" >&5
+  echo "$as_me:20136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20145,7 +20144,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20148: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20147: 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
@@ -20153,7 +20152,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20156: checking for openpty header" >&5
+echo "$as_me:20155: 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
@@ -20180,7 +20179,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20183 "configure"
+#line 20182 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20198,16 +20197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20204: \$? = $ac_status" >&5
+  echo "$as_me:20203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20210: \$? = $ac_status" >&5
+  echo "$as_me:20209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20225,7 +20224,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20228: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20227: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20259,7 +20258,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20262: checking for function curses_version" >&5
+echo "$as_me:20261: 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
@@ -20269,7 +20268,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20272 "configure"
+#line 20271 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20285,15 +20284,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20291: \$? = $ac_status" >&5
+  echo "$as_me:20290: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20296: \$? = $ac_status" >&5
+  echo "$as_me:20295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20308,14 +20307,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20311: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20310: 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:20318: checking for alternate character set array" >&5
+echo "$as_me:20317: 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
@@ -20325,7 +20324,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20328 "configure"
+#line 20327 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20341,16 +20340,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20347: \$? = $ac_status" >&5
+  echo "$as_me:20346: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20353: \$? = $ac_status" >&5
+  echo "$as_me:20352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20361,7 +20360,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20364: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20363: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20371,7 +20370,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20374: checking for wide alternate character set array" >&5
+echo "$as_me:20373: 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
@@ -20381,7 +20380,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20384 "configure"
+#line 20383 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20397,16 +20396,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20403: \$? = $ac_status" >&5
+  echo "$as_me:20402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20409: \$? = $ac_status" >&5
+  echo "$as_me:20408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20417,7 +20416,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20420: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20419: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20425,7 +20424,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20428: checking for wide alternate character constants" >&5
+echo "$as_me:20427: 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
@@ -20435,7 +20434,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20438 "configure"
+#line 20437 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20452,16 +20451,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20458: \$? = $ac_status" >&5
+  echo "$as_me:20457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20464: \$? = $ac_status" >&5
+  echo "$as_me:20463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20471,7 +20470,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20474 "configure"
+#line 20473 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20487,16 +20486,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20493: \$? = $ac_status" >&5
+  echo "$as_me:20492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20499: \$? = $ac_status" >&5
+  echo "$as_me:20498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20507,7 +20506,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20510: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20509: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20517,10 +20516,10 @@ EOF
 
 fi
 
-echo "$as_me:20520: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20519: 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 20523 "configure"
+#line 20522 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20538,16 +20537,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20544: \$? = $ac_status" >&5
+  echo "$as_me:20543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20550: \$? = $ac_status" >&5
+  echo "$as_me:20549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20556,7 +20555,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20559: result: $cf_result" >&5
+echo "$as_me:20558: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20577,14 +20576,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20580: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20579: 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 20587 "configure"
+#line 20586 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20602,23 +20601,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20608: \$? = $ac_status" >&5
+  echo "$as_me:20607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20614: \$? = $ac_status" >&5
+  echo "$as_me:20613: \$? = $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 20621 "configure"
+#line 20620 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20637,16 +20636,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20643: \$? = $ac_status" >&5
+  echo "$as_me:20642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20649: \$? = $ac_status" >&5
+  echo "$as_me:20648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20658,7 +20657,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20661: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20660: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20681,14 +20680,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20684: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20683: 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 20691 "configure"
+#line 20690 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20706,23 +20705,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20712: \$? = $ac_status" >&5
+  echo "$as_me:20711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20718: \$? = $ac_status" >&5
+  echo "$as_me:20717: \$? = $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 20725 "configure"
+#line 20724 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20741,16 +20740,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20747: \$? = $ac_status" >&5
+  echo "$as_me:20746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20753: \$? = $ac_status" >&5
+  echo "$as_me:20752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20762,7 +20761,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20765: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20764: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20785,14 +20784,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20788: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20787: 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 20795 "configure"
+#line 20794 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20810,23 +20809,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20816: \$? = $ac_status" >&5
+  echo "$as_me:20815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20822: \$? = $ac_status" >&5
+  echo "$as_me:20821: \$? = $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 20829 "configure"
+#line 20828 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20845,16 +20844,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20851: \$? = $ac_status" >&5
+  echo "$as_me:20850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20857: \$? = $ac_status" >&5
+  echo "$as_me:20856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20866,7 +20865,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20869: result: $cf_cv_wint_t" >&5
+echo "$as_me:20868: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20890,10 +20889,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20893: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20892: 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 20896 "configure"
+#line 20895 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20911,16 +20910,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20917: \$? = $ac_status" >&5
+  echo "$as_me:20916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20923: \$? = $ac_status" >&5
+  echo "$as_me:20922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20929,7 +20928,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20932: result: $cf_result" >&5
+echo "$as_me:20931: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20951,10 +20950,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20954: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20953: 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 20957 "configure"
+#line 20956 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20972,16 +20971,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20978: \$? = $ac_status" >&5
+  echo "$as_me:20977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20984: \$? = $ac_status" >&5
+  echo "$as_me:20983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20990,7 +20989,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20993: result: $cf_result" >&5
+echo "$as_me:20992: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21012,10 +21011,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21015: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21014: 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 21018 "configure"
+#line 21017 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21033,16 +21032,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21039: \$? = $ac_status" >&5
+  echo "$as_me:21038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21045: \$? = $ac_status" >&5
+  echo "$as_me:21044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21051,7 +21050,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21054: result: $cf_result" >&5
+echo "$as_me:21053: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21080,11 +21079,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21083: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21082: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21087 "configure"
+#line 21086 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21117,16 +21116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21123: \$? = $ac_status" >&5
+  echo "$as_me:21122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21129: \$? = $ac_status" >&5
+  echo "$as_me:21128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21136,7 +21135,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21139: result: $cf_result" >&5
+echo "$as_me:21138: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21148,14 +21147,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21151: checking for data $cf_data in library" >&5
+	echo "$as_me:21150: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21158 "configure"
+#line 21157 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21194,16 +21193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21200: \$? = $ac_status" >&5
+  echo "$as_me:21199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21206: \$? = $ac_status" >&5
+  echo "$as_me:21205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21215,7 +21214,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21218 "configure"
+#line 21217 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21247,15 +21246,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21253: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21258: \$? = $ac_status" >&5
+  echo "$as_me:21257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21267,7 +21266,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21270: result: $cf_result" >&5
+	echo "$as_me:21269: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21284,7 +21283,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21287: checking for X" >&5
+	echo "$as_me:21286: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21388,17 +21387,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21391 "configure"
+#line 21390 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21395: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21394: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21401: \$? = $ac_status" >&5
+  echo "$as_me:21400: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21431,7 +21430,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21434 "configure"
+#line 21433 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21443,16 +21442,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21449: \$? = $ac_status" >&5
+  echo "$as_me:21448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21455: \$? = $ac_status" >&5
+  echo "$as_me:21454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21490,7 +21489,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21493: result: $have_x" >&5
+  echo "$as_me:21492: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21500,7 +21499,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21503: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21502: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21527,11 +21526,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21530: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21529: 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 21534 "configure"
+#line 21533 "configure"
 #include "confdefs.h"
 
 int
@@ -21543,16 +21542,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21549: \$? = $ac_status" >&5
+  echo "$as_me:21548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21555: \$? = $ac_status" >&5
+  echo "$as_me:21554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21562,13 +21561,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21565: result: no" >&5
+	echo "$as_me:21564: 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 21571 "configure"
+#line 21570 "configure"
 #include "confdefs.h"
 
 int
@@ -21580,16 +21579,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21586: \$? = $ac_status" >&5
+  echo "$as_me:21585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21592: \$? = $ac_status" >&5
+  echo "$as_me:21591: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21599,11 +21598,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21602: result: yes" >&5
+	  echo "$as_me:21601: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21606: result: neither works" >&5
+	  echo "$as_me:21605: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21623,7 +21622,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21626 "configure"
+#line 21625 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21642,22 +21641,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21648: \$? = $ac_status" >&5
+  echo "$as_me:21647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21654: \$? = $ac_status" >&5
+  echo "$as_me:21653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21660: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21659: 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
@@ -21665,7 +21664,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21668 "configure"
+#line 21667 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21684,16 +21683,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21690: \$? = $ac_status" >&5
+  echo "$as_me:21689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21696: \$? = $ac_status" >&5
+  echo "$as_me:21695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21704,14 +21703,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21707: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21706: 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:21714: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21713: 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
@@ -21719,7 +21718,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21722 "configure"
+#line 21721 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21738,16 +21737,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21744: \$? = $ac_status" >&5
+  echo "$as_me:21743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21750: \$? = $ac_status" >&5
+  echo "$as_me:21749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21758,7 +21757,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21761: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21760: 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"
@@ -21777,13 +21776,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21780: checking for gethostbyname" >&5
+    echo "$as_me:21779: 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 21786 "configure"
+#line 21785 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21814,16 +21813,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21820: \$? = $ac_status" >&5
+  echo "$as_me:21819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21826: \$? = $ac_status" >&5
+  echo "$as_me:21825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21833,11 +21832,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21836: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21835: 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:21840: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21839: 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
@@ -21845,7 +21844,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21848 "configure"
+#line 21847 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21864,16 +21863,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21870: \$? = $ac_status" >&5
+  echo "$as_me:21869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21876: \$? = $ac_status" >&5
+  echo "$as_me:21875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21884,14 +21883,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21887: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21886: 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:21894: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21893: 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
@@ -21899,7 +21898,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21902 "configure"
+#line 21901 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21918,16 +21917,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21924: \$? = $ac_status" >&5
+  echo "$as_me:21923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21930: \$? = $ac_status" >&5
+  echo "$as_me:21929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21938,7 +21937,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21941: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21940: 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"
@@ -21954,13 +21953,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21957: checking for connect" >&5
+    echo "$as_me:21956: 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 21963 "configure"
+#line 21962 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21991,16 +21990,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21997: \$? = $ac_status" >&5
+  echo "$as_me:21996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22003: \$? = $ac_status" >&5
+  echo "$as_me:22002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22010,11 +22009,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22013: result: $ac_cv_func_connect" >&5
+echo "$as_me:22012: 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:22017: checking for connect in -lsocket" >&5
+      echo "$as_me:22016: 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
@@ -22022,7 +22021,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22025 "configure"
+#line 22024 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22041,16 +22040,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22047: \$? = $ac_status" >&5
+  echo "$as_me:22046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22053: \$? = $ac_status" >&5
+  echo "$as_me:22052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22061,7 +22060,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22064: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22063: 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"
@@ -22070,13 +22069,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22073: checking for remove" >&5
+    echo "$as_me:22072: 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 22079 "configure"
+#line 22078 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22107,16 +22106,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22113: \$? = $ac_status" >&5
+  echo "$as_me:22112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22119: \$? = $ac_status" >&5
+  echo "$as_me:22118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22126,11 +22125,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22129: result: $ac_cv_func_remove" >&5
+echo "$as_me:22128: 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:22133: checking for remove in -lposix" >&5
+      echo "$as_me:22132: 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
@@ -22138,7 +22137,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22141 "configure"
+#line 22140 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22157,16 +22156,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22163: \$? = $ac_status" >&5
+  echo "$as_me:22162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22169: \$? = $ac_status" >&5
+  echo "$as_me:22168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22177,7 +22176,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22180: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22179: 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"
@@ -22186,13 +22185,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22189: checking for shmat" >&5
+    echo "$as_me:22188: 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 22195 "configure"
+#line 22194 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22223,16 +22222,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22229: \$? = $ac_status" >&5
+  echo "$as_me:22228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22235: \$? = $ac_status" >&5
+  echo "$as_me:22234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22242,11 +22241,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22245: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22244: 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:22249: checking for shmat in -lipc" >&5
+      echo "$as_me:22248: 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
@@ -22254,7 +22253,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22257 "configure"
+#line 22256 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22273,16 +22272,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22279: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22285: \$? = $ac_status" >&5
+  echo "$as_me:22284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22293,7 +22292,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22296: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22295: 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"
@@ -22311,7 +22310,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22314: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22313: 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
@@ -22319,7 +22318,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22322 "configure"
+#line 22321 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22338,16 +22337,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22344: \$? = $ac_status" >&5
+  echo "$as_me:22343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22350: \$? = $ac_status" >&5
+  echo "$as_me:22349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22358,7 +22357,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22361: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22360: 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"
@@ -22405,16 +22404,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22408: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22407: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22413: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22412: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22417: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22416: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22453,16 +22452,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22456: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22455: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22461: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22460: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22465: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22464: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22501,23 +22500,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22504: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22509: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22508: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22513: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22512: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22520: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22519: 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.
@@ -22534,7 +22533,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22537: result: $enable_warnings" >&5
+echo "$as_me:22536: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22557,10 +22556,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22560: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22559: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22563 "${as_me:-configure}"
+#line 22562 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22610,12 +22609,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22613: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22616: \$? = $ac_status" >&5
+  echo "$as_me:22615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22618: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22617: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22693,7 +22692,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22696 "configure"
+#line 22695 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22708,26 +22707,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22714: \$? = $ac_status" >&5
+  echo "$as_me:22713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22720: \$? = $ac_status" >&5
+  echo "$as_me:22719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22723: checking for X11/Xt const-feature" >&5
+echo "$as_me:22722: 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 22730 "configure"
+#line 22729 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22745,16 +22744,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22751: \$? = $ac_status" >&5
+  echo "$as_me:22750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22757: \$? = $ac_status" >&5
+  echo "$as_me:22756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22769,7 +22768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22772: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22771: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22798,7 +22797,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22801 "${as_me:-configure}"
+#line 22800 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22814,7 +22813,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22817: checking for $CC warning options..." >&5
+	{ echo "$as_me:22816: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22830,12 +22829,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22833: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:22835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22838: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22837: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22843,7 +22842,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22846: checking for $CC warning options..." >&5
+	{ echo "$as_me:22845: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22866,12 +22865,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22869: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22872: \$? = $ac_status" >&5
+  echo "$as_me:22871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22874: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22873: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22879,7 +22878,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22882: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22889,7 +22888,7 @@ echo "${as_me:-configure}:22882: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22892: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22906,7 +22905,7 @@ fi
 
 fi
 
-echo "$as_me:22909: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22908: 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.
@@ -22928,7 +22927,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22931: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22930: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23042,23 +23041,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23045: checking for dmalloc.h" >&5
+	echo "$as_me:23044: 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 23051 "configure"
+#line 23050 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23055: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23061: \$? = $ac_status" >&5
+  echo "$as_me:23060: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23077,11 +23076,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23080: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23079: 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:23084: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23083: 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
@@ -23089,7 +23088,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23092 "configure"
+#line 23091 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23108,16 +23107,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23114: \$? = $ac_status" >&5
+  echo "$as_me:23113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23120: \$? = $ac_status" >&5
+  echo "$as_me:23119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23128,7 +23127,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23131: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23130: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23143,7 +23142,7 @@ fi
 
 fi
 
-echo "$as_me:23146: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23145: 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.
@@ -23165,7 +23164,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23168: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23167: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23279,23 +23278,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23282: checking for dbmalloc.h" >&5
+	echo "$as_me:23281: 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 23288 "configure"
+#line 23287 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23292: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23291: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23298: \$? = $ac_status" >&5
+  echo "$as_me:23297: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23314,11 +23313,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23317: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23316: 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:23321: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23320: 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
@@ -23326,7 +23325,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23329 "configure"
+#line 23328 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23345,16 +23344,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23351: \$? = $ac_status" >&5
+  echo "$as_me:23350: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23357: \$? = $ac_status" >&5
+  echo "$as_me:23356: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23365,7 +23364,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23368: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23367: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23380,7 +23379,7 @@ fi
 
 fi
 
-echo "$as_me:23383: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23382: 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.
@@ -23402,7 +23401,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23405: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23404: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23515,7 +23514,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23518: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23517: 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.
@@ -23526,7 +23525,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23529: result: $with_no_leaks" >&5
+echo "$as_me:23528: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23544,7 +23543,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23547: checking for an rpath option" >&5
+	echo "$as_me:23546: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23575,12 +23574,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23578: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23577: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23583: checking if we need a space after rpath option" >&5
+		echo "$as_me:23582: 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"
 
@@ -23601,7 +23600,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23604 "configure"
+#line 23603 "configure"
 #include "confdefs.h"
 
 int
@@ -23613,16 +23612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23619: \$? = $ac_status" >&5
+  echo "$as_me:23618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23625: \$? = $ac_status" >&5
+  echo "$as_me:23624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23632,14 +23631,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23635: result: $cf_rpath_space" >&5
+		echo "$as_me:23634: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23642: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23641: 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.
@@ -23657,22 +23656,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23660: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23659: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23665: checking for updated LDFLAGS" >&5
+echo "$as_me:23664: 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:23668: result: maybe" >&5
+	echo "$as_me:23667: 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:23675: checking for $ac_word" >&5
+echo "$as_me:23674: 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
@@ -23687,7 +23686,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23690: found $ac_dir/$ac_word" >&5
+echo "$as_me:23689: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23695,10 +23694,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23698: result: $cf_ldd_prog" >&5
+  echo "$as_me:23697: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23701: result: no" >&5
+  echo "$as_me:23700: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23712,7 +23711,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23715 "configure"
+#line 23714 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23724,16 +23723,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23730: \$? = $ac_status" >&5
+  echo "$as_me:23729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23736: \$? = $ac_status" >&5
+  echo "$as_me:23735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23761,7 +23760,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23764: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23773,11 +23772,11 @@ echo "${as_me:-configure}:23764: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23776: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23775: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23780: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23779: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23814,7 +23813,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23817: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23816: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23827,11 +23826,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23830: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23829: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23834: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23833: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23868,7 +23867,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23871: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23870: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23881,14 +23880,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23884: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23883: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23888: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23891: result: no" >&5
+	echo "$as_me:23890: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23978,7 +23977,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23981: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23980: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24159,7 +24158,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24162: error: ambiguous option: $1
+    { { echo "$as_me:24161: 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;}
@@ -24178,7 +24177,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24181: error: unrecognized option: $1
+  -*) { { echo "$as_me:24180: 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;}
@@ -24228,7 +24227,7 @@ do
   "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:24231: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24230: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24536,7 +24535,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24539: creating $ac_file" >&5
+    { echo "$as_me:24538: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24554,7 +24553,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24557: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24556: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24567,7 +24566,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24570: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24569: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24583,7 +24582,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24586: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24585: 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;}
@@ -24592,7 +24591,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24595: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24594: 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;}
@@ -24637,7 +24636,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24640: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24639: 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;}
@@ -24648,7 +24647,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24651: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24650: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24697,7 +24696,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24700: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24699: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24708,7 +24707,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24711: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24710: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24721,7 +24720,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24724: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24723: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24779,7 +24778,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24782: $ac_file is unchanged" >&5
+      { echo "$as_me:24781: $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/test/configure.in b/test/configure.in
index 699436492..4df1c11f9 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.173 2023/04/23 20:30:38 tom Exp $
+dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -255,7 +255,6 @@ CF_GETOPT_HEADER
 CF_FUNC_GETTIME
 
 AC_CHECK_FUNCS( \
-cfmakeraw \
 getopt \
 snprintf \
 strdup \
diff --git a/test/test_mouse.c b/test/test_mouse.c
index 126d2d6de..5508ea42f 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.29 2024/02/10 14:39:40 tom Exp $
+ * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -35,39 +35,24 @@
 
 static int logoffset = 0;
 
-static int
+static void
 raw_loop(void)
 {
-    struct termios tty;
-    struct termios old;
     char *xtermcap;
 
-    tcgetattr(0, &old);
-#if HAVE_CFMAKERAW
-    cfmakeraw(&tty);
-#else
-    tty = old;
-    tty.c_iflag &= (unsigned) (~(IGNBRK | BRKINT | PARMRK | ISTRIP
-				 | INLCR | IGNCR | ICRNL | IXON));
-    tty.c_oflag &= (unsigned) (~OPOST);
-    tty.c_lflag &= (unsigned) (~(ECHO | ECHONL | ICANON | ISIG | IEXTEN));
-    tty.c_cflag &= (unsigned) (~(CSIZE | PARENB));
-    tty.c_cflag |= CS8;
-    tcsetattr(0, TCSANOW, &tty);
-#endif
+    printf("Entering raw mode. Ctrl-c to quit.\n");
 
-    setupterm(NULL, 0, 0);
+    newterm(NULL, stdout, stdin);
+    raw();
     xtermcap = tigetstr("XM");
     if (!VALID_STRING(xtermcap)) {
 	fprintf(stderr, "couldn't get XM terminfo");
-	return 1;
+	return;
     }
 
     putp(tgoto(xtermcap, 1, 1));
     fflush(stdout);
 
-    tcsetattr(0, TCSANOW, &tty);
-
     while (1) {
 	int c = getc(stdin);
 	const char *pretty;
@@ -87,8 +72,7 @@ raw_loop(void)
 
     putp(tgoto(xtermcap, 0, 0));
     fflush(stdout);
-    tcsetattr(0, TCSANOW, &old);
-    return 0;
+    noraw();
 }
 
 static void logw(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
@@ -117,78 +101,9 @@ logw(const char *fmt, ...)
 }
 
 static void
-usage(int ok)
+cooked_loop(char *my_environ, int interval)
 {
-    static const char *msg[] =
-    {
-	"Usage: test_mouse [options]"
-	,""
-	,"Test mouse events.  These examples for $TERM demonstrate xterm"
-	,"features:"
-	,"    xterm"
-	,"    xterm-1002"
-	,"    xterm-1003"
-	,""
-	,USAGE_COMMON
-	,"Options:"
-	," -r       show raw input stream, injecting a new line before every ESC"
-	," -i n     set mouse interval to n; default is 0 (no double-clicks)"
-	," -T term  use terminal description other than $TERM"
-    };
-    unsigned n;
-    for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) {
-	fprintf(stderr, "%s\n", msg[n]);
-    }
-    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-/* *INDENT-OFF* */
-VERSION_COMMON()
-/* *INDENT-ON* */
-
-int
-main(int argc, char *argv[])
-{
-    bool rawmode = FALSE;
-    int interval = 0;
-    int ch;
     MEVENT event;
-    size_t my_len;
-    char *my_environ = NULL;
-    const char *term_format = "TERM=%s";
-
-    while ((ch = getopt(argc, argv, OPTS_COMMON "i:rT:")) != -1) {
-	switch (ch) {
-	case 'i':
-	    interval = atoi(optarg);
-	    break;
-	case 'r':
-	    rawmode = TRUE;
-	    break;
-	case 'T':
-	    my_len = strlen(term_format) + strlen(optarg) + 1;
-	    my_environ = malloc(my_len);
-	    if (my_environ != NULL) {
-		_nc_SPRINTF(my_environ, _nc_SLIMIT(my_len) term_format, optarg);
-		putenv(my_environ);
-	    }
-	    break;
-	case OPTS_VERSION:
-	    show_version(argv);
-	    ExitProgram(EXIT_SUCCESS);
-	default:
-	    usage(ch == OPTS_USAGE);
-	    /* NOTREACHED */
-	}
-    }
-    if (optind < argc) {
-	usage(FALSE);
-	ExitProgram(EXIT_FAILURE);
-    }
-
-    if (rawmode) {
-	printf("Entering raw mode. Ctrl-c to quit.\n");
-	return raw_loop();
-    }
 
     initscr();
     noecho();
@@ -281,6 +196,82 @@ main(int argc, char *argv[])
     }
   end:
     endwin();
+}
+
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_mouse [options]"
+	,""
+	,"Test mouse events.  These examples for $TERM demonstrate xterm"
+	,"features:"
+	,"    xterm"
+	,"    xterm-1002"
+	,"    xterm-1003"
+	,""
+	,USAGE_COMMON
+	,"Options:"
+	," -r       show raw input stream, injecting a new line before every ESC"
+	," -i n     set mouse interval to n; default is 0 (no double-clicks)"
+	," -T term  use terminal description other than $TERM"
+    };
+    unsigned n;
+    for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) {
+	fprintf(stderr, "%s\n", msg[n]);
+    }
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
+int
+main(int argc, char *argv[])
+{
+    bool rawmode = FALSE;
+    int interval = 0;
+    int ch;
+    size_t my_len;
+    char *my_environ = NULL;
+    const char *term_format = "TERM=%s";
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON "i:rT:")) != -1) {
+	switch (ch) {
+	case 'i':
+	    interval = atoi(optarg);
+	    break;
+	case 'r':
+	    rawmode = TRUE;
+	    break;
+	case 'T':
+	    my_len = strlen(term_format) + strlen(optarg) + 1;
+	    my_environ = malloc(my_len);
+	    if (my_environ != NULL) {
+		_nc_SPRINTF(my_environ, _nc_SLIMIT(my_len) term_format, optarg);
+		putenv(my_environ);
+	    }
+	    break;
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc) {
+	usage(FALSE);
+	ExitProgram(EXIT_FAILURE);
+    }
+
+    if (rawmode) {
+	raw_loop();
+    } else {
+	cooked_loop(my_environ, interval);
+    }
+
     ExitProgram(EXIT_SUCCESS);
 }
 #else

From 76fb72e10c3eeb26ff556c3b00e9bf787190fc8a Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 14 Apr 2024 03:07:57 +0200
Subject: [PATCH 060/106] ncurses-6.4-20240413.patch

---
 NEWS                                          |   10 +-
 VERSION                                       |    2 +-
 configure                                     | 2387 +++++++++--------
 configure.in                                  |   20 +-
 dist.mk                                       |    4 +-
 .../ada/terminal_interface-curses__adb.htm    |    8 +-
 doc/html/man/curs_add_wch.3x.html             |   17 +-
 doc/html/man/curs_add_wchstr.3x.html          |   22 +-
 doc/html/man/curs_addch.3x.html               |  100 +-
 doc/html/man/curs_addchstr.3x.html            |   20 +-
 doc/html/man/curs_addstr.3x.html              |   12 +-
 doc/html/man/curs_addwstr.3x.html             |   12 +-
 doc/html/man/curs_get_wch.3x.html             |   14 +-
 doc/html/man/curs_get_wstr.3x.html            |   13 +-
 doc/html/man/curs_getcchar.3x.html            |   10 +-
 doc/html/man/curs_getch.3x.html               |   24 +-
 doc/html/man/curs_getstr.3x.html              |   11 +-
 doc/html/man/curs_in_wch.3x.html              |   14 +-
 doc/html/man/curs_in_wchstr.3x.html           |   22 +-
 doc/html/man/curs_inch.3x.html                |   21 +-
 doc/html/man/curs_initscr.3x.html             |   12 +-
 doc/html/man/curs_inopts.3x.html              |   21 +-
 doc/html/man/curs_ins_wstr.3x.html            |   13 +-
 doc/html/man/curs_instr.3x.html               |   14 +-
 doc/html/man/curs_kernel.3x.html              |   49 +-
 doc/html/man/curs_outopts.3x.html             |   43 +-
 doc/html/man/curs_pad.3x.html                 |  157 +-
 doc/html/man/curs_scroll.3x.html              |    8 +-
 doc/html/man/curs_termattrs.3x.html           |   12 +-
 doc/html/man/curs_terminfo.3x.html            |   89 +-
 doc/html/man/curs_variables.3x.html           |   26 +-
 doc/html/man/default_colors.3x.html           |   10 +-
 doc/html/man/ncurses.3x.html                  |  884 +++---
 doc/html/man/terminfo.5.html                  |    2 +-
 doc/html/man/tput.1.html                      |   10 +-
 man/curs_add_wch.3x                           |    9 +-
 man/curs_add_wchstr.3x                        |   19 +-
 man/curs_addch.3x                             |   72 +-
 man/curs_addchstr.3x                          |   20 +-
 man/curs_addstr.3x                            |   12 +-
 man/curs_addwstr.3x                           |   12 +-
 man/curs_get_wch.3x                           |   12 +-
 man/curs_get_wstr.3x                          |    9 +-
 man/curs_getcchar.3x                          |    6 +-
 man/curs_getch.3x                             |   18 +-
 man/curs_getstr.3x                            |    9 +-
 man/curs_in_wch.3x                            |   11 +-
 man/curs_in_wchstr.3x                         |   18 +-
 man/curs_inch.3x                              |   23 +-
 man/curs_initscr.3x                           |    6 +-
 man/curs_inopts.3x                            |   35 +-
 man/curs_ins_wstr.3x                          |    9 +-
 man/curs_instr.3x                             |   13 +-
 man/curs_kernel.3x                            |   19 +-
 man/curs_outopts.3x                           |   29 +-
 man/curs_pad.3x                               |  154 +-
 man/curs_scroll.3x                            |    6 +-
 man/curs_termattrs.3x                         |    6 +-
 man/curs_terminfo.3x                          |   36 +-
 man/curs_variables.3x                         |   36 +-
 man/default_colors.3x                         |    6 +-
 man/man_db.renames.in                         |    9 +-
 man/manhtml.aliases                           |    8 +-
 man/manhtml.externs                           |    5 +-
 man/ncurses.3x                                |  902 ++++---
 man/tput.1                                    |    6 +-
 ncurses/curses.priv.h                         |   10 +-
 ncurses/tinfo/lib_setup.c                     |   42 +-
 package/debian-mingw/changelog                |    4 +-
 package/debian-mingw64/changelog              |    4 +-
 package/debian/changelog                      |    4 +-
 package/debian/ncurses6.lintian-overrides     |   10 +-
 package/debian/ncursest6.lintian-overrides    |   10 +-
 package/debian/rules                          |   14 +-
 package/mingw-ncurses.nsi                     |    4 +-
 package/mingw-ncurses.spec                    |    2 +-
 package/ncurses.spec                          |    2 +-
 package/ncursest.spec                         |    2 +-
 progs/Makefile.in                             |   25 +-
 progs/progs.priv.h                            |  136 +-
 progs/reset_cmd.c                             |    6 +-
 progs/reset_cmd.h                             |    6 +-
 progs/tset.c                                  |    6 +-
 83 files changed, 3029 insertions(+), 2886 deletions(-)

diff --git a/NEWS b/NEWS
index 619e9ea05..974a2e0eb 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4101 2024/03/30 23:44:22 tom Exp $
+-- $Id: NEWS,v 1.4107 2024/04/14 00:19:51 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240413
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ provide for padding in check-size feature, using new_prescr() to
+	  pass interim SCREEN pointer.
+	+ complete change for opaque options (Gentoo #928973, cf: 20231021).
+	+ update package /debian/rules and related lintian overrides
+	+ revise progs.priv.h to provide for NC_ISATTY reuse
+
 20240330
 	+ remove masking of ISIG in cbreak() (report by Benno Schulenberg).
 	+ modify test/test_mouse.c to use curses api for raw/noraw.
diff --git a/VERSION b/VERSION
index 72196423c..e327a6fec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240330
+5:0:10	6.4	20240413
diff --git a/configure b/configure
index e3486ba79..488d93fc1 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.776 .
+# From configure.in Revision: 1.779 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -16270,9 +16270,9 @@ echo $ECHO_N "checking whether curses library structures should be opaque... $EC
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
 if test "${enable_opaque_curses+set}" = set; then
   enableval="$enable_opaque_curses"
-  test "$enableval" != yes && enableval=no
-	if test "$enableval" != "no" ; then
-    enable_opaque_curses=yes
+  test "$enableval" != no && enableval=yes
+	if test "$enableval" != "yes" ; then
+    enable_opaque_curses=no
 	else
 
 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
@@ -16280,7 +16280,7 @@ if test "${enable_opaque_curses+set}" = set; then
 
 	fi
 else
-  enableval=no
+  enableval=yes
 
 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
@@ -16301,37 +16301,58 @@ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
 if test "${enable_opaque_form+set}" = set; then
   enableval="$enable_opaque_form"
-  enable_opaque_form=yes
+  test "$enableval" != no && enableval=yes
+	if test "$enableval" != "yes" ; then
+    enable_opaque_form=no
+	else
+		enable_opaque_form=$cf_dft_opaque_curses
+	fi
 else
-  enable_opaque_form=$cf_dft_opaque_curses
+  enableval=yes
+	enable_opaque_form=$cf_dft_opaque_curses
+
 fi;
-echo "$as_me:16308: result: $enable_opaque_form" >&5
+echo "$as_me:16315: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16311: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16318: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
 if test "${enable_opaque_menu+set}" = set; then
   enableval="$enable_opaque_menu"
-  enable_opaque_menu=yes
+  test "$enableval" != no && enableval=yes
+	if test "$enableval" != "yes" ; then
+    enable_opaque_menu=no
+	else
+		enable_opaque_menu=$cf_dft_opaque_curses
+	fi
 else
-  enable_opaque_menu=$cf_dft_opaque_curses
+  enableval=yes
+	enable_opaque_menu=$cf_dft_opaque_curses
+
 fi;
-echo "$as_me:16321: result: $enable_opaque_menu" >&5
+echo "$as_me:16335: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16324: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16338: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
 if test "${enable_opaque_panel+set}" = set; then
   enableval="$enable_opaque_panel"
-  enable_opaque_panel=yes
+  test "$enableval" != no && enableval=yes
+	if test "$enableval" != "yes" ; then
+    enable_opaque_panel=no
+	else
+		enable_opaque_panel=$cf_dft_opaque_curses
+	fi
 else
-  enable_opaque_panel=$cf_dft_opaque_curses
+  enableval=yes
+	enable_opaque_panel=$cf_dft_opaque_curses
+
 fi;
-echo "$as_me:16334: result: $enable_opaque_panel" >&5
+echo "$as_me:16355: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16341,7 +16362,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16344: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16365: 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.
@@ -16351,7 +16372,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16354: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16375: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16364,7 +16385,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16367: checking if you want all development code" >&5
+echo "$as_me:16388: 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.
@@ -16374,11 +16395,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16377: result: $with_develop" >&5
+echo "$as_me:16398: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16381: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16402: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16388,7 +16409,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16391: result: $enable_check_size" >&5
+echo "$as_me:16412: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16396,7 +16417,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16399: checking if you want hard-tabs code" >&5
+echo "$as_me:16420: 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.
@@ -16406,7 +16427,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16409: result: $enable_hard_tabs" >&5
+echo "$as_me:16430: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16414,7 +16435,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16417: checking if you want limited support for xmc" >&5
+echo "$as_me:16438: 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.
@@ -16424,7 +16445,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16427: result: $enable_xmc_glitch" >&5
+echo "$as_me:16448: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16434,7 +16455,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16437: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16458: 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.
@@ -16444,7 +16465,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16447: result: $with_assumed_color" >&5
+echo "$as_me:16468: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16452,7 +16473,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16455: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16476: 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.
@@ -16462,7 +16483,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16465: result: $with_hashmap" >&5
+echo "$as_me:16486: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16470,7 +16491,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16473: checking if you want colorfgbg code" >&5
+echo "$as_me:16494: 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.
@@ -16480,7 +16501,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16483: result: $with_colorfgbg" >&5
+echo "$as_me:16504: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16488,7 +16509,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16491: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16512: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16498,14 +16519,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16501: result: $cf_with_fvisibility" >&5
+echo "$as_me:16522: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16508: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16529: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16514,7 +16535,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16517 "configure"
+#line 16538 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16530,16 +16551,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16536: \$? = $ac_status" >&5
+  echo "$as_me:16557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16542: \$? = $ac_status" >&5
+  echo "$as_me:16563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16551,7 +16572,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16554: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16575: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16666,7 +16687,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16669: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16690: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16675,7 +16696,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16678 "configure"
+#line 16699 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16691,16 +16712,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16697: \$? = $ac_status" >&5
+  echo "$as_me:16718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16703: \$? = $ac_status" >&5
+  echo "$as_me:16724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16712,7 +16733,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16715: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16736: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16835,7 +16856,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16838: checking if you want interop bindings" >&5
+echo "$as_me:16859: 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.
@@ -16845,13 +16866,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16848: result: $with_exp_interop" >&5
+echo "$as_me:16869: 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:16854: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16875: 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.
@@ -16861,13 +16882,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16864: result: $with_safe_sprintf" >&5
+echo "$as_me:16885: 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:16870: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16891: 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.
@@ -16877,7 +16898,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16880: result: $with_scroll_hints" >&5
+echo "$as_me:16901: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16886,7 +16907,7 @@ EOF
 
 fi
 
-echo "$as_me:16889: checking if you want wgetch-events code" >&5
+echo "$as_me:16910: 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.
@@ -16896,7 +16917,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16899: result: $with_wgetch_events" >&5
+echo "$as_me:16920: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16911,7 +16932,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16914: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:16935: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16921,7 +16942,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16924: result: $with_exp_win32" >&5
+	echo "$as_me:16945: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16947,7 +16968,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16950: checking if you want to see long compiling messages" >&5
+echo "$as_me:16971: 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.
@@ -16981,7 +17002,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16984: result: $enableval" >&5
+echo "$as_me:17005: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -16994,7 +17015,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:16997: checking if you want to install stripped executables" >&5
+echo "$as_me:17018: 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.
@@ -17011,7 +17032,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17014: result: $enable_stripping" >&5
+echo "$as_me:17035: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17022,7 +17043,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17025: checking if install accepts -p option" >&5
+echo "$as_me:17046: 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
@@ -17053,10 +17074,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17056: result: $cf_cv_install_p" >&5
+echo "$as_me:17077: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17059: checking if install needs to be told about ownership" >&5
+echo "$as_me:17080: 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)
@@ -17067,7 +17088,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17070: result: $with_install_o" >&5
+echo "$as_me:17091: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17078,7 +17099,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17081: checking if you want to specify strip-program" >&5
+	echo "$as_me:17102: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17088,11 +17109,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17091: result: $with_strip_program" >&5
+	echo "$as_me:17112: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17095: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17116: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17113,11 +17134,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17116: result: $check_install_strip" >&5
+		echo "$as_me:17137: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17120: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17141: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17132,7 +17153,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17135: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17156: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17158,7 +17179,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17161: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17182: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17175,17 +17196,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17178: result: $enable_stdnoreturn" >&5
+echo "$as_me:17199: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17182: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17203: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17188 "configure"
+#line 17209 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17201,16 +17222,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17225: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17207: \$? = $ac_status" >&5
+  echo "$as_me:17228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17213: \$? = $ac_status" >&5
+  echo "$as_me:17234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17221,7 +17242,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17224: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17245: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17277,16 +17298,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17280: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17301: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17285: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17306: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17289: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17310: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17325,16 +17346,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17328: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17349: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17333: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17354: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17337: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17358: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17373,23 +17394,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17376: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17397: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17381: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17402: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17385: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17406: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17392: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17413: 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.
@@ -17406,7 +17427,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17409: result: $enable_warnings" >&5
+echo "$as_me:17430: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17430,7 +17451,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17433 "configure"
+#line 17454 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17445,26 +17466,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17451: \$? = $ac_status" >&5
+  echo "$as_me:17472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17457: \$? = $ac_status" >&5
+  echo "$as_me:17478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17460: checking for X11/Xt const-feature" >&5
+echo "$as_me:17481: 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 17467 "configure"
+#line 17488 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17482,16 +17503,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17488: \$? = $ac_status" >&5
+  echo "$as_me:17509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17494: \$? = $ac_status" >&5
+  echo "$as_me:17515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17506,7 +17527,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17509: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17530: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17535,7 +17556,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17538 "${as_me:-configure}"
+#line 17559 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17551,7 +17572,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17554: checking for $CC warning options..." >&5
+	{ echo "$as_me:17575: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17567,12 +17588,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17570: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17573: \$? = $ac_status" >&5
+  echo "$as_me:17594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17575: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17596: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17580,7 +17601,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17583: checking for $CC warning options..." >&5
+	{ echo "$as_me:17604: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17603,12 +17624,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17606: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17609: \$? = $ac_status" >&5
+  echo "$as_me:17630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17611: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17632: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17616,7 +17637,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17619: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17640: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17626,7 +17647,7 @@ echo "${as_me:-configure}:17619: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17629: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17650: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17659,10 +17680,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17662: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17683: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17665 "${as_me:-configure}"
+#line 17686 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17712,12 +17733,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17715: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17718: \$? = $ac_status" >&5
+  echo "$as_me:17739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17720: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17741: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17789,12 +17810,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17792: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:17813: 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 17797 "configure"
+#line 17818 "configure"
 #include "confdefs.h"
 
 int
@@ -17811,16 +17832,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17817: \$? = $ac_status" >&5
+  echo "$as_me:17838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17823: \$? = $ac_status" >&5
+  echo "$as_me:17844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17831,7 +17852,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17834: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:17855: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17840,11 +17861,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17843: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:17864: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17847 "configure"
+#line 17868 "configure"
 #include "confdefs.h"
 
 int
@@ -17861,16 +17882,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17867: \$? = $ac_status" >&5
+  echo "$as_me:17888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17873: \$? = $ac_status" >&5
+  echo "$as_me:17894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17880,7 +17901,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17883: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:17904: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17889,30 +17910,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17892: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:17913: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17899: checking version of $CC" >&5
+	echo "$as_me:17920: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17903: result: $CLANG_VERSION" >&5
+	echo "$as_me:17924: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17910: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:17931: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17915 "configure"
+#line 17936 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17926,16 +17947,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17932: \$? = $ac_status" >&5
+  echo "$as_me:17953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17938: \$? = $ac_status" >&5
+  echo "$as_me:17959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17946,13 +17967,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17949: result: $cf_clang_optok" >&5
+		echo "$as_me:17970: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17955: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17976: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17969,7 +17990,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17972 "configure"
+#line 17993 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -17987,7 +18008,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:17990: checking for $CC warning options..." >&5
+	{ echo "$as_me:18011: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18004,12 +18025,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18010: \$? = $ac_status" >&5
+  echo "$as_me:18031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18012: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18033: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18018,7 +18039,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18021: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18042: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18048,16 +18069,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18051: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18054: \$? = $ac_status" >&5
+  echo "$as_me:18075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18056: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18077: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18060: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18081: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18075,7 +18096,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18078: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18099: 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.
@@ -18085,7 +18106,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18088: result: $enable_string_hacks" >&5
+echo "$as_me:18109: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18094,15 +18115,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18097: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18118: 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:18099: checking for strlcat" >&5
+	echo "$as_me:18120: 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 18105 "configure"
+#line 18126 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18133,16 +18154,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18139: \$? = $ac_status" >&5
+  echo "$as_me:18160: \$? = $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:18163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18145: \$? = $ac_status" >&5
+  echo "$as_me:18166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18152,7 +18173,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18155: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18176: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18162,7 +18183,7 @@ EOF
 
 else
 
-		echo "$as_me:18165: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18186: 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
@@ -18170,7 +18191,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18173 "configure"
+#line 18194 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18189,16 +18210,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18195: \$? = $ac_status" >&5
+  echo "$as_me:18216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18201: \$? = $ac_status" >&5
+  echo "$as_me:18222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18209,7 +18230,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18212: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18233: 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
 
@@ -18232,23 +18253,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18235: checking for $ac_header" >&5
+echo "$as_me:18256: 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 18241 "configure"
+#line 18262 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18245: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18266: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18251: \$? = $ac_status" >&5
+  echo "$as_me:18272: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18267,7 +18288,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18270: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18291: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18288,13 +18309,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18291: checking for $ac_func" >&5
+echo "$as_me:18312: 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 18297 "configure"
+#line 18318 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18325,16 +18346,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18331: \$? = $ac_status" >&5
+  echo "$as_me:18352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18337: \$? = $ac_status" >&5
+  echo "$as_me:18358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18344,7 +18365,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18347: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18357,7 +18378,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18360: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18381: 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.
@@ -18367,7 +18388,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18370: result: $with_assertions" >&5
+echo "$as_me:18391: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18383,7 +18404,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18386: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18407: 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.
@@ -18405,7 +18426,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18408: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18429: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18519,23 +18540,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18522: checking for dmalloc.h" >&5
+	echo "$as_me:18543: 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 18528 "configure"
+#line 18549 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18532: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18553: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18538: \$? = $ac_status" >&5
+  echo "$as_me:18559: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18554,11 +18575,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18557: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18578: 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:18561: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18582: 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
@@ -18566,7 +18587,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18569 "configure"
+#line 18590 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18585,16 +18606,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18591: \$? = $ac_status" >&5
+  echo "$as_me:18612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18597: \$? = $ac_status" >&5
+  echo "$as_me:18618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18605,7 +18626,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18629: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18620,7 +18641,7 @@ fi
 
 fi
 
-echo "$as_me:18623: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18644: 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.
@@ -18642,7 +18663,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18645: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18666: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18756,23 +18777,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18759: checking for dbmalloc.h" >&5
+	echo "$as_me:18780: 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 18765 "configure"
+#line 18786 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18790: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18775: \$? = $ac_status" >&5
+  echo "$as_me:18796: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18791,11 +18812,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18794: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18815: 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:18798: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18819: 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
@@ -18803,7 +18824,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18806 "configure"
+#line 18827 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18822,16 +18843,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18828: \$? = $ac_status" >&5
+  echo "$as_me:18849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18834: \$? = $ac_status" >&5
+  echo "$as_me:18855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18842,7 +18863,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18845: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18866: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18857,7 +18878,7 @@ fi
 
 fi
 
-echo "$as_me:18860: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18881: 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.
@@ -18879,7 +18900,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18882: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18903: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -18992,7 +19013,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18995: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19016: 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.
@@ -19003,7 +19024,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19006: result: $with_no_leaks" >&5
+echo "$as_me:19027: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19055,7 +19076,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19058: checking whether to add trace feature to all models" >&5
+echo "$as_me:19079: 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.
@@ -19065,7 +19086,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19068: result: $cf_with_trace" >&5
+echo "$as_me:19089: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19179,7 +19200,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19182: checking if we want to use GNAT projects" >&5
+echo "$as_me:19203: 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.
@@ -19196,7 +19217,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19199: result: $enable_gnat_projects" >&5
+echo "$as_me:19220: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19209,14 +19230,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19212: checking if ssp library is needed" >&5
+echo "$as_me:19233: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19219 "configure"
+#line 19240 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19233,16 +19254,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19239: \$? = $ac_status" >&5
+  echo "$as_me:19260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19245: \$? = $ac_status" >&5
+  echo "$as_me:19266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19252,7 +19273,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19255 "configure"
+#line 19276 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19269,16 +19290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19275: \$? = $ac_status" >&5
+  echo "$as_me:19296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19281: \$? = $ac_status" >&5
+  echo "$as_me:19302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19292,7 +19313,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19295: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19316: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19321,14 +19342,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19324: checking if -lm needed for math functions" >&5
+echo "$as_me:19345: 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 19331 "configure"
+#line 19352 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19344,16 +19365,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19350: \$? = $ac_status" >&5
+  echo "$as_me:19371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19356: \$? = $ac_status" >&5
+  echo "$as_me:19377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19363,7 +19384,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19366: result: $cf_cv_need_libm" >&5
+echo "$as_me:19387: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19371,14 +19392,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19374: checking if -lm is available for math functions" >&5
+	echo "$as_me:19395: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19381 "configure"
+#line 19402 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19394,16 +19415,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19400: \$? = $ac_status" >&5
+  echo "$as_me:19421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19406: \$? = $ac_status" >&5
+  echo "$as_me:19427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19413,7 +19434,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19416: result: $cf_cv_have_libm" >&5
+echo "$as_me:19437: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19435,13 +19456,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19438: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19459: 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 19444 "configure"
+#line 19465 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19457,16 +19478,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19463: \$? = $ac_status" >&5
+  echo "$as_me:19484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19469: \$? = $ac_status" >&5
+  echo "$as_me:19490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19476,7 +19497,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19479: result: $ac_cv_header_time" >&5
+echo "$as_me:19500: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19491,7 +19512,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19494: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19515: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19499,7 +19520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19502 "configure"
+#line 19523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19518,16 +19539,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19524: \$? = $ac_status" >&5
+  echo "$as_me:19545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19530: \$? = $ac_status" >&5
+  echo "$as_me:19551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19538,11 +19559,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19541: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19562: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19545: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19566: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19550,7 +19571,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19553 "configure"
+#line 19574 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19569,16 +19590,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19575: \$? = $ac_status" >&5
+  echo "$as_me:19596: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19581: \$? = $ac_status" >&5
+  echo "$as_me:19602: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19589,7 +19610,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19592: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19613: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19611,7 +19632,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19614: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19635: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19619,7 +19640,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19622 "configure"
+#line 19643 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19638,16 +19659,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19644: \$? = $ac_status" >&5
+  echo "$as_me:19665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19650: \$? = $ac_status" >&5
+  echo "$as_me:19671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19658,7 +19679,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19661: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19682: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19680,7 +19701,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19683: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19704: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19688,7 +19709,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19691 "configure"
+#line 19712 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19707,16 +19728,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19713: \$? = $ac_status" >&5
+  echo "$as_me:19734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19719: \$? = $ac_status" >&5
+  echo "$as_me:19740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19727,7 +19748,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19730: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19751: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19769,7 +19790,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19772: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19793: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19777,7 +19798,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19780 "configure"
+#line 19801 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19796,16 +19817,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19802: \$? = $ac_status" >&5
+  echo "$as_me:19823: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19808: \$? = $ac_status" >&5
+  echo "$as_me:19829: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19816,7 +19837,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19819: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19840: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19844,13 +19865,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19847: checking for regcomp" >&5
+	echo "$as_me:19868: 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 19853 "configure"
+#line 19874 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19881,16 +19902,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19887: \$? = $ac_status" >&5
+  echo "$as_me:19908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19893: \$? = $ac_status" >&5
+  echo "$as_me:19914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19900,7 +19921,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19903: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19924: 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
@@ -19909,7 +19930,7 @@ else
 		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:19912: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19933: 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
@@ -19917,7 +19938,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19920 "configure"
+#line 19941 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19936,16 +19957,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19942: \$? = $ac_status" >&5
+  echo "$as_me:19963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19948: \$? = $ac_status" >&5
+  echo "$as_me:19969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19956,7 +19977,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19959: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19980: 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
 
@@ -19988,13 +20009,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:19991: checking for compile" >&5
+	echo "$as_me:20012: 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 19997 "configure"
+#line 20018 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20025,16 +20046,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20031: \$? = $ac_status" >&5
+  echo "$as_me:20052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20037: \$? = $ac_status" >&5
+  echo "$as_me:20058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20044,13 +20065,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20047: result: $ac_cv_func_compile" >&5
+echo "$as_me:20068: 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:20053: checking for compile in -lgen" >&5
+		echo "$as_me:20074: 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
@@ -20058,7 +20079,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20061 "configure"
+#line 20082 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20077,16 +20098,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20083: \$? = $ac_status" >&5
+  echo "$as_me:20104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20089: \$? = $ac_status" >&5
+  echo "$as_me:20110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20097,7 +20118,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20100: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20121: 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
 
@@ -20125,11 +20146,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20128: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20149: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20132: checking for regular-expression headers" >&5
+echo "$as_me:20153: 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
@@ -20141,7 +20162,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20144 "configure"
+#line 20165 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20158,16 +20179,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20182: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20164: \$? = $ac_status" >&5
+  echo "$as_me:20185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20170: \$? = $ac_status" >&5
+  echo "$as_me:20191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20184,7 +20205,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20187 "configure"
+#line 20208 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20204,16 +20225,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20210: \$? = $ac_status" >&5
+  echo "$as_me:20231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20216: \$? = $ac_status" >&5
+  echo "$as_me:20237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20229,11 +20250,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20232: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20253: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20236: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20257: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20271,23 +20292,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20274: checking for $ac_header" >&5
+echo "$as_me:20295: 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 20280 "configure"
+#line 20301 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20284: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20305: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20290: \$? = $ac_status" >&5
+  echo "$as_me:20311: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20306,7 +20327,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20309: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20330: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20319,23 +20340,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20322: checking for $ac_header" >&5
+echo "$as_me:20343: 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 20328 "configure"
+#line 20349 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20353: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20338: \$? = $ac_status" >&5
+  echo "$as_me:20359: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20354,7 +20375,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20357: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20378: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20364,7 +20385,7 @@ EOF
 fi
 done
 
-echo "$as_me:20367: checking for header declaring getopt variables" >&5
+echo "$as_me:20388: 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
@@ -20374,7 +20395,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20377 "configure"
+#line 20398 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20387,16 +20408,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20393: \$? = $ac_status" >&5
+  echo "$as_me:20414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20399: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20408,7 +20429,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20411: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20432: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20425,14 +20446,14 @@ EOF
 
 fi
 
-echo "$as_me:20428: checking if external environ is declared" >&5
+echo "$as_me:20449: 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 20435 "configure"
+#line 20456 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20445,16 +20466,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20451: \$? = $ac_status" >&5
+  echo "$as_me:20472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20457: \$? = $ac_status" >&5
+  echo "$as_me:20478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20465,7 +20486,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20468: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20489: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20480,14 +20501,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20483: checking if external environ exists" >&5
+echo "$as_me:20504: 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 20490 "configure"
+#line 20511 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20502,16 +20523,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20508: \$? = $ac_status" >&5
+  echo "$as_me:20529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20514: \$? = $ac_status" >&5
+  echo "$as_me:20535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20522,7 +20543,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20525: result: $cf_cv_have_environ" >&5
+echo "$as_me:20546: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20535,13 +20556,13 @@ EOF
 
 fi
 
-echo "$as_me:20538: checking for getenv" >&5
+echo "$as_me:20559: 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 20544 "configure"
+#line 20565 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20572,16 +20593,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20578: \$? = $ac_status" >&5
+  echo "$as_me:20599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20584: \$? = $ac_status" >&5
+  echo "$as_me:20605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20591,19 +20612,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20594: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20615: 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:20600: checking for $ac_func" >&5
+echo "$as_me:20621: 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 20606 "configure"
+#line 20627 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20634,16 +20655,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20640: \$? = $ac_status" >&5
+  echo "$as_me:20661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20646: \$? = $ac_status" >&5
+  echo "$as_me:20667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20653,7 +20674,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20656: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20677: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20663,7 +20684,7 @@ EOF
 fi
 done
 
-echo "$as_me:20666: checking if getenv returns consistent values" >&5
+echo "$as_me:20687: 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
@@ -20673,7 +20694,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20676 "configure"
+#line 20697 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20778,15 +20799,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20784: \$? = $ac_status" >&5
+  echo "$as_me:20805: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20789: \$? = $ac_status" >&5
+  echo "$as_me:20810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20799,7 +20820,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20802: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20823: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20814,18 +20835,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20817: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:20838: 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
 
-echo "$as_me:20821: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20842: 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 20828 "configure"
+#line 20849 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20845,16 +20866,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20851: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20857: \$? = $ac_status" >&5
+  echo "$as_me:20878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20866,7 +20887,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20869: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20890: 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
@@ -20881,13 +20902,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20884: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20905: 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 20890 "configure"
+#line 20911 "configure"
 #include "confdefs.h"
 
 int
@@ -20949,16 +20970,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20955: \$? = $ac_status" >&5
+  echo "$as_me:20976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20961: \$? = $ac_status" >&5
+  echo "$as_me:20982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20968,7 +20989,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20971: result: $ac_cv_c_const" >&5
+echo "$as_me:20992: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20978,7 +20999,7 @@ EOF
 
 fi
 
-echo "$as_me:20981: checking for inline" >&5
+echo "$as_me:21002: 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
@@ -20986,7 +21007,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20989 "configure"
+#line 21010 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -20995,16 +21016,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21001: \$? = $ac_status" >&5
+  echo "$as_me:21022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21007: \$? = $ac_status" >&5
+  echo "$as_me:21028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21015,7 +21036,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21018: result: $ac_cv_c_inline" >&5
+echo "$as_me:21039: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21041,7 +21062,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21044: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21065: 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
@@ -21050,7 +21071,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21053 "configure"
+#line 21074 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21062,16 +21083,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21068: \$? = $ac_status" >&5
+  echo "$as_me:21089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21074: \$? = $ac_status" >&5
+  echo "$as_me:21095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21083,7 +21104,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21086: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21107: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21189,7 +21210,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21192: checking for signal global datatype" >&5
+echo "$as_me:21213: 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
@@ -21201,7 +21222,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21204 "configure"
+#line 21225 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21225,16 +21246,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21231: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21237: \$? = $ac_status" >&5
+  echo "$as_me:21258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21248,7 +21269,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21251: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21272: 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 <<EOF
@@ -21257,7 +21278,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21260: checking for type of chtype" >&5
+echo "$as_me:21281: 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
@@ -21267,7 +21288,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21270 "configure"
+#line 21291 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21302,15 +21323,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21308: \$? = $ac_status" >&5
+  echo "$as_me:21329: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21313: \$? = $ac_status" >&5
+  echo "$as_me:21334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21325,7 +21346,7 @@ fi
 
 fi
 
-echo "$as_me:21328: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21349: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21337,14 +21358,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21340: checking if unsigned literals are legal" >&5
+echo "$as_me:21361: 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 21347 "configure"
+#line 21368 "configure"
 #include "confdefs.h"
 
 int
@@ -21356,16 +21377,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:21383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21368: \$? = $ac_status" >&5
+  echo "$as_me:21389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21377,7 +21398,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21380: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21401: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21393,14 +21414,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21396: checking if external errno is declared" >&5
+echo "$as_me:21417: 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 21403 "configure"
+#line 21424 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21414,16 +21435,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21438: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21420: \$? = $ac_status" >&5
+  echo "$as_me:21441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21426: \$? = $ac_status" >&5
+  echo "$as_me:21447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21434,7 +21455,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21437: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21458: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21449,14 +21470,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21452: checking if external errno exists" >&5
+echo "$as_me:21473: 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 21459 "configure"
+#line 21480 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21471,16 +21492,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21477: \$? = $ac_status" >&5
+  echo "$as_me:21498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21483: \$? = $ac_status" >&5
+  echo "$as_me:21504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21491,7 +21512,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21494: result: $cf_cv_have_errno" >&5
+echo "$as_me:21515: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21504,7 +21525,7 @@ EOF
 
 fi
 
-echo "$as_me:21507: checking if data-only library module links" >&5
+echo "$as_me:21528: 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
@@ -21512,20 +21533,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21515 "configure"
+#line 21536 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21521: \$? = $ac_status" >&5
+  echo "$as_me:21542: \$? = $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 <<EOF
-#line 21528 "configure"
+#line 21549 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21542,10 +21563,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21545: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21548: \$? = $ac_status" >&5
+  echo "$as_me:21569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21558,7 +21579,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21561 "configure"
+#line 21582 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21569,15 +21590,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21575: \$? = $ac_status" >&5
+  echo "$as_me:21596: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21580: \$? = $ac_status" >&5
+  echo "$as_me:21601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21592,7 +21613,7 @@ fi
 
 fi
 
-echo "$as_me:21595: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21616: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21606,14 +21627,14 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21609: checking for clock_gettime" >&5
+echo "$as_me:21630: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21616 "configure"
+#line 21637 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -21626,16 +21647,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21632: \$? = $ac_status" >&5
+  echo "$as_me:21653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21638: \$? = $ac_status" >&5
+  echo "$as_me:21659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21646,7 +21667,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21649: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:21670: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 
 if test "$cf_cv_func_clock_gettime" = yes
@@ -21657,13 +21678,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21660: checking for gettimeofday" >&5
+echo "$as_me:21681: 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 21666 "configure"
+#line 21687 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21694,16 +21715,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21700: \$? = $ac_status" >&5
+  echo "$as_me:21721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21706: \$? = $ac_status" >&5
+  echo "$as_me:21727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21713,7 +21734,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21716: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:21737: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21723,7 +21744,7 @@ EOF
 
 else
 
-echo "$as_me:21726: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:21747: 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
@@ -21731,7 +21752,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21734 "configure"
+#line 21755 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21750,16 +21771,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21756: \$? = $ac_status" >&5
+  echo "$as_me:21777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21762: \$? = $ac_status" >&5
+  echo "$as_me:21783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21770,7 +21791,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21773: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:21794: 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
 
@@ -21829,13 +21850,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21832: checking for $ac_func" >&5
+echo "$as_me:21853: 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 21838 "configure"
+#line 21859 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21866,16 +21887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21872: \$? = $ac_status" >&5
+  echo "$as_me:21893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21878: \$? = $ac_status" >&5
+  echo "$as_me:21899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21885,7 +21906,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21888: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21909: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21895,14 +21916,14 @@ EOF
 fi
 done
 
-echo "$as_me:21898: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:21919: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21905 "configure"
+#line 21926 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21917,16 +21938,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21923: \$? = $ac_status" >&5
+  echo "$as_me:21944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:21950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21936,7 +21957,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21939: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:21960: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21958,7 +21979,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21961: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:21982: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21968,7 +21989,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21971 "configure"
+#line 21992 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21981,15 +22002,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21987: \$? = $ac_status" >&5
+  echo "$as_me:22008: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21992: \$? = $ac_status" >&5
+  echo "$as_me:22013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22001,7 +22022,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22004: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22025: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22013,14 +22034,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22016: checking for getttynam" >&5
+	echo "$as_me:22037: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22023 "configure"
+#line 22044 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22032,16 +22053,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22038: \$? = $ac_status" >&5
+  echo "$as_me:22059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22044: \$? = $ac_status" >&5
+  echo "$as_me:22065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22051,7 +22072,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22054: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22075: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22061,7 +22082,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22064: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22085: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22070,7 +22091,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22073: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22094: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22083,14 +22104,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22086: checking for terminal-capability database functions" >&5
+echo "$as_me:22107: 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 22093 "configure"
+#line 22114 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22110,16 +22131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22116: \$? = $ac_status" >&5
+  echo "$as_me:22137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22122: \$? = $ac_status" >&5
+  echo "$as_me:22143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22130,7 +22151,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22133: result: $cf_cv_cgetent" >&5
+echo "$as_me:22154: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22140,14 +22161,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22143: checking if cgetent uses const parameter" >&5
+echo "$as_me:22164: 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 22150 "configure"
+#line 22171 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22170,16 +22191,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22176: \$? = $ac_status" >&5
+  echo "$as_me:22197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22182: \$? = $ac_status" >&5
+  echo "$as_me:22203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22190,7 +22211,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22193: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22214: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22204,14 +22225,14 @@ fi
 
 fi
 
-echo "$as_me:22207: checking for isascii" >&5
+echo "$as_me:22228: 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 22214 "configure"
+#line 22235 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22223,16 +22244,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22229: \$? = $ac_status" >&5
+  echo "$as_me:22250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22235: \$? = $ac_status" >&5
+  echo "$as_me:22256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22243,7 +22264,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22246: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22267: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22251,10 +22272,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22254: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22275: 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 22257 "configure"
+#line 22278 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22268,16 +22289,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22274: \$? = $ac_status" >&5
+  echo "$as_me:22295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22285,7 +22306,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22288 "configure"
+#line 22309 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22300,16 +22321,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22306: \$? = $ac_status" >&5
+  echo "$as_me:22327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22312: \$? = $ac_status" >&5
+  echo "$as_me:22333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22325,11 +22346,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22328: result: $sigact_bad" >&5
+echo "$as_me:22349: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22332: checking if nanosleep really works" >&5
+echo "$as_me:22353: 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
@@ -22339,7 +22360,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22342 "configure"
+#line 22363 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22365,15 +22386,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22371: \$? = $ac_status" >&5
+  echo "$as_me:22392: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22376: \$? = $ac_status" >&5
+  echo "$as_me:22397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22385,7 +22406,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22388: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22409: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22402,23 +22423,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22405: checking for $ac_header" >&5
+echo "$as_me:22426: 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 22411 "configure"
+#line 22432 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22436: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22421: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22437,7 +22458,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22454,10 +22475,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22457: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22478: 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 22460 "configure"
+#line 22481 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22469,16 +22490,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22472: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22493: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22475: \$? = $ac_status" >&5
+  echo "$as_me:22496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22481: \$? = $ac_status" >&5
+  echo "$as_me:22502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22486,7 +22507,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22489 "configure"
+#line 22510 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22500,16 +22521,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22506: \$? = $ac_status" >&5
+  echo "$as_me:22527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22512: \$? = $ac_status" >&5
+  echo "$as_me:22533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22525,19 +22546,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22528: result: $termios_bad" >&5
+	echo "$as_me:22549: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22533: checking for tcgetattr" >&5
+echo "$as_me:22554: 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 22540 "configure"
+#line 22561 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22565,16 +22586,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22571: \$? = $ac_status" >&5
+  echo "$as_me:22592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22577: \$? = $ac_status" >&5
+  echo "$as_me:22598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22584,21 +22605,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22587: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22608: 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:22594: checking for vsscanf function or workaround" >&5
+echo "$as_me:22615: 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 22601 "configure"
+#line 22622 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22624,16 +22645,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22630: \$? = $ac_status" >&5
+  echo "$as_me:22651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22636: \$? = $ac_status" >&5
+  echo "$as_me:22657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22641,7 +22662,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22644 "configure"
+#line 22665 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22663,16 +22684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22669: \$? = $ac_status" >&5
+  echo "$as_me:22690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22675: \$? = $ac_status" >&5
+  echo "$as_me:22696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22680,7 +22701,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22683 "configure"
+#line 22704 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22702,16 +22723,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22708: \$? = $ac_status" >&5
+  echo "$as_me:22729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22714: \$? = $ac_status" >&5
+  echo "$as_me:22735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22726,7 +22747,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22729: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22750: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22752,23 +22773,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22755: checking for $ac_header" >&5
+echo "$as_me:22776: 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 22761 "configure"
+#line 22782 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22786: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22771: \$? = $ac_status" >&5
+  echo "$as_me:22792: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22787,7 +22808,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22811: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22797,7 +22818,7 @@ EOF
 fi
 done
 
-echo "$as_me:22800: checking for working mkstemp" >&5
+echo "$as_me:22821: 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
@@ -22808,7 +22829,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22811 "configure"
+#line 22832 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22843,15 +22864,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22849: \$? = $ac_status" >&5
+  echo "$as_me:22870: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22854: \$? = $ac_status" >&5
+  echo "$as_me:22875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22866,16 +22887,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22869: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22890: 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:22872: checking for mkstemp" >&5
+	echo "$as_me:22893: 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 22878 "configure"
+#line 22899 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22906,16 +22927,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22912: \$? = $ac_status" >&5
+  echo "$as_me:22933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22918: \$? = $ac_status" >&5
+  echo "$as_me:22939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22925,7 +22946,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22928: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22949: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22946,21 +22967,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22949: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:22970: 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:22952: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:22973: 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:22958: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22979: 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 22963 "configure"
+#line 22984 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22977,15 +22998,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22983: \$? = $ac_status" >&5
+  echo "$as_me:23004: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22988: \$? = $ac_status" >&5
+  echo "$as_me:23009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -22998,7 +23019,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23001: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23022: 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
 
@@ -23009,13 +23030,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23012: checking for intptr_t" >&5
+echo "$as_me:23033: 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 23018 "configure"
+#line 23039 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23030,16 +23051,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23036: \$? = $ac_status" >&5
+  echo "$as_me:23057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23042: \$? = $ac_status" >&5
+  echo "$as_me:23063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23049,7 +23070,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23052: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23073: 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
   :
@@ -23061,13 +23082,13 @@ EOF
 
 fi
 
-echo "$as_me:23064: checking for ssize_t" >&5
+echo "$as_me:23085: 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 23070 "configure"
+#line 23091 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23082,16 +23103,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23088: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23094: \$? = $ac_status" >&5
+  echo "$as_me:23115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23101,7 +23122,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23104: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23125: 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
   :
@@ -23113,14 +23134,14 @@ EOF
 
 fi
 
-echo "$as_me:23116: checking for type sigaction_t" >&5
+echo "$as_me:23137: 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 23123 "configure"
+#line 23144 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23133,16 +23154,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23139: \$? = $ac_status" >&5
+  echo "$as_me:23160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23145: \$? = $ac_status" >&5
+  echo "$as_me:23166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23153,14 +23174,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23156: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23177: 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:23163: checking declaration of size-change" >&5
+echo "$as_me:23184: 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
@@ -23181,7 +23202,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23184 "configure"
+#line 23205 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23231,16 +23252,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23243: \$? = $ac_status" >&5
+  echo "$as_me:23264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23259,7 +23280,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23262: result: $cf_cv_sizechange" >&5
+echo "$as_me:23283: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23277,13 +23298,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23280: checking for memmove" >&5
+echo "$as_me:23301: 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 23286 "configure"
+#line 23307 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23314,16 +23335,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23320: \$? = $ac_status" >&5
+  echo "$as_me:23341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23326: \$? = $ac_status" >&5
+  echo "$as_me:23347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23333,19 +23354,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23336: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23357: 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:23342: checking for bcopy" >&5
+echo "$as_me:23363: 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 23348 "configure"
+#line 23369 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23376,16 +23397,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23382: \$? = $ac_status" >&5
+  echo "$as_me:23403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23388: \$? = $ac_status" >&5
+  echo "$as_me:23409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23395,11 +23416,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23398: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23419: 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:23402: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23423: 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
@@ -23409,7 +23430,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23412 "configure"
+#line 23433 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23425,15 +23446,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23431: \$? = $ac_status" >&5
+  echo "$as_me:23452: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23436: \$? = $ac_status" >&5
+  echo "$as_me:23457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23446,7 +23467,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23449: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23470: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23473,13 +23494,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23476: checking for $ac_func" >&5
+echo "$as_me:23497: 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 23482 "configure"
+#line 23503 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23510,16 +23531,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23516: \$? = $ac_status" >&5
+  echo "$as_me:23537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23522: \$? = $ac_status" >&5
+  echo "$as_me:23543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23529,7 +23550,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23532: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23553: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23539,7 +23560,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23542: checking if poll really works" >&5
+echo "$as_me:23563: 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
@@ -23549,7 +23570,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23552 "configure"
+#line 23573 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23602,15 +23623,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23608: \$? = $ac_status" >&5
+  echo "$as_me:23629: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23613: \$? = $ac_status" >&5
+  echo "$as_me:23634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23622,21 +23643,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23625: result: $cf_cv_working_poll" >&5
+echo "$as_me:23646: 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:23632: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23653: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23639 "configure"
+#line 23660 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23656,16 +23677,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23662: \$? = $ac_status" >&5
+  echo "$as_me:23683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23668: \$? = $ac_status" >&5
+  echo "$as_me:23689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -23675,7 +23696,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23678: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:23699: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -23685,18 +23706,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:23688: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:23709: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:23692: checking for va_copy" >&5
+echo "$as_me:23713: 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 23699 "configure"
+#line 23720 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23713,16 +23734,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23719: \$? = $ac_status" >&5
+  echo "$as_me:23740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23725: \$? = $ac_status" >&5
+  echo "$as_me:23746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23732,7 +23753,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23735: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23756: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23744,14 +23765,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23747: checking for __va_copy" >&5
+echo "$as_me:23768: 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 23754 "configure"
+#line 23775 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23768,16 +23789,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23774: \$? = $ac_status" >&5
+  echo "$as_me:23795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23780: \$? = $ac_status" >&5
+  echo "$as_me:23801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23787,7 +23808,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23790: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23811: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23799,14 +23820,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23802: checking for __builtin_va_copy" >&5
+echo "$as_me:23823: 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 23809 "configure"
+#line 23830 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23823,16 +23844,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23829: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23835: \$? = $ac_status" >&5
+  echo "$as_me:23856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23842,7 +23863,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23845: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23866: 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 &&
@@ -23860,14 +23881,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23863: checking if we can simply copy va_list" >&5
+	echo "$as_me:23884: 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 23870 "configure"
+#line 23891 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23884,16 +23905,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23890: \$? = $ac_status" >&5
+  echo "$as_me:23911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23896: \$? = $ac_status" >&5
+  echo "$as_me:23917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23903,19 +23924,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23906: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23927: 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:23911: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:23932: 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 23918 "configure"
+#line 23939 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23932,16 +23953,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23938: \$? = $ac_status" >&5
+  echo "$as_me:23959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23944: \$? = $ac_status" >&5
+  echo "$as_me:23965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23951,7 +23972,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23954: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23975: 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
@@ -23962,13 +23983,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23965: checking for pid_t" >&5
+echo "$as_me:23986: 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 23971 "configure"
+#line 23992 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23983,16 +24004,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23989: \$? = $ac_status" >&5
+  echo "$as_me:24010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23995: \$? = $ac_status" >&5
+  echo "$as_me:24016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24002,7 +24023,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24005: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24026: 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
   :
@@ -24017,23 +24038,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24020: checking for $ac_header" >&5
+echo "$as_me:24041: 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 24026 "configure"
+#line 24047 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24030: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24036: \$? = $ac_status" >&5
+  echo "$as_me:24057: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24052,7 +24073,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24055: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24065,13 +24086,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24068: checking for $ac_func" >&5
+echo "$as_me:24089: 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 24074 "configure"
+#line 24095 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24102,16 +24123,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24108: \$? = $ac_status" >&5
+  echo "$as_me:24129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24114: \$? = $ac_status" >&5
+  echo "$as_me:24135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24121,7 +24142,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24124: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24145: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24133,7 +24154,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24136: checking for working fork" >&5
+  echo "$as_me:24157: 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
@@ -24156,15 +24177,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24183: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24167: \$? = $ac_status" >&5
+  echo "$as_me:24188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24176,7 +24197,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24179: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24200: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24190,12 +24211,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24193: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24214: 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:24198: checking for working vfork" >&5
+  echo "$as_me:24219: 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
@@ -24204,7 +24225,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24207 "configure"
+#line 24228 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24297,15 +24318,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24303: \$? = $ac_status" >&5
+  echo "$as_me:24324: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24308: \$? = $ac_status" >&5
+  echo "$as_me:24329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24317,13 +24338,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24320: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24341: 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:24326: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24347: 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
 
@@ -24348,7 +24369,7 @@ EOF
 
 fi
 
-echo "$as_me:24351: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24372: 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
@@ -24358,7 +24379,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24361 "configure"
+#line 24382 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24393,15 +24414,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24399: \$? = $ac_status" >&5
+  echo "$as_me:24420: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24404: \$? = $ac_status" >&5
+  echo "$as_me:24425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24414,7 +24435,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24417: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24438: 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
@@ -24423,7 +24444,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24426: checking for openpty in -lutil" >&5
+echo "$as_me:24447: 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
@@ -24431,7 +24452,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24434 "configure"
+#line 24455 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24450,16 +24471,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24456: \$? = $ac_status" >&5
+  echo "$as_me:24477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24462: \$? = $ac_status" >&5
+  echo "$as_me:24483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24470,7 +24491,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24473: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24494: 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
@@ -24478,7 +24499,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24481: checking for openpty header" >&5
+echo "$as_me:24502: 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
@@ -24505,7 +24526,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24508 "configure"
+#line 24529 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24523,16 +24544,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24529: \$? = $ac_status" >&5
+  echo "$as_me:24550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24535: \$? = $ac_status" >&5
+  echo "$as_me:24556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24550,7 +24571,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24553: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24574: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24623,7 +24644,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24626 "configure"
+#line 24647 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24635,16 +24656,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24641: \$? = $ac_status" >&5
+  echo "$as_me:24662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24647: \$? = $ac_status" >&5
+  echo "$as_me:24668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24661,7 +24682,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24664: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24685: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24697,7 +24718,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24700: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24721: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24708,7 +24729,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24711: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:24732: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24780,7 +24801,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24783 "configure"
+#line 24804 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24792,16 +24813,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24798: \$? = $ac_status" >&5
+  echo "$as_me:24819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24804: \$? = $ac_status" >&5
+  echo "$as_me:24825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24818,7 +24839,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24821: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24842: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24898,7 +24919,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24901: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24922: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24915,23 +24936,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24918: checking for db.h" >&5
+echo "$as_me:24939: 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 24924 "configure"
+#line 24945 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24928: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24949: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24934: \$? = $ac_status" >&5
+  echo "$as_me:24955: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24950,11 +24971,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24953: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24974: 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:24957: checking for version of db" >&5
+echo "$as_me:24978: 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
@@ -24965,10 +24986,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24968: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24989: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24971 "configure"
+#line 24992 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24998,16 +25019,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25004: \$? = $ac_status" >&5
+  echo "$as_me:25025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25010: \$? = $ac_status" >&5
+  echo "$as_me:25031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25021,16 +25042,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25024: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25045: 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:25028: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25049: 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:25033: checking for db libraries" >&5
+echo "$as_me:25054: 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
@@ -25060,10 +25081,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25063: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25084: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25066 "configure"
+#line 25087 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25118,16 +25139,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25124: \$? = $ac_status" >&5
+  echo "$as_me:25145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25130: \$? = $ac_status" >&5
+  echo "$as_me:25151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25147,11 +25168,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25150: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25171: 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:25154: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25175: 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
@@ -25177,7 +25198,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25180: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25201: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25192,7 +25213,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25195: checking if we should include stdbool.h" >&5
+echo "$as_me:25216: 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
@@ -25200,7 +25221,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25203 "configure"
+#line 25224 "configure"
 #include "confdefs.h"
 
 int
@@ -25212,23 +25233,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25218: \$? = $ac_status" >&5
+  echo "$as_me:25239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25224: \$? = $ac_status" >&5
+  echo "$as_me:25245: \$? = $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 25231 "configure"
+#line 25252 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25244,16 +25265,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25250: \$? = $ac_status" >&5
+  echo "$as_me:25271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25256: \$? = $ac_status" >&5
+  echo "$as_me:25277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25267,13 +25288,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25270: result: yes" >&5
+then	echo "$as_me:25291: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25272: result: no" >&5
+else	echo "$as_me:25293: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25276: checking for builtin bool type" >&5
+echo "$as_me:25297: 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
@@ -25281,7 +25302,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25284 "configure"
+#line 25305 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25296,16 +25317,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25302: \$? = $ac_status" >&5
+  echo "$as_me:25323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25308: \$? = $ac_status" >&5
+  echo "$as_me:25329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25318,9 +25339,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25321: result: yes" >&5
+then	echo "$as_me:25342: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25323: result: no" >&5
+else	echo "$as_me:25344: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25337,10 +25358,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25340: checking if we already have C++ library" >&5
+	echo "$as_me:25361: 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 25343 "configure"
+#line 25364 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25354,16 +25375,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25360: \$? = $ac_status" >&5
+  echo "$as_me:25381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25366: \$? = $ac_status" >&5
+  echo "$as_me:25387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25372,7 +25393,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25375: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25396: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25391,7 +25412,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25394: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25415: 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
@@ -25417,7 +25438,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25420 "configure"
+#line 25441 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25431,16 +25452,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25437: \$? = $ac_status" >&5
+  echo "$as_me:25458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25443: \$? = $ac_status" >&5
+  echo "$as_me:25464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25452,7 +25473,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25455: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25476: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25474,7 +25495,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25477: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25498: 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
@@ -25489,15 +25510,15 @@ CF_EOF
 # 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:25492: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25495: \$? = $ac_status" >&5
+  echo "$as_me:25516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25497: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25500: \$? = $ac_status" >&5
+  echo "$as_me:25521: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25508,10 +25529,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25511: result: yes" >&5
+  echo "$as_me:25532: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25514: result: no" >&5
+  echo "$as_me:25535: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25531,7 +25552,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25534: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25555: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25552,7 +25573,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25555 "configure"
+#line 25576 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25566,16 +25587,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25572: \$? = $ac_status" >&5
+  echo "$as_me:25593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25578: \$? = $ac_status" >&5
+  echo "$as_me:25599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25612,7 +25633,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25615 "configure"
+#line 25636 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25626,16 +25647,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25632: \$? = $ac_status" >&5
+  echo "$as_me:25653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25638: \$? = $ac_status" >&5
+  echo "$as_me:25659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25668,7 +25689,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25671: result: $cf_cxx_library" >&5
+	echo "$as_me:25692: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25684,7 +25705,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25687: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25708: 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
@@ -25701,18 +25722,18 @@ do
   # 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 25704 "configure"
+#line 25725 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25730: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25715: \$? = $ac_status" >&5
+  echo "$as_me:25736: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25735,17 +25756,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25738 "configure"
+#line 25759 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25742: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25748: \$? = $ac_status" >&5
+  echo "$as_me:25769: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25782,7 +25803,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25785: result: $CXXCPP" >&5
+echo "$as_me:25806: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25792,18 +25813,18 @@ do
   # 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 25795 "configure"
+#line 25816 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25821: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25806: \$? = $ac_status" >&5
+  echo "$as_me:25827: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25826,17 +25847,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25829 "configure"
+#line 25850 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25854: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25839: \$? = $ac_status" >&5
+  echo "$as_me:25860: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25864,7 +25885,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25867: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25888: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25879,23 +25900,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25882: checking for $ac_header" >&5
+echo "$as_me:25903: 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 25888 "configure"
+#line 25909 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25898: \$? = $ac_status" >&5
+  echo "$as_me:25919: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25914,7 +25935,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25917: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25938: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25927,23 +25948,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25930: checking for $ac_header" >&5
+echo "$as_me:25951: 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 25936 "configure"
+#line 25957 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25940: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25961: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25946: \$? = $ac_status" >&5
+  echo "$as_me:25967: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25962,7 +25983,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25965: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25986: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25973,10 +25994,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25976: checking if iostream uses std-namespace" >&5
+	echo "$as_me:25997: 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 25979 "configure"
+#line 26000 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -25993,16 +26014,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25999: \$? = $ac_status" >&5
+  echo "$as_me:26020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26005: \$? = $ac_status" >&5
+  echo "$as_me:26026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26011,7 +26032,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26014: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26035: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26022,7 +26043,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26025: checking if we should include stdbool.h" >&5
+echo "$as_me:26046: 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
@@ -26030,7 +26051,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26033 "configure"
+#line 26054 "configure"
 #include "confdefs.h"
 
 int
@@ -26042,23 +26063,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26048: \$? = $ac_status" >&5
+  echo "$as_me:26069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26054: \$? = $ac_status" >&5
+  echo "$as_me:26075: \$? = $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 26061 "configure"
+#line 26082 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26074,16 +26095,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26080: \$? = $ac_status" >&5
+  echo "$as_me:26101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26086: \$? = $ac_status" >&5
+  echo "$as_me:26107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26097,13 +26118,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26100: result: yes" >&5
+then	echo "$as_me:26121: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26102: result: no" >&5
+else	echo "$as_me:26123: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26106: checking for builtin bool type" >&5
+echo "$as_me:26127: 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
@@ -26111,7 +26132,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26114 "configure"
+#line 26135 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26126,16 +26147,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26132: \$? = $ac_status" >&5
+  echo "$as_me:26153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26138: \$? = $ac_status" >&5
+  echo "$as_me:26159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26148,19 +26169,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26151: result: yes" >&5
+then	echo "$as_me:26172: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26153: result: no" >&5
+else	echo "$as_me:26174: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26157: checking for bool" >&5
+echo "$as_me:26178: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26163 "configure"
+#line 26184 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26195,16 +26216,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26201: \$? = $ac_status" >&5
+  echo "$as_me:26222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26207: \$? = $ac_status" >&5
+  echo "$as_me:26228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26214,10 +26235,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26217: result: $ac_cv_type_bool" >&5
+echo "$as_me:26238: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26220: checking size of bool" >&5
+echo "$as_me:26241: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26226,7 +26247,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26229 "configure"
+#line 26250 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26258,21 +26279,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26264: \$? = $ac_status" >&5
+  echo "$as_me:26285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26270: \$? = $ac_status" >&5
+  echo "$as_me:26291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26275 "configure"
+#line 26296 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26304,16 +26325,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26310: \$? = $ac_status" >&5
+  echo "$as_me:26331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26316: \$? = $ac_status" >&5
+  echo "$as_me:26337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26329,7 +26350,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26332 "configure"
+#line 26353 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26361,16 +26382,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26367: \$? = $ac_status" >&5
+  echo "$as_me:26388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26373: \$? = $ac_status" >&5
+  echo "$as_me:26394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26386,7 +26407,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26389 "configure"
+#line 26410 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26418,16 +26439,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26424: \$? = $ac_status" >&5
+  echo "$as_me:26445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26430: \$? = $ac_status" >&5
+  echo "$as_me:26451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26440,12 +26461,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26443: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26464: 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 26448 "configure"
+#line 26469 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26481,15 +26502,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26487: \$? = $ac_status" >&5
+  echo "$as_me:26508: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26492: \$? = $ac_status" >&5
+  echo "$as_me:26513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26505,13 +26526,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26508: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26529: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26514: checking for type of bool" >&5
+echo "$as_me:26535: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26530,7 +26551,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26533 "configure"
+#line 26554 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26571,15 +26592,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26577: \$? = $ac_status" >&5
+  echo "$as_me:26598: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26582: \$? = $ac_status" >&5
+  echo "$as_me:26603: \$? = $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
@@ -26596,19 +26617,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26599: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26620: 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:26606: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26627: 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:26611: checking for special defines needed for etip.h" >&5
+echo "$as_me:26632: 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"
@@ -26626,7 +26647,7 @@ do
 	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 26629 "configure"
+#line 26650 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26640,16 +26661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26646: \$? = $ac_status" >&5
+  echo "$as_me:26667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26670,12 +26691,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26673: result: ${cf_result:-(none)}" >&5
+echo "$as_me:26694: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26678: checking if $CXX accepts override keyword" >&5
+echo "$as_me:26699: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26692,7 +26713,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26695 "configure"
+#line 26716 "configure"
 #include "confdefs.h"
 
 class base
@@ -26711,15 +26732,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26717: \$? = $ac_status" >&5
+  echo "$as_me:26738: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26722: \$? = $ac_status" >&5
+  echo "$as_me:26743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26738,7 +26759,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26741: result: $cf_cv_cpp_override" >&5
+echo "$as_me:26762: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26747,7 +26768,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26750: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26771: 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
@@ -26764,7 +26785,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26767 "configure"
+#line 26788 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26783,15 +26804,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26789: \$? = $ac_status" >&5
+  echo "$as_me:26810: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26794: \$? = $ac_status" >&5
+  echo "$as_me:26815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26810,7 +26831,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26813: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26834: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26820,7 +26841,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26823: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26844: 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
@@ -26834,7 +26855,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26837 "configure"
+#line 26858 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26878,16 +26899,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26902: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26884: \$? = $ac_status" >&5
+  echo "$as_me:26905: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26890: \$? = $ac_status" >&5
+  echo "$as_me:26911: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26905,7 +26926,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26908: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26929: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26954,13 +26975,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26957: checking for bool" >&5
+echo "$as_me:26978: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26963 "configure"
+#line 26984 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26995,16 +27016,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27001: \$? = $ac_status" >&5
+  echo "$as_me:27022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27007: \$? = $ac_status" >&5
+  echo "$as_me:27028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27014,10 +27035,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27017: result: $ac_cv_type_bool" >&5
+echo "$as_me:27038: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27020: checking size of bool" >&5
+echo "$as_me:27041: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27026,7 +27047,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27029 "configure"
+#line 27050 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27058,21 +27079,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27064: \$? = $ac_status" >&5
+  echo "$as_me:27085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27070: \$? = $ac_status" >&5
+  echo "$as_me:27091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27075 "configure"
+#line 27096 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27104,16 +27125,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27110: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27116: \$? = $ac_status" >&5
+  echo "$as_me:27137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27129,7 +27150,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27132 "configure"
+#line 27153 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27161,16 +27182,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27167: \$? = $ac_status" >&5
+  echo "$as_me:27188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27173: \$? = $ac_status" >&5
+  echo "$as_me:27194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27186,7 +27207,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27189 "configure"
+#line 27210 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27218,16 +27239,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27224: \$? = $ac_status" >&5
+  echo "$as_me:27245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27230: \$? = $ac_status" >&5
+  echo "$as_me:27251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27240,12 +27261,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27243: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27264: 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 27248 "configure"
+#line 27269 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27281,15 +27302,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27287: \$? = $ac_status" >&5
+  echo "$as_me:27308: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27292: \$? = $ac_status" >&5
+  echo "$as_me:27313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27305,13 +27326,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27308: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27329: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27314: checking for type of bool" >&5
+echo "$as_me:27335: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27330,7 +27351,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27333 "configure"
+#line 27354 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27371,15 +27392,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27377: \$? = $ac_status" >&5
+  echo "$as_me:27398: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27382: \$? = $ac_status" >&5
+  echo "$as_me:27403: \$? = $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
@@ -27396,26 +27417,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27399: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27420: 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:27406: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27427: 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:27412: checking for fallback type of bool" >&5
+			echo "$as_me:27433: 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:27418: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27439: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27444,7 +27465,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27447: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27468: 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
@@ -27461,7 +27482,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27464: checking for $ac_word" >&5
+echo "$as_me:27485: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27478,7 +27499,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27481: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27502: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27490,10 +27511,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27493: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:27514: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:27496: result: no" >&5
+  echo "$as_me:27517: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27503,7 +27524,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:27506: checking for $cf_prog_gnat version" >&5
+echo "$as_me:27527: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27514,7 +27535,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27517: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27538: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -27543,7 +27564,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:27546: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:27567: 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
@@ -27562,10 +27583,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27565: result: $cf_gprconfig_value" >&5
+					echo "$as_me:27586: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:27568: result: missing" >&5
+					echo "$as_me:27589: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -27578,7 +27599,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:27581: checking for gnat version" >&5
+echo "$as_me:27602: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27589,7 +27610,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:27592: result: $cf_cv_gnat_version" >&5
+echo "$as_me:27613: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -27598,7 +27619,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:27601: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:27622: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -27606,7 +27627,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:27609: checking for $ac_word" >&5
+echo "$as_me:27630: 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
@@ -27621,7 +27642,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:27624: found $ac_dir/$ac_word" >&5
+echo "$as_me:27645: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -27630,20 +27651,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:27633: result: $M4_exists" >&5
+  echo "$as_me:27654: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:27636: result: no" >&5
+  echo "$as_me:27657: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27642: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:27663: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27646: checking if GNAT works" >&5
+			echo "$as_me:27667: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -27671,7 +27692,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:27674: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:27695: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -27683,7 +27704,7 @@ fi
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27686: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27707: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27700,10 +27721,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27703: result: $ADAFLAGS" >&5
+	echo "$as_me:27724: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27706: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27727: 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
@@ -27713,11 +27734,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27716: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27737: 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:27720: checking if GNAT supports generics" >&5
+echo "$as_me:27741: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27727,7 +27748,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27730: result: $cf_gnat_generics" >&5
+echo "$as_me:27751: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27739,7 +27760,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27742: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27763: 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
@@ -27787,7 +27808,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27790: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27811: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27800,7 +27821,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27803: checking if GNAT supports project files" >&5
+echo "$as_me:27824: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27863,15 +27884,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27866: result: $cf_gnat_projects" >&5
+echo "$as_me:27887: 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:27872: checking if GNAT supports libraries" >&5
+	echo "$as_me:27893: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27874: result: $cf_gnat_libraries" >&5
+	echo "$as_me:27895: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27891,7 +27912,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27894: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:27915: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27903,7 +27924,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27906: checking for Ada95 compiler" >&5
+echo "$as_me:27927: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27914,12 +27935,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27917: result: $cf_ada_compiler" >&5
+echo "$as_me:27938: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27922: checking for Ada95 include directory" >&5
+echo "$as_me:27943: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27955,7 +27976,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27958: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:27979: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27964,10 +27985,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27967: result: $ADA_INCLUDE" >&5
+echo "$as_me:27988: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27970: checking for Ada95 object directory" >&5
+echo "$as_me:27991: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28003,7 +28024,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28006: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28027: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28012,10 +28033,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28015: result: $ADA_OBJECTS" >&5
+echo "$as_me:28036: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28018: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28039: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28036,11 +28057,11 @@ then
 	fi
 fi
 
-echo "$as_me:28039: result: $with_ada_sharedlib" >&5
+echo "$as_me:28060: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28043: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28064: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28058,7 +28079,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28061: checking for Ada95 curses library name" >&5
+echo "$as_me:28082: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28074,7 +28095,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28077: result: $ADA_LIBNAME" >&5
+echo "$as_me:28098: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28085,13 +28106,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28088: checking for wchar_t" >&5
+	echo "$as_me:28109: 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 28094 "configure"
+#line 28115 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28106,16 +28127,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28112: \$? = $ac_status" >&5
+  echo "$as_me:28133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28118: \$? = $ac_status" >&5
+  echo "$as_me:28139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28125,10 +28146,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28128: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28149: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28131: checking size of wchar_t" >&5
+echo "$as_me:28152: 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
@@ -28137,7 +28158,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28140 "configure"
+#line 28161 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28149,21 +28170,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28155: \$? = $ac_status" >&5
+  echo "$as_me:28176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28161: \$? = $ac_status" >&5
+  echo "$as_me:28182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28166 "configure"
+#line 28187 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28175,16 +28196,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28181: \$? = $ac_status" >&5
+  echo "$as_me:28202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28187: \$? = $ac_status" >&5
+  echo "$as_me:28208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28200,7 +28221,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28203 "configure"
+#line 28224 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28212,16 +28233,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28218: \$? = $ac_status" >&5
+  echo "$as_me:28239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28224: \$? = $ac_status" >&5
+  echo "$as_me:28245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28237,7 +28258,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28240 "configure"
+#line 28261 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28249,16 +28270,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28255: \$? = $ac_status" >&5
+  echo "$as_me:28276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28261: \$? = $ac_status" >&5
+  echo "$as_me:28282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28271,12 +28292,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28274: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28295: 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 28279 "configure"
+#line 28300 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28292,15 +28313,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28298: \$? = $ac_status" >&5
+  echo "$as_me:28319: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28303: \$? = $ac_status" >&5
+  echo "$as_me:28324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28316,7 +28337,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28319: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28340: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28329,7 +28350,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28332: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28353: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28347,7 +28368,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28350: checking for library subsets" >&5
+echo "$as_me:28371: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28401,7 +28422,7 @@ fi
 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:28404: result: $LIB_SUBSETS" >&5
+echo "$as_me:28425: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28432,7 +28453,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28435: checking default library suffix" >&5
+echo "$as_me:28456: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28443,10 +28464,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28446: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28467: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28449: checking default library-dependency suffix" >&5
+echo "$as_me:28470: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28529,10 +28550,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28532: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28553: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28535: checking default object directory" >&5
+echo "$as_me:28556: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28548,11 +28569,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28551: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28572: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28555: checking c++ library-dependency suffix" >&5
+echo "$as_me:28576: 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++)
@@ -28645,7 +28666,7 @@ else
 	fi
 
 fi
-echo "$as_me:28648: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28669: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28821,19 +28842,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28824: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28845: 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 <<EOF
-#line 28829 "configure"
+#line 28850 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28833: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28836: \$? = $ac_status" >&5
+  echo "$as_me:28857: \$? = $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
@@ -28844,10 +28865,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28847 "configure"
+#line 28868 "configure"
 #include "confdefs.h"
 
-#line 28850 "configure"
+#line 28871 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28862,16 +28883,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28868: \$? = $ac_status" >&5
+  echo "$as_me:28889: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28874: \$? = $ac_status" >&5
+  echo "$as_me:28895: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28894,7 +28915,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28897: result: $cf_ldflags_static" >&5
+	echo "$as_me:28918: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28910,7 +28931,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28913: checking where we will install curses.h" >&5
+echo "$as_me:28934: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28920,7 +28941,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28923: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28944: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28928,7 +28949,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28931: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:28952: 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
@@ -28953,7 +28974,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28956: checking for desired basename for form library" >&5
+echo "$as_me:28977: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28973,10 +28994,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28976: result: $FORM_NAME" >&5
+echo "$as_me:28997: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:28979: checking for desired basename for menu library" >&5
+echo "$as_me:29000: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -28996,10 +29017,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:28999: result: $MENU_NAME" >&5
+echo "$as_me:29020: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29002: checking for desired basename for panel library" >&5
+echo "$as_me:29023: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29019,10 +29040,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29022: result: $PANEL_NAME" >&5
+echo "$as_me:29043: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29025: checking for desired basename for cxx library" >&5
+echo "$as_me:29046: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29042,13 +29063,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29045: result: $CXX_NAME" >&5
+echo "$as_me:29066: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29051: checking for src modules" >&5
+echo "$as_me:29072: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29107,7 +29128,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29110: result: $cf_cv_src_modules" >&5
+echo "$as_me:29131: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29268,7 +29289,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29271: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29292: 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//'`
@@ -29279,7 +29300,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29282: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29303: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29295,7 +29316,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29298: result: $PKG_CFLAGS" >&5
+echo "$as_me:29319: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29356,7 +29377,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29359: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29380: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29383,7 +29404,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29386: checking for linker search path" >&5
+echo "$as_me:29407: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29431,7 +29452,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29434: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29455: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29472,7 +29493,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29475: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29496: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29558,7 +29579,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29561: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29582: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29739,7 +29760,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29742: error: ambiguous option: $1
+    { { echo "$as_me:29763: 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;}
@@ -29758,7 +29779,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29761: error: unrecognized option: $1
+  -*) { { echo "$as_me:29782: 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;}
@@ -29888,7 +29909,7 @@ do
   "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:29891: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29912: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30409,7 +30430,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30412: creating $ac_file" >&5
+    { echo "$as_me:30433: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30427,7 +30448,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30430: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30451: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30440,7 +30461,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30443: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30464: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30456,7 +30477,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30459: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30480: 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;}
@@ -30465,7 +30486,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30468: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30489: 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;}
@@ -30510,7 +30531,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30513: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30534: 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;}
@@ -30521,7 +30542,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30524: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30545: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30570,7 +30591,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30573: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30594: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30581,7 +30602,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30584: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30605: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30594,7 +30615,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30597: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30618: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30652,7 +30673,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30655: $ac_file is unchanged" >&5
+      { echo "$as_me:30676: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31039,7 +31060,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31042: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31063: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 280313058..2d6836cb7 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.776 2024/03/17 00:08:03 tom Exp $
+dnl $Id: configure.in,v 1.779 2024/04/10 08:04:00 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.776 $)
+AC_REVISION($Revision: 1.779 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1406,9 +1406,9 @@ AC_SUBST(cf_cv_enable_opaque)
 AC_SUBST(NCURSES_SIZE_T)
 
 AC_MSG_CHECKING(whether curses library structures should be opaque)
-CF_ARG_ENABLE(opaque-curses,
+CF_ARG_DISABLE(opaque-curses,
 	[  --disable-opaque-curses do not make WINDOW, etc., structures opaque],
-	[enable_opaque_curses=yes],[
+	[enable_opaque_curses=no],[
 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 	])
@@ -1419,21 +1419,21 @@ test "$enable_opaque_curses" = no && \
 AC_MSG_ERROR(reentrant configuration requires opaque library)
 
 AC_MSG_CHECKING(whether form library structures should be opaque)
-AC_ARG_ENABLE(opaque-form,
+CF_ARG_DISABLE(opaque-form,
 	[  --disable-opaque-form   do not make form library structures opaque],
-	[enable_opaque_form=yes],[enable_opaque_form=$cf_dft_opaque_curses])
+	[enable_opaque_form=no],[enable_opaque_form=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_form)
 
 AC_MSG_CHECKING(whether menu library structures should be opaque)
-AC_ARG_ENABLE(opaque-menu,
+CF_ARG_DISABLE(opaque-menu,
 	[  --disable-opaque-menu   do not make menu library structures opaque],
-	[enable_opaque_menu=yes],[enable_opaque_menu=$cf_dft_opaque_curses])
+	[enable_opaque_menu=no],[enable_opaque_menu=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_menu)
 
 AC_MSG_CHECKING(whether panel library structures should be opaque)
-AC_ARG_ENABLE(opaque-panel,
+CF_ARG_DISABLE(opaque-panel,
 	[  --disable-opaque-panel  do not make panel library structures opaque],
-	[enable_opaque_panel=yes],[enable_opaque_panel=$cf_dft_opaque_curses])
+	[enable_opaque_panel=no],[enable_opaque_panel=$cf_dft_opaque_curses])
 AC_MSG_RESULT($enable_opaque_panel)
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
diff --git a/dist.mk b/dist.mk
index 53ae31cfc..e5cd16916 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1604 2024/03/30 09:26:39 tom Exp $
+# $Id: dist.mk,v 1.1606 2024/04/13 11:28:20 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240330
+NCURSES_PATCH = 20240413
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/ada/terminal_interface-curses__adb.htm b/doc/html/ada/terminal_interface-curses__adb.htm
index 53636619a..1f5e7c3ed 100644
--- a/doc/html/ada/terminal_interface-curses__adb.htm
+++ b/doc/html/ada/terminal_interface-curses__adb.htm
@@ -24,7 +24,7 @@
 <span class="comment"><em>--                                 B O D Y                                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
-<span class="comment"><em>-- Copyright 2018,2020 Thomas E. Dickey                                     --</em></span>
+<span class="comment"><em>-- Copyright 2018-2020,2024 Thomas E. Dickey                                --</em></span>
 <span class="comment"><em>-- Copyright 2007-2011,2014 Free Software Foundation, Inc.                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>-- Permission is hereby granted, free of charge, to any person obtaining a  --</em></span>
@@ -53,8 +53,8 @@
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <span class="comment"><em>--  Author: Juergen Pfeifer, 1996</em></span>
 <span class="comment"><em>--  Version Control:</em></span>
-<span class="comment"><em>--  @Revision: 1.16 @</em></span>
-<span class="comment"><em>--  @Date: 2020/02/02 23:34:34 @</em></span>
+<span class="comment"><em>--  @Revision: 1.17 @</em></span>
+<span class="comment"><em>--  @Date: 2024/03/30 13:24:07 @</em></span>
 <span class="comment"><em>--  Binding Version 01.00</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <b>with</b> System;
@@ -579,7 +579,7 @@
       <span class="symbol"><a name="ref_562_7">L</a></span> : <b>constant</b> <a href="terminal_interface-curses__ads.htm#ref_77_12">Special_Key_Code</a>  := <a href="terminal_interface-curses__ads.htm#ref_77_12">Special_Key_Code</a> (Natural (<a href="terminal_interface-curses__ads.htm#ref_111_4">Key_F0</a>) +
         Natural (<a href="terminal_interface-curses__ads.htm#ref_949_12">Function_Key_Number</a>'Last));
    <b>begin</b>
-      <b>if</b> (<a href="terminal_interface-curses__ads.htm#ref_945_30">Key</a> &gt;= <a href="terminal_interface-curses__ads.htm#ref_111_4">Key_F0</a>) <b>and</b> <b>then</b> (<a href="terminal_interface-curses__ads.htm#ref_945_30">Key</a> &lt;= <a href="terminal_interface-curses__adb.htm#ref_562_7">L</a>) <b>then</b>
+      <b>if</b> <a href="terminal_interface-curses__ads.htm#ref_945_30">Key</a> &gt;= <a href="terminal_interface-curses__ads.htm#ref_111_4">Key_F0</a> <b>and</b> <b>then</b> <a href="terminal_interface-curses__ads.htm#ref_945_30">Key</a> &lt;= <a href="terminal_interface-curses__adb.htm#ref_562_7">L</a> <b>then</b>
          <b>return</b> True;
       <b>else</b>
          <b>return</b> False;
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index a9bd6c504..25160dd16 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.57 2024/03/23 19:58:15 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.59 2024/04/13 22:11:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -321,13 +321,16 @@ <H1 class="no-header">curs_add_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,  <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
+       <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
+       its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
-ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+
+ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index ae3aa244a..e4020ef68 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.34 2024/03/16 19:44:53 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -56,13 +56,13 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>add_wchstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>add_wchnstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvadd_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>add_wchnstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
@@ -118,12 +118,14 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+       <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
+       in its non-wide-character configuration.
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index be7a59bb2..1284f5702 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.81 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_addch.3x,v 1.83 2024/04/13 22:23:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -89,54 +89,47 @@ <H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
            line of the window.
 
        <STRONG>o</STRONG>   Line  feed  does  a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then moves the cursor to the left
-           margin on the next line of the window, scrolling the window if  the
-           cursor was already on the last line.
+           margin on the next line of  the  window,  and  if  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is
+           enabled  for  <EM>win</EM>,  scrolls the window if the cursor was already on
+           the last line.
 
-       <STRONG>o</STRONG>   Tab  advances the cursor to the next tab stop (possibly on the next
-           line); these are placed at every eighth column by  default.   Alter
-           the    tab    interval    with    the    <STRONG>TABSIZE</STRONG>   extension;   see
+       <STRONG>o</STRONG>   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    <STRONG>TABSIZE</STRONG>    extension;    see
            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       If <EM>ch</EM> is any other nonprintable character, it  is  drawn  in  printable
+       If  <EM>ch</EM>  is  any  other nonprintable character, it is drawn in printable
        form, using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>waddch</STRONG> displays control characters in <STRONG>^</STRONG><EM>X</EM> notation.
-
-       <STRONG>o</STRONG>   Character codes above 127 are either meta characters (if the screen
-           has not been initialized, or if <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> has  been  called  with  a
-           <STRONG>TRUE</STRONG>  <EM>bf</EM> parameter) that render in <STRONG>M-</STRONG><EM>X</EM> notation, or they display as
-           themselves.  In the latter case, the values may not  be  printable;
-           this follows the X/Open specification.
-
-       Calling  <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does not
+       Calling <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does  not
        return the character itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
 
-       Video attributes can be combined with a character  argument  passed  to
-       <STRONG>waddch</STRONG>   by  logical-ORing  them  into  the  character.   (Thus,  text,
-       including attributes, can be copied from one  place  to  another  using
-       <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>  and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined
-       video attribute constants that can be usefully OR'ed with characters.
+       <EM>ch</EM>  may  contain  rendering  and/or color attributes, and others can be
+       combined with the parameter by logically "or"ing with it.  (A character
+       with  its  attributes can be copied from place to place using <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>
+       and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for  values  of  predefined   video
+       attribute constants that can be usefully "or"ed with characters.
 
 
 </PRE><H3><a name="h3-Echoing-Characters">Echoing Characters</a></H3><PRE>
-       <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
-       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these functions as a hint that only a
+       <STRONG>echochar</STRONG>  and  <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG> followed by
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM> interprets these functions as a hint  that  only  a
        single  character  is  being  output;  for  non-control  characters,  a
        considerable performance gain may be enjoyed by employing them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
-       <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
-       to write line-drawing and  other  special  characters  to  the  screen.
-       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
-       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
-       define  a  terminal-specific replacement for it, or if the terminal and
-       locale configuration requires Unicode to access  these  characters  but
+       <EM>curses</EM> defines macros starting with <STRONG>ACS_</STRONG> that can be used  with  <STRONG>waddch</STRONG>
+       to  write  line-drawing  and  other  special  characters to the screen.
+       <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS  default  listed
+       below  is  used  if  the  <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not
+       define a terminal-specific replacement for it, or if the  terminal  and
+       locale  configuration  requires  Unicode to access these characters but
        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
        corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> string
-       capability,  and  the  characters in it may appear on the screen if the
+       capability, and the characters in it may appear on the  screen  if  the
        terminal's database entry incorrectly advertises ACS support.  The name
-       "ACS"  originates  in  the  Alternate  Character Set feature of the DEC
+       "ACS" originates in the Alternate Character  Set  feature  of  the  DEC
        VT100 terminal.
 
                       <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
@@ -179,15 +172,16 @@ <H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if it is not possible to add a  complete
-       character  at  the  cursor  position, as when conversion of a multibyte
-       character to a byte sequence fails, or at least one  of  the  resulting
-       bytes  cannot  be added to the window.  See section "PORTABILITY" below
+       In  <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if it is not possible to add a complete
+       character at the cursor position, as when  conversion  of  a  multibyte
+       character  to  a  byte sequence fails, or at least one of the resulting
+       bytes cannot be added to the window.  See section  "PORTABILITY"  below
        regarding the use of <STRONG>waddch</STRONG> with multibyte characters.
 
-       If <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not  enabled,  <STRONG>waddch</STRONG>  can  successfully  write  a
-       character at the bottom right location of the window.  However, <EM>ncurses</EM>
-       returns <STRONG>ERR</STRONG> because it is not possible to wrap to a new line.
+       <STRONG>waddch</STRONG>  can successfully write a character at the bottom right location
+       of the window.  However, <EM>ncurses</EM> returns <STRONG>ERR</STRONG>  if  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not
+       enabled  in  that  event,  because  it is not possible to wrap to a new
+       line.
 
        Functions with a  "mv"  prefix  first  perform  cursor  movement  using
        <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
@@ -235,7 +229,7 @@ <H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
        <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
        released  System V.   However, many publicly available <EM>terminfo</EM> entries
-       include <STRONG>acsc</STRONG> strings  in  which  their  key  characters  (pryz{|})  are
+       include <STRONG>acsc</STRONG> strings  in  which  their  key  characters  <STRONG>(</STRONG>pryz{|}<STRONG>)</STRONG>  are
        embedded,  and  a  second-hand list of their character descriptions has
        come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
        them.
@@ -263,20 +257,20 @@ <H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        the  character  code,  which  SVr4  packs  into a <EM>chtype</EM> for passage to
        <STRONG>waddch</STRONG>.
 
-       In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character.  But <EM>ncurses</EM> allows  a
-       multibyte  character  to  be passed in a succession of calls to <STRONG>waddch</STRONG>.
-       Other implementations do not;  a  <STRONG>waddch</STRONG>  call  transmits  exactly  one
-       character,  which  may  be  rendered  in  one  or more screen locations
+       In <EM>ncurses</EM>, <EM>chtype</EM> holds  an  eight-bit  character.   But  the  library
+       allows  a  multibyte character to be passed in a succession of calls to
+       <STRONG>waddch</STRONG>.  Other implementations do not; a <STRONG>waddch</STRONG> call transmits  exactly
+       one  character,  which  may be rendered in one or more screen locations
        depending on whether it is printable.
 
        Depending on the locale settings, <EM>ncurses</EM> inspects the byte  passed  in
        each  <STRONG>waddch</STRONG>  call,  and  checks  whether  the  latest call continues a
        multibyte sequence.  When a character is <EM>complete</EM>, <EM>ncurses</EM> displays the
-       character and advances the window's current location.
+       character and advances the cursor.
 
        If  the  calling  application  interrupts  the succession of bytes in a
-       multibyte character  sequence  by  moving  the  current  location  (for
-       example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>), <EM>ncurses</EM> discards the incomplete character.
+       multibyte character sequence  by  changing  the  current  location--for
+       example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM> discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon this
        behavior.  Check whether a character can be  represented  as  a  single
@@ -293,16 +287,16 @@ <H1 class="no-header">curs_addch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
-
        <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
+
 
 
-ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 8bd9fc2f3..fe12b9900 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.40 2024/03/16 15:37:51 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.42 2024/04/13 22:21:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -55,13 +55,13 @@ <H1 class="no-header">curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addchstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>addchnstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvaddchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>addchnstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
@@ -111,14 +111,14 @@ <H1 class="no-header">curs_addchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
-
        <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>  describes  comparable  functions  of  the  <EM>ncurses</EM>
        library in its wide-character configuration (<EM>ncursesw</EM>).
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 0f7a29917..781ad8a2e 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.41 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_addstr.3x,v 1.43 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -103,14 +103,14 @@ <H1 class="no-header">curs_addstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
-
        <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+
 
 
-ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index d5f8eebaa..9cc8cd0a1 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.33 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.35 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -110,14 +110,14 @@ <H1 class="no-header">curs_addwstr 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
-
        <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+
 
 
-ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index ea72c340f..0b5c41fac 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.36 2024/03/23 20:00:03 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.38 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -160,15 +160,15 @@ <H1 class="no-header">curs_get_wch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
-
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+
 
 
-ncurses 6.4                       2024-03-23                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index e1035e021..612908318 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.44 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.46 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -183,11 +183,14 @@ <H1 class="no-header">curs_get_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+       <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       in its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+
+ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index b0a1abf6e..270263f03 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.47 2024/04/13 22:08:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>getcchar</STRONG>,  <STRONG>setcchar</STRONG>  -  convert  between  a wide-character string and a
-       <EM>curses</EM> complex character string
+       <EM>curses</EM> complex character
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 4fd0541d3..2c9e31c22 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.83 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_getch.3x,v 1.85 2024/04/13 22:18:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -141,10 +141,10 @@ <H1 class="no-header">curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        otherwise, it returns the function key code corresponding to the unique
        sequence defined by the terminal.  Consequently, a  user  of  a  <EM>curses</EM>
        application  may  experience  a  delay  after pressing ESC while <EM>curses</EM>
-       disambiguates the input.   See  section  "EXTENSIONS"  below.   If  the
-       window  is  in  "no time-out" mode, the timer does not expire; it is an
-       infinite (or very large) value.  See <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.   Because  function
-       key  sequences usually begin with an escape character, the terminal may
+       disambiguates the input; see section "EXTENSIONS" below.  If the window
+       is  in "no time-out" mode, the timer does not expire; it is an infinite
+       (or very  large)  value.   See  <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.   Because  function  key
+       sequences  usually  begin  with  an  escape character, the terminal may
        appear to hang in no time-out mode after  the  user  has  pressed  ESC.
        Generally, further typing "awakens" <EM>curses</EM>.
 
@@ -407,13 +407,13 @@ <H1 class="no-header">curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
-
        <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
+
        ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
        publications-and-standards/standards/ecma-6/&gt;
 
@@ -422,7 +422,7 @@ <H1 class="no-header">curs_getch 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index ef4ad6882..0a16c1bad 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.54 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_getstr.3x,v 1.56 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -236,11 +236,14 @@ <H1 class="no-header">curs_getstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
+       in its wide-character configuration (<EM>ncursesw</EM>).
+
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index c5c4ac6af..892cab2d2 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.26 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.28 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -87,12 +87,14 @@ <H1 class="no-header">curs_in_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library in
+       its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 1c671d35d..ad70a28e5 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -56,13 +56,13 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>in_wchstr(cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>in_wchnstr(cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>win_wchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>win_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvin_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvin_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwin_wchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>in_wchnstr(cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>win_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvin_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwin_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
@@ -112,12 +112,14 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+       <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       in its non-wide-character configuration.
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index e4690a1c3..d10727a5a 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_inch.3x,v 1.48 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -121,21 +121,14 @@ <H1 class="no-header">curs_inch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
-              gives an overview of the <STRONG>WINDOW</STRONG> and <STRONG>chtype</STRONG> data types.
+       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-              goes into more detail, pointing  out  portability  problems  and
-              constraints   on   the   use  of  <STRONG>chtype</STRONG>  for  returning  window
-              information.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
-       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
-              describes comparable functions for the wide-character (ncursesw)
-              library.
 
 
-
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 5f741d30d..80aa1bb27 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.64 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_initscr.3x,v 1.66 2024/04/13 22:18:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -178,8 +178,8 @@ <H1 class="no-header">curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Differences">Differences</a></H3><PRE>
-       X/Open  specifies that portable applications must not call <STRONG>initscr</STRONG> more
-       than once:
+       X/Open  Curses  specifies  that  portable  applications  must  not call
+       <STRONG>initscr</STRONG> more than once:
 
        <STRONG>o</STRONG>   The portable way to use <STRONG>initscr</STRONG> is once only, using <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to
            restore the screen after <STRONG>endwin</STRONG>.
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 966b645a2..c197d4a10 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.64 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_inopts.3x,v 1.66 2024/04/13 22:20:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -331,13 +331,25 @@ <H1 class="no-header">curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        the later definition is the one used.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       Formerly, <EM>ncurses</EM> used  <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>  to  control  the  conversion  of
+       newlines  to  carriage  return/line  feed  on  output as well as input.
+       X/Open Curses documents the use of  these  functions  only  for  input.
+       This  difference arose from converting the <EM>pcurses</EM> source (1986), which
+       used <STRONG>ioctl(2)</STRONG> calls and the <EM>sgttyb</EM> structure,  to  <EM>termios</EM>  (the  POSIX
+       terminal  API).   In  the former, both input and output were controlled
+       via a single option <STRONG>CRMOD</STRONG>, while the latter separates  these  features.
+       Because  that  conversion  interferes with output optimization, <EM>ncurses</EM>
+       6.2 (2020) amended <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> to eliminate their effect on output.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -364,6 +376,7 @@ <H1 class="no-header">curs_inopts 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 6cf946dc8..200264c52 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.32 2024/03/16 15:48:54 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.34 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -118,11 +118,14 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+       <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       in its non-wide-character configuration.
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+
+ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 0c3b755bf..a3c25fcac 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_instr.3x,v 1.48 2024/04/13 22:14:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -110,12 +110,14 @@ <H1 class="no-header">curs_instr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
+       in its wide-character configuration (<EM>ncursesw</EM>).
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+
+ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 8d91ff0b9..e9cf7f423 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_kernel.3x,v 1.58 2024/04/13 22:19:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -122,47 +122,46 @@ <H1 class="no-header">curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
-       The <STRONG>ripoffline</STRONG> routine  provides  access  to  the  same  facility  that
-       <STRONG>slk_init</STRONG>  [see  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>]  uses  to  reduce the size of the screen.
-       <STRONG>ripoffline</STRONG> must be called before  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>  is  called,  to
-       prepare these initial actions:
+       <STRONG>ripoffline</STRONG> provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>  uses
+       to  reduce  the  size  of the screen.  <STRONG>ripoffline</STRONG> must be called before
+       <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is called, to prepare these initial actions:
 
        <STRONG>o</STRONG>   If <EM>line</EM> is positive, a line is removed from the top of <STRONG>stdscr</STRONG>.
 
        <STRONG>o</STRONG>   if <EM>line</EM> is negative, a line is removed from the bottom.
 
-       When  the  resulting initialization is done inside <STRONG>initscr</STRONG>, the routine
+       When the resulting initialization is done inside <STRONG>initscr</STRONG>,  the  routine
        <STRONG>init</STRONG> (supplied by the user) is called with two arguments:
 
        <STRONG>o</STRONG>   a window pointer to the one-line window that has been allocated and
 
        <STRONG>o</STRONG>   an integer with the number of columns in the window.
 
-       Inside this initialization routine, the  integer  variables  <STRONG>LINES</STRONG>  and
-       <STRONG>COLS</STRONG>  (defined  in  <STRONG>&lt;curses.h&gt;</STRONG>)  are  not guaranteed to be accurate and
-       <STRONG>wrefresh</STRONG> or <STRONG>doupdate</STRONG> must not be  called.   It  is  allowable  to  call
+       Inside  this  initialization  routine,  the integer variables <STRONG>LINES</STRONG> and
+       <STRONG>COLS</STRONG> (defined in <STRONG>&lt;curses.h&gt;</STRONG>) are not  guaranteed  to  be  accurate  and
+       <STRONG>wrefresh</STRONG>  or  <STRONG>doupdate</STRONG>  must  not  be  called.  It is allowable to call
        <STRONG>wnoutrefresh</STRONG> during the initialization routine.
 
-       <STRONG>ripoffline</STRONG>  can  be  called  up to five times before calling <STRONG>initscr</STRONG> or
+       <STRONG>ripoffline</STRONG> can be called up to five times  before  calling  <STRONG>initscr</STRONG>  or
        <STRONG>newterm</STRONG>.
 
 
 </PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
-       The <STRONG>curs_set</STRONG> routine sets the cursor state  to  invisible,  normal,  or
-       very  visible  for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.  If the
-       terminal supports the <EM>visibility</EM> requested, the previous  <EM>cursor</EM>  state
+       The  <STRONG>curs_set</STRONG>  routine  sets  the cursor state to invisible, normal, or
+       very visible for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.   If  the
+       terminal  supports  the <EM>visibility</EM> requested, the previous <EM>cursor</EM> state
        is returned; otherwise, <STRONG>ERR</STRONG> is returned.
 
 
 </PRE><H3><a name="h3-napms">napms</a></H3><PRE>
-       The  <STRONG>napms</STRONG>  routine is used to sleep for <EM>ms</EM> milliseconds.  If the value
-       of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped at that value.
+       <STRONG>napms</STRONG> sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000  (thirty
+       seconds), it is capped at that value.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
-       <STRONG>curs_set</STRONG> returns the previous cursor state, or  <STRONG>ERR</STRONG>  if  the  requested
+       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
        <EM>visibility</EM> is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -180,23 +179,23 @@ <H1 class="no-header">curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
        <EM>y</EM> and <EM>x</EM>.
 
-       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
+       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both <EM>ncurses</EM> and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for <EM>ncurses</EM>  to  determine  the  initial
+       called to make the cursor other than normal, i.e., either invisible  or
+       very  visible.   There  is  no way for <EM>ncurses</EM> to determine the initial
        cursor state to restore that.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in the
-       XSI Curses standard, Issue 4.  All other functions are as described  in
+       XSI  Curses standard, Issue 4.  All other functions are as described in
        XSI Curses.
 
-       The  SVr4  documentation  describes  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> as having return
-       type int.  This is misleading, as they are macros  with  no  documented
+       The SVr4 documentation describes <STRONG>setsyx</STRONG> and  <STRONG>getsyx</STRONG>  as  having  return
+       type  int.   This  is misleading, as they are macros with no documented
        semantics for the return value.
 
        If interrupted, <EM>ncurses</EM> restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
@@ -209,7 +208,7 @@ <H1 class="no-header">curs_kernel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 783379846..96b1b01d7 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.58 2024/03/16 15:49:18 tom Exp @
+  * @Id: curs_outopts.3x,v 1.60 2024/04/13 22:23:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -158,54 +158,46 @@ <H1 class="no-header">curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
            outside the window.
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns an error if the window pointer is null.
-
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that  <STRONG>clearok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and <STRONG>setscrreg</STRONG> may be
+       Note that <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and  <STRONG>setscrreg</STRONG>  may  be
        macros.
 
-       The <STRONG>immedok</STRONG> routine is useful for windows that  are  used  as  terminal
+       The  <STRONG>immedok</STRONG>  routine  is  useful for windows that are used as terminal
        emulators.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in the XSI Curses standard, Issue 4.
 
-       From  the  outset,  <EM>ncurses</EM>  used  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG> to control the conversion of
-       newlines to carriage return/line-feed on output as well as input.   XSI
-       Curses  documents  only  the  use  of  these functions for input.  This
-       difference arose from converting the <EM>pcurses</EM> source (which  used  <STRONG>ioctl</STRONG>
-       calls  with  the <STRONG>sgttyb</STRONG> structure) to termios (i.e., the POSIX terminal
-       interface).  In the former, both input and output were controlled via a
-       single  option  <STRONG>CRMOD</STRONG>,  while  the  latter  separates  these  features.
-       Because that conversion interferes with  output  optimization,  <STRONG>nl</STRONG>/<STRONG>nonl</STRONG>
-       were amended after <EM>ncurses</EM> 6.2 to eliminate their effect on output.
-
-       Some  historic  curses implementations had, as an undocumented feature,
+       Some historic curses implementations had, as an  undocumented  feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
        <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
-       Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
-       enabled, any window modification triggering  a  scroll  also  forced  a
+       Earlier System V curses implementations specified  that  with  <STRONG>scrollok</STRONG>
+       enabled,  any  window  modification  triggering  a scroll also forced a
        physical refresh.  XSI Curses does not require this, and <EM>ncurses</EM> avoids
-       doing it to perform better  vertical-motion  optimization  at  <STRONG>wrefresh</STRONG>
+       doing  it  to  perform  better vertical-motion optimization at <STRONG>wrefresh</STRONG>
        time.
 
        The XSI Curses standard does not mention that the cursor should be made
-       invisible as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation  does
-       this,  but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the cursor
+       invisible  as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does
+       this, but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the  cursor
        invisible.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <EM>ncurses</EM>  formerly  treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input <EM>and</EM> output
+       options, but no longer; see <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -225,6 +217,7 @@ <H1 class="no-header">curs_outopts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 511572aa1..55ddbac1a 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.55 2024/03/16 15:49:29 tom Exp @
+  * @Id: curs_pad.3x,v 1.57 2024/04/13 22:13:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -55,103 +55,102 @@ <H1 class="no-header">curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>WINDOW</STRONG> <STRONG>*newpad(int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*subpad(WINDOW</STRONG> <STRONG>*</STRONG><EM>orig</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*subpad(WINDOW</STRONG> <STRONG>*</STRONG><EM>parent</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
              <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>prefresh(WINDOW</STRONG> <STRONG>*</STRONG><EM>pad</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pminrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pmincol</EM><STRONG>,</STRONG>
              <STRONG>int</STRONG> <EM>sminrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smincol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smaxrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smaxcol</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pnoutrefresh(WINDOW</STRONG> <STRONG>*</STRONG><EM>pad</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pminrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pmincol</EM><STRONG>,</STRONG>
              <STRONG>int</STRONG> <EM>sminrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smincol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smaxrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>smaxcol</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>pechochar(WINDOW</STRONG> <STRONG>*</STRONG><EM>pad</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pecho_wchar(WINDOW</STRONG> <STRONG>*</STRONG><EM>pad</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       A <EM>curses</EM> <EM>pad</EM> is like a window, except that it is not restricted by  the
+       screen  size,  and is not necessarily associated with a particular part
+       of the screen.  Pads can be used when a large window  is  needed,  only
+       part  of  which  is  to  be  visible  on  the  screen.   Pads  are  not
+       automatically refreshed by scrolling or input-echoing operations.
 
-</PRE><H3><a name="h3-newpad">newpad</a></H3><PRE>
-       <STRONG>newpad</STRONG> creates and returns a pointer to a new pad data  structure  with
-       the given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.  A pad is like a
-       window, except that it is not restricted by the screen size, and is not
-       necessarily  associated with a particular part of the screen.  Pads can
-       be used when a large window is needed, and only a part  of  the  window
-       will  be  on  the  screen at one time.  Automatic refreshes of pads (as
-       from scrolling or echoing of input) do not occur.
+       Pads  cannot  be  refreshed  with   <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>;   use   <STRONG>prefresh</STRONG>   or
+       <STRONG>pnoutrefresh</STRONG> instead.
 
-       It is not valid to call <STRONG>wrefresh</STRONG> with a <EM>pad</EM> argument; call <STRONG>prefresh</STRONG>  or
-       <STRONG>pnoutrefresh</STRONG>  instead.   They  require additional parameters to specify
-       the part of the pad to be displayed and the location on the  screen  to
-       be used for the display.
+
+</PRE><H3><a name="h3-newpad">newpad</a></H3><PRE>
+       <STRONG>newpad</STRONG>  creates  and returns a pointer to a new pad data structure with
+       the given number of lines, <EM>nlines</EM>, and columns, <EM>ncols</EM>.
 
 
 </PRE><H3><a name="h3-subpad">subpad</a></H3><PRE>
-       The  <STRONG>subpad</STRONG> routine creates and returns a pointer to a subwindow within
-       a pad with the given number  of  lines,  <EM>nlines</EM>,  and  columns,  <EM>ncols</EM>.
-       Unlike <STRONG>subwin</STRONG>, which uses screen coordinates, the window is at position
-       (<EM>begin</EM>_<EM>x</EM><STRONG>,</STRONG> <EM>begin</EM>_<EM>y</EM>) on the pad.  The window is made in the middle of the
-       window  <EM>orig</EM>,  so  that changes made to one window affect both windows.
-       During the use of this routine, it will  often  be  necessary  to  call
-       <STRONG>touchwin</STRONG> or <STRONG>touchline</STRONG> on <EM>orig</EM> before calling <STRONG>prefresh</STRONG>.
+       <STRONG>subpad</STRONG> creates and returns a pointer to a subwindow within a  pad  with
+       the  given  number  of  lines,  <EM>nlines</EM>,  and  columns,  <EM>ncols</EM>.   Unlike
+       <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG>, which uses screen coordinates, the new  pad  is  placed  at
+       position (<EM>begin</EM><STRONG>_</STRONG><EM>y</EM>, <EM>begin</EM><STRONG>_</STRONG><EM>x</EM>) relative to its parent.  Thus, changes made
+       to one pad can affect both.  When operating on a subpad,  it  is  often
+       necessary  to  call  <STRONG><A HREF="curs_touch.3x.html">touchwin(3x)</A></STRONG>  or  <STRONG><A HREF="curs_touch.3x.html">touchline(3x)</A></STRONG>  on  <EM>parent</EM> before
+       calling <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-prefresh_pnoutrefresh">prefresh, pnoutrefresh</a></H3><PRE>
-       The  <STRONG>prefresh</STRONG>  and  <STRONG>pnoutrefresh</STRONG> routines are analogous to <STRONG>wrefresh</STRONG> and
-       <STRONG>wnoutrefresh</STRONG> except that they relate to pads instead of  windows.   The
-       additional  parameters  are needed to indicate what part of the pad and
-       screen are involved.
+       <STRONG>prefresh</STRONG>  and  <STRONG>pnoutrefresh</STRONG>   are   analogous   to   <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>   and
+       <STRONG><A HREF="curs_refresh.3x.html">wnoutrefresh(3x)</A></STRONG>  except that they operate on pads rather than windows.
+       They require additional parameters are needed to indicate what portions
+       of the pad and screen are involved.
 
-       <STRONG>o</STRONG>   The <EM>pminrow</EM> and <EM>pmincol</EM>  parameters  specify  the  upper  left-hand
-           corner of the rectangle to be displayed in the pad.
+       <STRONG>o</STRONG>   <EM>pminrow</EM>  and  <EM>pmincol</EM>  specify  the  upper  left-hand  corner  of a
+           rectanglar view of the pad.
 
-       <STRONG>o</STRONG>   The  <EM>sminrow</EM>,  <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> parameters specify the
-           edges of the rectangle to be displayed on the screen.
+       <STRONG>o</STRONG>   <EM>sminrow</EM>, <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> specify the vertices of  the
+           rectangle to be displayed on the screen.
 
        The lower right-hand corner of the rectangle to be displayed in the pad
        is calculated from the screen coordinates, since the rectangles must be
        the same size.  Both rectangles must be entirely contained within their
-       respective  structures.   Negative values of <EM>pminrow</EM>, <EM>pmincol</EM>, <EM>sminrow</EM>,
-       or <EM>smincol</EM> are treated as if they were zero.
+       respective structures.  <EM>curses</EM> treats negative values of any  of  these
+       parameters as zero.
 
 
 </PRE><H3><a name="h3-pechochar">pechochar</a></H3><PRE>
-       The <STRONG>pechochar</STRONG> routine is functionally equivalent to  a  call  to  <STRONG>addch</STRONG>
-       followed  by a call to <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>, a call to <STRONG>waddch</STRONG> followed by a call
-       to <STRONG>wrefresh</STRONG>, or a call to <STRONG>waddch</STRONG> followed by a call to  <STRONG>prefresh</STRONG>.   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 these routines instead of their
-       equivalents.  In the case of <STRONG>pechochar</STRONG>, the last location of the pad on
-       the screen is reused for the arguments to <STRONG>prefresh</STRONG>.
+       <STRONG>pechochar</STRONG>  is functionally equivalent to calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> followed by
+       <STRONG>prefresh</STRONG>.  It suggests to the  <EM>curses</EM>  optimizer  that  only  a  single
+       character  is  being  output; a considerable performance benefit may be
+       thus enjoyed.  The location of the character <EM>ch</EM> written to the  pad  is
+       used to populate the arguments to <STRONG>prefresh</STRONG>.
 
 
 </PRE><H3><a name="h3-pecho_wchar">pecho_wchar</a></H3><PRE>
-       The  <STRONG>pecho_wchar</STRONG>  function  is  the  analogous  wide-character  form of
-       <STRONG>pechochar</STRONG>.  It outputs one character to a pad and immediately refreshes
-       the  pad.   It  does  this  by a call to <STRONG>wadd_wch</STRONG> followed by a call to
-       <STRONG>prefresh</STRONG>.
+       <STRONG>pecho_wchar</STRONG> is functionally equivalent to calling <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> followed
+       by <STRONG>prefresh</STRONG>.  It suggests to the <EM>curses</EM> optimizer that  only  a  single
+       wide  character is being output; a considerable performance benefit may
+       be thus enjoyed.  The location of the character <EM>wch</EM> written to the  pad
+       is used to populate the arguments to <STRONG>prefresh</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions that return an integer return <STRONG>ERR</STRONG> upon failure and  <STRONG>OK</STRONG>  (SVr4
-       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
+       Functions  that  return an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
+       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       Functions that return pointers return <STRONG>NULL</STRONG> on error, and set  <STRONG>errno</STRONG>  to
+       Functions  that  return pointers return <STRONG>NULL</STRONG> on error, and set <STRONG>errno</STRONG> to
        <STRONG>ENOMEM</STRONG>.
 
-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
        implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
                return an error if the window pointer is null, or if the window
-               is  not  really  a  pad  or if the area to refresh extends off-
-               screen or if the  minimum  coordinates  are  greater  than  the
+               is not really a pad or if the  area  to  refresh  extends  off-
+               screen  or  if  the  minimum  coordinates  are greater than the
                maximum.
 
           <STRONG>pechochar</STRONG>
-               returns  an  error  if  the window is not really a pad, and the
+               returns an error if the window is not really  a  pad,  and  the
                associated call to <STRONG>wechochar</STRONG> returns an error.
 
           <STRONG>pecho_wchar</STRONG>
-               returns an error if the window is not really  a  pad,  and  the
+               returns  an  error  if  the window is not really a pad, and the
                associated call to <STRONG>wecho_wchar</STRONG> returns an error.
 
 
@@ -162,67 +161,67 @@ <H1 class="no-header">curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        BSD <EM>curses</EM> has no <EM>pad</EM> feature.
 
-       SVr2   <EM>curses</EM>   (1986)  provided  the  <STRONG>newpad</STRONG>  and  related  functions,
-       documenting them in a single line  each.   SVr3  (1987)  provided  more
+       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
+       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
        extensive documentation.
 
-       The  documentation  does not explain the term <EM>pad</EM>.  However, the Apollo
+       The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
        <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
 
-       <STRONG>o</STRONG>   These graphical pads could  be  much  larger  than  the  computer's
+       <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
            display.
 
-       <STRONG>o</STRONG>   The  read-only  output  from  a  command  could be scrolled back to
+       <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
            inspect, and select text from the pad.
 
        The two uses may be related.
 
-       The XSI Curses standard, Issue 4  describes  these  functions,  without
-       significant  change from the SVr3 documentation.  It describes no error
-       conditions.  The behavior of <STRONG>subpad</STRONG> if the parent window is not  a  pad
+       The  XSI  Curses  standard,  Issue 4 describes these functions, without
+       significant change from the SVr3 documentation.  It describes no  error
+       conditions.   The  behavior of <STRONG>subpad</STRONG> if the parent window is not a pad
        is undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <EM>WINDOW</EM> structure in <STRONG>newpad</STRONG> which
+       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM>  structure  in  <STRONG>newpad</STRONG>  which
            tells if the window is a <EM>pad</EM>.
 
-           However, it uses this information only in <STRONG>waddch</STRONG> (to decide  if  it
-           should  call  <STRONG>wrefresh</STRONG>)  and  <STRONG>wscrl</STRONG> (to avoid scrolling a pad), and
-           does not check in <STRONG>wrefresh</STRONG> to ensure  that  the  pad  is  refreshed
+           However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
+           should call <STRONG>wrefresh</STRONG>) and <STRONG>wscrl</STRONG> (to avoid  scrolling  a  pad),  and
+           does  not  check  in  <STRONG>wrefresh</STRONG>  to ensure that the pad is refreshed
            properly.
 
-       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  checks whether a window is a pad in <STRONG>wnoutrefresh</STRONG>,
+       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> checks whether a window is a pad  in  <STRONG>wnoutrefresh</STRONG>,
            returning <STRONG>ERR</STRONG> in that case.
 
-           However, it only sets the flag for subwindows if the parent  window
-           is  a  pad.   Its  <STRONG>newpad</STRONG>  function  does not set this information.
+           However,  it only sets the flag for subwindows if the parent window
+           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
            Consequently, the check will never fail.
 
-           It makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though  interestingly
-           enough,  a  comment  in  the  source code states that the lack of a
+           It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
+           enough, a comment in the source code states  that  the  lack  of  a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG>  and
-           <STRONG>subpad</STRONG>,   using   this   to   help  with  the  distinction  between
+       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and
+           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
-           It does not check for the case where a subwindow is  created  in  a
+           It  does  not  check for the case where a subwindow is created in a
            pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
 
-           The  <STRONG>dupwin</STRONG>  function  returns  a regular window when duplicating a
-           pad.  Likewise, <STRONG>getwin</STRONG> always returns a window, even if  the  saved
+           The <STRONG>dupwin</STRONG> function returns a regular  window  when  duplicating  a
+           pad.   Likewise,  <STRONG>getwin</STRONG> always returns a window, even if the saved
            data was from a pad.
 
        This implementation
 
        <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
 
-       <STRONG>o</STRONG>   allows  a  <STRONG>subwin</STRONG>  or <STRONG>derwin</STRONG> call to succeed having a pad parent by
+       <STRONG>o</STRONG>   allows a <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG> call to succeed having a  pad  parent  by
            forcing the subwindow to be a pad,
 
-       <STRONG>o</STRONG>   checks in both <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to  ensure  that  pads
+       <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures   that   <STRONG>dupwin</STRONG>   and  <STRONG>getwin</STRONG>  treat  pads  versus  windows
+       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
            consistently.
 
 
@@ -231,7 +230,7 @@ <H1 class="no-header">curs_pad 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 6656b0400..ea313978f 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.40 2024/03/23 20:41:15 tom Exp @
+  * @Id: curs_scroll.3x,v 1.41 2024/04/14 00:14:28 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index f3d8eabe1..2fe219960 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.38 2024/04/13 22:16:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</H1
        routine fails and the location referenced by <EM>ch</EM> is not changed.
 
 
-</PRE><H3><a name="h3-has_is_has_il">has_is, has_il</a></H3><PRE>
+</PRE><H3><a name="h3-has_ic_has_il">has_ic, has_il</a></H3><PRE>
        The  <STRONG>has_ic</STRONG>  routine  is  true  if the terminal has insert- and delete-
        character capabilities.
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-03-16 ncurses 6.4 Library calls</H1
 <ul>
 <li><a href="#h3-baudrate">baudrate</a></li>
 <li><a href="#h3-erasechar_erasewchar">erasechar, erasewchar</a></li>
-<li><a href="#h3-has_is_has_il">has_is, has_il</a></li>
+<li><a href="#h3-has_ic_has_il">has_ic, has_il</a></li>
 <li><a href="#h3-killchar_killwchar">killchar, killwchar</a></li>
 <li><a href="#h3-longname">longname</a></li>
 <li><a href="#h3-termattrs_term_attrs">termattrs, term_attrs</a></li>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 9ee551e50..56620ba91 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.134 2024/03/23 20:41:15 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.136 2024/04/14 00:14:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -504,29 +504,30 @@ <H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        first standardized in the late 1980s.
 
        <STRONG>o</STRONG>   X/Open  Curses  uses  <EM>const</EM>  less  effectively  than a later design
-           might, in some cases applying it needlessly to values  are  already
-           constant,  and  in most cases overlooking parameters which normally
-           would use <EM>const</EM>.  Using constant parameters for functions which  do
-           not use <EM>const</EM> may prevent the program from compiling.  On the other
-           hand, "writable strings" are an obsolescent feature.
-
-           As an extension, this implementation can be  configured  to  change
-           the  function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI
+           might, sometimes applying it needlessly to values that are  already
+           constant,  and  in  most cases overlooking parameters that normally
+           would use <EM>const</EM>.  Passing <EM>const</EM>-qualified parameters  to  functions
+           that  do  not  declare  them  <EM>const</EM>  may  prevent  the program from
+           compiling.   On  the  other  hand,  "writable   strings"   are   an
+           obsolescent feature.
+
+           As  an  extension,  this implementation can be configured to change
+           the function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM>  ABI
            6 enables this feature by default.
 
-       <STRONG>o</STRONG>   X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number  of  parameters,
+       <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
            rather than a variable argument list.
 
-           This  implementation  uses  a  variable  argument  list, but can be
-           configured to use the fixed-parameter list.  Portable  applications
-           should  provide  nine  parameters after the format; zeroes are fine
+           This implementation uses a  variable  argument  list,  but  can  be
+           configured  to use the fixed-parameter list.  Portable applications
+           should provide nine parameters after the format;  zeroes  are  fine
            for this purpose.
 
-           In response to review comments by Thomas E. Dickey,  X/Open  Curses
+           In  response  to review comments by Thomas E. Dickey, X/Open Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
 
-           While  <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is only
-           available as a build-time configuration option.  If  not  specially
+           While <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is  only
+           available  as  a build-time configuration option.  If not specially
            configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
 
        Both forms of <STRONG>tparm</STRONG> have drawbacks:
@@ -534,67 +535,60 @@ <H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
            nine on each call is awkward.
 
-           Using <EM>long</EM> for the numeric parameter type is a workaround  to  make
-           the  parameter  use  the  same  amount of stack as a pointer.  That
-           approach dates back to the mid-1980s, before  C  was  standardized.
-           Since  then,  there is a standard (and pointers are not required to
+           Using  <EM>long</EM>  for the numeric parameter type is a workaround to make
+           the parameter use the same amount of  stack  as  a  pointer.   That
+           approach  dates  back  to the mid-1980s, before C was standardized.
+           Since then, there is a standard (and pointers are not  required  to
            fit in a <EM>long</EM>).
 
-       <STRONG>o</STRONG>   Providing the right number of parameters for  a  variadic  function
+       <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
            such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
-           parameters.  However, only a few <EM>terminfo</EM> capabilities  use  string
-           parameters  (for  instance, the ones used for programmable function
+           parameters.   However,  only a few <EM>terminfo</EM> capabilities use string
+           parameters (for instance, the ones used for  programmable  function
            keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           an  error  if  the capability mishandles string parameters.  But it
-           cannot check if a calling program provides  strings  in  the  right
+           an error if the capability mishandles string  parameters.   But  it
+           cannot  check  if  a  calling program provides strings in the right
            places for the <STRONG>tparm</STRONG> calls.
 
-           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
+           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of  these  capabilities  with  a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
        If configured to use the terminal driver, as with the MinGW port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
            value "unknown".
 
            SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The  difference  between  the  two  is  that  the  former  uses the
-           <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) <EM>terminfo</EM> capability, while the latter  does  not.
+           The difference  between  the  two  is  that  the  former  uses  the
+           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
            A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
-           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver  by
+           checking  if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of that
            string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In  SVr4,  <STRONG>set_curterm</STRONG>  returns  an  <EM>int</EM>, <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
+       In SVr4, <STRONG>set_curterm</STRONG> returns an <EM>int</EM>, <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
        implement the X/Open Curses semantics.
 
        In SVr4, the third argument of <STRONG>tputs</STRONG> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
 
-       At least one implementation of X/Open Curses (Solaris) returns a  value
-       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of the
+       At  least one implementation of X/Open Curses (Solaris) returns a value
+       other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of  the
        string, and does no error checking.
 
-       X/Open Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may  not
-       match  the  actual terminal state, and that an application should touch
-       and refresh the window  before  resuming  normal  <EM>curses</EM>  calls.   Both
+       X/Open  Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not
+       match the actual terminal state, and that an application  should  touch
+       and  refresh  the  window  before  resuming  normal <EM>curses</EM> calls.  Both
        <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data allocated
        in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
        function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
 
-       X/Open  notes  that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not match
-       the actual terminal state, and that an  application  should  touch  and
-       refresh  the  window before resuming normal <EM>curses</EM> calls.  Both <EM>ncurses</EM>
-       and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using  the  <EM>SCREEN</EM>  data  allocated  in
-       either  <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
-       function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
-
        X/Open Curses states that the old location must be given for  <STRONG>mvcur</STRONG>  to
        accommodate  terminals  that lack absolute cursor positioning.  <EM>ncurses</EM>
        allows the caller to use -1 for either or both old coordinates.  The -1
@@ -615,6 +609,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        <STRONG>mvcur</STRONG>       low level cursor motion
        <STRONG>putp</STRONG>        use <STRONG>tputs</STRONG> to send characters via <EM>putchar</EM>
        <STRONG>resetterm</STRONG>   set terminal modes to "out of <EM>curses</EM>" state
+
        <STRONG>resetty</STRONG>     reset terminal flags to stored value
        <STRONG>saveterm</STRONG>    save current modes as "in <EM>curses</EM>" state
        <STRONG>savetty</STRONG>     store current terminal flags
@@ -693,7 +688,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 984ad8e20..e4c90c4cd 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -181,11 +181,15 @@ <H1 class="no-header">curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 </PRE><H3><a name="h3-ESCDELAY">ESCDELAY</a></H3><PRE>
-       For <EM>curses</EM> to distinguish an escape character corresponding to a user's
-       press of an "Escape" key on the input device from  one  included  in  a
-       control sequence used by a cursor movement or function key, the library
-       waits to see if another key event occurs after  the  escape  character.
-       <STRONG>ESCDELAY</STRONG> stores this interval in milliseconds.
+       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
+       <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
+       the escape character to see if further characters are available on  the
+       input stream within a short interval.  <STRONG>ESCDELAY</STRONG> stores this interval in
+       milliseconds.
+
+       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
+       program must disambiguate escape sequences itself.
 
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
@@ -196,8 +200,8 @@ <H1 class="no-header">curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> initializes <EM>curses</EM>.
 
-       If <EM>ncurses</EM> is  configured  to  provide  separate  <EM>curses</EM>  and  <EM>terminfo</EM>
-       libraries, most of these variables reside in the <EM>curses</EM> library.
+       If  <EM>ncurses</EM>  is  configured  to  provide  separate  <EM>curses</EM>  and   <EM>tinfo</EM>
+       libraries, most of these variables reside in the former.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -262,7 +266,7 @@ <H1 class="no-header">curs_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index a6670e517..a2ed976e1 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997,1999,2000,2005
-  * @Id: default_colors.3x,v 1.50 2024/03/16 15:35:01 tom Exp @
+  * @Id: default_colors.3x,v 1.52 2024/04/13 22:17:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -49,7 +49,7 @@ <H1 class="no-header">default_colors 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>use_default_colors</STRONG>,  <STRONG>assume_default_colors</STRONG>  -  use  terminal's  default
-       colors
+       colors in <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 330628ed9..fcd1725b9 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.204 2024/03/23 20:42:29 tom Exp @
+  * @Id: ncurses.3x,v 1.207 2024/04/14 00:34:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,158 +61,152 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       describes <EM>ncurses</EM> version 6.4 (patch 20240323).
+       describes <EM>ncurses</EM> version 6.4 (patch 20240413).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; the reading of terminal
        input; control of terminal input and output options; environment  query
        routines;  color  manipulation;  the  definition  and use of <EM>soft</EM> <EM>label</EM>
-       keys; <EM>terminfo</EM> capabilities; a  <EM>termcap</EM>  compatibility  interface;  and
-       access to low-level terminal-manipulation routines.
+       keys; <EM>terminfo</EM> capability access; a  <EM>termcap</EM>  compatibility  interface;
+       and  an  abstraction  of the system's API for manipulating the terminal
+       (such as <STRONG>termios(3)</STRONG>).
 
-       <EM>ncurses</EM>  implements  the  standard interface described by X/Open Curses
-       Issue 7.  In  many  behavioral  details  not  standardized  by  X/Open,
-       <EM>ncurses</EM>  emulates  the  <EM>curses</EM>  library  of  SVr4 and provides numerous
+       <EM>ncurses</EM> implements the standard interface described  by  X/Open  Curses
+       Issue 7.   In  many  behavioral  details  not  standardized  by X/Open,
+       <EM>ncurses</EM> emulates the <EM>curses</EM>  library  of  SVr4  and  provides  numerous
        useful extensions.
 
-       <EM>ncurses</EM> man pages employ several sections to clarify matters  of  usage
+       <EM>ncurses</EM>  man  pages employ several sections to clarify matters of usage
        and interoperability with other <EM>curses</EM> implementations.
 
-       <STRONG>o</STRONG>   "NOTES"  describes  matters  and  caveats  of which any user of the
-           <EM>ncurses</EM> API should be aware, such as limitations on the size of  an
-           underlying  integral  type  or  the  availability of a preprocessor
-           macro exclusive  of  a  function  definition  (which  prevents  its
-           address   from   being   taken).    This   section  also  describes
-           implementation details that will be significant to  the  programmer
+       <STRONG>o</STRONG>   "NOTES" describes issues and caveats  of  which  any  user  of  the
+           <EM>ncurses</EM>  API should be aware, such as limitations on the size of an
+           underlying integral type or  the  availability  of  a  preprocessor
+           macro  exclusive  of  a  function  definition  (which  prevents its
+           address  from  being   taken).    This   section   also   describes
+           implementation  details  that will be significant to the programmer
            but which are not standardized.
 
-       <STRONG>o</STRONG>   "EXTENSIONS"  presents <EM>ncurses</EM> innovations beyond the X/Open Curses
-           standard and/or the SVr4 <EM>curses</EM> implementation.   They  are  termed
-           <EM>extensions</EM>  to  indicate  that they cannot be implemented solely by
+       <STRONG>o</STRONG>   "EXTENSIONS" presents <EM>ncurses</EM> innovations beyond the X/Open  Curses
+           standard  and/or  the  SVr4 <EM>curses</EM> implementation.  They are termed
+           <EM>extensions</EM> to indicate that they cannot be  implemented  solely  by
            using the library API, but require access to the library's internal
            state.
 
        <STRONG>o</STRONG>   "PORTABILITY" discusses matters (beyond the exercise of extensions)
-           that should be considered when writing to a <EM>curses</EM> standard, or  to
+           that should be considered when writing to a <EM>curses</EM> standard, or for
            multiple implementations.
 
-       <STRONG>o</STRONG>   "HISTORY"  examines  points  of  detail in <EM>ncurses</EM> and other <EM>curses</EM>
+       <STRONG>o</STRONG>   "HISTORY" examines points of detail in  <EM>ncurses</EM>  and  other  <EM>curses</EM>
            implementations over the decades of their development, particularly
            where precedent or inertia have frustrated better design (and, in a
            few cases, where such inertia has been overcome).
 
-       A program using these  routines  must  be  linked  with  the  <STRONG>-lncurses</STRONG>
-       option,  or  (if  it  has  been  generated)  with the debugging library
-       <STRONG>-lncurses_g</STRONG>.  (Your system integrator may  also  have  installed  these
-       libraries  under  the  names  <STRONG>-lcurses</STRONG>  and <STRONG>-lcurses_g</STRONG>.)  The ncurses_g
-       library generates trace logs (in a file called "trace" in  the  current
-       directory)  that  describe  curses  actions.   See  section  "ALTERNATE
-       CONFIGURATIONS" below.
+       A <EM>curses</EM> application must be linked with the library; use the <STRONG>-lncurses</STRONG>
+       option to your compiler or linker.  A debugging version of the  library
+       may  be available; if so, link with it using <STRONG>-lncurses_g</STRONG>.  (Your system
+       integrator may have installed these libraries such that you can use the
+       options  <STRONG>-lcurses</STRONG> and <STRONG>-lcurses_g</STRONG>, respectively.)  The <EM>ncurses</EM><STRONG>_</STRONG><EM>g</EM> library
+       generates trace logs (in a file called <EM>trace</EM> in the current  directory)
+       that  describe <EM>ncurses</EM> actions.  See section "ALTERNATE CONFIGURATIONS"
+       below.
 
 
-</PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The library uses the locale which the calling program has  initialized.
-       That is normally done with <STRONG>setlocale(3)</STRONG>:
+</PRE><H3><a name="h3-Application-Structure">Application Structure</a></H3><PRE>
+       A  <EM>curses</EM>  application  uses  information  from  the   system   locale;
+       <STRONG>setlocale(3)</STRONG> prepares it for <EM>curses</EM> library calls.
 
-           <STRONG>setlocale(LC_ALL,</STRONG> <STRONG>"");</STRONG>
+           setlocale(LC_ALL, "");
 
-       If  the  locale is not initialized, the library assumes that characters
-       are printable as in ISO-8859-1, to work with certain  legacy  programs.
-       You  should  initialize  the locale and not rely on specific details of
-       the library when the locale has not been set up.
+       If  the  locale  is  not  thus  initialized,  the  library assumes that
+       characters are printable as in ISO 8859-1, to work with certain  legacy
+       programs.   You  should initialize the locale; do not expect consistent
+       behavior from the library when the locale has not been set up.
 
-       The function <STRONG>initscr</STRONG> or  <STRONG>newterm</STRONG>  must  be  called  to  initialize  the
-       library  before  any  of  the other routines that deal with windows and
-       screens are  used.   The  routine  <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>  must  be  called  before
-       exiting.
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize  <EM>curses</EM>  before
+       use of any functions that deal with windows and screens.
 
-       To  get  character-at-a-time  input  without echoing (most interactive,
-       screen oriented programs want this), the following sequence  should  be
-       used:
+       To  get  character-at-a-time  input  without echoing--most interactive,
+       screen-oriented programs want this--use the following sequence.
 
-           <STRONG>initscr();</STRONG> <STRONG>cbreak();</STRONG> <STRONG>noecho();</STRONG>
+           initscr(); cbreak(); noecho();
 
-       Most programs would additionally use the sequence:
+       Most applications perform further setup as follows.
 
-           <STRONG>intrflush(stdscr,</STRONG> <STRONG>FALSE);</STRONG>
-           <STRONG>keypad(stdscr,</STRONG> <STRONG>TRUE);</STRONG>
+           intrflush(stdscr, FALSE);
+           keypad(stdscr, TRUE);
 
-       Before a <STRONG>curses</STRONG> program is run, the tab stops of the terminal should be
-       set and its initialization strings, if defined, must be  output.   This
-       can  be  done  by  executing  the  <STRONG>tput</STRONG>  <STRONG>init</STRONG>  command  after the shell
-       environment variable <EM>TERM</EM> has been exported.   (The  BSD-style  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
-       utility  also  performs  this  function.)   See  subsection  "Tabs  and
-       Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       A <EM>curses</EM> program then often enters an event loop of  some  sort.   Call
+       <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> before exiting.
 
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       A <EM>curses</EM> library abstracts the terminal screen by representing  all  or
-       part  of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular grid
-       of character cells, addressed by row and  column  coordinates  (<EM>y</EM>,  <EM>x</EM>),
+       A  <EM>curses</EM>  library abstracts the terminal screen by representing all or
+       part of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular  grid
+       of  character  cells,  addressed  by row and column coordinates (<EM>y</EM>, <EM>x</EM>),
        with the upper left corner as (0, 0).  A window called <STRONG>stdscr</STRONG>, the same
-       size as the terminal screen, is always available.  Create  others  with
+       size  as  the terminal screen, is always available.  Create others with
        <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
 
-       A  <EM>curses</EM>  library does not manage overlapping windows.  (See <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
-       if you desire this.)  You can either use <STRONG>stdscr</STRONG> to manage  one  screen-
-       filling window, or tile the screen into non-overlapping windows and not
-       use  <STRONG>stdscr</STRONG>  at  all.   Mixing  the  two  approaches  will  result   in
-       unpredictable, and undesired, effects.
+       A <EM>curses</EM> library does not manage overlapping windows (but  see  below).
+       You  can either use <STRONG>stdscr</STRONG> to manage one screen-filling window, or tile
+       the screen into non-overlapping windows and  not  use  <STRONG>stdscr</STRONG>  at  all.
+       Mixing  the  two  approaches will result in unpredictable and undesired
+       effects.
 
-       Functions  permit  manipulation  of a window and the <EM>cursor</EM> identifying
-       the cell within it at which  the  next  output  operation  will  occur.
+       Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
+       the  cell  within  it  at  which  the next output operation will occur.
        Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
-       cursor and write a character  to  <STRONG>stdscr</STRONG>,  respectively.   As  a  rule,
-       window-addressing  functions  feature  names  prefixed (or infixed, see
-       below) with "w"; these allow the user to specify a pointer to a <EM>WINDOW</EM>.
-       Counterparts  not  thus  prefixed  (or infixed) affect <STRONG>stdscr</STRONG>.  Because
-       moving the cursor prior to  another  operation  is  so  common,  <EM>curses</EM>
-       generally  also provides functions with a "mv" prefix as a convenience.
-       Thus, the library defines all of <STRONG>addch</STRONG>, <STRONG>waddch</STRONG>, <STRONG>mvaddch</STRONG>, and  <STRONG>mvwaddch</STRONG>.
-       When  both  prefixes  are  present,  the order of arguments is a <EM>WINDOW</EM>
-       pointer first, then a <EM>y</EM> and <EM>x</EM> coordinate pair.
-
-       Updating  the  terminal  screen  with  every  <EM>curses</EM>  call  can   cause
-       unpleasant  flicker or inefficient use of the communications channel to
-       the device.  Therefore, after using <EM>curses</EM> functions  to  accumulate  a
-       set  of  desired  updates  that  make  sense  to present together, call
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to tell the library to make the  user's  screen  look  like
-       <STRONG>stdscr</STRONG>.   <EM>ncurses</EM> <EM>optimizes</EM> its output by computing a minimal number of
-       operations to mutate the screen from its state at the previous  refresh
-       to  the  new  one.  Effective optimization demands accurate information
-       about the terminal device: the management of such  information  is  the
-       province  of  the  <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG> API, a feature of every standard <EM>curses</EM>
-       implementation.
+       cursor and write a character to <STRONG>stdscr</STRONG>, respectively.
+
+       Frequent changes to the terminal screen can cause unpleasant flicker or
+       inefficient use of the communication channel  to  the  device,  so  the
+       library  does  not generally update it automatically.  Therefore, after
+       using <EM>curses</EM> functions to accumulate a set of desired updates that make
+       sense to present together, call <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to tell the library to make
+       the user's screen look like <STRONG>stdscr</STRONG>.  The library <EM>optimizes</EM>  its  output
+       by  computing  a minimal number of operations to mutate the screen from
+       its  state  at  the  previous  refresh  to  the  new  one.    Effective
+       optimization  demands  accurate  information about the terminal device:
+       the management of such information is the province of the  <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG>
+       API, a feature of every standard <EM>curses</EM> implementation.
 
        Special windows called <EM>pads</EM> may also be manipulated.  These are windows
-       that  are  not constrained to the size of the terminal screen and whose
+       that are not constrained to the size of the terminal screen  and  whose
        contents need not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
-       In addition to drawing characters on the screen,  rendering  attributes
-       and  colors may be supported, causing the characters to show up in such
-       modes as underlined, in reverse video, or in color  on  terminals  that
+       In  addition  to drawing characters on the screen, rendering attributes
+       and colors may be supported, causing the characters to show up in  such
+       modes  as  underlined,  in reverse video, or in color on terminals that
        support such display enhancements.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
-       <EM>curses</EM>  predefines  constants for a small set of line-drawing and other
-       graphics corresponding to the DEC  Alternate  Character  Set  (ACS),  a
-       feature of VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+       <EM>curses</EM> predefines constants for a small set of  forms-drawing  graphics
+       corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
+       VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
 
-       <EM>curses</EM>  is  implemented  using  the operating system's terminal driver;
-       keystroke events are received not as scan codes but as byte  sequences.
-       Graphical  keycaps  (alphanumeric  and punctuation keys, and the space)
+       <EM>curses</EM> is implemented using the  operating  system's  terminal  driver;
+       keystroke  events are received not as scan codes but as byte sequences.
+       Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
        appear  as-is.   Everything  else,  including  the  tab,  enter/return,
-       keypad,  arrow,  and function keys, appears as a control character or a
-       multibyte <EM>escape</EM> <EM>sequence.</EM>  <EM>curses</EM> translates  these  into  unique  <EM>key</EM>
+       keypad, arrow, and function keys, appears as a control character  or  a
+       multibyte  <EM>escape</EM>  <EM>sequence.</EM>   <EM>curses</EM>  translates these into unique <EM>key</EM>
        <EM>codes.</EM>  See <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
+       <EM>ncurses</EM> provides reimplementations of the SVr4 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, and
+       <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG> libraries to ease construction of user interfaces with <EM>curses</EM>.
+
 
-</PRE><H3><a name="h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></H3><PRE>
+</PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        The   selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the  process
        environment  is  essential  to  correct  <EM>curses</EM>  and  <EM>terminfo</EM>  library
        operation.   A  well-configured  system  selects  a  correct <EM>TERM</EM> value
        automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  may   assist   with   troubleshooting   exotic
        situations.
 
+       If  you  change the terminal type, export the <EM>TERM</EM> environment variable
+       in the shell, then  run  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  or  the  "<STRONG>tput</STRONG>  <STRONG>init</STRONG>"  command.   See
+       subsection "Tabs and Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
        If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
        <EM>curses</EM> program is executing in a graphical windowing  environment,  the
        information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
@@ -228,17 +222,21 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
-       Many <EM>curses</EM> functions have two or more versions.  Those  prefixed  with
-       "w"  require  a  window  argument.   Four  functions  prefixed with "p"
-       require a pad argument.  Those without a prefix  generally  operate  on
-       <STRONG>stdscr</STRONG>.
+       <EM>curses</EM> offers many functions in variant forms using a  regular  set  of
+       alternatives  to the name of an elemental one.  Those prefixed with "w"
+       require a <EM>WINDOW</EM> pointer argument;  those  with  a  "mv"  prefix  first
+       perform cursor movement using <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>; a "mvw" prefix indicates both.
+       The "w" function is typically the elemental one; the  removal  of  this
+       prefix usually indicates operation on <STRONG>stdscr</STRONG>.
+
+       Four functions prefixed with "p" require a pad argument.
 
        In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
        parameters.
 
-                        <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
-                        <EM>win</EM>   pointer to <EM>WINDOW</EM>
-                        <EM>pad</EM>   pointer to <EM>WINDOW</EM> that is a pad
+                       <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
+                       <EM>win</EM>   pointer to a <EM>WINDOW</EM>
+                       <EM>pad</EM>   pointer to a <EM>WINDOW</EM> that is a pad
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
@@ -264,63 +262,65 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
                  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype</EM>.
                           It  always  a structure type, because it stores more
-                          data than fits into an integral type.   A  character
-                          code  may  not  be  representable  as  a  <EM>char</EM>,  and
-                          moreover more than one character may occupy  a  cell
-                          (as  with  accent marks and other diacritics).  Each
-                          character is of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a  complex  character
-                          contains one spacing character and zero or more non-
-                          spacing  characters  (see  below).   Attributes  and
-                          color  data  are  stored  in  separate fields of the
+                          data than  fit  into  a  standard  scalar  type.   A
+                          character  code  may not be representable as a <EM>char</EM>,
+                          and moreover more than one character  may  occupy  a
+                          cell  (as  with  accent marks and other diacritics).
+                          Each  character  is  of  type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a   complex
+                          character contains one spacing character and zero or
+                          more non-spacing characters (see below).  Attributes
+                          and  color data are stored in separate fields of the
                           structure, not combined as in <EM>chtype</EM>.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
-                 The  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  functions   store   and
-                 retrieve the data from a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure.  The wide library
-                 API of <EM>ncurses</EM> depends on two data types standardized by  ISO
-                 C95.
-
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype</EM>, it may be an
-                          alias of <EM>int</EM>.  Depending on the character  encoding,
-                          a  wide  character  may  be <EM>spacing</EM>, meaning that it
-                          occupies a character cell by  itself  and  typically
-                          accompanies   cursor  advancement,  or  <EM>non-spacing</EM>,
-                          meaning that it occupies the same cell as a  spacing
-                          character,  is often regarded as a "modifier" of the
-                          base glyph with which  it  combines,  and  typically
+                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG> and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
+                 data.   The  wide  library API of <EM>ncurses</EM> depends on two data
+                 types standardized by ISO C95.
+
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype</EM>, it may be  an
+                          alias  of <EM>int</EM>.  Depending on the character encoding,
+                          a wide character may be  <EM>spacing</EM>,  meaning  that  it
+                          occupies  a  character  cell by itself and typically
+                          accompanies  cursor  advancement,  or   <EM>non-spacing</EM>,
+                          meaning  that it occupies the same cell as a spacing
+                          character, is often regarded as a "modifier" of  the
+                          base  glyph  with  which  it combines, and typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can   store   a   <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or  the  constant  <STRONG>WEOF</STRONG>,
-                          analogously to the <EM>int</EM>-sized character  manipulation
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
+                          analogously  to the <EM>int</EM>-sized character manipulation
                           functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
-                 The   wide   library   provides   additional  functions  that
-                 complement those in the non-wide library where  the  size  of
-                 the  underlying  character  type  is significant.  A somewhat
-                 regular naming convention relates many of the  wide  variants
-                 to  their  non-wide  counterparts;  where a non-wide function
-                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
-                 the wide counterpart.  For example, <STRONG>waddch</STRONG> becomes <STRONG>wadd_wch</STRONG>.
-
-                 This  convention  is  inapplicable  to some non-wide function
+                 The  wide  library   provides   additional   functions   that
+                 complement  those  in  the non-wide library where the size of
+                 the underlying character type  is  significant.   A  somewhat
+                 regular  naming  convention relates many of the wide variants
+                 to their non-wide counterparts;  where  a  non-wide  function
+                 name  contains  "ch"  or "str", prefix it with "_w" to obtain
+                 the wide counterpart.  For example, <STRONG>waddch</STRONG> becomes  <STRONG>wadd_wch</STRONG>.
+                 (Exceptions  that  add only "w" comprise <STRONG>addwstr</STRONG>, <STRONG>inwstr</STRONG>, and
+                 their variants.)
+
+                 This convention is inapplicable  to  some  non-wide  function
                  names,  so  other  transformations  are  used  for  the  wide
-                 configuration: in the window background management functions,
-                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
-                 -clearing functions are suffixed with "_set".
+                 configuration:  the  window  background  management  function
+                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+                 -clearing functions are suffixed with "_set";  and  character
+                 attribute   manipulation   functions   like  "attron"  become
+                 "attr_on".
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
-       and wide APIs and the  corresponding  man  pages  that  describe  them.
-       Those  flagged  with  "*"  are  <EM>ncurses</EM>-specific,  neither described by
+       and  wide  APIs  and  the  corresponding  man pages that describe them.
+       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
        X/Open Curses nor present in SVr4.
 
                     <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     PAIR_NUMBER              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
-
                     add_wch                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     add_wchnstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     add_wchstr               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
@@ -380,6 +380,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     echochar                 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     endwin                   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     erase                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+
                     erasechar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
@@ -388,11 +389,11 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     extended_pair_content    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     extended_slk_color       <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     filter                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
-
                     find_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
                     flash                    <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
                     flushinp                 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     free_pair                <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>*
+                    get_escdelay             <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>*
                     get_wch                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     get_wstr                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     getattrs                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -445,6 +446,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     ins_wch                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     ins_wstr                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+
                     insch                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     insdelln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
@@ -456,7 +458,6 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     is_cbreak                <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
                     is_cleared               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_echo                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>*
-
                     is_idcok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_idlok                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
                     is_immedok               <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
@@ -511,6 +512,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+
                     mvhline_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     mvin_wch                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
@@ -524,7 +526,6 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     mvins_wch                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvins_wstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvinsch                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
-
                     mvinsnstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinsstr                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvinstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
@@ -577,6 +578,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -592,7 +594,6 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     pair_content             <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     pecho_wchar              <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     pechochar                <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
-
                     pnoutrefresh             <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     prefresh                 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     printw                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -620,6 +621,8 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     scroll                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     scrollok                 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     set_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+                    set_escdelay             <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>*
+                    set_tabsize              <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>*
                     set_term                 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     setcchar                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
                     setscrreg                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
@@ -641,6 +644,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     standout                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -660,7 +664,6 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     tigetnum                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tigetstr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     timeout                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     tiparm                   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     tiparm_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
                     tiscan_s                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>*
@@ -680,7 +683,9 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     use_env                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     use_extended_names       <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
+                    use_screen               <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>*
                     use_tioctl               <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
+                    use_window               <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>*
                     vid_attr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vid_puts                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vidattr                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
@@ -705,6 +710,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     wattr_off                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_on                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_set                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -728,7 +734,6 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     werase                   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
                     wget_wch                 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     wget_wstr                <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
-
                     wgetbkgrnd               <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
                     wgetch                   <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     wgetdelay                <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>*
@@ -771,253 +776,244 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
                     wstandout                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wsyncdown                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wsyncup                  <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     wtimeout                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     wtouchln                 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     wunctrl                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       Depending on the configuration, additional sets  of  functions  may  be
-       available:
-
-          <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG> - curses memory-leak checking
+       <EM>ncurses</EM>'s    <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional   functions
+       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
+       <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-          <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG> - curses screen-pointer extension
-
-          <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG> - curses thread support
-
-          <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> - curses debugging routines
+       The  availability  of  some  extensions is configurable when <EM>ncurses</EM> is
+       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
+       below.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Unless  otherwise  noted, functions that return an integer return <STRONG>OK</STRONG> on
        success and <STRONG>ERR</STRONG> on failure.  Functions that return pointers return <STRONG>NULL</STRONG>
        on  failure.   Typically,  <EM>ncurses</EM>  treats  a  null pointer passed as a
-       function parameter as a failure.
-
-       Functions with a "mv" prefix first perform cursor movement using  <STRONG>wmove</STRONG>
-       and  fail  if  the  position  is  outside  the  window,  or  (for "mvw"
-       functions) if the <EM>WINDOW</EM> pointer is null.
+       function parameter as a failure.  Functions with a  "mv"  prefix  first
+       perform  cursor  movement  using  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is
+       outside the window.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The following  environment  symbols  are  useful  for  customizing  the
-       runtime  behavior of the <EM>ncurses</EM> library.  The most important ones have
-       been already discussed in detail.
+       The following  symbols  from  the  process  environment  customize  the
+       runtime   behavior   of  <EM>ncurses</EM>  applications.   The  library  may  be
+       configured  to  disregard  the   variables   <EM>TERMINFO</EM>,   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
+       <EM>TERMPATH</EM>,  and  <EM>HOME</EM>,  if  the  user  is  the  superuser (root), or the
+       application uses <STRONG>setuid(2)</STRONG> or <STRONG>setgid(2)</STRONG>.
+
+
+</PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
+       The debugging library checks this variable  when  the  application  has
+       redirected  output  to a file.  Its integral value is used for the baud
+       rate.  If that value is absent or invalid,  <EM>ncurses</EM>  uses  9600.   This
+       feature  allows  testers  to  construct repeatable test cases that take
+       into account optimization decisions that depend on baud rate.
 
 
 </PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
-       When set, change the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of
-       loaded  <EM>terminfo</EM> entries to the value of this variable.  Very few <EM>term-</EM>
+       When set, the <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of  loaded
+       <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
        Because this name is also used in development environments to represent
-       the C compiler's name, <EM>ncurses</EM> ignores it if it does not happen to be a
-       single character.
-
-
-</PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
-       The  debugging  library  checks  this  environment  variable  when  the
-       application  has  redirected  output to a file.  The variable's numeric
-       value is used for the baud rate.  If no value is  found,  <EM>ncurses</EM>  uses
-       9600.  This allows testers to construct repeatable test-cases that take
-       into account costs that depend on baud rate.
+       the  C  compiler's  name,  <EM>ncurses</EM>  ignores  its value if it is not one
+       character in length.
 
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
-       Specify the width of the screen in characters.  Applications running in
-       a  windowing  environment  usually  are able to obtain the width of the
-       window in which they are executing.  If neither the <EM>COLUMNS</EM>  value  nor
-       the  terminal's  screen  size is available, <EM>ncurses</EM> uses the size which
-       may be specified in the terminfo database (i.e., the <STRONG>cols</STRONG> capability).
-
-       It is important that your  application  use  a  correct  size  for  the
-       screen.   This  is  not always possible because your application may be
-       running on a host which does not honor NAWS (Negotiations About  Window
-       Size),  or  because  you  are  temporarily  running  as  another  user.
-       However, setting <EM>COLUMNS</EM> and/or <EM>LINES</EM> overrides the  library's  use  of
-       the screen size obtained from the operating system.
-
-       Either  <EM>COLUMNS</EM>  or <EM>LINES</EM> symbols may be specified independently.  This
-       is  mainly  useful  to  circumvent  legacy  misfeatures   of   terminal
-       descriptions,  e.g.,  xterm  which commonly specifies a 65 line screen.
-       For best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified in a  terminal
-       description for terminals which are run as emulations.
-
-       Use  the  <STRONG>use_env</STRONG>  function  to disable all use of external environment
-       (but not including system calls) to determine the screen size.  Use the
-       <STRONG>use_tioctl</STRONG> function to update <EM>COLUMNS</EM> or <EM>LINES</EM> to match the screen size
-       obtained from system calls or the terminal database.
+       This  variable  specifies  the  width  of  the  screen  in  characters.
+       Applications  running  in  a  windowing environment usually are able to
+       obtain the width of the window in which they are executing.  If <EM>COLUMNS</EM>
+       is not defined and the terminal's screen size is not available from the
+       terminal driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG>  (<STRONG>cols</STRONG>)
+       capability  of  the  terminal type's entry in the <EM>terminfo</EM> database, if
+       any.
+
+       It is important that your application  use  the  correct  screen  size.
+       Automatic   detection   thereof  is  not  always  possible  because  an
+       application may  be  running  on  a  host  that  does  not  honor  NAWS
+       (Negotiations  About  Window  Size)  or as a different user ID than the
+       owner of the  terminal  device  file.   Setting  <EM>COLUMNS</EM>  and/or  <EM>LINES</EM>
+       overrides  the  library's  use  of  the  screen  size obtained from the
+       operating system.
+
+       The <EM>COLUMNS</EM> and <EM>LINES</EM> variables may be specified  independently.   This
+       property  is  useful  to circumvent misfeatures of legacy terminal type
+       descriptions; <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were  once
+       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
+       capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
+
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
+       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
+       the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       Specifies the total time, in milliseconds, for which <EM>ncurses</EM> will await
-       a  character  sequence,  e.g., a function key.  The default value, 1000
-       milliseconds, is enough for most uses.  However, it is made a  variable
-       to accommodate unusual applications.
+       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
+       press  of  the  "Escape"  key on the input device from one beginning an
+       <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
+       receiving  the  escape  character  to  see  if  further  characters are
+       available on the input  stream  within  a  short  interval.   A  global
+       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
+       value of 1000 (one second) is adequate for most uses.  This environment
+       variable overrides it.
 
        The  most common instance where you may wish to change this value is to
-       work with slow hosts, e.g., running on a network.  If the  host  cannot
-       read  characters rapidly enough, it will have the same effect as if the
-       terminal did not send characters  rapidly  enough.   The  library  will
-       still see a timeout.
+       work with a remote host over a slow communication channel.  If the host
+       running  a  <EM>curses</EM>  application  does  not receive the characters of an
+       escape sequence in a timely manner, the library can interpret  them  as
+       multiple key stroke events.
 
-       Note  that  xterm  mouse  events  are built up from character sequences
-       received from the xterm.   If  your  application  makes  heavy  use  of
-       multiple-clicking,  you may wish to lengthen this default value because
-       the timeout applies to the composed multi-click event as  well  as  the
-       individual clicks.
+       <STRONG>xterm(1)</STRONG> mouse events are a form of escape sequence; therefore, if your
+       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+       lengthen  the  default value because the delay applies to the composite
+       multi-click event as well as the individual clicks.
 
-       In addition to the environment variable, this implementation provides a
-       global variable with the same name.  Portable applications  should  not
-       rely  upon  the  presence  of  <STRONG>ESCDELAY</STRONG> in either form, but setting the
-       environment variable rather than the global variable  does  not  create
-       problems when compiling an application.
+       Portable applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG>  in
+       either  form,  but  setting  the  environment  variable rather than the
+       global variable does not create problems when compiling an application.
 
+       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
+       program must disambiguate escape sequences itself.
 
-</PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       Tells  <EM>ncurses</EM> where your home directory is.  That is where it may read
-       and write auxiliary terminal descriptions:
 
-           $HOME/.termcap
-           $HOME/.terminfo
+</PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
+       <EM>ncurses</EM>  may read and write auxiliary terminal descriptions in <EM>.termcap</EM>
+       and <EM>.terminfo</EM> files in the user's home directory.
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       Like <EM>COLUMNS</EM>, specify the height of  the  screen  in  characters.   See
-       <EM>COLUMNS</EM> for a detailed description.
+       This counterpart to <EM>COLUMNS</EM> specifies  the  height  of  the  screen  in
+       characters.   The  corresponding <EM>terminfo</EM> capability and code is <STRONG>lines</STRONG>.
+       See the description of the <EM>COLUMNS</EM> variable above.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       This  applies  only  to  the  OS/2 EMX port.  It specifies the order of
-       buttons on the mouse.  OS/2 numbers  a  3-button  mouse  inconsistently
-       from other platforms:
-
-           1 = left
-           2 = right
-           3 = middle.
-
-       This variable lets you customize the mouse.  The variable must be three
-       numeric digits 1-3 in any order, e.g.,  123  or  321.   If  it  is  not
-       specified, <EM>ncurses</EM> uses 132.
+       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+       with  other platforms, such that 1 is the left button, 2 the right, and
+       3 the middle.  This variable customizes  the  mouse  button  numbering.
+       Its  value  must be three digits 1-3 in any order.  By default, <EM>ncurses</EM>
+       assumes a numbering of "132".
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       Override  the compiled-in assumption that the terminal's default colors
-       are  white-on-black  (see  <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You   may   set   the
-       foreground  and  background color values with this environment variable
-       by proving a 2-element list: foreground,background.   For  example,  to
-       tell  <EM>ncurses</EM>  to  not  assume  anything  about the colors, set this to
-       "-1,-1".  To make it green-on-black, set it  to  "2,0".   Any  positive
-       value from zero to the terminfo <STRONG>max_colors</STRONG> value is allowed.
+       If set, this  variable  overrides  the  <EM>ncurses</EM>  library's  compiled-in
+       assumption  that  the terminal's default colors are white on black; see
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.  Set the foreground  and  background  color  values
+       with  this  environment  variable  by  assigning  it two integer values
+       separated  by  a  comma,  indicating  foregound  and  background  color
+       numbers, respectively.
 
+       For  example,  to tell <EM>ncurses</EM> not to assume anything about the colors,
+       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+       black,  use  "2,0".   <EM>ncurses</EM> accepts integral values from -1 up to the
+       value of the <EM>terminfo</EM> <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>) capability.
 
-</PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       This applies only to the MinGW port of <EM>ncurses</EM>.
 
-       The  <STRONG>Console2</STRONG>  program's  handling  of  the  Microsoft Console API call
-       <STRONG>CreateConsoleScreenBuffer</STRONG> is defective.  Applications  which  use  this
-       will hang.  However, it is possible to simulate the action of this call
-       by mapping coordinates, explicitly saving and  restoring  the  original
-       screen  contents.   Setting the environment variable <STRONG>NCGDB</STRONG> has the same
-       effect.
+</PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
+       (MinGW  port  only)  The  <EM>Console2</EM>  program  defectively  handles   the
+       Microsoft  Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.  Applications
+       that use it will hang.  However, it is possible to simulate the  action
+       of  this  call  by mapping coordinates, explicitly saving and restoring
+       the original screen contents.  Setting the environment  variable  <EM>NCGDB</EM>
+       has the same effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       This applies only to <EM>ncurses</EM> configured to use the GPM interface.
-
-       If present, the environment variable is a list of one or more  terminal
-       names  against which the <EM>TERM</EM> environment variable is matched.  Setting
-       it to an empty value disables the GPM  interface;  using  the  built-in
-       support for xterm, etc.
-
-       If the environment variable is absent, <EM>ncurses</EM> will attempt to open GPM
-       if <EM>TERM</EM> contains "linux".
+       (Linux  only) When <EM>ncurses</EM> is configured to use the GPM interface, this
+       variable may list one or more terminal names  against  which  the  <EM>TERM</EM>
+       variable  (see  below)  is  matched.   An  empty value disables the GPM
+       interface,  using  <EM>ncurses</EM>'s  built-in  support  for   <STRONG>xterm(1)</STRONG>   mouse
+       protocols instead.  If the variable is absent, <EM>ncurses</EM> attempts to open
+       GPM if <EM>TERM</EM> contains "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM> may use tabs as part of cursor movement optimization.  In  some
-       cases,  your  terminal  driver may not handle these properly.  Set this
-       environment variable to any value to disable the feature.  You can also
-       adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
+       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
+       some  cases,  your  terminal  driver may not handle them properly.  Set
+       this environment variable to any value to disable the feature.  You can
+       also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Some  terminals  use  a  magic-cookie  feature  which  requires special
-       handling to  make  highlighting  and  other  video  attributes  display
-       properly.   You  can  suppress  the  highlighting  entirely  for  these
-       terminals by setting this environment variable to any value.
+       Many  terminals  store  video  attributes  as a property of a character
+       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
+       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
+       display, switching attributes on or off, similarly to tags in a  markup
+       language;  these  are  termed "magic cookies", and must be subsequently
+       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
+       adequately describe its handling of magic cookies, set this variable to
+       any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
-       Most of the terminal descriptions in the terminfo database are  written
-       for  real  "hardware"  terminals.   Many  people use terminal emulators
-       which run in a windowing environment and use curses-based applications.
-       Terminal  emulators  can  duplicate  all  of the important aspects of a
-       hardware terminal, but they do not  have  the  same  limitations.   The
-       chief  limitation  of  a  hardware terminal from the standpoint of your
-       application is the management of  dataflow,  i.e.,  timing.   Unless  a
+       Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
+       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
+       terminal emulator programs that run in a windowing environment.   These
+       programs  can  duplicate  all  of  the important features of a hardware
+       terminal, but often lack their limitations.  Chief among  these  absent
+       drawbacks is the problem of data flow management; that is, limiting the
+       speed of communication to what the hardware  could  handle.   Unless  a
        hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), it (or  your  application)  must  manage  dataflow,
-       preventing  overruns.   The cheapest solution (no hardware cost) is for
-       your program to do this by pausing after operations that  the  terminal
-       does slowly, such as clearing the display.
+       does flow control), an application must manage flow control  itself  to
+       prevent overruns and data loss.
 
-       As  a  result,  many  terminal  descriptions (including the vt100) have
-       delay times embedded.  You may wish to use these descriptions, but  not
-       want to pay the performance penalty.
-
-       Set  the  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM>  environment  variable  to disable all but
-       mandatory padding.  Mandatory padding is used  as  a  part  of  special
-       control sequences such as <STRONG>flash</STRONG>.
+       A  solution  that  comes  at  no hardware cost is for an application to
+       pause after directing a  terminal  to  execute  an  operation  that  it
+       performs  slowly,  such  as  clearing  the display.  Many terminal type
+       descriptions, including that for the VT100, embed delay  specifications
+       in  capabilities.   You  may  wish  to  use these temrinal descriptions
+       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
+       value  to disable all but mandatory padding.  Mandatory padding is used
+       by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       This setting is obsolete.  Before changes
-
-          <STRONG>o</STRONG>   started with 5.9 patch 20120825 and
-
-          <STRONG>o</STRONG>   continued though 5.9 patch 20130126
-
-       <EM>ncurses</EM>  enabled  buffered output during terminal initialization.  This
-       was done (as in SVr4 curses)  for  performance  reasons.   For  testing
-       purposes,  both  of  <EM>ncurses</EM> and certain applications, this feature was
-       made optional.  Setting the <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>SETBUF</EM> variable disabled  output
-       buffering,  leaving  the output in the original (usually line buffered)
-       mode.
-
-       In the current implementation, <EM>ncurses</EM> performs its own  buffering  and
-       does  not require this workaround.  It does not modify the buffering of
-       the standard output.
-
-       The reason for the change was to make the behavior for  interrupts  and
-       other   signals   more   robust.    One   drawback   is   that  certain
-       nonconventional programs would mix ordinary <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM>
-       calls  and (usually) work.  This is no longer possible since <EM>ncurses</EM> is
-       not using the buffered standard output but its own output (to the  same
-       file  descriptor).  As a special case, the low-level calls such as <STRONG>putp</STRONG>
-       still use the standard output.  But high-level curses calls do not.
+       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
+       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
+       buffered output when initializing the terminal.  This was done,  as  in
+       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
+       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
+       Setting  this  variable  disabled  output buffering, leaving the output
+       stream in the original (usually line-buffered) mode.
+
+       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
+       workaround;  it  does  not  modify the buffering of the standard output
+       stream.  This approach makes signal handling, as for  interrupts,  more
+       robust.   A  drawback  is  that  certain  unconventional programs mixed
+       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
+       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
+       standard output file descriptor through a <EM>stdio</EM>-buffered stream.
+
+       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
+       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
+       not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       During initialization, the <EM>ncurses</EM> library  checks  for  special  cases
-       where VT100 line-drawing (and the corresponding alternate character set
-       capabilities) described in  the  terminfo  are  known  to  be  missing.
-       Specifically,  when  running  in  a  UTF-8  locale,  the  Linux console
-       emulator and the GNU screen program ignore these.  <EM>ncurses</EM>  <EM>checks</EM>  <EM>the</EM>
-       <EM>TERM</EM>  <EM>environment</EM>  <EM>variable</EM>  <EM>for</EM>  <EM>these.</EM>   <EM>For</EM> <EM>other</EM> <EM>special</EM> <EM>cases,</EM> <EM>you</EM>
-       <EM>should</EM> <EM>set</EM> <EM>this</EM> <EM>environment</EM> <EM>variable.</EM>  <EM>Doing</EM> <EM>this</EM> <EM>tells</EM> <EM>ncurses</EM> <EM>to</EM>  <EM>use</EM>
-       <EM>Unicode</EM> <EM>values</EM> <EM>which</EM> <EM>correspond</EM> <EM>to</EM> <EM>the</EM> <EM>VT100</EM> <EM>line-drawing</EM> <EM>glyphs.</EM>  <EM>That</EM>
-       <EM>works</EM> <EM>for</EM> <EM>the</EM> <EM>special</EM> <EM>cases</EM> <EM>cited,</EM> <EM>and</EM> <EM>is</EM> <EM>likely</EM> <EM>to</EM> <EM>work</EM>  <EM>for</EM>  <EM>terminal</EM>
-       <EM>emulators.</EM>
-
-       When  setting  this  variable,  you  should  set it to a nonzero value.
-       Setting it to zero (or to a nonnumber) disables the special  check  for
-       "linux" and "screen".
-
-       As  an  alternative  to the environment variable, <EM>ncurses</EM> checks for an
-       extended terminfo capability <STRONG>U8</STRONG>.  This is a  numeric  capability  which
-       can be compiled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>.  For example
+       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
+       special   cases   where   VT100   forms-drawing   characters  (and  the
+       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
+       to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+       compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
+       this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
+       terminal's ACS support is broken; the library then outputs Unicode code
+       points that correspond to the forms-drawing characters.  Set it to zero
+       (or a non-integer) to disable the special check for terminal type names
+       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
+       feature works if the terminal type description advertises it.
+
+       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
+       extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
+       <STRONG>-x</STRONG>".  Examples follow.
 
           # linux console, if patched to provide working
           # VT100 shift-in/shift-out, with corresponding font.
@@ -1028,67 +1024,60 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  name  "U8" is chosen to be two characters, to permit it to be used
-       by applications that use <EM>ncurses</EM>' termcap interface.
+       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
+       <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       During  initialization,  the  <EM>ncurses</EM>  debugging  library  checks   the
-       <EM>NCURSES</EM><STRONG>_</STRONG><EM>TRACE</EM>  environment  variable.   If  it is defined, to a numeric
-       value, <EM>ncurses</EM> calls the  <STRONG>trace</STRONG>  function,  using  that  value  as  the
-       argument.
-
-       The  argument  values,  which  are defined in <STRONG>curses.h</STRONG>, provide several
-       types  of  information.   When  running  with  traces   enabled,   your
-       application will write the file <STRONG>trace</STRONG> to the current directory.
-
-       See <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG> for more information.
+       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
+       this  variable's  presence.   If  defined  with  an integral value, the
+       library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       Denotes  your  terminal  type.   Each terminal type is distinct, though
+       Denotes your terminal type.  Each terminal  type  is  distinct,  though
        many are similar.
 
-       <EM>TERM</EM> is commonly set by terminal emulators to help applications find  a
-       workable   terminal  description.   Some  of  those  choose  a  popular
+       <EM>TERM</EM>  is commonly set by terminal emulators to help applications find a
+       workable  terminal  description.   Some  of  those  choose  a   popular
        approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
        Not  infrequently,  your  application  will  have  problems  with  that
        approach, e.g., incorrect function-key definitions.
 
-       If you set <EM>TERM</EM> in your environment, it has no effect on the  operation
-       of  the  terminal  emulator.  It only affects the way applications work
-       within the terminal.  Likewise, as a general  rule  (<STRONG>xterm(1)</STRONG>  being  a
-       rare  exception), terminal emulators which allow you to specify <EM>TERM</EM> as
-       a parameter or configuration value do  not  change  their  behavior  to
+       If  you set <EM>TERM</EM> in your environment, it has no effect on the operation
+       of the terminal emulator.  It only affects the  way  applications  work
+       within  the  terminal.   Likewise,  as a general rule (<STRONG>xterm(1)</STRONG> being a
+       rare exception), terminal emulators which allow you to specify <EM>TERM</EM>  as
+       a  parameter  or  configuration  value  do not change their behavior to
        match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
-       If  the  <EM>ncurses</EM>  library  has  been  configured  with <EM>termcap</EM> support,
-       <EM>ncurses</EM> will check for a terminal's description in termcap form  if  it
+       If the <EM>ncurses</EM>  library  has  been  configured  with  <EM>termcap</EM>  support,
+       <EM>ncurses</EM>  will  check for a terminal's description in termcap form if it
        is not available in the terminfo database.
 
        The <EM>TERMCAP</EM> environment variable contains either a terminal description
-       (with newlines  stripped  out),  or  a  file  name  telling  where  the
+       (with  newlines  stripped  out),  or  a  file  name  telling  where the
        information denoted by the <EM>TERM</EM> environment variable exists.  In either
-       case, setting it directs <EM>ncurses</EM> to ignore the  usual  place  for  this
+       case,  setting  it  directs  <EM>ncurses</EM> to ignore the usual place for this
        information, e.g., /etc/termcap.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM>  can  be  configured  to read from multiple terminal databases.
-       The <EM>TERMINFO</EM> variable overrides the location for the  default  terminal
-       database.   Terminal  descriptions  (in  terminal format) are stored in
+       <EM>ncurses</EM> can be configured to read  from  multiple  terminal  databases.
+       The  <EM>TERMINFO</EM>  variable overrides the location for the default terminal
+       database.  Terminal descriptions (in terminal  format)  are  stored  in
        terminal databases:
 
        <STRONG>o</STRONG>   Normally these are stored in a directory tree, using subdirectories
            named by the first letter of the terminal names therein.
 
            This is the scheme used in System V, which legacy Unix systems use,
-           and the <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications  on  those
+           and  the  <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications on those
            systems to override the default location of the terminal database.
 
-       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  built  to use hashed databases, then each entry in
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built to use hashed databases,  then  each  entry  in
            this list may be the path of a hashed database file, e.g.,
 
                /usr/share/terminfo.db
@@ -1097,30 +1086,30 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
                /usr/share/terminfo/
 
-           The hashed database uses less disk-space and  is  a  little  faster
-           than  the  directory  tree.   However, some applications assume the
-           existence of the directory tree, reading it  directly  rather  than
+           The  hashed  database  uses  less disk-space and is a little faster
+           than the directory tree.  However,  some  applications  assume  the
+           existence  of  the  directory tree, reading it directly rather than
            using the terminfo library calls.
 
-       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  built  with  a  support  for reading termcap files
-           directly, then an entry in this list may be the path of  a  termcap
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  with  a  support  for  reading  termcap  files
+           directly,  then  an entry in this list may be the path of a termcap
            file.
 
        <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <EM>ncurses</EM> uses
-           the remainder of that variable as a compiled terminal  description.
+           the  remainder of that variable as a compiled terminal description.
            You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
 
                TERMINFO="$(infocmp -0 -Q2 -q)"
                export TERMINFO
 
-           The  compiled description is used if it corresponds to the terminal
+           The compiled description is used if it corresponds to the  terminal
            identified by the <EM>TERM</EM> variable.
 
-       Setting <EM>TERMINFO</EM> is the simplest, but not the only way to set  location
-       of  the  default  terminal  database.   The  complete  list of database
+       Setting  <EM>TERMINFO</EM> is the simplest, but not the only way to set location
+       of the default  terminal  database.   The  complete  list  of  database
        locations in order follows:
 
-          <STRONG>o</STRONG>   the last terminal database to which <EM>ncurses</EM> wrote,  if  any,  is
+          <STRONG>o</STRONG>   the  last  terminal  database to which <EM>ncurses</EM> wrote, if any, is
               searched first
 
           <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
@@ -1129,48 +1118,42 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
           <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
 
-          <STRONG>o</STRONG>   one  or  more  locations whose names are configured and compiled
+          <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
               into the <EM>ncurses</EM> library, i.e.,
 
-             <STRONG>o</STRONG>   /usr/share/terminfo  (corresponding  to   the   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
+             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
                  variable)
 
              <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the <EM>TERMINFO</EM> variable)
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       Specifies  a  list  of  locations  to search for terminal descriptions.
-       Each location in the list is a terminal database as  described  in  the
-       section  on  the  <EM>TERMINFO</EM>  variable.   The list is separated by colons
+       Specifies a list of locations  to  search  for  terminal  descriptions.
+       Each  location  in  the list is a terminal database as described in the
+       section on the <EM>TERMINFO</EM> variable.  The  list  is  separated  by  colons
        (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       There is no corresponding feature  in  System  V  terminfo;  it  is  an
+       There  is  no  corresponding  feature  in  System  V terminfo; it is an
        extension developed for <EM>ncurses</EM>.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
-       If  <EM>TERMCAP</EM>  does not hold a file name then <EM>ncurses</EM> checks the <EM>TERMPATH</EM>
-       environment variable.  This is a list of filenames separated by  spaces
+       If <EM>TERMCAP</EM> does not hold a file name then <EM>ncurses</EM> checks  the  <EM>TERMPATH</EM>
+       environment  variable.  This is a list of filenames separated by spaces
        or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
 
-       If  the  <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks in the
+       If the <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks  in  the
        files
 
            /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
 
        in that order.
 
-       The library may be configured to disregard the following variables when
-       the  current  user  is the superuser (root), or if the application uses
-       setuid or setgid permissions:
-
-           $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
-
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
-       options  given  to the <EM>configure</EM> script when building the library.  Run
-       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
+       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
+       options given to the <EM>configure</EM> script when building the  library.   Run
+       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        --disable-overwrite
@@ -1178,20 +1161,20 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This  option  is  used to avoid filename conflicts when <EM>ncurses</EM> is
+            This option is used to avoid filename conflicts  when  <EM>ncurses</EM>  is
             not the main implementation of curses of the computer.  If <EM>ncurses</EM>
-            is  installed  disabling  overwrite,  it  puts  its  headers  in a
+            is installed  disabling  overwrite,  it  puts  its  headers  in  a
             subdirectory, e.g.,
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            It also omits a  symbolic  link  which  would  allow  you  to  use
+            It  also  omits  a  symbolic  link  which  would  allow you to use
             <STRONG>-lcurses</STRONG> to build executables.
 
        --enable-widec
-            The   configure   script   renames   the   library   and  (if  the
-            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
-            different  subdirectory.   All  of  the  library  names have a "w"
+            The  configure  script   renames   the   library   and   (if   the
+            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
+            different subdirectory.  All of  the  library  names  have  a  "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1200,45 +1183,45 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You must also enable the wide-character  features  in  the  header
-            file  when  compiling  for  the  wide-character library to use the
-            extended (wide-character) functions.   The  symbol  which  enables
+            You  must  also  enable  the wide-character features in the header
+            file when compiling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The  symbol which enables
             these features has changed since XSI Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
+            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
+            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
                 to 500.
 
-            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
-                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
+            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
+                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
-                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
-                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
+                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
+                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The  <EM>curses.h</EM> header file installed for the wide-character library
-            is designed to be compatible with the non-wide  library's  header.
-            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
+            The <EM>curses.h</EM> header file installed for the wide-character  library
+            is  designed  to be compatible with the non-wide library's header.
+            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character  library's  headers  should  be installed last, to allow
+            character library's headers should be  installed  last,  to  allow
             applications to be built using either library from the same set of
             headers.
 
        --with-pthread
-            The  configure  script  renames  the  library.  All of the library
-            names have a "t"  appended  to  them  (before  any  "w"  added  by
+            The configure script renames the  library.   All  of  the  library
+            names  have  a  "t"  appended  to  them  (before  any "w" added by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to  set  these  values.   Some applications (very few) may require
+            to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
        --with-shared
@@ -1248,17 +1231,17 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        --with-debug
 
        --with-profile
-            The shared and normal  (static)  library  names  differ  by  their
-            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+            The  shared  and  normal  (static)  library  names differ by their
+            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
+            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        --with-termlib
-            Low-level  functions  which do not depend upon whether the library
+            Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
-            By doing this, it is possible to share the tinfo  library  between
-            wide/normal  configurations  as  well  as  reduce  the size of the
+            By  doing  this, it is possible to share the tinfo library between
+            wide/normal configurations as well  as  reduce  the  size  of  the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1278,8 +1261,8 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        --with-trace
-            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
-            is  sometimes  useful  to  configure  this  in the shared library.
+            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
+            is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1293,71 +1276,78 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open  Curses permits most functions it specifies to be made available
+       X/Open Curses permits most functions it specifies to be made  available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
+       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
            another operation), and
 
        <STRONG>o</STRONG>   a few special cases.
 
-       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
-       redirected to something that is not  a  terminal  device,  the  library
-       writes  screen updates to the standard error file descriptor.  This was
+       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
+       redirected  to  something  that  is  not a terminal device, the library
+       writes screen updates to the standard error file descriptor.  This  was
        an undocumented feature of SVr3.
 
-       See subsection  "Header  files"  below  regarding  symbols  exposed  by
+       See  subsection  "Header  files"  below  regarding  symbols  exposed by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
+       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
        terminals, including <EM>xterm</EM>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
-       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
+       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
+       when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open  Curses  by  allowing  the  application  programmer  to   define
-       additional    key    sequences    at   runtime;   see   <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
+       X/Open   Curses  by  allowing  the  application  programmer  to  define
+       additional   key   sequences   at    runtime;    see    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
        <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
-       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
-       application to reset  the  terminal  to  its  original  foreground  and
-       background  colors.  From a user's perspective, the application is able
-       to draw colored text on a background whose color is set  independently,
+       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
+       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From a user's perspective, the application is  able
+       to  draw colored text on a background whose color is set independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An  <EM>ncurses</EM>  application  can  choose  to  hide the internal details of
-       <EM>WINDOW</EM>  structures,  instead   using   accessor   functions   such   as
+       An <EM>ncurses</EM> application can choose  to  hide  the  internal  details  of
+       <EM>WINDOW</EM>   structures,   instead   using   accessor   functions  such  as
        <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  enables  an  application  to  direct  application  output to a
+       <EM>ncurses</EM> enables an  application  to  direct  application  output  to  a
        printer attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
-       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that can gather color  information  from  them  when  many  colors  are
+       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
+       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that  can  gather  color  information  from  them  when many colors are
        supported.
 
-       Some  extensions  are  only available if <EM>ncurses</EM> is compiled to support
-       them; see section "ALTERNATE CONFIGURATIONS" above.
+       Some extensions are only available if <EM>ncurses</EM> is  compiled  to  support
+       them; section "ALTERNATE CONFIGURATIONS" describes how.
 
-       <STRONG>o</STRONG>   Rudimentary  support  for  multi-threaded   applications   may   be
+       <STRONG>o</STRONG>   Rudimentary   support   for   multi-threaded  applications  may  be
            available; see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   Functions  that  ease  the  management  of  multiple screens can be
+       <STRONG>o</STRONG>   Functions that ease the  management  of  multiple  screens  can  be
            exposed; see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
+       <STRONG>o</STRONG>   To aid applications to debug their memory usage, <EM>ncurses</EM> optionally
+           offers functions to more aggressively free  memory  it  dynamically
+           allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
+
+       <STRONG>o</STRONG>   The   library  facilitates  auditing  and  troubleshooting  of  its
+           behavior; see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
+
        <STRONG>o</STRONG>   The compiler option <STRONG>-DUSE_GETCAP</STRONG> causes the library to fall back to
            reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
            <EM>info</EM> entry corresponding to <EM>TERM</EM>.   Use  of  this  feature  is  not
@@ -1502,7 +1492,7 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-04-13                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -1510,9 +1500,9 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Initialization">Initialization</a></li>
+<li><a href="#h3-Application-Structure">Application Structure</a></li>
 <li><a href="#h3-Overview">Overview</a></li>
-<li><a href="#h3-Effects-of-GUIs-and-Environment-Variables">Effects of GUIs and Environment Variables</a></li>
+<li><a href="#h3-Initialization">Initialization</a></li>
 <li><a href="#h3-Naming-Conventions">Naming Conventions</a></li>
 <li><a href="#h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></li>
 <li><a href="#h3-Function-Name-Index">Function Name Index</a></li>
@@ -1521,8 +1511,8 @@ <H1 class="no-header">ncurses 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-ENVIRONMENT">ENVIRONMENT</a>
 <ul>
-<li><a href="#h3-CC-_command-character_">CC (command character)</a></li>
 <li><a href="#h3-BAUDRATE">BAUDRATE</a></li>
+<li><a href="#h3-CC-_command-character_">CC (command character)</a></li>
 <li><a href="#h3-COLUMNS">COLUMNS</a></li>
 <li><a href="#h3-ESCDELAY">ESCDELAY</a></li>
 <li><a href="#h3-HOME">HOME</a></li>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index e39d615fe..6487df0a8 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240323).
+       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240413).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 4ebb0d708..034dfe579 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.109 2024/03/23 20:42:29 tom Exp @
+  * @Id: tput.1,v 1.111 2024/04/13 22:09:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-03-23 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-04-13 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-03-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-04-13 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -350,7 +350,7 @@ <H1 class="no-header">tput 1 2024-03-23 ncurses 6.4 User commands</H1>
 
        <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM>  but  <STRONG>parm_delete_line</STRONG>
            to <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
-           <EM>info</EM> uses the code <STRONG>dch1</STRONG> for <STRONG>delete_line</STRONG>.
+           <EM>info</EM> uses the code <STRONG>dl1</STRONG> for <STRONG>delete_line</STRONG>.
 
        <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>ed</STRONG> means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM>  but  <STRONG>clr_eos</STRONG>  to
            <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
@@ -555,7 +555,7 @@ <H1 class="no-header">tput 1 2024-03-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-23                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2024-04-13                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 01fd9225e..b7c967cb6 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.57 2024/03/23 19:58:15 tom Exp $
-.TH curs_add_wch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.59 2024/04/13 22:11:52 tom Exp $
+.TH curs_add_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -431,8 +431,11 @@ variable is implemented in SVr4 and other versions of
 but is not specified by X/Open Curses
 (see \fBcurs_variables\fP(3X)).
 .SH SEE ALSO
+\fB\%curs_addch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X),
 \fB\%curs_addwstr\fP(3X),
 \fB\%curs_add_wchstr\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 5493dd858..8bbef8d09 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.34 2024/03/16 19:44:53 tom Exp $
-.TH curs_add_wchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp $
+.TH curs_add_wchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,13 +59,13 @@ add a \fIcurses\fR complex character string to a window
 \fB#include <curses.h>
 .PP
 \fBint add_wchstr(const cchar_t *\fIwchstr\fP);
-\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint wadd_wchstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP);
-\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
-.PP
 \fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
-\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint mvwadd_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+.PP
+\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
@@ -117,9 +117,10 @@ All functions except \fBwadd_wchnstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
+\fB\%curs_addchstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X),
-\fB\%curs_addchstr\fP(3X),
-\fB\%curs_addstr\fP(3X),
 \fB\%curs_addwstr\fP(3X),
 \fB\%curs_add_wch\fP(3X)
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index f3eab27c8..6d4668a83 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.81 2024/03/23 20:38:57 tom Exp $
-.TH curs_addch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.83 2024/04/13 22:23:35 tom Exp $
+.TH curs_addch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,7 +111,9 @@ of the window.
 .bP
 Line feed does a \fB\%clrtoeol\fP(3X),
 then moves the cursor to the left margin on the next line of the window,
-scrolling the window if the cursor was already on the last line.
+and if \fB\%scrollok\fP(3X) is enabled for
+.IR win ,
+scrolls the window if the cursor was already on the last line.
 .bP
 Tab advances the cursor to the next tab stop
 (possibly on the next line);
@@ -126,41 +128,20 @@ If
 is any other nonprintable character,
 it is drawn in printable form,
 using the same convention as \fB\%unctrl\fP(3X).
-.bP
-.B \%waddch
-displays control characters in
-.BI \*^ X
-notation.
-.bP
-Character codes above 127 are either meta characters
-(if the screen has not been initialized,
-or if \fB\%meta\fP(3X) has been called with a
-.B TRUE
-.I bf
-parameter)
-that render in
-.BI M\- X
-notation,
-or they display as themselves.
-In the latter case,
-the values may not be printable;
-.\" XXX: The following claim could be clearer.
-this follows the X/Open specification.
 .PP
 Calling \fB\%winch\fP(3X) on the location of a nonprintable character
 does not return the character itself,
 but its \fB\%unctrl\fP(3X) representation.
 .PP
-Video attributes can be combined with a character argument passed to
-.B \%waddch
-by logical-ORing them into the character.
-(Thus,
-text,
-including attributes,
-can be copied from one place to another using \fB\%winch\fP(3X) and
+.I ch
+may contain rendering and/or color attributes,
+and others can be combined with the parameter
+by logically \*(``or\*(''ing with it.
+(A character with its attributes can be copied from place to place
+using \fB\%winch\fP(3X) and
 .BR \%waddch .)
 See \fB\%curs_attr\fP(3X) for values of predefined video attribute
-constants that can be usefully OR'ed with characters.
+constants that can be usefully \*(``or\*(''ed with characters.
 .SS "Echoing Characters"
 .B \%echochar
 and
@@ -262,7 +243,6 @@ See section \*(``PORTABILITY\*('' below regarding the use of
 .B \%waddch
 with multibyte characters.
 .PP
-If \fB\%scrollok\fP(3X) is not enabled,
 .B \%waddch
 can successfully write a character at the bottom right location of the
 window.
@@ -270,6 +250,7 @@ However,
 .I \%ncurses
 returns
 .B ERR
+if \fB\%scrollok\fP(3X) is not enabled in that event,
 because it is not possible to wrap to a new line.
 .PP
 Functions with a \*(``mv\*('' prefix first perform cursor movement using
@@ -370,7 +351,9 @@ many publicly available
 .I \%term\%info
 entries include
 .B \%acsc
-strings in which their key characters (pryz{|}) are embedded,
+strings in which their key characters
+.BR ( pryz{|} )
+are embedded,
 and a second-hand list of their character descriptions has come to
 light.
 The
@@ -422,9 +405,8 @@ In
 .IR \%ncurses ,
 .I \%chtype
 holds an eight-bit character.
-But
-.I \%ncurses
-allows a multibyte character to be passed in a succession of calls to
+But the library allows a multibyte character to be passed in a
+succession of calls to
 .BR \%waddch .
 Other implementations do not;
 a
@@ -442,12 +424,12 @@ and checks whether the latest call continues a multibyte sequence.
 When a character is
 .IR complete ,
 .I \%ncurses
-displays the character and advances the window's current location.
+displays the character and advances the cursor.
 .PP
 If the calling application interrupts the succession of bytes in
-a multibyte character sequence by moving the current location
-(for example,
-with \fB\%wmove\fP(3X)),
+a multibyte character sequence by changing the current location\(emfor
+example,
+with \fB\%wmove\fP(3X)\(em\c
 .I \%ncurses
 discards the incomplete character.
 .PP
@@ -473,6 +455,11 @@ variable,
 but X/Open Curses does not specify it
 (see \fB\%curs_variables\fP(3X)).
 .SH SEE ALSO
+\fB\%curs_add_wch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_addchstr\fP(3X),
 \fB\%curs_addstr\fP(3X),
@@ -483,8 +470,3 @@ but X/Open Curses does not specify it
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_variables\fP(3X),
 \fB\%putchar\fP(3)
-.PP
-\fB\%curs_add_wch\fP(3X) describes comparable functions of the
-.I \%ncurses
-library in its wide-character configuration
-.RI ( \%ncursesw ).
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 9286885e3..77fe6b775 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.40 2024/03/16 15:37:51 tom Exp $
-.TH curs_addchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.42 2024/04/13 22:21:16 tom Exp $
+.TH curs_addchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,13 +59,13 @@ add a \fIcurses\fR character string to a window
 \fB#include <curses.h>
 .PP
 \fBint addchstr(const chtype *\fIchstr\fP);
-\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
 \fBint waddchstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP);
-\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
-.PP
 \fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
-\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
 \fBint mvwaddchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+.PP
+\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
 \fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
@@ -111,11 +111,11 @@ All functions except \fBwaddchnstr\fP may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
-\fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X),
-\fB\%curs_addstr\fP(3X)
-.PP
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
 .RI ( \%ncursesw ).
+.PP
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addstr\fP(3X)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 928a4d493..72dbb4514 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.41 2024/03/23 20:38:57 tom Exp $
-.TH curs_addstr 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.43 2024/04/13 22:14:06 tom Exp $
+.TH curs_addstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,11 +127,11 @@ All of these functions except \fBwaddnstr\fP may be macros.
 X/Open Curses,
 Issue 4 describes these functions.
 .SH SEE ALSO
-\fB\%curses\fP(3X),
-\fB\%curs_addch\fP(3X),
-\fB\%curs_addchstr\fP(3X)
-.PP
 \fB\%curs_addwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
 .RI ( \%ncursesw ).
+.PP
+\fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
+\fB\%curs_addchstr\fP(3X)
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 866c05dc5..0f96afb20 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.33 2024/03/23 20:38:57 tom Exp $
-.TH curs_addwstr 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.35 2024/04/13 22:14:06 tom Exp $
+.TH curs_addwstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -139,10 +139,10 @@ may be implemented as macros.
 X/Open Curses,
 Issue 4 describes these functions.
 .SH SEE ALSO
-\fB\%curses\fP(3X),
-\fB\%curs_add_wch\fP(3X),
-\fB\%curs_add_wchstr\fP(3X)
-.PP
 \fB\%curs_addstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its non-wide-character configuration.
+.PP
+\fB\%curses\fP(3X),
+\fB\%curs_add_wch\fP(3X),
+\fB\%curs_add_wchstr\fP(3X)
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index b0d69166f..ca171c196 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.36 2024/03/23 20:00:03 tom Exp $
-.TH curs_get_wch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.38 2024/04/13 22:14:06 tom Exp $
+.TH curs_get_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -249,12 +249,12 @@ the interaction of
 .B \%wget_wch
 with signal handlers.
 .SH SEE ALSO
+\fB\%curs_getch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
 \fB\%curs_inopts\fP(3X),
 \fB\%curs_move\fP(3X),
 \fB\%curs_refresh\fP(3X)
-.PP
-\fB\%curs_getch\fP(3X) describes comparable functions of the
-.I \%ncurses
-library in its non-wide-character configuration.
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 48d270873..ba1f50027 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.44 2024/03/16 15:35:01 tom Exp $
-.TH curs_get_wstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.46 2024/04/13 22:14:06 tom Exp $
+.TH curs_get_wstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -216,6 +216,9 @@ while others (PDCurses) do not allow this.
 NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
 treating a \fB\-1\fP as an indefinite number of characters.
 .SH SEE ALSO
+\fB\%curs_getstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_getstr\fP(3X),
 \fB\%curs_get_wch\fP(3X)
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 61b9f19ec..009d63dc2 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
-.TH curs_getcchar 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.47 2024/04/13 22:08:22 tom Exp $
+.TH curs_getcchar 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -36,7 +36,7 @@
 .SH NAME
 \fB\%getcchar\fP,
 \fB\%setcchar\fP \-
-convert between a wide-character string and a \fIcurses\fR complex character string
+convert between a wide-character string and a \fIcurses\fR complex character
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 30e10699b..b06c5d3ab 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.83 2024/03/23 20:38:57 tom Exp $
-.TH curs_getch 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.85 2024/04/13 22:18:51 tom Exp $
+.TH curs_getch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -227,8 +227,8 @@ a user of a
 .I curses
 application may experience a delay after pressing ESC while
 .I curses
-disambiguates the input.
-See section \*(``EXTENSIONS\*('' below.
+disambiguates the input;
+see section \*(``EXTENSIONS\*('' below.
 If the window is in \*(``no time-out\*('' mode,
 the timer does not expire;
 it is an infinite
@@ -672,6 +672,11 @@ NetBSD
 had added them along with
 .BR \%KEY_MOUSE .
 .SH SEE ALSO
+\fB\%curs_get_wch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
 \fB\%curs_inopts\fP(3X),
@@ -683,11 +688,6 @@ had added them along with
 \fB\%resizeterm\fP(3X),
 \fB\%ascii\fP(7)
 .PP
-\fB\%curs_get_wch\fP(3X) describes comparable functions of the
-.I \%ncurses
-library in its wide-character configuration
-.RI ( \%ncursesw ).
-.PP
 ECMA-6 \*(``7-bit coded Character Set\*(''
 \%<https://\*:ecma\-international\*:.org/\
 \*:publications\-and\-standards/\*:standards/\*:ecma\-6/>
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 33563ab68..43a290dba 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.54 2024/03/16 15:35:01 tom Exp $
-.TH curs_getstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.56 2024/04/13 22:14:06 tom Exp $
+.TH curs_getstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -288,6 +288,11 @@ Starting in 2021
 rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
 SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
 .SH SEE ALSO
+\fB\%curs_get_wstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
 \fB\%curs_termattrs\fP(3X),
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index e061df200..b3f9c08b3 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.26 2024/03/16 15:35:01 tom Exp $
-.TH curs_in_wch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.28 2024/04/13 22:14:06 tom Exp $
+.TH curs_in_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -74,8 +74,9 @@ Note that all of these routines may be macros.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .SH SEE ALSO
+\fB\%curs_inch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_inch\fP(3X),
-\fB\%curs_inchstr\fP(3X),
-\fB\%curs_instr\fP(3X),
 \fB\%curs_inwstr\fP(3X)
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index fa012b21d..295ccc810 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH curs_in_wchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp $
+.TH curs_in_wchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -59,13 +59,13 @@ get a \fIcurses\fR complex character string from a window
 \fB#include <curses.h>
 .PP
 \fBint in_wchstr(cchar_t *\fIwchstr\fP);
-\fBint in_wchnstr(cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint win_wchstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP);
-\fBint win_wchnstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
-.PP
 \fBint mvin_wchstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP);
-\fBint mvin_wchnstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint mvwin_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP);
+.PP
+\fBint in_wchnstr(cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint win_wchnstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint mvin_wchnstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
 \fBint mvwin_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
@@ -121,8 +121,10 @@ The XSI Curses defines no error conditions.
 This implementation checks for null pointers,
 returning \fBERR\fP in that case.
 .SH SEE ALSO
+\fB\%curs_inchstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_inchstr\fP(3X),
-\fB\%curs_instr\fP(3X),
 \fB\%curs_inwstr\fP(3X),
 \fB\%curs_in_wch\fP(3X)
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 66f488f8a..c540c5fbc 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH curs_inch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.48 2024/04/13 22:14:06 tom Exp $
+.TH curs_inch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -117,15 +117,10 @@ This implementation uses 8 bits for character values.
 An application using more bits, e.g., a Unicode value,
 should use the wide-character equivalents to these functions.
 .SH SEE ALSO
-.TP
-\fB\%curses\fP(3X)
-gives an overview of the \fB\%WINDOW\fP and \fB\%chtype\fP data types.
-.TP
-\fB\%curs_attr\fP(3X)
-goes into more detail, pointing out portability problems and
-constraints on the use of \fB\%chtype\fP for returning window
-information.
-.TP
-\fB\%curs_in_wch\fP(3X)
-describes comparable functions for the wide-character (ncursesw)
-library.
+\fB\%curs_in_wch\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
+\fB\%curses\fP(3X),
+\fB\%curs_instr\fP(3X)
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 997ca521e..5a54c41f4 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.64 2024/03/16 15:35:01 tom Exp $
-.TH curs_initscr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.66 2024/04/13 22:18:11 tom Exp $
+.TH curs_initscr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -177,7 +177,7 @@ returns no error.
 These functions were described in the XSI Curses standard, Issue 4.
 As of 2015, the current document is X/Open Curses, Issue 7.
 .SS Differences
-X/Open specifies that portable applications must not
+X/Open Curses specifies that portable applications must not
 call \fBinitscr\fP more than once:
 .bP
 The portable way to use \fBinitscr\fP is once only,
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index ad9e280b3..63db4967e 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.64 2024/03/23 20:38:57 tom Exp $
-.TH curs_inopts 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.66 2024/04/13 22:20:29 tom Exp $
+.TH curs_inopts 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -514,6 +514,37 @@ These are loaded after the predefined keys,
 and if a capability's value is the same as a previously-loaded
 key definition,
 the later definition is the one used.
+.SH HISTORY
+Formerly,
+.I \%ncurses
+used
+.B \%nl
+and
+.B \%nonl
+to control the conversion of newlines to carriage return/line feed
+on output as well as input.
+X/Open Curses documents the use of these functions only for input.
+This difference arose from converting the
+.I \%pcurses
+source (1986),
+which used
+\fI\%ioctl\fP(2) calls and the
+.I \%sgttyb
+structure,
+to
+.I \%termios
+(the POSIX terminal API).
+In the former,
+both input and output were controlled via a single option
+.BR \%CRMOD ,
+while the latter separates these features.
+Because that conversion interferes with output optimization,
+.I \%ncurses
+6.2 (2020) amended
+.B \%nl
+and
+.B \%nonl
+to eliminate their effect on output.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 3bf9b9d08..572127454 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.32 2024/03/16 15:48:54 tom Exp $
-.TH curs_ins_wstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.34 2024/04/13 22:14:06 tom Exp $
+.TH curs_ins_wstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -117,7 +117,10 @@ This is probably an error,
 because it is inconsistent with other functions,
 and differs from the X/Open implementation on Solaris.
 .SH SEE ALSO
+\fB\%curs_insstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_insstr\fP(3X),
 \fB\%curs_ins_wch\fP(3X),
 \fB\%curs_in_wch\fP(3X)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index d35a3615b..c53a6168e 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH curs_instr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.48 2024/04/13 22:14:06 tom Exp $
+.TH curs_instr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,8 +118,11 @@ The \fI\%ncurses\fP library extends the XSI description by allowing a
 negative value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
+\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI ( \%ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
-\fB\%curs_inchstr\fP(3X),
-\fB\%curs_inwstr\fP(3X),
-\fB\%curs_in_wchstr\fP(3X)
+\fB\%curs_inchstr\fP(3X)
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 0a7916120..3ab1c790d 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
-.TH curs_kernel 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.58 2024/04/13 22:19:08 tom Exp $
+.TH curs_kernel 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -132,9 +132,9 @@ at the beginning, do its manipulation of its own windows, do a
 Few applications will use this feature,
 most use \fBwmove\fP instead.
 .SS ripoffline
-The \fBripoffline\fP routine provides access to the same facility that
-\fBslk_init\fP [see \fBcurs_slk\fP(3X)] uses to reduce the size of the
-screen.
+.B \%ripoffline
+provides access to the same facility that \fB\%slk_init\fP(3X) uses to
+reduce the size of the screen.
 \fB\%ripoffline\fP must be called before \fBinitscr\fP or
 \fBnewterm\fP is called, to prepare these initial actions:
 .bP
@@ -166,8 +166,13 @@ If the terminal supports the \fIvisibility\fP requested,
 the previous \fIcursor\fP state is returned;
 otherwise, \fBERR\fP is returned.
 .SS napms
-The \fBnapms\fP routine is used to sleep for \fIms\fP milliseconds.
-If the value of \fIms\fP exceeds 30,000
+.B \%napms
+sleeps for
+.I ms
+milliseconds.
+If
+.I ms
+exceeds 30,000
 (thirty seconds),
 it is capped at that value.
 .SH RETURN VALUE
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 8f670df9a..0e20a801f 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.58 2024/03/16 15:49:18 tom Exp $
-.TH curs_outopts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.60 2024/04/13 22:23:57 tom Exp $
+.TH curs_outopts 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -152,10 +152,6 @@ will return an error if the window pointer is null
 .bP
 \fBwsetscrreg\fP
 returns an error if the scrolling region limits extend outside the window.
-.PP
-X/Open Curses does not specify any error conditions.
-This implementation returns an error
-if the window pointer is null.
 .SH NOTES
 Note that
 \fBclearok\fP,
@@ -169,20 +165,6 @@ emulators.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .PP
-From the outset,
-\fI\%ncurses\fP used \fBnl\fP/\fBnonl\fP to control the conversion of
-newlines to carriage return/line-feed on output as well as input.
-XSI Curses documents only the use of these functions for input.
-This difference arose from converting the \fIpcurses\fP source
-(which used \fBioctl\fP calls with the \fBsgttyb\fP structure)
-to termios (i.e., the POSIX terminal interface).
-In the former, both input and output were controlled via a single
-option \fBCRMOD\fP,
-while the latter separates these features.
-Because that conversion interferes with output optimization,
-\fBnl\fP/\fBnonl\fP were amended after \fI\%ncurses\fP 6.2
-to eliminate their effect on output.
-.PP
 Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
 \fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
@@ -199,6 +181,13 @@ The XSI Curses standard does not mention that the cursor should be
 made invisible as a side-effect of \fBleaveok\fP.
 SVr4 curses documentation does this, but the code does not.
 Use \fBcurs_set\fP to make the cursor invisible.
+.SH HISTORY
+.I \%ncurses
+formerly treated \fBnl\fP(3X) and \fBnonl\fP(3X) as both input
+.I and
+output options,
+but no longer;
+see \fB\%curs_inopts\fP(3X).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index a7b4a94a0..ae17b589b 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.55 2024/03/16 15:49:29 tom Exp $
-.TH curs_pad 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.57 2024/04/13 22:13:17 tom Exp $
+.TH curs_pad 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,88 +57,116 @@ create and display \fIcurses\fR pads
 \fB#include <curses.h>
 .PP
 \fBWINDOW *newpad(int \fInlines\fP, int \fIncols\fP);
-\fBWINDOW *subpad(WINDOW *\fIorig\fP, int \fInlines\fP, int \fIncols\fP,
+\fBWINDOW *subpad(WINDOW *\fIparent\fP, int \fInlines\fP, int \fIncols\fP,
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+.PP
 \fBint prefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
 \fBint pnoutrefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
+.PP
 \fBint pechochar(WINDOW *\fIpad\fB, chtype \fIch\fB);\fR
 \fBint pecho_wchar(WINDOW *\fIpad\fB, const cchar_t *\fIwch\fB);\fR
 .fi
 .SH DESCRIPTION
-.SS newpad
-\fB\%newpad\fP creates and returns a pointer to a new pad data structure
-with the given number of lines,
-\fInlines\fP,
-and columns,
-\fIncols\fP.
-A pad is like a window,
+A
+.I curses
+.I pad
+is like a window,
 except that it is not restricted by the screen size,
 and is not necessarily associated with a particular part of the screen.
 Pads can be used when a large window is needed,
-and only a part of the window will be on the screen at one time.
-Automatic refreshes of pads
-(as from scrolling or echoing of input)
-do not occur.
+only part of which is to be visible on the screen.
+Pads are not automatically refreshed by scrolling or input-echoing
+operations.
 .PP
-It is not valid to call \fB\%wrefresh\fP with a \fIpad\fP argument;
-call \fB\%prefresh\fP or \fB\%pnoutrefresh\fP instead.
-They require additional parameters to specify the part of the pad to be
-displayed and the location on the screen to be used for the display.
+Pads cannot be refreshed with \fB\%wrefresh\fP(3X);
+use
+.B \%prefresh
+or
+.B \%pnoutrefresh
+instead.
+.SS newpad
+\fB\%newpad\fP creates and returns a pointer to a new pad data structure
+with the given number of lines,
+.IR nlines ,
+and columns,
+.IR ncols .
 .SS subpad
-The \fB\%subpad\fP routine creates and returns a pointer to a subwindow within a
-pad with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
-Unlike \fB\%subwin\fP, which uses screen coordinates, the window is at position
-(\fIbegin\fR_\fIx\fB,\fR \fIbegin\fR_\fIy\fR) on the pad.
-The window is
-made in the middle of the window \fIorig\fP, so that changes made to one window
-affect both windows.
-During the use of this routine, it will often be
-necessary to call \fB\%touchwin\fP or \fB\%touchline\fP on \fIorig\fP before
-calling \fB\%prefresh\fP.
+.B \%subpad
+creates and returns a pointer to a subwindow within a pad
+with the given number of lines,
+.IR nlines ,
+and columns,
+.IR ncols .
+Unlike \fB\%subwin\fP(3X),
+which uses screen coordinates,
+the new pad is placed at position
+.RI ( begin_y ,
+.IR begin_x )
+relative to its parent.
+Thus,
+changes made to one pad can affect both.
+When operating on a subpad,
+it is often necessary to call \fB\%touchwin\fP(3X) or
+\fB\%touchline\fP(3X) on
+.I parent
+before calling
+.BR \%prefresh .
 .SS "prefresh, pnoutrefresh"
-The \fB\%prefresh\fP and \fB\%pnoutrefresh\fP routines are analogous to
-\fB\%wrefresh\fP and \fB\%wnoutrefresh\fP except that they relate to pads instead
-of windows.
-The additional parameters are needed to indicate what part of the
-pad and screen are involved.
+.B \%prefresh\fP
+and
+.B \%pnoutrefresh
+are analogous to \fB\%wrefresh\fP(3X) and \fB\%wnoutrefresh\fP(3X)
+except that they operate on pads rather than windows.
+They require additional parameters are needed to indicate what portions
+of the pad and screen are involved.
 .bP
-The \fIpminrow\fP and \fIpmincol\fP parameters specify the upper
-left-hand corner of the rectangle to be displayed in the pad.
+.I pminrow
+and
+.I pmincol
+specify the upper left-hand corner of a rectanglar view of the pad.
 .bP
-The \fIsminrow\fP,
-\fIsmincol\fP, \fIsmaxrow\fP, and \fIsmaxcol\fP
-parameters specify the edges of the
-rectangle to be displayed on the screen.
+.IR sminrow ,
+.IR smincol ,
+.IR smaxrow ,
+and
+.I smaxcol
+specify the vertices of the rectangle to be displayed on the screen.
 .PP
-The lower right-hand corner of the
-rectangle to be displayed in the pad is calculated from the screen coordinates,
+The lower right-hand corner
+of the rectangle to be displayed in the pad
+is calculated from the screen coordinates,
 since the rectangles must be the same size.
-Both rectangles must be entirely
-contained within their respective structures.
-Negative values of
-\fIpminrow\fP, \fIpmincol\fP, \fIsminrow\fP, or \fIsmincol\fP are treated as if
-they were zero.
+Both rectangles must be entirely contained
+within their respective structures.
+.I curses
+treats
+negative values of any of these parameters as zero.
 .SS pechochar
-The \fB\%pechochar\fP routine is functionally equivalent
-to a call to \fB\%addch\fP
-followed by a call to \fB\%refresh\fP(3X),
-a call to \fB\%waddch\fP followed by a call
-to \fB\%wrefresh\fP, or a call to \fB\%waddch\fP followed by a call to
-\fB\%prefresh\fP.
-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 these routines instead of their
-equivalents.
-In the case of \fB\%pechochar\fP, the last location of the pad on
-the screen is reused for the arguments to \fB\%prefresh\fP.
+.B \%pechochar
+is functionally equivalent to calling \fB\%waddch\fP(3X) followed by
+.BR \%prefresh .
+It suggests to the
+.I curses
+optimizer that only a single character is being output;
+a considerable performance benefit may be thus enjoyed.
+The location of the character
+.I ch
+written to the pad is used to populate the arguments to
+.BR \%prefresh .
 .SS pecho_wchar
-The \fB\%pecho_wchar\fP function is the analogous wide-character
-form of \fB\%pechochar\fP.
-It outputs one character to a pad and immediately refreshes the pad.
-It does this by a call to \fB\%wadd_wch\fP followed by a call
-to \fB\%prefresh\fP.
+.B \%pecho_wchar\fP
+is functionally equivalent to calling \fB\%wadd_wch\fP(3X) followed by
+.BR \%prefresh .
+It suggests to the
+.I curses
+optimizer that only a single wide character is being output;
+a considerable performance benefit may be thus enjoyed.
+The location of the character
+.I wch
+written to the pad is used to populate the arguments to
+.BR \%prefresh .
 .SH RETURN VALUE
 Functions that return an integer return \fBERR\fP upon failure and
 \fBOK\fP
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 8c29dd567..b8599d5f8 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.40 2024/03/23 20:41:15 tom Exp $
-.TH curs_scroll 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.41 2024/04/14 00:14:28 tom Exp $
+.TH curs_scroll 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,7 +64,7 @@ That is,
 every visible line we might number
 .I i
 becomes line
-.IR i \-1.
+.IR i "\-1."
 The text of the top line in the window disappears and the bottom line
 is populated with blank characters;
 see \fB\%bkgd\fP(3X) or \fB\%bkgrnd\fP(3X).
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 2c1f274ab..18134ddd2 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH curs_termattrs 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.38 2024/04/13 22:16:39 tom Exp $
+.TH curs_termattrs 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -71,7 +71,7 @@ The \fBerasewchar\fP routine stores the current erase character
 in the location referenced by \fIch\fP.
 If no erase character has been defined, the routine fails
 and the location referenced by \fIch\fP is not changed.
-.SS "has_is, has_il"
+.SS "has_ic, has_il"
 The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
 character capabilities.
 .PP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 2d235677d..10d1fa78b 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.134 2024/03/23 20:41:15 tom Exp $
-.TH curs_terminfo 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.136 2024/04/14 00:14:40 tom Exp $
+.TH curs_terminfo 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -419,7 +419,7 @@ rather than a fixed-parameter list.
 Its numeric parameters are
 .IR int s
 rather than
-.IR long s.
+.IR long "s."
 .PP
 Both \fB\%tparm\fP and \fB\%tiparm\fP assume that the application passes
 parameters consistent with the terminal description.
@@ -844,10 +844,12 @@ standardized in the late 1980s.
 X/Open Curses uses
 .I \%const
 less effectively than a later design might,
-in some cases applying it needlessly to values are already constant,
-and in most cases overlooking parameters which normally would use
+sometimes applying it needlessly to values that are already constant,
+and in most cases overlooking parameters that normally would use
 .IR \%const .
-Using constant parameters for functions which do not use
+Passing
+.IR \%const -qualified
+parameters to functions that do not declare them
 .I \%const
 may prevent the program from compiling.
 On the other hand,
@@ -980,28 +982,6 @@ function,
 .I curses
 function that is not well specified.
 .PP
-X/Open notes that after calling \fB\%mvcur\fP,
-the
-.I curses
-state may not match the actual terminal state,
-and that an application should touch and refresh the window before
-resuming normal
-.I curses
-calls.
-Both
-.I \%ncurses
-and SVr4
-.I curses
-implement \fB\%mvcur\fP using the
-.I SCREEN
-data allocated in either \fB\%initscr\fP or \fB\%newterm\fP.
-So though it is documented as a
-.I \%term\%info
-function,
-\fB\%mvcur\fP is really a
-.I curses
-function that is not well specified.
-.PP
 X/Open Curses states that the old location must be given for
 \fB\%mvcur\fP to accommodate terminals that lack absolute cursor
 positioning.
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index f88cbed02..467b69444 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
-.TH curs_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp $
+.TH curs_variables 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -216,14 +216,21 @@ respectively;
 that is,
 the number of columns and lines.
 .SS ESCDELAY
-For \fIcurses\fP to distinguish an escape character corresponding to a
-user's press of an \*(``Escape\*('' key on the input device from one
-included in a control sequence used by a cursor movement or function
-key,
-the library waits to see if another key event occurs after the escape
-character.
-\fB\%ESCDELAY\fP
+For
+.I curses
+to distinguish the ESC character resulting from a user's press of the
+\*(``Escape\*('' key on the input device from one beginning an
+.I "escape sequence"
+(as commonly produced by function keys),
+it waits after the escape character to see if further characters are
+available on the input stream within a short interval.
+.B \%ESCDELAY
 stores this interval in milliseconds.
+.PP
+If \fB\%keypad\fP(3X) is disabled for the
+.I curses
+window receiving input,
+a program must disambiguate escape sequences itself.
 .SS TABSIZE
 The \fIcurses\fP library converts a tab character to this number of
 spaces as it adds a tab to a window;
@@ -232,9 +239,14 @@ see \fB\%curs_addch\fP(3X).
 Either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) initializes
 \fIcurses\fP.
 .PP
-If \fI\%ncurses\fP is configured to provide separate \fIcurses\fP and
-\fIterminfo\fP libraries,
-most of these variables reside in the \fIcurses\fP library.
+If
+.I \%ncurses
+is configured to provide separate
+.I curses
+and
+.I \%tinfo
+libraries,
+most of these variables reside in the former.
 .SH PORTABILITY
 The X/Open Curses standard documents all of the foregoing types and
 symbols except for \fB\%newscr\fP,
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 5e14bd99d..96124147c 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.50 2024/03/16 15:35:01 tom Exp $
-.TH default_colors 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: default_colors.3x,v 1.52 2024/04/13 22:17:22 tom Exp $
+.TH default_colors 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,7 +44,7 @@
 .SH NAME
 \fB\%use_default_colors\fP,
 \fB\%assume_default_colors\fP \-
-use terminal's default colors
+use terminal's default colors in \fIcurses\fP
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 11332a87d..2b18a016e 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.72 2024/03/23 18:05:08 tom Exp $
+# $Id: man_db.renames.in,v 1.73 2024/04/13 23:39:11 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -185,6 +185,7 @@ clearok.3x			clearok.3ncurses
 clrtoeol.3x			clrtoeol.3ncurses
 curs_set.3x			curs_set.3ncurses
 curscr.3x			curscr.3ncurses
+curses_trace.3x			curses_trace.3ncurses
 def_prog_mode.3x		def_prog_mode.3ncurses
 def_shell_mode.3x		def_shell_mode.3ncurses
 del_curterm.3x			del_curterm.3ncurses
@@ -229,6 +230,8 @@ nonl.3x				nonl.3ncurses
 notimeout.3x			notimeout.3ncurses
 pnoutrefresh.3x			pnoutrefresh.3ncurses
 prefresh.3x			prefresh.3ncurses
+printw.3x			printw.3ncurses
+putp.3x			putp.3ncurses
 putwin.3x			putwin.3ncurses
 raw.3x				raw.3ncurses
 refresh.3x			refresh.3ncurses
@@ -249,13 +252,17 @@ subwin.3x			subwin.3ncurses
 syncok.3x			syncok.3ncurses
 terminfo.3x			terminfo.3ncurses
 tigetstr.3x			tigetstr.3ncurses
+touchline.3x			touchline.3ncurses
+touchwin.3x			touchwin.3ncurses
 tparm.3x			tparm.3ncurses
 tputs.3x			tputs.3ncurses
+trace.3x			trace.3ncurses
 unctrl.3x			unctrl.3ncurses
 use_default_colors.3x		use_default_colors.3ncurses
 use_env.3x			use_env.3ncurses
 use_extended_names.3x		use_extended_names.3ncurses
 use_legacy_coding.3x		use_legacy_coding.3ncurses
+use_tioctl.3x			use_tioctl.3ncurses
 vidputs.3x			vidputs.3ncurses
 wadd_wch.3x			wadd_wch.3ncurses
 waddch.3x			waddch.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 8f9e3d147..7599c74a8 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.34 2024/03/23 21:10:33 tom Exp $
+# $Id: manhtml.aliases,v 1.35 2024/04/14 00:36:21 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -42,6 +42,7 @@ clearok(3X)		curs_outopts(3X)
 clrtoeol(3X)		curs_clear(3X)
 curs_set(3X)		curs_kernel(3X)
 curscr(3X)		curs_variables(3X)
+curses_trace(3X)	curs_trace(3X)
 def_prog_mode(3X)	curs_kernel(3X)
 def_shell_mode(3X)	curs_kernel(3X)
 del_curterm(3X)		curs_terminfo(3X)
@@ -79,6 +80,8 @@ nocbreak(3X)		curs_inopts(3X)
 nonl(3X)		curs_inopts(3X)
 pnoutrefresh(3X)	curs_pad(3X)
 prefresh(3X)		curs_pad(3X)
+printw(3X)		curs_printw(3X)
+putp(3X)		curs_terminfo(3X)
 putwin(3X)		curs_util(3X)
 raw(3X)			curs_inopts(3X)
 refresh(3X)		curs_refresh(3X)
@@ -97,12 +100,15 @@ start_color(3X)		curs_color(3X)
 terminfo(3X)		curs_terminfo(3X)
 tic(1)			tic(1M)
 tigetstr(3X)		curs_terminfo(3X)
+touchline(3X)		curs_touch(3X)
+touchwin(3X)		curs_touch(3X)
 tparm(3X)		curs_terminfo(3X)
 tputs(3X)		curs_terminfo(3X)
 use_default_colors(3X)	default_colors(3X)
 use_env(3X)		curs_util(3X)
 use_extended_names(3X)	curs_extend(3X)
 use_legacy_coding(3X)	legacy_coding(3X)
+use_tioctl(3X)		curs_util(3X)
 vidputs(3X)		curs_terminfo(3X)
 wadd_wch(3X)		curs_add_wch(3X)
 waddch(3X)		curs_addch(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 91ee6f53c..c5dff79dc 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.22 2024/03/16 20:46:05 tom Exp $
+# $Id: manhtml.externs,v 1.24 2024/04/14 00:15:03 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -59,7 +59,10 @@ resize(1)
 scanf(3)
 scanf(3S)
 screen(1)
+setbuf(3)
+setgid(2)
 setlocale(3)
+setuid(2)
 sh(1)
 sscanf(3)
 stdio(3)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 0dd20c793..48c64944a 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.204 2024/03/23 20:42:29 tom Exp $
-.TH ncurses 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.207 2024/04/14 00:34:00 tom Exp $
+.TH ncurses 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -84,11 +84,12 @@ the definition and use of
 .I "soft label"
 keys;
 .I \%term\%info
-capabilities;
+capability access;
 a
-.I \%term\%cap
+.I termcap
 compatibility interface;
-and access to low-level terminal-manipulation routines.
+and an abstraction of the system's API for manipulating the terminal
+(such as \fI\%termios\fP(3)).
 .PP
 .I \%ncurses
 implements the standard interface described by
@@ -99,90 +100,123 @@ emulates the
 .I curses
 library of SVr4 and provides numerous useful extensions.
 .PP
-\fI\%ncurses\fP man pages employ several sections to clarify matters of
-usage and interoperability with other \fIcurses\fP implementations.
+.I \%ncurses
+man pages employ several sections to clarify matters of usage and
+interoperability with other
+.I curses
+implementations.
 .bP
-\*(``NOTES\*('' describes matters and caveats of which any user of the
-\fI\%ncurses\fP API should be aware,
+\*(``NOTES\*('' describes issues and caveats of which any user of the
+.I \%ncurses
+API should be aware,
 such as limitations on the size of an underlying integral type or the
 availability of a preprocessor macro exclusive of a function definition
 (which prevents its address from being taken).
 This section also describes implementation details that will be
 significant to the programmer but which are not standardized.
 .bP
-\*(``EXTENSIONS\*('' presents \fI\%ncurses\fP innovations beyond the
-X/Open Curses standard and/or the SVr4 \fIcurses\fP implementation.
-They are termed \fIextensions\fP to indicate that they cannot be
-implemented solely by using the library API, but require access to the
-library's internal state.
+\*(``EXTENSIONS\*('' presents
+.I \%ncurses
+innovations beyond the X/Open Curses standard and/or the SVr4
+.I curses
+implementation.
+They are termed
+.I extensions
+to indicate that they cannot be implemented solely by using the library
+API,
+but require access to the library's internal state.
 .bP
 \*(``PORTABILITY\*('' discusses matters
 (beyond the exercise of extensions)
-that should be considered when writing to a \fIcurses\fP standard,
-or to multiple implementations.
+that should be considered when writing to a
+.I curses
+standard,
+or for multiple implementations.
 .bP
-\*(``HISTORY\*('' examines points of detail in \fI\%ncurses\fP and other
-\fIcurses\fP implementations over the decades of their development,
+\*(``HISTORY\*('' examines points of detail in
+.I \%ncurses
+and other
+.I curses
+implementations over the decades of their development,
 particularly where precedent or inertia have frustrated better design
 (and,
 in a few cases,
 where such inertia has been overcome).
 .PP
-A program using these routines must be linked with the \fB\-lncurses\fP option,
-or (if it has been generated) with the debugging library \fB\-lncurses_g\fP.
-(Your system integrator may also have installed these libraries under
-the names \fB\-lcurses\fP and \fB\-lcurses_g\fP.)
-The ncurses_g library generates trace logs
-(in a file called \*(``trace\*('' in the current directory)
-that describe curses actions.
+A
+.I curses
+application must be linked with the library;
+use the
+.B \-lncurses
+option to your compiler or linker.
+A debugging version of the library may be available;
+if so,
+link with it using
+.BR \-lncurses_g .
+(Your system integrator may have installed these libraries such that you
+can use the options
+.B \-lcurses
+and
+.BR \-lcurses_g ,
+respectively.)
+The
+.I \%ncurses_g
+library generates trace logs
+(in a file called
+.I \%trace
+in the current directory)
+that describe
+.I \%ncurses
+actions.
 See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
-.SS Initialization
-The library uses the locale which the calling program has initialized.
-That is normally done with \fBsetlocale\fP(3):
+.SS "Application Structure"
+A
+.I curses
+application uses information from the system locale;
+\fI\%setlocale\fP(3) prepares it for
+.I curses
+library calls.
 .PP
 .RS 4
 .EX
-\fBsetlocale(LC_ALL, "");\fP
+setlocale(LC_ALL, "");
 .EE
 .RE
 .PP
-If the locale is not initialized,
-the library assumes that characters are printable as in ISO\-8859\-1,
+If the locale is not thus initialized,
+the library assumes that characters are printable as in ISO\ 8859-1,
 to work with certain legacy programs.
-You should initialize the locale and not rely on specific details of
-the library when the locale has not been set up.
+You should initialize the locale;
+do not expect consistent behavior from the library when the locale has
+not been set up.
 .PP
-The function \fBinitscr\fP or \fBnewterm\fP
-must be called to initialize the library
-before any of the other routines that deal with windows
-and screens are used.
-The routine \fBendwin\fP(3X) must be called before exiting.
+\fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
+must be called to initialize
+.I curses
+before use of any functions that deal with windows and screens.
 .PP
-To get character-at-a-time input without echoing (most
-interactive, screen oriented programs want this), the following
-sequence should be used:
+To get character-at-a-time input without echoing\(emmost interactive,
+screen-oriented programs want this\(emuse the following sequence.
 .PP
 .RS 4
 .EX
-\fBinitscr(); cbreak(); noecho();\fP
+initscr(); cbreak(); noecho();
 .EE
 .RE
 .PP
-Most programs would additionally use the sequence:
+Most applications perform further setup as follows.
 .PP
 .RS 4
 .EX
-\fBintrflush(stdscr, FALSE);\fP
-\fBkeypad(stdscr, TRUE);\fP
+intrflush(stdscr, FALSE);
+keypad(stdscr, TRUE);
 .EE
 .RE
 .PP
-Before a \fBcurses\fP program is run, the tab stops of the terminal
-should be set and its initialization strings, if defined, must be output.
-This can be done by executing the \fB@TPUT@ init\fP command
-after the shell environment variable \fITERM\fP has been exported.
-(The BSD-style \fB\%@TSET@\fP(1) utility also performs this function.)
-See subsection \*(``Tabs and Initialization\*('' of \fBterminfo\fP(5).
+A
+.I curses
+program then often enters an event loop of some sort.
+Call \fB\%endwin\fP(3X) before exiting.
 .SS Overview
 A
 .I curses
@@ -197,20 +231,23 @@ addressed by row and column coordinates
 .RI ( y ,
 .IR x ),
 with the upper left corner as (0, 0).
-A window called \fB\%stdscr\fP,
+A window called
+.BR \%stdscr ,
 the same size as the terminal screen,
 is always available.
 Create others with \fB\%newwin\fP(3X).
 .PP
 A
 .I curses
-library does not manage overlapping windows.
-(See \fBpanel\fP(3X) if you desire this.)
-You can either use \fB\%stdscr\fP to manage one screen-filling window,
+library does not manage overlapping windows
+(but see below).
+You can either use
+.B \%stdscr
+to manage one screen-filling window,
 or tile the screen into non-overlapping windows and not use
-\fB\%stdscr\fP at all.
-Mixing the two approaches will result in unpredictable,
-and undesired,
+.B \%stdscr
+at all.
+Mixing the two approaches will result in unpredictable and undesired
 effects.
 .PP
 Functions permit manipulation of a window and the
@@ -218,45 +255,14 @@ Functions permit manipulation of a window and the
 identifying the cell within it at which the next output operation will
 occur.
 Among those,
-the most basic are \fBmove\fP(3X) and \fB\%addch\fP(3X):
+the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
 these place the cursor and write a character to
 .BR \%stdscr ,
 respectively.
-As a rule,
-window-addressing functions feature names prefixed
-(or infixed,
-see below)
-with \*(``w\*('';
-these allow the user to specify a pointer to a
-.IR \%WINDOW .
-Counterparts not thus prefixed
-(or infixed)
-affect \fB\%stdscr\fP.
-Because moving the cursor prior to another operation is so common,
-.I curses
-generally also provides functions with a \*(``mv\*('' prefix as a
-convenience.
-Thus,
-the library defines all of
-\fB\%addch\fP,
-\fB\%waddch\fP,
-\fB\%mvaddch\fP,
-and
-\fB\%mvwaddch\fP.
-When both prefixes are present,
-the order of arguments is a
-.I \%WINDOW
-pointer first,
-then a
-.I y
-and
-.I x
-coordinate pair.
 .PP
-Updating the terminal screen with every
-.I curses
-call can cause unpleasant flicker or inefficient use of the
-communications channel to the device.
+Frequent changes to the terminal screen can cause unpleasant flicker or
+inefficient use of the communication channel to the device,
+so the library does not generally update it automatically.
 Therefore,
 after using
 .I curses
@@ -264,7 +270,7 @@ functions to accumulate a set of desired updates that make sense to
 present together,
 call \fB\%refresh\fP(3X) to tell the library to make the user's screen
 look like \fBstdscr\fP.
-.I \%ncurses
+The library
 .\" X/Open Curses Issue 7 assumes some optimization will be done, but
 .\" does not mandate it in any way.
 .I optimizes
@@ -278,7 +284,9 @@ a feature of every standard
 .I curses
 implementation.
 .PP
-Special windows called \fIpads\fP may also be manipulated.
+Special windows called
+.I pads
+may also be manipulated.
 These are windows that are not constrained to the size of the terminal
 screen and whose contents need not be completely displayed.
 See \fB\%curs_pad\fP(3X).
@@ -291,12 +299,10 @@ or in color on terminals that support such display enhancements.
 See \fB\%curs_attr\fP(3X).
 .PP
 .I curses
-predefines constants for a small set of line-drawing and other graphics
+predefines constants for a small set of forms-drawing graphics
 corresponding to the DEC Alternate Character Set (ACS),
 a feature of VT100 and other terminals.
-See
-\fB\%waddch\fP(3X) and
-\fB\%wadd_wch\fP(3X).
+See \fB\%waddch\fP(3X).
 .PP
 .I curses
 is implemented using the operating system's terminal driver;
@@ -317,7 +323,13 @@ appears as a control character or a multibyte
 translates these into unique
 .I "key codes."
 See \fB\%getch\fP(3X).
-.SS "Effects of GUIs and Environment Variables"
+.PP
+.I \%ncurses
+provides reimplementations of the SVr4 \fBpanel\fP(3X), \fBform\fP(3X),
+and \fBmenu\fP(3X) libraries to ease construction of user interfaces
+with
+.IR curses .
+.SS "Initialization"
 The selection of an appropriate value of
 .I TERM
 in the process environment is essential to correct
@@ -330,7 +342,20 @@ A well-configured system selects a correct
 value automatically;
 \fB\%tset\fP(1) may assist with troubleshooting exotic situations.
 .PP
-If the environment variables \fILINES\fP and \fI\%COLUMNS\fP are set,
+If you change the terminal type,
+export the
+.I TERM
+environment variable in the shell,
+then run \fB\%tset\fP(1) or the
+.RB \*(`` "@TPUT@ init" \*(''
+command.
+See subsection \*(``Tabs and Initialization\*('' of \fB\%terminfo\fP(5).
+.PP
+If the environment variables
+.I \%LINES
+and
+.I \%COLUMNS
+are set,
 or if the
 .I curses
 program is executing in a graphical windowing environment,
@@ -341,23 +366,35 @@ An
 extension supports resizable terminals;
 see \fB\%wresize\fP(3X).
 .PP
-If the environment variable \fI\%TERMINFO\fP is defined,
+If the environment variable
+.I \%TERMINFO
+is defined,
 a
 .I curses
 program checks first for a terminal type description in the location it
 identifies.
 .I \%TERMINFO
 is useful for developing experimental type descriptions or when write
-permission to \fI\*d\fP is not available.
+permission to
+.I \%\*d
+is not available.
 .PP
 See section \*(``ENVIRONMENT\*('' below.
 .SS "Naming Conventions"
-Many
 .I curses
-functions have two or more versions.
-Those prefixed with \*(``w\*('' require a window argument.
+offers many functions in variant forms using a regular set of
+alternatives to the name of an elemental one.
+Those prefixed with \*(``w\*('' require a
+.I \%WINDOW
+pointer argument;
+those with a \*(``mv\*('' prefix first perform cursor movement using
+\fB\%wmove\fP(3X);
+a \*(``mvw\*('' prefix indicates both.
+The \*(``w\*('' function is typically the elemental one;
+the removal of this prefix usually indicates operation on
+.BR \%stdscr .
+.PP
 Four functions prefixed with \*(``p\*('' require a pad argument.
-Those without a prefix generally operate on \fB\%stdscr\fP.
 .PP
 In function synopses,
 .I \%ncurses
@@ -367,8 +404,8 @@ man pages apply the following names to parameters.
 center;
 Li L.
 bf	\fIbool\fP (\fBTRUE\fP or \fBFALSE\fP)
-win	pointer to \fIWINDOW\fP
-pad	pointer to \fIWINDOW\fP that is a pad
+win	pointer to a \fIWINDOW\fP
+pad	pointer to a \fIWINDOW\fP that is a pad
 .TE
 .SS "Wide and Non-wide Character Configurations"
 This manual page describes functions that appear in any configuration
@@ -416,7 +453,7 @@ characters.
 corresponds to the non-wide configuration's
 .IR \%chtype .
 It always a structure type,
-because it stores more data than fits into an integral type.
+because it stores more data than fit into a standard scalar type.
 A character code may not be representable as a
 .IR \%char ,
 and moreover more than one character may occupy a cell
@@ -436,10 +473,10 @@ Each cell of a
 is stored as a
 .IR \%cchar_t .
 .PP
-The \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
-functions store and retrieve the data from a
+\fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
+store and retrieve
 .I \%cchar_t
-structure.
+data.
 The wide library API of
 .I \%ncurses
 depends on two data types standardized by ISO C95.
@@ -482,13 +519,19 @@ where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
 prefix it with \*(``_w\*('' to obtain the wide counterpart.
 For example,
 \fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+(Exceptions that add only \*(``w\*('' comprise
+.BR \%addwstr ,
+.BR \%inwstr ,
+and their variants.)
 .IP
 This convention is inapplicable to some non-wide function names,
 so other transformations are used for the wide configuration:
-in the window background management functions,
-\*(``bkgd\*('' becomes \*(``bkgrnd\*('';
+the window background management function \*(``bkgd\*('' becomes
+\*(``bkgrnd\*('';
 the window border-drawing and -clearing functions are suffixed with
-\*(``_set\*(''.
+\*(``_set\*('';
+and character attribute manipulation functions like
+\*(``attron\*('' become \*(``attr_on\*(''.
 .\"
 .SS "Function Name Index"
 The following table lists the
@@ -497,7 +540,7 @@ functions provided in the non-wide and wide APIs and the corresponding
 man pages that describe them.
 Those flagged with \*(``*\*(''
 are
-.IR \%ncurses -specific,
+.IR \%ncurses "-specific,"
 neither described by X/Open Curses nor present in SVr4.
 .PP
 .TS
@@ -578,6 +621,7 @@ find_pair/\fBnew_pair\fP(3X)*
 flash/\fBcurs_beep\fP(3X)
 flushinp/\fBcurs_util\fP(3X)
 free_pair/\fBnew_pair\fP(3X)*
+get_escdelay/\fBcurs_threads\fP(3X)*
 get_wch/\fBcurs_get_wch\fP(3X)
 get_wstr/\fBcurs_get_wstr\fP(3X)
 getattrs/\fBcurs_attr\fP(3X)
@@ -802,6 +846,8 @@ scrl/\fBcurs_scroll\fP(3X)
 scroll/\fBcurs_scroll\fP(3X)
 scrollok/\fBcurs_outopts\fP(3X)
 set_curterm/\fBcurs_terminfo\fP(3X)
+set_escdelay/\fBcurs_threads\fP(3X)*
+set_tabsize/\fBcurs_threads\fP(3X)*
 set_term/\fBcurs_initscr\fP(3X)
 setcchar/\fBcurs_getcchar\fP(3X)
 setscrreg/\fBcurs_outopts\fP(3X)
@@ -861,7 +907,9 @@ use_default_colors/\fBdefault_colors\fP(3X)*
 use_env/\fBcurs_util\fP(3X)
 use_extended_names/\fBcurs_extend\fP(3X)*
 use_legacy_coding/\fBlegacy_coding\fP(3X)*
+use_screen/\fBcurs_threads\fP(3X)*
 use_tioctl/\fBcurs_util\fP(3X)*
+use_window/\fBcurs_threads\fP(3X)*
 vid_attr/\fBcurs_terminfo\fP(3X)
 vid_puts/\fBcurs_terminfo\fP(3X)
 vidattr/\fBcurs_terminfo\fP(3X)
@@ -958,275 +1006,401 @@ wvline/\fBcurs_border\fP(3X)
 wvline_set/\fBcurs_border_set\fP(3X)
 .TE
 .PP
-Depending on the configuration,
-additional sets of functions may be available:
-.RS 3
-.TP 5
-\fBcurs_memleaks\fP(3X) - curses memory-leak checking
-.TP 5
-\fBcurs_sp_funcs\fP(3X) - curses screen-pointer extension
-.TP 5
-\fBcurs_threads\fP(3X) - curses thread support
-.TP 5
-\fBcurs_trace\fP(3X) - curses debugging routines
-.RE
+.IR \%ncurses 's
+.I "screen-pointer extension"
+adds additional functions corresponding to many of the above,
+each with an \*(``_sp\*('' suffix;
+see \fBcurs_sp_funcs\fP(3X).
+.PP
+The availability of some extensions is configurable when
+.I \%ncurses
+is compiled;
+see sections \*(``ALTERNATE CONFIGURATIONS\*('' and \*(``EXTENSIONS\*(''
+below.
 .SH RETURN VALUE
 Unless otherwise noted,
-functions that return an integer return \fBOK\fP on success and
-\fBERR\fP on failure.
-Functions that return pointers return \fBNULL\fP on failure.
+functions that return an integer return
+.B OK
+on success and
+.B ERR
+on failure.
+Functions that return pointers return
+.B NULL
+on failure.
 Typically,
 .I \%ncurses
 treats a null pointer passed as a function parameter as a failure.
-.PP
 Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I \%WINDOW
-pointer is null.
+\fB\%wmove\fP(3X) and fail if the position is outside the window.
 .SH ENVIRONMENT
-The following environment symbols are useful for customizing the
-runtime behavior of the \fI\%ncurses\fP library.
-The most important ones have been already discussed in detail.
+The following symbols from the process environment customize the
+runtime behavior of
+.I \%ncurses
+applications.
+The library may be configured to disregard the variables
+.IR \%TERMINFO ,
+.IR \%TERMINFO_DIRS ,
+.IR \%TERMPATH ,
+and
+.IR HOME ,
+if the user is the superuser (root),
+or the application uses \fI\%setuid\fP(2) or \fI\%setgid\fP(2).
+.SS "\fIBAUDRATE\fP"
+The debugging library checks this variable when the application has
+redirected output to a file.
+Its integral value is used for the baud rate.
+If that value is absent or invalid,
+.I \%ncurses
+uses 9600.
+This feature allows testers to construct repeatable test cases
+that take into account optimization decisions that depend on baud rate.
 .SS "\fICC\fP (command character)"
 When set,
-change the
+the
 .B \%command_character
 .RB ( \%cmdch )
 capability value of loaded
 .I \%term\%info
-entries to the value of this variable.
+entries changes to the value of this variable.
 Very few
 .I \%term\%info
 entries provide this feature.
 .PP
 Because this name is also used in development environments to represent
 the C compiler's name,
-\fI\%ncurses\fP ignores it if it does not happen to be a single
-character.
-.SS "\fIBAUDRATE\fP"
-The debugging library checks this environment variable when the application
-has redirected output to a file.
-The variable's numeric value is used for the baud rate.
-If no value is found, \fI\%ncurses\fP uses 9600.
-This allows testers to construct repeatable test-cases
-that take into account costs that depend on baud rate.
+.I \%ncurses
+ignores its value if it is not one character in length.
 .SS "\fICOLUMNS\fP"
-Specify the width of the screen in characters.
+This variable specifies the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
-If neither the \fI\%COLUMNS\fP value
-nor the terminal's screen size is available,
-\fI\%ncurses\fP uses the size which may be specified in the terminfo
-database
-(i.e., the \fBcols\fP capability).
+If
+.I \%COLUMNS
+is not defined and the terminal's screen size is not available from the
+terminal driver,
+.I \%ncurses
+uses the size specified by the
+.B \%columns
+.RB ( \%cols )
+capability of the terminal type's entry in the
+.I \%term\%info
+database,
+if any.
+.PP
+It is important that your application use the correct screen size.
+Automatic detection thereof is not always possible because an
+application may be running on a host that does not honor NAWS
+(Negotiations About Window Size)
+or as a different user ID than the owner of the terminal device file.
+Setting
+.I \%COLUMNS
+and/or
+.I \%LINES
+overrides the library's use of the screen size obtained from the
+operating system.
+.PP
+The
+.I \%COLUMNS
+and
+.I \%LINES
+variables may be specified independently.
+This property is useful to circumvent misfeatures of legacy terminal
+type descriptions;
+\fI\%xterm\fP(1) descriptions specifying 65 lines were once notorious.
+For best results,
+avoid specifying
+.B cols
+and
+.B lines
+capability codes in
+.I \%term\%info
+descriptions of terminal emulators.
 .PP
-It is important that your application use a correct size for the screen.
-This is not always possible because your application may be
-running on a host which does not honor NAWS (Negotiations About Window
-Size), or because you are temporarily running as another user.
-However,
-setting \fI\%COLUMNS\fP and/or \fILINES\fP overrides the library's use
-of the screen size obtained from the operating system.
-.PP
-Either \fI\%COLUMNS\fP or \fILINES\fP symbols may be specified
-independently.
-This is mainly useful to circumvent legacy misfeatures of terminal descriptions,
-e.g., xterm which commonly specifies a 65 line screen.
-For best results, \fBlines\fP and \fBcols\fP should not be specified in
-a terminal description for terminals which are run as emulations.
-.PP
-Use the \fBuse_env\fP function to disable all use of external environment
-(but not including system calls) to determine the screen size.
-Use the \fBuse_tioctl\fP function to update \fI\%COLUMNS\fP or
-\fILINES\fP to match the screen size obtained from system calls or the
-terminal database.
+\fBuse_env\fP(3X) can disable use of the process environment
+in determining the screen size.
+\fBuse_tioctl\fP(3X) can update
+.I \%COLUMNS
+and
+.I \%LINES
+to match the screen size obtained from system calls or the terminal
+database.
 .SS "\fIESCDELAY\fP"
-Specifies the total time,
-in milliseconds,
-for which \fI\%ncurses\fP will await a character sequence,
-e.g.,
-a function key.
-The default value, 1000 milliseconds, is enough for most uses.
-However, it is made a variable to accommodate unusual applications.
+For
+.I curses
+to distinguish the ESC character resulting from a user's press of the
+\*(``Escape\*('' key on the input device from one beginning an
+.I "escape sequence"
+(as commonly produced by function keys),
+it waits after receiving the escape character to see if further
+characters are available on the input stream within a short interval.
+A global variable
+.B \%ESCDELAY
+stores this interval in milliseconds.
+The default value of 1000
+(one second)
+is adequate for most uses.
+This environment variable overrides it.
 .PP
 The most common instance where you may wish to change this value
-is to work with slow hosts, e.g., running on a network.
-If the host cannot read characters rapidly enough, it will have the same
-effect as if the terminal did not send characters rapidly enough.
-The library will still see a timeout.
-.PP
-Note that xterm mouse events are built up from character sequences
-received from the xterm.
-If your application makes heavy use of multiple-clicking, you may
-wish to lengthen this default value because the timeout applies
-to the composed multi-click event as well as the individual clicks.
-.PP
-In addition to the environment variable,
-this implementation provides a global variable with the same name.
-Portable applications should not rely upon the presence of \fB\%ESCDELAY\fP
+is to work with a remote host over a slow communication channel.
+If the host running a
+.I curses
+application does not receive the characters of an escape sequence in a
+timely manner,
+the library can interpret them as multiple key stroke events.
+.PP
+\fI\%xterm\fP(1) mouse events are a form of escape sequence;
+therefore,
+if your application makes heavy use of multiple-clicking,
+you may wish to lengthen the default value because the delay applies
+to the composite multi-click event as well as the individual clicks.
+.PP
+Portable applications should not rely upon the presence of
+.B \%ESCDELAY
 in either form,
 but setting the environment variable rather than the global variable
 does not create problems when compiling an application.
-.SS "\fIHOME\fP"
-Tells \fI\%ncurses\fP where your home directory is.
-That is where it may read and write auxiliary terminal descriptions:
 .PP
-.RS 4
-.EX
-$HOME/.termcap
-$HOME/.terminfo
-.EE
-.RE
+If \fB\%keypad\fP(3X) is disabled for the
+.I curses
+window receiving input,
+a program must disambiguate escape sequences itself.
+.SS "\fIHOME\fP"
+.I \%ncurses
+may read and write auxiliary terminal descriptions in
+.I \%.termcap
+and
+.I \%.terminfo
+files in the user's home directory.
 .SS "\fILINES\fP"
-Like \fI\%COLUMNS\fP, specify the height of the screen in characters.
-See \fI\%COLUMNS\fP for a detailed description.
+This counterpart to
+.I \%COLUMNS
+specifies the height of the screen in characters.
+The corresponding
+.I \%term\%info
+capability and code is
+.BR \%lines .
+See the description of the
+.I \%COLUMNS
+variable above.
 .SS "\fIMOUSE_BUTTONS_123\fP"
-This applies only to the OS/2 EMX port.
-It specifies the order of buttons on the mouse.
-OS/2 numbers a 3-button mouse inconsistently from other
-platforms:
-.PP
-.RS 4
-.EX
-1 = left
-2 = right
-3 = middle.
-.EE
-.RE
-.PP
-This variable lets you customize the mouse.
-The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
-If it is not specified, \fI\%ncurses\fP uses 132.
+(OS/2 EMX port only)
+OS/2 numbers a three-button mouse inconsistently with other platforms,
+such that 1 is the left button,
+2 the right,
+and 3 the middle.
+This variable customizes the mouse button numbering.
+Its value must be three digits 1\-3 in any order.
+By default,
+.I \%ncurses
+assumes a numbering of \*(``132\*(''.
 .SS "\fINCURSES_ASSUMED_COLORS\fP"
-Override the compiled-in assumption that the
-terminal's default colors are white-on-black
-(see \fBdefault_colors\fP(3X)).
-You may set the foreground and background color values with this environment
-variable by proving a 2-element list: foreground,background.
-For example, to tell \fI\%ncurses\fP to not assume anything
-about the colors, set this to "\-1,\-1".
-To make it green-on-black, set it to "2,0".
-Any positive value from zero to the terminfo \fBmax_colors\fP value is allowed.
-.SS "\fINCURSES_CONSOLE2\fP"
-This applies only to the MinGW port of \fI\%ncurses\fP.
+If set,
+this variable overrides the
+.I \%ncurses
+library's compiled-in assumption that the terminal's default colors are
+white on black;
+see \fB\%default_colors\fP(3X).
+Set the foreground and background color values with this environment
+variable by assigning it two integer values separated by a comma,
+indicating foregound and background color numbers,
+respectively.
 .PP
-The \fBConsole2\fP program's handling of the Microsoft Console API call
-\fBCreateConsoleScreenBuffer\fP is defective.
-Applications which use this will hang.
-However, it is possible to simulate the action of this call by
-mapping coordinates,
+For example,
+to tell
+.I \%ncurses
+not to assume anything about the colors,
+use a value of \*(``\-1,\-1\*(''.
+To make the default color scheme green on black,
+use \*(``2,0\*(''.
+.I \%ncurses
+accepts integral values from \-1 up to the value of the
+.I \%term\%info
+.B \%max_colors
+.RB ( colors )
+capability.
+.SS "\fINCURSES_CONSOLE2\fP"
+(MinGW port only)
+The
+.I \%Console2
+.\" https://www.hanselman.com/blog/console2-a-better-windows-command-prompt
+program defectively handles the Microsoft Console API call
+.IR \%Create\%Console\%Screen\%Buffer .
+Applications that use it will hang.
+However,
+it is possible to simulate the action of this call by mapping
+coordinates,
 explicitly saving and restoring the original screen contents.
-Setting the environment variable \fBNCGDB\fP has the same effect.
+Setting the environment variable
+.I \%NCGDB
+has the same effect.
 .SS "\fINCURSES_GPM_TERMS\fP"
-This applies only to \fI\%ncurses\fP configured to use the GPM
-interface.
-.PP
-If present,
-the environment variable is a list of one or more terminal names
-against which the \fITERM\fP environment variable is matched.
-Setting it to an empty value disables the GPM interface;
-using the built-in support for xterm, etc.
-.PP
-If the environment variable is absent,
-\fI\%ncurses\fP will attempt to open GPM if \fITERM\fP contains
-\*(``linux\*(''.
+(Linux only)
+When
+.I \%ncurses
+is configured to use the GPM interface,
+this variable may list one or more terminal names
+against which the
+.I TERM
+variable
+(see below)
+is matched.
+An empty value disables the GPM interface,
+using
+.IR \%ncurses 's
+built-in support for \fIxterm\fP(1) mouse protocols instead.
+If the variable is absent,
+.I \%ncurses
+attempts to open GPM if
+.I TERM
+contains \*(``linux\*(''.
 .SS "\fINCURSES_NO_HARD_TABS\fP"
-\fI\%ncurses\fP may use tabs as part of cursor movement optimization.
+.I \%ncurses
+may use tab characters in cursor movement optimization.
 In some cases,
-your terminal driver may not handle these properly.
+your terminal driver may not handle them properly.
 Set this environment variable to any value to disable the feature.
-You can also adjust your \fBstty\fP(1) settings to avoid the problem.
+You can also adjust your \fI\%stty\fP(1) settings to avoid the problem.
 .SS "\fINCURSES_NO_MAGIC_COOKIE\fP"
-Some terminals use a magic-cookie feature which requires special handling
-to make highlighting and other video attributes display properly.
-You can suppress the highlighting entirely for these terminals by
-setting this environment variable to any value.
+Many terminals store video attributes as a property of a character cell,
+as
+.I curses
+does.
+Historically,
+some recorded changes in video attributes as data that logically
+.I occupies
+character cells on the display,
+switching attributes on or off,
+similarly to tags in a markup language;
+these are termed \*(``magic cookies\*('',
+and must be subsequently overprinted.
+If the
+.I \%term\%info
+entry for your terminal type does not adequately describe its handling
+of magic cookies,
+set this variable to any value to instruct
+.I \%ncurses
+to disable attributes entirely.
 .SS "\fINCURSES_NO_PADDING\fP"
-Most of the terminal descriptions in the terminfo database are written
-for real \*(``hardware\*('' terminals.
-Many people use terminal emulators
-which run in a windowing environment and use curses-based applications.
-Terminal emulators can duplicate
-all of the important aspects of a hardware terminal, but they do not
-have the same limitations.
-The chief limitation of a hardware terminal from the standpoint
-of your application is the management of dataflow, i.e., timing.
+Most terminal type descriptions in the
+.I \%term\%info
+database detail hardware devices.
+Many people use
+.IR curses -based
+applications in terminal emulator programs that run in a windowing
+environment.
+These programs can duplicate all of the important features of a hardware
+terminal,
+but often lack their limitations.
+Chief among these absent drawbacks is the problem of data flow
+management;
+that is,
+limiting the speed of communication to what the hardware could handle.
 Unless a hardware terminal is interfaced into a terminal concentrator
 (which does flow control),
-it (or your application) must manage dataflow, preventing overruns.
-The cheapest solution (no hardware cost)
-is for your program to do this by pausing after
-operations that the terminal does slowly, such as clearing the display.
-.PP
-As a result, many terminal descriptions (including the vt100)
-have delay times embedded.
-You may wish to use these descriptions,
-but not want to pay the performance penalty.
-.PP
-Set the \fI\%NCURSES_NO_PADDING\fP environment variable
-to disable all but mandatory padding.
-Mandatory padding is used as a part of special control
-sequences such as \fBflash\fP.
+an application must manage flow control itself to prevent overruns and
+data loss.
+.PP
+A solution that comes at no hardware cost is for an application to pause
+after directing a terminal to execute an operation that it performs
+slowly,
+such as clearing the display.
+Many terminal type descriptions,
+including that for the VT100,
+embed delay specifications in capabilities.
+You may wish to use these temrinal descriptions without paying the
+performance penalty.
+Set
+.I \%NCURSES_NO_PADDING
+to any value to disable all but mandatory padding.
+Mandatory padding is used by such terminal capabilities as
+.B \%flash_screen
+.RB ( flash ).
 .SS "\fINCURSES_NO_SETBUF\fP"
-This setting is obsolete.
-Before changes
-.RS 3
-.bP
-started with 5.9 patch 20120825
-and
-.bP
-continued
-though 5.9 patch 20130126
-.RE
-.PP
-\fI\%ncurses\fP enabled buffered output during terminal initialization.
-This was done (as in SVr4 curses) for performance reasons.
-For testing purposes, both of \fI\%ncurses\fP and certain applications,
+(Obsolete)
+Prior to internal changes developed in
+.I \%ncurses
+5.9
+(patches 20120825 through 20130126),
+the library used \fI\%setbuf\fP(3) to enable fully buffered output when
+initializing the terminal.
+This was done,
+as in SVr4
+.IR curses ,
+to increase performance.
+For testing purposes,
+both of
+.I \%ncurses
+and of certain applications,
 this feature was made optional.
-Setting the \fI\%NCURSES_NO_SETBUF\fP variable
-disabled output buffering, leaving the output in the original (usually
-line buffered) mode.
-.PP
-In the current implementation,
-\fI\%ncurses\fP performs its own buffering and does not require this
-workaround.
-It does not modify the buffering of the standard output.
-.PP
-The reason for the change was to make the behavior for interrupts and
-other signals more robust.
-One drawback is that certain nonconventional programs would mix
-ordinary \fI\%stdio\fP(3) calls with \fI\%ncurses\fP calls and (usually)
-work.
-This is no longer possible since \fI\%ncurses\fP is not using
-the buffered standard output but its own output (to the same file descriptor).
-As a special case, the low-level calls such as \fBputp\fP still use the
-standard output.
-But high-level curses calls do not.
+Setting this variable disabled output buffering,
+leaving the output stream in the original
+(usually line-buffered)
+mode.
+.PP
+Nowadays,
+.I \%ncurses
+performs its own buffering and does not require this workaround;
+it does not modify the buffering of the standard output stream.
+This approach makes signal handling,
+as for interrupts,
+more robust.
+A drawback is that certain unconventional programs mixed
+\fI\%stdio\fP(3) calls with
+.I \%ncurses
+calls and (usually)
+got the behavior they expected.
+This is no longer the case;
+.I \%ncurses
+does not write to the standard output file descriptor through a
+.IR stdio -buffered
+stream.
+.PP
+As a special case,
+low-level API calls such as \fB\%putp\fP(3X) still use the
+standard output stream.
+High-level
+.I curses
+calls such as \fB\%printw\fP(3X) do not.
 .SS "\fINCURSES_NO_UTF8_ACS\fP"
-During initialization, the \fI\%ncurses\fP library
-checks for special cases where VT100 line-drawing (and the corresponding
-alternate character set capabilities) described in the terminfo are known
-to be missing.
-Specifically, when running in a UTF\-8 locale,
-the Linux console emulator and the GNU screen program ignore these.
-\fI\%ncurses checks the \fITERM\fP environment variable for these.
-For other special cases, you should set this environment variable.
-Doing this tells \fI\%ncurses\fP to use Unicode values which correspond
-to the VT100 line-drawing glyphs.
-That works for the special cases cited,
-and is likely to work for terminal emulators.
-.PP
-When setting this variable, you should set it to a nonzero value.
-Setting it to zero (or to a nonnumber)
-disables the special check for \*(``linux\*('' and \*(``screen\*(''.
-.PP
-As an alternative to the environment variable,
-\fI\%ncurses\fP checks for an extended terminfo capability \fBU8\fP.
-This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
-For example
+At initialization,
+.I \%ncurses
+inspects the
+.I TERM
+environment variable for special cases where VT100 forms-drawing
+characters
+(and the corresponding alternate character set
+.I \%term\%info
+capabilities)
+are known to be unsupported by terminal types that otherwise claim VT100
+compatibility.
+Specifically,
+when running in a UTF-8 locale,
+the Linux virtual console device and the GNU \fI\%screen\fP(1)
+program ignore them.
+Set this variable to a nonzero value to instruct
+.I \%ncurses
+that the terminal's ACS support is broken;
+the library then outputs Unicode code points that correspond to the
+forms-drawing
+characters.
+Set it to zero
+(or a non-integer)
+to disable the special check for terminal type names matching
+\*(``linux\*('' or \*(``screen\*('',
+directing
+.I \%ncurses
+to assume that the ACS feature works if the terminal type description
+advertises it.
+.PP
+As an alternative to use of this variable,
+.I \%ncurses
+checks for an extended
+.I \%term\%info
+numeric capability \fBU8\fP
+that can be compiled using
+.RB \*(`` "@TIC@ \-x" \*(''.
+Examples follow.
 .PP
 .RS 3
 .EX
@@ -1241,23 +1415,18 @@ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
 .EE
 .RE
 .PP
-The name \*(``U8\*('' is chosen to be two characters,
-to permit it to be used by applications that use \fI\%ncurses\fP'
-termcap interface.
+The two-character name \*(``U8\*('' was chosen to permit its use via
+.IR \%ncurses 's
+.I termcap
+interface.
 .SS "\fINCURSES_TRACE\fP"
-During initialization, the \fI\%ncurses\fP debugging library
-checks the \fI\%NCURSES_TRACE\fP environment variable.
-If it is defined,
-to a numeric value,
-\fI\%ncurses\fP calls the \fBtrace\fP function,
-using that value as the argument.
-.PP
-The argument values, which are defined in \fBcurses.h\fP, provide several
-types of information.
-When running with traces enabled, your application will write the
-file \fBtrace\fP to the current directory.
-.PP
-See \fBcurs_trace\fP(3X) for more information.
+At initialization,
+.I \%ncurses
+(in its debugging configuration)
+checks for this variable's presence.
+If defined with an integral value,
+the library calls \fB\%curses_trace\fP(3X) with that value as the
+argument.
 .SS "\fITERM\fP"
 Denotes your terminal type.
 Each terminal type is distinct, though many are similar.
@@ -1396,16 +1565,6 @@ If the \fI\%TERMPATH\fP environment variable is not set,
 .RE
 .PP
 in that order.
-.PP
-The library may be configured to disregard the following variables when the
-current user is the superuser (root), or if the application uses setuid or
-setgid permissions:
-.PP
-.RS 4
-.EX
-$TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
-.EE
-.RE
 .SH "ALTERNATE CONFIGURATIONS"
 Many different
 .I \%ncurses
@@ -1650,7 +1809,7 @@ supported.
 Some extensions are only available if
 .I \%ncurses
 is compiled to support them;
-see section \*(``ALTERNATE CONFIGURATIONS\*('' above.
+section \*(``ALTERNATE CONFIGURATIONS\*('' describes how.
 .bP
 Rudimentary support for multi-threaded applications may be available;
 see \fBcurs_threads\fP(3X).
@@ -1658,6 +1817,15 @@ see \fBcurs_threads\fP(3X).
 Functions that ease the management of multiple screens can be exposed;
 see \fBcurs_sp_funcs\fP(3X).
 .bP
+To aid applications to debug their memory usage,
+.I ncurses
+optionally offers functions to more aggressively free memory it
+dynamically allocates itself;
+see \fBcurs_memleaks\fP(3X).
+.bP
+The library facilitates auditing and troubleshooting of its behavior;
+see \fBcurs_trace\fP(3X).
+.bP
 The compiler option
 .B \%\-DUSE_GETCAP
 causes the library to fall back to reading
diff --git a/man/tput.1 b/man/tput.1
index 01b68d1fe..5da9dd607 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.109 2024/03/23 20:42:29 tom Exp $
-.TH @TPUT@ 1 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.111 2024/04/13 22:09:53 tom Exp $
+.TH @TPUT@ 1 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -564,7 +564,7 @@ for
 .BR \%parm_delete_line .
 .I \%term\%info
 uses the code
-.B dch1
+.B dl1
 for
 .BR \%delete_line .
 .bP
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 29b8b661f..74d54d4d2 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.685 2024/02/24 18:46:40 tom Exp $
+ * $Id: curses.priv.h,v 1.686 2024/04/13 18:59:05 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2530,6 +2530,14 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
 #define NC_ISATTY(fd) isatty(fd)
 #endif
 
+/*
+ * Perhaps not "real" but possibly not "fake".
+ */
+#define IsRealTty(fd,value) \
+	(NC_ISATTY(fd) \
+	 && (value = ttyname(fd)) != NULL \
+	 && strncmp(value, "/dev/pts/", 9))
+
 #ifdef USE_TERM_DRIVER
 #  define IsTermInfo(sp)       ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo)))
 #  define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index e62aad794..7231ac671 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.233 2024/03/16 23:39:28 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.235 2024/04/13 20:35:14 tom Exp $")
 
 /****************************************************************************
  *
@@ -362,17 +362,15 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 }
 
 static bool
-set_position(TERMINAL *termp, int fd, int row, int col)
+set_position(NCURSES_SP_DCLx TERMINAL *termp, int row, int col)
 {
     bool result = FALSE;
     char *actual = TIPARM_2(cursor_address, row, col);
-    T(("set_position %d,%d", row, col));
-    if (actual != NULL) {
-	size_t want = strlen(actual);
-	int have = (int) write(fd, actual, want);	/* FIXME - padding */
-	result = ((int) want == have);
-    }
-    return result;
+    T((T_CALLED("set_position %d,%d)"), row, col));
+    if (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position", actual) == OK)
+	result = TRUE;
+    NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+    returnBool(result);
 }
 
 /*
@@ -392,15 +390,13 @@ set_position(TERMINAL *termp, int fd, int row, int col)
  * So we do a simple check to exclude pseudo-terminals.
  */
 static void
-_nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
+_nc_check_screensize(NCURSES_SP_DCLx TERMINAL *termp, int *linep, int *colp)
 {
     int fd = termp->Filedes;
     TTY saved;
     const char *name;
 
-    if (NC_ISATTY(fd)
-	&& (name = ttyname(fd)) != NULL
-	&& strncmp(name, "/dev/pts/", 9)
+    if (IsRealTty(fd, name)
 	&& VALID_STRING(cursor_address)
 	&& is_expected(user7, "6n")
 	&& (is_expected(user6, "%i%d;%dR") ||
@@ -410,6 +406,14 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
 	int updated_y = -1, updated_x = -1;
 	TTY alter = saved;
 
+#if NCURSES_SP_FUNCS
+	if (sp == NULL) {
+	    sp = new_prescr();
+	    sp->_term = termp;
+	    NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);
+	}
+#endif
+
 	T(("checking screensize of %s", name));
 	alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN);
 	alter.c_iflag &= (unsigned) ~(IXON | BRKINT | PARMRK);
@@ -418,11 +422,11 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
 	SET_TTY(fd, &alter);
 
 	if (get_position(termp, fd, &current_y, &current_x)
-	    && set_position(termp, fd, 9999, 9999)
+	    && set_position(NCURSES_SP_ARGx termp, 9999, 9999)
 	    && get_position(termp, fd, &updated_y, &updated_x)) {
 	    *linep = updated_y;
 	    *colp = updated_x;
-	    set_position(termp, fd, current_y, current_x);
+	    set_position(NCURSES_SP_ARGx termp, current_y, current_x);
 	}
 	/* restore tty modes */
 	SET_TTY(fd, &saved);
@@ -431,7 +435,7 @@ _nc_check_screensize(TERMINAL *termp, int *linep, int *colp)
     _nc_default_screensize(termp, linep, colp);
 }
 #else /* !USE_CHECK_SIZE */
-#define _nc_check_screensize(termp, linep, colp)	/* nothing */
+#define _nc_check_screensize(sp, termp, linep, colp)	/* nothing */
 #endif
 #endif /* !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)) */
 
@@ -506,7 +510,7 @@ _nc_get_screensize(SCREEN *sp,
 #endif
 #if HAVE_SIZECHANGE
 	/* try asking the OS */
-	if (NC_ISATTY(cur_term->Filedes)) {
+	if (!NC_ISATTY(cur_term->Filedes)) {
 	    STRUCT_WINSIZE size;
 
 	    errno = 0;
@@ -557,7 +561,7 @@ _nc_get_screensize(SCREEN *sp,
 
 	    _nc_default_screensize(termp, linep, colp);
 	} else {
-	    _nc_check_screensize(termp, linep, colp);
+	    _nc_check_screensize(NCURSES_SP_ARGx termp, linep, colp);
 	}
 
 	/*
@@ -573,7 +577,7 @@ _nc_get_screensize(SCREEN *sp,
 	OldNumber(termp, columns) = (short) (*colp);
 #endif
     } else {
-	_nc_check_screensize(termp, linep, colp);
+	_nc_check_screensize(NCURSES_SP_ARGx termp, linep, colp);
     }
 
     T(("screen size is %dx%d", *linep, *colp));
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 7717fe29e..c1456f7fa 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240330) unstable; urgency=low
+ncurses6 (6.4+20240413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7717fe29e..c1456f7fa 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240330) unstable; urgency=low
+ncurses6 (6.4+20240413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 5337ef8e5..57b91b13d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240330) unstable; urgency=low
+ncurses6 (6.4+20240413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 29 Mar 2024 18:09:01 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
index 2ce22e4fd..8bd49457f 100644
--- a/package/debian/ncurses6.lintian-overrides
+++ b/package/debian/ncurses6.lintian-overrides
@@ -1,17 +1,9 @@
 # This is intentional.
 ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
 
-# This worked around a bug in Debian's build-scripts.
-#ncurses6: latest-debian-changelog-entry-changed-to-native
-
-ncurses6: hardening-no-fortify-functions usr/lib/libncurses++w6.so.6.1
-#ncurses6: hardening-no-fortify-functions usr/lib/libformw6.so.6.1
-ncurses6: hardening-no-fortify-functions usr/lib/libmenuw6.so.6.1
-
 # This is intentional.
 ncurses6: binary-without-manpage
 ncurses6: non-dev-pkg-with-shlib-symlink
-ncurses6: embedded-library ncurses usr/lib/libtinfow6.so.6.1
-#ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
+ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
 
 # vile: confmode
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
index b3ecaa83b..5a1b83bd4 100644
--- a/package/debian/ncursest6.lintian-overrides
+++ b/package/debian/ncursest6.lintian-overrides
@@ -1,17 +1,9 @@
 # This is intentional.
 ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
 
-# This worked around a bug in Debian's build-scripts.
-#ncursest6: latest-debian-changelog-entry-changed-to-native
-
-ncursest6: hardening-no-fortify-functions usr/lib/libncurses++tw6.so.6.1
-#ncursest6: hardening-no-fortify-functions usr/lib/libformtw6.so.6.1
-ncursest6: hardening-no-fortify-functions usr/lib/libmenutw6.so.6.1
-
 # This is intentional.
 ncursest6: binary-without-manpage
 ncursest6: non-dev-pkg-with-shlib-symlink
-ncursest6: embedded-library ncurses usr/lib/libtinfotw6.so.6.1
-#ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
+ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
 
 # vile: confmode
diff --git a/package/debian/rules b/package/debian/rules
index e5b9c3315..648939b22 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,9 +1,16 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.52 2024/01/05 23:34:30 tom Exp $
+# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SHELL = /bin/bash
+DPKG_EXPORT_BUILDFLAGS = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+include /usr/share/dpkg/buildflags.mk
+
 # packages
 PACKAGES.indep = ncurses6-doc ncurses6-doc-html
 PACKAGES.arch  = ncurses6 ncursest6
@@ -25,10 +32,7 @@ MYDATA=/usr/local/ncurses/share/terminfo
 NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI)
 
-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS   += $(CC_NORMAL)
 
 ifneq ($(MY_DIR),/usr)
 	RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR)
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 8175cd3a4..56452b697 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.639 2024/03/29 22:09:01 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.641 2024/04/13 11:28:20 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0330"
+!define VERSION_MMDD  "0413"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 67b438933..72a9ed8c1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240330
+Release: 20240413
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a71558218..732c3452e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240330
+Release: 20240413
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index b39b89e62..c1f96cb2b 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240330
+Release: 20240413
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/Makefile.in b/progs/Makefile.in
index d818af4e8..218e64e0c 100644
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.111 2021/07/03 15:45:33 tom Exp $
+# $Id: Makefile.in,v 1.115 2024/04/08 18:33:54 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -93,7 +93,8 @@ CPP		= @CPP@
 CFLAGS		= @CFLAGS@ @EXTRA_CFLAGS@
 
 INCDIR		= $(top_srcdir)/include
-CPPFLAGS	= -DHAVE_CONFIG_H -I../progs @CPPFLAGS@
+NCUDIR		= $(top_srcdir)/ncurses
+CPPFLAGS	= -DHAVE_CONFIG_H -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
 
 CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
 
@@ -145,10 +146,24 @@ PROGS = $(PUT_PROGS) $(GET_PROGS)
 DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 
 HEADER_DEPS	= \
-	../include/curses.h \
+	$(INCDIR)/nc_access.h \
+	$(INCDIR)/nc_alloc.h \
+	$(INCDIR)/nc_panel.h \
+	$(INCDIR)/nc_string.h \
+	$(INCDIR)/nc_termios.h \
+	$(INCDIR)/nc_tparm.h \
 	$(INCDIR)/term_entry.h \
 	$(INCDIR)/tic.h \
-	$(INCDIR)/nc_alloc.h
+	$(NCUDIR)/curses.priv.h \
+	$(NCUDIR)/new_pair.h \
+	$(NCUDIR)/term.priv.h \
+	$(srcdir)/progs.priv.h \
+	../include/curses.h \
+	../include/ncurses_cfg.h \
+	../include/ncurses_def.h \
+	../include/ncurses_dll.h \
+	../include/term.h \
+	../include/unctrl.h
 
 ################################################################################
 
diff --git a/progs/progs.priv.h b/progs/progs.priv.h
index 00b98d0c6..fea18b8d7 100644
--- a/progs/progs.priv.h
+++ b/progs/progs.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 /*
- * $Id: progs.priv.h,v 1.59 2022/09/17 18:58:05 tom Exp $
+ * $Id: progs.priv.h,v 1.62 2024/04/08 17:28:28 tom Exp $
  *
  *	progs.priv.h
  *
@@ -41,28 +41,9 @@
 #ifndef PROGS_PRIV_H
 #define PROGS_PRIV_H 1
 
-#include <ncurses_cfg.h>
+#include <curses.priv.h>
 
-#if USE_RCS_IDS
-#define MODULE_ID(id) static const char Ident[] = id;
-#else
-#define MODULE_ID(id)		/*nothing */
-#endif
-
-#include <stdlib.h>
 #include <ctype.h>
-#include <string.h>
-#include <sys/types.h>
-
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if HAVE_LIMITS_H
-# include <limits.h>
-#elif HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -90,21 +71,6 @@
 # endif
 #endif
 
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-
-#include <assert.h>
-#include <errno.h>
-
-#if DECL_ERRNO
-extern int errno;
-#endif
-
 #if HAVE_GETOPT_H
 #include <getopt.h>
 #elif !defined(HAVE_GETOPT_HEADER)
@@ -115,28 +81,7 @@ extern char *optarg;
 extern int optind;
 #endif /* HAVE_GETOPT_H */
 
-#undef _NC_WINDOWS
-#if (defined(_WIN32) || defined(_WIN64))
-#define _NC_WINDOWS 1
-#endif
-
-#define NCURSES_INTERNALS 1
-#define NCURSES_OPAQUE    0
-
-#include <curses.h>
-
-#if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT))
-#undef KEY_EVENT		/* reduce compiler-warnings with Visual C++ */
-#endif
-
-#include <term_entry.h>
-#include <nc_termios.h>
 #include <tic.h>
-#include <nc_tparm.h>
-
-#include <nc_string.h>
-#include <nc_alloc.h>
-#include <nc_access.h>
 
 #if HAVE_NC_FREEALL
 #undef ExitProgram
@@ -153,69 +98,6 @@ extern int optind;
 #define ErrCapName	4
 #define ErrSystem(n)	(4 + (n))
 
-#if defined(__GNUC__) && defined(_FORTIFY_SOURCE)
-#define IGNORE_RC(func) errno = (int) func
-#else
-#define IGNORE_RC(func) (void) func
-#endif /* gcc workarounds */
-
-/* usually in <unistd.h> */
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-#ifndef R_OK
-#define	R_OK	4		/* Test for readable.  */
-#endif
-
-#ifndef W_OK
-#define	W_OK	2		/* Test for writable.  */
-#endif
-
-#ifndef X_OK
-#define	X_OK	1		/* Test for executable.  */
-#endif
-
-#ifndef F_OK
-#define	F_OK	0		/* Test for existence.  */
-#endif
-
-/* usually in <unistd.h> */
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
-
-/* may be in limits.h, included from various places */
-#ifndef PATH_MAX
-# if defined(_POSIX_PATH_MAX)
-#  define PATH_MAX _POSIX_PATH_MAX
-# elif defined(MAXPATHLEN)
-#  define PATH_MAX MAXPATHLEN
-# else
-#  define PATH_MAX 255		/* the Posix minimum pathsize */
-# endif
-#endif
-
 /* We use isascii only to guard against use of 7-bit ctype tables in the
  * isprint test in infocmp.
  */
@@ -228,10 +110,6 @@ extern int optind;
 # endif
 #endif
 
-#define UChar(c)    ((unsigned char)(c))
-
-#define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
-
 #define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0))
 
 /*
@@ -252,12 +130,8 @@ extern int optind;
 #define use_verbosity(level) do { set_trace_level(level); } while (0)
 #endif
 
-#define NCURSES_EXT_NUMBERS (NCURSES_EXT_COLORS && HAVE_INIT_EXTENDED_COLOR)
-
-#if NCURSES_EXT_NUMBERS
-#else
-#define _nc_free_termtype2(t) _nc_free_termtype(t)
-#define _nc_read_entry2(n,f,t) _nc_read_entry(n,f,t)
+#ifndef CUR
+#define CUR ((TERMTYPE *)(cur_term))->
 #endif
 
 #endif /* PROGS_PRIV_H */
diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c
index d706c4573..6ae3b673e 100644
--- a/progs/reset_cmd.c
+++ b/progs/reset_cmd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -53,7 +53,7 @@
 #include <sys/ptem.h>
 #endif
 
-MODULE_ID("$Id: reset_cmd.c,v 1.35 2023/11/05 00:02:37 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.37 2024/04/08 17:29:34 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -677,7 +677,7 @@ print_tty_chars(TTY * old_settings, TTY * new_settings)
  * size was set.
  */
 void
-set_window_size(int fd, short *high, short *wide)
+set_window_size(int fd, NCURSES_INT2 *high, NCURSES_INT2 *wide)
 {
     STRUCT_WINSIZE win;
     (void) ioctl(fd, IOCTL_GET_WINSIZE, &win);
diff --git a/progs/reset_cmd.h b/progs/reset_cmd.h
index 91a637c7e..43aee28f7 100644
--- a/progs/reset_cmd.h
+++ b/progs/reset_cmd.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 2016 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: reset_cmd.h,v 1.9 2021/10/02 20:58:58 tom Exp $
+ * $Id: reset_cmd.h,v 1.11 2024/04/08 17:29:34 tom Exp $
  *
  * Utility functions for resetting terminal.
  */
@@ -56,7 +56,7 @@ extern void set_control_chars(TTY * /* tty_settings */, int /* erase */, int /*
 extern void set_conversions(TTY * /* tty_settings */);
 
 #if HAVE_SIZECHANGE
-extern void set_window_size(int /* fd */, short * /* high */, short * /* wide */);
+extern void set_window_size(int /* fd */, NCURSES_INT2 * /* high */, NCURSES_INT2 * /* wide */);
 #endif
 
 extern const char *_nc_progname;
diff --git a/progs/tset.c b/progs/tset.c
index 5255ef476..8bc502a36 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.132 2024/03/17 00:15:54 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.134 2024/04/13 18:59:53 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -882,9 +882,7 @@ main(int argc, char **argv)
 
 		    (void) putc('\r', stderr);
 		    (void) fflush(stderr);
-		    if (isatty(my_fd)
-			&& (name = ttyname(my_fd)) != NULL
-			&& strncmp(name, "/dev/pts/", 9)) {
+		    if (IsRealTty(my_fd, name)) {
 			(void) napms(1000);	/* Settle the terminal. */
 		    }
 		}

From 92a1b9fb4e805871f6e3a6c6bd7e1de45975b957 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 15 Apr 2024 00:22:15 +0200
Subject: [PATCH 061/106] ncurses-6.4-20240414.patch

---
 NEWS                             |  6 ++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 ncurses/tinfo/lib_setup.c        | 38 +++++++++++++++++++++++---------
 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, 47 insertions(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index 974a2e0eb..588c4cfea 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4107 2024/04/14 00:19:51 tom Exp $
+-- $Id: NEWS,v 1.4109 2024/04/14 09:43:45 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240414
+	+ build/bug-fix for check-size feature (reports by Sam James, Gabriele
+	  Balducci).
+
 20240413
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ provide for padding in check-size feature, using new_prescr() to
diff --git a/VERSION b/VERSION
index e327a6fec..6600dc86f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240413
+5:0:10	6.4	20240414
diff --git a/dist.mk b/dist.mk
index e5cd16916..3af9726d4 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1606 2024/04/13 11:28:20 tom Exp $
+# $Id: dist.mk,v 1.1607 2024/04/14 08:48:20 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240413
+NCURSES_PATCH = 20240414
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 7231ac671..f1e6c1a2b 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.235 2024/04/13 20:35:14 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.239 2024/04/14 17:03:40 tom Exp $")
 
 /****************************************************************************
  *
@@ -364,12 +364,25 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 static bool
 set_position(NCURSES_SP_DCLx TERMINAL *termp, int row, int col)
 {
-    bool result = FALSE;
+    bool result;
     char *actual = TIPARM_2(cursor_address, row, col);
     T((T_CALLED("set_position %d,%d)"), row, col));
-    if (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position", actual) == OK)
-	result = TRUE;
+#if NCURSES_SP_FUNCS
+    result = (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position",
+					 actual) == OK);
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+#else
+    /* This does not support padding because without sp-funcs, we have only
+     * the interface using stdio, but we are not guaranteed that Filedes
+     * is the same as fileno(stdout).
+     */
+    result = FALSE;
+    if (actual != NULL) {
+	size_t want = strlen(actual);
+	int have = (int) write(termp->Filedes, actual, want);
+	result = ((int) want == have);
+    }
+#endif
     returnBool(result);
 }
 
@@ -390,11 +403,11 @@ set_position(NCURSES_SP_DCLx TERMINAL *termp, int row, int col)
  * So we do a simple check to exclude pseudo-terminals.
  */
 static void
-_nc_check_screensize(NCURSES_SP_DCLx TERMINAL *termp, int *linep, int *colp)
+_nc_check_screensize(SCREEN *sp, TERMINAL *termp, int *linep, int *colp)
 {
     int fd = termp->Filedes;
     TTY saved;
-    const char *name;
+    const char *name = NULL;
 
     if (IsRealTty(fd, name)
 	&& VALID_STRING(cursor_address)
@@ -412,9 +425,11 @@ _nc_check_screensize(NCURSES_SP_DCLx TERMINAL *termp, int *linep, int *colp)
 	    sp->_term = termp;
 	    NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);
 	}
+#else
+	(void) sp;
 #endif
 
-	T(("checking screensize of %s", name));
+	T(("trying CPR (u7/u6) with %s", name));
 	alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN);
 	alter.c_iflag &= (unsigned) ~(IXON | BRKINT | PARMRK);
 	alter.c_cc[VMIN] = 0;
@@ -430,6 +445,9 @@ _nc_check_screensize(NCURSES_SP_DCLx TERMINAL *termp, int *linep, int *colp)
 	}
 	/* restore tty modes */
 	SET_TTY(fd, &saved);
+    } else {
+	T(("NOT trying CPR with fd %d (%s): %s",
+	   fd, NonNull(name), NC_ISATTY(fd) ? "tty" : "not a tty"));
     }
 
     _nc_default_screensize(termp, linep, colp);
@@ -510,7 +528,7 @@ _nc_get_screensize(SCREEN *sp,
 #endif
 #if HAVE_SIZECHANGE
 	/* try asking the OS */
-	if (!NC_ISATTY(cur_term->Filedes)) {
+	if (NC_ISATTY(cur_term->Filedes)) {
 	    STRUCT_WINSIZE size;
 
 	    errno = 0;
@@ -561,7 +579,7 @@ _nc_get_screensize(SCREEN *sp,
 
 	    _nc_default_screensize(termp, linep, colp);
 	} else {
-	    _nc_check_screensize(NCURSES_SP_ARGx termp, linep, colp);
+	    _nc_check_screensize(sp, termp, linep, colp);
 	}
 
 	/*
@@ -577,7 +595,7 @@ _nc_get_screensize(SCREEN *sp,
 	OldNumber(termp, columns) = (short) (*colp);
 #endif
     } else {
-	_nc_check_screensize(NCURSES_SP_ARGx termp, linep, colp);
+	_nc_check_screensize(sp, termp, linep, colp);
     }
 
     T(("screen size is %dx%d", *linep, *colp));
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index c1456f7fa..088ed45c3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240413) unstable; urgency=low
+ncurses6 (6.4+20240414) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index c1456f7fa..088ed45c3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240413) unstable; urgency=low
+ncurses6 (6.4+20240414) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 57b91b13d..3c4053019 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240413) unstable; urgency=low
+ncurses6 (6.4+20240414) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2024 07:28:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 56452b697..eb57e1dc4 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.641 2024/04/13 11:28:20 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.642 2024/04/14 08:48:20 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0413"
+!define VERSION_MMDD  "0414"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 72a9ed8c1..31ce59961 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240413
+Release: 20240414
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 732c3452e..c02876c9c 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240413
+Release: 20240414
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c1f96cb2b..9903f058f 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240413
+Release: 20240414
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 0aff2f2fb232af25dcdc9558f707a6e2bd6219a6 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 21 Apr 2024 01:45:24 +0200
Subject: [PATCH 062/106] ncurses-6.4-20240420.patch

---
 NEWS                                   |   6 +-
 VERSION                                |   2 +-
 dist.mk                                |   4 +-
 doc/html/man/adacursesw6-config.1.html |   8 +-
 doc/html/man/curs_add_wch.3x.html      |  18 +-
 doc/html/man/curs_add_wchstr.3x.html   |  15 +-
 doc/html/man/curs_addch.3x.html        |  24 +-
 doc/html/man/curs_addchstr.3x.html     |  15 +-
 doc/html/man/curs_addstr.3x.html       |  15 +-
 doc/html/man/curs_addwstr.3x.html      |  15 +-
 doc/html/man/curs_attr.3x.html         |  76 +--
 doc/html/man/curs_beep.3x.html         |  12 +-
 doc/html/man/curs_bkgd.3x.html         |  10 +-
 doc/html/man/curs_bkgrnd.3x.html       |  10 +-
 doc/html/man/curs_border.3x.html       |  17 +-
 doc/html/man/curs_border_set.3x.html   |  17 +-
 doc/html/man/curs_clear.3x.html        |  10 +-
 doc/html/man/curs_color.3x.html        |  12 +-
 doc/html/man/curs_delch.3x.html        |  49 +-
 doc/html/man/curs_deleteln.3x.html     |  14 +-
 doc/html/man/curs_get_wch.3x.html      |  31 +-
 doc/html/man/curs_get_wstr.3x.html     |  49 +-
 doc/html/man/curs_getcchar.3x.html     |  46 +-
 doc/html/man/curs_getch.3x.html        |  86 +--
 doc/html/man/curs_getstr.3x.html       |  95 ++--
 doc/html/man/curs_getyx.3x.html        |  12 +-
 doc/html/man/curs_in_wch.3x.html       |  35 +-
 doc/html/man/curs_in_wchstr.3x.html    |  23 +-
 doc/html/man/curs_inch.3x.html         |  37 +-
 doc/html/man/curs_inchstr.3x.html      |  25 +-
 doc/html/man/curs_initscr.3x.html      |  14 +-
 doc/html/man/curs_ins_wch.3x.html      |  14 +-
 doc/html/man/curs_ins_wstr.3x.html     |  29 +-
 doc/html/man/curs_insch.3x.html        |  22 +-
 doc/html/man/curs_insstr.3x.html       |  29 +-
 doc/html/man/curs_instr.3x.html        |  25 +-
 doc/html/man/curs_inwstr.3x.html       |  27 +-
 doc/html/man/curs_kernel.3x.html       |  14 +-
 doc/html/man/curs_mouse.3x.html        |  35 +-
 doc/html/man/curs_move.3x.html         |  30 +-
 doc/html/man/curs_outopts.3x.html      |  29 +-
 doc/html/man/curs_overlay.3x.html      |  16 +-
 doc/html/man/curs_pad.3x.html          |  16 +-
 doc/html/man/curs_printw.3x.html       |  16 +-
 doc/html/man/curs_refresh.3x.html      |  10 +-
 doc/html/man/curs_scanw.3x.html        |  16 +-
 doc/html/man/curs_scr_dump.3x.html     |  10 +-
 doc/html/man/curs_scroll.3x.html       |  10 +-
 doc/html/man/curs_slk.3x.html          |  12 +-
 doc/html/man/curs_sp_funcs.3x.html     |  22 +-
 doc/html/man/curs_termattrs.3x.html    |  24 +-
 doc/html/man/curs_termcap.3x.html      |  20 +-
 doc/html/man/curs_touch.3x.html        |  16 +-
 doc/html/man/curs_trace.3x.html        |  20 +-
 doc/html/man/curs_util.3x.html         |  30 +-
 doc/html/man/curs_window.3x.html       |  10 +-
 doc/html/man/form_driver.3x.html       |  10 +-
 doc/html/man/legacy_coding.3x.html     |  48 +-
 doc/html/man/ncurses.3x.html           | 397 +++++++-------
 doc/html/man/ncursesw6-config.1.html   |   8 +-
 doc/html/man/tabs.1.html               |  51 +-
 doc/html/man/term.5.html               |  14 +-
 doc/html/man/terminfo.5.html           |  40 +-
 doc/html/man/toe.1m.html               |  16 +-
 doc/html/man/tput.1.html               |  14 +-
 doc/html/man/tset.1.html               |  26 +-
 include/Caps                           |  10 +-
 include/Caps.aix4                      |  10 +-
 include/Caps.hpux11                    |  10 +-
 include/Caps.keys                      |  10 +-
 include/Caps.osf1r5                    |  10 +-
 include/Caps.uwin                      |  10 +-
 man/MKada_config.in                    |  21 +-
 man/MKncu_config.in                    |   4 +-
 man/curs_add_wch.3x                    |  14 +-
 man/curs_add_wchstr.3x                 |  14 +-
 man/curs_addch.3x                      |  25 +-
 man/curs_addchstr.3x                   |  14 +-
 man/curs_addstr.3x                     |  16 +-
 man/curs_addwstr.3x                    |  16 +-
 man/curs_attr.3x                       |  23 +-
 man/curs_beep.3x                       |   6 +-
 man/curs_bkgd.3x                       |   7 +-
 man/curs_bkgrnd.3x                     |   7 +-
 man/curs_border.3x                     |  14 +-
 man/curs_border_set.3x                 |  14 +-
 man/curs_clear.3x                      |   6 +-
 man/curs_color.3x                      |   6 +-
 man/curs_delch.3x                      |  75 ++-
 man/curs_deleteln.3x                   |   6 +-
 man/curs_get_wch.3x                    |  21 +-
 man/curs_get_wstr.3x                   |  12 +-
 man/curs_getcchar.3x                   |  36 +-
 man/curs_getch.3x                      | 110 ++--
 man/curs_getstr.3x                     |  12 +-
 man/curs_getyx.3x                      |   6 +-
 man/curs_in_wch.3x                     |  26 +-
 man/curs_in_wchstr.3x                  |  14 +-
 man/curs_inch.3x                       |  14 +-
 man/curs_inchstr.3x                    |  14 +-
 man/curs_initscr.3x                    |   8 +-
 man/curs_ins_wch.3x                    |  13 +-
 man/curs_ins_wstr.3x                   |  18 +-
 man/curs_insch.3x                      |  40 +-
 man/curs_insstr.3x                     |  14 +-
 man/curs_instr.3x                      |  14 +-
 man/curs_inwstr.3x                     |  14 +-
 man/curs_kernel.3x                     |   8 +-
 man/curs_mouse.3x                      |  29 +-
 man/curs_move.3x                       |  68 ++-
 man/curs_outopts.3x                    |  13 +-
 man/curs_overlay.3x                    |   6 +-
 man/curs_pad.3x                        |   6 +-
 man/curs_printw.3x                     |  18 +-
 man/curs_refresh.3x                    |   6 +-
 man/curs_scanw.3x                      |  23 +-
 man/curs_scr_dump.3x                   |   7 +-
 man/curs_scroll.3x                     |   7 +-
 man/curs_slk.3x                        |   7 +-
 man/curs_sp_funcs.3x                   |  18 +-
 man/curs_termattrs.3x                  |  18 +-
 man/curs_termcap.3x                    |  10 +-
 man/curs_touch.3x                      |  10 +-
 man/curs_trace.3x                      |  12 +-
 man/curs_util.3x                       |  18 +-
 man/curs_window.3x                     |   6 +-
 man/form_driver.3x                     |   6 +-
 man/legacy_coding.3x                   |  73 ++-
 man/manhtml.externs                    |   3 +-
 man/manlinks.sed                       |   3 +-
 man/ncurses.3x                         | 711 +++++++++++++++++--------
 man/tabs.1                             |  11 +-
 man/term.5                             |   6 +-
 man/terminfo.head                      |  10 +-
 man/terminfo.tail                      |  14 +-
 man/toe.1m                             |  15 +-
 man/tput.1                             |  13 +-
 man/tset.1                             |  28 +-
 ncurses/base/resizeterm.c              |   8 +-
 ncurses/tinfo/lib_setup.c              |   4 +-
 ncurses/tinfo/write_entry.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 +-
 package/ncursest.spec                  |   2 +-
 progs/tput.c                           |  10 +-
 progs/tset.c                           |   8 +-
 150 files changed, 2155 insertions(+), 1750 deletions(-)

diff --git a/NEWS b/NEWS
index 588c4cfea..7a5ca227d 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4109 2024/04/14 09:43:45 tom Exp $
+-- $Id: NEWS,v 1.4111 2024/04/20 21:37:56 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240420
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ compiler warning/portability fixes.
+
 20240414
 	+ build/bug-fix for check-size feature (reports by Sam James, Gabriele
 	  Balducci).
diff --git a/VERSION b/VERSION
index 6600dc86f..2afdc1a7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240414
+5:0:10	6.4	20240420
diff --git a/dist.mk b/dist.mk
index 3af9726d4..d7360f7cb 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1607 2024/04/14 08:48:20 tom Exp $
+# $Id: dist.mk,v 1.1608 2024/04/20 10:17:21 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 4
-NCURSES_PATCH = 20240414
+NCURSES_PATCH = 20240420
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html
index e6c0dd798..3c61feef1 100644
--- a/doc/html/man/adacursesw6-config.1.html
+++ b/doc/html/man/adacursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.32 2023/12/16 21:42:53 tom Exp @
+  * @Id: MKada_config.in,v 1.34 2024/04/20 21:13:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>adacursesw6\-config 1 2023-12-16 ncurses 6.4 User commands</TITLE>
+<TITLE>adacursesw6\-config 1 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">adacursesw6\-config 1 2023-12-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacursesw6\-config 1 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>            User commands           <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">adacursesw6\-config 1 2023-12-16 ncurses 6.4 User commands
 
 
 
-ncurses 6.4                       2023-12-16             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2024-04-20             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 25160dd16..6b90bd0f4 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.59 2024/04/13 22:11:52 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -217,9 +217,8 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
            sequence of bytes, or if it is not  possible  to  add  all  of  the
            resulting bytes in the window, an error is returned.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -227,9 +226,8 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       defaults specified for  line-drawing  characters  apply  in  the  POSIX
-       locale.
+       These functions are described in X/Open Curses, Issue 4.  The  defaults
+       specified for line-drawing characters apply in the POSIX locale.
 
 
 </PRE><H3><a name="h3-WACS-Symbols">WACS Symbols</a></H3><PRE>
@@ -330,7 +328,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index e4020ef68..aa3ebaf52 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -104,9 +104,8 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H
 
        <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -114,7 +113,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -125,7 +124,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-04-13               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 1284f5702..2c6c418b1 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.83 2024/04/13 22:23:35 tom Exp @
+  * @Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -183,9 +183,8 @@ <H1 class="no-header">curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        enabled  in  that  event,  because  it is not possible to wrap to a new
        line.
 
-       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
-       functions) if the <EM>WINDOW</EM> pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -193,9 +192,14 @@ <H1 class="no-header">curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error  conditions  for  them.  The defaults specified for forms-drawing
-       characters apply in the POSIX locale.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
+
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       value other than <STRONG>ERR</STRONG>".
+
+       The  defaults specified for forms-drawing characters apply in the POSIX
+       locale.
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
@@ -296,7 +300,7 @@ <H1 class="no-header">curs_addch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index fe12b9900..8f3b5b683 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.42 2024/04/13 22:21:16 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -97,9 +97,8 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -107,7 +106,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -118,7 +117,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 781ad8a2e..ba4c12dfc 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.43 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_addstr.3x,v 1.45 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -89,9 +89,8 @@ <H1 class="no-header">curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> call returns an error.
 
-       Functions  with  a  "mv"  prefix  first  perform  cursor movement using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
-       functions) if the <EM>WINDOW</EM> pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -103,14 +102,14 @@ <H1 class="no-header">curs_addstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 9cc8cd0a1..28199cc21 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.35 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.37 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -96,9 +96,8 @@ <H1 class="no-header">curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns an error.
 
-       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
-       functions) if the <EM>WINDOW</EM> pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -110,14 +109,14 @@ <H1 class="no-header">curs_addwstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 2742e4cf0..63d9fb25b 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.99 2024/03/16 15:38:33 tom Exp @
+  * @Id: curs_attr.3x,v 1.103 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -253,74 +253,73 @@ <H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   does  not  return an error if either of the parameters of <STRONG>wattr_get</STRONG>
            used for retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>)
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        These functions may be macros:
 
-              <STRONG>attroff</STRONG>, <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>,  <STRONG>standend</STRONG>
+              <STRONG>attroff</STRONG>,  <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>standend</STRONG>
               and <STRONG>standout</STRONG>.
 
-       Color  pair  values can only be OR'd with attributes if the pair number
+       Color pair values can only be OR'd with attributes if the  pair  number
        is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can pass a
        color pair value directly.  However, <EM>ncurses</EM> ABI 4 and 5 simply OR this
-       value within the alternate functions.  You must use <EM>ncurses</EM>  ABI  6  to
+       value  within  the  alternate functions.  You must use <EM>ncurses</EM> ABI 6 to
        support more than 256 color pairs.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        This implementation provides the <STRONG>A_ITALIC</STRONG> attribute for terminals which
-       have  the  <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and   <STRONG>exit_italics_mode</STRONG>   (<STRONG>ritm</STRONG>)
-       capabilities.   Italics are not mentioned in X/Open Curses.  Unlike the
-       other video attributes, <STRONG>A_ITALIC</STRONG> is  unrelated  to  the  <STRONG>set_attributes</STRONG>
-       capabilities.    This   implementation   makes   the   assumption  that
+       have   the   <STRONG>enter_italics_mode</STRONG>  (<STRONG>sitm</STRONG>)  and  <STRONG>exit_italics_mode</STRONG>  (<STRONG>ritm</STRONG>)
+       capabilities.  Italics are not mentioned in X/Open Curses.  Unlike  the
+       other  video  attributes,  <STRONG>A_ITALIC</STRONG>  is unrelated to the <STRONG>set_attributes</STRONG>
+       capabilities.   This   implementation   makes   the   assumption   that
        <STRONG>exit_attribute_mode</STRONG> may also reset italics.
 
-       Each of the functions added by XSI Curses has a parameter  <EM>opts</EM>,  which
-       X/Open  Curses  still  (after  more  than  twenty  years)  documents as
+       Each  of  the functions added by XSI Curses has a parameter <EM>opts</EM>, which
+       X/Open Curses  still  (after  more  than  twenty  years)  documents  as
        reserved  for  future  use,  saying  that  it  should  be  <STRONG>NULL</STRONG>.   This
-       implementation  uses  that  parameter  in ABI 6 for the functions which
+       implementation uses that parameter in ABI 6  for  the  functions  which
        have a color pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
        <STRONG>o</STRONG>   For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
-           if  <EM>opts</EM>  is set it is treated as a pointer to <STRONG>int</STRONG>, and used to set
+           if <EM>opts</EM> is set it is treated as a pointer to <STRONG>int</STRONG>, and used  to  set
            the color pair instead of the <STRONG>short</STRONG> <EM>pair</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which retrieve the color, e.g., <STRONG>wattr_get</STRONG>, if <EM>opts</EM> is
-           set  it  is  treated  as a pointer to <STRONG>int</STRONG>, and used to retrieve the
-           color pair as an <STRONG>int</STRONG> value, in addition to retrieving  it  via  the
+           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
+           color  pair  as  an <STRONG>int</STRONG> value, in addition to retrieving it via the
            standard pointer to <STRONG>short</STRONG> parameter.
 
-       <STRONG>o</STRONG>   For  functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the <EM>opts</EM>
+       <STRONG>o</STRONG>   For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the  <EM>opts</EM>
            parameter is ignored except except to check that it is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  defined  the dedicated type for highlights, <STRONG>attr_t</STRONG>, which was
-       not defined in SVr4 curses.  The functions taking <STRONG>attr_t</STRONG> arguments were
-       not supported under SVr4.
+       These  functions are described in X/Open Curses, Issue 4.  The standard
+       defined the dedicated  type  for  highlights,  <STRONG>attr_t</STRONG>,  which  was  not
+       defined in SVr4 curses.  The functions taking <STRONG>attr_t</STRONG> arguments were not
+       supported under SVr4.
 
        Very old versions of this library did not force an update of the screen
-       when changing the attributes.  Use <STRONG>touchwin</STRONG>  to  force  the  screen  to
+       when  changing  the  attributes.   Use  <STRONG>touchwin</STRONG> to force the screen to
        match the updated attributes.
 
-       The  XSI  Curses standard states that whether the traditional functions
-       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG> can manipulate attributes  other  than  <STRONG>A_BLINK</STRONG>,
-       <STRONG>A_BOLD</STRONG>,  <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is "unspecified".
-       Under this implementation as  well  as  SVr4  curses,  these  functions
-       correctly  manipulate all other highlights (specifically, <STRONG>A_ALTCHARSET</STRONG>,
+       X/Open  Curses  states   that   whether   the   traditional   functions
+       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG>  can  manipulate  attributes other than <STRONG>A_BLINK</STRONG>,
+       <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is  "unspecified".
+       Under  this  implementation  as  well  as  SVr4 curses, these functions
+       correctly manipulate all other highlights (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
        <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
 
-       XSI Curses added these entry points:
+       X/Open Curses added these entry points:
 
               <STRONG>attr_get</STRONG>,  <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>,  <STRONG>wattr_on</STRONG>,  <STRONG>wattr_off</STRONG>,
               <STRONG>wattr_get</STRONG>, <STRONG>wattr_set</STRONG>
 
-       The  new  functions are intended to work with a new series of highlight
+       The new functions are intended to work with a new series  of  highlight
        macros prefixed with <STRONG>WA_</STRONG>.  The older macros have direct counterparts in
        the newer set of names:
 
@@ -336,11 +335,12 @@ <H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
               <STRONG>WA_ALTCHARSET</STRONG>   Alternate character set
 
-       XSI  curses  does not assign values to these symbols, nor does it state
-       whether or not they are related to the similarly-named A_NORMAL, etc.:
+       X/Open Curses does not assign values to  these  symbols,  nor  does  it
+       state  whether or not they are related to the similarly-named A_NORMAL,
+       etc.:
 
-       <STRONG>o</STRONG>   The XSI curses standard specifies that each pair  of  corresponding
-           <STRONG>A_</STRONG>  and  <STRONG>WA_</STRONG>-using functions operates on the same current-highlight
+       <STRONG>o</STRONG>   X/Open Curses specifies that each  pair  of  corresponding  <STRONG>A_</STRONG>  and
+           <STRONG>WA_</STRONG>-using   functions   operates   on  the  same  current-highlight
            information.
 
        <STRONG>o</STRONG>   However, in some  implementations,  those  symbols  have  unrelated
@@ -364,7 +364,7 @@ <H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
            This is consistent with SVr4 curses; X/Open Curses does not specify
            this.
 
-       The  XSI  standard  extended  conformance  level  adds  new  highlights
+       The  X/Open  Curses  extended  conformance  level  adds  new highlights
        <STRONG>A_HORIZONTAL</STRONG>,  <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>   (and
        corresponding  <STRONG>WA_</STRONG>  macros  for  each).   As  of  August 2013, no known
        terminal provides these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 474522879..1f009d8c1 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.27 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -77,8 +77,8 @@ <H1 class="no-header">curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the  XSI  Curses  standard,  Issue  4.
-       Like SVr4, it specifies that they always return <STRONG>OK</STRONG>.
+       These functions are described in X/Open Curses, Issue 4.  Like SVr4, it
+       specifies that they always return <STRONG>OK</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index ba9e68546..fca843e4c 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.59 2024/03/23 19:58:58 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -163,7 +163,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue 4, describes these functions.  It specifies that
+       X/Open  Curses,  Issue  4 describes these functions.  It specifies that
        <STRONG>bkgd</STRONG>, <STRONG>wbkgd</STRONG>, and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> on failure  (in  the  case  of  the
        last,  this  value  is  cast  to  <EM>chtype</EM>),  but  describes  no  failure
        conditions.
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 97878f91c..6f2742de2 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.40 2024/03/23 19:59:45 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -162,7 +162,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
        X/Open Curses does not provide details of how the rendition is updated.
@@ -177,7 +177,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 56d76bd74..8ca35f214 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.46 2024/03/16 15:38:43 tom Exp @
+  * @Id: curs_border.3x,v 1.49 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -121,20 +121,19 @@ <H1 class="no-header">curs_border 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        X/Open  Curses  does  not   specify   any   error   conditions.    This
        implementation returns an error if the window pointer is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  borders  generated  by these functions are <EM>inside</EM> borders (this is
+       The borders generated by these functions are <EM>inside</EM>  borders  (this  is
        also true of SVr4 curses, though the fact is not documented).
 
        Note that <STRONG>border</STRONG> and <STRONG>box</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -142,7 +141,7 @@ <H1 class="no-header">curs_border 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index ad00d4ee9..77e10da17 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_border_set.3x,v 1.36 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -146,18 +146,17 @@ <H1 class="no-header">curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</H
 
        Functions using a window parameter return an error if it is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note    that    <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,   <STRONG>mvhline_set</STRONG>,   <STRONG>mvvline_set</STRONG>,
+       Note   that   <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,    <STRONG>mvhline_set</STRONG>,    <STRONG>mvvline_set</STRONG>,
        <STRONG>mvwhline_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -165,7 +164,7 @@ <H1 class="no-header">curs_border_set 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 2eb714ef1..7475334cd 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_clear.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
        The SVr4.0 manual says that these functions could  return  "or  a  non-
        negative  integer  if <STRONG>immedok</STRONG> is set", referring to the return-value of
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index de3fff15b..dc4505fba 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.98 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_color.3x,v 1.100 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -463,8 +463,8 @@ <H1 class="no-header">curs_color 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       This  implementation satisfies XSI Curses's minimum maximums for <STRONG>COLORS</STRONG>
-       and <STRONG>COLOR_PAIRS</STRONG>.
+       This  implementation  satisfies  X/Open  Curses's  minimum maximums for
+       <STRONG>COLORS</STRONG> and <STRONG>COLOR_PAIRS</STRONG>.
 
        The  <STRONG>init_pair</STRONG>  routine  accepts  negative  values  of  foreground  and
        background  color  to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 2b385da7f..d8fcfde0e 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>delch</STRONG>,  <STRONG>wdelch</STRONG>,  <STRONG>mvdelch</STRONG>, <STRONG>mvwdelch</STRONG> - delete the character at the cursor
-       in a <EM>curses</EM> window
+       <STRONG>delch</STRONG>,  <STRONG>wdelch</STRONG>,  <STRONG>mvdelch</STRONG>,  <STRONG>mvwdelch</STRONG>  - delete a character from a <EM>curses</EM>
+       window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -61,32 +61,37 @@ <H1 class="no-header">curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines delete the character under the cursor; all characters to
-       the  right  of  the  cursor  on the same line are moved to the left one
-       position and the last character on the line is  filled  with  a  blank.
-       The  cursor  position  does  not  change  (after  moving  to  <EM>y</EM>,  <EM>x</EM>, if
-       specified).  (This does not imply use of the hardware delete  character
-       feature.)
+       <STRONG>wdelch</STRONG>  deletes  the  character  at  the  cursor   position   in   <EM>win</EM>.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
+
+       <STRONG>wdelch</STRONG> moves all characters to the right of the cursor on the same line
+       to the left one position and replaces the  contents  of  the  rightmost
+       position  on  the  line with the window's blank character; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG>
+       (wide-character API users may consult <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG> instead).  The  cursor
+       position does not change (after moving to (<EM>y</EM>, <EM>x</EM>), if specified).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines  return  the  integer  <STRONG>ERR</STRONG>  upon  failure and an <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>delch</STRONG>, <STRONG>mvdelch</STRONG>, and <STRONG>mvwdelch</STRONG> may be macros.
+       <STRONG>delch</STRONG>, <STRONG>mvdelch</STRONG>, and <STRONG>mvwdelch</STRONG> may be implemented as macros.
+
+       A terminal's <STRONG>delete_character</STRONG>  (<STRONG>dch1</STRONG>)  capability  is  not  necessarily
+       employed.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard specifies that they return <STRONG>ERR</STRONG> on failure,  but  specifies  no
-       error conditions.
+       X/Open Curses, Issue 4 describes these functions.
+
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       value other than <STRONG>ERR</STRONG>".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -94,7 +99,7 @@ <H1 class="no-header">curs_delch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 387479dd2..c286245de 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -99,9 +99,9 @@ <H1 class="no-header">curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  specifies  that  they return <STRONG>ERR</STRONG> on failure, but specifies no
-       error conditions.
+       These functions are described in X/Open Curses, Issue 4.  The  standard
+       specifies  that  they  return  <STRONG>ERR</STRONG>  on  failure, but specifies no error
+       conditions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 0b5c41fac..788a90211 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.38 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -59,7 +59,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>mvget_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwget_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>unget_wch(const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>unget_wch(const</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -119,9 +119,8 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
            to <STRONG>EINTR</STRONG>.
 
-       Functions with a  "mv"  prefix  first  perform  cursor  movement  using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
-       functions) if the <EM>win</EM> parameter is a null pointer.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
        <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
        input queue.
@@ -133,14 +132,14 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
        as macros.
 
-       Unlike <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>, <STRONG>wget_wch</STRONG> and its variants store  the  value  of  the
-       input  character  in  an additional <EM>wch</EM> parameter instead of the return
+       Unlike  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,  <STRONG>wget_wch</STRONG>  and  its variants store the value of the
+       input character in an additional <EM>wch</EM> parameter instead  of  the  return
        value.
 
-       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish  function  key   codes
-       <STRONG>wget_wch</STRONG>   from  conventional  character  codes.   An  application  can
+       Unlike   <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish  function  key  codes
+       <STRONG>wget_wch</STRONG>  from  conventional  character  codes.   An  application   can
        overcome this limitation by pushing function key codes with <STRONG>ungetch</STRONG> and
-       subsequently  checking  the  return  value of <STRONG>wget_wch</STRONG> for a match with
+       subsequently checking the return value of <STRONG>wget_wch</STRONG>  for  a  match  with
        <STRONG>KEY_CODE_YES</STRONG>.
 
 
@@ -152,10 +151,10 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
+       See  the  "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding the interaction
        of <STRONG>wget_wch</STRONG> with signal handlers.
 
 
@@ -163,12 +162,12 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 612908318..efb825e5c 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.46 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.48 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -125,20 +125,19 @@ <H1 class="no-header">curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the associated call to <STRONG>wget_wch</STRONG> failed.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
 
-       Using  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to read a line
-       that overflows the array pointed to by <STRONG>wstr</STRONG> causes  undefined  results.
-       The   use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or  <STRONG>wgetn_wstr</STRONG>,
+       Using <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to  read  a  line
+       that  overflows  the array pointed to by <STRONG>wstr</STRONG> causes undefined results.
+       The  use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or   <STRONG>wgetn_wstr</STRONG>,
        respectively, is recommended.
 
-       These functions cannot return <STRONG>KEY_</STRONG> values because there is  no  way  to
+       These  functions  cannot  return <STRONG>KEY_</STRONG> values because there is no way to
        distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.
 
 
@@ -146,51 +145,51 @@ <H1 class="no-header">curs_get_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
 
-       This implementation returns <STRONG>ERR</STRONG> if the window pointer is  null,  or  if
-       the  lower-level  <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter case, an
-       <STRONG>ERR</STRONG> return without other data is treated as an  end-of-file  condition,
+       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
+       the lower-level <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter  case,  an
+       <STRONG>ERR</STRONG>  return  without other data is treated as an end-of-file condition,
        and the returned array contains a <STRONG>WEOF</STRONG> followed by a null <STRONG>wchar_t</STRONG>.
 
        X/Open curses documented these functions to pass an array of <STRONG>wchar_t</STRONG> in
        1997, but that was an error because of this part of the description:
 
               The effect of <STRONG>get_wstr</STRONG> is as though a series of calls to <STRONG>get_wch</STRONG>
-              were  made, until a newline character, end-of-line character, or
+              were made, until a newline character, end-of-line character,  or
               end-of-file character is processed.
 
-       The latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while  <STRONG>wchar_t</STRONG>
-       is  a  unsigned  type.  All of the vendors implement this using <STRONG>wint_t</STRONG>,
+       The  latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while <STRONG>wchar_t</STRONG>
+       is a unsigned type.  All of the vendors implement  this  using  <STRONG>wint_t</STRONG>,
        following the standard.
 
        X/Open  Curses,  Issue  7  (2009)  is  unclear  regarding  whether  the
-       terminating  <EM>null</EM>  <STRONG>wchar_t</STRONG>  value is counted in the length parameter <EM>n</EM>.
+       terminating <EM>null</EM> <STRONG>wchar_t</STRONG> value is counted in the  length  parameter  <EM>n</EM>.
        X/Open  Curses,  Issue  7  revised  the  corresponding  description  of
-       <STRONG>wgetnstr</STRONG>   to   address  this  issue.   The  unrevised  description  of
-       <STRONG>wget_nwstr</STRONG> can be interpreted either way.  This  implementation  counts
+       <STRONG>wgetnstr</STRONG>  to  address  this  issue.   The  unrevised   description   of
+       <STRONG>wget_nwstr</STRONG>  can  be interpreted either way.  This implementation counts
        the terminator in the length.
 
-       X/Open  Curses  does  not  specify  what  happens  if  the  length <EM>n</EM> is
+       X/Open Curses does  not  specify  what  happens  if  the  length  <EM>n</EM>  is
        negative.
 
-       <STRONG>o</STRONG>   For analogy with <STRONG>wgetnstr</STRONG>, <EM>ncurses</EM>  6.2  uses  a  limit  (based  on
+       <STRONG>o</STRONG>   For  analogy  with  <STRONG>wgetnstr</STRONG>,  <EM>ncurses</EM>  6.2  uses a limit (based on
            <STRONG>LINE_MAX</STRONG>).
 
-       <STRONG>o</STRONG>   Some  other  implementations (such as Solaris xcurses) do the same,
+       <STRONG>o</STRONG>   Some other implementations (such as Solaris xcurses) do  the  same,
            while others (PDCurses) do not allow this.
 
-       <STRONG>o</STRONG>   NetBSD 7 curses imitates <EM>ncurses</EM> 6.1 in this regard, treating a  <STRONG>-1</STRONG>
+       <STRONG>o</STRONG>   NetBSD  7 curses imitates <EM>ncurses</EM> 6.1 in this regard, treating a <STRONG>-1</STRONG>
            as an indefinite number of characters.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 270263f03..91ee4e836 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.47 2024/04/13 22:08:22 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.49 2024/04/20 18:55:09 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -55,15 +55,15 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>getcchar(</STRONG>
-               <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>,</STRONG>
-               <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+               <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+               <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>,</STRONG>
                <STRONG>attr_t</STRONG> <STRONG>*</STRONG><EM>attrs</EM><STRONG>,</STRONG>
                <STRONG>short</STRONG> <STRONG>*</STRONG><EM>color</EM><STRONG>_</STRONG><EM>pair</EM><STRONG>,</STRONG>
                <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM> <STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>setcchar(</STRONG>
-               <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>,</STRONG>
-               <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+               <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+               <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>,</STRONG>
                <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG>
                <STRONG>short</STRONG> <EM>color</EM><STRONG>_</STRONG><EM>pair</EM><STRONG>,</STRONG>
                <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM> <STRONG>);</STRONG>
@@ -73,34 +73,34 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-getcchar">getcchar</a></H3><PRE>
        The <STRONG>getcchar</STRONG> function gets a wide-character string and rendition from a
-       <STRONG>cchar_t</STRONG>  argument.   When  <EM>wch</EM>  is  not  a  null  pointer, the <STRONG>getcchar</STRONG>
-       function does the following:
+       <STRONG>cchar_t</STRONG> argument.  When <EM>wc</EM> is not a null pointer, the <STRONG>getcchar</STRONG> function
+       does the following:
 
-       <STRONG>o</STRONG>   Extracts information from a <STRONG>cchar_t</STRONG> value <EM>wcval</EM>
+       <STRONG>o</STRONG>   Extracts information from a <STRONG>cchar_t</STRONG> value <EM>wch</EM>
 
        <STRONG>o</STRONG>   Stores the character attributes in the location pointed to by <EM>attrs</EM>
 
        <STRONG>o</STRONG>   Stores the color pair in the location pointed to by <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
 
-       <STRONG>o</STRONG>   Stores the wide-character string, characters referenced  by  <EM>wcval</EM>,
-           into the array pointed to by <EM>wch</EM>.
+       <STRONG>o</STRONG>   Stores the wide-character string,  characters  referenced  by  <EM>wch</EM>,
+           into the array pointed to by <EM>wc</EM>.
 
-       When <EM>wch</EM> is a null pointer, the <STRONG>getcchar</STRONG> function does the following:
+       When <EM>wc</EM> is a null pointer, the <STRONG>getcchar</STRONG> function does the following:
 
-       <STRONG>o</STRONG>   Obtains the number of wide characters pointed to by <EM>wcval</EM>
+       <STRONG>o</STRONG>   Obtains the number of wide characters pointed to by <EM>wch</EM>
 
        <STRONG>o</STRONG>   Does not change the data referenced by <EM>attrs</EM> or <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
 
 
 </PRE><H3><a name="h3-setcchar">setcchar</a></H3><PRE>
-       The  <STRONG>setcchar</STRONG>  function initializes the location pointed to by <EM>wcval</EM> by
+       The  <STRONG>setcchar</STRONG>  function  initializes  the location pointed to by <EM>wch</EM> by
        using:
 
        <STRONG>o</STRONG>   The character attributes in <EM>attrs</EM>
 
        <STRONG>o</STRONG>   The color pair in <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
 
-       <STRONG>o</STRONG>   The wide-character string pointed to by <EM>wch</EM>.  The  string  must  be
+       <STRONG>o</STRONG>   The wide-character string pointed to by <EM>wc</EM>.   The  string  must  be
            L'\0' terminated, contain at most one spacing character, which must
            be the first.
 
@@ -112,10 +112,10 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       When <EM>wch</EM> is a  null  pointer,  <STRONG>getcchar</STRONG>  returns  the  number  of  wide
-       characters referenced by <EM>wcval</EM>, including one for a trailing null.
+       When <EM>wc</EM> is  a  null  pointer,  <STRONG>getcchar</STRONG>  returns  the  number  of  wide
+       characters referenced by <EM>wch</EM>, including one for a trailing null.
 
-       When  <EM>wch</EM>  is  not  a null pointer, <STRONG>getcchar</STRONG> returns <STRONG>OK</STRONG> upon successful
+       When  <EM>wc</EM>  is  not  a  null pointer, <STRONG>getcchar</STRONG> returns <STRONG>OK</STRONG> upon successful
        completion, and <STRONG>ERR</STRONG> otherwise.
 
        Upon successful completion, <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, it returns
@@ -123,9 +123,9 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The <EM>wcval</EM> argument may be a value generated by a call to <STRONG>setcchar</STRONG> or by
-       a function that has a <STRONG>cchar_t</STRONG> output argument.  If <EM>wcval</EM> is constructed
-       by any other means, the effect is unspecified.
+       The <EM>wch</EM> argument may be a value generated by a call to <STRONG>setcchar</STRONG> or by a
+       function that has a <STRONG>cchar_t</STRONG> output argument.  If <EM>wch</EM> is constructed  by
+       any other means, the effect is unspecified.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 2c9e31c22..4efa9b02f 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.85 2024/04/13 22:18:51 tom Exp @
+  * @Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -60,10 +60,10 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>mvgetch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwgetch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>ungetch(int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetch(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
-       <STRONG>int</STRONG> <STRONG>has_key(int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>has_key(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -89,22 +89,22 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
-       the returned character <EM>ch</EM> to the window (at the  cursor  position)  per
-       the following rules.
+       the returned character <EM>c</EM> to the window (at the cursor position) per the
+       following rules.
 
-       <STRONG>o</STRONG>   If  <EM>ch</EM>  matches  the  terminal's  erase character, the cursor moves
+       <STRONG>o</STRONG>   If  <EM>c</EM>  matches  the  terminal's  erase  character, the cursor moves
            leftward one  position  and  the  new  position  is  erased  as  if
            <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>  and  then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When the window's
            keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are
            handled the same way.
 
-       <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>ch</EM> to the window, as with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>c</EM> to the window, as with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.
 
        <STRONG>o</STRONG>   If  the  window  has  been moved or modified since the last call to
            <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG>.
 
-       If <EM>ch</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,  <STRONG>wgetch</STRONG>  returns
-       the character code for newline (line feed) instead.
+       If <EM>c</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been  called,  <STRONG>wgetch</STRONG>  returns
+       the character code for line feed instead.
 
 
 </PRE><H3><a name="h3-Keypad-Mode">Keypad Mode</a></H3><PRE>
@@ -150,7 +150,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>ungetch</STRONG>  places <EM>ch</EM> into the input queue to be returned by the next call
+       <STRONG>ungetch</STRONG>  places  <EM>c</EM> into the input queue to be returned by the next call
        to <STRONG>wgetch</STRONG>.  A single input queue serves all windows.
 
 
@@ -164,7 +164,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
            terminal.
 
        <STRONG>o</STRONG>   The  naming  convention  may  seem  obscure,  with  some   apparent
-           misspellings  (such  as "RSUME" for "resume"); The names correspond
+           misspellings  (such  as "RSUME" for "resume"); the names correspond
            to  the  <EM>terminfo</EM>  capability  names  for  the   keys,   and   were
            standardized  before  the  IBM  PC/AT  keyboard  layout  achieved a
            dominant position in industry.
@@ -267,7 +267,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
               <STRONG>KEY_SSUSPEND</STRONG>    Shifted suspend key
               <STRONG>KEY_SUNDO</STRONG>       Shifted undo key
 
-       The keypad is arranged as follows.
+       Many keyboards feature a nine-key directional pad.
 
                                    +-----+------+-------+
                                    | A1  |  up  |  A3   |
@@ -276,41 +276,43 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                                    +-----+------+-------+
                                    | C1  | down |  C3   |
                                    +-----+------+-------+
-       Two of these symbols do <EM>not</EM> correspond to a real key.
+       Two of the symbols in the list above do <EM>not</EM> correspond  to  a  physical
+       key.
 
-       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns <STRONG>KEY_RESIZE</STRONG> (even if  the  window's  keypad  mode  is
-           disabled) when <EM>ncurses</EM> detects the <STRONG>SIGWINCH</STRONG> signal; see <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>
+       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns  <STRONG>KEY_RESIZE</STRONG>,  even  if  the window's keypad mode is
+           disabled, when <EM>ncurses</EM> handles a <STRONG>SIGWINCH</STRONG> signal;  see  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>
            and <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is  pending
-           collection;  see  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.   Receipt of this code requires a
-           window's keypad mode to be  enabled,  because  to  interpret  mouse
+       <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is pending
+           collection; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.  Receipt of this  code  requires  a
+           window's  keypad  mode  to  be  enabled, because to interpret mouse
            input (as with with <STRONG>xterm(1)</STRONG>'s mouse prototocol), <EM>ncurses</EM> must read
            an escape sequence, as with a function key.
 
 
 </PRE><H3><a name="h3-Testing-Key-Codes">Testing Key Codes</a></H3><PRE>
-       In <EM>ncurses</EM>, <STRONG>has_key</STRONG> takes a key code value from  the  above  list,  and
-       returns  a  Boolean  value indicating the terminal's recognition of it.
-       See also <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> and <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
+       In  <EM>ncurses</EM>,  <STRONG>has_key</STRONG>  returns  a  Boolean value indicating whether the
+       terminal type recognizes its parameter as a key code value.   See  also
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> and <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wgetch</STRONG> returns <STRONG>ERR</STRONG> if
+       Except  for  <STRONG>has_key</STRONG>,  these  functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on
+       failure.
 
-       <STRONG>o</STRONG>   the <EM>WINDOW</EM> pointer is <STRONG>NULL</STRONG>, or
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
+
+       <STRONG>wgetch</STRONG> also fails if
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
-       <STRONG>o</STRONG>   execution was interrupted by a signal, in which case <STRONG>errno</STRONG>  is  set
+       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
            to <STRONG>EINTR</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first  perform  cursor movement using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is outside the window, or (for "mvw"
-       functions) if the <EM>win</EM> parameter is a null pointer.
-
-       <STRONG>ungetch</STRONG>  returns  <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
-       input queue.
+       <STRONG>ungetch</STRONG> fails if there is no more room in the input queue.
 
        <STRONG>has_key</STRONG> returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
@@ -329,12 +331,12 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <EM>curses</EM>  distinguishes  the  Enter  keys  in  the alphabetic and numeric
        keypad sections of a keyboard because (most) terminals  do.   <STRONG>KEY_ENTER</STRONG>
-       refers  to  the  key  on  the (numeric) keypad and, like other function
-       keys, is reliably recognized  only  if  the  window's  keypad  mode  is
-       enabled.
+       refers  to the key on the numeric keypad and, like other function keys,
+       and is reliably recognized only if the window's keypad mode is enabled.
 
-       <STRONG>o</STRONG>   The  <EM>terminfo</EM>  <STRONG>key_enter</STRONG>  (<STRONG>kent</STRONG>) capability describes the character
-           (sequence) sent by the terminal's keypad Enter key.
+       <STRONG>o</STRONG>   The <EM>terminfo</EM> <STRONG>key_enter</STRONG> (<STRONG>kent</STRONG>) capability  describes  the  character
+           (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
+           similar) keypad.
 
        <STRONG>o</STRONG>   "Enter or send" is X/Open Curses's description of this key.
 
@@ -355,7 +357,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        Historically, the list of key code macros above was influenced  by  the
        function-key-rich  keyboard  of  the AT&amp;T 7300 (also known variously as
        the "3B1", "Safari  4",  and  "UNIX  PC"),  a  1985  machine.   Today's
-       computer keyboards are based on the IBM PC/AT keyboard and tend to have
+       computer  keyboards  are  based  that of the IBM PC/AT and tend to have
        fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
        codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
        <STRONG>KEY_PPAGE</STRONG> (Page Up), <STRONG>KEY_NPAGE</STRONG> (Page  Down),  <STRONG>KEY_IC</STRONG>  (Insert),  <STRONG>KEY_DC</STRONG>
@@ -378,7 +380,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4, describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>, and
+       X/Open Curses, Issue 4 describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>,  and
        <STRONG>ungetch</STRONG>.  It specifies no error conditions for them.
 
        <STRONG>wgetch</STRONG> reads only single-byte characters.
@@ -390,8 +392,8 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        The   behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of  signal  handlers  is
        unspecified in the SVr4 documentation and X/Open Curses.  In historical
        <EM>curses</EM>  implementations,  it  varied depending on whether the operating
-       system's dispatch of a signal to a handler interrupts a <STRONG>read(2)</STRONG> call in
-       progress  or  not,  and also (in some implementations) whether an input
+       system's dispatch of a signal to a handler interrupting a <STRONG>read(2)</STRONG>  call
+       in  progress,  and  also  (in  some  implementations)  whether an input
        timeout or non-blocking mode has been set.  Programmers concerned about
        portability  should  be  prepared  for  either of two cases: (a) signal
        receipt does not interrupt <STRONG>wgetch</STRONG>; or  (b)  signal  receipt  interrupts
@@ -422,7 +424,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 0a16c1bad..d05f6cbaf 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.56 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -124,17 +124,16 @@ <H1 class="no-header">curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        interrupts  the  function,  it will return <STRONG>KEY_RESIZE</STRONG> rather than <STRONG>OK</STRONG> or
        <STRONG>ERR</STRONG>.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
 
-       Using <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>, or  <STRONG>wgetstr</STRONG>  to  read  a  line  that
-       overflows  the  array  pointed to by <STRONG>str</STRONG> causes undefined results.  The
-       use of <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or  <STRONG>wgetnstr</STRONG>,  respectively,  is
+       Using  <STRONG>getstr</STRONG>,  <STRONG>mvgetstr</STRONG>,  <STRONG>mvwgetstr</STRONG>,  or  <STRONG>wgetstr</STRONG>  to read a line that
+       overflows the array pointed to by <STRONG>str</STRONG> causes  undefined  results.   The
+       use  of  <STRONG>getnstr</STRONG>,  <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or <STRONG>wgetnstr</STRONG>, respectively, is
        recommended.
 
 
@@ -142,96 +141,96 @@ <H1 class="no-header">curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        These functions are described in The Single Unix Specification, Version
        2.  No error conditions are defined.
 
-       This implementation returns <STRONG>ERR</STRONG> if the window pointer is  null,  or  if
+       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
        the lower-level <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call returns an <STRONG>ERR</STRONG>.
 
-       SVr3  and  early  SVr4  curses  implementations did not reject function
-       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
-       function  keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are "interpreted",
-       without giving details.  It  lied.   In  fact,  the  "character"  value
+       SVr3 and early SVr4 curses  implementations  did  not  reject  function
+       keys;  the  SVr4.0  documentation  claimed that "special keys" (such as
+       function keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are  "interpreted",
+       without  giving  details.   It  lied.   In  fact, the "character" value
        appended to the string by those implementations was predictable but not
-       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
+       useful  (being,  in  fact,  the  low-order eight bits of the key's KEY_
        value).
 
-       The  functions  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present but not
+       The functions <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present  but  not
        documented in SVr4.
 
        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM>  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
+       <EM>n</EM> 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
        "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
        some implementations count it, some do not:
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and PDCurses do not count the NUL in the  given  limit,
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.1  and PDCurses do not count the NUL in the given limit,
            while
 
        <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 
-       <STRONG>o</STRONG>   Solaris   xcurses   provides  both:  its  wide-character  <STRONG>wget_nstr</STRONG>
-           reserves  a  NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count   the   NUL
+       <STRONG>o</STRONG>   Solaris  xcurses  provides  both:  its   wide-character   <STRONG>wget_nstr</STRONG>
+           reserves   a   NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count  the  NUL
            consistently.
 
        In SVr4 curses, a negative value of <EM>n</EM> tells <STRONG>wgetnstr</STRONG> to assume that the
-       caller's buffer is large enough to hold the result, i.e., to  act  like
-       <STRONG>wgetstr</STRONG>.   X/Open  Curses does not mention this (or anything related to
-       negative or zero values of <EM>n</EM>), however  most  implementations  use  the
+       caller's  buffer  is large enough to hold the result, i.e., to act like
+       <STRONG>wgetstr</STRONG>.  X/Open Curses does not mention this (or anything  related  to
+       negative  or  zero  values  of <EM>n</EM>), however most implementations use the
        feature, with different limits:
 
-       <STRONG>o</STRONG>   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
+       <STRONG>o</STRONG>   Solaris SVr4 curses and PDCurses limit the  result  to  255  bytes.
            Other Unix systems than Solaris are likely to use the same limit.
 
        <STRONG>o</STRONG>   Solaris xcurses limits the result to <STRONG>LINE_MAX</STRONG> bytes.
 
-       <STRONG>o</STRONG>   NetBSD 7 assumes no particular limit for the result  from  <STRONG>wgetstr</STRONG>.
-           However,  it  limits  the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure that it is
+       <STRONG>o</STRONG>   NetBSD  7  assumes no particular limit for the result from <STRONG>wgetstr</STRONG>.
+           However, it limits the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure  that  it  is
            greater than zero.
 
-           A comment in NetBSD's source code states that this is specified  in
+           A  comment in NetBSD's source code states that this is specified in
            SUSv2.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  (before  6.2)  assumes  no particular limit for the result
-           from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
+       <STRONG>o</STRONG>   <EM>ncurses</EM> (before 6.2) assumes no particular  limit  for  the  result
+           from  <STRONG>wgetstr</STRONG>,  and  treats  the  <EM>n</EM> parameter of <STRONG>wgetnstr</STRONG> like SVr4
            curses.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
-           which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
-           <STRONG>sysconf</STRONG>  is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
-           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.2 uses <STRONG>LINE_MAX</STRONG>, or  a  larger  (system-dependent)  value
+           which  the  <STRONG>sysconf</STRONG>  function  may provide.  If neither <STRONG>LINE_MAX</STRONG> or
+           <STRONG>sysconf</STRONG> is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG>  (a
+           2048  byte  limit).   In  either  case,  it reserves a byte for the
            terminating NUL.
 
-       Although  <STRONG>getnstr</STRONG>  is equivalent to a series of calls to <STRONG>getch</STRONG>, it also
-       makes changes to the curses modes to allow simple editing of the  input
+       Although <STRONG>getnstr</STRONG> is equivalent to a series of calls to <STRONG>getch</STRONG>,  it  also
+       makes  changes to the curses modes to allow simple editing of the input
        buffer:
 
-       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG>  saves  the  current  value of the <STRONG>nl</STRONG>, <STRONG>echo</STRONG>, <STRONG>raw</STRONG> and <STRONG>cbreak</STRONG>
+       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG> saves the current value of the <STRONG>nl</STRONG>,  <STRONG>echo</STRONG>,  <STRONG>raw</STRONG>  and  <STRONG>cbreak</STRONG>
            modes, and sets <STRONG>nl</STRONG>, <STRONG>noecho</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>cbreak</STRONG>.
 
-           <STRONG>getnstr</STRONG> handles the echoing of characters, rather than  relying  on
+           <STRONG>getnstr</STRONG>  handles  the echoing of characters, rather than relying on
            the caller to set an appropriate mode.
 
-       <STRONG>o</STRONG>   It  also  obtains  the <EM>erase</EM> and <EM>kill</EM> characters from <STRONG>erasechar</STRONG> and
+       <STRONG>o</STRONG>   It also obtains the <EM>erase</EM> and <EM>kill</EM> characters  from  <STRONG>erasechar</STRONG>  and
            <STRONG>killchar</STRONG>, respectively.
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
 
        Other implementations differ in their treatment of special characters:
 
-       <STRONG>o</STRONG>   While they may set the <EM>echo</EM>  mode,  other  implementations  do  not
-           modify  the  <EM>raw</EM>  mode,  They  may  take the <EM>cbreak</EM> mode set by the
-           caller into account when deciding whether to handle echoing  within
+       <STRONG>o</STRONG>   While  they  may  set  the  <EM>echo</EM> mode, other implementations do not
+           modify the <EM>raw</EM> mode, They may take  the  <EM>cbreak</EM>  mode  set  by  the
+           caller  into account when deciding whether to handle echoing within
            <STRONG>getnstr</STRONG> or as a side-effect of the <STRONG>getch</STRONG> calls.
 
        <STRONG>o</STRONG>   The original <EM>ncurses</EM> (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
-           accepting input for <STRONG>getnstr</STRONG>.  That  may  have  been  done  to  make
+           accepting  input  for  <STRONG>getnstr</STRONG>.   That  may  have been done to make
            function- and cursor-keys work; it is not necessary with <EM>ncurses</EM>.
 
-           Since  1995, <EM>ncurses</EM> has provided signal handlers for INTR and QUIT
-           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
-           catch  a  signal  and stop the program, where other implementations
+           Since 1995, <EM>ncurses</EM> has provided signal handlers for INTR and  QUIT
+           (e.g.,  <STRONG>^C</STRONG>  or  <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> settings, those may
+           catch a signal and stop the program,  where  other  implementations
            allow one to enter those characters in the buffer.
 
        <STRONG>o</STRONG>   Starting in 2021 (<EM>ncurses</EM> 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
-           and   <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,  e.g.,
+           and  <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,   e.g.,
            allowing one to enter a <STRONG>^C</STRONG> into the buffer.
 
 
@@ -243,7 +242,7 @@ <H1 class="no-header">curs_getstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index bc69247f0..1dafd5c74 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -83,8 +83,8 @@ <H1 class="no-header">curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <STRONG>getyx</STRONG>, <STRONG>getparyx</STRONG>, <STRONG>getbegyx</STRONG> and <STRONG>getmaxyx</STRONG> macros are described in  the
-       XSI Curses standard, Issue 4.
+       The <STRONG>getyx</STRONG>, <STRONG>getparyx</STRONG>, <STRONG>getbegyx</STRONG> and  <STRONG>getmaxyx</STRONG>  macros  are  described  in
+       X/Open Curses, Issue 4.
 
        This  implementation also provides functions <STRONG>getbegx</STRONG>, <STRONG>getbegy</STRONG>, <STRONG>getcurx</STRONG>,
        <STRONG>getcury</STRONG>, <STRONG>getmaxx</STRONG>, <STRONG>getmaxy</STRONG>, <STRONG>getparx</STRONG> and <STRONG>getpary</STRONG> for  compatibility  with
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 892cab2d2..f0acbd888 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.28 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -54,28 +54,27 @@ <H1 class="no-header">curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>in_wch(cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>win_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>in_wch(cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>win_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvin_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwin_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wcval</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvin_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwin_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These functions extract the complex character and  rendition  from  the
        current position in the named window into the <STRONG>cchar_t</STRONG> object referenced
-       by wcval.
+       by wch.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       No errors are defined in the XSI Curses standard.  This  implementation
-       checks  for  null  pointers,  returns  <STRONG>ERR</STRONG>  in that case.  Also, the <EM>mv</EM>
-       routines check for error moving the cursor, returning <STRONG>ERR</STRONG> in that case.
-       Otherwise they return <STRONG>OK</STRONG>.
+       No errors are defined in X/Open Curses.  This implementation checks for
+       null  pointers,  returns <STRONG>ERR</STRONG> in that case.  Also, the <EM>mv</EM> routines check
+       for error moving the cursor, returning <STRONG>ERR</STRONG>  in  that  case.   Otherwise
+       they return <STRONG>OK</STRONG>.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -83,18 +82,18 @@ <H1 class="no-header">curs_in_wch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library in
+       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library  in
        its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index ad70a28e5..1bfc1a6b7 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.39 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -92,34 +92,33 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
        <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All routines except <STRONG>win_wchnstr</STRONG> may be macros.
 
-       Reading a line that overflows the  array  pointed  to  by  <EM>wchstr</EM>  with
-       <STRONG>in_wchstr</STRONG>,  <STRONG>mvin_wchstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG> causes undefined
-       results.    Therefore,   the   use   of    <STRONG>in_wchnstr</STRONG>,    <STRONG>mvin_wchnstr</STRONG>,
+       Reading  a  line  that  overflows  the  array pointed to by <EM>wchstr</EM> with
+       <STRONG>in_wchstr</STRONG>, <STRONG>mvin_wchstr</STRONG>, <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG>  causes  undefined
+       results.     Therefore,    the   use   of   <STRONG>in_wchnstr</STRONG>,   <STRONG>mvin_wchnstr</STRONG>,
        <STRONG>mvwin_wchnstr</STRONG>, or <STRONG>win_wchnstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses defines no error conditions.  This implementation checks
+       X/Open Curses defines no error conditions.  This implementation  checks
        for null pointers, returning <STRONG>ERR</STRONG> in that case.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index d10727a5a..69b835b24 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.48 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -81,12 +81,11 @@ <H1 class="no-header">curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       The <STRONG>winch</STRONG> function does not return an  error  if  the  window  contains
-       characters  larger than 8-bits (255).  Only the low-order 8 bits of the
+       The  <STRONG>winch</STRONG>  function  does  not  return an error if the window contains
+       characters larger than 8-bits (255).  Only the low-order 8 bits of  the
        character are used by <STRONG>winch</STRONG>.
 
 
@@ -95,40 +94,40 @@ <H1 class="no-header">curs_inch 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
-       Very old systems (before standardization) provide a different  function
+       Very  old systems (before standardization) provide a different function
        with the same name:
 
-       <STRONG>o</STRONG>   The  <STRONG>winch</STRONG>  function  was  part of the original BSD curses library,
-           which  stored  a  7-bit  character  combined  with   the   <EM>standout</EM>
+       <STRONG>o</STRONG>   The <STRONG>winch</STRONG> function was part of the  original  BSD  curses  library,
+           which   stored   a  7-bit  character  combined  with  the  <EM>standout</EM>
            attribute.
 
-           In  BSD  curses,  <STRONG>winch</STRONG> returned only the character (as an integer)
+           In BSD curses, <STRONG>winch</STRONG> returned only the character  (as  an  integer)
            with the <EM>standout</EM> attribute removed.
 
-       <STRONG>o</STRONG>   System V curses added support for several  video  attributes  which
+       <STRONG>o</STRONG>   System  V  curses  added support for several video attributes which
            could be combined with characters in the window.
 
            Reflecting this improvement, the function was altered to return the
            character combined with all video attributes in a <STRONG>chtype</STRONG> value.
 
        X/Open Curses does not specify the size and layout of attributes, color
-       and  character  values in <STRONG>chtype</STRONG>; it is implementation-dependent.  This
-       implementation uses 8 bits for character values.  An application  using
-       more  bits,  e.g.,  a  Unicode  value,  should  use  the wide-character
+       and character values in <STRONG>chtype</STRONG>; it is  implementation-dependent.   This
+       implementation  uses 8 bits for character values.  An application using
+       more bits,  e.g.,  a  Unicode  value,  should  use  the  wide-character
        equivalents to these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 4dfe5f7c4..e01860a40 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -92,9 +92,8 @@ <H1 class="no-header">curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the <EM>chstr</EM> parameter is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -104,16 +103,16 @@ <H1 class="no-header">curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        does not document whether a length limit argument includes any trailing
        0; and it does not document the meaning of the return value.
 
-       Reading a line that overflows  the  array  pointed  to  by  <EM>chstr</EM>  with
-       <STRONG>inchstr</STRONG>,  <STRONG>mvinchstr</STRONG>,  <STRONG>mvwinchstr</STRONG>  or <STRONG>winchstr</STRONG> causes undefined results.
-       Therefore, the use of <STRONG>inchnstr</STRONG>, <STRONG>mvinchnstr</STRONG>, <STRONG>mvwinchnstr</STRONG>,  or  <STRONG>winchnstr</STRONG>
+       Reading  a  line  that  overflows  the  array  pointed to by <EM>chstr</EM> with
+       <STRONG>inchstr</STRONG>, <STRONG>mvinchstr</STRONG>, <STRONG>mvwinchstr</STRONG> or <STRONG>winchstr</STRONG>  causes  undefined  results.
+       Therefore,  the  use of <STRONG>inchnstr</STRONG>, <STRONG>mvinchnstr</STRONG>, <STRONG>mvwinchnstr</STRONG>, or <STRONG>winchnstr</STRONG>
        is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in the XSI Curses standard, Issue 4.  It
-       is no more specific than the SVr4 documentation on the trailing 0.   It
-       does specify that the successful return of the functions is <STRONG>OK</STRONG>.
+       These functions are described in X/Open Curses, Issue 4.  It is no more
+       specific  than  the  SVr4  documentation  on  the  trailing 0.  It does
+       specify that the successful return of the functions is <STRONG>OK</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -121,7 +120,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 80aa1bb27..cc3a13370 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.66 2024/04/13 22:18:11 tom Exp @
+  * @Id: curs_initscr.3x,v 1.69 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -173,8 +173,8 @@ <H1 class="no-header">curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions were described in the XSI Curses standard, Issue 4.  As
-       of 2015, the current document is X/Open Curses, Issue 7.
+       These functions were described in X/Open Curses, Issue 4.  As of  2015,
+       the current document is X/Open Curses, Issue 7.
 
 
 </PRE><H3><a name="h3-Differences">Differences</a></H3><PRE>
@@ -188,7 +188,7 @@ <H1 class="no-header">curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        Old versions of curses, e.g., BSD 4.4, would return a null pointer from
        <STRONG>initscr</STRONG> when an error is detected, rather than exiting.  It is safe but
-       redundant to check the return value of <STRONG>initscr</STRONG> in XSI Curses.
+       redundant to check the return value of <STRONG>initscr</STRONG> in X/Open Curses.
 
        Calling  <STRONG>endwin</STRONG>  does not dispose of the memory allocated in <STRONG>initscr</STRONG> or
        <STRONG>newterm</STRONG>.  Deleting a <EM>SCREEN</EM> provides a way to do this:
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 914017a0d..f0256e145 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.28 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.30 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -73,8 +73,8 @@ <H1 class="no-header">curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement using  <STRONG>wmove</STRONG>
-       and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4, describes these functions.
+       X/Open Curses, Issue 4 describes these functions.
 
        SVr4 describes successful return values only as "an integer value other
        than <STRONG>ERR</STRONG>".
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 200264c52..5b00318eb 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.34 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -95,37 +95,36 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the <STRONG>wins_wch</STRONG> function returns an error.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>, and return an error if the position is outside  the  window,
-       or if the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All but <STRONG>wins_nwstr</STRONG> may be macros.
 
-       If  the first character in the string is a non-spacing character, these
-       functions will fail.  XSI does not define what will happen  if  a  non-
-       spacing character follows a control character.
+       If the first character in the string is a non-spacing character,  these
+       functions will fail.  X/Open Curses does not define what will happen if
+       a non-spacing character follows a control character.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in  the XSI Curses standard, Issue 4,
-       which adds <EM>const</EM> qualifiers to the arguments.
+       These functions are described in X/Open Curses,  Issue  4,  which  adds
+       <EM>const</EM> qualifiers to the arguments.
 
-       X/Open states that the entire string is inserted if <EM>n</EM> is less  than  1.
-       This  is  probably  an  error,  because  it  is inconsistent with other
+       X/Open  states  that the entire string is inserted if <EM>n</EM> is less than 1.
+       This is probably an  error,  because  it  is  inconsistent  with  other
        functions, and differs from the X/Open implementation on Solaris.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index f8575018e..a29cf8ae5 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -72,22 +72,22 @@ <H1 class="no-header">curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement using <STRONG>wmove</STRONG>
-       and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be implemented as macros.
+
        A terminal's <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is  not  necessarily
        employed.
 
-       <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be implemented as macros.
-
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4, describes these functions.
+       X/Open Curses, Issue 4 describes these functions.
 
-       SVr4 describes successful return values only as "an integer value other
-       than <STRONG>ERR</STRONG>".
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       value other than <STRONG>ERR</STRONG>".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_insch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 1a763d28e..693f6f76e 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.48 2024/03/16 15:49:07 tom Exp @
+  * @Id: curs_insstr.3x,v 1.51 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -93,9 +93,8 @@ <H1 class="no-header">curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   the <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> function returns an error.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>,  and  return an error if the position is outside the window,
-       or if the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -103,17 +102,17 @@ <H1 class="no-header">curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the  XSI  Curses  standard,  Issue  4,
-       which adds <EM>const</EM> qualifiers to the arguments.
+       These  functions  are  described  in X/Open Curses, Issue 4, which adds
+       <EM>const</EM> qualifiers to the arguments.
 
-       The  Single  Unix  Specification,  Version  2  states  that <STRONG>insnstr</STRONG> and
-       <STRONG>winsnstr</STRONG> perform wrapping.  This is probably an error, since  it  makes
-       this  group  of  functions  inconsistent.   Also,  no implementation of
+       The Single Unix  Specification,  Version  2  states  that  <STRONG>insnstr</STRONG>  and
+       <STRONG>winsnstr</STRONG>  perform  wrapping.  This is probably an error, since it makes
+       this group of  functions  inconsistent.   Also,  no  implementation  of
        curses documents this inconsistency.
 
-       X/Open states that the entire string is inserted if <EM>n</EM> is less  than  1.
-       This  is  probably  an  error,  because  it  is inconsistent with other
-       functions, and differs from the  SVr4  and  X/Open  implementations  on
+       X/Open  states  that the entire string is inserted if <EM>n</EM> is less than 1.
+       This is probably an  error,  because  it  is  inconsistent  with  other
+       functions,  and  differs  from  the  SVr4 and X/Open implementations on
        Solaris.
 
 
@@ -122,7 +121,7 @@ <H1 class="no-header">curs_insstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index a3c25fcac..511e1dc13 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.48 2024/04/13 22:14:06 tom Exp @
+  * @Id: curs_instr.3x,v 1.51 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -87,26 +87,25 @@ <H1 class="no-header">curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if the <EM>chstr</EM> parameter is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All routines except <STRONG>winnstr</STRONG> may be macros.
 
-       Reading  a  line that overflows the array pointed to by <EM>str</EM> with <STRONG>instr</STRONG>,
-       <STRONG>mvinstr</STRONG>, <STRONG>mvwinstr</STRONG> or <STRONG>winstr</STRONG> causes undefined results.   Therefore,  the
+       Reading a line that overflows the array pointed to by <EM>str</EM>  with  <STRONG>instr</STRONG>,
+       <STRONG>mvinstr</STRONG>,  <STRONG>mvwinstr</STRONG>  or <STRONG>winstr</STRONG> causes undefined results.  Therefore, the
        use of <STRONG>innstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinnstr</STRONG>, or <STRONG>winnstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       SVr4  does not document whether a length limit includes or excludes the
+       SVr4 does not document whether a length limit includes or excludes  the
        trailing NUL.
 
-       The <EM>ncurses</EM> library extends the XSI description by allowing a  negative
-       value  for  <EM>n</EM>.  In this case, the functions return the string ending at
-       the right margin.
+       The <EM>ncurses</EM> library extends the X/Open Curses description by allowing a
+       negative value for <EM>n</EM>.  In this case, the functions  return  the  string
+       ending at the right margin.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -117,7 +116,7 @@ <H1 class="no-header">curs_instr 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 7b034b202..ddd51afb2 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.41 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -92,36 +92,35 @@ <H1 class="no-header">curs_inwstr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>o</STRONG>   if no characters could be read.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All routines except <STRONG>winnwstr</STRONG> may be macros.
 
-       Each cell in the window holds a complex character (a spacing  character
-       and  zero  or more non-spacing characters) together with attributes and
-       color.  These  functions  store  only  the  wide  characters,  ignoring
-       attributes  and  color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters
+       Each  cell in the window holds a complex character (a spacing character
+       and zero or more non-spacing characters) together with  attributes  and
+       color.   These  functions  store  only  the  wide  characters, ignoring
+       attributes and color.  Use <STRONG>in_wchstr</STRONG> to return the  complex  characters
        from a window.
 
        Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
-       <STRONG>mvinwstr</STRONG>,  <STRONG>mvwinwstr</STRONG>  or  <STRONG>winwstr</STRONG> causes undefined results.  Therefore,
+       <STRONG>mvinwstr</STRONG>, <STRONG>mvwinwstr</STRONG> or <STRONG>winwstr</STRONG> causes  undefined  results.   Therefore,
        the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index e9cf7f423..da9bfd67e 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.58 2024/04/13 22:19:08 tom Exp @
+  * @Id: curs_kernel.3x,v 1.61 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -190,9 +190,9 @@ <H1 class="no-header">curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in the
-       XSI  Curses standard, Issue 4.  All other functions are as described in
-       XSI Curses.
+       The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG>  are  not  described  in
+       X/Open Curses, Issue 4.  All other functions are as described in X/Open
+       Curses.
 
        The SVr4 documentation describes <STRONG>setsyx</STRONG> and  <STRONG>getsyx</STRONG>  as  having  return
        type  int.   This  is misleading, as they are macros with no documented
@@ -208,7 +208,7 @@ <H1 class="no-header">curs_kernel 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index de0d7be9b..bf7787862 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.96 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -65,11 +65,11 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
        <STRONG>bool</STRONG> <STRONG>has_mouse(void);</STRONG>
 
+       <STRONG>mmask_t</STRONG> <STRONG>mousemask(mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>getmouse(MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ungetmouse(MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
 
-       <STRONG>mmask_t</STRONG> <STRONG>mousemask(mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
-
        <STRONG>bool</STRONG> <STRONG>wenclose(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
        <STRONG>bool</STRONG> <STRONG>mouse_trafo(int*</STRONG> <EM>pY</EM><STRONG>,</STRONG> <STRONG>int*</STRONG> <EM>pX</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>to</EM><STRONG>_</STRONG><EM>screen</EM><STRONG>);</STRONG>
@@ -85,6 +85,16 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> input stream.
 
 
+</PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
+       The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
+       successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
+
+       Mouse  events  are  ignored  when input is in cooked mode, and cause an
+       error beep when cooked mode  is  being  simulated  in  a  window  by  a
+       function  such  as  <STRONG>getstr</STRONG>  that  expects  a  linefeed  for  input-loop
+       termination.
+
+
 </PRE><H3><a name="h3-mousemask">mousemask</a></H3><PRE>
        To make mouse events visible, use the <STRONG>mousemask</STRONG>  function.   This  sets
        the  mouse  events  to  be  reported.   By default, no mouse events are
@@ -112,7 +122,6 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        <STRONG>BUTTON1_PRESSED</STRONG>          mouse button 1 down
        <STRONG>BUTTON1_RELEASED</STRONG>         mouse button 1 up
        <STRONG>BUTTON1_CLICKED</STRONG>          mouse button 1 clicked
-
        <STRONG>BUTTON1_DOUBLE_CLICKED</STRONG>   mouse button 1 double clicked
        <STRONG>BUTTON1_TRIPLE_CLICKED</STRONG>   mouse button 1 triple clicked
        ------------------------------------------------------------------------
@@ -234,16 +243,6 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
-       The  <STRONG>has_mouse</STRONG>  function  returns  <STRONG>TRUE</STRONG>  if  the  mouse driver has been
-       successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
-
-       Mouse events are ignored when input is in cooked  mode,  and  cause  an
-       error  beep  when  cooked  mode  is  being  simulated  in a window by a
-       function  such  as  <STRONG>getstr</STRONG>  that  expects  a  linefeed  for  input-loop
-       termination.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>has_mouse</STRONG>, <STRONG>wenclose</STRONG>, <STRONG>mouse_trafo</STRONG>, and <STRONG>wmouse_trafo</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>
        as noted above.
@@ -395,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -403,6 +402,7 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
+<li><a href="#h3-has_mouse">has_mouse</a></li>
 <li><a href="#h3-mousemask">mousemask</a></li>
 <li><a href="#h3-Mouse-Events">Mouse Events</a></li>
 <li><a href="#h3-getmouse">getmouse</a></li>
@@ -411,7 +411,6 @@ <H1 class="no-header">curs_mouse 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 <li><a href="#h3-wmouse_trafo">wmouse_trafo</a></li>
 <li><a href="#h3-mouse_trafo">mouse_trafo</a></li>
 <li><a href="#h3-mouseinterval">mouseinterval</a></li>
-<li><a href="#h3-has_mouse">has_mouse</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 53047bef7..190c8ac38 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_move.3x,v 1.38 2024/04/20 19:51:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -58,27 +58,27 @@ <H1 class="no-header">curs_move 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines move the cursor associated with the window to line <EM>y</EM> and
-       column <EM>x</EM>.  This routine does  not  move  the  physical  cursor  of  the
-       terminal  until  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The  position  specified is
-       relative to the upper left-hand corner of the window, which is (0,0).
+       <STRONG>wmove</STRONG>  relocates  the  cursor  associated with the <EM>curses</EM> window <EM>win</EM> to
+       line <EM>y</EM> and column  <EM>x</EM>.   The  terminal's  cursor  does  not  move  until
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The position (<EM>x</EM>, <EM>y</EM>) is relative to the upper
+       left-hand  corner  of  the  window,  which  has   coordinates   (0, 0).
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the <STRONG>move</STRONG> variant of this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
-       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
-       completion.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Specifically, they return an error if the window pointer is null, or if
-       the position is outside the window.
+       They fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
+
+       <STRONG>wmove</STRONG> fails if its <EM>WINDOW</EM> pointer argument is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>move</STRONG> may be a macro.
+       <STRONG>move</STRONG> may be implemented as a macro.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses, Issue 4 describes these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 96b1b01d7..65efa41b4 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.60 2024/04/13 22:23:57 tom Exp @
+  * @Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -156,7 +156,7 @@ <H1 class="no-header">curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
            the window pointer is null
 
        <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
-           outside the window.
+           outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -168,7 +168,7 @@ <H1 class="no-header">curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in the XSI Curses standard, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.
 
        Some historic curses implementations had, as an  undocumented  feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
@@ -176,28 +176,27 @@ <H1 class="no-header">curs_outopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        Earlier System V curses implementations specified  that  with  <STRONG>scrollok</STRONG>
        enabled,  any  window  modification  triggering  a scroll also forced a
-       physical refresh.  XSI Curses does not require this, and <EM>ncurses</EM> avoids
-       doing  it  to  perform  better vertical-motion optimization at <STRONG>wrefresh</STRONG>
-       time.
+       physical refresh.  X/Open Curses does not  require  this,  and  <EM>ncurses</EM>
+       avoids  doing  it  to  perform  better  vertical-motion optimization at
+       <STRONG>wrefresh</STRONG> time.
 
-       The XSI Curses standard does not mention that the cursor should be made
-       invisible  as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does
-       this, but  the  code  does  not.   Use  <STRONG>curs_set</STRONG>  to  make  the  cursor
-       invisible.
+       X/Open Curses does not mention that the cursor should be made invisible
+       as  a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does this, but
+       the code does not.  Use <STRONG>curs_set</STRONG> to make the cursor invisible.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <EM>ncurses</EM>  formerly  treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input <EM>and</EM> output
+       <EM>ncurses</EM> formerly treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input  <EM>and</EM>  output
        options, but no longer; see <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.4                       2024-04-13                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 6b9c9c54f..241fd3569 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.41 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_overlay.3x,v 1.43 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -95,10 +95,10 @@ <H1 class="no-header">curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in  the XSI Curses standard, Issue 4,
-       which adds <EM>const</EM> qualifiers to the  arguments.   It  further  specifies
-       their  behavior in the presence of characters with multibyte renditions
-       (not yet supported in this implementation).
+       These  functions  are  described  in X/Open Curses, Issue 4, which adds
+       <EM>const</EM> qualifiers to the arguments.  It further specifies their behavior
+       in  the  presence  of  characters  with  multibyte  renditions (not yet
+       supported in this implementation).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 55ddbac1a..af575097b 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.57 2024/04/13 22:13:17 tom Exp @
+  * @Id: curs_pad.3x,v 1.59 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -176,10 +176,10 @@ <H1 class="no-header">curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        The two uses may be related.
 
-       The  XSI  Curses  standard,  Issue 4 describes these functions, without
-       significant change from the SVr3 documentation.  It describes no  error
-       conditions.   The  behavior of <STRONG>subpad</STRONG> if the parent window is not a pad
-       is undocumented, and is not checked by the vendor Unix implementations:
+       X/Open  Curses,  Issue 4 describes these functions, without significant
+       change from the SVr3 documentation.  It describes no error  conditions.
+       The  behavior  of  <STRONG>subpad</STRONG>  if  the  parent  window  is  not  a  pad  is
+       undocumented, and is not checked by the vendor Unix implementations:
 
        <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM>  structure  in  <STRONG>newpad</STRONG>  which
            tells if the window is a <EM>pad</EM>.
@@ -230,7 +230,7 @@ <H1 class="no-header">curs_pad 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index ab4b2997d..c02ebf855 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.51 2024/03/23 20:38:57 tom Exp @
+  * @Id: curs_printw.3x,v 1.53 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -83,8 +83,8 @@ <H1 class="no-header">curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        for the buffer into which the output is formatted,  or  if  the  window
        pointer <EM>win</EM> is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       <STRONG>wmove</STRONG>, and fail if the position is outside the window.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -95,13 +95,13 @@ <H1 class="no-header">curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4,  describes these functions.  It specifies no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
        <EM>ncurses</EM> defines <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> identically  to  support  legacy
        applications.  However, the latter is obsolete.
 
-       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4,  Version  2  (1996),  marked <STRONG>vwprintw</STRONG> as
+       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  <STRONG>vwprintw</STRONG> as
            requiring <EM>varargs.h</EM> and "TO BE WITHDRAWN", and specified  <STRONG>vw_printw</STRONG>
            using the <EM>stdarg.h</EM> interface.
 
@@ -147,7 +147,7 @@ <H1 class="no-header">curs_printw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 3f6369474..815754899 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.44 2024/03/16 15:49:39 tom Exp @
+  * @Id: curs_refresh.3x,v 1.46 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses, Issue 4 describes these functions.
 
        Whether <STRONG>wnoutrefresh</STRONG> copies to the virtual screen the  entire  contents
        of a window or just its changed portions has never been well-documented
@@ -160,7 +160,7 @@ <H1 class="no-header">curs_refresh 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 9e1d30910..c11c049b7 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.51 2024/03/23 20:41:15 tom Exp @
+  * @Id: curs_scanw.3x,v 1.53 2024/04/20 19:18:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -84,8 +84,8 @@ <H1 class="no-header">curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
        In  <EM>ncurses</EM>, failure occurs if <STRONG>vsscanf(3)</STRONG> returns <STRONG>EOF</STRONG>, or if the window
        pointer <EM>win</EM> is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       <STRONG>wmove</STRONG>, and fail if the position is outside the window.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -100,13 +100,13 @@ <H1 class="no-header">curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4, describes these  functions.   It  specifies  no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
        <EM>ncurses</EM>  defines  <STRONG>vw_scanw</STRONG>  and  <STRONG>vwscanw</STRONG>  identically to support legacy
        applications.  However, the latter is obsolete.
 
-       <STRONG>o</STRONG>   X/Open Curses,  Issue  4,  Version  2  (1996),  marked  <STRONG>vwscanw</STRONG>  as
+       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  <STRONG>vwscanw</STRONG>  as
            requiring  <EM>varargs.h</EM>  and "TO BE WITHDRAWN", and specified <STRONG>vw_scanw</STRONG>
            using the <EM>stdarg.h</EM> interface.
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_scanw 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 66806000d..634608fad 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.41 2024/03/23 20:41:15 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4, describes these functions.
+       X/Open Curses, Issue 4 describes these functions.
 
        SVr4 omitted the <EM>const</EM> qualifiers.
 
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-03-23 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-23                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index ea313978f..ec80578d3 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.41 2024/04/14 00:14:28 tom Exp @
+  * @Id: curs_scroll.3x,v 1.43 2024/04/20 18:54:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -93,7 +93,7 @@ <H1 class="no-header">curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4, describes these functions.  It defines no error
+       X/Open Curses, Issue 4 describes these functions.  It defines no  error
        conditions.
 
        SVr4  specifies  only "an integer value other than <STRONG>ERR</STRONG>" as a successful
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index f0851713e..90e23f516 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.69 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_slk.3x,v 1.71 2024/04/20 18:54:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -224,8 +224,8 @@ <H1 class="no-header">curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4,  describes  these   functions,   with   some
-       differences from SVr4 <EM>curses</EM>:
+       X/Open Curses, Issue 4 describes these functions, with some differences
+       from SVr4 <EM>curses</EM>:
 
        <STRONG>o</STRONG>   X/Open   added   functions  like  the  SVr4  attribute-manipulation
            functions <STRONG>slk_attron</STRONG>, <STRONG>slk_attroff</STRONG>, and <STRONG>slk_attrset</STRONG>, but  which  use
@@ -313,7 +313,7 @@ <H1 class="no-header">curs_slk 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 116325126..442944894 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.48 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>endwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>erasechar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>erasewchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>erasewchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_color_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
@@ -88,7 +88,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>bool</STRONG> <STRONG>has_ic_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_il_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_mouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_extended_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>b</EM><STRONG>);</STRONG>
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>longname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
@@ -166,8 +166,8 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>chtype</STRONG> <STRONG>termattrs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>termname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <EM>event</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
@@ -178,7 +178,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>vid_puts_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>vidattr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>vidputs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
-       <STRONG>wchar_t*</STRONG> <STRONG>wunctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>wchar_t*</STRONG> <STRONG>wunctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
 
@@ -215,7 +215,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
        <STRONG>#include</STRONG> <STRONG>&lt;unctrl.h&gt;</STRONG>
 
-       <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG> <STRONG>unctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG> <STRONG>unctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 2fe219960..84f7a15b0 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.38 2024/04/13 22:16:39 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -57,11 +57,11 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
        <STRONG>int</STRONG> <STRONG>baudrate(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>erasechar(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>erasewchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>erasewchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_ic(void);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_il(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>killwchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>killwchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*longname(void);</STRONG>
        <STRONG>attr_t</STRONG> <STRONG>term_attrs(void);</STRONG>
        <STRONG>chtype</STRONG> <STRONG>termattrs(void);</STRONG>
@@ -80,8 +80,8 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1
        The <STRONG>erasechar</STRONG> routine returns the user's current erase character.
 
        The  <STRONG>erasewchar</STRONG>  routine  stores  the  current  erase  character in the
-       location referenced by <EM>ch</EM>.  If no erase character has been defined, the
-       routine fails and the location referenced by <EM>ch</EM> is not changed.
+       location referenced by <EM>wc</EM>.  If no erase character has been defined, the
+       routine fails and the location referenced by <EM>wc</EM> is not changed.
 
 
 </PRE><H3><a name="h3-has_ic_has_il">has_ic, has_il</a></H3><PRE>
@@ -98,8 +98,8 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1
        The <STRONG>killchar</STRONG> routine returns the user's current line kill character.
 
        The  <STRONG>killwchar</STRONG>  routine  stores  the current line-kill character in the
-       location referenced by <EM>ch</EM>.  If no line-kill character has been defined,
-       the routine fails and the location referenced by <EM>ch</EM> is not changed.
+       location referenced by <EM>wc</EM>.  If no line-kill character has been defined,
+       the routine fails and the location referenced by <EM>wc</EM> is not changed.
 
 
 </PRE><H3><a name="h3-longname">longname</a></H3><PRE>
@@ -139,8 +139,8 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.  It changes
-       the return type of <STRONG>termattrs</STRONG> to the new type <STRONG>attr_t</STRONG>.  Most versions  of
+       X/Open  Curses,  Issue  4  describes  these  functions.  It changes the
+       return type of <STRONG>termattrs</STRONG> to the new  type  <STRONG>attr_t</STRONG>.   Most  versions  of
        curses truncate the result returned by <STRONG>termname</STRONG> to 14 characters.
 
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index b35ae8cb3..cb46f66b3 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.83 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</H1>
               implementations conforming to  portions  of  X/Open  Curses  now
               withdrawn.   The  BSD  <EM>termcap</EM> library would store a copy of the
               terminal  type  description  in  the  area  referenced  by  this
-              pointer.   <EM>ncurses</EM> stores terminal type descriptions in compiled
+              pointer.  <EM>terminfo</EM> stores terminal type descriptions in compiled
               form, which is not the same thing.
 
           <STRONG>o</STRONG>   The meanings of the  return  values  differ.   The  BSD  <EM>termcap</EM>
@@ -333,11 +333,11 @@ <H1 class="no-header">curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        parameterized string capability, be aware that it is returned in  <EM>term-</EM>
        <EM>info</EM> notation, not the older and not-quite-compatible <EM>termcap</EM> notation.
        This does not cause problems if all you do with it  is  call  <STRONG>tgoto</STRONG>  or
-       <STRONG>tparm</STRONG>,  which both expand <EM>terminfo</EM>-style strings as <EM>terminfo</EM> does.  (If
-       <EM>ncurses</EM> is configured to support  <EM>termcap,</EM>  <STRONG>tgoto</STRONG>  checks  whether  the
-       string  is  <EM>terminfo</EM>-style  by  looking  for "<STRONG>%p</STRONG>" parameters or "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"
-       delays, and invokes a <EM>termcap</EM>-style parser if the string appears not to
-       use <EM>terminfo</EM> syntax.)
+       <STRONG>tparm</STRONG>,   which   both   parametrically   expand  <EM>terminfo</EM>-style  string
+       capabilities as <EM>terminfo</EM> does.  (If <EM>ncurses</EM> is  configured  to  support
+       <EM>termcap,</EM>  <STRONG>tgoto</STRONG>  checks whether the string is <EM>terminfo</EM>-style by looking
+       for "<STRONG>%p</STRONG>" parameters or "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"  delays,  and  invokes  a  <EM>termcap</EM>-style
+       parser if the string appears not to use <EM>terminfo</EM> syntax.)
 
        Because  <EM>terminfo</EM>'s  syntax  for padding in string capabilities differs
        from <EM>termcap</EM>'s, users can be surprised.
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_termcap 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index a0c23473d..08a4d087b 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.44 2024/03/16 15:49:58 tom Exp @
+  * @Id: curs_touch.3x,v 1.47 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
           <STRONG>is_linetouched</STRONG>
                returns an error if the window pointer is null, or if the  line
-               number is outside the window.
+               number is outside the window boundaries.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
                normal return values of this function.   Because  the  function
@@ -111,7 +111,7 @@ <H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
           <STRONG>wtouchln</STRONG>
                returns an error if the window pointer is null, or if the  line
-               number is outside the window.
+               number is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -125,8 +125,8 @@ <H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        does not check the window parameter <EM>win</EM> to ensure that it is not  <STRONG>NULL</STRONG>;
        otherwise this implementation behaves the same as SVr4.
 
-       The XSI Curses standard, Issue 4 describes these functions, but defines
-       no error conditions.
+       X/Open  Curses, Issue 4 describes these functions, but defines no error
+       conditions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_touch 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index dbbf128c1..ef2dfcafb 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.47 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -55,7 +55,7 @@ <H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>unsigned</STRONG> <STRONG>curses_trace(const</STRONG> <STRONG>unsigned</STRONG> <EM>param</EM><STRONG>);</STRONG>
+       <STRONG>unsigned</STRONG> <STRONG>curses_trace(const</STRONG> <STRONG>unsigned</STRONG> <EM>trace-mask</EM><STRONG>);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>_tracef(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>format</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>char</STRONG> <STRONG>*_traceattr2(int</STRONG> <EM>buffer</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracecchar_t(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>string</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracecchar_t2(int</STRONG> <EM>buffer</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>string</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*_tracechar(int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*_tracechar(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracechtype(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracechtype2(int</STRONG> <EM>buffer</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
@@ -72,7 +72,7 @@ <H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>deprecated</EM> <EM>*/</EM>
-       <STRONG>void</STRONG> <STRONG>trace(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>int</STRONG> <EM>param</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>trace(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>int</STRONG> <EM>trace-mask</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -219,9 +219,9 @@ <H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are not part of the XSI interface.  Some  other  curses
-       implementations  are  known  to have similar features, but they are not
-       compatible with <EM>ncurses</EM>:
+       These functions are not part of  the  X/Open  Curses  interface.   Some
+       other  curses  implementations  are known to have similar features, but
+       they are not compatible with <EM>ncurses</EM>:
 
        <STRONG>o</STRONG>   SVr4 provided <STRONG>traceon</STRONG> and <STRONG>traceoff</STRONG>, to  control  whether  debugging
            information  was  written to the "trace" file.  While the functions
@@ -261,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index a923c7654..9b6c3655f 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.98 2024/03/16 15:50:09 tom Exp @
+  * @Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -56,11 +56,11 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*unctrl(chtype</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>wchar_t</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*</STRONG><EM>c</EM><STRONG>);</STRONG>
+       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*unctrl(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>wchar_t</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*keyname(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <EM>w</EM><STRONG>);</STRONG>
+       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-unctrl">unctrl</a></H3><PRE>
        The  <STRONG>unctrl</STRONG>  routine  returns  a  character string which is a printable
-       representation of the character <EM>c</EM>:
+       representation of the character <EM>ch</EM>:
 
        <STRONG>o</STRONG>   Printable characters are displayed  as  themselves,  e.g.,  a  one-
            character string containing the key.
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
            this follows the X/Open specification.
 
        The  corresponding  <STRONG>wunctrl</STRONG>  returns  a  printable  representation of a
-       complex character <EM>c</EM>.
+       complex character <EM>wch</EM>.
 
        In both <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> the attributes and color associated with the
        character parameter are ignored.
@@ -269,8 +269,8 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
        The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
-       vaguest terms.  The description here is adapted  from  the  XSI  Curses
-       standard (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
+       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+       (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
@@ -333,10 +333,10 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.  It  states
-       that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but
-       does not define any error conditions.  This implementation  checks  for
-       three cases:
+       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
+       <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but does
+       not define any error conditions.  This implementation checks for  three
+       cases:
 
        <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
            X/Open Curses documented.
@@ -392,7 +392,7 @@ <H1 class="no-header">curs_util 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index b456816cf..6165a34db 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_window.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -217,7 +217,7 @@ <H1 class="no-header">curs_window 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses, Issue 4 describes these functions.
 
        X/Open Curses states regarding <STRONG>delwin</STRONG>:
 
@@ -256,7 +256,7 @@ <H1 class="no-header">curs_window 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index ef8bc8866..a1c536e45 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.59 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_driver.3x,v 1.61 2024/04/20 18:55:09 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -55,7 +55,7 @@ <H1 class="no-header">form_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>form_driver(FORM</STRONG> <STRONG>*</STRONG><EM>form</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>form_driver_w(FORM</STRONG> <STRONG>*</STRONG><EM>form</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>form_driver_w(FORM</STRONG> <STRONG>*</STRONG><EM>form</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -275,7 +275,7 @@ <H1 class="no-header">form_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index ec0995139..29b42500c 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.26 2024/03/16 15:35:01 tom Exp @
+  * @Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -58,39 +58,39 @@ <H1 class="no-header">legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>use_legacy_coding</STRONG>  function is an extension to the curses library.
-       It allows the caller to change  the  result  of  <STRONG>unctrl</STRONG>,  and  suppress
-       related checks within the library that would normally cause nonprinting
-       characters to be rendered in visible form.   This  affects  only  8-bit
-       characters.
+       <STRONG>use_legacy_coding</STRONG> is an extension to the <EM>curses</EM> library.  It allows the
+       caller to change the result of <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>, suppressing <STRONG>isprint(3)</STRONG>-based
+       checks  within  the  library  that  would  normally  cause  nonprinting
+       characters to be rendered in visible form.  The alteration affects only
+       eight-bit characters.
 
-       The <EM>level</EM> parameter controls the result:
+       The <EM>level</EM> parameter controls the result.
 
-              0    the   library  functions  normally,  rendering  nonprinting
-                   characters as described in <STRONG>unctrl</STRONG>.
+              <STRONG>0</STRONG>    The   library  functions  normally,  rendering  nonprinting
+                   characters as described in <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>,
 
-              1    the  library  ignores  <STRONG>isprintf</STRONG>  for  codes  in  the  range
-                   160-255.
+              <STRONG>1</STRONG>    the library ignores <EM>isprint</EM> for codes in the range 160-255.
 
-              2    the  library  ignores  <STRONG>isprintf</STRONG>  for  codes  in  the  range
-                   128-255.  It also modifies the output  of  <STRONG>unctrl</STRONG>,  showing
-                   codes in the range 128-159 as is.
+              <STRONG>2</STRONG>    the library ignores <EM>isprint</EM> for codes in the range 128-255.
+                   It also modifies the output of <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>, showing codes in
+                   the range 128-159 as is.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       If  the  screen has not been initialized, or the <EM>level</EM> parameter is out
-       of range, the function returns <STRONG>ERR</STRONG>.  Otherwise, it returns the previous
-       level: <STRONG>0</STRONG>, <STRONG>1</STRONG> or <STRONG>2</STRONG>.
+       If the screen has not been initialized, or the <EM>level</EM> parameter  is  out
+       of  range,  <STRONG>use_legacy_coding</STRONG>  returns  <STRONG>ERR</STRONG>.  Otherwise, it returns the
+       previous level: <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  routine  is specific to <EM>ncurses</EM>.  It was not supported on Version
-       7, BSD or System V implementations.  It is recommended  that  any  code
-       depending on <EM>ncurses</EM> extensions be conditioned using NCURSES_VERSION.
+       <STRONG>use_legacy_coding</STRONG> is specific to <EM>ncurses</EM>.   It  was  not  supported  on
+       Version  7,  BSD  or  System V implementations.  Applications employing
+       <EM>ncurses</EM> extensions should condition their use on the visibility of  the
+       <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Thomas Dickey (to support lynx's font-switching feature).
+       Thomas Dickey (to support <STRONG>lynx(1)</STRONG>'s font-switching feature).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index fcd1725b9..741ce949b 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.207 2024/04/14 00:34:00 tom Exp @
+  * @Id: ncurses.3x,v 1.210 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       describes <EM>ncurses</EM> version 6.4 (patch 20240413).
+       document describes <EM>ncurses</EM> version 6.4 (patch 20240420).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; the reading of terminal
@@ -235,6 +235,10 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        parameters.
 
                        <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
+                       <EM>c</EM>     a <EM>char</EM> or <EM>int</EM>
+                       <EM>ch</EM>    a <EM>chtype</EM>
+                       <EM>wc</EM>    a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> or <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>
+                       <EM>wch</EM>   a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
                        <EM>win</EM>   pointer to a <EM>WINDOW</EM>
                        <EM>pad</EM>   pointer to a <EM>WINDOW</EM> that is a pad
 
@@ -376,11 +380,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     echo_wchar               <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     echochar                 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     endwin                   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     erase                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
-
                     erasechar                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     erasewchar               <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
                     exit_curses              <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>*
@@ -442,11 +446,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     ins_wch                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     ins_wstr                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
-
                     insch                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     insdelln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     insertln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
@@ -508,11 +512,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     mvget_wch                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
-
                     mvhline_set              <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     mvin_wch                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     mvin_wchnstr             <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
@@ -574,11 +578,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     mvwprintw                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     mvwscanw                 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     mvwvline                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
-
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -640,11 +644,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_label                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_noutrefresh          <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_refresh              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     standout                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -706,11 +710,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+
                     wattr_get                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_off                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_on                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_set                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -772,11 +776,11 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+
                     wstandend                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wstandout                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wsyncdown                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wsyncup                  <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     wtimeout                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     wtouchln                 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     wunctrl                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
@@ -796,9 +800,9 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        Unless  otherwise  noted, functions that return an integer return <STRONG>OK</STRONG> on
        success and <STRONG>ERR</STRONG> on failure.  Functions that return pointers return <STRONG>NULL</STRONG>
        on  failure.   Typically,  <EM>ncurses</EM>  treats  a  null pointer passed as a
-       function parameter as a failure.  Functions with a  "mv"  prefix  first
-       perform  cursor  movement  using  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and fail if the position is
-       outside the window.
+       function parameter as a failure.  Functions prefixed  with  "mv"  first
+       perform  cursor movement and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the
+       window boundaries.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
@@ -1035,119 +1039,97 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       Denotes your terminal type.  Each terminal  type  is  distinct,  though
-       many are similar.
-
-       <EM>TERM</EM>  is commonly set by terminal emulators to help applications find a
-       workable  terminal  description.   Some  of  those  choose  a   popular
-       approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
-       Not  infrequently,  your  application  will  have  problems  with  that
-       approach, e.g., incorrect function-key definitions.
-
-       If  you set <EM>TERM</EM> in your environment, it has no effect on the operation
-       of the terminal emulator.  It only affects the  way  applications  work
-       within  the  terminal.   Likewise,  as a general rule (<STRONG>xterm(1)</STRONG> being a
-       rare exception), terminal emulators which allow you to specify <EM>TERM</EM>  as
-       a  parameter  or  configuration  value  do not change their behavior to
-       match that setting.
+       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
+       many  are  similar.   It  is commonly set by terminal emulators to help
+       applications find a  workable  terminal  description.   Some  choose  a
+       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+       an exact fit to their capabilities.  Not infrequently,  an  application
+       will  have  problems  with that approach; for example, a key stroke may
+       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+       characters on the screen.
+
+       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
+       applications communicate with the terminal.   Likewise,  as  a  general
+       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
+       you to specify <EM>TERM</EM> as a parameter or configuration value do not change
+       their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
-       If the <EM>ncurses</EM>  library  has  been  configured  with  <EM>termcap</EM>  support,
-       <EM>ncurses</EM>  will  check for a terminal's description in termcap form if it
-       is not available in the terminfo database.
-
-       The <EM>TERMCAP</EM> environment variable contains either a terminal description
-       (with  newlines  stripped  out),  or  a  file  name  telling  where the
-       information denoted by the <EM>TERM</EM> environment variable exists.  In either
-       case,  setting  it  directs  <EM>ncurses</EM> to ignore the usual place for this
-       information, e.g., /etc/termcap.
+       If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
+       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
+       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
+       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
+       should  contain  either  a terminal description (with newlines stripped
+       out), or a file name indicating where the information required  by  the
+       <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM> can be configured to read  from  multiple  terminal  databases.
-       The  <EM>TERMINFO</EM>  variable overrides the location for the default terminal
-       database.  Terminal descriptions (in terminal  format)  are  stored  in
-       terminal databases:
-
-       <STRONG>o</STRONG>   Normally these are stored in a directory tree, using subdirectories
-           named by the first letter of the terminal names therein.
-
-           This is the scheme used in System V, which legacy Unix systems use,
-           and  the  <EM>TERMINFO</EM> variable is used by <EM>curses</EM> applications on those
-           systems to override the default location of the terminal database.
-
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built to use hashed databases,  then  each  entry  in
-           this list may be the path of a hashed database file, e.g.,
-
-               /usr/share/terminfo.db
+       <EM>ncurses</EM>  can  be configured to read terminal type description databases
+       in various locations using different formats.  This variable  overrides
+       the default location.
 
-           rather than
+       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
+           tree using subdirectories named by the common first letters of  the
+           terminal types named therein.  This is the scheme used in System V.
 
-               /usr/share/terminfo/
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
+           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
+           <EM>/usr/share/terminfo/</EM>.
 
-           The  hashed  database  uses  less disk-space and is a little faster
-           than the directory tree.  However,  some  applications  assume  the
-           existence  of  the  directory tree, reading it directly rather than
-           using the terminfo library calls.
+       The  hashed  database  uses less disk space and is a little faster than
+       the directory tree.  However, some applications assume the existence of
+       the directory tree, and read it directly rather than using the <EM>terminfo</EM>
+       API.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  with  a  support  for  reading  termcap  files
-           directly,  then  an entry in this list may be the path of a termcap
-           file.
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
+           contain the location of a <EM>termcap</EM> file.
 
-       <STRONG>o</STRONG>   If the <EM>TERMINFO</EM> variable begins with "hex:" or "b64:", <EM>ncurses</EM> uses
-           the  remainder of that variable as a compiled terminal description.
-           You might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>:
+       <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
+           the remainder of the value as a compiled <EM>terminfo</EM> description.  You
+           might produce the base64 format using <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>.
 
-               TERMINFO="$(infocmp -0 -Q2 -q)"
-               export TERMINFO
+                  TERMINFO=$(infocmp -0 -Q2 -q)
+                  export TERMINFO
 
-           The compiled description is used if it corresponds to the  terminal
-           identified by the <EM>TERM</EM> variable.
+           The  compiled  description  is  used  only if it corresponds to the
+           terminal type identified by <EM>TERM</EM>.
 
-       Setting  <EM>TERMINFO</EM> is the simplest, but not the only way to set location
-       of the default  terminal  database.   The  complete  list  of  database
-       locations in order follows:
+       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
+       <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
-          <STRONG>o</STRONG>   the  last  terminal  database to which <EM>ncurses</EM> wrote, if any, is
-              searched first
+       <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
+           wrote, if any
 
-          <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
+       <STRONG>o</STRONG>   the location specified by the <EM>TERMINFO</EM> environment variable
 
-          <STRONG>o</STRONG>   $HOME/.terminfo
+       <STRONG>o</STRONG>   <EM>$HOME/.terminfo</EM>
 
-          <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
+       <STRONG>o</STRONG>   locations listed in the <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable
 
-          <STRONG>o</STRONG>   one or more locations whose names are  configured  and  compiled
-              into the <EM>ncurses</EM> library, i.e.,
+       <STRONG>o</STRONG>   location(s) configured and compiled into <EM>ncurses</EM>
 
-             <STRONG>o</STRONG>   /usr/share/terminfo   (corresponding   to  the  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>
-                 variable)
-
-             <STRONG>o</STRONG>   /usr/share/terminfo (corresponding to the <EM>TERMINFO</EM> variable)
+          <STRONG>o</STRONG>   <EM>/usr/share/terminfo</EM>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       Specifies a list of locations  to  search  for  terminal  descriptions.
-       Each  location  in  the list is a terminal database as described in the
-       section on the <EM>TERMINFO</EM> variable.  The  list  is  separated  by  colons
-       (i.e., ":") on Unix, semicolons on OS/2 EMX.
-
-       There  is  no  corresponding  feature  in  System  V terminfo; it is an
-       extension developed for <EM>ncurses</EM>.
+       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
+       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
+       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
+       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
+       feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
-       If <EM>TERMCAP</EM> does not hold a file name then <EM>ncurses</EM> checks  the  <EM>TERMPATH</EM>
-       environment  variable.  This is a list of filenames separated by spaces
-       or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
-
-       If the <EM>TERMPATH</EM> environment variable is not set, <EM>ncurses</EM> looks  in  the
-       files
-
-           /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
+       If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
+       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
+       <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
+       list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
-       in that order.
+       If both <EM>TERMCAP</EM> and <EM>TERMPATH</EM> are unset or invalid, <EM>ncurses</EM> searches for
+       the files <EM>/etc/termcap</EM>, <EM>/usr/share/misc/termcap</EM>, and <EM>$HOME/.termcap</EM>, in
+       that order.
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
@@ -1156,7 +1138,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
-       --disable-overwrite
+       <STRONG>--disable-overwrite</STRONG>
             The standard include for <EM>ncurses</EM> is as noted in <STRONG>SYNOPSIS</STRONG>:
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
@@ -1171,7 +1153,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
             It  also  omits  a  symbolic  link  which  would  allow you to use
             <STRONG>-lcurses</STRONG> to build executables.
 
-       --enable-widec
+       <STRONG>--enable-widec</STRONG>
             The  configure  script   renames   the   library   and   (if   the
             <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
             different subdirectory.  All of  the  library  names  have  a  "w"
@@ -1186,7 +1168,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
             You  must  also  enable  the wide-character features in the header
             file when compiling for the  wide-character  library  to  use  the
             extended  (wide-character)  functions.   The  symbol which enables
-            these features has changed since XSI Curses, Issue 4:
+            these features has changed since X/Open Curses, Issue 4:
 
             <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
@@ -1214,7 +1196,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
             applications to be built using either library from the same set of
             headers.
 
-       --with-pthread
+       <STRONG>--with-pthread</STRONG>
             The configure script renames the  library.   All  of  the  library
             names  have  a  "t"  appended  to  them  (before  any "w" added by
             <STRONG>--enable-widec</STRONG>).
@@ -1224,19 +1206,16 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
             to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
-       --with-shared
-
-       --with-normal
-
-       --with-debug
-
-       --with-profile
+       <STRONG>--with-shared</STRONG>
+       <STRONG>--with-normal</STRONG>
+       <STRONG>--with-debug</STRONG>
+       <STRONG>--with-profile</STRONG>
             The  shared  and  normal  (static)  library  names differ by their
             suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
             profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
-       --with-termlib
+       <STRONG>--with-termlib</STRONG>
             Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
@@ -1260,7 +1239,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
-       --with-trace
+       <STRONG>--with-trace</STRONG>
             The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
             is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
@@ -1291,15 +1270,15 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
        redirected  to  something  that  is  not a terminal device, the library
        writes screen updates to the standard error file descriptor.  This  was
-       an undocumented feature of SVr3.
+       an undocumented feature of SVr3 <EM>curses</EM>.
 
-       See  subsection  "Header  files"  below  regarding  symbols  exposed by
+       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
-       terminals, including <EM>xterm</EM>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
+       terminals, including <STRONG>xterm(1)</STRONG>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
        <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
        when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
@@ -1310,8 +1289,8 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
        X/Open   Curses  by  allowing  the  application  programmer  to  define
-       additional   key   sequences   at    runtime;    see    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,
-       <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
+       additional key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
+       <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
        <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
        ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
@@ -1320,20 +1299,20 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        to  draw colored text on a background whose color is set independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An <EM>ncurses</EM> application can choose  to  hide  the  internal  details  of
-       <EM>WINDOW</EM>   structures,   instead   using   accessor   functions  such  as
-       <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
+       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>WINDOW</EM>  structure
+       internals, instead using accessor functions such as <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> enables an  application  to  direct  application  output  to  a
+       <EM>ncurses</EM>  enables  an  application  to  direct  application  output to a
        printer attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
-       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that  can  gather  color  information  from  them  when many colors are
+       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
+       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that can gather color  information  from  them  when  many  colors  are
        supported.
 
-       Some extensions are only available if <EM>ncurses</EM> is  compiled  to  support
-       them; section "ALTERNATE CONFIGURATIONS" describes how.
+       Some  extensions  are available only if <EM>ncurses</EM> permits modification of
+       <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s behavior; see <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.  <EM>ncurses</EM> is  compiled
+       to support them; section "ALTERNATE CONFIGURATIONS" describes how.
 
        <STRONG>o</STRONG>   Rudimentary   support   for   multi-threaded  applications  may  be
            available; see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
@@ -1363,7 +1342,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
        and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
-       Curses, and supports nearly all its enhanced features.
+       Curses, and supports nearly all features of its enhanced level.
 
        Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
        "PORTABILITY" sections of applicable man pages.
@@ -1373,113 +1352,117 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
        In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations,  this  one  checks  parameters  such as
-       pointers to <EM>WINDOW</EM> structures to ensure they are not  null.   The  main
-       reason  for  providing  this  behavior  is  to guard against programmer
-       error.  The standard interface does not provide a way for  the  library
-       to  tell an application which of several possible errors were detected.
-       Relying on this (or some other) extension  will  adversely  affect  the
-       portability of curses applications.
+       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
+       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
+       is  done  primarily  to  guard  against programmer error.  The standard
+       interface does not provide a way for the library to tell an application
+       which  of  several  possible errors occurred.  Relying on this (or some
+       other)  extension  adversely  affects   the   portability   of   <EM>curses</EM>
+       applications.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In  historic  curses  versions, delays embedded in the capabilities <STRONG>cr</STRONG>,
-       <STRONG>ind</STRONG>, <STRONG>cub1</STRONG>, <STRONG>ff</STRONG> and <STRONG>tab</STRONG> activated corresponding delay bits  in  the  Unix
-       tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
-       interface  to the Unix kernel significantly and increases the package's
-       portability correspondingly.
+       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
+       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
+       (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
+       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
+       NUL  bytes  to the device.  This method is slightly more expensive, but
+       narrows  the  interface  to   the   Unix   kernel   significantly   and
+       correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
+       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
        <EM>unctrl.h</EM>.
 
-       X/Open Curses has more to say, but does not finish the story:
+       X/Open Curses has more to say,
 
-           The  inclusion  of &lt;curses.h&gt; may make visible all symbols from the
-           headers &lt;stdio.h&gt;, &lt;term.h&gt;, &lt;termios.h&gt;, and &lt;wchar.h&gt;.
+           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
+           headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
-       Here is a more complete story:
+       but does not finish the story.  A more complete account follows.
 
-       <STRONG>o</STRONG>   Starting  with  BSD  curses,  all  implementations  have   included
-           &lt;stdio.h&gt;.
+       <STRONG>o</STRONG>   Starting  with 4BSD <EM>curses</EM> (1980) all implementations have provided
+           a <EM>curses.h</EM> file.
 
-           BSD  curses  included  &lt;curses.h&gt;  and  &lt;unctrl.h&gt; from an internal
-           header file <EM>curses.ext</EM> ("ext" abbreviated "externs").
+           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
+           header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           BSD curses used &lt;stdio.h&gt; internally (for <STRONG>printw</STRONG>  and  <STRONG>scanw</STRONG>),  but
-           nothing in &lt;curses.h&gt; itself relied upon &lt;stdio.h&gt;.
+           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
+           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
+           nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2  curses  added <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, which relies upon &lt;stdio.h&gt;.  That
-           is, the function prototype uses <STRONG>FILE</STRONG>.
+       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
+           function prototype employs the <EM>FILE</EM> type.
 
-           SVr4 curses added <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG>, which also use &lt;stdio.h&gt;.
+           SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
-           X/Open Curses documents all three of these functions.
+           X/Open Curses specifies all three of these functions.
 
-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
-           include  &lt;stdio.h&gt;  before  including  &lt;curses.h&gt;.   Both  document
-           curses showing &lt;curses.h&gt; as the only required header.
+           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
+           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
+           requiring only <EM>curses.h</EM>.
 
-           As a result, standard &lt;curses.h&gt; will always include &lt;stdio.h&gt;.
+           As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
-           &lt;unctrl.h&gt;.
+       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
+           <EM>unctrl.h</EM>.
 
-           As   noted  in  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <EM>ncurses</EM>  includes  &lt;unctrl.h&gt;  from
-           &lt;curses.h&gt; (like SVr4).
+           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
+           (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open's comments about &lt;term.h&gt; and &lt;termios.h&gt; may refer to HP-UX
-           and AIX:
+       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
+           HP-UX and AIX.
 
-           HP-UX curses includes &lt;term.h&gt; from &lt;curses.h&gt; to declare <STRONG>setupterm</STRONG>
-           in curses.h, but <EM>ncurses</EM> (and Solaris curses) do not.
+           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
+           <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX curses includes &lt;term.h&gt; and &lt;termios.h&gt;.  Again, <EM>ncurses</EM>  (and
-           Solaris curses) do not.
+           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  termios.h<EM>.</EM>   Again,  <EM>ncurses</EM>  and
+           Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open  says  that &lt;curses.h&gt; <EM>may</EM> include &lt;term.h&gt;, but there is no
-           requirement that it do that.
+       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
+           require it to do so.
 
-           Some  programs  use  functions  declared  in  both  &lt;curses.h&gt;  and
-           &lt;term.h&gt;,  and  must include both headers in the same module.  Very
-           old versions of AIX curses  required  including  &lt;curses.h&gt;  before
-           including &lt;term.h&gt;.
+           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
+           and  must  include  both header files in the same module.  Very old
+           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
+           <EM>term.h</EM>.
 
-           Because  <EM>ncurses</EM>  header files include the headers needed to define
-           datatypes used in the headers, <EM>ncurses</EM> header files can be included
-           in  any  order.  But for portability, you should include &lt;curses.h&gt;
-           before &lt;term.h&gt;.
+           The  header  files supplied by <EM>ncurses</EM> include the standard library
+           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
+           files  can  be  included  in  any  order.  But for portability, you
+           should include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses says <EM>"may</EM> <EM>make</EM> <EM>visible"</EM> because  including  a  header
-           file does not necessarily make all symbols in it visible (there are
-           ifdef's to consider).
+       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
+           file  does  not  necessarily  make visible all of the symbols in it
+           (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For instance, in <EM>ncurses</EM> &lt;wchar.h&gt; <EM>may</EM> be included  if  the  proper
+           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
            symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
-           support.  If the header  is  included,  its  symbols  may  be  made
-           visible.   That depends on the value used for <STRONG>_XOPEN_SOURCE</STRONG> feature
-           test macro.
-
-       <STRONG>o</STRONG>   X/Open Curses documents one required header,  in  a  special  case:
-           &lt;stdarg.h&gt;   before  &lt;curses.h&gt;  to  prototype  the  <STRONG>vw_printw</STRONG>  and
-           <STRONG>vw_scanw</STRONG> functions (as  well  as  the  obsolete  the  <STRONG>vwprintw</STRONG>  and
-           <STRONG>vwscanw</STRONG> functions).  Each of those uses a <STRONG>va_list</STRONG> parameter.
-
-           The  two  obsolete  functions  were  introduced in SVr3.  The other
-           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
-           curses  provided  for  the  possibility  that  an application might
-           include either &lt;varargs.h&gt; or &lt;stdarg.h&gt;.  Initially, that was done
-           by  using  <STRONG>void*</STRONG>  for the <STRONG>va_list</STRONG> parameter.  Later, a special type
-           (defined in &lt;stdio.h&gt;) was introduced, to allow for compiler  type-
-           checking.  That special type is always available, because &lt;stdio.h&gt;
-           is always included by &lt;curses.h&gt;.
-
-           None of the X/Open Curses implementations require an application to
-           include  &lt;stdarg.h&gt;  before  &lt;curses.h&gt;  because  they  either have
-           allowed for a special type, or (like  <EM>ncurses</EM>)  include  &lt;stdarg.h&gt;
-           directly to provide a portable interface.
+           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
+           depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
+
+       <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
+           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
+           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
+           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
+           argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
+
+           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
+           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
+           possibility  that  an application might include either <EM>varargs.h</EM> or
+           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
+           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
+           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
+           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
+           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
+           call's  actual  parameters  against the formal ones declared in its
+           prototype.
+
+           No  conforming  implementations  of  X/Open   Curses   require   an
+           application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
+           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
+           <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -1492,7 +1475,7 @@ <H1 class="no-header">ncurses 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.4                       2024-04-20                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index f0be19773..089096f7b 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.22 2023/12/23 23:44:26 tom Exp @
+  * @Id: MKncu_config.in,v 1.23 2024/04/20 21:13:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2023-12-23 ncurses 6.4 User commands</TITLE>
+<TITLE>ncursesw6-config 1 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2023-12-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">ncursesw6-config 1 2023-12-23 ncurses 6.4 User commands</H
 
 
 
-ncurses 6.4                       2023-12-23               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.4                       2024-04-20               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 9f409908c..5f4818826 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.57 2024/03/16 15:35:01 tom Exp @
+  * @Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -214,43 +214,42 @@ <H1 class="no-header">tabs 1 2024-03-16 ncurses 6.4 User commands</H1>
        A <STRONG>tabs</STRONG> utility appeared in PWB/Unix  1.0  (1977).   A  reduced  version
        shipped  in  Seventh  Edition  Unix (early 1979) and in 3BSD (later the
        same year); it supported a "-n" option to set the first tab stop at the
-       left margin.  That option is not documented by POSIX.
+       left margin.  That option is not specified by POSIX.
 
        The  PWB/Unix  <STRONG>tabs</STRONG>  utility  returned  in  System III (1980), and used
-       built-in tables, rather than the terminal database, to support a  half-
-       dozen hardcopy terminal (printer) types.  It also had built-in logic to
-       support setting the left margin, as well as a feature for  copying  the
-       tab settings from a file.
+       built-in tables to support a  half-dozen  hardcopy  terminal  (printer)
+       types.   It  also had logic to support setting the left margin, as well
+       as a feature for copying the tab settings from a file.
 
-       Versions  of  the program in later releases of AT&amp;T Unix, such as SVr4,
-       added support for the terminal database, but  retained  the  tables  to
+       Versions of the program in later releases of AT&amp;T Unix, such  as  SVr4,
+       added  support  for  the  terminal database, but retained the tables to
        support the printers.  By this time, System V <STRONG>tput</STRONG> had incorporated the
-       tab stop initialization feature of BSD's <STRONG>tset</STRONG> from 1982,  but  employed
+       tab  stop  initialization feature of BSD's <STRONG>tset</STRONG> from 1982, but employed
        the <EM>terminfo</EM> database to do so.
 
-       The  <STRONG>+m</STRONG>  option was documented in the POSIX Base Specifications Issue 5
-       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
-       motivation,  though an introductory comment "and optionally adjusts the
-       margin"  remains,  overlooked  in  the  removal.   The   <STRONG>tabs</STRONG>   utility
-       documented  in Issues 6 and later has no mechanism for setting margins.
-       The <STRONG>+m</STRONG> option in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4  feature  by  using
+       The <STRONG>+m</STRONG> option was documented in the POSIX Base Specifications  Issue  5
+       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
+       motivation, though an introductory comment "and optionally adjusts  the
+       margin"   remains,   overlooked  in  the  removal.   The  <STRONG>tabs</STRONG>  utility
+       documented in Issues 6 and later has no mechanism for setting  margins.
+       The  <STRONG>+m</STRONG>  option  in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4 feature by using
        terminal capabilities rather than built-in tables.
 
-       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
+       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
        implementations impose one; the limit is 20 in PWB/Unix's <STRONG>tabs</STRONG> utility.
-       While  some  terminals may not accept an arbitrary number of tab stops,
-       <EM>ncurses</EM> <STRONG>tabs</STRONG> attempts to set tab stops up to the right  margin  if  the
+       While some terminals may not accept an arbitrary number of  tab  stops,
+       <EM>ncurses</EM>  <STRONG>tabs</STRONG>  attempts  to set tab stops up to the right margin if the
        list thereof is sufficiently long.
 
-       The  "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details how
-       the committee considered  redesigning  the  <STRONG>tabs</STRONG>  and  <STRONG>tput</STRONG>  utilities,
+       The "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details  how
+       the  committee  considered  redesigning  the  <STRONG>tabs</STRONG>  and <STRONG>tput</STRONG> utilities,
        without settling on an improved solution.  It claims that
 
-           "no  known  historical  version  of <EM>tabs</EM> supports the capability of
+           "no known historical version of <EM>tabs</EM>  supports  the  capability  of
            setting arbitrary tab stops."
 
-       The  feature  described  in  subsection  "Explicit  Lists"  above   was
-       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
+       The   feature  described  in  subsection  "Explicit  Lists"  above  was
+       implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
        stops nevertheless.
 
 
@@ -259,7 +258,7 @@ <H1 class="no-header">tabs 1 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 9a62438e2..00b75348b 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.75 2024/03/16 15:35:01 tom Exp @
+  * @Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2024-03-16 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2024-04-20 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2024-03-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2024-04-20 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -281,9 +281,9 @@ <H1 class="no-header">term 5 2024-03-16 ncurses 6.4 File formats</H1>
        versions.  The problem is that there are at  least  three  versions  of
        terminfo  (under  HP-UX,  AIX,  and OSF/1) 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 and XSI
-       Curses extensions.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for detailed discussion of terminfo
-       source compatibility issues.
+       string  table  that  (in  the  binary format) collide with System V and
+       X/Open Curses extensions.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for detailed  discussion  of
+       terminfo source compatibility issues.
 
        This  implementation  is by default compatible with the binary terminfo
        format used by Solaris curses, except in a few less-used details  where
@@ -399,7 +399,7 @@ <H1 class="no-header">term 5 2024-03-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.4                       2024-04-20                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 6487df0a8..febc18338 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,19 +32,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.63 2024/01/13 23:07:27 tom Exp @
+  * @Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2024-01-13 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2024-04-20 ncurses 6.4 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.4 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes <EM>ncurses</EM> version 6.4 (patch 20240413).
+       This document describes <EM>ncurses</EM> version 6.4 (patch 20240420).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -225,8 +225,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
            codes exceed this limit regardless.)
 
        <STRONG>o</STRONG>   The  TC  (<EM>termcap</EM>)  code  is  that used by the corresponding API of
-           <EM>ncurses.</EM>  (Some capabilities are new, and have names that BSD <EM>term-</EM>
-           <EM>cap</EM> did not originate.)
+           <EM>ncurses</EM>.  (Some capabilities are  new,  and  have  names  that  BSD
+           <EM>termcap</EM> did not originate.)
 
        <STRONG>o</STRONG>   The   description   field   attempts  to  convey  the  capability's
            semantics.
@@ -723,8 +723,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        <STRONG>clear_margins</STRONG>              <STRONG>mgc</STRONG>       <STRONG>MC</STRONG>  clear right and left soft
                                                 margins
        <STRONG>set_left_margin</STRONG>            <STRONG>smgl</STRONG>      <STRONG>ML</STRONG>  set left soft margin at
-                                                current column.  (ML is not in
-                                                BSD termcap).
+                                                current column (not in BSD
+                                                <EM>termcap</EM>)
        <STRONG>set_right_margin</STRONG>           <STRONG>smgr</STRONG>      <STRONG>MR</STRONG>  set right soft margin at
                                                 current column
        <STRONG>label_format</STRONG>               <STRONG>fln</STRONG>       <STRONG>Lf</STRONG>  label format
@@ -1585,7 +1585,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        screen, write something to the bottom line, move the cursor to the  top
        of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
        off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
-       non-destructive.   System  V  and XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
+       non-destructive.  System V and X/Open Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
        cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
        implementation is more  liberal  and  will  do  explicit  erases  after
@@ -1605,7 +1605,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
        There are two basic kinds of  intelligent  terminals  with  respect  to
-       insert/delete  character  which  can  be described using <EM>terminfo.</EM>  The
+       insert/delete  character  which  can  be described using <EM>terminfo</EM>.  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
@@ -1672,9 +1672,9 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        works.
 
        Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
-       one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> and  delete  mode  by  giving
-       <STRONG>smdc</STRONG>  and  <STRONG>rmdc</STRONG>  to  enter  and exit delete mode (any mode the terminal
-       needs to be placed in for <STRONG>dch1</STRONG> to work).
+       one parameter, <EM>n</EM>, to delete <EM>n</EM>characters, and delete mode by giving <STRONG>smdc</STRONG>
+       and  <STRONG>rmdc</STRONG> to enter and exit delete mode (any mode the terminal needs to
+       be placed in for <STRONG>dch1</STRONG> to work).
 
        A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
@@ -2426,8 +2426,8 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        the <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
        The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
-       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
-       the documentation for the AT&amp;T 505 terminal.
+       documented  in  SVr4  or  X/Open  Curses.   They  are  deduced from the
+       documentation for the AT&amp;T 505 terminal.
 
        Be careful assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM>  library  wants
        to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and emulators like
@@ -2442,9 +2442,9 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        specified, even if it is zero.
 
        Different commercial ports of <EM>terminfo</EM>  and  <EM>curses</EM>  support  different
-       subsets  of  XSI Curses and (in some cases) different extensions.  Here
-       is a summary, accurate as of October 1995, after which  the  commercial
-       Unix market contracted and lost diversity.
+       subsets  of  X/Open  Curses  and  (in some cases) different extensions.
+       Here is a summary,  accurate  as  of  October  1995,  after  which  the
+       commercial Unix market contracted and lost diversity.
 
        <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
@@ -2471,7 +2471,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
        between  commercial  Unix  systems.   At  least  two implementations of
        <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
        Unices  after  SVr1,  adding extension capabilities to the string table
-       that (in the binary format) collide with subsequent System  V  and  XSI
+       that (in the binary format) collide with subsequent System V and X/Open
        Curses extensions.
 
 
@@ -2487,7 +2487,7 @@ <H1 class="no-header">terminfo 5 2024-01-13 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-01-13                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.4                       2024-04-20                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 46578230e..f585ce138 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.66 2024/03/16 15:35:01 tom Exp @
+  * @Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -75,10 +75,10 @@ <H1 class="no-header">toe 1m 2024-03-16 ncurses 6.4 User commands</H1>
                 <EM>terminfo</EM>  would  search,  instead  of  only  the first that it
                 finds.
 
-                If the <STRONG>-s</STRONG> option is also given,  <STRONG>toe</STRONG>  adds  a  column  to  the
-                report,  showing  (like <STRONG>conflict(1)</STRONG>) which entries belong to a
-                given terminal database.  An "*" marks  entries  that  differ,
-                and "+" marks equivalent entries.
+                If  <STRONG>-s</STRONG>  is  also  given,  <STRONG>toe</STRONG>   additionally   reports,   like
+                <STRONG>conflict(1)</STRONG>,  which  entries  correspond  to  a given terminal
+                database.  An "*" marks entries that  differ,  and  "+"  marks
+                equivalent entries.
 
                 Without   the  <STRONG>-s</STRONG>  option,  <STRONG>toe</STRONG>  does  not  attempt  to  merge
                 duplicates in its report.
@@ -185,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.4                       2024-04-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 034dfe579..2292ec3df 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.111 2024/04/13 22:09:53 tom Exp @
+  * @Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-04-13 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-04-13 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -104,9 +104,9 @@ <H1 class="no-header">tput 1 2024-04-13 ncurses 6.4 User commands</H1>
 
        <EM>cap-code</EM>   indicates a capability from the terminal database.
 
-                  If  the  capability  is of string type and takes parameters,
-                  the arguments following the capability will be used  as  its
-                  parameters.
+                  If  <EM>cap-code</EM>  is  of  string type and takes parameters, <STRONG>tput</STRONG>
+                  interprets arguments following <EM>cap-code</EM> as  the  parameters,
+                  up to the (fixed) quantity the capability requires.
 
                   Most   parameters   are   numeric.    Only  a  few  terminal
                   capabilities require string parameters; <STRONG>tput</STRONG> uses a table to
@@ -555,7 +555,7 @@ <H1 class="no-header">tput 1 2024-04-13 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-04-13                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index ed1ca6129..3bfe8b6f3 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.81 2024/03/16 15:35:01 tom Exp @
+  * @Id: tset.1,v 1.83 2024/04/20 19:09:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2024-04-20 ncurses 6.4 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2024-04-20 ncurses 6.4 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -354,15 +354,15 @@ <H1 class="no-header">tset 1 2024-03-16 ncurses 6.4 User commands</H1>
            be from the operating system, the  <EM>LINES</EM>  and  <EM>COLUMNS</EM>  environment
            variables or the terminal description.
 
-       Obtaining  the  window  size from the terminal description is common to
-       both implementations, but considered obsolescent.  Its  only  practical
-       use is for hardware terminals.  Generally speaking, a window size would
-       be unset only if there were some problem obtaining the value  from  the
-       operating  system  (and  <STRONG>setupterm</STRONG> would still fail).  For that reason,
-       the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables may be useful  for  working
-       around  window-size  problems.   Those  have  the  drawback that if the
-       window is resized, those variables must be recomputed  and  reassigned.
-       To do this more easily, use the <STRONG>resize(1)</STRONG> program.
+       Obtaining  the window size from a terminal's type description is common
+       to  both  implementations,  but  considered  obsolescent.    Its   only
+       practical  use  is  for hardware terminals.  Generally, the window size
+       will remain uninitialized only if there were a  problem  obtaining  the
+       value  from the operating system (and <STRONG>setupterm</STRONG> would still fail).  The
+       <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables may thus be useful for  working
+       around  window-size  problems, but have the drawback that if the window
+       is resized, their  values  must  be  recomputed  and  reassigned.   The
+       <STRONG>resize(1)</STRONG> program distributed with <STRONG>xterm(1)</STRONG> assists this activity.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -393,7 +393,7 @@ <H1 class="no-header">tset 1 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps b/include/Caps
index ffd620d2b..cd077b969 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.55 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps,v 1.56 2024/04/20 21:05:02 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -210,12 +210,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -650,7 +650,7 @@ key_f62				kf62	str	Fq	KEY_F(62)	-	----E	F62 function key
 key_f63				kf63	str	Fr	KEY_F(63)	-	----E	F63 function key
 clr_bol				el1	str	cb	-		-	-----	Clear to beginning of line
 clear_margins			mgc	str	MC	-		-	-----	clear right and left soft margins
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_right_margin		smgr	str	MR	-		-	-----	set right soft margin at current column
 label_format			fln	str	Lf	-		-	-----	label format
 set_clock			sclk	str	SC	-		-	-----	set clock, #1 hrs #2 mins #3 secs
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 9b1ab8c90..1adb848e0 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.27 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps.aix4,v 1.28 2024/04/20 21:05:02 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -210,12 +210,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -752,7 +752,7 @@ key_sundo			kUND	str	!3	KEY_SUNDO	0626	-----	shifted undo key
 req_for_input			rfi	str	RF	-		-	-----	send next input char (for ptys)
 clr_bol				el1	str	cb	-		-	-----	Clear to beginning of line
 clear_margins			mgc	str	MC	-		-	-----	clear right and left soft margins
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_right_margin		smgr	str	MR	-		-	-----	set right soft margin at current column
 label_format			fln	str	Lf	-		-	-----	label format
 set_clock			sclk	str	SC	-		-	-----	set clock, #1 hrs #2 mins #3 secs
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 6087346b5..723556fa1 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.25 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps.hpux11,v 1.26 2024/04/20 21:05:02 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -210,12 +210,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -658,7 +658,7 @@ key_sundo			kUND	str	!3	KEY_SUNDO	0626	-----	shifted undo key
 req_for_input			rfi	str	RF	-		-	-----	send next input char (for ptys)
 clr_bol				el1	str	cb	-		-	-----	Clear to beginning of line
 clear_margins			mgc	str	MC	-		-	-----	clear right and left soft margins
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_right_margin		smgr	str	MR	-		-	-----	set right soft margin at current column
 label_format			fln	str	Lf	-		-	-----	label format
 set_clock			sclk	str	SC	-		-	-----	set clock, #1 hrs #2 mins #3 secs
diff --git a/include/Caps.keys b/include/Caps.keys
index dccb357f7..6f8a84e34 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.24 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps.keys,v 1.25 2024/04/20 21:05:02 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -213,12 +213,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -653,7 +653,7 @@ key_f62				kf62	str	Fq	KEY_F(62)	-	----E	F62 function key
 key_f63				kf63	str	Fr	KEY_F(63)	-	----E	F63 function key
 clr_bol				el1	str	cb	-		-	-----	Clear to beginning of line
 clear_margins			mgc	str	MC	-		-	-----	clear right and left soft margins
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_right_margin		smgr	str	MR	-		-	-----	set right soft margin at current column
 label_format			fln	str	Lf	-		-	-----	label format
 set_clock			sclk	str	SC	-		-	-----	set clock, #1 hrs #2 mins #3 secs
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index df641c2ab..ece14aef2 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.23 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps.osf1r5,v 1.24 2024/04/20 21:05:02 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -210,12 +210,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -795,7 +795,7 @@ set_clock			sclk	str	SC	-		-	-----	set clock, #1 hrs #2 mins #3 secs
 set_color_band		setcolor	str	Yz	-		-	-----	Change to ribbon color #1
 set_color_pair			scp	str	sp	-		-	-----	Set current color pair to #1
 set_foreground			setf	str	Sf	-		-	-----	Set foreground color #1
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_left_margin_parm		smglp	str	Zm	-		-	-----	Set left (right) margin at column #1
 set_lr_margin			smglr	str	ML	-		-	-----	Set both left and right margins to #1, #2.  (ML is not in BSD termcap).
 set_page_length			slines	str	YZ	-		-	-----	Set page length to #1 lines
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 6f4f083d9..a41e9eca7 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.22 2024/03/16 15:26:09 Branden.Robinson Exp $
+# $Id: Caps.uwin,v 1.23 2024/04/20 21:05:02 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -210,12 +210,12 @@
 #%(Some standard codes exceed this limit regardless.)
 #%.bP
 #%The TC
-#%.RI ( \%term\%cap )
+#%.RI ( termcap )
 #%code is that used by the corresponding API of
-#%.I \%ncurses.
+#%.IR \%ncurses .
 #%(Some capabilities are new,
 #%and have names that BSD
-#%.I \%term\%cap
+#%.I termcap
 #%did not originate.)
 #%.bP
 #%The description field attempts to convey the capability's semantics.
@@ -611,7 +611,7 @@ key_f62				kf62	str	Fq	KEY_F(62)	-	----E	F62 function key
 key_f63				kf63	str	Fr	KEY_F(63)	-	----E	F63 function key
 clr_bol				el1	str	cb	-		-	-----	Clear to beginning of line
 clear_margins			mgc	str	MC	-		-	-----	clear right and left soft margins
-set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column.	 (ML is not in BSD termcap).
+set_left_margin			smgl	str	ML	-		-	-----	set left soft margin at current column (not in BSD \fItermcap\fP)
 set_right_margin		smgr	str	MR	-		-	-----	set right soft margin at current column
 device_type			devt	str	dv	-		-	-----	Indicate language/codeset support
 code_set_init			csin	str	ci	-		-	-----	Init sequence for multiple codesets
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 4e0a57eb6..a017d09f8 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.32 2023/12/16 21:42:53 tom Exp $
-.TH adacurses@USE_CFG_SUFFIX@\-config 1 2023-12-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKada_config.in,v 1.34 2024/04/20 21:13:27 tom Exp $
+.TH adacurses@USE_CFG_SUFFIX@\-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
 .ie \n(.g \{\
 .ds `` \(lq
@@ -43,6 +43,19 @@
 .ie t .ds '  \(aq
 .el   .ds '  '
 .\}
+.
+.\" Fix broken EX/EE macros on DWB troff.
+.\" Detect it: only DWB sets up a `)Y` register.
+.if !\n(.g .if \n()Y \{\
+.\" Revert the undesired changes to indentation.
+.am EX
+.in -5n
+..
+.am EE
+.in +5n
+..
+.\}
+.
 .SH NAME
 \fB\%adacurses@USE_CFG_SUFFIX@\-config\fP \-
 configuration helper for \fI@ADA_LIBNAME@\fP libraries
@@ -82,7 +95,7 @@ Consider a program using \fI@ADA_LIBNAME@\fP to write the message
 user to press the \*(``q\*('' key before exiting.
 Populate a file \fIhello.adb\fP with the following.
 .PP
-.RS 4
+.if \n(LL>67n .RS 4
 .EX
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
@@ -115,7 +128,7 @@ begin
    End_Windows;
 end Hello;
 .EE
-.RE
+.if \n(LL>67n .RE
 .ne 2
 .PP
 Then, using
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index ec6aa90ac..461c84328 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.22 2023/12/23 23:44:26 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2023-12-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.23 2024/04/20 21:13:38 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
 configuration helper for \fI\%ncurses\fP libraries
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index b7c967cb6..d1eb9a311 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.59 2024/04/13 22:11:52 tom Exp $
-.TH curs_add_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp $
+.TH curs_add_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -312,9 +312,11 @@ of bytes,
 or if it is not possible to add all of the resulting bytes in the window,
 an error is returned.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 Note that
 \fBadd_wch\fP,
@@ -323,7 +325,7 @@ Note that
 \fBecho_wchar\fP
 may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 The defaults specified for line-drawing characters apply in the POSIX locale.
 .SS "WACS Symbols"
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 8bbef8d09..5dd3e8f4e 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp $
-.TH curs_add_wchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp $
+.TH curs_add_wchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,13 +109,15 @@ if the \fIwin\fP parameter is null or
 .bP
 if the \fIwchstr\fP parameter is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All functions except \fBwadd_wchnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curs_addchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 6d4668a83..ad548520c 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.83 2024/04/13 22:23:35 tom Exp $
-.TH curs_addch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp $
+.TH curs_addch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,7 +58,7 @@
 \fB\%mvwaddch\fP,
 \fB\%echochar\fP,
 \fB\%wechochar\fP \-
-add a \fIcurses\fR character to a window and advance the cursor
+add a \fIcurses\fP character to a window and advance the cursor
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -253,13 +253,11 @@ returns
 if \fB\%scrollok\fP(3X) is not enabled in that event,
 because it is not possible to wrap to a new line.
 .PP
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I \%WINDOW
-pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 .BR \%addch ,
 .BR \%mvaddch ,
@@ -271,6 +269,13 @@ may be implemented as macros.
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.PP
 The defaults specified for forms-drawing characters apply in the POSIX
 locale.
 .SS "ACS Symbols"
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 77fe6b775..25d322aff 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.42 2024/04/13 22:21:16 tom Exp $
-.TH curs_addchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp $
+.TH curs_addchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,13 +103,15 @@ if the \fIwin\fP parameter is null or
 .bP
 if the \fIwchstr\fP parameter is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All functions except \fBwaddchnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 72dbb4514..1244001db 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.43 2024/04/13 22:14:06 tom Exp $
-.TH curs_addstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.45 2024/04/20 19:18:18 tom Exp $
+.TH curs_addstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -114,13 +114,11 @@ or
 .bP
 if an internal \fB\%waddch\fP(3X) call returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I \%WINDOW
-pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All of these functions except \fBwaddnstr\fP may be macros.
 .SH PORTABILITY
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 0f96afb20..78d5788eb 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.35 2024/04/13 22:14:06 tom Exp $
-.TH curs_addwstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.37 2024/04/20 19:18:18 tom Exp $
+.TH curs_addwstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -124,13 +124,11 @@ or
 .bP
 if an internal \fB\%wadd_wch\fP(3X) call returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I \%WINDOW
-pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All of these functions except
 .B waddnwstr
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 7ff66bbb0..af275f5aa 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.99 2024/03/16 15:38:33 tom Exp $
-.TH curs_attr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.103 2024/04/20 21:24:19 tom Exp $
+.TH curs_attr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -308,9 +308,10 @@ for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
 does not return an error if either of the parameters of \fBwattr_get\fP
 used for retrieving attribute or color pair values is \fBNULL\fP.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
 .\" ---------------------------------------------------------------------------
 .SH NOTES
 These functions may be macros:
@@ -362,7 +363,7 @@ the \fIopts\fP parameter is ignored except
 except to check that it is \fBNULL\fP.
 .\" ---------------------------------------------------------------------------
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 The standard defined the dedicated type for highlights,
 \fBattr_t\fP, which was not defined in SVr4 curses.
 The functions taking \fBattr_t\fP arguments were not supported under SVr4.
@@ -371,7 +372,7 @@ Very old versions of this library did not force an update of the screen
 when changing the attributes.
 Use \fBtouchwin\fP to force the screen to match the updated attributes.
 .PP
-The XSI Curses standard states that whether the traditional functions
+X/Open Curses states that whether the traditional functions
 \fBattron\fP/\fBattroff\fP/\fBattrset\fP can manipulate attributes other than
 \fBA_BLINK\fP, \fBA_BOLD\fP, \fBA_DIM\fP, \fBA_REVERSE\fP, \fBA_STANDOUT\fP, or
 \fBA_UNDERLINE\fP is \*(``unspecified\*(''.
@@ -379,7 +380,7 @@ Under this implementation as well as
 SVr4 curses, these functions correctly manipulate all other highlights
 (specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
 .PP
-XSI Curses added these entry points:
+X/Open Curses added these entry points:
 .sp
 .RS
 \fBattr_get\fP, \fBattr_on\fP,
@@ -411,11 +412,11 @@ WA_ALTCHARSET	Alternate character set
 .TE
 .RE
 .PP
-XSI curses does not assign values to these symbols,
+X/Open Curses does not assign values to these symbols,
 nor does it state whether or not they are related to the
 similarly-named A_NORMAL, etc.:
 .bP
-The XSI curses standard specifies that each pair of corresponding \fBA_\fP
+X/Open Curses specifies that each pair of corresponding \fBA_\fP
 and \fBWA_\fP-using functions operates on the same current-highlight
 information.
 .bP
@@ -445,7 +446,7 @@ no change is made to the window's color.
 This is consistent with SVr4 curses;
 X/Open Curses does not specify this.
 .PP
-The XSI standard extended conformance level adds new highlights
+The X/Open Curses extended conformance level adds new highlights
 \fBA_HORIZONTAL\fP, \fBA_LEFT\fP, \fBA_LOW\fP, \fBA_RIGHT\fP, \fBA_TOP\fP,
 \fBA_VERTICAL\fP (and corresponding \fBWA_\fP macros for each).
 As of August 2013,
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 1ba3fdd98..9806f42b3 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.27 2024/03/16 15:35:01 tom Exp $
-.TH curs_beep 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp $
+.TH curs_beep 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -57,7 +57,7 @@ These routines return \fBOK\fP if they succeed in beeping or flashing,
 SVr4's beep and flash routines always returned \fBOK\fP, so it was not
 possible to tell when the beep or flash failed.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 Like SVr4, it specifies that they always return \fBOK\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index ec9fe3768..25ba1f9f7 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.59 2024/03/23 19:58:58 tom Exp $
-.TH curs_bkgd 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp $
+.TH curs_bkgd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -184,7 +184,8 @@ like SVr4 \fIcurses\fP,
 checks to ensure that,
 and will reuse the old background character if the check fails.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies that
 \fB\%bkgd\fP,
 \fB\%wbkgd\fP,
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 2b49db04c..2551924c1 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.40 2024/03/23 19:59:45 tom Exp $
-.TH curs_bkgrnd 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp $
+.TH curs_bkgrnd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -199,7 +199,8 @@ and attribute in a modifiable
 parameter,
 not as the return value.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses does not provide details of how the rendition is updated.
diff --git a/man/curs_border.3x b/man/curs_border.3x
index bd6f040c8..2a5e72c14 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.46 2024/03/16 15:38:43 tom Exp $
-.TH curs_border 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border.3x,v 1.49 2024/04/20 21:20:07 tom Exp $
+.TH curs_border 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -145,16 +145,18 @@ X/Open Curses does not specify any error conditions.
 This implementation returns an error
 if the window pointer is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 The borders generated by these functions are \fIinside\fP borders (this
 is also true of SVr4 curses, though the fact is not documented).
 .PP
 Note that \fBborder\fP and \fBbox\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index da9b14480..3077da6b4 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
-.TH curs_border_set 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.36 2024/04/20 21:20:07 tom Exp $
+.TH curs_border_set 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -179,9 +179,11 @@ Otherwise, they return
 .PP
 Functions using a window parameter return an error if it is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 Note that
 \fBborder_set\fP,
@@ -193,7 +195,7 @@ Note that
 \fBvline_set\fP
 may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 2e3f2be68..0ab006451 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH curs_clear 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_clear.3x,v 1.48 2024/04/20 21:20:07 tom Exp $
+.TH curs_clear 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,7 +104,7 @@ if the cursor position is about to wrap.
 Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
 \fBclrtobot\fP, and \fBclrtoeol\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .PP
 The SVr4.0 manual says that these functions could return
 \*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
diff --git a/man/curs_color.3x b/man/curs_color.3x
index eb4958705..7a5a02f27 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.98 2024/03/16 15:35:01 tom Exp $
-.TH curs_color 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_color.3x,v 1.100 2024/04/20 21:24:19 tom Exp $
+.TH curs_color 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -506,7 +506,7 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-This implementation satisfies XSI Curses's minimum maximums
+This implementation satisfies X/Open Curses's minimum maximums
 for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
 .PP
 The \fB\%init_pair\fP routine accepts negative values of foreground
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 7a3cb2027..e62ecc130 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
-.TH curs_delch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp $
+.TH curs_delch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,7 +44,7 @@
 \fB\%wdelch\fP,
 \fB\%mvdelch\fP,
 \fB\%mvwdelch\fP \-
-delete the character at the cursor in a \fIcurses\fR window
+delete a character from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -55,28 +55,59 @@ delete the character at the cursor in a \fIcurses\fR window
 \fBint mvwdelch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
-These routines delete the character under the cursor; all characters to the
-right of the cursor on the same line are moved to the left one position and the
-last character on the line is filled with a blank.
-The cursor position does
-not change (after moving to \fIy\fP, \fIx\fP, if specified).
-(This does not
-imply use of the hardware delete character feature.)
+.B \%wdelch
+deletes the character at the cursor position in
+.IR win .
+\fB\%ncurses\fP(3X) describes the variants of this function.
+.PP
+.B \%wdelch
+moves all characters to the right of the cursor on the same line to the
+left one position and replaces the contents of the rightmost position on
+the line with the window's blank character;
+see \fB\%bkgd\fP(3X)
+(wide-character API users may consult \fB\%bkgrnd\fP(3X) instead).
+The cursor position does not change
+(after moving to
+.RI ( y ,
+.IR x ),
+if specified).
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+Functions taking a
+.I \%WINDOW
+pointer argument fail if the pointer is
+.BR NULL .
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
-Note that \fBdelch\fP, \fBmvdelch\fP, and \fBmvwdelch\fP may be macros.
+.BR \%delch ,
+.BR \%mvdelch ,
+and
+.B \%mvwdelch
+may be implemented as macros.
+.PP
+A terminal's
+.B \%delete_character
+.RB ( dch1 )
+capability
+is not necessarily employed.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
-The
-standard specifies that they return \fBERR\fP on failure, but specifies no
-error conditions.
+X/Open Curses,
+Issue 4 describes these functions.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index cf1be3f86..6d70a4358 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH curs_deleteln 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp $
+.TH curs_deleteln 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,7 +96,7 @@ terminal.
 In fact, they will not use hardware line delete/insert unless
 \fBidlok(..., TRUE)\fP has been set on the current window.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 The
 standard specifies that they return \fBERR\fP on failure, but specifies no
 error conditions.
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index ca171c196..02932b91a 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.38 2024/04/13 22:14:06 tom Exp $
-.TH curs_get_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp $
+.TH curs_get_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -60,7 +60,7 @@ get (or push back) a wide character from \fIcurses\fR terminal keyboard
 \fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
 \fBint mvwget_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
 .PP
-\fBint unget_wch(const wchar_t \fIwch\fP);
+\fBint unget_wch(const wchar_t \fIwc\fP);
 .fi
 .SH DESCRIPTION
 .SS "Reading Characters"
@@ -190,13 +190,11 @@ in which case
 is set to
 .BR \%EINTR .
 .PP
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I win
-parameter is a null pointer.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .PP
 .B \%unget_wch
 returns
@@ -241,7 +239,8 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index ba1f50027..32ae541ab 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.46 2024/04/13 22:14:06 tom Exp $
-.TH curs_get_wstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.48 2024/04/20 19:18:18 tom Exp $
+.TH curs_get_wstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -147,9 +147,11 @@ if the associated call to
 \fBwget_wch\fP
 failed.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 Any of these functions other than
 \fBwgetn_wstr\fP
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 009d63dc2..523cc99df 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.47 2024/04/13 22:08:22 tom Exp $
-.TH curs_getcchar 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.49 2024/04/20 18:55:09 tom Exp $
+.TH curs_getcchar 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -42,15 +42,15 @@ convert between a wide-character string and a \fIcurses\fR complex character
 \fB#include <curses.h>
 .PP
 \fBint getcchar(
-.B "        const cchar_t *\fIwcval\fP,"
-.B "        wchar_t *\fIwch\fP,"
+.B "        const cchar_t *\fIwch\fP,"
+.B "        wchar_t *\fIwc\fP,"
 .B "        attr_t *\fIattrs\fP,"
 .B "        short *\fIcolor_pair\fP,"
 .B "        void *\fIopts\fP );"
 .PP
 .B "int setcchar("
-.B "        cchar_t *\fIwcval\fP,"
-.B "        const wchar_t *\fIwch\fP,"
+.B "        cchar_t *\fIwch\fP,"
+.B "        const wchar_t *\fIwc\fP,"
 .B "        const attr_t \fIattrs\fP,"
 .B "        short \fIcolor_pair\fP,"
 .B "        const void *\fIopts\fP );"
@@ -59,32 +59,32 @@ convert between a wide-character string and a \fIcurses\fR complex character
 .SS getcchar
 The \fBgetcchar\fP function gets a wide-character string
 and rendition from a \fBcchar_t\fP argument.
-When \fIwch\fP is not a null pointer,
+When \fIwc\fP is not a null pointer,
 the \fBgetcchar\fP function does the following:
 .bP
-Extracts information from a \fBcchar_t\fP value \fIwcval\fP
+Extracts information from a \fBcchar_t\fP value \fIwch\fP
 .bP
 Stores the character attributes in the location pointed to by \fIattrs\fP
 .bP
 Stores the color pair in the location pointed to by \fIcolor_pair\fP
 .bP
 Stores the wide-character string,
-characters referenced by \fIwcval\fP, into the array pointed to by \fIwch\fP.
+characters referenced by \fIwch\fP, into the array pointed to by \fIwc\fP.
 .PP
 When
-\fIwch\fP
+\fIwc\fP
 is a null pointer, the
 \fBgetcchar\fP
 function does the following:
 .bP
-Obtains the number of wide characters pointed to by \fIwcval\fP
+Obtains the number of wide characters pointed to by \fIwch\fP
 .bP
 Does not change the data referenced by
 \fIattrs\fP
 or
 \fIcolor_pair\fP
 .SS setcchar
-The \fBsetcchar\fP function initializes the location pointed to by \fIwcval\fP
+The \fBsetcchar\fP function initializes the location pointed to by \fIwch\fP
 by using:
 .bP
 The character attributes in
@@ -93,7 +93,7 @@ The character attributes in
 The color pair in
 \fIcolor_pair\fP
 .bP
-The wide-character string pointed to by \fIwch\fP.
+The wide-character string pointed to by \fIwc\fP.
 The string must be L'\e0' terminated,
 contain at most one spacing character,
 which must be the first.
@@ -104,21 +104,21 @@ Additional non-spacing characters are ignored.
 The string may contain a single control character instead.
 In that case, no non-spacing characters are allowed.
 .SH RETURN VALUE
-When \fIwch\fP is a null pointer,
+When \fIwc\fP is a null pointer,
 \fBgetcchar\fP returns the number of wide characters referenced by
-\fIwcval\fP,
+\fIwch\fP,
 including one for a trailing null.
 .PP
-When \fIwch\fP is not a null pointer,
+When \fIwc\fP is not a null pointer,
 \fBgetcchar\fP returns \fBOK\fP upon successful completion,
 and \fBERR\fP otherwise.
 .PP
 Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
 Otherwise, it returns \fBERR\fP.
 .SH NOTES
-The \fIwcval\fP argument may be a value generated by a call to
+The \fIwch\fP argument may be a value generated by a call to
 \fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
-If \fIwcval\fP is constructed by any other means, the effect is unspecified.
+If \fIwch\fP is constructed by any other means, the effect is unspecified.
 .SH EXTENSIONS
 X/Open Curses documents the \fIopts\fP argument as reserved for future use,
 saying that it must be null.
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index b06c5d3ab..9433c6148 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.85 2024/04/13 22:18:51 tom Exp $
-.TH curs_getch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp $
+.TH curs_getch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -67,11 +67,11 @@ get (or push back) characters from \fIcurses\fR terminal keyboard
 .B int mvgetch(int \fIy\fP, int \fIx\fP);
 .B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
-.B int ungetch(int \fIch\fP);
+.B int ungetch(int \fIc\fP);
 .PP
 .\" XXX: Move has_key into its own page like define_key and key_defined?
 \fI/* extension */\fP
-.B int has_key(int \fIch\fP);
+.B int has_key(int \fIc\fP);
 .fi
 .SH DESCRIPTION
 .SS "Reading Characters"
@@ -116,13 +116,13 @@ If \fB\%echo\fP(3X) has been called,
 and the window is not a pad,
 .I curses
 writes the returned character
-.I ch
+.I c
 to the window
 (at the cursor position)
 per the following rules.
 .bP
 If
-.I ch
+.I c
 matches the terminal's erase character,
 the cursor moves leftward one position
 and the new position is erased
@@ -136,7 +136,7 @@ are handled the same way.
 .bP
 .I curses
 writes any other
-.I ch
+.I c
 to the window,
 as with \fB\%wechochar\fP(3X).
 .bP
@@ -147,12 +147,10 @@ calls
 .BR \%wrefresh .
 .PP
 If
-.I ch
+.I c
 is a carriage return and \fBnl\fP(3X) has been called,
 .B \%wgetch
-returns the character code for newline
-(line feed)
-instead.
+returns the character code for line feed instead.
 .SS "Keypad Mode"
 To
 .IR curses ,
@@ -192,7 +190,7 @@ character codes.
 In
 .IR \%ncurses ,
 .I "user-defined function keys"
-are configured with \fBdefine_key\fP(3X);
+are configured with \fB\%define_key\fP(3X);
 they have no names,
 but are also expected to have values outside the range of eight-bit
 codes.
@@ -244,7 +242,7 @@ further typing \*(``awakens\*(''
 .SS "Ungetting Characters"
 .B \%ungetch
 places
-.I ch
+.I c
 into the input queue to be returned by the next call to
 .BR \%wgetch .
 A single input queue serves all windows.
@@ -264,7 +262,7 @@ Not all of these are necessarily supported on any particular terminal.
 The naming convention may seem obscure,
 with some apparent misspellings
 (such as \*(``RSUME\*('' for \*(``resume\*('');
-The names correspond to the
+the names correspond to the
 .I \%term\%info
 capability names for the keys,
 and were standardized before the IBM PC/AT keyboard layout achieved a
@@ -378,7 +376,7 @@ KEY_SUNDO	Shifted undo key
 .TE
 .RE
 .PP
-The keypad is arranged as follows.
+Many keyboards feature a nine-key directional pad.
 .PP
 .RS
 .TS
@@ -390,29 +388,29 @@ C1	down	C3
 .TE
 .RE
 .sp
-Two of these symbols do
+Two of the symbols in the list above do
 .I not
-correspond to a real key.
+correspond to a physical key.
 .bP
 .B \%wgetch
 returns
-.B \%KEY_RESIZE
-(even if the window's keypad mode is disabled)
+.BR \%KEY_RESIZE ,
+even if the window's keypad mode is disabled,
 when
 .I \%ncurses
-detects the
+handles a
 .B \%SIGWINCH
 signal;
-see \fBinitscr\fP(3X) and \fBresizeterm\fP(3X).
+see \fB\%initscr\fP(3X) and \fB\%resizeterm\fP(3X).
 .bP
 .B \%wgetch
 returns
 .B \%KEY_MOUSE
 to indicate that a mouse event is pending collection;
-see \fBcurs_mouse\fP(3X).
+see \fB\%curs_mouse\fP(3X).
 Receipt of this code requires a window's keypad mode to be enabled,
 because to interpret mouse input
-(as with with \fIxterm\fP(1)'s mouse prototocol),
+(as with with \fI\%xterm\fP(1)'s mouse prototocol),
 .I \%ncurses
 must read an escape sequence,
 as with a function key.
@@ -420,21 +418,32 @@ as with a function key.
 In
 .IR \%ncurses ,
 .B \%has_key
-takes a key code value from the above list,
-and returns a Boolean value indicating the terminal's recognition of it.
+returns a Boolean value indicating whether the terminal type recognizes
+its parameter as a key code value.
 See also
-\fBdefine_key\fP(3X) and \fBkey_defined\fP(3X).
+\fB\%define_key\fP(3X) and \fB\%key_defined\fP(3X).
 .SH RETURN VALUE
-.B \%wgetch
-returns
+Except for
+.BR \%has_key ,
+these functions return
+.B OK
+on success and
 .B ERR
-if
-.bP
-the
+on failure.
+.PP
+Functions taking a
 .I \%WINDOW
-pointer is
-.BR NULL ,
-or
+pointer argument fail if the pointer is
+.BR NULL .
+.PP
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
+.PP
+.B \%wgetch
+also fails if
 .bP
 its timeout expires without any data arriving,
 or
@@ -445,20 +454,8 @@ in which case
 is set to
 .BR \%EINTR .
 .PP
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window,
-or
-(for \*(``mvw\*('' functions)
-if the
-.I win
-parameter is a null pointer.
-.PP
 .B \%ungetch
-returns
-.B OK
-on success and
-.B ERR
-if there is no more room in the input queue.
+fails if there is no more room in the input queue.
 .PP
 .B \%has_key
 returns
@@ -503,16 +500,18 @@ others treat such control characters specially.
 distinguishes the Enter keys in the alphabetic and numeric keypad
 sections of a keyboard because (most) terminals do.
 .B \%KEY_ENTER
-refers to the key on the (numeric) keypad and,
+refers to the key on the numeric keypad and,
 like other function keys,
-is reliably recognized only if the window's keypad mode is enabled.
+and is reliably recognized only if the window's keypad mode is enabled.
 .bP
 The
 .I \%term\%info
 .B \%key_enter
 .RB ( kent )
-capability describes the character (sequence) sent by the terminal's
-keypad Enter key.
+capability describes the character (sequence) sent by the Enter key of
+a terminal's numeric
+(or similar)
+keypad.
 .bP
 \*(``Enter or send\*('' is X/Open Curses's description of this key.
 .PP
@@ -547,8 +546,8 @@ function-key-rich keyboard of the AT&T 7300
 (also known variously as the \*(``3B1\*('', \*(``Safari 4\*('', and
 \*(``UNIX PC\*(''),
 a 1985 machine.
-Today's computer keyboards are based on the IBM PC/AT keyboard and tend
-to have fewer.
+Today's computer keyboards are based that of the IBM PC/AT and tend to
+have fewer.
 A
 .I curses
 application can expect such a keyboard to transmit key codes
@@ -604,7 +603,8 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses, Issue 4, describes
+X/Open Curses,
+Issue 4 describes
 \fB\%getch\fP,
 \fB\%wgetch\fP,
 \fB\%mvgetch\fP,
@@ -629,7 +629,7 @@ In historical
 .I curses
 implementations,
 it varied depending on whether the operating system's dispatch of a
-signal to a handler interrupts a \fIread\fP(2) call in progress or not,
+signal to a handler interrupting a \fIread\fP(2) call in progress,
 and also
 (in some implementations)
 whether an input timeout or non-blocking mode has been set.
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 43a290dba..4a49352a1 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.56 2024/04/13 22:14:06 tom Exp $
-.TH curs_getstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp $
+.TH curs_getstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -149,9 +149,11 @@ This implementation provides an extension as well.
 If a \fBSIGWINCH\fP interrupts the function, it will return \fBKEY_RESIZE\fP
 rather than \fBOK\fP or \fBERR\fP.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 Any of these functions other than
 \fBwgetnstr\fP
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 7b1830c98..eadcecef2 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
-.TH curs_getyx 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp $
+.TH curs_getyx 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -78,7 +78,7 @@ The
 \fB\%getparyx\fP,
 \fB\%getbegyx\fP and
 \fB\%getmaxyx\fP
-macros are described in the XSI Curses standard, Issue 4.
+macros are described in X/Open Curses, Issue 4.
 .PP
 This implementation also provides functions
 \fB\%getbegx\fP,
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index b3f9c08b3..8512e6d3b 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.28 2024/04/13 22:14:06 tom Exp $
-.TH curs_in_wch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp $
+.TH curs_in_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,30 +49,32 @@ get a \fIcurses\fR complex character from a window
 .nf
 \fB#include <curses.h>
 .PP
-\fBint in_wch(cchar_t *\fIwcval\fP);
-\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwcval\fP);
+\fBint in_wch(cchar_t *\fIwch\fP);
+\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
 .PP
-\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwcval\fP);
-\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwcval\fP);
+\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
+\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
 .fi
 .SH DESCRIPTION
 These functions extract the complex character and rendition from
 the current position in the named window into the \fBcchar_t\fP object
-referenced by wcval.
+referenced by wch.
 .SH RETURN VALUE
-No errors are defined in the XSI Curses standard.
+No errors are defined in X/Open Curses.
 This implementation checks for null pointers, returns \fBERR\fP in that case.
 Also, the \fImv\fP routines check for error moving the cursor,
 returning \fBERR\fP in that case.
 Otherwise they return \fBOK\fP.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 Note that all of these routines may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curs_inch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 295ccc810..53c984647 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.36 2024/04/13 22:21:16 tom Exp $
-.TH curs_in_wchstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.39 2024/04/20 21:24:19 tom Exp $
+.TH curs_in_wchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -95,9 +95,11 @@ if the \fIwin\fP parameter is null or
 .bP
 if the \fIwchstr\fP parameter is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All routines except \fBwin_wchnstr\fP may be macros.
 .PP
@@ -117,7 +119,7 @@ Therefore, the use of
 \fBwin_wchnstr\fP
 is recommended.
 .SH PORTABILITY
-The XSI Curses defines no error conditions.
+X/Open Curses defines no error conditions.
 This implementation checks for null pointers,
 returning \fBERR\fP in that case.
 .SH SEE ALSO
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index c540c5fbc..962e9dc86 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.48 2024/04/13 22:14:06 tom Exp $
-.TH curs_inch 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp $
+.TH curs_inch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -83,9 +83,11 @@ A_ATTRIBUTES	Extract attributes
 A_COLOR	Extract color pair information
 .TE
 .SH RETURN VALUE
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .PP
 The \fBwinch\fP function does not return an error if the window contains
 characters larger than 8-bits (255).
@@ -93,7 +95,7 @@ Only the low-order 8 bits of the character are used by \fBwinch\fP.
 .SH NOTES
 Note that all of these routines may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .PP
 Very old systems (before standardization) provide a different function
 with the same name:
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index d019fc618..bcd5d6855 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
-.TH curs_inchstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp $
+.TH curs_inchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -94,9 +94,11 @@ if the \fIwin\fP parameter is null or
 .bP
 if the \fIchstr\fP parameter is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All routines except \fBwinchnstr\fP may be macros.
 .PP
@@ -121,7 +123,7 @@ Therefore, the use of
 \fBwinchnstr\fP
 is recommended.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 It is no
 more specific than the SVr4 documentation on the trailing 0.
 It does specify
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 5a54c41f4..0f460af14 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.66 2024/04/13 22:18:11 tom Exp $
-.TH curs_initscr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.69 2024/04/20 21:24:19 tom Exp $
+.TH curs_initscr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -174,7 +174,7 @@ i.e.,
 \fBset_term\fP
 returns no error.
 .SH PORTABILITY
-These functions were described in the XSI Curses standard, Issue 4.
+These functions were described in X/Open Curses, Issue 4.
 As of 2015, the current document is X/Open Curses, Issue 7.
 .SS Differences
 X/Open Curses specifies that portable applications must not
@@ -189,7 +189,7 @@ This implementation allows using \fBinitscr\fP after \fBendwin\fP.
 Old versions of curses, e.g., BSD 4.4, would return a null pointer
 from \fBinitscr\fP when an error is detected, rather than exiting.
 It is safe but redundant to check the return value of \fBinitscr\fP
-in XSI Curses.
+in X/Open Curses.
 .PP
 Calling \fBendwin\fP does not dispose of the memory allocated in \fBinitscr\fP
 or \fBnewterm\fP.
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 6730a7704..90b03f64f 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.28 2024/03/16 15:35:01 tom Exp $
-.TH curs_ins_wch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.30 2024/04/20 19:18:18 tom Exp $
+.TH curs_ins_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -75,11 +75,11 @@ Functions taking a
 pointer argument fail if the pointer is
 .BR NULL .
 .PP
-Functions prefixed with \*(``mv\*('' first perform cursor movement using
-\fB\%wmove\fP and fail if the position
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
 .RI ( y ,
 .IR x )
-is outside the window.
+is outside the window boundaries.
 .SH NOTES
 A terminal's
 .B \%insert_character
@@ -93,7 +93,8 @@ and
 \fB\%mvwins_wch\fP
 may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 .PP
 SVr4 describes successful return values only as
 \*(``an integer value other than \fBERR\fP\*(''.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 572127454..4ebd3ace2 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.34 2024/04/13 22:14:06 tom Exp $
-.TH curs_ins_wstr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp $
+.TH curs_ins_wstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -98,18 +98,20 @@ if the \fIwstr\fP parameter is null or
 .bP
 if the \fBwins_wch\fP function returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP(3X), and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All but \fBwins_nwstr\fP may be macros.
 .PP
 If the first character in the string is a non-spacing character, these
 functions will fail.
-XSI does not define what will happen if a non-spacing character follows
-a control character.
+X/Open Curses does not define what will happen
+if a non-spacing character follows a control character.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4,
+These functions are described in X/Open Curses, Issue 4,
 which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 X/Open states that the entire string is inserted if \fIn\fP is less than 1.
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 73c34a908..baf2f6cc1 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
-.TH curs_insch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp $
+.TH curs_insch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -44,7 +44,7 @@
 \fB\%winsch\fP,
 \fB\%mvinsch\fP,
 \fB\%mvwinsch\fP \-
-insert a \fIcurses\fR character in a window
+insert a \fIcurses\fP character in a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
@@ -68,35 +68,43 @@ cell to the right;
 the rightmost character on the line is discarded.
 The cursor does not advance.
 .SH "RETURN VALUE"
-These functions return \fBOK\fP on success and \fBERR\fP on failure.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
 .BR NULL .
 .PP
-Functions prefixed with \*(``mv\*('' first perform cursor movement using
-\fB\%wmove\fP and fail if the position
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
 .RI ( y ,
 .IR x )
-is outside the window.
+is outside the window boundaries.
 .SH NOTES
+.BR \%insch ,
+.BR \%mvinsch ,
+and
+.B \%mvwinsch
+may be implemented as macros.
+.PP
 A terminal's
 .B \%insert_character
 .RB ( ich1 )
 capability
 is not necessarily employed.
-.PP
-\fB\%insch\fP,
-\fB\%mvinsch\fP,
-and
-\fB\%mvwinsch\fP
-may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 .PP
-SVr4 describes successful return values only as
-\*(``an integer value other than \fBERR\fP\*(''.
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
 .SH "SEE ALSO"
 \fB\%curs_ins_wch\fP(3X) describes comparable functions in the
 wide-character
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 6c7035365..888d42500 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.48 2024/03/16 15:49:07 tom Exp $
-.TH curs_insstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.51 2024/04/20 21:20:07 tom Exp $
+.TH curs_insstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -97,13 +97,15 @@ if the \fIstr\fP parameter is null or
 .bP
 the \fBwinsch\fP(3X) function returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP(3X), and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All but \fBwinsnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4,
+These functions are described in X/Open Curses, Issue 4,
 which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 The Single Unix Specification, Version 2 states that
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index c53a6168e..5b6e4b760 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.48 2024/04/13 22:14:06 tom Exp $
-.TH curs_instr 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.51 2024/04/20 21:24:19 tom Exp $
+.TH curs_instr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,9 +89,11 @@ if the \fIwin\fP parameter is null or
 .bP
 if the \fIchstr\fP parameter is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All routines except \fBwinnstr\fP may be macros.
 .PP
@@ -114,7 +116,7 @@ is recommended.
 SVr4 does not
 document whether a length limit includes or excludes the trailing NUL.
 .PP
-The \fI\%ncurses\fP library extends the XSI description by allowing a
+The \fI\%ncurses\fP library extends the X/Open Curses description by allowing a
 negative value for \fIn\fP.
 In this case, the functions return the string ending at the right margin.
 .SH SEE ALSO
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 095c2fa1c..eec361d77 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
-.TH curs_inwstr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.41 2024/04/20 21:20:07 tom Exp $
+.TH curs_inwstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -99,9 +99,11 @@ if the \fIwstr\fP parameter is null, or
 .bP
 if no characters could be read.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fBwmove\fP, and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All routines except
 \fBwinnwstr\fP
@@ -130,7 +132,7 @@ Therefore, the use of
 \fBwinnwstr\fP
 is recommended.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 3ab1c790d..e85c13276 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.58 2024/04/13 22:19:08 tom Exp $
-.TH curs_kernel 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.61 2024/04/20 21:24:19 tom Exp $
+.TH curs_kernel 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -210,8 +210,8 @@ There is no way for \fI\%ncurses\fP to determine the initial cursor
 state to restore that.
 .SH PORTABILITY
 The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
-are not described in the XSI Curses standard, Issue 4.
-All other functions are as described in XSI Curses.
+are not described in X/Open Curses, Issue 4.
+All other functions are as described in X/Open Curses.
 .PP
 The SVr4 documentation describes \fBsetsyx\fP and \fBgetsyx\fP
 as having return type int.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 04df96f18..8e5c70181 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.96 2024/03/23 20:38:57 tom Exp $
-.TH curs_mouse 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp $
+.TH curs_mouse 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,16 +69,17 @@ get mouse events in \fIcurses\fR
 .PP
 \fBbool has_mouse(void);
 .PP
+\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
+.PP
 \fBint getmouse(MEVENT *\fIevent\fP);
 \fBint ungetmouse(MEVENT *\fIevent\fP);
 .PP
-\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
-.PP
 \fBbool wenclose(const WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
 \fBbool mouse_trafo(int* \fIpY\fP, int* \fIpX\fP, bool \fIto_screen\fP);
 \fBbool wmouse_trafo(const WINDOW* \fIwin\fP,
-                  \fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
+.ti +18n \" "bool wmouse_trafo("
+\fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);
 .PP
 \fBint mouseinterval(int \fIerval\fB);\fR
 .fi
@@ -87,6 +88,15 @@ These functions provide an interface to mouse events from
 \fB\%ncurses\fP(3X).
 Mouse events are represented by \fB\%KEY_MOUSE\fP
 pseudo-key values in the \fB\%wgetch\fP(3X) input stream.
+.SS has_mouse
+The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
+has been successfully initialized,
+and \fBFALSE\fP otherwise.
+.PP
+Mouse events are ignored when input is in cooked mode, and
+cause an error beep when cooked mode is being simulated in a window by a
+function such as \fB\%getstr\fP that expects a linefeed for input-loop
+termination.
 .SS mousemask
 To make mouse events visible, use the \fB\%mousemask\fP function.
 This sets the mouse events to be reported.
@@ -255,15 +265,6 @@ Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
 The mouse interval is set to one sixth of a second
 when the corresponding screen is initialized,
 e.g., in \fBinitscr\fP(3X) or \fBsetupterm\fP(3X).
-.SS has_mouse
-The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
-has been successfully initialized,
-and \fBFALSE\fP otherwise.
-.PP
-Mouse events are ignored when input is in cooked mode, and
-cause an error beep when cooked mode is being simulated in a window by a
-function such as \fB\%getstr\fP that expects a linefeed for input-loop
-termination.
 .SH RETURN VALUE
 \fB\%has_mouse\fP,
 \fB\%wenclose\fP,
diff --git a/man/curs_move.3x b/man/curs_move.3x
index cb244bd1a..3966325c4 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,19 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH curs_move 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
-.ie \n(.g \{\
-.ds `` \(lq
-.ds '' \(rq
-.\}
-.el \{\
-.ie t .ds `` ``
-.el   .ds `` ""
-.ie t .ds '' ''
-.el   .ds '' ""
-.\}
-.
+.\" $Id: curs_move.3x,v 1.38 2024/04/20 19:51:33 tom Exp $
+.TH curs_move 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -52,25 +41,48 @@ move cursor in a \fIcurses\fR window
 \fBint wmove(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
-These routines move the cursor associated with the window to line \fIy\fP and
-column \fIx\fP.
-This routine does not move the physical cursor of the terminal
-until \fBrefresh\fP(3X) is called.
-The position specified is relative to the upper
-left-hand corner of the window, which is (0,0).
+.B \%wmove
+relocates the cursor associated with the
+.I curses
+window
+.I win
+to line
+.I y
+and column
+.IR x .
+The terminal's cursor does not move until \fB\%refresh\fP(3X) is called.
+The position
+.RI ( x ,
+.IR y )
+is relative to the upper left-hand corner of the window,
+which has coordinates
+(0,\ 0).
+\fB\%ncurses\fP(3X) describes the
+.B \%move
+variant of this function.
 .SH RETURN VALUE
-These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-Specifically, they return an error
-if the window pointer is null, or
-if the position is outside the window.
+They fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
+.PP
+.B \%wmove
+fails if its
+.I \%WINDOW
+pointer argument is
+.BR NULL .
 .SH NOTES
-Note that \fBmove\fP may be a macro.
+.B \%move
+may be implemented as a macro.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X)
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 0e20a801f..df263f2c1 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.60 2024/04/13 22:23:57 tom Exp $
-.TH curs_outopts 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp $
+.TH curs_outopts 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -151,7 +151,8 @@ those functions that have a window pointer
 will return an error if the window pointer is null
 .bP
 \fBwsetscrreg\fP
-returns an error if the scrolling region limits extend outside the window.
+returns an error if the scrolling region limits extend outside the
+window boundaries.
 .SH NOTES
 Note that
 \fBclearok\fP,
@@ -163,7 +164,7 @@ Note that
 The \fBimmedok\fP routine is useful for windows that are used as terminal
 emulators.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4.
+These functions are described in X/Open Curses, Issue 4.
 .PP
 Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
@@ -173,11 +174,11 @@ This will not work under \fI\%ncurses\fP.
 Earlier System V curses implementations specified that with \fBscrollok\fP
 enabled, any window modification triggering a scroll also forced a physical
 refresh.
-XSI Curses does not require this, and \fI\%ncurses\fP avoids doing
+X/Open Curses does not require this, and \fI\%ncurses\fP avoids doing
 it to perform better vertical-motion optimization at \fBwrefresh\fP
 time.
 .PP
-The XSI Curses standard does not mention that the cursor should be
+X/Open Curses does not mention that the cursor should be
 made invisible as a side-effect of \fBleaveok\fP.
 SVr4 curses documentation does this, but the code does not.
 Use \fBcurs_set\fP to make the cursor invisible.
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index cfeccc792..2d4eb729b 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.41 2024/03/16 15:35:01 tom Exp $
-.TH curs_overlay 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.43 2024/04/20 21:20:07 tom Exp $
+.TH curs_overlay 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -88,7 +88,7 @@ if some part of the window would be placed off-screen.
 .SH NOTES
 Note that \fBoverlay\fP and \fBoverwrite\fP may be macros.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4,
+These functions are described in X/Open Curses, Issue 4,
 which adds \fI\%const\fP qualifiers to the arguments.
 It further specifies their behavior in the presence of characters
 with multibyte renditions (not yet supported in this implementation).
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index ae17b589b..37118dd00 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.57 2024/04/13 22:13:17 tom Exp $
-.TH curs_pad 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.59 2024/04/20 21:20:07 tom Exp $
+.TH curs_pad 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -218,7 +218,7 @@ and select text from the pad.
 .PP
 The two uses may be related.
 .PP
-The XSI Curses standard, Issue 4 describes these functions,
+X/Open Curses, Issue 4 describes these functions,
 without significant change from the SVr3 documentation.
 It describes no error conditions.
 The behavior of \fB\%subpad\fP if the parent window is not
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index a9fabc5cd..282536b36 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.51 2024/03/23 20:38:57 tom Exp $
-.TH curs_printw 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_printw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
+.TH curs_printw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,9 +103,11 @@ or if the window pointer
 .I win
 is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement
-using \fB\%wmove\fP,
-and fail if the position is outside the window.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 No wide character counterpart functions are defined by the
 \*(``wide\*(''
@@ -116,7 +118,8 @@ To format and write a wide-character string to a
 window,
 consider using \fI\%swprintf\fP(3) and \fB\%waddwstr\fP(3X) or similar.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 .I \%ncurses
@@ -125,7 +128,8 @@ legacy applications.
 However,
 the latter is obsolete.
 .bP
-X/Open Curses, Issue 4, Version 2 (1996),
+X/Open Curses,
+Issue 4 Version 2 (1996),
 marked \fB\%vwprintw\fP as requiring \fI\%varargs.h\fP and
 \*(``TO BE WITHDRAWN\*('',
 and specified \fB\%vw_printw\fP using the \fI\%stdarg.h\fP interface.
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index b193d28ec..ac81d1e63 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.44 2024/03/16 15:49:39 tom Exp $
-.TH curs_refresh 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.46 2024/04/20 21:20:07 tom Exp $
+.TH curs_refresh 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -149,7 +149,7 @@ if the associated call to \fBtouchln\fP returns an error.
 .SH NOTES
 Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4 describes these functions.
+X/Open Curses, Issue 4 describes these functions.
 .PP
 Whether \fBwnoutrefresh\fP copies to the virtual screen the entire contents
 of a window or just its changed portions has never been well-documented in
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index e5dcae6f4..409c297fb 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.51 2024/03/23 20:41:15 tom Exp $
-.TH curs_scanw 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
+.TH curs_scanw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,9 +104,11 @@ or if the window pointer
 .I win
 is null.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement
-using \fB\%wmove\fP,
-and fail if the position is outside the window.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 No wide character counterpart functions are defined by the
 \*(``wide\*(''
@@ -124,7 +126,8 @@ respectively.
 implements \fI\%vsscanf\fP(3) internally if it is unavailable when the
 library is configured.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 .I \%ncurses
@@ -133,13 +136,15 @@ legacy applications.
 However,
 the latter is obsolete.
 .bP
-X/Open Curses, Issue 4, Version 2 (1996),
+X/Open Curses,
+Issue 4 Version 2 (1996),
 marked \fB\%vwscanw\fP as requiring \fI\%varargs.h\fP and
 \*(``TO BE WITHDRAWN\*('',
 and specified \fB\%vw_scanw\fP using the \fI\%stdarg.h\fP interface.
 .bP
-X/Open Curses, Issue 5, Draft 2
-(December 2007) marked \fB\%vwscanw\fP (along with
+X/Open Curses,
+Issue 5,
+Draft 2 (December 2007) marked \fB\%vwscanw\fP (along with
 \fB\%vwscanw\fP and the \fItermcap\fP interface) as withdrawn.
 After incorporating review comments,
 this became
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 427ae2eba..5f14a2287 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.41 2024/03/23 20:41:15 tom Exp $
-.TH curs_scr_dump 3X 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp $
+.TH curs_scr_dump 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -132,7 +132,8 @@ each function fails if it cannot open
 and
 \fB\%scr_restore\fP may be macros.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 .PP
 .\" SVID 4, p. 529
 SVr4 omitted the
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index b8599d5f8..16d5a5010 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.41 2024/04/14 00:14:28 tom Exp $
-.TH curs_scroll 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.43 2024/04/20 18:54:36 tom Exp $
+.TH curs_scroll 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,7 +110,8 @@ accepting a \fI\%WINDOW\fP pointer argument.
 .PP
 \fB\%scrl\fP and \fB\%scroll\fP may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
 It defines no error conditions.
 .PP
 SVr4 specifies only
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 33119b64d..fbc718115 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.69 2024/03/16 15:35:01 tom Exp $
-.TH curs_slk 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.71 2024/04/20 18:54:36 tom Exp $
+.TH curs_slk 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -277,7 +277,8 @@ if \fIopts\fP is set it is treated as a pointer to \fIint\fP,
 and used to set the color pair instead of the \fIshort\fP pair
 parameter.
 .SH PORTABILITY
-X/Open Curses, Issue 4, describes these functions,
+X/Open Curses,
+Issue 4 describes these functions,
 with some differences from SVr4 \fIcurses\fP:
 .bP
 X/Open added functions like the SVr4 attribute-manipulation functions
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index c4c2b1320..e58a48e3c 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.48 2024/03/16 15:35:01 tom Exp $
-.TH curs_sp_funcs 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp $
+.TH curs_sp_funcs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -63,7 +63,7 @@
 \fBint echo_sp(SCREEN* \fIsp\fP);
 \fBint endwin_sp(SCREEN* \fIsp\fP);
 \fBchar erasechar_sp(SCREEN* \fIsp\fP);
-\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
 \fBint extended_color_content_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int * \fIr\fP, int * \fIg\fP, int * \fIb\fP);
 \fBint extended_pair_content_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
 \fBint extended_slk_color_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
@@ -81,7 +81,7 @@
 .PP
 \fBbool has_ic_sp(SCREEN* \fIsp\fP);
 \fBbool has_il_sp(SCREEN* \fIsp\fP);
-\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIc\fP);
 \fBbool has_mouse_sp(SCREEN* \fIsp\fP);
 \fBint init_color_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
 \fBint init_extended_color_sp(SCREEN* \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
@@ -101,7 +101,7 @@
 \fBint keyok_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
 \fBchar killchar_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
 \fBchar* longname_sp(SCREEN* \fIsp\fP);
 \fBint mcprint_sp(SCREEN* \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
 \fBint mouseinterval_sp(SCREEN* \fIsp\fP, int \fIerval\fP);
@@ -159,8 +159,8 @@
 \fBchtype termattrs_sp(SCREEN* \fIsp\fP);
 \fBchar* termname_sp(SCREEN* \fIsp\fP);
 \fBint typeahead_sp(SCREEN* \fIsp\fP, int \fIfd\fP);
-\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwch\fP);
-\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwc\fP);
+\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIc\fP);
 \fBint ungetmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
 \fBint use_default_colors_sp(SCREEN* \fIsp\fP);
 \fBvoid use_env_sp(SCREEN* \fIsp\fP, bool \fIbf\fP);
@@ -171,7 +171,7 @@
 \fBint vid_puts_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
 \fBint vidattr_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP);
 \fBint vidputs_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
-\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIch\fP);
+\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIwch\fP);
 .PP
 \fB#include <form.h>
 .PP
@@ -208,7 +208,7 @@
 .PP
 \fB#include <unctrl.h>
 .PP
-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIc\fP);
+\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 18134ddd2..dacd3b0f4 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.38 2024/04/13 22:16:39 tom Exp $
-.TH curs_termattrs 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp $
+.TH curs_termattrs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -48,11 +48,11 @@
 .PP
 \fBint baudrate(void);
 \fBchar erasechar(void);
-\fBint erasewchar(wchar_t *\fIch\fP);
+\fBint erasewchar(wchar_t *\fIwc\fP);
 \fBbool has_ic(void);
 \fBbool has_il(void);
 \fBchar killchar(void);
-\fBint killwchar(wchar_t *\fIch\fP);
+\fBint killwchar(wchar_t *\fIwc\fP);
 \fBchar *longname(void);
 \fBattr_t term_attrs(void);
 \fBchtype termattrs(void);
@@ -68,9 +68,9 @@ integer.
 The \fBerasechar\fP routine returns the user's current erase character.
 .PP
 The \fBerasewchar\fP routine stores the current erase character
-in the location referenced by \fIch\fP.
+in the location referenced by \fIwc\fP.
 If no erase character has been defined, the routine fails
-and the location referenced by \fIch\fP is not changed.
+and the location referenced by \fIwc\fP is not changed.
 .SS "has_ic, has_il"
 The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
 character capabilities.
@@ -84,9 +84,9 @@ scrolling using \fBscrollok\fP(3X).
 The \fBkillchar\fP routine returns the user's current line kill character.
 .PP
 The \fBkillwchar\fP routine stores the current line-kill character
-in the location referenced by \fIch\fP.
+in the location referenced by \fIwc\fP.
 If no line-kill character has been defined,
-the routine fails and the location referenced by \fIch\fP is not changed.
+the routine fails and the location referenced by \fIwc\fP is not changed.
 .SS longname
 The \fBlongname\fP routine returns a pointer to a static area
 containing a verbose description of the current terminal.
@@ -118,7 +118,7 @@ completion.
 .SH NOTES
 Note that \fBtermattrs\fP may be a macro.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4 describes these functions.
+X/Open Curses, Issue 4 describes these functions.
 It changes the
 return type of \fBtermattrs\fP to the new type \fBattr_t\fP.
 Most versions of curses truncate the result returned by \fBtermname\fP to
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index f292f9d8f..6bd2a66a0 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.83 2024/03/16 15:35:01 tom Exp $
-.TH curs_termcap 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp $
+.TH curs_termcap 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,7 +115,7 @@ as do other \fItermcap\fP implementations conforming to portions of
 X/Open Curses now withdrawn.
 The BSD \fItermcap\fP library would store a copy of the terminal type
 description in the area referenced by this pointer.
-\fI\%ncurses\fP stores terminal type descriptions in compiled form,
+\fI\%term\%info\fP stores terminal type descriptions in compiled form,
 which is not the same thing.
 .bP
 The meanings of the return values differ.
@@ -493,8 +493,8 @@ be aware that it is returned in \fI\%term\%info\fP notation,
 not the older and not-quite-compatible \fItermcap\fP notation.
 This does not cause problems if all you do with it is call \fB\%tgoto\fP
 or \fB\%tparm\fP,
-which both expand \fI\%term\%info\fP-style strings as \fI\%term\%info\fP
-does.
+which both parametrically expand \fI\%term\%info\fP-style string
+capabilities as \fI\%term\%info\fP does.
 (If
 .I \%ncurses
 is configured to support \fItermcap,\fP
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 22391fd66..613b69582 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.44 2024/03/16 15:49:58 tom Exp $
-.TH curs_touch 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_touch.3x,v 1.47 2024/04/20 21:20:07 tom Exp $
+.TH curs_touch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -88,7 +88,7 @@ In this implementation
 \fBis_linetouched\fP
 returns an error
 if the window pointer is null, or
-if the line number is outside the window.
+if the line number is outside the window boundaries.
 .IP
 The constant \fBERR\fP is distinct from \fBTRUE\fP and \fBFALSE\fP,
 which are the normal return values of this function.
@@ -103,7 +103,7 @@ The actual function returns \fBFALSE\fP when it detects an error.
 \fBwtouchln\fP
 returns an error
 if the window pointer is null, or
-if the line number is outside the window.
+if the line number is outside the window boundaries.
 .RE
 .SH NOTES
 All of these routines except \fB\%wtouchln\fP may be macros.
@@ -116,7 +116,7 @@ SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
 that it is not \fBNULL\fP;
 otherwise this implementation behaves the same as SVr4.
 .PP
-The XSI Curses standard, Issue 4 describes these functions,
+X/Open Curses, Issue 4 describes these functions,
 but defines no error conditions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index b985ffb32..ddae79112 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.47 2024/03/16 15:35:01 tom Exp $
-.TH curs_trace 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp $
+.TH curs_trace 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -74,7 +74,7 @@
 .nf
 \fB#include <curses.h>
 .PP
-\fBunsigned curses_trace(const unsigned \fIparam\fP);
+\fBunsigned curses_trace(const unsigned \fItrace-mask\fP);
 .PP
 \fBvoid _tracef(const char *\fIformat\fP, ...);
 .PP
@@ -82,7 +82,7 @@
 \fBchar *_traceattr2(int \fIbuffer\fP, chtype \fIch\fP);
 \fBchar *_tracecchar_t(const cchar_t *\fIstring\fP);
 \fBchar *_tracecchar_t2(int \fIbuffer\fP, const cchar_t *\fIstring\fP);
-\fBchar *_tracechar(int \fIch\fP);
+\fBchar *_tracechar(int \fIc\fP);
 \fBchar *_tracechtype(chtype \fIch\fP);
 \fBchar *_tracechtype2(int \fIbuffer\fP, chtype \fIch\fP);
 .PP
@@ -91,7 +91,7 @@
 \fBchar *_tracemouse(const MEVENT *\fIevent\fP);
 .PP
 \fI/* deprecated */\fP
-\fBvoid trace(const unsigned int \fIparam\fP);
+\fBvoid trace(const unsigned int \fItrace-mask\fP);
 .fi
 .SH DESCRIPTION
 The \fIcurses trace\fP routines are used for debugging the
@@ -250,7 +250,7 @@ were called.
 .RE
 .dE
 .SH PORTABILITY
-These functions are not part of the XSI interface.
+These functions are not part of the X/Open Curses interface.
 Some other curses implementations are known to
 have similar features,
 but they are not compatible with \fI\%ncurses\fP:
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 7e162e959..1df0a1d3f 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.98 2024/03/16 15:50:09 tom Exp $
-.TH curs_util 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp $
+.TH curs_util 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -63,11 +63,11 @@ miscellaneous \fIcurses\fR utility routines
 .nf
 \fB#include <curses.h>
 .PP
-\fBconst char *unctrl(chtype \fIc\fP);
-\fBwchar_t *wunctrl(cchar_t *\fIc\fP);
+\fBconst char *unctrl(chtype \fIch\fP);
+\fBwchar_t *wunctrl(cchar_t *\fIwch\fP);
 .PP
 \fBconst char *keyname(int \fIc\fP);
-\fBconst char *key_name(wchar_t \fIw\fP);
+\fBconst char *key_name(wchar_t \fIwc\fP);
 .PP
 \fBvoid filter(void);
 .PP
@@ -86,7 +86,7 @@ miscellaneous \fIcurses\fR utility routines
 .SH DESCRIPTION
 .SS unctrl
 The \fBunctrl\fP routine returns a character string which is a printable
-representation of the character \fIc\fP:
+representation of the character \fIch\fP:
 .bP
 Printable characters are displayed as themselves,
 e.g., a one-character string containing the key.
@@ -106,7 +106,7 @@ In the latter case, the values may not be printable;
 this follows the X/Open specification.
 .PP
 The corresponding \fBwunctrl\fP returns a printable representation of
-a complex character \fIc\fP.
+a complex character \fIwch\fP.
 .PP
 In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
 with the character parameter are ignored.
@@ -302,7 +302,7 @@ returns an error if the associated \fBfwrite\fP calls return an error.
 .SS filter
 The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
 terms.
-The description here is adapted from the XSI Curses standard (which
+The description here is adapted from X/Open Curses (which
 erroneously fails to describe the disabling of \fBcuu\fP).
 .SS "delay_output padding"
 The limitation to 30 seconds
@@ -364,7 +364,7 @@ Doing that can run into problems mixing block- and buffered-I/O.
 This implementation reduces the problem on writes by flushing the output.
 However, reading from a file written using mixed schemes may not be successful.
 .SS "unctrl, wunctrl"
-The XSI Curses standard, Issue 4 describes these functions.
+X/Open Curses, Issue 4 describes these functions.
 It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
 unsuccessful, but does not define any error conditions.
 This implementation checks for three cases:
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 1bb1a57d8..d3d55c751 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH curs_window 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.48 2024/04/20 21:20:07 tom Exp $
+.TH curs_window 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -222,7 +222,7 @@ degrade performance.
 .PP
 Note that \fBsyncok\fP may be a macro.
 .SH PORTABILITY
-The XSI Curses standard, Issue 4 describes these functions.
+X/Open Curses, Issue 4 describes these functions.
 .PP
 X/Open Curses states regarding \fBdelwin\fP:
 .bP
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 893f7d816..882a49dd4 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.59 2024/03/16 15:35:01 tom Exp $
-.TH form_driver 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_driver.3x,v 1.61 2024/04/20 18:55:09 tom Exp $
+.TH form_driver 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -43,7 +43,7 @@ command-processing loop of the form system
 \fB#include <form.h>
 .PP
 \fBint form_driver(FORM *\fIform\fP, int \fIc\fP);
-\fBint form_driver_w(FORM *\fIform\fP, int \fIc\fP, wchar_t \fIwch\fP);
+\fBint form_driver_w(FORM *\fIform\fP, int \fIc\fP, wchar_t \fIwc\fP);
 .fi
 .SH DESCRIPTION
 .SS form_driver
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 7bf1cdcca..ccfdd5564 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.26 2024/03/16 15:35:01 tom Exp $
-.TH legacy_coding 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp $
+.TH legacy_coding 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -41,38 +41,63 @@ override \fIcurses\fR locale encoding checks
 \fBint use_legacy_coding(int \fIlevel\fP);
 .fi
 .SH DESCRIPTION
-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.
-This affects only 8-bit characters.
+.B \%use_legacy_coding
+is an extension to the
+.I curses
+library.
+It allows the caller to change the result of \fB\%unctrl\fP(3X),
+suppressing \fI\%isprint\fP(3)-based checks within the library that
+would normally cause nonprinting characters to be rendered in visible
+form.
+The alteration affects only eight-bit characters.
 .PP
-The \fIlevel\fP parameter controls the result:
+The
+.I level
+parameter controls the result.
 .RS
 .TP 5
-0
-the library functions normally,
-rendering nonprinting characters as described in \fBunctrl\fP.
+.B 0
+The library functions normally,
+rendering nonprinting characters as described in \fB\%unctrl\fP(3X),
 .TP
-1
-the library ignores \fBisprintf\fP for codes in the range 160-255.
+.B 1
+the library ignores
+.I \%isprint
+for codes in the range 160-255.
 .TP
-2
-the library ignores \fBisprintf\fP for codes in the range 128-255.
-It also modifies the output of \fBunctrl\fP, showing codes in the
-range 128-159 as is.
+.B 2
+the library ignores
+.I \%isprint
+for codes in the range 128-255.
+It also modifies the output of \fB\%unctrl\fP(3X),
+showing codes in the range 128-159 as is.
 .RE
 .SH RETURN VALUE
 If the screen has not been initialized,
-or the \fIlevel\fP parameter is out of range,
-the function returns \fBERR\fP.
-Otherwise, it returns the previous level: \fB0\fP, \fB1\fP or \fB2\fP.
+or the
+.I level
+parameter is out of range,
+.B \%use_legacy_coding
+returns
+.BR ERR .
+Otherwise,
+it returns the previous level:
+.BR 0 ,
+.BR 1 ,
+or
+.BR 2 .
 .SH PORTABILITY
-This routine is specific to \fI\%ncurses\fP.
+.B \%use_legacy_coding
+is specific to
+.IR \%ncurses .
 It was not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fI\%ncurses\fP extensions
-be conditioned using NCURSES_VERSION.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .SH AUTHORS
-Thomas Dickey (to support lynx's font-switching feature).
+Thomas Dickey
+(to support \fI\%lynx\fP(1)'s font-switching feature).
 .SH SEE ALSO
 \fB\%unctrl\fP(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index c5dff79dc..41aa6359d 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.24 2024/04/14 00:15:03 tom Exp $
+# $Id: manhtml.externs,v 1.25 2024/04/20 19:26:05 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -48,6 +48,7 @@ mutt(1)
 nvi(1)
 od(1)
 ioctl(2)
+isprint(3)
 printf(3)
 profile(5)
 putc(3)
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 2f09cbbec..18f67c24d 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,4 +1,4 @@
-# $Id: manlinks.sed,v 1.19 2023/09/17 08:26:33 tom Exp $
+# $Id: manlinks.sed,v 1.20 2024/04/20 22:25:36 tom Exp $
 ##############################################################################
 # Copyright 2020-2021,2023 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
@@ -84,6 +84,7 @@ s/ /\
 #
 # Finally, remove the parameter list, which begins with a '('.
 /^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
+/^\.ti/d
 /^[^(]*$/d
 # reduce
 #	.B "int add_wch( const cchar_t *\fIwch\fB );"
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 48c64944a..b85946267 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.207 2024/04/14 00:34:00 tom Exp $
-.TH ncurses 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.210 2024/04/20 21:24:19 tom Exp $
+.TH ncurses 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,6 +46,14 @@
 .el    .IP \(bu 2
 ..
 .
+.\" Add supplementary paragraph tag on its own line after TP.
+.\" Adapted from TQ (which would produce mandoc warnings).
+.de tQ
+.  br
+.  ns
+.  TP
+..
+.
 .ds d @TERMINFO@
 .SH NAME
 \fB\%ncurses\fP \-
@@ -67,8 +75,10 @@ System V Release 4 Unix (\*(``SVr4\*('')
 and
 4.4BSD Unix,
 the development of which ceased in the 1990s.
-This describes \fI\%ncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+This document describes
+.I \%ncurses
+version @NCURSES_MAJOR@.@NCURSES_MINOR@
+(patch @NCURSES_PATCH@).
 .PP
 .I \%ncurses
 permits control of the terminal screen's contents;
@@ -404,6 +414,10 @@ man pages apply the following names to parameters.
 center;
 Li L.
 bf	\fIbool\fP (\fBTRUE\fP or \fBFALSE\fP)
+c	a \fIchar\fP or \fIint\fP
+ch	a \fIchtype\fP
+wc	a \fIwchar_t\fP or \fIwint_t\fP
+wch	a \fIcchar_t\fP
 win	pointer to a \fIWINDOW\fP
 pad	pointer to a \fIWINDOW\fP that is a pad
 .TE
@@ -1030,8 +1044,11 @@ on failure.
 Typically,
 .I \%ncurses
 treats a null pointer passed as a function parameter as a failure.
-Functions with a \*(``mv\*('' prefix first perform cursor movement using
-\fB\%wmove\fP(3X) and fail if the position is outside the window.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH ENVIRONMENT
 The following symbols from the process environment customize the
 runtime behavior of
@@ -1428,142 +1445,206 @@ If defined with an integral value,
 the library calls \fB\%curses_trace\fP(3X) with that value as the
 argument.
 .SS "\fITERM\fP"
-Denotes your terminal type.
-Each terminal type is distinct, though many are similar.
-.PP
-\fITERM\fP is commonly set by terminal emulators to help
-applications find a workable terminal description.
-Some of those choose a popular approximation, e.g.,
-\*(``ansi\*('', \*(``vt100\*('', \*(``xterm\*('' rather than an exact fit.
-Not infrequently, your application will have problems with that approach,
-e.g., incorrect function-key definitions.
-.PP
-If you set \fITERM\fP in your environment,
-it has no effect on the operation of the terminal emulator.
-It only affects the way applications work within the terminal.
-Likewise, as a general rule (\fBxterm\fP(1) being a rare exception),
-terminal emulators which allow you to
-specify \fITERM\fP as a parameter or configuration value do
-not change their behavior to match that setting.
+The
+.I TERM
+variable denotes the terminal type.
+Each is distinct,
+though many are similar.
+It is commonly set by terminal emulators to help applications find a
+workable terminal description.
+Some choose a popular approximation such as \*(``ansi\*('',
+\*(``vt100\*('', or \*(``xterm\*('' rather than an exact fit to their
+capabilities.
+Not infrequently,
+an application will have problems with that approach;
+for example,
+a key stroke may not operate correctly,
+or produce no effect but seeming garbage characters on the screen.
+.PP
+Setting
+.I TERM
+has no effect on hardware operation;
+it affects the way applications communicate with the terminal.
+Likewise,
+as a general rule
+(\fIxterm\fP(1) being a rare exception),
+terminal emulators that allow you to specify
+.I TERM
+as a parameter or configuration value do not change their behavior to
+match that setting.
 .SS "\fITERMCAP\fP"
-If the \fI\%ncurses\fP library has been configured with \fItermcap\fP
-support, \fI\%ncurses\fP will check for a terminal's description in
-termcap form if it is not available in the terminfo database.
-.PP
-The \fI\%TERMCAP\fP environment variable contains
-either a terminal description (with newlines stripped out),
-or a file name telling where the information denoted by
-the \fITERM\fP environment variable exists.
-In either case, setting it directs \fI\%ncurses\fP to ignore
-the usual place for this information, e.g., /etc/termcap.
+If
+.I \%ncurses
+is configured with
+.I termcap
+support,
+it checks for a terminal type description in
+.I termcap
+format if one in
+.I \%term\%info
+format is not available.
+Setting this variable directs
+.I \%ncurses
+to ignore the usual
+.I termcap
+database location,
+.IR \%/etc/termcap ;
+see
+.I \%TERMPATH
+below.
+.I \%TERMCAP
+should contain either a terminal description
+(with newlines stripped out),
+or a file name indicating where the information required by the
+.I TERM
+environment variable is stored.
 .SS "\fITERMINFO\fP"
-\fI\%ncurses\fP can be configured to read from multiple terminal
-databases.
-The \fI\%TERMINFO\fP variable overrides the location for
-the default terminal database.
-Terminal descriptions (in terminal format) are stored in terminal databases:
+.I \%ncurses
+can be configured to read terminal type description databases in various
+locations using different formats.
+This variable overrides the default location.
 .bP
-Normally these are stored in a directory tree,
-using subdirectories named by the first letter of the terminal names therein.
-.IP
-This is the scheme used in System V, which legacy Unix systems use,
-and the \fI\%TERMINFO\fP variable is used by \fIcurses\fP applications
-on those
-systems to override the default location of the terminal database.
-.IP \(bu 4
-If \fI\%ncurses\fP is built to use hashed databases,
-then each entry in this list may be the path of a hashed database file, e.g.,
-.RS 4
-.PP
-.RS 4
-.EX
-/usr/share/terminfo.db
-.EE
-.RE
-.PP
+Descriptions in
+.I \%term\%info
+format are normally stored in a directory tree using subdirectories
+named by the common first letters of the terminal types named therein.
+This is the scheme used in System\ V.
+.bP
+If
+.I \%ncurses
+is configured to use hashed databases,
+then
+.I \%TERM\%INFO
+may name its location,
+such as
+.IR \%/usr/share/terminfo.db ,
 rather than
+.IR \%/usr/share/terminfo/ .
 .PP
-.RS 4
-.EX
-/usr/share/terminfo/
-.EE
-.RE
-.PP
-The hashed database uses less disk-space and is a little faster than the
+The hashed database uses less disk space and is a little faster than the
 directory tree.
 However,
 some applications assume the existence of the directory tree,
-reading it directly
-rather than using the terminfo library calls.
-.RE
+and read it directly
+rather than using the
+.I \%term\%info
+API.
 .bP
-If \fI\%ncurses\fP is built with a support for reading termcap files
-directly, then an entry in this list may be the path of a termcap file.
-.IP \(bu 4
-If the \fI\%TERMINFO\fP variable begins with
-\*(``hex:\*('' or \*(``b64:\*('',
-\fI\%ncurses\fP uses the remainder of that variable as a compiled
-terminal description.
-You might produce the base64 format using \fBinfocmp\fP(1M):
-.RS 4
-.PP
+If
+.I \%ncurses
+is configured with
+.I termcap
+support,
+this variable may contain the location of a
+.I \%termcap
+file.
+.bP
+If the value of
+.I \%TERM\%INFO
+begins with \*(``hex:\*('' or \*(``b64:\*('',
+.I \%ncurses
+uses the remainder of the value as a compiled
+.I \%term\%info
+description.
+You might produce the base64 format using \fB\%infocmp\fP(1M).
 .RS 4
+.IP
 .EX
-TERMINFO="$(infocmp \-0 \-Q2 \-q)"
+TERMINFO=$(infocmp \-0 \-Q2 \-q)
 export TERMINFO
 .EE
 .RE
+.IP
+The compiled description is used only if it corresponds to the terminal
+type identified by
+.IR TERM .
 .PP
-The compiled description is used if it corresponds to the terminal identified
-by the \fITERM\fP variable.
-.RE
-.PP
-Setting \fI\%TERMINFO\fP is the simplest,
-but not the only way to set location of the default terminal database.
-The complete list of database locations in order follows:
-.RS 3
+Setting
+.I \%TERM\%INFO
+is the simplest,
+but not the only,
+way to direct
+.I \%ncurses
+to a terminal database.
+The search path is as follows.
 .bP
-the last terminal database to which \fI\%ncurses\fP wrote,
-if any, is searched first
+the last terminal database to which the running
+.I \%ncurses
+application wrote,
+if any
 .bP
-the location specified by the \fI\%TERMINFO\fP environment variable
+the location specified by the
+.I \%TERM\%INFO
+environment variable
 .bP
-$HOME/.terminfo
+.I $HOME/.terminfo
 .bP
-locations listed in the \fI\%TERMINFO_DIRS\fP environment variable
+locations listed in the
+.I \%TERMINFO_DIRS
+environment variable
+.ds td \" empty
+.if !'@TERMINFO_DIRS@'no default value' .as td @TERMINFO_DIRS@
+.if !'@TERMINFO@\*(td'' \{\
 .bP
-one or more locations whose names are configured and compiled into the
-\fI\%ncurses\fP library, i.e.,
+location(s) configured and compiled into
+.I \%ncurses
 .RS 3
+.if !'\*(td'' \{\
 .bP
-@TERMINFO_DIRS@ (corresponding to the \fI\%TERMINFO_DIRS\fP variable)
+.I \%@TERMINFO_DIRS@
+.\}
+.if !'@TERMINFO'' .if !'\*(td'@TERMINFO@' \{\
 .bP
-@TERMINFO@ (corresponding to the \fITERMINFO\fP variable)
-.RE
+.I \%@TERMINFO@
+.\}
+.\}
 .RE
 .SS "\fITERMINFO_DIRS\fP"
-Specifies a list of locations to search for terminal descriptions.
-Each location in the list is a terminal database as described in
-the section on the \fI\%TERMINFO\fP variable.
-The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
-.PP
-There is no corresponding feature in System V terminfo;
-it is an extension developed for \fI\%ncurses\fP.
+This variable specifies a list of locations,
+akin to
+.IR PATH ,
+in which
+.I \%ncurses
+searches for the terminal type descriptions described by
+.I \%TERMINFO
+above.
+The list items are separated by colons on Unix
+and semicolons on OS/2 EMX.
+System\ V
+.I \%term\%info
+lacks a corresponding feature;
+.I \%TERMINFO_DIRS
+is an
+.I \%ncurses
+extension.
 .SS "\fITERMPATH\fP"
-If \fI\%TERMCAP\fP does not hold a file name then \fI\%ncurses\fP checks
-the \fI\%TERMPATH\fP environment variable.
-This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
-semicolons on OS/2 EMX.
-.PP
-If the \fI\%TERMPATH\fP environment variable is not set,
-\fI\%ncurses\fP looks in the files
-.PP
-.RS 4
-.EX
-/etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
-.EE
-.RE
+If
+.I \%TERMCAP
+does not hold a terminal type description or file name,
+then
+.I \%ncurses
+checks the contents of
+.IR \%TERMPATH ,
+a list of locations,
+akin to
+.IR PATH ,
+in which it searches for
+.I termcap
+terminal type descriptions.
+The list items are separated by colons on Unix
+and semicolons on OS/2 EMX.
 .PP
+If both
+.I \%TERMCAP
+and
+.I \%TERMPATH
+are unset or invalid,
+.I \%ncurses
+searches for the files
+.IR \%/etc/termcap ,
+.IR \%/usr/share/misc/termcap ,
+and
+.IR \%$HOME/.termcap ,
 in that order.
 .SH "ALTERNATE CONFIGURATIONS"
 Many different
@@ -1579,7 +1660,7 @@ A few are of particular significance to the application developer
 employing
 .IR \%ncurses .
 .TP 5
-\-\-disable\-overwrite
+.B \-\-disable\-overwrite
 The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP:
 .RS 5
 .PP
@@ -1605,7 +1686,7 @@ It also omits a symbolic link which would allow you to use \fB\-lcurses\fP
 to build executables.
 .RE
 .TP 5
-\-\-enable\-widec
+.B \-\-enable\-widec
 The configure script renames the library and
 (if the \fB\-\-disable\-overwrite\fP option is used)
 puts the header files in a different subdirectory.
@@ -1630,7 +1711,8 @@ you link with
 You must also enable the wide-character features in the header file
 when compiling for the wide-character library
 to use the extended (wide-character) functions.
-The symbol which enables these features has changed since XSI Curses, Issue 4:
+The symbol which enables these features has changed
+since X/Open Curses, Issue 4:
 .bP
 Originally, the wide-character feature required the symbol
 \fB_XOPEN_SOURCE_EXTENDED\fP
@@ -1659,7 +1741,7 @@ to allow applications to be built using either library
 from the same set of headers.
 .RE
 .TP 5
-\-\-with\-pthread
+.B \-\-with\-pthread
 The configure script renames the library.
 All of the library names have a \*(``t\*('' appended to them
 (before any \*(``w\*('' added by \fB\-\-enable\-widec\fP).
@@ -1669,20 +1751,20 @@ allow read-only access.
 At the same time, setter-functions are provided to set these values.
 Some applications (very few) may require changes to work with this convention.
 .TP 5
-\-\-with\-shared
-.TP
-\-\-with\-normal
-.TP
-\-\-with\-debug
-.TP
-\-\-with\-profile
+.B \-\-with\-shared
+.tQ
+.B \-\-with\-normal
+.tQ
+.B \-\-with\-debug
+.tQ
+.B \-\-with\-profile
 The shared and normal (static) library names differ by their suffixes,
 e.g., \fBlibncurses.so\fP and \fBlibncurses.a\fP.
 The debug and profiling libraries add a \*(``_g\*(''
 and a \*(``_p\*('' to the root names respectively,
 e.g., \fBlibncurses_g.a\fP and \fBlibncurses_p.a\fP.
 .TP 5
-\-\-with\-termlib
+.B \-\-with\-termlib
 Low-level functions which do not depend upon whether the library
 supports wide-characters, are provided in the tinfo library.
 .IP
@@ -1709,7 +1791,7 @@ database
 \fB\%curs_util\fP(3X) \- miscellaneous \fIcurses\fP utility routines
 .RE
 .TP 5
-\-\-with\-trace
+.B \-\-with\-trace
 The \fBtrace\fP function normally resides in the debug library,
 but it is sometimes useful to configure this in the shared library.
 Configure scripts should check for the function's existence rather
@@ -1743,15 +1825,15 @@ If the standard output file descriptor of an
 .I \%ncurses
 program is redirected to something that is not a terminal device,
 the library writes screen updates to the standard error file descriptor.
-This was an undocumented feature of SVr3.
+This was an undocumented feature of SVr3
+.IR curses .
 .PP
-See subsection \*(``Header files\*('' below regarding symbols exposed by
+See subsection \*(``Header Files\*('' below regarding symbols exposed by
 inclusion of \fI\%curses.h\fP.
 .SH EXTENSIONS
 .I \%ncurses
 enables an application to capture mouse events on certain terminals,
-including
-.IR \%xterm ;
+including \fI\%xterm\fP(1);
 see \fB\%curs_mouse\fP(3X).
 .PP
 .I \%ncurses
@@ -1768,10 +1850,11 @@ see \fB\%has_key\fP(3X).
 .I \%ncurses
 extends the fixed set of function key capabilities specified by X/Open
 Curses by allowing the application programmer to define additional key
-sequences at runtime;
+events at runtime;
 see
 \fB\%define_key\fP(3X),
 \fB\%key_defined\fP(3X),
+\fB\%keybound\fP(3X),
 and
 \fB\%keyok\fP(3X).
 .PP
@@ -1788,9 +1871,9 @@ See \fB\%default_colors\fP(3X).
 .PP
 An
 .I \%ncurses
-application can choose to hide the internal details of
+application can eschew knowledge of
 .I \%WINDOW
-structures,
+structure internals,
 instead using accessor functions such as
 \fB\%is_scrollok\fP(3X).
 .PP
@@ -1806,7 +1889,10 @@ and \fB\%extended_slk_color\fP(3X) as a form of \fB\%slk_color\fP(3X)
 that can gather color information from them when many colors are
 supported.
 .PP
-Some extensions are only available if
+Some extensions are available only if
+.I \%ncurses
+permits modification of \fB\%unctrl\fP(3X)'s behavior;
+see \fB\%use_legacy_coding\fP(3X).
 .I \%ncurses
 is compiled to support them;
 section \*(``ALTERNATE CONFIGURATIONS\*('' describes how.
@@ -1856,7 +1942,7 @@ The latter includes several additional features,
 such as wide-character and color support.
 .I \%ncurses
 intends base-level conformance with X/Open Curses,
-and supports nearly all its enhanced features.
+and supports nearly all features of its enhanced level.
 .\" XXX: What's missing?  GBR counts untic(1), and that's all.
 .PP
 Differences between X/Open Curses and
@@ -1867,125 +1953,308 @@ pages.
 In many cases, X/Open Curses is vague about error conditions,
 omitting some of the SVr4 documentation.
 .PP
-Unlike other implementations, this one checks parameters such as pointers
-to \fI\%WINDOW\fP structures to ensure they are not null.
-The main reason for providing this behavior is to guard against programmer
-error.
+Unlike other implementations,
+.I \%ncurses
+checks pointer parameters,
+such as those to
+.I \%WINDOW
+structures,
+to ensure that they are not null.
+This is done primarily to guard against programmer error.
 The standard interface does not provide a way for the library
-to tell an application which of several possible errors were detected.
-Relying on this (or some other) extension will adversely affect the
-portability of curses applications.
+to tell an application which of several possible errors occurred.
+Relying on this
+(or some other)
+extension adversely affects the portability of
+.I curses
+applications.
 .SS "Padding Differences"
-In historic curses versions, delays embedded in the capabilities \fBcr\fP,
-\fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
-bits in the Unix tty driver.
-In this implementation, all padding is done by sending NUL bytes.
-This method is slightly more expensive, but narrows the interface
-to the Unix kernel significantly and increases the package's portability
-correspondingly.
+In historical
+.I curses
+implementations,
+delays embedded in the
+.I \%term\%info
+capabilities
+.B \%carriage_return
+.RB ( cr ),
+.B \%scroll_forward
+.RB ( ind ),
+.B \%cursor_left
+.RB ( cub1 ),
+.B \%form_feed
+.RB ( ff ),
+and
+.B \%tab
+.RB ( ht )
+activated corresponding delay bits in the Unix terminal driver.
+.I \%ncurses
+performs all padding by sending NUL bytes to the device.
+This method is slightly more expensive,
+but narrows the interface to the Unix kernel significantly and
+correspondingly increases the package's portability.
 .SS "Header Files"
-The header file \fI\%curses.h\fP itself includes the header files
-\fI\%stdio.h\fP and \fI\%unctrl.h\fP.
+The header file
+.I \%curses.h
+itself includes the header files
+.I \%stdio.h
+and
+.IR \%unctrl.h .
 .PP
 X/Open Curses has more to say,
-but does not finish the story:
 .RS 4
 .PP
-The inclusion of <curses.h> may make visible all symbols
-from the headers <stdio.h>, <term.h>, <termios.h>, and <wchar.h>.
+The inclusion of
+.I \%curses.h
+may make visible all symbols from the headers
+.IR \%stdio.h ,
+.IR \%term.h ,
+.IR \%termios.h ,
+and
+.IR \%wchar.h .
 .RE
 .PP
-Here is a more complete story:
+but does not finish the story.
+A more complete account follows.
 .bP
-Starting with BSD curses, all implementations have included <stdio.h>.
+Starting with 4BSD
+.I curses
+(1980)
+all implementations have provided a
+.I \%curses.h
+file.
 .IP
-BSD curses included <curses.h> and <unctrl.h> from an internal header
-file
-.I \%curses.ext
-(\*(``ext\*('' abbreviated \*(``externs\*('').
+BSD
+.I curses
+code included
+.I \%curses.h
+and
+.I \%unctrl.h
+from an internal header file
+.IR \%curses.ext ,
+where
+\*(``ext\*('' abbreviated \*(``externs\*(''.
 .IP
-BSD curses used <stdio.h> internally (for \fBprintw\fP and \fBscanw\fP),
-but nothing in <curses.h> itself relied upon <stdio.h>.
+The implementations of
+.I \%printw
+and
+.I \%scanw
+used undocumented internal functions of the standard I/O library
+.RI ( _doprnt
+and
+.IR _doscan ),
+but nothing in
+.I \%curses.h
+itself relied upon
+.IR \%stdio.h .
 .bP
-SVr2 curses added \fBnewterm\fP(3X), which relies upon <stdio.h>.
-That is, the function prototype uses \fBFILE\fP.
+SVr2
+.I curses
+added
+.IR \%newterm ,
+which relies upon
+.I \%stdio.h
+because its function prototype employs the
+.I FILE
+type.
 .IP
-SVr4 curses added \fBputwin\fP and \fBgetwin\fP, which also use <stdio.h>.
+SVr4
+.I curses
+added
+.I \%putwin
+and
+.IR \%getwin ,
+which also use
+.IR \%stdio.h .
 .IP
-X/Open Curses documents all three of these functions.
+X/Open Curses specifies all three of these functions.
 .IP
-SVr4 curses and X/Open Curses do not require the developer to
-include <stdio.h> before including <curses.h>.
-Both document curses showing <curses.h> as the only required header.
+SVr4
+.I curses
+and X/Open Curses do not require the developer to include
+.I \%stdio.h
+before
+.IR \%curses.h .
+Both document use of
+.I curses
+as requiring only
+.IR \%curses.h .
 .IP
-As a result, standard <curses.h> will always include <stdio.h>.
+As a result,
+standard
+.I \%curses.h
+always includes
+.IR \%stdio.h .
 .bP
-X/Open Curses is inconsistent with respect to SVr4 regarding <unctrl.h>.
+X/Open Curses and SVr4
+.I curses
+are inconsistent with respect to
+.IR \%unctrl.h .
 .IP
 As noted in \fBcurs_util\fP(3X),
-\fI\%ncurses\fP includes <unctrl.h> from <curses.h>
-(like SVr4).
+.I \%ncurses
+includes
+.I \%unctrl.h
+from
+.I \%curses.h
+(as SVr4 does).
 .bP
-X/Open's comments about <term.h> and <termios.h> may refer to HP-UX and AIX:
+X/Open Curses's comments about
+.I \%term.h
+and
+.I \%termios.h
+may refer to HP-UX and AIX.
 .IP
-HP-UX curses includes <term.h> from <curses.h>
-to declare \fBsetupterm\fP in curses.h,
-but \fI\%ncurses\fP (and Solaris curses) do not.
+HP-UX
+.I curses
+includes
+.I \%term.h
+from
+.I \%curses.h
+to declare
+.I \%setupterm
+in
+.IR \%curses.h ,
+but
+.I \%ncurses
+and Solaris
+.I curses
+do not.
 .IP
-AIX curses includes <term.h> and <termios.h>.
-Again, \fI\%ncurses\fP (and Solaris curses) do not.
+AIX
+.I curses
+includes
+.I \%term.h
+and
+.IR \% termios.h .
+Again,
+.I \%ncurses
+and Solaris
+.I curses
+do not.
 .bP
-X/Open says that <curses.h> \fImay\fP include <term.h>,
-but there is no requirement that it do that.
+X/Open Curses says that
+.I \%curses.h
+.B may
+include
+.IR \%term.h ,
+but does not require it to do so.
 .IP
-Some programs use functions declared in both <curses.h> and <term.h>,
-and must include both headers in the same module.
-Very old versions of AIX curses required including <curses.h>
-before including <term.h>.
+Some programs use functions declared in both
+.I \%curses.h
+and
+.IR \%term.h ,
+and must include both header files in the same module.
+Very old versions of AIX
+.I curses
+required inclusion of
+.I \%curses.h
+before
+.IR \%term.h .
 .IP
-Because \fI\%ncurses\fP header files include the headers needed to
-define datatypes used in the headers,
-\fI\%ncurses\fP header files can be included in any order.
-But for portability, you should include <curses.h> before <term.h>.
+The header files supplied by
+.I \%ncurses
+include the standard library headers required for its declarations,
+so
+.IR \%ncurses 's
+own header files can be included in any order.
+But for portability,
+you should include
+.I \%curses.h
+before
+.IR \%term.h .
 .bP
-X/Open Curses says \fI"may make visible"\fP
-because including a header file does not necessarily make all symbols
-in it visible (there are ifdef's to consider).
+X/Open Curses says \*(``may make visible\*('' because including a header
+file does not necessarily make visible all of the symbols in it
+(consider
+.B \%#ifdef
+and similar).
 .IP
-For instance, in \fI\%ncurses\fP <wchar.h> \fImay\fP be included if
-the proper symbol is defined, and if \fI\%ncurses\fP is configured for
-wide-character support.
-If the header is included, its symbols may be made visible.
-That depends on the value used for \fB_XOPEN_SOURCE\fP
+For instance,
+.IR \%ncurses 's
+.I \%curses.h
+.B may \" bold to contrast with preceding italic
+include
+.I \%wchar.h
+if the proper symbol is defined,
+and if
+.I \%ncurses
+is configured for wide-character support.
+If
+.I \%wchar.h
+is included,
+its symbols
+.B may \" bold for consistency in this paragraph
+be made visible depending on the value of the
+.B _XOPEN_SOURCE
 feature test macro.
 .bP
-X/Open Curses documents one required header,
-in a special case: <stdarg.h> before <curses.h> to prototype
-the \fBvw_printw\fP and \fBvw_scanw\fP functions
+X/Open Curses mandates an application's inclusion of one standard C
+library header in a special case:
+.I \%stdarg.h
+before
+.I \%curses.h
+to prototype the functions
+.I \%vw_printw
+and
+.I \%vw_scanw
 (as well as the obsolete
-the \fBvwprintw\fP and \fBvwscanw\fP functions).
-Each of those uses a \fBva_list\fP parameter.
+.I \%vwprintw
+and
+.IR \%vwscanw ).
+Each of these takes a variadic argument list,
+a
+.I \%va_list
+parameter,
+like that of \fI\%printf\fP(3).
 .IP
-The two obsolete functions were introduced in SVr3.
-The other functions were introduced in X/Open Curses.
-In between, SVr4 curses provided for the possibility that
-an application might include either <varargs.h> or <stdarg.h>.
-Initially, that was done by using \fBvoid*\fP for the \fBva_list\fP
+SVr3
+.I curses
+introduced
+the two obsolete functions,
+and X/Open Curses the others.
+In between,
+SVr4
+.I curses
+provided for the possibility that an application might include either
+.I \%varargs.h
+or
+.IR \%stdarg.h .
+These represented contrasting approaches to handling variadic
+argument lists.
+The older interface,
+.IR \%varargs.h ,
+used a pointer to
+.I char \" V7, 32V, System III, 3BSD
+for variadic functions'
+.I \%va_list
 parameter.
-Later, a special type (defined in <stdio.h>) was introduced,
-to allow for compiler type-checking.
-That special type is always available,
-because <stdio.h> is always included by <curses.h>.
+Later,
+the list acquired its own standard data type,
+.IR \%va_list ,
+defined in
+.IR \%stdarg.h ,
+empowering the compiler to check the types of a function call's actual
+parameters against the formal ones declared in its prototype.
 .IP
-None of the X/Open Curses implementations require an application
-to include <stdarg.h> before <curses.h> because they either
-have allowed for a special type,
-or
-(like \fI\%ncurses\fP)
-include <stdarg.h> directly to provide a portable interface.
+No conforming implementations of X/Open Curses require an application
+to include
+.I \%stdarg.h
+before
+.I \%curses.h
+because they either have allowed for a special type,
+or,
+like
+.IR \%ncurses ,
+they include
+.I \%stdarg.h
+themselves to provide a portable interface.
 .SH AUTHORS
-Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
-Based on \fIpcurses\fP by Pavel Curtis.
+Zeyd M. Ben-Halim,
+Eric S. Raymond,
+Thomas E. Dickey.
+Based on
+.I \%pcurses
+by Pavel Curtis.
 .SH SEE ALSO
 \fB\%curs_variables\fP(3X),
 \fB\%terminfo\fP(5),
diff --git a/man/tabs.1 b/man/tabs.1
index e942125b1..059bc1ec6 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.57 2024/03/16 15:35:01 tom Exp $
-.TH @TABS@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp $
+.TH @TABS@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -272,15 +272,14 @@ and in 3BSD
 (later the same year);
 it supported a \*(``\-n\*('' option to set the first tab stop at the
 left margin.
-That option is not documented by POSIX.
+That option is not specified by POSIX.
 .PP
 The PWB/Unix
 .B tabs
 utility returned in System III (1980),
-and used built-in tables,
-rather than the terminal database,
+and used built-in tables
 to support a half-dozen hardcopy terminal (printer) types.
-It also had built-in logic to support setting the left margin,
+It also had logic to support setting the left margin,
 as well as a feature for copying the tab settings from a file.
 .PP
 Versions of the program in later releases of AT&T Unix,
diff --git a/man/term.5 b/man/term.5
index 3527c3cac..cec231f55 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.75 2024/03/16 15:35:01 tom Exp $
-.TH term 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp $
+.TH term 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -327,7 +327,7 @@ The problem is that there
 are at least three versions of terminfo (under HP\-UX, AIX, and OSF/1) 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 and XSI Curses extensions.
+System V and X/Open Curses extensions.
 See \fBterminfo\fP(5) for detailed
 discussion of terminfo source compatibility issues.
 .PP
diff --git a/man/terminfo.head b/man/terminfo.head
index b0f49edaa..717f849e2 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.63 2024/01/13 23:07:27 tom Exp $
-.TH terminfo 5 2024-01-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp $
+.TH terminfo 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -75,8 +75,10 @@ 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.
 .PP
-This manual describes \fI\%ncurses\fP
-version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+This document describes
+.I \%ncurses
+version @NCURSES_MAJOR@.@NCURSES_MINOR@
+(patch @NCURSES_PATCH@).
 .SS "\fIterminfo\fP Entry Syntax"
 Entries in
 .I terminfo
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 9bc31e4d8..4d6daa38b 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.144 2024/03/02 14:36:39 tom Exp $
+.\" $Id: terminfo.tail,v 1.148 2024/04/20 21:24:19 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -892,7 +892,7 @@ and do \fBri\fP followed by \fBdl1\fP or \fBind\fP.
 If the data scrolled
 off the bottom of the region by the \fBri\fP re-appears, then scrolling
 is non-destructive.
-System V and XSI Curses expect that \fBind\fP, \fBri\fP,
+System V and X/Open Curses expect that \fBind\fP, \fBri\fP,
 \fBindn\fP, and \fBrin\fP will simulate destructive scrolling; their
 documentation cautions you not to define \fBcsr\fP unless this is true.
 This \fBcurses\fP implementation is more liberal and will do explicit erases
@@ -914,7 +914,7 @@ or that scrolling back with \fBri\fP may bring down non-blank lines.
 .SS "Insert/Delete Character"
 There are two basic kinds of intelligent terminals with respect to
 insert/delete character which can be described using
-.I terminfo.
+.IR 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
@@ -1008,7 +1008,7 @@ to delete a single character,
 with one parameter,
 .IR n ,
 to delete
-.I n characters,
+.IR n "characters,"
 and delete mode by giving \fBsmdc\fP and \fBrmdc\fP
 to enter and exit delete mode (any mode the terminal needs to be placed
 in for
@@ -2045,7 +2045,7 @@ See
 the \fBInsert/Delete Character\fP subsection above.
 .PP
 The parameter substitutions for \fBset_clock\fP and \fBdisplay_clock\fP are
-not documented in SVr4 or the XSI Curses standard.
+not documented in SVr4 or X/Open Curses.
 They are deduced from the
 documentation for the AT&T 505 terminal.
 .PP
@@ -2064,7 +2064,7 @@ If italics should work with colors,
 then the \fBncv\fP value must be specified, even if it is zero.
 .PP
 Different commercial ports of \fI\%terminfo\fP and \fIcurses\fP support
-different subsets of XSI Curses and
+different subsets of X/Open Curses and
 (in some cases)
 different extensions.
 Here is a summary,
@@ -2110,7 +2110,7 @@ At least two implementations of \fI\%terminfo\fP
 diverged from those of other System V Unices after SVr1,
 adding extension capabilities to the string table that
 (in the binary format)
-collide with subsequent System V and XSI Curses extensions.
+collide with subsequent System V and X/Open Curses extensions.
 .SH AUTHORS
 Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
 Based on \fIpcurses\fP by Pavel Curtis.
diff --git a/man/toe.1m b/man/toe.1m
index ab8e73403..c4eba848e 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.66 2024/03/16 15:35:01 tom Exp $
-.TH @TOE@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp $
+.TH @TOE@ 1M 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -85,10 +85,13 @@ lists entries from all terminal database directories that \fIterminfo\fP
 would search,
 instead of only the first that it finds.
 .IP
-If the \fB\-s\fP option is also given,
-\fB\%@TOE@\fP adds a column to the report,
-showing (like \fB\%conflict\fP(1)) which entries belong to a given
-terminal database.
+If
+.B \-s
+is also given,
+\fB\%@TOE@\fP
+additionally reports,
+like \fI\%conflict\fP(1),
+which entries correspond to a given terminal database.
 An \*(``*\*('' marks entries that differ,
 and \*(``+\*('' marks equivalent entries.
 .IP
diff --git a/man/tput.1 b/man/tput.1
index 5da9dd607..eba073390 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.111 2024/04/13 22:09:53 tom Exp $
-.TH @TPUT@ 1 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp $
+.TH @TPUT@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -129,8 +129,13 @@ we term them \*(``pseudo-capabilities\*(''.
 .I cap-code
 indicates a capability from the terminal database.
 .IP
-If the capability is of string type and takes parameters,
-the arguments following the capability will be used as its parameters.
+If
+.I cap-code
+is of string type and takes parameters,
+\fB\%@TPUT@\fP interprets arguments following
+.I cap-code
+as the parameters,
+up to the (fixed) quantity the capability requires.
 .IP
 Most parameters are numeric.
 Only a few terminal capabilities require string parameters;
diff --git a/man/tset.1 b/man/tset.1
index 14bcb16e2..d64f9850f 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.81 2024/03/16 15:35:01 tom Exp $
-.TH @TSET@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.83 2024/04/20 19:09:08 tom Exp $
+.TH @TSET@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -396,18 +396,20 @@ the operating system,
 the \fILINES\fP and \fICOLUMNS\fP environment variables or
 the terminal description.
 .PP
-Obtaining the window size from the terminal description is common to
-both implementations, but considered obsolescent.
+Obtaining the window size from a terminal's type description is common
+to both implementations,
+but considered obsolescent.
 Its only practical use is for hardware terminals.
-Generally speaking, a window size would be unset only if there were
-some problem obtaining the value from the operating system
-(and \fBsetupterm\fP would still fail).
-For that reason,
-the \fILINES\fP and \fI\%COLUMNS\fP environment variables
-may be useful for working around window-size problems.
-Those have the drawback that if the window is resized,
-those variables must be recomputed and reassigned.
-To do this more easily, use the \fBresize\fP(1) program.
+Generally,
+the window size will remain uninitialized only if there were a problem
+obtaining the value from the operating system
+(and \fB\%setupterm\fP would still fail).
+The \fILINES\fP and \fI\%COLUMNS\fP environment variables
+may thus be useful for working around window-size problems,
+but have the drawback that if the window is resized,
+their values must be recomputed and reassigned.
+The \fI\%resize\fP(1) program distributed with
+\fI\%xterm\fP(1) assists this activity.
 .SH HISTORY
 A \fB\%reset\fP command written by Kurt Shoens appeared in 1BSD
 (March 1978).
diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index b25cf9081..1a2ddb365 100644
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.52 2021/10/23 17:12:33 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.53 2024/04/20 21:54:14 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -409,8 +409,8 @@ NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols)
 #ifdef USE_TERM_DRIVER
 	    CallDriver_2(SP_PARM, td_setsize, ToLines, ToCols);
 #else
-	    lines = (NCURSES_SIZE_T) ToLines;
-	    columns = (NCURSES_SIZE_T) ToCols;
+	    lines = (NCURSES_INT2) ToLines;
+	    columns = (NCURSES_INT2) ToCols;
 #endif
 
 	    SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen);
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index f1e6c1a2b..99097f00f 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.239 2024/04/14 17:03:40 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.240 2024/04/20 17:04:05 tom Exp $")
 
 /****************************************************************************
  *
@@ -490,7 +490,7 @@ _nc_get_screensize(SCREEN *sp,
     bool useEnv = _nc_prescreen.use_env;
     bool useTioctl = _nc_prescreen.use_tioctl;
 
-    T((T_CALLED("_nc_get_screensize (%p)"), sp));
+    T((T_CALLED("_nc_get_screensize (%p)"), (void *) sp));
 #ifdef EXP_WIN32_DRIVER
     /* If we are here, then Windows console is used in terminfo mode.
        We need to figure out the size using the console API
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index f05b40790..8ccca9eca 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.131 2023/09/16 16:28:36 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.132 2024/04/20 17:58:51 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -384,7 +384,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 		       sizeof(buffer) - 1);
 	    data.size = name_size + 1;
 
-	    total_size += data.size;
+	    total_size += (int) data.size;
 	    total_parts++;
 	    _nc_db_put(capdb, &key, &data);
 
@@ -400,7 +400,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 		key.data = ptr;
 		key.size = strlen(ptr);
 
-		total_size += data.size;
+		total_size += (int) data.size;
 		total_parts++;
 		_nc_db_put(capdb, &key, &data);
 	    }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 088ed45c3..929b0a972 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240414) unstable; urgency=low
+ncurses6 (6.4+20240420) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 088ed45c3..929b0a972 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240414) unstable; urgency=low
+ncurses6 (6.4+20240420) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 3c4053019..a32ccc5b3 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240414) unstable; urgency=low
+ncurses6 (6.4+20240420) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Apr 2024 04:48:20 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index eb57e1dc4..9125446d2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.642 2024/04/14 08:48:20 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.643 2024/04/20 10:17:21 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0414"
+!define VERSION_MMDD  "0420"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 31ce59961..b9ab089ae 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240414
+Release: 20240420
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index c02876c9c..f72b2ad18 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240414
+Release: 20240420
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9903f058f..9116cb80c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240414
+Release: 20240420
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tput.c b/progs/tput.c
index 46fcafbe3..f9321b60a 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.103 2024/03/02 13:22:26 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.104 2024/04/20 22:20:51 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -178,7 +178,13 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	}
 
 #if HAVE_SIZECHANGE
-	set_window_size(fd, &lines, &columns);
+	{
+	    NCURSES_INT2 my_rows = lines;
+	    NCURSES_INT2 my_cols = columns;
+	    set_window_size(fd, &my_rows, &my_cols);
+	    lines = my_rows;
+	    columns = my_cols;
+	}
 #else
 	(void) fd;
 #endif
diff --git a/progs/tset.c b/progs/tset.c
index 8bc502a36..69f4aba87 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.134 2024/04/13 18:59:53 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.135 2024/04/20 22:20:41 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -869,7 +869,11 @@ main(int argc, char **argv)
     if (!noset) {
 #if HAVE_SIZECHANGE
 	if (opt_w) {
-	    set_window_size(my_fd, &lines, &columns);
+	    NCURSES_INT2 my_rows = lines;
+	    NCURSES_INT2 my_cols = columns;
+	    set_window_size(my_fd, &my_rows, &my_cols);
+	    lines = my_rows;
+	    columns = my_cols;
 	}
 #endif
 	if (opt_c) {

From 44eb9e2cfab56df30c73ab0df29abef878ec96a8 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 27 Apr 2024 22:27:14 +0200
Subject: [PATCH 063/106] ncurses-6.5-20240427.patch.gz

---
 ANNOUNCE                                      |  582 ++++-----
 INSTALL                                       |   25 +-
 NEWS                                          |    9 +-
 VERSION                                       |    2 +-
 announce.html.in                              | 1022 +++++++++-------
 dist.mk                                       |    6 +-
 ...rminal_interface-curses_constants__ads.htm |    4 +-
 doc/html/announce.html                        | 1036 ++++++++++-------
 doc/html/man/adacursesw6-config.1.html        |   10 +-
 doc/html/man/captoinfo.1m.html                |    6 +-
 doc/html/man/clear.1.html                     |    6 +-
 doc/html/man/curs_add_wch.3x.html             |    6 +-
 doc/html/man/curs_add_wchstr.3x.html          |    6 +-
 doc/html/man/curs_addch.3x.html               |    6 +-
 doc/html/man/curs_addchstr.3x.html            |    6 +-
 doc/html/man/curs_addstr.3x.html              |    6 +-
 doc/html/man/curs_addwstr.3x.html             |    6 +-
 doc/html/man/curs_attr.3x.html                |   10 +-
 doc/html/man/curs_beep.3x.html                |    6 +-
 doc/html/man/curs_bkgd.3x.html                |    6 +-
 doc/html/man/curs_bkgrnd.3x.html              |    6 +-
 doc/html/man/curs_border.3x.html              |    6 +-
 doc/html/man/curs_border_set.3x.html          |    6 +-
 doc/html/man/curs_clear.3x.html               |    6 +-
 doc/html/man/curs_color.3x.html               |    6 +-
 doc/html/man/curs_delch.3x.html               |    6 +-
 doc/html/man/curs_deleteln.3x.html            |    6 +-
 doc/html/man/curs_extend.3x.html              |    6 +-
 doc/html/man/curs_get_wch.3x.html             |    6 +-
 doc/html/man/curs_get_wstr.3x.html            |    6 +-
 doc/html/man/curs_getcchar.3x.html            |    6 +-
 doc/html/man/curs_getch.3x.html               |    6 +-
 doc/html/man/curs_getstr.3x.html              |    6 +-
 doc/html/man/curs_getyx.3x.html               |    6 +-
 doc/html/man/curs_in_wch.3x.html              |    6 +-
 doc/html/man/curs_in_wchstr.3x.html           |    6 +-
 doc/html/man/curs_inch.3x.html                |    6 +-
 doc/html/man/curs_inchstr.3x.html             |    6 +-
 doc/html/man/curs_initscr.3x.html             |    6 +-
 doc/html/man/curs_inopts.3x.html              |    6 +-
 doc/html/man/curs_ins_wch.3x.html             |    6 +-
 doc/html/man/curs_ins_wstr.3x.html            |    6 +-
 doc/html/man/curs_insch.3x.html               |    6 +-
 doc/html/man/curs_insstr.3x.html              |    6 +-
 doc/html/man/curs_instr.3x.html               |    6 +-
 doc/html/man/curs_inwstr.3x.html              |    6 +-
 doc/html/man/curs_kernel.3x.html              |    6 +-
 doc/html/man/curs_legacy.3x.html              |    6 +-
 doc/html/man/curs_memleaks.3x.html            |    6 +-
 doc/html/man/curs_mouse.3x.html               |    6 +-
 doc/html/man/curs_move.3x.html                |   10 +-
 doc/html/man/curs_opaque.3x.html              |    6 +-
 doc/html/man/curs_outopts.3x.html             |    6 +-
 doc/html/man/curs_overlay.3x.html             |    6 +-
 doc/html/man/curs_pad.3x.html                 |   10 +-
 doc/html/man/curs_print.3x.html               |    6 +-
 doc/html/man/curs_printw.3x.html              |    6 +-
 doc/html/man/curs_refresh.3x.html             |    6 +-
 doc/html/man/curs_scanw.3x.html               |    6 +-
 doc/html/man/curs_scr_dump.3x.html            |    6 +-
 doc/html/man/curs_scroll.3x.html              |    6 +-
 doc/html/man/curs_slk.3x.html                 |    6 +-
 doc/html/man/curs_sp_funcs.3x.html            |    6 +-
 doc/html/man/curs_termattrs.3x.html           |    6 +-
 doc/html/man/curs_termcap.3x.html             |    6 +-
 doc/html/man/curs_terminfo.3x.html            |    6 +-
 doc/html/man/curs_threads.3x.html             |    6 +-
 doc/html/man/curs_touch.3x.html               |    6 +-
 doc/html/man/curs_trace.3x.html               |    6 +-
 doc/html/man/curs_util.3x.html                |    6 +-
 doc/html/man/curs_variables.3x.html           |    6 +-
 doc/html/man/curs_window.3x.html              |    6 +-
 doc/html/man/default_colors.3x.html           |    6 +-
 doc/html/man/define_key.3x.html               |    6 +-
 doc/html/man/form.3x.html                     |    6 +-
 doc/html/man/form_cursor.3x.html              |    6 +-
 doc/html/man/form_data.3x.html                |    6 +-
 doc/html/man/form_driver.3x.html              |    6 +-
 doc/html/man/form_field.3x.html               |    6 +-
 doc/html/man/form_field_attributes.3x.html    |    6 +-
 doc/html/man/form_field_buffer.3x.html        |    6 +-
 doc/html/man/form_field_info.3x.html          |    6 +-
 doc/html/man/form_field_just.3x.html          |    6 +-
 doc/html/man/form_field_new.3x.html           |    6 +-
 doc/html/man/form_field_opts.3x.html          |    6 +-
 doc/html/man/form_field_userptr.3x.html       |    6 +-
 doc/html/man/form_field_validation.3x.html    |    6 +-
 doc/html/man/form_fieldtype.3x.html           |    6 +-
 doc/html/man/form_hook.3x.html                |    6 +-
 doc/html/man/form_new.3x.html                 |    6 +-
 doc/html/man/form_new_page.3x.html            |    6 +-
 doc/html/man/form_opts.3x.html                |    6 +-
 doc/html/man/form_page.3x.html                |    6 +-
 doc/html/man/form_post.3x.html                |    6 +-
 doc/html/man/form_requestname.3x.html         |    6 +-
 doc/html/man/form_userptr.3x.html             |    6 +-
 doc/html/man/form_variables.3x.html           |    6 +-
 doc/html/man/form_win.3x.html                 |    6 +-
 doc/html/man/infocmp.1m.html                  |    6 +-
 doc/html/man/infotocap.1m.html                |    6 +-
 doc/html/man/key_defined.3x.html              |    6 +-
 doc/html/man/keybound.3x.html                 |    6 +-
 doc/html/man/keyok.3x.html                    |    6 +-
 doc/html/man/legacy_coding.3x.html            |    6 +-
 doc/html/man/menu.3x.html                     |    6 +-
 doc/html/man/menu_attributes.3x.html          |    6 +-
 doc/html/man/menu_cursor.3x.html              |    6 +-
 doc/html/man/menu_driver.3x.html              |    6 +-
 doc/html/man/menu_format.3x.html              |    6 +-
 doc/html/man/menu_hook.3x.html                |    6 +-
 doc/html/man/menu_items.3x.html               |    6 +-
 doc/html/man/menu_mark.3x.html                |    6 +-
 doc/html/man/menu_new.3x.html                 |    6 +-
 doc/html/man/menu_opts.3x.html                |    6 +-
 doc/html/man/menu_pattern.3x.html             |    6 +-
 doc/html/man/menu_post.3x.html                |    6 +-
 doc/html/man/menu_requestname.3x.html         |    6 +-
 doc/html/man/menu_spacing.3x.html             |    6 +-
 doc/html/man/menu_userptr.3x.html             |    6 +-
 doc/html/man/menu_win.3x.html                 |    6 +-
 doc/html/man/mitem_current.3x.html            |    6 +-
 doc/html/man/mitem_name.3x.html               |    6 +-
 doc/html/man/mitem_new.3x.html                |    6 +-
 doc/html/man/mitem_opts.3x.html               |    6 +-
 doc/html/man/mitem_userptr.3x.html            |    6 +-
 doc/html/man/mitem_value.3x.html              |    6 +-
 doc/html/man/mitem_visible.3x.html            |    6 +-
 doc/html/man/ncurses.3x.html                  |  119 +-
 doc/html/man/ncursesw6-config.1.html          |   10 +-
 doc/html/man/new_pair.3x.html                 |    6 +-
 doc/html/man/panel.3x.html                    |    6 +-
 doc/html/man/resizeterm.3x.html               |    6 +-
 doc/html/man/scr_dump.5.html                  |    6 +-
 doc/html/man/tabs.1.html                      |    6 +-
 doc/html/man/term.5.html                      |    6 +-
 doc/html/man/term.7.html                      |    6 +-
 doc/html/man/term_variables.3x.html           |    6 +-
 doc/html/man/terminfo.5.html                  |    8 +-
 doc/html/man/tic.1m.html                      |   82 +-
 doc/html/man/toe.1m.html                      |    6 +-
 doc/html/man/tput.1.html                      |    6 +-
 doc/html/man/tset.1.html                      |   12 +-
 doc/html/man/user_caps.5.html                 |    6 +-
 doc/html/man/wresize.3x.html                  |    6 +-
 man/MKada_config.in                           |    4 +-
 man/MKncu_config.in                           |    4 +-
 man/curs_attr.3x                              |    5 +-
 man/curs_move.3x                              |    8 +-
 man/curs_pad.3x                               |    6 +-
 man/manlinks.sed                              |    4 +-
 man/ncurses.3x                                |   10 +-
 man/tic.1m                                    |    6 +-
 man/tset.1                                    |    6 +-
 ncurses/curses.priv.h                         |    3 +-
 package/debian-mingw/changelog                |    4 +-
 package/debian-mingw64/changelog              |    4 +-
 package/debian/changelog                      |    4 +-
 package/mingw-ncurses.nsi                     |    6 +-
 package/mingw-ncurses.spec                    |    4 +-
 package/ncurses.map                           |    4 +-
 package/ncurses.spec                          |    4 +-
 package/ncursest.map                          |    4 +-
 package/ncursest.spec                         |    4 +-
 package/ncursestw.map                         |    4 +-
 package/ncursesw.map                          |    4 +-
 test/README                                   |   12 +-
 166 files changed, 2153 insertions(+), 1680 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 45b1a0ea0..6abf551c6 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-                            Announcing ncurses 6.4
+                            Announcing ncurses 6.5
 
 Overview
 
@@ -49,10 +49,10 @@ Overview
 
 Release Notes
 
-   These notes are for ncurses 6.4, released December 31, 2022.
+   These notes are for ncurses 6.5, released April 27, 2024.
 
    This  release  is  designed  to  be source-compatible with ncurses 5.0
-   through  6.3; providing extensions to the application binary interface
+   through  6.4; providing extensions to the application binary interface
    (ABI).  Although  the  source  can  still be configured to support the
    ncurses  5  ABI, the reason for the release is to reflect improvements
    to the ncurses 6 ABI and the supporting utility programs.
@@ -63,176 +63,189 @@ Release Notes
    The   most  important  bug-fixes/improvements  dealt  with  robustness
    issues.  The  release notes also mention some other bug-fixes, but are
    focused  on  new  features and improvements to existing features since
-   ncurses 6.3 release.
+   ncurses 6.4 release.
 
   Library improvements
 
     New features
 
-   There are no new features in this release.
+   These are new features:
+     * The low-level terminfo and termcap interfaces are used both by the
+       higher-level curses library, as well as by many applications.
+       The  functions  which  convert  parameterized  terminal capability
+       strings  for output to the terminal (tiparm and tparm) analyze the
+       capability string to determine which parameters are strings (i.e.,
+       addresses), versus numbers (not addresses).
+       The  library's analysis of a capability string may differ from the
+       calling  application's design if environment variables are used to
+       point  to  an  invalid  terminal  database. This is a longstanding
+       problem  with  all  implementations  of  terminfo, dating from the
+       early 1980s.
+       Two  new  functions  address this problem: by providing a function
+       which  allows  the  calling  application  to tell ncurses how many
+       string-parameters to expect:
+          + tiscan_s  helps  applications  check  formatting capabilities
+            that would be passed to tiparm_s.
+          + tiparm_s provides applications a way to tell ncurses what the
+            expected parameters are for a capability.
+     * The  ncurses library supports a compile-time feature (enabled with
+       the   configure   --enable-check-size   option)  which  simplifies
+       initialization  with  terminals  which  do  not  negotiate  window
+       (screen)  size.  This is done in setupterm, by providing for using
+       ANSI cursor-position report (in user6/user7 terminfo capabilities)
+       to  obtain  the  screen  size  if neither environment variables or
+       ioctl is used.
+       The  ncurses  test-program  with options "-E -T" demonstrates this
+       feature.
+     * add functions to query tty-flags in SCREEN
+
+   This release drops compatibility with obsolete versions of tack, e.g.,
+   pre-1.08
 
     Other improvements
 
    These are improvements to existing features:
-     * modify  delscreen  to  more  effectively delete all windows on the
-       given screen.
-     * modify  wnoutrefresh  to  call  pnoutrefresh if its parameter is a
-       pad,  rather than treating it as an error, and modify new_panel to
-       permit its window-parameter to be a pad
-     * modify  curses_trace()  to  show  the trace-mask as symbols, e.g.,
-       TRACE_ORDINARY, DEBUG_LEVEL(3).
-     * improve  checks  for valid mouse events when an intermediate mouse
-       state is not part of the mousemask specified by the caller
-     * allow extended-color number in opts parameter of wattr_on.
-     * improve _tracecchar_t2 formatting of base+combining character.
-     * trim  out some unwanted linker options from ncurses*config and .pc
-       files seen in Fedora 36+.
-     * improve shell-scripts with shellcheck
-     * improve use of "trap" in shell scripts, using a script.
-     * modify make-tar.sh scripts to make timestamps more predictable.
+     * In  addition  to  the  new,  safer function tiparm_s, ncurses adds
+       checks to make the older tiparm, tparm and tgoto functions safer:
+          + the  terminfo  functions  tiparm  and  tparm  ensure that the
+            capability  string  comes from the terminal description which
+            ncurses  loads,  rather  than  from  random  data  which  the
+            application happens to have.
+          + the  tgoto function disallows capabilities which its analysis
+            shows will attempt to use string parameters.
+          + ncurses  uses  internal functions which correspond to tiparm,
+            and  tgoto which ensure that the capability strings which are
+            passed  to  these  functions  come  from  the loaded terminal
+            description.
+     * improve  check  in  lib_tparm.c, ensuring that a char* fits into a
+       TPARM_ARG
+     * modify  _nc_syserr_abort  to  use _nc_env_access, rather than only
+       checking root uid
+     * improve thread lock in lib_trace.c
+     * modify  flushinp  to  use  file descriptors in SCREEN, rather than
+       from TERMINAL, and check if they are for a terminal, like SVr4
+     * modify mcprint to use file descriptor in SCREEN, for consistency
+     * modify  internal  function  _nc_read_file_entry  to  show relevant
+       filename in warnings
+     * improve  checks  in  internal  function convert_string for corrupt
+       terminfo entry
+     * review/improve handling of out-of-memory conditions
+     * limit  delays  to 30 seconds, i.e., padding delays in terminfo, as
+       well as napms and delay_output functions
+     * fix  reallocation  loop  for  vsnprintf  in  _nc_sprintf_string by
+       copying the va_list variable
+     * modify  delscreen  to  limit  the windows which it creates to just
+       those associated with the screen
+     * modify  endwin to return an error if it is called again without an
+       intervening screen update
+     * modify wenclose to handle pads
+     * eliminate use of PATH_MAX in lib_trace.c
+     * provide for any CCHARW_MAX greater than 1
 
    These are corrections to existing features:
-     * modify  misc/gen-pkgconfig.in  to  allow  for  the  case where the
-       library  directory  does  not  yet  exist, since this is processed
-       before doing an install
-     * set trailing null on string passed from winsnstr to wins_nwstr.
-     * modify  waddch_literal  to  allow  for double-width base character
-       when merging a combining character
+     * correct loop termination condition in waddnstr and waddnwstr
+     * improve  parsing  in  internal  function _nc_msec_cost, allowing a
+       single decimal point
+     * amend  parameter check for entire string versus specific length in
+       winsnstr  and wins_nwstr to match Solaris; make similar correction
+       to wins_nwstr
+     * correct   internal   function   wadd_wch_literal   when  adding  a
+       non-spacing character to a double-width character
+     * correct  definition of Charable macro for non-wide ncurses library
+       .
 
   Program improvements
 
-   Several improvements were made to the utility programs:
+   Several improvements were made to the utility programs. Some were done
+   to  make  the  infocmp  option  "-u" option help refactor the terminal
+   database.
 
    infocmp
 
-          + rewrite  canonical_name  function of infocmp to ensure buffer
-            size
-          + improve  readability  of  long parameterized expressions with
-            the  infocmp  "-f"  option  by  allowing  split before a "%p"
-            marker.
-          + modify   verbose-option   of  infocmp,  tic,  toe  to  enable
-            debug-tracing if that is configured.
-
-   tabs
-          limit tab-stop values to max-columns
+          + add  limit  checks  for processing extended capabilities with
+            the "-u" option
+          + correct  initial  alignment of extended capabilities, so that
+            the "-u" option can be used for more than two terminal types
+          + modify  "-u"  option  to not report cancels for strings which
+            were already cancelled in a use'd chunk.
+          + correct  an  assignment  "-u"  for  detecting if a boolean is
+            unset  in  a base entry and set in a use'd chunk, i.e., if it
+            was cancelled.
 
    tic
-          add   consistency   check   in   tic  for  u6/u7/u8/u9  and  NQ
-          capabilities.
 
-   tput
-          corrected use of original tty-modes in init/reset subcommands
+          + correct limit-check when dumping tc/use clause via "-I"
+          + check  return  value  of  _nc_save_str, in special case where
+            extended   capabilities   are   processed  but  the  terminal
+            description was not initialized
+          + modify  check for multiply defined aliases to report problems
+            within  the  current  runtime  rather than for conflicts with
+            pre-existing terminal descriptions.
+          + disallow  using $TERMINFO or $HOME/.terminfo when "-o" option
+            is used
+
+   tput and tset
+
+          + add "-v" option to tput, to show warnings
+          + modify reset command to avoid altering clocal if the terminal
+            uses a modem
+          + modify  reset feature to avoid 1-second sleep if running in a
+            pseudo-terminal
 
     Examples
 
    Along  with  the  library and utilities, improvements were made to the
-   ncurses-examples.  Most  of  this  activity  aimed  at  improving  the
-   test-packages:
-     * add  minimal  -h  (usage)  and  -V  (version)  getopt logic to all
-       ncurses-examples programs.
-     * fix an error in "@" command in test/ncurses.c F-menu
-     * add curses_trace to ifdef's for START_TRACE in test/test.priv.h
-     * improve pthread-configuration for test/worm.c
-     * add setlocale call to several test-programs.
-     * workaround  in  test/picsmap.c  for  use of floating point for rgb
-       values by ImageMagick 6.9.11, which appears to use the wrong upper
-       limit.
-     * use  static libraries for AdaCurses test-package for Mageia, since
-       no gprbuild package is available.
-     * install  Ada95  sample  programs  in  libexecdir, adding a wrapper
-       script to invoke those.
-     * install  ncurses-examples programs in libexecdir, adding a wrapper
-       script to invoke those.
-
-   There are other new demo/test programs and reusable examples:
-
-   test/combine
-          demonstrate combining characters
-
-   test/test_delwin
-          demonstrate deleting a window
-
-   test/test_mouse
-          observe  mouse  events  in  the  raw terminal or parsed ncurses
-          modes
-
-   test/test_unget_wch
-          demonstrate the unget_wch and unget functions
+   ncurses-examples:
+     * modify test_tparm to account for extended capabilities
+     * corrected mouse mask in test/testcurs.c
+     * modify test/clip_printw.c to optionally test non-wrapped updates
+     * modify test/test_mouse.c to use curses api for raw/noraw
+     * modify test/clip_printw.c to optionally test non-wrapped updates
+
+   There is one new demo/test programs:
+
+   test/test_endwin.c
+          This program shows the return-status from endwin with different
+          combinations of endwin (repeated), initscr, newterm.
 
   Terminal database
 
    There are several new terminal descriptions:
-     * mosh
-     * mosh-256color
-     * teken-16color
-     * teken-sc
-     * teken-vt
-     * xgterm
+     * ansi+apparrows
+     * contour
+     * linux+kbs for terminals which imitate xterm's behavior with Linux
+     * rio, rio-direct
+     * mostlike
+     * ms-vt100-16color, winconsole
+     * vt100+noapp,   vt100+noapp+pc,  xterm+app+pc,  xterm+decedit  from
+       xterm #389
+     * putty+cursor to reflect amending of modified cursor-keys in 2021
+     * wezterm
 
    There  are  many  changes to existing terminal descriptions. Some were
-   updates to several descriptions:
-     * make description-fields distinct
-     * fix errata in description fields
-     * add/use several building-blocks:
-          + aixterm+sl
-          + ansi+cpr
-          + apollo+vt132
-          + decid+cpr
-          + ncr260vp+sl
-          + wyse+sl
-          + x10term+sl
-          + xterm+acs
-          + xterm+alt47
-
-   while  others  affected specific descriptions. These were retested, to
-   take into account changes by their developers:
-     * kitty
-     * teken
-
-   while  these are specific fixes based on reviewing documentation, user
-   reports, or warnings from tic:
-
-   att610+cvis0
-          amended note as per documentation for att610, att620, att730
-
-   kon, kon2, jfbterm
-          revise to undo "linux2.6" change to smacs/rmacs/enacs
-
-   st-0.6
-          add dim, ecma+strikeout
-
-   foot+base
-          add xterm+sl-alt
-
-   dec+sl
-          correct dsl in dec+sl
-
-   mintty and tmux
-          correct setal in mintty/tmux entries, add to vte-2018
-
-   nsterm
-          modify nsterm to use xterm+alt1049
-
-   putty
-          modify putty to use xterm+alt1049
-
-   vte-2018
-          add blink and setal
-
-   A few entries use extensions (user-defined terminal capabilities):
-     * use  ansi+enq  and  decid+cpr in cases where the terminal probably
-       supported the u6-u9 extension
-     * remove u6-u9 from teken-2018
-     * use  NQ  to flag entries where the terminal does not support query
-       and response
-     * add/use bracketed+paste to help identify terminals supporting this
-       xterm feature
-     * modify  samples  for xterm mouse 1002/1003 modes to use 1006 mode,
-       and also provide for focus in/out responses
-     * xterm  patch  #371 supports DEC-compatible status-line. add dec+sl
-       to  xterm-new, per xterm #371, add xterm-p371, add xterm-p370, for
-       use  in  older  terminals, and set "xterm-new" to "xterm-p370" (to
-       ease adoption).
+   updates  to  several  descriptions, using the infocmp "-u" option in a
+   script  to  determine  which  building-block  entries could be used to
+   replace multiple capability settings (and trim redundant information).
+
+   Other changes include:
+     * document XF, kxIN and kxOUT
+     * add note on sun regarding wscons/cmdtool/shelltool
+     * remove DECCOLM+DECSCLM from foot
+     * add xterm+focus to foot+base
+     * add ecma+strikeout to putty
+     * use CSI 3J in vte-2017
+     * use oldxterm+sm+1006 in vte-2014
+     * modify xgterm to work around line-drawing bug
+     * add  xterm  focus  mode 1004 to xterm+focus as fe/fd capabilities,
+       like vim.
+     * add xterm+focus to alacritty+common
+     * add  XR/xr,  to work with vim, and use RV/rv to denote DA2 and its
+       response
+     * add  XF  flag  to  xterm+focus so that termcap applications can be
+       aware of terminals which may support focus in/out
+     * use xterm+focus in xterm-p370 and tmux
+     * remove xterm+sm+1006 from tmux
+     * NetBSD-related fixes for x68k and wsvt25
 
   Documentation
 
@@ -247,123 +260,157 @@ Release Notes
    features   and   show   how   they  evolved,  there  are  corrections,
    clarifications, etc.:
      * Corrections:
-          + remove a stray '/' from description of %g in terminfo(5).
-          + correct/improve  font-formatting in curs_getch.3x, as well as
-            other manual pages.
+          + add   assignment   in  CF_MAN_PAGES  to  fill  in  value  for
+            TERMINFO_DIRS in ncurses, terminfo and tic manpages.
+          + clarify  interaction  of  -R  option  versus -C, -I and -r in
+            infocmp manpage.
+          + correct manpage description of panel_hidden.
+          + improve  manpage  description  for addch versus unctrl format
+            used for non-printable characters.
+          + improve  manpages  discussing  file  descriptors in low-level
+            functions.
+          + improve description of search rules for terminal descriptions
+            in terminfo manpage.
+          + modify  dist.mk  to  avoid  passing  developer's  comments in
+            manpages into the generated html documentation.
+          + modify  test-package  "ncurses6-doc"  to use manpage-aliases,
+            which  in  turn  required a change to the configure script to
+            factor in the extra-suffix option when deriving alias names.
      * New/improved history and portability sections:
-          + add portability notes for delscreen and delwin in manual.
-          + improve curs_slk.3x discussion of extensions and portability
+          + add  information  about  "ttycap",  termcap's  forerunner, to
+            tset.1
+          + document   limitations   of   tparm,   and  error-returns  in
+            curs_terminfo.3x
+          + document   limitations   of   tgoto,   and  error-returns  in
+            curs_termcap.3x
      * Other improvements:
-          + improve  curs_bkgd.3x,  explaining  that  bkgdset  can affect
-            results for bkgd
-          + add note on portable memory-leak checking in curs_memleaks.3x
-          + expanded description in resizeterm.3x
-          + add  section  on  releasing  memory  to  curs_termcap.3x  and
-            curs_terminfo.3x manpages.
-          + add  clarification  of  the  scope  of  dynamic  variables in
-            terminfo(5).
-          + improve formatting of ncurses-intro.html and hackguide.html
-          + improve curs_clear.3x links to other pages
-          + update  ncurses-howto,  making documentation fixes along with
-            corrections to example programs.
-          + use  newer  version  1.36 of gnathtml for generating Ada html
-            files.
-          + update external links in Ada95.html
+          + This  release  has many changes to improve the formatting and
+            style of the manpages.
+          + Manpages  now use consistent section-naming, page headers and
+            footers (including the modification date for each page).
+          + Table layout has been revised.
 
    There  are  no new manual pages (all of the manual page updates are to
    existing pages).
 
   Interesting bug-fixes
 
-   While  there  were  many bugs fixed during development of ncurses 6.4,
-   only  a  few  (the  reason  for  this release) were both important and
-   interesting. Most of the bug-fixes were for local issues which did not
-   affect  compatibility across releases. Since those are detailed in the
-   NEWS file no elaboration is needed here.
-
-   The  interesting  bugs were those dealing with memory leaks and buffer
-   overflows.  Although  the utilities are designed for text files (which
-   they do properly), some choose to test them with non-text files.
-     * Text  files  contain  no  embedded  nulls.  Also,  they end with a
-       newline.  Feeding tic non-text files exposed a few cases where the
-       program  did  not  check  for  those  issues. As a result, further
-       processing  of the input found limit-checks whose assumptions were
-       invalid.
-     * Fixing  the limit-checks (first) found a problem with tic managing
-       the  list  of  strings  in  a terminal description. In merging two
-       terminal  descriptions  (i.e.,  the  "use="  feature), tic was not
-       allocating  a  complete copy. A quick repair for that introduced a
-       memory leak.
-     * The  checks  for non-text files are improved (i.e., embedded nulls
-       in  the  input  file  will  cause  tic  to  reject  it rather than
-       attempting to process it).
-     * The string allocations in tic are likewise improved.
+   The  changes to tparm, tgoto which improve the design of the low-level
+   interfaces are interesting, but are not bug-fixes per se.
 
   Configuration changes
 
     Major changes
 
-   There  are  no  major  changes.  No  new  options  were added. Several
-   improvements were made to configure checks.
+   These are the major changes (aside from introducing tiparm_s):
+     * use wide-character (ncursesw) by default
+     * use opaque typedefs by default
+
+   However,  most  of  the  work  on configure scripts was done to reduce
+   warnings within the configure script:
+     * intrusive warnings from GNU grep regarding fgrep and egrep
+     * fatal  errors  in  compile-checks,  arising from recent "Modern C"
+       efforts  by  some  developers  which caused longstanding configure
+       checks to fail.
+       After  repairing  the  configure  script,  none  of  that activity
+       affected  ncurses  because stricter warnings are used routinely in
+       development.
+
+   Other improvements made to configure checks include
+     * use  string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c,
+       overlooked due to compiler changes in recent OpenBSD releases
+     * revise progs.priv.h to provide for NC_ISATTY reuse
+     * configure check for MB_LEN_MAX provides warning as needed
+     * trim   a   space  after  some  "-R"  options,  fixing  builds  for
+       applications built using clang and ncurses on Solaris
+     * work  around  misconfiguration  of  MacPorts  gcc13, which exposes
+       invalid  definition  of  MB_LEN_MAX  in  gcc's  fallback  copy  of
+       limits.h
+     * modified  experimental  Windows  driver  works  with  xterm  mouse
+       protocol
 
     Configuration options
 
-   There are a few new/modified configure options:
+   There are a few new configure options:
+
+   --disable-setuid-environ
+          Compile  with  environment  restriction, so certain environment
+          variables  are  not  available when running via a setuid/setgid
+          application. These are (for example $TERMINFO) those that allow
+          the  search  path  for  the  terminfo  or  termcap  entry to be
+          customized.
+
+          A  setuid/setgid application inherits its environment variables
+          from  the current user, in contrast to sudo which may limit the
+          environment variables that ncurses uses.
+
+   --enable-check-size
+          Compile-in  feature to detect screensize for terminals which do
+          not advertise their screensize, e.g., serial terminals.
+
+   --with-abi-altered=NUM
+          Override  the  displayed  (rather  than  compiled-in) ABI. Only
+          packagers who have created configurations where the ABI differs
+          from ncurses should be interested in this option.
+
+   --with-strip-program=XXX
+          When  stripping  executables  during install, use the specified
+          program  rather  than  "strip" overriding program chosen by the
+          install program for stripping executables.
 
-   --with-abi-version
-          add ABI 7 defaults to configure script.
+   These configure options are modified:
 
-   --with-caps
-          add   warning   in  configure  script  if  file  specified  for
-          "--with-caps" does not exist.
+   --with-pkg-config-libdir[=DIR]
+          The  optional  DIR parameter can now be "auto" to automatically
+          use pkg-config's library directory.
 
-   --with-manpage-format
-          bzip2 and xz compression are now supported
+          The default is $(libdir).
 
-   --with-xterm-kbs
-          add    check/warning    in    configure    script   if   option
-          "--with-xterm-kbs" is missing or inconsistent
+   --with-xterm-kbs[=XXX]
+          The  default  is  "auto"  which  tells  the configure script to
+          choose BS or DEL according to platform defaults.
 
   Portability
 
    Many  of  the  portability  changes  are implemented via the configure
    script:
-     * amend  configure option's auto-search to account for systems where
-       none of the directories known to pkg-config exist
-     * corrected regex needed for older pkg-config used in Solaris 10
-     * improve  handling of --with-pkg-config-libdir option, allowing for
-       the case where either $PKG_CONFIG_LIBDIR or the option value has a
-       colon-separated list of directories
-     * if   the   --with-pkg-config-libdir   option  is  not  given,  use
-       ${libdir}/pkgconfig as a default
-     * improve search-path check for pkg-config, e.g., for Debian testing
-       which installs pkg-config with architecture-prefixes.
-     * build-fix for cross-compiling to MingW, conditionally add -lssp
-     * improve configure check for getttynam
-     * fixes to build with dietlibc:
-          + add configure check for fpathconf
-          + add   configure   check   for  math  sine/cosine,  needed  in
-            test/tclock, and eliminate pow() from test/hanoi
-          + use wcsnlen as an alternative to wmemchr if it is not found
-     * modify  configure macro CF_BUILD_CC to check if the build-compiler
-       works,  rather  than that it is different from the cross-compiler,
-       e.g.,  to  accommodate  a  compiler  which  can be used for either
-       purpose with different flags
-     * modify  configure/scripts  to work around interference by GNU grep
-       3.8
+     * add/use   configure   check   for   clock_gettime,   to  supersede
+       gettimeofday.
+     * modify  configure script check for pkg-config library directory to
+       take   into   account   an   older   version   0.15.0  which  used
+       PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR
+     * allow for MinGW32-/64-bit configurations to use _DEFAULT_SOURCE
+     * modify   CF_XOPEN_SOURCE  macro's  amend  default  case  to  avoid
+       undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined
+     * updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng
+     * modify version-check for gcc/g++, now works for msys2
+     * build-fixes related to configure-options and/or platform:
+          + fix for --enable-fvisibility
+          + fix for unusual values of --with-rel-version
+          + fix for unusual values of --with-abi-version
+          + fix for --disable-tcap-names
+          + fix for termcap in nc_access.h
+     * other configure-script improvements:
+          + recent msys2 headers work with _DEFAULT_SOURCE; amend check
+          + use  $ac_includes_default in most cases where stdlib.h should
+            work
+          + use #error consistently vs "make an error"
+          + add configure macro for gettimeofday vs inline check
 
    Here are some of the other portability fixes:
-     * change  man_db.renames  to  template,  to  handle  ncurses*-config
-       script with the --extra-suffix configure option.
-     * update   CF_XOPEN_SOURCE  macro,  adding  variants  "gnueabi"  and
-       "gnueabihf" to get _DEFAULT_SOURCE special case, as well as adding
-       GNU  libc  suffixes for "abi64", "abin32", "x32" to distinguish it
-       from other libc flavors.
-     * work  around  musl's  nonstandard  use  of  feature test macros by
-       adding  a  definition  for NCURSES_WIDECHAR to the generated ".pc"
-       and *-config files.
-     * use  "command  -v"  rather than "type" in Ada95/gen/Makefile.in to
-       fix a portability issue.
+     * modify  configure  scripts/makefiles  to  omit  KEY_RESIZE  if the
+       corresponding SIGWINCH feature is disabled
+     * increase MB_CUR_MAX to 16, matching glibc's MB_LEN_MAX
+     * add BSD erase2 to characters handled by tset/reset
+     * use getauxval when available, to improve setuid/setgid checks
+     * set dwShareMode in calls to CreateConsoleScreenBuffer
+     * use  CreateFile  with "CONIN$", "CONOUT$" rather than GetStdHandle
+       to  obtain a handle on the actual console, avoiding redirection in
+       the MinGW/Win32 configurations
+     * modify  MinGW  driver  to  return KEY_BACKSPACE when an unmodified
+       VK_BACK virtual key is entered
+     * modify  MinGW  configuration  to provide for running in MSYS/MSYS2
+       shells, assuming ConPTY support
      _________________________________________________________________
 
 Features of ncurses
@@ -371,20 +418,21 @@ Features of ncurses
    The  ncurses  package  is  fully upward-compatible with SVr4 (System V
    Release 4) curses:
      * All of the SVr4 calls have been implemented (and are documented).
-     * ncurses  supports  all  of  the for SVr4 curses features including
-       keyboard  mapping,  color,  forms-drawing with ACS characters, and
-       automatic recognition of keypad and function keys.
-     * ncurses  provides  these SVr4 add-on libraries (not part of X/Open
-       Curses):
-          + the  panels  library,  supporting  a  stack  of  windows with
-            backing store.
-          + the   menus   library,  supporting  a  uniform  but  flexible
-            interface for menu programming.
+     * ncurses  supports  the  features of SVr4 curses including keyboard
+       mapping,  color,  form  drawing with ACS characters, and automatic
+       recognition of keypad and function keys.
+     * ncurses  provides  work-alike  replacements  of  SVr4 supplemental
+       libraries  based on curses, but which were not specified by X/Open
+       Curses:
+          + the panel library, supporting a stack of windows with backing
+            store
+          + the menu library, supporting a uniform but flexible interface
+            for menu programming
           + the   form   library,   supporting  data  collection  through
-            on-screen forms.
+            on-screen forms
      * ncurses's  terminal database is fully compatible with that used by
        SVr4 curses.
-          + ncurses  supports user-defined capabilities which it can see,
+          + ncurses  supports  user-defined capabilities that it can see,
             but  which are hidden from SVr4 curses applications using the
             same terminal database.
           + It  can  be optionally configured to match the format used in
@@ -397,11 +445,12 @@ Features of ncurses
        the HP-UX and AIX ports.
 
    The ncurses package also has many useful extensions over SVr4:
-     * The  API  is 8-bit clean and base-level conformant with the X/OPEN
-       curses  specification, XSI curses (that is, it implements all BASE
-       level  features,  and  most  EXTENDED  features). It includes many
-       function calls not supported under SVr4 curses (but portability of
-       all calls is documented so you can use the SVr4 subset only).
+     * The  API  is 8-bit clean and base-level conformant with the X/Open
+       Curses  specification, XSI curses (that is, it implements all BASE
+       level  features,  and  almost  all EXTENDED features). It includes
+       many   function   calls  not  supported  under  SVr4  curses  (but
+       portability  of  all  calls  is documented so you can use the SVr4
+       subset only).
      * Unlike  SVr3 curses, ncurses can write to the rightmost-bottommost
        corner  of  the  screen  if  your terminal has an insert-character
        capability.
@@ -461,10 +510,19 @@ Features of ncurses
        user's $HOME/.terminfo directory.
      * The  table-of-entries  utility  toe makes it easy for users to see
        exactly what terminal types are available on the system.
-     * The library meets the XSI requirement that every macro entry point
-       has  a  corresponding  function  which  may be linked (and will be
-       prototype-checked)  if  the  macro  definition  is  disabled  with
-       #undef.
+     * X/Open  Curses  permits  most  functions  it  specifies to be made
+       available as macros as well. ncurses does this
+          + to  improve  performance,  e.g.,  for  operations composed of
+            simpler functions such as cursor movement following by adding
+            text to the screen,
+          + to simplify the implementation by reusing functions which use
+            common parameters, e.g., the standard screen stdscr, and
+          + to provide functions that return values via their parameters
+       Except   for   the   last   case,  ncurses  provides  a  non-macro
+       implementation  of  the  function.  If  the  macro  definition  is
+       disabled with #undef, or by defining NCURSES_NOMACROS the function
+       may  be  linked  (and  its  calls  will  be  checked  against  the
+       prototype).
      * Extensive  documentation  is  provided (see the Additional Reading
        section of the ncurses FAQ for online documentation).
 
@@ -517,7 +575,8 @@ Applications using ncurses
    nvi
           New vi uses ncurses.
 
-          https://sites.google.com/a/bostic.com/keithbostic/vi
+          https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-
+          vi-editor-home-page
 
    ranger
           A console file manager with VI key bindings in Python.
@@ -539,7 +598,7 @@ Applications using ncurses
    minicom
           terminal emulator for serial modem connections
 
-          https://alioth.debian.org/projects/minicom/
+          https://salsa.debian.org/minicom-team/minicom
 
    mosh
           a replacement for ssh.
@@ -620,12 +679,12 @@ Development activities
 
    Patches to the current release are made available at
 
-     https://invisible-island.net/archives/ncurses/6.3/ and
-     https://invisible-mirror.net/archives/ncurses/6.3/ .
+     https://invisible-island.net/archives/ncurses/6.4/ and
+     https://invisible-mirror.net/archives/ncurses/6.4/ .
 
    There is an archive of the mailing list here:
 
-     http://lists.gnu.org/archive/html/bug-ncurses (also https)
+     https://lists.gnu.org/archive/html/bug-ncurses .
 
 Related resources
 
@@ -645,11 +704,12 @@ Other resources
    terminal description file once maintained by Eric Raymond . Unlike the
    older  version, the termcap and terminfo data are provided in the same
    file, which also provides several user-definable extensions beyond the
-   X/Open specification.
+   X/Open Curses specification.
 
    You  can  find  lots  of  information  on  terminal-related topics not
-   covered  in  the  terminfo  file  at  Richard  Shuford's archive . The
-   collection of computer manuals at bitsavers.org has also been useful.
+   covered  in the terminfo file in Richard Shuford's archive (original).
+   The  collection  of  computer  manuals  at bitsavers.org has also been
+   useful.
 
      * Overview
      * Release Notes
diff --git a/INSTALL b/INSTALL
index 281107825..a2076eeec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2018-2022,2023 Thomas E. Dickey                                 --
+-- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
 -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.253 2023/11/03 20:55:47 tom Exp $
+-- $Id: INSTALL,v 1.254 2024/04/27 14:21:05 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -1451,7 +1451,7 @@ COMPATIBILITY WITH OLDER RELEASES:
     you may encounter when building a system with different versions of
     ncurses:
 
-    6.5 (TBD; not stable; in development)
+    6.5 (Apt 27, 2024)
 	Interface changes:
 
 	+ the WINDOW structure and some related internal data types declared
@@ -1461,6 +1461,25 @@ COMPATIBILITY WITH OLDER RELEASES:
 	  default; and
 	+ support for wide characters is now enabled by default.
 
+	Added extensions:
+
+	+ is_cbreak, is_echo, is_nl, and is_raw, as well as "_sp" variants
+
+	+ tiparm_s and tiscan_s
+
+	Added internal functions (other than "_sp" variants):
+
+	+ _nc_env_access
+
+	Removed internal functions:
+
+	+ none
+
+	Modified internal functions:
+
+	+ These now pass a const parameter: _nc_delink_entry, _nc_str_copy,
+	  and _nc_trans_string
+
     6.4 (Dec 31, 2022)
 	Interface changes:
 
diff --git a/NEWS b/NEWS
index 7a5ca227d..8bedbc826 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4111 2024/04/20 21:37:56 tom Exp $
+-- $Id: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240427 6.5 release for upload to ftp.gnu.org
+	+ update announcement
+	+ fixes/corrections for manpages (patches by Branden Robinson).
+	+ fix redefinition of CASTxPTR, for legacy Unix.
+
 20240420
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ compiler warning/portability fixes.
@@ -119,7 +124,7 @@ it is not possible to add this information.
 	+ use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows,
 	  hp+pfk+cr, klone+acs, klone+color, klone+sgr, ncr160wy50+pp
 	  to trim -TD
-	+ NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner)
+	+ NetBSD-related fixes for x68k and wsvt25 (patch by Thomas Klausner)
 
 20240120
 	+ improve formatting/style of manpages (patches by Branden Robinson).
diff --git a/VERSION b/VERSION
index 2afdc1a7e..8ebef8fe8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.4	20240420
+5:0:10	6.5	20240427
diff --git a/announce.html.in b/announce.html.in
index 9da511910..9889ef1bf 100644
--- a/announce.html.in
+++ b/announce.html.in
@@ -1,7 +1,7 @@
 <!--
-  $Id: announce.html.in,v 1.106 2023/12/30 21:24:48 tom Exp $
+  $Id: announce.html.in,v 1.107 2024/04/27 16:45:27 tom Exp $
   ****************************************************************************
-  * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
@@ -154,10 +154,10 @@
   Notes</a></h2>
 
   <p>These notes are for <span class="main-name">ncurses</span>
-  @VERSION@, released <strong>December 31, 2022</strong>.</p>
+  @VERSION@, released <strong>April 27, 2024</strong>.</p>
 
   <p>This release is designed to be source-compatible with
-  <span class="main-name">ncurses</span> 5.0 through 6.3; providing
+  <span class="main-name">ncurses</span> 5.0 through 6.4; providing
   extensions to the application binary interface (ABI). Although
   the source can still be configured to support the <span class=
   "main-name">ncurses</span> 5 ABI, the reason for the release is
@@ -172,13 +172,68 @@
   bug-fixes/improvements</a> dealt with robustness issues. The
   release notes also mention some other bug-fixes, but are focused
   on new features and improvements to existing features since
-  <span class="main-name">ncurses</span> 6.3 release.</p>
+  <span class="main-name">ncurses</span> 6.4 release.</p>
 
   <h3><a name="h3-library" id="h3-library">Library improvements</a></h3>
 
   <h4><a name="h4-new-library" id="h4-new-library">New features</a></h4>
 
-  <p>There are no new features in this release.</p>
+  <p>These are new features:</p>
+
+  <ul>
+    <li>
+      <p>The low-level terminfo and termcap interfaces are used
+      both by the higher-level curses library, as well as by many
+      applications.</p>
+
+      <p>The functions which convert parameterized terminal
+      capability strings for output to the terminal
+      (<code>tiparm</code> and <code>tparm</code>) analyze the
+      capability string to determine which parameters are strings
+      (i.e., addresses), versus numbers (not addresses).</p>
+
+      <p>The library's analysis of a capability string may differ
+      from the calling application's design if environment
+      variables are used to point to an invalid terminal database.
+      This is a longstanding problem with <em>all</em>
+      implementations of terminfo, dating from the early 1980s.</p>
+
+      <p>Two new functions address this problem: by providing a
+      function which allows the calling application to tell ncurses
+      how many string-parameters to expect:</p>
+
+      <ul>
+        <li><code>tiscan_s</code> helps applications check
+        formatting capabilities that would be passed to
+        <code>tiparm_s</code>.</li>
+
+        <li><code>tiparm_s</code> provides applications a way to
+        tell ncurses what the expected parameters are for a
+        capability.</li>
+      </ul>
+    </li>
+
+    <li>
+      <p>The ncurses library supports a compile-time feature
+      (enabled with the configure <code>--enable-check-size</code>
+      option) which simplifies initialization with terminals which
+      do not negotiate window (screen) size. This is done in
+      <code>setupterm</code>, by providing for using ANSI
+      cursor-position report (in user6/user7 terminfo capabilities)
+      to obtain the screen size if neither environment variables or
+      ioctl is used.</p>
+
+      <p>The ncurses test-program with options
+      &ldquo;<code>-E&nbsp;-T</code>&rdquo; demonstrates this
+      feature.</p>
+    </li>
+
+    <li>add functions to query tty-flags in
+    <code>SCREEN</code></li>
+  </ul>
+
+  <p>This release drops compatibility with obsolete versions of
+  <a href="@HOMEPAGE@/tack/">tack</a>, e.g., pre-1.08</p>
 
   <h4><a name="h4-fixes-library" id="h4-fixes-library">Other
   improvements</a></h4>
@@ -187,55 +242,108 @@
 
   <ul>
     <li>
-      <p>modify <tt>delscreen</tt> to more effectively delete all
-      windows on the given screen.</p>
+      <p>In addition to the new, safer function
+      <code>tiparm_s</code>, ncurses adds checks to make the older
+      <code>tiparm</code>, <code>tparm</code> and
+      <code>tgoto</code> functions safer:</p>
+
+      <ul>
+        <li>
+          <p>the terminfo functions <code>tiparm</code> and
+          <code>tparm</code> ensure that the capability string
+          comes from the terminal description which ncurses loads,
+          rather than from random data which the application
+          happens to have.</p>
+        </li>
+
+        <li>
+          <p>the <code>tgoto</code> function disallows capabilities
+          which its analysis shows will attempt to use string
+          parameters.</p>
+        </li>
+
+        <li>
+          <p>ncurses uses internal functions which correspond to
+          <code>tiparm</code>, and <code>tgoto</code> which ensure
+          that the capability strings which are passed to these
+          functions come from the loaded terminal description.</p>
+        </li>
+      </ul>
+    </li>
+
+    <li>
+      <p>improve check in <code>lib_tparm.c</code>, ensuring that a
+      char* fits into a <code>TPARM_ARG</code></p>
+    </li>
+
+    <li>
+      <p>modify <code>_nc_syserr_abort</code> to use
+      <code>_nc_env_access</code>, rather than only checking root
+      uid</p>
+    </li>
+
+    <li>
+      <p>improve thread lock in <code>lib_trace.c</code></p>
+    </li>
+
+    <li>
+      <p>modify <code>flushinp</code> to use file descriptors in
+      <code>SCREEN</code>, rather than from <code>TERMINAL</code>,
+      and check if they are for a terminal, like SVr4</p>
+    </li>
+
+    <li>
+      <p>modify <code>mcprint</code> to use file descriptor in
+      <code>SCREEN</code>, for consistency</p>
+    </li>
+
+    <li>
+      <p>modify internal function <code>_nc_read_file_entry</code>
+      to show relevant filename in warnings</p>
     </li>
 
     <li>
-      <p>modify <tt>wnoutrefresh</tt> to call <tt>pnoutrefresh</tt>
-      if its parameter is a pad, rather than treating it as an
-      error, and modify new_panel to permit its window-parameter to
-      be a pad</p>
+      <p>improve checks in internal function
+      <code>convert_string</code> for corrupt terminfo entry</p>
     </li>
 
     <li>
-      <p>modify curses_trace() to show the trace-mask as symbols,
-      e.g., <tt>TRACE_ORDINARY</tt>, <tt>DEBUG_LEVEL(3)</tt>.</p>
+      <p>review/improve handling of out-of-memory conditions</p>
     </li>
 
     <li>
-      <p>improve checks for valid mouse events when an intermediate
-      mouse state is not part of the mousemask specified by the
-      caller</p>
+      <p>limit delays to 30 seconds, i.e., padding delays in
+      terminfo, as well as <code>napms</code> and
+      <code>delay_output</code> functions</p>
     </li>
 
     <li>
-      <p>allow extended-color number in <em>opts</em> parameter of
-      <tt>wattr_on</tt>.</p>
+      <p>fix reallocation loop for <code>vsnprintf</code> in
+      <code>_nc_sprintf_string</code> by copying the va_list
+      variable</p>
     </li>
 
     <li>
-      <p>improve <tt>_tracecchar_t2</tt> formatting of
-      base+combining character.</p>
+      <p>modify <code>delscreen</code> to limit the windows which
+      it creates to just those associated with the screen</p>
     </li>
 
     <li>
-      <p>trim out some unwanted linker options from ncurses*config
-      and .pc files seen in Fedora 36+.</p>
+      <p>modify <code>endwin</code> to return an error if it is
+      called again without an intervening screen update</p>
     </li>
 
     <li>
-      <p>improve shell-scripts with <em>shellcheck</em></p>
+      <p>modify <code>wenclose</code> to handle pads</p>
     </li>
 
     <li>
-      <p>improve use of "trap" in shell scripts, using a
-      script.</p>
+      <p>eliminate use of <code>PATH_MAX</code> in
+      <code>lib_trace.c</code></p>
     </li>
 
     <li>
-      <p>modify <tt>make-tar.sh</tt> scripts to make timestamps
-      more predictable.</p>
+      <p>provide for any <code>CCHARW_MAX</code> greater than 1</p>
     </li>
   </ul>
 
@@ -243,19 +351,32 @@
 
   <ul>
     <li>
-      <p>modify <tt>misc/gen-pkgconfig.in</tt> to allow for the
-      case where the library directory does not yet exist, since
-      this is processed before doing an install</p>
+      <p>correct loop termination condition in
+      <code>waddnstr</code> and <code>waddnwstr</code></p>
+    </li>
+
+    <li>
+      <p>improve parsing in internal function
+      <code>_nc_msec_cost</code>, allowing a single decimal
+      point</p>
     </li>
 
     <li>
-      <p>set trailing null on string passed from <tt>winsnstr</tt>
-      to <tt>wins_nwstr</tt>.</p>
+      <p>amend parameter check for entire string versus specific
+      length in <code>winsnstr</code> and <code>wins_nwstr</code>
+      to match Solaris; make similar correction to
+      <code>wins_nwstr</code></p>
     </li>
 
     <li>
-      <p>modify <tt>waddch_literal</tt> to allow for double-width
-      base character when merging a combining character</p>
+      <p>correct internal function <code>wadd_wch_literal</code>
+      when adding a non-spacing character to a double-width
+      character</p>
+    </li>
+
+    <li>
+      <p>correct definition of <code>Charable</code> macro for
+      non-wide ncurses library .</p>
     </li>
   </ul>
 
@@ -263,7 +384,9 @@
   improvements</a></h3>
 
   <p id="h4-utilities">Several improvements were made to the
-  utility programs:</p>
+  utility programs. Some were done to make the <code>infocmp</code>
+  option &ldquo;<tt>-u</tt>&rdquo; option help refactor the
+  terminal database.</p>
 
   <dl>
     <dt><span class="part-name"><a href=
@@ -272,118 +395,131 @@
 
     <dd>
       <ul>
-        <li>rewrite <tt>canonical_name</tt> function of
-        <tt>infocmp</tt> to ensure buffer size</li>
+        <li>
+          <p>add limit checks for processing extended capabilities
+          with the &ldquo;<code>-u</code>&rdquo; option</p>
+        </li>
 
-        <li>improve readability of long parameterized expressions
-        with the infocmp &ldquo;<tt>-f</tt>&rdquo; option by
-        allowing split before a &ldquo;<tt>%p</tt>&rdquo;
-        marker.</li>
+        <li>
+          <p>correct initial alignment of extended capabilities, so
+          that the &ldquo;<code>-u</code>&rdquo; option can be used
+          for more than two terminal types</p>
+        </li>
 
-        <li>modify verbose-option of <tt>infocmp</tt>,
-        <tt>tic</tt>, <tt>toe</tt> to enable debug-tracing if that
-        is configured.</li>
+        <li>
+          <p>modify &ldquo;<code>-u</code>&rdquo; option to not
+          report cancels for strings which were already cancelled
+          in a use'd chunk.</p>
+        </li>
+
+        <li>
+          <p>correct an assignment &ldquo;<code>-u</code>&rdquo;
+          for detecting if a boolean is unset in a base entry and
+          set in a use'd chunk, i.e., if it was cancelled.</p>
+        </li>
       </ul>
     </dd>
 
     <dt><span class="part-name"><a href=
-    "@HOMEPAGE@/man/tabs.1.html">tabs</a></span>
+    "@HOMEPAGE@/man/tic.1m.html">tic</a></span>
     </dt>
 
-    <dd>limit tab-stop values to max-columns</dd>
+    <dd>
+      <ul>
+        <li>
+          <p>correct limit-check when dumping tc/use clause via
+          &ldquo;<code>-I</code>&rdquo;</p>
+        </li>
 
-    <dt><span class="part-name"><a href=
-    "@HOMEPAGE@/man/tic.1m.html">tic</a></span>
-    </dt>
+        <li>
+          <p>check return value of <code>_nc_save_str</code>, in
+          special case where extended capabilities are processed
+          but the terminal description was not initialized</p>
+        </li>
 
-    <dd>add consistency check in tic for u6/u7/u8/u9 and NQ
-    capabilities.</dd>
+        <li>
+          <p>modify check for multiply defined aliases to report
+          problems within the current runtime rather than for
+          conflicts with pre-existing terminal descriptions.</p>
+        </li>
+
+        <li>
+          <p>disallow using <code>$TERMINFO</code> or
+          <code>$HOME/.terminfo</code> when
+          &ldquo;<code>-o</code>&rdquo; option is used</p>
+        </li>
+      </ul>
+    </dd>
 
     <dt><span class="part-name"><a href=
-    "@HOMEPAGE@/man/tput.1.html">tput</a></span>
-    </dt>
+    "@HOMEPAGE@/man/tput.1.html">tput</a></span> and <span class=
+    "part-name"><a href=
+    "@HOMEPAGE@/man/tset.1.html">tset</a></span></dt>
+
+    <dd>
+      <ul>
+        <li>
+          <p>add &ldquo;<code>-v</code>&rdquo; option to tput, to
+          show warnings</p>
+        </li>
 
-    <dd>corrected use of original tty-modes in <em>init/reset</em>
-    subcommands</dd>
+        <li>
+          <p>modify <em>reset</em> command to avoid altering clocal
+          if the terminal uses a modem</p>
+        </li>
+
+        <li>
+          <p>modify <em>reset</em> feature to avoid 1-second sleep
+          if running in a pseudo-terminal</p>
+        </li>
+      </ul>
+    </dd>
   </dl>
 
   <h4><a name="h4-examples" id="h4-examples">Examples</a></h4>
 
   <p>Along with the library and utilities, improvements were made
   to the <a href=
-  "@HOMEPAGE@/ncurses-examples.html">ncurses-examples</a>. Most of
-  this activity aimed at improving the test-packages:</p>
+  "@HOMEPAGE@/ncurses-examples.html">ncurses-examples</a>:</p>
 
   <ul>
     <li>
-      <p>add minimal <tt>-h</tt> (usage) and <tt>-V</tt> (version)
-      getopt logic to all ncurses-examples programs.</p>
-    </li>
-
-    <li>
-      <p>fix an error in "@" command in <tt>test/ncurses.c</tt>
-      F-menu</p>
-    </li>
-
-    <li>
-      <p>add curses_trace to ifdef's for <tt>START_TRACE</tt> in
-      <tt>test/test.priv.h</tt></p>
-    </li>
-
-    <li>
-      <p>improve pthread-configuration for test/worm.c</p>
-    </li>
-
-    <li>
-      <p>add <tt>setlocale</tt> call to several test-programs.</p>
+      <p>modify <code>test_tparm</code> to account for extended
+      capabilities</p>
     </li>
 
     <li>
-      <p>workaround in <tt>test/picsmap.c</tt> for use of floating
-      point for rgb values by ImageMagick 6.9.11, which appears to
-      use the wrong upper limit.</p>
+      <p>corrected mouse mask in <code>test/testcurs.c</code></p>
     </li>
 
     <li>
-      <p>use static libraries for AdaCurses test-package for
-      Mageia, since no gprbuild package is available.</p>
+      <p>modify <code>test/clip_printw.c</code> to optionally test
+      non-wrapped updates</p>
     </li>
 
     <li>
-      <p>install Ada95 sample programs in libexecdir, adding a
-      wrapper script to invoke those.</p>
+      <p>modify <code>test/test_mouse.c</code> to use curses api
+      for raw/noraw</p>
     </li>
 
     <li>
-      <p>install ncurses-examples programs in libexecdir, adding a
-      wrapper script to invoke those.</p>
+      <p>modify <code>test/clip_printw.c</code> to optionally test
+      non-wrapped updates</p>
     </li>
   </ul>
 
-  <p>There are other new demo/test programs and reusable
-  examples:</p>
+  <p>There is one new demo/test programs:</p>
 
   <dl>
-    <dt><span class="part-name"><em>test/combine</em></span>
+    <dt><span class="part-name"><em>test/test_endwin.c</em></span>
     </dt>
 
-    <dd>demonstrate combining characters</dd>
-
-    <dt><span class="part-name"><em>test/test_delwin</em></span>
-    </dt>
-
-    <dd>demonstrate deleting a window</dd>
-
-    <dt><span class="part-name"><em>test/test_mouse</em></span>
-    </dt>
-
-    <dd>observe mouse events in the raw terminal or parsed ncurses
-    modes</dd>
-
-    <dt><span class="part-name"><em>test/test_unget_wch</em></span>
-    </dt>
-
-    <dd>demonstrate the unget_wch and unget functions</dd>
+    <dd>
+      <p>This program shows the return-status from
+      <code>endwin</code> with different combinations of
+      <code>endwin</code> (repeated), <code>initscr</code>,
+      <code>newterm</code>.</p>
+    </dd>
   </dl>
 
   <h3><a name="h3-database" id="h3-database">Terminal database</a></h3>
@@ -391,190 +527,159 @@
   <p>There are several new terminal descriptions:</p>
 
   <ul>
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-mosh">mosh</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-ansi_apparrows"><tt>ansi+apparrows</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-mosh-256color">mosh-256color</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-contour"><tt>contour</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-teken-16color">teken-16color</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-linux_kbs"><tt>linux+kbs</tt></a>
+      for terminals which imitate xterm's behavior with Linux</p>
     </li>
 
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-teken-sc">teken-sc</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-rio"><tt>rio</tt></a>,
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-rio-direct"><tt>rio-direct</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-teken-vt">teken-vt</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-mostlike"><tt>mostlike</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-xgterm">xgterm</a></tt>
+    <li>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-ms-vt100-16color"><tt>ms-vt100-16color</tt></a>,
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-winconsole"><tt>winconsole</tt></a></p>
     </li>
-  </ul>
 
-  <p>There are many changes to existing terminal descriptions. Some
-  were updates to several descriptions:</p>
-
-  <ul>
     <li>
-      <p>make description-fields distinct</p>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-vt100_noapp"><tt>vt100+noapp</tt></a>,
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-vt100_noapp_pc"><tt>vt100+noapp+pc</tt></a>,
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xterm_app_pc"><tt>xterm+app+pc</tt></a>,
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xterm_decedit"><tt>xterm+decedit</tt></a>
+      from <a href="@WEBSITE@/xterm/xterm.log.html#xterm_389">xterm
+      #389</a></p>
     </li>
 
     <li>
-      <p>fix errata in description fields</p>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-putty_cursor"><tt>putty+cursor</tt></a>
+      to reflect amending of modified cursor-keys in 2021</p>
     </li>
 
     <li>
-      <p>add/use several building-blocks:</p>
-
-      <ul>
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-aixterm_sl"><tt>aixterm+sl</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-ansi_cpr"><tt>ansi+cpr</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-apollo_vt132"><tt>apollo+vt132</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-decid_cpr"><tt>decid+cpr</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-ncr260vp_sl"><tt>ncr260vp+sl</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-wyse_sl"><tt>wyse+sl</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-x10term_sl"><tt>x10term+sl</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-xterm_acs"><tt>xterm+acs</tt></a></li>
-
-        <li><a href=
-        "@HOMEPAGE@/terminfo.src.html#tic-xterm_alt47"><tt>xterm+alt47</tt></a></li>
-      </ul>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-wezterm"><tt>wezterm</tt></a></p>
     </li>
   </ul>
 
-  <p>while others affected specific descriptions. These were
-  retested, to take into account changes by their developers:</p>
+  <p>There are many changes to existing terminal descriptions. Some
+  were updates to several descriptions, using the
+  <code>infocmp</code> &ldquo;<code>-u</code>&rdquo; option in a
+  script to determine which <em>building-block</em> entries could
+  be used to replace multiple capability settings (and trim
+  redundant information).</p>
+
+  <p>Other changes include:</p>
 
   <ul>
     <li>
-      <p><tt><a href=
-      "@HOMEPAGE@/terminfo.src.html#tic-kitty">kitty</a></tt>
-      </p>
+      <p><a href=
+      "@HOMEPAGE@/terminfo.src.html#toc-_X_T_E_R_M__Extensions_">document</a>
+      XF, kxIN and kxOUT</p>
     </li>
 
     <li>
-      <p><tt><a href=
-      "@HOMEPAGE@/terminfo.src.html#tic-teken">teken</a></tt>
-      </p>
+      <p>add note on <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-sun"><tt>sun</tt></a>
+      regarding wscons/cmdtool/shelltool</p>
     </li>
-  </ul>
 
-  <p>while these are specific fixes based on reviewing
-  documentation, user reports, or warnings from <span class=
-  "part-name">tic</span>:</p>
-
-  <dl>
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-att610_cvis0">att610+cvis0</a>
-    </dt>
-
-    <dd>amended note as per documentation for att610, att620,
-    att730</dd>
-
-    <dt><a href="@HOMEPAGE@/terminfo.src.html#tic-kon">kon</a>,
-    kon2, jfbterm</dt>
-
-    <dd>revise to undo "linux2.6" change to smacs/rmacs/enacs</dd>
-
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-st-0_6">st-0.6</a>
-    </dt>
-
-    <dd>add dim, ecma+strikeout</dd>
-
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-foot_base">foot+base</a>
-    </dt>
-
-    <dd>add xterm+sl-alt</dd>
-
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-dec_sl">dec+sl</a>
-    </dt>
-
-    <dd>correct dsl in dec+sl</dd>
-
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-mintty">mintty</a> and
-    tmux</dt>
-
-    <dd>correct setal in mintty/tmux entries, add to vte-2018</dd>
-
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-nsterm">nsterm</a>
-    </dt>
+    <li>
+      <p>remove DECCOLM+DECSCLM from <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-foot"><tt>foot</tt></a></p>
+    </li>
 
-    <dd>modify nsterm to use xterm+alt1049</dd>
+    <li>
+      <p>add xterm+focus to <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-foot_base"><tt>foot+base</tt></a></p>
+    </li>
 
-    <dt><a href="@HOMEPAGE@/terminfo.src.html#tic-putty">putty</a>
-    </dt>
+    <li>
+      <p>add ecma+strikeout to <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-putty"><tt>putty</tt></a></p>
+    </li>
 
-    <dd>modify putty to use xterm+alt1049</dd>
+    <li>
+      <p>use CSI 3J in <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-vte-2017"><tt>vte-2017</tt></a></p>
+    </li>
 
-    <dt><a href=
-    "@HOMEPAGE@/terminfo.src.html#tic-vte-2018">vte-2018</a>
-    </dt>
+    <li>
+      <p>use oldxterm+sm+1006 in <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-vte-2014"><tt>vte-2014</tt></a></p>
+    </li>
 
-    <dd>add blink and setal</dd>
-  </dl>
+    <li>
+      <p>modify <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xgterm"><tt>xgterm</tt></a>
+      to work around line-drawing bug</p>
+    </li>
 
-  <p>A few entries use extensions (user-defined terminal
-  capabilities):</p>
+    <li>
+      <p>add xterm focus mode 1004 to <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xterm_focus"><tt>xterm+focus</tt></a>
+      as fe/fd capabilities, like vim.</p>
+    </li>
 
-  <ul>
     <li>
-      <p>use <tt>ansi+enq</tt> and <tt>decid+cpr</tt> in cases
-      where the terminal probably supported the u6-u9 extension</p>
+      <p>add xterm+focus to <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-alacritty_common"><tt>alacritty+common</tt></a></p>
     </li>
 
     <li>
-      <p>remove u6-u9 from teken-2018</p>
+      <p>add XR/xr, to work with vim, and use RV/rv to denote DA2
+      and its response</p>
     </li>
 
     <li>
-      <p>use <tt>NQ</tt> to flag entries where the terminal does
-      not support query and response</p>
+      <p>add XF flag to <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xterm_focus"><tt>xterm+focus</tt></a>
+      so that termcap applications can be aware of terminals which
+      may support focus in/out</p>
     </li>
 
     <li>
-      <p>add/use <a href=
-      "@HOMEPAGE@/terminfo.src.html#tic-bracketed_paste"><tt>bracketed+paste</tt></a>
-      to help identify terminals supporting this xterm feature</p>
+      <p>use xterm+focus in <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-xterm-p370"><tt>xterm-p370</tt></a>
+      and <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-tmux"><tt>tmux</tt></a></p>
     </li>
 
     <li>
-      <p>modify samples for xterm mouse 1002/1003 modes to use 1006
-      mode, and also provide for focus in/out responses</p>
+      <p>remove xterm+sm+1006 from <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-tmux"><tt>tmux</tt></a></p>
     </li>
 
     <li>
-      <p>xterm patch #371 supports DEC-compatible status-line. add
-      <tt>dec+sl</tt> to xterm-new, per xterm #371, add <a href=
-      "@HOMEPAGE@/terminfo.src.html#tic-xterm-p371"><tt>xterm-p371</tt></a>,
-      add <a href=
-      "@HOMEPAGE@/terminfo.src.html#tic-xterm-p370"><tt>xterm-p370</tt></a>,
-      for use in older terminals, and set &ldquo;xterm-new&rdquo;
-      to &ldquo;xterm-p370&rdquo; (to ease adoption).</p>
+      <p>NetBSD-related fixes for <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-x68k"><tt>x68k</tt></a> and
+      <a href=
+      "@HOMEPAGE@/terminfo.src.html#tic-wsvt25"><tt>wsvt25</tt></a></p>
     </li>
   </ul>
 
@@ -610,103 +715,88 @@
 
       <ul>
         <li>
-          <p>remove a stray '/' from description of <tt>%g</tt> in
-          <a href=
-          "@HOMEPAGE@/man/terminfo.5.html#h3-Parameterized-Strings">
-          terminfo(5)</a>.</p>
+          <p>add assignment in <code>CF_MAN_PAGES</code> to fill in
+          value for <code>TERMINFO_DIRS</code> in ncurses, terminfo
+          and tic manpages.</p>
         </li>
 
         <li>
-          <p>correct/improve font-formatting in <a href=
-          "@HOMEPAGE@/man/curs_getch.3x.html">curs_getch.3x</a>, as
-          well as other manual pages.</p>
+          <p>clarify interaction of <code>-R</code> option versus
+          <code>-C</code>, <code>-I</code> and <code>-r</code> in
+          <code>infocmp</code> manpage.</p>
         </li>
-      </ul>
-    </li>
-
-    <li>
-      <p>New/improved history and portability sections:</p>
 
-      <ul>
         <li>
-          <p>add portability notes for <a href=
-          "@HOMEPAGE@/man/curs_initscr.3x.html#h2-PORTABILITY">delscreen</a>
-          and <a href=
-          "@HOMEPAGE@/man/curs_window.3x.html#h2-PORTABILITY">delwin</a>
-          in manual.</p>
+          <p>correct manpage description of panel_hidden.</p>
         </li>
 
         <li>
-          <p>improve <a href=
-          "@HOMEPAGE@/man/curs_slk.3x.html#h2-EXTENSIONS">curs_slk.3x</a>
-          discussion of extensions and portability</p>
+          <p>improve manpage description for addch versus unctrl
+          format used for non-printable characters.</p>
         </li>
-      </ul>
-    </li>
 
-    <li>
-      <p>Other improvements:</p>
-
-      <ul>
         <li>
-          <p>improve <a href=
-          "@HOMEPAGE@/man/curs_bkgd.3x.html">curs_bkgd.3x</a>,
-          explaining that <tt>bkgdset</tt> can affect results for
-          <tt>bkgd</tt></p>
+          <p>improve manpages discussing file descriptors in
+          low-level functions.</p>
         </li>
 
         <li>
-          <p>add note on portable memory-leak checking in <a href=
-          "@HOMEPAGE@/man/curs_memleaks.3x.html#h2-PORTABILITY">curs_memleaks.3x</a></p>
+          <p>improve description of search rules for terminal
+          descriptions in terminfo manpage.</p>
         </li>
 
         <li>
-          <p>expanded description in <a href=
-          "@HOMEPAGE@/man/resizeterm.3x.html">resizeterm.3x</a></p>
+          <p>modify dist.mk to avoid passing developer's comments
+          in manpages into the generated html documentation.</p>
         </li>
 
         <li>
-          <p>add section on releasing memory to <a href=
-          "@HOMEPAGE@/man/curs_termcap.3x.html#h3-Releasing-Memory">
-          curs_termcap.3x</a> and <a href=
-          "@HOMEPAGE@/man/curs_terminfo.3x.html#h3-Releasing-Memory">
-          curs_terminfo.3x</a> manpages.</p>
+          <p>modify test-package "ncurses6-doc" to use
+          manpage-aliases, which in turn required a change to the
+          configure script to factor in the extra-suffix option
+          when deriving alias names.</p>
         </li>
+      </ul>
+    </li>
 
+    <li>
+      <p>New/improved history and portability sections:</p>
+
+      <ul>
         <li>
-          <p>add clarification of the scope of dynamic variables in
-          <a href=
-          "@HOMEPAGE@/man/terminfo.5.html">terminfo(5)</a>.</p>
+          <p>add information about "ttycap", termcap's forerunner,
+          to tset.1</p>
         </li>
 
         <li>
-          <p>improve formatting of <a href=
-          "@HOMEPAGE@/ncurses-intro.html">ncurses-intro.html</a>
-          and <a href=
-          "@HOMEPAGE@/hackguide.html">hackguide.html</a></p>
+          <p>document limitations of tparm, and error-returns in
+          curs_terminfo.3x</p>
         </li>
 
         <li>
-          <p>improve <a href=
-          "@HOMEPAGE@/man/curs_clear.3x.html">curs_clear.3x</a>
-          links to other pages</p>
+          <p>document limitations of tgoto, and error-returns in
+          curs_termcap.3x</p>
         </li>
+      </ul>
+    </li>
+
+    <li>
+      <p>Other improvements:</p>
 
+      <ul>
         <li>
-          <p>update <a href=
-          "@HOMEPAGE@/howto/NCURSES-Programming-HOWTO.html">ncurses-howto</a>,
-          making documentation fixes along with corrections to
-          example programs.</p>
+          <p>This release has many changes to improve the
+          formatting and style of the manpages.</p>
         </li>
 
         <li>
-          <p>use newer version 1.36 of gnathtml for generating Ada
-          html files.</p>
+          <p>Manpages now use consistent section-naming, page
+          headers and footers (including the modification date for
+          each page).</p>
         </li>
 
         <li>
-          <p>update external links in <a href=
-          "@HOMEPAGE@/Ada95.html">Ada95.html</a></p>
+          <p>Table layout has been revised.</p>
         </li>
       </ul>
     </li>
@@ -718,93 +808,162 @@
   <h3><a name="h3-bug-fixes" id="h3-bug-fixes">Interesting
   bug-fixes</a></h3>
 
-  <p>While there were many bugs fixed during development of ncurses
-  6.4, only a few (the reason for this release) were both important
-  and interesting. Most of the bug-fixes were for local issues
-  which did not affect compatibility across releases. Since those
-  are detailed in the <a href=
-  "@HOMEPAGE@/NEWS.html#t20221231">NEWS</a> file no elaboration is
-  needed here.</p>
+  <p>The changes to <tt>tparm</tt>, <tt>tgoto</tt> which improve
+  the design of the low-level interfaces are <em>interesting</em>,
+  but are not bug-fixes <em>per se</em>.</p>
+
+  <h3><a name="h3-config-config" id=
+  "h3-config-config">Configuration changes</a></h3>
+
+  <h4><a name="h4-config-major" id="h4-config-major">Major
+  changes</a></h4>
 
-  <p>The interesting bugs were those dealing with memory leaks and
-  buffer overflows. Although the utilities are designed for
-  <em>text</em> files (which they do properly), some choose to test
-  them with <strong>non-</strong><em>text</em> files.</p>
+  <p>These are the major changes (aside from introducing <a href=
+  "#h4-new-library"><tt>tiparm_s</tt></a>):</p>
 
   <ul>
     <li>
-      <p>Text files contain no embedded nulls. Also, they end with
-      a newline. Feeding <strong>tic</strong> non-text files
-      exposed a few cases where the program did not check for those
-      issues. As a result, further processing of the input found
-      limit-checks whose assumptions were invalid.</p>
+      <p>use wide-character (ncursesw) by default</p>
     </li>
 
     <li>
-      <p>Fixing the limit-checks (first) found a problem with
-      <strong>tic</strong> managing the list of strings in a
-      terminal description. In merging two terminal descriptions
-      (i.e., the &ldquo;use=&rdquo; feature), <strong>tic</strong>
-      was not allocating a complete copy. A quick repair for that
-      introduced a memory leak.</p>
+      <p>use opaque typedefs by default</p>
     </li>
+  </ul>
 
+  <p>However, most of the work on configure scripts was done to
+  reduce warnings within the configure script:</p>
+
+  <ul>
     <li>
-      <p>The checks for non-text files are improved (i.e., embedded
-      nulls in the input file will cause <strong>tic</strong> to
-      reject it rather than attempting to process it).</p>
+      <p>intrusive warnings from GNU grep regarding fgrep and
+      egrep</p>
     </li>
 
     <li>
-      <p>The string allocations in <strong>tic</strong> are
-      likewise improved.</p>
+      <p>fatal errors in compile-checks, arising from recent
+      &ldquo;Modern&nbsp;C&rdquo; efforts by some developers which
+      caused longstanding configure checks to fail.</p>
+
+      <p>After repairing the configure script, none of that
+      activity affected ncurses because stricter warnings are used
+      routinely in development.</p>
     </li>
   </ul>
 
-  <h3><a name="h3-config-config" id=
-  "h3-config-config">Configuration changes</a></h3>
+  <p>Other improvements made to configure checks include</p>
 
-  <h4><a name="h4-config-major" id="h4-config-major">Major
-  changes</a></h4>
+  <ul>
+    <li>
+      <p>use <a href=
+      "@HOMEPAGE@/INSTALL.html#option:enable-string-hacks">string-hacks</a>
+      in alloc_entry.c, alloc_type.c and hardscroll.c, overlooked
+      due to compiler changes in recent OpenBSD releases</p>
+    </li>
+
+    <li>
+      <p>revise progs.priv.h to provide for NC_ISATTY reuse</p>
+    </li>
+
+    <li>
+      <p>configure check for MB_LEN_MAX provides warning as
+      needed</p>
+    </li>
+
+    <li>
+      <p>trim a space after some "-R" options, fixing builds for
+      applications built using clang and ncurses on Solaris</p>
+    </li>
 
-  <p>There are no major changes. No new options were added. Several
-  improvements were made to configure checks.</p>
+    <li>
+      <p>work around misconfiguration of MacPorts gcc13, which
+      exposes invalid definition of <tt>MB_LEN_MAX</tt> in gcc's
+      fallback copy of <tt>limits.h</tt></p>
+    </li>
+
+    <li>
+      <p>modified experimental Windows driver works with xterm
+      mouse protocol</p>
+    </li>
+  </ul>
 
   <h4><a name="h4-config-options" id=
   "h4-config-options">Configuration options</a></h4>
 
-  <p>There are a few new/modified configure options:</p>
+  <p>There are a few new configure options:</p>
 
   <dl>
-    <dt><tt>--with-abi-version</tt>
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:disable-setuid-environ"><tt>--disable-setuid-environ</tt></a>
     </dt>
 
     <dd>
-      <p>add ABI 7 defaults to configure script.</p>
+      <p>Compile with environment restriction, so certain
+      environment variables are not available when running via a
+      setuid/setgid application. These are (for example
+      <tt>$TERMINFO</tt>) those that allow the search path for the
+      terminfo or termcap entry to be customized.</p>
+
+      <p>A setuid/setgid application inherits its environment
+      variables from the current user, in contrast to sudo which
+      may limit the environment variables that ncurses uses.</p>
     </dd>
 
-    <dt><tt>--with-caps</tt>
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:enable-check-size"><tt>--enable-check-size</tt></a>
     </dt>
 
     <dd>
-      <p>add warning in configure script if file specified for
-      &ldquo;<tt>--with-caps</tt>&rdquo; does not exist.</p>
+      <p>Compile-in feature to detect screensize for terminals
+      which do not advertise their screensize, e.g., serial
+      terminals.</p>
     </dd>
 
-    <dt><tt>--with-manpage-format</tt>
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:with-abi-altered"><tt>--with-abi-altered=<em>NUM</em></tt></a>
     </dt>
 
     <dd>
-      <p>bzip2 and xz compression are now supported</p>
+      <p>Override the displayed (rather than compiled-in) ABI. Only
+      packagers who have created configurations where the ABI
+      differs from ncurses should be interested in this option.</p>
     </dd>
 
-    <dt><tt>--with-xterm-kbs</tt>
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:with-strip-program"><tt>--with-strip-program=<em>XXX</em></tt></a>
     </dt>
 
     <dd>
-      <p>add check/warning in configure script if option
-      &ldquo;<tt>--with-xterm-kbs</tt>&rdquo; is missing or
-      inconsistent</p>
+      <p>When stripping executables during install, use the
+      specified program rather than &ldquo;strip&rdquo; overriding
+      program chosen by the install program for stripping
+      executables.</p>
+    </dd>
+  </dl>
+
+  <p>These configure options are modified:</p>
+
+  <dl>
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:with-pkg-config-libdir"><tt>--with-pkg-config-libdir[=<em>DIR</em>]</tt></a>
+    </dt>
+
+    <dd>
+      <p>The optional <em>DIR</em> parameter can now be
+      &ldquo;auto&rdquo; to automatically use pkg-config's library
+      directory.</p>
+
+      <p>The default is <tt>$(libdir)</tt>.</p>
+    </dd>
+
+    <dt><a href=
+    "@HOMEPAGE@/INSTALL.html#option:with-xterm-kbs"><tt>--with-xterm-kbs[=<em>XXX</em>]</tt></a>
+    </dt>
+
+    <dd>
+      <p>The default is &ldquo;auto&rdquo; which tells the
+      configure script to choose BS or DEL according to platform
+      defaults.</p>
     </dd>
   </dl>
 
@@ -815,100 +974,117 @@
 
   <ul>
     <li>
-      <p>amend configure option's auto-search to account for
-      systems where none of the directories known to
-      <em>pkg-config</em> exist</p>
+      <p>add/use configure check for <code>clock_gettime</code>, to
+      supersede <code>gettimeofday</code>.</p>
     </li>
 
     <li>
-      <p>corrected regex needed for older <em>pkg-config</em> used
-      in Solaris 10</p>
+      <p>modify configure script check for pkg-config library
+      directory to take into account an older version 0.15.0 which
+      used PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR</p>
     </li>
 
     <li>
-      <p>improve handling of <tt>--with-pkg-config-libdir</tt>
-      option, allowing for the case where either
-      <tt>$PKG_CONFIG_LIBDIR</tt> or the option value has a
-      colon-separated list of directories</p>
+      <p>allow for MinGW32-/64-bit configurations to use
+      _DEFAULT_SOURCE</p>
     </li>
 
     <li>
-      <p>if the <tt>--with-pkg-config-libdir</tt> option is not
-      given, use <tt>${libdir}/pkgconfig</tt> as a default</p>
+      <p>modify CF_XOPEN_SOURCE macro's amend default case to avoid
+      undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined</p>
     </li>
 
     <li>
-      <p>improve search-path check for <em>pkg-config</em>, e.g.,
-      for Debian testing which installs <em>pkg-config</em> with
-      architecture-prefixes.</p>
+      <p>updated configure script macro CF_XOPEN_SOURCE, for
+      uClibc-ng</p>
     </li>
 
     <li>
-      <p>build-fix for cross-compiling to MingW, conditionally add
-      <tt>-lssp</tt></p>
+      <p>modify version-check for gcc/g++, now works for msys2</p>
     </li>
 
     <li>
-      <p>improve configure check for <tt>getttynam</tt></p>
+      <p>build-fixes related to configure-options and/or
+      platform:</p>
+
+      <ul>
+        <li>fix for <tt>--enable-fvisibility</tt></li>
+
+        <li>fix for unusual values of
+        <tt>--with-rel-version</tt></li>
+
+        <li>fix for unusual values of
+        <tt>--with-abi-version</tt></li>
+
+        <li>fix for <tt>--disable-tcap-names</tt></li>
+
+        <li>fix for termcap in <tt>nc_access.h</tt></li>
+      </ul>
     </li>
 
     <li>
-      <p>fixes to build with <em>dietlibc</em>:</p>
+      <p>other configure-script improvements:</p>
 
       <ul>
-        <li>add configure check for <tt>fpathconf</tt></li>
+        <li>recent msys2 headers work with
+        <tt>_DEFAULT_SOURCE</tt>; amend check</li>
 
-        <li>add configure check for math sine/cosine, needed in
-        test/tclock, and eliminate <tt>pow()</tt> from
-        test/hanoi</li>
+        <li>use <tt>$ac_includes_default</tt> in most cases where
+        stdlib.h should work</li>
 
-        <li>use <tt>wcsnlen</tt> as an alternative to
-        <tt>wmemchr</tt> if it is not found</li>
+        <li>use <tt>#error</tt> consistently vs "make an
+        error"</li>
+
+        <li>add configure macro for <tt>gettimeofday</tt> vs inline
+        check</li>
       </ul>
     </li>
+  </ul>
 
+  <p>Here are some of the other portability fixes:</p>
+
+  <ul>
     <li>
-      <p>modify configure macro <tt>CF_BUILD_CC</tt> to check if
-      the build-compiler works, rather than that it is different
-      from the cross-compiler, e.g., to accommodate a compiler
-      which can be used for either purpose with different flags</p>
+      <p>modify configure scripts/makefiles to omit
+      <tt>KEY_RESIZE</tt> if the corresponding <tt>SIGWINCH</tt>
+      feature is disabled</p>
     </li>
 
     <li>
-      <p>modify configure/scripts to work around interference by
-      GNU grep 3.8</p>
+      <p>increase <tt>MB_CUR_MAX</tt> to 16, matching glibc's
+      <tt>MB_LEN_MAX</tt></p>
     </li>
-  </ul>
 
-  <p>Here are some of the other portability fixes:</p>
+    <li>
+      <p>add BSD <tt>erase2</tt> to characters handled by
+      tset/reset</p>
+    </li>
 
-  <ul>
     <li>
-      <p>change <tt>man_db.renames</tt> to template, to handle
-      <em>ncurses*-config</em> script with the
-      <tt>--extra-suffix</tt> configure option.</p>
+      <p>use <tt>getauxval</tt> when available, to improve
+      <tt>setuid</tt>/<tt>setgid</tt> checks</p>
     </li>
 
     <li>
-      <p>update <tt>CF_XOPEN_SOURCE</tt> macro, adding variants
-      &ldquo;gnueabi" and &ldquo;gnueabihf" to get
-      <tt>_DEFAULT_SOURCE</tt> special case, as well as adding GNU
-      libc suffixes for &ldquo;abi64&rdquo;, &ldquo;abin32&rdquo;,
-      &ldquo;x32&rdquo; to distinguish it from other libc
-      flavors.</p>
+      <p>set <tt>dwShareMode</tt> in calls to
+      <tt>CreateConsoleScreenBuffer</tt></p>
     </li>
 
     <li>
-      <p>work around <em>musl</em>'s nonstandard use of feature
-      test macros by adding a definition for
-      <tt>NCURSES_WIDECHAR</tt> to the generated &ldquo;.pc&rdquo;
-      and <em><tt>*-config</tt></em> files.</p>
+      <p>use <tt>CreateFile</tt> with "<tt>CONIN$</tt>",
+      "<tt>CONOUT$</tt>" rather than <tt>GetStdHandle</tt> to
+      obtain a handle on the actual console, avoiding redirection
+      in the MinGW/Win32 configurations</p>
     </li>
 
     <li>
-      <p>use &ldquo;<tt>command -v</tt>&rdquo; rather than
-      &ldquo;<tt>type</tt>&rdquo; in <tt>Ada95/gen/Makefile.in</tt>
-      to fix a portability issue.</p>
+      <p>modify MinGW driver to return <tt>KEY_BACKSPACE</tt> when
+      an unmodified <tt>VK_BACK</tt> virtual key is entered</p>
+    </li>
+
+    <li>
+      <p>modify MinGW configuration to provide for running in
+      MSYS/MSYS2 shells, assuming ConPTY support</p>
     </li>
   </ul>
 
@@ -927,16 +1103,16 @@
     </li>
 
     <li>
-      <p><span class="main-name">ncurses</span> supports the features of
-      SVr4 curses including keyboard mapping, color, form drawing with
-      ACS characters, and automatic recognition of keypad and function
-      keys.</p>
+      <p><span class="main-name">ncurses</span> supports the
+      features of SVr4 curses including keyboard mapping, color,
+      form drawing with ACS characters, and automatic recognition
+      of keypad and function keys.</p>
     </li>
 
     <li>
       <p><span class="main-name">ncurses</span> provides work-alike
-      replacements of SVr4 supplemental libraries based on curses, but
-      which were not specified by X/Open Curses:</p>
+      replacements of SVr4 supplemental libraries based on curses,
+      but which were not specified by X/Open Curses:</p>
 
       <ul>
         <li>
@@ -995,8 +1171,8 @@
   <ul>
     <li>
       <p>The API is 8-bit clean and base-level conformant with the
-      X/OPEN curses specification, XSI curses (that is, it
-      implements all <em>BASE</em> level features, and most
+      X/Open Curses specification, XSI curses (that is, it
+      implements all <em>BASE</em> level features, and almost all
       <em>EXTENDED</em> features). It includes many function calls
       not supported under SVr4 curses (but portability of all calls
       is documented so you can use the SVr4 subset only).</p>
@@ -1136,11 +1312,27 @@
     </li>
 
     <li>
-      <p>The library meets the X/Open Curses requirement that every
-      function declared in a header file has a macro equivalent.
-      If the macro definition is disabled with <code>#undef</code>,
-      the function may be linked (and its calls will be checked
-      against the prototype).</p>
+      <p>X/Open Curses permits most functions it specifies to be
+      made available as macros as well. ncurses does this</p>
+
+      <ul>
+        <li>to improve performance, e.g., for operations composed
+        of simpler functions such as cursor movement following by
+        adding text to the screen,</li>
+
+        <li>to simplify the implementation by reusing functions
+        which use common parameters, e.g., the standard screen
+        <code>stdscr</code>, and</li>
+
+        <li>to provide functions that return values via their
+        parameters</li>
+      </ul>
+
+      <p>Except for the last case, ncurses provides a non-macro
+      implementation of the function. If the macro definition is
+      disabled with <code>#undef</code>, or by defining
+      <code>NCURSES_NOMACROS</code> the function may be linked (and
+      its calls will be checked against the prototype).</p>
     </li>
 
     <li>
@@ -1242,7 +1434,8 @@
         <p>New vi uses ncurses.</p>
 
         <p><a href=
-        "https://sites.google.com/a/bostic.com/keithbostic/vi">https://sites.google.com/a/bostic.com/keithbostic/vi</a><br>
+        "https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page">
+        https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page</a><br>
 
         </p>
       </dd>
@@ -1290,7 +1483,7 @@
         <p>terminal emulator for serial modem connections</p>
 
         <p><a href=
-        "https://alioth.debian.org/projects/minicom/">https://alioth.debian.org/projects/minicom/</a></p>
+        "https://salsa.debian.org/minicom-team/minicom">https://salsa.debian.org/minicom-team/minicom</a></p>
       </dd>
 
       <dt><span class="part-name">mosh</span>
@@ -1434,19 +1627,17 @@
 
   <blockquote>
     <p><a href=
-    "https://invisible-island.net/archives/ncurses/6.3/">https://invisible-island.net/archives/ncurses/6.3/</a>
+    "https://invisible-island.net/archives/ncurses/6.4/">https://invisible-island.net/archives/ncurses/6.4/</a>
     and<br>
     <a href=
-    "https://invisible-mirror.net/archives/ncurses/6.3/">https://invisible-mirror.net/archives/ncurses/6.3/</a>&nbsp;.</p>
+    "https://invisible-mirror.net/archives/ncurses/6.4/">https://invisible-mirror.net/archives/ncurses/6.4/</a>&nbsp;.</p>
   </blockquote>
 
   <p>There is an archive of the mailing list here:</p>
 
   <blockquote>
     <p><a href=
-    "http://lists.gnu.org/archive/html/bug-ncurses">http://lists.gnu.org/archive/html/bug-ncurses</a>
-    (also <a href=
-    "https://lists.gnu.org/archive/html/bug-ncurses">https</a>)</p>
+    "https://lists.gnu.org/archive/html/bug-ncurses">https://lists.gnu.org/archive/html/bug-ncurses</a>&nbsp;.</p>
   </blockquote>
 
   <h2><a name="h2-this-stuff" id="h2-this-stuff">Related
@@ -1488,14 +1679,15 @@
   <a href="http://www.catb.org/~esr/terminfo/">Eric
   Raymond</a>&nbsp;. Unlike the older version, the termcap and
   terminfo data are provided in the same file, which also provides
-  several user-definable extensions beyond the X/Open
+  several user-definable extensions beyond the X/Open Curses
   specification.</p>
 
   <p>You can find lots of information on terminal-related topics
-  not covered in the terminfo file at <a href=
-  "http://web.archive.org/web/*/http://www.cs.utk.edu/~shuford/terminal">
-  Richard Shuford's archive</a>&nbsp;. The collection of computer
-  manuals at <a href=
+  not covered in the terminfo file in <a href=
+  "https://shuford.invisible-island.net/">Richard Shuford's
+  archive</a> (<a href=
+  "http://web.archive.org/web/*/http://www.cs.utk.edu/~shuford/terminal">original</a>).
+  The collection of computer manuals at <a href=
   "http://www.bitsavers.org/pdf/">bitsavers.org</a> has also been
   useful.</p>
 
diff --git a/dist.mk b/dist.mk
index d7360f7cb..18484d8ca 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1608 2024/04/20 10:17:21 tom Exp $
+# $Id: dist.mk,v 1.1610 2024/04/27 13:55:54 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,8 +37,8 @@ SHELL = /bin/sh
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
-NCURSES_MINOR = 4
-NCURSES_PATCH = 20240420
+NCURSES_MINOR = 5
+NCURSES_PATCH = 20240427
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/ada/terminal_interface-curses_constants__ads.htm b/doc/html/ada/terminal_interface-curses_constants__ads.htm
index eef12f454..5a10ea48f 100644
--- a/doc/html/ada/terminal_interface-curses_constants__ads.htm
+++ b/doc/html/ada/terminal_interface-curses_constants__ads.htm
@@ -36,8 +36,8 @@
    <span class="comment"><em>--  Version of the ncurses library from extensions(3NCURSES)</em></span>
 
    <span class="symbol"><a name="ref_21_4">NCURSES_VERSION_MAJOR</a></span>        : <b>constant</b> := 6;
-   <span class="symbol"><a name="ref_22_4">NCURSES_VERSION_MINOR</a></span>        : <b>constant</b> := 4;
-   <span class="symbol"><a name="ref_23_4">Version</a></span> : <b>constant</b> String := "6.4";
+   <span class="symbol"><a name="ref_22_4">NCURSES_VERSION_MINOR</a></span>        : <b>constant</b> := 5;
+   <span class="symbol"><a name="ref_23_4">Version</a></span> : <b>constant</b> String := "6.5";
 
    <span class="comment"><em>--  Character non-color attributes from attr(3NCURSES)</em></span>
 
diff --git a/doc/html/announce.html b/doc/html/announce.html
index 514331670..2aa03cfab 100644
--- a/doc/html/announce.html
+++ b/doc/html/announce.html
@@ -1,7 +1,7 @@
 <!--
-  $Id: announce.html,v 1.68 2022/12/31 20:38:46 tom Exp $
+  $Id: announce.html,v 1.70 2024/04/27 18:38:45 tom Exp $
   ****************************************************************************
-  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   *                                                                          *
   * 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 @@
 <head>
   <meta name="generator" content=
   "HTML Tidy for HTML5 for Linux version 5.6.0">
-  <title>Announcing ncurses 6.4</title>
+  <title>Announcing ncurses 6.5</title>
   <link rel="author" href="mailto:bug-ncurses@gnu.org">
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii">
@@ -56,7 +56,7 @@
   </style>
 </head>
 <body>
-  <h1 class="no-header">Announcing ncurses 6.4</h1>
+  <h1 class="no-header">Announcing ncurses 6.5</h1>
 
   <h2><a name="h2-overview" id="h2-overview">Overview</a></h2>
 
@@ -154,10 +154,10 @@ <h2><a name="h2-release-notes" id="h2-release-notes">Release
   Notes</a></h2>
 
   <p>These notes are for <span class="main-name">ncurses</span>
-  6.4, released <strong>December 31, 2022</strong>.</p>
+  6.5, released <strong>April 27, 2024</strong>.</p>
 
   <p>This release is designed to be source-compatible with
-  <span class="main-name">ncurses</span> 5.0 through 6.3; providing
+  <span class="main-name">ncurses</span> 5.0 through 6.4; providing
   extensions to the application binary interface (ABI). Although
   the source can still be configured to support the <span class=
   "main-name">ncurses</span> 5 ABI, the reason for the release is
@@ -172,13 +172,68 @@ <h2><a name="h2-release-notes" id="h2-release-notes">Release
   bug-fixes/improvements</a> dealt with robustness issues. The
   release notes also mention some other bug-fixes, but are focused
   on new features and improvements to existing features since
-  <span class="main-name">ncurses</span> 6.3 release.</p>
+  <span class="main-name">ncurses</span> 6.4 release.</p>
 
   <h3><a name="h3-library" id="h3-library">Library improvements</a></h3>
 
   <h4><a name="h4-new-library" id="h4-new-library">New features</a></h4>
 
-  <p>There are no new features in this release.</p>
+  <p>These are new features:</p>
+
+  <ul>
+    <li>
+      <p>The low-level terminfo and termcap interfaces are used
+      both by the higher-level curses library, as well as by many
+      applications.</p>
+
+      <p>The functions which convert parameterized terminal
+      capability strings for output to the terminal
+      (<code>tiparm</code> and <code>tparm</code>) analyze the
+      capability string to determine which parameters are strings
+      (i.e., addresses), versus numbers (not addresses).</p>
+
+      <p>The library's analysis of a capability string may differ
+      from the calling application's design if environment
+      variables are used to point to an invalid terminal database.
+      This is a longstanding problem with <em>all</em>
+      implementations of terminfo, dating from the early 1980s.</p>
+
+      <p>Two new functions address this problem: by providing a
+      function which allows the calling application to tell ncurses
+      how many string-parameters to expect:</p>
+
+      <ul>
+        <li><code>tiscan_s</code> helps applications check
+        formatting capabilities that would be passed to
+        <code>tiparm_s</code>.</li>
+
+        <li><code>tiparm_s</code> provides applications a way to
+        tell ncurses what the expected parameters are for a
+        capability.</li>
+      </ul>
+    </li>
+
+    <li>
+      <p>The ncurses library supports a compile-time feature
+      (enabled with the configure <code>--enable-check-size</code>
+      option) which simplifies initialization with terminals which
+      do not negotiate window (screen) size. This is done in
+      <code>setupterm</code>, by providing for using ANSI
+      cursor-position report (in user6/user7 terminfo capabilities)
+      to obtain the screen size if neither environment variables or
+      ioctl is used.</p>
+
+      <p>The ncurses test-program with options
+      &ldquo;<code>-E&nbsp;-T</code>&rdquo; demonstrates this
+      feature.</p>
+    </li>
+
+    <li>add functions to query tty-flags in
+    <code>SCREEN</code></li>
+  </ul>
+
+  <p>This release drops compatibility with obsolete versions of
+  <a href="https://invisible-island.net/ncurses/tack/">tack</a>, e.g., pre-1.08</p>
 
   <h4><a name="h4-fixes-library" id="h4-fixes-library">Other
   improvements</a></h4>
@@ -187,55 +242,108 @@ <h4><a name="h4-fixes-library" id="h4-fixes-library">Other
 
   <ul>
     <li>
-      <p>modify <tt>delscreen</tt> to more effectively delete all
-      windows on the given screen.</p>
+      <p>In addition to the new, safer function
+      <code>tiparm_s</code>, ncurses adds checks to make the older
+      <code>tiparm</code>, <code>tparm</code> and
+      <code>tgoto</code> functions safer:</p>
+
+      <ul>
+        <li>
+          <p>the terminfo functions <code>tiparm</code> and
+          <code>tparm</code> ensure that the capability string
+          comes from the terminal description which ncurses loads,
+          rather than from random data which the application
+          happens to have.</p>
+        </li>
+
+        <li>
+          <p>the <code>tgoto</code> function disallows capabilities
+          which its analysis shows will attempt to use string
+          parameters.</p>
+        </li>
+
+        <li>
+          <p>ncurses uses internal functions which correspond to
+          <code>tiparm</code>, and <code>tgoto</code> which ensure
+          that the capability strings which are passed to these
+          functions come from the loaded terminal description.</p>
+        </li>
+      </ul>
+    </li>
+
+    <li>
+      <p>improve check in <code>lib_tparm.c</code>, ensuring that a
+      char* fits into a <code>TPARM_ARG</code></p>
+    </li>
+
+    <li>
+      <p>modify <code>_nc_syserr_abort</code> to use
+      <code>_nc_env_access</code>, rather than only checking root
+      uid</p>
+    </li>
+
+    <li>
+      <p>improve thread lock in <code>lib_trace.c</code></p>
+    </li>
+
+    <li>
+      <p>modify <code>flushinp</code> to use file descriptors in
+      <code>SCREEN</code>, rather than from <code>TERMINAL</code>,
+      and check if they are for a terminal, like SVr4</p>
+    </li>
+
+    <li>
+      <p>modify <code>mcprint</code> to use file descriptor in
+      <code>SCREEN</code>, for consistency</p>
+    </li>
+
+    <li>
+      <p>modify internal function <code>_nc_read_file_entry</code>
+      to show relevant filename in warnings</p>
     </li>
 
     <li>
-      <p>modify <tt>wnoutrefresh</tt> to call <tt>pnoutrefresh</tt>
-      if its parameter is a pad, rather than treating it as an
-      error, and modify new_panel to permit its window-parameter to
-      be a pad</p>
+      <p>improve checks in internal function
+      <code>convert_string</code> for corrupt terminfo entry</p>
     </li>
 
     <li>
-      <p>modify curses_trace() to show the trace-mask as symbols,
-      e.g., <tt>TRACE_ORDINARY</tt>, <tt>DEBUG_LEVEL(3)</tt>.</p>
+      <p>review/improve handling of out-of-memory conditions</p>
     </li>
 
     <li>
-      <p>improve checks for valid mouse events when an intermediate
-      mouse state is not part of the mousemask specified by the
-      caller</p>
+      <p>limit delays to 30 seconds, i.e., padding delays in
+      terminfo, as well as <code>napms</code> and
+      <code>delay_output</code> functions</p>
     </li>
 
     <li>
-      <p>allow extended-color number in <em>opts</em> parameter of
-      <tt>wattr_on</tt>.</p>
+      <p>fix reallocation loop for <code>vsnprintf</code> in
+      <code>_nc_sprintf_string</code> by copying the va_list
+      variable</p>
     </li>
 
     <li>
-      <p>improve <tt>_tracecchar_t2</tt> formatting of
-      base+combining character.</p>
+      <p>modify <code>delscreen</code> to limit the windows which
+      it creates to just those associated with the screen</p>
     </li>
 
     <li>
-      <p>trim out some unwanted linker options from ncurses*config
-      and .pc files seen in Fedora 36+.</p>
+      <p>modify <code>endwin</code> to return an error if it is
+      called again without an intervening screen update</p>
     </li>
 
     <li>
-      <p>improve shell-scripts with <em>shellcheck</em></p>
+      <p>modify <code>wenclose</code> to handle pads</p>
     </li>
 
     <li>
-      <p>improve use of "trap" in shell scripts, using a
-      script.</p>
+      <p>eliminate use of <code>PATH_MAX</code> in
+      <code>lib_trace.c</code></p>
     </li>
 
     <li>
-      <p>modify <tt>make-tar.sh</tt> scripts to make timestamps
-      more predictable.</p>
+      <p>provide for any <code>CCHARW_MAX</code> greater than 1</p>
     </li>
   </ul>
 
@@ -243,19 +351,32 @@ <h4><a name="h4-fixes-library" id="h4-fixes-library">Other
 
   <ul>
     <li>
-      <p>modify <tt>misc/gen-pkgconfig.in</tt> to allow for the
-      case where the library directory does not yet exist, since
-      this is processed before doing an install</p>
+      <p>correct loop termination condition in
+      <code>waddnstr</code> and <code>waddnwstr</code></p>
+    </li>
+
+    <li>
+      <p>improve parsing in internal function
+      <code>_nc_msec_cost</code>, allowing a single decimal
+      point</p>
     </li>
 
     <li>
-      <p>set trailing null on string passed from <tt>winsnstr</tt>
-      to <tt>wins_nwstr</tt>.</p>
+      <p>amend parameter check for entire string versus specific
+      length in <code>winsnstr</code> and <code>wins_nwstr</code>
+      to match Solaris; make similar correction to
+      <code>wins_nwstr</code></p>
     </li>
 
     <li>
-      <p>modify <tt>waddch_literal</tt> to allow for double-width
-      base character when merging a combining character</p>
+      <p>correct internal function <code>wadd_wch_literal</code>
+      when adding a non-spacing character to a double-width
+      character</p>
+    </li>
+
+    <li>
+      <p>correct definition of <code>Charable</code> macro for
+      non-wide ncurses library .</p>
     </li>
   </ul>
 
@@ -263,7 +384,9 @@ <h3><a name="h3-programs" id="h3-programs">Program
   improvements</a></h3>
 
   <p id="h4-utilities">Several improvements were made to the
-  utility programs:</p>
+  utility programs. Some were done to make the <code>infocmp</code>
+  option &ldquo;<tt>-u</tt>&rdquo; option help refactor the
+  terminal database.</p>
 
   <dl>
     <dt><span class="part-name"><a href=
@@ -272,118 +395,131 @@ <h3><a name="h3-programs" id="h3-programs">Program
 
     <dd>
       <ul>
-        <li>rewrite <tt>canonical_name</tt> function of
-        <tt>infocmp</tt> to ensure buffer size</li>
+        <li>
+          <p>add limit checks for processing extended capabilities
+          with the &ldquo;<code>-u</code>&rdquo; option</p>
+        </li>
 
-        <li>improve readability of long parameterized expressions
-        with the infocmp &ldquo;<tt>-f</tt>&rdquo; option by
-        allowing split before a &ldquo;<tt>%p</tt>&rdquo;
-        marker.</li>
+        <li>
+          <p>correct initial alignment of extended capabilities, so
+          that the &ldquo;<code>-u</code>&rdquo; option can be used
+          for more than two terminal types</p>
+        </li>
 
-        <li>modify verbose-option of <tt>infocmp</tt>,
-        <tt>tic</tt>, <tt>toe</tt> to enable debug-tracing if that
-        is configured.</li>
+        <li>
+          <p>modify &ldquo;<code>-u</code>&rdquo; option to not
+          report cancels for strings which were already cancelled
+          in a use'd chunk.</p>
+        </li>
+
+        <li>
+          <p>correct an assignment &ldquo;<code>-u</code>&rdquo;
+          for detecting if a boolean is unset in a base entry and
+          set in a use'd chunk, i.e., if it was cancelled.</p>
+        </li>
       </ul>
     </dd>
 
     <dt><span class="part-name"><a href=
-    "https://invisible-island.net/ncurses/man/tabs.1.html">tabs</a></span>
+    "https://invisible-island.net/ncurses/man/tic.1m.html">tic</a></span>
     </dt>
 
-    <dd>limit tab-stop values to max-columns</dd>
+    <dd>
+      <ul>
+        <li>
+          <p>correct limit-check when dumping tc/use clause via
+          &ldquo;<code>-I</code>&rdquo;</p>
+        </li>
 
-    <dt><span class="part-name"><a href=
-    "https://invisible-island.net/ncurses/man/tic.1m.html">tic</a></span>
-    </dt>
+        <li>
+          <p>check return value of <code>_nc_save_str</code>, in
+          special case where extended capabilities are processed
+          but the terminal description was not initialized</p>
+        </li>
 
-    <dd>add consistency check in tic for u6/u7/u8/u9 and NQ
-    capabilities.</dd>
+        <li>
+          <p>modify check for multiply defined aliases to report
+          problems within the current runtime rather than for
+          conflicts with pre-existing terminal descriptions.</p>
+        </li>
+
+        <li>
+          <p>disallow using <code>$TERMINFO</code> or
+          <code>$HOME/.terminfo</code> when
+          &ldquo;<code>-o</code>&rdquo; option is used</p>
+        </li>
+      </ul>
+    </dd>
 
     <dt><span class="part-name"><a href=
-    "https://invisible-island.net/ncurses/man/tput.1.html">tput</a></span>
-    </dt>
+    "https://invisible-island.net/ncurses/man/tput.1.html">tput</a></span> and <span class=
+    "part-name"><a href=
+    "https://invisible-island.net/ncurses/man/tset.1.html">tset</a></span></dt>
+
+    <dd>
+      <ul>
+        <li>
+          <p>add &ldquo;<code>-v</code>&rdquo; option to tput, to
+          show warnings</p>
+        </li>
 
-    <dd>corrected use of original tty-modes in <em>init/reset</em>
-    subcommands</dd>
+        <li>
+          <p>modify <em>reset</em> command to avoid altering clocal
+          if the terminal uses a modem</p>
+        </li>
+
+        <li>
+          <p>modify <em>reset</em> feature to avoid 1-second sleep
+          if running in a pseudo-terminal</p>
+        </li>
+      </ul>
+    </dd>
   </dl>
 
   <h4><a name="h4-examples" id="h4-examples">Examples</a></h4>
 
   <p>Along with the library and utilities, improvements were made
   to the <a href=
-  "https://invisible-island.net/ncurses/ncurses-examples.html">ncurses-examples</a>. Most of
-  this activity aimed at improving the test-packages:</p>
+  "https://invisible-island.net/ncurses/ncurses-examples.html">ncurses-examples</a>:</p>
 
   <ul>
     <li>
-      <p>add minimal <tt>-h</tt> (usage) and <tt>-V</tt> (version)
-      getopt logic to all ncurses-examples programs.</p>
-    </li>
-
-    <li>
-      <p>fix an error in "@" command in <tt>test/ncurses.c</tt>
-      F-menu</p>
-    </li>
-
-    <li>
-      <p>add curses_trace to ifdef's for <tt>START_TRACE</tt> in
-      <tt>test/test.priv.h</tt></p>
-    </li>
-
-    <li>
-      <p>improve pthread-configuration for test/worm.c</p>
-    </li>
-
-    <li>
-      <p>add <tt>setlocale</tt> call to several test-programs.</p>
+      <p>modify <code>test_tparm</code> to account for extended
+      capabilities</p>
     </li>
 
     <li>
-      <p>workaround in <tt>test/picsmap.c</tt> for use of floating
-      point for rgb values by ImageMagick 6.9.11, which appears to
-      use the wrong upper limit.</p>
+      <p>corrected mouse mask in <code>test/testcurs.c</code></p>
     </li>
 
     <li>
-      <p>use static libraries for AdaCurses test-package for
-      Mageia, since no gprbuild package is available.</p>
+      <p>modify <code>test/clip_printw.c</code> to optionally test
+      non-wrapped updates</p>
     </li>
 
     <li>
-      <p>install Ada95 sample programs in libexecdir, adding a
-      wrapper script to invoke those.</p>
+      <p>modify <code>test/test_mouse.c</code> to use curses api
+      for raw/noraw</p>
     </li>
 
     <li>
-      <p>install ncurses-examples programs in libexecdir, adding a
-      wrapper script to invoke those.</p>
+      <p>modify <code>test/clip_printw.c</code> to optionally test
+      non-wrapped updates</p>
     </li>
   </ul>
 
-  <p>There are other new demo/test programs and reusable
-  examples:</p>
+  <p>There is one new demo/test programs:</p>
 
   <dl>
-    <dt><span class="part-name"><em>test/combine</em></span>
+    <dt><span class="part-name"><em>test/test_endwin.c</em></span>
     </dt>
 
-    <dd>demonstrate combining characters</dd>
-
-    <dt><span class="part-name"><em>test/test_delwin</em></span>
-    </dt>
-
-    <dd>demonstrate deleting a window</dd>
-
-    <dt><span class="part-name"><em>test/test_mouse</em></span>
-    </dt>
-
-    <dd>observe mouse events in the raw terminal or parsed ncurses
-    modes</dd>
-
-    <dt><span class="part-name"><em>test/test_unget_wch</em></span>
-    </dt>
-
-    <dd>demonstrate the unget_wch and unget functions</dd>
+    <dd>
+      <p>This program shows the return-status from
+      <code>endwin</code> with different combinations of
+      <code>endwin</code> (repeated), <code>initscr</code>,
+      <code>newterm</code>.</p>
+    </dd>
   </dl>
 
   <h3><a name="h3-database" id="h3-database">Terminal database</a></h3>
@@ -391,190 +527,159 @@ <h3><a name="h3-database" id="h3-database">Terminal database</a></h3>
   <p>There are several new terminal descriptions:</p>
 
   <ul>
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-mosh">mosh</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-ansi_apparrows"><tt>ansi+apparrows</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-mosh-256color">mosh-256color</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-contour"><tt>contour</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-teken-16color">teken-16color</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-linux_kbs"><tt>linux+kbs</tt></a>
+      for terminals which imitate xterm's behavior with Linux</p>
     </li>
 
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-teken-sc">teken-sc</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-rio"><tt>rio</tt></a>,
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-rio-direct"><tt>rio-direct</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-teken-vt">teken-vt</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-mostlike"><tt>mostlike</tt></a></p>
     </li>
 
-    <li><tt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-xgterm">xgterm</a></tt>
+    <li>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-ms-vt100-16color"><tt>ms-vt100-16color</tt></a>,
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-winconsole"><tt>winconsole</tt></a></p>
     </li>
-  </ul>
 
-  <p>There are many changes to existing terminal descriptions. Some
-  were updates to several descriptions:</p>
-
-  <ul>
     <li>
-      <p>make description-fields distinct</p>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-vt100_noapp"><tt>vt100+noapp</tt></a>,
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-vt100_noapp_pc"><tt>vt100+noapp+pc</tt></a>,
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_app_pc"><tt>xterm+app+pc</tt></a>,
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_decedit"><tt>xterm+decedit</tt></a>
+      from <a href="https://invisible-island.net/xterm/xterm.log.html#xterm_389">xterm
+      #389</a></p>
     </li>
 
     <li>
-      <p>fix errata in description fields</p>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-putty_cursor"><tt>putty+cursor</tt></a>
+      to reflect amending of modified cursor-keys in 2021</p>
     </li>
 
     <li>
-      <p>add/use several building-blocks:</p>
-
-      <ul>
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-aixterm_sl"><tt>aixterm+sl</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-ansi_cpr"><tt>ansi+cpr</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-apollo_vt132"><tt>apollo+vt132</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-decid_cpr"><tt>decid+cpr</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-ncr260vp_sl"><tt>ncr260vp+sl</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-wyse_sl"><tt>wyse+sl</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-x10term_sl"><tt>x10term+sl</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_acs"><tt>xterm+acs</tt></a></li>
-
-        <li><a href=
-        "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_alt47"><tt>xterm+alt47</tt></a></li>
-      </ul>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-wezterm"><tt>wezterm</tt></a></p>
     </li>
   </ul>
 
-  <p>while others affected specific descriptions. These were
-  retested, to take into account changes by their developers:</p>
+  <p>There are many changes to existing terminal descriptions. Some
+  were updates to several descriptions, using the
+  <code>infocmp</code> &ldquo;<code>-u</code>&rdquo; option in a
+  script to determine which <em>building-block</em> entries could
+  be used to replace multiple capability settings (and trim
+  redundant information).</p>
+
+  <p>Other changes include:</p>
 
   <ul>
     <li>
-      <p><tt><a href=
-      "https://invisible-island.net/ncurses/terminfo.src.html#tic-kitty">kitty</a></tt>
-      </p>
+      <p><a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#toc-_X_T_E_R_M__Extensions_">document</a>
+      XF, kxIN and kxOUT</p>
     </li>
 
     <li>
-      <p><tt><a href=
-      "https://invisible-island.net/ncurses/terminfo.src.html#tic-teken">teken</a></tt>
-      </p>
+      <p>add note on <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-sun"><tt>sun</tt></a>
+      regarding wscons/cmdtool/shelltool</p>
     </li>
-  </ul>
 
-  <p>while these are specific fixes based on reviewing
-  documentation, user reports, or warnings from <span class=
-  "part-name">tic</span>:</p>
-
-  <dl>
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-att610_cvis0">att610+cvis0</a>
-    </dt>
-
-    <dd>amended note as per documentation for att610, att620,
-    att730</dd>
-
-    <dt><a href="https://invisible-island.net/ncurses/terminfo.src.html#tic-kon">kon</a>,
-    kon2, jfbterm</dt>
-
-    <dd>revise to undo "linux2.6" change to smacs/rmacs/enacs</dd>
-
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-st-0_6">st-0.6</a>
-    </dt>
-
-    <dd>add dim, ecma+strikeout</dd>
-
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-foot_base">foot+base</a>
-    </dt>
-
-    <dd>add xterm+sl-alt</dd>
-
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-dec_sl">dec+sl</a>
-    </dt>
-
-    <dd>correct dsl in dec+sl</dd>
-
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-mintty">mintty</a> and
-    tmux</dt>
-
-    <dd>correct setal in mintty/tmux entries, add to vte-2018</dd>
-
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-nsterm">nsterm</a>
-    </dt>
+    <li>
+      <p>remove DECCOLM+DECSCLM from <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-foot"><tt>foot</tt></a></p>
+    </li>
 
-    <dd>modify nsterm to use xterm+alt1049</dd>
+    <li>
+      <p>add xterm+focus to <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-foot_base"><tt>foot+base</tt></a></p>
+    </li>
 
-    <dt><a href="https://invisible-island.net/ncurses/terminfo.src.html#tic-putty">putty</a>
-    </dt>
+    <li>
+      <p>add ecma+strikeout to <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-putty"><tt>putty</tt></a></p>
+    </li>
 
-    <dd>modify putty to use xterm+alt1049</dd>
+    <li>
+      <p>use CSI 3J in <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-vte-2017"><tt>vte-2017</tt></a></p>
+    </li>
 
-    <dt><a href=
-    "https://invisible-island.net/ncurses/terminfo.src.html#tic-vte-2018">vte-2018</a>
-    </dt>
+    <li>
+      <p>use oldxterm+sm+1006 in <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-vte-2014"><tt>vte-2014</tt></a></p>
+    </li>
 
-    <dd>add blink and setal</dd>
-  </dl>
+    <li>
+      <p>modify <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xgterm"><tt>xgterm</tt></a>
+      to work around line-drawing bug</p>
+    </li>
 
-  <p>A few entries use extensions (user-defined terminal
-  capabilities):</p>
+    <li>
+      <p>add xterm focus mode 1004 to <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_focus"><tt>xterm+focus</tt></a>
+      as fe/fd capabilities, like vim.</p>
+    </li>
 
-  <ul>
     <li>
-      <p>use <tt>ansi+enq</tt> and <tt>decid+cpr</tt> in cases
-      where the terminal probably supported the u6-u9 extension</p>
+      <p>add xterm+focus to <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-alacritty_common"><tt>alacritty+common</tt></a></p>
     </li>
 
     <li>
-      <p>remove u6-u9 from teken-2018</p>
+      <p>add XR/xr, to work with vim, and use RV/rv to denote DA2
+      and its response</p>
     </li>
 
     <li>
-      <p>use <tt>NQ</tt> to flag entries where the terminal does
-      not support query and response</p>
+      <p>add XF flag to <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm_focus"><tt>xterm+focus</tt></a>
+      so that termcap applications can be aware of terminals which
+      may support focus in/out</p>
     </li>
 
     <li>
-      <p>add/use <a href=
-      "https://invisible-island.net/ncurses/terminfo.src.html#tic-bracketed_paste"><tt>bracketed+paste</tt></a>
-      to help identify terminals supporting this xterm feature</p>
+      <p>use xterm+focus in <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm-p370"><tt>xterm-p370</tt></a>
+      and <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-tmux"><tt>tmux</tt></a></p>
     </li>
 
     <li>
-      <p>modify samples for xterm mouse 1002/1003 modes to use 1006
-      mode, and also provide for focus in/out responses</p>
+      <p>remove xterm+sm+1006 from <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-tmux"><tt>tmux</tt></a></p>
     </li>
 
     <li>
-      <p>xterm patch #371 supports DEC-compatible status-line. add
-      <tt>dec+sl</tt> to xterm-new, per xterm #371, add <a href=
-      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm-p371"><tt>xterm-p371</tt></a>,
-      add <a href=
-      "https://invisible-island.net/ncurses/terminfo.src.html#tic-xterm-p370"><tt>xterm-p370</tt></a>,
-      for use in older terminals, and set &ldquo;xterm-new&rdquo;
-      to &ldquo;xterm-p370&rdquo; (to ease adoption).</p>
+      <p>NetBSD-related fixes for <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-x68k"><tt>x68k</tt></a> and
+      <a href=
+      "https://invisible-island.net/ncurses/terminfo.src.html#tic-wsvt25"><tt>wsvt25</tt></a></p>
     </li>
   </ul>
 
@@ -610,103 +715,88 @@ <h3><a name="h3-documentation" id=
 
       <ul>
         <li>
-          <p>remove a stray '/' from description of <tt>%g</tt> in
-          <a href=
-          "https://invisible-island.net/ncurses/man/terminfo.5.html#h3-Parameterized-Strings">
-          terminfo(5)</a>.</p>
+          <p>add assignment in <code>CF_MAN_PAGES</code> to fill in
+          value for <code>TERMINFO_DIRS</code> in ncurses, terminfo
+          and tic manpages.</p>
         </li>
 
         <li>
-          <p>correct/improve font-formatting in <a href=
-          "https://invisible-island.net/ncurses/man/curs_getch.3x.html">curs_getch.3x</a>, as
-          well as other manual pages.</p>
+          <p>clarify interaction of <code>-R</code> option versus
+          <code>-C</code>, <code>-I</code> and <code>-r</code> in
+          <code>infocmp</code> manpage.</p>
         </li>
-      </ul>
-    </li>
-
-    <li>
-      <p>New/improved history and portability sections:</p>
 
-      <ul>
         <li>
-          <p>add portability notes for <a href=
-          "https://invisible-island.net/ncurses/man/curs_initscr.3x.html#h2-PORTABILITY">delscreen</a>
-          and <a href=
-          "https://invisible-island.net/ncurses/man/curs_window.3x.html#h2-PORTABILITY">delwin</a>
-          in manual.</p>
+          <p>correct manpage description of panel_hidden.</p>
         </li>
 
         <li>
-          <p>improve <a href=
-          "https://invisible-island.net/ncurses/man/curs_slk.3x.html#h2-EXTENSIONS">curs_slk.3x</a>
-          discussion of extensions and portability</p>
+          <p>improve manpage description for addch versus unctrl
+          format used for non-printable characters.</p>
         </li>
-      </ul>
-    </li>
 
-    <li>
-      <p>Other improvements:</p>
-
-      <ul>
         <li>
-          <p>improve <a href=
-          "https://invisible-island.net/ncurses/man/curs_bkgd.3x.html">curs_bkgd.3x</a>,
-          explaining that <tt>bkgdset</tt> can affect results for
-          <tt>bkgd</tt></p>
+          <p>improve manpages discussing file descriptors in
+          low-level functions.</p>
         </li>
 
         <li>
-          <p>add note on portable memory-leak checking in <a href=
-          "https://invisible-island.net/ncurses/man/curs_memleaks.3x.html#h2-PORTABILITY">curs_memleaks.3x</a></p>
+          <p>improve description of search rules for terminal
+          descriptions in terminfo manpage.</p>
         </li>
 
         <li>
-          <p>expanded description in <a href=
-          "https://invisible-island.net/ncurses/man/resizeterm.3x.html">resizeterm.3x</a></p>
+          <p>modify dist.mk to avoid passing developer's comments
+          in manpages into the generated html documentation.</p>
         </li>
 
         <li>
-          <p>add section on releasing memory to <a href=
-          "https://invisible-island.net/ncurses/man/curs_termcap.3x.html#h3-Releasing-Memory">
-          curs_termcap.3x</a> and <a href=
-          "https://invisible-island.net/ncurses/man/curs_terminfo.3x.html#h3-Releasing-Memory">
-          curs_terminfo.3x</a> manpages.</p>
+          <p>modify test-package "ncurses6-doc" to use
+          manpage-aliases, which in turn required a change to the
+          configure script to factor in the extra-suffix option
+          when deriving alias names.</p>
         </li>
+      </ul>
+    </li>
 
+    <li>
+      <p>New/improved history and portability sections:</p>
+
+      <ul>
         <li>
-          <p>add clarification of the scope of dynamic variables in
-          <a href=
-          "https://invisible-island.net/ncurses/man/terminfo.5.html">terminfo(5)</a>.</p>
+          <p>add information about "ttycap", termcap's forerunner,
+          to tset.1</p>
         </li>
 
         <li>
-          <p>improve formatting of <a href=
-          "https://invisible-island.net/ncurses/ncurses-intro.html">ncurses-intro.html</a>
-          and <a href=
-          "https://invisible-island.net/ncurses/hackguide.html">hackguide.html</a></p>
+          <p>document limitations of tparm, and error-returns in
+          curs_terminfo.3x</p>
         </li>
 
         <li>
-          <p>improve <a href=
-          "https://invisible-island.net/ncurses/man/curs_clear.3x.html">curs_clear.3x</a>
-          links to other pages</p>
+          <p>document limitations of tgoto, and error-returns in
+          curs_termcap.3x</p>
         </li>
+      </ul>
+    </li>
+
+    <li>
+      <p>Other improvements:</p>
 
+      <ul>
         <li>
-          <p>update <a href=
-          "https://invisible-island.net/ncurses/howto/NCURSES-Programming-HOWTO.html">ncurses-howto</a>,
-          making documentation fixes along with corrections to
-          example programs.</p>
+          <p>This release has many changes to improve the
+          formatting and style of the manpages.</p>
         </li>
 
         <li>
-          <p>use newer version 1.36 of gnathtml for generating Ada
-          html files.</p>
+          <p>Manpages now use consistent section-naming, page
+          headers and footers (including the modification date for
+          each page).</p>
         </li>
 
         <li>
-          <p>update external links in <a href=
-          "https://invisible-island.net/ncurses/Ada95.html">Ada95.html</a></p>
+          <p>Table layout has been revised.</p>
         </li>
       </ul>
     </li>
@@ -718,93 +808,162 @@ <h3><a name="h3-documentation" id=
   <h3><a name="h3-bug-fixes" id="h3-bug-fixes">Interesting
   bug-fixes</a></h3>
 
-  <p>While there were many bugs fixed during development of ncurses
-  6.4, only a few (the reason for this release) were both important
-  and interesting. Most of the bug-fixes were for local issues
-  which did not affect compatibility across releases. Since those
-  are detailed in the <a href=
-  "https://invisible-island.net/ncurses/NEWS.html#t20221231">NEWS</a> file no elaboration is
-  needed here.</p>
+  <p>The changes to <tt>tparm</tt>, <tt>tgoto</tt> which improve
+  the design of the low-level interfaces are <em>interesting</em>,
+  but are not bug-fixes <em>per se</em>.</p>
+
+  <h3><a name="h3-config-config" id=
+  "h3-config-config">Configuration changes</a></h3>
+
+  <h4><a name="h4-config-major" id="h4-config-major">Major
+  changes</a></h4>
 
-  <p>The interesting bugs were those dealing with memory leaks and
-  buffer overflows. Although the utilities are designed for
-  <em>text</em> files (which they do properly), some choose to test
-  them with <strong>non-</strong><em>text</em> files.</p>
+  <p>These are the major changes (aside from introducing <a href=
+  "#h4-new-library"><tt>tiparm_s</tt></a>):</p>
 
   <ul>
     <li>
-      <p>Text files contain no embedded nulls. Also, they end with
-      a newline. Feeding <strong>tic</strong> non-text files
-      exposed a few cases where the program did not check for those
-      issues. As a result, further processing of the input found
-      limit-checks whose assumptions were invalid.</p>
+      <p>use wide-character (ncursesw) by default</p>
     </li>
 
     <li>
-      <p>Fixing the limit-checks (first) found a problem with
-      <strong>tic</strong> managing the list of strings in a
-      terminal description. In merging two terminal descriptions
-      (i.e., the &ldquo;use=&rdquo; feature), <strong>tic</strong>
-      was not allocating a complete copy. A quick repair for that
-      introduced a memory leak.</p>
+      <p>use opaque typedefs by default</p>
     </li>
+  </ul>
 
+  <p>However, most of the work on configure scripts was done to
+  reduce warnings within the configure script:</p>
+
+  <ul>
     <li>
-      <p>The checks for non-text files are improved (i.e., embedded
-      nulls in the input file will cause <strong>tic</strong> to
-      reject it rather than attempting to process it).</p>
+      <p>intrusive warnings from GNU grep regarding fgrep and
+      egrep</p>
     </li>
 
     <li>
-      <p>The string allocations in <strong>tic</strong> are
-      likewise improved.</p>
+      <p>fatal errors in compile-checks, arising from recent
+      &ldquo;Modern&nbsp;C&rdquo; efforts by some developers which
+      caused longstanding configure checks to fail.</p>
+
+      <p>After repairing the configure script, none of that
+      activity affected ncurses because stricter warnings are used
+      routinely in development.</p>
     </li>
   </ul>
 
-  <h3><a name="h3-config-config" id=
-  "h3-config-config">Configuration changes</a></h3>
+  <p>Other improvements made to configure checks include</p>
 
-  <h4><a name="h4-config-major" id="h4-config-major">Major
-  changes</a></h4>
+  <ul>
+    <li>
+      <p>use <a href=
+      "https://invisible-island.net/ncurses/INSTALL.html#option:enable-string-hacks">string-hacks</a>
+      in alloc_entry.c, alloc_type.c and hardscroll.c, overlooked
+      due to compiler changes in recent OpenBSD releases</p>
+    </li>
+
+    <li>
+      <p>revise progs.priv.h to provide for NC_ISATTY reuse</p>
+    </li>
+
+    <li>
+      <p>configure check for MB_LEN_MAX provides warning as
+      needed</p>
+    </li>
+
+    <li>
+      <p>trim a space after some "-R" options, fixing builds for
+      applications built using clang and ncurses on Solaris</p>
+    </li>
 
-  <p>There are no major changes. No new options were added. Several
-  improvements were made to configure checks.</p>
+    <li>
+      <p>work around misconfiguration of MacPorts gcc13, which
+      exposes invalid definition of <tt>MB_LEN_MAX</tt> in gcc's
+      fallback copy of <tt>limits.h</tt></p>
+    </li>
+
+    <li>
+      <p>modified experimental Windows driver works with xterm
+      mouse protocol</p>
+    </li>
+  </ul>
 
   <h4><a name="h4-config-options" id=
   "h4-config-options">Configuration options</a></h4>
 
-  <p>There are a few new/modified configure options:</p>
+  <p>There are a few new configure options:</p>
 
   <dl>
-    <dt><tt>--with-abi-version</tt>
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:disable-setuid-environ"><tt>--disable-setuid-environ</tt></a>
     </dt>
 
     <dd>
-      <p>add ABI 7 defaults to configure script.</p>
+      <p>Compile with environment restriction, so certain
+      environment variables are not available when running via a
+      setuid/setgid application. These are (for example
+      <tt>$TERMINFO</tt>) those that allow the search path for the
+      terminfo or termcap entry to be customized.</p>
+
+      <p>A setuid/setgid application inherits its environment
+      variables from the current user, in contrast to sudo which
+      may limit the environment variables that ncurses uses.</p>
     </dd>
 
-    <dt><tt>--with-caps</tt>
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:enable-check-size"><tt>--enable-check-size</tt></a>
     </dt>
 
     <dd>
-      <p>add warning in configure script if file specified for
-      &ldquo;<tt>--with-caps</tt>&rdquo; does not exist.</p>
+      <p>Compile-in feature to detect screensize for terminals
+      which do not advertise their screensize, e.g., serial
+      terminals.</p>
     </dd>
 
-    <dt><tt>--with-manpage-format</tt>
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:with-abi-altered"><tt>--with-abi-altered=<em>NUM</em></tt></a>
     </dt>
 
     <dd>
-      <p>bzip2 and xz compression are now supported</p>
+      <p>Override the displayed (rather than compiled-in) ABI. Only
+      packagers who have created configurations where the ABI
+      differs from ncurses should be interested in this option.</p>
     </dd>
 
-    <dt><tt>--with-xterm-kbs</tt>
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:with-strip-program"><tt>--with-strip-program=<em>XXX</em></tt></a>
     </dt>
 
     <dd>
-      <p>add check/warning in configure script if option
-      &ldquo;<tt>--with-xterm-kbs</tt>&rdquo; is missing or
-      inconsistent</p>
+      <p>When stripping executables during install, use the
+      specified program rather than &ldquo;strip&rdquo; overriding
+      program chosen by the install program for stripping
+      executables.</p>
+    </dd>
+  </dl>
+
+  <p>These configure options are modified:</p>
+
+  <dl>
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:with-pkg-config-libdir"><tt>--with-pkg-config-libdir[=<em>DIR</em>]</tt></a>
+    </dt>
+
+    <dd>
+      <p>The optional <em>DIR</em> parameter can now be
+      &ldquo;auto&rdquo; to automatically use pkg-config's library
+      directory.</p>
+
+      <p>The default is <tt>$(libdir)</tt>.</p>
+    </dd>
+
+    <dt><a href=
+    "https://invisible-island.net/ncurses/INSTALL.html#option:with-xterm-kbs"><tt>--with-xterm-kbs[=<em>XXX</em>]</tt></a>
+    </dt>
+
+    <dd>
+      <p>The default is &ldquo;auto&rdquo; which tells the
+      configure script to choose BS or DEL according to platform
+      defaults.</p>
     </dd>
   </dl>
 
@@ -815,100 +974,117 @@ <h3><a name="h3-portability" id="h3-portability">Portability</a></h3>
 
   <ul>
     <li>
-      <p>amend configure option's auto-search to account for
-      systems where none of the directories known to
-      <em>pkg-config</em> exist</p>
+      <p>add/use configure check for <code>clock_gettime</code>, to
+      supersede <code>gettimeofday</code>.</p>
     </li>
 
     <li>
-      <p>corrected regex needed for older <em>pkg-config</em> used
-      in Solaris 10</p>
+      <p>modify configure script check for pkg-config library
+      directory to take into account an older version 0.15.0 which
+      used PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR</p>
     </li>
 
     <li>
-      <p>improve handling of <tt>--with-pkg-config-libdir</tt>
-      option, allowing for the case where either
-      <tt>$PKG_CONFIG_LIBDIR</tt> or the option value has a
-      colon-separated list of directories</p>
+      <p>allow for MinGW32-/64-bit configurations to use
+      _DEFAULT_SOURCE</p>
     </li>
 
     <li>
-      <p>if the <tt>--with-pkg-config-libdir</tt> option is not
-      given, use <tt>${libdir}/pkgconfig</tt> as a default</p>
+      <p>modify CF_XOPEN_SOURCE macro's amend default case to avoid
+      undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined</p>
     </li>
 
     <li>
-      <p>improve search-path check for <em>pkg-config</em>, e.g.,
-      for Debian testing which installs <em>pkg-config</em> with
-      architecture-prefixes.</p>
+      <p>updated configure script macro CF_XOPEN_SOURCE, for
+      uClibc-ng</p>
     </li>
 
     <li>
-      <p>build-fix for cross-compiling to MingW, conditionally add
-      <tt>-lssp</tt></p>
+      <p>modify version-check for gcc/g++, now works for msys2</p>
     </li>
 
     <li>
-      <p>improve configure check for <tt>getttynam</tt></p>
+      <p>build-fixes related to configure-options and/or
+      platform:</p>
+
+      <ul>
+        <li>fix for <tt>--enable-fvisibility</tt></li>
+
+        <li>fix for unusual values of
+        <tt>--with-rel-version</tt></li>
+
+        <li>fix for unusual values of
+        <tt>--with-abi-version</tt></li>
+
+        <li>fix for <tt>--disable-tcap-names</tt></li>
+
+        <li>fix for termcap in <tt>nc_access.h</tt></li>
+      </ul>
     </li>
 
     <li>
-      <p>fixes to build with <em>dietlibc</em>:</p>
+      <p>other configure-script improvements:</p>
 
       <ul>
-        <li>add configure check for <tt>fpathconf</tt></li>
+        <li>recent msys2 headers work with
+        <tt>_DEFAULT_SOURCE</tt>; amend check</li>
 
-        <li>add configure check for math sine/cosine, needed in
-        test/tclock, and eliminate <tt>pow()</tt> from
-        test/hanoi</li>
+        <li>use <tt>$ac_includes_default</tt> in most cases where
+        stdlib.h should work</li>
 
-        <li>use <tt>wcsnlen</tt> as an alternative to
-        <tt>wmemchr</tt> if it is not found</li>
+        <li>use <tt>#error</tt> consistently vs "make an
+        error"</li>
+
+        <li>add configure macro for <tt>gettimeofday</tt> vs inline
+        check</li>
       </ul>
     </li>
+  </ul>
 
+  <p>Here are some of the other portability fixes:</p>
+
+  <ul>
     <li>
-      <p>modify configure macro <tt>CF_BUILD_CC</tt> to check if
-      the build-compiler works, rather than that it is different
-      from the cross-compiler, e.g., to accommodate a compiler
-      which can be used for either purpose with different flags</p>
+      <p>modify configure scripts/makefiles to omit
+      <tt>KEY_RESIZE</tt> if the corresponding <tt>SIGWINCH</tt>
+      feature is disabled</p>
     </li>
 
     <li>
-      <p>modify configure/scripts to work around interference by
-      GNU grep 3.8</p>
+      <p>increase <tt>MB_CUR_MAX</tt> to 16, matching glibc's
+      <tt>MB_LEN_MAX</tt></p>
     </li>
-  </ul>
 
-  <p>Here are some of the other portability fixes:</p>
+    <li>
+      <p>add BSD <tt>erase2</tt> to characters handled by
+      tset/reset</p>
+    </li>
 
-  <ul>
     <li>
-      <p>change <tt>man_db.renames</tt> to template, to handle
-      <em>ncurses*-config</em> script with the
-      <tt>--extra-suffix</tt> configure option.</p>
+      <p>use <tt>getauxval</tt> when available, to improve
+      <tt>setuid</tt>/<tt>setgid</tt> checks</p>
     </li>
 
     <li>
-      <p>update <tt>CF_XOPEN_SOURCE</tt> macro, adding variants
-      &ldquo;gnueabi" and &ldquo;gnueabihf" to get
-      <tt>_DEFAULT_SOURCE</tt> special case, as well as adding GNU
-      libc suffixes for &ldquo;abi64&rdquo;, &ldquo;abin32&rdquo;,
-      &ldquo;x32&rdquo; to distinguish it from other libc
-      flavors.</p>
+      <p>set <tt>dwShareMode</tt> in calls to
+      <tt>CreateConsoleScreenBuffer</tt></p>
     </li>
 
     <li>
-      <p>work around <em>musl</em>'s nonstandard use of feature
-      test macros by adding a definition for
-      <tt>NCURSES_WIDECHAR</tt> to the generated &ldquo;.pc&rdquo;
-      and <em><tt>*-config</tt></em> files.</p>
+      <p>use <tt>CreateFile</tt> with "<tt>CONIN$</tt>",
+      "<tt>CONOUT$</tt>" rather than <tt>GetStdHandle</tt> to
+      obtain a handle on the actual console, avoiding redirection
+      in the MinGW/Win32 configurations</p>
     </li>
 
     <li>
-      <p>use &ldquo;<tt>command -v</tt>&rdquo; rather than
-      &ldquo;<tt>type</tt>&rdquo; in <tt>Ada95/gen/Makefile.in</tt>
-      to fix a portability issue.</p>
+      <p>modify MinGW driver to return <tt>KEY_BACKSPACE</tt> when
+      an unmodified <tt>VK_BACK</tt> virtual key is entered</p>
+    </li>
+
+    <li>
+      <p>modify MinGW configuration to provide for running in
+      MSYS/MSYS2 shells, assuming ConPTY support</p>
     </li>
   </ul>
 
@@ -927,30 +1103,31 @@ <h2><a name="h2-features" id="h2-features">Features of
     </li>
 
     <li>
-      <p><span class="main-name">ncurses</span> supports all of the
-      for SVr4 curses features including keyboard mapping, color,
-      forms-drawing with ACS characters, and automatic recognition
+      <p><span class="main-name">ncurses</span> supports the
+      features of SVr4 curses including keyboard mapping, color,
+      form drawing with ACS characters, and automatic recognition
       of keypad and function keys.</p>
     </li>
 
     <li>
-      <p><span class="main-name">ncurses</span> provides these SVr4
-      add-on libraries (not part of X/Open Curses):</p>
+      <p><span class="main-name">ncurses</span> provides work-alike
+      replacements of SVr4 supplemental libraries based on curses,
+      but which were not specified by X/Open Curses:</p>
 
       <ul>
         <li>
-          <p>the panels library, supporting a stack of windows with
-          backing store.</p>
+          <p>the panel library, supporting a stack of windows with
+          backing store</p>
         </li>
 
         <li>
-          <p>the menus library, supporting a uniform but flexible
-          interface for menu programming.</p>
+          <p>the menu library, supporting a uniform but flexible
+          interface for menu programming</p>
         </li>
 
         <li>
           <p>the form library, supporting data collection through
-          on-screen forms.</p>
+          on-screen forms</p>
         </li>
       </ul>
     </li>
@@ -962,7 +1139,7 @@ <h2><a name="h2-features" id="h2-features">Features of
       <ul>
         <li>
           <p><span class="main-name">ncurses</span> supports
-          user-defined capabilities which it can see, but which are
+          user-defined capabilities that it can see, but which are
           hidden from SVr4 curses applications using the
           <em>same</em> terminal database.</p>
         </li>
@@ -994,8 +1171,8 @@ <h2><a name="h2-features" id="h2-features">Features of
   <ul>
     <li>
       <p>The API is 8-bit clean and base-level conformant with the
-      X/OPEN curses specification, XSI curses (that is, it
-      implements all <em>BASE</em> level features, and most
+      X/Open Curses specification, XSI curses (that is, it
+      implements all <em>BASE</em> level features, and almost all
       <em>EXTENDED</em> features). It includes many function calls
       not supported under SVr4 curses (but portability of all calls
       is documented so you can use the SVr4 subset only).</p>
@@ -1135,10 +1312,27 @@ <h2><a name="h2-features" id="h2-features">Features of
     </li>
 
     <li>
-      <p>The library meets the XSI requirement that every macro
-      entry point has a corresponding function which may be linked
-      (and will be prototype-checked) if the macro definition is
-      disabled with <code>#undef</code>.</p>
+      <p>X/Open Curses permits most functions it specifies to be
+      made available as macros as well. ncurses does this</p>
+
+      <ul>
+        <li>to improve performance, e.g., for operations composed
+        of simpler functions such as cursor movement following by
+        adding text to the screen,</li>
+
+        <li>to simplify the implementation by reusing functions
+        which use common parameters, e.g., the standard screen
+        <code>stdscr</code>, and</li>
+
+        <li>to provide functions that return values via their
+        parameters</li>
+      </ul>
+
+      <p>Except for the last case, ncurses provides a non-macro
+      implementation of the function. If the macro definition is
+      disabled with <code>#undef</code>, or by defining
+      <code>NCURSES_NOMACROS</code> the function may be linked (and
+      its calls will be checked against the prototype).</p>
     </li>
 
     <li>
@@ -1240,7 +1434,8 @@ <h2><a name="h2-who-uses" id="h2-who-uses">Applications using
         <p>New vi uses ncurses.</p>
 
         <p><a href=
-        "https://sites.google.com/a/bostic.com/keithbostic/vi">https://sites.google.com/a/bostic.com/keithbostic/vi</a><br>
+        "https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page">
+        https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page</a><br>
 
         </p>
       </dd>
@@ -1288,7 +1483,7 @@ <h2><a name="h2-who-uses" id="h2-who-uses">Applications using
         <p>terminal emulator for serial modem connections</p>
 
         <p><a href=
-        "https://alioth.debian.org/projects/minicom/">https://alioth.debian.org/projects/minicom/</a></p>
+        "https://salsa.debian.org/minicom-team/minicom">https://salsa.debian.org/minicom-team/minicom</a></p>
       </dd>
 
       <dt><span class="part-name">mosh</span>
@@ -1432,19 +1627,17 @@ <h2><a name="h2-development" id="h2-development">Development
 
   <blockquote>
     <p><a href=
-    "https://invisible-island.net/archives/ncurses/6.3/">https://invisible-island.net/archives/ncurses/6.3/</a>
+    "https://invisible-island.net/archives/ncurses/6.4/">https://invisible-island.net/archives/ncurses/6.4/</a>
     and<br>
     <a href=
-    "https://invisible-mirror.net/archives/ncurses/6.3/">https://invisible-mirror.net/archives/ncurses/6.3/</a>&nbsp;.</p>
+    "https://invisible-mirror.net/archives/ncurses/6.4/">https://invisible-mirror.net/archives/ncurses/6.4/</a>&nbsp;.</p>
   </blockquote>
 
   <p>There is an archive of the mailing list here:</p>
 
   <blockquote>
     <p><a href=
-    "http://lists.gnu.org/archive/html/bug-ncurses">http://lists.gnu.org/archive/html/bug-ncurses</a>
-    (also <a href=
-    "https://lists.gnu.org/archive/html/bug-ncurses">https</a>)</p>
+    "https://lists.gnu.org/archive/html/bug-ncurses">https://lists.gnu.org/archive/html/bug-ncurses</a>&nbsp;.</p>
   </blockquote>
 
   <h2><a name="h2-this-stuff" id="h2-this-stuff">Related
@@ -1486,14 +1679,15 @@ <h2><a name="h2-other-stuff" id="h2-other-stuff">Other
   <a href="http://www.catb.org/~esr/terminfo/">Eric
   Raymond</a>&nbsp;. Unlike the older version, the termcap and
   terminfo data are provided in the same file, which also provides
-  several user-definable extensions beyond the X/Open
+  several user-definable extensions beyond the X/Open Curses
   specification.</p>
 
   <p>You can find lots of information on terminal-related topics
-  not covered in the terminfo file at <a href=
-  "http://web.archive.org/web/*/http://www.cs.utk.edu/~shuford/terminal">
-  Richard Shuford's archive</a>&nbsp;. The collection of computer
-  manuals at <a href=
+  not covered in the terminfo file in <a href=
+  "https://shuford.invisible-island.net/">Richard Shuford's
+  archive</a> (<a href=
+  "http://web.archive.org/web/*/http://www.cs.utk.edu/~shuford/terminal">original</a>).
+  The collection of computer manuals at <a href=
   "http://www.bitsavers.org/pdf/">bitsavers.org</a> has also been
   useful.</p>
 
diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html
index 3c61feef1..3ded34ae5 100644
--- a/doc/html/man/adacursesw6-config.1.html
+++ b/doc/html/man/adacursesw6-config.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010-2014,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKada_config.in,v 1.34 2024/04/20 21:13:27 tom Exp @
+  * @Id: MKada_config.in,v 1.35 2024/04/20 21:13:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>adacursesw6\-config 1 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">adacursesw6\-config 1 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>            User commands           <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">adacursesw6\-config 1 2024-04-20 ncurses 6.4 User commands
 
 
 
-ncurses 6.4                       2024-04-20             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
+ncurses 6.5                       2024-04-20             <STRONG><A HREF="adacursesw6-config.1.html">adacursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fcf71ff7c..92f9905e2 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2024-03-23 ncurses 6.4 User commands</TITLE>
+<TITLE>captoinfo 1m 2024-03-23 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.4 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -194,7 +194,7 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.5                       2024-03-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index a6dbfb607..e7da4da4f 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>clear 1 2024-03-16 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">clear 1 2024-03-16 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -148,7 +148,7 @@ <H1 class="no-header">clear 1 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.5                       2024-03-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 6b90bd0f4..64c645d5a 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -328,7 +328,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index aa3ebaf52..f554061d8 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -124,7 +124,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-04-20               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 2c6c418b1..0a0622e39 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -300,7 +300,7 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 8f3b5b683..a3441e6c9 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index ba4c12dfc..b7f1c689b 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 28199cc21..ce3229acc 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 63d9fb25b..bc1fd859d 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.103 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -254,7 +254,7 @@ <H1 class="no-header">curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
            used for retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
-       the position (<EM>y</EM>, <EM>x</EM>)
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-27                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 1f009d8c1..e3d6c8178 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index fca843e4c..47d2e13b8 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 6f2742de2..a11a68c57 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -177,7 +177,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 8ca35f214..d310dad79 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 77e10da17..e687aa68a 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-04-20               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 7475334cd..058689bfc 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index dc4505fba..d84a57325 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_color 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index d8fcfde0e..ca638df7c 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index c286245de..c9c500146 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 4bf9c804d..e8b3a4682 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 788a90211..291ef67f1 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -167,7 +167,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index efb825e5c..9e18e64f3 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 91ee4e836..c1edf2841 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 4efa9b02f..fd8a8909f 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -424,7 +424,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index d05f6cbaf..0142df971 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 1dafd5c74..185717002 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index f0acbd888..1ea5b63ec 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -93,7 +93,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 1bfc1a6b7..d7af18ddc 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-04-20                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 69b835b24..15bd134e9 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -127,7 +127,7 @@ <H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index e01860a40..1eeb1b3a3 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index cc3a13370..778fc0016 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index c197d4a10..149b2b82b 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -349,7 +349,7 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-04-13                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index f0256e145..7c25b2ed7 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 5b00318eb..f2982eaa1 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -124,7 +124,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index a29cf8ae5..5f60c67c0 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 693f6f76e..04e023992 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 511e1dc13..50d0f20e2 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index ddd51afb2..6c79b595f 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index da9bfd67e..90042caf9 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -208,7 +208,7 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index c4f34e9c7..22f78dddb 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -127,7 +127,7 @@ <H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
index 5ebb8dc22..085e3aba9 100644
--- a/doc/html/man/curs_memleaks.3x.html
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_memleaks 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_memleaks 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_memleaks 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_memleaks 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 
@@ -132,7 +132,7 @@ <H1 class="no-header">curs_memleaks 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                 <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index bf7787862..cdb42f278 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -394,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 190c8ac38..bbab2b871 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.38 2024/04/20 19:51:33 tom Exp @
+  * @Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -60,7 +60,7 @@ <H1 class="no-header">curs_move 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wmove</STRONG>  relocates  the  cursor  associated with the <EM>curses</EM> window <EM>win</EM> to
        line <EM>y</EM> and column  <EM>x</EM>.   The  terminal's  cursor  does  not  move  until
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The position (<EM>x</EM>, <EM>y</EM>) is relative to the upper
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The position (<EM>y</EM>, <EM>x</EM>) is relative to the upper
        left-hand  corner  of  the  window,  which  has   coordinates   (0, 0).
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the <STRONG>move</STRONG> variant of this function.
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2024-04-27                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 7a72b4823..50bb9ee64 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 65efa41b4..7f04d92ea 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 241fd3569..61c4c1999 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index af575097b..ae2759096 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.59 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_pad.3x,v 1.61 2024/04/27 17:55:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -100,7 +100,7 @@ <H1 class="no-header">curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</H1>
        of the pad and screen are involved.
 
        <STRONG>o</STRONG>   <EM>pminrow</EM>  and  <EM>pmincol</EM>  specify  the  upper  left-hand  corner  of a
-           rectanglar view of the pad.
+           rectangular view of the pad.
 
        <STRONG>o</STRONG>   <EM>sminrow</EM>, <EM>smincol</EM>, <EM>smaxrow</EM>, and <EM>smaxcol</EM> specify the vertices of  the
            rectangle to be displayed on the screen.
@@ -230,7 +230,7 @@ <H1 class="no-header">curs_pad 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2024-04-27                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 9dafeabf4..92fb48d47 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_print 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index c02ebf855..259b56121 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -147,7 +147,7 @@ <H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 815754899..4beec325a 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -160,7 +160,7 @@ <H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index c11c049b7..d0b9b7947 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 634608fad..f1759cb3b 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index ec80578d3..5b827fede 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 90e23f516..52f8c29fb 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -313,7 +313,7 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 442944894..7695f68c4 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 84f7a15b0..386b4b4b3 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-04-20                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index cb46f66b3..c2763afe3 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 56620ba91..2bba9d912 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -688,7 +688,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-04-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index a8570f99f..8681a8fe8 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -617,7 +617,7 @@ <H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 08a4d087b..507176628 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index ef2dfcafb..c1ea937fd 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -261,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 9b6c3655f..6160a2cad 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -392,7 +392,7 @@ <H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index e4c90c4cd..92ae9851f 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -266,7 +266,7 @@ <H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-04-13                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-04-13                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 6165a34db..ea99659ec 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -256,7 +256,7 @@ <H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index a2ed976e1..14a0f8e36 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>default_colors 3x 2024-04-13 ncurses 6.4 Library calls</TITLE>
+<TITLE>default_colors 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">default_colors 3x 2024-04-13 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">default_colors 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>               Library calls              <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 
@@ -149,7 +149,7 @@ <H1 class="no-header">default_colors 3x 2024-04-13 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-04-13                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
+ncurses 6.5                       2024-04-13                <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 344af2c31..d135e3109 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>define_key 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 3a3c20199..fcdb7af1f 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html
index 845d5d580..5844dd58d 100644
--- a/doc/html/man/form_cursor.3x.html
+++ b/doc/html/man/form_cursor.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_cursor 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_cursor 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_cursor 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">form_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="form_cursor.3x.html">form_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html
index de14710e9..2f1dc3b90 100644
--- a/doc/html/man/form_data.3x.html
+++ b/doc/html/man/form_data.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_data 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_data 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_data 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_data 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">form_data 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_data.3x.html">form_data(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index a1c536e45..859c291a7 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_driver 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_driver 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_driver 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_driver 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 
@@ -275,7 +275,7 @@ <H1 class="no-header">form_driver 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                   <STRONG><A HREF="form_driver.3x.html">form_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 0c1004bdd..8eb58d4c6 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html
index 2d92d04cb..22afdc679 100644
--- a/doc/html/man/form_field_attributes.3x.html
+++ b/doc/html/man/form_field_attributes.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_attributes 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_attributes 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_attributes 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_attributes 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_field_attributes 3x 2024-03-16 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2024-03-16         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16         <STRONG><A HREF="form_field_attributes.3x.html">form_field_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 90918414c..47d6c8b3e 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -152,7 +152,7 @@ <H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.4 Library calls<
 
 
 
-ncurses 6.4                       2024-03-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index 3c4eb1f51..2090ab669 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_info 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_info 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_info 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_info 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">form_field_info 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16               <STRONG><A HREF="form_field_info.3x.html">form_field_info(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 0a092c4c4..f0bc457fa 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_just 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_just 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_just 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_just 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">form_field_just 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16               <STRONG><A HREF="form_field_just.3x.html">form_field_just(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 461def91d..c7bedd9a2 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -122,7 +122,7 @@ <H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 3e66b8817..52fca0a5a 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 1a55d6e10..128698edb 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.4 Library calls
 
 
 
-ncurses 6.4                       2024-03-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index e3d728068..e66d71c26 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.4 Library ca
 
 
 
-ncurses 6.4                       2024-03-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 167b762c9..369f25c5f 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -183,7 +183,7 @@ <H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 0c41e893d..4845771f8 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_hook 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -137,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 798551d43..7a1877cad 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html
index 75e3db41f..e8a18df4f 100644
--- a/doc/html/man/form_new_page.3x.html
+++ b/doc/html/man/form_new_page.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new_page 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_new_page 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_new_page 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>                Library calls               <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 
@@ -92,7 +92,7 @@ <H1 class="no-header">form_new_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                 <STRONG><A HREF="form_new_page.3x.html">form_new_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 33c8de233..63a9437fc 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index 7d1cc2af7..b882db2be 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_page 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index 2c1e4b590..9f97d3e5e 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_post 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_post 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_post 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">form_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_post.3x.html">form_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index e0ba32106..ecb5992d4 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2024-03-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index 5ccd94f07..db79de202 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index 8d31e086e..68c8e5635 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_variables 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 
@@ -108,7 +108,7 @@ <H1 class="no-header">form_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                <STRONG><A HREF="form_variables.3x.html">form_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index cb6b8d9c3..976ef2714 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>form_win 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 505de42e6..44cb12fb7 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>infocmp 1m 2024-03-16 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2024-03-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index d89146480..4213f6942 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>infotocap 1m 2024-03-16 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 8592ad1bf..453decfdb 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>key_defined 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index ed1e8d59e..e926e77c6 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keybound 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 51ccad84a..f94f82f49 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>keyok 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index 29b42500c..f7b41ba99 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.5                       2024-04-20                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 9f491d486..a499cf1ad 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html
index 8577269a8..3b3f6ea5e 100644
--- a/doc/html/man/menu_attributes.3x.html
+++ b/doc/html/man/menu_attributes.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_attributes 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_attributes 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_attributes 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_attributes 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>              Library calls             <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">menu_attributes 3x 2024-03-16 ncurses 6.4 Library calls</H
 
 
 
-ncurses 6.4                       2024-03-16               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16               <STRONG><A HREF="menu_attributes.3x.html">menu_attributes(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html
index 5b3fd70d2..0003bcdbd 100644
--- a/doc/html/man/menu_cursor.3x.html
+++ b/doc/html/man/menu_cursor.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_cursor 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_cursor 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_cursor 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 
@@ -93,7 +93,7 @@ <H1 class="no-header">menu_cursor 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="menu_cursor.3x.html">menu_cursor(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index a34004287..d82a7f5ce 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_driver 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_driver 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_driver 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 
@@ -223,7 +223,7 @@ <H1 class="no-header">menu_driver 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="menu_driver.3x.html">menu_driver(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 9723b60c6..ddd934cfb 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_format 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_format 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_format 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_format 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 
@@ -106,7 +106,7 @@ <H1 class="no-header">menu_format 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="menu_format.3x.html">menu_format(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 478fcddf6..ca1810c27 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 7e192c3fc..7f1c08249 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_items 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index bb83b9e4d..1cdb2b051 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index b4414da86..e53eacb65 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index a1e6c1226..453526ab2 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index cffb79fa6..34d6f98d2 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index cb204211d..6d48f77b0 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_post 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_post 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_post 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">menu_post 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_post.3x.html">menu_post(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 234f7a410..0a06ada49 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.4 Library calls</
 
 
 
-ncurses 6.4                       2024-03-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 6857baf48..5526b4dea 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -113,7 +113,7 @@ <H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index 5aa7e8f29..d2b52f1df 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index b30b2c213..9688e0f50 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>menu_win 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index dab17faaf..ea8a33f7d 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index e35568d4e..1ff53c8a9 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index acc2a0f88..b4ed66765 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 5b59f6532..537a91301 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -102,7 +102,7 @@ <H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index c1d5b26db..afb442d81 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html
index 164b53d19..01ce5d506 100644
--- a/doc/html/man/mitem_value.3x.html
+++ b/doc/html/man/mitem_value.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_value 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_value 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_value 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_value 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 
@@ -94,7 +94,7 @@ <H1 class="no-header">mitem_value 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                   <STRONG><A HREF="mitem_value.3x.html">mitem_value(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html
index c0758e3d8..8224323f3 100644
--- a/doc/html/man/mitem_visible.3x.html
+++ b/doc/html/man/mitem_visible.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_visible 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>mitem_visible 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_visible 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">mitem_visible 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 
@@ -77,7 +77,7 @@ <H1 class="no-header">mitem_visible 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                 <STRONG><A HREF="mitem_visible.3x.html">mitem_visible(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 741ce949b..9b061acba 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.210 2024/04/20 21:24:19 tom Exp @
+  * @Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-04-20 ncurses 6.4 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.4 (patch 20240420).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240427).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; the reading of terminal
@@ -973,7 +973,7 @@ <H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
        pause after directing a  terminal  to  execute  an  operation  that  it
        performs  slowly,  such  as  clearing  the display.  Many terminal type
        descriptions, including that for the VT100, embed delay  specifications
-       in  capabilities.   You  may  wish  to  use these temrinal descriptions
+       in  capabilities.   You  may  wish  to  use these terminal descriptions
        without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
        value  to disable all but mandatory padding.  Mandatory padding is used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
@@ -1342,126 +1342,127 @@ <H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
        and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
-       Curses, and supports nearly all features of its enhanced level.
+       Curses,  and  supports  all  features  of its enhanced level except the
+       <STRONG>untic</STRONG> utility.
 
-       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
+       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
+       In  many cases, X/Open Curses is vague about error conditions, omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
-       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
-       is  done  primarily  to  guard  against programmer error.  The standard
+       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
+       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
+       is done primarily to guard  against  programmer  error.   The  standard
        interface does not provide a way for the library to tell an application
-       which  of  several  possible errors occurred.  Relying on this (or some
-       other)  extension  adversely  affects   the   portability   of   <EM>curses</EM>
+       which of several possible errors occurred.  Relying on  this  (or  some
+       other)   extension   adversely   affects   the  portability  of  <EM>curses</EM>
        applications.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
-       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
+       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
+       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
-       NUL  bytes  to the device.  This method is slightly more expensive, but
-       narrows  the  interface  to   the   Unix   kernel   significantly   and
+       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
+       NUL bytes to the device.  This method is slightly more  expensive,  but
+       narrows   the   interface   to   the   Unix  kernel  significantly  and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
+           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
-       <STRONG>o</STRONG>   Starting  with 4BSD <EM>curses</EM> (1980) all implementations have provided
+       <STRONG>o</STRONG>   Starting with 4BSD <EM>curses</EM> (1980) all implementations have  provided
            a <EM>curses.h</EM> file.
 
-           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
+           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
-           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
+           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
+           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
+       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
-           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
+           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
+           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
+       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
            <EM>unctrl.h</EM>.
 
-           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
+           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
+       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
            HP-UX and AIX.
 
-           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
+           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  termios.h<EM>.</EM>   Again,  <EM>ncurses</EM>  and
+           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  termios.h<EM>.</EM>   Again, <EM>ncurses</EM> and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
+       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
            require it to do so.
 
-           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
-           and  must  include  both header files in the same module.  Very old
-           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
+           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
+           and must include both header files in the same  module.   Very  old
+           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
            <EM>term.h</EM>.
 
-           The  header  files supplied by <EM>ncurses</EM> include the standard library
-           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
-           files  can  be  included  in  any  order.  But for portability, you
+           The header files supplied by <EM>ncurses</EM> include the  standard  library
+           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
+           files can be included in  any  order.   But  for  portability,  you
            should include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
-           file  does  not  necessarily  make visible all of the symbols in it
+       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
+           file does not necessarily make visible all of  the  symbols  in  it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
-           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
-           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
+           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
+           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
+           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
-           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
-           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
+           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
+           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
+           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
-           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
-           possibility  that  an application might include either <EM>varargs.h</EM> or
-           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
-           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
-           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
-           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
-           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
-           call's  actual  parameters  against the formal ones declared in its
+           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
+           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
+           possibility that an application might include either  <EM>varargs.h</EM>  or
+           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
+           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
+           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
+           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
+           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
+           call's actual parameters against the formal ones  declared  in  its
            prototype.
 
-           No  conforming  implementations  of  X/Open   Curses   require   an
+           No   conforming   implementations   of  X/Open  Curses  require  an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
+           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1475,7 +1476,7 @@ <H1 class="no-header">ncurses 3x 2024-04-20 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-04-20                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-04-27                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index 089096f7b..6380a6dda 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
   * Copyright 2010 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.23 2024/04/20 21:13:38 tom Exp @
+  * @Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.4 User commands</H
 
 
 
-ncurses 6.4                       2024-04-20               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.5                       2024-04-20               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 495f6e656..3cc73d6f3 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>new_pair 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index e585b33c4..58ad42d26 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>panel 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">panel 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -266,7 +266,7 @@ <H1 class="no-header">panel 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 8cca761cf..234914627 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index bb38e5e00..a96342558 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2024-03-23 ncurses 6.4 File formats</TITLE>
+<TITLE>scr_dump 5 2024-03-23 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.4 File formats</H1>
+<H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -390,7 +390,7 @@ <H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-03-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.5                       2024-03-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 5f4818826..5a548fab1 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>tabs 1 2024-04-20 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tabs 1 2024-04-20 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -258,7 +258,7 @@ <H1 class="no-header">tabs 1 2024-04-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2024-04-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 00b75348b..9c9b5b8e5 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2024-04-20 ncurses 6.4 File formats</TITLE>
+<TITLE>term 5 2024-04-20 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2024-04-20 ncurses 6.4 File formats</H1>
+<H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -399,7 +399,7 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-04-20                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.5                       2024-04-20                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 10f65ad26..9a8858878 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2024-03-16 ncurses 6.4 Miscellaneous</TITLE>
+<TITLE>term 7 2024-03-16 ncurses 6.5 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2024-03-16 ncurses 6.4 Miscellaneous</H1>
+<H1 class="no-header">term 7 2024-03-16 ncurses 6.5 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -216,7 +216,7 @@ <H1 class="no-header">term 7 2024-03-16 ncurses 6.4 Miscellaneous</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.5                       2024-03-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index e58834687..99b6786bc 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -34,12 +34,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>term_variables 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -176,7 +176,7 @@ <H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.4 Library calls</H1
 
 
 
-ncurses 6.4                       2024-03-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index febc18338..67061141f 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -39,12 +39,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2024-04-20 ncurses 6.4 File formats</TITLE>
+<TITLE>terminfo 5 2024-04-20 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.4 File formats</H1>
+<H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.4 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.4 (patch 20240420).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240427).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -2487,7 +2487,7 @@ <H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-04-20                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.5                       2024-04-20                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index f2e197d35..e5e610724 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.108 2024/03/16 15:35:01 tom Exp @
+  * @Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2024-03-16 ncurses 6.4 User commands</TITLE>
+<TITLE>tic 1m 2024-04-27 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2024-03-16 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tic 1m 2024-04-27 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -256,63 +256,63 @@ <H1 class="no-header">tic 1m 2024-03-16 ncurses 6.4 User commands</H1>
               translating   from   terminfo   to    termcap,    untranslatable
               capabilities are commented-out.
 
-       <STRONG>-U</STRONG>   tells  <STRONG>tic</STRONG>  to  not post-process the data after parsing the source
-            file.  Normally, it infers data which is commonly missing in older
-            terminfo data, or in termcaps.
+       <STRONG>-U</STRONG>     tells  <STRONG>tic</STRONG> to not post-process the data after parsing the source
+              file.  Normally, it infers data which  is  commonly  missing  in
+              older terminfo data, or in termcaps.
 
-       <STRONG>-V</STRONG>   reports the version of <EM>ncurses</EM> which was used in this program, and
-            exits.
+       <STRONG>-V</STRONG>     reports  the  version of <EM>ncurses</EM> which was used in this program,
+              and exits.
 
-       <STRONG>-v</STRONG><EM>n</EM>  specifies that (verbose) output be written to standard error trace
-            information showing <STRONG>tic</STRONG>'s progress.
+       <STRONG>-v</STRONG><EM>n</EM>    specifies that (verbose) output be  written  to  standard  error
+              trace information showing <STRONG>tic</STRONG>'s progress.
 
-            The  optional  parameter  <EM>n</EM>  is  a  number from 1 to 9, inclusive,
-            indicating the desired level of detail of information.
+              The  optional  parameter  <EM>n</EM>  is a number from 1 to 9, inclusive,
+              indicating the desired level of detail of information.
 
-            <STRONG>o</STRONG>   If <EM>ncurses</EM> is built  without  tracing  support,  the  optional
-                parameter is ignored.
+              <STRONG>o</STRONG>   If <EM>ncurses</EM> is built without tracing  support,  the  optional
+                  parameter is ignored.
 
-            <STRONG>o</STRONG>   If <EM>n</EM> is omitted, the default level is 1.
+              <STRONG>o</STRONG>   If <EM>n</EM> is omitted, the default level is 1.
 
-            <STRONG>o</STRONG>   If  <EM>n</EM>  is specified and greater than 1, the level of detail is
-                increased,  and  the   output   is   written   (with   tracing
-                information) to the "trace" file.
+              <STRONG>o</STRONG>   If <EM>n</EM> is specified and greater than 1, the level of detail is
+                  increased,  and  the  output  is   written   (with   tracing
+                  information) to the "trace" file.
 
-            The debug flag levels are as follows:
+              The debug flag levels are as follows:
 
-            1   Names of files created and linked
+              1   Names of files created and linked
 
-            2   Information related to the "use" facility
+              2   Information related to the "use" facility
 
-            3   Statistics from the hashing algorithm
+              3   Statistics from the hashing algorithm
 
-            4   Details of extended capabilities
+              4   Details of extended capabilities
 
-            5   (unused)
+              5   (unused)
 
-            6   (unused)
+              6   (unused)
 
-            7   Entries into the string-table
+              7   Entries into the string-table
 
-            8   List of tokens encountered by scanner
+              8   List of tokens encountered by scanner
 
-            9   All values computed in construction of the hash table
+              9   All values computed in construction of the hash table
 
-       <STRONG>-W</STRONG>   By  itself,  the  <STRONG>-w</STRONG>  option  will  not  force  long strings to be
-            wrapped.  Use the <STRONG>-W</STRONG> option to do this.
+       <STRONG>-W</STRONG>     By  itself,  the  <STRONG>-w</STRONG>  option  will  not force long strings to be
+              wrapped.  Use the <STRONG>-W</STRONG> option to do this.
 
-            If you specify both <STRONG>-f</STRONG> and <STRONG>-W</STRONG> options, the latter is ignored  when
-            <STRONG>-f</STRONG> has already split the line.
+              If you specify both <STRONG>-f</STRONG> and <STRONG>-W</STRONG> options,  the  latter  is  ignored
+              when <STRONG>-f</STRONG> has already split the line.
 
-       <STRONG>-w</STRONG><EM>n</EM>  specifies the width of the output.  The parameter is optional.  If
-            it is omitted, it defaults to 60.
+       <STRONG>-w</STRONG><EM>n</EM>    specifies  the  width of the output.  The parameter is optional.
+              If it is omitted, it defaults to 60.
 
-       <STRONG>-x</STRONG>   Treat unknown capabilities  as  user-defined  (see  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
-            That  is,  if  you  supply  a  capability  name which <STRONG>tic</STRONG> does not
-            recognize, it will infer its type (Boolean, number or 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 keys.
+       <STRONG>-x</STRONG>     Treat unknown capabilities as user-defined  (see  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>).
+              That  is,  if  you  supply  a capability name which <STRONG>tic</STRONG> does not
+              recognize, it will infer its type (Boolean,  number  or  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 keys.
 
 
 </PRE><H3><a name="h3-Parameters">Parameters</a></H3><PRE>
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2024-03-16 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-03-16                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.5                       2024-04-27                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index f585ce138..c3aca2c59 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>toe 1m 2024-04-20 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">toe 1m 2024-04-20 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -185,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-04-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-04-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.5                       2024-04-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 2292ec3df..ed8fe3805 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>tput 1 2024-04-20 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tput 1 2024-04-20 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -555,7 +555,7 @@ <H1 class="no-header">tput 1 2024-04-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-04-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 3bfe8b6f3..a5669568f 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.83 2024/04/20 19:09:08 tom Exp @
+  * @Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-04-20 ncurses 6.4 User commands</TITLE>
+<TITLE>tset 1 2024-04-27 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-04-20 ncurses 6.4 User commands</H1>
+<H1 class="no-header">tset 1 2024-04-27 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -350,8 +350,8 @@ <H1 class="no-header">tset 1 2024-04-20 ncurses 6.4 User commands</H1>
            to set the window size if <STRONG>tset</STRONG> is not able  to  obtain  the  window
            size from the operating system.
 
-       <STRONG>o</STRONG>   In <EM>ncurses</EM>, <STRONG>tset</STRONG> obtains the window size using <STRONG>setupterm</STRONG>, which may
-           be from the operating system, the  <EM>LINES</EM>  and  <EM>COLUMNS</EM>  environment
+       <STRONG>o</STRONG>   In <EM>ncurses</EM>, <STRONG>tset</STRONG> obtains the window size using <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>, which
+           may be from the operating system, the <EM>LINES</EM> and <EM>COLUMNS</EM> environment
            variables or the terminal description.
 
        Obtaining  the window size from a terminal's type description is common
@@ -393,7 +393,7 @@ <H1 class="no-header">tset 1 2024-04-20 ncurses 6.4 User commands</H1>
 
 
 
-ncurses 6.4                       2024-04-20                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.5                       2024-04-27                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 1c1dac333..10b6f7764 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2024-03-16 ncurses 6.4 File formats</TITLE>
+<TITLE>user_caps 5 2024-03-16 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.4 File formats</H1>
+<H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -403,7 +403,7 @@ <H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.4 File formats</H1>
 
 
 
-ncurses 6.4                       2024-03-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.5                       2024-03-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 38e3ef3c7..b224fd393 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -35,12 +35,12 @@
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-03-16 ncurses 6.4 Library calls</TITLE>
+<TITLE>wresize 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.4 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -95,7 +95,7 @@ <H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.4 Library calls</H1>
 
 
 
-ncurses 6.4                       2024-03-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2024-03-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKada_config.in b/man/MKada_config.in
index a017d09f8..ee037ff4f 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010-2014,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.34 2024/04/20 21:13:27 tom Exp $
+.\" $Id: MKada_config.in,v 1.35 2024/04/20 21:13:27 tom Exp $
 .TH adacurses@USE_CFG_SUFFIX@\-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ds C adacurses@USE_CFG_SUFFIX@\-config
 .ie \n(.g \{\
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 461c84328..14690a544 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2021,2023 Thomas E. Dickey                                *
+.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2010 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.23 2024/04/20 21:13:38 tom Exp $
+.\" $Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp $
 .TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index af275f5aa..37774602b 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.103 2024/04/20 21:24:19 tom Exp $
-.TH curs_attr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp $
+.TH curs_attr 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -312,6 +312,7 @@ Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
 .IR x )
+is outside the window boundaries.
 .\" ---------------------------------------------------------------------------
 .SH NOTES
 These functions may be macros:
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 3966325c4..c3b68e813 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.38 2024/04/20 19:51:33 tom Exp $
-.TH curs_move 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp $
+.TH curs_move 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -52,8 +52,8 @@ and column
 .IR x .
 The terminal's cursor does not move until \fB\%refresh\fP(3X) is called.
 The position
-.RI ( x ,
-.IR y )
+.RI ( y ,
+.IR x )
 is relative to the upper left-hand corner of the window,
 which has coordinates
 (0,\ 0).
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 37118dd00..21cc405c7 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.59 2024/04/20 21:20:07 tom Exp $
-.TH curs_pad 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.61 2024/04/27 17:55:43 tom Exp $
+.TH curs_pad 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -125,7 +125,7 @@ of the pad and screen are involved.
 .I pminrow
 and
 .I pmincol
-specify the upper left-hand corner of a rectanglar view of the pad.
+specify the upper left-hand corner of a rectangular view of the pad.
 .bP
 .IR sminrow ,
 .IR smincol ,
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 18f67c24d..6e2d2b869 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,6 +1,6 @@
-# $Id: manlinks.sed,v 1.20 2024/04/20 22:25:36 tom Exp $
+# $Id: manlinks.sed,v 1.21 2024/04/20 22:25:36 tom Exp $
 ##############################################################################
-# Copyright 2020-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2020-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
diff --git a/man/ncurses.3x b/man/ncurses.3x
index b85946267..9aaa7adf5 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.210 2024/04/20 21:24:19 tom Exp $
-.TH ncurses 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp $
+.TH ncurses 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -1325,7 +1325,7 @@ such as clearing the display.
 Many terminal type descriptions,
 including that for the VT100,
 embed delay specifications in capabilities.
-You may wish to use these temrinal descriptions without paying the
+You may wish to use these terminal descriptions without paying the
 performance penalty.
 Set
 .I \%NCURSES_NO_PADDING
@@ -1942,8 +1942,8 @@ The latter includes several additional features,
 such as wide-character and color support.
 .I \%ncurses
 intends base-level conformance with X/Open Curses,
-and supports nearly all features of its enhanced level.
-.\" XXX: What's missing?  GBR counts untic(1), and that's all.
+and supports all features of its enhanced level
+except the \fB\%untic\fP utility.
 .PP
 Differences between X/Open Curses and
 .I \%ncurses
diff --git a/man/tic.1m b/man/tic.1m
index f949e5a68..9c3181ed5 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.108 2024/03/16 15:35:01 tom Exp $
-.TH @TIC@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp $
+.TH @TIC@ 1M 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -324,7 +324,7 @@ descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo).
 tells \fB@TIC@\fP to discard commented-out capabilities.
 Normally when translating from terminfo to termcap,
 untranslatable capabilities are commented-out.
-.TP 5
+.TP
 \fB\-U\fP
 tells \fB@TIC@\fP to not post-process the data after parsing the source file.
 Normally, it infers data which is commonly missing in older terminfo data,
diff --git a/man/tset.1 b/man/tset.1
index d64f9850f..185227dcd 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.83 2024/04/20 19:09:08 tom Exp $
-.TH @TSET@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp $
+.TH @TSET@ 1 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -391,7 +391,7 @@ to set the window size if \fBtset\fP is not able to obtain the window
 size from the operating system.
 .bP
 In \fI\%ncurses\fP, \fB@TSET@\fP obtains the window size using
-\fBsetupterm\fP, which may be from
+\fB\%setupterm\fP(3X), which may be from
 the operating system,
 the \fILINES\fP and \fICOLUMNS\fP environment variables or
 the terminal description.
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 74d54d4d2..68cda17e7 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.686 2024/04/13 18:59:05 tom Exp $
+ * $Id: curses.priv.h,v 1.687 2024/04/23 22:28:25 tom Exp $
  *
  *	curses.priv.h
  *
@@ -135,6 +135,7 @@ extern int errno;
 
 #ifndef PRIxPTR
 # define PRIxPTR	"lx"
+# undef CASTxPTR
 # define CASTxPTR(n)    (long)(void*)(n)
 #endif
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 929b0a972..cf7773000 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240420) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 929b0a972..cf7773000 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240420) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a32ccc5b3..12ba6fbd9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240420) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2024 06:17:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 9125446d2..2bbc8cc03 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.643 2024/04/20 10:17:21 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.645 2024/04/27 13:56:53 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -8,9 +8,9 @@
 !define EXENAME "ncurses.exe"
 
 !define VERSION_MAJOR "6"
-!define VERSION_MINOR "4"
+!define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0420"
+!define VERSION_MMDD  "0427"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b9ab089ae..3635bbc78 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -2,8 +2,8 @@
 
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
-Version: 6.4
-Release: 20240420
+Version: 6.5
+Release: 20240427
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.map b/package/ncurses.map
index 20552d106..68de9c437 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.57 2023/08/12 15:33:35 tom Exp $
+# $Id: ncurses.map,v 1.58 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1216,7 +1216,7 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_tiparm;
 } NCURSES_TINFO_6.2.20200212;
 
-NCURSES_TINFO_6.4.current {
+NCURSES_TINFO_6.5.20240427 {
 	global:
 		is_cbreak;
 		is_cbreak_sp;
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f72b2ad18..a4a915c11 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
-Version: 6.4
-Release: 20240420
+Version: 6.5
+Release: 20240427
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.map b/package/ncursest.map
index 5642c3b43..1dfbe5325 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.55 2023/08/12 15:33:41 tom Exp $
+# $Id: ncursest.map,v 1.56 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -495,7 +495,7 @@ NCURSES_TINFO_6.2.20211010 {
 		_nc_tiparm;
 } NCURSES_TINFO_6.2.20200212;
 
-NCURSES_TINFO_6.4.current {
+NCURSES_TINFO_6.5.20240427 {
 	global:
 		is_cbreak;
 		is_cbreak_sp;
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9116cb80c..8427530eb 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
-Version: 6.4
-Release: 20240420
+Version: 6.5
+Release: 20240427
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursestw.map b/package/ncursestw.map
index 9ffde606e..116957f54 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.58 2023/08/12 15:33:46 tom Exp $
+# $Id: ncursestw.map,v 1.59 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -503,7 +503,7 @@ NCURSES_TINFO_6.2.20211010 {
 		killwchar_sp;
 } NCURSES_TINFO_6.2.20200212;
 
-NCURSES_TINFO_6.4.current {
+NCURSES_TINFO_6.5.20240427 {
 	global:
 		is_cbreak;
 		is_cbreak_sp;
diff --git a/package/ncursesw.map b/package/ncursesw.map
index 5c484e0ba..55834182d 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.61 2023/08/12 15:33:52 tom Exp $
+# $Id: ncursesw.map,v 1.62 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -497,7 +497,7 @@ NCURSES_TINFO_6.2.20211010 {
 		killwchar_sp;
 } NCURSES_TINFO_6.2.20200212;
 
-NCURSES_TINFO_6.4.current {
+NCURSES_TINFO_6.5.20240427 {
 	global:
 		is_cbreak;
 		is_cbreak_sp;
diff --git a/test/README b/test/README
index 300f9e61c..885349dd0 100644
--- a/test/README
+++ b/test/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2018-2022,2023 Thomas E. Dickey                                 --
+-- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
 -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.80 2023/11/25 21:17:30 tom Exp $
+-- $Id: README,v 1.82 2024/04/27 18:35:01 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -557,7 +557,7 @@ new_prescr			test: sp_tinfo
 newpad				test: ncurses padview popup_msg testcurs
 newpad_sp			lib: ncurses
 newscr				lib: ncurses
-newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_endwin test_setupterm test_termattrs
+newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_endwin test_mouse test_setupterm test_termattrs
 newterm_sp			-
 newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
 newwin_sp			lib: ncurses
@@ -574,7 +574,7 @@ nonl				test: bs demo_forms dup_field hashtest move_field movewindow ncurses pad
 nonl_sp				lib: ncurses
 noqiflush			-
 noqiflush_sp			test: sp_tinfo
-noraw				test: demo_forms demo_menus dup_field move_field ncurses testcurs
+noraw				test: demo_forms demo_menus dup_field move_field ncurses test_mouse testcurs
 noraw_sp			test: sp_tinfo
 notimeout			test: ncurses test_opaque
 numcodes			test: demo_termcap test_arrays progs: dump_entry
@@ -595,7 +595,7 @@ putp_sp				test: sp_tinfo
 putwin				test: ncurses
 qiflush				-
 qiflush_sp			test: sp_tinfo
-raw				test: demo_forms dup_field move_field ncurses redraw testcurs
+raw				test: demo_forms dup_field move_field ncurses redraw test_mouse testcurs
 raw_sp				test: sp_tinfo
 redrawwin			test: combine padview redraw view
 refresh				test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock test_delwin test_endwin test_mouse testcurs view xmas
@@ -637,7 +637,7 @@ set_tabsize_sp			test: sp_tinfo
 set_term			lib: ncurses
 setcchar			test: back_ground combine demo_new_pair demo_panels ins_wide ncurses picsmap savescreen test_add_wchstr test_addwstr
 setscrreg			test: view
-setupterm			test: demo_terminfo dots list_keys sp_tinfo test_mouse test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs progs: clear tabs tput tset
+setupterm			test: demo_terminfo dots list_keys sp_tinfo test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs progs: clear tabs tput tset
 slk_attr			-
 slk_attr_off			-
 slk_attr_on			-

From 34b03eebb13b2ce8630ddb6541dc74477a4283a2 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 27 Apr 2024 21:31:31 +0200
Subject: [PATCH 064/106] ncurses 6.5

---
 ncurses/tinfo/MKcaptab.sh   | 0
 ncurses/tinfo/MKfallback.sh | 0
 ncurses/tinfo/MKuserdefs.sh | 0
 progs/clear.sh              | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 ncurses/tinfo/MKcaptab.sh
 mode change 100644 => 100755 ncurses/tinfo/MKfallback.sh
 mode change 100644 => 100755 ncurses/tinfo/MKuserdefs.sh
 mode change 100644 => 100755 progs/clear.sh

diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh
old mode 100644
new mode 100755
diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
old mode 100644
new mode 100755
diff --git a/ncurses/tinfo/MKuserdefs.sh b/ncurses/tinfo/MKuserdefs.sh
old mode 100644
new mode 100755
diff --git a/progs/clear.sh b/progs/clear.sh
old mode 100644
new mode 100755

From c6d4df72cb557fda896e0a8925823c8704f3c27d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 4 May 2024 22:37:35 +0200
Subject: [PATCH 065/106] ncurses-6.5-20240504.patch.gz

---
 INSTALL                          |  10 +-
 NEWS                             |   6 +-
 VERSION                          |   2 +-
 dist.mk                          |   4 +-
 include/nc_mingw.h               |   8 +-
 include/nc_win32.h               |   8 +-
 ncurses/curses.priv.h            |   4 +-
 ncurses/wcwidth.h                | 741 +++++++++++++++++++++++++------
 ncurses/win32con/wcwidth.c       |  13 +-
 package/debian-mingw/changelog   |   4 +-
 package/debian-mingw64/changelog |   4 +-
 package/debian/changelog         |   4 +-
 package/mingw-ncurses.nsi        |   4 +-
 package/mingw-ncurses.spec       |   2 +-
 package/ncurses.spec             |   2 +-
 package/ncursest.spec            |   2 +-
 16 files changed, 658 insertions(+), 160 deletions(-)

diff --git a/INSTALL b/INSTALL
index a2076eeec..a8198fb5b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.254 2024/04/27 14:21:05 tom Exp $
+-- $Id: INSTALL,v 1.255 2024/05/04 15:54:00 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -1351,11 +1351,9 @@ CONFIGURE OPTIONS:
 	several builds, some symbols will be listed in the the ".map" files
 	that do not happen to be present in one configuration or another.
 
-	The sample ".map" (and ".sym") files are generated using a set of
-	scripts which build several configurations for each release version,
-	checking to see which of the "_nc_" symbols can be made local.  In
-	addition to the ncurses libraries and programs, the symbols used
-	by the "tack" program before version 1.08 are made global.
+	The sample ".map" (and ".sym") files were generated using a set of
+	scripts which built several configurations for each release version,
+	checking to see which of the "_nc_" symbols can be made local.
 
 	These sample ".map" files will not cover all possible combinations.
 	In some cases, e.g., when using the --with-weak-symbols option, you
diff --git a/NEWS b/NEWS
index 8bedbc826..144f70b40 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $
+-- $Id: NEWS,v 1.4117 2024/05/04 18:43:01 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240504
+	+ update ncurses/wcwidth.c, for MinGW ports, from xterm.
+	+ trim obsolete comment about tack from INSTALL.
+
 20240427 6.5 release for upload to ftp.gnu.org
 	+ update announcement
 	+ fixes/corrections for manpages (patches by Branden Robinson).
diff --git a/VERSION b/VERSION
index 8ebef8fe8..b98d7203f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240427
+5:0:10	6.5	20240504
diff --git a/dist.mk b/dist.mk
index 18484d8ca..78d06b88a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1610 2024/04/27 13:55:54 tom Exp $
+# $Id: dist.mk,v 1.1611 2024/05/04 10:21:09 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240427
+NCURSES_PATCH = 20240504
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_mingw.h b/include/nc_mingw.h
index 1bfc4b0d3..c36f22288 100644
--- a/include/nc_mingw.h
+++ b/include/nc_mingw.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_mingw.h,v 1.10 2023/02/25 19:59:24 tom Exp $ */
+/* $Id: nc_mingw.h,v 1.12 2024/05/04 19:16:38 tom Exp $ */
 
 #ifndef NC_MINGW_H
 #define NC_MINGW_H 1
@@ -58,6 +58,8 @@
 #include <winsock2.h>		/* for struct timeval */
 #endif
 
+#include <stdint.h>		/* for uint32_t */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -77,7 +79,7 @@ NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);
 
 #undef wcwidth
 #define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs))
-NCURSES_EXPORT(int) _nc_wcwidth(wchar_t);
+NCURSES_EXPORT(int) _nc_wcwidth(uint32_t);
 
 #ifdef __cplusplus
 }
diff --git a/include/nc_win32.h b/include/nc_win32.h
index e67b8e045..f069d5043 100644
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.10 2023/02/25 20:09:23 tom Exp $ */
+/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
@@ -73,6 +73,8 @@
 #include <winsock2.h>		/* for struct timeval */
 #endif
 
+#include <stdint.h>		/* for uint32_t */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -87,7 +89,7 @@ extern NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);
 
 #undef wcwidth
 #define wcwidth(ucs)  _nc_wcwidth((wchar_t)(ucs))
-extern NCURSES_EXPORT(int)    _nc_wcwidth(wchar_t);
+extern NCURSES_EXPORT(int)    _nc_wcwidth(uint32_t);
 
 #ifdef EVENTLIST_2nd /* test.priv.h just needs the preceding */
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 68cda17e7..bf81cf18a 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.687 2024/04/23 22:28:25 tom Exp $
+ * $Id: curses.priv.h,v 1.688 2024/05/04 18:30:25 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2250,7 +2250,7 @@ extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
 
 #if defined(_NC_WINDOWS) || defined(_NC_MINGW)
 /* see wcwidth.c */
-extern NCURSES_EXPORT(int) mk_wcwidth(wchar_t);
+extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t);
 #define wcwidth(ucs) _nc_wcwidth(ucs)
 #endif
 
diff --git a/ncurses/wcwidth.h b/ncurses/wcwidth.h
index 76673da65..ab96bef13 100644
--- a/ncurses/wcwidth.h
+++ b/ncurses/wcwidth.h
@@ -1,4 +1,57 @@
+/* $Id: wcwidth.h,v 1.6 2024/05/04 18:44:25 tom Exp $ */
+
 /*
+ * Copyright 2002-2023,2024 by Thomas E. Dickey
+ *
+ *                         All Rights Reserved
+ *
+ * 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
+ *-----------------------------------------------------------------------------
+ * This is an updated version of Markus Kuhn's implementation of wcwidth.
+ *
+ * Originally added to xterm in 2000 (patch #141), there were a couple of
+ * updates from Kuhn until 2005 (patch #202), renaming entrypoints and applying
+ * data from Unicode.org (e.g., 3.2, 4.0, 4.1.0).  The Unicode data is
+ * transformed into tables in this file by a script "uniset" written by Kuhn.
+ *
+ * While Kuhn implemented the original CJK variant, it was unused by xterm
+ * until Jungshik Shin used it in 2002 to implement the -cjk_width command-line
+ * option.
+ *
+ * Kuhn added a check for the vertical forms block (double-width) in 2007;
+ * other updates were derived from the Unicode.org data (release 5.0).
+ *
+ * Since then, additional updates have been made:
+ * + data-type fixes
+ * + new Unicode releases (6.2.0, 9.0.0, etc),
+ * + additional special symbol blocks have been added to the special cases.
+ * + soft-hyphen behavior has been made configurable.
+ * + added table shows when a character is not part of Unicode.
+ *
+ * Kuhn's original header follows giving the design information:
+ *-----------------------------------------------------------------------------
  * This is an implementation of wcwidth() and wcswidth() (defined in
  * IEEE Std 1002.1-2001) for Unicode.
  *
@@ -50,13 +103,14 @@
  *
  * http://www.unicode.org/unicode/reports/tr11/
  *
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ * Markus Kuhn -- 2007-05-25 (Unicode 5.0)
  *
  * Permission to use, copy, modify, and distribute this software
  * for any purpose and without fee is hereby granted. The author
  * disclaims all warranties with regard to this software.
  *
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ *-----------------------------------------------------------------------------
  */
 
 #ifndef _WCWIDTH_H_incl
@@ -72,30 +126,42 @@ extern "C" {
 #include <wchar.h>
 
 struct interval {
-  int first;
-  int last;
+  unsigned long first;
+  unsigned long last;
 };
 
+static int use_latin1 = 1;
+
 /* auxiliary function for binary search in interval table */
-static int bisearch(wchar_t ucs, const struct interval *table, int max) {
-  int min = 0;
-  int mid;
-
-  if (ucs < table[0].first || ucs > table[max].last)
-    return 0;
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (ucs > table[mid].last)
-      min = mid + 1;
-    else if (ucs < table[mid].first)
-      max = mid - 1;
-    else
-      return 1;
+static int bisearch(unsigned long ucs, const struct interval *table, int max)
+{
+
+  if (ucs >= table[0].first && ucs <= table[max].last) {
+    int min = 0;
+
+    while (max >= min) {
+      int mid;
+
+      mid = (min + max) / 2;
+      if (ucs > table[mid].last)
+        min = mid + 1;
+      else if (ucs < table[mid].first)
+        max = mid - 1;
+      else
+        return 1;
+    }
   }
 
   return 0;
 }
 
+/*
+ * Provide a way to change the behavior of soft-hyphen.
+ */
+NCURSES_EXPORT(void) mk_wcwidth_init(int mode)
+{
+  use_latin1 = (mode == 0);
+}
 
 /* The following two functions define the column width of an ISO 10646
  * character as follows:
@@ -109,7 +175,10 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
  *      category code Mn or Me in the Unicode database) have a
  *      column width of 0.
  *
- *    - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *    - A few spacing combining marks have a column width of 0.
+ *
+ *    - SOFT HYPHEN (U+00AD) has a column width of 1 in Latin-1, 0 in Unicode.
+ *      An initialization function is used to switch between the two.
  *
  *    - Other format characters (general category code Cf in the Unicode
  *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
@@ -117,115 +186,513 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
  *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
  *      have a column width of 0.
  *
+ *    - Hangul Jamo Extended-B medial vowels and final consonants for old
+ *      Korean (U+D7B0-U+D7FF) have a column width of 0.
+ *
  *    - Spacing characters in the East Asian Wide (W) or East Asian
  *      Full-width (F) category as defined in Unicode Technical
- *      Report #11 have a column width of 2.
+ *      Report #11 have a column width of 2.  In that report, some codes
+ *      were unassigned.  Characters in these blocks use a column width of 1:
+ *          4DC0..4DFF; Yijing Hexagram Symbols
+ *          A960..A97F; Hangul Jamo Extended-A
  *
  *    - All remaining characters (including all printable
  *      ISO 8859-1 and WGL4 characters, Unicode control characters,
  *      etc.) have a column width of 1.
  *
+ *    - Codes which do not correspond to a Unicode character have a column
+ *      width of -1.
+ *
  * This implementation assumes that wchar_t characters are encoded
  * in ISO 10646.
  */
 
-NCURSES_EXPORT(int) mk_wcwidth(wchar_t ucs)
+NCURSES_EXPORT(int) mk_wcwidth(uint32_t ucs)
 {
+  unsigned long cmp = (unsigned long) ucs;
+
+  /* sorted list of non-overlapping intervals of formatting characters */
+  /* generated by
+   *    uniset +cat=Cf -00AD -0600-0605 -061C -06DD -070F c
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset_ctl 1.1 */
+  static const struct interval formatting[] = {
+    { 0x0890, 0x0891 }, { 0x08E2, 0x08E2 }, { 0x180E, 0x180E },
+    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2064 },
+    { 0x2066, 0x206F }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+    { 0x110BD, 0x110BD }, { 0x110CD, 0x110CD }, { 0x13430, 0x1343F },
+    { 0x1BCA0, 0x1BCA3 }, { 0x1D173, 0x1D17A }, { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+  };
+  /* *INDENT-OFF* */
+
   /* sorted list of non-overlapping intervals of non-spacing characters */
-  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+  /* generated by
+   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c 
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset 1.9 */
   static const struct interval combining[] = {
-    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
-    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
-    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
-    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
-    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
-    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
-    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
-    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
-    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
-    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
-    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
-    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
-    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
-    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
-    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
-    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
-    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
-    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
-    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
-    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
-    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+    { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 }, { 0x0600, 0x0605 }, { 0x0610, 0x061A },
+    { 0x061C, 0x061C }, { 0x064B, 0x065F }, { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DD }, { 0x06DF, 0x06E4 }, { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 },
+    { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 },
+    { 0x07FD, 0x07FD }, { 0x0816, 0x0819 }, { 0x081B, 0x0823 },
+    { 0x0825, 0x0827 }, { 0x0829, 0x082D }, { 0x0859, 0x085B },
+    { 0x0898, 0x089F }, { 0x08CA, 0x08E1 }, { 0x08E3, 0x0902 },
+    { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 },
+    { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 },
+    { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 },
+    { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x09FE, 0x09FE },
+    { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 },
+    { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, { 0x0A51, 0x0A51 },
+    { 0x0A70, 0x0A71 }, { 0x0A75, 0x0A75 }, { 0x0A81, 0x0A82 },
+    { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 },
+    { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0AFA, 0x0AFF },
+    { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, { 0x0B3F, 0x0B3F },
+    { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, { 0x0B55, 0x0B56 },
+    { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD }, { 0x0C00, 0x0C00 }, { 0x0C04, 0x0C04 },
+    { 0x0C3C, 0x0C3C }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0C62, 0x0C63 },
+    { 0x0C81, 0x0C81 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF },
+    { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, { 0x0CE2, 0x0CE3 },
+    { 0x0D00, 0x0D01 }, { 0x0D3B, 0x0D3C }, { 0x0D41, 0x0D44 },
+    { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, { 0x0D81, 0x0D81 },
     { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
     { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
-    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
-    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
-    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
-    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
-    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
-    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
-    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
-    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
-    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
-    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
-    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
-    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
-    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
-    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
-    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
-    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
-    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
-    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
-    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
-    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
-    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
-    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
-    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
-    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EBC }, { 0x0EC8, 0x0ECE },
+    { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 },
+    { 0x0F86, 0x0F87 }, { 0x0F8D, 0x0F97 }, { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1037 },
+    { 0x1039, 0x103A }, { 0x103D, 0x103E }, { 0x1058, 0x1059 },
+    { 0x105E, 0x1060 }, { 0x1071, 0x1074 }, { 0x1082, 0x1082 },
+    { 0x1085, 0x1086 }, { 0x108D, 0x108D }, { 0x109D, 0x109D },
+    { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 },
+    { 0x1732, 0x1733 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 },
+    { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 },
+    { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D },
+    { 0x180F, 0x180F }, { 0x1885, 0x1886 }, { 0x18A9, 0x18A9 },
+    { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 },
+    { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, { 0x1A1B, 0x1A1B },
+    { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, { 0x1A60, 0x1A60 },
+    { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C },
+    { 0x1A7F, 0x1A7F }, { 0x1AB0, 0x1ACE }, { 0x1B00, 0x1B03 },
+    { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C },
+    { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 },
+    { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAD },
+    { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED },
+    { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 },
+    { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 },
+    { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1CF8, 0x1CF9 },
+    { 0x1DC0, 0x1DFF }, { 0x20D0, 0x20F0 }, { 0x2CEF, 0x2CF1 },
+    { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, { 0x302A, 0x302D },
+    { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, { 0xA674, 0xA67D },
+    { 0xA69E, 0xA69F }, { 0xA6F0, 0xA6F1 }, { 0xA802, 0xA802 },
+    { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 },
+    { 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 },
+    { 0xA8FF, 0xA8FF }, { 0xA926, 0xA92D }, { 0xA947, 0xA951 },
+    { 0xA980, 0xA982 }, { 0xA9B3, 0xA9B3 }, { 0xA9B6, 0xA9B9 },
+    { 0xA9BC, 0xA9BD }, { 0xA9E5, 0xA9E5 }, { 0xAA29, 0xAA2E },
+    { 0xAA31, 0xAA32 }, { 0xAA35, 0xAA36 }, { 0xAA43, 0xAA43 },
+    { 0xAA4C, 0xAA4C }, { 0xAA7C, 0xAA7C }, { 0xAAB0, 0xAAB0 },
+    { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF },
+    { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 },
+    { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED },
+    { 0xD7B0, 0xD7C6 }, { 0xD7CB, 0xD7FB }, { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE2F }, { 0x101FD, 0x101FD },
+    { 0x102E0, 0x102E0 }, { 0x10376, 0x1037A }, { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 },
+    { 0x10EAB, 0x10EAC }, { 0x10EFD, 0x10EFF }, { 0x10F46, 0x10F50 },
+    { 0x10F82, 0x10F85 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 },
+    { 0x11070, 0x11070 }, { 0x11073, 0x11074 }, { 0x1107F, 0x11081 },
+    { 0x110B3, 0x110B6 }, { 0x110B9, 0x110BA }, { 0x110C2, 0x110C2 },
+    { 0x11100, 0x11102 }, { 0x11127, 0x1112B }, { 0x1112D, 0x11134 },
+    { 0x11173, 0x11173 }, { 0x11180, 0x11181 }, { 0x111B6, 0x111BE },
+    { 0x111C9, 0x111CC }, { 0x111CF, 0x111CF }, { 0x1122F, 0x11231 },
+    { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, { 0x1123E, 0x1123E },
+    { 0x11241, 0x11241 }, { 0x112DF, 0x112DF }, { 0x112E3, 0x112EA },
+    { 0x11300, 0x11301 }, { 0x1133B, 0x1133C }, { 0x11340, 0x11340 },
+    { 0x11366, 0x1136C }, { 0x11370, 0x11374 }, { 0x11438, 0x1143F },
+    { 0x11442, 0x11444 }, { 0x11446, 0x11446 }, { 0x1145E, 0x1145E },
+    { 0x114B3, 0x114B8 }, { 0x114BA, 0x114BA }, { 0x114BF, 0x114C0 },
+    { 0x114C2, 0x114C3 }, { 0x115B2, 0x115B5 }, { 0x115BC, 0x115BD },
+    { 0x115BF, 0x115C0 }, { 0x115DC, 0x115DD }, { 0x11633, 0x1163A },
+    { 0x1163D, 0x1163D }, { 0x1163F, 0x11640 }, { 0x116AB, 0x116AB },
+    { 0x116AD, 0x116AD }, { 0x116B0, 0x116B5 }, { 0x116B7, 0x116B7 },
+    { 0x1171D, 0x1171F }, { 0x11722, 0x11725 }, { 0x11727, 0x1172B },
+    { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, { 0x1193B, 0x1193C },
+    { 0x1193E, 0x1193E }, { 0x11943, 0x11943 }, { 0x119D4, 0x119D7 },
+    { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, { 0x11A01, 0x11A0A },
+    { 0x11A33, 0x11A38 }, { 0x11A3B, 0x11A3E }, { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 }, { 0x11A59, 0x11A5B }, { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 }, { 0x11C30, 0x11C36 }, { 0x11C38, 0x11C3D },
+    { 0x11C3F, 0x11C3F }, { 0x11C92, 0x11CA7 }, { 0x11CAA, 0x11CB0 },
+    { 0x11CB2, 0x11CB3 }, { 0x11CB5, 0x11CB6 }, { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A }, { 0x11D3C, 0x11D3D }, { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 }, { 0x11D90, 0x11D91 }, { 0x11D95, 0x11D95 },
+    { 0x11D97, 0x11D97 }, { 0x11EF3, 0x11EF4 }, { 0x11F00, 0x11F01 },
+    { 0x11F36, 0x11F3A }, { 0x11F40, 0x11F40 }, { 0x11F42, 0x11F42 },
+    { 0x13440, 0x13440 }, { 0x13447, 0x13455 }, { 0x16AF0, 0x16AF4 },
+    { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 },
+    { 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1CF00, 0x1CF2D },
+    { 0x1CF30, 0x1CF46 }, { 0x1D167, 0x1D169 }, { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 },
+    { 0x1DA00, 0x1DA36 }, { 0x1DA3B, 0x1DA6C }, { 0x1DA75, 0x1DA75 },
+    { 0x1DA84, 0x1DA84 }, { 0x1DA9B, 0x1DA9F }, { 0x1DAA1, 0x1DAAF },
+    { 0x1E000, 0x1E006 }, { 0x1E008, 0x1E018 }, { 0x1E01B, 0x1E021 },
+    { 0x1E023, 0x1E024 }, { 0x1E026, 0x1E02A }, { 0x1E08F, 0x1E08F },
+    { 0x1E130, 0x1E136 }, { 0x1E2AE, 0x1E2AE }, { 0x1E2EC, 0x1E2EF },
+    { 0x1E4EC, 0x1E4EF }, { 0x1E8D0, 0x1E8D6 }, { 0x1E944, 0x1E94A },
     { 0xE0100, 0xE01EF }
   };
+  /* *INDENT-ON* */
+
+  /* sorted list of non-overlapping intervals of non-characters */
+  /* generated by
+   *    uniset +0000..DFFF -4e00..9fd5 +F900..10FFFD unknown +2028..2029 c
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset_unk 1.6 */
+  static const struct interval unknowns[] = {
+    { 0x0378, 0x0379 }, { 0x0380, 0x0383 }, { 0x038B, 0x038B },
+    { 0x038D, 0x038D }, { 0x03A2, 0x03A2 }, { 0x0530, 0x0530 },
+    { 0x0557, 0x0558 }, { 0x058B, 0x058C }, { 0x0590, 0x0590 },
+    { 0x05C8, 0x05CF }, { 0x05EB, 0x05EE }, { 0x05F5, 0x05FF },
+    { 0x070E, 0x070E }, { 0x074B, 0x074C }, { 0x07B2, 0x07BF },
+    { 0x07FB, 0x07FC }, { 0x082E, 0x082F }, { 0x083F, 0x083F },
+    { 0x085C, 0x085D }, { 0x085F, 0x085F }, { 0x086B, 0x086F },
+    { 0x088F, 0x088F }, { 0x0892, 0x0897 }, { 0x0984, 0x0984 },
+    { 0x098D, 0x098E }, { 0x0991, 0x0992 }, { 0x09A9, 0x09A9 },
+    { 0x09B1, 0x09B1 }, { 0x09B3, 0x09B5 }, { 0x09BA, 0x09BB },
+    { 0x09C5, 0x09C6 }, { 0x09C9, 0x09CA }, { 0x09CF, 0x09D6 },
+    { 0x09D8, 0x09DB }, { 0x09DE, 0x09DE }, { 0x09E4, 0x09E5 },
+    { 0x09FF, 0x0A00 }, { 0x0A04, 0x0A04 }, { 0x0A0B, 0x0A0E },
+    { 0x0A11, 0x0A12 }, { 0x0A29, 0x0A29 }, { 0x0A31, 0x0A31 },
+    { 0x0A34, 0x0A34 }, { 0x0A37, 0x0A37 }, { 0x0A3A, 0x0A3B },
+    { 0x0A3D, 0x0A3D }, { 0x0A43, 0x0A46 }, { 0x0A49, 0x0A4A },
+    { 0x0A4E, 0x0A50 }, { 0x0A52, 0x0A58 }, { 0x0A5D, 0x0A5D },
+    { 0x0A5F, 0x0A65 }, { 0x0A77, 0x0A80 }, { 0x0A84, 0x0A84 },
+    { 0x0A8E, 0x0A8E }, { 0x0A92, 0x0A92 }, { 0x0AA9, 0x0AA9 },
+    { 0x0AB1, 0x0AB1 }, { 0x0AB4, 0x0AB4 }, { 0x0ABA, 0x0ABB },
+    { 0x0AC6, 0x0AC6 }, { 0x0ACA, 0x0ACA }, { 0x0ACE, 0x0ACF },
+    { 0x0AD1, 0x0ADF }, { 0x0AE4, 0x0AE5 }, { 0x0AF2, 0x0AF8 },
+    { 0x0B00, 0x0B00 }, { 0x0B04, 0x0B04 }, { 0x0B0D, 0x0B0E },
+    { 0x0B11, 0x0B12 }, { 0x0B29, 0x0B29 }, { 0x0B31, 0x0B31 },
+    { 0x0B34, 0x0B34 }, { 0x0B3A, 0x0B3B }, { 0x0B45, 0x0B46 },
+    { 0x0B49, 0x0B4A }, { 0x0B4E, 0x0B54 }, { 0x0B58, 0x0B5B },
+    { 0x0B5E, 0x0B5E }, { 0x0B64, 0x0B65 }, { 0x0B78, 0x0B81 },
+    { 0x0B84, 0x0B84 }, { 0x0B8B, 0x0B8D }, { 0x0B91, 0x0B91 },
+    { 0x0B96, 0x0B98 }, { 0x0B9B, 0x0B9B }, { 0x0B9D, 0x0B9D },
+    { 0x0BA0, 0x0BA2 }, { 0x0BA5, 0x0BA7 }, { 0x0BAB, 0x0BAD },
+    { 0x0BBA, 0x0BBD }, { 0x0BC3, 0x0BC5 }, { 0x0BC9, 0x0BC9 },
+    { 0x0BCE, 0x0BCF }, { 0x0BD1, 0x0BD6 }, { 0x0BD8, 0x0BE5 },
+    { 0x0BFB, 0x0BFF }, { 0x0C0D, 0x0C0D }, { 0x0C11, 0x0C11 },
+    { 0x0C29, 0x0C29 }, { 0x0C3A, 0x0C3B }, { 0x0C45, 0x0C45 },
+    { 0x0C49, 0x0C49 }, { 0x0C4E, 0x0C54 }, { 0x0C57, 0x0C57 },
+    { 0x0C5B, 0x0C5C }, { 0x0C5E, 0x0C5F }, { 0x0C64, 0x0C65 },
+    { 0x0C70, 0x0C76 }, { 0x0C8D, 0x0C8D }, { 0x0C91, 0x0C91 },
+    { 0x0CA9, 0x0CA9 }, { 0x0CB4, 0x0CB4 }, { 0x0CBA, 0x0CBB },
+    { 0x0CC5, 0x0CC5 }, { 0x0CC9, 0x0CC9 }, { 0x0CCE, 0x0CD4 },
+    { 0x0CD7, 0x0CDC }, { 0x0CDF, 0x0CDF }, { 0x0CE4, 0x0CE5 },
+    { 0x0CF0, 0x0CF0 }, { 0x0CF4, 0x0CFF }, { 0x0D0D, 0x0D0D },
+    { 0x0D11, 0x0D11 }, { 0x0D45, 0x0D45 }, { 0x0D49, 0x0D49 },
+    { 0x0D50, 0x0D53 }, { 0x0D64, 0x0D65 }, { 0x0D80, 0x0D80 },
+    { 0x0D84, 0x0D84 }, { 0x0D97, 0x0D99 }, { 0x0DB2, 0x0DB2 },
+    { 0x0DBC, 0x0DBC }, { 0x0DBE, 0x0DBF }, { 0x0DC7, 0x0DC9 },
+    { 0x0DCB, 0x0DCE }, { 0x0DD5, 0x0DD5 }, { 0x0DD7, 0x0DD7 },
+    { 0x0DE0, 0x0DE5 }, { 0x0DF0, 0x0DF1 }, { 0x0DF5, 0x0E00 },
+    { 0x0E3B, 0x0E3E }, { 0x0E5C, 0x0E80 }, { 0x0E83, 0x0E83 },
+    { 0x0E85, 0x0E85 }, { 0x0E8B, 0x0E8B }, { 0x0EA4, 0x0EA4 },
+    { 0x0EA6, 0x0EA6 }, { 0x0EBE, 0x0EBF }, { 0x0EC5, 0x0EC5 },
+    { 0x0EC7, 0x0EC7 }, { 0x0ECF, 0x0ECF }, { 0x0EDA, 0x0EDB },
+    { 0x0EE0, 0x0EFF }, { 0x0F48, 0x0F48 }, { 0x0F6D, 0x0F70 },
+    { 0x0F98, 0x0F98 }, { 0x0FBD, 0x0FBD }, { 0x0FCD, 0x0FCD },
+    { 0x0FDB, 0x0FFF }, { 0x10C6, 0x10C6 }, { 0x10C8, 0x10CC },
+    { 0x10CE, 0x10CF }, { 0x1249, 0x1249 }, { 0x124E, 0x124F },
+    { 0x1257, 0x1257 }, { 0x1259, 0x1259 }, { 0x125E, 0x125F },
+    { 0x1289, 0x1289 }, { 0x128E, 0x128F }, { 0x12B1, 0x12B1 },
+    { 0x12B6, 0x12B7 }, { 0x12BF, 0x12BF }, { 0x12C1, 0x12C1 },
+    { 0x12C6, 0x12C7 }, { 0x12D7, 0x12D7 }, { 0x1311, 0x1311 },
+    { 0x1316, 0x1317 }, { 0x135B, 0x135C }, { 0x137D, 0x137F },
+    { 0x139A, 0x139F }, { 0x13F6, 0x13F7 }, { 0x13FE, 0x13FF },
+    { 0x169D, 0x169F }, { 0x16F9, 0x16FF }, { 0x1716, 0x171E },
+    { 0x1737, 0x173F }, { 0x1754, 0x175F }, { 0x176D, 0x176D },
+    { 0x1771, 0x1771 }, { 0x1774, 0x177F }, { 0x17DE, 0x17DF },
+    { 0x17EA, 0x17EF }, { 0x17FA, 0x17FF }, { 0x181A, 0x181F },
+    { 0x1879, 0x187F }, { 0x18AB, 0x18AF }, { 0x18F6, 0x18FF },
+    { 0x191F, 0x191F }, { 0x192C, 0x192F }, { 0x193C, 0x193F },
+    { 0x1941, 0x1943 }, { 0x196E, 0x196F }, { 0x1975, 0x197F },
+    { 0x19AC, 0x19AF }, { 0x19CA, 0x19CF }, { 0x19DB, 0x19DD },
+    { 0x1A1C, 0x1A1D }, { 0x1A5F, 0x1A5F }, { 0x1A7D, 0x1A7E },
+    { 0x1A8A, 0x1A8F }, { 0x1A9A, 0x1A9F }, { 0x1AAE, 0x1AAF },
+    { 0x1ACF, 0x1AFF }, { 0x1B4D, 0x1B4F }, { 0x1B7F, 0x1B7F },
+    { 0x1BF4, 0x1BFB }, { 0x1C38, 0x1C3A }, { 0x1C4A, 0x1C4C },
+    { 0x1C89, 0x1C8F }, { 0x1CBB, 0x1CBC }, { 0x1CC8, 0x1CCF },
+    { 0x1CFB, 0x1CFF }, { 0x1F16, 0x1F17 }, { 0x1F1E, 0x1F1F },
+    { 0x1F46, 0x1F47 }, { 0x1F4E, 0x1F4F }, { 0x1F58, 0x1F58 },
+    { 0x1F5A, 0x1F5A }, { 0x1F5C, 0x1F5C }, { 0x1F5E, 0x1F5E },
+    { 0x1F7E, 0x1F7F }, { 0x1FB5, 0x1FB5 }, { 0x1FC5, 0x1FC5 },
+    { 0x1FD4, 0x1FD5 }, { 0x1FDC, 0x1FDC }, { 0x1FF0, 0x1FF1 },
+    { 0x1FF5, 0x1FF5 }, { 0x1FFF, 0x1FFF }, { 0x2028, 0x2029 },
+    { 0x2065, 0x2065 }, { 0x2072, 0x2073 }, { 0x208F, 0x208F },
+    { 0x209D, 0x209F }, { 0x20C1, 0x20CF }, { 0x20F1, 0x20FF },
+    { 0x218C, 0x218F }, { 0x2427, 0x243F }, { 0x244B, 0x245F },
+    { 0x2B74, 0x2B75 }, { 0x2B96, 0x2B96 }, { 0x2CF4, 0x2CF8 },
+    { 0x2D26, 0x2D26 }, { 0x2D28, 0x2D2C }, { 0x2D2E, 0x2D2F },
+    { 0x2D68, 0x2D6E }, { 0x2D71, 0x2D7E }, { 0x2D97, 0x2D9F },
+    { 0x2DA7, 0x2DA7 }, { 0x2DAF, 0x2DAF }, { 0x2DB7, 0x2DB7 },
+    { 0x2DBF, 0x2DBF }, { 0x2DC7, 0x2DC7 }, { 0x2DCF, 0x2DCF },
+    { 0x2DD7, 0x2DD7 }, { 0x2DDF, 0x2DDF }, { 0x2E5E, 0x2E7F },
+    { 0x2E9A, 0x2E9A }, { 0x2EF4, 0x2EFF }, { 0x2FD6, 0x2FEF },
+    { 0x3040, 0x3040 }, { 0x3097, 0x3098 }, { 0x3100, 0x3104 },
+    { 0x3130, 0x3130 }, { 0x318F, 0x318F }, { 0x31E4, 0x31EE },
+    { 0x321F, 0x321F }, { 0x4DB6, 0x4DBF }, { 0x9FD6, 0x9FFF },
+    { 0xA48D, 0xA48F }, { 0xA4C7, 0xA4CF }, { 0xA62C, 0xA63F },
+    { 0xA6F8, 0xA6FF }, { 0xA7CB, 0xA7CF }, { 0xA7D2, 0xA7D2 },
+    { 0xA7D4, 0xA7D4 }, { 0xA7DA, 0xA7F1 }, { 0xA82D, 0xA82F },
+    { 0xA83A, 0xA83F }, { 0xA878, 0xA87F }, { 0xA8C6, 0xA8CD },
+    { 0xA8DA, 0xA8DF }, { 0xA954, 0xA95E }, { 0xA97D, 0xA97F },
+    { 0xA9CE, 0xA9CE }, { 0xA9DA, 0xA9DD }, { 0xA9FF, 0xA9FF },
+    { 0xAA37, 0xAA3F }, { 0xAA4E, 0xAA4F }, { 0xAA5A, 0xAA5B },
+    { 0xAAC3, 0xAADA }, { 0xAAF7, 0xAB00 }, { 0xAB07, 0xAB08 },
+    { 0xAB0F, 0xAB10 }, { 0xAB17, 0xAB1F }, { 0xAB27, 0xAB27 },
+    { 0xAB2F, 0xAB2F }, { 0xAB6C, 0xAB6F }, { 0xABEE, 0xABEF },
+    { 0xABFA, 0xABFF }, { 0xD7A4, 0xD7AF }, { 0xD7C7, 0xD7CA },
+    { 0xD7FC, 0xDFFF }, { 0xFA6E, 0xFA6F }, { 0xFADA, 0xFAFF },
+    { 0xFB07, 0xFB12 }, { 0xFB18, 0xFB1C }, { 0xFB37, 0xFB37 },
+    { 0xFB3D, 0xFB3D }, { 0xFB3F, 0xFB3F }, { 0xFB42, 0xFB42 },
+    { 0xFB45, 0xFB45 }, { 0xFBC3, 0xFBD2 }, { 0xFD90, 0xFD91 },
+    { 0xFDC8, 0xFDCE }, { 0xFDD0, 0xFDEF }, { 0xFE1A, 0xFE1F },
+    { 0xFE53, 0xFE53 }, { 0xFE67, 0xFE67 }, { 0xFE6C, 0xFE6F },
+    { 0xFE75, 0xFE75 }, { 0xFEFD, 0xFEFE }, { 0xFF00, 0xFF00 },
+    { 0xFFBF, 0xFFC1 }, { 0xFFC8, 0xFFC9 }, { 0xFFD0, 0xFFD1 },
+    { 0xFFD8, 0xFFD9 }, { 0xFFDD, 0xFFDF }, { 0xFFE7, 0xFFE7 },
+    { 0xFFEF, 0xFFF8 }, { 0xFFFE, 0xFFFF }, { 0x1000C, 0x1000C },
+    { 0x10027, 0x10027 }, { 0x1003B, 0x1003B }, { 0x1003E, 0x1003E },
+    { 0x1004E, 0x1004F }, { 0x1005E, 0x1007F }, { 0x100FB, 0x100FF },
+    { 0x10103, 0x10106 }, { 0x10134, 0x10136 }, { 0x1018F, 0x1018F },
+    { 0x1019D, 0x1019F }, { 0x101A1, 0x101CF }, { 0x101FE, 0x1027F },
+    { 0x1029D, 0x1029F }, { 0x102D1, 0x102DF }, { 0x102FC, 0x102FF },
+    { 0x10324, 0x1032C }, { 0x1034B, 0x1034F }, { 0x1037B, 0x1037F },
+    { 0x1039E, 0x1039E }, { 0x103C4, 0x103C7 }, { 0x103D6, 0x103FF },
+    { 0x1049E, 0x1049F }, { 0x104AA, 0x104AF }, { 0x104D4, 0x104D7 },
+    { 0x104FC, 0x104FF }, { 0x10528, 0x1052F }, { 0x10564, 0x1056E },
+    { 0x1057B, 0x1057B }, { 0x1058B, 0x1058B }, { 0x10593, 0x10593 },
+    { 0x10596, 0x10596 }, { 0x105A2, 0x105A2 }, { 0x105B2, 0x105B2 },
+    { 0x105BA, 0x105BA }, { 0x105BD, 0x105FF }, { 0x10737, 0x1073F },
+    { 0x10756, 0x1075F }, { 0x10768, 0x1077F }, { 0x10786, 0x10786 },
+    { 0x107B1, 0x107B1 }, { 0x107BB, 0x107FF }, { 0x10806, 0x10807 },
+    { 0x10809, 0x10809 }, { 0x10836, 0x10836 }, { 0x10839, 0x1083B },
+    { 0x1083D, 0x1083E }, { 0x10856, 0x10856 }, { 0x1089F, 0x108A6 },
+    { 0x108B0, 0x108DF }, { 0x108F3, 0x108F3 }, { 0x108F6, 0x108FA },
+    { 0x1091C, 0x1091E }, { 0x1093A, 0x1093E }, { 0x10940, 0x1097F },
+    { 0x109B8, 0x109BB }, { 0x109D0, 0x109D1 }, { 0x10A04, 0x10A04 },
+    { 0x10A07, 0x10A0B }, { 0x10A14, 0x10A14 }, { 0x10A18, 0x10A18 },
+    { 0x10A36, 0x10A37 }, { 0x10A3B, 0x10A3E }, { 0x10A49, 0x10A4F },
+    { 0x10A59, 0x10A5F }, { 0x10AA0, 0x10ABF }, { 0x10AE7, 0x10AEA },
+    { 0x10AF7, 0x10AFF }, { 0x10B36, 0x10B38 }, { 0x10B56, 0x10B57 },
+    { 0x10B73, 0x10B77 }, { 0x10B92, 0x10B98 }, { 0x10B9D, 0x10BA8 },
+    { 0x10BB0, 0x10BFF }, { 0x10C49, 0x10C7F }, { 0x10CB3, 0x10CBF },
+    { 0x10CF3, 0x10CF9 }, { 0x10D28, 0x10D2F }, { 0x10D3A, 0x10E5F },
+    { 0x10E7F, 0x10E7F }, { 0x10EAA, 0x10EAA }, { 0x10EAE, 0x10EAF },
+    { 0x10EB2, 0x10EFC }, { 0x10F28, 0x10F2F }, { 0x10F5A, 0x10F6F },
+    { 0x10F8A, 0x10FAF }, { 0x10FCC, 0x10FDF }, { 0x10FF7, 0x10FFF },
+    { 0x1104E, 0x11051 }, { 0x11076, 0x1107E }, { 0x110C3, 0x110CC },
+    { 0x110CE, 0x110CF }, { 0x110E9, 0x110EF }, { 0x110FA, 0x110FF },
+    { 0x11135, 0x11135 }, { 0x11148, 0x1114F }, { 0x11177, 0x1117F },
+    { 0x111E0, 0x111E0 }, { 0x111F5, 0x111FF }, { 0x11212, 0x11212 },
+    { 0x11242, 0x1127F }, { 0x11287, 0x11287 }, { 0x11289, 0x11289 },
+    { 0x1128E, 0x1128E }, { 0x1129E, 0x1129E }, { 0x112AA, 0x112AF },
+    { 0x112EB, 0x112EF }, { 0x112FA, 0x112FF }, { 0x11304, 0x11304 },
+    { 0x1130D, 0x1130E }, { 0x11311, 0x11312 }, { 0x11329, 0x11329 },
+    { 0x11331, 0x11331 }, { 0x11334, 0x11334 }, { 0x1133A, 0x1133A },
+    { 0x11345, 0x11346 }, { 0x11349, 0x1134A }, { 0x1134E, 0x1134F },
+    { 0x11351, 0x11356 }, { 0x11358, 0x1135C }, { 0x11364, 0x11365 },
+    { 0x1136D, 0x1136F }, { 0x11375, 0x113FF }, { 0x1145C, 0x1145C },
+    { 0x11462, 0x1147F }, { 0x114C8, 0x114CF }, { 0x114DA, 0x1157F },
+    { 0x115B6, 0x115B7 }, { 0x115DE, 0x115FF }, { 0x11645, 0x1164F },
+    { 0x1165A, 0x1165F }, { 0x1166D, 0x1167F }, { 0x116BA, 0x116BF },
+    { 0x116CA, 0x116FF }, { 0x1171B, 0x1171C }, { 0x1172C, 0x1172F },
+    { 0x11747, 0x117FF }, { 0x1183C, 0x1189F }, { 0x118F3, 0x118FE },
+    { 0x11907, 0x11908 }, { 0x1190A, 0x1190B }, { 0x11914, 0x11914 },
+    { 0x11917, 0x11917 }, { 0x11936, 0x11936 }, { 0x11939, 0x1193A },
+    { 0x11947, 0x1194F }, { 0x1195A, 0x1199F }, { 0x119A8, 0x119A9 },
+    { 0x119D8, 0x119D9 }, { 0x119E5, 0x119FF }, { 0x11A48, 0x11A4F },
+    { 0x11AA3, 0x11AAF }, { 0x11AF9, 0x11AFF }, { 0x11B0A, 0x11BFF },
+    { 0x11C09, 0x11C09 }, { 0x11C37, 0x11C37 }, { 0x11C46, 0x11C4F },
+    { 0x11C6D, 0x11C6F }, { 0x11C90, 0x11C91 }, { 0x11CA8, 0x11CA8 },
+    { 0x11CB7, 0x11CFF }, { 0x11D07, 0x11D07 }, { 0x11D0A, 0x11D0A },
+    { 0x11D37, 0x11D39 }, { 0x11D3B, 0x11D3B }, { 0x11D3E, 0x11D3E },
+    { 0x11D48, 0x11D4F }, { 0x11D5A, 0x11D5F }, { 0x11D66, 0x11D66 },
+    { 0x11D69, 0x11D69 }, { 0x11D8F, 0x11D8F }, { 0x11D92, 0x11D92 },
+    { 0x11D99, 0x11D9F }, { 0x11DAA, 0x11EDF }, { 0x11EF9, 0x11EFF },
+    { 0x11F11, 0x11F11 }, { 0x11F3B, 0x11F3D }, { 0x11F5A, 0x11FAF },
+    { 0x11FB1, 0x11FBF }, { 0x11FF2, 0x11FFE }, { 0x1239A, 0x123FF },
+    { 0x1246F, 0x1246F }, { 0x12475, 0x1247F }, { 0x12544, 0x12F8F },
+    { 0x12FF3, 0x12FFF }, { 0x13456, 0x143FF }, { 0x14647, 0x167FF },
+    { 0x16A39, 0x16A3F }, { 0x16A5F, 0x16A5F }, { 0x16A6A, 0x16A6D },
+    { 0x16ABF, 0x16ABF }, { 0x16ACA, 0x16ACF }, { 0x16AEE, 0x16AEF },
+    { 0x16AF6, 0x16AFF }, { 0x16B46, 0x16B4F }, { 0x16B5A, 0x16B5A },
+    { 0x16B62, 0x16B62 }, { 0x16B78, 0x16B7C }, { 0x16B90, 0x16E3F },
+    { 0x16E9B, 0x16EFF }, { 0x16F4B, 0x16F4E }, { 0x16F88, 0x16F8E },
+    { 0x16FA0, 0x16FDF }, { 0x16FE5, 0x16FEF }, { 0x16FF2, 0x187FF },
+    { 0x18CD6, 0x1AFEF }, { 0x1AFF4, 0x1AFF4 }, { 0x1AFFC, 0x1AFFC },
+    { 0x1AFFF, 0x1AFFF }, { 0x1B123, 0x1B131 }, { 0x1B133, 0x1B14F },
+    { 0x1B153, 0x1B154 }, { 0x1B156, 0x1B163 }, { 0x1B168, 0x1B16F },
+    { 0x1B2FC, 0x1BBFF }, { 0x1BC6B, 0x1BC6F }, { 0x1BC7D, 0x1BC7F },
+    { 0x1BC89, 0x1BC8F }, { 0x1BC9A, 0x1BC9B }, { 0x1BCA4, 0x1CEFF },
+    { 0x1CF2E, 0x1CF2F }, { 0x1CF47, 0x1CF4F }, { 0x1CFC4, 0x1CFFF },
+    { 0x1D0F6, 0x1D0FF }, { 0x1D127, 0x1D128 }, { 0x1D1EB, 0x1D1FF },
+    { 0x1D246, 0x1D2BF }, { 0x1D2D4, 0x1D2DF }, { 0x1D2F4, 0x1D2FF },
+    { 0x1D357, 0x1D35F }, { 0x1D379, 0x1D3FF }, { 0x1D455, 0x1D455 },
+    { 0x1D49D, 0x1D49D }, { 0x1D4A0, 0x1D4A1 }, { 0x1D4A3, 0x1D4A4 },
+    { 0x1D4A7, 0x1D4A8 }, { 0x1D4AD, 0x1D4AD }, { 0x1D4BA, 0x1D4BA },
+    { 0x1D4BC, 0x1D4BC }, { 0x1D4C4, 0x1D4C4 }, { 0x1D506, 0x1D506 },
+    { 0x1D50B, 0x1D50C }, { 0x1D515, 0x1D515 }, { 0x1D51D, 0x1D51D },
+    { 0x1D53A, 0x1D53A }, { 0x1D53F, 0x1D53F }, { 0x1D545, 0x1D545 },
+    { 0x1D547, 0x1D549 }, { 0x1D551, 0x1D551 }, { 0x1D6A6, 0x1D6A7 },
+    { 0x1D7CC, 0x1D7CD }, { 0x1DA8C, 0x1DA9A }, { 0x1DAA0, 0x1DAA0 },
+    { 0x1DAB0, 0x1DEFF }, { 0x1DF1F, 0x1DF24 }, { 0x1DF2B, 0x1DFFF },
+    { 0x1E007, 0x1E007 }, { 0x1E019, 0x1E01A }, { 0x1E022, 0x1E022 },
+    { 0x1E025, 0x1E025 }, { 0x1E02B, 0x1E02F }, { 0x1E06E, 0x1E08E },
+    { 0x1E090, 0x1E0FF }, { 0x1E12D, 0x1E12F }, { 0x1E13E, 0x1E13F },
+    { 0x1E14A, 0x1E14D }, { 0x1E150, 0x1E28F }, { 0x1E2AF, 0x1E2BF },
+    { 0x1E2FA, 0x1E2FE }, { 0x1E300, 0x1E4CF }, { 0x1E4FA, 0x1E7DF },
+    { 0x1E7E7, 0x1E7E7 }, { 0x1E7EC, 0x1E7EC }, { 0x1E7EF, 0x1E7EF },
+    { 0x1E7FF, 0x1E7FF }, { 0x1E8C5, 0x1E8C6 }, { 0x1E8D7, 0x1E8FF },
+    { 0x1E94C, 0x1E94F }, { 0x1E95A, 0x1E95D }, { 0x1E960, 0x1EC70 },
+    { 0x1ECB5, 0x1ED00 }, { 0x1ED3E, 0x1EDFF }, { 0x1EE04, 0x1EE04 },
+    { 0x1EE20, 0x1EE20 }, { 0x1EE23, 0x1EE23 }, { 0x1EE25, 0x1EE26 },
+    { 0x1EE28, 0x1EE28 }, { 0x1EE33, 0x1EE33 }, { 0x1EE38, 0x1EE38 },
+    { 0x1EE3A, 0x1EE3A }, { 0x1EE3C, 0x1EE41 }, { 0x1EE43, 0x1EE46 },
+    { 0x1EE48, 0x1EE48 }, { 0x1EE4A, 0x1EE4A }, { 0x1EE4C, 0x1EE4C },
+    { 0x1EE50, 0x1EE50 }, { 0x1EE53, 0x1EE53 }, { 0x1EE55, 0x1EE56 },
+    { 0x1EE58, 0x1EE58 }, { 0x1EE5A, 0x1EE5A }, { 0x1EE5C, 0x1EE5C },
+    { 0x1EE5E, 0x1EE5E }, { 0x1EE60, 0x1EE60 }, { 0x1EE63, 0x1EE63 },
+    { 0x1EE65, 0x1EE66 }, { 0x1EE6B, 0x1EE6B }, { 0x1EE73, 0x1EE73 },
+    { 0x1EE78, 0x1EE78 }, { 0x1EE7D, 0x1EE7D }, { 0x1EE7F, 0x1EE7F },
+    { 0x1EE8A, 0x1EE8A }, { 0x1EE9C, 0x1EEA0 }, { 0x1EEA4, 0x1EEA4 },
+    { 0x1EEAA, 0x1EEAA }, { 0x1EEBC, 0x1EEEF }, { 0x1EEF2, 0x1EFFF },
+    { 0x1F02C, 0x1F02F }, { 0x1F094, 0x1F09F }, { 0x1F0AF, 0x1F0B0 },
+    { 0x1F0C0, 0x1F0C0 }, { 0x1F0D0, 0x1F0D0 }, { 0x1F0F6, 0x1F0FF },
+    { 0x1F1AE, 0x1F1E5 }, { 0x1F203, 0x1F20F }, { 0x1F23C, 0x1F23F },
+    { 0x1F249, 0x1F24F }, { 0x1F252, 0x1F25F }, { 0x1F266, 0x1F2FF },
+    { 0x1F6D8, 0x1F6DB }, { 0x1F6ED, 0x1F6EF }, { 0x1F6FD, 0x1F6FF },
+    { 0x1F777, 0x1F77A }, { 0x1F7DA, 0x1F7DF }, { 0x1F7EC, 0x1F7EF },
+    { 0x1F7F1, 0x1F7FF }, { 0x1F80C, 0x1F80F }, { 0x1F848, 0x1F84F },
+    { 0x1F85A, 0x1F85F }, { 0x1F888, 0x1F88F }, { 0x1F8AE, 0x1F8AF },
+    { 0x1F8B2, 0x1F8FF }, { 0x1FA54, 0x1FA5F }, { 0x1FA6E, 0x1FA6F },
+    { 0x1FA7D, 0x1FA7F }, { 0x1FA89, 0x1FA8F }, { 0x1FABE, 0x1FABE },
+    { 0x1FAC6, 0x1FACD }, { 0x1FADC, 0x1FADF }, { 0x1FAE9, 0x1FAEF },
+    { 0x1FAF9, 0x1FAFF }, { 0x1FB93, 0x1FB93 }, { 0x1FBCB, 0x1FBEF },
+    { 0x1FBFA, 0x1FFFF }, { 0x2A6D7, 0x2F7FF }, { 0x2FA1E, 0xE0000 },
+    { 0xE0002, 0xE001F }, { 0xE0080, 0xE00FF }, { 0xE01F0, 0x10FFFD }
+  };
+  /* *INDENT-ON* */
+
+  /* sorted list of non-overlapping intervals of non-characters */
+  /* generated by
+   *    uniset +WIDTH-W -cat=Cn -cat=Mn c
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset_dbl 1.2 */
+  static const struct interval doublewidth[] = {
+    { 0x1100, 0x115F }, { 0x231A, 0x231B }, { 0x2329, 0x232A },
+    { 0x23E9, 0x23EC }, { 0x23F0, 0x23F0 }, { 0x23F3, 0x23F3 },
+    { 0x25FD, 0x25FE }, { 0x2614, 0x2615 }, { 0x2648, 0x2653 },
+    { 0x267F, 0x267F }, { 0x2693, 0x2693 }, { 0x26A1, 0x26A1 },
+    { 0x26AA, 0x26AB }, { 0x26BD, 0x26BE }, { 0x26C4, 0x26C5 },
+    { 0x26CE, 0x26CE }, { 0x26D4, 0x26D4 }, { 0x26EA, 0x26EA },
+    { 0x26F2, 0x26F3 }, { 0x26F5, 0x26F5 }, { 0x26FA, 0x26FA },
+    { 0x26FD, 0x26FD }, { 0x2705, 0x2705 }, { 0x270A, 0x270B },
+    { 0x2728, 0x2728 }, { 0x274C, 0x274C }, { 0x274E, 0x274E },
+    { 0x2753, 0x2755 }, { 0x2757, 0x2757 }, { 0x2795, 0x2797 },
+    { 0x27B0, 0x27B0 }, { 0x27BF, 0x27BF }, { 0x2B1B, 0x2B1C },
+    { 0x2B50, 0x2B50 }, { 0x2B55, 0x2B55 }, { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 }, { 0x2F00, 0x2FD5 }, { 0x2FF0, 0x3029 },
+    { 0x302E, 0x303E }, { 0x3041, 0x3096 }, { 0x309B, 0x30FF },
+    { 0x3105, 0x312F }, { 0x3131, 0x318E }, { 0x3190, 0x31E3 },
+    { 0x31EF, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF },
+    { 0x4E00, 0xA48C }, { 0xA490, 0xA4C6 }, { 0xA960, 0xA97C },
+    { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF }, { 0xFE10, 0xFE19 },
+    { 0xFE30, 0xFE52 }, { 0xFE54, 0xFE66 }, { 0xFE68, 0xFE6B },
+    { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, { 0x16FE0, 0x16FE3 },
+    { 0x16FF0, 0x16FF1 }, { 0x17000, 0x187F7 }, { 0x18800, 0x18CD5 },
+    { 0x18D00, 0x18D08 }, { 0x1AFF0, 0x1AFF3 }, { 0x1AFF5, 0x1AFFB },
+    { 0x1AFFD, 0x1AFFE }, { 0x1B000, 0x1B122 }, { 0x1B132, 0x1B132 },
+    { 0x1B150, 0x1B152 }, { 0x1B155, 0x1B155 }, { 0x1B164, 0x1B167 },
+    { 0x1B170, 0x1B2FB }, { 0x1F004, 0x1F004 }, { 0x1F0CF, 0x1F0CF },
+    { 0x1F18E, 0x1F18E }, { 0x1F191, 0x1F19A }, { 0x1F200, 0x1F202 },
+    { 0x1F210, 0x1F23B }, { 0x1F240, 0x1F248 }, { 0x1F250, 0x1F251 },
+    { 0x1F260, 0x1F265 }, { 0x1F300, 0x1F320 }, { 0x1F32D, 0x1F335 },
+    { 0x1F337, 0x1F37C }, { 0x1F37E, 0x1F393 }, { 0x1F3A0, 0x1F3CA },
+    { 0x1F3CF, 0x1F3D3 }, { 0x1F3E0, 0x1F3F0 }, { 0x1F3F4, 0x1F3F4 },
+    { 0x1F3F8, 0x1F43E }, { 0x1F440, 0x1F440 }, { 0x1F442, 0x1F4FC },
+    { 0x1F4FF, 0x1F53D }, { 0x1F54B, 0x1F54E }, { 0x1F550, 0x1F567 },
+    { 0x1F57A, 0x1F57A }, { 0x1F595, 0x1F596 }, { 0x1F5A4, 0x1F5A4 },
+    { 0x1F5FB, 0x1F64F }, { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC },
+    { 0x1F6D0, 0x1F6D2 }, { 0x1F6D5, 0x1F6D7 }, { 0x1F6DC, 0x1F6DF },
+    { 0x1F6EB, 0x1F6EC }, { 0x1F6F4, 0x1F6FC }, { 0x1F7E0, 0x1F7EB },
+    { 0x1F7F0, 0x1F7F0 }, { 0x1F90C, 0x1F93A }, { 0x1F93C, 0x1F945 },
+    { 0x1F947, 0x1F9FF }, { 0x1FA70, 0x1FA7C }, { 0x1FA80, 0x1FA88 },
+    { 0x1FA90, 0x1FABD }, { 0x1FABF, 0x1FAC5 }, { 0x1FACE, 0x1FADB },
+    { 0x1FAE0, 0x1FAE8 }, { 0x1FAF0, 0x1FAF8 }, { 0x20000, 0x2FFFD },
+    { 0x30000, 0x3FFFD }
+  };
+  /* *INDENT-ON* */
+
+  int result;
+
+#define Lookup(cmp, table) \
+      bisearch(cmp, table, \
+               (int) (sizeof(table) / sizeof(struct interval) - 1))
 
   /* test for 8-bit control characters */
-  if (ucs == 0)
-    return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-    return -1;
+  if (cmp == 0) {
+    result = 0;
+  } else if (cmp < 32 || (cmp >= 0x7f && cmp < 0xa0)) {
+    result = -1;
+  } else if (cmp == 0xad) {
+    result = use_latin1;
+  } else if (Lookup(cmp, formatting)) {
+    /* treat formatting characters like control characters */
+    result = -1;
+  } else if (Lookup(cmp, combining)) {
+    /* binary search in table of non-spacing characters */
+    result = 0;
+  } else {
+    /* if we arrive here, cmp is not a combining or C0/C1 control character */
+    result = 1;
 
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, combining,
-	       sizeof(combining) / sizeof(struct interval) - 1))
-    return 0;
-
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
-  return 1 +
-    (ucs >= 0x1100 &&
-     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
-      ucs == 0x2329 || ucs == 0x232a ||
-      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-       ucs != 0x303f)                     /* CJK ... Yi */
-      || (ucs >= 0xac00 && ucs <= 0xd7a3) /* Hangul Syllables */
-      || (ucs >= 0xf900 && ucs <= 0xfaff) /* CJK Compatibility Ideographs */
-      || (ucs >= 0xfe10 && ucs <= 0xfe19) /* Vertical forms */
-      || (ucs >= 0xfe30 && ucs <= 0xfe6f) /* CJK Compatibility Forms */
-      || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */
-      || (ucs >= 0xffe0 && ucs <= 0xffe6)
-#if !defined(SIZEOF_WCHAR_T) || (SIZEOF_WCHAR_T >= 4)
-      || (ucs >= 0x20000 && ucs <= 0x2fffd)
-      || (ucs >= 0x30000 && ucs <= 0x3fffd)
-#endif
-      ));
+    if (Lookup(cmp, doublewidth)) {
+      result = 2;
+    } else if (cmp >= unknowns[0].first && Lookup(cmp, unknowns)) {
+      result = -1;
+    }
+  }
+  return result;
 }
 
 
-NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *pwcs, size_t n)
+NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *pwcs, size_t n)
 {
-  int w, width = 0;
+  int width = 0;
+
+  for (; *pwcs && n-- > 0; pwcs++) {
+    int w;
 
-  for (;*pwcs && n-- > 0; pwcs++)
     if ((w = mk_wcwidth(*pwcs)) < 0)
       return -1;
     else
       width += w;
+  }
 
   return width;
 }
@@ -233,17 +700,31 @@ NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *pwcs, size_t n)
 
 /*
  * The following functions are the same as mk_wcwidth() and
- * mk_wcswidth(), except that spacing characters in the East Asian
+ * mk_wcwidth_cjk(), except that spacing characters in the East Asian
  * Ambiguous (A) category as defined in Unicode Technical Report #11
  * have a column width of 2. This variant might be useful for users of
  * CJK legacy encodings who want to migrate to UCS without changing
  * the traditional terminal character-width behaviour. It is not
  * otherwise recommended for general use.
  */
-NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t ucs)
+NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t ucs)
 {
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
-   * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+   * characters, generated by
+   *
+   * uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf \
+   *    +E000..F8FF \
+   *    +F0000..FFFFD \
+   *    +100000..10FFFD  c
+   *
+   * "WIDTH-A" is a file extracted from EastAsianWidth.txt by selecting
+   * only those with width "A", and omitting:
+   *
+   *    0xAD
+   *    all lines with "COMBINING"
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset_cjk 1.5 */
   static const struct interval ambiguous[] = {
     { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
     { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
@@ -274,49 +755,59 @@ NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t ucs)
     { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
     { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
     { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
-    { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
-    { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
-    { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
-    { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
-    { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
-    { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
-    { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
-    { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
-    { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
-    { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
-    { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
-    { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
-    { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
-    { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
-    { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
-    { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
-    { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
-    { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
+    { 0x2189, 0x2189 }, { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 },
+    { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 },
+    { 0x2200, 0x2200 }, { 0x2202, 0x2203 }, { 0x2207, 0x2208 },
+    { 0x220B, 0x220B }, { 0x220F, 0x220F }, { 0x2211, 0x2211 },
+    { 0x2215, 0x2215 }, { 0x221A, 0x221A }, { 0x221D, 0x2220 },
+    { 0x2223, 0x2223 }, { 0x2225, 0x2225 }, { 0x2227, 0x222C },
+    { 0x222E, 0x222E }, { 0x2234, 0x2237 }, { 0x223C, 0x223D },
+    { 0x2248, 0x2248 }, { 0x224C, 0x224C }, { 0x2252, 0x2252 },
+    { 0x2260, 0x2261 }, { 0x2264, 0x2267 }, { 0x226A, 0x226B },
+    { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 },
+    { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 },
+    { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24E9 },
+    { 0x24EB, 0x254B }, { 0x2550, 0x2573 }, { 0x2580, 0x258F },
+    { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 },
+    { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD },
+    { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB },
+    { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF },
+    { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F },
     { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
     { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
     { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
-    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
-    { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+    { 0x269E, 0x269F }, { 0x26BF, 0x26BF }, { 0x26C6, 0x26CD },
+    { 0x26CF, 0x26D3 }, { 0x26D5, 0x26E1 }, { 0x26E3, 0x26E3 },
+    { 0x26E8, 0x26E9 }, { 0x26EB, 0x26F1 }, { 0x26F4, 0x26F4 },
+    { 0x26F6, 0x26F9 }, { 0x26FB, 0x26FC }, { 0x26FE, 0x26FF },
+    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0x2B56, 0x2B59 },
+    { 0x3248, 0x324F }, { 0xE000, 0xF8FF }, { 0xFFFD, 0xFFFD },
+    { 0x1F100, 0x1F10A }, { 0x1F110, 0x1F12D }, { 0x1F130, 0x1F169 },
+    { 0x1F170, 0x1F18D }, { 0x1F18F, 0x1F190 }, { 0x1F19B, 0x1F1AC },
+    { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
   };
+  /* *INDENT-ON* */
 
   /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, ambiguous,
-	       sizeof(ambiguous) / sizeof(struct interval) - 1))
+  if (Lookup((unsigned long) ucs, ambiguous))
     return 2;
 
   return mk_wcwidth(ucs);
 }
 
 
-NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
+NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *pwcs, size_t n)
 {
-  int w, width = 0;
+  int width = 0;
+
+  for (; *pwcs && n-- > 0; pwcs++) {
+    int w;
 
-  for (;*pwcs && n-- > 0; pwcs++)
     if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
       return -1;
     else
       width += w;
+  }
 
   return width;
 }
diff --git a/ncurses/win32con/wcwidth.c b/ncurses/win32con/wcwidth.c
index 55843662e..1a5401821 100644
--- a/ncurses/win32con/wcwidth.c
+++ b/ncurses/win32con/wcwidth.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2010 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
  ****************************************************************************/
 #include <curses.priv.h>
 
-MODULE_ID("$Id: wcwidth.c,v 1.4 2020/07/11 21:02:10 tom Exp $")
+MODULE_ID("$Id: wcwidth.c,v 1.5 2024/05/04 18:31:39 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define mk_wcwidth(ucs)          _nc_wcwidth(ucs)
@@ -36,10 +36,11 @@ MODULE_ID("$Id: wcwidth.c,v 1.4 2020/07/11 21:02:10 tom Exp $")
 #define mk_wcwidth_cjk(ucs)      _nc_wcwidth_cjk(ucs)
 #define mk_wcswidth_cjk(pwcs, n) _nc_wcswidth_cjk(pwcs, n)
 
-NCURSES_EXPORT(int) mk_wcwidth(wchar_t);
-NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *, size_t);
-NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t);
-NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *, size_t);
+NCURSES_EXPORT(void) mk_wcwidth_init(int);
+NCURSES_EXPORT(int) mk_wcwidth(uint32_t);
+NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *, size_t);
+NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t);
+NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *, size_t);
 
 #include <wcwidth.h>
 #else
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index cf7773000..8a2e6afde 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240427) unstable; urgency=low
+ncurses6 (6.5+20240504) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index cf7773000..8a2e6afde 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240427) unstable; urgency=low
+ncurses6 (6.5+20240504) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 12ba6fbd9..f1521e690 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240427) unstable; urgency=low
+ncurses6 (6.5+20240504) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 2bbc8cc03..efffabd76 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.645 2024/04/27 13:56:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.646 2024/05/04 10:21:09 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0427"
+!define VERSION_MMDD  "0504"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 3635bbc78..322299dab 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240427
+Release: 20240504
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a4a915c11..8754f296d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240427
+Release: 20240504
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 8427530eb..f6f76b52c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240427
+Release: 20240504
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From e8b017dc070da57f262444ebffeedfbcf348cd86 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 12 May 2024 02:16:58 +0200
Subject: [PATCH 066/106] ncurses-6.5-20240511.patch.gz

---
 NEWS                                 |   9 +-
 VERSION                              |   2 +-
 dist.mk                              |   4 +-
 doc/html/man/curs_add_wch.3x.html    | 256 ++++++-----
 doc/html/man/curs_add_wchstr.3x.html |  59 ++-
 doc/html/man/curs_addch.3x.html      | 232 +++++-----
 doc/html/man/curs_addchstr.3x.html   |  51 +--
 doc/html/man/curs_attr.3x.html       |  13 +-
 doc/html/man/curs_delch.3x.html      |  30 +-
 doc/html/man/curs_get_wch.3x.html    |  71 +--
 doc/html/man/curs_getch.3x.html      | 128 +++---
 doc/html/man/curs_getstr.3x.html     |  10 +-
 doc/html/man/curs_getyx.3x.html      |  64 +--
 doc/html/man/curs_inch.3x.html       |  86 ++--
 doc/html/man/curs_mouse.3x.html      |  20 +-
 doc/html/man/curs_outopts.3x.html    |  32 +-
 doc/html/man/curs_sp_funcs.3x.html   |   8 +-
 doc/html/man/curs_termattrs.3x.html  |  12 +-
 doc/html/man/curs_util.3x.html       | 165 ++++---
 doc/html/man/infocmp.1m.html         |   8 +-
 doc/html/man/infotocap.1m.html       |   8 +-
 doc/html/man/ncurses.3x.html         | 663 ++++++++++++++-------------
 doc/html/man/ncursesw6-config.1.html |   8 +-
 doc/html/man/term.5.html             | 233 +++++-----
 doc/html/man/term.7.html             |   8 +-
 doc/html/man/terminfo.5.html         |  10 +-
 doc/html/man/tic.1m.html             |   8 +-
 doc/html/man/toe.1m.html             |   8 +-
 doc/html/man/tput.1.html             |   8 +-
 doc/html/man/tset.1.html             |   8 +-
 man/MKncu_config.in                  |   4 +-
 man/curs_add_wch.3x                  | 300 +++++++-----
 man/curs_add_wchstr.3x               |  87 ++--
 man/curs_addch.3x                    | 148 +++---
 man/curs_addchstr.3x                 |  81 ++--
 man/curs_attr.3x                     |  14 +-
 man/curs_delch.3x                    |  17 +-
 man/curs_get_wch.3x                  |  51 +--
 man/curs_getch.3x                    | 120 ++---
 man/curs_getstr.3x                   |   6 +-
 man/curs_getyx.3x                    | 135 ++++--
 man/curs_inch.3x                     | 119 +++--
 man/curs_mouse.3x                    |  13 +-
 man/curs_outopts.3x                  |  28 +-
 man/curs_sp_funcs.3x                 |   4 +-
 man/curs_termattrs.3x                |   6 +-
 man/curs_util.3x                     |   9 +-
 man/infocmp.1m                       |   7 +-
 man/infotocap.1m                     |   7 +-
 man/man_db.renames.in                |   6 +-
 man/manhtml.aliases                  |   7 +-
 man/manhtml.externs                  |   3 +-
 man/ncurses.3x                       | 188 +++++---
 man/term.5                           | 423 +++++++++++------
 man/term.7                           |  11 +-
 man/terminfo.head                    |   7 +-
 man/terminfo.tail                    |   8 +-
 man/tic.1m                           |  16 +-
 man/toe.1m                           |   7 +-
 man/tput.1                           |   7 +-
 man/tset.1                           |   7 +-
 ncurses/base/lib_newterm.c           |   5 +-
 ncurses/curses.priv.h                |   8 +-
 ncurses/tinfo/lib_setup.c            |   6 +-
 ncurses/tinfo/tinfo_driver.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 +-
 package/ncursest.spec                |   2 +-
 72 files changed, 2289 insertions(+), 1828 deletions(-)

diff --git a/NEWS b/NEWS
index 144f70b40..99f97ee0e 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4117 2024/05/04 18:43:01 tom Exp $
+-- $Id: NEWS,v 1.4119 2024/05/11 21:38:14 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240511
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ limit value from ESCDELAY environment variable to 30 seconds, like
+	  other delay limits.
+	+ limit values from LINES and COLUMNS environment variables to 512
+	  (report by Miroslav Lichvar).
+
 20240504
 	+ update ncurses/wcwidth.c, for MinGW ports, from xterm.
 	+ trim obsolete comment about tack from INSTALL.
diff --git a/VERSION b/VERSION
index b98d7203f..2e2f7c02f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240504
+5:0:10	6.5	20240511
diff --git a/dist.mk b/dist.mk
index 78d06b88a..97db5c372 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1611 2024/05/04 10:21:09 tom Exp $
+# $Id: dist.mk,v 1.1612 2024/05/11 10:20:08 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240504
+NCURSES_PATCH = 20240511
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 64c645d5a..a7dee58c9 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -49,7 +49,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>add_wch</STRONG>, <STRONG>wadd_wch</STRONG>, <STRONG>mvadd_wch</STRONG>, <STRONG>mvwadd_wch</STRONG>, <STRONG>echo_wchar</STRONG>, <STRONG>wecho_wchar</STRONG> - add
-       a <EM>curses</EM> complex character to a window and advance the cursor
+       a <EM>curses</EM> complex character to a window, possibly advancing the cursor
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -66,55 +66,85 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-add_wch">add_wch</a></H3><PRE>
-       The <STRONG>add_wch</STRONG>, <STRONG>wadd_wch</STRONG>, <STRONG>mvadd_wch</STRONG>,  and  <STRONG>mvwadd_wch</STRONG>  functions  put  the
-       complex  character  <EM>wch</EM>  into the given window at its current position,
-       which is then advanced.  These functions perform wrapping and  special-
-       character processing as follows:
-
-       <STRONG>o</STRONG>   If  <EM>wch</EM>  refers to a spacing character, then any previous character
-           at that location is removed.  A new character specified by  <EM>wch</EM>  is
-           placed  at  that  location  with  rendition  specified by <EM>wch</EM>.  The
-           cursor then advances after this spacing character, to  prepare  for
-           writing the next character on the screen.
-
-           The newly added spacing character is the base of the active complex
-           character.  Subsequent non-spacing characters can be combined  with
-           this base until another spacing character is written to the screen,
-           or the cursor is moved, e.g., using <STRONG>wmove</STRONG>.
-
-       <STRONG>o</STRONG>   If <EM>wch</EM> refers to a non-spacing character, it  is  appended  to  the
-           active complex character, retaining the previous characters at that
-           location.  The rendition specified by <EM>wch</EM> is ignored.
-
-           The cursor is not advanced after adding  a  non-spacing  character.
-           Subsequent calls to add non-spacing characters will update the same
-           position.
+</PRE><H3><a name="h3-wadd_wch">wadd_wch</a></H3><PRE>
+       <STRONG>wadd_wch</STRONG> writes the complex character <EM>wch</EM> to the window <EM>win</EM>,  then  may
+       advance  the  cursor  position, analogously to the standard C library's
+       <STRONG>putwchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
+
+       Much behavior depends on whether the wide characters in <EM>wch</EM> are spacing
+       or non-spacing; see subsection "Complex Characters" below.
+
+       <STRONG>o</STRONG>   If  <EM>wch</EM>  contains  a  spacing  character, then any character at the
+           cursor is first removed.   The  complex  character  <EM>wch</EM>,  with  its
+           attributes  and  color  pair  identifier,  becomes  the <EM>base</EM> of the
+           <EM>active</EM> <EM>complex</EM> <EM>character</EM>.
+
+       <STRONG>o</STRONG>   If <EM>wch</EM> contains only non-spacing characters, they are combined with
+           the  active  complex  character.  <EM>curses</EM> ignores its attributes and
+           color pair identifier, and does not advance the cursor.
+
+       Further non-spacing characters added with <STRONG>wadd_wch</STRONG> are not  written  at
+       the  new  cursor position but combine with the active complex character
+       until another spacing character is written to the window or the  cursor
+       is moved.
+
+       If advancement occurs at the right margin,
+
+       <STRONG>o</STRONG>   the  cursor  automatically wraps to the beginning of the next line,
+           then,
+
+       <STRONG>o</STRONG>   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
+           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  enabled  for <EM>win</EM>, the scrolling region scrolls up
+           one line.
 
-       <STRONG>o</STRONG>   If the character part of <EM>wch</EM> is a tab, newline, backspace or  other
-           control character, the window is updated and the cursor moves as if
-           <STRONG>addch</STRONG> were called.
+       If <EM>wch</EM> is a backspace, carriage return, line feed, or tab,  the  cursor
+       moves appropriately within the window.
 
+       <STRONG>o</STRONG>   Backspace  moves  the cursor one character left; at the left margin
+           of a window, it does nothing.
 
-</PRE><H3><a name="h3-echo_wchar">echo_wchar</a></H3><PRE>
-       The <STRONG>echo_wchar</STRONG> function is functionally equivalent to a call to <STRONG>add_wch</STRONG>
-       followed  by  a  call  to  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>.   Similarly, the <STRONG>wecho_wchar</STRONG> is
-       functionally equivalent to a call to <STRONG>wadd_wch</STRONG> followed  by  a  call  to
-       <STRONG>wrefresh</STRONG>.   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 *<STRONG>echo</STRONG>*
-       functions instead of their equivalents.
+       <STRONG>o</STRONG>   Carriage return moves the cursor to the left margin on the  current
+           line of the window.
 
+       <STRONG>o</STRONG>   Line  feed  does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from the right
+           margin.
 
-</PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Like <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>addch_wch</STRONG> 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 <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    <STRONG>TABSIZE</STRONG>    extension;    see
+           <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-                       <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
+       If  <EM>wch</EM>  is  any other nonprintable character, it is drawn in printable
+       form using the same convention as <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG>.
 
+       Calling <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG> on the location of a  nonprintable  character  does
+       not return the character itself, but its <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG> representation.
 
-       <STRONG>ACS</STRONG> <STRONG>Name</STRONG>        <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
+
+</PRE><H3><a name="h3-wecho_wchar">wecho_wchar</a></H3><PRE>
+       <STRONG>echo_wchar</STRONG>   and  <STRONG>wecho_wchar</STRONG>  are  equivalent  to  calling  (<STRONG>w</STRONG>)<STRONG>add_wch</STRONG>
+       followed by (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM> interprets these functions  as  a  hint
+       that only a single (complex) character is being output; for non-control
+       characters, a considerable performance gain may be enjoyed by employing
+       them.
+
+
+</PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
+       <EM>curses</EM>  defines  macros  starting  with  <STRONG>WACS_</STRONG>  that  can  be used with
+       <STRONG>wadd_wch</STRONG> to write line-drawing and  other  special  characters  to  the
+       screen.  <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default
+       listed below is used if the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM>  capability  does
+       not  define  a terminal-specific replacement for it, or if the terminal
+       and locale configuration requires Unicode to  access  these  characters
+       but  the  library  is  unable  to  use Unicode.  The "acsc char" column
+       corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
+       string capability, and the characters in it may appear on the screen if
+       the terminal type's database entry incorrectly advertises ACS  support.
+       The name "ACS" originates in the Alternate Character Set feature of the
+       DEC VT100 terminal.
+
+                       <STRONG>Unicode</STRONG>   <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
+       <STRONG>Symbol</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
        <STRONG>WACS_BLOCK</STRONG>      0x25ae    #         0      solid square block
        <STRONG>WACS_BOARD</STRONG>      0x2592    #         h      board of squares
@@ -179,7 +209,6 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>WACS_D_LTEE</STRONG>       0x2560    +         F      double tee pointing right
        <STRONG>WACS_D_PLUS</STRONG>       0x256c    +         E      double large plus
        <STRONG>WACS_D_RTEE</STRONG>       0x2563    +         G      double tee pointing left
-
        <STRONG>WACS_D_TTEE</STRONG>       0x2566    +         I      double tee pointing down
        <STRONG>WACS_D_ULCORNER</STRONG>   0x2554    +         C      double upper left corner
        <STRONG>WACS_D_URCORNER</STRONG>   0x2557    +         B      double upper right corner
@@ -198,124 +227,122 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.   In  <EM>ncurses</EM>,
+       <STRONG>wadd_wch</STRONG> returns <STRONG>ERR</STRONG> if
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns an error
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the window pointer is null or
+       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
+           been called on <EM>win</EM> when writing to its  bottom  right  location  is
+           attempted, or
 
-       <STRONG>o</STRONG>   if it is not possible to add a complete character in the window.
+       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
+           position.
 
-       The latter may be due to different causes:
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       <STRONG>o</STRONG>   If  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not enabled, writing a character at the lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line.
 
-       <STRONG>o</STRONG>   If  an error is detected when converting a multibyte character to a
-           sequence of bytes, or if it is not  possible  to  add  all  of  the
-           resulting bytes in the window, an error is returned.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>add_wch</STRONG>,  <STRONG>mvadd_wch</STRONG>,  <STRONG>mvwadd_wch</STRONG>,  and <STRONG>echo_wchar</STRONG> may be implemented as
+       macros.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
-       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>add_wch</STRONG>, <STRONG>mvadd_wch</STRONG>, <STRONG>mvwadd_wch</STRONG>, and <STRONG>echo_wchar</STRONG> may be macros.
+</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
+       The <STRONG>TABSIZE</STRONG> variable is implemented  in  SVr4  and  other  versions  of
+       <EM>curses</EM>, but is not specified by X/Open Curses (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  The  defaults
-       specified for line-drawing characters apply in the POSIX locale.
+       These  functions are described in X/Open Curses, Issue 4.  It specifies
+       no error conditions for them.
 
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       value other than <STRONG>ERR</STRONG>".
 
-</PRE><H3><a name="h3-WACS-Symbols">WACS Symbols</a></H3><PRE>
-       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
-       as a pointer to <STRONG>cchar_t</STRONG> data, e.g., in the discussion of <STRONG>border_set</STRONG>.  A
-       few implementations are problematic:
+       The  defaults specified for forms-drawing characters apply in the POSIX
+       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+       defined  as  a  pointer  to  <STRONG>cchar_t</STRONG>  data,  e.g., in the discussion of
+       <STRONG>border_set</STRONG>.  A few implementations are problematic:
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
-       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
-           misdefined  symbols  are the arrows and other symbols which are not
+       <STRONG>o</STRONG>   HP-UX curses equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
+           <STRONG>WACS_</STRONG>  symbols  as  if  the <STRONG>ACS_</STRONG> symbols were wide characters.  The
+           misdefined symbols are the arrows and other symbols which  are  not
            used for line-drawing.
 
-       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
+       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
        SVr4 curses implementations defined their line-drawing symbols in terms
-       of intermediate symbols.  This implementation  extends  those  symbols,
+       of  intermediate  symbols.   This implementation extends those symbols,
        providing new definitions which are not in the SVr4 implementations.
 
-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
-       alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
-       corresponding  line-drawing  characters.  X/Open Curses did not address
-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
-       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
+       corresponding line-drawing characters.  X/Open Curses did  not  address
+       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
+       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       <EM>ncurses</EM> 5.3 (2002) provided a table of Unicode values  to  solve  these
+       <EM>ncurses</EM>  5.3  (2002)  provided a table of Unicode values to solve these
        problems.  NetBSD curses incorporated that table in 2010.
 
-       In  this  implementation,  the  Unicode  values are used instead of the
+       In this implementation, the Unicode values  are  used  instead  of  the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment  variable  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.   In contrast, for the same
+       environment variable <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.  In contrast,  for  the  same
        cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use only
        the ASCII default values.
 
-       Having  Unicode available does not solve all of the problems with line-
+       Having Unicode available does not solve all of the problems with  line-
        drawing for curses:
 
-       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics  <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>
-           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
+       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
+           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
            the terminal used.
 
-       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
-           terminal  in the early 1980s.  There is no accessible documentation
+       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
+           terminal in the early 1980s.  There is no accessible  documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
-           since  they  lie  outside the BMP and as a result are not generally
+           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+           since they lie outside the BMP and as a result  are  not  generally
            available in terminals.  They are not storm lanterns, in any case.
 
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: &lt;section&gt; U+00A7 (section
-           mark), &lt;Theta&gt; U+0398 (theta), &lt;Phi&gt; U+03A6 (phi),  &lt;delta&gt;  U+03B4
+           mark),  &lt;Theta&gt;  U+0398 (theta), &lt;Phi&gt; U+03A6 (phi), &lt;delta&gt; U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
 </PRE><H3><a name="h3-Complex-Characters">Complex Characters</a></H3><PRE>
-       The complex character  type  <STRONG>cchar_t</STRONG>  can  store  more  than  one  wide
-       character  (<STRONG>wchar_t</STRONG>).   The  X/Open Curses description does not mention
-       this possibility, describing only the cases  where  <EM>wch</EM>  is  a  spacing
-       character or a non-spacing character.
+       The  complex  character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  can  store  more  than one wide
+       character (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>).  X/Open Curses does not mention this  possibility,
+       specifying  behavior  only  where  <EM>wch</EM>  is  a  single character, either
+       spacing or non-spacing.
 
-       This implementation assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>,
-       and in turn that the result
+       <EM>ncurses</EM> assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>, and in turn
+       that the result
 
-       <STRONG>o</STRONG>   contains at most one spacing character in the beginning of its list
-           of wide characters, and zero or more non-spacing characters or
+       <STRONG>o</STRONG>   contains at most one spacing character at the beginning of its list
+           of wide characters, and zero or more non-spacing characters, or
 
-       <STRONG>o</STRONG>   may hold one non-spacing character.
+       <STRONG>o</STRONG>   holds one non-spacing character.
 
-       In  the  latter  case,  <EM>ncurses</EM>  adds  the non-spacing character to the
-       active (base) spacing character.
-
-
-</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       The <STRONG>TABSIZE</STRONG> variable is implemented  in  SVr4  and  other  versions  of
-       <EM>curses</EM>, but is not specified by X/Open Curses (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
+       In the latter case, <EM>ncurses</EM>  adds  the  non-spacing  character  to  the
+       active complex character.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -328,7 +355,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -336,18 +363,21 @@ <H1 class="no-header">curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-add_wch">add_wch</a></li>
-<li><a href="#h3-echo_wchar">echo_wchar</a></li>
-<li><a href="#h3-Line-Graphics">Line Graphics</a></li>
+<li><a href="#h3-wadd_wch">wadd_wch</a></li>
+<li><a href="#h3-wecho_wchar">wecho_wchar</a></li>
+<li><a href="#h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a>
+<ul>
+<li><a href="#h3-TABSIZE">TABSIZE</a></li>
+</ul>
+</li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
-<li><a href="#h3-WACS-Symbols">WACS Symbols</a></li>
 <li><a href="#h3-Complex-Characters">Complex Characters</a></li>
-<li><a href="#h3-TABSIZE">TABSIZE</a></li>
 </ul>
 </li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index f554061d8..8d7b7c2c1 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -67,53 +67,50 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  functions copy the (null-terminated) array of complex characters
-       <EM>wchstr</EM> into the window image structure starting at the  current  cursor
-       position.
+       <STRONG>wadd_wchstr</STRONG>  copies  the  string  of  complex  characters <EM>wchstr</EM> to the
+       window <EM>win</EM>.  A null complex character  terminates  the  string.   If  a
+       complex  character  does  completely fit at the end of the line, <EM>curses</EM>
+       fills the remaining columns with the window background; see <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.
+       <STRONG>wadd_wchnstr</STRONG> does the same, but copies at most <EM>n</EM> characters, or as many
+       as possible if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the  variants  of  these
+       functions.
 
-       The four functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,
-       but no more than will fit on the line.  If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
-       copied, to the maximum number of characters that will fit on the line.
+       Because  these  functions do not call <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> internally, they are
+       faster than <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG> and <STRONG><A HREF="curs_addwstr.3x.html">waddnwstr(3x)</A></STRONG>.  On the other hand, they
 
-       The  window  cursor  is  <EM>not</EM> advanced.  These functions are faster than
-       <STRONG>waddnstr</STRONG>.  On the other hand:
+       <STRONG>o</STRONG>   do  not  treat  the  backspace,  carriage  return,  or  line   feed
+           characters specially;
 
-       <STRONG>o</STRONG>   they do not perform checking (such as for the  newline,  backspace,
-           or carriage return characters),
+       <STRONG>o</STRONG>   do not represent unprintable characters with <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG>;
 
-       <STRONG>o</STRONG>   they do not advance the current cursor position,
+       <STRONG>o</STRONG>   do  not  update  the  cursor  position to follow the last character
+           written;
 
-       <STRONG>o</STRONG>   they do not expand other control characters to ^-escapes, and
-
-       <STRONG>o</STRONG>   they  truncate  the  string  if it crosses the right margin, rather
-           than wrapping it around to the new line.
-
-       These functions end successfully on encountering  a  null  <STRONG>cchar_t</STRONG>,  or
-       when  they have filled the current line.  If a complex character cannot
-       completely fit at the end of the current line,  the  remaining  columns
-       are filled with the background character and rendition.
+       <STRONG>o</STRONG>   truncate the string at  the  window's  right  margin,  rather  than
+           wrapping it to the next line and potentially scrolling.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open   Curses   does   not   specify   any  error  conditions.   This
-       implementation returns an error
+       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
+       <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
-       <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
+       <STRONG>o</STRONG>   <EM>wchstr</EM> is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All functions except <STRONG>wadd_wchnstr</STRONG> may be macros.
+       All  of  these  functions  except  <STRONG>wadd_wchnstr</STRONG>  may  be implemented as
+       macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       X/Open Curses, Issue 4 describes these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -124,7 +121,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-04-20               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 0a0622e39..2e8bbe836 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp @
+  * @Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -66,71 +66,70 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-Adding-Characters">Adding Characters</a></H3><PRE>
-       <STRONG>waddch</STRONG> puts the character <EM>ch</EM> at the cursor position of window <EM>win</EM>, then
-       advances  the  cursor position, analogously to the standard C library's
+</PRE><H3><a name="h3-waddch">waddch</a></H3><PRE>
+       <STRONG>waddch</STRONG> writes the <EM>curses</EM> character <EM>ch</EM> to the window <EM>win</EM>, then  advances
+       the   cursor   position,   analogously  to  the  standard  C  library's
        <STRONG>putchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
        If advancement occurs at the right margin,
 
-       <STRONG>o</STRONG>   the cursor automatically wraps to the beginning of the  next  line;
-           and
+       <STRONG>o</STRONG>   the cursor automatically wraps to the beginning of the  next  line,
+           then,
 
-       <STRONG>o</STRONG>   at  the bottom of the current scrolling region, and if <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>
-           is enabled for <EM>win</EM>, the scrolling region scrolls up one line.
+       <STRONG>o</STRONG>   if   it  was  at  the  bottom  of  the  scrolling  region,  and  if
+           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is enabled for <EM>win</EM>, the scrolling  region  scrolls  up
+           one line.
 
-       If <EM>ch</EM> is a backspace, carriage return, line feed, or  tab,  the  cursor
+       If  <EM>ch</EM>  is  a backspace, carriage return, line feed, or tab, the cursor
        moves appropriately within the window.
 
-       <STRONG>o</STRONG>   Backspace  moves  the cursor one character left; at the left margin
+       <STRONG>o</STRONG>   Backspace moves the cursor one character left; at the  left  margin
            of a window, it does nothing.
 
-       <STRONG>o</STRONG>   Carriage return moves the cursor to the left margin on the  current
+       <STRONG>o</STRONG>   Carriage  return moves the cursor to the left margin on the current
            line of the window.
 
-       <STRONG>o</STRONG>   Line  feed  does  a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then moves the cursor to the left
-           margin on the next line of  the  window,  and  if  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is
-           enabled  for  <EM>win</EM>,  scrolls the window if the cursor was already on
-           the last line.
+       <STRONG>o</STRONG>   Line feed does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from  the  right
+           margin.
 
-       <STRONG>o</STRONG>   Tab advances the cursor to the next tab stop (possibly on the  next
-           line);  these  are placed at every eighth column by default.  Alter
-           the   tab   interval    with    the    <STRONG>TABSIZE</STRONG>    extension;    see
+       <STRONG>o</STRONG>   Tab  advances the cursor to the next tab stop (possibly on the next
+           line); these are placed at every eighth column by  default.   Alter
+           the    tab    interval    with    the    <STRONG>TABSIZE</STRONG>   extension;   see
            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       If  <EM>ch</EM>  is  any  other nonprintable character, it is drawn in printable
-       form, using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
+       If <EM>ch</EM> is any other nonprintable character, it  is  drawn  in  printable
+       form using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
 
-       Calling <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does  not
+       Calling  <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does not
        return the character itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
 
-       <EM>ch</EM>  may  contain  rendering  and/or color attributes, and others can be
-       combined with the parameter by logically "or"ing with it.  (A character
-       with  its  attributes can be copied from place to place using <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>
-       and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for  values  of  predefined   video
-       attribute constants that can be usefully "or"ed with characters.
+       The object or expression <EM>ch</EM> may contain attributes and/or a color  pair
+       identifier.   (A character with its attributes can be copied from place
+       to place using <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> and <STRONG>waddch</STRONG>.)  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> for values  of
+       predefined  video  attribute constants that can be usefully "or"ed with
+       characters.
 
 
-</PRE><H3><a name="h3-Echoing-Characters">Echoing Characters</a></H3><PRE>
-       <STRONG>echochar</STRONG>  and  <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG> followed by
-       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM> interprets these functions as a hint  that  only  a
+</PRE><H3><a name="h3-wechochar">wechochar</a></H3><PRE>
+       <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these functions as a hint that only a
        single  character  is  being  output;  for  non-control  characters,  a
        considerable performance gain may be enjoyed by employing them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
-       <EM>curses</EM> defines macros starting with <STRONG>ACS_</STRONG> that can be used  with  <STRONG>waddch</STRONG>
-       to  write  line-drawing  and  other  special  characters to the screen.
-       <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS  default  listed
-       below  is  used  if  the  <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not
-       define a terminal-specific replacement for it, or if the  terminal  and
-       locale  configuration  requires  Unicode to access these characters but
+       <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
+       to write line-drawing and  other  special  characters  to  the  screen.
+       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
+       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
+       define  a  terminal-specific replacement for it, or if the terminal and
+       locale configuration requires Unicode to access  these  characters  but
        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
-       corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> string
-       capability, and the characters in it may appear on the  screen  if  the
-       terminal's database entry incorrectly advertises ACS support.  The name
-       "ACS" originates in the Alternate Character  Set  feature  of  the  DEC
-       VT100 terminal.
+       corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
+       string capability, and the characters in it may appear on the screen if
+       the terminal type's database entry incorrectly advertises ACS  support.
+       The name "ACS" originates in the Alternate Character Set feature of the
+       DEC VT100 terminal.
 
                       <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
        <STRONG>Symbol</STRONG>         <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
@@ -172,16 +171,25 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In  <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if it is not possible to add a complete
-       character at the cursor position, as when  conversion  of  a  multibyte
-       character  to  a  byte sequence fails, or at least one of the resulting
-       bytes cannot be added to the window.  See section  "PORTABILITY"  below
-       regarding the use of <STRONG>waddch</STRONG> with multibyte characters.
+       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if
 
-       <STRONG>waddch</STRONG>  can successfully write a character at the bottom right location
-       of the window.  However, <EM>ncurses</EM> returns <STRONG>ERR</STRONG>  if  <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  not
-       enabled  in  that  event,  because  it is not possible to wrap to a new
-       line.
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+
+       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
+           been  called  on  <EM>win</EM>  when a write to its bottom right location is
+           attempted, or
+
+       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
+           position.
+
+       The last may be due to different causes:
+
+       <STRONG>o</STRONG>   conversion of a multibyte character to a byte sequence can fail, or
+
+       <STRONG>o</STRONG>   at  least  one  of  the  bytes  resulting  from  conversion  from a
+           multibyte sequence cannot be added  to  the  window.   See  section
+           "PORTABILITY"  below  regarding  the  use  of <STRONG>waddch</STRONG> with multibyte
+           characters.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -191,14 +199,21 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>addch</STRONG>, <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, and <STRONG>echochar</STRONG> may be implemented as macros.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+
+</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
+       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
+       X/Open Curses does not specify it; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
        value other than <STRONG>ERR</STRONG>".
 
-       The  defaults specified for forms-drawing characters apply in the POSIX
+       The defaults specified for forms-drawing characters apply in the  POSIX
        locale.
 
 
@@ -207,89 +222,82 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, define the ACS symbols  as  constants;
+       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
            others define them as elements of an array.
 
-           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
+           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
+       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
+           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
-           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
-           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
+       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
+           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
            implementations use "i" (small i).
 
-           None  of  the terminal descriptions on Unix platforms use uppercase
-           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
-           apparently  based on the X/Open documentation around 1995).  On the
-           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
+           None of the terminal descriptions on Unix platforms  use  uppercase
+           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
+           apparently based on the X/Open documentation around 1995).  On  the
+           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
            description uses lowercase i.
 
-       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
-       released  System V.   However, many publicly available <EM>terminfo</EM> entries
-       include <STRONG>acsc</STRONG> strings  in  which  their  key  characters  <STRONG>(</STRONG>pryz{|}<STRONG>)</STRONG>  are
-       embedded,  and  a  second-hand list of their character descriptions has
-       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
+       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
+       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
+       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
+       embedded, and a second-hand list of their  character  descriptions  has
+       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character configurations  (the  former  is  capable  of  displaying
+           character  configurations  (the  former  is  capable  of displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
-       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
-       <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>).
+       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
+       <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
-       single character.  As discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,  that  character  may
-       have  been more than eight bits wide in an SVr3 or SVr4 implementation,
-       but in the X/Open  Curses  model,  the  details  are  not  given.   The
-       important distinction between SVr4 <EM>curses</EM> and X/Open Curses is that the
-       latter separates non-character information (attributes and color)  from
-       the  character  code,  which  SVr4  packs  into a <EM>chtype</EM> for passage to
-       <STRONG>waddch</STRONG>.
-
-       In <EM>ncurses</EM>, <EM>chtype</EM> holds  an  eight-bit  character.   But  the  library
-       allows  a  multibyte character to be passed in a succession of calls to
-       <STRONG>waddch</STRONG>.  Other implementations do not; a <STRONG>waddch</STRONG> call transmits  exactly
-       one  character,  which  may be rendered in one or more screen locations
-       depending on whether it is printable.
-
-       Depending on the locale settings, <EM>ncurses</EM> inspects the byte  passed  in
-       each  <STRONG>waddch</STRONG>  call,  and  checks  whether  the  latest call continues a
-       multibyte sequence.  When a character is <EM>complete</EM>, <EM>ncurses</EM> displays the
-       character and advances the cursor.
-
-       If  the  calling  application  interrupts  the succession of bytes in a
-       multibyte character sequence  by  changing  the  current  location--for
+       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
+       single  character.   That  character may have been more than eight bits
+       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+       width  of  a non-wide character code unspecified.  The standard further
+       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
+       bit  operations  to  combine  the  character code with attributes and a
+       color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
+       portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
+       manipulate a <EM>chtype</EM>.
+
+       In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
+       a  multibyte character to be passed in a succession of calls to <STRONG>waddch</STRONG>.
+       Other implementations do not;  a  <STRONG>waddch</STRONG>  call  transmits  exactly  one
+       character,  which  may  be  rendered  in  one  or more screen locations
+       depending on whether it is printable (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).   Depending  on
+       the  locale,  <EM>ncurses</EM>  inspects the byte passed in each <STRONG>waddch</STRONG> call and
+       checks whether the latest call continues a multibyte sequence.  When  a
+       character  is <EM>complete</EM>, <EM>ncurses</EM> displays the character and advances the
+       cursor.  If the calling application interrupts the succession of  bytes
+       in a multibyte character sequence by changing the current location--for
        example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM> discards the incomplete character.
 
-       For  portability  to  other  implementations,  do  not  rely  upon this
-       behavior.  Check whether a character can be  represented  as  a  single
-       byte in the current locale.
+       For  portability  to  other  implementations,  do  not  rely  upon  the
+       foregoing  behavior.  Check whether a character can be represented as a
+       single byte in the current locale.
 
        <STRONG>o</STRONG>   If it can, call either <STRONG>waddch</STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
        <STRONG>o</STRONG>   If it cannot, use only <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
 
-</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
-       X/Open Curses does not specify it (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
-
-
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
@@ -300,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -308,18 +316,22 @@ <H1 class="no-header">curs_addch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-Adding-Characters">Adding Characters</a></li>
-<li><a href="#h3-Echoing-Characters">Echoing Characters</a></li>
+<li><a href="#h3-waddch">waddch</a></li>
+<li><a href="#h3-wechochar">wechochar</a></li>
 <li><a href="#h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a>
+<ul>
+<li><a href="#h3-TABSIZE">TABSIZE</a></li>
+</ul>
+</li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-ACS-Symbols">ACS Symbols</a></li>
 <li><a href="#h3-Character-Set">Character Set</a></li>
-<li><a href="#h3-TABSIZE">TABSIZE</a></li>
 </ul>
 </li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index a3441e6c9..0616c9bc5 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -66,47 +66,46 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions copy the (null-terminated) <EM>chstr</EM> array into the  window
-       image structure starting at the current cursor position.
+       <STRONG>waddchstr</STRONG> copies the string of <EM>curses</EM> characters <EM>chstr</EM>  to  the  window
+       <EM>win</EM>.   A  null <EM>curses</EM> character terminates the string.  <STRONG>waddchnstr</STRONG> does
+       the same, but copies at most <EM>n</EM> characters, or as many as possible if  <EM>n</EM>
+       is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
-       The four functions with <EM>n</EM> as the last argument copy at most <EM>n</EM> elements,
-       but no more than will fit on the line.  If <STRONG>n</STRONG>=<STRONG>-1</STRONG> then the whole array is
-       copied, to the maximum number of characters that will fit on the line.
+       Because  these  functions  do  not call <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> internally, they are
+       faster than <STRONG><A HREF="curs_addstr.3x.html">waddstr(3x)</A></STRONG> and <STRONG><A HREF="curs_addstr.3x.html">waddnstr(3x)</A></STRONG>.  On the other hand, they
 
-       The  window  cursor  is  <EM>not</EM> advanced.  These functions are faster than
-       <STRONG>waddnstr</STRONG>.  On the other hand:
+       <STRONG>o</STRONG>   do  not  treat  the  backspace,  carriage  return,  or  line   feed
+           characters specially;
 
-       <STRONG>o</STRONG>   they do not perform checking (such as for the  newline,  backspace,
-           or carriage return characters),
+       <STRONG>o</STRONG>   do not represent unprintable characters with <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>;
 
-       <STRONG>o</STRONG>   they do not advance the current cursor position,
+       <STRONG>o</STRONG>   do  not  update  the  cursor  position to follow the last character
+           written;
 
-       <STRONG>o</STRONG>   they do not expand other control characters to ^-escapes, and
-
-       <STRONG>o</STRONG>   they  truncate  the  string  if it crosses the right margin, rather
-           than wrapping it around to the new line.
+       <STRONG>o</STRONG>   truncate the string at  the  window's  right  margin,  rather  than
+           wrapping it to the next line and potentially scrolling.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns an error
+       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
+       <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
-       <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
+       <STRONG>o</STRONG>   <EM>chstr</EM> is <STRONG>NULL</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All functions except <STRONG>waddchnstr</STRONG> may be macros.
+       All of these functions except <STRONG>waddchnstr</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       X/Open Curses, Issue 4 describes these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -117,7 +116,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index bc1fd859d..b995aecac 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp @
+  * @Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -220,6 +220,10 @@ <H1 class="no-header">curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</H1>
               <STRONG>A_CHARTEXT</STRONG>     Bit-mask to extract a character
               <STRONG>A_COLOR</STRONG>        Bit-mask to extract a color (legacy routines)
 
+       You can thus use <STRONG>A_CHARTEXT</STRONG> to extract the  character  from  a  <EM>chtype</EM>,
+       <STRONG>A_ATTRIBUTES</STRONG>  to  obtain  its rendering attributes, and <STRONG>A_COLOR</STRONG> to find
+       the color pair it uses.
+
        These video attributes are supported by <STRONG>attr_on</STRONG> and  related  functions
        (which also support the attributes recognized by <STRONG>attron</STRONG>, etc.):
 
@@ -332,7 +336,6 @@ <H1 class="no-header">curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</H1>
               <STRONG>WA_BLINK</STRONG>        Blinking
               <STRONG>WA_DIM</STRONG>          Half bright
               <STRONG>WA_BOLD</STRONG>         Extra bright or bold
-
               <STRONG>WA_ALTCHARSET</STRONG>   Alternate character set
 
        X/Open Curses does not assign values to  these  symbols,  nor  does  it
@@ -497,7 +500,7 @@ <H1 class="no-header">curs_attr 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-27                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index ca638df7c..5196e418a 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp @
+  * @Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -61,14 +61,13 @@ <H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>wdelch</STRONG>  deletes  the  character  at  the  cursor   position   in   <EM>win</EM>.
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
-
-       <STRONG>wdelch</STRONG> moves all characters to the right of the cursor on the same line
-       to the left one position and replaces the  contents  of  the  rightmost
-       position  on  the  line with the window's blank character; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG>
-       (wide-character API users may consult <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG> instead).  The  cursor
-       position does not change (after moving to (<EM>y</EM>, <EM>x</EM>), if specified).
+       <STRONG>wdelch</STRONG> deletes the character at the cursor position in <EM>win</EM>.   It  moves
+       all  characters to the right of the cursor on the same line to the left
+       one position and replaces the contents of the rightmost position on the
+       line  with  the  window's blank character; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> (wide-character
+       API users: <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  The cursor position  does  not  change  (after
+       moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of
+       this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -76,19 +75,20 @@ <H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>delch</STRONG>, <STRONG>mvdelch</STRONG>, and <STRONG>mvwdelch</STRONG> may be implemented as macros.
 
-       A terminal's <STRONG>delete_character</STRONG>  (<STRONG>dch1</STRONG>)  capability  is  not  necessarily
+       A  terminal's  <STRONG>delete_character</STRONG>  (<STRONG>dch1</STRONG>)  capability  is not necessarily
        employed.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
        SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
        value other than <STRONG>ERR</STRONG>".
@@ -99,7 +99,7 @@ <H1 class="no-header">curs_delch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 291ef67f1..a8149fb92 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -65,47 +65,49 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Reading-Characters">Reading Characters</a></H3><PRE>
-       <STRONG>wget_wch</STRONG> gathers a key stroke <EM>wch</EM> from the terminal keyboard associated
-       with  a  <EM>curses</EM>  window  <EM>win</EM>, returning <STRONG>OK</STRONG> if a wide character is read,
+       <STRONG>wget_wch</STRONG> gathers a key event from the terminal keyboard associated with
+       a  <EM>curses</EM>  window  <EM>win</EM>,  returning  <STRONG>OK</STRONG>  if  a  wide  character is read,
        <STRONG>KEY_CODE_YES</STRONG> if a function key is read, and <STRONG>ERR</STRONG>  if  no  key  event  is
        available.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
        When  input  is pending, <STRONG>wget_wch</STRONG> stores an integer identifying the key
-       stroke in <EM>wch</EM>;  for  alphanumeric  and  punctuation  keys,  this  value
+       event in  <EM>wch</EM>;  for  alphanumeric  and  punctuation  keys,  this  value
        corresponds to the character encoding used by the terminal.  Use of the
-       control key as a modifier  often  results  in  a  distinct  code.   The
-       behavior  of  other  keys depends on whether <EM>win</EM> is in keypad mode; see
-       subsections "Keypad Mode" and "Predefined Key Codes" in <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
-
-       If no input is pending, then if the no-delay flag is set in the  window
-       (see  <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>),  the  function returns <STRONG>ERR</STRONG>; otherwise, <EM>curses</EM> waits
-       until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
-       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been called,
-       it occurs when the next newline is read.   If  <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG>  has  been
-       called,  <EM>curses</EM> waits until a character is typed or the specified delay
+       control key as a modifier,  by  holding  it  down  while  pressing  and
+       releasing  another key, often results in a distinct code.  The behavior
+       of other keys depends on whether <EM>win</EM> is in keypad mode; see subsections
+       "Keypad Mode" and "Predefined Key Codes" in <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+
+       If  no input is pending, then if the no-delay flag is set in the window
+       (see <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>), the function returns <STRONG>ERR</STRONG>;  otherwise,  <EM>curses</EM>  waits
+       until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
+       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been  called,
+       it  occurs  when  the  next newline is read.  If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been
+       called, <EM>curses</EM> waits until input is available or  the  specified  delay
        elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
        <EM>wch</EM> to the window (at the cursor position) per the following rules.
 
-       <STRONG>o</STRONG>   If  <EM>wch</EM>  matches  the  terminal's erase character, the cursor moves
-           leftward one  position  and  the  new  position  is  erased  as  if
-           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>  and  then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When the window's
-           keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are
+       <STRONG>o</STRONG>   If <EM>wch</EM> matches the terminal's erase  character,  the  cursor  moves
+           leftward  one  position  and  the  new  position  is  erased  as if
+           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When  the  window's
+           keypad  mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
            handled the same way.
 
        <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>wch</EM> to the window, as with <STRONG><A HREF="curs_add_wch.3x.html">wecho_wchar(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   If  the  window  has  been moved or modified since the last call to
-           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG>.
+       <STRONG>o</STRONG>   If the window <EM>win</EM> has been moved or modified since the last call to
+           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG> on it.
 
-       If <EM>wch</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,  <STRONG>wgetch</STRONG>  stores
-       the the character code for newline (line feed) in <EM>wch</EM> instead.
+       If  <EM>wch</EM>  is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called, <STRONG>wgetch</STRONG> stores
+       the the character code for line feed in <EM>wch</EM> instead.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>unget_wch</STRONG>  places  <EM>wch</EM>  into the input queue to be returned by the next
-       call to <STRONG>wget_wch</STRONG>.  A single input queue serves all windows.
+       <STRONG>unget_wch</STRONG> places <EM>wch</EM> into the input queue to be returned  by  the  next
+       call  to  <STRONG>wget_wch</STRONG>.  A single input queue serves all windows associated
+       with the terminal.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -136,11 +138,10 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        input character in an additional <EM>wch</EM> parameter instead  of  the  return
        value.
 
-       Unlike   <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot  distinguish  function  key  codes
-       <STRONG>wget_wch</STRONG>  from  conventional  character  codes.   An  application   can
-       overcome this limitation by pushing function key codes with <STRONG>ungetch</STRONG> and
-       subsequently checking the return value of <STRONG>wget_wch</STRONG>  for  a  match  with
-       <STRONG>KEY_CODE_YES</STRONG>.
+       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot distinguish function key codes from
+       conventional  character  codes.   An  application  can  overcome   this
+       limitation  by pushing function key codes with <STRONG>ungetch</STRONG> and subsequently
+       checking the return value of <STRONG>wget_wch</STRONG> for a match with <STRONG>KEY_CODE_YES</STRONG>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
@@ -151,10 +152,10 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
-       See  the  "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding the interaction
+       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
        of <STRONG>wget_wch</STRONG> with signal handlers.
 
 
@@ -162,12 +163,12 @@ <H1 class="no-header">curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index fd8a8909f..15ca56f81 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -69,89 +69,91 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-Reading-Characters">Reading Characters</a></H3><PRE>
-       <STRONG>wgetch</STRONG> gathers a key stroke from the terminal keyboard associated  with
-       a  <EM>curses</EM>  window  <EM>win</EM>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants of this
+       <STRONG>wgetch</STRONG> gathers a key event from the terminal keyboard associated with a
+       <EM>curses</EM>   window  <EM>win</EM>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants  of  this
        function.
 
        When input is pending, <STRONG>wgetch</STRONG> returns an integer  identifying  the  key
-       stroke;  for  alphanumeric and punctuation keys, this value corresponds
-       to the character encoding used by the terminal.  Use of the control key
-       as  a modifier often results in a distinct code.  The behavior of other
-       keys depends on whether <EM>win</EM> is in keypad mode; see  subsection  "Keypad
-       Mode" below.
-
-       If  no input is pending, then if the no-delay flag is set in the window
-       (see <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>), the function returns <STRONG>ERR</STRONG>;  otherwise,  <EM>curses</EM>  waits
-       until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
-       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been  called,
-       it  occurs  when  the  next newline is read.  If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been
-       called, <EM>curses</EM> waits until a character is typed or the specified  delay
+       event; for alphanumeric and punctuation keys, this value corresponds to
+       the character encoding used by the terminal.  Use of the control key as
+       a  modifier,  by  holding  it down while pressing and releasing another
+       key, often results in a distinct code.   The  behavior  of  other  keys
+       depends  on whether <EM>win</EM> is in keypad mode; see subsection "Keypad Mode"
+       below.
+
+       If no input is pending, then if the no-delay flag is set in the  window
+       (see  <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>),  the  function returns <STRONG>ERR</STRONG>; otherwise, <EM>curses</EM> waits
+       until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
+       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been called,
+       it occurs when the next newline is read.   If  <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG>  has  been
+       called,  <EM>curses</EM>  waits  until input is available or the specified delay
        elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
        the returned character <EM>c</EM> to the window (at the cursor position) per the
        following rules.
 
-       <STRONG>o</STRONG>   If  <EM>c</EM>  matches  the  terminal's  erase  character, the cursor moves
-           leftward one  position  and  the  new  position  is  erased  as  if
-           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>  and  then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When the window's
-           keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG>  are
+       <STRONG>o</STRONG>   If <EM>c</EM> matches the  terminal's  erase  character,  the  cursor  moves
+           leftward  one  position  and  the  new  position  is  erased  as if
+           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When  the  window's
+           keypad  mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
            handled the same way.
 
        <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>c</EM> to the window, as with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   If  the  window  has  been moved or modified since the last call to
-           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG>.
+       <STRONG>o</STRONG>   If the window <EM>win</EM> has been moved or modified since the last call to
+           <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG> on it.
 
-       If <EM>c</EM> is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been  called,  <STRONG>wgetch</STRONG>  returns
+       If  <EM>c</EM>  is  a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called, <STRONG>wgetch</STRONG> returns
        the character code for line feed instead.
 
 
 </PRE><H3><a name="h3-Keypad-Mode">Keypad Mode</a></H3><PRE>
-       To  <EM>curses</EM>, key strokes not from the alphabetic section of the keyboard
+       To <EM>curses</EM>, key strokes not from the alphabetic section of the  keyboard
        (those    corresponding    to    the    ECMA-6    character    set--see
-       <STRONG>ascii(7)</STRONG>--optionally  modified by either the control or shift keys) are
+       <STRONG>ascii(7)</STRONG>--optionally modified by either the control or shift keys)  are
        treated as <EM>function</EM> keys.  (In <EM>curses</EM>, the term "function key" includes
-       but  is  not  limited to keycaps engraved with "F1", "PF1", and so on.)
-       If the  window  is  in  keypad  mode,  these  produce  a  numeric  code
-       corresponding  to the <STRONG>KEY_</STRONG> symbols listed in subsection "Predefined Key
-       Codes" below; otherwise, they transmit a sequence  of  codes  typically
-       starting  with  the  escape character, and which must be collected with
+       but is not limited to keycaps engraved with "F1", "PF1",  and  so  on.)
+       If  the  window  is  in  keypad  mode,  these  produce  a  numeric code
+       corresponding to the <STRONG>KEY_</STRONG> symbols listed in subsection "Predefined  Key
+       Codes"  below;  otherwise,  they transmit a sequence of codes typically
+       starting with the escape character, and which must  be  collected  with
        multiple <STRONG>wgetch</STRONG> calls.
 
-       <STRONG>o</STRONG>   The <EM>curses.h</EM> header file declares  many  <EM>predefined</EM>  <EM>function</EM>  <EM>keys</EM>
-           whose  names  begin with <STRONG>KEY_</STRONG>; these object-like macros have values
+       <STRONG>o</STRONG>   The  <EM>curses.h</EM>  header  file  declares many <EM>predefined</EM> <EM>function</EM> <EM>keys</EM>
+           whose names begin with <STRONG>KEY_</STRONG>; these object-like macros  have  values
            outside the range of eight-bit character codes.
 
-       <STRONG>o</STRONG>   In  <EM>ncurses</EM>,  <EM>user-defined</EM>  <EM>function</EM>  <EM>keys</EM>  are   configured   with
-           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>;  they  have no names, but are also expected to have
+       <STRONG>o</STRONG>   In   <EM>ncurses</EM>,   <EM>user-defined</EM>  <EM>function</EM>  <EM>keys</EM>  are  configured  with
+           <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>; they have no names, but are also expected  to  have
            values outside the range of eight-bit codes.
 
-       A variable intended to hold a function key code must thus  be  of  type
+       A  variable  intended  to hold a function key code must thus be of type
        <EM>short</EM> or larger.
 
-       Most  terminals  one  encounters follow the ECMA-48 standard insofar as
-       their function keys  produce  character  sequences  prefixed  with  the
-       escape  character  ESC.   This  fact  implies  that  <EM>curses</EM> cannot know
-       whether the terminal has sent an ESC key stroke or the beginning  of  a
-       function  key's  character  sequence without waiting to see if, and how
-       soon, further input arrives.   When  <EM>curses</EM>  reads  such  an  ambiguous
-       character,  it sets a timer.  If the remainder of the sequence does not
-       arrive within the designated time, <STRONG>wgetch</STRONG> returns the prefix character;
-       otherwise, it returns the function key code corresponding to the unique
-       sequence defined by the terminal.  Consequently, a  user  of  a  <EM>curses</EM>
-       application  may  experience  a  delay  after pressing ESC while <EM>curses</EM>
-       disambiguates the input; see section "EXTENSIONS" below.  If the window
-       is  in "no time-out" mode, the timer does not expire; it is an infinite
-       (or very  large)  value.   See  <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.   Because  function  key
-       sequences  usually  begin  with  an  escape character, the terminal may
-       appear to hang in no time-out mode after  the  user  has  pressed  ESC.
-       Generally, further typing "awakens" <EM>curses</EM>.
+       Most terminals one encounters follow the ECMA-48  standard  insofar  as
+       their  function  keys  produce  character  sequences  prefixed with the
+       escape character ESC.  This fact implies that <EM>curses</EM> cannot distinguish
+       a  user's  press  of  the  escape  key (assuming it sends ESC) from the
+       beginning of a function key's character sequence without waiting to see
+       if,  and  how  soon,  further input arrives.  When <EM>curses</EM> reads such an
+       ambiguous character, it sets a timer.  If the remainder of the sequence
+       does  not  arrive within the designated time, <STRONG>wgetch</STRONG> returns the prefix
+       character; otherwise, it returns the function key code corresponding to
+       the unique sequence defined by the terminal.  Consequently, a user of a
+       <EM>curses</EM> application may experience a delay  after  they  escape  key  is
+       pressed  while <EM>curses</EM> disambiguates the input; see section "EXTENSIONS"
+       below.  If the window is in "no time-out"  mode,  the  timer  does  not
+       expire;  it  is  an infinite (or very large) value.  See <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.
+       Because function key sequences usually begin with ESC, the terminal may
+       appear  to  hang  in no time-out mode after the user presses the escape
+       key.  Generally, further typing "awakens" <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>ungetch</STRONG>  places  <EM>c</EM> into the input queue to be returned by the next call
-       to <STRONG>wgetch</STRONG>.  A single input queue serves all windows.
+       <STRONG>ungetch</STRONG> places <EM>c</EM> into the input queue to be returned by the  next  call
+       to <STRONG>wgetch</STRONG>.  A single input queue serves all windows associated with the
+       terminal.
 
 
 </PRE><H3><a name="h3-Predefined-Key-Codes">Predefined Key Codes</a></H3><PRE>
@@ -178,9 +180,9 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
               <STRONG>KEY_RIGHT</STRONG>
               <STRONG>KEY_HOME</STRONG>        Home key (upward+left arrow)
               <STRONG>KEY_BACKSPACE</STRONG>   Backspace
+
               <STRONG>KEY_F0</STRONG>          Function keys; space for 64 keys is reserved
               <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG>        Function key <EM>n</EM> where 0 &lt;= <EM>n</EM> &lt;= 63
-
               <STRONG>KEY_DL</STRONG>          Delete line
               <STRONG>KEY_IL</STRONG>          Insert line
               <STRONG>KEY_DC</STRONG>          Delete character
@@ -244,9 +246,9 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
               <STRONG>KEY_SCREATE</STRONG>     Shifted create key
               <STRONG>KEY_SDC</STRONG>         Shifted delete character key
               <STRONG>KEY_SDL</STRONG>         Shifted delete line key
+
               <STRONG>KEY_SEND</STRONG>        Shifted end key
               <STRONG>KEY_SEOL</STRONG>        Shifted clear line key
-
               <STRONG>KEY_SEXIT</STRONG>       Shifted exit key
               <STRONG>KEY_SFIND</STRONG>       Shifted find key
               <STRONG>KEY_SHELP</STRONG>       Shifted help key
@@ -332,7 +334,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <EM>curses</EM>  distinguishes  the  Enter  keys  in  the alphabetic and numeric
        keypad sections of a keyboard because (most) terminals  do.   <STRONG>KEY_ENTER</STRONG>
        refers  to the key on the numeric keypad and, like other function keys,
-       and is reliably recognized only if the window's keypad mode is enabled.
+       is reliably recognized only if the window's keypad mode is enabled.
 
        <STRONG>o</STRONG>   The <EM>terminfo</EM> <STRONG>key_enter</STRONG> (<STRONG>kent</STRONG>) capability  describes  the  character
            (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
@@ -372,8 +374,8 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        function  key character sequence from a series of key strokes beginning
        with ESC typed by the user; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       <STRONG>has_key</STRONG> was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and is not found in SVr4  <EM>curses</EM>,
-       4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+       <STRONG>has_key</STRONG> was designed for <EM>ncurses</EM>, and is  not  found  in  SVr4  <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -392,9 +394,9 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        The   behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of  signal  handlers  is
        unspecified in the SVr4 documentation and X/Open Curses.  In historical
        <EM>curses</EM>  implementations,  it  varied depending on whether the operating
-       system's dispatch of a signal to a handler interrupting a <STRONG>read(2)</STRONG>  call
+       system's dispatch of a signal to a handler interrupted a  <STRONG>read(2)</STRONG>  call
        in  progress,  and  also  (in  some  implementations)  whether an input
-       timeout or non-blocking mode has been set.  Programmers concerned about
+       timeout or non-blocking mode had been set.  Programmers concerned about
        portability  should  be  prepared  for  either of two cases: (a) signal
        receipt does not interrupt <STRONG>wgetch</STRONG>; or  (b)  signal  receipt  interrupts
        <STRONG>wgetch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
@@ -424,7 +426,7 @@ <H1 class="no-header">curs_getch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 0142df971..d157fecf8 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -156,7 +156,7 @@ <H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        documented in SVr4.
 
        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM> bytes" but did not state whether the terminating NUL  is  counted  in
+       <EM>n</EM> bytes" but did not state whether the terminating NUL  counted  toward
        that  limit.   X/Open  Curses,  Issue 7 (2009) changed that to say they
        "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
        some implementations count it, some do not:
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 185717002..fa30badb4 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -55,53 +55,53 @@ <H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>void</STRONG> <STRONG>getyx(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>getparyx(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>getbegyx(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>getmaxyx(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
+       <STRONG>void</STRONG> <STRONG>getparyx(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>getyx</STRONG> macro places the current cursor position of the given  window
-       in the two integer variables <EM>y</EM> and <EM>x</EM>.
-
-       If  <EM>win</EM>  is  a  subwindow,  the  <STRONG>getparyx</STRONG>  macro  places  the beginning
-       coordinates of the subwindow relative to the  parent  window  into  two
-       integer variables <EM>y</EM> and <EM>x</EM>.  Otherwise, <STRONG>-1</STRONG> is placed into <EM>y</EM> and <EM>x</EM>.
+       These macros obtain the cursor position and  bounds  information  of  a
+       <EM>curses</EM> window <EM>win</EM>.  <STRONG>getyx</STRONG> stores <EM>win</EM>'s cursor position in the variables
+       <EM>y</EM> and <EM>x</EM>.  <STRONG>getmaxyx</STRONG> stores <EM>win</EM>'s maximum valid row and column numbers in
+       <EM>y</EM> and <EM>x</EM>, respectively.  <STRONG>getbegyx</STRONG> similarly stores the position of <EM>win</EM>'s
+       origin relative to that of the screen (for  <STRONG>stdscr</STRONG>,  these  coordinates
+       are always <STRONG>0</STRONG>).
 
-       Like  <STRONG>getyx</STRONG>,  the  <STRONG>getbegyx</STRONG>  and  <STRONG>getmaxyx</STRONG>  macros  store  the  current
-       beginning coordinates and size of the specified window.
+       If  <EM>win</EM>  is a subwindow (see <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG>), the <STRONG>getparyx</STRONG> macro places the
+       coordinates of its origin relative to its parent window into <EM>y</EM>  and  <EM>x</EM>,
+       and <STRONG>-1</STRONG> into both if it is not.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The return values of these macros are undefined (i.e., they should  not
-       be used as the right-hand side of assignment statements).
+       No return values are defined for macros.  Do not use them as the right-
+       hand side of assignment statements.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All  of these interfaces are macros.  A "&amp;" is not necessary before the
-       variables <EM>y</EM> and <EM>x</EM>.
+       All of these interfaces are implemented as macros.  An "&amp;" operator  is
+       not necessary before the variables <EM>y</EM> and <EM>x</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The <STRONG>getyx</STRONG>, <STRONG>getparyx</STRONG>, <STRONG>getbegyx</STRONG> and  <STRONG>getmaxyx</STRONG>  macros  are  described  in
-       X/Open Curses, Issue 4.
+       These macros are described in X/Open Curses, Issue 4.
 
-       This  implementation also provides functions <STRONG>getbegx</STRONG>, <STRONG>getbegy</STRONG>, <STRONG>getcurx</STRONG>,
-       <STRONG>getcury</STRONG>, <STRONG>getmaxx</STRONG>, <STRONG>getmaxy</STRONG>, <STRONG>getparx</STRONG> and <STRONG>getpary</STRONG> for  compatibility  with
-       older versions of <EM>curses</EM>; see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>.
+       <EM>ncurses</EM>  also  provides  functions  <STRONG>getbegx</STRONG>, <STRONG>getbegy</STRONG>, <STRONG>getcurx</STRONG>, <STRONG>getcury</STRONG>,
+       <STRONG>getmaxx</STRONG>, <STRONG>getmaxy</STRONG>, <STRONG>getparx</STRONG>, and <STRONG>getpary</STRONG>  for  compatibility  with  older
+       versions of <EM>curses</EM>; see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>.
 
-       Although  X/Open  Curses  does  not  address this, many implementations
-       provide members of the <STRONG>WINDOW</STRONG> structure containing values corresponding
-       to  these  macros.  For best portability, do not rely on using the data
-       in <STRONG>WINDOW</STRONG>, since some implementations make <STRONG>WINDOW</STRONG> opaque (do not  allow
-       direct use of its members).
+       Although X/Open Curses does not address the issue, many implementations
+       expose members of the <EM>WINDOW</EM> structure containing values  corresponding
+       to   these   macros.    Do   not   rely  on  their  availability;  some
+       implementations make <EM>WINDOW</EM> opaque (that is, they do not  allow  direct
+       access to its members).
 
        Besides the problem of opaque structures, the data stored in like-named
-       members may not have like-values  in  different  implementations.   For
-       example,  the  <STRONG>WINDOW._maxx</STRONG> and <STRONG>WINDOW._maxy</STRONG> values in <EM>ncurses</EM> have (at
-       least  since  release  1.8.1)  differed  by   one   from   some   other
-       implementations.   The  difference  is  hidden  by  means  of the macro
-       <STRONG>getmaxyx</STRONG>.
+       members  may  not  have  values   of   the   same   meaning   different
+       implementations.    For   example,   the  values  of  <STRONG>WINDOW._maxx</STRONG>  and
+       <STRONG>WINDOW._maxy</STRONG> in <EM>ncurses</EM> have long  differed  by  one  from  some  other
+       implementations.  The <STRONG>getmaxyx</STRONG> macro hides this difference.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 15bd134e9..e2a00a625 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -56,67 +56,56 @@ <H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <STRONG>chtype</STRONG> <STRONG>inch(void);</STRONG>
        <STRONG>chtype</STRONG> <STRONG>winch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-
        <STRONG>chtype</STRONG> <STRONG>mvinch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>chtype</STRONG> <STRONG>mvwinch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  routines  return  the  character, of type <STRONG>chtype</STRONG>, at the current
-       position in the named window.  If  any  attributes  are  set  for  that
-       position,  their  values  are OR'ed into the value returned.  Constants
-       defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical AND) operator  to
-       extract the character or attributes alone.
-
-
-</PRE><H3><a name="h3-Attributes">Attributes</a></H3><PRE>
-       The  following  bit  masks  may  be  AND-ed with characters returned by
-       <STRONG>winch</STRONG>.
-
-       <STRONG>Name</STRONG>           <STRONG>Description</STRONG>
-       ------------------------------------------------------------------------
-       <STRONG>A_CHARTEXT</STRONG>     Extract character
-       <STRONG>A_ATTRIBUTES</STRONG>   Extract attributes
-       <STRONG>A_COLOR</STRONG>        Extract color pair information
+       <STRONG>winch</STRONG>  returns the <EM>curses</EM> character, including rendering attributes and
+       color pair identifier, at  the  cursor  position  in  the  window  <EM>win</EM>.
+       Subsection  "Video  Attributes"  of  <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG> explains how to extract
+       these data from a <EM>chtype</EM>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants  of  this
+       function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       The  <STRONG>winch</STRONG>  function  does  not  return an error if the window contains
-       characters larger than 8-bits (255).  Only the low-order 8 bits of  the
-       character are used by <STRONG>winch</STRONG>.
+       These functions do not return an error if the window comprises cells of
+       <EM>curses</EM>  complex characters (that is, they contain characters with codes
+       wider than eight bits, or greater  than  255  as  an  unsigned  decimal
+       integer).   They  instead  extract  only  the  low-order  eight bits of
+       character data in the cell.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all of these routines may be macros.
+       <STRONG>inch</STRONG>, <STRONG>mvinch</STRONG>, and <STRONG>mvwinch</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       Very  old systems (before standardization) provide a different function
-       with the same name:
 
-       <STRONG>o</STRONG>   The <STRONG>winch</STRONG> function was part of the  original  BSD  curses  library,
-           which   stored   a  7-bit  character  combined  with  the  <EM>standout</EM>
-           attribute.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <STRONG>winch</STRONG>  was  implemented  in  the original 4BSD <EM>curses</EM> library (November
+       1980).  It returned only the character code (as an  integer)  with  the
+       "standout"  attribute bit (the only one it supported) cleared.  Because
+       7-bit ASCII was the only character  encoding  supported,  4BSD's  <STRONG>winch</STRONG>
+       returned a <EM>char</EM> type.
 
-           In BSD curses, <STRONG>winch</STRONG> returned only the character  (as  an  integer)
-           with the <EM>standout</EM> attribute removed.
+       System V  <EM>curses</EM>  (1983)  permitted  several rendering attributes to be
+       combined with a character in a window.   Reflecting  this  improvement,
+       <STRONG>winch</STRONG>  returned  an <EM>int</EM> in SVr3.2 (1988) and switched to <EM>chtype</EM> in SVr4
+       (1989).
 
-       <STRONG>o</STRONG>   System  V  curses  added support for several video attributes which
-           could be combined with characters in the window.
-
-           Reflecting this improvement, the function was altered to return the
-           character combined with all video attributes in a <STRONG>chtype</STRONG> value.
-
-       X/Open Curses does not specify the size and layout of attributes, color
-       and character values in <STRONG>chtype</STRONG>; it is  implementation-dependent.   This
-       implementation  uses 8 bits for character values.  An application using
-       more bits,  e.g.,  a  Unicode  value,  should  use  the  wide-character
-       equivalents to these functions.
+       X/Open Curses does not specify the sizes of the character code or color
+       pair  identifier,  nor  the  quantity  of  rendering attribute bits, in
+       <EM>chtype</EM>; these are implementation-dependent.  <EM>ncurses</EM>  uses  eight  bits
+       for  the  character  code.   An application requiring a wider character
+       type, for instance to handle Unicode,  should  use  the  wide-character
+       counterparts of these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -127,20 +116,17 @@ <H1 class="no-header">curs_inch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
-<ul>
-<li><a href="#h3-Attributes">Attributes</a></li>
-</ul>
-</li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index cdb42f278..1b266fd4b 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp @
+  * @Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -373,12 +373,12 @@ <H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
        appears in the string read.
 
-       Mouse event reports from <EM>xterm</EM> are not detected correctly in  a  window
-       with  keypad application mode disabled, since they are interpreted as a
-       variety of function key.  Set the terminal's <EM>terminfo</EM> capability  <STRONG>kmous</STRONG>
-       to  "\E[M" (the beginning of the response from <EM>xterm</EM> for mouse clicks).
-       Other values of <STRONG>kmous</STRONG> are permitted under the same assumption, that is,
-       the report begins with that sequence.
+       An <EM>ncurses</EM> window must enable <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  to  correctly  receive  mouse
+       event  reports  from  <EM>xterm</EM>  since they are encoded like function keys.
+       Set the terminal's <EM>terminfo</EM> capability <STRONG>kmous</STRONG> to "\E[M"  (the  beginning
+       of  the  response  from <EM>xterm</EM> for mouse clicks).  Other values of <STRONG>kmous</STRONG>
+       are permitted under the same assumption, that  is,  the  report  begins
+       with that sequence.
 
        Because there are no standard response sequences that serve to identify
        terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
@@ -394,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 7f04d92ea..d61be7493 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -47,16 +47,16 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>clearok</STRONG>,   <STRONG>idlok</STRONG>,   <STRONG>idcok</STRONG>,  <STRONG>immedok</STRONG>,  <STRONG>leaveok</STRONG>,  <STRONG>setscrreg</STRONG>,  <STRONG>wsetscrreg</STRONG>,
-       <STRONG>scrollok</STRONG> - set <EM>curses</EM> output options
+       <STRONG>clearok</STRONG>,   <STRONG>idcok</STRONG>,   <STRONG>idlok</STRONG>,   <STRONG>immedok</STRONG>,   <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>setscrreg</STRONG>,
+       <STRONG>wsetscrreg</STRONG> - set <EM>curses</EM> output options
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>clearok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>idlok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>idcok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>idlok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>immedok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>leaveok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>scrollok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
@@ -81,6 +81,14 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        repainted from scratch.
 
 
+</PRE><H3><a name="h3-idcok">idcok</a></H3><PRE>
+       If <STRONG>idcok</STRONG> is called with <STRONG>FALSE</STRONG> as  second  argument,  <STRONG>curses</STRONG>  no  longer
+       considers   using  the  hardware  insert/delete  character  feature  of
+       terminals so equipped.  Use of character insert/delete  is  enabled  by
+       default.   Calling <STRONG>idcok</STRONG> with <STRONG>TRUE</STRONG> as second argument re-enables use of
+       character insertion and deletion.
+
+
 </PRE><H3><a name="h3-idlok">idlok</a></H3><PRE>
        If <STRONG>idlok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, <STRONG>curses</STRONG> considers using
        the  hardware  insert/delete  line  feature  of  terminals so equipped.
@@ -93,14 +101,6 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        changed portions of all lines.
 
 
-</PRE><H3><a name="h3-idcok">idcok</a></H3><PRE>
-       If <STRONG>idcok</STRONG> is called with <STRONG>FALSE</STRONG> as  second  argument,  <STRONG>curses</STRONG>  no  longer
-       considers   using  the  hardware  insert/delete  character  feature  of
-       terminals so equipped.  Use of character insert/delete  is  enabled  by
-       default.   Calling <STRONG>idcok</STRONG> with <STRONG>TRUE</STRONG> as second argument re-enables use of
-       character insertion and deletion.
-
-
 </PRE><H3><a name="h3-immedok">immedok</a></H3><PRE>
        If <STRONG>immedok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, any  change  in  the
        window  image,  such  as  the  ones caused by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>,
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -205,8 +205,8 @@ <H1 class="no-header">curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-clearok">clearok</a></li>
-<li><a href="#h3-idlok">idlok</a></li>
 <li><a href="#h3-idcok">idcok</a></li>
+<li><a href="#h3-idlok">idlok</a></li>
 <li><a href="#h3-immedok">immedok</a></li>
 <li><a href="#h3-leaveok">leaveok</a></li>
 <li><a href="#h3-scrollok">scrollok</a></li>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 7695f68c4..4b84cd782 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 386b4b4b3..681a1a1a8 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</H1
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>baudrate</STRONG>,  <STRONG>erasechar</STRONG>,  <STRONG>erasewchar</STRONG>, <STRONG>has_ic</STRONG>, <STRONG>has_il</STRONG>, <STRONG>killchar</STRONG>, <STRONG>killwchar</STRONG>,
-       <STRONG>longname</STRONG>, <STRONG>term_attrs</STRONG>, <STRONG>termattrs</STRONG>, <STRONG>termname</STRONG> -  <EM>curses</EM>  environment  query
-       routines
+       <STRONG>longname</STRONG>, <STRONG>term_attrs</STRONG>,  <STRONG>termattrs</STRONG>,  <STRONG>termname</STRONG>  -  get  and  set  terminal
+       attributes with <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-04-20                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 6160a2cad..bce853e26 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -64,7 +64,7 @@ <H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
 
-       <STRONG>void</STRONG> <STRONG>use_env(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>use_env(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>putwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
        <STRONG>WINDOW</STRONG> <STRONG>*getwin(FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
@@ -74,7 +74,7 @@ <H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
-       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>f</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -192,159 +192,158 @@ <H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
               <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
               -----------------------------------------------------------------
-              <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        This  is  the  default behavior.  <EM>ncurses</EM>
-                                     uses  operating   system   calls   unless
-                                     overridden    by    <EM>LINES</EM>    or   <EM>COLUMNS</EM>
+              <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        <EM>ncurses</EM>   uses   operating  system  calls
+                                     unless overridden  by  <EM>LINES</EM>  or  <EM>COLUMNS</EM>
                                      environment variables; default.
-              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM> updates <EM>LINES</EM> and  <EM>COLUMNS</EM>  based
+              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  updates  <EM>LINES</EM> and <EM>COLUMNS</EM> based
                                      on operating system calls.
-              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  ignores <EM>LINES</EM> and <EM>COLUMNS</EM>, using
+              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM> ignores <EM>LINES</EM> and <EM>COLUMNS</EM>,  using
                                      operating system calls to obtain size.
 
 
 </PRE><H3><a name="h3-putwin_getwin">putwin, getwin</a></H3><PRE>
-       The <STRONG>putwin</STRONG> routine writes all data associated with window (or pad)  <EM>win</EM>
-       into  the  file  to  which <EM>filep</EM> points.  This information can be later
+       The  <STRONG>putwin</STRONG> routine writes all data associated with window (or pad) <EM>win</EM>
+       into the file to which <EM>filep</EM> points.  This  information  can  be  later
        retrieved using the <STRONG>getwin</STRONG> function.
 
-       The <STRONG>getwin</STRONG> routine reads window related data  stored  in  the  file  by
-       <STRONG>putwin</STRONG>.   The  routine  then creates and initializes a new window using
-       that data.  It returns a pointer to the new window.  There  are  a  few
+       The  <STRONG>getwin</STRONG>  routine  reads  window  related data stored in the file by
+       <STRONG>putwin</STRONG>.  The routine then creates and initializes a  new  window  using
+       that  data.   It  returns a pointer to the new window.  There are a few
        caveats:
 
-       <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <EM>WINDOW</EM> structure, and its
-           associated character cells.  The format differs between  the  wide-
-           character  (<EM>ncursesw</EM>)  and  non-wide  (<EM>ncurses</EM>) libraries.  You can
+       <STRONG>o</STRONG>   the data written is  a  copy  of  the  <EM>WINDOW</EM>  structure,  and  its
+           associated  character  cells.  The format differs between the wide-
+           character (<EM>ncursesw</EM>) and non-wide  (<EM>ncurses</EM>)  libraries.   You  can
            transfer data between the two, however.
 
-       <STRONG>o</STRONG>   the retrieved window is always created as a  top-level  window  (or
+       <STRONG>o</STRONG>   the  retrieved  window  is always created as a top-level window (or
            pad), rather than a subwindow.
 
-       <STRONG>o</STRONG>   the  window's character cells contain the color pair <EM>value</EM>, but not
-           the actual color <EM>numbers</EM>.  If cells in  the  retrieved  window  use
-           color  pairs  which  have not been created in the application using
+       <STRONG>o</STRONG>   the window's character cells contain the color pair <EM>value</EM>, but  not
+           the  actual  color  <EM>numbers</EM>.   If cells in the retrieved window use
+           color pairs which have not been created in  the  application  using
            <STRONG>init_pair</STRONG>, they will not be colored when the window is refreshed.
 
 
 </PRE><H3><a name="h3-delay_output">delay_output</a></H3><PRE>
-       The <STRONG>delay_output</STRONG> routine inserts an <EM>ms</EM>  millisecond  pause  in  output.
-       Employ  this  function  judiciously  when terminal output uses padding,
-       because <EM>ncurses</EM>  transmits  null  characters  (consuming  CPU  and  I/O
-       resources)  instead  of  sleeping  and  requesting  resumption from the
+       The  <STRONG>delay_output</STRONG>  routine  inserts  an <EM>ms</EM> millisecond pause in output.
+       Employ this function judiciously when  terminal  output  uses  padding,
+       because  <EM>ncurses</EM>  transmits  null  characters  (consuming  CPU  and I/O
+       resources) instead of  sleeping  and  requesting  resumption  from  the
        operating system.  Padding is used unless:
 
        <STRONG>o</STRONG>   the terminal description has <STRONG>npc</STRONG> (<STRONG>no_pad_char</STRONG>) capability, or
 
        <STRONG>o</STRONG>   the environment variable <STRONG>NCURSES_NO_PADDING</STRONG> is set.
 
-       If padding is not in use, <EM>ncurses</EM> uses <STRONG>napms</STRONG> to perform the delay.   If
-       the  value  of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped at that
+       If  padding is not in use, <EM>ncurses</EM> uses <STRONG>napms</STRONG> to perform the delay.  If
+       the value of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped  at  that
        value.
 
 
 </PRE><H3><a name="h3-flushinp">flushinp</a></H3><PRE>
-       The <STRONG>flushinp</STRONG> routine throws away any typeahead that has been  typed  by
+       The  <STRONG>flushinp</STRONG>  routine throws away any typeahead that has been typed by
        the user and has not yet been read by the program.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except  for  <STRONG>flushinp</STRONG>,  routines that return an integer return <STRONG>ERR</STRONG> upon
-       failure and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than  <STRONG>ERR</STRONG>")
+       Except for <STRONG>flushinp</STRONG>, routines that return an integer  return  <STRONG>ERR</STRONG>  upon
+       failure  and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")
        upon successful completion.
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
        implementation
 
           <STRONG>flushinp</STRONG>
                returns an error if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns an error if  the  associated  <STRONG>fwrite</STRONG>  calls  return  an
+               returns  an  error  if  the  associated  <STRONG>fwrite</STRONG> calls return an
                error.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
-       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
+       vaguest  terms.   The  description  here  is adapted from X/Open Curses
        (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
-       The  limitation  to  30  seconds and the use of <STRONG>napms</STRONG> differ from other
+       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
        implementations.
 
        <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
 
-       <STRONG>o</STRONG>   NetBSD curses uses <STRONG>napms</STRONG> when no padding  character  is  available,
-           but  does  not  take  timing  into  account  when using the padding
+       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
+           but does not take  timing  into  account  when  using  the  padding
            character.
 
        Neither limits the delay.
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
-       capabilities  which are defined in the terminfo entry via the <STRONG>-x</STRONG> option
+       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
+       capabilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option
        of <STRONG>tic</STRONG>.  This implementation automatically assigns at run-time keycodes
-       to  user-defined  strings  which begin with "k".  The keycodes start at
+       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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  controls
-       whether  this  data  is loaded when the terminal description is read by
+       because user-defined codes are merged from  all  terminal  descriptions
+       which  have  been loaded.  The <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function controls
+       whether this data is loaded when the terminal description  is  read  by
        the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
-       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <EM>ncurses</EM>.   They
-       were  not  supported on Version 7, BSD or System V implementations.  It
-       is recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions  be
+       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
+       were not supported on Version 7, BSD or System V  implementations.   It
+       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The   files   written   and   read   by   these  functions  use  an
-           implementation-specific format.  Although the format is an  obvious
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.)  originated  with
+           Interestingly enough, according to the copyright dates  in  Solaris
+           source,  the  functions (along with <STRONG>scr_init</STRONG>, etc.) originated with
            the University of California, Berkeley (in 1982) and were later (in
-           1988) incorporated into SVr4.  Oddly, there are no  such  functions
+           1988)  incorporated  into SVr4.  Oddly, there are no such functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
+           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
            older <EM>ncurses</EM> versions.  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
-           <STRONG>fwrite</STRONG>  and  <STRONG>fread</STRONG>  functions).   Those  that use textual dumps use
+           The  implementations  which  use  binary  dumps  use block-I/O (the
+           <STRONG>fwrite</STRONG> and <STRONG>fread</STRONG> 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.  However, reading from a
+           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.  However, reading from  a
            file written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
+       X/Open  Curses,  Issue  4  describes  these  functions.  It states that
        <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but does
-       not define any error conditions.  This implementation checks for  three
+       not  define any error conditions.  This implementation checks for three
        cases:
 
-       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
-           returns the  parameter,  i.e.,  a  one-character  string  with  the
-           parameter  as  the  first  character.   Otherwise, it returns "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -355,44 +354,44 @@ <H1 class="no-header">curs_util 3x 2024-04-20 ncurses 6.5 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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  printable.
-       This  implementation  uses  8  bits  but  does not modify the string to
-       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
+       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 printable.
+       This implementation uses 8 bits but  does  not  modify  the  string  to
+       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
-       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses   is
-       initialized.   X/Open  Curses  does not document the treatment of codes
+       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
+       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
+       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before   initializing  curses),  this  implementation  returns  strings
+       before  initializing  curses),  this  implementation  returns   strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
+       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
-       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
-       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
+       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
+       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
+       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 44cb12fb7..dd23d8b05 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp @
+  * @Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-03-16 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2024-03-16 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-03-16                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2024-05-11                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 4213f6942..f44336b31 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp @
+  * @Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2024-03-16 ncurses 6.5 User commands</TITLE>
+<TITLE>infotocap 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infotocap 1m 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2024-03-16 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.5                       2024-05-11                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 9b061acba..64f23bbb8 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp @
+  * @Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,20 +61,20 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240427).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240511).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
-       and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; the reading of terminal
-       input; control of terminal input and output options; environment  query
-       routines;  color  manipulation;  the  definition  and use of <EM>soft</EM> <EM>label</EM>
-       keys; <EM>terminfo</EM> capability access; a  <EM>termcap</EM>  compatibility  interface;
-       and  an  abstraction  of the system's API for manipulating the terminal
-       (such as <STRONG>termios(3)</STRONG>).
-
-       <EM>ncurses</EM> implements the standard interface described  by  X/Open  Curses
-       Issue 7.   In  many  behavioral  details  not  standardized  by X/Open,
-       <EM>ncurses</EM> emulates the <EM>curses</EM>  library  of  SVr4  and  provides  numerous
-       useful extensions.
+       and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
+       and mouse  events;  control  of  terminal  input  and  output  options;
+       selection   of   color  and  rendering  attributes  (such  as  bold  or
+       underline); the definition and use of <EM>soft</EM> <EM>label</EM> keys;  access  to  the
+       <EM>terminfo</EM>   terminal   capability   database;  a  <EM>termcap</EM>  compatibility
+       interface; and an abstraction of the system's API for manipulating  the
+       terminal (such as <STRONG>termios(3)</STRONG>).
+
+       <EM>ncurses</EM>  implements  the  interface described by X/Open Curses Issue 7.
+       In many behavioral details not standardized by X/Open, <EM>ncurses</EM> emulates
+       the <EM>curses</EM> library of SVr4 and provides numerous useful extensions.
 
        <EM>ncurses</EM>  man  pages employ several sections to clarify matters of usage
        and interoperability with other <EM>curses</EM> implementations.
@@ -160,63 +160,63 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        cursor and write a character to <STRONG>stdscr</STRONG>, respectively.
 
        Frequent changes to the terminal screen can cause unpleasant flicker or
-       inefficient use of the communication channel  to  the  device,  so  the
-       library  does  not generally update it automatically.  Therefore, after
+       inefficient use of the communication channel to the  device,  so  as  a
+       rule  the  library  does not update it automatically.  Therefore, after
        using <EM>curses</EM> functions to accumulate a set of desired updates that make
        sense to present together, call <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to tell the library to make
        the user's screen look like <STRONG>stdscr</STRONG>.  The library <EM>optimizes</EM>  its  output
-       by  computing  a minimal number of operations to mutate the screen from
+       by  computing  a minimal volume of operations to mutate the screen from
        its  state  at  the  previous  refresh  to  the  new  one.    Effective
        optimization  demands  accurate  information about the terminal device:
        the management of such information is the province of the  <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG>
        API, a feature of every standard <EM>curses</EM> implementation.
 
-       Special windows called <EM>pads</EM> may also be manipulated.  These are windows
-       that are not constrained to the size of the terminal screen  and  whose
-       contents need not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
+       Special  windows  called  <EM>pads</EM>  may also be manipulated.  These are not
+       constrained to the size of the terminal screen and their contents  need
+       not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
-       In  addition  to drawing characters on the screen, rendering attributes
-       and colors may be supported, causing the characters to show up in  such
-       modes  as  underlined,  in reverse video, or in color on terminals that
-       support such display enhancements.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
+       Many  terminals  support configuration of character cell foreground and
+       background colors  as  well  as  rendering  <EM>attributes</EM>  <EM>,</EM>  which  cause
+       characters  to  show  up  in such modes as boldfaced, underlined, or in
+       reverse video.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
        <EM>curses</EM> predefines constants for a small set of  forms-drawing  graphics
        corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
-       VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
+       VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
-       <EM>curses</EM> is implemented using the  operating  system's  terminal  driver;
-       keystroke  events are received not as scan codes but as byte sequences.
-       Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
-       appear  as-is.   Everything  else,  including  the  tab,  enter/return,
-       keypad, arrow, and function keys, appears as a control character  or  a
-       multibyte  <EM>escape</EM>  <EM>sequence.</EM>   <EM>curses</EM>  translates these into unique <EM>key</EM>
-       <EM>codes.</EM>  See <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+       <EM>curses</EM> is implemented using the operating system's terminal driver; key
+       events are received not as scan codes but as byte sequences.  Graphical
+       keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
+       is.   Everything  else, including the tab, enter/return, keypad, arrow,
+       and function keys, appears as a control character or a multibyte <EM>escape</EM>
+       <EM>sequence.</EM>   <EM>curses</EM>  translates  the  latter into unique <EM>key</EM> <EM>codes.</EM>  See
+       <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
        <EM>ncurses</EM> provides reimplementations of the SVr4 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, and
-       <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG> libraries to ease construction of user interfaces with <EM>curses</EM>.
+       <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>   libraries;   they   permit   overlapping  windows  and  ease
+       construction of user interfaces with <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The   selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the  process
+       The  selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the   process
        environment  is  essential  to  correct  <EM>curses</EM>  and  <EM>terminfo</EM>  library
-       operation.   A  well-configured  system  selects  a  correct <EM>TERM</EM> value
-       automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  may   assist   with   troubleshooting   exotic
+       operation.  A well-configured  system  selects  a  correct  <EM>TERM</EM>  value
+       automatically;   <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>   may   assist   with  troubleshooting  exotic
        situations.
 
-       If  you  change the terminal type, export the <EM>TERM</EM> environment variable
-       in the shell, then  run  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  or  the  "<STRONG>tput</STRONG>  <STRONG>init</STRONG>"  command.   See
-       subsection "Tabs and Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       If you change the terminal type, export the shell's <EM>TERM</EM> variable, then
+       run  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  or  the  "<STRONG>tput</STRONG>  <STRONG>init</STRONG>"  command.  See subsection "Tabs and
+       Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
-       <EM>curses</EM> program is executing in a graphical windowing  environment,  the
-       information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
+       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
+       <EM>curses</EM>  program  is executing in a graphical windowing environment, the
+       information obtained thence overrides that obtained  by  <EM>terminfo</EM>.   An
        <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
-       checks  first  for  a  terminal  type  description  in  the location it
-       identifies.   <EM>TERMINFO</EM>  is  useful  for  developing  experimental  type
-       descriptions  or  when  write  permission to <EM>/usr/share/terminfo</EM> is not
-       available.
+       If  the  environment  variable  <EM>TERMINFO</EM>  is  defined, a <EM>curses</EM> program
+       checks first for  a  terminal  type  description  in  the  location  it
+       identifies.   <EM>TERMINFO</EM>  is  useful  for developing type descriptions or
+       when write permission to <EM>/usr/share/terminfo</EM> is not available.
 
        See section "ENVIRONMENT" below.
 
@@ -234,7 +234,7 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
        parameters.
 
-                       <EM>bf</EM>    <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
+                       <EM>bf</EM>    a <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
                        <EM>c</EM>     a <EM>char</EM> or <EM>int</EM>
                        <EM>ch</EM>    a <EM>chtype</EM>
                        <EM>wc</EM>    a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> or <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>
@@ -244,17 +244,21 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
-       This manual page describes functions that appear in  any  configuration
-       of  the  library.   There  are  two  common configurations; see section
-       "ALTERNATE CONFIGURATIONS" below.
+       This  man  page  primarily  surveys  functions  that  appear   in   any
+       configuration of the library.  There are two common configurations; see
+       section "ALTERNATE CONFIGURATIONS" below.
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
                  eight-bit  characters.   It  stores a character combined with
-                 attributes in a <EM>chtype</EM> datum, which is often an alias of <EM>int</EM>.
+                 attributes and a color pair in a <EM>chtype</EM> datum, which is often
+                 an alias of <EM>int</EM>.  A string of <EM>curses</EM> characters is similar to
+                 a C <EM>char</EM> string; a <EM>chtype</EM> string ends with an integral <STRONG>0</STRONG>, the
+                 null <EM>curses</EM> character.
 
-                 Attributes alone (with no  corresponding  character)  can  be
-                 stored  in  variables  of  <EM>chtype</EM>  or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> type.  In either
-                 case, they are represented as an integral bit mask.
+                 Attributes  and a color pair selection (with no corresponding
+                 character) can be stored in variables  of  <EM>chtype</EM>  or  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
+                 type.   In either case, they are accessed via an integral bit
+                 mask.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.
 
@@ -272,53 +276,56 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                           cell  (as  with  accent marks and other diacritics).
                           Each  character  is  of  type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a   complex
                           character contains one spacing character and zero or
-                          more non-spacing characters (see below).  Attributes
-                          and  color data are stored in separate fields of the
-                          structure, not combined as in <EM>chtype</EM>.
+                          more non-spacing characters (see below).   A  string
+                          of  complex  characters  ends  with  a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose
+                          <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  member  is   the   null   wide   character.
+                          Attributes  and a color pair selection are stored in
+                          separate fields of the structure, not combined  into
+                          an integer as in <EM>chtype</EM>.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
-                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG> and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
-                 data.   The  wide  library API of <EM>ncurses</EM> depends on two data
+                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
+                 data.  The wide library API of <EM>ncurses</EM> depends  on  two  data
                  types standardized by ISO C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype</EM>, it may be  an
-                          alias  of <EM>int</EM>.  Depending on the character encoding,
-                          a wide character may be  <EM>spacing</EM>,  meaning  that  it
-                          occupies  a  character  cell by itself and typically
-                          accompanies  cursor  advancement,  or   <EM>non-spacing</EM>,
-                          meaning  that it occupies the same cell as a spacing
-                          character, is often regarded as a "modifier" of  the
-                          base  glyph  with  which  it combines, and typically
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype</EM>, it may be an
+                          alias of <EM>int</EM>.  Depending on the character  encoding,
+                          a  wide  character  may  be <EM>spacing</EM>, meaning that it
+                          occupies a character cell by  itself  and  typically
+                          accompanies   cursor  advancement,  or  <EM>non-spacing</EM>,
+                          meaning that it occupies the same cell as a  spacing
+                          character,  is often regarded as a "modifier" of the
+                          base glyph with which  it  combines,  and  typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
-                          analogously  to the <EM>int</EM>-sized character manipulation
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can   store   a   <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or  the  constant  <STRONG>WEOF</STRONG>,
+                          analogously to the <EM>int</EM>-sized character  manipulation
                           functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
-                 The  wide  library   provides   additional   functions   that
-                 complement  those  in  the non-wide library where the size of
-                 the underlying character type  is  significant.   A  somewhat
-                 regular  naming  convention relates many of the wide variants
-                 to their non-wide counterparts;  where  a  non-wide  function
-                 name  contains  "ch"  or "str", prefix it with "_w" to obtain
-                 the wide counterpart.  For example, <STRONG>waddch</STRONG> becomes  <STRONG>wadd_wch</STRONG>.
-                 (Exceptions  that  add only "w" comprise <STRONG>addwstr</STRONG>, <STRONG>inwstr</STRONG>, and
+                 The   wide   library   provides   additional  functions  that
+                 complement those in the non-wide library where  the  size  of
+                 the  underlying  character  type  is significant.  A somewhat
+                 regular naming convention relates many of the  wide  variants
+                 to  their  non-wide  counterparts;  where a non-wide function
+                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
+                 the  wide counterpart.  For example, <STRONG>waddch</STRONG> becomes <STRONG>wadd_wch</STRONG>.
+                 (Exceptions that add only "w" comprise <STRONG>addwstr</STRONG>,  <STRONG>inwstr</STRONG>,  and
                  their variants.)
 
-                 This convention is inapplicable  to  some  non-wide  function
+                 This  convention  is  inapplicable  to some non-wide function
                  names,  so  other  transformations  are  used  for  the  wide
                  configuration:  the  window  background  management  function
-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
-                 -clearing functions are suffixed with "_set";  and  character
-                 attribute   manipulation   functions   like  "attron"  become
+                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+                 -clearing  functions  are suffixed with "_set"; and character
+                 attribute  manipulation  functions   like   "attron"   become
                  "attr_on".
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
-       and  wide  APIs  and  the  corresponding  man pages that describe them.
-       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
+       and wide APIs and the  corresponding  man  pages  that  describe  them.
+       Those  flagged  with  "*"  are  <EM>ncurses</EM>-specific,  neither described by
        X/Open Curses nor present in SVr4.
 
                     <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
@@ -375,12 +382,12 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     delscreen                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+
                     delwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     derwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     echo_wchar               <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     echochar                 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     endwin                   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
@@ -442,11 +449,11 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     init_extended_color      <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
+
                     init_extended_pair       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
-
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     ins_wch                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
@@ -509,10 +516,10 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     mvcur                    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvderwin                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     mvget_wch                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
-
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
@@ -576,9 +583,9 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwprintw                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+
                     mvwscanw                 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     mvwvline                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
-
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
@@ -643,8 +650,8 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_label                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-                    slk_noutrefresh          <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
+                    slk_noutrefresh          <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_refresh              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -776,8 +783,8 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
-
                     wstandend                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
                     wstandout                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wsyncdown                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wsyncup                  <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
@@ -787,235 +794,235 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       <EM>ncurses</EM>'s    <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional   functions
-       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
+       <EM>ncurses</EM>'s   <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional    functions
+       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       The  availability  of  some  extensions is configurable when <EM>ncurses</EM> is
-       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
+       The availability of some extensions is  configurable  when  <EM>ncurses</EM>  is
+       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
        below.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Unless  otherwise  noted, functions that return an integer return <STRONG>OK</STRONG> on
-       success and <STRONG>ERR</STRONG> on failure.  Functions that return pointers return <STRONG>NULL</STRONG>
-       on  failure.   Typically,  <EM>ncurses</EM>  treats  a  null pointer passed as a
-       function parameter as a failure.  Functions prefixed  with  "mv"  first
-       perform  cursor movement and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the
-       window boundaries.
+       Unless otherwise noted,  functions  that  return  integers  return  the
+       constants  <STRONG>OK</STRONG>  on  success  and <STRONG>ERR</STRONG> on failure; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       Functions that return pointers  return  <STRONG>NULL</STRONG>  on  failure.   Typically,
+       <EM>ncurses</EM>  treats  a  null  pointer  passed  as a function parameter as a
+       failure.  Functions prefixed with "mv" first  perform  cursor  movement
+       and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The following  symbols  from  the  process  environment  customize  the
-       runtime   behavior   of  <EM>ncurses</EM>  applications.   The  library  may  be
-       configured  to  disregard  the   variables   <EM>TERMINFO</EM>,   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
-       <EM>TERMPATH</EM>,  and  <EM>HOME</EM>,  if  the  user  is  the  superuser (root), or the
+       The  following  symbols  from  the  process  environment  customize the
+       runtime  behavior  of  <EM>ncurses</EM>  applications.   The  library   may   be
+       configured   to   disregard   the  variables  <EM>TERMINFO</EM>,  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
+       <EM>TERMPATH</EM>, and <EM>HOME</EM>, if  the  user  is  the  superuser  (root),  or  the
        application uses <STRONG>setuid(2)</STRONG> or <STRONG>setgid(2)</STRONG>.
 
 
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
-       The debugging library checks this variable  when  the  application  has
-       redirected  output  to a file.  Its integral value is used for the baud
-       rate.  If that value is absent or invalid,  <EM>ncurses</EM>  uses  9600.   This
-       feature  allows  testers  to  construct repeatable test cases that take
+       The  debugging  library  checks  this variable when the application has
+       redirected output to a file.  Its integral value is used for  the  baud
+       rate.   If  that  value  is absent or invalid, <EM>ncurses</EM> uses 9600.  This
+       feature allows developers to construct repeatable test cases that  take
        into account optimization decisions that depend on baud rate.
 
 
 </PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
-       When set, the <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of  loaded
+       When  set,  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability value of loaded
        <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
        Because this name is also used in development environments to represent
-       the  C  compiler's  name,  <EM>ncurses</EM>  ignores  its value if it is not one
+       the C compiler's name, <EM>ncurses</EM> ignores its  value  if  it  is  not  one
        character in length.
 
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        This  variable  specifies  the  width  of  the  screen  in  characters.
-       Applications  running  in  a  windowing environment usually are able to
+       Applications running in a windowing environment  usually  are  able  to
        obtain the width of the window in which they are executing.  If <EM>COLUMNS</EM>
        is not defined and the terminal's screen size is not available from the
-       terminal driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG>  (<STRONG>cols</STRONG>)
-       capability  of  the  terminal type's entry in the <EM>terminfo</EM> database, if
+       terminal  driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG> (<STRONG>cols</STRONG>)
+       capability of the terminal type's entry in the  <EM>terminfo</EM>  database,  if
        any.
 
-       It is important that your application  use  the  correct  screen  size.
-       Automatic   detection   thereof  is  not  always  possible  because  an
-       application may  be  running  on  a  host  that  does  not  honor  NAWS
-       (Negotiations  About  Window  Size)  or as a different user ID than the
-       owner of the  terminal  device  file.   Setting  <EM>COLUMNS</EM>  and/or  <EM>LINES</EM>
-       overrides  the  library's  use  of  the  screen  size obtained from the
+       It  is  important  that  your  application use the correct screen size.
+       Automatic  detection  thereof  is  not  always  possible   because   an
+       application  may  be  running  on  a  host  that  does  not  honor NAWS
+       (Negotiations About Window Size) or as a different  user  ID  than  the
+       owner  of  the  terminal  device  file.   Setting  <EM>COLUMNS</EM> and/or <EM>LINES</EM>
+       overrides the library's use  of  the  screen  size  obtained  from  the
        operating system.
 
-       The <EM>COLUMNS</EM> and <EM>LINES</EM> variables may be specified  independently.   This
-       property  is  useful  to circumvent misfeatures of legacy terminal type
-       descriptions; <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were  once
-       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
+       The  <EM>COLUMNS</EM>  and <EM>LINES</EM> variables may be specified independently.  This
+       property is useful to circumvent misfeatures of  legacy  terminal  type
+       descriptions;  <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were once
+       notorious.   For  best  results,  avoid  specifying  <STRONG>cols</STRONG>   and   <STRONG>lines</STRONG>
        capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
 
-       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
-       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>  can  disable use of the process environment in determining
+       the screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to  match
        the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
-       press  of  the  "Escape"  key on the input device from one beginning an
+       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
        <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
-       receiving  the  escape  character  to  see  if  further  characters are
-       available on the input  stream  within  a  short  interval.   A  global
-       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
+       receiving the  escape  character  to  see  if  further  characters  are
+       available  on  the  input  stream  within  a  short interval.  A global
+       variable <STRONG>ESCDELAY</STRONG> stores this interval in  milliseconds.   The  default
        value of 1000 (one second) is adequate for most uses.  This environment
        variable overrides it.
 
-       The  most common instance where you may wish to change this value is to
+       The most common instance where you may wish to change this value is  to
        work with a remote host over a slow communication channel.  If the host
-       running  a  <EM>curses</EM>  application  does  not receive the characters of an
-       escape sequence in a timely manner, the library can interpret  them  as
+       running a <EM>curses</EM> application does not  receive  the  characters  of  an
+       escape  sequence  in a timely manner, the library can interpret them as
        multiple key stroke events.
 
        <STRONG>xterm(1)</STRONG> mouse events are a form of escape sequence; therefore, if your
-       application makes heavy use  of  multiple-clicking,  you  may  wish  to
-       lengthen  the  default value because the delay applies to the composite
+       application  makes  heavy  use  of  multiple-clicking,  you may wish to
+       lengthen the default value because the delay applies to  the  composite
        multi-click event as well as the individual clicks.
 
-       Portable applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG>  in
-       either  form,  but  setting  the  environment  variable rather than the
+       Portable  applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG> in
+       either form, but setting  the  environment  variable  rather  than  the
        global variable does not create problems when compiling an application.
 
-       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
+       If  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  is  disabled  for  the <EM>curses</EM> window receiving input, a
        program must disambiguate escape sequences itself.
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       <EM>ncurses</EM>  may read and write auxiliary terminal descriptions in <EM>.termcap</EM>
+       <EM>ncurses</EM> may read and write auxiliary terminal descriptions in  <EM>.termcap</EM>
        and <EM>.terminfo</EM> files in the user's home directory.
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       This counterpart to <EM>COLUMNS</EM> specifies  the  height  of  the  screen  in
-       characters.   The  corresponding <EM>terminfo</EM> capability and code is <STRONG>lines</STRONG>.
+       This  counterpart  to  <EM>COLUMNS</EM>  specifies  the  height of the screen in
+       characters.  The corresponding <EM>terminfo</EM> capability and code  is  <STRONG>lines</STRONG>.
        See the description of the <EM>COLUMNS</EM> variable above.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
-       with  other platforms, such that 1 is the left button, 2 the right, and
-       3 the middle.  This variable customizes  the  mouse  button  numbering.
-       Its  value  must be three digits 1-3 in any order.  By default, <EM>ncurses</EM>
+       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
+       with other platforms, such that 1 is the left button, 2 the right,  and
+       3  the  middle.   This  variable customizes the mouse button numbering.
+       Its value must be three digits 1-3 in any order.  By  default,  <EM>ncurses</EM>
        assumes a numbering of "132".
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       If set, this  variable  overrides  the  <EM>ncurses</EM>  library's  compiled-in
-       assumption  that  the terminal's default colors are white on black; see
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.  Set the foreground  and  background  color  values
-       with  this  environment  variable  by  assigning  it two integer values
+       If  set,  this  variable  overrides  the  <EM>ncurses</EM> library's compiled-in
+       assumption that the terminal's default colors are white on  black;  see
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.   Set  the  foreground  and background color values
+       with this environment variable  by  assigning  it  two  integer  values
        separated  by  a  comma,  indicating  foregound  and  background  color
        numbers, respectively.
 
-       For  example,  to tell <EM>ncurses</EM> not to assume anything about the colors,
-       use a value of "-1,-1".  To make the  default  color  scheme  green  on
-       black,  use  "2,0".   <EM>ncurses</EM> accepts integral values from -1 up to the
+       For example, to tell <EM>ncurses</EM> not to assume anything about  the  colors,
+       use  a  value  of  "-1,-1".   To make the default color scheme green on
+       black, use "2,0".  <EM>ncurses</EM> accepts integral values from -1  up  to  the
        value of the <EM>terminfo</EM> <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>) capability.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       (MinGW  port  only)  The  <EM>Console2</EM>  program  defectively  handles   the
-       Microsoft  Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.  Applications
-       that use it will hang.  However, it is possible to simulate the  action
-       of  this  call  by mapping coordinates, explicitly saving and restoring
-       the original screen contents.  Setting the environment  variable  <EM>NCGDB</EM>
+       (MinGW   port  only)  The  <EM>Console2</EM>  program  defectively  handles  the
+       Microsoft Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.   Applications
+       that  use it will hang.  However, it is possible to simulate the action
+       of this call by mapping coordinates, explicitly  saving  and  restoring
+       the  original  screen contents.  Setting the environment variable <EM>NCGDB</EM>
        has the same effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       (Linux  only) When <EM>ncurses</EM> is configured to use the GPM interface, this
-       variable may list one or more terminal names  against  which  the  <EM>TERM</EM>
-       variable  (see  below)  is  matched.   An  empty value disables the GPM
-       interface,  using  <EM>ncurses</EM>'s  built-in  support  for   <STRONG>xterm(1)</STRONG>   mouse
+       (Linux only) When <EM>ncurses</EM> is configured to use the GPM interface,  this
+       variable  may  list  one  or more terminal type names against which the
+       <EM>TERM</EM> variable (see below) is matched.  An empty value disables the  GPM
+       interface,   using   <EM>ncurses</EM>'s  built-in  support  for  <STRONG>xterm(1)</STRONG>  mouse
        protocols instead.  If the variable is absent, <EM>ncurses</EM> attempts to open
        GPM if <EM>TERM</EM> contains "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
-       some  cases,  your  terminal  driver may not handle them properly.  Set
+       <EM>ncurses</EM>  may  use  tab  characters in cursor movement optimization.  In
+       some cases, your terminal driver may not  handle  them  properly.   Set
        this environment variable to any value to disable the feature.  You can
        also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Many  terminals  store  video  attributes  as a property of a character
-       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
-       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
-       display, switching attributes on or off, similarly to tags in a  markup
-       language;  these  are  termed "magic cookies", and must be subsequently
-       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
+       Many terminals store video attributes as  a  property  of  a  character
+       cell,  as  <EM>curses</EM>  does.   Historically, some recorded changes in video
+       attributes as data that  logically  <EM>occupies</EM>  character  cells  on  the
+       display,  switching attributes on or off, similarly to tags in a markup
+       language; these are termed "magic cookies", and  must  be  subsequently
+       overprinted.   If  the  <EM>terminfo</EM>  entry for your terminal type does not
        adequately describe its handling of magic cookies, set this variable to
        any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
-       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
-       terminal emulator programs that run in a windowing environment.   These
-       programs  can  duplicate  all  of  the important features of a hardware
-       terminal, but often lack their limitations.  Chief among  these  absent
+       hardware  devices.   Many  people  use  <EM>curses</EM>-based  applications   in
+       terminal  emulator programs that run in a windowing environment.  These
+       programs can duplicate all of the  important  features  of  a  hardware
+       terminal,  but  often lack their limitations.  Chief among these absent
        drawbacks is the problem of data flow management; that is, limiting the
-       speed of communication to what the hardware  could  handle.   Unless  a
-       hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), an application must manage flow control  itself  to
-       prevent overruns and data loss.
-
-       A  solution  that  comes  at  no hardware cost is for an application to
-       pause after directing a  terminal  to  execute  an  operation  that  it
-       performs  slowly,  such  as  clearing  the display.  Many terminal type
-       descriptions, including that for the VT100, embed delay  specifications
-       in  capabilities.   You  may  wish  to  use these terminal descriptions
-       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
-       value  to disable all but mandatory padding.  Mandatory padding is used
+       speed  of  communication  to  what the hardware could handle.  Unless a
+       hardware terminal is interfaced into  a  terminal  concentrator  (which
+       does  flow  control), an application must manage flow itself to prevent
+       overruns and data loss.
+
+       A solution that comes at no hardware cost  is  for  an  application  to
+       pause  after  directing  a  terminal  to  execute  an operation that it
+       performs slowly, such as clearing  the  display.   Many  terminal  type
+       descriptions,  including that for the VT100, embed delay specifications
+       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+       without  paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to any
+       value to disable all but mandatory padding.  Mandatory padding is  used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
-       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
-       buffered output when initializing the terminal.  This was done,  as  in
-       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
-       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
-       Setting  this  variable  disabled  output buffering, leaving the output
+       (Obsolete)  Prior to internal changes developed in <EM>ncurses</EM> 5.9 (patches
+       20120825 through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable  fully
+       buffered  output  when initializing the terminal.  This was done, as in
+       SVr4 <EM>curses</EM>, to increase performance.  For testing  purposes,  both  of
+       <EM>ncurses</EM>  and  of  certain applications, this feature was made optional.
+       Setting this variable disabled output  buffering,  leaving  the  output
        stream in the original (usually line-buffered) mode.
 
-       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
-       workaround;  it  does  not  modify the buffering of the standard output
-       stream.  This approach makes signal handling, as for  interrupts,  more
-       robust.   A  drawback  is  that  certain  unconventional programs mixed
-       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
-       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
+       Nowadays,  <EM>ncurses</EM> performs its own buffering and does not require this
+       workaround; it does not modify the buffering  of  the  standard  output
+       stream.   This  approach makes signal handling, as for interrupts, more
+       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+       <STRONG>stdio(3)</STRONG>  calls  with <EM>ncurses</EM> calls and (usually) got the behavior they
+       expected.  This is no longer the case; <EM>ncurses</EM> does not  write  to  the
        standard output file descriptor through a <EM>stdio</EM>-buffered stream.
 
-       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
-       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
+       As  a  special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still use the
+       standard output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG>  do
        not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
-       special   cases   where   VT100   forms-drawing   characters  (and  the
-       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
+       At  initialization,  <EM>ncurses</EM> inspects the <EM>TERM</EM> environment variable for
+       special  cases  where   VT100   forms-drawing   characters   (and   the
+       corresponding  alternate character set <EM>terminfo</EM> capabilities) are known
        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
-       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
+       virtual console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.   Set
        this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
        terminal's ACS support is broken; the library then outputs Unicode code
        points that correspond to the forms-drawing characters.  Set it to zero
        (or a non-integer) to disable the special check for terminal type names
-       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
+       matching  "linux" or "screen", directing <EM>ncurses</EM> to assume that the ACS
        feature works if the terminal type description advertises it.
 
-       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
+       As an alternative to use  of  this  variable,  <EM>ncurses</EM>  checks  for  an
        extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
        <STRONG>-x</STRONG>".  Examples follow.
 
@@ -1028,62 +1035,62 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
+       The two-character name "U8" was chosen to permit its use via  <EM>ncurses</EM>'s
        <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
-       this  variable's  presence.   If  defined  with  an integral value, the
+       At  initialization, <EM>ncurses</EM> (in its debugging configuration) checks for
+       this variable's presence.  If  defined  with  an  integral  value,  the
        library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
-       many  are  similar.   It  is commonly set by terminal emulators to help
-       applications find a  workable  terminal  description.   Some  choose  a
-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
-       an exact fit to their capabilities.  Not infrequently,  an  application
-       will  have  problems  with that approach; for example, a key stroke may
-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+       The  <EM>TERM</EM> variable denotes the terminal type.  Each is distinct, though
+       many are similar.  It is commonly set by  terminal  emulators  to  help
+       applications  find  a  workable  terminal  description.   Some choose a
+       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+       an  exact  fit to their capabilities.  Not infrequently, an application
+       will have problems with that approach; for example, a  key  stroke  may
+       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
        characters on the screen.
 
-       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
-       applications communicate with the terminal.   Likewise,  as  a  general
-       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
+       Setting <EM>TERM</EM> has no effect on hardware operation; it  affects  the  way
+       applications  communicate  with  the  terminal.  Likewise, as a general
+       rule (<STRONG>xterm(1)</STRONG> being a rare exception), terminal emulators  that  allow
        you to specify <EM>TERM</EM> as a parameter or configuration value do not change
        their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
-       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
-       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
-       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
-       should  contain  either  a terminal description (with newlines stripped
-       out), or a file name indicating where the information required  by  the
+       type  description  in  <EM>termcap</EM>  format if one in <EM>terminfo</EM> format is not
+       available.  Setting this variable directs <EM>ncurses</EM> to ignore  the  usual
+       <EM>termcap</EM>  database  location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM> below.  <EM>TERMCAP</EM>
+       should contain either a terminal description  (with  newlines  stripped
+       out),  or  a file name indicating where the information required by the
        <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM>  can  be configured to read terminal type description databases
-       in various locations using different formats.  This variable  overrides
+       <EM>ncurses</EM> can be configured to read terminal type  description  databases
+       in  various locations using different formats.  This variable overrides
        the default location.
 
-       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
-           tree using subdirectories named by the common first letters of  the
+       <STRONG>o</STRONG>   Descriptions in <EM>terminfo</EM> format are normally stored in a  directory
+           tree  using subdirectories named by the common first letters of the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
-           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
+           name  its  location,  such  as  <EM>/usr/share/terminfo.db</EM>, rather than
            <EM>/usr/share/terminfo/</EM>.
 
-       The  hashed  database  uses less disk space and is a little faster than
+       The hashed database uses less disk space and is a  little  faster  than
        the directory tree.  However, some applications assume the existence of
        the directory tree, and read it directly rather than using the <EM>terminfo</EM>
        API.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
+       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  configured with <EM>termcap</EM> support, this variable may
            contain the location of a <EM>termcap</EM> file.
 
        <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
@@ -1093,10 +1100,10 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
                   TERMINFO=$(infocmp -0 -Q2 -q)
                   export TERMINFO
 
-           The  compiled  description  is  used  only if it corresponds to the
+           The compiled description is used only  if  it  corresponds  to  the
            terminal type identified by <EM>TERM</EM>.
 
-       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
+       Setting  <EM>TERMINFO</EM>  is  the  simplest,  but  not the only, way to direct
        <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
        <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
@@ -1110,20 +1117,20 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   location(s) configured and compiled into <EM>ncurses</EM>
 
-          <STRONG>o</STRONG>   <EM>/usr/share/terminfo</EM>
+           <STRONG>o</STRONG>   <EM>/usr/share/terminfo</EM>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
-       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
-       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
-       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
+       This  variable  specifies  a  list of locations, akin to <EM>PATH</EM>, in which
+       <EM>ncurses</EM> searches  for  the  terminal  type  descriptions  described  by
+       <EM>TERMINFO</EM>  above.   The  list  items are separated by colons on Unix and
+       semicolons on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a  corresponding
        feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
        If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
-       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
+       <EM>ncurses</EM> checks the contents of <EM>TERMPATH</EM>, a list of locations,  akin  to
        <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
        list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
@@ -1133,25 +1140,30 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
-       options given to the <EM>configure</EM> script when building the  library.   Run
-       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
+       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
+       options  given  to the <EM>configure</EM> script when building the library.  Run
+       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        <STRONG>--disable-overwrite</STRONG>
-            The standard include for <EM>ncurses</EM> is as noted in <STRONG>SYNOPSIS</STRONG>:
+            The standard C preprocessor inclusion for the <EM>curses</EM> library is as
+            follows.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This option is used to avoid filename conflicts  when  <EM>ncurses</EM>  is
-            not the main implementation of curses of the computer.  If <EM>ncurses</EM>
-            is installed  disabling  overwrite,  it  puts  its  headers  in  a
-            subdirectory, e.g.,
+            This option is used to avoid file name conflicts  between  <EM>ncurses</EM>
+            and  an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM> is
+            installed disabling overwrite, it  puts  its  header  files  in  a
+            subdirectory.  Here is an example.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            It  also  omits  a  symbolic  link  which  would  allow you to use
-            <STRONG>-lcurses</STRONG> to build executables.
+            Installation  also  omits  a  symbolic  link  that would cause the
+            compiler's <STRONG>-lcurses</STRONG> option  to  link  object  files  with  <EM>ncurses</EM>
+            instead of the system <EM>curses</EM> library.
+
+            The  directory  used  by this configuration of <EM>ncurses</EM> is shown in
+            section "SYNOPSIS" above.
 
        <STRONG>--enable-widec</STRONG>
             The  configure  script   renames   the   library   and   (if   the
@@ -1265,7 +1277,7 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
            another operation), and
 
-       <STRONG>o</STRONG>   a few special cases.
+       <STRONG>o</STRONG>   in a few special cases.
 
        If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
        redirected  to  something  that  is  not a terminal device, the library
@@ -1302,8 +1314,8 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>WINDOW</EM>  structure
        internals, instead using accessor functions such as <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  enables  an  application  to  direct  application  output to a
-       printer attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
+       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
+       attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
        <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
        label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
@@ -1314,155 +1326,158 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s behavior; see <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.  <EM>ncurses</EM> is  compiled
        to support them; section "ALTERNATE CONFIGURATIONS" describes how.
 
-       <STRONG>o</STRONG>   Rudimentary   support   for   multi-threaded  applications  may  be
-           available; see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
+       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
+
+       Rudimentary support for multi-threaded applications may  be  available;
+       see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   Functions that ease the  management  of  multiple  screens  can  be
-           exposed; see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
+       Functions  that ease the management of multiple screens can be exposed;
+       see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   To aid applications to debug their memory usage, <EM>ncurses</EM> optionally
-           offers functions to more aggressively free  memory  it  dynamically
-           allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
+       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
+       offers  functions  to  more  aggressively  free  memory  it dynamically
+       allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   The   library  facilitates  auditing  and  troubleshooting  of  its
-           behavior; see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
+       The library facilitates auditing and troubleshooting of  its  behavior;
+       see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   The compiler option <STRONG>-DUSE_GETCAP</STRONG> causes the library to fall back to
-           reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
-           <EM>info</EM> entry corresponding to <EM>TERM</EM>.   Use  of  this  feature  is  not
-           recommended,  as it essentially includes an entire <EM>termcap</EM> compiler
-           in the <EM>ncurses</EM>  startup  code,  at  a  cost  in  memory  usage  and
-           application launch latency.
+       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
+       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
+       <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
+       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
+       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
+       launch latency.
 
-       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
+       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
-       Curses,  and  supports  all  features  of its enhanced level except the
+       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
+       Curses, and supports all features of  its  enhanced  level  except  the
        <STRONG>untic</STRONG> utility.
 
-       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
+       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
-       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
-       is done primarily to guard  against  programmer  error.   The  standard
+       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
+       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
+       is  done  primarily  to  guard  against programmer error.  The standard
        interface does not provide a way for the library to tell an application
-       which of several possible errors occurred.  Relying on  this  (or  some
-       other)   extension   adversely   affects   the  portability  of  <EM>curses</EM>
-       applications.
+       which  of several possible errors occurred.  An application that relies
+       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
+       portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
-       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
+       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
+       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
-       NUL bytes to the device.  This method is slightly more  expensive,  but
-       narrows   the   interface   to   the   Unix  kernel  significantly  and
+       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
+       NUL  bytes  to the device.  This method is slightly more expensive, but
+       narrows  the  interface  to   the   Unix   kernel   significantly   and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
+       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
+           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
-       <STRONG>o</STRONG>   Starting with 4BSD <EM>curses</EM> (1980) all implementations have  provided
+       <STRONG>o</STRONG>   Starting  with 4BSD <EM>curses</EM> (1980) all implementations have provided
            a <EM>curses.h</EM> file.
 
-           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
+           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
-           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
+           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
+           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
+       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
-           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
+           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
+           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
+       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
            <EM>unctrl.h</EM>.
 
-           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
+           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
+       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
            HP-UX and AIX.
 
-           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
+           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  termios.h<EM>.</EM>   Again, <EM>ncurses</EM> and
+           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again,  <EM>ncurses</EM>  and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
+       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
            require it to do so.
 
-           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
-           and must include both header files in the same  module.   Very  old
-           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
+           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
+           and  must  include  both header files in the same module.  Very old
+           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
            <EM>term.h</EM>.
 
-           The header files supplied by <EM>ncurses</EM> include the  standard  library
-           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
-           files can be included in  any  order.   But  for  portability,  you
+           The  header  files supplied by <EM>ncurses</EM> include the standard library
+           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
+           files  can  be  included  in  any  order.  But for portability, you
            should include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
-           file does not necessarily make visible all of  the  symbols  in  it
+       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
+           file  does  not  necessarily  make visible all of the symbols in it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
-           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
-           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
+           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
+           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
+           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
-           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
-           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
+           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
+           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
+           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
-           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
-           possibility that an application might include either  <EM>varargs.h</EM>  or
-           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
-           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
-           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
-           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
-           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
-           call's actual parameters against the formal ones  declared  in  its
+           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
+           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
+           possibility  that  an application might include either <EM>varargs.h</EM> or
+           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
+           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
+           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
+           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
+           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
+           call's  actual  parameters  against the formal ones declared in its
            prototype.
 
-           No   conforming   implementations   of  X/Open  Curses  require  an
+           No  conforming  implementations  of  X/Open   Curses   require   an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
+           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1476,7 +1491,7 @@ <H1 class="no-header">ncurses 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-27                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-05-11                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html
index 6380a6dda..61748865d 100644
--- a/doc/html/man/ncursesw6-config.1.html
+++ b/doc/html/man/ncursesw6-config.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp @
+  * @Id: MKncu_config.in,v 1.25 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands</TITLE>
+<TITLE>ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands</H1>
+<H1 class="no-header">ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>              User commands             <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands</H
 
 
 
-ncurses 6.5                       2024-04-20               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
+ncurses 6.5                       2024-05-11               <STRONG><A HREF="ncursesw6-config.1.html">ncursesw6-config(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index 9c9b5b8e5..bf87ffa5a 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp @
+  * @Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2024-04-20 ncurses 6.5 File formats</TITLE>
+<TITLE>term 5 2024-05-11 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
+<H1 class="no-header">term 5 2024-05-11 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -51,103 +51,103 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
        term - compiled <EM>terminfo</EM> terminal description
 
 
-</PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>term</STRONG>
-
-
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> compiles a <EM>terminfo</EM> terminal type description, and <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
+       reads it.  A compiled description may be stored  in  a  file  or  in  a
+       database  of, potentially, many such descriptions.  Further, a compiled
+       description may be in one of two formats: one similar to that  used  by
+       System V,  and  a  newer,  extensible  format  employed  exclusively by
+       <EM>ncurses</EM>.
+
 
 </PRE><H3><a name="h3-Storage-Location">Storage Location</a></H3><PRE>
-       Compiled   terminfo   descriptions   are  placed  under  the  directory
-       <STRONG>/usr/share/terminfo</STRONG>.  Two configurations are supported  (when  building
-       the <EM>ncurses</EM> libraries):
+       Compiled  <EM>terminfo</EM>  <EM>descriptions</EM>  <EM>are</EM>  <EM>placed</EM>   under   the   directory
+       <EM>/usr/share/terminfo</EM>.   One  of  two  configurations  is  selected  when
+       building the <EM>ncurses</EM> libraries.
 
        <STRONG>directory</STRONG> <STRONG>tree</STRONG>
             A two-level scheme is used to avoid a linear search of a huge Unix
-            system directory: <STRONG>/usr/share/terminfo/c/name</STRONG>  where  <EM>name</EM>  is  the
+            system  directory:  <EM>/usr/share/terminfo/</EM>c<EM>/</EM>name  where  <EM>name</EM> is the
             name of the terminal, and <EM>c</EM> is the first character of <EM>name</EM>.  Thus,
-            <EM>act4</EM>  can  be  found  in  the   file   <STRONG>/usr/share/terminfo/a/act4</STRONG>.
-            Synonyms  for  the same terminal are implemented by multiple links
-            to the same compiled file.
+            the  compiled  description of terminal type "act4" is found in the
+            file <EM>/usr/share/terminfo/a/act4</EM>.  Synonyms for the  same  terminal
+            are implemented by multiple links to the same compiled file.
 
        <STRONG>hashed</STRONG> <STRONG>database</STRONG>
-            Using Berkeley database, two types  of  records  are  stored:  the
-            terminfo  data  in  the  same format as stored in a directory tree
-            with the terminfo's primary name as a key, and records  containing
-            only aliases pointing to the primary name.
-
-            If  built  to  write  hashed  databases,  <EM>ncurses</EM>  can  still read
-            terminfo databases organized as a directory tree, but cannot write
-            entries  into  the  directory  tree.   It  can  write (or rewrite)
+            Using  the Berkeley database API, two types of records are stored:
+            the <EM>terminfo</EM> data in the same format as that stored in a directory
+            tree  with  the terminal's primary type name as a key, and records
+            containing only aliases pointing to the primary name.
+
+            If built to write hashed databases, <EM>ncurses</EM> can still  read  <EM>term-</EM>
+            <EM>info</EM>  databases  organized  as  a directory tree, but cannot write
+            entries into the  directory  tree.   It  can  write  (or  rewrite)
             entries in the hashed database.
 
-            <EM>ncurses</EM>  distinguishes  the  two  cases  in   the   <EM>TERMINFO</EM>   and
-            <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>  environment  variable  by assuming a directory tree
-            for entries that correspond to an existing directory,  and  hashed
+            <EM>ncurses</EM>   distinguishes   the   two  cases  in  the  <EM>TERMINFO</EM>  and
+            <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variable by assuming  a  directory  tree
+            for entries that correspond to an existing directory, and a hashed
             database otherwise.
 
 
 </PRE><H3><a name="h3-Legacy-Storage-Format">Legacy Storage Format</a></H3><PRE>
        The format has been chosen so that it will be the same on all hardware.
-       An 8 or more bit  byte  is  assumed,  but  no  assumptions  about  byte
-       ordering or sign extension are made.
+       A  byte  of  at  least eight bits' width is assumed, but no assumptions
+       about bit ordering or sign extension are made.
 
-       The  compiled  file  is  created  with the <STRONG>tic</STRONG> program, and read by the
-       routine <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.  The file is divided into six parts:
+       The file is divided into six parts:
 
-            a) <EM>header</EM>,
+            (a) <EM>header</EM>,
 
-            b) <EM>terminal</EM> <EM>names</EM>,
+            (b) <EM>terminal</EM> <EM>names</EM>,
 
-            c) <EM>Boolean</EM> <EM>flags</EM>,
+            (c) <EM>Boolean</EM> <EM>flags</EM>,
 
-            d) <EM>numbers</EM>,
+            (d) <EM>numbers</EM>,
 
-            e) <EM>strings</EM>, and
+            (e) <EM>strings</EM>, and
 
-            f) <EM>string</EM> <EM>table</EM>.
+            (f) a <EM>string</EM> <EM>table</EM>.
 
        The <EM>header</EM> section begins the file.  This section  contains  six  short
        integers in the format described below.  These integers are
 
-            (1) the <EM>magic</EM> <EM>number</EM> (octal 0432);
+            (1) the <EM>magic</EM> <EM>number</EM>
+                 (octal 0432);
 
-            (2) the size, in bytes, of the <EM>terminal</EM> <EM>names</EM> section;
+            (2) the size,
+                 in bytes, of the <EM>terminal</EM> <EM>names</EM> section;
 
             (3) the number of bytes in the <EM>Boolean</EM> <EM>flags</EM> section;
 
             (4) the number of short integers in the <EM>numbers</EM> section;
 
-            (5) the number of offsets (short integers) in the <EM>strings</EM> section;
+            (5) the number of offsets
+                 (short integers) in the <EM>strings</EM> section;
 
-            (6) the size, in bytes, of the <EM>string</EM> <EM>table</EM>.
+            (6) the size,
+                 in bytes, of the <EM>string</EM> <EM>table</EM>.
 
        The  capabilities  in  the <EM>Boolean</EM> <EM>flags</EM>, <EM>numbers</EM>, and <EM>strings</EM> sections
-       are in the same order as the file &lt;term.h&gt;.
+       are in the same order as in the header file <EM>term.h</EM>.
 
-       Short integers are signed, in the range  -32768  to  32767.   They  are
-       stored  as  two  8-bit  bytes.   The  first  byte  contains  the  least
-       significant 8 bits of the value, and the second byte contains the  most
-       significant 8 bits.  (Thus, the value represented is 256*second+first.)
-       This format corresponds to the hardware of the VAX and PDP-11 (that is,
-       little-endian  machines).   Machines  where this does not correspond to
-       the hardware must read the  integers  as  two  bytes  and  compute  the
-       little-endian value.
+       Short integers are signed, in the range -32768 to 32767, and stored  in
+       little-endian format.
 
        Numbers  in  a  terminal  description,  whether they are entries in the
        <EM>numbers</EM> or <EM>strings</EM> table, are positive  integers.   Boolean  flags  are
        treated  as  positive  one-byte integers.  In each case, those positive
-       integers represent a terminal capability.  The  terminal  compiler  tic
+       integers represent a terminal capability.  The  terminal  compiler  <EM>tic</EM>
        uses  negative  integers  to handle the cases where a capability is not
        available:
 
-       <STRONG>o</STRONG>   If a capability is absent from this terminal, tic stores  a  -1  in
+       <STRONG>o</STRONG>   If a capability is absent from this terminal, <EM>tic</EM> stores  a  -1  in
            the corresponding table.
 
            The integer value -1 is represented by two bytes 0377, 0377.
            Absent Boolean values are represented by the byte 0 (false).
 
-       <STRONG>o</STRONG>   If  a capability has been canceled from this terminal, tic stores a
+       <STRONG>o</STRONG>   If  a capability has been canceled from this terminal, <EM>tic</EM> stores a
            -2 in the corresponding table.
 
            The integer value -2 is represented by two bytes 0377, 0376.
@@ -156,7 +156,7 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
        <STRONG>o</STRONG>   Other negative values are illegal.
 
        The <EM>terminal</EM> <EM>names</EM> section comes after the  <EM>header</EM>.   It  contains  the
-       first  line  of the terminfo description, listing the various names for
+       first  line  of the <EM>terminfo</EM> description, listing the various names for
        the terminal, separated by  the  "|"  character.   The  <EM>terminal</EM>  <EM>names</EM>
        section is terminated with an ASCII NUL character.
 
@@ -182,23 +182,23 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
        string capabilities referenced in the <EM>strings</EM> section.  Each string  is
        null-terminated.  Special characters in ^X or \c notation are stored in
        their interpreted  form,  not  the  printing  representation.   Padding
-       information  $&lt;nn&gt;  and  parameter  information %x are stored intact in
+       information  <STRONG>$&lt;</STRONG><EM>nn</EM><STRONG>&gt;</STRONG>  and  parameter  information <STRONG>%x</STRONG> are stored intact in
        uninterpreted form.
 
 
 </PRE><H3><a name="h3-Extended-Storage-Format">Extended Storage Format</a></H3><PRE>
-       The previous section describes the conventional terminfo binary format.
+       The previous section describes the conventional <EM>terminfo</EM> binary format.
        With  some  minor variations of the offsets (see PORTABILITY), the same
        binary format is used in all modern Unix systems.  Each system  uses  a
        predefined set of Boolean, number or string capabilities.
 
-       The <EM>ncurses</EM> libraries and applications support extended terminfo binary
-       format, allowing users to  define  capabilities  which  are  loaded  at
+       The <EM>ncurses</EM> libraries and applications support extended <EM>terminfo</EM> binary
+       format, allowing users  to  define  capabilities  that  are  loaded  at
        runtime.   This  extension  is made possible by using the fact that the
-       other implementations stop reading the terminfo  data  when  they  have
-       reached  the  end  of the size given in the header.  <EM>ncurses</EM> checks the
-       size, and if it exceeds that due to the predefined data,  continues  to
-       parse according to its own scheme.
+       other implementations stop reading the <EM>terminfo</EM> data  when  they  reach
+       the  end of the size given in the header.  <EM>ncurses</EM> checks the size, and
+       if it exceeds that due to  the  predefined  data,  continues  to  parse
+       according to its own scheme.
 
        First, it reads the extended header (5 short integers):
 
@@ -220,24 +220,22 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
 
        The  extended  string  table  contains  values for string capabilities.
        After the end of these values, it contains the names for  each  of  the
-       extended  capabilities  in  order,  e.g.,  Booleans,  then  numbers and
-       finally strings.
+       extended capabilities in order: Boolean, numeric, and string.
 
-       By storing terminal descriptions  in  this  way,  <EM>ncurses</EM>  is  able  to
+       By  storing  terminal  descriptions  in  this  way,  <EM>ncurses</EM> is able to
        provide  a  database  useful  with  legacy  applications,  as  well  as
-       providing data for applications which need  more  than  the  predefined
-       capabilities.  See <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG> for an overview of the way <EM>ncurses</EM> uses
-       this extended information.
+       providing  data  for applications that require more information about a
+       terminal type than was anticipated by X/Open Curses.  See  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+       for an overview of the way <EM>ncurses</EM> uses this extended information.
 
-       Applications which manipulate terminal data  can  use  the  definitions
-       described  in  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>  which  associate the long capability
-       names with members of a <STRONG>TERMTYPE</STRONG> structure.
+       Applications  that  manipulate  terminal  data  can use the definitions
+       described in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG> associating the long  capability  names
+       with members of a <EM>TERMTYPE</EM> structure.
 
 
 </PRE><H3><a name="h3-Extended-Number-Format">Extended Number Format</a></H3><PRE>
-       On occasion, 16-bit signed integers are not large enough.  With <EM>ncurses</EM>
-       6.1,  a new format was introduced by making a few changes to the legacy
-       format:
+       On  occasion, 16-bit signed integers are not large enough.  <EM>ncurses</EM> 6.1
+       introduced a new format by making a few changes to the legacy format:
 
        <STRONG>o</STRONG>   a different magic number (octal 01036)
 
@@ -245,10 +243,10 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
            to signed 32-bit integers.
 
        To   maintain   compatibility,  the  library  presents  the  same  data
-       structures to direct users of the <STRONG>TERMTYPE</STRONG>  structure  as  in  previous
+       structures to direct users of the <EM>TERMTYPE</EM>  structure  as  in  previous
        formats.   However,  that  cannot  provide  callers  with  the extended
        numbers.   The  library  uses  a  similar  but  hidden  data  structure
-       <STRONG>TERMTYPE2</STRONG> to provide data for the terminfo functions.
+       <EM>TERMTYPE2</EM> to provide data for the <EM>terminfo</EM> functions.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -271,85 +269,84 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
 
 
 </PRE><H3><a name="h3-Binary-Format">Binary Format</a></H3><PRE>
-       X/Open  Curses  does  not  specify  a format for the terminfo database.
-       System V curses used a directory-tree of binary files, one per terminal
+       X/Open  Curses  does  not  specify  a format for the <EM>terminfo</EM> database.
+       System V <EM>curses</EM> used a directory-tree of binary files, one per terminal
        description.
 
-       Despite  the  consistent  use  of  little-endian  for  numbers  and the
-       otherwise  self-describing  format,  it  is  not  wise  to   count   on
-       portability   of   binary  terminfo  entries  between  commercial  Unix
-       versions.  The problem is that there are at  least  three  versions  of
-       terminfo  (under  HP-UX,  AIX,  and OSF/1) 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 and
-       X/Open Curses extensions.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for detailed  discussion  of
-       terminfo source compatibility issues.
-
-       This  implementation  is by default compatible with the binary terminfo
-       format used by Solaris curses, except in a few less-used details  where
+       Despite  the  consistent use of little-endian numbers and the otherwise
+       self-describing format, it is not  wise  to  count  on  portability  of
+       binary  <EM>terminfo</EM> entries between commercial Unix versions.  The problem
+       is that there are at least three versions  of  <EM>terminfo</EM>  (under  HP-UX,
+       AIX,  and  OSF/1)  each  of which diverged from System V <EM>terminfo</EM> after
+       SVr1, and added extension capabilities to the string table that (in the
+       binary format) collide with System V and X/Open Curses extensions.  See
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for detailed discussion of  <EM>terminfo</EM>  source  compatibility
+       issues.
+
+       This  implementation  is by default compatible with the binary <EM>terminfo</EM>
+       format used by Solaris <EM>curses</EM>, except in a few less-used details  where
        it  was  found that the latter did not match X/Open Curses.  The format
        used by the other Unix versions can be matched by building <EM>ncurses</EM> with
        different configuration options.
 
 
 </PRE><H3><a name="h3-Magic-Codes">Magic Codes</a></H3><PRE>
-       The  magic  number  in a binary terminfo file is the first 16-bits (two
+       The  magic  number  in a binary <EM>terminfo</EM> file is the first 16 bits (two
        bytes).  Besides making it more reliable for the library to check  that
-       a  file  is  terminfo,  utilities such as <STRONG>file(1)</STRONG> also use that to tell
+       a  file  is  <EM>terminfo</EM>,  utilities such as <STRONG>file(1)</STRONG> also use that to tell
        what the file-format is.  System V defined more than one magic  number,
        with 0433, 0435 as screen-dumps (see <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>).  This implementation
        uses 01036 as a continuation of that sequence,  but  with  a  different
        high-order byte to avoid confusion.
 
    <STRONG>The</STRONG> <EM>TERMTYPE</EM> <STRONG>Structure</STRONG>
-       Direct  access  to  the  <STRONG>TERMTYPE</STRONG>  structure  is  provided  for  legacy
-       applications.  Portable  applications  should  use  the  <STRONG>tigetflag</STRONG>  and
-       related  functions  described in <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> for reading terminal
-       capabilities.
+       Direct  access  to  the  <EM>TERMTYPE</EM>  structure  is  provided  for  legacy
+       applications.   Portable  applications  should  use  <STRONG><A HREF="curs_terminfo.3x.html">tigetflag(3x)</A></STRONG>  and
+       related functions to read terminal capabilities.
 
 
 </PRE><H3><a name="h3-Mixed-case-Terminal-Names">Mixed-case Terminal Names</a></H3><PRE>
-       A small number of terminal descriptions  use  uppercase  characters  in
-       their  names.   If  the  underlying  filesystem  ignores the difference
-       between  uppercase  and  lowercase,  <EM>ncurses</EM>  represents   the   "first
-       character"  of  the  terminal  name used as the intermediate level of a
+       A  small  number  of  terminal descriptions use uppercase characters in
+       their names.  If the underlying  file  system  ignores  the  difference
+       between   uppercase   and  lowercase,  <EM>ncurses</EM>  represents  the  "first
+       character" of the terminal name used as the  intermediate  level  of  a
        directory tree in (two-character) hexadecimal form.
 
 
 </PRE><H3><a name="h3-Limits">Limits</a></H3><PRE>
        <EM>ncurses</EM> stores compiled terminal descriptions in three related formats,
-       described in the sections
+       described in the subsections
 
-       <STRONG>o</STRONG>   <STRONG>LEGACY</STRONG> <STRONG>STORAGE</STRONG> <STRONG>FORMAT</STRONG>, and
+       <STRONG>o</STRONG>   <STRONG>Legacy</STRONG> <STRONG>Storage</STRONG> <STRONG>Format</STRONG>, and
 
-       <STRONG>o</STRONG>   <STRONG>EXTENDED</STRONG> <STRONG>STORAGE</STRONG> <STRONG>FORMAT</STRONG>, and
+       <STRONG>o</STRONG>   <STRONG>Extended</STRONG> <STRONG>Storage</STRONG> <STRONG>Format</STRONG>, and
 
-       <STRONG>o</STRONG>   <STRONG>EXTENDED</STRONG> <STRONG>NUMBER</STRONG> <STRONG>FORMAT</STRONG>.
+       <STRONG>o</STRONG>   <STRONG>Extended</STRONG> <STRONG>Number</STRONG> <STRONG>Format</STRONG>.
 
-       The  legacy storage format and the extended number format differ by the
-       types of numeric capability which they can store (i.e.,  16-bit  versus
-       32-bit  integers).   The  extended storage format introduced by <EM>ncurses</EM>
-       5.0 adds data to either of these formats.
+       The legacy storage format and the extended number format differ by  the
+       types  of  numeric  capability  that  they  can store (for example, 16-
+       versus 32-bit integers).  The extended  storage  format  introduced  by
+       <EM>ncurses</EM> 5.0 adds data to either of these formats.
 
        Some limitations apply:
 
-       <STRONG>o</STRONG>   total compiled entries cannot  exceed  4096  bytes  in  the  legacy
+       <STRONG>o</STRONG>   total  compiled  entries  cannot  exceed  4096  bytes in the legacy
            format.
 
-       <STRONG>o</STRONG>   total  compiled  entries  cannot exceed 32768 bytes in the extended
+       <STRONG>o</STRONG>   total compiled entries cannot exceed 32768 bytes  in  the  extended
            format.
 
        <STRONG>o</STRONG>   the name field cannot exceed 128 bytes.
 
-       Compiled entries are limited to 32768 bytes because  offsets  into  the
-       <EM>strings</EM>  <EM>table</EM>  use  two-byte  integers.   The legacy format could have
-       supported 32768-byte entries, but  was  limited  to  a  virtual  memory
+       Compiled  entries  are  limited to 32768 bytes because offsets into the
+       <EM>strings</EM> <EM>table</EM> use two-byte integers.   The  legacy  format  could  have
+       supported  32768-byte  entries,  but  was  limited  to a virtual memory
        page's 4096 bytes.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
-       As  an  example,  here  is  a description for the Lear-Siegler ADM-3, a
-       popular though rather stupid early terminal:
+       Here is a <EM>terminfo</EM> description of the  Lear-Siegler  ADM-3,  a  popular
+       though rather stupid early terminal.
 
        adm3a|lsi adm3a,
                am,
@@ -358,7 +355,8 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
                cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
                home=^^, ind=^J,
 
-       and a hexadecimal dump of the compiled terminal description:
+       A  hexadecimal  dump  of  its  compiled terminal description (in legacy
+       format) follows.
 
        0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
        0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
@@ -386,12 +384,12 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
        Thomas E. Dickey
-       extended terminfo format for <EM>ncurses</EM> 5.0
+       extended <EM>terminfo</EM> format for <EM>ncurses</EM> 5.0
        hashed database support for <EM>ncurses</EM> 5.6
        extended number support for <EM>ncurses</EM> 6.1
 
        Eric S. Raymond
-       documented legacy terminfo format, e.g., from <EM>pcurses</EM>.
+       documented legacy <EM>terminfo</EM> format (that used by <EM>pcurses</EM>).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -399,12 +397,11 @@ <H1 class="no-header">term 5 2024-04-20 ncurses 6.5 File formats</H1>
 
 
 
-ncurses 6.5                       2024-04-20                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
-<li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Storage-Location">Storage Location</a></li>
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 9a8858878..f19821b19 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp @
+  * @Id: term.7,v 1.49 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 7 2024-03-16 ncurses 6.5 Miscellaneous</TITLE>
+<TITLE>term 7 2024-05-11 ncurses 6.5 Miscellaneous</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 7 2024-03-16 ncurses 6.5 Miscellaneous</H1>
+<H1 class="no-header">term 7 2024-05-11 ncurses 6.5 Miscellaneous</H1>
 <PRE>
 <STRONG><A HREF="term.7.html">term(7)</A></STRONG>                          Miscellaneous                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 
@@ -216,7 +216,7 @@ <H1 class="no-header">term 7 2024-03-16 ncurses 6.5 Miscellaneous</H1>
 
 
 
-ncurses 6.5                       2024-03-16                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 67061141f..f833c6957 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,19 +32,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp @
+  * @Id: terminfo.head,v 1.66 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>terminfo 5 2024-04-20 ncurses 6.5 File formats</TITLE>
+<TITLE>terminfo 5 2024-05-11 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.5 File formats</H1>
+<H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                      File formats                      <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240427).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240511).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -2487,7 +2487,7 @@ <H1 class="no-header">terminfo 5 2024-04-20 ncurses 6.5 File formats</H1>
 
 
 
-ncurses 6.5                       2024-04-20                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+ncurses 6.5                       2024-05-11                       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index e5e610724..30efeb1a1 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp @
+  * @Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2024-04-27 ncurses 6.5 User commands</TITLE>
+<TITLE>tic 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2024-04-27 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tic 1m 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2024-04-27 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-04-27                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index c3aca2c59..85daf55cd 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp @
+  * @Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-04-20 ncurses 6.5 User commands</TITLE>
+<TITLE>toe 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-04-20 ncurses 6.5 User commands</H1>
+<H1 class="no-header">toe 1m 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -185,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-04-20 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-04-20                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index ed8fe3805..c7bf1e106 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp @
+  * @Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-04-20 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-04-20 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -555,7 +555,7 @@ <H1 class="no-header">tput 1 2024-04-20 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-04-20                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index a5669568f..b2b865cc3 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp @
+  * @Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-04-27 ncurses 6.5 User commands</TITLE>
+<TITLE>tset 1 2024-05-11 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-04-27 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tset 1 2024-05-11 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -393,7 +393,7 @@ <H1 class="no-header">tset 1 2024-04-27 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-04-27                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/MKncu_config.in b/man/MKncu_config.in
index 14690a544..856e64b02 100644
--- a/man/MKncu_config.in
+++ b/man/MKncu_config.in
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp $
-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: MKncu_config.in,v 1.25 2024/05/11 20:39:53 tom Exp $
+.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@\-config 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .SH NAME
 \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \-
 configuration helper for \fI\%ncurses\fP libraries
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index d1eb9a311..502425afd 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp $
-.TH curs_add_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp $
+.TH curs_add_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -52,7 +52,7 @@
 \fB\%mvwadd_wch\fP,
 \fB\%echo_wchar\fP,
 \fB\%wecho_wchar\fP \-
-add a \fIcurses\fR complex character to a window and advance the cursor
+add a \fIcurses\fR complex character to a window, possibly advancing the cursor
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -66,70 +66,143 @@ add a \fIcurses\fR complex character to a window and advance the cursor
 \fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
 .fi
 .SH DESCRIPTION
-.SS add_wch
-The
-\fBadd_wch\fP,
-\fBwadd_wch\fP,
-\fBmvadd_wch\fP, and
-\fBmvwadd_wch\fP
-functions put the complex character \fIwch\fP into the given
-window at its current position,
-which is then advanced.
-These functions perform
-wrapping and special-character processing as follows:
+.SS wadd_wch
+.B \%wadd_wch
+writes the complex character
+.I wch
+to the window
+.IR win ","
+then may advance the cursor position,
+analogously to the standard C library's \fI\%putwchar\fP(3).
+\fB\%ncurses\fP(3X) describes the variants of this function.
+.PP
+Much behavior depends on whether the wide characters in
+.I wch
+are spacing or non-spacing;
+see subsection \*(``Complex Characters\*('' below.
 .bP
-If \fIwch\fP refers to a spacing character,
-then any previous character at that location is removed.
-A new character specified by \fIwch\fP is
-placed at that location with rendition specified by \fIwch\fP.
-The cursor then advances after this spacing character,
-to prepare for writing the next character on the screen.
-.IP
-The newly added spacing character is the base of the active complex character.
-Subsequent non-spacing characters can be combined with this base
-until another spacing character is written to the screen,
-or the cursor is moved, e.g., using \fBwmove\fP.
+If
+.I wch
+contains a spacing character,
+then any character at the cursor is first removed.
+The complex character
+.IR wch ","
+with its attributes and color pair identifier,
+becomes the
+.I base
+of the
+.IR "active complex character" "."
 .bP
-If \fIwch\fP refers to a non-spacing character,
-it is appended to the active complex character,
-retaining the previous characters at that location.
-The rendition specified by \fIwch\fP is ignored.
-.IP
-The cursor is not advanced after adding a non-spacing character.
-Subsequent calls to add non-spacing characters will update the same position.
+If
+.I wch
+contains only non-spacing characters,
+.\" XXX: see wadd_wch_literal (the beginning of the array may be nonspacing)
+they are combined with the active complex character.
+.I curses
+ignores its attributes and color pair identifier,
+and does not advance the cursor.
+.PP
+Further non-spacing characters added with
+.B \%wadd_wch
+are not written at the new cursor position but combine with the active
+complex character until another spacing character is written to the
+window or the cursor is moved.
+.PP
+If advancement occurs at the right margin,
+.bP
+the cursor automatically wraps to the beginning of the next line,
+then,
+.bP
+if it was at the bottom of the scrolling region,
+and if \fB\%scrollok\fP(3X) is enabled for
+.IR win ,
+the scrolling region scrolls up one line.
+.PP
+If
+.I wch
+is a
+backspace,
+carriage return,
+line feed,
+or
+tab,
+the cursor moves appropriately within the window.
 .bP
-If the character part of \fIwch\fP is
-a tab, newline, backspace or other control character,
-the window is updated and the cursor moves as if \fBaddch\fP were called.
-.SS echo_wchar
-The \fBecho_wchar\fP
-function is functionally equivalent to a call to
-\fBadd_wch\fP
-followed by a call to
-\fB\%refresh\fP(3X).
-Similarly, the
-\fBwecho_wchar\fP
-is functionally equivalent to a call to
-\fBwadd_wch\fP
-followed by a call to
-\fBwrefresh\fP.
-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 *\fBecho\fP* functions instead of their equivalents.
-.SS "Line Graphics"
-Like \fB\%addch\fP(3X),
-\fBaddch_wch\fP 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
-\fB\%addch\fP(3X).
+Backspace moves the cursor one character left;
+at the left margin of a window,
+it does nothing.
+.bP
+Carriage return moves the cursor to the left margin on the current line
+of the window.
+.bP
+Line feed does a \fB\%clrtoeol\fP(3X),
+then advances as if from the right margin.
+.bP
+Tab advances the cursor to the next tab stop
+(possibly on the next line);
+these are placed at every eighth column by default.
+Alter the tab interval with the
+.B \%TABSIZE
+extension;
+see \fB\%curs_variables\fP(3X).
+.PP
+If
+.I wch
+is any other nonprintable character,
+it is drawn in printable form using the same convention as
+\fB\%wunctrl\fP(3X).
+.PP
+Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
+does not return the character itself,
+but its \fB\%wunctrl\fP(3X) representation.
+.SS wecho_wchar
+.B \%echo_wchar
+and
+.B \%wecho_wchar
+are equivalent to calling
+.RB \%( w ) add_wch
+followed by
+.RB \%( w ) refresh .
+.I curses
+interprets these functions as a hint that only a single (complex)
+character is being output;
+for non-control characters,
+a considerable performance gain may be enjoyed by employing them.
+.\" TODO: Combine the following with the "Line Drawing" subsection of
+.\" terminfo(5) and replace this with a cross reference there.
+.SS "Forms-Drawing Characters"
+.I curses
+defines macros starting with
+.B \%WACS_
+that can be used with
+.B \%wadd_wch
+to write line-drawing and other special characters to the screen.
+.I \%ncurses
+terms these
+.I "forms-drawing characters."
+The ACS default listed below is used if the
+.B \%acs_chars
+.RB ( \%acsc )
+.I \%term\%info
+capability does not define a terminal-specific replacement for it,
+or if the terminal and locale configuration requires Unicode to access
+these characters but the library is unable to use Unicode.
+The \*(``acsc char\*('' column corresponds to how the characters are
+specified in the
+.B \%acs_chars
+.RB ( \%acsc )
+string capability,
+and the characters in it may appear on the screen if the terminal type's
+database entry incorrectly advertises ACS support.
+The name \*(``ACS\*('' originates in the Alternate Character Set feature
+of the DEC VT100 terminal.
 .PP
 .TS
 Lb Lb Lb Lb Lb
 Lb Lb Lb Lb Lb
 Lb L  L  L  Lx.
-\&	Unicode	ASCII	acsc	\&
-ACS Name	Default	Default	Char	Glyph Name
+\&	Unicode	ACS	acsc	\&
+Symbol	Default	Default	char	Glyph Name
 _
 WACS_BLOCK	0x25ae	#	0	T{
 solid square block
@@ -291,26 +364,29 @@ U+2501 BOX DRAWINGS HEAVY HORIZONTAL
 .bP
 U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success.
-.PP
-X/Open Curses does not specify any error conditions.
-This implementation returns an error
-.bP
-if the window pointer is null or
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
+In
+.IR \%ncurses ,
+.B \%wadd_wch
+returns
+.B ERR
+if
 .bP
-if it is not possible to add a complete character in the window.
-.PP
-The latter may be due to different causes:
+.I win
+is
+.BR NULL ","
 .bP
-If \fB\%scrollok\fP(3X) is not enabled,
-writing a character at the lower right margin succeeds.
-However,
-an error is returned because it is not possible to wrap to a new line.
+wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+not been called on
+.I win
+when writing to its bottom right location is attempted,
+or
 .bP
-If an error is detected when converting a multibyte character to a sequence
-of bytes,
-or if it is not possible to add all of the resulting bytes in the window,
-an error is returned.
+it is not possible to add a complete character at the cursor position.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -318,16 +394,32 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Note that
-\fBadd_wch\fP,
-\fBmvadd_wch\fP,
-\fBmvwadd_wch\fP, and
-\fBecho_wchar\fP
-may be macros.
+.BR add_wch ","
+.BR mvadd_wch ","
+.BR mvwadd_wch ","
+and
+.B echo_wchar
+may be implemented as macros.
+.SH EXTENSIONS
+.SS TABSIZE
+The
+.B TABSIZE
+variable is implemented in SVr4 and other versions of
+.IR curses ,
+but is not specified by X/Open Curses
+(see \fBcurs_variables\fP(3X)).
 .SH PORTABILITY
 These functions are described in X/Open Curses, Issue 4.
-The defaults specified for line-drawing characters apply in the POSIX locale.
-.SS "WACS Symbols"
+It specifies no error conditions for them.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.PP
+The defaults specified for forms-drawing characters apply in the POSIX
+locale.
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
 a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fP.
 A few implementations are problematic:
@@ -406,32 +498,32 @@ Others have suggested these alternatives:
 \[u256C] U+256C (forms double vertical and horizontal), and
 \[u2612] U+2612 (ballot box with x).
 .SS "Complex Characters"
-The complex character type \fBcchar_t\fR
-can store more than one wide character (\fBwchar_t\fR).
-The X/Open Curses description does not mention this possibility,
-describing only the cases where \fIwch\fP is a spacing character
-or a non-spacing character.
+The complex character type
+.I \%cchar_t
+can store more than one wide character
+.RI ( \%wchar_t ).
+X/Open Curses does not mention this possibility,
+specifying behavior only where
+.I wch
+is a single character,
+either spacing or non-spacing.
 .PP
-This implementation assumes that \fIwch\fP is constructed using
-\fB\%setcchar\fP(3X), and in turn that the result
+.I \%ncurses
+assumes that
+.I wch
+is constructed using \fB\%setcchar\fP(3X),
+and in turn that the result
 .bP
-contains at most one spacing character in the beginning of its list of wide
-characters,
-and zero or more non-spacing characters
+contains at most one spacing character at the beginning of its list of
+wide characters,
+and zero or more non-spacing characters,
 or
 .bP
-may hold one non-spacing character.
+holds one non-spacing character.
 .PP
 In the latter case,
-\fI\%ncurses\fP adds the non-spacing character to the active
-(base) spacing character.
-.SS TABSIZE
-The
-.B TABSIZE
-variable is implemented in SVr4 and other versions of
-.IR curses ,
-but is not specified by X/Open Curses
-(see \fBcurs_variables\fP(3X)).
+.I \%ncurses
+adds the non-spacing character to the active complex character.
 .SH SEE ALSO
 \fB\%curs_addch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 5dd3e8f4e..4a0d06e9d 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp $
-.TH curs_add_wchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp $
+.TH curs_add_wchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,45 +69,63 @@ add a \fIcurses\fR complex character string to a window
 \fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These functions copy the (null-terminated)
-array of complex characters \fIwchstr\fP
-into the window image structure
-starting at the current cursor position.
+.B \%wadd_wchstr
+copies the string of complex characters
+.I \%wchstr
+to the window
+.IR win "."
+A null complex character terminates the string.
+If a complex character does completely fit at the end of the line,
+.I curses
+fills the remaining columns with the window background;
+see \fB\%bkgrnd\fP(3X).
+.B \%wadd_wchnstr
+does the same,
+but copies at most
+.I n
+characters,
+or as many as possible if
+.I n
+is
+.BR \-1 "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .PP
-The four functions with \fIn\fP as the last
-argument copy at most \fIn\fP elements,
-but no more than will fit on the line.
-If \fBn\fP=\fB\-1\fP then the whole array is copied,
-to the maximum number of characters that will fit on the line.
-.PP
-The window cursor is \fInot\fP advanced.
-These functions are faster than \fBwaddnstr\fP.
-On the other hand:
+Because these functions do not call \fB\%wadd_wch\fP(3X) internally,
+they are faster than \fB\%waddwstr\fP(3X) and \fB\%waddnwstr\fP(3X).
+On the other hand,
+they
 .bP
-they do not perform checking
-(such as for the newline, backspace, or carriage return characters),
+do not treat the backspace,
+carriage return,
+or line feed characters specially;
 .bP
-they do not advance the current cursor position,
+do not represent unprintable characters with \fB\%wunctrl\fP(3X);
 .bP
-they do not expand other control characters to ^-escapes, and
+do not update the cursor position to follow the last character written;
 .bP
-they truncate the string if it crosses the right margin,
-rather than wrapping it around to the new line.
-.PP
-These functions end successfully
-on encountering a null \fBcchar_t\fP, or
-when they have filled the current line.
-If a complex character cannot completely fit at the end of the current line,
-the remaining columns are filled with the background character and rendition.
+truncate the string at the window's right margin,
+rather than wrapping it to the next line and potentially scrolling.
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns an error
+.I \%ncurses
+returns
+.B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.B NULL
+or
 .bP
-if the \fIwchstr\fP parameter is null.
+.I wchstr
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -115,9 +133,12 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All functions except \fBwadd_wchnstr\fP may be macros.
+All of these functions except
+.B \%wadd_wchnstr
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 .SH SEE ALSO
 \fB\%curs_addchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index ad548520c..cfa7bf121 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp $
-.TH curs_addch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp $
+.TH curs_addch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -72,22 +72,24 @@ add a \fIcurses\fP character to a window and advance the cursor
 \fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
-.SS "Adding Characters"
+.SS waddch
 .B \%waddch
-puts the character
+writes the
+.I curses
+character
 .I ch
-at the cursor position of window
-.IR win ,
+to the window
+.IR win ","
 then advances the cursor position,
 analogously to the standard C library's \fI\%putchar\fP(3).
 \fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
 If advancement occurs at the right margin,
 .bP
-the cursor automatically wraps to the beginning of the next line;
-and
+the cursor automatically wraps to the beginning of the next line,
+then,
 .bP
-at the bottom of the current scrolling region,
+if it was at the bottom of the scrolling region,
 and if \fB\%scrollok\fP(3X) is enabled for
 .IR win ,
 the scrolling region scrolls up one line.
@@ -110,10 +112,7 @@ Carriage return moves the cursor to the left margin on the current line
 of the window.
 .bP
 Line feed does a \fB\%clrtoeol\fP(3X),
-then moves the cursor to the left margin on the next line of the window,
-and if \fB\%scrollok\fP(3X) is enabled for
-.IR win ,
-scrolls the window if the cursor was already on the last line.
+then advances as if from the right margin.
 .bP
 Tab advances the cursor to the next tab stop
 (possibly on the next line);
@@ -126,23 +125,22 @@ see \fB\%curs_variables\fP(3X).
 If
 .I ch
 is any other nonprintable character,
-it is drawn in printable form,
-using the same convention as \fB\%unctrl\fP(3X).
+it is drawn in printable form using the same convention as
+\fB\%unctrl\fP(3X).
 .PP
 Calling \fB\%winch\fP(3X) on the location of a nonprintable character
 does not return the character itself,
 but its \fB\%unctrl\fP(3X) representation.
 .PP
+The object or expression
 .I ch
-may contain rendering and/or color attributes,
-and others can be combined with the parameter
-by logically \*(``or\*(''ing with it.
+may contain attributes and/or a color pair identifier.
 (A character with its attributes can be copied from place to place
 using \fB\%winch\fP(3X) and
 .BR \%waddch .)
 See \fB\%curs_attr\fP(3X) for values of predefined video attribute
 constants that can be usefully \*(``or\*(''ed with characters.
-.SS "Echoing Characters"
+.SS wechochar
 .B \%echochar
 and
 .B \%wechochar
@@ -177,8 +175,9 @@ these characters but the library is unable to use Unicode.
 The \*(``acsc char\*('' column corresponds to how the characters are
 specified in the
 .B \%acs_chars
+.RB ( \%acsc )
 string capability,
-and the characters in it may appear on the screen if the terminal's
+and the characters in it may appear on the screen if the terminal type's
 database entry incorrectly advertises ACS support.
 The name \*(``ACS\*('' originates in the Alternate Character Set feature
 of the DEC VT100 terminal.
@@ -235,36 +234,52 @@ In
 .B \%waddch
 returns
 .B ERR
-if it is not possible to add a complete character at the cursor
-position,
-as when conversion of a multibyte character to a byte sequence fails,
-or at least one of the resulting bytes cannot be added to the window.
+if
+.bP
+.I win
+is
+.BR NULL ","
+.bP
+wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+not been called on
+.I win
+when a write to its bottom right location is attempted,
+or
+.bP
+it is not possible to add a complete character at the cursor position.
+.PP
+The last may be due to different causes:
+.bP
+conversion of a multibyte character to a byte sequence can fail,
+or
+.bP
+at least one of the bytes resulting from conversion from a multibyte
+sequence cannot be added to the window.
 See section \*(``PORTABILITY\*('' below regarding the use of
 .B \%waddch
 with multibyte characters.
 .PP
-.B \%waddch
-can successfully write a character at the bottom right location of the
-window.
-However,
-.I \%ncurses
-returns
-.B ERR
-if \fB\%scrollok\fP(3X) is not enabled in that event,
-because it is not possible to wrap to a new line.
-.PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-.BR \%addch ,
-.BR \%mvaddch ,
-.BR \%mvwaddch ,
+.BR \%addch ","
+.BR \%mvaddch ","
+.BR \%mvwaddch ","
 and
 .B \%echochar
 may be implemented as macros.
+.SH EXTENSIONS
+.SS TABSIZE
+SVr4 and other versions of
+.I curses
+implement the
+.B \%TABSIZE
+variable,
+but X/Open Curses does not specify it;
+see \fB\%curs_variables\fP(3X).
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
@@ -290,7 +305,7 @@ Some implementations are problematic.
 Solaris
 .IR curses ,
 for example,
-define the ACS symbols as constants;
+defines the ACS symbols as constants;
 others define them as elements of an array.
 .IP
 This implementation uses an array,
@@ -356,8 +371,8 @@ many publicly available
 .I \%term\%info
 entries include
 .B \%acsc
-strings in which their key characters
-.BR ( pryz{|} )
+capabilities in which their key characters
+.RB ( pryz{|} )
 are embedded,
 and a second-hand list of their character descriptions has come to
 light.
@@ -386,51 +401,50 @@ the terminal is unable to display forms-drawing characters
 by using UTF-8;
 see the discussion of the
 .I \%NCURSES_NO_UTF8_ACS
-environment variable in \fB\%ncurses\fP(3X)).
+environment variable in \fB\%ncurses\fP(3X).
 .SS "Character Set"
 X/Open Curses assumes that the parameter passed to
 .B \%waddch
 contains a single character.
-As discussed in \fB\%curs_attr\fP(3X),
-that character may have been more than eight bits wide in an SVr3 or
+That character may have been more than eight bits wide in an SVr3 or
 SVr4 implementation,
-but in the X/Open Curses model,
-the details are not given.
-The important distinction between SVr4
-.I curses
-and X/Open Curses is that the latter separates non-character information
-(attributes and color)
-from the character code,
-which SVr4 packs into a
+but X/Open Curses leaves the width of a non-wide character code
+unspecified.
+The standard further does not specify the internal structure of a
+.IR chtype ","
+though the use of bit operations to combine the character code with
+attributes and a color pair identifier into a
 .I \%chtype
 for passage to
-.BR \%waddch .
+.B \%waddch
+is common.
+A portable application uses only the macros discussed in
+\fB\%curs_attr\fP(3X) to manipulate a
+.IR \%chtype "."
 .PP
 In
 .IR \%ncurses ,
 .I \%chtype
-holds an eight-bit character.
-But the library allows a multibyte character to be passed in a
+holds an eight-bit character,
+but the library allows a multibyte character to be passed in a
 succession of calls to
-.BR \%waddch .
+.BR \%waddch "."
 Other implementations do not;
 a
 .B \%waddch
 call transmits exactly one character,
 which may be rendered in one or more screen locations depending on
-whether it is printable.
-.PP
-Depending on the locale settings,
+whether it is printable
+(see \fB\%unctrl\fP(3X)).
+Depending on the locale,
 .I \%ncurses
 inspects the byte passed in each
 .B \%waddch
-call,
-and checks whether the latest call continues a multibyte sequence.
+call and checks whether the latest call continues a multibyte sequence.
 When a character is
-.IR complete ,
+.IR complete ","
 .I \%ncurses
 displays the character and advances the cursor.
-.PP
 If the calling application interrupts the succession of bytes in
 a multibyte character sequence by changing the current location\(emfor
 example,
@@ -439,7 +453,7 @@ with \fB\%wmove\fP(3X)\(em\c
 discards the incomplete character.
 .PP
 For portability to other implementations,
-do not rely upon this behavior.
+do not rely upon the foregoing behavior.
 Check whether a character can be represented as a single byte in the
 current locale.
 .bP
@@ -451,14 +465,6 @@ or \fB\%wadd_wch\fP(3X).
 If it cannot,
 use only
 \fB\%wadd_wch\fP(3X).
-.SS TABSIZE
-SVr4 and other versions of
-.I curses
-implement the
-.B \%TABSIZE
-variable,
-but X/Open Curses does not specify it
-(see \fB\%curs_variables\fP(3X)).
 .SH SEE ALSO
 \fB\%curs_add_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 25d322aff..19c47fc59 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp $
-.TH curs_addchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp $
+.TH curs_addchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,39 +69,63 @@ add a \fIcurses\fR character string to a window
 \fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These functions copy the (null-terminated)
-\fIchstr\fP array
-into the window image structure
-starting at the current cursor position.
+.B \%waddchstr
+copies the string of
+.I curses
+characters
+.I \%chstr
+to the window
+.IR win "."
+A null
+.I curses
+character terminates the string.
+.B \%waddchnstr
+does the same,
+but copies at most
+.I n
+characters,
+or as many as possible if
+.I n
+is
+.BR \-1 "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .PP
-The four functions with \fIn\fP as the last
-argument copy at most \fIn\fP elements,
-but no more than will fit on the line.
-If \fBn\fP=\fB\-1\fP then the whole array is copied,
-to the maximum number of characters that will fit on the line.
-.PP
-The window cursor is \fInot\fP advanced.
-These functions are faster than \fBwaddnstr\fP.
-On the other hand:
+Because these functions do not call \fB\%waddch\fP(3X) internally,
+they are faster than \fB\%waddstr\fP(3X) and \fB\%waddnstr\fP(3X).
+On the other hand,
+they
 .bP
-they do not perform checking
-(such as for the newline, backspace, or carriage return characters),
+do not treat the backspace,
+carriage return,
+or line feed characters specially;
 .bP
-they do not advance the current cursor position,
+do not represent unprintable characters with \fB\%unctrl\fP(3X);
 .bP
-they do not expand other control characters to ^-escapes, and
+do not update the cursor position to follow the last character written;
 .bP
-they truncate the string if it crosses the right margin,
-rather than wrapping it around to the new line.
+truncate the string at the window's right margin,
+rather than wrapping it to the next line and potentially scrolling.
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns an error
+.I \%ncurses
+returns
+.B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.B NULL
+or
 .bP
-if the \fIwchstr\fP parameter is null.
+.I chstr
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -109,9 +133,12 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All functions except \fBwaddchnstr\fP may be macros.
+All of these functions except
+.B \%waddchnstr
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 .SH SEE ALSO
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 37774602b..0062129b8 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp $
-.TH curs_attr 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp $
+.TH curs_attr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -271,6 +271,16 @@ T}
 .TE
 .RE
 .PP
+You can thus use
+.B \%A_CHARTEXT
+to extract the character from a
+.IR chtype ","
+.B \%A_ATTRIBUTES
+to obtain its rendering attributes,
+and
+.B \%A_COLOR
+to find the color pair it uses.
+.PP
 These video attributes are supported by \fBattr_on\fP and related functions
 (which also support the attributes recognized by \fBattron\fP, etc.):
 .PP
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index e62ecc130..969215872 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp $
-.TH curs_delch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp $
+.TH curs_delch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,19 +58,17 @@ delete a character from a \fIcurses\fR window
 .B \%wdelch
 deletes the character at the cursor position in
 .IR win .
-\fB\%ncurses\fP(3X) describes the variants of this function.
-.PP
-.B \%wdelch
-moves all characters to the right of the cursor on the same line to the
-left one position and replaces the contents of the rightmost position on
-the line with the window's blank character;
+It moves all characters to the right of the cursor on the same line to
+the left one position and replaces the contents of the rightmost
+position on the line with the window's blank character;
 see \fB\%bkgd\fP(3X)
-(wide-character API users may consult \fB\%bkgrnd\fP(3X) instead).
+(wide-character API users: \fB\%bkgrnd\fP(3X)).
 The cursor position does not change
 (after moving to
 .RI ( y ,
 .IR x ),
 if specified).
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .SH RETURN VALUE
 These functions return
 .B OK
@@ -103,6 +101,7 @@ is not necessarily employed.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 SVr4
 .I curses
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 02932b91a..c190a7ea1 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp $
-.TH curs_get_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp $
+.TH curs_get_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -65,12 +65,10 @@ get (or push back) a wide character from \fIcurses\fR terminal keyboard
 .SH DESCRIPTION
 .SS "Reading Characters"
 .B \%wget_wch
-gathers a key stroke
-.I wch
-from the terminal keyboard associated with a
+gathers a key event from the terminal keyboard associated with a
 .I curses
 window
-.IR win ,
+.IR win ","
 returning
 .B OK
 if a wide character is read,
@@ -84,11 +82,13 @@ if no key event is available.
 When input is pending,
 .B \%wget_wch
 stores an integer
-identifying the key stroke in
-.IR wch ;
+identifying the key event in
+.IR wch ";"
 for alphanumeric and punctuation keys,
 this value corresponds to the character encoding used by the terminal.
-Use of the control key as a modifier often results in a distinct code.
+Use of the control key as a modifier,
+by holding it down while pressing and releasing another key,
+often results in a distinct code.
 The behavior of other keys depends on whether
 .I win
 is in keypad mode;
@@ -99,7 +99,7 @@ If no input is pending,
 then if the no-delay flag is set in the window
 (see \fB\%nodelay\fP(3X)),
 the function returns
-.BR ERR ;
+.BR ERR ";"
 otherwise,
 .I curses
 waits until the terminal has input.
@@ -112,7 +112,7 @@ it occurs when the next newline is read.
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
-waits until a character is typed or the specified delay elapses.
+waits until input is available or the specified delay elapses.
 .PP
 If \fB\%echo\fP(3X) has been called,
 and the window is not a pad,
@@ -142,19 +142,20 @@ writes any other
 to the window,
 as with \fB\%wecho_wchar\fP(3X).
 .bP
-If the window has been moved or modified since the last call to
+If the window
+.I win
+has been moved or modified since the last call to
 \fB\%wrefresh\fP(3X),
 .I curses
 calls
-.BR \%wrefresh .
+.B \%wrefresh
+on it.
 .PP
 If
 .I wch
 is a carriage return and \fBnl\fP(3X) has been called,
 .B \%wgetch
-stores the the character code for newline
-(line feed)
-in
+stores the the character code for line feed in
 .I wch
 instead.
 .SS "Ungetting Characters"
@@ -162,8 +163,8 @@ instead.
 places
 .I wch
 into the input queue to be returned by the next call to
-.BR \%wget_wch .
-A single input queue serves all windows.
+.BR \%wget_wch "."
+A single input queue serves all windows associated with the terminal.
 .SH RETURN VALUE
 .B \%wget_wch
 returns
@@ -178,7 +179,7 @@ if
 the
 .I \%WINDOW
 pointer is
-.BR NULL ,
+.BR NULL ","
 or
 .bP
 its timeout expires without any data arriving,
@@ -188,12 +189,12 @@ execution was interrupted by a signal,
 in which case
 .B \%errno
 is set to
-.BR \%EINTR .
+.BR \%EINTR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
-.IR x )
+.IR x ")"
 is outside the window boundaries.
 .PP
 .B \%unget_wch
@@ -218,18 +219,16 @@ and its variants store the value of the input character in an additional
 parameter instead of the return value.
 .PP
 Unlike
-.BR \%ungetch ,
+.BR \%ungetch ","
 .B \%unget_wch
-cannot distinguish function key codes
-.B \%wget_wch
-from conventional character codes.
+cannot distinguish function key codes from conventional character codes.
 An application can overcome this limitation by pushing function key
 codes with
 .B \%ungetch
 and subsequently checking the return value of
 .B \%wget_wch
 for a match with
-.BR \%KEY_CODE_YES .
+.BR \%KEY_CODE_YES "."
 .SH EXTENSIONS
 See the \*(``EXTENSIONS\*('' section of \fB\%wgetch\fP(3X).
 .SH PORTABILITY
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 9433c6148..02fefd0da 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp $
-.TH curs_getch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp $
+.TH curs_getch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -76,18 +76,20 @@ get (or push back) characters from \fIcurses\fR terminal keyboard
 .SH DESCRIPTION
 .SS "Reading Characters"
 .B \%wgetch
-gathers a key stroke from the terminal keyboard associated with a
+gathers a key event from the terminal keyboard associated with a
 .I curses
 window
-.IR win .
+.IR win "."
 \fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
 When input is pending,
 .B \%wgetch
-returns an integer identifying the key stroke;
+returns an integer identifying the key event;
 for alphanumeric and punctuation keys,
 this value corresponds to the character encoding used by the terminal.
-Use of the control key as a modifier often results in a distinct code.
+Use of the control key as a modifier,
+by holding it down while pressing and releasing another key,
+often results in a distinct code.
 The behavior of other keys depends on whether
 .I win
 is in keypad mode;
@@ -97,7 +99,7 @@ If no input is pending,
 then if the no-delay flag is set in the window
 (see \fB\%nodelay\fP(3X)),
 the function returns
-.BR ERR ;
+.BR ERR ";"
 otherwise,
 .I curses
 waits until the terminal has input.
@@ -110,7 +112,7 @@ it occurs when the next newline is read.
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
-waits until a character is typed or the specified delay elapses.
+waits until input is available or the specified delay elapses.
 .PP
 If \fB\%echo\fP(3X) has been called,
 and the window is not a pad,
@@ -140,11 +142,14 @@ writes any other
 to the window,
 as with \fB\%wechochar\fP(3X).
 .bP
-If the window has been moved or modified since the last call to
+If the window
+.I win
+has been moved or modified since the last call to
 \fB\%wrefresh\fP(3X),
 .I curses
 calls
-.BR \%wrefresh .
+.B \%wrefresh
+on it.
 .PP
 If
 .I c
@@ -153,7 +158,7 @@ is a carriage return and \fBnl\fP(3X) has been called,
 returns the character code for line feed instead.
 .SS "Keypad Mode"
 To
-.IR curses ,
+.IR curses ","
 key strokes not from the alphabetic section of the keyboard
 (those corresponding to the ECMA-6 character set\(emsee
 \fIascii\fP(7)\(emoptionally modified by either the control or shift
@@ -162,7 +167,7 @@ are treated as
 .I function
 keys.
 (In
-.IR curses ,
+.IR curses ","
 the term \*(``function key\*('' includes but is not limited to keycaps
 engraved with \*(``F1\*('',
 \*(``PF1\*('',
@@ -183,12 +188,12 @@ The
 header file declares many
 .I "predefined function keys"
 whose names begin with
-.BR KEY_ ;
+.BR KEY_ ";"
 these object-like macros have values outside the range of eight-bit
 character codes.
 .bP
 In
-.IR \%ncurses ,
+.IR \%ncurses ","
 .I "user-defined function keys"
 are configured with \fB\%define_key\fP(3X);
 they have no names,
@@ -204,9 +209,10 @@ their function keys produce character sequences prefixed with the
 escape character ESC.
 This fact implies that
 .I curses
-cannot know whether the terminal has sent an ESC key stroke or the
-beginning of a function key's character sequence without waiting to see
-if,
+cannot distinguish a user's press of the escape key
+(assuming it sends ESC)
+from the beginning of a function key's character sequence without
+waiting to see if,
 and how soon,
 further input arrives.
 When
@@ -223,7 +229,8 @@ defined by the terminal.
 Consequently,
 a user of a
 .I curses
-application may experience a delay after pressing ESC while
+application may experience a delay after they escape key is pressed
+while
 .I curses
 disambiguates the input;
 see section \*(``EXTENSIONS\*('' below.
@@ -233,26 +240,26 @@ it is an infinite
 (or very large)
 value.
 See \fB\%notimeout\fP(3X).
-Because function key sequences usually begin with an escape character,
-the terminal may appear to hang in no time-out mode after the user has
-pressed ESC.
+Because function key sequences usually begin with ESC,
+the terminal may appear to hang in no time-out mode after the user
+presses the escape key.
 Generally,
 further typing \*(``awakens\*(''
-.IR curses .
+.IR curses "."
 .SS "Ungetting Characters"
 .B \%ungetch
 places
 .I c
 into the input queue to be returned by the next call to
-.BR \%wgetch .
-A single input queue serves all windows.
+.BR \%wgetch "."
+A single input queue serves all windows associated with the terminal.
 .SS "Predefined Key Codes"
 The header file
 .I \%curses.h
 defines the following function key codes.
 .bP
 Except for the special case of
-.BR \%KEY_RESIZE ,
+.BR \%KEY_RESIZE ","
 a window's keypad mode must be enabled for
 .B \%wgetch
 to read these codes from it.
@@ -394,7 +401,7 @@ correspond to a physical key.
 .bP
 .B \%wgetch
 returns
-.BR \%KEY_RESIZE ,
+.BR \%KEY_RESIZE ","
 even if the window's keypad mode is disabled,
 when
 .I \%ncurses
@@ -416,7 +423,7 @@ must read an escape sequence,
 as with a function key.
 .SS "Testing Key Codes"
 In
-.IR \%ncurses ,
+.IR \%ncurses ","
 .B \%has_key
 returns a Boolean value indicating whether the terminal type recognizes
 its parameter as a key code value.
@@ -424,7 +431,7 @@ See also
 \fB\%define_key\fP(3X) and \fB\%key_defined\fP(3X).
 .SH RETURN VALUE
 Except for
-.BR \%has_key ,
+.BR \%has_key ","
 these functions return
 .B OK
 on success and
@@ -434,12 +441,12 @@ on failure.
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
-.BR NULL .
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
-.IR x )
+.IR x ")"
 is outside the window boundaries.
 .PP
 .B \%wgetch
@@ -452,7 +459,7 @@ execution was interrupted by a signal,
 in which case
 .B \%errno
 is set to
-.BR \%EINTR .
+.BR \%EINTR "."
 .PP
 .B \%ungetch
 fails if there is no more room in the input queue.
@@ -461,7 +468,7 @@ fails if there is no more room in the input queue.
 returns
 .B TRUE
 or
-.BR FALSE .
+.BR FALSE "."
 .SH NOTES
 .I curses
 discourages assignment of the ESC key to a discrete function by the
@@ -472,7 +479,7 @@ Some key strokes are indistinguishable from control characters;
 for example,
 .B \%KEY_ENTER
 may be the same as
-.BR \*^M ,
+.BR \*^M ","
 .\" as with att630 or pccon+keys
 and
 .B \%KEY_BACKSPACE
@@ -480,7 +487,7 @@ may be the same as
 .B \*^H
 .\" as with att505 or vt52-basic
 or
-.BR \*^? .
+.BR \*^? "."
 .\" as with pccon+keys or vt320
 Consult the terminal's
 .I \%term\%info
@@ -490,7 +497,7 @@ Some
 .I curses
 implementations,
 including
-.IR \%ncurses ,
+.IR \%ncurses ","
 honor the
 .I \%term\%info
 key definitions;
@@ -502,7 +509,7 @@ sections of a keyboard because (most) terminals do.
 .B \%KEY_ENTER
 refers to the key on the numeric keypad and,
 like other function keys,
-and is reliably recognized only if the window's keypad mode is enabled.
+is reliably recognized only if the window's keypad mode is enabled.
 .bP
 The
 .I \%term\%info
@@ -551,12 +558,12 @@ have fewer.
 A
 .I curses
 application can expect such a keyboard to transmit key codes
-.BR \%KEY_UP ,
-.BR \%KEY_DOWN ,
-.BR \%KEY_LEFT ,
-.BR \%KEY_RIGHT ,
-.BR \%KEY_HOME ,
-.BR \%KEY_END ,
+.BR \%KEY_UP ","
+.BR \%KEY_DOWN ","
+.BR \%KEY_LEFT ","
+.BR \%KEY_RIGHT ","
+.BR \%KEY_HOME ","
+.BR \%KEY_END ","
 .B \%KEY_PPAGE
 (Page Up),
 .B \%KEY_NPAGE
@@ -571,14 +578,14 @@ for 1 \(<=
 .I n
 \(<= 12.
 .PP
-.BR \%getch ,
-.BR \%mvgetch ,
+.BR \%getch ","
+.BR \%mvgetch ","
 and
 .B \%mvwgetch
 may be implemented as macros.
 .SH EXTENSIONS
 In
-.IR \%ncurses ,
+.IR \%ncurses ","
 when a window's \*(``no time-out\*('' mode is
 .I not
 set,
@@ -590,12 +597,15 @@ with ESC typed by the user;
 see
 \fB\%curs_variables\fP(3X).
 .PP
-\fB\%has_key\fP was designed for \fB\%ncurses\fP(3X),
+\fB\%has_key\fP was designed for
+.IR \%ncurses ","
 and is not found in SVr4
-.IR curses ,
+.IR curses ","
 4.4BSD
-.IR curses ,
-or any other previous curses implementation.
+.IR curses ","
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
@@ -629,14 +639,14 @@ In historical
 .I curses
 implementations,
 it varied depending on whether the operating system's dispatch of a
-signal to a handler interrupting a \fIread\fP(2) call in progress,
+signal to a handler interrupted a \fIread\fP(2) call in progress,
 and also
 (in some implementations)
-whether an input timeout or non-blocking mode has been set.
+whether an input timeout or non-blocking mode had been set.
 Programmers concerned about portability should be prepared for either of
 two cases:
 (a) signal receipt does not interrupt
-.BR \%wgetch ;
+.BR \%wgetch ";"
 or
 (b) signal receipt interrupts
 .B \%wgetch
@@ -645,7 +655,7 @@ and causes it to return
 with
 .B \%errno
 set to
-.BR \%EINTR .
+.BR \%EINTR "."
 .PP
 .B \%KEY_MOUSE
 is mentioned in X/Open Curses,
@@ -661,7 +671,7 @@ is an extension.
 and
 .B \%has_key
 are extensions first implemented for
-.IR \%ncurses .
+.IR \%ncurses "."
 By 2022,
 .I \%PDCurses
 .\" https://web.archive.org/web/20220117232009/https://pdcurses.org/docs/MANUAL.html
@@ -670,7 +680,7 @@ NetBSD
 .I curses
 .\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3
 had added them along with
-.BR \%KEY_MOUSE .
+.BR \%KEY_MOUSE "."
 .SH SEE ALSO
 \fB\%curs_get_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 4a49352a1..bb8131c86 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp $
-.TH curs_getstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp $
+.TH curs_getstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -199,7 +199,7 @@ present but not documented in SVr4.
 .PP
 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.
+but did not state whether the terminating NUL counted toward that limit.
 X/Open Curses, Issue 7 (2009) changed that to say they
 \*(``read at most \fIn\fP\-1 bytes\*(''
 to allow for the terminating NUL.
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index eadcecef2..92b48af9f 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp $
-.TH curs_getyx 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp $
+.TH curs_getyx 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -51,62 +51,109 @@ get \fIcurses\fR cursor and window coordinates
 \fB#include <curses.h>
 .PP
 \fBvoid getyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
-\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 \fBvoid getbegyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 \fBvoid getmaxyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.PP
+\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
-The \fB\%getyx\fP macro places the current cursor position
-of the given window in the two integer variables \fIy\fP and \fIx\fP.
-.PP
-If \fIwin\fP is a subwindow, the \fB\%getparyx\fP macro places the beginning
-coordinates of the subwindow relative to the parent window into two integer
-variables \fIy\fP and \fIx\fP.
-Otherwise, \fB\-1\fP is placed into \fIy\fP and \fIx\fP.
+These macros obtain the cursor position and bounds information of a
+.I curses
+window
+.IR win "."
+.B \%getyx
+stores
+.IR win "'s"
+cursor position in the variables
+.I y
+and
+.IR x "."
+.B \%getmaxyx
+stores
+.IR win "'s"
+maximum valid row and column numbers in
+.I y
+and
+.IR x ","
+respectively.
+.B \%getbegyx
+similarly stores the position of
+.IR win "'s"
+origin relative to that of the screen
+(for
+.BR stdscr ","
+these coordinates are always
+.BR 0 ")."
 .PP
-Like \fB\%getyx\fP, the \fB\%getbegyx\fP and \fB\%getmaxyx\fP macros store
-the current beginning coordinates and size of the specified window.
+If
+.I win
+is a subwindow
+(see \fB\%subwin\fP(3X)),
+the
+.B \%getparyx
+macro places the coordinates of its origin relative to its parent window
+into
+.I y
+and
+.IR x ","
+and
+.B \-1
+into both if it is not.
 .SH RETURN VALUE
-The return values of these macros are undefined (i.e.,
-they should not be used as the right-hand side of assignment statements).
+No return values are defined for macros.
+Do not use them as the right-hand side of assignment statements.
 .SH NOTES
-All of these interfaces are macros.
-A \*(``&\*('' is not necessary before the variables \fIy\fP and \fIx\fP.
+All of these interfaces are implemented as macros.
+An \*(``&\*('' operator is not necessary before the variables
+.I y
+and
+.IR x "."
 .SH PORTABILITY
-The
-\fB\%getyx\fP,
-\fB\%getparyx\fP,
-\fB\%getbegyx\fP and
-\fB\%getmaxyx\fP
-macros are described in X/Open Curses, Issue 4.
+These macros are described in X/Open Curses,
+Issue 4.
 .PP
-This implementation also provides functions
-\fB\%getbegx\fP,
-\fB\%getbegy\fP,
-\fB\%getcurx\fP,
-\fB\%getcury\fP,
-\fB\%getmaxx\fP,
-\fB\%getmaxy\fP,
-\fB\%getparx\fP and
-\fB\%getpary\fP
-for compatibility with older versions of \fIcurses\fP;
+.I \%ncurses
+also provides functions
+.BR \%getbegx ","
+.BR \%getbegy ","
+.BR \%getcurx ","
+.BR \%getcury ","
+.BR \%getmaxx ","
+.BR \%getmaxy ","
+.BR \%getparx ","
+and
+.B \%getpary
+for compatibility with older versions of
+.IR curses ";"
 see \fB\%curs_legacy\fP(3X).
 .PP
-Although X/Open Curses does not address this,
-many implementations provide members of the \fB\%WINDOW\fP structure
-containing values corresponding to these macros.
-For best portability, do not rely on using the data in \fB\%WINDOW\fP,
-since some implementations make \fB\%WINDOW\fP opaque (do not allow
-direct use of its members).
+Although X/Open Curses does not address the issue,
+many implementations expose members of the
+.I \%WINDOW
+structure containing values corresponding to these macros.
+Do not rely on their availability;
+some implementations make
+.I \%WINDOW
+opaque
+(that is,
+they do not allow direct access to its members).
 .PP
 Besides the problem of opaque structures,
-the data stored in like-named members may not have like-values in
-different implementations.
-For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values
-in \fI\%ncurses\fP have
-(at least since release 1.8.1)
+the data stored in like-named members may not have values of the same
+meaning different implementations.
+For example,
+the values of
+.B \%WINDOW._maxx
+and
+.B \%WINDOW._maxy
+in
+.I \%ncurses
+have long
+.\" (at least since its initial release, 1.8.1)
 differed by one from some other implementations.
-The difference is hidden by means of the macro \fB\%getmaxyx\fP.
+The
+.B \%getmaxyx
+macro hides this difference.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_legacy\fP(3X),
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 962e9dc86..17be0fb9e 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp $
-.TH curs_inch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp $
+.TH curs_inch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,31 +57,21 @@ get a \fIcurses\fR character from a window
 .PP
 \fBchtype inch(void);
 \fBchtype winch(WINDOW *\fIwin\fP);
-.PP
 \fBchtype mvinch(int \fIy\fP, int \fIx\fP);
 \fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
-These routines return the character, of type \fBchtype\fP, at the current
-position in the named window.
-If any attributes are set for that position,
-their values are OR'ed into the value returned.
-Constants defined in
-\fB<curses.h>\fP can be used with the \fB&\fP (logical AND) operator to
-extract the character or attributes alone.
-.
-.SS Attributes
-The following bit masks may be AND-ed with characters returned by \fBwinch\fP.
-.PP
-.TS
-Lb Lb
-Lb Lx.
-Name	Description
-_
-A_CHARTEXT	Extract character
-A_ATTRIBUTES	Extract attributes
-A_COLOR	Extract color pair information
-.TE
+.B \%winch
+returns the
+.I curses
+character,
+including rendering attributes and color pair identifier,
+at the cursor position in the window
+.IR win "."
+Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) explains
+how to extract these data from a
+.IR chtype "."
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .SH RETURN VALUE
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -89,35 +79,68 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .PP
-The \fBwinch\fP function does not return an error if the window contains
-characters larger than 8-bits (255).
-Only the low-order 8 bits of the character are used by \fBwinch\fP.
+These functions do not return an error if the window comprises cells of
+.I curses
+complex characters
+(that is,
+they contain characters with codes wider than eight bits,
+or greater than 255 as an unsigned decimal integer).
+They instead extract only the low-order eight bits of character data
+in the cell.
 .SH NOTES
-Note that all of these routines may be macros.
+.BR \%inch ,
+.BR \%mvinch ,
+and
+.B \%mvwinch
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.SH HISTORY
+.B \%winch
+was implemented in the original 4BSD
+.I curses
+library
+(November 1980).
+It returned only the character code
+(as an integer)
+with the \*(``standout\*(`` attribute bit
+(the only one it supported)
+cleared.
+Because 7-bit ASCII was the only character encoding supported,
+4BSD's
+.B \%winch
+returned a
+.I char
+type.
+.\" Through macros, it directly accessed a `char` structure member.
 .PP
-Very old systems (before standardization) provide a different function
-with the same name:
-.bP
-The \fBwinch\fP function was part of the original BSD curses library,
-which stored a 7-bit character combined with the \fIstandout\fP attribute.
-.IP
-In BSD curses, \fBwinch\fP returned only the character (as an integer)
-with the \fIstandout\fP attribute removed.
-.bP
-System V curses added support for several video attributes which
-could be combined with characters in the window.
-.IP
-Reflecting this improvement, the function was altered to return the
-character combined with all video attributes in a \fBchtype\fP value.
+System\ V
+.I curses
+(1983) permitted several rendering attributes to be combined with a
+character in a window.
+Reflecting this improvement,
+.B \%winch
+.\" XXX: possibly returned a `short` in SVr1 through SVr3 --GBR
+returned an
+.I int
+in SVr3.2 (1988)
+and switched to
+.I chtype
+in SVr4 (1989).
 .PP
-X/Open Curses does not specify
-the size and layout of attributes, color and character values in
-\fBchtype\fP; it is implementation-dependent.
-This implementation uses 8 bits for character values.
-An application using more bits, e.g., a Unicode value,
-should use the wide-character equivalents to these functions.
+X/Open Curses does not specify the sizes of the character code or
+color pair identifier,
+nor the quantity of rendering attribute bits,
+in
+.IR chtype ";"
+these are implementation-dependent.
+.I \%ncurses
+uses eight bits for the character code.
+An application requiring a wider character type,
+for instance to handle Unicode,
+should use the wide-character counterparts of these functions.
 .SH SEE ALSO
 \fB\%curs_in_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 8e5c70181..d67b2761f 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp $
-.TH curs_mouse 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp $
+.TH curs_mouse 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -487,11 +487,12 @@ the
 .I \%xterm
 mouse report sequence appears in the string read.
 .PP
-Mouse event reports from
+An
+.I \%ncurses
+window must enable \fB\%keypad\fP(3X) to correctly receive mouse event
+reports from
 .I \%xterm
-are not detected correctly in a window with keypad application mode
-disabled,
-since they are interpreted as a variety of function key.
+since they are encoded like function keys.
 Set the terminal's
 .I \%term\%info
 capability \fB\%kmous\fP to \*(``\eE[M\*(''
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index df263f2c1..8904d2ee5 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,29 +27,29 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp $
-.TH curs_outopts 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp $
+.TH curs_outopts 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
 .SH NAME
 \fB\%clearok\fP,
-\fB\%idlok\fP,
 \fB\%idcok\fP,
+\fB\%idlok\fP,
 \fB\%immedok\fP,
 \fB\%leaveok\fP,
+\fB\%scrollok\fP,
 \fB\%setscrreg\fP,
-\fB\%wsetscrreg\fP,
-\fB\%scrollok\fP \-
+\fB\%wsetscrreg\fP \-
 set \fIcurses\fR output options
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
 \fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
 \fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
 \fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP);
 \fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP);
 \fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP);
@@ -72,6 +72,13 @@ If
 the \fIwin\fP argument to \fBclearok\fP is the global variable \fBcurscr\fP,
 the next call to \fBwrefresh\fP with any window causes the screen to be cleared
 and repainted from scratch.
+.SS idcok
+If \fBidcok\fP is called with \fBFALSE\fP as second argument, \fBcurses\fP
+no longer considers using the hardware insert/delete character feature of
+terminals so equipped.
+Use of character insert/delete is enabled by default.
+Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
+of character insertion and deletion.
 .SS idlok
 If \fBidlok\fP is called with \fBTRUE\fP as second argument, \fBcurses\fP
 considers using the hardware insert/delete line feature of terminals so
@@ -85,13 +92,6 @@ disabled by default because insert/delete line tends to be visually annoying
 when used in applications where it is not really needed.
 If insert/delete line
 cannot be used, \fBcurses\fP redraws the changed portions of all lines.
-.SS idcok
-If \fBidcok\fP is called with \fBFALSE\fP as second argument, \fBcurses\fP
-no longer considers using the hardware insert/delete character feature of
-terminals so equipped.
-Use of character insert/delete is enabled by default.
-Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
-of character insertion and deletion.
 .SS immedok
 If \fBimmedok\fP is called with \fBTRUE\fP as second argument,
 any change in the window image,
@@ -119,7 +119,7 @@ line.
 If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
 (Note that to get the physical scrolling effect on the terminal, it is
 also necessary to call \fBidlok\fP).
-.SS  "setscrreg, wsetscrreg"
+.SS "setscrreg, wsetscrreg"
 The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
 programmer to set a software scrolling region in a window.
 The \fItop\fP and
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index e58a48e3c..3a1e5fc06 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp $
-.TH curs_sp_funcs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp $
+.TH curs_sp_funcs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index dacd3b0f4..019522e74 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp $
-.TH curs_termattrs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp $
+.TH curs_termattrs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -41,7 +41,7 @@
 \fB\%term_attrs\fP,
 \fB\%termattrs\fP,
 \fB\%termname\fP \-
-\fIcurses\fR environment query routines
+get and set terminal attributes with \fIcurses\fP
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 1df0a1d3f..ac92fa8af 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp $
-.TH curs_util 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp $
+.TH curs_util 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,7 +71,7 @@ miscellaneous \fIcurses\fR utility routines
 .PP
 \fBvoid filter(void);
 .PP
-\fBvoid use_env(bool \fIf\fP);
+\fBvoid use_env(bool \fIbf\fP);
 .PP
 \fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP);
 \fBWINDOW *getwin(FILE *\fIfilep\fP);
@@ -81,7 +81,7 @@ miscellaneous \fIcurses\fR utility routines
 .PP
 \fI/* extensions */
 \fBvoid nofilter(void);
-\fBvoid use_tioctl(bool \fIf\fP);
+\fBvoid use_tioctl(bool \fIbf\fP);
 .fi
 .SH DESCRIPTION
 .SS unctrl
@@ -217,7 +217,6 @@ lB lB lx.
 use_env	use_tioctl	Summary
 _
 TRUE	FALSE	T{
-This is the default behavior.
 \fI\%ncurses\fP uses operating system calls
 unless overridden by \fILINES\fP or \fI\%COLUMNS\fP environment
 variables;
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 5f92c96dd..661a0861d 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp $
-.TH @INFOCMP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp $
+.TH @INFOCMP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,7 +49,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB@INFOCMP@\fP \-
 compare or print out \fIterminfo\fP descriptions
@@ -584,7 +583,7 @@ These are extensions to the terminfo repertoire which can be loaded
 using the \fB\-x\fP option of \fB@TIC@\fP.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH EXTENSIONS
 The
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 0f0335d44..43db64b11 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp $
-.TH @INFOTOCAP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp $
+.TH @INFOTOCAP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@INFOTOCAP@\fP \-
 convert a \fI\%terminfo\fR description into a \fI\%termcap\fR description
@@ -78,7 +77,7 @@ The \fB\-V\fP option reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 None of X/Open Curses,
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 2b18a016e..60efbdd23 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.73 2024/04/13 23:39:11 tom Exp $
+# $Id: man_db.renames.in,v 1.74 2024/05/11 20:30:32 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -251,6 +251,7 @@ start_color.3x			start_color.3ncurses
 subwin.3x			subwin.3ncurses
 syncok.3x			syncok.3ncurses
 terminfo.3x			terminfo.3ncurses
+tigetflag.3x			tigetflag.3ncurses
 tigetstr.3x			tigetstr.3ncurses
 touchline.3x			touchline.3ncurses
 touchwin.3x			touchwin.3ncurses
@@ -266,6 +267,8 @@ use_tioctl.3x			use_tioctl.3ncurses
 vidputs.3x			vidputs.3ncurses
 wadd_wch.3x			wadd_wch.3ncurses
 waddch.3x			waddch.3ncurses
+waddnstr.3x			waddnstr.3ncurses
+waddnwstr.3x			waddnwstr.3ncurses
 waddstr.3x			waddstr.3ncurses
 waddwstr.3x			waddwstr.3ncurses
 wattr_set.3x			wattr_set.3ncurses
@@ -286,6 +289,7 @@ wnoutrefresh.3x			wnoutrefresh.3ncurses
 wrefresh.3x			wrefresh.3ncurses
 wsetscrreg.3x			wsetscrreg.3ncurses
 wtimeout.3x			wtimeout.3ncurses
+wunctrl.3x			wunctrl.3ncurses
 #
 # Other:
 getty.8				getty.8
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 7599c74a8..4b64fbebe 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.35 2024/04/14 00:36:21 tom Exp $
+# $Id: manhtml.aliases,v 1.36 2024/05/11 21:52:17 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -99,6 +99,7 @@ slk_touch(3X)		curs_slk(3X)
 start_color(3X)		curs_color(3X)
 terminfo(3X)		curs_terminfo(3X)
 tic(1)			tic(1M)
+tigetflag(3X)		curs_terminfo(3X)
 tigetstr(3X)		curs_terminfo(3X)
 touchline(3X)		curs_touch(3X)
 touchwin(3X)		curs_touch(3X)
@@ -112,6 +113,8 @@ use_tioctl(3X)		curs_util(3X)
 vidputs(3X)		curs_terminfo(3X)
 wadd_wch(3X)		curs_add_wch(3X)
 waddch(3X)		curs_addch(3X)
+waddnstr(3X)		curs_addstr(3X)
+waddnwstr(3X)		curs_addwstr(3X)
 waddstr(3X)		curs_addstr(3X)
 waddwstr(3X)		curs_addwstr(3X)
 wattr_set(3X)		curs_attr(3X)
@@ -124,6 +127,7 @@ wechochar(3X)		curs_addch(3X)
 wget_wch(3X)		curs_get_wch(3X)
 wgetch(3X)		curs_getch(3X)
 wgetstr(3X)		curs_getstr(3X)
+win_wch(3X)		curs_in_wch(3X)
 winch(3X)		curs_inch(3X)
 wins_wch(3X)		curs_ins_wch(3X)
 winsch(3X)		curs_insch(3X)
@@ -131,3 +135,4 @@ wmove(3X)		curs_move(3X)
 wnoutrefresh(3X)	curs_refresh(3X)
 wrefresh(3X)		curs_refresh(3X)
 wsetscrreg(3X)		curs_outopts(3X)
+wunctrl(3X)		curs_util(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 41aa6359d..e685e9c2c 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.25 2024/04/20 19:26:05 tom Exp $
+# $Id: manhtml.externs,v 1.26 2024/05/11 20:35:15 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -53,6 +53,7 @@ printf(3)
 profile(5)
 putc(3)
 putchar(3)
+putwchar(3)
 putwc(3)
 read(2)
 readline(3)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 9aaa7adf5..603796414 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp $
-.TH ncurses 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp $
+.TH ncurses 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -54,7 +54,6 @@
 .  TP
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%ncurses\fP \-
 character-cell terminal interface with optimized output
@@ -86,15 +85,16 @@ abstraction and subdivision thereof with
 .I windows
 and
 .IR pads ;
-the reading of terminal input;
+acquisition of keyboard and mouse events;
 control of terminal input and output options;
-environment query routines;
-color manipulation;
+selection of color and rendering attributes
+(such as bold or underline);
 the definition and use of
 .I "soft label"
 keys;
+access to the
 .I \%term\%info
-capability access;
+terminal capability database;
 a
 .I termcap
 compatibility interface;
@@ -102,8 +102,7 @@ and an abstraction of the system's API for manipulating the terminal
 (such as \fI\%termios\fP(3)).
 .PP
 .I \%ncurses
-implements the standard interface described by
-X/Open Curses Issue\ 7.
+implements the interface described by X/Open Curses Issue\ 7.
 In many behavioral details not standardized by X/Open,
 .I \%ncurses
 emulates the
@@ -272,7 +271,7 @@ respectively.
 .PP
 Frequent changes to the terminal screen can cause unpleasant flicker or
 inefficient use of the communication channel to the device,
-so the library does not generally update it automatically.
+so as a rule the library does not update it automatically.
 Therefore,
 after using
 .I curses
@@ -284,7 +283,7 @@ The library
 .\" X/Open Curses Issue 7 assumes some optimization will be done, but
 .\" does not mandate it in any way.
 .I optimizes
-its output by computing a minimal number of operations to mutate the
+its output by computing a minimal volume of operations to mutate the
 screen from its state at the previous refresh to the new one.
 Effective optimization demands accurate information about the terminal
 device:
@@ -297,26 +296,28 @@ implementation.
 Special windows called
 .I pads
 may also be manipulated.
-These are windows that are not constrained to the size of the terminal
-screen and whose contents need not be completely displayed.
+These are not constrained to the size of the terminal screen and their
+contents need not be completely displayed.
 See \fB\%curs_pad\fP(3X).
 .PP
-In addition to drawing characters on the screen,
-rendering attributes and colors may be supported,
-causing the characters to show up in such modes as underlined,
-in reverse video,
-or in color on terminals that support such display enhancements.
+Many terminals support configuration of character cell foreground and
+background colors as well as rendering
+.I attributes ,
+which cause characters to show up in such modes as
+boldfaced,
+underlined,
+or in reverse video.
 See \fB\%curs_attr\fP(3X).
 .PP
 .I curses
 predefines constants for a small set of forms-drawing graphics
 corresponding to the DEC Alternate Character Set (ACS),
 a feature of VT100 and other terminals.
-See \fB\%waddch\fP(3X).
+See \fB\%addch\fP(3X).
 .PP
 .I curses
 is implemented using the operating system's terminal driver;
-keystroke events are received not as scan codes but as byte sequences.
+key events are received not as scan codes but as byte sequences.
 Graphical keycaps
 (alphanumeric and punctuation keys,
 and the space)
@@ -330,13 +331,14 @@ and function keys,
 appears as a control character or a multibyte
 .I "escape sequence."
 .I curses
-translates these into unique
+translates the latter into unique
 .I "key codes."
 See \fB\%getch\fP(3X).
 .PP
 .I \%ncurses
 provides reimplementations of the SVr4 \fBpanel\fP(3X), \fBform\fP(3X),
-and \fBmenu\fP(3X) libraries to ease construction of user interfaces
+and \fBmenu\fP(3X) libraries;
+they permit overlapping windows and ease construction of user interfaces
 with
 .IR curses .
 .SS "Initialization"
@@ -353,9 +355,9 @@ value automatically;
 \fB\%tset\fP(1) may assist with troubleshooting exotic situations.
 .PP
 If you change the terminal type,
-export the
+export the shell's
 .I TERM
-environment variable in the shell,
+variable,
 then run \fB\%tset\fP(1) or the
 .RB \*(`` "@TPUT@ init" \*(''
 command.
@@ -384,9 +386,8 @@ a
 program checks first for a terminal type description in the location it
 identifies.
 .I \%TERMINFO
-is useful for developing experimental type descriptions or when write
-permission to
-.I \%\*d
+is useful for developing type descriptions or when write permission to
+.I \%@TERMINFO@
 is not available.
 .PP
 See section \*(``ENVIRONMENT\*('' below.
@@ -413,7 +414,7 @@ man pages apply the following names to parameters.
 .TS
 center;
 Li L.
-bf	\fIbool\fP (\fBTRUE\fP or \fBFALSE\fP)
+bf	a \fIbool\fP (\fBTRUE\fP or \fBFALSE\fP)
 c	a \fIchar\fP or \fIint\fP
 ch	a \fIchtype\fP
 wc	a \fIwchar_t\fP or \fIwint_t\fP
@@ -422,21 +423,33 @@ win	pointer to a \fIWINDOW\fP
 pad	pointer to a \fIWINDOW\fP that is a pad
 .TE
 .SS "Wide and Non-wide Character Configurations"
-This manual page describes functions that appear in any configuration
-of the library.
+This man page primarily surveys functions that appear in any
+configuration of the library.
 There are two common configurations;
 see section \*(``ALTERNATE CONFIGURATIONS\*('' below.
 .TP 10 \" "ncursesw" + 2n
 .I \%ncurses
 is the library in its \*(``non-wide\*('' configuration,
 handling only eight-bit characters.
-It stores a character combined with attributes in a
+It stores a character combined with attributes and a color pair in a
 .I \%chtype
 datum,
 which is often an alias of
 .IR int .
+A string of
+.I curses
+characters is similar to a C
+.I char
+string;
+a
+.I chtype
+string ends with an integral
+.BR 0 ","
+the null
+.I curses
+character.
 .IP
-Attributes alone
+Attributes and a color pair selection
 (with no corresponding character)
 can be stored in variables of
 .I \%chtype
@@ -444,7 +457,7 @@ or
 .I \%attr_t
 type.
 In either case,
-they are represented as an integral bit mask.
+they are accessed via an integral bit mask.
 .IP
 Each cell of a
 .I \%WINDOW
@@ -477,9 +490,14 @@ Each character is of type
 a complex character contains one spacing character and zero or more
 non-spacing characters
 (see below).
-Attributes and color data are stored in separate fields of the
-structure,
-not combined as in
+A string of complex characters ends with a
+.I \%cchar_t
+whose
+.I \%wchar_t
+member is the null wide character.
+Attributes and a color pair selection are stored in separate fields of
+the structure,
+not combined into an integer as in
 .IR \%chtype .
 .PP
 Each cell of a
@@ -1033,11 +1051,12 @@ see sections \*(``ALTERNATE CONFIGURATIONS\*('' and \*(``EXTENSIONS\*(''
 below.
 .SH RETURN VALUE
 Unless otherwise noted,
-functions that return an integer return
+functions that return integers return the constants
 .B OK
 on success and
 .B ERR
-on failure.
+on failure;
+see \fB\%curs_variables\fP(3X).
 Functions that return pointers return
 .B NULL
 on failure.
@@ -1069,7 +1088,7 @@ Its integral value is used for the baud rate.
 If that value is absent or invalid,
 .I \%ncurses
 uses 9600.
-This feature allows testers to construct repeatable test cases
+This feature allows developers to construct repeatable test cases
 that take into account optimization decisions that depend on baud rate.
 .SS "\fICC\fP (command character)"
 When set,
@@ -1256,7 +1275,7 @@ has the same effect.
 When
 .I \%ncurses
 is configured to use the GPM interface,
-this variable may list one or more terminal names
+this variable may list one or more terminal type names
 against which the
 .I TERM
 variable
@@ -1265,7 +1284,7 @@ is matched.
 An empty value disables the GPM interface,
 using
 .IR \%ncurses 's
-built-in support for \fIxterm\fP(1) mouse protocols instead.
+built-in support for \fI\%xterm\fP(1) mouse protocols instead.
 If the variable is absent,
 .I \%ncurses
 attempts to open GPM if
@@ -1315,8 +1334,8 @@ that is,
 limiting the speed of communication to what the hardware could handle.
 Unless a hardware terminal is interfaced into a terminal concentrator
 (which does flow control),
-an application must manage flow control itself to prevent overruns and
-data loss.
+an application must manage flow itself to prevent overruns and data
+loss.
 .PP
 A solution that comes at no hardware cost is for an application to pause
 after directing a terminal to execute an operation that it performs
@@ -1588,7 +1607,7 @@ environment variable
 .bP
 location(s) configured and compiled into
 .I \%ncurses
-.RS 3
+.RS
 .if !'\*(td'' \{\
 .bP
 .I \%@TERMINFO_DIRS@
@@ -1661,29 +1680,49 @@ employing
 .IR \%ncurses .
 .TP 5
 .B \-\-disable\-overwrite
-The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP:
+The standard C preprocessor inclusion for the
+.I curses
+library is as follows.
 .RS 5
 .PP
 .RS 4
 .EX
-\fB#include <curses.h>\fP
+.\" The dummy character prevents undesired rewriting of the next line on
+.\" installation of the man page.
+\fB#\&include <curses.h>\fP
 .EE
 .RE
 .PP
-This option is used to avoid filename conflicts when \fI\%ncurses\fP
-is not the main implementation of curses of the computer.
-If \fI\%ncurses\fP is installed disabling overwrite,
-it puts its headers in a subdirectory,
-e.g.,
+This option is used to avoid file name conflicts between
+.I \%ncurses
+and an existing
+.I curses
+installation on the system.
+If
+.I \%ncurses
+is installed disabling overwrite,
+it puts its header files in a subdirectory.
+Here is an example.
 .PP
 .RS 4
 .EX
-\fB#include <ncurses/curses.h>\fP
+.\" The dummy character prevents undesired rewriting of the next line on
+.\" installation of the man page.
+\fB#\&include <ncurses/curses.h>\fP
 .EE
 .RE
 .PP
-It also omits a symbolic link which would allow you to use \fB\-lcurses\fP
-to build executables.
+Installation also omits a symbolic link that would cause the compiler's
+.B \-lcurses
+option to link object files with
+.I \%ncurses
+instead of the system
+.I curses
+library.
+.PP
+The directory used by this configuration of
+.I \%ncurses
+is shown in section \*(``SYNOPSIS\*('' above.
 .RE
 .TP 5
 .B \-\-enable\-widec
@@ -1801,7 +1840,7 @@ than assuming it is always in the debug library.
 .I @DATADIR@/tabset
 tab stop initialization database
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal capability database
 .SH NOTES
 X/Open Curses permits most functions it specifies to be made available
@@ -1819,7 +1858,7 @@ to reuse functions
 those that move the cursor before another operation),
 and
 .bP
-a few special cases.
+in a few special cases.
 .PP
 If the standard output file descriptor of an
 .I \%ncurses
@@ -1878,8 +1917,8 @@ instead using accessor functions such as
 \fB\%is_scrollok\fP(3X).
 .PP
 .I \%ncurses
-enables an application to direct application output to a printer
-attached to the terminal device;
+enables an application to direct its output to a printer attached to the
+terminal device;
 see \fB\%curs_print\fP(3X).
 .PP
 .I \%ncurses
@@ -1896,25 +1935,31 @@ see \fB\%use_legacy_coding\fP(3X).
 .I \%ncurses
 is compiled to support them;
 section \*(``ALTERNATE CONFIGURATIONS\*('' describes how.
-.bP
+.PP
+.I \%ncurses
+permits modification of \fB\%unctrl\fP(3X)'s behavior;
+see \fB\%use_legacy_coding\fP(3X).
+.PP
 Rudimentary support for multi-threaded applications may be available;
 see \fBcurs_threads\fP(3X).
-.bP
+.PP
 Functions that ease the management of multiple screens can be exposed;
 see \fBcurs_sp_funcs\fP(3X).
-.bP
+.PP
 To aid applications to debug their memory usage,
-.I ncurses
+.I \%ncurses
 optionally offers functions to more aggressively free memory it
 dynamically allocates itself;
 see \fBcurs_memleaks\fP(3X).
-.bP
+.PP
 The library facilitates auditing and troubleshooting of its behavior;
 see \fBcurs_trace\fP(3X).
-.bP
-The compiler option
+.PP
+Compiling
+.I \%ncurses
+with the option
 .B \%\-DUSE_GETCAP
-causes the library to fall back to reading
+causes it to fall back to reading
 .I \%/etc/termcap
 if the terminal setup code cannot find a
 .I \%term\%info
@@ -1963,11 +2008,10 @@ to ensure that they are not null.
 This is done primarily to guard against programmer error.
 The standard interface does not provide a way for the library
 to tell an application which of several possible errors occurred.
-Relying on this
-(or some other)
-extension adversely affects the portability of
-.I curses
-applications.
+An application that relies on
+.I \%ncurses
+to check its function parameters for validity limits its portability and
+robustness.
 .SS "Padding Differences"
 In historical
 .I curses
@@ -2125,7 +2169,7 @@ AIX
 includes
 .I \%term.h
 and
-.IR \% termios.h .
+.IR \%termios.h .
 Again,
 .I \%ncurses
 and Solaris
diff --git a/man/term.5 b/man/term.5
index cec231f55..588652f84 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp $
-.TH term 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp $
+.TH term 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -55,69 +55,101 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 term \-
-compiled \fIterminfo\fR terminal description
-.SH SYNOPSIS
-.B term
+compiled \fI\%term\%info\fP terminal description
 .SH DESCRIPTION
+\fB\%@TIC@\fP(1) compiles a
+.I \%term\%info
+terminal type description,
+and \fB\%setupterm\fP(3X) reads it.
+A compiled description may be stored in a file or in a database of,
+potentially,
+many such descriptions.
+Further,
+a compiled description may be in one of two formats:
+one similar to that used by System\ V,
+and a newer,
+extensible format employed exclusively by
+.IR \%ncurses .
 .SS "Storage Location"
-Compiled terminfo descriptions are placed under the directory \fB\*d\fP.
-Two configurations are supported
-(when building the \fI\%ncurses\fP libraries):
+Compiled
+.I \%term\%info descriptions are placed
+under the directory
+.IR \%@TERMINFO@ .
+One of two configurations is selected
+when building the
+.I \%ncurses
+libraries.
 .TP 5
 .B directory tree
 A two-level scheme is used to avoid a linear search
-of a huge Unix system directory: \fB\*d/c/name\fP where
+of a huge Unix system directory:
+.IR \%@TERMINFO@/ c / name
+where
 .I name
-is the name of the terminal, and
+is the name of the terminal,
+and
 .I c
 is the first character of
 .IR name .
 Thus,
-.I act4
-can be found in the file \fB\*d/a/act4\fP.
+the compiled description of terminal type \*(``act4\*(''
+is found in the file
+.IR \%@TERMINFO@/a/act4 .
 Synonyms for the same terminal are implemented by multiple
 links to the same compiled file.
 .TP 5
 .B hashed database
-Using Berkeley database, two types of records are stored:
-the terminfo data in the same format as stored in a directory tree with
-the terminfo's primary name as a key,
+Using the Berkeley database API,
+two types of records are stored:
+the
+.I \%term\%info
+data in the same format as that stored in a directory tree with
+the terminal's primary type name as a key,
 and records containing only aliases pointing to the primary name.
 .IP
 If built to write hashed databases,
-\fI\%ncurses\fP can still read terminfo databases organized as a
+.I \%ncurses
+can still read
+.I \%term\%info
+databases organized as a
 directory tree,
 but cannot write entries into the directory tree.
-It can write (or rewrite) entries in the hashed database.
+It can write
+(or rewrite)
+entries in the hashed database.
 .IP
-\fI\%ncurses\fP distinguishes the two cases in the \fI\%TERMINFO\fP and
-\fI\%TERMINFO_DIRS\fP environment variable by assuming a directory tree
-for entries that correspond to an existing directory,
-and hashed database otherwise.
+.I \%ncurses
+distinguishes the two cases in the
+.I \%TERMINFO
+and
+.I \%TERMINFO_DIRS
+environment variable by assuming a directory tree for entries that
+correspond to an existing directory,
+and a hashed database otherwise.
 .SS "Legacy Storage Format"
 The format has been chosen so that it will be the same on all hardware.
-An 8 or more bit byte is assumed, but no assumptions about byte ordering
+A byte of at least eight bits' width is assumed,
+but no assumptions about bit ordering
 or sign extension are made.
 .PP
-The compiled file is created with the \fB@TIC@\fP program,
-and read by the routine \fBsetupterm\fP(3X).
 The file is divided into six parts:
 .RS 5
-.TP 3
-a) \fIheader\fP,
-.TP 3
-b) \fIterminal names\fP,
-.TP 3
-c) \fIBoolean flags\fP,
-.TP 3
-d) \fInumbers\fP,
-.TP 3
-e) \fIstrings\fP, and
-.TP 3
-f) \fIstring table\fP.
+.IP (a) 4
+.IR header ,
+.IP (b)
+.IR "terminal names" ,
+.IP (c)
+.IR "Boolean flags" ,
+.IP (d)
+.IR numbers ,
+.IP (e)
+.IR strings ,
+and
+.IP (f)
+a
+.IR "string table" .
 .RE
 .PP
 The \fIheader\fP section begins the file.
@@ -126,54 +158,64 @@ described below.
 These integers are
 .RS 5
 .TP 5
-(1) the \fImagic number\fP (octal 0432);
+(1) the \fImagic number\fP
+(octal 0432);
 .TP 5
-(2) the size, in bytes, of the \fIterminal names\fP section;
+(2) the size,
+in bytes,
+of the \fIterminal names\fP section;
 .TP 5
 (3) the number of bytes in the \fIBoolean flags\fP section;
 .TP 5
 (4) the number of short integers in the \fInumbers\fP section;
 .TP 5
-(5) the number of offsets (short integers) in the \fIstrings\fP section;
+(5) the number of offsets
+(short integers)
+in the \fIstrings\fP section;
 .TP 5
-(6) the size, in bytes, of the \fIstring table\fP.
+(6) the size,
+in bytes,
+of the \fIstring table\fP.
 .RE
 .PP
 The capabilities in the
 \fIBoolean flags\fP,
-\fInumbers\fP, and
+\fInumbers\fP,
+and
 \fIstrings\fP
-sections are in the same order as the file <term.h>.
+sections are in the same order as in the header file
+.IR term.h .
 .PP
-Short integers are signed, in the range \-32768 to 32767.
-They are stored as two 8-bit bytes.
-The first byte contains the least significant 8 bits of the value,
-and the second byte contains the most significant 8 bits.
-(Thus, the value represented is 256*second+first.)
-This format corresponds to the hardware of the \s-1VAX\s+1
-and \s-1PDP\s+1-11 (that is, little-endian machines).
-Machines where this does not correspond to the hardware must read the
-integers as two bytes and compute the little-endian value.
+Short integers are signed,
+in the range \-32768 to 32767,
+and stored in little-endian format.
 .PP
 Numbers in a terminal description,
 whether they are entries in the \fInumbers\fP or \fIstrings\fP table,
 are positive integers.
 Boolean flags are treated as positive one-byte integers.
-In each case, those positive integers represent a terminal capability.
-The terminal compiler @TIC@ uses negative integers to handle the cases where
-a capability is not available:
+In each case,
+those positive integers represent a terminal capability.
+The terminal compiler
+.I \%@TIC@
+uses negative integers to handle the cases where a capability is not
+available:
 .bP
 If a capability is absent from this terminal,
-@TIC@ stores a \-1 in the corresponding table.
+.I \%@TIC@
+stores a \-1 in the corresponding table.
 .IP
-The integer value \-1 is represented by two bytes 0377, 0377.
+The integer value \-1 is represented by two bytes 0377,
+0377.
 .br
 Absent Boolean values are represented by the byte 0 (false).
 .bP
 If a capability has been canceled from this terminal,
-@TIC@ stores a \-2 in the corresponding table.
+.I \%@TIC@
+stores a \-2 in the corresponding table.
 .IP
-The integer value \-2 is represented by two bytes 0377, 0376.
+The integer value \-2 is represented by two bytes 0377,
+0376.
 .br
 The Boolean value \-2 is represented by the byte 0376.
 .br
@@ -181,18 +223,22 @@ The Boolean value \-2 is represented by the byte 0376.
 Other negative values are illegal.
 .PP
 The \fIterminal names\fP section comes after the \fIheader\fP.
-It contains the first line of the terminfo description,
+It contains the first line of the
+.I \%term\%info
+description,
 listing the various names for the terminal,
 separated by the \*(``|\*('' character.
 The \fIterminal names\fP section is terminated
 with an \s-1ASCII NUL\s+1 character.
 .PP
 The \fIBoolean flags\fP section has one byte for each flag.
-Boolean capabilities are either 1 or 0 (true or false)
+Boolean capabilities are either 1 or 0
+(true or false)
 according to whether the terminal supports the given capability or not.
 .PP
 Between the \fIBoolean flags\fP section and the \fInumber\fP section,
-a null byte will be inserted, if necessary,
+a null byte will be inserted,
+if necessary,
 to ensure that the \fInumber\fP section begins on an even byte
 This is a relic of the PDP\-11's word-addressed architecture,
 originally designed to avoid traps induced
@@ -212,27 +258,41 @@ It contains all of the values of string capabilities referenced in
 the \fIstrings\fP section.
 Each string is null-terminated.
 Special characters in \*^X or \ec notation are stored in their
-interpreted form, not the printing representation.
-Padding information $<nn> and parameter information %x are
-stored intact in uninterpreted form.
+interpreted form,
+not the printing representation.
+Padding information
+.BI $< nn >
+and parameter information
+.B %x
+are stored intact in uninterpreted form.
 .SS "Extended Storage Format"
-The previous section describes the conventional terminfo binary format.
-With some minor variations of the offsets (see PORTABILITY),
+The previous section describes the conventional
+.I \%term\%info
+binary format.
+With some minor variations of the offsets
+(see PORTABILITY),
 the same binary format is used in all modern Unix systems.
-Each system uses a predefined set of Boolean, number or string capabilities.
+Each system uses a predefined set of Boolean,
+number or string capabilities.
 .PP
-The \fI\%ncurses\fP libraries and applications support
-extended terminfo binary format,
-allowing users to define capabilities which are loaded at runtime.
-This
-extension is made possible by using the fact that the other implementations
-stop reading the terminfo data when they have reached the end of the size given
-in the header.
-\fI\%ncurses\fP checks the size,
+The
+.I \%ncurses
+libraries and applications support extended
+.I \%term\%info
+binary format,
+allowing users to define capabilities that are loaded at runtime.
+This extension is made possible by using the fact that the other
+implementations stop reading the
+.I \%term\%info
+data when they reach the end of the size given in the header.
+.I \%ncurses
+checks the size,
 and if it exceeds that due to the predefined data,
 continues to parse according to its own scheme.
 .PP
-First, it reads the extended header (5 short integers):
+First,
+it reads the extended header
+(5 short integers):
 .RS 5
 .TP 5
 (1)
@@ -256,45 +316,62 @@ include the extended capability \fInames\fP as well as
 extended capability \fIvalues\fP.
 .PP
 Using the counts and sizes,
-\fI\%ncurses\fP allocates arrays and reads data for the extended
-capabilities in the same order as the header information.
+.I \%ncurses
+allocates arrays and reads data for the extended capabilities in the
+same order as the header information.
 .PP
 The extended string table contains values for string capabilities.
-After the end of these values, it contains the names for each of
-the extended capabilities in order, e.g., Booleans, then numbers and
-finally strings.
+After the end of these values,
+it contains the names for each of
+the extended capabilities in order:
+Boolean,
+numeric,
+and string.
 .PP
 By storing terminal descriptions in this way,
-\fI\%ncurses\fP is able to provide a database useful with legacy
-applications,
-as well as providing data for applications which need more than the
-predefined capabilities.
-See \fBuser_caps\fP(5) for an overview
-of the way \fI\%ncurses\fP uses this extended information.
+.I \%ncurses
+is able to provide a database useful with legacy applications,
+as well as providing data for applications that require more information
+about a terminal type than was anticipated
+by X/Open Curses.
+See \fB\%user_caps\fP(5) for an overview of the way
+.I \%ncurses
+uses this extended information.
 .PP
-Applications which manipulate terminal data can use the definitions
-described in \fBterm_variables\fP(3X) which associate the long capability
-names with members of a \fBTERMTYPE\fP structure.
+Applications that manipulate terminal data can use the definitions
+described in \fB\%term_variables\fP(3X) associating the long capability
+names with members of a
+.I \%TERMTYPE
+structure.
 .
 .SS "Extended Number Format"
-On occasion, 16-bit signed integers are not large enough.
-With \fI\%ncurses\fP 6.1,
-a new format was introduced by making a few changes
-to the legacy format:
+On occasion,
+16-bit signed integers are not large enough.
+.I \%ncurses
+6.1 introduced a new format
+by making a few changes to the legacy format:
 .bP
-a different magic number (octal 01036)
+a different magic number
+(octal 01036)
 .bP
 changing the type for the \fInumber\fP array from signed 16-bit integers
 to signed 32-bit integers.
 .PP
-To maintain compatibility, the library presents the same data structures
-to direct users of the \fBTERMTYPE\fP structure as in previous formats.
-However, that cannot provide callers with the extended numbers.
-The library uses a similar but hidden data structure \fBTERMTYPE2\fP
-to provide data for the terminfo functions.
+To maintain compatibility,
+the library presents the same data structures
+to direct users of the
+.I \%TERMTYPE
+structure as in previous formats.
+However,
+that cannot provide callers with the extended numbers.
+The library uses a similar but hidden data structure
+.I \%TERMTYPE2
+to provide data for the
+.I \%term\%info
+functions.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 .SS setupterm
@@ -313,69 +390,101 @@ The routine
 .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
-of Boolean, number, and string capabilities.
+Also,
+new capabilities must always be added at the end of the lists
+of Boolean,
+number,
+and string capabilities.
 .SS "Binary Format"
-X/Open Curses does not specify a format for the terminfo database.
-System V curses used a directory-tree of binary files,
+X/Open Curses does not specify a format for the
+.I \%term\%info
+database.
+System\ V
+.I curses
+used a directory-tree of binary files,
 one per terminal description.
 .PP
-Despite the consistent use of little-endian for numbers and the otherwise
-self-describing format, it is not wise to count on portability of binary
-terminfo entries between commercial Unix versions.
-The problem is that there
-are at least three versions of terminfo (under HP\-UX, AIX, and OSF/1) 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 and X/Open Curses extensions.
-See \fBterminfo\fP(5) for detailed
-discussion of terminfo source compatibility issues.
+Despite the consistent use of little-endian numbers and the otherwise
+self-describing format,
+it is not wise to count on portability of binary
+.I \%term\%info
+entries between commercial Unix versions.
+The problem is that there are at least three versions of
+.I \%term\%info
+(under HP\-UX,
+AIX,
+and OSF/1)
+each of which diverged from System\ V
+.I \%term\%info
+after SVr1,
+and added extension capabilities to the string table that
+(in the binary format)
+collide with System\ V and X/Open Curses extensions.
+See \fB\%terminfo\fP(5) for detailed
+discussion of
+.I \%term\%info
+source compatibility issues.
 .PP
 This implementation is by default compatible with the binary
-terminfo format used by Solaris curses,
+.I \%term\%info
+format used by Solaris
+.IR curses ,
 except in a few less-used details
 where it was found that the latter did not match X/Open Curses.
 The format used by the other Unix versions
-can be matched by building \fI\%ncurses\fP
+can be matched by building
+.I \%ncurses
 with different configuration options.
 .SS "Magic Codes"
-The magic number in a binary terminfo file is the first 16-bits (two bytes).
-Besides making it more reliable for the library to check that a file
-is terminfo,
-utilities such as \fBfile\fP(1) also use that to tell what the file-format is.
-System V defined more than one magic number,
-with 0433, 0435 as screen-dumps (see \fBscr_dump\fP(5)).
+The magic number in a binary
+.I \%term\%info
+file is the first 16 bits
+(two bytes).
+Besides making it more reliable for the library to check that a file is
+.IR \%term\%info ,
+utilities such as \fIfile\fP(1) also use that to tell what the
+file-format is.
+System\ V defined more than one magic number,
+with 0433,
+0435 as screen-dumps
+(see \fB\%scr_dump\fP(5)).
 This implementation uses 01036 as a continuation of that sequence,
 but with a different high-order byte to avoid confusion.
 .SS "The \fITERMTYPE\fP Structure"
-Direct access to the \fBTERMTYPE\fP structure is provided for legacy
-applications.
-Portable applications should use the \fBtigetflag\fP and related functions
-described in \fBcurs_terminfo\fP(3X) for reading terminal capabilities.
+Direct access to the
+.I \%TERMTYPE
+structure is provided for legacy applications.
+Portable applications should use \fB\%tigetflag\fP(3X) and related
+functions to read terminal capabilities.
 .SS "Mixed-case Terminal Names"
 A small number of terminal descriptions use uppercase characters in
 their names.
-If the underlying filesystem ignores the difference between
+If the underlying file system ignores the difference between
 uppercase and lowercase,
-\fI\%ncurses\fP represents the \*(``first character\*(''
-of the terminal name used as
-the intermediate level of a directory tree in (two-character) hexadecimal form.
+.I \%ncurses
+represents the \*(``first character\*('' of the terminal name used as
+the intermediate level of a directory tree in (two-character)
+hexadecimal form.
 .SS Limits
-\fI\%ncurses\fP stores compiled terminal descriptions
-in three related formats,
-described in the sections
+.I \%ncurses
+stores compiled terminal descriptions in three related formats,
+described in the subsections
 .bP
-\fBLEGACY STORAGE FORMAT\fP, and
+.BR "Legacy Storage Format" ,
+and
 .bP
-\fBEXTENDED STORAGE FORMAT\fP, and
+.BR "Extended Storage Format" ,
+and
 .bP
-\fBEXTENDED NUMBER FORMAT\fP.
+.BR "Extended Number Format" .
 .PP
 The legacy storage format and the extended number format differ by
-the types of numeric capability which they can store
-(i.e., 16-bit versus 32-bit integers).
-The extended storage format introduced by \fI\%ncurses\fP 5.0 adds data
-to either of these formats.
+the types of numeric capability that they can store
+(for example,
+16- versus 32-bit integers).
+The extended storage format introduced by
+.I \%ncurses
+5.0 adds data to either of these formats.
 .PP
 Some limitations apply:
 .bP
@@ -390,8 +499,10 @@ Compiled entries are limited to 32768 bytes because offsets into the
 The legacy format could have supported 32768-byte entries,
 but was limited to a virtual memory page's 4096 bytes.
 .SH EXAMPLES
-As an example, here is a description for the Lear-Siegler
-ADM\-3, a popular though rather stupid early terminal:
+Here is a
+.I \%term\%info
+description of the Lear-Siegler ADM-3,
+a popular though rather stupid early terminal.
 .PP
 .EX
 adm3a|lsi adm3a,
@@ -402,7 +513,9 @@ adm3a|lsi adm3a,
         home=\*^\*^, ind=\*^J,
 .EE
 .PP
-and a hexadecimal dump of the compiled terminal description:
+A hexadecimal dump of its compiled terminal description
+(in legacy format)
+follows.
 .PP
 .if t .in +4n
 .ft \*(CW
@@ -436,15 +549,27 @@ Lp-1.
 .SH AUTHORS
 Thomas E. Dickey
 .br
-extended terminfo format for \fI\%ncurses\fP 5.0
+extended
+.I \%term\%info
+format for
+.I \%ncurses
+5.0
 .br
-hashed database support for \fI\%ncurses\fP 5.6
+hashed database support for
+.I \%ncurses
+5.6
 .br
-extended number support for \fI\%ncurses\fP 6.1
+extended number support for
+.I \%ncurses
+6.1
 .sp
 Eric S. Raymond
 .br
-documented legacy terminfo format, e.g., from \fIpcurses\fP.
+documented legacy
+.I \%term\%info
+format
+(that used by
+.IR \%pcurses ).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
diff --git a/man/term.7 b/man/term.7
index 84d100d84..ac4ab6cfb 100644
--- a/man/term.7
+++ b/man/term.7
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp $
-.TH term 7 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" Miscellaneous
+.\" $Id: term.7,v 1.49 2024/05/11 20:39:53 tom Exp $
+.TH term 7 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" Miscellaneous
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds d @TERMINFO@
 .SH NAME
 term \-
 conventions for naming terminal types
@@ -83,7 +82,7 @@ a custom entry incorporating options
 which you wish to override the system default type for your line.
 .PP
 Terminal type descriptions are stored as files of capability data underneath
-\*d.
+@TERMINFO@.
 To browse a list of all terminal names recognized by the system, do
 .sp
         @TOE@ | more
@@ -97,7 +96,7 @@ Invoke it as follows:
         @INFOCMP@ \fIentry_name\fP
 .sp
 where \fIentry_name\fP is the name of the type you wish to examine (and the
-name of its capability file the subdirectory of \*d named for its first
+name of its capability file the subdirectory of @TERMINFO@ named for its first
 letter).
 This command dumps a capability file in the text format described by
 \fBterminfo\fP(5).
@@ -221,7 +220,7 @@ Such programs should fall back
 on the \fITERM\fP environment variable when no \-T option is specified.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .TP
 .I /etc/inittab
diff --git a/man/terminfo.head b/man/terminfo.head
index 717f849e2..1d712ced5 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp $
-.TH terminfo 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.66 2024/05/11 20:39:53 tom Exp $
+.TH terminfo 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -51,12 +51,11 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%terminfo\fP \-
 terminal capability database
 .SH SYNOPSIS
-\*d/*/*
+@TERMINFO@/*/*
 .SH DESCRIPTION
 .I Terminfo
 is a database describing terminals,
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 4d6daa38b..f1a213555 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.148 2024/04/20 21:24:19 tom Exp $
+.\" $Id: terminfo.tail,v 1.149 2024/05/11 20:28:54 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -277,14 +277,14 @@ as a list of colon-separated pathnames of terminal databases to be searched.
 .IP
 An empty pathname (i.e., if the variable begins or ends
 with a colon, or contains adjacent colons)
-is interpreted as the system location \fI\*d\fP.
+is interpreted as the system location \fI@TERMINFO@\fP.
 .bP
 Finally, \fI\%ncurses\fP searches these compiled-in locations:
 .RS
 .bP
 a list of directories (@TERMINFO_DIRS@), and
 .bP
-the system terminfo directory, \fI\*d\fP
+the system terminfo directory, \fI@TERMINFO@\fP
 .RE
 .PP
 The \fBTERMINFO\fP variable can contain a terminal description instead
@@ -2019,7 +2019,7 @@ The \-c (check) option also checks resolved (after tc
 expansion) lengths.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database directory
 .SH EXTENSIONS
 Searching for terminal descriptions in
diff --git a/man/tic.1m b/man/tic.1m
index 9c3181ed5..b73b3c618 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp $
-.TH @TIC@ 1M 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp $
+.TH @TIC@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TIC@\fP \-
 compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR
@@ -109,7 +108,8 @@ In either case (directory or hashed database),
 For a directory, this would be the \*(``terminfo\*('' leaf,
 versus a "terminfo.db" file.
 .PP
-The results are normally placed in the system terminfo database \fB\*d\fP.
+The results are normally placed
+in the system terminfo database \fB@TERMINFO@\fP.
 The compiled terminal description can be placed
 in a different terminfo database.
 There are two ways to achieve this:
@@ -119,7 +119,7 @@ using the \fB\-o\fP option,
 or by setting the variable \fI\%TERMINFO\fP
 in your shell environment to a valid database location.
 .bP
-Secondly, if \fB@TIC@\fP cannot write in \fI\*d\fP
+Secondly, if \fB@TIC@\fP cannot write in \fI@TERMINFO@\fP
 or the location specified using your \fI\%TERMINFO\fP variable,
 it looks for the directory \fI$HOME/.terminfo\fP
 (or hashed database \fI$HOME/.terminfo.db)\fP;
@@ -135,7 +135,7 @@ directories listed in the \fI\%TERMINFO_DIRS\fP environment variable,
 .bP
 a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
-the system terminfo database (\fI\*d\fP).
+the system terminfo database (\fI@TERMINFO@\fP).
 .PP
 The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(5)
 manual goes into further detail.
@@ -419,7 +419,7 @@ The exception is the \fBuse\fP capability.
 .PP
 When a \fBuse\fP=\fIentry\fP\-\fIname\fP field is discovered in a
 terminal entry currently being compiled, \fB@TIC@\fP reads in the binary
-from \fB\*d\fP to complete the entry.
+from \fB@TERMINFO@\fP to complete the entry.
 (Entries created from
 \fIfile\fP will be used first.
 \fB@TIC@\fP duplicates the capabilities in
@@ -443,7 +443,7 @@ will be truncated to the maximum alias length
 and a warning message will be printed.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH NOTES
 There is some evidence that historic \fB@TIC@\fP implementations treated
diff --git a/man/toe.1m b/man/toe.1m
index c4eba848e..891570e4a 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp $
-.TH @TOE@ 1M 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp $
+.TH @TOE@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,7 +50,6 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TOE@\fP \-
 list table of entries of \fIterminfo\fR terminal types
@@ -143,7 +142,7 @@ reports the version of \fI\%ncurses\fP associated
 with this program and exits with a successful status.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 \fB\%@TOE@\fP is not provided by other implementations.
diff --git a/man/tput.1 b/man/tput.1
index eba073390..bd25b0b5b 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp $
-.TH @TPUT@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp $
+.TH @TPUT@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,7 +45,6 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
@@ -434,7 +433,7 @@ option overrides its value.
 .I @DATADIR@/tabset
 tab stop initialization database
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 Over time
diff --git a/man/tset.1 b/man/tset.1
index 185227dcd..154d91587 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp $
-.TH @TSET@ 1 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp $
+.TH @TSET@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,7 +47,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TSET@\fP,
 \fB\%@RESET@\fP \-
@@ -314,7 +313,7 @@ for the terminal description.
 .I /etc/ttys
 system port name to terminal type mapping database (BSD versions only).
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database directory
 .SH PORTABILITY
 Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 15d05a31b..2ec3c8941 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.104 2022/07/09 18:58:58 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.105 2024/05/11 19:06:59 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -279,6 +279,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
 	    /* allow user to set maximum escape delay from the environment */
 	    if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
+		value = Min(value, MAX_DELAY_MSECS);
 #if NCURSES_EXT_FUNCS
 		NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_ARGx value);
 #else
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index bf81cf18a..6d0dbcdf1 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.688 2024/05/04 18:30:25 tom Exp $
+ * $Id: curses.priv.h,v 1.689 2024/05/11 19:05:45 tom Exp $
  *
  *	curses.priv.h
  *
@@ -876,6 +876,12 @@ typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *);
  */
 #define MAX_DELAY_MSECS 30000
 
+/*
+ * Limit screen dimensions read from environment variables.
+ */
+#define MAX_ENV_LINES	512
+#define MAX_ENV_COLUMNS	512
+
 /*
  * When converting from terminfo to termcap, check for cases where we can trim
  * octal escapes down to 2-character form.  It is useful for terminfo format
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 99097f00f..66226b112 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.240 2024/04/20 17:04:05 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.241 2024/05/11 19:07:34 tom Exp $")
 
 /****************************************************************************
  *
@@ -569,11 +569,11 @@ _nc_get_screensize(SCREEN *sp,
 	     * variable.
 	     */
 	    if ((value = _nc_getenv_num("LINES")) > 0) {
-		*linep = value;
+		*linep = Min(value, MAX_ENV_LINES);
 		T(("screen size: environment LINES = %d", *linep));
 	    }
 	    if ((value = _nc_getenv_num("COLUMNS")) > 0) {
-		*colp = value;
+		*colp = Min(value, MAX_ENV_COLUMNS);
 		T(("screen size: environment COLUMNS = %d", *colp));
 	    }
 
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index fd993b820..a9f14850d 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.74 2023/09/16 10:44:33 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.75 2024/05/11 19:20:44 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -504,11 +504,11 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp)
 	     * variable.
 	     */
 	    if ((value = _nc_getenv_num("LINES")) > 0) {
-		*linep = value;
+		*linep = Min(value, MAX_ENV_LINES);
 		T(("screen size: environment LINES = %d", *linep));
 	    }
 	    if ((value = _nc_getenv_num("COLUMNS")) > 0) {
-		*colp = value;
+		*colp = Min(value, MAX_ENV_COLUMNS);
 		T(("screen size: environment COLUMNS = %d", *colp));
 	    }
 	}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8a2e6afde..222096091 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240504) unstable; urgency=low
+ncurses6 (6.5+20240511) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8a2e6afde..222096091 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240504) unstable; urgency=low
+ncurses6 (6.5+20240511) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index f1521e690..ea7256d79 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240504) unstable; urgency=low
+ncurses6 (6.5+20240511) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 May 2024 06:21:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index efffabd76..65eb84e39 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.646 2024/05/04 10:21:09 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.647 2024/05/11 10:20:08 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0504"
+!define VERSION_MMDD  "0511"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 322299dab..0b94a9150 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240504
+Release: 20240511
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8754f296d..f524ff7e1 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240504
+Release: 20240511
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index f6f76b52c..95f7ebe0e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240504
+Release: 20240511
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 87624542e248c20fb1e33810280d95d9e1395e62 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 19 May 2024 01:30:00 +0200
Subject: [PATCH 067/106] ncurses-6.5-20240518.patch.gz

---
 Ada95/aclocal.m4                           |   83 +-
 Ada95/configure                            | 3556 ++++++------
 Ada95/configure.in                         |    9 +-
 NEWS                                       |   10 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   83 +-
 configure                                  | 5662 ++++++++++----------
 configure.in                               |   21 +-
 dist.mk                                    |    4 +-
 doc/html/man/curs_beep.3x.html             |   47 +-
 doc/html/man/curs_getch.3x.html            |   18 +-
 doc/html/man/curs_in_wch.3x.html           |   42 +-
 doc/html/man/curs_inch.3x.html             |   77 +-
 doc/html/man/curs_mouse.3x.html            |   10 +-
 doc/html/man/define_key.3x.html            |   53 +-
 doc/html/man/key_defined.3x.html           |   35 +-
 doc/html/man/keybound.3x.html              |   45 +-
 doc/html/man/keyok.3x.html                 |   47 +-
 doc/html/man/ncurses.3x.html               |   12 +-
 doc/html/man/terminfo.5.html               |    2 +-
 include/ncurses_defs                       |    3 +-
 man/curs_beep.3x                           |   83 +-
 man/curs_getch.3x                          |   10 +-
 man/curs_in_wch.3x                         |   64 +-
 man/curs_inch.3x                           |  119 +-
 man/curs_mouse.3x                          |    6 +-
 man/define_key.3x                          |  108 +-
 man/key_defined.3x                         |   59 +-
 man/keybound.3x                            |   79 +-
 man/keyok.3x                               |   86 +-
 man/ncurses.3x                             |    6 +-
 package/debian-mingw/changelog             |    4 +-
 package/debian-mingw64/changelog           |    4 +-
 package/debian/changelog                   |    4 +-
 package/debian/ncurses6.lintian-overrides  |    2 +-
 package/debian/ncursest6.lintian-overrides |    2 +-
 package/mingw-ncurses.nsi                  |    4 +-
 package/mingw-ncurses.spec                 |    2 +-
 package/ncurses.spec                       |    2 +-
 package/ncursest.spec                      |    2 +-
 test/aclocal.m4                            |   27 +-
 test/configure                             | 1153 ++--
 42 files changed, 6293 insertions(+), 5354 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 6fe1f946e..3d7c80569 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.210 2024/03/30 22:17:13 tom Exp $
+dnl $Id: aclocal.m4,v 1.212 2024/05/18 19:51:00 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -477,7 +477,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08
+dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -577,9 +577,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='${LIBS}'}
+	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
@@ -1395,19 +1395,36 @@ fi
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56
+dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02
 dnl ---------------
 dnl Check for gettimeofday or clock_gettime.  In 2023, the former is still more
 dnl widely supported, but "deprecated" (2008), so we will use the latter if it
 dnl is available, to reduce compiler warnings.
 AC_DEFUN([CF_FUNC_GETTIME],[
-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[
-		AC_TRY_LINK([#include <time.h>],
+cf_save_libs="$LIBS"
+AC_CHECK_FUNC(clock_gettime,
+	cf_cv_test_clock_gettime=yes,
+	AC_CHECK_LIB(rt, clock_gettime,
+		[LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes],
+		 cf_cv_test_clock_gettime=no))
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[
+		AC_TRY_LINK([
+$ac_includes_default
+#include <time.h>
+		],
 		[struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts],
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts],
 		[cf_cv_func_clock_gettime=yes],
 		[cf_cv_func_clock_gettime=no])
 ])
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
@@ -4747,6 +4764,56 @@ weak_symbol(fopen);
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
+dnl -----------
+dnl Check for the Ada compiler (unless requested to not do this), which causes
+dnl a further check for a C compiler which can work with the Ada compiler.
+AC_DEFUN([CF_WITH_ADA],[
+AC_ARG_WITH(ada,
+	[  --without-ada           suppress check for Ada compiler],
+	[cf_with_ada=$withval],
+	[cf_with_ada=yes])
+
+cf_prog_cc="gcc cc"
+if test "x$cf_with_ada" = xyes
+then
+	CF_PROG_GNAT
+	if test	"x$cf_cv_prog_gnat_correct" = xyes; then
+		# gcc's developers chose to deprecate gnatgcc before making gprconfig
+		# work.  They replaced gnatgcc in gcc 13 with a script which spits out
+		# a warning offering advice which could never work.
+		#
+		# Here is a workaround.
+		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
+		if test "$cf_cv_path_gnatgcc" != no
+		then
+			AC_MSG_CHECKING(for improvement) 
+			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+			case "x$cf_file_gnatgcc" in
+			(*script*)
+				cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ 	]]*+[[ 	]]*//' -e 's/exec[[ 	]]//' -e 's/ .*//'`
+				;;
+			(*)
+				cf_cv_path_gnatgcc=no
+				;;
+			esac
+			AC_MSG_RESULT($cf_cv_path_gnatgcc)
+			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+		fi
+	fi
+fi
+case "$cf_prog_cc" in
+(*/*)
+	CC="$cf_prog_cc"
+	AC_SUBST(CC)
+	;;
+(*)
+	CF_PROG_CC($cf_prog_cc)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
 dnl --------------------
 dnl Command-line option to specify the Ada95 compiler.
diff --git a/Ada95/configure b/Ada95/configure
index 8c01a2936..869f8fdd9 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.91 .
+# From configure.in Revision: 1.92 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -703,6 +703,7 @@ Optional Features:
 
 General Options:
   --with-system-type=XXX  test: override derived host system-type
+  --without-ada           suppress check for Ada compiler
   --disable-stripping     do not strip (debug info) installed executables
   --with-strip-program=XX specify program to use when stripping in install
   --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
@@ -947,7 +948,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:950: loading site script $ac_site_file" >&5
+    { echo "$as_me:951: 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"
@@ -958,7 +959,7 @@ if test -r "$cache_file"; then
   # 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:961: loading cache $cache_file" >&5
+    { echo "$as_me:962: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -966,7 +967,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:969: creating cache $cache_file" >&5
+  { echo "$as_me:970: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -982,21 +983,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:985: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:986: 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:989: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:990: 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:995: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:996: 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:997:   former value:  $ac_old_val" >&5
+        { echo "$as_me:998:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:999:   current value: $ac_new_val" >&5
+        { echo "$as_me:1000:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1015,9 +1016,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1018: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1019: 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:1020: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1021: 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
@@ -1046,10 +1047,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1049: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1052: \$? = $ac_status" >&5
+  echo "$as_me:1053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1081,7 +1082,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1084: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1085: 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
@@ -1091,11 +1092,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1094: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1098: checking build system type" >&5
+echo "$as_me:1099: 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
@@ -1104,23 +1105,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1107: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1108: 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:1111: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1112: 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:1116: result: $ac_cv_build" >&5
+echo "$as_me:1117: 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:1123: checking host system type" >&5
+echo "$as_me:1124: 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
@@ -1129,12 +1130,12 @@ else
 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:1132: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1133: 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:1137: result: $ac_cv_host" >&5
+echo "$as_me:1138: 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/'`
@@ -1142,7 +1143,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1145: checking target system type" >&5
+	echo "$as_me:1146: 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
@@ -1151,12 +1152,12 @@ else
 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:1154: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1155: 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:1159: result: $ac_cv_target" >&5
+echo "$as_me:1160: 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/'`
@@ -1188,13 +1189,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1191: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1192: 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:1195: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1196: 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:1197: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1198: 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
@@ -1202,7 +1203,7 @@ fi
 # 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:1205: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1206: 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
@@ -1217,7 +1218,7 @@ for ac_prog in ggrep grep
 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:1220: checking for $ac_word" >&5
+echo "$as_me:1221: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1232,7 +1233,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1235: found $ac_dir/$ac_word" >&5
+echo "$as_me:1236: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1240,10 +1241,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1243: result: $GREP" >&5
+  echo "$as_me:1244: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1246: result: no" >&5
+  echo "$as_me:1247: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1251,7 +1252,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1254: checking for fgrep" >&5
+echo "$as_me:1255: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1263,7 +1264,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1266: checking for $ac_word" >&5
+echo "$as_me:1267: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1280,7 +1281,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1283: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1284: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1291,10 +1292,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1294: result: $FGREP" >&5
+  echo "$as_me:1295: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1297: result: no" >&5
+  echo "$as_me:1298: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1302,16 +1303,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1305: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1310: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1314: checking for prefix" >&5
+echo "$as_me:1315: 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
@@ -1323,11 +1324,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1326: result: $prefix" >&5
+echo "$as_me:1327: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1330: checking for default include-directory" >&5
+echo "$as_me:1331: 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 \
@@ -1350,12 +1351,322 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1353: result: $includedir" >&5
+echo "$as_me:1354: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
 ###	Checks for programs.
 
+# Check whether --with-ada or --without-ada was given.
+if test "${with_ada+set}" = set; then
+  withval="$with_ada"
+  cf_with_ada=$withval
+else
+  cf_with_ada=yes
+fi;
+
+cf_prog_cc="gcc cc"
+if test "x$cf_with_ada" = xyes
+then
+
+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild
+do
+
+cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+	unset ac_cv_path_cf_TEMP_gnat
+	unset cf_TEMP_gnat
+	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+set dummy $cf_prog_gnat; ac_word=$2
+echo "$as_me:1381: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $cf_TEMP_gnat in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+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_cf_TEMP_gnat="$ac_dir/$ac_word"
+   echo "$as_me:1398: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no"
+  ;;
+esac
+fi
+cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+if test -n "$cf_TEMP_gnat"; then
+  echo "$as_me:1410: result: $cf_TEMP_gnat" >&5
+echo "${ECHO_T}$cf_TEMP_gnat" >&6
+else
+  echo "$as_me:1413: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"
+
+	if test "x$cf_TEMP_gnat" != xno; then
+		unset cf_cv_gnat_version
+		unset cf_TEMP_gnat
+
+echo "$as_me:1423: checking for $cf_prog_gnat version" >&5
+echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+if test "${cf_cv_gnat_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
+	grep '[0-9].[0-9][0-9]*' |\
+	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+fi
+echo "$as_me:1434: result: $cf_cv_gnat_version" >&5
+echo "${ECHO_T}$cf_cv_gnat_version" >&6
+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+
+	fi
+	eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"
+
+	unset cf_TEMP_gnat
+	unset cf_cv_gnat_version
+	unset ac_cv_path_cf_TEMP_gnat
+done
+
+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then
+	cf_ada_make=
+	cf_cv_prog_gnat_correct=no
+else
+	cf_ada_make=gnatmake
+	if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then
+		# gprconfig is newer than gnatmake; we can continue...
+		cf_ada_config="##"
+	else
+		rm -rf ./conftest* ./*~conftest*
+		if mkdir conftest.src
+		then
+			cf_ada_config=""
+			cd conftest.src
+			for cf_gprconfig in Ada C
+			do
+				echo "$as_me:1463: 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
+					for cf_gprconfig_param in \
+						"$cf_gprconfig,,,,GNATGCC" \
+						"$cf_gprconfig,,,,GCC" \
+						"$cf_gprconfig"
+					do
+						cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
+						test -n "$cf_gprconfig_value" && break
+					done
+				else
+					cf_gprconfig_param=$cf_gprconfig
+					cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
+				fi
+				if test -n "$cf_gprconfig_value"
+				then
+					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+					echo "$as_me:1482: result: $cf_gprconfig_value" >&5
+echo "${ECHO_T}$cf_gprconfig_value" >&6
+				else
+					echo "$as_me:1485: result: missing" >&5
+echo "${ECHO_T}missing" >&6
+					cf_ada_config="#"
+					break
+				fi
+			done
+			cd ..
+			rm -rf ./conftest* ./*~conftest*
+		fi
+	fi
+	if test "x$cf_ada_config" != "x#"
+	then
+
+echo "$as_me:1498: checking for gnat version" >&5
+echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+if test "${cf_cv_gnat_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
+	grep '[0-9].[0-9][0-9]*' |\
+	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+fi
+echo "$as_me:1509: result: $cf_cv_gnat_version" >&5
+echo "${ECHO_T}$cf_cv_gnat_version" >&6
+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+
+case "$cf_cv_gnat_version" in
+(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+	cf_cv_prog_gnat_correct=yes
+	;;
+(*)
+	{ echo "$as_me:1518: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+	cf_cv_prog_gnat_correct=no
+	;;
+esac
+
+		# Extract the first word of "m4", so it can be a program name with args.
+set dummy m4; ac_word=$2
+echo "$as_me:1526: 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
+else
+  if test -n "$M4_exists"; then
+  ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_M4_exists="yes"
+echo "$as_me:1541: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no"
+fi
+fi
+M4_exists=$ac_cv_prog_M4_exists
+if test -n "$M4_exists"; then
+  echo "$as_me:1550: result: $M4_exists" >&5
+echo "${ECHO_T}$M4_exists" >&6
+else
+  echo "$as_me:1553: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test "$ac_cv_prog_M4_exists" = no; then
+			cf_cv_prog_gnat_correct=no
+			{ echo "$as_me:1559: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+		fi
+		if test "$cf_cv_prog_gnat_correct" = yes; then
+			echo "$as_me:1563: checking if GNAT works" >&5
+echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+rm -rf ./conftest* ./*~conftest*
+cat >>conftest.ads <<CF_EOF
+procedure conftest;
+CF_EOF
+cat >>conftest.adb <<CF_EOF
+with Text_IO;
+with GNAT.OS_Lib;
+procedure conftest is
+begin
+   Text_IO.Put ("Hello World");
+   Text_IO.New_Line;
+   GNAT.OS_Lib.OS_Exit (0);
+end conftest;
+CF_EOF
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+   if ( ./conftest 1>&5 2>&1 ) ; then
+      cf_cv_prog_gnat_correct=yes
+   else
+      cf_cv_prog_gnat_correct=no
+   fi
+else
+   cf_cv_prog_gnat_correct=no
+fi
+rm -rf ./conftest* ./*~conftest*
+
+			echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5
+echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+		fi
+	else
+		cf_cv_prog_gnat_correct=no
+	fi
+fi
+
+	if test	"x$cf_cv_prog_gnat_correct" = xyes; then
+		# gcc's developers chose to deprecate gnatgcc before making gprconfig
+		# work.  They replaced gnatgcc in gcc 13 with a script which spits out
+		# a warning offering advice which could never work.
+		#
+		# Here is a workaround.
+		# Extract the first word of "gnatgcc", so it can be a program name with args.
+set dummy gnatgcc; ac_word=$2
+echo "$as_me:1607: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $cf_cv_path_gnatgcc in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+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_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+   echo "$as_me:1624: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no"
+  ;;
+esac
+fi
+cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+if test -n "$cf_cv_path_gnatgcc"; then
+  echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5
+echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+else
+  echo "$as_me:1639: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test "$cf_cv_path_gnatgcc" != no
+		then
+			echo "$as_me:1645: checking for improvement" >&5
+echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+			case "x$cf_file_gnatgcc" in
+			(*script*)
+				cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ 	]*+[ 	]*//' -e 's/exec[ 	]//' -e 's/ .*//'`
+				;;
+			(*)
+				cf_cv_path_gnatgcc=no
+				;;
+			esac
+			echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5
+echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+		fi
+	fi
+fi
+case "$cf_prog_cc" in
+(*/*)
+	CC="$cf_prog_cc"
+
+	;;
+(*)
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
@@ -1363,11 +1674,11 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gnatgcc gcc cc
+  for ac_prog in $cf_prog_cc
   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:1370: checking for $ac_word" >&5
+echo "$as_me:1681: 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
@@ -1382,7 +1693,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1385: found $ac_dir/$ac_word" >&5
+echo "$as_me:1696: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1390,10 +1701,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1393: result: $CC" >&5
+  echo "$as_me:1704: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1396: result: no" >&5
+  echo "$as_me:1707: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1402,11 +1713,11 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in gnatgcc gcc cc
+  for ac_prog in $cf_prog_cc
 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:1409: checking for $ac_word" >&5
+echo "$as_me:1720: 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
@@ -1421,7 +1732,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1424: found $ac_dir/$ac_word" >&5
+echo "$as_me:1735: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1429,10 +1740,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1432: result: $ac_ct_CC" >&5
+  echo "$as_me:1743: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1435: result: no" >&5
+  echo "$as_me:1746: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1442,32 +1753,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1445: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1756: 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:1450:" \
+echo "$as_me:1761:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1453: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1764: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1456: \$? = $ac_status" >&5
+  echo "$as_me:1767: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1458: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1769: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1461: \$? = $ac_status" >&5
+  echo "$as_me:1772: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1463: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1774: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1466: \$? = $ac_status" >&5
+  echo "$as_me:1777: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1470 "configure"
+#line 1781 "configure"
 #include "confdefs.h"
 
 int
@@ -1483,13 +1794,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1486: checking for C compiler default output" >&5
+echo "$as_me:1797: 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:1489: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1800: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1492: \$? = $ac_status" >&5
+  echo "$as_me:1803: \$? = $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
@@ -1512,34 +1823,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1515: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1826: 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:1521: result: $ac_file" >&5
+echo "$as_me:1832: 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:1526: checking whether the C compiler works" >&5
+echo "$as_me:1837: 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:1532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1535: \$? = $ac_status" >&5
+  echo "$as_me:1846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1542: error: cannot run C compiled programs.
+	{ { echo "$as_me:1853: 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;}
@@ -1547,24 +1858,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1550: result: yes" >&5
+echo "$as_me:1861: 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:1557: checking whether we are cross compiling" >&5
+echo "$as_me:1868: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1559: result: $cross_compiling" >&5
+echo "$as_me:1870: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1562: checking for executable suffix" >&5
+echo "$as_me:1873: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1567: \$? = $ac_status" >&5
+  echo "$as_me:1878: \$? = $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
@@ -1580,25 +1891,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1583: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1894: 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:1589: result: $ac_cv_exeext" >&5
+echo "$as_me:1900: 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:1595: checking for object suffix" >&5
+echo "$as_me:1906: 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 1601 "configure"
+#line 1912 "configure"
 #include "confdefs.h"
 
 int
@@ -1610,10 +1921,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1616: \$? = $ac_status" >&5
+  echo "$as_me:1927: \$? = $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
@@ -1625,24 +1936,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1628: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1939: 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:1635: result: $ac_cv_objext" >&5
+echo "$as_me:1946: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1639: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1950: 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 1645 "configure"
+#line 1956 "configure"
 #include "confdefs.h"
 
 int
@@ -1657,16 +1968,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1663: \$? = $ac_status" >&5
+  echo "$as_me:1974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1669: \$? = $ac_status" >&5
+  echo "$as_me:1980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1678,19 +1989,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1681: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1992: 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:1687: checking whether $CC accepts -g" >&5
+echo "$as_me:1998: 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 1693 "configure"
+#line 2004 "configure"
 #include "confdefs.h"
 
 int
@@ -1702,16 +2013,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1708: \$? = $ac_status" >&5
+  echo "$as_me:2019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1714: \$? = $ac_status" >&5
+  echo "$as_me:2025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1721,7 +2032,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1724: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2035: 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
@@ -1748,16 +2059,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1754: \$? = $ac_status" >&5
+  echo "$as_me:2065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1760: \$? = $ac_status" >&5
+  echo "$as_me:2071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1769,7 +2080,7 @@ if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1772 "configure"
+#line 2083 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1782,16 +2093,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1788: \$? = $ac_status" >&5
+  echo "$as_me:2099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1794: \$? = $ac_status" >&5
+  echo "$as_me:2105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1801,7 +2112,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1804 "configure"
+#line 2115 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1813,16 +2124,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1819: \$? = $ac_status" >&5
+  echo "$as_me:2130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1825: \$? = $ac_status" >&5
+  echo "$as_me:2136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1852,11 +2163,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1855: checking version of $CC" >&5
+	echo "$as_me:2166: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1859: result: $GCC_VERSION" >&5
+	echo "$as_me:2170: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1865,12 +2176,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1868: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2179: 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 1873 "configure"
+#line 2184 "configure"
 #include "confdefs.h"
 
 int
@@ -1887,16 +2198,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1893: \$? = $ac_status" >&5
+  echo "$as_me:2204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1899: \$? = $ac_status" >&5
+  echo "$as_me:2210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1907,7 +2218,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1910: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2221: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1916,11 +2227,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1919: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2230: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1923 "configure"
+#line 2234 "configure"
 #include "confdefs.h"
 
 int
@@ -1937,16 +2248,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1943: \$? = $ac_status" >&5
+  echo "$as_me:2254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1949: \$? = $ac_status" >&5
+  echo "$as_me:2260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -1956,7 +2267,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:1959: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2270: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -1965,30 +2276,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:1968: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2279: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:1975: checking version of $CC" >&5
+	echo "$as_me:2286: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:1979: result: $CLANG_VERSION" >&5
+	echo "$as_me:2290: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:1986: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2297: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 1991 "configure"
+#line 2302 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2002,16 +2313,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2008: \$? = $ac_status" >&5
+  echo "$as_me:2319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2014: \$? = $ac_status" >&5
+  echo "$as_me:2325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2022,13 +2333,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2025: result: $cf_clang_optok" >&5
+		echo "$as_me:2336: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2031: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2342: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2037,7 +2348,7 @@ echo "${as_me:-configure}:2031: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2040: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2351: 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
@@ -2045,7 +2356,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2048 "configure"
+#line 2359 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2092,16 +2403,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2098: \$? = $ac_status" >&5
+  echo "$as_me:2409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2104: \$? = $ac_status" >&5
+  echo "$as_me:2415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2118,10 +2429,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2121: result: none needed" >&5
+    echo "$as_me:2432: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2124: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2129,13 +2440,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2132: checking \$CFLAGS variable" >&5
+echo "$as_me:2443: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2136: result: broken" >&5
+	echo "$as_me:2447: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2138: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2449: 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=
@@ -2243,18 +2554,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2246: result: ok" >&5
+	echo "$as_me:2557: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2251: checking \$CC variable" >&5
+echo "$as_me:2562: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2255: result: broken" >&5
+	echo "$as_me:2566: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2257: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2568: 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/[ ]*[ ]-[^ ].*//'`
@@ -2371,24 +2682,27 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2374: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2378: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2382: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2386: result: ok" >&5
+	echo "$as_me:2697: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2391: checking for egrep" >&5
+	;;
+esac
+
+echo "$as_me:2705: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2400,7 +2714,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2403: checking for $ac_word" >&5
+echo "$as_me:2717: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2417,7 +2731,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2420: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2734: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2428,10 +2742,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2431: result: $EGREP" >&5
+  echo "$as_me:2745: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2434: result: no" >&5
+  echo "$as_me:2748: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2439,12 +2753,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2442: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2447: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2454,7 +2768,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2457: checking how to run the C preprocessor" >&5
+echo "$as_me:2771: 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
@@ -2475,18 +2789,18 @@ do
   # 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 2478 "configure"
+#line 2792 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2483: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2489: \$? = $ac_status" >&5
+  echo "$as_me:2803: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2509,17 +2823,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2512 "configure"
+#line 2826 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2516: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2522: \$? = $ac_status" >&5
+  echo "$as_me:2836: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2556,7 +2870,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2559: result: $CPP" >&5
+echo "$as_me:2873: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2566,18 +2880,18 @@ do
   # 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 2569 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2574: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2580: \$? = $ac_status" >&5
+  echo "$as_me:2894: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2600,17 +2914,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2603 "configure"
+#line 2917 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2607: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2613: \$? = $ac_status" >&5
+  echo "$as_me:2927: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2638,7 +2952,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2641: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2651,14 +2965,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2654: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2968: 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 2661 "configure"
+#line 2975 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2673,7 +2987,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 2676 "configure"
+#line 2990 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2686,14 +3000,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:2689: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3003: 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:2696: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3010: 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
@@ -2708,15 +3022,15 @@ CF_EOF
 # 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:2711: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2714: \$? = $ac_status" >&5
+  echo "$as_me:3028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2716: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2719: \$? = $ac_status" >&5
+  echo "$as_me:3033: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -2727,10 +3041,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:2730: result: yes" >&5
+  echo "$as_me:3044: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2733: result: no" >&5
+  echo "$as_me:3047: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2751,7 +3065,7 @@ for ac_prog in mawk gawk nawk awk
 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:2754: checking for $ac_word" >&5
+echo "$as_me:3068: 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
@@ -2766,7 +3080,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2769: found $ac_dir/$ac_word" >&5
+echo "$as_me:3083: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2774,21 +3088,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2777: result: $AWK" >&5
+  echo "$as_me:3091: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2780: result: no" >&5
+  echo "$as_me:3094: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:2787: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2791: checking for egrep" >&5
+echo "$as_me:3105: 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
@@ -2798,11 +3112,11 @@ else
 		else ac_cv_prog_egrep='egrep'
 	fi
 fi
-echo "$as_me:2801: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3115: 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:2805: error: No egrep program found" >&5
+	test -z "$EGREP" && { { echo "$as_me:3119: error: No egrep program found" >&5
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -2818,7 +3132,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # 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:2821: checking for a BSD compatible install" >&5
+echo "$as_me:3135: 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
@@ -2867,7 +3181,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2870: result: $INSTALL" >&5
+echo "$as_me:3184: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2878,18 +3192,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2881: checking whether ln -s works" >&5
+echo "$as_me:3195: 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:2885: result: yes" >&5
+  echo "$as_me:3199: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2888: result: no, using $LN_S" >&5
+  echo "$as_me:3202: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2892: checking if $LN_S -f options work" >&5
+echo "$as_me:3206: 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
@@ -2901,7 +3215,7 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:2904: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3218: 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"
@@ -2918,7 +3232,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 # 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:2921: checking for a BSD compatible install" >&5
+echo "$as_me:3235: 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
@@ -2967,7 +3281,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2970: result: $INSTALL" >&5
+echo "$as_me:3284: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2988,7 +3302,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:2991: checking if you want to install stripped executables" >&5
+echo "$as_me:3305: 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.
@@ -3005,7 +3319,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:3008: result: $enable_stripping" >&5
+echo "$as_me:3322: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -3016,7 +3330,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:3019: checking if install accepts -p option" >&5
+echo "$as_me:3333: 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
@@ -3047,10 +3361,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3050: result: $cf_cv_install_p" >&5
+echo "$as_me:3364: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3053: checking if install needs to be told about ownership" >&5
+echo "$as_me:3367: 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)
@@ -3061,7 +3375,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3064: result: $with_install_o" >&5
+echo "$as_me:3378: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3072,7 +3386,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:3075: checking if you want to specify strip-program" >&5
+	echo "$as_me:3389: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3082,11 +3396,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3085: result: $with_strip_program" >&5
+	echo "$as_me:3399: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3089: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3403: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3107,11 +3421,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3110: result: $check_install_strip" >&5
+		echo "$as_me:3424: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3114: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3428: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3126,7 +3440,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3136,7 +3450,7 @@ echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5
 	fi
 fi
 
-echo "$as_me:3139: checking for long file names" >&5
+echo "$as_me:3453: 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
@@ -3175,7 +3489,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3178: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3492: 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
 
@@ -3187,7 +3501,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:3190: checking if you want to use pkg-config" >&5
+echo "$as_me:3504: 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.
@@ -3197,7 +3511,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:3200: result: $cf_pkg_config" >&5
+echo "$as_me:3514: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -3209,7 +3523,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3212: checking for $ac_word" >&5
+echo "$as_me:3526: 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
@@ -3226,7 +3540,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3229: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3543: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3237,10 +3551,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3240: result: $PKG_CONFIG" >&5
+  echo "$as_me:3554: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3243: result: no" >&5
+  echo "$as_me:3557: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3249,7 +3563,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3252: checking for $ac_word" >&5
+echo "$as_me:3566: 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
@@ -3266,7 +3580,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3269: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3583: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3278,10 +3592,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:3281: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:3284: result: no" >&5
+  echo "$as_me:3598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3324,24 +3638,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:3327: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:3641: 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:3334: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:3648: 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:3340: checking for pkg-config library directory" >&5
+	echo "$as_me:3654: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:3344: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:3658: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -3368,7 +3682,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:3371: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3685: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -3379,16 +3693,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:3382: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3696: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:3387: result: auto" >&5
+	echo "$as_me:3701: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:3391: checking for search-list" >&5
+	echo "$as_me:3705: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -3415,11 +3729,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:3418: result: $cf_search_path" >&5
+	echo "$as_me:3732: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:3422: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:3736: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -3427,7 +3741,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:3430: checking for first directory" >&5
+	echo "$as_me:3744: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -3438,7 +3752,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:3441: result: $cf_pkg_config_path" >&5
+	echo "$as_me:3755: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -3448,7 +3762,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:3451: checking for workaround" >&5
+		echo "$as_me:3765: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -3471,12 +3785,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:3474: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:3788: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
-echo "$as_me:3479: checking if you want to build test-programs" >&5
+echo "$as_me:3793: 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.
@@ -3486,10 +3800,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3489: result: $cf_with_tests" >&5
+echo "$as_me:3803: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3492: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3806: 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.
@@ -3499,11 +3813,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:3502: result: $enable_mixedcase" >&5
+echo "$as_me:3816: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:3506: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3820: 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
@@ -3530,7 +3844,7 @@ else
 fi
 
 fi
-echo "$as_me:3533: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3847: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3548,7 +3862,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3551: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3865: 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
@@ -3568,16 +3882,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3571: result: yes" >&5
+  echo "$as_me:3885: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3575: result: no" >&5
+  echo "$as_me:3889: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:3580: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3894: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3632,7 +3946,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3635: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3949: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -3643,7 +3957,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3646: checking for $ac_word" >&5
+echo "$as_me:3960: 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
@@ -3658,7 +3972,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3661: found $ac_dir/$ac_word" >&5
+echo "$as_me:3975: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3666,10 +3980,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3669: result: $CTAGS" >&5
+  echo "$as_me:3983: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3672: result: no" >&5
+  echo "$as_me:3986: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3680,7 +3994,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3683: checking for $ac_word" >&5
+echo "$as_me:3997: 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
@@ -3695,7 +4009,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3698: found $ac_dir/$ac_word" >&5
+echo "$as_me:4012: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3703,10 +4017,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3706: result: $ETAGS" >&5
+  echo "$as_me:4020: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3709: result: no" >&5
+  echo "$as_me:4023: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3715,7 +4029,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3718: checking for $ac_word" >&5
+echo "$as_me:4032: 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
@@ -3730,7 +4044,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3733: found $ac_dir/$ac_word" >&5
+echo "$as_me:4047: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3739,17 +4053,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3742: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3745: result: no" >&5
+  echo "$as_me:4059: 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:3752: checking for $ac_word" >&5
+echo "$as_me:4066: 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
@@ -3764,7 +4078,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3767: found $ac_dir/$ac_word" >&5
+echo "$as_me:4081: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3773,10 +4087,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3776: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3779: result: no" >&5
+  echo "$as_me:4093: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3796,7 +4110,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3799: checking for makeflags variable" >&5
+echo "$as_me:4113: 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
@@ -3826,7 +4140,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -3834,13 +4148,13 @@ echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3837: result: $cf_cv_makeflags" >&5
+echo "$as_me:4151: 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:3843: checking for $ac_word" >&5
+echo "$as_me:4157: 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
@@ -3855,7 +4169,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3858: found $ac_dir/$ac_word" >&5
+echo "$as_me:4172: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3863,10 +4177,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3866: result: $RANLIB" >&5
+  echo "$as_me:4180: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3869: result: no" >&5
+  echo "$as_me:4183: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3875,7 +4189,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3878: checking for $ac_word" >&5
+echo "$as_me:4192: 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
@@ -3890,7 +4204,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3893: found $ac_dir/$ac_word" >&5
+echo "$as_me:4207: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3899,10 +4213,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3902: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4216: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3905: result: no" >&5
+  echo "$as_me:4219: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3914,7 +4228,7 @@ fi
 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:3917: checking for $ac_word" >&5
+echo "$as_me:4231: 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
@@ -3929,7 +4243,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:3932: found $ac_dir/$ac_word" >&5
+echo "$as_me:4246: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3937,10 +4251,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:3940: result: $LD" >&5
+  echo "$as_me:4254: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3943: result: no" >&5
+  echo "$as_me:4257: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3949,7 +4263,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:3952: checking for $ac_word" >&5
+echo "$as_me:4266: 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
@@ -3964,7 +4278,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:3967: found $ac_dir/$ac_word" >&5
+echo "$as_me:4281: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3973,10 +4287,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:3976: result: $ac_ct_LD" >&5
+  echo "$as_me:4290: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:3979: result: no" >&5
+  echo "$as_me:4293: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3988,7 +4302,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3991: checking for $ac_word" >&5
+echo "$as_me:4305: 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
@@ -4003,7 +4317,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4006: found $ac_dir/$ac_word" >&5
+echo "$as_me:4320: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4011,10 +4325,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4014: result: $AR" >&5
+  echo "$as_me:4328: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4017: result: no" >&5
+  echo "$as_me:4331: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4023,7 +4337,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4026: checking for $ac_word" >&5
+echo "$as_me:4340: 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
@@ -4038,7 +4352,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4041: found $ac_dir/$ac_word" >&5
+echo "$as_me:4355: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4047,10 +4361,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4050: result: $ac_ct_AR" >&5
+  echo "$as_me:4364: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4053: result: no" >&5
+  echo "$as_me:4367: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4062,7 +4376,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4065: checking for $ac_word" >&5
+echo "$as_me:4379: 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
@@ -4077,7 +4391,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4080: found $ac_dir/$ac_word" >&5
+echo "$as_me:4394: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4085,10 +4399,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4088: result: $AR" >&5
+  echo "$as_me:4402: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4091: result: no" >&5
+  echo "$as_me:4405: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4097,7 +4411,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4100: checking for $ac_word" >&5
+echo "$as_me:4414: 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
@@ -4112,7 +4426,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4115: found $ac_dir/$ac_word" >&5
+echo "$as_me:4429: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4121,10 +4435,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4124: result: $ac_ct_AR" >&5
+  echo "$as_me:4438: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4127: result: no" >&5
+  echo "$as_me:4441: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4133,7 +4447,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:4136: checking for options to update archives" >&5
+echo "$as_me:4450: 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
@@ -4170,13 +4484,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4173 "configure"
+#line 4487 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4176: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4179: \$? = $ac_status" >&5
+  echo "$as_me:4493: \$? = $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
@@ -4187,7 +4501,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4197,7 +4511,7 @@ echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4200: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4514: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4208,17 +4522,17 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-	echo "$as_me:4211: checking for PATH separator" >&5
+	echo "$as_me:4525: 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:4218: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:4532: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
-echo "$as_me:4221: checking if you have specified an install-prefix" >&5
+echo "$as_me:4535: 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.
@@ -4231,7 +4545,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:4234: result: $DESTDIR" >&5
+echo "$as_me:4548: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -4259,7 +4573,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4262: checking for $ac_word" >&5
+echo "$as_me:4576: 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
@@ -4274,7 +4588,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:4277: found $ac_dir/$ac_word" >&5
+echo "$as_me:4591: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4282,10 +4596,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:4285: result: $BUILD_CC" >&5
+  echo "$as_me:4599: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:4288: result: no" >&5
+  echo "$as_me:4602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4294,12 +4608,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:4297: checking for native build C compiler" >&5
+	echo "$as_me:4611: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:4299: result: $BUILD_CC" >&5
+	echo "$as_me:4613: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:4302: checking for native build C preprocessor" >&5
+	echo "$as_me:4616: 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.
@@ -4309,10 +4623,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:4312: result: $BUILD_CPP" >&5
+	echo "$as_me:4626: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:4315: checking for native build C flags" >&5
+	echo "$as_me:4629: 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.
@@ -4320,10 +4634,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:4323: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:4637: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:4326: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:4640: 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.
@@ -4331,10 +4645,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:4334: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:4337: checking for native build linker-flags" >&5
+	echo "$as_me:4651: 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.
@@ -4342,10 +4656,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:4345: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:4348: checking for native build linker-libraries" >&5
+	echo "$as_me:4662: 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.
@@ -4353,7 +4667,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:4356: result: $BUILD_LIBS" >&5
+	echo "$as_me:4670: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -4362,7 +4676,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:4365: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:4679: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -4376,7 +4690,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4379 "configure"
+#line 4693 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -4386,15 +4700,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4392: \$? = $ac_status" >&5
+  echo "$as_me:4706: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4397: \$? = $ac_status" >&5
+  echo "$as_me:4711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -4409,12 +4723,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:4412: result: $cf_ok_build_cc" >&5
+	echo "$as_me:4726: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:4417: error: Cross-build requires two compilers.
+		{ { echo "$as_me:4731: 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;}
@@ -4425,9 +4739,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+	: ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='${LIBS}'}
+	: ${BUILD_LIBS:=''${LIBS}''}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
@@ -4439,7 +4753,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:4442: checking if you want to build shared C-objects" >&5
+echo "$as_me:4756: checking if you want to build shared C-objects" >&5
 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
@@ -4449,27 +4763,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:4452: result: $with_shared" >&5
+echo "$as_me:4766: result: $with_shared" >&5
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
-echo "$as_me:4456: checking for specified models" >&5
+echo "$as_me:4770: checking for specified models" >&5
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
-echo "$as_me:4459: result: $cf_list_models" >&5
+echo "$as_me:4773: 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:4464: checking for default model" >&5
+echo "$as_me:4778: 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:4467: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4781: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:4472: checking for specific curses-directory" >&5
+echo "$as_me:4786: 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.
@@ -4479,7 +4793,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:4482: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4796: 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"
@@ -4510,7 +4824,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4513: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4546,7 +4860,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 4549 "configure"
+#line 4863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4558,16 +4872,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4564: \$? = $ac_status" >&5
+  echo "$as_me:4878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4570: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4584,7 +4898,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:4587: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -4620,7 +4934,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:4623: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -4635,13 +4949,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:4638: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:4952: 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:4641: result: yes" >&5
+		echo "$as_me:4955: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:4644: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:4958: 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
 
@@ -4774,7 +5088,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4777 "configure"
+#line 5091 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -4786,37 +5100,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4792: \$? = $ac_status" >&5
+  echo "$as_me:5106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4798: \$? = $ac_status" >&5
+  echo "$as_me:5112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4804 "configure"
+#line 5118 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4814: \$? = $ac_status" >&5
+  echo "$as_me:5128: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4819: \$? = $ac_status" >&5
+  echo "$as_me:5133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -4990,7 +5304,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4993 "configure"
+#line 5307 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5002,37 +5316,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5008: \$? = $ac_status" >&5
+  echo "$as_me:5322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5014: \$? = $ac_status" >&5
+  echo "$as_me:5328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5020 "configure"
+#line 5334 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5030: \$? = $ac_status" >&5
+  echo "$as_me:5344: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5035: \$? = $ac_status" >&5
+  echo "$as_me:5349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -5049,7 +5363,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:5052: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5366: 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"
@@ -5065,7 +5379,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5068: checking for terminfo header" >&5
+echo "$as_me:5382: 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
@@ -5083,7 +5397,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5086 "configure"
+#line 5400 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5098,16 +5412,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5104: \$? = $ac_status" >&5
+  echo "$as_me:5418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5110: \$? = $ac_status" >&5
+  echo "$as_me:5424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5123,7 +5437,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5126: result: $cf_cv_term_header" >&5
+echo "$as_me:5440: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5158,7 +5472,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5161: result: no" >&5
+		echo "$as_me:5475: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5174,7 +5488,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5177: checking for $ac_word" >&5
+echo "$as_me:5491: 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
@@ -5189,7 +5503,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5192: found $ac_dir/$ac_word" >&5
+echo "$as_me:5506: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5197,10 +5511,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5200: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5514: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5203: result: no" >&5
+  echo "$as_me:5517: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5213,7 +5527,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5216: checking for $ac_word" >&5
+echo "$as_me:5530: 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
@@ -5228,7 +5542,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5231: found $ac_dir/$ac_word" >&5
+echo "$as_me:5545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5236,10 +5550,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5239: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5242: result: no" >&5
+  echo "$as_me:5556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5396,7 +5710,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5399: checking if we have identified curses headers" >&5
+echo "$as_me:5713: 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
@@ -5408,7 +5722,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5411 "configure"
+#line 5725 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5420,16 +5734,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5426: \$? = $ac_status" >&5
+  echo "$as_me:5740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5432: \$? = $ac_status" >&5
+  echo "$as_me:5746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5440,11 +5754,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5443: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5757: 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:5447: error: No curses header-files found" >&5
+	{ { echo "$as_me:5761: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5454,23 +5768,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5457: checking for $ac_header" >&5
+echo "$as_me:5771: 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 5463 "configure"
+#line 5777 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5467: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5781: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5473: \$? = $ac_status" >&5
+  echo "$as_me:5787: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5489,7 +5803,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5492: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5806: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5545,7 +5859,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5548 "configure"
+#line 5862 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5557,16 +5871,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5563: \$? = $ac_status" >&5
+  echo "$as_me:5877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5569: \$? = $ac_status" >&5
+  echo "$as_me:5883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5583,7 +5897,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5586: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5602,7 +5916,7 @@ fi
 
 }
 
-echo "$as_me:5605: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5919: 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
@@ -5614,7 +5928,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5617 "configure"
+#line 5931 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5638,16 +5952,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5644: \$? = $ac_status" >&5
+  echo "$as_me:5958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5650: \$? = $ac_status" >&5
+  echo "$as_me:5964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -5662,14 +5976,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:5665: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:5979: 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:5672: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:5986: 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
@@ -5790,7 +6104,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5793 "configure"
+#line 6107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5802,16 +6116,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5808: \$? = $ac_status" >&5
+  echo "$as_me:6122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5814: \$? = $ac_status" >&5
+  echo "$as_me:6128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5828,7 +6142,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5831: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5851,7 +6165,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5854 "configure"
+#line 6168 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5875,16 +6189,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5881: \$? = $ac_status" >&5
+  echo "$as_me:6195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5887: \$? = $ac_status" >&5
+  echo "$as_me:6201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -5905,12 +6219,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5908: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:5913: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6227: 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%/[^/]*$%%'`
@@ -5946,7 +6260,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5949 "configure"
+#line 6263 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5958,16 +6272,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5964: \$? = $ac_status" >&5
+  echo "$as_me:6278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5970: \$? = $ac_status" >&5
+  echo "$as_me:6284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5984,7 +6298,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5987: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6032,7 +6346,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:6035: checking for terminfo header" >&5
+echo "$as_me:6349: 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
@@ -6050,7 +6364,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6053 "configure"
+#line 6367 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -6065,16 +6379,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6071: \$? = $ac_status" >&5
+  echo "$as_me:6385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6077: \$? = $ac_status" >&5
+  echo "$as_me:6391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6090,7 +6404,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6093: result: $cf_cv_term_header" >&5
+echo "$as_me:6407: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6128,7 +6442,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6131: checking for ncurses version" >&5
+echo "$as_me:6445: 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
@@ -6154,10 +6468,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6157: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6471: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6160: \$? = $ac_status" >&5
+  echo "$as_me:6474: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6167,7 +6481,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6170 "configure"
+#line 6484 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6194,15 +6508,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6200: \$? = $ac_status" >&5
+  echo "$as_me:6514: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6205: \$? = $ac_status" >&5
+  echo "$as_me:6519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6216,7 +6530,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6219: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6229,7 +6543,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6232: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6546: 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
@@ -6237,7 +6551,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6240 "configure"
+#line 6554 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6256,16 +6570,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6262: \$? = $ac_status" >&5
+  echo "$as_me:6576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6268: \$? = $ac_status" >&5
+  echo "$as_me:6582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6276,10 +6590,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6279: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6593: 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:6282: checking for initscr in -lgpm" >&5
+  echo "$as_me:6596: 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
@@ -6287,7 +6601,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6290 "configure"
+#line 6604 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6306,16 +6620,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6312: \$? = $ac_status" >&5
+  echo "$as_me:6626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6318: \$? = $ac_status" >&5
+  echo "$as_me:6632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6326,7 +6640,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6329: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6643: 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"
@@ -6341,7 +6655,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6344: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6658: 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
@@ -6349,7 +6663,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6352 "configure"
+#line 6666 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6368,16 +6682,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6374: \$? = $ac_status" >&5
+  echo "$as_me:6688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6380: \$? = $ac_status" >&5
+  echo "$as_me:6694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6388,7 +6702,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6391: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6705: 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"
@@ -6437,13 +6751,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6440: checking for initscr" >&5
+	echo "$as_me:6754: 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 6446 "configure"
+#line 6760 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6474,16 +6788,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6480: \$? = $ac_status" >&5
+  echo "$as_me:6794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6486: \$? = $ac_status" >&5
+  echo "$as_me:6800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6493,18 +6807,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6496: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6810: 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:6503: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:6817: 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 6507 "configure"
+#line 6821 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6516,25 +6830,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6522: \$? = $ac_status" >&5
+  echo "$as_me:6836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6528: \$? = $ac_status" >&5
+  echo "$as_me:6842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6530: result: yes" >&5
+  echo "$as_me:6844: 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:6537: result: no" >&5
+echo "$as_me:6851: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6602,11 +6916,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6605: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:6919: 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 6609 "configure"
+#line 6923 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6618,25 +6932,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6624: \$? = $ac_status" >&5
+  echo "$as_me:6938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6630: \$? = $ac_status" >&5
+  echo "$as_me:6944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6632: result: yes" >&5
+  echo "$as_me:6946: 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:6639: result: no" >&5
+echo "$as_me:6953: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -6651,7 +6965,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:6654: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6659,7 +6973,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:6662: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:6976: 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
@@ -6669,7 +6983,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6672 "configure"
+#line 6986 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6681,23 +6995,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6687: \$? = $ac_status" >&5
+  echo "$as_me:7001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6693: \$? = $ac_status" >&5
+  echo "$as_me:7007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6695: result: yes" >&5
+  echo "$as_me:7009: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:6700: result: no" >&5
+echo "$as_me:7014: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -6715,7 +7029,7 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:6718: checking if you want wide-character code" >&5
+echo "$as_me:7032: 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.
@@ -6725,30 +7039,30 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
-echo "$as_me:6728: result: $with_widec" >&5
+echo "$as_me:7042: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
 
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6735: checking for $ac_header" >&5
+echo "$as_me:7049: 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 6741 "configure"
+#line 7055 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7059: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6751: \$? = $ac_status" >&5
+  echo "$as_me:7065: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6767,7 +7081,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6770: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6777,7 +7091,7 @@ EOF
 fi
 done
 
-echo "$as_me:6780: checking for multibyte character support" >&5
+echo "$as_me:7094: 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
@@ -6785,7 +7099,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6788 "configure"
+#line 7102 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6802,16 +7116,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6808: \$? = $ac_status" >&5
+  echo "$as_me:7122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6814: \$? = $ac_status" >&5
+  echo "$as_me:7128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -6823,12 +7137,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:6826: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7140: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6831 "configure"
+#line 7145 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -6841,16 +7155,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6847: \$? = $ac_status" >&5
+  echo "$as_me:7161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6853: \$? = $ac_status" >&5
+  echo "$as_me:7167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -6864,7 +7178,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6867 "configure"
+#line 7181 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -6877,16 +7191,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6883: \$? = $ac_status" >&5
+  echo "$as_me:7197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6889: \$? = $ac_status" >&5
+  echo "$as_me:7203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -6903,9 +7217,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:6906: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7220: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:6908: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7222: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6996,7 +7310,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:6999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7313: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7004,7 +7318,7 @@ echo "${as_me:-configure}:6999: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7007 "configure"
+#line 7321 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7017,21 +7331,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7023: \$? = $ac_status" >&5
+  echo "$as_me:7337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7029: \$? = $ac_status" >&5
+  echo "$as_me:7343: \$? = $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}:7034: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7348: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7049,7 +7363,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7052: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7366: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7124,13 +7438,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7127: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7441: 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 7133 "configure"
+#line 7447 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7143,21 +7457,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7149: \$? = $ac_status" >&5
+  echo "$as_me:7463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7155: \$? = $ac_status" >&5
+  echo "$as_me:7469: \$? = $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}:7160: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7474: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7199,7 +7513,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7202: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7516: 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
@@ -7237,7 +7551,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7240 "configure"
+#line 7554 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7249,16 +7563,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7255: \$? = $ac_status" >&5
+  echo "$as_me:7569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7261: \$? = $ac_status" >&5
+  echo "$as_me:7575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7275,7 +7589,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7278: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7592: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7311,7 +7625,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7314: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7628: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7341,13 +7655,13 @@ cf_ncuconfig_root=ncursesw
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7344: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7658: 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:7347: result: yes" >&5
+		echo "$as_me:7661: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7350: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7664: 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
 
@@ -7480,7 +7794,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7483 "configure"
+#line 7797 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7492,37 +7806,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7498: \$? = $ac_status" >&5
+  echo "$as_me:7812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7504: \$? = $ac_status" >&5
+  echo "$as_me:7818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7510 "configure"
+#line 7824 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7520: \$? = $ac_status" >&5
+  echo "$as_me:7834: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7525: \$? = $ac_status" >&5
+  echo "$as_me:7839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -7696,7 +8010,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7699 "configure"
+#line 8013 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7708,37 +8022,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7714: \$? = $ac_status" >&5
+  echo "$as_me:8028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7720: \$? = $ac_status" >&5
+  echo "$as_me:8034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7726 "configure"
+#line 8040 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7736: \$? = $ac_status" >&5
+  echo "$as_me:8050: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7741: \$? = $ac_status" >&5
+  echo "$as_me:8055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -7755,7 +8069,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7758: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8072: 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"
@@ -7771,7 +8085,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:7774: checking for terminfo header" >&5
+echo "$as_me:8088: 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
@@ -7789,7 +8103,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7792 "configure"
+#line 8106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7804,16 +8118,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7810: \$? = $ac_status" >&5
+  echo "$as_me:8124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7816: \$? = $ac_status" >&5
+  echo "$as_me:8130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7829,7 +8143,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7832: result: $cf_cv_term_header" >&5
+echo "$as_me:8146: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7864,7 +8178,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:7867: result: no" >&5
+		echo "$as_me:8181: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -7880,7 +8194,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:7883: checking for $ac_word" >&5
+echo "$as_me:8197: 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
@@ -7895,7 +8209,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:7898: found $ac_dir/$ac_word" >&5
+echo "$as_me:8212: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7903,10 +8217,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:7906: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8220: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:7909: result: no" >&5
+  echo "$as_me:8223: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7919,7 +8233,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:7922: checking for $ac_word" >&5
+echo "$as_me:8236: 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
@@ -7934,7 +8248,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:7937: found $ac_dir/$ac_word" >&5
+echo "$as_me:8251: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7942,10 +8256,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:7945: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8259: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:7948: result: no" >&5
+  echo "$as_me:8262: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8102,7 +8416,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8105: checking if we have identified curses headers" >&5
+echo "$as_me:8419: 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
@@ -8114,7 +8428,7 @@ for cf_header in \
 	curses.h ncursesw/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8117 "configure"
+#line 8431 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8126,16 +8440,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8132: \$? = $ac_status" >&5
+  echo "$as_me:8446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8138: \$? = $ac_status" >&5
+  echo "$as_me:8452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8146,11 +8460,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8149: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8463: 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:8153: error: No curses header-files found" >&5
+	{ { echo "$as_me:8467: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8160,23 +8474,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8163: checking for $ac_header" >&5
+echo "$as_me:8477: 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 8169 "configure"
+#line 8483 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8173: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8487: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8179: \$? = $ac_status" >&5
+  echo "$as_me:8493: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8195,7 +8509,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8198: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8512: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8251,7 +8565,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8254 "configure"
+#line 8568 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8263,16 +8577,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8275: \$? = $ac_status" >&5
+  echo "$as_me:8589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8289,7 +8603,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8292: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8606: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8308,7 +8622,7 @@ fi
 
 }
 
-echo "$as_me:8311: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8625: 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
@@ -8320,7 +8634,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8323 "configure"
+#line 8637 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -8352,16 +8666,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8358: \$? = $ac_status" >&5
+  echo "$as_me:8672: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8364: \$? = $ac_status" >&5
+  echo "$as_me:8678: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8376,14 +8690,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8379: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8693: 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:8386: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8700: 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
@@ -8504,7 +8818,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8507 "configure"
+#line 8821 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8516,16 +8830,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8522: \$? = $ac_status" >&5
+  echo "$as_me:8836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8528: \$? = $ac_status" >&5
+  echo "$as_me:8842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8542,7 +8856,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8545: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8859: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8565,7 +8879,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8568 "configure"
+#line 8882 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8589,16 +8903,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8595: \$? = $ac_status" >&5
+  echo "$as_me:8909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8601: \$? = $ac_status" >&5
+  echo "$as_me:8915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8619,12 +8933,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8622: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8936: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8627: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8941: 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%/[^/]*$%%'`
@@ -8660,7 +8974,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8663 "configure"
+#line 8977 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8672,16 +8986,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8678: \$? = $ac_status" >&5
+  echo "$as_me:8992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8684: \$? = $ac_status" >&5
+  echo "$as_me:8998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8698,7 +9012,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8701: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9015: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8746,7 +9060,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:8749: checking for terminfo header" >&5
+echo "$as_me:9063: 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
@@ -8764,7 +9078,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8767 "configure"
+#line 9081 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8779,16 +9093,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8785: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8791: \$? = $ac_status" >&5
+  echo "$as_me:9105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8804,7 +9118,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8807: result: $cf_cv_term_header" >&5
+echo "$as_me:9121: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8842,7 +9156,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:8845: checking for ncurses version" >&5
+echo "$as_me:9159: 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
@@ -8868,10 +9182,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:8871: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9185: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:8874: \$? = $ac_status" >&5
+  echo "$as_me:9188: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -8881,7 +9195,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8884 "configure"
+#line 9198 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8908,15 +9222,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8914: \$? = $ac_status" >&5
+  echo "$as_me:9228: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8919: \$? = $ac_status" >&5
+  echo "$as_me:9233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8930,7 +9244,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:8933: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9247: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -8943,7 +9257,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:8946: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9260: 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
@@ -8951,7 +9265,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8954 "configure"
+#line 9268 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8970,16 +9284,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  echo "$as_me:9290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8982: \$? = $ac_status" >&5
+  echo "$as_me:9296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -8990,10 +9304,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8993: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9307: 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:8996: checking for initscr in -lgpm" >&5
+  echo "$as_me:9310: 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
@@ -9001,7 +9315,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9004 "configure"
+#line 9318 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9020,16 +9334,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9026: \$? = $ac_status" >&5
+  echo "$as_me:9340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9032: \$? = $ac_status" >&5
+  echo "$as_me:9346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9040,7 +9354,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9043: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9357: 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"
@@ -9055,7 +9369,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9058: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9372: 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
@@ -9063,7 +9377,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9066 "configure"
+#line 9380 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9082,16 +9396,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9088: \$? = $ac_status" >&5
+  echo "$as_me:9402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9094: \$? = $ac_status" >&5
+  echo "$as_me:9408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9102,7 +9416,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9105: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9419: 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"
@@ -9151,13 +9465,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9154: checking for initscr" >&5
+	echo "$as_me:9468: 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 9160 "configure"
+#line 9474 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9188,16 +9502,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9194: \$? = $ac_status" >&5
+  echo "$as_me:9508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9200: \$? = $ac_status" >&5
+  echo "$as_me:9514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9207,18 +9521,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9210: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9524: 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:9217: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9531: 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 9221 "configure"
+#line 9535 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9230,25 +9544,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9236: \$? = $ac_status" >&5
+  echo "$as_me:9550: \$? = $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:9553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9242: \$? = $ac_status" >&5
+  echo "$as_me:9556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9244: result: yes" >&5
+  echo "$as_me:9558: 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:9251: result: no" >&5
+echo "$as_me:9565: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9316,11 +9630,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9319: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9633: 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 9323 "configure"
+#line 9637 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9332,25 +9646,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9338: \$? = $ac_status" >&5
+  echo "$as_me:9652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9344: \$? = $ac_status" >&5
+  echo "$as_me:9658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9346: result: yes" >&5
+  echo "$as_me:9660: 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:9353: result: no" >&5
+echo "$as_me:9667: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9365,7 +9679,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9368: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9682: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9373,7 +9687,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9376: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9690: 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
@@ -9383,7 +9697,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9386 "configure"
+#line 9700 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9395,23 +9709,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9401: \$? = $ac_status" >&5
+  echo "$as_me:9715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9407: \$? = $ac_status" >&5
+  echo "$as_me:9721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9409: result: yes" >&5
+  echo "$as_me:9723: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9414: result: no" >&5
+echo "$as_me:9728: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9435,13 +9749,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9438: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9752: 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:9441: result: yes" >&5
+		echo "$as_me:9755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9444: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9758: 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
 
@@ -9574,7 +9888,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9577 "configure"
+#line 9891 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9586,37 +9900,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9592: \$? = $ac_status" >&5
+  echo "$as_me:9906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9598: \$? = $ac_status" >&5
+  echo "$as_me:9912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9604 "configure"
+#line 9918 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9614: \$? = $ac_status" >&5
+  echo "$as_me:9928: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9619: \$? = $ac_status" >&5
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -9790,7 +10104,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 9793 "configure"
+#line 10107 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9802,37 +10116,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9808: \$? = $ac_status" >&5
+  echo "$as_me:10122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9814: \$? = $ac_status" >&5
+  echo "$as_me:10128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9820 "configure"
+#line 10134 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9830: \$? = $ac_status" >&5
+  echo "$as_me:10144: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9835: \$? = $ac_status" >&5
+  echo "$as_me:10149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -9849,7 +10163,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:9852: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:10166: 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"
@@ -9865,7 +10179,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:9868: checking for terminfo header" >&5
+echo "$as_me:10182: 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
@@ -9883,7 +10197,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9886 "configure"
+#line 10200 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9898,16 +10212,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9904: \$? = $ac_status" >&5
+  echo "$as_me:10218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9910: \$? = $ac_status" >&5
+  echo "$as_me:10224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9923,7 +10237,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9926: result: $cf_cv_term_header" >&5
+echo "$as_me:10240: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9958,7 +10272,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9961: result: no" >&5
+		echo "$as_me:10275: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9974,7 +10288,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9977: checking for $ac_word" >&5
+echo "$as_me:10291: 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
@@ -9989,7 +10303,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9992: found $ac_dir/$ac_word" >&5
+echo "$as_me:10306: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9997,10 +10311,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10000: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10003: result: no" >&5
+  echo "$as_me:10317: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10013,7 +10327,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10016: checking for $ac_word" >&5
+echo "$as_me:10330: 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
@@ -10028,7 +10342,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10031: found $ac_dir/$ac_word" >&5
+echo "$as_me:10345: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10036,10 +10350,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10039: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10042: result: no" >&5
+  echo "$as_me:10356: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10196,7 +10510,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10199: checking if we have identified curses headers" >&5
+echo "$as_me:10513: 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
@@ -10208,7 +10522,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10211 "configure"
+#line 10525 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10220,16 +10534,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10226: \$? = $ac_status" >&5
+  echo "$as_me:10540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10232: \$? = $ac_status" >&5
+  echo "$as_me:10546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10240,11 +10554,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10243: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10557: 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:10247: error: No curses header-files found" >&5
+	{ { echo "$as_me:10561: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10254,23 +10568,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10257: checking for $ac_header" >&5
+echo "$as_me:10571: 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 10263 "configure"
+#line 10577 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10273: \$? = $ac_status" >&5
+  echo "$as_me:10587: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10289,7 +10603,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10345,7 +10659,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10348 "configure"
+#line 10662 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10357,16 +10671,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10363: \$? = $ac_status" >&5
+  echo "$as_me:10677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10369: \$? = $ac_status" >&5
+  echo "$as_me:10683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10383,7 +10697,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10386: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10402,7 +10716,7 @@ fi
 
 }
 
-echo "$as_me:10405: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10719: 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
@@ -10414,7 +10728,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10417 "configure"
+#line 10731 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10438,16 +10752,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10444: \$? = $ac_status" >&5
+  echo "$as_me:10758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10450: \$? = $ac_status" >&5
+  echo "$as_me:10764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10462,14 +10776,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10465: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10779: 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:10472: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10786: 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
@@ -10590,7 +10904,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10593 "configure"
+#line 10907 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10602,16 +10916,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10608: \$? = $ac_status" >&5
+  echo "$as_me:10922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10614: \$? = $ac_status" >&5
+  echo "$as_me:10928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10628,7 +10942,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10631: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10651,7 +10965,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10654 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10675,16 +10989,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10681: \$? = $ac_status" >&5
+  echo "$as_me:10995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10687: \$? = $ac_status" >&5
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -10705,12 +11019,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10708: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:10713: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11027: 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%/[^/]*$%%'`
@@ -10746,7 +11060,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10749 "configure"
+#line 11063 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10758,16 +11072,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10764: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10770: \$? = $ac_status" >&5
+  echo "$as_me:11084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10784,7 +11098,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10787: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10832,7 +11146,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10835: checking for terminfo header" >&5
+echo "$as_me:11149: 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
@@ -10850,7 +11164,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10853 "configure"
+#line 11167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10865,16 +11179,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10871: \$? = $ac_status" >&5
+  echo "$as_me:11185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10877: \$? = $ac_status" >&5
+  echo "$as_me:11191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10890,7 +11204,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10893: result: $cf_cv_term_header" >&5
+echo "$as_me:11207: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10928,7 +11242,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10931: checking for ncurses version" >&5
+echo "$as_me:11245: 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
@@ -10954,10 +11268,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10957: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10960: \$? = $ac_status" >&5
+  echo "$as_me:11274: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10967,7 +11281,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10970 "configure"
+#line 11284 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10994,15 +11308,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11000: \$? = $ac_status" >&5
+  echo "$as_me:11314: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11005: \$? = $ac_status" >&5
+  echo "$as_me:11319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11016,7 +11330,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11019: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -11029,7 +11343,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11032: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11346: 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
@@ -11037,7 +11351,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11040 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11056,16 +11370,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11062: \$? = $ac_status" >&5
+  echo "$as_me:11376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11068: \$? = $ac_status" >&5
+  echo "$as_me:11382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11076,10 +11390,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11079: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11393: 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:11082: checking for initscr in -lgpm" >&5
+  echo "$as_me:11396: 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
@@ -11087,7 +11401,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11090 "configure"
+#line 11404 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11106,16 +11420,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11112: \$? = $ac_status" >&5
+  echo "$as_me:11426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11118: \$? = $ac_status" >&5
+  echo "$as_me:11432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11126,7 +11440,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11129: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11443: 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"
@@ -11141,7 +11455,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11144: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11458: 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
@@ -11149,7 +11463,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11152 "configure"
+#line 11466 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11168,16 +11482,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11174: \$? = $ac_status" >&5
+  echo "$as_me:11488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11180: \$? = $ac_status" >&5
+  echo "$as_me:11494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11188,7 +11502,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11191: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11505: 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"
@@ -11237,13 +11551,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11240: checking for initscr" >&5
+	echo "$as_me:11554: 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 11246 "configure"
+#line 11560 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11274,16 +11588,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11280: \$? = $ac_status" >&5
+  echo "$as_me:11594: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11286: \$? = $ac_status" >&5
+  echo "$as_me:11600: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11293,18 +11607,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11296: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11610: 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:11303: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11617: 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 11307 "configure"
+#line 11621 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11316,25 +11630,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11322: \$? = $ac_status" >&5
+  echo "$as_me:11636: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11328: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11330: result: yes" >&5
+  echo "$as_me:11644: 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:11337: result: no" >&5
+echo "$as_me:11651: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11402,11 +11716,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11405: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11719: 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 11409 "configure"
+#line 11723 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11418,25 +11732,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11424: \$? = $ac_status" >&5
+  echo "$as_me:11738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11430: \$? = $ac_status" >&5
+  echo "$as_me:11744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11432: result: yes" >&5
+  echo "$as_me:11746: 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:11439: result: no" >&5
+echo "$as_me:11753: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11451,7 +11765,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11454: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11459,7 +11773,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11462: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11776: 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
@@ -11469,7 +11783,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11472 "configure"
+#line 11786 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11481,23 +11795,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11487: \$? = $ac_status" >&5
+  echo "$as_me:11801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11493: \$? = $ac_status" >&5
+  echo "$as_me:11807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11495: result: yes" >&5
+  echo "$as_me:11809: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11500: result: no" >&5
+echo "$as_me:11814: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11550,10 +11864,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11553: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11867: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11556: \$? = $ac_status" >&5
+  echo "$as_me:11870: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11571,10 +11885,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11574: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11888: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11577: checking if you want to have a library-prefix" >&5
+echo "$as_me:11891: 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.
@@ -11584,7 +11898,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11587: result: $with_lib_prefix" >&5
+echo "$as_me:11901: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -11622,7 +11936,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:11625: checking for default loader flags" >&5
+echo "$as_me:11939: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -11630,13 +11944,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:11633: result: $LD_MODEL" >&5
+echo "$as_me:11947: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:11639: checking for an rpath option" >&5
+	echo "$as_me:11953: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -11667,12 +11981,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:11670: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:11984: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:11675: checking if we need a space after rpath option" >&5
+		echo "$as_me:11989: 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"
 
@@ -11693,7 +12007,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11696 "configure"
+#line 12010 "configure"
 #include "confdefs.h"
 
 int
@@ -11705,16 +12019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11711: \$? = $ac_status" >&5
+  echo "$as_me:12025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11717: \$? = $ac_status" >&5
+  echo "$as_me:12031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -11724,7 +12038,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:11727: result: $cf_rpath_space" >&5
+		echo "$as_me:12041: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -11746,7 +12060,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:11749: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:12063: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -11761,9 +12075,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:11764: result: $withval" >&5
+		echo "$as_me:12078: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:11766: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:12080: 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; }; }
 		;;
@@ -11772,7 +12086,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:11775: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:12089: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -11795,14 +12109,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:11798: checking which $CC option to use" >&5
+		echo "$as_me:12112: 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 11805 "configure"
+#line 12119 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11814,16 +12128,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11820: \$? = $ac_status" >&5
+  echo "$as_me:12134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11826: \$? = $ac_status" >&5
+  echo "$as_me:12140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -11832,7 +12146,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:11835: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:12149: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -11903,7 +12217,7 @@ CF_EOF
 		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:11906: checking if ld -search_paths_first works" >&5
+		echo "$as_me:12220: 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
@@ -11912,7 +12226,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11915 "configure"
+#line 12229 "configure"
 #include "confdefs.h"
 
 int
@@ -11924,16 +12238,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11930: \$? = $ac_status" >&5
+  echo "$as_me:12244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11936: \$? = $ac_status" >&5
+  echo "$as_me:12250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -11944,7 +12258,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:11947: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:12261: 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"
@@ -12294,7 +12608,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12297 "configure"
+#line 12611 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12306,16 +12620,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12312: \$? = $ac_status" >&5
+  echo "$as_me:12626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12352,7 +12666,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12355: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12669: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12362,7 +12676,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12365 "${as_me:-configure}"
+#line 12679 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12374,18 +12688,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12377: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12691: 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:12379: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12382: \$? = $ac_status" >&5
+  echo "$as_me:12696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12384: result: yes" >&5
+				echo "$as_me:12698: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12388: result: no" >&5
+				echo "$as_me:12702: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12400,17 +12714,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12403: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12717: 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}:12407: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12721: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12413: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12727: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12420,7 +12734,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12423: result: $with_rpath_link" >&5
+	echo "$as_me:12737: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12433,7 +12747,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12436: checking if you want broken-linker support code" >&5
+echo "$as_me:12750: 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.
@@ -12443,7 +12757,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12446: result: $with_broken_linker" >&5
+echo "$as_me:12760: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12458,14 +12772,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12461: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12775: 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 12468 "configure"
+#line 12782 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12484,16 +12798,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12801: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12490: \$? = $ac_status" >&5
+  echo "$as_me:12804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12496: \$? = $ac_status" >&5
+  echo "$as_me:12810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12504,7 +12818,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12507: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12821: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12546,14 +12860,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12549: checking if this is the GNU C library" >&5
+echo "$as_me:12863: 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 12556 "configure"
+#line 12870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12572,16 +12886,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12584: \$? = $ac_status" >&5
+  echo "$as_me:12898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12592,7 +12906,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12595: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12909: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12600,7 +12914,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12603: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:12917: 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
@@ -12612,7 +12926,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12615 "configure"
+#line 12929 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12631,16 +12945,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12637: \$? = $ac_status" >&5
+  echo "$as_me:12951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12643: \$? = $ac_status" >&5
+  echo "$as_me:12957: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -12652,12 +12966,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:12655: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:12969: 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:12660: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:12974: 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
@@ -12762,7 +13076,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12765 "configure"
+#line 13079 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -12782,16 +13096,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12788: \$? = $ac_status" >&5
+  echo "$as_me:13102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12794: \$? = $ac_status" >&5
+  echo "$as_me:13108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -12802,7 +13116,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12805: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:13119: 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
@@ -12811,14 +13125,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:12814: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:13128: 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 12821 "configure"
+#line 13135 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12833,16 +13147,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12839: \$? = $ac_status" >&5
+  echo "$as_me:13153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12845: \$? = $ac_status" >&5
+  echo "$as_me:13159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -12949,7 +13263,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12952 "configure"
+#line 13266 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12964,16 +13278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12970: \$? = $ac_status" >&5
+  echo "$as_me:13284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12976: \$? = $ac_status" >&5
+  echo "$as_me:13290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -12988,12 +13302,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12991: result: $cf_cv_gnu_source" >&5
+echo "$as_me:13305: 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:12996: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:13310: 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
@@ -13003,7 +13317,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13006 "configure"
+#line 13320 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13018,16 +13332,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13024: \$? = $ac_status" >&5
+  echo "$as_me:13338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13030: \$? = $ac_status" >&5
+  echo "$as_me:13344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13038,7 +13352,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13041: result: $cf_cv_default_source" >&5
+echo "$as_me:13355: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13075,16 +13389,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13078: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13392: 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}:13084: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13398: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13087 "configure"
+#line 13401 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13099,16 +13413,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13105: \$? = $ac_status" >&5
+  echo "$as_me:13419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13111: \$? = $ac_status" >&5
+  echo "$as_me:13425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13129,7 +13443,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13132 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13144,16 +13458,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13150: \$? = $ac_status" >&5
+  echo "$as_me:13464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13156: \$? = $ac_status" >&5
+  echo "$as_me:13470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13164,7 +13478,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13481: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13172,10 +13486,10 @@ echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13175: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13489: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13178 "configure"
+#line 13492 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13190,16 +13504,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13196: \$? = $ac_status" >&5
+  echo "$as_me:13510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13202: \$? = $ac_status" >&5
+  echo "$as_me:13516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13215,7 +13529,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13218: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13532: 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
@@ -13332,7 +13646,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13335: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13649: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13364,14 +13678,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13367: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13681: 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 13374 "configure"
+#line 13688 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13389,16 +13703,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13395: \$? = $ac_status" >&5
+  echo "$as_me:13709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13401: \$? = $ac_status" >&5
+  echo "$as_me:13715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13410,7 +13724,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13413 "configure"
+#line 13727 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13428,16 +13742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13434: \$? = $ac_status" >&5
+  echo "$as_me:13748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13440: \$? = $ac_status" >&5
+  echo "$as_me:13754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13452,7 +13766,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13455: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13769: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13612,16 +13926,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13615: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13929: 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}:13621: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13935: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13624 "configure"
+#line 13938 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13636,16 +13950,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13642: \$? = $ac_status" >&5
+  echo "$as_me:13956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:13962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13666,7 +13980,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13669 "configure"
+#line 13983 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13681,16 +13995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13687: \$? = $ac_status" >&5
+  echo "$as_me:14001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13693: \$? = $ac_status" >&5
+  echo "$as_me:14007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13701,7 +14015,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14018: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13709,10 +14023,10 @@ echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13712: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14026: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13715 "configure"
+#line 14029 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13727,16 +14041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13733: \$? = $ac_status" >&5
+  echo "$as_me:14047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13739: \$? = $ac_status" >&5
+  echo "$as_me:14053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13752,7 +14066,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13755: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14069: 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
@@ -13865,10 +14179,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:13868: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14182: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13871 "configure"
+#line 14185 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13886,23 +14200,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13892: \$? = $ac_status" >&5
+  echo "$as_me:14206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13898: \$? = $ac_status" >&5
+  echo "$as_me:14212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:13905: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14219: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -13925,7 +14239,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13928: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14242: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -13937,7 +14251,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:13940: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14254: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14025,7 +14339,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14028: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14342: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14035,7 +14349,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14038: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14352: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14045,7 +14359,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14048: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14362: 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"
@@ -14057,10 +14371,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14060: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14374: 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 14063 "configure"
+#line 14377 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14075,16 +14389,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14081: \$? = $ac_status" >&5
+  echo "$as_me:14395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14093,12 +14407,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14096: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14410: 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 14101 "configure"
+#line 14415 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14113,16 +14427,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14119: \$? = $ac_status" >&5
+  echo "$as_me:14433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14133,19 +14447,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14136: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14450: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14141: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14455: 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 14148 "configure"
+#line 14462 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14163,16 +14477,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14169: \$? = $ac_status" >&5
+  echo "$as_me:14483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14175: \$? = $ac_status" >&5
+  echo "$as_me:14489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14184,7 +14498,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14187 "configure"
+#line 14501 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14202,16 +14516,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14208: \$? = $ac_status" >&5
+  echo "$as_me:14522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14214: \$? = $ac_status" >&5
+  echo "$as_me:14528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14226,7 +14540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14229: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14543: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14373,13 +14687,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14376: checking for ANSI C header files" >&5
+echo "$as_me:14690: 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 14382 "configure"
+#line 14696 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14387,13 +14701,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14704: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14396: \$? = $ac_status" >&5
+  echo "$as_me:14710: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14415,7 +14729,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14418 "configure"
+#line 14732 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14433,7 +14747,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14436 "configure"
+#line 14750 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14454,7 +14768,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14457 "configure"
+#line 14771 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14480,15 +14794,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14486: \$? = $ac_status" >&5
+  echo "$as_me:14800: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14491: \$? = $ac_status" >&5
+  echo "$as_me:14805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14501,7 +14815,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14504: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14818: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14517,28 +14831,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14520: checking for $ac_header" >&5
+echo "$as_me:14834: 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 14526 "configure"
+#line 14840 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14535: \$? = $ac_status" >&5
+  echo "$as_me:14849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14541: \$? = $ac_status" >&5
+  echo "$as_me:14855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14548,7 +14862,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14551: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14865: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14558,13 +14872,13 @@ EOF
 fi
 done
 
-echo "$as_me:14561: checking whether exit is declared" >&5
+echo "$as_me:14875: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14567 "configure"
+#line 14881 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14579,16 +14893,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14585: \$? = $ac_status" >&5
+  echo "$as_me:14899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14591: \$? = $ac_status" >&5
+  echo "$as_me:14905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14598,7 +14912,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14601: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:14915: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14608,7 +14922,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14611: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14925: 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
@@ -14620,7 +14934,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14623 "configure"
+#line 14937 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14640,16 +14954,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14646: \$? = $ac_status" >&5
+  echo "$as_me:14960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14652: \$? = $ac_status" >&5
+  echo "$as_me:14966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14659,16 +14973,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14665: \$? = $ac_status" >&5
+  echo "$as_me:14979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14671: \$? = $ac_status" >&5
+  echo "$as_me:14985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14682,13 +14996,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14685: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14999: 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:14691: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15005: 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
@@ -14696,7 +15010,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14699 "configure"
+#line 15013 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14716,16 +15030,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14722: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14728: \$? = $ac_status" >&5
+  echo "$as_me:15042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14734,7 +15048,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14737 "configure"
+#line 15051 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14755,16 +15069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14761: \$? = $ac_status" >&5
+  echo "$as_me:15075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14767: \$? = $ac_status" >&5
+  echo "$as_me:15081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14775,7 +15089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14778: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15092: 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
 
@@ -14785,7 +15099,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14788: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15102: 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
@@ -14793,7 +15107,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14796 "configure"
+#line 15110 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14813,16 +15127,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14819: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14825: \$? = $ac_status" >&5
+  echo "$as_me:15139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14831,7 +15145,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14834 "configure"
+#line 15148 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14852,16 +15166,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14858: \$? = $ac_status" >&5
+  echo "$as_me:15172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14864: \$? = $ac_status" >&5
+  echo "$as_me:15178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14872,7 +15186,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14875: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15189: 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
 
@@ -14885,7 +15199,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14888: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15202: 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
@@ -14893,7 +15207,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14896 "configure"
+#line 15210 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14908,16 +15222,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15225: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14914: \$? = $ac_status" >&5
+  echo "$as_me:15228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14920: \$? = $ac_status" >&5
+  echo "$as_me:15234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14926,7 +15240,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14929 "configure"
+#line 15243 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14942,16 +15256,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14948: \$? = $ac_status" >&5
+  echo "$as_me:15262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14954: \$? = $ac_status" >&5
+  echo "$as_me:15268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14962,7 +15276,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14965: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15279: 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
 
@@ -14976,13 +15290,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14979: checking for fseeko" >&5
+echo "$as_me:15293: 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 14985 "configure"
+#line 15299 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14996,16 +15310,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15002: \$? = $ac_status" >&5
+  echo "$as_me:15316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15008: \$? = $ac_status" >&5
+  echo "$as_me:15322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15015,7 +15329,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15332: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15054,14 +15368,14 @@ fi
 
 	fi
 
-	echo "$as_me:15057: checking whether to use struct dirent64" >&5
+	echo "$as_me:15371: 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 15064 "configure"
+#line 15378 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15088,16 +15402,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15094: \$? = $ac_status" >&5
+  echo "$as_me:15408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15100: \$? = $ac_status" >&5
+  echo "$as_me:15414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15108,7 +15422,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15425: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15118,7 +15432,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15121: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15435: 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.
@@ -15128,7 +15442,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15131: result: $with_rcs_ids" >&5
+echo "$as_me:15445: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15138,7 +15452,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15141: checking if you want to build with function extensions" >&5
+echo "$as_me:15455: 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.
@@ -15148,7 +15462,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15151: result: $with_ext_funcs" >&5
+echo "$as_me:15465: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15166,7 +15480,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15169: checking for extended use of const keyword" >&5
+echo "$as_me:15483: 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.
@@ -15176,7 +15490,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15179: result: $with_ext_const" >&5
+echo "$as_me:15493: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15186,7 +15500,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15189: checking if you want all development code" >&5
+echo "$as_me:15503: 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.
@@ -15196,7 +15510,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15199: result: $with_develop" >&5
+echo "$as_me:15513: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15205,7 +15519,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15208: checking if you want to link with the pthread library" >&5
+echo "$as_me:15522: 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.
@@ -15215,27 +15529,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15218: result: $with_pthread" >&5
+echo "$as_me:15532: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15222: checking for pthread.h" >&5
+	echo "$as_me:15536: 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 15228 "configure"
+#line 15542 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15232: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15546: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15238: \$? = $ac_status" >&5
+  echo "$as_me:15552: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15254,7 +15568,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15257: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15571: 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
 
@@ -15264,7 +15578,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15267: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15581: 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"
 
@@ -15285,7 +15599,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15288 "configure"
+#line 15602 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15302,16 +15616,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15308: \$? = $ac_status" >&5
+  echo "$as_me:15622: \$? = $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:15625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15314: \$? = $ac_status" >&5
+  echo "$as_me:15628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15321,7 +15635,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15324: result: $with_pthread" >&5
+	    echo "$as_me:15638: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15349,7 +15663,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15352: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15666: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15358,7 +15672,7 @@ fi
 
 fi
 
-echo "$as_me:15361: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15675: 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.
@@ -15368,18 +15682,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15371: result: $use_weak_symbols" >&5
+echo "$as_me:15685: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15375: checking if $CC supports weak symbols" >&5
+echo "$as_me:15689: 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 15382 "configure"
+#line 15696 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15405,16 +15719,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15411: \$? = $ac_status" >&5
+  echo "$as_me:15725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15417: \$? = $ac_status" >&5
+  echo "$as_me:15731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15425,7 +15739,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15742: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15454,13 +15768,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15457: checking for _nc_TABSIZE" >&5
+echo "$as_me:15771: 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 15463 "configure"
+#line 15777 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15491,16 +15805,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15497: \$? = $ac_status" >&5
+  echo "$as_me:15811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15503: \$? = $ac_status" >&5
+  echo "$as_me:15817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15510,7 +15824,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15513: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15827: 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
@@ -15522,7 +15836,7 @@ fi
 # 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:15525: checking if you want experimental reentrant code" >&5
+echo "$as_me:15839: 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.
@@ -15532,7 +15846,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15535: result: $with_reentrant" >&5
+echo "$as_me:15849: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15555,7 +15869,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15558: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15872: 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.
@@ -15565,7 +15879,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15882: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15579,7 +15893,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15582: checking if you want to see long compiling messages" >&5
+echo "$as_me:15896: 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.
@@ -15613,10 +15927,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15616: result: $enableval" >&5
+echo "$as_me:15930: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15933: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15633,17 +15947,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15636: result: $enable_stdnoreturn" >&5
+echo "$as_me:15950: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15640: checking for C11 _Noreturn feature" >&5
+echo "$as_me:15954: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15646 "configure"
+#line 15960 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15659,16 +15973,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15665: \$? = $ac_status" >&5
+  echo "$as_me:15979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15671: \$? = $ac_status" >&5
+  echo "$as_me:15985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -15679,7 +15993,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:15996: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -15735,16 +16049,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16052: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16057: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16061: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15783,16 +16097,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16100: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16105: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16109: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -15831,23 +16145,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16148: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16153: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16157: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:15850: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16164: 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.
@@ -15864,7 +16178,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:15867: result: $enable_warnings" >&5
+echo "$as_me:16181: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -15888,7 +16202,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15891 "configure"
+#line 16205 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15903,26 +16217,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15909: \$? = $ac_status" >&5
+  echo "$as_me:16223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15915: \$? = $ac_status" >&5
+  echo "$as_me:16229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:15918: checking for X11/Xt const-feature" >&5
+echo "$as_me:16232: 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 15925 "configure"
+#line 16239 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -15940,16 +16254,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15946: \$? = $ac_status" >&5
+  echo "$as_me:16260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15952: \$? = $ac_status" >&5
+  echo "$as_me:16266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -15964,7 +16278,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15967: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16281: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -15993,7 +16307,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 15996 "${as_me:-configure}"
+#line 16310 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16009,7 +16323,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16012: checking for $CC warning options..." >&5
+	{ echo "$as_me:16326: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16025,12 +16339,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16031: \$? = $ac_status" >&5
+  echo "$as_me:16345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16347: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16038,7 +16352,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16041: checking for $CC warning options..." >&5
+	{ echo "$as_me:16355: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16061,12 +16375,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16064: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16067: \$? = $ac_status" >&5
+  echo "$as_me:16381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16383: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16074,7 +16388,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16391: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16084,7 +16398,7 @@ echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16401: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16117,10 +16431,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16120: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16434: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16123 "${as_me:-configure}"
+#line 16437 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16170,12 +16484,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16176: \$? = $ac_status" >&5
+  echo "$as_me:16490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16492: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16243,7 +16557,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16246: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16560: 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.
@@ -16253,7 +16567,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16256: result: $with_assertions" >&5
+echo "$as_me:16570: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16306,7 +16620,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16309: checking whether to add trace feature to all models" >&5
+echo "$as_me:16623: 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.
@@ -16316,7 +16630,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16319: result: $cf_with_trace" >&5
+echo "$as_me:16633: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16424,7 +16738,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16427: checking if we want to use GNAT projects" >&5
+echo "$as_me:16741: 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.
@@ -16441,21 +16755,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16444: result: $enable_gnat_projects" >&5
+echo "$as_me:16758: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16451: checking if ssp library is needed" >&5
+echo "$as_me:16765: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16458 "configure"
+#line 16772 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16472,16 +16786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16478: \$? = $ac_status" >&5
+  echo "$as_me:16792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16484: \$? = $ac_status" >&5
+  echo "$as_me:16798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16491,7 +16805,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16494 "configure"
+#line 16808 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16508,16 +16822,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16514: \$? = $ac_status" >&5
+  echo "$as_me:16828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16520: \$? = $ac_status" >&5
+  echo "$as_me:16834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16531,7 +16845,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16534: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16558,36 +16872,162 @@ fi
 	;;
 (*)
 
-echo "$as_me:16561: checking for clock_gettime" >&5
+cf_save_libs="$LIBS"
+echo "$as_me:16876: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+if test "${ac_cv_func_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16882 "configure"
+#include "confdefs.h"
+#define clock_gettime autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef clock_gettime
+
+#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 clock_gettime (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_clock_gettime) || defined (__stub___clock_gettime)
+#error found stub for clock_gettime
+#endif
+
+	return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:16916: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:16922: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+if test "$ac_cv_func_clock_gettime" = yes; then
+  cf_cv_test_clock_gettime=yes
+else
+  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
+echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16945 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char clock_gettime (void);
+int
+main (void)
+{
+clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:16967: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:16973: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_rt_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+  LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes
+else
+  cf_cv_test_clock_gettime=no
+fi
+
+fi
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+echo "$as_me:16996: checking if clock_gettime links" >&5
+echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16568 "configure"
+#line 17003 "configure"
 #include "confdefs.h"
+
+$ac_includes_default
 #include <time.h>
+
 int
 main (void)
 {
 struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16584: \$? = $ac_status" >&5
+  echo "$as_me:17024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16590: \$? = $ac_status" >&5
+  echo "$as_me:17030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16598,8 +17038,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
@@ -16609,13 +17052,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:16612: checking for gettimeofday" >&5
+echo "$as_me:17055: 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 16618 "configure"
+#line 17061 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16646,16 +17089,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16652: \$? = $ac_status" >&5
+  echo "$as_me:17095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16658: \$? = $ac_status" >&5
+  echo "$as_me:17101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -16665,7 +17108,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -16675,7 +17118,7 @@ EOF
 
 else
 
-echo "$as_me:16678: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17121: 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
@@ -16683,7 +17126,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16686 "configure"
+#line 17129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16702,16 +17145,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16708: \$? = $ac_status" >&5
+  echo "$as_me:17151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16714: \$? = $ac_status" >&5
+  echo "$as_me:17157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -16722,7 +17165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16725: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17168: 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
 
@@ -16755,13 +17198,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:16758: checking for signed char" >&5
+echo "$as_me:17201: 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 16764 "configure"
+#line 17207 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16776,16 +17219,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16782: \$? = $ac_status" >&5
+  echo "$as_me:17225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16788: \$? = $ac_status" >&5
+  echo "$as_me:17231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -16795,10 +17238,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:16801: checking size of signed char" >&5
+echo "$as_me:17244: 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
@@ -16807,7 +17250,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16810 "configure"
+#line 17253 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16819,21 +17262,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16825: \$? = $ac_status" >&5
+  echo "$as_me:17268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16831: \$? = $ac_status" >&5
+  echo "$as_me:17274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16836 "configure"
+#line 17279 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16845,16 +17288,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16851: \$? = $ac_status" >&5
+  echo "$as_me:17294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16857: \$? = $ac_status" >&5
+  echo "$as_me:17300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -16870,7 +17313,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16873 "configure"
+#line 17316 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16882,16 +17325,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16888: \$? = $ac_status" >&5
+  echo "$as_me:17331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16894: \$? = $ac_status" >&5
+  echo "$as_me:17337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -16907,7 +17350,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16910 "configure"
+#line 17353 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16919,16 +17362,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16925: \$? = $ac_status" >&5
+  echo "$as_me:17368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16931: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -16941,12 +17384,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16944: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17387: 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 16949 "configure"
+#line 17392 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -16962,15 +17405,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16968: \$? = $ac_status" >&5
+  echo "$as_me:17411: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16973: \$? = $ac_status" >&5
+  echo "$as_me:17416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -16986,7 +17429,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -16995,13 +17438,13 @@ EOF
 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:16998: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17441: 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 17004 "configure"
+#line 17447 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17016,16 +17459,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17022: \$? = $ac_status" >&5
+  echo "$as_me:17465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17028: \$? = $ac_status" >&5
+  echo "$as_me:17471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17035,7 +17478,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17038: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17048,7 +17491,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17051: checking for opendir in -ldir" >&5
+  echo "$as_me:17494: 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
@@ -17056,7 +17499,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17059 "configure"
+#line 17502 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17075,16 +17518,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17081: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17087: \$? = $ac_status" >&5
+  echo "$as_me:17530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17095,14 +17538,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17098: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17541: 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:17105: checking for opendir in -lx" >&5
+  echo "$as_me:17548: 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
@@ -17110,7 +17553,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17113 "configure"
+#line 17556 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17129,16 +17572,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17135: \$? = $ac_status" >&5
+  echo "$as_me:17578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17141: \$? = $ac_status" >&5
+  echo "$as_me:17584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17149,7 +17592,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17152: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17595: 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"
@@ -17157,13 +17600,13 @@ fi
 
 fi
 
-echo "$as_me:17160: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17603: 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 17166 "configure"
+#line 17609 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17179,16 +17622,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17185: \$? = $ac_status" >&5
+  echo "$as_me:17628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17191: \$? = $ac_status" >&5
+  echo "$as_me:17634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17198,7 +17641,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17201: result: $ac_cv_header_time" >&5
+echo "$as_me:17644: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17216,13 +17659,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17219: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17662: 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 17225 "configure"
+#line 17668 "configure"
 #include "confdefs.h"
 
 int
@@ -17284,16 +17727,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17290: \$? = $ac_status" >&5
+  echo "$as_me:17733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17296: \$? = $ac_status" >&5
+  echo "$as_me:17739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17303,7 +17746,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17306: result: $ac_cv_c_const" >&5
+echo "$as_me:17749: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17315,7 +17758,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17318: checking if data-only library module links" >&5
+echo "$as_me:17761: 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
@@ -17323,20 +17766,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17326 "configure"
+#line 17769 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17332: \$? = $ac_status" >&5
+  echo "$as_me:17775: \$? = $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 <<EOF
-#line 17339 "configure"
+#line 17782 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17353,10 +17796,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17356: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17359: \$? = $ac_status" >&5
+  echo "$as_me:17802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17369,7 +17812,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17372 "configure"
+#line 17815 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17380,15 +17823,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17386: \$? = $ac_status" >&5
+  echo "$as_me:17829: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17391: \$? = $ac_status" >&5
+  echo "$as_me:17834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17403,7 +17846,7 @@ fi
 
 fi
 
-echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17422,23 +17865,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17425: checking for $ac_header" >&5
+echo "$as_me:17868: 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 17431 "configure"
+#line 17874 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17435: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17441: \$? = $ac_status" >&5
+  echo "$as_me:17884: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17457,7 +17900,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17460: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17467,7 +17910,7 @@ EOF
 fi
 done
 
-echo "$as_me:17470: checking for working mkstemp" >&5
+echo "$as_me:17913: 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
@@ -17478,7 +17921,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17481 "configure"
+#line 17924 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17513,15 +17956,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17519: \$? = $ac_status" >&5
+  echo "$as_me:17962: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17524: \$? = $ac_status" >&5
+  echo "$as_me:17967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17536,16 +17979,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17539: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17982: 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:17542: checking for mkstemp" >&5
+	echo "$as_me:17985: 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 17548 "configure"
+#line 17991 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17576,16 +18019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17582: \$? = $ac_status" >&5
+  echo "$as_me:18025: \$? = $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:18028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17588: \$? = $ac_status" >&5
+  echo "$as_me:18031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17595,7 +18038,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -17614,237 +18057,9 @@ fi
 
 cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
-
-for cf_prog_gnat in gnat gnatmake gprconfig gprbuild
-do
-
-cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
-	unset ac_cv_path_cf_TEMP_gnat
-	unset cf_TEMP_gnat
-	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
-set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:17627: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $cf_TEMP_gnat in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path.
-  ;;
-  *)
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-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_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:17644: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
-  test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no"
-  ;;
-esac
-fi
-cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
-
-if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:17656: result: $cf_TEMP_gnat" >&5
-echo "${ECHO_T}$cf_TEMP_gnat" >&6
-else
-  echo "$as_me:17659: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-	eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"
-
-	if test "x$cf_TEMP_gnat" != xno; then
-		unset cf_cv_gnat_version
-		unset cf_TEMP_gnat
-
-echo "$as_me:17669: checking for $cf_prog_gnat version" >&5
-echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
-if test "${cf_cv_gnat_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
-	grep '[0-9].[0-9][0-9]*' |\
-	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-
-fi
-echo "$as_me:17680: result: $cf_cv_gnat_version" >&5
-echo "${ECHO_T}$cf_cv_gnat_version" >&6
-test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
-eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
-
-	fi
-	eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"
-
-	unset cf_TEMP_gnat
-	unset cf_cv_gnat_version
-	unset ac_cv_path_cf_TEMP_gnat
-done
-
-if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then
-	cf_ada_make=
-	cf_cv_prog_gnat_correct=no
-else
-	cf_ada_make=gnatmake
-	if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then
-		# gprconfig is newer than gnatmake; we can continue...
-		cf_ada_config="##"
-	else
-		rm -rf ./conftest* ./*~conftest*
-		if mkdir conftest.src
-		then
-			cf_ada_config=""
-			cd conftest.src
-			for cf_gprconfig in Ada C
-			do
-				echo "$as_me:17709: 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
-					for cf_gprconfig_param in \
-						"$cf_gprconfig,,,,GNATGCC" \
-						"$cf_gprconfig,,,,GCC" \
-						"$cf_gprconfig"
-					do
-						cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
-						test -n "$cf_gprconfig_value" && break
-					done
-				else
-					cf_gprconfig_param=$cf_gprconfig
-					cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
-				fi
-				if test -n "$cf_gprconfig_value"
-				then
-					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:17728: result: $cf_gprconfig_value" >&5
-echo "${ECHO_T}$cf_gprconfig_value" >&6
-				else
-					echo "$as_me:17731: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-					cf_ada_config="#"
-					break
-				fi
-			done
-			cd ..
-			rm -rf ./conftest* ./*~conftest*
-		fi
-	fi
-	if test "x$cf_ada_config" != "x#"
-	then
-
-echo "$as_me:17744: checking for gnat version" >&5
-echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
-if test "${cf_cv_gnat_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
-	grep '[0-9].[0-9][0-9]*' |\
-	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-
-fi
-echo "$as_me:17755: result: $cf_cv_gnat_version" >&5
-echo "${ECHO_T}$cf_cv_gnat_version" >&6
-test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
-
-case "$cf_cv_gnat_version" in
-(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
-	cf_cv_prog_gnat_correct=yes
-	;;
-(*)
-	{ echo "$as_me:17764: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
-	cf_cv_prog_gnat_correct=no
-	;;
-esac
-
-		# Extract the first word of "m4", so it can be a program name with args.
-set dummy m4; ac_word=$2
-echo "$as_me:17772: 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
-else
-  if test -n "$M4_exists"; then
-  ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test.
-else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_M4_exists="yes"
-echo "$as_me:17787: found $ac_dir/$ac_word" >&5
-break
-done
-
-  test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no"
-fi
-fi
-M4_exists=$ac_cv_prog_M4_exists
-if test -n "$M4_exists"; then
-  echo "$as_me:17796: result: $M4_exists" >&5
-echo "${ECHO_T}$M4_exists" >&6
-else
-  echo "$as_me:17799: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-		if test "$ac_cv_prog_M4_exists" = no; then
-			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:17805: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
-echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
-		fi
-		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:17809: checking if GNAT works" >&5
-echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
-
-rm -rf ./conftest* ./*~conftest*
-cat >>conftest.ads <<CF_EOF
-procedure conftest;
-CF_EOF
-cat >>conftest.adb <<CF_EOF
-with Text_IO;
-with GNAT.OS_Lib;
-procedure conftest is
-begin
-   Text_IO.Put ("Hello World");
-   Text_IO.New_Line;
-   GNAT.OS_Lib.OS_Exit (0);
-end conftest;
-CF_EOF
-if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then
-   if ( ./conftest 1>&5 2>&1 ) ; then
-      cf_cv_prog_gnat_correct=yes
-   else
-      cf_cv_prog_gnat_correct=no
-   fi
-else
-   cf_cv_prog_gnat_correct=no
-fi
-rm -rf ./conftest* ./*~conftest*
-
-			echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5
-echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
-		fi
-	else
-		cf_cv_prog_gnat_correct=no
-	fi
-fi
-
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -17861,10 +18076,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:17864: result: $ADAFLAGS" >&5
+	echo "$as_me:18079: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:17867: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18082: 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
@@ -17874,11 +18089,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:17877: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18092: 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:17881: checking if GNAT supports generics" >&5
+echo "$as_me:18096: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -17888,7 +18103,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:17891: result: $cf_gnat_generics" >&5
+echo "$as_me:18106: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -17900,7 +18115,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:17903: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18118: 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
@@ -17948,7 +18163,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -17961,7 +18176,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:17964: checking if GNAT supports project files" >&5
+echo "$as_me:18179: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18024,15 +18239,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18027: result: $cf_gnat_projects" >&5
+echo "$as_me:18242: 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:18033: checking if GNAT supports libraries" >&5
+	echo "$as_me:18248: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18035: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18052,7 +18267,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18064,7 +18279,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18067: checking for Ada95 compiler" >&5
+echo "$as_me:18282: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18075,12 +18290,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18078: result: $cf_ada_compiler" >&5
+echo "$as_me:18293: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18083: checking for Ada95 include directory" >&5
+echo "$as_me:18298: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18116,7 +18331,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18334: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18125,10 +18340,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18128: result: $ADA_INCLUDE" >&5
+echo "$as_me:18343: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18131: checking for Ada95 object directory" >&5
+echo "$as_me:18346: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18164,7 +18379,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18382: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18173,10 +18388,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18176: result: $ADA_OBJECTS" >&5
+echo "$as_me:18391: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18394: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18197,11 +18412,11 @@ then
 	fi
 fi
 
-echo "$as_me:18200: result: $with_ada_sharedlib" >&5
+echo "$as_me:18415: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18419: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18219,7 +18434,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18222: checking for Ada95 curses library name" >&5
+echo "$as_me:18437: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18235,16 +18450,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18238: result: $ADA_LIBNAME" >&5
+echo "$as_me:18453: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18242: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18457: 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:18247: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18462: 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
@@ -18284,7 +18499,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18287: checking default library suffix" >&5
+echo "$as_me:18502: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18295,10 +18510,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18513: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18301: checking default library-dependency suffix" >&5
+echo "$as_me:18516: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18381,10 +18596,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18384: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18599: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18387: checking default object directory" >&5
+echo "$as_me:18602: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18400,7 +18615,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18618: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18542,7 +18757,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18545: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18760: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18723,7 +18938,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18726: error: ambiguous option: $1
+    { { echo "$as_me:18941: 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;}
@@ -18742,7 +18957,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18745: error: unrecognized option: $1
+  -*) { { echo "$as_me:18960: 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;}
@@ -18817,7 +19032,7 @@ do
   "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:18820: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19035: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -18917,6 +19132,13 @@ s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@GREP@,$GREP,;t t
 s,@FGREP@,$FGREP,;t t
+s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t
+s,@M4_exists@,$M4_exists,;t t
+s,@cf_ada_make@,$cf_ada_make,;t t
+s,@cf_ada_config@,$cf_ada_config,;t t
+s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t
+s,@cf_ada_config_C@,$cf_ada_config_C,;t t
+s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -19007,12 +19229,6 @@ s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t
 s,@STDC_NORETURN@,$STDC_NORETURN,;t t
 s,@ADAFLAGS@,$ADAFLAGS,;t t
 s,@ADA_TRACE@,$ADA_TRACE,;t t
-s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t
-s,@M4_exists@,$M4_exists,;t t
-s,@cf_ada_make@,$cf_ada_make,;t t
-s,@cf_ada_config@,$cf_ada_config,;t t
-s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t
-s,@cf_ada_config_C@,$cf_ada_config_C,;t t
 s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t
 s,@cf_compile_generics@,$cf_compile_generics,;t t
 s,@cf_generic_objects@,$cf_generic_objects,;t t
@@ -19178,7 +19394,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19181: creating $ac_file" >&5
+    { echo "$as_me:19397: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19196,7 +19412,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19415: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19209,7 +19425,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19212: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19428: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19225,7 +19441,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19228: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19444: 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;}
@@ -19234,7 +19450,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19237: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19453: 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;}
@@ -19279,7 +19495,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19282: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19498: 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;}
@@ -19290,7 +19506,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19293: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19509: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19339,7 +19555,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19342: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19558: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19350,7 +19566,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19569: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19363,7 +19579,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19366: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19582: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19421,7 +19637,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19424: $ac_file is unchanged" >&5
+      { echo "$as_me:19640: $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/Ada95/configure.in b/Ada95/configure.in
index 3384df245..0e523d04e 100644
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: configure.in,v 1.91 2023/02/18 23:21:29 tom Exp $
+dnl $Id: configure.in,v 1.92 2024/05/18 14:31:03 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)
-AC_REVISION($Revision: 1.91 $)
+AC_REVISION($Revision: 1.92 $)
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -59,7 +59,7 @@ cf_user_CFLAGS="$CFLAGS"
 CF_CFG_DEFAULTS
 
 ###	Checks for programs.
-CF_PROG_CC(gnatgcc gcc cc)
+CF_WITH_ADA
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS])
@@ -455,7 +455,6 @@ cf_with_ada=yes
 dnl Check for availability of GNU Ada Translator (GNAT).
 dnl At the moment we support no other Ada95 compiler.
 if test "$cf_with_ada" != "no" ; then
-	CF_PROG_GNAT
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 		CF_FIXUP_ADAFLAGS
 
diff --git a/NEWS b/NEWS
index 99f97ee0e..4c3a229c2 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4119 2024/05/11 21:38:14 tom Exp $
+-- $Id: NEWS,v 1.4123 2024/05/18 21:35:34 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240518
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use
+	  of CFLAGS/CPPFLAGS.
+	+ improve check for clock_gettime(), from xterm.
+	+ modify configure script to work around broken gnatgcc script found in
+	  gcc-13 builds.
+
 20240511
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ limit value from ESCDELAY environment variable to 30 seconds, like
diff --git a/VERSION b/VERSION
index 2e2f7c02f..ef00a32b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240511
+5:0:10	6.5	20240518
diff --git a/aclocal.m4 b/aclocal.m4
index 1c2b788bf..003bb308e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1069 2024/03/30 22:15:45 tom Exp $
+dnl $Id: aclocal.m4,v 1.1071 2024/05/18 19:49:14 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -741,7 +741,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08
+dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -841,9 +841,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='${LIBS}'}
+	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
@@ -2623,19 +2623,36 @@ else
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56
+dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02
 dnl ---------------
 dnl Check for gettimeofday or clock_gettime.  In 2023, the former is still more
 dnl widely supported, but "deprecated" (2008), so we will use the latter if it
 dnl is available, to reduce compiler warnings.
 AC_DEFUN([CF_FUNC_GETTIME],[
-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[
-		AC_TRY_LINK([#include <time.h>],
+cf_save_libs="$LIBS"
+AC_CHECK_FUNC(clock_gettime,
+	cf_cv_test_clock_gettime=yes,
+	AC_CHECK_LIB(rt, clock_gettime,
+		[LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes],
+		 cf_cv_test_clock_gettime=no))
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[
+		AC_TRY_LINK([
+$ac_includes_default
+#include <time.h>
+		],
 		[struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts],
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts],
 		[cf_cv_func_clock_gettime=yes],
 		[cf_cv_func_clock_gettime=no])
 ])
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
@@ -9001,6 +9018,56 @@ $1_ABI=$cf_cv_abi_version
 cf_cv_abi_default=$cf_cv_abi_version
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
+dnl -----------
+dnl Check for the Ada compiler (unless requested to not do this), which causes
+dnl a further check for a C compiler which can work with the Ada compiler.
+AC_DEFUN([CF_WITH_ADA],[
+AC_ARG_WITH(ada,
+	[  --without-ada           suppress check for Ada compiler],
+	[cf_with_ada=$withval],
+	[cf_with_ada=yes])
+
+cf_prog_cc="gcc cc"
+if test "x$cf_with_ada" = xyes
+then
+	CF_PROG_GNAT
+	if test	"x$cf_cv_prog_gnat_correct" = xyes; then
+		# gcc's developers chose to deprecate gnatgcc before making gprconfig
+		# work.  They replaced gnatgcc in gcc 13 with a script which spits out
+		# a warning offering advice which could never work.
+		#
+		# Here is a workaround.
+		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
+		if test "$cf_cv_path_gnatgcc" != no
+		then
+			AC_MSG_CHECKING(for improvement) 
+			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+			case "x$cf_file_gnatgcc" in
+			(*script*)
+				cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ 	]]*+[[ 	]]*//' -e 's/exec[[ 	]]//' -e 's/ .*//'`
+				;;
+			(*)
+				cf_cv_path_gnatgcc=no
+				;;
+			esac
+			AC_MSG_RESULT($cf_cv_path_gnatgcc)
+			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+		fi
+	fi
+fi
+case "$cf_prog_cc" in
+(*/*)
+	CC="$cf_prog_cc"
+	AC_SUBST(CC)
+	;;
+(*)
+	CF_PROG_CC($cf_prog_cc)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
 dnl --------------------
 dnl Command-line option to specify the Ada95 compiler.
diff --git a/configure b/configure
index 488d93fc1..d0884171f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.779 .
+# From configure.in Revision: 1.781 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -717,7 +717,7 @@ Optional Features:
   --with-abi-version=XXX  override derived ABI version
   --with-system-type=XXX  test: override derived host system-type
   --with-abi-altered=XXX  override visible ABI version, for packaging
-  --without-ada           suppress check for Ada compiler, don't build demo
+  --without-ada           suppress check for Ada compiler
   --without-cxx           do not adjust ncurses bool to match C++
   --without-cxx-binding   do not build C++ binding and demo
   --disable-db-install    suppress install of terminal database
@@ -1818,12 +1818,307 @@ else
   cf_with_ada=yes
 fi;
 
+cf_prog_cc="gcc cc"
 if test "x$cf_with_ada" = xyes
 then
-	cf_prog_cc="gnatgcc gcc cc"
+
+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild
+do
+
+cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+	unset ac_cv_path_cf_TEMP_gnat
+	unset cf_TEMP_gnat
+	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+set dummy $cf_prog_gnat; ac_word=$2
+echo "$as_me:1834: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $cf_TEMP_gnat in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+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_cf_TEMP_gnat="$ac_dir/$ac_word"
+   echo "$as_me:1851: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no"
+  ;;
+esac
+fi
+cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+if test -n "$cf_TEMP_gnat"; then
+  echo "$as_me:1863: result: $cf_TEMP_gnat" >&5
+echo "${ECHO_T}$cf_TEMP_gnat" >&6
+else
+  echo "$as_me:1866: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"
+
+	if test "x$cf_TEMP_gnat" != xno; then
+		unset cf_cv_gnat_version
+		unset cf_TEMP_gnat
+
+echo "$as_me:1876: checking for $cf_prog_gnat version" >&5
+echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+if test "${cf_cv_gnat_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
+	grep '[0-9].[0-9][0-9]*' |\
+	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+fi
+echo "$as_me:1887: result: $cf_cv_gnat_version" >&5
+echo "${ECHO_T}$cf_cv_gnat_version" >&6
+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+
+	fi
+	eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"
+
+	unset cf_TEMP_gnat
+	unset cf_cv_gnat_version
+	unset ac_cv_path_cf_TEMP_gnat
+done
+
+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then
+	cf_ada_make=
+	cf_cv_prog_gnat_correct=no
+else
+	cf_ada_make=gnatmake
+	if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then
+		# gprconfig is newer than gnatmake; we can continue...
+		cf_ada_config="##"
+	else
+		rm -rf ./conftest* ./*~conftest*
+		if mkdir conftest.src
+		then
+			cf_ada_config=""
+			cd conftest.src
+			for cf_gprconfig in Ada C
+			do
+				echo "$as_me:1916: 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
+					for cf_gprconfig_param in \
+						"$cf_gprconfig,,,,GNATGCC" \
+						"$cf_gprconfig,,,,GCC" \
+						"$cf_gprconfig"
+					do
+						cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
+						test -n "$cf_gprconfig_value" && break
+					done
+				else
+					cf_gprconfig_param=$cf_gprconfig
+					cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
+				fi
+				if test -n "$cf_gprconfig_value"
+				then
+					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+					echo "$as_me:1935: result: $cf_gprconfig_value" >&5
+echo "${ECHO_T}$cf_gprconfig_value" >&6
+				else
+					echo "$as_me:1938: result: missing" >&5
+echo "${ECHO_T}missing" >&6
+					cf_ada_config="#"
+					break
+				fi
+			done
+			cd ..
+			rm -rf ./conftest* ./*~conftest*
+		fi
+	fi
+	if test "x$cf_ada_config" != "x#"
+	then
+
+echo "$as_me:1951: checking for gnat version" >&5
+echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+if test "${cf_cv_gnat_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
+	grep '[0-9].[0-9][0-9]*' |\
+	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+fi
+echo "$as_me:1962: result: $cf_cv_gnat_version" >&5
+echo "${ECHO_T}$cf_cv_gnat_version" >&6
+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+
+case "$cf_cv_gnat_version" in
+(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+	cf_cv_prog_gnat_correct=yes
+	;;
+(*)
+	{ echo "$as_me:1971: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+	cf_cv_prog_gnat_correct=no
+	;;
+esac
+
+		# Extract the first word of "m4", so it can be a program name with args.
+set dummy m4; ac_word=$2
+echo "$as_me:1979: 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
+else
+  if test -n "$M4_exists"; then
+  ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_M4_exists="yes"
+echo "$as_me:1994: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no"
+fi
+fi
+M4_exists=$ac_cv_prog_M4_exists
+if test -n "$M4_exists"; then
+  echo "$as_me:2003: result: $M4_exists" >&5
+echo "${ECHO_T}$M4_exists" >&6
+else
+  echo "$as_me:2006: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test "$ac_cv_prog_M4_exists" = no; then
+			cf_cv_prog_gnat_correct=no
+			{ echo "$as_me:2012: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+		fi
+		if test "$cf_cv_prog_gnat_correct" = yes; then
+			echo "$as_me:2016: checking if GNAT works" >&5
+echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+rm -rf ./conftest* ./*~conftest*
+cat >>conftest.ads <<CF_EOF
+procedure conftest;
+CF_EOF
+cat >>conftest.adb <<CF_EOF
+with Text_IO;
+with GNAT.OS_Lib;
+procedure conftest is
+begin
+   Text_IO.Put ("Hello World");
+   Text_IO.New_Line;
+   GNAT.OS_Lib.OS_Exit (0);
+end conftest;
+CF_EOF
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+   if ( ./conftest 1>&5 2>&1 ) ; then
+      cf_cv_prog_gnat_correct=yes
+   else
+      cf_cv_prog_gnat_correct=no
+   fi
+else
+   cf_cv_prog_gnat_correct=no
+fi
+rm -rf ./conftest* ./*~conftest*
+
+			echo "$as_me:2044: result: $cf_cv_prog_gnat_correct" >&5
+echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+		fi
+	else
+		cf_cv_prog_gnat_correct=no
+	fi
+fi
+
+	if test	"x$cf_cv_prog_gnat_correct" = xyes; then
+		# gcc's developers chose to deprecate gnatgcc before making gprconfig
+		# work.  They replaced gnatgcc in gcc 13 with a script which spits out
+		# a warning offering advice which could never work.
+		#
+		# Here is a workaround.
+		# Extract the first word of "gnatgcc", so it can be a program name with args.
+set dummy gnatgcc; ac_word=$2
+echo "$as_me:2060: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $cf_cv_path_gnatgcc in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+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_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+   echo "$as_me:2077: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no"
+  ;;
+esac
+fi
+cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+if test -n "$cf_cv_path_gnatgcc"; then
+  echo "$as_me:2089: result: $cf_cv_path_gnatgcc" >&5
+echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-	cf_prog_cc="gcc cc"
+  echo "$as_me:2092: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test "$cf_cv_path_gnatgcc" != no
+		then
+			echo "$as_me:2098: checking for improvement" >&5
+echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+			case "x$cf_file_gnatgcc" in
+			(*script*)
+				cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ 	]*+[ 	]*//' -e 's/exec[ 	]//' -e 's/ .*//'`
+				;;
+			(*)
+				cf_cv_path_gnatgcc=no
+				;;
+			esac
+			echo "$as_me:2109: result: $cf_cv_path_gnatgcc" >&5
+echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+		fi
+	fi
 fi
+case "$cf_prog_cc" in
+(*/*)
+	CC="$cf_prog_cc"
+
+	;;
+(*)
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1836,7 +2131,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1839: checking for $ac_word" >&5
+echo "$as_me:2134: 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
@@ -1851,7 +2146,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1854: found $ac_dir/$ac_word" >&5
+echo "$as_me:2149: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1859,10 +2154,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1862: result: $CC" >&5
+  echo "$as_me:2157: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1865: result: no" >&5
+  echo "$as_me:2160: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1875,7 +2170,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1878: checking for $ac_word" >&5
+echo "$as_me:2173: 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
@@ -1890,7 +2185,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1893: found $ac_dir/$ac_word" >&5
+echo "$as_me:2188: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1898,10 +2193,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1901: result: $ac_ct_CC" >&5
+  echo "$as_me:2196: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1904: result: no" >&5
+  echo "$as_me:2199: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1911,32 +2206,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1914: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2209: 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:1919:" \
+echo "$as_me:2214:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1922: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2217: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1925: \$? = $ac_status" >&5
+  echo "$as_me:2220: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1927: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2222: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1930: \$? = $ac_status" >&5
+  echo "$as_me:2225: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1932: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2227: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1935: \$? = $ac_status" >&5
+  echo "$as_me:2230: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1939 "configure"
+#line 2234 "configure"
 #include "confdefs.h"
 
 int
@@ -1952,13 +2247,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1955: checking for C compiler default output" >&5
+echo "$as_me:2250: 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:1958: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2253: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1961: \$? = $ac_status" >&5
+  echo "$as_me:2256: \$? = $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
@@ -1981,34 +2276,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1984: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2279: 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:1990: result: $ac_file" >&5
+echo "$as_me:2285: 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:1995: checking whether the C compiler works" >&5
+echo "$as_me:2290: 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:2001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2004: \$? = $ac_status" >&5
+  echo "$as_me:2299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2011: error: cannot run C compiled programs.
+	{ { echo "$as_me:2306: 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;}
@@ -2016,24 +2311,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2019: result: yes" >&5
+echo "$as_me:2314: 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:2026: checking whether we are cross compiling" >&5
+echo "$as_me:2321: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2028: result: $cross_compiling" >&5
+echo "$as_me:2323: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2031: checking for executable suffix" >&5
+echo "$as_me:2326: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2036: \$? = $ac_status" >&5
+  echo "$as_me:2331: \$? = $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
@@ -2049,25 +2344,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2052: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2347: 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:2058: result: $ac_cv_exeext" >&5
+echo "$as_me:2353: 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:2064: checking for object suffix" >&5
+echo "$as_me:2359: 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 2070 "configure"
+#line 2365 "configure"
 #include "confdefs.h"
 
 int
@@ -2079,10 +2374,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2085: \$? = $ac_status" >&5
+  echo "$as_me:2380: \$? = $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
@@ -2094,24 +2389,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2097: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2392: 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:2104: result: $ac_cv_objext" >&5
+echo "$as_me:2399: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2108: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2403: 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 2114 "configure"
+#line 2409 "configure"
 #include "confdefs.h"
 
 int
@@ -2126,16 +2421,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2132: \$? = $ac_status" >&5
+  echo "$as_me:2427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2138: \$? = $ac_status" >&5
+  echo "$as_me:2433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2147,19 +2442,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2150: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2445: 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:2156: checking whether $CC accepts -g" >&5
+echo "$as_me:2451: 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 2162 "configure"
+#line 2457 "configure"
 #include "confdefs.h"
 
 int
@@ -2171,16 +2466,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2177: \$? = $ac_status" >&5
+  echo "$as_me:2472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2183: \$? = $ac_status" >&5
+  echo "$as_me:2478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2190,7 +2485,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2193: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2488: 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
@@ -2217,16 +2512,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2223: \$? = $ac_status" >&5
+  echo "$as_me:2518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2229: \$? = $ac_status" >&5
+  echo "$as_me:2524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2238,7 +2533,7 @@ if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2241 "configure"
+#line 2536 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2251,16 +2546,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2257: \$? = $ac_status" >&5
+  echo "$as_me:2552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2263: \$? = $ac_status" >&5
+  echo "$as_me:2558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2270,7 +2565,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2273 "configure"
+#line 2568 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2282,16 +2577,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2288: \$? = $ac_status" >&5
+  echo "$as_me:2583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2294: \$? = $ac_status" >&5
+  echo "$as_me:2589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2321,11 +2616,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2324: checking version of $CC" >&5
+	echo "$as_me:2619: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2328: result: $GCC_VERSION" >&5
+	echo "$as_me:2623: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2334,12 +2629,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2337: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2632: 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 2342 "configure"
+#line 2637 "configure"
 #include "confdefs.h"
 
 int
@@ -2356,16 +2651,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2362: \$? = $ac_status" >&5
+  echo "$as_me:2657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2368: \$? = $ac_status" >&5
+  echo "$as_me:2663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2376,7 +2671,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2379: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2674: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2385,11 +2680,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2388: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2683: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2392 "configure"
+#line 2687 "configure"
 #include "confdefs.h"
 
 int
@@ -2406,16 +2701,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2412: \$? = $ac_status" >&5
+  echo "$as_me:2707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2418: \$? = $ac_status" >&5
+  echo "$as_me:2713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2425,7 +2720,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2428: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2723: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2434,30 +2729,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2437: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2732: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2444: checking version of $CC" >&5
+	echo "$as_me:2739: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2448: result: $CLANG_VERSION" >&5
+	echo "$as_me:2743: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2455: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2750: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2460 "configure"
+#line 2755 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2471,16 +2766,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2477: \$? = $ac_status" >&5
+  echo "$as_me:2772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2483: \$? = $ac_status" >&5
+  echo "$as_me:2778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2491,13 +2786,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2494: result: $cf_clang_optok" >&5
+		echo "$as_me:2789: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2500: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2795: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2506,7 +2801,7 @@ echo "${as_me:-configure}:2500: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2509: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2804: 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
@@ -2514,7 +2809,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2517 "configure"
+#line 2812 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2561,16 +2856,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2567: \$? = $ac_status" >&5
+  echo "$as_me:2862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2573: \$? = $ac_status" >&5
+  echo "$as_me:2868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2587,10 +2882,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2590: result: none needed" >&5
+    echo "$as_me:2885: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2593: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2888: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2598,13 +2893,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2601: checking \$CFLAGS variable" >&5
+echo "$as_me:2896: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2605: result: broken" >&5
+	echo "$as_me:2900: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2607: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2902: 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=
@@ -2712,18 +3007,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2715: result: ok" >&5
+	echo "$as_me:3010: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2720: checking \$CC variable" >&5
+echo "$as_me:3015: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2724: result: broken" >&5
+	echo "$as_me:3019: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2726: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:3021: 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/[ ]*[ ]-[^ ].*//'`
@@ -2840,30 +3135,33 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2843: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:3138: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2847: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3142: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2851: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3146: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2855: result: ok" >&5
+	echo "$as_me:3150: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
+	;;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2866: checking how to run the C preprocessor" >&5
+echo "$as_me:3164: 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
@@ -2884,18 +3182,18 @@ do
   # 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 2887 "configure"
+#line 3185 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3190: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2898: \$? = $ac_status" >&5
+  echo "$as_me:3196: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2918,17 +3216,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2921 "configure"
+#line 3219 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2931: \$? = $ac_status" >&5
+  echo "$as_me:3229: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2965,7 +3263,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2968: result: $CPP" >&5
+echo "$as_me:3266: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2975,18 +3273,18 @@ do
   # 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 2978 "configure"
+#line 3276 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2989: \$? = $ac_status" >&5
+  echo "$as_me:3287: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3009,17 +3307,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3012 "configure"
+#line 3310 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3016: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3022: \$? = $ac_status" >&5
+  echo "$as_me:3320: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3047,7 +3345,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3050: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3348: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3060,14 +3358,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3063: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3361: 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 3070 "configure"
+#line 3368 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3082,7 +3380,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3085 "configure"
+#line 3383 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3095,14 +3393,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3098: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3396: 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:3105: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3403: 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
@@ -3117,15 +3415,15 @@ CF_EOF
 # 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:3120: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3123: \$? = $ac_status" >&5
+  echo "$as_me:3421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3125: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3128: \$? = $ac_status" >&5
+  echo "$as_me:3426: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3136,10 +3434,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3139: result: yes" >&5
+  echo "$as_me:3437: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3142: result: no" >&5
+  echo "$as_me:3440: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3153,7 +3451,7 @@ else
 	(*) 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:3156: checking for $ac_word" >&5
+echo "$as_me:3454: 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
@@ -3170,7 +3468,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3173: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3471: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3181,10 +3479,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3184: result: $LDCONFIG" >&5
+  echo "$as_me:3482: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3187: result: no" >&5
+  echo "$as_me:3485: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3192,7 +3490,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3195: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3493: 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.
@@ -3202,7 +3500,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3205: result: $cf_with_cxx" >&5
+echo "$as_me:3503: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3220,7 +3518,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3223: checking for $ac_word" >&5
+echo "$as_me:3521: 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
@@ -3235,7 +3533,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3238: found $ac_dir/$ac_word" >&5
+echo "$as_me:3536: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3243,10 +3541,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3246: result: $CXX" >&5
+  echo "$as_me:3544: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3249: result: no" >&5
+  echo "$as_me:3547: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3259,7 +3557,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3262: checking for $ac_word" >&5
+echo "$as_me:3560: 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
@@ -3274,7 +3572,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3277: found $ac_dir/$ac_word" >&5
+echo "$as_me:3575: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3282,10 +3580,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3285: result: $ac_ct_CXX" >&5
+  echo "$as_me:3583: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3288: result: no" >&5
+  echo "$as_me:3586: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3297,32 +3595,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3300:" \
+echo "$as_me:3598:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3303: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3601: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3306: \$? = $ac_status" >&5
+  echo "$as_me:3604: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3308: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3606: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3311: \$? = $ac_status" >&5
+  echo "$as_me:3609: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3313: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3611: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3316: \$? = $ac_status" >&5
+  echo "$as_me:3614: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3319: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3617: 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 3325 "configure"
+#line 3623 "configure"
 #include "confdefs.h"
 
 int
@@ -3337,16 +3635,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3343: \$? = $ac_status" >&5
+  echo "$as_me:3641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3349: \$? = $ac_status" >&5
+  echo "$as_me:3647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3358,19 +3656,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3361: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3659: 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:3367: checking whether $CXX accepts -g" >&5
+echo "$as_me:3665: 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 3373 "configure"
+#line 3671 "configure"
 #include "confdefs.h"
 
 int
@@ -3382,16 +3680,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3388: \$? = $ac_status" >&5
+  echo "$as_me:3686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3394: \$? = $ac_status" >&5
+  echo "$as_me:3692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3401,7 +3699,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3404: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3702: 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
@@ -3428,7 +3726,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3431 "configure"
+#line 3729 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3441,16 +3739,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3447: \$? = $ac_status" >&5
+  echo "$as_me:3745: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3453: \$? = $ac_status" >&5
+  echo "$as_me:3751: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3460,7 +3758,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3463 "configure"
+#line 3761 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3472,16 +3770,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3478: \$? = $ac_status" >&5
+  echo "$as_me:3776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3484: \$? = $ac_status" >&5
+  echo "$as_me:3782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3515,7 +3813,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3518: checking if $CXX works" >&5
+		echo "$as_me:3816: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3523,7 +3821,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3526 "configure"
+#line 3824 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3540,16 +3838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3546: \$? = $ac_status" >&5
+  echo "$as_me:3844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3552: \$? = $ac_status" >&5
+  echo "$as_me:3850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3560,11 +3858,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3563: result: $cf_cxx_works" >&5
+		echo "$as_me:3861: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3567: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3865: 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
@@ -3580,7 +3878,7 @@ ac_main_return="return"
 	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:3583: checking for $ac_word" >&5
+echo "$as_me:3881: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3597,7 +3895,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3600: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3898: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3608,17 +3906,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3611: result: $CXX" >&5
+  echo "$as_me:3909: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3614: result: no" >&5
+  echo "$as_me:3912: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3621: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3919: 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="";
 		;;
@@ -3627,7 +3925,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3630: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3928: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3635,7 +3933,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3638: result: $GXX_VERSION" >&5
+	echo "$as_me:3936: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3643,12 +3941,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3646: WARNING: templates do not work" >&5
+	{ echo "$as_me:3944: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3651: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3949: 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.
@@ -3658,15 +3956,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3661: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3959: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3664: checking if you want to build with Ada" >&5
+echo "$as_me:3962: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3666: result: $cf_with_ada" >&5
+echo "$as_me:3964: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3669: checking if you want to install terminal database" >&5
+echo "$as_me:3967: 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.
@@ -3676,10 +3974,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3679: result: $cf_with_db_install" >&5
+echo "$as_me:3977: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3682: checking if you want to install manpages" >&5
+echo "$as_me:3980: 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.
@@ -3689,10 +3987,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3692: result: $cf_with_manpages" >&5
+echo "$as_me:3990: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3695: checking if you want to build programs such as tic" >&5
+echo "$as_me:3993: 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.
@@ -3702,10 +4000,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:3705: result: $cf_with_progs" >&5
+echo "$as_me:4003: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:3708: checking if you want to build test-programs" >&5
+echo "$as_me:4006: 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.
@@ -3715,10 +4013,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3718: result: $cf_with_tests" >&5
+echo "$as_me:4016: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3721: checking if you wish to install curses.h" >&5
+echo "$as_me:4019: 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.
@@ -3728,7 +4026,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:3731: result: $with_curses_h" >&5
+echo "$as_me:4029: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -3752,7 +4050,7 @@ for ac_prog in mawk gawk nawk awk
 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:3755: checking for $ac_word" >&5
+echo "$as_me:4053: 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
@@ -3767,7 +4065,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3770: found $ac_dir/$ac_word" >&5
+echo "$as_me:4068: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3775,17 +4073,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3778: result: $AWK" >&5
+  echo "$as_me:4076: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3781: result: no" >&5
+  echo "$as_me:4079: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3788: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:4086: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3801,7 +4099,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:3804: checking for a BSD compatible install" >&5
+echo "$as_me:4102: 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
@@ -3850,7 +4148,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3853: result: $INSTALL" >&5
+echo "$as_me:4151: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3875,7 +4173,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3878: checking for $ac_word" >&5
+echo "$as_me:4176: 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
@@ -3890,7 +4188,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3893: found $ac_dir/$ac_word" >&5
+echo "$as_me:4191: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3898,10 +4196,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3901: result: $LINT" >&5
+  echo "$as_me:4199: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3904: result: no" >&5
+  echo "$as_me:4202: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3914,18 +4212,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3917: checking whether ln -s works" >&5
+echo "$as_me:4215: 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:3921: result: yes" >&5
+  echo "$as_me:4219: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3924: result: no, using $LN_S" >&5
+  echo "$as_me:4222: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3928: checking if $LN_S -f options work" >&5
+echo "$as_me:4226: 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
@@ -3937,12 +4235,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3940: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4238: 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:3945: checking for long file names" >&5
+echo "$as_me:4243: 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
@@ -3981,7 +4279,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3984: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4282: 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
 
@@ -4000,7 +4298,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4003: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4301: 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"
@@ -4010,7 +4308,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4013: checking if you want to use pkg-config" >&5
+echo "$as_me:4311: 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.
@@ -4020,7 +4318,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4023: result: $cf_pkg_config" >&5
+echo "$as_me:4321: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4032,7 +4330,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4035: checking for $ac_word" >&5
+echo "$as_me:4333: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4049,7 +4347,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4052: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4350: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4060,10 +4358,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4063: result: $PKG_CONFIG" >&5
+  echo "$as_me:4361: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4066: result: no" >&5
+  echo "$as_me:4364: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4072,7 +4370,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4075: checking for $ac_word" >&5
+echo "$as_me:4373: 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
@@ -4089,7 +4387,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4092: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4390: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4101,10 +4399,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4104: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4402: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4107: result: no" >&5
+  echo "$as_me:4405: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4147,24 +4445,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4150: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4448: 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:4157: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4455: 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:4163: checking for pkg-config library directory" >&5
+	echo "$as_me:4461: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4167: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4465: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4191,7 +4489,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4194: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4492: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4202,16 +4500,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4205: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4210: result: auto" >&5
+	echo "$as_me:4508: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4214: checking for search-list" >&5
+	echo "$as_me:4512: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4238,11 +4536,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4241: result: $cf_search_path" >&5
+	echo "$as_me:4539: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4245: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4543: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4250,7 +4548,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4253: checking for first directory" >&5
+	echo "$as_me:4551: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4261,7 +4559,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4264: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4562: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4271,7 +4569,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4274: checking for workaround" >&5
+		echo "$as_me:4572: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4294,17 +4592,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4297: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4595: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4304: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4602: 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:4307: checking if we should install .pc files" >&5
+	echo "$as_me:4605: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4315,7 +4613,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4318: result: $enable_pc_files" >&5
+echo "$as_me:4616: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4323,7 +4621,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4326: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4624: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4354,7 +4652,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4357: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4655: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4368,7 +4666,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4371: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4669: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4383,13 +4681,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4386: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4684: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4392: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4690: 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.
@@ -4399,11 +4697,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4402: result: $enable_mixedcase" >&5
+echo "$as_me:4700: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4406: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4704: 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
@@ -4430,7 +4728,7 @@ else
 fi
 
 fi
-echo "$as_me:4433: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4731: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4449,7 +4747,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4452: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4750: 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
@@ -4469,16 +4767,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4472: result: yes" >&5
+  echo "$as_me:4770: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4476: result: no" >&5
+  echo "$as_me:4774: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4481: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4779: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4533,7 +4831,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4536: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4834: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4544,7 +4842,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4547: checking for $ac_word" >&5
+echo "$as_me:4845: 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
@@ -4559,7 +4857,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4562: found $ac_dir/$ac_word" >&5
+echo "$as_me:4860: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4567,10 +4865,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4570: result: $CTAGS" >&5
+  echo "$as_me:4868: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4573: result: no" >&5
+  echo "$as_me:4871: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4581,7 +4879,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4584: checking for $ac_word" >&5
+echo "$as_me:4882: 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
@@ -4596,7 +4894,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4599: found $ac_dir/$ac_word" >&5
+echo "$as_me:4897: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4604,10 +4902,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4607: result: $ETAGS" >&5
+  echo "$as_me:4905: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4610: result: no" >&5
+  echo "$as_me:4908: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4616,7 +4914,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4619: checking for $ac_word" >&5
+echo "$as_me:4917: 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
@@ -4631,7 +4929,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4634: found $ac_dir/$ac_word" >&5
+echo "$as_me:4932: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4640,17 +4938,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4643: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4941: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4646: result: no" >&5
+  echo "$as_me:4944: 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:4653: checking for $ac_word" >&5
+echo "$as_me:4951: 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
@@ -4665,7 +4963,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4668: found $ac_dir/$ac_word" >&5
+echo "$as_me:4966: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4674,10 +4972,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4677: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4975: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4680: result: no" >&5
+  echo "$as_me:4978: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4697,7 +4995,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4700: checking for makeflags variable" >&5
+echo "$as_me:4998: 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
@@ -4727,7 +5025,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4730: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4735,13 +5033,13 @@ echo "${as_me:-configure}:4730: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4738: result: $cf_cv_makeflags" >&5
+echo "$as_me:5036: 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:4744: checking for $ac_word" >&5
+echo "$as_me:5042: 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
@@ -4756,7 +5054,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4759: found $ac_dir/$ac_word" >&5
+echo "$as_me:5057: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4764,10 +5062,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4767: result: $RANLIB" >&5
+  echo "$as_me:5065: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4770: result: no" >&5
+  echo "$as_me:5068: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4776,7 +5074,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4779: checking for $ac_word" >&5
+echo "$as_me:5077: 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
@@ -4791,7 +5089,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4794: found $ac_dir/$ac_word" >&5
+echo "$as_me:5092: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4800,10 +5098,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4803: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5101: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4806: result: no" >&5
+  echo "$as_me:5104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4815,7 +5113,7 @@ fi
 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:4818: checking for $ac_word" >&5
+echo "$as_me:5116: 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
@@ -4830,7 +5128,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4833: found $ac_dir/$ac_word" >&5
+echo "$as_me:5131: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4838,10 +5136,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4841: result: $LD" >&5
+  echo "$as_me:5139: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4844: result: no" >&5
+  echo "$as_me:5142: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4850,7 +5148,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4853: checking for $ac_word" >&5
+echo "$as_me:5151: 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
@@ -4865,7 +5163,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4868: found $ac_dir/$ac_word" >&5
+echo "$as_me:5166: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4874,10 +5172,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4877: result: $ac_ct_LD" >&5
+  echo "$as_me:5175: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4880: result: no" >&5
+  echo "$as_me:5178: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4889,7 +5187,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4892: checking for $ac_word" >&5
+echo "$as_me:5190: 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
@@ -4904,7 +5202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4907: found $ac_dir/$ac_word" >&5
+echo "$as_me:5205: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4912,10 +5210,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4915: result: $AR" >&5
+  echo "$as_me:5213: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4918: result: no" >&5
+  echo "$as_me:5216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4924,7 +5222,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4927: checking for $ac_word" >&5
+echo "$as_me:5225: 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
@@ -4939,7 +5237,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4942: found $ac_dir/$ac_word" >&5
+echo "$as_me:5240: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4948,10 +5246,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4951: result: $ac_ct_AR" >&5
+  echo "$as_me:5249: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4954: result: no" >&5
+  echo "$as_me:5252: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4963,7 +5261,7 @@ fi
 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:4966: checking for $ac_word" >&5
+echo "$as_me:5264: 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
@@ -4978,7 +5276,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:4981: found $ac_dir/$ac_word" >&5
+echo "$as_me:5279: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4986,10 +5284,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:4989: result: $NM" >&5
+  echo "$as_me:5287: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:4992: result: no" >&5
+  echo "$as_me:5290: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4998,7 +5296,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5001: checking for $ac_word" >&5
+echo "$as_me:5299: 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
@@ -5013,7 +5311,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5016: found $ac_dir/$ac_word" >&5
+echo "$as_me:5314: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5022,10 +5320,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5025: result: $ac_ct_NM" >&5
+  echo "$as_me:5323: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5028: result: no" >&5
+  echo "$as_me:5326: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5037,7 +5335,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5040: checking for $ac_word" >&5
+echo "$as_me:5338: 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
@@ -5052,7 +5350,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5055: found $ac_dir/$ac_word" >&5
+echo "$as_me:5353: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5060,10 +5358,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5063: result: $AR" >&5
+  echo "$as_me:5361: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5066: result: no" >&5
+  echo "$as_me:5364: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5072,7 +5370,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5075: checking for $ac_word" >&5
+echo "$as_me:5373: 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
@@ -5087,7 +5385,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5090: found $ac_dir/$ac_word" >&5
+echo "$as_me:5388: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5096,10 +5394,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5099: result: $ac_ct_AR" >&5
+  echo "$as_me:5397: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5102: result: no" >&5
+  echo "$as_me:5400: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5108,7 +5406,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5111: checking for options to update archives" >&5
+echo "$as_me:5409: 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
@@ -5145,13 +5443,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5148 "configure"
+#line 5446 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5151: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5154: \$? = $ac_status" >&5
+  echo "$as_me:5452: \$? = $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
@@ -5162,7 +5460,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5165: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5172,7 +5470,7 @@ echo "${as_me:-configure}:5165: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5175: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5473: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5183,7 +5481,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5186: checking for an installation directory prefix" >&5
+echo "$as_me:5484: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5196,7 +5494,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5199: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5497: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
 ###############################################################################
@@ -5231,7 +5529,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5234: checking for $ac_word" >&5
+echo "$as_me:5532: 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
@@ -5246,7 +5544,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5249: found $ac_dir/$ac_word" >&5
+echo "$as_me:5547: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5254,10 +5552,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5257: result: $BUILD_CC" >&5
+  echo "$as_me:5555: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5260: result: no" >&5
+  echo "$as_me:5558: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5266,12 +5564,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5269: checking for native build C compiler" >&5
+	echo "$as_me:5567: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5271: result: $BUILD_CC" >&5
+	echo "$as_me:5569: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5274: checking for native build C preprocessor" >&5
+	echo "$as_me:5572: 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.
@@ -5281,10 +5579,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5284: result: $BUILD_CPP" >&5
+	echo "$as_me:5582: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5287: checking for native build C flags" >&5
+	echo "$as_me:5585: 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.
@@ -5292,10 +5590,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5295: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5593: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5298: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5596: 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.
@@ -5303,10 +5601,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5306: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5604: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5309: checking for native build linker-flags" >&5
+	echo "$as_me:5607: 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.
@@ -5314,10 +5612,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5317: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5615: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5320: checking for native build linker-libraries" >&5
+	echo "$as_me:5618: 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.
@@ -5325,7 +5623,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5328: result: $BUILD_LIBS" >&5
+	echo "$as_me:5626: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5334,7 +5632,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5337: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5635: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5348,7 +5646,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5351 "configure"
+#line 5649 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5358,15 +5656,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5364: \$? = $ac_status" >&5
+  echo "$as_me:5662: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5369: \$? = $ac_status" >&5
+  echo "$as_me:5667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5381,12 +5679,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5384: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5682: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5389: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5687: 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;}
@@ -5397,9 +5695,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+	: ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='${LIBS}'}
+	: ${BUILD_LIBS:=''${LIBS}''}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
@@ -5411,7 +5709,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5414: checking if libtool -version-number should be used" >&5
+echo "$as_me:5712: 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.
@@ -5428,7 +5726,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5431: result: $cf_libtool_version" >&5
+echo "$as_me:5729: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5437,25 +5735,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5440: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5738: 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}:5447: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5745: 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}:5454: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5752: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5458: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5756: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5477,7 +5775,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5480: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5778: 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.
@@ -5487,7 +5785,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5490: result: $with_libtool" >&5
+echo "$as_me:5788: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5518,7 +5816,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5521: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5819: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5531,7 +5829,7 @@ esac
   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:5534: checking for $ac_word" >&5
+echo "$as_me:5832: 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
@@ -5546,7 +5844,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5549: found $ac_dir/$ac_word" >&5
+echo "$as_me:5847: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5554,10 +5852,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5557: result: $LIBTOOL" >&5
+  echo "$as_me:5855: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5560: result: no" >&5
+  echo "$as_me:5858: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5570,7 +5868,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5573: checking for $ac_word" >&5
+echo "$as_me:5871: 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
@@ -5585,7 +5883,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5588: found $ac_dir/$ac_word" >&5
+echo "$as_me:5886: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5593,10 +5891,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5596: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5894: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5599: result: no" >&5
+  echo "$as_me:5897: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5627,7 +5925,7 @@ unset LIBTOOL
   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:5630: checking for $ac_word" >&5
+echo "$as_me:5928: 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
@@ -5642,7 +5940,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5645: found $ac_dir/$ac_word" >&5
+echo "$as_me:5943: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5650,10 +5948,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5653: result: $LIBTOOL" >&5
+  echo "$as_me:5951: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5656: result: no" >&5
+  echo "$as_me:5954: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5666,7 +5964,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5669: checking for $ac_word" >&5
+echo "$as_me:5967: 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
@@ -5681,7 +5979,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5684: found $ac_dir/$ac_word" >&5
+echo "$as_me:5982: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5689,10 +5987,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5692: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5990: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5695: result: no" >&5
+  echo "$as_me:5993: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5714,7 +6012,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:5717: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6015: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5730,7 +6028,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:5733: checking version of $LIBTOOL" >&5
+	echo "$as_me:6031: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -5741,7 +6039,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:5744: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6042: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -n "$cf_cv_libtool_version"
 	then
@@ -5750,18 +6048,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:5753: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6051: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:5759: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6057: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:5764: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6062: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5797,7 +6095,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:5800: checking if you want to build shared libraries" >&5
+echo "$as_me:6098: 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.
@@ -5807,11 +6105,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:5810: result: $with_shared" >&5
+echo "$as_me:6108: 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:5814: checking if you want to build static libraries" >&5
+echo "$as_me:6112: 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.
@@ -5821,11 +6119,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:5824: result: $with_normal" >&5
+echo "$as_me:6122: 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:5828: checking if you want to build debug libraries" >&5
+echo "$as_me:6126: 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.
@@ -5835,11 +6133,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:5838: result: $with_debug" >&5
+echo "$as_me:6136: 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:5842: checking if you want to build profiling libraries" >&5
+echo "$as_me:6140: 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.
@@ -5849,7 +6147,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:5852: result: $with_profile" >&5
+echo "$as_me:6150: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -5857,7 +6155,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:5860: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6158: 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.
@@ -5867,26 +6165,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:5870: result: $with_shared_cxx" >&5
+echo "$as_me:6168: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:5877: checking for specified models" >&5
+echo "$as_me:6175: 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:5881: result: $cf_list_models" >&5
+echo "$as_me:6179: 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:5886: checking for default model" >&5
+echo "$as_me:6184: 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:5889: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6187: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -5900,7 +6198,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:5903: checking if you want to have a library-prefix" >&5
+echo "$as_me:6201: 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.
@@ -5910,7 +6208,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:5913: result: $with_lib_prefix" >&5
+echo "$as_me:6211: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -5941,24 +6239,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:5944: checking for PATH separator" >&5
+	echo "$as_me:6242: 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:5951: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6249: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:5955: checking for ANSI C header files" >&5
+echo "$as_me:6253: 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 5961 "configure"
+#line 6259 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5966,13 +6264,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5969: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5975: \$? = $ac_status" >&5
+  echo "$as_me:6273: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5994,7 +6292,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5997 "configure"
+#line 6295 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6012,7 +6310,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6015 "configure"
+#line 6313 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6033,7 +6331,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6036 "configure"
+#line 6334 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6059,15 +6357,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6065: \$? = $ac_status" >&5
+  echo "$as_me:6363: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6070: \$? = $ac_status" >&5
+  echo "$as_me:6368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6080,7 +6378,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6083: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6381: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6096,28 +6394,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6099: checking for $ac_header" >&5
+echo "$as_me:6397: 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 6105 "configure"
+#line 6403 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6114: \$? = $ac_status" >&5
+  echo "$as_me:6412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6120: \$? = $ac_status" >&5
+  echo "$as_me:6418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6127,7 +6425,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6130: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6428: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6137,13 +6435,13 @@ EOF
 fi
 done
 
-echo "$as_me:6140: checking whether exit is declared" >&5
+echo "$as_me:6438: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6146 "configure"
+#line 6444 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6158,16 +6456,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6164: \$? = $ac_status" >&5
+  echo "$as_me:6462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6170: \$? = $ac_status" >&5
+  echo "$as_me:6468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6177,19 +6475,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6180: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6478: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6186: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6484: 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 6192 "configure"
+#line 6490 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6204,16 +6502,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6210: \$? = $ac_status" >&5
+  echo "$as_me:6508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6216: \$? = $ac_status" >&5
+  echo "$as_me:6514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6223,7 +6521,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6226: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6236,7 +6534,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6239: checking for opendir in -ldir" >&5
+  echo "$as_me:6537: 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
@@ -6244,7 +6542,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6247 "configure"
+#line 6545 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6263,16 +6561,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6269: \$? = $ac_status" >&5
+  echo "$as_me:6567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6275: \$? = $ac_status" >&5
+  echo "$as_me:6573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6283,14 +6581,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6286: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6584: 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:6293: checking for opendir in -lx" >&5
+  echo "$as_me:6591: 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
@@ -6298,7 +6596,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6301 "configure"
+#line 6599 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6317,16 +6615,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6323: \$? = $ac_status" >&5
+  echo "$as_me:6621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6329: \$? = $ac_status" >&5
+  echo "$as_me:6627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6337,7 +6635,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6340: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6638: 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"
@@ -6347,7 +6645,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6350: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6648: 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.
@@ -6357,10 +6655,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6360: result: $with_termlib" >&5
+echo "$as_me:6658: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6363: checking if you want to build a separate tic library" >&5
+echo "$as_me:6661: 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.
@@ -6370,7 +6668,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6373: result: $with_ticlib" >&5
+echo "$as_me:6671: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6383,7 +6681,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6386: checking for default loader flags" >&5
+echo "$as_me:6684: 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=''   ;;
@@ -6392,13 +6690,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6395: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6693: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6401: checking if rpath option should be used" >&5
+echo "$as_me:6699: 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.
@@ -6408,10 +6706,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6411: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6709: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6414: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6712: 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.
@@ -6421,7 +6719,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6424: result: $cf_cv_do_relink" >&5
+echo "$as_me:6722: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6432,7 +6730,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6435: checking for an rpath option" >&5
+	echo "$as_me:6733: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6463,12 +6761,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6466: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6764: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6471: checking if we need a space after rpath option" >&5
+		echo "$as_me:6769: 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"
 
@@ -6489,7 +6787,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6492 "configure"
+#line 6790 "configure"
 #include "confdefs.h"
 
 int
@@ -6501,16 +6799,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6507: \$? = $ac_status" >&5
+  echo "$as_me:6805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6513: \$? = $ac_status" >&5
+  echo "$as_me:6811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6520,7 +6818,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6523: result: $cf_rpath_space" >&5
+		echo "$as_me:6821: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6542,7 +6840,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6545: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6843: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6557,9 +6855,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6560: result: $withval" >&5
+		echo "$as_me:6858: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6562: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6860: 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; }; }
 		;;
@@ -6568,7 +6866,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6571: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6869: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6591,14 +6889,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6594: checking which $CC option to use" >&5
+		echo "$as_me:6892: 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 6601 "configure"
+#line 6899 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6610,16 +6908,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6616: \$? = $ac_status" >&5
+  echo "$as_me:6914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6622: \$? = $ac_status" >&5
+  echo "$as_me:6920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6628,7 +6926,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6631: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6929: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6699,7 +6997,7 @@ CF_EOF
 		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:6702: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7000: 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
@@ -6708,7 +7006,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 6711 "configure"
+#line 7009 "configure"
 #include "confdefs.h"
 
 int
@@ -6720,16 +7018,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6726: \$? = $ac_status" >&5
+  echo "$as_me:7024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6732: \$? = $ac_status" >&5
+  echo "$as_me:7030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -6740,7 +7038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:6743: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7041: 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"
@@ -7090,7 +7388,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7093 "configure"
+#line 7391 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7102,16 +7400,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7108: \$? = $ac_status" >&5
+  echo "$as_me:7406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7114: \$? = $ac_status" >&5
+  echo "$as_me:7412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7148,7 +7446,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7151: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7449: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7158,7 +7456,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7161 "${as_me:-configure}"
+#line 7459 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7170,18 +7468,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7173: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7471: 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:7175: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7178: \$? = $ac_status" >&5
+  echo "$as_me:7476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7180: result: yes" >&5
+				echo "$as_me:7478: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7184: result: no" >&5
+				echo "$as_me:7482: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7196,17 +7494,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7199: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7497: 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}:7203: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7501: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7209: checking for additional libtool options" >&5
+echo "$as_me:7507: 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.
@@ -7216,7 +7514,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7219: result: $with_libtool_opts" >&5
+echo "$as_me:7517: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7227,7 +7525,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7230: checking if exported-symbols file should be used" >&5
+echo "$as_me:7528: 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.
@@ -7242,7 +7540,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7245: result: $with_export_syms" >&5
+echo "$as_me:7543: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7253,15 +7551,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7256: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7554: 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:7261: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7559: 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 7264 "configure"
+#line 7562 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7273,16 +7571,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
+  echo "$as_me:7583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7291,18 +7589,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7294: result: $cf_cflags_work" >&5
+		echo "$as_me:7592: 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}:7300: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7598: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7305: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7603: 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.
@@ -7320,18 +7618,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7323: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7621: 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:7328: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7626: 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:7334: result: $with_versioned_syms" >&5
+echo "$as_me:7632: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7347,7 +7645,7 @@ then
 		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}:7350: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7648: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7355,11 +7653,11 @@ echo "${as_me:-configure}:7350: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7358: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7656: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7362: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7660: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7371,7 +7669,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7374: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7672: 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
 
@@ -7408,7 +7706,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7411 "configure"
+#line 7709 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7439,7 +7737,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7442: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7740: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7452,7 +7750,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7455: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7753: 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.
@@ -7462,27 +7760,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7465: result: $with_gpm" >&5
+echo "$as_me:7763: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7469: checking for gpm.h" >&5
+	echo "$as_me:7767: 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 7475 "configure"
+#line 7773 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7777: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7485: \$? = $ac_status" >&5
+  echo "$as_me:7783: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7501,7 +7799,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7504: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7802: 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
 
@@ -7512,7 +7810,7 @@ EOF
 		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}:7515: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7813: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7520,7 +7818,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7523: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7821: 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
@@ -7528,7 +7826,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7531 "configure"
+#line 7829 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7547,16 +7845,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7553: \$? = $ac_status" >&5
+  echo "$as_me:7851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7559: \$? = $ac_status" >&5
+  echo "$as_me:7857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7567,18 +7865,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7570: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7868: 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:7577: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7875: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7581: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7879: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7589,7 +7887,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7592: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7890: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7598,7 +7896,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7601: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7899: 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.
@@ -7608,18 +7906,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7611: result: $with_dlsym" >&5
+	echo "$as_me:7909: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7616: checking for dlsym" >&5
+echo "$as_me:7914: 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 7622 "configure"
+#line 7920 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7650,16 +7948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7656: \$? = $ac_status" >&5
+  echo "$as_me:7954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7662: \$? = $ac_status" >&5
+  echo "$as_me:7960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7669,14 +7967,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7672: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7970: 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:7679: checking for dlsym in -ldl" >&5
+echo "$as_me:7977: 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
@@ -7684,7 +7982,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7687 "configure"
+#line 7985 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7703,16 +8001,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:8007: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7715: \$? = $ac_status" >&5
+  echo "$as_me:8013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -7723,7 +8021,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7726: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8024: 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
 
@@ -7752,10 +8050,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:7755: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8053: 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 7758 "configure"
+#line 8056 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -7773,16 +8071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7779: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7785: \$? = $ac_status" >&5
+  echo "$as_me:8083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7793,15 +8091,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:7796: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8094: 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:7801: result: ok" >&5
+	echo "$as_me:8099: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:7804: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8102: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7809,12 +8107,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:7812: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8110: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:7817: checking for soname of gpm library" >&5
+echo "$as_me:8115: 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
@@ -7848,15 +8146,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:7851: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7854: \$? = $ac_status" >&5
+  echo "$as_me:8152: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:7856: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7859: \$? = $ac_status" >&5
+  echo "$as_me:8157: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -7867,7 +8165,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:7870: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8168: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -7935,7 +8233,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:7938: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8236: 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
@@ -7943,7 +8241,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7946 "configure"
+#line 8244 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7962,16 +8260,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7968: \$? = $ac_status" >&5
+  echo "$as_me:8266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7974: \$? = $ac_status" >&5
+  echo "$as_me:8272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -7982,11 +8280,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7985: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8283: 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:7989: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8287: 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
@@ -8010,15 +8308,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8013: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8016: \$? = $ac_status" >&5
+  echo "$as_me:8314: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8021: \$? = $ac_status" >&5
+  echo "$as_me:8319: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8030,11 +8328,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8033: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8331: 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:8037: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8335: 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
 
@@ -8042,7 +8340,7 @@ fi
 
 fi
 
-echo "$as_me:8045: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8343: 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.
@@ -8051,7 +8349,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8054: result: $with_pcre2" >&5
+echo "$as_me:8352: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8062,17 +8360,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8065: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8363: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8071: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8369: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8075: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8373: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8196,7 +8494,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8199: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8497: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8209,7 +8507,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8212: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8510: 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
@@ -8217,7 +8515,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8220 "configure"
+#line 8518 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8236,16 +8534,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8248: \$? = $ac_status" >&5
+  echo "$as_me:8546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8256,7 +8554,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8259: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8557: 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
 
@@ -8277,7 +8575,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8280: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8578: 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
@@ -8285,7 +8583,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8288 "configure"
+#line 8586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8304,16 +8602,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8310: \$? = $ac_status" >&5
+  echo "$as_me:8608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8316: \$? = $ac_status" >&5
+  echo "$as_me:8614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8324,7 +8622,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8327: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8625: 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
 
@@ -8345,7 +8643,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8348: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8646: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8360,23 +8658,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8363: checking for $ac_header" >&5
+echo "$as_me:8661: 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 8369 "configure"
+#line 8667 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8671: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8379: \$? = $ac_status" >&5
+  echo "$as_me:8677: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8395,7 +8693,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8398: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8696: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8408,13 +8706,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8411: checking for $ac_func" >&5
+echo "$as_me:8709: 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 8417 "configure"
+#line 8715 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8445,16 +8743,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8451: \$? = $ac_status" >&5
+  echo "$as_me:8749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8457: \$? = $ac_status" >&5
+  echo "$as_me:8755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8464,7 +8762,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8765: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8478,7 +8776,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8481: checking if you want to use sysmouse" >&5
+echo "$as_me:8779: 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.
@@ -8490,7 +8788,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8493 "configure"
+#line 8791 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8513,16 +8811,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8519: \$? = $ac_status" >&5
+  echo "$as_me:8817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8525: \$? = $ac_status" >&5
+  echo "$as_me:8823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8532,7 +8830,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8535: result: $cf_with_sysmouse" >&5
+echo "$as_me:8833: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8542,7 +8840,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8545: checking if you want to disable library suffixes" >&5
+echo "$as_me:8843: 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.
@@ -8559,13 +8857,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8562: result: $disable_lib_suffixes" >&5
+echo "$as_me:8860: 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:8568: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8866: 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.
@@ -8583,22 +8881,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8586: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8884: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8591: checking for updated LDFLAGS" >&5
+echo "$as_me:8889: 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:8594: result: maybe" >&5
+	echo "$as_me:8892: 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:8601: checking for $ac_word" >&5
+echo "$as_me:8899: 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
@@ -8613,7 +8911,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8616: found $ac_dir/$ac_word" >&5
+echo "$as_me:8914: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8621,10 +8919,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8624: result: $cf_ldd_prog" >&5
+  echo "$as_me:8922: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8627: result: no" >&5
+  echo "$as_me:8925: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8638,7 +8936,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8641 "configure"
+#line 8939 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8650,16 +8948,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8656: \$? = $ac_status" >&5
+  echo "$as_me:8954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8662: \$? = $ac_status" >&5
+  echo "$as_me:8960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8687,7 +8985,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8699,11 +8997,11 @@ echo "${as_me:-configure}:8690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8702: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9000: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8706: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9004: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -8740,7 +9038,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8743: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9041: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8753,11 +9051,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8756: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9054: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8760: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9058: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -8794,7 +9092,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:8797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9095: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -8807,14 +9105,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:8810: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9108: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:8814: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9112: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:8817: result: no" >&5
+	echo "$as_me:9115: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8828,7 +9126,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:8831: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9129: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -8845,7 +9143,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:8848: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9146: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -8853,7 +9151,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:8856: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9154: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -8872,11 +9170,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:8875: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9173: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:8879: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9177: 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.
@@ -8886,10 +9184,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:8889: result: $with_overwrite" >&5
+echo "$as_me:9187: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:8892: checking if external terminfo-database is used" >&5
+echo "$as_me:9190: 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.
@@ -8899,7 +9197,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:8902: result: $use_database" >&5
+echo "$as_me:9200: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -8915,7 +9213,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:8918: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9216: 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.
@@ -8923,10 +9221,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:8926: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9224: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:8929: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9227: 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.
@@ -8936,13 +9234,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:8939: result: $with_hashed_db" >&5
+	echo "$as_me:9237: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:8945: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9243: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -8952,7 +9250,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:8955: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9253: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -8960,7 +9258,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:8963: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9261: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -8976,7 +9274,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:8979: checking for $ac_word" >&5
+echo "$as_me:9277: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8991,7 +9289,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:8994: found $ac_dir/$ac_word" >&5
+echo "$as_me:9292: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8999,10 +9297,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9002: result: $TIC" >&5
+  echo "$as_me:9300: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9005: result: no" >&5
+  echo "$as_me:9303: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9011,7 +9309,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9014: checking for $ac_word" >&5
+echo "$as_me:9312: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9026,7 +9324,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9029: found $ac_dir/$ac_word" >&5
+echo "$as_me:9327: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9034,10 +9332,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9037: result: $ac_ct_TIC" >&5
+  echo "$as_me:9335: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9040: result: no" >&5
+  echo "$as_me:9338: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9049,7 +9347,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9052: checking for $ac_word" >&5
+echo "$as_me:9350: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9064,7 +9362,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9067: found $ac_dir/$ac_word" >&5
+echo "$as_me:9365: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9072,10 +9370,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9075: result: $INFOCMP" >&5
+  echo "$as_me:9373: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9078: result: no" >&5
+  echo "$as_me:9376: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9084,7 +9382,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9087: checking for $ac_word" >&5
+echo "$as_me:9385: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9099,7 +9397,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9102: found $ac_dir/$ac_word" >&5
+echo "$as_me:9400: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9107,10 +9405,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9110: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9408: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9113: result: no" >&5
+  echo "$as_me:9411: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9125,10 +9423,10 @@ 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:9128: checking for tic program for fallbacks" >&5
+  echo "$as_me:9426: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9131: result: $TIC" >&5
+		echo "$as_me:9429: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9156,7 +9454,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9159: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9457: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9169,7 +9467,7 @@ 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:9172: checking for $ac_word" >&5
+echo "$as_me:9470: 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
@@ -9186,7 +9484,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9189: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9487: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9197,10 +9495,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9200: result: $TIC" >&5
+  echo "$as_me:9498: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9203: result: no" >&5
+  echo "$as_me:9501: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9259,7 +9557,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9262: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9560: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9274,7 +9572,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9277: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9575: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9283,10 +9581,10 @@ 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:9286: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9584: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9289: result: $INFOCMP" >&5
+		echo "$as_me:9587: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9314,7 +9612,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9317: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9615: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9327,7 +9625,7 @@ 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:9330: checking for $ac_word" >&5
+echo "$as_me:9628: 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
@@ -9344,7 +9642,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9347: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9645: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9355,10 +9653,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9358: result: $INFOCMP" >&5
+  echo "$as_me:9656: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9361: result: no" >&5
+  echo "$as_me:9659: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9417,7 +9715,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9420: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9718: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9432,7 +9730,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9435: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9733: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9442,7 +9740,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9445: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9743: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9450,7 +9748,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9453: checking if you want modern xterm or antique" >&5
+echo "$as_me:9751: 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.
@@ -9464,7 +9762,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9467: result: $with_xterm_new" >&5
+echo "$as_me:9765: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9477,7 +9775,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9480: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9778: 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.
@@ -9501,13 +9799,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9504: result: $with_xterm_kbs" >&5
+echo "$as_me:9802: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9510: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9808: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9517,7 +9815,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9520: checking for list of terminfo directories" >&5
+echo "$as_me:9818: 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.
@@ -9557,7 +9855,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9560: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9858: 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; }; }
 	;;
@@ -9580,7 +9878,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9583: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9881: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9589,13 +9887,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9592: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9890: 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:9598: checking for default terminfo directory" >&5
+echo "$as_me:9896: 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.
@@ -9631,7 +9929,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9634: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9932: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9640,7 +9938,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9643: result: $TERMINFO" >&5
+echo "$as_me:9941: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9651,7 +9949,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9654: checking if big-core option selected" >&5
+echo "$as_me:9952: 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.
@@ -9663,7 +9961,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9666 "configure"
+#line 9964 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9677,15 +9975,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9683: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9688: \$? = $ac_status" >&5
+  echo "$as_me:9986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9697,7 +9995,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9700: result: $with_big_core" >&5
+echo "$as_me:9998: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9707,7 +10005,7 @@ EOF
 ### 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:9710: checking if big-strings option selected" >&5
+echo "$as_me:10008: 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.
@@ -9731,14 +10029,14 @@ else
 	esac
 
 fi;
-echo "$as_me:9734: result: $with_big_strings" >&5
+echo "$as_me:10032: 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:9741: checking if you want termcap-fallback support" >&5
+echo "$as_me:10039: 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.
@@ -9748,14 +10046,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:9751: result: $with_termcap" >&5
+echo "$as_me:10049: 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:9758: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10056: 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
@@ -9768,13 +10066,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:9771: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10069: 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:9777: checking for list of termcap files" >&5
+	echo "$as_me:10075: 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.
@@ -9814,7 +10112,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9817: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10115: 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; }; }
 	;;
@@ -9837,7 +10135,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:9840: result: $TERMPATH" >&5
+	echo "$as_me:10138: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -9845,7 +10143,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:9848: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10146: 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.
@@ -9855,14 +10153,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:9858: result: $with_getcap" >&5
+	echo "$as_me:10156: 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:9865: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10163: 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.
@@ -9872,7 +10170,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:9875: result: $with_getcap_cache" >&5
+	echo "$as_me:10173: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -9882,7 +10180,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:9885: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10183: 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.
@@ -9892,14 +10190,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:9895: result: $with_home_terminfo" >&5
+echo "$as_me:10193: 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:9902: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10200: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -9909,14 +10207,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:9912: result: $with_root_environ" >&5
+echo "$as_me:10210: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:9919: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10217: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -9926,14 +10224,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:9929: result: $with_root_access" >&5
+echo "$as_me:10227: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:9936: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10234: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -9943,7 +10241,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:9946: result: $with_setuid_environ" >&5
+echo "$as_me:10244: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -9958,23 +10256,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9961: checking for $ac_header" >&5
+echo "$as_me:10259: 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 9967 "configure"
+#line 10265 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9971: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9977: \$? = $ac_status" >&5
+  echo "$as_me:10275: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9993,7 +10291,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9996: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10008,13 +10306,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10011: checking for $ac_func" >&5
+echo "$as_me:10309: 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 10017 "configure"
+#line 10315 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10045,16 +10343,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10051: \$? = $ac_status" >&5
+  echo "$as_me:10349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10057: \$? = $ac_status" >&5
+  echo "$as_me:10355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10064,7 +10362,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10067: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10365: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10081,13 +10379,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10084: checking for $ac_func" >&5
+echo "$as_me:10382: 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 10090 "configure"
+#line 10388 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10118,16 +10416,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10124: \$? = $ac_status" >&5
+  echo "$as_me:10422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10130: \$? = $ac_status" >&5
+  echo "$as_me:10428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10137,7 +10435,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10140: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10438: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10148,7 +10446,7 @@ fi
 done
 
 else
-	echo "$as_me:10151: checking if link/symlink functions work" >&5
+	echo "$as_me:10449: 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
@@ -10161,7 +10459,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10164 "configure"
+#line 10462 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10195,15 +10493,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10201: \$? = $ac_status" >&5
+  echo "$as_me:10499: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10206: \$? = $ac_status" >&5
+  echo "$as_me:10504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10221,7 +10519,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10224: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10522: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10241,7 +10539,7 @@ with_symlinks=no
 # 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:10244: checking if tic should use symbolic links" >&5
+	echo "$as_me:10542: 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.
@@ -10251,21 +10549,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10254: result: $with_symlinks" >&5
+	echo "$as_me:10552: 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:10261: checking if tic should use hard links" >&5
+	echo "$as_me:10559: 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:10268: result: $with_links" >&5
+	echo "$as_me:10566: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10281,7 +10579,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10284: checking if you want broken-linker support code" >&5
+echo "$as_me:10582: 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.
@@ -10291,7 +10589,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10294: result: $with_broken_linker" >&5
+echo "$as_me:10592: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10305,7 +10603,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10308: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10606: 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.
@@ -10315,7 +10613,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10318: result: $with_bsdpad" >&5
+echo "$as_me:10616: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10334,14 +10632,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10337: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10635: 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 10344 "configure"
+#line 10642 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10360,16 +10658,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10372: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10380,7 +10678,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10383: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10681: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10422,14 +10720,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10425: checking if this is the GNU C library" >&5
+echo "$as_me:10723: 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 10432 "configure"
+#line 10730 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10448,16 +10746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10454: \$? = $ac_status" >&5
+  echo "$as_me:10752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10460: \$? = $ac_status" >&5
+  echo "$as_me:10758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10468,7 +10766,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10471: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10769: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10476,7 +10774,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10479: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10777: 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
@@ -10488,7 +10786,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10491 "configure"
+#line 10789 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10507,16 +10805,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10513: \$? = $ac_status" >&5
+  echo "$as_me:10811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10519: \$? = $ac_status" >&5
+  echo "$as_me:10817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10528,12 +10826,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10531: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10829: 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:10536: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10834: 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
@@ -10638,7 +10936,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10641 "configure"
+#line 10939 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10658,16 +10956,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:10962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10670: \$? = $ac_status" >&5
+  echo "$as_me:10968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10678,7 +10976,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10681: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10979: 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
@@ -10687,14 +10985,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10690: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10988: 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 10697 "configure"
+#line 10995 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10709,16 +11007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10715: \$? = $ac_status" >&5
+  echo "$as_me:11013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:11019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10825,7 +11123,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10828 "configure"
+#line 11126 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10840,16 +11138,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10846: \$? = $ac_status" >&5
+  echo "$as_me:11144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10852: \$? = $ac_status" >&5
+  echo "$as_me:11150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -10864,12 +11162,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10867: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11165: 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:10872: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11170: 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
@@ -10879,7 +11177,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10882 "configure"
+#line 11180 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10894,16 +11192,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10900: \$? = $ac_status" >&5
+  echo "$as_me:11198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10906: \$? = $ac_status" >&5
+  echo "$as_me:11204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -10914,7 +11212,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10917: result: $cf_cv_default_source" >&5
+echo "$as_me:11215: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -10951,16 +11249,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:10954: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11252: 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}:10960: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11258: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10963 "configure"
+#line 11261 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10975,16 +11273,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10981: \$? = $ac_status" >&5
+  echo "$as_me:11279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10987: \$? = $ac_status" >&5
+  echo "$as_me:11285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11005,7 +11303,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11008 "configure"
+#line 11306 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11020,16 +11318,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11026: \$? = $ac_status" >&5
+  echo "$as_me:11324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11032: \$? = $ac_status" >&5
+  echo "$as_me:11330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11040,7 +11338,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11048,10 +11346,10 @@ echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11051: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11349: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11054 "configure"
+#line 11352 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11066,16 +11364,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11072: \$? = $ac_status" >&5
+  echo "$as_me:11370: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  echo "$as_me:11376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11091,7 +11389,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11094: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11392: 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
@@ -11208,7 +11506,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11211: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11509: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11240,14 +11538,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11243: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11541: 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 11250 "configure"
+#line 11548 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11265,16 +11563,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11271: \$? = $ac_status" >&5
+  echo "$as_me:11569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11277: \$? = $ac_status" >&5
+  echo "$as_me:11575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11286,7 +11584,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11289 "configure"
+#line 11587 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11304,16 +11602,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11310: \$? = $ac_status" >&5
+  echo "$as_me:11608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11316: \$? = $ac_status" >&5
+  echo "$as_me:11614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11328,7 +11626,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11331: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11629: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11488,16 +11786,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11491: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11789: 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}:11497: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11795: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11500 "configure"
+#line 11798 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11512,16 +11810,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11524: \$? = $ac_status" >&5
+  echo "$as_me:11822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11542,7 +11840,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11545 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11557,16 +11855,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11563: \$? = $ac_status" >&5
+  echo "$as_me:11861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11569: \$? = $ac_status" >&5
+  echo "$as_me:11867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11577,7 +11875,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11585,10 +11883,10 @@ echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11588: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11886: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11591 "configure"
+#line 11889 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11603,16 +11901,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11609: \$? = $ac_status" >&5
+  echo "$as_me:11907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11615: \$? = $ac_status" >&5
+  echo "$as_me:11913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11628,7 +11926,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11631: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11929: 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
@@ -11741,10 +12039,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12042: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11747 "configure"
+#line 12045 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11762,23 +12060,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11768: \$? = $ac_status" >&5
+  echo "$as_me:12066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11774: \$? = $ac_status" >&5
+  echo "$as_me:12072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:11781: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12079: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -11801,7 +12099,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11804: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12102: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -11813,7 +12111,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11816: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12114: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -11901,7 +12199,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11904: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11911,7 +12209,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11914: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11921,7 +12219,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11924: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12222: 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"
@@ -11933,10 +12231,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:11936: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12234: 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 11939 "configure"
+#line 12237 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11951,16 +12249,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11957: \$? = $ac_status" >&5
+  echo "$as_me:12255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11963: \$? = $ac_status" >&5
+  echo "$as_me:12261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -11969,12 +12267,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:11972: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12270: 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 11977 "configure"
+#line 12275 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -11989,16 +12287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11995: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12001: \$? = $ac_status" >&5
+  echo "$as_me:12299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12009,19 +12307,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12012: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12310: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12017: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12315: 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 12024 "configure"
+#line 12322 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12039,16 +12337,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12045: \$? = $ac_status" >&5
+  echo "$as_me:12343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12051: \$? = $ac_status" >&5
+  echo "$as_me:12349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12060,7 +12358,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12063 "configure"
+#line 12361 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12078,16 +12376,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12084: \$? = $ac_status" >&5
+  echo "$as_me:12382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12090: \$? = $ac_status" >&5
+  echo "$as_me:12388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12102,7 +12400,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12105: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12403: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12253,14 +12551,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12256: checking if SIGWINCH is defined" >&5
+echo "$as_me:12554: 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 12263 "configure"
+#line 12561 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12275,23 +12573,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12281: \$? = $ac_status" >&5
+  echo "$as_me:12579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12585: \$? = $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 12294 "configure"
+#line 12592 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12309,16 +12607,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12315: \$? = $ac_status" >&5
+  echo "$as_me:12613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12321: \$? = $ac_status" >&5
+  echo "$as_me:12619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12332,11 +12630,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12335: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12633: 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:12339: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12637: 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
@@ -12347,7 +12645,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12350 "configure"
+#line 12648 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12369,16 +12667,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12375: \$? = $ac_status" >&5
+  echo "$as_me:12673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12381: \$? = $ac_status" >&5
+  echo "$as_me:12679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12392,7 +12690,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12395: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12693: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12402,13 +12700,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12405: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12703: 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 12411 "configure"
+#line 12709 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12422,16 +12720,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12428: \$? = $ac_status" >&5
+  echo "$as_me:12726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12434: \$? = $ac_status" >&5
+  echo "$as_me:12732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12442,7 +12740,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12445: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12743: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12456,7 +12754,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12459: checking if you want wide-character code" >&5
+echo "$as_me:12757: 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.
@@ -12466,7 +12764,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12469: result: $with_widec" >&5
+echo "$as_me:12767: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12488,7 +12786,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12491: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12789: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12501,23 +12799,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12504: checking for $ac_header" >&5
+echo "$as_me:12802: 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 12510 "configure"
+#line 12808 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12812: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12520: \$? = $ac_status" >&5
+  echo "$as_me:12818: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12536,7 +12834,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12539: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12837: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12546,14 +12844,14 @@ EOF
 fi
 done
 
-echo "$as_me:12549: checking if wchar.h can be used as is" >&5
+echo "$as_me:12847: 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 12556 "configure"
+#line 12854 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12575,16 +12873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12581: \$? = $ac_status" >&5
+  echo "$as_me:12879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12587: \$? = $ac_status" >&5
+  echo "$as_me:12885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12594,16 +12892,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12597: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12895: 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:12603: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12901: 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 12606 "configure"
+#line 12904 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12619,16 +12917,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12625: \$? = $ac_status" >&5
+  echo "$as_me:12923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12631: \$? = $ac_status" >&5
+  echo "$as_me:12929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12637,16 +12935,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12640: result: $cf_result" >&5
+echo "$as_me:12938: 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:12646: checking checking for compatible value versus " >&5
+	echo "$as_me:12944: 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 12649 "configure"
+#line 12947 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12662,16 +12960,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
+  echo "$as_me:12966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12674: \$? = $ac_status" >&5
+  echo "$as_me:12972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12680,7 +12978,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12683: result: $cf_result" >&5
+	echo "$as_me:12981: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12690,7 +12988,7 @@ fi
 
 fi
 
-echo "$as_me:12693: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12991: 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
@@ -12761,7 +13059,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12764 "configure"
+#line 13062 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12806,15 +13104,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12812: \$? = $ac_status" >&5
+  echo "$as_me:13110: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12817: \$? = $ac_status" >&5
+  echo "$as_me:13115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -12827,7 +13125,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:12830: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13128: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -12838,13 +13136,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:12841: checking for $ac_func" >&5
+echo "$as_me:13139: 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 12847 "configure"
+#line 13145 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12875,16 +13173,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12881: \$? = $ac_status" >&5
+  echo "$as_me:13179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12887: \$? = $ac_status" >&5
+  echo "$as_me:13185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12894,7 +13192,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12897: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13195: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12909,23 +13207,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12912: checking for $ac_header" >&5
+echo "$as_me:13210: 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 12918 "configure"
+#line 13216 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12928: \$? = $ac_status" >&5
+  echo "$as_me:13226: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12944,7 +13242,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12954,7 +13252,7 @@ EOF
 fi
 done
 
-echo "$as_me:12957: checking for multibyte character support" >&5
+echo "$as_me:13255: 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
@@ -12962,7 +13260,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12965 "configure"
+#line 13263 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12979,16 +13277,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12985: \$? = $ac_status" >&5
+  echo "$as_me:13283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12991: \$? = $ac_status" >&5
+  echo "$as_me:13289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13000,12 +13298,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13003: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13301: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13008 "configure"
+#line 13306 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13018,16 +13316,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13024: \$? = $ac_status" >&5
+  echo "$as_me:13322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13030: \$? = $ac_status" >&5
+  echo "$as_me:13328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13041,7 +13339,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13044 "configure"
+#line 13342 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13054,16 +13352,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13060: \$? = $ac_status" >&5
+  echo "$as_me:13358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13066: \$? = $ac_status" >&5
+  echo "$as_me:13364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13080,9 +13378,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13083: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13381: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13085: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13383: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13173,7 +13471,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13474: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13181,7 +13479,7 @@ echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13184 "configure"
+#line 13482 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13194,21 +13492,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13200: \$? = $ac_status" >&5
+  echo "$as_me:13498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13206: \$? = $ac_status" >&5
+  echo "$as_me:13504: \$? = $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}:13211: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13226,7 +13524,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13229: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13301,13 +13599,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13304: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13602: 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 13310 "configure"
+#line 13608 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13320,21 +13618,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13326: \$? = $ac_status" >&5
+  echo "$as_me:13624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13332: \$? = $ac_status" >&5
+  echo "$as_me:13630: \$? = $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}:13337: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13635: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13376,7 +13674,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13379: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13677: 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
@@ -13414,7 +13712,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13417 "configure"
+#line 13715 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13426,16 +13724,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13432: \$? = $ac_status" >&5
+  echo "$as_me:13730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13438: \$? = $ac_status" >&5
+  echo "$as_me:13736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13452,7 +13750,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13455: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13753: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13488,7 +13786,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13789: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13520,14 +13818,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13523: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13821: 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 13530 "configure"
+#line 13828 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13545,23 +13843,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13551: \$? = $ac_status" >&5
+  echo "$as_me:13849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13557: \$? = $ac_status" >&5
+  echo "$as_me:13855: \$? = $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 13564 "configure"
+#line 13862 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13580,16 +13878,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13586: \$? = $ac_status" >&5
+  echo "$as_me:13884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13592: \$? = $ac_status" >&5
+  echo "$as_me:13890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13601,7 +13899,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13604: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13902: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13619,14 +13917,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13622: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13920: 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 13629 "configure"
+#line 13927 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13644,23 +13942,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13650: \$? = $ac_status" >&5
+  echo "$as_me:13948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13656: \$? = $ac_status" >&5
+  echo "$as_me:13954: \$? = $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 13663 "configure"
+#line 13961 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13679,16 +13977,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13685: \$? = $ac_status" >&5
+  echo "$as_me:13983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13691: \$? = $ac_status" >&5
+  echo "$as_me:13989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13700,7 +13998,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13703: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14001: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -13723,14 +14021,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:13726: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14024: 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 13733 "configure"
+#line 14031 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13748,23 +14046,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13754: \$? = $ac_status" >&5
+  echo "$as_me:14052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13760: \$? = $ac_status" >&5
+  echo "$as_me:14058: \$? = $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 13767 "configure"
+#line 14065 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13783,16 +14081,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13789: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13795: \$? = $ac_status" >&5
+  echo "$as_me:14093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -13804,7 +14102,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13807: result: $cf_cv_wint_t" >&5
+echo "$as_me:14105: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -13836,7 +14134,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:13839: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14137: 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.
@@ -13846,7 +14144,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:13849: result: $with_lp64" >&5
+echo "$as_me:14147: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -13862,7 +14160,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:13865: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14163: 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
@@ -13874,7 +14172,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 13877 "configure"
+#line 14175 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13894,16 +14192,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13900: \$? = $ac_status" >&5
+  echo "$as_me:14198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13906: \$? = $ac_status" >&5
+  echo "$as_me:14204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13913,16 +14211,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13919: \$? = $ac_status" >&5
+  echo "$as_me:14217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13925: \$? = $ac_status" >&5
+  echo "$as_me:14223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -13936,13 +14234,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:13939: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14237: 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:13945: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14243: 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
@@ -13950,7 +14248,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13953 "configure"
+#line 14251 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13970,16 +14268,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:14274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13982: \$? = $ac_status" >&5
+  echo "$as_me:14280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -13988,7 +14286,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13991 "configure"
+#line 14289 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14009,16 +14307,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14015: \$? = $ac_status" >&5
+  echo "$as_me:14313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:14319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14029,7 +14327,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14032: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14330: 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
 
@@ -14039,7 +14337,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14042: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14340: 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
@@ -14047,7 +14345,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14050 "configure"
+#line 14348 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14067,16 +14365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14073: \$? = $ac_status" >&5
+  echo "$as_me:14371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14079: \$? = $ac_status" >&5
+  echo "$as_me:14377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14085,7 +14383,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14088 "configure"
+#line 14386 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14106,16 +14404,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14112: \$? = $ac_status" >&5
+  echo "$as_me:14410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14118: \$? = $ac_status" >&5
+  echo "$as_me:14416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14126,7 +14424,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14129: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14427: 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
 
@@ -14139,7 +14437,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14142: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14440: 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
@@ -14147,7 +14445,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14150 "configure"
+#line 14448 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14162,16 +14460,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14168: \$? = $ac_status" >&5
+  echo "$as_me:14466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14174: \$? = $ac_status" >&5
+  echo "$as_me:14472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14180,7 +14478,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14183 "configure"
+#line 14481 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14196,16 +14494,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14202: \$? = $ac_status" >&5
+  echo "$as_me:14500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14208: \$? = $ac_status" >&5
+  echo "$as_me:14506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14216,7 +14514,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14219: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14517: 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
 
@@ -14230,13 +14528,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14233: checking for fseeko" >&5
+echo "$as_me:14531: 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 14239 "configure"
+#line 14537 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14250,16 +14548,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14256: \$? = $ac_status" >&5
+  echo "$as_me:14554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14262: \$? = $ac_status" >&5
+  echo "$as_me:14560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14269,7 +14567,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14272: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14570: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14308,14 +14606,14 @@ fi
 
 	fi
 
-	echo "$as_me:14311: checking whether to use struct dirent64" >&5
+	echo "$as_me:14609: 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 14318 "configure"
+#line 14616 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14342,16 +14640,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14348: \$? = $ac_status" >&5
+  echo "$as_me:14646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14354: \$? = $ac_status" >&5
+  echo "$as_me:14652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14362,7 +14660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14365: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14663: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14372,7 +14670,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14375: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14673: 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.
@@ -14382,14 +14680,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14385: result: $with_tparm_varargs" >&5
+echo "$as_me:14683: 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:14392: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14690: 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.
@@ -14399,14 +14697,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14402: result: $with_tic_depends" >&5
+echo "$as_me:14700: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14409: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14707: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14418,15 +14716,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14421: result: no" >&5
+	echo "$as_me:14719: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14425: result: yes" >&5
+	echo "$as_me:14723: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14429: checking for X11 rgb file" >&5
+echo "$as_me:14727: 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.
@@ -14490,7 +14788,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14493: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14498,7 +14796,7 @@ esac
 
 fi
 
-echo "$as_me:14501: result: $RGB_PATH" >&5
+echo "$as_me:14799: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14513,7 +14811,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14516: checking for type of bool" >&5
+echo "$as_me:14814: 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.
@@ -14523,17 +14821,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14526: result: $NCURSES_BOOL" >&5
+echo "$as_me:14824: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14530: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14536: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14834: 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.
@@ -14545,16 +14843,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14548: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14552: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14557: checking for type of chtype" >&5
+echo "$as_me:14855: 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.
@@ -14564,11 +14862,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14567: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14571: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14576,7 +14874,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14579: checking for type of ospeed" >&5
+echo "$as_me:14877: 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.
@@ -14586,11 +14884,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14589: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14593: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14598,7 +14896,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14601: checking for type of mmask-t" >&5
+echo "$as_me:14899: 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.
@@ -14608,18 +14906,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14611: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14615: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14622: checking for size CCHARW_MAX" >&5
+echo "$as_me:14920: 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.
@@ -14629,16 +14927,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14632: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14635: checking for signed char" >&5
+echo "$as_me:14933: 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 14641 "configure"
+#line 14939 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14653,16 +14951,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14659: \$? = $ac_status" >&5
+  echo "$as_me:14957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14665: \$? = $ac_status" >&5
+  echo "$as_me:14963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14672,10 +14970,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14675: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14678: checking size of signed char" >&5
+echo "$as_me:14976: 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
@@ -14684,7 +14982,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14687 "configure"
+#line 14985 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14696,21 +14994,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14702: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14708: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14713 "configure"
+#line 15011 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14722,16 +15020,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14728: \$? = $ac_status" >&5
+  echo "$as_me:15026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14734: \$? = $ac_status" >&5
+  echo "$as_me:15032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14747,7 +15045,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 14750 "configure"
+#line 15048 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14759,16 +15057,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14765: \$? = $ac_status" >&5
+  echo "$as_me:15063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14771: \$? = $ac_status" >&5
+  echo "$as_me:15069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14784,7 +15082,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14787 "configure"
+#line 15085 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14796,16 +15094,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14802: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14808: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -14818,12 +15116,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14821: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15119: 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 14826 "configure"
+#line 15124 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14839,15 +15137,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14845: \$? = $ac_status" >&5
+  echo "$as_me:15143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14850: \$? = $ac_status" >&5
+  echo "$as_me:15148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14863,7 +15161,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14866: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -14874,7 +15172,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:14877: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -14884,13 +15182,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:14887: result: $with_signed_char" >&5
+echo "$as_me:15185: 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:14893: checking for type of tparm-arg" >&5
+echo "$as_me:15191: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -14900,18 +15198,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:14903: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:14907: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:14914: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15212: 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.
@@ -14921,7 +15219,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:14924: result: $with_rcs_ids" >&5
+echo "$as_me:15222: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -14930,7 +15228,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:14933: checking format of man-pages" >&5
+echo "$as_me:15231: 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.
@@ -15021,10 +15319,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15024: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15027: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15065,7 +15363,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15068: checking for manpage renaming" >&5
+echo "$as_me:15366: 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.
@@ -15094,15 +15392,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15097: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15102: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15105: checking if manpage aliases will be installed" >&5
+echo "$as_me:15403: 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.
@@ -15113,7 +15411,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15116: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15127,7 +15425,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15130: checking if manpage symlinks should be used" >&5
+echo "$as_me:15428: 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.
@@ -15140,17 +15438,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15143: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15149: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15153: checking for manpage tbl" >&5
+echo "$as_me:15451: 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.
@@ -15161,7 +15459,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15164: result: $MANPAGE_TBL" >&5
+echo "$as_me:15462: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15479,7 +15777,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15482: checking if you want to build with function extensions" >&5
+echo "$as_me:15780: 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.
@@ -15489,7 +15787,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15492: result: $with_ext_funcs" >&5
+echo "$as_me:15790: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15545,7 +15843,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15548: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15846: 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.
@@ -15555,7 +15853,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15558: result: $with_sp_funcs" >&5
+echo "$as_me:15856: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15574,7 +15872,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15577: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15875: 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.
@@ -15584,7 +15882,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15587: result: $with_term_driver" >&5
+echo "$as_me:15885: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15593,19 +15891,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15596: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15894: 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:15601: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15899: 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:15608: checking for extended use of const keyword" >&5
+echo "$as_me:15906: 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.
@@ -15615,7 +15913,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15618: result: $with_ext_const" >&5
+echo "$as_me:15916: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15623,7 +15921,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15626: checking if you want to use extended colors" >&5
+echo "$as_me:15924: 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.
@@ -15633,12 +15931,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15636: result: $with_ext_colors" >&5
+echo "$as_me:15934: 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:15641: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15939: 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)
@@ -15649,7 +15947,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15652: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15950: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15677,7 +15975,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15680: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15978: 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.
@@ -15687,7 +15985,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15690: result: $with_ext_mouse" >&5
+echo "$as_me:15988: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15697,7 +15995,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15700: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15998: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15714,7 +16012,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:15717: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16015: 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.
@@ -15724,7 +16022,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:15727: result: $with_ext_putwin" >&5
+echo "$as_me:16025: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -15734,7 +16032,7 @@ EOF
 
 fi
 
-echo "$as_me:15737: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16035: 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.
@@ -15744,7 +16042,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:15747: result: $with_no_padding" >&5
+echo "$as_me:16045: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15752,7 +16050,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:15755: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16053: 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.
@@ -15762,7 +16060,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:15765: result: $with_sigwinch" >&5
+echo "$as_me:16063: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -15777,7 +16075,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:15780: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16078: 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.
@@ -15787,7 +16085,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:15790: result: $with_tcap_names" >&5
+echo "$as_me:16088: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -15801,7 +16099,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:15804: checking if you want to link with the pthread library" >&5
+echo "$as_me:16102: 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.
@@ -15811,27 +16109,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15814: result: $with_pthread" >&5
+echo "$as_me:16112: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15818: checking for pthread.h" >&5
+	echo "$as_me:16116: 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 15824 "configure"
+#line 16122 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15828: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16126: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15834: \$? = $ac_status" >&5
+  echo "$as_me:16132: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15850,7 +16148,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15853: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16151: 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
 
@@ -15860,7 +16158,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15863: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16161: 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"
 
@@ -15881,7 +16179,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15884 "configure"
+#line 16182 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15898,16 +16196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15904: \$? = $ac_status" >&5
+  echo "$as_me:16202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15910: \$? = $ac_status" >&5
+  echo "$as_me:16208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15917,7 +16215,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15920: result: $with_pthread" >&5
+	    echo "$as_me:16218: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15945,7 +16243,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15948: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16246: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15955,13 +16253,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:15958: checking for pthread_kill" >&5
+	echo "$as_me:16256: 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 15964 "configure"
+#line 16262 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15992,16 +16290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15998: \$? = $ac_status" >&5
+  echo "$as_me:16296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16004: \$? = $ac_status" >&5
+  echo "$as_me:16302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16011,11 +16309,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16014: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16312: 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:16018: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16316: 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.
@@ -16025,7 +16323,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16028: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16326: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16036,7 +16334,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16039: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16337: 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.
@@ -16046,18 +16344,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16049: result: $use_weak_symbols" >&5
+	echo "$as_me:16347: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16053: checking if $CC supports weak symbols" >&5
+echo "$as_me:16351: 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 16060 "configure"
+#line 16358 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16083,16 +16381,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16089: \$? = $ac_status" >&5
+  echo "$as_me:16387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16095: \$? = $ac_status" >&5
+  echo "$as_me:16393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16103,7 +16401,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16106: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16404: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16153,7 +16451,7 @@ fi
 # 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:16156: checking if you want reentrant code" >&5
+echo "$as_me:16454: 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.
@@ -16163,7 +16461,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16166: result: $with_reentrant" >&5
+echo "$as_me:16464: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16252,7 +16550,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16255: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16553: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16264,7 +16562,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16267: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16565: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16286,16 +16584,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16289: result: $enable_opaque_curses" >&5
+echo "$as_me:16587: 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:16294: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16592: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16298: checking whether form library structures should be opaque" >&5
+echo "$as_me:16596: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16312,10 +16610,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16315: result: $enable_opaque_form" >&5
+echo "$as_me:16613: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16318: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16616: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16332,10 +16630,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16335: result: $enable_opaque_menu" >&5
+echo "$as_me:16633: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16338: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16636: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16352,7 +16650,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16355: result: $enable_opaque_panel" >&5
+echo "$as_me:16653: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16362,7 +16660,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16365: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16663: 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.
@@ -16372,7 +16670,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16375: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16673: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16385,7 +16683,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16388: checking if you want all development code" >&5
+echo "$as_me:16686: 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.
@@ -16395,11 +16693,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16398: result: $with_develop" >&5
+echo "$as_me:16696: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16402: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16700: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16409,7 +16707,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16412: result: $enable_check_size" >&5
+echo "$as_me:16710: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16417,7 +16715,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16420: checking if you want hard-tabs code" >&5
+echo "$as_me:16718: 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.
@@ -16427,7 +16725,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16430: result: $enable_hard_tabs" >&5
+echo "$as_me:16728: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16435,7 +16733,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16438: checking if you want limited support for xmc" >&5
+echo "$as_me:16736: 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.
@@ -16445,7 +16743,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16448: result: $enable_xmc_glitch" >&5
+echo "$as_me:16746: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16455,7 +16753,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16458: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16756: 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.
@@ -16465,7 +16763,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16468: result: $with_assumed_color" >&5
+echo "$as_me:16766: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16473,7 +16771,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16476: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16774: 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.
@@ -16483,7 +16781,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16486: result: $with_hashmap" >&5
+echo "$as_me:16784: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16491,7 +16789,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16494: checking if you want colorfgbg code" >&5
+echo "$as_me:16792: 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.
@@ -16501,7 +16799,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16504: result: $with_colorfgbg" >&5
+echo "$as_me:16802: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16509,7 +16807,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16512: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16810: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16519,14 +16817,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16522: result: $cf_with_fvisibility" >&5
+echo "$as_me:16820: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16529: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16827: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16535,7 +16833,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16538 "configure"
+#line 16836 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16551,16 +16849,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16557: \$? = $ac_status" >&5
+  echo "$as_me:16855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16563: \$? = $ac_status" >&5
+  echo "$as_me:16861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16572,7 +16870,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16575: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16873: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16687,7 +16985,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16690: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16988: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16696,7 +16994,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16699 "configure"
+#line 16997 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16712,16 +17010,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16718: \$? = $ac_status" >&5
+  echo "$as_me:17016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16724: \$? = $ac_status" >&5
+  echo "$as_me:17022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -16733,7 +17031,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16736: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17034: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -16856,7 +17154,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:16859: checking if you want interop bindings" >&5
+echo "$as_me:17157: 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.
@@ -16866,13 +17164,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:16869: result: $with_exp_interop" >&5
+echo "$as_me:17167: 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:16875: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17173: 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.
@@ -16882,13 +17180,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:16885: result: $with_safe_sprintf" >&5
+echo "$as_me:17183: 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:16891: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17189: 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.
@@ -16898,7 +17196,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:16901: result: $with_scroll_hints" >&5
+echo "$as_me:17199: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16907,7 +17205,7 @@ EOF
 
 fi
 
-echo "$as_me:16910: checking if you want wgetch-events code" >&5
+echo "$as_me:17208: 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.
@@ -16917,7 +17215,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:16920: result: $with_wgetch_events" >&5
+echo "$as_me:17218: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -16932,7 +17230,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:16935: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17233: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -16942,7 +17240,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:16945: result: $with_exp_win32" >&5
+	echo "$as_me:17243: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -16968,7 +17266,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:16971: checking if you want to see long compiling messages" >&5
+echo "$as_me:17269: 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.
@@ -17002,7 +17300,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17005: result: $enableval" >&5
+echo "$as_me:17303: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17015,7 +17313,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17018: checking if you want to install stripped executables" >&5
+echo "$as_me:17316: 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.
@@ -17032,7 +17330,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17035: result: $enable_stripping" >&5
+echo "$as_me:17333: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17043,7 +17341,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17046: checking if install accepts -p option" >&5
+echo "$as_me:17344: 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
@@ -17074,10 +17372,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17077: result: $cf_cv_install_p" >&5
+echo "$as_me:17375: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17080: checking if install needs to be told about ownership" >&5
+echo "$as_me:17378: 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)
@@ -17088,7 +17386,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17091: result: $with_install_o" >&5
+echo "$as_me:17389: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17099,7 +17397,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17102: checking if you want to specify strip-program" >&5
+	echo "$as_me:17400: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17109,11 +17407,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17112: result: $with_strip_program" >&5
+	echo "$as_me:17410: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17116: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17414: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17134,11 +17432,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17137: result: $check_install_strip" >&5
+		echo "$as_me:17435: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17141: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17439: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17153,7 +17451,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17156: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17454: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17179,7 +17477,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17182: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17480: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17196,17 +17494,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17199: result: $enable_stdnoreturn" >&5
+echo "$as_me:17497: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17203: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17501: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17209 "configure"
+#line 17507 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17222,16 +17520,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17228: \$? = $ac_status" >&5
+  echo "$as_me:17526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17234: \$? = $ac_status" >&5
+  echo "$as_me:17532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17242,7 +17540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17245: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17543: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17298,16 +17596,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17301: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17599: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17306: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17604: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17310: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17608: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17346,16 +17644,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17349: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17647: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17354: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17652: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17358: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17656: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17394,23 +17692,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17397: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17695: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17402: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17700: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17406: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17704: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17413: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17711: 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.
@@ -17427,7 +17725,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17430: result: $enable_warnings" >&5
+echo "$as_me:17728: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17451,7 +17749,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17454 "configure"
+#line 17752 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17466,26 +17764,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17472: \$? = $ac_status" >&5
+  echo "$as_me:17770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17478: \$? = $ac_status" >&5
+  echo "$as_me:17776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17481: checking for X11/Xt const-feature" >&5
+echo "$as_me:17779: 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 17488 "configure"
+#line 17786 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17503,16 +17801,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17509: \$? = $ac_status" >&5
+  echo "$as_me:17807: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17515: \$? = $ac_status" >&5
+  echo "$as_me:17813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17527,7 +17825,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17530: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17828: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17556,7 +17854,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17559 "${as_me:-configure}"
+#line 17857 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17572,7 +17870,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17575: checking for $CC warning options..." >&5
+	{ echo "$as_me:17873: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17588,12 +17886,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17591: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17594: \$? = $ac_status" >&5
+  echo "$as_me:17892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17596: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17894: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17601,7 +17899,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17604: checking for $CC warning options..." >&5
+	{ echo "$as_me:17902: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17624,12 +17922,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17627: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17630: \$? = $ac_status" >&5
+  echo "$as_me:17928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17632: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17930: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17637,7 +17935,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17640: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17938: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17647,7 +17945,7 @@ echo "${as_me:-configure}:17640: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17650: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17948: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17680,10 +17978,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17683: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17981: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17686 "${as_me:-configure}"
+#line 17984 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -17733,12 +18031,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:17736: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17739: \$? = $ac_status" >&5
+  echo "$as_me:18037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17741: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18039: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -17810,12 +18108,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:17813: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18111: 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 17818 "configure"
+#line 18116 "configure"
 #include "confdefs.h"
 
 int
@@ -17832,16 +18130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17838: \$? = $ac_status" >&5
+  echo "$as_me:18136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17844: \$? = $ac_status" >&5
+  echo "$as_me:18142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17852,7 +18150,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17855: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18153: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -17861,11 +18159,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17864: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18162: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 17868 "configure"
+#line 18166 "configure"
 #include "confdefs.h"
 
 int
@@ -17882,16 +18180,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17888: \$? = $ac_status" >&5
+  echo "$as_me:18186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17894: \$? = $ac_status" >&5
+  echo "$as_me:18192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -17901,7 +18199,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17904: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18202: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -17910,30 +18208,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:17913: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18211: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:17920: checking version of $CC" >&5
+	echo "$as_me:18218: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:17924: result: $CLANG_VERSION" >&5
+	echo "$as_me:18222: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:17931: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18229: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17936 "configure"
+#line 18234 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -17947,16 +18245,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18248: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17953: \$? = $ac_status" >&5
+  echo "$as_me:18251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17959: \$? = $ac_status" >&5
+  echo "$as_me:18257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -17967,13 +18265,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17970: result: $cf_clang_optok" >&5
+		echo "$as_me:18268: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:17976: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18274: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -17990,7 +18288,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 17993 "configure"
+#line 18291 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18008,7 +18306,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18011: checking for $CC warning options..." >&5
+	{ echo "$as_me:18309: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18025,12 +18323,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18028: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18031: \$? = $ac_status" >&5
+  echo "$as_me:18329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18033: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18331: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18039,7 +18337,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18042: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18340: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18069,16 +18367,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18072: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18075: \$? = $ac_status" >&5
+  echo "$as_me:18373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18077: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18375: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18081: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18379: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18096,7 +18394,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18099: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18397: 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.
@@ -18106,7 +18404,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18109: result: $enable_string_hacks" >&5
+echo "$as_me:18407: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18115,15 +18413,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18118: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18416: 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:18120: checking for strlcat" >&5
+	echo "$as_me:18418: 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 18126 "configure"
+#line 18424 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18154,16 +18452,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18160: \$? = $ac_status" >&5
+  echo "$as_me:18458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18166: \$? = $ac_status" >&5
+  echo "$as_me:18464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18173,7 +18471,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18176: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18474: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18183,7 +18481,7 @@ EOF
 
 else
 
-		echo "$as_me:18186: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18484: 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
@@ -18191,7 +18489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18194 "configure"
+#line 18492 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18210,16 +18508,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18216: \$? = $ac_status" >&5
+  echo "$as_me:18514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18222: \$? = $ac_status" >&5
+  echo "$as_me:18520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18230,7 +18528,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18233: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18531: 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
 
@@ -18253,23 +18551,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18256: checking for $ac_header" >&5
+echo "$as_me:18554: 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 18262 "configure"
+#line 18560 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18266: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18564: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18272: \$? = $ac_status" >&5
+  echo "$as_me:18570: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18288,7 +18586,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18291: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18589: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18309,13 +18607,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18312: checking for $ac_func" >&5
+echo "$as_me:18610: 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 18318 "configure"
+#line 18616 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18346,16 +18644,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18352: \$? = $ac_status" >&5
+  echo "$as_me:18650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18358: \$? = $ac_status" >&5
+  echo "$as_me:18656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18365,7 +18663,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18666: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18378,7 +18676,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18381: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18679: 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.
@@ -18388,7 +18686,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18391: result: $with_assertions" >&5
+echo "$as_me:18689: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18404,7 +18702,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18407: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18705: 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.
@@ -18426,7 +18724,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18429: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18727: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18540,23 +18838,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18543: checking for dmalloc.h" >&5
+	echo "$as_me:18841: 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 18549 "configure"
+#line 18847 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18553: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18559: \$? = $ac_status" >&5
+  echo "$as_me:18857: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18575,11 +18873,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18578: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18876: 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:18582: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18880: 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
@@ -18587,7 +18885,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18590 "configure"
+#line 18888 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18606,16 +18904,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18612: \$? = $ac_status" >&5
+  echo "$as_me:18910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18618: \$? = $ac_status" >&5
+  echo "$as_me:18916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18626,7 +18924,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18629: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18927: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18641,7 +18939,7 @@ fi
 
 fi
 
-echo "$as_me:18644: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18942: 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.
@@ -18663,7 +18961,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18666: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18964: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18777,23 +19075,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18780: checking for dbmalloc.h" >&5
+	echo "$as_me:19078: 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 18786 "configure"
+#line 19084 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18790: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19088: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18796: \$? = $ac_status" >&5
+  echo "$as_me:19094: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18812,11 +19110,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18815: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19113: 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:18819: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19117: 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
@@ -18824,7 +19122,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18827 "configure"
+#line 19125 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18843,16 +19141,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18849: \$? = $ac_status" >&5
+  echo "$as_me:19147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18855: \$? = $ac_status" >&5
+  echo "$as_me:19153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18863,7 +19161,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18866: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19164: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -18878,7 +19176,7 @@ fi
 
 fi
 
-echo "$as_me:18881: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19179: 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.
@@ -18900,7 +19198,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18903: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19201: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19013,7 +19311,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19016: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19314: 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.
@@ -19024,7 +19322,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19027: result: $with_no_leaks" >&5
+echo "$as_me:19325: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19076,7 +19374,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19079: checking whether to add trace feature to all models" >&5
+echo "$as_me:19377: 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.
@@ -19086,110 +19384,16 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19089: result: $cf_with_trace" >&5
+echo "$as_me:19387: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
 	LIB_TRACING=all
 	ADA_TRACE=TRUE
 
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in -DTRACE
-do
-case "$cf_fix_cppflags" in
-(no)
-	case "$cf_add_cflags" in
-	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
-		case "$cf_add_cflags" in
-		(-D*)
-			cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-				&& test -z "${cf_tst_cflags}" \
-				&& cf_fix_cppflags=yes
-
-			if test "$cf_fix_cppflags" = yes ; then
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-				continue
-			elif test "${cf_tst_cflags}" = "\"'" ; then
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-				continue
-			fi
-			;;
-		esac
-		case "$CPPFLAGS" in
-		(*$cf_add_cflags)
-			;;
-		(*)
-			case "$cf_add_cflags" in
-			(-D*)
-				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
-	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
-
-				;;
-			esac
-
-	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
-	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
-
-			;;
-		esac
-		;;
-	(*)
-
-	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
-	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
-
-		;;
-	esac
-	;;
-(yes)
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-	cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'`
-
-	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-		&& test -z "${cf_tst_cflags}" \
-		&& cf_fix_cppflags=no
-	;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
-	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
-	CFLAGS="${CFLAGS}$cf_new_cflags"
-
-fi
-
-if test -n "$cf_new_cppflags" ; then
-
-	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
-	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-
-fi
-
-if test -n "$cf_new_extra_cppflags" ; then
-
-	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
-	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-
-fi
+cat >>confdefs.h <<\EOF
+#define TRACE 1
+EOF
 
 cat >>confdefs.h <<\EOF
 #define HAVE__TRACEF 1
@@ -19200,7 +19404,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19203: checking if we want to use GNAT projects" >&5
+echo "$as_me:19407: 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.
@@ -19217,7 +19421,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19220: result: $enable_gnat_projects" >&5
+echo "$as_me:19424: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19230,14 +19434,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19233: checking if ssp library is needed" >&5
+echo "$as_me:19437: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19240 "configure"
+#line 19444 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19254,16 +19458,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19260: \$? = $ac_status" >&5
+  echo "$as_me:19464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19266: \$? = $ac_status" >&5
+  echo "$as_me:19470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19273,7 +19477,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19276 "configure"
+#line 19480 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19290,16 +19494,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19296: \$? = $ac_status" >&5
+  echo "$as_me:19500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19302: \$? = $ac_status" >&5
+  echo "$as_me:19506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19313,7 +19517,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19316: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19520: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19342,14 +19546,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19345: checking if -lm needed for math functions" >&5
+echo "$as_me:19549: 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 19352 "configure"
+#line 19556 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19365,16 +19569,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19371: \$? = $ac_status" >&5
+  echo "$as_me:19575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19377: \$? = $ac_status" >&5
+  echo "$as_me:19581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19384,7 +19588,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19387: result: $cf_cv_need_libm" >&5
+echo "$as_me:19591: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19392,14 +19596,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19395: checking if -lm is available for math functions" >&5
+	echo "$as_me:19599: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19402 "configure"
+#line 19606 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19415,16 +19619,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19421: \$? = $ac_status" >&5
+  echo "$as_me:19625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19427: \$? = $ac_status" >&5
+  echo "$as_me:19631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19434,7 +19638,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19437: result: $cf_cv_have_libm" >&5
+echo "$as_me:19641: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19456,13 +19660,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19459: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19663: 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 19465 "configure"
+#line 19669 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19478,16 +19682,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19484: \$? = $ac_status" >&5
+  echo "$as_me:19688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19490: \$? = $ac_status" >&5
+  echo "$as_me:19694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19497,7 +19701,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19500: result: $ac_cv_header_time" >&5
+echo "$as_me:19704: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19512,7 +19716,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19515: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19719: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19520,7 +19724,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19523 "configure"
+#line 19727 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19539,16 +19743,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19545: \$? = $ac_status" >&5
+  echo "$as_me:19749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19551: \$? = $ac_status" >&5
+  echo "$as_me:19755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19559,11 +19763,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19562: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19766: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19566: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19770: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19571,7 +19775,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19574 "configure"
+#line 19778 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19590,16 +19794,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19596: \$? = $ac_status" >&5
+  echo "$as_me:19800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19602: \$? = $ac_status" >&5
+  echo "$as_me:19806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19610,7 +19814,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19613: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19817: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19632,7 +19836,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19635: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19839: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19640,7 +19844,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19643 "configure"
+#line 19847 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19659,16 +19863,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19665: \$? = $ac_status" >&5
+  echo "$as_me:19869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19671: \$? = $ac_status" >&5
+  echo "$as_me:19875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19679,7 +19883,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19682: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19886: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19701,7 +19905,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19704: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19908: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19709,7 +19913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19712 "configure"
+#line 19916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19728,16 +19932,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19734: \$? = $ac_status" >&5
+  echo "$as_me:19938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19740: \$? = $ac_status" >&5
+  echo "$as_me:19944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19748,7 +19952,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19751: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19955: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19790,7 +19994,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19793: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19997: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19798,7 +20002,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19801 "configure"
+#line 20005 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19817,16 +20021,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19823: \$? = $ac_status" >&5
+  echo "$as_me:20027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19829: \$? = $ac_status" >&5
+  echo "$as_me:20033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -19837,7 +20041,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19840: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20044: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -19865,13 +20069,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:19868: checking for regcomp" >&5
+	echo "$as_me:20072: 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 19874 "configure"
+#line 20078 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19902,16 +20106,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19908: \$? = $ac_status" >&5
+  echo "$as_me:20112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19914: \$? = $ac_status" >&5
+  echo "$as_me:20118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -19921,7 +20125,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19924: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20128: 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
@@ -19930,7 +20134,7 @@ else
 		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:19933: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20137: 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
@@ -19938,7 +20142,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19941 "configure"
+#line 20145 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19957,16 +20161,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19963: \$? = $ac_status" >&5
+  echo "$as_me:20167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19969: \$? = $ac_status" >&5
+  echo "$as_me:20173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19977,7 +20181,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19980: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20184: 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
 
@@ -20009,13 +20213,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20012: checking for compile" >&5
+	echo "$as_me:20216: 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 20018 "configure"
+#line 20222 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20046,16 +20250,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20052: \$? = $ac_status" >&5
+  echo "$as_me:20256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20058: \$? = $ac_status" >&5
+  echo "$as_me:20262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20065,13 +20269,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20068: result: $ac_cv_func_compile" >&5
+echo "$as_me:20272: 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:20074: checking for compile in -lgen" >&5
+		echo "$as_me:20278: 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
@@ -20079,7 +20283,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20082 "configure"
+#line 20286 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20098,16 +20302,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20104: \$? = $ac_status" >&5
+  echo "$as_me:20308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20110: \$? = $ac_status" >&5
+  echo "$as_me:20314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20118,7 +20322,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20121: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20325: 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
 
@@ -20146,11 +20350,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20149: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20353: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20153: checking for regular-expression headers" >&5
+echo "$as_me:20357: 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
@@ -20162,7 +20366,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20165 "configure"
+#line 20369 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20179,16 +20383,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20185: \$? = $ac_status" >&5
+  echo "$as_me:20389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20191: \$? = $ac_status" >&5
+  echo "$as_me:20395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20205,7 +20409,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20208 "configure"
+#line 20412 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20225,16 +20429,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20231: \$? = $ac_status" >&5
+  echo "$as_me:20435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20237: \$? = $ac_status" >&5
+  echo "$as_me:20441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20250,11 +20454,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20253: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20457: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20257: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20461: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20292,23 +20496,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20295: checking for $ac_header" >&5
+echo "$as_me:20499: 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 20301 "configure"
+#line 20505 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20305: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20311: \$? = $ac_status" >&5
+  echo "$as_me:20515: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20327,7 +20531,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20330: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20340,23 +20544,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20343: checking for $ac_header" >&5
+echo "$as_me:20547: 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 20349 "configure"
+#line 20553 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20353: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20359: \$? = $ac_status" >&5
+  echo "$as_me:20563: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20375,7 +20579,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20378: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20385,7 +20589,7 @@ EOF
 fi
 done
 
-echo "$as_me:20388: checking for header declaring getopt variables" >&5
+echo "$as_me:20592: 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
@@ -20395,7 +20599,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20398 "configure"
+#line 20602 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20408,16 +20612,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20414: \$? = $ac_status" >&5
+  echo "$as_me:20618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20420: \$? = $ac_status" >&5
+  echo "$as_me:20624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20429,7 +20633,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20432: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20636: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20446,14 +20650,14 @@ EOF
 
 fi
 
-echo "$as_me:20449: checking if external environ is declared" >&5
+echo "$as_me:20653: 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 20456 "configure"
+#line 20660 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20466,16 +20670,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20472: \$? = $ac_status" >&5
+  echo "$as_me:20676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20478: \$? = $ac_status" >&5
+  echo "$as_me:20682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20486,7 +20690,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20489: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20693: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20501,14 +20705,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20504: checking if external environ exists" >&5
+echo "$as_me:20708: 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 20511 "configure"
+#line 20715 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20523,16 +20727,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20529: \$? = $ac_status" >&5
+  echo "$as_me:20733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20535: \$? = $ac_status" >&5
+  echo "$as_me:20739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20543,7 +20747,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20546: result: $cf_cv_have_environ" >&5
+echo "$as_me:20750: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20556,13 +20760,13 @@ EOF
 
 fi
 
-echo "$as_me:20559: checking for getenv" >&5
+echo "$as_me:20763: 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 20565 "configure"
+#line 20769 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20593,16 +20797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20599: \$? = $ac_status" >&5
+  echo "$as_me:20803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20605: \$? = $ac_status" >&5
+  echo "$as_me:20809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20612,19 +20816,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20615: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20819: 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:20621: checking for $ac_func" >&5
+echo "$as_me:20825: 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 20627 "configure"
+#line 20831 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20655,16 +20859,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20661: \$? = $ac_status" >&5
+  echo "$as_me:20865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20667: \$? = $ac_status" >&5
+  echo "$as_me:20871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20674,7 +20878,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20677: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20881: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20684,7 +20888,7 @@ EOF
 fi
 done
 
-echo "$as_me:20687: checking if getenv returns consistent values" >&5
+echo "$as_me:20891: 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
@@ -20694,7 +20898,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20697 "configure"
+#line 20901 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20799,15 +21003,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20805: \$? = $ac_status" >&5
+  echo "$as_me:21009: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20810: \$? = $ac_status" >&5
+  echo "$as_me:21014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -20820,7 +21024,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20823: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21027: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -20835,18 +21039,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:20838: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21042: 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
 
-echo "$as_me:20842: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21046: 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 20849 "configure"
+#line 21053 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20866,16 +21070,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20872: \$? = $ac_status" >&5
+  echo "$as_me:21076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20878: \$? = $ac_status" >&5
+  echo "$as_me:21082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20887,7 +21091,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20890: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21094: 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
@@ -20902,13 +21106,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:20905: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21109: 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 20911 "configure"
+#line 21115 "configure"
 #include "confdefs.h"
 
 int
@@ -20970,16 +21174,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20976: \$? = $ac_status" >&5
+  echo "$as_me:21180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20982: \$? = $ac_status" >&5
+  echo "$as_me:21186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -20989,7 +21193,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20992: result: $ac_cv_c_const" >&5
+echo "$as_me:21196: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -20999,7 +21203,7 @@ EOF
 
 fi
 
-echo "$as_me:21002: checking for inline" >&5
+echo "$as_me:21206: 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
@@ -21007,7 +21211,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21010 "configure"
+#line 21214 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21016,16 +21220,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21022: \$? = $ac_status" >&5
+  echo "$as_me:21226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21028: \$? = $ac_status" >&5
+  echo "$as_me:21232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21036,7 +21240,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21039: result: $ac_cv_c_inline" >&5
+echo "$as_me:21243: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21062,7 +21266,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21065: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21269: 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
@@ -21071,7 +21275,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21074 "configure"
+#line 21278 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21083,16 +21287,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21089: \$? = $ac_status" >&5
+  echo "$as_me:21293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21095: \$? = $ac_status" >&5
+  echo "$as_me:21299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21104,7 +21308,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21107: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21311: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21210,7 +21414,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21213: checking for signal global datatype" >&5
+echo "$as_me:21417: 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
@@ -21222,7 +21426,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21225 "configure"
+#line 21429 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21246,16 +21450,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21252: \$? = $ac_status" >&5
+  echo "$as_me:21456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21258: \$? = $ac_status" >&5
+  echo "$as_me:21462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21269,7 +21473,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21272: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21476: 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 <<EOF
@@ -21278,7 +21482,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21281: checking for type of chtype" >&5
+echo "$as_me:21485: 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
@@ -21288,7 +21492,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21291 "configure"
+#line 21495 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21323,15 +21527,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21329: \$? = $ac_status" >&5
+  echo "$as_me:21533: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21334: \$? = $ac_status" >&5
+  echo "$as_me:21538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21346,7 +21550,7 @@ fi
 
 fi
 
-echo "$as_me:21349: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21553: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21358,14 +21562,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21361: checking if unsigned literals are legal" >&5
+echo "$as_me:21565: 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 21368 "configure"
+#line 21572 "configure"
 #include "confdefs.h"
 
 int
@@ -21377,16 +21581,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21383: \$? = $ac_status" >&5
+  echo "$as_me:21587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21389: \$? = $ac_status" >&5
+  echo "$as_me:21593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21398,7 +21602,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21401: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21605: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21414,14 +21618,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21417: checking if external errno is declared" >&5
+echo "$as_me:21621: 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 21424 "configure"
+#line 21628 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21435,16 +21639,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21441: \$? = $ac_status" >&5
+  echo "$as_me:21645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21447: \$? = $ac_status" >&5
+  echo "$as_me:21651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21455,7 +21659,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21458: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21662: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21470,14 +21674,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21473: checking if external errno exists" >&5
+echo "$as_me:21677: 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 21480 "configure"
+#line 21684 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21492,16 +21696,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21498: \$? = $ac_status" >&5
+  echo "$as_me:21702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21504: \$? = $ac_status" >&5
+  echo "$as_me:21708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21512,7 +21716,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21515: result: $cf_cv_have_errno" >&5
+echo "$as_me:21719: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21525,7 +21729,7 @@ EOF
 
 fi
 
-echo "$as_me:21528: checking if data-only library module links" >&5
+echo "$as_me:21732: 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
@@ -21533,20 +21737,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21536 "configure"
+#line 21740 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21539: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:21746: \$? = $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 <<EOF
-#line 21549 "configure"
+#line 21753 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21563,10 +21767,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21566: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21569: \$? = $ac_status" >&5
+  echo "$as_me:21773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21579,7 +21783,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21582 "configure"
+#line 21786 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21590,15 +21794,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21596: \$? = $ac_status" >&5
+  echo "$as_me:21800: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21601: \$? = $ac_status" >&5
+  echo "$as_me:21805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21613,7 +21817,7 @@ fi
 
 fi
 
-echo "$as_me:21616: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21820: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21627,36 +21831,162 @@ fi
 
 ###	Checks for library functions.
 
-echo "$as_me:21630: checking for clock_gettime" >&5
+cf_save_libs="$LIBS"
+echo "$as_me:21835: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+if test "${ac_cv_func_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21841 "configure"
+#include "confdefs.h"
+#define clock_gettime autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef clock_gettime
+
+#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 clock_gettime (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_clock_gettime) || defined (__stub___clock_gettime)
+#error found stub for clock_gettime
+#endif
+
+	return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21872: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21875: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21878: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21881: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:21891: result: $ac_cv_func_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+if test "$ac_cv_func_clock_gettime" = yes; then
+  cf_cv_test_clock_gettime=yes
+else
+  echo "$as_me:21896: checking for clock_gettime in -lrt" >&5
+echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21904 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char clock_gettime (void);
+int
+main (void)
+{
+clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21923: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21926: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21929: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21932: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_rt_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:21943: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+  LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes
+else
+  cf_cv_test_clock_gettime=no
+fi
+
+fi
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+echo "$as_me:21955: checking if clock_gettime links" >&5
+echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21637 "configure"
+#line 21962 "configure"
 #include "confdefs.h"
+
+$ac_includes_default
 #include <time.h>
+
 int
 main (void)
 {
 struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21653: \$? = $ac_status" >&5
+  echo "$as_me:21983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21659: \$? = $ac_status" >&5
+  echo "$as_me:21989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21667,8 +21997,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21670: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22000: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
@@ -21678,13 +22011,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:21681: checking for gettimeofday" >&5
+echo "$as_me:22014: 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 21687 "configure"
+#line 22020 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21715,16 +22048,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21721: \$? = $ac_status" >&5
+  echo "$as_me:22054: \$? = $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:22057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21727: \$? = $ac_status" >&5
+  echo "$as_me:22060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -21734,7 +22067,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21737: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22070: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -21744,7 +22077,7 @@ EOF
 
 else
 
-echo "$as_me:21747: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22080: 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
@@ -21752,7 +22085,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21755 "configure"
+#line 22088 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21771,16 +22104,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21777: \$? = $ac_status" >&5
+  echo "$as_me:22110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21783: \$? = $ac_status" >&5
+  echo "$as_me:22116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -21791,7 +22124,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21794: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22127: 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
 
@@ -21850,13 +22183,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21853: checking for $ac_func" >&5
+echo "$as_me:22186: 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 21859 "configure"
+#line 22192 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21887,16 +22220,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21893: \$? = $ac_status" >&5
+  echo "$as_me:22226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21899: \$? = $ac_status" >&5
+  echo "$as_me:22232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21906,7 +22239,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21909: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22242: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -21916,14 +22249,14 @@ EOF
 fi
 done
 
-echo "$as_me:21919: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22252: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21926 "configure"
+#line 22259 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21938,16 +22271,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21944: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21950: \$? = $ac_status" >&5
+  echo "$as_me:22283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -21957,7 +22290,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21960: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22293: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -21979,7 +22312,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:21982: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22315: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21989,7 +22322,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21992 "configure"
+#line 22325 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22002,15 +22335,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22008: \$? = $ac_status" >&5
+  echo "$as_me:22341: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22013: \$? = $ac_status" >&5
+  echo "$as_me:22346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22022,7 +22355,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22025: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22358: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22034,14 +22367,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22037: checking for getttynam" >&5
+	echo "$as_me:22370: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22044 "configure"
+#line 22377 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22053,16 +22386,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22059: \$? = $ac_status" >&5
+  echo "$as_me:22392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22065: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22072,7 +22405,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22075: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22408: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22082,7 +22415,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22085: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22418: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22091,7 +22424,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22094: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22427: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22104,14 +22437,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22107: checking for terminal-capability database functions" >&5
+echo "$as_me:22440: 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 22114 "configure"
+#line 22447 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22131,16 +22464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22137: \$? = $ac_status" >&5
+  echo "$as_me:22470: \$? = $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:22473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22143: \$? = $ac_status" >&5
+  echo "$as_me:22476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22151,7 +22484,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22154: result: $cf_cv_cgetent" >&5
+echo "$as_me:22487: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22161,14 +22494,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22164: checking if cgetent uses const parameter" >&5
+echo "$as_me:22497: 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 22171 "configure"
+#line 22504 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22191,16 +22524,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22197: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22203: \$? = $ac_status" >&5
+  echo "$as_me:22536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22211,7 +22544,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22214: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22547: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22225,14 +22558,14 @@ fi
 
 fi
 
-echo "$as_me:22228: checking for isascii" >&5
+echo "$as_me:22561: 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 22235 "configure"
+#line 22568 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22244,16 +22577,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22250: \$? = $ac_status" >&5
+  echo "$as_me:22583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22256: \$? = $ac_status" >&5
+  echo "$as_me:22589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22264,7 +22597,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22267: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22600: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22272,10 +22605,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22275: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22608: 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 22278 "configure"
+#line 22611 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22289,16 +22622,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22295: \$? = $ac_status" >&5
+  echo "$as_me:22628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22301: \$? = $ac_status" >&5
+  echo "$as_me:22634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22306,7 +22639,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22309 "configure"
+#line 22642 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22321,16 +22654,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22327: \$? = $ac_status" >&5
+  echo "$as_me:22660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22333: \$? = $ac_status" >&5
+  echo "$as_me:22666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22346,11 +22679,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22349: result: $sigact_bad" >&5
+echo "$as_me:22682: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22353: checking if nanosleep really works" >&5
+echo "$as_me:22686: 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
@@ -22360,7 +22693,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22363 "configure"
+#line 22696 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22386,15 +22719,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22392: \$? = $ac_status" >&5
+  echo "$as_me:22725: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22397: \$? = $ac_status" >&5
+  echo "$as_me:22730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22406,7 +22739,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22409: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22742: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22423,23 +22756,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22426: checking for $ac_header" >&5
+echo "$as_me:22759: 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 22432 "configure"
+#line 22765 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22436: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22775: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22458,7 +22791,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22794: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22475,10 +22808,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22478: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22811: 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 22481 "configure"
+#line 22814 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22490,16 +22823,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22496: \$? = $ac_status" >&5
+  echo "$as_me:22829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22502: \$? = $ac_status" >&5
+  echo "$as_me:22835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22507,7 +22840,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22510 "configure"
+#line 22843 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22521,16 +22854,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22527: \$? = $ac_status" >&5
+  echo "$as_me:22860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22533: \$? = $ac_status" >&5
+  echo "$as_me:22866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22546,19 +22879,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22549: result: $termios_bad" >&5
+	echo "$as_me:22882: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22554: checking for tcgetattr" >&5
+echo "$as_me:22887: 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 22561 "configure"
+#line 22894 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22586,16 +22919,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22592: \$? = $ac_status" >&5
+  echo "$as_me:22925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22598: \$? = $ac_status" >&5
+  echo "$as_me:22931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22605,21 +22938,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22608: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22941: 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:22615: checking for vsscanf function or workaround" >&5
+echo "$as_me:22948: 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 22622 "configure"
+#line 22955 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22645,16 +22978,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22651: \$? = $ac_status" >&5
+  echo "$as_me:22984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22657: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22662,7 +22995,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22665 "configure"
+#line 22998 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22684,16 +23017,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22690: \$? = $ac_status" >&5
+  echo "$as_me:23023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22696: \$? = $ac_status" >&5
+  echo "$as_me:23029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -22701,7 +23034,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22704 "configure"
+#line 23037 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22723,16 +23056,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:23062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22735: \$? = $ac_status" >&5
+  echo "$as_me:23068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -22747,7 +23080,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22750: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23083: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -22773,23 +23106,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22776: checking for $ac_header" >&5
+echo "$as_me:23109: 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 22782 "configure"
+#line 23115 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22786: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22792: \$? = $ac_status" >&5
+  echo "$as_me:23125: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22808,7 +23141,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22811: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22818,7 +23151,7 @@ EOF
 fi
 done
 
-echo "$as_me:22821: checking for working mkstemp" >&5
+echo "$as_me:23154: 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
@@ -22829,7 +23162,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22832 "configure"
+#line 23165 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22864,15 +23197,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:23203: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22875: \$? = $ac_status" >&5
+  echo "$as_me:23208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -22887,16 +23220,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:22890: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23223: 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:22893: checking for mkstemp" >&5
+	echo "$as_me:23226: 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 22899 "configure"
+#line 23232 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22927,16 +23260,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22933: \$? = $ac_status" >&5
+  echo "$as_me:23266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22939: \$? = $ac_status" >&5
+  echo "$as_me:23272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -22946,7 +23279,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22949: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23282: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -22967,21 +23300,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:22970: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23303: 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:22973: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23306: 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:22979: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23312: 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 22984 "configure"
+#line 23317 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -22998,15 +23331,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23004: \$? = $ac_status" >&5
+  echo "$as_me:23337: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23009: \$? = $ac_status" >&5
+  echo "$as_me:23342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23019,7 +23352,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23022: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23355: 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
 
@@ -23030,13 +23363,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23033: checking for intptr_t" >&5
+echo "$as_me:23366: 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 23039 "configure"
+#line 23372 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23051,16 +23384,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23057: \$? = $ac_status" >&5
+  echo "$as_me:23390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23063: \$? = $ac_status" >&5
+  echo "$as_me:23396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23070,7 +23403,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23073: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23406: 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
   :
@@ -23082,13 +23415,13 @@ EOF
 
 fi
 
-echo "$as_me:23085: checking for ssize_t" >&5
+echo "$as_me:23418: 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 23091 "configure"
+#line 23424 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23103,16 +23436,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23109: \$? = $ac_status" >&5
+  echo "$as_me:23442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23115: \$? = $ac_status" >&5
+  echo "$as_me:23448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23122,7 +23455,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23125: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23458: 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
   :
@@ -23134,14 +23467,14 @@ EOF
 
 fi
 
-echo "$as_me:23137: checking for type sigaction_t" >&5
+echo "$as_me:23470: 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 23144 "configure"
+#line 23477 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23154,16 +23487,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23157: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23160: \$? = $ac_status" >&5
+  echo "$as_me:23493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23166: \$? = $ac_status" >&5
+  echo "$as_me:23499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23174,14 +23507,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23177: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23510: 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:23184: checking declaration of size-change" >&5
+echo "$as_me:23517: 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
@@ -23202,7 +23535,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23205 "configure"
+#line 23538 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23252,16 +23585,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23258: \$? = $ac_status" >&5
+  echo "$as_me:23591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23264: \$? = $ac_status" >&5
+  echo "$as_me:23597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23280,7 +23613,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23283: result: $cf_cv_sizechange" >&5
+echo "$as_me:23616: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23298,13 +23631,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23301: checking for memmove" >&5
+echo "$as_me:23634: 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 23307 "configure"
+#line 23640 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23335,16 +23668,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23341: \$? = $ac_status" >&5
+  echo "$as_me:23674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23347: \$? = $ac_status" >&5
+  echo "$as_me:23680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23354,19 +23687,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23357: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23690: 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:23363: checking for bcopy" >&5
+echo "$as_me:23696: 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 23369 "configure"
+#line 23702 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23397,16 +23730,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23403: \$? = $ac_status" >&5
+  echo "$as_me:23736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23409: \$? = $ac_status" >&5
+  echo "$as_me:23742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23416,11 +23749,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23419: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23752: 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:23423: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23756: 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
@@ -23430,7 +23763,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23433 "configure"
+#line 23766 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23446,15 +23779,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23452: \$? = $ac_status" >&5
+  echo "$as_me:23785: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23457: \$? = $ac_status" >&5
+  echo "$as_me:23790: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23467,7 +23800,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23470: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23803: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23494,13 +23827,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23497: checking for $ac_func" >&5
+echo "$as_me:23830: 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 23503 "configure"
+#line 23836 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23531,16 +23864,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23537: \$? = $ac_status" >&5
+  echo "$as_me:23870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23543: \$? = $ac_status" >&5
+  echo "$as_me:23876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23550,7 +23883,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23553: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23886: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23560,7 +23893,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23563: checking if poll really works" >&5
+echo "$as_me:23896: 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
@@ -23570,7 +23903,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23573 "configure"
+#line 23906 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23623,15 +23956,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23629: \$? = $ac_status" >&5
+  echo "$as_me:23962: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23634: \$? = $ac_status" >&5
+  echo "$as_me:23967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23643,21 +23976,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23646: result: $cf_cv_working_poll" >&5
+echo "$as_me:23979: 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:23653: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23986: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23660 "configure"
+#line 23993 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23677,16 +24010,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23683: \$? = $ac_status" >&5
+  echo "$as_me:24016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23689: \$? = $ac_status" >&5
+  echo "$as_me:24022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -23696,7 +24029,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23699: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24032: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -23706,18 +24039,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:23709: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24042: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:23713: checking for va_copy" >&5
+echo "$as_me:24046: 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 23720 "configure"
+#line 24053 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23734,16 +24067,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23740: \$? = $ac_status" >&5
+  echo "$as_me:24073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23746: \$? = $ac_status" >&5
+  echo "$as_me:24079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -23753,7 +24086,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23756: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24089: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -23765,14 +24098,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:23768: checking for __va_copy" >&5
+echo "$as_me:24101: 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 23775 "configure"
+#line 24108 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23789,16 +24122,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23795: \$? = $ac_status" >&5
+  echo "$as_me:24128: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23801: \$? = $ac_status" >&5
+  echo "$as_me:24134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -23808,7 +24141,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23811: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24144: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -23820,14 +24153,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:23823: checking for __builtin_va_copy" >&5
+echo "$as_me:24156: 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 23830 "configure"
+#line 24163 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23844,16 +24177,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:24183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23856: \$? = $ac_status" >&5
+  echo "$as_me:24189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -23863,7 +24196,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23866: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24199: 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 &&
@@ -23881,14 +24214,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:23884: checking if we can simply copy va_list" >&5
+	echo "$as_me:24217: 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 23891 "configure"
+#line 24224 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23905,16 +24238,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23911: \$? = $ac_status" >&5
+  echo "$as_me:24244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23917: \$? = $ac_status" >&5
+  echo "$as_me:24250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -23924,19 +24257,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23927: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24260: 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:23932: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24265: 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 23939 "configure"
+#line 24272 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23953,16 +24286,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23959: \$? = $ac_status" >&5
+  echo "$as_me:24292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23965: \$? = $ac_status" >&5
+  echo "$as_me:24298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -23972,7 +24305,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23975: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24308: 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
@@ -23983,13 +24316,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:23986: checking for pid_t" >&5
+echo "$as_me:24319: 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 23992 "configure"
+#line 24325 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24004,16 +24337,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24010: \$? = $ac_status" >&5
+  echo "$as_me:24343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24016: \$? = $ac_status" >&5
+  echo "$as_me:24349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24023,7 +24356,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24026: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24359: 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
   :
@@ -24038,23 +24371,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24041: checking for $ac_header" >&5
+echo "$as_me:24374: 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 24047 "configure"
+#line 24380 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24384: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24057: \$? = $ac_status" >&5
+  echo "$as_me:24390: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24073,7 +24406,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24409: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24086,13 +24419,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24089: checking for $ac_func" >&5
+echo "$as_me:24422: 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 24095 "configure"
+#line 24428 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24123,16 +24456,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24129: \$? = $ac_status" >&5
+  echo "$as_me:24462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24135: \$? = $ac_status" >&5
+  echo "$as_me:24468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24142,7 +24475,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24145: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24478: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24154,7 +24487,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24157: checking for working fork" >&5
+  echo "$as_me:24490: 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
@@ -24177,15 +24510,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24183: \$? = $ac_status" >&5
+  echo "$as_me:24516: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24188: \$? = $ac_status" >&5
+  echo "$as_me:24521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24197,7 +24530,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24200: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24533: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24211,12 +24544,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24214: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24547: 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:24219: checking for working vfork" >&5
+  echo "$as_me:24552: 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
@@ -24225,7 +24558,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24228 "configure"
+#line 24561 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24318,15 +24651,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24324: \$? = $ac_status" >&5
+  echo "$as_me:24657: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24329: \$? = $ac_status" >&5
+  echo "$as_me:24662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24338,13 +24671,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24341: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24674: 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:24347: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24680: 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
 
@@ -24369,7 +24702,7 @@ EOF
 
 fi
 
-echo "$as_me:24372: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24705: 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
@@ -24379,7 +24712,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24382 "configure"
+#line 24715 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24414,15 +24747,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24420: \$? = $ac_status" >&5
+  echo "$as_me:24753: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24425: \$? = $ac_status" >&5
+  echo "$as_me:24758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24435,7 +24768,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24438: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24771: 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
@@ -24444,7 +24777,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24447: checking for openpty in -lutil" >&5
+echo "$as_me:24780: 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
@@ -24452,7 +24785,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24455 "configure"
+#line 24788 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24471,16 +24804,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24477: \$? = $ac_status" >&5
+  echo "$as_me:24810: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24483: \$? = $ac_status" >&5
+  echo "$as_me:24816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24491,7 +24824,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24494: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24827: 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
@@ -24499,7 +24832,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24502: checking for openpty header" >&5
+echo "$as_me:24835: 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
@@ -24526,7 +24859,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24529 "configure"
+#line 24862 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24544,16 +24877,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24550: \$? = $ac_status" >&5
+  echo "$as_me:24883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24556: \$? = $ac_status" >&5
+  echo "$as_me:24889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24571,7 +24904,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24574: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24907: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24644,7 +24977,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24647 "configure"
+#line 24980 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24656,16 +24989,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24662: \$? = $ac_status" >&5
+  echo "$as_me:24995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24668: \$? = $ac_status" >&5
+  echo "$as_me:25001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24682,7 +25015,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24685: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25018: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24718,7 +25051,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24721: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25054: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24729,7 +25062,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:24732: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25065: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -24801,7 +25134,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24804 "configure"
+#line 25137 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24813,16 +25146,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24819: \$? = $ac_status" >&5
+  echo "$as_me:25152: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24825: \$? = $ac_status" >&5
+  echo "$as_me:25158: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24839,7 +25172,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24842: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25175: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24919,7 +25252,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:24922: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25255: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -24936,23 +25269,23 @@ fi
 	fi
 esac
 
-echo "$as_me:24939: checking for db.h" >&5
+echo "$as_me:25272: 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 24945 "configure"
+#line 25278 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:24949: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24955: \$? = $ac_status" >&5
+  echo "$as_me:25288: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24971,11 +25304,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24974: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25307: 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:24978: checking for version of db" >&5
+echo "$as_me:25311: 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
@@ -24986,10 +25319,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:24989: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25322: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24992 "configure"
+#line 25325 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25019,16 +25352,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25025: \$? = $ac_status" >&5
+  echo "$as_me:25358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25031: \$? = $ac_status" >&5
+  echo "$as_me:25364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25042,16 +25375,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25045: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25378: 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:25049: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25382: 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:25054: checking for db libraries" >&5
+echo "$as_me:25387: 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
@@ -25081,10 +25414,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25084: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25417: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25087 "configure"
+#line 25420 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25139,16 +25472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25145: \$? = $ac_status" >&5
+  echo "$as_me:25478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25151: \$? = $ac_status" >&5
+  echo "$as_me:25484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25168,11 +25501,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25171: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25504: 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:25175: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25508: 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
@@ -25198,7 +25531,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25201: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25534: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25213,7 +25546,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25216: checking if we should include stdbool.h" >&5
+echo "$as_me:25549: 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
@@ -25221,7 +25554,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25224 "configure"
+#line 25557 "configure"
 #include "confdefs.h"
 
 int
@@ -25233,23 +25566,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25239: \$? = $ac_status" >&5
+  echo "$as_me:25572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25245: \$? = $ac_status" >&5
+  echo "$as_me:25578: \$? = $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 25252 "configure"
+#line 25585 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25265,16 +25598,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25271: \$? = $ac_status" >&5
+  echo "$as_me:25604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25277: \$? = $ac_status" >&5
+  echo "$as_me:25610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25288,13 +25621,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25291: result: yes" >&5
+then	echo "$as_me:25624: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25293: result: no" >&5
+else	echo "$as_me:25626: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25297: checking for builtin bool type" >&5
+echo "$as_me:25630: 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
@@ -25302,7 +25635,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25305 "configure"
+#line 25638 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25317,16 +25650,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25323: \$? = $ac_status" >&5
+  echo "$as_me:25656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25329: \$? = $ac_status" >&5
+  echo "$as_me:25662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25339,9 +25672,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25342: result: yes" >&5
+then	echo "$as_me:25675: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25344: result: no" >&5
+else	echo "$as_me:25677: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25358,10 +25691,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25361: checking if we already have C++ library" >&5
+	echo "$as_me:25694: 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 25364 "configure"
+#line 25697 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25375,16 +25708,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25381: \$? = $ac_status" >&5
+  echo "$as_me:25714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25387: \$? = $ac_status" >&5
+  echo "$as_me:25720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25393,7 +25726,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25396: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25729: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25412,7 +25745,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25415: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25748: 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
@@ -25438,7 +25771,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25441 "configure"
+#line 25774 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25452,16 +25785,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25458: \$? = $ac_status" >&5
+  echo "$as_me:25791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25464: \$? = $ac_status" >&5
+  echo "$as_me:25797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25473,7 +25806,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25476: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25809: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25495,7 +25828,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25498: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25831: 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
@@ -25510,15 +25843,15 @@ CF_EOF
 # 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:25513: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25516: \$? = $ac_status" >&5
+  echo "$as_me:25849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25518: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25521: \$? = $ac_status" >&5
+  echo "$as_me:25854: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25529,10 +25862,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25532: result: yes" >&5
+  echo "$as_me:25865: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25535: result: no" >&5
+  echo "$as_me:25868: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25552,7 +25885,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25555: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25888: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25573,7 +25906,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25576 "configure"
+#line 25909 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25587,16 +25920,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25593: \$? = $ac_status" >&5
+  echo "$as_me:25926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25599: \$? = $ac_status" >&5
+  echo "$as_me:25932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25633,7 +25966,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25636 "configure"
+#line 25969 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25647,16 +25980,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25653: \$? = $ac_status" >&5
+  echo "$as_me:25986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25659: \$? = $ac_status" >&5
+  echo "$as_me:25992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25689,7 +26022,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:25692: result: $cf_cxx_library" >&5
+	echo "$as_me:26025: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -25705,7 +26038,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:25708: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26041: 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
@@ -25722,18 +26055,18 @@ do
   # 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 25725 "configure"
+#line 26058 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25730: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26063: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25736: \$? = $ac_status" >&5
+  echo "$as_me:26069: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25756,17 +26089,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25759 "configure"
+#line 26092 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26096: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25769: \$? = $ac_status" >&5
+  echo "$as_me:26102: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25803,7 +26136,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:25806: result: $CXXCPP" >&5
+echo "$as_me:26139: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -25813,18 +26146,18 @@ do
   # 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 25816 "configure"
+#line 26149 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:25821: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25827: \$? = $ac_status" >&5
+  echo "$as_me:26160: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25847,17 +26180,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25850 "configure"
+#line 26183 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:25854: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26187: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25860: \$? = $ac_status" >&5
+  echo "$as_me:26193: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25885,7 +26218,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:25888: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26221: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25900,23 +26233,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25903: checking for $ac_header" >&5
+echo "$as_me:26236: 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 25909 "configure"
+#line 26242 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26246: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25919: \$? = $ac_status" >&5
+  echo "$as_me:26252: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25935,7 +26268,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25938: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26271: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25948,23 +26281,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25951: checking for $ac_header" >&5
+echo "$as_me:26284: 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 25957 "configure"
+#line 26290 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25961: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26294: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25967: \$? = $ac_status" >&5
+  echo "$as_me:26300: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -25983,7 +26316,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25986: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26319: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -25994,10 +26327,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:25997: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26330: 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 26000 "configure"
+#line 26333 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26014,16 +26347,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26032,7 +26365,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26035: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26368: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26043,7 +26376,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26046: checking if we should include stdbool.h" >&5
+echo "$as_me:26379: 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
@@ -26051,7 +26384,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26054 "configure"
+#line 26387 "configure"
 #include "confdefs.h"
 
 int
@@ -26063,23 +26396,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26069: \$? = $ac_status" >&5
+  echo "$as_me:26402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26075: \$? = $ac_status" >&5
+  echo "$as_me:26408: \$? = $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 26082 "configure"
+#line 26415 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26095,16 +26428,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26101: \$? = $ac_status" >&5
+  echo "$as_me:26434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26107: \$? = $ac_status" >&5
+  echo "$as_me:26440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26118,13 +26451,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26121: result: yes" >&5
+then	echo "$as_me:26454: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26123: result: no" >&5
+else	echo "$as_me:26456: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26127: checking for builtin bool type" >&5
+echo "$as_me:26460: 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
@@ -26132,7 +26465,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26135 "configure"
+#line 26468 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26147,16 +26480,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26153: \$? = $ac_status" >&5
+  echo "$as_me:26486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26159: \$? = $ac_status" >&5
+  echo "$as_me:26492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26169,19 +26502,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26172: result: yes" >&5
+then	echo "$as_me:26505: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26174: result: no" >&5
+else	echo "$as_me:26507: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26178: checking for bool" >&5
+echo "$as_me:26511: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26184 "configure"
+#line 26517 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26216,16 +26549,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26222: \$? = $ac_status" >&5
+  echo "$as_me:26555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26228: \$? = $ac_status" >&5
+  echo "$as_me:26561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26235,10 +26568,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26238: result: $ac_cv_type_bool" >&5
+echo "$as_me:26571: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26241: checking size of bool" >&5
+echo "$as_me:26574: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26247,7 +26580,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26250 "configure"
+#line 26583 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26279,21 +26612,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26282: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26285: \$? = $ac_status" >&5
+  echo "$as_me:26618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26291: \$? = $ac_status" >&5
+  echo "$as_me:26624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26296 "configure"
+#line 26629 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26325,16 +26658,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26331: \$? = $ac_status" >&5
+  echo "$as_me:26664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26337: \$? = $ac_status" >&5
+  echo "$as_me:26670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26350,7 +26683,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26353 "configure"
+#line 26686 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26382,16 +26715,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26388: \$? = $ac_status" >&5
+  echo "$as_me:26721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26394: \$? = $ac_status" >&5
+  echo "$as_me:26727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26407,7 +26740,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26410 "configure"
+#line 26743 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26439,16 +26772,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26445: \$? = $ac_status" >&5
+  echo "$as_me:26778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26451: \$? = $ac_status" >&5
+  echo "$as_me:26784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26461,12 +26794,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26464: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26797: 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 26469 "configure"
+#line 26802 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26502,15 +26835,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26508: \$? = $ac_status" >&5
+  echo "$as_me:26841: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26513: \$? = $ac_status" >&5
+  echo "$as_me:26846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26526,13 +26859,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26529: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26862: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26535: checking for type of bool" >&5
+echo "$as_me:26868: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26551,7 +26884,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26554 "configure"
+#line 26887 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26592,15 +26925,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26598: \$? = $ac_status" >&5
+  echo "$as_me:26931: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26603: \$? = $ac_status" >&5
+  echo "$as_me:26936: \$? = $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
@@ -26617,19 +26950,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26620: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26953: 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:26627: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26960: 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:26632: checking for special defines needed for etip.h" >&5
+echo "$as_me:26965: 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"
@@ -26647,7 +26980,7 @@ do
 	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 26650 "configure"
+#line 26983 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26661,16 +26994,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26667: \$? = $ac_status" >&5
+  echo "$as_me:27000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26673: \$? = $ac_status" >&5
+  echo "$as_me:27006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -26691,12 +27024,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:26694: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27027: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:26699: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27032: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26713,7 +27046,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26716 "configure"
+#line 27049 "configure"
 #include "confdefs.h"
 
 class base
@@ -26732,15 +27065,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26738: \$? = $ac_status" >&5
+  echo "$as_me:27071: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26743: \$? = $ac_status" >&5
+  echo "$as_me:27076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -26759,7 +27092,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26762: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27095: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -26768,7 +27101,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:26771: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27104: 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
@@ -26785,7 +27118,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26788 "configure"
+#line 27121 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -26804,15 +27137,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26810: \$? = $ac_status" >&5
+  echo "$as_me:27143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26815: \$? = $ac_status" >&5
+  echo "$as_me:27148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -26831,7 +27164,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26834: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27167: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -26841,7 +27174,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:26844: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27177: 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
@@ -26855,7 +27188,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26858 "configure"
+#line 27191 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -26899,16 +27232,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26905: \$? = $ac_status" >&5
+  echo "$as_me:27238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26911: \$? = $ac_status" >&5
+  echo "$as_me:27244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -26926,7 +27259,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:26929: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27262: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -26975,13 +27308,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:26978: checking for bool" >&5
+echo "$as_me:27311: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26984 "configure"
+#line 27317 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27016,16 +27349,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27019: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27022: \$? = $ac_status" >&5
+  echo "$as_me:27355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27028: \$? = $ac_status" >&5
+  echo "$as_me:27361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27035,10 +27368,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27038: result: $ac_cv_type_bool" >&5
+echo "$as_me:27371: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27041: checking size of bool" >&5
+echo "$as_me:27374: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27047,7 +27380,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27050 "configure"
+#line 27383 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27079,21 +27412,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27085: \$? = $ac_status" >&5
+  echo "$as_me:27418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27091: \$? = $ac_status" >&5
+  echo "$as_me:27424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27096 "configure"
+#line 27429 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27125,16 +27458,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27131: \$? = $ac_status" >&5
+  echo "$as_me:27464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27137: \$? = $ac_status" >&5
+  echo "$as_me:27470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27150,7 +27483,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27153 "configure"
+#line 27486 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27182,16 +27515,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27188: \$? = $ac_status" >&5
+  echo "$as_me:27521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27194: \$? = $ac_status" >&5
+  echo "$as_me:27527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27207,7 +27540,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27210 "configure"
+#line 27543 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27239,16 +27572,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27245: \$? = $ac_status" >&5
+  echo "$as_me:27578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27251: \$? = $ac_status" >&5
+  echo "$as_me:27584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27261,12 +27594,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27264: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27597: 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 27269 "configure"
+#line 27602 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27302,15 +27635,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27638: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27308: \$? = $ac_status" >&5
+  echo "$as_me:27641: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27313: \$? = $ac_status" >&5
+  echo "$as_me:27646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27326,13 +27659,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27329: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27662: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27335: checking for type of bool" >&5
+echo "$as_me:27668: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27351,7 +27684,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27354 "configure"
+#line 27687 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27392,15 +27725,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27398: \$? = $ac_status" >&5
+  echo "$as_me:27731: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27403: \$? = $ac_status" >&5
+  echo "$as_me:27736: \$? = $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
@@ -27417,26 +27750,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27420: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27753: 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:27427: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27760: 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:27433: checking for fallback type of bool" >&5
+			echo "$as_me:27766: 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:27439: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27772: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27465,246 +27798,18 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27468: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27801: 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
 	fi
 
 	if test "$cf_with_ada" != "no" ; then
-
-for cf_prog_gnat in gnat gnatmake gprconfig gprbuild
-do
-
-cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
-	unset ac_cv_path_cf_TEMP_gnat
-	unset cf_TEMP_gnat
-	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
-set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:27485: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $cf_TEMP_gnat in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path.
-  ;;
-  *)
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-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_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:27502: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
-  test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no"
-  ;;
-esac
-fi
-cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
-
-if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:27514: result: $cf_TEMP_gnat" >&5
-echo "${ECHO_T}$cf_TEMP_gnat" >&6
-else
-  echo "$as_me:27517: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-	eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"
-
-	if test "x$cf_TEMP_gnat" != xno; then
-		unset cf_cv_gnat_version
-		unset cf_TEMP_gnat
-
-echo "$as_me:27527: checking for $cf_prog_gnat version" >&5
-echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
-if test "${cf_cv_gnat_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
-	grep '[0-9].[0-9][0-9]*' |\
-	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-
-fi
-echo "$as_me:27538: result: $cf_cv_gnat_version" >&5
-echo "${ECHO_T}$cf_cv_gnat_version" >&6
-test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
-eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
-
-	fi
-	eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"
-
-	unset cf_TEMP_gnat
-	unset cf_cv_gnat_version
-	unset ac_cv_path_cf_TEMP_gnat
-done
-
-if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then
-	cf_ada_make=
-	cf_cv_prog_gnat_correct=no
-else
-	cf_ada_make=gnatmake
-	if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then
-		# gprconfig is newer than gnatmake; we can continue...
-		cf_ada_config="##"
-	else
-		rm -rf ./conftest* ./*~conftest*
-		if mkdir conftest.src
-		then
-			cf_ada_config=""
-			cd conftest.src
-			for cf_gprconfig in Ada C
-			do
-				echo "$as_me:27567: 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
-					for cf_gprconfig_param in \
-						"$cf_gprconfig,,,,GNATGCC" \
-						"$cf_gprconfig,,,,GCC" \
-						"$cf_gprconfig"
-					do
-						cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
-						test -n "$cf_gprconfig_value" && break
-					done
-				else
-					cf_gprconfig_param=$cf_gprconfig
-					cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
-				fi
-				if test -n "$cf_gprconfig_value"
-				then
-					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:27586: result: $cf_gprconfig_value" >&5
-echo "${ECHO_T}$cf_gprconfig_value" >&6
-				else
-					echo "$as_me:27589: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-					cf_ada_config="#"
-					break
-				fi
-			done
-			cd ..
-			rm -rf ./conftest* ./*~conftest*
-		fi
-	fi
-	if test "x$cf_ada_config" != "x#"
-	then
-
-echo "$as_me:27602: checking for gnat version" >&5
-echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
-if test "${cf_cv_gnat_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
-	grep '[0-9].[0-9][0-9]*' |\
-	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-
-fi
-echo "$as_me:27613: result: $cf_cv_gnat_version" >&5
-echo "${ECHO_T}$cf_cv_gnat_version" >&6
-test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
-
-case "$cf_cv_gnat_version" in
-(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
-	cf_cv_prog_gnat_correct=yes
-	;;
-(*)
-	{ echo "$as_me:27622: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
-	cf_cv_prog_gnat_correct=no
-	;;
-esac
-
-		# Extract the first word of "m4", so it can be a program name with args.
-set dummy m4; ac_word=$2
-echo "$as_me:27630: 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
-else
-  if test -n "$M4_exists"; then
-  ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test.
-else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_M4_exists="yes"
-echo "$as_me:27645: found $ac_dir/$ac_word" >&5
-break
-done
-
-  test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no"
-fi
-fi
-M4_exists=$ac_cv_prog_M4_exists
-if test -n "$M4_exists"; then
-  echo "$as_me:27654: result: $M4_exists" >&5
-echo "${ECHO_T}$M4_exists" >&6
-else
-  echo "$as_me:27657: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-		if test "$ac_cv_prog_M4_exists" = no; then
-			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:27663: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
-echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
-		fi
-		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:27667: checking if GNAT works" >&5
-echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
-
-rm -rf ./conftest* ./*~conftest*
-cat >>conftest.ads <<CF_EOF
-procedure conftest;
-CF_EOF
-cat >>conftest.adb <<CF_EOF
-with Text_IO;
-with GNAT.OS_Lib;
-procedure conftest is
-begin
-   Text_IO.Put ("Hello World");
-   Text_IO.New_Line;
-   GNAT.OS_Lib.OS_Exit (0);
-end conftest;
-CF_EOF
-if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then
-   if ( ./conftest 1>&5 2>&1 ) ; then
-      cf_cv_prog_gnat_correct=yes
-   else
-      cf_cv_prog_gnat_correct=no
-   fi
-else
-   cf_cv_prog_gnat_correct=no
-fi
-rm -rf ./conftest* ./*~conftest*
-
-			echo "$as_me:27695: result: $cf_cv_prog_gnat_correct" >&5
-echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
-		fi
-	else
-		cf_cv_prog_gnat_correct=no
-	fi
-fi
-
 		if test	"x$cf_cv_prog_gnat_correct" = xyes; then
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27707: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27812: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27721,10 +27826,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27724: result: $ADAFLAGS" >&5
+	echo "$as_me:27829: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27727: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27832: 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
@@ -27734,11 +27839,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27737: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27842: 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:27741: checking if GNAT supports generics" >&5
+echo "$as_me:27846: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27748,7 +27853,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27751: result: $cf_gnat_generics" >&5
+echo "$as_me:27856: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27760,7 +27865,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27763: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27868: 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
@@ -27808,7 +27913,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27811: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27916: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27821,7 +27926,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27824: checking if GNAT supports project files" >&5
+echo "$as_me:27929: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27884,15 +27989,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27887: result: $cf_gnat_projects" >&5
+echo "$as_me:27992: 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:27893: checking if GNAT supports libraries" >&5
+	echo "$as_me:27998: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:27895: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28000: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -27912,7 +28017,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:27915: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28020: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -27924,7 +28029,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:27927: checking for Ada95 compiler" >&5
+echo "$as_me:28032: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -27935,12 +28040,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:27938: result: $cf_ada_compiler" >&5
+echo "$as_me:28043: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:27943: checking for Ada95 include directory" >&5
+echo "$as_me:28048: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -27976,7 +28081,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27979: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28084: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27985,10 +28090,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:27988: result: $ADA_INCLUDE" >&5
+echo "$as_me:28093: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:27991: checking for Ada95 object directory" >&5
+echo "$as_me:28096: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28024,7 +28129,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28027: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28132: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28033,10 +28138,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28036: result: $ADA_OBJECTS" >&5
+echo "$as_me:28141: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28039: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28144: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28057,11 +28162,11 @@ then
 	fi
 fi
 
-echo "$as_me:28060: result: $with_ada_sharedlib" >&5
+echo "$as_me:28165: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28064: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28169: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28079,7 +28184,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28082: checking for Ada95 curses library name" >&5
+echo "$as_me:28187: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28095,7 +28200,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28098: result: $ADA_LIBNAME" >&5
+echo "$as_me:28203: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28106,13 +28211,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28109: checking for wchar_t" >&5
+	echo "$as_me:28214: 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 28115 "configure"
+#line 28220 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28127,16 +28232,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28133: \$? = $ac_status" >&5
+  echo "$as_me:28238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28139: \$? = $ac_status" >&5
+  echo "$as_me:28244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28146,10 +28251,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28149: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28254: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28152: checking size of wchar_t" >&5
+echo "$as_me:28257: 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
@@ -28158,7 +28263,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28161 "configure"
+#line 28266 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28170,21 +28275,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28176: \$? = $ac_status" >&5
+  echo "$as_me:28281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28182: \$? = $ac_status" >&5
+  echo "$as_me:28287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28187 "configure"
+#line 28292 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28196,16 +28301,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28202: \$? = $ac_status" >&5
+  echo "$as_me:28307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28208: \$? = $ac_status" >&5
+  echo "$as_me:28313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28221,7 +28326,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28224 "configure"
+#line 28329 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28233,16 +28338,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28239: \$? = $ac_status" >&5
+  echo "$as_me:28344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28245: \$? = $ac_status" >&5
+  echo "$as_me:28350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28258,7 +28363,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28261 "configure"
+#line 28366 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28270,16 +28375,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28276: \$? = $ac_status" >&5
+  echo "$as_me:28381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28282: \$? = $ac_status" >&5
+  echo "$as_me:28387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28292,12 +28397,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28295: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28400: 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 28300 "configure"
+#line 28405 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28313,15 +28418,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28319: \$? = $ac_status" >&5
+  echo "$as_me:28424: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28324: \$? = $ac_status" >&5
+  echo "$as_me:28429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28337,7 +28442,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28340: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28445: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28350,7 +28455,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28353: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28458: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28368,7 +28473,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28371: checking for library subsets" >&5
+echo "$as_me:28476: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28422,7 +28527,7 @@ fi
 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:28425: result: $LIB_SUBSETS" >&5
+echo "$as_me:28530: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28453,7 +28558,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28456: checking default library suffix" >&5
+echo "$as_me:28561: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28464,10 +28569,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28467: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28572: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28470: checking default library-dependency suffix" >&5
+echo "$as_me:28575: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28550,10 +28655,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28553: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28658: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28556: checking default object directory" >&5
+echo "$as_me:28661: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28569,11 +28674,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28572: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28677: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28576: checking c++ library-dependency suffix" >&5
+echo "$as_me:28681: 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++)
@@ -28666,7 +28771,7 @@ else
 	fi
 
 fi
-echo "$as_me:28669: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28774: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28842,19 +28947,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28845: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28950: 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 <<EOF
-#line 28850 "configure"
+#line 28955 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28854: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28857: \$? = $ac_status" >&5
+  echo "$as_me:28962: \$? = $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
@@ -28865,10 +28970,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28868 "configure"
+#line 28973 "configure"
 #include "confdefs.h"
 
-#line 28871 "configure"
+#line 28976 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28883,16 +28988,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28889: \$? = $ac_status" >&5
+  echo "$as_me:28994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28895: \$? = $ac_status" >&5
+  echo "$as_me:29000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -28915,7 +29020,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:28918: result: $cf_ldflags_static" >&5
+	echo "$as_me:29023: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -28931,7 +29036,7 @@ fi
 	;;
 esac
 
-echo "$as_me:28934: checking where we will install curses.h" >&5
+echo "$as_me:29039: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -28941,7 +29046,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:28944: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29049: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -28949,7 +29054,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:28952: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29057: 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
@@ -28974,7 +29079,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:28977: checking for desired basename for form library" >&5
+echo "$as_me:29082: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -28994,10 +29099,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:28997: result: $FORM_NAME" >&5
+echo "$as_me:29102: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29000: checking for desired basename for menu library" >&5
+echo "$as_me:29105: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29017,10 +29122,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29020: result: $MENU_NAME" >&5
+echo "$as_me:29125: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29023: checking for desired basename for panel library" >&5
+echo "$as_me:29128: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29040,10 +29145,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29043: result: $PANEL_NAME" >&5
+echo "$as_me:29148: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29046: checking for desired basename for cxx library" >&5
+echo "$as_me:29151: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29063,13 +29168,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29066: result: $CXX_NAME" >&5
+echo "$as_me:29171: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29072: checking for src modules" >&5
+echo "$as_me:29177: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29128,7 +29233,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29131: result: $cf_cv_src_modules" >&5
+echo "$as_me:29236: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29289,7 +29394,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29292: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29397: 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//'`
@@ -29300,7 +29405,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29303: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29408: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29316,7 +29421,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29319: result: $PKG_CFLAGS" >&5
+echo "$as_me:29424: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29377,7 +29482,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29380: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29485: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29404,7 +29509,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29407: checking for linker search path" >&5
+echo "$as_me:29512: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29452,7 +29557,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29455: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29560: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29493,7 +29598,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29496: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29601: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29579,7 +29684,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29582: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29687: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29760,7 +29865,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29763: error: ambiguous option: $1
+    { { echo "$as_me:29868: 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;}
@@ -29779,7 +29884,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29782: error: unrecognized option: $1
+  -*) { { echo "$as_me:29887: 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;}
@@ -29909,7 +30014,7 @@ do
   "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:29912: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30017: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30023,6 +30128,13 @@ s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@FGREP@,$FGREP,;t t
+s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t
+s,@M4_exists@,$M4_exists,;t t
+s,@cf_ada_make@,$cf_ada_make,;t t
+s,@cf_ada_config@,$cf_ada_config,;t t
+s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t
+s,@cf_ada_config_C@,$cf_ada_config_C,;t t
+s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -30221,12 +30333,6 @@ s,@CXX_AR@,$CXX_AR,;t t
 s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t
 s,@CXXLIBS@,$CXXLIBS,;t t
 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
-s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t
-s,@M4_exists@,$M4_exists,;t t
-s,@cf_ada_make@,$cf_ada_make,;t t
-s,@cf_ada_config@,$cf_ada_config,;t t
-s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t
-s,@cf_ada_config_C@,$cf_ada_config_C,;t t
 s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t
 s,@cf_compile_generics@,$cf_compile_generics,;t t
 s,@cf_generic_objects@,$cf_generic_objects,;t t
@@ -30430,7 +30536,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30433: creating $ac_file" >&5
+    { echo "$as_me:30539: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30448,7 +30554,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30451: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30557: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30461,7 +30567,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30464: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30570: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30477,7 +30583,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30480: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30586: 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;}
@@ -30486,7 +30592,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30489: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30595: 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;}
@@ -30531,7 +30637,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30534: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30640: 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;}
@@ -30542,7 +30648,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30545: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30651: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30591,7 +30697,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30594: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30700: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30602,7 +30708,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30605: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30711: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30615,7 +30721,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30618: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30724: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30673,7 +30779,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30676: $ac_file is unchanged" >&5
+      { echo "$as_me:30782: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31060,7 +31166,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31063: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31169: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 2d6836cb7..1beb840a6 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.779 2024/04/10 08:04:00 tom Exp $
+dnl $Id: configure.in,v 1.781 2024/05/18 19:42:53 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.779 $)
+AC_REVISION($Revision: 1.781 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -65,19 +65,7 @@ CF_ABI_DEFAULTS
 CF_WITH_ABI_ALTERED
 
 ###	Checks for programs.
-AC_ARG_WITH(ada,
-	[  --without-ada           suppress check for Ada compiler, don't build demo],
-	[cf_with_ada=$withval],
-	[cf_with_ada=yes])
-
-if test "x$cf_with_ada" = xyes
-then
-	cf_prog_cc="gnatgcc gcc cc"
-else
-	cf_prog_cc="gcc cc"
-fi
-CF_PROG_CC($cf_prog_cc)
-
+CF_WITH_ADA
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS])
@@ -1721,7 +1709,7 @@ AC_MSG_RESULT($cf_with_trace)
 if test "x$cf_with_trace" = xyes ; then
 	LIB_TRACING=all
 	ADA_TRACE=TRUE
-	CF_ADD_CFLAGS(-DTRACE)
+	AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions])
 	AC_DEFINE(HAVE__TRACEF,1,[Define to 1 if we have _tracef function])
 else
 	LIB_TRACING=DEBUG
@@ -2019,7 +2007,6 @@ dnl libtool -TD 20070714
 dnl Check for availability of GNU Ada Translator (GNAT).
 dnl At the moment we support no other Ada compiler.
 	if test "$cf_with_ada" != "no" ; then
-		CF_PROG_GNAT
 		if test	"x$cf_cv_prog_gnat_correct" = xyes; then
 			CF_ADD_ADAFLAGS(-gnatpn)
 			CF_FIXUP_ADAFLAGS
diff --git a/dist.mk b/dist.mk
index 97db5c372..114ad1502 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1612 2024/05/11 10:20:08 tom Exp $
+# $Id: dist.mk,v 1.1613 2024/05/18 10:54:27 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240511
+NCURSES_PATCH = 20240518
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index e3d6c8178..bb53a28e3 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -58,35 +58,47 @@ <H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>beep</STRONG>  and <STRONG>flash</STRONG> routines are used to alert the terminal user.  The
-       routine <STRONG>beep</STRONG> sounds an audible alarm  on  the  terminal,  if  possible;
-       otherwise  it  flashes  the  screen  (visible bell).  The routine <STRONG>flash</STRONG>
-       flashes the screen, and if that is not possible, sounds the alert.   If
-       neither  alert is possible, nothing happens.  Nearly all terminals have
-       an audible alert (bell or beep), but only some can flash the screen.
+       <STRONG>beep</STRONG>  and  <STRONG>flash</STRONG>  alert  the  terminal user: the former by sounding the
+       terminal's audible alarm, and the latter  by  visibly  attracting  user
+       attention.    Commonly,   a   terminal  implements  a  visual  bell  by
+       momentarily reversing the character foreground and background colors on
+       the  entire  display;  even  a  monochrome  device  can do this.  These
+       functions each attempt the other alert type if  the  one  requested  is
+       unavailable.   If  neither  is  available,  <EM>curses</EM>  performs no action.
+       Nearly all terminals have an audible alert mechanism such as a bell  or
+       piezoelectric buzzer, but only some can flash the screen.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return <STRONG>OK</STRONG> if they succeed in beeping  or  flashing,  <STRONG>ERR</STRONG>
-       otherwise.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       In  <EM>ncurses</EM>, <STRONG>beep</STRONG> and <STRONG>flash</STRONG> return <STRONG>OK</STRONG> if the terminal type supports the
+       corresponding capability: <STRONG>bell</STRONG> (<STRONG>bel</STRONG>) for <STRONG>beep</STRONG> and <STRONG>flash_screen</STRONG>  (<STRONG>flash</STRONG>)
+       for <STRONG>flash</STRONG>.  Otherwise they return <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       SVr4's  beep  and  flash  routines  always  returned  <STRONG>OK</STRONG>, so it was not
-       possible to tell when the beep or flash failed.
+       In <EM>ncurses</EM>, these functions can return <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  Like SVr4, it
-       specifies that they always return <STRONG>OK</STRONG>.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
+
+       On SVr4 <EM>curses</EM>, they always return <STRONG>OK</STRONG>, and X/Open Curses specifies them
+       as doing so.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <STRONG>beep</STRONG> and <STRONG>flash</STRONG> appeared in SVr2 (1984).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -96,6 +108,7 @@ <H1 class="no-header">curs_beep 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 15ca56f81..15f523c8f 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -288,7 +288,7 @@ <H1 class="no-header">curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is pending
            collection; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.  Receipt of this  code  requires  a
            window's  keypad  mode  to  be  enabled, because to interpret mouse
-           input (as with with <STRONG>xterm(1)</STRONG>'s mouse prototocol), <EM>ncurses</EM> must read
+           input (as with with <STRONG>xterm(1)</STRONG>'s mouse protocol), <EM>ncurses</EM>  must  read
            an escape sequence, as with a function key.
 
 
@@ -326,10 +326,10 @@ <H1 class="no-header">curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
        Some key strokes are indistinguishable  from  control  characters;  for
        example,  <STRONG>KEY_ENTER</STRONG> may be the same as <STRONG>^M</STRONG>, and <STRONG>KEY_BACKSPACE</STRONG> may be the
-       same as <STRONG>^H</STRONG> or <STRONG>^?</STRONG>.  Consult the terminal's <EM>terminfo</EM> entry  to  determine
-       whether this is the case; see <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG>.  Some <EM>curses</EM> implementations,
-       including <EM>ncurses</EM>, honor the <EM>terminfo</EM>  key  definitions;  others  treat
-       such control characters specially.
+       same as <STRONG>^H</STRONG> or <STRONG>^?</STRONG>.  Consult the <EM>terminfo</EM> entry for the terminal type  to
+       determine  whether  this  is  the  case;  see  <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG>.  Some <EM>curses</EM>
+       implementations, including <EM>ncurses</EM>, honor the <EM>terminfo</EM> key definitions;
+       others treat such control characters specially.
 
        <EM>curses</EM>  distinguishes  the  Enter  keys  in  the alphabetic and numeric
        keypad sections of a keyboard because (most) terminals  do.   <STRONG>KEY_ENTER</STRONG>
@@ -426,7 +426,7 @@ <H1 class="no-header">curs_getch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 1ea5b63ec..a04f410fc 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -54,46 +54,50 @@ <H1 class="no-header">curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>in_wch(cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>win_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>mvin_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwin_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>in_wch(cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>win_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvin_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwin_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions extract the complex character and  rendition  from  the
-       current position in the named window into the <STRONG>cchar_t</STRONG> object referenced
-       by wch.
+       <STRONG>win_wch</STRONG> copies the <EM>curses</EM> complex character at the cursor  position  in
+       <EM>win</EM>  into  <EM>wch</EM>.   Use  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  to  extract  its  character  code,
+       attributes, and  color  pair  identifier.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the
+       variants of this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       No errors are defined in X/Open Curses.  This implementation checks for
-       null  pointers,  returns <STRONG>ERR</STRONG> in that case.  Also, the <EM>mv</EM> routines check
-       for error moving the cursor, returning <STRONG>ERR</STRONG>  in  that  case.   Otherwise
-       they return <STRONG>OK</STRONG>.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       In <EM>ncurses</EM>, <STRONG>win_wch</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all of these routines may be macros.
+       <STRONG>in_wch</STRONG>, <STRONG>mvin_wch</STRONG>, and <STRONG>mvwin_wch</STRONG> may be implemented as macros.
+
+       Unlike <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>, <STRONG>win_wch</STRONG> and its  variants  store  the  value  of  the
+       retrieved  character  in  an  additional  <EM>wch</EM>  parameter instead of the
+       return value.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library  in
+       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index e2a00a625..35af0bbc4 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -55,68 +55,77 @@ <H1 class="no-header">curs_inch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>chtype</STRONG> <STRONG>inch(void);</STRONG>
-       <STRONG>chtype</STRONG> <STRONG>winch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>chtype</STRONG> <STRONG>winch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
        <STRONG>chtype</STRONG> <STRONG>mvinch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>chtype</STRONG> <STRONG>mvwinch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>chtype</STRONG> <STRONG>mvwinch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>winch</STRONG>  returns the <EM>curses</EM> character, including rendering attributes and
-       color pair identifier, at  the  cursor  position  in  the  window  <EM>win</EM>.
-       Subsection  "Video  Attributes"  of  <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG> explains how to extract
-       these data from a <EM>chtype</EM>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants  of  this
-       function.
+       <STRONG>winch</STRONG>  returns the <EM>curses</EM> character, including its attributes and color
+       pair identifier, at the cursor position in the window <EM>win</EM>.   Subsection
+       "Video  Attributes"  of  <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>  explains how to extract these data
+       from a <EM>chtype</EM>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions  prefixed with "mv" first perform cursor movement and fail if
-       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       In <EM>ncurses</EM>, <STRONG>winch</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
-       These functions do not return an error if the window comprises cells of
-       <EM>curses</EM>  complex characters (that is, they contain characters with codes
-       wider than eight bits, or greater  than  255  as  an  unsigned  decimal
-       integer).   They  instead  extract  only  the  low-order  eight bits of
-       character data in the cell.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>inch</STRONG>, <STRONG>mvinch</STRONG>, and <STRONG>mvwinch</STRONG> may be implemented as macros.
 
+       These  functions do not return an error if the window contains cells of
+       <EM>curses</EM> complex characters; that is, if  they  contain  characters  with
+       codes wider than eight bits (or greater than 255 as an unsigned decimal
+       integer).  They instead extract only the low-order eight  bits  of  the
+       character code from the cell.
+
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <STRONG>winch</STRONG>  was  implemented  in  the original 4BSD <EM>curses</EM> library (November
-       1980).  It returned only the character code (as an  integer)  with  the
-       "standout"  attribute bit (the only one it supported) cleared.  Because
-       7-bit ASCII was the only character  encoding  supported,  4BSD's  <STRONG>winch</STRONG>
-       returned a <EM>char</EM> type.
-
-       System V  <EM>curses</EM>  (1983)  permitted  several rendering attributes to be
-       combined with a character in a window.   Reflecting  this  improvement,
-       <STRONG>winch</STRONG>  returned  an <EM>int</EM> in SVr3.2 (1988) and switched to <EM>chtype</EM> in SVr4
-       (1989).
+       The original <EM>curses</EM> in 4BSD (1980) defined <EM>winch</EM> as a  macro  accessing
+       the  <EM>WINDOW</EM>  structure member representing character cell data, at that
+       time a <EM>char</EM>, containing  only  a  7-bit  ASCII  character  code  and  a
+       "standout" attribute bit, the only one the library supported.
+
+       SVr2  <EM>curses</EM> (1984) extended this approach, widening the character code
+       to eight bits and permitting several attributes to be combined with  it
+       by  storing  them  together  in  a  <EM>chtype</EM>, an alias of <EM>unsigned</EM> <EM>short</EM>.
+       Because a macro was used, its value was not type-checked as a  function
+       return  value  could have been.  Goodheart documented SVr3 (1987) <EM>winch</EM>
+       as returning an  <EM>int</EM>.   SVr3.1's  (1987)  <EM>chtype</EM>  became  an  alias  of
+       <EM>unsigned</EM>  <EM>long</EM>,  using  16 bits for the character code and widening the
+       type in practical terms to 32 bits, as 64-bit Unix systems were not yet
+       in wide use, and fixed-width integral types would not be standard until
+       ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
+       the attributes.
 
        X/Open Curses does not specify the sizes of the character code or color
-       pair  identifier,  nor  the  quantity  of  rendering attribute bits, in
-       <EM>chtype</EM>; these are implementation-dependent.  <EM>ncurses</EM>  uses  eight  bits
-       for  the  character  code.   An application requiring a wider character
-       type, for instance to handle Unicode,  should  use  the  wide-character
+       pair identifier, nor the quantity of attribute bits, in  <EM>chtype</EM>;  these
+       are   implementation-dependent.    <EM>ncurses</EM>  uses  eight  bits  for  the
+       character code.  An application requiring a wider character  type,  for
+       instance   to   represent   Unicode,   should  use  the  wide-character
        counterparts of these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 1b266fd4b..e35187f9d 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -222,7 +222,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
-       The  <STRONG>mouseinterval</STRONG>  function  sets  the maximum time (in thousands of a
+       The  <STRONG>mouseinterval</STRONG>  function sets the maximum time (in thousandths of a
        second) that can elapse between press and release events for them to be
        resolved  as  a <EM>click</EM>.  An application might interpret button press and
        release events separated by more than the mouse  interval  as  a  "long
@@ -394,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index d135e3109..c7e3f717c 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp @
+  * @Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>define_key 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -48,37 +48,46 @@ <H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>define_key</STRONG> - define a <EM>curses</EM> keycode
+       <STRONG>define_key</STRONG> - define a <EM>curses</EM> function key code
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>define_key(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>define_key(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>definition</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>key-code</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the <EM>curses</EM> library.  It permits an application
-       to define keycodes with their corresponding control  strings,  so  that
-       the <EM>ncurses</EM> library will interpret them just as it would the predefined
-       codes in the terminfo database.
+       The <STRONG>define_key</STRONG> <EM>ncurses</EM> extension permits a <EM>curses</EM> application to <EM>bind</EM> a
+       string <EM>definition</EM> to the function key <EM>key-code</EM> returned  by  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>
+       (wide-character  API users: <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>) when <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is enabled in
+       a window and a function key is  pressed.   <EM>ncurses</EM>  interprets  such  a
+       binding  as  it  does  those  in  the  <EM>terminfo</EM>  database entry for the
+       terminal type.
 
-       If <EM>definition</EM> is <STRONG>NULL</STRONG>, any existing one for  the  keycode  is  removed.
-       Similarly,  if  the  given  keycode  is  negative or zero, any existing
-       string for the given definition is removed.
+       A <EM>definition</EM> of <STRONG>NULL</STRONG> removes any existing one <EM>key-code</EM>.   Similarly,  a
+       non-positive <EM>key-code</EM> removes any existing bindings for <EM>definition</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Either <EM>keycode</EM> must be greater than zero, or <EM>definition</EM>  must  be  non-
-       <STRONG>NULL</STRONG>,  otherwise <STRONG>ERR</STRONG> is returned.  <STRONG>ERR</STRONG> may also be returned if there is
-       insufficient memory to allocate the data to store the  definition.   If
-       no error is detected, <STRONG>OK</STRONG> is returned.
+       <STRONG>define_key</STRONG> returns <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   <EM>definition</EM> is <STRONG>NULL</STRONG> and <EM>key-code</EM> is nonpositive, or
+
+       <STRONG>o</STRONG>   insufficient memory is available to bind <EM>definition</EM> to <EM>key-code</EM>.
+
+       Otherwise, <STRONG>define_key</STRONG> returns <STRONG>OK</STRONG>.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>define_key</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  routines  are  specific  to <EM>ncurses</EM>.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       NetBSD <EM>curses</EM> since 2.0 (2004) supports <STRONG>define_key</STRONG>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -86,11 +95,12 @@ <H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,   <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,   <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
+       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -98,6 +108,7 @@ <H1 class="no-header">define_key 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 453decfdb..8ef095adb 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>key_defined 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -48,30 +48,34 @@ <H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>key_defined</STRONG> - test whether a <EM>curses</EM> keycode is defined
+       <STRONG>key_defined</STRONG> - test whether a <EM>curses</EM> function key code is defined
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>key_defined(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>key_defined(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>definition</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the <EM>curses</EM> library.  It permits an application
-       to determine if a string is currently bound to any keycode.
+       The  <STRONG>key_defined</STRONG>  <EM>ncurses</EM>  extension  permits  a  <EM>curses</EM> application to
+       determine the function key code, if any, to which the string <EM>definition</EM>
+       is bound.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       If the string is bound to a keycode, its value (greater than  zero)  is
-       returned.   If  no  keycode  is bound, zero is returned.  If the string
-       conflicts with longer strings which are bound to keys, -1 is returned.
+       <STRONG>key_defined</STRONG>  returns the first key code to which <EM>definition</EM> is bound if
+       any exists.  If none does, it returns <STRONG>0</STRONG>.  If <EM>definition</EM> is a prefix  of
+       another binding, <STRONG>key_defined</STRONG> returns <STRONG>-1</STRONG>.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>define_key</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This routine is specific to <EM>ncurses</EM>.  It was not supported  on  Version
-       7,  BSD  or  System V implementations.  It is recommended that any code
-       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -79,11 +83,11 @@ <H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-03-16                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -91,6 +95,7 @@ <H1 class="no-header">key_defined 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index e926e77c6..c61af21a5 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>keybound 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keybound 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -48,33 +48,41 @@ <H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>keybound</STRONG> - get definition of <EM>curses</EM> keycode
+       <STRONG>keybound</STRONG> - get definition of a <EM>curses</EM> function key code
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keybound(int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keybound(int</STRONG> <EM>key-code</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the <EM>curses</EM> library.  It permits an application
-       to determine the string which is defined in the terminfo  for  specific
-       keycodes.
+       The  <STRONG>keybound</STRONG>  <EM>ncurses</EM> extension permits a <EM>curses</EM> application to obtain
+       the value of the  string  <EM>bound</EM>  to  the  function  key  <EM>key-code</EM>;  see
+       <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  (wide-character API users: <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>).  By default, such
+       bindings are string  capabilities  from  the  <EM>terminfo</EM>  database  entry
+       corresponding   to   the  terminal  type.   The  application  can  non-
+       destructively   and   repeatedly   override   such   definitions   with
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  as  if  by  pushing new definitions onto a stack.  The
+       <EM>count</EM> parameter accesses the  <EM>n</EM>th  most  recently  defined  binding;  <STRONG>0</STRONG>
+       selects the binding that is used on input.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <EM>keycode</EM> parameter must be greater than zero, else <STRONG>NULL</STRONG> is returned.
-       If it does not correspond to a defined key, then <STRONG>NULL</STRONG> is returned.  The
-       <EM>count</EM>  parameter  is  used  to allow the application to iterate through
-       multiple  definitions,  counting  from  zero.   When  successful,   the
-       function returns a string which must be freed by the caller.
+       If <EM>key-code</EM> corresponds to a function key defined by the application or
+       the terminal type in use, <STRONG>keybound</STRONG> allocates and returns a string  that
+       must be freed by the application.  <STRONG>keybound</STRONG> returns <STRONG>NULL</STRONG> if <EM>key-code</EM> is
+       not positive or if it does not correspond to a key code definition.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>keybound</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This  routine  is specific to <EM>ncurses</EM>.  It was not supported on Version
-       7, BSD or System V implementations.  It is recommended  that  any  code
-       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -82,11 +90,11 @@ <H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -94,6 +102,7 @@ <H1 class="no-header">keybound 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index f94f82f49..e6d3a35e8 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp @
+  * @Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>keyok 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -48,32 +48,44 @@ <H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>keyok</STRONG> - enable or disable a <EM>curses</EM> keycode
+       <STRONG>keyok</STRONG> - enable or disable a <EM>curses</EM> function key code
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>keyok(int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>keyok(int</STRONG> <EM>key-code</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  is an extension to the <EM>curses</EM> library.  It permits an application
-       to disable specific keycodes, rather than use the  <STRONG>keypad</STRONG>  function  to
-       disable all keycodes.  Keys that have been disabled can be re-enabled.
+       The  <STRONG>keyok</STRONG>  <EM>ncurses</EM> extension permits a <EM>curses</EM> application to disable a
+       function key <EM>key-code</EM> returned by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> (wide-character API users:
+       <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>).   Key  codes  that have been disabled can be re-enabled.
+       <EM>bf</EM> indicates the desired enablement status.   This  operation  is  more
+       fine-grained than calling <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>, which affects <EM>all</EM> function keys.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  keycode  must  be  greater than zero, else <STRONG>ERR</STRONG> is returned.  If it
-       does not correspond to a defined key, then <STRONG>ERR</STRONG>  is  returned.   If  the
-       <EM>enable</EM>  parameter  is  true,  then the key must have been disabled, and
-       vice versa.  Otherwise, the function returns <STRONG>OK</STRONG>.
+       <STRONG>keyok</STRONG> returns <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   <EM>key-code</EM> is nonpositive,
+
+       <STRONG>o</STRONG>   <EM>key-code</EM> is not a recognized value, or
+
+       <STRONG>o</STRONG>   enablement of <EM>key-code</EM> is already in the desired state.
+
+       Otherwise, <STRONG>keyok</STRONG> returns <STRONG>OK</STRONG>.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>keyok</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       This routine is specific to <EM>ncurses</EM>.  It was not supported  on  Version
-       7,  BSD  or  System V implementations.  It is recommended that any code
-       depending on them be conditioned using <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       NetBSD <EM>curses</EM> since 2.0 (2004) supports <STRONG>keyok</STRONG>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -81,11 +93,11 @@ <H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
 
 
 
-ncurses 6.5                       2024-03-16                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -93,6 +105,7 @@ <H1 class="no-header">keyok 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 64f23bbb8..d76f4f45f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp @
+  * @Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240511).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240518).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -176,7 +176,7 @@ <H1 class="no-header">ncurses 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
        Many  terminals  support configuration of character cell foreground and
-       background colors  as  well  as  rendering  <EM>attributes</EM>  <EM>,</EM>  which  cause
+       background  colors  as  well  as  rendering  <EM>attributes</EM>,  which   cause
        characters  to  show  up  in such modes as boldfaced, underlined, or in
        reverse video.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
@@ -1491,7 +1491,7 @@ <H1 class="no-header">ncurses 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-05-18                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index f833c6957..92c722ef1 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240511).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240518).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/include/ncurses_defs b/include/ncurses_defs
index c0da3ad53..dc73ce7d3 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.110 2024/03/02 20:38:23 tom Exp $
+# $Id: ncurses_defs,v 1.111 2024/05/18 19:41:39 tom Exp $
 ##############################################################################
 # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -253,6 +253,7 @@ SYSTEM_NAME	"unknown"
 TERMINFO	"none"
 TERMPATH	"none"
 TIME_WITH_SYS_TIME
+TRACE
 TYPEOF_CHTYPE
 USE_COLORFGBG
 USE_FOPEN_BIN_R
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 9806f42b3..6a01deca2 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp $
-.TH curs_beep 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp $
+.TH curs_beep 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -41,23 +41,70 @@ ring the (visual) bell of the terminal with \fIcurses\fR
 \fBint flash(void);
 .fi
 .SH DESCRIPTION
-The \fBbeep\fP and \fBflash\fP routines are used to alert the terminal user.
-The routine \fBbeep\fP sounds an audible alarm on the terminal, if possible;
-otherwise it flashes the screen (visible bell).
-The routine \fBflash\fP
-flashes the screen, and if that is not possible, sounds the alert.
-If neither
-alert is possible, nothing happens.
-Nearly all terminals have an audible alert
-(bell or beep), but only some can flash the screen.
+.B beep
+and
+.B flash
+alert the terminal user:
+the former by sounding the terminal's audible alarm,
+and the latter by visibly attracting user attention.
+Commonly,
+a terminal implements a visual bell by momentarily reversing the
+character foreground and background colors on the entire display;
+even a monochrome device can do this.
+These functions each attempt the other alert type if the one requested
+is unavailable.
+If neither is available,
+.I curses
+performs no action.
+Nearly all terminals have an audible alert mechanism such as a bell or
+piezoelectric buzzer,
+but only some can flash the screen.
 .SH RETURN VALUE
-These routines return \fBOK\fP if they succeed in beeping or flashing,
-\fBERR\fP otherwise.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ","
+.B beep
+and
+.B flash
+return
+.B OK
+if the terminal type supports the corresponding capability:
+.B bell
+.RB ( bel )
+for
+.B beep
+and
+.B \%flash_screen
+.RB ( flash )
+for
+.BR flash "."
+Otherwise they return
+.BR ERR "."
 .SH EXTENSIONS
-SVr4's beep and flash routines always returned \fBOK\fP, so it was not
-possible to tell when the beep or flash failed.
+In
+.IR \%ncurses ","
+these functions can return
+.BR ERR "."
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
-Like SVr4, it specifies that they always return \fBOK\fP.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+On SVr4
+.IR curses ","
+they always return
+.BR OK ","
+and X/Open Curses specifies them as doing so.
+.SH HISTORY
+.B beep
+and
+.B flash
+appeared in SVr2 (1984).
 .SH SEE ALSO
-\fB\%curses\fP(3X)
+\fB\%curses\fP(3X),
+\fB\%terminfo\fP(5)
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 02fefd0da..5969ce1f1 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp $
-.TH curs_getch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp $
+.TH curs_getch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -417,7 +417,7 @@ to indicate that a mouse event is pending collection;
 see \fB\%curs_mouse\fP(3X).
 Receipt of this code requires a window's keypad mode to be enabled,
 because to interpret mouse input
-(as with with \fI\%xterm\fP(1)'s mouse prototocol),
+(as with with \fI\%xterm\fP(1)'s mouse protocol),
 .I \%ncurses
 must read an escape sequence,
 as with a function key.
@@ -489,9 +489,9 @@ may be the same as
 or
 .BR \*^? "."
 .\" as with pccon+keys or vt320
-Consult the terminal's
+Consult the
 .I \%term\%info
-entry to determine whether this is the case;
+entry for the terminal type to determine whether this is the case;
 see \fB\%infocmp\fP(1).
 Some
 .I curses
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index 8512e6d3b..1775752a9 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp $
-.TH curs_in_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp $
+.TH curs_in_wch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,22 +49,39 @@ get a \fIcurses\fR complex character from a window
 .nf
 \fB#include <curses.h>
 .PP
-\fBint in_wch(cchar_t *\fIwch\fP);
-\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
-.PP
-\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
-\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
+\fBint in_wch(cchar_t * \fIwch\fP);
+\fBint win_wch(WINDOW * \fIwin\fP, cchar_t * \fIwch\fP);
+\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t * \fIwch\fP);
+\fBint mvwin_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t * \fIwch\fP);
 .fi
 .SH DESCRIPTION
-These functions extract the complex character and rendition from
-the current position in the named window into the \fBcchar_t\fP object
-referenced by wch.
+.B \%win_wch
+copies the
+.I curses
+complex character at the cursor position in
+.I win
+into
+.IR wch "."
+Use \fB\%getcchar\fP(3X) to extract its character code,
+attributes,
+and color pair identifier.
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .SH RETURN VALUE
-No errors are defined in X/Open Curses.
-This implementation checks for null pointers, returns \fBERR\fP in that case.
-Also, the \fImv\fP routines check for error moving the cursor,
-returning \fBERR\fP in that case.
-Otherwise they return \fBOK\fP.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ","
+.B \%win_wch
+returns
+.B ERR
+if
+.I win
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -72,9 +89,22 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Note that all of these routines may be macros.
+.BR \%in_wch ","
+.BR mvin_wch ","
+and
+.B mvwin_wch
+may be implemented as macros.
+.PP
+Unlike \fB\%winch\fP(3X),
+.B \%win_wch
+and its variants store the value of the retrieved character in an
+additional
+.I wch
+parameter instead of the return value.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .SH SEE ALSO
 \fB\%curs_inch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 17be0fb9e..786ab2f7a 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp $
-.TH curs_inch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp $
+.TH curs_inch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -56,16 +56,16 @@ get a \fIcurses\fR character from a window
 \fB#include <curses.h>
 .PP
 \fBchtype inch(void);
-\fBchtype winch(WINDOW *\fIwin\fP);
+\fBchtype winch(WINDOW * \fIwin\fP);
 \fBchtype mvinch(int \fIy\fP, int \fIx\fP);
-\fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBchtype mvwinch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
 .B \%winch
 returns the
 .I curses
 character,
-including rendering attributes and color pair identifier,
+including its attributes and color pair identifier,
 at the cursor position in the window
 .IR win "."
 Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) explains
@@ -73,73 +73,104 @@ how to extract these data from a
 .IR chtype "."
 \fB\%ncurses\fP(3X) describes the variants of this function.
 .SH RETURN VALUE
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ","
+.B \%winch
+returns
+.B ERR
+if
+.I win
+is
+.BR NULL "."
+.PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
 .IR x )
 is outside the window boundaries.
-.PP
-These functions do not return an error if the window comprises cells of
-.I curses
-complex characters
-(that is,
-they contain characters with codes wider than eight bits,
-or greater than 255 as an unsigned decimal integer).
-They instead extract only the low-order eight bits of character data
-in the cell.
 .SH NOTES
 .BR \%inch ,
 .BR \%mvinch ,
 and
 .B \%mvwinch
 may be implemented as macros.
+.PP
+These functions do not return an error if the window contains cells of
+.I curses
+complex characters;
+that is,
+if they contain characters with codes wider than eight bits
+(or greater than 255 as an unsigned decimal integer).
+They instead extract only the low-order eight bits of the character code
+from the cell.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-.B \%winch
-was implemented in the original 4BSD
+The original
 .I curses
-library
-(November 1980).
-It returned only the character code
-(as an integer)
-with the \*(``standout\*(`` attribute bit
-(the only one it supported)
-cleared.
-Because 7-bit ASCII was the only character encoding supported,
-4BSD's
-.B \%winch
-returned a
-.I char
-type.
-.\" Through macros, it directly accessed a `char` structure member.
+in 4BSD (1980) defined
+.I \%winch
+as a macro accessing the
+.I \%WINDOW
+structure member representing character cell data,
+at that time a
+.IR char ","
+containing only a 7-bit ASCII character code
+and a \*(``standout\*(`` attribute bit,
+the only one the library supported.
 .PP
-System\ V
+SVr2
 .I curses
-(1983) permitted several rendering attributes to be combined with a
-character in a window.
-Reflecting this improvement,
-.B \%winch
-.\" XXX: possibly returned a `short` in SVr1 through SVr3 --GBR
-returned an
-.I int
-in SVr3.2 (1988)
-and switched to
-.I chtype
-in SVr4 (1989).
+(1984)
+extended this approach,
+widening the character code to eight bits
+and permitting several attributes to be combined with it
+by storing them together in a
+.IR \%chtype ","
+an alias of
+.IR "unsigned short" "."
+.\" ...indirectly through a preprocessor macro named CHTYPE, encouraging
+.\" builders to change the typedef to `char` or `long` as desired.  More
+.\" innocent times with respect to ABI compatibility concerns... --GBR
+Because a macro was used,
+its value was not type-checked
+as a function return value could have been.
+Goodheart documented SVr3 (1987)
+.I \%winch
+as returning an
+.IR int "."
+.\" ...but the implementation remained unchanged.
+SVr3.1's (1987)
+.I \%chtype
+became an alias of
+.IR "unsigned long" ","
+using 16 bits for the character code and
+widening the type in practical terms to 32 bits,
+as 64-bit Unix systems were not yet in wide use,
+and fixed-width integral types would not be standard until ISO C99.
+.\" Cray's UNICOS was 1985 (how many shops had Crays?).  DEC OSF/1 for
+.\" the Alpha arrived in 1993.  --GBR
+SVr3.2 (1988)
+added a 6-bit color pair identifier alongside the attributes.
 .PP
 X/Open Curses does not specify the sizes of the character code or
 color pair identifier,
-nor the quantity of rendering attribute bits,
+nor the quantity of attribute bits,
 in
 .IR chtype ";"
 these are implementation-dependent.
 .I \%ncurses
 uses eight bits for the character code.
 An application requiring a wider character type,
-for instance to handle Unicode,
+for instance to represent Unicode,
 should use the wide-character counterparts of these functions.
 .SH SEE ALSO
 \fB\%curs_in_wch\fP(3X) describes comparable functions of the
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index d67b2761f..ffb97f2e8 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp $
-.TH curs_mouse 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp $
+.TH curs_mouse 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -238,7 +238,7 @@ as \fB\%wmouse_trafo\fP,
 using \fB\%stdscr\fP for \fIwin\fP.
 .SS mouseinterval
 The \fB\%mouseinterval\fP function sets the maximum time
-(in thousands of a second)
+(in thousandths of a second)
 that can elapse between press and release events for them to
 be resolved as a
 .IR click .
diff --git a/man/define_key.3x b/man/define_key.3x
index 667d8cd31..52086b654 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,43 +29,101 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
-.TH define_key 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp $
+.TH define_key 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
+.
 .SH NAME
 \fB\%define_key\fP \-
-define a \fIcurses\fR keycode
+define a \fIcurses\fP function key code
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint define_key(const char *\fIdefinition\fP, int \fIkeycode\fP);
+\fBint define_key(const char * \fIdefinition\fP, int \fIkey-code\fP);
 .fi
 .SH DESCRIPTION
-This is an extension to the \fIcurses\fP library.
-It permits an application to define keycodes with their corresponding control
-strings,
-so that the \fI\%ncurses\fP library will interpret them just as it would
-the predefined codes in the terminfo database.
+The
+.B \%define_key
+.I \%ncurses
+extension permits a
+.I curses
+application to
+.I bind
+a string
+.I definition
+to the function key
+.I key-code
+returned by \fB\%wgetch\fP(3X)
+(wide-character API users:
+\fB\%wget_wch\fP(3X))
+when \fB\%keypad\fP(3X) is enabled in a window and a function key is
+pressed.
+.I \%ncurses
+interprets such a binding as it does those in the
+.I \%term\%info
+database entry for the terminal type.
 .PP
-If \fIdefinition\fP is \fBNULL\fP,
-any existing one for the keycode is removed.
-Similarly, if the given keycode is negative or zero, any existing string
-for the given definition is removed.
+A
+.I definition
+of
+.B NULL
+removes any existing one
+.IR key-code "."
+Similarly,
+a non-positive
+.I key-code
+removes any existing bindings for
+.IR definition "."
 .SH RETURN VALUE
-Either \fIkeycode\fP must be greater than zero,
-or \fIdefinition\fP must be non-\fBNULL\fP,
-otherwise \fBERR\fP is returned.
-\fBERR\fP may also be returned if there is insufficient memory to allocate the
-data to store the definition.
-If no error is detected, \fBOK\fP is returned.
+.B \%define_key
+returns
+.B ERR
+if
+.bP
+.I definition
+is
+.B NULL
+and
+.I key-code
+is nonpositive,
+or
+.bP
+insufficient memory is available to bind
+.I definition
+to
+.IR key-code "."
+.PP
+Otherwise,
+.B \%define_key
+returns
+.BR OK "."
+.SH EXTENSIONS
+.B \%define_key
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-These routines are specific to \fI\%ncurses\fP.
-They were not supported on
-Version 7, BSD or System V implementations.
-It is recommended that
-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+NetBSD
+.I curses
+since 2.0 (2004) supports
+.BR \%define_key "."
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
+\fB\%ncurses\fP(3X),
+\fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X),
+\fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
-\fB\%key_defined\fP(3X)
+\fB\%terminfo\fP(5)
diff --git a/man/key_defined.3x b/man/key_defined.3x
index f0184aa77..f5d9b4474 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,33 +29,58 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH key_defined 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp $
+.TH key_defined 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
-test whether a \fIcurses\fR keycode is defined
+test whether a \fIcurses\fP function key code is defined
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint key_defined(const char *\fIdefinition\fP);
+\fBint key_defined(const char * \fIdefinition\fP);
 .fi
 .SH DESCRIPTION
-This is an extension to the \fIcurses\fP library.
-It permits an application to determine if a string is currently bound
-to any keycode.
+The
+.B \%key_defined
+.I \%ncurses
+extension permits a
+.I curses
+application to determine the function key code,
+if any,
+to which the string
+.I definition
+is bound.
 .SH RETURN VALUE
-If the string is bound to a keycode, its value (greater than zero) is returned.
-If no keycode is bound, zero is returned.
-If the string conflicts with longer strings
-which are bound to keys, \-1 is returned.
+.B \%key_defined
+returns the first key code to which
+.I definition
+is bound if any exists.
+If none does,
+it returns
+.BR 0 "."
+If
+.I definition
+is a prefix of another binding,
+.B \%key_defined
+returns
+.BR \-1 "."
+.SH EXTENSIONS
+.B \%define_key
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-This routine is specific to \fI\%ncurses\fP.
-It was not supported on
-Version 7, BSD or System V implementations.
-It is recommended that
-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%define_key\fP(3X)
+\fB\%ncurses\fP(3X),
+\fB\%define_key\fP(3X),
+\fB\%keyok\fP(3X),
+\fB\%keybound\fP(3X),
+\fB\%keyok\fP(3X)
diff --git a/man/keybound.3x b/man/keybound.3x
index bd8bb80f3..476920692 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,37 +29,76 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH keybound 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp $
+.TH keybound 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
-get definition of \fIcurses\fR keycode
+get definition of a \fIcurses\fP function key code
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBchar * keybound(int \fIkeycode\fP, int \fIcount\fP);
+\fBchar * keybound(int \fIkey-code\fP, int \fIcount\fP);
 .fi
 .SH DESCRIPTION
-This is an extension to the \fIcurses\fP library.
-It permits an application to determine the string which is defined
-in the terminfo for specific keycodes.
+The
+.B \%keybound
+.I \%ncurses
+extension permits a
+.I curses
+application to obtain the value of the string
+.I bound
+to the function key
+.IR key-code ";"
+see \fB\%wgetch\fP(3X)
+(wide-character API users: \fB\%wget_wch\fP(3X)).
+By default,
+such bindings are string capabilities from the
+.I \%term\%info
+database entry corresponding to the terminal type.
+The application can non-destructively and repeatedly
+override such definitions with
+\fB\%define_key\fP(3X),
+as if by pushing new definitions onto a stack.
+The
+.I count
+parameter accesses the
+.IR n th
+most recently defined binding;
+.B 0
+selects the binding that is used on input.
 .SH RETURN VALUE
-The \fIkeycode\fP parameter must be greater than zero,
-else \fBNULL\fP is returned.
-If it does not correspond to a defined key, then \fBNULL\fP is returned.
-The \fIcount\fP parameter is used to allow the application to iterate
-through multiple definitions, counting from zero.
-When successful,
-the function returns a string which must be freed by the caller.
+If
+.I key-code
+corresponds to a function key defined
+by the application
+or the terminal type in use,
+.B \%keybound
+allocates and returns a string
+that must be freed by the application.
+.B \%keybound
+returns
+.B NULL
+if
+.I key-code
+is not positive
+or if it does not correspond to a key code definition.
+.SH EXTENSIONS
+.B \%keybound
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-This routine is specific to \fI\%ncurses\fP.
-It was not supported on
-Version 7, BSD or System V implementations.
-It is recommended that
-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
+\fB\%ncurses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%keyok\fP(3X)
+\fB\%key_defined\fP(3X),
+\fB\%keyok\fP(3X),
+\fB\%terminfo\fP(5)
diff --git a/man/keyok.3x b/man/keyok.3x
index b4c7de2b4..a10da7bde 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,35 +29,83 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp $
-.TH keyok 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp $
+.TH keyok 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
+.
 .SH NAME
 \fB\%keyok\fP \-
-enable or disable a \fIcurses\fR keycode
+enable or disable a \fIcurses\fP function key code
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint keyok(int \fIkeycode\fP, bool \fIenable\fP);
+\fBint keyok(int \fIkey-code\fP, bool \fIbf\fP);
 .fi
 .SH DESCRIPTION
-This is an extension to the \fIcurses\fP library.
-It permits an application to disable specific keycodes, rather than
-use the \fB\%keypad\fP function to disable all keycodes.
-Keys that have been disabled can be re-enabled.
+The
+.B \%keyok
+.I \%ncurses
+extension permits a
+.I curses
+application to disable a function key
+.I key-code
+returned by \fB\%wgetch\fP(3X)
+(wide-character API users:
+\fB\%wget_wch\fP(3X)).
+Key codes that have been disabled can be re-enabled.
+.I bf
+indicates the desired enablement status.
+This operation is more fine-grained than calling \fB\%keypad\fP(3X),
+which affects
+.I all
+function keys.
 .SH RETURN VALUE
-The keycode must be greater than zero, else \fBERR\fP is returned.
-If it does not correspond to a defined key, then \fBERR\fP is returned.
-If the \fIenable\fP parameter is true, then the key must have been disabled,
-and vice versa.
-Otherwise, the function returns \fBOK\fP.
+.B \%keyok
+returns
+.B ERR
+if
+.bP
+.I key-code
+is nonpositive,
+.bP
+.I key-code
+is not a recognized value,
+or
+.bP
+enablement of
+.I key-code
+is already in the desired state.
+.PP
+Otherwise,
+.B \%keyok
+returns
+.BR OK "."
+.SH EXTENSIONS
+.B \%keyok
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-This routine is specific to \fI\%ncurses\fP.
-It was not supported on
-Version 7, BSD or System V implementations.
-It is recommended that
-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+NetBSD
+.I curses
+since 2.0 (2004) supports
+.BR \%keyok "."
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%define_key\fP(3X)
+\fB\%ncurses\fP(3X),
+\fB\%define_key\fP(3X),
+\fB\%key_defined\fP(3X),
+\fB\%keybound\fP(3X),
+\fB\%keyok\fP(3X),
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 603796414..7f005e5cc 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp $
-.TH ncurses 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp $
+.TH ncurses 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -302,7 +302,7 @@ See \fB\%curs_pad\fP(3X).
 .PP
 Many terminals support configuration of character cell foreground and
 background colors as well as rendering
-.I attributes ,
+.IR attributes ","
 which cause characters to show up in such modes as
 boldfaced,
 underlined,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 222096091..14515c0a9 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240511) unstable; urgency=low
+ncurses6 (6.5+20240518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 222096091..14515c0a9 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240511) unstable; urgency=low
+ncurses6 (6.5+20240518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ea7256d79..86f2e5846 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240511) unstable; urgency=low
+ncurses6 (6.5+20240518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 May 2024 06:20:08 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
index 8bd49457f..20f1159e6 100644
--- a/package/debian/ncurses6.lintian-overrides
+++ b/package/debian/ncurses6.lintian-overrides
@@ -4,6 +4,6 @@ ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++
 # This is intentional.
 ncurses6: binary-without-manpage
 ncurses6: non-dev-pkg-with-shlib-symlink
-ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
+ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
 
 # vile: confmode
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
index 5a1b83bd4..c40acbbfc 100644
--- a/package/debian/ncursest6.lintian-overrides
+++ b/package/debian/ncursest6.lintian-overrides
@@ -4,6 +4,6 @@ ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurse
 # This is intentional.
 ncursest6: binary-without-manpage
 ncursest6: non-dev-pkg-with-shlib-symlink
-ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
+ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
 
 # vile: confmode
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 65eb84e39..ed819a2a5 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.647 2024/05/11 10:20:08 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.648 2024/05/18 10:54:27 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0511"
+!define VERSION_MMDD  "0518"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0b94a9150..ce2c513c4 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240511
+Release: 20240518
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f524ff7e1..2ccdd3e63 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240511
+Release: 20240518
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 95f7ebe0e..ed0d4b5dd 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240511
+Release: 20240518
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index fdab359ae..1968f0394 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $
+dnl $Id: aclocal.m4,v 1.222 2024/05/18 18:08:04 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1685,19 +1685,36 @@ rm -f core])
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56
+dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02
 dnl ---------------
 dnl Check for gettimeofday or clock_gettime.  In 2023, the former is still more
 dnl widely supported, but "deprecated" (2008), so we will use the latter if it
 dnl is available, to reduce compiler warnings.
 AC_DEFUN([CF_FUNC_GETTIME],[
-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[
-		AC_TRY_LINK([#include <time.h>],
+cf_save_libs="$LIBS"
+AC_CHECK_FUNC(clock_gettime,
+	cf_cv_test_clock_gettime=yes,
+	AC_CHECK_LIB(rt, clock_gettime,
+		[LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes],
+		 cf_cv_test_clock_gettime=no))
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[
+		AC_TRY_LINK([
+$ac_includes_default
+#include <time.h>
+		],
 		[struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts],
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts],
 		[cf_cv_func_clock_gettime=yes],
 		[cf_cv_func_clock_gettime=no])
 ])
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
diff --git a/test/configure b/test/configure
index 4f155cd78..264be1c6b 100755
--- a/test/configure
+++ b/test/configure
@@ -18629,36 +18629,162 @@ EOF
 
 fi
 
-echo "$as_me:18632: checking for clock_gettime" >&5
+cf_save_libs="$LIBS"
+echo "$as_me:18633: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+if test "${ac_cv_func_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18639 "configure"
+#include "confdefs.h"
+#define clock_gettime autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef clock_gettime
+
+#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 clock_gettime (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_clock_gettime) || defined (__stub___clock_gettime)
+#error found stub for clock_gettime
+#endif
+
+	return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:18673: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:18679: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:18689: result: $ac_cv_func_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+if test "$ac_cv_func_clock_gettime" = yes; then
+  cf_cv_test_clock_gettime=yes
+else
+  echo "$as_me:18694: checking for clock_gettime in -lrt" >&5
+echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18702 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char clock_gettime (void);
+int
+main (void)
+{
+clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18721: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:18724: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:18730: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_rt_clock_gettime=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:18741: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+  LIBS="-lrt $LIBS"
+		 cf_cv_test_clock_gettime=yes
+else
+  cf_cv_test_clock_gettime=no
+fi
+
+fi
+
+if test "$cf_cv_test_clock_gettime" = yes ; then
+echo "$as_me:18753: checking if clock_gettime links" >&5
+echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18639 "configure"
+#line 18760 "configure"
 #include "confdefs.h"
+
+$ac_includes_default
 #include <time.h>
+
 int
 main (void)
 {
 struct timespec ts;
-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts
+		int rc = clock_gettime(CLOCK_REALTIME, &ts)
+			   + clock_gettime(CLOCK_MONOTONIC, &ts);
+		 (void) rc; (void)ts
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18655: \$? = $ac_status" >&5
+  echo "$as_me:18781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18661: \$? = $ac_status" >&5
+  echo "$as_me:18787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18669,8 +18795,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18672: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18798: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+else
+	cf_cv_func_clock_gettime=no
+fi
 
 if test "$cf_cv_func_clock_gettime" = yes
 then
@@ -18680,13 +18809,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18683: checking for gettimeofday" >&5
+echo "$as_me:18812: 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 18689 "configure"
+#line 18818 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18717,16 +18846,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18723: \$? = $ac_status" >&5
+  echo "$as_me:18852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18729: \$? = $ac_status" >&5
+  echo "$as_me:18858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18736,7 +18865,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18739: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18868: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18746,7 +18875,7 @@ EOF
 
 else
 
-echo "$as_me:18749: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18878: 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
@@ -18754,7 +18883,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18757 "configure"
+#line 18886 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18773,16 +18902,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18779: \$? = $ac_status" >&5
+  echo "$as_me:18908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18785: \$? = $ac_status" >&5
+  echo "$as_me:18914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -18793,7 +18922,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18796: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18925: 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
 
@@ -18831,13 +18960,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18834: checking for $ac_func" >&5
+echo "$as_me:18963: 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 18840 "configure"
+#line 18969 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18868,16 +18997,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18874: \$? = $ac_status" >&5
+  echo "$as_me:19003: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18880: \$? = $ac_status" >&5
+  echo "$as_me:19009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18887,7 +19016,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19019: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18898,14 +19027,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:18901: checking if we can use termcap.h" >&5
+echo "$as_me:19030: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18908 "configure"
+#line 19037 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -18926,16 +19055,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18932: \$? = $ac_status" >&5
+  echo "$as_me:19061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18938: \$? = $ac_status" >&5
+  echo "$as_me:19067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -18945,7 +19074,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18948: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19077: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -18955,14 +19084,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18958: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19087: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18965 "configure"
+#line 19094 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -18983,16 +19112,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18989: \$? = $ac_status" >&5
+  echo "$as_me:19118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18995: \$? = $ac_status" >&5
+  echo "$as_me:19124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19002,7 +19131,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19005: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19134: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19012,7 +19141,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19015: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19144: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19031,13 +19160,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19034: checking for $ac_func" >&5
+echo "$as_me:19163: 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 19040 "configure"
+#line 19169 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19068,16 +19197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19074: \$? = $ac_status" >&5
+  echo "$as_me:19203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19080: \$? = $ac_status" >&5
+  echo "$as_me:19209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19087,7 +19216,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19090: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19219: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19099,7 +19228,7 @@ done
 
 fi
 
-echo "$as_me:19102: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19231: 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
@@ -19107,7 +19236,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19110 "configure"
+#line 19239 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19140,16 +19269,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19146: \$? = $ac_status" >&5
+  echo "$as_me:19275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19152: \$? = $ac_status" >&5
+  echo "$as_me:19281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19159,7 +19288,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19162 "configure"
+#line 19291 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19185,16 +19314,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19197: \$? = $ac_status" >&5
+  echo "$as_me:19326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19208,7 +19337,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19211: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19340: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19220,7 +19349,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19223: checking for term.h" >&5
+echo "$as_me:19352: 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
@@ -19241,7 +19370,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19244 "configure"
+#line 19373 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19255,16 +19384,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19261: \$? = $ac_status" >&5
+  echo "$as_me:19390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19267: \$? = $ac_status" >&5
+  echo "$as_me:19396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19283,7 +19412,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19286 "configure"
+#line 19415 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19301,16 +19430,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19307: \$? = $ac_status" >&5
+  echo "$as_me:19436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19313: \$? = $ac_status" >&5
+  echo "$as_me:19442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19325,7 +19454,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19328: result: $cf_cv_term_header" >&5
+echo "$as_me:19457: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19352,7 +19481,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19355: checking for unctrl.h" >&5
+echo "$as_me:19484: 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
@@ -19373,7 +19502,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19376 "configure"
+#line 19505 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19387,16 +19516,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19393: \$? = $ac_status" >&5
+  echo "$as_me:19522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19399: \$? = $ac_status" >&5
+  echo "$as_me:19528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19409,12 +19538,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19412: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19541: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19417: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19546: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19512,10 +19641,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19515: checking for ${cf_func}" >&5
+	echo "$as_me:19644: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19518: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19647: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19524,7 +19653,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19527 "configure"
+#line 19656 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19557,16 +19686,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19563: \$? = $ac_status" >&5
+  echo "$as_me:19692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19569: \$? = $ac_status" >&5
+  echo "$as_me:19698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19582,7 +19711,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19585: result: $cf_result" >&5
+	echo "$as_me:19714: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19597,10 +19726,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19600: checking for ${cf_func}" >&5
+	echo "$as_me:19729: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19603: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19609,7 +19738,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19612 "configure"
+#line 19741 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19642,16 +19771,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19648: \$? = $ac_status" >&5
+  echo "$as_me:19777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19654: \$? = $ac_status" >&5
+  echo "$as_me:19783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19667,7 +19796,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19670: result: $cf_result" >&5
+	echo "$as_me:19799: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19691,7 +19820,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19694 "configure"
+#line 19823 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19711,21 +19840,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19717: \$? = $ac_status" >&5
+  echo "$as_me:19846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19723: \$? = $ac_status" >&5
+  echo "$as_me:19852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19728: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19857: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19745,14 +19874,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19748: checking for ncurses extended functions" >&5
+echo "$as_me:19877: 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 19755 "configure"
+#line 19884 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19767,16 +19896,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19773: \$? = $ac_status" >&5
+  echo "$as_me:19902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19779: \$? = $ac_status" >&5
+  echo "$as_me:19908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19784,7 +19913,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19787 "configure"
+#line 19916 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19809,16 +19938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19815: \$? = $ac_status" >&5
+  echo "$as_me:19944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19821: \$? = $ac_status" >&5
+  echo "$as_me:19950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19832,7 +19961,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19835: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19964: 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
@@ -19846,11 +19975,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19849: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19978: 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 19853 "configure"
+#line 19982 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19863,16 +19992,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19869: \$? = $ac_status" >&5
+  echo "$as_me:19998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19875: \$? = $ac_status" >&5
+  echo "$as_me:20004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19881,7 +20010,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19884 "configure"
+#line 20013 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19894,16 +20023,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19900: \$? = $ac_status" >&5
+  echo "$as_me:20029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19906: \$? = $ac_status" >&5
+  echo "$as_me:20035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19914,7 +20043,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19917: result: $cf_define_xpg5" >&5
+		echo "$as_me:20046: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19923,14 +20052,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19926: checking for wide-character functions" >&5
+	echo "$as_me:20055: 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 19933 "configure"
+#line 20062 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19947,16 +20076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19953: \$? = $ac_status" >&5
+  echo "$as_me:20082: \$? = $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:20085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19959: \$? = $ac_status" >&5
+  echo "$as_me:20088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19967,7 +20096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19970: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20099: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19988,14 +20117,14 @@ EOF
 
 fi
 
-echo "$as_me:19991: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20120: 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 19998 "configure"
+#line 20127 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20013,16 +20142,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20019: \$? = $ac_status" >&5
+  echo "$as_me:20148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20025: \$? = $ac_status" >&5
+  echo "$as_me:20154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20033,21 +20162,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20036: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20165: 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:20043: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20172: 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 20050 "configure"
+#line 20179 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20067,16 +20196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20073: \$? = $ac_status" >&5
+  echo "$as_me:20202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20079: \$? = $ac_status" >&5
+  echo "$as_me:20208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20088,7 +20217,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20091: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20220: 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
@@ -20097,7 +20226,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20100: checking for openpty in -lutil" >&5
+echo "$as_me:20229: 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
@@ -20105,7 +20234,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20108 "configure"
+#line 20237 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20124,16 +20253,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20130: \$? = $ac_status" >&5
+  echo "$as_me:20259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20136: \$? = $ac_status" >&5
+  echo "$as_me:20265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20144,7 +20273,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20147: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20276: 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
@@ -20152,7 +20281,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20155: checking for openpty header" >&5
+echo "$as_me:20284: 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
@@ -20179,7 +20308,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20182 "configure"
+#line 20311 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20197,16 +20326,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20203: \$? = $ac_status" >&5
+  echo "$as_me:20332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20209: \$? = $ac_status" >&5
+  echo "$as_me:20338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20224,7 +20353,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20227: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20356: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20258,7 +20387,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20261: checking for function curses_version" >&5
+echo "$as_me:20390: 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
@@ -20268,7 +20397,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20271 "configure"
+#line 20400 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20284,15 +20413,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20290: \$? = $ac_status" >&5
+  echo "$as_me:20419: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20295: \$? = $ac_status" >&5
+  echo "$as_me:20424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20307,14 +20436,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20310: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20439: 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:20317: checking for alternate character set array" >&5
+echo "$as_me:20446: 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
@@ -20324,7 +20453,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20327 "configure"
+#line 20456 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20340,16 +20469,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20346: \$? = $ac_status" >&5
+  echo "$as_me:20475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20352: \$? = $ac_status" >&5
+  echo "$as_me:20481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20360,7 +20489,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20363: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20492: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20370,7 +20499,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20373: checking for wide alternate character set array" >&5
+echo "$as_me:20502: 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
@@ -20380,7 +20509,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20383 "configure"
+#line 20512 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20396,16 +20525,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20402: \$? = $ac_status" >&5
+  echo "$as_me:20531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20408: \$? = $ac_status" >&5
+  echo "$as_me:20537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20416,7 +20545,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20419: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20548: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20424,7 +20553,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20427: checking for wide alternate character constants" >&5
+echo "$as_me:20556: 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
@@ -20434,7 +20563,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20437 "configure"
+#line 20566 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20451,16 +20580,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20454: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20457: \$? = $ac_status" >&5
+  echo "$as_me:20586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20463: \$? = $ac_status" >&5
+  echo "$as_me:20592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20470,7 +20599,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20473 "configure"
+#line 20602 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20486,16 +20615,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20492: \$? = $ac_status" >&5
+  echo "$as_me:20621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20498: \$? = $ac_status" >&5
+  echo "$as_me:20627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20506,7 +20635,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20509: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20638: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20516,10 +20645,10 @@ EOF
 
 fi
 
-echo "$as_me:20519: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20648: 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 20522 "configure"
+#line 20651 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20537,16 +20666,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20543: \$? = $ac_status" >&5
+  echo "$as_me:20672: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20549: \$? = $ac_status" >&5
+  echo "$as_me:20678: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20555,7 +20684,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20558: result: $cf_result" >&5
+echo "$as_me:20687: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20576,14 +20705,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20579: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20708: 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 20586 "configure"
+#line 20715 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20601,23 +20730,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20607: \$? = $ac_status" >&5
+  echo "$as_me:20736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20613: \$? = $ac_status" >&5
+  echo "$as_me:20742: \$? = $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 20620 "configure"
+#line 20749 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20636,16 +20765,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20642: \$? = $ac_status" >&5
+  echo "$as_me:20771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20648: \$? = $ac_status" >&5
+  echo "$as_me:20777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20657,7 +20786,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20660: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20789: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20680,14 +20809,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20683: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20812: 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 20690 "configure"
+#line 20819 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20705,23 +20834,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20711: \$? = $ac_status" >&5
+  echo "$as_me:20840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20717: \$? = $ac_status" >&5
+  echo "$as_me:20846: \$? = $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 20724 "configure"
+#line 20853 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20740,16 +20869,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20746: \$? = $ac_status" >&5
+  echo "$as_me:20875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20752: \$? = $ac_status" >&5
+  echo "$as_me:20881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20761,7 +20890,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20764: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20893: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20784,14 +20913,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20787: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20916: 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 20794 "configure"
+#line 20923 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20809,23 +20938,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20815: \$? = $ac_status" >&5
+  echo "$as_me:20944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20821: \$? = $ac_status" >&5
+  echo "$as_me:20950: \$? = $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 20828 "configure"
+#line 20957 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20844,16 +20973,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20850: \$? = $ac_status" >&5
+  echo "$as_me:20979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20856: \$? = $ac_status" >&5
+  echo "$as_me:20985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20865,7 +20994,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20868: result: $cf_cv_wint_t" >&5
+echo "$as_me:20997: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20889,10 +21018,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20892: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21021: 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 20895 "configure"
+#line 21024 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20910,16 +21039,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20916: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20922: \$? = $ac_status" >&5
+  echo "$as_me:21051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20928,7 +21057,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20931: result: $cf_result" >&5
+echo "$as_me:21060: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20950,10 +21079,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20953: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21082: 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 20956 "configure"
+#line 21085 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20971,16 +21100,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20977: \$? = $ac_status" >&5
+  echo "$as_me:21106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20983: \$? = $ac_status" >&5
+  echo "$as_me:21112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20989,7 +21118,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20992: result: $cf_result" >&5
+echo "$as_me:21121: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21011,10 +21140,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21014: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21143: 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 21017 "configure"
+#line 21146 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21032,16 +21161,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21038: \$? = $ac_status" >&5
+  echo "$as_me:21167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21044: \$? = $ac_status" >&5
+  echo "$as_me:21173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21050,7 +21179,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21053: result: $cf_result" >&5
+echo "$as_me:21182: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21079,11 +21208,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21082: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21211: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21086 "configure"
+#line 21215 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21116,16 +21245,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21122: \$? = $ac_status" >&5
+  echo "$as_me:21251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21128: \$? = $ac_status" >&5
+  echo "$as_me:21257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21135,7 +21264,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21138: result: $cf_result" >&5
+echo "$as_me:21267: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21147,14 +21276,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21150: checking for data $cf_data in library" >&5
+	echo "$as_me:21279: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21157 "configure"
+#line 21286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21193,16 +21322,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21199: \$? = $ac_status" >&5
+  echo "$as_me:21328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21205: \$? = $ac_status" >&5
+  echo "$as_me:21334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21214,7 +21343,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21217 "configure"
+#line 21346 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21246,15 +21375,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21252: \$? = $ac_status" >&5
+  echo "$as_me:21381: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21257: \$? = $ac_status" >&5
+  echo "$as_me:21386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21266,7 +21395,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21269: result: $cf_result" >&5
+	echo "$as_me:21398: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21283,7 +21412,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21286: checking for X" >&5
+	echo "$as_me:21415: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21387,17 +21516,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21390 "configure"
+#line 21519 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21394: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21400: \$? = $ac_status" >&5
+  echo "$as_me:21529: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21430,7 +21559,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21433 "configure"
+#line 21562 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21442,16 +21571,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21448: \$? = $ac_status" >&5
+  echo "$as_me:21577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21454: \$? = $ac_status" >&5
+  echo "$as_me:21583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21489,7 +21618,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21492: result: $have_x" >&5
+  echo "$as_me:21621: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21499,7 +21628,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21502: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21631: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21526,11 +21655,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21529: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21658: 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 21533 "configure"
+#line 21662 "configure"
 #include "confdefs.h"
 
 int
@@ -21542,16 +21671,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21548: \$? = $ac_status" >&5
+  echo "$as_me:21677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21554: \$? = $ac_status" >&5
+  echo "$as_me:21683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21561,13 +21690,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21564: result: no" >&5
+	echo "$as_me:21693: 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 21570 "configure"
+#line 21699 "configure"
 #include "confdefs.h"
 
 int
@@ -21579,16 +21708,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21585: \$? = $ac_status" >&5
+  echo "$as_me:21714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21591: \$? = $ac_status" >&5
+  echo "$as_me:21720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21598,11 +21727,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21601: result: yes" >&5
+	  echo "$as_me:21730: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21605: result: neither works" >&5
+	  echo "$as_me:21734: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21622,7 +21751,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21625 "configure"
+#line 21754 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21641,22 +21770,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21647: \$? = $ac_status" >&5
+  echo "$as_me:21776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21653: \$? = $ac_status" >&5
+  echo "$as_me:21782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21659: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21788: 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
@@ -21664,7 +21793,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21667 "configure"
+#line 21796 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21683,16 +21812,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21689: \$? = $ac_status" >&5
+  echo "$as_me:21818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21695: \$? = $ac_status" >&5
+  echo "$as_me:21824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21703,14 +21832,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21706: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21835: 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:21713: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21842: 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
@@ -21718,7 +21847,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21721 "configure"
+#line 21850 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21737,16 +21866,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21743: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21749: \$? = $ac_status" >&5
+  echo "$as_me:21878: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21757,7 +21886,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21760: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21889: 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"
@@ -21776,13 +21905,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21779: checking for gethostbyname" >&5
+    echo "$as_me:21908: 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 21785 "configure"
+#line 21914 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21813,16 +21942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21819: \$? = $ac_status" >&5
+  echo "$as_me:21948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21825: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21832,11 +21961,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21835: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21964: 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:21839: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21968: 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
@@ -21844,7 +21973,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21847 "configure"
+#line 21976 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21863,16 +21992,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21869: \$? = $ac_status" >&5
+  echo "$as_me:21998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21875: \$? = $ac_status" >&5
+  echo "$as_me:22004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21883,14 +22012,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21886: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22015: 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:21893: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22022: 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
@@ -21898,7 +22027,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21901 "configure"
+#line 22030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21917,16 +22046,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21923: \$? = $ac_status" >&5
+  echo "$as_me:22052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:22058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21937,7 +22066,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21940: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22069: 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"
@@ -21953,13 +22082,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21956: checking for connect" >&5
+    echo "$as_me:22085: 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 21962 "configure"
+#line 22091 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21990,16 +22119,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21996: \$? = $ac_status" >&5
+  echo "$as_me:22125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22002: \$? = $ac_status" >&5
+  echo "$as_me:22131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22009,11 +22138,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22012: result: $ac_cv_func_connect" >&5
+echo "$as_me:22141: 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:22016: checking for connect in -lsocket" >&5
+      echo "$as_me:22145: 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
@@ -22021,7 +22150,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22024 "configure"
+#line 22153 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22040,16 +22169,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22046: \$? = $ac_status" >&5
+  echo "$as_me:22175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22052: \$? = $ac_status" >&5
+  echo "$as_me:22181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22060,7 +22189,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22063: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22192: 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"
@@ -22069,13 +22198,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22072: checking for remove" >&5
+    echo "$as_me:22201: 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 22078 "configure"
+#line 22207 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22106,16 +22235,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22112: \$? = $ac_status" >&5
+  echo "$as_me:22241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22118: \$? = $ac_status" >&5
+  echo "$as_me:22247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22125,11 +22254,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22128: result: $ac_cv_func_remove" >&5
+echo "$as_me:22257: 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:22132: checking for remove in -lposix" >&5
+      echo "$as_me:22261: 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
@@ -22137,7 +22266,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22140 "configure"
+#line 22269 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22156,16 +22285,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22162: \$? = $ac_status" >&5
+  echo "$as_me:22291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22168: \$? = $ac_status" >&5
+  echo "$as_me:22297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22176,7 +22305,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22179: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22308: 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"
@@ -22185,13 +22314,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22188: checking for shmat" >&5
+    echo "$as_me:22317: 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 22194 "configure"
+#line 22323 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22222,16 +22351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22228: \$? = $ac_status" >&5
+  echo "$as_me:22357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22234: \$? = $ac_status" >&5
+  echo "$as_me:22363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22241,11 +22370,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22244: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22373: 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:22248: checking for shmat in -lipc" >&5
+      echo "$as_me:22377: 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
@@ -22253,7 +22382,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22256 "configure"
+#line 22385 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22272,16 +22401,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22278: \$? = $ac_status" >&5
+  echo "$as_me:22407: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22284: \$? = $ac_status" >&5
+  echo "$as_me:22413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22292,7 +22421,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22295: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22424: 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"
@@ -22310,7 +22439,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22313: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22442: 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
@@ -22318,7 +22447,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22321 "configure"
+#line 22450 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22337,16 +22466,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22343: \$? = $ac_status" >&5
+  echo "$as_me:22472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22349: \$? = $ac_status" >&5
+  echo "$as_me:22478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22357,7 +22486,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22360: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22489: 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"
@@ -22404,16 +22533,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22407: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22536: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22412: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22541: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22416: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22545: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22452,16 +22581,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22455: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22584: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22460: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22589: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22464: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22593: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22500,23 +22629,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22632: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22508: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22637: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22512: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22641: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22519: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22648: 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.
@@ -22533,7 +22662,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22536: result: $enable_warnings" >&5
+echo "$as_me:22665: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22556,10 +22685,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22559: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22688: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22562 "${as_me:-configure}"
+#line 22691 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22609,12 +22738,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22612: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22615: \$? = $ac_status" >&5
+  echo "$as_me:22744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22617: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22746: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22692,7 +22821,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22695 "configure"
+#line 22824 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22707,26 +22836,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22713: \$? = $ac_status" >&5
+  echo "$as_me:22842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22719: \$? = $ac_status" >&5
+  echo "$as_me:22848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22722: checking for X11/Xt const-feature" >&5
+echo "$as_me:22851: 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 22729 "configure"
+#line 22858 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22744,16 +22873,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22876: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22750: \$? = $ac_status" >&5
+  echo "$as_me:22879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22756: \$? = $ac_status" >&5
+  echo "$as_me:22885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22768,7 +22897,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22771: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22900: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22797,7 +22926,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22800 "${as_me:-configure}"
+#line 22929 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22813,7 +22942,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22816: checking for $CC warning options..." >&5
+	{ echo "$as_me:22945: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22829,12 +22958,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22835: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22837: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22966: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22842,7 +22971,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22845: checking for $CC warning options..." >&5
+	{ echo "$as_me:22974: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22865,12 +22994,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22868: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22871: \$? = $ac_status" >&5
+  echo "$as_me:23000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22873: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23002: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22878,7 +23007,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22888,7 +23017,7 @@ echo "${as_me:-configure}:22881: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22905,7 +23034,7 @@ fi
 
 fi
 
-echo "$as_me:22908: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23037: 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.
@@ -22927,7 +23056,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22930: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23059: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23041,23 +23170,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23044: checking for dmalloc.h" >&5
+	echo "$as_me:23173: 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 23050 "configure"
+#line 23179 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23060: \$? = $ac_status" >&5
+  echo "$as_me:23189: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23076,11 +23205,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23079: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23208: 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:23083: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23212: 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
@@ -23088,7 +23217,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23091 "configure"
+#line 23220 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23107,16 +23236,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23113: \$? = $ac_status" >&5
+  echo "$as_me:23242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23119: \$? = $ac_status" >&5
+  echo "$as_me:23248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23127,7 +23256,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23130: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23259: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23142,7 +23271,7 @@ fi
 
 fi
 
-echo "$as_me:23145: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23274: 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.
@@ -23164,7 +23293,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23167: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23296: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23278,23 +23407,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23281: checking for dbmalloc.h" >&5
+	echo "$as_me:23410: 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 23287 "configure"
+#line 23416 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23291: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23297: \$? = $ac_status" >&5
+  echo "$as_me:23426: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23313,11 +23442,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23316: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23445: 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:23320: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23449: 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
@@ -23325,7 +23454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23328 "configure"
+#line 23457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23344,16 +23473,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23350: \$? = $ac_status" >&5
+  echo "$as_me:23479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23356: \$? = $ac_status" >&5
+  echo "$as_me:23485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23364,7 +23493,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23367: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23496: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23379,7 +23508,7 @@ fi
 
 fi
 
-echo "$as_me:23382: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23511: 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.
@@ -23401,7 +23530,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23404: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23533: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23514,7 +23643,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23517: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23646: 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.
@@ -23525,7 +23654,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23528: result: $with_no_leaks" >&5
+echo "$as_me:23657: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23543,7 +23672,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23546: checking for an rpath option" >&5
+	echo "$as_me:23675: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23574,12 +23703,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23577: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23706: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23582: checking if we need a space after rpath option" >&5
+		echo "$as_me:23711: 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"
 
@@ -23600,7 +23729,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23603 "configure"
+#line 23732 "configure"
 #include "confdefs.h"
 
 int
@@ -23612,16 +23741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23618: \$? = $ac_status" >&5
+  echo "$as_me:23747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23624: \$? = $ac_status" >&5
+  echo "$as_me:23753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23631,14 +23760,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23634: result: $cf_rpath_space" >&5
+		echo "$as_me:23763: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23641: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23770: 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.
@@ -23656,22 +23785,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23659: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23788: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23664: checking for updated LDFLAGS" >&5
+echo "$as_me:23793: 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:23667: result: maybe" >&5
+	echo "$as_me:23796: 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:23674: checking for $ac_word" >&5
+echo "$as_me:23803: 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
@@ -23686,7 +23815,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23689: found $ac_dir/$ac_word" >&5
+echo "$as_me:23818: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23694,10 +23823,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23697: result: $cf_ldd_prog" >&5
+  echo "$as_me:23826: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23700: result: no" >&5
+  echo "$as_me:23829: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23711,7 +23840,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23714 "configure"
+#line 23843 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23723,16 +23852,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23729: \$? = $ac_status" >&5
+  echo "$as_me:23858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23735: \$? = $ac_status" >&5
+  echo "$as_me:23864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23760,7 +23889,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23772,11 +23901,11 @@ echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23775: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23904: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23779: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23908: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23813,7 +23942,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23816: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23945: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23826,11 +23955,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23829: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23958: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23833: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23962: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23867,7 +23996,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23870: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23999: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23880,14 +24009,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23883: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24012: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24016: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23890: result: no" >&5
+	echo "$as_me:24019: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23977,7 +24106,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23980: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24109: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24158,7 +24287,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24161: error: ambiguous option: $1
+    { { echo "$as_me:24290: 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;}
@@ -24177,7 +24306,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24180: error: unrecognized option: $1
+  -*) { { echo "$as_me:24309: 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;}
@@ -24227,7 +24356,7 @@ do
   "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:24230: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24359: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24535,7 +24664,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24538: creating $ac_file" >&5
+    { echo "$as_me:24667: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24553,7 +24682,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24556: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24685: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24566,7 +24695,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24569: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24698: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24582,7 +24711,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24585: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24714: 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;}
@@ -24591,7 +24720,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24594: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24723: 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;}
@@ -24636,7 +24765,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24639: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24768: 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;}
@@ -24647,7 +24776,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24650: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24779: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24696,7 +24825,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24699: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24828: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24707,7 +24836,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24710: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24839: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24720,7 +24849,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24723: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24852: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24778,7 +24907,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24781: $ac_file is unchanged" >&5
+      { echo "$as_me:24910: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

From a9f92e1f4852a49a5fbed874cb84939ff4a9be0d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 20 May 2024 01:39:14 +0200
Subject: [PATCH 068/106] ncurses-6.5-20240519.patch.gz

---
 Ada95/configure                  | 502 +++++++++++++------------------
 Ada95/configure.in               |   6 +-
 NEWS                             |   7 +-
 VERSION                          |   2 +-
 dist.mk                          |   4 +-
 include/ncurses_defs             |   3 +-
 package/debian-mingw/changelog   |   4 +-
 package/debian-mingw64/changelog |   4 +-
 package/debian/changelog         |   4 +-
 package/mingw-ncurses.nsi        |   4 +-
 package/mingw-ncurses.spec       |   2 +-
 package/ncurses.spec             |   2 +-
 package/ncursest.spec            |   2 +-
 13 files changed, 228 insertions(+), 318 deletions(-)

diff --git a/Ada95/configure b/Ada95/configure
index 869f8fdd9..fa45b3c49 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.92 .
+# From configure.in Revision: 1.93 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -16636,109 +16636,15 @@ echo "${ECHO_T}$cf_with_trace" >&6
 if test "$cf_with_trace" = yes ; then
 	ADA_TRACE=TRUE
 
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in -DTRACE
-do
-case "$cf_fix_cppflags" in
-(no)
-	case "$cf_add_cflags" in
-	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
-		case "$cf_add_cflags" in
-		(-D*)
-			cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-				&& test -z "${cf_tst_cflags}" \
-				&& cf_fix_cppflags=yes
-
-			if test "$cf_fix_cppflags" = yes ; then
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-				continue
-			elif test "${cf_tst_cflags}" = "\"'" ; then
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-				continue
-			fi
-			;;
-		esac
-		case "$CPPFLAGS" in
-		(*$cf_add_cflags)
-			;;
-		(*)
-			case "$cf_add_cflags" in
-			(-D*)
-				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
-	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
-
-				;;
-			esac
-
-	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
-	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
-
-			;;
-		esac
-		;;
-	(*)
-
-	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
-	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
-
-		;;
-	esac
-	;;
-(yes)
-
-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
-	cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'`
-
-	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-		&& test -z "${cf_tst_cflags}" \
-		&& cf_fix_cppflags=no
-	;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
-	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
-	CFLAGS="${CFLAGS}$cf_new_cflags"
-
-fi
-
-if test -n "$cf_new_cppflags" ; then
-
-	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
-	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-
-fi
-
-if test -n "$cf_new_extra_cppflags" ; then
-
-	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
-	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-
-fi
+cat >>confdefs.h <<\EOF
+#define TRACE 1
+EOF
 
 else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16741: checking if we want to use GNAT projects" >&5
+echo "$as_me:16647: 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.
@@ -16755,21 +16661,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16758: result: $enable_gnat_projects" >&5
+echo "$as_me:16664: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16765: checking if ssp library is needed" >&5
+echo "$as_me:16671: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16772 "configure"
+#line 16678 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16786,16 +16692,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16792: \$? = $ac_status" >&5
+  echo "$as_me:16698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16798: \$? = $ac_status" >&5
+  echo "$as_me:16704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16805,7 +16711,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16808 "configure"
+#line 16714 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16822,16 +16728,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16828: \$? = $ac_status" >&5
+  echo "$as_me:16734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16834: \$? = $ac_status" >&5
+  echo "$as_me:16740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16845,7 +16751,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16754: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16873,13 +16779,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16876: checking for clock_gettime" >&5
+echo "$as_me:16782: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16882 "configure"
+#line 16788 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16910,16 +16816,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16916: \$? = $ac_status" >&5
+  echo "$as_me:16822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16922: \$? = $ac_status" >&5
+  echo "$as_me:16828: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16929,12 +16835,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16838: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16843: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16942,7 +16848,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16945 "configure"
+#line 16851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16961,16 +16867,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16967: \$? = $ac_status" >&5
+  echo "$as_me:16873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16973: \$? = $ac_status" >&5
+  echo "$as_me:16879: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16981,7 +16887,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16890: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16993,14 +16899,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16996: checking if clock_gettime links" >&5
+echo "$as_me:16902: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17003 "configure"
+#line 16909 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17018,16 +16924,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17024: \$? = $ac_status" >&5
+  echo "$as_me:16930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17030: \$? = $ac_status" >&5
+  echo "$as_me:16936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -17038,7 +16944,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16947: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17052,13 +16958,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17055: checking for gettimeofday" >&5
+echo "$as_me:16961: 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 17061 "configure"
+#line 16967 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17089,16 +16995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17095: \$? = $ac_status" >&5
+  echo "$as_me:17001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17101: \$? = $ac_status" >&5
+  echo "$as_me:17007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17108,7 +17014,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17017: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17118,7 +17024,7 @@ EOF
 
 else
 
-echo "$as_me:17121: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17027: 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
@@ -17126,7 +17032,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17129 "configure"
+#line 17035 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17145,16 +17051,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17151: \$? = $ac_status" >&5
+  echo "$as_me:17057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17157: \$? = $ac_status" >&5
+  echo "$as_me:17063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17165,7 +17071,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17168: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17074: 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
 
@@ -17198,13 +17104,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17201: checking for signed char" >&5
+echo "$as_me:17107: 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 17207 "configure"
+#line 17113 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17219,16 +17125,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17225: \$? = $ac_status" >&5
+  echo "$as_me:17131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17231: \$? = $ac_status" >&5
+  echo "$as_me:17137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17238,10 +17144,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17147: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17244: checking size of signed char" >&5
+echo "$as_me:17150: 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
@@ -17250,7 +17156,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17253 "configure"
+#line 17159 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17262,21 +17168,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17268: \$? = $ac_status" >&5
+  echo "$as_me:17174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17274: \$? = $ac_status" >&5
+  echo "$as_me:17180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17279 "configure"
+#line 17185 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17288,16 +17194,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17294: \$? = $ac_status" >&5
+  echo "$as_me:17200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17300: \$? = $ac_status" >&5
+  echo "$as_me:17206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17313,7 +17219,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17316 "configure"
+#line 17222 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17325,16 +17231,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17331: \$? = $ac_status" >&5
+  echo "$as_me:17237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17337: \$? = $ac_status" >&5
+  echo "$as_me:17243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17350,7 +17256,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17353 "configure"
+#line 17259 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17362,16 +17268,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17368: \$? = $ac_status" >&5
+  echo "$as_me:17274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17374: \$? = $ac_status" >&5
+  echo "$as_me:17280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17384,12 +17290,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17387: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17293: 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 17392 "configure"
+#line 17298 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17405,15 +17311,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17411: \$? = $ac_status" >&5
+  echo "$as_me:17317: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17416: \$? = $ac_status" >&5
+  echo "$as_me:17322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17429,7 +17335,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17338: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17438,13 +17344,13 @@ EOF
 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:17441: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17347: 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 17447 "configure"
+#line 17353 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17459,16 +17365,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17465: \$? = $ac_status" >&5
+  echo "$as_me:17371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17471: \$? = $ac_status" >&5
+  echo "$as_me:17377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17478,7 +17384,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17387: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17491,7 +17397,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17494: checking for opendir in -ldir" >&5
+  echo "$as_me:17400: 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
@@ -17499,7 +17405,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17502 "configure"
+#line 17408 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17518,16 +17424,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17524: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17530: \$? = $ac_status" >&5
+  echo "$as_me:17436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17538,14 +17444,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17541: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17447: 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:17548: checking for opendir in -lx" >&5
+  echo "$as_me:17454: 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
@@ -17553,7 +17459,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17556 "configure"
+#line 17462 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17572,16 +17478,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17578: \$? = $ac_status" >&5
+  echo "$as_me:17484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17584: \$? = $ac_status" >&5
+  echo "$as_me:17490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17592,7 +17498,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17595: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17501: 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"
@@ -17600,13 +17506,13 @@ fi
 
 fi
 
-echo "$as_me:17603: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17509: 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 17609 "configure"
+#line 17515 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17622,16 +17528,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17628: \$? = $ac_status" >&5
+  echo "$as_me:17534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17634: \$? = $ac_status" >&5
+  echo "$as_me:17540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17641,7 +17547,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17644: result: $ac_cv_header_time" >&5
+echo "$as_me:17550: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17659,13 +17565,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17662: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17568: 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 17668 "configure"
+#line 17574 "configure"
 #include "confdefs.h"
 
 int
@@ -17727,16 +17633,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17733: \$? = $ac_status" >&5
+  echo "$as_me:17639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17739: \$? = $ac_status" >&5
+  echo "$as_me:17645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17746,7 +17652,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17749: result: $ac_cv_c_const" >&5
+echo "$as_me:17655: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17758,7 +17664,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17761: checking if data-only library module links" >&5
+echo "$as_me:17667: 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
@@ -17766,20 +17672,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17769 "configure"
+#line 17675 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17775: \$? = $ac_status" >&5
+  echo "$as_me:17681: \$? = $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 <<EOF
-#line 17782 "configure"
+#line 17688 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17796,10 +17702,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17802: \$? = $ac_status" >&5
+  echo "$as_me:17708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17812,7 +17718,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17815 "configure"
+#line 17721 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17823,15 +17729,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17829: \$? = $ac_status" >&5
+  echo "$as_me:17735: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17834: \$? = $ac_status" >&5
+  echo "$as_me:17740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17846,7 +17752,7 @@ fi
 
 fi
 
-echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17755: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17865,23 +17771,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17868: checking for $ac_header" >&5
+echo "$as_me:17774: 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 17874 "configure"
+#line 17780 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17784: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17884: \$? = $ac_status" >&5
+  echo "$as_me:17790: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17900,7 +17806,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17809: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17910,7 +17816,7 @@ EOF
 fi
 done
 
-echo "$as_me:17913: checking for working mkstemp" >&5
+echo "$as_me:17819: 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
@@ -17921,7 +17827,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17924 "configure"
+#line 17830 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17956,15 +17862,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17962: \$? = $ac_status" >&5
+  echo "$as_me:17868: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17967: \$? = $ac_status" >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17979,16 +17885,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17982: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17888: 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:17985: checking for mkstemp" >&5
+	echo "$as_me:17891: 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 17991 "configure"
+#line 17897 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18019,16 +17925,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18025: \$? = $ac_status" >&5
+  echo "$as_me:17931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18031: \$? = $ac_status" >&5
+  echo "$as_me:17937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -18038,7 +17944,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17947: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18059,7 +17965,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:17968: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18076,10 +17982,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18079: result: $ADAFLAGS" >&5
+	echo "$as_me:17985: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18082: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17988: 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
@@ -18089,11 +17995,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18092: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17998: 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:18096: checking if GNAT supports generics" >&5
+echo "$as_me:18002: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18103,7 +18009,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18106: result: $cf_gnat_generics" >&5
+echo "$as_me:18012: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18115,7 +18021,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18118: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18024: 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
@@ -18163,7 +18069,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18072: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18176,7 +18082,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18179: checking if GNAT supports project files" >&5
+echo "$as_me:18085: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18239,15 +18145,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18242: result: $cf_gnat_projects" >&5
+echo "$as_me:18148: 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:18248: checking if GNAT supports libraries" >&5
+	echo "$as_me:18154: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18156: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18267,7 +18173,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18176: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18279,7 +18185,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18282: checking for Ada95 compiler" >&5
+echo "$as_me:18188: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18290,12 +18196,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18293: result: $cf_ada_compiler" >&5
+echo "$as_me:18199: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18298: checking for Ada95 include directory" >&5
+echo "$as_me:18204: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18331,7 +18237,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18334: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18240: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18340,10 +18246,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18343: result: $ADA_INCLUDE" >&5
+echo "$as_me:18249: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18346: checking for Ada95 object directory" >&5
+echo "$as_me:18252: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18379,7 +18285,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18382: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18288: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18388,10 +18294,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18391: result: $ADA_OBJECTS" >&5
+echo "$as_me:18297: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18394: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18300: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18412,11 +18318,11 @@ then
 	fi
 fi
 
-echo "$as_me:18415: result: $with_ada_sharedlib" >&5
+echo "$as_me:18321: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18419: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18325: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18434,7 +18340,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18437: checking for Ada95 curses library name" >&5
+echo "$as_me:18343: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18450,16 +18356,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18453: result: $ADA_LIBNAME" >&5
+echo "$as_me:18359: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18457: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18363: 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:18462: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18368: 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
@@ -18499,7 +18405,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18502: checking default library suffix" >&5
+echo "$as_me:18408: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18510,10 +18416,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18513: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18419: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18516: checking default library-dependency suffix" >&5
+echo "$as_me:18422: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18596,10 +18502,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18599: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18505: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18602: checking default object directory" >&5
+echo "$as_me:18508: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18615,7 +18521,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18618: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18524: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18757,7 +18663,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18760: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18666: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18938,7 +18844,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18941: error: ambiguous option: $1
+    { { echo "$as_me:18847: 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;}
@@ -18957,7 +18863,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18960: error: unrecognized option: $1
+  -*) { { echo "$as_me:18866: 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;}
@@ -19032,7 +18938,7 @@ do
   "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:19035: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18941: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19394,7 +19300,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19397: creating $ac_file" >&5
+    { echo "$as_me:19303: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19412,7 +19318,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19415: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19321: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19425,7 +19331,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19428: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19334: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19441,7 +19347,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19444: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19350: 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;}
@@ -19450,7 +19356,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19453: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19359: 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;}
@@ -19495,7 +19401,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19498: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19404: 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;}
@@ -19506,7 +19412,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19509: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19415: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19555,7 +19461,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19558: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19464: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19566,7 +19472,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19569: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19475: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19579,7 +19485,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19582: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19488: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19637,7 +19543,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19640: $ac_file is unchanged" >&5
+      { echo "$as_me:19546: $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/Ada95/configure.in b/Ada95/configure.in
index 0e523d04e..2b0e01373 100644
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: configure.in,v 1.92 2024/05/18 14:31:03 tom Exp $
+dnl $Id: configure.in,v 1.93 2024/05/19 09:12:05 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)
-AC_REVISION($Revision: 1.92 $)
+AC_REVISION($Revision: 1.93 $)
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -410,7 +410,7 @@ AC_MSG_RESULT($cf_with_trace)
 
 if test "$cf_with_trace" = yes ; then
 	ADA_TRACE=TRUE
-	CF_ADD_CFLAGS(-DTRACE)
+	AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions])
 else
 	ADA_TRACE=FALSE
 fi
diff --git a/NEWS b/NEWS
index 4c3a229c2..96175cf68 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4123 2024/05/18 21:35:34 tom Exp $
+-- $Id: NEWS,v 1.4126 2024/05/19 09:13:07 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240519
+	+ update Ada95/configure to match change for -DTRACE
+	+ revert change to include/ncurses_defs, which caused build failure if
+	  tracing was not enabled (report by Branden Robinson).
+
 20240518
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use
diff --git a/VERSION b/VERSION
index ef00a32b4..69b5db68f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240518
+5:0:10	6.5	20240519
diff --git a/dist.mk b/dist.mk
index 114ad1502..63ea2d3b4 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1613 2024/05/18 10:54:27 tom Exp $
+# $Id: dist.mk,v 1.1614 2024/05/19 08:58:02 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240518
+NCURSES_PATCH = 20240519
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/ncurses_defs b/include/ncurses_defs
index dc73ce7d3..bf00f7555 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.111 2024/05/18 19:41:39 tom Exp $
+# $Id: ncurses_defs,v 1.112 2024/05/19 09:02:51 tom Exp $
 ##############################################################################
 # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -253,7 +253,6 @@ SYSTEM_NAME	"unknown"
 TERMINFO	"none"
 TERMPATH	"none"
 TIME_WITH_SYS_TIME
-TRACE
 TYPEOF_CHTYPE
 USE_COLORFGBG
 USE_FOPEN_BIN_R
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 14515c0a9..e7aea7bed 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240518) unstable; urgency=low
+ncurses6 (6.5+20240519) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 14515c0a9..e7aea7bed 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240518) unstable; urgency=low
+ncurses6 (6.5+20240519) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 86f2e5846..26a2294bf 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240518) unstable; urgency=low
+ncurses6 (6.5+20240519) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 May 2024 06:54:27 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ed819a2a5..f3253f0d5 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.648 2024/05/18 10:54:27 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.649 2024/05/19 08:58:02 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0518"
+!define VERSION_MMDD  "0519"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ce2c513c4..babff0386 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240518
+Release: 20240519
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2ccdd3e63..7d51c5c3e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240518
+Release: 20240519
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index ed0d4b5dd..25a6955e7 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240518
+Release: 20240519
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 645eb04ae08a37801d0206ed784b173fedd7c6bf Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 26 May 2024 02:05:13 +0200
Subject: [PATCH 069/106] ncurses-6.5-20240525.patch.gz

---
 NEWS                                 |    7 +-
 VERSION                              |    2 +-
 configure                            | 2465 +++++++++++++-------------
 configure.in                         |    7 +-
 dist.mk                              |    4 +-
 doc/html/man/curs_add_wch.3x.html    |    8 +-
 doc/html/man/curs_addch.3x.html      |    8 +-
 doc/html/man/curs_addstr.3x.html     |   22 +-
 doc/html/man/curs_addwstr.3x.html    |   10 +-
 doc/html/man/curs_attr.3x.html       |   18 +-
 doc/html/man/curs_border.3x.html     |   10 +-
 doc/html/man/curs_border_set.3x.html |   10 +-
 doc/html/man/curs_clear.3x.html      |   27 +-
 doc/html/man/curs_color.3x.html      |   10 +-
 doc/html/man/curs_get_wstr.3x.html   |   10 +-
 doc/html/man/curs_getch.3x.html      |   28 +-
 doc/html/man/curs_getstr.3x.html     |   10 +-
 doc/html/man/curs_in_wchstr.3x.html  |   10 +-
 doc/html/man/curs_inch.3x.html       |   14 +-
 doc/html/man/curs_inchstr.3x.html    |   10 +-
 doc/html/man/curs_initscr.3x.html    |   18 +-
 doc/html/man/curs_inopts.3x.html     |  410 +++--
 doc/html/man/curs_ins_wch.3x.html    |   12 +-
 doc/html/man/curs_ins_wstr.3x.html   |   12 +-
 doc/html/man/curs_insstr.3x.html     |   12 +-
 doc/html/man/curs_instr.3x.html      |   10 +-
 doc/html/man/curs_inwstr.3x.html     |   25 +-
 doc/html/man/curs_kernel.3x.html     |   87 +-
 doc/html/man/curs_legacy.3x.html     |   26 +-
 doc/html/man/curs_mouse.3x.html      |   10 +-
 doc/html/man/curs_outopts.3x.html    |   14 +-
 doc/html/man/curs_overlay.3x.html    |   12 +-
 doc/html/man/curs_pad.3x.html        |   71 +-
 doc/html/man/curs_refresh.3x.html    |   23 +-
 doc/html/man/curs_scroll.3x.html     |   16 +-
 doc/html/man/curs_slk.3x.html        |   67 +-
 doc/html/man/curs_terminfo.3x.html   |  220 +--
 doc/html/man/curs_touch.3x.html      |   12 +-
 doc/html/man/curs_util.3x.html       |  111 +-
 doc/html/man/curs_window.3x.html     |   81 +-
 doc/html/man/define_key.3x.html      |   15 +-
 doc/html/man/form.3x.html            |   10 +-
 doc/html/man/index.html              |   69 +-
 doc/html/man/menu.3x.html            |   10 +-
 doc/html/man/ncurses.3x.html         |  384 ++--
 doc/html/man/panel.3x.html           |   14 +-
 doc/html/man/terminfo.5.html         |    2 +-
 doc/html/ncurses-intro.html          |   10 +-
 man/curs_add_wch.3x                  |   12 +-
 man/curs_addch.3x                    |   12 +-
 man/curs_addstr.3x                   |   26 +-
 man/curs_addwstr.3x                  |    7 +-
 man/curs_attr.3x                     |   14 +-
 man/curs_border.3x                   |    7 +-
 man/curs_border_set.3x               |    8 +-
 man/curs_clear.3x                    |    8 +-
 man/curs_color.3x                    |    8 +-
 man/curs_get_wstr.3x                 |    7 +-
 man/curs_getch.3x                    |   40 +-
 man/curs_getstr.3x                   |    7 +-
 man/curs_in_wchstr.3x                |    7 +-
 man/curs_inch.3x                     |    6 +-
 man/curs_inchstr.3x                  |    7 +-
 man/curs_initscr.3x                  |   15 +-
 man/curs_inopts.3x                   |  800 ++++++---
 man/curs_ins_wch.3x                  |   16 +-
 man/curs_ins_wstr.3x                 |   10 +-
 man/curs_insstr.3x                   |   10 +-
 man/curs_instr.3x                    |    7 +-
 man/curs_inwstr.3x                   |    7 +-
 man/curs_kernel.3x                   |  127 +-
 man/curs_legacy.3x                   |   22 +-
 man/curs_mouse.3x                    |    8 +-
 man/curs_outopts.3x                  |   12 +-
 man/curs_overlay.3x                  |    7 +-
 man/curs_pad.3x                      |   19 +-
 man/curs_refresh.3x                  |   13 +-
 man/curs_scroll.3x                   |   65 +-
 man/curs_slk.3x                      |   25 +-
 man/curs_terminfo.3x                 |   81 +-
 man/curs_touch.3x                    |   10 +-
 man/curs_util.3x                     |   13 +-
 man/curs_window.3x                   |  112 +-
 man/define_key.3x                    |   11 +-
 man/form.3x                          |    6 +-
 man/man_db.renames.in                |    4 +-
 man/manhtml.aliases                  |    3 +-
 man/menu.3x                          |    6 +-
 man/ncurses.3x                       |   46 +-
 man/panel.3x                         |   11 +-
 misc/terminfo.src                    |   82 +-
 ncurses/base/lib_color.c             |    8 +-
 ncurses/new_pair.h                   |    6 +-
 ncurses/report_offsets.c             |    4 +-
 ncurses/tinfo/lib_raw.c              |   12 +-
 package/debian-mingw/changelog       |    4 +-
 package/debian-mingw64/changelog     |    4 +-
 package/debian/changelog             |    4 +-
 package/mingw-ncurses.nsi            |    4 +-
 package/mingw-ncurses.spec           |    2 +-
 package/ncurses.spec                 |    2 +-
 package/ncursest.spec                |    2 +-
 102 files changed, 3337 insertions(+), 2892 deletions(-)

diff --git a/NEWS b/NEWS
index 96175cf68..702afb739 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4126 2024/05/19 09:13:07 tom Exp $
+-- $Id: NEWS,v 1.4129 2024/05/25 23:09:24 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240525
+	+ build-fix for configure option --disable-ext-funcs
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ review/update iTerm2 for 3.5.0 -TD
+
 20240519
 	+ update Ada95/configure to match change for -DTRACE
 	+ revert change to include/ncurses_defs, which caused build failure if
diff --git a/VERSION b/VERSION
index 69b5db68f..b27c93b66 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240519
+5:0:10	6.5	20240525
diff --git a/configure b/configure
index d0884171f..4a74babd4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.781 .
+# From configure.in Revision: 1.782 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20231210.
 #
@@ -15837,13 +15837,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	GENERATED_EXT_FUNCS=generated
-	test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no
 else
+	cf_dft_ext_spfuncs=no
+	cf_dft_ext_colors=no
 	NCURSES_EXT_FUNCS=0
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15846: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15847: 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.
@@ -15853,7 +15854,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15856: result: $with_sp_funcs" >&5
+echo "$as_me:15857: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15872,7 +15873,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15875: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15876: 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.
@@ -15882,7 +15883,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15885: result: $with_term_driver" >&5
+echo "$as_me:15886: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15891,19 +15892,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15894: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15895: 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:15899: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15900: 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:15906: checking for extended use of const keyword" >&5
+echo "$as_me:15907: 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.
@@ -15913,7 +15914,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15916: result: $with_ext_const" >&5
+echo "$as_me:15917: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15921,7 +15922,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15924: checking if you want to use extended colors" >&5
+echo "$as_me:15925: 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.
@@ -15931,12 +15932,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15934: result: $with_ext_colors" >&5
+echo "$as_me:15935: 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:15939: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15940: 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)
@@ -15947,7 +15948,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15950: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15975,7 +15976,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15978: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15979: 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.
@@ -15985,7 +15986,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15988: result: $with_ext_mouse" >&5
+echo "$as_me:15989: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15995,7 +15996,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15998: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16012,7 +16013,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16015: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16016: 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.
@@ -16022,7 +16023,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16025: result: $with_ext_putwin" >&5
+echo "$as_me:16026: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16032,7 +16033,7 @@ EOF
 
 fi
 
-echo "$as_me:16035: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16036: 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.
@@ -16042,7 +16043,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16045: result: $with_no_padding" >&5
+echo "$as_me:16046: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16050,7 +16051,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16053: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16054: 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.
@@ -16060,7 +16061,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16063: result: $with_sigwinch" >&5
+echo "$as_me:16064: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16075,7 +16076,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16078: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16079: 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.
@@ -16085,7 +16086,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16088: result: $with_tcap_names" >&5
+echo "$as_me:16089: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16099,7 +16100,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16102: checking if you want to link with the pthread library" >&5
+echo "$as_me:16103: 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.
@@ -16109,27 +16110,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16112: result: $with_pthread" >&5
+echo "$as_me:16113: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16116: checking for pthread.h" >&5
+	echo "$as_me:16117: 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 16122 "configure"
+#line 16123 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16126: \"$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:16132: \$? = $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
@@ -16148,7 +16149,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16151: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16152: 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
 
@@ -16158,7 +16159,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16161: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16162: 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"
 
@@ -16179,7 +16180,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16182 "configure"
+#line 16183 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16196,16 +16197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16202: \$? = $ac_status" >&5
+  echo "$as_me:16203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16208: \$? = $ac_status" >&5
+  echo "$as_me:16209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16215,7 +16216,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16218: result: $with_pthread" >&5
+	    echo "$as_me:16219: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16243,7 +16244,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16246: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16253,13 +16254,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16256: checking for pthread_kill" >&5
+	echo "$as_me:16257: 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 16262 "configure"
+#line 16263 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16290,16 +16291,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16296: \$? = $ac_status" >&5
+  echo "$as_me:16297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16302: \$? = $ac_status" >&5
+  echo "$as_me:16303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16309,11 +16310,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16312: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16313: 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:16316: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16317: 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.
@@ -16323,7 +16324,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16326: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16334,7 +16335,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16337: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16338: 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.
@@ -16344,18 +16345,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16347: result: $use_weak_symbols" >&5
+	echo "$as_me:16348: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16351: checking if $CC supports weak symbols" >&5
+echo "$as_me:16352: 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 16358 "configure"
+#line 16359 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16381,16 +16382,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16387: \$? = $ac_status" >&5
+  echo "$as_me:16388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16393: \$? = $ac_status" >&5
+  echo "$as_me:16394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16401,7 +16402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16404: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16451,7 +16452,7 @@ fi
 # 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:16454: checking if you want reentrant code" >&5
+echo "$as_me:16455: 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.
@@ -16461,7 +16462,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16464: result: $with_reentrant" >&5
+echo "$as_me:16465: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16550,7 +16551,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16553: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16562,7 +16563,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16565: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16584,16 +16585,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16587: result: $enable_opaque_curses" >&5
+echo "$as_me:16588: 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:16592: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16593: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16596: checking whether form library structures should be opaque" >&5
+echo "$as_me:16597: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16610,10 +16611,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16613: result: $enable_opaque_form" >&5
+echo "$as_me:16614: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16616: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16630,10 +16631,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16633: result: $enable_opaque_menu" >&5
+echo "$as_me:16634: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16636: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16650,7 +16651,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16653: result: $enable_opaque_panel" >&5
+echo "$as_me:16654: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16660,7 +16661,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16663: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16664: 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.
@@ -16670,7 +16671,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16673: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16683,7 +16684,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16686: checking if you want all development code" >&5
+echo "$as_me:16687: 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.
@@ -16693,11 +16694,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16696: result: $with_develop" >&5
+echo "$as_me:16697: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16700: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16707,7 +16708,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16710: result: $enable_check_size" >&5
+echo "$as_me:16711: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16715,7 +16716,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16718: checking if you want hard-tabs code" >&5
+echo "$as_me:16719: 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.
@@ -16725,7 +16726,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16728: result: $enable_hard_tabs" >&5
+echo "$as_me:16729: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16733,7 +16734,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16736: checking if you want limited support for xmc" >&5
+echo "$as_me:16737: 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.
@@ -16743,7 +16744,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16746: result: $enable_xmc_glitch" >&5
+echo "$as_me:16747: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16753,7 +16754,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16756: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16757: 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.
@@ -16763,7 +16764,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16766: result: $with_assumed_color" >&5
+echo "$as_me:16767: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16771,7 +16772,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16774: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16775: 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.
@@ -16781,7 +16782,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16784: result: $with_hashmap" >&5
+echo "$as_me:16785: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16789,7 +16790,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16792: checking if you want colorfgbg code" >&5
+echo "$as_me:16793: 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.
@@ -16799,7 +16800,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16802: result: $with_colorfgbg" >&5
+echo "$as_me:16803: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16807,7 +16808,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16810: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16817,14 +16818,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16820: result: $cf_with_fvisibility" >&5
+echo "$as_me:16821: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16827: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16828: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16833,7 +16834,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16836 "configure"
+#line 16837 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16849,16 +16850,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16855: \$? = $ac_status" >&5
+  echo "$as_me:16856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16861: \$? = $ac_status" >&5
+  echo "$as_me:16862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16870,7 +16871,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16873: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16985,7 +16986,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16988: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16994,7 +16995,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16997 "configure"
+#line 16998 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17010,16 +17011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17016: \$? = $ac_status" >&5
+  echo "$as_me:17017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17022: \$? = $ac_status" >&5
+  echo "$as_me:17023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17031,7 +17032,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17034: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17154,7 +17155,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17157: checking if you want interop bindings" >&5
+echo "$as_me:17158: 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.
@@ -17164,13 +17165,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17167: result: $with_exp_interop" >&5
+echo "$as_me:17168: 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:17173: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17174: 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.
@@ -17180,13 +17181,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17183: result: $with_safe_sprintf" >&5
+echo "$as_me:17184: 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:17189: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17190: 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.
@@ -17196,7 +17197,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17199: result: $with_scroll_hints" >&5
+echo "$as_me:17200: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17205,7 +17206,7 @@ EOF
 
 fi
 
-echo "$as_me:17208: checking if you want wgetch-events code" >&5
+echo "$as_me:17209: 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.
@@ -17215,7 +17216,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17218: result: $with_wgetch_events" >&5
+echo "$as_me:17219: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17230,7 +17231,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17233: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17240,7 +17241,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17243: result: $with_exp_win32" >&5
+	echo "$as_me:17244: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17266,7 +17267,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17269: checking if you want to see long compiling messages" >&5
+echo "$as_me:17270: 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.
@@ -17300,7 +17301,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17303: result: $enableval" >&5
+echo "$as_me:17304: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17313,7 +17314,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17316: checking if you want to install stripped executables" >&5
+echo "$as_me:17317: 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.
@@ -17330,7 +17331,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17333: result: $enable_stripping" >&5
+echo "$as_me:17334: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17341,7 +17342,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17344: checking if install accepts -p option" >&5
+echo "$as_me:17345: 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
@@ -17372,10 +17373,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17375: result: $cf_cv_install_p" >&5
+echo "$as_me:17376: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17378: checking if install needs to be told about ownership" >&5
+echo "$as_me:17379: 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)
@@ -17386,7 +17387,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17389: result: $with_install_o" >&5
+echo "$as_me:17390: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17397,7 +17398,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17400: checking if you want to specify strip-program" >&5
+	echo "$as_me:17401: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17407,11 +17408,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17410: result: $with_strip_program" >&5
+	echo "$as_me:17411: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17414: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17432,11 +17433,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17435: result: $check_install_strip" >&5
+		echo "$as_me:17436: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17439: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17451,7 +17452,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17454: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17477,7 +17478,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17480: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17494,17 +17495,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17497: result: $enable_stdnoreturn" >&5
+echo "$as_me:17498: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17501: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17507 "configure"
+#line 17508 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17520,16 +17521,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17526: \$? = $ac_status" >&5
+  echo "$as_me:17527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17532: \$? = $ac_status" >&5
+  echo "$as_me:17533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17540,7 +17541,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17543: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17596,16 +17597,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17599: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17604: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17608: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17644,16 +17645,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17647: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17652: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17656: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17692,23 +17693,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17695: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17700: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17704: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17711: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17712: 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.
@@ -17725,7 +17726,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17728: result: $enable_warnings" >&5
+echo "$as_me:17729: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17749,7 +17750,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17752 "configure"
+#line 17753 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17764,26 +17765,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17770: \$? = $ac_status" >&5
+  echo "$as_me:17771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17776: \$? = $ac_status" >&5
+  echo "$as_me:17777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17779: checking for X11/Xt const-feature" >&5
+echo "$as_me:17780: 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 17786 "configure"
+#line 17787 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17801,16 +17802,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17807: \$? = $ac_status" >&5
+  echo "$as_me:17808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17813: \$? = $ac_status" >&5
+  echo "$as_me:17814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17825,7 +17826,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17828: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17854,7 +17855,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17857 "${as_me:-configure}"
+#line 17858 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17870,7 +17871,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17873: checking for $CC warning options..." >&5
+	{ echo "$as_me:17874: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17886,12 +17887,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17889: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17892: \$? = $ac_status" >&5
+  echo "$as_me:17893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17894: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17899,7 +17900,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17902: checking for $CC warning options..." >&5
+	{ echo "$as_me:17903: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17922,12 +17923,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17925: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17928: \$? = $ac_status" >&5
+  echo "$as_me:17929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17930: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17935,7 +17936,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17938: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17945,7 +17946,7 @@ echo "${as_me:-configure}:17938: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17948: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17978,10 +17979,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17981: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17984 "${as_me:-configure}"
+#line 17985 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18031,12 +18032,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18037: \$? = $ac_status" >&5
+  echo "$as_me:18038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18039: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18108,12 +18109,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18111: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18112: 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 18116 "configure"
+#line 18117 "configure"
 #include "confdefs.h"
 
 int
@@ -18130,16 +18131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18136: \$? = $ac_status" >&5
+  echo "$as_me:18137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18142: \$? = $ac_status" >&5
+  echo "$as_me:18143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18150,7 +18151,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18153: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18159,11 +18160,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18162: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18163: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18166 "configure"
+#line 18167 "configure"
 #include "confdefs.h"
 
 int
@@ -18180,16 +18181,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18186: \$? = $ac_status" >&5
+  echo "$as_me:18187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18192: \$? = $ac_status" >&5
+  echo "$as_me:18193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18199,7 +18200,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18202: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18208,30 +18209,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18211: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18218: checking version of $CC" >&5
+	echo "$as_me:18219: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18222: result: $CLANG_VERSION" >&5
+	echo "$as_me:18223: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18229: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18230: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18234 "configure"
+#line 18235 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18245,16 +18246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18251: \$? = $ac_status" >&5
+  echo "$as_me:18252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18257: \$? = $ac_status" >&5
+  echo "$as_me:18258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18265,13 +18266,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18268: result: $cf_clang_optok" >&5
+		echo "$as_me:18269: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18274: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18288,7 +18289,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18291 "configure"
+#line 18292 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18306,7 +18307,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18309: checking for $CC warning options..." >&5
+	{ echo "$as_me:18310: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18323,12 +18324,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18329: \$? = $ac_status" >&5
+  echo "$as_me:18330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18331: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18337,7 +18338,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18340: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18367,16 +18368,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18373: \$? = $ac_status" >&5
+  echo "$as_me:18374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18375: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18379: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18394,7 +18395,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18397: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18398: 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.
@@ -18404,7 +18405,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18407: result: $enable_string_hacks" >&5
+echo "$as_me:18408: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18413,15 +18414,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18416: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18417: 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:18418: checking for strlcat" >&5
+	echo "$as_me:18419: 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 18424 "configure"
+#line 18425 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18452,16 +18453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18458: \$? = $ac_status" >&5
+  echo "$as_me:18459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18464: \$? = $ac_status" >&5
+  echo "$as_me:18465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18471,7 +18472,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18474: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18481,7 +18482,7 @@ EOF
 
 else
 
-		echo "$as_me:18484: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18485: 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
@@ -18489,7 +18490,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18492 "configure"
+#line 18493 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18508,16 +18509,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18514: \$? = $ac_status" >&5
+  echo "$as_me:18515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18520: \$? = $ac_status" >&5
+  echo "$as_me:18521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18528,7 +18529,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18531: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18532: 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
 
@@ -18551,23 +18552,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18554: checking for $ac_header" >&5
+echo "$as_me:18555: 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 18560 "configure"
+#line 18561 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18564: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18570: \$? = $ac_status" >&5
+  echo "$as_me:18571: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18586,7 +18587,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18589: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18607,13 +18608,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18610: checking for $ac_func" >&5
+echo "$as_me:18611: 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 18616 "configure"
+#line 18617 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18644,16 +18645,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18650: \$? = $ac_status" >&5
+  echo "$as_me:18651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18656: \$? = $ac_status" >&5
+  echo "$as_me:18657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18663,7 +18664,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18666: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18676,7 +18677,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18679: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18680: 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.
@@ -18686,7 +18687,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18689: result: $with_assertions" >&5
+echo "$as_me:18690: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18702,7 +18703,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18705: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18706: 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.
@@ -18724,7 +18725,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18727: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18838,23 +18839,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18841: checking for dmalloc.h" >&5
+	echo "$as_me:18842: 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 18847 "configure"
+#line 18848 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18857: \$? = $ac_status" >&5
+  echo "$as_me:18858: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18873,11 +18874,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18876: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18877: 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:18880: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18881: 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
@@ -18885,7 +18886,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18888 "configure"
+#line 18889 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18904,16 +18905,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18910: \$? = $ac_status" >&5
+  echo "$as_me:18911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18916: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18924,7 +18925,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18927: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18939,7 +18940,7 @@ fi
 
 fi
 
-echo "$as_me:18942: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18943: 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.
@@ -18961,7 +18962,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18964: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19075,23 +19076,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19078: checking for dbmalloc.h" >&5
+	echo "$as_me:19079: 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 19084 "configure"
+#line 19085 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19088: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19094: \$? = $ac_status" >&5
+  echo "$as_me:19095: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19110,11 +19111,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19113: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19114: 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:19117: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19118: 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
@@ -19122,7 +19123,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19125 "configure"
+#line 19126 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19141,16 +19142,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19147: \$? = $ac_status" >&5
+  echo "$as_me:19148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19153: \$? = $ac_status" >&5
+  echo "$as_me:19154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19161,7 +19162,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19164: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19165: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19176,7 +19177,7 @@ fi
 
 fi
 
-echo "$as_me:19179: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19180: 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.
@@ -19198,7 +19199,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19201: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19311,7 +19312,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19314: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19315: 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.
@@ -19322,7 +19323,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19325: result: $with_no_leaks" >&5
+echo "$as_me:19326: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19374,7 +19375,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19377: checking whether to add trace feature to all models" >&5
+echo "$as_me:19378: 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.
@@ -19384,7 +19385,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19387: result: $cf_with_trace" >&5
+echo "$as_me:19388: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19404,7 +19405,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19407: checking if we want to use GNAT projects" >&5
+echo "$as_me:19408: 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.
@@ -19421,7 +19422,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19424: result: $enable_gnat_projects" >&5
+echo "$as_me:19425: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19434,14 +19435,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19437: checking if ssp library is needed" >&5
+echo "$as_me:19438: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19444 "configure"
+#line 19445 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19458,16 +19459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19464: \$? = $ac_status" >&5
+  echo "$as_me:19465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19470: \$? = $ac_status" >&5
+  echo "$as_me:19471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19477,7 +19478,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19480 "configure"
+#line 19481 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19494,16 +19495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19500: \$? = $ac_status" >&5
+  echo "$as_me:19501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19506: \$? = $ac_status" >&5
+  echo "$as_me:19507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19517,7 +19518,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19520: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19546,14 +19547,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19549: checking if -lm needed for math functions" >&5
+echo "$as_me:19550: 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 19556 "configure"
+#line 19557 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19569,16 +19570,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19575: \$? = $ac_status" >&5
+  echo "$as_me:19576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19581: \$? = $ac_status" >&5
+  echo "$as_me:19582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19588,7 +19589,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19591: result: $cf_cv_need_libm" >&5
+echo "$as_me:19592: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19596,14 +19597,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19599: checking if -lm is available for math functions" >&5
+	echo "$as_me:19600: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19606 "configure"
+#line 19607 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19619,16 +19620,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19625: \$? = $ac_status" >&5
+  echo "$as_me:19626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19631: \$? = $ac_status" >&5
+  echo "$as_me:19632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19638,7 +19639,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19641: result: $cf_cv_have_libm" >&5
+echo "$as_me:19642: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19660,13 +19661,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19663: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19664: 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 19669 "configure"
+#line 19670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19682,16 +19683,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19688: \$? = $ac_status" >&5
+  echo "$as_me:19689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19694: \$? = $ac_status" >&5
+  echo "$as_me:19695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19701,7 +19702,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19704: result: $ac_cv_header_time" >&5
+echo "$as_me:19705: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19716,7 +19717,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19719: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19724,7 +19725,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19727 "configure"
+#line 19728 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19743,16 +19744,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19749: \$? = $ac_status" >&5
+  echo "$as_me:19750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19755: \$? = $ac_status" >&5
+  echo "$as_me:19756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19763,11 +19764,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19766: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19770: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19771: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19775,7 +19776,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19778 "configure"
+#line 19779 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19794,16 +19795,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19800: \$? = $ac_status" >&5
+  echo "$as_me:19801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19806: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19814,7 +19815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19817: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19836,7 +19837,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19839: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19844,7 +19845,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19847 "configure"
+#line 19848 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19863,16 +19864,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19869: \$? = $ac_status" >&5
+  echo "$as_me:19870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19875: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19883,7 +19884,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19886: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19905,7 +19906,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19908: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19913,7 +19914,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19916 "configure"
+#line 19917 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19932,16 +19933,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19938: \$? = $ac_status" >&5
+  echo "$as_me:19939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19944: \$? = $ac_status" >&5
+  echo "$as_me:19945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19952,7 +19953,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19955: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19994,7 +19995,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19997: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20002,7 +20003,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20005 "configure"
+#line 20006 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20021,16 +20022,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20027: \$? = $ac_status" >&5
+  echo "$as_me:20028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20033: \$? = $ac_status" >&5
+  echo "$as_me:20034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20041,7 +20042,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20044: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20069,13 +20070,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20072: checking for regcomp" >&5
+	echo "$as_me:20073: 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 20078 "configure"
+#line 20079 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20106,16 +20107,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20112: \$? = $ac_status" >&5
+  echo "$as_me:20113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20118: \$? = $ac_status" >&5
+  echo "$as_me:20119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20125,7 +20126,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20128: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20129: 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
@@ -20134,7 +20135,7 @@ else
 		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:20137: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20138: 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
@@ -20142,7 +20143,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20145 "configure"
+#line 20146 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20161,16 +20162,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20167: \$? = $ac_status" >&5
+  echo "$as_me:20168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20173: \$? = $ac_status" >&5
+  echo "$as_me:20174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20181,7 +20182,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20184: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20185: 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
 
@@ -20213,13 +20214,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20216: checking for compile" >&5
+	echo "$as_me:20217: 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 20222 "configure"
+#line 20223 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20250,16 +20251,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20256: \$? = $ac_status" >&5
+  echo "$as_me:20257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20262: \$? = $ac_status" >&5
+  echo "$as_me:20263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20269,13 +20270,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20272: result: $ac_cv_func_compile" >&5
+echo "$as_me:20273: 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:20278: checking for compile in -lgen" >&5
+		echo "$as_me:20279: 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
@@ -20283,7 +20284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20286 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20302,16 +20303,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20308: \$? = $ac_status" >&5
+  echo "$as_me:20309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20314: \$? = $ac_status" >&5
+  echo "$as_me:20315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20322,7 +20323,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20325: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20326: 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
 
@@ -20350,11 +20351,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20353: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20357: checking for regular-expression headers" >&5
+echo "$as_me:20358: 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
@@ -20366,7 +20367,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20369 "configure"
+#line 20370 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20383,16 +20384,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20389: \$? = $ac_status" >&5
+  echo "$as_me:20390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20395: \$? = $ac_status" >&5
+  echo "$as_me:20396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20409,7 +20410,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20412 "configure"
+#line 20413 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20429,16 +20430,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20435: \$? = $ac_status" >&5
+  echo "$as_me:20436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20441: \$? = $ac_status" >&5
+  echo "$as_me:20442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20454,11 +20455,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20457: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20461: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20496,23 +20497,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20499: checking for $ac_header" >&5
+echo "$as_me:20500: 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 20505 "configure"
+#line 20506 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20515: \$? = $ac_status" >&5
+  echo "$as_me:20516: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20531,7 +20532,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20544,23 +20545,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20547: checking for $ac_header" >&5
+echo "$as_me:20548: 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 20553 "configure"
+#line 20554 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20563: \$? = $ac_status" >&5
+  echo "$as_me:20564: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20579,7 +20580,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20589,7 +20590,7 @@ EOF
 fi
 done
 
-echo "$as_me:20592: checking for header declaring getopt variables" >&5
+echo "$as_me:20593: 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
@@ -20599,7 +20600,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20602 "configure"
+#line 20603 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20612,16 +20613,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20618: \$? = $ac_status" >&5
+  echo "$as_me:20619: \$? = $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:20622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20624: \$? = $ac_status" >&5
+  echo "$as_me:20625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20633,7 +20634,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20636: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20650,14 +20651,14 @@ EOF
 
 fi
 
-echo "$as_me:20653: checking if external environ is declared" >&5
+echo "$as_me:20654: 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 20660 "configure"
+#line 20661 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20670,16 +20671,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20676: \$? = $ac_status" >&5
+  echo "$as_me:20677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20682: \$? = $ac_status" >&5
+  echo "$as_me:20683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20690,7 +20691,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20693: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20705,14 +20706,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20708: checking if external environ exists" >&5
+echo "$as_me:20709: 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 20715 "configure"
+#line 20716 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20727,16 +20728,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20730: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20733: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20739: \$? = $ac_status" >&5
+  echo "$as_me:20740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20747,7 +20748,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20750: result: $cf_cv_have_environ" >&5
+echo "$as_me:20751: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20760,13 +20761,13 @@ EOF
 
 fi
 
-echo "$as_me:20763: checking for getenv" >&5
+echo "$as_me:20764: 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 20769 "configure"
+#line 20770 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20797,16 +20798,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20803: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20809: \$? = $ac_status" >&5
+  echo "$as_me:20810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20816,19 +20817,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20819: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20820: 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:20825: checking for $ac_func" >&5
+echo "$as_me:20826: 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 20831 "configure"
+#line 20832 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20859,16 +20860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20865: \$? = $ac_status" >&5
+  echo "$as_me:20866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20871: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20878,7 +20879,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20881: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20888,7 +20889,7 @@ EOF
 fi
 done
 
-echo "$as_me:20891: checking if getenv returns consistent values" >&5
+echo "$as_me:20892: 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
@@ -20898,7 +20899,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20901 "configure"
+#line 20902 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21003,15 +21004,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21009: \$? = $ac_status" >&5
+  echo "$as_me:21010: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21014: \$? = $ac_status" >&5
+  echo "$as_me:21015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21024,7 +21025,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21027: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21039,18 +21040,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21042: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21043: 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
 
-echo "$as_me:21046: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21047: 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 21053 "configure"
+#line 21054 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21070,16 +21071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21076: \$? = $ac_status" >&5
+  echo "$as_me:21077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21082: \$? = $ac_status" >&5
+  echo "$as_me:21083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21091,7 +21092,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21094: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21095: 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
@@ -21106,13 +21107,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21109: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21110: 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 21115 "configure"
+#line 21116 "configure"
 #include "confdefs.h"
 
 int
@@ -21174,16 +21175,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21180: \$? = $ac_status" >&5
+  echo "$as_me:21181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21186: \$? = $ac_status" >&5
+  echo "$as_me:21187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21193,7 +21194,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21196: result: $ac_cv_c_const" >&5
+echo "$as_me:21197: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21203,7 +21204,7 @@ EOF
 
 fi
 
-echo "$as_me:21206: checking for inline" >&5
+echo "$as_me:21207: 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
@@ -21211,7 +21212,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21214 "configure"
+#line 21215 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21220,16 +21221,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21226: \$? = $ac_status" >&5
+  echo "$as_me:21227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21232: \$? = $ac_status" >&5
+  echo "$as_me:21233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21240,7 +21241,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21243: result: $ac_cv_c_inline" >&5
+echo "$as_me:21244: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21266,7 +21267,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21269: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21270: 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
@@ -21275,7 +21276,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21278 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21287,16 +21288,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21293: \$? = $ac_status" >&5
+  echo "$as_me:21294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21299: \$? = $ac_status" >&5
+  echo "$as_me:21300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21308,7 +21309,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21311: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21414,7 +21415,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21417: checking for signal global datatype" >&5
+echo "$as_me:21418: 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
@@ -21426,7 +21427,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21429 "configure"
+#line 21430 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21450,16 +21451,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21456: \$? = $ac_status" >&5
+  echo "$as_me:21457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21462: \$? = $ac_status" >&5
+  echo "$as_me:21463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21473,7 +21474,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21476: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21477: 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 <<EOF
@@ -21482,7 +21483,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21485: checking for type of chtype" >&5
+echo "$as_me:21486: 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
@@ -21492,7 +21493,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21495 "configure"
+#line 21496 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21527,15 +21528,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21533: \$? = $ac_status" >&5
+  echo "$as_me:21534: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21538: \$? = $ac_status" >&5
+  echo "$as_me:21539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21550,7 +21551,7 @@ fi
 
 fi
 
-echo "$as_me:21553: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21562,14 +21563,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21565: checking if unsigned literals are legal" >&5
+echo "$as_me:21566: 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 21572 "configure"
+#line 21573 "configure"
 #include "confdefs.h"
 
 int
@@ -21581,16 +21582,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21587: \$? = $ac_status" >&5
+  echo "$as_me:21588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21593: \$? = $ac_status" >&5
+  echo "$as_me:21594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21602,7 +21603,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21605: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21618,14 +21619,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21621: checking if external errno is declared" >&5
+echo "$as_me:21622: 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 21628 "configure"
+#line 21629 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21639,16 +21640,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21645: \$? = $ac_status" >&5
+  echo "$as_me:21646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21651: \$? = $ac_status" >&5
+  echo "$as_me:21652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21659,7 +21660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21662: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21674,14 +21675,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21677: checking if external errno exists" >&5
+echo "$as_me:21678: 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 21684 "configure"
+#line 21685 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21696,16 +21697,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21702: \$? = $ac_status" >&5
+  echo "$as_me:21703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21708: \$? = $ac_status" >&5
+  echo "$as_me:21709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21716,7 +21717,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21719: result: $cf_cv_have_errno" >&5
+echo "$as_me:21720: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21729,7 +21730,7 @@ EOF
 
 fi
 
-echo "$as_me:21732: checking if data-only library module links" >&5
+echo "$as_me:21733: 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
@@ -21737,20 +21738,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21740 "configure"
+#line 21741 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21743: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21746: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $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 <<EOF
-#line 21753 "configure"
+#line 21754 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21767,10 +21768,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21770: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21773: \$? = $ac_status" >&5
+  echo "$as_me:21774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21783,7 +21784,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21786 "configure"
+#line 21787 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21794,15 +21795,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21800: \$? = $ac_status" >&5
+  echo "$as_me:21801: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21805: \$? = $ac_status" >&5
+  echo "$as_me:21806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21817,7 +21818,7 @@ fi
 
 fi
 
-echo "$as_me:21820: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21832,13 +21833,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21835: checking for clock_gettime" >&5
+echo "$as_me:21836: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21841 "configure"
+#line 21842 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21869,16 +21870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21875: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21881: \$? = $ac_status" >&5
+  echo "$as_me:21882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21888,12 +21889,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21891: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21896: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21901,7 +21902,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21904 "configure"
+#line 21905 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21920,16 +21921,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21926: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21932: \$? = $ac_status" >&5
+  echo "$as_me:21933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21940,7 +21941,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21943: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21952,14 +21953,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21955: checking if clock_gettime links" >&5
+echo "$as_me:21956: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21962 "configure"
+#line 21963 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21977,16 +21978,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21983: \$? = $ac_status" >&5
+  echo "$as_me:21984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21989: \$? = $ac_status" >&5
+  echo "$as_me:21990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21997,7 +21998,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22000: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22011,13 +22012,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22014: checking for gettimeofday" >&5
+echo "$as_me:22015: 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 22020 "configure"
+#line 22021 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22048,16 +22049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22054: \$? = $ac_status" >&5
+  echo "$as_me:22055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22060: \$? = $ac_status" >&5
+  echo "$as_me:22061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22067,7 +22068,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22070: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22077,7 +22078,7 @@ EOF
 
 else
 
-echo "$as_me:22080: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22081: 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
@@ -22085,7 +22086,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22088 "configure"
+#line 22089 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22104,16 +22105,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22110: \$? = $ac_status" >&5
+  echo "$as_me:22111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22116: \$? = $ac_status" >&5
+  echo "$as_me:22117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22124,7 +22125,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22127: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22128: 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
 
@@ -22183,13 +22184,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22186: checking for $ac_func" >&5
+echo "$as_me:22187: 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 22192 "configure"
+#line 22193 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22220,16 +22221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22226: \$? = $ac_status" >&5
+  echo "$as_me:22227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22232: \$? = $ac_status" >&5
+  echo "$as_me:22233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22239,7 +22240,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22242: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22249,14 +22250,14 @@ EOF
 fi
 done
 
-echo "$as_me:22252: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22259 "configure"
+#line 22260 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22271,16 +22272,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22283: \$? = $ac_status" >&5
+  echo "$as_me:22284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22290,7 +22291,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22293: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22312,7 +22313,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22315: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22322,7 +22323,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22325 "configure"
+#line 22326 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22335,15 +22336,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22341: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22346: \$? = $ac_status" >&5
+  echo "$as_me:22347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22355,7 +22356,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22358: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22367,14 +22368,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22370: checking for getttynam" >&5
+	echo "$as_me:22371: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22377 "configure"
+#line 22378 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22386,16 +22387,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22392: \$? = $ac_status" >&5
+  echo "$as_me:22393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22398: \$? = $ac_status" >&5
+  echo "$as_me:22399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22405,7 +22406,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22408: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22415,7 +22416,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22418: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22424,7 +22425,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22427: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22437,14 +22438,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22440: checking for terminal-capability database functions" >&5
+echo "$as_me:22441: 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 22447 "configure"
+#line 22448 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22464,16 +22465,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22470: \$? = $ac_status" >&5
+  echo "$as_me:22471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22476: \$? = $ac_status" >&5
+  echo "$as_me:22477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22484,7 +22485,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22487: result: $cf_cv_cgetent" >&5
+echo "$as_me:22488: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22494,14 +22495,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22497: checking if cgetent uses const parameter" >&5
+echo "$as_me:22498: 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 22504 "configure"
+#line 22505 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22524,16 +22525,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22530: \$? = $ac_status" >&5
+  echo "$as_me:22531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22536: \$? = $ac_status" >&5
+  echo "$as_me:22537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22544,7 +22545,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22547: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22558,14 +22559,14 @@ fi
 
 fi
 
-echo "$as_me:22561: checking for isascii" >&5
+echo "$as_me:22562: 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 22568 "configure"
+#line 22569 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22577,16 +22578,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22583: \$? = $ac_status" >&5
+  echo "$as_me:22584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22589: \$? = $ac_status" >&5
+  echo "$as_me:22590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22597,7 +22598,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22600: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22605,10 +22606,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22608: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22609: 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 22611 "configure"
+#line 22612 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22622,16 +22623,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22628: \$? = $ac_status" >&5
+  echo "$as_me:22629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22634: \$? = $ac_status" >&5
+  echo "$as_me:22635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22639,7 +22640,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22642 "configure"
+#line 22643 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22654,16 +22655,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22660: \$? = $ac_status" >&5
+  echo "$as_me:22661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22666: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22679,11 +22680,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22682: result: $sigact_bad" >&5
+echo "$as_me:22683: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22686: checking if nanosleep really works" >&5
+echo "$as_me:22687: 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
@@ -22693,7 +22694,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22696 "configure"
+#line 22697 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22719,15 +22720,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22725: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22730: \$? = $ac_status" >&5
+  echo "$as_me:22731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22739,7 +22740,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22742: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22756,23 +22757,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22759: checking for $ac_header" >&5
+echo "$as_me:22760: 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 22765 "configure"
+#line 22766 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22775: \$? = $ac_status" >&5
+  echo "$as_me:22776: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22791,7 +22792,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22794: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22808,10 +22809,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22811: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22812: 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 22814 "configure"
+#line 22815 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22823,16 +22824,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22829: \$? = $ac_status" >&5
+  echo "$as_me:22830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22835: \$? = $ac_status" >&5
+  echo "$as_me:22836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22840,7 +22841,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22843 "configure"
+#line 22844 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22854,16 +22855,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22860: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22866: \$? = $ac_status" >&5
+  echo "$as_me:22867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22879,19 +22880,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22882: result: $termios_bad" >&5
+	echo "$as_me:22883: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22887: checking for tcgetattr" >&5
+echo "$as_me:22888: 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 22894 "configure"
+#line 22895 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22919,16 +22920,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22925: \$? = $ac_status" >&5
+  echo "$as_me:22926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22931: \$? = $ac_status" >&5
+  echo "$as_me:22932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22938,21 +22939,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22941: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22942: 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:22948: checking for vsscanf function or workaround" >&5
+echo "$as_me:22949: 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 22955 "configure"
+#line 22956 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22978,16 +22979,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22984: \$? = $ac_status" >&5
+  echo "$as_me:22985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22990: \$? = $ac_status" >&5
+  echo "$as_me:22991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22995,7 +22996,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22998 "configure"
+#line 22999 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23017,16 +23018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23023: \$? = $ac_status" >&5
+  echo "$as_me:23024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23029: \$? = $ac_status" >&5
+  echo "$as_me:23030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23034,7 +23035,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23037 "configure"
+#line 23038 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23056,16 +23057,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23062: \$? = $ac_status" >&5
+  echo "$as_me:23063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23068: \$? = $ac_status" >&5
+  echo "$as_me:23069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23080,7 +23081,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23083: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23106,23 +23107,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23109: checking for $ac_header" >&5
+echo "$as_me:23110: 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 23115 "configure"
+#line 23116 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23125: \$? = $ac_status" >&5
+  echo "$as_me:23126: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23141,7 +23142,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23151,7 +23152,7 @@ EOF
 fi
 done
 
-echo "$as_me:23154: checking for working mkstemp" >&5
+echo "$as_me:23155: 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
@@ -23162,7 +23163,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23165 "configure"
+#line 23166 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23197,15 +23198,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23203: \$? = $ac_status" >&5
+  echo "$as_me:23204: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23208: \$? = $ac_status" >&5
+  echo "$as_me:23209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23220,16 +23221,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23223: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23224: 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:23226: checking for mkstemp" >&5
+	echo "$as_me:23227: 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 23232 "configure"
+#line 23233 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23260,16 +23261,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23266: \$? = $ac_status" >&5
+  echo "$as_me:23267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23272: \$? = $ac_status" >&5
+  echo "$as_me:23273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23279,7 +23280,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23282: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23300,21 +23301,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23303: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23304: 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:23306: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23307: 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:23312: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23313: 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 23317 "configure"
+#line 23318 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23331,15 +23332,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23337: \$? = $ac_status" >&5
+  echo "$as_me:23338: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23342: \$? = $ac_status" >&5
+  echo "$as_me:23343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23352,7 +23353,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23355: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23356: 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
 
@@ -23363,13 +23364,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23366: checking for intptr_t" >&5
+echo "$as_me:23367: 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 23372 "configure"
+#line 23373 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23384,16 +23385,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23390: \$? = $ac_status" >&5
+  echo "$as_me:23391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23396: \$? = $ac_status" >&5
+  echo "$as_me:23397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23403,7 +23404,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23406: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23407: 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
   :
@@ -23415,13 +23416,13 @@ EOF
 
 fi
 
-echo "$as_me:23418: checking for ssize_t" >&5
+echo "$as_me:23419: 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 23424 "configure"
+#line 23425 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23436,16 +23437,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23442: \$? = $ac_status" >&5
+  echo "$as_me:23443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23448: \$? = $ac_status" >&5
+  echo "$as_me:23449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23455,7 +23456,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23458: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23459: 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
   :
@@ -23467,14 +23468,14 @@ EOF
 
 fi
 
-echo "$as_me:23470: checking for type sigaction_t" >&5
+echo "$as_me:23471: 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 23477 "configure"
+#line 23478 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23487,16 +23488,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23493: \$? = $ac_status" >&5
+  echo "$as_me:23494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23499: \$? = $ac_status" >&5
+  echo "$as_me:23500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23507,14 +23508,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23510: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23511: 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:23517: checking declaration of size-change" >&5
+echo "$as_me:23518: 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
@@ -23535,7 +23536,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23538 "configure"
+#line 23539 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23585,16 +23586,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23591: \$? = $ac_status" >&5
+  echo "$as_me:23592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23597: \$? = $ac_status" >&5
+  echo "$as_me:23598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23613,7 +23614,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23616: result: $cf_cv_sizechange" >&5
+echo "$as_me:23617: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23631,13 +23632,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23634: checking for memmove" >&5
+echo "$as_me:23635: 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 23640 "configure"
+#line 23641 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23668,16 +23669,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23674: \$? = $ac_status" >&5
+  echo "$as_me:23675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23680: \$? = $ac_status" >&5
+  echo "$as_me:23681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23687,19 +23688,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23690: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23691: 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:23696: checking for bcopy" >&5
+echo "$as_me:23697: 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 23702 "configure"
+#line 23703 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23730,16 +23731,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23736: \$? = $ac_status" >&5
+  echo "$as_me:23737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23742: \$? = $ac_status" >&5
+  echo "$as_me:23743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23749,11 +23750,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23752: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23753: 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:23756: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23757: 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
@@ -23763,7 +23764,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23766 "configure"
+#line 23767 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23779,15 +23780,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23785: \$? = $ac_status" >&5
+  echo "$as_me:23786: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23790: \$? = $ac_status" >&5
+  echo "$as_me:23791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23800,7 +23801,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23803: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23827,13 +23828,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23830: checking for $ac_func" >&5
+echo "$as_me:23831: 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 23836 "configure"
+#line 23837 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23864,16 +23865,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23870: \$? = $ac_status" >&5
+  echo "$as_me:23871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23876: \$? = $ac_status" >&5
+  echo "$as_me:23877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23883,7 +23884,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23886: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23893,7 +23894,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23896: checking if poll really works" >&5
+echo "$as_me:23897: 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
@@ -23903,7 +23904,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23906 "configure"
+#line 23907 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23956,15 +23957,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23962: \$? = $ac_status" >&5
+  echo "$as_me:23963: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23967: \$? = $ac_status" >&5
+  echo "$as_me:23968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23976,21 +23977,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23979: result: $cf_cv_working_poll" >&5
+echo "$as_me:23980: 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:23986: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23987: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23993 "configure"
+#line 23994 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24010,16 +24011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24016: \$? = $ac_status" >&5
+  echo "$as_me:24017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24022: \$? = $ac_status" >&5
+  echo "$as_me:24023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24029,7 +24030,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24032: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24039,18 +24040,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24042: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24046: checking for va_copy" >&5
+echo "$as_me:24047: 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 24053 "configure"
+#line 24054 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24067,16 +24068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24073: \$? = $ac_status" >&5
+  echo "$as_me:24074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24079: \$? = $ac_status" >&5
+  echo "$as_me:24080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24086,7 +24087,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24089: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24098,14 +24099,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24101: checking for __va_copy" >&5
+echo "$as_me:24102: 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 24108 "configure"
+#line 24109 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24122,16 +24123,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24128: \$? = $ac_status" >&5
+  echo "$as_me:24129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24134: \$? = $ac_status" >&5
+  echo "$as_me:24135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24141,7 +24142,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24144: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24153,14 +24154,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24156: checking for __builtin_va_copy" >&5
+echo "$as_me:24157: 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 24163 "configure"
+#line 24164 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24177,16 +24178,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24183: \$? = $ac_status" >&5
+  echo "$as_me:24184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24189: \$? = $ac_status" >&5
+  echo "$as_me:24190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24196,7 +24197,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24199: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24200: 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 &&
@@ -24214,14 +24215,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24217: checking if we can simply copy va_list" >&5
+	echo "$as_me:24218: 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 24224 "configure"
+#line 24225 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24238,16 +24239,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24244: \$? = $ac_status" >&5
+  echo "$as_me:24245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24250: \$? = $ac_status" >&5
+  echo "$as_me:24251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24257,19 +24258,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24260: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24261: 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:24265: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24266: 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 24272 "configure"
+#line 24273 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24286,16 +24287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24292: \$? = $ac_status" >&5
+  echo "$as_me:24293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24298: \$? = $ac_status" >&5
+  echo "$as_me:24299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24305,7 +24306,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24308: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24309: 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
@@ -24316,13 +24317,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24319: checking for pid_t" >&5
+echo "$as_me:24320: 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 24325 "configure"
+#line 24326 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24337,16 +24338,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24343: \$? = $ac_status" >&5
+  echo "$as_me:24344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24349: \$? = $ac_status" >&5
+  echo "$as_me:24350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24356,7 +24357,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24359: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24360: 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
   :
@@ -24371,23 +24372,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24374: checking for $ac_header" >&5
+echo "$as_me:24375: 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 24380 "configure"
+#line 24381 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24384: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24390: \$? = $ac_status" >&5
+  echo "$as_me:24391: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24406,7 +24407,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24409: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24419,13 +24420,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24422: checking for $ac_func" >&5
+echo "$as_me:24423: 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 24428 "configure"
+#line 24429 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24456,16 +24457,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24462: \$? = $ac_status" >&5
+  echo "$as_me:24463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24468: \$? = $ac_status" >&5
+  echo "$as_me:24469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24475,7 +24476,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24478: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24487,7 +24488,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24490: checking for working fork" >&5
+  echo "$as_me:24491: 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
@@ -24510,15 +24511,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24516: \$? = $ac_status" >&5
+  echo "$as_me:24517: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24521: \$? = $ac_status" >&5
+  echo "$as_me:24522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24530,7 +24531,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24533: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24544,12 +24545,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24547: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24548: 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:24552: checking for working vfork" >&5
+  echo "$as_me:24553: 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
@@ -24558,7 +24559,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24561 "configure"
+#line 24562 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24651,15 +24652,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24657: \$? = $ac_status" >&5
+  echo "$as_me:24658: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24662: \$? = $ac_status" >&5
+  echo "$as_me:24663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24671,13 +24672,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24674: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24675: 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:24680: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24681: 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
 
@@ -24702,7 +24703,7 @@ EOF
 
 fi
 
-echo "$as_me:24705: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24706: 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
@@ -24712,7 +24713,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24715 "configure"
+#line 24716 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24747,15 +24748,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24753: \$? = $ac_status" >&5
+  echo "$as_me:24754: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24758: \$? = $ac_status" >&5
+  echo "$as_me:24759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24768,7 +24769,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24771: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24772: 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
@@ -24777,7 +24778,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24780: checking for openpty in -lutil" >&5
+echo "$as_me:24781: 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
@@ -24785,7 +24786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24788 "configure"
+#line 24789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24804,16 +24805,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24810: \$? = $ac_status" >&5
+  echo "$as_me:24811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24816: \$? = $ac_status" >&5
+  echo "$as_me:24817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24824,7 +24825,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24827: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24828: 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
@@ -24832,7 +24833,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24835: checking for openpty header" >&5
+echo "$as_me:24836: 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
@@ -24859,7 +24860,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24862 "configure"
+#line 24863 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24877,16 +24878,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24883: \$? = $ac_status" >&5
+  echo "$as_me:24884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24889: \$? = $ac_status" >&5
+  echo "$as_me:24890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24904,7 +24905,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24907: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24977,7 +24978,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24980 "configure"
+#line 24981 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24989,16 +24990,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24995: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25001: \$? = $ac_status" >&5
+  echo "$as_me:25002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25015,7 +25016,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25018: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25051,7 +25052,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25054: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25062,7 +25063,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25065: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25134,7 +25135,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25137 "configure"
+#line 25138 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25146,16 +25147,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25152: \$? = $ac_status" >&5
+  echo "$as_me:25153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25158: \$? = $ac_status" >&5
+  echo "$as_me:25159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25172,7 +25173,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25175: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25252,7 +25253,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25255: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25269,23 +25270,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25272: checking for db.h" >&5
+echo "$as_me:25273: 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 25278 "configure"
+#line 25279 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25288: \$? = $ac_status" >&5
+  echo "$as_me:25289: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25304,11 +25305,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25307: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25308: 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:25311: checking for version of db" >&5
+echo "$as_me:25312: 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
@@ -25319,10 +25320,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25322: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25325 "configure"
+#line 25326 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25352,16 +25353,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25358: \$? = $ac_status" >&5
+  echo "$as_me:25359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25364: \$? = $ac_status" >&5
+  echo "$as_me:25365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25375,16 +25376,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25378: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25379: 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:25382: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25383: 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:25387: checking for db libraries" >&5
+echo "$as_me:25388: 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
@@ -25414,10 +25415,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25417: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25420 "configure"
+#line 25421 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25472,16 +25473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25478: \$? = $ac_status" >&5
+  echo "$as_me:25479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25484: \$? = $ac_status" >&5
+  echo "$as_me:25485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25501,11 +25502,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25504: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25505: 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:25508: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25509: 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
@@ -25531,7 +25532,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25534: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25546,7 +25547,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25549: checking if we should include stdbool.h" >&5
+echo "$as_me:25550: 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
@@ -25554,7 +25555,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25557 "configure"
+#line 25558 "configure"
 #include "confdefs.h"
 
 int
@@ -25566,23 +25567,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25572: \$? = $ac_status" >&5
+  echo "$as_me:25573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25578: \$? = $ac_status" >&5
+  echo "$as_me:25579: \$? = $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 25585 "configure"
+#line 25586 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25598,16 +25599,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25604: \$? = $ac_status" >&5
+  echo "$as_me:25605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25610: \$? = $ac_status" >&5
+  echo "$as_me:25611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25621,13 +25622,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25624: result: yes" >&5
+then	echo "$as_me:25625: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25626: result: no" >&5
+else	echo "$as_me:25627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25630: checking for builtin bool type" >&5
+echo "$as_me:25631: 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
@@ -25635,7 +25636,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25638 "configure"
+#line 25639 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25650,16 +25651,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25656: \$? = $ac_status" >&5
+  echo "$as_me:25657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25662: \$? = $ac_status" >&5
+  echo "$as_me:25663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25672,9 +25673,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25675: result: yes" >&5
+then	echo "$as_me:25676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25677: result: no" >&5
+else	echo "$as_me:25678: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25691,10 +25692,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25694: checking if we already have C++ library" >&5
+	echo "$as_me:25695: 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 25697 "configure"
+#line 25698 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25708,16 +25709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25714: \$? = $ac_status" >&5
+  echo "$as_me:25715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25720: \$? = $ac_status" >&5
+  echo "$as_me:25721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25726,7 +25727,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25729: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25745,7 +25746,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25748: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25749: 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
@@ -25771,7 +25772,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25774 "configure"
+#line 25775 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25785,16 +25786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25791: \$? = $ac_status" >&5
+  echo "$as_me:25792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25797: \$? = $ac_status" >&5
+  echo "$as_me:25798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25806,7 +25807,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25809: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25828,7 +25829,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25831: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25832: 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
@@ -25843,15 +25844,15 @@ CF_EOF
 # 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:25846: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25849: \$? = $ac_status" >&5
+  echo "$as_me:25850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25851: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25854: \$? = $ac_status" >&5
+  echo "$as_me:25855: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25862,10 +25863,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25865: result: yes" >&5
+  echo "$as_me:25866: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25868: result: no" >&5
+  echo "$as_me:25869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25885,7 +25886,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25888: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25906,7 +25907,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25909 "configure"
+#line 25910 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25920,16 +25921,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25926: \$? = $ac_status" >&5
+  echo "$as_me:25927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25932: \$? = $ac_status" >&5
+  echo "$as_me:25933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25966,7 +25967,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25969 "configure"
+#line 25970 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25980,16 +25981,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25986: \$? = $ac_status" >&5
+  echo "$as_me:25987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25992: \$? = $ac_status" >&5
+  echo "$as_me:25993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26022,7 +26023,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26025: result: $cf_cxx_library" >&5
+	echo "$as_me:26026: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26038,7 +26039,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26041: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26042: 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
@@ -26055,18 +26056,18 @@ do
   # 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 26058 "configure"
+#line 26059 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26063: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26069: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26089,17 +26090,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26092 "configure"
+#line 26093 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26096: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26102: \$? = $ac_status" >&5
+  echo "$as_me:26103: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26136,7 +26137,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26139: result: $CXXCPP" >&5
+echo "$as_me:26140: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26146,18 +26147,18 @@ do
   # 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 26149 "configure"
+#line 26150 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26160: \$? = $ac_status" >&5
+  echo "$as_me:26161: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26180,17 +26181,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26183 "configure"
+#line 26184 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26187: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26193: \$? = $ac_status" >&5
+  echo "$as_me:26194: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26218,7 +26219,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26221: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26233,23 +26234,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26236: checking for $ac_header" >&5
+echo "$as_me:26237: 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 26242 "configure"
+#line 26243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26246: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26252: \$? = $ac_status" >&5
+  echo "$as_me:26253: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26268,7 +26269,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26271: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26281,23 +26282,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26284: checking for $ac_header" >&5
+echo "$as_me:26285: 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 26290 "configure"
+#line 26291 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26294: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26300: \$? = $ac_status" >&5
+  echo "$as_me:26301: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26316,7 +26317,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26319: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26327,10 +26328,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26330: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26331: 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 26333 "configure"
+#line 26334 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26347,16 +26348,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26353: \$? = $ac_status" >&5
+  echo "$as_me:26354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26359: \$? = $ac_status" >&5
+  echo "$as_me:26360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26365,7 +26366,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26368: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26376,7 +26377,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26379: checking if we should include stdbool.h" >&5
+echo "$as_me:26380: 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
@@ -26384,7 +26385,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26387 "configure"
+#line 26388 "configure"
 #include "confdefs.h"
 
 int
@@ -26396,23 +26397,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26402: \$? = $ac_status" >&5
+  echo "$as_me:26403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26408: \$? = $ac_status" >&5
+  echo "$as_me:26409: \$? = $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 26415 "configure"
+#line 26416 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26428,16 +26429,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26434: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26440: \$? = $ac_status" >&5
+  echo "$as_me:26441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26451,13 +26452,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26454: result: yes" >&5
+then	echo "$as_me:26455: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26456: result: no" >&5
+else	echo "$as_me:26457: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26460: checking for builtin bool type" >&5
+echo "$as_me:26461: 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
@@ -26465,7 +26466,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26468 "configure"
+#line 26469 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26480,16 +26481,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26486: \$? = $ac_status" >&5
+  echo "$as_me:26487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26492: \$? = $ac_status" >&5
+  echo "$as_me:26493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26502,19 +26503,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26505: result: yes" >&5
+then	echo "$as_me:26506: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26507: result: no" >&5
+else	echo "$as_me:26508: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26511: checking for bool" >&5
+echo "$as_me:26512: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26517 "configure"
+#line 26518 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26549,16 +26550,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26555: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26561: \$? = $ac_status" >&5
+  echo "$as_me:26562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26568,10 +26569,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26571: result: $ac_cv_type_bool" >&5
+echo "$as_me:26572: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26574: checking size of bool" >&5
+echo "$as_me:26575: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26580,7 +26581,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26583 "configure"
+#line 26584 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26612,21 +26613,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26618: \$? = $ac_status" >&5
+  echo "$as_me:26619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26624: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26629 "configure"
+#line 26630 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26658,16 +26659,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26664: \$? = $ac_status" >&5
+  echo "$as_me:26665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26670: \$? = $ac_status" >&5
+  echo "$as_me:26671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26683,7 +26684,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26686 "configure"
+#line 26687 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26715,16 +26716,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26721: \$? = $ac_status" >&5
+  echo "$as_me:26722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26727: \$? = $ac_status" >&5
+  echo "$as_me:26728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26740,7 +26741,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26743 "configure"
+#line 26744 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26772,16 +26773,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26778: \$? = $ac_status" >&5
+  echo "$as_me:26779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26784: \$? = $ac_status" >&5
+  echo "$as_me:26785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26794,12 +26795,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26797: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26798: 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 26802 "configure"
+#line 26803 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26835,15 +26836,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26841: \$? = $ac_status" >&5
+  echo "$as_me:26842: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26846: \$? = $ac_status" >&5
+  echo "$as_me:26847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26859,13 +26860,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26862: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26868: checking for type of bool" >&5
+echo "$as_me:26869: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26884,7 +26885,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26887 "configure"
+#line 26888 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26925,15 +26926,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26931: \$? = $ac_status" >&5
+  echo "$as_me:26932: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26936: \$? = $ac_status" >&5
+  echo "$as_me:26937: \$? = $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
@@ -26950,19 +26951,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26953: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26954: 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:26960: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26961: 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:26965: checking for special defines needed for etip.h" >&5
+echo "$as_me:26966: 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"
@@ -26980,7 +26981,7 @@ do
 	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 26983 "configure"
+#line 26984 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26994,16 +26995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27000: \$? = $ac_status" >&5
+  echo "$as_me:27001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27006: \$? = $ac_status" >&5
+  echo "$as_me:27007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27024,12 +27025,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27027: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27032: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27046,7 +27047,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27049 "configure"
+#line 27050 "configure"
 #include "confdefs.h"
 
 class base
@@ -27065,15 +27066,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27071: \$? = $ac_status" >&5
+  echo "$as_me:27072: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27076: \$? = $ac_status" >&5
+  echo "$as_me:27077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27092,7 +27093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27095: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27101,7 +27102,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27104: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27105: 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
@@ -27118,7 +27119,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27121 "configure"
+#line 27122 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27137,15 +27138,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27143: \$? = $ac_status" >&5
+  echo "$as_me:27144: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27148: \$? = $ac_status" >&5
+  echo "$as_me:27149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27164,7 +27165,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27167: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27174,7 +27175,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27177: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27178: 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
@@ -27188,7 +27189,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27191 "configure"
+#line 27192 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27232,16 +27233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27238: \$? = $ac_status" >&5
+  echo "$as_me:27239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27244: \$? = $ac_status" >&5
+  echo "$as_me:27245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27259,7 +27260,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27262: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27308,13 +27309,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27311: checking for bool" >&5
+echo "$as_me:27312: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27317 "configure"
+#line 27318 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27349,16 +27350,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27355: \$? = $ac_status" >&5
+  echo "$as_me:27356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27361: \$? = $ac_status" >&5
+  echo "$as_me:27362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27368,10 +27369,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27371: result: $ac_cv_type_bool" >&5
+echo "$as_me:27372: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27374: checking size of bool" >&5
+echo "$as_me:27375: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27380,7 +27381,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27383 "configure"
+#line 27384 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27412,21 +27413,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27418: \$? = $ac_status" >&5
+  echo "$as_me:27419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27424: \$? = $ac_status" >&5
+  echo "$as_me:27425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27429 "configure"
+#line 27430 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27458,16 +27459,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27464: \$? = $ac_status" >&5
+  echo "$as_me:27465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27470: \$? = $ac_status" >&5
+  echo "$as_me:27471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27483,7 +27484,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27486 "configure"
+#line 27487 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27515,16 +27516,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27521: \$? = $ac_status" >&5
+  echo "$as_me:27522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27527: \$? = $ac_status" >&5
+  echo "$as_me:27528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27540,7 +27541,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27543 "configure"
+#line 27544 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27572,16 +27573,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27578: \$? = $ac_status" >&5
+  echo "$as_me:27579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27584: \$? = $ac_status" >&5
+  echo "$as_me:27585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27594,12 +27595,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27597: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27598: 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 27602 "configure"
+#line 27603 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27635,15 +27636,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27641: \$? = $ac_status" >&5
+  echo "$as_me:27642: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27646: \$? = $ac_status" >&5
+  echo "$as_me:27647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27659,13 +27660,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27662: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27668: checking for type of bool" >&5
+echo "$as_me:27669: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27684,7 +27685,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27687 "configure"
+#line 27688 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27725,15 +27726,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27731: \$? = $ac_status" >&5
+  echo "$as_me:27732: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27736: \$? = $ac_status" >&5
+  echo "$as_me:27737: \$? = $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
@@ -27750,26 +27751,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27753: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27754: 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:27760: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27761: 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:27766: checking for fallback type of bool" >&5
+			echo "$as_me:27767: 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:27772: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27773: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27798,7 +27799,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27801: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27802: 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
@@ -27809,7 +27810,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27812: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27826,10 +27827,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27829: result: $ADAFLAGS" >&5
+	echo "$as_me:27830: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27832: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27833: 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
@@ -27839,11 +27840,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27842: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27843: 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:27846: checking if GNAT supports generics" >&5
+echo "$as_me:27847: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27853,7 +27854,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27856: result: $cf_gnat_generics" >&5
+echo "$as_me:27857: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27865,7 +27866,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27868: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27869: 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
@@ -27913,7 +27914,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27916: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27926,7 +27927,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27929: checking if GNAT supports project files" >&5
+echo "$as_me:27930: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27989,15 +27990,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27992: result: $cf_gnat_projects" >&5
+echo "$as_me:27993: 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:27998: checking if GNAT supports libraries" >&5
+	echo "$as_me:27999: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28000: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28017,7 +28018,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28020: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28029,7 +28030,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28032: checking for Ada95 compiler" >&5
+echo "$as_me:28033: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28040,12 +28041,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28043: result: $cf_ada_compiler" >&5
+echo "$as_me:28044: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28048: checking for Ada95 include directory" >&5
+echo "$as_me:28049: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28081,7 +28082,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28084: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28085: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28090,10 +28091,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28093: result: $ADA_INCLUDE" >&5
+echo "$as_me:28094: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28096: checking for Ada95 object directory" >&5
+echo "$as_me:28097: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28129,7 +28130,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28132: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28133: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28138,10 +28139,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28141: result: $ADA_OBJECTS" >&5
+echo "$as_me:28142: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28144: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28145: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28162,11 +28163,11 @@ then
 	fi
 fi
 
-echo "$as_me:28165: result: $with_ada_sharedlib" >&5
+echo "$as_me:28166: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28169: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28170: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28184,7 +28185,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28187: checking for Ada95 curses library name" >&5
+echo "$as_me:28188: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28200,7 +28201,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28203: result: $ADA_LIBNAME" >&5
+echo "$as_me:28204: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28211,13 +28212,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28214: checking for wchar_t" >&5
+	echo "$as_me:28215: 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 28220 "configure"
+#line 28221 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28232,16 +28233,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28238: \$? = $ac_status" >&5
+  echo "$as_me:28239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28244: \$? = $ac_status" >&5
+  echo "$as_me:28245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28251,10 +28252,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28254: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28255: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28257: checking size of wchar_t" >&5
+echo "$as_me:28258: 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
@@ -28263,7 +28264,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28266 "configure"
+#line 28267 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28275,21 +28276,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28281: \$? = $ac_status" >&5
+  echo "$as_me:28282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28287: \$? = $ac_status" >&5
+  echo "$as_me:28288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28292 "configure"
+#line 28293 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28301,16 +28302,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28307: \$? = $ac_status" >&5
+  echo "$as_me:28308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28313: \$? = $ac_status" >&5
+  echo "$as_me:28314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28326,7 +28327,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28329 "configure"
+#line 28330 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28338,16 +28339,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28344: \$? = $ac_status" >&5
+  echo "$as_me:28345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28350: \$? = $ac_status" >&5
+  echo "$as_me:28351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28363,7 +28364,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28366 "configure"
+#line 28367 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28375,16 +28376,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28381: \$? = $ac_status" >&5
+  echo "$as_me:28382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28387: \$? = $ac_status" >&5
+  echo "$as_me:28388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28397,12 +28398,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28400: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28401: 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 28405 "configure"
+#line 28406 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28418,15 +28419,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28424: \$? = $ac_status" >&5
+  echo "$as_me:28425: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28429: \$? = $ac_status" >&5
+  echo "$as_me:28430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28442,7 +28443,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28445: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28446: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28455,7 +28456,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28458: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28459: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28473,7 +28474,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28476: checking for library subsets" >&5
+echo "$as_me:28477: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28527,7 +28528,7 @@ fi
 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:28530: result: $LIB_SUBSETS" >&5
+echo "$as_me:28531: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28558,7 +28559,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28561: checking default library suffix" >&5
+echo "$as_me:28562: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28569,10 +28570,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28572: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28573: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28575: checking default library-dependency suffix" >&5
+echo "$as_me:28576: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28655,10 +28656,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28658: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28659: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28661: checking default object directory" >&5
+echo "$as_me:28662: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28674,11 +28675,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28677: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28678: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28681: checking c++ library-dependency suffix" >&5
+echo "$as_me:28682: 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++)
@@ -28771,7 +28772,7 @@ else
 	fi
 
 fi
-echo "$as_me:28774: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28775: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28947,19 +28948,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28950: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28951: 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 <<EOF
-#line 28955 "configure"
+#line 28956 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28959: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28962: \$? = $ac_status" >&5
+  echo "$as_me:28963: \$? = $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
@@ -28970,10 +28971,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28973 "configure"
+#line 28974 "configure"
 #include "confdefs.h"
 
-#line 28976 "configure"
+#line 28977 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28988,16 +28989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28994: \$? = $ac_status" >&5
+  echo "$as_me:28995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29000: \$? = $ac_status" >&5
+  echo "$as_me:29001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29020,7 +29021,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29023: result: $cf_ldflags_static" >&5
+	echo "$as_me:29024: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29036,7 +29037,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29039: checking where we will install curses.h" >&5
+echo "$as_me:29040: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29046,7 +29047,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29049: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29050: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29054,7 +29055,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29057: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29058: 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
@@ -29079,7 +29080,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29082: checking for desired basename for form library" >&5
+echo "$as_me:29083: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29099,10 +29100,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29102: result: $FORM_NAME" >&5
+echo "$as_me:29103: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29105: checking for desired basename for menu library" >&5
+echo "$as_me:29106: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29122,10 +29123,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29125: result: $MENU_NAME" >&5
+echo "$as_me:29126: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29128: checking for desired basename for panel library" >&5
+echo "$as_me:29129: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29145,10 +29146,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29148: result: $PANEL_NAME" >&5
+echo "$as_me:29149: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29151: checking for desired basename for cxx library" >&5
+echo "$as_me:29152: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29168,13 +29169,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29171: result: $CXX_NAME" >&5
+echo "$as_me:29172: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29177: checking for src modules" >&5
+echo "$as_me:29178: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29233,7 +29234,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29236: result: $cf_cv_src_modules" >&5
+echo "$as_me:29237: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29394,7 +29395,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29397: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29398: 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//'`
@@ -29405,7 +29406,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29408: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29409: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29421,7 +29422,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29424: result: $PKG_CFLAGS" >&5
+echo "$as_me:29425: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29482,7 +29483,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29485: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29486: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29509,7 +29510,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29512: checking for linker search path" >&5
+echo "$as_me:29513: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29557,7 +29558,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29560: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29561: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29598,7 +29599,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29601: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29602: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29684,7 +29685,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29687: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29688: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29865,7 +29866,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29868: error: ambiguous option: $1
+    { { echo "$as_me:29869: 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;}
@@ -29884,7 +29885,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29887: error: unrecognized option: $1
+  -*) { { echo "$as_me:29888: 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;}
@@ -30014,7 +30015,7 @@ do
   "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:30017: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30018: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30536,7 +30537,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30539: creating $ac_file" >&5
+    { echo "$as_me:30540: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30554,7 +30555,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30557: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30558: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30567,7 +30568,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30570: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30571: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30583,7 +30584,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30586: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30587: 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;}
@@ -30592,7 +30593,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30595: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30596: 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;}
@@ -30637,7 +30638,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30640: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30641: 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;}
@@ -30648,7 +30649,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30651: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30652: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30697,7 +30698,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30700: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30701: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30708,7 +30709,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30711: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30712: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30721,7 +30722,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30724: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30725: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30779,7 +30780,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30782: $ac_file is unchanged" >&5
+      { echo "$as_me:30783: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31166,7 +31167,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31169: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31170: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 1beb840a6..8a7e6c5e3 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.781 2024/05/18 19:42:53 tom Exp $
+dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.781 $)
+AC_REVISION($Revision: 1.782 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1151,8 +1151,9 @@ if test "x$with_ext_funcs" = xyes ; then
 	AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs])
 	AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs])
 	GENERATED_EXT_FUNCS=generated
-	test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no
 else
+	cf_dft_ext_spfuncs=no
+	cf_dft_ext_colors=no
 	NCURSES_EXT_FUNCS=0
 	GENERATED_EXT_FUNCS=
 fi
diff --git a/dist.mk b/dist.mk
index 63ea2d3b4..ee4164728 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1614 2024/05/19 08:58:02 tom Exp $
+# $Id: dist.mk,v 1.1615 2024/05/25 10:33:51 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240519
+NCURSES_PATCH = 20240525
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index a7dee58c9..5ffbdca85 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -355,7 +355,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 2e8bbe836..ca56a80f4 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -308,7 +308,7 @@ <H1 class="no-header">curs_addch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index b7f1c689b..da46ecfa0 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.45 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -80,16 +80,15 @@ <H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open Curses does not specify any error conditions.   <EM>ncurses</EM>  returns
-       an error
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the window pointer is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the string pointer is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> call returns an error.
+       <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -98,7 +97,8 @@ <H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index ce3229acc..145e9d622 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.37 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -88,7 +88,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
        X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
-       an error
+       <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the window pointer is <STRONG>NULL</STRONG>,
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index b995aecac..cb1449d2d 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -249,13 +249,13 @@ <H1 class="no-header">curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
        This implementation
 
-       <STRONG>o</STRONG>   returns an error if the window pointer is null.
+       <STRONG>o</STRONG>   returns <STRONG>ERR</STRONG> if the window pointer is null.
 
-       <STRONG>o</STRONG>   returns an error if the color  pair  parameter  for  <STRONG>wcolor_set</STRONG>  is
-           outside the range 0..COLOR_PAIRS-1.
+       <STRONG>o</STRONG>   returns <STRONG>ERR</STRONG> if the color pair parameter for <STRONG>wcolor_set</STRONG>  is  outside
+           the range 0..COLOR_PAIRS-1.
 
-       <STRONG>o</STRONG>   does  not  return an error if either of the parameters of <STRONG>wattr_get</STRONG>
-           used for retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   does  not  fail  if  either of the parameters of <STRONG>wattr_get</STRONG> used for
+           retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -500,7 +500,7 @@ <H1 class="no-header">curs_attr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index d310dad79..8185670aa 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.49 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -119,7 +119,7 @@ <H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        negative integer if <STRONG>immedok</STRONG> is set", but this appears to be an error.
 
        X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns an error if the window pointer is null.
+       implementation returns <STRONG>ERR</STRONG> if the window pointer is null.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_border 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index e687aa68a..9b7fb55df 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.36 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -144,7 +144,7 @@ <H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</H
        Upon successful completion, these functions return <STRONG>OK</STRONG>.  Otherwise, they
        return <STRONG>ERR</STRONG>.
 
-       Functions using a window parameter return an error if it is null.
+       Functions using a window parameter return <STRONG>ERR</STRONG> if it is null.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -164,7 +164,7 @@ <H1 class="no-header">curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-04-20               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 058689bfc..6b5874e7a 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -100,36 +100,35 @@ <H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        X/Open defines no error conditions.  In this implementation,
 
-       <STRONG>o</STRONG>   functions using a window pointer parameter return an error if it is
-           null
+       <STRONG>o</STRONG>   functions using a window pointer parameter return <STRONG>ERR</STRONG> if it is null
 
        <STRONG>o</STRONG>   <STRONG>wclrtoeol</STRONG> returns an error if the cursor position is about to wrap.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note  that  <STRONG>erase</STRONG>, <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, and <STRONG>clrtoeol</STRONG> may be
+       Note that <STRONG>erase</STRONG>, <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, and <STRONG>clrtoeol</STRONG>  may  be
        macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        These functions are described in X/Open Curses, Issue 4.
 
-       The SVr4.0 manual says that these functions could  return  "or  a  non-
-       negative  integer  if <STRONG>immedok</STRONG> is set", referring to the return-value of
+       The  SVr4.0  manual  says  that these functions could return "or a non-
+       negative integer if <STRONG>immedok</STRONG> is set", referring to the  return-value  of
        <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count of the
        number of characters written to the terminal.
 
-       Some  historic  curses implementations had, as an undocumented feature,
+       Some historic curses implementations had, as an  undocumented  feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
        <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
-       This  implementation,  and  others  such  as  Solaris, sets the current
-       position to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is  not
-       documented   in   other   implementations,  and  may  not  be  true  of
+       This implementation, and others  such  as  Solaris,  sets  the  current
+       position  to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is not
+       documented  in  other  implementations,  and  may  not   be   true   of
        implementations which were not derived from SVr4 source.
 
        Not obvious from the description, most implementations clear the screen
-       after  <STRONG>wclear</STRONG>  even  for  a subwindow or derived window.  If you do not
+       after <STRONG>wclear</STRONG> even for a subwindow or derived window.   If  you  do  not
        want to clear the screen during the next <STRONG>wrefresh</STRONG>, use <STRONG>werase</STRONG> instead.
 
 
@@ -138,7 +137,7 @@ <H1 class="no-header">curs_clear 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index d84a57325..4a0f5872b 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.100 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_color 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -417,7 +417,7 @@ <H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        Specific functions make additional checks:
 
           <STRONG>init_color</STRONG>
-               returns an error if the terminal does not support this feature,
+               returns <STRONG>ERR</STRONG> if the terminal  does  not  support  this  feature,
                e.g.,  if  the  <STRONG>initialize_color</STRONG>  capability is absent from the
                terminal description.
 
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 9e18e64f3..ded3cb3dc 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.48 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        X/Open defines no error conditions.
 
-       In this implementation, these functions return an error
+       In this implementation, these functions return <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the window pointer is null,
 
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 15f523c8f..f72389794 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp @
+  * @Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -357,8 +357,8 @@ <H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        well-defined.
 
        Historically, the list of key code macros above was influenced  by  the
-       function-key-rich  keyboard  of  the AT&amp;T 7300 (also known variously as
-       the "3B1", "Safari  4",  and  "UNIX  PC"),  a  1985  machine.   Today's
+       keyboard  of  the AT&amp;T 7300 (also known variously as the "3B1", "Safari
+       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
        computer  keyboards  are  based  that of the IBM PC/AT and tend to have
        fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
        codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
@@ -382,8 +382,8 @@ <H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>,  and
-       <STRONG>ungetch</STRONG>.  It specifies no error conditions for them.
+       Except as noted in section "EXTENSIONS" above, X/Open Curses,  Issue  4
+       describes these functions.  It specifies no error conditions for them.
 
        <STRONG>wgetch</STRONG> reads only single-byte characters.
 
@@ -411,6 +411,12 @@ <H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       ECMA-6  "7-bit  coded  Character  Set" &lt;https://ecma-international.org/
+       publications-and-standards/standards/ecma-6/&gt;
+
+       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   &lt;https://
+       ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
+
        <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
@@ -418,15 +424,9 @@ <H1 class="no-header">curs_getch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
-       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
-       publications-and-standards/standards/ecma-6/&gt;
-
-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
-       ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
-
 
 
-ncurses 6.5                       2024-05-18                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index d157fecf8..2c4128150 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
        X/Open defines no error conditions.
 
-       In this implementation, these functions return an error
+       In this implementation, these functions return <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the window pointer is null,
 
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index d7af18ddc..74a3b4bfa 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.39 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1
        return <STRONG>ERR</STRONG>.
 
        X/Open Curses defines no error conditions.  This implementation returns
-       an error
+       <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-04-20                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 35af0bbc4..ed0f1b26f 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp @
+  * @Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -79,9 +79,9 @@ <H1 class="no-header">curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>inch</STRONG>, <STRONG>mvinch</STRONG>, and <STRONG>mvwinch</STRONG> may be implemented as macros.
 
-       These  functions do not return an error if the window contains cells of
-       <EM>curses</EM> complex characters; that is, if  they  contain  characters  with
-       codes wider than eight bits (or greater than 255 as an unsigned decimal
+       These  functions  do  not  fail  if the window contains cells of <EM>curses</EM>
+       complex characters; that is, if  they  contain  characters  with  codes
+       wider  than  eight  bits  (or  greater  than 255 as an unsigned decimal
        integer).  They instead extract only the low-order eight  bits  of  the
        character code from the cell.
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_inch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-18                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 1eeb1b3a3..87c2c2f4c 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        retrieved, exclusive of the trailing 0).
 
        X/Open Curses defines no error conditions.  This implementation returns
-       an error
+       <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 778fc0016..c854a5ace 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.69 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -157,17 +157,17 @@ <H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        X/Open defines no error conditions.  In this implementation
 
-       <STRONG>o</STRONG>   <STRONG>endwin</STRONG> returns an error if
+       <STRONG>o</STRONG>   <STRONG>endwin</STRONG> returns <STRONG>ERR</STRONG> if
 
            <STRONG>o</STRONG>   the terminal was not initialized, or
 
            <STRONG>o</STRONG>   <STRONG>endwin</STRONG> is called more than once without updating the screen, or
 
-           <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> returns an error.
+           <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> return <STRONG>ERR</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>newterm</STRONG> returns an error if it cannot allocate the data  structures
-           for  the  screen,  or  for the top-level windows within the screen,
-           i.e., <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, or <STRONG>stdscr</STRONG>.
+       <STRONG>o</STRONG>   <STRONG>newterm</STRONG> returns <STRONG>ERR</STRONG> if it cannot allocate the data  structures  for
+           the  screen,  or for the top-level windows within the screen, i.e.,
+           <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, or <STRONG>stdscr</STRONG>.
 
        <STRONG>o</STRONG>   <STRONG>set_term</STRONG> returns no error.
 
@@ -299,7 +299,7 @@ <H1 class="no-header">curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 149b2b82b..f1aa3b081 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.66 2024/04/13 22:20:29 tom Exp @
+  * @Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -63,24 +63,24 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>echo(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>noecho(void);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>intrflush(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>keypad(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>meta(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>nodelay(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>notimeout(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>intrflush(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM> <EM>/*</EM> <EM>ignored</EM> <EM>*/</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>keypad(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>meta(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM> <EM>/*</EM> <EM>ignored</EM> <EM>*/</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>nodelay(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>notimeout(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>nl(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>nonl(void);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>raw(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>noraw(void);</STRONG>
-
        <STRONG>void</STRONG> <STRONG>qiflush(void);</STRONG>
        <STRONG>void</STRONG> <STRONG>noqiflush(void);</STRONG>
 
+       <STRONG>int</STRONG> <STRONG>raw(void);</STRONG>
+       <STRONG>int</STRONG> <STRONG>noraw(void);</STRONG>
+
        <STRONG>int</STRONG> <STRONG>halfdelay(int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>timeout(int</STRONG> <EM>delay</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wtimeout(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>delay</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wtimeout(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>delay</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>typeahead(int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
 
@@ -92,158 +92,177 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <EM>ncurses</EM> provides several functions that let an application  change  the
-       way  input  from the terminal is handled.  Some are global, applying to
-       all windows.  Others apply only to a specific window.   Window-specific
-       settings  are  not automatically applied to new or derived windows.  An
-       application must apply these to each window if  the  same  behavior  is
-       desired.
+       <EM>curses</EM> offers configurable  parameters  permitting  an  application  to
+       control  the  handling  of  input  from the terminal.  Some are global,
+       applying to all windows; others apply only to a specific  window.   The
+       library  does not automatically apply such parameters to new or derived
+       windows; an application must configure  each  window  for  the  desired
+       behavior.
+
+       Some  descriptions  below  make reference to an <EM>input</EM> <EM>character</EM> <EM>reading</EM>
+       <EM>function</EM>: this is <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> in the non-wide character <EM>curses</EM>  API  and
+       <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>  in  the  wide  character API.  In addition to the variant
+       forms  of  these  described  in  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  the   <EM>curses</EM>   functions
+       <STRONG><A HREF="curs_getstr.3x.html">wgetstr(3x)</A></STRONG>   and   <STRONG><A HREF="curs_get_wstr.3x.html">wget_wstr(3x)</A></STRONG>  and  their  own  variants  call  the
+       appropriate input character reading function.
 
 
 </PRE><H3><a name="h3-cbreak_nocbreak">cbreak, nocbreak</a></H3><PRE>
-       Normally,  the terminal driver buffers typed characters until a newline
-       or  carriage  return  is  typed.   The  <STRONG>cbreak</STRONG>  routine  disables  line
-       buffering  and  erase/kill  character-processing  (interrupt  and  flow
-       control characters are unaffected), making characters typed by the user
-       immediately available to the program.  The <STRONG>nocbreak</STRONG> routine returns the
-       terminal to normal (cooked) mode.
+       Normally, the terminal driver buffers typed characters, not  delivering
+       them  to  an application until a line feed or carriage return is typed.
+       <STRONG>cbreak</STRONG> configures the terminal in  <EM>cbreak</EM>  <EM>mode</EM>,  which  disables  line
+       buffering and erase and kill character processing (the interrupt, quit,
+       suspend,  and  flow  control  characters  are  unaffected)  and   makes
+       characters  typed  by  the  user  immediately available to the program.
+       <STRONG>nocbreak</STRONG> returns the terminal to normal ("cooked") mode.
 
-       Initially the terminal may or may not be in <STRONG>cbreak</STRONG> mode, as the mode is
-       inherited;   therefore,  a  program  should  call  <STRONG>cbreak</STRONG>  or  <STRONG>nocbreak</STRONG>
-       explicitly.  Most interactive programs  using  <EM>curses</EM>  set  the  <STRONG>cbreak</STRONG>
-       mode.   Note  that  <STRONG>cbreak</STRONG>  overrides  <STRONG>raw</STRONG>.   [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a
-       discussion of how these routines interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.]
+       The state of the terminal is unknown to a <EM>curses</EM>  application  when  it
+       starts; therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explicitly.
+       Most interactive programs using <EM>curses</EM> set cbreak mode.  Calling <STRONG>cbreak</STRONG>
+       overrides  <STRONG>raw</STRONG>.   The man page for the input character reading function
+       discusses how <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG> interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.
 
 
 </PRE><H3><a name="h3-echo_noecho">echo, noecho</a></H3><PRE>
-       The <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> routines control whether characters  typed  by  the
-       user  are  echoed  by  <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>  as  they  are  typed.  Echoing by the
-       terminal driver is always disabled, but  initially  <STRONG>getch</STRONG>  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
-       <STRONG>noecho</STRONG>.  [See <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> for a discussion  of  how  these  routines
-       interact with <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.]
+       <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> determine whether characters  typed  by  the  user  are
+       written to the <EM>curses</EM> window by the input character reading function as
+       they are typed.  <EM>curses</EM>  always  disables  the  terminal  driver's  own
+       echoing.   By  default, a <EM>curses</EM> window has its echo flag set.  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 call
+       <STRONG>noecho</STRONG>.   The  man  page  for  the  input  character  reading  function
+       discusses how <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> interact with <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.
 
 
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
-       The  <STRONG>halfdelay</STRONG> routine is used for half-delay mode, which is similar to
-       <STRONG>cbreak</STRONG> mode in that  characters  typed  by  the  user  are  immediately
-       available to the program.  However, after blocking for <EM>tenths</EM> tenths of
-       seconds, <STRONG>ERR</STRONG> is returned if nothing  has  been  typed.   The  value  of
-       <EM>tenths</EM> must be a number between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-
-       delay mode.
+       <STRONG>halfdelay</STRONG>  configures  <EM>half-delay</EM> <EM>mode</EM>, which is similar to cbreak mode
+       in that characters typed by the user are immediately available  to  the
+       program.   However,  after  blocking  for  <EM>tenths</EM> tenths of seconds, an
+       input character reading function returns <STRONG>ERR</STRONG> if no  input  is  pending.
+       The  value  of <EM>tenths</EM> must be between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave
+       half-delay mode.
 
 
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
-       If the <STRONG>intrflush</STRONG> option is enabled (<EM>bf</EM> is <STRONG>TRUE</STRONG>), and an  interrupt  key
-       is  pressed on the keyboard (interrupt, break, quit), all output in the
-       terminal driver queue is flushed, giving the effect of faster  response
-       to  the interrupt, but causing <EM>curses</EM> to have the wrong idea of what is
-       on the screen.  Disabling the option (<EM>bf</EM> is <STRONG>FALSE</STRONG>), prevents the flush.
-       The  default  for  the  option  is  inherited  from the terminal driver
-       settings.  The <EM>win</EM> argument is ignored.
+       <STRONG>intrflush</STRONG> calls <STRONG>qiflush</STRONG> (see below) if <EM>bf</EM> is <STRONG>TRUE</STRONG>, and <STRONG>noqiflush</STRONG> if  <EM>bf</EM>
+       is <STRONG>FALSE</STRONG>.  It ignores its <EM>win</EM> argument.
 
 
 </PRE><H3><a name="h3-keypad">keypad</a></H3><PRE>
-       The <STRONG>keypad</STRONG> option enables  the  keypad  of  the  user's  terminal.   If
-       enabled  (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the user can press a function key (such as an
-       arrow key) and <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  returns  a  single  value  representing  the
-       function  key,  as in <STRONG>KEY_LEFT</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <EM>curses</EM> 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 locally), turning  on  this
-       option  causes  the  terminal keypad to be turned on when <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> is
-       called.  The default value for keypad is <STRONG>FALSE</STRONG>.
+       <STRONG>keypad</STRONG>  enables  recognition of a terminal's function keys.  If enabled
+       (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the input character  reading  function  returns  a  value
+       representing  the  function key, such as <STRONG>KEY_LEFT</STRONG>.  (Wide-character API
+       users: <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> returns <STRONG>KEY_CODE_YES</STRONG> to indicate  the  availability
+       of  a  function  key  code  in  its <EM>wch</EM> parameter.)  If disabled (<EM>bf</EM> is
+       <STRONG>FALSE</STRONG>), <EM>curses</EM> does not treat function keys specially and  the  program
+       has to interpret escape sequences itself.  If the terminal's keypad can
+       be turned on (made to transmit) and off (made to work locally),  <STRONG>keypad</STRONG>
+       configures  it  consistently  with  the  <EM>bf</EM>  parameter.   By default, a
+       window's keypad mode is off.
 
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
-       Initially, whether the terminal returns 7  or  8  significant  bits  on
-       input  depends  on  the  control  mode  of  the  terminal  driver  [see
-       <STRONG>termios(3)</STRONG>].  To force 8 bits to be returned, invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>);
-       this  is  equivalent,  under  POSIX,  to  setting  the  CS8 flag on the
-       terminal.  To force 7 bits to be  returned,  invoke  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>FALSE</STRONG>);
-       this  is  equivalent,  under  POSIX,  to  setting  the  CS7 flag on the
-       terminal.  The  window  argument,  <EM>win</EM>,  is  always  ignored.   If  the
-       terminfo  capabilities <STRONG>smm</STRONG> (meta_on) and <STRONG>rmm</STRONG> (meta_off) are defined for
-       the terminal, <STRONG>smm</STRONG> is sent to  the  terminal  when  <STRONG>meta</STRONG>(<EM>win</EM>,  <STRONG>TRUE</STRONG>)  is
-       called and <STRONG>rmm</STRONG> is sent when <STRONG>meta</STRONG>(<EM>win</EM>, <STRONG>FALSE</STRONG>) is called.
+       Initially, whether the terminal returns 7- or 8-bit character codes  on
+       input  depends  on  the  configuration  of  the  terminal  driver;  see
+       <STRONG>termios(3)</STRONG>.  To force 8 bits to be returned, call <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>TRUE)</STRONG>; this
+       is  equivalent,  on  POSIX  systems,  to  setting  the  CS8 flag on the
+       terminal.  To force 7 bits to be returned, call <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>FALSE)</STRONG>;  this
+       is  equivalent,  on  POSIX  systems,  to  setting  the  CS7 flag on the
+       terminal.  The window argument, <EM>win</EM>, is always ignored.  If  the  <EM>term-</EM>
+       <EM>info</EM>  string  capabilities <STRONG>meta_on</STRONG> (<STRONG>smm</STRONG>) and <STRONG>meta_off</STRONG> (<STRONG>rmm</STRONG>) are defined
+       for the terminal type, enabling meta mode sends <STRONG>smm</STRONG> to the terminal and
+       disabling it sends <STRONG>rmm</STRONG> to the terminal.
 
 
 </PRE><H3><a name="h3-nl_nonl">nl, nonl</a></H3><PRE>
-       The  <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> routines control whether the underlying display device
-       translates the return key into newline on input.
+       Initially,  whether  the  terminal  reports a carriage return using the
+       character code for a line feed depends  on  the  configuration  of  the
+       terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures the terminal to perform
+       this translation.  <STRONG>nonl</STRONG> disables it.
 
 
 </PRE><H3><a name="h3-nodelay">nodelay</a></H3><PRE>
-       The <STRONG>nodelay</STRONG> option causes <STRONG>getch</STRONG> to be a non-blocking call.  If no input
-       is  ready,  <STRONG>getch</STRONG>  returns <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), <STRONG>getch</STRONG> waits
-       until a key is pressed.
+       <STRONG>nodelay</STRONG> configures the input character  reading  function  to  be  non-
+       blocking  for  window  <EM>win</EM>.  If no input is ready, the reading function
+       returns <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the reading function does  not
+       return until it has input.
 
 
 </PRE><H3><a name="h3-notimeout">notimeout</a></H3><PRE>
-       When interpreting an escape sequence, <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  sets  a  timer  while
-       waiting  for  the  next  character.  If <STRONG>notimeout(</STRONG><EM>win</EM>, <STRONG>TRUE</STRONG>) is called,
-       then <STRONG>wgetch</STRONG> does not set a timer.  The purpose of  the  timeout  is  to
-       distinguish  sequences produced by a function key from those typed by a
-       user.
+       When  the  input  character reading function reads an ESC character, it
+       sets a timer while waiting  for  the  next  character.   <STRONG>notimeout(</STRONG><EM>win</EM><STRONG>,</STRONG>
+       <STRONG>TRUE)</STRONG>   disables  this  timer.   The  purpose  of  the  timeout  is  to
+       distinguish sequences produced by a function key from those typed by  a
+       user.   To configure the timeout rather than disabling it, see <STRONG>wtimeout</STRONG>
+       below.
+
+
+</PRE><H3><a name="h3-qiflush_noqiflush">qiflush, noqiflush</a></H3><PRE>
+       <STRONG>qiflush</STRONG> and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of  its
+       input and output queues when it handles the interrupt, suspend, or quit
+       characters  in  <EM>cbreak</EM>  and  "cooked"  modes;  on  POSIX  systems,  see
+       <STRONG>termios(3)</STRONG>.  The default behavior is inherited from the terminal driver
+       settings.  Calling <STRONG>qiflush</STRONG> configures the terminal to flush the  queues
+       when  any  of  these  events  occurs,  giving  the impression of faster
+       response to user input, but making the library's model  of  the  screen
+       contents  incorrect.   Calling  <STRONG>noqiflush</STRONG>  prevents  such flushing, but
+       might frustrate impatient users on slow connections if a <EM>curses</EM>  update
+       of the screen is in progress when the event occurs; see <STRONG>typeahead</STRONG> below
+       for a mitigation of this problem.  You may want to call <STRONG>noqiflush</STRONG> in  a
+       signal  handler  if you want output to continue after the handler exits
+       as though the interrupt had not occurred.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
-       The <STRONG>raw</STRONG> and <STRONG>noraw</STRONG> routines place the terminal into or out of raw  mode.
-       Raw  mode  is  similar  to  <STRONG>cbreak</STRONG>  mode,  in that characters typed are
-       immediately passed through to the user program.   The  differences  are
-       that  in  raw  mode,  the  interrupt,  quit,  suspend, and flow control
-       characters are all passed through uninterpreted, instead of  generating
-       a  signal.   The behavior of the BREAK key depends on other bits in the
-       terminal driver that are not set by <EM>curses</EM>.
-
-
-</PRE><H3><a name="h3-qiflush_nqiflush">qiflush, nqiflush</a></H3><PRE>
-       When the <STRONG>noqiflush</STRONG> routine is used, normal flush of  input  and  output
-       queues  associated  with the <STRONG>INTR</STRONG>, <STRONG>QUIT</STRONG> and <STRONG>SUSP</STRONG> characters will not be
-       done [see <STRONG>termios(3)</STRONG>].  When <STRONG>qiflush</STRONG> is  called,  the  queues  will  be
-       flushed  when  these control characters are read.  You may want to call
-       <STRONG>noqiflush</STRONG> in a signal handler if you want output to continue as  though
-       the interrupt had not occurred, after the handler exits.
+       <STRONG>raw</STRONG> configures the terminal to read input in <EM>raw</EM> <EM>mode</EM>, which is similar
+       to  cbreak  mode  (see  <STRONG>cbreak</STRONG> above) except that it furthermore passes
+       through the terminal's configured interrupt, quit,  suspend,  and  flow
+       control   characters  uninterpreted  to  the  application,  instead  of
+       generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+       terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+       configuration parameters that <EM>curses</EM> does not handle.  <STRONG>noraw</STRONG> exits  raw
+       mode.
 
 
 </PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
-       The <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> routines set blocking or non-blocking read for
-       a given window.  If <EM>delay</EM> is negative, a blocking read is  used  (i.e.,
-       waits  indefinitely  for input).  If <EM>delay</EM> is zero, then a non-blocking
-       read is used (i.e., <EM>read</EM> returns <STRONG>ERR</STRONG> if no input is waiting).  If <EM>delay</EM>
-       is  positive,  then <EM>read</EM> blocks for <EM>delay</EM> milliseconds, and returns <STRONG>ERR</STRONG>
-       if there is still no input.  Hence, these  routines  provide  the  same
-       functionality  as <STRONG>nodelay</STRONG>, plus the additional capability of being able
-       to block for only <EM>delay</EM> milliseconds (where <EM>delay</EM> is positive).
+       <STRONG>wtimeout</STRONG>  configures  whether a <EM>curses</EM> input character reading function
+       called on window <EM>win</EM> uses blocking or non-blocking reads.  If <EM>delay</EM>  is
+       negative,  a blocking read is used, waiting indefinitely for input.  If
+       <EM>delay</EM> is zero, a non-blocking read is used; an input character  reading
+       function  returns <STRONG>ERR</STRONG> if no input is pending.  If <EM>delay</EM> is positive, an
+       input character reading function blocks  for  <EM>delay</EM>  milliseconds,  and
+       returns  <STRONG>ERR</STRONG>  if the delay elapses and there is still no input pending.
+       <STRONG>timeout</STRONG> calls <STRONG>wtimeout</STRONG> on <STRONG>stdscr</STRONG>.
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
-       <EM>curses</EM> does  "line-breakout  optimization"  by  looking  for  typeahead
-       periodically  while  updating the screen.  If input is found, and it is
-       coming  from  a  terminal,  the  current  update  is  postponed   until
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  or  <STRONG>doupdate</STRONG> is called again.  This allows faster response
-       to commands typed in advance.  Normally, the input <EM>FILE</EM> pointer  passed
-       to <STRONG>newterm</STRONG>, or <STRONG>stdin</STRONG> in the case that <STRONG>initscr</STRONG> was used, will be used to
-       do this typeahead checking.  The <STRONG>typeahead</STRONG> routine specifies  that  the
-       file descriptor <EM>fd</EM> is to be used to check for typeahead instead.  If <EM>fd</EM>
-       is -1, then no typeahead checking is done.
+       Normally, a <EM>curses</EM> library checks the terminal for input while updating
+       the  screen.   If  any is found, the update is postponed until the next
+       <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> call, allowing faster response to user key
+       strokes.   The  library  tests the file descriptor corresponding to the
+       <EM>FILE</EM> stream pointer passed to <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> (or <EM>stdin</EM> if <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  was
+       called),  for  pending  input.  <STRONG>typeahead</STRONG> instructs <EM>curses</EM> to test file
+       descriptor <EM>fd</EM> instead.  An <EM>fd</EM> of <STRONG>-1</STRONG> disables the check.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines that return an integer return  <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>
-       (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> return no value.
+
+       <STRONG>cbreak</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>,  <STRONG>halfdelay</STRONG>,  <STRONG>intrflush</STRONG>,  <STRONG>keypad</STRONG>,  <STRONG>meta</STRONG>,
+       <STRONG>nodelay</STRONG>,  <STRONG>notimeout</STRONG>,  <STRONG>nl</STRONG>,  <STRONG>nonl</STRONG>, <STRONG>raw</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>typeahead</STRONG> return <STRONG>OK</STRONG> on
+       success and <STRONG>ERR</STRONG> on failure.
+
+       In <EM>ncurses</EM>, the functions in the previous paragraph return <STRONG>ERR</STRONG> if
 
-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
-       implementation, functions with a window parameter will return an  error
-       if  it is null.  Any function will also return an error if the terminal
-       was not initialized.  Also,
+       <STRONG>o</STRONG>   the terminal is not initialized or
 
-          <STRONG>halfdelay</STRONG>
-               returns an error if its parameter is outside the range 1..255.
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> (except  for  <STRONG>intrflush</STRONG>  and  <STRONG>meta</STRONG>,  which  ignore  its
+           value).
+
+       Further, <STRONG>halfdelay</STRONG> returns <STRONG>ERR</STRONG> if <EM>delay</EM> is outside the range 1..255.
+
+       See  section  "EXTENSIONS"  below  for  the return values of <STRONG>is_cbreak</STRONG>,
+       <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, and <STRONG>is_raw</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -251,15 +270,15 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
        <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
-       restore normal ("cooked") mode from raw and cbreak modes  respectively.
-       Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  and  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>  calls leads to terminal driver
-       control states that are hard to predict or understand; doing so is  not
-       recommended.
+       restore normal ("cooked") mode from raw and cbreak modes, respectively.
+       Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  calls  with  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG> calls leads to terminal
+       driver control states that are hard to predict or understand; doing  so
+       is not recommended.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM> provides four "is_" functions that may be used to detect if the
-       corresponding flags were set or reset.
+       <EM>ncurses</EM>  provides  four  "is_" functions corresponding to <STRONG>cbreak</STRONG>, <STRONG>echo</STRONG>,
+       <STRONG>nl</STRONG>, and <STRONG>raw</STRONG>, permitting their states to be queried by the application.
 
                             <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
                             ------------------------------
@@ -270,86 +289,99 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
        In each case, the function returns
 
-       1   if the flag is set,
-
-       0   if the flag is reset, or
+       <STRONG>1</STRONG>    if the flag is set,
 
-       -1  if the library is not initialized.
+       <STRONG>0</STRONG>    if the flag is reset, or
 
-       They were designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not found in  SVr4  <EM>curses</EM>,
-       4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
+       <STRONG>-1</STRONG>   if the library is not initialized.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except as noted in section "EXTENSIONS" above, X/Open Curses, Issue  4,
-       Version 2 describes these functions.
-
-       <EM>ncurses</EM>  follows  X/Open  Curses  and  the  historical practice of AT&amp;T
-       <EM>curses</EM> implementations, in that the echo bit  is  cleared  when  <EM>curses</EM>
-       initializes   the  terminal  state.   BSD  <EM>curses</EM>  differed  from  this
-       slightly; it left the echo bit on at initialization, but  the  BSD  <STRONG>raw</STRONG>
-       call turned it off as a side effect.  For best portability, set <STRONG>echo</STRONG> or
-       <STRONG>noecho</STRONG> explicitly just  after  initialization,  even  if  your  program
-       remains in cooked mode.
-
-       X/Open  Curses  is  ambiguous  regarding whether <STRONG>raw</STRONG> should disable the
-       CR/LF translations controlled by <STRONG>nl</STRONG> and <STRONG>nonl</STRONG>.  BSD <EM>curses</EM> did turn  off
-       these  translations;  AT&amp;T  <EM>curses</EM>  (at least as late as SVr1) did not.
-       <EM>ncurses</EM> does so, on the assumption that  a  programmer  requesting  raw
-       input  wants  a  clean  (ideally,  8-bit  clean)  connection  that  the
+       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
+       describes these functions.  It specifies no error conditions for them.
+
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       value other than <STRONG>ERR</STRONG>".
+
+       <EM>ncurses</EM>  follows  X/Open Curses and the historical practice of System V
+       <EM>curses</EM>, clearing the terminal driver's "echo"  flag  when  initializing
+       the  screen.  BSD <EM>curses</EM> did not, but its <EM>raw</EM> function turned it off as
+       a side effect.  For best portability, call <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly
+       just  after  initialization,  even  if  your  program remains in normal
+       ("cooked") mode.
+
+       X/Open Curses is ambiguous regarding whether  <EM>raw</EM>  should  disable  the
+       carriage  return and line feed translation feature controlled by <EM>nl</EM> and
+       <EM>nonl</EM>.  BSD <EM>curses</EM> did turn off these translations; System V <EM>curses</EM>  did
+       not.   <EM>ncurses</EM>  does so, on the assumption that a programmer requesting
+       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
        operating system will not alter.
 
        When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key definitions for the
-       current  terminal  description.   If  the terminal description includes
-       extended string capabilities, e.g., from using the <STRONG>-x</STRONG>  option  of  <STRONG>tic</STRONG>,
-       then  <EM>ncurses</EM>  also defines keys for the capabilities whose names begin
-       with "k".  The corresponding keycodes are generated and  (depending  on
-       previous  loads of terminal descriptions) may differ from one execution
-       of a program to the next.  The generated keycodes are recognized by the
-       <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>  function (which will then return a name beginning with "k"
-       denoting the terminfo capability name rather than "K", used for  <EM>curses</EM>
-       key  names).   On the other hand, an application can use <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
-       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 <STRONG>tigetstr</STRONG>, and reassign  the  keycode  to  match  its  own
-       needs.
-
-       Low-level applications can use <STRONG>tigetstr</STRONG> to obtain the definition of any
-       particular string capability.  Higher-level applications which use  the
-       <EM>curses</EM>  <STRONG>wgetch</STRONG>  and  similar functions to return keycodes rely upon the
-       order in which the strings are loaded.  If more than one key definition
-       has  the  same  string  value, then <STRONG>wgetch</STRONG> can return only one keycode.
-       Most <EM>curses</EM> implementations (including <EM>ncurses</EM>) load key definitions in
-       the  order  defined  by the array of string capability names.  The last
-       key to be loaded determines the keycode which  will  be  returned.   In
-       <EM>ncurses</EM>,  you  may  also  have extended capabilities interpreted as key
-       definitions.  These are loaded after the  predefined  keys,  and  if  a
-       capability's  value  is the same as a previously-loaded key definition,
-       the later definition is the one used.
+       current terminal description.  If  the  terminal  description  includes
+       extended  string  capabilities,  for example, by using the <STRONG>-x</STRONG> option of
+       <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>, then <EM>ncurses</EM> also defines keys for the capabilities whose names
+       begin  with  "k".  Corresponding key codes are generated and (depending
+       on previous  loads  of  terminal  descriptions)  may  differ  from  one
+       execution  of  a  program  to  the  next.   The  generated keycodes are
+       recognized by the <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>  function  (which  then  returns  a  name
+       beginning  with  "k"  denoting the <EM>terminfo</EM> capability name rather than
+       "K", used for <EM>curses</EM> key names).  On the other hand, an application can
+       use  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>  to  bind  a  specific  key  to  a  string  of  the
+       programmer's choice.  This feature enables an application to check  for
+       an  extended  capability's presence with <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, and reassign the
+       keycode to match its own needs.
+
+       Low-level applications can use <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG> to obtain the definition of
+       any  string  capability.   <EM>curses</EM>  applications use the input character
+       reading function to obtain key codes from input and rely upon the order
+       in  which  the string capabilities are loaded.  Multiple key capability
+       strings can have the  same  value,  but  the  input  character  reading
+       function  can  report  only  one key code.  Most <EM>curses</EM> implementations
+       (including <EM>ncurses</EM>) load key definitions in the order  they  appear  in
+       the <STRONG>strfnames</STRONG> array of string capability names; see <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
+       The last capability read using a particular definition  determines  the
+       key  code  to  be  reported.   In <EM>ncurses</EM>, extended capabilities can be
+       interpreted as key definitions.  These are loaded after the  predefined
+       keys,  and  if  a capability's value is the same as a previously loaded
+       key definition, the later definition is the one used.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Formerly, <EM>ncurses</EM> used  <STRONG>nl</STRONG>  and  <STRONG>nonl</STRONG>  to  control  the  conversion  of
-       newlines  to  carriage  return/line  feed  on  output as well as input.
-       X/Open Curses documents the use of  these  functions  only  for  input.
-       This  difference arose from converting the <EM>pcurses</EM> source (1986), which
-       used <STRONG>ioctl(2)</STRONG> calls and the <EM>sgttyb</EM> structure,  to  <EM>termios</EM>  (the  POSIX
-       terminal  API).   In  the former, both input and output were controlled
-       via a single option <STRONG>CRMOD</STRONG>, while the latter separates  these  features.
-       Because  that  conversion  interferes with output optimization, <EM>ncurses</EM>
-       6.2 (2020) amended <STRONG>nl</STRONG> and <STRONG>nonl</STRONG> to eliminate their effect on output.
+       4BSD <EM>curses</EM> (1980) introduced <EM>echo</EM>, <EM>noecho</EM>, <EM>nl</EM>, <EM>nonl</EM>, <EM>raw</EM>, and <EM>noraw</EM>.
+
+       SVr2 (1984) featured a new terminal driver, extending the <EM>curses</EM> API to
+       support it with <EM>cbreak</EM>, <EM>nocbreak</EM>, <EM>intrflush</EM>, <EM>keypad</EM>, <EM>meta</EM>, <EM>nodelay</EM>, and
+       <EM>typeahead</EM>.
+
+       SVr3 (1987) added <EM>halfdelay</EM>,  <EM>notimeout</EM>,  and  <EM>wtimeout</EM>.   <EM>qiflush</EM>  and
+       <EM>noqiflush</EM>  appeared in SVr3.1 (1987), at which point <EM>intrflush</EM> became a
+       wrapper for either of these functions, depending on the  value  of  its
+       Boolean argument.  SVr3.1 also added <EM>timeout</EM>.
+
+       <EM>ncurses</EM> 6.5 (2024) introduced <EM>is</EM><STRONG>_</STRONG><EM>cbreak</EM>, <EM>is</EM><STRONG>_</STRONG><EM>echo</EM>, <EM>is</EM><STRONG>_</STRONG><EM>nl</EM>, and <EM>is</EM><STRONG>_</STRONG><EM>raw</EM>.
+
+       Formerly,  <EM>ncurses</EM>  used  <EM>nl</EM>  and  <EM>nonl</EM>  to  control  the conversion of
+       newlines to carriage return/line feed  on  output  as  well  as  input.
+       X/Open  Curses  documents  the  use  of these functions only for input.
+       This difference arose from converting the <EM>pcurses</EM> source (1986),  which
+       used  <STRONG>ioctl(2)</STRONG>  calls  and  the <EM>sgttyb</EM> structure, to <EM>termios</EM> (the POSIX
+       terminal API).  In the former, both input and  output  were  controlled
+       via a single option "CRMOD", while the latter separates these features.
+       Because that conversion interferes with  output  optimization,  <EM>ncurses</EM>
+       6.2 (2020) amended <EM>nl</EM> and <EM>nonl</EM> to eliminate their effect on output.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-04-13                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -366,8 +398,8 @@ <H1 class="no-header">curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-nl_nonl">nl, nonl</a></li>
 <li><a href="#h3-nodelay">nodelay</a></li>
 <li><a href="#h3-notimeout">notimeout</a></li>
+<li><a href="#h3-qiflush_noqiflush">qiflush, noqiflush</a></li>
 <li><a href="#h3-raw_noraw">raw, noraw</a></li>
-<li><a href="#h3-qiflush_nqiflush">qiflush, nqiflush</a></li>
 <li><a href="#h3-timeout_wtimeout">timeout, wtimeout</a></li>
 <li><a href="#h3-typeahead">typeahead</a></li>
 </ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 7c25b2ed7..08ba1f417 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.30 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -78,11 +78,11 @@ <H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>ins_wch</STRONG>, <STRONG>mvins_wch</STRONG>, and <STRONG>mvwins_wch</STRONG> may be implemented as macros.
+
        A  terminal's  <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is not necessarily
        employed.
 
-       <STRONG>ins_wch</STRONG>, <STRONG>mvins_wch</STRONG>, and <STRONG>mvwins_wch</STRONG> may be implemented as macros.
-
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses, Issue 4 describes these functions.
@@ -104,7 +104,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index f2982eaa1..d947cc464 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -87,13 +87,13 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
        X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns an error
+       implementation returns <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
        <STRONG>o</STRONG>   if the <EM>wstr</EM> parameter is null or
 
-       <STRONG>o</STRONG>   if the <STRONG>wins_wch</STRONG> function returns an error.
+       <STRONG>o</STRONG>   if the <STRONG>wins_wch</STRONG> function returns <STRONG>ERR</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -124,7 +124,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 04e023992..e1e4b5494 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.51 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -85,13 +85,13 @@ <H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
 
        X/Open   Curses   does   not   specify   any  error  conditions.   This
-       implementation returns an error
+       implementation returns <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
        <STRONG>o</STRONG>   if the <EM>str</EM> parameter is null or
 
-       <STRONG>o</STRONG>   the <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> function returns an error.
+       <STRONG>o</STRONG>   the <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> function returns <STRONG>ERR</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 50d0f20e2..dd9540fe1 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.51 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        characters actually read into the string.
 
        X/Open Curses defines no error conditions.  This implementation returns
-       an error
+       <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_instr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 6c79b595f..e91d0ea9d 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.41 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -83,8 +83,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        *<STRONG>inwstr</STRONG> routines return <STRONG>OK</STRONG>, and the *<STRONG>innwstr</STRONG> routines return the number
        of characters read into the string.
 
-       X/Open  defines  no  error  conditions.  This implementation returns an
-       error
+       X/Open defines no error conditions.  This implementation returns <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
@@ -92,21 +91,21 @@ <H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   if no characters could be read.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All routines except <STRONG>winnwstr</STRONG> may be macros.
 
-       Each  cell in the window holds a complex character (a spacing character
-       and zero or more non-spacing characters) together with  attributes  and
-       color.   These  functions  store  only  the  wide  characters, ignoring
-       attributes and color.  Use <STRONG>in_wchstr</STRONG> to return the  complex  characters
+       Each cell in the window holds a complex character (a spacing  character
+       and  zero  or more non-spacing characters) together with attributes and
+       color.  These  functions  store  only  the  wide  characters,  ignoring
+       attributes  and  color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters
        from a window.
 
        Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
-       <STRONG>mvinwstr</STRONG>, <STRONG>mvwinwstr</STRONG> or <STRONG>winwstr</STRONG> causes  undefined  results.   Therefore,
+       <STRONG>mvinwstr</STRONG>,  <STRONG>mvwinwstr</STRONG>  or  <STRONG>winwstr</STRONG> causes undefined results.  Therefore,
        the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
 
 
@@ -115,12 +114,12 @@ <H1 class="no-header">curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 90042caf9..7d52c2d26 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.61 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>def_prog_mode</STRONG>,   <STRONG>def_shell_mode</STRONG>,   <STRONG>reset_prog_mode</STRONG>,   <STRONG>reset_shell_mode</STRONG>,
-       <STRONG>resetty</STRONG>, <STRONG>savetty</STRONG>, <STRONG>getsyx</STRONG>, <STRONG>setsyx</STRONG>, <STRONG>ripoffline</STRONG>, <STRONG>curs_set</STRONG>,  <STRONG>napms</STRONG>  -  low-
-       level <EM>curses</EM> routines
+       <STRONG>resetty</STRONG>, <STRONG>savetty</STRONG>, <STRONG>getsyx</STRONG>, <STRONG>setsyx</STRONG>, <STRONG>curs_set</STRONG>, <STRONG>mvcur</STRONG>, <STRONG>napms</STRONG>, <STRONG>ripoffline</STRONG>  -
+       low-level <EM>curses</EM> routines
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -67,9 +67,10 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>void</STRONG> <STRONG>getsyx(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>setsyx(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>ripoffline(int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int));</STRONG>
        <STRONG>int</STRONG> <STRONG>curs_set(int</STRONG> <EM>visibility</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvcur(int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>napms(int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ripoffline(int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int));</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -121,6 +122,34 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        Few applications will use this feature, most use <STRONG>wmove</STRONG> instead.
 
 
+</PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
+       The <STRONG>curs_set</STRONG> routine sets the cursor state  to  invisible,  normal,  or
+       very  visible  for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.  If the
+       terminal supports the <EM>visibility</EM> requested, the previous  <EM>cursor</EM>  state
+       is returned; otherwise, <STRONG>ERR</STRONG> is returned.
+
+
+</PRE><H3><a name="h3-mvcur">mvcur</a></H3><PRE>
+       <STRONG>mvcur</STRONG>  provides  low-level cursor motion.  It takes effect immediately,
+       rather than at the next refresh.  Unlike  the  other  low-level  output
+       functions,  which  either  write  to  the standard output stream or are
+       passed a  function  pointer  to  perform  output,  <STRONG>mvcur</STRONG>  uses  a  file
+       descriptor derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
+
+       One  application  of  <STRONG>mvcur</STRONG>  accompanies  the  temporary use of another
+       program to write to the  terminal  screen.   For  example,  first  call
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to ensure that the screen and the library's model of it is
+       up to date; then call <STRONG>reset_shell_mode</STRONG>; write to the  screen  with  the
+       external  application;  call <STRONG>reset_prog_mode</STRONG>; and finally call <STRONG>mvcur</STRONG> to
+       set the cursor's location to where  <EM>curses</EM>  thinks  it  is,  since  the
+       library has no knowledge of how the external application moved it.
+
+
+</PRE><H3><a name="h3-napms">napms</a></H3><PRE>
+       <STRONG>napms</STRONG>  sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000 (thirty
+       seconds), it is capped at that value.
+
+
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
        <STRONG>ripoffline</STRONG> provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>  uses
        to  reduce  the  size  of the screen.  <STRONG>ripoffline</STRONG> must be called before
@@ -146,18 +175,6 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>newterm</STRONG>.
 
 
-</PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
-       The  <STRONG>curs_set</STRONG>  routine  sets  the cursor state to invisible, normal, or
-       very visible for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.   If  the
-       terminal  supports  the <EM>visibility</EM> requested, the previous <EM>cursor</EM> state
-       is returned; otherwise, <STRONG>ERR</STRONG> is returned.
-
-
-</PRE><H3><a name="h3-napms">napms</a></H3><PRE>
-       <STRONG>napms</STRONG> sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000  (thirty
-       seconds), it is capped at that value.
-
-
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
@@ -167,12 +184,12 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        X/Open defines no error conditions.  In this implementation
 
        <STRONG>def_prog_mode</STRONG>, <STRONG>def_shell_mode</STRONG>, <STRONG>reset_prog_mode</STRONG>, <STRONG>reset_shell_mode</STRONG>
-            return an error if the terminal was not initialized, or if the I/O
-            call to obtain the terminal settings fails.
+            return <STRONG>ERR</STRONG> if the terminal was not initialized, or if the I/O call
+            to obtain the terminal settings fails.
 
        <STRONG>ripoffline</STRONG>
-            returns an error if the maximum number of ripped-off lines exceeds
-            the maximum (5).
+            returns  <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds the
+            maximum (5).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -189,6 +206,14 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        cursor state to restore that.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       In <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.   This
+       value  tells <EM>ncurses</EM> that the old location is unknown, and that it must
+       use only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>)  capability,
+       rather  than  the  least  costly  combination  of absolute and relative
+       motion.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG>  are  not  described  in
        X/Open Curses, Issue 4.  All other functions are as described in X/Open
@@ -198,6 +223,18 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        type  int.   This  is misleading, as they are macros with no documented
        semantics for the return value.
 
+       X/Open Curses notes:
+
+              "After use of <EM>mvcur</EM>(), the model Curses maintains of  the  state
+              of  the  terminal  might  not  match  the  actual  state  of the
+              terminal.  An application should touch and  refresh  the  window
+              before resuming conventional use of Curses."
+
+       Both  <EM>ncurses</EM>  and  SVr4  <EM>curses</EM>  implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data
+       allocated in either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open  Curses  states
+       that  the old location must be given for <STRONG>mvcur</STRONG> to accommodate terminals
+       that lack absolute cursor positioning.
+
        If interrupted, <EM>ncurses</EM> restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
        seconds, are different from other implementations.
 
@@ -208,7 +245,7 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -221,13 +258,15 @@ <H1 class="no-header">curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-resetty_savetty">resetty, savetty</a></li>
 <li><a href="#h3-getsyx">getsyx</a></li>
 <li><a href="#h3-setsyx">setsyx</a></li>
-<li><a href="#h3-ripoffline">ripoffline</a></li>
 <li><a href="#h3-curs_set">curs_set</a></li>
+<li><a href="#h3-mvcur">mvcur</a></li>
 <li><a href="#h3-napms">napms</a></li>
+<li><a href="#h3-ripoffline">ripoffline</a></li>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 22f78dddb..9d8d8d9cc 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -101,23 +101,12 @@ <H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        window parameter is null.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these interfaces are implemented as macros and  functions.   The
-       macros  are suppressed (and only the functions provided) in an "opaque"
-       <EM>ncurses</EM> build, which defines the  preprocessor  symbol  <STRONG>NCURSES_OPAQUE</STRONG>.
-       See section "ALTERNATE CONFIGURATIONS" in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
-
-       The standard forms such as <STRONG>getyx</STRONG> <EM>must</EM> be implemented as macros, and (in
-       this implementation) are defined in terms of  the  functions  described
-       here, to avoid reliance on internal details of the <EM>WINDOW</EM> structure.
-
-
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These   functions  were  supported  on  Version  7,  BSD  or  System  V
-       implementations.  None of  those  implementations  checked  the  window
+       These  functions  were  supported  on  Version  7,  BSD  or  System   V
+       implementations.   None  of  those  implementations  checked the window
        parameter.
 
-       The  <STRONG>getattrs</STRONG>  function  and  macro  are  defined  to return a (signed)
+       The <STRONG>getattrs</STRONG> function and  macro  are  defined  to  return  a  (signed)
        integer  for  compatibility  with  those  implementations  although  an
        unsigned type would have been more appropriate.
 
@@ -127,7 +116,7 @@ <H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -135,7 +124,6 @@ <H1 class="no-header">curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index e35187f9d..04a1f35ae 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp @
+  * @Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -259,7 +259,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   or if no more events remain in the queue.
 
-       <STRONG>ungetmouse</STRONG> returns an error if the event queue is full.
+       <STRONG>ungetmouse</STRONG> returns <STRONG>ERR</STRONG> if the event queue is full.
 
        <STRONG>mousemask</STRONG> returns the mask of reportable events.
 
@@ -394,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-18                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index d61be7493..1daa08715 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -152,10 +152,10 @@ <H1 class="no-header">curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
        In this implementation,
 
-       <STRONG>o</STRONG>   those functions that have a window pointer will return an error  if
-           the window pointer is null
+       <STRONG>o</STRONG>   those functions that have a window pointer will return <STRONG>ERR</STRONG>  if  the
+           window pointer is null
 
-       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  an error if the scrolling region limits extend
+       <STRONG>o</STRONG>   <STRONG>wsetscrreg</STRONG>  returns  <STRONG>ERR</STRONG>  if  the  scrolling  region  limits extend
            outside the window boundaries.
 
 
@@ -196,7 +196,7 @@ <H1 class="no-header">curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 61c4c1999..6c60a7cc5 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.43 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -86,8 +86,8 @@ <H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        completion.
 
        X/Open  defines  no error conditions.  In this implementation, <STRONG>copywin</STRONG>,
-       <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> return an error if either of the window  pointers
-       are null, or if some part of the window would be placed off-screen.
+       <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> return <STRONG>ERR</STRONG> if either of the window  pointers  are
+       null, or if some part of the window would be placed off-screen.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index ae2759096..4ff084816 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.61 2024/04/27 17:55:43 tom Exp @
+  * @Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -140,18 +140,17 @@ <H1 class="no-header">curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
-               return an error if the window pointer is null, or if the window
-               is not really a pad or if the  area  to  refresh  extends  off-
-               screen  or  if  the  minimum  coordinates  are greater than the
-               maximum.
+               return  <STRONG>ERR</STRONG>  if the window pointer is null, or if the window is
+               not really a pad or if the area to refresh  extends  off-screen
+               or if the minimum coordinates are greater than the maximum.
 
           <STRONG>pechochar</STRONG>
-               returns an error if the window is not really  a  pad,  and  the
-               associated call to <STRONG>wechochar</STRONG> returns an error.
+               returns  <STRONG>ERR</STRONG>  if  the  window  is  not  really  a  pad, and the
+               associated call to <STRONG>wechochar</STRONG> returns <STRONG>ERR</STRONG>.
 
           <STRONG>pecho_wchar</STRONG>
-               returns  an  error  if  the window is not really a pad, and the
-               associated call to <STRONG>wecho_wchar</STRONG> returns an error.
+               returns <STRONG>ERR</STRONG> if  the  window  is  not  really  a  pad,  and  the
+               associated call to <STRONG>wecho_wchar</STRONG> returns <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -161,67 +160,67 @@ <H1 class="no-header">curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        BSD <EM>curses</EM> has no <EM>pad</EM> feature.
 
-       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
-       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
+       SVr2   <EM>curses</EM>   (1986)  provided  the  <STRONG>newpad</STRONG>  and  related  functions,
+       documenting them in a single line  each.   SVr3  (1987)  provided  more
        extensive documentation.
 
-       The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
+       The  documentation  does not explain the term <EM>pad</EM>.  However, the Apollo
        <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
 
-       <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
+       <STRONG>o</STRONG>   These graphical pads could  be  much  larger  than  the  computer's
            display.
 
-       <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
+       <STRONG>o</STRONG>   The  read-only  output  from  a  command  could be scrolled back to
            inspect, and select text from the pad.
 
        The two uses may be related.
 
-       X/Open  Curses,  Issue 4 describes these functions, without significant
-       change from the SVr3 documentation.  It describes no error  conditions.
+       X/Open Curses, Issue 4 describes these functions,  without  significant
+       change  from the SVr3 documentation.  It describes no error conditions.
        The  behavior  of  <STRONG>subpad</STRONG>  if  the  parent  window  is  not  a  pad  is
        undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM>  structure  in  <STRONG>newpad</STRONG>  which
+       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <EM>WINDOW</EM> structure in <STRONG>newpad</STRONG> which
            tells if the window is a <EM>pad</EM>.
 
-           However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
-           should call <STRONG>wrefresh</STRONG>) and <STRONG>wscrl</STRONG> (to avoid  scrolling  a  pad),  and
-           does  not  check  in  <STRONG>wrefresh</STRONG>  to ensure that the pad is refreshed
+           However, it uses this information only in <STRONG>waddch</STRONG> (to decide  if  it
+           should  call  <STRONG>wrefresh</STRONG>)  and  <STRONG>wscrl</STRONG> (to avoid scrolling a pad), and
+           does not check in <STRONG>wrefresh</STRONG> to ensure  that  the  pad  is  refreshed
            properly.
 
-       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> checks whether a window is a pad  in  <STRONG>wnoutrefresh</STRONG>,
+       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  checks whether a window is a pad in <STRONG>wnoutrefresh</STRONG>,
            returning <STRONG>ERR</STRONG> in that case.
 
-           However,  it only sets the flag for subwindows if the parent window
-           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
+           However, it only sets the flag for subwindows if the parent  window
+           is  a  pad.   Its  <STRONG>newpad</STRONG>  function  does not set this information.
            Consequently, the check will never fail.
 
-           It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
-           enough, a comment in the source code states  that  the  lack  of  a
+           It makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though  interestingly
+           enough,  a  comment  in  the  source code states that the lack of a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and
-           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
+       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG>  and
+           <STRONG>subpad</STRONG>,   using   this   to   help  with  the  distinction  between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
-           It  does  not  check for the case where a subwindow is created in a
+           It does not check for the case where a subwindow is  created  in  a
            pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
 
-           The <STRONG>dupwin</STRONG> function returns a regular  window  when  duplicating  a
-           pad.   Likewise,  <STRONG>getwin</STRONG> always returns a window, even if the saved
+           The  <STRONG>dupwin</STRONG>  function  returns  a regular window when duplicating a
+           pad.  Likewise, <STRONG>getwin</STRONG> always returns a window, even if  the  saved
            data was from a pad.
 
        This implementation
 
        <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
 
-       <STRONG>o</STRONG>   allows a <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG> call to succeed having a  pad  parent  by
+       <STRONG>o</STRONG>   allows  a  <STRONG>subwin</STRONG>  or <STRONG>derwin</STRONG> call to succeed having a pad parent by
            forcing the subwindow to be a pad,
 
-       <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
+       <STRONG>o</STRONG>   checks in both <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to  ensure  that  pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
+       <STRONG>o</STRONG>   ensures   that   <STRONG>dupwin</STRONG>   and  <STRONG>getwin</STRONG>  treat  pads  versus  windows
            consistently.
 
 
@@ -230,7 +229,7 @@ <H1 class="no-header">curs_pad 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-27                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 4beec325a..f2aef205d 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.46 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -131,12 +131,11 @@ <H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        implementation
 
           <STRONG>wnoutrefresh</STRONG>
-               returns an error if the window  pointer  is  null,  or  if  the
-               window is really a pad.
+               returns <STRONG>ERR</STRONG> if the window pointer is null, or if the window  is
+               really a pad.
 
           <STRONG>wredrawln</STRONG>
-               returns  an  error if the associated call to <STRONG>touchln</STRONG> returns an
-               error.
+               return <STRONG>ERR</STRONG> if the associated call to <STRONG>touchln</STRONG> returns <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -146,12 +145,12 @@ <H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses, Issue 4 describes these functions.
 
-       Whether <STRONG>wnoutrefresh</STRONG> copies to the virtual screen the  entire  contents
+       Whether  <STRONG>wnoutrefresh</STRONG>  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
+       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 <STRONG>touchwin</STRONG>
-       before  the  <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an entire-contents copy
+       before the <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an  entire-contents  copy
        anywhere.
 
 
@@ -160,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 5b827fede..8b830748b 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.43 2024/04/20 18:54:36 tom Exp @
+  * @Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -53,10 +53,10 @@ <H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>scroll(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scroll(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>scrl(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wscrl(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wscrl(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -86,11 +86,11 @@ <H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> may be implemented as macros.
+
        Unusually,  there  is  no <STRONG>wscroll</STRONG> function; <STRONG>scroll</STRONG> behaves as one would
        expect <STRONG>wscroll</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
-       <STRONG>scrl</STRONG> and <STRONG>scroll</STRONG> may be implemented as macros.
-
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses, Issue 4 describes these functions.  It defines no  error
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 52f8c29fb..de9699fc9 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.71 2024/04/20 18:54:36 tom Exp @
+  * @Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -176,50 +176,49 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
           <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attron</STRONG>,  <STRONG>slk_clear</STRONG>,  <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_refresh</STRONG>,
           <STRONG>slk_touch</STRONG>
-               return an error if  the  terminal  or  the  softkeys  were  not
+               return  <STRONG>ERR</STRONG>  if  the  terminal  or  the   softkeys   were   not
                initialized.
 
           <STRONG>slk_attrset</STRONG>
-               returns  an  error  if  the  terminal  or the softkeys were not
+               returns   <STRONG>ERR</STRONG>   if  the  terminal  or  the  softkeys  were  not
                initialized.
 
           <STRONG>slk_attr_set</STRONG>
-               returns an error if the  terminal  or  the  softkeys  were  not
+               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
                initialized,   or   the   color   pair  is  outside  the  range
                0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_color</STRONG>
-               returns an error if the  terminal  or  the  softkeys  were  not
+               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
                initialized,   or   the   color   pair  is  outside  the  range
                0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_init</STRONG>
-               returns an error if the format parameter is outside  the  range
-               0..3.
+               returns <STRONG>ERR</STRONG> if the format parameter is outside the range 0..3.
 
           <STRONG>slk_label</STRONG>
                returns <STRONG>NULL</STRONG> on error.
 
           <STRONG>slk_set</STRONG>
-               returns  an  error  if  the  terminal  or the softkeys were not
-               initialized, or the <EM>labnum</EM> parameter is outside  the  range  of
-               label  counts,  or if the format parameter is outside the range
+               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
+               initialized,  or  the  <EM>labnum</EM> parameter is outside the range of
+               label counts, or if the format parameter is outside  the  range
                0..2, or if memory for the labels cannot be allocated.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Most applications would  use  <STRONG>slk_noutrefresh</STRONG>  because  a  <STRONG>wrefresh</STRONG>  is
+       Most  applications  would  use  <STRONG>slk_noutrefresh</STRONG>  because  a <STRONG>wrefresh</STRONG> is
        likely to follow soon.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
-       saying that it must be null.  This implementation uses  that  parameter
+       X/Open Curses documents the <EM>opts</EM> argument as reserved for  future  use,
+       saying  that  it must be null.  This implementation uses that parameter
        in ABI 6 for the functions which have a color pair parameter to support
        extended color pairs.
 
-       For functions which modify the color, e.g., <STRONG>slk_attr_set</STRONG>,  if  <EM>opts</EM>  is
-       set  it  is treated as a pointer to <EM>int</EM>, and used to set the color pair
+       For  functions  which  modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM> is
+       set it is treated as a pointer to <EM>int</EM>, and used to set the  color  pair
        instead of the <EM>short</EM> pair parameter.
 
 
@@ -227,12 +226,12 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        X/Open Curses, Issue 4 describes these functions, with some differences
        from SVr4 <EM>curses</EM>:
 
-       <STRONG>o</STRONG>   X/Open   added   functions  like  the  SVr4  attribute-manipulation
-           functions <STRONG>slk_attron</STRONG>, <STRONG>slk_attroff</STRONG>, and <STRONG>slk_attrset</STRONG>, but  which  use
-           <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  parameters (rather than <EM>chtype</EM>), along with a reserved <EM>opts</EM>
+       <STRONG>o</STRONG>   X/Open  added  functions  like  the   SVr4   attribute-manipulation
+           functions  <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>, and <STRONG>slk_attrset</STRONG>, but which use
+           <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> parameters (rather than <EM>chtype</EM>), along with a reserved  <EM>opts</EM>
            parameter.
 
-           Two of these new functions (unlike  the  SVr4  functions)  have  no
+           Two  of  these  new  functions  (unlike the SVr4 functions) have no
            provision for color: <STRONG>slk_attr_on</STRONG> and <STRONG>slk_attr_off</STRONG>.
 
            The third function (<STRONG>slk_attr_set</STRONG>) has a color pair parameter.
@@ -241,7 +240,7 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   It added <STRONG>slk_color</STRONG>.
 
-       Although  <STRONG>slk_start</STRONG>  is  declared in the <EM>curses</EM> header file, it was not
+       Although <STRONG>slk_start</STRONG> is declared in the <EM>curses</EM> header file,  it  was  not
        documented by SVr4 other than its presence in a list of libtermlib.so.1
        symbols.  Reading the source code (i.e., Illumos):
 
@@ -253,32 +252,32 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   Soft-key groups are an array of <EM>ng</EM> integers.
 
-       <STRONG>o</STRONG>   In  SVr4, <STRONG>slk_init</STRONG> calls <STRONG>slk_start</STRONG> passing a null for <EM>gp</EM>.  For this
-           case, <STRONG>slk_start</STRONG> uses the number of  groups  <EM>ng</EM>  (3  for  the  3-2-3
+       <STRONG>o</STRONG>   In SVr4, <STRONG>slk_init</STRONG> calls <STRONG>slk_start</STRONG> passing a null for <EM>gp</EM>.  For  this
+           case,  <STRONG>slk_start</STRONG>  uses  the  number  of  groups <EM>ng</EM> (3 for the 3-2-3
            layout, 2 for the 4-4 layout) which <STRONG>slk_init</STRONG> provided.
 
-           If  <EM>ng</EM>  is  neither  2  or  3,  <STRONG>slk_start</STRONG>  checks  the terminfo <STRONG>fln</STRONG>
-           (label_format) capability, interpreting that as  a  comma-separated
+           If <EM>ng</EM> is  neither  2  or  3,  <STRONG>slk_start</STRONG>  checks  the  terminfo  <STRONG>fln</STRONG>
+           (label_format)  capability,  interpreting that as a comma-separated
            list of numbers, e.g., "3,2,3" for the 3-2-3 layout.
 
            Finally, if there is no <STRONG>fln</STRONG> capability, <STRONG>slk_start</STRONG> returns <STRONG>ERR</STRONG>.
 
-       <STRONG>o</STRONG>   If  <STRONG>slk_start</STRONG>  is given a non-null <EM>gp</EM>, it copies the <EM>ng</EM> elements of
+       <STRONG>o</STRONG>   If <STRONG>slk_start</STRONG> is given a non-null <EM>gp</EM>, it copies the <EM>ng</EM>  elements  of
            the group of soft-keys, up to 16.
 
-           If there are more than 16 elements, <STRONG>slk_start</STRONG> returns an error.
+           If there are more than 16 elements, <STRONG>slk_start</STRONG> returns <STRONG>ERR</STRONG>.
 
-       <STRONG>o</STRONG>   The format codes <STRONG>2</STRONG> and <STRONG>3</STRONG> for <STRONG>slk_init</STRONG>  were  added  by  <EM>ncurses</EM>  in
+       <STRONG>o</STRONG>   The  format  codes  <STRONG>2</STRONG>  and  <STRONG>3</STRONG> for <STRONG>slk_init</STRONG> were added by <EM>ncurses</EM> in
            1996.  PDCurses 2.4 added this feature in 2001.
 
        The function <STRONG>slk_attr</STRONG> was added by <EM>ncurses</EM> in 1996.
 
-       X/Open  Curses  does  not  specify a limit for the number of colors and
+       X/Open Curses does not specify a limit for the  number  of  colors  and
        color pairs which a terminal can support.  However, in its use of <EM>short</EM>
-       for  the  parameters,  it carries over SVr4's implementation detail for
+       for the parameters, it carries over SVr4's  implementation  detail  for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation  provides extended versions of those functions which use
-       <EM>int</EM> parameters, allowing applications to use larger  color-  and  pair-
+       implementation provides extended versions of those functions which  use
+       <EM>int</EM>  parameters,  allowing  applications to use larger color- and pair-
        numbers.
 
 
@@ -313,7 +312,7 @@ <H1 class="no-header">curs_slk 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 2bba9d912..ebb9251ca 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.136 2024/04/14 00:14:40 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -48,10 +48,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>del_curterm</STRONG>,   <STRONG>mvcur</STRONG>,   <STRONG>putp</STRONG>,   <STRONG>restartterm</STRONG>,   <STRONG>set_curterm</STRONG>,  <STRONG>setupterm</STRONG>,
-       <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG>,  <STRONG>tigetstr</STRONG>,  <STRONG>tiparm</STRONG>,  <STRONG>tiparm_s</STRONG>,  <STRONG>tiscan_s</STRONG>,  <STRONG>tparm</STRONG>,
-       <STRONG>tputs</STRONG>,  <STRONG>vid_attr</STRONG>,  <STRONG>vid_puts</STRONG>,  <STRONG>vidattr</STRONG>,  <STRONG>vidputs</STRONG>  - <EM>curses</EM> interfaces to
-       <EM>terminfo</EM> database
+       <STRONG>del_curterm</STRONG>,  <STRONG>putp</STRONG>,  <STRONG>restartterm</STRONG>,  <STRONG>set_curterm</STRONG>,  <STRONG>setupterm</STRONG>,  <STRONG>tigetflag</STRONG>,
+       <STRONG>tigetnum</STRONG>, <STRONG>tigetstr</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tiparm_s</STRONG>, <STRONG>tiscan_s</STRONG>, <STRONG>tparm</STRONG>, <STRONG>tputs</STRONG>, <STRONG>vid_attr</STRONG>,
+       <STRONG>vid_puts</STRONG>, <STRONG>vidattr</STRONG>, <STRONG>vidputs</STRONG> - <EM>curses</EM> interfaces to <EM>terminfo</EM> database
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -87,8 +86,6 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>vid_puts(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
        <STRONG>int</STRONG> <STRONG>vid_attr(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvcur(int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
@@ -105,45 +102,45 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These low-level functions must be called by programs that deal directly
-       with  the  <EM>terminfo</EM>  database  to handle certain terminal capabilities,
+       with the <EM>terminfo</EM> database to  handle  certain  terminal  capabilities,
        such as programming function keys.  For all other functionality, <EM>curses</EM>
        functions are more suitable and their use is recommended.
 
-       None  of  these  functions  use  (or  are aware of) multibyte character
+       None of these functions use  (or  are  aware  of)  multibyte  character
        strings such as UTF-8.
 
        <STRONG>o</STRONG>   Capability names and codes use the POSIX portable character set.
 
-       <STRONG>o</STRONG>   Capability string values have  no  associated  encoding;  they  are
+       <STRONG>o</STRONG>   Capability  string  values  have  no  associated encoding; they are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        Initially, <STRONG>setupterm</STRONG> should be called.  The high-level <EM>curses</EM> functions
-       <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level  set  of
+       <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
        terminal-dependent variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
 
-       Applications  can  use  the  terminal capabilities either directly (via
+       Applications can use the terminal  capabilities  either  directly  (via
        header  definitions),  or  by  special  functions.   The  header  files
-       <EM>curses.h</EM>  and  <EM>term.h</EM>  should  be  included  (in that order) to get the
+       <EM>curses.h</EM> and <EM>term.h</EM> should be included  (in  that  order)  to  get  the
        definitions for these strings, numbers, and flags.
 
-       The <EM>terminfo</EM> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized  by  <STRONG>setupterm</STRONG>
+       The  <EM>terminfo</EM>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
        as follows.
 
-       <STRONG>o</STRONG>   If  <STRONG>use_env(FALSE)</STRONG>  has  been  called, values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG>
+       <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
            specified in <EM>terminfo</EM> are used.
 
-       <STRONG>o</STRONG>   Otherwise, if the environment variables <EM>LINES</EM>  and  <EM>COLUMNS</EM>  exist,
+       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <EM>LINES</EM> and <EM>COLUMNS</EM> exist,
            their values are used.  If these environment variables do not exist
-           and the program is running in a window, the current window size  is
-           used.   Otherwise,  if  the environment variables do not exist, the
+           and  the program is running in a window, the current window size is
+           used.  Otherwise, if the environment variables do  not  exist,  the
            values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <EM>terminfo</EM> database are
            used.
 
-       Parameterized  strings  should  be  passed through <STRONG>tparm</STRONG> to instantiate
-       them.  All <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>)  should  be
-       sent  to the terminal device with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call <STRONG>reset_shell_mode</STRONG>
+       Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
+       them.   All  <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>) should be
+       sent to the terminal device with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call  <STRONG>reset_shell_mode</STRONG>
        to restore the terminal modes before exiting; see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>.
 
        Programs that use cursor addressing should
@@ -154,54 +151,54 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
        Programs that execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call <STRONG>reset_shell_mode</STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell  is
+       <STRONG>o</STRONG>   call  <STRONG>reset_shell_mode</STRONG>  and output <STRONG>exit_ca_mode</STRONG> before the shell is
            called and
 
-       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning from
+       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
            the shell.
 
-       <STRONG>setupterm</STRONG> reads in the <EM>terminfo</EM>  database,  initializing  the  <EM>terminfo</EM>
-       structures,  but  does  not set up the output virtualization structures
+       <STRONG>setupterm</STRONG>  reads  in  the  <EM>terminfo</EM> database, initializing the <EM>terminfo</EM>
+       structures, but does not set up the  output  virtualization  structures
        used by <EM>curses</EM>.  Its parameters follow.
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <EM>TERM</EM> is read.
 
           <EM>filedes</EM>
-               is  the  file  descriptor used for getting and setting terminal
+               is the file descriptor used for getting  and  setting  terminal
                I/O modes.
 
-               Higher-level applications use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to  initialize  the
-               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
-               In  <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
-               <STRONG>setupterm</STRONG>,  passing the file descriptor derived from its output
+               Higher-level  applications  use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to initialize the
+               terminal, passing an output <EM>stream</EM> rather  than  a  <EM>descriptor</EM>.
+               In   <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>  calls
+               <STRONG>setupterm</STRONG>, passing the file descriptor derived from its  output
                stream parameter.
 
           <EM>errret</EM>
-               points to an optional location where an  error  status  can  be
-               returned  to the caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
-               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
-               pointed  to  by  <EM>errret</EM>.   A  return  value of <STRONG>OK</STRONG> combined with
+               points  to  an  optional  location where an error status can be
+               returned to the caller.  If <EM>errret</EM> is not null, then  <STRONG>setupterm</STRONG>
+               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
+               pointed to by <EM>errret</EM>.  A  return  value  of  <STRONG>OK</STRONG>  combined  with
                status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret:</EM>
 
-               <STRONG>1</STRONG>    means that the terminal is hardcopy, and  cannot  be  used
+               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, and cannot be used
                     for <EM>curses</EM> applications.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the entry is a hardcopy type by
+                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
                     checking the <STRONG>hardcopy</STRONG> (<STRONG>hc</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
-                    a  generic  type, having too little information for <EM>curses</EM>
+               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
+                    a generic type, having too little information  for  <EM>curses</EM>
                     applications to run.
 
-                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
+                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
                     checking the <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <EM>terminfo</EM> database could not be found.
 
-               If  <EM>errret</EM>  is  null,  <STRONG>setupterm</STRONG>  reports an error message upon
+               If <EM>errret</EM> is null, <STRONG>setupterm</STRONG>  reports  an  error  message  upon
                finding an error and exits.  Thus, the simplest call is:
 
                       setupterm((char *)0, 1, (int *)0);
@@ -210,88 +207,85 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       <STRONG>setupterm</STRONG> stores its information  about  the  terminal  in  a  <EM>TERMINAL</EM>
+       <STRONG>setupterm</STRONG>  stores  its  information  about  the  terminal in a <EM>TERMINAL</EM>
        structure pointed to by the global variable <STRONG>cur_term</STRONG>.  If it detects an
        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
-       generic),  it  discards  this  information,  making it not available to
+       generic), it discards this information,  making  it  not  available  to
        applications.
 
-       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type,  it  will
+       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
        reuse  the  information.   It  maintains  only  one  copy  of  a  given
-       terminal's capabilities in memory.   If  it  is  called  for  different
-       terminal  types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set of
+       terminal's  capabilities  in  memory.   If  it  is called for different
+       terminal types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set  of
        terminal capabilities.
 
-       <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>,  and  makes  all  of  the  <EM>terminfo</EM>
-       Boolean,  numeric,  and string variables use the values from <EM>nterm</EM>.  It
+       <STRONG>set_curterm</STRONG>  sets  <STRONG>cur_term</STRONG>  to  <EM>nterm</EM>,  and  makes all of the <EM>terminfo</EM>
+       Boolean, numeric, and string variables use the values from  <EM>nterm</EM>.   It
        returns the old value of <STRONG>cur_term</STRONG>.
 
-       <STRONG>del_curterm</STRONG> frees the space pointed to by <EM>oterm</EM> and makes it  available
-       for  further  use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references to any
-       of the <EM>terminfo</EM> Boolean, numeric, and string variables  thereafter  may
-       refer  to  invalid  memory  locations  until another <STRONG>setupterm</STRONG> has been
+       <STRONG>del_curterm</STRONG>  frees the space pointed to by <EM>oterm</EM> and makes it available
+       for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references  to  any
+       of  the  <EM>terminfo</EM> Boolean, numeric, and string variables thereafter may
+       refer to invalid memory locations  until  another  <STRONG>setupterm</STRONG>  has  been
        called.
 
-       <STRONG>restartterm</STRONG> is similar to <STRONG>setupterm</STRONG> and  <STRONG>initscr</STRONG>,  except  that  it  is
-       called  after  restoring  memory to a previous state (for example, when
+       <STRONG>restartterm</STRONG>  is  similar  to  <STRONG>setupterm</STRONG>  and <STRONG>initscr</STRONG>, except that it is
+       called after restoring memory to a previous state  (for  example,  when
        reloading a game saved as a core image dump).  <STRONG>restartterm</STRONG> assumes that
-       the  windows  and  the  input  and  output options are the same as when
+       the windows and the input and output  options  are  the  same  as  when
        memory was saved, but the terminal type and baud rate may be different.
-       Accordingly,  <STRONG>restartterm</STRONG>  saves  various  terminal  state  bits, calls
+       Accordingly, <STRONG>restartterm</STRONG>  saves  various  terminal  state  bits,  calls
        <STRONG>setupterm</STRONG>, and then restores the bits.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi</EM>.   A  pointer  is
+       <STRONG>tparm</STRONG>  instantiates  the  string  <EM>str</EM> with parameters <EM>pi</EM>.  A pointer is
        returned to the result of <EM>str</EM> with the parameters applied.  Application
        developers should keep in mind these quirks of the interface:
 
-       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
+       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
            prototype expects <EM>long</EM> (integer) values.
 
-       <STRONG>o</STRONG>   Aside  from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most terminal
+       <STRONG>o</STRONG>   Aside from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most  terminal
            capabilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
+       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
+       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG>  which  uses  <EM>stdarg.h</EM>  rather  than  a
-       fixed-parameter  list.   Its  numeric  parameters  are <EM>int</EM>s rather than
+       <STRONG>tiparm</STRONG>  is  a  newer  form  of  <STRONG>tparm</STRONG> which uses <EM>stdarg.h</EM> rather than a
+       fixed-parameter list.  Its numeric  parameters  are  <EM>int</EM>s  rather  than
        <EM>long</EM>s.
 
-       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
-       consistent  with the terminal description.  Two extensions are provided
+       Both  <STRONG>tparm</STRONG>  and  <STRONG>tiparm</STRONG>  assume that the application passes parameters
+       consistent with the terminal description.  Two extensions are  provided
        as alternatives to deal with untrusted data.
 
-       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG>  is an extension which is a safer formatting function than
            <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the <EM>curses</EM>
-           library how many parameters to expect in the  parameter  list,  and
+           library  how  many  parameters to expect in the parameter list, and
            which may be string parameters.
 
-           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
+           The <EM>mask</EM> parameter has one bit set for each of the  parameters  (up
            to 9) passed as <EM>char</EM> pointers rather than numbers.
 
-       <STRONG>o</STRONG>   The  extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect   a
+       <STRONG>o</STRONG>   The   extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect  a
            formatting capability to see what the <EM>curses</EM> library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       String  capabilities  can  contain  padding  information,  a time delay
+       String capabilities can  contain  padding  information,  a  time  delay
        (accommodating performance limitations of hardware terminals) expressed
        as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM>
        exceeds 30,000 (thirty seconds), it is capped at that value.
 
-       <STRONG>tputs</STRONG> interprets time-delay information in the string <EM>str</EM>  and  outputs
+       <STRONG>tputs</STRONG>  interprets  time-delay information in the string <EM>str</EM> and outputs
        it, executing the delays:
 
-       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the return
-           value of <STRONG>tparm</STRONG>, <STRONG>tiparm</STRONG>, <STRONG>tgetstr</STRONG>, or <STRONG>tgoto</STRONG>.
-
-           The <STRONG>tgetstr</STRONG> and <STRONG>tgoto</STRONG> functions are part of the <EM>termcap</EM>  interface,
-           which happens to share these function names with the <EM>terminfo</EM> API.
+       <STRONG>o</STRONG>   The <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the  return
+           value of <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>.
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or <STRONG>1</STRONG> if not applicable.
 
@@ -326,15 +320,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        applications  must  provide  a  null pointer for that argument; but see
        section "EXTENSIONS" below.
 
-       <STRONG>mvcur</STRONG> provides low-level cursor motion.  It  takes  effect  immediately
-       (rather  than  at the next refresh).  Unlike the other low-level output
-       functions, which either write to the standard output or pass an  output
-       function  parameter,  <STRONG>mvcur</STRONG> uses an output file descriptor derived from
-       the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
-
-       While <STRONG>putp</STRONG> and <STRONG>mvcur</STRONG> are low-level functions that do not use high-level
-       <EM>curses</EM>  state,  <EM>ncurses</EM>  declares them in <EM>curses.h</EM> because System V did
-       this (see section "HISTORY" below).
+       While <STRONG>putp</STRONG> is a low-level function that does not use high-level  <EM>curses</EM>
+       state,  <EM>ncurses</EM>  declares it in <EM>curses.h</EM> because System V did this (see
+       section "HISTORY" below).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
@@ -415,7 +403,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error codes.
 
        <STRONG>restartterm</STRONG>
-            fails if the associated call to <STRONG>setupterm</STRONG> returns an error.
+            fails if the associated call to <STRONG>setupterm</STRONG> returns <STRONG>ERR</STRONG>.
 
        <STRONG>setupterm</STRONG>
             fails if it cannot allocate enough memory, or create  the  initial
@@ -548,9 +536,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
            keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           an error if the capability mishandles string  parameters.   But  it
-           cannot  check  if  a  calling program provides strings in the right
-           places for the <STRONG>tparm</STRONG> calls.
+           <STRONG>ERR</STRONG> if the capability mishandles string parameters.  But it  cannot
+           check if a calling program provides strings in the right places for
+           the <STRONG>tparm</STRONG> calls.
 
            The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of  these  capabilities  with  a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
@@ -582,24 +570,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of  the
        string, and does no error checking.
 
-       X/Open  Curses notes that after calling <STRONG>mvcur</STRONG>, the <EM>curses</EM> state may not
-       match the actual terminal state, and that an application  should  touch
-       and  refresh  the  window  before  resuming  normal <EM>curses</EM> calls.  Both
-       <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data allocated
-       in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  So though it is documented as a <EM>terminfo</EM>
-       function, <STRONG>mvcur</STRONG> is really a <EM>curses</EM> function that is not well specified.
-
-       X/Open Curses states that the old location must be given for  <STRONG>mvcur</STRONG>  to
-       accommodate  terminals  that lack absolute cursor positioning.  <EM>ncurses</EM>
-       allows the caller to use -1 for either or both old coordinates.  The -1
-       tells  <EM>ncurses</EM>  that  the old location is unknown, and that it must use
-       only absolute motion, as  with  the  <STRONG>cursor_address</STRONG>  (<STRONG>cup</STRONG>)  capability,
-       rather  than  the  least  costly  combination  of absolute and relative
-       motion.
-
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
+       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -609,7 +582,6 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>mvcur</STRONG>       low level cursor motion
        <STRONG>putp</STRONG>        use <STRONG>tputs</STRONG> to send characters via <EM>putchar</EM>
        <STRONG>resetterm</STRONG>   set terminal modes to "out of <EM>curses</EM>" state
-
        <STRONG>resetty</STRONG>     reset terminal flags to stored value
        <STRONG>saveterm</STRONG>    save current modes as "in <EM>curses</EM>" state
        <STRONG>savetty</STRONG>     store current terminal flags
@@ -620,7 +592,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
        <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
 
-       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
+       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
@@ -632,11 +604,11 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>tgoto</STRONG>      apply parameters to given capability
        <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
 
-       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
+       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
-       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
+       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
+       capability  values  (like the <EM>termcap</EM> interface), and reusing <STRONG>tgoto</STRONG> and
        <STRONG>tputs</STRONG>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -645,7 +617,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
+       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -658,37 +630,37 @@ <H1 class="no-header">curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls</H1>
        saveterm    def_prog_mode
        setterm     setupterm
 
-       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
-       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
+       SVr3  kept  the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG>, and <STRONG>tputs</STRONG>.  The latter were needed to support  padding,  and  to
+       handle  capabilities  accessed by functions such as <STRONG>vidattr</STRONG> (which used
        more than the two parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3   introduced   the   functions   for  switching  between  terminal
-       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
+       SVr3  introduced  the  functions   for   switching   between   terminal
+       descriptions;   for   example,  <STRONG>set_curterm</STRONG>.   Some  changes  reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
+       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
-           programming  manual  at  this  point, though the variables had been
+       <STRONG>o</STRONG>   Various  global  variables  such as <STRONG>boolnames</STRONG> were mentioned in the
+           programming manual at this point, though  the  variables  had  been
            provided in SVr2.
 
        SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
+       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-13                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 507176628..dfd354118 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.47 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -97,7 +97,7 @@ <H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        implementation
 
           <STRONG>is_linetouched</STRONG>
-               returns an error if the window pointer is null, or if the  line
+               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
                number is outside the window boundaries.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
@@ -110,7 +110,7 @@ <H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
                The actual function returns <STRONG>FALSE</STRONG> when it detects an error.
 
           <STRONG>wtouchln</STRONG>
-               returns an error if the window pointer is null, or if the  line
+               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
                number is outside the window boundaries.
 
 
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_touch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index bce853e26..8e641fe9b 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -257,93 +257,92 @@ <H1 class="no-header">curs_util 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        implementation
 
           <STRONG>flushinp</STRONG>
-               returns an error if the terminal was not initialized.
+               returns <STRONG>ERR</STRONG> if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns  an  error  if  the  associated  <STRONG>fwrite</STRONG> calls return an
-               error.
+               returns <STRONG>ERR</STRONG> if the associated <STRONG>fwrite</STRONG> calls return <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
-       vaguest  terms.   The  description  here  is adapted from X/Open Curses
+       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
+       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
        (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
-       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
+       The  limitation  to  30  seconds and the use of <STRONG>napms</STRONG> differ from other
        implementations.
 
        <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
 
-       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
-           but does not take  timing  into  account  when  using  the  padding
+       <STRONG>o</STRONG>   NetBSD curses uses <STRONG>napms</STRONG> when no padding  character  is  available,
+           but  does  not  take  timing  into  account  when using the padding
            character.
 
        Neither limits the delay.
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
-       capabilities which are defined in the terminfo entry via the <STRONG>-x</STRONG>  option
+       The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
+       capabilities  which are defined in the terminfo entry via the <STRONG>-x</STRONG> option
        of <STRONG>tic</STRONG>.  This implementation automatically assigns at run-time keycodes
-       to user-defined strings which begin with "k".  The  keycodes  start  at
+       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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG> function controls
-       whether this data is loaded when the terminal description  is  read  by
+       because  user-defined  codes  are merged from all terminal descriptions
+       which have been loaded.  The <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  controls
+       whether  this  data  is loaded when the terminal description is read by
        the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
-       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
-       were not supported on Version 7, BSD or System V  implementations.   It
-       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
+       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <EM>ncurses</EM>.   They
+       were  not  supported on Version 7, BSD or System V implementations.  It
+       is recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions  be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The  files  written  and   read   by   these   functions   use   an
-           implementation-specific  format.  Although the format is an obvious
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.) originated with
+           Interestingly  enough,  according to the copyright dates in Solaris
+           source, the functions (along with <STRONG>scr_init</STRONG>, etc.)  originated  with
            the University of California, Berkeley (in 1982) and were later (in
-           1988)  incorporated  into SVr4.  Oddly, there are no such functions
+           1988) incorporated into SVr4.  Oddly, there are no  such  functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
+           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
            older <EM>ncurses</EM> versions.  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
-           <STRONG>fwrite</STRONG> and <STRONG>fread</STRONG> functions).  Those  that  use  textual  dumps  use
+           The implementations which  use  binary  dumps  use  block-I/O  (the
+           <STRONG>fwrite</STRONG>  and  <STRONG>fread</STRONG>  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.  However, reading from  a
+           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.  However, reading from a
            file written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       X/Open  Curses,  Issue  4  describes  these  functions.  It states that
+       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
        <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but does
-       not  define any error conditions.  This implementation checks for three
+       not define any error conditions.  This implementation checks for  three
        cases:
 
-       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
-           returns  the  parameter,  i.e.,  a  one-character  string  with the
-           parameter as the first  character.   Otherwise,  it  returns  "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -354,44 +353,44 @@ <H1 class="no-header">curs_util 3x 2024-05-11 ncurses 6.5 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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 printable.
-       This implementation uses 8 bits but  does  not  modify  the  string  to
-       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
+       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  printable.
+       This  implementation  uses  8  bits  but  does not modify the string to
+       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
-       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
-       "meta"   keys   (codes   in   the   range   128    to    255).     Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses  is
-       initialized.  X/Open Curses does not document the  treatment  of  codes
+       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
+       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
+       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before  initializing  curses),  this  implementation  returns   strings
+       before   initializing  curses),  this  implementation  returns  strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
+       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
-       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
-       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
+       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
+       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
+       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index ea99659ec..01d6abd14 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -167,41 +167,41 @@ <H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        X/Open defines no error conditions.  In this implementation
 
        <STRONG>delwin</STRONG>
-            returns an error if the window pointer is null, or if  the  window
-            is the parent of another window.
+            returns <STRONG>ERR</STRONG> if the window pointer is null, or if the window is the
+            parent of another window.
 
        <STRONG>derwin</STRONG>
-            returns  an  error if the parent window pointer is null, or if any
-            of its ordinates or dimensions is negative, or  if  the  resulting
-            window does not fit inside the parent window.
+            returns <STRONG>ERR</STRONG> if the parent window pointer is null, or if any of its
+            ordinates or dimensions is negative, or if  the  resulting  window
+            does not fit inside the parent window.
 
        <STRONG>dupwin</STRONG>
-            returns an error if the window pointer is null.
+            returns <STRONG>ERR</STRONG> if the window pointer is null.
 
             This  implementation  also maintains a list of windows, and checks
             that the  pointer  passed  to  <STRONG>delwin</STRONG>  is  one  that  it  created,
             returning an error if it was not..
 
        <STRONG>mvderwin</STRONG>
-            returns an error if the window pointer is null, or if some part of
-            the window would be placed off-screen.
+            returns  <STRONG>ERR</STRONG> if the window pointer is null, or if some part of the
+            window would be placed off-screen.
 
        <STRONG>mvwin</STRONG>
-            returns an error if the window pointer is null, or if  the  window
-            is  really  a  pad,  or if some part of the window would be placed
-            off-screen.
+            returns <STRONG>ERR</STRONG> if the window pointer is null, or  if  the  window  is
+            really  a  pad, or if some part of the window would be placed off-
+            screen.
 
        <STRONG>newwin</STRONG>
             will fail if either of its beginning ordinates is negative, or  if
             either the number of lines or columns is negative.
 
        <STRONG>syncok</STRONG>
-            returns an error if the window pointer is null.
+            returns <STRONG>ERR</STRONG> if the window pointer is null.
 
        <STRONG>subwin</STRONG>
-            returns  an  error if the parent window pointer is null, or if any
-            of its ordinates or dimensions is negative, or  if  the  resulting
-            window does not fit inside the parent window.
+            returns <STRONG>ERR</STRONG> if the parent window pointer is null, or if any of its
+            ordinates or dimensions is negative, or if  the  resulting  window
+            does not fit inside the parent window.
 
        The  functions  which return a window pointer may also fail if there is
        insufficient memory for its data structures.  Any  of  these  functions
@@ -219,44 +219,36 @@ <H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses, Issue 4 describes these functions.
 
-       X/Open Curses states regarding <STRONG>delwin</STRONG>:
+       Regarding <EM>delwin</EM>, X/Open Curses states that
 
-       <STRONG>o</STRONG>   It must delete subwindows before deleting their parent.
+              [t]he  application  must  delete  subwindows before deleting the
+              main window.
 
-       <STRONG>o</STRONG>   If  <STRONG>delwin</STRONG>  is asked to delete a parent window, it can only succeed
-           if the curses library keeps a list of the subwindows.  SVr4  curses
-           kept  a  count  of the number of subwindows rather than a list.  It
-           simply returned <STRONG>ERR</STRONG> when asked  to  delete  a  subwindow.   Solaris
-           X/Open  curses  does  not  even  make that check, and will delete a
-           parent window which still has subwindows.
+       If <EM>delwin</EM> is asked to delete a parent window, it can  succeed  only  if
+       the  <EM>curses</EM> library keeps a list of its subwindows.  SVr4 <EM>curses</EM> kept a
+       count of the number of  subwindows  rather  than  a  list.   It  simply
+       returned  <STRONG>ERR</STRONG>  when asked to delete a subwindow.  Solaris X/Open <EM>curses</EM>
+       (<EM>xcurses</EM>) does not make even that  check,  and  will  delete  a  parent
+       window that still has subwindows.  <EM>PDCurses</EM> also behaves this way.
 
-       <STRONG>o</STRONG>   Since release 4.0 (1996), <EM>ncurses</EM> maintains a list of  windows  for
-           each  screen,  to  ensure  that  a  window has no subwindows before
-           allowing deletion.
+       <EM>ncurses</EM>  4.0  (1996)  and  later  maintains  a list of windows for each
+       screen to ensure that a window has no subwindows  before  allowing  its
+       deletion.  NetBSD <EM>curses</EM> has followed suit since 2003.
 
-       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in 2003.
-           PDCurses follows the scheme used in Solaris X/Open curses.
-
-
-</PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       The subwindow functions <STRONG>subwin</STRONG>, <STRONG>derwin</STRONG>, <STRONG>mvderwin</STRONG>,  <STRONG>wsyncup</STRONG>,  <STRONG>wsyncdown</STRONG>,
-       <STRONG>wcursyncup</STRONG>,  and  <STRONG>syncok</STRONG>  are  flaky, incompletely implemented, and not
-       well tested.
-
-       System V's <EM>curses</EM> documentation  is  unclear  about  what  <STRONG>wsyncup</STRONG>  and
-       <STRONG>wsyncdown</STRONG>  actually  do.   It  seems to imply that they are supposed to
-       touch only those lines that are  affected  by  changes  to  a  window's
-       ancestors.  The language here, and behavior of <EM>ncurses</EM>, is patterned on
+       SVr4  <EM>curses</EM>  documentation is unclear about what <EM>wsyncup</EM> and <EM>wsyncdown</EM>
+       actually do.  It seems to imply that they are supposed  to  touch  only
+       those  lines that are affected by changes to a window's ancestors.  The
+       description and behavior of these functions in <EM>ncurses</EM> is patterned  on
        the X/Open Curses standard; this approach may result in slower updates.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,   <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -279,7 +271,6 @@ <H1 class="no-header">curs_window 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
-<li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index c7e3f717c..8ca26d232 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp @
+  * @Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>define_key 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -65,8 +65,9 @@ <H1 class="no-header">define_key 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        binding  as  it  does  those  in  the  <EM>terminfo</EM>  database entry for the
        terminal type.
 
-       A <EM>definition</EM> of <STRONG>NULL</STRONG> removes any existing one <EM>key-code</EM>.   Similarly,  a
-       non-positive <EM>key-code</EM> removes any existing bindings for <EM>definition</EM>.
+       A <EM>definition</EM> of  <STRONG>NULL</STRONG>  removes  any  existing  binding  from  <EM>key-code</EM>.
+       Similarly,  a  non-positive  <EM>key-code</EM>  removes  an existing binding for
+       <EM>definition</EM>, if any.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -95,12 +96,12 @@ <H1 class="no-header">define_key 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,   <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,   <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,   <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,  <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,  <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-18                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index fcdb7af1f..5ebc12750 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.54 2024/03/16 15:35:01 tom Exp @
+  * @Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">form 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>form</STRONG> - curses extension for programming forms
+       <STRONG>form</STRONG> - present user-fillable forms in <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/index.html b/doc/html/man/index.html
index 07d986b6b..e50cd2f98 100644
--- a/doc/html/man/index.html
+++ b/doc/html/man/index.html
@@ -1,7 +1,7 @@
 <!--
-  $Id: index.html,v 1.12 2020/02/02 23:34:34 tom Exp $
+  $Id: index.html,v 1.13 2024/05/25 22:27:27 tom Exp $
   ****************************************************************************
-  * Copyright 2019,2020 Thomas E. Dickey                                     *
+  * Copyright 2019-2020,2024 Thomas E. Dickey                                *
   * Copyright 2001-2013,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,22 +30,18 @@
   ****************************************************************************
   -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-
 <html>
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-
+  "HTML Tidy for HTML5 for Linux version 5.6.0">
   <title>NCURSES &ndash; Manual Pages</title>
   <link rel="author" href="mailto:dickey@invisible-island.net">
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii">
 </head>
-
 <body>
   <ul>
     <li>Programs:
-
       <ul>
         <li><a href="captoinfo.1m.html">captoinfo &ndash; convert a
         termcap description into a terminfo description</a></li>
@@ -59,64 +55,69 @@
         <li><a href="infotocap.1m.html">infotocap &ndash; convert a
         terminfo description into a termcap description</a></li>
 
-        <li><a href="tabs.1.html">tabs &ndash; set tabs on a
-        terminal</a></li>
+        <li><a href="tabs.1.html">tabs &ndash; set terminal tab
+        stops</a></li>
 
-        <li><a href="tic.1m.html">tic &ndash; the terminfo
-        entry-description compiler</a></li>
+        <li><a href="tic.1m.html">tic &ndash; compile terminal
+        descriptions for terminfo or termcap</a></li>
 
-        <li><a href="toe.1m.html">toe &ndash; table of (terminfo)
-        entries</a></li>
+        <li><a href="toe.1m.html">toe &ndash; list table of entries
+        of terminfo terminal types</a></li>
 
         <li><a href="tput.1.html">tput &ndash; initialize a
-        terminal or query terminfo database</a></li>
+        terminal, exercise its capabilities, or query terminfo
+        database</a></li>
 
-        <li><a href="tset.1.html">tset &ndash; terminal
-        initialization</a></li>
+        <li><a href="tset.1.html">tset &ndash; initialize or reset
+        terminal state</a></li>
       </ul>
     </li>
 
     <li>Scripts:
-
       <ul>
         <li><a href=
         "adacurses6-config.1.html">adacurses*-config</a> &ndash;
-        helper script for AdaCurses libraries</li>
+        configuration helper for AdaCurses libraries</li>
 
         <li><a href="ncurses6-config.1.html">ncurses*-config</a>
-        &ndash; helper script for ncurses libraries</li>
+        &ndash; configuration helper for ncurses libraries</li>
       </ul>
     </li>
 
     <li>Libraries:
-
       <ul>
-        <li><a href="ncurses.3x.html">ncurses &ndash; CRT screen
-        handling and optimization package</a></li>
+        <li><a href="ncurses.3x.html">ncurses &ndash;
+        character-cell terminal interface with optimized output</a></li>
 
-        <li><a href="panel.3x.html">panel &ndash; panel stack
-        extension for curses</a></li>
+        <li><a href="panel.3x.html">panel &ndash; manage
+        overlapping curses windows</a></li>
 
-        <li><a href="form.3x.html">form &ndash; curses extension
-        for programming forms</a></li>
+        <li><a href="form.3x.html">form &ndash; present
+        user-fillable forms in curses windows</a></li>
 
-        <li><a href="menu.3x.html">menu &ndash; curses extension
-        for programming menus</a></li>
+        <li><a href="menu.3x.html">menu &ndash; present menus in
+        curses windows</a></li>
       </ul>
     </li>
 
     <li>File formats:
-
       <ul>
         <li><a href="terminfo.5.html">terminfo &ndash; terminal
-        capability data base</a></li>
+        capability database</a></li>
 
-        <li><a href="term.5.html">term &ndash; format of compiled
-        term file.</a></li>
+        <li><a href="term.5.html">term &ndash; compiled terminfo
+        terminal description</a></li>
 
-        <li><a href="scr_dump.5.html">scr_dump &ndash; format of
-        curses screen dumps.</a></li>
+        <li><a href="scr_dump.5.html">scr_dump &ndash; curses
+        screen dump</a></li>
 
+        <li><a href="user_caps.5.html">user_caps &ndash;
+        user-defined terminfo capability format</a></li>
+      </ul>
+    </li>
+
+    <li>Other information:
+      <ul>
         <li><a href="term.7.html">term &ndash; conventions for
         naming terminal types</a></li>
       </ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index a499cf1ad..a5d29e431 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">menu 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>menu</STRONG> - curses extension for programming menus
+       <STRONG>menu</STRONG> - present menus in <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index d76f4f45f..e36b0fce4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp @
+  * @Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240518).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240525).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -131,9 +131,9 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
            initscr(); cbreak(); noecho();
 
-       Most applications perform further setup as follows.
+       Most applications would perform further setup as follows.
 
-           intrflush(stdscr, FALSE);
+           noqiflush();
            keypad(stdscr, TRUE);
 
        A <EM>curses</EM> program then often enters an event loop of  some  sort.   Call
@@ -176,9 +176,9 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
        Many  terminals  support configuration of character cell foreground and
-       background  colors  as  well  as  rendering  <EM>attributes</EM>,  which   cause
-       characters  to  show  up  in such modes as boldfaced, underlined, or in
-       reverse video.  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
+       background colors as well as  <EM>attributes</EM>,  which  cause  characters  to
+       render  in  such  modes  as boldfaced, underlined, or in reverse video.
+       See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
        <EM>curses</EM> predefines constants for a small set of  forms-drawing  graphics
        corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
@@ -189,8 +189,8 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
        is.   Everything  else, including the tab, enter/return, keypad, arrow,
        and function keys, appears as a control character or a multibyte <EM>escape</EM>
-       <EM>sequence.</EM>   <EM>curses</EM>  translates  the  latter into unique <EM>key</EM> <EM>codes.</EM>  See
-       <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+       <EM>sequence.</EM>   <EM>curses</EM> can translate the latter into unique <EM>key</EM> <EM>codes.</EM>  See
+       <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> and <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
        <EM>ncurses</EM> provides reimplementations of the SVr4 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, and
        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>   libraries;   they   permit   overlapping  windows  and  ease
@@ -855,26 +855,28 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        overrides the library's use  of  the  screen  size  obtained  from  the
        operating system.
 
-       The  <EM>COLUMNS</EM>  and <EM>LINES</EM> variables may be specified independently.  This
-       property is useful to circumvent misfeatures of  legacy  terminal  type
-       descriptions;  <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were once
-       notorious.   For  best  results,  avoid  specifying  <STRONG>cols</STRONG>   and   <STRONG>lines</STRONG>
+       The  <EM>COLUMNS</EM>  and  <EM>LINES</EM>  variables  may  be  specified  independently.
+       <EM>ncurses</EM> enforces an upper limit of 512 on each when reading the  value.
+       This  property  is  useful to circumvent misfeatures of legacy terminal
+       type descriptions; <STRONG>xterm(1)</STRONG> descriptions specifying 65 lines were  once
+       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
        capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
 
-       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>  can  disable use of the process environment in determining
-       the screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to  match
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
+       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
        the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
-       press of the "Escape" key on the input device  from  one  beginning  an
+       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
+       press  of  the  "Escape"  key on the input device from one beginning an
        <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
-       receiving the  escape  character  to  see  if  further  characters  are
-       available  on  the  input  stream  within  a  short interval.  A global
-       variable <STRONG>ESCDELAY</STRONG> stores this interval in  milliseconds.   The  default
+       receiving  the  escape  character  to  see  if  further  characters are
+       available on the input  stream  within  a  short  interval.   A  global
+       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
        value of 1000 (one second) is adequate for most uses.  This environment
-       variable overrides it.
+       variable  overrides  it;  <EM>ncurses</EM> enforces an upper limit of 30,000 (30
+       seconds) when reading the value.
 
        The most common instance where you may wish to change this value is  to
        work with a remote host over a slow communication channel.  If the host
@@ -939,90 +941,91 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
        (Linux only) When <EM>ncurses</EM> is configured to use the GPM interface,  this
-       variable  may  list  one  or more terminal type names against which the
-       <EM>TERM</EM> variable (see below) is matched.  An empty value disables the  GPM
-       interface,   using   <EM>ncurses</EM>'s  built-in  support  for  <STRONG>xterm(1)</STRONG>  mouse
-       protocols instead.  If the variable is absent, <EM>ncurses</EM> attempts to open
-       GPM if <EM>TERM</EM> contains "linux".
+       variable  may  list  one  or  more  terminal  type  names, delimited by
+       vertical bars (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM>  variable  (see
+       below)  is  matched.   An empty value disables the GPM interface, using
+       <EM>ncurses</EM>'s built-in support for <STRONG>xterm(1)</STRONG> mouse  protocols  instead.   If
+       the  variable  is absent, <EM>ncurses</EM> attempts to open GPM if <EM>TERM</EM> contains
+       "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM>  may  use  tab  characters in cursor movement optimization.  In
-       some cases, your terminal driver may not  handle  them  properly.   Set
+       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
+       some  cases,  your  terminal  driver may not handle them properly.  Set
        this environment variable to any value to disable the feature.  You can
        also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Many terminals store video attributes as  a  property  of  a  character
-       cell,  as  <EM>curses</EM>  does.   Historically, some recorded changes in video
-       attributes as data that  logically  <EM>occupies</EM>  character  cells  on  the
-       display,  switching attributes on or off, similarly to tags in a markup
-       language; these are termed "magic cookies", and  must  be  subsequently
-       overprinted.   If  the  <EM>terminfo</EM>  entry for your terminal type does not
+       Many  terminals  store  video  attributes  as a property of a character
+       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
+       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
+       display, switching attributes on or off, similarly to tags in a  markup
+       language;  these  are  termed "magic cookies", and must be subsequently
+       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
        adequately describe its handling of magic cookies, set this variable to
        any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
-       hardware  devices.   Many  people  use  <EM>curses</EM>-based  applications   in
-       terminal  emulator programs that run in a windowing environment.  These
-       programs can duplicate all of the  important  features  of  a  hardware
-       terminal,  but  often lack their limitations.  Chief among these absent
+       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
+       terminal emulator programs that run in a windowing environment.   These
+       programs  can  duplicate  all  of  the important features of a hardware
+       terminal, but often lack their limitations.  Chief among  these  absent
        drawbacks is the problem of data flow management; that is, limiting the
-       speed  of  communication  to  what the hardware could handle.  Unless a
-       hardware terminal is interfaced into  a  terminal  concentrator  (which
-       does  flow  control), an application must manage flow itself to prevent
+       speed of communication to what the hardware  could  handle.   Unless  a
+       hardware  terminal  is  interfaced  into a terminal concentrator (which
+       does flow control), an application must manage flow itself  to  prevent
        overruns and data loss.
 
-       A solution that comes at no hardware cost  is  for  an  application  to
-       pause  after  directing  a  terminal  to  execute  an operation that it
-       performs slowly, such as clearing  the  display.   Many  terminal  type
-       descriptions,  including that for the VT100, embed delay specifications
-       in capabilities.  You may  wish  to  use  these  terminal  descriptions
-       without  paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to any
-       value to disable all but mandatory padding.  Mandatory padding is  used
+       A  solution  that  comes  at  no hardware cost is for an application to
+       pause after directing a  terminal  to  execute  an  operation  that  it
+       performs  slowly,  such  as  clearing  the display.  Many terminal type
+       descriptions, including that for the VT100, embed delay  specifications
+       in  capabilities.   You  may  wish  to  use these terminal descriptions
+       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
+       value  to disable all but mandatory padding.  Mandatory padding is used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       (Obsolete)  Prior to internal changes developed in <EM>ncurses</EM> 5.9 (patches
-       20120825 through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable  fully
-       buffered  output  when initializing the terminal.  This was done, as in
-       SVr4 <EM>curses</EM>, to increase performance.  For testing  purposes,  both  of
-       <EM>ncurses</EM>  and  of  certain applications, this feature was made optional.
-       Setting this variable disabled output  buffering,  leaving  the  output
+       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
+       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
+       buffered output when initializing the terminal.  This was done,  as  in
+       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
+       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
+       Setting  this  variable  disabled  output buffering, leaving the output
        stream in the original (usually line-buffered) mode.
 
-       Nowadays,  <EM>ncurses</EM> performs its own buffering and does not require this
-       workaround; it does not modify the buffering  of  the  standard  output
-       stream.   This  approach makes signal handling, as for interrupts, more
-       robust.  A drawback  is  that  certain  unconventional  programs  mixed
-       <STRONG>stdio(3)</STRONG>  calls  with <EM>ncurses</EM> calls and (usually) got the behavior they
-       expected.  This is no longer the case; <EM>ncurses</EM> does not  write  to  the
+       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
+       workaround;  it  does  not  modify the buffering of the standard output
+       stream.  This approach makes signal handling, as for  interrupts,  more
+       robust.   A  drawback  is  that  certain  unconventional programs mixed
+       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
+       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
        standard output file descriptor through a <EM>stdio</EM>-buffered stream.
 
-       As  a  special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still use the
-       standard output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG>  do
+       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
+       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
        not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       At  initialization,  <EM>ncurses</EM> inspects the <EM>TERM</EM> environment variable for
-       special  cases  where   VT100   forms-drawing   characters   (and   the
-       corresponding  alternate character set <EM>terminfo</EM> capabilities) are known
+       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
+       special   cases   where   VT100   forms-drawing   characters  (and  the
+       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
-       virtual console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.   Set
+       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
        this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
        terminal's ACS support is broken; the library then outputs Unicode code
        points that correspond to the forms-drawing characters.  Set it to zero
        (or a non-integer) to disable the special check for terminal type names
-       matching  "linux" or "screen", directing <EM>ncurses</EM> to assume that the ACS
+       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
        feature works if the terminal type description advertises it.
 
-       As an alternative to use  of  this  variable,  <EM>ncurses</EM>  checks  for  an
+       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
        extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
        <STRONG>-x</STRONG>".  Examples follow.
 
@@ -1035,62 +1038,62 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The two-character name "U8" was chosen to permit its use via  <EM>ncurses</EM>'s
+       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
        <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       At  initialization, <EM>ncurses</EM> (in its debugging configuration) checks for
-       this variable's presence.  If  defined  with  an  integral  value,  the
+       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
+       this  variable's  presence.   If  defined  with  an integral value, the
        library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       The  <EM>TERM</EM> variable denotes the terminal type.  Each is distinct, though
-       many are similar.  It is commonly set by  terminal  emulators  to  help
-       applications  find  a  workable  terminal  description.   Some choose a
-       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
-       an  exact  fit to their capabilities.  Not infrequently, an application
-       will have problems with that approach; for example, a  key  stroke  may
-       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
+       many  are  similar.   It  is commonly set by terminal emulators to help
+       applications find a  workable  terminal  description.   Some  choose  a
+       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+       an exact fit to their capabilities.  Not infrequently,  an  application
+       will  have  problems  with that approach; for example, a key stroke may
+       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
        characters on the screen.
 
-       Setting <EM>TERM</EM> has no effect on hardware operation; it  affects  the  way
-       applications  communicate  with  the  terminal.  Likewise, as a general
-       rule (<STRONG>xterm(1)</STRONG> being a rare exception), terminal emulators  that  allow
+       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
+       applications communicate with the terminal.   Likewise,  as  a  general
+       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
        you to specify <EM>TERM</EM> as a parameter or configuration value do not change
        their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
-       type  description  in  <EM>termcap</EM>  format if one in <EM>terminfo</EM> format is not
-       available.  Setting this variable directs <EM>ncurses</EM> to ignore  the  usual
-       <EM>termcap</EM>  database  location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM> below.  <EM>TERMCAP</EM>
-       should contain either a terminal description  (with  newlines  stripped
-       out),  or  a file name indicating where the information required by the
+       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
+       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
+       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
+       should  contain  either  a terminal description (with newlines stripped
+       out), or a file name indicating where the information required  by  the
        <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM> can be configured to read terminal type  description  databases
-       in  various locations using different formats.  This variable overrides
+       <EM>ncurses</EM>  can  be configured to read terminal type description databases
+       in various locations using different formats.  This variable  overrides
        the default location.
 
-       <STRONG>o</STRONG>   Descriptions in <EM>terminfo</EM> format are normally stored in a  directory
-           tree  using subdirectories named by the common first letters of the
+       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
+           tree using subdirectories named by the common first letters of  the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
-           name  its  location,  such  as  <EM>/usr/share/terminfo.db</EM>, rather than
+           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
            <EM>/usr/share/terminfo/</EM>.
 
-       The hashed database uses less disk space and is a  little  faster  than
+       The  hashed  database  uses less disk space and is a little faster than
        the directory tree.  However, some applications assume the existence of
        the directory tree, and read it directly rather than using the <EM>terminfo</EM>
        API.
 
-       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  configured with <EM>termcap</EM> support, this variable may
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
            contain the location of a <EM>termcap</EM> file.
 
        <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
@@ -1100,10 +1103,10 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
                   TERMINFO=$(infocmp -0 -Q2 -q)
                   export TERMINFO
 
-           The compiled description is used only  if  it  corresponds  to  the
+           The  compiled  description  is  used  only if it corresponds to the
            terminal type identified by <EM>TERM</EM>.
 
-       Setting  <EM>TERMINFO</EM>  is  the  simplest,  but  not the only, way to direct
+       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
        <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
        <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
@@ -1121,16 +1124,16 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       This  variable  specifies  a  list of locations, akin to <EM>PATH</EM>, in which
-       <EM>ncurses</EM> searches  for  the  terminal  type  descriptions  described  by
-       <EM>TERMINFO</EM>  above.   The  list  items are separated by colons on Unix and
-       semicolons on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a  corresponding
+       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
+       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
+       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
+       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
        feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
        If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
-       <EM>ncurses</EM> checks the contents of <EM>TERMPATH</EM>, a list of locations,  akin  to
+       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
        <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
        list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
@@ -1140,9 +1143,9 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
-       options  given  to the <EM>configure</EM> script when building the library.  Run
-       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
+       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
+       options given to the <EM>configure</EM> script when building the  library.   Run
+       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        <STRONG>--disable-overwrite</STRONG>
@@ -1151,24 +1154,24 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This option is used to avoid file name conflicts  between  <EM>ncurses</EM>
-            and  an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM> is
-            installed disabling overwrite, it  puts  its  header  files  in  a
+            This  option  is used to avoid file name conflicts between <EM>ncurses</EM>
+            and an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM>  is
+            installed  disabling  overwrite,  it  puts  its  header files in a
             subdirectory.  Here is an example.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            Installation  also  omits  a  symbolic  link  that would cause the
-            compiler's <STRONG>-lcurses</STRONG> option  to  link  object  files  with  <EM>ncurses</EM>
+            Installation also omits a  symbolic  link  that  would  cause  the
+            compiler's  <STRONG>-lcurses</STRONG>  option  to  link  object  files with <EM>ncurses</EM>
             instead of the system <EM>curses</EM> library.
 
-            The  directory  used  by this configuration of <EM>ncurses</EM> is shown in
+            The directory used by this configuration of <EM>ncurses</EM>  is  shown  in
             section "SYNOPSIS" above.
 
        <STRONG>--enable-widec</STRONG>
-            The  configure  script   renames   the   library   and   (if   the
-            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
-            different subdirectory.  All of  the  library  names  have  a  "w"
+            The   configure   script   renames   the   library   and  (if  the
+            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
+            different  subdirectory.   All  of  the  library  names have a "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1177,62 +1180,62 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You  must  also  enable  the wide-character features in the header
-            file when compiling for the  wide-character  library  to  use  the
-            extended  (wide-character)  functions.   The  symbol which enables
+            You must also enable the wide-character  features  in  the  header
+            file  when  compiling  for  the  wide-character library to use the
+            extended (wide-character) functions.   The  symbol  which  enables
             these features has changed since X/Open Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
+            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
+            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
                 to 500.
 
-            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
-                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
+            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
+                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
-                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
-                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
+                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
+                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The <EM>curses.h</EM> header file installed for the wide-character  library
-            is  designed  to be compatible with the non-wide library's header.
-            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
+            The  <EM>curses.h</EM> header file installed for the wide-character library
+            is designed to be compatible with the non-wide  library's  header.
+            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character library's headers should be  installed  last,  to  allow
+            character  library's  headers  should  be installed last, to allow
             applications to be built using either library from the same set of
             headers.
 
        <STRONG>--with-pthread</STRONG>
-            The configure script renames the  library.   All  of  the  library
-            names  have  a  "t"  appended  to  them  (before  any "w" added by
+            The  configure  script  renames  the  library.  All of the library
+            names have a "t"  appended  to  them  (before  any  "w"  added  by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to set these values.  Some applications  (very  few)  may  require
+            to  set  these  values.   Some applications (very few) may require
             changes to work with this convention.
 
        <STRONG>--with-shared</STRONG>
        <STRONG>--with-normal</STRONG>
        <STRONG>--with-debug</STRONG>
        <STRONG>--with-profile</STRONG>
-            The  shared  and  normal  (static)  library  names differ by their
-            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+            The shared and normal  (static)  library  names  differ  by  their
+            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
+            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        <STRONG>--with-termlib</STRONG>
-            Low-level functions which do not depend upon whether  the  library
+            Low-level  functions  which do not depend upon whether the library
             supports wide-characters, are provided in the tinfo library.
 
-            By  doing  this, it is possible to share the tinfo library between
-            wide/normal configurations as well  as  reduce  the  size  of  the
+            By doing this, it is possible to share the tinfo  library  between
+            wide/normal  configurations  as  well  as  reduce  the size of the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1252,8 +1255,8 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        <STRONG>--with-trace</STRONG>
-            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
-            is sometimes useful to  configure  this  in  the  shared  library.
+            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
+            is  sometimes  useful  to  configure  this  in the shared library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1267,139 +1270,134 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open Curses permits most functions it specifies to be made  available
+       X/Open  Curses permits most functions it specifies to be made available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
+       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
            another operation), and
 
        <STRONG>o</STRONG>   in a few special cases.
 
-       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
-       redirected  to  something  that  is  not a terminal device, the library
-       writes screen updates to the standard error file descriptor.  This  was
+       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
+       redirected to something that is not  a  terminal  device,  the  library
+       writes  screen updates to the standard error file descriptor.  This was
        an undocumented feature of SVr3 <EM>curses</EM>.
 
-       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
+       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
+       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
        terminals, including <STRONG>xterm(1)</STRONG>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
-       when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
+       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
+       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open   Curses  by  allowing  the  application  programmer  to  define
-       additional key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
+       X/Open  Curses  by  allowing  the  application  programmer  to   define
+       additional  key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
        <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From a user's perspective, the application is  able
-       to  draw colored text on a background whose color is set independently,
+       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
+       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
+       application to reset  the  terminal  to  its  original  foreground  and
+       background  colors.  From a user's perspective, the application is able
+       to draw colored text on a background whose color is set  independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
        An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>WINDOW</EM>  structure
        internals, instead using accessor functions such as <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
+       <EM>ncurses</EM> enables an application  to  direct  its  output  to  a  printer
        attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
-       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that can gather color  information  from  them  when  many  colors  are
+       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
+       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that  can  gather  color  information  from  them  when many colors are
        supported.
 
-       Some  extensions  are available only if <EM>ncurses</EM> permits modification of
-       <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s behavior; see <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.  <EM>ncurses</EM> is  compiled
-       to support them; section "ALTERNATE CONFIGURATIONS" describes how.
-
-       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
+       <EM>ncurses</EM>   permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;    see
        <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
 
-       Rudimentary support for multi-threaded applications may  be  available;
+       Rudimentary  support  for multi-threaded applications may be available;
        see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       Functions  that ease the management of multiple screens can be exposed;
+       Functions that ease the management of multiple screens can be  exposed;
        see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
-       offers  functions  to  more  aggressively  free  memory  it dynamically
+       To  aid  applications  to  debug their memory usage, <EM>ncurses</EM> optionally
+       offers functions  to  more  aggressively  free  memory  it  dynamically
        allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       The library facilitates auditing and troubleshooting of  its  behavior;
+       The  library  facilitates auditing and troubleshooting of its behavior;
        see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
-       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
+       Compiling <EM>ncurses</EM> with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to  fall  back
+       to  reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
        <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
-       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
-       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
+       recommended,  as  it essentially includes an entire <EM>termcap</EM> compiler in
+       the <EM>ncurses</EM> startup code, at a cost in  memory  usage  and  application
        launch latency.
 
-       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
+       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
-       Curses, and supports all features of  its  enhanced  level  except  the
+       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
+       Curses,  and  supports  all  features  of its enhanced level except the
        <STRONG>untic</STRONG> utility.
 
-       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
+       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
+       In  many cases, X/Open Curses is vague about error conditions, omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
-       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
-       is  done  primarily  to  guard  against programmer error.  The standard
+       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
+       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
+       is done primarily to guard  against  programmer  error.   The  standard
        interface does not provide a way for the library to tell an application
-       which  of several possible errors occurred.  An application that relies
-       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
+       which of several possible errors occurred.  An application that  relies
+       on  <EM>ncurses</EM>  to  check  its function parameters for validity limits its
        portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
-       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
+       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
+       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
-       NUL  bytes  to the device.  This method is slightly more expensive, but
-       narrows  the  interface  to   the   Unix   kernel   significantly   and
+       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
+       NUL bytes to the device.  This method is slightly more  expensive,  but
+       narrows   the   interface   to   the   Unix  kernel  significantly  and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
+           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
-       <STRONG>o</STRONG>   Starting  with 4BSD <EM>curses</EM> (1980) all implementations have provided
-           a <EM>curses.h</EM> file.
+       <STRONG>o</STRONG>   The first <EM>curses</EM>, in 4BSD, provided a <EM>curses.h</EM> file.
 
            BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
@@ -1491,7 +1489,7 @@ <H1 class="no-header">ncurses 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-18                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 58ad42d26..791ae717d 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.63 2024/03/16 15:35:01 tom Exp @
+  * @Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>panel 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">panel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">panel 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       panel - panel stack extension for <EM>curses</EM>
+       panel - manage overlapping <EM>curses</EM> windows
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -200,8 +200,8 @@ <H1 class="no-header">panel 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        Except as noted, the <EM>pan</EM> and <EM>window</EM> parameters must  be  non-null.   If
        either is null, an error is returned.
 
-       The  <STRONG>move_panel</STRONG>  function uses <STRONG><A HREF="curs_window.3x.html">mvwin(3x)</A></STRONG>, and returns an error if <STRONG>mvwin</STRONG>
-       returns an error.
+       The  <STRONG>move_panel</STRONG>  function  uses  <STRONG><A HREF="curs_window.3x.html">mvwin(3x)</A></STRONG>,  and  returns  <STRONG>ERR</STRONG> if <STRONG>mvwin</STRONG>
+       returns <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -266,7 +266,7 @@ <H1 class="no-header">panel 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.5                       2024-05-25                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 92c722ef1..36f5ddcaf 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240518).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240525).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/ncurses-intro.html b/doc/html/ncurses-intro.html
index 194850246..d07f6f251 100644
--- a/doc/html/ncurses-intro.html
+++ b/doc/html/ncurses-intro.html
@@ -1,7 +1,7 @@
 <!--
-  $Id: ncurses-intro.html,v 1.57 2022/11/26 19:33:46 tom Exp $
+  $Id: ncurses-intro.html,v 1.58 2024/05/25 22:29:49 tom Exp $
   ****************************************************************************
-  * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+  * Copyright 2019-2022,2024 Thomas E. Dickey                                *
   * Copyright 2000-2013,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -365,9 +365,9 @@ <h3><a name="history" id="history">A Brief History of Curses</a></h3>
   source-code or documentation; the <code>tic</code> and
   <code>infocmp</code> programs are the exceptions.</p>
 
-  <p>System V Release 3 (System III UNIX) from Bell Labs featured a
-  rewritten and much-improved <code>curses</code> library, along
-  with the <code>tic</code> program (late 1986).</p>
+  <p>System V Release 3 from Bell Labs featured a rewritten and
+  much-improved <code>curses</code> library, along with the
+  <code>tic</code> program (late 1986).</p>
 
   <p>To recap, terminfo is based on Berkeley's termcap database,
   but contains a number of improvements and extensions.
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 502425afd..29fd1e4f2 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp $
-.TH curs_add_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp $
+.TH curs_add_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -182,7 +182,7 @@ terms these
 .I "forms-drawing characters."
 The ACS default listed below is used if the
 .B \%acs_chars
-.RB ( \%acsc )
+.RB \%( acsc )
 .I \%term\%info
 capability does not define a terminal-specific replacement for it,
 or if the terminal and locale configuration requires Unicode to access
@@ -190,13 +190,15 @@ these characters but the library is unable to use Unicode.
 The \*(``acsc char\*('' column corresponds to how the characters are
 specified in the
 .B \%acs_chars
-.RB ( \%acsc )
+.RB \%( acsc )
 string capability,
 and the characters in it may appear on the screen if the terminal type's
 database entry incorrectly advertises ACS support.
 The name \*(``ACS\*('' originates in the Alternate Character Set feature
 of the DEC VT100 terminal.
-.PP
+.br
+.ie t .ne 4v
+.el   .ne 5v
 .TS
 Lb Lb Lb Lb Lb
 Lb Lb Lb Lb Lb
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index cfa7bf121..be7c13a26 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp $
-.TH curs_addch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp $
+.TH curs_addch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,7 +167,7 @@ terms these
 .I "forms-drawing characters."
 The ACS default listed below is used if the
 .B \%acs_chars
-.RB ( \%acsc )
+.RB \%( acsc )
 .I \%term\%info
 capability does not define a terminal-specific replacement for it,
 or if the terminal and locale configuration requires Unicode to access
@@ -175,13 +175,15 @@ these characters but the library is unable to use Unicode.
 The \*(``acsc char\*('' column corresponds to how the characters are
 specified in the
 .B \%acs_chars
-.RB ( \%acsc )
+.RB \%( acsc )
 string capability,
 and the characters in it may appear on the screen if the terminal type's
 database entry incorrectly advertises ACS support.
 The name \*(``ACS\*('' originates in the Alternate Character Set feature
 of the DEC VT100 terminal.
-.PP
+.br
+.ie t .ne 4v
+.el   .ne 5v
 .TS
 Lb Lb Lb Lb
 Lb Lb Lb Lb
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 1244001db..35a4122bb 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.45 2024/04/20 19:18:18 tom Exp $
-.TH curs_addstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp $
+.TH curs_addstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,18 +101,23 @@ on success and
 .B ERR
 on failure.
 .PP
-X/Open Curses does not specify any error conditions.
-.I \%ncurses
-returns an error
+In
+.IR \%ncurses ","
+they return
+.B ERR
+if
 .bP
-if the window pointer is
-.BR NULL ,
+.I win
+is
+.BR NULL ","
 .bP
-if the string pointer is
-.BR NULL ,
+.I str
+is
+.BR NULL ","
 or
 .bP
-if an internal \fB\%waddch\fP(3X) call returns an error.
+an internal \fB\%waddch\fP(3X) call returns
+.BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -124,6 +129,7 @@ All of these functions except \fBwaddnstr\fP may be macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
 .SH SEE ALSO
 \fB\%curs_addwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 78d5788eb..b380d5e3f 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.37 2024/04/20 19:18:18 tom Exp $
-.TH curs_addwstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp $
+.TH curs_addwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -113,7 +113,8 @@ on failure.
 .PP
 X/Open Curses does not specify any error conditions.
 .I \%ncurses
-returns an error
+returns
+.B ERR
 .bP
 if the window pointer is
 .BR NULL ,
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 0062129b8..d15995e25 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp $
-.TH curs_attr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp $
+.TH curs_attr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -310,12 +310,16 @@ X/Open Curses does not specify any error conditions.
 .PP
 This implementation
 .bP
-returns an error if the window pointer is null.
+returns
+.B ERR
+if the window pointer is null.
 .bP
-returns an error if the color pair parameter
+returns
+.B ERR
+if the color pair parameter
 for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
 .bP
-does not return an error if either of the parameters of \fBwattr_get\fP
+does not fail if either of the parameters of \fBwattr_get\fP
 used for retrieving attribute or color pair values is \fBNULL\fP.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 2a5e72c14..d8990fb3b 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.49 2024/04/20 21:20:07 tom Exp $
-.TH curs_border 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp $
+.TH curs_border 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,7 +142,8 @@ The SVr4.0 manual says
 but this appears to be an error.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 if the window pointer is null.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 3077da6b4..6e1acdf53 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.36 2024/04/20 21:20:07 tom Exp $
-.TH curs_border_set 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp $
+.TH curs_border_set 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -177,7 +177,9 @@ Upon successful completion, these functions return
 Otherwise, they return
 \fBERR\fP.
 .PP
-Functions using a window parameter return an error if it is null.
+Functions using a window parameter return
+.B ERR
+if it is null.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 0ab006451..66d84582d 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.48 2024/04/20 21:20:07 tom Exp $
-.TH curs_clear 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
+.TH curs_clear 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,7 +96,9 @@ All routines return the integer \fBOK\fP on success and \fBERR\fP on failure.
 X/Open defines no error conditions.
 In this implementation,
 .bP
-functions using a window pointer parameter return an error if it is null
+functions using a window pointer parameter return
+.B ERR
+if it is null
 .bP
 \fBwclrtoeol\fP returns an error
 if the cursor position is about to wrap.
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 7a5a02f27..bf33f6f4a 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.100 2024/04/20 21:24:19 tom Exp $
-.TH curs_color 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp $
+.TH curs_color 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -455,7 +455,9 @@ Specific functions make additional checks:
 .RS 3
 .TP 5
 \fB\%init_color\fP
-returns an error if the terminal does not support
+returns
+.B ERR
+if the terminal does not support
 this feature, e.g., if the \fB\%initialize_color\fP capability is absent
 from the terminal description.
 .TP 5
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 32ae541ab..9722a3e64 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.48 2024/04/20 19:18:18 tom Exp $
-.TH curs_get_wstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
+.TH curs_get_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -137,7 +137,8 @@ If unsuccessful, they return \fBERR\fP.
 X/Open defines no error conditions.
 .PP
 In this implementation,
-these functions return an error
+these functions return
+.B ERR
 .bP
 if the window pointer is null,
 .bP
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 5969ce1f1..6e6a91380 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp $
-.TH curs_getch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp $
+.TH curs_getch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -161,7 +161,7 @@ To
 .IR curses ","
 key strokes not from the alphabetic section of the keyboard
 (those corresponding to the ECMA-6 character set\(emsee
-\fIascii\fP(7)\(emoptionally modified by either the control or shift
+\fI\%ascii\fP(7)\(emoptionally modified by either the control or shift
 keys)
 are treated as
 .I function
@@ -548,11 +548,11 @@ with \fB\%echo\fP(3X) and neither \fB\%cbreak\fP(3X) nor \fB\%raw\fP(3X)
 is not well-defined.
 .PP
 Historically,
-the list of key code macros above was influenced by the
-function-key-rich keyboard of the AT&T 7300
+the list of key code macros above was influenced by the keyboard of the
+AT&T 7300
 (also known variously as the \*(``3B1\*('', \*(``Safari 4\*('', and
 \*(``UNIX PC\*(''),
-a 1985 machine.
+a 1985 machine rich in function keys.
 Today's computer keyboards are based that of the IBM PC/AT and tend to
 have fewer.
 A
@@ -597,7 +597,8 @@ with ESC typed by the user;
 see
 \fB\%curs_variables\fP(3X).
 .PP
-\fB\%has_key\fP was designed for
+.B \%has_key
+was designed for
 .IR \%ncurses ","
 and is not found in SVr4
 .IR curses ","
@@ -613,14 +614,9 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
+Except as noted in section \*(``EXTENSIONS\*('' above,
 X/Open Curses,
-Issue 4 describes
-\fB\%getch\fP,
-\fB\%wgetch\fP,
-\fB\%mvgetch\fP,
-\fB\%mvwgetch\fP,
-and
-\fB\%ungetch\fP.
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 .B \%wgetch
@@ -682,6 +678,14 @@ NetBSD
 had added them along with
 .BR \%KEY_MOUSE "."
 .SH SEE ALSO
+ECMA-6 \*(``7-bit coded Character Set\*(''
+\%<https://\*:ecma\-international\*:.org/\
+\*:publications\-and\-standards/\*:standards/\*:ecma\-6/>
+.PP
+ECMA-48 \*(``Control Functions for Coded Character Sets\*(''
+\%<https://\*:ecma\-international\*:.org/\
+\*:publications\-and\-standards/\*:standards/\*:ecma\-48/>
+.PP
 \fB\%curs_get_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
@@ -697,11 +701,3 @@ library in its wide-character configuration
 \fB\%curs_variables\fP(3X),
 \fB\%resizeterm\fP(3X),
 \fB\%ascii\fP(7)
-.PP
-ECMA-6 \*(``7-bit coded Character Set\*(''
-\%<https://\*:ecma\-international\*:.org/\
-\*:publications\-and\-standards/\*:standards/\*:ecma\-6/>
-.PP
-ECMA-48 \*(``Control Functions for Coded Character Sets\*(''
-\%<https://\*:ecma\-international\*:.org/\
-\*:publications\-and\-standards/\*:standards/\*:ecma\-48/>
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index bb8131c86..9e9334ca1 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp $
-.TH curs_getstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp $
+.TH curs_getstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,7 +135,8 @@ If unsuccessful, they return \fBERR\fP.
 X/Open defines no error conditions.
 .PP
 In this implementation,
-these functions return an error
+these functions return
+.B ERR
 .bP
 if the window pointer is null,
 .bP
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 53c984647..0b821c94a 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.39 2024/04/20 21:24:19 tom Exp $
-.TH curs_in_wchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp $
+.TH curs_in_wchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,7 +89,8 @@ Otherwise, they return
 \fBERR\fP.
 .PP
 X/Open Curses defines no error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 786ab2f7a..e2025374b 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp $
-.TH curs_inch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp $
+.TH curs_inch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,7 +101,7 @@ and
 .B \%mvwinch
 may be implemented as macros.
 .PP
-These functions do not return an error if the window contains cells of
+These functions do not fail if the window contains cells of
 .I curses
 complex characters;
 that is,
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index bcd5d6855..a9903e880 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp $
-.TH curs_inchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp $
+.TH curs_inchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -88,7 +88,8 @@ other than \fBERR\fP upon successful completion (the number of characters
 retrieved, exclusive of the trailing 0).
 .PP
 X/Open Curses defines no error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 0f460af14..29e5425d9 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.69 2024/04/20 21:24:19 tom Exp $
-.TH curs_initscr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp $
+.TH curs_initscr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -155,18 +155,23 @@ Routines that return pointers always return \fBNULL\fP on error.
 X/Open defines no error conditions.
 In this implementation
 .bP
-\fBendwin\fP returns an error if
+\fBendwin\fP returns
+.B ERR
+if
 .RS
 .bP
 the terminal was not initialized, or
 .bP
 \fBendwin\fP is called more than once without updating the screen, or
 .bP
-\fBreset_shell_mode\fP(3X) returns an error.
+\fBreset_shell_mode\fP(3X) return
+.BR ERR "."
 .RE
 .bP
 \fBnewterm\fP
-returns an error if it cannot allocate the data structures for the screen,
+returns
+.B ERR
+if it cannot allocate the data structures for the screen,
 or for the top-level windows within the screen,
 i.e.,
 \fBcurscr\fP, \fBnewscr\fP, or \fBstdscr\fP.
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 63db4967e..e915023b5 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.66 2024/04/13 22:20:29 tom Exp $
-.TH curs_inopts 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp $
+.TH curs_inopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,6 +40,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%cbreak\fP,
 \fB\%echo\fP,
@@ -75,24 +80,24 @@ get and set \fIcurses\fR terminal input options
 \fBint echo(void);
 \fBint noecho(void);
 .PP
-\fBint intrflush(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint keypad(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint meta(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint nodelay(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint notimeout(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint intrflush(WINDOW * \fIwin\fP \fI/* ignored */\fP, bool \fIbf\fP);
+\fBint keypad(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint meta(WINDOW * \fIwin\fP \fI/* ignored */\fP, bool \fIbf\fP);
+\fBint nodelay(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint notimeout(WINDOW * \fIwin\fP, bool \fIbf\fP);
 .PP
 \fBint nl(void);
 \fBint nonl(void);
 .PP
-\fBint raw(void);
-\fBint noraw(void);
-.PP
 \fBvoid qiflush(void);
 \fBvoid noqiflush(void);
 .PP
+\fBint raw(void);
+\fBint noraw(void);
+.PP
 \fBint halfdelay(int \fItenths\fP);
 \fBvoid timeout(int \fIdelay\fP);
-\fBvoid wtimeout(WINDOW *\fIwin\fP, int \fIdelay\fP);
+\fBvoid wtimeout(WINDOW * \fIwin\fP, int \fIdelay\fP);
 .PP
 \fBint typeahead(int \fIfd\fP);
 .PP
@@ -103,287 +108,472 @@ get and set \fIcurses\fR terminal input options
 \fBint is_raw(void);
 .fi
 .SH DESCRIPTION
-.I \%ncurses
-provides several functions that let an application change the way input
-from the terminal is handled.
+.I curses
+offers configurable parameters permitting an application to control the
+handling of input from the terminal.
 Some are global,
-applying to all windows.
-Others apply only to a specific window.
-Window-specific settings are not automatically applied to new or derived
-windows.
-An application must apply these to each window if the same behavior is
-desired.
+applying to all windows;
+others apply only to a specific window.
+The library does not automatically apply such parameters to new or
+derived windows;
+an application must configure each window for the desired behavior.
+.PP
+Some descriptions below make reference to an
+.IR "input character reading function" ":"
+this is \fB\%wgetch\fP(3X) in the non-wide character
+.I curses
+API and \fB\%wget_wch\fP(3X) in the wide character API.
+In addition to the variant forms of these described in
+\fB\%ncurses\fP(3X),
+the
+.I curses
+functions \fB\%wgetstr\fP(3X) and \fB\%wget_wstr\fP(3X) and their own
+variants call the appropriate input character reading function.
 .\"
 .SS "cbreak, nocbreak"
 Normally,
-the terminal driver buffers typed characters until a newline or carriage
-return is typed.
-The \fB\%cbreak\fP routine disables line buffering and
-erase/kill character-processing
-(interrupt and flow control characters are unaffected),
-making characters typed by the user immediately available to the
+the terminal driver buffers typed characters,
+not delivering them to an application
+until a line feed or carriage return is typed.
+.B \%cbreak
+configures the terminal in
+.IR "cbreak mode" ","
+which disables line buffering
+and erase and kill character processing
+(the interrupt,
+quit,
+suspend,
+and flow control characters are unaffected)
+and makes characters typed by the user immediately available to the
 program.
-The \fB\%nocbreak\fP routine returns the terminal to normal (cooked)
-mode.
+.B \%nocbreak
+returns the terminal to normal (\*(``cooked\*('') mode.
 .PP
-Initially the terminal may or may not be in \fB\%cbreak\fP mode,
-as the mode is inherited;
+The state of the terminal is unknown to a
+.I curses
+application when it starts;
 therefore,
-a program should call \fB\%cbreak\fP or \fB\%nocbreak\fP explicitly.
+a program should call
+.B \%cbreak
+or
+.B \%nocbreak
+explicitly.
 Most interactive programs using
 .I curses
-set the \fB\%cbreak\fP mode.
-Note that \fB\%cbreak\fP overrides \fBraw\fP.
-[See \fB\%curs_getch\fP(3X) for a discussion of how these routines
-interact with \fBecho\fP and \fB\%noecho\fP.]
+set \%cbreak
+mode.
+Calling
+.B \%cbreak
+overrides
+.BR raw "."
+The man page for the input character reading function
+discusses how
+.B \%cbreak
+and
+.B \%nocbreak
+interact with
+.B echo
+and
+.BR \%noecho "."
 .\"
 .SS "echo, noecho"
-The \fBecho\fP and \fB\%noecho\fP routines control whether characters
-typed by the user are echoed by \fB\%getch\fP(3X) as they are typed.
-Echoing by the terminal driver is always disabled,
-but initially \fB\%getch\fP 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,
+.B echo
+and
+.B \%noecho
+determine whether characters typed by the user are written to the
+.I curses
+window by the input character reading function as they are typed.
+.I curses
+always disables the terminal driver's own echoing.
+By default,
+a
+.I curses
+window has its echo flag set.
+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 \fB\%noecho\fP.
-[See \fB\%curs_getch\fP(3X) for a
-discussion of how these routines interact with \fB\%cbreak\fP and
-\fB\%nocbreak\fP.]
+so they call
+.BR \%noecho "."
+The man page for the input character reading function
+discusses how
+.B echo
+and
+.B \%noecho
+interact with
+.B \%cbreak
+and
+.BR \%nocbreak "."
 .\"
 .SS halfdelay
-The \fB\%halfdelay\fP routine is used for half-delay mode,
-which is similar to \fB\%cbreak\fP mode in that characters typed by the
-user are immediately available to the program.
+.B \%halfdelay
+configures
+.IR "half-delay mode" ","
+which is similar to \%cbreak mode in that characters typed by the user
+are immediately available to the program.
 However,
-after blocking for \fItenths\fP tenths of seconds,
-\fBERR\fP is returned if nothing has been typed.
-The value of \fItenths\fP must be a number between 1 and 255.
-Use \fB\%nocbreak\fP to leave half-delay mode.
+after blocking for
+.I tenths
+tenths of seconds,
+an input character reading function returns
+.B ERR
+if no input is pending.
+The value of
+.I tenths
+must be between 1 and 255.
+Use
+.B \%nocbreak
+to leave half-delay mode.
 .\"
 .SS intrflush
-If the \fB\%intrflush\fP option is enabled
-.RI ( bf
+.B \%intrflush
+calls
+.B \%qiflush
+(see below)
+if
+.I bf
 is
-.BR TRUE ),
-and an interrupt key is pressed on the keyboard
-(interrupt,
-break,
-quit),
-all output in the terminal driver queue is flushed,
-giving the effect of faster response to the interrupt,
-but causing
-.I curses
-to have the wrong idea of what is on the screen.
-Disabling the option
-.RI ( bf
+.BR TRUE ","
+and
+.B \%noqiflush
+if
+.I bf
 is
-.BR FALSE ),
-prevents the flush.
-The default for the option is inherited from the terminal driver
-settings.
-The
+.BR FALSE "."
+It ignores its
 .I win
-argument is ignored.
+argument.
 .\"
 .SS keypad
-The \fB\%keypad\fP option enables the keypad of the user's terminal.
+.B keypad
+enables recognition of a terminal's function keys.
 If
 enabled
 .RI ( bf
 is
 .BR TRUE ),
-the user can press a function key
-(such as an arrow key)
-and \fB\%wgetch\fP(3X) returns a single value representing the function
-key,
-as in \fB\%KEY_LEFT\fP.
+the input character reading function returns a value representing
+the function key,
+such as
+.BR KEY_LEFT "."
+(Wide-character API users:
+\fB\%wget_wch\fP(3X) returns
+.B \%KEY_CODE_YES
+to indicate the availability of a function key code in its
+.I wch
+parameter.)
 If disabled
-(\fIbf\fP is \fBFALSE\fP),
+.RI ( bf
+is
+.BR FALSE ),
 .I 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
+escape sequences itself.
+If the terminal's keypad 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
-\fB\%wgetch\fP(3X) is called.
-The default value for keypad is \fBFALSE\fP.
+.B \%keypad
+configures it consistently with the
+.I bf
+parameter.
+By default,
+a window's keypad mode is off.
 .\"
 .SS meta
 Initially,
-whether the terminal returns 7 or 8 significant bits on input depends on
-the control mode of the terminal driver [see \fI\%termios\fP(3)].
+whether the terminal returns 7- or 8-bit character codes on input
+depends on the configuration of the terminal driver;
+see \fI\%termios\fP(3).
 To force 8 bits to be returned,
-invoke
-\fBmeta\fP(\fIwin\fP, \fBTRUE\fP);
+call
+.BR meta( .\|.\|. ,
+.BR TRUE) ;
 this is equivalent,
-under POSIX,
+on POSIX systems,
 to setting the CS8 flag on the terminal.
 To force 7 bits to be returned,
-invoke
-\fBmeta\fP(\fIwin\fP, \fBFALSE\fP);
+call
+.BR meta( .\|.\|. ,
+.BR FALSE) ;
 this is equivalent,
-under POSIX,
+on POSIX systems,
 to setting the CS7 flag on the terminal.
 The window argument,
 .IR win ,
 is always ignored.
-If the terminfo capabilities
-\fBsmm\fP (meta_on) and
-\fBrmm\fP (meta_off) are defined for the terminal,
-\fBsmm\fP is sent to the terminal when
-\fBmeta\fP(\fIwin\fP, \fBTRUE\fP)
-is called and \fBrmm\fP is sent when
-\fBmeta\fP(\fIwin\fP, \fBFALSE\fP) is called.
+If the
+.I \%term\%info
+string capabilities
+.B \%meta_on
+.RB ( smm )
+and
+.B \%meta_off
+.RB ( rmm )
+are defined for the terminal type,
+enabling meta mode sends
+.B smm
+to the terminal and disabling it sends
+.B rmm
+to the terminal.
 .\"
 .SS "nl, nonl"
-The \fBnl\fP and \fBnonl\fP routines control whether the underlying
-display device translates the return key into newline on input.
+Initially,
+whether the terminal reports a carriage return
+using the character code for a line feed
+depends on the configuration of the terminal driver;
+see \fI\%termios\fP(3).
+.B nl
+configures the terminal to perform this translation.
+.B nonl
+disables it.
 .\"
 .SS nodelay
-The \fB\%nodelay\fP option causes \fB\%getch\fP to be a non-blocking
-call.
+.B \%nodelay
+configures the input character reading function to be non-blocking for
+window
+.IR "win" .
 If no input is ready,
-\fB\%getch\fP returns \fBERR\fP.
+the reading function returns
+.BR ERR "."
 If disabled
 .RI ( bf
 is
 .BR FALSE ),
-\fB\%getch\fP waits until a key is pressed.
+the reading function does not return until it has input.
 .SS notimeout
-When interpreting an escape sequence,
-\fB\%wgetch\fP(3X) sets a timer
-while waiting for the next character.
-If
-\fB\%notimeout(\fIwin\fR, \fBTRUE\fP)
-is called,
-then \fB\%wgetch\fP does not set a timer.
+When the input character reading function reads an ESC character,
+it sets a timer while waiting for the next character.
+.BI \%notimeout( win ,
+.B TRUE)
+disables this timer.
 The purpose of the timeout is to distinguish sequences produced by a
 function key from those typed by a user.
+To configure the timeout rather than disabling it,
+see
+.B \%wtimeout
+below.
+.\"
+.SS "qiflush, noqiflush"
+.\"
+.B \%qiflush
+and
+.B \%noqiflush
+configure the terminal driver's treatment of its input and output queues
+when it handles the interrupt,
+suspend,
+or quit characters in
+.I \%cbreak
+and \*(``cooked\*('' modes;
+on POSIX systems,
+see \fI\%termios\fP(3).
+The default behavior is inherited from the terminal driver settings.
+Calling
+.B \%qiflush
+configures the terminal to flush the queues when any of these events
+occurs,
+giving the impression of faster response to user input,
+but making the library's model of the screen contents incorrect.
+Calling
+.B \%noqiflush
+prevents such flushing,
+but might frustrate impatient users on slow connections if a
+.I curses
+update of the screen is in progress when the event occurs;
+see
+.B \%typeahead
+below for a mitigation of this problem.
+You may want to call
+.B \%noqiflush
+in a signal handler
+if you want output to continue
+after the handler exits
+as though the interrupt had not occurred.
 .\"
 .SS "raw, noraw"
-The \fBraw\fP and \fB\%noraw\fP routines place the terminal into or out
-of raw mode.
-Raw mode is similar to \fB\%cbreak\fP mode,
-in that characters typed are immediately passed through to the user
-program.
-The differences are that in raw mode,
-the interrupt,
+.B raw
+configures the terminal to read input in
+.IR "raw mode" ,
+which is similar to cbreak mode
+(see
+.B \%cbreak
+above)
+except that it furthermore passes through the terminal's configured
+interrupt,
 quit,
 suspend,
-and flow control characters are all
-passed through uninterpreted,
-instead of generating a signal.
-The behavior of the BREAK key depends on other bits in the terminal
-driver that are not set by
-.IR curses .
-.\"
-.SS "qiflush, nqiflush"
-When the \fB\%noqiflush\fP routine is used,
-normal flush of input and output queues associated with the \fBINTR\fP,
-\fBQUIT\fP and \fBSUSP\fP characters will not be done
-[see \fB\%termios\fP(3)].
-When
-\fB\%qiflush\fP is called,
-the queues will be flushed when these control characters are read.
-You may want to call \fB\%noqiflush\fP in a signal handler if you want
-output to continue as though the interrupt had not occurred,
-after the handler exits.
+and flow control characters
+uninterpreted to the application,
+instead of generating a signal or acting on I/O flow.
+The behavior of the terminal's \*(``Break\*('' key
+(if any)
+depends on terminal driver configuration parameters that
+.I curses
+does not handle.
+.B \%noraw
+exits raw mode.
 .\"
 .SS "timeout, wtimeout"
-The \fB\%timeout\fP and \fB\%wtimeout\fP routines set blocking or
-non-blocking read for a given window.
-If \fIdelay\fP is negative,
-a blocking read is used
-(i.e.,
-waits indefinitely for input).
-If \fIdelay\fP is zero,
-then a non-blocking read is used
-(i.e.,
-.I read
-returns \fBERR\fP if no input is waiting).
+.B \%wtimeout
+configures whether a
+.I curses
+input character reading function called on window
+.I win
+uses blocking or non-blocking reads.
 If
-\fIdelay\fP is positive,
-then
-.I read
-blocks for \fIdelay\fP milliseconds,
-and returns \fBERR\fP if there is still no input.
-Hence,
-these routines provide the same functionality as \fB\%nodelay\fP,
-plus the additional capability of being able to block for only
-\fIdelay\fP milliseconds
-(where \fIdelay\fP is positive).
+.I delay
+is negative,
+a blocking read is used,
+waiting indefinitely for input.
+If
+.I delay
+is zero,
+a non-blocking read is used;
+an input character reading function returns
+.B ERR
+if no input is pending.
+If
+.I delay
+is positive,
+an input character reading function
+blocks for
+.I delay
+milliseconds,
+and returns
+.B ERR
+if the delay elapses and there is still no input pending.
+.B \%timeout
+calls
+.B \%wtimeout
+on
+.BR stdscr "."
 .\"
 .SS typeahead
-.I curses
-does \*(``line-breakout optimization\*('' by looking for typeahead
-periodically while updating the screen.
-If input is found,
-and it is coming from a terminal,
-the current update is postponed until
-\fB\%refresh\fP(3X) or \fB\%doupdate\fP is called again.
-This allows faster response to commands typed in advance.
 Normally,
-the input
+a
+.I curses
+library checks the terminal for input while updating the screen.
+If any is found,
+the update is postponed until the next \fB\%wrefresh\fP(3X) or
+\fB\%doupdate\fP(3X) call,
+allowing faster response to user key strokes.
+The library tests the file descriptor corresponding to the
 .I FILE
-pointer passed to \fB\%newterm\fP,
-or \fBstdin\fP in the case that \fB\%initscr\fP was used,
-will be used to do this typeahead checking.
-The \fB\%typeahead\fP routine specifies that the file descriptor
-\fIfd\fP is to be used to check for typeahead instead.
-If \fIfd\fP is
-\-1,
-then no typeahead checking is done.
+stream pointer passed to \fB\%newterm\fP(3X)
+(or
+.I stdin
+if \fB\%initscr\fP(3X) was called),
+for pending input.
+.B \%typeahead
+instructs
+.I curses
+to test file descriptor
+.I fd
+instead.
+An
+.I fd
+of
+.B \-1
+disables the check.
 .\"
 .SH RETURN VALUE
-All routines that return an integer return \fBERR\fP upon failure and
-\fBOK\fP
-(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
-upon successful completion,
-unless otherwise noted in the preceding routine descriptions.
+.B \%timeout
+and
+.B \%wtimeout
+return no value.
+.PP
+.BR \%cbreak ","
+.BR \%nocbreak ","
+.BR \%echo ","
+.BR \%noecho ","
+.BR \%halfdelay ","
+.BR \%intrflush ","
+.BR \%keypad ","
+.BR \%meta ","
+.BR \%nodelay ","
+.BR \%notimeout ","
+.BR \%nl ","
+.BR \%nonl ","
+.BR \%raw ","
+.BR \%noraw ","
+and
+.B \%typeahead
+return
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ","
+the functions in the previous paragraph return
+.B ERR
+if
+.bP
+the terminal is not initialized or
+.bP
+.I win
+is
+.B NULL
+(except for
+.B \%intrflush
+and
+.BR meta ","
+which ignore its value).
+.PP
+Further,
+.B \%halfdelay
+returns
+.B ERR
+if
+.I delay
+is outside the range 1..255.
 .PP
-X/Open Curses does not specify any error conditions.
-In this implementation,
-functions with a window parameter will return an error if it is null.
-Any function will also return an error if the terminal was not
-initialized.
-Also,
-.RS 3
-.TP 5
-\fB\%halfdelay\fP
-returns an error
-if its parameter is outside the range 1..255.
-.RE
+See section \*(``EXTENSIONS\*('' below for the
+return values of
+.BR is_cbreak ","
+.BR is_echo ","
+.BR is_nl ","
+and
+.BR is_raw "."
 .SH NOTES
-\fBecho\fP,
-\fB\%noecho\fP,
-\fB\%halfdelay\fP,
-\fB\%intrflush\fP,
-\fBmeta\fP,
-\fBnl\fP,
-\fBnonl\fP,
-\fB\%nodelay\fP,
-\fB\%notimeout\fP,
-\fB\%noqiflush\fP,
-\fB\%qiflush\fP,
-\fB\%timeout\fP,
+.BR echo ","
+.BR \%noecho ","
+.BR \%halfdelay ","
+.BR \%intrflush ","
+.BR meta ","
+.BR nl ","
+.BR nonl ","
+.BR \%nodelay ","
+.BR \%notimeout ","
+.BR \%noqiflush ","
+.BR \%qiflush ","
+.BR \%timeout ","
 and
-\fB\%wtimeout\fP
+.B \%wtimeout
 may be implemented as macros.
 .PP
-\fB\%noraw\fP and \fB\%nocbreak\fP follow historical practice in that
-they attempt to restore normal (\*(``cooked\*('') mode
-from raw and cbreak modes respectively.
-Mixing \fBraw\fP/\fB\%noraw\fP and \fB\%cbreak\fP/\fB\%nocbreak\fP calls
-leads to terminal driver control states that are hard to predict or
-understand;
+.B \%noraw
+and
+.B \%nocbreak
+follow historical practice in that they attempt to restore normal
+(\*(``cooked\*('') mode from raw and cbreak modes,
+respectively.
+Mixing
+.BR raw / \%noraw
+calls with
+.BR cbreak / \%nocbreak
+calls leads to terminal driver control states that are hard to predict
+or understand;
 doing so is not recommended.
 .SH EXTENSIONS
 .I \%ncurses
-provides four \*(``is_\*('' functions that may be used to detect if the
-corresponding flags were set or reset.
+provides four \*(``is_\*('' functions corresponding to
+.BR \%cbreak ","
+.BR echo ","
+.BR nl ","
+and
+.BR raw ","
+permitting their states to be queried by the application.
 .PP
 .TS
 center;
@@ -399,26 +589,16 @@ is_raw	raw	noraw
 .PP
 In each case,
 the function returns
-.TP 4 \" "-1" + 2n
-1
+.TP 5 \" "-1" + 2n tag separation + 1n fudge for typesetters like grops
+.B 1
 if the flag is set,
 .TP
-0
+.B 0
 if the flag is reset,
 or
 .TP
-\-1
+.B \-1
 if the library is not initialized.
-.PP
-They were designed for
-\fB\%ncurses\fP(3X),
-and are not found in SVr4
-.IR curses ,
-4.4BSD
-.IR curses ,
-or any other previous
-.I curses
-implementation.
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
@@ -427,33 +607,52 @@ extensions should condition their use on the visibility of the
 preprocessor macro.
 .PP
 Except as noted in section \*(``EXTENSIONS\*('' above,
-X/Open Curses, Issue 4, Version 2 describes these functions.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
 .PP
 .I \%ncurses
 follows X/Open Curses
-and the historical practice of AT&T
-.I curses
-implementations,
-in that the echo bit is cleared when
-.I curses
-initializes the terminal state.
+and the historical practice of System\ V
+.IR curses ","
+clearing the terminal driver's \*(``echo\*('' flag when initializing the
+screen.
 BSD
 .I curses
-differed from this slightly;
-it left the echo bit on at initialization,
-but the BSD \fBraw\fP call turned it off as a side effect.
+did not,
+but its
+.I raw
+function turned it off as a side effect.
+.\" SGTTY's sg_flags had a "RAW" symbol; termio in SVr1 for the PDP-11
+.\" did not.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/include/curses.h
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysv-pdp11_man/a_man/man7/termio.7
 For best portability,
-set \fBecho\fP or \fB\%noecho\fP explicitly just after initialization,
-even if your program remains in cooked mode.
+call
+.B echo
+or
+.B \%noecho
+explicitly just after initialization,
+even if your program remains in normal (\*(``cooked\*('') mode.
 .PP
-X/Open Curses is ambiguous regarding whether \fBraw\fP should disable
-the CR/LF translations controlled by \fBnl\fP and \fBnonl\fP.
+X/Open Curses is ambiguous regarding whether
+.I raw
+should disable the carriage return and line feed translation feature
+controlled by
+.I nl
+and
+.IR \%nonl "."
 BSD
 .I curses
 did turn off these translations;
-AT&T
+System\ V
 .I curses
-(at least as late as SVr1)
 did not.
 .I \%ncurses
 does so,
@@ -462,65 +661,123 @@ on the assumption that a programmer requesting raw input wants a clean
 8-bit clean)
 connection that the operating system will not alter.
 .PP
-When \fB\%keypad\fP is first enabled,
+When
+.B \%keypad
+is first enabled,
 .I \%ncurses
 loads the key definitions for the current terminal description.
 If the terminal description includes extended string capabilities,
-e.g.,
-from using the
+for example,
+by using the
 .B \-x
-option of \fB\%@TIC@\fP,
+option of \fB\%@TIC@\fP(1),
 then
 .I \%ncurses
 also defines keys for the capabilities whose names begin with
 \*(``k\*(''.
-The corresponding keycodes are generated and
+Corresponding key codes are generated and
 (depending on previous loads of terminal descriptions)
 may differ from one execution of a program to the next.
 The generated keycodes are recognized by the \fB\%keyname\fP(3X)
 function
-(which will then return a name beginning with \*(``k\*('' denoting the
-terminfo capability name rather than \*(``K\*('',
+(which then returns a name beginning with \*(``k\*('' denoting the
+.I \%term\%info
+capability name rather than \*(``K\*('',
 used for
 .I curses
 key names).
 On the other hand,
-an application can use \fB\%define_key\fP(3X) 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 \fB\%tigetstr\fP,
+an application can use \fB\%define_key\fP(3X) to bind
+a specific key to a string of the programmer's choice.
+This feature enables an application to check for an extended
+capability's presence with \fB\%tigetstr\fP(3X),
 and reassign the keycode to match its own needs.
 .PP
-Low-level applications can use \fB\%tigetstr\fP to obtain the definition
-of any particular string capability.
-Higher-level applications which use the
+Low-level applications can use \fB\%tigetstr\fP(3X) to obtain the
+definition of any string capability.
 .I curses
-\fB\%wgetch\fP and similar functions to return keycodes rely upon the
-order in which the strings are loaded.
-If more than one key definition has the same string value,
-then \fB\%wgetch\fP can return only one keycode.
+applications use the input character reading function
+to obtain key codes from input
+and rely upon the order in which the string capabilities are loaded.
+Multiple key capability strings can have the same value,
+but the input character reading function can report only one key code.
 Most
 .I curses
 implementations
 (including
 .IR \%ncurses )
 load key definitions in the order
-defined by the array of string capability names.
-The last key to be loaded determines the keycode which will be returned.
+they appear in the
+.B \%strfnames
+array of string capability names;
+see \fB\%term_variables\fP(3X).
+.\" ncurses/tinfo/parse_entry.c:lookup_fullname, I think --GBR
+The last capability read using a particular definition determines the
+key code to be reported.
 In
 .IR \%ncurses ,
-you may also have extended capabilities interpreted as key definitions.
+extended capabilities can be interpreted as key definitions.
 These are loaded after the predefined keys,
-and if a capability's value is the same as a previously-loaded
+and if a capability's value is the same as a previously loaded
 key definition,
 the later definition is the one used.
 .SH HISTORY
+4BSD
+.I curses
+(1980)
+introduced
+.IR echo ","
+.IR \%noecho ","
+.IR nl ","
+.IR \%nonl ","
+.IR raw ","
+and
+.IR \%noraw "." \" also crmod and nocrmod, never standardized
+.PP
+SVr2 (1984) featured a new terminal driver,
+extending the
+.I curses
+API to support it with
+.IR \%cbreak ","
+.IR \%nocbreak ","
+.IR \%intrflush ","
+.IR \%keypad ","
+.IR \%meta ","
+.IR \%nodelay ","
+and
+.IR \%typeahead "."
+.PP
+SVr3 (1987)
+added
+.IR \%halfdelay ","
+.IR \%notimeout ","
+and
+.IR \%wtimeout "."
+.I \%qiflush
+and
+.I \%noqiflush
+appeared in SVr3.1 (1987),
+at which point
+.I \%intrflush
+became a wrapper for either of these functions,
+depending on the value of its Boolean argument.
+SVr3.1 also added
+.IR \%timeout "."
+.PP
+.I \%ncurses
+6.5 (2024) introduced
+.IR is_cbreak ","
+.IR is_echo ","
+.IR is_nl ","
+and
+.IR is_raw "."
+.PP
 Formerly,
 .I \%ncurses
 used
-.B \%nl
+.I \%nl
 and
-.B \%nonl
+.I \%nonl
 to control the conversion of newlines to carriage return/line feed
 on output as well as input.
 X/Open Curses documents the use of these functions only for input.
@@ -536,14 +793,14 @@ to
 (the POSIX terminal API).
 In the former,
 both input and output were controlled via a single option
-.BR \%CRMOD ,
+\*(``CRMOD\*('',
 while the latter separates these features.
 Because that conversion interferes with output optimization,
 .I \%ncurses
 6.2 (2020) amended
-.B \%nl
+.I \%nl
 and
-.B \%nonl
+.I \%nonl
 to eliminate their effect on output.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
@@ -551,4 +808,5 @@ to eliminate their effect on output.
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_util\fP(3X),
 \fB\%define_key\fP(3X),
+\fB\%term_variables\fP(3X),
 \fB\%termios\fP(3)
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 90b03f64f..cb1b8f9e0 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.30 2024/04/20 19:18:18 tom Exp $
-.TH curs_ins_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp $
+.TH curs_ins_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,17 +81,17 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-A terminal's
-.B \%insert_character
-.RB ( ich1 )
-capability
-is not necessarily employed.
-.PP
 \fB\%ins_wch\fP,
 \fB\%mvins_wch\fP,
 and
 \fB\%mvwins_wch\fP
 may be implemented as macros.
+.PP
+A terminal's
+.B \%insert_character
+.RB ( ich1 )
+capability
+is not necessarily employed.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 4ebd3ace2..76194443a 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp $
-.TH curs_ins_wstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp $
+.TH curs_ins_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -90,13 +90,15 @@ Special characters are handled as in \fBwadd_wch\fP(3X).
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
 if the \fIwstr\fP parameter is null or
 .bP
-if the \fBwins_wch\fP function returns an error.
+if the \fBwins_wch\fP function returns
+.BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 888d42500..1a2a0efec 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.51 2024/04/20 21:20:07 tom Exp $
-.TH curs_insstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
+.TH curs_insstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,13 +89,15 @@ Special characters are handled as in \fBwaddch\fP(3X).
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
 if the \fIstr\fP parameter is null or
 .bP
-the \fBwinsch\fP(3X) function returns an error.
+the \fBwinsch\fP(3X) function returns
+.BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 5b6e4b760..ec115efd8 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.51 2024/04/20 21:24:19 tom Exp $
-.TH curs_instr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
+.TH curs_instr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -83,7 +83,8 @@ All of the functions return \fBERR\fP upon failure,
 or the number of characters actually read into the string.
 .PP
 X/Open Curses defines no error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index eec361d77..9bafe85db 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.41 2024/04/20 21:20:07 tom Exp $
-.TH curs_inwstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp $
+.TH curs_inwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -91,7 +91,8 @@ routines return the
 number of characters read into the string.
 .PP
 X/Open defines no error conditions.
-This implementation returns an error
+This implementation returns
+.B ERR
 .bP
 if the \fIwin\fP parameter is null or
 .bP
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index e85c13276..8c4119de6 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.61 2024/04/20 21:24:19 tom Exp $
-.TH curs_kernel 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp $
+.TH curs_kernel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,9 +53,10 @@
 \fB\%savetty\fP,
 \fB\%getsyx\fP,
 \fB\%setsyx\fP,
-\fB\%ripoffline\fP,
 \fB\%curs_set\fP,
-\fB\%napms\fP \-
+\fB\%mvcur\fP,
+\fB\%napms\fP,
+\fB\%ripoffline\fP \-
 low-level \fIcurses\fR routines
 .SH SYNOPSIS
 .nf
@@ -73,9 +74,10 @@ low-level \fIcurses\fR routines
 \fBvoid getsyx(int \fIy\fP, int \fIx\fP);
 \fBvoid setsyx(int \fIy\fP, int \fIx\fP);
 .PP
-\fBint ripoffline(int \fIline\fP, int (*\fIinit\fP)(WINDOW *, int));
 \fBint curs_set(int \fIvisibility\fP);
+\fBint mvcur(int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
 \fBint napms(int \fIms\fP);
+\fBint ripoffline(int \fIline\fP, int (*\fIinit\fP)(WINDOW *, int));
 .fi
 .SH DESCRIPTION
 The following routines give low-level access
@@ -131,6 +133,55 @@ at the beginning, do its manipulation of its own windows, do a
 .PP
 Few applications will use this feature,
 most use \fBwmove\fP instead.
+.SS curs_set
+The \fBcurs_set\fP routine sets the cursor state to invisible,
+normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
+\fB1\fP, or \fB2\fP respectively.
+If the terminal supports the \fIvisibility\fP requested,
+the previous \fIcursor\fP state is returned;
+otherwise, \fBERR\fP is returned.
+.SS mvcur
+.B \%mvcur
+provides low-level cursor motion.
+It takes effect immediately,
+rather than at the next refresh.
+Unlike the other low-level output functions,
+which either write to the standard output stream
+or are passed a function pointer to perform output,
+.B \%mvcur
+uses a file descriptor derived from the output stream parameter of
+\fB\%newterm\fP(3X).
+.PP
+One application of
+.B \%mvcur
+accompanies the temporary use of another program to write to the
+terminal screen.
+For example,
+first call \fB\%refresh\fP(3X) to ensure that the screen and the
+library's model of it is up to date;
+then call
+.BR \%reset_shell_mode ";"
+write to the screen with the external application;
+call
+.BR \%reset_prog_mode ";"
+and finally call
+.B \%mvcur
+to set the cursor's location to where
+.I \%curses
+thinks it is,
+since the library has no knowledge of how the external application
+moved it.
+.\" https://lists.gnu.org/archive/html/bug-ncurses/2016-10/msg00002.html
+.SS napms
+.B \%napms
+sleeps for
+.I ms
+milliseconds.
+If
+.I ms
+exceeds 30,000
+(thirty seconds),
+it is capped at that value.
 .SS ripoffline
 .B \%ripoffline
 provides access to the same facility that \fB\%slk_init\fP(3X) uses to
@@ -158,23 +209,6 @@ It is allowable to call \fBwnoutrefresh\fP during the initialization routine.
 .PP
 \fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
 \fBnewterm\fP.
-.SS curs_set
-The \fBcurs_set\fP routine sets the cursor state to invisible,
-normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
-\fB1\fP, or \fB2\fP respectively.
-If the terminal supports the \fIvisibility\fP requested,
-the previous \fIcursor\fP state is returned;
-otherwise, \fBERR\fP is returned.
-.SS napms
-.B \%napms
-sleeps for
-.I ms
-milliseconds.
-If
-.I ms
-exceeds 30,000
-(thirty seconds),
-it is capped at that value.
 .SH RETURN VALUE
 Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
 .PP
@@ -186,12 +220,15 @@ X/Open defines no error conditions.
 In this implementation
 .TP 5
 \fBdef_prog_mode\fP, \fBdef_shell_mode\fP, \fBreset_prog_mode\fP, \fBreset_shell_mode\fP
-return an error
+return
+.B ERR
 if the terminal was not initialized, or
 if the I/O call to obtain the terminal settings fails.
 .TP 5
 \fBripoffline\fP
-returns an error if the maximum number of ripped-off lines
+returns
+.B ERR
+if the maximum number of ripped-off lines
 exceeds the maximum (5).
 .SH NOTES
 Note that \fBgetsyx\fP is a macro, so \fB&\fP is not necessary before
@@ -208,6 +245,23 @@ has been called to make the cursor other than normal, i.e., either
 invisible or very visible.
 There is no way for \fI\%ncurses\fP to determine the initial cursor
 state to restore that.
+.SH EXTENSIONS
+In
+.IR \%ncurses ","
+.B \%mvcur
+accepts
+.B \-1
+for either or both old coordinates.
+This value tells
+.I \%ncurses
+that the old location is unknown,
+and that it must use only absolute motion,
+as with the
+.B \%cursor_address
+.RB ( cup )
+capability,
+rather than the least costly combination of absolute and relative
+motion.
 .SH PORTABILITY
 The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
 are not described in X/Open Curses, Issue 4.
@@ -218,6 +272,31 @@ as having return type int.
 This is misleading, as they are macros with no documented semantics
 for the return value.
 .PP
+X/Open Curses notes:
+.RS
+.PP
+\*(``After use of
+.IR \%mvcur "(),"
+the model Curses maintains of the state of the terminal might not
+match the actual state of the terminal.
+An application should touch and refresh the window before
+resuming conventional use of Curses.\*(''
+.RE
+.PP
+Both
+.I \%ncurses
+and SVr4
+.I curses
+implement
+.B \%mvcur
+using the
+.I SCREEN
+data allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
+X/Open Curses states that the old location must be given for
+.B \%mvcur
+to accommodate terminals that lack absolute cursor positioning.
+.\" X/Open Curses Issue 7, p. 161
+.PP
 If interrupted, \fI\%ncurses\fP restarts \fBnapms\fP.
 That, and the limitation to 30 seconds,
 are different from other implementations.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 24be01b85..91831a63c 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
-.TH curs_legacy 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp $
+.TH curs_legacy 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -107,24 +107,6 @@ data as \fB\%getparyx\fP.
 Except as noted,
 these functions return an integer,
 or \fBERR\fP if the window parameter is null.
-.SH NOTES
-All of these interfaces are implemented as macros and functions.
-The macros are suppressed
-(and only the functions provided)
-in an \*(``opaque\*(''
-.I \%ncurses
-build,
-which defines the preprocessor symbol
-.BR \%NCURSES_OPAQUE .
-See section \*(``ALTERNATE CONFIGURATIONS\*('' in \fB\%ncurses\fP(3X).
-.PP
-The standard forms such as \fB\%getyx\fP
-.I must
-be implemented as macros,
-and
-(in this implementation)
-are defined in terms of the functions described here,
-to avoid reliance on internal details of the \fI\%WINDOW\fP structure.
 .SH PORTABILITY
 These functions were supported on Version 7, BSD or System V implementations.
 None of those implementations checked the window parameter.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index ffb97f2e8..41622522f 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp $
-.TH curs_mouse 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp $
+.TH curs_mouse 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -286,7 +286,9 @@ a mouse event was detected that does not match the mask,
 .bP
 or if no more events remain in the queue.
 .PP
-\fB\%ungetmouse\fP returns an error if the event queue is full.
+\fB\%ungetmouse\fP returns
+.B ERR
+if the event queue is full.
 .PP
 \fB\%mousemask\fP
 returns the mask of reportable events.
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 8904d2ee5..414d9d08a 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp $
-.TH curs_outopts 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp $
+.TH curs_outopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -148,10 +148,14 @@ X/Open Curses does not specify any error conditions.
 In this implementation,
 .bP
 those functions that have a window pointer
-will return an error if the window pointer is null
+will return
+.B ERR
+if the window pointer is null
 .bP
 \fBwsetscrreg\fP
-returns an error if the scrolling region limits extend outside the
+returns
+.B ERR
+if the scrolling region limits extend outside the
 window boundaries.
 .SH NOTES
 Note that
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index 2d4eb729b..c4400637f 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.43 2024/04/20 21:20:07 tom Exp $
-.TH curs_overlay 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp $
+.TH curs_overlay 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -82,7 +82,8 @@ upon successful completion.
 X/Open defines no error conditions.
 In this implementation,
 \fBcopywin\fP,
-\fBoverlay\fP and \fBoverwrite\fP return an error
+\fBoverlay\fP and \fBoverwrite\fP return
+.B ERR
 if either of the window pointers are null, or
 if some part of the window would be placed off-screen.
 .SH NOTES
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 21cc405c7..f42968bdc 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.61 2024/04/27 17:55:43 tom Exp $
-.TH curs_pad 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp $
+.TH curs_pad 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -182,21 +182,26 @@ In this implementation
 .RS 3
 .TP 5
 \fB\%prefresh\fP and \fB\%pnoutrefresh\fP
-return an error
+return
+.B ERR
 if the window pointer is null, or
 if the window is not really a pad or
 if the area to refresh extends off-screen or
 if the minimum coordinates are greater than the maximum.
 .TP 5
 \fBpechochar\fP
-returns an error
+returns
+.B ERR
 if the window is not really a pad, and the associated call
-to \fB\%wechochar\fP returns an error.
+to \fB\%wechochar\fP returns
+.BR ERR "."
 .TP 5
 \fBpecho_wchar\fP
-returns an error
+returns
+.B ERR
 if the window is not really a pad, and the associated call
-to \fB\%wecho_wchar\fP returns an error.
+to \fB\%wecho_wchar\fP returns
+.BR ERR "."
 .RE
 .SH NOTES
 \fB\%pechochar\fP may be a macro.
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index ac81d1e63..a189ab3e5 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.46 2024/04/20 21:20:07 tom Exp $
-.TH curs_refresh 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp $
+.TH curs_refresh 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -138,13 +138,16 @@ In this implementation
 .RS 3
 .TP 5
 \fBwnoutrefresh\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null, or
 if the window is really a pad.
 .TP 5
 \fBwredrawln\fP
-returns an error
-if the associated call to \fBtouchln\fP returns an error.
+return
+.B ERR
+if the associated call to \fBtouchln\fP returns
+.BR ERR "."
 .RE
 .SH NOTES
 Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 16d5a5010..6dee97c50 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.43 2024/04/20 18:54:36 tom Exp $
-.TH curs_scroll 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp $
+.TH curs_scroll 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,18 +48,19 @@
 \fB\%scroll\fP,
 \fB\%scrl\fP,
 \fB\%wscrl\fP \-
-scroll a \fIcurses\fR window
+scroll a \fIcurses\fP window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint scroll(WINDOW *\fIwin\fP);
+\fBint scroll(WINDOW * \fIwin\fP);
 .PP
 \fBint scrl(int \fIn\fP);
-\fBint wscrl(WINDOW *\fIwin\fP, int \fIn\fP);
+\fBint wscrl(WINDOW * \fIwin\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-\fBscroll\fP scrolls the given window up one line.
+.B scroll
+scrolls the given window up one line.
 That is,
 every visible line we might number
 .I i
@@ -73,18 +74,29 @@ if the scrolling region of the window is the entire screen,
 the physical screen may be scrolled at the same time;
 see \fB\%curscr\fP(3X).
 .PP
-\fB\%scrl\fP and \fB\%wscrl\fP scroll
+.B \%scrl
+and
+.B \%wscrl
+scroll
 .B \%stdscr
 or the specified window up or down depending on the sign of
-.IR n .
+.IR n "."
 .bP
 For positive
-.IR n ,
-line \fIi\fP+\fIn\fP becomes \fIi\fP (scrolling up);
+.IR n ","
+line
+.IR i + n
+becomes
+.I i
+(scrolling up);
 .bP
 for negative
-.IR n ,
-line \fIi\fP-\fIn\fP becomes \fIi\fP (scrolling down).
+.IR n ","
+line
+.IR i \- n
+becomes
+.I i
+(scrolling down).
 .PP
 The cursor does not move.
 These functions perform no operation unless scrolling is enabled for the
@@ -97,26 +109,39 @@ upon failure and
 upon success.
 .PP
 .I \%ncurses
-returns \fBERR\fP if scrolling is not enabled in the window,
+returns
+.B ERR
+if scrolling is not enabled in the window,
 for example with \fB\%scrollok\fP(3X),
 or if the
 .I \%WINDOW
 pointer is null.
 .SH NOTES
-Unusually,
-there is no \fB\%wscroll\fP function;
-\fBscroll\fP behaves as one would expect \fB\%wscroll\fP to,
-accepting a \fI\%WINDOW\fP pointer argument.
+.B \%scrl
+and
+.B \%wscrl
+may be implemented as macros.
 .PP
-\fB\%scrl\fP and \fB\%scroll\fP may be implemented as macros.
+Unusually,
+there is no
+.B \%wscroll
+function;
+.B scroll
+behaves as one would expect
+.B \%wscroll
+to,
+accepting a
+.I \%WINDOW
+pointer argument.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
 It defines no error conditions.
 .PP
 SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('' as a successful return
-value.
+\*(``an integer value other than
+.BR ERR \*(''
+as a successful return value.
 .PP
 SVr4 indicates that the optimization of physically scrolling immediately
 if the scroll region is the entire screen \*(``is\*('' performed,
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index fbc718115..1866064a6 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.71 2024/04/20 18:54:36 tom Exp $
-.TH curs_slk 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp $
+.TH curs_slk 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -228,32 +228,38 @@ In this implementation
 returns the attribute used for the soft keys.
 .TP 5
 \fBslk_attroff\fP, \fBslk_attron\fP, \fBslk_clear\fP, \fBslk_noutrefresh\fP, \fBslk_refresh\fP, \fBslk_touch\fP
-return an error
+return
+.B ERR
 if the terminal or the softkeys were not initialized.
 .TP 5
 \fBslk_attrset\fP
-returns an error
+returns
+.B ERR
 if the terminal or the softkeys were not initialized.
 .TP 5
 \fBslk_attr_set\fP
-returns an error
+returns
+.B ERR
 if the terminal or the softkeys were not initialized, or
 the color pair is outside the range 0..\fBCOLOR_PAIRS\fP\-1.
 .TP 5
 \fBslk_color\fP
-returns an error
+returns
+.B ERR
 if the terminal or the softkeys were not initialized, or
 the color pair is outside the range 0..\fBCOLOR_PAIRS\fP\-1.
 .TP 5
 \fBslk_init\fP
-returns an error
+returns
+.B ERR
 if the format parameter is outside the range 0..3.
 .TP 5
 \fBslk_label\fP
 returns \fBNULL\fP on error.
 .TP 5
 \fBslk_set\fP
-returns an error
+returns
+.B ERR
 if the terminal or the softkeys were not initialized, or
 the \fIlabnum\fP parameter is outside the range of label counts, or
 if the format parameter is outside the range 0..2, or if
@@ -332,7 +338,8 @@ Finally, if there is no \fBfln\fP capability,
 If \fB\%slk_start\fP is given a non-null \fIgp\fP,
 it copies the \fIng\fP elements of the group of soft-keys, up to 16.
 .IP
-If there are more than 16 elements, \fB\%slk_start\fP returns an error.
+If there are more than 16 elements, \fB\%slk_start\fP returns
+.BR ERR "."
 .bP
 The format codes \fB2\fP and \fB3\fP for \fB\%slk_init\fP
 were added by \fI\%ncurses\fP in 1996.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 10d1fa78b..580f29d89 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.136 2024/04/14 00:14:40 tom Exp $
-.TH curs_terminfo 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp $
+.TH curs_terminfo 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,7 +48,6 @@
 .
 .SH NAME
 \fB\%del_curterm\fP,
-\fB\%mvcur\fP,
 \fB\%putp\fP,
 \fB\%restartterm\fP,
 \fB\%set_curterm\fP,
@@ -100,8 +99,6 @@
 \fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP, int (*\fIputc\fP)(int));
 \fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
 .PP
-\fBint mvcur(int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
-.PP
 \fBint tigetflag(const char *\fIcap-code\fP);
 \fBint tigetnum(const char *\fIcap-code\fP);
 \fBchar *tigetstr(const char *\fIcap-code\fP);
@@ -463,17 +460,9 @@ The
 parameter must be a
 .I \%term\%info
 string variable or the return value of
-\fB\%tparm\fP,
-\fB\%tiparm\fP,
-\fB\%tgetstr\fP,
-or \fB\%tgoto\fP.
-.IP
-The \fB\%tgetstr\fP and \fB\%tgoto\fP functions are part of the
-.I termcap
-interface,
-which happens to share these function names with the
-.I \%term\%info
-API.
+.B \%tparm
+or
+.BR \%tiparm "."
 .bP
 .I affcnt
 is the number of lines affected,
@@ -548,21 +537,11 @@ argument for future use,
 saying that applications must provide a null pointer for that argument;
 but see section \*(``EXTENSIONS\*('' below.
 .PP
-\fB\%mvcur\fP provides low-level cursor motion.
-It takes effect immediately
-(rather than at the next refresh).
-Unlike the other low-level output functions,
-which either write to the standard output or pass an output function
-parameter,
-\fB\%mvcur\fP uses an output file descriptor derived from
-the output stream parameter of \fB\%newterm\fP(3X).
-.PP
-While \fB\%putp\fP and \fB\%mvcur\fP are low-level functions that do not
-use high-level
+While \fB\%putp\fP is a low-level function that does not use high-level
 .I curses
 state,
 .I \%ncurses
-declares them in
+declares it in
 .I \%curses.h
 because System\ V did this
 (see section \*(``HISTORY\*('' below).
@@ -696,7 +675,8 @@ calls \fB\%tputs\fP,
 returning the same error codes.
 .TP 5
 .B restartterm
-fails if the associated call to \fB\%setupterm\fP returns an error.
+fails if the associated call to \fB\%setupterm\fP returns
+.BR ERR "."
 .TP 5
 .B setupterm
 fails if it cannot allocate enough memory,
@@ -908,7 +888,9 @@ capabilities use string parameters
 the ones used for programmable function keys).
 .IP
 The \fI\%ncurses\fP library checks usage of these capabilities,
-and returns an error if the capability mishandles string parameters.
+and returns
+.B ERR
+if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
 places for the \fB\%tparm\fP calls.
 .IP
@@ -959,45 +941,6 @@ or
 from \fB\%tputs\fP.
 It instead returns the length of the string,
 and does no error checking.
-.PP
-X/Open Curses notes that after calling \fB\%mvcur\fP,
-the
-.I curses
-state may not match the actual terminal state,
-and that an application should touch and refresh the window before
-resuming normal
-.I curses
-calls.
-Both
-.I \%ncurses
-and SVr4
-.I curses
-implement \fB\%mvcur\fP using the
-.I SCREEN
-data allocated in either \fB\%initscr\fP or \fB\%newterm\fP.
-So though it is documented as a
-.I \%term\%info
-function,
-\fB\%mvcur\fP is really a
-.I curses
-function that is not well specified.
-.PP
-X/Open Curses states that the old location must be given for
-\fB\%mvcur\fP to accommodate terminals that lack absolute cursor
-positioning.
-.\" X/Open Curses Issue 7, p. 161
-.I \%ncurses
-allows the caller to use \-1 for either or both old coordinates.
-The \-1 tells
-.I \%ncurses
-that the old location is unknown,
-and that it must use only absolute motion,
-as with the
-.B \%cursor_address
-.RB ( cup )
-capability,
-rather than the least costly combination of absolute and relative
-motion.
 .\" ********************************************************************
 .SH HISTORY
 SVr2 (1984) introduced the
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 613b69582..ca90dce59 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.47 2024/04/20 21:20:07 tom Exp $
-.TH curs_touch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp $
+.TH curs_touch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -86,7 +86,8 @@ In this implementation
 .RS 3
 .TP 5
 \fBis_linetouched\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null, or
 if the line number is outside the window boundaries.
 .IP
@@ -101,7 +102,8 @@ the \fBERR\fP is provided by a macro named \fB\%is_linetouched\fP.
 The actual function returns \fBFALSE\fP when it detects an error.
 .TP 5
 \fBwtouchln\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null, or
 if the line number is outside the window boundaries.
 .RE
diff --git a/man/curs_util.3x b/man/curs_util.3x
index ac92fa8af..3cb3fa726 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp $
-.TH curs_util 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp $
+.TH curs_util 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -292,10 +292,15 @@ In this implementation
 .RS 3
 .TP 5
 \fBflushinp\fP
-returns an error if the terminal was not initialized.
+returns
+.B ERR
+if the terminal was not initialized.
 .TP 5
 \fBputwin\fP
-returns an error if the associated \fBfwrite\fP calls return an error.
+returns
+.B ERR
+if the associated \fBfwrite\fP calls return
+.BR ERR "."
 .RE
 .SH PORTABILITY
 .SS filter
diff --git a/man/curs_window.3x b/man/curs_window.3x
index d3d55c751..149db81e9 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,12 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.48 2024/04/20 21:20:07 tom Exp $
-.TH curs_window 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
-.de bP
-.ie n  .IP \(bu 4
-.el    .IP \(bu 2
-..
+.\" $Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp $
+.TH curs_window 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%newwin\fP,
 \fB\%delwin\fP,
@@ -173,28 +169,36 @@ X/Open defines no error conditions.
 In this implementation
 .TP 5
 \fBdelwin\fP
-returns an error if the window pointer is null, or
+returns
+.B ERR
+if the window pointer is null, or
 if the window is the parent of another window.
 .TP 5
 \fBderwin\fP
-returns an error if the parent window pointer is null, or
+returns
+.B ERR
+if the parent window pointer is null, or
 if any of its ordinates or dimensions is negative, or
 if the resulting window does not fit inside the parent window.
 .TP 5
 \fBdupwin\fP
-returns an error if the window pointer is null.
+returns
+.B ERR
+if the window pointer is null.
 .IP
 This implementation also maintains a list of windows,
 and checks that the pointer passed to \fBdelwin\fP is one that
 it created, returning an error if it was not..
 .TP 5
 \fBmvderwin\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null, or
 if some part of the window would be placed off-screen.
 .TP 5
 \fBmvwin\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null, or
 if the window is really a pad, or
 if some part of the window would be placed off-screen.
@@ -204,11 +208,14 @@ will fail if either of its beginning ordinates is negative, or
 if either the number of lines or columns is negative.
 .TP 5
 \fBsyncok\fP
-returns an error
+returns
+.B ERR
 if the window pointer is null.
 .TP 5
 \fBsubwin\fP
-returns an error if the parent window pointer is null, or
+returns
+.B ERR
+if the parent window pointer is null, or
 if any of its ordinates or dimensions is negative, or
 if the resulting window does not fit inside the parent window.
 .PP
@@ -224,44 +231,53 @@ Note that \fBsyncok\fP may be a macro.
 .SH PORTABILITY
 X/Open Curses, Issue 4 describes these functions.
 .PP
-X/Open Curses states regarding \fBdelwin\fP:
-.bP
-It must delete subwindows before deleting their parent.
-.bP
-If \fBdelwin\fP is asked to delete a parent window,
-it can only succeed if the curses library keeps a list of the subwindows.
-SVr4 curses kept a count of the number of subwindows rather than a list.
-It simply returned \fBERR\fP when asked to delete a subwindow.
-Solaris X/Open curses does not even make that check,
-and will delete a parent window which still has subwindows.
-.bP
-Since release 4.0 (1996),
-\fI\%ncurses\fP maintains a list of windows for each screen,
-to ensure that a window has no subwindows before allowing deletion.
-.bP
-NetBSD copied this feature of \fI\%ncurses\fP in 2003.
-.br
-PDCurses follows the scheme used in Solaris X/Open curses.
-.SH BUGS
-The subwindow functions
-\fB\%subwin\fP,
-\fB\%derwin\fP,
-\fB\%mvderwin\fP,
-\fB\%wsyncup\fP,
-\fB\%wsyncdown\fP,
-\fB\%wcursyncup\fP,
-and
-\fB\%syncok\fP
-are flaky,
-incompletely implemented,
-and not well tested.
+Regarding
+.IR \%delwin ","
+X/Open Curses states that
+.RS
+.PP
+[t]he application must delete subwindows before deleting the main
+window.
+.RE
+.PP
+If
+.I \%delwin
+is asked to delete a parent window,
+it can succeed only if the
+.I curses
+library keeps a list of its subwindows.
+SVr4
+.I curses
+kept a count of the number of subwindows rather than a list.
+It simply returned
+.B ERR
+when asked to delete a subwindow.
+Solaris X/Open
+.I curses
+.RI ( \%xcurses )
+does not make even that check,
+and will delete a parent window that still has subwindows.
+.I \%PDCurses
+also behaves this way.
 .PP
-System\ V's \fIcurses\fP documentation is unclear about what
-\fB\%wsyncup\fP and \fB\%wsyncdown\fP actually do.
+.I \%ncurses
+4.0 (1996) and later maintains a list of windows for each screen
+to ensure that a window has no subwindows before allowing its deletion.
+NetBSD
+.I curses
+has followed suit since 2003.
+.PP
+SVr4
+.I curses
+documentation is unclear about what
+.I \%wsyncup
+and
+.I \%wsyncdown
+actually do.
 It seems to imply that they are supposed to touch only those lines that
 are affected by changes to a window's ancestors.
-The language here,
-and behavior of \fI\%ncurses\fP,
+The description and behavior of these functions in
+.I \%ncurses
 is patterned on the X/Open Curses standard;
 this approach may result in slower updates.
 .SH SEE ALSO
diff --git a/man/define_key.3x b/man/define_key.3x
index 52086b654..6937d6203 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp $
-.TH define_key 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp $
+.TH define_key 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -72,13 +72,14 @@ A
 .I definition
 of
 .B NULL
-removes any existing one
+removes any existing binding from
 .IR key-code "."
 Similarly,
 a non-positive
 .I key-code
-removes any existing bindings for
-.IR definition "."
+removes an existing binding for
+.IR definition ","
+if any.
 .SH RETURN VALUE
 .B \%define_key
 returns
diff --git a/man/form.3x b/man/form.3x
index 2f8f88486..b17e41f7c 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.54 2024/03/16 15:35:01 tom Exp $
-.TH form 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp $
+.TH form 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,7 +47,7 @@
 ..
 .SH NAME
 \fBform\fP \-
-curses extension for programming forms
+present user-fillable forms in \fIcurses\fP windows
 .SH SYNOPSIS
 .nf
 \fB#include <form.h>
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 60efbdd23..6198b02cc 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.74 2024/05/11 20:30:32 tom Exp $
+# $Id: man_db.renames.in,v 1.75 2024/05/25 20:26:02 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -279,8 +279,10 @@ wdelch.3x			wdelch.3ncurses
 wecho_wchar.3x			wecho_wchar.3ncurses
 wechochar.3x			wechochar.3ncurses
 wget_wch.3x			wget_wch.3ncurses
+wget_wstr.3x			wget_wstr.3ncurses
 wgetch.3x			wgetch.3ncurses
 wgetstr.3x			wgetstr.3ncurses
+win_wch.3x			win_wch.3ncurses
 winch.3x			winch.3ncurses
 wins_wch.3x			wins_wch.3ncurses
 winsch.3x			winsch.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 4b64fbebe..7122bd4a9 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.36 2024/05/11 21:52:17 tom Exp $
+# $Id: manhtml.aliases,v 1.37 2024/05/25 22:40:43 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -125,6 +125,7 @@ wdelch(3X)		curs_delch(3X)
 wecho_wchar(3X)		curs_add_wch(3X)
 wechochar(3X)		curs_addch(3X)
 wget_wch(3X)		curs_get_wch(3X)
+wget_wstr(3X)		curs_get_wstr(3X)
 wgetch(3X)		curs_getch(3X)
 wgetstr(3X)		curs_getstr(3X)
 win_wch(3X)		curs_in_wch(3X)
diff --git a/man/menu.3x b/man/menu.3x
index a833c3b55..99d5c1e6a 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
-.TH menu 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp $
+.TH menu 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,7 +47,7 @@
 ..
 .SH NAME
 \fBmenu\fP \-
-curses extension for programming menus
+present menus in \fIcurses\fP windows
 .SH SYNOPSIS
 .nf
 \fB#include <menu.h>
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 7f005e5cc..4e904df81 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp $
-.TH ncurses 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp $
+.TH ncurses 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -213,11 +213,11 @@ initscr(); cbreak(); noecho();
 .EE
 .RE
 .PP
-Most applications perform further setup as follows.
+Most applications would perform further setup as follows.
 .PP
 .RS 4
 .EX
-intrflush(stdscr, FALSE);
+noqiflush();
 keypad(stdscr, TRUE);
 .EE
 .RE
@@ -301,9 +301,9 @@ contents need not be completely displayed.
 See \fB\%curs_pad\fP(3X).
 .PP
 Many terminals support configuration of character cell foreground and
-background colors as well as rendering
+background colors as well as
 .IR attributes ","
-which cause characters to show up in such modes as
+which cause characters to render in such modes as
 boldfaced,
 underlined,
 or in reverse video.
@@ -331,9 +331,9 @@ and function keys,
 appears as a control character or a multibyte
 .I "escape sequence."
 .I curses
-translates the latter into unique
+can translate the latter into unique
 .I "key codes."
-See \fB\%getch\fP(3X).
+See \fB\%keypad\fP(3X) and \fB\%getch\fP(3X).
 .PP
 .I \%ncurses
 provides reimplementations of the SVr4 \fBpanel\fP(3X), \fBform\fP(3X),
@@ -1140,6 +1140,8 @@ The
 and
 .I \%LINES
 variables may be specified independently.
+.I \%ncurses
+enforces an upper limit of 512 on each when reading the value.
 This property is useful to circumvent misfeatures of legacy terminal
 type descriptions;
 \fI\%xterm\fP(1) descriptions specifying 65 lines were once notorious.
@@ -1175,7 +1177,11 @@ stores this interval in milliseconds.
 The default value of 1000
 (one second)
 is adequate for most uses.
-This environment variable overrides it.
+This environment variable overrides it;
+.I \%ncurses
+enforces an upper limit of 30,000
+(30 seconds)
+when reading the value.
 .PP
 The most common instance where you may wish to change this value
 is to work with a remote host over a slow communication channel.
@@ -1275,7 +1281,11 @@ has the same effect.
 When
 .I \%ncurses
 is configured to use the GPM interface,
-this variable may list one or more terminal type names
+this variable may list one or more terminal type names,
+delimited by vertical bars
+.RB ( | )
+or colons
+.RB ( : ),
 against which the
 .I TERM
 variable
@@ -1928,14 +1938,6 @@ and \fB\%extended_slk_color\fP(3X) as a form of \fB\%slk_color\fP(3X)
 that can gather color information from them when many colors are
 supported.
 .PP
-Some extensions are available only if
-.I \%ncurses
-permits modification of \fB\%unctrl\fP(3X)'s behavior;
-see \fB\%use_legacy_coding\fP(3X).
-.I \%ncurses
-is compiled to support them;
-section \*(``ALTERNATE CONFIGURATIONS\*('' describes how.
-.PP
 .I \%ncurses
 permits modification of \fB\%unctrl\fP(3X)'s behavior;
 see \fB\%use_legacy_coding\fP(3X).
@@ -2060,10 +2062,10 @@ and
 but does not finish the story.
 A more complete account follows.
 .bP
-Starting with 4BSD
-.I curses
-(1980)
-all implementations have provided a
+The first
+.IR curses ","
+in 4BSD,
+provided a
 .I \%curses.h
 file.
 .IP
diff --git a/man/panel.3x b/man/panel.3x
index c63b43156..41aca0076 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.63 2024/03/16 15:35:01 tom Exp $
-.TH panel 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp $
+.TH panel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,7 +46,7 @@
 ..
 .SH NAME
 panel \-
-panel stack extension for \fIcurses\fP
+manage overlapping \fIcurses\fP windows
 .SH SYNOPSIS
 .nf
 \fB#include <panel.h>
@@ -226,7 +226,10 @@ If either is null,
 an error is returned.
 .PP
 The \fB\%move_panel\fP function uses \fBmvwin\fP(3X),
-and returns an error if \fB\%mvwin\fP returns an error.
+and returns
+.B ERR
+if \fB\%mvwin\fP returns
+.BR ERR "."
 .SH NOTES
 The header file \fI\%panel.h\fP itself includes the header file
 \fI\%curses.h\fP.
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 5d575b8eb..fdd65e3ed 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1143 $
-#	$Date: 2024/03/09 20:01:40 $
+#	$Revision: 1.1144 $
+#	$Date: 2024/05/25 19:34:27 $
 #
 # 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
@@ -3652,13 +3652,63 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
 	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
 
-# iTerm2 3.0.15
+# iTerm2
 #
 # https://iterm2.com/
 # https://github.com/gnachman/iTerm2
 # ~/Library/Preferences/com.googlecode.iterm2.plist
 # "iTerm" stalled in 2009.  A different set of developers began "iTerm2".
 #
+# iTerm2 3.5.0
+#
+# NOTES:
+# with esctest:
+#	365 tests passed, 196 known bugs, 2 tests fail intermittently
+#	the known bugs include several of the cursor-movement tests 
+#	the ED, EL tests include those failing intermittently
+#	DECCOLM, DECERA, DECSED, DECSERA and SPA do not work
+#	most of the DECRPM, DECRQSS reports fail
+# with vttest:
+#	reports primary DA as VT420
+#	VT420 rectangular operations, as well as DECBI/DEVFI work with margins
+#	SRM does not work
+#	DECSED, and SPA do not work
+#	REP and SD work, SL/SR/SU do not work
+# with tack:
+#	status-line does not work
+#
+# The default settings have blinking-text and keypad-application mode disabled.
+# Enabling the latter make it half-working (numlock sends an escape character).
+# About half of the modified function-keys are untestable due to preassigned
+# features.
+#
+# iTerm2 3.5.0 comes with a 4-year-old copy of xterm's terminfo (June 2020),
+# which is modified:
+# + xterm-nrc and xterm+pcfN are removed
+# + the developer made changes to adapt it to the 16-year-old version of
+#   ncurses bundled with MacOS, i.e., changing the mouse protocol to the
+#   legacy X11 format and reducing the number of colors to 32k (in more than
+#   one place).  In the former case, the developer was confused about why that
+#   was necessary.  In the latter, the developer clearly misunderstood how the
+#   tools work.
+# + vt420+lrmm is modified, removing smglr and corrupting mgc (again, developer
+#   confusion).
+# + the developer added a couple of features, misnaming them as "xterm" blocks:
+#   + a copy of kitty+setal renamed to xterm+setulc (and Setulc) is added, but
+#     the feature is first mentioned in iTerm2 changes in May 2020, while
+#     it is first mention in kitty changes in December 2016.
+#   + Smulx is added
+#
+# iTerm2 3.4.0
+#
+# NOTES:
+# with esctest:
+#	293 tests pass, 270 tests fail
+# with tack:
+#	minor improvements which do not alter the terminfo
+#
+# iTerm2 3.0.15
+#
 # NOTES:
 # with vttest:
 #	reports primary DA as VT100 with AVO: \E[?1;2c
@@ -3696,17 +3746,18 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 	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,
-	kEND3=\E[1;9F, kEND4=\E[1;10F, kEND6=\E[1;6F,
-	kEND7=\E[1;13F, kEND8=\E[1;14F, kHOM3=\E[1;9H,
-	kHOM4=\E[1;10H, kHOM6=\E[1;6H, kHOM7=\E[1;13H,
-	kHOM8=\E[1;14H, kLFT3=\E\E[D, kLFT4=\E[1;10D,
-	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=ecma+index,
-	use=xterm+alt+title, use=ecma+italics, use=iterm,
-	use=bracketed+paste,
+	Smulx=\E[4:%p1%dm, kDN3=\E\E[B, kDN4=\E[1;10B,
+	kDN5=\E[1;5B, kDN6=\E[1;6B, kEND3=\E[1;9F,
+	kEND4=\E[1;10F, kEND6=\E[1;6F, kEND7=\E[1;13F,
+	kEND8=\E[1;14F, kHOM3=\E[1;9H, kHOM4=\E[1;10H,
+	kHOM6=\E[1;6H, kHOM7=\E[1;13H, kHOM8=\E[1;14H,
+	kLFT3=\E\E[D, kLFT4=\E[1;10D, 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=ecma+index, use=xterm+alt+title,
+	use=ecma+italics, use=iterm, use=bracketed+paste,
+	use=kitty+setal,
 
 # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
 #
@@ -27510,4 +27561,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ modify xgterm to work around line-drawing bug -TD
 #	+ use CSI 3J in vte-2017 (report by Sven Joachim)
 #
+# 2024-05-25
+#	+ review/update iTerm2 for 3.5.0 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index f001b2241..654b63df0 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.150 2023/09/16 16:39:15 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.151 2024/05/25 23:10:42 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -529,7 +529,7 @@ _nc_reserve_pairs(SCREEN *sp, int want)
     if (sp->_color_pairs == 0) {
 	TYPE_CALLOC(colorpair_t, have, sp->_color_pairs);
     } else if (have > sp->_pair_alloc) {
-#if NCURSES_EXT_COLORS
+#if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS
 	colorpair_t *next;
 
 	if ((next = typeCalloc(colorpair_t, have)) == 0)
@@ -1081,7 +1081,7 @@ _nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc)
 }
 #endif
 
-#if NCURSES_EXT_COLORS
+#if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(init_extended_pair) (NCURSES_SP_DCLx int pair, int f, int b)
 {
diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 49d7e8b8d..055b237d1 100644
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.13 2021/09/24 17:52:01 tom Exp $
+ * $Id: new_pair.h,v 1.14 2024/05/25 23:10:33 tom Exp $
  */
 
 #ifndef NEW_PAIR_H
@@ -113,7 +113,7 @@ colorpair_t;
 #define ValidPair(sp,pair) \
     ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
 
-#if NCURSES_EXT_COLORS
+#if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
 extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
 extern NCURSES_EXPORT(void)     _nc_free_ordered_pairs(SCREEN*);
 extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, colorpair_t*);
diff --git a/ncurses/report_offsets.c b/ncurses/report_offsets.c
index 0f82dcf35..034a789a6 100644
--- a/ncurses/report_offsets.c
+++ b/ncurses/report_offsets.c
@@ -34,7 +34,7 @@
 #define NEW_PAIR_INTERNAL 1
 #include <curses.priv.h>
 
-MODULE_ID("$Id: report_offsets.c,v 1.28 2024/02/24 15:59:09 tom Exp $")
+MODULE_ID("$Id: report_offsets.c,v 1.29 2024/05/25 23:00:26 tom Exp $")
 
 #define show_size(type) \
 	flag = 0; \
@@ -183,7 +183,9 @@ main(void)
     show_REENTR(SCREEN, _ttytype);
     show_SPFUNC(SCREEN, use_tioctl);
     show_WIDECH(SCREEN, _screen_acs_fix);
+#if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
     show_COLORS(SCREEN, _ordered_pairs);
+#endif
     show_TRACES(SCREEN, tracechr_buf);
 
     printf("\n");
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index fda6deada..7a76d92ee 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.30 2024/03/30 15:54:17 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.31 2024/05/25 20:18:20 Branden.Robinson Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -179,10 +179,6 @@ cbreak(void)
 }
 #endif
 
-/*
- * Note:
- * this implementation may be wrong.  See the comment under intrflush().
- */
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0)
 {
@@ -349,11 +345,7 @@ noqiflush(void)
 #endif
 
 /*
- * This call does the same thing as the qiflush()/noqiflush() pair.  We know
- * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand,
- * the match (in the SVr4 man pages) between the language describing NOFLSH in
- * termio(7) and the language describing qiflush()/noqiflush() in
- * curs_inopts(3x) is too exact to be coincidence.
+ * This call does the same thing as the qiflush()/noqiflush() pair.
  */
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index e7aea7bed..ac78f4aac 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240519) unstable; urgency=low
+ncurses6 (6.5+20240525) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index e7aea7bed..ac78f4aac 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240519) unstable; urgency=low
+ncurses6 (6.5+20240525) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 26a2294bf..9f2e0b331 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240519) unstable; urgency=low
+ncurses6 (6.5+20240525) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 May 2024 04:58:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f3253f0d5..2dc4cf49d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.649 2024/05/19 08:58:02 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.650 2024/05/25 10:33:51 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0519"
+!define VERSION_MMDD  "0525"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index babff0386..9b74e3df6 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240519
+Release: 20240525
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 7d51c5c3e..0c59b4d15 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240519
+Release: 20240525
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 25a6955e7..19179901a 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240519
+Release: 20240525
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 7efd051333a7353e847a3d0a8025602a9b899655 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 2 Jun 2024 02:21:13 +0200
Subject: [PATCH 070/106] ncurses-6.5-20240601.patch.gz

---
 Ada95/aclocal.m4                   |  106 +-
 Ada95/configure                    | 1969 ++++++++++++++--------------
 Ada95/package/AdaCurses.spec       |    3 +-
 Ada95/package/debian/rules         |    1 +
 NEWS                               |    7 +-
 VERSION                            |    2 +-
 dist.mk                            |    4 +-
 doc/html/man/curs_add_wch.3x.html  |   90 +-
 doc/html/man/curs_addch.3x.html    |  127 +-
 doc/html/man/curs_addchstr.3x.html |    8 +-
 doc/html/man/curs_addstr.3x.html   |    8 +-
 doc/html/man/curs_addwstr.3x.html  |   21 +-
 doc/html/man/curs_getch.3x.html    |   24 +-
 doc/html/man/curs_getstr.3x.html   |    8 +-
 doc/html/man/curs_inch.3x.html     |    8 +-
 doc/html/man/curs_initscr.3x.html  |   22 +-
 doc/html/man/curs_inopts.3x.html   |   67 +-
 doc/html/man/curs_instr.3x.html    |    8 +-
 doc/html/man/curs_scr_dump.3x.html |   85 +-
 doc/html/man/curs_terminfo.3x.html |    8 +-
 doc/html/man/curs_util.3x.html     |   24 +-
 doc/html/man/curs_window.3x.html   |    8 +-
 doc/html/man/ncurses.3x.html       |   78 +-
 doc/html/man/terminfo.5.html       |    2 +-
 doc/ncurses-intro.doc              |    5 +-
 man/curs_add_wch.3x                |   41 +-
 man/curs_addch.3x                  |   45 +-
 man/curs_addchstr.3x               |    6 +-
 man/curs_addstr.3x                 |    6 +-
 man/curs_addwstr.3x                |   24 +-
 man/curs_getch.3x                  |   29 +-
 man/curs_getstr.3x                 |    6 +-
 man/curs_inch.3x                   |    6 +-
 man/curs_initscr.3x                |   25 +-
 man/curs_inopts.3x                 |   19 +-
 man/curs_instr.3x                  |    6 +-
 man/curs_scr_dump.3x               |  148 ++-
 man/curs_terminfo.3x               |    6 +-
 man/curs_util.3x                   |   10 +-
 man/curs_window.3x                 |    6 +-
 man/ncurses.3x                     |   70 +-
 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/package/debian/rules          |    4 +-
 49 files changed, 1666 insertions(+), 1506 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 3d7c80569..b6d9f27c3 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.212 2024/05/18 19:51:00 tom Exp $
+dnl $Id: aclocal.m4,v 1.216 2024/06/01 21:38:29 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -959,67 +959,6 @@ case "$cf_cv_const_x_string" in
 	;;
 esac
 
-])
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
-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_REQUIRE([AC_PATH_XTRA])
-
-CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
-
-AC_TRY_COMPILE(
-[
-#include <stdlib.h>
-#include <X11/Intrinsic.h>
-],
-[String foo = malloc(1); free((void*)foo)],[
-
-AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
-	AC_TRY_COMPILE(
-		[
-#undef  _CONST_X_STRING
-#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
-#undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
-#include <X11/Intrinsic.h>
-		],[String foo = malloc(1); *foo = 0],[
-			cf_cv_const_x_string=no
-		],[
-			cf_cv_const_x_string=yes
-		])
-])
-
-CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
-
-case "$cf_cv_const_x_string" in
-(no)
-	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
-	;;
-(*)
-	CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING)
-	;;
-esac
-
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -2938,7 +2877,7 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_ADDON version: 6 updated: 2021/01/04 19:33:05
+dnl CF_NCURSES_ADDON version: 7 updated: 2024/06/01 17:37:13
 dnl ----------------
 dnl Configure an ncurses add-on, built outside the ncurses tree.
 AC_DEFUN([CF_NCURSES_ADDON],[
@@ -2946,18 +2885,29 @@ AC_REQUIRE([CF_NCURSES_CONFIG])
 
 AC_PROVIDE([CF_SUBST_NCURSES_VERSION])
 
-AC_MSG_CHECKING(if you want wide-character code)
-AC_ARG_ENABLE(widec,
-	[  --enable-widec          compile with wide-char/UTF-8 code],
-	[with_widec=$enableval],
-	[with_widec=no])
-AC_MSG_RESULT($with_widec)
-if test "$with_widec" = yes ; then
+AC_MSG_CHECKING(for specified curses library type)
+AC_ARG_WITH(screen,
+	[  --with-screen=XXX       use specified curses-libraries],
+	[cf_cv_screen=$withval],
+	[cf_cv_screen=ncurses])
+
+case $cf_cv_screen in
+(curses|curses_*)
+	CF_CURSES_CONFIG
+	;;
+(ncursesw*)
 	CF_UTF8_LIB
-	CF_NCURSES_CONFIG(ncursesw)
-else
-	CF_NCURSES_CONFIG(ncurses)
-fi
+	CF_NCURSES_CONFIG($cf_cv_screen)
+	;;
+(ncurses*)
+	CF_NCURSES_CONFIG($cf_cv_screen)
+	;;
+(*)
+	AC_MSG_ERROR(unexpected screen-value: $cf_cv_screen)
+	;;
+esac
+
+AC_SUBST(cf_cv_screen)
 
 if test "$NCURSES_CONFIG_PKG" != none ; then
 	cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null`
@@ -3026,6 +2976,14 @@ AC_SUBST(cf_cv_builtin_bool)
 AC_SUBST(cf_cv_header_stdbool_h)
 AC_SUBST(cf_cv_type_of_bool)dnl
 
+AC_CACHE_CHECK(if KEY_RESIZE is supported,cf_cv_curses_resizes,[
+	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
+		[int key = KEY_RESIZE; (void)key],
+		cf_cv_curses_resizes=yes,
+		cf_cv_curses_resizes=no)])
+cf_cv_enable_sigwinch=0
+test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+AC_SUBST(cf_cv_enable_sigwinch)
 ])
 dnl ---------------------------------------------------------------------------
 dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58
diff --git a/Ada95/configure b/Ada95/configure
index fa45b3c49..9c86c4ea6 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -721,7 +721,7 @@ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
 Options to Specify the Libraries Built/Used:
   --with-shared           generate shared C-objects (needed for --with-ada-sharedlib)
   --with-curses-dir=DIR   directory in which (n)curses is installed
-  --enable-widec          compile with wide-char/UTF-8 code
+  --with-screen=XXX       use specified curses-libraries
   --with-lib-prefix       override library-prefix
   --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names
   --enable-rpath-link     link sample programs with rpath option
@@ -7029,40 +7029,43 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:7032: checking if you want wide-character code" >&5
-echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+echo "$as_me:7032: checking for specified curses library type" >&5
+echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
 
-# Check whether --enable-widec or --disable-widec was given.
-if test "${enable_widec+set}" = set; then
-  enableval="$enable_widec"
-  with_widec=$enableval
+# Check whether --with-screen or --without-screen was given.
+if test "${with_screen+set}" = set; then
+  withval="$with_screen"
+  cf_cv_screen=$withval
 else
-  with_widec=no
+  cf_cv_screen=ncurses
 fi;
-echo "$as_me:7042: result: $with_widec" >&5
-echo "${ECHO_T}$with_widec" >&6
-if test "$with_widec" = yes ; then
+
+case $cf_cv_screen in
+(curses|curses_*)
+	CF_CURSES_CONFIG
+	;;
+(ncursesw*)
 
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7049: checking for $ac_header" >&5
+echo "$as_me:7052: 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 7055 "configure"
+#line 7058 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7059: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7062: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7065: \$? = $ac_status" >&5
+  echo "$as_me:7068: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7081,7 +7084,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7087: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7091,7 +7094,7 @@ EOF
 fi
 done
 
-echo "$as_me:7094: checking for multibyte character support" >&5
+echo "$as_me:7097: 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
@@ -7099,7 +7102,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7102 "configure"
+#line 7105 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7116,16 +7119,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7122: \$? = $ac_status" >&5
+  echo "$as_me:7125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7128: \$? = $ac_status" >&5
+  echo "$as_me:7131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7137,12 +7140,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7140: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7143: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7145 "configure"
+#line 7148 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7155,16 +7158,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7161: \$? = $ac_status" >&5
+  echo "$as_me:7164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7167: \$? = $ac_status" >&5
+  echo "$as_me:7170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7178,7 +7181,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7181 "configure"
+#line 7184 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7191,16 +7194,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7197: \$? = $ac_status" >&5
+  echo "$as_me:7200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7203: \$? = $ac_status" >&5
+  echo "$as_me:7206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7217,9 +7220,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:7220: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7223: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:7222: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7225: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7310,7 +7313,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7313: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7316: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7318,7 +7321,7 @@ echo "${as_me:-configure}:7313: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7321 "configure"
+#line 7324 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7331,21 +7334,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7337: \$? = $ac_status" >&5
+  echo "$as_me:7340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7343: \$? = $ac_status" >&5
+  echo "$as_me:7346: \$? = $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}:7348: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7351: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7363,7 +7366,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7366: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7369: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7438,13 +7441,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7441: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7444: 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 7447 "configure"
+#line 7450 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7457,21 +7460,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7463: \$? = $ac_status" >&5
+  echo "$as_me:7466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7469: \$? = $ac_status" >&5
+  echo "$as_me:7472: \$? = $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}:7474: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7477: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7513,7 +7516,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7516: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7519: 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
@@ -7551,7 +7554,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7554 "configure"
+#line 7557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7563,16 +7566,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7569: \$? = $ac_status" >&5
+  echo "$as_me:7572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7575: \$? = $ac_status" >&5
+  echo "$as_me:7578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7589,7 +7592,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7592: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7595: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7625,7 +7628,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7628: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7631: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7651,17 +7654,17 @@ LIBS="$cf_add_libs"
 
 fi
 
-cf_ncuconfig_root=ncursesw
+cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7658: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7661: 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:7661: result: yes" >&5
+		echo "$as_me:7664: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7664: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7667: 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
 
@@ -7794,7 +7797,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7797 "configure"
+#line 7800 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7806,37 +7809,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7812: \$? = $ac_status" >&5
+  echo "$as_me:7815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7818: \$? = $ac_status" >&5
+  echo "$as_me:7821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7824 "configure"
+#line 7827 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7834: \$? = $ac_status" >&5
+  echo "$as_me:7837: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7839: \$? = $ac_status" >&5
+  echo "$as_me:7842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8010,7 +8013,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8013 "configure"
+#line 8016 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8022,37 +8025,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8028: \$? = $ac_status" >&5
+  echo "$as_me:8031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8034: \$? = $ac_status" >&5
+  echo "$as_me:8037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8040 "configure"
+#line 8043 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8050: \$? = $ac_status" >&5
+  echo "$as_me:8053: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8055: \$? = $ac_status" >&5
+  echo "$as_me:8058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8069,7 +8072,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8072: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8075: 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"
@@ -8085,7 +8088,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8088: checking for terminfo header" >&5
+echo "$as_me:8091: 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
@@ -8103,7 +8106,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8106 "configure"
+#line 8109 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8118,16 +8121,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8124: \$? = $ac_status" >&5
+  echo "$as_me:8127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8130: \$? = $ac_status" >&5
+  echo "$as_me:8133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8143,7 +8146,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8146: result: $cf_cv_term_header" >&5
+echo "$as_me:8149: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8178,7 +8181,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8181: result: no" >&5
+		echo "$as_me:8184: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8194,7 +8197,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8197: checking for $ac_word" >&5
+echo "$as_me:8200: 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
@@ -8209,7 +8212,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:8212: found $ac_dir/$ac_word" >&5
+echo "$as_me:8215: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8217,10 +8220,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8220: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8223: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8223: result: no" >&5
+  echo "$as_me:8226: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8233,7 +8236,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8236: checking for $ac_word" >&5
+echo "$as_me:8239: 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
@@ -8248,7 +8251,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:8251: found $ac_dir/$ac_word" >&5
+echo "$as_me:8254: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8256,10 +8259,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:8259: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8262: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8262: result: no" >&5
+  echo "$as_me:8265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8416,7 +8419,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8419: checking if we have identified curses headers" >&5
+echo "$as_me:8422: 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
@@ -8424,11 +8427,11 @@ else
 
 cf_cv_ncurses_header=none
 for cf_header in \
-	ncurses.h ncursesw/ncurses.h \
-	curses.h ncursesw/curses.h
+	ncurses.h $cf_cv_screen/ncurses.h \
+	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8431 "configure"
+#line 8434 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8440,16 +8443,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8446: \$? = $ac_status" >&5
+  echo "$as_me:8449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8452: \$? = $ac_status" >&5
+  echo "$as_me:8455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8460,11 +8463,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8463: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8466: 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:8467: error: No curses header-files found" >&5
+	{ { echo "$as_me:8470: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8474,23 +8477,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8477: checking for $ac_header" >&5
+echo "$as_me:8480: 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 8483 "configure"
+#line 8486 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8487: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8490: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8493: \$? = $ac_status" >&5
+  echo "$as_me:8496: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8509,7 +8512,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8512: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8515: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8533,7 +8536,7 @@ EOF
 
 	else
 
-cf_ncuhdr_root=ncursesw
+cf_ncuhdr_root=$cf_cv_screen
 
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
@@ -8565,7 +8568,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8568 "configure"
+#line 8571 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8577,16 +8580,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8583: \$? = $ac_status" >&5
+  echo "$as_me:8586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8589: \$? = $ac_status" >&5
+  echo "$as_me:8592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8603,7 +8606,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8606: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8609: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8622,7 +8625,7 @@ fi
 
 }
 
-echo "$as_me:8625: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8628: 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
@@ -8634,13 +8637,9 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8637 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
 
-#define _XOPEN_SOURCE_EXTENDED
-#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
-#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
-
 #include <$cf_header>
 int
 main (void)
@@ -8648,10 +8647,6 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
-#ifndef WACS_BSSB
-	#error WACS_BSSB is not defined
-#endif
-
 printf("%s\\n", NCURSES_VERSION);
 #else
 #ifdef __NCURSES_H
@@ -8666,16 +8661,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8672: \$? = $ac_status" >&5
+  echo "$as_me:8667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8678: \$? = $ac_status" >&5
+  echo "$as_me:8673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8690,14 +8685,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8693: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8688: 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:8700: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8695: 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
@@ -8818,7 +8813,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8821 "configure"
+#line 8816 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8830,16 +8825,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8836: \$? = $ac_status" >&5
+  echo "$as_me:8831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8842: \$? = $ac_status" >&5
+  echo "$as_me:8837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8856,7 +8851,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8859: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8854: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8879,7 +8874,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8882 "configure"
+#line 8877 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8903,16 +8898,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8909: \$? = $ac_status" >&5
+  echo "$as_me:8904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8915: \$? = $ac_status" >&5
+  echo "$as_me:8910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8933,12 +8928,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8936: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8931: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8941: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8936: 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%/[^/]*$%%'`
@@ -8974,7 +8969,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8977 "configure"
+#line 8972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8986,16 +8981,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8992: \$? = $ac_status" >&5
+  echo "$as_me:8987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8998: \$? = $ac_status" >&5
+  echo "$as_me:8993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9012,7 +9007,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9015: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9060,7 +9055,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9063: checking for terminfo header" >&5
+echo "$as_me:9058: 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
@@ -9078,7 +9073,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9081 "configure"
+#line 9076 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9093,16 +9088,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9099: \$? = $ac_status" >&5
+  echo "$as_me:9094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9105: \$? = $ac_status" >&5
+  echo "$as_me:9100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9118,7 +9113,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9121: result: $cf_cv_term_header" >&5
+echo "$as_me:9116: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9156,7 +9151,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9159: checking for ncurses version" >&5
+echo "$as_me:9154: 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
@@ -9182,10 +9177,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9185: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9180: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9188: \$? = $ac_status" >&5
+  echo "$as_me:9183: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9195,7 +9190,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9198 "configure"
+#line 9193 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9222,15 +9217,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9228: \$? = $ac_status" >&5
+  echo "$as_me:9223: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9233: \$? = $ac_status" >&5
+  echo "$as_me:9228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9244,20 +9239,20 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:9247: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9242: 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
 
-cf_nculib_root=ncursesw
+cf_nculib_root=$cf_cv_screen
 	# This works, except for the special case where we find gpm, but
 	# ncurses is in a nonstandard location via $LIBS, and we really want
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9260: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9255: 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
@@ -9265,7 +9260,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9268 "configure"
+#line 9263 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9284,16 +9279,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9290: \$? = $ac_status" >&5
+  echo "$as_me:9285: \$? = $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:9288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9296: \$? = $ac_status" >&5
+  echo "$as_me:9291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9304,10 +9299,10 @@ fi
 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_Gpm_Open" >&5
+echo "$as_me:9302: 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:9310: checking for initscr in -lgpm" >&5
+  echo "$as_me:9305: 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
@@ -9315,7 +9310,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9318 "configure"
+#line 9313 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9334,16 +9329,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9340: \$? = $ac_status" >&5
+  echo "$as_me:9335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9346: \$? = $ac_status" >&5
+  echo "$as_me:9341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9354,7 +9349,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9357: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9352: 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"
@@ -9369,7 +9364,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9372: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9367: 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
@@ -9377,7 +9372,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9380 "configure"
+#line 9375 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9396,16 +9391,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9402: \$? = $ac_status" >&5
+  echo "$as_me:9397: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9408: \$? = $ac_status" >&5
+  echo "$as_me:9403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9416,7 +9411,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9419: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9414: 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"
@@ -9465,13 +9460,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9468: checking for initscr" >&5
+	echo "$as_me:9463: 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 9474 "configure"
+#line 9469 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9502,16 +9497,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9508: \$? = $ac_status" >&5
+  echo "$as_me:9503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9514: \$? = $ac_status" >&5
+  echo "$as_me:9509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9521,18 +9516,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9524: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9519: 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:9531: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9526: 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 9535 "configure"
+#line 9530 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9544,25 +9539,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9550: \$? = $ac_status" >&5
+  echo "$as_me:9545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9556: \$? = $ac_status" >&5
+  echo "$as_me:9551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9558: result: yes" >&5
+  echo "$as_me:9553: 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:9565: result: no" >&5
+echo "$as_me:9560: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9630,11 +9625,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9633: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9628: 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 9637 "configure"
+#line 9632 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9646,25 +9641,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9652: \$? = $ac_status" >&5
+  echo "$as_me:9647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9658: \$? = $ac_status" >&5
+  echo "$as_me:9653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9660: result: yes" >&5
+  echo "$as_me:9655: 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:9667: result: no" >&5
+echo "$as_me:9662: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9679,7 +9674,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9682: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9677: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9687,7 +9682,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9690: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9685: 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
@@ -9697,7 +9692,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9700 "configure"
+#line 9695 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9709,23 +9704,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9715: \$? = $ac_status" >&5
+  echo "$as_me:9710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9721: \$? = $ac_status" >&5
+  echo "$as_me:9716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9723: result: yes" >&5
+  echo "$as_me:9718: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9728: result: no" >&5
+echo "$as_me:9723: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9743,19 +9738,20 @@ else
 	NCURSES_CONFIG=none
 fi
 
-else
+	;;
+(ncurses*)
 
-cf_ncuconfig_root=ncurses
+cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9752: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9748: 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:9755: result: yes" >&5
+		echo "$as_me:9751: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9758: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9754: 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
 
@@ -9888,7 +9884,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9891 "configure"
+#line 9887 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9900,37 +9896,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9906: \$? = $ac_status" >&5
+  echo "$as_me:9902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9912: \$? = $ac_status" >&5
+  echo "$as_me:9908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9918 "configure"
+#line 9914 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9928: \$? = $ac_status" >&5
+  echo "$as_me:9924: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  echo "$as_me:9929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10104,7 +10100,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10107 "configure"
+#line 10103 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10116,37 +10112,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10122: \$? = $ac_status" >&5
+  echo "$as_me:10118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10128: \$? = $ac_status" >&5
+  echo "$as_me:10124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10134 "configure"
+#line 10130 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10144: \$? = $ac_status" >&5
+  echo "$as_me:10140: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10149: \$? = $ac_status" >&5
+  echo "$as_me:10145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10163,7 +10159,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10166: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:10162: 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"
@@ -10179,7 +10175,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10182: checking for terminfo header" >&5
+echo "$as_me:10178: 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
@@ -10197,7 +10193,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10200 "configure"
+#line 10196 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10212,16 +10208,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10218: \$? = $ac_status" >&5
+  echo "$as_me:10214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10224: \$? = $ac_status" >&5
+  echo "$as_me:10220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10237,7 +10233,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10240: result: $cf_cv_term_header" >&5
+echo "$as_me:10236: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10272,7 +10268,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:10275: result: no" >&5
+		echo "$as_me:10271: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -10288,7 +10284,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:10291: checking for $ac_word" >&5
+echo "$as_me:10287: 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
@@ -10303,7 +10299,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:10306: found $ac_dir/$ac_word" >&5
+echo "$as_me:10302: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10311,10 +10307,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10310: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10317: result: no" >&5
+  echo "$as_me:10313: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10327,7 +10323,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10330: checking for $ac_word" >&5
+echo "$as_me:10326: 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
@@ -10342,7 +10338,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10345: found $ac_dir/$ac_word" >&5
+echo "$as_me:10341: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10350,10 +10346,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10349: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10356: result: no" >&5
+  echo "$as_me:10352: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10510,7 +10506,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10513: checking if we have identified curses headers" >&5
+echo "$as_me:10509: 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
@@ -10518,11 +10514,11 @@ else
 
 cf_cv_ncurses_header=none
 for cf_header in \
-	ncurses.h ncurses/ncurses.h \
-	curses.h ncurses/curses.h
+	ncurses.h $cf_cv_screen/ncurses.h \
+	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10525 "configure"
+#line 10521 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10534,16 +10530,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10540: \$? = $ac_status" >&5
+  echo "$as_me:10536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10546: \$? = $ac_status" >&5
+  echo "$as_me:10542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10554,11 +10550,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10557: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10553: 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:10561: error: No curses header-files found" >&5
+	{ { echo "$as_me:10557: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10568,23 +10564,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10571: checking for $ac_header" >&5
+echo "$as_me:10567: 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 10577 "configure"
+#line 10573 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10577: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10587: \$? = $ac_status" >&5
+  echo "$as_me:10583: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10603,7 +10599,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10602: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10627,7 +10623,7 @@ EOF
 
 	else
 
-cf_ncuhdr_root=ncurses
+cf_ncuhdr_root=$cf_cv_screen
 
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
@@ -10659,7 +10655,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10662 "configure"
+#line 10658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10671,16 +10667,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10677: \$? = $ac_status" >&5
+  echo "$as_me:10673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10683: \$? = $ac_status" >&5
+  echo "$as_me:10679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10697,7 +10693,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10696: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10716,7 +10712,7 @@ fi
 
 }
 
-echo "$as_me:10719: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10715: 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
@@ -10728,7 +10724,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10731 "configure"
+#line 10727 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10752,16 +10748,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:10754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10764: \$? = $ac_status" >&5
+  echo "$as_me:10760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10776,14 +10772,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10779: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10775: 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:10786: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10782: 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
@@ -10904,7 +10900,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10907 "configure"
+#line 10903 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10916,16 +10912,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10922: \$? = $ac_status" >&5
+  echo "$as_me:10918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10928: \$? = $ac_status" >&5
+  echo "$as_me:10924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10942,7 +10938,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10941: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10965,7 +10961,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10968 "configure"
+#line 10964 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10989,16 +10985,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10995: \$? = $ac_status" >&5
+  echo "$as_me:10991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:10997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11019,12 +11015,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11018: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11027: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11023: 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%/[^/]*$%%'`
@@ -11060,7 +11056,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11063 "configure"
+#line 11059 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11072,16 +11068,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  echo "$as_me:11074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11084: \$? = $ac_status" >&5
+  echo "$as_me:11080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11098,7 +11094,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11097: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11146,7 +11142,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11149: checking for terminfo header" >&5
+echo "$as_me:11145: 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
@@ -11164,7 +11160,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11167 "configure"
+#line 11163 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11179,16 +11175,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11185: \$? = $ac_status" >&5
+  echo "$as_me:11181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11191: \$? = $ac_status" >&5
+  echo "$as_me:11187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11204,7 +11200,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11207: result: $cf_cv_term_header" >&5
+echo "$as_me:11203: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11242,7 +11238,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:11245: checking for ncurses version" >&5
+echo "$as_me:11241: 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
@@ -11268,10 +11264,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11267: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11274: \$? = $ac_status" >&5
+  echo "$as_me:11270: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -11281,7 +11277,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11284 "configure"
+#line 11280 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11308,15 +11304,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11310: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11319: \$? = $ac_status" >&5
+  echo "$as_me:11315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11330,20 +11326,20 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11329: 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
 
-cf_nculib_root=ncurses
+cf_nculib_root=$cf_cv_screen
 	# This works, except for the special case where we find gpm, but
 	# ncurses is in a nonstandard location via $LIBS, and we really want
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11346: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11342: 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
@@ -11351,7 +11347,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11354 "configure"
+#line 11350 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11370,16 +11366,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11376: \$? = $ac_status" >&5
+  echo "$as_me:11372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11382: \$? = $ac_status" >&5
+  echo "$as_me:11378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11390,10 +11386,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11393: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11389: 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:11396: checking for initscr in -lgpm" >&5
+  echo "$as_me:11392: 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
@@ -11401,7 +11397,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11404 "configure"
+#line 11400 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11420,16 +11416,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11426: \$? = $ac_status" >&5
+  echo "$as_me:11422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11432: \$? = $ac_status" >&5
+  echo "$as_me:11428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11440,7 +11436,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11443: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11439: 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"
@@ -11455,7 +11451,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11458: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11454: 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
@@ -11463,7 +11459,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11466 "configure"
+#line 11462 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11482,16 +11478,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11488: \$? = $ac_status" >&5
+  echo "$as_me:11484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11494: \$? = $ac_status" >&5
+  echo "$as_me:11490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11502,7 +11498,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11505: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11501: 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"
@@ -11551,13 +11547,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11554: checking for initscr" >&5
+	echo "$as_me:11550: 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 11560 "configure"
+#line 11556 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11588,16 +11584,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11594: \$? = $ac_status" >&5
+  echo "$as_me:11590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11607,18 +11603,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11610: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11606: 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:11617: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11613: 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 11621 "configure"
+#line 11617 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11630,25 +11626,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11636: \$? = $ac_status" >&5
+  echo "$as_me:11632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+  echo "$as_me:11638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11644: result: yes" >&5
+  echo "$as_me:11640: 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:11651: result: no" >&5
+echo "$as_me:11647: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11716,11 +11712,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11719: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11715: 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 11723 "configure"
+#line 11719 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11732,25 +11728,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11738: \$? = $ac_status" >&5
+  echo "$as_me:11734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11744: \$? = $ac_status" >&5
+  echo "$as_me:11740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11746: result: yes" >&5
+  echo "$as_me:11742: 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:11753: result: no" >&5
+echo "$as_me:11749: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11765,7 +11761,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11764: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11773,7 +11769,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11772: 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
@@ -11783,7 +11779,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11786 "configure"
+#line 11782 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11795,23 +11791,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11801: \$? = $ac_status" >&5
+  echo "$as_me:11797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11807: \$? = $ac_status" >&5
+  echo "$as_me:11803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11809: result: yes" >&5
+  echo "$as_me:11805: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11814: result: no" >&5
+echo "$as_me:11810: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11829,7 +11825,13 @@ else
 	NCURSES_CONFIG=none
 fi
 
-fi
+	;;
+(*)
+	{ { echo "$as_me:11830: error: unexpected screen-value: $cf_cv_screen" >&5
+echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+esac
 
 if test "$NCURSES_CONFIG_PKG" != none ; then
 	cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null`
@@ -11864,10 +11866,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11867: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11869: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11870: \$? = $ac_status" >&5
+  echo "$as_me:11872: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11885,10 +11887,53 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11888: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11890: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11891: checking if you want to have a library-prefix" >&5
+echo "$as_me:11893: checking if KEY_RESIZE is supported" >&5
+echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+if test "${cf_cv_curses_resizes+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 11900 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+int key = KEY_RESIZE; (void)key
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11915: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11918: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11921: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_curses_resizes=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_curses_resizes=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:11931: result: $cf_cv_curses_resizes" >&5
+echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+cf_cv_enable_sigwinch=0
+test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+
+echo "$as_me:11936: 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.
@@ -11898,7 +11943,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11901: result: $with_lib_prefix" >&5
+echo "$as_me:11946: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -11936,7 +11981,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:11939: checking for default loader flags" >&5
+echo "$as_me:11984: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -11944,13 +11989,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:11947: result: $LD_MODEL" >&5
+echo "$as_me:11992: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:11953: checking for an rpath option" >&5
+	echo "$as_me:11998: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -11981,12 +12026,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:11984: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:12029: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:11989: checking if we need a space after rpath option" >&5
+		echo "$as_me:12034: 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"
 
@@ -12007,7 +12052,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12010 "configure"
+#line 12055 "configure"
 #include "confdefs.h"
 
 int
@@ -12019,16 +12064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12025: \$? = $ac_status" >&5
+  echo "$as_me:12070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12031: \$? = $ac_status" >&5
+  echo "$as_me:12076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -12038,7 +12083,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:12041: result: $cf_rpath_space" >&5
+		echo "$as_me:12086: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -12060,7 +12105,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:12063: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:12108: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -12075,9 +12120,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:12078: result: $withval" >&5
+		echo "$as_me:12123: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:12080: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:12125: 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; }; }
 		;;
@@ -12086,7 +12131,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:12089: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:12134: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -12109,14 +12154,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:12112: checking which $CC option to use" >&5
+		echo "$as_me:12157: 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 12119 "configure"
+#line 12164 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12128,16 +12173,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12134: \$? = $ac_status" >&5
+  echo "$as_me:12179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12140: \$? = $ac_status" >&5
+  echo "$as_me:12185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12146,7 +12191,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:12149: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:12194: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -12217,7 +12262,7 @@ CF_EOF
 		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:12220: checking if ld -search_paths_first works" >&5
+		echo "$as_me:12265: 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
@@ -12226,7 +12271,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12229 "configure"
+#line 12274 "configure"
 #include "confdefs.h"
 
 int
@@ -12238,16 +12283,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12244: \$? = $ac_status" >&5
+  echo "$as_me:12289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12250: \$? = $ac_status" >&5
+  echo "$as_me:12295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -12258,7 +12303,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:12261: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:12306: 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"
@@ -12608,7 +12653,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12611 "configure"
+#line 12656 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12620,16 +12665,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12626: \$? = $ac_status" >&5
+  echo "$as_me:12671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12632: \$? = $ac_status" >&5
+  echo "$as_me:12677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12666,7 +12711,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12669: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12714: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12676,7 +12721,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12679 "${as_me:-configure}"
+#line 12724 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12688,18 +12733,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12691: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12736: 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:12693: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12696: \$? = $ac_status" >&5
+  echo "$as_me:12741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12698: result: yes" >&5
+				echo "$as_me:12743: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12702: result: no" >&5
+				echo "$as_me:12747: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12714,17 +12759,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12717: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12762: 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}:12721: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12766: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12727: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12772: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12734,7 +12779,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12737: result: $with_rpath_link" >&5
+	echo "$as_me:12782: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12747,7 +12792,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12750: checking if you want broken-linker support code" >&5
+echo "$as_me:12795: 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.
@@ -12757,7 +12802,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12760: result: $with_broken_linker" >&5
+echo "$as_me:12805: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12772,14 +12817,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12775: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12820: 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 12782 "configure"
+#line 12827 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12798,16 +12843,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12804: \$? = $ac_status" >&5
+  echo "$as_me:12849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12810: \$? = $ac_status" >&5
+  echo "$as_me:12855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12818,7 +12863,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12821: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12866: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12860,14 +12905,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12863: checking if this is the GNU C library" >&5
+echo "$as_me:12908: 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 12870 "configure"
+#line 12915 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12886,16 +12931,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12892: \$? = $ac_status" >&5
+  echo "$as_me:12937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12898: \$? = $ac_status" >&5
+  echo "$as_me:12943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12906,7 +12951,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12909: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12954: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12914,7 +12959,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12917: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:12962: 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
@@ -12926,7 +12971,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12929 "configure"
+#line 12974 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12945,16 +12990,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12951: \$? = $ac_status" >&5
+  echo "$as_me:12996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12957: \$? = $ac_status" >&5
+  echo "$as_me:13002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -12966,12 +13011,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:12969: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:13014: 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:12974: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:13019: 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
@@ -13076,7 +13121,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13079 "configure"
+#line 13124 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13096,16 +13141,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13102: \$? = $ac_status" >&5
+  echo "$as_me:13147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13108: \$? = $ac_status" >&5
+  echo "$as_me:13153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -13116,7 +13161,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13119: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:13164: 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
@@ -13125,14 +13170,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:13128: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:13173: 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 13135 "configure"
+#line 13180 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13147,16 +13192,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13159: \$? = $ac_status" >&5
+  echo "$as_me:13204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13263,7 +13308,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13266 "configure"
+#line 13311 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13278,16 +13323,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13284: \$? = $ac_status" >&5
+  echo "$as_me:13329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13290: \$? = $ac_status" >&5
+  echo "$as_me:13335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13302,12 +13347,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13305: result: $cf_cv_gnu_source" >&5
+echo "$as_me:13350: 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:13310: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:13355: 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
@@ -13317,7 +13362,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13320 "configure"
+#line 13365 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13332,16 +13377,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13338: \$? = $ac_status" >&5
+  echo "$as_me:13383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13344: \$? = $ac_status" >&5
+  echo "$as_me:13389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13352,7 +13397,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13355: result: $cf_cv_default_source" >&5
+echo "$as_me:13400: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13389,16 +13434,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13392: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13437: 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}:13398: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13443: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13401 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13413,16 +13458,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13419: \$? = $ac_status" >&5
+  echo "$as_me:13464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13425: \$? = $ac_status" >&5
+  echo "$as_me:13470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13443,7 +13488,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13446 "configure"
+#line 13491 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13458,16 +13503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13464: \$? = $ac_status" >&5
+  echo "$as_me:13509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13470: \$? = $ac_status" >&5
+  echo "$as_me:13515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13478,7 +13523,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13481: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13486,10 +13531,10 @@ echo "${as_me:-configure}:13481: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13489: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13534: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13492 "configure"
+#line 13537 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13504,16 +13549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13510: \$? = $ac_status" >&5
+  echo "$as_me:13555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13516: \$? = $ac_status" >&5
+  echo "$as_me:13561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13529,7 +13574,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13532: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13577: 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
@@ -13646,7 +13691,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13649: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13694: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13678,14 +13723,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13681: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13726: 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 13688 "configure"
+#line 13733 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13703,16 +13748,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13709: \$? = $ac_status" >&5
+  echo "$as_me:13754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13715: \$? = $ac_status" >&5
+  echo "$as_me:13760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13724,7 +13769,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13727 "configure"
+#line 13772 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13742,16 +13787,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13748: \$? = $ac_status" >&5
+  echo "$as_me:13793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13754: \$? = $ac_status" >&5
+  echo "$as_me:13799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13766,7 +13811,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13769: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13814: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13926,16 +13971,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13929: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13974: 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}:13935: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13980: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13938 "configure"
+#line 13983 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13950,16 +13995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13956: \$? = $ac_status" >&5
+  echo "$as_me:14001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13962: \$? = $ac_status" >&5
+  echo "$as_me:14007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13980,7 +14025,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13983 "configure"
+#line 14028 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13995,16 +14040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14001: \$? = $ac_status" >&5
+  echo "$as_me:14046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14007: \$? = $ac_status" >&5
+  echo "$as_me:14052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14015,7 +14060,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14018: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14063: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14023,10 +14068,10 @@ echo "${as_me:-configure}:14018: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14026: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14071: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14029 "configure"
+#line 14074 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14041,16 +14086,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14047: \$? = $ac_status" >&5
+  echo "$as_me:14092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14053: \$? = $ac_status" >&5
+  echo "$as_me:14098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14066,7 +14111,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14069: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14114: 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
@@ -14179,10 +14224,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14182: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14227: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14185 "configure"
+#line 14230 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14200,23 +14245,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14206: \$? = $ac_status" >&5
+  echo "$as_me:14251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14212: \$? = $ac_status" >&5
+  echo "$as_me:14257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14219: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14264: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14239,7 +14284,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14242: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14287: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14251,7 +14296,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14254: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14299: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14339,7 +14384,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14342: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14387: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14349,7 +14394,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14352: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14397: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14359,7 +14404,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14362: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14407: 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"
@@ -14371,10 +14416,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14374: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14419: 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 14377 "configure"
+#line 14422 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14389,16 +14434,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14395: \$? = $ac_status" >&5
+  echo "$as_me:14440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14401: \$? = $ac_status" >&5
+  echo "$as_me:14446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14407,12 +14452,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14410: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14455: 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 14415 "configure"
+#line 14460 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14427,16 +14472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14433: \$? = $ac_status" >&5
+  echo "$as_me:14478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14439: \$? = $ac_status" >&5
+  echo "$as_me:14484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14447,19 +14492,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14450: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14495: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14455: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14500: 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 14462 "configure"
+#line 14507 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14477,16 +14522,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14483: \$? = $ac_status" >&5
+  echo "$as_me:14528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14489: \$? = $ac_status" >&5
+  echo "$as_me:14534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14498,7 +14543,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14501 "configure"
+#line 14546 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14516,16 +14561,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14522: \$? = $ac_status" >&5
+  echo "$as_me:14567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14528: \$? = $ac_status" >&5
+  echo "$as_me:14573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14540,7 +14585,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14543: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14588: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14687,13 +14732,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14690: checking for ANSI C header files" >&5
+echo "$as_me:14735: 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 14696 "configure"
+#line 14741 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14701,13 +14746,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14704: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14710: \$? = $ac_status" >&5
+  echo "$as_me:14755: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14729,7 +14774,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14732 "configure"
+#line 14777 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14747,7 +14792,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14750 "configure"
+#line 14795 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14768,7 +14813,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14771 "configure"
+#line 14816 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14794,15 +14839,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14800: \$? = $ac_status" >&5
+  echo "$as_me:14845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14805: \$? = $ac_status" >&5
+  echo "$as_me:14850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14815,7 +14860,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14818: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14863: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14831,28 +14876,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14834: checking for $ac_header" >&5
+echo "$as_me:14879: 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 14840 "configure"
+#line 14885 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14849: \$? = $ac_status" >&5
+  echo "$as_me:14894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14855: \$? = $ac_status" >&5
+  echo "$as_me:14900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14862,7 +14907,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14865: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14910: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14872,13 +14917,13 @@ EOF
 fi
 done
 
-echo "$as_me:14875: checking whether exit is declared" >&5
+echo "$as_me:14920: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14881 "configure"
+#line 14926 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14893,16 +14938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14899: \$? = $ac_status" >&5
+  echo "$as_me:14944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14905: \$? = $ac_status" >&5
+  echo "$as_me:14950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14912,7 +14957,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14915: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:14960: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14922,7 +14967,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14925: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14970: 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
@@ -14934,7 +14979,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14937 "configure"
+#line 14982 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14954,16 +14999,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14960: \$? = $ac_status" >&5
+  echo "$as_me:15005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14966: \$? = $ac_status" >&5
+  echo "$as_me:15011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14973,16 +15018,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14979: \$? = $ac_status" >&5
+  echo "$as_me:15024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14985: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14996,13 +15041,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14999: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15044: 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:15005: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15050: 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
@@ -15010,7 +15055,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15013 "configure"
+#line 15058 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15030,16 +15075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15036: \$? = $ac_status" >&5
+  echo "$as_me:15081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15042: \$? = $ac_status" >&5
+  echo "$as_me:15087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15048,7 +15093,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15051 "configure"
+#line 15096 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15069,16 +15114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15075: \$? = $ac_status" >&5
+  echo "$as_me:15120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15081: \$? = $ac_status" >&5
+  echo "$as_me:15126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15089,7 +15134,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15092: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15137: 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
 
@@ -15099,7 +15144,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15102: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15147: 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
@@ -15107,7 +15152,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15110 "configure"
+#line 15155 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15127,16 +15172,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15133: \$? = $ac_status" >&5
+  echo "$as_me:15178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15139: \$? = $ac_status" >&5
+  echo "$as_me:15184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15145,7 +15190,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15148 "configure"
+#line 15193 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15166,16 +15211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15172: \$? = $ac_status" >&5
+  echo "$as_me:15217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15178: \$? = $ac_status" >&5
+  echo "$as_me:15223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15186,7 +15231,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15189: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15234: 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
 
@@ -15199,7 +15244,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15202: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15247: 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
@@ -15207,7 +15252,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15210 "configure"
+#line 15255 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15222,16 +15267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15228: \$? = $ac_status" >&5
+  echo "$as_me:15273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15234: \$? = $ac_status" >&5
+  echo "$as_me:15279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15240,7 +15285,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15243 "configure"
+#line 15288 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15256,16 +15301,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15262: \$? = $ac_status" >&5
+  echo "$as_me:15307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15268: \$? = $ac_status" >&5
+  echo "$as_me:15313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15276,7 +15321,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15279: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15324: 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
 
@@ -15290,13 +15335,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15293: checking for fseeko" >&5
+echo "$as_me:15338: 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 15299 "configure"
+#line 15344 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15310,16 +15355,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15316: \$? = $ac_status" >&5
+  echo "$as_me:15361: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15322: \$? = $ac_status" >&5
+  echo "$as_me:15367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15329,7 +15374,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15332: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15377: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15368,14 +15413,14 @@ fi
 
 	fi
 
-	echo "$as_me:15371: checking whether to use struct dirent64" >&5
+	echo "$as_me:15416: 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 15378 "configure"
+#line 15423 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15402,16 +15447,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15408: \$? = $ac_status" >&5
+  echo "$as_me:15453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15414: \$? = $ac_status" >&5
+  echo "$as_me:15459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15422,7 +15467,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15425: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15470: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15432,7 +15477,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15435: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15480: 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.
@@ -15442,7 +15487,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15445: result: $with_rcs_ids" >&5
+echo "$as_me:15490: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15452,7 +15497,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15455: checking if you want to build with function extensions" >&5
+echo "$as_me:15500: 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.
@@ -15462,7 +15507,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15465: result: $with_ext_funcs" >&5
+echo "$as_me:15510: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15480,7 +15525,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15483: checking for extended use of const keyword" >&5
+echo "$as_me:15528: 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.
@@ -15490,7 +15535,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15493: result: $with_ext_const" >&5
+echo "$as_me:15538: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15500,7 +15545,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15503: checking if you want all development code" >&5
+echo "$as_me:15548: 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.
@@ -15510,7 +15555,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15513: result: $with_develop" >&5
+echo "$as_me:15558: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15519,7 +15564,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15522: checking if you want to link with the pthread library" >&5
+echo "$as_me:15567: 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.
@@ -15529,27 +15574,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15532: result: $with_pthread" >&5
+echo "$as_me:15577: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15536: checking for pthread.h" >&5
+	echo "$as_me:15581: 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 15542 "configure"
+#line 15587 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15546: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15552: \$? = $ac_status" >&5
+  echo "$as_me:15597: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15568,7 +15613,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15571: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15616: 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
 
@@ -15578,7 +15623,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15581: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15626: 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"
 
@@ -15599,7 +15644,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15602 "configure"
+#line 15647 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15616,16 +15661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15622: \$? = $ac_status" >&5
+  echo "$as_me:15667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15628: \$? = $ac_status" >&5
+  echo "$as_me:15673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15635,7 +15680,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15638: result: $with_pthread" >&5
+	    echo "$as_me:15683: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15663,7 +15708,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15666: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15711: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15672,7 +15717,7 @@ fi
 
 fi
 
-echo "$as_me:15675: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15720: 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.
@@ -15682,18 +15727,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15685: result: $use_weak_symbols" >&5
+echo "$as_me:15730: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15689: checking if $CC supports weak symbols" >&5
+echo "$as_me:15734: 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 15696 "configure"
+#line 15741 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15719,16 +15764,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15725: \$? = $ac_status" >&5
+  echo "$as_me:15770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15731: \$? = $ac_status" >&5
+  echo "$as_me:15776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15739,7 +15784,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15742: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15787: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15768,13 +15813,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15771: checking for _nc_TABSIZE" >&5
+echo "$as_me:15816: 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 15777 "configure"
+#line 15822 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15805,16 +15850,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15811: \$? = $ac_status" >&5
+  echo "$as_me:15856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15817: \$? = $ac_status" >&5
+  echo "$as_me:15862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15824,7 +15869,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15827: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15872: 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
@@ -15836,7 +15881,7 @@ fi
 # 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:15839: checking if you want experimental reentrant code" >&5
+echo "$as_me:15884: 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.
@@ -15846,7 +15891,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15849: result: $with_reentrant" >&5
+echo "$as_me:15894: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15869,7 +15914,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15872: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15917: 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.
@@ -15879,7 +15924,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15882: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15927: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15893,7 +15938,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15896: checking if you want to see long compiling messages" >&5
+echo "$as_me:15941: 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.
@@ -15927,10 +15972,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15930: result: $enableval" >&5
+echo "$as_me:15975: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15933: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15978: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15947,17 +15992,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15950: result: $enable_stdnoreturn" >&5
+echo "$as_me:15995: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15954: checking for C11 _Noreturn feature" >&5
+echo "$as_me:15999: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15960 "configure"
+#line 16005 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15973,16 +16018,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15979: \$? = $ac_status" >&5
+  echo "$as_me:16024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15985: \$? = $ac_status" >&5
+  echo "$as_me:16030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -15993,7 +16038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15996: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16041: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16049,16 +16094,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16052: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16097: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16057: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16102: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16061: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16106: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16097,16 +16142,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16100: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16145: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16105: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16150: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16109: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16154: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16145,23 +16190,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16148: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16193: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16153: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16198: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16157: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16164: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16209: 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.
@@ -16178,7 +16223,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16181: result: $enable_warnings" >&5
+echo "$as_me:16226: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16202,7 +16247,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16205 "configure"
+#line 16250 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16217,26 +16262,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16223: \$? = $ac_status" >&5
+  echo "$as_me:16268: \$? = $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:16271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16229: \$? = $ac_status" >&5
+  echo "$as_me:16274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16232: checking for X11/Xt const-feature" >&5
+echo "$as_me:16277: 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 16239 "configure"
+#line 16284 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16254,16 +16299,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16260: \$? = $ac_status" >&5
+  echo "$as_me:16305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16266: \$? = $ac_status" >&5
+  echo "$as_me:16311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16278,7 +16323,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16281: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16326: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16307,7 +16352,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16310 "${as_me:-configure}"
+#line 16355 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16323,7 +16368,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16326: checking for $CC warning options..." >&5
+	{ echo "$as_me:16371: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16339,12 +16384,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16342: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16345: \$? = $ac_status" >&5
+  echo "$as_me:16390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16347: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16392: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16352,7 +16397,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16355: checking for $CC warning options..." >&5
+	{ echo "$as_me:16400: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16375,12 +16420,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16378: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16381: \$? = $ac_status" >&5
+  echo "$as_me:16426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16383: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16428: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16388,7 +16433,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16391: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16436: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16398,7 +16443,7 @@ echo "${as_me:-configure}:16391: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16401: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16446: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16431,10 +16476,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16434: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16479: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16437 "${as_me:-configure}"
+#line 16482 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16484,12 +16529,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16490: \$? = $ac_status" >&5
+  echo "$as_me:16535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16492: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16537: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16557,7 +16602,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16560: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16605: 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.
@@ -16567,7 +16612,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16570: result: $with_assertions" >&5
+echo "$as_me:16615: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16620,7 +16665,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16623: checking whether to add trace feature to all models" >&5
+echo "$as_me:16668: 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.
@@ -16630,7 +16675,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16633: result: $cf_with_trace" >&5
+echo "$as_me:16678: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16644,7 +16689,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16647: checking if we want to use GNAT projects" >&5
+echo "$as_me:16692: 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.
@@ -16661,21 +16706,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16664: result: $enable_gnat_projects" >&5
+echo "$as_me:16709: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16671: checking if ssp library is needed" >&5
+echo "$as_me:16716: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16678 "configure"
+#line 16723 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16692,16 +16737,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16698: \$? = $ac_status" >&5
+  echo "$as_me:16743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16704: \$? = $ac_status" >&5
+  echo "$as_me:16749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16711,7 +16756,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16714 "configure"
+#line 16759 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16728,16 +16773,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16734: \$? = $ac_status" >&5
+  echo "$as_me:16779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16740: \$? = $ac_status" >&5
+  echo "$as_me:16785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16751,7 +16796,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16754: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16799: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16779,13 +16824,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16782: checking for clock_gettime" >&5
+echo "$as_me:16827: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16788 "configure"
+#line 16833 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16816,16 +16861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16822: \$? = $ac_status" >&5
+  echo "$as_me:16867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16828: \$? = $ac_status" >&5
+  echo "$as_me:16873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16835,12 +16880,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16838: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16883: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16843: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16888: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16848,7 +16893,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16851 "configure"
+#line 16896 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16867,16 +16912,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16873: \$? = $ac_status" >&5
+  echo "$as_me:16918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16879: \$? = $ac_status" >&5
+  echo "$as_me:16924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16887,7 +16932,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16890: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16935: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16899,14 +16944,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16902: checking if clock_gettime links" >&5
+echo "$as_me:16947: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16909 "configure"
+#line 16954 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16924,16 +16969,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16930: \$? = $ac_status" >&5
+  echo "$as_me:16975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16936: \$? = $ac_status" >&5
+  echo "$as_me:16981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16944,7 +16989,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16947: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16992: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -16958,13 +17003,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:16961: checking for gettimeofday" >&5
+echo "$as_me:17006: 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 16967 "configure"
+#line 17012 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16995,16 +17040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17001: \$? = $ac_status" >&5
+  echo "$as_me:17046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17007: \$? = $ac_status" >&5
+  echo "$as_me:17052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17014,7 +17059,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17017: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17062: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17024,7 +17069,7 @@ EOF
 
 else
 
-echo "$as_me:17027: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17072: 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
@@ -17032,7 +17077,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17035 "configure"
+#line 17080 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17051,16 +17096,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17057: \$? = $ac_status" >&5
+  echo "$as_me:17102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17063: \$? = $ac_status" >&5
+  echo "$as_me:17108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17071,7 +17116,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17074: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17119: 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
 
@@ -17104,13 +17149,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17107: checking for signed char" >&5
+echo "$as_me:17152: 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 17113 "configure"
+#line 17158 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17125,16 +17170,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17131: \$? = $ac_status" >&5
+  echo "$as_me:17176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17137: \$? = $ac_status" >&5
+  echo "$as_me:17182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17144,10 +17189,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17147: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17192: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17150: checking size of signed char" >&5
+echo "$as_me:17195: 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
@@ -17156,7 +17201,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17159 "configure"
+#line 17204 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17168,21 +17213,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17174: \$? = $ac_status" >&5
+  echo "$as_me:17219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17180: \$? = $ac_status" >&5
+  echo "$as_me:17225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17185 "configure"
+#line 17230 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17194,16 +17239,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17200: \$? = $ac_status" >&5
+  echo "$as_me:17245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17206: \$? = $ac_status" >&5
+  echo "$as_me:17251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17219,7 +17264,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17222 "configure"
+#line 17267 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17231,16 +17276,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17237: \$? = $ac_status" >&5
+  echo "$as_me:17282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17243: \$? = $ac_status" >&5
+  echo "$as_me:17288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17256,7 +17301,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17259 "configure"
+#line 17304 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17268,16 +17313,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17274: \$? = $ac_status" >&5
+  echo "$as_me:17319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17280: \$? = $ac_status" >&5
+  echo "$as_me:17325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17290,12 +17335,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17293: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17338: 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 17298 "configure"
+#line 17343 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17311,15 +17356,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17317: \$? = $ac_status" >&5
+  echo "$as_me:17362: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17322: \$? = $ac_status" >&5
+  echo "$as_me:17367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17335,7 +17380,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17338: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17383: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17344,13 +17389,13 @@ EOF
 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:17347: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17392: 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 17353 "configure"
+#line 17398 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17365,16 +17410,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17413: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17371: \$? = $ac_status" >&5
+  echo "$as_me:17416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17377: \$? = $ac_status" >&5
+  echo "$as_me:17422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17384,7 +17429,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17387: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17432: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17397,7 +17442,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17400: checking for opendir in -ldir" >&5
+  echo "$as_me:17445: 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
@@ -17405,7 +17450,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17408 "configure"
+#line 17453 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17424,16 +17469,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17430: \$? = $ac_status" >&5
+  echo "$as_me:17475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17436: \$? = $ac_status" >&5
+  echo "$as_me:17481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17444,14 +17489,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17447: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17492: 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:17454: checking for opendir in -lx" >&5
+  echo "$as_me:17499: 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
@@ -17459,7 +17504,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17462 "configure"
+#line 17507 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17478,16 +17523,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17484: \$? = $ac_status" >&5
+  echo "$as_me:17529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17490: \$? = $ac_status" >&5
+  echo "$as_me:17535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17498,7 +17543,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17501: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17546: 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"
@@ -17506,13 +17551,13 @@ fi
 
 fi
 
-echo "$as_me:17509: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17554: 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 17515 "configure"
+#line 17560 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17528,16 +17573,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17534: \$? = $ac_status" >&5
+  echo "$as_me:17579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17540: \$? = $ac_status" >&5
+  echo "$as_me:17585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17547,7 +17592,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17550: result: $ac_cv_header_time" >&5
+echo "$as_me:17595: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17565,13 +17610,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17568: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17613: 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 17574 "configure"
+#line 17619 "configure"
 #include "confdefs.h"
 
 int
@@ -17633,16 +17678,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17639: \$? = $ac_status" >&5
+  echo "$as_me:17684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17645: \$? = $ac_status" >&5
+  echo "$as_me:17690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17652,7 +17697,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17655: result: $ac_cv_c_const" >&5
+echo "$as_me:17700: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17664,7 +17709,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17667: checking if data-only library module links" >&5
+echo "$as_me:17712: 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
@@ -17672,20 +17717,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17675 "configure"
+#line 17720 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17681: \$? = $ac_status" >&5
+  echo "$as_me:17726: \$? = $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 <<EOF
-#line 17688 "configure"
+#line 17733 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17702,10 +17747,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17705: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17708: \$? = $ac_status" >&5
+  echo "$as_me:17753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17718,7 +17763,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17721 "configure"
+#line 17766 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17729,15 +17774,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17735: \$? = $ac_status" >&5
+  echo "$as_me:17780: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17740: \$? = $ac_status" >&5
+  echo "$as_me:17785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17752,7 +17797,7 @@ fi
 
 fi
 
-echo "$as_me:17755: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17800: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17771,23 +17816,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17774: checking for $ac_header" >&5
+echo "$as_me:17819: 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 17780 "configure"
+#line 17825 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17784: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17790: \$? = $ac_status" >&5
+  echo "$as_me:17835: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17806,7 +17851,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17809: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17854: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17816,7 +17861,7 @@ EOF
 fi
 done
 
-echo "$as_me:17819: checking for working mkstemp" >&5
+echo "$as_me:17864: 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
@@ -17827,7 +17872,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17830 "configure"
+#line 17875 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17862,15 +17907,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17868: \$? = $ac_status" >&5
+  echo "$as_me:17913: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17873: \$? = $ac_status" >&5
+  echo "$as_me:17918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17885,16 +17930,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17888: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17933: 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:17891: checking for mkstemp" >&5
+	echo "$as_me:17936: 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 17897 "configure"
+#line 17942 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17925,16 +17970,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17931: \$? = $ac_status" >&5
+  echo "$as_me:17976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17937: \$? = $ac_status" >&5
+  echo "$as_me:17982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17944,7 +17989,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17947: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17992: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -17965,7 +18010,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:17968: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18013: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -17982,10 +18027,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:17985: result: $ADAFLAGS" >&5
+	echo "$as_me:18030: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:17988: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18033: 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
@@ -17995,11 +18040,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:17998: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18043: 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:18002: checking if GNAT supports generics" >&5
+echo "$as_me:18047: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18009,7 +18054,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18012: result: $cf_gnat_generics" >&5
+echo "$as_me:18057: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18021,7 +18066,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18024: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18069: 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
@@ -18069,7 +18114,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18072: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18117: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18082,7 +18127,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18085: checking if GNAT supports project files" >&5
+echo "$as_me:18130: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18145,15 +18190,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18148: result: $cf_gnat_projects" >&5
+echo "$as_me:18193: 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:18154: checking if GNAT supports libraries" >&5
+	echo "$as_me:18199: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18156: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18201: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18173,7 +18218,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18176: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18221: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18185,7 +18230,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18188: checking for Ada95 compiler" >&5
+echo "$as_me:18233: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18196,12 +18241,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18199: result: $cf_ada_compiler" >&5
+echo "$as_me:18244: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18204: checking for Ada95 include directory" >&5
+echo "$as_me:18249: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18237,7 +18282,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18240: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18285: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18246,10 +18291,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18249: result: $ADA_INCLUDE" >&5
+echo "$as_me:18294: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18252: checking for Ada95 object directory" >&5
+echo "$as_me:18297: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18285,7 +18330,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18288: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18333: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18294,10 +18339,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18297: result: $ADA_OBJECTS" >&5
+echo "$as_me:18342: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18300: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18345: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18318,11 +18363,11 @@ then
 	fi
 fi
 
-echo "$as_me:18321: result: $with_ada_sharedlib" >&5
+echo "$as_me:18366: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18325: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18370: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18340,7 +18385,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18343: checking for Ada95 curses library name" >&5
+echo "$as_me:18388: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18356,16 +18401,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18359: result: $ADA_LIBNAME" >&5
+echo "$as_me:18404: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18363: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18408: 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:18368: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18413: 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
@@ -18405,7 +18450,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18408: checking default library suffix" >&5
+echo "$as_me:18453: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18416,10 +18461,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18419: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18464: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18422: checking default library-dependency suffix" >&5
+echo "$as_me:18467: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18502,10 +18547,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18505: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18550: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18508: checking default object directory" >&5
+echo "$as_me:18553: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18521,7 +18566,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18524: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18569: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18663,7 +18708,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18666: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18711: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18844,7 +18889,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18847: error: ambiguous option: $1
+    { { echo "$as_me:18892: 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;}
@@ -18863,7 +18908,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18866: error: unrecognized option: $1
+  -*) { { echo "$as_me:18911: 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;}
@@ -18938,7 +18983,7 @@ do
   "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:18941: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18986: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19093,6 +19138,7 @@ s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
 s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
 s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
+s,@cf_cv_screen@,$cf_cv_screen,;t t
 s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t
 s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t
 s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t
@@ -19101,6 +19147,7 @@ s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t
 s,@cf_cv_builtin_bool@,$cf_cv_builtin_bool,;t t
 s,@cf_cv_header_stdbool_h@,$cf_cv_header_stdbool_h,;t t
 s,@cf_cv_type_of_bool@,$cf_cv_type_of_bool,;t t
+s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t
 s,@LIB_PREFIX@,$LIB_PREFIX,;t t
 s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
 s,@CC_G_OPT@,$CC_G_OPT,;t t
@@ -19300,7 +19347,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19303: creating $ac_file" >&5
+    { echo "$as_me:19350: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19318,7 +19365,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19321: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19368: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19331,7 +19378,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19334: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19381: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19347,7 +19394,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19350: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19397: 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;}
@@ -19356,7 +19403,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19359: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19406: 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;}
@@ -19401,7 +19448,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19404: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19451: 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;}
@@ -19412,7 +19459,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19415: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19462: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19461,7 +19508,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19464: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19511: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19472,7 +19519,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19475: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19522: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19485,7 +19532,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19488: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19535: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19543,7 +19590,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19546: $ac_file is unchanged" >&5
+      { echo "$as_me:19593: $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/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec
index 540e8e54b..be18e68dc 100644
--- a/Ada95/package/AdaCurses.spec
+++ b/Ada95/package/AdaCurses.spec
@@ -2,7 +2,7 @@ Summary: Ada95 binding for ncurses
 %define AppProgram AdaCurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.31 2022/12/18 00:08:17 tom Exp $
+# $Id: AdaCurses.spec,v 1.33 2024/06/01 22:51:57 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
@@ -69,6 +69,7 @@ INSTALL_PROGRAM='${INSTALL}' \
 		--disable-rpath-link \
 		--disable-echo \
 		--verbose \
+		--with-screen=ncursesw6dev \
 		--enable-warnings
 
 make
diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules
index 0adde8de5..162668f22 100755
--- a/Ada95/package/debian/rules
+++ b/Ada95/package/debian/rules
@@ -41,6 +41,7 @@ configure-stamp:
 		--disable-rpath-link \
 		--with-shared \
 		--with-ada-sharedlib \
+		--with-screen=ncurses6 \
 		--without-pkg-config
 
 	touch configure-stamp
diff --git a/NEWS b/NEWS
index 702afb739..76eaf90ee 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4129 2024/05/25 23:09:24 tom Exp $
+-- $Id: NEWS,v 1.4131 2024/06/01 22:49:52 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240601
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ change Ada95/configure to use --with-screen option rather than
+	  --enable-widec, to provide more choices of underlying curses library
+
 20240525
 	+ build-fix for configure option --disable-ext-funcs
 	+ improve formatting/style of manpages (patches by Branden Robinson).
diff --git a/VERSION b/VERSION
index b27c93b66..0ee88e4d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240525
+5:0:10	6.5	20240601
diff --git a/dist.mk b/dist.mk
index ee4164728..4c5f84b32 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1615 2024/05/25 10:33:51 tom Exp $
+# $Id: dist.mk,v 1.1616 2024/06/01 11:06:41 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240525
+NCURSES_PATCH = 20240601
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 5ffbdca85..5e9c50347 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -115,10 +115,12 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
        If  <EM>wch</EM>  is  any other nonprintable character, it is drawn in printable
-       form using the same convention as <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG>.
+       form using the same convention as <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG>.  Calling <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG>  on
+       the  location of a nonprintable character does not return the character
+       itself, but its <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG> representation.
 
-       Calling <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG> on the location of a  nonprintable  character  does
-       not return the character itself, but its <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG> representation.
+       A <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> can be copied from  place  to  place  using  <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG>  and
+       <STRONG>wadd_wch</STRONG>.
 
 
 </PRE><H3><a name="h3-wecho_wchar">wecho_wchar</a></H3><PRE>
@@ -177,6 +179,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG>WACS_UARROW</STRONG>     0x2191    ^         -      arrow pointing up
        <STRONG>WACS_ULCORNER</STRONG>   0x250c    +         l      upper left-hand corner
        <STRONG>WACS_URCORNER</STRONG>   0x2510    +         k      upper right-hand corner
+
        <STRONG>WACS_VLINE</STRONG>      0x2502    |         x      vertical line
 
        The wide-character configuration of <EM>ncurses</EM> also  defines  symbols  for
@@ -259,78 +262,75 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        These  functions are described in X/Open Curses, Issue 4.  It specifies
        no error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
-       value other than <STRONG>ERR</STRONG>".
-
-       The  defaults specified for forms-drawing characters apply in the POSIX
-       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
-       defined  as  a  pointer  to  <STRONG>cchar_t</STRONG>  data,  e.g., in the discussion of
+       The defaults specified for forms-drawing characters apply in the  POSIX
+       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
+       defined as a pointer to  <STRONG>cchar_t</STRONG>  data,  e.g.,  in  the  discussion  of
        <STRONG>border_set</STRONG>.  A few implementations are problematic:
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
-       <STRONG>o</STRONG>   HP-UX curses equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
-           <STRONG>WACS_</STRONG>  symbols  as  if  the <STRONG>ACS_</STRONG> symbols were wide characters.  The
-           misdefined symbols are the arrows and other symbols which  are  not
+       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
+           misdefined  symbols  are the arrows and other symbols which are not
            used for line-drawing.
 
-       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
        SVr4 curses implementations defined their line-drawing symbols in terms
-       of  intermediate  symbols.   This implementation extends those symbols,
+       of intermediate symbols.  This implementation  extends  those  symbols,
        providing new definitions which are not in the SVr4 implementations.
 
-       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
-       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
-       corresponding line-drawing characters.  X/Open Curses did  not  address
-       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
-       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
+       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+       alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
+       corresponding  line-drawing  characters.  X/Open Curses did not address
+       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
+       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       <EM>ncurses</EM>  5.3  (2002)  provided a table of Unicode values to solve these
+       <EM>ncurses</EM> 5.3 (2002) provided a table of Unicode values  to  solve  these
        problems.  NetBSD curses incorporated that table in 2010.
 
-       In this implementation, the Unicode values  are  used  instead  of  the
+       In  this  implementation,  the  Unicode  values are used instead of the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment variable <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.  In contrast,  for  the  same
+       environment  variable  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.   In contrast, for the same
        cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use only
        the ASCII default values.
 
-       Having Unicode available does not solve all of the problems with  line-
+       Having  Unicode available does not solve all of the problems with line-
        drawing for curses:
 
-       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
-           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
+       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics  <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>
+           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
            the terminal used.
 
-       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
-           terminal in the early 1980s.  There is no accessible  documentation
+       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
+           terminal  in the early 1980s.  There is no accessible documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
-           since they lie outside the BMP and as a result  are  not  generally
+           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+           since  they  lie  outside the BMP and as a result are not generally
            available in terminals.  They are not storm lanterns, in any case.
 
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
+           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: &lt;section&gt; U+00A7 (section
-           mark),  &lt;Theta&gt;  U+0398 (theta), &lt;Phi&gt; U+03A6 (phi), &lt;delta&gt; U+03B4
+           mark), &lt;Theta&gt; U+0398 (theta), &lt;Phi&gt; U+03A6 (phi),  &lt;delta&gt;  U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
 </PRE><H3><a name="h3-Complex-Characters">Complex Characters</a></H3><PRE>
-       The  complex  character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  can  store  more  than one wide
-       character (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>).  X/Open Curses does not mention this  possibility,
-       specifying  behavior  only  where  <EM>wch</EM>  is  a  single character, either
+       The complex character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  can  store  more  than  one  wide
+       character  (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>).  X/Open Curses does not mention this possibility,
+       specifying behavior only  where  <EM>wch</EM>  is  a  single  character,  either
        spacing or non-spacing.
 
        <EM>ncurses</EM> assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>, and in turn
@@ -341,10 +341,19 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   holds one non-spacing character.
 
-       In the latter case, <EM>ncurses</EM>  adds  the  non-spacing  character  to  the
+       In  the  latter  case,  <EM>ncurses</EM>  adds  the non-spacing character to the
        active complex character.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These functions were initially specified by  X/Open  Curses,  Issue  4.
+       The   System V   Interface  Definition,  Version  4  (1995),  specified
+       functions named <EM>waddwch</EM> and <EM>wechowchar</EM> (and the usual variants).  These
+       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       They differed from X/Open's <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that they  each
+       took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
@@ -355,7 +364,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -380,6 +389,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-Complex-Characters">Complex Characters</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index ca56a80f4..593355b54 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp @
+  * @Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -98,16 +98,14 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
        If <EM>ch</EM> is any other nonprintable character, it  is  drawn  in  printable
-       form using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.
+       form using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.  Calling <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the
+       location of a nonprintable character  does  not  return  the  character
+       itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
 
-       Calling  <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the location of a nonprintable character does not
-       return the character itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
-
-       The object or expression <EM>ch</EM> may contain attributes and/or a color  pair
-       identifier.   (A character with its attributes can be copied from place
-       to place using <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> and <STRONG>waddch</STRONG>.)  See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> for values  of
-       predefined  video  attribute constants that can be usefully "or"ed with
-       characters.
+       The  object or expression <EM>ch</EM> may contain attributes and/or a color pair
+       identifier.  (A  <EM>chtype</EM>  can  be  copied  from  place  to  place  using
+       <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>  and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined
+       constants that can be usefully "or"ed with characters.
 
 
 </PRE><H3><a name="h3-wechochar">wechochar</a></H3><PRE>
@@ -184,14 +182,15 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        The last may be due to different causes:
 
-       <STRONG>o</STRONG>   conversion of a multibyte character to a byte sequence can fail, or
+       <STRONG>o</STRONG>   conversion  of  a  wide character to a multibyte character sequence
+           can fail, or
 
-       <STRONG>o</STRONG>   at  least  one  of  the  bytes  resulting  from  conversion  from a
-           multibyte sequence cannot be added  to  the  window.   See  section
-           "PORTABILITY"  below  regarding  the  use  of <STRONG>waddch</STRONG> with multibyte
-           characters.
+       <STRONG>o</STRONG>   at least one of the bytes resulting from wide character  conversion
+           to  a  multibyte  character sequence cannot be added to the window.
+           See section "PORTABILITY" below regarding the use  of  <STRONG>waddch</STRONG>  with
+           wide characters.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -202,18 +201,18 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
+       SVr4 and other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG>  variable,  but
        X/Open Curses does not specify it; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
        value other than <STRONG>ERR</STRONG>".
 
-       The defaults specified for forms-drawing characters apply in the  POSIX
+       The  defaults specified for forms-drawing characters apply in the POSIX
        locale.
 
 
@@ -222,72 +221,73 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
+       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
            others define them as elements of an array.
 
-           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
+           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
-           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
+       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
-           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
-           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
+       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
            implementations use "i" (small i).
 
-           None of the terminal descriptions on Unix platforms  use  uppercase
-           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
-           apparently based on the X/Open documentation around 1995).  On  the
-           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
+           apparently  based on the X/Open documentation around 1995).  On the
+           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
            description uses lowercase i.
 
-       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
-       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
-       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
-       embedded, and a second-hand list of their  character  descriptions  has
-       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
+       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
+       released  System V.   However, many publicly available <EM>terminfo</EM> entries
+       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
+       embedded,  and  a  second-hand list of their character descriptions has
+       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character  configurations  (the  former  is  capable  of displaying
+           character configurations  (the  former  is  capable  of  displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
-       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
-       single  character.   That  character may have been more than eight bits
-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
-       width  of  a non-wide character code unspecified.  The standard further
-       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
-       bit  operations  to  combine  the  character code with attributes and a
+       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
+       single character.  That character may have been more  than  eight  bits
+       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+       width of a non-wide character code unspecified.  The  standard  further
+       does  not specify the internal structure of a <EM>chtype</EM>, though the use of
+       bit operations to combine the character  code  with  attributes  and  a
        color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
-       a  multibyte character to be passed in a succession of calls to <STRONG>waddch</STRONG>.
-       Other implementations do not;  a  <STRONG>waddch</STRONG>  call  transmits  exactly  one
-       character,  which  may  be  rendered  in  one  or more screen locations
-       depending on whether it is printable (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).   Depending  on
-       the  locale,  <EM>ncurses</EM>  inspects the byte passed in each <STRONG>waddch</STRONG> call and
-       checks whether the latest call continues a multibyte sequence.  When  a
-       character  is <EM>complete</EM>, <EM>ncurses</EM> displays the character and advances the
-       cursor.  If the calling application interrupts the succession of  bytes
-       in a multibyte character sequence by changing the current location--for
-       example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM> discards the incomplete character.
+       a multibyte character sequence to be passed via a succession  of  calls
+       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
+       exactly one character, which may be rendered  in  one  or  more  screen
+       locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
+       Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
+       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
+       character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
+       character   and  advances  the  cursor.   If  the  calling  application
+       interrupts the succession of bytes in a multibyte character sequence by
+       changing  the  current  location--for  example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
+       discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
        foregoing  behavior.  Check whether a character can be represented as a
@@ -298,6 +298,12 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   If it cannot, use only <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       The original <EM>curses</EM> in 4BSD (1980) introduced <EM>waddch</EM>.
+
+       SVr3 (1987) added <EM>wechochar</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
@@ -308,7 +314,7 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -334,6 +340,7 @@ <H1 class="no-header">curs_addch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-Character-Set">Character Set</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 0616c9bc5..b9ee20aae 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index da46ecfa0..4ac4e972e 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp @
+  * @Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 145e9d622..0d5cd64db 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -87,16 +87,15 @@ <H1 class="no-header">curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
-       <STRONG>ERR</STRONG>
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the window pointer is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the string pointer is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns an error.
+       <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -109,14 +108,14 @@ <H1 class="no-header">curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index f72389794..3bc1777c2 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp @
+  * @Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        does  not  arrive within the designated time, <STRONG>wgetch</STRONG> returns the prefix
        character; otherwise, it returns the function key code corresponding to
        the unique sequence defined by the terminal.  Consequently, a user of a
-       <EM>curses</EM> application may experience a delay  after  they  escape  key  is
+       <EM>curses</EM> application may experience a  delay  after  the  escape  key  is
        pressed  while <EM>curses</EM> disambiguates the input; see section "EXTENSIONS"
        below.  If the window is in "no time-out"  mode,  the  timer  does  not
        expire;  it  is  an infinite (or very large) value.  See <STRONG><A HREF="notimeout.3x.html">notimeout(3x)</A></STRONG>.
@@ -320,6 +320,8 @@ <H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be implemented as macros.
+
        <EM>curses</EM> discourages assignment of the ESC key to a discrete function  by
        the programmer because the library requires a delay while it awaits the
        potential remainder of a terminal escape sequence.
@@ -359,14 +361,12 @@ <H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        Historically, the list of key code macros above was influenced  by  the
        keyboard  of  the AT&amp;T 7300 (also known variously as the "3B1", "Safari
        4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
-       computer  keyboards  are  based  that of the IBM PC/AT and tend to have
+       computer  keyboards are based on that of the IBM PC/AT and tend to have
        fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
        codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
        <STRONG>KEY_PPAGE</STRONG> (Page Up), <STRONG>KEY_NPAGE</STRONG> (Page  Down),  <STRONG>KEY_IC</STRONG>  (Insert),  <STRONG>KEY_DC</STRONG>
        (Delete), and <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG> for 1 &lt;= <EM>n</EM> &lt;= 12.
 
-       <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be implemented as macros.
-
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        In <EM>ncurses</EM>, when a window's "no time-out" mode is <EM>not</EM> set, the <STRONG>ESCDELAY</STRONG>
@@ -396,10 +396,10 @@ <H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <EM>curses</EM>  implementations,  it  varied depending on whether the operating
        system's dispatch of a signal to a handler interrupted a  <STRONG>read(2)</STRONG>  call
        in  progress,  and  also  (in  some  implementations)  whether an input
-       timeout or non-blocking mode had been set.  Programmers concerned about
-       portability  should  be  prepared  for  either of two cases: (a) signal
-       receipt does not interrupt <STRONG>wgetch</STRONG>; or  (b)  signal  receipt  interrupts
-       <STRONG>wgetch</STRONG> and causes it to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
+       timeout  or  non-blocking  mode  had  been  set.   A  portable   <EM>curses</EM>
+       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       interrupt <STRONG>wgetch</STRONG>; or (b) signal receipt interrupts <STRONG>wgetch</STRONG> and causes it
+       to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
        <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
@@ -426,7 +426,7 @@ <H1 class="no-header">curs_getch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 2c4128150..0753dc21d 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index ed0f1b26f..3dfd504e0 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_inch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index c854a5ace..717593ac2 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -286,11 +286,15 @@ <H1 class="no-header">curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG>SIGWINCH</STRONG>
             This handles the window-size changes which  were  ignored  in  the
             standardization   efforts.    The  handler  sets  a  (signal-safe)
-            variable which is later tested in <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>.  If <STRONG>keypad</STRONG> has  been
-            enabled  for  the  corresponding  window,  <STRONG>wgetch</STRONG>  returns the key
-            symbol <STRONG>KEY_RESIZE</STRONG>.  At the same time, <STRONG>wgetch</STRONG> calls  <STRONG>resizeterm</STRONG>  to
-            adjust  the  standard screen <STRONG>stdscr</STRONG>, and update other data such as
-            <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
+            variable that is later tested by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> and <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>:
+
+            <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns the key code <STRONG>KEY_RESIZE</STRONG>.
+
+            <STRONG>o</STRONG>   <STRONG>wget_wch</STRONG> returns <STRONG>KEY_CODE_YES</STRONG> and sets its  <EM>wch</EM>  parameter  to
+                <STRONG>KEY_RESIZE</STRONG>.
+
+            At  the same time, <EM>ncurses</EM> calls <STRONG>resizeterm</STRONG> to adjust the standard
+            screen <STRONG>stdscr</STRONG>, and update other data such as <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -299,7 +303,7 @@ <H1 class="no-header">curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index f1aa3b081..d447ccd29 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp @
+  * @Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -220,8 +220,8 @@ <H1 class="no-header">curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        control   characters  uninterpreted  to  the  application,  instead  of
        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
-       configuration parameters that <EM>curses</EM> does not handle.  <STRONG>noraw</STRONG> exits  raw
-       mode.
+       configuration parameters that <EM>curses</EM> does not  handle.   <STRONG>noraw</STRONG>  returns
+       the terminal to normal ("cooked") mode.
 
 
 </PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
@@ -326,27 +326,26 @@ <H1 class="no-header">curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>, then <EM>ncurses</EM> also defines keys for the capabilities whose names
        begin  with  "k".  Corresponding key codes are generated and (depending
        on previous  loads  of  terminal  descriptions)  may  differ  from  one
-       execution  of  a  program  to  the  next.   The  generated keycodes are
-       recognized by the <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>  function  (which  then  returns  a  name
-       beginning  with  "k"  denoting the <EM>terminfo</EM> capability name rather than
-       "K", used for <EM>curses</EM> key names).  On the other hand, an application can
-       use  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>  to  bind  a  specific  key  to  a  string  of  the
-       programmer's choice.  This feature enables an application to check  for
-       an  extended  capability's presence with <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, and reassign the
-       keycode to match its own needs.
+       execution  of  a  program  to  the  next.   The generated key codes are
+       recognized by <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>, which then returns a name beginning with "k"
+       denoting  the <EM>terminfo</EM> capability name rather than "K", used for <EM>curses</EM>
+       key names.  On the other hand, an application can use <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> to
+       bind  a  specific  key  to  a  string of the programmer's choice.  This
+       feature  enables  an  application  to  check  for  its  presence   with
+       <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, and reassign the key code to match its own needs.
 
        Low-level applications can use <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG> to obtain the definition of
-       any  string  capability.   <EM>curses</EM>  applications use the input character
+       any string capability.  <EM>curses</EM> applications  use  the  input  character
        reading function to obtain key codes from input and rely upon the order
-       in  which  the string capabilities are loaded.  Multiple key capability
-       strings can have the  same  value,  but  the  input  character  reading
-       function  can  report  only  one key code.  Most <EM>curses</EM> implementations
-       (including <EM>ncurses</EM>) load key definitions in the order  they  appear  in
+       in which the string capabilities are loaded.  Multiple  key  capability
+       strings  can  have  the  same  value,  but  the input character reading
+       function can report only one key  code.   Most  <EM>curses</EM>  implementations
+       (including  <EM>ncurses</EM>)  load  key definitions in the order they appear in
        the <STRONG>strfnames</STRONG> array of string capability names; see <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
-       The last capability read using a particular definition  determines  the
-       key  code  to  be  reported.   In <EM>ncurses</EM>, extended capabilities can be
-       interpreted as key definitions.  These are loaded after the  predefined
-       keys,  and  if  a capability's value is the same as a previously loaded
+       The  last  capability read using a particular definition determines the
+       key code to be reported.  In  <EM>ncurses</EM>,  extended  capabilities  can  be
+       interpreted  as key definitions.  These are loaded after the predefined
+       keys, and if a capability's value is the same as  a  previously  loaded
        key definition, the later definition is the one used.
 
 
@@ -357,31 +356,31 @@ <H1 class="no-header">curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        support it with <EM>cbreak</EM>, <EM>nocbreak</EM>, <EM>intrflush</EM>, <EM>keypad</EM>, <EM>meta</EM>, <EM>nodelay</EM>, and
        <EM>typeahead</EM>.
 
-       SVr3 (1987) added <EM>halfdelay</EM>,  <EM>notimeout</EM>,  and  <EM>wtimeout</EM>.   <EM>qiflush</EM>  and
-       <EM>noqiflush</EM>  appeared in SVr3.1 (1987), at which point <EM>intrflush</EM> became a
-       wrapper for either of these functions, depending on the  value  of  its
+       SVr3  (1987)  added  <EM>halfdelay</EM>,  <EM>notimeout</EM>,  and <EM>wtimeout</EM>.  <EM>qiflush</EM> and
+       <EM>noqiflush</EM> appeared in SVr3.1 (1987), at which point <EM>intrflush</EM> became  a
+       wrapper  for  either  of these functions, depending on the value of its
        Boolean argument.  SVr3.1 also added <EM>timeout</EM>.
 
        <EM>ncurses</EM> 6.5 (2024) introduced <EM>is</EM><STRONG>_</STRONG><EM>cbreak</EM>, <EM>is</EM><STRONG>_</STRONG><EM>echo</EM>, <EM>is</EM><STRONG>_</STRONG><EM>nl</EM>, and <EM>is</EM><STRONG>_</STRONG><EM>raw</EM>.
 
-       Formerly,  <EM>ncurses</EM>  used  <EM>nl</EM>  and  <EM>nonl</EM>  to  control  the conversion of
-       newlines to carriage return/line feed  on  output  as  well  as  input.
-       X/Open  Curses  documents  the  use  of these functions only for input.
-       This difference arose from converting the <EM>pcurses</EM> source (1986),  which
-       used  <STRONG>ioctl(2)</STRONG>  calls  and  the <EM>sgttyb</EM> structure, to <EM>termios</EM> (the POSIX
-       terminal API).  In the former, both input and  output  were  controlled
+       Formerly, <EM>ncurses</EM> used  <EM>nl</EM>  and  <EM>nonl</EM>  to  control  the  conversion  of
+       newlines  to  carriage  return/line  feed  on  output as well as input.
+       X/Open Curses documents the use of  these  functions  only  for  input.
+       This  difference arose from converting the <EM>pcurses</EM> source (1986), which
+       used <STRONG>ioctl(2)</STRONG> calls and the <EM>sgttyb</EM> structure,  to  <EM>termios</EM>  (the  POSIX
+       terminal  API).   In  the former, both input and output were controlled
        via a single option "CRMOD", while the latter separates these features.
-       Because that conversion interferes with  output  optimization,  <EM>ncurses</EM>
+       Because  that  conversion  interferes with output optimization, <EM>ncurses</EM>
        6.2 (2020) amended <EM>nl</EM> and <EM>nonl</EM> to eliminate their effect on output.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index dd9540fe1..5488404b0 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_instr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index f1759cb3b..052af277f 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -54,10 +54,10 @@ <H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>scr_dump(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scr_restore(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scr_init(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scr_set(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_dump(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_restore(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_init(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_set(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>filename</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -73,65 +73,85 @@ <H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-scr_restore">scr_restore</a></H3><PRE>
-       <STRONG>scr_restore</STRONG> updates the virtual  screen  to  contain  the  contents  of
-       <EM>filename</EM>  (if  it  was  validly  written with <STRONG>scr_dump</STRONG>).  No refresh is
-       performed;  after  performing  any  further   desired   updates,   call
-       <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> or similar.
+       <STRONG>scr_restore</STRONG> updates  the  virtual  screen  to  match  the  contents  of
+       <EM>filename</EM> (if validly written with <STRONG>scr_dump</STRONG>).  <EM>curses</EM> does not perform a
+       refresh;  after  making  any  desired  changes,  call  <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG>  or
+       similar.
 
 
 </PRE><H3><a name="h3-scr_init">scr_init</a></H3><PRE>
        <STRONG>scr_init</STRONG>  reads <EM>filename</EM>, using it to initialize <EM>curses</EM> data structures
-       describing the state of the terminal screen.  If these data are  valid,
-       <EM>curses</EM>  bases  its next update of the screen on this information rather
-       than clearing it and starting from scratch.
+       describing the state of  the  terminal  screen.   <EM>curses</EM>  then,  if  it
+       decides  the  terminal  state  is  valid,  bases its next update of the
+       screen on this information rather than clearing it  and  starting  from
+       scratch.
 
-       The data fail the validity check
+       <EM>curses</EM>  regards  the terminal being in an invalid state for computation
+       of updates based on the contents of <EM>filename</EM> if
 
-       <STRONG>o</STRONG>   if the terminal employs <EM>terminfo</EM> capabilities <STRONG>exit_ca_mode</STRONG>  (<STRONG>rmcup</STRONG>)
-           or <STRONG>non_rev_rmcup</STRONG> (<STRONG>nrrmc</STRONG>) are defined, or
+       <STRONG>o</STRONG>   the terminal type supports the <EM>terminfo</EM>  capabilities  <STRONG>exit_ca_mode</STRONG>
+           (<STRONG>rmcup</STRONG>) or <STRONG>non_rev_rmcup</STRONG> (<STRONG>nrrmc</STRONG>), or
 
-       <STRONG>o</STRONG>   if  <EM>curses</EM>  knows  that  the terminal has been written to since the
+       <STRONG>o</STRONG>   <EM>curses</EM>  knows  that  the  terminal  has  been  written to since the
            preceding <STRONG>scr_dump</STRONG> call.
 
-       <STRONG>scr_init</STRONG> could be used after <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG>system(3)</STRONG>  to  share  the
-       screen with another process that has done a <STRONG>scr_dump</STRONG> after <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
+       Either of the foregoing conditions means that <EM>curses</EM> cannot assume that
+       the  terminal's  contents  match their representation in <EM>filename</EM>.  The
+       former is due to  terminal  features  (such  as  <STRONG>xterm(1)</STRONG>'s  "alternate
+       screen")  that  couple  cursor-positioning  mode  with a local cache of
+       screen contents.  <EM>curses</EM> cannot know  whether  terminal  is  displaying
+       from that local cache at the time the application calls <STRONG>scr_init</STRONG>, so it
+       makes a pessimistic assumption that a  full  redraw  is  required;  see
+       subsection "Cursor Motions" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
+       <STRONG>scr_init</STRONG>  could  be  used  after  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG>system(3)</STRONG> to share the
+       screen with another process that has done a <STRONG>scr_dump</STRONG> after  <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
+       An   application  that  supports  suspending  its  state  on  exit  and
+       subsequent resumption upon  later  execution  might  use  <STRONG>scr_dump</STRONG>  and
+       <STRONG>scr_init</STRONG> thus.
 
 
 </PRE><H3><a name="h3-scr_set">scr_set</a></H3><PRE>
-       The  <STRONG>scr_set</STRONG>  routine is a combination of <STRONG>scr_restore</STRONG> and <STRONG>scr_init</STRONG>.  It
-       tells the program that the information in <EM>filename</EM> is what is currently
-       on the screen, and also what the program wants on the screen.  This can
-       be thought of as a screen inheritance function.
+       <STRONG>scr_set</STRONG>  combines  <STRONG>scr_restore</STRONG> and <STRONG>scr_init</STRONG>, synchronizing the contents
+       of <EM>filename</EM> with the virtual screen.  It can be regarded  as  a  screen
+       inheritance function; consider a real-time screen-sharing application.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no failure conditions.   In  this  implementation,  each
-       function fails if it cannot open <EM>filename</EM>.
+       In  <EM>ncurses</EM>,  each  function  returns  <STRONG>ERR</STRONG>  if it cannot open <EM>filename</EM>.
+       <STRONG>scr_init</STRONG>, <STRONG>scr_restore</STRONG>, and  <STRONG>scr_set</STRONG>  return  <STRONG>ERR</STRONG>  if  the  contents  of
+       <EM>filename</EM> are invalid.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>scr_init</STRONG>, <STRONG>scr_set</STRONG>, and <STRONG>scr_restore</STRONG> may be macros.
+       <STRONG>scr_init</STRONG>, <STRONG>scr_restore</STRONG>, and <STRONG>scr_set</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
 
        SVr4 omitted the <EM>const</EM> qualifiers.
 
-       SVr4  documentation  describes <STRONG>scr_init</STRONG> such that the dump data is also
-       considered invalid "if the time-stamp of the tty is old" but  does  not
+       SVr4 documentation describes <STRONG>scr_init</STRONG> such that the dump data  is  also
+       considered  invalid  "if the time-stamp of the tty is old" but does not
        define "old".
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3 (1987) introduced <STRONG>scr_dump</STRONG>,  <STRONG>scr_init</STRONG>,  and  <STRONG>scr_restore</STRONG>.   SVr3.1
+       added <STRONG>scr_set</STRONG>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG>system(3)</STRONG>, <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+       <STRONG>system(3)</STRONG>, <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -148,6 +168,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index ebb9251ca..260228a3e 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -660,7 +660,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 8e641fe9b..abf0a0240 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_util 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            implementations return rather than null.
 
        The   corresponding  <STRONG>key_name</STRONG>  returns  a  multibyte  character  string
-       corresponding  to  the  wide-character  value  <EM>w</EM>.   The  two  functions
+       corresponding to  the  wide-character  value  <EM>wc</EM>.   The  two  functions
        (<STRONG>keyname</STRONG> and <STRONG>key_name</STRONG>) do not return the same set of strings:
 
        <STRONG>o</STRONG>   <STRONG>keyname</STRONG> returns null where <STRONG>key_name</STRONG> would display a meta character.
@@ -287,13 +287,13 @@ <H1 class="no-header">curs_util 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
        The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
        capabilities  which are defined in the terminfo entry via the <STRONG>-x</STRONG> option
-       of <STRONG>tic</STRONG>.  This implementation automatically 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 <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>  function  controls
-       whether  this  data  is loaded when the terminal description is read by
-       the library.
+       of <STRONG>tic</STRONG>.  This implementation  automatically  assigns  at  run-time  key
+       codes  to  user-defined  strings  which  begin with "k".  The key codes
+       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   <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
+       function  controls  whether  this  data  is  loaded  when  the terminal
+       description is read by the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
@@ -390,7 +390,7 @@ <H1 class="no-header">curs_util 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 01d6abd14..ebc4de7bd 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp @
+  * @Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -248,7 +248,7 @@ <H1 class="no-header">curs_window 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index e36b0fce4..6c1d89ce8 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp @
+  * @Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240525).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240601).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -157,7 +157,7 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
        the  cell  within  it  at  which  the next output operation will occur.
        Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
-       cursor and write a character to <STRONG>stdscr</STRONG>, respectively.
+       cursor within and write a character to <STRONG>stdscr</STRONG>, respectively.
 
        Frequent changes to the terminal screen can cause unpleasant flicker or
        inefficient use of the communication channel to the  device,  so  as  a
@@ -232,7 +232,7 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        Four functions prefixed with "p" require a pad argument.
 
        In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
-       parameters.
+       parameters.  We introduce the character types in the next subsection.
 
                        <EM>bf</EM>    a <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
                        <EM>c</EM>     a <EM>char</EM> or <EM>int</EM>
@@ -264,13 +264,27 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
-                 byte-sized type) can represent.  It adds about one third more
-                 calls  using  additional  data  types  that  can  store  such
-                 <EM>multibyte</EM> characters.
+                 byte-sized  type)  can  represent.   It  provides  additional
+                 functions that complement those in the non-wide library where
+                 the size of the underlying character type is significant.   A
+                 somewhat  regular  naming convention relates many of the wide
+                 variants to their non-wide  counterparts;  where  a  non-wide
+                 function  name contains "ch" or "str", prefix it with "_w" to
+                 obtain the wide counterpart.   For  example,  <STRONG>waddch</STRONG>  becomes
+                 <STRONG>wadd_wch</STRONG>.   (Exceptions  that  add only "w" comprise <STRONG>addwstr</STRONG>,
+                 <STRONG>inwstr</STRONG>, and their variants.)
+
+                 This convention is inapplicable  to  some  non-wide  function
+                 names,  so  other  transformations  are  used  for  the  wide
+                 configuration:  the  window  background  management  function
+                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+                 -clearing functions are suffixed with "_set";  and  character
+                 attribute   manipulation   functions   like  "attron"  become
+                 "attr_on".
 
                  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype</EM>.
-                          It  always  a structure type, because it stores more
-                          data than  fit  into  a  standard  scalar  type.   A
+                          It  is  a  structure  type  because it requires more
+                          storage than fits into a standard  scalar  type.   A
                           character  code  may not be representable as a <EM>char</EM>,
                           and moreover more than one character  may  occupy  a
                           cell  (as  with  accent marks and other diacritics).
@@ -303,24 +317,6 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                           analogously to the <EM>int</EM>-sized character  manipulation
                           functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
-                 The   wide   library   provides   additional  functions  that
-                 complement those in the non-wide library where  the  size  of
-                 the  underlying  character  type  is significant.  A somewhat
-                 regular naming convention relates many of the  wide  variants
-                 to  their  non-wide  counterparts;  where a non-wide function
-                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
-                 the  wide counterpart.  For example, <STRONG>waddch</STRONG> becomes <STRONG>wadd_wch</STRONG>.
-                 (Exceptions that add only "w" comprise <STRONG>addwstr</STRONG>,  <STRONG>inwstr</STRONG>,  and
-                 their variants.)
-
-                 This  convention  is  inapplicable  to some non-wide function
-                 names,  so  other  transformations  are  used  for  the  wide
-                 configuration:  the  window  background  management  function
-                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
-                 -clearing  functions  are suffixed with "_set"; and character
-                 attribute  manipulation  functions   like   "attron"   become
-                 "attr_on".
-
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
@@ -382,11 +378,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     delscreen                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
-
                     delwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     derwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     echo_wchar               <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     echochar                 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -449,11 +445,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     init_extended_color      <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
-
                     init_extended_pair       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     ins_wch                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
@@ -513,14 +509,14 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-                    mvcur                    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+                    mvcur                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvderwin                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     mvget_wch                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -583,11 +579,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwprintw                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
-
                     mvwscanw                 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     mvwvline                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
@@ -650,11 +646,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_label                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_noutrefresh          <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_refresh              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -717,11 +713,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
-
                     wattr_get                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_off                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_on                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_set                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -784,11 +780,11 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     wstandend                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     wstandout                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wsyncdown                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wsyncup                  <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wtimeout                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+
                     wtouchln                 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     wunctrl                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -833,9 +829,9 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
-       Because this name is also used in development environments to represent
-       the C compiler's name, <EM>ncurses</EM> ignores its  value  if  it  is  not  one
-       character in length.
+       Because this name is also used in development environments to store the
+       C compiler's name, <EM>ncurses</EM> ignores its value if it is not one character
+       in length.
 
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
@@ -1489,7 +1485,7 @@ <H1 class="no-header">ncurses 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-06-01                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 36f5ddcaf..f90e8fc8d 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240525).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240601).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/ncurses-intro.doc b/doc/ncurses-intro.doc
index a20ee1a1d..87f092d1f 100644
--- a/doc/ncurses-intro.doc
+++ b/doc/ncurses-intro.doc
@@ -153,9 +153,8 @@ Introduction
    source-code  or  documentation;  the  tic and infocmp programs are the
    exceptions.
 
-   System  V  Release  3  (System  III  UNIX)  from  Bell Labs featured a
-   rewritten and much-improved curses library, along with the tic program
-   (late 1986).
+   System   V   Release  3  from  Bell  Labs  featured  a  rewritten  and
+   much-improved curses library, along with the tic program (late 1986).
 
    To  recap,  terminfo  is  based  on  Berkeley's  termcap database, but
    contains  a  number  of  improvements  and  extensions.  Parameterized
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 29fd1e4f2..ccddafdea 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp $
-.TH curs_add_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp $
+.TH curs_add_wch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -151,10 +151,14 @@ If
 is any other nonprintable character,
 it is drawn in printable form using the same convention as
 \fB\%wunctrl\fP(3X).
-.PP
 Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
 does not return the character itself,
 but its \fB\%wunctrl\fP(3X) representation.
+.PP
+A
+.I \%cchar_t
+can be copied from place to place using \fB\%win_wch\fP(3X) and
+.BR \%wadd_wch "."
 .SS wecho_wchar
 .B \%echo_wchar
 and
@@ -196,7 +200,7 @@ and the characters in it may appear on the screen if the terminal type's
 database entry incorrectly advertises ACS support.
 The name \*(``ACS\*('' originates in the Alternate Character Set feature
 of the DEC VT100 terminal.
-.br
+.PP
 .ie t .ne 4v
 .el   .ne 5v
 .TS
@@ -414,12 +418,6 @@ but is not specified by X/Open Curses
 These functions are described in X/Open Curses, Issue 4.
 It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
-\*(``an integer value other than
-.BR ERR \*(''.
-.PP
 The defaults specified for forms-drawing characters apply in the POSIX
 locale.
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
@@ -503,7 +501,7 @@ Others have suggested these alternatives:
 The complex character type
 .I \%cchar_t
 can store more than one wide character
-.RI ( \%wchar_t ).
+.RI \%( wchar_t ).
 X/Open Curses does not mention this possibility,
 specifying behavior only where
 .I wch
@@ -526,6 +524,27 @@ holds one non-spacing character.
 In the latter case,
 .I \%ncurses
 adds the non-spacing character to the active complex character.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified functions named
+.I \%waddwch
+and
+.I \%wechowchar
+(and the usual variants).
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+They differed from X/Open's
+.I \%wadd_wch
+and
+.I \%wecho_wchar
+in that they each took an argument of type
+.I \%wchar_t
+instead of
+.IR \%cchar_t "."
 .SH SEE ALSO
 \fB\%curs_addch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index be7c13a26..5fb25b0a7 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp $
-.TH curs_addch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp $
+.TH curs_addch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -127,7 +127,6 @@ If
 is any other nonprintable character,
 it is drawn in printable form using the same convention as
 \fB\%unctrl\fP(3X).
-.PP
 Calling \fB\%winch\fP(3X) on the location of a nonprintable character
 does not return the character itself,
 but its \fB\%unctrl\fP(3X) representation.
@@ -135,11 +134,12 @@ but its \fB\%unctrl\fP(3X) representation.
 The object or expression
 .I ch
 may contain attributes and/or a color pair identifier.
-(A character with its attributes can be copied from place to place
-using \fB\%winch\fP(3X) and
+(A
+.I \%chtype
+can be copied from place to place using \fB\%winch\fP(3X) and
 .BR \%waddch .)
-See \fB\%curs_attr\fP(3X) for values of predefined video attribute
-constants that can be usefully \*(``or\*(''ed with characters.
+See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+usefully \*(``or\*(''ed with characters.
 .SS wechochar
 .B \%echochar
 and
@@ -181,7 +181,7 @@ and the characters in it may appear on the screen if the terminal type's
 database entry incorrectly advertises ACS support.
 The name \*(``ACS\*('' originates in the Alternate Character Set feature
 of the DEC VT100 terminal.
-.br
+.PP
 .ie t .ne 4v
 .el   .ne 5v
 .TS
@@ -252,14 +252,15 @@ it is not possible to add a complete character at the cursor position.
 .PP
 The last may be due to different causes:
 .bP
-conversion of a multibyte character to a byte sequence can fail,
+conversion of a wide character to a multibyte character sequence can
+fail,
 or
 .bP
-at least one of the bytes resulting from conversion from a multibyte
-sequence cannot be added to the window.
+at least one of the bytes resulting from wide character conversion to a
+multibyte character sequence cannot be added to the window.
 See section \*(``PORTABILITY\*('' below regarding the use of
 .B \%waddch
-with multibyte characters.
+with wide characters.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -359,7 +360,7 @@ its
 description uses lowercase i.
 .PP
 Some ACS symbols
-.RB ( \%ACS_S3 ,
+.RB \%( ACS_S3 ,
 .BR \%ACS_S7 ,
 .BR \%ACS_LEQUAL ,
 .BR \%ACS_GEQUAL ,
@@ -368,6 +369,9 @@ Some ACS symbols
 and
 .BR \%ACS_STERLING )
 were not documented in any publicly released System\ V.
+.\" And did not exist yet as late as SVr4.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
 However,
 many publicly available
 .I \%term\%info
@@ -428,7 +432,7 @@ In
 .IR \%ncurses ,
 .I \%chtype
 holds an eight-bit character,
-but the library allows a multibyte character to be passed in a
+but the library allows a multibyte character sequence to be passed via a
 succession of calls to
 .BR \%waddch "."
 Other implementations do not;
@@ -442,7 +446,7 @@ Depending on the locale,
 .I \%ncurses
 inspects the byte passed in each
 .B \%waddch
-call and checks whether the latest call continues a multibyte sequence.
+call and checks whether the latest call continues a multibyte character.
 When a character is
 .IR complete ","
 .I \%ncurses
@@ -467,11 +471,20 @@ or \fB\%wadd_wch\fP(3X).
 If it cannot,
 use only
 \fB\%wadd_wch\fP(3X).
+.SH HISTORY
+The original
+.I curses
+in 4BSD (1980) introduced
+.IR \%waddch "."
+.PP
+SVr3 (1987)
+added
+.IR \%wechochar "."
 .SH SEE ALSO
 \fB\%curs_add_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addchstr\fP(3X),
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 19c47fc59..2df7138c0 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp $
-.TH curs_addchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp $
+.TH curs_addchstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -143,7 +143,7 @@ Issue 4 describes these functions.
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 35a4122bb..cee228de8 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp $
-.TH curs_addstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp $
+.TH curs_addstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -134,7 +134,7 @@ It specifies no error conditions for them.
 \fB\%curs_addwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index b380d5e3f..8b2abee79 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp $
-.TH curs_addwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp $
+.TH curs_addwstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,19 +111,23 @@ on success and
 .B ERR
 on failure.
 .PP
-X/Open Curses does not specify any error conditions.
-.I \%ncurses
-returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the window pointer is
-.BR NULL ,
+.I win
+is
+.BR NULL ","
 .bP
-if the string pointer is
-.BR NULL ,
+.I wstr
+is
+.BR NULL ","
 or
 .bP
-if an internal \fB\%wadd_wch\fP(3X) call returns an error.
+an internal \fB\%wadd_wch\fP(3X) call returns
+.BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 6e6a91380..bc88c0ac7 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp $
-.TH curs_getch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp $
+.TH curs_getch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -229,7 +229,7 @@ defined by the terminal.
 Consequently,
 a user of a
 .I curses
-application may experience a delay after they escape key is pressed
+application may experience a delay after the escape key is pressed
 while
 .I curses
 disambiguates the input;
@@ -470,6 +470,12 @@ returns
 or
 .BR FALSE "."
 .SH NOTES
+.BR \%getch ","
+.BR \%mvgetch ","
+and
+.B \%mvwgetch
+may be implemented as macros.
+.PP
 .I curses
 discourages assignment of the ESC key to a discrete function by the
 programmer because the library requires a delay while it awaits the
@@ -553,8 +559,8 @@ AT&T 7300
 (also known variously as the \*(``3B1\*('', \*(``Safari 4\*('', and
 \*(``UNIX PC\*(''),
 a 1985 machine rich in function keys.
-Today's computer keyboards are based that of the IBM PC/AT and tend to
-have fewer.
+Today's computer keyboards are based on that of the IBM PC/AT
+and tend to have fewer.
 A
 .I curses
 application can expect such a keyboard to transmit key codes
@@ -577,12 +583,6 @@ and
 for 1 \(<=
 .I n
 \(<= 12.
-.PP
-.BR \%getch ","
-.BR \%mvgetch ","
-and
-.B \%mvwgetch
-may be implemented as macros.
 .SH EXTENSIONS
 In
 .IR \%ncurses ","
@@ -639,8 +639,9 @@ signal to a handler interrupted a \fIread\fP(2) call in progress,
 and also
 (in some implementations)
 whether an input timeout or non-blocking mode had been set.
-Programmers concerned about portability should be prepared for either of
-two cases:
+A portable
+.I curses
+application prepares for two cases:
 (a) signal receipt does not interrupt
 .BR \%wgetch ";"
 or
@@ -689,7 +690,7 @@ ECMA-48 \*(``Control Functions for Coded Character Sets\*(''
 \fB\%curs_get_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 9e9334ca1..27b9c9517 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp $
-.TH curs_getstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp $
+.TH curs_getstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -294,7 +294,7 @@ SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
 \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_getch\fP(3X),
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index e2025374b..fffcff30c 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp $
-.TH curs_inch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp $
+.TH curs_inch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -176,7 +176,7 @@ should use the wide-character counterparts of these functions.
 \fB\%curs_in_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_instr\fP(3X)
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 29e5425d9..ecfc1fc6b 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp $
-.TH curs_initscr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp $
+.TH curs_initscr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -308,10 +308,23 @@ It also updates the saved terminal modes with
 This handles the window-size changes which were ignored in
 the standardization efforts.
 The handler sets a (signal-safe) variable
-which is later tested in \fB\%wgetch\fP(3X).
-If \fBkeypad\fP has been enabled for the corresponding window,
-\fBwgetch\fP returns the key symbol \fBKEY_RESIZE\fP.
-At the same time, \fBwgetch\fP calls \fBresizeterm\fP to adjust the
+that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X):
+.RS
+.bP
+.B \%wgetch
+returns the key code
+.BR \%KEY_RESIZE "."
+.bP
+.B \%wget_wch
+returns
+.B \%KEY_CODE_YES
+and sets its
+.I wch
+parameter to
+.BR \%KEY_RESIZE "."
+.RE
+.IP
+At the same time, \fI\%ncurses\fP calls \fBresizeterm\fP to adjust the
 standard screen \fBstdscr\fP,
 and update other data such as \fBLINES\fP and \fBCOLS\fP.
 .SH SEE ALSO
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index e915023b5..4f4c25549 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp $
-.TH curs_inopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp $
+.TH curs_inopts 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -410,7 +410,7 @@ depends on terminal driver configuration parameters that
 .I curses
 does not handle.
 .B \%noraw
-exits raw mode.
+returns the terminal to normal (\*(``cooked\*('') mode.
 .\"
 .SS "timeout, wtimeout"
 .B \%wtimeout
@@ -678,20 +678,19 @@ also defines keys for the capabilities whose names begin with
 Corresponding key codes are generated and
 (depending on previous loads of terminal descriptions)
 may differ from one execution of a program to the next.
-The generated keycodes are recognized by the \fB\%keyname\fP(3X)
-function
-(which then returns a name beginning with \*(``k\*('' denoting the
+The generated key codes are recognized by \fB\%keyname\fP(3X),
+which then returns a name beginning with \*(``k\*('' denoting the
 .I \%term\%info
 capability name rather than \*(``K\*('',
 used for
 .I curses
-key names).
+key names.
 On the other hand,
 an application can use \fB\%define_key\fP(3X) to bind
 a specific key to a string of the programmer's choice.
-This feature enables an application to check for an extended
-capability's presence with \fB\%tigetstr\fP(3X),
-and reassign the keycode to match its own needs.
+This feature enables an application to check for its presence
+with \fB\%tigetstr\fP(3X),
+and reassign the key code to match its own needs.
 .PP
 Low-level applications can use \fB\%tigetstr\fP(3X) to obtain the
 definition of any string capability.
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index ec115efd8..aca21a1b2 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
-.TH curs_instr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp $
+.TH curs_instr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -124,7 +124,7 @@ In this case, the functions return the string ending at the right margin.
 \fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
-.RI ( \%ncursesw ).
+.RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 5f14a2287..4b78ff99a 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp $
-.TH curs_scr_dump 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp $
+.TH curs_scr_dump 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -54,10 +54,10 @@ read/write a \fIcurses\fR screen from/to a file
 .nf
 \fB#include <curses.h>
 .PP
-\fBint scr_dump(const char *\fIfilename\fP);
-\fBint scr_restore(const char *\fIfilename\fP);
-\fBint scr_init(const char *\fIfilename\fP);
-\fBint scr_set(const char *\fIfilename\fP);
+\fBint scr_dump(const char * \fIfilename\fP);
+\fBint scr_restore(const char * \fIfilename\fP);
+\fBint scr_init(const char * \fIfilename\fP);
+\fBint scr_set(const char * \fIfilename\fP);
 .fi
 .SH DESCRIPTION
 .I curses
@@ -70,83 +70,151 @@ use \fB\%getwin\fP(3X) and
 \fB\%putwin\fP(3X),
 respectively.
 .SS scr_dump
-\fB\%scr_dump\fP writes to
+.B \%scr_dump
+writes to
 .I filename
 the contents of the virtual screen;
 see \fB\%curscr\fP(3X).
 .SS scr_restore
-\fB\%scr_restore\fP updates the virtual screen to contain the contents
-of
+.B \%scr_restore
+updates the virtual screen to match the contents of
 .I filename
-(if it was validly written with \fB\%scr_dump\fP).
-No refresh is performed;
-after performing any further desired updates,
+(if validly written with
+.BR \%scr_dump ")."
+.I curses
+does not perform a refresh;
+after making any desired changes,
 call \fB\%doupdate\fP(3X) or similar.
 .SS scr_init
-\fB\%scr_init\fP reads
-.IR filename ,
+.B \%scr_init
+reads
+.IR filename ","
 using it to initialize
 .I curses
 data structures describing the state of the terminal screen.
-If these data are valid,
 .I curses
+then,
+if it decides the terminal state is valid,
 bases its next update of the screen on this information rather than
 clearing it and starting from scratch.
 .PP
-The data fail the validity check
+.I curses
+regards the terminal being in an invalid state for computation of
+updates based on the contents of
+.I filename
+if
 .bP
-if the terminal employs
+the terminal type supports the
 .I \%term\%info
 capabilities
 .B \%exit_ca_mode
-.RB ( \%rmcup )
+.RB \%( rmcup )
 or
 .B \%non_rev_rmcup
-.RB ( \%nrrmc )
-are defined,
+.RB \%( nrrmc ),
 or
 .bP
-if
 .I curses
 knows that the terminal has been written to since the preceding
-\fB\%scr_dump\fP call.
+.B \%scr_dump
+call.
+.PP
+Either of the foregoing conditions means that
+.I curses
+cannot assume that the terminal's contents
+match their representation in
+.IR filename "."
+The former is due to terminal features
+(such as \fI\%xterm\fP(1)'s \*(``alternate screen\*('')
+that couple cursor-positioning mode with a local cache of screen
+contents.
+.I curses
+cannot know whether terminal is displaying from that local cache at the
+time the application calls
+.BR \%scr_init ","
+so it makes a pessimistic assumption that a full redraw is required;
+see subsection \*(``Cursor Motions\*('' of \fB\%terminfo\fP(5).
 .PP
-\fB\%scr_init\fP could be used after \fB\%initscr\fP(3X) or
-\fB\%system\fP(3) to share the screen with another process that has
-done a \fBscr_dump\fP after \fB\%endwin\fP(3X).
+.B \%scr_init
+could be used after \fB\%initscr\fP(3X) or \fI\%system\fP(3) to share
+the screen with another process that has done a
+.B \%scr_dump
+after \fB\%endwin\fP(3X).
+An application that supports suspending its state on exit and subsequent
+resumption upon later execution might use
+.B \%scr_dump
+and
+.B \%scr_init
+thus.
 .SS scr_set
-The \fBscr_set\fP routine is a combination of \fBscr_restore\fP and
-\fBscr_init\fP.  It tells the program that the information in \fIfilename\fP is
-what is currently on the screen, and also what the program wants on the screen.
-This can be thought of as a screen inheritance function.
+.B \%scr_set
+combines
+.B \%scr_restore
+and
+.BR \%scr_init ","
+synchronizing the contents of
+.I filename
+with the virtual screen.
+It can be regarded as a screen inheritance function;
+consider a real-time screen-sharing application.
 .SH RETURN VALUE
-These functions return \fBOK\fP on success and \fBERR\fP on failure.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open defines no failure conditions.
-In this implementation,
-each function fails if it cannot open
-.IR filename .
+In
+.IR \%ncurses ","
+each function returns
+.B ERR
+if it cannot open
+.IR filename "."
+.BR \%scr_init ","
+.BR \%scr_restore ","
+and
+.B \%scr_set
+return
+.B ERR
+if the contents of
+.I filename
+are invalid.
 .SH NOTES
-\fB\%scr_init\fP,
-\fB\%scr_set\fP,
+.BR \%scr_init ","
+.BR \%scr_restore ","
 and
-\fB\%scr_restore\fP may be macros.
+.B \%scr_set
+may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
+.\" Unusually, SVID 4 explicitly indicated "OK" as a possible return
+.\" value, rather than the "integer other than ERR" refrain (p. 529).
 .PP
 .\" SVID 4, p. 529
 SVr4 omitted the
 .I \%const
 qualifiers.
 .PP
-SVr4 documentation describes \fB\%scr_init\fP such that the dump data is
-also considered invalid \*(``if the time-stamp of the tty is old\*(''
+SVr4 documentation describes
+.B \%scr_init
+such that the dump data is also considered invalid
+\*(``if the time-stamp of the tty is old\*(''
 but does not define \*(``old\*(''.
+.SH HISTORY
+SVr3 (1987) introduced
+.BR \%scr_dump ","
+.BR \%scr_init ","
+and
+.BR \%scr_restore "."
+SVr3.1 added
+.BR \%scr_set "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_util\fP(3X),
 \fB\%system\fP(3),
-\fB\%scr_dump\fP(5)
+\fB\%scr_dump\fP(5),
+\fB\%terminfo\fP(5)
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 580f29d89..046a3a96c 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp $
-.TH curs_terminfo 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp $
+.TH curs_terminfo 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -681,7 +681,7 @@ fails if the associated call to \fB\%setupterm\fP returns
 .B setupterm
 fails if it cannot allocate enough memory,
 or create the initial windows
-.RB ( \%stdscr ,
+.RB \%( stdscr ,
 .BR \%curscr ,
 and
 .BR \%newscr )
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 3cb3fa726..a4f5de232 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp $
-.TH curs_util 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp $
+.TH curs_util 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -128,7 +128,7 @@ which some implementations return rather than null.
 .LP
 The corresponding \fBkey_name\fP returns
 a multibyte character string corresponding
-to the wide-character value \fIw\fP.
+to the wide-character value \fIwc\fP.
 The two functions (\fBkeyname\fP and \fBkey_name\fP)
 do not return the same set of strings:
 .bP
@@ -323,9 +323,9 @@ Neither limits the delay.
 The \fBkeyname\fP function may return the names of user-defined
 string capabilities which are defined in the terminfo entry via the \fB\-x\fP
 option of \fB@TIC@\fP.
-This implementation automatically assigns at run-time keycodes to
+This implementation automatically assigns at run-time key codes to
 user-defined strings which begin with \*(``k\*(''.
-The keycodes start at KEY_MAX, but are not guaranteed to be
+The key codes 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 \fBuse_extended_names\fP(3X) function controls whether this data is
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 149db81e9..88bb4a348 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp $
-.TH curs_window 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp $
+.TH curs_window 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%newwin\fP,
 \fB\%delwin\fP,
@@ -254,7 +254,7 @@ It simply returned
 when asked to delete a subwindow.
 Solaris X/Open
 .I curses
-.RI ( \%xcurses )
+.RI \%( xcurses )
 does not make even that check,
 and will delete a parent window that still has subwindows.
 .I \%PDCurses
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 4e904df81..e94e10a4b 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp $
-.TH ncurses 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp $
+.TH ncurses 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -265,7 +265,7 @@ identifying the cell within it at which the next output operation will
 occur.
 Among those,
 the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
-these place the cursor and write a character to
+these place the cursor within and write a character to
 .BR \%stdscr ,
 respectively.
 .PP
@@ -410,6 +410,7 @@ Four functions prefixed with \*(``p\*('' require a pad argument.
 In function synopses,
 .I \%ncurses
 man pages apply the following names to parameters.
+We introduce the character types in the next subsection.
 .PP
 .TS
 center;
@@ -470,17 +471,35 @@ which handles character encodings requiring a larger data type than
 .I \%char
 (a byte-sized type)
 can represent.
-It adds about one third more calls using additional data types that
-can store such
-.I multibyte
-characters.
+It provides additional functions that complement those in
+the non-wide library where the size of the underlying character type is
+significant.
+A somewhat regular naming convention relates many of the wide variants
+to their non-wide counterparts;
+where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
+prefix it with \*(``_w\*('' to obtain the wide counterpart.
+For example,
+\fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+(Exceptions that add only \*(``w\*('' comprise
+.BR \%addwstr ,
+.BR \%inwstr ,
+and their variants.)
+.IP
+This convention is inapplicable to some non-wide function names,
+so other transformations are used for the wide configuration:
+the window background management function \*(``bkgd\*('' becomes
+\*(``bkgrnd\*('';
+the window border-drawing and -clearing functions are suffixed with
+\*(``_set\*('';
+and character attribute manipulation functions like
+\*(``attron\*('' become \*(``attr_on\*(''.
 .RS 10 \" same as foregoing tag width
 .TP 9 \" "cchar_t" + 2n
 .I \%cchar_t
 corresponds to the non-wide configuration's
 .IR \%chtype .
-It always a structure type,
-because it stores more data than fit into a standard scalar type.
+It is a structure type
+because it requires more storage than fits into a standard scalar type.
 A character code may not be representable as a
 .IR \%char ,
 and moreover more than one character may occupy a cell
@@ -541,29 +560,6 @@ analogously to the
 character manipulation functions of ISO C and its constant
 .BR \%EOF .
 .RE
-.IP
-The wide library provides additional functions that complement those in
-the non-wide library where the size of the underlying character type is
-significant.
-A somewhat regular naming convention relates many of the wide variants
-to their non-wide counterparts;
-where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
-prefix it with \*(``_w\*('' to obtain the wide counterpart.
-For example,
-\fB\%waddch\fP becomes \fB\%wadd_wch\fP.
-(Exceptions that add only \*(``w\*('' comprise
-.BR \%addwstr ,
-.BR \%inwstr ,
-and their variants.)
-.IP
-This convention is inapplicable to some non-wide function names,
-so other transformations are used for the wide configuration:
-the window background management function \*(``bkgd\*('' becomes
-\*(``bkgrnd\*('';
-the window border-drawing and -clearing functions are suffixed with
-\*(``_set\*('';
-and character attribute manipulation functions like
-\*(``attron\*('' become \*(``attr_on\*(''.
 .\"
 .SS "Function Name Index"
 The following table lists the
@@ -761,7 +757,7 @@ mvaddnwstr/\fBcurs_addwstr\fP(3X)
 mvaddstr/\fBcurs_addstr\fP(3X)
 mvaddwstr/\fBcurs_addwstr\fP(3X)
 mvchgat/\fBcurs_attr\fP(3X)
-mvcur/\fBcurs_terminfo\fP(3X)
+mvcur/\fBcurs_kernel\fP(3X)
 mvdelch/\fBcurs_delch\fP(3X)
 mvderwin/\fBcurs_window\fP(3X)
 mvget_wch/\fBcurs_get_wch\fP(3X)
@@ -1094,7 +1090,7 @@ that take into account optimization decisions that depend on baud rate.
 When set,
 the
 .B \%command_character
-.RB ( \%cmdch )
+.RB \%( cmdch )
 capability value of loaded
 .I \%term\%info
 entries changes to the value of this variable.
@@ -1102,8 +1098,8 @@ Very few
 .I \%term\%info
 entries provide this feature.
 .PP
-Because this name is also used in development environments to represent
-the C compiler's name,
+Because this name is also used in development environments to store the
+C compiler's name,
 .I \%ncurses
 ignores its value if it is not one character in length.
 .SS "\fICOLUMNS\fP"
@@ -1117,7 +1113,7 @@ terminal driver,
 .I \%ncurses
 uses the size specified by the
 .B \%columns
-.RB ( \%cols )
+.RB \%( cols )
 capability of the terminal type's entry in the
 .I \%term\%info
 database,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index ac78f4aac..4fe2d8163 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240525) unstable; urgency=low
+ncurses6 (6.5+20240601) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index ac78f4aac..4fe2d8163 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240525) unstable; urgency=low
+ncurses6 (6.5+20240601) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9f2e0b331..ae19371f8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240525) unstable; urgency=low
+ncurses6 (6.5+20240601) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 May 2024 06:33:51 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 2dc4cf49d..278ed0cbc 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.650 2024/05/25 10:33:51 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.651 2024/06/01 11:06:41 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0525"
+!define VERSION_MMDD  "0601"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9b74e3df6..23438cc2e 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240525
+Release: 20240601
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 0c59b4d15..8dd480b6f 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240525
+Release: 20240601
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 19179901a..a777197d8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240525
+Release: 20240601
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/package/debian/rules b/test/package/debian/rules
index 2cc34f730..e8e4eb15d 100755
--- a/test/package/debian/rules
+++ b/test/package/debian/rules
@@ -75,7 +75,7 @@ config-$(NCURSES_PKG)-stamp:
 
 	cd t/ncurses6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSES_PKG) \
-		--with-screen=ncursesw6
+		--with-screen=ncurses6
 
 	touch $@
 
@@ -87,7 +87,7 @@ config-$(NCURSEST_PKG)-stamp:
 
 	cd t/ncursest6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSEST_PKG) \
-		--with-screen=ncursestw6
+		--with-screen=ncursest6
 
 	touch $@
 

From 94a2e85ed25719b13738f729879665bcdf96cba5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 9 Jun 2024 03:06:48 +0200
Subject: [PATCH 071/106] ncurses-6.5-20240608.patch.gz

---
 Ada95/include/ncurses_cfg.hin                 |   6 +-
 Ada95/package/AdaCurses-doc.spec              |   4 +-
 Ada95/package/AdaCurses.spec                  |   4 +-
 Ada95/package/debian/rules                    |   2 +-
 Ada95/package/debian/watch                    |   2 +-
 INSTALL                                       |   6 +-
 MANIFEST                                      |  12 +-
 NEWS                                          |   9 +-
 VERSION                                       |   2 +-
 dist.mk                                       |   4 +-
 doc/html/man/curs_addch.3x.html               |  89 ++++----
 doc/html/man/curs_get_wch.3x.html             |  40 ++--
 doc/html/man/curs_get_wstr.3x.html            |  12 +-
 doc/html/man/curs_getch.3x.html               |  69 +++---
 doc/html/man/curs_getstr.3x.html              |  89 ++++----
 doc/html/man/curs_getyx.3x.html               |  16 +-
 doc/html/man/curs_inch.3x.html                |  17 +-
 doc/html/man/curs_initscr.3x.html             |  10 +-
 doc/html/man/curs_inopts.3x.html              |  26 ++-
 doc/html/man/curs_ins_wstr.3x.html            |  37 ++--
 doc/html/man/curs_insstr.3x.html              |  29 +--
 doc/html/man/curs_instr.3x.html               |  94 +++++---
 doc/html/man/curs_inwstr.3x.html              | 101 +++++----
 doc/html/man/curs_kernel.3x.html              | 100 +++++----
 doc/html/man/curs_scr_dump.3x.html            |  22 +-
 doc/html/man/curs_terminfo.3x.html            |   8 +-
 doc/html/man/curs_util.3x.html                |  40 ++--
 doc/html/man/define_key.3x.html               |  11 +-
 doc/html/man/key_defined.3x.html              |  10 +-
 doc/html/man/keybound.3x.html                 |  10 +-
 doc/html/man/keyok.3x.html                    |  10 +-
 doc/html/man/ncurses.3x.html                  |  40 ++--
 doc/html/man/terminfo.5.html                  |  34 +--
 doc/html/man/tput.1.html                      |  30 +--
 doc/html/man/tset.1.html                      |  14 +-
 doc/html/man/user_caps.5.html                 |  12 +-
 include/ncurses_cfg.hin                       |   6 +-
 man/curs_addch.3x                             |   5 +-
 man/curs_get_wch.3x                           |  32 +--
 man/curs_get_wstr.3x                          |   9 +-
 man/curs_getch.3x                             |  31 ++-
 man/curs_getstr.3x                            |  12 +-
 man/curs_getyx.3x                             |   6 +-
 man/curs_inch.3x                              |  16 +-
 man/curs_initscr.3x                           |   6 +-
 man/curs_inopts.3x                            |  21 +-
 man/curs_ins_wstr.3x                          |  54 +++--
 man/curs_insstr.3x                            |  41 +++-
 man/curs_instr.3x                             | 178 +++++++++++----
 man/curs_inwstr.3x                            | 209 +++++++++++++-----
 man/curs_kernel.3x                            |  91 +++++---
 man/curs_scr_dump.3x                          |  26 +--
 man/curs_terminfo.3x                          |   5 +-
 man/curs_util.3x                              | 197 +++++++++++------
 man/define_key.3x                             |   9 +-
 man/key_defined.3x                            |   7 +-
 man/keybound.3x                               |   8 +-
 man/keyok.3x                                  |   8 +-
 man/man_db.renames.in                         |   6 +-
 man/manhtml.aliases                           |   6 +-
 man/ncurses.3x                                |  28 ++-
 man/terminfo.tail                             |  28 +--
 man/tput.1                                    |  26 ++-
 man/tset.1                                    |   9 +-
 man/user_caps.5                               |  11 +-
 ncurses/widechar/lib_inwstr.c                 |  19 +-
 package/debian-mingw/changelog                |   4 +-
 package/debian-mingw/control                  |   7 +-
 .../mingw32-ncurses6td.lintian-overrides      |   7 +
 package/debian-mingw/rules                    |   4 +-
 package/debian-mingw/watch                    |   2 +-
 package/debian-mingw64/changelog              |   4 +-
 package/debian-mingw64/control                |   7 +-
 .../mingw64-ncurses6td.lintian-overrides      |   7 +
 package/debian-mingw64/rules                  |   4 +-
 package/debian-mingw64/watch                  |   2 +-
 package/debian/changelog                      |   4 +-
 package/debian/control                        |  22 +-
 package/debian/ncurses6td.lintian-overrides   |   9 +
 package/debian/ncurses6td.triggers            |   1 +
 package/debian/ncursest6td.lintian-overrides  |   9 +
 package/debian/ncursest6td.triggers           |   1 +
 package/debian/rules                          |  80 +++----
 package/debian/watch                          |   2 +-
 package/mingw-ncurses.nsi                     |   4 +-
 package/mingw-ncurses.spec                    |   2 +-
 package/ncurses.spec                          |   2 +-
 package/ncursest.spec                         |   2 +-
 test/package/debian-mingw/rules               |   2 +-
 test/package/debian-mingw/watch               |   2 +-
 test/package/debian-mingw64/rules             |   2 +-
 test/package/debian-mingw64/watch             |   2 +-
 test/package/debian/rules                     |   4 +-
 test/package/debian/watch                     |   2 +-
 94 files changed, 1399 insertions(+), 932 deletions(-)
 create mode 100644 package/debian-mingw/mingw32-ncurses6td.lintian-overrides
 create mode 100644 package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
 create mode 100644 package/debian/ncurses6td.lintian-overrides
 create mode 100644 package/debian/ncurses6td.triggers
 create mode 100644 package/debian/ncursest6td.lintian-overrides
 create mode 100644 package/debian/ncursest6td.triggers

diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin
index f8bcb6628..c19ac8a57 100644
--- a/Ada95/include/ncurses_cfg.hin
+++ b/Ada95/include/ncurses_cfg.hin
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2005-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.13 2024/06/08 14:04:14 tom Exp $
  *
  * This is a template-file used to generate the "ncurses_cfg.h" file.
  *
@@ -41,7 +41,7 @@
  *
  * See:
  *	https://invisible-island.net/autoconf/
- *	ftp://ftp.invisible-island.net/autoconf/
+ *	https://invisible-island.net/archives/autoconf/
  */
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec
index c5b68dd49..cfc8527c6 100644
--- a/Ada95/package/AdaCurses-doc.spec
+++ b/Ada95/package/AdaCurses-doc.spec
@@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
 %define AppPackage %{AppProgram}-doc
-# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $
+# $Id: AdaCurses-doc.spec,v 1.8 2024/06/08 13:54:31 tom Exp $
 Name: %{AppPackage}
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: MIT
 Group: Applications/Development
-URL: ftp://ftp.invisible-island.net/%{AppProgram}
+URL: https://invisible-island.net/%{AppProgram}
 Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>
 
diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec
index be18e68dc..aa557ab11 100644
--- a/Ada95/package/AdaCurses.spec
+++ b/Ada95/package/AdaCurses.spec
@@ -2,13 +2,13 @@ Summary: Ada95 binding for ncurses
 %define AppProgram AdaCurses
 %define AppVersion MAJOR.MINOR
 %define AppRelease YYYYMMDD
-# $Id: AdaCurses.spec,v 1.33 2024/06/01 22:51:57 tom Exp $
+# $Id: AdaCurses.spec,v 1.34 2024/06/08 13:53:14 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
 License: MIT
 Group: Applications/Development
-URL: ftp://ftp.invisible-island.net/%{AppProgram}
+URL: https://invisible-island.net/%{AppProgram}
 Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>
 
diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules
index 162668f22..8f8e841ce 100755
--- a/Ada95/package/debian/rules
+++ b/Ada95/package/debian/rules
@@ -41,7 +41,7 @@ configure-stamp:
 		--disable-rpath-link \
 		--with-shared \
 		--with-ada-sharedlib \
-		--with-screen=ncurses6 \
+		--with-screen=ncursesw6td \
 		--without-pkg-config
 
 	touch configure-stamp
diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch
index 1b870ba19..5a8f1d2a3 100644
--- a/Ada95/package/debian/watch
+++ b/Ada95/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/AdaCurses/AdaCurses-([\d.]+)\.tgz \
  debian  uupdate
diff --git a/INSTALL b/INSTALL
index a8198fb5b..f7a252c35 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.255 2024/05/04 15:54:00 tom Exp $
+-- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -550,8 +550,8 @@ CONFIGURE OPTIONS:
 	problem.
 
     --enable-bsdpad
-	Recognize BSD-style prefix padding.  Some ancient BSD programs (such as
-	nethack) call tputs("50") to implement delays.
+	Recognize BSD-style prefix padding.  Some programs written using
+	the BSD curses API use tputs("50") to implement delays.
 
     --enable-check-size
 	Compile-in feature to detect screensize for terminals which do not
diff --git a/MANIFEST b/MANIFEST
index a9395d2f8..9e506b481 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1012,7 +1012,7 @@
 ./package/debian-mingw/compat
 ./package/debian-mingw/control
 ./package/debian-mingw/copyright
-./package/debian-mingw/mingw32-ncurses6.lintian-overrides
+./package/debian-mingw/mingw32-ncurses6td.lintian-overrides
 ./package/debian-mingw/rules
 ./package/debian-mingw/source/format
 ./package/debian-mingw/watch
@@ -1020,7 +1020,7 @@
 ./package/debian-mingw64/compat
 ./package/debian-mingw64/control
 ./package/debian-mingw64/copyright
-./package/debian-mingw64/mingw64-ncurses6.lintian-overrides
+./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
 ./package/debian-mingw64/rules
 ./package/debian-mingw64/source/format
 ./package/debian-mingw64/watch
@@ -1028,10 +1028,10 @@
 ./package/debian/compat
 ./package/debian/control
 ./package/debian/copyright
-./package/debian/ncurses6.lintian-overrides
-./package/debian/ncurses6.triggers
-./package/debian/ncursest6.lintian-overrides
-./package/debian/ncursest6.triggers
+./package/debian/ncurses6td.lintian-overrides
+./package/debian/ncurses6td.triggers
+./package/debian/ncursest6td.lintian-overrides
+./package/debian/ncursest6td.triggers
 ./package/debian/rules
 ./package/debian/source/format
 ./package/debian/watch
diff --git a/NEWS b/NEWS
index 76eaf90ee..d829b88ad 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4131 2024/06/01 22:49:52 tom Exp $
+-- $Id: NEWS,v 1.4134 2024/06/08 21:21:25 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240608
+	+ change winwstr to return wide character count instead of OK (patch
+	  by Branden Robinson).
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ rename testing dpkg's for ncurses6 to resolve a naming conflict with
+	  Debian's ncurses packages.
+
 20240601
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ change Ada95/configure to use --with-screen option rather than
diff --git a/VERSION b/VERSION
index 0ee88e4d4..bb0b549af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240601
+5:0:10	6.5	20240608
diff --git a/dist.mk b/dist.mk
index 4c5f84b32..054a859c2 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1616 2024/06/01 11:06:41 tom Exp $
+# $Id: dist.mk,v 1.1617 2024/06/08 09:49:40 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240601
+NCURSES_PATCH = 20240608
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 593355b54..ac18dbcb9 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -217,80 +217,79 @@ <H1 class="no-header">curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open Curses states that the <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
-
+       X/Open Curses states that the  <STRONG>ACS_</STRONG>  definitions  are  <EM>char</EM>  constants.
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
+       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
            others define them as elements of an array.
 
-           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
+           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
+       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
+           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
-           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
-           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
+       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
+           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
            implementations use "i" (small i).
 
-           None  of  the terminal descriptions on Unix platforms use uppercase
-           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
-           apparently  based on the X/Open documentation around 1995).  On the
-           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
+           None of the terminal descriptions on Unix platforms  use  uppercase
+           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
+           apparently based on the X/Open documentation around 1995).  On  the
+           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
            description uses lowercase i.
 
-       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
-       released  System V.   However, many publicly available <EM>terminfo</EM> entries
-       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
-       embedded,  and  a  second-hand list of their character descriptions has
-       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
+       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
+       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
+       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
+       embedded, and a second-hand list of their  character  descriptions  has
+       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character configurations  (the  former  is  capable  of  displaying
+           character  configurations  (the  former  is  capable  of displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
-       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
+       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
-       single character.  That character may have been more  than  eight  bits
-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
-       width of a non-wide character code unspecified.  The  standard  further
-       does  not specify the internal structure of a <EM>chtype</EM>, though the use of
-       bit operations to combine the character  code  with  attributes  and  a
+       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
+       single  character.   That  character may have been more than eight bits
+       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+       width  of  a non-wide character code unspecified.  The standard further
+       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
+       bit  operations  to  combine  the  character code with attributes and a
        color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
-       a multibyte character sequence to be passed via a succession  of  calls
-       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
-       exactly one character, which may be rendered  in  one  or  more  screen
-       locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
-       Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
-       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
-       character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
-       character   and  advances  the  cursor.   If  the  calling  application
+       a  multibyte  character sequence to be passed via a succession of calls
+       to <STRONG>waddch</STRONG>.  Other implementations  do  not;  a  <STRONG>waddch</STRONG>  call  transmits
+       exactly  one  character,  which  may  be rendered in one or more screen
+       locations depending  on  whether  it  is  printable  (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
+       Depending  on  the  locale,  <EM>ncurses</EM>  inspects  the byte passed in each
+       <STRONG>waddch</STRONG> call and checks whether the latest call  continues  a  multibyte
+       character.    When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays  the
+       character  and  advances  the  cursor.   If  the  calling   application
        interrupts the succession of bytes in a multibyte character sequence by
-       changing  the  current  location--for  example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
+       changing the current  location--for  example,  with  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
        discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
-       foregoing  behavior.  Check whether a character can be represented as a
+       foregoing behavior.  Check whether a character can be represented as  a
        single byte in the current locale.
 
        <STRONG>o</STRONG>   If it can, call either <STRONG>waddch</STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
@@ -305,16 +304,16 @@ <H1 class="no-header">curs_addch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index a8149fb92..8db437780 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -81,31 +81,35 @@ <H1 class="no-header">curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        If  no input is pending, then if the no-delay flag is set in the window
        (see <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>), the function returns <STRONG>ERR</STRONG>;  otherwise,  <EM>curses</EM>  waits
        until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
-       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been  called,
-       it  occurs  when  the  next newline is read.  If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been
-       called, <EM>curses</EM> waits until input is available or  the  specified  delay
-       elapses.
+       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG>  has
+       been  called,  it  occurs  when the next newline is read.  (Because the
+       terminal's normal or "cooked" mode is line-buffered, multiple  <STRONG>wget_wch</STRONG>
+       calls   may   then   be  necessary  to  empty  the  input  queue.)   If
+       <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
+       the specified delay elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
-       <EM>wch</EM> to the window (at the cursor position) per the following rules.
+       the wide character from the input queue to the window  (at  the  cursor
+       position) per the following rules.
 
-       <STRONG>o</STRONG>   If <EM>wch</EM> matches the terminal's erase  character,  the  cursor  moves
-           leftward  one  position  and  the  new  position  is  erased  as if
-           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When  the  window's
-           keypad  mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
-           handled the same way.
+       <STRONG>o</STRONG>   If  the  wide character matches the terminal's erase character (see
+           <STRONG><A HREF="curs_termattrs.3x.html">erasewchar(3x)</A></STRONG>), the cursor moves leftward one position and the new
+           position is erased as if <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG> were called.
+           When the window's keypad mode is enabled (see below), <STRONG>KEY_LEFT</STRONG>  and
+           <STRONG>KEY_BACKSPACE</STRONG> are handled the same way.
 
-       <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>wch</EM> to the window, as with <STRONG><A HREF="curs_add_wch.3x.html">wecho_wchar(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   <EM>curses</EM>  writes  any  other  wide  character  to the window, as with
+           <STRONG><A HREF="curs_add_wch.3x.html">wecho_wchar(3x)</A></STRONG>.
 
        <STRONG>o</STRONG>   If the window <EM>win</EM> has been moved or modified since the last call to
            <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG> on it.
 
-       If  <EM>wch</EM>  is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called, <STRONG>wgetch</STRONG> stores
-       the the character code for line feed in <EM>wch</EM> instead.
+       If  the wide character is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,
+       <STRONG>wgetch</STRONG> stores the the wide character code for line feed in <EM>wch</EM> instead.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>unget_wch</STRONG> places <EM>wch</EM> into the input queue to be returned  by  the  next
+       <STRONG>unget_wch</STRONG> places <EM>wc</EM> into the input queue to be retrieved  by  the  next
        call  to  <STRONG>wget_wch</STRONG>.  A single input queue serves all windows associated
        with the terminal.
 
@@ -168,7 +172,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index ded3cb3dc..6d387bd08 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -142,8 +142,8 @@ <H1 class="no-header">curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in The Single Unix Specification, Version
-       2.  No error conditions are defined.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
        This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
        the lower-level <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter  case,  an
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 3bc1777c2..3b11ae8cb 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -84,20 +84,22 @@ <H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        If no input is pending, then if the no-delay flag is set in the  window
        (see  <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>),  the  function returns <STRONG>ERR</STRONG>; otherwise, <EM>curses</EM> waits
        until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
-       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> has been called,
-       it occurs when the next newline is read.   If  <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG>  has  been
-       called,  <EM>curses</EM>  waits  until input is available or the specified delay
-       elapses.
+       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG> has
+       been called, it occurs when the next newline  is  read.   (Because  the
+       terminal's  normal  or  "cooked" mode is line-buffered, multiple <STRONG>wgetch</STRONG>
+       calls  may  then  be  necessary  to  empty  the   input   queue.)    If
+       <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
+       the specified delay elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
        the returned character <EM>c</EM> to the window (at the cursor position) per the
        following rules.
 
-       <STRONG>o</STRONG>   If <EM>c</EM> matches the  terminal's  erase  character,  the  cursor  moves
-           leftward  one  position  and  the  new  position  is  erased  as if
-           <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then  <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG>  were  called.   When  the  window's
-           keypad  mode is enabled (see below), <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
-           handled the same way.
+       <STRONG>o</STRONG>   If <EM>c</EM> matches the terminal's erase  character  (see  <STRONG><A HREF="curs_termattrs.3x.html">erasechar(3x)</A></STRONG>),
+           the  cursor  moves  leftward  one  position and the new position is
+           erased as if <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> and then <STRONG><A HREF="curs_delch.3x.html">wdelch(3x)</A></STRONG> were called.   When  the
+           window's   keypad   mode  is  enabled  (see  below),  <STRONG>KEY_LEFT</STRONG>  and
+           <STRONG>KEY_BACKSPACE</STRONG> are handled the same way.
 
        <STRONG>o</STRONG>   <EM>curses</EM> writes any other <EM>c</EM> to the window, as with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.
 
@@ -178,9 +180,9 @@ <H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
               <STRONG>KEY_UP</STRONG>          Arrow keys
               <STRONG>KEY_LEFT</STRONG>
               <STRONG>KEY_RIGHT</STRONG>
+
               <STRONG>KEY_HOME</STRONG>        Home key (upward+left arrow)
               <STRONG>KEY_BACKSPACE</STRONG>   Backspace
-
               <STRONG>KEY_F0</STRONG>          Function keys; space for 64 keys is reserved
               <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG>        Function key <EM>n</EM> where 0 &lt;= <EM>n</EM> &lt;= 63
               <STRONG>KEY_DL</STRONG>          Delete line
@@ -244,9 +246,9 @@ <H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
               <STRONG>KEY_SCOMMAND</STRONG>    Shifted command key
               <STRONG>KEY_SCOPY</STRONG>       Shifted copy key
               <STRONG>KEY_SCREATE</STRONG>     Shifted create key
+
               <STRONG>KEY_SDC</STRONG>         Shifted delete character key
               <STRONG>KEY_SDL</STRONG>         Shifted delete line key
-
               <STRONG>KEY_SEND</STRONG>        Shifted end key
               <STRONG>KEY_SEOL</STRONG>        Shifted clear line key
               <STRONG>KEY_SEXIT</STRONG>       Shifted exit key
@@ -282,8 +284,8 @@ <H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        key.
 
        <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns  <STRONG>KEY_RESIZE</STRONG>,  even  if  the window's keypad mode is
-           disabled, when <EM>ncurses</EM> handles a <STRONG>SIGWINCH</STRONG> signal;  see  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>
-           and <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
+           disabled, if <EM>ncurses</EM> has handled a <STRONG>SIGWINCH</STRONG> signal since <STRONG>wgetch</STRONG> was
+           called; see <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> and <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
 
        <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is pending
            collection; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.  Receipt of this  code  requires  a
@@ -388,45 +390,44 @@ <H1 class="no-header">curs_getch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        <STRONG>wgetch</STRONG> reads only single-byte characters.
 
        The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
-       characters  was  not  specified  in  the  SVr4   documentation.    This
-       description is adapted from X/Open Curses.
-
-       The   behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of  signal  handlers  is
-       unspecified in the SVr4 documentation and X/Open Curses.  In historical
-       <EM>curses</EM>  implementations,  it  varied depending on whether the operating
-       system's dispatch of a signal to a handler interrupted a  <STRONG>read(2)</STRONG>  call
-       in  progress,  and  also  (in  some  implementations)  whether an input
-       timeout  or  non-blocking  mode  had  been  set.   A  portable   <EM>curses</EM>
-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       characters is not documented in SVr4 <EM>curses</EM>.
+
+       The behavior of <STRONG>wgetch</STRONG> in  the  presence  of  signal  handlers  is  not
+       documented  in  SVr4  <EM>curses</EM>  and  is unspecified by X/Open Curses.  In
+       historical <EM>curses</EM> implementations, it varied depending on  whether  the
+       operating  system's  dispatch  of  a  signal to a handler interrupted a
+       <STRONG>read(2)</STRONG> call in progress, and also (in some implementations) whether an
+       input  timeout  or  non-blocking  mode had been set.  A portable <EM>curses</EM>
+       application prepares  for  two  cases:  (a)  signal  receipt  does  not
        interrupt <STRONG>wgetch</STRONG>; or (b) signal receipt interrupts <STRONG>wgetch</STRONG> and causes it
        to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
+       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG>  and  <STRONG>has_key</STRONG>  are extensions first implemented for <EM>ncurses</EM>.
+       <STRONG>KEY_RESIZE</STRONG> and <STRONG>has_key</STRONG> are extensions first  implemented  for  <EM>ncurses</EM>.
        By  2022,  <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  had  added  them  along  with
        <STRONG>KEY_MOUSE</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       ECMA-6  "7-bit  coded  Character  Set" &lt;https://ecma-international.org/
+       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
        publications-and-standards/standards/ecma-6/&gt;
 
-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   &lt;https://
+       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
        ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
 
-       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
 
 
-ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 0753dc21d..dc22cb809 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -138,99 +138,96 @@ <H1 class="no-header">curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in The Single Unix Specification, Version
-       2.  No error conditions are defined.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
-       the lower-level <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call returns an <STRONG>ERR</STRONG>.
-
-       SVr3 and early SVr4 curses  implementations  did  not  reject  function
-       keys;  the  SVr4.0  documentation  claimed that "special keys" (such as
-       function keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are  "interpreted",
-       without  giving  details.   It  lied.   In  fact, the "character" value
+       SVr3  and  early  SVr4  curses  implementations did not reject function
+       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
+       function  keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are "interpreted",
+       without giving details.  It  lied.   In  fact,  the  "character"  value
        appended to the string by those implementations was predictable but not
-       useful  (being,  in  fact,  the  low-order eight bits of the key's KEY_
+       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
        value).
 
-       The functions <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present  but  not
+       The  functions  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present but not
        documented in SVr4.
 
        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM> bytes" but did not state whether the terminating NUL  counted  toward
-       that  limit.   X/Open  Curses,  Issue 7 (2009) changed that to say they
+       <EM>n</EM>  bytes"  but did not state whether the terminating NUL counted toward
+       that limit.  X/Open Curses, Issue 7 (2009) changed  that  to  say  they
        "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
        some implementations count it, some do not:
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.1  and PDCurses do not count the NUL in the given limit,
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and PDCurses do not count the NUL in the  given  limit,
            while
 
        <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 
-       <STRONG>o</STRONG>   Solaris  xcurses  provides  both:  its   wide-character   <STRONG>wget_nstr</STRONG>
-           reserves   a   NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count  the  NUL
+       <STRONG>o</STRONG>   Solaris   xcurses   provides  both:  its  wide-character  <STRONG>wget_nstr</STRONG>
+           reserves  a  NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count   the   NUL
            consistently.
 
        In SVr4 curses, a negative value of <EM>n</EM> tells <STRONG>wgetnstr</STRONG> to assume that the
-       caller's  buffer  is large enough to hold the result, i.e., to act like
-       <STRONG>wgetstr</STRONG>.  X/Open Curses does not mention this (or anything  related  to
-       negative  or  zero  values  of <EM>n</EM>), however most implementations use the
+       caller's buffer is large enough to hold the result, i.e., to  act  like
+       <STRONG>wgetstr</STRONG>.   X/Open  Curses does not mention this (or anything related to
+       negative or zero values of <EM>n</EM>), however  most  implementations  use  the
        feature, with different limits:
 
-       <STRONG>o</STRONG>   Solaris SVr4 curses and PDCurses limit the  result  to  255  bytes.
+       <STRONG>o</STRONG>   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
            Other Unix systems than Solaris are likely to use the same limit.
 
        <STRONG>o</STRONG>   Solaris xcurses limits the result to <STRONG>LINE_MAX</STRONG> bytes.
 
-       <STRONG>o</STRONG>   NetBSD  7  assumes no particular limit for the result from <STRONG>wgetstr</STRONG>.
-           However, it limits the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure  that  it  is
+       <STRONG>o</STRONG>   NetBSD 7 assumes no particular limit for the result  from  <STRONG>wgetstr</STRONG>.
+           However,  it  limits  the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure that it is
            greater than zero.
 
-           A  comment in NetBSD's source code states that this is specified in
+           A comment in NetBSD's source code states that this is specified  in
            SUSv2.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> (before 6.2) assumes no particular  limit  for  the  result
-           from  <STRONG>wgetstr</STRONG>,  and  treats  the  <EM>n</EM> parameter of <STRONG>wgetnstr</STRONG> like SVr4
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  (before  6.2)  assumes  no particular limit for the result
+           from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
            curses.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.2 uses <STRONG>LINE_MAX</STRONG>, or  a  larger  (system-dependent)  value
-           which  the  <STRONG>sysconf</STRONG>  function  may provide.  If neither <STRONG>LINE_MAX</STRONG> or
-           <STRONG>sysconf</STRONG> is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG>  (a
-           2048  byte  limit).   In  either  case,  it reserves a byte for the
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
+           which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
+           <STRONG>sysconf</STRONG>  is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
+           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
            terminating NUL.
 
-       Although <STRONG>getnstr</STRONG> is equivalent to a series of calls to <STRONG>getch</STRONG>,  it  also
-       makes  changes to the curses modes to allow simple editing of the input
+       Although  <STRONG>getnstr</STRONG>  is equivalent to a series of calls to <STRONG>getch</STRONG>, it also
+       makes changes to the curses modes to allow simple editing of the  input
        buffer:
 
-       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG> saves the current value of the <STRONG>nl</STRONG>,  <STRONG>echo</STRONG>,  <STRONG>raw</STRONG>  and  <STRONG>cbreak</STRONG>
+       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG>  saves  the  current  value of the <STRONG>nl</STRONG>, <STRONG>echo</STRONG>, <STRONG>raw</STRONG> and <STRONG>cbreak</STRONG>
            modes, and sets <STRONG>nl</STRONG>, <STRONG>noecho</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>cbreak</STRONG>.
 
-           <STRONG>getnstr</STRONG>  handles  the echoing of characters, rather than relying on
+           <STRONG>getnstr</STRONG> handles the echoing of characters, rather than  relying  on
            the caller to set an appropriate mode.
 
-       <STRONG>o</STRONG>   It also obtains the <EM>erase</EM> and <EM>kill</EM> characters  from  <STRONG>erasechar</STRONG>  and
+       <STRONG>o</STRONG>   It  also  obtains  the <EM>erase</EM> and <EM>kill</EM> characters from <STRONG>erasechar</STRONG> and
            <STRONG>killchar</STRONG>, respectively.
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
 
        Other implementations differ in their treatment of special characters:
 
-       <STRONG>o</STRONG>   While  they  may  set  the  <EM>echo</EM> mode, other implementations do not
-           modify the <EM>raw</EM> mode, They may take  the  <EM>cbreak</EM>  mode  set  by  the
-           caller  into account when deciding whether to handle echoing within
+       <STRONG>o</STRONG>   While they may set the <EM>echo</EM>  mode,  other  implementations  do  not
+           modify  the  <EM>raw</EM>  mode,  They  may  take the <EM>cbreak</EM> mode set by the
+           caller into account when deciding whether to handle echoing  within
            <STRONG>getnstr</STRONG> or as a side-effect of the <STRONG>getch</STRONG> calls.
 
        <STRONG>o</STRONG>   The original <EM>ncurses</EM> (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
-           accepting  input  for  <STRONG>getnstr</STRONG>.   That  may  have been done to make
+           accepting input for <STRONG>getnstr</STRONG>.  That  may  have  been  done  to  make
            function- and cursor-keys work; it is not necessary with <EM>ncurses</EM>.
 
-           Since 1995, <EM>ncurses</EM> has provided signal handlers for INTR and  QUIT
-           (e.g.,  <STRONG>^C</STRONG>  or  <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> settings, those may
-           catch a signal and stop the program,  where  other  implementations
+           Since  1995, <EM>ncurses</EM> has provided signal handlers for INTR and QUIT
+           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
+           catch  a  signal  and stop the program, where other implementations
            allow one to enter those characters in the buffer.
 
        <STRONG>o</STRONG>   Starting in 2021 (<EM>ncurses</EM> 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
-           and  <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,   e.g.,
+           and   <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,  e.g.,
            allowing one to enter a <STRONG>^C</STRONG> into the buffer.
 
 
@@ -242,7 +239,7 @@ <H1 class="no-header">curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index fa30badb4..f12c587b5 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -64,10 +64,10 @@ <H1 class="no-header">curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These macros obtain the cursor position and  bounds  information  of  a
        <EM>curses</EM> window <EM>win</EM>.  <STRONG>getyx</STRONG> stores <EM>win</EM>'s cursor position in the variables
-       <EM>y</EM> and <EM>x</EM>.  <STRONG>getmaxyx</STRONG> stores <EM>win</EM>'s maximum valid row and column numbers in
-       <EM>y</EM> and <EM>x</EM>, respectively.  <STRONG>getbegyx</STRONG> similarly stores the position of <EM>win</EM>'s
-       origin relative to that of the screen (for  <STRONG>stdscr</STRONG>,  these  coordinates
-       are always <STRONG>0</STRONG>).
+       <EM>y</EM> and <EM>x</EM>.  <STRONG>getmaxyx</STRONG> stores <EM>win</EM>'s maximum valid line and  column  numbers
+       in  <EM>y</EM>  and  <EM>x</EM>, respectively.  <STRONG>getbegyx</STRONG> similarly stores the position of
+       <EM>win</EM>'s origin  relative  to  that  of  the  screen  (for  <STRONG>stdscr</STRONG>,  these
+       coordinates are always <STRONG>0</STRONG>).
 
        If  <EM>win</EM>  is a subwindow (see <STRONG><A HREF="subwin.3x.html">subwin(3x)</A></STRONG>), the <STRONG>getparyx</STRONG> macro places the
        coordinates of its origin relative to its parent window into <EM>y</EM>  and  <EM>x</EM>,
@@ -109,7 +109,7 @@ <H1 class="no-header">curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 3dfd504e0..0e8a2c228 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -109,23 +109,16 @@ <H1 class="no-header">curs_inch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
        the attributes.
 
-       X/Open Curses does not specify the sizes of the character code or color
-       pair identifier, nor the quantity of attribute bits, in  <EM>chtype</EM>;  these
-       are   implementation-dependent.    <EM>ncurses</EM>  uses  eight  bits  for  the
-       character code.  An application requiring a wider character  type,  for
-       instance   to   represent   Unicode,   should  use  the  wide-character
-       counterparts of these functions.
-
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-01                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 717593ac2..9b77d4c39 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp @
+  * @Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -286,7 +286,7 @@ <H1 class="no-header">curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        <STRONG>SIGWINCH</STRONG>
             This handles the window-size changes which  were  ignored  in  the
             standardization   efforts.    The  handler  sets  a  (signal-safe)
-            variable that is later tested by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> and <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>:
+            variable that is later tested by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> and <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>.
 
             <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns the key code <STRONG>KEY_RESIZE</STRONG>.
 
@@ -303,7 +303,7 @@ <H1 class="no-header">curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index d447ccd29..30829c59e 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp @
+  * @Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -127,8 +127,8 @@ <H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> determine whether characters  typed  by  the  user  are
        written to the <EM>curses</EM> window by the input character reading function as
        they are typed.  <EM>curses</EM>  always  disables  the  terminal  driver's  own
-       echoing.   By  default, a <EM>curses</EM> window has its echo flag set.  Authors
-       of most interactive programs prefer  to  do  their  own  echoing  in  a
+       echoing.  By default, a <EM>curses</EM> screen's echo option is set.  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 call
        <STRONG>noecho</STRONG>.   The  man  page  for  the  input  character  reading  function
        discusses how <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> interact with <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.
@@ -176,9 +176,11 @@ <H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-nl_nonl">nl, nonl</a></H3><PRE>
        Initially,  whether  the  terminal  reports a carriage return using the
-       character code for a line feed depends  on  the  configuration  of  the
-       terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures the terminal to perform
-       this translation.  <STRONG>nonl</STRONG> disables it.
+       character code for a line feed in cbreak or raw modes  depends  on  the
+       configuration  of  the  terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures
+       the terminal to perform this translation.  <STRONG>nonl</STRONG> disables it.  In normal
+       (or  "cooked")  mode,  the  terminal  driver always translates carriage
+       returns to line feeds.
 
 
 </PRE><H3><a name="h3-nodelay">nodelay</a></H3><PRE>
@@ -289,9 +291,9 @@ <H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
        In each case, the function returns
 
-       <STRONG>1</STRONG>    if the flag is set,
+       <STRONG>1</STRONG>    if the option is set,
 
-       <STRONG>0</STRONG>    if the flag is reset, or
+       <STRONG>0</STRONG>    if the option is reset, or
 
        <STRONG>-1</STRONG>   if the library is not initialized.
 
@@ -376,11 +378,11 @@ <H1 class="no-header">curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
 
 
 
-ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index d947cc464..4c9506f1f 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -84,47 +84,48 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns <STRONG>ERR</STRONG>
+       X/Open Curses does not specify any error conditions.  In <EM>ncurses</EM>,  they
+       return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the <EM>wstr</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if the <STRONG>wins_wch</STRONG> function returns <STRONG>ERR</STRONG>.
+       <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All but <STRONG>wins_nwstr</STRONG> may be macros.
+       All of these functions except <STRONG>wins_nwstr</STRONG> may be implemented as macros.
 
        If the first character in the string is a non-spacing character,  these
-       functions will fail.  X/Open Curses does not define what will happen if
-       a non-spacing character follows a control character.
+       functions return <STRONG>ERR</STRONG>.  X/Open Curses does not specify what happens if a
+       non-spacing character follows a control character.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses,  Issue  4,  which  adds
-       <EM>const</EM> qualifiers to the arguments.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       X/Open  states  that the entire string is inserted if <EM>n</EM> is less than 1.
+       Issue  4 states that the entire string is inserted if <EM>n</EM> is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions, and differs from the X/Open implementation on Solaris.
+       functions,  and  differs  from  the  SVr4  <EM>curses</EM>  and  Solaris <EM>xcurses</EM>
+       implementations.  Nevertheless, Issue 7 retains it.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index e1e4b5494..55bcbe1bc 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -102,26 +102,29 @@ <H1 class="no-header">curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in X/Open Curses, Issue 4, which adds
-       <EM>const</EM> qualifiers to the arguments.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
 
-       The Single Unix  Specification,  Version  2  states  that  <STRONG>insnstr</STRONG>  and
-       <STRONG>winsnstr</STRONG>  perform  wrapping.  This is probably an error, since it makes
-       this group of  functions  inconsistent.   Also,  no  implementation  of
-       curses documents this inconsistency.
+       Issue 4 distinguished <STRONG>insnstr</STRONG> and <STRONG>winsnstr</STRONG>  by  stating  they  "do  not
+       perform  wrapping".   This  was  probably an error, since it makes this
+       group of functions inconsistent.  No implementation of <EM>curses</EM> documents
+       this inconsistency, and Issue 7 removed it.
 
-       X/Open  states  that the entire string is inserted if <EM>n</EM> is less than 1.
+       Issue  4 states that the entire string is inserted if <EM>n</EM> is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions,  and  differs  from  the  SVr4 and X/Open implementations on
-       Solaris.
+       functions,  and  differs  from  the  SVr4  <EM>curses</EM>  and  Solaris <EM>xcurses</EM>
+       implementations.  Nevertheless, Issue 7 retains it.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
+       in its wide-character configuration (<EM>ncursesw</EM>).
+
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 5488404b0..9ff33254e 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -54,69 +54,91 @@ <H1 class="no-header">curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>instr(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>innstr(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>instr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvinstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvinnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>innstr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines return a string of characters in <EM>str</EM>,  starting  at  the
-       current  cursor  position in the named window.  Attributes are stripped
-       from the characters.
-
-       The four functions with  <EM>n</EM>  as  the  last  argument  return  a  leading
-       substring  at  most  <EM>n</EM> characters long (exclusive of the trailing NUL).
-       Transfer stops at the end of the current line,  or  when  <EM>n</EM>  characters
-       have been stored at the location referenced by <EM>str</EM>.
+       <STRONG>winstr</STRONG> extracts a string from a <EM>curses</EM>  window  <EM>win</EM>,  starting  at  the
+       cursor  and  stopping  at  the  end  of the line, and stores it in <EM>str</EM>,
+       terminating it with a null character and omitting  any  attributes  and
+       color  pair  identifier  that  <EM>curses</EM>  associates  with each character.
+       <STRONG>winnstr</STRONG> does the same, but copies at most <EM>n</EM> characters from <EM>win</EM>.  An  <EM>n</EM>
+       of  <STRONG>-1</STRONG>  implies  no limit; <STRONG>winnstr</STRONG> then works like <STRONG>winstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+       describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  the  functions  return  <STRONG>ERR</STRONG>  upon  failure,  or  the number of
-       characters actually read into the string.
+       These functions return the count of characters copied from <EM>win</EM> to  <EM>str</EM>,
+       or <STRONG>ERR</STRONG> upon failure.
 
-       X/Open Curses defines no error conditions.  This implementation returns
-       <STRONG>ERR</STRONG>
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
-       <STRONG>o</STRONG>   if the <EM>chstr</EM> parameter is null.
+       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All routines except <STRONG>winnstr</STRONG> may be macros.
+       All of these functions except <STRONG>winnstr</STRONG> may be implemented as macros.
 
        Reading a line that overflows the array pointed to by <EM>str</EM>  with  <STRONG>instr</STRONG>,
-       <STRONG>mvinstr</STRONG>,  <STRONG>mvwinstr</STRONG>  or <STRONG>winstr</STRONG> causes undefined results.  Therefore, the
-       use of <STRONG>innstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinnstr</STRONG>, or <STRONG>winnstr</STRONG> is recommended.
+       <STRONG>winstr</STRONG>,  <STRONG>mvinstr</STRONG>, or <STRONG>mvwinstr</STRONG> causes undefined results.  Use of <STRONG>innstr</STRONG>,
+       <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG> is recommended instead.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>innstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG>'s treatment of <STRONG>-1</STRONG> as  a  valid
+       value of <EM>n</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       SVr4 does not document whether a length limit includes or excludes  the
-       trailing NUL.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
+
+       X/Open  Curses  Issues  4 and 7 both state that <STRONG>instr</STRONG>, <STRONG>winstr</STRONG>, <STRONG>mvinstr</STRONG>,
+       and <STRONG>mvwinstr</STRONG> return <STRONG>OK</STRONG> rather than a character count.  This  is  likely
+       an erratum.
+
+       <STRONG>o</STRONG>   SVr3.1  and  SVr4  implemented  <STRONG>winstr</STRONG> as a wrapper around <STRONG>winnstr</STRONG>,
+           returning the latter's return value.  X/Open Curses's specification
+           thus  may  have  been  an editorial solecism copied from System V's
+           documentation (see below) by X/Open,  rather  than  an  intentional
+           change.
+
+       <STRONG>o</STRONG>   <EM>ncurses</EM> retains compatibility with System V <EM>curses</EM> behavior.
+
+       SVr4  documents no return values apart from <STRONG>OK</STRONG> and <STRONG>ERR</STRONG> for any of these
+       functions.  SVr4 does not document whether <EM>n</EM> counts the null terminator
+       that these functions write to <EM>str</EM>.
+
 
-       The <EM>ncurses</EM> library extends the X/Open Curses description by allowing a
-       negative value for <EM>n</EM>.  In this case, the functions  return  the  string
-       ending at the right margin.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3.1 (1987) introduced these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -125,7 +147,9 @@ <H1 class="no-header">curs_instr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index e91d0ea9d..d5777a283 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -54,72 +54,88 @@ <H1 class="no-header">curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>inwstr(wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>innwstr(wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>inwstr(wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvinwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvinnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>innwstr(wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines return a string of  <STRONG>wchar_t</STRONG>  wide  characters  in  <EM>wstr</EM>,
-       starting at the current cursor position in the named window.
-
-       The  four  functions  with  <EM>n</EM>  as  the  last  argument return a leading
-       substring at most <EM>n</EM> characters long (exclusive of  the  trailing  NUL).
-       Transfer  stops  at  the  end of the current line, or when <EM>n</EM> characters
-       have been stored at the location referenced by <EM>wstr</EM>.
-
-       If the size  <EM>n</EM>  is  not  large  enough  to  store  a  complete  complex
-       character, an error is generated.
+       <STRONG>winwstr</STRONG> extracts a wide-character string  from  a  <EM>curses</EM>  window  <EM>win</EM>,
+       starting  at the cursor and stopping at the end of the line, and stores
+       it in <EM>wstr</EM>, terminating it with a wide null character and omitting  any
+       attributes  and  color pair identifier that <EM>curses</EM> associates with each
+       character.  <STRONG>winnwstr</STRONG> does the same, but copies  at  most  <EM>n</EM>  characters
+       from  <EM>win</EM>.   An  <EM>n</EM>  of  <STRONG>-1</STRONG>  implies  no limit; <STRONG>winnwstr</STRONG> then works like
+       <STRONG>winwstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines return <STRONG>ERR</STRONG> upon failure.  Upon successful completion, the
-       *<STRONG>inwstr</STRONG> routines return <STRONG>OK</STRONG>, and the *<STRONG>innwstr</STRONG> routines return the number
-       of characters read into the string.
+       On successful operation, these  functions  return  the  count  of  wide
+       characters  copied  from  <EM>win</EM>  to  <EM>wstr</EM>.  They return <STRONG>ERR</STRONG> upon failure.
+       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>,  and  <STRONG>mvwinnwstr</STRONG>  return  <STRONG>ERR</STRONG>  if  <EM>n</EM>  is
+       insufficiently  large  to  store  a  complete  wide  character  string.
+       (Recall that a <EM>curses</EM>  complex  character  can  contain  multiple  wide
+       characters, some of which may be non-spacing.)
 
-       X/Open defines no error conditions.  This implementation returns <STRONG>ERR</STRONG>
+       In <EM>ncurses</EM>, these functions return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
-       <STRONG>o</STRONG>   if the <EM>wstr</EM> parameter is null, or
-
-       <STRONG>o</STRONG>   if no characters could be read.
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All routines except <STRONG>winnwstr</STRONG> may be macros.
+       All of these functions except <STRONG>winnwstr</STRONG> may be implemented as macros.
+
+       Reading a line that overflows the array pointed to by <EM>str</EM> with  <STRONG>inwstr</STRONG>,
+       <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  or  <STRONG>mvwinwstr</STRONG>  causes  undefined  results.  Use of
+       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> is recommended instead.
 
-       Each cell in the window holds a complex character (a spacing  character
-       and  zero  or more non-spacing characters) together with attributes and
-       color.  These  functions  store  only  the  wide  characters,  ignoring
-       attributes  and  color.  Use <STRONG>in_wchstr</STRONG> to return the complex characters
-       from a window.
 
-       Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
-       <STRONG>mvinwstr</STRONG>,  <STRONG>mvwinwstr</STRONG>  or  <STRONG>winwstr</STRONG> causes undefined results.  Therefore,
-       the use of <STRONG>innwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinnwstr</STRONG>, or <STRONG>winnwstr</STRONG> is recommended.
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG>'s treatment  of  <STRONG>-1</STRONG>  as  a
+       valid value of <EM>n</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
+
+       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
+       that <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> "fail  ...  [i]f  the
+       array  is  not  large  enough  to  contain  any  complete  characters".
+       Strictly interpreted, this means  that  a  caller  of  these  functions
+       cannot use their return values to detect truncation of a wide-character
+       string copied from more  than  one  character  cell  in  <EM>win</EM>.   <EM>ncurses</EM>
+       reports any truncation with <STRONG>ERR</STRONG>.
+
+       X/Open  Curses  specifies  <STRONG>inwstr</STRONG>,  <STRONG>winwstr</STRONG>, <STRONG>mvinwstr</STRONG>, and <STRONG>mvwinwstr</STRONG> as
+       returning <STRONG>OK</STRONG> rather than a (wide) character count,  unlike  their  non-
+       wide  counterparts  <STRONG>instr</STRONG>,  <STRONG>winstr</STRONG>,  <STRONG>mvinstr</STRONG>,  and  <STRONG>mvwinstr</STRONG>.   <EM>ncurses</EM>
+       regards this inconsistency as an error in the standard.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>,     <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+       <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
+       its non-wide-character configuration.
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -128,6 +144,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 7d52c2d26..b93fcbf44 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp @
+  * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -101,84 +101,85 @@ <H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-getsyx">getsyx</a></H3><PRE>
-       The <STRONG>getsyx</STRONG> routine returns  the  current  coordinates  of  the  <EM>virtual</EM>
-       <EM>screen</EM>  cursor in <EM>y</EM> and <EM>x</EM>.  If <STRONG>leaveok</STRONG> is currently <STRONG>TRUE</STRONG>, then <STRONG>-1</STRONG>,<STRONG>-1</STRONG> is
-       returned.  If lines have been removed from the top of the screen, using
-       <STRONG>ripoffline</STRONG>,  <EM>y</EM>  and <EM>x</EM> include these lines; therefore, <EM>y</EM> and <EM>x</EM> should be
-       used only as arguments for <STRONG>setsyx</STRONG>.
+       <STRONG>getsyx</STRONG> stores the coordinates of virtual screen (<STRONG>newscr</STRONG>)  cursor  in  <EM>y</EM>
+       and <EM>x</EM>.  If <STRONG>newscr</STRONG>'s <STRONG><A HREF="leaveok.3x.html">leaveok(3x)</A></STRONG> output option is <STRONG>TRUE</STRONG>, <STRONG>getsyx</STRONG> stores <STRONG>-1</STRONG>
+       in both <EM>y</EM> and <EM>x</EM>.  If lines have been removed from the top of the screen
+       using  <STRONG>ripoffline</STRONG>, <EM>y</EM> includes these lines; therefore, <EM>y</EM> and <EM>x</EM> populated
+       by <STRONG>getsyx</STRONG> should be used only as arguments for <STRONG>setsyx</STRONG>.
 
-       Few applications will use this feature, most use <STRONG>getyx</STRONG> instead.
+       Few applications use this feature; most call <STRONG><A HREF="curs_getyx.3x.html">getyx(3x)</A></STRONG> instead.
 
 
 </PRE><H3><a name="h3-setsyx">setsyx</a></H3><PRE>
-       The <STRONG>setsyx</STRONG> routine sets the <EM>virtual</EM> <EM>screen</EM> cursor to <EM>y</EM>, <EM>x</EM>.  If <EM>y</EM> and  <EM>x</EM>
-       are  both  <STRONG>-1</STRONG>, then <STRONG>leaveok</STRONG> is set.  The two routines <STRONG>getsyx</STRONG> and <STRONG>setsyx</STRONG>
-       are designed to be used by a library routine, which manipulates  <STRONG>curses</STRONG>
-       windows  but  does  not  want  to  change  the  current position of the
-       program's cursor.   The  library  routine  would  call  <STRONG>getsyx</STRONG>  at  the
-       beginning, do its manipulation of its own windows, do a <STRONG>wnoutrefresh</STRONG> on
-       its windows, call <STRONG>setsyx</STRONG>, and then call <STRONG>doupdate</STRONG>.
+       <STRONG>setsyx</STRONG> sets the virtual screen (<STRONG>newscr</STRONG>)  cursor  location  to  (<EM>y</EM>,  <EM>x</EM>).
+       <STRONG>setsyx(-1,</STRONG> <STRONG>-1)</STRONG> is equivalent to <STRONG>leaveok(newscr,</STRONG> <STRONG>TRUE)</STRONG>.
 
-       Few applications will use this feature, most use <STRONG>wmove</STRONG> instead.
+       <STRONG>getsyx</STRONG>  and  <STRONG>setsyx</STRONG>  are  designed  to  be  used  by  a  function  that
+       manipulates <EM>curses</EM> windows but  seeks  to  avoid  changing  the  cursor
+       position.  Such a function would first call <STRONG>getsyx</STRONG>, modify its windows'
+       content,  call  <STRONG><A HREF="curs_refresh.3x.html">wnoutrefresh(3x)</A></STRONG>  on  them,  call  <STRONG>setsyx</STRONG>,  then   call
+       <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG>.
+
+       Few applications use this feature; most call <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG> instead.
 
 
 </PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
-       The <STRONG>curs_set</STRONG> routine sets the cursor state  to  invisible,  normal,  or
-       very  visible  for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.  If the
-       terminal supports the <EM>visibility</EM> requested, the previous  <EM>cursor</EM>  state
+       The  <STRONG>curs_set</STRONG>  routine  sets  the cursor state to invisible, normal, or
+       very visible for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.   If  the
+       terminal  supports  the <EM>visibility</EM> requested, the previous <EM>cursor</EM> state
        is returned; otherwise, <STRONG>ERR</STRONG> is returned.
 
 
 </PRE><H3><a name="h3-mvcur">mvcur</a></H3><PRE>
-       <STRONG>mvcur</STRONG>  provides  low-level cursor motion.  It takes effect immediately,
-       rather than at the next refresh.  Unlike  the  other  low-level  output
-       functions,  which  either  write  to  the standard output stream or are
-       passed a  function  pointer  to  perform  output,  <STRONG>mvcur</STRONG>  uses  a  file
+       <STRONG>mvcur</STRONG> provides low-level cursor motion.  It takes  effect  immediately,
+       rather  than  at  the  next refresh.  Unlike the other low-level output
+       functions, which either write to the  standard  output  stream  or  are
+       passed  a  function  pointer  to  perform  output,  <STRONG>mvcur</STRONG>  uses  a file
        descriptor derived from the output stream parameter of <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
-       One  application  of  <STRONG>mvcur</STRONG>  accompanies  the  temporary use of another
-       program to write to the  terminal  screen.   For  example,  first  call
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to ensure that the screen and the library's model of it is
-       up to date; then call <STRONG>reset_shell_mode</STRONG>; write to the  screen  with  the
-       external  application;  call <STRONG>reset_prog_mode</STRONG>; and finally call <STRONG>mvcur</STRONG> to
-       set the cursor's location to where  <EM>curses</EM>  thinks  it  is,  since  the
+       One application of <STRONG>mvcur</STRONG>  accompanies  the  temporary  use  of  another
+       program  to  write  to  the  terminal  screen.  For example, first call
+       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to ensure that the screen and the library's model of it  is
+       up  to  date;  then call <STRONG>reset_shell_mode</STRONG>; write to the screen with the
+       external application; call <STRONG>reset_prog_mode</STRONG>; and finally call  <STRONG>mvcur</STRONG>  to
+       set  the  cursor's  location  to  where  <EM>curses</EM> thinks it is, since the
        library has no knowledge of how the external application moved it.
 
 
 </PRE><H3><a name="h3-napms">napms</a></H3><PRE>
-       <STRONG>napms</STRONG>  sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000 (thirty
+       <STRONG>napms</STRONG> sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000  (thirty
        seconds), it is capped at that value.
 
 
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
-       <STRONG>ripoffline</STRONG> provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>  uses
-       to  reduce  the  size  of the screen.  <STRONG>ripoffline</STRONG> must be called before
+       <STRONG>ripoffline</STRONG>  provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> uses
+       to reduce the size of the screen.  <STRONG>ripoffline</STRONG>  must  be  called  before
        <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is called, to prepare these initial actions:
 
        <STRONG>o</STRONG>   If <EM>line</EM> is positive, a line is removed from the top of <STRONG>stdscr</STRONG>.
 
        <STRONG>o</STRONG>   if <EM>line</EM> is negative, a line is removed from the bottom.
 
-       When the resulting initialization is done inside <STRONG>initscr</STRONG>,  the  routine
+       When  the  resulting initialization is done inside <STRONG>initscr</STRONG>, the routine
        <STRONG>init</STRONG> (supplied by the user) is called with two arguments:
 
        <STRONG>o</STRONG>   a window pointer to the one-line window that has been allocated and
 
        <STRONG>o</STRONG>   an integer with the number of columns in the window.
 
-       Inside  this  initialization  routine,  the integer variables <STRONG>LINES</STRONG> and
-       <STRONG>COLS</STRONG> (defined in <STRONG>&lt;curses.h&gt;</STRONG>) are not  guaranteed  to  be  accurate  and
-       <STRONG>wrefresh</STRONG>  or  <STRONG>doupdate</STRONG>  must  not  be  called.  It is allowable to call
+       Inside this initialization routine, the  integer  variables  <STRONG>LINES</STRONG>  and
+       <STRONG>COLS</STRONG>  (defined  in  <STRONG>&lt;curses.h&gt;</STRONG>)  are  not guaranteed to be accurate and
+       <STRONG>wrefresh</STRONG> or <STRONG>doupdate</STRONG> must not be  called.   It  is  allowable  to  call
        <STRONG>wnoutrefresh</STRONG> during the initialization routine.
 
-       <STRONG>ripoffline</STRONG> can be called up to five times  before  calling  <STRONG>initscr</STRONG>  or
+       <STRONG>ripoffline</STRONG>  can  be  called  up to five times before calling <STRONG>initscr</STRONG> or
        <STRONG>newterm</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
-       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
+       <STRONG>curs_set</STRONG> returns the previous cursor state, or  <STRONG>ERR</STRONG>  if  the  requested
        <EM>visibility</EM> is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -188,7 +189,7 @@ <H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
             to obtain the terminal settings fails.
 
        <STRONG>ripoffline</STRONG>
-            returns  <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds the
+            returns <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds  the
             maximum (5).
 
 
@@ -196,25 +197,28 @@ <H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
        <EM>y</EM> and <EM>x</EM>.
 
-       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
+       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both <EM>ncurses</EM> and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called to make the cursor other than normal, i.e., either invisible  or
-       very  visible.   There  is  no way for <EM>ncurses</EM> to determine the initial
+       called  to make the cursor other than normal, i.e., either invisible or
+       very visible.  There is no way for <EM>ncurses</EM>  to  determine  the  initial
        cursor state to restore that.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       In <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.   This
-       value  tells <EM>ncurses</EM> that the old location is unknown, and that it must
-       use only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>)  capability,
-       rather  than  the  least  costly  combination  of absolute and relative
+       In  <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.  This
+       value tells <EM>ncurses</EM> that the old location is unknown, and that it  must
+       use  only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability,
+       rather than the least  costly  combination  of  absolute  and  relative
        motion.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
        The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG>  are  not  described  in
        X/Open Curses, Issue 4.  All other functions are as described in X/Open
        Curses.
@@ -245,7 +249,7 @@ <H1 class="no-header">curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 052af277f..56aafbb4d 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -86,20 +86,20 @@ <H1 class="no-header">curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        screen on this information rather than clearing it  and  starting  from
        scratch.
 
-       <EM>curses</EM>  regards  the terminal being in an invalid state for computation
-       of updates based on the contents of <EM>filename</EM> if
+       <EM>curses</EM>  regards  the terminal as in an invalid state for computation of
+       updates based on the contents of <EM>filename</EM> if
 
-       <STRONG>o</STRONG>   the terminal type supports the <EM>terminfo</EM>  capabilities  <STRONG>exit_ca_mode</STRONG>
-           (<STRONG>rmcup</STRONG>) or <STRONG>non_rev_rmcup</STRONG> (<STRONG>nrrmc</STRONG>), or
+       <STRONG>o</STRONG>   <EM>curses</EM> knows that the  terminal  has  been  written  to  since  the
+           preceding <STRONG>scr_dump</STRONG> call, or
 
-       <STRONG>o</STRONG>   <EM>curses</EM>  knows  that  the  terminal  has  been  written to since the
-           preceding <STRONG>scr_dump</STRONG> call.
+       <STRONG>o</STRONG>   the  terminal  type supports the <EM>terminfo</EM> capabilities <STRONG>exit_ca_mode</STRONG>
+           (<STRONG>rmcup</STRONG>) or <STRONG>non_rev_rmcup</STRONG> (<STRONG>nrrmc</STRONG>).
 
        Either of the foregoing conditions means that <EM>curses</EM> cannot assume that
        the  terminal's  contents  match their representation in <EM>filename</EM>.  The
        former is due to  terminal  features  (such  as  <STRONG>xterm(1)</STRONG>'s  "alternate
        screen")  that  couple  cursor-positioning  mode  with a local cache of
-       screen contents.  <EM>curses</EM> cannot know  whether  terminal  is  displaying
+       screen contents.  <EM>curses</EM> cannot know whether the terminal is displaying
        from that local cache at the time the application calls <STRONG>scr_init</STRONG>, so it
        makes a pessimistic assumption that a  full  redraw  is  required;  see
        subsection "Cursor Motions" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -151,7 +151,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 260228a3e..4ba139ae5 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -660,7 +660,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index abf0a0240..fe64f8d6f 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp @
+  * @Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -80,7 +80,7 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-unctrl">unctrl</a></H3><PRE>
-       The  <STRONG>unctrl</STRONG>  routine  returns  a  character string which is a printable
+       The   <STRONG>unctrl</STRONG>   routine  returns  a  character  string  as  a  printable
        representation of the character <EM>ch</EM>:
 
        <STRONG>o</STRONG>   Printable characters are displayed  as  themselves,  e.g.,  a  one-
@@ -186,7 +186,7 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
            from the terminal database.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> re-fetches the value of the environment variables  so  that
-           it is still the environment variables which set the screen size.
+           it is still the environment variables that set the screen size.
 
        The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as follows.
 
@@ -221,7 +221,7 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   the window's character cells contain the color pair <EM>value</EM>, but  not
            the  actual  color  <EM>numbers</EM>.   If cells in the retrieved window use
-           color pairs which have not been created in  the  application  using
+           color pairs that have not been created  in  the  application  using
            <STRONG>init_pair</STRONG>, they will not be colored when the window is refreshed.
 
 
@@ -260,7 +260,7 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                returns <STRONG>ERR</STRONG> if the terminal was not initialized.
 
           <STRONG>putwin</STRONG>
-               returns <STRONG>ERR</STRONG> if the associated <STRONG>fwrite</STRONG> calls return <STRONG>ERR</STRONG>.
+               returns <STRONG>ERR</STRONG> if the associated <STRONG>write(2)</STRONG> calls return <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -286,12 +286,12 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
        The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
-       capabilities  which are defined in the terminfo entry via the <STRONG>-x</STRONG> option
+       capabilities  that  are defined in the terminfo entry via the <STRONG>-x</STRONG> option
        of <STRONG>tic</STRONG>.  This implementation  automatically  assigns  at  run-time  key
-       codes  to  user-defined  strings  which  begin with "k".  The key codes
-       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   <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
+       codes to user-defined strings that begin with "k".  The key codes 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  that  have  been  loaded.    The   <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
        function  controls  whether  this  data  is  loaded  when  the terminal
        description is read by the library.
 
@@ -321,13 +321,13 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
            older <EM>ncurses</EM> versions.  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
-           <STRONG>fwrite</STRONG>  and  <STRONG>fread</STRONG>  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.  However, reading from a
-           file written using mixed schemes may not be successful.
+           The implementations that use binary dumps use  block-I/O  (<STRONG>write(2)</STRONG>
+           and <STRONG>read(2)</STRONG> 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.  However, reading from a file
+           written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
@@ -390,7 +390,7 @@ <H1 class="no-header">curs_util 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 8ca26d232..9ebd9c883 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp @
+  * @Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>define_key 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -96,12 +96,11 @@ <H1 class="no-header">define_key 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,   <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,  <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,  <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
-       <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html
index 8ef095adb..5b0c30fef 100644
--- a/doc/html/man/key_defined.3x.html
+++ b/doc/html/man/key_defined.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 2003
-  * @Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp @
+  * @Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>key_defined 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>key_defined 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">key_defined 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">key_defined 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
@@ -83,11 +83,11 @@ <H1 class="no-header">key_defined 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-18                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                   <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index c61af21a5..cc3ae3a14 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp @
+  * @Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>keybound 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keybound 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -90,11 +90,11 @@ <H1 class="no-header">keybound 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-18                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index e6d3a35e8..495274073 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp @
+  * @Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>keyok 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -93,11 +93,11 @@ <H1 class="no-header">keyok 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
 
 
 
-ncurses 6.5                       2024-05-18                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 6c1d89ce8..8b29047eb 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp @
+  * @Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240601).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240608).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -143,7 +143,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
        A  <EM>curses</EM>  library abstracts the terminal screen by representing all or
        part of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular  grid
-       of  character  cells,  addressed  by row and column coordinates (<EM>y</EM>, <EM>x</EM>),
+       of  character  cells,  addressed by line and column coordinates (<EM>y</EM>, <EM>x</EM>),
        with the upper left corner as (0, 0).  A window called <STRONG>stdscr</STRONG>, the same
        size  as  the terminal screen, is always available.  Create others with
        <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
@@ -155,8 +155,8 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        effects.
 
        Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
-       the  cell  within  it  at  which  the next output operation will occur.
-       Among those, the most basic are <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG> and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
+       the  cell  within  it  at  which  the next operation will occur.  Among
+       those, the most basic are  <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG>  and  <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>:  these  place  the
        cursor within and write a character to <STRONG>stdscr</STRONG>, respectively.
 
        Frequent changes to the terminal screen can cause unpleasant flicker or
@@ -260,7 +260,13 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                  type.   In either case, they are accessed via an integral bit
                  mask.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.   X/Open  Curses
+                 does  not  specify  the  sizes of the character code or color
+                 pair identifier, nor  the  quantity  of  attribute  bits,  in
+                 <EM>chtype</EM>;  these  are  implementation-dependent.   <EM>ncurses</EM> uses
+                 eight bits for the character code.  An application  requiring
+                 a  wider  character  type, for instance to represent Unicode,
+                 should use the wide-character API.
 
        <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
@@ -284,7 +290,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
                  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype</EM>.
                           It  is  a  structure  type  because it requires more
-                          storage than fits into a standard  scalar  type.   A
+                          storage than  a  standard  scalar  type  offers.   A
                           character  code  may not be representable as a <EM>char</EM>,
                           and moreover more than one character  may  occupy  a
                           cell  (as  with  accent marks and other diacritics).
@@ -374,6 +380,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     def_shell_mode           <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
@@ -382,7 +389,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     derwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     echo_wchar               <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
                     echochar                 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -440,6 +446,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     in_wch                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     in_wchnstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
@@ -449,7 +456,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
-
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     ins_wch                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
@@ -506,6 +512,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     mvaddchstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     mvaddnstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddnwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -516,7 +523,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
-
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -572,6 +578,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     mvwinnwstr               <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwins_nwstr             <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwins_wch               <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+
                     mvwins_wstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
@@ -583,7 +590,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     mvwvline                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
-
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
@@ -638,6 +644,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     slk_attr                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     slk_attr_off             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attr_on              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_attr_set             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attroff              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -650,7 +657,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     slk_refresh              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_restore              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -704,6 +710,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     vwprintw                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     vwscanw                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wadd_wch                 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+
                     wadd_wchnstr             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     wadd_wchstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     waddch                   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -717,7 +724,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     wattr_off                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_on                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattr_set                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -770,6 +776,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     winstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     wmouse_trafo             <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
+
                     wmove                    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
                     wnoutrefresh             <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wprintw                  <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -784,7 +791,6 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
                     wsyncdown                <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wsyncup                  <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     wtimeout                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
-
                     wtouchln                 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
                     wunctrl                  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -1485,7 +1491,7 @@ <H1 class="no-header">ncurses 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-06-08                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index f90e8fc8d..b9e784d56 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240601).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240608).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -1186,9 +1186,9 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        printing terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>.  (<STRONG>os</STRONG>
        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 <STRONG>cr</STRONG>.  (Normally
-       this will be carriage return,  control/M.)   If  there  is  a  code  to
-       produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
+       cursor  to  the  left  edge  of  the  current  line,  give  this as <STRONG>cr</STRONG>.
+       (Normally this will be carriage return, control/M.)  If there is a code
+       to produce an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>.
 
        If there is a code to move the cursor one position to the left (such as
        backspace) that capability should be given as <STRONG>cub1</STRONG>.   Similarly,  codes
@@ -1217,7 +1217,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        the  screen when text is output, but this does not necessarily apply to
        a <STRONG>cuf1</STRONG> from the last column.  The only local motion  which  is  defined
        from  the  left  edge is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge
-       will move to the right edge of the previous row.  If <STRONG>bw</STRONG> is  not  given,
+       will move to the right edge of the previous line.  If <STRONG>bw</STRONG> 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 <EM>terminfo</EM> file usually assumes that this is on;
@@ -1244,8 +1244,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
        terminal are described  by  a  parameterized  string  capability,  with
        <EM>printf</EM>-like  escapes  such  as  <EM>%x</EM>  in it.  For example, to address the
-       cursor, the <STRONG>cup</STRONG> capability is given, using two parameters: the row  and
-       column  to  address  to.   (Rows and columns are numbered from zero and
+       cursor, the <STRONG>cup</STRONG> capability is given, using two parameters: the line and
+       column  to  address  to.  (Lines 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 by <STRONG>mrcup</STRONG>.
@@ -1365,14 +1365,14 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the  rows  and
-       columns  is  inverted  here,  and the row and column are printed as two
+       Consider the HP2645, which, to get to line 3 and column 12, needs to be
+       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the lines  and
+       columns  is  inverted here, and the lines and column are printed as two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
 
-       The Microterm ACT-IV needs the current row and column sent preceded  by
-       a <STRONG>^T</STRONG>, with the row and column simply encoded in binary,
+       The Microterm ACT-IV needs the current line and column sent preceded by
+       a <STRONG>^T</STRONG>, with the line and column simply encoded in binary,
               cup=^T%p1%c%p2%c
 
        Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
@@ -1382,7 +1382,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        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 line and column offset by
        a blank character, thus
               cup=\E=%p1%' '%+%c%p2%' '%+%c
 
@@ -1404,8 +1404,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        corner of the screen, not of memory.  (Thus, the  \EH  sequence  on  HP
        terminals cannot be used for <STRONG>home</STRONG>.)
 
-       If the terminal has row or column absolute cursor addressing, these can
-       be given as single  parameter  capabilities  <STRONG>hpa</STRONG>  (horizontal  position
+       If  the  terminal  has line or column absolute cursor addressing, these
+       can be given as single parameter capabilities <STRONG>hpa</STRONG> (horizontal  position
        absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
@@ -1443,7 +1443,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
                line position, and
 
            <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
-               right margins given the number of rows or columns.
+               right margins given the number of lines or columns.
 
        In practice, the categorization into "terminal" and  "printer"  is  not
        suitable:
@@ -1948,7 +1948,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        If there are commands to set and clear tab stops, they can be given  as
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (set a tab stop in the current column
-       of every row).  If a more complex sequence is needed to  set  the  tabs
+       of every line).  If a more complex sequence is needed to set  the  tabs
        than can be described by this, the sequence can be placed in <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
        The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index c7bf1e106..0d9d1788c 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp @
+  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2024-06-08 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2024-06-08 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -53,19 +53,19 @@ <H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] {<EM>cap-code</EM> [<EM>parameter</EM> ...]} ...
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>] {<EM>cap-code</EM> [<EM>parameter</EM> ...]} ...
 
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>] [<STRONG>-x</STRONG>] <STRONG>clear</STRONG>
 
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>init</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>init</STRONG>
 
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>reset</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>reset</STRONG>
 
-       <STRONG>tput</STRONG> [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>longname</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] [<STRONG>-T</STRONG> <EM>terminal-type</EM>] <STRONG>longname</STRONG>
 
-       <STRONG>tput</STRONG> <STRONG>-S</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] <STRONG>-S</STRONG>
 
-       <STRONG>tput</STRONG> <STRONG>-V</STRONG>
+       <STRONG>tput</STRONG> [<STRONG>-v</STRONG>] <STRONG>-V</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -259,6 +259,8 @@ <H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
                 environment variable.  If specified, the environment variables
                 <EM>LINES</EM> and <EM>COLUMNS</EM> are also ignored.
 
+       <STRONG>-v</STRONG>       causes <STRONG>tput</STRONG> to operate verbosely, reporting warnings.
+
        <STRONG>-V</STRONG>       reports the version of <EM>ncurses</EM> associated with <STRONG>tput</STRONG>, and exits
                 with a successful status.
 
@@ -498,8 +500,8 @@ <H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
               Set cursor to normal visibility.
 
        <STRONG>tput</STRONG> <STRONG>home</STRONG>
-              Move the cursor to row 0, column 0: the upper left corner of the
-              screen, usually known as the "home" cursor position.
+              Move the cursor to line 0, column 0: the upper  left  corner  of
+              the screen, usually known as the "home" cursor position.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
               Clear  the  screen: write the <STRONG>clear_screen</STRONG> capability's value to
@@ -523,7 +525,7 @@ <H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
               device.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
-              Move the cursor to row 23, column 4.
+              Move the cursor to line 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
               Report  the  value  of the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability (used
@@ -555,7 +557,7 @@ <H1 class="no-header">tput 1 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-06-08                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index b2b865cc3..cbec400c0 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp @
+  * @Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>tset 1 2024-06-08 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tset 1 2024-06-08 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -115,8 +115,10 @@ <H1 class="no-header">tset 1 2024-05-11 ncurses 6.5 User commands</H1>
            kill characters (among many other things) are set
 
        <STRONG>o</STRONG>   unless   the   "<STRONG>-I</STRONG>"   option  is  enabled,  the  terminal  and  tab
-           <EM>initialization</EM> strings are sent to the standard error  output,  and
-           <STRONG>tset</STRONG> waits one second (in case a hardware reset was issued).
+           <EM>initialization</EM> strings are sent to the standard error output,  and,
+           if  the  terminal device does not appear to be a pseudoterminal (as
+           might be used by a  terminal  emulator  program),  <STRONG>tset</STRONG>  waits  one
+           second in case a hardware reset was issued.
 
        <STRONG>o</STRONG>   Finally,  if  the  erase,  interrupt  and line kill characters have
            changed, or are not set to their default values, their  values  are
@@ -393,7 +395,7 @@ <H1 class="no-header">tset 1 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.5                       2024-06-08                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 10b6f7764..61e2de806 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp @
+  * @Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>user_caps 5 2024-03-16 ncurses 6.5 File formats</TITLE>
+<TITLE>user_caps 5 2024-06-08 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.5 File formats</H1>
+<H1 class="no-header">user_caps 5 2024-06-08 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>                     File formats                     <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
@@ -62,8 +62,8 @@ <H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.5 File formats</H1>
 </PRE><H3><a name="h3-Background">Background</a></H3><PRE>
        Before  <EM>ncurses</EM>  5.0,  terminfo  databases  used  a <EM>fixed</EM> <EM>repertoire</EM> of
        terminal capabilities designed for the SVr2 terminal database in  1984,
-       and  extended  in  stages  through SVr4 (1989), and standardized in the
-       Single Unix Specification beginning in 1995.
+       and  extended in stages through SVr4 (1989), and standardized in X/Open
+       Curses starting in 1995.
 
        Most of the <EM>extensions</EM> in this fixed repertoire were additions  to  the
        tables of Boolean, numeric and string capabilities.  Rather than change
@@ -403,7 +403,7 @@ <H1 class="no-header">user_caps 5 2024-03-16 ncurses 6.5 File formats</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
+ncurses 6.5                       2024-06-08                      <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/ncurses_cfg.hin b/include/ncurses_cfg.hin
index 8d9ed81a8..0744fa0c6 100644
--- a/include/ncurses_cfg.hin
+++ b/include/ncurses_cfg.hin
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey      1997-on                                   *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.13 2020/03/08 12:37:59 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.15 2024/06/08 14:04:14 tom Exp $
  *
  * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
  * building ncurses.
@@ -44,7 +44,7 @@
  *
  * See:
  *	https://invisible-island.net/autoconf/
- *	ftp://ftp.invisible-island.net/autoconf/
+ *	https://invisible-island.net/archives/autoconf/
  */
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 5fb25b0a7..4e1bf944f 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp $
-.TH curs_addch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp $
+.TH curs_addch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -302,7 +302,6 @@ X/Open Curses states that the
 definitions are
 .I char
 constants.
-.PP
 Some implementations are problematic.
 .bP
 Solaris
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index c190a7ea1..e58d326fb 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp $
-.TH curs_get_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp $
+.TH curs_get_wch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,9 +106,14 @@ waits until the terminal has input.
 If \fB\%cbreak\fP(3X)
 has been called,
 this happens after one character is read.
-If \fB\%nocbreak\fP(3X)
+If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
+(Because the terminal's normal or \*(``cooked\*('' mode
+is line-buffered,
+multiple
+.B \%wget_wch
+calls may then be necessary to empty the input queue.)
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
@@ -117,15 +122,15 @@ waits until input is available or the specified delay elapses.
 If \fB\%echo\fP(3X) has been called,
 and the window is not a pad,
 .I curses
-writes
-.I wch
+writes the wide character
+from the input queue
 to the window
 (at the cursor position)
 per the following rules.
 .bP
-If
-.I wch
-matches the terminal's erase character,
+If the wide character
+matches the terminal's erase character
+(see \fB\%erasewchar\fP(3X)),
 the cursor moves leftward one position
 and the new position is erased
 as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
@@ -138,7 +143,7 @@ are handled the same way.
 .bP
 .I curses
 writes any other
-.I wch
+wide character
 to the window,
 as with \fB\%wecho_wchar\fP(3X).
 .bP
@@ -151,18 +156,17 @@ calls
 .B \%wrefresh
 on it.
 .PP
-If
-.I wch
+If the wide character
 is a carriage return and \fBnl\fP(3X) has been called,
 .B \%wgetch
-stores the the character code for line feed in
+stores the the wide character code for line feed in
 .I wch
 instead.
 .SS "Ungetting Characters"
 .B \%unget_wch
 places
-.I wch
-into the input queue to be returned by the next call to
+.I wc
+into the input queue to be retrieved by the next call to
 .BR \%wget_wch "."
 A single input queue serves all windows associated with the terminal.
 .SH RETURN VALUE
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 9722a3e64..733054c75 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
-.TH curs_get_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp $
+.TH curs_get_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -178,8 +178,9 @@ respectively, is recommended.
 These functions cannot return \fBKEY_\fP values because there
 is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
 .SH PORTABILITY
-These functions are described in The Single Unix Specification, Version 2.
-No error conditions are defined.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 This implementation returns \fBERR\fP if the window pointer is null,
 or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index bc88c0ac7..a66e68a25 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp $
-.TH curs_getch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp $
+.TH curs_getch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,9 +106,14 @@ waits until the terminal has input.
 If \fB\%cbreak\fP(3X)
 has been called,
 this happens after one character is read.
-If \fB\%nocbreak\fP(3X)
+If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
+(Because the terminal's normal or \*(``cooked\*('' mode
+is line-buffered,
+multiple
+.B \%wgetch
+calls may then be necessary to empty the input queue.)
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
@@ -125,7 +130,8 @@ per the following rules.
 .bP
 If
 .I c
-matches the terminal's erase character,
+matches the terminal's erase character
+(see \fB\%erasechar\fP(3X)),
 the cursor moves leftward one position
 and the new position is erased
 as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
@@ -403,11 +409,13 @@ correspond to a physical key.
 returns
 .BR \%KEY_RESIZE ","
 even if the window's keypad mode is disabled,
-when
+if
 .I \%ncurses
-handles a
+has handled a
 .B \%SIGWINCH
-signal;
+signal since
+.B \%wgetch
+was called;
 see \fB\%initscr\fP(3X) and \fB\%resizeterm\fP(3X).
 .bP
 .B \%wgetch
@@ -624,13 +632,14 @@ reads only single-byte characters.
 .PP
 The echo behavior of these functions on input of
 .B KEY_
-or backspace characters was not specified in the SVr4 documentation.
-This description is adapted from X/Open Curses.
+or backspace characters is not documented in SVr4
+.IR curses "."
 .PP
 The behavior of
 .B \%wgetch
-in the presence of signal handlers is unspecified in the SVr4
-documentation and X/Open Curses.
+in the presence of signal handlers is not documented in SVr4
+.I curses
+and is unspecified by X/Open Curses.
 In historical
 .I curses
 implementations,
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 27b9c9517..eec58a542 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp $
-.TH curs_getstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp $
+.TH curs_getstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -177,11 +177,9 @@ The use of
 \fBwgetnstr\fP,
 respectively, is recommended.
 .SH PORTABILITY
-These functions are described in The Single Unix Specification, Version 2.
-No error conditions are defined.
-.PP
-This implementation returns \fBERR\fP if the window pointer is null,
-or if the lower-level \fBwgetch\fP(3X) call returns an \fBERR\fP.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 SVr3 and early SVr4 curses implementations did not reject function keys;
 the SVr4.0 documentation claimed that \*(``special keys\*(''
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 92b48af9f..4d7ec469d 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp $
-.TH curs_getyx 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp $
+.TH curs_getyx 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,7 +71,7 @@ and
 .B \%getmaxyx
 stores
 .IR win "'s"
-maximum valid row and column numbers in
+maximum valid line and column numbers in
 .I y
 and
 .IR x ","
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index fffcff30c..edcc65cd5 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp $
-.TH curs_inch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp $
+.TH curs_inch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -160,18 +160,6 @@ and fixed-width integral types would not be standard until ISO C99.
 .\" the Alpha arrived in 1993.  --GBR
 SVr3.2 (1988)
 added a 6-bit color pair identifier alongside the attributes.
-.PP
-X/Open Curses does not specify the sizes of the character code or
-color pair identifier,
-nor the quantity of attribute bits,
-in
-.IR chtype ";"
-these are implementation-dependent.
-.I \%ncurses
-uses eight bits for the character code.
-An application requiring a wider character type,
-for instance to represent Unicode,
-should use the wide-character counterparts of these functions.
 .SH SEE ALSO
 \fB\%curs_in_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index ecfc1fc6b..1e30604a7 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp $
-.TH curs_initscr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp $
+.TH curs_initscr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -308,7 +308,7 @@ It also updates the saved terminal modes with
 This handles the window-size changes which were ignored in
 the standardization efforts.
 The handler sets a (signal-safe) variable
-that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X):
+that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X).
 .RS
 .bP
 .B \%wgetch
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 4f4c25549..ed78d24c8 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp $
-.TH curs_inopts 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp $
+.TH curs_inopts 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -188,7 +188,7 @@ always disables the terminal driver's own echoing.
 By default,
 a
 .I curses
-window has its echo flag set.
+screen's echo option is set.
 Authors of most interactive programs prefer
 to do their own echoing in a controlled area of the screen,
 or not to echo at all,
@@ -320,12 +320,15 @@ to the terminal.
 Initially,
 whether the terminal reports a carriage return
 using the character code for a line feed
+in cbreak or raw modes
 depends on the configuration of the terminal driver;
 see \fI\%termios\fP(3).
 .B nl
 configures the terminal to perform this translation.
 .B nonl
 disables it.
+In normal (or \*(``cooked\*('') mode,
+the terminal driver always translates carriage returns to line feeds.
 .\"
 .SS nodelay
 .B \%nodelay
@@ -559,9 +562,9 @@ follow historical practice in that they attempt to restore normal
 (\*(``cooked\*('') mode from raw and cbreak modes,
 respectively.
 Mixing
-.BR raw / \%noraw
+.BR \%raw / noraw
 calls with
-.BR cbreak / \%nocbreak
+.BR \%cbreak / nocbreak
 calls leads to terminal driver control states that are hard to predict
 or understand;
 doing so is not recommended.
@@ -591,10 +594,10 @@ In each case,
 the function returns
 .TP 5 \" "-1" + 2n tag separation + 1n fudge for typesetters like grops
 .B 1
-if the flag is set,
+if the option is set,
 .TP
 .B 0
-if the flag is reset,
+if the option is reset,
 or
 .TP
 .B \-1
@@ -807,5 +810,5 @@ to eliminate their effect on output.
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_util\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%term_variables\fP(3X),
-\fB\%termios\fP(3)
+\fB\%termios\fP(3),
+\fB\%term_variables\fP(3X).
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 76194443a..37a583027 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp $
-.TH curs_ins_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp $
+.TH curs_ins_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,17 +87,29 @@ If \fIn\fP is less than zero, the entire string is inserted
 .PP
 Special characters are handled as in \fBwadd_wch\fP(3X).
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.BR NULL ","
 .bP
-if the \fIwstr\fP parameter is null or
+.I wstr
+is
+.BR NULL ","
+or
 .bP
-if the \fBwins_wch\fP function returns
+an internal \fB\%wins_wch\fP(3X) call returns
 .BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
@@ -106,20 +118,32 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All but \fBwins_nwstr\fP may be macros.
+All of these functions except
+.B \%wins_nwstr
+may be implemented as macros.
 .PP
-If the first character in the string is a non-spacing character, these
-functions will fail.
-X/Open Curses does not define what will happen
+If the first character in the string is a non-spacing character,
+these functions return
+.BR ERR "."
+X/Open Curses does not specify what happens
 if a non-spacing character follows a control character.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+Issue 4 states that the entire string is inserted if
+.I n
+is less than 1.
 This is probably an error,
 because it is inconsistent with other functions,
-and differs from the X/Open implementation on Solaris.
+and differs from the SVr4
+.I curses
+and Solaris
+.I xcurses
+implementations.
+Nevertheless,
+Issue 7 retains it.
 .SH SEE ALSO
 \fB\%curs_insstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 1a2a0efec..2641f05ad 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
-.TH curs_insstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp $
+.TH curs_insstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -107,19 +107,40 @@ is outside the window boundaries.
 .SH NOTES
 All but \fBwinsnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-The Single Unix Specification, Version 2 states that
-\fBinsnstr\fP and \fBwinsnstr\fP perform wrapping.
-This is probably an error, since it makes this group of functions inconsistent.
-Also, no implementation of curses documents this inconsistency.
+Issue 4 distinguished
+.B \%insnstr
+and
+.B \%winsnstr
+by stating they \*(``do not perform wrapping\*(''.
+This was probably an error,
+since it makes this group of functions inconsistent.
+No implementation of
+.I curses
+documents this inconsistency,
+and Issue 7 removed it.
 .PP
-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+Issue 4 states that the entire string is inserted if
+.I n
+is less than 1.
 This is probably an error,
 because it is inconsistent with other functions,
-and differs from the SVr4 and X/Open implementations on Solaris.
+and differs from the SVr4
+.I curses
+and Solaris
+.I xcurses
+implementations.
+Nevertheless,
+Issue 7 retains it.
 .SH SEE ALSO
+\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI \%( ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
 \fB\%curs_ins_wstr\fP(3X),
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index aca21a1b2..911d4e895 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp $
-.TH curs_instr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp $
+.TH curs_instr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,37 +58,69 @@ get a string from a \fIcurses\fR window
 .nf
 \fB#include <curses.h>
 .PP
-\fBint instr(char *\fIstr\fP);
-\fBint innstr(char *\fIstr\fP, int \fIn\fP);
-\fBint winstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
-\fBint winnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint instr(char *\ \fIstr\fP);
+\fBint winstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP);
+\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
+\fBint mvwinstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
 .PP
-\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
-\fBint mvwinstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint innstr(char *\ \fIstr\fP, int \fIn\fP);
+\fBint winnstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP, int \fIn\fP);
+\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
+\fBint mvwinnstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a string of characters in \fIstr\fP,
-starting at the current cursor position in the named window.
-Attributes are stripped from the characters.
-.PP
-The four functions with \fIn\fP as the last argument return
-a leading substring at most \fIn\fP characters long
-(exclusive of the trailing NUL).
-Transfer stops at the end of the current line, or when \fIn\fP characters have
-been stored at the location referenced by \fIstr\fP.
+.B \%winstr
+extracts a string from a
+.I curses
+window
+.IR win ","
+starting at the cursor and stopping at the end of the line,
+and stores it in
+.IR str ","
+terminating it with a null character
+and
+omitting any attributes and color pair identifier
+that
+.I curses
+associates with each character.
+.B \%winnstr
+does the same,
+but copies at most
+.I n
+characters from
+.IR win "."
+An
+.I n
+of
+.B \-1
+implies no limit;
+.B \%winnstr
+then works like
+.BR \%winstr "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All of the functions return \fBERR\fP upon failure,
-or the number of characters actually read into the string.
+These functions return the count of characters copied from
+.I win
+to
+.IR str ","
+or
+.B ERR
+upon failure.
 .PP
-X/Open Curses defines no error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.B NULL
+or
 .bP
-if the \fIchstr\fP parameter is null.
+.I str
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -96,32 +128,92 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except \fBwinnstr\fP may be macros.
+All of these functions except
+.B \%winnstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
-\fIstr\fP
+.I str
 with
-\fBinstr\fP,
-\fBmvinstr\fP,
-\fBmvwinstr\fP
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
 or
-\fBwinstr\fP
+.B \%mvwinstr
 causes undefined results.
-Therefore, the use of
-\fBinnstr\fP,
-\fBmvinnstr\fP,
-\fBmvwinnstr\fP, or
-\fBwinnstr\fP
-is recommended.
+Use of
+.BR \%innstr ","
+.BR \%winnstr ","
+.BR \%mvinnstr ","
+and
+.B \%mvwinnstr
+is recommended instead.
+.SH EXTENSIONS
+.BR \%innstr ","
+.BR \%winnstr ","
+.BR \%mvinnstr ","
+and
+.BR \%mvwinnstr "'s"
+treatment of
+.B \-1
+as a valid value of
+.I n
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-SVr4 does not
-document whether a length limit includes or excludes the trailing NUL.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-The \fI\%ncurses\fP library extends the X/Open Curses description by allowing a
-negative value for \fIn\fP.
-In this case, the functions return the string ending at the right margin.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+X/Open Curses Issues 4 and 7 both state that
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
+and
+.B \%mvwinstr
+return
+.B OK
+rather than a character count.
+This is likely an erratum.
+.bP
+SVr3.1 and SVr4 implemented
+.B \%winstr
+as a wrapper around
+.BR \%winnstr ","
+returning the latter's return value.
+X/Open Curses's specification thus may have been an editorial solecism
+copied from System\ V's documentation
+(see below)
+by X/Open,
+rather than an intentional change.
+.bP
+.I \%ncurses
+retains compatibility with System\ V
+.I curses
+behavior.
+.PP
+SVr4 documents no return values apart from
+.B OK
+and
+.B ERR
+for any of these functions.
+SVr4 does not
+document whether
+.I n
+counts the null terminator that these functions write to
+.IR str "."
+.SH HISTORY
+SVr3.1 (1987)
+introduced these functions.
 .SH SEE ALSO
-\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+\fB\%curs_inwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
 .RI \%( ncursesw ).
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 9bafe85db..a557cbe3c 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp $
-.TH curs_inwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp $
+.TH curs_inwstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,48 +57,84 @@ get a wide-character string from a \fIcurses\fR window
 .nf
 \fB#include <curses.h>
 .PP
-\fBint inwstr(wchar_t *\fIwstr\fP);
-\fBint innwstr(wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint winwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP);
-\fBint winnwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint inwstr(wchar_t *\ \fIwstr\fP);
+\fBint winwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP);
+\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
+\fBint mvwinwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
 .PP
-\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
-\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwinwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
-\fBint mvwinnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint innwstr(wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint winnwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint mvwinnwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
-starting at the current cursor position in the named window.
-.PP
-The four functions with \fIn\fP as the last argument return
-a leading substring at most \fIn\fP characters long
-(exclusive of the trailing NUL).
-Transfer stops at the end of the current line, or when \fIn\fP characters have
-been stored at the location referenced by \fIwstr\fP.
-.PP
-If the size \fIn\fP is not large enough to store a complete complex character,
-an error is generated.
+.B \%winwstr
+extracts a wide-character string from a
+.I curses
+window
+.IR win ","
+starting at the cursor and stopping at the end of the line,
+and stores it in
+.IR wstr ","
+terminating it with a wide null character
+and
+omitting any attributes and color pair identifier
+that
+.I curses
+associates with each character.
+.B \%winnwstr
+does the same,
+but copies at most
+.I n
+characters from
+.IR win "."
+An
+.I n
+of
+.B \-1
+implies no limit;
+.B \%winnwstr
+then works like
+.BR \%winwstr "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All routines return
-\fBERR\fP
+On successful operation,
+these functions return the count of wide characters copied from
+.I win
+to
+.IR wstr "."
+They return
+.B ERR
 upon failure.
-Upon
-successful completion, the *\fBinwstr\fP
-routines return
-\fBOK\fP, and the *\fBinnwstr\fP
-routines return the
-number of characters read into the string.
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+return
+.B ERR
+if
+.I n
+is insufficiently large to store a complete wide character string.
+(Recall that a
+.I curses
+complex character can contain multiple wide characters,
+some of which may be non-spacing.)
 .PP
-X/Open defines no error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+these functions return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
-.bP
-if the \fIwstr\fP parameter is null, or
+.I win
+is
+.B NULL
+or
 .bP
-if no characters could be read.
+.I wstr
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -106,37 +142,90 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except
-\fBwinnwstr\fP
-may be macros.
-.PP
-Each cell in the window holds a complex character
-(a spacing character and zero or more non-spacing characters)
-together with attributes and color.
-These functions store only the wide characters,
-ignoring attributes and color.
-Use \fBin_wchstr\fP to return the complex characters from a window.
+All of these functions except
+.B \%winnwstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
-\fIwstr\fP
+.I str
 with
-\fBinwstr\fP,
-\fBmvinwstr\fP,
-\fBmvwinwstr\fP
+.BR \%inwstr ","
+.BR \%winwstr ","
+.BR \%mvinwstr ","
 or
-\fBwinwstr\fP
+.B \%mvwinwstr
 causes undefined results.
-Therefore, the use of
-\fBinnwstr\fP,
-\fBmvinnwstr\fP,
-\fBmvwinnwstr\fP, or
-\fBwinnwstr\fP
-is recommended.
+Use of
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+is recommended instead.
+.SH EXTENSIONS
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.BR \%mvwinnwstr "'s"
+treatment of
+.B \-1
+as a valid value of
+.I n
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+Notwithstanding the foregoing,
+X/Open Curses Issues 4 and 7 both state that
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+\*(``fail .\|.\|. [i]f the array is not large enough to contain any
+complete characters\*(''.
+Strictly interpreted,
+this means that a caller of these functions cannot use their return
+values to detect truncation of a wide-character string copied from more
+than one character cell in
+.IR win "."
+.I \%ncurses
+reports any truncation with
+.BR ERR "."
+.PP
+X/Open Curses specifies
+.BR \%inwstr ","
+.BR \%winwstr ","
+.BR \%mvinwstr ","
+and
+.B \%mvwinwstr
+as returning
+.B OK
+rather than a (wide) character count,
+unlike their non-wide counterparts
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
+and
+.BR \%mvwinstr "."
+.I \%ncurses
+regards this inconsistency as an error in the standard.
 .SH SEE ALSO
+\fB\%curs_instr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_inch\fP(3X),
-\fB\%curs_inchstr\fP(3X),
-\fB\%curs_instr\fP(3X),
+\fB\%curs_in_wch\fP(3X),
 \fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 8c4119de6..e474b6400 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp $
-.TH curs_kernel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp $
+.TH curs_kernel 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,33 +106,66 @@ state of the terminal modes.
 a buffer and \fBresetty\fP restores the state to what it was at the
 last call to \fBsavetty\fP.
 .SS getsyx
-The \fBgetsyx\fP routine returns the current coordinates
-of the \fIvirtual screen\fP cursor in \fIy\fP and \fIx\fP.
-If \fBleaveok\fP is currently \fBTRUE\fP, then
-\fB\-1\fP,\fB\-1\fP is returned.
-If lines have been removed from the top of the
-screen, using \fBripoffline\fP, \fIy\fP and \fIx\fP include these lines;
-therefore, \fIy\fP and \fIx\fP should be used only as arguments for
-\fBsetsyx\fP.
+.B \%getsyx
+stores the coordinates of virtual screen
+.RB \%( newscr )
+cursor in
+.I y
+and
+.IR x "."
+If
+.BR \%newscr 's
+\fB\%leaveok\fP(3X) output option is
+.BR TRUE ","
+.B \%getsyx
+stores
+.B \-1
+in both
+.I y
+and
+.IR x "."
+If lines have been removed from the top of the screen using
+.BR \%ripoffline ","
+.I y
+includes these lines;
+therefore,
+.I y
+and
+.I x
+populated by
+.B \%getsyx
+should be used only as arguments for
+.BR \%setsyx "."
 .PP
-Few applications will use this feature,
-most use \fBgetyx\fP instead.
+Few applications use this feature;
+most call \fB\%getyx\fP(3X) instead.
 .SS setsyx
-The \fBsetsyx\fP routine sets
-the \fIvirtual screen\fP cursor to \fIy\fP, \fIx\fP.
-If \fIy\fP and \fIx\fP are both \fB\-1\fP, then
-\fBleaveok\fP is set.
-The two routines \fBgetsyx\fP and \fBsetsyx\fP
-are designed to be used by a library routine, which manipulates
-\fBcurses\fP windows but does not want to change the current position
-of the program's cursor.
-The library routine would call \fBgetsyx\fP
-at the beginning, do its manipulation of its own windows, do a
-\fBwnoutrefresh\fP on its windows, call \fBsetsyx\fP, and then call
-\fBdoupdate\fP.
+.B \%setsyx
+sets the virtual screen
+.RB \%( newscr )
+cursor location to
+.RI ( y ,
+.IR x ")."
+.B "\%setsyx(\-1, \-1)"
+is equivalent to
+.BR "\%leaveok(newscr, TRUE)" "."
 .PP
-Few applications will use this feature,
-most use \fBwmove\fP instead.
+.B \%getsyx
+and
+.B \%setsyx
+are designed to be used by a function that manipulates
+.I curses
+windows but seeks to avoid changing the cursor position.
+Such a function would first call
+.BR \%getsyx ","
+modify its windows' content,
+call \fB\%wnoutrefresh\fP(3X) on them,
+call
+.BR \%setsyx ","
+then call \fB\%doupdate\fP(3X).
+.PP
+Few applications use this feature;
+most call \fB\%wmove\fP(3X) instead.
 .SS curs_set
 The \fBcurs_set\fP routine sets the cursor state to invisible,
 normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
@@ -263,6 +296,12 @@ capability,
 rather than the least costly combination of absolute and relative
 motion.
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
 are not described in X/Open Curses, Issue 4.
 All other functions are as described in X/Open Curses.
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 4b78ff99a..ba9881e53 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp $
-.TH curs_scr_dump 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp $
+.TH curs_scr_dump 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -99,11 +99,17 @@ bases its next update of the screen on this information rather than
 clearing it and starting from scratch.
 .PP
 .I curses
-regards the terminal being in an invalid state for computation of
-updates based on the contents of
+regards the terminal as in an invalid state for computation of updates
+based on the contents of
 .I filename
 if
 .bP
+.I curses
+knows that the terminal has been written to since the preceding
+.B \%scr_dump
+call,
+or
+.bP
 the terminal type supports the
 .I \%term\%info
 capabilities
@@ -111,13 +117,7 @@ capabilities
 .RB \%( rmcup )
 or
 .B \%non_rev_rmcup
-.RB \%( nrrmc ),
-or
-.bP
-.I curses
-knows that the terminal has been written to since the preceding
-.B \%scr_dump
-call.
+.RB \%( nrrmc ).
 .PP
 Either of the foregoing conditions means that
 .I curses
@@ -129,8 +129,8 @@ The former is due to terminal features
 that couple cursor-positioning mode with a local cache of screen
 contents.
 .I curses
-cannot know whether terminal is displaying from that local cache at the
-time the application calls
+cannot know whether the terminal is displaying from that local cache
+at the time the application calls
 .BR \%scr_init ","
 so it makes a pessimistic assumption that a full redraw is required;
 see subsection \*(``Cursor Motions\*('' of \fB\%terminfo\fP(5).
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 046a3a96c..2c373f6f6 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp $
-.TH curs_terminfo 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp $
+.TH curs_terminfo 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -1007,6 +1007,7 @@ by adding functions to retrieve capability values
 interface),
 and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
 .PP
+.ne 4v
 .TS
 lB lB
 lB lx.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index a4f5de232..c589f0e27 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp $
-.TH curs_util 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp $
+.TH curs_util 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -85,30 +85,35 @@ miscellaneous \fIcurses\fR utility routines
 .fi
 .SH DESCRIPTION
 .SS unctrl
-The \fBunctrl\fP routine returns a character string which is a printable
+The \fBunctrl\fP routine returns a character string as a printable
 representation of the character \fIch\fP:
 .bP
 Printable characters are displayed as themselves,
-e.g., a one-character string containing the key.
+e.g.,
+a one-character string containing the key.
 .bP
 Control characters are displayed in the \fB^\fIX\fR notation.
 .bP
 Printing characters are displayed as is.
 .bP
-DEL (character 127) is displayed as \fB^?\fP.
+DEL
+(character 127)
+is displayed as \fB^?\fP.
 .bP
 Values above 128 are either meta characters
 (if the screen has not been initialized,
 or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
 shown in the \fBM\-\fIX\fR notation,
 or are displayed as themselves.
-In the latter case, the values may not be printable;
+In the latter case,
+the values may not be printable;
 this follows the X/Open specification.
 .PP
 The corresponding \fBwunctrl\fP returns a printable representation of
 a complex character \fIwch\fP.
 .PP
-In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
+In both \fBunctrl\fP and \fBwunctrl\fP the attributes
+and color associated
 with the character parameter are ignored.
 .SS "keyname, key_name"
 The \fBkeyname\fP routine returns a character string
@@ -121,22 +126,28 @@ They are displayed using \fBunctrl\fP.
 Values above 256 may be the codes for function keys.
 The function key name is displayed.
 .bP
-Otherwise (if there is no corresponding name and the key is not a character)
-the function returns null, to denote an error.
+Otherwise
+(if there is no corresponding name and the key is not a character)
+the function returns null,
+to denote an error.
 X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
 which some implementations return rather than null.
 .LP
 The corresponding \fBkey_name\fP returns
 a multibyte character string corresponding
 to the wide-character value \fIwc\fP.
-The two functions (\fBkeyname\fP and \fBkey_name\fP)
+The two functions
+(\fBkeyname\fP and \fBkey_name\fP)
 do not return the same set of strings:
 .bP
-\fBkeyname\fP returns null where \fBkey_name\fP would display a meta character.
+\fBkeyname\fP returns null where \fBkey_name\fP
+would display a meta character.
 .bP
 \fBkey_name\fP does not return the name of a function key.
 .SS "filter, nofilter"
-The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
+The \fBfilter\fP routine,
+if used,
+must be called before \fBinitscr\fP or
 \fBnewterm\fP are called.
 Calling \fBfilter\fP causes these changes in initialization:
 .bP
@@ -156,14 +167,15 @@ the capability \fBed\fP is disabled if \fBbce\fP is set;
 .bP
 and the \fBhome\fP string is set to the value of \fBcr\fP.
 .PP
-The \fBnofilter\fP routine cancels the effect of a preceding \fBfilter\fP
-call.
+The \fBnofilter\fP routine cancels the effect
+of a preceding \fBfilter\fP call.
 That allows the caller to initialize a screen on a different device,
 using a different value of \fB$TERM\fP.
 The limitation arises because the \fBfilter\fP routine modifies the
 in-memory copy of the terminal information.
 .SS use_env
-The \fBuse_env\fP routine, if used,
+The \fBuse_env\fP routine,
+if used,
 should be called before \fBinitscr\fP or
 \fBnewterm\fP are called
 (because those compute the screen size).
@@ -181,7 +193,8 @@ Then it asks for the screen size via operating system calls.
 If successful,
 it overrides the values from the terminal database.
 .bP
-Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
+Finally
+(unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
 \fI\%ncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 using a value in those to override the results
@@ -192,7 +205,8 @@ from the operating system or terminal database.
 unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 .SS use_tioctl
-The \fBuse_tioctl\fP routine, if used,
+The \fBuse_tioctl\fP routine,
+if used,
 should be called before \fBinitscr\fP or \fBnewterm\fP are called
 (because those compute the screen size).
 After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
@@ -202,12 +216,13 @@ of screen size as follows:
 checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 are set to a number greater than zero.
 .bP
-for each, \fI\%ncurses\fP updates the corresponding environment variable
+for each,
+\fI\%ncurses\fP updates the corresponding environment variable
 with the value that it has obtained via operating system call
 or from the terminal database.
 .bP
 \fI\%ncurses\fP re-fetches the value of the environment variables so
-that it is still the environment variables which set the screen size.
+that it is still the environment variables that set the screen size.
 .PP
 The \fB\%use_env\fP and \fB\%use_tioctl\fP routines combine as follows.
 .IP
@@ -233,7 +248,9 @@ T}
 .TE
 .SS "putwin, getwin"
 The \fBputwin\fP routine writes all data associated
-with window (or pad) \fIwin\fP into
+with window
+(or pad)
+\fIwin\fP into
 the file to which \fIfilep\fP points.
 This information can be later retrieved
 using the \fBgetwin\fP function.
@@ -249,14 +266,16 @@ the data written is a copy of the \fI\%WINDOW\fP structure,
 and its associated character cells.
 The format differs between the wide-character (\fI\%ncursesw\fP) and
 non-wide (\fI\%ncurses\fP) libraries.
-You can transfer data between the two, however.
+You can transfer data between the two,
+however.
 .bP
-the retrieved window is always created as a top-level window (or pad),
+the retrieved window is always created as a top-level window
+(or pad),
 rather than a subwindow.
 .bP
 the window's character cells contain the color pair \fIvalue\fP,
 but not the actual color \fInumbers\fP.
-If cells in the retrieved window use color pairs which have not been
+If cells in the retrieved window use color pairs that have not been
 created in the application using \fBinit_pair\fP,
 they will not be colored when the window is refreshed.
 .SS delay_output
@@ -268,7 +287,8 @@ because \fI\%ncurses\fP transmits null characters
 instead of sleeping and requesting resumption from the operating system.
 Padding is used unless:
 .bP
-the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability, or
+the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability,
+or
 .bP
 the environment variable \fB\%NCURSES_NO_PADDING\fP is set.
 .PP
@@ -278,12 +298,15 @@ If the value of \fIms\fP exceeds 30,000
 (thirty seconds),
 it is capped at that value.
 .SS flushinp
-The \fBflushinp\fP routine throws away any typeahead that has been typed by the
-user and has not yet been read by the program.
+The \fBflushinp\fP routine throws away any typeahead
+that has been typed by the user
+and has not yet been read by the program.
 .SH RETURN VALUE
-Except for \fBflushinp\fP, routines that return an integer return \fBERR\fP
-upon failure and \fBOK\fP (SVr4 specifies only "an integer value other than
-\fBERR\fP") upon successful completion.
+Except for \fBflushinp\fP,
+routines that return an integer
+return \fBERR\fP upon failure and \fBOK\fP
+(SVr4 specifies only "an integer value other than \fBERR\fP")
+upon successful completion.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .PP
@@ -299,15 +322,15 @@ if the terminal was not initialized.
 \fBputwin\fP
 returns
 .B ERR
-if the associated \fBfwrite\fP calls return
+if the associated \fIwrite\fP(2) calls return
 .BR ERR "."
 .RE
 .SH PORTABILITY
 .SS filter
-The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
-terms.
-The description here is adapted from X/Open Curses (which
-erroneously fails to describe the disabling of \fBcuu\fP).
+The SVr4 documentation describes the action of \fBfilter\fP
+only in the vaguest terms.
+The description here is adapted from X/Open Curses
+(which erroneously fails to describe the disabling of \fBcuu\fP).
 .SS "delay_output padding"
 The limitation to 30 seconds
 and the use of \fBnapms\fP
@@ -321,19 +344,22 @@ but does not take timing into account when using the padding character.
 Neither limits the delay.
 .SS keyname
 The \fBkeyname\fP function may return the names of user-defined
-string capabilities which are defined in the terminfo entry via the \fB\-x\fP
+string capabilities that are defined in the terminfo entry
+via the \fB\-x\fP
 option of \fB@TIC@\fP.
 This implementation automatically assigns at run-time key codes to
-user-defined strings which begin with \*(``k\*(''.
-The key codes 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.
+user-defined strings that begin with \*(``k\*(''.
+The key codes 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 that have been loaded.
 The \fBuse_extended_names\fP(3X) function controls whether this data is
 loaded when the terminal description is read by the library.
 .SS "nofilter, use_tioctl"
 The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to
 \fI\%ncurses\fP.
-They were not supported on Version 7, BSD or System V implementations.
+They were not supported on Version 7,
+BSD or System V implementations.
 It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fBNCURSES_VERSION\fP.
 .SS "putwin/getwin file-format"
@@ -345,68 +371,96 @@ use an implementation-specific format.
 Although the format is an obvious target for standardization,
 it has been overlooked.
 .IP
-Interestingly enough, according to the copyright dates in Solaris source,
-the functions (along with \fBscr_init\fP, etc.) originated with
-the University of California, Berkeley (in 1982)
-and were later (in 1988) incorporated into SVr4.
-Oddly, there are no such functions in the 4.3BSD curses sources.
+Interestingly enough,
+according to the copyright dates in Solaris source,
+the functions
+(along with \fBscr_init\fP,
+etc.\&)
+originated with the University of California,
+Berkeley
+(in 1982)
+and were later
+(in 1988)
+incorporated into SVr4.
+Oddly,
+there are no such functions in the 4.3BSD curses sources.
 .bP
 Most implementations simply dump the binary \fI\%WINDOW\fP structure
 to the file.
-These include SVr4 curses, NetBSD and PDCurses,
+These include SVr4 curses,
+NetBSD and PDCurses,
 as well as older \fI\%ncurses\fP versions.
 This implementation
-(as well as the X/Open variant of Solaris curses, dated 1995)
+(as well as the X/Open variant of Solaris curses,
+dated 1995)
 uses textual dumps.
 .IP
-The implementations which use binary dumps use block-I/O
-(the \fBfwrite\fP and \fBfread\fP functions).
+The implementations that use binary dumps use block-I/O
+(\fIwrite\fP(2) and \fIread\fP(2) 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.
-However, reading from a file written using mixed schemes may not be successful.
+This implementation reduces the problem on writes by flushing the
+output.
+However,
+reading from a file written using mixed schemes may not be successful.
 .SS "unctrl, wunctrl"
-X/Open Curses, Issue 4 describes these functions.
-It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
-unsuccessful, but does not define any error conditions.
+X/Open Curses,
+Issue 4 describes these functions.
+It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
+if unsuccessful,
+but does not define any error conditions.
 This implementation checks for three cases:
 .bP
 the parameter is a 7-bit US\-ASCII code.
 This is the case that X/Open Curses documented.
 .bP
-the parameter is in the range 128\-159, i.e., a C1 control code.
+the parameter is in the range 128\-159,
+i.e.,
+a C1 control code.
 If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
-\fBunctrl\fP returns the parameter, i.e., a one-character string with
+\fBunctrl\fP 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.
+Otherwise,
+it returns \*(``~@\*('',
+\*(``~A\*('',
+etc.,
+analogous to \*(``^@\*('',
+\*(``^A\*('',
+C0 controls.
 .IP
-X/Open Curses does not document whether \fBunctrl\fP can be called before
-initializing curses.
+X/Open Curses does not document whether \fBunctrl\fP can be called
+before initializing curses.
 This implementation permits that,
-and returns the \*(``~@\*('', etc., values in that case.
+and returns the \*(``~@\*('',
+etc.,
+values in that case.
 .bP
 parameter values outside the 0 to 255 range.
 \fBunctrl\fP returns a null pointer.
 .PP
-The strings returned by \fBunctrl\fP in this implementation are determined
-at compile time,
+The strings returned by \fBunctrl\fP 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 \*(``^\*('',
+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
 printable.
-This implementation uses 8 bits but does not modify the string to reflect
-locale.
+This implementation uses 8 bits
+but does not modify the string to reflect locale.
 The \fBuse_legacy_coding\fP(3X) function allows the caller to
 change the output of \fBunctrl\fP.
 .PP
-Likewise, the \fBmeta\fP(3X) function allows the caller to change the
-output of \fBkeyname\fP, i.e.,
+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).
 Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
@@ -414,11 +468,14 @@ curses is initialized.
 X/Open Curses does not document the treatment of codes 128 to 159.
 When treating them as \*(``meta\*('' keys
 (or if \fBkeyname\fP is called before initializing curses),
-this implementation returns strings \*(``M\-^@\*('', \*(``M\-^A\*('', etc.
+this implementation returns strings \*(``M\-^@\*('',
+\*(``M\-^A\*('',
+etc.
 .PP
 X/Open Curses documents \fBunctrl\fP as declared in \fB<unctrl.h>\fP,
 which \fI\%ncurses\fP does.
-However, \fI\%ncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
+However,
+\fI\%ncurses\fP' \fB<curses.h>\fP includes \fB<unctrl.h>\fP,
 matching the behavior of SVr4 curses.
 Other implementations may not do that.
 .SS "use_env, use_tioctl"
diff --git a/man/define_key.3x b/man/define_key.3x
index 6937d6203..1e450207d 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp $
-.TH define_key 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp $
+.TH define_key 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -122,9 +122,8 @@ since 2.0 (2004) supports
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
-\fB\%keyok\fP(3X),
-\fB\%key_defined\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/key_defined.3x b/man/key_defined.3x
index f5d9b4474..c1e401ae8 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp $
-.TH key_defined 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp $
+.TH key_defined 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fP function key code is defined
@@ -79,8 +79,7 @@ preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%keyok\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X)
diff --git a/man/keybound.3x b/man/keybound.3x
index 476920692..03725503a 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp $
-.TH keybound 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp $
+.TH keybound 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of a \fIcurses\fP function key code
@@ -97,8 +97,8 @@ preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%key_defined\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/keyok.3x b/man/keyok.3x
index a10da7bde..0459ab092 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp $
-.TH keyok 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp $
+.TH keyok 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -104,8 +104,8 @@ since 2.0 (2004) supports
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%key_defined\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X).
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 6198b02cc..637688034 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.75 2024/05/25 20:26:02 tom Exp $
+# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -195,6 +195,8 @@ derwin.3x			derwin.3ncurses
 doupdate.3x			doupdate.3ncurses
 echo.3x				echo.3ncurses
 endwin.3x			endwin.3ncurses
+erasechar.3x			erasechar.3ncurses
+erasewchar.3x			erasewchar.3ncurses
 extended_slk_color.3x		extended_slk_color.3ncurses
 filter.3x			filter.3ncurses
 flushinp.3x			flushinp.3ncurses
@@ -203,6 +205,7 @@ getattr.3x			getattr.3ncurses
 getcchar.3x			getcchar.3ncurses
 getch.3x			getch.3ncurses
 getwin.3x			getwin.3ncurses
+getyx.3x			getyx.3ncurses
 halfdelay.3x			halfdelay.3ncurses
 has_key.3x			has_key.3ncurses
 idcok.3x			idcok.3ncurses
@@ -227,6 +230,7 @@ nl.3x				nl.3ncurses
 nocbreak.3x			nocbreak.3ncurses
 nodelay.3x			nodelay.3ncurses
 nonl.3x				nonl.3ncurses
+noraw.3x			noraw.3ncurses
 notimeout.3x			notimeout.3ncurses
 pnoutrefresh.3x			pnoutrefresh.3ncurses
 prefresh.3x			prefresh.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 7122bd4a9..27a9b371c 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.37 2024/05/25 22:40:43 tom Exp $
+# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -51,6 +51,8 @@ delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 echo(3X)		curs_inopts(3X)
 endwin(3X)		curs_initscr(3X)
+erasechar(3X)		curs_termattrs(3X)
+erasewchar(3X)		curs_termattrs(3X)
 extended_slk_color(3X)	curs_slk(3X)
 filter(3X)		curs_util(3X)
 flushinp(3X)		curs_util(3X)
@@ -58,6 +60,7 @@ get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
 getwin(3X)		curs_util(3X)
+getyx(3X)		curs_getyx(3X)
 halfdelay(3X)		curs_inopts(3X)
 has_key(3X)		curs_getch(3X)
 immedok(3X)		curs_outopts(3X)
@@ -78,6 +81,7 @@ newwin(3X)		curs_window(3X)
 nl(3X)			curs_inopts(3X)
 nocbreak(3X)		curs_inopts(3X)
 nonl(3X)		curs_inopts(3X)
+noraw(3X)		curs_inopts(3X)
 pnoutrefresh(3X)	curs_pad(3X)
 prefresh(3X)		curs_pad(3X)
 printw(3X)		curs_printw(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index e94e10a4b..b784cc071 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp $
-.TH ncurses 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp $
+.TH ncurses 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -236,7 +236,7 @@ data structure.
 A
 .I window
 is a rectangular grid of character cells,
-addressed by row and column coordinates
+addressed by line and column coordinates
 .RI ( y ,
 .IR x ),
 with the upper left corner as (0, 0).
@@ -261,8 +261,7 @@ effects.
 .PP
 Functions permit manipulation of a window and the
 .I cursor
-identifying the cell within it at which the next output operation will
-occur.
+identifying the cell within it at which the next operation will occur.
 Among those,
 the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
 these place the cursor within and write a character to
@@ -464,6 +463,17 @@ Each cell of a
 .I \%WINDOW
 is stored as a
 .IR \%chtype .
+X/Open Curses does not specify the sizes of the character code or
+color pair identifier,
+nor the quantity of attribute bits,
+in
+.IR chtype ";"
+these are implementation-dependent.
+.I \%ncurses
+uses eight bits for the character code.
+An application requiring a wider character type,
+for instance to represent Unicode,
+should use the wide-character API.
 .TP 10
 .I \%ncursesw
 is the library in its \*(``wide\*('' configuration,
@@ -484,6 +494,12 @@ For example,
 .BR \%addwstr ,
 .BR \%inwstr ,
 and their variants.)
+.\" This is because they operate on "plain" wide-character strings
+.\" (`wchar_t*`) and not curses complex character strings (`cchar_t*`).
+.\" SVID 4 did specify functions like `addwch()` and `inswch()` that
+.\" operated on `chtype`s assuming that they were wide enough for a
+.\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
+.\" standardize these.
 .IP
 This convention is inapplicable to some non-wide function names,
 so other transformations are used for the wide configuration:
@@ -499,7 +515,7 @@ and character attribute manipulation functions like
 corresponds to the non-wide configuration's
 .IR \%chtype .
 It is a structure type
-because it requires more storage than fits into a standard scalar type.
+because it requires more storage than a standard scalar type offers.
 A character code may not be representable as a
 .IR \%char ,
 and moreover more than one character may occupy a cell
diff --git a/man/terminfo.tail b/man/terminfo.tail
index f1a213555..74a274152 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.149 2024/05/11 20:28:54 tom Exp $
+.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -348,7 +348,7 @@ and
 applies to storage scope terminals, such as \s-1TEKTRONIX\s+1 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
+line, give this as
 .BR cr .
 (Normally this will be carriage return, control/M.)
 If there is a code to produce an audible signal (bell, beep, etc)
@@ -412,7 +412,7 @@ The only local motion which is defined from the left edge is if
 .B bw
 is given, then a
 .B cub1
-from the left edge will move to the right edge of the previous row.
+from the left edge will move to the right edge of the previous line.
 If
 .B bw
 is not given, the effect is undefined.
@@ -462,8 +462,8 @@ with \fIprintf\fP-like escapes such as \fI%x\fP in it.
 For example, to address the cursor, the
 .B 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
+the line and column to address to.
+(Lines 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 by
@@ -608,17 +608,17 @@ That is, to get x\-5 one would use \*(``%gx%{5}%\-\*(''.
 \fB%P\fP and \fB%g\fP variables are
 persistent across escape-string evaluations.
 .PP
-Consider the HP2645, which, to get to row 3 and column 12, needs
+Consider the HP2645, which, to get to line 3 and column 12, needs
 to be sent \eE&a12c03Y padded for 6 milliseconds.
-The order of the rows and columns is inverted here,
-and the row and column are printed as two digits.
+The order of the lines and columns is inverted here,
+and the lines and column are printed as two digits.
 The corresponding terminal description is expressed thus:
 .RS
 cup=\eE&a%p2%dc%p1%dY$<6>,
 .RE
 .PP
-The Microterm \s-1ACT-IV\s0 needs the current row and column sent
-preceded by a \fB\*^T\fP, with the row and column simply encoded in binary,
+The Microterm \s-1ACT-IV\s0 needs the current line and column sent
+preceded by a \fB\*^T\fP, with the line and column simply encoded in binary,
 .RS
 cup=\*^T%p1%c%p2%c
 .RE
@@ -632,7 +632,7 @@ This is necessary because it is not always safe to transmit \fB\en\fP
 tabs are never expanded, so \et is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
 .PP
-A final example is the \s-1LSI ADM\s0-3a, which uses row and column
+A final example is the \s-1LSI ADM\s0-3a, which uses line and column
 offset by a blank character, thus
 .RS
 cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
@@ -656,7 +656,7 @@ to the top left corner of the screen, not of memory.
 (Thus, the \eEH sequence on HP terminals cannot be used for
 .BR home .)
 .PP
-If the terminal has row or column absolute cursor addressing,
+If the terminal has line or column absolute cursor addressing,
 these can be given as single parameter capabilities
 .B hpa
 (horizontal position absolute)
@@ -713,7 +713,7 @@ the ability to set a top and/or bottom margin using the current
 line position, and
 .bP
 parameterized capabilities for setting the top, bottom, left, right margins
-given the number of rows or columns.
+given the number of lines or columns.
 .RE
 .PP
 In practice, the categorization into \*(``terminal\*('' and \*(``printer\*(''
@@ -1446,7 +1446,7 @@ If there are commands to set and clear tab stops, they can be given as
 (clear all tab stops)
 and
 .B hts
-(set a tab stop in the current column of every row).
+(set a tab stop in the current column of every line).
 If a more complex sequence is needed to set the tabs than can be
 described by this, the sequence can be placed in
 .B is2
diff --git a/man/tput.1 b/man/tput.1
index bd25b0b5b..ad9309621 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp $
-.TH @TPUT@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp $
+.TH @TPUT@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,20 +49,20 @@
 \fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
 .SH SYNOPSIS
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP]
 {\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|.
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
 .PP
-\fB@TPUT@ \-S\fP
+\fB@TPUT@\fP [\fB\-v\fP] \fB\-S\fP
 .PP
-\fB@TPUT@ \-V\fP
+\fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP
 .SH DESCRIPTION
 \fB\%@TPUT@\fP uses the
 .I \%term\%info
@@ -373,6 +373,10 @@ and
 .I \%COLUMNS
 are also ignored.
 .TP
+.B \-v
+causes \fB\%@TPUT@\fP to operate verbosely,
+reporting warnings.
+.TP
 .B \-V
 reports the version of
 .I \%ncurses
@@ -913,7 +917,7 @@ environment variable.
 Set cursor to normal visibility.
 .TP
 .B "@TPUT@ home"
-Move the cursor to row 0,
+Move the cursor to line 0,
 column 0:
 the upper left corner of the screen,
 usually known as the \*(``home\*('' cursor position.
@@ -950,7 +954,7 @@ printf "${strong}Username:${normal} "
 Indicate via exit status whether the terminal is a hard copy device.
 .TP
 .B "@TPUT@ cup 23 4"
-Move the cursor to row 23,
+Move the cursor to line 23,
 column 4.
 .TP
 .B "@TPUT@ cup"
diff --git a/man/tset.1 b/man/tset.1
index 154d91587..8542bba43 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp $
-.TH @TSET@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp $
+.TH @TSET@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -123,7 +123,10 @@ the backspace, interrupt and line kill characters
 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).
+and,
+if the terminal device does not appear to be a pseudoterminal
+(as might be used by a terminal emulator program),
+\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
diff --git a/man/user_caps.5 b/man/user_caps.5
index 219bbf5f9..cf5fa858a 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp $
-.TH user_caps 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp $
+.TH user_caps 5 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,7 +58,12 @@ Before \fI\%ncurses\fP 5.0,
 terminfo databases used a \fIfixed repertoire\fP of terminal
 capabilities designed for the SVr2 terminal database in 1984,
 and extended in stages through SVr4 (1989),
-and standardized in the Single Unix Specification beginning in 1995.
+and standardized in X/Open Curses starting in 1995.
+.\" That date is a surmise based on the capability list appearing in
+.\" Issue 4, Version 2 (1996).  That list is not in man page format in
+.\" the standard, so lacks a "HISTORY" section.  However, `tigetstr()`
+.\" and `tputs()` are identified in the same document as new to Issue 4,
+.\" so GBR conjectures that the list came in at the same time.
 .PP
 Most of the \fIextensions\fP in this fixed repertoire were additions
 to the tables of Boolean, numeric and string capabilities.
diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index b2fdaeac7..abfc595f3 100644
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.10 2024/06/08 21:22:24 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
@@ -93,22 +93,15 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
     returnCode(count);
 }
 
-/*
- * X/Open says winwstr() returns OK if not ERR.  If that is not a blunder, it
- * must have a null termination on the string (see above).  Unlike winnstr(),
- * it does not define what happens for a negative count with winnwstr().
- */
 NCURSES_EXPORT(int)
 winwstr(WINDOW *win, wchar_t *wstr)
 {
-    int result = OK;
+    int result = ERR;
 
     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
-    if (win == 0) {
-	result = ERR;
-    } else if (winnwstr(win, wstr,
-			CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) {
-	result = ERR;
+    if (win != 0) {
+	result = winnwstr(win, wstr,
+			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
     }
     returnCode(result);
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4fe2d8163..122a65be6 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/control b/package/debian-mingw/control
index 6fb213fdf..e442255cc 100644
--- a/package/debian-mingw/control
+++ b/package/debian-mingw/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7),
   binutils-mingw-w64-i686
 Standards-Version: 4.6.1.0
 
-Package: mingw32-ncurses6
+Package: mingw32-ncurses6td
 Architecture: any
+Conflicts: mingw32-ncurses6
+Provides: mingw32-ncurses6
+Replaces: mingw32-ncurses6
 Depends: ${misc:Depends}
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
diff --git a/package/debian-mingw/mingw32-ncurses6td.lintian-overrides b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides
new file mode 100644
index 000000000..8dea2a952
--- /dev/null
+++ b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides
@@ -0,0 +1,7 @@
+mingw32-ncurses6td: latest-debian-changelog-entry-changed-to-native
+
+mingw32-ncurses6td: non-standard-dir-in-usr
+mingw32-ncurses6td: file-in-unusual-dir
+
+mingw32-ncurses6td: binary-without-manpage
+mingw32-ncurses6td: executable-not-elf-or-script
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 8c266a93a..76fbf06de 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi
 TARGET    = i686-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)
+MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)td
 
 CFLAGS = $(CC_NORMAL)
 
@@ -83,7 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
-		--with-pc-suffix=$(MY_ABI) \
+		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch
index f6b3987e0..11c22c5a6 100644
--- a/package/debian-mingw/watch
+++ b/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4fe2d8163..122a65be6 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/control b/package/debian-mingw64/control
index 74e8136a6..7094a176c 100644
--- a/package/debian-mingw64/control
+++ b/package/debian-mingw64/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7),
   binutils-mingw-w64-x86-64
 Standards-Version: 4.6.1.0
 
-Package: mingw64-ncurses6
+Package: mingw64-ncurses6td
 Architecture: any
+Conflicts: mingw64-ncurses6
+Provides: mingw64-ncurses6
+Replaces: mingw64-ncurses6
 Depends: ${misc:Depends}
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
diff --git a/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
new file mode 100644
index 000000000..f475ec0f1
--- /dev/null
+++ b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
@@ -0,0 +1,7 @@
+mingw64-ncurses6td: latest-debian-changelog-entry-changed-to-native
+
+mingw64-ncurses6td: non-standard-dir-in-usr
+mingw64-ncurses6td: file-in-unusual-dir
+
+mingw64-ncurses6td: binary-without-manpage
+mingw64-ncurses6td: executable-not-elf-or-script
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index 3a79517cf..b39fec67e 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi
 TARGET    = x86_64-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)
+MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)td
 
 CFLAGS = $(CC_NORMAL)
 
@@ -83,7 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
-		--with-pc-suffix=$(MY_ABI) \
+		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch
index f6b3987e0..11c22c5a6 100644
--- a/package/debian-mingw64/watch
+++ b/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian/changelog b/package/debian/changelog
index ae19371f8..f04a8642d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/control b/package/debian/control
index 35921910f..3b99ac176 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
@@ -6,8 +6,11 @@ Homepage: https://invisible-island.net/ncurses/
 Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 4.6.1.0
 
-Package: ncurses6
+Package: ncurses6td
 Architecture: any
+Conflicts: ncurses6 (>= 6.5)
+Provides: ncurses6 (= 6.5)
+Replaces: ncurses6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -15,8 +18,11 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6.
 
-Package: ncursest6
+Package: ncursest6td
 Architecture: any
+Conflicts: ncursest6 (>= 6.5)
+Provides: ncursest6 (= 6.5)
+Replaces: ncursest6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -24,9 +30,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6 with pthreads.
 
-Package: ncurses6-doc
+Package: ncurses6td-doc
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc
+Provides: ncurses6-doc
+Replaces: ncurses6-doc
 Depends: groff-base
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -34,9 +43,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ncurses6 document packaging.
 
-Package: ncurses6-doc-html
+Package: ncurses6td-doc-html
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc-html
+Provides: ncurses6-doc-html
+Replaces: ncurses6-doc-html
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
  updating character screens with reasonable optimization.
diff --git a/package/debian/ncurses6td.lintian-overrides b/package/debian/ncurses6td.lintian-overrides
new file mode 100644
index 000000000..dd49fcde2
--- /dev/null
+++ b/package/debian/ncurses6td.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+
+# This is intentional.
+ncurses6td: binary-without-manpage
+ncurses6td: non-dev-pkg-with-shlib-symlink
+ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncurses6td.triggers b/package/debian/ncurses6td.triggers
new file mode 100644
index 000000000..dd8660367
--- /dev/null
+++ b/package/debian/ncurses6td.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/package/debian/ncursest6td.lintian-overrides b/package/debian/ncursest6td.lintian-overrides
new file mode 100644
index 000000000..0a5eccc1e
--- /dev/null
+++ b/package/debian/ncursest6td.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+
+# This is intentional.
+ncursest6td: binary-without-manpage
+ncursest6td: non-dev-pkg-with-shlib-symlink
+ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncursest6td.triggers b/package/debian/ncursest6td.triggers
new file mode 100644
index 000000000..dd8660367
--- /dev/null
+++ b/package/debian/ncursest6td.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/package/debian/rules b/package/debian/rules
index 648939b22..f1f10fe66 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
+# $Id: rules,v 1.57 2024/06/08 17:51:52 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,8 +12,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/buildflags.mk
 
 # packages
-PACKAGES.indep = ncurses6-doc ncurses6-doc-html
-PACKAGES.arch  = ncurses6 ncursest6
+PACKAGES.indep = ncurses6td-doc ncurses6td-doc-html
+PACKAGES.arch  = ncurses6td ncursest6td
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -86,7 +86,8 @@ configure = \
 		--program-suffix=$(MY_ABI) \
 		--verbose \
 		--with-abi-version=$(MY_ABI) \
-		--with-config-suffix=dev \
+		--with-config-suffix=td \
+		--with-pc-suffix=td \
 		--with-cxx-shared \
 		--with-default-terminfo-dir=$(MYDATA) \
 		--with-develop \
@@ -104,8 +105,8 @@ configure = \
 		--with-manpage-symlinks \
 		--without-normal
 
-NCURSES6_DIR = $(CURDIR)/debian/ncurses6
-NCURSEST6_DIR = $(CURDIR)/debian/ncursest6
+NCURSES6_DIR = $(CURDIR)/debian/ncurses6td
+NCURSEST6_DIR = $(CURDIR)/debian/ncursest6td
 
 .PHONY: all config build install binary clean config-indep config-arch \
     build-indep build-arch install-indep install-arch binary-indep \
@@ -118,6 +119,7 @@ build: build-indep build-arch
 install: install-indep install-arch
 binary: binary-indep binary-arch
 clean:
+	pwd; ls -l
 	dh_testdir
 	dh_testroot
 	dh_clean $(verbose)
@@ -133,7 +135,7 @@ install-indep: $(PACKAGES.indep:%=install-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
 # make the doc-package installable by renaming everything to avoid clashing
-patch-ncurses6-stamp:
+patch-ncurses6td-stamp:
 	dh_testdir
 	sed -i.bak \
 		-e 's/-config\.1$$/dev-config.1/;t' \
@@ -147,91 +149,91 @@ patch-ncurses6-stamp:
 	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
 	touch $@
 
-config-ncurses6-stamp: patch-ncurses6-stamp
+config-ncurses6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncurses6
-	mkdir -p t/ncurses6
-	cd t/ncurses6; $(configure)
+	rm -rf t/ncurses6td
+	mkdir -p t/ncurses6td
+	cd t/ncurses6td; $(configure)
 	touch $@
 
-config-ncursest6-stamp: patch-ncurses6-stamp
+config-ncursest6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncursest6
-	mkdir -p t/ncursest6
-	cd t/ncursest6; $(configure) \
+	rm -rf t/ncursest6td
+	mkdir -p t/ncursest6td
+	cd t/ncursest6td; $(configure) \
 		--enable-interop \
 		--enable-sp-funcs \
 		--program-suffix=t$(MY_ABI) \
 		--with-pthread
 	touch $@
 
-config-ncurses6-doc-stamp \
-config-ncurses6-doc-html-stamp: config-ncurses6-stamp
+config-ncurses6td-doc-stamp \
+config-ncurses6td-doc-html-stamp: config-ncurses6td-stamp
 	touch $@
 
-build-ncurses6-stamp: config-ncurses6-stamp
+build-ncurses6td-stamp: config-ncurses6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncurses6
+	$(MAKE) -C t/ncurses6td
 
 	touch $@
 
-build-ncursest6-stamp: config-ncursest6-stamp
+build-ncursest6td-stamp: config-ncursest6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncursest6
+	$(MAKE) -C t/ncursest6td
 
 	touch $@
 
-build-ncurses6-doc-stamp \
-build-ncurses6-doc-html-stamp: build-ncurses6-stamp
+build-ncurses6td-doc-stamp \
+build-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	touch $@
 
-install-ncurses6-stamp: build-ncurses6-stamp
+install-ncurses6td-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6
+	dh_prep        $(verbose) -pncurses6td
 
-	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncurses6td install.libs install.progs DESTDIR=$(NCURSES6_DIR)
+	$(MAKE) -C t/ncurses6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
+	mv t/ncurses6td/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
-install-ncursest6-stamp: build-ncursest6-stamp
+install-ncursest6td-stamp: build-ncursest6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncursest6
+	dh_prep        $(verbose) -pncursest6td
 
-	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncursest6td install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
+	$(MAKE) -C t/ncursest6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+	mv t/ncursest6td/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
 
 	touch $@
 
-install-ncurses6-doc-stamp: build-ncurses6-stamp
+install-ncurses6td-doc-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc
+	dh_prep        $(verbose) -pncurses6td-doc
 
-	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
+	$(MAKE) -C t/ncurses6td install.man DESTDIR=$(NCURSES6_DIR)-doc
 	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
 
 	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
 
 	touch $@
 
-HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
-install-ncurses6-doc-html-stamp: build-ncurses6-stamp
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6td-doc-html
+install-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc-html
+	dh_prep        $(verbose) -pncurses6td-doc-html
 
 	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
 	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
diff --git a/package/debian/watch b/package/debian/watch
index f6b3987e0..11c22c5a6 100644
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 278ed0cbc..38c14836c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.651 2024/06/01 11:06:41 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.652 2024/06/08 09:49:40 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0601"
+!define VERSION_MMDD  "0608"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 23438cc2e..60ecbf820 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8dd480b6f..fc93da6cd 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index a777197d8..cbe0c91d8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules
index 152cd3c77..3a791507d 100755
--- a/test/package/debian-mingw/rules
+++ b/test/package/debian-mingw/rules
@@ -43,7 +43,7 @@ configure-stamp:
 		--prefix=$(MINGW_TOP) \
 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
-		--with-screen=ncursesw6 \
+		--with-screen=ncursesw6td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
 
 	touch configure-stamp
diff --git a/test/package/debian-mingw/watch b/test/package/debian-mingw/watch
index ec075b189..c35c8e38e 100644
--- a/test/package/debian-mingw/watch
+++ b/test/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate
diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules
index 02175a66e..571b9a7ed 100755
--- a/test/package/debian-mingw64/rules
+++ b/test/package/debian-mingw64/rules
@@ -43,7 +43,7 @@ configure-stamp:
 		--prefix=$(MINGW_TOP) \
 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
-		--with-screen=ncursesw6 \
+		--with-screen=ncursesw6td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
 
 	touch configure-stamp
diff --git a/test/package/debian-mingw64/watch b/test/package/debian-mingw64/watch
index ec075b189..c35c8e38e 100644
--- a/test/package/debian-mingw64/watch
+++ b/test/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate
diff --git a/test/package/debian/rules b/test/package/debian/rules
index e8e4eb15d..842e58587 100755
--- a/test/package/debian/rules
+++ b/test/package/debian/rules
@@ -75,7 +75,7 @@ config-$(NCURSES_PKG)-stamp:
 
 	cd t/ncurses6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSES_PKG) \
-		--with-screen=ncurses6
+		--with-screen=ncursesw6td
 
 	touch $@
 
@@ -87,7 +87,7 @@ config-$(NCURSEST_PKG)-stamp:
 
 	cd t/ncursest6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSEST_PKG) \
-		--with-screen=ncursest6
+		--with-screen=ncursestw6td
 
 	touch $@
 
diff --git a/test/package/debian/watch b/test/package/debian/watch
index ec075b189..c35c8e38e 100644
--- a/test/package/debian/watch
+++ b/test/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate

From c90e50025b28688729e0c4e7fe9007fcda447228 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 16 Jun 2024 01:59:02 +0200
Subject: [PATCH 072/106] ncurses-6.5-20240615.patch.gz

---
 AUTHORS                          |  7 +--
 Ada95/gen/Makefile.in            | 62 ++++++++++++++------------
 Ada95/samples/Makefile.in        |  6 +--
 Ada95/src/modules                |  6 ++-
 NEWS                             |  8 +++-
 VERSION                          |  2 +-
 c++/cursslk.cc                   |  5 +--
 c++/modules                      | 20 ++++-----
 dist.mk                          |  4 +-
 doc/html/man/curs_inopts.3x.html | 10 ++---
 doc/html/man/curs_util.3x.html   | 25 +++++++++--
 doc/html/man/keyok.3x.html       | 10 ++---
 doc/html/man/ncurses.3x.html     |  2 +-
 doc/html/man/term.5.html         |  8 ++--
 doc/html/man/terminfo.5.html     |  2 +-
 man/curs_inopts.3x               |  6 +--
 man/curs_util.3x                 | 42 +++++++++++++++++-
 man/keyok.3x                     |  6 +--
 man/manhtml.externs              | 10 +++--
 man/term.5                       |  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 +-
 package/ncursest.spec            |  2 +-
 progs/modules                    | 28 ++++++------
 test/bs.6                        | 75 +++++++++++++++++++++-----------
 test/gdc.6                       | 40 +++++++++++------
 test/modules                     | 30 ++++++-------
 31 files changed, 274 insertions(+), 167 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 09dfc9a9e..9a5ac067e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2020,2021 Thomas E. Dickey                                      --
+-- Copyright 2020-2021,2024 Thomas E. Dickey                                 --
 -- Copyright 2006,2017 Free Software Foundation, Inc.                        --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $
+-- $Id: AUTHORS,v 1.7 2024/06/15 20:43:32 tom Exp $
 -------------------------------------------------------------------------------
 These are the principal authors/contributors of ncurses since 1.9.9e,
 in decreasing order of their contribution:
@@ -37,4 +37,5 @@ ESR	Eric S Raymond
 AVL	Alexander V Lukyanov
 PB	Philippe Blain
 SV	Sven Verdoolaege
-NB  Nicolas Boulenguez
+NB	Nicolas Boulenguez
+GBR	Branden Robinson
diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 525ce9987..6e47b0a66 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -30,7 +30,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #     and:  Thomas E. Dickey, 1997
 #
-#  $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $
+#  $Id: Makefile.in,v 1.104 2024/06/15 14:56:14 tom Exp $
 #
 .SUFFIXES:
 
@@ -111,36 +111,37 @@ ABASE		= $(ALIB)-curses
 
 ADA_SRCDIR	= ../src
 
-GEN_TARGETS     = $(ADA_SRCDIR)/$(ABASE).ads         			\
-		  $(ADA_SRCDIR)/$(ABASE).adb         			\
-	          $(ADA_SRCDIR)/$(ABASE)-aux.ads   			\
-	          $(ADA_SRCDIR)/$(ABASE)-trace.ads   			\
-	          $(ADA_SRCDIR)/$(ABASE)-menus.ads   			\
-	          $(ADA_SRCDIR)/$(ABASE)-forms.ads   			\
-	          $(ADA_SRCDIR)/$(ABASE)-mouse.ads 			\
-	          $(ADA_SRCDIR)/$(ABASE)-panels.ads			\
-	          $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads	\
-	          $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads	\
-	          $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads	\
-	          $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads		\
-	          $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads	\
-	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads           \
-                  $(ADA_SRCDIR)/$(ABASE)_constants.ads
+GEN_TARGETS     = options.m4						\
+		  $(ADA_SRCDIR)/$(ABASE).ads				\
+		  $(ADA_SRCDIR)/$(ABASE).adb				\
+		  $(ADA_SRCDIR)/$(ABASE)-aux.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-trace.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-menus.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-forms.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-mouse.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-panels.ads			\
+		  $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads	\
+		  $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads	\
+		  $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads	\
+		  $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads		\
+		  $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads	\
+		  $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads		\
+		  $(ADA_SRCDIR)/$(ABASE)_constants.ads
 
 GEN_SRC		= $(srcdir)/$(ABASE).ads.m4				\
 		  $(srcdir)/$(ABASE).adb.m4				\
-	          $(srcdir)/$(ABASE)-aux.ads.m4 	  		\
-	          $(srcdir)/$(ABASE)-trace.ads.m4 	  		\
-	          $(srcdir)/$(ABASE)-menus.ads.m4 	  		\
-	          $(srcdir)/$(ABASE)-forms.ads.m4   			\
-	          $(srcdir)/$(ABASE)-mouse.ads.m4			\
-	          $(srcdir)/$(ABASE)-panels.ads.m4			\
-	          $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4	\
-	          $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4	\
-	          $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4	\
-	          $(srcdir)/$(ABASE)-forms-field_types.ads.m4		\
-	          $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4	\
-	          $(srcdir)/$(ABASE)-panels-user_data.ads.m4
+		  $(srcdir)/$(ABASE)-aux.ads.m4				\
+		  $(srcdir)/$(ABASE)-trace.ads.m4			\
+		  $(srcdir)/$(ABASE)-menus.ads.m4			\
+		  $(srcdir)/$(ABASE)-forms.ads.m4			\
+		  $(srcdir)/$(ABASE)-mouse.ads.m4			\
+		  $(srcdir)/$(ABASE)-panels.ads.m4			\
+		  $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4	\
+		  $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4	\
+		  $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4	\
+		  $(srcdir)/$(ABASE)-forms-field_types.ads.m4		\
+		  $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4	\
+		  $(srcdir)/$(ABASE)-panels-user_data.ads.m4
 
 ################################################################################
 
@@ -166,7 +167,10 @@ $(DESTDIR)$(bindir) :
 	mkdir -p $@
 
 install \
-install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
+install.libs :: \
+		$(GEN_TARGETS) \
+		$(DESTDIR)$(bindir) \
+		$(ADACURSES_CONFIG)
 	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 uninstall \
diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in
index 3731085a3..61abfc73a 100644
--- a/Ada95/samples/Makefile.in
+++ b/Ada95/samples/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.64 2021/07/03 15:45:33 tom Exp $
+#  $Id: Makefile.in,v 1.65 2024/06/15 15:13:11 tom Exp $
 #
 .SUFFIXES:
 
@@ -133,7 +133,7 @@ sources :
 
 libs \
 install \
-install.libs ::
+install.libs ::	$(PROGS)
 	@echo made $@
 
 uninstall \
diff --git a/Ada95/src/modules b/Ada95/src/modules
index 29a0d8b08..cb1fb84b3 100644
--- a/Ada95/src/modules
+++ b/Ada95/src/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.4 2020/02/02 23:34:34 tom Exp $
+# $Id: modules,v 1.5 2024/06/15 20:51:03 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 2010 Free Software Foundation, Inc.                              #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -69,3 +69,5 @@ $(ABASE)-text_io-decimal_io		$(srcdir)	$(srcdir)	body
 $(ABASE)-text_io-enumeration_io		$(srcdir)	$(srcdir)	body
 $(ABASE)-text_io-modular_io		$(srcdir)	$(srcdir)	body
 $(ABASE)-text_io-complex_io		$(srcdir)	$(srcdir)	body
+
+# vile:makemode
diff --git a/NEWS b/NEWS
index d829b88ad..bec446a85 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4134 2024/06/08 21:21:25 tom Exp $
+-- $Id: NEWS,v 1.4139 2024/06/15 20:49:04 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240615
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ review/update modules files.
+	+ improve install-rules in Ada95 makefiles (report by Branden Robinson).
+	+ improve formatting/style of manpages in test-directory.
+
 20240608
 	+ change winwstr to return wide character count instead of OK (patch
 	  by Branden Robinson).
diff --git a/VERSION b/VERSION
index bb0b549af..416c43d00 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240608
+5:0:10	6.5	20240615
diff --git a/c++/cursslk.cc b/c++/cursslk.cc
index 7b898ceff..0212971d2 100644
--- a/c++/cursslk.cc
+++ b/c++/cursslk.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2005,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,10 +33,9 @@
  ****************************************************************************/
 
 #include "internal.h"
-#include "cursslk.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursslk.cc,v 1.21 2023/02/25 23:36:06 tom Exp $")
+MODULE_ID("$Id: cursslk.cc,v 1.22 2024/06/15 21:07:30 tom Exp $")
 
 Soft_Label_Key_Set::Soft_Label_Key&
   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
diff --git a/c++/modules b/c++/modules
index f82b487fd..0cd80573a 100644
--- a/c++/modules
+++ b/c++/modules
@@ -1,7 +1,7 @@
 # Program modules
-# $Id: modules,v 1.12 2020/02/02 23:34:34 tom Exp $
+# $Id: modules,v 1.13 2024/06/15 21:07:41 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 1998-2006,2013 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -33,13 +33,13 @@
 #
 
 @ base
-cursesf		c++		$(srcdir)	$(internal_h) $(cursesf_h) $(cursesapp_h)
-cursesm		c++		$(srcdir)	$(internal_h) $(cursesm_h) $(cursesapp_h)
-cursesw		c++		$(srcdir)	$(internal_h) $(cursesw_h)
-cursespad	c++		$(srcdir)	$(internal_h) $(cursesw_h)
-cursesp		c++		$(srcdir)	$(internal_h) $(cursesp_h)
-cursslk		c++		$(srcdir)	$(internal_h) $(cursesapp_h)
-cursesapp	c++		$(srcdir)	$(internal_h) $(cursesapp_h)
-cursesmain	c++		$(srcdir)	$(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h
+cursesf		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesf_h) $(cursesapp_h)
+cursesm		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesm_h) $(cursesapp_h)
+cursesw		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesw_h)
+cursespad	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesw_h)
+cursesp		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesp_h)
+cursslk		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h)
+cursesapp	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h)
+cursesmain	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h
 
 # vile:makemode
diff --git a/dist.mk b/dist.mk
index 054a859c2..7c3832689 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1617 2024/06/08 09:49:40 tom Exp $
+# $Id: dist.mk,v 1.1618 2024/06/15 09:33:15 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240608
+NCURSES_PATCH = 20240615
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 30829c59e..964ea1f86 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp @
+  * @Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -378,11 +378,11 @@ <H1 class="no-header">curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
+       <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-06-15                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index fe64f8d6f..6da4a8e98 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp @
+  * @Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -383,6 +383,22 @@ <H1 class="no-header">curs_util 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) defined <EM>unctrl</EM> (as a macro, in <EM>unctrl.h</EM>).
+
+       SVr2 (1984) introduced <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
+
+       SVr3  (1987)  added <EM>filter</EM>.  Later that year, SVr3.1 brought <EM>getwin</EM> and
+       <EM>putwin</EM>, reading and writing window dumps with <STRONG>fread(3)</STRONG>  and  <STRONG>fwrite(3)</STRONG>,
+       respectively.
+
+       SVr4 (1989) supplied <EM>use</EM><STRONG>_</STRONG><EM>env</EM>.
+
+       X/Open Curses Issue 4 (1995) specified <EM>key</EM><STRONG>_</STRONG><EM>name</EM> and <EM>wunctrl</EM>.
+
+       <EM>ncurses</EM> 5.6 (2006) added <EM>nofilter</EM>, and 6.0 (2015) <EM>use</EM><STRONG>_</STRONG><EM>tioctl</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
@@ -390,7 +406,7 @@ <H1 class="no-header">curs_util 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-06-15                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -420,6 +436,7 @@ <H1 class="no-header">curs_util 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-use_env_use_tioctl">use_env, use_tioctl</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 495274073..41a419c6d 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp @
+  * @Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>keyok 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -93,11 +93,11 @@ <H1 class="no-header">keyok 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-08                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.5                       2024-06-15                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 8b29047eb..af5f66124 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240608).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240615).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index bf87ffa5a..192bf0399 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp @
+  * @Id: term.5,v 1.80 2024/06/15 20:23:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term 5 2024-05-11 ncurses 6.5 File formats</TITLE>
+<TITLE>term 5 2024-06-15 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term 5 2024-05-11 ncurses 6.5 File formats</H1>
+<H1 class="no-header">term 5 2024-06-15 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>                          File formats                          <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 
@@ -397,7 +397,7 @@ <H1 class="no-header">term 5 2024-05-11 ncurses 6.5 File formats</H1>
 
 
 
-ncurses 6.5                       2024-05-11                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
+ncurses 6.5                       2024-06-15                           <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index b9e784d56..107bc38f6 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240608).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240615).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index ed78d24c8..2c5d7b69f 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp $
-.TH curs_inopts 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp $
+.TH curs_inopts 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -811,4 +811,4 @@ to eliminate their effect on output.
 \fB\%curs_util\fP(3X),
 \fB\%define_key\fP(3X),
 \fB\%termios\fP(3),
-\fB\%term_variables\fP(3X).
+\fB\%term_variables\fP(3X)
diff --git a/man/curs_util.3x b/man/curs_util.3x
index c589f0e27..4b6450ee9 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp $
-.TH curs_util 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp $
+.TH curs_util 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -485,6 +485,44 @@ creating each \fIscreen\fP rather than once only
 (\fBcurs_sp_funcs\fP(3X)).
 This feature of \fBuse_env\fP
 is not provided by other implementations of curses.
+.SH HISTORY
+4BSD (1980)
+defined
+.I \%unctrl
+(as a macro,
+in
+.IR \%unctrl.h ")."
+.PP
+SVr2 (1984) introduced
+.IR \%delay_output ","
+.IR \%flushinp ","
+and
+.IR \%keyname "."
+.PP
+SVr3 (1987) added
+.IR \%filter "."
+Later that year,
+SVr3.1 brought
+.I \%getwin
+and
+.IR \%putwin ","
+reading and writing window dumps
+with \fI\%fread\fP(3) and \fI\%fwrite\fP(3),
+respectively.
+.PP
+SVr4 (1989) supplied
+.IR \%use_env "."
+.PP
+X/Open Curses Issue 4 (1995) specified
+.I \%key_name
+and
+.IR \%wunctrl "."
+.PP
+.I \%ncurses
+5.6 (2006) added
+.IR \%nofilter "," \" 20060107
+and 6.0 (2015)
+.IR \%use_tioctl "." \" 20120714
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/keyok.3x b/man/keyok.3x
index 0459ab092..d4b94ac3a 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp $
-.TH keyok 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp $
+.TH keyok 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -108,4 +108,4 @@ Thomas Dickey
 \fB\%define_key\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
-\fB\%key_defined\fP(3X).
+\fB\%key_defined\fP(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index e685e9c2c..1cf3af64c 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.26 2024/05/11 20:35:15 tom Exp $
+# $Id: manhtml.externs,v 1.27 2024/06/15 20:24:43 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -41,20 +41,22 @@ emacs(1)
 environ(7)
 errno(3)
 file(1)
+fread(3)
+fwrite(3)
 getty(8)
+ioctl(2)
+isprint(3)
 jove(1)
 lynx(1)
 mutt(1)
 nvi(1)
 od(1)
-ioctl(2)
-isprint(3)
 printf(3)
 profile(5)
 putc(3)
 putchar(3)
-putwchar(3)
 putwc(3)
+putwchar(3)
 read(2)
 readline(3)
 resize(1)
diff --git a/man/term.5 b/man/term.5
index 588652f84..d2568ee98 100644
--- a/man/term.5
+++ b/man/term.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp $
-.TH term 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: term.5,v 1.80 2024/06/15 20:23:33 tom Exp $
+.TH term 5 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,6 +58,7 @@
 .SH NAME
 term \-
 compiled \fI\%term\%info\fP terminal description
+.\"SH SYNOPSIS
 .SH DESCRIPTION
 \fB\%@TIC@\fP(1) compiles a
 .I \%term\%info
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 122a65be6..b43c082ae 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240608) unstable; urgency=low
+ncurses6td (6.5+20240615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 122a65be6..b43c082ae 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240608) unstable; urgency=low
+ncurses6td (6.5+20240615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index f04a8642d..e7c01705e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240608) unstable; urgency=low
+ncurses6td (6.5+20240615) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Jun 2024 05:49:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 38c14836c..7a17c6dc8 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.652 2024/06/08 09:49:40 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.653 2024/06/15 09:33:15 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0608"
+!define VERSION_MMDD  "0615"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 60ecbf820..645e02e2d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240608
+Release: 20240615
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index fc93da6cd..36ea54cc3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240608
+Release: 20240615
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index cbe0c91d8..6cfbf90db 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240608
+Release: 20240615
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/modules b/progs/modules
index 349061ff5..c36897949 100644
--- a/progs/modules
+++ b/progs/modules
@@ -1,7 +1,7 @@
-# $Id: modules,v 1.25 2021/04/18 17:21:03 tom Exp $
+# $Id: modules,v 1.29 2024/06/15 23:34:33 tom Exp $
 # Program modules (some are in ncurses lib!)
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2014,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -33,18 +33,18 @@
 #
 
 @ base
-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.h
-infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.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)/tparm_type.h reset_cmd.h tty_settings.h
-tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h ../include/termcap.h reset_cmd.h  tty_settings.h
+clear		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/tty_settings.h
+tic		progs		$(srcdir)	$(HEADER_DEPS) $(INCDIR)/hashed_db.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h ../include/parametrized.h transform.h
+toe		progs		$(srcdir)	$(HEADER_DEPS) $(INCDIR)/hashed_db.h
+clear_cmd	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h
+dump_entry	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/dump_entry.h ../include/capdefaults.c ../include/parametrized.h termsort.h
+infocmp		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/dump_entry.h
+reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h
+tabs		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tty_settings.h
+tparm_type	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tparm_type.h
+tput		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/reset_cmd.h $(srcdir)/tparm_type.h $(srcdir)/tty_settings.h transform.h
+tset		progs		$(srcdir)	$(HEADER_DEPS) ../include/termcap.h $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h transform.h 
 transform	progs		$(srcdir)	$(HEADER_DEPS) transform.h
-tty_settings	progs		$(srcdir)	$(HEADER_DEPS) tty_settings.h
+tty_settings	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tty_settings.h
 
 # vile:makemode
diff --git a/test/bs.6 b/test/bs.6
index 12295a319..03021f65e 100644
--- a/test/bs.6
+++ b/test/bs.6
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+.\" Copyright 2020-2021,2024 Thomas E. Dickey                                *
 .\" Copyright 1998,2006 Free Software Foundation, Inc.                       *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,46 +27,69 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: bs.6,v 1.5 2021/06/17 21:20:30 tom Exp $
-.TH BATTLESHIPS 6 2021-06-17 ncurses-examples Games
+.\" $Id: bs.6,v 1.8 2024/06/15 20:32:28 tom Exp $
+.TH BATTLESHIPS 6 2024-06-15 ncurses-examples Games
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
-bs \- battleships game
+bs \-
+battleships game
 .SH SYNOPSIS
-battle [ -b | -s ] [ -c ]
+battle [ \-b | \-s ] [ \-c ]
 .SH DESCRIPTION
 This program allows you to play the familiar Battleships game against the
-computer on a 10x10 board. The interface is visual and largely
-self-explanatory; you place your ships and pick your shots by moving the
-cursor around the `sea' with the rogue/hack motion keys hjklyubn.
+computer on a 10x10 board.
+The interface is visual and largely self-explanatory;
+you place your ships and pick your shots by moving the
+cursor around the \*(``sea\*('' with the rogue/hack motion keys hjklyubn.
 .PP
-Note that when selecting a ship to place, you must type the capital letter
-(these are, after all, capital ships). During ship placement, the `r' command
+Note that when selecting a ship to place,
+you must type the capital letter
+(these are, after all, capital ships).
+During ship placement,
+the \*(``r\*('' command
 may be used to ignore the current position and randomly place your currently
-selected ship. The `R' command will place all remaining ships randomly. The ^L
-command (form feed, ASCII 12) will force a screen redraw).
+selected ship.
+The \*(``R\*('' command will place all remaining ships randomly.
+The ^L command (form feed,
+ASCII 12) will force a screen redraw).
 .PP
 The command-line arguments control game modes.
 
 .nf
-	-b selects a `blitz' variant
-	-s selects a `salvo' variant
-	-c permits ships to be placed adjacently
+	\-b selects a \*(``blitz\*('' variant
+	\-s selects a \*(``salvo\*('' variant
+	\-c permits ships to be placed adjacently
 .fi
 
-The `blitz' variant allows a side to shoot for as long as it continues to
-score hits.
+The \*(``blitz\*('' variant allows a side to shoot
+for as long as it continues to score hits.
 .PP
-The `salvo' game allows a player one shot per turn for each of his/her ships
-still afloat.  This puts a premium scoring hits early and knocking out some
+The \*(``salvo\*('' game allows a player one shot per turn
+for each of his/her ships still afloat.
+This puts a premium scoring hits early and knocking out some
 ships and also makes much harder the situation where you face a superior force
 with only your PT-boat.
 .PP
-Normally, ships must be separated by at least one square of open water. The
--c option disables this check and allows them to close-pack.
+Normally, ships must be separated by at least one square of open water.
+The \-c option disables this check and allows them to close-pack.
 .PP
-The algorithm the computer uses once it has found a ship to sink is provably
-optimal. The dispersion criterion for the random-fire algorithm may not be.
+The algorithm the computer uses
+once it has found a ship to sink is provably optimal.
+The dispersion criterion for the random-fire algorithm may not be.
 .SH AUTHORS
-Originally written by one Bruce Holloway in 1986. Salvo mode added by Chuck A.
-DeGaul (cbosgd!cad). Visual user interface, `closepack' option, code rewrite
-and manual page by Eric S. Raymond <esr@snark.thyrsus.com> August 1989.
+Originally written by Bruce Holloway in 1986.
+Salvo mode added by Chuck A. DeGaul (cbosgd!cad).
+Visual user interface,
+\*(``closepack\*('' option,
+code rewrite,
+and manual page by Eric S. Raymond
+<esr@snark.thyrsus.com> August 1989.
diff --git a/test/gdc.6 b/test/gdc.6
index bf90b26f8..3a0026443 100644
--- a/test/gdc.6
+++ b/test/gdc.6
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020 Thomas E. Dickey                                          *
+.\" Copyright 2020,2024 Thomas E. Dickey                                     *
 .\" Copyright 1998-2006,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,42 +27,56 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: gdc.6,v 1.6 2020/02/02 23:34:34 tom Exp $
-.TH GDC 6 2020-02-02 ncurses-examples Games
+.\" $Id: gdc.6,v 1.9 2024/06/15 15:16:34 tom Exp $
+.TH GDC 6 2024-06-15 ncurses-examples Games
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
-gdc \- grand digital clock (curses)
+gdc \-
+grand digital clock (curses)
 .SH SYNOPSIS
 .B gdc \fP[\fIoptions\fP] [\fIn\fP]
 .SH DESCRIPTION
 .I Gdc
 runs a digital clock made of reverse-video blanks on a terminal screen.
-If the terminal supports color, the clock is drawn in red.
-You can make the clock stop, pause or resume by pressing a ``q'',
-``s'' or space, respectively.
+If the terminal supports color,
+the clock is drawn in red.
+You can make the clock stop, pause, or resume by pressing a \*(``q\*('',
+\*(``s\*('' or space, respectively.
 .SH OPTIONS
 .TP
 .B \-d
 use terminal's default colors for the background.
 .TP
 .B \-n
-redirects input to /dev/null, making it ignore the stop/pause commands.
+redirects input to /dev/null,
+making it ignore the stop/pause commands.
 You can still stop it by pressing the interrupt key.
 .TP
 .B \-s
 makes digits scroll as they change.
-When running on a fast display, the program breaks up the scrolling into
-subsecond repaints, making the operation appear smooth.
+When running on a fast display,
+the program breaks up the scrolling into subsecond repaints,
+making the operation appear smooth.
 .TP
 .B \-t \fIhh:mm:ss\fP
-specify starting time (default is ``now'').
+specify starting time (default is \*(``now\*('').
 .PP
 With an optional numeric argument
 .I num
 it stops after
 .I num
 seconds.
-Normally it runs "forever" (counting down from 2 billion seconds).
-.SH AUTHOR
+Normally it runs \*(``forever\*('' (counting down from 2 billion seconds).
+.SH AUTHORS
 Amos Shapir, modified for curses by John Lupien.
 .br
 Improvements for ncurses by Thomas Dickey.
diff --git a/test/modules b/test/modules
index fb97d027e..a3eb58083 100644
--- a/test/modules
+++ b/test/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.79 2023/11/10 11:48:20 tom Exp $
+# $Id: modules,v 1.80 2024/06/15 19:00:13 tom Exp $
 ##############################################################################
-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -33,8 +33,8 @@
 # Test-Program modules
 
 @ base
-back_ground	progs		$(srcdir)	$(HEADER_DEPS)
-background	progs		$(srcdir)	$(HEADER_DEPS)
+back_ground	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h 
+background	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h 
 blue		progs		$(srcdir)	$(HEADER_DEPS)
 bs		progs		$(srcdir)	$(HEADER_DEPS)
 cardfile	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/form.h
@@ -42,7 +42,7 @@ chgat		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 clip_printw	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 color_content	progs		$(srcdir)	$(HEADER_DEPS)
 color_set	progs		$(srcdir)	$(HEADER_DEPS)
-combine		progs		$(srcdir)	$(HEADER_DEPS)
+combine		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/dump_window.h $(srcdir)/popup_msg.h
 demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
 demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
 demo_forms	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
@@ -51,8 +51,8 @@ demo_menus	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/menu.h
 demo_new_pair	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h
 demo_tabs	progs		$(srcdir)	$(HEADER_DEPS)
-demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)
-demo_terminfo	progs		$(srcdir)	$(HEADER_DEPS)
+demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h	$(incdir)/termcap.h
+demo_terminfo	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
 ditto		progs		$(srcdir)	$(HEADER_DEPS)
 dots		progs		$(srcdir)	$(HEADER_DEPS)
 dots_curses	progs		$(srcdir)	$(HEADER_DEPS)
@@ -60,7 +60,7 @@ dots_mvcur	progs		$(srcdir)	$(HEADER_DEPS)
 dots_termcap	progs		$(srcdir)	$(HEADER_DEPS)
 dots_xcurses	progs		$(srcdir)	$(HEADER_DEPS)
 dump_window	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/dump_window.h
-dup_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+dup_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
 echochar	progs		$(srcdir)	$(HEADER_DEPS)
 edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
 extended_color	progs		$(srcdir)	$(HEADER_DEPS)
@@ -68,7 +68,7 @@ filter		progs		$(srcdir)	$(HEADER_DEPS)
 firework	progs		$(srcdir)	$(HEADER_DEPS)
 firstlast	progs		$(srcdir)	$(HEADER_DEPS)
 foldkeys	progs		$(srcdir)	$(HEADER_DEPS)
-form_driver_w	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+form_driver_w	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h	$(incdir)/form.h
 gdc		progs		$(srcdir)	$(HEADER_DEPS)
 hanoi		progs		$(srcdir)	$(HEADER_DEPS)
 hashtest	progs		$(srcdir)	$(HEADER_DEPS)
@@ -80,15 +80,15 @@ inserts		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
 key_names	progs		$(srcdir)	$(HEADER_DEPS)
 keynames	progs		$(srcdir)	$(HEADER_DEPS)
 knight		progs		$(srcdir)	$(HEADER_DEPS)
-list_keys	progs		$(srcdir)	$(HEADER_DEPS)
+list_keys	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
 lrtest		progs		$(srcdir)	$(HEADER_DEPS)
-move_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+move_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
 movewindow	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 ncurses		progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/menu.h $(incdir)/form.h
 newdemo		progs		$(srcdir)	$(HEADER_DEPS)
 padview		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/widechars.h	$(srcdir)/popup_msg.h
 pair_content	progs		$(srcdir)	$(HEADER_DEPS)
-picsmap		progs		$(srcdir)	$(HEADER_DEPS)
+picsmap		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/picsmap.h
 popup_msg	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 railroad	progs		$(srcdir)	$(HEADER_DEPS)
 rain		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
@@ -103,8 +103,8 @@ test_addwstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
 test_arrays	progs		$(srcdir)	$(HEADER_DEPS)
 test_delwin	progs		$(srcdir)	$(HEADER_DEPS)
 test_endwin	progs		$(srcdir)	$(HEADER_DEPS)
-test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)
-test_getstr	progs		$(srcdir)	$(HEADER_DEPS)
+test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+test_getstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
 test_instr	progs		$(srcdir)	$(HEADER_DEPS)
 test_inwstr	progs		$(srcdir)	$(HEADER_DEPS)
 test_mouse	progs		$(srcdir)	$(HEADER_DEPS)
@@ -112,7 +112,7 @@ test_opaque	progs		$(srcdir)	$(HEADER_DEPS)
 test_setupterm	progs		$(srcdir)	$(HEADER_DEPS)
 test_sgr	progs		$(srcdir)	$(HEADER_DEPS)
 test_termattrs	progs		$(srcdir)	$(HEADER_DEPS)
-test_tparm	progs		$(srcdir)	$(HEADER_DEPS)
+test_tparm	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
 test_unget_wch	progs		$(srcdir)	$(HEADER_DEPS)
 test_vid_puts	progs		$(srcdir)	$(HEADER_DEPS)
 test_vidputs	progs		$(srcdir)	$(HEADER_DEPS)

From b2a9aa13a2863f4a549f1db840d537856815a2f6 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 23 Jun 2024 01:49:00 +0200
Subject: [PATCH 073/106] ncurses-6.5-20240622.patch.gz

---
 NEWS                                 |  12 +-
 VERSION                              |   2 +-
 aclocal.m4                           |   8 +-
 announce.html.in                     |  10 +-
 configure                            |   4 +-
 dist.mk                              |   4 +-
 doc/html/man/curs_add_wchstr.3x.html |  18 +-
 doc/html/man/curs_addch.3x.html      |  99 ++---
 doc/html/man/curs_addstr.3x.html     |  17 +-
 doc/html/man/curs_beep.3x.html       |  10 +-
 doc/html/man/curs_get_wstr.3x.html   |  24 +-
 doc/html/man/curs_getstr.3x.html     | 271 +++++++------
 doc/html/man/curs_kernel.3x.html     |  67 ++--
 doc/html/man/curs_pad.3x.html        |  10 +-
 doc/html/man/curs_slk.3x.html        |   8 +-
 doc/html/man/curs_termcap.3x.html    |   8 +-
 doc/html/man/curs_util.3x.html       |   8 +-
 doc/html/man/curs_variables.3x.html  |   8 +-
 doc/html/man/ncurses.3x.html         | 206 +++++-----
 doc/html/man/tabs.1.html             |  12 +-
 doc/html/man/terminfo.5.html         |   2 +-
 doc/html/man/tput.1.html             |  14 +-
 man/curs_add_wchstr.3x               |  25 +-
 man/curs_addch.3x                    |  14 +-
 man/curs_addstr.3x                   |  19 +-
 man/curs_beep.3x                     |   8 +-
 man/curs_get_wstr.3x                 |  20 +-
 man/curs_getstr.3x                   | 564 ++++++++++++++++++---------
 man/curs_kernel.3x                   |  10 +-
 man/curs_pad.3x                      |  56 ++-
 man/curs_slk.3x                      |   8 +-
 man/curs_termcap.3x                  |  14 +-
 man/curs_util.3x                     |   8 +-
 man/curs_variables.3x                |   6 +-
 man/man_db.renames.in                |   4 +-
 man/manhtml.aliases                  |   5 +-
 man/manhtml.externs                  |   3 +-
 man/ncurses.3x                       |  49 ++-
 man/tabs.1                           |   8 +-
 man/terminfo.tail                    |   4 +-
 man/tput.1                           |  13 +-
 misc/gen-pkgconfig.in                |   6 +-
 misc/ncurses-config.in               | 107 +++--
 package/debian-mingw/changelog       |   4 +-
 package/debian-mingw/rules           |   1 +
 package/debian-mingw64/changelog     |   4 +-
 package/debian-mingw64/rules         |   1 +
 package/debian/changelog             |   4 +-
 package/mingw-ncurses.nsi            |   4 +-
 package/mingw-ncurses.spec           |   2 +-
 package/ncurses.spec                 |   2 +-
 package/ncursest.spec                |   2 +-
 test/gdc.6                           |  78 ++--
 test/gdc.c                           |  37 +-
 54 files changed, 1167 insertions(+), 745 deletions(-)

diff --git a/NEWS b/NEWS
index bec446a85..29088a351 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4139 2024/06/15 20:49:04 tom Exp $
+-- $Id: NEWS,v 1.4143 2024/06/22 22:59:44 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240622
+	+ improve test/gdc.c (patch by Branden Robinson).
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ adjust naming of mingw *-config scripts to match the pkg-config names
+	+ widen pattern in pc/*-config scripts to disallow more linker options
+	+ add --cflags-only-I and --cflags-only-other options to
+	  misc/ncurses-config.in
+	+ revert change to CF_BUILD_CC macro (report by Vassili Courzakis,
+	  cf: 20240518).
+
 20240615
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ review/update modules files.
diff --git a/VERSION b/VERSION
index 416c43d00..e80d9211d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240615
+5:0:10	6.5	20240622
diff --git a/aclocal.m4 b/aclocal.m4
index 003bb308e..8c39fe417 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1071 2024/05/18 19:49:14 tom Exp $
+dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -741,7 +741,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
+dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -841,9 +841,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
+	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
+	: ${BUILD_LIBS:='${LIBS}'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
diff --git a/announce.html.in b/announce.html.in
index 9889ef1bf..737dff41a 100644
--- a/announce.html.in
+++ b/announce.html.in
@@ -1,5 +1,5 @@
 <!--
-  $Id: announce.html.in,v 1.107 2024/04/27 16:45:27 tom Exp $
+  $Id: announce.html.in,v 1.108 2024/06/22 22:17:40 tom Exp $
   ****************************************************************************
   * Copyright 2018-2023,2024 Thomas E. Dickey                                *
   *                                                                          *
@@ -324,8 +324,8 @@
     </li>
 
     <li>
-      <p>modify <code>delscreen</code> to limit the windows which
-      it creates to just those associated with the screen</p>
+      <p>modify <code>delscreen</code> to delete only windows associated
+      with the screen</p>
     </li>
 
     <li>
@@ -1116,8 +1116,8 @@
 
       <ul>
         <li>
-          <p>the panel library, supporting a stack of windows with
-          backing store</p>
+          <p>the panel library, permitting windows to stack and
+          overlap</p>
         </li>
 
         <li>
diff --git a/configure b/configure
index 4a74babd4..c89e3425a 100755
--- a/configure
+++ b/configure
@@ -5695,9 +5695,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
+	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:=''${LIBS}''}
+	: ${BUILD_LIBS:='${LIBS}'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
diff --git a/dist.mk b/dist.mk
index 7c3832689..52933dc5c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1618 2024/06/15 09:33:15 tom Exp $
+# $Id: dist.mk,v 1.1619 2024/06/22 09:24:38 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240615
+NCURSES_PATCH = 20240622
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 8d7b7c2c1..d96ab67d5 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -113,6 +113,15 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</H
        X/Open Curses, Issue 4 describes these functions.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These functions were initially specified by  X/Open  Curses,  Issue  4.
+       The   System V   Interface  Definition,  Version  4  (1995),  specified
+       functions named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and  the  usual  variants).
+       These  were  later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4
+       (1989).  They differed from X/Open's <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM>  and  <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM>  in
+       that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
        in its non-wide-character configuration.
@@ -121,7 +130,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-05-11               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -131,6 +140,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls</H
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index ac18dbcb9..e0499b472 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @
+  * @Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -206,90 +206,93 @@ <H1 class="no-header">curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
        value other than <STRONG>ERR</STRONG>".
 
-       The  defaults specified for forms-drawing characters apply in the POSIX
+       The defaults specified for forms-drawing characters apply in the  POSIX
        locale.
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open Curses states that the  <STRONG>ACS_</STRONG>  definitions  are  <EM>char</EM>  constants.
+       X/Open  Curses  states  that  the  <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
+       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
            others define them as elements of an array.
 
-           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
+           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
-           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
+       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
-           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
-           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
+       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
            implementations use "i" (small i).
 
-           None of the terminal descriptions on Unix platforms  use  uppercase
-           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
-           apparently based on the X/Open documentation around 1995).  On  the
-           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
+           apparently  based on the X/Open documentation around 1995).  On the
+           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
            description uses lowercase i.
 
-       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
-       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
-       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
-       embedded, and a second-hand list of their  character  descriptions  has
-       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
+       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
+       released  System V.   However, many publicly available <EM>terminfo</EM> entries
+       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
+       embedded,  and  a  second-hand list of their character descriptions has
+       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character  configurations  (the  former  is  capable  of displaying
+           character configurations  (the  former  is  capable  of  displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
-       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
-       single  character.   That  character may have been more than eight bits
-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
-       width  of  a non-wide character code unspecified.  The standard further
-       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
-       bit  operations  to  combine  the  character code with attributes and a
+       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
+       single character.  That character may have been more  than  eight  bits
+       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+       width of a non-wide character code unspecified.  The  standard  further
+       does  not specify the internal structure of a <EM>chtype</EM>, though the use of
+       bit operations to combine the character  code  with  attributes  and  a
        color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
-       a  multibyte  character sequence to be passed via a succession of calls
-       to <STRONG>waddch</STRONG>.  Other implementations  do  not;  a  <STRONG>waddch</STRONG>  call  transmits
-       exactly  one  character,  which  may  be rendered in one or more screen
-       locations depending  on  whether  it  is  printable  (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
-       Depending  on  the  locale,  <EM>ncurses</EM>  inspects  the byte passed in each
-       <STRONG>waddch</STRONG> call and checks whether the latest call  continues  a  multibyte
-       character.    When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays  the
-       character  and  advances  the  cursor.   If  the  calling   application
+       a multibyte character sequence to be passed via a succession  of  calls
+       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
+       exactly one character, which may be rendered  in  one  or  more  screen
+       locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
+       Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
+       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
+       character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
+       character   and  advances  the  cursor.   If  the  calling  application
        interrupts the succession of bytes in a multibyte character sequence by
-       changing the current  location--for  example,  with  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
+       changing  the  current  location--for  example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
        discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
-       foregoing behavior.  Check whether a character can be represented as  a
+       foregoing  behavior.  Check whether a character can be represented as a
        single byte in the current locale.
 
        <STRONG>o</STRONG>   If it can, call either <STRONG>waddch</STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
@@ -298,22 +301,22 @@ <H1 class="no-header">curs_addch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The original <EM>curses</EM> in 4BSD (1980) introduced <EM>waddch</EM>.
+       4BSD (1980) <EM>curses</EM> introduced <EM>waddch</EM>.
 
        SVr3 (1987) added <EM>wechochar</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 4ac4e972e..f626abb5b 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -101,6 +101,14 @@ <H1 class="no-header">curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        error conditions for them.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) <EM>curses</EM> introduced <EM>waddstr</EM>  along  with  its  variants,  the
+       latter defined as macros.
+
+       SVr3.1 (1987) added <EM>waddnstr</EM> (and its variants) redefining <EM>waddstr</EM> as a
+       macro wrapping it.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
@@ -109,7 +117,7 @@ <H1 class="no-header">curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,6 +127,7 @@ <H1 class="no-header">curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index bb53a28e3..8dc4771f9 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp @
+  * @Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -90,7 +90,7 @@ <H1 class="no-header">curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <STRONG>beep</STRONG> and <STRONG>flash</STRONG> appeared in SVr2 (1984).
+       <EM>beep</EM> and <EM>flash</EM> appeared in SVr2 (1984).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_beep 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-18                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 6d387bd08..b4ec79d4c 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -55,15 +55,15 @@ <H1 class="no-header">curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>get_wstr(wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>getn_wstr(wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wget_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>get_wstr(wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wget_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvget_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwget_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvget_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvgetn_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwget_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getn_wstr(wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvgetn_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index dc22cb809..226514a4c 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @
+  * @Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -54,192 +54,211 @@ <H1 class="no-header">curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>getstr(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>getnstr(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wgetstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wgetnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getstr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wgetstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvgetstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvgetstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvgetnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getnstr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wgetnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvgetnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The function <STRONG>wgetnstr</STRONG> is equivalent to a series of calls to <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,
-       until a newline or carriage return terminates the series:
+       <STRONG>wgetstr</STRONG> populates a  user-supplied  string  buffer  <EM>str</EM>  by  repeatedly
+       calling  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> with the <EM>win</EM> argument until a line feed or carriage
+       return character is input.  The function
 
-       <STRONG>o</STRONG>   The terminating character is not included in the returned string.
+       <STRONG>o</STRONG>   does not copy the terminating character to <EM>str</EM>;
 
-       <STRONG>o</STRONG>   In all instances, the end of the string is terminated by a NUL.
+       <STRONG>o</STRONG>   always terminates <EM>str</EM> with a null character;
 
-       <STRONG>o</STRONG>   The  function  stores  the result in the area pointed to by the <EM>str</EM>
-           parameter.
+       <STRONG>o</STRONG>   interprets  the   screen's   erase   and   kill   characters   (see
+           <STRONG><A HREF="curs_termattrs.3x.html">erasechar(3x)</A></STRONG> and <STRONG><A HREF="curs_termattrs.3x.html">killchar(3x)</A></STRONG>);
 
-       <STRONG>o</STRONG>   The function reads at most <EM>n</EM> characters, thus preventing a possible
-           overflow of the input buffer.
+       <STRONG>o</STRONG>   recognizes  function  keys  only  if  the screen's keypad option is
+           enabled (see <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>);
 
-           Any  attempt  to  enter more characters (other than the terminating
-           newline or carriage return) causes a beep.
+       <STRONG>o</STRONG>   treats the function keys <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> the same as the
+           erase character; and
 
-           Function keys also cause a beep and are ignored.
+       <STRONG>o</STRONG>   discards  function key inputs other than those treated as the erase
+           character, calling <STRONG><A HREF="curs_beep.3x.html">beep(3x)</A></STRONG>.
 
-       The user's <EM>erase</EM> and <EM>kill</EM> characters are interpreted:
+       The erase character replaces the character at the  end  of  the  buffer
+       with  a  null character, while the kill character does the same for the
+       entire buffer.
 
-       <STRONG>o</STRONG>   The <EM>erase</EM> character (e.g., <STRONG>^H</STRONG>) erases the character at the  end  of
-           the buffer, moving the cursor to the left.
+       If the screen's echo option is enabled (see <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG>), <STRONG>wgetstr</STRONG>  updates
+       <EM>win</EM> with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.  Further,
 
-           If <EM>keypad</EM> mode is on for the window, <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
-           both considered equivalent to the user's <EM>erase</EM> character.
+       <STRONG>o</STRONG>   the  erase  character and its function key synonyms move the cursor
+           to the left, and
 
-       <STRONG>o</STRONG>   The <EM>kill</EM> character (e.g., <STRONG>^U</STRONG>) erases the entire buffer, leaving the
-           cursor at the beginning of the buffer.
+       <STRONG>o</STRONG>   the kill character returns the cursor to where it was located  when
+           <STRONG>wgetstr</STRONG> was called.
 
-       Characters  input  are  echoed  only  if <STRONG>echo</STRONG> is currently on.  In that
-       case, backspace  is  echoed  as  deletion  of  the  previous  character
-       (typically a left motion).
+       <STRONG>wgetnstr</STRONG>  is  similar,  but  reads  at  most  <EM>n</EM>  characters, aiding the
+       application to avoid overrunning the buffer to which  <EM>str</EM>  points.   An
+       attempt  to  input  more  than <EM>n</EM> characters (other than the terminating
+       line feed or carriage return) is ignored with a beep.
 
-       The   <STRONG>getnstr</STRONG>,   <STRONG>mvgetnstr</STRONG>,  <STRONG>mvwgetnstr</STRONG>,  and  <STRONG>wgetnstr</STRONG>  functions  are
-       identical to the <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>,  and  <STRONG>wgetstr</STRONG>  functions,
-       respectively,  except  that the <STRONG>*n*</STRONG> versions read at most <EM>n</EM> characters,
-       letting the application prevent overflow of the input buffer.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  these  functions  return  the  integer  <STRONG>OK</STRONG>   upon   successful
-       completion.  (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>") If
-       unsuccessful, they return <STRONG>ERR</STRONG>.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no error conditions.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       In this implementation, these functions return <STRONG>ERR</STRONG>
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   if the window pointer is null,
+       <STRONG>o</STRONG>   if an internal <STRONG>wgetch</STRONG> call fails.
 
-       <STRONG>o</STRONG>   if its timeout expires without having any data, or
+       Further, in <EM>ncurses</EM>, these functions return <STRONG>KEY_RESIZE</STRONG>  if  a  <STRONG>SIGWINCH</STRONG>
+       event interrupts the function.
 
-       <STRONG>o</STRONG>   if the associated call to <STRONG>wgetch</STRONG> failed.
-
-       This implementation provides an  extension  as  well.   If  a  <STRONG>SIGWINCH</STRONG>
-       interrupts  the  function,  it will return <STRONG>KEY_RESIZE</STRONG> rather than <STRONG>OK</STRONG> or
-       <STRONG>ERR</STRONG>.
-
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Any of these functions other than <STRONG>wgetnstr</STRONG> may be macros.
+       All of these functions except <STRONG>wgetnstr</STRONG> may be implemented as macros.
+
+       Use of <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>,  or  <STRONG>wgetstr</STRONG>  to  read  input  that
+       overruns  the  buffer  pointed to by <EM>str</EM> causes undefined results.  Use
+       their <STRONG>n</STRONG>-infixed counterpart functions instead.
+
+       While <STRONG>wgetnstr</STRONG> is conceptually a series of calls  to  <STRONG>wgetch</STRONG>,  it  also
+       temporarily  changes  properties  of the <EM>curses</EM> screen to permit simple
+       editing of the input buffer.  It saves  the  screen's  state  and  then
+       calls  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  and,  if  the  screen  was  in  normal  ("cooked") mode,
+       <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>.  Before returning, it  restores  the  saved  screen  state.
+       Other   implementations  differ  in  detail,  affecting  which  control
+       characters they can accept in the  buffer;  see  section  "PORTABILITY"
+       below.
 
-       Using  <STRONG>getstr</STRONG>,  <STRONG>mvgetstr</STRONG>,  <STRONG>mvwgetstr</STRONG>,  or  <STRONG>wgetstr</STRONG>  to read a line that
-       overflows the array pointed to by <STRONG>str</STRONG> causes  undefined  results.   The
-       use  of  <STRONG>getnstr</STRONG>,  <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetnstr</STRONG>, or <STRONG>wgetnstr</STRONG>, respectively, is
-       recommended.
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       The return value <STRONG>KEY_RESIZE</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       SVr3  and  early  SVr4  curses  implementations did not reject function
-       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
-       function  keys,  "home"  key,  "clear"  key,  <EM>etc</EM>.)  are "interpreted",
-       without giving details.  It  lied.   In  fact,  the  "character"  value
-       appended to the string by those implementations was predictable but not
-       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
-       value).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions  for them, but indicates that <EM>wgetnstr</EM> and its variants read
+       "the entire multi-byte sequence associated with a character" and "fail"
+       if <EM>n</EM> and <EM>str</EM> together do not describe a buffer "large enough to contain
+       any complete characters".   In  <EM>ncurses</EM>,  however,  <EM>wgetch</EM>  reads  only
+       single-byte characters, so this scenario does not arise.
 
-       The  functions  <STRONG>getnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG> were present but not
-       documented in SVr4.
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       value other than <STRONG>ERR</STRONG>".
 
-       X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM>  bytes"  but did not state whether the terminating NUL counted toward
-       that limit.  X/Open Curses, Issue 7 (2009) changed  that  to  say  they
-       "read at most <EM>n</EM>-1 bytes" to allow for the terminating NUL.  As of 2018,
-       some implementations count it, some do not:
+       SVr3 and early SVr4 <EM>curses</EM>  implementations  did  not  reject  function
+       keys; the SVr4 documentation asserted that, like the screen's erase and
+       kill characters, they were
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and PDCurses do not count the NUL in the  given  limit,
-           while
+              interpreted, as well as any special keys (such as function keys,
+              "home" key, "clear" key, <EM>etc.</EM>)
+
+       without  further  detail.   It  lied.   In  fact, the "character" value
+       appended to the string by those implementations was predictable but not
+       useful  --  being,  in fact, the low-order eight bits of the key code's
+       <STRONG>KEY_</STRONG> constant value.  (The same language, unchanged except for styling,
+       survived into X/Open Curses Issue 4, but disappeared from Issue 7.)
 
-       <STRONG>o</STRONG>   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+       X/Open  Curses Issue 5 (2007) stated that these functions "read at most
+       <EM>n</EM> bytes" but did not  state  whether  the  terminating  null  character
+       counted  toward  that limit.  X/Open Curses Issue 7 (2009) changed that
+       to say they "read at most <EM>n</EM>-1 bytes" to allow for the terminating  null
+       character.  As of 2018, some implementations count it, some do not.
 
-       <STRONG>o</STRONG>   Solaris   xcurses   provides  both:  its  wide-character  <STRONG>wget_nstr</STRONG>
-           reserves  a  NUL,  but  its  <STRONG>wgetnstr</STRONG>  does  not  count   the   NUL
-           consistently.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and <EM>PDCurses</EM> do not count the null character toward the
+           limit, while Solaris and NetBSD <EM>curses</EM> do.
 
-       In SVr4 curses, a negative value of <EM>n</EM> tells <STRONG>wgetnstr</STRONG> to assume that the
-       caller's buffer is large enough to hold the result, i.e., to  act  like
-       <STRONG>wgetstr</STRONG>.   X/Open  Curses does not mention this (or anything related to
-       negative or zero values of <EM>n</EM>), however  most  implementations  use  the
-       feature, with different limits:
+       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  offers   both   behaviors:   its   wide-character
+           <EM>wgetn</EM><STRONG>_</STRONG><EM>wstr</EM>  reserves  room  for a wide null character, but its non-
+           wide <EM>wgetnstr</EM> does not consistently count a null  character  toward
+           the limit.
 
-       <STRONG>o</STRONG>   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
-           Other Unix systems than Solaris are likely to use the same limit.
+       In SVr4 <EM>curses</EM>, a negative <EM>n</EM> tells <EM>wgetnstr</EM> to assume that the caller's
+       buffer is large enough to hold the result; that is, the  function  then
+       acts  like  <EM>wgetstr</EM>.   X/Open Curses does not mention this behavior (or
+       anything  related  to  nonpositive  <EM>n</EM>  values),  however  most   <EM>curses</EM>
+       libraries  implement  it.  Most implementations nevertheless enforce an
+       upper limit on the count of bytes they write to the destination  buffer
+       <EM>str</EM>.
 
-       <STRONG>o</STRONG>   Solaris xcurses limits the result to <STRONG>LINE_MAX</STRONG> bytes.
+       <STRONG>o</STRONG>   BSD   <EM>curses</EM>   lacked  <EM>wgetnstr</EM>,  and  its  <EM>wgetstr</EM>  wrote  to  <EM>str</EM>
+           unboundedly, as did that in SVr2.
 
-       <STRONG>o</STRONG>   NetBSD 7 assumes no particular limit for the result  from  <STRONG>wgetstr</STRONG>.
-           However,  it  limits  the <STRONG>wgetnstr</STRONG> parameter <EM>n</EM> to ensure that it is
-           greater than zero.
+       <STRONG>o</STRONG>   <EM>PDCurses</EM>, and SVr3.1, SVr4, and Solaris <EM>curses</EM> limit both functions
+           to  writing  256  bytes.  Other System V-based platforms likely use
+           the same limit.
 
-           A comment in NetBSD's source code states that this is specified  in
-           SUSv2.
+       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> limits the write to <STRONG>LINE_MAX</STRONG> bytes.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  (before  6.2)  assumes  no particular limit for the result
-           from <STRONG>wgetstr</STRONG>, and treats the <EM>n</EM>  parameter  of  <STRONG>wgetnstr</STRONG>  like  SVr4
-           curses.
+       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> imposes no particular limit on the  length  of  the
+           write,  but does validate <EM>n</EM> to ensure that it is greater than zero.
+           A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
+           this.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  6.2  uses  <STRONG>LINE_MAX</STRONG>,  or a larger (system-dependent) value
-           which the <STRONG>sysconf</STRONG> function may provide.   If  neither  <STRONG>LINE_MAX</STRONG>  or
-           <STRONG>sysconf</STRONG>  is available, <EM>ncurses</EM> uses the POSIX value for <STRONG>LINE_MAX</STRONG> (a
-           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
-           terminating NUL.
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  prior  to 6.2 (2020) imposes no limit on the length of the
+           write, and treats <EM>wgetnstr</EM>'s <EM>n</EM> parameter as SVr4 <EM>curses</EM> does.
 
-       Although  <STRONG>getnstr</STRONG>  is equivalent to a series of calls to <STRONG>getch</STRONG>, it also
-       makes changes to the curses modes to allow simple editing of the  input
-       buffer:
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.2 uses <STRONG>LINE_MAX</STRONG>  or  a  larger  (system-dependent)  value
+           provided  by  <STRONG>sysconf(3)</STRONG>.   If  neither  <STRONG>LINE_MAX</STRONG>  nor  <EM>sysconf</EM>  is
+           available, <EM>ncurses</EM>  uses  the  POSIX  minimum  value  for  <STRONG>LINE_MAX</STRONG>
+           (2048).   In  either  case,  it reserves a byte for the terminating
+           null character.
 
-       <STRONG>o</STRONG>   <STRONG>getnstr</STRONG>  saves  the  current  value of the <STRONG>nl</STRONG>, <STRONG>echo</STRONG>, <STRONG>raw</STRONG> and <STRONG>cbreak</STRONG>
-           modes, and sets <STRONG>nl</STRONG>, <STRONG>noecho</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>cbreak</STRONG>.
+       Implementations vary in their handling of input control characters.
 
-           <STRONG>getnstr</STRONG> handles the echoing of characters, rather than  relying  on
-           the caller to set an appropriate mode.
+       <STRONG>o</STRONG>   While they may enable the screen's echo option, some do not take it
+           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+           deciding whether to handle echoing within <EM>wgetnstr</EM> or to rely on it
+           as a side effect of calling <EM>wgetch</EM>.
 
-       <STRONG>o</STRONG>   It  also  obtains  the <EM>erase</EM> and <EM>kill</EM> characters from <STRONG>erasechar</STRONG> and
-           <STRONG>killchar</STRONG>, respectively.
+       <STRONG>o</STRONG>   Originally,  <EM>ncurses</EM>, like its progenitor <EM>pcurses</EM>, had its <EM>wgetnstr</EM>
+           call <EM>noraw</EM> and <EM>cbreak</EM> before accepting input.  That may  have  been
+           done  to  make  function keys work; it is not necessary with modern
+           <EM>ncurses</EM>.
 
-       <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
+           Since 1995, <EM>ncurses</EM> has provided handlers for <STRONG>SIGINTR</STRONG>  and  <STRONG>SIGQUIT</STRONG>
+           events,  which  are typically generated at the keyboard with <STRONG>^C</STRONG> and
+           <STRONG>^\</STRONG> respectively.  In cbreak mode, those handlers catch a signal and
+           stop   the  program,  whereas  other  implementations  write  those
+           characters into the buffer.
 
-       Other implementations differ in their treatment of special characters:
+       <STRONG>o</STRONG>   Starting with <EM>ncurses</EM> 6.3 (2021), <EM>wgetnstr</EM> preserves  raw  mode  if
+           the  screen  was  already  in that state, allowing one to enter the
+           characters the terminal interprets as  interrupt  and  quit  events
+           into the buffer, for better compatibility with SVr4 <EM>curses</EM>.
 
-       <STRONG>o</STRONG>   While they may set the <EM>echo</EM>  mode,  other  implementations  do  not
-           modify  the  <EM>raw</EM>  mode,  They  may  take the <EM>cbreak</EM> mode set by the
-           caller into account when deciding whether to handle echoing  within
-           <STRONG>getnstr</STRONG> or as a side-effect of the <STRONG>getch</STRONG> calls.
 
-       <STRONG>o</STRONG>   The original <EM>ncurses</EM> (as <EM>pcurses</EM> in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
-           accepting input for <STRONG>getnstr</STRONG>.  That  may  have  been  done  to  make
-           function- and cursor-keys work; it is not necessary with <EM>ncurses</EM>.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) <EM>curses</EM> introduced <EM>wgetstr</EM> along with its variants.
 
-           Since  1995, <EM>ncurses</EM> has provided signal handlers for INTR and QUIT
-           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
-           catch  a  signal  and stop the program, where other implementations
-           allow one to enter those characters in the buffer.
+       SVr3.1 (1987) added <EM>wgetnstr</EM>, but none of its variants.
 
-       <STRONG>o</STRONG>   Starting in 2021 (<EM>ncurses</EM> 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
-           and   <STRONG>cbreak</STRONG>  for  better  compatibility  with  SVr4-curses,  e.g.,
-           allowing one to enter a <STRONG>^C</STRONG> into the buffer.
+       X/Open  Curses  Issue  4  (1995)  specified  <EM>getnstr</EM>,  <EM>mvwgetnstr</EM>,  and
+       <EM>mvgetnstr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>,
 
 
 
-ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -248,7 +267,9 @@ <H1 class="no-header">curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index b93fcbf44..6d821c12e 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @
+  * @Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -141,45 +141,46 @@ <H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        program  to  write  to  the  terminal  screen.  For example, first call
        <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to ensure that the screen and the library's model of it  is
        up  to  date;  then call <STRONG>reset_shell_mode</STRONG>; write to the screen with the
-       external application; call <STRONG>reset_prog_mode</STRONG>; and finally call  <STRONG>mvcur</STRONG>  to
-       set  the  cursor's  location  to  where  <EM>curses</EM> thinks it is, since the
-       library has no knowledge of how the external application moved it.
+       external application; call <STRONG>reset_prog_mode</STRONG>; and finally call <STRONG>mvcur(</STRONG>...<STRONG>,</STRONG>
+       ...<STRONG>,</STRONG>  <STRONG>-1,</STRONG> <STRONG>-1)</STRONG> to move the terminal cursor to where <EM>curses</EM> thinks it is,
+       since the library has no knowledge  of  how  the  external  application
+       moved it.
 
 
 </PRE><H3><a name="h3-napms">napms</a></H3><PRE>
-       <STRONG>napms</STRONG> sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000  (thirty
+       <STRONG>napms</STRONG>  sleeps  for  <EM>ms</EM>  milliseconds.   If  <EM>ms</EM>  exceeds  30,000 (thirty
        seconds), it is capped at that value.
 
 
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
-       <STRONG>ripoffline</STRONG>  provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> uses
-       to reduce the size of the screen.  <STRONG>ripoffline</STRONG>  must  be  called  before
+       <STRONG>ripoffline</STRONG> provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>  uses
+       to  reduce  the  size  of the screen.  <STRONG>ripoffline</STRONG> must be called before
        <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is called, to prepare these initial actions:
 
        <STRONG>o</STRONG>   If <EM>line</EM> is positive, a line is removed from the top of <STRONG>stdscr</STRONG>.
 
        <STRONG>o</STRONG>   if <EM>line</EM> is negative, a line is removed from the bottom.
 
-       When  the  resulting initialization is done inside <STRONG>initscr</STRONG>, the routine
+       When the resulting initialization is done inside <STRONG>initscr</STRONG>,  the  routine
        <STRONG>init</STRONG> (supplied by the user) is called with two arguments:
 
        <STRONG>o</STRONG>   a window pointer to the one-line window that has been allocated and
 
        <STRONG>o</STRONG>   an integer with the number of columns in the window.
 
-       Inside this initialization routine, the  integer  variables  <STRONG>LINES</STRONG>  and
-       <STRONG>COLS</STRONG>  (defined  in  <STRONG>&lt;curses.h&gt;</STRONG>)  are  not guaranteed to be accurate and
-       <STRONG>wrefresh</STRONG> or <STRONG>doupdate</STRONG> must not be  called.   It  is  allowable  to  call
+       Inside  this  initialization  routine,  the integer variables <STRONG>LINES</STRONG> and
+       <STRONG>COLS</STRONG> (defined in <STRONG>&lt;curses.h&gt;</STRONG>) are not  guaranteed  to  be  accurate  and
+       <STRONG>wrefresh</STRONG>  or  <STRONG>doupdate</STRONG>  must  not  be  called.  It is allowable to call
        <STRONG>wnoutrefresh</STRONG> during the initialization routine.
 
-       <STRONG>ripoffline</STRONG>  can  be  called  up to five times before calling <STRONG>initscr</STRONG> or
+       <STRONG>ripoffline</STRONG> can be called up to five times  before  calling  <STRONG>initscr</STRONG>  or
        <STRONG>newterm</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
 
-       <STRONG>curs_set</STRONG> returns the previous cursor state, or  <STRONG>ERR</STRONG>  if  the  requested
+       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
        <EM>visibility</EM> is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -189,7 +190,7 @@ <H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
             to obtain the terminal settings fails.
 
        <STRONG>ripoffline</STRONG>
-            returns <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds  the
+            returns  <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds the
             maximum (5).
 
 
@@ -197,21 +198,21 @@ <H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
        <EM>y</EM> and <EM>x</EM>.
 
-       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
+       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both <EM>ncurses</EM> and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for <EM>ncurses</EM>  to  determine  the  initial
+       called to make the cursor other than normal, i.e., either invisible  or
+       very  visible.   There  is  no way for <EM>ncurses</EM> to determine the initial
        cursor state to restore that.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       In  <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.  This
-       value tells <EM>ncurses</EM> that the old location is unknown, and that it  must
-       use  only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability,
-       rather than the least  costly  combination  of  absolute  and  relative
+       In <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.   This
+       value  tells <EM>ncurses</EM> that the old location is unknown, and that it must
+       use only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>)  capability,
+       rather  than  the  least  costly  combination  of absolute and relative
        motion.
 
 
@@ -219,24 +220,24 @@ <H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       The <EM>virtual</EM> <EM>screen</EM> functions <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG>  are  not  described  in
+       The  <EM>virtual</EM>  <EM>screen</EM>  functions  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in
        X/Open Curses, Issue 4.  All other functions are as described in X/Open
        Curses.
 
-       The SVr4 documentation describes <STRONG>setsyx</STRONG> and  <STRONG>getsyx</STRONG>  as  having  return
-       type  int.   This  is misleading, as they are macros with no documented
+       The  SVr4  documentation  describes  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> as having return
+       type int.  This is misleading, as they are macros  with  no  documented
        semantics for the return value.
 
        X/Open Curses notes:
 
-              "After use of <EM>mvcur</EM>(), the model Curses maintains of  the  state
-              of  the  terminal  might  not  match  the  actual  state  of the
-              terminal.  An application should touch and  refresh  the  window
+              "After  use  of <EM>mvcur</EM>(), the model Curses maintains of the state
+              of the  terminal  might  not  match  the  actual  state  of  the
+              terminal.   An  application  should touch and refresh the window
               before resuming conventional use of Curses."
 
-       Both  <EM>ncurses</EM>  and  SVr4  <EM>curses</EM>  implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> data
-       allocated in either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open  Curses  states
-       that  the old location must be given for <STRONG>mvcur</STRONG> to accommodate terminals
+       Both <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement  <STRONG>mvcur</STRONG>  using  the  <EM>SCREEN</EM>  data
+       allocated  in  either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open Curses states
+       that the old location must be given for <STRONG>mvcur</STRONG> to accommodate  terminals
        that lack absolute cursor positioning.
 
        If interrupted, <EM>ncurses</EM> restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
@@ -249,7 +250,7 @@ <H1 class="no-header">curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 4ff084816..c1bf123c7 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       Functions  that  return pointers return <STRONG>NULL</STRONG> on error, and set <STRONG>errno</STRONG> to
+       Functions  that  return pointers return <STRONG>NULL</STRONG> on error, and set <EM>errno</EM> to
        <STRONG>ENOMEM</STRONG>.
 
        X/Open  Curses  does  not  specify  any  error  conditions.   In   this
@@ -229,7 +229,7 @@ <H1 class="no-header">curs_pad 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index de9699fc9..5802ec28b 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -312,7 +312,7 @@ <H1 class="no-header">curs_slk 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index c2763afe3..e2bb7de01 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp @
+  * @Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 6da4a8e98..0784e42d6 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp @
+  * @Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-06-15 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -406,7 +406,7 @@ <H1 class="no-header">curs_util 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-15                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 92ae9851f..a72a37e30 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp @
+  * @Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-04-13 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -266,7 +266,7 @@ <H1 class="no-header">curs_variables 3x 2024-04-13 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-04-13                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index af5f66124..18331ce1b 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp @
+  * @Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240615).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240622).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -84,8 +84,8 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
            underlying integral type or  the  availability  of  a  preprocessor
            macro  exclusive  of  a  function  definition  (which  prevents its
            address  from  being   taken).    This   section   also   describes
-           implementation  details  that will be significant to the programmer
-           but which are not standardized.
+           implementation  details of significance to the programmer but which
+           are not standardized.
 
        <STRONG>o</STRONG>   "EXTENSIONS" presents <EM>ncurses</EM> innovations beyond the X/Open  Curses
            standard  and/or  the  SVr4 <EM>curses</EM> implementation.  They are termed
@@ -107,26 +107,25 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        may  be available; if so, link with it using <STRONG>-lncurses_g</STRONG>.  (Your system
        integrator may have installed these libraries such that you can use the
        options  <STRONG>-lcurses</STRONG> and <STRONG>-lcurses_g</STRONG>, respectively.)  The <EM>ncurses</EM><STRONG>_</STRONG><EM>g</EM> library
-       generates trace logs (in a file called <EM>trace</EM> in the current  directory)
-       that  describe <EM>ncurses</EM> actions.  See section "ALTERNATE CONFIGURATIONS"
-       below.
+       logs events describing <EM>ncurses</EM> actions to a file called  <EM>trace</EM>  in  the
+       current directory.  See section "ALTERNATE CONFIGURATIONS" below.
 
 
 </PRE><H3><a name="h3-Application-Structure">Application Structure</a></H3><PRE>
-       A  <EM>curses</EM>  application  uses  information  from  the   system   locale;
+       A   <EM>curses</EM>   application  uses  information  from  the  system  locale;
        <STRONG>setlocale(3)</STRONG> prepares it for <EM>curses</EM> library calls.
 
            setlocale(LC_ALL, "");
 
-       If  the  locale  is  not  thus  initialized,  the  library assumes that
-       characters are printable as in ISO 8859-1, to work with certain  legacy
-       programs.   You  should initialize the locale; do not expect consistent
+       If the locale  is  not  thus  initialized,  the  library  assumes  that
+       characters  are printable as in ISO 8859-1, to work with certain legacy
+       programs.  You should initialize the locale; do not  expect  consistent
        behavior from the library when the locale has not been set up.
 
-       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize  <EM>curses</EM>  before
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize <EM>curses</EM> before
        use of any functions that deal with windows and screens.
 
-       To  get  character-at-a-time  input  without echoing--most interactive,
+       To get character-at-a-time  input  without  echoing--most  interactive,
        screen-oriented programs want this--use the following sequence.
 
            initscr(); cbreak(); noecho();
@@ -136,17 +135,22 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
            noqiflush();
            keypad(stdscr, TRUE);
 
-       A <EM>curses</EM> program then often enters an event loop of  some  sort.   Call
+       A  <EM>curses</EM>  program  then often enters an event loop of some sort.  Call
        <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> before exiting.
 
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       A  <EM>curses</EM>  library abstracts the terminal screen by representing all or
-       part of it as a <EM>WINDOW</EM> data structure.  A <EM>window</EM> is a rectangular  grid
-       of  character  cells,  addressed by line and column coordinates (<EM>y</EM>, <EM>x</EM>),
-       with the upper left corner as (0, 0).  A window called <STRONG>stdscr</STRONG>, the same
-       size  as  the terminal screen, is always available.  Create others with
-       <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
+       A <EM>curses</EM> library abstracts the terminal with a <EM>SCREEN</EM>  data  structure,
+       and  represents  all  or  part  of  its display with <EM>WINDOW</EM> structures.
+       Distinct properties apply to each; for example, the <EM>line</EM> <EM>discipline</EM>  of
+       a  typical  Unix terminal driver is in one of three modes: raw, cbreak,
+       or normal ("cooked").  In <EM>curses</EM>, the line discipline is a property  of
+       the screen, applying identically to all windows associated with it.
+
+       A  <EM>window</EM>  is  a rectangular grid of character cells, addressed by line
+       and column coordinates (<EM>y</EM>, <EM>x</EM>), with the upper left corner as (0, 0).  A
+       window  called  <STRONG>stdscr</STRONG>, the same size as the terminal screen, is always
+       available.  Create others with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
 
        A <EM>curses</EM> library does not manage overlapping windows (but  see  below).
        You  can either use <STRONG>stdscr</STRONG> to manage one screen-filling window, or tile
@@ -380,13 +384,13 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     def_shell_mode           <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     delscreen                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     delwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     derwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -446,7 +450,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     in_wch                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     in_wchnstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
-
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
@@ -455,6 +458,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     init_extended_pair       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
@@ -512,7 +516,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     mvaddchstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     mvaddnstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddnwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
-
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -523,6 +526,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -578,7 +582,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     mvwinnwstr               <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwins_nwstr             <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwins_wch               <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
-
                     mvwins_wstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
@@ -591,6 +594,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -644,7 +648,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     slk_attr                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     slk_attr_off             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attr_on              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_attr_set             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attroff              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -659,6 +662,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     standout                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     start_color              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -710,7 +714,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     vwprintw                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     vwscanw                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wadd_wch                 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
-
                     wadd_wchnstr             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     wadd_wchstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     waddch                   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
@@ -727,6 +730,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
                     wbkgd                    <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     wbkgdset                 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     wbkgrnd                  <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
@@ -776,7 +780,6 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
                     winstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     wmouse_trafo             <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>*
-
                     wmove                    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
                     wnoutrefresh             <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wprintw                  <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -1316,168 +1319,169 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        to draw colored text on a background whose color is set  independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>WINDOW</EM>  structure
-       internals, instead using accessor functions such as <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
+       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>SCREEN</EM> and <EM>WINDOW</EM>
+       structure  internals,  instead  using  accessor   functions   such   as
+       <STRONG><A HREF="curs_inopts.3x.html">is_cbreak(3x)</A></STRONG> and <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> enables an application  to  direct  its  output  to  a  printer
+       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
        attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
-       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that  can  gather  color  information  from  them  when many colors are
+       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
+       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that can gather color  information  from  them  when  many  colors  are
        supported.
 
-       <EM>ncurses</EM>   permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;    see
+       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
        <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
 
-       Rudimentary  support  for multi-threaded applications may be available;
+       Rudimentary support for multi-threaded applications may  be  available;
        see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       Functions that ease the management of multiple screens can be  exposed;
+       Functions  that ease the management of multiple screens can be exposed;
        see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       To  aid  applications  to  debug their memory usage, <EM>ncurses</EM> optionally
-       offers functions  to  more  aggressively  free  memory  it  dynamically
+       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
+       offers  functions  to  more  aggressively  free  memory  it dynamically
        allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       The  library  facilitates auditing and troubleshooting of its behavior;
+       The library facilitates auditing and troubleshooting of  its  behavior;
        see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       Compiling <EM>ncurses</EM> with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to  fall  back
-       to  reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
+       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
+       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
        <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
-       recommended,  as  it essentially includes an entire <EM>termcap</EM> compiler in
-       the <EM>ncurses</EM> startup code, at a cost in  memory  usage  and  application
+       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
+       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
        launch latency.
 
-       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
+       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
-       Curses,  and  supports  all  features  of its enhanced level except the
-       <STRONG>untic</STRONG> utility.
+       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
+       Curses, and supports all features of  its  enhanced  level  except  the
+       <EM>untic</EM> utility.
 
-       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
+       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
-       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
-       is done primarily to guard  against  programmer  error.   The  standard
+       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
+       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
+       is  done  primarily  to  guard  against programmer error.  The standard
        interface does not provide a way for the library to tell an application
-       which of several possible errors occurred.  An application that  relies
-       on  <EM>ncurses</EM>  to  check  its function parameters for validity limits its
+       which  of several possible errors occurred.  An application that relies
+       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
        portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
-       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
+       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
+       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
-       NUL bytes to the device.  This method is slightly more  expensive,  but
-       narrows   the   interface   to   the   Unix  kernel  significantly  and
+       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
+       NUL  bytes  to the device.  This method is slightly more expensive, but
+       narrows  the  interface  to   the   Unix   kernel   significantly   and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
+       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
+           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
        <STRONG>o</STRONG>   The first <EM>curses</EM>, in 4BSD, provided a <EM>curses.h</EM> file.
 
-           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
+           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
-           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
+           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
+           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
+       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
-           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
+           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
+           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
+       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
            <EM>unctrl.h</EM>.
 
-           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
+           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
+       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
            HP-UX and AIX.
 
-           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
+           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again,  <EM>ncurses</EM>  and
+           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again, <EM>ncurses</EM> and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
+       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
            require it to do so.
 
-           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
-           and  must  include  both header files in the same module.  Very old
-           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
+           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
+           and must include both header files in the same  module.   Very  old
+           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
            <EM>term.h</EM>.
 
-           The  header  files supplied by <EM>ncurses</EM> include the standard library
-           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
-           files  can  be  included  in  any  order.  But for portability, you
+           The header files supplied by <EM>ncurses</EM> include the  standard  library
+           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
+           files can be included in  any  order.   But  for  portability,  you
            should include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
-           file  does  not  necessarily  make visible all of the symbols in it
+       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
+           file does not necessarily make visible all of  the  symbols  in  it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
-           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
-           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
+           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
+           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
+           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
-           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
-           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
+           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
+           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
+           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
-           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
-           possibility  that  an application might include either <EM>varargs.h</EM> or
-           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
-           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
-           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
-           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
-           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
-           call's  actual  parameters  against the formal ones declared in its
+           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
+           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
+           possibility that an application might include either  <EM>varargs.h</EM>  or
+           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
+           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
+           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
+           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
+           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
+           call's actual parameters against the formal ones  declared  in  its
            prototype.
 
-           No  conforming  implementations  of  X/Open   Curses   require   an
+           No   conforming   implementations   of  X/Open  Curses  require  an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
+           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1491,7 +1495,7 @@ <H1 class="no-header">ncurses 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-06-22                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 5a548fab1..c2ef365d9 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp @
+  * @Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-04-20 ncurses 6.5 User commands</TITLE>
+<TITLE>tabs 1 2024-06-22 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-04-20 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tabs 1 2024-06-22 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -245,8 +245,8 @@ <H1 class="no-header">tabs 1 2024-04-20 ncurses 6.5 User commands</H1>
        the  committee  considered  redesigning  the  <STRONG>tabs</STRONG>  and <STRONG>tput</STRONG> utilities,
        without settling on an improved solution.  It claims that
 
-           "no known historical version of <EM>tabs</EM>  supports  the  capability  of
-           setting arbitrary tab stops."
+           no known historical version of  <EM>tabs</EM>  supports  the  capability  of
+           setting arbitrary tab stops.
 
        The   feature  described  in  subsection  "Explicit  Lists"  above  was
        implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
@@ -258,7 +258,7 @@ <H1 class="no-header">tabs 1 2024-04-20 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-04-20                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2024-06-22                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 107bc38f6..f9496ff81 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240615).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240622).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 0d9d1788c..623be9c75 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
+  * @Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-06-08 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2024-06-22 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-06-08 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2024-06-22 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -477,8 +477,10 @@ <H1 class="no-header">tput 1 2024-06-08 ncurses 6.5 User commands</H1>
        As of <EM>ncurses</EM> 6.1,  the  "reset"  features  of  the  two  programs  are
        (mostly) the same.  Two minor differences remain.
 
-       <STRONG>o</STRONG>   The  <STRONG>tset</STRONG>  program  waits  one  second  when resetting, in case the
-           terminal happens to be a hardware device.
+       <STRONG>o</STRONG>   When  issuing  a  reset, the <STRONG>tset</STRONG> program checks whether the device
+           appears to be a pseudoterminal (as might  be  used  by  a  terminal
+           emulator program), and, if it does not, waits one second in case it
+           is communicating with a hardware terminal.
 
        <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
            different  streams;  that  is, standard error for <STRONG>tset</STRONG> and standard
@@ -557,7 +559,7 @@ <H1 class="no-header">tput 1 2024-06-08 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-06-08                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-06-22                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 4a0d06e9d..bf28a61eb 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp $
-.TH curs_add_wchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp $
+.TH curs_add_wchstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -139,6 +139,27 @@ may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified functions named
+.I \%waddwchstr
+and
+.I \%waddwchnstr
+(and the usual variants).
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+They differed from X/Open's
+.I \%wadd_wchstr
+and
+.I \%wadd_wchnstr
+in that they each took an argument of type
+.I \%wchar_t
+instead of
+.IR \%cchar_t "."
 .SH SEE ALSO
 \fB\%curs_addchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 4e1bf944f..cdea7bb63 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp $
-.TH curs_addch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp $
+.TH curs_addch 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -284,6 +284,12 @@ variable,
 but X/Open Curses does not specify it;
 see \fB\%curs_variables\fP(3X).
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
@@ -471,9 +477,9 @@ If it cannot,
 use only
 \fB\%wadd_wch\fP(3X).
 .SH HISTORY
-The original
+4BSD (1980)
 .I curses
-in 4BSD (1980) introduced
+introduced
 .IR \%waddch "."
 .PP
 SVr3 (1987)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index cee228de8..848b99786 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp $
-.TH curs_addstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp $
+.TH curs_addstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -130,6 +130,21 @@ All of these functions except \fBwaddnstr\fP may be macros.
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.I \%waddstr
+along with its variants,
+the latter defined as macros.
+.PP
+SVr3.1 (1987)
+added
+.I \%waddnstr
+(and its variants)
+redefining
+.I \%waddstr
+as a macro wrapping it.
 .SH SEE ALSO
 \fB\%curs_addwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 6a01deca2..c0e9de21f 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp $
-.TH curs_beep 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp $
+.TH curs_beep 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -101,9 +101,9 @@ they always return
 .BR OK ","
 and X/Open Curses specifies them as doing so.
 .SH HISTORY
-.B beep
+.I beep
 and
-.B flash
+.I flash
 appeared in SVr2 (1984).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 733054c75..3893bb95f 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp $
-.TH curs_get_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp $
+.TH curs_get_wstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,15 +58,15 @@ get a wide-character string from a \fIcurses\fR terminal keyboard
 .nf
 \fB#include <curses.h>
 .PP
-\fBint get_wstr(wint_t *\fIwstr\fP);
-\fBint getn_wstr(wint_t *\fIwstr\fP, int \fIn\fP);
-\fBint wget_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP);
-\fBint wgetn_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint get_wstr(wint_t * \fIwstr\fP);
+\fBint wget_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP);
+\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
+\fBint mvwget_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
 .PP
-\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
-\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwget_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
-\fBint mvwgetn_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint getn_wstr(wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint wgetn_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 The function
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index eec58a542..8ad2471f6 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,17 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp $
-.TH curs_getstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp $
+.TH curs_getstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds ^  \(ha
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       ^  ^
 .\}
 .
 .de bP
@@ -58,97 +60,119 @@ accept character strings from \fIcurses\fR terminal keyboard
 .nf
 \fB#include <curses.h>
 .PP
-\fBint getstr(char *\fIstr\fP);
-\fBint getnstr(char *\fIstr\fP, int \fIn\fP);
-\fBint wgetstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
-\fBint wgetnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint getstr(char * \fIstr\fP);
+\fBint wgetstr(WINDOW * \fIwin\fP, char * \fIstr\fP);
+\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
+\fBint mvwgetstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
 .PP
-\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvwgetstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
-\fBint mvwgetnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint getnstr(char * \fIstr\fP, int \fIn\fP);
+\fBint wgetnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
+.B \%wgetstr
+populates a user-supplied string buffer
+.I str
+by repeatedly calling \fBwgetch\fP(3X)
+with the
+.I win
+argument
+until a line feed or carriage return character is input.
+.\" Of the two, because wgetnstr() calls nl(), only a line feed (\n)
+.\" will ever be returned by wgetch().
 The function
-\fBwgetnstr\fP
-is equivalent to a series of calls to
-\fBwgetch\fP(3X),
-until a newline or carriage return terminates the series:
 .bP
-The terminating character is not included in the returned string.
+does not copy the terminating character to
+.IR str ";"
 .bP
-In all instances, the end of the string is terminated
-by a NUL.
+always terminates
+.I str
+with a null character;
 .bP
-The function stores the result in the area pointed to
-by the \fIstr\fP parameter.
+interprets the screen's erase and kill characters
+(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
 .bP
-The function reads at most \fIn\fP characters,
-thus preventing a possible overflow of the input buffer.
-.IP
-Any attempt to enter more characters
-(other than the terminating newline or carriage return)
-causes a beep.
-.IP
-Function keys also cause a beep and are ignored.
+recognizes function keys only if the screen's keypad option is enabled
+(see \fB\%keypad\fP(3X));
+.bP
+treats the function keys
+.B \%KEY_LEFT
+and
+.B \%KEY_BACKSPACE
+the same as the erase character;
+and
+.bP
+discards function key inputs other than those treated as the erase
+character,
+calling \fBbeep\fP(3X).
+.PP
+The erase character replaces the character at the end of the buffer with
+a null character,
+while the kill character does the same for the entire buffer.
 .PP
-The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+If the screen's echo option is enabled
+(see \fBecho\fP(3X)),
+.B \%wgetstr
+updates
+.I win
+with \fB\%wechochar\fP(3X).
+Further,
 .bP
-The \fIerase\fP character (e.g., \fB^H\fP) erases the character
-at the end of the buffer, moving the cursor to the left.
-.IP
-If \fIkeypad\fP mode is on for the window,
-\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
-are both considered equivalent to the user's \fIerase\fP character.
+the erase character
+and its function key synonyms
+move the cursor to the left,
+and
 .bP
-The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
-leaving the cursor at the beginning of the buffer.
+the kill character returns the cursor to where it was located when
+.B \%wgetstr
+was called.
 .PP
-Characters input are echoed only if \fBecho\fP is currently on.
-In that case,
-backspace is echoed as deletion of the previous character
-(typically a left motion).
+.B \%wgetnstr
+is similar,
+but reads at most
+.I n
+characters,
+aiding the application to avoid overrunning the buffer to which
+.I str
+points.
+An attempt to input more than
+.I n
+characters
+(other than the terminating line feed or carriage return)
+is ignored with a beep.
 .PP
-The
-\fBgetnstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetnstr\fP, and
-\fBwgetnstr\fP
-functions are identical
-to the
-\fBgetstr\fP,
-\fBmvgetstr\fP,
-\fBmvwgetstr\fP, and
-\fBwgetstr\fP
-functions, respectively,
-except that the
-\fB*n*\fP
-versions read at most
-\fIn\fP
-characters, letting the application prevent overflow of the
-input buffer.
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All of these functions return the integer \fBOK\fP upon successful completion.
-(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
-If unsuccessful, they return \fBERR\fP.
-.PP
-X/Open defines no error conditions.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-In this implementation,
-these functions return
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the window pointer is null,
+.I win
+is
+.BR NULL ","
+or
 .bP
-if its timeout expires without having any data, or
-.bP
-if the associated call to
-\fBwgetch\fP
-failed.
+if an internal
+.B \%wgetch
+call fails.
 .PP
-This implementation provides an extension as well.
-If a \fBSIGWINCH\fP interrupts the function, it will return \fBKEY_RESIZE\fP
-rather than \fBOK\fP or \fBERR\fP.
+Further,
+in
+.IR \%ncurses ","
+these functions return
+.B \%KEY_RESIZE
+if a
+.B \%SIGWINCH
+event interrupts the function.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -156,138 +180,307 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Any of these functions other than
-\fBwgetnstr\fP
-may be macros.
+All of these functions except
+.B \%wgetnstr
+may be implemented as macros.
+.PP
+Use of
+.BR \%getstr ","
+.BR \%mvgetstr ","
+.BR \%mvwgetstr ","
+or
+.B \%wgetstr
+to read input that
+overruns the buffer pointed to by
+.I str
+causes undefined results.
+Use their
+.BR n -infixed
+counterpart functions instead.
 .PP
-Using
-\fBgetstr\fP,
-\fBmvgetstr\fP,
-\fBmvwgetstr\fP, or
-\fBwgetstr\fP
-to read a line that
-overflows the array pointed to by
-\fBstr\fP
-causes undefined
-results.
-The use of
-\fBgetnstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetnstr\fP, or
-\fBwgetnstr\fP,
-respectively, is recommended.
+While
+.B \%wgetnstr
+is conceptually a series of calls to
+.BR \%wgetch ","
+it also temporarily changes properties of the
+.I curses
+screen to permit simple editing of the input buffer.
+It saves the screen's state and then calls \fBnl\fP(3X) and,
+if the screen was in normal (\*(``cooked\*('') mode,
+\fB\%cbreak\fP(3X).
+Before returning,
+it restores the saved screen state.
+Other implementations differ in detail,
+affecting which control characters they can accept in the buffer;
+see section \*(``PORTABILITY\*('' below.
+.SH EXTENSIONS
+The return value
+.B \%KEY_RESIZE
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
-It specifies no error conditions for them.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-SVr3 and early SVr4 curses implementations did not reject function keys;
-the SVr4.0 documentation claimed that \*(``special keys\*(''
+X/Open Curses Issue 4 describes these functions.
+It specifies no error conditions for them,
+but indicates that
+.I \%wgetnstr
+and its variants read
+\*(``the entire multi-byte sequence associated with a character\*(''
+and \*(``fail\*('' if
+.I n
+and
+.I str
+together do not describe a buffer
+\*(``large enough to contain any complete characters\*(''.
+In
+.IR \%ncurses ","
+however,
+.I \%wgetch
+reads only single-byte characters,
+so this scenario does not arise.
+.\" You can pass ncurses wgetnstr n=0 and it will beep at you with each
+.\" key stroke.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.PP
+SVr3 and early SVr4
+.I curses
+implementations did not reject function keys;
+the SVr4 documentation asserted that,
+like the screen's erase and kill characters,
+they were
+.PP
+.RS
+interpreted,
+as well as any special keys
 (such as function keys,
 \*(``home\*('' key,
 \*(``clear\*('' key,
-\fIetc\fP.) are \*(``interpreted\*('',
-without giving details.
-It lied.
-In fact, the \*(``character\*('' value appended to the
-string by those implementations was predictable but not useful
-(being, in fact, the low-order eight bits of the key's KEY_ value).
+.IR etc. )
+.\" SVID 4, Volume 3, p. 495
+.RE
 .PP
-The functions \fBgetnstr\fP, \fBmvgetnstr\fP, and \fBmvwgetnstr\fP were
-present but not documented in SVr4.
+without further detail.
+It lied.
+In fact,
+the \*(``character\*('' value
+appended to the string
+by those implementations
+was predictable but not useful \(em
+being,
+in fact,
+the low-order eight bits of the key code's
+.B KEY_
+constant value.
+(The same language,
+unchanged except for styling,
+survived into X/Open Curses Issue 4, \" p. 94 (PDF 114)
+but disappeared from Issue 7.) \" p. 105 (PDF 119)
 .PP
-X/Open Curses, Issue 5 (2007) stated that these functions
-\*(``read at most \fIn\fP bytes\*(''
-but did not state whether the terminating NUL counted toward that limit.
-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 count it, some do not:
-.bP
-\fI\%ncurses\fP 6.1 and PDCurses do not count the NUL in the given limit, while
+X/Open Curses Issue 5 (2007) stated that these functions
+\*(``read at most
+.I n
+bytes\*(''
+but did not state whether the terminating null character
+counted toward that limit.
+X/Open Curses Issue 7 (2009) changed that to say they
+\*(``read at most
+.IR n \-1
+bytes\*(''
+to allow for the terminating null character.
+As of 2018,
+some implementations count it,
+some do not.
 .bP
-Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+.I \%ncurses
+6.1 and
+.I PDCurses
+do not count the null character toward the limit,
+while Solaris and NetBSD
+.I curses
+do.
 .bP
-Solaris xcurses provides both:
-its wide-character \fBwget_nstr\fP reserves a NUL,
-but its \fBwgetnstr\fP does not count the NUL consistently.
+Solaris
+.I xcurses
+offers both behaviors:
+its wide-character
+.I \%wgetn_wstr
+reserves room for a wide null character,
+but its non-wide
+.I \%wgetnstr
+does not consistently count a null character toward the limit.
 .PP
-In SVr4 curses,
-a negative value of \fIn\fP tells \fBwgetnstr\fP to assume that the
-caller's buffer is large enough to hold the result,
-i.e., to act like \fBwgetstr\fP.
-X/Open Curses does not mention this
-(or anything related to negative or zero values of \fIn\fP),
-however most implementations
-use the feature, with different limits:
+In SVr4
+.IR curses ","
+a negative
+.I n
+tells
+.I \%wgetnstr
+to assume that the caller's buffer
+is large enough to hold the result;
+that is,
+the function then acts like
+.IR \%wgetstr "."
+X/Open Curses does not mention this behavior
+(or anything related to nonpositive
+.I n
+values),
+however most
+.I curses
+libraries implement it.
+Most implementations nevertheless enforce an upper limit
+on the count of bytes they write to the destination buffer
+.IR str "."
 .bP
-Solaris SVr4 curses and PDCurses limit the result to 255 bytes.
-Other Unix systems than Solaris are likely to use the same limit.
+BSD
+.I curses
+lacked
+.IR \%wgetnstr ","
+and its
+.I \%wgetstr
+wrote to
+.I str
+unboundedly,
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+.\"   libcurses/getstr.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/lib/\
+.\"   libcurses/getstr.c
+as did that in SVr2.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysvr2-vax/\
+.\"   src/lib/libcurses/screen/getstr.c
 .bP
-Solaris xcurses limits the result to \fBLINE_MAX\fP bytes.
-.bP
-NetBSD 7 assumes no particular limit for the result from \fBwgetstr\fP.
-However, it limits the \fBwgetnstr\fP parameter \fIn\fP to ensure
-that it is greater than zero.
-.IP
-A comment in NetBSD's source code states that this is specified in SUSv2.
+.IR PDCurses ","
+and
+SVr3.1,
+SVr4,
+and
+Solaris
+.I curses
+limit both functions to writing 256 bytes.
+Other System\ V-based platforms likely use the same limit.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
+.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
 .bP
-\fI\%ncurses\fP (before 6.2) assumes no particular limit for the result
-from \fBwgetstr\fP, and treats the \fIn\fP parameter of \fBwgetnstr\fP
-like SVr4 curses.
+Solaris
+.I xcurses
+limits the write to
+.B LINE_MAX
+bytes.
 .bP
-\fI\%ncurses\fP 6.2 uses \fBLINE_MAX\fP,
-or a larger (system-dependent) value
-which the \fBsysconf\fP function may provide.
-If neither \fBLINE_MAX\fP or \fBsysconf\fP is available,
-\fI\%ncurses\fP uses the POSIX value for \fBLINE_MAX\fP (a 2048 byte limit).
-In either case, it reserves a byte for the terminating NUL.
-.PP
-Although \fBgetnstr\fP is equivalent to a series of calls to \fBgetch\fP,
-it also makes changes to the curses modes to allow simple editing of
-the input buffer:
-.bP
-\fBgetnstr\fP saves the current value of the \fBnl\fP, \fBecho\fP,
-\fBraw\fP and \fBcbreak\fP modes, and sets
-\fBnl\fP,
-\fBnoecho\fP,
-\fBnoraw\fP, and
-\fBcbreak\fP.
-.IP
-\fBgetnstr\fP handles the echoing of characters,
-rather than relying on the caller to set an appropriate mode.
+NetBSD 7
+.I curses
+imposes no particular limit on the length of the write,
+but does validate
+.I n
+to ensure that it is greater than zero.
+A comment in NetBSD's source code asserts that SUSv2 specifies this.
 .bP
-It also obtains the \fIerase\fP and \fIkill\fP characters
-from \fBerasechar\fP and \fBkillchar\fP, respectively.
+.I \%ncurses
+prior to 6.2 (2020)
+imposes no limit on the length of the write,
+and treats
+.IR wgetnstr 's
+.I n
+parameter as SVr4
+.I curses
+does.
 .bP
-On return, \fBgetnstr\fP restores the modes to their previous values.
+.I \%ncurses
+6.2 uses
+.B LINE_MAX
+or a larger (system-dependent) value
+provided by \fI\%sysconf\fP(3).
+If neither
+.B LINE_MAX
+nor
+.I \%sysconf
+is available,
+.I \%ncurses
+uses the POSIX minimum value for
+.B LINE_MAX
+(2048). \" _POSIX2_LINE_MAX
+In either case,
+it reserves a byte for the terminating null character.
 .PP
-Other implementations differ in their treatment of special characters:
+Implementations vary in their handling of input control characters.
 .bP
-While they may set the \fIecho\fP mode,
-other implementations do not modify the \fIraw\fP mode,
-They may take the \fIcbreak\fP
-mode set by the caller into account when deciding whether to handle
-echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.
+While they may enable the screen's echo option,
+some do not take it out of raw mode,
+and may take cbreak mode into account
+when deciding whether to handle echoing within
+.I \%wgetnstr
+or to rely on it as a side effect of calling
+.IR \%wgetch "."
 .bP
-The original \fI\%ncurses\fP
-(as \fIpcurses\fP in 1986)
-set \fBnoraw\fP and \fBcbreak\fP when accepting input for \fBgetnstr\fP.
-That may have been done to make function- and cursor-keys work;
-it is not necessary with \fI\%ncurses\fP.
+Originally,
+.IR \%ncurses ","
+like its progenitor
+.IR \%pcurses ","
+had its
+.I \%wgetnstr
+call
+.I \%noraw
+and
+.I \%cbreak
+before accepting input.
+That may have been done to make function keys work;
+it is not necessary with modern
+.IR \%ncurses "."
 .IP
 Since 1995,
-\fI\%ncurses\fP has provided signal handlers for INTR and QUIT
-(e.g., \fB^C\fP or \fB^\e\fP).
-With the \fBnoraw\fP and \fBcbreak\fP settings,
-those may catch a signal and stop the program,
-where other implementations allow one to enter those characters in the buffer.
+.I \%ncurses
+has provided handlers for
+.B SIGINTR
+and
+.B SIGQUIT
+events,
+which are typically generated at the keyboard with
+.B \*^C
+and
+.B \*^\e
+respectively.
+In cbreak mode,
+those handlers catch a signal and stop the program,
+whereas other implementations write those characters into the buffer.
 .bP
-Starting in 2021
-(\fI\%ncurses\fP 6.3),
-\fBgetnstr\fP sets \fBraw\fP,
-rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
-SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
+Starting with
+.I \%ncurses
+6.3 (2021),
+.I \%wgetnstr
+preserves raw mode if the screen was already in that state,
+allowing one to enter the characters the terminal interprets
+as interrupt and quit events
+into the buffer,
+for better compatibility with SVr4
+.IR curses "."
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.I \%wgetstr
+along with its variants.
+.PP
+SVr3.1 (1987)
+added
+.IR \%wgetnstr ","
+but none of its variants.
+.PP
+X/Open Curses Issue 4 (1995) specified
+.IR \%getnstr ","
+.IR \%mvwgetnstr ","
+and
+.IR \%mvgetnstr "."
 .SH SEE ALSO
 \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
@@ -295,6 +488,7 @@ library in its wide-character configuration
 .RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
 \fB\%curs_getch\fP(3X),
-\fB\%curs_termattrs\fP(3X),
-\fB\%curs_variables\fP(3X)
+\fB\%curs_inopts\fP(3X), \" echo(), keypad()
+\fB\%curs_termattrs\fP(3X), \" erasechar(), killchar()
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index e474b6400..457db4da2 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp $
-.TH curs_kernel 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp $
+.TH curs_kernel 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -198,8 +198,10 @@ write to the screen with the external application;
 call
 .BR \%reset_prog_mode ";"
 and finally call
-.B \%mvcur
-to set the cursor's location to where
+.BR \%mvcur( ".\|.\|." ,
+.RB .\|.\|. ,
+.B \-1, \-1)
+to move the terminal cursor to where
 .I \%curses
 thinks it is,
 since the library has no knowledge of how the external application
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index f42968bdc..d2fadb90d 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp $
-.TH curs_pad 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp $
+.TH curs_pad 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,7 +87,8 @@ or
 .B \%pnoutrefresh
 instead.
 .SS newpad
-\fB\%newpad\fP creates and returns a pointer to a new pad data structure
+.B \%newpad
+creates and returns a pointer to a new pad data structure
 with the given number of lines,
 .IR nlines ,
 and columns,
@@ -114,7 +115,7 @@ it is often necessary to call \fB\%touchwin\fP(3X) or
 before calling
 .BR \%prefresh .
 .SS "prefresh, pnoutrefresh"
-.B \%prefresh\fP
+.B \%prefresh
 and
 .B \%pnoutrefresh
 are analogous to \fB\%wrefresh\fP(3X) and \fB\%wnoutrefresh\fP(3X)
@@ -156,7 +157,7 @@ The location of the character
 written to the pad is used to populate the arguments to
 .BR \%prefresh .
 .SS pecho_wchar
-.B \%pecho_wchar\fP
+.B \%pecho_wchar
 is functionally equivalent to calling \fB\%wadd_wch\fP(3X) followed by
 .BR \%prefresh .
 It suggests to the
@@ -168,20 +169,28 @@ The location of the character
 written to the pad is used to populate the arguments to
 .BR \%prefresh .
 .SH RETURN VALUE
-Functions that return an integer return \fBERR\fP upon failure and
-\fBOK\fP
+Functions that return an integer return
+.B ERR
+upon failure and
+.B OK
 (SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
+\*(``an integer value other than
+.BR ERR \*('')
 upon successful completion.
 .PP
-Functions that return pointers return \fBNULL\fP on error,
-and set \fB\%errno\fP to \fB\%ENOMEM\fP.
+Functions that return pointers return
+.B NULL
+on error,
+and set
+.I \%errno
+to
+.BR \%ENOMEM "."
 .PP
 X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
-\fB\%prefresh\fP and \fB\%pnoutrefresh\fP
+.BR prefresh\  and\  pnoutrefresh
 return
 .B ERR
 if the window pointer is null, or
@@ -189,24 +198,33 @@ if the window is not really a pad or
 if the area to refresh extends off-screen or
 if the minimum coordinates are greater than the maximum.
 .TP 5
-\fBpechochar\fP
+.B pechochar
 returns
 .B ERR
-if the window is not really a pad, and the associated call
-to \fB\%wechochar\fP returns
+if the window is not really a pad,
+and the associated call to
+.B \%wechochar
+returns
 .BR ERR "."
 .TP 5
-\fBpecho_wchar\fP
+.B pecho_wchar
 returns
 .B ERR
-if the window is not really a pad, and the associated call
-to \fB\%wecho_wchar\fP returns
+if the window is not really a pad,
+and the associated call to
+.B \%wecho_wchar
+returns
 .BR ERR "."
 .RE
 .SH NOTES
-\fB\%pechochar\fP may be a macro.
+.B \%pechochar
+may be a macro.
 .SH PORTABILITY
-BSD \fIcurses\fP has no \fIpad\fP feature.
+BSD
+.I curses
+has no
+.I pad
+feature.
 .PP
 SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
 documenting them in a single line each.
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 1866064a6..e141d7b68 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp $
-.TH curs_slk 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp $
+.TH curs_slk 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,9 +135,9 @@ helping the user to associate each label with its numbered function key.
 \fBLINES\fP and the vertical size of \fB\%stdscr\fP are further reduced.
 .SS Labels
 Populate the labels with normal strings
-(\fB\%slk_set\fP)
+\%(\fBslk_set\fP)
 or wide-character strings
-(\fB\%slk_wset\fP).
+\%(\fBslk_wset\fP).
 Each function takes three parameters.
 .TP 8 \" "labnum" + 2n
 .I labnum
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 6bd2a66a0..f7bb8d6bf 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp $
-.TH curs_termcap 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp $
+.TH curs_termcap 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -275,7 +275,7 @@ on error.
 Error conditions include:
 .bP
 uninitialized state
-(\fB\%tgetent\fP was not called successfully),
+\%(\fBtgetent\fP was not called successfully),
 .bP
 .I cap
 being a null pointer,
@@ -421,7 +421,7 @@ Nevertheless,
 the BSD sources included two different \fI\%termcap.h\fP header files
 over time.
 .bP
-One was used internally by \fBjove\fP(1) from 4.3BSD onward.
+One was used internally by \fIjove\fP(1) from 4.3BSD onward.
 .\" 2BSD became a branch retaining support for non-virtual memory
 .\" systems (such as the PDP-11) whereas most BSD development focused on
 .\" the VAX and other VM-enabled systems starting with 3BSD.
@@ -466,11 +466,11 @@ support the \fI\%readline\fP(3) library.
 \fI\%ncurses\fP 1.8.1
 (November 1993)
 provided a \fI\%termcap.h\fP file.
-It reflected influence from GNU \fItermcap\fP and \fBemacs\fP(1)
-(rather than \fBjove\fP(1)),
+It reflected influence from GNU \fItermcap\fP and \fI\%emacs\fP(1)
+(rather than \fIjove\fP(1)),
 providing the following interface:
 .bP
-global symbols used by \fIemacs\fP,
+global symbols used by \fI\%emacs\fP,
 .bP
 \fIconst\fP-qualified function prototypes,
 and
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 4b6450ee9..74227f0d9 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp $
-.TH curs_util 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp $
+.TH curs_util 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -264,8 +264,8 @@ There are a few caveats:
 .bP
 the data written is a copy of the \fI\%WINDOW\fP structure,
 and its associated character cells.
-The format differs between the wide-character (\fI\%ncursesw\fP) and
-non-wide (\fI\%ncurses\fP) libraries.
+The format differs between the wide-character \%(\fIncursesw\fP) and
+non-wide \%(\fIncurses\fP) libraries.
 You can transfer data between the two,
 however.
 .bP
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 467b69444..8b1501476 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp $
-.TH curs_variables 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp $
+.TH curs_variables 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -285,7 +285,7 @@ the physical screen with \fB\%mvcur\fP(3X).
 \fI\%ncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
 virtual screen.
 It uses the terminal description's \*(``\fBit\fP\*(''
-(\fB\%init_tabs\fP) capability for computing hardware tabs
+\%(\fBinit_tabs\fP) capability for computing hardware tabs
 (that is,
 tab stops on the physical screen).
 .bP
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 637688034..ef6b5f083 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
+# $Id: man_db.renames.in,v 1.77 2024/06/22 22:20:56 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -178,6 +178,7 @@ attr_get.3x			attr_get.3ncurses
 attr_on.3x			attr_on.3ncurses
 attron.3x			attron.3ncurses
 baudrate.3x			baudrate.3ncurses
+beep.3x				beep.3ncurses
 bkgd.3x				bkgd.3ncurses
 bkgrnd.3x			bkgrnd.3ncurses
 cbreak.3x			cbreak.3ncurses
@@ -217,6 +218,7 @@ initscr.3x			initscr.3ncurses
 is_scrollok.3x			is_scrollok.3ncurses
 keyname.3x			keyname.3ncurses
 keypad.3x			keypad.3ncurses
+killchar.3x			killchar.3ncurses
 leaveok.3x			leaveok.3ncurses
 longname.3x			longname.3ncurses
 meta.3x				meta.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 27a9b371c..fe68cf5b5 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
+# $Id: manhtml.aliases,v 1.41 2024/06/22 23:03:10 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -35,6 +35,7 @@ attr_get(3X)		curs_attr(3X)
 attr_on(3X)		curs_attr(3X)
 attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
+beep(3X)		curs_beep(3X)
 bkgd(3X)		curs_bkgd(3X)
 bkgrnd(3X)		curs_bkgrnd(3X)
 cbreak(3X)		curs_inopts(3X)
@@ -68,7 +69,9 @@ in_wch(3X)		curs_in_wch(3X)
 inch(3X)		curs_inch(3X)
 infocmp(1)		infocmp(1M)
 initscr(3X)		curs_initscr(3X)
+is_cbreak(3X)		curs_inopts(3X)
 is_scrollok(3X)		curs_opaque(3X)
+killchar(3X)		curs_termattrs(3X)
 keyname(3X)		curs_util(3X)
 keypad(3X)		curs_inopts(3X)
 longname(3X)		curs_termattrs(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 1cf3af64c..0db34210c 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.27 2024/06/15 20:24:43 tom Exp $
+# $Id: manhtml.externs,v 1.28 2024/06/22 22:20:56 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -72,6 +72,7 @@ sscanf(3)
 stdio(3)
 stty(1)
 swprintf(3)
+sysconf(3)
 system(3)
 termios(3)
 tmux(1)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index b784cc071..b41af1007 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp $
-.TH ncurses 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp $
+.TH ncurses 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -121,8 +121,8 @@ API should be aware,
 such as limitations on the size of an underlying integral type or the
 availability of a preprocessor macro exclusive of a function definition
 (which prevents its address from being taken).
-This section also describes implementation details that will be
-significant to the programmer but which are not standardized.
+This section also describes implementation details
+of significance to the programmer but which are not standardized.
 .bP
 \*(``EXTENSIONS\*('' presents
 .I \%ncurses
@@ -170,13 +170,12 @@ and
 respectively.)
 The
 .I \%ncurses_g
-library generates trace logs
-(in a file called
-.I \%trace
-in the current directory)
-that describe
+library logs events describing
 .I \%ncurses
-actions.
+actions
+to a file called
+.I \%trace
+in the current directory.
 See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
 .SS "Application Structure"
 A
@@ -229,10 +228,27 @@ Call \fB\%endwin\fP(3X) before exiting.
 .SS Overview
 A
 .I curses
-library abstracts the terminal screen by representing all or part of it
-as a
+library abstracts the terminal with a
+.I \%SCREEN
+data structure,
+and represents all or part of its display
+with
 .I \%WINDOW
-data structure.
+structures.
+Distinct properties apply to each;
+for example,
+the
+.I "line discipline"
+of a typical Unix terminal driver
+is in one of three modes:
+raw,
+\%cbreak,
+or normal (\*(``cooked\*('').
+In
+.IR curses ","
+the line discipline is a property of the screen,
+applying identically to all windows associated with it.
+.PP
 A
 .I window
 is a rectangular grid of character cells,
@@ -1933,9 +1949,12 @@ See \fB\%default_colors\fP(3X).
 An
 .I \%ncurses
 application can eschew knowledge of
+.I \%SCREEN
+and
 .I \%WINDOW
 structure internals,
 instead using accessor functions such as
+\fB\%is_cbreak\fP(3X) and
 \fB\%is_scrollok\fP(3X).
 .PP
 .I \%ncurses
@@ -2002,7 +2021,9 @@ such as wide-character and color support.
 .I \%ncurses
 intends base-level conformance with X/Open Curses,
 and supports all features of its enhanced level
-except the \fB\%untic\fP utility.
+except the
+.I \%untic
+utility.
 .PP
 Differences between X/Open Curses and
 .I \%ncurses
diff --git a/man/tabs.1 b/man/tabs.1
index 059bc1ec6..116860399 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp $
-.TH @TABS@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp $
+.TH @TABS@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -341,9 +341,9 @@ without settling on an improved solution.
 It claims that
 .PP
 .RS 4
-\*(``no known historical version of
+no known historical version of
 .I tabs
-supports the capability of setting arbitrary tab stops.\*(''
+supports the capability of setting arbitrary tab stops.
 .RE
 .PP
 The feature described in subsection \*(``Explicit Lists\*('' above was
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 74a274152..7f4001177 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.151 2024/06/22 21:25:23 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -2076,7 +2076,7 @@ Solaris,
 and \fI\%ncurses\fP support all SVr4 capabilities.
 .bP
 IRIX supports the SVr4 set and adds one undocumented extended string
-capability (\fB\%set_pglen\fP).
+capability \%(\fBset_pglen\fP).
 .bP
 SVr1 and Ultrix support a restricted subset of \fI\%terminfo\fP
 capabilities.
diff --git a/man/tput.1 b/man/tput.1
index ad9309621..60aeb72db 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp $
-.TH @TPUT@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp $
+.TH @TPUT@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -885,8 +885,13 @@ As of
 the \*(``reset\*('' features of the two programs are (mostly) the same.
 Two minor differences remain.
 .bP
-The \fB\%@TSET@\fP program waits one second when resetting,
-in case the terminal happens to be a hardware device.
+When issuing a reset,
+the \fB\%@TSET@\fP program
+checks whether the device appears to be a pseudoterminal
+(as might be used by a terminal emulator program),
+and,
+if it does not,
+waits one second in case it is communicating with a hardware terminal.
 .bP
 The two programs write the terminal initialization strings
 to different streams;
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 89a5cd4a3..3affeefcc 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.57 2024/06/22 21:02:53 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -92,7 +92,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index c9f1cf809..b17f68428 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $
+# $Id: ncurses-config.in,v 1.53 2024/06/22 20:52:02 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -107,7 +107,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
@@ -186,16 +186,57 @@ while [ $# -gt 0 ]; do
 		;;
 	# compile/link
 	--cflags)
-		INCS="@PKG_CFLAGS@"
-		if [ "x@WITH_OVERWRITE@" = xno ]; then
-			INCS="$INCS -I${includesubdir}"
-		fi
-		if [ "${includedir}" != /usr/include ]; then
-			INCS="$INCS -I${includedir}"
-		fi
-		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-			$INCS
-ENDECHO
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				OPTS="$OPTS $opt"
+				;;
+			x-Wl,*)
+				OPTS="$OPTS $opt"
+				;;
+			x-[OW]*)
+				;;
+			*)
+				OPTS="$OPTS $opt"
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-I)
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				OPTS="$OPTS $opt"
+				;;
+			*)
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-other)
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				;;
+			x-Wl,*)
+				OPTS="$OPTS $opt"
+				;;
+			x-[OW]*)
+				;;
+			*)
+				OPTS="$OPTS $opt"
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
 		;;
 	--libs)
 		OPTS=
@@ -294,30 +335,32 @@ ENDECHO
 Usage: `basename "$0"` [options]
 
 Options:
-  --prefix           echos the package-prefix of ${THIS}
-  --exec-prefix      echos the executable-prefix of ${THIS}
+  --prefix            echos the package-prefix of ${THIS}
+  --exec-prefix       echos the executable-prefix of ${THIS}
 
-  --cflags           echos the C compiler flags needed to compile with ${THIS}
-  --libs             echos the libraries needed to link with ${THIS}
+  --cflags            echos the C compiler flags needed to compile for ${THIS}
+  --cflags-only-I     echos only -I C compiler flags needed with ${THIS}
+  --cflags-only-other echos only C compiler flags other than -I for ${THIS}
+  --libs              echos the libraries needed to link with ${THIS}
 
-  --libs-only-L      echos -L linker options (search path) for ${THIS}
-  --libs-only-l      echos -l linker options (libraries) for ${THIS}
-  --libs-only-other  echos linker options other than -L/-l
+  --libs-only-L       echos -L linker options (search path) for ${THIS}
+  --libs-only-l       echos -l linker options (libraries) for ${THIS}
+  --libs-only-other   echos linker options other than -L/-l
 
-  --version          echos the release+patchdate version of ${THIS}
-  --abi-version      echos the ABI version of ${THIS}
-  --mouse-version    echos the mouse-interface version of ${THIS}
+  --version           echos the release+patchdate version of ${THIS}
+  --abi-version       echos the ABI version of ${THIS}
+  --mouse-version     echos the mouse-interface version of ${THIS}
 
-  --bindir           echos the directory containing ${THIS} programs
-  --datadir          echos the directory containing ${THIS} data
-  --includedir       echos the directory containing ${THIS} header files
-  --libdir           echos the directory containing ${THIS} libraries
-  --mandir           echos the directory containing ${THIS} manpages
-  --terminfo         echos the \$TERMINFO terminfo database path
-  --terminfo-dirs    echos the \$TERMINFO_DIRS directory list
-  --termpath         echos the \$TERMPATH termcap list
+  --bindir            echos the directory containing ${THIS} programs
+  --datadir           echos the directory containing ${THIS} data
+  --includedir        echos the directory containing ${THIS} header files
+  --libdir            echos the directory containing ${THIS} libraries
+  --mandir            echos the directory containing ${THIS} manpages
+  --terminfo          echos the \$TERMINFO terminfo database path
+  --terminfo-dirs     echos the \$TERMINFO_DIRS directory list
+  --termpath          echos the \$TERMPATH termcap list
 
-  --help             prints this message
+  --help              prints this message
 ENDHELP
 		;;
 	--error|*)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b43c082ae..56090ae80 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 76fbf06de..aada76419 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -83,6 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-config-suffix=td \
 		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b43c082ae..56090ae80 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index b39fec67e..29c80b417 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -83,6 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-config-suffix=td \
 		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
diff --git a/package/debian/changelog b/package/debian/changelog
index e7c01705e..82f595736 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7a17c6dc8..7717e0aa2 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.653 2024/06/15 09:33:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.654 2024/06/21 22:24:47 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0615"
+!define VERSION_MMDD  "0622"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 645e02e2d..ff423fd82 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 36ea54cc3..15880da95 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6cfbf90db..7a4dfa953 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/gdc.6 b/test/gdc.6
index 3a0026443..700687e63 100644
--- a/test/gdc.6
+++ b/test/gdc.6
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: gdc.6,v 1.9 2024/06/15 15:16:34 tom Exp $
+.\" $Id: gdc.6,v 1.10 2024/06/22 21:31:03 tom Exp $
 .TH GDC 6 2024-06-15 ncurses-examples Games
 .ie \n(.g \{\
 .ds `` \(lq
@@ -41,42 +41,66 @@
 .\}
 .SH NAME
 gdc \-
-grand digital clock (curses)
+grand digital clock using
+.I curses
 .SH SYNOPSIS
-.B gdc \fP[\fIoptions\fP] [\fIn\fP]
+.B gdc
+.RB [ \-dns ]
+.RB [ \-t
+.IB hh : mm : ss\c
+]
+.RI [ count ]
 .SH DESCRIPTION
-.I Gdc
-runs a digital clock made of reverse-video blanks on a terminal screen.
-If the terminal supports color,
-the clock is drawn in red.
-You can make the clock stop, pause, or resume by pressing a \*(``q\*('',
-\*(``s\*('' or space, respectively.
+.I gdc
+uses
+.I curses
+to display a clock on the terminal.
+It constructs the digits from reverse-video blank characters.
+If the terminal type supports color,
+the digits are drawn in red.
+Make the clock stop,
+pause,
+or resume by typing \*(``q\*('',
+\*(``s\*('',
+or space,
+respectively.
+.PP
+Given a numeric operand,
+the clock
+stops after
+.I count
+seconds.
+Normally,
+.I gdc
+runs \*(``forever\*(''
+(at least 2 billion seconds).
 .SH OPTIONS
 .TP
 .B \-d
-use terminal's default colors for the background.
+uses the terminal's default background color.
 .TP
 .B \-n
-redirects input to /dev/null,
-making it ignore the stop/pause commands.
-You can still stop it by pressing the interrupt key.
+reads input from
+.IR \%/dev/null ,
+making
+.I gdc
+ignore the stop and pause commands.
+You can still stop it with a terminal interrupt.
 .TP
 .B \-s
-makes digits scroll as they change.
+scrolls the digits up as they change.
 When running on a fast display,
-the program breaks up the scrolling into subsecond repaints,
+the program breaks up the scrolling into sub-second redraws,
 making the operation appear smooth.
 .TP
-.B \-t \fIhh:mm:ss\fP
-specify starting time (default is \*(``now\*('').
-.PP
-With an optional numeric argument
-.I num
-it stops after
-.I num
-seconds.
-Normally it runs \*(``forever\*('' (counting down from 2 billion seconds).
+.BR \-t \ \c
+.IB hh : mm : ss
+uses the specified time instead of the current time.
 .SH AUTHORS
-Amos Shapir, modified for curses by John Lupien.
-.br
-Improvements for ncurses by Thomas Dickey.
+Amos Shapir,
+John Lupien
+(modifications for
+.IR curses ),
+Thomas Dickey
+(improvements for
+.IR \%ncurses )
diff --git a/test/gdc.c b/test/gdc.c
index 7243c104b..975b20fdf 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $
+ * $Id: gdc.c,v 1.58 2024/06/22 22:27:52 tom Exp $
  */
 
 #include <test.priv.h>
@@ -60,6 +60,7 @@ static long older[6], next[6], newer[6], mask;
 static int sigtermed = 0;
 static bool redirected = FALSE;
 static bool hascolor = FALSE;
+static bool hascustomtime = FALSE;
 
 static void
 sighndl(int signo)
@@ -154,18 +155,19 @@ usage(int ok)
 {
     static const char *msg[] =
     {
-	"Usage: gdc [options] [count]"
+	"usage: gdc [-dns] -[t HH:MM:SS] [COUNT]"
+	,""
+	,"Display a digital clock, running indefinitely or for COUNT"
+	" seconds."
 	,""
 	,USAGE_COMMON
 	,"Options:"
 #if HAVE_USE_DEFAULT_COLORS
-	," -d       invoke use_default_colors"
+	," -d           uses the terminal's default background color"
 #endif
-	," -n       redirect input to /dev/null"
-	," -s       scroll each number into place, rather than flipping"
-	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
-	,""
-	,"If you specify a count, gdc runs for that number of seconds"
+	," -n           reads input from /dev/null"
+	," -s           scrolls each digit into place"
+	," -t HH:MM:SS  starts clock at specified time"
     };
     unsigned j;
     for (j = 0; j < SIZEOF(msg); j++)
@@ -247,6 +249,7 @@ main(int argc, char *argv[])
 	    smooth = TRUE;
 	    break;
 	case 't':
+	    hascustomtime = TRUE;
 	    starts = parse_time(optarg);
 	    break;
 	case OPTS_VERSION:
@@ -399,14 +402,16 @@ main(int argc, char *argv[])
 	    }
 	}
 
-	/* this depends on the detailed format of ctime(3) */
-	_nc_STRNCPY(buf, ctime(&now), (size_t) 30);
-	{
-	    char *d2 = buf + 10;
-	    char *s2 = buf + 19;
-	    while ((*d2++ = *s2++) != '\0') ;
+	if (!hascustomtime) {
+	    /* this depends on the detailed format of ctime(3) */
+	    _nc_STRNCPY(buf, ctime(&now), (size_t) 30);
+	    {
+		char *d2 = buf + 10;
+		char *s2 = buf + 19;
+		while ((*d2++ = *s2++) != '\0') ;
+	    }
+	    MvAddStr(16, 30, buf);
 	}
-	MvAddStr(16, 30, buf);
 
 	move(6, 0);
 	drawbox(FALSE);

From 76b566274859c2860ee00c539458c7b6c37d78f5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 30 Jun 2024 02:08:16 +0200
Subject: [PATCH 074/106] ncurses-6.5-20240629.patch.gz

---
 NEWS                             | 12 +++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +--
 ncurses/base/lib_delwin.c        | 21 +++++++-------
 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/chgat.c                     |  7 +++--
 test/demo_new_pair.c             | 17 ++++++++---
 test/dup_field.c                 |  6 ++--
 test/edit_field.c                |  6 ++--
 test/gdc.c                       | 48 ++++++++++++++++++++++++--------
 test/move_field.c                |  6 ++--
 test/popup_msg.c                 |  7 +++--
 test/programs                    |  8 +++---
 test/test_instr.c                | 38 ++++++++++++++++++++++---
 test/test_inwstr.c               | 39 +++++++++++++++++++++++---
 21 files changed, 175 insertions(+), 68 deletions(-)

diff --git a/NEWS b/NEWS
index 29088a351..27faffc21 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4143 2024/06/22 22:59:44 tom Exp $
+-- $Id: NEWS,v 1.4145 2024/06/29 19:31:28 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240629
+	+ build-fix for ncurses-examples with newer PDCurses, which no longer
+	  has stubs for unimplemented features.
+	+ add help-popup for test_instr.c, test_inwstr.c
+	+ modify checks in delwin to avoid checking if the window is a pad
+	  until first checking if it is still on the active window-list
+	  (cf: 20211115).
+	+ improve -t option of test/gdc.c, allowing hours only, or hours and
+	  minutes only.
+
 20240622
 	+ improve test/gdc.c (patch by Branden Robinson).
 	+ improve formatting/style of manpages (patches by Branden Robinson).
diff --git a/VERSION b/VERSION
index e80d9211d..e1507dd77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240622
+5:0:10	6.5	20240629
diff --git a/dist.mk b/dist.mk
index 52933dc5c..e7b3e49cb 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1619 2024/06/22 09:24:38 tom Exp $
+# $Id: dist.mk,v 1.1620 2024/06/29 10:00:32 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240622
+NCURSES_PATCH = 20240629
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index c96e417a9..56cd4f75c 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -43,30 +43,31 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.25 2023/10/21 11:12:44 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.26 2024/06/29 16:51:40 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
 {
     bool result = TRUE;
+    bool found = FALSE;
+    SCREEN *scan;
+    WINDOWLIST *p;
 
-    if (IS_PAD(win)) {
-	result = FALSE;
-    } else {
-	WINDOWLIST *p;
-#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST)
-	SCREEN *sp = _nc_screen_of(win);
-#endif
-
-	for (each_window(SP_PARM, p)) {
+    for (each_screen(scan)) {
+	for (each_window(scan, p)) {
 	    if (&(p->win) == win) {
 		result = FALSE;
+		found = TRUE;
+		break;
 	    } else if (IS_SUBWIN(&(p->win))
 		       && p->win._parent == win) {
 		result = TRUE;
+		found = TRUE;
 		break;
 	    }
 	}
+	if (found)
+	    break;
     }
     return result;
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 56090ae80..7891ef0e5 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240622) unstable; urgency=low
+ncurses6td (6.5+20240629) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 56090ae80..7891ef0e5 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240622) unstable; urgency=low
+ncurses6td (6.5+20240629) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 82f595736..d1405115e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240622) unstable; urgency=low
+ncurses6td (6.5+20240629) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 21 Jun 2024 18:24:47 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7717e0aa2..150d7fec7 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.654 2024/06/21 22:24:47 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.655 2024/06/29 10:00:32 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0622"
+!define VERSION_MMDD  "0629"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ff423fd82..9d7c279d4 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240622
+Release: 20240629
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 15880da95..125e860b2 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240622
+Release: 20240629
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7a4dfa953..a23dd0800 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240622
+Release: 20240629
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/chgat.c b/test/chgat.c
index 2c2b53912..ab91b8aec 100644
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,16 +27,17 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $
+ * $Id: chgat.c,v 1.21 2024/06/29 17:45:32 tom Exp $
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
 
 #include <test.priv.h>
-#include <popup_msg.h>
 
 #if HAVE_CHGAT
 
+#include <popup_msg.h>
+
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 #define COLOR_DEFAULT (-1)
 
diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c
index bc41d44de..ed095d9cf 100644
--- a/test/demo_new_pair.c
+++ b/test/demo_new_pair.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_new_pair.c,v 1.27 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_new_pair.c,v 1.28 2024/06/29 19:30:26 tom Exp $
  *
  * Demonstrate the alloc_pair() function.
  */
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <popup_msg.h>
 
+#if HAVE_TIGETSTR
 #if HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT
 
 #include <sys/types.h>
@@ -391,11 +392,19 @@ main(int argc, char *argv[])
     ExitProgram(EXIT_SUCCESS);
 }
 
-#else
+#else /* !(HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT) */
 int
 main(void)
 {
     printf("This program requires the ncurses alloc_pair function\n");
     ExitProgram(EXIT_FAILURE);
 }
-#endif
+#endif /* HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT */
+#else /* !HAVE_TIGETSTR */
+int
+main(void)
+{
+    printf("This program requires the terminfo functions such as tigetstr\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif /* HAVE_TIGETSTR */
diff --git a/test/dup_field.c b/test/dup_field.c
index 68198ed75..163dad677 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: dup_field.c,v 1.8 2023/11/11 00:29:10 tom Exp $
+ * $Id: dup_field.c,v 1.9 2024/06/29 17:45:32 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -62,7 +62,7 @@ static struct {
     { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
     { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
     { CTRL('['),     MY_QUIT,         "exit form" },
-    { KEY_F(1),      MY_HELP,         "show this screen", },
+    { HELP_KEY_2,    MY_HELP,         "show this screen", },
     { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
     { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
     { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
diff --git a/test/edit_field.c b/test/edit_field.c
index b2b208459..e62a51fd3 100644
--- a/test/edit_field.c
+++ b/test/edit_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: edit_field.c,v 1.31 2020/02/02 23:34:34 tom Exp $
+ * $Id: edit_field.c,v 1.32 2024/06/29 17:49:56 tom Exp $
  *
  * A wrapper for form_driver() which keeps track of the user's editing changes
  * for each field, and makes the resulting length available as a
@@ -131,7 +131,7 @@ static struct {
 	CTRL(']'), MY_INS_MODE, "toggle REQ_INS_MODE/REQ_OVL_MODE",
     },
     {
-	KEY_F(1), MY_HELP, "show this screen",
+	HELP_KEY_2, MY_HELP, "show this screen",
     },
     {
 	KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character"
diff --git a/test/gdc.c b/test/gdc.c
index 975b20fdf..44bcaa7cc 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.58 2024/06/22 22:27:52 tom Exp $
+ * $Id: gdc.c,v 1.60 2024/06/29 19:59:06 tom Exp $
  */
 
 #include <test.priv.h>
@@ -150,24 +150,23 @@ set(int t, int n)
 	mask |= m;
 }
 
-static void
+static GCC_NORETURN void
 usage(int ok)
 {
     static const char *msg[] =
     {
 	"usage: gdc [-dns] -[t HH:MM:SS] [COUNT]"
 	,""
-	,"Display a digital clock, running indefinitely or for COUNT"
-	" seconds."
+	,"Display a digital clock, running indefinitely or for COUNT seconds."
 	,""
 	,USAGE_COMMON
 	,"Options:"
 #if HAVE_USE_DEFAULT_COLORS
-	," -d           uses the terminal's default background color"
+	," -d       uses the terminal's default background color"
 #endif
-	," -n           reads input from /dev/null"
-	," -s           scrolls each digit into place"
-	," -t HH:MM:SS  starts clock at specified time"
+	," -n       reads input from /dev/null"
+	," -s       scrolls each digit into place"
+	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
     };
     unsigned j;
     for (j = 0; j < SIZEOF(msg); j++)
@@ -181,13 +180,38 @@ parse_time(const char *value)
     int hh, mm, ss;
     int check;
     time_t result;
-    char c;
+    char c = 0;
     struct tm *tm;
 
-    if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) {
-	if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) {
-	    usage(FALSE);
+    switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) {
+    default:
+	usage(FALSE);
+	/* NOTREACHED */
+    case 1:
+	if (strspn(value, "0123456789") >= 2) {
+	    switch (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c)) {
+	    default:
+		usage(FALSE);
+		/* NOTREACHED */
+	    case 1:
+		mm = 0;
+		/* FALLTHRU */
+	    case 2:
+		ss = 0;
+		/* FALLTHRU */
+	    case 3:
+		break;
+	    }
+	    break;
+	} else {
+	    mm = 0;
 	}
+	/* FALLTHRU */
+    case 2:
+	ss = 0;
+	/* FALLTHRU */
+    case 3:
+	break;
     }
 
     if ((hh < 0) || (hh >= 24) ||
diff --git a/test/move_field.c b/test/move_field.c
index 84bac3f4b..4b6e28d33 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: move_field.c,v 1.15 2023/11/11 00:28:19 tom Exp $
+ * $Id: move_field.c,v 1.16 2024/06/29 17:45:02 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -62,7 +62,7 @@ static struct {
     { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
     { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
     { CTRL('['),     MY_QUIT,         "exit form" },
-    { KEY_F(1),      MY_HELP,         "show this screen", },
+    { HELP_KEY_2,    MY_HELP,         "show this screen", },
     { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
     { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
     { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
diff --git a/test/popup_msg.c b/test/popup_msg.c
index 09eff5e39..7a260dd70 100644
--- a/test/popup_msg.c
+++ b/test/popup_msg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: popup_msg.c,v 1.11 2021/12/18 21:19:19 tom Exp $
+ * $Id: popup_msg.c,v 1.12 2024/06/29 18:34:58 tom Exp $
  *
  * Show a multi-line message in a window which may extend beyond the screen.
  *
@@ -83,7 +83,7 @@ popup_msg(WINDOW *parent, const char *const *msg)
 	if (width < check)
 	    width = check;
     }
-    length = n;
+    length = n + 2;
 
     if ((help = newwin(high, wide, y0, x0)) == 0)
 	return;
@@ -96,6 +96,7 @@ popup_msg(WINDOW *parent, const char *const *msg)
 
     keypad(data, TRUE);
 
+    waddstr(data, "Press ^[ or ^Q to exit this window.\n\n");
     for (n = 0; n < length; ++n) {
 	waddstr(data, msg[n]);
 	if ((n + 1) < length) {
diff --git a/test/programs b/test/programs
index 16ecf8103..3f784d30e 100644
--- a/test/programs
+++ b/test/programs
@@ -1,6 +1,6 @@
-# $Id: programs,v 1.57 2023/11/10 11:48:38 tom Exp $
+# $Id: programs,v 1.58 2024/06/29 18:49:58 tom Exp $
 ##############################################################################
-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -100,8 +100,8 @@ test_delwin	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_delwin
 test_endwin	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_endwin
 test_get_wstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_get_wstr popup_msg
 test_getstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_getstr popup_msg
-test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr
-test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr
+test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr popup_msg
+test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr popup_msg
 test_mouse	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_mouse
 test_opaque	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_opaque
 test_setupterm	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_setupterm
diff --git a/test/test_instr.c b/test/test_instr.c
index c87bdd707..677b3d40c 100644
--- a/test/test_instr.c
+++ b/test/test_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $
+ * $Id: test_instr.c,v 1.13 2024/06/29 18:42:53 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -44,6 +44,7 @@
  */
 
 #include <test.priv.h>
+#include <popup_msg.h>
 
 #define BASE_Y 6
 #define MAX_COLS 1024
@@ -68,6 +69,26 @@ showmore(WINDOW *win, int line, char *buffer)
     show_1st(win, line, buffer);
 }
 
+static void
+show_help(WINDOW *win)
+{
+    static const char *msgs[] =
+    {
+	"Show file contents and a viewport from the variants of winstr."
+	,"Use h/j/k/l or arrow keys to move the viewport."
+	,""
+	,"Other commands:"
+	,"+     increases the buffer-size used."
+	,"-     decreases the buffer-size used."
+	,"w     opens new window on the next filename."
+	,"q     quits the current file/window."
+	,"?     shows this help-window"
+	,0
+    };
+
+    popup_msg(win, msgs);
+}
+
 static int
 recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
@@ -169,8 +190,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    }
 	    break;
 	case '+':
-	    ++limit;
+	    if (limit + 2 < MAX_COLS) {
+		++limit;
+	    } else {
+		beep();
+	    }
 	    break;
+	case HELP_KEY_1:
+	    show_help(txtwin);
+	    continue;
 	default:
 	    beep();
 	    break;
@@ -273,8 +301,10 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    if (optind + 1 > argc)
+    if (optind + 1 > argc) {
+	fprintf(stderr, "At least one text-file is needed\n");
 	usage(FALSE);
+    }
 
     initscr();
 
diff --git a/test/test_inwstr.c b/test/test_inwstr.c
index c22add7b8..0196f5bb7 100644
--- a/test/test_inwstr.c
+++ b/test/test_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $
+ * $Id: test_inwstr.c,v 1.9 2024/06/29 18:40:02 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -47,6 +47,8 @@
 
 #if USE_WIDEC_SUPPORT
 
+#include <popup_msg.h>
+
 #define BASE_Y 6
 #define MAX_COLS 1024
 
@@ -70,6 +72,26 @@ showmore(WINDOW *win, int line, wchar_t *buffer)
     show_1st(win, line, buffer);
 }
 
+static void
+show_help(WINDOW *win)
+{
+    static const char *msgs[] =
+    {
+	"Show file contents and a viewport from the variants of winwstr."
+	,"Use h/j/k/l or arrow keys to move the viewport."
+	,""
+	,"Other commands:"
+	,"+     increases the buffer-size used."
+	,"-     decreases the buffer-size used."
+	,"w     opens new window on the next filename."
+	,"q     quits the current file/window."
+	,"?     shows this help-window"
+	,0
+    };
+
+    popup_msg(win, msgs);
+}
+
 static int
 recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
@@ -169,8 +191,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    }
 	    break;
 	case '+':
-	    ++limit;
+	    if (limit + 2 < MAX_COLS) {
+		++limit;
+	    } else {
+		beep();
+	    }
 	    break;
+	case HELP_KEY_1:
+	    show_help(txtwin);
+	    continue;
 	default:
 	    beep();
 	    break;
@@ -273,8 +302,10 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    if (optind + 1 > argc)
+    if (optind + 1 > argc) {
+	fprintf(stderr, "At least one text-file is needed\n");
 	usage(FALSE);
+    }
 
     initscr();
 

From 7b488dc08a5813e2d99d3640f34f99223739982f Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 7 Jul 2024 01:21:31 +0200
Subject: [PATCH 075/106] ncurses-6.5-20240706.patch.gz

---
 Ada95/aclocal.m4                 |    8 +-
 Ada95/configure                  | 2972 ++++++++---------
 NEWS                             |    7 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   22 +-
 configure                        | 5133 +++++++++++++++---------------
 dist.mk                          |    4 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    2 +-
 package/ncursest.spec            |    2 +-
 test/aclocal.m4                  |   20 +-
 test/configure                   | 3917 +++++++++++------------
 16 files changed, 6071 insertions(+), 6036 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index b6d9f27c3..b56cd182e 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.216 2024/06/01 21:38:29 tom Exp $
+dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -477,7 +477,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
+dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -577,9 +577,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
+	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
+	: ${BUILD_LIBS:='${LIBS}'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
diff --git a/Ada95/configure b/Ada95/configure
index 9c86c4ea6..0cea3b0f7 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.93 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20231210.
+# Generated by Autoconf 2.52.20240618.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -481,6 +481,10 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
+  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
+    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
+    ;;
+
   -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
@@ -824,7 +828,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
+generated by GNU Autoconf 2.52.20240618.  Invocation command line was
 
   $ $0 $@
 
@@ -948,7 +952,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:951: loading site script $ac_site_file" >&5
+    { echo "$as_me:955: 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"
@@ -959,7 +963,7 @@ if test -r "$cache_file"; then
   # 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:962: loading cache $cache_file" >&5
+    { echo "$as_me:966: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -967,7 +971,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:970: creating cache $cache_file" >&5
+  { echo "$as_me:974: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -983,21 +987,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:986: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:990: 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:990: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:994: 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:996: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1000: 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:998:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1002:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1000:   current value: $ac_new_val" >&5
+        { echo "$as_me:1004:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1016,9 +1020,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1019: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1023: 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:1021: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1025: 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
@@ -1047,10 +1051,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1053: \$? = $ac_status" >&5
+  echo "$as_me:1057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1082,7 +1086,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1085: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1089: 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
@@ -1092,11 +1096,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1099: checking build system type" >&5
+echo "$as_me:1103: 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
@@ -1105,23 +1109,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1108: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1112: 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:1112: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1116: 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:1117: result: $ac_cv_build" >&5
+echo "$as_me:1121: 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:1124: checking host system type" >&5
+echo "$as_me:1128: 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
@@ -1130,12 +1134,12 @@ else
 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:1133: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1137: 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:1138: result: $ac_cv_host" >&5
+echo "$as_me:1142: 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/'`
@@ -1143,7 +1147,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1146: checking target system type" >&5
+	echo "$as_me:1150: 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
@@ -1152,12 +1156,12 @@ else
 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:1155: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1159: 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:1160: result: $ac_cv_target" >&5
+echo "$as_me:1164: 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/'`
@@ -1189,13 +1193,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1192: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1196: 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:1196: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1200: 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:1198: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1202: 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
@@ -1203,7 +1207,7 @@ fi
 # 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:1206: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1210: 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
@@ -1218,7 +1222,7 @@ for ac_prog in ggrep grep
 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:1221: checking for $ac_word" >&5
+echo "$as_me:1225: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1233,7 +1237,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1236: found $ac_dir/$ac_word" >&5
+echo "$as_me:1240: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1241,10 +1245,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1244: result: $GREP" >&5
+  echo "$as_me:1248: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1247: result: no" >&5
+  echo "$as_me:1251: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1252,7 +1256,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1255: checking for fgrep" >&5
+echo "$as_me:1259: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1264,7 +1268,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1267: checking for $ac_word" >&5
+echo "$as_me:1271: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1281,7 +1285,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1284: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1288: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1292,10 +1296,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1295: result: $FGREP" >&5
+  echo "$as_me:1299: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1298: result: no" >&5
+  echo "$as_me:1302: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1303,16 +1307,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1315: checking for prefix" >&5
+echo "$as_me:1319: 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
@@ -1324,11 +1328,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1327: result: $prefix" >&5
+echo "$as_me:1331: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1331: checking for default include-directory" >&5
+echo "$as_me:1335: 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 \
@@ -1351,7 +1355,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1354: result: $includedir" >&5
+echo "$as_me:1358: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1378,7 +1382,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:1381: checking for $ac_word" >&5
+echo "$as_me:1385: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1395,7 +1399,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:1398: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1402: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1407,10 +1411,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:1410: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:1413: result: no" >&5
+  echo "$as_me:1417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1420,7 +1424,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:1423: checking for $cf_prog_gnat version" >&5
+echo "$as_me:1427: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1431,7 +1435,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1434: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1438: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -1460,7 +1464,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:1463: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:1467: 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
@@ -1479,10 +1483,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:1482: result: $cf_gprconfig_value" >&5
+					echo "$as_me:1486: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:1485: result: missing" >&5
+					echo "$as_me:1489: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -1495,7 +1499,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:1498: checking for gnat version" >&5
+echo "$as_me:1502: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1506,7 +1510,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1509: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1513: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -1515,7 +1519,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:1518: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:1522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -1523,7 +1527,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:1526: checking for $ac_word" >&5
+echo "$as_me:1530: 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
@@ -1538,7 +1542,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:1541: found $ac_dir/$ac_word" >&5
+echo "$as_me:1545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1547,20 +1551,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:1550: result: $M4_exists" >&5
+  echo "$as_me:1554: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:1553: result: no" >&5
+  echo "$as_me:1557: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:1559: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:1563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:1563: checking if GNAT works" >&5
+			echo "$as_me:1567: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -1588,7 +1592,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -1604,7 +1608,7 @@ fi
 		# Here is a workaround.
 		# Extract the first word of "gnatgcc", so it can be a program name with args.
 set dummy gnatgcc; ac_word=$2
-echo "$as_me:1607: checking for $ac_word" >&5
+echo "$as_me:1611: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1621,7 +1625,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
-   echo "$as_me:1624: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1628: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1633,16 +1637,16 @@ fi
 cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
 
 if test -n "$cf_cv_path_gnatgcc"; then
-  echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5
+  echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-  echo "$as_me:1639: result: no" >&5
+  echo "$as_me:1643: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			echo "$as_me:1645: checking for improvement" >&5
+			echo "$as_me:1649: checking for improvement" >&5
 echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
@@ -1653,7 +1657,7 @@ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 				cf_cv_path_gnatgcc=no
 				;;
 			esac
-			echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5
+			echo "$as_me:1660: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
@@ -1678,7 +1682,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1681: checking for $ac_word" >&5
+echo "$as_me:1685: 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
@@ -1693,7 +1697,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1696: found $ac_dir/$ac_word" >&5
+echo "$as_me:1700: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1701,10 +1705,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1704: result: $CC" >&5
+  echo "$as_me:1708: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1707: result: no" >&5
+  echo "$as_me:1711: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1717,7 +1721,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1720: checking for $ac_word" >&5
+echo "$as_me:1724: 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
@@ -1732,7 +1736,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1735: found $ac_dir/$ac_word" >&5
+echo "$as_me:1739: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1740,10 +1744,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1743: result: $ac_ct_CC" >&5
+  echo "$as_me:1747: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1746: result: no" >&5
+  echo "$as_me:1750: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1753,32 +1757,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1756: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1760: 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:1761:" \
+echo "$as_me:1765:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1764: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1768: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1767: \$? = $ac_status" >&5
+  echo "$as_me:1771: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1769: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1773: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1772: \$? = $ac_status" >&5
+  echo "$as_me:1776: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1774: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1778: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1777: \$? = $ac_status" >&5
+  echo "$as_me:1781: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1781 "configure"
+#line 1785 "configure"
 #include "confdefs.h"
 
 int
@@ -1794,13 +1798,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1797: checking for C compiler default output" >&5
+echo "$as_me:1801: 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:1800: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1804: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1803: \$? = $ac_status" >&5
+  echo "$as_me:1807: \$? = $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
@@ -1823,34 +1827,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1826: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1830: 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:1832: result: $ac_file" >&5
+echo "$as_me:1836: 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:1837: checking whether the C compiler works" >&5
+echo "$as_me:1841: 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:1843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1846: \$? = $ac_status" >&5
+  echo "$as_me:1850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1853: error: cannot run C compiled programs.
+	{ { echo "$as_me:1857: 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;}
@@ -1858,24 +1862,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1861: result: yes" >&5
+echo "$as_me:1865: 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:1868: checking whether we are cross compiling" >&5
+echo "$as_me:1872: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1870: result: $cross_compiling" >&5
+echo "$as_me:1874: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1873: checking for executable suffix" >&5
+echo "$as_me:1877: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1878: \$? = $ac_status" >&5
+  echo "$as_me:1882: \$? = $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
@@ -1891,25 +1895,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1894: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1898: 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:1900: result: $ac_cv_exeext" >&5
+echo "$as_me:1904: 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:1906: checking for object suffix" >&5
+echo "$as_me:1910: 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 1912 "configure"
+#line 1916 "configure"
 #include "confdefs.h"
 
 int
@@ -1921,10 +1925,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1927: \$? = $ac_status" >&5
+  echo "$as_me:1931: \$? = $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
@@ -1936,24 +1940,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1939: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1943: 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:1946: result: $ac_cv_objext" >&5
+echo "$as_me:1950: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1950: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1954: 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 1956 "configure"
+#line 1960 "configure"
 #include "confdefs.h"
 
 int
@@ -1968,16 +1972,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1974: \$? = $ac_status" >&5
+  echo "$as_me:1978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1980: \$? = $ac_status" >&5
+  echo "$as_me:1984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1989,19 +1993,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1992: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1996: 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:1998: checking whether $CC accepts -g" >&5
+echo "$as_me:2002: 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 2004 "configure"
+#line 2008 "configure"
 #include "confdefs.h"
 
 int
@@ -2013,16 +2017,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2019: \$? = $ac_status" >&5
+  echo "$as_me:2023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2025: \$? = $ac_status" >&5
+  echo "$as_me:2029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2032,7 +2036,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2035: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2039: 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
@@ -2059,16 +2063,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2065: \$? = $ac_status" >&5
+  echo "$as_me:2069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2071: \$? = $ac_status" >&5
+  echo "$as_me:2075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2080,7 +2084,7 @@ if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2083 "configure"
+#line 2087 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2093,16 +2097,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2099: \$? = $ac_status" >&5
+  echo "$as_me:2103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2105: \$? = $ac_status" >&5
+  echo "$as_me:2109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2112,7 +2116,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2115 "configure"
+#line 2119 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2124,16 +2128,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2130: \$? = $ac_status" >&5
+  echo "$as_me:2134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2136: \$? = $ac_status" >&5
+  echo "$as_me:2140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2163,11 +2167,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2166: checking version of $CC" >&5
+	echo "$as_me:2170: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2170: result: $GCC_VERSION" >&5
+	echo "$as_me:2174: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2176,12 +2180,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2179: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2183: 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 2184 "configure"
+#line 2188 "configure"
 #include "confdefs.h"
 
 int
@@ -2198,16 +2202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2204: \$? = $ac_status" >&5
+  echo "$as_me:2208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2210: \$? = $ac_status" >&5
+  echo "$as_me:2214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2218,7 +2222,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2221: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2225: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2227,11 +2231,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2230: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2234: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2234 "configure"
+#line 2238 "configure"
 #include "confdefs.h"
 
 int
@@ -2248,16 +2252,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2254: \$? = $ac_status" >&5
+  echo "$as_me:2258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2260: \$? = $ac_status" >&5
+  echo "$as_me:2264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2267,7 +2271,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2270: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2274: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2276,30 +2280,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2279: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2283: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2286: checking version of $CC" >&5
+	echo "$as_me:2290: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2290: result: $CLANG_VERSION" >&5
+	echo "$as_me:2294: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2297: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2301: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2302 "configure"
+#line 2306 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2313,16 +2317,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2319: \$? = $ac_status" >&5
+  echo "$as_me:2323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2325: \$? = $ac_status" >&5
+  echo "$as_me:2329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2333,13 +2337,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2336: result: $cf_clang_optok" >&5
+		echo "$as_me:2340: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2342: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2346: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2348,7 +2352,7 @@ echo "${as_me:-configure}:2342: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2351: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2355: 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
@@ -2356,7 +2360,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2359 "configure"
+#line 2363 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2403,16 +2407,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2409: \$? = $ac_status" >&5
+  echo "$as_me:2413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2415: \$? = $ac_status" >&5
+  echo "$as_me:2419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2429,10 +2433,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2432: result: none needed" >&5
+    echo "$as_me:2436: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2440,13 +2444,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2443: checking \$CFLAGS variable" >&5
+echo "$as_me:2447: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2447: result: broken" >&5
+	echo "$as_me:2451: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2449: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2453: 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=
@@ -2554,18 +2558,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2557: result: ok" >&5
+	echo "$as_me:2561: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2562: checking \$CC variable" >&5
+echo "$as_me:2566: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2566: result: broken" >&5
+	echo "$as_me:2570: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2568: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2572: 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/[ ]*[ ]-[^ ].*//'`
@@ -2682,19 +2686,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2697: result: ok" >&5
+	echo "$as_me:2701: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2702,7 +2706,7 @@ esac
 	;;
 esac
 
-echo "$as_me:2705: checking for egrep" >&5
+echo "$as_me:2709: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2714,7 +2718,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2717: checking for $ac_word" >&5
+echo "$as_me:2721: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2731,7 +2735,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2734: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2738: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2742,10 +2746,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2745: result: $EGREP" >&5
+  echo "$as_me:2749: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2748: result: no" >&5
+  echo "$as_me:2752: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2753,12 +2757,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2768,7 +2772,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2771: checking how to run the C preprocessor" >&5
+echo "$as_me:2775: 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
@@ -2789,18 +2793,18 @@ do
   # 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 2792 "configure"
+#line 2796 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2801: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2803: \$? = $ac_status" >&5
+  echo "$as_me:2807: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2823,17 +2827,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2826 "configure"
+#line 2830 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2836: \$? = $ac_status" >&5
+  echo "$as_me:2840: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2870,7 +2874,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2873: result: $CPP" >&5
+echo "$as_me:2877: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2880,18 +2884,18 @@ do
   # 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 2883 "configure"
+#line 2887 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2894: \$? = $ac_status" >&5
+  echo "$as_me:2898: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2914,17 +2918,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2917 "configure"
+#line 2921 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2927: \$? = $ac_status" >&5
+  echo "$as_me:2931: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2952,7 +2956,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2965,14 +2969,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2968: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2972: 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 2975 "configure"
+#line 2979 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2987,7 +2991,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 2990 "configure"
+#line 2994 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3000,14 +3004,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3003: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3007: 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:3010: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3014: 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
@@ -3022,15 +3026,15 @@ CF_EOF
 # 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:3025: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3028: \$? = $ac_status" >&5
+  echo "$as_me:3032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3033: \$? = $ac_status" >&5
+  echo "$as_me:3037: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3041,10 +3045,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3044: result: yes" >&5
+  echo "$as_me:3048: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3047: result: no" >&5
+  echo "$as_me:3051: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3065,7 +3069,7 @@ for ac_prog in mawk gawk nawk awk
 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:3068: checking for $ac_word" >&5
+echo "$as_me:3072: 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
@@ -3080,7 +3084,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3083: found $ac_dir/$ac_word" >&5
+echo "$as_me:3087: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3088,21 +3092,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3091: result: $AWK" >&5
+  echo "$as_me:3095: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3094: result: no" >&5
+  echo "$as_me:3098: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:3105: checking for egrep" >&5
+echo "$as_me:3109: 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
@@ -3112,11 +3116,11 @@ else
 		else ac_cv_prog_egrep='egrep'
 	fi
 fi
-echo "$as_me:3115: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3119: 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:3119: error: No egrep program found" >&5
+	test -z "$EGREP" && { { echo "$as_me:3123: error: No egrep program found" >&5
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3132,7 +3136,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # 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:3135: checking for a BSD compatible install" >&5
+echo "$as_me:3139: 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
@@ -3181,7 +3185,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3184: result: $INSTALL" >&5
+echo "$as_me:3188: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3192,18 +3196,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:3195: checking whether ln -s works" >&5
+echo "$as_me:3199: 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:3199: result: yes" >&5
+  echo "$as_me:3203: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3202: result: no, using $LN_S" >&5
+  echo "$as_me:3206: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3206: checking if $LN_S -f options work" >&5
+echo "$as_me:3210: 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
@@ -3215,7 +3219,7 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3218: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3222: 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"
@@ -3232,7 +3236,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 # 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:3235: checking for a BSD compatible install" >&5
+echo "$as_me:3239: 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
@@ -3281,7 +3285,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3284: result: $INSTALL" >&5
+echo "$as_me:3288: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3302,7 +3306,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:3305: checking if you want to install stripped executables" >&5
+echo "$as_me:3309: 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.
@@ -3319,7 +3323,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:3322: result: $enable_stripping" >&5
+echo "$as_me:3326: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -3330,7 +3334,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:3333: checking if install accepts -p option" >&5
+echo "$as_me:3337: 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
@@ -3361,10 +3365,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3364: result: $cf_cv_install_p" >&5
+echo "$as_me:3368: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3367: checking if install needs to be told about ownership" >&5
+echo "$as_me:3371: 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)
@@ -3375,7 +3379,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3378: result: $with_install_o" >&5
+echo "$as_me:3382: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3386,7 +3390,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:3389: checking if you want to specify strip-program" >&5
+	echo "$as_me:3393: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3396,11 +3400,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3399: result: $with_strip_program" >&5
+	echo "$as_me:3403: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3403: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3407: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3421,11 +3425,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3424: result: $check_install_strip" >&5
+		echo "$as_me:3428: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3428: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3432: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3440,7 +3444,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3450,7 +3454,7 @@ echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5
 	fi
 fi
 
-echo "$as_me:3453: checking for long file names" >&5
+echo "$as_me:3457: 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
@@ -3489,7 +3493,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3492: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3496: 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
 
@@ -3501,7 +3505,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:3504: checking if you want to use pkg-config" >&5
+echo "$as_me:3508: 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.
@@ -3511,7 +3515,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:3514: result: $cf_pkg_config" >&5
+echo "$as_me:3518: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -3523,7 +3527,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3526: checking for $ac_word" >&5
+echo "$as_me:3530: 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
@@ -3540,7 +3544,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3543: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3547: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3551,10 +3555,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3554: result: $PKG_CONFIG" >&5
+  echo "$as_me:3558: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3557: result: no" >&5
+  echo "$as_me:3561: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3563,7 +3567,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3566: checking for $ac_word" >&5
+echo "$as_me:3570: 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
@@ -3580,7 +3584,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3583: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3587: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3592,10 +3596,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:3598: result: no" >&5
+  echo "$as_me:3602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3638,24 +3642,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:3641: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:3645: 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:3648: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:3652: 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:3654: checking for pkg-config library directory" >&5
+	echo "$as_me:3658: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:3658: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -3682,7 +3686,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:3685: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -3693,16 +3697,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:3696: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:3701: result: auto" >&5
+	echo "$as_me:3705: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:3705: checking for search-list" >&5
+	echo "$as_me:3709: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -3729,11 +3733,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:3732: result: $cf_search_path" >&5
+	echo "$as_me:3736: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:3736: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -3741,7 +3745,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:3744: checking for first directory" >&5
+	echo "$as_me:3748: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -3752,7 +3756,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:3755: result: $cf_pkg_config_path" >&5
+	echo "$as_me:3759: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -3762,7 +3766,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:3765: checking for workaround" >&5
+		echo "$as_me:3769: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -3785,12 +3789,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:3788: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
-echo "$as_me:3793: checking if you want to build test-programs" >&5
+echo "$as_me:3797: 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.
@@ -3800,10 +3804,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3803: result: $cf_with_tests" >&5
+echo "$as_me:3807: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3806: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3810: 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.
@@ -3813,11 +3817,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:3816: result: $enable_mixedcase" >&5
+echo "$as_me:3820: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:3820: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3824: 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
@@ -3844,7 +3848,7 @@ else
 fi
 
 fi
-echo "$as_me:3847: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3862,7 +3866,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3865: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3869: 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
@@ -3882,16 +3886,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3885: result: yes" >&5
+  echo "$as_me:3889: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3889: result: no" >&5
+  echo "$as_me:3893: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:3894: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3898: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3946,7 +3950,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3949: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -3957,7 +3961,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3960: checking for $ac_word" >&5
+echo "$as_me:3964: 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
@@ -3972,7 +3976,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3975: found $ac_dir/$ac_word" >&5
+echo "$as_me:3979: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3980,10 +3984,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3983: result: $CTAGS" >&5
+  echo "$as_me:3987: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3986: result: no" >&5
+  echo "$as_me:3990: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3994,7 +3998,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3997: checking for $ac_word" >&5
+echo "$as_me:4001: 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
@@ -4009,7 +4013,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4012: found $ac_dir/$ac_word" >&5
+echo "$as_me:4016: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4017,10 +4021,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4020: result: $ETAGS" >&5
+  echo "$as_me:4024: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4023: result: no" >&5
+  echo "$as_me:4027: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4029,7 +4033,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4032: checking for $ac_word" >&5
+echo "$as_me:4036: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4044,7 +4048,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4047: found $ac_dir/$ac_word" >&5
+echo "$as_me:4051: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4053,17 +4057,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4059: result: no" >&5
+  echo "$as_me:4063: 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:4066: checking for $ac_word" >&5
+echo "$as_me:4070: 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
@@ -4078,7 +4082,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4081: found $ac_dir/$ac_word" >&5
+echo "$as_me:4085: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4087,10 +4091,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4093: result: no" >&5
+  echo "$as_me:4097: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4110,7 +4114,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4113: checking for makeflags variable" >&5
+echo "$as_me:4117: 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
@@ -4140,7 +4144,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4148,13 +4152,13 @@ echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4151: result: $cf_cv_makeflags" >&5
+echo "$as_me:4155: 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:4157: checking for $ac_word" >&5
+echo "$as_me:4161: 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
@@ -4169,7 +4173,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4172: found $ac_dir/$ac_word" >&5
+echo "$as_me:4176: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4177,10 +4181,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4180: result: $RANLIB" >&5
+  echo "$as_me:4184: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4183: result: no" >&5
+  echo "$as_me:4187: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4189,7 +4193,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4192: checking for $ac_word" >&5
+echo "$as_me:4196: 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
@@ -4204,7 +4208,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4207: found $ac_dir/$ac_word" >&5
+echo "$as_me:4211: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4213,10 +4217,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4216: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4219: result: no" >&5
+  echo "$as_me:4223: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4228,7 +4232,7 @@ fi
 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:4231: checking for $ac_word" >&5
+echo "$as_me:4235: 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
@@ -4243,7 +4247,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4246: found $ac_dir/$ac_word" >&5
+echo "$as_me:4250: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4251,10 +4255,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4254: result: $LD" >&5
+  echo "$as_me:4258: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4257: result: no" >&5
+  echo "$as_me:4261: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4263,7 +4267,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4266: checking for $ac_word" >&5
+echo "$as_me:4270: 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
@@ -4278,7 +4282,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4281: found $ac_dir/$ac_word" >&5
+echo "$as_me:4285: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4287,10 +4291,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4290: result: $ac_ct_LD" >&5
+  echo "$as_me:4294: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4293: result: no" >&5
+  echo "$as_me:4297: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4302,7 +4306,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4305: checking for $ac_word" >&5
+echo "$as_me:4309: 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
@@ -4317,7 +4321,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4320: found $ac_dir/$ac_word" >&5
+echo "$as_me:4324: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4325,10 +4329,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4328: result: $AR" >&5
+  echo "$as_me:4332: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4331: result: no" >&5
+  echo "$as_me:4335: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4337,7 +4341,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4340: checking for $ac_word" >&5
+echo "$as_me:4344: 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
@@ -4352,7 +4356,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4355: found $ac_dir/$ac_word" >&5
+echo "$as_me:4359: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4361,10 +4365,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4364: result: $ac_ct_AR" >&5
+  echo "$as_me:4368: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4367: result: no" >&5
+  echo "$as_me:4371: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4376,7 +4380,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4379: checking for $ac_word" >&5
+echo "$as_me:4383: 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
@@ -4391,7 +4395,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4394: found $ac_dir/$ac_word" >&5
+echo "$as_me:4398: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4399,10 +4403,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4402: result: $AR" >&5
+  echo "$as_me:4406: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4405: result: no" >&5
+  echo "$as_me:4409: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4411,7 +4415,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4414: checking for $ac_word" >&5
+echo "$as_me:4418: 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
@@ -4426,7 +4430,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4429: found $ac_dir/$ac_word" >&5
+echo "$as_me:4433: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4435,10 +4439,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4438: result: $ac_ct_AR" >&5
+  echo "$as_me:4442: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4441: result: no" >&5
+  echo "$as_me:4445: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4447,7 +4451,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:4450: checking for options to update archives" >&5
+echo "$as_me:4454: 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
@@ -4484,13 +4488,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4487 "configure"
+#line 4491 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4493: \$? = $ac_status" >&5
+  echo "$as_me:4497: \$? = $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
@@ -4501,7 +4505,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4511,7 +4515,7 @@ echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4514: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4522,17 +4526,17 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-	echo "$as_me:4525: checking for PATH separator" >&5
+	echo "$as_me:4529: 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:4532: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:4536: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
-echo "$as_me:4535: checking if you have specified an install-prefix" >&5
+echo "$as_me:4539: 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.
@@ -4545,7 +4549,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:4548: result: $DESTDIR" >&5
+echo "$as_me:4552: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -4573,7 +4577,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4576: checking for $ac_word" >&5
+echo "$as_me:4580: 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
@@ -4588,7 +4592,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:4591: found $ac_dir/$ac_word" >&5
+echo "$as_me:4595: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4596,10 +4600,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:4599: result: $BUILD_CC" >&5
+  echo "$as_me:4603: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:4602: result: no" >&5
+  echo "$as_me:4606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4608,12 +4612,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:4611: checking for native build C compiler" >&5
+	echo "$as_me:4615: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:4613: result: $BUILD_CC" >&5
+	echo "$as_me:4617: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:4616: checking for native build C preprocessor" >&5
+	echo "$as_me:4620: 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.
@@ -4623,10 +4627,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:4626: result: $BUILD_CPP" >&5
+	echo "$as_me:4630: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:4629: checking for native build C flags" >&5
+	echo "$as_me:4633: 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.
@@ -4634,10 +4638,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:4637: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:4640: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:4644: 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.
@@ -4645,10 +4649,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:4651: checking for native build linker-flags" >&5
+	echo "$as_me:4655: 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.
@@ -4656,10 +4660,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:4662: checking for native build linker-libraries" >&5
+	echo "$as_me:4666: 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.
@@ -4667,7 +4671,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:4670: result: $BUILD_LIBS" >&5
+	echo "$as_me:4674: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -4676,7 +4680,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:4679: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:4683: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -4690,7 +4694,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4693 "configure"
+#line 4697 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -4700,15 +4704,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4706: \$? = $ac_status" >&5
+  echo "$as_me:4710: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4711: \$? = $ac_status" >&5
+  echo "$as_me:4715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -4723,12 +4727,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:4726: result: $cf_ok_build_cc" >&5
+	echo "$as_me:4730: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:4731: error: Cross-build requires two compilers.
+		{ { echo "$as_me:4735: 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;}
@@ -4739,9 +4743,9 @@ else
 	: ${BUILD_CC:='${CC}'}
 	: ${BUILD_CPP:='${CPP}'}
 	: ${BUILD_CFLAGS:='${CFLAGS}'}
-	: ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
+	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
-	: ${BUILD_LIBS:=''${LIBS}''}
+	: ${BUILD_LIBS:='${LIBS}'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
 fi
@@ -4753,7 +4757,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:4756: checking if you want to build shared C-objects" >&5
+echo "$as_me:4760: checking if you want to build shared C-objects" >&5
 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
@@ -4763,27 +4767,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:4766: result: $with_shared" >&5
+echo "$as_me:4770: result: $with_shared" >&5
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
-echo "$as_me:4770: checking for specified models" >&5
+echo "$as_me:4774: checking for specified models" >&5
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
-echo "$as_me:4773: result: $cf_list_models" >&5
+echo "$as_me:4777: 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:4778: checking for default model" >&5
+echo "$as_me:4782: 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:4781: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4785: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:4786: checking for specific curses-directory" >&5
+echo "$as_me:4790: 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.
@@ -4793,7 +4797,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:4796: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4800: 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"
@@ -4824,7 +4828,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4860,7 +4864,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 4863 "configure"
+#line 4867 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4872,16 +4876,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4878: \$? = $ac_status" >&5
+  echo "$as_me:4882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4884: \$? = $ac_status" >&5
+  echo "$as_me:4888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4898,7 +4902,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -4934,7 +4938,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -4949,13 +4953,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:4952: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:4956: 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:4955: result: yes" >&5
+		echo "$as_me:4959: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:4958: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:4962: 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
 
@@ -5088,7 +5092,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 5091 "configure"
+#line 5095 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5100,37 +5104,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5106: \$? = $ac_status" >&5
+  echo "$as_me:5110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5112: \$? = $ac_status" >&5
+  echo "$as_me:5116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5118 "configure"
+#line 5122 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5128: \$? = $ac_status" >&5
+  echo "$as_me:5132: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5133: \$? = $ac_status" >&5
+  echo "$as_me:5137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -5304,7 +5308,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5307 "configure"
+#line 5311 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5316,37 +5320,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5322: \$? = $ac_status" >&5
+  echo "$as_me:5326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5328: \$? = $ac_status" >&5
+  echo "$as_me:5332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5334 "configure"
+#line 5338 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5344: \$? = $ac_status" >&5
+  echo "$as_me:5348: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5349: \$? = $ac_status" >&5
+  echo "$as_me:5353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -5363,7 +5367,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:5366: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5370: 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"
@@ -5379,7 +5383,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5382: checking for terminfo header" >&5
+echo "$as_me:5386: 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
@@ -5397,7 +5401,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5400 "configure"
+#line 5404 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5412,16 +5416,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5418: \$? = $ac_status" >&5
+  echo "$as_me:5422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5424: \$? = $ac_status" >&5
+  echo "$as_me:5428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5437,7 +5441,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5440: result: $cf_cv_term_header" >&5
+echo "$as_me:5444: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5472,7 +5476,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5475: result: no" >&5
+		echo "$as_me:5479: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5488,7 +5492,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5491: checking for $ac_word" >&5
+echo "$as_me:5495: 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
@@ -5503,7 +5507,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5506: found $ac_dir/$ac_word" >&5
+echo "$as_me:5510: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5511,10 +5515,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5514: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5517: result: no" >&5
+  echo "$as_me:5521: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5527,7 +5531,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5530: checking for $ac_word" >&5
+echo "$as_me:5534: 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
@@ -5542,7 +5546,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5545: found $ac_dir/$ac_word" >&5
+echo "$as_me:5549: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5550,10 +5554,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5556: result: no" >&5
+  echo "$as_me:5560: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5710,7 +5714,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5713: checking if we have identified curses headers" >&5
+echo "$as_me:5717: 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
@@ -5722,7 +5726,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5725 "configure"
+#line 5729 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5734,16 +5738,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5740: \$? = $ac_status" >&5
+  echo "$as_me:5744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5746: \$? = $ac_status" >&5
+  echo "$as_me:5750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5754,11 +5758,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5757: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5761: 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:5761: error: No curses header-files found" >&5
+	{ { echo "$as_me:5765: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5768,23 +5772,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5771: checking for $ac_header" >&5
+echo "$as_me:5775: 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 5777 "configure"
+#line 5781 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5781: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5785: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5787: \$? = $ac_status" >&5
+  echo "$as_me:5791: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5803,7 +5807,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5806: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5810: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5859,7 +5863,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5862 "configure"
+#line 5866 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5871,16 +5875,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5877: \$? = $ac_status" >&5
+  echo "$as_me:5881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5883: \$? = $ac_status" >&5
+  echo "$as_me:5887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5897,7 +5901,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5916,7 +5920,7 @@ fi
 
 }
 
-echo "$as_me:5919: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5923: 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
@@ -5928,7 +5932,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5931 "configure"
+#line 5935 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5952,16 +5956,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5958: \$? = $ac_status" >&5
+  echo "$as_me:5962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5964: \$? = $ac_status" >&5
+  echo "$as_me:5968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -5976,14 +5980,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:5979: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:5983: 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:5986: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:5990: 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
@@ -6104,7 +6108,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6107 "configure"
+#line 6111 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6116,16 +6120,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6122: \$? = $ac_status" >&5
+  echo "$as_me:6126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6128: \$? = $ac_status" >&5
+  echo "$as_me:6132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6142,7 +6146,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6165,7 +6169,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6168 "configure"
+#line 6172 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6189,16 +6193,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6195: \$? = $ac_status" >&5
+  echo "$as_me:6199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6201: \$? = $ac_status" >&5
+  echo "$as_me:6205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -6219,12 +6223,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:6227: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6231: 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%/[^/]*$%%'`
@@ -6260,7 +6264,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6263 "configure"
+#line 6267 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6272,16 +6276,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6278: \$? = $ac_status" >&5
+  echo "$as_me:6282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6284: \$? = $ac_status" >&5
+  echo "$as_me:6288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6298,7 +6302,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6346,7 +6350,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:6349: checking for terminfo header" >&5
+echo "$as_me:6353: 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
@@ -6364,7 +6368,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6367 "configure"
+#line 6371 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -6379,16 +6383,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6385: \$? = $ac_status" >&5
+  echo "$as_me:6389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6391: \$? = $ac_status" >&5
+  echo "$as_me:6395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6404,7 +6408,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6407: result: $cf_cv_term_header" >&5
+echo "$as_me:6411: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6442,7 +6446,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6445: checking for ncurses version" >&5
+echo "$as_me:6449: 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
@@ -6468,10 +6472,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6471: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6475: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6474: \$? = $ac_status" >&5
+  echo "$as_me:6478: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6481,7 +6485,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6484 "configure"
+#line 6488 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6508,15 +6512,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6514: \$? = $ac_status" >&5
+  echo "$as_me:6518: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6519: \$? = $ac_status" >&5
+  echo "$as_me:6523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6530,7 +6534,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6543,7 +6547,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6546: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6550: 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
@@ -6551,7 +6555,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6554 "configure"
+#line 6558 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6570,16 +6574,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6576: \$? = $ac_status" >&5
+  echo "$as_me:6580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6582: \$? = $ac_status" >&5
+  echo "$as_me:6586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6590,10 +6594,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6593: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6597: 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:6596: checking for initscr in -lgpm" >&5
+  echo "$as_me:6600: 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
@@ -6601,7 +6605,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6604 "configure"
+#line 6608 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6620,16 +6624,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6626: \$? = $ac_status" >&5
+  echo "$as_me:6630: \$? = $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:6633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6632: \$? = $ac_status" >&5
+  echo "$as_me:6636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6640,7 +6644,7 @@ fi
 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_gpm_initscr" >&5
+echo "$as_me:6647: 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"
@@ -6655,7 +6659,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6658: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6662: 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
@@ -6663,7 +6667,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6666 "configure"
+#line 6670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6682,16 +6686,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6688: \$? = $ac_status" >&5
+  echo "$as_me:6692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6694: \$? = $ac_status" >&5
+  echo "$as_me:6698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6702,7 +6706,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6705: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6709: 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"
@@ -6751,13 +6755,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6754: checking for initscr" >&5
+	echo "$as_me:6758: 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 6760 "configure"
+#line 6764 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6788,16 +6792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6794: \$? = $ac_status" >&5
+  echo "$as_me:6798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6800: \$? = $ac_status" >&5
+  echo "$as_me:6804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6807,18 +6811,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6810: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6814: 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:6817: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:6821: 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 6821 "configure"
+#line 6825 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6830,25 +6834,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6836: \$? = $ac_status" >&5
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6842: \$? = $ac_status" >&5
+  echo "$as_me:6846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6844: result: yes" >&5
+  echo "$as_me:6848: 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:6851: result: no" >&5
+echo "$as_me:6855: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6916,11 +6920,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6919: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:6923: 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 6923 "configure"
+#line 6927 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6932,25 +6936,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6938: \$? = $ac_status" >&5
+  echo "$as_me:6942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6944: \$? = $ac_status" >&5
+  echo "$as_me:6948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6946: result: yes" >&5
+  echo "$as_me:6950: 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:6953: result: no" >&5
+echo "$as_me:6957: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -6965,7 +6969,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6973,7 +6977,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:6976: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:6980: 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
@@ -6983,7 +6987,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6986 "configure"
+#line 6990 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6995,23 +6999,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7001: \$? = $ac_status" >&5
+  echo "$as_me:7005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7007: \$? = $ac_status" >&5
+  echo "$as_me:7011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:7009: result: yes" >&5
+  echo "$as_me:7013: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:7014: result: no" >&5
+echo "$as_me:7018: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -7029,7 +7033,7 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:7032: checking for specified curses library type" >&5
+echo "$as_me:7036: 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.
@@ -7049,23 +7053,23 @@ case $cf_cv_screen in
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7052: checking for $ac_header" >&5
+echo "$as_me:7056: 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 7058 "configure"
+#line 7062 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7062: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7066: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7068: \$? = $ac_status" >&5
+  echo "$as_me:7072: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7084,7 +7088,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7087: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7091: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7094,7 +7098,7 @@ EOF
 fi
 done
 
-echo "$as_me:7097: checking for multibyte character support" >&5
+echo "$as_me:7101: 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
@@ -7102,7 +7106,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7105 "configure"
+#line 7109 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7119,16 +7123,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7125: \$? = $ac_status" >&5
+  echo "$as_me:7129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7131: \$? = $ac_status" >&5
+  echo "$as_me:7135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7140,12 +7144,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7143: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7148 "configure"
+#line 7152 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7158,16 +7162,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7164: \$? = $ac_status" >&5
+  echo "$as_me:7168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7170: \$? = $ac_status" >&5
+  echo "$as_me:7174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7181,7 +7185,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7184 "configure"
+#line 7188 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7194,16 +7198,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7200: \$? = $ac_status" >&5
+  echo "$as_me:7204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7206: \$? = $ac_status" >&5
+  echo "$as_me:7210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7220,9 +7224,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:7223: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:7225: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7313,7 +7317,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7316: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7321,7 +7325,7 @@ echo "${as_me:-configure}:7316: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7324 "configure"
+#line 7328 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7334,21 +7338,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7340: \$? = $ac_status" >&5
+  echo "$as_me:7344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7346: \$? = $ac_status" >&5
+  echo "$as_me:7350: \$? = $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}:7351: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7366,7 +7370,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7369: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7441,13 +7445,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7444: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7448: 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 7450 "configure"
+#line 7454 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7460,21 +7464,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7466: \$? = $ac_status" >&5
+  echo "$as_me:7470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7472: \$? = $ac_status" >&5
+  echo "$as_me:7476: \$? = $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}:7477: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7516,7 +7520,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7519: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7523: 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
@@ -7554,7 +7558,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7557 "configure"
+#line 7561 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7566,16 +7570,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7572: \$? = $ac_status" >&5
+  echo "$as_me:7576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7578: \$? = $ac_status" >&5
+  echo "$as_me:7582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7592,7 +7596,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7595: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7628,7 +7632,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7631: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7658,13 +7662,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7661: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7665: 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:7664: result: yes" >&5
+		echo "$as_me:7668: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7667: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7671: 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
 
@@ -7797,7 +7801,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7800 "configure"
+#line 7804 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7809,37 +7813,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7815: \$? = $ac_status" >&5
+  echo "$as_me:7819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7821: \$? = $ac_status" >&5
+  echo "$as_me:7825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7827 "configure"
+#line 7831 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7837: \$? = $ac_status" >&5
+  echo "$as_me:7841: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7842: \$? = $ac_status" >&5
+  echo "$as_me:7846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8013,7 +8017,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8016 "configure"
+#line 8020 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8025,37 +8029,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8031: \$? = $ac_status" >&5
+  echo "$as_me:8035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8037: \$? = $ac_status" >&5
+  echo "$as_me:8041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8043 "configure"
+#line 8047 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8053: \$? = $ac_status" >&5
+  echo "$as_me:8057: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8058: \$? = $ac_status" >&5
+  echo "$as_me:8062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8072,7 +8076,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8075: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8079: 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"
@@ -8088,7 +8092,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8091: checking for terminfo header" >&5
+echo "$as_me:8095: 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
@@ -8106,7 +8110,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8109 "configure"
+#line 8113 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8121,16 +8125,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8127: \$? = $ac_status" >&5
+  echo "$as_me:8131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8133: \$? = $ac_status" >&5
+  echo "$as_me:8137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8146,7 +8150,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8149: result: $cf_cv_term_header" >&5
+echo "$as_me:8153: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8181,7 +8185,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8184: result: no" >&5
+		echo "$as_me:8188: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8197,7 +8201,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8200: checking for $ac_word" >&5
+echo "$as_me:8204: 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
@@ -8212,7 +8216,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:8215: found $ac_dir/$ac_word" >&5
+echo "$as_me:8219: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8220,10 +8224,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8223: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8226: result: no" >&5
+  echo "$as_me:8230: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8236,7 +8240,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8239: checking for $ac_word" >&5
+echo "$as_me:8243: 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
@@ -8251,7 +8255,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:8254: found $ac_dir/$ac_word" >&5
+echo "$as_me:8258: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8259,10 +8263,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:8262: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8265: result: no" >&5
+  echo "$as_me:8269: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8419,7 +8423,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8422: checking if we have identified curses headers" >&5
+echo "$as_me:8426: 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
@@ -8431,7 +8435,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8434 "configure"
+#line 8438 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8443,16 +8447,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8449: \$? = $ac_status" >&5
+  echo "$as_me:8453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8455: \$? = $ac_status" >&5
+  echo "$as_me:8459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8463,11 +8467,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8466: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8470: 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:8470: error: No curses header-files found" >&5
+	{ { echo "$as_me:8474: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8477,23 +8481,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8480: checking for $ac_header" >&5
+echo "$as_me:8484: 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 8486 "configure"
+#line 8490 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8490: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8494: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8496: \$? = $ac_status" >&5
+  echo "$as_me:8500: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8512,7 +8516,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8515: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8519: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8568,7 +8572,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8571 "configure"
+#line 8575 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8580,16 +8584,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8586: \$? = $ac_status" >&5
+  echo "$as_me:8590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8592: \$? = $ac_status" >&5
+  echo "$as_me:8596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8606,7 +8610,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8609: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8625,7 +8629,7 @@ fi
 
 }
 
-echo "$as_me:8628: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8632: 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
@@ -8637,7 +8641,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8640 "configure"
+#line 8644 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8661,16 +8665,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8667: \$? = $ac_status" >&5
+  echo "$as_me:8671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8673: \$? = $ac_status" >&5
+  echo "$as_me:8677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8685,14 +8689,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8688: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8692: 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:8695: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8699: 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
@@ -8813,7 +8817,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8816 "configure"
+#line 8820 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8825,16 +8829,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8831: \$? = $ac_status" >&5
+  echo "$as_me:8835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8837: \$? = $ac_status" >&5
+  echo "$as_me:8841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8851,7 +8855,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8854: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8874,7 +8878,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8877 "configure"
+#line 8881 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8898,16 +8902,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8904: \$? = $ac_status" >&5
+  echo "$as_me:8908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8910: \$? = $ac_status" >&5
+  echo "$as_me:8914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8928,12 +8932,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8931: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8936: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8940: 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%/[^/]*$%%'`
@@ -8969,7 +8973,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8972 "configure"
+#line 8976 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8981,16 +8985,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8987: \$? = $ac_status" >&5
+  echo "$as_me:8991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8993: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9007,7 +9011,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9055,7 +9059,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9058: checking for terminfo header" >&5
+echo "$as_me:9062: 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
@@ -9073,7 +9077,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9076 "configure"
+#line 9080 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9088,16 +9092,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9094: \$? = $ac_status" >&5
+  echo "$as_me:9098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9100: \$? = $ac_status" >&5
+  echo "$as_me:9104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9113,7 +9117,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9116: result: $cf_cv_term_header" >&5
+echo "$as_me:9120: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9151,7 +9155,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9154: checking for ncurses version" >&5
+echo "$as_me:9158: 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
@@ -9177,10 +9181,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9180: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9184: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9183: \$? = $ac_status" >&5
+  echo "$as_me:9187: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9190,7 +9194,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9193 "configure"
+#line 9197 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9217,15 +9221,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9223: \$? = $ac_status" >&5
+  echo "$as_me:9227: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9228: \$? = $ac_status" >&5
+  echo "$as_me:9232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9239,7 +9243,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:9242: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -9252,7 +9256,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9255: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9259: 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
@@ -9260,7 +9264,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9263 "configure"
+#line 9267 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9279,16 +9283,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9285: \$? = $ac_status" >&5
+  echo "$as_me:9289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9291: \$? = $ac_status" >&5
+  echo "$as_me:9295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9299,10 +9303,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9306: 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:9305: checking for initscr in -lgpm" >&5
+  echo "$as_me:9309: 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
@@ -9310,7 +9314,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9313 "configure"
+#line 9317 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9329,16 +9333,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9335: \$? = $ac_status" >&5
+  echo "$as_me:9339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9341: \$? = $ac_status" >&5
+  echo "$as_me:9345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9349,7 +9353,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9352: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9356: 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"
@@ -9364,7 +9368,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9367: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9371: 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
@@ -9372,7 +9376,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9375 "configure"
+#line 9379 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9391,16 +9395,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9397: \$? = $ac_status" >&5
+  echo "$as_me:9401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9403: \$? = $ac_status" >&5
+  echo "$as_me:9407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9411,7 +9415,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9414: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9418: 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"
@@ -9460,13 +9464,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9463: checking for initscr" >&5
+	echo "$as_me:9467: 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 9469 "configure"
+#line 9473 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9497,16 +9501,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9503: \$? = $ac_status" >&5
+  echo "$as_me:9507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9509: \$? = $ac_status" >&5
+  echo "$as_me:9513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9516,18 +9520,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9519: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9523: 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:9526: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9530: 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 9530 "configure"
+#line 9534 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9539,25 +9543,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9545: \$? = $ac_status" >&5
+  echo "$as_me:9549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9551: \$? = $ac_status" >&5
+  echo "$as_me:9555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9553: result: yes" >&5
+  echo "$as_me:9557: 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:9560: result: no" >&5
+echo "$as_me:9564: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9625,11 +9629,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9628: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9632: 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 9632 "configure"
+#line 9636 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9641,25 +9645,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9647: \$? = $ac_status" >&5
+  echo "$as_me:9651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9653: \$? = $ac_status" >&5
+  echo "$as_me:9657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9655: result: yes" >&5
+  echo "$as_me:9659: 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:9662: result: no" >&5
+echo "$as_me:9666: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9674,7 +9678,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9677: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9682,7 +9686,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9685: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9689: 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
@@ -9692,7 +9696,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9695 "configure"
+#line 9699 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9704,23 +9708,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9710: \$? = $ac_status" >&5
+  echo "$as_me:9714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9716: \$? = $ac_status" >&5
+  echo "$as_me:9720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9718: result: yes" >&5
+  echo "$as_me:9722: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9723: result: no" >&5
+echo "$as_me:9727: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9745,13 +9749,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9748: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9752: 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:9751: result: yes" >&5
+		echo "$as_me:9755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9754: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9758: 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
 
@@ -9884,7 +9888,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9887 "configure"
+#line 9891 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9896,37 +9900,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9902: \$? = $ac_status" >&5
+  echo "$as_me:9906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9908: \$? = $ac_status" >&5
+  echo "$as_me:9912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9914 "configure"
+#line 9918 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9924: \$? = $ac_status" >&5
+  echo "$as_me:9928: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9929: \$? = $ac_status" >&5
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10100,7 +10104,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10103 "configure"
+#line 10107 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10112,37 +10116,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10118: \$? = $ac_status" >&5
+  echo "$as_me:10122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10124: \$? = $ac_status" >&5
+  echo "$as_me:10128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10130 "configure"
+#line 10134 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10140: \$? = $ac_status" >&5
+  echo "$as_me:10144: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10145: \$? = $ac_status" >&5
+  echo "$as_me:10149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10159,7 +10163,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10162: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:10166: 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"
@@ -10175,7 +10179,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10178: checking for terminfo header" >&5
+echo "$as_me:10182: 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
@@ -10193,7 +10197,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10196 "configure"
+#line 10200 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10208,16 +10212,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10214: \$? = $ac_status" >&5
+  echo "$as_me:10218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10220: \$? = $ac_status" >&5
+  echo "$as_me:10224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10233,7 +10237,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10236: result: $cf_cv_term_header" >&5
+echo "$as_me:10240: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10268,7 +10272,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:10271: result: no" >&5
+		echo "$as_me:10275: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -10284,7 +10288,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:10287: checking for $ac_word" >&5
+echo "$as_me:10291: 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
@@ -10299,7 +10303,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:10302: found $ac_dir/$ac_word" >&5
+echo "$as_me:10306: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10307,10 +10311,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10310: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10313: result: no" >&5
+  echo "$as_me:10317: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10323,7 +10327,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10326: checking for $ac_word" >&5
+echo "$as_me:10330: 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
@@ -10338,7 +10342,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10341: found $ac_dir/$ac_word" >&5
+echo "$as_me:10345: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10346,10 +10350,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10349: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10352: result: no" >&5
+  echo "$as_me:10356: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10506,7 +10510,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10509: checking if we have identified curses headers" >&5
+echo "$as_me:10513: 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
@@ -10518,7 +10522,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10521 "configure"
+#line 10525 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10530,16 +10534,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10536: \$? = $ac_status" >&5
+  echo "$as_me:10540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10542: \$? = $ac_status" >&5
+  echo "$as_me:10546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10550,11 +10554,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10553: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10557: 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:10557: error: No curses header-files found" >&5
+	{ { echo "$as_me:10561: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10564,23 +10568,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10567: checking for $ac_header" >&5
+echo "$as_me:10571: 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 10573 "configure"
+#line 10577 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10577: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10583: \$? = $ac_status" >&5
+  echo "$as_me:10587: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10599,7 +10603,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10602: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10655,7 +10659,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10658 "configure"
+#line 10662 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10667,16 +10671,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10673: \$? = $ac_status" >&5
+  echo "$as_me:10677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10679: \$? = $ac_status" >&5
+  echo "$as_me:10683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10693,7 +10697,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10696: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10712,7 +10716,7 @@ fi
 
 }
 
-echo "$as_me:10715: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10719: 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
@@ -10724,7 +10728,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10727 "configure"
+#line 10731 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10748,16 +10752,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10754: \$? = $ac_status" >&5
+  echo "$as_me:10758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10760: \$? = $ac_status" >&5
+  echo "$as_me:10764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10772,14 +10776,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10775: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10779: 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:10782: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10786: 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
@@ -10900,7 +10904,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10903 "configure"
+#line 10907 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10912,16 +10916,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10918: \$? = $ac_status" >&5
+  echo "$as_me:10922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10924: \$? = $ac_status" >&5
+  echo "$as_me:10928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10938,7 +10942,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10941: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10961,7 +10965,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10964 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10985,16 +10989,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10991: \$? = $ac_status" >&5
+  echo "$as_me:10995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10997: \$? = $ac_status" >&5
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11015,12 +11019,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11018: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11023: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11027: 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%/[^/]*$%%'`
@@ -11056,7 +11060,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11059 "configure"
+#line 11063 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11068,16 +11072,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11074: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11080: \$? = $ac_status" >&5
+  echo "$as_me:11084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11094,7 +11098,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11097: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11142,7 +11146,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11145: checking for terminfo header" >&5
+echo "$as_me:11149: 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
@@ -11160,7 +11164,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11163 "configure"
+#line 11167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11175,16 +11179,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11181: \$? = $ac_status" >&5
+  echo "$as_me:11185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11187: \$? = $ac_status" >&5
+  echo "$as_me:11191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11200,7 +11204,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11203: result: $cf_cv_term_header" >&5
+echo "$as_me:11207: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11238,7 +11242,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:11241: checking for ncurses version" >&5
+echo "$as_me:11245: 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
@@ -11264,10 +11268,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11267: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11270: \$? = $ac_status" >&5
+  echo "$as_me:11274: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -11277,7 +11281,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11280 "configure"
+#line 11284 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11304,15 +11308,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11310: \$? = $ac_status" >&5
+  echo "$as_me:11314: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11315: \$? = $ac_status" >&5
+  echo "$as_me:11319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11326,7 +11330,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11329: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -11339,7 +11343,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11342: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11346: 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
@@ -11347,7 +11351,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11350 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11366,16 +11370,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11372: \$? = $ac_status" >&5
+  echo "$as_me:11376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11378: \$? = $ac_status" >&5
+  echo "$as_me:11382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11386,10 +11390,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11389: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11393: 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:11392: checking for initscr in -lgpm" >&5
+  echo "$as_me:11396: 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
@@ -11397,7 +11401,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11400 "configure"
+#line 11404 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11416,16 +11420,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11422: \$? = $ac_status" >&5
+  echo "$as_me:11426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11428: \$? = $ac_status" >&5
+  echo "$as_me:11432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11436,7 +11440,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11439: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11443: 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"
@@ -11451,7 +11455,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11454: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11458: 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
@@ -11459,7 +11463,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11462 "configure"
+#line 11466 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11478,16 +11482,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11484: \$? = $ac_status" >&5
+  echo "$as_me:11488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11490: \$? = $ac_status" >&5
+  echo "$as_me:11494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11498,7 +11502,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11501: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11505: 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"
@@ -11547,13 +11551,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11550: checking for initscr" >&5
+	echo "$as_me:11554: 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 11556 "configure"
+#line 11560 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11584,16 +11588,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11590: \$? = $ac_status" >&5
+  echo "$as_me:11594: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11596: \$? = $ac_status" >&5
+  echo "$as_me:11600: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11603,18 +11607,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11606: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11610: 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:11613: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11617: 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 11617 "configure"
+#line 11621 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11626,25 +11630,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11632: \$? = $ac_status" >&5
+  echo "$as_me:11636: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11638: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11640: result: yes" >&5
+  echo "$as_me:11644: 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:11647: result: no" >&5
+echo "$as_me:11651: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11712,11 +11716,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11715: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11719: 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 11719 "configure"
+#line 11723 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11728,25 +11732,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11734: \$? = $ac_status" >&5
+  echo "$as_me:11738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11740: \$? = $ac_status" >&5
+  echo "$as_me:11744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11742: result: yes" >&5
+  echo "$as_me:11746: 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:11749: result: no" >&5
+echo "$as_me:11753: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11761,7 +11765,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11764: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11769,7 +11773,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11772: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11776: 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
@@ -11779,7 +11783,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11782 "configure"
+#line 11786 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11791,23 +11795,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11797: \$? = $ac_status" >&5
+  echo "$as_me:11801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11803: \$? = $ac_status" >&5
+  echo "$as_me:11807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11805: result: yes" >&5
+  echo "$as_me:11809: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11810: result: no" >&5
+echo "$as_me:11814: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11827,7 +11831,7 @@ fi
 
 	;;
 (*)
-	{ { echo "$as_me:11830: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11866,10 +11870,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11869: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11873: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11872: \$? = $ac_status" >&5
+  echo "$as_me:11876: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11887,17 +11891,17 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11890: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11894: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11893: checking if KEY_RESIZE is supported" >&5
+echo "$as_me:11897: checking if KEY_RESIZE is supported" >&5
 echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
 if test "${cf_cv_curses_resizes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11900 "configure"
+#line 11904 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11909,16 +11913,16 @@ int key = KEY_RESIZE; (void)key
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11915: \$? = $ac_status" >&5
+  echo "$as_me:11919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11921: \$? = $ac_status" >&5
+  echo "$as_me:11925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_resizes=yes
 else
@@ -11928,12 +11932,12 @@ cf_cv_curses_resizes=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:11931: result: $cf_cv_curses_resizes" >&5
+echo "$as_me:11935: result: $cf_cv_curses_resizes" >&5
 echo "${ECHO_T}$cf_cv_curses_resizes" >&6
 cf_cv_enable_sigwinch=0
 test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
 
-echo "$as_me:11936: checking if you want to have a library-prefix" >&5
+echo "$as_me:11940: 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.
@@ -11943,7 +11947,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11946: result: $with_lib_prefix" >&5
+echo "$as_me:11950: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -11981,7 +11985,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:11984: checking for default loader flags" >&5
+echo "$as_me:11988: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -11989,13 +11993,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:11992: result: $LD_MODEL" >&5
+echo "$as_me:11996: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:11998: checking for an rpath option" >&5
+	echo "$as_me:12002: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -12026,12 +12030,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:12029: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:12034: checking if we need a space after rpath option" >&5
+		echo "$as_me:12038: 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"
 
@@ -12052,7 +12056,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12055 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 
 int
@@ -12064,16 +12068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12070: \$? = $ac_status" >&5
+  echo "$as_me:12074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12076: \$? = $ac_status" >&5
+  echo "$as_me:12080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -12083,7 +12087,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:12086: result: $cf_rpath_space" >&5
+		echo "$as_me:12090: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -12105,7 +12109,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:12108: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:12112: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -12120,9 +12124,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:12123: result: $withval" >&5
+		echo "$as_me:12127: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:12125: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:12129: 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; }; }
 		;;
@@ -12131,7 +12135,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:12134: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -12154,14 +12158,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:12157: checking which $CC option to use" >&5
+		echo "$as_me:12161: 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 12164 "configure"
+#line 12168 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12173,16 +12177,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12179: \$? = $ac_status" >&5
+  echo "$as_me:12183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12185: \$? = $ac_status" >&5
+  echo "$as_me:12189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12191,7 +12195,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:12194: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -12262,7 +12266,7 @@ CF_EOF
 		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:12265: checking if ld -search_paths_first works" >&5
+		echo "$as_me:12269: 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
@@ -12271,7 +12275,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12274 "configure"
+#line 12278 "configure"
 #include "confdefs.h"
 
 int
@@ -12283,16 +12287,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12289: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12295: \$? = $ac_status" >&5
+  echo "$as_me:12299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -12303,7 +12307,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:12306: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:12310: 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"
@@ -12653,7 +12657,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12656 "configure"
+#line 12660 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12665,16 +12669,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12677: \$? = $ac_status" >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12711,7 +12715,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12714: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12721,7 +12725,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12724 "${as_me:-configure}"
+#line 12728 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12733,18 +12737,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12736: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12740: 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:12738: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12741: \$? = $ac_status" >&5
+  echo "$as_me:12745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12743: result: yes" >&5
+				echo "$as_me:12747: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12747: result: no" >&5
+				echo "$as_me:12751: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12759,17 +12763,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12762: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12766: 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}:12766: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12770: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12772: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12776: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12779,7 +12783,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12782: result: $with_rpath_link" >&5
+	echo "$as_me:12786: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12792,7 +12796,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12795: checking if you want broken-linker support code" >&5
+echo "$as_me:12799: 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.
@@ -12802,7 +12806,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12805: result: $with_broken_linker" >&5
+echo "$as_me:12809: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12817,14 +12821,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12820: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12824: 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 12827 "configure"
+#line 12831 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12843,16 +12847,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12849: \$? = $ac_status" >&5
+  echo "$as_me:12853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12855: \$? = $ac_status" >&5
+  echo "$as_me:12859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12863,7 +12867,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12866: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12905,14 +12909,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12908: checking if this is the GNU C library" >&5
+echo "$as_me:12912: 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 12915 "configure"
+#line 12919 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12931,16 +12935,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12937: \$? = $ac_status" >&5
+  echo "$as_me:12941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12943: \$? = $ac_status" >&5
+  echo "$as_me:12947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12951,7 +12955,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12954: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12959,7 +12963,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12962: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:12966: 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
@@ -12971,7 +12975,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12974 "configure"
+#line 12978 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12990,16 +12994,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12996: \$? = $ac_status" >&5
+  echo "$as_me:13000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13002: \$? = $ac_status" >&5
+  echo "$as_me:13006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -13011,12 +13015,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:13014: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:13018: 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:13019: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:13023: 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
@@ -13121,7 +13125,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13124 "configure"
+#line 13128 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13141,16 +13145,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13147: \$? = $ac_status" >&5
+  echo "$as_me:13151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -13161,7 +13165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13164: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:13168: 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
@@ -13170,14 +13174,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:13173: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:13177: 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 13180 "configure"
+#line 13184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13192,16 +13196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13198: \$? = $ac_status" >&5
+  echo "$as_me:13202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13204: \$? = $ac_status" >&5
+  echo "$as_me:13208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13308,7 +13312,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13311 "configure"
+#line 13315 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13323,16 +13327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13329: \$? = $ac_status" >&5
+  echo "$as_me:13333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13335: \$? = $ac_status" >&5
+  echo "$as_me:13339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13347,12 +13351,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13350: result: $cf_cv_gnu_source" >&5
+echo "$as_me:13354: 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:13355: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:13359: 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
@@ -13362,7 +13366,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13365 "configure"
+#line 13369 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13377,16 +13381,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13383: \$? = $ac_status" >&5
+  echo "$as_me:13387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13389: \$? = $ac_status" >&5
+  echo "$as_me:13393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13397,7 +13401,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13400: result: $cf_cv_default_source" >&5
+echo "$as_me:13404: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13434,16 +13438,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13437: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13441: 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}:13443: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13447: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13446 "configure"
+#line 13450 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13458,16 +13462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13464: \$? = $ac_status" >&5
+  echo "$as_me:13468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13470: \$? = $ac_status" >&5
+  echo "$as_me:13474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13488,7 +13492,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13491 "configure"
+#line 13495 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13503,16 +13507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13509: \$? = $ac_status" >&5
+  echo "$as_me:13513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13515: \$? = $ac_status" >&5
+  echo "$as_me:13519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13523,7 +13527,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13531,10 +13535,10 @@ echo "${as_me:-configure}:13526: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13534: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13537 "configure"
+#line 13541 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13549,16 +13553,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13555: \$? = $ac_status" >&5
+  echo "$as_me:13559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13561: \$? = $ac_status" >&5
+  echo "$as_me:13565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13574,7 +13578,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13577: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13581: 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
@@ -13691,7 +13695,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13694: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13698: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13723,14 +13727,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13726: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13730: 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 13733 "configure"
+#line 13737 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13748,16 +13752,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13754: \$? = $ac_status" >&5
+  echo "$as_me:13758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13760: \$? = $ac_status" >&5
+  echo "$as_me:13764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13769,7 +13773,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13772 "configure"
+#line 13776 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13787,16 +13791,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13793: \$? = $ac_status" >&5
+  echo "$as_me:13797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13799: \$? = $ac_status" >&5
+  echo "$as_me:13803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13811,7 +13815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13814: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13971,16 +13975,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13974: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13978: 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}:13980: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13984: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13983 "configure"
+#line 13987 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13995,16 +13999,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14001: \$? = $ac_status" >&5
+  echo "$as_me:14005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14007: \$? = $ac_status" >&5
+  echo "$as_me:14011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -14025,7 +14029,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14028 "configure"
+#line 14032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14040,16 +14044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14043: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14046: \$? = $ac_status" >&5
+  echo "$as_me:14050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14052: \$? = $ac_status" >&5
+  echo "$as_me:14056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14060,7 +14064,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14063: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14068,10 +14072,10 @@ echo "${as_me:-configure}:14063: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14071: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14074 "configure"
+#line 14078 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14086,16 +14090,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14092: \$? = $ac_status" >&5
+  echo "$as_me:14096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14098: \$? = $ac_status" >&5
+  echo "$as_me:14102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14111,7 +14115,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14114: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14118: 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
@@ -14224,10 +14228,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14227: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14230 "configure"
+#line 14234 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14245,23 +14249,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14251: \$? = $ac_status" >&5
+  echo "$as_me:14255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14257: \$? = $ac_status" >&5
+  echo "$as_me:14261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14264: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14268: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14284,7 +14288,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14287: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14296,7 +14300,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14299: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14384,7 +14388,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14387: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14394,7 +14398,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14397: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14404,7 +14408,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14407: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14411: 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"
@@ -14416,10 +14420,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14419: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14423: 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 14422 "configure"
+#line 14426 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14434,16 +14438,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14440: \$? = $ac_status" >&5
+  echo "$as_me:14444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14446: \$? = $ac_status" >&5
+  echo "$as_me:14450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14452,12 +14456,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14455: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14459: 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 14460 "configure"
+#line 14464 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14472,16 +14476,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14478: \$? = $ac_status" >&5
+  echo "$as_me:14482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14484: \$? = $ac_status" >&5
+  echo "$as_me:14488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14492,19 +14496,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14495: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14500: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14504: 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 14507 "configure"
+#line 14511 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14522,16 +14526,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14528: \$? = $ac_status" >&5
+  echo "$as_me:14532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14534: \$? = $ac_status" >&5
+  echo "$as_me:14538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14543,7 +14547,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14546 "configure"
+#line 14550 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14561,16 +14565,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14567: \$? = $ac_status" >&5
+  echo "$as_me:14571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14573: \$? = $ac_status" >&5
+  echo "$as_me:14577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14585,7 +14589,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14588: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14732,13 +14736,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14735: checking for ANSI C header files" >&5
+echo "$as_me:14739: 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 14741 "configure"
+#line 14745 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14746,13 +14750,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14753: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14755: \$? = $ac_status" >&5
+  echo "$as_me:14759: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14774,7 +14778,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14777 "configure"
+#line 14781 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14792,7 +14796,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14795 "configure"
+#line 14799 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14813,7 +14817,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14816 "configure"
+#line 14820 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14839,15 +14843,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14845: \$? = $ac_status" >&5
+  echo "$as_me:14849: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14850: \$? = $ac_status" >&5
+  echo "$as_me:14854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14860,7 +14864,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14863: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14876,28 +14880,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14879: checking for $ac_header" >&5
+echo "$as_me:14883: 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 14885 "configure"
+#line 14889 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14894: \$? = $ac_status" >&5
+  echo "$as_me:14898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14900: \$? = $ac_status" >&5
+  echo "$as_me:14904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14907,7 +14911,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14910: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14917,13 +14921,13 @@ EOF
 fi
 done
 
-echo "$as_me:14920: checking whether exit is declared" >&5
+echo "$as_me:14924: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14926 "configure"
+#line 14930 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14938,16 +14942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14944: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14950: \$? = $ac_status" >&5
+  echo "$as_me:14954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14957,7 +14961,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14960: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:14964: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14967,7 +14971,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14970: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14974: 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
@@ -14979,7 +14983,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14982 "configure"
+#line 14986 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14999,16 +15003,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15005: \$? = $ac_status" >&5
+  echo "$as_me:15009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15011: \$? = $ac_status" >&5
+  echo "$as_me:15015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15018,16 +15022,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15024: \$? = $ac_status" >&5
+  echo "$as_me:15028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15030: \$? = $ac_status" >&5
+  echo "$as_me:15034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15041,13 +15045,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:15044: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15048: 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:15050: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15054: 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
@@ -15055,7 +15059,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15058 "configure"
+#line 15062 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15075,16 +15079,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15081: \$? = $ac_status" >&5
+  echo "$as_me:15085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15087: \$? = $ac_status" >&5
+  echo "$as_me:15091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15093,7 +15097,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15096 "configure"
+#line 15100 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15114,16 +15118,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15120: \$? = $ac_status" >&5
+  echo "$as_me:15124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15126: \$? = $ac_status" >&5
+  echo "$as_me:15130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15134,7 +15138,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15137: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15141: 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
 
@@ -15144,7 +15148,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15147: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15151: 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
@@ -15152,7 +15156,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15155 "configure"
+#line 15159 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15172,16 +15176,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15178: \$? = $ac_status" >&5
+  echo "$as_me:15182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15184: \$? = $ac_status" >&5
+  echo "$as_me:15188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15190,7 +15194,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15193 "configure"
+#line 15197 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15211,16 +15215,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15217: \$? = $ac_status" >&5
+  echo "$as_me:15221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15223: \$? = $ac_status" >&5
+  echo "$as_me:15227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15231,7 +15235,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15234: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15238: 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
 
@@ -15244,7 +15248,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15247: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15251: 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
@@ -15252,7 +15256,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15255 "configure"
+#line 15259 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15267,16 +15271,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15273: \$? = $ac_status" >&5
+  echo "$as_me:15277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15279: \$? = $ac_status" >&5
+  echo "$as_me:15283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15285,7 +15289,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15288 "configure"
+#line 15292 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15301,16 +15305,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15307: \$? = $ac_status" >&5
+  echo "$as_me:15311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15313: \$? = $ac_status" >&5
+  echo "$as_me:15317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15321,7 +15325,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15324: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15328: 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
 
@@ -15335,13 +15339,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15338: checking for fseeko" >&5
+echo "$as_me:15342: 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 15344 "configure"
+#line 15348 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15355,16 +15359,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15361: \$? = $ac_status" >&5
+  echo "$as_me:15365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15367: \$? = $ac_status" >&5
+  echo "$as_me:15371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15374,7 +15378,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15377: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15413,14 +15417,14 @@ fi
 
 	fi
 
-	echo "$as_me:15416: checking whether to use struct dirent64" >&5
+	echo "$as_me:15420: 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 15423 "configure"
+#line 15427 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15447,16 +15451,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15453: \$? = $ac_status" >&5
+  echo "$as_me:15457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15459: \$? = $ac_status" >&5
+  echo "$as_me:15463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15467,7 +15471,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15470: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15477,7 +15481,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15480: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15484: 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.
@@ -15487,7 +15491,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15490: result: $with_rcs_ids" >&5
+echo "$as_me:15494: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15497,7 +15501,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15500: checking if you want to build with function extensions" >&5
+echo "$as_me:15504: 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.
@@ -15507,7 +15511,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15510: result: $with_ext_funcs" >&5
+echo "$as_me:15514: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15525,7 +15529,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15528: checking for extended use of const keyword" >&5
+echo "$as_me:15532: 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.
@@ -15535,7 +15539,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15538: result: $with_ext_const" >&5
+echo "$as_me:15542: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15545,7 +15549,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15548: checking if you want all development code" >&5
+echo "$as_me:15552: 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.
@@ -15555,7 +15559,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15558: result: $with_develop" >&5
+echo "$as_me:15562: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15564,7 +15568,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15567: checking if you want to link with the pthread library" >&5
+echo "$as_me:15571: 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.
@@ -15574,27 +15578,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15577: result: $with_pthread" >&5
+echo "$as_me:15581: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15581: checking for pthread.h" >&5
+	echo "$as_me:15585: 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 15587 "configure"
+#line 15591 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15597: \$? = $ac_status" >&5
+  echo "$as_me:15601: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15613,7 +15617,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15616: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15620: 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
 
@@ -15623,7 +15627,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15626: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15630: 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"
 
@@ -15644,7 +15648,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15647 "configure"
+#line 15651 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15661,16 +15665,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15667: \$? = $ac_status" >&5
+  echo "$as_me:15671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15673: \$? = $ac_status" >&5
+  echo "$as_me:15677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15680,7 +15684,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15683: result: $with_pthread" >&5
+	    echo "$as_me:15687: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15708,7 +15712,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15711: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15717,7 +15721,7 @@ fi
 
 fi
 
-echo "$as_me:15720: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15724: 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.
@@ -15727,18 +15731,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15730: result: $use_weak_symbols" >&5
+echo "$as_me:15734: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15734: checking if $CC supports weak symbols" >&5
+echo "$as_me:15738: 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 15741 "configure"
+#line 15745 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15764,16 +15768,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15770: \$? = $ac_status" >&5
+  echo "$as_me:15774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15776: \$? = $ac_status" >&5
+  echo "$as_me:15780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15784,7 +15788,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15787: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15813,13 +15817,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15816: checking for _nc_TABSIZE" >&5
+echo "$as_me:15820: 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 15822 "configure"
+#line 15826 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15850,16 +15854,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:15860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15862: \$? = $ac_status" >&5
+  echo "$as_me:15866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15869,7 +15873,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15872: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15876: 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
@@ -15881,7 +15885,7 @@ fi
 # 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:15884: checking if you want experimental reentrant code" >&5
+echo "$as_me:15888: 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.
@@ -15891,7 +15895,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15894: result: $with_reentrant" >&5
+echo "$as_me:15898: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15914,7 +15918,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15917: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15921: 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.
@@ -15924,7 +15928,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15927: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15938,7 +15942,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15941: checking if you want to see long compiling messages" >&5
+echo "$as_me:15945: 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.
@@ -15972,10 +15976,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15975: result: $enableval" >&5
+echo "$as_me:15979: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15978: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15982: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15992,17 +15996,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15995: result: $enable_stdnoreturn" >&5
+echo "$as_me:15999: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:15999: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16003: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16005 "configure"
+#line 16009 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16018,16 +16022,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16024: \$? = $ac_status" >&5
+  echo "$as_me:16028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16030: \$? = $ac_status" >&5
+  echo "$as_me:16034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -16038,7 +16042,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16041: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16094,16 +16098,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16097: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16102: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16106: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16142,16 +16146,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16145: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16150: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16154: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16190,23 +16194,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16193: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16198: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16209: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16213: 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.
@@ -16223,7 +16227,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16226: result: $enable_warnings" >&5
+echo "$as_me:16230: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16247,7 +16251,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16250 "configure"
+#line 16254 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16262,26 +16266,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16268: \$? = $ac_status" >&5
+  echo "$as_me:16272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16274: \$? = $ac_status" >&5
+  echo "$as_me:16278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16277: checking for X11/Xt const-feature" >&5
+echo "$as_me:16281: 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 16284 "configure"
+#line 16288 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16299,16 +16303,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16305: \$? = $ac_status" >&5
+  echo "$as_me:16309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16311: \$? = $ac_status" >&5
+  echo "$as_me:16315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16323,7 +16327,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16326: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16352,7 +16356,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16355 "${as_me:-configure}"
+#line 16359 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16368,7 +16372,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16371: checking for $CC warning options..." >&5
+	{ echo "$as_me:16375: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16384,12 +16388,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16390: \$? = $ac_status" >&5
+  echo "$as_me:16394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16392: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16397,7 +16401,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16400: checking for $CC warning options..." >&5
+	{ echo "$as_me:16404: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16420,12 +16424,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16423: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16426: \$? = $ac_status" >&5
+  echo "$as_me:16430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16428: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16433,7 +16437,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16436: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16443,7 +16447,7 @@ echo "${as_me:-configure}:16436: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16446: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16476,10 +16480,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16479: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16482 "${as_me:-configure}"
+#line 16486 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16529,12 +16533,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16535: \$? = $ac_status" >&5
+  echo "$as_me:16539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16537: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16602,7 +16606,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16605: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16609: 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.
@@ -16612,7 +16616,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16615: result: $with_assertions" >&5
+echo "$as_me:16619: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16665,7 +16669,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16668: checking whether to add trace feature to all models" >&5
+echo "$as_me:16672: 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.
@@ -16675,7 +16679,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16678: result: $cf_with_trace" >&5
+echo "$as_me:16682: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16689,7 +16693,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16692: checking if we want to use GNAT projects" >&5
+echo "$as_me:16696: 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.
@@ -16706,21 +16710,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16709: result: $enable_gnat_projects" >&5
+echo "$as_me:16713: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16716: checking if ssp library is needed" >&5
+echo "$as_me:16720: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16723 "configure"
+#line 16727 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16737,16 +16741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16743: \$? = $ac_status" >&5
+  echo "$as_me:16747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16749: \$? = $ac_status" >&5
+  echo "$as_me:16753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16756,7 +16760,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16759 "configure"
+#line 16763 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16773,16 +16777,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16779: \$? = $ac_status" >&5
+  echo "$as_me:16783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16785: \$? = $ac_status" >&5
+  echo "$as_me:16789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16796,7 +16800,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16799: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16824,13 +16828,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16827: checking for clock_gettime" >&5
+echo "$as_me:16831: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16833 "configure"
+#line 16837 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16861,16 +16865,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16867: \$? = $ac_status" >&5
+  echo "$as_me:16871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16873: \$? = $ac_status" >&5
+  echo "$as_me:16877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16880,12 +16884,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16883: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16887: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16888: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16892: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16893,7 +16897,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16896 "configure"
+#line 16900 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16912,16 +16916,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16918: \$? = $ac_status" >&5
+  echo "$as_me:16922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16924: \$? = $ac_status" >&5
+  echo "$as_me:16928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16932,7 +16936,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16935: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16939: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16944,14 +16948,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16947: checking if clock_gettime links" >&5
+echo "$as_me:16951: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16954 "configure"
+#line 16958 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16969,16 +16973,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16975: \$? = $ac_status" >&5
+  echo "$as_me:16979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16981: \$? = $ac_status" >&5
+  echo "$as_me:16985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16989,7 +16993,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16992: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17003,13 +17007,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17006: checking for gettimeofday" >&5
+echo "$as_me:17010: 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 17012 "configure"
+#line 17016 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17040,16 +17044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17046: \$? = $ac_status" >&5
+  echo "$as_me:17050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17052: \$? = $ac_status" >&5
+  echo "$as_me:17056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17059,7 +17063,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17062: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17069,7 +17073,7 @@ EOF
 
 else
 
-echo "$as_me:17072: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17076: 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
@@ -17077,7 +17081,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17080 "configure"
+#line 17084 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17096,16 +17100,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17102: \$? = $ac_status" >&5
+  echo "$as_me:17106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17108: \$? = $ac_status" >&5
+  echo "$as_me:17112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17116,7 +17120,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17119: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17123: 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
 
@@ -17149,13 +17153,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17152: checking for signed char" >&5
+echo "$as_me:17156: 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 17158 "configure"
+#line 17162 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17170,16 +17174,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17176: \$? = $ac_status" >&5
+  echo "$as_me:17180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17182: \$? = $ac_status" >&5
+  echo "$as_me:17186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17189,10 +17193,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17192: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17195: checking size of signed char" >&5
+echo "$as_me:17199: 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
@@ -17201,7 +17205,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17204 "configure"
+#line 17208 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17213,21 +17217,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17219: \$? = $ac_status" >&5
+  echo "$as_me:17223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17225: \$? = $ac_status" >&5
+  echo "$as_me:17229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17230 "configure"
+#line 17234 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17239,16 +17243,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17245: \$? = $ac_status" >&5
+  echo "$as_me:17249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17251: \$? = $ac_status" >&5
+  echo "$as_me:17255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17264,7 +17268,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17267 "configure"
+#line 17271 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17276,16 +17280,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17282: \$? = $ac_status" >&5
+  echo "$as_me:17286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17288: \$? = $ac_status" >&5
+  echo "$as_me:17292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17301,7 +17305,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17304 "configure"
+#line 17308 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17313,16 +17317,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17319: \$? = $ac_status" >&5
+  echo "$as_me:17323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17325: \$? = $ac_status" >&5
+  echo "$as_me:17329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17335,12 +17339,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17338: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17343 "configure"
+#line 17347 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17356,15 +17360,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17362: \$? = $ac_status" >&5
+  echo "$as_me:17366: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17367: \$? = $ac_status" >&5
+  echo "$as_me:17371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17380,7 +17384,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17383: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17387: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17389,13 +17393,13 @@ EOF
 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:17392: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17396: 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 17398 "configure"
+#line 17402 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17410,16 +17414,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17416: \$? = $ac_status" >&5
+  echo "$as_me:17420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17422: \$? = $ac_status" >&5
+  echo "$as_me:17426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17429,7 +17433,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17432: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17442,7 +17446,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17445: checking for opendir in -ldir" >&5
+  echo "$as_me:17449: 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
@@ -17450,7 +17454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17453 "configure"
+#line 17457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17469,16 +17473,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17475: \$? = $ac_status" >&5
+  echo "$as_me:17479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17481: \$? = $ac_status" >&5
+  echo "$as_me:17485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17489,14 +17493,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17492: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17496: 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:17499: checking for opendir in -lx" >&5
+  echo "$as_me:17503: 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
@@ -17504,7 +17508,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17507 "configure"
+#line 17511 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17523,16 +17527,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17529: \$? = $ac_status" >&5
+  echo "$as_me:17533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17535: \$? = $ac_status" >&5
+  echo "$as_me:17539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17543,7 +17547,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17546: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17550: 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"
@@ -17551,13 +17555,13 @@ fi
 
 fi
 
-echo "$as_me:17554: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17558: 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 17560 "configure"
+#line 17564 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17573,16 +17577,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17579: \$? = $ac_status" >&5
+  echo "$as_me:17583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17585: \$? = $ac_status" >&5
+  echo "$as_me:17589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17592,7 +17596,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17595: result: $ac_cv_header_time" >&5
+echo "$as_me:17599: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17610,13 +17614,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17613: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17617: 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 17619 "configure"
+#line 17623 "configure"
 #include "confdefs.h"
 
 int
@@ -17678,16 +17682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17684: \$? = $ac_status" >&5
+  echo "$as_me:17688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17690: \$? = $ac_status" >&5
+  echo "$as_me:17694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17697,7 +17701,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17700: result: $ac_cv_c_const" >&5
+echo "$as_me:17704: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17709,7 +17713,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17712: checking if data-only library module links" >&5
+echo "$as_me:17716: 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
@@ -17717,20 +17721,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17720 "configure"
+#line 17724 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17723: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17726: \$? = $ac_status" >&5
+  echo "$as_me:17730: \$? = $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 <<EOF
-#line 17733 "configure"
+#line 17737 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17747,10 +17751,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17753: \$? = $ac_status" >&5
+  echo "$as_me:17757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17763,7 +17767,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17766 "configure"
+#line 17770 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17774,15 +17778,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17780: \$? = $ac_status" >&5
+  echo "$as_me:17784: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17785: \$? = $ac_status" >&5
+  echo "$as_me:17789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17797,7 +17801,7 @@ fi
 
 fi
 
-echo "$as_me:17800: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17816,23 +17820,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17819: checking for $ac_header" >&5
+echo "$as_me:17823: 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 17825 "configure"
+#line 17829 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17835: \$? = $ac_status" >&5
+  echo "$as_me:17839: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17851,7 +17855,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17854: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17858: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17861,7 +17865,7 @@ EOF
 fi
 done
 
-echo "$as_me:17864: checking for working mkstemp" >&5
+echo "$as_me:17868: 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
@@ -17872,7 +17876,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17875 "configure"
+#line 17879 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17907,15 +17911,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17913: \$? = $ac_status" >&5
+  echo "$as_me:17917: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17918: \$? = $ac_status" >&5
+  echo "$as_me:17922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17930,16 +17934,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17933: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17937: 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:17936: checking for mkstemp" >&5
+	echo "$as_me:17940: 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 17942 "configure"
+#line 17946 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17970,16 +17974,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17976: \$? = $ac_status" >&5
+  echo "$as_me:17980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17982: \$? = $ac_status" >&5
+  echo "$as_me:17986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17989,7 +17993,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17992: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18010,7 +18014,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18013: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18027,10 +18031,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18030: result: $ADAFLAGS" >&5
+	echo "$as_me:18034: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18033: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18037: 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
@@ -18040,11 +18044,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18043: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18047: 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:18047: checking if GNAT supports generics" >&5
+echo "$as_me:18051: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18054,7 +18058,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18057: result: $cf_gnat_generics" >&5
+echo "$as_me:18061: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18066,7 +18070,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18069: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18073: 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
@@ -18114,7 +18118,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18117: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18127,7 +18131,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18130: checking if GNAT supports project files" >&5
+echo "$as_me:18134: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18190,15 +18194,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18193: result: $cf_gnat_projects" >&5
+echo "$as_me:18197: 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:18199: checking if GNAT supports libraries" >&5
+	echo "$as_me:18203: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18201: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18205: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18218,7 +18222,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18221: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18225: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18230,7 +18234,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18233: checking for Ada95 compiler" >&5
+echo "$as_me:18237: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18241,12 +18245,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18244: result: $cf_ada_compiler" >&5
+echo "$as_me:18248: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18249: checking for Ada95 include directory" >&5
+echo "$as_me:18253: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18282,7 +18286,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18285: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18291,10 +18295,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18294: result: $ADA_INCLUDE" >&5
+echo "$as_me:18298: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18297: checking for Ada95 object directory" >&5
+echo "$as_me:18301: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18330,7 +18334,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18333: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18339,10 +18343,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18342: result: $ADA_OBJECTS" >&5
+echo "$as_me:18346: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18345: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18349: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18363,11 +18367,11 @@ then
 	fi
 fi
 
-echo "$as_me:18366: result: $with_ada_sharedlib" >&5
+echo "$as_me:18370: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18370: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18374: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18385,7 +18389,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18388: checking for Ada95 curses library name" >&5
+echo "$as_me:18392: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18401,16 +18405,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18404: result: $ADA_LIBNAME" >&5
+echo "$as_me:18408: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18408: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18412: 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:18413: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18417: 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
@@ -18450,7 +18454,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18453: checking default library suffix" >&5
+echo "$as_me:18457: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18461,10 +18465,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18464: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18467: checking default library-dependency suffix" >&5
+echo "$as_me:18471: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18547,10 +18551,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18550: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18554: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18553: checking default object directory" >&5
+echo "$as_me:18557: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18566,7 +18570,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18569: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18708,7 +18712,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18711: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18844,7 +18848,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20231210,
+configured by $0, generated by GNU Autoconf 2.52.20240618,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -18889,7 +18893,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18892: error: ambiguous option: $1
+    { { echo "$as_me:18896: 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;}
@@ -18908,7 +18912,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18911: error: unrecognized option: $1
+  -*) { { echo "$as_me:18915: 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;}
@@ -18927,7 +18931,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20231210, executed with
+This file was extended by $as_me 2.52.20240618, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -18983,7 +18987,7 @@ do
   "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:18986: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18990: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19242,14 +19246,14 @@ EOF
       # is no need to browse any of the substitutions).
       # These are the two extra sed commands mentioned above.
       (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
       if test -s "$tmp"/subs.next; then
-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
+        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
         if test ! -s "$tmp"/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
           if test ! -s "$tmp"/subs.edit; then
@@ -19347,7 +19351,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19350: creating $ac_file" >&5
+    { echo "$as_me:19354: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19365,7 +19369,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19368: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19378,7 +19382,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19381: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19385: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19394,7 +19398,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19397: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19401: 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;}
@@ -19403,7 +19407,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19406: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19410: 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;}
@@ -19448,7 +19452,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19451: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19455: 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;}
@@ -19459,7 +19463,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19462: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19466: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19508,7 +19512,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19511: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19519,7 +19523,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19522: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19532,7 +19536,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19535: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19539: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19590,7 +19594,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19593: $ac_file is unchanged" >&5
+      { echo "$as_me:19597: $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/NEWS b/NEWS
index 27faffc21..7e7a8efb1 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4145 2024/06/29 19:31:28 tom Exp $
+-- $Id: NEWS,v 1.4147 2024/07/06 18:21:47 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240706
+	+ update configure script to use macro changes from dialog.
+	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
+	  names.
+
 20240629
 	+ build-fix for ncurses-examples with newer PDCurses, which no longer
 	  has stubs for unimplemented features.
diff --git a/VERSION b/VERSION
index e1507dd77..3bd3bb433 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240629
+5:0:10	6.5	20240706
diff --git a/aclocal.m4 b/aclocal.m4
index 8c39fe417..2239d223f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $
+dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1411,7 +1411,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34
+dnl CF_CHECK_LIBTOOL_VERSION version: 3 updated: 2024/06/12 04:19:01
 dnl ------------------------
 dnl Show the version of libtool
 dnl
@@ -1427,6 +1427,7 @@ then
 	AC_MSG_CHECKING(version of $LIBTOOL)
 	CF_LIBTOOL_VERSION
 	AC_MSG_RESULT($cf_cv_libtool_version)
+	ifdef([LT_PACKAGE_VERSION],,[
 	if test -n "$cf_cv_libtool_version"
 	then
 		cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[[()]],...,g' -e 's,[[ ]],-,g' -e '2,$d'`
@@ -1440,6 +1441,7 @@ then
 	else
 		AC_MSG_ERROR(No version found for $LIBTOOL)
 	fi
+	])
 else
 	AC_MSG_ERROR(GNU libtool has not been found)
 fi
@@ -4584,9 +4586,12 @@ CF_SUBDIR_PATH($1,$2,lib)
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl CF_LIBTOOL_VERSION version: 2 updated: 2024/06/12 04:19:01
 dnl ------------------
 AC_DEFUN([CF_LIBTOOL_VERSION],[
+ifdef([LT_PACKAGE_VERSION],[
+	cf_cv_libtool_version=LT_PACKAGE_VERSION
+],[
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
 	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
@@ -4595,6 +4600,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 ])dnl
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04
 dnl -------------
@@ -8804,7 +8810,7 @@ AC_DEFUN([CF_VERBOSE],
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04
+dnl CF_VERSION_INFO version: 9 updated: 2024/06/12 04:04:13
 dnl ---------------
 dnl Define several useful symbols derived from the VERSION file.  A separate
 dnl file is preferred to embedding the version numbers in various scripts.
@@ -8882,13 +8888,13 @@ AC_SUBST(VERSION_PATCH)
 dnl if a package name is given, define its corresponding version info.  We
 dnl need the package name to ensure that the defined symbols are unique.
 ifelse($1,,,[
-	cf_PACKAGE=$1
 	PACKAGE=ifelse($2,,$1,$2)
 	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
 	AC_SUBST(PACKAGE)
-	CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
-	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
-	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
+	AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package])
+	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}")
+	AH_TEMPLATE([AS_TR_CPP($1[_PATCHDATE])],[patchdate of package])
+	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_PATCHDATE]),${VERSION_PATCH})
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
diff --git a/configure b/configure
index c89e3425a..4408749f0 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.782 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20231210.
+# Generated by Autoconf 2.52.20240618.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -481,6 +481,10 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
+  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
+    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
+    ;;
+
   -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
@@ -949,7 +953,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
+generated by GNU Autoconf 2.52.20240618.  Invocation command line was
 
   $ $0 $@
 
@@ -1073,7 +1077,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1076: loading site script $ac_site_file" >&5
+    { echo "$as_me:1080: 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"
@@ -1084,7 +1088,7 @@ if test -r "$cache_file"; then
   # 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:1087: loading cache $cache_file" >&5
+    { echo "$as_me:1091: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1092,7 +1096,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1095: creating cache $cache_file" >&5
+  { echo "$as_me:1099: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1108,21 +1112,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1111: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1115: 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:1115: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1119: 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:1121: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1125: 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:1123:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1127:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1125:   current value: $ac_new_val" >&5
+        { echo "$as_me:1129:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1141,9 +1145,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1144: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1148: 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:1146: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1150: 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
@@ -1172,10 +1176,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1175: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1178: \$? = $ac_status" >&5
+  echo "$as_me:1182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1192,7 +1196,7 @@ for ac_prog in ggrep grep
 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:1195: checking for $ac_word" >&5
+echo "$as_me:1199: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1207,7 +1211,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1210: found $ac_dir/$ac_word" >&5
+echo "$as_me:1214: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1215,10 +1219,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1218: result: $GREP" >&5
+  echo "$as_me:1222: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1221: result: no" >&5
+  echo "$as_me:1225: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1226,7 +1230,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1229: checking for egrep" >&5
+echo "$as_me:1233: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1238,7 +1242,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1241: checking for $ac_word" >&5
+echo "$as_me:1245: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1255,7 +1259,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:1258: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1262: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1266,10 +1270,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:1269: result: $EGREP" >&5
+  echo "$as_me:1273: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:1272: result: no" >&5
+  echo "$as_me:1276: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1277,12 +1281,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1280: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1285: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -1293,11 +1297,11 @@ cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_abi_default=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
-echo "$as_me:1296: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+echo "$as_me:1300: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
 
 if test -f "$srcdir/VERSION" ; then
-	echo "$as_me:1300: checking for package version" >&5
+	echo "$as_me:1304: 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...
@@ -1309,39 +1313,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1312: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: 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:1317: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1321: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1321: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1324: checking for package patch date" >&5
+	echo "$as_me:1328: 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:1329: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1333: 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:1336: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1340: 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:1341: result: $VERSION_PATCH" >&5
+	echo "$as_me:1345: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1344: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1349,35 +1353,32 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
 
-echo "${as_me:-configure}:1352: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me:-configure}:1356: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me:-configure}:1360: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me:-configure}:1364: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
-	cf_PACKAGE=NCURSES
 	PACKAGE=ncurses
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-cf_PACKAGE=`echo "$cf_PACKAGE" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
 	cat >>confdefs.h <<EOF
-#define ${cf_PACKAGE}_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
+#define NCURSES_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
 EOF
 
 	cat >>confdefs.h <<EOF
-#define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH}
+#define NCURSES_PATCHDATE ${VERSION_PATCH}
 EOF
 
 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
@@ -1385,7 +1386,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1388: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1389: 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;
@@ -1399,13 +1400,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1402: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1403: 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:1408: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1409: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1415,13 +1416,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1418: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1419: 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:1424: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1425: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1434,7 +1435,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1437: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1438: 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.*)
@@ -1453,13 +1454,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1456: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1457: 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:1462: error: ABI version value is empty" >&5
+  { { echo "$as_me:1463: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1492,7 +1493,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1495: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1496: 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
@@ -1502,11 +1503,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1505: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1509: checking build system type" >&5
+echo "$as_me:1510: 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
@@ -1515,23 +1516,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1518: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1519: 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:1522: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1523: 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:1527: result: $ac_cv_build" >&5
+echo "$as_me:1528: 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:1534: checking host system type" >&5
+echo "$as_me:1535: 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
@@ -1540,12 +1541,12 @@ else
 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:1543: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1544: 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:1548: result: $ac_cv_host" >&5
+echo "$as_me:1549: 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/'`
@@ -1553,7 +1554,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1556: checking target system type" >&5
+	echo "$as_me:1557: 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
@@ -1562,12 +1563,12 @@ else
 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:1565: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1566: 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:1570: result: $ac_cv_target" >&5
+echo "$as_me:1571: 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/'`
@@ -1599,13 +1600,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1602: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1603: 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:1606: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1607: 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:1608: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1609: 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
@@ -1613,7 +1614,7 @@ fi
 # 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:1616: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1617: 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
@@ -1624,7 +1625,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1627: checking for fgrep" >&5
+echo "$as_me:1628: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1636,7 +1637,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1639: checking for $ac_word" >&5
+echo "$as_me:1640: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1653,7 +1654,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1656: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1657: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1664,10 +1665,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1667: result: $FGREP" >&5
+  echo "$as_me:1668: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1670: result: no" >&5
+  echo "$as_me:1671: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1675,16 +1676,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1678: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1683: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1687: checking for prefix" >&5
+echo "$as_me:1688: 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
@@ -1696,11 +1697,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1699: result: $prefix" >&5
+echo "$as_me:1700: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1703: checking for default include-directory" >&5
+echo "$as_me:1704: 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 \
@@ -1723,7 +1724,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1726: result: $includedir" >&5
+echo "$as_me:1727: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1788,20 +1789,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1791: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1792: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1797: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1798: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1804: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1805: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1831,7 +1832,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:1834: checking for $ac_word" >&5
+echo "$as_me:1835: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1848,7 +1849,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:1851: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1852: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1860,10 +1861,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:1863: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:1866: result: no" >&5
+  echo "$as_me:1867: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1873,7 +1874,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:1876: checking for $cf_prog_gnat version" >&5
+echo "$as_me:1877: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1884,7 +1885,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1887: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1888: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -1913,7 +1914,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:1916: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:1917: 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
@@ -1932,10 +1933,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:1935: result: $cf_gprconfig_value" >&5
+					echo "$as_me:1936: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:1938: result: missing" >&5
+					echo "$as_me:1939: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -1948,7 +1949,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:1951: checking for gnat version" >&5
+echo "$as_me:1952: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1959,7 +1960,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1962: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1963: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -1968,7 +1969,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:1971: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:1972: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -1976,7 +1977,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:1979: checking for $ac_word" >&5
+echo "$as_me:1980: 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
@@ -1991,7 +1992,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:1994: found $ac_dir/$ac_word" >&5
+echo "$as_me:1995: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2000,20 +2001,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:2003: result: $M4_exists" >&5
+  echo "$as_me:2004: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:2006: result: no" >&5
+  echo "$as_me:2007: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:2012: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:2013: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:2016: checking if GNAT works" >&5
+			echo "$as_me:2017: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -2041,7 +2042,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:2044: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -2057,7 +2058,7 @@ fi
 		# Here is a workaround.
 		# Extract the first word of "gnatgcc", so it can be a program name with args.
 set dummy gnatgcc; ac_word=$2
-echo "$as_me:2060: checking for $ac_word" >&5
+echo "$as_me:2061: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2074,7 +2075,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
-   echo "$as_me:2077: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2078: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2086,16 +2087,16 @@ fi
 cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
 
 if test -n "$cf_cv_path_gnatgcc"; then
-  echo "$as_me:2089: result: $cf_cv_path_gnatgcc" >&5
+  echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-  echo "$as_me:2092: result: no" >&5
+  echo "$as_me:2093: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			echo "$as_me:2098: checking for improvement" >&5
+			echo "$as_me:2099: checking for improvement" >&5
 echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
@@ -2106,7 +2107,7 @@ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 				cf_cv_path_gnatgcc=no
 				;;
 			esac
-			echo "$as_me:2109: result: $cf_cv_path_gnatgcc" >&5
+			echo "$as_me:2110: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
@@ -2131,7 +2132,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2134: checking for $ac_word" >&5
+echo "$as_me:2135: 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
@@ -2146,7 +2147,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:2149: found $ac_dir/$ac_word" >&5
+echo "$as_me:2150: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2154,10 +2155,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2157: result: $CC" >&5
+  echo "$as_me:2158: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2160: result: no" >&5
+  echo "$as_me:2161: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2170,7 +2171,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2173: checking for $ac_word" >&5
+echo "$as_me:2174: 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
@@ -2185,7 +2186,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:2188: found $ac_dir/$ac_word" >&5
+echo "$as_me:2189: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2193,10 +2194,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2196: result: $ac_ct_CC" >&5
+  echo "$as_me:2197: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2199: result: no" >&5
+  echo "$as_me:2200: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2206,32 +2207,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:2209: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2210: 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:2214:" \
+echo "$as_me:2215:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:2217: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2218: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2220: \$? = $ac_status" >&5
+  echo "$as_me:2221: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2222: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2223: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2225: \$? = $ac_status" >&5
+  echo "$as_me:2226: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2227: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2228: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2230: \$? = $ac_status" >&5
+  echo "$as_me:2231: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2234 "configure"
+#line 2235 "configure"
 #include "confdefs.h"
 
 int
@@ -2247,13 +2248,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:2250: checking for C compiler default output" >&5
+echo "$as_me:2251: 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:2253: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2254: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:2256: \$? = $ac_status" >&5
+  echo "$as_me:2257: \$? = $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
@@ -2276,34 +2277,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2279: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2280: 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:2285: result: $ac_file" >&5
+echo "$as_me:2286: 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:2290: checking whether the C compiler works" >&5
+echo "$as_me:2291: 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:2296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2299: \$? = $ac_status" >&5
+  echo "$as_me:2300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2306: error: cannot run C compiled programs.
+	{ { echo "$as_me:2307: 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;}
@@ -2311,24 +2312,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2314: result: yes" >&5
+echo "$as_me:2315: 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:2321: checking whether we are cross compiling" >&5
+echo "$as_me:2322: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2323: result: $cross_compiling" >&5
+echo "$as_me:2324: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2326: checking for executable suffix" >&5
+echo "$as_me:2327: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2331: \$? = $ac_status" >&5
+  echo "$as_me:2332: \$? = $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
@@ -2344,25 +2345,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2347: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2348: 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:2353: result: $ac_cv_exeext" >&5
+echo "$as_me:2354: 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:2359: checking for object suffix" >&5
+echo "$as_me:2360: 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 2365 "configure"
+#line 2366 "configure"
 #include "confdefs.h"
 
 int
@@ -2374,10 +2375,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2380: \$? = $ac_status" >&5
+  echo "$as_me:2381: \$? = $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
@@ -2389,24 +2390,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2392: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2393: 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:2399: result: $ac_cv_objext" >&5
+echo "$as_me:2400: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2403: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2404: 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 2409 "configure"
+#line 2410 "configure"
 #include "confdefs.h"
 
 int
@@ -2421,16 +2422,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2427: \$? = $ac_status" >&5
+  echo "$as_me:2428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2433: \$? = $ac_status" >&5
+  echo "$as_me:2434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2442,19 +2443,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2445: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2446: 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:2451: checking whether $CC accepts -g" >&5
+echo "$as_me:2452: 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 2457 "configure"
+#line 2458 "configure"
 #include "confdefs.h"
 
 int
@@ -2466,16 +2467,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2472: \$? = $ac_status" >&5
+  echo "$as_me:2473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2478: \$? = $ac_status" >&5
+  echo "$as_me:2479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2485,7 +2486,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2488: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2489: 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
@@ -2512,16 +2513,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2518: \$? = $ac_status" >&5
+  echo "$as_me:2519: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2524: \$? = $ac_status" >&5
+  echo "$as_me:2525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2533,7 +2534,7 @@ if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2536 "configure"
+#line 2537 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2546,16 +2547,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2552: \$? = $ac_status" >&5
+  echo "$as_me:2553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2558: \$? = $ac_status" >&5
+  echo "$as_me:2559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2565,7 +2566,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2568 "configure"
+#line 2569 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2577,16 +2578,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2583: \$? = $ac_status" >&5
+  echo "$as_me:2584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2589: \$? = $ac_status" >&5
+  echo "$as_me:2590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2616,11 +2617,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2619: checking version of $CC" >&5
+	echo "$as_me:2620: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2623: result: $GCC_VERSION" >&5
+	echo "$as_me:2624: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2629,12 +2630,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2632: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2633: 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 2637 "configure"
+#line 2638 "configure"
 #include "confdefs.h"
 
 int
@@ -2651,16 +2652,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2657: \$? = $ac_status" >&5
+  echo "$as_me:2658: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2663: \$? = $ac_status" >&5
+  echo "$as_me:2664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2671,7 +2672,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2674: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2675: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2680,11 +2681,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2683: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2684: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2687 "configure"
+#line 2688 "configure"
 #include "confdefs.h"
 
 int
@@ -2701,16 +2702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2707: \$? = $ac_status" >&5
+  echo "$as_me:2708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2713: \$? = $ac_status" >&5
+  echo "$as_me:2714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2720,7 +2721,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2723: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2724: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2729,30 +2730,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2732: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2733: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2739: checking version of $CC" >&5
+	echo "$as_me:2740: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2743: result: $CLANG_VERSION" >&5
+	echo "$as_me:2744: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2750: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2751: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2755 "configure"
+#line 2756 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2766,16 +2767,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2772: \$? = $ac_status" >&5
+  echo "$as_me:2773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2778: \$? = $ac_status" >&5
+  echo "$as_me:2779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2786,13 +2787,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2789: result: $cf_clang_optok" >&5
+		echo "$as_me:2790: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2795: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2796: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2801,7 +2802,7 @@ echo "${as_me:-configure}:2795: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2804: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2805: 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
@@ -2809,7 +2810,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2812 "configure"
+#line 2813 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2856,16 +2857,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2862: \$? = $ac_status" >&5
+  echo "$as_me:2863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2868: \$? = $ac_status" >&5
+  echo "$as_me:2869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2882,10 +2883,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2885: result: none needed" >&5
+    echo "$as_me:2886: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2888: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2893,13 +2894,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2896: checking \$CFLAGS variable" >&5
+echo "$as_me:2897: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2900: result: broken" >&5
+	echo "$as_me:2901: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2902: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2903: 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=
@@ -3007,18 +3008,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:3010: result: ok" >&5
+	echo "$as_me:3011: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:3015: checking \$CC variable" >&5
+echo "$as_me:3016: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:3019: result: broken" >&5
+	echo "$as_me:3020: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:3021: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:3022: 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/[ ]*[ ]-[^ ].*//'`
@@ -3135,19 +3136,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:3138: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3142: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3146: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:3150: result: ok" >&5
+	echo "$as_me:3151: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -3161,7 +3162,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:3164: checking how to run the C preprocessor" >&5
+echo "$as_me:3165: 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
@@ -3182,18 +3183,18 @@ do
   # 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 3185 "configure"
+#line 3186 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3190: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3196: \$? = $ac_status" >&5
+  echo "$as_me:3197: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3216,17 +3217,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3219 "configure"
+#line 3220 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3229: \$? = $ac_status" >&5
+  echo "$as_me:3230: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3263,7 +3264,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3266: result: $CPP" >&5
+echo "$as_me:3267: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3273,18 +3274,18 @@ do
   # 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 3276 "configure"
+#line 3277 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3287: \$? = $ac_status" >&5
+  echo "$as_me:3288: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3307,17 +3308,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3310 "configure"
+#line 3311 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3320: \$? = $ac_status" >&5
+  echo "$as_me:3321: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3345,7 +3346,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3348: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3358,14 +3359,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3361: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3362: 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 3368 "configure"
+#line 3369 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3380,7 +3381,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3383 "configure"
+#line 3384 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3393,14 +3394,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3396: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3397: 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:3403: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3404: 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
@@ -3415,15 +3416,15 @@ CF_EOF
 # 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:3418: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3421: \$? = $ac_status" >&5
+  echo "$as_me:3422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3423: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3426: \$? = $ac_status" >&5
+  echo "$as_me:3427: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3434,10 +3435,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3437: result: yes" >&5
+  echo "$as_me:3438: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3440: result: no" >&5
+  echo "$as_me:3441: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3451,7 +3452,7 @@ else
 	(*) 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:3454: checking for $ac_word" >&5
+echo "$as_me:3455: 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
@@ -3468,7 +3469,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3471: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3472: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3479,10 +3480,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3482: result: $LDCONFIG" >&5
+  echo "$as_me:3483: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3485: result: no" >&5
+  echo "$as_me:3486: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3490,7 +3491,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3493: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3494: 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.
@@ -3500,7 +3501,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3503: result: $cf_with_cxx" >&5
+echo "$as_me:3504: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3518,7 +3519,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3521: checking for $ac_word" >&5
+echo "$as_me:3522: 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
@@ -3533,7 +3534,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
+echo "$as_me:3537: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3541,10 +3542,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3544: result: $CXX" >&5
+  echo "$as_me:3545: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3547: result: no" >&5
+  echo "$as_me:3548: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3557,7 +3558,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3560: checking for $ac_word" >&5
+echo "$as_me:3561: 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
@@ -3572,7 +3573,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3575: found $ac_dir/$ac_word" >&5
+echo "$as_me:3576: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3580,10 +3581,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3583: result: $ac_ct_CXX" >&5
+  echo "$as_me:3584: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3586: result: no" >&5
+  echo "$as_me:3587: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3595,32 +3596,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3598:" \
+echo "$as_me:3599:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3601: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3602: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3604: \$? = $ac_status" >&5
+  echo "$as_me:3605: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3606: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3607: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3609: \$? = $ac_status" >&5
+  echo "$as_me:3610: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3611: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3612: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3614: \$? = $ac_status" >&5
+  echo "$as_me:3615: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3617: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3618: 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 3623 "configure"
+#line 3624 "configure"
 #include "confdefs.h"
 
 int
@@ -3635,16 +3636,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3641: \$? = $ac_status" >&5
+  echo "$as_me:3642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3647: \$? = $ac_status" >&5
+  echo "$as_me:3648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3656,19 +3657,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3659: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3660: 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:3665: checking whether $CXX accepts -g" >&5
+echo "$as_me:3666: 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 3671 "configure"
+#line 3672 "configure"
 #include "confdefs.h"
 
 int
@@ -3680,16 +3681,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3686: \$? = $ac_status" >&5
+  echo "$as_me:3687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3692: \$? = $ac_status" >&5
+  echo "$as_me:3693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3699,7 +3700,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3702: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3703: 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
@@ -3726,7 +3727,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3729 "configure"
+#line 3730 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3739,16 +3740,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3745: \$? = $ac_status" >&5
+  echo "$as_me:3746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3751: \$? = $ac_status" >&5
+  echo "$as_me:3752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3758,7 +3759,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3761 "configure"
+#line 3762 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3770,16 +3771,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3776: \$? = $ac_status" >&5
+  echo "$as_me:3777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3782: \$? = $ac_status" >&5
+  echo "$as_me:3783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3813,7 +3814,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3816: checking if $CXX works" >&5
+		echo "$as_me:3817: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3821,7 +3822,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3824 "configure"
+#line 3825 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3838,16 +3839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3844: \$? = $ac_status" >&5
+  echo "$as_me:3845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3850: \$? = $ac_status" >&5
+  echo "$as_me:3851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3858,11 +3859,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3861: result: $cf_cxx_works" >&5
+		echo "$as_me:3862: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3865: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3866: 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
@@ -3878,7 +3879,7 @@ ac_main_return="return"
 	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:3881: checking for $ac_word" >&5
+echo "$as_me:3882: 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
@@ -3895,7 +3896,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3898: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3899: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3906,17 +3907,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3909: result: $CXX" >&5
+  echo "$as_me:3910: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3912: result: no" >&5
+  echo "$as_me:3913: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3919: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3920: 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="";
 		;;
@@ -3925,7 +3926,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3928: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3929: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3933,7 +3934,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3936: result: $GXX_VERSION" >&5
+	echo "$as_me:3937: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3941,12 +3942,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3944: WARNING: templates do not work" >&5
+	{ echo "$as_me:3945: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3949: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3950: 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.
@@ -3956,15 +3957,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3959: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3962: checking if you want to build with Ada" >&5
+echo "$as_me:3963: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3964: result: $cf_with_ada" >&5
+echo "$as_me:3965: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3967: checking if you want to install terminal database" >&5
+echo "$as_me:3968: 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.
@@ -3974,10 +3975,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3977: result: $cf_with_db_install" >&5
+echo "$as_me:3978: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3980: checking if you want to install manpages" >&5
+echo "$as_me:3981: 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.
@@ -3987,10 +3988,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3990: result: $cf_with_manpages" >&5
+echo "$as_me:3991: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3993: checking if you want to build programs such as tic" >&5
+echo "$as_me:3994: 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.
@@ -4000,10 +4001,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:4003: result: $cf_with_progs" >&5
+echo "$as_me:4004: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:4006: checking if you want to build test-programs" >&5
+echo "$as_me:4007: 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.
@@ -4013,10 +4014,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:4016: result: $cf_with_tests" >&5
+echo "$as_me:4017: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:4019: checking if you wish to install curses.h" >&5
+echo "$as_me:4020: 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.
@@ -4026,7 +4027,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:4029: result: $with_curses_h" >&5
+echo "$as_me:4030: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -4050,7 +4051,7 @@ for ac_prog in mawk gawk nawk awk
 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:4053: checking for $ac_word" >&5
+echo "$as_me:4054: 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
@@ -4065,7 +4066,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:4068: found $ac_dir/$ac_word" >&5
+echo "$as_me:4069: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4073,17 +4074,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:4076: result: $AWK" >&5
+  echo "$as_me:4077: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:4079: result: no" >&5
+  echo "$as_me:4080: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:4086: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -4099,7 +4100,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:4102: checking for a BSD compatible install" >&5
+echo "$as_me:4103: 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
@@ -4148,7 +4149,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:4151: result: $INSTALL" >&5
+echo "$as_me:4152: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -4173,7 +4174,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4176: checking for $ac_word" >&5
+echo "$as_me:4177: 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
@@ -4188,7 +4189,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4191: found $ac_dir/$ac_word" >&5
+echo "$as_me:4192: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4196,10 +4197,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4199: result: $LINT" >&5
+  echo "$as_me:4200: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4202: result: no" >&5
+  echo "$as_me:4203: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4212,18 +4213,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:4215: checking whether ln -s works" >&5
+echo "$as_me:4216: 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:4219: result: yes" >&5
+  echo "$as_me:4220: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:4222: result: no, using $LN_S" >&5
+  echo "$as_me:4223: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:4226: checking if $LN_S -f options work" >&5
+echo "$as_me:4227: 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
@@ -4235,12 +4236,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:4238: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4239: 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:4243: checking for long file names" >&5
+echo "$as_me:4244: 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
@@ -4279,7 +4280,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4282: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4283: 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
 
@@ -4298,7 +4299,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4301: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4302: 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"
@@ -4308,7 +4309,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4311: checking if you want to use pkg-config" >&5
+echo "$as_me:4312: 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.
@@ -4318,7 +4319,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4321: result: $cf_pkg_config" >&5
+echo "$as_me:4322: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4330,7 +4331,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4333: checking for $ac_word" >&5
+echo "$as_me:4334: 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
@@ -4347,7 +4348,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4350: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4351: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4358,10 +4359,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4361: result: $PKG_CONFIG" >&5
+  echo "$as_me:4362: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4364: result: no" >&5
+  echo "$as_me:4365: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4370,7 +4371,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4373: checking for $ac_word" >&5
+echo "$as_me:4374: 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
@@ -4387,7 +4388,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4390: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4391: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4399,10 +4400,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4402: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4405: result: no" >&5
+  echo "$as_me:4406: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4445,24 +4446,24 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4448: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4449: 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:4455: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4456: 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:4461: checking for pkg-config library directory" >&5
+	echo "$as_me:4462: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4465: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4466: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4489,7 +4490,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4492: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4500,16 +4501,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x/*)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4508: result: auto" >&5
+	echo "$as_me:4509: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4512: checking for search-list" >&5
+	echo "$as_me:4513: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4536,11 +4537,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4539: result: $cf_search_path" >&5
+	echo "$as_me:4540: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4543: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4548,7 +4549,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4551: checking for first directory" >&5
+	echo "$as_me:4552: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4559,7 +4560,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4562: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4563: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4569,7 +4570,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4572: checking for workaround" >&5
+		echo "$as_me:4573: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4592,17 +4593,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4595: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4602: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4603: 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:4605: checking if we should install .pc files" >&5
+	echo "$as_me:4606: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4613,7 +4614,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4616: result: $enable_pc_files" >&5
+echo "$as_me:4617: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4621,7 +4622,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4624: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4652,7 +4653,7 @@ case ".$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4655: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4656: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4666,7 +4667,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4669: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4670: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4681,13 +4682,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4684: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4690: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4691: 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.
@@ -4697,11 +4698,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4700: result: $enable_mixedcase" >&5
+echo "$as_me:4701: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4704: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4705: 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
@@ -4728,7 +4729,7 @@ else
 fi
 
 fi
-echo "$as_me:4731: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4747,7 +4748,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4750: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4751: 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
@@ -4767,16 +4768,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4770: result: yes" >&5
+  echo "$as_me:4771: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4774: result: no" >&5
+  echo "$as_me:4775: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4779: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4780: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4831,7 +4832,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4834: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4842,7 +4843,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4845: checking for $ac_word" >&5
+echo "$as_me:4846: 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
@@ -4857,7 +4858,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4860: found $ac_dir/$ac_word" >&5
+echo "$as_me:4861: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4865,10 +4866,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4868: result: $CTAGS" >&5
+  echo "$as_me:4869: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4871: result: no" >&5
+  echo "$as_me:4872: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4879,7 +4880,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4882: checking for $ac_word" >&5
+echo "$as_me:4883: 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
@@ -4894,7 +4895,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4897: found $ac_dir/$ac_word" >&5
+echo "$as_me:4898: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4902,10 +4903,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4905: result: $ETAGS" >&5
+  echo "$as_me:4906: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4908: result: no" >&5
+  echo "$as_me:4909: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4914,7 +4915,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4917: checking for $ac_word" >&5
+echo "$as_me:4918: 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
@@ -4929,7 +4930,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4932: found $ac_dir/$ac_word" >&5
+echo "$as_me:4933: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4938,17 +4939,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4941: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4944: result: no" >&5
+  echo "$as_me:4945: 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:4951: checking for $ac_word" >&5
+echo "$as_me:4952: 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
@@ -4963,7 +4964,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4966: found $ac_dir/$ac_word" >&5
+echo "$as_me:4967: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4972,10 +4973,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4975: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4978: result: no" >&5
+  echo "$as_me:4979: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4995,7 +4996,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4998: checking for makeflags variable" >&5
+echo "$as_me:4999: 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
@@ -5025,7 +5026,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -5033,13 +5034,13 @@ echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:5036: result: $cf_cv_makeflags" >&5
+echo "$as_me:5037: 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:5042: checking for $ac_word" >&5
+echo "$as_me:5043: 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
@@ -5054,7 +5055,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5057: found $ac_dir/$ac_word" >&5
+echo "$as_me:5058: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5062,10 +5063,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5065: result: $RANLIB" >&5
+  echo "$as_me:5066: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5068: result: no" >&5
+  echo "$as_me:5069: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5074,7 +5075,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5077: checking for $ac_word" >&5
+echo "$as_me:5078: 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
@@ -5089,7 +5090,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5092: found $ac_dir/$ac_word" >&5
+echo "$as_me:5093: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5098,10 +5099,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5101: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5104: result: no" >&5
+  echo "$as_me:5105: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5113,7 +5114,7 @@ fi
 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:5116: checking for $ac_word" >&5
+echo "$as_me:5117: 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
@@ -5128,7 +5129,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:5131: found $ac_dir/$ac_word" >&5
+echo "$as_me:5132: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5136,10 +5137,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:5139: result: $LD" >&5
+  echo "$as_me:5140: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:5142: result: no" >&5
+  echo "$as_me:5143: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5148,7 +5149,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:5151: checking for $ac_word" >&5
+echo "$as_me:5152: 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
@@ -5163,7 +5164,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:5166: found $ac_dir/$ac_word" >&5
+echo "$as_me:5167: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5172,10 +5173,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:5175: result: $ac_ct_LD" >&5
+  echo "$as_me:5176: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:5178: result: no" >&5
+  echo "$as_me:5179: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5187,7 +5188,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5190: checking for $ac_word" >&5
+echo "$as_me:5191: 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
@@ -5202,7 +5203,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5205: found $ac_dir/$ac_word" >&5
+echo "$as_me:5206: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5210,10 +5211,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5213: result: $AR" >&5
+  echo "$as_me:5214: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5216: result: no" >&5
+  echo "$as_me:5217: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5222,7 +5223,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5225: checking for $ac_word" >&5
+echo "$as_me:5226: 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
@@ -5237,7 +5238,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5240: found $ac_dir/$ac_word" >&5
+echo "$as_me:5241: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5246,10 +5247,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5249: result: $ac_ct_AR" >&5
+  echo "$as_me:5250: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5252: result: no" >&5
+  echo "$as_me:5253: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5261,7 +5262,7 @@ fi
 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:5264: checking for $ac_word" >&5
+echo "$as_me:5265: 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
@@ -5276,7 +5277,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5279: found $ac_dir/$ac_word" >&5
+echo "$as_me:5280: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5284,10 +5285,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5287: result: $NM" >&5
+  echo "$as_me:5288: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5290: result: no" >&5
+  echo "$as_me:5291: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5296,7 +5297,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5299: checking for $ac_word" >&5
+echo "$as_me:5300: 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
@@ -5311,7 +5312,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5314: found $ac_dir/$ac_word" >&5
+echo "$as_me:5315: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5320,10 +5321,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5323: result: $ac_ct_NM" >&5
+  echo "$as_me:5324: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5326: result: no" >&5
+  echo "$as_me:5327: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5335,7 +5336,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5338: checking for $ac_word" >&5
+echo "$as_me:5339: 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
@@ -5350,7 +5351,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5353: found $ac_dir/$ac_word" >&5
+echo "$as_me:5354: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5358,10 +5359,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5361: result: $AR" >&5
+  echo "$as_me:5362: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5364: result: no" >&5
+  echo "$as_me:5365: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5370,7 +5371,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5373: checking for $ac_word" >&5
+echo "$as_me:5374: 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
@@ -5385,7 +5386,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5388: found $ac_dir/$ac_word" >&5
+echo "$as_me:5389: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5394,10 +5395,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5397: result: $ac_ct_AR" >&5
+  echo "$as_me:5398: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5400: result: no" >&5
+  echo "$as_me:5401: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5406,7 +5407,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5409: checking for options to update archives" >&5
+echo "$as_me:5410: 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
@@ -5443,13 +5444,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5446 "configure"
+#line 5447 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5452: \$? = $ac_status" >&5
+  echo "$as_me:5453: \$? = $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
@@ -5460,7 +5461,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5470,7 +5471,7 @@ echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5473: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5481,7 +5482,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5484: checking for an installation directory prefix" >&5
+echo "$as_me:5485: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5494,7 +5495,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5497: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
 ###############################################################################
@@ -5529,7 +5530,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5532: checking for $ac_word" >&5
+echo "$as_me:5533: 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
@@ -5544,7 +5545,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5547: found $ac_dir/$ac_word" >&5
+echo "$as_me:5548: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5552,10 +5553,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5555: result: $BUILD_CC" >&5
+  echo "$as_me:5556: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5558: result: no" >&5
+  echo "$as_me:5559: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5564,12 +5565,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5567: checking for native build C compiler" >&5
+	echo "$as_me:5568: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5569: result: $BUILD_CC" >&5
+	echo "$as_me:5570: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5572: checking for native build C preprocessor" >&5
+	echo "$as_me:5573: 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.
@@ -5579,10 +5580,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5582: result: $BUILD_CPP" >&5
+	echo "$as_me:5583: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5585: checking for native build C flags" >&5
+	echo "$as_me:5586: 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.
@@ -5590,10 +5591,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5593: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5596: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5597: 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.
@@ -5601,10 +5602,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5604: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5607: checking for native build linker-flags" >&5
+	echo "$as_me:5608: 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.
@@ -5612,10 +5613,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5615: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5618: checking for native build linker-libraries" >&5
+	echo "$as_me:5619: 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.
@@ -5623,7 +5624,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5626: result: $BUILD_LIBS" >&5
+	echo "$as_me:5627: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5632,7 +5633,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5635: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5636: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5646,7 +5647,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5649 "configure"
+#line 5650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5656,15 +5657,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5662: \$? = $ac_status" >&5
+  echo "$as_me:5663: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5667: \$? = $ac_status" >&5
+  echo "$as_me:5668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5679,12 +5680,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5682: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5683: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5687: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5688: 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;}
@@ -5709,7 +5710,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5712: checking if libtool -version-number should be used" >&5
+echo "$as_me:5713: 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.
@@ -5726,7 +5727,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5729: result: $cf_libtool_version" >&5
+echo "$as_me:5730: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5735,25 +5736,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5738: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5739: 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}:5745: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5746: 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}:5752: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5756: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5775,7 +5776,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5778: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5779: 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.
@@ -5785,7 +5786,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5788: result: $with_libtool" >&5
+echo "$as_me:5789: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5816,7 +5817,7 @@ case ".$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5819: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5829,7 +5830,7 @@ esac
   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:5832: checking for $ac_word" >&5
+echo "$as_me:5833: 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
@@ -5844,7 +5845,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5847: found $ac_dir/$ac_word" >&5
+echo "$as_me:5848: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5852,10 +5853,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5855: result: $LIBTOOL" >&5
+  echo "$as_me:5856: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5858: result: no" >&5
+  echo "$as_me:5859: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5868,7 +5869,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5871: checking for $ac_word" >&5
+echo "$as_me:5872: 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
@@ -5883,7 +5884,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5886: found $ac_dir/$ac_word" >&5
+echo "$as_me:5887: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5891,10 +5892,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5894: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5897: result: no" >&5
+  echo "$as_me:5898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5925,7 +5926,7 @@ unset LIBTOOL
   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:5928: checking for $ac_word" >&5
+echo "$as_me:5929: 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
@@ -5940,7 +5941,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5943: found $ac_dir/$ac_word" >&5
+echo "$as_me:5944: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5948,10 +5949,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5951: result: $LIBTOOL" >&5
+  echo "$as_me:5952: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5954: result: no" >&5
+  echo "$as_me:5955: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5964,7 +5965,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5967: checking for $ac_word" >&5
+echo "$as_me:5968: 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
@@ -5979,7 +5980,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5982: found $ac_dir/$ac_word" >&5
+echo "$as_me:5983: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5987,10 +5988,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5990: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5993: result: no" >&5
+  echo "$as_me:5994: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6012,7 +6013,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:6015: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6016: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6028,7 +6029,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:6031: checking version of $LIBTOOL" >&5
+	echo "$as_me:6032: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -6039,8 +6040,9 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:6042: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
+
 	if test -n "$cf_cv_libtool_version"
 	then
 		cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[()],...,g' -e 's,[ ],-,g' -e '2,$d'`
@@ -6048,18 +6050,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:6051: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6053: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:6057: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6059: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
+
 else
-	{ { echo "$as_me:6062: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6065: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6095,7 +6098,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:6098: checking if you want to build shared libraries" >&5
+echo "$as_me:6101: 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.
@@ -6105,11 +6108,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:6108: result: $with_shared" >&5
+echo "$as_me:6111: 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:6112: checking if you want to build static libraries" >&5
+echo "$as_me:6115: 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.
@@ -6119,11 +6122,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:6122: result: $with_normal" >&5
+echo "$as_me:6125: 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:6126: checking if you want to build debug libraries" >&5
+echo "$as_me:6129: 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.
@@ -6133,11 +6136,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:6136: result: $with_debug" >&5
+echo "$as_me:6139: 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:6140: checking if you want to build profiling libraries" >&5
+echo "$as_me:6143: 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.
@@ -6147,7 +6150,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:6150: result: $with_profile" >&5
+echo "$as_me:6153: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -6155,7 +6158,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:6158: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6161: 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.
@@ -6165,26 +6168,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:6168: result: $with_shared_cxx" >&5
+echo "$as_me:6171: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:6175: checking for specified models" >&5
+echo "$as_me:6178: 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:6179: result: $cf_list_models" >&5
+echo "$as_me:6182: 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:6184: checking for default model" >&5
+echo "$as_me:6187: 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:6187: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6190: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -6198,7 +6201,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:6201: checking if you want to have a library-prefix" >&5
+echo "$as_me:6204: 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.
@@ -6208,7 +6211,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:6211: result: $with_lib_prefix" >&5
+echo "$as_me:6214: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -6239,24 +6242,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:6242: checking for PATH separator" >&5
+	echo "$as_me:6245: 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:6249: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6252: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:6253: checking for ANSI C header files" >&5
+echo "$as_me:6256: 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 6259 "configure"
+#line 6262 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6264,13 +6267,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6273: \$? = $ac_status" >&5
+  echo "$as_me:6276: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6292,7 +6295,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6295 "configure"
+#line 6298 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6310,7 +6313,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6313 "configure"
+#line 6316 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6331,7 +6334,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6334 "configure"
+#line 6337 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6357,15 +6360,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6363: \$? = $ac_status" >&5
+  echo "$as_me:6366: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6368: \$? = $ac_status" >&5
+  echo "$as_me:6371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6378,7 +6381,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6381: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6394,28 +6397,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6397: checking for $ac_header" >&5
+echo "$as_me:6400: 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 6403 "configure"
+#line 6406 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6412: \$? = $ac_status" >&5
+  echo "$as_me:6415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6418: \$? = $ac_status" >&5
+  echo "$as_me:6421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6425,7 +6428,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6428: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6431: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6435,13 +6438,13 @@ EOF
 fi
 done
 
-echo "$as_me:6438: checking whether exit is declared" >&5
+echo "$as_me:6441: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6444 "configure"
+#line 6447 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6456,16 +6459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6462: \$? = $ac_status" >&5
+  echo "$as_me:6465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6468: \$? = $ac_status" >&5
+  echo "$as_me:6471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6475,19 +6478,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6478: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6481: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6484: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6487: 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 6490 "configure"
+#line 6493 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6502,16 +6505,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6508: \$? = $ac_status" >&5
+  echo "$as_me:6511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6514: \$? = $ac_status" >&5
+  echo "$as_me:6517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6521,7 +6524,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6527: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6534,7 +6537,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6537: checking for opendir in -ldir" >&5
+  echo "$as_me:6540: 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
@@ -6542,7 +6545,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6545 "configure"
+#line 6548 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6561,16 +6564,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6567: \$? = $ac_status" >&5
+  echo "$as_me:6570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6573: \$? = $ac_status" >&5
+  echo "$as_me:6576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6581,14 +6584,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6584: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6587: 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:6591: checking for opendir in -lx" >&5
+  echo "$as_me:6594: 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
@@ -6596,7 +6599,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6599 "configure"
+#line 6602 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6615,16 +6618,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6621: \$? = $ac_status" >&5
+  echo "$as_me:6624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6627: \$? = $ac_status" >&5
+  echo "$as_me:6630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6635,7 +6638,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6638: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6641: 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"
@@ -6645,7 +6648,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6648: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6651: 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.
@@ -6655,10 +6658,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6658: result: $with_termlib" >&5
+echo "$as_me:6661: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6661: checking if you want to build a separate tic library" >&5
+echo "$as_me:6664: 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.
@@ -6668,7 +6671,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6671: result: $with_ticlib" >&5
+echo "$as_me:6674: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6681,7 +6684,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6684: checking for default loader flags" >&5
+echo "$as_me:6687: 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=''   ;;
@@ -6690,13 +6693,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6693: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6699: checking if rpath option should be used" >&5
+echo "$as_me:6702: 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.
@@ -6706,10 +6709,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6709: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6712: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6715: 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.
@@ -6719,7 +6722,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6722: result: $cf_cv_do_relink" >&5
+echo "$as_me:6725: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6730,7 +6733,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6733: checking for an rpath option" >&5
+	echo "$as_me:6736: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6761,12 +6764,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6764: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6769: checking if we need a space after rpath option" >&5
+		echo "$as_me:6772: 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"
 
@@ -6787,7 +6790,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6790 "configure"
+#line 6793 "configure"
 #include "confdefs.h"
 
 int
@@ -6799,16 +6802,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6805: \$? = $ac_status" >&5
+  echo "$as_me:6808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6811: \$? = $ac_status" >&5
+  echo "$as_me:6814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6818,7 +6821,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6821: result: $cf_rpath_space" >&5
+		echo "$as_me:6824: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6840,7 +6843,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6843: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6846: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6855,9 +6858,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6858: result: $withval" >&5
+		echo "$as_me:6861: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6860: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6863: 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; }; }
 		;;
@@ -6866,7 +6869,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6869: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6889,14 +6892,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6892: checking which $CC option to use" >&5
+		echo "$as_me:6895: 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 6899 "configure"
+#line 6902 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6908,16 +6911,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6914: \$? = $ac_status" >&5
+  echo "$as_me:6917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6920: \$? = $ac_status" >&5
+  echo "$as_me:6923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6926,7 +6929,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6929: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -6997,7 +7000,7 @@ CF_EOF
 		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:7000: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7003: 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
@@ -7006,7 +7009,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7009 "configure"
+#line 7012 "configure"
 #include "confdefs.h"
 
 int
@@ -7018,16 +7021,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7024: \$? = $ac_status" >&5
+  echo "$as_me:7027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7030: \$? = $ac_status" >&5
+  echo "$as_me:7033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -7038,7 +7041,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:7041: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7044: 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"
@@ -7388,7 +7391,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7391 "configure"
+#line 7394 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7400,16 +7403,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7406: \$? = $ac_status" >&5
+  echo "$as_me:7409: \$? = $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:7412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7412: \$? = $ac_status" >&5
+  echo "$as_me:7415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7446,7 +7449,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7449: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7456,7 +7459,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7459 "${as_me:-configure}"
+#line 7462 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7468,18 +7471,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7471: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7474: 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:7473: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7476: \$? = $ac_status" >&5
+  echo "$as_me:7479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7478: result: yes" >&5
+				echo "$as_me:7481: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7482: result: no" >&5
+				echo "$as_me:7485: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7494,17 +7497,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7497: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7500: 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}:7501: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7504: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7507: checking for additional libtool options" >&5
+echo "$as_me:7510: 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.
@@ -7514,7 +7517,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7517: result: $with_libtool_opts" >&5
+echo "$as_me:7520: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7525,7 +7528,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7528: checking if exported-symbols file should be used" >&5
+echo "$as_me:7531: 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.
@@ -7540,7 +7543,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7543: result: $with_export_syms" >&5
+echo "$as_me:7546: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7551,15 +7554,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7554: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7557: 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:7559: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7562: 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 7562 "configure"
+#line 7565 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7571,16 +7574,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7577: \$? = $ac_status" >&5
+  echo "$as_me:7580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7583: \$? = $ac_status" >&5
+  echo "$as_me:7586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7589,18 +7592,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7592: result: $cf_cflags_work" >&5
+		echo "$as_me:7595: 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}:7598: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7601: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7603: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7606: 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.
@@ -7618,18 +7621,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7621: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7624: 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:7626: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7629: 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:7632: result: $with_versioned_syms" >&5
+echo "$as_me:7635: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7645,7 +7648,7 @@ then
 		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}:7648: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7651: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7653,11 +7656,11 @@ echo "${as_me:-configure}:7648: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7656: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7659: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7660: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7669,7 +7672,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7672: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7675: 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
 
@@ -7706,7 +7709,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7709 "configure"
+#line 7712 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7737,7 +7740,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7740: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7743: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7750,7 +7753,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7753: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7756: 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.
@@ -7760,27 +7763,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7763: result: $with_gpm" >&5
+echo "$as_me:7766: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7767: checking for gpm.h" >&5
+	echo "$as_me:7770: 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 7773 "configure"
+#line 7776 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7777: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7780: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7783: \$? = $ac_status" >&5
+  echo "$as_me:7786: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7799,7 +7802,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7802: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7805: 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
 
@@ -7810,7 +7813,7 @@ EOF
 		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}:7813: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7816: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7818,7 +7821,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7821: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7824: 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
@@ -7826,7 +7829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7829 "configure"
+#line 7832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7845,16 +7848,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7851: \$? = $ac_status" >&5
+  echo "$as_me:7854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7857: \$? = $ac_status" >&5
+  echo "$as_me:7860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7865,18 +7868,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7868: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7871: 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:7875: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7878: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7879: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7882: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7887,7 +7890,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7890: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7896,7 +7899,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7899: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7902: 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.
@@ -7906,18 +7909,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7909: result: $with_dlsym" >&5
+	echo "$as_me:7912: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7914: checking for dlsym" >&5
+echo "$as_me:7917: 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 7920 "configure"
+#line 7923 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7948,16 +7951,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7954: \$? = $ac_status" >&5
+  echo "$as_me:7957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7960: \$? = $ac_status" >&5
+  echo "$as_me:7963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7967,14 +7970,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7970: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7973: 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:7977: checking for dlsym in -ldl" >&5
+echo "$as_me:7980: 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
@@ -7982,7 +7985,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7985 "configure"
+#line 7988 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8001,16 +8004,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8007: \$? = $ac_status" >&5
+  echo "$as_me:8010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8013: \$? = $ac_status" >&5
+  echo "$as_me:8016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8021,7 +8024,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8024: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8027: 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
 
@@ -8050,10 +8053,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8053: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8056: 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 8056 "configure"
+#line 8059 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -8071,16 +8074,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8077: \$? = $ac_status" >&5
+  echo "$as_me:8080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8083: \$? = $ac_status" >&5
+  echo "$as_me:8086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8091,15 +8094,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8094: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8097: 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:8099: result: ok" >&5
+	echo "$as_me:8102: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8102: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8105: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8107,12 +8110,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8110: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8115: checking for soname of gpm library" >&5
+echo "$as_me:8118: 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
@@ -8146,15 +8149,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8149: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8152: \$? = $ac_status" >&5
+  echo "$as_me:8155: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8154: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8157: \$? = $ac_status" >&5
+  echo "$as_me:8160: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8165,7 +8168,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8168: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8233,7 +8236,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8236: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8239: 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
@@ -8241,7 +8244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8244 "configure"
+#line 8247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8260,16 +8263,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8266: \$? = $ac_status" >&5
+  echo "$as_me:8269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8272: \$? = $ac_status" >&5
+  echo "$as_me:8275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8280,11 +8283,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8283: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8286: 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:8287: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8290: 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
@@ -8308,15 +8311,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8314: \$? = $ac_status" >&5
+  echo "$as_me:8317: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8319: \$? = $ac_status" >&5
+  echo "$as_me:8322: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8328,11 +8331,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8331: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8334: 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:8335: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8338: 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
 
@@ -8340,7 +8343,7 @@ fi
 
 fi
 
-echo "$as_me:8343: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8346: 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.
@@ -8349,7 +8352,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8352: result: $with_pcre2" >&5
+echo "$as_me:8355: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8360,17 +8363,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8363: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8366: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8369: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8372: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8373: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8494,7 +8497,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8497: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8507,7 +8510,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8510: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8513: 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
@@ -8515,7 +8518,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8518 "configure"
+#line 8521 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8534,16 +8537,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8540: \$? = $ac_status" >&5
+  echo "$as_me:8543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:8549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8554,7 +8557,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8557: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8560: 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
 
@@ -8575,7 +8578,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8578: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8581: 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
@@ -8583,7 +8586,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8586 "configure"
+#line 8589 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8602,16 +8605,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8608: \$? = $ac_status" >&5
+  echo "$as_me:8611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8614: \$? = $ac_status" >&5
+  echo "$as_me:8617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8622,7 +8625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8625: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8628: 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
 
@@ -8643,7 +8646,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8646: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8658,23 +8661,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8661: checking for $ac_header" >&5
+echo "$as_me:8664: 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 8667 "configure"
+#line 8670 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8671: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8674: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8677: \$? = $ac_status" >&5
+  echo "$as_me:8680: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8693,7 +8696,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8696: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8699: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8706,13 +8709,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8709: checking for $ac_func" >&5
+echo "$as_me:8712: 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 8715 "configure"
+#line 8718 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8743,16 +8746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8749: \$? = $ac_status" >&5
+  echo "$as_me:8752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8755: \$? = $ac_status" >&5
+  echo "$as_me:8758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8762,7 +8765,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8765: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8768: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8776,7 +8779,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8779: checking if you want to use sysmouse" >&5
+echo "$as_me:8782: 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.
@@ -8788,7 +8791,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8791 "configure"
+#line 8794 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8811,16 +8814,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8817: \$? = $ac_status" >&5
+  echo "$as_me:8820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8823: \$? = $ac_status" >&5
+  echo "$as_me:8826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8830,7 +8833,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8833: result: $cf_with_sysmouse" >&5
+echo "$as_me:8836: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8840,7 +8843,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8843: checking if you want to disable library suffixes" >&5
+echo "$as_me:8846: 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.
@@ -8857,13 +8860,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8860: result: $disable_lib_suffixes" >&5
+echo "$as_me:8863: 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:8866: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8869: 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.
@@ -8881,22 +8884,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8884: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8887: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8889: checking for updated LDFLAGS" >&5
+echo "$as_me:8892: 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:8892: result: maybe" >&5
+	echo "$as_me:8895: 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:8899: checking for $ac_word" >&5
+echo "$as_me:8902: 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
@@ -8911,7 +8914,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8914: found $ac_dir/$ac_word" >&5
+echo "$as_me:8917: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8919,10 +8922,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8922: result: $cf_ldd_prog" >&5
+  echo "$as_me:8925: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8925: result: no" >&5
+  echo "$as_me:8928: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8936,7 +8939,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8939 "configure"
+#line 8942 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8948,16 +8951,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8954: \$? = $ac_status" >&5
+  echo "$as_me:8957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8960: \$? = $ac_status" >&5
+  echo "$as_me:8963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8985,7 +8988,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -8997,11 +9000,11 @@ echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9000: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9004: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9038,7 +9041,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9041: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9051,11 +9054,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9054: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9058: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9092,7 +9095,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9095: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9105,14 +9108,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9108: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9112: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9115: result: no" >&5
+	echo "$as_me:9118: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9126,7 +9129,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9129: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9132: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9143,7 +9146,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9146: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9151,7 +9154,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9154: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9157: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9170,11 +9173,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9173: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9176: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9177: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9180: 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.
@@ -9184,10 +9187,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9187: result: $with_overwrite" >&5
+echo "$as_me:9190: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9190: checking if external terminfo-database is used" >&5
+echo "$as_me:9193: 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.
@@ -9197,7 +9200,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9200: result: $use_database" >&5
+echo "$as_me:9203: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9213,7 +9216,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9216: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9219: 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.
@@ -9221,10 +9224,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9224: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9227: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9227: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9230: 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.
@@ -9234,13 +9237,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9237: result: $with_hashed_db" >&5
+	echo "$as_me:9240: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9243: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9246: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9250,7 +9253,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9253: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9258,7 +9261,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9261: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9274,7 +9277,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9277: checking for $ac_word" >&5
+echo "$as_me:9280: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9289,7 +9292,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9292: found $ac_dir/$ac_word" >&5
+echo "$as_me:9295: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9297,10 +9300,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9300: result: $TIC" >&5
+  echo "$as_me:9303: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9303: result: no" >&5
+  echo "$as_me:9306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9309,7 +9312,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9312: checking for $ac_word" >&5
+echo "$as_me:9315: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9324,7 +9327,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9327: found $ac_dir/$ac_word" >&5
+echo "$as_me:9330: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9332,10 +9335,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9335: result: $ac_ct_TIC" >&5
+  echo "$as_me:9338: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9338: result: no" >&5
+  echo "$as_me:9341: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9347,7 +9350,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9350: checking for $ac_word" >&5
+echo "$as_me:9353: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9362,7 +9365,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9365: found $ac_dir/$ac_word" >&5
+echo "$as_me:9368: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9370,10 +9373,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9373: result: $INFOCMP" >&5
+  echo "$as_me:9376: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9376: result: no" >&5
+  echo "$as_me:9379: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9382,7 +9385,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9385: checking for $ac_word" >&5
+echo "$as_me:9388: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9397,7 +9400,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9400: found $ac_dir/$ac_word" >&5
+echo "$as_me:9403: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9405,10 +9408,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9408: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9411: result: no" >&5
+  echo "$as_me:9414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9423,10 +9426,10 @@ 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:9426: checking for tic program for fallbacks" >&5
+  echo "$as_me:9429: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9429: result: $TIC" >&5
+		echo "$as_me:9432: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9454,7 +9457,7 @@ case ".$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9457: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9467,7 +9470,7 @@ 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:9470: checking for $ac_word" >&5
+echo "$as_me:9473: 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
@@ -9484,7 +9487,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9487: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9490: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9495,10 +9498,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9498: result: $TIC" >&5
+  echo "$as_me:9501: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9501: result: no" >&5
+  echo "$as_me:9504: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9557,7 +9560,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9560: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9572,7 +9575,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9575: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9578: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9581,10 +9584,10 @@ 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:9584: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9587: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9587: result: $INFOCMP" >&5
+		echo "$as_me:9590: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9612,7 +9615,7 @@ case ".$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9615: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9625,7 +9628,7 @@ 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:9628: checking for $ac_word" >&5
+echo "$as_me:9631: 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
@@ -9642,7 +9645,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9645: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9648: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9653,10 +9656,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9656: result: $INFOCMP" >&5
+  echo "$as_me:9659: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9659: result: no" >&5
+  echo "$as_me:9662: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9715,7 +9718,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9718: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9730,7 +9733,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9733: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9736: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9740,7 +9743,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9743: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9746: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9748,7 +9751,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9751: checking if you want modern xterm or antique" >&5
+echo "$as_me:9754: 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.
@@ -9762,7 +9765,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9765: result: $with_xterm_new" >&5
+echo "$as_me:9768: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9775,7 +9778,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9778: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9781: 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.
@@ -9799,13 +9802,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9802: result: $with_xterm_kbs" >&5
+echo "$as_me:9805: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9808: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9811: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9815,7 +9818,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9818: checking for list of terminfo directories" >&5
+echo "$as_me:9821: 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.
@@ -9855,7 +9858,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9858: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9861: 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; }; }
 	;;
@@ -9878,7 +9881,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9881: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9887,13 +9890,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9890: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9893: 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:9896: checking for default terminfo directory" >&5
+echo "$as_me:9899: 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.
@@ -9929,7 +9932,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9932: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9938,7 +9941,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9941: result: $TERMINFO" >&5
+echo "$as_me:9944: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9949,7 +9952,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9952: checking if big-core option selected" >&5
+echo "$as_me:9955: 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.
@@ -9961,7 +9964,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9964 "configure"
+#line 9967 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9975,15 +9978,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9981: \$? = $ac_status" >&5
+  echo "$as_me:9984: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9986: \$? = $ac_status" >&5
+  echo "$as_me:9989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9995,7 +9998,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:9998: result: $with_big_core" >&5
+echo "$as_me:10001: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10005,7 +10008,7 @@ EOF
 ### 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:10008: checking if big-strings option selected" >&5
+echo "$as_me:10011: 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.
@@ -10029,14 +10032,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10032: result: $with_big_strings" >&5
+echo "$as_me:10035: 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:10039: checking if you want termcap-fallback support" >&5
+echo "$as_me:10042: 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.
@@ -10046,14 +10049,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10049: result: $with_termcap" >&5
+echo "$as_me:10052: 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:10056: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10059: 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
@@ -10066,13 +10069,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10069: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10072: 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:10075: checking for list of termcap files" >&5
+	echo "$as_me:10078: 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.
@@ -10112,7 +10115,7 @@ case ".$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10115: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10118: 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; }; }
 	;;
@@ -10135,7 +10138,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10138: result: $TERMPATH" >&5
+	echo "$as_me:10141: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10143,7 +10146,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10146: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10149: 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.
@@ -10153,14 +10156,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10156: result: $with_getcap" >&5
+	echo "$as_me:10159: 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:10163: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10166: 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.
@@ -10170,7 +10173,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10173: result: $with_getcap_cache" >&5
+	echo "$as_me:10176: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10180,7 +10183,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10183: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10186: 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.
@@ -10190,14 +10193,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10193: result: $with_home_terminfo" >&5
+echo "$as_me:10196: 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:10200: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10203: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10207,14 +10210,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10210: result: $with_root_environ" >&5
+echo "$as_me:10213: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10217: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10220: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10224,14 +10227,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10227: result: $with_root_access" >&5
+echo "$as_me:10230: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10234: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10237: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10241,7 +10244,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10244: result: $with_setuid_environ" >&5
+echo "$as_me:10247: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10256,23 +10259,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10259: checking for $ac_header" >&5
+echo "$as_me:10262: 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 10265 "configure"
+#line 10268 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10272: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10275: \$? = $ac_status" >&5
+  echo "$as_me:10278: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10291,7 +10294,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10306,13 +10309,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10309: checking for $ac_func" >&5
+echo "$as_me:10312: 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 10315 "configure"
+#line 10318 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10343,16 +10346,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10349: \$? = $ac_status" >&5
+  echo "$as_me:10352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10355: \$? = $ac_status" >&5
+  echo "$as_me:10358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10362,7 +10365,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10365: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10379,13 +10382,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10382: checking for $ac_func" >&5
+echo "$as_me:10385: 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 10388 "configure"
+#line 10391 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10416,16 +10419,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10422: \$? = $ac_status" >&5
+  echo "$as_me:10425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10428: \$? = $ac_status" >&5
+  echo "$as_me:10431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10435,7 +10438,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10438: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10441: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10446,7 +10449,7 @@ fi
 done
 
 else
-	echo "$as_me:10449: checking if link/symlink functions work" >&5
+	echo "$as_me:10452: 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
@@ -10459,7 +10462,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10462 "configure"
+#line 10465 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10493,15 +10496,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10499: \$? = $ac_status" >&5
+  echo "$as_me:10502: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10504: \$? = $ac_status" >&5
+  echo "$as_me:10507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10519,7 +10522,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10522: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10539,7 +10542,7 @@ with_symlinks=no
 # 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:10542: checking if tic should use symbolic links" >&5
+	echo "$as_me:10545: 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.
@@ -10549,21 +10552,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10552: result: $with_symlinks" >&5
+	echo "$as_me:10555: 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:10559: checking if tic should use hard links" >&5
+	echo "$as_me:10562: 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:10566: result: $with_links" >&5
+	echo "$as_me:10569: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10579,7 +10582,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10582: checking if you want broken-linker support code" >&5
+echo "$as_me:10585: 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.
@@ -10589,7 +10592,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10592: result: $with_broken_linker" >&5
+echo "$as_me:10595: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10603,7 +10606,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10606: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10609: 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.
@@ -10613,7 +10616,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10616: result: $with_bsdpad" >&5
+echo "$as_me:10619: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10632,14 +10635,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10635: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10638: 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 10642 "configure"
+#line 10645 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10658,16 +10661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:10667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10670: \$? = $ac_status" >&5
+  echo "$as_me:10673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10678,7 +10681,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10681: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10720,14 +10723,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10723: checking if this is the GNU C library" >&5
+echo "$as_me:10726: 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 10730 "configure"
+#line 10733 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10746,16 +10749,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10752: \$? = $ac_status" >&5
+  echo "$as_me:10755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:10761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10766,7 +10769,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10769: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10774,7 +10777,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10777: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10780: 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
@@ -10786,7 +10789,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10789 "configure"
+#line 10792 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10805,16 +10808,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10811: \$? = $ac_status" >&5
+  echo "$as_me:10814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10817: \$? = $ac_status" >&5
+  echo "$as_me:10820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10826,12 +10829,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10829: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10832: 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:10834: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10837: 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
@@ -10936,7 +10939,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10939 "configure"
+#line 10942 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10956,16 +10959,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10962: \$? = $ac_status" >&5
+  echo "$as_me:10965: \$? = $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:10968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10968: \$? = $ac_status" >&5
+  echo "$as_me:10971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10976,7 +10979,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10979: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10982: 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
@@ -10985,14 +10988,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10988: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10991: 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 10995 "configure"
+#line 10998 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11007,16 +11010,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11013: \$? = $ac_status" >&5
+  echo "$as_me:11016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11019: \$? = $ac_status" >&5
+  echo "$as_me:11022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11123,7 +11126,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11126 "configure"
+#line 11129 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11138,16 +11141,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11144: \$? = $ac_status" >&5
+  echo "$as_me:11147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11150: \$? = $ac_status" >&5
+  echo "$as_me:11153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11162,12 +11165,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11165: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11168: 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:11170: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11173: 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
@@ -11177,7 +11180,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11180 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11192,16 +11195,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11198: \$? = $ac_status" >&5
+  echo "$as_me:11201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11204: \$? = $ac_status" >&5
+  echo "$as_me:11207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11212,7 +11215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11215: result: $cf_cv_default_source" >&5
+echo "$as_me:11218: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11249,16 +11252,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11252: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11255: 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}:11258: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11261: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11261 "configure"
+#line 11264 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11273,16 +11276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11279: \$? = $ac_status" >&5
+  echo "$as_me:11282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11285: \$? = $ac_status" >&5
+  echo "$as_me:11288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11303,7 +11306,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11306 "configure"
+#line 11309 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11318,16 +11321,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11324: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11330: \$? = $ac_status" >&5
+  echo "$as_me:11333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11338,7 +11341,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11346,10 +11349,10 @@ echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11349: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11352 "configure"
+#line 11355 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11364,16 +11367,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11370: \$? = $ac_status" >&5
+  echo "$as_me:11373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11376: \$? = $ac_status" >&5
+  echo "$as_me:11379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11389,7 +11392,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11392: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11395: 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
@@ -11506,7 +11509,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11509: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11512: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11538,14 +11541,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11541: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11544: 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 11548 "configure"
+#line 11551 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11563,16 +11566,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11569: \$? = $ac_status" >&5
+  echo "$as_me:11572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11575: \$? = $ac_status" >&5
+  echo "$as_me:11578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11584,7 +11587,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11587 "configure"
+#line 11590 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11602,16 +11605,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11608: \$? = $ac_status" >&5
+  echo "$as_me:11611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11614: \$? = $ac_status" >&5
+  echo "$as_me:11617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11626,7 +11629,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11629: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11786,16 +11789,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11789: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11792: 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}:11795: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11798: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11798 "configure"
+#line 11801 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11810,16 +11813,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11816: \$? = $ac_status" >&5
+  echo "$as_me:11819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11822: \$? = $ac_status" >&5
+  echo "$as_me:11825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11840,7 +11843,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11843 "configure"
+#line 11846 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11855,16 +11858,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11861: \$? = $ac_status" >&5
+  echo "$as_me:11864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11867: \$? = $ac_status" >&5
+  echo "$as_me:11870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11875,7 +11878,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11883,10 +11886,10 @@ echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11886: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11889 "configure"
+#line 11892 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11901,16 +11904,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11907: \$? = $ac_status" >&5
+  echo "$as_me:11910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11913: \$? = $ac_status" >&5
+  echo "$as_me:11916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11926,7 +11929,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11929: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11932: 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
@@ -12039,10 +12042,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12042: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12045 "configure"
+#line 12048 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12060,23 +12063,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12066: \$? = $ac_status" >&5
+  echo "$as_me:12069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12072: \$? = $ac_status" >&5
+  echo "$as_me:12075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12079: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12082: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12099,7 +12102,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12102: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12111,7 +12114,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12114: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12199,7 +12202,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12209,7 +12212,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12219,7 +12222,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12222: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12225: 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"
@@ -12231,10 +12234,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12234: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12237: 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 12237 "configure"
+#line 12240 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12249,16 +12252,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12255: \$? = $ac_status" >&5
+  echo "$as_me:12258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12261: \$? = $ac_status" >&5
+  echo "$as_me:12264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12267,12 +12270,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12270: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12273: 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 12275 "configure"
+#line 12278 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12287,16 +12290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12307,19 +12310,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12310: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12315: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12318: 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 12322 "configure"
+#line 12325 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12337,16 +12340,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12343: \$? = $ac_status" >&5
+  echo "$as_me:12346: \$? = $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:12349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12349: \$? = $ac_status" >&5
+  echo "$as_me:12352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12358,7 +12361,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12361 "configure"
+#line 12364 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12376,16 +12379,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12382: \$? = $ac_status" >&5
+  echo "$as_me:12385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12388: \$? = $ac_status" >&5
+  echo "$as_me:12391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12400,7 +12403,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12403: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12551,14 +12554,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12554: checking if SIGWINCH is defined" >&5
+echo "$as_me:12557: 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 12561 "configure"
+#line 12564 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12573,23 +12576,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12579: \$? = $ac_status" >&5
+  echo "$as_me:12582: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12585: \$? = $ac_status" >&5
+  echo "$as_me:12588: \$? = $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 12592 "configure"
+#line 12595 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12607,16 +12610,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12613: \$? = $ac_status" >&5
+  echo "$as_me:12616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12619: \$? = $ac_status" >&5
+  echo "$as_me:12622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12630,11 +12633,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12633: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12636: 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:12637: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12640: 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
@@ -12645,7 +12648,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12648 "configure"
+#line 12651 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12667,16 +12670,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12673: \$? = $ac_status" >&5
+  echo "$as_me:12676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12679: \$? = $ac_status" >&5
+  echo "$as_me:12682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12690,7 +12693,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12693: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12700,13 +12703,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12703: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12706: 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 12709 "configure"
+#line 12712 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12720,16 +12723,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12726: \$? = $ac_status" >&5
+  echo "$as_me:12729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12732: \$? = $ac_status" >&5
+  echo "$as_me:12735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12740,7 +12743,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12743: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12754,7 +12757,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12757: checking if you want wide-character code" >&5
+echo "$as_me:12760: 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.
@@ -12764,7 +12767,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12767: result: $with_widec" >&5
+echo "$as_me:12770: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12786,7 +12789,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12789: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12792: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12799,23 +12802,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12802: checking for $ac_header" >&5
+echo "$as_me:12805: 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 12808 "configure"
+#line 12811 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12812: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12815: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12818: \$? = $ac_status" >&5
+  echo "$as_me:12821: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12834,7 +12837,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12837: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12840: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12844,14 +12847,14 @@ EOF
 fi
 done
 
-echo "$as_me:12847: checking if wchar.h can be used as is" >&5
+echo "$as_me:12850: 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 12854 "configure"
+#line 12857 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12873,16 +12876,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12879: \$? = $ac_status" >&5
+  echo "$as_me:12882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12885: \$? = $ac_status" >&5
+  echo "$as_me:12888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12892,16 +12895,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12895: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12898: 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:12901: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12904: 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 12904 "configure"
+#line 12907 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12917,16 +12920,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12923: \$? = $ac_status" >&5
+  echo "$as_me:12926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12929: \$? = $ac_status" >&5
+  echo "$as_me:12932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12935,16 +12938,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12938: result: $cf_result" >&5
+echo "$as_me:12941: 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:12944: checking checking for compatible value versus " >&5
+	echo "$as_me:12947: 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 12947 "configure"
+#line 12950 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12960,16 +12963,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12966: \$? = $ac_status" >&5
+  echo "$as_me:12969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12972: \$? = $ac_status" >&5
+  echo "$as_me:12975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12978,7 +12981,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12981: result: $cf_result" >&5
+	echo "$as_me:12984: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12988,7 +12991,7 @@ fi
 
 fi
 
-echo "$as_me:12991: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12994: 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
@@ -13059,7 +13062,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13062 "configure"
+#line 13065 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13104,15 +13107,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13110: \$? = $ac_status" >&5
+  echo "$as_me:13113: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13115: \$? = $ac_status" >&5
+  echo "$as_me:13118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13125,7 +13128,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13128: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13136,13 +13139,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13139: checking for $ac_func" >&5
+echo "$as_me:13142: 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 13145 "configure"
+#line 13148 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13173,16 +13176,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13179: \$? = $ac_status" >&5
+  echo "$as_me:13182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13185: \$? = $ac_status" >&5
+  echo "$as_me:13188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13192,7 +13195,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13195: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13198: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13207,23 +13210,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13210: checking for $ac_header" >&5
+echo "$as_me:13213: 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 13216 "configure"
+#line 13219 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13226: \$? = $ac_status" >&5
+  echo "$as_me:13229: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13242,7 +13245,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13252,7 +13255,7 @@ EOF
 fi
 done
 
-echo "$as_me:13255: checking for multibyte character support" >&5
+echo "$as_me:13258: 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
@@ -13260,7 +13263,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13263 "configure"
+#line 13266 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13277,16 +13280,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13283: \$? = $ac_status" >&5
+  echo "$as_me:13286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13289: \$? = $ac_status" >&5
+  echo "$as_me:13292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13298,12 +13301,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13301: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13306 "configure"
+#line 13309 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13316,16 +13319,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13322: \$? = $ac_status" >&5
+  echo "$as_me:13325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13328: \$? = $ac_status" >&5
+  echo "$as_me:13331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13339,7 +13342,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13342 "configure"
+#line 13345 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13352,16 +13355,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13358: \$? = $ac_status" >&5
+  echo "$as_me:13361: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13378,9 +13381,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13381: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13383: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13471,7 +13474,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13474: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13479,7 +13482,7 @@ echo "${as_me:-configure}:13474: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13482 "configure"
+#line 13485 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13492,21 +13495,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13498: \$? = $ac_status" >&5
+  echo "$as_me:13501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13504: \$? = $ac_status" >&5
+  echo "$as_me:13507: \$? = $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}:13509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13524,7 +13527,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13599,13 +13602,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13602: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13605: 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 13608 "configure"
+#line 13611 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13618,21 +13621,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13624: \$? = $ac_status" >&5
+  echo "$as_me:13627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13630: \$? = $ac_status" >&5
+  echo "$as_me:13633: \$? = $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}:13635: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13674,7 +13677,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13677: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13680: 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
@@ -13712,7 +13715,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13715 "configure"
+#line 13718 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13724,16 +13727,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13730: \$? = $ac_status" >&5
+  echo "$as_me:13733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13736: \$? = $ac_status" >&5
+  echo "$as_me:13739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13750,7 +13753,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13753: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13786,7 +13789,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13789: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13818,14 +13821,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13821: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13824: 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 13828 "configure"
+#line 13831 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13843,23 +13846,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13849: \$? = $ac_status" >&5
+  echo "$as_me:13852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13855: \$? = $ac_status" >&5
+  echo "$as_me:13858: \$? = $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 13862 "configure"
+#line 13865 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13878,16 +13881,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13884: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13890: \$? = $ac_status" >&5
+  echo "$as_me:13893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13899,7 +13902,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13902: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13917,14 +13920,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13920: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13923: 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 13927 "configure"
+#line 13930 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13942,23 +13945,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13948: \$? = $ac_status" >&5
+  echo "$as_me:13951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13954: \$? = $ac_status" >&5
+  echo "$as_me:13957: \$? = $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 13961 "configure"
+#line 13964 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13977,16 +13980,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13983: \$? = $ac_status" >&5
+  echo "$as_me:13986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13989: \$? = $ac_status" >&5
+  echo "$as_me:13992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -13998,7 +14001,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14001: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14021,14 +14024,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14024: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14027: 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 14031 "configure"
+#line 14034 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14046,23 +14049,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14052: \$? = $ac_status" >&5
+  echo "$as_me:14055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14058: \$? = $ac_status" >&5
+  echo "$as_me:14061: \$? = $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 14065 "configure"
+#line 14068 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14081,16 +14084,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14093: \$? = $ac_status" >&5
+  echo "$as_me:14096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14102,7 +14105,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14105: result: $cf_cv_wint_t" >&5
+echo "$as_me:14108: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14134,7 +14137,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14137: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14140: 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.
@@ -14144,7 +14147,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14147: result: $with_lp64" >&5
+echo "$as_me:14150: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14160,7 +14163,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14163: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14166: 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
@@ -14172,7 +14175,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14175 "configure"
+#line 14178 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14192,16 +14195,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14198: \$? = $ac_status" >&5
+  echo "$as_me:14201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14204: \$? = $ac_status" >&5
+  echo "$as_me:14207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14211,16 +14214,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14217: \$? = $ac_status" >&5
+  echo "$as_me:14220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14223: \$? = $ac_status" >&5
+  echo "$as_me:14226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14234,13 +14237,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14237: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14240: 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:14243: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14246: 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
@@ -14248,7 +14251,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14251 "configure"
+#line 14254 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14268,16 +14271,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14274: \$? = $ac_status" >&5
+  echo "$as_me:14277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14280: \$? = $ac_status" >&5
+  echo "$as_me:14283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14286,7 +14289,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14289 "configure"
+#line 14292 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14307,16 +14310,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14313: \$? = $ac_status" >&5
+  echo "$as_me:14316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14319: \$? = $ac_status" >&5
+  echo "$as_me:14322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14327,7 +14330,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14330: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14333: 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
 
@@ -14337,7 +14340,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14340: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14343: 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
@@ -14345,7 +14348,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14348 "configure"
+#line 14351 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14365,16 +14368,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14371: \$? = $ac_status" >&5
+  echo "$as_me:14374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14377: \$? = $ac_status" >&5
+  echo "$as_me:14380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14383,7 +14386,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14386 "configure"
+#line 14389 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14404,16 +14407,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14410: \$? = $ac_status" >&5
+  echo "$as_me:14413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14416: \$? = $ac_status" >&5
+  echo "$as_me:14419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14424,7 +14427,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14427: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14430: 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
 
@@ -14437,7 +14440,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14440: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14443: 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
@@ -14445,7 +14448,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14448 "configure"
+#line 14451 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14460,16 +14463,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14466: \$? = $ac_status" >&5
+  echo "$as_me:14469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14472: \$? = $ac_status" >&5
+  echo "$as_me:14475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14478,7 +14481,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14481 "configure"
+#line 14484 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14494,16 +14497,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14500: \$? = $ac_status" >&5
+  echo "$as_me:14503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14506: \$? = $ac_status" >&5
+  echo "$as_me:14509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14514,7 +14517,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14517: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14520: 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
 
@@ -14528,13 +14531,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14531: checking for fseeko" >&5
+echo "$as_me:14534: 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 14537 "configure"
+#line 14540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14548,16 +14551,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14554: \$? = $ac_status" >&5
+  echo "$as_me:14557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14560: \$? = $ac_status" >&5
+  echo "$as_me:14563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14567,7 +14570,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14570: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14606,14 +14609,14 @@ fi
 
 	fi
 
-	echo "$as_me:14609: checking whether to use struct dirent64" >&5
+	echo "$as_me:14612: 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 14616 "configure"
+#line 14619 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14640,16 +14643,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14646: \$? = $ac_status" >&5
+  echo "$as_me:14649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14652: \$? = $ac_status" >&5
+  echo "$as_me:14655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14660,7 +14663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14663: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14670,7 +14673,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14673: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14676: 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.
@@ -14680,14 +14683,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14683: result: $with_tparm_varargs" >&5
+echo "$as_me:14686: 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:14690: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14693: 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.
@@ -14697,14 +14700,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14700: result: $with_tic_depends" >&5
+echo "$as_me:14703: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14707: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14710: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14716,15 +14719,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14719: result: no" >&5
+	echo "$as_me:14722: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14723: result: yes" >&5
+	echo "$as_me:14726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14727: checking for X11 rgb file" >&5
+echo "$as_me:14730: 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.
@@ -14788,7 +14791,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14794: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14796,7 +14799,7 @@ esac
 
 fi
 
-echo "$as_me:14799: result: $RGB_PATH" >&5
+echo "$as_me:14802: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14811,7 +14814,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14814: checking for type of bool" >&5
+echo "$as_me:14817: 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.
@@ -14821,17 +14824,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
+echo "$as_me:14827: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14831: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14834: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14837: 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.
@@ -14843,16 +14846,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14849: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14853: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14855: checking for type of chtype" >&5
+echo "$as_me:14858: 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.
@@ -14862,11 +14865,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14868: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14872: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14874,7 +14877,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14877: checking for type of ospeed" >&5
+echo "$as_me:14880: 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.
@@ -14884,11 +14887,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14890: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14894: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14896,7 +14899,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14899: checking for type of mmask-t" >&5
+echo "$as_me:14902: 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.
@@ -14906,18 +14909,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14912: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14916: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14920: checking for size CCHARW_MAX" >&5
+echo "$as_me:14923: 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.
@@ -14927,16 +14930,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14933: checking for signed char" >&5
+echo "$as_me:14936: 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 14939 "configure"
+#line 14942 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14951,16 +14954,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14957: \$? = $ac_status" >&5
+  echo "$as_me:14960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14963: \$? = $ac_status" >&5
+  echo "$as_me:14966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14970,10 +14973,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14976: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14976: checking size of signed char" >&5
+echo "$as_me:14979: 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
@@ -14982,7 +14985,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14985 "configure"
+#line 14988 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14994,21 +14997,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15000: \$? = $ac_status" >&5
+  echo "$as_me:15003: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15006: \$? = $ac_status" >&5
+  echo "$as_me:15009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15011 "configure"
+#line 15014 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15020,16 +15023,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15026: \$? = $ac_status" >&5
+  echo "$as_me:15029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15032: \$? = $ac_status" >&5
+  echo "$as_me:15035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15045,7 +15048,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15048 "configure"
+#line 15051 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15057,16 +15060,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15063: \$? = $ac_status" >&5
+  echo "$as_me:15066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15069: \$? = $ac_status" >&5
+  echo "$as_me:15072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15082,7 +15085,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15085 "configure"
+#line 15088 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15094,16 +15097,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15100: \$? = $ac_status" >&5
+  echo "$as_me:15103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15116,12 +15119,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15119: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15122: 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 15124 "configure"
+#line 15127 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15137,15 +15140,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15143: \$? = $ac_status" >&5
+  echo "$as_me:15146: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15148: \$? = $ac_status" >&5
+  echo "$as_me:15151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15161,7 +15164,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15167: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15172,7 +15175,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15178: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15182,13 +15185,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15185: result: $with_signed_char" >&5
+echo "$as_me:15188: 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:15191: checking for type of tparm-arg" >&5
+echo "$as_me:15194: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15198,18 +15201,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15204: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15208: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15212: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15215: 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.
@@ -15219,7 +15222,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15222: result: $with_rcs_ids" >&5
+echo "$as_me:15225: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15228,7 +15231,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15231: checking format of man-pages" >&5
+echo "$as_me:15234: 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.
@@ -15319,10 +15322,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15325: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15363,7 +15366,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15366: checking for manpage renaming" >&5
+echo "$as_me:15369: 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.
@@ -15392,15 +15395,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15398: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15403: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15403: checking if manpage aliases will be installed" >&5
+echo "$as_me:15406: 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.
@@ -15411,7 +15414,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15425,7 +15428,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15428: checking if manpage symlinks should be used" >&5
+echo "$as_me:15431: 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.
@@ -15438,17 +15441,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15444: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15450: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15451: checking for manpage tbl" >&5
+echo "$as_me:15454: 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.
@@ -15459,7 +15462,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
+echo "$as_me:15465: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15777,7 +15780,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15780: checking if you want to build with function extensions" >&5
+echo "$as_me:15783: 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.
@@ -15787,7 +15790,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15790: result: $with_ext_funcs" >&5
+echo "$as_me:15793: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15844,7 +15847,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15850: 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.
@@ -15854,7 +15857,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15857: result: $with_sp_funcs" >&5
+echo "$as_me:15860: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15873,7 +15876,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15879: 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.
@@ -15883,7 +15886,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15886: result: $with_term_driver" >&5
+echo "$as_me:15889: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15892,19 +15895,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15895: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15898: 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:15900: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15903: 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:15907: checking for extended use of const keyword" >&5
+echo "$as_me:15910: 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.
@@ -15914,7 +15917,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15917: result: $with_ext_const" >&5
+echo "$as_me:15920: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15922,7 +15925,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15925: checking if you want to use extended colors" >&5
+echo "$as_me:15928: 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.
@@ -15932,12 +15935,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15935: result: $with_ext_colors" >&5
+echo "$as_me:15938: 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:15940: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15943: 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)
@@ -15948,7 +15951,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15954: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15976,7 +15979,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15979: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15982: 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.
@@ -15986,7 +15989,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15989: result: $with_ext_mouse" >&5
+echo "$as_me:15992: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15996,7 +15999,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16002: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16013,7 +16016,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16016: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16019: 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.
@@ -16023,7 +16026,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16026: result: $with_ext_putwin" >&5
+echo "$as_me:16029: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16033,7 +16036,7 @@ EOF
 
 fi
 
-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16039: 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.
@@ -16043,7 +16046,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16046: result: $with_no_padding" >&5
+echo "$as_me:16049: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16051,7 +16054,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16054: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16057: 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.
@@ -16061,7 +16064,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16064: result: $with_sigwinch" >&5
+echo "$as_me:16067: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16076,7 +16079,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16079: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16082: 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.
@@ -16086,7 +16089,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16089: result: $with_tcap_names" >&5
+echo "$as_me:16092: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16100,7 +16103,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
+echo "$as_me:16106: 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.
@@ -16110,27 +16113,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16113: result: $with_pthread" >&5
+echo "$as_me:16116: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16117: checking for pthread.h" >&5
+	echo "$as_me:16120: 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 16123 "configure"
+#line 16126 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:16136: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16149,7 +16152,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16155: 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
 
@@ -16159,7 +16162,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16162: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16165: 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"
 
@@ -16180,7 +16183,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16183 "configure"
+#line 16186 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16197,16 +16200,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16203: \$? = $ac_status" >&5
+  echo "$as_me:16206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16209: \$? = $ac_status" >&5
+  echo "$as_me:16212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16216,7 +16219,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16219: result: $with_pthread" >&5
+	    echo "$as_me:16222: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16244,7 +16247,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16254,13 +16257,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16257: checking for pthread_kill" >&5
+	echo "$as_me:16260: 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 16263 "configure"
+#line 16266 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16291,16 +16294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16297: \$? = $ac_status" >&5
+  echo "$as_me:16300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16303: \$? = $ac_status" >&5
+  echo "$as_me:16306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16310,11 +16313,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16313: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16316: 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:16317: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16320: 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.
@@ -16324,7 +16327,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16330: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16335,7 +16338,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16341: 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.
@@ -16345,18 +16348,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16348: result: $use_weak_symbols" >&5
+	echo "$as_me:16351: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16352: checking if $CC supports weak symbols" >&5
+echo "$as_me:16355: 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 16359 "configure"
+#line 16362 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16382,16 +16385,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16388: \$? = $ac_status" >&5
+  echo "$as_me:16391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16394: \$? = $ac_status" >&5
+  echo "$as_me:16397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16402,7 +16405,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16452,7 +16455,7 @@ fi
 # 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:16455: checking if you want reentrant code" >&5
+echo "$as_me:16458: 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.
@@ -16462,7 +16465,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16465: result: $with_reentrant" >&5
+echo "$as_me:16468: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16551,7 +16554,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16557: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16563,7 +16566,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16569: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16585,16 +16588,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16588: result: $enable_opaque_curses" >&5
+echo "$as_me:16591: 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:16593: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16596: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16597: checking whether form library structures should be opaque" >&5
+echo "$as_me:16600: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16611,10 +16614,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16614: result: $enable_opaque_form" >&5
+echo "$as_me:16617: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16620: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16631,10 +16634,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16634: result: $enable_opaque_menu" >&5
+echo "$as_me:16637: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16640: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16651,7 +16654,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16654: result: $enable_opaque_panel" >&5
+echo "$as_me:16657: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16661,7 +16664,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16664: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16667: 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.
@@ -16671,7 +16674,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16684,7 +16687,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16687: checking if you want all development code" >&5
+echo "$as_me:16690: 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.
@@ -16694,11 +16697,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16697: result: $with_develop" >&5
+echo "$as_me:16700: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16704: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16708,7 +16711,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16711: result: $enable_check_size" >&5
+echo "$as_me:16714: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16716,7 +16719,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16719: checking if you want hard-tabs code" >&5
+echo "$as_me:16722: 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.
@@ -16726,7 +16729,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16729: result: $enable_hard_tabs" >&5
+echo "$as_me:16732: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16734,7 +16737,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16737: checking if you want limited support for xmc" >&5
+echo "$as_me:16740: 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.
@@ -16744,7 +16747,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
+echo "$as_me:16750: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16754,7 +16757,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16757: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16760: 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.
@@ -16764,7 +16767,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16767: result: $with_assumed_color" >&5
+echo "$as_me:16770: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16772,7 +16775,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16775: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16778: 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.
@@ -16782,7 +16785,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16785: result: $with_hashmap" >&5
+echo "$as_me:16788: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16790,7 +16793,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16793: checking if you want colorfgbg code" >&5
+echo "$as_me:16796: 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.
@@ -16800,7 +16803,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16803: result: $with_colorfgbg" >&5
+echo "$as_me:16806: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16808,7 +16811,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16814: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16818,14 +16821,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
+echo "$as_me:16824: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16828: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16831: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16834,7 +16837,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16837 "configure"
+#line 16840 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16850,16 +16853,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16856: \$? = $ac_status" >&5
+  echo "$as_me:16859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16862: \$? = $ac_status" >&5
+  echo "$as_me:16865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16871,7 +16874,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16986,7 +16989,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16992: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16995,7 +16998,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16998 "configure"
+#line 17001 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17011,16 +17014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17017: \$? = $ac_status" >&5
+  echo "$as_me:17020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17023: \$? = $ac_status" >&5
+  echo "$as_me:17026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17032,7 +17035,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17155,7 +17158,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17158: checking if you want interop bindings" >&5
+echo "$as_me:17161: 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.
@@ -17165,13 +17168,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17168: result: $with_exp_interop" >&5
+echo "$as_me:17171: 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:17174: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17177: 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.
@@ -17181,13 +17184,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17184: result: $with_safe_sprintf" >&5
+echo "$as_me:17187: 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:17190: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17193: 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.
@@ -17197,7 +17200,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17200: result: $with_scroll_hints" >&5
+echo "$as_me:17203: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17206,7 +17209,7 @@ EOF
 
 fi
 
-echo "$as_me:17209: checking if you want wgetch-events code" >&5
+echo "$as_me:17212: 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.
@@ -17216,7 +17219,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17219: result: $with_wgetch_events" >&5
+echo "$as_me:17222: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17231,7 +17234,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17237: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17241,7 +17244,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17244: result: $with_exp_win32" >&5
+	echo "$as_me:17247: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17267,7 +17270,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17270: checking if you want to see long compiling messages" >&5
+echo "$as_me:17273: 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.
@@ -17301,7 +17304,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17304: result: $enableval" >&5
+echo "$as_me:17307: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17314,7 +17317,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17317: checking if you want to install stripped executables" >&5
+echo "$as_me:17320: 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.
@@ -17331,7 +17334,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17334: result: $enable_stripping" >&5
+echo "$as_me:17337: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17342,7 +17345,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17345: checking if install accepts -p option" >&5
+echo "$as_me:17348: 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
@@ -17373,10 +17376,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17376: result: $cf_cv_install_p" >&5
+echo "$as_me:17379: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17379: checking if install needs to be told about ownership" >&5
+echo "$as_me:17382: 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)
@@ -17387,7 +17390,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17390: result: $with_install_o" >&5
+echo "$as_me:17393: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17398,7 +17401,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17401: checking if you want to specify strip-program" >&5
+	echo "$as_me:17404: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17408,11 +17411,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17411: result: $with_strip_program" >&5
+	echo "$as_me:17414: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17418: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17433,11 +17436,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17436: result: $check_install_strip" >&5
+		echo "$as_me:17439: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17443: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17452,7 +17455,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17458: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17478,7 +17481,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17484: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17495,17 +17498,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
+echo "$as_me:17501: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17505: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17508 "configure"
+#line 17511 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17521,16 +17524,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17527: \$? = $ac_status" >&5
+  echo "$as_me:17530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17533: \$? = $ac_status" >&5
+  echo "$as_me:17536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17541,7 +17544,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17597,16 +17600,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17603: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17608: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17645,16 +17648,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17651: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17656: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17693,23 +17696,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17699: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17704: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17708: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17712: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17715: 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.
@@ -17726,7 +17729,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17729: result: $enable_warnings" >&5
+echo "$as_me:17732: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17750,7 +17753,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17753 "configure"
+#line 17756 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17765,26 +17768,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17771: \$? = $ac_status" >&5
+  echo "$as_me:17774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17777: \$? = $ac_status" >&5
+  echo "$as_me:17780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
+echo "$as_me:17783: 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 17787 "configure"
+#line 17790 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17802,16 +17805,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17808: \$? = $ac_status" >&5
+  echo "$as_me:17811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17814: \$? = $ac_status" >&5
+  echo "$as_me:17817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17826,7 +17829,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17832: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17855,7 +17858,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17858 "${as_me:-configure}"
+#line 17861 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17871,7 +17874,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17874: checking for $CC warning options..." >&5
+	{ echo "$as_me:17877: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17887,12 +17890,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17893: \$? = $ac_status" >&5
+  echo "$as_me:17896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17900,7 +17903,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17903: checking for $CC warning options..." >&5
+	{ echo "$as_me:17906: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17923,12 +17926,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17926: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17929: \$? = $ac_status" >&5
+  echo "$as_me:17932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17936,7 +17939,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17946,7 +17949,7 @@ echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17979,10 +17982,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17985: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17985 "${as_me:-configure}"
+#line 17988 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18032,12 +18035,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18038: \$? = $ac_status" >&5
+  echo "$as_me:18041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18109,12 +18112,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18112: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18115: 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 18117 "configure"
+#line 18120 "configure"
 #include "confdefs.h"
 
 int
@@ -18131,16 +18134,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18137: \$? = $ac_status" >&5
+  echo "$as_me:18140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18143: \$? = $ac_status" >&5
+  echo "$as_me:18146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18151,7 +18154,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18157: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18160,11 +18163,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18163: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18166: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18167 "configure"
+#line 18170 "configure"
 #include "confdefs.h"
 
 int
@@ -18181,16 +18184,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18187: \$? = $ac_status" >&5
+  echo "$as_me:18190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18193: \$? = $ac_status" >&5
+  echo "$as_me:18196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18200,7 +18203,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18206: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18209,30 +18212,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18215: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18219: checking version of $CC" >&5
+	echo "$as_me:18222: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18223: result: $CLANG_VERSION" >&5
+	echo "$as_me:18226: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18230: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18233: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18235 "configure"
+#line 18238 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18246,16 +18249,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18258: \$? = $ac_status" >&5
+  echo "$as_me:18261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18266,13 +18269,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18269: result: $cf_clang_optok" >&5
+		echo "$as_me:18272: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18278: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18289,7 +18292,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18292 "configure"
+#line 18295 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18307,7 +18310,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18310: checking for $CC warning options..." >&5
+	{ echo "$as_me:18313: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18324,12 +18327,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18330: \$? = $ac_status" >&5
+  echo "$as_me:18333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18338,7 +18341,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18344: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18368,16 +18371,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18374: \$? = $ac_status" >&5
+  echo "$as_me:18377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18383: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18395,7 +18398,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18401: 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.
@@ -18405,7 +18408,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18408: result: $enable_string_hacks" >&5
+echo "$as_me:18411: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18414,15 +18417,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18417: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18420: 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:18419: checking for strlcat" >&5
+	echo "$as_me:18422: 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 18425 "configure"
+#line 18428 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18453,16 +18456,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18459: \$? = $ac_status" >&5
+  echo "$as_me:18462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18465: \$? = $ac_status" >&5
+  echo "$as_me:18468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18472,7 +18475,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18478: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18482,7 +18485,7 @@ EOF
 
 else
 
-		echo "$as_me:18485: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18488: 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
@@ -18490,7 +18493,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18493 "configure"
+#line 18496 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18509,16 +18512,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18515: \$? = $ac_status" >&5
+  echo "$as_me:18518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18521: \$? = $ac_status" >&5
+  echo "$as_me:18524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18529,7 +18532,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18532: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18535: 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
 
@@ -18552,23 +18555,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18555: checking for $ac_header" >&5
+echo "$as_me:18558: 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 18561 "configure"
+#line 18564 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18571: \$? = $ac_status" >&5
+  echo "$as_me:18574: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18587,7 +18590,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18593: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18608,13 +18611,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18611: checking for $ac_func" >&5
+echo "$as_me:18614: 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 18617 "configure"
+#line 18620 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18645,16 +18648,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18651: \$? = $ac_status" >&5
+  echo "$as_me:18654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18657: \$? = $ac_status" >&5
+  echo "$as_me:18660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18664,7 +18667,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18670: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18677,7 +18680,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18680: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18683: 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.
@@ -18687,7 +18690,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18690: result: $with_assertions" >&5
+echo "$as_me:18693: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18703,7 +18706,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18706: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18709: 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.
@@ -18725,7 +18728,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18839,23 +18842,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18842: checking for dmalloc.h" >&5
+	echo "$as_me:18845: 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 18848 "configure"
+#line 18851 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18855: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18858: \$? = $ac_status" >&5
+  echo "$as_me:18861: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18874,11 +18877,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18880: 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:18881: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18884: 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
@@ -18886,7 +18889,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18889 "configure"
+#line 18892 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18905,16 +18908,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18911: \$? = $ac_status" >&5
+  echo "$as_me:18914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18917: \$? = $ac_status" >&5
+  echo "$as_me:18920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18925,7 +18928,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18931: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18940,7 +18943,7 @@ fi
 
 fi
 
-echo "$as_me:18943: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18946: 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.
@@ -18962,7 +18965,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19076,23 +19079,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19079: checking for dbmalloc.h" >&5
+	echo "$as_me:19082: 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 19085 "configure"
+#line 19088 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19092: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19095: \$? = $ac_status" >&5
+  echo "$as_me:19098: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19111,11 +19114,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19117: 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:19118: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19121: 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
@@ -19123,7 +19126,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19126 "configure"
+#line 19129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19142,16 +19145,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19148: \$? = $ac_status" >&5
+  echo "$as_me:19151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19154: \$? = $ac_status" >&5
+  echo "$as_me:19157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19162,7 +19165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19165: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19168: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19177,7 +19180,7 @@ fi
 
 fi
 
-echo "$as_me:19180: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19183: 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.
@@ -19199,7 +19202,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19312,7 +19315,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19318: 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.
@@ -19323,7 +19326,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19326: result: $with_no_leaks" >&5
+echo "$as_me:19329: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19375,7 +19378,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
+echo "$as_me:19381: 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.
@@ -19385,7 +19388,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19388: result: $cf_with_trace" >&5
+echo "$as_me:19391: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19405,7 +19408,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
+echo "$as_me:19411: 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.
@@ -19422,7 +19425,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19425: result: $enable_gnat_projects" >&5
+echo "$as_me:19428: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19435,14 +19438,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19438: checking if ssp library is needed" >&5
+echo "$as_me:19441: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19445 "configure"
+#line 19448 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19459,16 +19462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19465: \$? = $ac_status" >&5
+  echo "$as_me:19468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19471: \$? = $ac_status" >&5
+  echo "$as_me:19474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19478,7 +19481,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19481 "configure"
+#line 19484 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19495,16 +19498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19518,7 +19521,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19524: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19547,14 +19550,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19550: checking if -lm needed for math functions" >&5
+echo "$as_me:19553: 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 19557 "configure"
+#line 19560 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19570,16 +19573,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19576: \$? = $ac_status" >&5
+  echo "$as_me:19579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19582: \$? = $ac_status" >&5
+  echo "$as_me:19585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19589,7 +19592,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19592: result: $cf_cv_need_libm" >&5
+echo "$as_me:19595: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19597,14 +19600,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19600: checking if -lm is available for math functions" >&5
+	echo "$as_me:19603: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19607 "configure"
+#line 19610 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19620,16 +19623,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19626: \$? = $ac_status" >&5
+  echo "$as_me:19629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19632: \$? = $ac_status" >&5
+  echo "$as_me:19635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19639,7 +19642,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19642: result: $cf_cv_have_libm" >&5
+echo "$as_me:19645: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19661,13 +19664,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19664: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19667: 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 19670 "configure"
+#line 19673 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19683,16 +19686,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19689: \$? = $ac_status" >&5
+  echo "$as_me:19692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19695: \$? = $ac_status" >&5
+  echo "$as_me:19698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19702,7 +19705,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19705: result: $ac_cv_header_time" >&5
+echo "$as_me:19708: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19717,7 +19720,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19723: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19725,7 +19728,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19728 "configure"
+#line 19731 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19744,16 +19747,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19750: \$? = $ac_status" >&5
+  echo "$as_me:19753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19756: \$? = $ac_status" >&5
+  echo "$as_me:19759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19764,11 +19767,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19770: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19771: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19774: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19776,7 +19779,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19779 "configure"
+#line 19782 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19795,16 +19798,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19801: \$? = $ac_status" >&5
+  echo "$as_me:19804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19807: \$? = $ac_status" >&5
+  echo "$as_me:19810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19815,7 +19818,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19821: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19837,7 +19840,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19843: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19845,7 +19848,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19848 "configure"
+#line 19851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19864,16 +19867,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19870: \$? = $ac_status" >&5
+  echo "$as_me:19873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19879: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19884,7 +19887,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19890: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19906,7 +19909,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19912: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19914,7 +19917,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19917 "configure"
+#line 19920 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19933,16 +19936,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19939: \$? = $ac_status" >&5
+  echo "$as_me:19942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19945: \$? = $ac_status" >&5
+  echo "$as_me:19948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19953,7 +19956,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19959: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19995,7 +19998,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20001: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20003,7 +20006,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20006 "configure"
+#line 20009 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20022,16 +20025,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20028: \$? = $ac_status" >&5
+  echo "$as_me:20031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20034: \$? = $ac_status" >&5
+  echo "$as_me:20037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20042,7 +20045,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20048: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20070,13 +20073,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20073: checking for regcomp" >&5
+	echo "$as_me:20076: 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 20079 "configure"
+#line 20082 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20107,16 +20110,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20113: \$? = $ac_status" >&5
+  echo "$as_me:20116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20119: \$? = $ac_status" >&5
+  echo "$as_me:20122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20126,7 +20129,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20129: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20132: 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
@@ -20135,7 +20138,7 @@ else
 		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:20138: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20141: 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
@@ -20143,7 +20146,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20146 "configure"
+#line 20149 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20162,16 +20165,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20168: \$? = $ac_status" >&5
+  echo "$as_me:20171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20174: \$? = $ac_status" >&5
+  echo "$as_me:20177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20182,7 +20185,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20185: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20188: 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
 
@@ -20214,13 +20217,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20217: checking for compile" >&5
+	echo "$as_me:20220: 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 20223 "configure"
+#line 20226 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20251,16 +20254,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20257: \$? = $ac_status" >&5
+  echo "$as_me:20260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20263: \$? = $ac_status" >&5
+  echo "$as_me:20266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20270,13 +20273,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20273: result: $ac_cv_func_compile" >&5
+echo "$as_me:20276: 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:20279: checking for compile in -lgen" >&5
+		echo "$as_me:20282: 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
@@ -20284,7 +20287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20287 "configure"
+#line 20290 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20303,16 +20306,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20309: \$? = $ac_status" >&5
+  echo "$as_me:20312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20315: \$? = $ac_status" >&5
+  echo "$as_me:20318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20323,7 +20326,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20326: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20329: 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
 
@@ -20351,11 +20354,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20357: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20358: checking for regular-expression headers" >&5
+echo "$as_me:20361: 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
@@ -20367,7 +20370,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20370 "configure"
+#line 20373 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20384,16 +20387,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20390: \$? = $ac_status" >&5
+  echo "$as_me:20393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20396: \$? = $ac_status" >&5
+  echo "$as_me:20399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20410,7 +20413,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20413 "configure"
+#line 20416 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20430,16 +20433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20436: \$? = $ac_status" >&5
+  echo "$as_me:20439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20442: \$? = $ac_status" >&5
+  echo "$as_me:20445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20455,11 +20458,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20461: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20465: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20497,23 +20500,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20500: checking for $ac_header" >&5
+echo "$as_me:20503: 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 20506 "configure"
+#line 20509 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20516: \$? = $ac_status" >&5
+  echo "$as_me:20519: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20532,7 +20535,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20545,23 +20548,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20548: checking for $ac_header" >&5
+echo "$as_me:20551: 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 20554 "configure"
+#line 20557 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20561: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20564: \$? = $ac_status" >&5
+  echo "$as_me:20567: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20580,7 +20583,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20586: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20590,7 +20593,7 @@ EOF
 fi
 done
 
-echo "$as_me:20593: checking for header declaring getopt variables" >&5
+echo "$as_me:20596: 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
@@ -20600,7 +20603,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20603 "configure"
+#line 20606 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20613,16 +20616,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20619: \$? = $ac_status" >&5
+  echo "$as_me:20622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20625: \$? = $ac_status" >&5
+  echo "$as_me:20628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20634,7 +20637,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20651,14 +20654,14 @@ EOF
 
 fi
 
-echo "$as_me:20654: checking if external environ is declared" >&5
+echo "$as_me:20657: 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 20661 "configure"
+#line 20664 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20671,16 +20674,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20677: \$? = $ac_status" >&5
+  echo "$as_me:20680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20683: \$? = $ac_status" >&5
+  echo "$as_me:20686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20691,7 +20694,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20706,14 +20709,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20709: checking if external environ exists" >&5
+echo "$as_me:20712: 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 20716 "configure"
+#line 20719 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20728,16 +20731,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20734: \$? = $ac_status" >&5
+  echo "$as_me:20737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20740: \$? = $ac_status" >&5
+  echo "$as_me:20743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20748,7 +20751,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20751: result: $cf_cv_have_environ" >&5
+echo "$as_me:20754: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20761,13 +20764,13 @@ EOF
 
 fi
 
-echo "$as_me:20764: checking for getenv" >&5
+echo "$as_me:20767: 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 20770 "configure"
+#line 20773 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20798,16 +20801,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20804: \$? = $ac_status" >&5
+  echo "$as_me:20807: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20810: \$? = $ac_status" >&5
+  echo "$as_me:20813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20817,19 +20820,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20820: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20823: 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:20826: checking for $ac_func" >&5
+echo "$as_me:20829: 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 20832 "configure"
+#line 20835 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20860,16 +20863,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20866: \$? = $ac_status" >&5
+  echo "$as_me:20869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20872: \$? = $ac_status" >&5
+  echo "$as_me:20875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20879,7 +20882,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20889,7 +20892,7 @@ EOF
 fi
 done
 
-echo "$as_me:20892: checking if getenv returns consistent values" >&5
+echo "$as_me:20895: 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
@@ -20899,7 +20902,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20902 "configure"
+#line 20905 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21004,15 +21007,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21010: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21015: \$? = $ac_status" >&5
+  echo "$as_me:21018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21025,7 +21028,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21040,18 +21043,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21043: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21046: 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
 
-echo "$as_me:21047: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21050: 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 21054 "configure"
+#line 21057 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21071,16 +21074,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21077: \$? = $ac_status" >&5
+  echo "$as_me:21080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21083: \$? = $ac_status" >&5
+  echo "$as_me:21086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21092,7 +21095,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21098: 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
@@ -21107,13 +21110,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21110: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21113: 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 21116 "configure"
+#line 21119 "configure"
 #include "confdefs.h"
 
 int
@@ -21175,16 +21178,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21181: \$? = $ac_status" >&5
+  echo "$as_me:21184: \$? = $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:21187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21187: \$? = $ac_status" >&5
+  echo "$as_me:21190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21194,7 +21197,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21197: result: $ac_cv_c_const" >&5
+echo "$as_me:21200: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21204,7 +21207,7 @@ EOF
 
 fi
 
-echo "$as_me:21207: checking for inline" >&5
+echo "$as_me:21210: 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
@@ -21212,7 +21215,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21215 "configure"
+#line 21218 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21221,16 +21224,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21227: \$? = $ac_status" >&5
+  echo "$as_me:21230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21233: \$? = $ac_status" >&5
+  echo "$as_me:21236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21241,7 +21244,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
+echo "$as_me:21247: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21267,7 +21270,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21273: 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
@@ -21276,7 +21279,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21279 "configure"
+#line 21282 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21288,16 +21291,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21294: \$? = $ac_status" >&5
+  echo "$as_me:21297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21300: \$? = $ac_status" >&5
+  echo "$as_me:21303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21309,7 +21312,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21415,7 +21418,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21418: checking for signal global datatype" >&5
+echo "$as_me:21421: 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
@@ -21427,7 +21430,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21430 "configure"
+#line 21433 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21451,16 +21454,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21457: \$? = $ac_status" >&5
+  echo "$as_me:21460: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21463: \$? = $ac_status" >&5
+  echo "$as_me:21466: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21474,7 +21477,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21480: 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 <<EOF
@@ -21483,7 +21486,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21486: checking for type of chtype" >&5
+echo "$as_me:21489: 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
@@ -21493,7 +21496,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21496 "configure"
+#line 21499 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21528,15 +21531,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21534: \$? = $ac_status" >&5
+  echo "$as_me:21537: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21539: \$? = $ac_status" >&5
+  echo "$as_me:21542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21551,7 +21554,7 @@ fi
 
 fi
 
-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21563,14 +21566,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21566: checking if unsigned literals are legal" >&5
+echo "$as_me:21569: 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 21573 "configure"
+#line 21576 "configure"
 #include "confdefs.h"
 
 int
@@ -21582,16 +21585,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21588: \$? = $ac_status" >&5
+  echo "$as_me:21591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:21597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21603,7 +21606,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21619,14 +21622,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21622: checking if external errno is declared" >&5
+echo "$as_me:21625: 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 21629 "configure"
+#line 21632 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21640,16 +21643,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21646: \$? = $ac_status" >&5
+  echo "$as_me:21649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21652: \$? = $ac_status" >&5
+  echo "$as_me:21655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21660,7 +21663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21675,14 +21678,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21678: checking if external errno exists" >&5
+echo "$as_me:21681: 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 21685 "configure"
+#line 21688 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21697,16 +21700,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21703: \$? = $ac_status" >&5
+  echo "$as_me:21706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21709: \$? = $ac_status" >&5
+  echo "$as_me:21712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21717,7 +21720,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21720: result: $cf_cv_have_errno" >&5
+echo "$as_me:21723: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21730,7 +21733,7 @@ EOF
 
 fi
 
-echo "$as_me:21733: checking if data-only library module links" >&5
+echo "$as_me:21736: 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
@@ -21738,20 +21741,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21741 "configure"
+#line 21744 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21747: \$? = $ac_status" >&5
+  echo "$as_me:21750: \$? = $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 <<EOF
-#line 21754 "configure"
+#line 21757 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21768,10 +21771,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21774: \$? = $ac_status" >&5
+  echo "$as_me:21777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21784,7 +21787,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21787 "configure"
+#line 21790 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21795,15 +21798,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21801: \$? = $ac_status" >&5
+  echo "$as_me:21804: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21806: \$? = $ac_status" >&5
+  echo "$as_me:21809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21818,7 +21821,7 @@ fi
 
 fi
 
-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21833,13 +21836,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21836: checking for clock_gettime" >&5
+echo "$as_me:21839: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21842 "configure"
+#line 21845 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21870,16 +21873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21876: \$? = $ac_status" >&5
+  echo "$as_me:21879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21882: \$? = $ac_status" >&5
+  echo "$as_me:21885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21889,12 +21892,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21895: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21900: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21902,7 +21905,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21905 "configure"
+#line 21908 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21921,16 +21924,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21933: \$? = $ac_status" >&5
+  echo "$as_me:21936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21941,7 +21944,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21947: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21953,14 +21956,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21956: checking if clock_gettime links" >&5
+echo "$as_me:21959: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21963 "configure"
+#line 21966 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21978,16 +21981,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21984: \$? = $ac_status" >&5
+  echo "$as_me:21987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21990: \$? = $ac_status" >&5
+  echo "$as_me:21993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21998,7 +22001,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22004: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22012,13 +22015,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22015: checking for gettimeofday" >&5
+echo "$as_me:22018: 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 22021 "configure"
+#line 22024 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22049,16 +22052,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22055: \$? = $ac_status" >&5
+  echo "$as_me:22058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22061: \$? = $ac_status" >&5
+  echo "$as_me:22064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22068,7 +22071,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22074: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22078,7 +22081,7 @@ EOF
 
 else
 
-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22084: 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
@@ -22086,7 +22089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22089 "configure"
+#line 22092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22105,16 +22108,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22111: \$? = $ac_status" >&5
+  echo "$as_me:22114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22117: \$? = $ac_status" >&5
+  echo "$as_me:22120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22125,7 +22128,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22128: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22131: 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
 
@@ -22184,13 +22187,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22187: checking for $ac_func" >&5
+echo "$as_me:22190: 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 22193 "configure"
+#line 22196 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22221,16 +22224,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22227: \$? = $ac_status" >&5
+  echo "$as_me:22230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22233: \$? = $ac_status" >&5
+  echo "$as_me:22236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22240,7 +22243,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22246: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22250,14 +22253,14 @@ EOF
 fi
 done
 
-echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22256: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22260 "configure"
+#line 22263 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22272,16 +22275,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22278: \$? = $ac_status" >&5
+  echo "$as_me:22281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22284: \$? = $ac_status" >&5
+  echo "$as_me:22287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22291,7 +22294,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22313,7 +22316,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22319: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22323,7 +22326,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22326 "configure"
+#line 22329 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22336,15 +22339,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22345: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22347: \$? = $ac_status" >&5
+  echo "$as_me:22350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22356,7 +22359,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22362: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22368,14 +22371,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22371: checking for getttynam" >&5
+	echo "$as_me:22374: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22378 "configure"
+#line 22381 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22387,16 +22390,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22393: \$? = $ac_status" >&5
+  echo "$as_me:22396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22399: \$? = $ac_status" >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22406,7 +22409,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22412: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22416,7 +22419,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22422: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22425,7 +22428,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22431: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22438,14 +22441,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22441: checking for terminal-capability database functions" >&5
+echo "$as_me:22444: 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 22448 "configure"
+#line 22451 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22465,16 +22468,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22471: \$? = $ac_status" >&5
+  echo "$as_me:22474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22477: \$? = $ac_status" >&5
+  echo "$as_me:22480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22485,7 +22488,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22488: result: $cf_cv_cgetent" >&5
+echo "$as_me:22491: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22495,14 +22498,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
+echo "$as_me:22501: 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 22505 "configure"
+#line 22508 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22525,16 +22528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22531: \$? = $ac_status" >&5
+  echo "$as_me:22534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22537: \$? = $ac_status" >&5
+  echo "$as_me:22540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22545,7 +22548,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22551: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22559,14 +22562,14 @@ fi
 
 fi
 
-echo "$as_me:22562: checking for isascii" >&5
+echo "$as_me:22565: 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 22569 "configure"
+#line 22572 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22578,16 +22581,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22584: \$? = $ac_status" >&5
+  echo "$as_me:22587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22590: \$? = $ac_status" >&5
+  echo "$as_me:22593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22598,7 +22601,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22604: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22606,10 +22609,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22612: 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 22612 "configure"
+#line 22615 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22623,16 +22626,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22629: \$? = $ac_status" >&5
+  echo "$as_me:22632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22635: \$? = $ac_status" >&5
+  echo "$as_me:22638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22640,7 +22643,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22643 "configure"
+#line 22646 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22655,16 +22658,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22661: \$? = $ac_status" >&5
+  echo "$as_me:22664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22667: \$? = $ac_status" >&5
+  echo "$as_me:22670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22680,11 +22683,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22683: result: $sigact_bad" >&5
+echo "$as_me:22686: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22687: checking if nanosleep really works" >&5
+echo "$as_me:22690: 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
@@ -22694,7 +22697,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22697 "configure"
+#line 22700 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22720,15 +22723,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22726: \$? = $ac_status" >&5
+  echo "$as_me:22729: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22731: \$? = $ac_status" >&5
+  echo "$as_me:22734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22740,7 +22743,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22746: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22757,23 +22760,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22760: checking for $ac_header" >&5
+echo "$as_me:22763: 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 22766 "configure"
+#line 22769 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22776: \$? = $ac_status" >&5
+  echo "$as_me:22779: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22792,7 +22795,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22798: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22809,10 +22812,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22812: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22815: 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 22815 "configure"
+#line 22818 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22824,16 +22827,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22830: \$? = $ac_status" >&5
+  echo "$as_me:22833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:22839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22841,7 +22844,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22844 "configure"
+#line 22847 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22855,16 +22858,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22861: \$? = $ac_status" >&5
+  echo "$as_me:22864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22867: \$? = $ac_status" >&5
+  echo "$as_me:22870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22880,19 +22883,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22883: result: $termios_bad" >&5
+	echo "$as_me:22886: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22888: checking for tcgetattr" >&5
+echo "$as_me:22891: 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 22895 "configure"
+#line 22898 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22920,16 +22923,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22926: \$? = $ac_status" >&5
+  echo "$as_me:22929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22932: \$? = $ac_status" >&5
+  echo "$as_me:22935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22939,21 +22942,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22942: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22945: 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:22949: checking for vsscanf function or workaround" >&5
+echo "$as_me:22952: 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 22956 "configure"
+#line 22959 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22979,16 +22982,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22985: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22991: \$? = $ac_status" >&5
+  echo "$as_me:22994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22996,7 +22999,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22999 "configure"
+#line 23002 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23018,16 +23021,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23024: \$? = $ac_status" >&5
+  echo "$as_me:23027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23030: \$? = $ac_status" >&5
+  echo "$as_me:23033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23035,7 +23038,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23038 "configure"
+#line 23041 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23057,16 +23060,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23063: \$? = $ac_status" >&5
+  echo "$as_me:23066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23069: \$? = $ac_status" >&5
+  echo "$as_me:23072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23081,7 +23084,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23087: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23107,23 +23110,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23110: checking for $ac_header" >&5
+echo "$as_me:23113: 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 23116 "configure"
+#line 23119 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23123: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23126: \$? = $ac_status" >&5
+  echo "$as_me:23129: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23142,7 +23145,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23148: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23152,7 +23155,7 @@ EOF
 fi
 done
 
-echo "$as_me:23155: checking for working mkstemp" >&5
+echo "$as_me:23158: 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
@@ -23163,7 +23166,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23166 "configure"
+#line 23169 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23198,15 +23201,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23204: \$? = $ac_status" >&5
+  echo "$as_me:23207: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23209: \$? = $ac_status" >&5
+  echo "$as_me:23212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23221,16 +23224,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23227: 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:23227: checking for mkstemp" >&5
+	echo "$as_me:23230: 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 23233 "configure"
+#line 23236 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23261,16 +23264,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23267: \$? = $ac_status" >&5
+  echo "$as_me:23270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23273: \$? = $ac_status" >&5
+  echo "$as_me:23276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23280,7 +23283,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23286: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23301,21 +23304,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23304: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23307: 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:23307: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23310: 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:23313: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23316: 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 23318 "configure"
+#line 23321 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23332,15 +23335,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23338: \$? = $ac_status" >&5
+  echo "$as_me:23341: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23343: \$? = $ac_status" >&5
+  echo "$as_me:23346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23353,7 +23356,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23359: 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
 
@@ -23364,13 +23367,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23367: checking for intptr_t" >&5
+echo "$as_me:23370: 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 23373 "configure"
+#line 23376 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23385,16 +23388,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23391: \$? = $ac_status" >&5
+  echo "$as_me:23394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23397: \$? = $ac_status" >&5
+  echo "$as_me:23400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23404,7 +23407,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23407: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23410: 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
   :
@@ -23416,13 +23419,13 @@ EOF
 
 fi
 
-echo "$as_me:23419: checking for ssize_t" >&5
+echo "$as_me:23422: 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 23425 "configure"
+#line 23428 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23437,16 +23440,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23443: \$? = $ac_status" >&5
+  echo "$as_me:23446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23449: \$? = $ac_status" >&5
+  echo "$as_me:23452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23456,7 +23459,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23459: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23462: 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
   :
@@ -23468,14 +23471,14 @@ EOF
 
 fi
 
-echo "$as_me:23471: checking for type sigaction_t" >&5
+echo "$as_me:23474: 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 23478 "configure"
+#line 23481 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23488,16 +23491,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23494: \$? = $ac_status" >&5
+  echo "$as_me:23497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23500: \$? = $ac_status" >&5
+  echo "$as_me:23503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23508,14 +23511,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23514: 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:23518: checking declaration of size-change" >&5
+echo "$as_me:23521: 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
@@ -23536,7 +23539,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23539 "configure"
+#line 23542 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23586,16 +23589,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23592: \$? = $ac_status" >&5
+  echo "$as_me:23595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23598: \$? = $ac_status" >&5
+  echo "$as_me:23601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23614,7 +23617,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
+echo "$as_me:23620: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23632,13 +23635,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23635: checking for memmove" >&5
+echo "$as_me:23638: 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 23641 "configure"
+#line 23644 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23669,16 +23672,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23675: \$? = $ac_status" >&5
+  echo "$as_me:23678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23681: \$? = $ac_status" >&5
+  echo "$as_me:23684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23688,19 +23691,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23691: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23694: 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:23697: checking for bcopy" >&5
+echo "$as_me:23700: 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 23703 "configure"
+#line 23706 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23731,16 +23734,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23737: \$? = $ac_status" >&5
+  echo "$as_me:23740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23743: \$? = $ac_status" >&5
+  echo "$as_me:23746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23750,11 +23753,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23753: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23756: 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:23757: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23760: 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
@@ -23764,7 +23767,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23767 "configure"
+#line 23770 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23780,15 +23783,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23786: \$? = $ac_status" >&5
+  echo "$as_me:23789: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23791: \$? = $ac_status" >&5
+  echo "$as_me:23794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23801,7 +23804,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23828,13 +23831,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23831: checking for $ac_func" >&5
+echo "$as_me:23834: 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 23837 "configure"
+#line 23840 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23865,16 +23868,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23871: \$? = $ac_status" >&5
+  echo "$as_me:23874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23877: \$? = $ac_status" >&5
+  echo "$as_me:23880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23884,7 +23887,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23894,7 +23897,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23897: checking if poll really works" >&5
+echo "$as_me:23900: 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
@@ -23904,7 +23907,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23907 "configure"
+#line 23910 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23957,15 +23960,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23963: \$? = $ac_status" >&5
+  echo "$as_me:23966: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23968: \$? = $ac_status" >&5
+  echo "$as_me:23971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23977,21 +23980,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23980: result: $cf_cv_working_poll" >&5
+echo "$as_me:23983: 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:23987: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23990: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23994 "configure"
+#line 23997 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24011,16 +24014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24017: \$? = $ac_status" >&5
+  echo "$as_me:24020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24023: \$? = $ac_status" >&5
+  echo "$as_me:24026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24030,7 +24033,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24036: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24040,18 +24043,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24046: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24047: checking for va_copy" >&5
+echo "$as_me:24050: 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 24054 "configure"
+#line 24057 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24068,16 +24071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24074: \$? = $ac_status" >&5
+  echo "$as_me:24077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24080: \$? = $ac_status" >&5
+  echo "$as_me:24083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24087,7 +24090,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24093: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24099,14 +24102,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24102: checking for __va_copy" >&5
+echo "$as_me:24105: 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 24109 "configure"
+#line 24112 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24123,16 +24126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24129: \$? = $ac_status" >&5
+  echo "$as_me:24132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24135: \$? = $ac_status" >&5
+  echo "$as_me:24138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24142,7 +24145,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24148: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24154,14 +24157,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24157: checking for __builtin_va_copy" >&5
+echo "$as_me:24160: 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 24164 "configure"
+#line 24167 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24178,16 +24181,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24184: \$? = $ac_status" >&5
+  echo "$as_me:24187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24190: \$? = $ac_status" >&5
+  echo "$as_me:24193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24197,7 +24200,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24200: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24203: 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 &&
@@ -24215,14 +24218,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24218: checking if we can simply copy va_list" >&5
+	echo "$as_me:24221: 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 24225 "configure"
+#line 24228 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24239,16 +24242,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24245: \$? = $ac_status" >&5
+  echo "$as_me:24248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24251: \$? = $ac_status" >&5
+  echo "$as_me:24254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24258,19 +24261,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24261: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24264: 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:24266: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24269: 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 24273 "configure"
+#line 24276 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24287,16 +24290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24293: \$? = $ac_status" >&5
+  echo "$as_me:24296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24299: \$? = $ac_status" >&5
+  echo "$as_me:24302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24306,7 +24309,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24309: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24312: 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
@@ -24317,13 +24320,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24320: checking for pid_t" >&5
+echo "$as_me:24323: 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 24326 "configure"
+#line 24329 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24338,16 +24341,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24344: \$? = $ac_status" >&5
+  echo "$as_me:24347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24350: \$? = $ac_status" >&5
+  echo "$as_me:24353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24357,7 +24360,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24360: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24363: 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
   :
@@ -24372,23 +24375,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24375: checking for $ac_header" >&5
+echo "$as_me:24378: 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 24381 "configure"
+#line 24384 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24388: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24391: \$? = $ac_status" >&5
+  echo "$as_me:24394: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24407,7 +24410,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24413: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24420,13 +24423,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24423: checking for $ac_func" >&5
+echo "$as_me:24426: 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 24429 "configure"
+#line 24432 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24457,16 +24460,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24463: \$? = $ac_status" >&5
+  echo "$as_me:24466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24469: \$? = $ac_status" >&5
+  echo "$as_me:24472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24476,7 +24479,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24482: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24488,7 +24491,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24491: checking for working fork" >&5
+  echo "$as_me:24494: 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
@@ -24511,15 +24514,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24517: \$? = $ac_status" >&5
+  echo "$as_me:24520: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24522: \$? = $ac_status" >&5
+  echo "$as_me:24525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24531,7 +24534,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24537: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24545,12 +24548,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24548: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24551: 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:24553: checking for working vfork" >&5
+  echo "$as_me:24556: 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
@@ -24559,7 +24562,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24562 "configure"
+#line 24565 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24652,15 +24655,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24658: \$? = $ac_status" >&5
+  echo "$as_me:24661: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24663: \$? = $ac_status" >&5
+  echo "$as_me:24666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24672,13 +24675,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24675: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24678: 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:24681: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24684: 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
 
@@ -24703,7 +24706,7 @@ EOF
 
 fi
 
-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24709: 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
@@ -24713,7 +24716,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24716 "configure"
+#line 24719 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24748,15 +24751,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24754: \$? = $ac_status" >&5
+  echo "$as_me:24757: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24759: \$? = $ac_status" >&5
+  echo "$as_me:24762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24769,7 +24772,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24775: 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
@@ -24778,7 +24781,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24781: checking for openpty in -lutil" >&5
+echo "$as_me:24784: 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
@@ -24786,7 +24789,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24789 "configure"
+#line 24792 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24805,16 +24808,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24811: \$? = $ac_status" >&5
+  echo "$as_me:24814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24817: \$? = $ac_status" >&5
+  echo "$as_me:24820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24825,7 +24828,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24828: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24831: 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
@@ -24833,7 +24836,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24836: checking for openpty header" >&5
+echo "$as_me:24839: 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
@@ -24860,7 +24863,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24863 "configure"
+#line 24866 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24878,16 +24881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24884: \$? = $ac_status" >&5
+  echo "$as_me:24887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24890: \$? = $ac_status" >&5
+  echo "$as_me:24893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24905,7 +24908,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24978,7 +24981,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24981 "configure"
+#line 24984 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24990,16 +24993,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24996: \$? = $ac_status" >&5
+  echo "$as_me:24999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25002: \$? = $ac_status" >&5
+  echo "$as_me:25005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25016,7 +25019,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25052,7 +25055,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25063,7 +25066,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25135,7 +25138,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25138 "configure"
+#line 25141 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25147,16 +25150,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25153: \$? = $ac_status" >&5
+  echo "$as_me:25156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25159: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25173,7 +25176,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25253,7 +25256,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25270,23 +25273,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25273: checking for db.h" >&5
+echo "$as_me:25276: 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 25279 "configure"
+#line 25282 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25289: \$? = $ac_status" >&5
+  echo "$as_me:25292: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25305,11 +25308,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25311: 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:25312: checking for version of db" >&5
+echo "$as_me:25315: 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
@@ -25320,10 +25323,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25326: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25326 "configure"
+#line 25329 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25353,16 +25356,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25359: \$? = $ac_status" >&5
+  echo "$as_me:25362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25365: \$? = $ac_status" >&5
+  echo "$as_me:25368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25376,16 +25379,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25382: 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:25383: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25386: 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:25388: checking for db libraries" >&5
+echo "$as_me:25391: 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
@@ -25415,10 +25418,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25421 "configure"
+#line 25424 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25473,16 +25476,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25479: \$? = $ac_status" >&5
+  echo "$as_me:25482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25485: \$? = $ac_status" >&5
+  echo "$as_me:25488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25502,11 +25505,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25508: 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:25509: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25512: 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
@@ -25532,7 +25535,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25538: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25547,7 +25550,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25550: checking if we should include stdbool.h" >&5
+echo "$as_me:25553: 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
@@ -25555,7 +25558,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25558 "configure"
+#line 25561 "configure"
 #include "confdefs.h"
 
 int
@@ -25567,23 +25570,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25573: \$? = $ac_status" >&5
+  echo "$as_me:25576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25579: \$? = $ac_status" >&5
+  echo "$as_me:25582: \$? = $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 25586 "configure"
+#line 25589 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25599,16 +25602,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25605: \$? = $ac_status" >&5
+  echo "$as_me:25608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:25614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25622,13 +25625,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25625: result: yes" >&5
+then	echo "$as_me:25628: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25627: result: no" >&5
+else	echo "$as_me:25630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25631: checking for builtin bool type" >&5
+echo "$as_me:25634: 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
@@ -25636,7 +25639,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25639 "configure"
+#line 25642 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25651,16 +25654,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25657: \$? = $ac_status" >&5
+  echo "$as_me:25660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25663: \$? = $ac_status" >&5
+  echo "$as_me:25666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25673,9 +25676,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25676: result: yes" >&5
+then	echo "$as_me:25679: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25678: result: no" >&5
+else	echo "$as_me:25681: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25692,10 +25695,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25695: checking if we already have C++ library" >&5
+	echo "$as_me:25698: 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 25698 "configure"
+#line 25701 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25709,16 +25712,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25715: \$? = $ac_status" >&5
+  echo "$as_me:25718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25721: \$? = $ac_status" >&5
+  echo "$as_me:25724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25727,7 +25730,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25733: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25746,7 +25749,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25752: 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
@@ -25772,7 +25775,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25775 "configure"
+#line 25778 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25786,16 +25789,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25792: \$? = $ac_status" >&5
+  echo "$as_me:25795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25798: \$? = $ac_status" >&5
+  echo "$as_me:25801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25807,7 +25810,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25829,7 +25832,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25835: 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
@@ -25844,15 +25847,15 @@ CF_EOF
 # 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:25847: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25850: \$? = $ac_status" >&5
+  echo "$as_me:25853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25855: \$? = $ac_status" >&5
+  echo "$as_me:25858: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25863,10 +25866,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25866: result: yes" >&5
+  echo "$as_me:25869: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25869: result: no" >&5
+  echo "$as_me:25872: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25886,7 +25889,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25907,7 +25910,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25910 "configure"
+#line 25913 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25921,16 +25924,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25927: \$? = $ac_status" >&5
+  echo "$as_me:25930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25933: \$? = $ac_status" >&5
+  echo "$as_me:25936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25967,7 +25970,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25970 "configure"
+#line 25973 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25981,16 +25984,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:25990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25993: \$? = $ac_status" >&5
+  echo "$as_me:25996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26023,7 +26026,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26026: result: $cf_cxx_library" >&5
+	echo "$as_me:26029: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26039,7 +26042,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26042: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26045: 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
@@ -26056,18 +26059,18 @@ do
   # 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 26059 "configure"
+#line 26062 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26067: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26070: \$? = $ac_status" >&5
+  echo "$as_me:26073: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26090,17 +26093,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26093 "configure"
+#line 26096 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26100: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26106: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26137,7 +26140,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26140: result: $CXXCPP" >&5
+echo "$as_me:26143: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26147,18 +26150,18 @@ do
   # 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 26150 "configure"
+#line 26153 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26161: \$? = $ac_status" >&5
+  echo "$as_me:26164: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26181,17 +26184,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26184 "configure"
+#line 26187 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26194: \$? = $ac_status" >&5
+  echo "$as_me:26197: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26219,7 +26222,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26225: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26234,23 +26237,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26237: checking for $ac_header" >&5
+echo "$as_me:26240: 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 26243 "configure"
+#line 26246 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26250: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26253: \$? = $ac_status" >&5
+  echo "$as_me:26256: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26269,7 +26272,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26282,23 +26285,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26285: checking for $ac_header" >&5
+echo "$as_me:26288: 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 26291 "configure"
+#line 26294 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26301: \$? = $ac_status" >&5
+  echo "$as_me:26304: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26317,7 +26320,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26328,10 +26331,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26331: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26334: 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 26334 "configure"
+#line 26337 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26348,16 +26351,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26354: \$? = $ac_status" >&5
+  echo "$as_me:26357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26360: \$? = $ac_status" >&5
+  echo "$as_me:26363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26366,7 +26369,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26372: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26377,7 +26380,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26380: checking if we should include stdbool.h" >&5
+echo "$as_me:26383: 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
@@ -26385,7 +26388,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26388 "configure"
+#line 26391 "configure"
 #include "confdefs.h"
 
 int
@@ -26397,23 +26400,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26403: \$? = $ac_status" >&5
+  echo "$as_me:26406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26409: \$? = $ac_status" >&5
+  echo "$as_me:26412: \$? = $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 26416 "configure"
+#line 26419 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26429,16 +26432,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26435: \$? = $ac_status" >&5
+  echo "$as_me:26438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26441: \$? = $ac_status" >&5
+  echo "$as_me:26444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26452,13 +26455,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26455: result: yes" >&5
+then	echo "$as_me:26458: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26457: result: no" >&5
+else	echo "$as_me:26460: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26461: checking for builtin bool type" >&5
+echo "$as_me:26464: 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
@@ -26466,7 +26469,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26469 "configure"
+#line 26472 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26481,16 +26484,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26487: \$? = $ac_status" >&5
+  echo "$as_me:26490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26493: \$? = $ac_status" >&5
+  echo "$as_me:26496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26503,19 +26506,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26506: result: yes" >&5
+then	echo "$as_me:26509: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26508: result: no" >&5
+else	echo "$as_me:26511: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26512: checking for bool" >&5
+echo "$as_me:26515: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26518 "configure"
+#line 26521 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26550,16 +26553,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26556: \$? = $ac_status" >&5
+  echo "$as_me:26559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26562: \$? = $ac_status" >&5
+  echo "$as_me:26565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26569,10 +26572,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
+echo "$as_me:26575: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26575: checking size of bool" >&5
+echo "$as_me:26578: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26581,7 +26584,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26584 "configure"
+#line 26587 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26613,21 +26616,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26619: \$? = $ac_status" >&5
+  echo "$as_me:26622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26625: \$? = $ac_status" >&5
+  echo "$as_me:26628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26630 "configure"
+#line 26633 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26659,16 +26662,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26665: \$? = $ac_status" >&5
+  echo "$as_me:26668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26671: \$? = $ac_status" >&5
+  echo "$as_me:26674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26684,7 +26687,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26687 "configure"
+#line 26690 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26716,16 +26719,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26722: \$? = $ac_status" >&5
+  echo "$as_me:26725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26728: \$? = $ac_status" >&5
+  echo "$as_me:26731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26741,7 +26744,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26744 "configure"
+#line 26747 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26773,16 +26776,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26779: \$? = $ac_status" >&5
+  echo "$as_me:26782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26785: \$? = $ac_status" >&5
+  echo "$as_me:26788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26795,12 +26798,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26798: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26801: 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 26803 "configure"
+#line 26806 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26836,15 +26839,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26842: \$? = $ac_status" >&5
+  echo "$as_me:26845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26847: \$? = $ac_status" >&5
+  echo "$as_me:26850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26860,13 +26863,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26866: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26869: checking for type of bool" >&5
+echo "$as_me:26872: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26885,7 +26888,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26888 "configure"
+#line 26891 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26926,15 +26929,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26932: \$? = $ac_status" >&5
+  echo "$as_me:26935: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26937: \$? = $ac_status" >&5
+  echo "$as_me:26940: \$? = $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
@@ -26951,19 +26954,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26957: 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:26961: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26964: 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:26966: checking for special defines needed for etip.h" >&5
+echo "$as_me:26969: 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"
@@ -26981,7 +26984,7 @@ do
 	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 26984 "configure"
+#line 26987 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26995,16 +26998,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27001: \$? = $ac_status" >&5
+  echo "$as_me:27004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27007: \$? = $ac_status" >&5
+  echo "$as_me:27010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27025,12 +27028,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27031: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27036: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27047,7 +27050,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27050 "configure"
+#line 27053 "configure"
 #include "confdefs.h"
 
 class base
@@ -27066,15 +27069,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27072: \$? = $ac_status" >&5
+  echo "$as_me:27075: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27077: \$? = $ac_status" >&5
+  echo "$as_me:27080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27093,7 +27096,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27102,7 +27105,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27108: 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
@@ -27119,7 +27122,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27122 "configure"
+#line 27125 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27138,15 +27141,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27144: \$? = $ac_status" >&5
+  echo "$as_me:27147: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27149: \$? = $ac_status" >&5
+  echo "$as_me:27152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27165,7 +27168,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27171: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27175,7 +27178,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27181: 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
@@ -27189,7 +27192,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27192 "configure"
+#line 27195 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27233,16 +27236,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27239: \$? = $ac_status" >&5
+  echo "$as_me:27242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27245: \$? = $ac_status" >&5
+  echo "$as_me:27248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27260,7 +27263,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27309,13 +27312,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27312: checking for bool" >&5
+echo "$as_me:27315: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27318 "configure"
+#line 27321 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27350,16 +27353,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27356: \$? = $ac_status" >&5
+  echo "$as_me:27359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27362: \$? = $ac_status" >&5
+  echo "$as_me:27365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27369,10 +27372,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
+echo "$as_me:27375: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27375: checking size of bool" >&5
+echo "$as_me:27378: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27381,7 +27384,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27384 "configure"
+#line 27387 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27413,21 +27416,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27419: \$? = $ac_status" >&5
+  echo "$as_me:27422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27425: \$? = $ac_status" >&5
+  echo "$as_me:27428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27430 "configure"
+#line 27433 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27459,16 +27462,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27465: \$? = $ac_status" >&5
+  echo "$as_me:27468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27471: \$? = $ac_status" >&5
+  echo "$as_me:27474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27484,7 +27487,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27487 "configure"
+#line 27490 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27516,16 +27519,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27522: \$? = $ac_status" >&5
+  echo "$as_me:27525: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27528: \$? = $ac_status" >&5
+  echo "$as_me:27531: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27541,7 +27544,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27544 "configure"
+#line 27547 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27573,16 +27576,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27579: \$? = $ac_status" >&5
+  echo "$as_me:27582: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27585: \$? = $ac_status" >&5
+  echo "$as_me:27588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27595,12 +27598,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27598: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27601: 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 27603 "configure"
+#line 27606 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27636,15 +27639,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27642: \$? = $ac_status" >&5
+  echo "$as_me:27645: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27647: \$? = $ac_status" >&5
+  echo "$as_me:27650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27660,13 +27663,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27666: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27669: checking for type of bool" >&5
+echo "$as_me:27672: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27685,7 +27688,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27688 "configure"
+#line 27691 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27726,15 +27729,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27732: \$? = $ac_status" >&5
+  echo "$as_me:27735: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27737: \$? = $ac_status" >&5
+  echo "$as_me:27740: \$? = $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
@@ -27751,26 +27754,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27757: 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:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27764: 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:27767: checking for fallback type of bool" >&5
+			echo "$as_me:27770: 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:27773: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27776: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27799,7 +27802,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27802: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27805: 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
@@ -27810,7 +27813,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27827,10 +27830,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27830: result: $ADAFLAGS" >&5
+	echo "$as_me:27833: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27836: 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
@@ -27840,11 +27843,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27843: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27846: 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:27847: checking if GNAT supports generics" >&5
+echo "$as_me:27850: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27854,7 +27857,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27857: result: $cf_gnat_generics" >&5
+echo "$as_me:27860: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27866,7 +27869,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27872: 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
@@ -27914,7 +27917,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27927,7 +27930,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27930: checking if GNAT supports project files" >&5
+echo "$as_me:27933: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27990,15 +27993,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27993: result: $cf_gnat_projects" >&5
+echo "$as_me:27996: 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:27999: checking if GNAT supports libraries" >&5
+	echo "$as_me:28002: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28004: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28018,7 +28021,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28024: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28030,7 +28033,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28033: checking for Ada95 compiler" >&5
+echo "$as_me:28036: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28041,12 +28044,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28044: result: $cf_ada_compiler" >&5
+echo "$as_me:28047: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28049: checking for Ada95 include directory" >&5
+echo "$as_me:28052: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28082,7 +28085,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28085: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28091,10 +28094,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28094: result: $ADA_INCLUDE" >&5
+echo "$as_me:28097: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28097: checking for Ada95 object directory" >&5
+echo "$as_me:28100: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28130,7 +28133,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28133: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28139,10 +28142,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28142: result: $ADA_OBJECTS" >&5
+echo "$as_me:28145: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28145: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28148: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28163,11 +28166,11 @@ then
 	fi
 fi
 
-echo "$as_me:28166: result: $with_ada_sharedlib" >&5
+echo "$as_me:28169: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28170: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28173: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28185,7 +28188,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28188: checking for Ada95 curses library name" >&5
+echo "$as_me:28191: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28201,7 +28204,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28204: result: $ADA_LIBNAME" >&5
+echo "$as_me:28207: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28212,13 +28215,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28215: checking for wchar_t" >&5
+	echo "$as_me:28218: 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 28221 "configure"
+#line 28224 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28233,16 +28236,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28239: \$? = $ac_status" >&5
+  echo "$as_me:28242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28245: \$? = $ac_status" >&5
+  echo "$as_me:28248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28252,10 +28255,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28255: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28258: checking size of wchar_t" >&5
+echo "$as_me:28261: 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
@@ -28264,7 +28267,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28267 "configure"
+#line 28270 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28276,21 +28279,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28282: \$? = $ac_status" >&5
+  echo "$as_me:28285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28288: \$? = $ac_status" >&5
+  echo "$as_me:28291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28293 "configure"
+#line 28296 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28302,16 +28305,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28308: \$? = $ac_status" >&5
+  echo "$as_me:28311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28314: \$? = $ac_status" >&5
+  echo "$as_me:28317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28327,7 +28330,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28330 "configure"
+#line 28333 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28339,16 +28342,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28345: \$? = $ac_status" >&5
+  echo "$as_me:28348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28351: \$? = $ac_status" >&5
+  echo "$as_me:28354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28364,7 +28367,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28367 "configure"
+#line 28370 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28376,16 +28379,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28382: \$? = $ac_status" >&5
+  echo "$as_me:28385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28388: \$? = $ac_status" >&5
+  echo "$as_me:28391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28398,12 +28401,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28401: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28404: 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 28406 "configure"
+#line 28409 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28419,15 +28422,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28425: \$? = $ac_status" >&5
+  echo "$as_me:28428: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28430: \$? = $ac_status" >&5
+  echo "$as_me:28433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28443,7 +28446,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28446: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28449: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28456,7 +28459,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28459: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28474,7 +28477,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28477: checking for library subsets" >&5
+echo "$as_me:28480: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28528,7 +28531,7 @@ fi
 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:28531: result: $LIB_SUBSETS" >&5
+echo "$as_me:28534: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28559,7 +28562,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28562: checking default library suffix" >&5
+echo "$as_me:28565: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28570,10 +28573,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28573: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28576: checking default library-dependency suffix" >&5
+echo "$as_me:28579: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28656,10 +28659,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28659: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28662: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28662: checking default object directory" >&5
+echo "$as_me:28665: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28675,11 +28678,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28678: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28682: checking c++ library-dependency suffix" >&5
+echo "$as_me:28685: 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++)
@@ -28772,7 +28775,7 @@ else
 	fi
 
 fi
-echo "$as_me:28775: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28948,19 +28951,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28951: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28954: 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 <<EOF
-#line 28956 "configure"
+#line 28959 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28960: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28963: \$? = $ac_status" >&5
+  echo "$as_me:28966: \$? = $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
@@ -28971,10 +28974,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28974 "configure"
+#line 28977 "configure"
 #include "confdefs.h"
 
-#line 28977 "configure"
+#line 28980 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28989,16 +28992,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28995: \$? = $ac_status" >&5
+  echo "$as_me:28998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29001: \$? = $ac_status" >&5
+  echo "$as_me:29004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29021,7 +29024,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29024: result: $cf_ldflags_static" >&5
+	echo "$as_me:29027: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29037,7 +29040,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29040: checking where we will install curses.h" >&5
+echo "$as_me:29043: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29047,7 +29050,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29050: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29055,7 +29058,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29058: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29061: 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
@@ -29080,7 +29083,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29083: checking for desired basename for form library" >&5
+echo "$as_me:29086: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29100,10 +29103,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29103: result: $FORM_NAME" >&5
+echo "$as_me:29106: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29106: checking for desired basename for menu library" >&5
+echo "$as_me:29109: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29123,10 +29126,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29126: result: $MENU_NAME" >&5
+echo "$as_me:29129: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29129: checking for desired basename for panel library" >&5
+echo "$as_me:29132: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29146,10 +29149,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29149: result: $PANEL_NAME" >&5
+echo "$as_me:29152: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29152: checking for desired basename for cxx library" >&5
+echo "$as_me:29155: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29169,13 +29172,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29172: result: $CXX_NAME" >&5
+echo "$as_me:29175: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29178: checking for src modules" >&5
+echo "$as_me:29181: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29234,7 +29237,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29237: result: $cf_cv_src_modules" >&5
+echo "$as_me:29240: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29395,7 +29398,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29398: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29401: 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//'`
@@ -29406,7 +29409,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29409: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29412: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29422,7 +29425,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29425: result: $PKG_CFLAGS" >&5
+echo "$as_me:29428: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
@@ -29483,7 +29486,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29486: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29510,7 +29513,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29513: checking for linker search path" >&5
+echo "$as_me:29516: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29558,7 +29561,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29561: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29599,7 +29602,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29602: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29605: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29685,7 +29688,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29688: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29821,7 +29824,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20231210,
+configured by $0, generated by GNU Autoconf 2.52.20240618,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -29866,7 +29869,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29869: error: ambiguous option: $1
+    { { echo "$as_me:29872: 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;}
@@ -29885,7 +29888,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29888: error: unrecognized option: $1
+  -*) { { echo "$as_me:29891: 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;}
@@ -29904,7 +29907,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20231210, executed with
+This file was extended by $as_me 2.52.20240618, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -30015,7 +30018,7 @@ do
   "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:30018: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30021: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30432,14 +30435,14 @@ EOF
       # is no need to browse any of the substitutions).
       # These are the two extra sed commands mentioned above.
       (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
       if test -s "$tmp"/subs.next; then
-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
+        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
         if test ! -s "$tmp"/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
           if test ! -s "$tmp"/subs.edit; then
@@ -30537,7 +30540,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30540: creating $ac_file" >&5
+    { echo "$as_me:30543: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30555,7 +30558,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30558: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30568,7 +30571,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30571: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30574: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30584,7 +30587,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30587: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30590: 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;}
@@ -30593,7 +30596,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30596: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30599: 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;}
@@ -30638,7 +30641,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30641: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30644: 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;}
@@ -30649,7 +30652,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30652: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30655: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30698,7 +30701,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30701: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30709,7 +30712,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30712: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30722,7 +30725,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30725: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30728: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30780,7 +30783,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30783: $ac_file is unchanged" >&5
+      { echo "$as_me:30786: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31167,7 +31170,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31170: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index e7b3e49cb..aa00145b6 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1620 2024/06/29 10:00:32 tom Exp $
+# $Id: dist.mk,v 1.1621 2024/07/06 09:41:29 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240629
+NCURSES_PATCH = 20240706
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 7891ef0e5..46946452b 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240629) unstable; urgency=low
+ncurses6td (6.5+20240706) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7891ef0e5..46946452b 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240629) unstable; urgency=low
+ncurses6td (6.5+20240706) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d1405115e..2b91a919a 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240629) unstable; urgency=low
+ncurses6td (6.5+20240706) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2024 06:00:32 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 150d7fec7..987971691 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.655 2024/06/29 10:00:32 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.656 2024/07/06 09:41:29 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0629"
+!define VERSION_MMDD  "0706"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9d7c279d4..1e28ca959 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240629
+Release: 20240706
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 125e860b2..0439eca64 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240629
+Release: 20240706
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index a23dd0800..289ee46b6 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240629
+Release: 20240706
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 1968f0394..7cc4c5bf0 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.222 2024/05/18 18:08:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -901,15 +901,22 @@ CF_CURSES_HEADER
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42
+dnl CF_CURSES_FUNCS version: 21 updated: 2024/06/11 20:24:35
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
+dnl
+dnl $1 is a list of functions to test
 AC_DEFUN([CF_CURSES_FUNCS],
 [
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_REQUIRE([CF_XOPEN_CURSES])
 AC_REQUIRE([CF_CURSES_TERM_H])
 AC_REQUIRE([CF_CURSES_UNCTRL_H])
+
+AC_FOREACH([AC_Func], [$1],
+  [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Func),
+               [Define if you have the `]AC_Func[' function.])])dnl
+
 for cf_func in $1
 do
 	CF_UPPER(cf_tr_func,$cf_func)
@@ -3076,13 +3083,12 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_PTHREADS version: 2 updated: 2016/04/22 05:07:41
+dnl CF_NCURSES_PTHREADS version: 3 updated: 2024/07/06 13:57:42
 dnl -------------------
-dnl Use this followup check to ensure that we link with pthreads if ncurses
-dnl uses it.
+dnl Use this followup check, e.g., in CF_WITH_NCURSES_ETC, to ensure that we
+dnl link with pthreads if ncurses uses it.
 AC_DEFUN([CF_NCURSES_PTHREADS],[
-: ${cf_nculib_root:=ifelse($1,,ncurses,$1)}
-AC_CHECK_LIB($cf_nculib_root,_nc_init_pthreads,
+AC_CHECK_FUNC(_nc_init_pthreads,
 	cf_cv_ncurses_pthreads=yes,
 	cf_cv_ncurses_pthreads=no)
 if test "$cf_cv_ncurses_pthreads" = yes
diff --git a/test/configure b/test/configure
index 264be1c6b..2b779d500 100755
--- a/test/configure
+++ b/test/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20231210.
+# Generated by Autoconf 2.52.20240618.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -480,6 +480,10 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
+  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
+    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
+    ;;
+
   -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
@@ -809,7 +813,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
+generated by GNU Autoconf 2.52.20240618.  Invocation command line was
 
   $ $0 $@
 
@@ -933,7 +937,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:936: loading site script $ac_site_file" >&5
+    { echo "$as_me:940: 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"
@@ -944,7 +948,7 @@ if test -r "$cache_file"; then
   # 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:947: loading cache $cache_file" >&5
+    { echo "$as_me:951: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -952,7 +956,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:955: creating cache $cache_file" >&5
+  { echo "$as_me:959: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -968,21 +972,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:971: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:975: 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:975: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:979: 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:981: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:985: 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:983:   former value:  $ac_old_val" >&5
+        { echo "$as_me:987:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:985:   current value: $ac_new_val" >&5
+        { echo "$as_me:989:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1001,9 +1005,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1004: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1008: 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:1006: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1010: 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
@@ -1032,10 +1036,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1038: \$? = $ac_status" >&5
+  echo "$as_me:1042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1067,7 +1071,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1070: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1074: 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
@@ -1077,11 +1081,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1084: checking build system type" >&5
+echo "$as_me:1088: 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
@@ -1090,16 +1094,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1093: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1097: 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:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1101: 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:1102: result: $ac_cv_build" >&5
+echo "$as_me:1106: 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/'`
@@ -1107,7 +1111,7 @@ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1110: checking host system type" >&5
+	echo "$as_me:1114: 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
@@ -1116,12 +1120,12 @@ else
 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:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1123: 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:1124: result: $ac_cv_host" >&5
+echo "$as_me:1128: 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/'`
@@ -1147,13 +1151,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1154: 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:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1158: 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:1156: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1160: 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
@@ -1171,7 +1175,7 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-echo "$as_me:1174: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1178: 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
@@ -1191,11 +1195,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1194: result: yes" >&5
+  echo "$as_me:1198: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1198: result: no" >&5
+  echo "$as_me:1202: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1209,7 +1213,7 @@ ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1212: checking for $ac_word" >&5
+echo "$as_me:1216: 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
@@ -1224,7 +1228,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1227: found $ac_dir/$ac_word" >&5
+echo "$as_me:1231: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1232,10 +1236,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1235: result: $CC" >&5
+  echo "$as_me:1239: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1238: result: no" >&5
+  echo "$as_me:1242: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1244,7 +1248,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1247: checking for $ac_word" >&5
+echo "$as_me:1251: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1259,7 +1263,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1262: found $ac_dir/$ac_word" >&5
+echo "$as_me:1266: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1267,10 +1271,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1270: result: $ac_ct_CC" >&5
+  echo "$as_me:1274: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1273: result: no" >&5
+  echo "$as_me:1277: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1283,7 +1287,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1286: checking for $ac_word" >&5
+echo "$as_me:1290: 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
@@ -1298,7 +1302,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1301: found $ac_dir/$ac_word" >&5
+echo "$as_me:1305: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1306,10 +1310,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1309: result: $CC" >&5
+  echo "$as_me:1313: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1312: result: no" >&5
+  echo "$as_me:1316: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1318,7 +1322,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1321: checking for $ac_word" >&5
+echo "$as_me:1325: 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
@@ -1333,7 +1337,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1336: found $ac_dir/$ac_word" >&5
+echo "$as_me:1340: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1341,10 +1345,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1344: result: $ac_ct_CC" >&5
+  echo "$as_me:1348: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1347: result: no" >&5
+  echo "$as_me:1351: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1357,7 +1361,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1360: checking for $ac_word" >&5
+echo "$as_me:1364: 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
@@ -1377,7 +1381,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1380: found $ac_dir/$ac_word" >&5
+echo "$as_me:1384: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1399,10 +1403,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1402: result: $CC" >&5
+  echo "$as_me:1406: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1405: result: no" >&5
+  echo "$as_me:1409: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1413,7 +1417,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1416: checking for $ac_word" >&5
+echo "$as_me:1420: 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
@@ -1428,7 +1432,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1431: found $ac_dir/$ac_word" >&5
+echo "$as_me:1435: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1436,10 +1440,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1439: result: $CC" >&5
+  echo "$as_me:1443: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1442: result: no" >&5
+  echo "$as_me:1446: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1452,7 +1456,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1455: checking for $ac_word" >&5
+echo "$as_me:1459: 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
@@ -1467,7 +1471,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1470: found $ac_dir/$ac_word" >&5
+echo "$as_me:1474: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1475,10 +1479,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1478: result: $ac_ct_CC" >&5
+  echo "$as_me:1482: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1481: result: no" >&5
+  echo "$as_me:1485: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1490,32 +1494,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1493: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1497: 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:1498:" \
+echo "$as_me:1502:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1501: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1505: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1504: \$? = $ac_status" >&5
+  echo "$as_me:1508: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1506: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1510: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1509: \$? = $ac_status" >&5
+  echo "$as_me:1513: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1511: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1515: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1514: \$? = $ac_status" >&5
+  echo "$as_me:1518: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1518 "configure"
+#line 1522 "configure"
 #include "confdefs.h"
 
 int
@@ -1531,13 +1535,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1534: checking for C compiler default output" >&5
+echo "$as_me:1538: 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:1537: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1541: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1540: \$? = $ac_status" >&5
+  echo "$as_me:1544: \$? = $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
@@ -1560,34 +1564,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1563: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1567: 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:1569: result: $ac_file" >&5
+echo "$as_me:1573: 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:1574: checking whether the C compiler works" >&5
+echo "$as_me:1578: 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:1580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1583: \$? = $ac_status" >&5
+  echo "$as_me:1587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1590: error: cannot run C compiled programs.
+	{ { echo "$as_me:1594: 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;}
@@ -1595,24 +1599,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1598: result: yes" >&5
+echo "$as_me:1602: 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:1605: checking whether we are cross compiling" >&5
+echo "$as_me:1609: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1607: result: $cross_compiling" >&5
+echo "$as_me:1611: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1610: checking for executable suffix" >&5
+echo "$as_me:1614: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1615: \$? = $ac_status" >&5
+  echo "$as_me:1619: \$? = $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
@@ -1628,25 +1632,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1631: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1635: 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:1637: result: $ac_cv_exeext" >&5
+echo "$as_me:1641: 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:1643: checking for object suffix" >&5
+echo "$as_me:1647: 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 1649 "configure"
+#line 1653 "configure"
 #include "confdefs.h"
 
 int
@@ -1658,10 +1662,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1664: \$? = $ac_status" >&5
+  echo "$as_me:1668: \$? = $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
@@ -1673,24 +1677,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1676: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1680: 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:1683: result: $ac_cv_objext" >&5
+echo "$as_me:1687: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1687: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1691: 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 1693 "configure"
+#line 1697 "configure"
 #include "confdefs.h"
 
 int
@@ -1705,16 +1709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1711: \$? = $ac_status" >&5
+  echo "$as_me:1715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1717: \$? = $ac_status" >&5
+  echo "$as_me:1721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1726,19 +1730,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1729: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1733: 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:1735: checking whether $CC accepts -g" >&5
+echo "$as_me:1739: 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 1741 "configure"
+#line 1745 "configure"
 #include "confdefs.h"
 
 int
@@ -1750,16 +1754,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1756: \$? = $ac_status" >&5
+  echo "$as_me:1760: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1762: \$? = $ac_status" >&5
+  echo "$as_me:1766: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1769,7 +1773,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1772: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1776: 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
@@ -1796,16 +1800,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1802: \$? = $ac_status" >&5
+  echo "$as_me:1806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1808: \$? = $ac_status" >&5
+  echo "$as_me:1812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1817,7 +1821,7 @@ if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1820 "configure"
+#line 1824 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1830,16 +1834,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1836: \$? = $ac_status" >&5
+  echo "$as_me:1840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1842: \$? = $ac_status" >&5
+  echo "$as_me:1846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1849,7 +1853,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1852 "configure"
+#line 1856 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1861,16 +1865,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1867: \$? = $ac_status" >&5
+  echo "$as_me:1871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1873: \$? = $ac_status" >&5
+  echo "$as_me:1877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1900,11 +1904,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1903: checking version of $CC" >&5
+	echo "$as_me:1907: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1907: result: $GCC_VERSION" >&5
+	echo "$as_me:1911: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1913,12 +1917,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1916: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1920: 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 1921 "configure"
+#line 1925 "configure"
 #include "confdefs.h"
 
 int
@@ -1935,16 +1939,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1941: \$? = $ac_status" >&5
+  echo "$as_me:1945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1947: \$? = $ac_status" >&5
+  echo "$as_me:1951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1955,7 +1959,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1958: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1962: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1964,11 +1968,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1967: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1971: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1971 "configure"
+#line 1975 "configure"
 #include "confdefs.h"
 
 int
@@ -1985,16 +1989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1991: \$? = $ac_status" >&5
+  echo "$as_me:1995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1997: \$? = $ac_status" >&5
+  echo "$as_me:2001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2004,7 +2008,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2007: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2011: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2013,30 +2017,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2020: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2023: checking version of $CC" >&5
+	echo "$as_me:2027: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2027: result: $CLANG_VERSION" >&5
+	echo "$as_me:2031: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2034: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2038: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2039 "configure"
+#line 2043 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2050,16 +2054,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2056: \$? = $ac_status" >&5
+  echo "$as_me:2060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2062: \$? = $ac_status" >&5
+  echo "$as_me:2066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2070,13 +2074,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2073: result: $cf_clang_optok" >&5
+		echo "$as_me:2077: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2083: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2085,7 +2089,7 @@ echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2092: 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 +2097,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2096 "configure"
+#line 2100 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2140,16 +2144,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2146: \$? = $ac_status" >&5
+  echo "$as_me:2150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2152: \$? = $ac_status" >&5
+  echo "$as_me:2156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2166,10 +2170,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2169: result: none needed" >&5
+    echo "$as_me:2173: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2177,13 +2181,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2180: checking \$CFLAGS variable" >&5
+echo "$as_me:2184: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2184: result: broken" >&5
+	echo "$as_me:2188: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2186: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2190: 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=
@@ -2291,18 +2295,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2294: result: ok" >&5
+	echo "$as_me:2298: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2299: checking \$CC variable" >&5
+echo "$as_me:2303: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2303: result: broken" >&5
+	echo "$as_me:2307: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2305: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2309: 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/[ ]*[ ]-[^ ].*//'`
@@ -2419,24 +2423,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2434: result: ok" >&5
+	echo "$as_me:2438: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2439: checking for inline" >&5
+echo "$as_me:2443: 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
@@ -2444,7 +2448,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2447 "configure"
+#line 2451 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -2453,16 +2457,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2459: \$? = $ac_status" >&5
+  echo "$as_me:2463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2465: \$? = $ac_status" >&5
+  echo "$as_me:2469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2473,7 +2477,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:2476: result: $ac_cv_c_inline" >&5
+echo "$as_me:2480: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2492,7 +2496,7 @@ for ac_prog in ggrep grep
 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:2495: checking for $ac_word" >&5
+echo "$as_me:2499: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2507,7 +2511,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2510: found $ac_dir/$ac_word" >&5
+echo "$as_me:2514: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2515,10 +2519,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2518: result: $GREP" >&5
+  echo "$as_me:2522: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2521: result: no" >&5
+  echo "$as_me:2525: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2526,7 +2530,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2529: checking for egrep" >&5
+echo "$as_me:2533: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2538,7 +2542,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2541: checking for $ac_word" >&5
+echo "$as_me:2545: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2555,7 +2559,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2558: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2562: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2566,10 +2570,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2569: result: $EGREP" >&5
+  echo "$as_me:2573: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2572: result: no" >&5
+  echo "$as_me:2576: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2577,12 +2581,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2592,7 +2596,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2595: checking how to run the C preprocessor" >&5
+echo "$as_me:2599: 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
@@ -2613,18 +2617,18 @@ do
   # 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 2616 "configure"
+#line 2620 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2625: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2627: \$? = $ac_status" >&5
+  echo "$as_me:2631: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2647,17 +2651,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2650 "configure"
+#line 2654 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2660: \$? = $ac_status" >&5
+  echo "$as_me:2664: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2694,7 +2698,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2697: result: $CPP" >&5
+echo "$as_me:2701: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2704,18 +2708,18 @@ do
   # 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 2707 "configure"
+#line 2711 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2718: \$? = $ac_status" >&5
+  echo "$as_me:2722: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2738,17 +2742,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2741 "configure"
+#line 2745 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2751: \$? = $ac_status" >&5
+  echo "$as_me:2755: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2776,7 +2780,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2792,7 +2796,7 @@ for ac_prog in mawk gawk nawk awk
 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:2795: checking for $ac_word" >&5
+echo "$as_me:2799: 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
@@ -2807,7 +2811,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2810: found $ac_dir/$ac_word" >&5
+echo "$as_me:2814: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2815,10 +2819,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2818: result: $AWK" >&5
+  echo "$as_me:2822: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2821: result: no" >&5
+  echo "$as_me:2825: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2837,7 +2841,7 @@ done
 # 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:2840: checking for a BSD compatible install" >&5
+echo "$as_me:2844: 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
@@ -2886,7 +2890,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2889: result: $INSTALL" >&5
+echo "$as_me:2893: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2907,7 +2911,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:2910: checking if you want to install stripped executables" >&5
+echo "$as_me:2914: 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.
@@ -2924,7 +2928,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:2927: result: $enable_stripping" >&5
+echo "$as_me:2931: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -2935,7 +2939,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:2938: checking if install accepts -p option" >&5
+echo "$as_me:2942: 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
@@ -2966,10 +2970,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:2969: result: $cf_cv_install_p" >&5
+echo "$as_me:2973: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:2972: checking if install needs to be told about ownership" >&5
+echo "$as_me:2976: 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)
@@ -2980,7 +2984,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:2983: result: $with_install_o" >&5
+echo "$as_me:2987: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -2991,7 +2995,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:2994: checking if you want to specify strip-program" >&5
+	echo "$as_me:2998: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3001,11 +3005,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3004: result: $with_strip_program" >&5
+	echo "$as_me:3008: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3008: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3012: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3026,11 +3030,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3029: result: $check_install_strip" >&5
+		echo "$as_me:3033: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3037: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3045,7 +3049,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3059,7 +3063,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3062: checking for $ac_word" >&5
+echo "$as_me:3066: 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
@@ -3074,7 +3078,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3077: found $ac_dir/$ac_word" >&5
+echo "$as_me:3081: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3082,10 +3086,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3085: result: $LINT" >&5
+  echo "$as_me:3089: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3088: result: no" >&5
+  echo "$as_me:3092: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3098,7 +3102,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3101: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3105: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3153,14 +3157,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3160: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3163: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3167: 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
@@ -3187,7 +3191,7 @@ else
 fi
 
 fi
-echo "$as_me:3190: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3198,7 +3202,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3201: checking for $ac_word" >&5
+echo "$as_me:3205: 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
@@ -3213,7 +3217,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3216: found $ac_dir/$ac_word" >&5
+echo "$as_me:3220: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3221,10 +3225,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3224: result: $CTAGS" >&5
+  echo "$as_me:3228: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3227: result: no" >&5
+  echo "$as_me:3231: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3235,7 +3239,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3238: checking for $ac_word" >&5
+echo "$as_me:3242: 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
@@ -3250,7 +3254,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3253: found $ac_dir/$ac_word" >&5
+echo "$as_me:3257: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3258,10 +3262,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3261: result: $ETAGS" >&5
+  echo "$as_me:3265: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3264: result: no" >&5
+  echo "$as_me:3268: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3270,7 +3274,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3273: checking for $ac_word" >&5
+echo "$as_me:3277: 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
@@ -3285,7 +3289,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3288: found $ac_dir/$ac_word" >&5
+echo "$as_me:3292: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3294,17 +3298,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3300: result: no" >&5
+  echo "$as_me:3304: 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:3307: checking for $ac_word" >&5
+echo "$as_me:3311: 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
@@ -3319,7 +3323,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3322: found $ac_dir/$ac_word" >&5
+echo "$as_me:3326: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3328,10 +3332,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3334: result: no" >&5
+  echo "$as_me:3338: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3351,14 +3355,14 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3354: checking if -lm needed for math functions" >&5
+echo "$as_me:3358: 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 3361 "configure"
+#line 3365 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3374,16 +3378,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3380: \$? = $ac_status" >&5
+  echo "$as_me:3384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3386: \$? = $ac_status" >&5
+  echo "$as_me:3390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -3393,7 +3397,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3396: result: $cf_cv_need_libm" >&5
+echo "$as_me:3400: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -3401,14 +3405,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:3404: checking if -lm is available for math functions" >&5
+	echo "$as_me:3408: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3411 "configure"
+#line 3415 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3424,16 +3428,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3430: \$? = $ac_status" >&5
+  echo "$as_me:3434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3436: \$? = $ac_status" >&5
+  echo "$as_me:3440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -3443,7 +3447,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3446: result: $cf_cv_have_libm" >&5
+echo "$as_me:3450: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -3498,7 +3502,7 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
-echo "$as_me:3501: checking for fgrep" >&5
+echo "$as_me:3505: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3510,7 +3514,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3513: checking for $ac_word" >&5
+echo "$as_me:3517: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3527,7 +3531,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3530: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3534: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3538,10 +3542,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3541: result: $FGREP" >&5
+  echo "$as_me:3545: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3544: result: no" >&5
+  echo "$as_me:3548: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3549,16 +3553,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:3565: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -3575,17 +3579,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:3578: result: $enable_stdnoreturn" >&5
+echo "$as_me:3582: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:3582: checking for C11 _Noreturn feature" >&5
+echo "$as_me:3586: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3588 "configure"
+#line 3592 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3601,16 +3605,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3607: \$? = $ac_status" >&5
+  echo "$as_me:3611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3613: \$? = $ac_status" >&5
+  echo "$as_me:3617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -3621,7 +3625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -3660,10 +3664,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 3666 "${as_me:-configure}"
+#line 3670 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -3713,12 +3717,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3719: \$? = $ac_status" >&5
+  echo "$as_me:3723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -3777,7 +3781,7 @@ fi
 rm -rf ./conftest*
 fi
 
-echo "$as_me:3780: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3784: 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.
@@ -3787,7 +3791,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:3790: result: $enable_string_hacks" >&5
+echo "$as_me:3794: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -3796,15 +3800,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:3799: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:3803: 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:3801: checking for strlcat" >&5
+	echo "$as_me:3805: 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 3807 "configure"
+#line 3811 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3835,16 +3839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3841: \$? = $ac_status" >&5
+  echo "$as_me:3845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3847: \$? = $ac_status" >&5
+  echo "$as_me:3851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -3854,7 +3858,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -3864,7 +3868,7 @@ EOF
 
 else
 
-		echo "$as_me:3867: checking for strlcat in -lbsd" >&5
+		echo "$as_me:3871: 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
@@ -3872,7 +3876,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3875 "configure"
+#line 3879 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3891,16 +3895,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3897: \$? = $ac_status" >&5
+  echo "$as_me:3901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3903: \$? = $ac_status" >&5
+  echo "$as_me:3907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -3911,7 +3915,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3914: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3918: 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
 
@@ -3934,23 +3938,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3937: checking for $ac_header" >&5
+echo "$as_me:3941: 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 3943 "configure"
+#line 3947 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3947: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3953: \$? = $ac_status" >&5
+  echo "$as_me:3957: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3969,7 +3973,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:3976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -3990,13 +3994,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3993: checking for $ac_func" >&5
+echo "$as_me:3997: 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 3999 "configure"
+#line 4003 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4027,16 +4031,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4033: \$? = $ac_status" >&5
+  echo "$as_me:4037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4039: \$? = $ac_status" >&5
+  echo "$as_me:4043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4046,7 +4050,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:4053: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4058,14 +4062,14 @@ done
 
 fi
 
-echo "$as_me:4061: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:4065: 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 4068 "configure"
+#line 4072 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4084,16 +4088,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4090: \$? = $ac_status" >&5
+  echo "$as_me:4094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4096: \$? = $ac_status" >&5
+  echo "$as_me:4100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -4104,7 +4108,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4107: result: $cf_cv_posix_visible" >&5
+echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -4146,14 +4150,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:4149: checking if this is the GNU C library" >&5
+echo "$as_me:4153: 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 4156 "configure"
+#line 4160 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4172,16 +4176,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4178: \$? = $ac_status" >&5
+  echo "$as_me:4182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4184: \$? = $ac_status" >&5
+  echo "$as_me:4188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -4192,7 +4196,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4195: result: $cf_cv_gnu_library" >&5
+echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -4200,7 +4204,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:4203: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:4207: 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
@@ -4212,7 +4216,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4215 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4231,16 +4235,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4237: \$? = $ac_status" >&5
+  echo "$as_me:4241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4243: \$? = $ac_status" >&5
+  echo "$as_me:4247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -4252,12 +4256,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:4255: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:4259: 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:4260: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:4264: 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
@@ -4362,7 +4366,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4365 "configure"
+#line 4369 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -4382,16 +4386,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4388: \$? = $ac_status" >&5
+  echo "$as_me:4392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4394: \$? = $ac_status" >&5
+  echo "$as_me:4398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -4402,7 +4406,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4405: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4409: 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
@@ -4411,14 +4415,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:4414: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:4418: 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 4421 "configure"
+#line 4425 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4433,16 +4437,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4439: \$? = $ac_status" >&5
+  echo "$as_me:4443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4445: \$? = $ac_status" >&5
+  echo "$as_me:4449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4549,7 +4553,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4552 "configure"
+#line 4556 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4564,16 +4568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4570: \$? = $ac_status" >&5
+  echo "$as_me:4574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4576: \$? = $ac_status" >&5
+  echo "$as_me:4580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4588,12 +4592,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4591: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4595: 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:4596: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:4600: 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
@@ -4603,7 +4607,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4606 "configure"
+#line 4610 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4618,16 +4622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4624: \$? = $ac_status" >&5
+  echo "$as_me:4628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4630: \$? = $ac_status" >&5
+  echo "$as_me:4634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -4638,7 +4642,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4641: result: $cf_cv_default_source" >&5
+echo "$as_me:4645: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -4675,16 +4679,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4678: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4682: 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}:4684: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4688: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4687 "configure"
+#line 4691 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4699,16 +4703,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4705: \$? = $ac_status" >&5
+  echo "$as_me:4709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4711: \$? = $ac_status" >&5
+  echo "$as_me:4715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4729,7 +4733,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4732 "configure"
+#line 4736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4744,16 +4748,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4750: \$? = $ac_status" >&5
+  echo "$as_me:4754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4756: \$? = $ac_status" >&5
+  echo "$as_me:4760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4764,7 +4768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4772,10 +4776,10 @@ echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4778 "configure"
+#line 4782 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4790,16 +4794,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4796: \$? = $ac_status" >&5
+  echo "$as_me:4800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4802: \$? = $ac_status" >&5
+  echo "$as_me:4806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4815,7 +4819,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4818: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4822: 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
@@ -4932,7 +4936,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4935: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4939: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -4964,14 +4968,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:4967: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4971: 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 4974 "configure"
+#line 4978 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4989,16 +4993,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4995: \$? = $ac_status" >&5
+  echo "$as_me:4999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5001: \$? = $ac_status" >&5
+  echo "$as_me:5005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5010,7 +5014,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5013 "configure"
+#line 5017 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5028,16 +5032,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5034: \$? = $ac_status" >&5
+  echo "$as_me:5038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5040: \$? = $ac_status" >&5
+  echo "$as_me:5044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5052,7 +5056,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5055: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5212,16 +5216,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5215: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5219: 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}:5221: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5225: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5224 "configure"
+#line 5228 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5236,16 +5240,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5242: \$? = $ac_status" >&5
+  echo "$as_me:5246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5248: \$? = $ac_status" >&5
+  echo "$as_me:5252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5266,7 +5270,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5269 "configure"
+#line 5273 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5281,16 +5285,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5287: \$? = $ac_status" >&5
+  echo "$as_me:5291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5293: \$? = $ac_status" >&5
+  echo "$as_me:5297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5301,7 +5305,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5309,10 +5313,10 @@ echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5315 "configure"
+#line 5319 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5327,16 +5331,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5333: \$? = $ac_status" >&5
+  echo "$as_me:5337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5339: \$? = $ac_status" >&5
+  echo "$as_me:5343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5352,7 +5356,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5355: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5359: 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
@@ -5465,10 +5469,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5471 "configure"
+#line 5475 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5486,23 +5490,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5492: \$? = $ac_status" >&5
+  echo "$as_me:5496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5498: \$? = $ac_status" >&5
+  echo "$as_me:5502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5509: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5525,7 +5529,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5537,7 +5541,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5625,7 +5629,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5635,7 +5639,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5645,7 +5649,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5648: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5652: 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"
@@ -5657,10 +5661,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5660: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5664: 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 5663 "configure"
+#line 5667 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5675,16 +5679,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5681: \$? = $ac_status" >&5
+  echo "$as_me:5685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5687: \$? = $ac_status" >&5
+  echo "$as_me:5691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5693,12 +5697,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5696: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5700: 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 5701 "configure"
+#line 5705 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5713,16 +5717,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5719: \$? = $ac_status" >&5
+  echo "$as_me:5723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5725: \$? = $ac_status" >&5
+  echo "$as_me:5729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5733,19 +5737,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5741: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5745: 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 5748 "configure"
+#line 5752 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5763,16 +5767,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5769: \$? = $ac_status" >&5
+  echo "$as_me:5773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5775: \$? = $ac_status" >&5
+  echo "$as_me:5779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5784,7 +5788,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5787 "configure"
+#line 5791 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5802,16 +5806,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5808: \$? = $ac_status" >&5
+  echo "$as_me:5812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5814: \$? = $ac_status" >&5
+  echo "$as_me:5818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5826,7 +5830,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5829: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5973,13 +5977,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:5976: checking for ANSI C header files" >&5
+echo "$as_me:5980: 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 5982 "configure"
+#line 5986 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5987,13 +5991,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5990: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5994: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5996: \$? = $ac_status" >&5
+  echo "$as_me:6000: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6015,7 +6019,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6018 "configure"
+#line 6022 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6033,7 +6037,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6036 "configure"
+#line 6040 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6054,7 +6058,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6057 "configure"
+#line 6061 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6080,15 +6084,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6086: \$? = $ac_status" >&5
+  echo "$as_me:6090: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6091: \$? = $ac_status" >&5
+  echo "$as_me:6095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6101,7 +6105,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6104: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6117,28 +6121,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6120: checking for $ac_header" >&5
+echo "$as_me:6124: 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 6126 "configure"
+#line 6130 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6135: \$? = $ac_status" >&5
+  echo "$as_me:6139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6141: \$? = $ac_status" >&5
+  echo "$as_me:6145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6148,7 +6152,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6158,13 +6162,13 @@ EOF
 fi
 done
 
-echo "$as_me:6161: checking whether exit is declared" >&5
+echo "$as_me:6165: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6167 "configure"
+#line 6171 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6179,16 +6183,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6185: \$? = $ac_status" >&5
+  echo "$as_me:6189: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6191: \$? = $ac_status" >&5
+  echo "$as_me:6195: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6198,10 +6202,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6204: checking for signal global datatype" >&5
+echo "$as_me:6208: 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
@@ -6213,7 +6217,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6216 "configure"
+#line 6220 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6237,16 +6241,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6243: \$? = $ac_status" >&5
+  echo "$as_me:6247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6249: \$? = $ac_status" >&5
+  echo "$as_me:6253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6260,7 +6264,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6263: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6267: 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 <<EOF
@@ -6269,14 +6273,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6272: checking if SIGWINCH is defined" >&5
+echo "$as_me:6276: 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 6279 "configure"
+#line 6283 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6291,23 +6295,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6297: \$? = $ac_status" >&5
+  echo "$as_me:6301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6303: \$? = $ac_status" >&5
+  echo "$as_me:6307: \$? = $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 6310 "configure"
+#line 6314 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6325,16 +6329,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6331: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6337: \$? = $ac_status" >&5
+  echo "$as_me:6341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6348,11 +6352,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6351: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6355: 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:6355: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6359: 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
@@ -6363,7 +6367,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6366 "configure"
+#line 6370 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6385,16 +6389,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6391: \$? = $ac_status" >&5
+  echo "$as_me:6395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6397: \$? = $ac_status" >&5
+  echo "$as_me:6401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6408,7 +6412,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6418,13 +6422,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6421: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6425: 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 6427 "configure"
+#line 6431 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6438,16 +6442,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6444: \$? = $ac_status" >&5
+  echo "$as_me:6448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6450: \$? = $ac_status" >&5
+  echo "$as_me:6454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6458,7 +6462,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6468,7 +6472,7 @@ EOF
 
 	fi
 
-echo "$as_me:6471: checking if you want to use pkg-config" >&5
+echo "$as_me:6475: 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.
@@ -6478,7 +6482,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6481: result: $cf_pkg_config" >&5
+echo "$as_me:6485: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6490,7 +6494,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6493: checking for $ac_word" >&5
+echo "$as_me:6497: 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
@@ -6507,7 +6511,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6510: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6514: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6518,10 +6522,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6521: result: $PKG_CONFIG" >&5
+  echo "$as_me:6525: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6524: result: no" >&5
+  echo "$as_me:6528: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6530,7 +6534,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6533: checking for $ac_word" >&5
+echo "$as_me:6537: 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
@@ -6547,7 +6551,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6550: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6554: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6559,10 +6563,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6565: result: no" >&5
+  echo "$as_me:6569: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6605,18 +6609,18 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6608: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6612: 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:6615: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6619: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6619: checking if you want to see long compiling messages" >&5
+echo "$as_me:6623: 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.
@@ -6650,10 +6654,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6653: result: $enableval" >&5
+echo "$as_me:6657: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6656: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6660: 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.
@@ -6663,10 +6667,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6669: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6673: 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.
@@ -6683,10 +6687,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6686: result: $cf_enable_widec" >&5
+echo "$as_me:6690: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6689: checking for specific curses-directory" >&5
+echo "$as_me:6693: 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.
@@ -6696,7 +6700,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6699: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6703: 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"
@@ -6727,7 +6731,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6763,7 +6767,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6766 "configure"
+#line 6770 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6775,16 +6779,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6781: \$? = $ac_status" >&5
+  echo "$as_me:6785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6787: \$? = $ac_status" >&5
+  echo "$as_me:6791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6801,7 +6805,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6837,7 +6841,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6850,7 +6854,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6853: checking for specified curses library type" >&5
+echo "$as_me:6857: 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.
@@ -6894,13 +6898,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6897: result: $cf_cv_screen" >&5
+echo "$as_me:6901: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6903: checking for extra include directories" >&5
+echo "$as_me:6907: 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
@@ -6926,7 +6930,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -6936,7 +6940,7 @@ then
 
 fi
 
-echo "$as_me:6939: checking if we have identified curses headers" >&5
+echo "$as_me:6943: 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
@@ -6948,7 +6952,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6951 "configure"
+#line 6955 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -6960,16 +6964,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6966: \$? = $ac_status" >&5
+  echo "$as_me:6970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6972: \$? = $ac_status" >&5
+  echo "$as_me:6976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -6980,11 +6984,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6983: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:6987: 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:6987: error: No curses header-files found" >&5
+	{ { echo "$as_me:6991: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6994,23 +6998,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6997: checking for $ac_header" >&5
+echo "$as_me:7001: 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 7003 "configure"
+#line 7007 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7007: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7013: \$? = $ac_status" >&5
+  echo "$as_me:7017: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7029,7 +7033,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7039,7 +7043,7 @@ EOF
 fi
 done
 
-echo "$as_me:7042: checking for terminfo header" >&5
+echo "$as_me:7046: 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
@@ -7057,7 +7061,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7060 "configure"
+#line 7064 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7072,16 +7076,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7078: \$? = $ac_status" >&5
+  echo "$as_me:7082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7084: \$? = $ac_status" >&5
+  echo "$as_me:7088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7097,7 +7101,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7100: result: $cf_cv_term_header" >&5
+echo "$as_me:7104: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7129,7 +7133,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7132: checking for ncurses version" >&5
+echo "$as_me:7136: 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
@@ -7155,10 +7159,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7158: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7162: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7161: \$? = $ac_status" >&5
+  echo "$as_me:7165: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7168,7 +7172,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7171 "configure"
+#line 7175 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7195,15 +7199,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7201: \$? = $ac_status" >&5
+  echo "$as_me:7205: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7206: \$? = $ac_status" >&5
+  echo "$as_me:7210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7217,17 +7221,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7220: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7224: 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:7227: checking if we have identified curses libraries" >&5
+echo "$as_me:7231: 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 7230 "configure"
+#line 7234 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7239,16 +7243,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7245: \$? = $ac_status" >&5
+  echo "$as_me:7249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7251: \$? = $ac_status" >&5
+  echo "$as_me:7255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7257,13 +7261,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7260: result: $cf_result" >&5
+echo "$as_me:7264: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7266: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7270: 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
@@ -7271,7 +7275,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7274 "configure"
+#line 7278 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7290,16 +7294,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7296: \$? = $ac_status" >&5
+  echo "$as_me:7300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7302: \$? = $ac_status" >&5
+  echo "$as_me:7306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7310,7 +7314,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7313: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7317: 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
 
@@ -7340,7 +7344,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7343: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7347: 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
@@ -7348,7 +7352,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7351 "configure"
+#line 7355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7367,16 +7371,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7373: \$? = $ac_status" >&5
+  echo "$as_me:7377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7379: \$? = $ac_status" >&5
+  echo "$as_me:7383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7387,7 +7391,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7390: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7394: 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
 
@@ -7411,7 +7415,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7414: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7418: 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
@@ -7419,7 +7423,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7422 "configure"
+#line 7426 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7438,16 +7442,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7444: \$? = $ac_status" >&5
+  echo "$as_me:7448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7450: \$? = $ac_status" >&5
+  echo "$as_me:7454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7458,7 +7462,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7461: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7465: 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
 
@@ -7516,7 +7520,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7545,7 +7549,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7576,7 +7580,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7611,7 +7615,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7655,13 +7659,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7658: checking for tgoto" >&5
+		echo "$as_me:7662: 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 7664 "configure"
+#line 7668 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7692,16 +7696,16 @@ main (void)
 }
 _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_func_tgoto=yes
 else
@@ -7711,7 +7715,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7714: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7718: 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
@@ -7720,7 +7724,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7723: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7727: 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
@@ -7728,7 +7732,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7731 "configure"
+#line 7735 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7747,16 +7751,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7753: \$? = $ac_status" >&5
+  echo "$as_me:7757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7759: \$? = $ac_status" >&5
+  echo "$as_me:7763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7767,7 +7771,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7770: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7774: 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
 
@@ -7790,10 +7794,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7793: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7797: 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 7796 "configure"
+#line 7800 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7805,16 +7809,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7811: \$? = $ac_status" >&5
+  echo "$as_me:7815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7817: \$? = $ac_status" >&5
+  echo "$as_me:7821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7823,16 +7827,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7826: result: $cf_result" >&5
+				echo "$as_me:7830: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7836: 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 7835 "configure"
+#line 7839 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7844,16 +7848,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7850: \$? = $ac_status" >&5
+  echo "$as_me:7854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7856: \$? = $ac_status" >&5
+  echo "$as_me:7860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7862,7 +7866,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7865 "configure"
+#line 7869 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7874,16 +7878,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7880: \$? = $ac_status" >&5
+  echo "$as_me:7884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7886: \$? = $ac_status" >&5
+  echo "$as_me:7890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7895,13 +7899,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7898: result: $cf_result" >&5
+				echo "$as_me:7902: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7904: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7908: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7913,23 +7917,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7916: checking for $ac_header" >&5
+echo "$as_me:7920: 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 7922 "configure"
+#line 7926 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7930: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7932: \$? = $ac_status" >&5
+  echo "$as_me:7936: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7948,7 +7952,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7958,7 +7962,7 @@ EOF
 fi
 done
 
-echo "$as_me:7961: checking for multibyte character support" >&5
+echo "$as_me:7965: 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
@@ -7966,7 +7970,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7969 "configure"
+#line 7973 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7983,16 +7987,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7989: \$? = $ac_status" >&5
+  echo "$as_me:7993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7995: \$? = $ac_status" >&5
+  echo "$as_me:7999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8004,12 +8008,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8012 "configure"
+#line 8016 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8022,16 +8026,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8028: \$? = $ac_status" >&5
+  echo "$as_me:8032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8034: \$? = $ac_status" >&5
+  echo "$as_me:8038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8045,7 +8049,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8048 "configure"
+#line 8052 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8058,16 +8062,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8064: \$? = $ac_status" >&5
+  echo "$as_me:8068: \$? = $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:8071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8070: \$? = $ac_status" >&5
+  echo "$as_me:8074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8084,9 +8088,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8177,7 +8181,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8185,7 +8189,7 @@ echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8188 "configure"
+#line 8192 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8198,21 +8202,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8204: \$? = $ac_status" >&5
+  echo "$as_me:8208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8210: \$? = $ac_status" >&5
+  echo "$as_me:8214: \$? = $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}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8230,7 +8234,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8305,13 +8309,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8308: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8312: 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 8314 "configure"
+#line 8318 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8324,21 +8328,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8330: \$? = $ac_status" >&5
+  echo "$as_me:8334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8336: \$? = $ac_status" >&5
+  echo "$as_me:8340: \$? = $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}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8380,7 +8384,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8383: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8387: 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
@@ -8418,7 +8422,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8421 "configure"
+#line 8425 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8430,16 +8434,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8436: \$? = $ac_status" >&5
+  echo "$as_me:8440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8442: \$? = $ac_status" >&5
+  echo "$as_me:8446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8456,7 +8460,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8492,7 +8496,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8522,13 +8526,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8525: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8529: 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:8528: result: yes" >&5
+		echo "$as_me:8532: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8531: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8535: 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
 
@@ -8661,7 +8665,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8664 "configure"
+#line 8668 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8673,37 +8677,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8679: \$? = $ac_status" >&5
+  echo "$as_me:8683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8685: \$? = $ac_status" >&5
+  echo "$as_me:8689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8691 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8701: \$? = $ac_status" >&5
+  echo "$as_me:8705: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8706: \$? = $ac_status" >&5
+  echo "$as_me:8710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8877,7 +8881,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8880 "configure"
+#line 8884 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8889,37 +8893,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8895: \$? = $ac_status" >&5
+  echo "$as_me:8899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8901: \$? = $ac_status" >&5
+  echo "$as_me:8905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8907 "configure"
+#line 8911 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8917: \$? = $ac_status" >&5
+  echo "$as_me:8921: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8922: \$? = $ac_status" >&5
+  echo "$as_me:8926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8936,7 +8940,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8939: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8943: 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"
@@ -8952,7 +8956,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8955: checking for terminfo header" >&5
+echo "$as_me:8959: 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
@@ -8970,7 +8974,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8973 "configure"
+#line 8977 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8985,16 +8989,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8991: \$? = $ac_status" >&5
+  echo "$as_me:8995: \$? = $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:8998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8997: \$? = $ac_status" >&5
+  echo "$as_me:9001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9010,7 +9014,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9013: result: $cf_cv_term_header" >&5
+echo "$as_me:9017: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9045,7 +9049,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9048: result: no" >&5
+		echo "$as_me:9052: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9061,7 +9065,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9064: checking for $ac_word" >&5
+echo "$as_me:9068: 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
@@ -9076,7 +9080,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9079: found $ac_dir/$ac_word" >&5
+echo "$as_me:9083: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9084,10 +9088,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9087: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9090: result: no" >&5
+  echo "$as_me:9094: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9100,7 +9104,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9103: checking for $ac_word" >&5
+echo "$as_me:9107: 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
@@ -9115,7 +9119,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9118: found $ac_dir/$ac_word" >&5
+echo "$as_me:9122: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9123,10 +9127,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9129: result: no" >&5
+  echo "$as_me:9133: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9283,7 +9287,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9286: checking if we have identified curses headers" >&5
+echo "$as_me:9290: 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
@@ -9295,7 +9299,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9298 "configure"
+#line 9302 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9307,16 +9311,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9313: \$? = $ac_status" >&5
+  echo "$as_me:9317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9319: \$? = $ac_status" >&5
+  echo "$as_me:9323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9327,11 +9331,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9330: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9334: 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:9334: error: No curses header-files found" >&5
+	{ { echo "$as_me:9338: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9341,23 +9345,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9344: checking for $ac_header" >&5
+echo "$as_me:9348: 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 9350 "configure"
+#line 9354 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9354: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9358: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9360: \$? = $ac_status" >&5
+  echo "$as_me:9364: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9376,7 +9380,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9383: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9432,7 +9436,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9435 "configure"
+#line 9439 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9444,16 +9448,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9450: \$? = $ac_status" >&5
+  echo "$as_me:9454: \$? = $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:9457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9456: \$? = $ac_status" >&5
+  echo "$as_me:9460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9470,7 +9474,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9489,7 +9493,7 @@ fi
 
 }
 
-echo "$as_me:9492: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9496: 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
@@ -9501,7 +9505,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9504 "configure"
+#line 9508 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9525,16 +9529,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9531: \$? = $ac_status" >&5
+  echo "$as_me:9535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9537: \$? = $ac_status" >&5
+  echo "$as_me:9541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9549,14 +9553,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9552: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9556: 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:9559: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9563: 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
@@ -9677,7 +9681,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9680 "configure"
+#line 9684 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9689,16 +9693,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9695: \$? = $ac_status" >&5
+  echo "$as_me:9699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9701: \$? = $ac_status" >&5
+  echo "$as_me:9705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9715,7 +9719,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9738,7 +9742,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9741 "configure"
+#line 9745 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9762,16 +9766,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9768: \$? = $ac_status" >&5
+  echo "$as_me:9772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9774: \$? = $ac_status" >&5
+  echo "$as_me:9778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9792,12 +9796,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9800: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9804: 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%/[^/]*$%%'`
@@ -9833,7 +9837,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9836 "configure"
+#line 9840 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9845,16 +9849,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9851: \$? = $ac_status" >&5
+  echo "$as_me:9855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9857: \$? = $ac_status" >&5
+  echo "$as_me:9861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9871,7 +9875,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9919,7 +9923,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9922: checking for terminfo header" >&5
+echo "$as_me:9926: 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
@@ -9937,7 +9941,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9940 "configure"
+#line 9944 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9952,16 +9956,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9958: \$? = $ac_status" >&5
+  echo "$as_me:9962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9964: \$? = $ac_status" >&5
+  echo "$as_me:9968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9977,7 +9981,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9980: result: $cf_cv_term_header" >&5
+echo "$as_me:9984: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10015,7 +10019,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10018: checking for ncurses version" >&5
+echo "$as_me:10022: 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
@@ -10041,10 +10045,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10044: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10048: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10047: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10054,7 +10058,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10057 "configure"
+#line 10061 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10081,15 +10085,15 @@ int main(void)
 }
 _ACEOF
 rm -f "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='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10092: \$? = $ac_status" >&5
+  echo "$as_me:10096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10103,7 +10107,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10116,7 +10120,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10119: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10123: 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
@@ -10124,7 +10128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10127 "configure"
+#line 10131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10143,16 +10147,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10149: \$? = $ac_status" >&5
+  echo "$as_me:10153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10155: \$? = $ac_status" >&5
+  echo "$as_me:10159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10163,10 +10167,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10166: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10170: 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:10169: checking for initscr in -lgpm" >&5
+  echo "$as_me:10173: 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
@@ -10174,7 +10178,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10177 "configure"
+#line 10181 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10193,16 +10197,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10199: \$? = $ac_status" >&5
+  echo "$as_me:10203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10205: \$? = $ac_status" >&5
+  echo "$as_me:10209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10213,7 +10217,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10216: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10220: 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"
@@ -10228,7 +10232,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10231: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10235: 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
@@ -10236,7 +10240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10239 "configure"
+#line 10243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10255,16 +10259,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10261: \$? = $ac_status" >&5
+  echo "$as_me:10265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10267: \$? = $ac_status" >&5
+  echo "$as_me:10271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10275,7 +10279,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10278: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10282: 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"
@@ -10324,13 +10328,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10327: checking for initscr" >&5
+	echo "$as_me:10331: 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 10333 "configure"
+#line 10337 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10361,16 +10365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10367: \$? = $ac_status" >&5
+  echo "$as_me:10371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10373: \$? = $ac_status" >&5
+  echo "$as_me:10377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10380,18 +10384,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10383: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10387: 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:10390: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10394: 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 10394 "configure"
+#line 10398 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10403,25 +10407,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10409: \$? = $ac_status" >&5
+  echo "$as_me:10413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10415: \$? = $ac_status" >&5
+  echo "$as_me:10419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10417: result: yes" >&5
+  echo "$as_me:10421: 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:10424: result: no" >&5
+echo "$as_me:10428: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10489,11 +10493,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10492: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10496: 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 10496 "configure"
+#line 10500 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10505,25 +10509,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10511: \$? = $ac_status" >&5
+  echo "$as_me:10515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10517: \$? = $ac_status" >&5
+  echo "$as_me:10521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10519: result: yes" >&5
+  echo "$as_me:10523: 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:10526: result: no" >&5
+echo "$as_me:10530: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10538,7 +10542,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10546,7 +10550,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10549: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10553: 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
@@ -10556,7 +10560,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10559 "configure"
+#line 10563 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10568,23 +10572,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10574: \$? = $ac_status" >&5
+  echo "$as_me:10578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10580: \$? = $ac_status" >&5
+  echo "$as_me:10584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10582: result: yes" >&5
+  echo "$as_me:10586: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10587: result: no" >&5
+echo "$as_me:10591: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10609,13 +10613,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10612: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10616: 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:10615: result: yes" >&5
+		echo "$as_me:10619: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10618: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10622: 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
 
@@ -10748,7 +10752,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10751 "configure"
+#line 10755 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10760,37 +10764,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10766: \$? = $ac_status" >&5
+  echo "$as_me:10770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10772: \$? = $ac_status" >&5
+  echo "$as_me:10776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10778 "configure"
+#line 10782 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10788: \$? = $ac_status" >&5
+  echo "$as_me:10792: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10793: \$? = $ac_status" >&5
+  echo "$as_me:10797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10964,7 +10968,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10967 "configure"
+#line 10971 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10976,37 +10980,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10982: \$? = $ac_status" >&5
+  echo "$as_me:10986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10988: \$? = $ac_status" >&5
+  echo "$as_me:10992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10994 "configure"
+#line 10998 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11004: \$? = $ac_status" >&5
+  echo "$as_me:11008: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11009: \$? = $ac_status" >&5
+  echo "$as_me:11013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11023,7 +11027,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11026: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11030: 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"
@@ -11039,7 +11043,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11042: checking for terminfo header" >&5
+echo "$as_me:11046: 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
@@ -11057,7 +11061,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11060 "configure"
+#line 11064 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11072,16 +11076,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  echo "$as_me:11082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11084: \$? = $ac_status" >&5
+  echo "$as_me:11088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11097,7 +11101,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11100: result: $cf_cv_term_header" >&5
+echo "$as_me:11104: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11132,7 +11136,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11135: result: no" >&5
+		echo "$as_me:11139: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11148,7 +11152,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11151: checking for $ac_word" >&5
+echo "$as_me:11155: 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
@@ -11163,7 +11167,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11166: found $ac_dir/$ac_word" >&5
+echo "$as_me:11170: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11171,10 +11175,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11174: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11177: result: no" >&5
+  echo "$as_me:11181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11187,7 +11191,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11190: checking for $ac_word" >&5
+echo "$as_me:11194: 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
@@ -11202,7 +11206,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11205: found $ac_dir/$ac_word" >&5
+echo "$as_me:11209: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11210,10 +11214,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11216: result: no" >&5
+  echo "$as_me:11220: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11370,7 +11374,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11373: checking if we have identified curses headers" >&5
+echo "$as_me:11377: 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
@@ -11382,7 +11386,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11385 "configure"
+#line 11389 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11394,16 +11398,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11400: \$? = $ac_status" >&5
+  echo "$as_me:11404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11406: \$? = $ac_status" >&5
+  echo "$as_me:11410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11414,11 +11418,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11417: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11421: 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:11421: error: No curses header-files found" >&5
+	{ { echo "$as_me:11425: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11428,23 +11432,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11431: checking for $ac_header" >&5
+echo "$as_me:11435: 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 11437 "configure"
+#line 11441 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11441: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11447: \$? = $ac_status" >&5
+  echo "$as_me:11451: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11463,7 +11467,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11519,7 +11523,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11522 "configure"
+#line 11526 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11531,16 +11535,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11537: \$? = $ac_status" >&5
+  echo "$as_me:11541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11543: \$? = $ac_status" >&5
+  echo "$as_me:11547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11557,7 +11561,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11576,7 +11580,7 @@ fi
 
 }
 
-echo "$as_me:11579: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11583: 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
@@ -11588,7 +11592,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11591 "configure"
+#line 11595 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11612,16 +11616,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11618: \$? = $ac_status" >&5
+  echo "$as_me:11622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11624: \$? = $ac_status" >&5
+  echo "$as_me:11628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11636,14 +11640,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11639: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11643: 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:11646: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11650: 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
@@ -11764,7 +11768,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11767 "configure"
+#line 11771 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11776,16 +11780,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11782: \$? = $ac_status" >&5
+  echo "$as_me:11786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11788: \$? = $ac_status" >&5
+  echo "$as_me:11792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11802,7 +11806,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11825,7 +11829,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11828 "configure"
+#line 11832 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11849,16 +11853,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11855: \$? = $ac_status" >&5
+  echo "$as_me:11859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11861: \$? = $ac_status" >&5
+  echo "$as_me:11865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11879,12 +11883,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11887: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11891: 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%/[^/]*$%%'`
@@ -11920,7 +11924,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11923 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11932,16 +11936,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11938: \$? = $ac_status" >&5
+  echo "$as_me:11942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11944: \$? = $ac_status" >&5
+  echo "$as_me:11948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11958,7 +11962,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12006,7 +12010,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12009: checking for terminfo header" >&5
+echo "$as_me:12013: 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
@@ -12024,7 +12028,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12027 "configure"
+#line 12031 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12039,16 +12043,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12045: \$? = $ac_status" >&5
+  echo "$as_me:12049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12051: \$? = $ac_status" >&5
+  echo "$as_me:12055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12064,7 +12068,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12067: result: $cf_cv_term_header" >&5
+echo "$as_me:12071: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12102,7 +12106,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12105: checking for ncurses version" >&5
+echo "$as_me:12109: 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
@@ -12128,10 +12132,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12131: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12135: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12134: \$? = $ac_status" >&5
+  echo "$as_me:12138: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12141,7 +12145,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12144 "configure"
+#line 12148 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12168,15 +12172,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12174: \$? = $ac_status" >&5
+  echo "$as_me:12178: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12179: \$? = $ac_status" >&5
+  echo "$as_me:12183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12190,7 +12194,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12203,7 +12207,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12206: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12210: 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
@@ -12211,7 +12215,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12214 "configure"
+#line 12218 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12230,16 +12234,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12236: \$? = $ac_status" >&5
+  echo "$as_me:12240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12242: \$? = $ac_status" >&5
+  echo "$as_me:12246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12250,10 +12254,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12253: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12257: 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:12256: checking for initscr in -lgpm" >&5
+  echo "$as_me:12260: 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
@@ -12261,7 +12265,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12264 "configure"
+#line 12268 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12280,16 +12284,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12286: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12292: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12300,7 +12304,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12303: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12307: 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"
@@ -12315,7 +12319,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12318: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12322: 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
@@ -12323,7 +12327,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12326 "configure"
+#line 12330 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12342,16 +12346,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12348: \$? = $ac_status" >&5
+  echo "$as_me:12352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12354: \$? = $ac_status" >&5
+  echo "$as_me:12358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12362,7 +12366,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12365: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12369: 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"
@@ -12411,13 +12415,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12414: checking for initscr" >&5
+	echo "$as_me:12418: 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 12420 "configure"
+#line 12424 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12448,16 +12452,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12454: \$? = $ac_status" >&5
+  echo "$as_me:12458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12460: \$? = $ac_status" >&5
+  echo "$as_me:12464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12467,18 +12471,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12470: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12474: 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:12477: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12481: 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 12481 "configure"
+#line 12485 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12490,25 +12494,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12496: \$? = $ac_status" >&5
+  echo "$as_me:12500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12502: \$? = $ac_status" >&5
+  echo "$as_me:12506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12504: result: yes" >&5
+  echo "$as_me:12508: 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:12511: result: no" >&5
+echo "$as_me:12515: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12576,11 +12580,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12579: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12583: 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 12583 "configure"
+#line 12587 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12592,25 +12596,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12598: \$? = $ac_status" >&5
+  echo "$as_me:12602: \$? = $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:12605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12604: \$? = $ac_status" >&5
+  echo "$as_me:12608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12606: result: yes" >&5
+  echo "$as_me:12610: 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:12613: result: no" >&5
+echo "$as_me:12617: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12625,7 +12629,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12633,7 +12637,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12640: 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
@@ -12643,7 +12647,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12646 "configure"
+#line 12650 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12655,23 +12659,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _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
-  echo "$as_me:12669: result: yes" >&5
+  echo "$as_me:12673: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12674: result: no" >&5
+echo "$as_me:12678: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12691,7 +12695,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12694: checking for X" >&5
+	echo "$as_me:12698: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12795,17 +12799,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12798 "configure"
+#line 12802 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12806: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:12812: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12838,7 +12842,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12841 "configure"
+#line 12845 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12850,16 +12854,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12856: \$? = $ac_status" >&5
+  echo "$as_me:12860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12862: \$? = $ac_status" >&5
+  echo "$as_me:12866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12897,7 +12901,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12900: result: $have_x" >&5
+  echo "$as_me:12904: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12907,7 +12911,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12910: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12914: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -12934,11 +12938,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:12937: checking whether -R must be followed by a space" >&5
+      echo "$as_me:12941: 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 12941 "configure"
+#line 12945 "configure"
 #include "confdefs.h"
 
 int
@@ -12950,16 +12954,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12956: \$? = $ac_status" >&5
+  echo "$as_me:12960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12962: \$? = $ac_status" >&5
+  echo "$as_me:12966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -12969,13 +12973,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:12972: result: no" >&5
+	echo "$as_me:12976: 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 12978 "configure"
+#line 12982 "configure"
 #include "confdefs.h"
 
 int
@@ -12987,16 +12991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12993: \$? = $ac_status" >&5
+  echo "$as_me:12997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12999: \$? = $ac_status" >&5
+  echo "$as_me:13003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13006,11 +13010,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13009: result: yes" >&5
+	  echo "$as_me:13013: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13013: result: neither works" >&5
+	  echo "$as_me:13017: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13030,7 +13034,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13033 "configure"
+#line 13037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13049,22 +13053,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13055: \$? = $ac_status" >&5
+  echo "$as_me:13059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13061: \$? = $ac_status" >&5
+  echo "$as_me:13065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13067: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13071: 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
@@ -13072,7 +13076,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13075 "configure"
+#line 13079 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13091,16 +13095,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13097: \$? = $ac_status" >&5
+  echo "$as_me:13101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13103: \$? = $ac_status" >&5
+  echo "$as_me:13107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13111,14 +13115,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13114: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13118: 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:13121: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13125: 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
@@ -13126,7 +13130,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13129 "configure"
+#line 13133 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13145,16 +13149,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13151: \$? = $ac_status" >&5
+  echo "$as_me:13155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13157: \$? = $ac_status" >&5
+  echo "$as_me:13161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13165,7 +13169,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13168: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13172: 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"
@@ -13184,13 +13188,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13187: checking for gethostbyname" >&5
+    echo "$as_me:13191: 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 13193 "configure"
+#line 13197 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13221,16 +13225,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13227: \$? = $ac_status" >&5
+  echo "$as_me:13231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13233: \$? = $ac_status" >&5
+  echo "$as_me:13237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13240,11 +13244,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13243: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13247: 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:13247: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13251: 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
@@ -13252,7 +13256,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13255 "configure"
+#line 13259 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13271,16 +13275,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13277: \$? = $ac_status" >&5
+  echo "$as_me:13281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13283: \$? = $ac_status" >&5
+  echo "$as_me:13287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13291,14 +13295,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13294: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13298: 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:13301: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13305: 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
@@ -13306,7 +13310,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13309 "configure"
+#line 13313 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13325,16 +13329,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13331: \$? = $ac_status" >&5
+  echo "$as_me:13335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13337: \$? = $ac_status" >&5
+  echo "$as_me:13341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13345,7 +13349,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13348: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13352: 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"
@@ -13361,13 +13365,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13364: checking for connect" >&5
+    echo "$as_me:13368: 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 13370 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13398,16 +13402,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13404: \$? = $ac_status" >&5
+  echo "$as_me:13408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13410: \$? = $ac_status" >&5
+  echo "$as_me:13414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13417,11 +13421,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13420: result: $ac_cv_func_connect" >&5
+echo "$as_me:13424: 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:13424: checking for connect in -lsocket" >&5
+      echo "$as_me:13428: 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
@@ -13429,7 +13433,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13432 "configure"
+#line 13436 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13448,16 +13452,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13454: \$? = $ac_status" >&5
+  echo "$as_me:13458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13460: \$? = $ac_status" >&5
+  echo "$as_me:13464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13468,7 +13472,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13471: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13475: 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"
@@ -13477,13 +13481,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13480: checking for remove" >&5
+    echo "$as_me:13484: 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 13486 "configure"
+#line 13490 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13514,16 +13518,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13520: \$? = $ac_status" >&5
+  echo "$as_me:13524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13526: \$? = $ac_status" >&5
+  echo "$as_me:13530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13533,11 +13537,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13536: result: $ac_cv_func_remove" >&5
+echo "$as_me:13540: 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:13540: checking for remove in -lposix" >&5
+      echo "$as_me:13544: 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
@@ -13545,7 +13549,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13548 "configure"
+#line 13552 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13564,16 +13568,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13570: \$? = $ac_status" >&5
+  echo "$as_me:13574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13576: \$? = $ac_status" >&5
+  echo "$as_me:13580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13584,7 +13588,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13587: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13591: 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"
@@ -13593,13 +13597,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13596: checking for shmat" >&5
+    echo "$as_me:13600: 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 13602 "configure"
+#line 13606 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13630,16 +13634,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13636: \$? = $ac_status" >&5
+  echo "$as_me:13640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13642: \$? = $ac_status" >&5
+  echo "$as_me:13646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13649,11 +13653,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13652: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13656: 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:13656: checking for shmat in -lipc" >&5
+      echo "$as_me:13660: 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
@@ -13661,7 +13665,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13664 "configure"
+#line 13668 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13680,16 +13684,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13686: \$? = $ac_status" >&5
+  echo "$as_me:13690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13692: \$? = $ac_status" >&5
+  echo "$as_me:13696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13700,7 +13704,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13703: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13707: 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"
@@ -13718,7 +13722,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13721: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13725: 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
@@ -13726,7 +13730,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13729 "configure"
+#line 13733 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13745,16 +13749,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13751: \$? = $ac_status" >&5
+  echo "$as_me:13755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13757: \$? = $ac_status" >&5
+  echo "$as_me:13761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13765,7 +13769,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13768: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13772: 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"
@@ -13777,7 +13781,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13780: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13784: 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=
 
@@ -13788,14 +13792,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13791: result: yes" >&5
+	echo "$as_me:13795: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13794: result: no" >&5
+	echo "$as_me:13798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13798: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13802: 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=
 
@@ -13806,14 +13810,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13809: result: yes" >&5
+	echo "$as_me:13813: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13812: result: no" >&5
+	echo "$as_me:13816: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13816: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13820: 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=
 
@@ -13824,14 +13828,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13827: result: yes" >&5
+	echo "$as_me:13831: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13830: result: no" >&5
+	echo "$as_me:13834: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13834: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13838: 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=
 
@@ -13842,10 +13846,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13845: result: yes" >&5
+	echo "$as_me:13849: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13848: result: no" >&5
+	echo "$as_me:13852: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13865,17 +13869,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13868: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13872: 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}:13874: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13878: 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}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14006,20 +14010,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14009: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14013: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14015: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14019: 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 14022 "configure"
+#line 14026 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14037,16 +14041,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14043: \$? = $ac_status" >&5
+  echo "$as_me:14047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14049: \$? = $ac_status" >&5
+  echo "$as_me:14053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14056,7 +14060,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14068,7 +14072,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14076,17 +14080,17 @@ echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14079: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14083: 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}:14085: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14089: 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}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14206,12 +14210,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14209: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14213: 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}:14214: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14218: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14219,12 +14223,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14222: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14226: 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}:14227: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14231: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14235,7 +14239,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14238: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14242: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14260,17 +14264,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14263: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14267: 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}:14269: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14273: 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}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14391,7 +14395,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14394: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14398: 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
@@ -14399,7 +14403,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14402 "configure"
+#line 14406 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14418,16 +14422,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14424: \$? = $ac_status" >&5
+  echo "$as_me:14428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14430: \$? = $ac_status" >&5
+  echo "$as_me:14434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14438,7 +14442,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14441: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14445: 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
 
@@ -14474,17 +14478,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14477: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14481: 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}:14483: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14487: 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}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14604,24 +14608,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14607: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14611: 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}:14614: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14618: 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}:14620: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14624: 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}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14741,24 +14745,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14744: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14748: 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}:14751: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14755: 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}:14757: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14761: 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}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14878,24 +14882,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14881: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14885: 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}:14888: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14892: 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}:14894: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14898: 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}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15015,7 +15019,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15018: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15022: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15028,17 +15032,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15031: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15035: 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}:15037: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15041: 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}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15159,14 +15163,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15162: checking for usable X dependency" >&5
+echo "$as_me:15166: 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 15169 "configure"
+#line 15173 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15186,16 +15190,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15192: \$? = $ac_status" >&5
+  echo "$as_me:15196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15198: \$? = $ac_status" >&5
+  echo "$as_me:15202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15205,30 +15209,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15208: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15212: 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}:15214: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15218: 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}:15221: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15225: 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}:15227: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15231: 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}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15351,12 +15355,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15354: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15358: 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}:15359: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15363: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15364,14 +15368,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15367: checking for usable X Toolkit package" >&5
+echo "$as_me:15371: 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 15374 "configure"
+#line 15378 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15387,16 +15391,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15393: \$? = $ac_status" >&5
+  echo "$as_me:15397: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15399: \$? = $ac_status" >&5
+  echo "$as_me:15403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15406,7 +15410,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15420,22 +15424,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15423: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15427: 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}:15428: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15432: 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}:15434: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15438: 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}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15554,17 +15558,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15557: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15561: 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}:15563: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15567: 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}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15693,12 +15697,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15696: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15700: 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}:15701: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15705: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15718,7 +15722,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15803,7 +15807,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15813,7 +15817,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15823,7 +15827,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15830: 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"
@@ -15832,7 +15836,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15835 "configure"
+#line 15839 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15844,16 +15848,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15850: \$? = $ac_status" >&5
+  echo "$as_me:15854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:15860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15861,12 +15865,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15864: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15868: 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}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15874,13 +15878,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15877: checking for XOpenDisplay" >&5
+	echo "$as_me:15881: 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 15883 "configure"
+#line 15887 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15911,16 +15915,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15917: \$? = $ac_status" >&5
+  echo "$as_me:15921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15923: \$? = $ac_status" >&5
+  echo "$as_me:15927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15930,13 +15934,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15933: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15937: 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:15939: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:15943: 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
@@ -15944,7 +15948,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15947 "configure"
+#line 15951 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15963,16 +15967,16 @@ XOpenDisplay ();
 }
 _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_X11_XOpenDisplay=yes
 else
@@ -15983,7 +15987,7 @@ fi
 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_X11_XOpenDisplay" >&5
+echo "$as_me:15990: 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
 
@@ -16007,13 +16011,13 @@ fi
 
 fi
 
-	echo "$as_me:16010: checking for XtAppInitialize" >&5
+	echo "$as_me:16014: 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 16016 "configure"
+#line 16020 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16044,16 +16048,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16050: \$? = $ac_status" >&5
+  echo "$as_me:16054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16056: \$? = $ac_status" >&5
+  echo "$as_me:16060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16063,13 +16067,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16066: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16070: 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:16072: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16076: 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
@@ -16077,7 +16081,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16080 "configure"
+#line 16084 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16096,16 +16100,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16102: \$? = $ac_status" >&5
+  echo "$as_me:16106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16108: \$? = $ac_status" >&5
+  echo "$as_me:16112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16116,7 +16120,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16119: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16123: 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
 
@@ -16133,7 +16137,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16136: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16140: 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
@@ -16174,14 +16178,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16177: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16181: 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:16180: checking for $cf_test" >&5
+			echo "$as_me:16184: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16184 "configure"
+#line 16188 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16195,16 +16199,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16201: \$? = $ac_status" >&5
+  echo "$as_me:16205: \$? = $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:16208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16207: \$? = $ac_status" >&5
+  echo "$as_me:16211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16213,7 +16217,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16216: result: $cf_result" >&5
+		echo "$as_me:16220: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16229,7 +16233,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16236: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16294,10 +16298,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16301: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16300 "configure"
+#line 16304 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16314,16 +16318,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16320: \$? = $ac_status" >&5
+  echo "$as_me:16324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16326: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16332,7 +16336,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16335: result: $cf_result" >&5
+		echo "$as_me:16339: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16349,7 +16353,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16352: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16356: 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
@@ -16383,7 +16387,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16386: checking for $ac_word" >&5
+echo "$as_me:16390: 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
@@ -16398,7 +16402,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16401: found $ac_dir/$ac_word" >&5
+echo "$as_me:16405: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16406,10 +16410,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16409: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16412: result: no" >&5
+  echo "$as_me:16416: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16422,7 +16426,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16425: checking for $ac_word" >&5
+echo "$as_me:16429: 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
@@ -16437,7 +16441,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16440: found $ac_dir/$ac_word" >&5
+echo "$as_me:16444: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16445,10 +16449,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16451: result: no" >&5
+  echo "$as_me:16455: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16583,7 +16587,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16668,7 +16672,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16678,7 +16682,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16688,7 +16692,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16691: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16695: 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"
@@ -16697,7 +16701,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16700 "configure"
+#line 16704 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16709,16 +16713,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16715: \$? = $ac_status" >&5
+  echo "$as_me:16719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16721: \$? = $ac_status" >&5
+  echo "$as_me:16725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16726,12 +16730,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16729: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16733: 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}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16739,7 +16743,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16742: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16746: 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
@@ -16747,7 +16751,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16750 "configure"
+#line 16754 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16766,16 +16770,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16772: \$? = $ac_status" >&5
+  echo "$as_me:16776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16778: \$? = $ac_status" >&5
+  echo "$as_me:16782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16786,7 +16790,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16789: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16793: 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
 
@@ -16808,7 +16812,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16811: checking for XCurses library" >&5
+echo "$as_me:16815: 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
@@ -16831,7 +16835,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16834 "configure"
+#line 16838 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16846,16 +16850,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16852: \$? = $ac_status" >&5
+  echo "$as_me:16856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16858: \$? = $ac_status" >&5
+  echo "$as_me:16862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16866,7 +16870,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16881,23 +16885,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16884: checking for xcurses.h" >&5
+	echo "$as_me:16888: 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 16890 "configure"
+#line 16894 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16894: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16898: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16900: \$? = $ac_status" >&5
+  echo "$as_me:16904: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16916,7 +16920,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16919: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16923: 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
 
@@ -16927,71 +16931,78 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:16930: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:16934: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-: ${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:16945: 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 "$as_me:16947: checking for _nc_init_pthreads" >&5
+echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$cf_nculib_root  $LIBS"
-cat >"conftest.$ac_ext" <<_ACEOF
+  cat >"conftest.$ac_ext" <<_ACEOF
 #line 16953 "configure"
 #include "confdefs.h"
+#define _nc_init_pthreads autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef _nc_init_pthreads
 
-/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char _nc_init_pthreads (void);
+
 int
 main (void)
 {
-_nc_init_pthreads ();
+
+/* 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__nc_init_pthreads) || defined (__stub____nc_init_pthreads)
+#error found stub for _nc_init_pthreads
+#endif
+
+	return _nc_init_pthreads ();
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16975: \$? = $ac_status" >&5
+  echo "$as_me:16987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16981: \$? = $ac_status" >&5
+  echo "$as_me:16993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  eval "$as_ac_Lib=yes"
+  ac_cv_func__nc_init_pthreads=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-eval "$as_ac_Lib=no"
+ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16992: 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
+echo "$as_me:17003: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
 else
   cf_cv_ncurses_pthreads=no
@@ -17024,7 +17035,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17027: checking for X11 rgb file" >&5
+echo "$as_me:17038: 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.
@@ -17088,7 +17099,7 @@ case ".$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17096,7 +17107,7 @@ esac
 
 fi
 
-echo "$as_me:17099: result: $RGB_PATH" >&5
+echo "$as_me:17110: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17137,7 +17148,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17140: checking for desired basename for form library" >&5
+echo "$as_me:17151: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17157,10 +17168,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17160: result: $FORM_NAME" >&5
+echo "$as_me:17171: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17163: checking for desired basename for menu library" >&5
+echo "$as_me:17174: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17180,10 +17191,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17183: result: $MENU_NAME" >&5
+echo "$as_me:17194: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17186: checking for desired basename for panel library" >&5
+echo "$as_me:17197: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17203,10 +17214,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17206: result: $PANEL_NAME" >&5
+echo "$as_me:17217: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17209: checking if you want to check for panel functions" >&5
+echo "$as_me:17220: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17223,7 +17234,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17226: result: $cf_enable_panel" >&5
+echo "$as_me:17237: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17234,13 +17245,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17248: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17240: result: yes" >&5
+		echo "$as_me:17251: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17254: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17390,7 +17401,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17393 "configure"
+#line 17404 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17402,37 +17413,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17408: \$? = $ac_status" >&5
+  echo "$as_me:17419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17414: \$? = $ac_status" >&5
+  echo "$as_me:17425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17420 "configure"
+#line 17431 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17430: \$? = $ac_status" >&5
+  echo "$as_me:17441: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17435: \$? = $ac_status" >&5
+  echo "$as_me:17446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17449,7 +17460,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17452: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17463: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17470,7 +17481,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17484: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17478,7 +17489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17481 "configure"
+#line 17492 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17497,16 +17508,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17503: \$? = $ac_status" >&5
+  echo "$as_me:17514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17509: \$? = $ac_status" >&5
+  echo "$as_me:17520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17517,7 +17528,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17520: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17531: 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
 
@@ -17550,7 +17561,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17553: checking if you want to check for menu functions" >&5
+echo "$as_me:17564: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17567,7 +17578,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17570: result: $cf_enable_menu" >&5
+echo "$as_me:17581: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17576,14 +17587,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17579: checking for NetBSD menu.h" >&5
+echo "$as_me:17590: 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 17586 "configure"
+#line 17597 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17601,16 +17612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17607: \$? = $ac_status" >&5
+  echo "$as_me:17618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17613: \$? = $ac_status" >&5
+  echo "$as_me:17624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17622,7 +17633,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17639,13 +17650,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17653: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17645: result: yes" >&5
+		echo "$as_me:17656: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17659: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17795,7 +17806,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17798 "configure"
+#line 17809 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17807,37 +17818,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17813: \$? = $ac_status" >&5
+  echo "$as_me:17824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17819: \$? = $ac_status" >&5
+  echo "$as_me:17830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17825 "configure"
+#line 17836 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17835: \$? = $ac_status" >&5
+  echo "$as_me:17846: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17840: \$? = $ac_status" >&5
+  echo "$as_me:17851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17854,7 +17865,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17857: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17868: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17875,7 +17886,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17889: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17883,7 +17894,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17886 "configure"
+#line 17897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17902,16 +17913,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17908: \$? = $ac_status" >&5
+  echo "$as_me:17919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17914: \$? = $ac_status" >&5
+  echo "$as_me:17925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17922,7 +17933,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17936: 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
 
@@ -17955,7 +17966,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:17958: checking if you want to check for form functions" >&5
+echo "$as_me:17969: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -17972,7 +17983,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:17975: result: $cf_enable_form" >&5
+echo "$as_me:17986: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -17981,14 +17992,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17984: checking for NetBSD form.h" >&5
+echo "$as_me:17995: 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 17991 "configure"
+#line 18002 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18007,16 +18018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18013: \$? = $ac_status" >&5
+  echo "$as_me:18024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18019: \$? = $ac_status" >&5
+  echo "$as_me:18030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18028,7 +18039,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18045,13 +18056,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18059: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18051: result: yes" >&5
+		echo "$as_me:18062: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18065: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18201,7 +18212,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18204 "configure"
+#line 18215 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18213,37 +18224,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18219: \$? = $ac_status" >&5
+  echo "$as_me:18230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18225: \$? = $ac_status" >&5
+  echo "$as_me:18236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18231 "configure"
+#line 18242 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18241: \$? = $ac_status" >&5
+  echo "$as_me:18252: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18246: \$? = $ac_status" >&5
+  echo "$as_me:18257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18260,7 +18271,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18263: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18274: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18281,7 +18292,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18295: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18289,7 +18300,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18292 "configure"
+#line 18303 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18308,16 +18319,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18314: \$? = $ac_status" >&5
+  echo "$as_me:18325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18320: \$? = $ac_status" >&5
+  echo "$as_me:18331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18328,7 +18339,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18331: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18342: 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
 
@@ -18366,23 +18377,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18369: checking for $ac_header" >&5
+echo "$as_me:18380: 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 18375 "configure"
+#line 18386 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18379: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18385: \$? = $ac_status" >&5
+  echo "$as_me:18396: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18401,7 +18412,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18415: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18411,13 +18422,13 @@ EOF
 fi
 done
 
-echo "$as_me:18414: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18425: 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 18420 "configure"
+#line 18431 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18433,16 +18444,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18439: \$? = $ac_status" >&5
+  echo "$as_me:18450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18445: \$? = $ac_status" >&5
+  echo "$as_me:18456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18452,7 +18463,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18455: result: $ac_cv_header_time" >&5
+echo "$as_me:18466: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18475,23 +18486,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18478: checking for $ac_header" >&5
+echo "$as_me:18489: 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 18484 "configure"
+#line 18495 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18488: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18494: \$? = $ac_status" >&5
+  echo "$as_me:18505: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18510,7 +18521,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18523,23 +18534,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18526: checking for $ac_header" >&5
+echo "$as_me:18537: 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 18532 "configure"
+#line 18543 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18542: \$? = $ac_status" >&5
+  echo "$as_me:18553: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18558,7 +18569,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18568,7 +18579,7 @@ EOF
 fi
 done
 
-echo "$as_me:18571: checking for header declaring getopt variables" >&5
+echo "$as_me:18582: 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
@@ -18578,7 +18589,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18581 "configure"
+#line 18592 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18591,16 +18602,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18597: \$? = $ac_status" >&5
+  echo "$as_me:18608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18603: \$? = $ac_status" >&5
+  echo "$as_me:18614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18612,7 +18623,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18615: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18630,13 +18641,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18633: checking for clock_gettime" >&5
+echo "$as_me:18644: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18639 "configure"
+#line 18650 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18667,16 +18678,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18673: \$? = $ac_status" >&5
+  echo "$as_me:18684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18679: \$? = $ac_status" >&5
+  echo "$as_me:18690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18686,12 +18697,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18689: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18700: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18694: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18705: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18699,7 +18710,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18702 "configure"
+#line 18713 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18718,16 +18729,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18724: \$? = $ac_status" >&5
+  echo "$as_me:18735: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18730: \$? = $ac_status" >&5
+  echo "$as_me:18741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18738,7 +18749,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18741: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18752: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18750,14 +18761,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18753: checking if clock_gettime links" >&5
+echo "$as_me:18764: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18760 "configure"
+#line 18771 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18775,16 +18786,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18781: \$? = $ac_status" >&5
+  echo "$as_me:18792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18787: \$? = $ac_status" >&5
+  echo "$as_me:18798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18795,7 +18806,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18798: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18809,13 +18820,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18812: checking for gettimeofday" >&5
+echo "$as_me:18823: 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 18818 "configure"
+#line 18829 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18846,16 +18857,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18852: \$? = $ac_status" >&5
+  echo "$as_me:18863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18858: \$? = $ac_status" >&5
+  echo "$as_me:18869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18865,7 +18876,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18868: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18875,7 +18886,7 @@ EOF
 
 else
 
-echo "$as_me:18878: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18889: 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
@@ -18883,7 +18894,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18886 "configure"
+#line 18897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18902,16 +18913,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18908: \$? = $ac_status" >&5
+  echo "$as_me:18919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18914: \$? = $ac_status" >&5
+  echo "$as_me:18925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -18922,7 +18933,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18925: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18936: 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
 
@@ -18960,13 +18971,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18963: checking for $ac_func" >&5
+echo "$as_me:18974: 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 18969 "configure"
+#line 18980 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18997,16 +19008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19003: \$? = $ac_status" >&5
+  echo "$as_me:19014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19009: \$? = $ac_status" >&5
+  echo "$as_me:19020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19016,7 +19027,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19019: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19030: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19027,14 +19038,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19030: checking if we can use termcap.h" >&5
+echo "$as_me:19041: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19037 "configure"
+#line 19048 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19055,16 +19066,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19061: \$? = $ac_status" >&5
+  echo "$as_me:19072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19067: \$? = $ac_status" >&5
+  echo "$as_me:19078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19074,7 +19085,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19077: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19088: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19084,14 +19095,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19087: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19098: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19094 "configure"
+#line 19105 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19112,16 +19123,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19118: \$? = $ac_status" >&5
+  echo "$as_me:19129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19124: \$? = $ac_status" >&5
+  echo "$as_me:19135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19131,7 +19142,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19134: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19145: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19141,7 +19152,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19144: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19155: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19160,13 +19171,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19163: checking for $ac_func" >&5
+echo "$as_me:19174: 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 19169 "configure"
+#line 19180 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19197,16 +19208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19203: \$? = $ac_status" >&5
+  echo "$as_me:19214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19209: \$? = $ac_status" >&5
+  echo "$as_me:19220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19216,7 +19227,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19219: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19228,7 +19239,7 @@ done
 
 fi
 
-echo "$as_me:19231: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19242: 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
@@ -19236,7 +19247,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19239 "configure"
+#line 19250 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19269,16 +19280,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19275: \$? = $ac_status" >&5
+  echo "$as_me:19286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19281: \$? = $ac_status" >&5
+  echo "$as_me:19292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19288,7 +19299,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19291 "configure"
+#line 19302 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19314,16 +19325,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19320: \$? = $ac_status" >&5
+  echo "$as_me:19331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19326: \$? = $ac_status" >&5
+  echo "$as_me:19337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19337,7 +19348,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19340: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19349,7 +19360,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19352: checking for term.h" >&5
+echo "$as_me:19363: 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
@@ -19370,7 +19381,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19373 "configure"
+#line 19384 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19384,16 +19395,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19390: \$? = $ac_status" >&5
+  echo "$as_me:19401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19396: \$? = $ac_status" >&5
+  echo "$as_me:19407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19412,7 +19423,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19415 "configure"
+#line 19426 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19430,16 +19441,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19436: \$? = $ac_status" >&5
+  echo "$as_me:19447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19442: \$? = $ac_status" >&5
+  echo "$as_me:19453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19454,7 +19465,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19457: result: $cf_cv_term_header" >&5
+echo "$as_me:19468: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19481,7 +19492,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19484: checking for unctrl.h" >&5
+echo "$as_me:19495: 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
@@ -19502,7 +19513,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19505 "configure"
+#line 19516 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19516,16 +19527,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19522: \$? = $ac_status" >&5
+  echo "$as_me:19533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19528: \$? = $ac_status" >&5
+  echo "$as_me:19539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19538,12 +19549,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19541: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19546: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19641,10 +19652,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19644: checking for ${cf_func}" >&5
+	echo "$as_me:19655: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19647: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19653,7 +19664,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19656 "configure"
+#line 19667 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19686,16 +19697,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19692: \$? = $ac_status" >&5
+  echo "$as_me:19703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19698: \$? = $ac_status" >&5
+  echo "$as_me:19709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19711,7 +19722,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19714: result: $cf_result" >&5
+	echo "$as_me:19725: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19726,10 +19737,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19729: checking for ${cf_func}" >&5
+	echo "$as_me:19740: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19738,7 +19749,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19741 "configure"
+#line 19752 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19771,16 +19782,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19796,7 +19807,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19799: result: $cf_result" >&5
+	echo "$as_me:19810: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19820,7 +19831,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19823 "configure"
+#line 19834 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19840,21 +19851,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19846: \$? = $ac_status" >&5
+  echo "$as_me:19857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19852: \$? = $ac_status" >&5
+  echo "$as_me:19863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19857: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19874,14 +19885,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19877: checking for ncurses extended functions" >&5
+echo "$as_me:19888: 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 19884 "configure"
+#line 19895 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19896,16 +19907,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19902: \$? = $ac_status" >&5
+  echo "$as_me:19913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19908: \$? = $ac_status" >&5
+  echo "$as_me:19919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19913,7 +19924,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19916 "configure"
+#line 19927 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19938,16 +19949,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19944: \$? = $ac_status" >&5
+  echo "$as_me:19955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19950: \$? = $ac_status" >&5
+  echo "$as_me:19961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19961,7 +19972,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19964: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19975: 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
@@ -19975,11 +19986,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19978: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19989: 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 19982 "configure"
+#line 19993 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19992,16 +20003,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19998: \$? = $ac_status" >&5
+  echo "$as_me:20009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20004: \$? = $ac_status" >&5
+  echo "$as_me:20015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20010,7 +20021,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20013 "configure"
+#line 20024 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20023,16 +20034,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20029: \$? = $ac_status" >&5
+  echo "$as_me:20040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20035: \$? = $ac_status" >&5
+  echo "$as_me:20046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20043,7 +20054,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20046: result: $cf_define_xpg5" >&5
+		echo "$as_me:20057: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20052,14 +20063,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20055: checking for wide-character functions" >&5
+	echo "$as_me:20066: 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 20062 "configure"
+#line 20073 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20076,16 +20087,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20082: \$? = $ac_status" >&5
+  echo "$as_me:20093: \$? = $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:20096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20088: \$? = $ac_status" >&5
+  echo "$as_me:20099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20096,7 +20107,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20099: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20117,14 +20128,14 @@ EOF
 
 fi
 
-echo "$as_me:20120: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20131: 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 20127 "configure"
+#line 20138 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20142,16 +20153,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20148: \$? = $ac_status" >&5
+  echo "$as_me:20159: \$? = $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:20162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20154: \$? = $ac_status" >&5
+  echo "$as_me:20165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20162,21 +20173,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20165: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20176: 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:20172: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20183: 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 20179 "configure"
+#line 20190 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20196,16 +20207,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20202: \$? = $ac_status" >&5
+  echo "$as_me:20213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20208: \$? = $ac_status" >&5
+  echo "$as_me:20219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20217,7 +20228,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20220: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20231: 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
@@ -20226,7 +20237,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20229: checking for openpty in -lutil" >&5
+echo "$as_me:20240: 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
@@ -20234,7 +20245,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20237 "configure"
+#line 20248 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20253,16 +20264,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20259: \$? = $ac_status" >&5
+  echo "$as_me:20270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20265: \$? = $ac_status" >&5
+  echo "$as_me:20276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20273,7 +20284,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20276: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20287: 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
@@ -20281,7 +20292,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20284: checking for openpty header" >&5
+echo "$as_me:20295: 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
@@ -20308,7 +20319,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20311 "configure"
+#line 20322 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20326,16 +20337,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20332: \$? = $ac_status" >&5
+  echo "$as_me:20343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20338: \$? = $ac_status" >&5
+  echo "$as_me:20349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20353,7 +20364,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20356: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20387,7 +20398,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20390: checking for function curses_version" >&5
+echo "$as_me:20401: 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
@@ -20397,7 +20408,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20400 "configure"
+#line 20411 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20413,15 +20424,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20419: \$? = $ac_status" >&5
+  echo "$as_me:20430: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20424: \$? = $ac_status" >&5
+  echo "$as_me:20435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20436,14 +20447,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20439: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20450: 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:20446: checking for alternate character set array" >&5
+echo "$as_me:20457: 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
@@ -20453,7 +20464,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20456 "configure"
+#line 20467 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20469,16 +20480,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20475: \$? = $ac_status" >&5
+  echo "$as_me:20486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20481: \$? = $ac_status" >&5
+  echo "$as_me:20492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20489,7 +20500,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20492: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20499,7 +20510,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20502: checking for wide alternate character set array" >&5
+echo "$as_me:20513: 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
@@ -20509,7 +20520,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20512 "configure"
+#line 20523 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20525,16 +20536,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20531: \$? = $ac_status" >&5
+  echo "$as_me:20542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20537: \$? = $ac_status" >&5
+  echo "$as_me:20548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20545,7 +20556,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20548: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20553,7 +20564,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20556: checking for wide alternate character constants" >&5
+echo "$as_me:20567: 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
@@ -20563,7 +20574,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20566 "configure"
+#line 20577 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20580,16 +20591,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20586: \$? = $ac_status" >&5
+  echo "$as_me:20597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20592: \$? = $ac_status" >&5
+  echo "$as_me:20603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20599,7 +20610,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20602 "configure"
+#line 20613 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20615,16 +20626,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20621: \$? = $ac_status" >&5
+  echo "$as_me:20632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20627: \$? = $ac_status" >&5
+  echo "$as_me:20638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20635,7 +20646,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20638: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20645,10 +20656,10 @@ EOF
 
 fi
 
-echo "$as_me:20648: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20659: 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 20651 "configure"
+#line 20662 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20666,16 +20677,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20672: \$? = $ac_status" >&5
+  echo "$as_me:20683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20678: \$? = $ac_status" >&5
+  echo "$as_me:20689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20684,7 +20695,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20687: result: $cf_result" >&5
+echo "$as_me:20698: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20705,14 +20716,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20708: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20719: 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 20715 "configure"
+#line 20726 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20730,23 +20741,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20736: \$? = $ac_status" >&5
+  echo "$as_me:20747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20742: \$? = $ac_status" >&5
+  echo "$as_me:20753: \$? = $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 20749 "configure"
+#line 20760 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20765,16 +20776,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20771: \$? = $ac_status" >&5
+  echo "$as_me:20782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20777: \$? = $ac_status" >&5
+  echo "$as_me:20788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20786,7 +20797,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20789: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20809,14 +20820,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20812: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20823: 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 20819 "configure"
+#line 20830 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20834,23 +20845,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20840: \$? = $ac_status" >&5
+  echo "$as_me:20851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20846: \$? = $ac_status" >&5
+  echo "$as_me:20857: \$? = $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 20853 "configure"
+#line 20864 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20869,16 +20880,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20875: \$? = $ac_status" >&5
+  echo "$as_me:20886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20881: \$? = $ac_status" >&5
+  echo "$as_me:20892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20890,7 +20901,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20893: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20913,14 +20924,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20916: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20927: 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 20923 "configure"
+#line 20934 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20938,23 +20949,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20944: \$? = $ac_status" >&5
+  echo "$as_me:20955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20950: \$? = $ac_status" >&5
+  echo "$as_me:20961: \$? = $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 20957 "configure"
+#line 20968 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20973,16 +20984,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20979: \$? = $ac_status" >&5
+  echo "$as_me:20990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20985: \$? = $ac_status" >&5
+  echo "$as_me:20996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20994,7 +21005,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20997: result: $cf_cv_wint_t" >&5
+echo "$as_me:21008: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21018,10 +21029,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21021: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21032: 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 21024 "configure"
+#line 21035 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21039,16 +21050,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21045: \$? = $ac_status" >&5
+  echo "$as_me:21056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21051: \$? = $ac_status" >&5
+  echo "$as_me:21062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21057,7 +21068,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21060: result: $cf_result" >&5
+echo "$as_me:21071: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21079,10 +21090,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21082: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21093: 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 21085 "configure"
+#line 21096 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21100,16 +21111,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21106: \$? = $ac_status" >&5
+  echo "$as_me:21117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21112: \$? = $ac_status" >&5
+  echo "$as_me:21123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21118,7 +21129,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21121: result: $cf_result" >&5
+echo "$as_me:21132: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21140,10 +21151,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21143: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21154: 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 21146 "configure"
+#line 21157 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21161,16 +21172,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21167: \$? = $ac_status" >&5
+  echo "$as_me:21178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21173: \$? = $ac_status" >&5
+  echo "$as_me:21184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21179,7 +21190,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21182: result: $cf_result" >&5
+echo "$as_me:21193: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21208,11 +21219,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21211: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21215 "configure"
+#line 21226 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21245,16 +21256,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21251: \$? = $ac_status" >&5
+  echo "$as_me:21262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21257: \$? = $ac_status" >&5
+  echo "$as_me:21268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21264,7 +21275,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21267: result: $cf_result" >&5
+echo "$as_me:21278: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21276,14 +21287,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21279: checking for data $cf_data in library" >&5
+	echo "$as_me:21290: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21286 "configure"
+#line 21297 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21322,16 +21333,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21328: \$? = $ac_status" >&5
+  echo "$as_me:21339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21334: \$? = $ac_status" >&5
+  echo "$as_me:21345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21343,7 +21354,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21346 "configure"
+#line 21357 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21375,15 +21386,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21381: \$? = $ac_status" >&5
+  echo "$as_me:21392: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21386: \$? = $ac_status" >&5
+  echo "$as_me:21397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21395,7 +21406,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21398: result: $cf_result" >&5
+	echo "$as_me:21409: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21412,7 +21423,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21415: checking for X" >&5
+	echo "$as_me:21426: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21516,17 +21527,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21519 "configure"
+#line 21530 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21534: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21529: \$? = $ac_status" >&5
+  echo "$as_me:21540: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21559,7 +21570,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21562 "configure"
+#line 21573 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21571,16 +21582,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21577: \$? = $ac_status" >&5
+  echo "$as_me:21588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21583: \$? = $ac_status" >&5
+  echo "$as_me:21594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21618,7 +21629,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21621: result: $have_x" >&5
+  echo "$as_me:21632: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21628,7 +21639,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21631: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21642: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21655,11 +21666,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21658: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21669: 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 21662 "configure"
+#line 21673 "configure"
 #include "confdefs.h"
 
 int
@@ -21671,16 +21682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21677: \$? = $ac_status" >&5
+  echo "$as_me:21688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21683: \$? = $ac_status" >&5
+  echo "$as_me:21694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21690,13 +21701,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21693: result: no" >&5
+	echo "$as_me:21704: 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 21699 "configure"
+#line 21710 "configure"
 #include "confdefs.h"
 
 int
@@ -21708,16 +21719,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21714: \$? = $ac_status" >&5
+  echo "$as_me:21725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21720: \$? = $ac_status" >&5
+  echo "$as_me:21731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21727,11 +21738,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21730: result: yes" >&5
+	  echo "$as_me:21741: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21734: result: neither works" >&5
+	  echo "$as_me:21745: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21751,7 +21762,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21754 "configure"
+#line 21765 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21770,22 +21781,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21776: \$? = $ac_status" >&5
+  echo "$as_me:21787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21782: \$? = $ac_status" >&5
+  echo "$as_me:21793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21788: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21799: 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
@@ -21793,7 +21804,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21796 "configure"
+#line 21807 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21812,16 +21823,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21818: \$? = $ac_status" >&5
+  echo "$as_me:21829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21824: \$? = $ac_status" >&5
+  echo "$as_me:21835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21832,14 +21843,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21835: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21846: 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:21842: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21853: 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
@@ -21847,7 +21858,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21850 "configure"
+#line 21861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21866,16 +21877,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21872: \$? = $ac_status" >&5
+  echo "$as_me:21883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21878: \$? = $ac_status" >&5
+  echo "$as_me:21889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21886,7 +21897,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21889: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21900: 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"
@@ -21905,13 +21916,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21908: checking for gethostbyname" >&5
+    echo "$as_me:21919: 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 21914 "configure"
+#line 21925 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21942,16 +21953,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21948: \$? = $ac_status" >&5
+  echo "$as_me:21959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21961,11 +21972,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21964: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21975: 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:21968: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21979: 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
@@ -21973,7 +21984,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21976 "configure"
+#line 21987 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21992,16 +22003,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21998: \$? = $ac_status" >&5
+  echo "$as_me:22009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22004: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22012,14 +22023,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22015: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22026: 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:22022: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22033: 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
@@ -22027,7 +22038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22030 "configure"
+#line 22041 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22046,16 +22057,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22052: \$? = $ac_status" >&5
+  echo "$as_me:22063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22058: \$? = $ac_status" >&5
+  echo "$as_me:22069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22066,7 +22077,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22069: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22080: 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"
@@ -22082,13 +22093,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22085: checking for connect" >&5
+    echo "$as_me:22096: 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 22091 "configure"
+#line 22102 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22119,16 +22130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22138,11 +22149,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22141: result: $ac_cv_func_connect" >&5
+echo "$as_me:22152: 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:22145: checking for connect in -lsocket" >&5
+      echo "$as_me:22156: 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
@@ -22150,7 +22161,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22153 "configure"
+#line 22164 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22169,16 +22180,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22175: \$? = $ac_status" >&5
+  echo "$as_me:22186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22181: \$? = $ac_status" >&5
+  echo "$as_me:22192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22189,7 +22200,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22192: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22203: 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"
@@ -22198,13 +22209,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22201: checking for remove" >&5
+    echo "$as_me:22212: 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 22207 "configure"
+#line 22218 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22235,16 +22246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22241: \$? = $ac_status" >&5
+  echo "$as_me:22252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22247: \$? = $ac_status" >&5
+  echo "$as_me:22258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22254,11 +22265,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22257: result: $ac_cv_func_remove" >&5
+echo "$as_me:22268: 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:22261: checking for remove in -lposix" >&5
+      echo "$as_me:22272: 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
@@ -22266,7 +22277,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22269 "configure"
+#line 22280 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22285,16 +22296,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22291: \$? = $ac_status" >&5
+  echo "$as_me:22302: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22297: \$? = $ac_status" >&5
+  echo "$as_me:22308: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22305,7 +22316,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22308: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22319: 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"
@@ -22314,13 +22325,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22317: checking for shmat" >&5
+    echo "$as_me:22328: 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 22323 "configure"
+#line 22334 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22351,16 +22362,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22357: \$? = $ac_status" >&5
+  echo "$as_me:22368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22363: \$? = $ac_status" >&5
+  echo "$as_me:22374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22370,11 +22381,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22373: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22384: 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:22377: checking for shmat in -lipc" >&5
+      echo "$as_me:22388: 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
@@ -22382,7 +22393,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22385 "configure"
+#line 22396 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22401,16 +22412,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22407: \$? = $ac_status" >&5
+  echo "$as_me:22418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22413: \$? = $ac_status" >&5
+  echo "$as_me:22424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22421,7 +22432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22424: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22435: 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"
@@ -22439,7 +22450,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22442: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22453: 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
@@ -22447,7 +22458,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22450 "configure"
+#line 22461 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22466,16 +22477,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22472: \$? = $ac_status" >&5
+  echo "$as_me:22483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22478: \$? = $ac_status" >&5
+  echo "$as_me:22489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22486,7 +22497,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22489: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22500: 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"
@@ -22533,16 +22544,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22536: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22541: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22545: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22581,16 +22592,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22584: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22589: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22593: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22629,23 +22640,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22632: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22637: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22641: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22648: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22659: 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.
@@ -22662,7 +22673,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22665: result: $enable_warnings" >&5
+echo "$as_me:22676: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22685,10 +22696,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22688: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22691 "${as_me:-configure}"
+#line 22702 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22738,12 +22749,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22741: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22744: \$? = $ac_status" >&5
+  echo "$as_me:22755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22746: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22821,7 +22832,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22824 "configure"
+#line 22835 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22836,26 +22847,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22842: \$? = $ac_status" >&5
+  echo "$as_me:22853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22848: \$? = $ac_status" >&5
+  echo "$as_me:22859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22851: checking for X11/Xt const-feature" >&5
+echo "$as_me:22862: 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 22858 "configure"
+#line 22869 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22873,16 +22884,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22879: \$? = $ac_status" >&5
+  echo "$as_me:22890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22885: \$? = $ac_status" >&5
+  echo "$as_me:22896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22897,7 +22908,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22900: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22926,7 +22937,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22929 "${as_me:-configure}"
+#line 22940 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22942,7 +22953,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22945: checking for $CC warning options..." >&5
+	{ echo "$as_me:22956: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22958,12 +22969,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22966: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22971,7 +22982,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22974: checking for $CC warning options..." >&5
+	{ echo "$as_me:22985: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22994,12 +23005,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22997: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23000: \$? = $ac_status" >&5
+  echo "$as_me:23011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23002: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23007,7 +23018,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23017,7 +23028,7 @@ echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23034,7 +23045,7 @@ fi
 
 fi
 
-echo "$as_me:23037: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23048: 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.
@@ -23056,7 +23067,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23059: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23170,23 +23181,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23173: checking for dmalloc.h" >&5
+	echo "$as_me:23184: 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 23179 "configure"
+#line 23190 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23194: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23189: \$? = $ac_status" >&5
+  echo "$as_me:23200: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23205,11 +23216,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23208: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23219: 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:23212: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23223: 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
@@ -23217,7 +23228,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23220 "configure"
+#line 23231 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23236,16 +23247,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23242: \$? = $ac_status" >&5
+  echo "$as_me:23253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23248: \$? = $ac_status" >&5
+  echo "$as_me:23259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23256,7 +23267,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23259: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23270: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23271,7 +23282,7 @@ fi
 
 fi
 
-echo "$as_me:23274: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23285: 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.
@@ -23293,7 +23304,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23296: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23407,23 +23418,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23410: checking for dbmalloc.h" >&5
+	echo "$as_me:23421: 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 23416 "configure"
+#line 23427 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23426: \$? = $ac_status" >&5
+  echo "$as_me:23437: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23442,11 +23453,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23445: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23456: 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:23449: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23460: 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
@@ -23454,7 +23465,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23457 "configure"
+#line 23468 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23473,16 +23484,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23479: \$? = $ac_status" >&5
+  echo "$as_me:23490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23485: \$? = $ac_status" >&5
+  echo "$as_me:23496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23493,7 +23504,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23496: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23507: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23508,7 +23519,7 @@ fi
 
 fi
 
-echo "$as_me:23511: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23522: 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.
@@ -23530,7 +23541,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23533: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23643,7 +23654,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23646: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23657: 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.
@@ -23654,7 +23665,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23657: result: $with_no_leaks" >&5
+echo "$as_me:23668: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23672,7 +23683,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23675: checking for an rpath option" >&5
+	echo "$as_me:23686: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23703,12 +23714,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23706: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23711: checking if we need a space after rpath option" >&5
+		echo "$as_me:23722: 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"
 
@@ -23729,7 +23740,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23732 "configure"
+#line 23743 "configure"
 #include "confdefs.h"
 
 int
@@ -23741,16 +23752,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23747: \$? = $ac_status" >&5
+  echo "$as_me:23758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23753: \$? = $ac_status" >&5
+  echo "$as_me:23764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23760,14 +23771,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23763: result: $cf_rpath_space" >&5
+		echo "$as_me:23774: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23770: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23781: 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.
@@ -23785,22 +23796,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23788: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23799: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23793: checking for updated LDFLAGS" >&5
+echo "$as_me:23804: 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:23796: result: maybe" >&5
+	echo "$as_me:23807: 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:23803: checking for $ac_word" >&5
+echo "$as_me:23814: 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
@@ -23815,7 +23826,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23818: found $ac_dir/$ac_word" >&5
+echo "$as_me:23829: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23823,10 +23834,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23826: result: $cf_ldd_prog" >&5
+  echo "$as_me:23837: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23829: result: no" >&5
+  echo "$as_me:23840: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23840,7 +23851,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23843 "configure"
+#line 23854 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23852,16 +23863,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23858: \$? = $ac_status" >&5
+  echo "$as_me:23869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23864: \$? = $ac_status" >&5
+  echo "$as_me:23875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23889,7 +23900,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23901,11 +23912,11 @@ echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23904: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23908: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23942,7 +23953,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23945: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23955,11 +23966,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23958: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23962: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23996,7 +24007,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23999: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24009,14 +24020,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24012: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24016: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24019: result: no" >&5
+	echo "$as_me:24030: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24106,7 +24117,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24109: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24242,7 +24253,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20231210,
+configured by $0, generated by GNU Autoconf 2.52.20240618,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -24287,7 +24298,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24290: error: ambiguous option: $1
+    { { echo "$as_me:24301: 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;}
@@ -24306,7 +24317,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24309: error: unrecognized option: $1
+  -*) { { echo "$as_me:24320: 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;}
@@ -24325,7 +24336,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20231210, executed with
+This file was extended by $as_me 2.52.20240618, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -24356,7 +24367,7 @@ do
   "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:24359: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24370: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24559,14 +24570,14 @@ EOF
       # is no need to browse any of the substitutions).
       # These are the two extra sed commands mentioned above.
       (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
       if test -s "$tmp"/subs.next; then
-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
+        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
         if test ! -s "$tmp"/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
           if test ! -s "$tmp"/subs.edit; then
@@ -24664,7 +24675,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24667: creating $ac_file" >&5
+    { echo "$as_me:24678: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24682,7 +24693,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24685: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24695,7 +24706,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24698: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24709: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24711,7 +24722,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24714: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24725: 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;}
@@ -24720,7 +24731,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24723: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24734: 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;}
@@ -24765,7 +24776,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24768: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24779: 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;}
@@ -24776,7 +24787,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24779: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24790: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24825,7 +24836,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24828: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24836,7 +24847,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24839: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24849,7 +24860,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24852: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24863: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24907,7 +24918,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24910: $ac_file is unchanged" >&5
+      { echo "$as_me:24921: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

From a1e24bc002d1e13e0579280de43a588957047e72 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 14 Jul 2024 01:06:05 +0200
Subject: [PATCH 076/106] ncurses-6.5-20240713.patch.gz

---
 NEWS                             |  5 ++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 misc/ncurses-config.in           | 66 ++++++++++++++++++++------------
 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, 60 insertions(+), 39 deletions(-)

diff --git a/NEWS b/NEWS
index 7e7a8efb1..4579ce538 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4147 2024/07/06 18:21:47 tom Exp $
+-- $Id: NEWS,v 1.4149 2024/07/13 20:44:30 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240713
+	+ modify misc/ncurses-config.in, improved match with pkg-config output.
+
 20240706
 	+ update configure script to use macro changes from dialog.
 	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
diff --git a/VERSION b/VERSION
index 3bd3bb433..67693a779 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240706
+5:0:10	6.5	20240713
diff --git a/dist.mk b/dist.mk
index aa00145b6..54e06f0d0 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1621 2024/07/06 09:41:29 tom Exp $
+# $Id: dist.mk,v 1.1622 2024/07/13 10:06:25 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240706
+NCURSES_PATCH = 20240713
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index b17f68428..5608d1844 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.53 2024/06/22 20:52:02 tom Exp $
+# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
@@ -94,6 +94,24 @@ else
 	LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
 fi
 
+CFLAGS="@PKG_CFLAGS@"
+if [ "$includedir" != "/usr/include" ]; then
+	if [ "x@WITH_OVERWRITE@" = xno ]
+	then
+		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+		CFLAGS="$CFLAGS -I${includesubdir}"
+	fi
+	[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+	CFLAGS="$CFLAGS-I${includedir}"
+	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
+	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
+	if [ "x$includetop" != "x$includedir" ]
+	then
+		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+		CFLAGS="$CFLAGS-I$includetop"
+	fi
+fi
+
 # Ignore -L options which do not correspond to an actual directory, or which
 # are standard library directories (i.e., the linker is supposed to search
 # those directories).
@@ -187,54 +205,54 @@ while [ $# -gt 0 ]; do
 	# compile/link
 	--cflags)
 		OPTS=
-		for opt in @PKG_CFLAGS@
+		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[DIU]*)
-				OPTS="$OPTS $opt"
-				;;
-			x-Wl,*)
-				OPTS="$OPTS $opt"
-				;;
 			x-[OW]*)
-				;;
-			*)
-				OPTS="$OPTS $opt"
+				opt=
 				;;
 			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
 		done
 		printf "%s\n" "$OPTS"
 		;;
 	--cflags-only-I)
 		OPTS=
-		for opt in @PKG_CFLAGS@
+		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[DIU]*)
-				OPTS="$OPTS $opt"
+			x-[I]*)
 				;;
 			*)
+				opt=
 				;;
 			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
 		done
 		printf "%s\n" "$OPTS"
 		;;
 	--cflags-only-other)
 		OPTS=
-		for opt in @PKG_CFLAGS@
+		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[DIU]*)
-				;;
-			x-Wl,*)
-				OPTS="$OPTS $opt"
-				;;
-			x-[OW]*)
-				;;
-			*)
-				OPTS="$OPTS $opt"
+			x-[I]*|x-[OW]*)
+				opt=
 				;;
 			esac
+			if [ -n "$opt" ]
+			then
+				[ -n "$OPTS" ] && OPTS="$OPTS "
+				OPTS="$OPTS$opt"
+			fi
 		done
 		printf "%s\n" "$OPTS"
 		;;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 46946452b..36b2c7f88 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240706) unstable; urgency=low
+ncurses6td (6.5+20240713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 46946452b..36b2c7f88 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240706) unstable; urgency=low
+ncurses6td (6.5+20240713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2b91a919a..5145862c9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240706) unstable; urgency=low
+ncurses6td (6.5+20240713) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Jul 2024 05:41:29 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 987971691..0017437cd 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.656 2024/07/06 09:41:29 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.657 2024/07/13 10:06:25 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0706"
+!define VERSION_MMDD  "0713"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1e28ca959..b0656258b 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240706
+Release: 20240713
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 0439eca64..3d647f7fc 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240706
+Release: 20240713
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 289ee46b6..9f6377546 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240706
+Release: 20240713
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From e29b40bd015ed98db1d60832df9a208678301049 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 21 Jul 2024 02:16:51 +0200
Subject: [PATCH 077/106] ncurses-6.5-20240720.patch.gz

---
 NEWS                              |   9 +-
 VERSION                           |   2 +-
 aclocal.m4                        |  22 +-
 configure                         |  55 ++-
 configure.in                      |   5 +-
 dist.mk                           |   4 +-
 doc/html/man/curs_add_wch.3x.html |  10 +-
 doc/html/man/curs_addch.3x.html   |  10 +-
 doc/html/man/curs_addstr.3x.html  |  32 +-
 doc/html/man/curs_addwstr.3x.html |  50 +-
 doc/html/man/curs_beep.3x.html    |  10 +-
 doc/html/man/curs_get_wch.3x.html |  16 +-
 doc/html/man/curs_getch.3x.html   |  28 +-
 doc/html/man/curs_move.3x.html    |  13 +-
 doc/html/man/ncurses.3x.html      | 752 +++++++++++++++---------------
 doc/html/man/terminfo.5.html      |   2 +-
 doc/html/man/wresize.3x.html      |  57 ++-
 man/curs_add_wch.3x               |   8 +-
 man/curs_addch.3x                 |   8 +-
 man/curs_addstr.3x                |  32 +-
 man/curs_addwstr.3x               |  48 +-
 man/curs_beep.3x                  |   6 +-
 man/curs_get_wch.3x               |  25 +-
 man/curs_getch.3x                 |  48 +-
 man/curs_move.3x                  |  10 +-
 man/man_db.renames.in             |   3 +-
 man/ncurses.3x                    |  12 +-
 man/wresize.3x                    | 102 +++-
 misc/Makefile.in                  |   8 +-
 ncurses/win32con/win_driver.c     |  15 +-
 package/debian-mingw/changelog    |   4 +-
 package/debian-mingw64/changelog  |   4 +-
 package/debian/changelog          |   4 +-
 package/mingw-ncurses.nsi         |   4 +-
 package/mingw-ncurses.spec        |   2 +-
 package/ncurses.spec              |   2 +-
 package/ncursest.spec             |   2 +-
 37 files changed, 778 insertions(+), 646 deletions(-)

diff --git a/NEWS b/NEWS
index 4579ce538..e7f92c009 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4149 2024/07/13 20:44:30 tom Exp $
+-- $Id: NEWS,v 1.4151 2024/07/20 21:54:20 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240720
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ modify configure script and misc/Makefile to accept glob expressions
+	  that include Windows/DOS drive-letters (report by Eli Zaretskii).
+	+ fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in
+	  win_driver.c (report/patch by Eli Zaretskii).
+
 20240713
 	+ modify misc/ncurses-config.in, improved match with pkg-config output.
 
diff --git a/VERSION b/VERSION
index 67693a779..b9d967354 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240713
+5:0:10	6.5	20240720
diff --git a/aclocal.m4 b/aclocal.m4
index 2239d223f..18702c0f3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $
+dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3239,6 +3239,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17
+dnl ----------------
+dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
+AC_DEFUN([CF_GLOB_FULLPATH],[
+AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*'
+	GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ '
+	;;
+(*)
+	GLOB_FULLPATH_ONLY='x/*'
+	GLOB_FULLPATH_ARGS='x/*\ '
+	;;
+esac
+AC_SUBST(GLOB_FULLPATH_ONLY)
+AC_SUBST(GLOB_FULLPATH_ARGS)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
 dnl -----------------
 AC_DEFUN([CF_GNATPREP_OPT_T],[
diff --git a/configure b/configure
index 4408749f0..2a5cf1e36 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.782 .
+# From configure.in Revision: 1.783 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -29428,6 +29428,17 @@ done
 echo "$as_me:29428: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*'
+	GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ '
+	;;
+(*)
+	GLOB_FULLPATH_ONLY='x/*'
+	GLOB_FULLPATH_ARGS='x/*\ '
+	;;
+esac
+
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
 case "x$NCURSES_OSPEED" in
 (*short*)
@@ -29486,7 +29497,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29513,7 +29524,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29516: checking for linker search path" >&5
+echo "$as_me:29527: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29561,7 +29572,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29602,7 +29613,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29605: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29616: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29688,7 +29699,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29869,7 +29880,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29872: error: ambiguous option: $1
+    { { echo "$as_me:29883: 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;}
@@ -29888,7 +29899,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29891: error: unrecognized option: $1
+  -*) { { echo "$as_me:29902: 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;}
@@ -30018,7 +30029,7 @@ do
   "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:30021: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30032: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30400,6 +30411,8 @@ s,@MAKE_TESTS@,$MAKE_TESTS,;t t
 s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
 s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
 s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
+s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t
+s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t
 s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
 s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
 s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t
@@ -30540,7 +30553,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30543: creating $ac_file" >&5
+    { echo "$as_me:30556: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30558,7 +30571,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30571,7 +30584,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30574: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30587: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30587,7 +30600,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30590: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30603: 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;}
@@ -30596,7 +30609,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30599: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30612: 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;}
@@ -30641,7 +30654,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30644: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30657: 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;}
@@ -30652,7 +30665,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30655: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30668: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30701,7 +30714,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30712,7 +30725,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30725,7 +30738,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30728: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30741: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30783,7 +30796,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30786: $ac_file is unchanged" >&5
+      { echo "$as_me:30799: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31170,7 +31183,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 8a7e6c5e3..76bd06d85 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 tom Exp $
+dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.782 $)
+AC_REVISION($Revision: 1.783 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -2431,6 +2431,7 @@ do
 done
 AC_MSG_RESULT($PKG_CFLAGS)
 AC_SUBST(PKG_CFLAGS)
+CF_GLOB_FULLPATH
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
 case "x$NCURSES_OSPEED" in
diff --git a/dist.mk b/dist.mk
index 54e06f0d0..ef4624f63 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1622 2024/07/13 10:06:25 tom Exp $
+# $Id: dist.mk,v 1.1623 2024/07/20 10:19:56 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240713
+NCURSES_PATCH = 20240720
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 5e9c50347..6b84a450f 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   Backspace  moves  the cursor one character left; at the left margin
            of a window, it does nothing.
 
-       <STRONG>o</STRONG>   Carriage return moves the cursor to the left margin on the  current
+       <STRONG>o</STRONG>   Carriage return moves the cursor to the left  margin  on  the  same
            line of the window.
 
        <STRONG>o</STRONG>   Line  feed  does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from the right
@@ -364,7 +364,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index e0499b472..fd978f38c 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp @
+  * @Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   Backspace moves the cursor one character left; at the  left  margin
            of a window, it does nothing.
 
-       <STRONG>o</STRONG>   Carriage  return moves the cursor to the left margin on the current
+       <STRONG>o</STRONG>   Carriage  return  moves  the  cursor to the left margin on the same
            line of the window.
 
        <STRONG>o</STRONG>   Line feed does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from  the  right
@@ -316,7 +316,7 @@ <H1 class="no-header">curs_addch 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index f626abb5b..8d9ce5191 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp @
+  * @Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -54,25 +54,23 @@ <H1 class="no-header">curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>waddstr</STRONG> writes the characters of the (null-terminated)  string  <EM>str</EM>  to
-       the  window <EM>win</EM>.  Its process is similar to calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> for each
-       <EM>char</EM> in <EM>str</EM>.  Control characters are processed as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
+       the window <EM>win</EM>, as if by calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> for each <EM>char</EM> in <EM>str</EM>.
 
-       <STRONG>waddnstr</STRONG> writes at most <EM>n</EM>  characters,  or  until  a  terminating  null
-       character  occurs  in  <EM>str</EM>.   If  <EM>n</EM>  is  -1, <STRONG>waddnstr</STRONG> writes the entire
-       string.
+       <STRONG>waddnstr</STRONG>  is  similar,  but  writes  at most <EM>n</EM> characters.  If <EM>n</EM> is -1,
+       <STRONG>waddnstr</STRONG> writes the entire string.
 
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
@@ -117,7 +115,7 @@ <H1 class="no-header">curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 0d5cd64db..9e5d70ae3 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -55,31 +55,26 @@ <H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>waddwstr</STRONG>  writes  the  characters  of  the (wide-null-terminated) wide-
-       character string <EM>wstr</EM> to the window <EM>win</EM>.  Its  process  is  similar  to
-       constructing   a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  for  each  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  in  <EM>wstr</EM>,  then  calling
-       <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> with the resulting <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       character string <EM>wstr</EM> to the  window  <EM>win</EM>,  as  if  by  constructing  a
+       <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  for  each  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>wstr</EM>, then calling <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> with the
+       resulting <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.  <EM>curses</EM> processes spacing and non-spacing characters
+       in <EM>wstr</EM> one at a time.
 
-       <STRONG>o</STRONG>   Spacing and non-spacing characters in the string are processed  one
-           at a time, and
-
-       <STRONG>o</STRONG>   control characters are processed as in <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
-
-       <STRONG>waddnwstr</STRONG> writes at most <EM>n</EM> wide characters, or until a terminating wide
-       null character occurs in <EM>wstr</EM>.  If <EM>n</EM> is -1, <STRONG>waddnwstr</STRONG> writes the entire
-       wide string.
+       <STRONG>waddnwstr</STRONG>  is  similar,  but writes at most <EM>n</EM> wide characters.  If <EM>n</EM> is
+       -1, <STRONG>waddnwstr</STRONG> writes the entire wide string.
 
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
@@ -95,7 +90,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -107,15 +102,19 @@ <H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
        X/Open Curses, Issue 4 describes these functions.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <EM>waddstr</EM> and <EM>waddnstr</EM> appeared late in SVr4 development (1995).
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-01                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -125,6 +124,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 8dc4771f9..a75d5d4bc 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp @
+  * @Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -59,7 +59,7 @@ <H1 class="no-header">curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>beep</STRONG>  and  <STRONG>flash</STRONG>  alert  the  terminal user: the former by sounding the
-       terminal's audible alarm, and the latter  by  visibly  attracting  user
+       terminal's  audible  alarm,  and  the  latter  by  visibly   attracting
        attention.    Commonly,   a   terminal  implements  a  visual  bell  by
        momentarily reversing the character foreground and background colors on
        the  entire  display;  even  a  monochrome  device  can do this.  These
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_beep 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 8db437780..b9e7bd91d 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -115,16 +115,16 @@ <H1 class="no-header">curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wget_wch</STRONG> returns <STRONG>OK</STRONG> when it reads a  wide  character  and  <STRONG>KEY_CODE_YES</STRONG>
-       when it reads a function key code.  It returns <STRONG>ERR</STRONG> if
-
-       <STRONG>o</STRONG>   the <EM>WINDOW</EM> pointer is <STRONG>NULL</STRONG>, or
+       <STRONG>wget_wch</STRONG> returns <STRONG>OK</STRONG> when it reads a wide character,  <STRONG>KEY_CODE_YES</STRONG>  when
+       it reads a function key code, and <STRONG>ERR</STRONG> on failure.  <STRONG>wget_wch</STRONG> fails if
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
        <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
            to <STRONG>EINTR</STRONG>.
 
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
@@ -172,7 +172,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 3b11ae8cb..01a060f83 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp @
+  * @Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -301,25 +301,25 @@ <H1 class="no-header">curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except  for  <STRONG>has_key</STRONG>,  these  functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on
-       failure.
-
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
-
-       Functions prefixed with "mv" first perform cursor movement and fail  if
-       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
-
-       <STRONG>wgetch</STRONG> also fails if
+       <STRONG>wgetch</STRONG> returns a key code identifying the key event as described above,
+       which may include <STRONG>KEY_RESIZE</STRONG> or <STRONG>KEY_MOUSE</STRONG> indicating non-key events, or
+       <STRONG>ERR</STRONG> on failure.  <STRONG>wgetch</STRONG> fails if
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
        <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
            to <STRONG>EINTR</STRONG>.
 
-       <STRONG>ungetch</STRONG> fails if there is no more room in the input queue.
+       <STRONG>ungetch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on  failure.   <STRONG>ungetch</STRONG>  fails  if
+       there is no more room in the input queue.
 
        <STRONG>has_key</STRONG> returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
+
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be implemented as macros.
@@ -427,7 +427,7 @@ <H1 class="no-header">curs_getch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index bbab2b871..d6e4fd2a2 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp @
+  * @Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-04-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-04-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -54,7 +54,7 @@ <H1 class="no-header">curs_move 3x 2024-04-27 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>move(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wmove(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wmove(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -78,7 +78,8 @@ <H1 class="no-header">curs_move 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open  Curses,  Issue 4 describes these functions.  4BSD (1980) <EM>curses</EM>
+       introduced <EM>wmove</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -86,7 +87,7 @@ <H1 class="no-header">curs_move 3x 2024-04-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-27                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 18331ce1b..42dcd4672 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp @
+  * @Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,35 +61,34 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240622).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240720).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
-       and mouse  events;  control  of  terminal  input  and  output  options;
-       selection   of   color  and  rendering  attributes  (such  as  bold  or
-       underline); the definition and use of <EM>soft</EM> <EM>label</EM> keys;  access  to  the
-       <EM>terminfo</EM>   terminal   capability   database;  a  <EM>termcap</EM>  compatibility
-       interface; and an abstraction of the system's API for manipulating  the
+       and mouse events; selection of color and rendering attributes (such  as
+       bold  or  underline); the definition and use of <EM>soft</EM> <EM>label</EM> keys; access
+       to the <EM>terminfo</EM> terminal capability database; a  <EM>termcap</EM>  compatibility
+       interface;  and an abstraction of the system's API for manipulating the
        terminal (such as <STRONG>termios(3)</STRONG>).
 
-       <EM>ncurses</EM>  implements  the  interface described by X/Open Curses Issue 7.
+       <EM>ncurses</EM> implements the interface described by  X/Open  Curses  Issue 7.
        In many behavioral details not standardized by X/Open, <EM>ncurses</EM> emulates
        the <EM>curses</EM> library of SVr4 and provides numerous useful extensions.
 
-       <EM>ncurses</EM>  man  pages employ several sections to clarify matters of usage
+       <EM>ncurses</EM> man pages employ several sections to clarify matters  of  usage
        and interoperability with other <EM>curses</EM> implementations.
 
-       <STRONG>o</STRONG>   "NOTES" describes issues and caveats  of  which  any  user  of  the
-           <EM>ncurses</EM>  API should be aware, such as limitations on the size of an
-           underlying integral type or  the  availability  of  a  preprocessor
-           macro  exclusive  of  a  function  definition  (which  prevents its
-           address  from  being   taken).    This   section   also   describes
-           implementation  details of significance to the programmer but which
+       <STRONG>o</STRONG>   "NOTES"  describes  issues  and  caveats  of  which any user of the
+           <EM>ncurses</EM> API should be aware, such as limitations on the size of  an
+           underlying  integral  type  or  the  availability of a preprocessor
+           macro exclusive  of  a  function  definition  (which  prevents  its
+           address   from   being   taken).    This   section  also  describes
+           implementation details of significance to the programmer but  which
            are not standardized.
 
-       <STRONG>o</STRONG>   "EXTENSIONS" presents <EM>ncurses</EM> innovations beyond the X/Open  Curses
-           standard  and/or  the  SVr4 <EM>curses</EM> implementation.  They are termed
-           <EM>extensions</EM> to indicate that they cannot be  implemented  solely  by
+       <STRONG>o</STRONG>   "EXTENSIONS"  presents <EM>ncurses</EM> innovations beyond the X/Open Curses
+           standard and/or the SVr4 <EM>curses</EM> implementation.   They  are  termed
+           <EM>extensions</EM>  to  indicate  that they cannot be implemented solely by
            using the library API, but require access to the library's internal
            state.
 
@@ -97,35 +96,35 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
            that should be considered when writing to a <EM>curses</EM> standard, or for
            multiple implementations.
 
-       <STRONG>o</STRONG>   "HISTORY" examines points of detail in  <EM>ncurses</EM>  and  other  <EM>curses</EM>
+       <STRONG>o</STRONG>   "HISTORY"  examines  points  of  detail in <EM>ncurses</EM> and other <EM>curses</EM>
            implementations over the decades of their development, particularly
            where precedent or inertia have frustrated better design (and, in a
            few cases, where such inertia has been overcome).
 
        A <EM>curses</EM> application must be linked with the library; use the <STRONG>-lncurses</STRONG>
-       option to your compiler or linker.  A debugging version of the  library
-       may  be available; if so, link with it using <STRONG>-lncurses_g</STRONG>.  (Your system
+       option  to your compiler or linker.  A debugging version of the library
+       may be available; if so, link with it using <STRONG>-lncurses_g</STRONG>.  (Your  system
        integrator may have installed these libraries such that you can use the
-       options  <STRONG>-lcurses</STRONG> and <STRONG>-lcurses_g</STRONG>, respectively.)  The <EM>ncurses</EM><STRONG>_</STRONG><EM>g</EM> library
-       logs events describing <EM>ncurses</EM> actions to a file called  <EM>trace</EM>  in  the
+       options <STRONG>-lcurses</STRONG> and <STRONG>-lcurses_g</STRONG>, respectively.)  The <EM>ncurses</EM><STRONG>_</STRONG><EM>g</EM>  library
+       logs  events  describing  <EM>ncurses</EM> actions to a file called <EM>trace</EM> in the
        current directory.  See section "ALTERNATE CONFIGURATIONS" below.
 
 
 </PRE><H3><a name="h3-Application-Structure">Application Structure</a></H3><PRE>
-       A   <EM>curses</EM>   application  uses  information  from  the  system  locale;
+       A  <EM>curses</EM>  application  uses  information  from  the   system   locale;
        <STRONG>setlocale(3)</STRONG> prepares it for <EM>curses</EM> library calls.
 
            setlocale(LC_ALL, "");
 
-       If the locale  is  not  thus  initialized,  the  library  assumes  that
-       characters  are printable as in ISO 8859-1, to work with certain legacy
-       programs.  You should initialize the locale; do not  expect  consistent
+       If  the  locale  is  not  thus  initialized,  the  library assumes that
+       characters are printable as in ISO 8859-1, to work with certain  legacy
+       programs.   You  should initialize the locale; do not expect consistent
        behavior from the library when the locale has not been set up.
 
-       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize <EM>curses</EM> before
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize  <EM>curses</EM>  before
        use of any functions that deal with windows and screens.
 
-       To get character-at-a-time  input  without  echoing--most  interactive,
+       To  get  character-at-a-time  input  without echoing--most interactive,
        screen-oriented programs want this--use the following sequence.
 
            initscr(); cbreak(); noecho();
@@ -135,107 +134,107 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
            noqiflush();
            keypad(stdscr, TRUE);
 
-       A  <EM>curses</EM>  program  then often enters an event loop of some sort.  Call
+       A <EM>curses</EM> program then often enters an event loop of  some  sort.   Call
        <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> before exiting.
 
 
 </PRE><H3><a name="h3-Overview">Overview</a></H3><PRE>
-       A <EM>curses</EM> library abstracts the terminal with a <EM>SCREEN</EM>  data  structure,
-       and  represents  all  or  part  of  its display with <EM>WINDOW</EM> structures.
-       Distinct properties apply to each; for example, the <EM>line</EM> <EM>discipline</EM>  of
-       a  typical  Unix terminal driver is in one of three modes: raw, cbreak,
-       or normal ("cooked").  In <EM>curses</EM>, the line discipline is a property  of
+       A  <EM>curses</EM>  library abstracts the terminal with a <EM>SCREEN</EM> data structure,
+       and represents all or part  of  its  display  with  <EM>WINDOW</EM>  structures.
+       Distinct  properties apply to each; for example, the <EM>line</EM> <EM>discipline</EM> of
+       a typical Unix terminal driver is in one of three modes:  raw,  cbreak,
+       or  normal ("cooked").  In <EM>curses</EM>, the line discipline is a property of
        the screen, applying identically to all windows associated with it.
 
-       A  <EM>window</EM>  is  a rectangular grid of character cells, addressed by line
+       A <EM>window</EM> is a rectangular grid of character cells,  addressed  by  line
        and column coordinates (<EM>y</EM>, <EM>x</EM>), with the upper left corner as (0, 0).  A
-       window  called  <STRONG>stdscr</STRONG>, the same size as the terminal screen, is always
+       window called <STRONG>stdscr</STRONG>, the same size as the terminal screen,  is  always
        available.  Create others with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.
 
-       A <EM>curses</EM> library does not manage overlapping windows (but  see  below).
-       You  can either use <STRONG>stdscr</STRONG> to manage one screen-filling window, or tile
-       the screen into non-overlapping windows and  not  use  <STRONG>stdscr</STRONG>  at  all.
-       Mixing  the  two  approaches will result in unpredictable and undesired
+       A  <EM>curses</EM>  library does not manage overlapping windows (but see below).
+       You can either use <STRONG>stdscr</STRONG> to manage one screen-filling window, or  tile
+       the  screen  into  non-overlapping  windows  and not use <STRONG>stdscr</STRONG> at all.
+       Mixing the two approaches will result in  unpredictable  and  undesired
        effects.
 
-       Functions permit manipulation of a window and  the  <EM>cursor</EM>  identifying
-       the  cell  within  it  at  which  the next operation will occur.  Among
-       those, the most basic are  <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG>  and  <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>:  these  place  the
+       Functions  permit  manipulation  of a window and the <EM>cursor</EM> identifying
+       the cell within it at which  the  next  operation  will  occur.   Among
+       those,  the  most  basic  are  <STRONG><A HREF="curs_move.3x.html">move(3x)</A></STRONG>  and <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>: these place the
        cursor within and write a character to <STRONG>stdscr</STRONG>, respectively.
 
        Frequent changes to the terminal screen can cause unpleasant flicker or
-       inefficient use of the communication channel to the  device,  so  as  a
-       rule  the  library  does not update it automatically.  Therefore, after
+       inefficient  use  of  the  communication channel to the device, so as a
+       rule the library does not update it  automatically.   Therefore,  after
        using <EM>curses</EM> functions to accumulate a set of desired updates that make
        sense to present together, call <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> to tell the library to make
-       the user's screen look like <STRONG>stdscr</STRONG>.  The library <EM>optimizes</EM>  its  output
-       by  computing  a minimal volume of operations to mutate the screen from
-       its  state  at  the  previous  refresh  to  the  new  one.    Effective
-       optimization  demands  accurate  information about the terminal device:
-       the management of such information is the province of the  <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG>
+       the  user's  screen look like <STRONG>stdscr</STRONG>.  The library <EM>optimizes</EM> its output
+       by computing a minimal volume of operations to mutate the  screen  from
+       its   state  at  the  previous  refresh  to  the  new  one.   Effective
+       optimization demands accurate information about  the  terminal  device:
+       the  management of such information is the province of the <STRONG><A HREF="curs_terminfo.3x.html">terminfo(3x)</A></STRONG>
        API, a feature of every standard <EM>curses</EM> implementation.
 
-       Special  windows  called  <EM>pads</EM>  may also be manipulated.  These are not
-       constrained to the size of the terminal screen and their contents  need
+       Special windows called <EM>pads</EM> may also be  manipulated.   These  are  not
+       constrained  to the size of the terminal screen and their contents need
        not be completely displayed.  See <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>.
 
-       Many  terminals  support configuration of character cell foreground and
-       background colors as well as  <EM>attributes</EM>,  which  cause  characters  to
-       render  in  such  modes  as boldfaced, underlined, or in reverse video.
+       Many terminals support configuration of character cell  foreground  and
+       background  colors  as  well  as  <EM>attributes</EM>, which cause characters to
+       render in such modes as boldfaced, underlined,  or  in  reverse  video.
        See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
-       <EM>curses</EM> predefines constants for a small set of  forms-drawing  graphics
-       corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
+       <EM>curses</EM>  predefines  constants for a small set of forms-drawing graphics
+       corresponding to the DEC Alternate Character Set (ACS),  a  feature  of
        VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
        <EM>curses</EM> is implemented using the operating system's terminal driver; key
        events are received not as scan codes but as byte sequences.  Graphical
-       keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
-       is.   Everything  else, including the tab, enter/return, keypad, arrow,
+       keycaps  (alphanumeric  and punctuation keys, and the space) appear as-
+       is.  Everything else, including the tab, enter/return,  keypad,  arrow,
        and function keys, appears as a control character or a multibyte <EM>escape</EM>
-       <EM>sequence.</EM>   <EM>curses</EM> can translate the latter into unique <EM>key</EM> <EM>codes.</EM>  See
+       <EM>sequence.</EM>  <EM>curses</EM> can translate the latter into unique <EM>key</EM> <EM>codes.</EM>   See
        <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> and <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
        <EM>ncurses</EM> provides reimplementations of the SVr4 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, and
-       <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>   libraries;   they   permit   overlapping  windows  and  ease
+       <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>  libraries;  they  permit   overlapping   windows   and   ease
        construction of user interfaces with <EM>curses</EM>.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       The  selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the   process
+       The   selection  of  an  appropriate  value  of  <EM>TERM</EM>  in  the  process
        environment  is  essential  to  correct  <EM>curses</EM>  and  <EM>terminfo</EM>  library
-       operation.  A well-configured  system  selects  a  correct  <EM>TERM</EM>  value
-       automatically;   <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>   may   assist   with  troubleshooting  exotic
+       operation.   A  well-configured  system  selects  a  correct <EM>TERM</EM> value
+       automatically;  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  may   assist   with   troubleshooting   exotic
        situations.
 
        If you change the terminal type, export the shell's <EM>TERM</EM> variable, then
-       run  <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>  or  the  "<STRONG>tput</STRONG>  <STRONG>init</STRONG>"  command.  See subsection "Tabs and
+       run <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG> or the "<STRONG>tput</STRONG>  <STRONG>init</STRONG>"  command.   See  subsection  "Tabs  and
        Initialization" of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       If the environment variables <EM>LINES</EM> and  <EM>COLUMNS</EM>  are  set,  or  if  the
-       <EM>curses</EM>  program  is executing in a graphical windowing environment, the
-       information obtained thence overrides that obtained  by  <EM>terminfo</EM>.   An
+       If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
+       <EM>curses</EM> program is executing in a graphical windowing  environment,  the
+       information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
        <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-       If  the  environment  variable  <EM>TERMINFO</EM>  is  defined, a <EM>curses</EM> program
-       checks first for  a  terminal  type  description  in  the  location  it
-       identifies.   <EM>TERMINFO</EM>  is  useful  for developing type descriptions or
+       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
+       checks  first  for  a  terminal  type  description  in  the location it
+       identifies.  <EM>TERMINFO</EM> is useful for  developing  type  descriptions  or
        when write permission to <EM>/usr/share/terminfo</EM> is not available.
 
        See section "ENVIRONMENT" below.
 
 
 </PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
-       <EM>curses</EM> offers many functions in variant forms using a  regular  set  of
-       alternatives  to the name of an elemental one.  Those prefixed with "w"
-       require a <EM>WINDOW</EM> pointer argument;  those  with  a  "mv"  prefix  first
+       <EM>curses</EM>  offers  many  functions in variant forms using a regular set of
+       alternatives to the name of an elemental one.  Those prefixed with  "w"
+       require  a  <EM>WINDOW</EM>  pointer  argument;  those  with a "mv" prefix first
        perform cursor movement using <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>; a "mvw" prefix indicates both.
-       The "w" function is typically the elemental one; the  removal  of  this
+       The  "w"  function  is typically the elemental one; the removal of this
        prefix usually indicates operation on <STRONG>stdscr</STRONG>.
 
        Four functions prefixed with "p" require a pad argument.
 
-       In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
+       In function synopses, <EM>ncurses</EM> man pages apply the  following  names  to
        parameters.  We introduce the character types in the next subsection.
 
                        <EM>bf</EM>    a <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
@@ -248,64 +247,65 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
-       This  man  page  primarily  surveys  functions  that  appear   in   any
+       This   man   page  primarily  surveys  functions  that  appear  in  any
        configuration of the library.  There are two common configurations; see
        section "ALTERNATE CONFIGURATIONS" below.
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
-                 eight-bit  characters.   It  stores a character combined with
+                 eight-bit characters.  It stores a  character  combined  with
                  attributes and a color pair in a <EM>chtype</EM> datum, which is often
                  an alias of <EM>int</EM>.  A string of <EM>curses</EM> characters is similar to
                  a C <EM>char</EM> string; a <EM>chtype</EM> string ends with an integral <STRONG>0</STRONG>, the
                  null <EM>curses</EM> character.
 
-                 Attributes  and a color pair selection (with no corresponding
-                 character) can be stored in variables  of  <EM>chtype</EM>  or  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
-                 type.   In either case, they are accessed via an integral bit
+                 Attributes and a color pair selection (with no  corresponding
+                 character)  can  be  stored  in variables of <EM>chtype</EM> or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
+                 type.  In either case, they are accessed via an integral  bit
                  mask.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.   X/Open  Curses
-                 does  not  specify  the  sizes of the character code or color
-                 pair identifier, nor  the  quantity  of  attribute  bits,  in
-                 <EM>chtype</EM>;  these  are  implementation-dependent.   <EM>ncurses</EM> uses
-                 eight bits for the character code.  An application  requiring
-                 a  wider  character  type, for instance to represent Unicode,
+                 Each  cell  of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.  X/Open Curses
+                 does not specify the sizes of the  character  code  or  color
+                 pair  identifier,  nor  the  quantity  of  attribute bits, in
+                 <EM>chtype</EM>; these  are  implementation-dependent.   <EM>ncurses</EM>  uses
+                 eight  bits for the character code.  An application requiring
+                 a wider character type, for instance  to  represent  Unicode,
                  should use the wide-character API.
 
-       <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
+       <EM>ncursesw</EM>  is  the  library  in  its "wide" configuration, which handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
                  byte-sized  type)  can  represent.   It  provides  additional
                  functions that complement those in the non-wide library where
-                 the size of the underlying character type is significant.   A
-                 somewhat  regular  naming convention relates many of the wide
-                 variants to their non-wide  counterparts;  where  a  non-wide
-                 function  name contains "ch" or "str", prefix it with "_w" to
-                 obtain the wide counterpart.   For  example,  <STRONG>waddch</STRONG>  becomes
-                 <STRONG>wadd_wch</STRONG>.   (Exceptions  that  add only "w" comprise <STRONG>addwstr</STRONG>,
+                 the  size of the underlying character type is significant.  A
+                 somewhat regular naming convention relates many of  the  wide
+                 variants  to  their  non-wide  counterparts; where a non-wide
+                 function name contains "ch" or "str", prefix it with "_w"  to
+                 obtain  the  wide  counterpart.   For example, <STRONG>waddch</STRONG> becomes
+                 <STRONG>wadd_wch</STRONG>.  (Exceptions that add only  "w"  comprise  <STRONG>addwstr</STRONG>,
                  <STRONG>inwstr</STRONG>, and their variants.)
 
-                 This convention is inapplicable  to  some  non-wide  function
+                 This  convention  is  inapplicable  to some non-wide function
                  names,  so  other  transformations  are  used  for  the  wide
                  configuration:  the  window  background  management  function
-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
-                 -clearing functions are suffixed with "_set";  and  character
-                 attribute   manipulation   functions   like  "attron"  become
+                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+                 -clearing  functions  are suffixed with "_set"; and character
+                 attribute  manipulation  functions   like   "attron"   become
                  "attr_on".
 
-                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  corresponds to the non-wide configuration's  <EM>chtype</EM>.
-                          It  is  a  structure  type  because it requires more
-                          storage than  a  standard  scalar  type  offers.   A
-                          character  code  may not be representable as a <EM>char</EM>,
-                          and moreover more than one character  may  occupy  a
-                          cell  (as  with  accent marks and other diacritics).
-                          Each  character  is  of  type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a   complex
-                          character contains one spacing character and zero or
-                          more non-spacing characters (see below).   A  string
-                          of  complex  characters  ends  with  a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose
-                          <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  member  is   the   null   wide   character.
-                          Attributes  and a color pair selection are stored in
-                          separate fields of the structure, not combined  into
-                          an integer as in <EM>chtype</EM>.
+                 <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is a <EM>curses</EM> <EM>complex</EM> <EM>character</EM> and corresponds to the
+                          non-wide configuration's <EM>chtype</EM>.  It is a  structure
+                          type   because  it  requires  more  storage  than  a
+                          standard scalar type offers.  A character  code  may
+                          not  be  representable  as a <EM>char</EM>, and moreover more
+                          than one character may occupy a cell (as with accent
+                          marks  and  other diacritics).  Each character is of
+                          type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a  complex  character  contains  one
+                          spacing  character  and  zero  or  more  non-spacing
+                          characters  (see  below).   A  string   of   complex
+                          characters  ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> member
+                          is the null wide character.  Attributes and a  color
+                          pair  selection are stored in separate fields of the
+                          structure,  not  combined  into  an  integer  as  in
+                          <EM>chtype</EM>.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
@@ -385,12 +385,12 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     delscreen                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     delwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     derwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
-
                     doupdate                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     dupwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     echo                     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -452,13 +452,13 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     init_extended_color      <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     init_extended_pair       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
                     init_pair                <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     initscr                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
-
                     innstr                   <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     innwstr                  <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     ins_nwstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
@@ -519,6 +519,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+
                     mvcur                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvderwin                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
@@ -526,7 +527,6 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     mvget_wstr               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
                     mvgetch                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
                     mvgetn_wstr              <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
-
                     mvgetnstr                <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvgetstr                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
                     mvhline                  <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
@@ -586,6 +586,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvwinsstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwprintw                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -594,7 +595,6 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     mvwvline_set             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
                     napms                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
-
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
@@ -653,6 +653,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attrset              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_clear                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_label                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -662,7 +663,6 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     slk_set                  <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_touch                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_wset                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     standend                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     standout                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     start_color              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -720,6 +720,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     waddchnstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     waddchstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     waddnstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
@@ -730,7 +731,6 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     wattroff                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattron                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     wattrset                 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     wbkgd                    <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     wbkgdset                 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
                     wbkgrnd                  <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
@@ -787,6 +787,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                     wrefresh                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wresize                  <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>*
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     wstandend                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -830,11 +831,12 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        redirected output to a file.  Its integral value is used for  the  baud
        rate.   If  that  value  is absent or invalid, <EM>ncurses</EM> uses 9600.  This
        feature allows developers to construct repeatable test cases that  take
-       into account optimization decisions that depend on baud rate.
+       into  account optimization decisions that depend on the terminal's line
+       speed.
 
 
 </PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
-       When  set,  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability value of loaded
+       When set, the <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of  loaded
        <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
@@ -845,192 +847,192 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        This  variable  specifies  the  width  of  the  screen  in  characters.
-       Applications running in a windowing environment  usually  are  able  to
+       Applications  running  in  a  windowing environment usually are able to
        obtain the width of the window in which they are executing.  If <EM>COLUMNS</EM>
        is not defined and the terminal's screen size is not available from the
-       terminal  driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG> (<STRONG>cols</STRONG>)
-       capability of the terminal type's entry in the  <EM>terminfo</EM>  database,  if
+       terminal driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG>  (<STRONG>cols</STRONG>)
+       capability  of  the  terminal type's entry in the <EM>terminfo</EM> database, if
        any.
 
-       It  is  important  that  your  application use the correct screen size.
-       Automatic  detection  thereof  is  not  always  possible   because   an
-       application  may  be  running  on  a  host  that  does  not  honor NAWS
-       (Negotiations About Window Size) or as a different  user  ID  than  the
-       owner  of  the  terminal  device  file.   Setting  <EM>COLUMNS</EM> and/or <EM>LINES</EM>
-       overrides the library's use  of  the  screen  size  obtained  from  the
+       It is important that your application  use  the  correct  screen  size.
+       Automatic   detection   thereof  is  not  always  possible  because  an
+       application may  be  running  on  a  host  that  does  not  honor  NAWS
+       (Negotiations  About  Window  Size)  or as a different user ID than the
+       owner of the  terminal  device  file.   Setting  <EM>COLUMNS</EM>  and/or  <EM>LINES</EM>
+       overrides  the  library's  use  of  the  screen  size obtained from the
        operating system.
 
        The  <EM>COLUMNS</EM>  and  <EM>LINES</EM>  variables  may  be  specified  independently.
-       <EM>ncurses</EM> enforces an upper limit of 512 on each when reading the  value.
-       This  property  is  useful to circumvent misfeatures of legacy terminal
-       type descriptions; <STRONG>xterm(1)</STRONG> descriptions specifying 65 lines were  once
-       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
+       <EM>ncurses</EM>  enforces an upper limit of 512 on each when reading the value.
+       This property is useful to circumvent misfeatures  of  legacy  terminal
+       type  descriptions; <STRONG>xterm(1)</STRONG> descriptions specifying 65 lines were once
+       notorious.   For  best  results,  avoid  specifying  <STRONG>cols</STRONG>   and   <STRONG>lines</STRONG>
        capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
 
-       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
-       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>  can  disable use of the process environment in determining
+       the screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to  match
        the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
-       press  of  the  "Escape"  key on the input device from one beginning an
+       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
        <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
-       receiving  the  escape  character  to  see  if  further  characters are
-       available on the input  stream  within  a  short  interval.   A  global
-       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
+       receiving the  escape  character  to  see  if  further  characters  are
+       available  on  the  input  stream  within  a  short interval.  A global
+       variable <STRONG>ESCDELAY</STRONG> stores this interval in  milliseconds.   The  default
        value of 1000 (one second) is adequate for most uses.  This environment
-       variable  overrides  it;  <EM>ncurses</EM> enforces an upper limit of 30,000 (30
+       variable overrides it; <EM>ncurses</EM> enforces an upper limit  of  30,000  (30
        seconds) when reading the value.
 
-       The most common instance where you may wish to change this value is  to
+       The  most common instance where you may wish to change this value is to
        work with a remote host over a slow communication channel.  If the host
-       running a <EM>curses</EM> application does not  receive  the  characters  of  an
-       escape  sequence  in a timely manner, the library can interpret them as
+       running  a  <EM>curses</EM>  application  does  not receive the characters of an
+       escape sequence in a timely manner, the library can interpret  them  as
        multiple key stroke events.
 
        <STRONG>xterm(1)</STRONG> mouse events are a form of escape sequence; therefore, if your
-       application  makes  heavy  use  of  multiple-clicking,  you may wish to
-       lengthen the default value because the delay applies to  the  composite
+       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+       lengthen  the  default value because the delay applies to the composite
        multi-click event as well as the individual clicks.
 
-       Portable  applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG> in
-       either form, but setting  the  environment  variable  rather  than  the
+       Portable applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG>  in
+       either  form,  but  setting  the  environment  variable rather than the
        global variable does not create problems when compiling an application.
 
-       If  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  is  disabled  for  the <EM>curses</EM> window receiving input, a
+       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
        program must disambiguate escape sequences itself.
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       <EM>ncurses</EM> may read and write auxiliary terminal descriptions in  <EM>.termcap</EM>
+       <EM>ncurses</EM>  may read and write auxiliary terminal descriptions in <EM>.termcap</EM>
        and <EM>.terminfo</EM> files in the user's home directory.
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       This  counterpart  to  <EM>COLUMNS</EM>  specifies  the  height of the screen in
-       characters.  The corresponding <EM>terminfo</EM> capability and code  is  <STRONG>lines</STRONG>.
+       This counterpart to <EM>COLUMNS</EM> specifies  the  height  of  the  screen  in
+       characters.   The  corresponding <EM>terminfo</EM> capability and code is <STRONG>lines</STRONG>.
        See the description of the <EM>COLUMNS</EM> variable above.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
-       with other platforms, such that 1 is the left button, 2 the right,  and
-       3  the  middle.   This  variable customizes the mouse button numbering.
-       Its value must be three digits 1-3 in any order.  By  default,  <EM>ncurses</EM>
+       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+       with  other platforms, such that 1 is the left button, 2 the right, and
+       3 the middle.  This variable customizes  the  mouse  button  numbering.
+       Its  value  must be three digits 1-3 in any order.  By default, <EM>ncurses</EM>
        assumes a numbering of "132".
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       If  set,  this  variable  overrides  the  <EM>ncurses</EM> library's compiled-in
-       assumption that the terminal's default colors are white on  black;  see
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.   Set  the  foreground  and background color values
-       with this environment variable  by  assigning  it  two  integer  values
+       If set, this  variable  overrides  the  <EM>ncurses</EM>  library's  compiled-in
+       assumption  that  the terminal's default colors are white on black; see
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.  Set the foreground  and  background  color  values
+       with  this  environment  variable  by  assigning  it two integer values
        separated  by  a  comma,  indicating  foregound  and  background  color
        numbers, respectively.
 
-       For example, to tell <EM>ncurses</EM> not to assume anything about  the  colors,
-       use  a  value  of  "-1,-1".   To make the default color scheme green on
-       black, use "2,0".  <EM>ncurses</EM> accepts integral values from -1  up  to  the
+       For  example,  to tell <EM>ncurses</EM> not to assume anything about the colors,
+       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+       black,  use  "2,0".   <EM>ncurses</EM> accepts integral values from -1 up to the
        value of the <EM>terminfo</EM> <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>) capability.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       (MinGW   port  only)  The  <EM>Console2</EM>  program  defectively  handles  the
-       Microsoft Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.   Applications
-       that  use it will hang.  However, it is possible to simulate the action
-       of this call by mapping coordinates, explicitly  saving  and  restoring
-       the  original  screen contents.  Setting the environment variable <EM>NCGDB</EM>
+       (MinGW  port  only)  The  <EM>Console2</EM>  program  defectively  handles   the
+       Microsoft  Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.  Applications
+       that use it will hang.  However, it is possible to simulate the  action
+       of  this  call  by mapping coordinates, explicitly saving and restoring
+       the original screen contents.  Setting the environment  variable  <EM>NCGDB</EM>
        has the same effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       (Linux only) When <EM>ncurses</EM> is configured to use the GPM interface,  this
-       variable  may  list  one  or  more  terminal  type  names, delimited by
-       vertical bars (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM>  variable  (see
-       below)  is  matched.   An empty value disables the GPM interface, using
-       <EM>ncurses</EM>'s built-in support for <STRONG>xterm(1)</STRONG> mouse  protocols  instead.   If
-       the  variable  is absent, <EM>ncurses</EM> attempts to open GPM if <EM>TERM</EM> contains
+       (Linux  only) When <EM>ncurses</EM> is configured to use the GPM interface, this
+       variable may list  one  or  more  terminal  type  names,  delimited  by
+       vertical  bars  (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM> variable (see
+       below) is matched.  An empty value disables the  GPM  interface,  using
+       <EM>ncurses</EM>'s  built-in  support  for <STRONG>xterm(1)</STRONG> mouse protocols instead.  If
+       the variable is absent, <EM>ncurses</EM> attempts to open GPM if  <EM>TERM</EM>  contains
        "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
-       some  cases,  your  terminal  driver may not handle them properly.  Set
+       <EM>ncurses</EM>  may  use  tab  characters in cursor movement optimization.  In
+       some cases, your terminal driver may not  handle  them  properly.   Set
        this environment variable to any value to disable the feature.  You can
        also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Many  terminals  store  video  attributes  as a property of a character
-       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
-       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
-       display, switching attributes on or off, similarly to tags in a  markup
-       language;  these  are  termed "magic cookies", and must be subsequently
-       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
+       Many terminals store video attributes as  a  property  of  a  character
+       cell,  as  <EM>curses</EM>  does.   Historically, some recorded changes in video
+       attributes as data that  logically  <EM>occupies</EM>  character  cells  on  the
+       display,  switching attributes on or off, similarly to tags in a markup
+       language; these are termed "magic cookies", and  must  be  subsequently
+       overprinted.   If  the  <EM>terminfo</EM>  entry for your terminal type does not
        adequately describe its handling of magic cookies, set this variable to
        any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
-       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
-       terminal emulator programs that run in a windowing environment.   These
-       programs  can  duplicate  all  of  the important features of a hardware
-       terminal, but often lack their limitations.  Chief among  these  absent
+       hardware  devices.   Many  people  use  <EM>curses</EM>-based  applications   in
+       terminal  emulator programs that run in a windowing environment.  These
+       programs can duplicate all of the  important  features  of  a  hardware
+       terminal,  but  often lack their limitations.  Chief among these absent
        drawbacks is the problem of data flow management; that is, limiting the
-       speed of communication to what the hardware  could  handle.   Unless  a
-       hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), an application must manage flow itself  to  prevent
+       speed  of  communication  to  what the hardware could handle.  Unless a
+       hardware terminal is interfaced into  a  terminal  concentrator  (which
+       does  flow  control), an application must manage flow itself to prevent
        overruns and data loss.
 
-       A  solution  that  comes  at  no hardware cost is for an application to
-       pause after directing a  terminal  to  execute  an  operation  that  it
-       performs  slowly,  such  as  clearing  the display.  Many terminal type
-       descriptions, including that for the VT100, embed delay  specifications
-       in  capabilities.   You  may  wish  to  use these terminal descriptions
-       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
-       value  to disable all but mandatory padding.  Mandatory padding is used
+       A solution that comes at no hardware cost  is  for  an  application  to
+       pause  after  directing  a  terminal  to  execute  an operation that it
+       performs slowly, such as clearing  the  display.   Many  terminal  type
+       descriptions,  including that for the VT100, embed delay specifications
+       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+       without  paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to any
+       value to disable all but mandatory padding.  Mandatory padding is  used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
-       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
-       buffered output when initializing the terminal.  This was done,  as  in
-       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
-       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
-       Setting  this  variable  disabled  output buffering, leaving the output
+       (Obsolete)  Prior to internal changes developed in <EM>ncurses</EM> 5.9 (patches
+       20120825 through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable  fully
+       buffered  output  when initializing the terminal.  This was done, as in
+       SVr4 <EM>curses</EM>, to increase performance.  For testing  purposes,  both  of
+       <EM>ncurses</EM>  and  of  certain applications, this feature was made optional.
+       Setting this variable disabled output  buffering,  leaving  the  output
        stream in the original (usually line-buffered) mode.
 
-       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
-       workaround;  it  does  not  modify the buffering of the standard output
-       stream.  This approach makes signal handling, as for  interrupts,  more
-       robust.   A  drawback  is  that  certain  unconventional programs mixed
-       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
-       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
+       Nowadays,  <EM>ncurses</EM> performs its own buffering and does not require this
+       workaround; it does not modify the buffering  of  the  standard  output
+       stream.   This  approach makes signal handling, as for interrupts, more
+       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+       <STRONG>stdio(3)</STRONG>  calls  with <EM>ncurses</EM> calls and (usually) got the behavior they
+       expected.  This is no longer the case; <EM>ncurses</EM> does not  write  to  the
        standard output file descriptor through a <EM>stdio</EM>-buffered stream.
 
-       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
-       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
+       As  a  special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still use the
+       standard output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG>  do
        not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
-       special   cases   where   VT100   forms-drawing   characters  (and  the
-       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
+       At  initialization,  <EM>ncurses</EM> inspects the <EM>TERM</EM> environment variable for
+       special  cases  where   VT100   forms-drawing   characters   (and   the
+       corresponding  alternate character set <EM>terminfo</EM> capabilities) are known
        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
-       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
+       virtual console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.   Set
        this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
        terminal's ACS support is broken; the library then outputs Unicode code
        points that correspond to the forms-drawing characters.  Set it to zero
        (or a non-integer) to disable the special check for terminal type names
-       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
+       matching  "linux" or "screen", directing <EM>ncurses</EM> to assume that the ACS
        feature works if the terminal type description advertises it.
 
-       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
+       As an alternative to use  of  this  variable,  <EM>ncurses</EM>  checks  for  an
        extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
        <STRONG>-x</STRONG>".  Examples follow.
 
@@ -1043,62 +1045,62 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
+       The two-character name "U8" was chosen to permit its use via  <EM>ncurses</EM>'s
        <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
-       this  variable's  presence.   If  defined  with  an integral value, the
+       At  initialization, <EM>ncurses</EM> (in its debugging configuration) checks for
+       this variable's presence.  If  defined  with  an  integral  value,  the
        library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
-       many  are  similar.   It  is commonly set by terminal emulators to help
-       applications find a  workable  terminal  description.   Some  choose  a
-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
-       an exact fit to their capabilities.  Not infrequently,  an  application
-       will  have  problems  with that approach; for example, a key stroke may
-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+       The  <EM>TERM</EM> variable denotes the terminal type.  Each is distinct, though
+       many are similar.  It is commonly set by  terminal  emulators  to  help
+       applications  find  a  workable  terminal  description.   Some choose a
+       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+       an  exact  fit to their capabilities.  Not infrequently, an application
+       will have problems with that approach; for example, a  key  stroke  may
+       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
        characters on the screen.
 
-       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
-       applications communicate with the terminal.   Likewise,  as  a  general
-       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
+       Setting <EM>TERM</EM> has no effect on hardware operation; it  affects  the  way
+       applications  communicate  with  the  terminal.  Likewise, as a general
+       rule (<STRONG>xterm(1)</STRONG> being a rare exception), terminal emulators  that  allow
        you to specify <EM>TERM</EM> as a parameter or configuration value do not change
        their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
-       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
-       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
-       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
-       should  contain  either  a terminal description (with newlines stripped
-       out), or a file name indicating where the information required  by  the
+       type  description  in  <EM>termcap</EM>  format if one in <EM>terminfo</EM> format is not
+       available.  Setting this variable directs <EM>ncurses</EM> to ignore  the  usual
+       <EM>termcap</EM>  database  location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM> below.  <EM>TERMCAP</EM>
+       should contain either a terminal description  (with  newlines  stripped
+       out),  or  a file name indicating where the information required by the
        <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM>  can  be configured to read terminal type description databases
-       in various locations using different formats.  This variable  overrides
+       <EM>ncurses</EM> can be configured to read terminal type  description  databases
+       in  various locations using different formats.  This variable overrides
        the default location.
 
-       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
-           tree using subdirectories named by the common first letters of  the
+       <STRONG>o</STRONG>   Descriptions in <EM>terminfo</EM> format are normally stored in a  directory
+           tree  using subdirectories named by the common first letters of the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
-           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
+           name  its  location,  such  as  <EM>/usr/share/terminfo.db</EM>, rather than
            <EM>/usr/share/terminfo/</EM>.
 
-       The  hashed  database  uses less disk space and is a little faster than
+       The hashed database uses less disk space and is a  little  faster  than
        the directory tree.  However, some applications assume the existence of
        the directory tree, and read it directly rather than using the <EM>terminfo</EM>
        API.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
+       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  configured with <EM>termcap</EM> support, this variable may
            contain the location of a <EM>termcap</EM> file.
 
        <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
@@ -1108,10 +1110,10 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                   TERMINFO=$(infocmp -0 -Q2 -q)
                   export TERMINFO
 
-           The  compiled  description  is  used  only if it corresponds to the
+           The compiled description is used only  if  it  corresponds  to  the
            terminal type identified by <EM>TERM</EM>.
 
-       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
+       Setting  <EM>TERMINFO</EM>  is  the  simplest,  but  not the only, way to direct
        <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
        <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
@@ -1129,16 +1131,16 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
-       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
-       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
-       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
+       This  variable  specifies  a  list of locations, akin to <EM>PATH</EM>, in which
+       <EM>ncurses</EM> searches  for  the  terminal  type  descriptions  described  by
+       <EM>TERMINFO</EM>  above.   The  list  items are separated by colons on Unix and
+       semicolons on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a  corresponding
        feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
        If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
-       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
+       <EM>ncurses</EM> checks the contents of <EM>TERMPATH</EM>, a list of locations,  akin  to
        <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
        list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
@@ -1148,9 +1150,9 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
-       options given to the <EM>configure</EM> script when building the  library.   Run
-       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
+       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
+       options  given  to the <EM>configure</EM> script when building the library.  Run
+       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        <STRONG>--disable-overwrite</STRONG>
@@ -1159,24 +1161,24 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This  option  is used to avoid file name conflicts between <EM>ncurses</EM>
-            and an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM>  is
-            installed  disabling  overwrite,  it  puts  its  header files in a
+            This option is used to avoid file name conflicts  between  <EM>ncurses</EM>
+            and  an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM> is
+            installed disabling overwrite, it  puts  its  header  files  in  a
             subdirectory.  Here is an example.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            Installation also omits a  symbolic  link  that  would  cause  the
-            compiler's  <STRONG>-lcurses</STRONG>  option  to  link  object  files with <EM>ncurses</EM>
+            Installation  also  omits  a  symbolic  link  that would cause the
+            compiler's <STRONG>-lcurses</STRONG> option  to  link  object  files  with  <EM>ncurses</EM>
             instead of the system <EM>curses</EM> library.
 
-            The directory used by this configuration of <EM>ncurses</EM>  is  shown  in
+            The  directory  used  by this configuration of <EM>ncurses</EM> is shown in
             section "SYNOPSIS" above.
 
        <STRONG>--enable-widec</STRONG>
-            The   configure   script   renames   the   library   and  (if  the
-            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
-            different  subdirectory.   All  of  the  library  names have a "w"
+            The  configure  script   renames   the   library   and   (if   the
+            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
+            different subdirectory.  All of  the  library  names  have  a  "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1185,62 +1187,62 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You must also enable the wide-character  features  in  the  header
-            file  when  compiling  for  the  wide-character library to use the
-            extended (wide-character) functions.   The  symbol  which  enables
+            You  must  also  enable  the wide-character features in the header
+            file when compiling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The  symbol which enables
             these features has changed since X/Open Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
+            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
+            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
                 to 500.
 
-            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
-                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
+            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
+                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
-                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
-                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
+                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
+                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The  <EM>curses.h</EM> header file installed for the wide-character library
-            is designed to be compatible with the non-wide  library's  header.
-            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
+            The <EM>curses.h</EM> header file installed for the wide-character  library
+            is  designed  to be compatible with the non-wide library's header.
+            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character  library's  headers  should  be installed last, to allow
+            character library's headers should be  installed  last,  to  allow
             applications to be built using either library from the same set of
             headers.
 
        <STRONG>--with-pthread</STRONG>
-            The  configure  script  renames  the  library.  All of the library
-            names have a "t"  appended  to  them  (before  any  "w"  added  by
+            The configure script renames the  library.   All  of  the  library
+            names  have  a  "t"  appended  to  them  (before  any "w" added by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to  set  these  values.   Some applications (very few) may require
+            to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
        <STRONG>--with-shared</STRONG>
        <STRONG>--with-normal</STRONG>
        <STRONG>--with-debug</STRONG>
        <STRONG>--with-profile</STRONG>
-            The shared and normal  (static)  library  names  differ  by  their
-            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+            The  shared  and  normal  (static)  library  names differ by their
+            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
+            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        <STRONG>--with-termlib</STRONG>
-            Low-level  functions  which do not depend upon whether the library
+            Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
-            By doing this, it is possible to share the tinfo  library  between
-            wide/normal  configurations  as  well  as  reduce  the size of the
+            By  doing  this, it is possible to share the tinfo library between
+            wide/normal configurations as well  as  reduce  the  size  of  the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1260,8 +1262,8 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        <STRONG>--with-trace</STRONG>
-            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
-            is  sometimes  useful  to  configure  this  in the shared library.
+            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
+            is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1275,213 +1277,213 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open  Curses permits most functions it specifies to be made available
+       X/Open Curses permits most functions it specifies to be made  available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
+       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
            another operation), and
 
        <STRONG>o</STRONG>   in a few special cases.
 
-       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
-       redirected to something that is not  a  terminal  device,  the  library
-       writes  screen updates to the standard error file descriptor.  This was
+       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
+       redirected  to  something  that  is  not a terminal device, the library
+       writes screen updates to the standard error file descriptor.  This  was
        an undocumented feature of SVr3 <EM>curses</EM>.
 
-       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
+       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
+       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
        terminals, including <STRONG>xterm(1)</STRONG>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
-       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
+       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
+       when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open  Curses  by  allowing  the  application  programmer  to   define
-       additional  key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
+       X/Open   Curses  by  allowing  the  application  programmer  to  define
+       additional key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
        <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
-       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
-       application to reset  the  terminal  to  its  original  foreground  and
-       background  colors.  From a user's perspective, the application is able
-       to draw colored text on a background whose color is set  independently,
+       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
+       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From a user's perspective, the application is  able
+       to  draw colored text on a background whose color is set independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>SCREEN</EM> and <EM>WINDOW</EM>
-       structure  internals,  instead  using  accessor   functions   such   as
+       An <EM>ncurses</EM> application  can  eschew  knowledge  of  <EM>SCREEN</EM>  and  <EM>WINDOW</EM>
+       structure   internals,   instead   using  accessor  functions  such  as
        <STRONG><A HREF="curs_inopts.3x.html">is_cbreak(3x)</A></STRONG> and <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
+       <EM>ncurses</EM> enables an application  to  direct  its  output  to  a  printer
        attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
-       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that can gather color  information  from  them  when  many  colors  are
+       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
+       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that  can  gather  color  information  from  them  when many colors are
        supported.
 
-       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
+       <EM>ncurses</EM>   permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;    see
        <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
 
-       Rudimentary support for multi-threaded applications may  be  available;
+       Rudimentary  support  for multi-threaded applications may be available;
        see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       Functions  that ease the management of multiple screens can be exposed;
+       Functions that ease the management of multiple screens can be  exposed;
        see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
-       offers  functions  to  more  aggressively  free  memory  it dynamically
+       To  aid  applications  to  debug their memory usage, <EM>ncurses</EM> optionally
+       offers functions  to  more  aggressively  free  memory  it  dynamically
        allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       The library facilitates auditing and troubleshooting of  its  behavior;
+       The  library  facilitates auditing and troubleshooting of its behavior;
        see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
-       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
+       Compiling <EM>ncurses</EM> with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to  fall  back
+       to  reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
        <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
-       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
-       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
+       recommended,  as  it essentially includes an entire <EM>termcap</EM> compiler in
+       the <EM>ncurses</EM> startup code, at a cost in  memory  usage  and  application
        launch latency.
 
-       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
+       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
-       Curses, and supports all features of  its  enhanced  level  except  the
+       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
+       Curses,  and  supports  all  features  of its enhanced level except the
        <EM>untic</EM> utility.
 
-       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
+       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
+       In  many cases, X/Open Curses is vague about error conditions, omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
-       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
-       is  done  primarily  to  guard  against programmer error.  The standard
+       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
+       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
+       is done primarily to guard  against  programmer  error.   The  standard
        interface does not provide a way for the library to tell an application
-       which  of several possible errors occurred.  An application that relies
-       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
+       which of several possible errors occurred.  An application that  relies
+       on  <EM>ncurses</EM>  to  check  its function parameters for validity limits its
        portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
-       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
+       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
+       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
-       NUL  bytes  to the device.  This method is slightly more expensive, but
-       narrows  the  interface  to   the   Unix   kernel   significantly   and
+       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
+       NUL bytes to the device.  This method is slightly more  expensive,  but
+       narrows   the   interface   to   the   Unix  kernel  significantly  and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
+           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
        <STRONG>o</STRONG>   The first <EM>curses</EM>, in 4BSD, provided a <EM>curses.h</EM> file.
 
-           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
+           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
-           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
+           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
+           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
+       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
-           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
+           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
+           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
+       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
            <EM>unctrl.h</EM>.
 
-           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
+           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
+       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
            HP-UX and AIX.
 
-           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
+           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again, <EM>ncurses</EM> and
+           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again,  <EM>ncurses</EM>  and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
+       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
            require it to do so.
 
-           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
-           and must include both header files in the same  module.   Very  old
-           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
+           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
+           and  must  include  both header files in the same module.  Very old
+           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
            <EM>term.h</EM>.
 
-           The header files supplied by <EM>ncurses</EM> include the  standard  library
-           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
-           files can be included in  any  order.   But  for  portability,  you
+           The  header  files supplied by <EM>ncurses</EM> include the standard library
+           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
+           files  can  be  included  in  any  order.  But for portability, you
            should include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
-           file does not necessarily make visible all of  the  symbols  in  it
+       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
+           file  does  not  necessarily  make visible all of the symbols in it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
-           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
-           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
+           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
+           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
+           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
-           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
-           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
+           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
+           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
+           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
-           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
-           possibility that an application might include either  <EM>varargs.h</EM>  or
-           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
-           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
-           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
-           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
-           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
-           call's actual parameters against the formal ones  declared  in  its
+           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
+           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
+           possibility  that  an application might include either <EM>varargs.h</EM> or
+           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
+           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
+           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
+           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
+           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
+           call's  actual  parameters  against the formal ones declared in its
            prototype.
 
-           No   conforming   implementations   of  X/Open  Curses  require  an
+           No  conforming  implementations  of  X/Open   Curses   require   an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
+           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1495,7 +1497,7 @@ <H1 class="no-header">ncurses 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index f9496ff81..a69e38627 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240622).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240720).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index b224fd393..6920a9982 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>wresize 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -54,40 +54,53 @@ <H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>wresize(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wresize(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  <EM>ncurses</EM>  extension  to  standard <EM>curses</EM> reallocates storage for a
-       <EM>curses</EM> window to adjust its dimensions to  the  specified  values.   If
-       either dimension is larger than its current value, the expanded part of
-       the window  is  filled  with  blanks  merged  with  current  background
-       rendition (as set by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>).
+       <STRONG>wresize</STRONG>,  an  <EM>ncurses</EM>  extension  to  the  <EM>curses</EM>  library, reallocates
+       storage for <EM>win</EM>, adjusting its dimensions to  <EM>lines</EM>  and  <EM>columns</EM>.   If
+       either  dimension  is  larger than its current value, <EM>ncurses</EM> fills the
+       expanded part of the window with  the  blank  character  configured  by
+       <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character API users: <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wresize</STRONG>  returns  <STRONG>ERR</STRONG>  upon failure and <STRONG>OK</STRONG> on success.  It will fail if
-       either of the dimensions is less than or equal to zero, or if an  error
-       occurs while (re)allocating memory for the window.
+       <STRONG>wresize</STRONG>  returns  <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.  It fails if either
+       <EM>lines</EM> or <EM>columns</EM> is less than or equal to zero, or if an  error  occurs
+       while (re)allocating memory for <EM>win</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  only  restriction placed on the dimensions is that they be greater
-       than zero.  They are <EM>not</EM> compared to the <EM>curses</EM> screen dimensions; this
-       keeps  the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.  The caller must ensure that
-       the window's dimensions fit within the actual screen dimensions.
+       The  only restriction placed on the values of <EM>lines</EM> and <EM>columns</EM> is that
+       they be greater than zero.  They are <EM>not</EM> compared to the dimensions  of
+       the  <EM>curses</EM> screen; this keeps the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.  The
+       caller must ensure that  <EM>win</EM>'s  dimensions  fit  within  those  of  the
+       screen.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>wresize</STRONG>  is  an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in SVr4 <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       NetBSD  <EM>curses</EM> adopted <STRONG>wresize</STRONG> in 2001 (release 1.5.3), and <EM>PDCurses</EM> in
+       2004 (version 2.7).
+
        It is not possible to resize windows with SVr4 <EM>curses</EM>.
 
-       <EM>ncurses</EM> introduced this extension in mid-1995.  NetBSD  <EM>curses</EM>  adopted
-       it in 2001, and <EM>PDCurses</EM> in 2003.
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       Thomas Dickey developed <STRONG>wresize</STRONG> as an extension to BSD <EM>curses</EM> in  1988,
+       and brought it to <EM>ncurses</EM> in mid-1995.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
-       <EM>curses</EM>).
+       Thomas Dickey
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -95,7 +108,7 @@ <H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2024-07-20                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -104,7 +117,9 @@ <H1 class="no-header">wresize 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index ccddafdea..cc73aafea 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp $
-.TH curs_add_wch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp $
+.TH curs_add_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -132,8 +132,8 @@ Backspace moves the cursor one character left;
 at the left margin of a window,
 it does nothing.
 .bP
-Carriage return moves the cursor to the left margin on the current line
-of the window.
+Carriage return moves the cursor to the left margin on the same line of
+the window.
 .bP
 Line feed does a \fB\%clrtoeol\fP(3X),
 then advances as if from the right margin.
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index cdea7bb63..dc2c7ac15 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp $
-.TH curs_addch 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp $
+.TH curs_addch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -108,8 +108,8 @@ Backspace moves the cursor one character left;
 at the left margin of a window,
 it does nothing.
 .bP
-Carriage return moves the cursor to the left margin on the current line
-of the window.
+Carriage return moves the cursor to the left margin on the same line of
+the window.
 .bP
 Line feed does a \fB\%clrtoeol\fP(3X),
 then advances as if from the right margin.
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 848b99786..e835bd1ff 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp $
-.TH curs_addstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp $
+.TH curs_addstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,34 +58,32 @@ add a string to a \fIcurses\fR window and advance the cursor
 .nf
 \fB#include <curses.h>
 .PP
-\fBint addstr(const char *\fIstr\fP);
-\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
-\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
-\fBint waddstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+\fBint addstr(const char * \fIstr\fP);
+\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+\fBint mvwaddstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
 .PP
-\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
-\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
-\fBint mvwaddnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
-\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
+\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B waddstr
 writes the characters of the (null-terminated) string
 .I str
 to the window
-.IR win .
-Its process is similar to calling \fB\%waddch\fP(3X) for each
+.IR win ,
+as if by calling \fB\%waddch\fP(3X) for each
 .I char
 in
 .IR str .
-Control characters are processed as in \fB\%waddch\fP(3X).
 .PP
 .B waddnstr
-writes at most
+is similar,
+but writes at most
 .I n
-characters,
-or until a terminating null character occurs in
-.IR str .
+characters.
 If
 .I n
 is \-1,
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 8b2abee79..6077798c6 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp $
-.TH curs_addwstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp $
+.TH curs_addwstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,15 +58,15 @@ add a wide-character string to a \fIcurses\fR window and advance the cursor
 .nf
 \fB#include <curses.h>
 .PP
-\fBint addwstr(const wchar_t *\fIwstr\fP);
-\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
-\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
-\fBint waddwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+\fBint addwstr(const wchar_t * \fIwstr\fP);
+\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
 .PP
-\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwaddnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B waddwstr
@@ -74,8 +74,9 @@ writes the characters of the (wide-null-terminated) wide-character
 string
 .I wstr
 to the window
-.IR win .
-Its process is similar to constructing a
+.IR win ,
+as if by
+constructing a
 .I cchar_t
 for each
 .I wchar_t
@@ -83,19 +84,16 @@ in
 .IR wstr ,
 then calling \fB\%wadd_wch\fP(3X) with the resulting
 .IR cchar_t .
-.bP
-Spacing and non-spacing characters in the string
-are processed one at a time,
-and
-.bP
-control characters are processed as in \fB\%wadd_wch\fP(3X).
+.I curses
+processes spacing and non-spacing characters in
+.I wstr
+one at a time.
 .PP
 .B waddnwstr
-writes at most
+is similar,
+but writes at most
 .I n
-wide characters,
-or until a terminating wide null character occurs in
-.IR wstr .
+wide characters.
 If
 .I n
 is \-1,
@@ -141,6 +139,12 @@ may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+.SH HISTORY
+.I \%waddstr
+and
+.I \%waddnstr
+appeared late in SVr4 development (1995).
+.\" SVID 4, vol 3., p. 478
 .SH SEE ALSO
 \fB\%curs_addstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index c0e9de21f..bc90da919 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp $
-.TH curs_beep 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp $
+.TH curs_beep 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -46,7 +46,7 @@ and
 .B flash
 alert the terminal user:
 the former by sounding the terminal's audible alarm,
-and the latter by visibly attracting user attention.
+and the latter by visibly attracting attention.
 Commonly,
 a terminal implements a visual bell by momentarily reversing the
 character foreground and background colors on the entire display;
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index e58d326fb..e0caac6d9 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp $
-.TH curs_get_wch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp $
+.TH curs_get_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -173,18 +173,14 @@ A single input queue serves all windows associated with the terminal.
 .B \%wget_wch
 returns
 .B OK
-when it reads a wide character and
+when it reads a wide character,
 .B \%KEY_CODE_YES
-when it reads a function key code.
-It returns
+when it reads a function key code,
+and
 .B ERR
-if
-.bP
-the
-.I \%WINDOW
-pointer is
-.BR NULL ","
-or
+on failure.
+.B \%wget_wch
+fails if
 .bP
 its timeout expires without any data arriving,
 or
@@ -195,6 +191,11 @@ in which case
 is set to
 .BR \%EINTR "."
 .PP
+Functions taking a
+.I \%WINDOW
+pointer argument fail if the pointer is
+.BR NULL "."
+.PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
 .RI ( y ,
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index a66e68a25..ccc3b5bbf 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp $
-.TH curs_getch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp $
+.TH curs_getch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -438,27 +438,18 @@ its parameter as a key code value.
 See also
 \fB\%define_key\fP(3X) and \fB\%key_defined\fP(3X).
 .SH RETURN VALUE
-Except for
-.BR \%has_key ","
-these functions return
-.B OK
-on success and
+.B \%wgetch
+returns a key code identifying the key event as described above,
+which may include
+.B \%KEY_RESIZE
+or
+.B \%KEY_MOUSE
+indicating non-key events,
+or
 .B ERR
 on failure.
-.PP
-Functions taking a
-.I \%WINDOW
-pointer argument fail if the pointer is
-.BR NULL "."
-.PP
-Functions prefixed with \*(``mv\*('' first perform cursor movement and
-fail if the position
-.RI ( y ,
-.IR x ")"
-is outside the window boundaries.
-.PP
 .B \%wgetch
-also fails if
+fails if
 .bP
 its timeout expires without any data arriving,
 or
@@ -470,6 +461,12 @@ is set to
 .BR \%EINTR "."
 .PP
 .B \%ungetch
+returns
+.B OK
+on success and
+.B ERR
+on failure.
+.B \%ungetch
 fails if there is no more room in the input queue.
 .PP
 .B \%has_key
@@ -477,6 +474,17 @@ returns
 .B TRUE
 or
 .BR FALSE "."
+.PP
+Functions taking a
+.I \%WINDOW
+pointer argument fail if the pointer is
+.BR NULL "."
+.PP
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x ")"
+is outside the window boundaries.
 .SH NOTES
 .BR \%getch ","
 .BR \%mvgetch ","
diff --git a/man/curs_move.3x b/man/curs_move.3x
index c3b68e813..3a16076f1 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp $
-.TH curs_move 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp $
+.TH curs_move 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -38,7 +38,7 @@ move cursor in a \fIcurses\fR window
 \fB#include <curses.h>
 .PP
 \fBint move(int \fIy\fP, int \fIx\fP);
-\fBint wmove(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBint wmove(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
 .B \%wmove
@@ -83,6 +83,10 @@ may be implemented as a macro.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+4BSD (1980)
+.I curses
+introduced
+.IR \%wmove "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X)
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index ef6b5f083..79fbba2a1 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.77 2024/06/22 22:20:56 tom Exp $
+# $Id: man_db.renames.in,v 1.78 2024/07/20 20:55:37 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -215,6 +215,7 @@ immedok.3x			immedok.3ncurses
 in_wch.3x			in_wch.3ncurses
 inch.3x				inch.3ncurses
 initscr.3x			initscr.3ncurses
+is_cbreak.3x			is_cbreak.3ncurses
 is_scrollok.3x			is_scrollok.3ncurses
 keyname.3x			keyname.3ncurses
 keypad.3x			keypad.3ncurses
diff --git a/man/ncurses.3x b/man/ncurses.3x
index b41af1007..19498891b 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp $
-.TH ncurses 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp $
+.TH ncurses 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -86,7 +86,6 @@ abstraction and subdivision thereof with
 and
 .IR pads ;
 acquisition of keyboard and mouse events;
-control of terminal input and output options;
 selection of color and rendering attributes
 (such as bold or underline);
 the definition and use of
@@ -528,7 +527,9 @@ and character attribute manipulation functions like
 .RS 10 \" same as foregoing tag width
 .TP 9 \" "cchar_t" + 2n
 .I \%cchar_t
-corresponds to the non-wide configuration's
+is a
+.I "curses complex character"
+and corresponds to the non-wide configuration's
 .IR \%chtype .
 It is a structure type
 because it requires more storage than a standard scalar type offers.
@@ -1117,7 +1118,8 @@ If that value is absent or invalid,
 .I \%ncurses
 uses 9600.
 This feature allows developers to construct repeatable test cases
-that take into account optimization decisions that depend on baud rate.
+that take into account optimization decisions that depend
+on the terminal's line speed.
 .SS "\fICC\fP (command character)"
 When set,
 the
diff --git a/man/wresize.3x b/man/wresize.3x
index b67feada0..327c51a8b 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH wresize 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp $
+.TH wresize 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -38,35 +38,93 @@ resize a \fIcurses\fR window
 .nf
 \fB#include <curses.h>
 .PP
-\fBint wresize(WINDOW *\fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint wresize(WINDOW * \fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
 .fi
 .SH DESCRIPTION
-This \fI\%ncurses\fP extension to standard \fIcurses\fP reallocates
-storage for a \fIcurses\fP window to adjust its dimensions to the
-specified values.
+.BR \%wresize ","
+an
+.I \%ncurses
+extension to the
+.I curses
+library,
+reallocates storage for
+.IR win ,
+adjusting its dimensions to
+.I lines
+and
+.IR columns "."
 If either dimension is larger than its current value,
-the expanded part of the window is filled with blanks merged with
-current background rendition
-(as set by \fB\%wbkgdset\fP(3X)).
+.I \%ncurses
+fills the expanded part of the window with the blank character
+configured by \fB\%wbkgdset\fP(3X)
+(wide-character API users: \fB\%wbkgrndset\fP(3X)).
 .SH RETURN VALUE
-\fB\%wresize\fP returns \fBERR\fP upon failure and \fBOK\fP on success.
-It will fail if either of the dimensions is less than or equal to zero,
-or if an error occurs while (re)allocating memory for the window.
+.B \%wresize
+returns
+.B OK
+on success and
+.B ERR
+on failure.
+It fails if either
+.I lines
+or
+.I columns
+is less than or equal to zero,
+or if an error occurs while (re)allocating memory for
+.IR win "."
 .SH NOTES
-The only restriction placed on the dimensions is that they be greater
-than zero.
-They are \fInot\fP compared to the \fIcurses\fP screen dimensions;
+The only restriction placed on the values of
+.I lines
+and
+.I columns
+is that they be greater than zero.
+They are
+.I not
+compared to the dimensions of the
+.I curses
+screen;
 this keeps the logic of \fB\%resizeterm\fP(3X) simple.
-The caller must ensure that the window's dimensions fit within the
-actual screen dimensions.
+The caller must ensure that
+.IR win 's
+dimensions fit within those of the screen.
+.SH EXTENSIONS
+.B \%wresize
+is an \fB\%ncurses\fP(3X) extension,
+and is not found in SVr4
+.IR curses ","
+4.4BSD
+.IR curses ","
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
-It is not possible to resize windows with SVr4 \fIcurses\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-\fI\%ncurses\fP introduced this extension in mid-1995.
-NetBSD \fIcurses\fP adopted it in 2001,
-and \fI\%PDCurses\fP in 2003.
+NetBSD
+.I curses
+adopted
+.B \%wresize
+in 2001 (release 1.5.3),
+and
+.I \%PDCurses
+in 2004 (version 2.7).
+.PP
+It is not possible to resize windows with SVr4
+.IR curses "."
+.SH HISTORY
+Thomas Dickey developed
+.B \%wresize
+as an extension to BSD
+.I curses
+in 1988,
+and brought it to
+.I \%ncurses
+in mid-1995.
 .SH AUTHORS
 Thomas Dickey
-(from an equivalent function written in 1988 for BSD \fIcurses\fP).
 .SH SEE ALSO
 \fB\%resizeterm\fP(3X)
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 1539973fe..e7ec1e847 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.79 2021/11/06 23:36:12 tom Exp $
+# $Id: Makefile.in,v 1.80 2024/07/20 17:47:13 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -148,7 +148,7 @@ install.libs :: $(DESTDIR)$(bindir) ncurses-config
 @MAKE_PC_FILES@install \
 @MAKE_PC_FILES@install.libs :: pc-files
 @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
-@MAKE_PC_FILES@		x/*) \
+@MAKE_PC_FILES@		@GLOB_FULLPATH_ONLY@) \
 @MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
 @MAKE_PC_FILES@			for name in $(PC_FILES); do \
 @MAKE_PC_FILES@				test -f $$name || continue; \
@@ -193,7 +193,7 @@ uninstall.data :
 uninstall.libs :
 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
 @MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
-@MAKE_PC_FILES@	x/*) \
+@MAKE_PC_FILES@	@GLOB_FULLPATH_ONLY@) \
 @MAKE_PC_FILES@		for name in $(PC_FILES); do \
 @MAKE_PC_FILES@			test -f $$name || continue; \
 @MAKE_PC_FILES@			echo uninstalling $$name; \
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 2425b3a44..fc6064036 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.74 2023/09/16 16:27:44 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.75 2024/07/20 17:04:48 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -612,7 +612,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
     returnCode(result);
 }
 
-#ifdef __MING32__
+#ifdef __MINGW32__
 #define SysISATTY(fd) _isatty(fd)
 #else
 #define SysISATTY(fd) isatty(fd)
@@ -2064,14 +2064,13 @@ _nc_mingw_tcgetattr(int fd, struct termios *arg)
 int
 _nc_mingw_tcflush(int fd, int queue)
 {
-    TC_PROLOGUE(fd);
-    (void) term;
+    int code = ERR;
 
     if (_nc_mingw_isconsole(fd)) {
 	if (queue == TCIFLUSH) {
-	    BOOL b = FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
-	    if (!b)
-		return (int) GetLastError();
+	    code = (FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE))
+		    ? OK
+		    : (int) GetLastError());
 	}
     }
     return code;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 36b2c7f88..41ff2214e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240713) unstable; urgency=low
+ncurses6td (6.5+20240720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 36b2c7f88..41ff2214e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240713) unstable; urgency=low
+ncurses6td (6.5+20240720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 5145862c9..5f71d0969 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240713) unstable; urgency=low
+ncurses6td (6.5+20240720) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Jul 2024 06:06:25 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 0017437cd..a38f8c75b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.657 2024/07/13 10:06:25 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.658 2024/07/20 10:19:56 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0713"
+!define VERSION_MMDD  "0720"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b0656258b..3bf061e20 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240713
+Release: 20240720
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 3d647f7fc..163968db6 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240713
+Release: 20240720
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9f6377546..db6f96de7 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240713
+Release: 20240720
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From c329c19639c33f0fbf43c191386810f9d75ff978 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 28 Jul 2024 02:35:55 +0200
Subject: [PATCH 078/106] ncurses-6.5-20240727.patch.gz

---
 NEWS                                 |  15 +-
 VERSION                              |   2 +-
 dist.mk                              |   4 +-
 doc/html/man/curs_add_wch.3x.html    |  12 +-
 doc/html/man/curs_add_wchstr.3x.html |  52 +++---
 doc/html/man/curs_addch.3x.html      |  12 +-
 doc/html/man/curs_addchstr.3x.html   |  41 +++--
 doc/html/man/curs_addstr.3x.html     |  14 +-
 doc/html/man/curs_addwstr.3x.html    |  20 ++-
 doc/html/man/curs_attr.3x.html       | 121 +++++++-------
 doc/html/man/curs_border.3x.html     |  18 +-
 doc/html/man/curs_delch.3x.html      |  19 ++-
 doc/html/man/curs_deleteln.3x.html   |  74 +++++----
 doc/html/man/curs_extend.3x.html     |  58 ++++---
 doc/html/man/curs_in_wch.3x.html     |  24 ++-
 doc/html/man/curs_inch.3x.html       |  10 +-
 doc/html/man/curs_ins_wch.3x.html    |  26 +--
 doc/html/man/curs_ins_wstr.3x.html   |  85 +++++-----
 doc/html/man/curs_insch.3x.html      |  17 +-
 doc/html/man/curs_insstr.3x.html     |  86 +++++-----
 doc/html/man/curs_move.3x.html       |  21 ++-
 doc/html/man/curs_outopts.3x.html    |  29 ++--
 doc/html/man/curs_pad.3x.html        |  69 ++++----
 doc/html/man/curs_print.3x.html      |  61 ++++---
 doc/html/man/curs_refresh.3x.html    |  16 +-
 doc/html/man/curs_touch.3x.html      |  29 ++--
 doc/html/man/curs_util.3x.html       | 117 +++++++------
 doc/html/man/define_key.3x.html      |  10 +-
 doc/html/man/infotocap.1m.html       |  10 +-
 doc/html/man/keyok.3x.html           |  14 +-
 doc/html/man/legacy_coding.3x.html   |  33 ++--
 doc/html/man/ncurses.3x.html         |  40 ++---
 doc/html/man/terminfo.5.html         |   2 +-
 doc/html/man/wresize.3x.html         |  12 +-
 form/frm_data.c                      |   8 +-
 form/frm_driver.c                    |  65 ++++----
 form/frm_post.c                      |   6 +-
 form/frm_sub.c                       |  15 +-
 form/frm_win.c                       |  16 +-
 form/fty_enum.c                      |  48 +++---
 form/fty_generic.c                   |   6 +-
 form/fty_int.c                       |   8 +-
 form/fty_num.c                       |  10 +-
 include/capdefaults.c                |   6 +-
 man/curs_add_wch.3x                  |   7 +-
 man/curs_add_wchstr.3x               |  38 +++--
 man/curs_addch.3x                    |  11 +-
 man/curs_addchstr.3x                 |  39 +++--
 man/curs_addstr.3x                   |  14 +-
 man/curs_addwstr.3x                  |  26 +--
 man/curs_attr.3x                     | 240 +++++++++++++++++++--------
 man/curs_border.3x                   |   6 +-
 man/curs_delch.3x                    |  23 ++-
 man/curs_deleteln.3x                 | 121 +++++++++-----
 man/curs_extend.3x                   |  72 +++++---
 man/curs_in_wch.3x                   |  29 +++-
 man/curs_inch.3x                     |   8 +-
 man/curs_ins_wch.3x                  |  39 +++--
 man/curs_ins_wstr.3x                 | 121 +++++++++-----
 man/curs_insch.3x                    |  11 +-
 man/curs_insstr.3x                   | 115 ++++++++-----
 man/curs_move.3x                     |  23 ++-
 man/curs_outopts.3x                  |   7 +-
 man/curs_pad.3x                      |   7 +-
 man/curs_print.3x                    | 113 +++++++++----
 man/curs_refresh.3x                  |   6 +-
 man/curs_touch.3x                    |   9 +-
 man/curs_util.3x                     |   9 +-
 man/define_key.3x                    |   6 +-
 man/infotocap.1m                     |   6 +-
 man/keyok.3x                         |   8 +-
 man/legacy_coding.3x                 |  29 ++--
 man/manhtml.externs                  |   3 +-
 man/ncurses.3x                       |  16 +-
 man/wresize.3x                       |   8 +-
 menu/m_driver.c                      |   8 +-
 menu/m_item_vis.c                    |   6 +-
 menu/m_post.c                        |  42 ++---
 misc/terminfo.src                    |  45 ++++-
 ncurses/base/lib_addch.c             |   6 +-
 ncurses/base/lib_delch.c             |   4 +-
 ncurses/base/lib_delwin.c            |   6 +-
 ncurses/base/lib_freeall.c           |   6 +-
 ncurses/base/lib_getstr.c            |   8 +-
 ncurses/base/lib_insch.c             |   6 +-
 ncurses/base/lib_instr.c             |   6 +-
 ncurses/base/lib_mvwin.c             |   6 +-
 ncurses/base/lib_printw.c            |   8 +-
 ncurses/base/lib_screen.c            |  13 +-
 ncurses/base/lib_slkrefr.c           |   6 +-
 ncurses/base/new_pair.c              |   8 +-
 ncurses/base/resizeterm.c            |   4 +-
 ncurses/base/safe_sprintf.c          |   9 +-
 ncurses/tinfo/alloc_ttype.c          |  14 +-
 ncurses/tinfo/captoinfo.c            |   4 +-
 ncurses/tinfo/comp_parse.c           |   6 +-
 ncurses/tinfo/comp_scan.c            |   6 +-
 ncurses/tinfo/db_iterator.c          |   6 +-
 ncurses/tinfo/entries.c              |   4 +-
 ncurses/tinfo/getenv_num.c           |   6 +-
 ncurses/tinfo/home_terminfo.c        |   6 +-
 ncurses/tinfo/init_keytry.c          |   6 +-
 ncurses/tinfo/lib_print.c            |   7 +-
 ncurses/tinfo/lib_setup.c            |   6 +-
 ncurses/tinfo/lib_termcap.c          |   6 +-
 ncurses/tinfo/lib_tparm.c            |  10 +-
 ncurses/tinfo/parse_entry.c          |   6 +-
 ncurses/tinfo/read_entry.c           |  18 +-
 ncurses/tinfo/trim_sgr0.c            |   8 +-
 ncurses/tinfo/write_entry.c          |  14 +-
 ncurses/trace/lib_traceatr.c         |   4 +-
 ncurses/trace/varargs.c              |   6 +-
 ncurses/tty/hashmap.c                |   9 +-
 ncurses/widechar/lib_add_wch.c       |   8 +-
 ncurses/widechar/lib_cchar.c         |   6 +-
 ncurses/widechar/lib_get_wstr.c      |   8 +-
 ncurses/widechar/lib_in_wchnstr.c    |   6 +-
 ncurses/widechar/lib_ins_wch.c       |   6 +-
 ncurses/widechar/lib_inwstr.c        |   4 +-
 ncurses/widechar/lib_key_name.c      |   6 +-
 ncurses/widechar/lib_wunctrl.c       |   7 +-
 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 +-
 128 files changed, 1725 insertions(+), 1228 deletions(-)

diff --git a/NEWS b/NEWS
index e7f92c009..8494cd665 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4151 2024/07/20 21:54:20 tom Exp $
+-- $Id: NEWS,v 1.4155 2024/07/27 20:13:00 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240727
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ fixes for compiler warnings/cppcheck.
+	+ modify wattron/wattroff calls in form/m_post.c to call wattr_on and
+	  wattr_off to omit cast used in the former for X/Open compatibility
+	  (patch by Bill Gray).
+	+ modify wezterm, omitting its broken left/right margin feature (report
+	  by Thayne McCombs) -TD
+
 20240720
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ modify configure script and misc/Makefile to accept glob expressions
@@ -401,7 +410,7 @@ it is not possible to add this information.
 	+ minor grammatical fix for manpages (Branden Robinson).
 
 20230729
-	+ improve manpages for wgetnstr() and wget_wnstr().
+	+ improve manpages for wgetnstr() and wget_nwstr().
 	+ modify MinGW configuration to provide for running in MSYS/MSYS2
 	  shells, assuming ConPTY support (patch by Pavel Fedin).
 	+ add assignment in CF_MAN_PAGES to fill in value for TERMINFO_DIRS in
@@ -10712,7 +10721,7 @@ it is not possible to add this information.
 	  wide-character structures (report by <George.R.Goffe@seagate.com>).
 	+ ensure that _XOPEN_SOURCE_EXTENDED is defined in curses.priv.h if
 	  compiling for wide-character configuration.
-	+ make addwnstr() handle non-spacing characters (patch by Sven
+	+ make addnwstr() handle non-spacing characters (patch by Sven
 	  Verdoolaege).
 
 20010630
diff --git a/VERSION b/VERSION
index b9d967354..49944e193 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240720
+5:0:10	6.5	20240727
diff --git a/dist.mk b/dist.mk
index ef4624f63..1b269dba5 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1623 2024/07/20 10:19:56 tom Exp $
+# $Id: dist.mk,v 1.1624 2024/07/27 13:25:06 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240720
+NCURSES_PATCH = 20240727
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 6b84a450f..1f4d9d565 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -350,8 +350,8 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        The   System V   Interface  Definition,  Version  4  (1995),  specified
        functions named <EM>waddwch</EM> and <EM>wechowchar</EM> (and the usual variants).  These
        were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
-       They differed from X/Open's <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that they  each
-       took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that they
+       each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -364,7 +364,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index d96ab67d5..1d0e9798c 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -47,33 +47,33 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>add_wchstr</STRONG>,   <STRONG>add_wchnstr</STRONG>,   <STRONG>wadd_wchstr</STRONG>,  <STRONG>wadd_wchnstr</STRONG>,  <STRONG>mvadd_wchstr</STRONG>,
-       <STRONG>mvadd_wchnstr</STRONG>, <STRONG>mvwadd_wchstr</STRONG>, <STRONG>mvwadd_wchnstr</STRONG> -  add  a  <EM>curses</EM>  complex
+       <STRONG>add_wchstr</STRONG>,   <STRONG>wadd_wchstr</STRONG>,  <STRONG>mvadd_wchstr</STRONG>,  <STRONG>mvwadd_wchstr</STRONG>,  <STRONG>add_wchnstr</STRONG>,
+       <STRONG>wadd_wchnstr</STRONG>, <STRONG>mvadd_wchnstr</STRONG>, <STRONG>mvwadd_wchnstr</STRONG>  -  add  a  <EM>curses</EM>  complex
        character string to a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>add_wchstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>add_wchstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG>  <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>add_wchnstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>add_wchnstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG>  <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wadd_wchstr</STRONG>  copies  the  string  of  complex  characters <EM>wchstr</EM> to the
        window <EM>win</EM>.  A null complex character  terminates  the  string.   If  a
-       complex  character  does  completely fit at the end of the line, <EM>curses</EM>
-       fills the remaining columns with the window background; see <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.
-       <STRONG>wadd_wchnstr</STRONG> does the same, but copies at most <EM>n</EM> characters, or as many
-       as possible if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the  variants  of  these
-       functions.
+       complex  character  does  not  completely  fit  at the end of the line,
+       <EM>curses</EM> fills the remaining columns  with  the  window  background;  see
+       <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.    <STRONG>wadd_wchnstr</STRONG>  does  the  same,  but  copies  at  most  <EM>n</EM>
+       characters, or as many as possible if <EM>n</EM> is <STRONG>-1</STRONG>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes
+       the variants of these functions.
 
        Because  these  functions do not call <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> internally, they are
        faster than <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG> and <STRONG><A HREF="curs_addwstr.3x.html">waddnwstr(3x)</A></STRONG>.  On the other hand, they
@@ -93,24 +93,24 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
-       <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
        <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
        <STRONG>o</STRONG>   <EM>wchstr</EM> is <STRONG>NULL</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All  of  these  functions  except  <STRONG>wadd_wchnstr</STRONG>  may  be implemented as
+       All of these  functions  except  <STRONG>wadd_wchnstr</STRONG>  may  be  implemented  as
        macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -118,8 +118,8 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H
        The   System V   Interface  Definition,  Version  4  (1995),  specified
        functions named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and  the  usual  variants).
        These  were  later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4
-       (1989).  They differed from X/Open's <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM>  and  <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM>  in
-       that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       (1989).  They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM> and <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM>
+       in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -130,7 +130,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-06-22               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index fd978f38c..427f92aaa 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp @
+  * @Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -295,9 +295,9 @@ <H1 class="no-header">curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        foregoing  behavior.  Check whether a character can be represented as a
        single byte in the current locale.
 
-       <STRONG>o</STRONG>   If it can, call either <STRONG>waddch</STRONG> or <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   If it can, call either <EM>waddch</EM> or <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>.
 
-       <STRONG>o</STRONG>   If it cannot, use only <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+       <STRONG>o</STRONG>   If it cannot, use only <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -316,7 +316,7 @@ <H1 class="no-header">curs_addch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index b9ee20aae..07c9c457d 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -47,22 +47,22 @@ <H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addchstr</STRONG>,  <STRONG>addchnstr</STRONG>,  <STRONG>waddchstr</STRONG>,  <STRONG>waddchnstr</STRONG>, <STRONG>mvaddchstr</STRONG>, <STRONG>mvaddchnstr</STRONG>,
-       <STRONG>mvwaddchstr</STRONG>, <STRONG>mvwaddchnstr</STRONG> - add a <EM>curses</EM> character string to a window
+       <STRONG>addchstr</STRONG>,  <STRONG>waddchstr</STRONG>,  <STRONG>mvaddchstr</STRONG>,  <STRONG>mvwaddchstr</STRONG>, <STRONG>addchnstr</STRONG>, <STRONG>waddchnstr</STRONG>,
+       <STRONG>mvaddchnstr</STRONG>, <STRONG>mvwaddchnstr</STRONG> - add a <EM>curses</EM> character string to a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addchstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddchstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addchstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>addchnstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvaddchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddchnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG><EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>addchnstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvaddchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -89,14 +89,13 @@ <H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  Curses  does not specify any error conditions.  <EM>ncurses</EM> returns
-       <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
        <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
 
        <STRONG>o</STRONG>   <EM>chstr</EM> is <STRONG>NULL</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -105,7 +104,12 @@ <H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3.1 (1987) introduced <EM>waddchstr</EM> and <EM>waddchnstr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -116,7 +120,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -126,6 +130,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 8d9ce5191..550d1d7fe 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp @
+  * @Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addstr</STRONG>,  <STRONG>addnstr</STRONG>,  <STRONG>waddstr</STRONG>,  <STRONG>waddnstr</STRONG>,  <STRONG>mvaddstr</STRONG>, <STRONG>mvaddnstr</STRONG>, <STRONG>mvwaddstr</STRONG>,
+       <STRONG>addstr</STRONG>,  <STRONG>waddstr</STRONG>,  <STRONG>mvaddstr</STRONG>,  <STRONG>mvwaddstr</STRONG>,  <STRONG>addnstr</STRONG>, <STRONG>waddnstr</STRONG>, <STRONG>mvaddnstr</STRONG>,
        <STRONG>mvwaddnstr</STRONG> - add a string to a <EM>curses</EM> window and advance the cursor
 
 
@@ -55,14 +55,14 @@ <H1 class="no-header">curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 9e5d70ae3..0254d9e22 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -47,8 +47,8 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>addwstr</STRONG>,   <STRONG>addnwstr</STRONG>,   <STRONG>waddwstr</STRONG>,   <STRONG>waddnwstr</STRONG>,   <STRONG>mvaddwstr</STRONG>,  <STRONG>mvaddnwstr</STRONG>,
-       <STRONG>mvwaddwstr</STRONG>, <STRONG>mvwaddnwstr</STRONG> - add  a  wide-character  string  to  a  <EM>curses</EM>
+       <STRONG>addwstr</STRONG>,   <STRONG>waddwstr</STRONG>,   <STRONG>mvaddwstr</STRONG>,   <STRONG>mvwaddwstr</STRONG>,   <STRONG>addnwstr</STRONG>,  <STRONG>waddnwstr</STRONG>,
+       <STRONG>mvaddnwstr</STRONG>, <STRONG>mvwaddnwstr</STRONG> - add  a  wide-character  string  to  a  <EM>curses</EM>
        window and advance the cursor
 
 
@@ -56,14 +56,14 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -103,7 +103,9 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <EM>waddstr</EM> and <EM>waddnstr</EM> appeared late in SVr4 development (1995).
+       The System V Interface Definition, Version 4 (1995), specified <EM>waddwstr</EM>
+       and <EM>waddnwstr</EM> (and the usual variants).  These were later additions  to
+       SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -114,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index cb1449d2d..cc4cb8536 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -132,8 +132,8 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        into  the attribute parameter.  These newer routines use similar names,
        because X/Open simply added an underscore (<STRONG>_</STRONG>) for the newer names.
 
-       The <STRONG>int</STRONG> datatype used in the legacy routines is treated as if it is the
-       same  size  as  <STRONG>chtype</STRONG>  (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It holds the common video
+       The <EM>int</EM> datatype used in the legacy routines is treated as if it is the
+       same  size  as  <EM>chtype</EM>  (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It holds the common video
        attributes (such as bold, reverse), as well as a few  bits  for  color.
        Those  bits  correspond  to  the  <STRONG>A_COLOR</STRONG> symbol.  The <STRONG>COLOR_PAIR</STRONG> macro
        provides a value which can be OR'd into the attribute  parameter.   For
@@ -148,20 +148,20 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        (8) bits, then <STRONG>COLOR_PAIR(</STRONG><EM>259</EM><STRONG>)</STRONG> is 4 (i.e., 259 is 4 more than the limit
        255).
 
-       The  <STRONG>PAIR_NUMBER</STRONG>  macro extracts a pair number from an <STRONG>int</STRONG> (or <STRONG>chtype</STRONG>).
+       The  <STRONG>PAIR_NUMBER</STRONG>  macro extracts a pair number from an <EM>int</EM> (or <EM>chtype</EM>).
        For example, the <EM>input</EM> and <EM>output</EM> values in these statements  would  be
        the same:
 
            int value = A_BOLD | COLOR_PAIR(<EM>input</EM>);
            int <EM>output</EM> = PAIR_NUMBER(value);
 
-       The  <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 curses but kept
-       in X/Open Curses  for  the  same  reason  that  SVr4  curses  kept  it:
+       The  <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 <EM>curses</EM> but kept
+       in X/Open Curses  for  the  same  reason  that  SVr4  <EM>curses</EM>  kept  it:
        compatibility.
 
        The  remaining  <STRONG>attr</STRONG>*  functions operate exactly like the corresponding
-       <STRONG>attr_</STRONG>* functions, except that they take arguments of  type  <STRONG>int</STRONG>  rather
-       than <STRONG>attr_t</STRONG>.
+       <STRONG>attr_</STRONG>* functions, except that they take arguments of  type  <EM>int</EM>  rather
+       than <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>.
 
        There  is  no  corresponding <STRONG>attrget</STRONG> function as such in X/Open Curses,
        although <EM>ncurses</EM> provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
@@ -243,19 +243,13 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>OK</STRONG> on success, or <STRONG>ERR</STRONG> on failure.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open Curses does not specify any error conditions.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
-       This implementation
+       <STRONG>wcolor_set</STRONG> returns <STRONG>ERR</STRONG> if <EM>pair</EM> is outside the range <STRONG>0</STRONG>..<STRONG>COLOR_PAIRS-1</STRONG>.
 
-       <STRONG>o</STRONG>   returns <STRONG>ERR</STRONG> if the window pointer is null.
-
-       <STRONG>o</STRONG>   returns <STRONG>ERR</STRONG> if the color pair parameter for <STRONG>wcolor_set</STRONG>  is  outside
-           the range 0..COLOR_PAIRS-1.
-
-       <STRONG>o</STRONG>   does  not  fail  if  either of the parameters of <STRONG>wattr_get</STRONG> used for
-           retrieving attribute or color pair values is <STRONG>NULL</STRONG>.
+       <STRONG>wattr_get</STRONG> does <EM>not</EM> fail if its <EM>attrs</EM> or <EM>pair</EM> parameter is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -289,23 +283,25 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        have a color pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
        <STRONG>o</STRONG>   For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
-           if <EM>opts</EM> is set it is treated as a pointer to <STRONG>int</STRONG>, and used  to  set
-           the color pair instead of the <STRONG>short</STRONG> <EM>pair</EM> parameter.
+           if <EM>opts</EM> is set it is treated as a pointer to <EM>int</EM>, and used  to  set
+           the color pair instead of the <EM>short</EM> <EM>pair</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which retrieve the color, e.g., <STRONG>wattr_get</STRONG>, if <EM>opts</EM> is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
-           color  pair  as  an <STRONG>int</STRONG> value, in addition to retrieving it via the
-           standard pointer to <STRONG>short</STRONG> parameter.
+           set it is treated as a pointer to <EM>int</EM>, and  used  to  retrieve  the
+           color  pair  as  an <EM>int</EM> value, in addition to retrieving it via the
+           standard pointer to <EM>short</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the  <EM>opts</EM>
            parameter is ignored except except to check that it is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in X/Open Curses, Issue 4.  The standard
-       defined the dedicated  type  for  highlights,  <STRONG>attr_t</STRONG>,  which  was  not
-       defined in SVr4 curses.  The functions taking <STRONG>attr_t</STRONG> arguments were not
-       supported under SVr4.
+       These  functions are described in X/Open Curses, Issue 4.  It specifies
+       no error conditions for them.
+
+       The standard defined the dedicated type for highlights,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>,  which
+       was  not defined in SVr4 <EM>curses</EM>.  The functions taking <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> arguments
+       were not supported under SVr4.
 
        Very old versions of this library did not force an update of the screen
        when  changing  the  attributes.   Use  <STRONG>touchwin</STRONG> to force the screen to
@@ -314,7 +310,7 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        X/Open  Curses  states   that   whether   the   traditional   functions
        <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG>  can  manipulate  attributes other than <STRONG>A_BLINK</STRONG>,
        <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is  "unspecified".
-       Under  this  implementation  as  well  as  SVr4 curses, these functions
+       Under  this  implementation  as  well  as  SVr4 <EM>curses</EM>, these functions
        correctly manipulate all other highlights (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
        <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
 
@@ -336,6 +332,7 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
               <STRONG>WA_BLINK</STRONG>        Blinking
               <STRONG>WA_DIM</STRONG>          Half bright
               <STRONG>WA_BOLD</STRONG>         Extra bright or bold
+
               <STRONG>WA_ALTCHARSET</STRONG>   Alternate character set
 
        X/Open Curses does not assign values to  these  symbols,  nor  does  it
@@ -349,22 +346,22 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   However, in some  implementations,  those  symbols  have  unrelated
            values.
 
-           For example, the Solaris <EM>xpg4</EM> (X/Open) curses declares <STRONG>attr_t</STRONG> to be
-           an unsigned short integer (16-bits), while  <STRONG>chtype</STRONG>  is  a  unsigned
+           For example, the Solaris <EM>xpg4</EM> (X/Open) <EM>curses</EM> declares <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> to be
+           an unsigned short integer (16-bits), while  <EM>chtype</EM>  is  a  unsigned
            integer (32-bits).  The <STRONG>WA_</STRONG> symbols in this case are different from
            the <STRONG>A_</STRONG> symbols because they are used for a smaller  datatype  which
            does not represent <STRONG>A_CHARTEXT</STRONG> or <STRONG>A_COLOR</STRONG>.
 
            In this implementation (as in many others), the values happen to be
-           the same because it simplifies copying information  between  <STRONG>chtype</STRONG>
-           and <STRONG>cchar_t</STRONG> variables.
+           the same because it simplifies copying information  between  <EM>chtype</EM>
+           and <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> variables.
 
-       <STRONG>o</STRONG>   Because  <EM>ncurses</EM>'s  <STRONG>attr_t</STRONG>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
+       <STRONG>o</STRONG>   Because  <EM>ncurses</EM>'s  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
            field), a call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may  alter  the
            window's  color.   If  the  color pair information in the attribute
            parameter is zero, no change is made to the window's color.
 
-           This is consistent with SVr4 curses; X/Open Curses does not specify
+           This is consistent with SVr4 <EM>curses</EM>; X/Open Curses does not specify
            this.
 
        The  X/Open  Curses  extended  conformance  level  adds  new highlights
@@ -374,23 +371,23 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
+       X/Open Curses is largely based  on  SVr4  <EM>curses</EM>,  adding  support  for
        "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
-       differences from SVr4 curses address the way video  attributes  can  be
+       differences from SVr4 <EM>curses</EM> address the way video  attributes  can  be
        applied  to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
-       are similar.  SVr4 curses provided the basic features for  manipulating
-       video  attributes.  However, earlier versions of curses provided a part
+       are similar.  SVr4 <EM>curses</EM> provided the basic features for  manipulating
+       video  attributes.  However, earlier versions of <EM>curses</EM> provided a part
        of these features.
 
-       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
+       As seen in 2.8BSD, <EM>curses</EM> assumed 7-bit characters,  using  the  eighth
        bit  of  a byte to represent the <EM>standout</EM> feature (often implemented as
-       bold and/or reverse video).  The BSD curses library provided  functions
+       bold and/or reverse video).  The BSD <EM>curses</EM> library provided  functions
        <STRONG>standout</STRONG>  and  <STRONG>standend</STRONG> which were carried along into X/Open Curses due
        to their pervasive use in legacy applications.
 
        Some  terminals  in  the  1980s  could  support  a  variety  of   video
-       attributes,  although  the  BSD  curses  library  could do nothing with
-       those.  System V  (1983)  provided  an  improved  curses  library.   It
+       attributes,  although  the  BSD  <EM>curses</EM>  library  could do nothing with
+       those.  System V  (1983)  provided  an  improved  <EM>curses</EM>  library.   It
        defined  the <STRONG>A_</STRONG> symbols for use by applications to manipulate the other
        attributes.  There are few useful references for the chronology.
 
@@ -398,7 +395,7 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        commenting on several functions:
 
        <STRONG>o</STRONG>   the  <STRONG>attron</STRONG>,  <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of the functions
-           found in SVr4 but not in BSD curses) were introduced by System V,
+           found in SVr4 but not in BSD <EM>curses</EM>) were introduced by System V,
 
        <STRONG>o</STRONG>   the alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added  in
            SVr2 and improved in SVr3 (by adding <STRONG>acs_map[]</STRONG>),
@@ -408,17 +405,17 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
 
-       Goodheart did not mention the background character or the <STRONG>cchar_t</STRONG> type.
+       Goodheart did not mention the background character or the <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> type.
        Those are respectively SVr4 and X/Open features.  He did mention the <STRONG>A_</STRONG>
        constants, but did not indicate their values.  Those were not the  same
        in different systems, even for those marked as System V.
 
        Different  Unix  systems  used  different  sizes  for the bit-fields in
-       <STRONG>chtype</STRONG> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
+       <EM>chtype</EM> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
        integer sizes (32-bit versus 64-bit).
 
        This  table  showing  the number of bits for <STRONG>A_COLOR</STRONG> and <STRONG>A_CHARTEXT</STRONG> was
-       gleaned from the curses header files for various operating systems  and
+       gleaned from the <EM>curses</EM> header files for various operating systems  and
        architectures.   The inferred architecture and notes reflect the format
        and size of the  defined  constants  as  well  as  clues  such  as  the
        alternate  character  set implementation.  A 32-bit library can be used
@@ -447,48 +444,48 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
               in 1996.
 
           <STRONG>o</STRONG>   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
-              of curses was dropped with HP-UX 11.30 in 2006.
+              of <EM>curses</EM> was dropped with HP-UX 11.30 in 2006.
 
           Regarding OSF/1 (and Tru64),
 
-          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  <EM>ncurses</EM>,  the  OSF/1  curses
+          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  <EM>ncurses</EM>,  the  OSF/1  <EM>curses</EM>
               interface is not customized for 32-bit and 64-bit versions.
 
           <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
-              provided a new implementation for X/Open curses.
+              provided a new implementation for X/Open Curses.
 
           Regarding Solaris,
 
           <STRONG>o</STRONG>   The initial release of Solaris was in 1992.
 
-          <STRONG>o</STRONG>   The <EM>xpg4</EM> (X/Open) curses was developed by MKS from 1990 to 1995.
+          <STRONG>o</STRONG>   The <EM>xpg4</EM> (X/Open) Curses was developed by MKS from 1990 to 1995.
               Sun's copyright began in 1996.
 
-          <STRONG>o</STRONG>   Sun updated the X/Open curses interface after 64-bit support was
-              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
+          <STRONG>o</STRONG>   Sun updated the X/Open Curses interface after 64-bit support was
+              introduced  in  1997,  but  did  not  modify  the  SVr4   <EM>curses</EM>
               interface.
 
           Regarding U/Win,
 
-          <STRONG>o</STRONG>   Development  of  the  curses  library  began in 1991, stopped in
+          <STRONG>o</STRONG>   Development  of  the  <EM>curses</EM>  library  began in 1991, stopped in
               2000.
 
           <STRONG>o</STRONG>   Color support was added in 1998.
 
-          <STRONG>o</STRONG>   The library uses only <STRONG>chtype</STRONG> (no <STRONG>cchar_t</STRONG>).
+          <STRONG>o</STRONG>   The library uses only <EM>chtype</EM> (no <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>).
 
-       Once X/Open curses was adopted in the mid-1990s, the  constraint  of  a
-       32-bit interface with many colors and wide-characters for <STRONG>chtype</STRONG> became
-       a moot point.  The <STRONG>cchar_t</STRONG> structure (whose size and  members  are  not
+       Once X/Open Curses was adopted in the mid-1990s, the  constraint  of  a
+       32-bit interface with many colors and wide-characters for <EM>chtype</EM> became
+       a moot point.  The <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure (whose size and  members  are  not
        specified in X/Open Curses) could be extended as needed.
 
        Other interfaces are rarely used now:
 
-       <STRONG>o</STRONG>   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
+       <STRONG>o</STRONG>   BSD  <EM>curses</EM> was improved slightly in 1993/1994 using Keith Bostic's
            modification to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He  moved
            <EM>standout</EM> attribute to a structure member.
 
-           The  resulting  4.4BSD curses was replaced by <EM>ncurses</EM> over the next
+           The  resulting  4.4BSD <EM>curses</EM> was replaced by <EM>ncurses</EM> over the next
            ten years.
 
        <STRONG>o</STRONG>   U/Win is rarely used now.
@@ -500,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 8185670aa..53dc4d8e0 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -118,22 +118,22 @@ <H1 class="no-header">curs_border 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        All  routines return the integer <STRONG>OK</STRONG>.  The SVr4.0 manual says "or a non-
        negative integer if <STRONG>immedok</STRONG> is set", but this appears to be an error.
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns <STRONG>ERR</STRONG> if the window pointer is null.
+       This implementation returns <STRONG>ERR</STRONG> if the window pointer is null.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The borders generated by these functions are <EM>inside</EM>  borders  (this  is
+       The  borders  generated  by these functions are <EM>inside</EM> borders (this is
        also true of SVr4 curses, though the fact is not documented).
 
        Note that <STRONG>border</STRONG> and <STRONG>box</STRONG> may be macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.  It  specifies
+       no error conditions for them.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_border 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 5196e418a..03154b992 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -55,9 +55,9 @@ <H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>delch(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wdelch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wdelch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvdelch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwdelch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwdelch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -73,7 +73,7 @@ <H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -94,12 +94,16 @@ <H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        value other than <STRONG>ERR</STRONG>".
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr2 (1984) introduced <EM>delch</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-11                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -109,6 +113,7 @@ <H1 class="no-header">curs_delch 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index c9c500146..ff353b7ae 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>deleteln</STRONG>,  <STRONG>wdeleteln</STRONG>, <STRONG>insdelln</STRONG>, <STRONG>winsdelln</STRONG>, <STRONG>insertln</STRONG>, <STRONG>winsertln</STRONG> - delete
+       <STRONG>deleteln</STRONG>,  <STRONG>wdeleteln</STRONG>, <STRONG>insertln</STRONG>, <STRONG>winsertln</STRONG>, <STRONG>insdelln</STRONG>, <STRONG>winsdelln</STRONG> - delete
        or insert lines in a <EM>curses</EM> window
 
 
@@ -55,53 +55,58 @@ <H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>deleteln(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wdeleteln(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>insdelln(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winsdelln(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wdeleteln(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>insertln(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winsertln(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winsertln(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>insdelln(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winsdelln(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <STRONG>deleteln</STRONG> and <STRONG>wdeleteln</STRONG> routines delete the line under the cursor in
-       the  window;  all  lines  below the current line are moved up one line.
-       The bottom line of the window is cleared.  The cursor position does not
-       change.
+       <STRONG>wdeleteln</STRONG> deletes the line at the cursor in <EM>win</EM>;  all  lines  below  it
+       move  up  one  line.  <EM>curses</EM> then fills the bottom line of <EM>win</EM> with the
+       blank character configured by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character  API  users:
+       <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).  The cursor position does not change.
+
+       <STRONG>winsertln</STRONG>  inserts  a  line  of  blank characters above the line at the
+       cursor in <EM>win</EM>; the content of the window's bottom line  is  lost.   The
+       cursor position does not change.
 
-       The  <STRONG>insdelln</STRONG>  and  <STRONG>winsdelln</STRONG>  routines, for positive <EM>n</EM>, insert <EM>n</EM> lines
-       into the specified window above the current line.  The <EM>n</EM>  bottom  lines
-       are  lost.  For negative <EM>n</EM>, delete <EM>n</EM> lines (starting with the one under
-       the cursor), and move the remaining lines up.  The bottom <EM>n</EM>  lines  are
-       cleared.  The current cursor position remains the same.
+       <STRONG>winsdelln</STRONG>  inserts  or  deletes  <EM>n</EM> lines  in  <EM>win</EM>  as  <EM>n</EM> is positive or
+       negative, respectively,  as  if  by  repeatedly  calling  <STRONG>winsertln</STRONG>  or
+       <STRONG>wdeleteln</STRONG>.
 
-       The  <STRONG>insertln</STRONG>  and  <STRONG>winsertln</STRONG>  routines  insert  a blank line above the
-       current line and the bottom line is lost.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an  <STRONG>OK</STRONG>  (SVr4
-       specifies  only  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon successful
-       completion.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no error conditions.  In  this  implementation,  if  the
-       window parameter is null, an error is returned.
+       In <EM>ncurses</EM>, they fail if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that all but <STRONG>winsdelln</STRONG> may be macros.
+       All of these functions except <STRONG>winsdelln</STRONG> may be implemented as macros.
 
-       These  routines do not require a hardware line delete or insert feature
-       in  the  terminal.   In  fact,  they  will  not   use   hardware   line
-       delete/insert  unless  <STRONG>idlok(...,</STRONG>  <STRONG>TRUE)</STRONG>  has  been  set on the current
-       window.
+       These  functions  do  not require the terminal to possess hardware line
+       deletion or insertion capabilities.   Even  if  available,  by  default
+       <EM>curses</EM> does not use them; see <STRONG><A HREF="idlok.3x.html">idlok(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  The  standard
-       specifies  that  they  return  <STRONG>ERR</STRONG>  on  failure, but specifies no error
-       conditions.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
+
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       value other than <STRONG>ERR</STRONG>".
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) <EM>curses</EM> introduced <EM>wdeleteln</EM> and <EM>winsertln</EM>.
+
+       SVr3.1 (1987) added <EM>winsdelln</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -109,7 +114,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,6 +124,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index e8b3a4682..36bba46b4 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_extend 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -55,41 +55,46 @@ <H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>curses_version(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>use_extended_names(bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>use_extended_names(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These  functions  are extensions to the curses library which do not fit
-       easily into other categories.
+       These  <EM>ncurses</EM>  extensions to the <EM>curses</EM> library do not fit easily into
+       other functional categories.
 
 
 </PRE><H3><a name="h3-curses_version">curses_version</a></H3><PRE>
-       Use <STRONG>curses_version</STRONG> to get the version number, including patch level  of
-       the library, prefixed by "ncurses", e.g.,
-
-              <STRONG>ncurses</STRONG> <STRONG>5.0.19991023</STRONG>
+       <STRONG>curses_version</STRONG> returns a pointer to a string containing  the  library's
+       name  and  version  number,  including  its  patch  level,  for example
+       "ncurses 6.5.20240720".
 
 
 </PRE><H3><a name="h3-use_extended_names">use_extended_names</a></H3><PRE>
-       The   <STRONG>use_extended_names</STRONG>   function   controls   whether   the  calling
-       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 <STRONG>-x</STRONG> option of <STRONG>tic</STRONG> to compile
-       extended terminal definitions.  However you can disable this feature to
-       ensure compatibility with other implementations of curses.
+       <STRONG>use_extended_names</STRONG> configures  whether  the  library  recognizes  user-
+       defined  or  nonstandard <EM>terminfo</EM> capability names that may be compiled
+       into  terminal  type  descriptions   via   the   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>   or
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>  interfaces.   Normally  these names are available for
+       use, since the essential decision is made through use  of  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>'s  <STRONG>-x</STRONG>
+       option  to  include  such  extensions  in  terminal  type descriptions.
+       <STRONG>use_extended_names</STRONG>  can  prevent   <EM>ncurses</EM>   from   recognizing   these
+       capabilities  to  ensure  compatibility  with  other implementations of
+       <EM>curses</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>curses_version</STRONG>  returns a pointer to static memory; you should not free
-       this in your application.
+       <STRONG>curses_version</STRONG> returns a constant string.
+
+       <STRONG>use_extended_names</STRONG> returns the previous state  of  extended  capability
+       name recognition, allowing you to save this property and restore it.
 
-       <STRONG>use_extended_names</STRONG> returns the previous state,  allowing  you  to  save
-       this and restore it.
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       The  pointer  returned  by  <STRONG>curses_version</STRONG>  corresponds  to  statically
+       allocated memory; do not attempt to <STRONG>free(3)</STRONG> it.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       These  functions  are <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extensions, and are not found in SVr4
+       These functions are <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extensions, and are not found  in  SVr4
        <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous curses implementation.
 
 
@@ -99,17 +104,19 @@ <H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Thomas Dickey.
+       Thomas Dickey
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+       <EM>ncurses</EM> offers several other extensions to the X/Open Curses API.
+
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,     <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,     <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,     <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,     <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -122,6 +129,7 @@ <H1 class="no-header">curs_extend 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index a04f410fc..2078aecf3 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>in_wch</STRONG>,  <STRONG>mvin_wch</STRONG>,  <STRONG>mvwin_wch</STRONG>, <STRONG>win_wch</STRONG> - get a <EM>curses</EM> complex character
+       <STRONG>in_wch</STRONG>,  <STRONG>win_wch</STRONG>,  <STRONG>mvin_wch</STRONG>, <STRONG>mvwin_wch</STRONG> - get a <EM>curses</EM> complex character
        from a window
 
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>win_wch</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -89,15 +89,24 @@ <H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
        error conditions for them.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+       The System V  Interface  Definition,  Version  4  (1995),  specified  a
+       function  named  <EM>winwch</EM>  (and  the  usual  variants).  This was a later
+       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
+       differed  from  X/Open's  later  <EM>win</EM><STRONG>_</STRONG><EM>wch</EM> in that it returned a value of
+       type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library in
+       <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library  in
        its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -107,6 +116,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 0e8a2c228..8a0eab01b 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp @
+  * @Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>winch</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_inch 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 08ba1f417..187c3b767 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -47,17 +47,17 @@ <H1 class="no-header">curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ins_wch</STRONG>,  <STRONG>mvins_wch</STRONG>,  <STRONG>mvwins_wch</STRONG>,  <STRONG>wins_wch</STRONG>  -  insert a <EM>curses</EM> complex
+       <STRONG>ins_wch</STRONG>,  <STRONG>wins_wch</STRONG>,  <STRONG>mvins_wch</STRONG>,  <STRONG>mvwins_wch</STRONG>  -  insert a <EM>curses</EM> complex
        character in a window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>ins_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wins_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvins_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ins_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wins_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvins_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -92,8 +92,12 @@ <H1 class="no-header">curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr4  (1989)  implemented  these  functions  under  the  names  <STRONG>inswch</STRONG>,
-       <STRONG>winswch</STRONG>, <STRONG>mvinswch</STRONG>, and <STRONG>mvwinswch</STRONG>.
+       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+       The System V  Interface  Definition,  Version  4  (1995),  specified  a
+       function  named  <EM>winswch</EM>  (and  the  usual variants).  This was a later
+       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
+       differed  from  X/Open's  later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took an argument of
+       type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -104,7 +108,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 4c9506f1f..f3614ab53 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -47,74 +47,80 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>ins_wstr</STRONG>,  <STRONG>ins_nwstr</STRONG>,  <STRONG>wins_wstr</STRONG>,  <STRONG>wins_nwstr</STRONG>, <STRONG>mvins_wstr</STRONG>, <STRONG>mvins_nwstr</STRONG>,
-       <STRONG>mvwins_wstr</STRONG>, <STRONG>mvwins_nwstr</STRONG> - insert a wide-character string in a  <EM>curses</EM>
+       <STRONG>ins_wstr</STRONG>,  <STRONG>wins_wstr</STRONG>,  <STRONG>mvins_wstr</STRONG>,  <STRONG>mvwins_wstr</STRONG>, <STRONG>ins_nwstr</STRONG>, <STRONG>wins_nwstr</STRONG>,
+       <STRONG>mvins_nwstr</STRONG>, <STRONG>mvwins_nwstr</STRONG> - insert a wide-character string in a  <EM>curses</EM>
        window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>ins_wstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ins_nwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wins_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ins_wstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wins_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvins_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvins_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvins_nwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_wstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ins_nwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvins_nwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines insert a <STRONG>wchar_t</STRONG> character string (as many characters as
-       will fit on the line) before the character  under  the  cursor,  as  if
-       calling  <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG>.   All  characters to the right of the cursor are
-       shifted right, with the possibility of the rightmost characters on  the
-       line being lost.  No wrapping is performed.
-
-       The  cursor  position  does  not  change  (after  moving  to  <EM>y</EM>,  <EM>x</EM>, if
-       specified).
-
-       The functions with <EM>n</EM> as the last argument insert a leading substring of
-       at  most  <EM>n</EM>  <STRONG>wchar_t</STRONG>  characters.   If  <EM>n</EM> is less than zero, the entire
-       string is inserted (stopping on a L'\0' character).
-
-       Special characters are handled as in <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.
+       <STRONG>wins_wstr</STRONG>  inserts a wide-character string <EM>wstr</EM> before the character at
+       the cursor in window <EM>win</EM> as if by calling <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> for each <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>
+       in  <EM>wstr</EM>.   No  line wrapping is performed.  Characters to the right of
+       the cursor are shifted right; those at the right edge of the window may
+       be  lost.   <STRONG>wins_wstr</STRONG>  stops  inserting if it would have to wrap to the
+       next line to write the next <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>wstr</EM>.  The cursor position  does
+       not change (after moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG>wins_nwstr</STRONG> does the
+       same, but inserts at most <EM>n</EM> characters, or as many as possible  (up  to
+       the end of the line) if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of
+       these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open Curses does not specify any error conditions.  In <EM>ncurses</EM>,  they
-       return <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
        <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>,
+
+       <STRONG>o</STRONG>   the first wide character in <EM>wstr</EM> is a non-spacing character, or
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>wins_nwstr</STRONG> may be implemented as macros.
 
-       If the first character in the string is a non-spacing character,  these
-       functions return <STRONG>ERR</STRONG>.  X/Open Curses does not specify what happens if a
-       non-spacing character follows a control character.
-
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
+       X/Open Curses does not specify what happens if a non-spacing  character
+       follows a control character.
+
        Issue  4 states that the entire string is inserted if <EM>n</EM> is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions,  and  differs  from  the  SVr4  <EM>curses</EM>  and  Solaris <EM>xcurses</EM>
-       implementations.  Nevertheless, Issue 7 retains it.
+       functions  such  as  <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG>, and differs from the SVr4 <EM>curses</EM> and
+       Solaris <EM>xcurses</EM> implementations.  Nevertheless,  Issue  7  retains  the
+       language.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+       The  System V  Interface  Definition,  Version  4   (1995),   specified
+       functions named <EM>winswstr</EM> and <EM>winsnwstr</EM> (and the usual variants).  These
+       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       They  differ from X/Open's later <EM>wins</EM><STRONG>_</STRONG><EM>wstr</EM> and <EM>wins</EM><STRONG>_</STRONG><EM>nwstr</EM> in that their
+       <EM>wstr</EM> parameters are not <EM>const</EM>-qualified<EM>.</EM>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -125,7 +131,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -135,6 +141,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 5f60c67c0..9e36e4240 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp @
+  * @Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -55,9 +55,9 @@ <H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>insch(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winsch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winsch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvinsch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinsch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinsch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -90,6 +90,10 @@ <H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        value other than <STRONG>ERR</STRONG>".
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr2 (1984) introduced <EM>winsch</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG> describes comparable functions in  the  wide-character
        <EM>curses</EM> configuration.
@@ -98,7 +102,7 @@ <H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -108,6 +112,7 @@ <H1 class="no-header">curs_insch 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 55bcbe1bc..34b9c28d3 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp @
+  * @Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -47,73 +47,74 @@ <H1 class="no-header">curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>insstr</STRONG>,  <STRONG>insnstr</STRONG>,  <STRONG>winsstr</STRONG>,  <STRONG>winsnstr</STRONG>,  <STRONG>mvinsstr</STRONG>, <STRONG>mvinsnstr</STRONG>, <STRONG>mvwinsstr</STRONG>,
+       <STRONG>insstr</STRONG>,  <STRONG>winsstr</STRONG>,  <STRONG>mvinsstr</STRONG>,  <STRONG>mvinsnstr</STRONG>,  <STRONG>insnstr</STRONG>, <STRONG>winsnstr</STRONG>, <STRONG>mvwinsstr</STRONG>,
        <STRONG>mvwinsnstr</STRONG> - insert a string in a <EM>curses</EM> window
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
-       <STRONG>int</STRONG> <STRONG>insstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>insnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winsstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>winsnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mvinsstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvinsnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinsstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinsnstr(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>insstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winsstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinsstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinsstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
+       <STRONG>int</STRONG> <STRONG>insnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>winsnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvinsnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinsnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
-</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines insert a character string (as many  characters  as  will
-       fit  on  the line) before the character under the cursor, as if calling
-       <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG>.  All characters to the right  of  the  cursor  are  shifted
-       right,  with  the  possibility  of the rightmost characters on the line
-       being lost.  No wrapping is performed.
-
-       The cursor  position  does  not  change  (after  moving  to  <EM>y</EM>,  <EM>x</EM>,  if
-       specified).
-
-       The functions with <EM>n</EM> as the last argument insert a leading substring of
-       at most <EM>n</EM> characters.  If <EM>n</EM> is less than zero,  the  entire  string  is
-       inserted (stopping on a NUL character).
 
-       Special characters are handled as in <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.
+</PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       <STRONG>winsstr</STRONG> inserts a string <EM>str</EM> before the  character  at  the  cursor  in
+       window  <EM>win</EM>  as if by calling <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> for each <EM>char</EM> in <EM>str</EM>.  No line
+       wrapping is performed.  Characters to  the  right  of  the  cursor  are
+       shifted  right;  those  at  the  right  edge of the window may be lost.
+       <STRONG>winsstr</STRONG> stops inserting if it would have to wrap to the  next  line  to
+       write the next <EM>char</EM> in <EM>str</EM>.  The cursor position does not change (after
+       moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG>insnstr</STRONG> does the same, but inserts at
+       most  <EM>n</EM>  characters, or as many as possible (up to the end of the line)
+       if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All functions return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open   Curses   does   not   specify   any  error  conditions.   This
-       implementation returns <STRONG>ERR</STRONG>
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   if the <EM>str</EM> parameter is null or
+       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>, or
 
-       <STRONG>o</STRONG>   the <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> function returns <STRONG>ERR</STRONG>.
+       <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All but <STRONG>winsnstr</STRONG> may be macros.
+       All of these functions except <STRONG>winsnstr</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
-       Issue 4 distinguished <STRONG>insnstr</STRONG> and <STRONG>winsnstr</STRONG>  by  stating  they  "do  not
-       perform  wrapping".   This  was  probably an error, since it makes this
-       group of functions inconsistent.  No implementation of <EM>curses</EM> documents
-       this inconsistency, and Issue 7 removed it.
+       Issue 4 distinguished <STRONG>insnstr</STRONG> and <STRONG>winsnstr</STRONG>  from  the  other  functions
+       documented  above  by stating they "do not perform wrapping".  This was
+       probably an error, since it makes this group of functions inconsistent.
+       No  implementation  of <EM>curses</EM> documents this inconsistency, and Issue 7
+       removed it.
+
+       Issue 4 states that the entire string is inserted if <EM>n</EM> is less than  1.
+       This  is  probably  an  error,  because  it  is inconsistent with other
+       functions such as <STRONG><A HREF="curs_addstr.3x.html">waddstr(3x)</A></STRONG>, and differs from  the  SVr4  <EM>curses</EM>  and
+       Solaris  <EM>xcurses</EM>  implementations.   Nevertheless,  Issue 7 retains the
+       language.
+
 
-       Issue  4 states that the entire string is inserted if <EM>n</EM> is less than 1.
-       This is probably an  error,  because  it  is  inconsistent  with  other
-       functions,  and  differs  from  the  SVr4  <EM>curses</EM>  and  Solaris <EM>xcurses</EM>
-       implementations.  Nevertheless, Issue 7 retains it.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3.1 (1987) introduced <EM>winsstr</EM> and <EM>winsnstr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -124,7 +125,7 @@ <H1 class="no-header">curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -134,6 +135,7 @@ <H1 class="no-header">curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index d6e4fd2a2..3efe2e2b7 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp @
+  * @Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
        They fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       <STRONG>wmove</STRONG> fails if its <EM>WINDOW</EM> pointer argument is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, <STRONG>wmove</STRONG> fails if its <EM>WINDOW</EM> pointer argument is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -78,8 +78,14 @@ <H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue 4 describes these functions.  4BSD (1980) <EM>curses</EM>
-       introduced <EM>wmove</EM>.
+       X/Open Curses, Issue 4 describes these functions.
+
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       value other than <STRONG>ERR</STRONG>".
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) <EM>curses</EM> introduced <EM>wmove</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -87,7 +93,7 @@ <H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -97,6 +103,7 @@ <H1 class="no-header">curs_move 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 1daa08715..89fdc9c08 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -148,8 +148,6 @@ <H1 class="no-header">curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        upon  failure.  All other routines that return an integer always return
        <STRONG>OK</STRONG>.
 
-       X/Open Curses does not specify any error conditions.
-
        In this implementation,
 
        <STRONG>o</STRONG>   those functions that have a window pointer will return <STRONG>ERR</STRONG>  if  the
@@ -168,35 +166,36 @@ <H1 class="no-header">curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       These functions are described in X/Open Curses, Issue 4.  It  specifies
+       no error conditions for them.
 
-       Some historic curses implementations had, as an  undocumented  feature,
+       Some  historic  curses implementations had, as an undocumented feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
        <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
-       Earlier System V curses implementations specified  that  with  <STRONG>scrollok</STRONG>
-       enabled,  any  window  modification  triggering  a scroll also forced a
-       physical refresh.  X/Open Curses does not  require  this,  and  <EM>ncurses</EM>
-       avoids  doing  it  to  perform  better  vertical-motion optimization at
+       Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
+       enabled, any window modification triggering  a  scroll  also  forced  a
+       physical  refresh.   X/Open  Curses  does not require this, and <EM>ncurses</EM>
+       avoids doing it  to  perform  better  vertical-motion  optimization  at
        <STRONG>wrefresh</STRONG> time.
 
        X/Open Curses does not mention that the cursor should be made invisible
-       as  a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does this, but
+       as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does this,  but
        the code does not.  Use <STRONG>curs_set</STRONG> to make the cursor invisible.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <EM>ncurses</EM> formerly treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input  <EM>and</EM>  output
+       <EM>ncurses</EM>  formerly  treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input <EM>and</EM> output
        options, but no longer; see <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index c1bf123c7..2ff106866 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp @
+  * @Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -136,20 +136,19 @@ <H1 class="no-header">curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        Functions  that  return pointers return <STRONG>NULL</STRONG> on error, and set <EM>errno</EM> to
        <STRONG>ENOMEM</STRONG>.
 
-       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
-       implementation
+       In this implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
-               return  <STRONG>ERR</STRONG>  if the window pointer is null, or if the window is
-               not really a pad or if the area to refresh  extends  off-screen
+               return <STRONG>ERR</STRONG> if the window pointer is null, or if the  window  is
+               not  really  a pad or if the area to refresh extends off-screen
                or if the minimum coordinates are greater than the maximum.
 
           <STRONG>pechochar</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  window  is  not  really  a  pad, and the
+               returns <STRONG>ERR</STRONG> if  the  window  is  not  really  a  pad,  and  the
                associated call to <STRONG>wechochar</STRONG> returns <STRONG>ERR</STRONG>.
 
           <STRONG>pecho_wchar</STRONG>
-               returns <STRONG>ERR</STRONG> if  the  window  is  not  really  a  pad,  and  the
+               returns  <STRONG>ERR</STRONG>  if  the  window  is  not  really  a  pad, and the
                associated call to <STRONG>wecho_wchar</STRONG> returns <STRONG>ERR</STRONG>.
 
 
@@ -160,67 +159,67 @@ <H1 class="no-header">curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        BSD <EM>curses</EM> has no <EM>pad</EM> feature.
 
-       SVr2   <EM>curses</EM>   (1986)  provided  the  <STRONG>newpad</STRONG>  and  related  functions,
-       documenting them in a single line  each.   SVr3  (1987)  provided  more
+       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
+       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
        extensive documentation.
 
-       The  documentation  does not explain the term <EM>pad</EM>.  However, the Apollo
+       The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
        <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
 
-       <STRONG>o</STRONG>   These graphical pads could  be  much  larger  than  the  computer's
+       <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
            display.
 
-       <STRONG>o</STRONG>   The  read-only  output  from  a  command  could be scrolled back to
+       <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
            inspect, and select text from the pad.
 
        The two uses may be related.
 
-       X/Open Curses, Issue 4 describes these functions,  without  significant
-       change  from the SVr3 documentation.  It describes no error conditions.
-       The  behavior  of  <STRONG>subpad</STRONG>  if  the  parent  window  is  not  a  pad  is
+       X/Open  Curses,  Issue 4 describes these functions, without significant
+       change from the SVr3 documentation.  It specifies no  error  conditions
+       for  them.  The behavior of <STRONG>subpad</STRONG> if the parent window is not a pad is
        undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  sets  a  flag in the <EM>WINDOW</EM> structure in <STRONG>newpad</STRONG> which
+       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM>  structure  in  <STRONG>newpad</STRONG>  which
            tells if the window is a <EM>pad</EM>.
 
-           However, it uses this information only in <STRONG>waddch</STRONG> (to decide  if  it
-           should  call  <STRONG>wrefresh</STRONG>)  and  <STRONG>wscrl</STRONG> (to avoid scrolling a pad), and
-           does not check in <STRONG>wrefresh</STRONG> to ensure  that  the  pad  is  refreshed
+           However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
+           should call <STRONG>wrefresh</STRONG>) and <STRONG>wscrl</STRONG> (to avoid  scrolling  a  pad),  and
+           does  not  check  in  <STRONG>wrefresh</STRONG>  to ensure that the pad is refreshed
            properly.
 
-       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  checks whether a window is a pad in <STRONG>wnoutrefresh</STRONG>,
+       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> checks whether a window is a pad  in  <STRONG>wnoutrefresh</STRONG>,
            returning <STRONG>ERR</STRONG> in that case.
 
-           However, it only sets the flag for subwindows if the parent  window
-           is  a  pad.   Its  <STRONG>newpad</STRONG>  function  does not set this information.
+           However,  it only sets the flag for subwindows if the parent window
+           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
            Consequently, the check will never fail.
 
-           It makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though  interestingly
-           enough,  a  comment  in  the  source code states that the lack of a
+           It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
+           enough, a comment in the source code states  that  the  lack  of  a
            check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG>  and
-           <STRONG>subpad</STRONG>,   using   this   to   help  with  the  distinction  between
+       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and
+           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
            <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
 
-           It does not check for the case where a subwindow is  created  in  a
+           It  does  not  check for the case where a subwindow is created in a
            pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
 
-           The  <STRONG>dupwin</STRONG>  function  returns  a regular window when duplicating a
-           pad.  Likewise, <STRONG>getwin</STRONG> always returns a window, even if  the  saved
+           The <STRONG>dupwin</STRONG> function returns a regular  window  when  duplicating  a
+           pad.   Likewise,  <STRONG>getwin</STRONG> always returns a window, even if the saved
            data was from a pad.
 
        This implementation
 
        <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
 
-       <STRONG>o</STRONG>   allows  a  <STRONG>subwin</STRONG>  or <STRONG>derwin</STRONG> call to succeed having a pad parent by
+       <STRONG>o</STRONG>   allows a <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG> call to succeed having a  pad  parent  by
            forcing the subwindow to be a pad,
 
-       <STRONG>o</STRONG>   checks in both <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to  ensure  that  pads
+       <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures   that   <STRONG>dupwin</STRONG>   and  <STRONG>getwin</STRONG>  treat  pads  versus  windows
+       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
            consistently.
 
 
@@ -229,7 +228,7 @@ <H1 class="no-header">curs_pad 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 92fb48d47..133e8f790 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_print 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -53,49 +53,57 @@ <H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>mcprint(char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mcprint(char</STRONG> <STRONG>*</STRONG> <EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  function  uses  the <STRONG>mc5p</STRONG> or <STRONG>mc4</STRONG> and <STRONG>mc5</STRONG> capabilities, if they are
-       present, to ship given data to a printer attached to the terminal.
+       <STRONG>mcprint</STRONG>,   an  <EM>ncurses</EM>  extension  to  the  <EM>curses</EM>  library,  uses  the
+       terminal's <STRONG>prtr_non</STRONG> (<STRONG>mc5p</STRONG>) or <STRONG>prtr_on</STRONG> (<STRONG>mc5</STRONG>) and  <STRONG>prtr_off</STRONG>  (<STRONG>mc4</STRONG>)  media
+       copy  capabilities,  if  defined, to send <EM>len</EM> bytes of the given string
+       <EM>data</EM> to a printer attached to the terminal.
 
-       Note that the <STRONG>mcprint</STRONG> code has no way  to  do  flow  control  with  the
-       printer  or  to  know  how  much buffering it has.  Your application is
-       responsible for keeping the rate of writes to  the  printer  below  its
-       continuous  throughput  rate  (typically  about half of its nominal cps
-       rating).   Dot-matrix  printers  and   6-page-per-minute   lasers   can
-       typically  handle  80cps,  so  a  good conservative rule of thumb is to
-       sleep for a second after shipping each 80-character line.
+       <STRONG>mcprint</STRONG> has no means of flow control to the printer nor of knowing  how
+       much buffering it has.  Your application is responsible for keeping the
+       rate of writes to the printer below  its  continuous  throughput  rate,
+       typically about half of its nominal characters-per-second (cps) rating.
+       Dot-matrix printers and 6-page-per-minute laser printers can  typically
+       handle  80  cps,  so  a  conservative rule of thumb is to sleep for one
+       second after sending an 80-character line.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <STRONG>mcprint</STRONG> function returns <STRONG>ERR</STRONG> if the  write  operation  aborted  for
-       some  reason.   In  this  case,  <STRONG>errno</STRONG>  will  contain  either  an error
-       associated with <STRONG>write(2)</STRONG> or one of the following:
+       On success, <STRONG>mcprint</STRONG> returns  the  number  of  characters  sent  to  the
+       printer.
+
+       <STRONG>mcprint</STRONG>  returns  <STRONG>ERR</STRONG>  if the write operation fails for any reason.  In
+       that event, <STRONG>errno</STRONG> contains either a value set by <STRONG>write(2)</STRONG>,  or  one  of
+       the following.
 
        <STRONG>ENODEV</STRONG>
-            Capabilities for printer redirection do not exist.
+            The terminal lacks relevant media copy capabilities.
 
        <STRONG>ENOMEM</STRONG>
-            Couldn't allocate sufficient memory to buffer the printer write.
-
-       When <STRONG>mcprint</STRONG> succeeds, it returns the  number  of  characters  actually
-       sent to the printer.
+            <EM>ncurses</EM>  could  not allocate sufficient memory to buffer the write
+            operation.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>mcprint</STRONG> was designed for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and was not found in SVr4 <EM>curses</EM>,
-       4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+       <STRONG>mcprint</STRONG> is an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in  SVr4  <EM>curses</EM>,
+       4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Applications employing this <EM>ncurses</EM> extension should condition its  use
+       Applications  employing this <EM>ncurses</EM> extension should condition its use
        on the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <EM>ncurses</EM> introduced <EM>mcprint</EM> prior to version 1.9.9g (1996).
+
+
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Padding in the <STRONG>mc5p</STRONG>, <STRONG>mc4</STRONG>, and <STRONG>mc5</STRONG> capabilities is not interpreted.
+       Padding in the <STRONG>prtr_non</STRONG>  (<STRONG>mc5p</STRONG>),  <STRONG>prtr_on</STRONG>  (<STRONG>mc5</STRONG>),  and  <STRONG>prtr_off</STRONG>  (<STRONG>mc4</STRONG>)
+       capabilities is not interpreted.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -103,7 +111,7 @@ <H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -113,6 +121,7 @@ <H1 class="no-header">curs_print 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index f2aef205d..7af81c14e 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -127,11 +127,10 @@ <H1 class="no-header">curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
-       implementation
+       In this implementation
 
           <STRONG>wnoutrefresh</STRONG>
-               returns <STRONG>ERR</STRONG> if the window pointer is null, or if the window  is
+               returns  <STRONG>ERR</STRONG> if the window pointer is null, or if the window is
                really a pad.
 
           <STRONG>wredrawln</STRONG>
@@ -143,7 +142,8 @@ <H1 class="no-header">curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
        Whether  <STRONG>wnoutrefresh</STRONG>  copies to the virtual screen the entire contents
        of a window or just its changed portions has never been well-documented
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index dfd354118..8351b568e 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -93,24 +93,23 @@ <H1 class="no-header">curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        other than <STRONG>ERR</STRONG> upon successful completion, unless  otherwise  noted  in
        the preceding routine descriptions.
 
-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
-       implementation
+       In this implementation
 
           <STRONG>is_linetouched</STRONG>
-               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
+               returns  <STRONG>ERR</STRONG>  if  the  window  pointer  is null, or if the line
                number is outside the window boundaries.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
-               normal return values of this function.   Because  the  function
+               normal  return  values  of this function.  Because the function
                returns a <STRONG>bool</STRONG>, returning <STRONG>ERR</STRONG> (which is neither <STRONG>TRUE</STRONG> nor <STRONG>FALSE</STRONG>)
                may not be supported by the compiler.
 
-               To provide error-checking and also match  the  X/Open  function
+               To  provide  error-checking  and also match the X/Open function
                prototype, the <STRONG>ERR</STRONG> is provided by a macro named <STRONG>is_linetouched</STRONG>.
                The actual function returns <STRONG>FALSE</STRONG> when it detects an error.
 
           <STRONG>wtouchln</STRONG>
-               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
+               returns  <STRONG>ERR</STRONG>  if  the  window  pointer  is null, or if the line
                number is outside the window boundaries.
 
 
@@ -119,14 +118,14 @@ <H1 class="no-header">curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  were  introduced  by SVr4.  The Solaris <EM>curses</EM> header
+       These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
        file, for instance, defines both an actual function and macro for each.
-       The  macros  give the same result as the actual functions.  SVr4 <EM>curses</EM>
-       does not check the window parameter <EM>win</EM> to ensure that it is not  <STRONG>NULL</STRONG>;
+       The macros give the same result as the actual functions.   SVr4  <EM>curses</EM>
+       does  not check the window parameter <EM>win</EM> to ensure that it is not <STRONG>NULL</STRONG>;
        otherwise this implementation behaves the same as SVr4.
 
-       X/Open  Curses, Issue 4 describes these functions, but defines no error
-       conditions.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -134,7 +133,7 @@ <H1 class="no-header">curs_touch 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 0784e42d6..f013ea078 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp @
+  * @Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -253,8 +253,7 @@ <H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
        Routines that return pointers return <STRONG>NULL</STRONG> on error.
 
-       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
-       implementation
+       In this implementation
 
           <STRONG>flushinp</STRONG>
                returns <STRONG>ERR</STRONG> if the terminal was not initialized.
@@ -266,83 +265,83 @@ <H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
-       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
+       vaguest  terms.   The  description  here  is adapted from X/Open Curses
        (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
-       The  limitation  to  30  seconds and the use of <STRONG>napms</STRONG> differ from other
+       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
        implementations.
 
        <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
 
-       <STRONG>o</STRONG>   NetBSD curses uses <STRONG>napms</STRONG> when no padding  character  is  available,
-           but  does  not  take  timing  into  account  when using the padding
+       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
+           but does not take  timing  into  account  when  using  the  padding
            character.
 
        Neither limits the delay.
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
-       capabilities  that  are defined in the terminfo entry via the <STRONG>-x</STRONG> option
-       of <STRONG>tic</STRONG>.  This implementation  automatically  assigns  at  run-time  key
+       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
+       capabilities that are defined in the terminfo entry via the  <STRONG>-x</STRONG>  option
+       of  <STRONG>tic</STRONG>.   This  implementation  automatically  assigns at run-time key
        codes to user-defined strings that begin with "k".  The key codes 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  that  have  been  loaded.    The   <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
-       function  controls  whether  this  data  is  loaded  when  the terminal
+       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   that   have  been  loaded.   The  <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
+       function controls  whether  this  data  is  loaded  when  the  terminal
        description is read by the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
-       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <EM>ncurses</EM>.   They
-       were  not  supported on Version 7, BSD or System V implementations.  It
-       is recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions  be
+       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
+       were not supported on Version 7, BSD or System V  implementations.   It
+       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The   files   written   and   read   by   these  functions  use  an
-           implementation-specific format.  Although the format is an  obvious
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.)  originated  with
+           Interestingly enough, according to the copyright dates  in  Solaris
+           source,  the  functions (along with <STRONG>scr_init</STRONG>, etc.) originated with
            the University of California, Berkeley (in 1982) and were later (in
-           1988) incorporated into SVr4.  Oddly, there are no  such  functions
+           1988)  incorporated  into SVr4.  Oddly, there are no such functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
+           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
            older <EM>ncurses</EM> versions.  This implementation (as well as the X/Open
            variant of Solaris curses, dated 1995) uses textual dumps.
 
-           The implementations that use binary dumps use  block-I/O  (<STRONG>write(2)</STRONG>
+           The  implementations  that use binary dumps use block-I/O (<STRONG>write(2)</STRONG>
            and <STRONG>read(2)</STRONG> 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.  However, reading from a 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.  However,  reading  from  a  file
            written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
-       <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will return a null pointer if unsuccessful, but does
-       not define any error conditions.  This implementation checks for  three
-       cases:
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.  It states  that  <STRONG>unctrl</STRONG>  and  <STRONG>wunctrl</STRONG>  will
+       return  a null pointer if unsuccessful.  This implementation checks for
+       three cases:
 
-       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
-           returns the  parameter,  i.e.,  a  one-character  string  with  the
-           parameter  as  the  first  character.   Otherwise, it returns "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -353,33 +352,33 @@ <H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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  printable.
-       This  implementation  uses  8  bits  but  does not modify the string to
-       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
+       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 printable.
+       This implementation uses 8 bits but  does  not  modify  the  string  to
+       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
-       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses   is
-       initialized.   X/Open  Curses  does not document the treatment of codes
+       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
+       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
+       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before   initializing  curses),  this  implementation  returns  strings
+       before  initializing  curses),  this  implementation  returns   strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
+       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
-       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
-       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
+       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
+       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
+       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
@@ -388,8 +387,8 @@ <H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
        SVr2 (1984) introduced <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
 
-       SVr3  (1987)  added <EM>filter</EM>.  Later that year, SVr3.1 brought <EM>getwin</EM> and
-       <EM>putwin</EM>, reading and writing window dumps with <STRONG>fread(3)</STRONG>  and  <STRONG>fwrite(3)</STRONG>,
+       SVr3 (1987) added <EM>filter</EM>.  Later that year, SVr3.1 brought  <EM>getwin</EM>  and
+       <EM>putwin</EM>,  reading  and writing window dumps with <STRONG>fread(3)</STRONG> and <STRONG>fwrite(3)</STRONG>,
        respectively.
 
        SVr4 (1989) supplied <EM>use</EM><STRONG>_</STRONG><EM>env</EM>.
@@ -400,13 +399,13 @@ <H1 class="no-header">curs_util 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
        <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-22                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 9ebd9c883..29cf51ac3 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp @
+  * @Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>define_key 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -88,7 +88,7 @@ <H1 class="no-header">define_key 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       NetBSD <EM>curses</EM> since 2.0 (2004) supports <STRONG>define_key</STRONG>.
+       NetBSD <EM>curses</EM> since 2.0 (2004) supports <EM>define</EM><STRONG>_</STRONG><EM>key</EM>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -100,7 +100,7 @@ <H1 class="no-header">define_key 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index f44336b31..8831caf53 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp @
+  * @Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>infotocap 1m 2024-07-27 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infotocap 1m 2024-07-27 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -58,7 +58,7 @@ <H1 class="no-header">infotocap 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>infotocap</STRONG>  translates  terminal  descriptions.   It looks in each given
-       text <EM>file</EM> for <EM>terminfo</EM> entries and, For each one found,  it  writes  an
+       text <EM>file</EM> for <EM>terminfo</EM> entries and, for each one found,  it  writes  an
        analogous  <EM>termcap</EM> description to the standard output stream.  <EM>terminfo</EM>
        "<STRONG>use</STRONG>" capabilities  translate  to  <EM>termcap</EM>  <STRONG>tc</STRONG>  capabilities.   Because
        <EM>termcap</EM>  is  a  less expressive format than <EM>terminfo</EM>, some capabilities
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.5                       2024-07-27                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index 41a419c6d..42f0187d2 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp @
+  * @Id: keyok.3x,v 1.48 2024/07/27 19:42:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keyok 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
+<TITLE>keyok 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keyok 3x 2024-06-15 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keyok 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 
@@ -61,8 +61,8 @@ <H1 class="no-header">keyok 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        The  <STRONG>keyok</STRONG>  <EM>ncurses</EM> extension permits a <EM>curses</EM> application to disable a
        function key <EM>key-code</EM> returned by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> (wide-character API users:
        <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>).   Key  codes  that have been disabled can be re-enabled.
-       <EM>bf</EM> indicates the desired enablement status.   This  operation  is  more
-       fine-grained than calling <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>, which affects <EM>all</EM> function keys.
+       <EM>bf</EM> selects the desired enablement status.  This operation is more fine-
+       grained than calling <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>, which affects <EM>all</EM> function keys.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -85,7 +85,7 @@ <H1 class="no-header">keyok 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       NetBSD <EM>curses</EM> since 2.0 (2004) supports <STRONG>keyok</STRONG>.
+       NetBSD <EM>curses</EM> since 2.0 (2004) supports <EM>keyok</EM>.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -97,7 +97,7 @@ <H1 class="no-header">keyok 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-15                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                         <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index f7b41ba99..d9a3c7902 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp @
+  * @Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -77,20 +77,27 @@ <H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       If the screen has not been initialized, or the <EM>level</EM> parameter  is  out
-       of  range,  <STRONG>use_legacy_coding</STRONG>  returns  <STRONG>ERR</STRONG>.  Otherwise, it returns the
-       previous level: <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG>.
+       If the <EM>curses</EM> screen has not been initialized, or the  <EM>level</EM>  parameter
+       is  out of range, <STRONG>use_legacy_coding</STRONG> returns <STRONG>ERR</STRONG>.  Otherwise, it returns
+       the previous level.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>use_legacy_coding</STRONG> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       <STRONG>use_legacy_coding</STRONG> is specific to <EM>ncurses</EM>.   It  was  not  supported  on
-       Version  7,  BSD  or  System V implementations.  Applications employing
-       <EM>ncurses</EM> extensions should condition their use on the visibility of  the
-       <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       <EM>ncurses</EM>  5.6  (2006)  introduced <EM>use</EM><STRONG>_</STRONG><EM>legacy</EM><STRONG>_</STRONG><EM>coding</EM> to support <STRONG>lynx(1)</STRONG>'s
+       font-switching feature.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
-       Thomas Dickey (to support <STRONG>lynx(1)</STRONG>'s font-switching feature).
+       Thomas Dickey
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -98,7 +105,7 @@ <H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -106,7 +113,9 @@ <H1 class="no-header">legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-AUTHORS">AUTHORS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 42dcd4672..333cf04a8 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp @
+  * @Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240720).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240727).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -253,12 +253,12 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
                  eight-bit characters.  It stores a  character  combined  with
-                 attributes and a color pair in a <EM>chtype</EM> datum, which is often
-                 an alias of <EM>int</EM>.  A string of <EM>curses</EM> characters is similar to
-                 a C <EM>char</EM> string; a <EM>chtype</EM> string ends with an integral <STRONG>0</STRONG>, the
-                 null <EM>curses</EM> character.
+                 attributes  and  a  color  pair identifier in a <EM>chtype</EM> datum,
+                 which  is  often  an  alias  of  <EM>int</EM>.   A  string  of  <EM>curses</EM>
+                 characters  is  similar  to  a C <EM>char</EM> string; a <EM>chtype</EM> string
+                 ends with an integral <STRONG>0</STRONG>, the null <EM>curses</EM> character.
 
-                 Attributes and a color pair selection (with no  corresponding
+                 Attributes and a color pair identifier (with no corresponding
                  character)  can  be  stored  in variables of <EM>chtype</EM> or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
                  type.  In either case, they are accessed via an integral  bit
                  mask.
@@ -281,7 +281,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                  function name contains "ch" or "str", prefix it with "_w"  to
                  obtain  the  wide  counterpart.   For example, <STRONG>waddch</STRONG> becomes
                  <STRONG>wadd_wch</STRONG>.  (Exceptions that add only  "w"  comprise  <STRONG>addwstr</STRONG>,
-                 <STRONG>inwstr</STRONG>, and their variants.)
+                 <STRONG>inwstr</STRONG>,  and their variants.)  Another exception is <STRONG>ins_nwstr</STRONG>
+                 and  its  variants,  which  is  spelled   thus   instead   of
+                 "insn_wstr".
 
                  This  convention  is  inapplicable  to some non-wide function
                  names,  so  other  transformations  are  used  for  the  wide
@@ -303,7 +305,7 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                           characters  (see  below).   A  string   of   complex
                           characters  ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> member
                           is the null wide character.  Attributes and a  color
-                          pair  selection are stored in separate fields of the
+                          pair identifier are stored in separate fields of the
                           structure,  not  combined  into  an  integer  as  in
                           <EM>chtype</EM>.
 
@@ -383,9 +385,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     def_prog_mode            <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     def_shell_mode           <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
+
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
-
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     delscreen                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
@@ -450,9 +452,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     in_wch                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     in_wchnstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
-
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     init_extended_color      <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>*
@@ -517,9 +519,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     mvaddnstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddnwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
-
                     mvcur                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     mvderwin                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
@@ -584,9 +586,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     mvwins_wch               <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvwins_wstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvwinsstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
-
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     mvwprintw                <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
@@ -651,9 +653,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     slk_attr_set             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attroff              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_attrset              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_clear                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_label                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -718,9 +720,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     wadd_wchstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     waddch                   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     waddchnstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+
                     waddchstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     waddnstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
-
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddwstr                 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
@@ -785,9 +787,9 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
                     wprintw                  <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     wredrawln                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wrefresh                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+
                     wresize                  <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>*
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
-
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     wstandend                <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
@@ -1497,7 +1499,7 @@ <H1 class="no-header">ncurses 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a69e38627..5dde24bc8 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240720).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240727).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 6920a9982..b421d2ba1 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp @
+  * @Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>wresize 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -88,14 +88,14 @@ <H1 class="no-header">wresize 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       NetBSD  <EM>curses</EM> adopted <STRONG>wresize</STRONG> in 2001 (release 1.5.3), and <EM>PDCurses</EM> in
+       NetBSD  <EM>curses</EM> adopted <EM>wresize</EM> in 2001 (release 1.5.3), and <EM>PDCurses</EM> in
        2004 (version 2.7).
 
        It is not possible to resize windows with SVr4 <EM>curses</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Thomas Dickey developed <STRONG>wresize</STRONG> as an extension to BSD <EM>curses</EM> in  1988,
+       Thomas Dickey developed <EM>wresize</EM> as an extension to BSD <EM>curses</EM> in  1988,
        and brought it to <EM>ncurses</EM> in mid-1995.
 
 
@@ -108,7 +108,7 @@ <H1 class="no-header">wresize 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2024-07-27                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/form/frm_data.c b/form/frm_data.c
index 940c32db9..1fcb59fc9 100644
--- a/form/frm_data.c
+++ b/form/frm_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_data.c,v 1.21 2021/06/17 21:11:08 tom Exp $")
+MODULE_ID("$Id: frm_data.c,v 1.22 2024/07/27 18:35:02 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -54,7 +54,7 @@ data_behind(const FORM *form)
 
   if (form && (form->status & _POSTED) && form->current)
     {
-      FIELD *field;
+      const FIELD *field;
 
       field = form->current;
       if (!Single_Line_Field(field))
@@ -141,7 +141,7 @@ data_ahead(const FORM *form)
 
   if (form && (form->status & _POSTED) && form->current)
     {
-      FIELD *field;
+      const FIELD *field;
       bool cursor_moved = FALSE;
       int pos;
 
diff --git a/form/frm_driver.c b/form/frm_driver.c
index 75656d69e..179e403cf 100644
--- a/form/frm_driver.c
+++ b/form/frm_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_driver.c,v 1.135 2021/09/01 23:34:01 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.136 2024/07/27 18:49:18 tom Exp $")
 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority
@@ -313,7 +313,7 @@ cell_base(WINDOW *win, int y, int x)
 
   while (LEGALYX(win, y, x))
     {
-      cchar_t *data = &(win->_line[y].text[x]);
+      const cchar_t *data = &(win->_line[y].text[x]);
 
       if (isWidecBase(CHDEREF(data)) || !isWidecExt(CHDEREF(data)))
 	{
@@ -387,7 +387,7 @@ NCURSES_INLINE static FIELD_CELL *
 Get_Start_Of_Data(FIELD_CELL *buf, int blen)
 {
   FIELD_CELL *p = buf;
-  FIELD_CELL *end = &buf[blen];
+  const FIELD_CELL *end = &buf[blen];
 
   assert(buf && blen >= 0);
   while ((p < end) && ISBLANK(*p))
@@ -429,7 +429,7 @@ NCURSES_INLINE static FIELD_CELL *
 Get_First_Whitespace_Character(FIELD_CELL *buf, int blen)
 {
   FIELD_CELL *p = buf;
-  FIELD_CELL *end = &p[blen];
+  const FIELD_CELL *end = &p[blen];
 
   assert(buf && blen >= 0);
   while ((p < end) && !ISBLANK(*p))
@@ -479,7 +479,7 @@ After_Last_Whitespace_Character(FIELD_CELL *buf, int blen)
 NCURSES_INLINE static void
 Adjust_Cursor_Position(FORM *form, const FIELD_CELL *pos)
 {
-  FIELD *field;
+  const FIELD *field;
   int idx;
 
   field = form->current;
@@ -716,7 +716,7 @@ Field_Grown(FIELD *field, int amount)
 	  for (i = 0; i <= field->nbuf; i++)
 	    {
 	      FIELD_CELL *new_bp = Address_Of_Nth_Buffer(field, i);
-	      FIELD_CELL *old_bp = oldbuf + i * (1 + old_buflen);
+	      const FIELD_CELL *old_bp = oldbuf + i * (1 + old_buflen);
 
 	      for (j = 0; j < old_buflen; ++j)
 		new_bp[j] = old_bp[j];
@@ -830,7 +830,7 @@ Field_encloses(FIELD *field, int ry, int rx)
 FORM_EXPORT(int)
 _nc_Position_Form_Cursor(FORM *form)
 {
-  FIELD *field;
+  const FIELD *field;
   WINDOW *formwin;
 
   if (!form)
@@ -1005,7 +1005,7 @@ _nc_Refresh_Current_Field(FORM *form)
 static void
 Perform_Justification(FIELD *field, WINDOW *win)
 {
-  FIELD_CELL *bp;
+  const FIELD_CELL *bp;
   int len;
 
   bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
@@ -1053,7 +1053,7 @@ Perform_Justification(FIELD *field, WINDOW *win)
 static void
 Undo_Justification(FIELD *field, WINDOW *win)
 {
-  FIELD_CELL *bp;
+  const FIELD_CELL *bp;
   int y, x;
   int len;
 
@@ -1702,10 +1702,10 @@ IFN_Previous_Line(FORM *form)
 static int
 IFN_Next_Word(FORM *form)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
   FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
   FIELD_CELL *s;
-  FIELD_CELL *t;
+  const FIELD_CELL *t;
 
   T((T_CALLED("IFN_Next_Word(%p)"), (void *)form));
 
@@ -1745,9 +1745,9 @@ static int
 IFN_Previous_Word(FORM *form)
 {
   FIELD *field = form->current;
-  FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
-  FIELD_CELL *s;
-  FIELD_CELL *t;
+  const FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
+  const FIELD_CELL *s;
+  const FIELD_CELL *t;
   bool again = FALSE;
 
   T((T_CALLED("IFN_Previous_Word(%p)"), (void *)form));
@@ -1845,7 +1845,7 @@ IFN_End_Of_Field(FORM *form)
 static int
 IFN_Beginning_Of_Line(FORM *form)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
 
   T((T_CALLED("IFN_Beginning_Of_Line(%p)"), (void *)form));
   Synchronize_Buffer(form);
@@ -1869,7 +1869,7 @@ IFN_Beginning_Of_Line(FORM *form)
 static int
 IFN_End_Of_Line(FORM *form)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
   FIELD_CELL *pos;
   FIELD_CELL *bp;
 
@@ -2009,7 +2009,7 @@ IFN_Down_Character(FORM *form)
 static int
 VSC_Generic(FORM *form, int nlines)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
   int res = E_REQUEST_DENIED;
   int rows_to_go = (nlines > 0 ? nlines : -nlines);
 
@@ -2189,7 +2189,7 @@ VSC_Scroll_Half_Page_Backward(FORM *form)
 static int
 HSC_Generic(FORM *form, int ncolumns)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
   int res = E_REQUEST_DENIED;
   int cols_to_go = (ncolumns > 0 ? ncolumns : -ncolumns);
 
@@ -2365,7 +2365,8 @@ NCURSES_INLINE static bool
 Is_There_Room_For_A_Line(FORM *form)
 {
   FIELD *field = form->current;
-  FIELD_CELL *begin_of_last_line, *s;
+  FIELD_CELL *begin_of_last_line;
+  const FIELD_CELL *s;
 
   Synchronize_Buffer(form);
   begin_of_last_line = Address_Of_Row_In_Buffer(field, (field->drows - 1));
@@ -2419,7 +2420,7 @@ Is_There_Room_For_A_Char_In_Line(FORM *form)
 |                    E_SYSTEM_ERROR    - system error
 +--------------------------------------------------------------------------*/
 static int
-Insert_String(FORM *form, int row, FIELD_CELL *txt, int len)
+Insert_String(FORM *form, int row, const FIELD_CELL *txt, int len)
 {
   FIELD *field = form->current;
   FIELD_CELL *bp = Address_Of_Row_In_Buffer(field, row);
@@ -2450,7 +2451,7 @@ Insert_String(FORM *form, int row, FIELD_CELL *txt, int len)
 
       if (row < (field->drows - 1))
 	{
-	  FIELD_CELL *split;
+	  const FIELD_CELL *split;
 
 	  split =
 	    After_Last_Whitespace_Character(bp,
@@ -2507,7 +2508,7 @@ Wrapping_Not_Necessary_Or_Wrapping_Ok(FORM *form)
       (!Last_Row || Growable(field)))	/* there are more lines */
     {
       FIELD_CELL *bp;
-      FIELD_CELL *split;
+      const FIELD_CELL *split;
       int chars_to_be_wrapped;
       int chars_to_remain_on_line;
 
@@ -2633,7 +2634,7 @@ static int
 FE_New_Line(FORM *form)
 {
   FIELD *field = form->current;
-  FIELD_CELL *bp, *t;
+  FIELD_CELL *bp;
   bool Last_Row = ((field->drows - 1) == form->currow);
 
   T((T_CALLED("FE_New_Line(%p)"), (void *)form));
@@ -2682,6 +2683,7 @@ FE_New_Line(FORM *form)
 	}
       else
 	{
+	  const FIELD_CELL *t;
 	  bool May_Do_It = !Last_Row && Is_There_Room_For_A_Line(form);
 
 	  if (!(May_Do_It || Growable(field)))
@@ -2810,7 +2812,7 @@ FE_Delete_Character(FORM *form)
 static int
 FE_Delete_Previous(FORM *form)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
 
   T((T_CALLED("FE_Delete_Previous(%p)"), (void *)form));
   if (First_Position_In_Current_Field(form))
@@ -2818,7 +2820,8 @@ FE_Delete_Previous(FORM *form)
 
   if ((--(form->curcol)) < 0)
     {
-      FIELD_CELL *this_line, *prev_line, *prev_end, *this_end;
+      FIELD_CELL *this_line, *prev_line;
+      const FIELD_CELL *prev_end, *this_end;
       int this_row = form->currow;
 
       form->curcol++;
@@ -2898,9 +2901,9 @@ FE_Delete_Line(FORM *form)
 static int
 FE_Delete_Word(FORM *form)
 {
-  FIELD *field = form->current;
+  const FIELD *field = form->current;
   FIELD_CELL *bp = Address_Of_Current_Row_In_Buffer(form);
-  FIELD_CELL *ep = bp + field->dcols;
+  const FIELD_CELL *ep = bp + field->dcols;
   FIELD_CELL *cp = bp + form->curcol;
   FIELD_CELL *s;
 
@@ -4440,7 +4443,7 @@ form_driver(FORM *form, int c)
     {
       MEVENT event;
       WINDOW *win = form->win ? form->win : StdScreen(Get_Form_Screen(form));
-      WINDOW *sub = form->sub ? form->sub : win;
+      const WINDOW *sub = form->sub ? form->sub : win;
 
       getmouse(&event);
       if ((event.bstate & (BUTTON1_CLICKED |
@@ -4641,7 +4644,7 @@ form_driver_w(FORM *form, int type, wchar_t c)
     {
       MEVENT event;
       WINDOW *win = form->win ? form->win : StdScreen(Get_Form_Screen(form));
-      WINDOW *sub = form->sub ? form->sub : win;
+      const WINDOW *sub = form->sub ? form->sub : win;
 
       getmouse(&event);
       if ((event.bstate & (BUTTON1_CLICKED |
@@ -4935,7 +4938,7 @@ FORM_EXPORT(wchar_t *)
 _nc_Widen_String(char *source, int *lengthp)
 {
   wchar_t *result = 0;
-  wchar_t wch;
+  wchar_t wch = 0;
   size_t given = strlen(source);
   size_t tries;
   int pass;
diff --git a/form/frm_post.c b/form/frm_post.c
index ab880894d..a4f4f7d39 100644
--- a/form/frm_post.c
+++ b/form/frm_post.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_post.c,v 1.14 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: frm_post.c,v 1.15 2024/07/27 18:35:02 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -51,7 +51,7 @@ MODULE_ID("$Id: frm_post.c,v 1.14 2020/05/24 01:40:20 anonymous.maarten Exp $")
 FORM_EXPORT(int)
 post_form(FORM *form)
 {
-  WINDOW *formwin;
+  const WINDOW *formwin;
   int err;
   int page;
 
diff --git a/form/frm_sub.c b/form/frm_sub.c
index 8f1de099c..4fb00e7a7 100644
--- a/form/frm_sub.c
+++ b/form/frm_sub.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_sub.c,v 1.15 2021/06/17 21:20:30 tom Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.16 2024/07/27 18:35:02 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -54,9 +54,8 @@ set_form_sub(FORM *form, WINDOW *win)
   else
     {
 #if NCURSES_SP_FUNCS
-      FORM *f = Normalize_Form(form);
-
-      f->sub = win ? win : StdScreen(Get_Form_Screen(f));
+      (void) Normalize_Form(form);
+      form->sub = win ? win : StdScreen(Get_Form_Screen(form));
       RETURN(E_OK);
 #else
       Normalize_Form(form)->sub = win;
@@ -76,12 +75,10 @@ set_form_sub(FORM *form, WINDOW *win)
 FORM_EXPORT(WINDOW *)
 form_sub(const FORM *form)
 {
-  const FORM *f;
-
   T((T_CALLED("form_sub(%p)"), (const void *)form));
 
-  f = Normalize_Form(form);
-  returnWin(Get_Form_Window(f));
+  (void) Normalize_Form(form);
+  returnWin(Get_Form_Window(form));
 }
 
 /* frm_sub.c ends here */
diff --git a/form/frm_win.c b/form/frm_win.c
index eeea27d37..eb4982922 100644
--- a/form/frm_win.c
+++ b/form/frm_win.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_win.c,v 1.19 2021/06/17 21:20:30 tom Exp $")
+MODULE_ID("$Id: frm_win.c,v 1.20 2024/07/27 18:35:02 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -54,9 +54,8 @@ set_form_win(FORM *form, WINDOW *win)
   else
     {
 #if NCURSES_SP_FUNCS
-      FORM *f = Normalize_Form(form);
-
-      f->win = win ? win : StdScreen(Get_Form_Screen(f));
+      (void) Normalize_Form(form);
+      form->win = win ? win : StdScreen(Get_Form_Screen(form));
       RETURN(E_OK);
 #else
       Normalize_Form(form)->win = win;
@@ -77,15 +76,14 @@ FORM_EXPORT(WINDOW *)
 form_win(const FORM *form)
 {
   WINDOW *result;
-  const FORM *f;
 
   T((T_CALLED("form_win(%p)"), (const void *)form));
 
-  f = Normalize_Form(form);
+  (void) Normalize_Form(form);
 #if NCURSES_SP_FUNCS
-  result = (f->win ? f->win : StdScreen(Get_Form_Screen(f)));
+  result = (form->win ? form->win : StdScreen(Get_Form_Screen(form)));
 #else
-  result = (f->win ? f->win : stdscr);
+  result = (form->win ? form->win : stdscr);
 #endif
   returnWin(result);
 }
diff --git a/form/fty_enum.c b/form/fty_enum.c
index 16ffae110..07a501e87 100644
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020,2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_enum.c,v 1.33 2021/06/17 21:11:08 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.34 2024/07/27 18:50:22 tom Exp $")
 
 typedef struct
   {
@@ -291,21 +291,21 @@ Check_Enum_Field(FIELD *field, const void *argp)
   char **kwds = ((const enumARG *)argp)->kwds;
   bool ccase = ((const enumARG *)argp)->checkcase;
   bool unique = ((const enumARG *)argp)->checkunique;
-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
-  char *s, *t, *p;
+  const unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+  const char *s, *t, *p;
 
   while (kwds && (s = (*kwds++)))
     {
       int res;
 
-      if ((res = Compare((unsigned char *)s, bp, ccase)) != NOMATCH)
+      if ((res = Compare((const unsigned char *)s, bp, ccase)) != NOMATCH)
 	{
 	  p = t = s;		/* t is at least a partial match */
 	  if ((unique && res != EXACT))
 	    {
 	      while (kwds && (p = *kwds++))
 		{
-		  if ((res = Compare((unsigned char *)p, bp, ccase)) != NOMATCH)
+		  if ((res = Compare((const unsigned char *)p, bp, ccase)) != NOMATCH)
 		    {
 		      if (res == EXACT)
 			{
@@ -313,7 +313,7 @@ Check_Enum_Field(FIELD *field, const void *argp)
 			  break;
 			}
 		      else
-			t = (char *)0;
+			t = NULL;
 		    }
 		}
 	    }
@@ -347,12 +347,13 @@ Next_Enum(FIELD *field, const void *argp)
 {
   const enumARG *args = (const enumARG *)argp;
   char **kwds = args->kwds;
-  bool ccase = args->checkcase;
-  int cnt = args->count;
-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+  const unsigned char *bp = (const unsigned char *)field_buffer(field, 0);
 
   if (kwds)
     {
+      int cnt = args->count;
+      bool ccase = args->checkcase;
+
       while (cnt--)
 	{
 	  if (Compare((unsigned char *)(*kwds++), bp, ccase) == EXACT)
@@ -386,26 +387,25 @@ Previous_Enum(FIELD *field, const void *argp)
   const enumARG *args = (const enumARG *)argp;
   int cnt = args->count;
   char **kwds = &args->kwds[cnt - 1];
+  const unsigned char *bp = (const unsigned char *)field_buffer(field, 0);
+
   bool ccase = args->checkcase;
-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
 
-  if (kwds)
+  while (cnt--)
     {
-      while (cnt--)
-	{
-	  if (Compare((unsigned char *)(*kwds--), bp, ccase) == EXACT)
-	    break;
-	}
+      if (Compare((unsigned char *)(*kwds--), bp, ccase) == EXACT)
+	break;
+    }
 
-      if (cnt <= 0)
-	kwds = &args->kwds[args->count - 1];
+  if (cnt <= 0)
+    kwds = &args->kwds[args->count - 1];
 
-      if ((cnt >= 0) || (Compare((const unsigned char *)dummy, bp, ccase) == EXACT))
-	{
-	  set_field_buffer(field, 0, *kwds);
-	  return TRUE;
-	}
+  if ((cnt >= 0) || (Compare((const unsigned char *)dummy, bp, ccase) == EXACT))
+    {
+      set_field_buffer(field, 0, *kwds);
+      return TRUE;
     }
+
   return FALSE;
 }
 
diff --git a/form/fty_generic.c b/form/fty_generic.c
index 301c80a1f..5914d258d 100644
--- a/form/fty_generic.c
+++ b/form/fty_generic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2008-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_generic.c,v 1.15 2021/03/27 23:49:53 tom Exp $")
+MODULE_ID("$Id: fty_generic.c,v 1.16 2024/07/27 18:51:24 tom Exp $")
 
 /*
  * This is not a full implementation of a field type, but adds some
@@ -231,7 +231,7 @@ _nc_set_generic_fieldtype(FIELD *field,
 
   if (field)
     {
-      if (field && field->type)
+      if (field->type)
 	_nc_Free_Type(field);
 
       field->type = ftyp;
diff --git a/form/fty_int.c b/form/fty_int.c
index c7e3135c8..328780bbd 100644
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020,2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_int.c,v 1.33 2021/06/17 21:11:08 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.34 2024/07/27 18:35:02 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
@@ -73,7 +73,7 @@ static void *
 Generic_This_Type(void *arg)
 {
   thisARG *argp = (thisARG *)0;
-  thisARG *param = (thisARG *)arg;
+  const thisARG *param = (thisARG *)arg;
 
   if (param)
     {
@@ -169,7 +169,7 @@ Check_This_Field(FIELD *field, const void *argp)
   long high = argi->high;
   int prec = argi->precision;
   unsigned char *bp = (unsigned char *)field_buffer(field, 0);
-  char *s = (char *)bp;
+  const char *s = (char *)bp;
   bool result = FALSE;
 
   while (*bp == ' ')
diff --git a/form/fty_num.c b/form/fty_num.c
index 34cef6364..c51bca892 100644
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_num.c,v 1.37 2021/03/27 23:49:58 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.38 2024/07/27 18:33:58 tom Exp $")
 
 #if HAVE_LOCALE_H
 #include <locale.h>
@@ -84,7 +84,7 @@ static void *
 Generic_This_Type(void *arg)
 {
   thisARG *argn = (thisARG *)0;
-  thisPARM *args = (thisPARM *)arg;
+  const thisPARM *args = (thisPARM *)arg;
 
   if (args)
     {
@@ -187,8 +187,8 @@ Check_This_Field(FIELD *field, const void *argp)
   double high = argn->high;
   int prec = argn->precision;
   unsigned char *bp = (unsigned char *)field_buffer(field, 0);
-  char *s = (char *)bp;
-  struct lconv *L = argn->L;
+  const char *s = (char *)bp;
+  const struct lconv *L = argn->L;
   bool result = FALSE;
 
   while (*bp == ' ')
diff --git a/include/capdefaults.c b/include/capdefaults.c
index 0bdda14de..2405b89a3 100644
--- a/include/capdefaults.c
+++ b/include/capdefaults.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2000,2008 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: capdefaults.c,v 1.16 2021/09/04 10:52:55 tom Exp $ */
+/* $Id: capdefaults.c,v 1.17 2024/07/27 19:19:23 tom Exp $ */
 
     /*
      * Compute obsolete capabilities.  The reason this is an include file is
@@ -45,7 +45,7 @@
      * postprocess_termcap().
      */
 {
-    char *strp;
+    const char *strp;
     short capval;
 
 #define EXTRACT_DELAY(str) \
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index cc73aafea..8e293b928 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp $
-.TH curs_add_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp $
+.TH curs_add_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -534,10 +534,11 @@ specified functions named
 and
 .I \%wechowchar
 (and the usual variants).
+.\" SVID 4, vol 3., p. 475
 These were later additions to
 .RI SVr4. x ,
 not appearing in the first SVr4 (1989).
-They differed from X/Open's
+They differed from X/Open's later
 .I \%wadd_wch
 and
 .I \%wecho_wchar
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index bf28a61eb..145a270ff 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp $
-.TH curs_add_wchstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp $
+.TH curs_add_wchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,27 +46,27 @@
 ..
 .SH NAME
 \fB\%add_wchstr\fP,
-\fB\%add_wchnstr\fP,
 \fB\%wadd_wchstr\fP,
-\fB\%wadd_wchnstr\fP,
 \fB\%mvadd_wchstr\fP,
-\fB\%mvadd_wchnstr\fP,
 \fB\%mvwadd_wchstr\fP,
+\fB\%add_wchnstr\fP,
+\fB\%wadd_wchnstr\fP,
+\fB\%mvadd_wchnstr\fP,
 \fB\%mvwadd_wchnstr\fP \-
 add a \fIcurses\fR complex character string to a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint add_wchstr(const cchar_t *\fIwchstr\fP);
-\fBint wadd_wchstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP);
-\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
-\fBint mvwadd_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+\fBint add_wchstr(const cchar_t * \fIwchstr\fP);
+\fBint wadd_wchstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP);
+\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
+\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
 .PP
-\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
-\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
-\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
-\fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint add_wchnstr(const cchar_t * \fIwchstr\fP, int \fIn\fP);
+\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%wadd_wchstr
@@ -75,7 +75,7 @@ copies the string of complex characters
 to the window
 .IR win "."
 A null complex character terminates the string.
-If a complex character does completely fit at the end of the line,
+If a complex character does not completely fit at the end of the line,
 .I curses
 fills the remaining columns with the window background;
 see \fB\%bkgrnd\fP(3X).
@@ -112,9 +112,9 @@ on success and
 .B ERR
 on failure.
 .PP
-X/Open Curses does not specify any error conditions.
-.I \%ncurses
-returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
 if
 .bP
@@ -139,6 +139,7 @@ may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
 .SH HISTORY
 These functions were initially specified by X/Open Curses,
 Issue 4.
@@ -149,10 +150,11 @@ specified functions named
 and
 .I \%waddwchnstr
 (and the usual variants).
+.\" SVID 4, vol 3., p. 477
 These were later additions to
 .RI SVr4. x ,
 not appearing in the first SVr4 (1989).
-They differed from X/Open's
+They differed from X/Open's later
 .I \%wadd_wchstr
 and
 .I \%wadd_wchnstr
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index dc2c7ac15..187911c4c 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp $
-.TH curs_addch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp $
+.TH curs_addch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -470,12 +470,13 @@ current locale.
 .bP
 If it can,
 call either
-.B \%waddch
-or \fB\%wadd_wch\fP(3X).
+.I \%waddch
+or
+.IR \%wadd_wch "."
 .bP
 If it cannot,
 use only
-\fB\%wadd_wch\fP(3X).
+.IR \%wadd_wch "."
 .SH HISTORY
 4BSD (1980)
 .I curses
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 2df7138c0..5d1a5c568 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp $
-.TH curs_addchstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp $
+.TH curs_addchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,27 +46,27 @@
 ..
 .SH NAME
 \fB\%addchstr\fP,
-\fB\%addchnstr\fP,
 \fB\%waddchstr\fP,
-\fB\%waddchnstr\fP,
 \fB\%mvaddchstr\fP,
-\fB\%mvaddchnstr\fP,
 \fB\%mvwaddchstr\fP,
+\fB\%addchnstr\fP,
+\fB\%waddchnstr\fP,
+\fB\%mvaddchnstr\fP,
 \fB\%mvwaddchnstr\fP \-
 add a \fIcurses\fR character string to a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint addchstr(const chtype *\fIchstr\fP);
-\fBint waddchstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP);
-\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
-\fBint mvwaddchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+\fBint addchstr(const chtype * \fIchstr\fP);
+\fBint waddchstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP);
+\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
+\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
 .PP
-\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
-\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
-\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
-\fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint addchnstr(const chtype * \fIchstr\fP, int \fIn\fP);
+\fBint waddchnstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%waddchstr
@@ -112,9 +112,9 @@ on success and
 .B ERR
 on failure.
 .PP
-X/Open Curses does not specify any error conditions.
-.I \%ncurses
-returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
 if
 .bP
@@ -139,6 +139,13 @@ may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
+.SH HISTORY
+SVr3.1 (1987)
+introduced
+.I \%waddchstr
+and
+.IR \%waddchnstr "."
 .SH SEE ALSO
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index e835bd1ff..a213544cf 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp $
-.TH curs_addstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp $
+.TH curs_addstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,12 +46,12 @@
 ..
 .SH NAME
 \fB\%addstr\fP,
-\fB\%addnstr\fP,
 \fB\%waddstr\fP,
-\fB\%waddnstr\fP,
 \fB\%mvaddstr\fP,
-\fB\%mvaddnstr\fP,
 \fB\%mvwaddstr\fP,
+\fB\%addnstr\fP,
+\fB\%waddnstr\fP,
+\fB\%mvaddnstr\fP,
 \fB\%mvwaddnstr\fP \-
 add a string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
@@ -59,14 +59,14 @@ add a string to a \fIcurses\fR window and advance the cursor
 \fB#include <curses.h>
 .PP
 \fBint addstr(const char * \fIstr\fP);
+\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
 \fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
 \fBint mvwaddstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
-\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
 .PP
 \fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
+\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
 \fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
 \fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
-\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B waddstr
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 6077798c6..c5db7c592 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp $
-.TH curs_addwstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp $
+.TH curs_addwstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,12 +46,12 @@
 ..
 .SH NAME
 \fB\%addwstr\fP,
-\fB\%addnwstr\fP,
 \fB\%waddwstr\fP,
-\fB\%waddnwstr\fP,
 \fB\%mvaddwstr\fP,
-\fB\%mvaddnwstr\fP,
 \fB\%mvwaddwstr\fP,
+\fB\%addnwstr\fP,
+\fB\%waddnwstr\fP,
+\fB\%mvaddnwstr\fP,
 \fB\%mvwaddnwstr\fP \-
 add a wide-character string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
@@ -59,14 +59,14 @@ add a wide-character string to a \fIcurses\fR window and advance the cursor
 \fB#include <curses.h>
 .PP
 \fBint addwstr(const wchar_t * \fIwstr\fP);
+\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
 \fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
 \fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
-\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
 .PP
 \fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
-\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B waddwstr
@@ -140,11 +140,17 @@ may be implemented as macros.
 X/Open Curses,
 Issue 4 describes these functions.
 .SH HISTORY
-.I \%waddstr
+The System\ V Interface Definition,
+Version 4 (1995),
+specified
+.I \%waddwstr
 and
-.I \%waddnstr
-appeared late in SVr4 development (1995).
+.I \%waddnwstr
+(and the usual variants).
 .\" SVID 4, vol 3., p. 478
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
 .SH SEE ALSO
 \fB\%curs_addstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index d15995e25..9072b2938 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp $
-.TH curs_attr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp $
+.TH curs_attr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -156,8 +156,12 @@ which assume that color pairs are OR'd into the attribute parameter.
 These newer routines use similar names, because
 X/Open simply added an underscore (\fB_\fP) for the newer names.
 .PP
-The \fBint\fP datatype used in the legacy routines is treated as if
-it is the same size as \fBchtype\fP (used by \fBaddch\fP(3X)).
+The
+.I int
+datatype used in the legacy routines is treated as if
+it is the same size as
+.I \%chtype
+(used by \fBaddch\fP(3X)).
 It holds the common video attributes (such as bold, reverse),
 as well as a few bits for color.
 Those bits correspond to the \fBA_COLOR\fP symbol.
@@ -177,12 +181,16 @@ attr_set(A_BOLD, \fIpair\fP, NULL);
 However, if the value does not fit, then the \fBCOLOR_PAIR\fP macro
 uses only the bits that fit.
 For example,
-because in \fI\%ncurses\fP \fBA_COLOR\fP has eight (8) bits,
+because in
+.I \%ncurses
+\fBA_COLOR\fP has eight (8) bits,
 then \fBCOLOR_PAIR(\fI259\fB)\fR is 4
 (i.e., 259 is 4 more than the limit 255).
 .PP
-The \fBPAIR_NUMBER\fP macro extracts a pair number from an \fBint\fP
-(or \fBchtype\fP).
+The \fBPAIR_NUMBER\fP macro extracts a pair number from an
+.I int
+(or
+.IR \%chtype ")."
 For example, the \fIinput\fP and \fIoutput\fP values in these statements
 would be the same:
 .PP
@@ -193,17 +201,24 @@ int \fIoutput\fP = PAIR_NUMBER(value);
 .EE
 .RE
 .PP
-The \fBattrset\fP routine is a legacy feature predating SVr4 curses
-but kept in X/Open Curses for the same reason that SVr4 curses kept it:
+The \fBattrset\fP routine is a legacy feature predating SVr4
+.I curses
+but kept in X/Open Curses for the same reason that SVr4
+.I curses
+kept it:
 compatibility.
 .PP
 The remaining \fBattr\fP* functions operate exactly like the corresponding
-\fBattr_\fP* functions, except that they take arguments of type \fBint\fP
-rather than \fBattr_t\fP.
+\fBattr_\fP* functions, except that they take arguments of type
+.I int
+rather than
+.IR \%attr_t "."
 .PP
 There is no corresponding \fB\%attrget\fP function as such
 in X/Open Curses,
-although \fI\%ncurses\fP provides \fB\%getattrs\fP
+although
+.I \%ncurses
+provides \fB\%getattrs\fP
 (see \fB\%curs_legacy\fP(3X)).
 .\" ---------------------------------------------------------------------------
 .SS "Change Character Rendition"
@@ -304,23 +319,38 @@ implemented as macro-expanded assignments and simply return their argument).
 The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
 .\" ---------------------------------------------------------------------------
 .SH RETURN VALUE
-All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
-.PP
-X/Open Curses does not specify any error conditions.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-This implementation
-.bP
-returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
-if the window pointer is null.
-.bP
+if
+.I win
+is
+.BR NULL "."
+.PP
+.B \%wcolor_set
 returns
 .B ERR
-if the color pair parameter
-for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
-.bP
-does not fail if either of the parameters of \fBwattr_get\fP
-used for retrieving attribute or color pair values is \fBNULL\fP.
+if
+.I pair
+is outside the range
+.BR 0 .\|. COLOR_PAIRS\-1 .
+.PP
+.B \%wattr_get
+does
+.I not
+fail if its
+.I \%attrs
+or
+.I \%pair
+parameter is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -340,9 +370,13 @@ Color pair values can only be OR'd with attributes if the pair
 number is less than 256.
 The alternate functions such as \fBcolor_set\fP can pass a color pair
 value directly.
-However, \fI\%ncurses\fP ABI 4 and 5 simply OR this value
+However,
+.I \%ncurses
+ABI 4 and 5 simply OR this value
 within the alternate functions.
-You must use \fI\%ncurses\fP ABI 6 to support more than 256 color pairs.
+You must use
+.I \%ncurses
+ABI 6 to support more than 256 color pairs.
 .\" ---------------------------------------------------------------------------
 .SH EXTENSIONS
 This implementation provides the \fBA_ITALIC\fP attribute for terminals
@@ -362,15 +396,24 @@ have a color pair parameter to support \fIextended color pairs\fP:
 .bP
 For functions which modify the color, e.g.,
 \fBwattr_set\fP and \fBwattr_on\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to set the color pair instead of the \fBshort\fP \fIpair\fP parameter.
+if \fIopts\fP is set it is treated as a pointer to
+.IR int ","
+and used to set the color pair instead of the
+.I short
+.I pair
+parameter.
 .bP
 For functions which retrieve the color, e.g.,
 \fBwattr_get\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to retrieve the color pair as an \fBint\fP value,
+if \fIopts\fP is set it is treated as a pointer to
+.IR int ","
+and used to retrieve the color pair as an
+.I int
+value,
 in addition to
-retrieving it via the standard pointer to \fBshort\fP parameter.
+retrieving it via the standard pointer to
+.I short
+parameter.
 .bP
 For functions which turn attributes off, e.g.,
 \fBwattr_off\fP,
@@ -379,9 +422,15 @@ except to check that it is \fBNULL\fP.
 .\" ---------------------------------------------------------------------------
 .SH PORTABILITY
 These functions are described in X/Open Curses, Issue 4.
+It specifies no error conditions for them.
+.PP
 The standard defined the dedicated type for highlights,
-\fBattr_t\fP, which was not defined in SVr4 curses.
-The functions taking \fBattr_t\fP arguments were not supported under SVr4.
+.IR \%attr_t ","
+which was not defined in SVr4
+.IR curses "."
+The functions taking
+.I \%attr_t
+arguments were not supported under SVr4.
 .PP
 Very old versions of this library did not force an update of the screen
 when changing the attributes.
@@ -392,7 +441,9 @@ X/Open Curses states that whether the traditional functions
 \fBA_BLINK\fP, \fBA_BOLD\fP, \fBA_DIM\fP, \fBA_REVERSE\fP, \fBA_STANDOUT\fP, or
 \fBA_UNDERLINE\fP is \*(``unspecified\*(''.
 Under this implementation as well as
-SVr4 curses, these functions correctly manipulate all other highlights
+SVr4
+.IR curses ","
+these functions correctly manipulate all other highlights
 (specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
 .PP
 X/Open Curses added these entry points:
@@ -437,18 +488,29 @@ information.
 .bP
 However, in some implementations, those symbols have unrelated values.
 .IP
-For example, the Solaris \fIxpg4\fP (X/Open) curses declares
-\fBattr_t\fP to be an unsigned short integer (16-bits),
-while \fBchtype\fP is a unsigned integer (32-bits).
+For example, the Solaris \fIxpg4\fP (X/Open)
+.I curses
+declares
+.I \%attr_t
+to be an unsigned short integer (16-bits),
+while
+.I \%chtype
+is a unsigned integer (32-bits).
 The \fBWA_\fP symbols in this case are different from the \fBA_\fP symbols
 because they are used for a smaller datatype which does not
 represent \fBA_CHARTEXT\fP or \fBA_COLOR\fP.
 .IP
 In this implementation (as in many others), the values happen to be
 the same because it simplifies copying information between
-\fBchtype\fP and \fBcchar_t\fP variables.
+.I \%chtype
+and
+.I \%cchar_t
+variables.
 .bP
-Because \fI\%ncurses\fP's \fBattr_t\fP can hold a color pair
+Because
+.IR \%ncurses 's
+.I \%attr_t
+can hold a color pair
 (in the \fBA_COLOR\fP field),
 a call to
 \fBwattr_on\fP,
@@ -458,7 +520,8 @@ may alter the window's color.
 If the color pair information in the attribute parameter is zero,
 no change is made to the window's color.
 .IP
-This is consistent with SVr4 curses;
+This is consistent with SVr4
+.IR curses ";"
 X/Open Curses does not specify this.
 .PP
 The X/Open Curses extended conformance level adds new highlights
@@ -469,24 +532,39 @@ no known terminal provides these highlights
 (i.e., via the \fBsgr1\fP capability).
 .\" ---------------------------------------------------------------------------
 .SH HISTORY
-X/Open Curses is largely based on SVr4 curses,
+X/Open Curses is largely based on SVr4
+.IR curses ","
 adding support for \*(``wide-characters\*('' (not specific to Unicode).
-Some of the X/Open differences from SVr4 curses address the way
+Some of the X/Open differences from SVr4
+.I curses
+address the way
 video attributes can be applied to wide-characters.
 But aside from that, \fBattrset\fP and \fBattr_set\fP are similar.
-SVr4 curses provided the basic features for manipulating video attributes.
-However, earlier versions of curses provided a part of these features.
-.PP
-As seen in 2.8BSD, curses assumed 7-bit characters,
+SVr4
+.I curses
+provided the basic features for manipulating video attributes.
+However, earlier versions of
+.I curses
+provided a part of these features.
+.PP
+As seen in 2.8BSD,
+.I curses
+assumed 7-bit characters,
 using the eighth bit of a byte to represent the \fIstandout\fP
 feature (often implemented as bold and/or reverse video).
-The BSD curses library provided functions \fBstandout\fP and \fBstandend\fP
+The BSD
+.I curses
+library provided functions \fBstandout\fP and \fBstandend\fP
 which were carried along into X/Open Curses due to their pervasive use
 in legacy applications.
 .PP
 Some terminals in the 1980s could support a variety of video attributes,
-although the BSD curses library could do nothing with those.
-System V (1983) provided an improved curses library.
+although the BSD
+.I curses
+library could do nothing with those.
+System V (1983) provided an improved
+.I curses
+library.
 It defined the \fBA_\fP symbols for use by applications to manipulate the
 other attributes.
 There are few useful references for the chronology.
@@ -496,7 +574,9 @@ Goodheart's book
 commenting on several functions:
 .bP
 the \fBattron\fP, \fBattroff\fP, \fBattrset\fP functions
-(and most of the functions found in SVr4 but not in BSD curses) were
+(and most of the functions found in SVr4 but not in BSD
+.IR curses ")"
+were
 introduced by System V,
 .bP
 the alternate character set feature with \fBA_ALTCHARSET\fP was
@@ -506,19 +586,24 @@ added in SVr2 and improved in SVr3 (by adding \fBacs_map[]\fP),
 .bP
 pads, soft-keys were added in SVr3, and
 .PP
-Goodheart did not mention the background character or the \fBcchar_t\fP type.
+Goodheart did not mention the background character or the
+.I \%cchar_t
+type.
 Those are respectively SVr4 and X/Open features.
 He did mention the \fBA_\fP constants, but did not indicate their values.
 Those were not the same in different systems,
 even for those marked as System V.
 .PP
-Different Unix systems used different sizes for the bit-fields in \fBchtype\fP
+Different Unix systems used different sizes for the bit-fields in
+.I \%chtype
 for \fIcharacters\fP and \fIcolors\fP, and took into account the different
 integer sizes (32-bit versus 64-bit).
 .PP
 This table showing the number of bits for \fBA_COLOR\fP
 and \fBA_CHARTEXT\fP
-was gleaned from the curses header files for
+was gleaned from the
+.I curses
+header files for
 various operating systems and architectures.
 The inferred architecture and notes reflect
 the format and size of the defined constants
@@ -554,51 +639,70 @@ Regarding HP-UX,
 HP-UX 10.20 (1996) added support for 64-bit PA-RISC processors in 1996.
 .bP
 HP-UX 10.30 (1997) marked \*(``curses_colr\*('' obsolete.
-That version of curses was dropped with HP-UX 11.30 in 2006.
+That version of
+.I curses
+was dropped with HP-UX 11.30 in 2006.
 .PP
 Regarding OSF/1 (and Tru64),
 .bP
 These used 64-bit hardware.
-Like \fI\%ncurses\fP,
-the OSF/1 curses interface is not customized for 32-bit and 64-bit
+Like
+.IR \%ncurses ","
+the OSF/1
+.I curses
+interface is not customized for 32-bit and 64-bit
 versions.
 .bP
 Unlike other systems which evolved from AT&T code,
-OSF/1 provided a new implementation for X/Open curses.
+OSF/1 provided a new implementation for X/Open Curses.
 .PP
 Regarding Solaris,
 .bP
 The initial release of Solaris was in 1992.
 .bP
-The \fIxpg4\fP (X/Open) curses was developed by MKS from 1990 to 1995.
+The \fIxpg4\fP (X/Open) Curses was developed by MKS from 1990 to 1995.
 Sun's copyright began in 1996.
 .bP
-Sun updated the X/Open curses interface
+Sun updated the X/Open Curses interface
 after 64-bit support was introduced in 1997,
-but did not modify the SVr4 curses interface.
+but did not modify the SVr4
+.I curses
+interface.
 .PP
 Regarding U/Win,
 .bP
-Development of the curses library began in 1991, stopped in 2000.
+Development of the
+.I curses
+library began in 1991, stopped in 2000.
 .bP
 Color support was added in 1998.
 .bP
-The library uses only \fBchtype\fP (no \fBcchar_t\fP).
+The library uses only
+.I \%chtype
+(no
+.IR \%cchar_t ")."
 .RE
 .PP
-Once X/Open curses was adopted in the mid-1990s, the constraint of
-a 32-bit interface with many colors and wide-characters for \fBchtype\fP
+Once X/Open Curses was adopted in the mid-1990s, the constraint of
+a 32-bit interface with many colors and wide-characters for
+.I \%chtype
 became a moot point.
-The \fBcchar_t\fP structure (whose size and
+The
+.I \%cchar_t
+structure (whose size and
 members are not specified in X/Open Curses) could be extended as needed.
 .PP
 Other interfaces are rarely used now:
 .bP
-BSD curses was improved slightly in 1993/1994 using Keith Bostic's
+BSD
+.I curses
+was improved slightly in 1993/1994 using Keith Bostic's
 modification to make the library 8-bit clean for \fBnvi\fP(1).
 He moved \fIstandout\fP attribute to a structure member.
 .IP
-The resulting 4.4BSD curses was replaced by \fI\%ncurses\fP over the
+The resulting 4.4BSD
+.I curses
+was replaced by \fI\%ncurses\fP over the
 next ten years.
 .bP
 U/Win is rarely used now.
diff --git a/man/curs_border.3x b/man/curs_border.3x
index d8990fb3b..4d159f6f3 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp $
-.TH curs_border 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp $
+.TH curs_border 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -141,7 +141,6 @@ The SVr4.0 manual says
 \*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
 but this appears to be an error.
 .PP
-X/Open Curses does not specify any error conditions.
 This implementation returns
 .B ERR
 if the window pointer is null.
@@ -158,6 +157,7 @@ is also true of SVr4 curses, though the fact is not documented).
 Note that \fBborder\fP and \fBbox\fP may be macros.
 .SH PORTABILITY
 These functions are described in X/Open Curses, Issue 4.
+It specifies no error conditions for them.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 969215872..260969325 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp $
-.TH curs_delch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp $
+.TH curs_delch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,9 +50,9 @@ delete a character from a \fIcurses\fR window
 \fB#include <curses.h>
 .PP
 \fBint delch(void);
-\fBint wdelch(WINDOW *\fIwin\fP);
+\fBint wdelch(WINDOW * \fIwin\fP);
 \fBint mvdelch(int \fIy\fP, int \fIx\fP);
-\fBint mvwdelch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBint mvwdelch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
 .B \%wdelch
@@ -76,10 +76,14 @@ on success and
 .B ERR
 on failure.
 .PP
-Functions taking a
-.I \%WINDOW
-pointer argument fail if the pointer is
-.BR NULL .
+In
+.IR \%ncurses ,
+they return
+.B ERR
+if
+.I win
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -108,5 +112,8 @@ SVr4
 describes a successful return value only as
 \*(``an integer value other than
 .BR ERR \*(''.
+.SH HISTORY
+SVr2 (1984) introduced
+.IR \%delch "."
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 6d70a4358..7af323238 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp $
-.TH curs_deleteln 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp $
+.TH curs_deleteln 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -43,62 +43,103 @@
 .SH NAME
 \fB\%deleteln\fP,
 \fB\%wdeleteln\fP,
-\fB\%insdelln\fP,
-\fB\%winsdelln\fP,
 \fB\%insertln\fP,
-\fB\%winsertln\fP \-
+\fB\%winsertln\fP,
+\fB\%insdelln\fP,
+\fB\%winsdelln\fP \-
 delete or insert lines in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
 \fBint deleteln(void);
-\fBint wdeleteln(WINDOW *\fIwin\fP);
-.PP
-\fBint insdelln(int \fIn\fP);
-\fBint winsdelln(WINDOW *\fIwin\fP, int \fIn\fP);
+\fBint wdeleteln(WINDOW * \fIwin\fP);
 .PP
 \fBint insertln(void);
-\fBint winsertln(WINDOW *\fIwin\fP);
+\fBint winsertln(WINDOW * \fIwin\fP);
+.PP
+\fBint insdelln(int \fIn\fP);
+\fBint winsdelln(WINDOW * \fIwin\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
-cursor in the window; all lines below the current line are moved up one line.
-The bottom line of the window is cleared.
+.B \%wdeleteln
+deletes the line at the cursor in
+.IR win ;
+all lines below it move up one line.
+.I curses
+then fills the bottom line of
+.I win
+with the blank character
+configured by \fB\%wbkgdset\fP(3X)
+(wide-character API users: \fB\%wbkgrndset\fP(3X)).
+The cursor position does not change.
+.PP
+.B \%winsertln
+inserts a line of blank characters above the line at the cursor in
+.IR win ;
+the content of the window's bottom line is lost.
 The cursor position does not change.
 .PP
-The \fBinsdelln\fP and \fBwinsdelln\fP routines, for positive \fIn\fP, insert
-\fIn\fP lines into the specified window above the current line.
-The \fIn\fP
-bottom lines are lost.
-For negative \fIn\fP, delete \fIn\fP lines (starting
-with the one under the cursor), and move the remaining lines up.
-The bottom
-\fIn\fP lines are cleared.
-The current cursor position remains the same.
+.B \%winsdelln
+inserts or deletes
+.IR n\  lines
+in
+.I win
+as
+.I n
+is positive or negative,
+respectively,
+as if by repeatedly calling
+.B \%winsertln
+or
+.BR \%wdeleteln "."
 .PP
-The \fBinsertln\fP and \fBwinsertln\fP routines insert a blank line above the
-current line and the bottom line is lost.
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open defines no error conditions.
-In this implementation,
-if the window parameter is null, an error is returned.
+In
+.IR \%ncurses ","
+they fail if
+.I win
+is
+.BR NULL "."
 .SH NOTES
-Note that all but \fBwinsdelln\fP may be macros.
+All of these functions except
+.B \%winsdelln
+may be implemented as macros.
 .PP
-These routines do not require a hardware line delete or insert feature in the
-terminal.
-In fact, they will not use hardware line delete/insert unless
-\fBidlok(..., TRUE)\fP has been set on the current window.
+These functions do not require the terminal
+to possess hardware line deletion or insertion capabilities.
+Even if available,
+by default
+.I curses
+does not use them;
+see \fB\%idlok\fP(3X).
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
-The
-standard specifies that they return \fBERR\fP on failure, but specifies no
-error conditions.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.I \%wdeleteln
+and
+.IR \%winsertln "."
+.PP
+SVr3.1 (1987)
+added
+.IR \%winsdelln "."
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 01cf9d2ec..64a34f176 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH curs_extend 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp $
+.TH curs_extend 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,36 +50,51 @@ miscellaneous \fIcurses\fR extensions
 \fB#include <curses.h>
 .PP
 \fBconst char * curses_version(void);
-\fBint use_extended_names(bool \fIenable\fP);
+\fBint use_extended_names(bool \fIbf\fP);
 .fi
 .SH DESCRIPTION
-These functions are extensions to the curses library
-which do not fit easily into other categories.
+These
+.I \%ncurses
+extensions to the
+.I curses
+library do not fit easily into other functional categories.
 .SS curses_version
-Use \fBcurses_version\fP
-to get the version number, including patch level of the library,
-prefixed by \*(``ncurses\*('', e.g.,
-.RS
-.sp
-.B ncurses 5.0.19991023
-.RE
+.B \%curses_version
+returns a pointer to a string containing the library's name
+and version number,
+including its patch level,
+for example
+\*(``ncurses 6.5.20240720\*(''.
 .SS 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
-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 \fB\-x\fP option of \fB@TIC@\fP to compile
-extended terminal definitions.
-However you can disable this feature
-to ensure compatibility with other implementations of curses.
+.B \%use_extended_names
+configures whether the library recognizes
+user-defined or nonstandard
+.I \%term\%info
+capability names that may be compiled into terminal type descriptions
+via the \fB\%curs_terminfo\fP(3X) or \fB\%curs_termcap\fP(3X) interfaces.
+Normally these names are available for use,
+since the essential decision
+is made through use of \fB\%@TIC@\fP(1)'s
+.B \-x
+option to include such extensions in terminal type descriptions.
+.B \%use_extended_names
+can prevent
+.I \%ncurses
+from recognizing these capabilities
+to ensure compatibility with other implementations of
+.IR curses .
 .SH RETURN VALUE
-\fBcurses_version\fP returns a pointer to static memory; you should not free
-this in your application.
+.B \%curses_version
+returns a constant string.
 .PP
-\fBuse_extended_names\fP returns the previous state, allowing you to
-save this and restore it.
+.B \%use_extended_names
+returns the previous state of extended capability name recognition,
+allowing you to save this property and restore it.
+.SH NOTES
+The pointer returned by
+.B \%curses_version
+corresponds to statically allocated memory;
+do not attempt to \fIfree\fP(3) it.
 .SH EXTENSIONS
 These functions are \fB\%ncurses\fP(3X) extensions,
 and are not found in SVr4
@@ -94,8 +109,11 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .SH AUTHORS
-Thomas Dickey.
+Thomas Dickey
 .SH SEE ALSO
+.I \%ncurses
+offers several other extensions to the X/Open Curses API.
+.PP
 \fB\%curs_getch\fP(3X),
 \fB\%curs_mouse\fP(3X),
 \fB\%curs_print\fP(3X),
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index 1775752a9..88bf4074a 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp $
-.TH curs_in_wch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp $
+.TH curs_in_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -41,9 +41,9 @@
 .\}
 .SH NAME
 \fB\%in_wch\fP,
+\fB\%win_wch\fP,
 \fB\%mvin_wch\fP,
-\fB\%mvwin_wch\fP,
-\fB\%win_wch\fP \-
+\fB\%mvwin_wch\fP \-
 get a \fIcurses\fR complex character from a window
 .SH SYNOPSIS
 .nf
@@ -75,8 +75,7 @@ on failure.
 .PP
 In
 .IR \%ncurses ","
-.B \%win_wch
-returns
+they return
 .B ERR
 if
 .I win
@@ -105,6 +104,24 @@ parameter instead of the return value.
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified a function named
+.I \%winwch
+(and the usual variants).
+.\" SVID 4, vol 3., p. 514
+This was a later addition to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+It differed from X/Open's later
+.I \%win_wch
+in that it returned a value of type
+.I \%chtype
+instead of
+.IR \%cchar_t "."
 .SH SEE ALSO
 \fB\%curs_inch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index edcc65cd5..a281537d2 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp $
-.TH curs_inch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp $
+.TH curs_inch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,8 +81,8 @@ on failure.
 .PP
 In
 .IR \%ncurses ","
-.B \%winch
-returns
+they return
+return
 .B ERR
 if
 .I win
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index cb1b8f9e0..5573a769f 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp $
-.TH curs_ins_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp $
+.TH curs_ins_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -41,18 +41,18 @@
 .\}
 .SH NAME
 \fB\%ins_wch\fP,
+\fB\%wins_wch\fP,
 \fB\%mvins_wch\fP,
-\fB\%mvwins_wch\fP,
-\fB\%wins_wch\fP \-
+\fB\%mvwins_wch\fP \-
 insert a \fIcurses\fR complex character in a window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>\fP
 .PP
-\fBint ins_wch(const cchar_t *\fIwch\fP);
-\fBint wins_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
-\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
-\fBint mvwins_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint ins_wch(const cchar_t * \fIwch\fP);
+\fBint wins_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
+\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
+\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
 .fi
 .SH DESCRIPTION
 These functions insert the
@@ -99,12 +99,23 @@ Issue 4 describes these functions.
 SVr4 describes successful return values only as
 \*(``an integer value other than \fBERR\fP\*(''.
 .SH HISTORY
-SVr4 (1989) implemented these functions under the names
-.BR inswch ,
-.BR winswch ,
-.BR mvinswch ,
-and
-.BR mvwinswch .
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified a function named
+.I \%winswch
+(and the usual variants).
+.\" SVID 4, vol 3., p. 512
+This was a later addition to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+It differed from X/Open's later
+.I \%wins_wch
+in that it took an argument of type
+.I \%chtype
+instead of
+.IR \%cchar_t "."
 .SH "SEE ALSO"
 \fB\%curs_insch\fP(3X) describes comparable functions in the
 non-wide-character
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 37a583027..5638f5b0a 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp $
-.TH curs_ins_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp $
+.TH curs_ins_wstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,46 +46,64 @@
 ..
 .SH NAME
 \fB\%ins_wstr\fP,
-\fB\%ins_nwstr\fP,
 \fB\%wins_wstr\fP,
-\fB\%wins_nwstr\fP,
 \fB\%mvins_wstr\fP,
-\fB\%mvins_nwstr\fP,
 \fB\%mvwins_wstr\fP,
+\fB\%ins_nwstr\fP,
+\fB\%wins_nwstr\fP,
+\fB\%mvins_nwstr\fP,
 \fB\%mvwins_nwstr\fP \-
 insert a wide-character string in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint ins_wstr(const wchar_t *\fIwstr\fP);
-\fBint ins_nwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint wins_wstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
-\fBint wins_nwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint ins_wstr(const wchar_t * \fIwstr\fP);
+\fBint wins_wstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
+\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
 .PP
-\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
-\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwins_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
-\fBint mvwins_nwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint ins_nwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint wins_nwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines insert a \fBwchar_t\fP character string
-(as many characters as will fit on the line)
-before the character under the cursor,
-as if calling \fBwins_wch\fP(3X).
-All characters to the right of the cursor are shifted right,
-with the possibility of the rightmost characters on the line being lost.
-No wrapping is performed.
-.PP
+.B \%wins_wstr
+inserts a wide-character string
+.I wstr
+before the character at the cursor in window
+.I win
+as if by calling \fBwins_wch\fP(3X) for each
+.I \%wchar_t
+in
+.IR wstr "."
+No line wrapping is performed.
+Characters to the right of the cursor are shifted right;
+those at the right edge of the window may be lost.
+.B \%wins_wstr
+stops inserting if it would have to wrap to the next line to write the
+next
+.I \%wchar_t
+in
+.IR wstr "."
 The cursor position does not change
-(after moving to \fIy\fP, \fIx\fP, if specified).
-.PP
-The functions with \fIn\fP as the last argument
-insert a leading substring of at most \fIn\fP \fBwchar_t\fP characters.
-If \fIn\fP is less than zero, the entire string is inserted
-(stopping on a L'\e0' character).
-.PP
-Special characters are handled as in \fBwadd_wch\fP(3X).
+(after moving to
+.RI ( y ","
+.IR x "),"
+if specified).
+.B \%wins_nwstr
+does the same,
+but inserts at most
+.I n
+characters,
+or as many as possible
+(up to the end of the line)
+if
+.I n
+is
+.BR \-1 "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
 These functions return
 .B OK
@@ -93,7 +111,6 @@ on success and
 .B ERR
 on failure.
 .PP
-X/Open Curses does not specify any error conditions.
 In
 .IR \%ncurses ","
 they return
@@ -107,6 +124,10 @@ is
 .I wstr
 is
 .BR NULL ","
+.bP
+the first wide character in
+.I wstr
+is a non-spacing character,
 or
 .bP
 an internal \fB\%wins_wch\fP(3X) call returns
@@ -121,29 +142,53 @@ is outside the window boundaries.
 All of these functions except
 .B \%wins_nwstr
 may be implemented as macros.
-.PP
-If the first character in the string is a non-spacing character,
-these functions return
-.BR ERR "."
-X/Open Curses does not specify what happens
-if a non-spacing character follows a control character.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
+X/Open Curses does not specify what happens
+if a non-spacing character follows a control character.
+.PP
 Issue 4 states that the entire string is inserted if
 .I n
 is less than 1.
 This is probably an error,
-because it is inconsistent with other functions,
+.\" ...copied from SVID 4, which made the same error; see p. 513.
+because it is inconsistent with other functions
+such as \fB\%waddwstr\fP(3X),
 and differs from the SVr4
 .I curses
 and Solaris
 .I xcurses
 implementations.
 Nevertheless,
-Issue 7 retains it.
+Issue 7 retains the language.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified functions named
+.I \%winswstr
+and
+.I \%winsnwstr
+(and the usual variants).
+.\" SVID 4, vol 3., p. 513
+.\" The prototypes also identify the data type as `wchar`, not
+.\" `wchar_t`, but this may be an error since the "DESCRIPTION" section
+.\" consistently uses the latter. --GBR
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+They differ from X/Open's later
+.I \%wins_wstr
+and
+.I \%wins_nwstr
+in that their
+.I wstr
+parameters are not
+.IR const -qualified .
 .SH SEE ALSO
 \fB\%curs_insstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index baf2f6cc1..d88a64a9e 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp $
-.TH curs_insch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp $
+.TH curs_insch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,9 +50,9 @@ insert a \fIcurses\fP character in a window
 \fB#include <curses.h>\fP
 .PP
 \fBint insch(chtype \fIch\fP);
-\fBint winsch(WINDOW *\fIwin\fP, chtype \fIch\fP);
+\fBint winsch(WINDOW * \fIwin\fP, chtype \fIch\fP);
 \fBint mvinsch(int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
-\fBint mvwinsch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+\fBint mvwinsch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
 These functions insert the
@@ -105,6 +105,9 @@ SVr4
 describes a successful return value only as
 \*(``an integer value other than
 .BR ERR \*(''.
+.SH HISTORY
+SVr2 (1984) introduced
+.IR \%winsch "."
 .SH "SEE ALSO"
 \fB\%curs_ins_wch\fP(3X) describes comparable functions in the
 wide-character
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 2641f05ad..30c4da20d 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp $
-.TH curs_insstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp $
+.TH curs_insstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,57 +46,87 @@
 ..
 .SH NAME
 \fB\%insstr\fP,
-\fB\%insnstr\fP,
 \fB\%winsstr\fP,
-\fB\%winsnstr\fP,
 \fB\%mvinsstr\fP,
 \fB\%mvinsnstr\fP,
+\fB\%insnstr\fP,
+\fB\%winsnstr\fP,
 \fB\%mvwinsstr\fP,
 \fB\%mvwinsnstr\fP \-
 insert a string in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
-\fBint insstr(const char *\fIstr\fP);
-\fBint insnstr(const char *\fIstr\fP, int \fIn\fP);
-\fBint winsstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
-\fBint winsnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
 .PP
-\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
-\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
-\fBint mvwinsstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
-\fBint mvwinsnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint insstr(const char * \fIstr\fP);
+\fBint winsstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
+\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+\fBint mvwinsstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+.PP
+\fBint insnstr(const char * \fIstr\fP, int \fIn\fP);
+\fBint winsnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines insert a character string
-(as many characters as will fit on the line)
-before the character under the cursor,
-as if calling \fBwinsch\fP(3X).
-All characters to the right of the cursor are shifted right,
-with the possibility of the rightmost characters on the line being lost.
-No wrapping is performed.
-.PP
+.B \%winsstr
+inserts a string
+.I str
+before the character at the cursor in window
+.I win
+as if by calling \fBwinsch\fP(3X) for each
+.I char
+in
+.IR str "."
+No line wrapping is performed.
+Characters to the right of the cursor are shifted right;
+those at the right edge of the window may be lost.
+.B \%winsstr
+stops inserting if it would have to wrap to the next line to write the
+next
+.I \%char
+in
+.IR str "."
 The cursor position does not change
-(after moving to \fIy\fP, \fIx\fP, if specified).
-.PP
-The functions with \fIn\fP as the last argument
-insert a leading substring of at most \fIn\fP characters.
-If \fIn\fP is less than zero, the entire string is inserted
-(stopping on a NUL character).
-.PP
-Special characters are handled as in \fBwaddch\fP(3X).
+(after moving to
+.RI ( y ","
+.IR x "),"
+if specified).
+.B \%insnstr
+does the same,
+but inserts at most
+.I n
+characters,
+or as many as possible
+(up to the end of the line)
+if
+.I n
+is
+.BR \-1 "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open Curses does not specify any error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.BR NULL ","
 .bP
-if the \fIstr\fP parameter is null or
+.I str
+is
+.BR NULL ","
+or
 .bP
-the \fBwinsch\fP(3X) function returns
+an internal \fBwinsch\fP(3X) call returns
 .BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
@@ -105,7 +135,9 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All but \fBwinsnstr\fP may be macros.
+All of these functions except
+.B \%winsnstr
+may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
@@ -115,6 +147,7 @@ Issue 4 distinguished
 .B \%insnstr
 and
 .B \%winsnstr
+from the other functions documented above
 by stating they \*(``do not perform wrapping\*(''.
 This was probably an error,
 since it makes this group of functions inconsistent.
@@ -127,14 +160,22 @@ Issue 4 states that the entire string is inserted if
 .I n
 is less than 1.
 This is probably an error,
-because it is inconsistent with other functions,
+.\" ...copied from SVID 4, which made the same error; see p. 510.
+because it is inconsistent with other functions
+such as \fB\%waddstr\fP(3X),
 and differs from the SVr4
 .I curses
 and Solaris
 .I xcurses
 implementations.
 Nevertheless,
-Issue 7 retains it.
+Issue 7 retains the language.
+.SH HISTORY
+SVr3.1 (1987)
+introduced
+.I \%winsstr
+and
+.IR \%winsnstr "."
 .SH SEE ALSO
 \fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 3a16076f1..eea39b2a8 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp $
-.TH curs_move 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp $
+.TH curs_move 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%move\fP,
 \fB\%wmove\fP \-
@@ -72,6 +82,8 @@ They fail if the position
 .IR x )
 is outside the window boundaries.
 .PP
+In
+.IR \%ncurses ,
 .B \%wmove
 fails if its
 .I \%WINDOW
@@ -83,6 +95,13 @@ may be implemented as a macro.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.SH HISTORY
 4BSD (1980)
 .I curses
 introduced
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 414d9d08a..a441160a9 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp $
-.TH curs_outopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp $
+.TH curs_outopts 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -143,8 +143,6 @@ and \fBERR\fP upon failure.
 All other routines that return an integer always
 return \fBOK\fP.
 .PP
-X/Open Curses does not specify any error conditions.
-.PP
 In this implementation,
 .bP
 those functions that have a window pointer
@@ -169,6 +167,7 @@ The \fBimmedok\fP routine is useful for windows that are used as terminal
 emulators.
 .SH PORTABILITY
 These functions are described in X/Open Curses, Issue 4.
+It specifies no error conditions for them.
 .PP
 Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index d2fadb90d..575722c32 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp $
-.TH curs_pad 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp $
+.TH curs_pad 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -186,7 +186,6 @@ and set
 to
 .BR \%ENOMEM "."
 .PP
-X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
@@ -243,7 +242,7 @@ The two uses may be related.
 .PP
 X/Open Curses, Issue 4 describes these functions,
 without significant change from the SVr3 documentation.
-It describes no error conditions.
+It specifies no error conditions for them.
 The behavior of \fB\%subpad\fP if the parent window is not
 a pad is undocumented,
 and is not checked by the vendor Unix implementations:
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 3694beffc..21f4f8416 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
-.TH curs_print 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp $
+.TH curs_print 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
@@ -36,54 +46,93 @@ write binary data to printer using \fIterminfo\fR capabilities
 .nf
 \fB#include <curses.h>
 .PP
-\fBint mcprint(char *\fIdata\fP, int \fIlen\fP);
+\fBint mcprint(char * \fIdata\fP, int \fIlen\fP);
 .fi
 .SH DESCRIPTION
-This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
-if they are present, to ship given data to a printer attached to the terminal.
+.BR \%mcprint ","
+an
+.I \%ncurses
+extension to the
+.I curses
+library,
+uses the terminal's
+.B \%prtr_non
+.RB ( mc5p )
+or
+.B \%prtr_on
+.RB ( mc5 )
+and
+.B \%prtr_off
+.RB ( mc4 )
+media copy capabilities,
+if defined,
+to send
+.I len
+bytes of the given string
+.I data
+to a printer attached to the terminal.
 .PP
-Note that the \fB\%mcprint\fP code has no way
-to do flow control with the printer
-or to know how much buffering it has.
-Your application is responsible for
-keeping the rate of writes to the printer below its continuous throughput rate
-(typically about half of its nominal cps rating).
+.B \%mcprint
+has no means of flow control to the printer
+nor of knowing how much buffering it has.
+Your application is responsible
+for keeping the rate of writes to the printer
+below its continuous throughput rate,
+typically about half of its nominal characters-per-second (cps) rating.
 Dot-matrix printers and
-6-page-per-minute lasers can typically handle 80cps, so a good conservative
-rule of thumb is to sleep for a second after shipping each 80-character line.
-.
+6-page-per-minute laser printers can typically handle 80 cps,
+so a conservative rule of thumb
+is to sleep for one second after sending an 80-character line.
 .SH RETURN VALUE
-The \fB\%mcprint\fP function returns \fBERR\fP if the write operation aborted
-for some reason.
-In this case, \fB\%errno\fP will contain either an error associated
-with \fBwrite\fP(2) or one of the following:
+On success,
+.B \%mcprint
+returns the number of characters sent to the printer.
+.PP
+.B \%mcprint
+returns
+.B ERR
+if the write operation fails for any reason.
+In that event,
+.B errno
+contains either a value set by \fIwrite\fP(2),
+or one of the following.
 .TP 5
 \fBENODEV\fP
-Capabilities for printer redirection do not exist.
+The terminal lacks relevant media copy capabilities.
 .TP 5
 \fBENOMEM\fP
-Couldn't allocate sufficient memory to buffer the printer write.
-.PP
-When \fB\%mcprint\fP succeeds, it returns the number of characters actually
-sent to the printer.
+.I \%ncurses
+could not allocate sufficient memory to buffer the write operation.
 .SH EXTENSIONS
-\fB\%mcprint\fP was designed for
-\fB\%ncurses\fP(3X),
-and was not found in SVr4
-.IR curses ,
+.B \%mcprint
+is an \fB\%ncurses\fP(3X) extension,
+and is not found in SVr4
+.IR curses ","
 4.4BSD
-.IR curses ,
-or any other previous curses implementation.
+.IR curses ","
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
 Applications employing this
 .I \%ncurses
 extension should condition its use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
+.SH HISTORY
+.I \%ncurses
+introduced
+.I \%mcprint
+prior to version 1.9.9g (1996).
 .SH BUGS
 Padding in the
-\fBmc5p\fP,
-\fBmc4\fP, and
-\fBmc5\fP capabilities is not interpreted.
+.B \%prtr_non
+.RB ( mc5p ),
+.B \%prtr_on
+.RB ( mc5 ),
+and
+.B \%prtr_off
+.RB ( mc4 )
+capabilities is not interpreted.
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index a189ab3e5..14b002c1a 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp $
-.TH curs_refresh 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp $
+.TH curs_refresh 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -133,7 +133,6 @@ These routines return the integer \fBERR\fP upon failure and \fBOK\fP
 \*(``an integer value other than \fBERR\fP\*('')
 upon successful completion.
 .PP
-X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
@@ -153,6 +152,7 @@ if the associated call to \fBtouchln\fP returns
 Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
 .SH PORTABILITY
 X/Open Curses, Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 Whether \fBwnoutrefresh\fP copies to the virtual screen the entire contents
 of a window or just its changed portions has never been well-documented in
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index ca90dce59..1c8dadbd8 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp $
-.TH curs_touch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp $
+.TH curs_touch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -81,7 +81,6 @@ All routines return the integer \fBERR\fP upon failure and an integer value
 other than \fBERR\fP upon successful completion, unless otherwise noted in the
 preceding routine descriptions.
 .PP
-X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
@@ -118,8 +117,8 @@ SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
 that it is not \fBNULL\fP;
 otherwise this implementation behaves the same as SVr4.
 .PP
-X/Open Curses, Issue 4 describes these functions,
-but defines no error conditions.
+X/Open Curses, Issue 4 describes these functions.
+It specifies no error conditions for them.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X),
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 74227f0d9..fb557d992 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp $
-.TH curs_util 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp $
+.TH curs_util 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -310,7 +310,6 @@ upon successful completion.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .PP
-X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
@@ -408,9 +407,9 @@ reading from a file written using mixed schemes may not be successful.
 .SS "unctrl, wunctrl"
 X/Open Curses,
 Issue 4 describes these functions.
+It specifies no error conditions for them.
 It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
-if unsuccessful,
-but does not define any error conditions.
+if unsuccessful.
 This implementation checks for three cases:
 .bP
 the parameter is a 7-bit US\-ASCII code.
diff --git a/man/define_key.3x b/man/define_key.3x
index 1e450207d..0042d8de5 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp $
-.TH define_key 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp $
+.TH define_key 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -118,7 +118,7 @@ preprocessor macro.
 NetBSD
 .I curses
 since 2.0 (2004) supports
-.BR \%define_key "."
+.IR \%define_key "."
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 43db64b11..4be98f9e6 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp $
-.TH @INFOTOCAP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp $
+.TH @INFOTOCAP@ 1M 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,7 +53,7 @@ convert a \fI\%terminfo\fR description into a \fI\%termcap\fR description
 .SH DESCRIPTION
 \fB\%@INFOTOCAP@\fP translates terminal descriptions.
 It looks in each given text \fIfile\fP for \fI\%terminfo\fP entries and,
-For each one found,
+for each one found,
 it writes an analogous \fI\%termcap\fP description to the standard
 output stream.
 \fI\%terminfo\fP \*(``\fBuse\fP\*('' capabilities translate to
diff --git a/man/keyok.3x b/man/keyok.3x
index d4b94ac3a..b3a831404 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp $
-.TH keyok 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keyok.3x,v 1.48 2024/07/27 19:42:31 tom Exp $
+.TH keyok 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -59,7 +59,7 @@ returned by \fB\%wgetch\fP(3X)
 \fB\%wget_wch\fP(3X)).
 Key codes that have been disabled can be re-enabled.
 .I bf
-indicates the desired enablement status.
+selects the desired enablement status.
 This operation is more fine-grained than calling \fB\%keypad\fP(3X),
 which affects
 .I all
@@ -100,7 +100,7 @@ preprocessor macro.
 NetBSD
 .I curses
 since 2.0 (2004) supports
-.BR \%keyok "."
+.IR \%keyok "."
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index ccfdd5564..d9ee73f7b 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp $
-.TH legacy_coding 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp $
+.TH legacy_coding 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -73,7 +73,9 @@ It also modifies the output of \fB\%unctrl\fP(3X),
 showing codes in the range 128-159 as is.
 .RE
 .SH RETURN VALUE
-If the screen has not been initialized,
+If the
+.I curses
+screen has not been initialized,
 or the
 .I level
 parameter is out of range,
@@ -81,23 +83,24 @@ parameter is out of range,
 returns
 .BR ERR .
 Otherwise,
-it returns the previous level:
-.BR 0 ,
-.BR 1 ,
-or
-.BR 2 .
-.SH PORTABILITY
+it returns the previous level.
+.SH EXTENSIONS
 .B \%use_legacy_coding
-is specific to
-.IR \%ncurses .
-It was not supported on Version 7, BSD or System V implementations.
+is an
+.I \%ncurses
+extension.
+.SH PORTABILITY
 Applications employing
 .I \%ncurses
 extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
+.SH HISTORY
+.I \%ncurses
+5.6 (2006) introduced
+.I \%use_legacy_coding
+to support \fI\%lynx\fP(1)'s font-switching feature.
 .SH AUTHORS
 Thomas Dickey
-(to support \fI\%lynx\fP(1)'s font-switching feature).
 .SH SEE ALSO
 \fB\%unctrl\fP(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 0db34210c..cc4e8210b 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.28 2024/06/22 22:20:56 tom Exp $
+# $Id: manhtml.externs,v 1.29 2024/07/27 20:15:00 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -42,6 +42,7 @@ environ(7)
 errno(3)
 file(1)
 fread(3)
+free(3)
 fwrite(3)
 getty(8)
 ioctl(2)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 19498891b..d3795d66e 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp $
-.TH ncurses 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp $
+.TH ncurses 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -446,7 +446,9 @@ see section \*(``ALTERNATE CONFIGURATIONS\*('' below.
 .I \%ncurses
 is the library in its \*(``non-wide\*('' configuration,
 handling only eight-bit characters.
-It stores a character combined with attributes and a color pair in a
+It stores a character combined with attributes
+and a color pair identifier
+in a
 .I \%chtype
 datum,
 which is often an alias of
@@ -464,7 +466,7 @@ the null
 .I curses
 character.
 .IP
-Attributes and a color pair selection
+Attributes and a color pair identifier
 (with no corresponding character)
 can be stored in variables of
 .I \%chtype
@@ -515,6 +517,10 @@ and their variants.)
 .\" operated on `chtype`s assuming that they were wide enough for a
 .\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
 .\" standardize these.
+Another exception is
+.B \%ins_nwstr
+and its variants,
+which is spelled thus instead of \*(``insn_wstr\*(''.
 .IP
 This convention is inapplicable to some non-wide function names,
 so other transformations are used for the wide configuration:
@@ -547,7 +553,7 @@ A string of complex characters ends with a
 whose
 .I \%wchar_t
 member is the null wide character.
-Attributes and a color pair selection are stored in separate fields of
+Attributes and a color pair identifier are stored in separate fields of
 the structure,
 not combined into an integer as in
 .IR \%chtype .
diff --git a/man/wresize.3x b/man/wresize.3x
index 327c51a8b..f9db3d1e4 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp $
-.TH wresize 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp $
+.TH wresize 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -107,7 +107,7 @@ preprocessor macro.
 NetBSD
 .I curses
 adopted
-.B \%wresize
+.I \%wresize
 in 2001 (release 1.5.3),
 and
 .I \%PDCurses
@@ -117,7 +117,7 @@ It is not possible to resize windows with SVr4
 .IR curses "."
 .SH HISTORY
 Thomas Dickey developed
-.B \%wresize
+.I \%wresize
 as an extension to BSD
 .I curses
 in 1988,
diff --git a/menu/m_driver.c b/menu/m_driver.c
index cf2ef2fe0..93882b288 100644
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_driver.c,v 1.37 2021/03/27 23:46:29 tom Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.38 2024/07/27 18:14:20 tom Exp $")
 
 /* Macros */
 
@@ -449,7 +449,7 @@ menu_driver(MENU *menu, int c)
       else if (KEY_MOUSE == c)
 	{
 	  MEVENT event;
-	  WINDOW *uwin = Get_Menu_UserWin(menu);
+	  const WINDOW *uwin = Get_Menu_UserWin(menu);
 
 	  getmouse(&event);
 	  if ((event.bstate & (BUTTON1_CLICKED |
@@ -459,7 +459,7 @@ menu_driver(MENU *menu, int c)
 	    {			/* we react only if the click was in the userwin, that means
 				 * inside the menu display area or at the decoration window.
 				 */
-	      WINDOW *sub = Get_Menu_Window(menu);
+	      const WINDOW *sub = Get_Menu_Window(menu);
 	      int ry = event.y, rx = event.x;	/* screen coordinates */
 
 	      result = E_REQUEST_DENIED;
diff --git a/menu/m_item_vis.c b/menu/m_item_vis.c
index 9ae4fdb0a..5471cad9c 100644
--- a/menu/m_item_vis.c
+++ b/menu/m_item_vis.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2004,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_item_vis.c,v 1.20 2021/06/17 21:20:30 tom Exp $")
+MODULE_ID("$Id: m_item_vis.c,v 1.21 2024/07/27 18:14:09 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -53,7 +53,7 @@ MODULE_ID("$Id: m_item_vis.c,v 1.20 2021/06/17 21:20:30 tom Exp $")
 MENU_EXPORT(bool)
 item_visible(const ITEM *item)
 {
-  MENU *menu;
+  const MENU *menu;
 
   T((T_CALLED("item_visible(%p)"), (const void *)item));
   if (item &&
diff --git a/menu/m_post.c b/menu/m_post.c
index cb8023043..1e4ce7cf4 100644
--- a/menu/m_post.c
+++ b/menu/m_post.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_post.c,v 1.38 2022/09/24 09:38:44 tom Exp $")
+MODULE_ID("$Id: m_post.c,v 1.41 2024/07/27 18:08:59 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -67,7 +67,7 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
      - it is a onevalued menu and it is the current item
      - or it has a selection value
    */
-  wattron(menu->win, (int)menu->back);
+  wattr_on(menu->win, menu->back, NULL);
   if (item->value || (item == menu->curitem))
     {
       if (menu->marklen)
@@ -79,13 +79,13 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
 	     item. */
 	  if (!(menu->opt & O_ONEVALUE) && item->value && item != menu->curitem)
 	    {
-	      wattron(menu->win, (int)menu->fore);
+	      wattr_on(menu->win, menu->fore, NULL);
 	      isfore = TRUE;
 	    }
 	  waddstr(menu->win, menu->mark);
 	  if (isfore)
 	    {
-	      wattron(menu->win, (int)menu->fore);
+	      wattr_on(menu->win, menu->fore, NULL);
 	      isfore = FALSE;
 	    }
 	}
@@ -93,7 +93,7 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
   else				/* otherwise we have to wipe out the marker area */
     for (ch = ' ', i = menu->marklen; i > 0; i--)
       waddch(menu->win, ch);
-  wattroff(menu->win, (int)menu->back);
+  wattr_off(menu->win, menu->back, NULL);
   count += menu->marklen;
 
   /* First we have to calculate the attribute depending on selectability
@@ -101,19 +101,19 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
    */
   if (!(item->opt & O_SELECTABLE))
     {
-      wattron(menu->win, (int)menu->grey);
+      wattr_on(menu->win, menu->grey, NULL);
       isgrey = TRUE;
     }
   else
     {
       if (item->value || item == menu->curitem)
 	{
-	  wattron(menu->win, (int)menu->fore);
+	  wattr_on(menu->win, menu->fore, NULL);
 	  isfore = TRUE;
 	}
       else
 	{
-	  wattron(menu->win, (int)menu->back);
+	  wattr_on(menu->win, menu->back, NULL);
 	  isback = TRUE;
 	}
     }
@@ -159,10 +159,10 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
 	  assert(cx >= 0 && cy >= 0);
 	  getyx(menu->win, ncy, ncx);
 	  if (isgrey)
-	    wattroff(menu->win, (int)menu->grey);
+	    wattr_off(menu->win, menu->grey, NULL);
 	  else if (isfore)
-	    wattroff(menu->win, (int)menu->fore);
-	  wattron(menu->win, (int)menu->back);
+	    wattr_off(menu->win, menu->fore, NULL);
+	  wattr_on(menu->win, menu->back, NULL);
 	  for (j = 1; j < menu->spc_rows; j++)
 	    {
 	      if ((item_y + j) < getmaxy(menu->win))
@@ -176,17 +176,17 @@ _nc_Post_Item(const MENU *menu, const ITEM *item)
 	    }
 	  wmove(menu->win, ncy, ncx);
 	  if (!isback)
-	    wattroff(menu->win, (int)menu->back);
+	    wattr_off(menu->win, menu->back, NULL);
 	}
     }
 
   /* Remove attributes */
   if (isfore)
-    wattroff(menu->win, (int)menu->fore);
+    wattr_off(menu->win, menu->fore, NULL);
   if (isback)
-    wattroff(menu->win, (int)menu->back);
+    wattr_off(menu->win, menu->back, NULL);
   if (isgrey)
-    wattroff(menu->win, (int)menu->grey);
+    wattr_off(menu->win, menu->grey, NULL);
 }
 
 /*---------------------------------------------------------------------------
@@ -201,7 +201,7 @@ MENU_EXPORT(void)
 _nc_Draw_Menu(const MENU *menu)
 {
   ITEM *item = menu->items[0];
-  ITEM *lastvert;
+  const ITEM *lastvert;
   ITEM *hitem;
   chtype s_bkgd;
 
@@ -220,7 +220,7 @@ _nc_Draw_Menu(const MENU *menu)
 
       do
 	{
-	  ITEM *lasthor;
+	  const ITEM *lasthor;
 
 	  wmove(menu->win, y, 0);
 
@@ -231,7 +231,7 @@ _nc_Draw_Menu(const MENU *menu)
 	    {
 	      _nc_Post_Item(menu, hitem);
 
-	      wattron(menu->win, (int)menu->back);
+	      wattr_on(menu->win, menu->back, NULL);
 	      if (((hitem = hitem->right) != lasthor) && hitem)
 		{
 		  int i, j, cy, cx;
@@ -250,7 +250,7 @@ _nc_Draw_Menu(const MENU *menu)
 		}
 	    }
 	  while (hitem && (hitem != lasthor));
-	  wattroff(menu->win, (int)menu->back);
+	  wattr_off(menu->win, menu->back, NULL);
 
 	  item = item->down;
 	  y += menu->spc_rows;
@@ -291,7 +291,7 @@ post_menu(MENU *menu)
     {
       int h = 1 + menu->spc_rows * (menu->rows - 1);
 
-      WINDOW *win = Get_Menu_Window(menu);
+      const WINDOW *win = Get_Menu_Window(menu);
       int maxy = getmaxy(win);
 
       if ((menu->win = newpad(h, menu->width)))
diff --git a/misc/terminfo.src b/misc/terminfo.src
index fdd65e3ed..26e987a41 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1144 $
-#	$Date: 2024/05/25 19:34:27 $
+#	$Revision: 1.1146 $
+#	$Date: 2024/07/27 16:58:08 $
 #
 # 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
@@ -8022,6 +8022,16 @@ domterm|DomTerm web client,
 # "wezterm is a terminal emulator with support for modern features
 #  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
 #
+# wezterm-20240203-110809-5046fc22 tested with MacOS
+# General:
+# + initial screensize is now 80x24
+# tack:
+# + no change
+# wraptest:
+# + erasures (EL, ED, DCH, ICH, ESC) do not cancel wrap
+# vttest:
+# + some of the problems with debris have been fixed
+#
 # wezterm-20230712_072601_f4abf8fd-1.fedora38.x86_64
 # tested with MacOS and Fedora 38/39.
 #
@@ -8068,9 +8078,30 @@ domterm|DomTerm web client,
 # + implements xterm normal, any-event and button-event mouse, none of the rest
 # + reports window size, none of the other window reports
 wezterm|Wez's Terminal Emulator,
-	km@, xenl@,
-	cvvis@, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
-	use=xterm-256color,
+	am, bce, km, mir, msgr, npc, xenl,
+	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
+	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
+	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
+	u9=\E[c, Smol=\E[53m, Smulx=\E[4:%p1%dm,
+	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+	use=report+version, use=vt220+cvis,
+	use=xterm+256color2, use=xterm+alt1049,
+	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
+	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
+	use=xterm+tmux,
 
 #### Contour
 # https://github.com/contour-terminal/contour
@@ -27564,4 +27595,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2024-05-25
 #	+ review/update iTerm2 for 3.5.0 -TD
 #
+# 2024-07-27
+#	+ modify wezterm, omitting its broken left/right margin feature (report
+#	  by Thayne McCombs) -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index a14bfd3b0..ac472a662 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.141 2022/06/12 15:16:41 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.142 2024/07/27 19:22:23 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -118,7 +118,7 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch)
 #endif
 
 static bool
-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)
+newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos)
 {
     bool result = FALSE;
 
diff --git a/ncurses/base/lib_delch.c b/ncurses/base/lib_delch.c
index d39a8ebae..a4c7d247b 100644
--- a/ncurses/base/lib_delch.c
+++ b/ncurses/base/lib_delch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2001,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delch.c,v 1.14 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_delch.c,v 1.15 2024/07/27 19:23:21 tom Exp $")
 
 NCURSES_EXPORT(int)
 wdelch(WINDOW *win)
diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 56cd4f75c..28b4c806d 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,10 +43,10 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.26 2024/06/29 16:51:40 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.28 2024/07/27 18:57:35 tom Exp $")
 
 static bool
-cannot_delete(WINDOW *win)
+cannot_delete(const WINDOW *win)
 {
     bool result = TRUE;
     bool found = FALSE;
diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 75bbe77e3..0a3ee1254 100644
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 extern int malloc_errfd;	/* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.76 2021/11/06 21:52:49 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.77 2024/07/27 19:22:23 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -87,7 +87,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
 #endif
 
 		for (each_window(SP_PARM, q)) {
-		    WINDOW *q_win = &(q->win);
+		    const WINDOW *q_win = &(q->win);
 
 #ifndef USE_SP_WINDOWLIST
 		    if (q->screen != SP_PARM)
diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index cac21fc85..6730c55d9 100644
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,14 +42,14 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getstr.c,v 1.39 2023/04/29 19:00:17 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.40 2024/07/27 19:22:23 tom Exp $")
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
  * or other character, and handles reverse wraparound.
  */
 static char *
-WipeOut(WINDOW *win, int y, int x, char *first, char *last, int echoed)
+WipeOut(WINDOW *win, int y, int x, const char *first, char *last, int echoed)
 {
     if (last > first) {
 	*--last = '\0';
@@ -81,7 +81,7 @@ wgetnstr_events(WINDOW *win,
     TTY_FLAGS save_flags;
     char erasec;
     char killc;
-    char *oldstr;
+    const char *oldstr;
     int ch;
     int y, x;
 
diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c
index 894605ccf..f1ca96d36 100644
--- a/ncurses/base/lib_insch.c
+++ b/ncurses/base/lib_insch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insch.c,v 1.37 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.38 2024/07/27 19:23:21 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -90,7 +90,7 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 		struct ldat *line = &(win->_line[win->_cury]);
 		NCURSES_CH_T *end = &(line->text[win->_curx]);
 		NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
-		NCURSES_CH_T *temp2 = temp1 - 1;
+		const NCURSES_CH_T *temp2 = temp1 - 1;
 
 		SetChar2(wch, ch);
 
diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index 221ebd290..b483785cd 100644
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.26 2023/06/03 12:37:04 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.27 2024/07/27 19:22:23 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
@@ -63,7 +63,7 @@ winnstr(WINDOW *win, char *str, int n)
 
 	for (; i < n;) {
 #if USE_WIDEC_SUPPORT
-	    cchar_t *cell = &(text[col]);
+	    const cchar_t *cell = &(text[col]);
 	    attr_t attrs;
 	    NCURSES_PAIRS_T pair;
 	    char *tmp;
diff --git a/ncurses/base/lib_mvwin.c b/ncurses/base/lib_mvwin.c
index fca014efe..66421971a 100644
--- a/ncurses/base/lib_mvwin.c
+++ b/ncurses/base/lib_mvwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,13 +43,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_mvwin.c,v 1.20 2021/10/23 18:57:41 tom Exp $")
+MODULE_ID("$Id: lib_mvwin.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
 
 NCURSES_EXPORT(int)
 mvwin(WINDOW *win, int by, int bx)
 {
 #if NCURSES_SP_FUNCS
-    SCREEN *sp = _nc_screen_of(win);
+    const SCREEN *sp = _nc_screen_of(win);
 #endif
 
     T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx));
diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c
index d901b727a..0b168ccac 100644
--- a/ncurses/base/lib_printw.c
+++ b/ncurses/base/lib_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_printw.c,v 1.28 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_printw.c,v 1.29 2024/07/27 19:22:23 tom Exp $")
 
 NCURSES_EXPORT(int)
 printw(const char *fmt, ...)
@@ -133,7 +133,7 @@ mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...)
 NCURSES_EXPORT(int)
 vwprintw(WINDOW *win, const char *fmt, va_list argp)
 {
-    char *buf;
+    const char *buf;
     int code = ERR;
 #if NCURSES_SP_FUNCS
     SCREEN *sp = _nc_screen_of(win);
@@ -151,7 +151,7 @@ vwprintw(WINDOW *win, const char *fmt, va_list argp)
 NCURSES_EXPORT(int)
 vw_printw(WINDOW *win, const char *fmt, va_list argp)
 {
-    char *buf;
+    const char *buf;
     int code = ERR;
 #if NCURSES_SP_FUNCS
     SCREEN *sp = _nc_screen_of(win);
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index e2647b54e..5f727688f 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.105 2023/04/28 20:58:54 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.106 2024/07/27 19:22:23 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -222,7 +222,6 @@ decode_attr(char *source, attr_t *target, int *color)
 	    source++;
 	    found = FALSE;
 	} else if (found) {
-	    size_t n;
 	    char *next = source;
 
 	    if (source[0] == GUTTER) {
@@ -241,6 +240,8 @@ decode_attr(char *source, attr_t *target, int *color)
 		*target |= pair;
 		*color = value;
 	    } else {
+		size_t n;
+
 		while (isalnum(UChar(*next))) {
 		    ++next;
 		}
@@ -304,7 +305,7 @@ decode_char(char *source, int *target)
 	if (limit) {
 	    *target = 0;
 	    while (limit-- > 0) {
-		char *find = strchr(digits, *source++);
+		const char *find = strchr(digits, *source++);
 		int ch = (find != 0) ? (int) (find - digits) : -1;
 		*target *= base;
 		if (ch >= 0 && ch < base) {
@@ -337,7 +338,7 @@ decode_chtype(char *source, chtype fillin, chtype *target)
 
 #if NCURSES_WIDECHAR
 static char *
-decode_cchar(char *source, cchar_t *fillin, cchar_t *target)
+decode_cchar(char *source, const cchar_t *fillin, cchar_t *target)
 {
     int color;
     attr_t attr = fillin->attr;
@@ -382,7 +383,7 @@ read_win(WINDOW *win, FILE *fp)
 
     memset(win, 0, sizeof(WINDOW));
     for (;;) {
-	char *name;
+	const char *name;
 	char *value;
 	char *txt = read_txt(fp);
 
diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 7a40624b1..85b777482 100644
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.32 2021/09/04 10:54:35 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.33 2024/07/27 19:23:59 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -58,7 +58,7 @@ MODULE_ID("$Id: lib_slkrefr.c,v 1.32 2021/09/04 10:54:35 tom Exp $")
 static void
 slk_paint_info(WINDOW *win)
 {
-    SCREEN *sp = _nc_screen_of(win);
+    const SCREEN *sp = _nc_screen_of(win);
 
     if (win && sp && (sp->slk_format == 4)) {
 	int i;
diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c
index 70866c636..7de5bd2b3 100644
--- a/ncurses/base/new_pair.c
+++ b/ncurses/base/new_pair.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -61,7 +61,7 @@
 
 #endif
 
-MODULE_ID("$Id: new_pair.c,v 1.23 2021/08/16 22:11:26 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.24 2024/07/27 19:22:23 tom Exp $")
 
 #if NCURSES_EXT_COLORS
 
@@ -151,7 +151,7 @@ _nc_find_color_pair(SCREEN *sp, int fg, int bg)
     if (sp != 0) {
 	void *pp;
 	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
-	    colorpair_t *temp = *(colorpair_t **) pp;
+	    const colorpair_t *temp = *(colorpair_t **) pp;
 	    result = (int) (temp - sp->_color_pairs);
 	}
     }
@@ -252,7 +252,7 @@ _nc_copy_pairs(SCREEN *sp, colorpair_t * target, colorpair_t * source, int lengt
 {
     int n;
     for (n = 0; n < length; ++n) {
-	void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
+	const void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
 	if (find != 0) {
 	    tdelete(source + n, &sp->_ordered_pairs, compare_data);
 	    tsearch(target + n, &sp->_ordered_pairs, compare_data);
diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index 1a2ddb365..5818f1142 100644
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.53 2024/04/20 21:54:14 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.55 2024/07/27 23:04:55 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -219,7 +219,7 @@ adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS)
     int bottom = CurLines + _nc_screen_of(win)->_topstolen - stolen;
     int myLines = win->_maxy + 1;
     int myCols = win->_maxx + 1;
-    ripoff_t *rop = ripped_window(win);
+    const ripoff_t *rop = ripped_window(win);
 
     T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"),
        (void *) win, ToLines, ToCols,
diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index 8816e58c2..a1ac64728 100644
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.37 2023/09/30 10:42:42 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.38 2024/07/27 19:22:23 tom Exp $")
 
 #if USE_SAFE_SPRINTF
 
@@ -262,10 +262,9 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx
 
 	if (my_buffer != NULL) {
 # if HAVE_VSNPRINTF
-	    /* SUSv2, 1997 */
-	    int used;
-
 	    do {
+		/* SUSv2, 1997 */
+		int used;
 		va_list ap2;
 
 		begin_va_copy(ap2, ap);
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 304c1b62f..ae45b0023 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.51 2023/09/09 23:15:53 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.52 2024/07/27 19:22:23 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -181,7 +181,7 @@ realign_data(TERMTYPE2 *to, char **ext_Names,
  * Returns the first index in ext_Names[] for the given token-type
  */
 static unsigned
-_nc_first_ext_name(TERMTYPE2 *tp, int token_type)
+_nc_first_ext_name(const TERMTYPE2 *tp, int token_type)
 {
     unsigned first;
 
@@ -206,7 +206,7 @@ _nc_first_ext_name(TERMTYPE2 *tp, int token_type)
  * Returns the last index in ext_Names[] for the given token-type
  */
 static unsigned
-_nc_last_ext_name(TERMTYPE2 *tp, int token_type)
+_nc_last_ext_name(const TERMTYPE2 *tp, int token_type)
 {
     unsigned last;
 
@@ -229,7 +229,7 @@ _nc_last_ext_name(TERMTYPE2 *tp, int token_type)
  * Lookup an entry from extended-names, returning -1 if not found
  */
 static int
-_nc_find_ext_name(TERMTYPE2 *tp, char *name, int token_type)
+_nc_find_ext_name(const TERMTYPE2 *tp, const char *name, int token_type)
 {
     unsigned j;
     unsigned first = _nc_first_ext_name(tp, token_type);
@@ -248,7 +248,7 @@ _nc_find_ext_name(TERMTYPE2 *tp, char *name, int token_type)
  * (e.g., Booleans[]).
  */
 static int
-_nc_ext_data_index(TERMTYPE2 *tp, int n, int token_type)
+_nc_ext_data_index(const TERMTYPE2 *tp, int n, int token_type)
 {
     switch (token_type) {
     case BOOLEAN:
@@ -271,7 +271,7 @@ _nc_ext_data_index(TERMTYPE2 *tp, int n, int token_type)
  * data.
  */
 static bool
-_nc_del_ext_name(TERMTYPE2 *tp, char *name, int token_type)
+_nc_del_ext_name(TERMTYPE2 *tp, const char *name, int token_type)
 {
     int first;
 
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index 7e14731df..3c80ec0f6 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.102 2021/09/04 10:29:15 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.103 2024/07/27 19:22:23 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index dec4b9256..3cda08930 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.134 2024/02/10 15:52:11 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.135 2024/07/27 19:15:16 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -109,7 +109,9 @@ skip_index(char *name)
 static bool
 check_collisions(char *n1, char *n2, int counter)
 {
-    char *pstart, *qstart, *pend, *qend;
+    const char *pstart;
+    const char *qstart;
+    char *pend, *qend;
     char nc1[NAMEBUFFER_SIZE];
     char nc2[NAMEBUFFER_SIZE];
 
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index 3ba0835e2..a4c332a63 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
-,* Copyright 2020-2022,2023 Thomas E. Dickey                                *
+,* Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.122 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -551,7 +551,7 @@ _nc_get_token(bool silent)
 			    ;
 			}
 			if (islower(UChar(*s))) {
-			    char *name = s;
+			    const char *name = s;
 			    while (isalnum(UChar(*s))) {
 				++s;
 			    }
diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index db3872e3f..d8eb3ddb2 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.50 2023/06/24 21:52:32 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.51 2024/07/27 19:22:23 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -124,7 +124,7 @@ update_getenv(const char *name, DBDIRS which)
 
     if (which < dbdLAST) {
 	char *value;
-	char *cached_value = my_vars[which].value;
+	const char *cached_value = my_vars[which].value;
 	bool same_value;
 
 	if ((value = getenv(name)) != 0) {
diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index f47fd3fe9..e5dc1acd4 100644
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: entries.c,v 1.35 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.36 2024/07/27 19:22:23 tom Exp $")
 
 /****************************************************************************
  *
diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c
index ca179d334..82c460f0d 100644
--- a/ncurses/tinfo/getenv_num.c
+++ b/ncurses/tinfo/getenv_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,13 +37,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: getenv_num.c,v 1.8 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: getenv_num.c,v 1.9 2024/07/27 19:23:59 tom Exp $")
 
 NCURSES_EXPORT(int)
 _nc_getenv_num(const char *name)
 {
     char *dst = 0;
-    char *src = getenv(name);
+    const char *src = getenv(name);
     long value;
 
     if ((src == 0)
diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c
index 7e626dfca..3c381b9f0 100644
--- a/ncurses/tinfo/home_terminfo.c
+++ b/ncurses/tinfo/home_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: home_terminfo.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: home_terminfo.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
 
 /* ncurses extension...fall back on user's private directory */
 
@@ -52,7 +52,7 @@ _nc_home_terminfo(void)
     if (use_terminfo_vars()) {
 
 	if (MyBuffer == 0) {
-	    char *home;
+	    const char *home;
 
 	    if ((home = getenv("HOME")) != 0) {
 		size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index ef20dfb1d..5f4c54990 100644
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 #include <curses.priv.h>
 #include <tic.h>		/* struct tinfo_fkeys */
 
-MODULE_ID("$Id: init_keytry.c,v 1.20 2023/09/16 12:55:01 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -94,7 +94,7 @@ _nc_init_keytry(SCREEN *sp)
 	    TERMTYPE *tp = &(sp->_term->type);
 	    for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
 		const char *name = ExtStrname(tp, (int) n, strnames);
-		char *value = tp->Strings[n];
+		const char *value = tp->Strings[n];
 		if (name != 0
 		    && *name == 'k'
 		    && VALID_STRING(value)
diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index e7d8535ef..f78ca039a 100644
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,14 +40,15 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_print.c,v 1.31 2023/06/10 12:44:41 tom Exp $")
+MODULE_ID("$Id: lib_print.c,v 1.32 2024/07/27 19:22:23 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
 /* ship binary character data to the printer via mc4/mc5/mc5p */
 {
     int result;
-    char *mybuf = NULL, *switchon;
+    char *mybuf = NULL;
+    const char *switchon;
     size_t onsize, offsize;
     size_t need;
 
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 66226b112..449c963e3 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.241 2024/05/11 19:07:34 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.242 2024/07/27 19:14:45 tom Exp $")
 
 /****************************************************************************
  *
@@ -362,10 +362,10 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 }
 
 static bool
-set_position(NCURSES_SP_DCLx TERMINAL *termp, int row, int col)
+set_position(NCURSES_SP_DCLx const TERMINAL *termp, int row, int col)
 {
     bool result;
-    char *actual = TIPARM_2(cursor_address, row, col);
+    const char *actual = TIPARM_2(cursor_address, row, col);
     T((T_CALLED("set_position %d,%d)"), row, col));
 #if NCURSES_SP_FUNCS
     result = (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position",
diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index 2ece98591..a5ac2ecc3 100644
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_termcap.c,v 1.89 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.90 2024/07/27 19:22:23 tom Exp $")
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
@@ -132,7 +132,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 	     * Also free the terminfo data that we loaded (much bigger leak).
 	     */
 	    if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) {
-		TERMINAL *trm = LAST_TRM;
+		const TERMINAL *trm = LAST_TRM;
 		NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM);
 		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
 		    if (LAST_TRM == trm)
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 5666b27b7..2d8d3268f 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.153 2023/11/04 19:28:41 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.154 2024/07/27 19:22:23 tom Exp $")
 
 /*
  *	char *
@@ -1099,7 +1099,7 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data)
  * are parameterized accept only numeric parameters.
  */
 static bool
-check_string_caps(TPARM_DATA *data, const char *string)
+check_string_caps(const TPARM_DATA *data, const char *string)
 {
     bool result = FALSE;
 
@@ -1126,7 +1126,7 @@ check_string_caps(TPARM_DATA *data, const char *string)
 #endif
 #if NCURSES_XNAMES
 	else {
-	    char *check;
+	    const char *check;
 
 	    check = tigetstr("Cs");
 	    if (CHECK_CAP(check))
@@ -1354,7 +1354,7 @@ _nc_tiparm(int expected, const char *string, ...)
 	    }
 #if NCURSES_XNAMES
 	    else {
-		char *check;
+		const char *check;
 
 		check = tigetstr("xm");
 		if (CHECK_CAP(check)) {
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 13fef495a..78548193a 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.108 2023/04/24 22:32:33 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.109 2024/07/27 19:22:23 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -695,7 +695,7 @@ _nc_capcmp(const char *s, const char *t)
 }
 
 static void
-append_acs0(string_desc * dst, int code, char *src, size_t off)
+append_acs0(string_desc * dst, int code, const char *src, size_t off)
 {
     if (src != 0 && off < strlen(src)) {
 	char temp[3];
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index b0f360eca..9fcbaab22 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.171 2023/09/16 16:30:34 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.173 2024/07/27 23:07:02 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -51,7 +51,7 @@ MODULE_ID("$Id: read_entry.c,v 1.171 2023/09/16 16:30:34 tom Exp $")
 #if NCURSES_USE_DATABASE
 #if NCURSES_EXT_NUMBERS
 static size_t
-convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
+convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count)
 {
     int i;
     size_t j;
@@ -77,7 +77,7 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
 }
 
 static size_t
-convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
+convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count)
 {
     int i;
     size_t j;
@@ -98,7 +98,7 @@ convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
 }
 #else
 static size_t
-convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
+convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count)
 {
     int i, j;
     unsigned char ch;
@@ -122,7 +122,7 @@ convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
 }
 
 static size_t
-convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
+convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
@@ -195,7 +195,7 @@ convert_strings(char *buf, char **Strings, int count, int size,
 }
 
 static int
-fake_read(char *src, int *offset, int limit, char *dst, unsigned want)
+fake_read(const char *src, int *offset, int limit, char *dst, unsigned want)
 {
     int have = (limit - *offset);
 
@@ -285,7 +285,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
     char buf[MAX_ENTRY_SIZE + 2];
     char *string_table;
     unsigned want, have;
-    size_t (*convert_numbers) (char *, NCURSES_INT2 *, int);
+    size_t (*convert_numbers) (const char *, NCURSES_INT2 *, int);
     int size_of_numbers;
     int max_entry_size = MAX_ENTRY_SIZE;
 
@@ -728,7 +728,7 @@ decode_hex(const char **source)
 static int
 decode_quickdump(char *target, const char *source)
 {
-    char *base = target;
+    const char *base = target;
     int result = 0;
 
     if (!strncmp(source, "b64:", (size_t) 4)) {
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index 177dcd872..e2fc5baa2 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2005-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,13 +37,13 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.22 2023/09/23 18:47:56 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.23 2024/07/27 19:22:23 tom Exp $")
 
 #undef CUR
 #define CUR tp->
 
 static char *
-set_attribute_9(TERMTYPE2 *tp, int flag)
+set_attribute_9(const TERMTYPE2 *tp, int flag)
 {
     const char *value;
     char *result;
@@ -99,7 +99,7 @@ skip_delay(const char *s)
  * to the end of the s-string.
  */
 static bool
-rewrite_sgr(char *s, char *attr)
+rewrite_sgr(char *s, const char *attr)
 {
     if (s != 0) {
 	if (PRESENT(attr)) {
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 8ccca9eca..a4cadb050 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.132 2024/04/20 17:58:51 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.133 2024/07/27 19:15:16 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -126,7 +126,7 @@ check_writeable(int code)
     static bool verified[sizeof(dirnames)];
 
     char dir[sizeof(LEAF_FMT)];
-    char *s = 0;
+    const char *s = 0;
 
     if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
@@ -552,7 +552,7 @@ static size_t
 fake_write(char *dst,
 	   unsigned *offset,
 	   size_t limit,
-	   char *src,
+	   const char *src,
 	   size_t want,
 	   size_t size)
 {
@@ -658,7 +658,7 @@ convert_32bit(unsigned char *buf, NCURSES_INT2 *Numbers, size_t count)
 
 #if NCURSES_XNAMES
 static unsigned
-extended_Booleans(TERMTYPE2 *tp)
+extended_Booleans(const TERMTYPE2 *tp)
 {
     unsigned result = 0;
     unsigned i;
@@ -671,7 +671,7 @@ extended_Booleans(TERMTYPE2 *tp)
 }
 
 static unsigned
-extended_Numbers(TERMTYPE2 *tp)
+extended_Numbers(const TERMTYPE2 *tp)
 {
     unsigned result = 0;
     unsigned i;
@@ -684,7 +684,7 @@ extended_Numbers(TERMTYPE2 *tp)
 }
 
 static unsigned
-extended_Strings(TERMTYPE2 *tp)
+extended_Strings(const TERMTYPE2 *tp)
 {
     unsigned short result = 0;
     unsigned short i;
@@ -701,7 +701,7 @@ extended_Strings(TERMTYPE2 *tp)
  * clause - discard the unneeded data.
  */
 static bool
-extended_object(TERMTYPE2 *tp)
+extended_object(const TERMTYPE2 *tp)
 {
     bool result = FALSE;
 
diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index b36286253..aa3a9ddbf 100644
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -44,7 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.96 2024/02/04 00:11:35 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.97 2024/07/27 19:08:04 tom Exp $")
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
@@ -255,7 +255,7 @@ _nc_altcharset_name(attr_t attr, chtype ch)
 #endif
     if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
 	char *cp;
-	char *found = 0;
+	const char *found = 0;
 
 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
 	    if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c
index 7b9533bd6..0fc56477b 100644
--- a/ncurses/trace/varargs.c
+++ b/ncurses/trace/varargs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2001-2008,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: varargs.c,v 1.13 2023/06/24 13:41:46 tom Exp $")
+MODULE_ID("$Id: varargs.c,v 1.14 2024/07/27 19:23:59 tom Exp $")
 
 #ifdef TRACE
 
@@ -73,7 +73,7 @@ _nc_varargs(const char *fmt, va_list ap)
 
     while (*fmt != '\0') {
 	if (*fmt == '%') {
-	    char *pval = 0;	/* avoid const-cast */
+	    const char *pval = 0;	/* avoid const-cast */
 	    const char *sval = "";
 	    double fval = 0.0;
 	    int done = FALSE;
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index e50b63847..3b396a0c6 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -74,7 +74,7 @@ AUTHOR
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: hashmap.c,v 1.71 2023/09/16 16:28:53 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.72 2024/07/27 19:22:23 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -120,15 +120,14 @@ static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH(sp)];
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 static NCURSES_INLINE unsigned long
-hash(SCREEN *sp, NCURSES_CH_T *text)
+hash(SCREEN *sp, const NCURSES_CH_T *text)
 {
     int i;
-    NCURSES_CH_T ch;
     unsigned long result = 0;
     (void) sp;
 
     for (i = TEXTWIDTH(sp); i > 0; i--) {
-	ch = *text++;
+	NCURSES_CH_T ch = *text++;
 	result += (result << 5) + (unsigned long) HASH_VAL(ch);
     }
     return result;
diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c
index be1bbb051..f8160135b 100644
--- a/ncurses/widechar/lib_add_wch.c
+++ b/ncurses/widechar/lib_add_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2004-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_add_wch.c,v 1.18 2023/07/15 17:34:12 tom Exp $")
+MODULE_ID("$Id: lib_add_wch.c,v 1.19 2024/07/27 19:22:23 tom Exp $")
 
 /* clone/adapt lib_addch.c */
 static const cchar_t blankchar = NewChar(BLANK_TEXT);
@@ -115,7 +115,7 @@ render_char(WINDOW *win, cchar_t ch)
 #endif
 
 static bool
-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)
+newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos)
 {
     bool result = FALSE;
 
@@ -307,7 +307,7 @@ wadd_wch_nosync(WINDOW *win, cchar_t ch)
 /* the workhorse function -- add a character to the given window */
 {
     NCURSES_SIZE_T x, y;
-    wchar_t *s;
+    const wchar_t *s;
     int tabsize = 8;
 #if USE_REENTRANT
     SCREEN *sp = _nc_screen_of(win);
diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 451c5dcb5..81bef8ad3 100644
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <wchar.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.38 2022/07/27 08:03:16 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.39 2024/07/27 19:22:23 tom Exp $")
 
 /*
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -119,7 +119,7 @@ getcchar(const cchar_t *wcval,
     } else
 #endif
     if (wcval != NULL) {
-	wchar_t *wp;
+	const wchar_t *wp;
 	int len;
 
 #if HAVE_WMEMCHR
diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c
index 3b3bd522c..4aa9a0c46 100644
--- a/ncurses/widechar/lib_get_wstr.c
+++ b/ncurses/widechar/lib_get_wstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,10 +40,10 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_get_wstr.c,v 1.21 2023/04/29 19:02:03 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.22 2024/07/27 19:22:23 tom Exp $")
 
 static int
-wadd_wint(WINDOW *win, wint_t *src)
+wadd_wint(WINDOW *win, const wint_t *src)
 {
     cchar_t tmp;
     wchar_t wch[2];
@@ -59,7 +59,7 @@ wadd_wint(WINDOW *win, wint_t *src)
  * or other character, and handles reverse wraparound.
  */
 static wint_t *
-WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed)
+WipeOut(WINDOW *win, int y, int x, const wint_t *first, wint_t *last, int echoed)
 {
     if (last > first) {
 	*--last = '\0';
diff --git a/ncurses/widechar/lib_in_wchnstr.c b/ncurses/widechar/lib_in_wchnstr.c
index 40a2bb62b..fd453b658 100644
--- a/ncurses/widechar/lib_in_wchnstr.c
+++ b/ncurses/widechar/lib_in_wchnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2007,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_in_wchnstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_in_wchnstr.c,v 1.10 2024/07/27 19:23:21 tom Exp $")
 
 NCURSES_EXPORT(int)
 win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
@@ -50,7 +50,7 @@ win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
     T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n));
     if (win != 0
 	&& wchstr != 0) {
-	NCURSES_CH_T *src;
+	const NCURSES_CH_T *src;
 	int row, col;
 	int j, k, limit;
 
diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index ecaabcc9b..8d4899914 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.29 2023/11/21 21:53:28 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.30 2024/07/27 19:22:23 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -63,7 +63,7 @@ _nc_insert_wch(WINDOW *win, const cchar_t *wch)
 	    struct ldat *line = &(win->_line[win->_cury]);
 	    NCURSES_CH_T *end = &(line->text[win->_curx]);
 	    NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
-	    NCURSES_CH_T *temp2 = temp1 - cells;
+	    const NCURSES_CH_T *temp2 = temp1 - cells;
 
 	    CHANGED_TO_EOL(line, win->_curx, win->_maxx);
 	    while (temp1 > end)
diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index abfc595f3..77feece87 100644
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -40,13 +40,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.10 2024/06/08 21:22:24 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.11 2024/07/27 19:02:27 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
 {
     int count = 0;
-    cchar_t *text;
+    const cchar_t *text;
 
     T((T_CALLED("winnwstr(%p,%p,%d)"), (void *) win, (void *) wstr, n));
     if (wstr != 0) {
diff --git a/ncurses/widechar/lib_key_name.c b/ncurses/widechar/lib_key_name.c
index 379bdc2d4..c85909fe6 100644
--- a/ncurses/widechar/lib_key_name.c
+++ b/ncurses/widechar/lib_key_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2007-2008,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_key_name.c,v 1.6 2023/06/03 12:15:34 tom Exp $")
+MODULE_ID("$Id: lib_key_name.c,v 1.7 2024/07/27 19:23:59 tom Exp $")
 
 #define MyData _nc_globals.key_name
 
@@ -44,7 +44,7 @@ NCURSES_EXPORT(NCURSES_CONST char *)
 key_name(wchar_t c)
 {
     cchar_t my_cchar;
-    wchar_t *my_wchars;
+    const wchar_t *my_wchars;
     size_t len;
     NCURSES_CONST char *result = NULL;
 
diff --git a/ncurses/widechar/lib_wunctrl.c b/ncurses/widechar/lib_wunctrl.c
index 155da2292..b1c4f1a45 100644
--- a/ncurses/widechar/lib_wunctrl.c
+++ b/ncurses/widechar/lib_wunctrl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2001-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,17 +36,18 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_wunctrl.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_wunctrl.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
 
 NCURSES_EXPORT(wchar_t *)
 NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
 {
-    static wchar_t str[CCHARW_MAX + 1], *wsp;
+    static wchar_t str[CCHARW_MAX + 1];
     wchar_t *result;
 
     if (wc == 0) {
 	result = 0;
     } else if (SP_PARM != 0 && Charable(*wc)) {
+	wchar_t *wsp;
 	const char *p =
 	NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx
 				 (unsigned) _nc_to_char((wint_t)CharOf(*wc)));
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 41ff2214e..3ead410e7 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240720) unstable; urgency=low
+ncurses6td (6.5+20240727) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 41ff2214e..3ead410e7 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240720) unstable; urgency=low
+ncurses6td (6.5+20240727) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 5f71d0969..83a3ca35b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240720) unstable; urgency=low
+ncurses6td (6.5+20240727) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Jul 2024 06:19:56 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index a38f8c75b..e7750d89e 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.658 2024/07/20 10:19:56 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.659 2024/07/27 13:25:06 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0720"
+!define VERSION_MMDD  "0727"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 3bf061e20..e1f30e509 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240720
+Release: 20240727
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 163968db6..4f50badd7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240720
+Release: 20240727
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index db6f96de7..2e02f0b38 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240720
+Release: 20240727
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From e401ec997105ba8ef315dc0d3f7956557132dc57 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 10 Aug 2024 21:08:00 +0200
Subject: [PATCH 079/106] ncurses-6.5-20240810.patch.gz

---
 Ada95/aclocal.m4                 |   70 +-
 Ada95/configure                  | 2587 ++++++++--------
 NEWS                             |   11 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   83 +-
 config.guess                     |   15 +-
 config.sub                       |  733 +++--
 configure                        | 4725 +++++++++++++++---------------
 dist.mk                          |    4 +-
 menu/menu.priv.h                 |    7 +-
 misc/Makefile.in                 |   59 +-
 misc/run_tic.in                  |   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 +-
 test/aclocal.m4                  |   80 +-
 test/configure                   | 4006 ++++++++++++-------------
 test/configure.in                |    8 +-
 22 files changed, 6489 insertions(+), 5972 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index b56cd182e..28b4aa9f3 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
+dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1622,6 +1622,26 @@ rm -rf ./conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
+dnl ----------------
+dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
+AC_DEFUN([CF_GLOB_FULLPATH],[
+AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+AC_SUBST(GLOB_FULLPATH_POSIX)
+AC_SUBST(GLOB_FULLPATH_OTHER)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
 dnl -----------------
 AC_DEFUN([CF_GNATPREP_OPT_T],[
@@ -3434,35 +3454,35 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
 	AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
+dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
 if test "x$prefix" != xNONE; then
 	cf_path_syntax="$prefix"
 else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".[$]$1" in
-(.\[$]\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x[$]$1" in
+(x\[$]\(*\)*|x\'*\'*)
 	;;
-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
+(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
 	eval $1="[$]$1"
-	case ".[$]$1" in
-	(.NONE/*)
+	case "x[$]$1" in
+	(xNONE/*)
 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -3834,15 +3854,16 @@ AC_SUBST(cf_ada_config_Ada)
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
+dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl using the fallback mkinstalldirs script
 AC_DEFUN([CF_PROG_INSTALL],
 [AC_PROG_INSTALL
-case $INSTALL in
-(/*)
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	CF_DIRNAME(cf_dir,$INSTALL)
@@ -4657,12 +4678,12 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
+dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
-AC_HAVE_HEADERS(wchar.h)
+AC_CHECK_HEADERS(wchar.h)
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
 	cf_save_LIBS="$LIBS"
 	AC_TRY_LINK([
@@ -4949,7 +4970,7 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -4963,6 +4984,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config)
 dnl optionally ignores $PKG_CONFIG_LIBDIR.  Very old versions of pkg-config,
 dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
 
 case "$PKG_CONFIG" in
 (no|none|yes)
@@ -4996,10 +5018,10 @@ case "x$cf_search_path" in
 	;;
 (x)
 	;;
-(x/*\ *)
+(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
 	PKG_CONFIG_LIBDIR=
 	;;
-(x/*)
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
 	cf_search_path=
@@ -5018,7 +5040,15 @@ case "x$cf_search_path" in
 			pkg-config \
 			pkgconf
 		do
-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
+			case "$cf_raw_search_path" in
+			(*\\*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
+				;;
+			(*/*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
+				;;
+			esac
 			test -n "$cf_search_path" && break
 		done
 
diff --git a/Ada95/configure b/Ada95/configure
index 0cea3b0f7..c6515c155 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -3224,6 +3224,17 @@ echo "${ECHO_T}$cf_prog_ln_sf" >&6
 
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3236,7 +3247,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 # 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:3239: checking for a BSD compatible install" >&5
+echo "$as_me:3250: 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
@@ -3285,7 +3296,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3288: result: $INSTALL" >&5
+echo "$as_me:3299: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3296,8 +3307,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-case $INSTALL in
-(/*)
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
@@ -3306,7 +3317,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:3309: checking if you want to install stripped executables" >&5
+echo "$as_me:3320: 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.
@@ -3323,7 +3334,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:3326: result: $enable_stripping" >&5
+echo "$as_me:3337: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -3334,7 +3345,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:3337: checking if install accepts -p option" >&5
+echo "$as_me:3348: 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
@@ -3365,10 +3376,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3368: result: $cf_cv_install_p" >&5
+echo "$as_me:3379: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3371: checking if install needs to be told about ownership" >&5
+echo "$as_me:3382: 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)
@@ -3379,7 +3390,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3382: result: $with_install_o" >&5
+echo "$as_me:3393: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3390,7 +3401,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:3393: checking if you want to specify strip-program" >&5
+	echo "$as_me:3404: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3400,11 +3411,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3403: result: $with_strip_program" >&5
+	echo "$as_me:3414: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3407: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3418: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3425,11 +3436,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3428: result: $check_install_strip" >&5
+		echo "$as_me:3439: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3432: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3443: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3444,7 +3455,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3454,7 +3465,7 @@ echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
 	fi
 fi
 
-echo "$as_me:3457: checking for long file names" >&5
+echo "$as_me:3468: 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
@@ -3493,7 +3504,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3496: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3507: 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
 
@@ -3505,7 +3516,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:3508: checking if you want to use pkg-config" >&5
+echo "$as_me:3519: 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.
@@ -3515,7 +3526,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:3518: result: $cf_pkg_config" >&5
+echo "$as_me:3529: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -3527,7 +3538,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3530: checking for $ac_word" >&5
+echo "$as_me:3541: 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
@@ -3544,7 +3555,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3547: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3558: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3555,10 +3566,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3558: result: $PKG_CONFIG" >&5
+  echo "$as_me:3569: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3561: result: no" >&5
+  echo "$as_me:3572: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3567,7 +3578,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3570: checking for $ac_word" >&5
+echo "$as_me:3581: 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
@@ -3584,7 +3595,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3587: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3598: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3596,10 +3607,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:3602: result: no" >&5
+  echo "$as_me:3613: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3623,43 +3634,41 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$PKG_CONFIG" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$PKG_CONFIG" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval PKG_CONFIG="$PKG_CONFIG"
-	case ".$PKG_CONFIG" in
-	(.NONE/*)
+	case "x$PKG_CONFIG" in
+	(xNONE/*)
 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:3645: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:3654: 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:3652: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:3661: 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:3658: checking for pkg-config library directory" >&5
+	echo "$as_me:3667: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -3686,27 +3695,27 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (x)
 	;;
-(x/*\ *)
+(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
 	PKG_CONFIG_LIBDIR=
 	;;
-(x/*)
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:3705: result: auto" >&5
+	echo "$as_me:3714: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:3709: checking for search-list" >&5
+	echo "$as_me:3718: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -3717,7 +3726,15 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 			pkg-config \
 			pkgconf
 		do
-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
+			case "$cf_raw_search_path" in
+			(*\\*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
+				;;
+			(*/*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
+				;;
+			esac
 			test -n "$cf_search_path" && break
 		done
 
@@ -3733,11 +3750,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:3736: result: $cf_search_path" >&5
+	echo "$as_me:3753: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -3745,7 +3762,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:3748: checking for first directory" >&5
+	echo "$as_me:3765: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -3756,7 +3773,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:3759: result: $cf_pkg_config_path" >&5
+	echo "$as_me:3776: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -3766,7 +3783,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:3769: checking for workaround" >&5
+		echo "$as_me:3786: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -3789,12 +3806,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
-echo "$as_me:3797: checking if you want to build test-programs" >&5
+echo "$as_me:3814: 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.
@@ -3804,10 +3821,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3807: result: $cf_with_tests" >&5
+echo "$as_me:3824: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3810: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3827: 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.
@@ -3817,11 +3834,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:3820: result: $enable_mixedcase" >&5
+echo "$as_me:3837: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:3824: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3841: 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
@@ -3848,7 +3865,7 @@ else
 fi
 
 fi
-echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3866,7 +3883,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3869: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3886: 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
@@ -3886,16 +3903,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3889: result: yes" >&5
+  echo "$as_me:3906: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3893: result: no" >&5
+  echo "$as_me:3910: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:3898: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3915: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3950,7 +3967,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -3961,7 +3978,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3964: checking for $ac_word" >&5
+echo "$as_me:3981: 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
@@ -3976,7 +3993,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3979: found $ac_dir/$ac_word" >&5
+echo "$as_me:3996: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3984,10 +4001,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3987: result: $CTAGS" >&5
+  echo "$as_me:4004: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3990: result: no" >&5
+  echo "$as_me:4007: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3998,7 +4015,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4001: checking for $ac_word" >&5
+echo "$as_me:4018: 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
@@ -4013,7 +4030,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4016: found $ac_dir/$ac_word" >&5
+echo "$as_me:4033: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4021,10 +4038,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4024: result: $ETAGS" >&5
+  echo "$as_me:4041: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4027: result: no" >&5
+  echo "$as_me:4044: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4033,7 +4050,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4036: checking for $ac_word" >&5
+echo "$as_me:4053: 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
@@ -4048,7 +4065,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4051: found $ac_dir/$ac_word" >&5
+echo "$as_me:4068: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4057,17 +4074,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4063: result: no" >&5
+  echo "$as_me:4080: 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:4070: checking for $ac_word" >&5
+echo "$as_me:4087: 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
@@ -4082,7 +4099,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4085: found $ac_dir/$ac_word" >&5
+echo "$as_me:4102: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4091,10 +4108,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4097: result: no" >&5
+  echo "$as_me:4114: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4114,7 +4131,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4117: checking for makeflags variable" >&5
+echo "$as_me:4134: 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
@@ -4144,7 +4161,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4152,13 +4169,13 @@ echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4155: result: $cf_cv_makeflags" >&5
+echo "$as_me:4172: 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:4161: checking for $ac_word" >&5
+echo "$as_me:4178: 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
@@ -4173,7 +4190,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4176: found $ac_dir/$ac_word" >&5
+echo "$as_me:4193: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4181,10 +4198,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4184: result: $RANLIB" >&5
+  echo "$as_me:4201: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4187: result: no" >&5
+  echo "$as_me:4204: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4193,7 +4210,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4196: checking for $ac_word" >&5
+echo "$as_me:4213: 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
@@ -4208,7 +4225,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4211: found $ac_dir/$ac_word" >&5
+echo "$as_me:4228: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4217,10 +4234,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4223: result: no" >&5
+  echo "$as_me:4240: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4232,7 +4249,7 @@ fi
 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:4235: checking for $ac_word" >&5
+echo "$as_me:4252: 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
@@ -4247,7 +4264,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4250: found $ac_dir/$ac_word" >&5
+echo "$as_me:4267: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4255,10 +4272,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4258: result: $LD" >&5
+  echo "$as_me:4275: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4261: result: no" >&5
+  echo "$as_me:4278: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4267,7 +4284,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4270: checking for $ac_word" >&5
+echo "$as_me:4287: 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
@@ -4282,7 +4299,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4285: found $ac_dir/$ac_word" >&5
+echo "$as_me:4302: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4291,10 +4308,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4294: result: $ac_ct_LD" >&5
+  echo "$as_me:4311: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4297: result: no" >&5
+  echo "$as_me:4314: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4306,7 +4323,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4309: checking for $ac_word" >&5
+echo "$as_me:4326: 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
@@ -4321,7 +4338,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4324: found $ac_dir/$ac_word" >&5
+echo "$as_me:4341: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4329,10 +4346,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4332: result: $AR" >&5
+  echo "$as_me:4349: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4335: result: no" >&5
+  echo "$as_me:4352: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4341,7 +4358,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4344: checking for $ac_word" >&5
+echo "$as_me:4361: 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
@@ -4356,7 +4373,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4359: found $ac_dir/$ac_word" >&5
+echo "$as_me:4376: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4365,10 +4382,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4368: result: $ac_ct_AR" >&5
+  echo "$as_me:4385: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4371: result: no" >&5
+  echo "$as_me:4388: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4380,7 +4397,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4383: checking for $ac_word" >&5
+echo "$as_me:4400: 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
@@ -4395,7 +4412,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4398: found $ac_dir/$ac_word" >&5
+echo "$as_me:4415: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4403,10 +4420,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4406: result: $AR" >&5
+  echo "$as_me:4423: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4409: result: no" >&5
+  echo "$as_me:4426: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4415,7 +4432,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4418: checking for $ac_word" >&5
+echo "$as_me:4435: 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
@@ -4430,7 +4447,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4433: found $ac_dir/$ac_word" >&5
+echo "$as_me:4450: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4439,10 +4456,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4442: result: $ac_ct_AR" >&5
+  echo "$as_me:4459: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4445: result: no" >&5
+  echo "$as_me:4462: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4451,7 +4468,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:4454: checking for options to update archives" >&5
+echo "$as_me:4471: 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
@@ -4488,13 +4505,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4491 "configure"
+#line 4508 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4497: \$? = $ac_status" >&5
+  echo "$as_me:4514: \$? = $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
@@ -4505,7 +4522,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4515,7 +4532,7 @@ echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4526,17 +4543,17 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-	echo "$as_me:4529: checking for PATH separator" >&5
+	echo "$as_me:4546: 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:4536: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:4553: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
-echo "$as_me:4539: checking if you have specified an install-prefix" >&5
+echo "$as_me:4556: 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.
@@ -4549,7 +4566,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:4552: result: $DESTDIR" >&5
+echo "$as_me:4569: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
@@ -4577,7 +4594,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4580: checking for $ac_word" >&5
+echo "$as_me:4597: 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
@@ -4592,7 +4609,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:4595: found $ac_dir/$ac_word" >&5
+echo "$as_me:4612: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4600,10 +4617,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:4603: result: $BUILD_CC" >&5
+  echo "$as_me:4620: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:4606: result: no" >&5
+  echo "$as_me:4623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4612,12 +4629,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:4615: checking for native build C compiler" >&5
+	echo "$as_me:4632: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:4617: result: $BUILD_CC" >&5
+	echo "$as_me:4634: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:4620: checking for native build C preprocessor" >&5
+	echo "$as_me:4637: 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.
@@ -4627,10 +4644,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:4630: result: $BUILD_CPP" >&5
+	echo "$as_me:4647: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:4633: checking for native build C flags" >&5
+	echo "$as_me:4650: 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.
@@ -4638,10 +4655,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:4644: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:4661: 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.
@@ -4649,10 +4666,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:4655: checking for native build linker-flags" >&5
+	echo "$as_me:4672: 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.
@@ -4660,10 +4677,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:4666: checking for native build linker-libraries" >&5
+	echo "$as_me:4683: 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.
@@ -4671,7 +4688,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:4674: result: $BUILD_LIBS" >&5
+	echo "$as_me:4691: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -4680,7 +4697,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:4683: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:4700: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -4694,7 +4711,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4697 "configure"
+#line 4714 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -4704,15 +4721,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4710: \$? = $ac_status" >&5
+  echo "$as_me:4727: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4715: \$? = $ac_status" >&5
+  echo "$as_me:4732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -4727,12 +4744,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:4730: result: $cf_ok_build_cc" >&5
+	echo "$as_me:4747: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:4735: error: Cross-build requires two compilers.
+		{ { echo "$as_me:4752: 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;}
@@ -4757,7 +4774,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:4760: checking if you want to build shared C-objects" >&5
+echo "$as_me:4777: checking if you want to build shared C-objects" >&5
 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
@@ -4767,27 +4784,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:4770: result: $with_shared" >&5
+echo "$as_me:4787: result: $with_shared" >&5
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
-echo "$as_me:4774: checking for specified models" >&5
+echo "$as_me:4791: checking for specified models" >&5
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
-echo "$as_me:4777: result: $cf_list_models" >&5
+echo "$as_me:4794: 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:4782: checking for default model" >&5
+echo "$as_me:4799: 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:4785: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4802: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:4790: checking for specific curses-directory" >&5
+echo "$as_me:4807: 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.
@@ -4797,7 +4814,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:4800: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4817: 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"
@@ -4809,26 +4826,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4864,7 +4879,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 4867 "configure"
+#line 4882 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4876,16 +4891,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4882: \$? = $ac_status" >&5
+  echo "$as_me:4897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4888: \$? = $ac_status" >&5
+  echo "$as_me:4903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4902,7 +4917,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -4938,7 +4953,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -4953,13 +4968,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:4956: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:4971: 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:4959: result: yes" >&5
+		echo "$as_me:4974: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:4962: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:4977: 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
 
@@ -5092,7 +5107,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 5095 "configure"
+#line 5110 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5104,37 +5119,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5110: \$? = $ac_status" >&5
+  echo "$as_me:5125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5116: \$? = $ac_status" >&5
+  echo "$as_me:5131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5122 "configure"
+#line 5137 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5132: \$? = $ac_status" >&5
+  echo "$as_me:5147: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5137: \$? = $ac_status" >&5
+  echo "$as_me:5152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -5308,7 +5323,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5311 "configure"
+#line 5326 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5320,37 +5335,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5326: \$? = $ac_status" >&5
+  echo "$as_me:5341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5332: \$? = $ac_status" >&5
+  echo "$as_me:5347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5338 "configure"
+#line 5353 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5348: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5353: \$? = $ac_status" >&5
+  echo "$as_me:5368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -5367,7 +5382,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:5370: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5385: 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"
@@ -5383,7 +5398,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5386: checking for terminfo header" >&5
+echo "$as_me:5401: 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
@@ -5401,7 +5416,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5404 "configure"
+#line 5419 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5416,16 +5431,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5422: \$? = $ac_status" >&5
+  echo "$as_me:5437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5428: \$? = $ac_status" >&5
+  echo "$as_me:5443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5441,7 +5456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5444: result: $cf_cv_term_header" >&5
+echo "$as_me:5459: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5476,7 +5491,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5479: result: no" >&5
+		echo "$as_me:5494: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5492,7 +5507,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5495: checking for $ac_word" >&5
+echo "$as_me:5510: 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
@@ -5507,7 +5522,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5510: found $ac_dir/$ac_word" >&5
+echo "$as_me:5525: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5515,10 +5530,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5521: result: no" >&5
+  echo "$as_me:5536: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5531,7 +5546,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5534: checking for $ac_word" >&5
+echo "$as_me:5549: 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
@@ -5546,7 +5561,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5549: found $ac_dir/$ac_word" >&5
+echo "$as_me:5564: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5554,10 +5569,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5560: result: no" >&5
+  echo "$as_me:5575: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5714,7 +5729,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5717: checking if we have identified curses headers" >&5
+echo "$as_me:5732: 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
@@ -5726,7 +5741,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5729 "configure"
+#line 5744 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5738,16 +5753,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5744: \$? = $ac_status" >&5
+  echo "$as_me:5759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5750: \$? = $ac_status" >&5
+  echo "$as_me:5765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5758,11 +5773,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5761: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5776: 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:5765: error: No curses header-files found" >&5
+	{ { echo "$as_me:5780: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5772,23 +5787,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5775: checking for $ac_header" >&5
+echo "$as_me:5790: 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 5781 "configure"
+#line 5796 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5785: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5791: \$? = $ac_status" >&5
+  echo "$as_me:5806: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5807,7 +5822,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5810: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5863,7 +5878,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5866 "configure"
+#line 5881 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5875,16 +5890,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5881: \$? = $ac_status" >&5
+  echo "$as_me:5896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5887: \$? = $ac_status" >&5
+  echo "$as_me:5902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5901,7 +5916,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5920,7 +5935,7 @@ fi
 
 }
 
-echo "$as_me:5923: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5938: 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
@@ -5932,7 +5947,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5935 "configure"
+#line 5950 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5956,16 +5971,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5962: \$? = $ac_status" >&5
+  echo "$as_me:5977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5968: \$? = $ac_status" >&5
+  echo "$as_me:5983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -5980,14 +5995,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:5983: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:5998: 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:5990: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:6005: 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
@@ -6108,7 +6123,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6111 "configure"
+#line 6126 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6120,16 +6135,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6126: \$? = $ac_status" >&5
+  echo "$as_me:6141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6132: \$? = $ac_status" >&5
+  echo "$as_me:6147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6146,7 +6161,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6169,7 +6184,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6172 "configure"
+#line 6187 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6193,16 +6208,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6199: \$? = $ac_status" >&5
+  echo "$as_me:6214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6205: \$? = $ac_status" >&5
+  echo "$as_me:6220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -6223,12 +6238,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:6231: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6246: 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%/[^/]*$%%'`
@@ -6264,7 +6279,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6267 "configure"
+#line 6282 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6276,16 +6291,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6282: \$? = $ac_status" >&5
+  echo "$as_me:6297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6288: \$? = $ac_status" >&5
+  echo "$as_me:6303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6302,7 +6317,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6350,7 +6365,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:6353: checking for terminfo header" >&5
+echo "$as_me:6368: 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
@@ -6368,7 +6383,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6371 "configure"
+#line 6386 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -6383,16 +6398,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6389: \$? = $ac_status" >&5
+  echo "$as_me:6404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6395: \$? = $ac_status" >&5
+  echo "$as_me:6410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6408,7 +6423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6411: result: $cf_cv_term_header" >&5
+echo "$as_me:6426: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6446,7 +6461,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6449: checking for ncurses version" >&5
+echo "$as_me:6464: 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
@@ -6472,10 +6487,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6475: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6490: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6478: \$? = $ac_status" >&5
+  echo "$as_me:6493: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6485,7 +6500,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6488 "configure"
+#line 6503 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6512,15 +6527,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6518: \$? = $ac_status" >&5
+  echo "$as_me:6533: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6523: \$? = $ac_status" >&5
+  echo "$as_me:6538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6534,7 +6549,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6547,7 +6562,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6550: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6565: 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
@@ -6555,7 +6570,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6558 "configure"
+#line 6573 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6574,16 +6589,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6580: \$? = $ac_status" >&5
+  echo "$as_me:6595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6586: \$? = $ac_status" >&5
+  echo "$as_me:6601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6594,10 +6609,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6597: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6612: 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:6600: checking for initscr in -lgpm" >&5
+  echo "$as_me:6615: 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
@@ -6605,7 +6620,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6608 "configure"
+#line 6623 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6624,16 +6639,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6630: \$? = $ac_status" >&5
+  echo "$as_me:6645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6636: \$? = $ac_status" >&5
+  echo "$as_me:6651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6644,7 +6659,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6647: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6662: 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"
@@ -6659,7 +6674,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6662: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6677: 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
@@ -6667,7 +6682,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6670 "configure"
+#line 6685 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6686,16 +6701,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6692: \$? = $ac_status" >&5
+  echo "$as_me:6707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6698: \$? = $ac_status" >&5
+  echo "$as_me:6713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6706,7 +6721,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6709: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6724: 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"
@@ -6755,13 +6770,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6758: checking for initscr" >&5
+	echo "$as_me:6773: 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 6764 "configure"
+#line 6779 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6792,16 +6807,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6798: \$? = $ac_status" >&5
+  echo "$as_me:6813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6804: \$? = $ac_status" >&5
+  echo "$as_me:6819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6811,18 +6826,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6814: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6829: 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:6821: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:6836: 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 6825 "configure"
+#line 6840 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6834,25 +6849,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:6855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6846: \$? = $ac_status" >&5
+  echo "$as_me:6861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6848: result: yes" >&5
+  echo "$as_me:6863: 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:6855: result: no" >&5
+echo "$as_me:6870: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6920,11 +6935,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6923: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:6938: 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 6927 "configure"
+#line 6942 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6936,25 +6951,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6942: \$? = $ac_status" >&5
+  echo "$as_me:6957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6948: \$? = $ac_status" >&5
+  echo "$as_me:6963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6950: result: yes" >&5
+  echo "$as_me:6965: 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:6957: result: no" >&5
+echo "$as_me:6972: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -6969,7 +6984,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6977,7 +6992,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:6980: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:6995: 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
@@ -6987,7 +7002,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6990 "configure"
+#line 7005 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6999,23 +7014,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7005: \$? = $ac_status" >&5
+  echo "$as_me:7020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7011: \$? = $ac_status" >&5
+  echo "$as_me:7026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:7013: result: yes" >&5
+  echo "$as_me:7028: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:7018: result: no" >&5
+echo "$as_me:7033: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -7033,7 +7048,7 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:7036: checking for specified curses library type" >&5
+echo "$as_me:7051: 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.
@@ -7053,23 +7068,23 @@ case $cf_cv_screen in
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7056: checking for $ac_header" >&5
+echo "$as_me:7071: 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 7062 "configure"
+#line 7077 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7066: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7081: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7072: \$? = $ac_status" >&5
+  echo "$as_me:7087: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7088,7 +7103,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7091: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7106: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7098,7 +7113,7 @@ EOF
 fi
 done
 
-echo "$as_me:7101: checking for multibyte character support" >&5
+echo "$as_me:7116: 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
@@ -7106,7 +7121,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7109 "configure"
+#line 7124 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7123,16 +7138,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7129: \$? = $ac_status" >&5
+  echo "$as_me:7144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7135: \$? = $ac_status" >&5
+  echo "$as_me:7150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7144,12 +7159,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7152 "configure"
+#line 7167 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7162,16 +7177,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7168: \$? = $ac_status" >&5
+  echo "$as_me:7183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7174: \$? = $ac_status" >&5
+  echo "$as_me:7189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7185,7 +7200,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7188 "configure"
+#line 7203 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7198,16 +7213,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7204: \$? = $ac_status" >&5
+  echo "$as_me:7219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7210: \$? = $ac_status" >&5
+  echo "$as_me:7225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7224,9 +7239,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7317,7 +7332,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7325,7 +7340,7 @@ echo "${as_me:-configure}:7320: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7328 "configure"
+#line 7343 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7338,21 +7353,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7344: \$? = $ac_status" >&5
+  echo "$as_me:7359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7350: \$? = $ac_status" >&5
+  echo "$as_me:7365: \$? = $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}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7370,7 +7385,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7445,13 +7460,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7448: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7463: 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 7454 "configure"
+#line 7469 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7464,21 +7479,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7470: \$? = $ac_status" >&5
+  echo "$as_me:7485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7476: \$? = $ac_status" >&5
+  echo "$as_me:7491: \$? = $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}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7520,7 +7535,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7523: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7538: 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
@@ -7558,7 +7573,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7561 "configure"
+#line 7576 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7570,16 +7585,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7576: \$? = $ac_status" >&5
+  echo "$as_me:7591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7582: \$? = $ac_status" >&5
+  echo "$as_me:7597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7596,7 +7611,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7632,7 +7647,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7662,13 +7677,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7665: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7680: 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:7668: result: yes" >&5
+		echo "$as_me:7683: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7671: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7686: 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
 
@@ -7801,7 +7816,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7804 "configure"
+#line 7819 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7813,37 +7828,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7819: \$? = $ac_status" >&5
+  echo "$as_me:7834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7825: \$? = $ac_status" >&5
+  echo "$as_me:7840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7831 "configure"
+#line 7846 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7841: \$? = $ac_status" >&5
+  echo "$as_me:7856: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7846: \$? = $ac_status" >&5
+  echo "$as_me:7861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8017,7 +8032,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8020 "configure"
+#line 8035 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8029,37 +8044,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8035: \$? = $ac_status" >&5
+  echo "$as_me:8050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8041: \$? = $ac_status" >&5
+  echo "$as_me:8056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8047 "configure"
+#line 8062 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8057: \$? = $ac_status" >&5
+  echo "$as_me:8072: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8062: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8076,7 +8091,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8079: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8094: 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"
@@ -8092,7 +8107,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8095: checking for terminfo header" >&5
+echo "$as_me:8110: 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
@@ -8110,7 +8125,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8113 "configure"
+#line 8128 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8125,16 +8140,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8131: \$? = $ac_status" >&5
+  echo "$as_me:8146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8137: \$? = $ac_status" >&5
+  echo "$as_me:8152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8150,7 +8165,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8153: result: $cf_cv_term_header" >&5
+echo "$as_me:8168: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8185,7 +8200,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8188: result: no" >&5
+		echo "$as_me:8203: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8201,7 +8216,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8204: checking for $ac_word" >&5
+echo "$as_me:8219: 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
@@ -8216,7 +8231,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:8219: found $ac_dir/$ac_word" >&5
+echo "$as_me:8234: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8224,10 +8239,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8230: result: no" >&5
+  echo "$as_me:8245: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8240,7 +8255,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8243: checking for $ac_word" >&5
+echo "$as_me:8258: 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
@@ -8255,7 +8270,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:8258: found $ac_dir/$ac_word" >&5
+echo "$as_me:8273: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8263,10 +8278,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8269: result: no" >&5
+  echo "$as_me:8284: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8423,7 +8438,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8426: checking if we have identified curses headers" >&5
+echo "$as_me:8441: 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
@@ -8435,7 +8450,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8438 "configure"
+#line 8453 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8447,16 +8462,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8453: \$? = $ac_status" >&5
+  echo "$as_me:8468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8459: \$? = $ac_status" >&5
+  echo "$as_me:8474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8467,11 +8482,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8470: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8485: 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:8474: error: No curses header-files found" >&5
+	{ { echo "$as_me:8489: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8481,23 +8496,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8484: checking for $ac_header" >&5
+echo "$as_me:8499: 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 8490 "configure"
+#line 8505 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8494: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8500: \$? = $ac_status" >&5
+  echo "$as_me:8515: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8516,7 +8531,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8519: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8572,7 +8587,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8575 "configure"
+#line 8590 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8584,16 +8599,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8590: \$? = $ac_status" >&5
+  echo "$as_me:8605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8596: \$? = $ac_status" >&5
+  echo "$as_me:8611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8610,7 +8625,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8629,7 +8644,7 @@ fi
 
 }
 
-echo "$as_me:8632: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8647: 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
@@ -8641,7 +8656,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8644 "configure"
+#line 8659 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8665,16 +8680,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8671: \$? = $ac_status" >&5
+  echo "$as_me:8686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8677: \$? = $ac_status" >&5
+  echo "$as_me:8692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8689,14 +8704,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8692: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8707: 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:8699: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8714: 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
@@ -8817,7 +8832,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8820 "configure"
+#line 8835 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8829,16 +8844,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8835: \$? = $ac_status" >&5
+  echo "$as_me:8850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8841: \$? = $ac_status" >&5
+  echo "$as_me:8856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8855,7 +8870,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8878,7 +8893,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8881 "configure"
+#line 8896 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8902,16 +8917,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8908: \$? = $ac_status" >&5
+  echo "$as_me:8923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8914: \$? = $ac_status" >&5
+  echo "$as_me:8929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8932,12 +8947,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8940: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8955: 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%/[^/]*$%%'`
@@ -8973,7 +8988,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8976 "configure"
+#line 8991 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8985,16 +9000,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8991: \$? = $ac_status" >&5
+  echo "$as_me:9006: \$? = $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:9009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8997: \$? = $ac_status" >&5
+  echo "$as_me:9012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9011,7 +9026,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9059,7 +9074,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9062: checking for terminfo header" >&5
+echo "$as_me:9077: 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
@@ -9077,7 +9092,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9080 "configure"
+#line 9095 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9092,16 +9107,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9098: \$? = $ac_status" >&5
+  echo "$as_me:9113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9104: \$? = $ac_status" >&5
+  echo "$as_me:9119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9117,7 +9132,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9120: result: $cf_cv_term_header" >&5
+echo "$as_me:9135: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9155,7 +9170,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9158: checking for ncurses version" >&5
+echo "$as_me:9173: 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
@@ -9181,10 +9196,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9184: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9199: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9187: \$? = $ac_status" >&5
+  echo "$as_me:9202: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9194,7 +9209,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9197 "configure"
+#line 9212 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9221,15 +9236,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9227: \$? = $ac_status" >&5
+  echo "$as_me:9242: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9232: \$? = $ac_status" >&5
+  echo "$as_me:9247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9243,7 +9258,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -9256,7 +9271,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9259: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9274: 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
@@ -9264,7 +9279,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9267 "configure"
+#line 9282 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9283,16 +9298,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9289: \$? = $ac_status" >&5
+  echo "$as_me:9304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9295: \$? = $ac_status" >&5
+  echo "$as_me:9310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9303,10 +9318,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9306: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9321: 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:9309: checking for initscr in -lgpm" >&5
+  echo "$as_me:9324: 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
@@ -9314,7 +9329,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9317 "configure"
+#line 9332 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9333,16 +9348,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9339: \$? = $ac_status" >&5
+  echo "$as_me:9354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9345: \$? = $ac_status" >&5
+  echo "$as_me:9360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9353,7 +9368,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9356: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9371: 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"
@@ -9368,7 +9383,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9371: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9386: 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
@@ -9376,7 +9391,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9379 "configure"
+#line 9394 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9395,16 +9410,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9401: \$? = $ac_status" >&5
+  echo "$as_me:9416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9407: \$? = $ac_status" >&5
+  echo "$as_me:9422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9415,7 +9430,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9418: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9433: 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"
@@ -9464,13 +9479,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9467: checking for initscr" >&5
+	echo "$as_me:9482: 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 9473 "configure"
+#line 9488 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9501,16 +9516,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9507: \$? = $ac_status" >&5
+  echo "$as_me:9522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9513: \$? = $ac_status" >&5
+  echo "$as_me:9528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9520,18 +9535,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9523: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9538: 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:9530: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9545: 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 9534 "configure"
+#line 9549 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9543,25 +9558,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9549: \$? = $ac_status" >&5
+  echo "$as_me:9564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9555: \$? = $ac_status" >&5
+  echo "$as_me:9570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9557: result: yes" >&5
+  echo "$as_me:9572: 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:9564: result: no" >&5
+echo "$as_me:9579: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9629,11 +9644,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9632: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9647: 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 9636 "configure"
+#line 9651 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9645,25 +9660,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9651: \$? = $ac_status" >&5
+  echo "$as_me:9666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9657: \$? = $ac_status" >&5
+  echo "$as_me:9672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9659: result: yes" >&5
+  echo "$as_me:9674: 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:9666: result: no" >&5
+echo "$as_me:9681: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9678,7 +9693,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9686,7 +9701,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9689: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9704: 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
@@ -9696,7 +9711,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9699 "configure"
+#line 9714 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9708,23 +9723,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9714: \$? = $ac_status" >&5
+  echo "$as_me:9729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9720: \$? = $ac_status" >&5
+  echo "$as_me:9735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9722: result: yes" >&5
+  echo "$as_me:9737: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9727: result: no" >&5
+echo "$as_me:9742: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9749,13 +9764,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9752: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9767: 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:9755: result: yes" >&5
+		echo "$as_me:9770: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9758: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9773: 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
 
@@ -9888,7 +9903,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9891 "configure"
+#line 9906 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9900,37 +9915,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9906: \$? = $ac_status" >&5
+  echo "$as_me:9921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9912: \$? = $ac_status" >&5
+  echo "$as_me:9927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9918 "configure"
+#line 9933 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9928: \$? = $ac_status" >&5
+  echo "$as_me:9943: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  echo "$as_me:9948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10104,7 +10119,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10107 "configure"
+#line 10122 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10116,37 +10131,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10122: \$? = $ac_status" >&5
+  echo "$as_me:10137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10128: \$? = $ac_status" >&5
+  echo "$as_me:10143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10134 "configure"
+#line 10149 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10144: \$? = $ac_status" >&5
+  echo "$as_me:10159: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10149: \$? = $ac_status" >&5
+  echo "$as_me:10164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10163,7 +10178,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10166: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:10181: 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"
@@ -10179,7 +10194,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10182: checking for terminfo header" >&5
+echo "$as_me:10197: 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
@@ -10197,7 +10212,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10200 "configure"
+#line 10215 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10212,16 +10227,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10218: \$? = $ac_status" >&5
+  echo "$as_me:10233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10224: \$? = $ac_status" >&5
+  echo "$as_me:10239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10237,7 +10252,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10240: result: $cf_cv_term_header" >&5
+echo "$as_me:10255: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10272,7 +10287,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:10275: result: no" >&5
+		echo "$as_me:10290: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -10288,7 +10303,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:10291: checking for $ac_word" >&5
+echo "$as_me:10306: 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
@@ -10303,7 +10318,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:10306: found $ac_dir/$ac_word" >&5
+echo "$as_me:10321: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10311,10 +10326,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10317: result: no" >&5
+  echo "$as_me:10332: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10327,7 +10342,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10330: checking for $ac_word" >&5
+echo "$as_me:10345: 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
@@ -10342,7 +10357,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10345: found $ac_dir/$ac_word" >&5
+echo "$as_me:10360: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10350,10 +10365,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10356: result: no" >&5
+  echo "$as_me:10371: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10510,7 +10525,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10513: checking if we have identified curses headers" >&5
+echo "$as_me:10528: 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
@@ -10522,7 +10537,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10525 "configure"
+#line 10540 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10534,16 +10549,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10540: \$? = $ac_status" >&5
+  echo "$as_me:10555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10546: \$? = $ac_status" >&5
+  echo "$as_me:10561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10554,11 +10569,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10557: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10572: 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:10561: error: No curses header-files found" >&5
+	{ { echo "$as_me:10576: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10568,23 +10583,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10571: checking for $ac_header" >&5
+echo "$as_me:10586: 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 10577 "configure"
+#line 10592 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10596: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10587: \$? = $ac_status" >&5
+  echo "$as_me:10602: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10603,7 +10618,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10621: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10659,7 +10674,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10662 "configure"
+#line 10677 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10671,16 +10686,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10677: \$? = $ac_status" >&5
+  echo "$as_me:10692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10683: \$? = $ac_status" >&5
+  echo "$as_me:10698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10697,7 +10712,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10716,7 +10731,7 @@ fi
 
 }
 
-echo "$as_me:10719: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10734: 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
@@ -10728,7 +10743,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10731 "configure"
+#line 10746 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10752,16 +10767,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:10773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10764: \$? = $ac_status" >&5
+  echo "$as_me:10779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10776,14 +10791,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10779: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10794: 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:10786: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10801: 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
@@ -10904,7 +10919,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10907 "configure"
+#line 10922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10916,16 +10931,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10922: \$? = $ac_status" >&5
+  echo "$as_me:10937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10928: \$? = $ac_status" >&5
+  echo "$as_me:10943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10942,7 +10957,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10965,7 +10980,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10968 "configure"
+#line 10983 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10989,16 +11004,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10995: \$? = $ac_status" >&5
+  echo "$as_me:11010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:11016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11019,12 +11034,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11027: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11042: 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%/[^/]*$%%'`
@@ -11060,7 +11075,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11063 "configure"
+#line 11078 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11072,16 +11087,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11078: \$? = $ac_status" >&5
+  echo "$as_me:11093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11084: \$? = $ac_status" >&5
+  echo "$as_me:11099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11098,7 +11113,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11146,7 +11161,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11149: checking for terminfo header" >&5
+echo "$as_me:11164: 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
@@ -11164,7 +11179,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11167 "configure"
+#line 11182 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11179,16 +11194,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11185: \$? = $ac_status" >&5
+  echo "$as_me:11200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11191: \$? = $ac_status" >&5
+  echo "$as_me:11206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11204,7 +11219,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11207: result: $cf_cv_term_header" >&5
+echo "$as_me:11222: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11242,7 +11257,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:11245: checking for ncurses version" >&5
+echo "$as_me:11260: 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
@@ -11268,10 +11283,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11286: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11274: \$? = $ac_status" >&5
+  echo "$as_me:11289: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -11281,7 +11296,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11284 "configure"
+#line 11299 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11308,15 +11323,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11329: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11319: \$? = $ac_status" >&5
+  echo "$as_me:11334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11330,7 +11345,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -11343,7 +11358,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11346: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11361: 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
@@ -11351,7 +11366,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11354 "configure"
+#line 11369 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11370,16 +11385,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11376: \$? = $ac_status" >&5
+  echo "$as_me:11391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11382: \$? = $ac_status" >&5
+  echo "$as_me:11397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11390,10 +11405,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11393: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11408: 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:11396: checking for initscr in -lgpm" >&5
+  echo "$as_me:11411: 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
@@ -11401,7 +11416,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11404 "configure"
+#line 11419 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11420,16 +11435,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11426: \$? = $ac_status" >&5
+  echo "$as_me:11441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11432: \$? = $ac_status" >&5
+  echo "$as_me:11447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11440,7 +11455,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11443: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11458: 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"
@@ -11455,7 +11470,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11458: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11473: 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
@@ -11463,7 +11478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11466 "configure"
+#line 11481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11482,16 +11497,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11488: \$? = $ac_status" >&5
+  echo "$as_me:11503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11494: \$? = $ac_status" >&5
+  echo "$as_me:11509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11502,7 +11517,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11505: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11520: 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"
@@ -11551,13 +11566,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11554: checking for initscr" >&5
+	echo "$as_me:11569: 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 11560 "configure"
+#line 11575 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11588,16 +11603,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11594: \$? = $ac_status" >&5
+  echo "$as_me:11609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11607,18 +11622,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11610: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11625: 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:11617: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11632: 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 11621 "configure"
+#line 11636 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11630,25 +11645,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11636: \$? = $ac_status" >&5
+  echo "$as_me:11651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+  echo "$as_me:11657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11644: result: yes" >&5
+  echo "$as_me:11659: 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:11651: result: no" >&5
+echo "$as_me:11666: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11716,11 +11731,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11719: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11734: 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 11723 "configure"
+#line 11738 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11732,25 +11747,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11738: \$? = $ac_status" >&5
+  echo "$as_me:11753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11744: \$? = $ac_status" >&5
+  echo "$as_me:11759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11746: result: yes" >&5
+  echo "$as_me:11761: 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:11753: result: no" >&5
+echo "$as_me:11768: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11765,7 +11780,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11773,7 +11788,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11791: 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
@@ -11783,7 +11798,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11786 "configure"
+#line 11801 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11795,23 +11810,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11801: \$? = $ac_status" >&5
+  echo "$as_me:11816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11807: \$? = $ac_status" >&5
+  echo "$as_me:11822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11809: result: yes" >&5
+  echo "$as_me:11824: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11814: result: no" >&5
+echo "$as_me:11829: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11831,7 +11846,7 @@ fi
 
 	;;
 (*)
-	{ { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11870,10 +11885,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11873: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11888: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11876: \$? = $ac_status" >&5
+  echo "$as_me:11891: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11891,17 +11906,17 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11894: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11909: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11897: checking if KEY_RESIZE is supported" >&5
+echo "$as_me:11912: checking if KEY_RESIZE is supported" >&5
 echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
 if test "${cf_cv_curses_resizes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11904 "configure"
+#line 11919 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11913,16 +11928,16 @@ int key = KEY_RESIZE; (void)key
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11919: \$? = $ac_status" >&5
+  echo "$as_me:11934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11925: \$? = $ac_status" >&5
+  echo "$as_me:11940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_resizes=yes
 else
@@ -11932,12 +11947,12 @@ cf_cv_curses_resizes=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:11935: result: $cf_cv_curses_resizes" >&5
+echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
 echo "${ECHO_T}$cf_cv_curses_resizes" >&6
 cf_cv_enable_sigwinch=0
 test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
 
-echo "$as_me:11940: checking if you want to have a library-prefix" >&5
+echo "$as_me:11955: 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.
@@ -11947,7 +11962,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11950: result: $with_lib_prefix" >&5
+echo "$as_me:11965: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -11985,7 +12000,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:11988: checking for default loader flags" >&5
+echo "$as_me:12003: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -11993,13 +12008,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:11996: result: $LD_MODEL" >&5
+echo "$as_me:12011: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:12002: checking for an rpath option" >&5
+	echo "$as_me:12017: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -12030,12 +12045,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:12038: checking if we need a space after rpath option" >&5
+		echo "$as_me:12053: 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"
 
@@ -12056,7 +12071,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12059 "configure"
+#line 12074 "configure"
 #include "confdefs.h"
 
 int
@@ -12068,16 +12083,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12074: \$? = $ac_status" >&5
+  echo "$as_me:12089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12080: \$? = $ac_status" >&5
+  echo "$as_me:12095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -12087,7 +12102,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:12090: result: $cf_rpath_space" >&5
+		echo "$as_me:12105: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -12109,7 +12124,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:12112: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:12127: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -12124,9 +12139,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:12127: result: $withval" >&5
+		echo "$as_me:12142: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:12129: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:12144: 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; }; }
 		;;
@@ -12135,7 +12150,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -12158,14 +12173,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:12161: checking which $CC option to use" >&5
+		echo "$as_me:12176: 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 12168 "configure"
+#line 12183 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12177,16 +12192,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12183: \$? = $ac_status" >&5
+  echo "$as_me:12198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12189: \$? = $ac_status" >&5
+  echo "$as_me:12204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12195,7 +12210,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -12266,7 +12281,7 @@ CF_EOF
 		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:12269: checking if ld -search_paths_first works" >&5
+		echo "$as_me:12284: 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
@@ -12275,7 +12290,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12278 "configure"
+#line 12293 "configure"
 #include "confdefs.h"
 
 int
@@ -12287,16 +12302,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -12307,7 +12322,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:12310: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:12325: 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"
@@ -12657,7 +12672,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12660 "configure"
+#line 12675 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12669,16 +12684,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12675: \$? = $ac_status" >&5
+  echo "$as_me:12690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12681: \$? = $ac_status" >&5
+  echo "$as_me:12696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12715,7 +12730,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12725,7 +12740,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12728 "${as_me:-configure}"
+#line 12743 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12737,18 +12752,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12740: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12755: 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:12742: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12745: \$? = $ac_status" >&5
+  echo "$as_me:12760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12747: result: yes" >&5
+				echo "$as_me:12762: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12751: result: no" >&5
+				echo "$as_me:12766: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12763,17 +12778,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12766: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12781: 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}:12770: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12785: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12776: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12791: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12783,7 +12798,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12786: result: $with_rpath_link" >&5
+	echo "$as_me:12801: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12796,7 +12811,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12799: checking if you want broken-linker support code" >&5
+echo "$as_me:12814: 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.
@@ -12806,7 +12821,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12809: result: $with_broken_linker" >&5
+echo "$as_me:12824: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12821,14 +12836,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12824: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12839: 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 12831 "configure"
+#line 12846 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12847,16 +12862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12853: \$? = $ac_status" >&5
+  echo "$as_me:12868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12859: \$? = $ac_status" >&5
+  echo "$as_me:12874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12867,7 +12882,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12909,14 +12924,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12912: checking if this is the GNU C library" >&5
+echo "$as_me:12927: 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 12919 "configure"
+#line 12934 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12935,16 +12950,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12941: \$? = $ac_status" >&5
+  echo "$as_me:12956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12947: \$? = $ac_status" >&5
+  echo "$as_me:12962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12955,7 +12970,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12963,7 +12978,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12966: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:12981: 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
@@ -12975,7 +12990,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12978 "configure"
+#line 12993 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12994,16 +13009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13000: \$? = $ac_status" >&5
+  echo "$as_me:13015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13006: \$? = $ac_status" >&5
+  echo "$as_me:13021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -13015,12 +13030,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:13018: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:13033: 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:13023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:13038: 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
@@ -13125,7 +13140,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13128 "configure"
+#line 13143 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13145,16 +13160,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13151: \$? = $ac_status" >&5
+  echo "$as_me:13166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13157: \$? = $ac_status" >&5
+  echo "$as_me:13172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -13165,7 +13180,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13168: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:13183: 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
@@ -13174,14 +13189,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:13177: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:13192: 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 13184 "configure"
+#line 13199 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13196,16 +13211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13202: \$? = $ac_status" >&5
+  echo "$as_me:13217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13208: \$? = $ac_status" >&5
+  echo "$as_me:13223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13312,7 +13327,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13315 "configure"
+#line 13330 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13327,16 +13342,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13333: \$? = $ac_status" >&5
+  echo "$as_me:13348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13339: \$? = $ac_status" >&5
+  echo "$as_me:13354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13351,12 +13366,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13354: result: $cf_cv_gnu_source" >&5
+echo "$as_me:13369: 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:13359: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:13374: 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
@@ -13366,7 +13381,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13369 "configure"
+#line 13384 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13381,16 +13396,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13387: \$? = $ac_status" >&5
+  echo "$as_me:13402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13393: \$? = $ac_status" >&5
+  echo "$as_me:13408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13401,7 +13416,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13404: result: $cf_cv_default_source" >&5
+echo "$as_me:13419: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13438,16 +13453,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13441: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13456: 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}:13447: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13462: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13450 "configure"
+#line 13465 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13462,16 +13477,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13468: \$? = $ac_status" >&5
+  echo "$as_me:13483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13474: \$? = $ac_status" >&5
+  echo "$as_me:13489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13492,7 +13507,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13495 "configure"
+#line 13510 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13507,16 +13522,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13513: \$? = $ac_status" >&5
+  echo "$as_me:13528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13519: \$? = $ac_status" >&5
+  echo "$as_me:13534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13527,7 +13542,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13535,10 +13550,10 @@ echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13541 "configure"
+#line 13556 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13553,16 +13568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13559: \$? = $ac_status" >&5
+  echo "$as_me:13574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13565: \$? = $ac_status" >&5
+  echo "$as_me:13580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13578,7 +13593,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13581: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13596: 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
@@ -13695,7 +13710,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13698: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13713: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13727,14 +13742,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13730: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13745: 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 13737 "configure"
+#line 13752 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13752,16 +13767,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13758: \$? = $ac_status" >&5
+  echo "$as_me:13773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13764: \$? = $ac_status" >&5
+  echo "$as_me:13779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13773,7 +13788,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13776 "configure"
+#line 13791 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13791,16 +13806,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13797: \$? = $ac_status" >&5
+  echo "$as_me:13812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13803: \$? = $ac_status" >&5
+  echo "$as_me:13818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13815,7 +13830,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13975,16 +13990,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13978: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13993: 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}:13984: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13999: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13987 "configure"
+#line 14002 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13999,16 +14014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14005: \$? = $ac_status" >&5
+  echo "$as_me:14020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14011: \$? = $ac_status" >&5
+  echo "$as_me:14026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -14029,7 +14044,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14032 "configure"
+#line 14047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14044,16 +14059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14050: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14056: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14064,7 +14079,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14072,10 +14087,10 @@ echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14078 "configure"
+#line 14093 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14090,16 +14105,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14096: \$? = $ac_status" >&5
+  echo "$as_me:14111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14102: \$? = $ac_status" >&5
+  echo "$as_me:14117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14115,7 +14130,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14118: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14133: 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
@@ -14228,10 +14243,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14234 "configure"
+#line 14249 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14249,23 +14264,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14255: \$? = $ac_status" >&5
+  echo "$as_me:14270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14261: \$? = $ac_status" >&5
+  echo "$as_me:14276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14268: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14283: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14288,7 +14303,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14300,7 +14315,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14388,7 +14403,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14398,7 +14413,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14408,7 +14423,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14411: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14426: 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"
@@ -14420,10 +14435,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14423: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14438: 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 14426 "configure"
+#line 14441 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14438,16 +14453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14444: \$? = $ac_status" >&5
+  echo "$as_me:14459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14450: \$? = $ac_status" >&5
+  echo "$as_me:14465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14456,12 +14471,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14459: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14474: 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 14464 "configure"
+#line 14479 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14476,16 +14491,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14482: \$? = $ac_status" >&5
+  echo "$as_me:14497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14488: \$? = $ac_status" >&5
+  echo "$as_me:14503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14496,19 +14511,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14504: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14519: 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 14511 "configure"
+#line 14526 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14526,16 +14541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14532: \$? = $ac_status" >&5
+  echo "$as_me:14547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14538: \$? = $ac_status" >&5
+  echo "$as_me:14553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14547,7 +14562,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14550 "configure"
+#line 14565 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14565,16 +14580,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14571: \$? = $ac_status" >&5
+  echo "$as_me:14586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14577: \$? = $ac_status" >&5
+  echo "$as_me:14592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14589,7 +14604,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14736,13 +14751,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14739: checking for ANSI C header files" >&5
+echo "$as_me:14754: 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 14745 "configure"
+#line 14760 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14750,13 +14765,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14753: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14768: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14759: \$? = $ac_status" >&5
+  echo "$as_me:14774: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14778,7 +14793,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14781 "configure"
+#line 14796 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14796,7 +14811,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14799 "configure"
+#line 14814 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14817,7 +14832,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14820 "configure"
+#line 14835 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14843,15 +14858,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14849: \$? = $ac_status" >&5
+  echo "$as_me:14864: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14854: \$? = $ac_status" >&5
+  echo "$as_me:14869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14864,7 +14879,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14880,28 +14895,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14883: checking for $ac_header" >&5
+echo "$as_me:14898: 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 14889 "configure"
+#line 14904 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14898: \$? = $ac_status" >&5
+  echo "$as_me:14913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14904: \$? = $ac_status" >&5
+  echo "$as_me:14919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14911,7 +14926,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14929: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14921,13 +14936,13 @@ EOF
 fi
 done
 
-echo "$as_me:14924: checking whether exit is declared" >&5
+echo "$as_me:14939: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14930 "configure"
+#line 14945 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14942,16 +14957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14948: \$? = $ac_status" >&5
+  echo "$as_me:14963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14954: \$? = $ac_status" >&5
+  echo "$as_me:14969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14961,7 +14976,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14964: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14971,7 +14986,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14974: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14989: 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
@@ -14983,7 +14998,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14986 "configure"
+#line 15001 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15003,16 +15018,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15009: \$? = $ac_status" >&5
+  echo "$as_me:15024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15015: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15022,16 +15037,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15028: \$? = $ac_status" >&5
+  echo "$as_me:15043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15034: \$? = $ac_status" >&5
+  echo "$as_me:15049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15045,13 +15060,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:15048: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15063: 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:15054: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15069: 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
@@ -15059,7 +15074,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15062 "configure"
+#line 15077 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15079,16 +15094,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15085: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15091: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15097,7 +15112,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15100 "configure"
+#line 15115 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15118,16 +15133,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15124: \$? = $ac_status" >&5
+  echo "$as_me:15139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15130: \$? = $ac_status" >&5
+  echo "$as_me:15145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15138,7 +15153,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15141: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15156: 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
 
@@ -15148,7 +15163,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15151: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15166: 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
@@ -15156,7 +15171,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15159 "configure"
+#line 15174 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15176,16 +15191,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15182: \$? = $ac_status" >&5
+  echo "$as_me:15197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15188: \$? = $ac_status" >&5
+  echo "$as_me:15203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15194,7 +15209,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15197 "configure"
+#line 15212 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15215,16 +15230,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15221: \$? = $ac_status" >&5
+  echo "$as_me:15236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15227: \$? = $ac_status" >&5
+  echo "$as_me:15242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15235,7 +15250,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15238: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15253: 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
 
@@ -15248,7 +15263,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15251: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15266: 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
@@ -15256,7 +15271,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15259 "configure"
+#line 15274 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15271,16 +15286,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15277: \$? = $ac_status" >&5
+  echo "$as_me:15292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15283: \$? = $ac_status" >&5
+  echo "$as_me:15298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15289,7 +15304,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15292 "configure"
+#line 15307 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15305,16 +15320,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15311: \$? = $ac_status" >&5
+  echo "$as_me:15326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15317: \$? = $ac_status" >&5
+  echo "$as_me:15332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15325,7 +15340,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15328: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15343: 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
 
@@ -15339,13 +15354,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15342: checking for fseeko" >&5
+echo "$as_me:15357: 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 15348 "configure"
+#line 15363 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15359,16 +15374,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15365: \$? = $ac_status" >&5
+  echo "$as_me:15380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15371: \$? = $ac_status" >&5
+  echo "$as_me:15386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15378,7 +15393,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15417,14 +15432,14 @@ fi
 
 	fi
 
-	echo "$as_me:15420: checking whether to use struct dirent64" >&5
+	echo "$as_me:15435: 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 15427 "configure"
+#line 15442 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15451,16 +15466,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15457: \$? = $ac_status" >&5
+  echo "$as_me:15472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15463: \$? = $ac_status" >&5
+  echo "$as_me:15478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15471,7 +15486,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15481,7 +15496,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15484: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15499: 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.
@@ -15491,7 +15506,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15494: result: $with_rcs_ids" >&5
+echo "$as_me:15509: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15501,7 +15516,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15504: checking if you want to build with function extensions" >&5
+echo "$as_me:15519: 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.
@@ -15511,7 +15526,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15514: result: $with_ext_funcs" >&5
+echo "$as_me:15529: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15529,7 +15544,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15532: checking for extended use of const keyword" >&5
+echo "$as_me:15547: 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.
@@ -15539,7 +15554,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15542: result: $with_ext_const" >&5
+echo "$as_me:15557: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15549,7 +15564,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15552: checking if you want all development code" >&5
+echo "$as_me:15567: 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.
@@ -15559,7 +15574,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15562: result: $with_develop" >&5
+echo "$as_me:15577: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15568,7 +15583,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15571: checking if you want to link with the pthread library" >&5
+echo "$as_me:15586: 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.
@@ -15578,27 +15593,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15581: result: $with_pthread" >&5
+echo "$as_me:15596: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15585: checking for pthread.h" >&5
+	echo "$as_me:15600: 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 15591 "configure"
+#line 15606 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15601: \$? = $ac_status" >&5
+  echo "$as_me:15616: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15617,7 +15632,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15620: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15635: 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
 
@@ -15627,7 +15642,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15630: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15645: 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"
 
@@ -15648,7 +15663,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15651 "configure"
+#line 15666 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15665,16 +15680,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15671: \$? = $ac_status" >&5
+  echo "$as_me:15686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15677: \$? = $ac_status" >&5
+  echo "$as_me:15692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15684,7 +15699,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15687: result: $with_pthread" >&5
+	    echo "$as_me:15702: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15712,7 +15727,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15721,7 +15736,7 @@ fi
 
 fi
 
-echo "$as_me:15724: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15739: 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.
@@ -15731,18 +15746,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15734: result: $use_weak_symbols" >&5
+echo "$as_me:15749: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15738: checking if $CC supports weak symbols" >&5
+echo "$as_me:15753: 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 15745 "configure"
+#line 15760 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15768,16 +15783,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15774: \$? = $ac_status" >&5
+  echo "$as_me:15789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15780: \$? = $ac_status" >&5
+  echo "$as_me:15795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15788,7 +15803,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15817,13 +15832,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15820: checking for _nc_TABSIZE" >&5
+echo "$as_me:15835: 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 15826 "configure"
+#line 15841 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15854,16 +15869,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15860: \$? = $ac_status" >&5
+  echo "$as_me:15875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15866: \$? = $ac_status" >&5
+  echo "$as_me:15881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15873,7 +15888,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15876: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15891: 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
@@ -15885,7 +15900,7 @@ fi
 # 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:15888: checking if you want experimental reentrant code" >&5
+echo "$as_me:15903: 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.
@@ -15895,7 +15910,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15898: result: $with_reentrant" >&5
+echo "$as_me:15913: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15918,7 +15933,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15921: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15936: 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.
@@ -15928,7 +15943,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15942,7 +15957,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15945: checking if you want to see long compiling messages" >&5
+echo "$as_me:15960: 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.
@@ -15976,10 +15991,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15979: result: $enableval" >&5
+echo "$as_me:15994: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15982: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:15997: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -15996,17 +16011,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:15999: result: $enable_stdnoreturn" >&5
+echo "$as_me:16014: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:16003: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16018: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16009 "configure"
+#line 16024 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16022,16 +16037,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16028: \$? = $ac_status" >&5
+  echo "$as_me:16043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16034: \$? = $ac_status" >&5
+  echo "$as_me:16049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -16042,7 +16057,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16098,16 +16113,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16146,16 +16161,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16194,23 +16209,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16213: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16228: 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.
@@ -16227,7 +16242,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16230: result: $enable_warnings" >&5
+echo "$as_me:16245: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16251,7 +16266,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16254 "configure"
+#line 16269 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16266,26 +16281,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16272: \$? = $ac_status" >&5
+  echo "$as_me:16287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16278: \$? = $ac_status" >&5
+  echo "$as_me:16293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16281: checking for X11/Xt const-feature" >&5
+echo "$as_me:16296: 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 16288 "configure"
+#line 16303 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16303,16 +16318,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16309: \$? = $ac_status" >&5
+  echo "$as_me:16324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16315: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16327,7 +16342,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16356,7 +16371,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16359 "${as_me:-configure}"
+#line 16374 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16372,7 +16387,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16375: checking for $CC warning options..." >&5
+	{ echo "$as_me:16390: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16388,12 +16403,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16394: \$? = $ac_status" >&5
+  echo "$as_me:16409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16401,7 +16416,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16404: checking for $CC warning options..." >&5
+	{ echo "$as_me:16419: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16424,12 +16439,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16427: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16430: \$? = $ac_status" >&5
+  echo "$as_me:16445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16437,7 +16452,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16447,7 +16462,7 @@ echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16480,10 +16495,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16486 "${as_me:-configure}"
+#line 16501 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16533,12 +16548,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16539: \$? = $ac_status" >&5
+  echo "$as_me:16554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16606,7 +16621,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16609: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16624: 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.
@@ -16616,7 +16631,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16619: result: $with_assertions" >&5
+echo "$as_me:16634: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16669,7 +16684,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16672: checking whether to add trace feature to all models" >&5
+echo "$as_me:16687: 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.
@@ -16679,7 +16694,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16682: result: $cf_with_trace" >&5
+echo "$as_me:16697: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16693,7 +16708,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16696: checking if we want to use GNAT projects" >&5
+echo "$as_me:16711: 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.
@@ -16710,21 +16725,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16713: result: $enable_gnat_projects" >&5
+echo "$as_me:16728: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16720: checking if ssp library is needed" >&5
+echo "$as_me:16735: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16727 "configure"
+#line 16742 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16741,16 +16756,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16747: \$? = $ac_status" >&5
+  echo "$as_me:16762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16753: \$? = $ac_status" >&5
+  echo "$as_me:16768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16760,7 +16775,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16763 "configure"
+#line 16778 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16777,16 +16792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16783: \$? = $ac_status" >&5
+  echo "$as_me:16798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16789: \$? = $ac_status" >&5
+  echo "$as_me:16804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16800,7 +16815,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16828,13 +16843,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16831: checking for clock_gettime" >&5
+echo "$as_me:16846: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16837 "configure"
+#line 16852 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16865,16 +16880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16871: \$? = $ac_status" >&5
+  echo "$as_me:16886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16877: \$? = $ac_status" >&5
+  echo "$as_me:16892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16884,12 +16899,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16887: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16902: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16892: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16907: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16897,7 +16912,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16900 "configure"
+#line 16915 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16916,16 +16931,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16922: \$? = $ac_status" >&5
+  echo "$as_me:16937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16928: \$? = $ac_status" >&5
+  echo "$as_me:16943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16936,7 +16951,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16939: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16954: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16948,14 +16963,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16951: checking if clock_gettime links" >&5
+echo "$as_me:16966: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16958 "configure"
+#line 16973 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16973,16 +16988,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16979: \$? = $ac_status" >&5
+  echo "$as_me:16994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16985: \$? = $ac_status" >&5
+  echo "$as_me:17000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -16993,7 +17008,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17007,13 +17022,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17010: checking for gettimeofday" >&5
+echo "$as_me:17025: 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 17016 "configure"
+#line 17031 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17044,16 +17059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17056: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17063,7 +17078,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17073,7 +17088,7 @@ EOF
 
 else
 
-echo "$as_me:17076: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17091: 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
@@ -17081,7 +17096,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17084 "configure"
+#line 17099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17100,16 +17115,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17106: \$? = $ac_status" >&5
+  echo "$as_me:17121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17112: \$? = $ac_status" >&5
+  echo "$as_me:17127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17120,7 +17135,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17123: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17138: 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
 
@@ -17153,13 +17168,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17156: checking for signed char" >&5
+echo "$as_me:17171: 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 17162 "configure"
+#line 17177 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17174,16 +17189,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17180: \$? = $ac_status" >&5
+  echo "$as_me:17195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17186: \$? = $ac_status" >&5
+  echo "$as_me:17201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17193,10 +17208,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17199: checking size of signed char" >&5
+echo "$as_me:17214: 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
@@ -17205,7 +17220,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17208 "configure"
+#line 17223 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17217,21 +17232,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17223: \$? = $ac_status" >&5
+  echo "$as_me:17238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17229: \$? = $ac_status" >&5
+  echo "$as_me:17244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17234 "configure"
+#line 17249 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17243,16 +17258,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17249: \$? = $ac_status" >&5
+  echo "$as_me:17264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17255: \$? = $ac_status" >&5
+  echo "$as_me:17270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17268,7 +17283,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17271 "configure"
+#line 17286 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17280,16 +17295,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17286: \$? = $ac_status" >&5
+  echo "$as_me:17301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17292: \$? = $ac_status" >&5
+  echo "$as_me:17307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17305,7 +17320,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17308 "configure"
+#line 17323 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17317,16 +17332,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17323: \$? = $ac_status" >&5
+  echo "$as_me:17338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17329: \$? = $ac_status" >&5
+  echo "$as_me:17344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17339,12 +17354,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17357: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17347 "configure"
+#line 17362 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17360,15 +17375,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17366: \$? = $ac_status" >&5
+  echo "$as_me:17381: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17371: \$? = $ac_status" >&5
+  echo "$as_me:17386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17384,7 +17399,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17387: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17402: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17393,13 +17408,13 @@ EOF
 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:17396: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17411: 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 17402 "configure"
+#line 17417 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17414,16 +17429,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17420: \$? = $ac_status" >&5
+  echo "$as_me:17435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17426: \$? = $ac_status" >&5
+  echo "$as_me:17441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17433,7 +17448,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17451: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17446,7 +17461,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17449: checking for opendir in -ldir" >&5
+  echo "$as_me:17464: 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
@@ -17454,7 +17469,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17457 "configure"
+#line 17472 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17473,16 +17488,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17479: \$? = $ac_status" >&5
+  echo "$as_me:17494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17485: \$? = $ac_status" >&5
+  echo "$as_me:17500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17493,14 +17508,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17496: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17511: 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:17503: checking for opendir in -lx" >&5
+  echo "$as_me:17518: 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
@@ -17508,7 +17523,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17511 "configure"
+#line 17526 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17527,16 +17542,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17533: \$? = $ac_status" >&5
+  echo "$as_me:17548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17539: \$? = $ac_status" >&5
+  echo "$as_me:17554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17547,7 +17562,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17550: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17565: 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"
@@ -17555,13 +17570,13 @@ fi
 
 fi
 
-echo "$as_me:17558: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17573: 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 17564 "configure"
+#line 17579 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17577,16 +17592,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17583: \$? = $ac_status" >&5
+  echo "$as_me:17598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17589: \$? = $ac_status" >&5
+  echo "$as_me:17604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17596,7 +17611,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17599: result: $ac_cv_header_time" >&5
+echo "$as_me:17614: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17614,13 +17629,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17617: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17632: 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 17623 "configure"
+#line 17638 "configure"
 #include "confdefs.h"
 
 int
@@ -17682,16 +17697,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17688: \$? = $ac_status" >&5
+  echo "$as_me:17703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17694: \$? = $ac_status" >&5
+  echo "$as_me:17709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17701,7 +17716,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17704: result: $ac_cv_c_const" >&5
+echo "$as_me:17719: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17713,7 +17728,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17716: checking if data-only library module links" >&5
+echo "$as_me:17731: 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
@@ -17721,20 +17736,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17724 "configure"
+#line 17739 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17730: \$? = $ac_status" >&5
+  echo "$as_me:17745: \$? = $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 <<EOF
-#line 17737 "configure"
+#line 17752 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17751,10 +17766,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17754: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17757: \$? = $ac_status" >&5
+  echo "$as_me:17772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17767,7 +17782,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17770 "configure"
+#line 17785 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17778,15 +17793,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17784: \$? = $ac_status" >&5
+  echo "$as_me:17799: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17789: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17801,7 +17816,7 @@ fi
 
 fi
 
-echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17820,23 +17835,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17823: checking for $ac_header" >&5
+echo "$as_me:17838: 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 17829 "configure"
+#line 17844 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17848: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17839: \$? = $ac_status" >&5
+  echo "$as_me:17854: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17855,7 +17870,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17858: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17873: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17865,7 +17880,7 @@ EOF
 fi
 done
 
-echo "$as_me:17868: checking for working mkstemp" >&5
+echo "$as_me:17883: 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
@@ -17876,7 +17891,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17879 "configure"
+#line 17894 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17911,15 +17926,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17917: \$? = $ac_status" >&5
+  echo "$as_me:17932: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17922: \$? = $ac_status" >&5
+  echo "$as_me:17937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17934,16 +17949,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17937: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17952: 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:17940: checking for mkstemp" >&5
+	echo "$as_me:17955: 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 17946 "configure"
+#line 17961 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17974,16 +17989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17980: \$? = $ac_status" >&5
+  echo "$as_me:17995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17986: \$? = $ac_status" >&5
+  echo "$as_me:18001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -17993,7 +18008,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18014,7 +18029,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18031,10 +18046,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18034: result: $ADAFLAGS" >&5
+	echo "$as_me:18049: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18037: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18052: 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
@@ -18044,11 +18059,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18047: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18062: 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:18051: checking if GNAT supports generics" >&5
+echo "$as_me:18066: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18058,7 +18073,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18061: result: $cf_gnat_generics" >&5
+echo "$as_me:18076: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18070,7 +18085,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18073: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18088: 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
@@ -18118,7 +18133,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18131,7 +18146,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18134: checking if GNAT supports project files" >&5
+echo "$as_me:18149: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18194,15 +18209,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18197: result: $cf_gnat_projects" >&5
+echo "$as_me:18212: 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:18203: checking if GNAT supports libraries" >&5
+	echo "$as_me:18218: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18205: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18220: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18222,7 +18237,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18225: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18240: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18234,7 +18249,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18237: checking for Ada95 compiler" >&5
+echo "$as_me:18252: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18245,12 +18260,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18248: result: $cf_ada_compiler" >&5
+echo "$as_me:18263: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18253: checking for Ada95 include directory" >&5
+echo "$as_me:18268: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18267,26 +18282,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18295,10 +18308,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18298: result: $ADA_INCLUDE" >&5
+echo "$as_me:18311: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18301: checking for Ada95 object directory" >&5
+echo "$as_me:18314: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18315,26 +18328,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18343,10 +18354,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18346: result: $ADA_OBJECTS" >&5
+echo "$as_me:18357: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18349: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18360: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18367,11 +18378,11 @@ then
 	fi
 fi
 
-echo "$as_me:18370: result: $with_ada_sharedlib" >&5
+echo "$as_me:18381: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18374: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18385: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18389,7 +18400,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18392: checking for Ada95 curses library name" >&5
+echo "$as_me:18403: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18405,16 +18416,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18408: result: $ADA_LIBNAME" >&5
+echo "$as_me:18419: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18412: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18423: 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:18417: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18428: 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
@@ -18454,7 +18465,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18457: checking default library suffix" >&5
+echo "$as_me:18468: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18465,10 +18476,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18471: checking default library-dependency suffix" >&5
+echo "$as_me:18482: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18551,10 +18562,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18554: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18565: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18557: checking default object directory" >&5
+echo "$as_me:18568: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18570,7 +18581,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18712,7 +18723,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18893,7 +18904,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18896: error: ambiguous option: $1
+    { { echo "$as_me:18907: 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;}
@@ -18912,7 +18923,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18915: error: unrecognized option: $1
+  -*) { { echo "$as_me:18926: 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;}
@@ -18987,7 +18998,7 @@ do
   "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:18990: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19001: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19109,6 +19120,8 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@LN_S@,$LN_S,;t t
+s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
+s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
 s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
 s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
@@ -19351,7 +19364,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19354: creating $ac_file" >&5
+    { echo "$as_me:19367: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19369,7 +19382,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19382,7 +19395,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19398: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19398,7 +19411,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19401: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19414: 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;}
@@ -19407,7 +19420,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19410: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19423: 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;}
@@ -19452,7 +19465,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19455: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19468: 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;}
@@ -19463,7 +19476,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19466: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19479: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19512,7 +19525,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19523,7 +19536,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19536,7 +19549,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19552: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19594,7 +19607,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19597: $ac_file is unchanged" >&5
+      { echo "$as_me:19610: $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/NEWS b/NEWS
index 8494cd665..db3ed1c16 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4155 2024/07/27 20:13:00 tom Exp $
+-- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240810
+	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
+	  and used only in the makefile.
+	+ modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using
+	  DOS/Windows pathname syntax (report by Eli Zaretskii).
+	+ improve glob-expressions in configure script
+	+ remove unused Get_Menu_Screen() macro from menu.priv.h
+	+ update config.guess, config.sub
+
 20240727
 	+ improve formatting/style of manpages (patches by Branden Robinson).
 	+ fixes for compiler warnings/cppcheck.
diff --git a/VERSION b/VERSION
index 49944e193..d40c622eb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240727
+5:0:10	6.5	20240810
diff --git a/aclocal.m4 b/aclocal.m4
index 18702c0f3..b68af6bec 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3213,13 +3213,14 @@ rm -rf ./conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
+dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
 AC_DEFUN([CF_GETOPT_HEADER],
-[
-AC_HAVE_HEADERS(unistd.h getopt.h)
+[AC_REQUIRE([AC_HEADER_STDC])
+
+AC_CHECK_HEADERS(getopt.h)
 AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
@@ -3239,7 +3240,7 @@ if test "$cf_cv_getopt_header" = getopt.h ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17
+dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
 dnl ----------------
 dnl Use this in case-statements to check for pathname syntax, i.e., absolute
 dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
@@ -3247,16 +3248,16 @@ AC_DEFUN([CF_GLOB_FULLPATH],[
 AC_REQUIRE([CF_WITH_SYSTYPE])dnl
 case "$cf_cv_system_name" in
 (cygwin*|msys*|mingw32*|mingw64|os2*)
-	GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*'
-	GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ '
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
 	;;
 (*)
-	GLOB_FULLPATH_ONLY='x/*'
-	GLOB_FULLPATH_ARGS='x/*\ '
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
 	;;
 esac
-AC_SUBST(GLOB_FULLPATH_ONLY)
-AC_SUBST(GLOB_FULLPATH_ARGS)
+AC_SUBST(GLOB_FULLPATH_POSIX)
+AC_SUBST(GLOB_FULLPATH_OTHER)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
@@ -4646,7 +4647,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
 	AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30
+dnl CF_LIB_RULES version: 101 updated: 2024/08/03 13:08:58
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -4664,6 +4665,7 @@ dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable.
 AC_DEFUN([CF_LIB_RULES],
 [AC_REQUIRE([AC_PROG_FGREP])dnl
 AC_REQUIRE([CF_MAKE_PHONY])dnl
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
 
 cf_prefix=$LIB_PREFIX
 AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
@@ -5189,7 +5191,7 @@ CF_EOF
 if test "$WITH_CURSES_H" = yes; then
 	cat >>headers.sh <<CF_EOF
 case \$DST in
-(/*/include/*)
+($GLOB_FULLPATH_POSIX/include/*)
 	END=\`basename \$DST\`
 	for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
 	do
@@ -5206,7 +5208,7 @@ CF_EOF
 else
 	cat >>headers.sh <<CF_EOF
 case \$DST in
-(/*/include/*)
+($GLOB_FULLPATH_POSIX/include/*)
 	END=\`basename \$DST\`
 	for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
 	do
@@ -6677,35 +6679,35 @@ if test -n "$cf_path_prog" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
+dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
 if test "x$prefix" != xNONE; then
 	cf_path_syntax="$prefix"
 else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".[$]$1" in
-(.\[$]\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x[$]$1" in
+(x\[$]\(*\)*|x\'*\'*)
 	;;
-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
+(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
 	eval $1="[$]$1"
-	case ".[$]$1" in
-	(.NONE/*)
+	case "x[$]$1" in
+	(xNONE/*)
 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -7094,15 +7096,16 @@ AC_SUBST(cf_ada_config_Ada)
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
+dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl using the fallback mkinstalldirs script
 AC_DEFUN([CF_PROG_INSTALL],
 [AC_PROG_INSTALL
-case $INSTALL in
-(/*)
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	CF_DIRNAME(cf_dir,$INSTALL)
@@ -8706,12 +8709,12 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
+dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
-AC_HAVE_HEADERS(wchar.h)
+AC_CHECK_HEADERS(wchar.h)
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
 	cf_save_LIBS="$LIBS"
 	AC_TRY_LINK([
@@ -9658,7 +9661,7 @@ if test "x$with_pcre2" != xno ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 dnl
@@ -9672,6 +9675,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config)
 dnl optionally ignores $PKG_CONFIG_LIBDIR.  Very old versions of pkg-config,
 dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
 
 case "$PKG_CONFIG" in
 (no|none|yes)
@@ -9705,10 +9709,10 @@ case "x$cf_search_path" in
 	;;
 (x)
 	;;
-(x/*\ *)
+(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
 	PKG_CONFIG_LIBDIR=
 	;;
-(x/*)
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
 	cf_search_path=
@@ -9727,7 +9731,15 @@ case "x$cf_search_path" in
 			pkg-config \
 			pkgconf
 		do
-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
+			case "$cf_raw_search_path" in
+			(*\\*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
+				;;
+			(*/*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
+				;;
+			esac
 			test -n "$cf_search_path" && break
 		done
 
@@ -9947,7 +9959,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04
+dnl CF_WITH_VERSIONED_SYMS version: 14 updated: 2024/08/03 12:34:02
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -9957,6 +9969,7 @@ dnl $1 = basename of the ".map" file (default $PACKAGE)
 AC_DEFUN([CF_WITH_VERSIONED_SYMS],
 [AC_REQUIRE([AC_PROG_FGREP])dnl
 AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
 
 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
@@ -9970,7 +9983,7 @@ case "x$with_versioned_syms" in
 	;;
 (xno)
 	;;
-(x/*)
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms)
 	;;
 (*)
diff --git a/config.guess b/config.guess
index f47d666d3..48a684601 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-10-19'
+timestamp='2024-07-27'
 
 # 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
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
@@ -123,7 +123,7 @@ set_cc_for_build() {
     dummy=$tmp/dummy
     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
 	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
+	       for driver in cc gcc c17 c99 c89 ; do
 		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 		       CC_FOR_BUILD=$driver
 		       break
@@ -634,7 +634,8 @@ EOF
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
-		main()
+		int
+		main ()
 			{
 			if (!__power_pc())
 				exit(1);
@@ -718,7 +719,8 @@ EOF
 		#include <stdlib.h>
 		#include <unistd.h>
 
-		int main ()
+		int
+		main ()
 		{
 		#if defined(_SC_KERNEL_BITS)
 		    long bits = sysconf(_SC_KERNEL_BITS);
@@ -1621,6 +1623,7 @@ cat > "$dummy.c" <<EOF
 #endif
 #endif
 #endif
+int
 main ()
 {
 #if defined (sony)
diff --git a/config.sub b/config.sub
index e4c4e09b6..4aaae46f6 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
+# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
 
-timestamp='2023-12-02'
+timestamp='2024-05-27'
 
 # 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
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
@@ -120,7 +120,6 @@ case $# in
 esac
 
 # Split fields of configuration type
-# shellcheck disable=SC2162
 saved_IFS=$IFS
 IFS="-" read field1 field2 field3 field4 <<EOF
 $1
@@ -142,10 +141,20 @@ case $1 in
 		# parts
 		maybe_os=$field2-$field3
 		case $maybe_os in
-			nto-qnx* | linux-* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			  cloudabi*-eabi* \
+			| kfreebsd*-gnu* \
+			| knetbsd*-gnu* \
+			| kopensolaris*-gnu* \
+			| linux-* \
+			| managarm-* \
+			| netbsd*-eabi* \
+			| netbsd*-gnu* \
+			| nto-qnx* \
+			| os2-emx* \
+			| rtmk-nova* \
+			| storm-chaos* \
+			| uclinux-gnu* \
+			| uclinux-uclibc* \
 			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
@@ -161,8 +170,12 @@ case $1 in
 		esac
 		;;
 	*-*)
-		# A lone config we happen to match not fitting any pattern
 		case $field1-$field2 in
+			# Shorthands that happen to contain a single dash
+			convex-c[12] | convex-c3[248])
+				basic_machine=$field2-convex
+				basic_os=
+				;;
 			decstation-3100)
 				basic_machine=mips-dec
 				basic_os=
@@ -170,28 +183,88 @@ case $1 in
 			*-*)
 				# Second component is usually, but not always the OS
 				case $field2 in
-					# Prevent following clause from handling this valid os
+					# Do not treat sunos as a manufacturer
 					sun*os*)
 						basic_machine=$field1
 						basic_os=$field2
 						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
 					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
+					  3100* \
+					| 32* \
+					| 3300* \
+					| 3600* \
+					| 7300* \
+					| acorn \
+					| altos* \
+					| apollo \
+					| apple \
+					| atari \
+					| att* \
+					| axis \
+					| be \
+					| bull \
+					| cbm \
+					| ccur \
+					| cisco \
+					| commodore \
+					| convergent* \
+					| convex* \
+					| cray \
+					| crds \
+					| dec* \
+					| delta* \
+					| dg \
+					| digital \
+					| dolphin \
+					| encore* \
+					| gould \
+					| harris \
+					| highlevel \
+					| hitachi* \
+					| hp \
+					| ibm* \
+					| intergraph \
+					| isi* \
+					| knuth \
+					| masscomp \
+					| microblaze* \
+					| mips* \
+					| motorola* \
+					| ncr* \
+					| news \
+					| next \
+					| ns \
+					| oki \
+					| omron* \
+					| pc533* \
+					| rebel \
+					| rom68k \
+					| rombug \
+					| semi \
+					| sequent* \
+					| siemens \
+					| sgi* \
+					| siemens \
+					| sim \
+					| sni \
+					| sony* \
+					| stratus \
+					| sun \
+					| sun[234]* \
+					| tektronix \
+					| tti* \
+					| ultra \
+					| unicom* \
+					| wec \
+					| winbond \
+					| wrs)
 						basic_machine=$field1-$field2
 						basic_os=
 						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
 					*)
 						basic_machine=$field1
 						basic_os=$field2
@@ -272,26 +345,6 @@ case $1 in
 				basic_machine=arm-unknown
 				basic_os=cegcc
 				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
 			cray)
 				basic_machine=j90-cray
 				basic_os=unicos
@@ -714,15 +767,26 @@ case $basic_machine in
 		vendor=dec
 		basic_os=tops20
 		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
+	delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300)
 		cpu=m68k
 		vendor=motorola
 		;;
-	dpx2*)
+	# This used to be dpx2*, but that gets the RS6000-based
+	# DPX/20 and the x86-based DPX/2-100 wrong.  See
+	# https://oldskool.silicium.org/stations/bull_dpx20.htm
+	# https://www.feb-patrimoine.com/english/bull_dpx2.htm
+	# https://www.feb-patrimoine.com/english/unix_and_bull.htm
+	dpx2 | dpx2[23]00 | dpx2[23]xx)
 		cpu=m68k
 		vendor=bull
-		basic_os=sysv3
+		;;
+	dpx2100 | dpx21xx)
+		cpu=i386
+		vendor=bull
+		;;
+	dpx20)
+		cpu=rs6000
+		vendor=bull
 		;;
 	encore | umax | mmax)
 		cpu=ns32k
@@ -837,18 +901,6 @@ case $basic_machine in
 	next | m*-next)
 		cpu=m68k
 		vendor=next
-		case $basic_os in
-		    openstep*)
-		        ;;
-		    nextstep*)
-			;;
-		    ns2*)
-		      basic_os=nextstep2
-			;;
-		    *)
-		      basic_os=nextstep3
-			;;
-		esac
 		;;
 	np1)
 		cpu=np1
@@ -937,7 +989,6 @@ case $basic_machine in
 		;;
 
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read cpu vendor <<EOF
 $basic_machine
@@ -972,15 +1023,19 @@ unset -v basic_machine
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
+	# Here we handle the default manufacturer of certain CPU types in canonical form.
+	# It is in some cases the only manufacturer, in others, it is the most popular.
+	c[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)
+		vendor=convex
+		basic_os=${basic_os:-bsd}
+		;;
 	craynv-unknown)
 		vendor=cray
 		basic_os=${basic_os:-unicosmp}
 		;;
 	c90-unknown | c90-cray)
 		vendor=cray
-		basic_os=${Basic_os:-unicos}
+		basic_os=${basic_os:-unicos}
 		;;
 	fx80-unknown)
 		vendor=alliant
@@ -1026,11 +1081,29 @@ case $cpu-$vendor in
 		vendor=alt
 		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
+
+	# Normalized CPU+vendor pairs that imply an OS, if not otherwise specified
+	m68k-isi)
+		basic_os=${basic_os:-sysv}
+		;;
+	m68k-sony)
+		basic_os=${basic_os:-newsos}
+		;;
+	m68k-tektronix)
+		basic_os=${basic_os:-bsd}
+		;;
+	m88k-harris)
+		basic_os=${basic_os:-sysv3}
+		;;
+	i386-bull | m68k-bull)
+		basic_os=${basic_os:-sysv3}
+		;;
+	rs6000-bull)
 		basic_os=${basic_os:-bosx}
 		;;
+	mips-sni)
+		basic_os=${basic_os:-sysv4}
+		;;
 
 	# Here we normalize CPU types irrespective of the vendor
 	amd64-*)
@@ -1038,7 +1111,7 @@ case $cpu-$vendor in
 		;;
 	blackfin-*)
 		cpu=bfin
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	c54x-*)
 		cpu=tic54x
@@ -1061,7 +1134,7 @@ case $cpu-$vendor in
 		;;
 	m68knommu-*)
 		cpu=m68k
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
 		cpu=s12z
@@ -1071,7 +1144,7 @@ case $cpu-$vendor in
 		;;
 	parisc-*)
 		cpu=hppa
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
@@ -1085,9 +1158,6 @@ case $cpu-$vendor in
 	pentium4-*)
 		cpu=i786
 		;;
-	pc98-*)
-		cpu=i386
-		;;
 	ppc-* | ppcbe-*)
 		cpu=powerpc
 		;;
@@ -1121,9 +1191,6 @@ case $cpu-$vendor in
 	tx39el-*)
 		cpu=mipstx39el
 		;;
-	x64-*)
-		cpu=x86_64
-		;;
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
@@ -1179,90 +1246,227 @@ case $cpu-$vendor in
 		# Recognize the canonical CPU types that are allowed with any
 		# company name.
 		case $cpu in
-			1750a | 580 \
+			  1750a \
+			| 580 \
+			| [cjt]90 \
 			| a29k \
-			| aarch64 | aarch64_be | aarch64c | arm64ec \
+			| aarch64 \
+			| aarch64_be \
+			| aarch64c \
 			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
+			| alpha \
+			| alpha64 \
+			| alpha64ev56 \
+			| alpha64ev6[78] \
+			| alpha64ev[4-8] \
+			| alpha64pca5[67] \
+			| alphaev56 \
+			| alphaev6[78] \
+			| alphaev[4-8] \
+			| alphapca5[67] \
 			| am33_2.0 \
 			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
-			| arm | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
+			| arc \
+			| arc32 \
+			| arc64 \
+			| arceb \
+			| arm \
+			| arm64e \
+			| arm64ec \
+			| arm[lb]e \
+			| arme[lb] \
+			| armv* \
 			| asmjs \
+			| avr \
+			| avr32 \
 			| ba \
-			| be32 | be64 \
-			| bfin | bpf | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| javascript \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| be32 \
+			| be64 \
+			| bfin \
+			| bpf \
+			| bs2000 \
+			| c30 \
+			| c4x \
+			| c8051 \
+			| c[123]* \
+			| clipper \
+			| craynv \
+			| csky \
+			| cydra \
+			| d10v \
+			| d30v \
+			| dlx \
+			| dsp16xx \
+			| e2k \
+			| elxsi \
+			| epiphany \
+			| f30[01] \
+			| f700 \
+			| fido \
+			| fr30 \
+			| frv \
+			| ft32 \
+			| fx80 \
+			| h8300 \
+			| h8500 \
 			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
+			| hppa \
+			| hppa1.[01] \
+			| hppa2.0 \
+			| hppa2.0[nw] \
+			| hppa64 \
+			| i*86 \
+			| i370 \
+			| i860 \
+			| i960 \
+			| ia16 \
+			| ia64 \
+			| ip2k \
+			| iq2000 \
+			| javascript \
 			| k1om \
 			| kvx \
-			| le32 | le64 \
+			| le32 \
+			| le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
+			| loongarch32 \
+			| loongarch64 \
+			| m32c \
+			| m32r \
+			| m32rle \
+			| m5200 \
+			| m68000 \
+			| m680[012346]0 \
+			| m6811 \
+			| m6812 \
+			| m68360 \
+			| m683?2 \
+			| m68hc11 \
+			| m68hc12 \
+			| m68hcs12x \
+			| m68k \
+			| m88110 \
+			| m88k \
+			| maxq \
+			| mb \
+			| mcore \
+			| mep \
+			| metag \
+			| microblaze \
+			| microblazeel \
 			| mips* \
 			| mmix \
-			| mn10200 | mn10300 \
+			| mn10200 \
+			| mn10300 \
 			| moxie \
-			| mt \
 			| msp430 \
+			| mt \
 			| nanomips* \
-			| nds32 | nds32le | nds32be \
+			| nds32 \
+			| nds32be \
+			| nds32le \
 			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k | nvptx \
+			| nios \
+			| nios2 \
+			| nios2eb \
+			| nios2el \
+			| none \
+			| np1 \
+			| ns16k \
+			| ns32k \
+			| nvptx \
 			| open8 \
 			| or1k* \
 			| or32 \
 			| orion \
+			| pdp10 \
+			| pdp11 \
 			| picochip \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pj \
+			| pjl \
+			| pn \
+			| power \
+			| powerpc \
+			| powerpc64 \
+			| powerpc64le \
+			| powerpcle \
+			| powerpcspe \
 			| pru \
 			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
+			| riscv \
+			| riscv32 \
+			| riscv32be \
+			| riscv64 \
+			| riscv64be \
+			| rl78 \
+			| romp \
+			| rs6000 \
+			| rx \
+			| s390 \
+			| s390x \
 			| score \
-			| sh | shl \
-			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sh \
+			| sh64 \
+			| sh64le \
+			| sh[12345][lb]e \
+			| sh[1234] \
+			| sh[1234]e[lb] \
+			| sh[23]e \
+			| sh[23]ele \
+			| sh[24]a \
+			| sh[24]ae[lb] \
+			| sh[lb]e \
+			| she[lb] \
+			| shl \
+			| sparc \
+			| sparc64 \
+			| sparc64b \
+			| sparc64v \
+			| sparc86x \
+			| sparclet \
 			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| sparcv8 \
+			| sparcv9 \
+			| sparcv9b \
+			| sparcv9v \
 			| spu \
+			| sv1 \
+			| sx* \
 			| tahoe \
 			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tic30 \
+			| tic4x \
+			| tic54x \
+			| tic55x \
+			| tic6x \
+			| tic80 \
 			| tron \
 			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| v70 \
+			| v810 \
+			| v850 \
+			| v850e \
+			| v850e1 \
+			| v850e2 \
+			| v850e2v3 \
+			| v850es \
 			| vax \
 			| vc4 \
 			| visium \
 			| w65 \
-			| wasm32 | wasm64 \
+			| wasm32 \
+			| wasm64 \
 			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
+			| x86 \
+			| x86_64 \
+			| xc16x \
+			| xgate \
+			| xps100 \
+			| xstormy16 \
+			| xtensa* \
 			| ymp \
-			| z8k | z80)
+			| z80 \
+			| z8k)
 				;;
 
 			*)
@@ -1307,7 +1511,6 @@ case $basic_os in
 		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
 		;;
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read kernel os <<EOF
 $basic_os
@@ -1354,6 +1557,23 @@ case $os in
 	unixware*)
 		os=sysv4.2uw
 		;;
+	# The marketing names for NeXT's operating systems were
+	# NeXTSTEP, NeXTSTEP 2, OpenSTEP 3, OpenSTEP 4.  'openstep' is
+	# mapped to 'openstep3', but 'openstep1' and 'openstep2' are
+	# mapped to 'nextstep' and 'nextstep2', consistent with the
+	# treatment of SunOS/Solaris.
+	ns | ns1 | nextstep | nextstep1 | openstep1)
+		os=nextstep
+		;;
+	ns2 | nextstep2 | openstep2)
+		os=nextstep2
+		;;
+	ns3 | nextstep3 | openstep | openstep3)
+		os=openstep3
+		;;
+	ns4 | nextstep4 | openstep4)
+		os=openstep4
+		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
 	es1800*)
 		os=ose
@@ -1424,6 +1644,7 @@ case $os in
 		;;
 	utek*)
 		os=bsd
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|tektronix|'`
 		;;
 	dynix*)
 		os=bsd
@@ -1440,21 +1661,25 @@ case $os in
 	386bsd)
 		os=bsd
 		;;
-	ctix* | uts*)
+	ctix*)
 		os=sysv
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|convergent|'`
 		;;
-	nova*)
-		os=rtmk-nova
+	uts*)
+		os=sysv
 		;;
-	ns2)
-		os=nextstep2
+	nova*)
+		kernel=rtmk
+		os=nova
 		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
 		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	sinix*)
 		os=sysv4
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	tpf*)
 		os=tpf
@@ -1595,6 +1820,14 @@ case $cpu-$vendor in
 		os=
 		obj=elf
 		;;
+	# The -sgi and -siemens entries must be before the mips- entry
+	# or we get the wrong os.
+	*-sgi)
+		os=irix
+		;;
+	*-siemens)
+		os=sysv4
+		;;
 	mips*-cisco)
 		os=
 		obj=elf
@@ -1607,7 +1840,8 @@ case $cpu-$vendor in
 		os=
 		obj=coff
 		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
+	# This must be before the sparc-* entry or we get the wrong os.
+	*-tti)
 		os=sysv3
 		;;
 	sparc-* | *-sun)
@@ -1639,7 +1873,7 @@ case $cpu-$vendor in
 		os=hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=hiuxwe2
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 		os=sysv
@@ -1683,12 +1917,6 @@ case $cpu-$vendor in
 	*-encore)
 		os=bsd
 		;;
-	*-sgi)
-		os=irix
-		;;
-	*-siemens)
-		os=sysv4
-		;;
 	*-masscomp)
 		os=rtu
 		;;
@@ -1735,40 +1963,193 @@ case $os in
 	ghcjs)
 		;;
 	# Now accept the basic system types.
-	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
-	     | mpw* | magic* | mmixware* | mon960* | lnews* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | mint* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
-	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
+	  abug \
+	| aix* \
+	| amdhsa* \
+	| amigados* \
+	| amigaos* \
+	| android* \
+	| aof* \
+	| aos* \
+	| aros* \
+	| atheos* \
+	| auroraux* \
+	| aux* \
+	| beos* \
+	| bitrig* \
+	| bme* \
+	| bosx* \
+	| bsd* \
+	| cegcc* \
+	| chorusos* \
+	| chorusrdb* \
+	| clix* \
+	| cloudabi* \
+	| cnk* \
+	| conix* \
+	| cos* \
+	| cxux* \
+	| cygwin* \
+	| darwin* \
+	| dgux* \
+	| dicos* \
+	| dnix* \
+	| domain* \
+	| dragonfly* \
+	| drops* \
+	| ebmon* \
+	| ecoff* \
+	| ekkobsd* \
+	| emscripten* \
+	| emx* \
+	| es* \
+	| fiwix* \
+	| freebsd* \
+	| fuchsia* \
+	| genix* \
+	| genode* \
+	| glidix* \
+	| gnu* \
+	| go32* \
+	| haiku* \
+	| hcos* \
+	| hiux* \
+	| hms* \
+	| hpux* \
+	| ieee* \
+	| interix* \
+	| ios* \
+	| iris* \
+	| irix* \
+	| ironclad* \
+	| isc* \
+	| its* \
+	| l4re* \
+	| libertybsd* \
+	| lites* \
+	| lnews* \
+	| luna* \
+	| lynxos* \
+	| mach* \
+	| macos* \
+	| magic* \
+	| mbr* \
+	| midipix* \
+	| midnightbsd* \
+	| mingw32* \
+	| mingw64* \
+	| minix* \
+	| mint* \
+	| mirbsd* \
+	| mks* \
+	| mlibc* \
+	| mmixware* \
+	| mon960* \
+	| morphos* \
+	| moss* \
+	| moxiebox* \
+	| mpeix* \
+	| mpw* \
+	| msdos* \
+	| msys* \
+	| mvs* \
+	| nacl* \
+	| netbsd* \
+	| netware* \
+	| newsos* \
+	| nextstep* \
+	| nindy* \
+	| nonstopux* \
+	| nova* \
+	| nsk* \
+	| nucleus* \
+	| nx6 \
+	| nx7 \
+	| oabi* \
+	| ohos* \
+	| onefs* \
+	| openbsd* \
+	| openedition* \
+	| openstep* \
+	| os108* \
+	| os2* \
+	| os400* \
+	| os68k* \
+	| os9* \
+	| ose* \
+	| osf* \
+	| oskit* \
+	| osx* \
+	| palmos* \
+	| phoenix* \
+	| plan9* \
+	| powermax* \
+	| powerunix* \
+	| proelf* \
+	| psos* \
+	| psp* \
+	| ptx* \
+	| pw32* \
+	| qnx* \
+	| rdos* \
+	| redox* \
+	| rhapsody* \
+	| riscix* \
+	| riscos* \
+	| rtems* \
+	| rtmk* \
+	| rtu* \
+	| scout* \
+	| secbsd* \
+	| sei* \
+	| serenity* \
+	| sim* \
+	| skyos* \
+	| solaris* \
+	| solidbsd* \
+	| sortix* \
+	| storm-chaos* \
+	| sunos \
+	| sunos[34]* \
+	| superux* \
+	| syllable* \
+	| sym* \
+	| sysv* \
+	| tenex* \
+	| tirtos* \
+	| toppers* \
+	| tops10* \
+	| tops20* \
+	| tpf* \
+	| tvos* \
+	| twizzler* \
+	| uclinux* \
+	| udi* \
+	| udk* \
+	| ultrix* \
+	| unicos* \
+	| uniplus* \
+	| unleashed* \
+	| unos* \
+	| uwin* \
+	| uxpv* \
+	| v88r* \
+	|*vms* \
+	| vos* \
+	| vsta* \
+	| vxsim* \
+	| vxworks* \
+	| wasi* \
+	| watchos* \
+	| wince* \
+	| windiss* \
+	| windows* \
+	| winnt* \
+	| xenix* \
+	| xray* \
+	| zephyr* \
+	| zvmoe* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1829,9 +2210,9 @@ esac
 case $kernel-$os-$obj in
 	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
 		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
-		    | linux-relibc*- | linux-uclibc*- )
+		    | linux-relibc*- | linux-uclibc*- | linux-ohos*- )
 		;;
-	uclinux-uclibc*- )
+	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
@@ -1856,7 +2237,7 @@ case $kernel-$os-$obj in
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+	kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
 	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
@@ -1864,6 +2245,8 @@ case $kernel-$os-$obj in
 		;;
 	os2-emx-)
 		;;
+	rtmk-nova-)
+		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
 	none--*)
@@ -1890,7 +2273,7 @@ case $vendor in
 			*-riscix*)
 				vendor=acorn
 				;;
-			*-sunos*)
+			*-sunos* | *-solaris*)
 				vendor=sun
 				;;
 			*-cnk* | *-aix*)
diff --git a/configure b/configure
index 2a5cf1e36..36b923260 100755
--- a/configure
+++ b/configure
@@ -4088,6 +4088,17 @@ test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -4100,7 +4111,7 @@ echo "$as_me: error: No awk program found" >&2;}
 # 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:4103: checking for a BSD compatible install" >&5
+echo "$as_me:4114: 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
@@ -4149,7 +4160,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:4152: result: $INSTALL" >&5
+echo "$as_me:4163: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -4160,8 +4171,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-case $INSTALL in
-(/*)
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
@@ -4174,7 +4185,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4177: checking for $ac_word" >&5
+echo "$as_me:4188: 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
@@ -4189,7 +4200,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4192: found $ac_dir/$ac_word" >&5
+echo "$as_me:4203: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4197,10 +4208,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4200: result: $LINT" >&5
+  echo "$as_me:4211: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4203: result: no" >&5
+  echo "$as_me:4214: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4213,18 +4224,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:4216: checking whether ln -s works" >&5
+echo "$as_me:4227: 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:4220: result: yes" >&5
+  echo "$as_me:4231: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:4223: result: no, using $LN_S" >&5
+  echo "$as_me:4234: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:4227: checking if $LN_S -f options work" >&5
+echo "$as_me:4238: 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
@@ -4236,12 +4247,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:4239: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4250: 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:4244: checking for long file names" >&5
+echo "$as_me:4255: 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
@@ -4280,7 +4291,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4283: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4294: 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
 
@@ -4299,7 +4310,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4302: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4313: 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"
@@ -4309,7 +4320,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4312: checking if you want to use pkg-config" >&5
+echo "$as_me:4323: 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.
@@ -4319,7 +4330,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4322: result: $cf_pkg_config" >&5
+echo "$as_me:4333: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4331,7 +4342,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4334: 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_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4348,7 +4359,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4351: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4362: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4359,10 +4370,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4362: result: $PKG_CONFIG" >&5
+  echo "$as_me:4373: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4365: result: no" >&5
+  echo "$as_me:4376: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4371,7 +4382,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4374: checking for $ac_word" >&5
+echo "$as_me:4385: 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
@@ -4388,7 +4399,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4391: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4402: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4400,10 +4411,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4406: result: no" >&5
+  echo "$as_me:4417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4427,43 +4438,41 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$PKG_CONFIG" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$PKG_CONFIG" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval PKG_CONFIG="$PKG_CONFIG"
-	case ".$PKG_CONFIG" in
-	(.NONE/*)
+	case "x$PKG_CONFIG" in
+	(xNONE/*)
 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4449: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4458: 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:4456: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4465: 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:4462: checking for pkg-config library directory" >&5
+	echo "$as_me:4471: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4466: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4475: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4490,27 +4499,27 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (x)
 	;;
-(x/*\ *)
+(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
 	PKG_CONFIG_LIBDIR=
 	;;
-(x/*)
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4509: result: auto" >&5
+	echo "$as_me:4518: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4513: checking for search-list" >&5
+	echo "$as_me:4522: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4521,7 +4530,15 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 			pkg-config \
 			pkgconf
 		do
-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
+			case "$cf_raw_search_path" in
+			(*\\*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
+				;;
+			(*/*)
+				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
+				;;
+			esac
 			test -n "$cf_search_path" && break
 		done
 
@@ -4537,11 +4554,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4540: result: $cf_search_path" >&5
+	echo "$as_me:4557: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4549,7 +4566,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4552: checking for first directory" >&5
+	echo "$as_me:4569: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4560,7 +4577,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4563: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4580: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4570,7 +4587,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4573: checking for workaround" >&5
+		echo "$as_me:4590: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4593,17 +4610,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4603: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4620: 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:4606: checking if we should install .pc files" >&5
+	echo "$as_me:4623: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4614,7 +4631,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4617: result: $enable_pc_files" >&5
+echo "$as_me:4634: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4622,7 +4639,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4634,26 +4651,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_pkg_config_libdir" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_pkg_config_libdir" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_pkg_config_libdir="$cf_pkg_config_libdir"
-	case ".$cf_pkg_config_libdir" in
-	(.NONE/*)
+	case "x$cf_pkg_config_libdir" in
+	(xNONE/*)
 		cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4656: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4671: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4667,7 +4682,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4670: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4685: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4682,13 +4697,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4691: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4706: 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.
@@ -4698,11 +4713,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4701: result: $enable_mixedcase" >&5
+echo "$as_me:4716: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4705: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4720: 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
@@ -4729,7 +4744,7 @@ else
 fi
 
 fi
-echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4748,7 +4763,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4751: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4766: 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
@@ -4768,16 +4783,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4771: result: yes" >&5
+  echo "$as_me:4786: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4775: result: no" >&5
+  echo "$as_me:4790: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4780: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4795: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4832,7 +4847,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4843,7 +4858,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4846: checking for $ac_word" >&5
+echo "$as_me:4861: 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
@@ -4858,7 +4873,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4861: found $ac_dir/$ac_word" >&5
+echo "$as_me:4876: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4866,10 +4881,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4869: result: $CTAGS" >&5
+  echo "$as_me:4884: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4872: result: no" >&5
+  echo "$as_me:4887: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4880,7 +4895,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4883: checking for $ac_word" >&5
+echo "$as_me:4898: 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
@@ -4895,7 +4910,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4898: found $ac_dir/$ac_word" >&5
+echo "$as_me:4913: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4903,10 +4918,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4906: result: $ETAGS" >&5
+  echo "$as_me:4921: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4909: result: no" >&5
+  echo "$as_me:4924: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4915,7 +4930,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4918: checking for $ac_word" >&5
+echo "$as_me:4933: 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
@@ -4930,7 +4945,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4933: found $ac_dir/$ac_word" >&5
+echo "$as_me:4948: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4939,17 +4954,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4945: result: no" >&5
+  echo "$as_me:4960: 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:4952: checking for $ac_word" >&5
+echo "$as_me:4967: 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
@@ -4964,7 +4979,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4967: found $ac_dir/$ac_word" >&5
+echo "$as_me:4982: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4973,10 +4988,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4979: result: no" >&5
+  echo "$as_me:4994: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4996,7 +5011,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4999: checking for makeflags variable" >&5
+echo "$as_me:5014: 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
@@ -5026,7 +5041,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -5034,13 +5049,13 @@ echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:5037: result: $cf_cv_makeflags" >&5
+echo "$as_me:5052: 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:5043: checking for $ac_word" >&5
+echo "$as_me:5058: 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
@@ -5055,7 +5070,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5058: found $ac_dir/$ac_word" >&5
+echo "$as_me:5073: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5063,10 +5078,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5066: result: $RANLIB" >&5
+  echo "$as_me:5081: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5069: result: no" >&5
+  echo "$as_me:5084: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5075,7 +5090,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5078: checking for $ac_word" >&5
+echo "$as_me:5093: 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
@@ -5090,7 +5105,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5093: found $ac_dir/$ac_word" >&5
+echo "$as_me:5108: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5099,10 +5114,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5105: result: no" >&5
+  echo "$as_me:5120: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5114,7 +5129,7 @@ fi
 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:5117: checking for $ac_word" >&5
+echo "$as_me:5132: 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
@@ -5129,7 +5144,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:5132: found $ac_dir/$ac_word" >&5
+echo "$as_me:5147: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5137,10 +5152,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:5140: result: $LD" >&5
+  echo "$as_me:5155: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:5143: result: no" >&5
+  echo "$as_me:5158: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5149,7 +5164,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:5152: checking for $ac_word" >&5
+echo "$as_me:5167: 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
@@ -5164,7 +5179,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:5167: found $ac_dir/$ac_word" >&5
+echo "$as_me:5182: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5173,10 +5188,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:5176: result: $ac_ct_LD" >&5
+  echo "$as_me:5191: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:5179: result: no" >&5
+  echo "$as_me:5194: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5188,7 +5203,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5191: checking for $ac_word" >&5
+echo "$as_me:5206: 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
@@ -5203,7 +5218,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5206: found $ac_dir/$ac_word" >&5
+echo "$as_me:5221: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5211,10 +5226,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5214: result: $AR" >&5
+  echo "$as_me:5229: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5217: result: no" >&5
+  echo "$as_me:5232: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5223,7 +5238,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5226: checking for $ac_word" >&5
+echo "$as_me:5241: 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
@@ -5238,7 +5253,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5241: found $ac_dir/$ac_word" >&5
+echo "$as_me:5256: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5247,10 +5262,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5250: result: $ac_ct_AR" >&5
+  echo "$as_me:5265: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5253: result: no" >&5
+  echo "$as_me:5268: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5262,7 +5277,7 @@ fi
 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:5265: checking for $ac_word" >&5
+echo "$as_me:5280: 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
@@ -5277,7 +5292,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5280: found $ac_dir/$ac_word" >&5
+echo "$as_me:5295: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5285,10 +5300,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5288: result: $NM" >&5
+  echo "$as_me:5303: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5291: result: no" >&5
+  echo "$as_me:5306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5297,7 +5312,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5300: checking for $ac_word" >&5
+echo "$as_me:5315: 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
@@ -5312,7 +5327,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5315: found $ac_dir/$ac_word" >&5
+echo "$as_me:5330: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5321,10 +5336,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5324: result: $ac_ct_NM" >&5
+  echo "$as_me:5339: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5327: result: no" >&5
+  echo "$as_me:5342: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5336,7 +5351,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5339: checking for $ac_word" >&5
+echo "$as_me:5354: 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
@@ -5351,7 +5366,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5354: found $ac_dir/$ac_word" >&5
+echo "$as_me:5369: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5359,10 +5374,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5362: result: $AR" >&5
+  echo "$as_me:5377: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5365: result: no" >&5
+  echo "$as_me:5380: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5371,7 +5386,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5374: checking for $ac_word" >&5
+echo "$as_me:5389: 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
@@ -5386,7 +5401,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5389: found $ac_dir/$ac_word" >&5
+echo "$as_me:5404: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5395,10 +5410,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5398: result: $ac_ct_AR" >&5
+  echo "$as_me:5413: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5401: result: no" >&5
+  echo "$as_me:5416: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5407,7 +5422,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5410: checking for options to update archives" >&5
+echo "$as_me:5425: 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
@@ -5444,13 +5459,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5447 "configure"
+#line 5462 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5450: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5453: \$? = $ac_status" >&5
+  echo "$as_me:5468: \$? = $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
@@ -5461,7 +5476,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5471,7 +5486,7 @@ echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5482,7 +5497,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5485: checking for an installation directory prefix" >&5
+echo "$as_me:5500: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5495,7 +5510,7 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
 ###############################################################################
@@ -5530,7 +5545,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5533: checking for $ac_word" >&5
+echo "$as_me:5548: 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
@@ -5545,7 +5560,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5548: found $ac_dir/$ac_word" >&5
+echo "$as_me:5563: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5553,10 +5568,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5556: result: $BUILD_CC" >&5
+  echo "$as_me:5571: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5559: result: no" >&5
+  echo "$as_me:5574: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5565,12 +5580,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5568: checking for native build C compiler" >&5
+	echo "$as_me:5583: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5570: result: $BUILD_CC" >&5
+	echo "$as_me:5585: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5573: checking for native build C preprocessor" >&5
+	echo "$as_me:5588: 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.
@@ -5580,10 +5595,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5583: result: $BUILD_CPP" >&5
+	echo "$as_me:5598: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5586: checking for native build C flags" >&5
+	echo "$as_me:5601: 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.
@@ -5591,10 +5606,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5597: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5612: 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.
@@ -5602,10 +5617,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5608: checking for native build linker-flags" >&5
+	echo "$as_me:5623: 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.
@@ -5613,10 +5628,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5619: checking for native build linker-libraries" >&5
+	echo "$as_me:5634: 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.
@@ -5624,7 +5639,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5627: result: $BUILD_LIBS" >&5
+	echo "$as_me:5642: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5633,7 +5648,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5636: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5651: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5647,7 +5662,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5650 "configure"
+#line 5665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5657,15 +5672,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5663: \$? = $ac_status" >&5
+  echo "$as_me:5678: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5668: \$? = $ac_status" >&5
+  echo "$as_me:5683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5680,12 +5695,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5683: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5698: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5688: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5703: 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;}
@@ -5710,7 +5725,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5713: checking if libtool -version-number should be used" >&5
+echo "$as_me:5728: 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.
@@ -5727,7 +5742,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5730: result: $cf_libtool_version" >&5
+echo "$as_me:5745: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5736,25 +5751,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5739: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5754: 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}:5746: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5761: 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}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5776,7 +5791,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5779: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5794: 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.
@@ -5786,7 +5801,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5789: result: $with_libtool" >&5
+echo "$as_me:5804: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5798,26 +5813,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$with_libtool" in
-(.\$\(*\)*|.\'*\'*)
+case "x$with_libtool" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval with_libtool="$with_libtool"
-	case ".$with_libtool" in
-	(.NONE/*)
+	case "x$with_libtool" in
+	(xNONE/*)
 		with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5830,7 +5843,7 @@ esac
   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:5833: checking for $ac_word" >&5
+echo "$as_me:5846: 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
@@ -5845,7 +5858,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5848: found $ac_dir/$ac_word" >&5
+echo "$as_me:5861: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5853,10 +5866,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5856: result: $LIBTOOL" >&5
+  echo "$as_me:5869: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5859: result: no" >&5
+  echo "$as_me:5872: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5869,7 +5882,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5872: checking for $ac_word" >&5
+echo "$as_me:5885: 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
@@ -5884,7 +5897,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5887: found $ac_dir/$ac_word" >&5
+echo "$as_me:5900: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5892,10 +5905,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5898: result: no" >&5
+  echo "$as_me:5911: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5926,7 +5939,7 @@ unset LIBTOOL
   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:5929: checking for $ac_word" >&5
+echo "$as_me:5942: 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
@@ -5941,7 +5954,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5944: found $ac_dir/$ac_word" >&5
+echo "$as_me:5957: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5949,10 +5962,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5952: result: $LIBTOOL" >&5
+  echo "$as_me:5965: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5955: result: no" >&5
+  echo "$as_me:5968: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5965,7 +5978,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5968: checking for $ac_word" >&5
+echo "$as_me:5981: 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
@@ -5980,7 +5993,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5983: found $ac_dir/$ac_word" >&5
+echo "$as_me:5996: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5988,10 +6001,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5994: result: no" >&5
+  echo "$as_me:6007: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6013,7 +6026,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:6016: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6029: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6029,7 +6042,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:6032: checking version of $LIBTOOL" >&5
+	echo "$as_me:6045: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -6040,7 +6053,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 
 	if test -n "$cf_cv_libtool_version"
@@ -6050,19 +6063,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:6053: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6066: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:6059: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6072: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
 else
-	{ { echo "$as_me:6065: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6078: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6098,7 +6111,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:6101: checking if you want to build shared libraries" >&5
+echo "$as_me:6114: 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.
@@ -6108,11 +6121,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:6111: result: $with_shared" >&5
+echo "$as_me:6124: 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:6115: checking if you want to build static libraries" >&5
+echo "$as_me:6128: 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.
@@ -6122,11 +6135,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:6125: result: $with_normal" >&5
+echo "$as_me:6138: 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:6129: checking if you want to build debug libraries" >&5
+echo "$as_me:6142: 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.
@@ -6136,11 +6149,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:6139: result: $with_debug" >&5
+echo "$as_me:6152: 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:6143: checking if you want to build profiling libraries" >&5
+echo "$as_me:6156: 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.
@@ -6150,7 +6163,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:6153: result: $with_profile" >&5
+echo "$as_me:6166: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -6158,7 +6171,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:6161: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6174: 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.
@@ -6168,26 +6181,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:6171: result: $with_shared_cxx" >&5
+echo "$as_me:6184: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:6178: checking for specified models" >&5
+echo "$as_me:6191: 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:6182: result: $cf_list_models" >&5
+echo "$as_me:6195: 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:6187: checking for default model" >&5
+echo "$as_me:6200: 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:6190: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6203: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -6201,7 +6214,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:6204: checking if you want to have a library-prefix" >&5
+echo "$as_me:6217: 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.
@@ -6211,7 +6224,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:6214: result: $with_lib_prefix" >&5
+echo "$as_me:6227: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -6242,24 +6255,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:6245: checking for PATH separator" >&5
+	echo "$as_me:6258: 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:6252: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6265: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:6256: checking for ANSI C header files" >&5
+echo "$as_me:6269: 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 6262 "configure"
+#line 6275 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6267,13 +6280,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6276: \$? = $ac_status" >&5
+  echo "$as_me:6289: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6295,7 +6308,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6298 "configure"
+#line 6311 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6313,7 +6326,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6316 "configure"
+#line 6329 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6334,7 +6347,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6337 "configure"
+#line 6350 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6360,15 +6373,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6366: \$? = $ac_status" >&5
+  echo "$as_me:6379: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6371: \$? = $ac_status" >&5
+  echo "$as_me:6384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6381,7 +6394,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6397,28 +6410,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6400: checking for $ac_header" >&5
+echo "$as_me:6413: 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 6406 "configure"
+#line 6419 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6415: \$? = $ac_status" >&5
+  echo "$as_me:6428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6421: \$? = $ac_status" >&5
+  echo "$as_me:6434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6428,7 +6441,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6431: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6444: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6438,13 +6451,13 @@ EOF
 fi
 done
 
-echo "$as_me:6441: checking whether exit is declared" >&5
+echo "$as_me:6454: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6447 "configure"
+#line 6460 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6459,16 +6472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6465: \$? = $ac_status" >&5
+  echo "$as_me:6478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6471: \$? = $ac_status" >&5
+  echo "$as_me:6484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6478,19 +6491,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6481: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6494: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6487: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6500: 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 6493 "configure"
+#line 6506 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6505,16 +6518,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6511: \$? = $ac_status" >&5
+  echo "$as_me:6524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6517: \$? = $ac_status" >&5
+  echo "$as_me:6530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6524,7 +6537,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6527: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6540: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6537,7 +6550,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6540: checking for opendir in -ldir" >&5
+  echo "$as_me:6553: 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
@@ -6545,7 +6558,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6548 "configure"
+#line 6561 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6564,16 +6577,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6570: \$? = $ac_status" >&5
+  echo "$as_me:6583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6576: \$? = $ac_status" >&5
+  echo "$as_me:6589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6584,14 +6597,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6587: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6600: 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:6594: checking for opendir in -lx" >&5
+  echo "$as_me:6607: 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
@@ -6599,7 +6612,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6602 "configure"
+#line 6615 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6618,16 +6631,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6624: \$? = $ac_status" >&5
+  echo "$as_me:6637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6630: \$? = $ac_status" >&5
+  echo "$as_me:6643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6638,7 +6651,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6641: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6654: 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"
@@ -6648,7 +6661,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6651: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6664: 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.
@@ -6658,10 +6671,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6661: result: $with_termlib" >&5
+echo "$as_me:6674: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6664: checking if you want to build a separate tic library" >&5
+echo "$as_me:6677: 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.
@@ -6671,7 +6684,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6674: result: $with_ticlib" >&5
+echo "$as_me:6687: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6684,7 +6697,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6687: checking for default loader flags" >&5
+echo "$as_me:6700: 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=''   ;;
@@ -6693,13 +6706,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6702: checking if rpath option should be used" >&5
+echo "$as_me:6715: 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.
@@ -6709,10 +6722,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6715: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6728: 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.
@@ -6722,7 +6735,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6725: result: $cf_cv_do_relink" >&5
+echo "$as_me:6738: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6733,7 +6746,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6736: checking for an rpath option" >&5
+	echo "$as_me:6749: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6764,12 +6777,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6772: checking if we need a space after rpath option" >&5
+		echo "$as_me:6785: 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"
 
@@ -6790,7 +6803,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6793 "configure"
+#line 6806 "configure"
 #include "confdefs.h"
 
 int
@@ -6802,16 +6815,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6808: \$? = $ac_status" >&5
+  echo "$as_me:6821: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6814: \$? = $ac_status" >&5
+  echo "$as_me:6827: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6821,7 +6834,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6824: result: $cf_rpath_space" >&5
+		echo "$as_me:6837: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6843,7 +6856,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6846: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6859: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6858,9 +6871,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6861: result: $withval" >&5
+		echo "$as_me:6874: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6863: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6876: 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; }; }
 		;;
@@ -6869,7 +6882,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6892,14 +6905,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6895: checking which $CC option to use" >&5
+		echo "$as_me:6908: 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 6902 "configure"
+#line 6915 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6911,16 +6924,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6917: \$? = $ac_status" >&5
+  echo "$as_me:6930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6923: \$? = $ac_status" >&5
+  echo "$as_me:6936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6929,7 +6942,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -7000,7 +7013,7 @@ CF_EOF
 		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:7003: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7016: 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
@@ -7009,7 +7022,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7012 "configure"
+#line 7025 "configure"
 #include "confdefs.h"
 
 int
@@ -7021,16 +7034,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7027: \$? = $ac_status" >&5
+  echo "$as_me:7040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7033: \$? = $ac_status" >&5
+  echo "$as_me:7046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -7041,7 +7054,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:7044: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7057: 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"
@@ -7391,7 +7404,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7394 "configure"
+#line 7407 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7403,16 +7416,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7409: \$? = $ac_status" >&5
+  echo "$as_me:7422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7415: \$? = $ac_status" >&5
+  echo "$as_me:7428: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7449,7 +7462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7459,7 +7472,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7462 "${as_me:-configure}"
+#line 7475 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7471,18 +7484,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7474: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7487: 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:7476: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7479: \$? = $ac_status" >&5
+  echo "$as_me:7492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7481: result: yes" >&5
+				echo "$as_me:7494: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7485: result: no" >&5
+				echo "$as_me:7498: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7497,17 +7510,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7500: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7513: 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}:7504: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7517: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7510: checking for additional libtool options" >&5
+echo "$as_me:7523: 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.
@@ -7517,7 +7530,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7520: result: $with_libtool_opts" >&5
+echo "$as_me:7533: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7528,7 +7541,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7531: checking if exported-symbols file should be used" >&5
+echo "$as_me:7544: 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.
@@ -7543,7 +7556,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7546: result: $with_export_syms" >&5
+echo "$as_me:7559: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7554,15 +7567,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7557: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7570: 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:7562: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7575: 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 7565 "configure"
+#line 7578 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7574,16 +7587,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7580: \$? = $ac_status" >&5
+  echo "$as_me:7593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7586: \$? = $ac_status" >&5
+  echo "$as_me:7599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7592,18 +7605,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7595: result: $cf_cflags_work" >&5
+		echo "$as_me:7608: 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}:7601: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7614: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7606: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7619: 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.
@@ -7620,19 +7633,19 @@ case "x$with_versioned_syms" in
 	;;
 (xno)
 	;;
-(x/*)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7624: error: expected a filename: $with_versioned_syms" >&5
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+	test -f "$with_versioned_syms" || { { echo "$as_me:7637: 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:7629: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7642: 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:7635: result: $with_versioned_syms" >&5
+echo "$as_me:7648: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7648,7 +7661,7 @@ then
 		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}:7651: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7664: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7656,11 +7669,11 @@ echo "${as_me:-configure}:7651: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7659: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7672: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7672,7 +7685,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7675: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7688: 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
 
@@ -7709,7 +7722,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7712 "configure"
+#line 7725 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7740,7 +7753,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7743: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7756: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7753,7 +7766,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7756: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7769: 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.
@@ -7763,27 +7776,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7766: result: $with_gpm" >&5
+echo "$as_me:7779: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7770: checking for gpm.h" >&5
+	echo "$as_me:7783: 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 7776 "configure"
+#line 7789 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7780: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7786: \$? = $ac_status" >&5
+  echo "$as_me:7799: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7802,7 +7815,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7805: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7818: 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
 
@@ -7813,7 +7826,7 @@ EOF
 		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}:7816: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7829: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7821,7 +7834,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7824: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7837: 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
@@ -7829,7 +7842,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7832 "configure"
+#line 7845 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7848,16 +7861,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7854: \$? = $ac_status" >&5
+  echo "$as_me:7867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7860: \$? = $ac_status" >&5
+  echo "$as_me:7873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7868,18 +7881,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7871: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7884: 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:7878: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7891: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7882: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7895: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7890,7 +7903,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7899,7 +7912,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7902: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7915: 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.
@@ -7909,18 +7922,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7912: result: $with_dlsym" >&5
+	echo "$as_me:7925: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7917: checking for dlsym" >&5
+echo "$as_me:7930: 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 7923 "configure"
+#line 7936 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7951,16 +7964,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7957: \$? = $ac_status" >&5
+  echo "$as_me:7970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7963: \$? = $ac_status" >&5
+  echo "$as_me:7976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7970,14 +7983,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7973: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7986: 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:7980: checking for dlsym in -ldl" >&5
+echo "$as_me:7993: 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
@@ -7985,7 +7998,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7988 "configure"
+#line 8001 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8004,16 +8017,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8010: \$? = $ac_status" >&5
+  echo "$as_me:8023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8016: \$? = $ac_status" >&5
+  echo "$as_me:8029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8024,7 +8037,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8027: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8040: 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
 
@@ -8053,10 +8066,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8056: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8069: 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 8059 "configure"
+#line 8072 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -8074,16 +8087,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8080: \$? = $ac_status" >&5
+  echo "$as_me:8093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8086: \$? = $ac_status" >&5
+  echo "$as_me:8099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8094,15 +8107,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8097: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8110: 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:8102: result: ok" >&5
+	echo "$as_me:8115: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8105: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8118: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8110,12 +8123,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8118: checking for soname of gpm library" >&5
+echo "$as_me:8131: 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
@@ -8149,15 +8162,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8155: \$? = $ac_status" >&5
+  echo "$as_me:8168: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8160: \$? = $ac_status" >&5
+  echo "$as_me:8173: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8168,7 +8181,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8236,7 +8249,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8239: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8252: 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
@@ -8244,7 +8257,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8247 "configure"
+#line 8260 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8263,16 +8276,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8275: \$? = $ac_status" >&5
+  echo "$as_me:8288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8283,11 +8296,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8286: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8299: 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:8290: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8303: 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
@@ -8311,15 +8324,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8317: \$? = $ac_status" >&5
+  echo "$as_me:8330: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8322: \$? = $ac_status" >&5
+  echo "$as_me:8335: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8331,11 +8344,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8334: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8347: 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:8338: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8351: 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
 
@@ -8343,7 +8356,7 @@ fi
 
 fi
 
-echo "$as_me:8346: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8359: 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.
@@ -8352,7 +8365,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8355: result: $with_pcre2" >&5
+echo "$as_me:8368: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8363,17 +8376,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8366: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8379: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8372: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8385: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8497,7 +8510,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8510,7 +8523,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8513: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8526: 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
@@ -8518,7 +8531,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8521 "configure"
+#line 8534 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8537,16 +8550,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8543: \$? = $ac_status" >&5
+  echo "$as_me:8556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8549: \$? = $ac_status" >&5
+  echo "$as_me:8562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8557,7 +8570,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8560: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8573: 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
 
@@ -8578,7 +8591,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8581: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8594: 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
@@ -8586,7 +8599,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8589 "configure"
+#line 8602 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8605,16 +8618,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8611: \$? = $ac_status" >&5
+  echo "$as_me:8624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8617: \$? = $ac_status" >&5
+  echo "$as_me:8630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8625,7 +8638,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8628: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8641: 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
 
@@ -8646,7 +8659,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8661,23 +8674,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8664: checking for $ac_header" >&5
+echo "$as_me:8677: 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 8670 "configure"
+#line 8683 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8674: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8680: \$? = $ac_status" >&5
+  echo "$as_me:8693: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8696,7 +8709,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8699: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8709,13 +8722,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8712: checking for $ac_func" >&5
+echo "$as_me:8725: 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 8718 "configure"
+#line 8731 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8746,16 +8759,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8752: \$? = $ac_status" >&5
+  echo "$as_me:8765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8758: \$? = $ac_status" >&5
+  echo "$as_me:8771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8765,7 +8778,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8768: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8781: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8779,7 +8792,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8782: checking if you want to use sysmouse" >&5
+echo "$as_me:8795: 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.
@@ -8791,7 +8804,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8794 "configure"
+#line 8807 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8814,16 +8827,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8820: \$? = $ac_status" >&5
+  echo "$as_me:8833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8826: \$? = $ac_status" >&5
+  echo "$as_me:8839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8833,7 +8846,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8836: result: $cf_with_sysmouse" >&5
+echo "$as_me:8849: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8843,7 +8856,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8846: checking if you want to disable library suffixes" >&5
+echo "$as_me:8859: 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.
@@ -8860,13 +8873,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8863: result: $disable_lib_suffixes" >&5
+echo "$as_me:8876: 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:8869: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8882: 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.
@@ -8884,22 +8897,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8887: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8900: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8892: checking for updated LDFLAGS" >&5
+echo "$as_me:8905: 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:8895: result: maybe" >&5
+	echo "$as_me:8908: 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:8902: checking for $ac_word" >&5
+echo "$as_me:8915: 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
@@ -8914,7 +8927,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8917: found $ac_dir/$ac_word" >&5
+echo "$as_me:8930: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8922,10 +8935,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8925: result: $cf_ldd_prog" >&5
+  echo "$as_me:8938: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8928: result: no" >&5
+  echo "$as_me:8941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8939,7 +8952,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8942 "configure"
+#line 8955 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8951,16 +8964,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8957: \$? = $ac_status" >&5
+  echo "$as_me:8970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8963: \$? = $ac_status" >&5
+  echo "$as_me:8976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -8988,7 +9001,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9000,11 +9013,11 @@ echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9041,7 +9054,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9054,11 +9067,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9095,7 +9108,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9108,14 +9121,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9118: result: no" >&5
+	echo "$as_me:9131: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9129,7 +9142,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9132: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9145: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9146,7 +9159,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9154,7 +9167,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9157: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9170: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9173,11 +9186,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9176: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9189: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9180: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9193: 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.
@@ -9187,10 +9200,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9190: result: $with_overwrite" >&5
+echo "$as_me:9203: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9193: checking if external terminfo-database is used" >&5
+echo "$as_me:9206: 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.
@@ -9200,7 +9213,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9203: result: $use_database" >&5
+echo "$as_me:9216: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9216,7 +9229,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9219: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9232: 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.
@@ -9224,10 +9237,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9227: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9240: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9230: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9243: 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.
@@ -9237,13 +9250,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9240: result: $with_hashed_db" >&5
+	echo "$as_me:9253: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9246: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9259: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9253,7 +9266,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9261,7 +9274,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9277,7 +9290,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9280: checking for $ac_word" >&5
+echo "$as_me:9293: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9292,7 +9305,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9295: found $ac_dir/$ac_word" >&5
+echo "$as_me:9308: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9300,10 +9313,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9303: result: $TIC" >&5
+  echo "$as_me:9316: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9306: result: no" >&5
+  echo "$as_me:9319: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9312,7 +9325,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9315: checking for $ac_word" >&5
+echo "$as_me:9328: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9327,7 +9340,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9330: found $ac_dir/$ac_word" >&5
+echo "$as_me:9343: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9335,10 +9348,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9338: result: $ac_ct_TIC" >&5
+  echo "$as_me:9351: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9341: result: no" >&5
+  echo "$as_me:9354: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9350,7 +9363,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9353: checking for $ac_word" >&5
+echo "$as_me:9366: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9365,7 +9378,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9368: found $ac_dir/$ac_word" >&5
+echo "$as_me:9381: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9373,10 +9386,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9376: result: $INFOCMP" >&5
+  echo "$as_me:9389: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9379: result: no" >&5
+  echo "$as_me:9392: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9385,7 +9398,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9388: checking for $ac_word" >&5
+echo "$as_me:9401: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9400,7 +9413,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9403: found $ac_dir/$ac_word" >&5
+echo "$as_me:9416: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9408,10 +9421,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9414: result: no" >&5
+  echo "$as_me:9427: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9426,10 +9439,10 @@ 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:9429: checking for tic program for fallbacks" >&5
+  echo "$as_me:9442: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9432: result: $TIC" >&5
+		echo "$as_me:9445: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9438,26 +9451,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$TIC" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$TIC" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval TIC="$TIC"
-	case ".$TIC" in
-	(.NONE/*)
+	case "x$TIC" in
+	(xNONE/*)
 		TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9470,7 +9481,7 @@ 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:9473: checking for $ac_word" >&5
+echo "$as_me:9484: 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
@@ -9487,7 +9498,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9490: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9501: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9498,10 +9509,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9501: result: $TIC" >&5
+  echo "$as_me:9512: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9504: result: no" >&5
+  echo "$as_me:9515: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9523,22 +9534,20 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_temp" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_temp" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_temp="$cf_temp"
-	case ".$cf_temp" in
-	(.NONE/*)
+	case "x$cf_temp" in
+	(xNONE/*)
 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -9560,7 +9569,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9575,7 +9584,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9578: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9587: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9584,10 +9593,10 @@ 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:9587: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9596: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9590: result: $INFOCMP" >&5
+		echo "$as_me:9599: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9596,26 +9605,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$INFOCMP" in
-(.\$\(*\)*|.\'*\'*)
+case "x$INFOCMP" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval INFOCMP="$INFOCMP"
-	case ".$INFOCMP" in
-	(.NONE/*)
+	case "x$INFOCMP" in
+	(xNONE/*)
 		INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9628,7 +9635,7 @@ 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:9631: checking for $ac_word" >&5
+echo "$as_me:9638: 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
@@ -9645,7 +9652,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9648: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9655: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9656,10 +9663,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9659: result: $INFOCMP" >&5
+  echo "$as_me:9666: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9662: result: no" >&5
+  echo "$as_me:9669: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9681,22 +9688,20 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_temp" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_temp" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_temp="$cf_temp"
-	case ".$cf_temp" in
-	(.NONE/*)
+	case "x$cf_temp" in
+	(xNONE/*)
 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -9718,7 +9723,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9733,7 +9738,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9736: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9741: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9743,7 +9748,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9746: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9751: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9751,7 +9756,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9754: checking if you want modern xterm or antique" >&5
+echo "$as_me:9759: 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.
@@ -9765,7 +9770,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9768: result: $with_xterm_new" >&5
+echo "$as_me:9773: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9778,7 +9783,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9781: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9786: 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.
@@ -9802,13 +9807,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9805: result: $with_xterm_kbs" >&5
+echo "$as_me:9810: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9811: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9816: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9818,7 +9823,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9821: checking for list of terminfo directories" >&5
+echo "$as_me:9826: 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.
@@ -9839,26 +9844,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_src_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_src_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_src_path="$cf_src_path"
-	case ".$cf_src_path" in
-	(.NONE/*)
+	case "x$cf_src_path" in
+	(xNONE/*)
 		cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9861: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9864: 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; }; }
 	;;
@@ -9881,7 +9884,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9890,13 +9893,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9893: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9896: 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:9899: checking for default terminfo directory" >&5
+echo "$as_me:9902: 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.
@@ -9913,26 +9916,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9941,7 +9942,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9944: result: $TERMINFO" >&5
+echo "$as_me:9945: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9952,7 +9953,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9955: checking if big-core option selected" >&5
+echo "$as_me:9956: 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.
@@ -9964,7 +9965,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9967 "configure"
+#line 9968 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9978,15 +9979,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9984: \$? = $ac_status" >&5
+  echo "$as_me:9985: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9989: \$? = $ac_status" >&5
+  echo "$as_me:9990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9998,7 +9999,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10001: result: $with_big_core" >&5
+echo "$as_me:10002: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10008,7 +10009,7 @@ EOF
 ### 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:10011: checking if big-strings option selected" >&5
+echo "$as_me:10012: 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.
@@ -10032,14 +10033,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10035: result: $with_big_strings" >&5
+echo "$as_me:10036: 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:10042: checking if you want termcap-fallback support" >&5
+echo "$as_me:10043: 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.
@@ -10049,14 +10050,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10052: result: $with_termcap" >&5
+echo "$as_me:10053: 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:10059: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10060: 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
@@ -10069,13 +10070,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10072: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10073: 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:10078: checking for list of termcap files" >&5
+	echo "$as_me:10079: 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.
@@ -10096,26 +10097,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_src_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_src_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_src_path="$cf_src_path"
-	case ".$cf_src_path" in
-	(.NONE/*)
+	case "x$cf_src_path" in
+	(xNONE/*)
 		cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10118: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10117: 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; }; }
 	;;
@@ -10138,7 +10137,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10141: result: $TERMPATH" >&5
+	echo "$as_me:10140: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10146,7 +10145,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10149: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10148: 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.
@@ -10156,14 +10155,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10159: result: $with_getcap" >&5
+	echo "$as_me:10158: 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:10166: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10165: 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.
@@ -10173,7 +10172,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10176: result: $with_getcap_cache" >&5
+	echo "$as_me:10175: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10183,7 +10182,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10186: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10185: 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.
@@ -10193,14 +10192,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10196: result: $with_home_terminfo" >&5
+echo "$as_me:10195: 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:10203: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10202: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10210,14 +10209,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10213: result: $with_root_environ" >&5
+echo "$as_me:10212: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10220: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10219: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10227,14 +10226,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10230: result: $with_root_access" >&5
+echo "$as_me:10229: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10237: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10236: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10244,7 +10243,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10247: result: $with_setuid_environ" >&5
+echo "$as_me:10246: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10259,23 +10258,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10262: checking for $ac_header" >&5
+echo "$as_me:10261: 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 10268 "configure"
+#line 10267 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10272: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10271: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10278: \$? = $ac_status" >&5
+  echo "$as_me:10277: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10294,7 +10293,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10296: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10309,13 +10308,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10312: checking for $ac_func" >&5
+echo "$as_me:10311: 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 10318 "configure"
+#line 10317 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10346,16 +10345,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10352: \$? = $ac_status" >&5
+  echo "$as_me:10351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10358: \$? = $ac_status" >&5
+  echo "$as_me:10357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10365,7 +10364,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10367: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10382,13 +10381,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10385: checking for $ac_func" >&5
+echo "$as_me:10384: 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 10391 "configure"
+#line 10390 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10419,16 +10418,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10425: \$? = $ac_status" >&5
+  echo "$as_me:10424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10431: \$? = $ac_status" >&5
+  echo "$as_me:10430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10438,7 +10437,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10441: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10440: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10449,7 +10448,7 @@ fi
 done
 
 else
-	echo "$as_me:10452: checking if link/symlink functions work" >&5
+	echo "$as_me:10451: 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
@@ -10462,7 +10461,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10465 "configure"
+#line 10464 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10496,15 +10495,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10502: \$? = $ac_status" >&5
+  echo "$as_me:10501: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10507: \$? = $ac_status" >&5
+  echo "$as_me:10506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10522,7 +10521,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10542,7 +10541,7 @@ with_symlinks=no
 # 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:10545: checking if tic should use symbolic links" >&5
+	echo "$as_me:10544: 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.
@@ -10552,21 +10551,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10555: result: $with_symlinks" >&5
+	echo "$as_me:10554: 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:10562: checking if tic should use hard links" >&5
+	echo "$as_me:10561: 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:10569: result: $with_links" >&5
+	echo "$as_me:10568: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10582,7 +10581,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10585: checking if you want broken-linker support code" >&5
+echo "$as_me:10584: 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.
@@ -10592,7 +10591,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10595: result: $with_broken_linker" >&5
+echo "$as_me:10594: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10606,7 +10605,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10609: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10608: 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.
@@ -10616,7 +10615,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10619: result: $with_bsdpad" >&5
+echo "$as_me:10618: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10635,14 +10634,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10638: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10637: 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 10645 "configure"
+#line 10644 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10661,16 +10660,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10667: \$? = $ac_status" >&5
+  echo "$as_me:10666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10673: \$? = $ac_status" >&5
+  echo "$as_me:10672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10681,7 +10680,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10723,14 +10722,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10726: checking if this is the GNU C library" >&5
+echo "$as_me:10725: 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 10733 "configure"
+#line 10732 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10749,16 +10748,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10755: \$? = $ac_status" >&5
+  echo "$as_me:10754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10761: \$? = $ac_status" >&5
+  echo "$as_me:10760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10769,7 +10768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10777,7 +10776,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10780: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10779: 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
@@ -10789,7 +10788,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10792 "configure"
+#line 10791 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10808,16 +10807,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10814: \$? = $ac_status" >&5
+  echo "$as_me:10813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10820: \$? = $ac_status" >&5
+  echo "$as_me:10819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10829,12 +10828,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10832: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10831: 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:10837: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10836: 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
@@ -10939,7 +10938,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10942 "configure"
+#line 10941 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10959,16 +10958,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10965: \$? = $ac_status" >&5
+  echo "$as_me:10964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10971: \$? = $ac_status" >&5
+  echo "$as_me:10970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10979,7 +10978,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10982: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10981: 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
@@ -10988,14 +10987,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10991: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:10990: 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 10998 "configure"
+#line 10997 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11010,16 +11009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:11015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11126,7 +11125,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11129 "configure"
+#line 11128 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11141,16 +11140,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11147: \$? = $ac_status" >&5
+  echo "$as_me:11146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11153: \$? = $ac_status" >&5
+  echo "$as_me:11152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11165,12 +11164,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11168: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11167: 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:11173: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11172: 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
@@ -11180,7 +11179,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11183 "configure"
+#line 11182 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11195,16 +11194,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11201: \$? = $ac_status" >&5
+  echo "$as_me:11200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11207: \$? = $ac_status" >&5
+  echo "$as_me:11206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11215,7 +11214,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11218: result: $cf_cv_default_source" >&5
+echo "$as_me:11217: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11252,16 +11251,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11255: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11254: 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}:11261: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11260: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11264 "configure"
+#line 11263 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11276,16 +11275,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11282: \$? = $ac_status" >&5
+  echo "$as_me:11281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11288: \$? = $ac_status" >&5
+  echo "$as_me:11287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11306,7 +11305,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11309 "configure"
+#line 11308 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11321,16 +11320,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11327: \$? = $ac_status" >&5
+  echo "$as_me:11326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11333: \$? = $ac_status" >&5
+  echo "$as_me:11332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11341,7 +11340,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11349,10 +11348,10 @@ echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11355 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11367,16 +11366,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11373: \$? = $ac_status" >&5
+  echo "$as_me:11372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11379: \$? = $ac_status" >&5
+  echo "$as_me:11378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11392,7 +11391,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11395: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11394: 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
@@ -11509,7 +11508,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11512: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11511: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11541,14 +11540,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11544: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11543: 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 11551 "configure"
+#line 11550 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11566,16 +11565,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11572: \$? = $ac_status" >&5
+  echo "$as_me:11571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11578: \$? = $ac_status" >&5
+  echo "$as_me:11577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11587,7 +11586,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11590 "configure"
+#line 11589 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11605,16 +11604,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11611: \$? = $ac_status" >&5
+  echo "$as_me:11610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11617: \$? = $ac_status" >&5
+  echo "$as_me:11616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11629,7 +11628,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11789,16 +11788,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11792: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11791: 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}:11798: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11797: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11801 "configure"
+#line 11800 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11813,16 +11812,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11819: \$? = $ac_status" >&5
+  echo "$as_me:11818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11825: \$? = $ac_status" >&5
+  echo "$as_me:11824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11843,7 +11842,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11846 "configure"
+#line 11845 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11858,16 +11857,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11864: \$? = $ac_status" >&5
+  echo "$as_me:11863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11870: \$? = $ac_status" >&5
+  echo "$as_me:11869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11878,7 +11877,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11886,10 +11885,10 @@ echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11892 "configure"
+#line 11891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11904,16 +11903,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11910: \$? = $ac_status" >&5
+  echo "$as_me:11909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11916: \$? = $ac_status" >&5
+  echo "$as_me:11915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11929,7 +11928,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11932: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11931: 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
@@ -12042,10 +12041,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12048 "configure"
+#line 12047 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12063,23 +12062,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12069: \$? = $ac_status" >&5
+  echo "$as_me:12068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12075: \$? = $ac_status" >&5
+  echo "$as_me:12074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12082: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12081: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12102,7 +12101,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12114,7 +12113,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12202,7 +12201,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12212,7 +12211,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12222,7 +12221,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12225: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12224: 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"
@@ -12234,10 +12233,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12237: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12236: 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 12240 "configure"
+#line 12239 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12252,16 +12251,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12258: \$? = $ac_status" >&5
+  echo "$as_me:12257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12264: \$? = $ac_status" >&5
+  echo "$as_me:12263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12270,12 +12269,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12273: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12272: 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 12278 "configure"
+#line 12277 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12290,16 +12289,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12302: \$? = $ac_status" >&5
+  echo "$as_me:12301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12310,19 +12309,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12318: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12317: 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 12325 "configure"
+#line 12324 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12340,16 +12339,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12346: \$? = $ac_status" >&5
+  echo "$as_me:12345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12352: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12361,7 +12360,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12364 "configure"
+#line 12363 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12379,16 +12378,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12385: \$? = $ac_status" >&5
+  echo "$as_me:12384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12391: \$? = $ac_status" >&5
+  echo "$as_me:12390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12403,7 +12402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12554,14 +12553,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12557: checking if SIGWINCH is defined" >&5
+echo "$as_me:12556: 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 12564 "configure"
+#line 12563 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12576,23 +12575,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12582: \$? = $ac_status" >&5
+  echo "$as_me:12581: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12588: \$? = $ac_status" >&5
+  echo "$as_me:12587: \$? = $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 12595 "configure"
+#line 12594 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12610,16 +12609,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12616: \$? = $ac_status" >&5
+  echo "$as_me:12615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12622: \$? = $ac_status" >&5
+  echo "$as_me:12621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12633,11 +12632,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12636: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12635: 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:12640: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12639: 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
@@ -12648,7 +12647,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12651 "configure"
+#line 12650 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12670,16 +12669,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12676: \$? = $ac_status" >&5
+  echo "$as_me:12675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12682: \$? = $ac_status" >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12693,7 +12692,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12703,13 +12702,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12706: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12705: 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 12712 "configure"
+#line 12711 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12723,16 +12722,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12729: \$? = $ac_status" >&5
+  echo "$as_me:12728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12735: \$? = $ac_status" >&5
+  echo "$as_me:12734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12743,7 +12742,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12757,7 +12756,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12760: checking if you want wide-character code" >&5
+echo "$as_me:12759: 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.
@@ -12767,7 +12766,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12770: result: $with_widec" >&5
+echo "$as_me:12769: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12789,7 +12788,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12792: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12791: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12802,23 +12801,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12805: checking for $ac_header" >&5
+echo "$as_me:12804: 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 12811 "configure"
+#line 12810 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12815: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12814: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12821: \$? = $ac_status" >&5
+  echo "$as_me:12820: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12837,7 +12836,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12840: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12839: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12847,14 +12846,14 @@ EOF
 fi
 done
 
-echo "$as_me:12850: checking if wchar.h can be used as is" >&5
+echo "$as_me:12849: 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 12857 "configure"
+#line 12856 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12876,16 +12875,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12882: \$? = $ac_status" >&5
+  echo "$as_me:12881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12888: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12895,16 +12894,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12898: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12897: 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:12904: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12903: 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 12907 "configure"
+#line 12906 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12920,16 +12919,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12926: \$? = $ac_status" >&5
+  echo "$as_me:12925: \$? = $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:12928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12932: \$? = $ac_status" >&5
+  echo "$as_me:12931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12938,16 +12937,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12941: result: $cf_result" >&5
+echo "$as_me:12940: 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:12947: checking checking for compatible value versus " >&5
+	echo "$as_me:12946: 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 12950 "configure"
+#line 12949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12963,16 +12962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12969: \$? = $ac_status" >&5
+  echo "$as_me:12968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12975: \$? = $ac_status" >&5
+  echo "$as_me:12974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12981,7 +12980,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12984: result: $cf_result" >&5
+	echo "$as_me:12983: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12991,7 +12990,7 @@ fi
 
 fi
 
-echo "$as_me:12994: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12993: 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
@@ -13062,7 +13061,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13065 "configure"
+#line 13064 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13107,15 +13106,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13113: \$? = $ac_status" >&5
+  echo "$as_me:13112: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13118: \$? = $ac_status" >&5
+  echo "$as_me:13117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13128,7 +13127,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13139,13 +13138,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13142: checking for $ac_func" >&5
+echo "$as_me:13141: 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 13148 "configure"
+#line 13147 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13176,16 +13175,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13182: \$? = $ac_status" >&5
+  echo "$as_me:13181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13188: \$? = $ac_status" >&5
+  echo "$as_me:13187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13195,7 +13194,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13198: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13197: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13210,23 +13209,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13213: checking for $ac_header" >&5
+echo "$as_me:13212: 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 13219 "configure"
+#line 13218 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13222: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13229: \$? = $ac_status" >&5
+  echo "$as_me:13228: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13245,7 +13244,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13247: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13255,7 +13254,7 @@ EOF
 fi
 done
 
-echo "$as_me:13258: checking for multibyte character support" >&5
+echo "$as_me:13257: 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
@@ -13263,7 +13262,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13266 "configure"
+#line 13265 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13280,16 +13279,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13286: \$? = $ac_status" >&5
+  echo "$as_me:13285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13292: \$? = $ac_status" >&5
+  echo "$as_me:13291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13301,12 +13300,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13309 "configure"
+#line 13308 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13319,16 +13318,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13325: \$? = $ac_status" >&5
+  echo "$as_me:13324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13331: \$? = $ac_status" >&5
+  echo "$as_me:13330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13342,7 +13341,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13345 "configure"
+#line 13344 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13355,16 +13354,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13361: \$? = $ac_status" >&5
+  echo "$as_me:13360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13367: \$? = $ac_status" >&5
+  echo "$as_me:13366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13381,9 +13380,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13474,7 +13473,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13482,7 +13481,7 @@ echo "${as_me:-configure}:13477: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13485 "configure"
+#line 13484 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13495,21 +13494,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13501: \$? = $ac_status" >&5
+  echo "$as_me:13500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13507: \$? = $ac_status" >&5
+  echo "$as_me:13506: \$? = $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}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13527,7 +13526,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13602,13 +13601,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13605: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13604: 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 13611 "configure"
+#line 13610 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13621,21 +13620,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13627: \$? = $ac_status" >&5
+  echo "$as_me:13626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13633: \$? = $ac_status" >&5
+  echo "$as_me:13632: \$? = $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}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13677,7 +13676,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13680: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13679: 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
@@ -13715,7 +13714,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13718 "configure"
+#line 13717 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13727,16 +13726,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13733: \$? = $ac_status" >&5
+  echo "$as_me:13732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13739: \$? = $ac_status" >&5
+  echo "$as_me:13738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13753,7 +13752,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13789,7 +13788,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13821,14 +13820,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13824: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13823: 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 13831 "configure"
+#line 13830 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13846,23 +13845,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13852: \$? = $ac_status" >&5
+  echo "$as_me:13851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13858: \$? = $ac_status" >&5
+  echo "$as_me:13857: \$? = $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 13865 "configure"
+#line 13864 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13881,16 +13880,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13887: \$? = $ac_status" >&5
+  echo "$as_me:13886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13893: \$? = $ac_status" >&5
+  echo "$as_me:13892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13902,7 +13901,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13920,14 +13919,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13923: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13922: 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 13930 "configure"
+#line 13929 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13945,23 +13944,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13951: \$? = $ac_status" >&5
+  echo "$as_me:13950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13957: \$? = $ac_status" >&5
+  echo "$as_me:13956: \$? = $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 13964 "configure"
+#line 13963 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13980,16 +13979,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13986: \$? = $ac_status" >&5
+  echo "$as_me:13985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13992: \$? = $ac_status" >&5
+  echo "$as_me:13991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14001,7 +14000,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14024,14 +14023,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14027: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14026: 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 14034 "configure"
+#line 14033 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14049,23 +14048,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14055: \$? = $ac_status" >&5
+  echo "$as_me:14054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14061: \$? = $ac_status" >&5
+  echo "$as_me:14060: \$? = $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 14068 "configure"
+#line 14067 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14084,16 +14083,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14090: \$? = $ac_status" >&5
+  echo "$as_me:14089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14096: \$? = $ac_status" >&5
+  echo "$as_me:14095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14105,7 +14104,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14108: result: $cf_cv_wint_t" >&5
+echo "$as_me:14107: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14137,7 +14136,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14140: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14139: 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.
@@ -14147,7 +14146,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14150: result: $with_lp64" >&5
+echo "$as_me:14149: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14163,7 +14162,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14166: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14165: 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
@@ -14175,7 +14174,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14178 "configure"
+#line 14177 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14195,16 +14194,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14201: \$? = $ac_status" >&5
+  echo "$as_me:14200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14207: \$? = $ac_status" >&5
+  echo "$as_me:14206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14214,16 +14213,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14220: \$? = $ac_status" >&5
+  echo "$as_me:14219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14226: \$? = $ac_status" >&5
+  echo "$as_me:14225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14237,13 +14236,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14240: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14239: 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:14246: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14245: 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
@@ -14251,7 +14250,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14254 "configure"
+#line 14253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14271,16 +14270,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14277: \$? = $ac_status" >&5
+  echo "$as_me:14276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14283: \$? = $ac_status" >&5
+  echo "$as_me:14282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14289,7 +14288,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14292 "configure"
+#line 14291 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14310,16 +14309,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14316: \$? = $ac_status" >&5
+  echo "$as_me:14315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14322: \$? = $ac_status" >&5
+  echo "$as_me:14321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14330,7 +14329,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14333: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14332: 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
 
@@ -14340,7 +14339,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14343: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14342: 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
@@ -14348,7 +14347,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14351 "configure"
+#line 14350 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14368,16 +14367,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14374: \$? = $ac_status" >&5
+  echo "$as_me:14373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14380: \$? = $ac_status" >&5
+  echo "$as_me:14379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14386,7 +14385,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14389 "configure"
+#line 14388 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14407,16 +14406,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14413: \$? = $ac_status" >&5
+  echo "$as_me:14412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14419: \$? = $ac_status" >&5
+  echo "$as_me:14418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14427,7 +14426,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14430: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14429: 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
 
@@ -14440,7 +14439,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14443: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14442: 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
@@ -14448,7 +14447,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14451 "configure"
+#line 14450 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14463,16 +14462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14469: \$? = $ac_status" >&5
+  echo "$as_me:14468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14475: \$? = $ac_status" >&5
+  echo "$as_me:14474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14481,7 +14480,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14484 "configure"
+#line 14483 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14497,16 +14496,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14503: \$? = $ac_status" >&5
+  echo "$as_me:14502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14509: \$? = $ac_status" >&5
+  echo "$as_me:14508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14517,7 +14516,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14520: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14519: 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
 
@@ -14531,13 +14530,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14534: checking for fseeko" >&5
+echo "$as_me:14533: 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 14540 "configure"
+#line 14539 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14551,16 +14550,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14557: \$? = $ac_status" >&5
+  echo "$as_me:14556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14563: \$? = $ac_status" >&5
+  echo "$as_me:14562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14570,7 +14569,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14609,14 +14608,14 @@ fi
 
 	fi
 
-	echo "$as_me:14612: checking whether to use struct dirent64" >&5
+	echo "$as_me:14611: 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 14619 "configure"
+#line 14618 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14643,16 +14642,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14649: \$? = $ac_status" >&5
+  echo "$as_me:14648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:14654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14663,7 +14662,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14673,7 +14672,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14676: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14675: 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.
@@ -14683,14 +14682,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14686: result: $with_tparm_varargs" >&5
+echo "$as_me:14685: 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:14693: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14692: 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.
@@ -14700,14 +14699,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14703: result: $with_tic_depends" >&5
+echo "$as_me:14702: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14710: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14709: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14719,15 +14718,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14722: result: no" >&5
+	echo "$as_me:14721: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14726: result: yes" >&5
+	echo "$as_me:14725: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14730: checking for X11 rgb file" >&5
+echo "$as_me:14729: 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.
@@ -14772,26 +14771,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_path="$cf_path"
-	case ".$cf_path" in
-	(.NONE/*)
+	case "x$cf_path" in
+	(xNONE/*)
 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14794: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14799,7 +14796,7 @@ esac
 
 fi
 
-echo "$as_me:14802: result: $RGB_PATH" >&5
+echo "$as_me:14799: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14814,7 +14811,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14817: checking for type of bool" >&5
+echo "$as_me:14814: 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.
@@ -14824,17 +14821,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14827: result: $NCURSES_BOOL" >&5
+echo "$as_me:14824: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14831: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14837: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14834: 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.
@@ -14846,16 +14843,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14849: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14853: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14858: checking for type of chtype" >&5
+echo "$as_me:14855: 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.
@@ -14865,11 +14862,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14868: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14872: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14877,7 +14874,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14880: checking for type of ospeed" >&5
+echo "$as_me:14877: 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.
@@ -14887,11 +14884,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14890: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14894: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14899,7 +14896,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14902: checking for type of mmask-t" >&5
+echo "$as_me:14899: 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.
@@ -14909,18 +14906,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14912: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14916: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14923: checking for size CCHARW_MAX" >&5
+echo "$as_me:14920: 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.
@@ -14930,16 +14927,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14936: checking for signed char" >&5
+echo "$as_me:14933: 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 14942 "configure"
+#line 14939 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14954,16 +14951,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14960: \$? = $ac_status" >&5
+  echo "$as_me:14957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14966: \$? = $ac_status" >&5
+  echo "$as_me:14963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14973,10 +14970,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14976: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14979: checking size of signed char" >&5
+echo "$as_me:14976: 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
@@ -14985,7 +14982,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14988 "configure"
+#line 14985 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14997,21 +14994,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15003: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15009: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15014 "configure"
+#line 15011 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15023,16 +15020,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15029: \$? = $ac_status" >&5
+  echo "$as_me:15026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15035: \$? = $ac_status" >&5
+  echo "$as_me:15032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15048,7 +15045,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15051 "configure"
+#line 15048 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15060,16 +15057,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15066: \$? = $ac_status" >&5
+  echo "$as_me:15063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15072: \$? = $ac_status" >&5
+  echo "$as_me:15069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15085,7 +15082,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15088 "configure"
+#line 15085 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15097,16 +15094,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15103: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15109: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15119,12 +15116,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15122: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15119: 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 15127 "configure"
+#line 15124 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15140,15 +15137,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15146: \$? = $ac_status" >&5
+  echo "$as_me:15143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15151: \$? = $ac_status" >&5
+  echo "$as_me:15148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15164,7 +15161,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15167: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15175,7 +15172,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15178: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15185,13 +15182,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15188: result: $with_signed_char" >&5
+echo "$as_me:15185: 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:15194: checking for type of tparm-arg" >&5
+echo "$as_me:15191: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15201,18 +15198,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15204: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15208: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15215: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15212: 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.
@@ -15222,7 +15219,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15225: result: $with_rcs_ids" >&5
+echo "$as_me:15222: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15231,7 +15228,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15234: checking format of man-pages" >&5
+echo "$as_me:15231: 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.
@@ -15322,10 +15319,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15325: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15366,7 +15363,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15369: checking for manpage renaming" >&5
+echo "$as_me:15366: 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.
@@ -15395,15 +15392,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15398: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15403: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15406: checking if manpage aliases will be installed" >&5
+echo "$as_me:15403: 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.
@@ -15414,7 +15411,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15428,7 +15425,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15431: checking if manpage symlinks should be used" >&5
+echo "$as_me:15428: 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.
@@ -15441,17 +15438,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15444: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15450: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15454: checking for manpage tbl" >&5
+echo "$as_me:15451: 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.
@@ -15462,7 +15459,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15465: result: $MANPAGE_TBL" >&5
+echo "$as_me:15462: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15780,7 +15777,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15783: checking if you want to build with function extensions" >&5
+echo "$as_me:15780: 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.
@@ -15790,7 +15787,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15793: result: $with_ext_funcs" >&5
+echo "$as_me:15790: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15847,7 +15844,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15850: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15847: 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.
@@ -15857,7 +15854,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15860: result: $with_sp_funcs" >&5
+echo "$as_me:15857: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15876,7 +15873,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15879: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15876: 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.
@@ -15886,7 +15883,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15889: result: $with_term_driver" >&5
+echo "$as_me:15886: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15895,19 +15892,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15898: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15895: 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:15903: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15900: 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:15910: checking for extended use of const keyword" >&5
+echo "$as_me:15907: 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.
@@ -15917,7 +15914,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15920: result: $with_ext_const" >&5
+echo "$as_me:15917: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15925,7 +15922,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15928: checking if you want to use extended colors" >&5
+echo "$as_me:15925: 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.
@@ -15935,12 +15932,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15938: result: $with_ext_colors" >&5
+echo "$as_me:15935: 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:15943: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15940: 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)
@@ -15951,7 +15948,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15954: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15979,7 +15976,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15982: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15979: 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.
@@ -15989,7 +15986,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15992: result: $with_ext_mouse" >&5
+echo "$as_me:15989: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15999,7 +15996,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16002: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16016,7 +16013,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16019: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16016: 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.
@@ -16026,7 +16023,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16029: result: $with_ext_putwin" >&5
+echo "$as_me:16026: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16036,7 +16033,7 @@ EOF
 
 fi
 
-echo "$as_me:16039: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16036: 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.
@@ -16046,7 +16043,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16049: result: $with_no_padding" >&5
+echo "$as_me:16046: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16054,7 +16051,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16057: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16054: 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.
@@ -16064,7 +16061,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16067: result: $with_sigwinch" >&5
+echo "$as_me:16064: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16079,7 +16076,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16082: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16079: 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.
@@ -16089,7 +16086,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16092: result: $with_tcap_names" >&5
+echo "$as_me:16089: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16103,7 +16100,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16106: checking if you want to link with the pthread library" >&5
+echo "$as_me:16103: 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.
@@ -16113,27 +16110,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16116: result: $with_pthread" >&5
+echo "$as_me:16113: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16120: checking for pthread.h" >&5
+	echo "$as_me:16117: 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 16126 "configure"
+#line 16123 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16130: \"$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:16136: \$? = $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
@@ -16152,7 +16149,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16155: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16152: 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
 
@@ -16162,7 +16159,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16165: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16162: 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"
 
@@ -16183,7 +16180,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16186 "configure"
+#line 16183 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16200,16 +16197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16206: \$? = $ac_status" >&5
+  echo "$as_me:16203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16212: \$? = $ac_status" >&5
+  echo "$as_me:16209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16219,7 +16216,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16222: result: $with_pthread" >&5
+	    echo "$as_me:16219: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16247,7 +16244,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16257,13 +16254,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16260: checking for pthread_kill" >&5
+	echo "$as_me:16257: 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 16266 "configure"
+#line 16263 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16294,16 +16291,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16300: \$? = $ac_status" >&5
+  echo "$as_me:16297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16306: \$? = $ac_status" >&5
+  echo "$as_me:16303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16313,11 +16310,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16316: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16313: 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:16320: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16317: 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.
@@ -16327,7 +16324,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16330: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16338,7 +16335,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16341: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16338: 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.
@@ -16348,18 +16345,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16351: result: $use_weak_symbols" >&5
+	echo "$as_me:16348: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16355: checking if $CC supports weak symbols" >&5
+echo "$as_me:16352: 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 16362 "configure"
+#line 16359 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16385,16 +16382,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16391: \$? = $ac_status" >&5
+  echo "$as_me:16388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16397: \$? = $ac_status" >&5
+  echo "$as_me:16394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16405,7 +16402,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16455,7 +16452,7 @@ fi
 # 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:16458: checking if you want reentrant code" >&5
+echo "$as_me:16455: 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.
@@ -16465,7 +16462,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16468: result: $with_reentrant" >&5
+echo "$as_me:16465: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16554,7 +16551,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16557: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16566,7 +16563,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16569: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16588,16 +16585,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16591: result: $enable_opaque_curses" >&5
+echo "$as_me:16588: 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:16596: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16593: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16600: checking whether form library structures should be opaque" >&5
+echo "$as_me:16597: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16614,10 +16611,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16617: result: $enable_opaque_form" >&5
+echo "$as_me:16614: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16620: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16634,10 +16631,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16637: result: $enable_opaque_menu" >&5
+echo "$as_me:16634: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16640: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16654,7 +16651,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16657: result: $enable_opaque_panel" >&5
+echo "$as_me:16654: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16664,7 +16661,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16667: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16664: 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.
@@ -16674,7 +16671,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16687,7 +16684,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16690: checking if you want all development code" >&5
+echo "$as_me:16687: 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.
@@ -16697,11 +16694,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16700: result: $with_develop" >&5
+echo "$as_me:16697: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16704: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16711,7 +16708,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16714: result: $enable_check_size" >&5
+echo "$as_me:16711: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16719,7 +16716,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16722: checking if you want hard-tabs code" >&5
+echo "$as_me:16719: 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.
@@ -16729,7 +16726,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16732: result: $enable_hard_tabs" >&5
+echo "$as_me:16729: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16737,7 +16734,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16740: checking if you want limited support for xmc" >&5
+echo "$as_me:16737: 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.
@@ -16747,7 +16744,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16750: result: $enable_xmc_glitch" >&5
+echo "$as_me:16747: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16757,7 +16754,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16760: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16757: 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.
@@ -16767,7 +16764,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16770: result: $with_assumed_color" >&5
+echo "$as_me:16767: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16775,7 +16772,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16778: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16775: 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.
@@ -16785,7 +16782,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16788: result: $with_hashmap" >&5
+echo "$as_me:16785: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16793,7 +16790,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16796: checking if you want colorfgbg code" >&5
+echo "$as_me:16793: 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.
@@ -16803,7 +16800,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16806: result: $with_colorfgbg" >&5
+echo "$as_me:16803: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16811,7 +16808,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16814: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16821,14 +16818,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16824: result: $cf_with_fvisibility" >&5
+echo "$as_me:16821: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16831: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16828: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16837,7 +16834,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16840 "configure"
+#line 16837 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16853,16 +16850,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16859: \$? = $ac_status" >&5
+  echo "$as_me:16856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16865: \$? = $ac_status" >&5
+  echo "$as_me:16862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16874,7 +16871,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16989,7 +16986,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16992: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16998,7 +16995,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17001 "configure"
+#line 16998 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17014,16 +17011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17020: \$? = $ac_status" >&5
+  echo "$as_me:17017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17026: \$? = $ac_status" >&5
+  echo "$as_me:17023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17035,7 +17032,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17158,7 +17155,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17161: checking if you want interop bindings" >&5
+echo "$as_me:17158: 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.
@@ -17168,13 +17165,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17171: result: $with_exp_interop" >&5
+echo "$as_me:17168: 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:17177: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17174: 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.
@@ -17184,13 +17181,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17187: result: $with_safe_sprintf" >&5
+echo "$as_me:17184: 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:17193: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17190: 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.
@@ -17200,7 +17197,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17203: result: $with_scroll_hints" >&5
+echo "$as_me:17200: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17209,7 +17206,7 @@ EOF
 
 fi
 
-echo "$as_me:17212: checking if you want wgetch-events code" >&5
+echo "$as_me:17209: 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.
@@ -17219,7 +17216,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17222: result: $with_wgetch_events" >&5
+echo "$as_me:17219: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17234,7 +17231,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17237: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17244,7 +17241,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17247: result: $with_exp_win32" >&5
+	echo "$as_me:17244: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17270,7 +17267,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17273: checking if you want to see long compiling messages" >&5
+echo "$as_me:17270: 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.
@@ -17304,7 +17301,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17307: result: $enableval" >&5
+echo "$as_me:17304: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17317,7 +17314,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17320: checking if you want to install stripped executables" >&5
+echo "$as_me:17317: 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.
@@ -17334,7 +17331,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17337: result: $enable_stripping" >&5
+echo "$as_me:17334: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17345,7 +17342,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17348: checking if install accepts -p option" >&5
+echo "$as_me:17345: 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
@@ -17376,10 +17373,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17379: result: $cf_cv_install_p" >&5
+echo "$as_me:17376: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17382: checking if install needs to be told about ownership" >&5
+echo "$as_me:17379: 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)
@@ -17390,7 +17387,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17393: result: $with_install_o" >&5
+echo "$as_me:17390: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17401,7 +17398,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17404: checking if you want to specify strip-program" >&5
+	echo "$as_me:17401: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17411,11 +17408,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17414: result: $with_strip_program" >&5
+	echo "$as_me:17411: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17418: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17436,11 +17433,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17439: result: $check_install_strip" >&5
+		echo "$as_me:17436: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17443: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17455,7 +17452,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17458: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17481,7 +17478,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17484: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17498,17 +17495,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17501: result: $enable_stdnoreturn" >&5
+echo "$as_me:17498: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17505: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17511 "configure"
+#line 17508 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17524,16 +17521,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17530: \$? = $ac_status" >&5
+  echo "$as_me:17527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17536: \$? = $ac_status" >&5
+  echo "$as_me:17533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17544,7 +17541,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17600,16 +17597,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17603: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17608: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17648,16 +17645,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17651: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17656: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17696,23 +17693,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17699: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17704: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17708: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17715: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17712: 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.
@@ -17729,7 +17726,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17732: result: $enable_warnings" >&5
+echo "$as_me:17729: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17753,7 +17750,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17756 "configure"
+#line 17753 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17768,26 +17765,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17774: \$? = $ac_status" >&5
+  echo "$as_me:17771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17780: \$? = $ac_status" >&5
+  echo "$as_me:17777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17783: checking for X11/Xt const-feature" >&5
+echo "$as_me:17780: 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 17790 "configure"
+#line 17787 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17805,16 +17802,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17811: \$? = $ac_status" >&5
+  echo "$as_me:17808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17817: \$? = $ac_status" >&5
+  echo "$as_me:17814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17829,7 +17826,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17832: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17858,7 +17855,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17861 "${as_me:-configure}"
+#line 17858 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17874,7 +17871,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17877: checking for $CC warning options..." >&5
+	{ echo "$as_me:17874: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17890,12 +17887,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17896: \$? = $ac_status" >&5
+  echo "$as_me:17893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17903,7 +17900,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17906: checking for $CC warning options..." >&5
+	{ echo "$as_me:17903: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17926,12 +17923,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17929: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17932: \$? = $ac_status" >&5
+  echo "$as_me:17929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17939,7 +17936,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17949,7 +17946,7 @@ echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17982,10 +17979,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17985: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17988 "${as_me:-configure}"
+#line 17985 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18035,12 +18032,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18041: \$? = $ac_status" >&5
+  echo "$as_me:18038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18112,12 +18109,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18115: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18112: 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 18120 "configure"
+#line 18117 "configure"
 #include "confdefs.h"
 
 int
@@ -18134,16 +18131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18140: \$? = $ac_status" >&5
+  echo "$as_me:18137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18146: \$? = $ac_status" >&5
+  echo "$as_me:18143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18154,7 +18151,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18157: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18163,11 +18160,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18166: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18163: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18170 "configure"
+#line 18167 "configure"
 #include "confdefs.h"
 
 int
@@ -18184,16 +18181,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18190: \$? = $ac_status" >&5
+  echo "$as_me:18187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18196: \$? = $ac_status" >&5
+  echo "$as_me:18193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18203,7 +18200,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18206: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18212,30 +18209,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18215: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18222: checking version of $CC" >&5
+	echo "$as_me:18219: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18226: result: $CLANG_VERSION" >&5
+	echo "$as_me:18223: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18233: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18230: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18238 "configure"
+#line 18235 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18249,16 +18246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18255: \$? = $ac_status" >&5
+  echo "$as_me:18252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18261: \$? = $ac_status" >&5
+  echo "$as_me:18258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18269,13 +18266,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18272: result: $cf_clang_optok" >&5
+		echo "$as_me:18269: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18278: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18292,7 +18289,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18295 "configure"
+#line 18292 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18310,7 +18307,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18313: checking for $CC warning options..." >&5
+	{ echo "$as_me:18310: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18327,12 +18324,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18333: \$? = $ac_status" >&5
+  echo "$as_me:18330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18341,7 +18338,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18344: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18371,16 +18368,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18377: \$? = $ac_status" >&5
+  echo "$as_me:18374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18383: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18398,7 +18395,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18401: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18398: 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.
@@ -18408,7 +18405,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18411: result: $enable_string_hacks" >&5
+echo "$as_me:18408: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18417,15 +18414,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18420: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18417: 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:18422: checking for strlcat" >&5
+	echo "$as_me:18419: 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 18428 "configure"
+#line 18425 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18456,16 +18453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18462: \$? = $ac_status" >&5
+  echo "$as_me:18459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18468: \$? = $ac_status" >&5
+  echo "$as_me:18465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18475,7 +18472,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18478: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18485,7 +18482,7 @@ EOF
 
 else
 
-		echo "$as_me:18488: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18485: 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
@@ -18493,7 +18490,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18496 "configure"
+#line 18493 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18512,16 +18509,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18518: \$? = $ac_status" >&5
+  echo "$as_me:18515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18524: \$? = $ac_status" >&5
+  echo "$as_me:18521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18532,7 +18529,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18535: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18532: 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
 
@@ -18555,23 +18552,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18558: checking for $ac_header" >&5
+echo "$as_me:18555: 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 18564 "configure"
+#line 18561 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18574: \$? = $ac_status" >&5
+  echo "$as_me:18571: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18590,7 +18587,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18593: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18611,13 +18608,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18614: checking for $ac_func" >&5
+echo "$as_me:18611: 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 18620 "configure"
+#line 18617 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18648,16 +18645,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18654: \$? = $ac_status" >&5
+  echo "$as_me:18651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18660: \$? = $ac_status" >&5
+  echo "$as_me:18657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18667,7 +18664,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18670: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18680,7 +18677,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18683: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18680: 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.
@@ -18690,7 +18687,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18693: result: $with_assertions" >&5
+echo "$as_me:18690: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18706,7 +18703,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18709: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18706: 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.
@@ -18728,7 +18725,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18842,23 +18839,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18845: checking for dmalloc.h" >&5
+	echo "$as_me:18842: 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 18851 "configure"
+#line 18848 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18855: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18861: \$? = $ac_status" >&5
+  echo "$as_me:18858: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18877,11 +18874,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18880: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18877: 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:18884: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18881: 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
@@ -18889,7 +18886,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18892 "configure"
+#line 18889 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18908,16 +18905,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18914: \$? = $ac_status" >&5
+  echo "$as_me:18911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18920: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18928,7 +18925,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18931: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18943,7 +18940,7 @@ fi
 
 fi
 
-echo "$as_me:18946: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18943: 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.
@@ -18965,7 +18962,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19079,23 +19076,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19082: checking for dbmalloc.h" >&5
+	echo "$as_me:19079: 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 19088 "configure"
+#line 19085 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19092: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19098: \$? = $ac_status" >&5
+  echo "$as_me:19095: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19114,11 +19111,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19117: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19114: 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:19121: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19118: 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
@@ -19126,7 +19123,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19129 "configure"
+#line 19126 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19145,16 +19142,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19151: \$? = $ac_status" >&5
+  echo "$as_me:19148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19157: \$? = $ac_status" >&5
+  echo "$as_me:19154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19165,7 +19162,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19168: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19165: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19180,7 +19177,7 @@ fi
 
 fi
 
-echo "$as_me:19183: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19180: 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.
@@ -19202,7 +19199,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19315,7 +19312,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19318: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19315: 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.
@@ -19326,7 +19323,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19329: result: $with_no_leaks" >&5
+echo "$as_me:19326: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19378,7 +19375,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19381: checking whether to add trace feature to all models" >&5
+echo "$as_me:19378: 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.
@@ -19388,7 +19385,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19391: result: $cf_with_trace" >&5
+echo "$as_me:19388: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19408,7 +19405,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19411: checking if we want to use GNAT projects" >&5
+echo "$as_me:19408: 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.
@@ -19425,7 +19422,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19428: result: $enable_gnat_projects" >&5
+echo "$as_me:19425: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19438,14 +19435,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19441: checking if ssp library is needed" >&5
+echo "$as_me:19438: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19448 "configure"
+#line 19445 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19462,16 +19459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19468: \$? = $ac_status" >&5
+  echo "$as_me:19465: \$? = $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:19468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19474: \$? = $ac_status" >&5
+  echo "$as_me:19471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19481,7 +19478,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19484 "configure"
+#line 19481 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19498,16 +19495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19504: \$? = $ac_status" >&5
+  echo "$as_me:19501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19510: \$? = $ac_status" >&5
+  echo "$as_me:19507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19521,7 +19518,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19524: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19550,14 +19547,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19553: checking if -lm needed for math functions" >&5
+echo "$as_me:19550: 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 19560 "configure"
+#line 19557 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19573,16 +19570,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19579: \$? = $ac_status" >&5
+  echo "$as_me:19576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19585: \$? = $ac_status" >&5
+  echo "$as_me:19582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19592,7 +19589,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19595: result: $cf_cv_need_libm" >&5
+echo "$as_me:19592: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19600,14 +19597,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19603: checking if -lm is available for math functions" >&5
+	echo "$as_me:19600: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19610 "configure"
+#line 19607 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19623,16 +19620,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19629: \$? = $ac_status" >&5
+  echo "$as_me:19626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19635: \$? = $ac_status" >&5
+  echo "$as_me:19632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19642,7 +19639,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19645: result: $cf_cv_have_libm" >&5
+echo "$as_me:19642: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19664,13 +19661,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19667: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19664: 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 19673 "configure"
+#line 19670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19686,16 +19683,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19692: \$? = $ac_status" >&5
+  echo "$as_me:19689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19698: \$? = $ac_status" >&5
+  echo "$as_me:19695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19705,7 +19702,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19708: result: $ac_cv_header_time" >&5
+echo "$as_me:19705: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19720,7 +19717,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19723: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19728,7 +19725,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19731 "configure"
+#line 19728 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19747,16 +19744,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19753: \$? = $ac_status" >&5
+  echo "$as_me:19750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19759: \$? = $ac_status" >&5
+  echo "$as_me:19756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19767,11 +19764,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19770: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19774: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19771: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19779,7 +19776,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19782 "configure"
+#line 19779 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19798,16 +19795,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19804: \$? = $ac_status" >&5
+  echo "$as_me:19801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19810: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19818,7 +19815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19821: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19840,7 +19837,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19843: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19848,7 +19845,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19851 "configure"
+#line 19848 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19867,16 +19864,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19873: \$? = $ac_status" >&5
+  echo "$as_me:19870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19879: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19887,7 +19884,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19890: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19909,7 +19906,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19912: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19917,7 +19914,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19920 "configure"
+#line 19917 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19936,16 +19933,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19942: \$? = $ac_status" >&5
+  echo "$as_me:19939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19948: \$? = $ac_status" >&5
+  echo "$as_me:19945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19956,7 +19953,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19959: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19998,7 +19995,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20001: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20006,7 +20003,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20009 "configure"
+#line 20006 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20025,16 +20022,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20031: \$? = $ac_status" >&5
+  echo "$as_me:20028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20037: \$? = $ac_status" >&5
+  echo "$as_me:20034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20045,7 +20042,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20048: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20073,13 +20070,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20076: checking for regcomp" >&5
+	echo "$as_me:20073: 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 20082 "configure"
+#line 20079 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20110,16 +20107,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20116: \$? = $ac_status" >&5
+  echo "$as_me:20113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20122: \$? = $ac_status" >&5
+  echo "$as_me:20119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20129,7 +20126,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20132: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20129: 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
@@ -20138,7 +20135,7 @@ else
 		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:20141: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20138: 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
@@ -20146,7 +20143,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20149 "configure"
+#line 20146 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20165,16 +20162,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20171: \$? = $ac_status" >&5
+  echo "$as_me:20168: \$? = $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:20171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20177: \$? = $ac_status" >&5
+  echo "$as_me:20174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20185,7 +20182,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20188: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20185: 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
 
@@ -20217,13 +20214,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20220: checking for compile" >&5
+	echo "$as_me:20217: 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 20226 "configure"
+#line 20223 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20254,16 +20251,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20260: \$? = $ac_status" >&5
+  echo "$as_me:20257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20266: \$? = $ac_status" >&5
+  echo "$as_me:20263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20273,13 +20270,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20276: result: $ac_cv_func_compile" >&5
+echo "$as_me:20273: 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:20282: checking for compile in -lgen" >&5
+		echo "$as_me:20279: 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
@@ -20287,7 +20284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20290 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20306,16 +20303,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20312: \$? = $ac_status" >&5
+  echo "$as_me:20309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20318: \$? = $ac_status" >&5
+  echo "$as_me:20315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20326,7 +20323,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20329: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20326: 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
 
@@ -20354,11 +20351,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20357: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20361: checking for regular-expression headers" >&5
+echo "$as_me:20358: 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
@@ -20370,7 +20367,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20373 "configure"
+#line 20370 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20387,16 +20384,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20393: \$? = $ac_status" >&5
+  echo "$as_me:20390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20399: \$? = $ac_status" >&5
+  echo "$as_me:20396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20413,7 +20410,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20416 "configure"
+#line 20413 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20433,16 +20430,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20439: \$? = $ac_status" >&5
+  echo "$as_me:20436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20445: \$? = $ac_status" >&5
+  echo "$as_me:20442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20458,11 +20455,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20461: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20465: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20500,23 +20497,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20503: checking for $ac_header" >&5
+echo "$as_me:20500: 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 20509 "configure"
+#line 20506 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20519: \$? = $ac_status" >&5
+  echo "$as_me:20516: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20535,7 +20532,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20545,26 +20542,26 @@ EOF
 fi
 done
 
-for ac_header in unistd.h getopt.h
+for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20551: checking for $ac_header" >&5
+echo "$as_me:20548: 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 20557 "configure"
+#line 20554 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20561: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20567: \$? = $ac_status" >&5
+  echo "$as_me:20564: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20583,7 +20580,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20586: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20593,7 +20590,7 @@ EOF
 fi
 done
 
-echo "$as_me:20596: checking for header declaring getopt variables" >&5
+echo "$as_me:20593: 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
@@ -20603,7 +20600,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20606 "configure"
+#line 20603 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20616,16 +20613,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20622: \$? = $ac_status" >&5
+  echo "$as_me:20619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20628: \$? = $ac_status" >&5
+  echo "$as_me:20625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20637,7 +20634,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20654,14 +20651,14 @@ EOF
 
 fi
 
-echo "$as_me:20657: checking if external environ is declared" >&5
+echo "$as_me:20654: 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 20664 "configure"
+#line 20661 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20674,16 +20671,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20680: \$? = $ac_status" >&5
+  echo "$as_me:20677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20686: \$? = $ac_status" >&5
+  echo "$as_me:20683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20694,7 +20691,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20709,14 +20706,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20712: checking if external environ exists" >&5
+echo "$as_me:20709: 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 20719 "configure"
+#line 20716 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20731,16 +20728,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20737: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20743: \$? = $ac_status" >&5
+  echo "$as_me:20740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20751,7 +20748,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20754: result: $cf_cv_have_environ" >&5
+echo "$as_me:20751: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20764,13 +20761,13 @@ EOF
 
 fi
 
-echo "$as_me:20767: checking for getenv" >&5
+echo "$as_me:20764: 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 20773 "configure"
+#line 20770 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20801,16 +20798,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20807: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $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:20807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20813: \$? = $ac_status" >&5
+  echo "$as_me:20810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20820,19 +20817,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20823: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20820: 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:20829: checking for $ac_func" >&5
+echo "$as_me:20826: 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 20835 "configure"
+#line 20832 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20863,16 +20860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20869: \$? = $ac_status" >&5
+  echo "$as_me:20866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20875: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20882,7 +20879,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20892,7 +20889,7 @@ EOF
 fi
 done
 
-echo "$as_me:20895: checking if getenv returns consistent values" >&5
+echo "$as_me:20892: 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
@@ -20902,7 +20899,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20905 "configure"
+#line 20902 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21007,15 +21004,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21013: \$? = $ac_status" >&5
+  echo "$as_me:21010: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21018: \$? = $ac_status" >&5
+  echo "$as_me:21015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21028,7 +21025,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21043,18 +21040,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21046: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21043: 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
 
-echo "$as_me:21050: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21047: 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 21057 "configure"
+#line 21054 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21074,16 +21071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21080: \$? = $ac_status" >&5
+  echo "$as_me:21077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21086: \$? = $ac_status" >&5
+  echo "$as_me:21083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21095,7 +21092,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21098: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21095: 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
@@ -21110,13 +21107,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21113: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21110: 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 21119 "configure"
+#line 21116 "configure"
 #include "confdefs.h"
 
 int
@@ -21178,16 +21175,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21184: \$? = $ac_status" >&5
+  echo "$as_me:21181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21190: \$? = $ac_status" >&5
+  echo "$as_me:21187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21197,7 +21194,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21200: result: $ac_cv_c_const" >&5
+echo "$as_me:21197: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21207,7 +21204,7 @@ EOF
 
 fi
 
-echo "$as_me:21210: checking for inline" >&5
+echo "$as_me:21207: 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
@@ -21215,7 +21212,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21218 "configure"
+#line 21215 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21224,16 +21221,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21230: \$? = $ac_status" >&5
+  echo "$as_me:21227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21236: \$? = $ac_status" >&5
+  echo "$as_me:21233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21244,7 +21241,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21247: result: $ac_cv_c_inline" >&5
+echo "$as_me:21244: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21270,7 +21267,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21273: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21270: 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
@@ -21279,7 +21276,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21282 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21291,16 +21288,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21297: \$? = $ac_status" >&5
+  echo "$as_me:21294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21303: \$? = $ac_status" >&5
+  echo "$as_me:21300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21312,7 +21309,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21418,7 +21415,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21421: checking for signal global datatype" >&5
+echo "$as_me:21418: 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
@@ -21430,7 +21427,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21433 "configure"
+#line 21430 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21454,16 +21451,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21460: \$? = $ac_status" >&5
+  echo "$as_me:21457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21466: \$? = $ac_status" >&5
+  echo "$as_me:21463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21477,7 +21474,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21480: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21477: 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 <<EOF
@@ -21486,7 +21483,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21489: checking for type of chtype" >&5
+echo "$as_me:21486: 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
@@ -21496,7 +21493,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21499 "configure"
+#line 21496 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21531,15 +21528,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21537: \$? = $ac_status" >&5
+  echo "$as_me:21534: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:21539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21554,7 +21551,7 @@ fi
 
 fi
 
-echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21566,14 +21563,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21569: checking if unsigned literals are legal" >&5
+echo "$as_me:21566: 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 21576 "configure"
+#line 21573 "configure"
 #include "confdefs.h"
 
 int
@@ -21585,16 +21582,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21591: \$? = $ac_status" >&5
+  echo "$as_me:21588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21597: \$? = $ac_status" >&5
+  echo "$as_me:21594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21606,7 +21603,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21622,14 +21619,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21625: checking if external errno is declared" >&5
+echo "$as_me:21622: 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 21632 "configure"
+#line 21629 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21643,16 +21640,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21649: \$? = $ac_status" >&5
+  echo "$as_me:21646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21655: \$? = $ac_status" >&5
+  echo "$as_me:21652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21663,7 +21660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21678,14 +21675,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21681: checking if external errno exists" >&5
+echo "$as_me:21678: 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 21688 "configure"
+#line 21685 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21700,16 +21697,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21706: \$? = $ac_status" >&5
+  echo "$as_me:21703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21712: \$? = $ac_status" >&5
+  echo "$as_me:21709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21720,7 +21717,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21723: result: $cf_cv_have_errno" >&5
+echo "$as_me:21720: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21733,7 +21730,7 @@ EOF
 
 fi
 
-echo "$as_me:21736: checking if data-only library module links" >&5
+echo "$as_me:21733: 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
@@ -21741,20 +21738,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21744 "configure"
+#line 21741 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21747: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21750: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $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 <<EOF
-#line 21757 "configure"
+#line 21754 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21771,10 +21768,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21777: \$? = $ac_status" >&5
+  echo "$as_me:21774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21787,7 +21784,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21790 "configure"
+#line 21787 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21798,15 +21795,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21804: \$? = $ac_status" >&5
+  echo "$as_me:21801: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21809: \$? = $ac_status" >&5
+  echo "$as_me:21806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21821,7 +21818,7 @@ fi
 
 fi
 
-echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21836,13 +21833,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21839: checking for clock_gettime" >&5
+echo "$as_me:21836: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21845 "configure"
+#line 21842 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21873,16 +21870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21879: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21885: \$? = $ac_status" >&5
+  echo "$as_me:21882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21892,12 +21889,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21895: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21900: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21905,7 +21902,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21908 "configure"
+#line 21905 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21924,16 +21921,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21930: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21936: \$? = $ac_status" >&5
+  echo "$as_me:21933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21944,7 +21941,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21947: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21956,14 +21953,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21959: checking if clock_gettime links" >&5
+echo "$as_me:21956: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21966 "configure"
+#line 21963 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21981,16 +21978,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21987: \$? = $ac_status" >&5
+  echo "$as_me:21984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21993: \$? = $ac_status" >&5
+  echo "$as_me:21990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22001,7 +21998,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22004: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22015,13 +22012,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22018: checking for gettimeofday" >&5
+echo "$as_me:22015: 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 22024 "configure"
+#line 22021 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22052,16 +22049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22058: \$? = $ac_status" >&5
+  echo "$as_me:22055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22064: \$? = $ac_status" >&5
+  echo "$as_me:22061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22071,7 +22068,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22074: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22081,7 +22078,7 @@ EOF
 
 else
 
-echo "$as_me:22084: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22081: 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
@@ -22089,7 +22086,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22092 "configure"
+#line 22089 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22108,16 +22105,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22114: \$? = $ac_status" >&5
+  echo "$as_me:22111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22120: \$? = $ac_status" >&5
+  echo "$as_me:22117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22128,7 +22125,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22131: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22128: 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
 
@@ -22187,13 +22184,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22190: checking for $ac_func" >&5
+echo "$as_me:22187: 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 22196 "configure"
+#line 22193 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22224,16 +22221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22230: \$? = $ac_status" >&5
+  echo "$as_me:22227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22236: \$? = $ac_status" >&5
+  echo "$as_me:22233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22243,7 +22240,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22246: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22253,14 +22250,14 @@ EOF
 fi
 done
 
-echo "$as_me:22256: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22263 "configure"
+#line 22260 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22275,16 +22272,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22281: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22287: \$? = $ac_status" >&5
+  echo "$as_me:22284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22294,7 +22291,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22316,7 +22313,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22319: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22326,7 +22323,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22329 "configure"
+#line 22326 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22339,15 +22336,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22345: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22350: \$? = $ac_status" >&5
+  echo "$as_me:22347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22359,7 +22356,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22362: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22371,14 +22368,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22374: checking for getttynam" >&5
+	echo "$as_me:22371: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22381 "configure"
+#line 22378 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22390,16 +22387,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22396: \$? = $ac_status" >&5
+  echo "$as_me:22393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22402: \$? = $ac_status" >&5
+  echo "$as_me:22399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22409,7 +22406,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22412: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22419,7 +22416,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22422: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22428,7 +22425,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22431: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22441,14 +22438,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22444: checking for terminal-capability database functions" >&5
+echo "$as_me:22441: 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 22451 "configure"
+#line 22448 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22468,16 +22465,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22474: \$? = $ac_status" >&5
+  echo "$as_me:22471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22480: \$? = $ac_status" >&5
+  echo "$as_me:22477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22488,7 +22485,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22491: result: $cf_cv_cgetent" >&5
+echo "$as_me:22488: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22498,14 +22495,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22501: checking if cgetent uses const parameter" >&5
+echo "$as_me:22498: 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 22508 "configure"
+#line 22505 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22528,16 +22525,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22534: \$? = $ac_status" >&5
+  echo "$as_me:22531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22540: \$? = $ac_status" >&5
+  echo "$as_me:22537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22548,7 +22545,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22551: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22562,14 +22559,14 @@ fi
 
 fi
 
-echo "$as_me:22565: checking for isascii" >&5
+echo "$as_me:22562: 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 22572 "configure"
+#line 22569 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22581,16 +22578,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22587: \$? = $ac_status" >&5
+  echo "$as_me:22584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22593: \$? = $ac_status" >&5
+  echo "$as_me:22590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22601,7 +22598,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22604: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22609,10 +22606,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22612: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22609: 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 22615 "configure"
+#line 22612 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22626,16 +22623,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22632: \$? = $ac_status" >&5
+  echo "$as_me:22629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22638: \$? = $ac_status" >&5
+  echo "$as_me:22635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22643,7 +22640,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22646 "configure"
+#line 22643 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22658,16 +22655,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22664: \$? = $ac_status" >&5
+  echo "$as_me:22661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22670: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22683,11 +22680,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22686: result: $sigact_bad" >&5
+echo "$as_me:22683: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22690: checking if nanosleep really works" >&5
+echo "$as_me:22687: 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
@@ -22697,7 +22694,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22700 "configure"
+#line 22697 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22723,15 +22720,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22734: \$? = $ac_status" >&5
+  echo "$as_me:22731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22743,7 +22740,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22746: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22760,23 +22757,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22763: checking for $ac_header" >&5
+echo "$as_me:22760: 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 22769 "configure"
+#line 22766 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22779: \$? = $ac_status" >&5
+  echo "$as_me:22776: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22795,7 +22792,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22798: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22812,10 +22809,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22815: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22812: 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 22818 "configure"
+#line 22815 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22827,16 +22824,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22833: \$? = $ac_status" >&5
+  echo "$as_me:22830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22839: \$? = $ac_status" >&5
+  echo "$as_me:22836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22844,7 +22841,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22847 "configure"
+#line 22844 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22858,16 +22855,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22864: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:22867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22883,19 +22880,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22886: result: $termios_bad" >&5
+	echo "$as_me:22883: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22891: checking for tcgetattr" >&5
+echo "$as_me:22888: 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 22898 "configure"
+#line 22895 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22923,16 +22920,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22929: \$? = $ac_status" >&5
+  echo "$as_me:22926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22935: \$? = $ac_status" >&5
+  echo "$as_me:22932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22942,21 +22939,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22945: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22942: 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:22952: checking for vsscanf function or workaround" >&5
+echo "$as_me:22949: 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 22959 "configure"
+#line 22956 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22982,16 +22979,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22988: \$? = $ac_status" >&5
+  echo "$as_me:22985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22994: \$? = $ac_status" >&5
+  echo "$as_me:22991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22999,7 +22996,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23002 "configure"
+#line 22999 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23021,16 +23018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23027: \$? = $ac_status" >&5
+  echo "$as_me:23024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23033: \$? = $ac_status" >&5
+  echo "$as_me:23030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23038,7 +23035,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23041 "configure"
+#line 23038 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23060,16 +23057,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23066: \$? = $ac_status" >&5
+  echo "$as_me:23063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23072: \$? = $ac_status" >&5
+  echo "$as_me:23069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23084,7 +23081,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23087: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23110,23 +23107,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23113: checking for $ac_header" >&5
+echo "$as_me:23110: 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 23119 "configure"
+#line 23116 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23123: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23129: \$? = $ac_status" >&5
+  echo "$as_me:23126: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23145,7 +23142,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23148: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23155,7 +23152,7 @@ EOF
 fi
 done
 
-echo "$as_me:23158: checking for working mkstemp" >&5
+echo "$as_me:23155: 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
@@ -23166,7 +23163,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23169 "configure"
+#line 23166 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23201,15 +23198,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23207: \$? = $ac_status" >&5
+  echo "$as_me:23204: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23212: \$? = $ac_status" >&5
+  echo "$as_me:23209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23224,16 +23221,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23227: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23224: 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:23230: checking for mkstemp" >&5
+	echo "$as_me:23227: 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 23236 "configure"
+#line 23233 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23264,16 +23261,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23270: \$? = $ac_status" >&5
+  echo "$as_me:23267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23276: \$? = $ac_status" >&5
+  echo "$as_me:23273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23283,7 +23280,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23286: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23304,21 +23301,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23307: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23304: 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:23310: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23307: 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:23316: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23313: 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 23321 "configure"
+#line 23318 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23335,15 +23332,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23341: \$? = $ac_status" >&5
+  echo "$as_me:23338: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23346: \$? = $ac_status" >&5
+  echo "$as_me:23343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23356,7 +23353,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23359: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23356: 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
 
@@ -23367,13 +23364,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23370: checking for intptr_t" >&5
+echo "$as_me:23367: 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 23376 "configure"
+#line 23373 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23388,16 +23385,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23394: \$? = $ac_status" >&5
+  echo "$as_me:23391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23400: \$? = $ac_status" >&5
+  echo "$as_me:23397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23407,7 +23404,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23410: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23407: 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
   :
@@ -23419,13 +23416,13 @@ EOF
 
 fi
 
-echo "$as_me:23422: checking for ssize_t" >&5
+echo "$as_me:23419: 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 23428 "configure"
+#line 23425 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23440,16 +23437,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23446: \$? = $ac_status" >&5
+  echo "$as_me:23443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23452: \$? = $ac_status" >&5
+  echo "$as_me:23449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23459,7 +23456,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23462: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23459: 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
   :
@@ -23471,14 +23468,14 @@ EOF
 
 fi
 
-echo "$as_me:23474: checking for type sigaction_t" >&5
+echo "$as_me:23471: 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 23481 "configure"
+#line 23478 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23491,16 +23488,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23497: \$? = $ac_status" >&5
+  echo "$as_me:23494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23503: \$? = $ac_status" >&5
+  echo "$as_me:23500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23511,14 +23508,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23514: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23511: 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:23521: checking declaration of size-change" >&5
+echo "$as_me:23518: 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
@@ -23539,7 +23536,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23542 "configure"
+#line 23539 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23589,16 +23586,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23595: \$? = $ac_status" >&5
+  echo "$as_me:23592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23601: \$? = $ac_status" >&5
+  echo "$as_me:23598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23617,7 +23614,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23620: result: $cf_cv_sizechange" >&5
+echo "$as_me:23617: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23635,13 +23632,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23638: checking for memmove" >&5
+echo "$as_me:23635: 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 23644 "configure"
+#line 23641 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23672,16 +23669,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23678: \$? = $ac_status" >&5
+  echo "$as_me:23675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23684: \$? = $ac_status" >&5
+  echo "$as_me:23681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23691,19 +23688,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23694: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23691: 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:23700: checking for bcopy" >&5
+echo "$as_me:23697: 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 23706 "configure"
+#line 23703 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23734,16 +23731,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23740: \$? = $ac_status" >&5
+  echo "$as_me:23737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23746: \$? = $ac_status" >&5
+  echo "$as_me:23743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23753,11 +23750,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23756: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23753: 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:23760: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23757: 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
@@ -23767,7 +23764,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23770 "configure"
+#line 23767 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23783,15 +23780,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23789: \$? = $ac_status" >&5
+  echo "$as_me:23786: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23794: \$? = $ac_status" >&5
+  echo "$as_me:23791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23804,7 +23801,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23831,13 +23828,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23834: checking for $ac_func" >&5
+echo "$as_me:23831: 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 23840 "configure"
+#line 23837 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23868,16 +23865,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23874: \$? = $ac_status" >&5
+  echo "$as_me:23871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23880: \$? = $ac_status" >&5
+  echo "$as_me:23877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23887,7 +23884,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23897,7 +23894,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23900: checking if poll really works" >&5
+echo "$as_me:23897: 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
@@ -23907,7 +23904,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23910 "configure"
+#line 23907 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23960,15 +23957,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23966: \$? = $ac_status" >&5
+  echo "$as_me:23963: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23971: \$? = $ac_status" >&5
+  echo "$as_me:23968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23980,21 +23977,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23983: result: $cf_cv_working_poll" >&5
+echo "$as_me:23980: 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:23990: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:23987: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23997 "configure"
+#line 23994 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24014,16 +24011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24020: \$? = $ac_status" >&5
+  echo "$as_me:24017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24026: \$? = $ac_status" >&5
+  echo "$as_me:24023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24033,7 +24030,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24036: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24043,18 +24040,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24046: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24050: checking for va_copy" >&5
+echo "$as_me:24047: 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 24057 "configure"
+#line 24054 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24071,16 +24068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24077: \$? = $ac_status" >&5
+  echo "$as_me:24074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24083: \$? = $ac_status" >&5
+  echo "$as_me:24080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24090,7 +24087,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24093: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24102,14 +24099,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24105: checking for __va_copy" >&5
+echo "$as_me:24102: 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 24112 "configure"
+#line 24109 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24126,16 +24123,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24132: \$? = $ac_status" >&5
+  echo "$as_me:24129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24138: \$? = $ac_status" >&5
+  echo "$as_me:24135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24145,7 +24142,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24148: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24157,14 +24154,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24160: checking for __builtin_va_copy" >&5
+echo "$as_me:24157: 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 24167 "configure"
+#line 24164 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24181,16 +24178,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24187: \$? = $ac_status" >&5
+  echo "$as_me:24184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24193: \$? = $ac_status" >&5
+  echo "$as_me:24190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24200,7 +24197,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24203: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24200: 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 &&
@@ -24218,14 +24215,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24221: checking if we can simply copy va_list" >&5
+	echo "$as_me:24218: 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 24228 "configure"
+#line 24225 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24242,16 +24239,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24248: \$? = $ac_status" >&5
+  echo "$as_me:24245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24254: \$? = $ac_status" >&5
+  echo "$as_me:24251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24261,19 +24258,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24264: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24261: 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:24269: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24266: 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 24276 "configure"
+#line 24273 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24290,16 +24287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24296: \$? = $ac_status" >&5
+  echo "$as_me:24293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24302: \$? = $ac_status" >&5
+  echo "$as_me:24299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24309,7 +24306,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24312: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24309: 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
@@ -24320,13 +24317,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24323: checking for pid_t" >&5
+echo "$as_me:24320: 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 24329 "configure"
+#line 24326 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24341,16 +24338,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24347: \$? = $ac_status" >&5
+  echo "$as_me:24344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24353: \$? = $ac_status" >&5
+  echo "$as_me:24350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24360,7 +24357,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24363: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24360: 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
   :
@@ -24375,23 +24372,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24378: checking for $ac_header" >&5
+echo "$as_me:24375: 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 24384 "configure"
+#line 24381 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24388: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24394: \$? = $ac_status" >&5
+  echo "$as_me:24391: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24410,7 +24407,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24413: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24423,13 +24420,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24426: checking for $ac_func" >&5
+echo "$as_me:24423: 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 24432 "configure"
+#line 24429 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24460,16 +24457,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24466: \$? = $ac_status" >&5
+  echo "$as_me:24463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24472: \$? = $ac_status" >&5
+  echo "$as_me:24469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24479,7 +24476,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24482: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24491,7 +24488,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24494: checking for working fork" >&5
+  echo "$as_me:24491: 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
@@ -24514,15 +24511,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24520: \$? = $ac_status" >&5
+  echo "$as_me:24517: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24525: \$? = $ac_status" >&5
+  echo "$as_me:24522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24534,7 +24531,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24537: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24548,12 +24545,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24551: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24548: 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:24556: checking for working vfork" >&5
+  echo "$as_me:24553: 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
@@ -24562,7 +24559,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24565 "configure"
+#line 24562 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24655,15 +24652,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24661: \$? = $ac_status" >&5
+  echo "$as_me:24658: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24666: \$? = $ac_status" >&5
+  echo "$as_me:24663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24675,13 +24672,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24678: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24675: 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:24684: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24681: 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
 
@@ -24706,7 +24703,7 @@ EOF
 
 fi
 
-echo "$as_me:24709: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24706: 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
@@ -24716,7 +24713,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24719 "configure"
+#line 24716 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24751,15 +24748,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24757: \$? = $ac_status" >&5
+  echo "$as_me:24754: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24762: \$? = $ac_status" >&5
+  echo "$as_me:24759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24772,7 +24769,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24775: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24772: 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
@@ -24781,7 +24778,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24784: checking for openpty in -lutil" >&5
+echo "$as_me:24781: 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
@@ -24789,7 +24786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24792 "configure"
+#line 24789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24808,16 +24805,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24814: \$? = $ac_status" >&5
+  echo "$as_me:24811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24820: \$? = $ac_status" >&5
+  echo "$as_me:24817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24828,7 +24825,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24831: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24828: 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
@@ -24836,7 +24833,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24839: checking for openpty header" >&5
+echo "$as_me:24836: 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
@@ -24863,7 +24860,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24866 "configure"
+#line 24863 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24881,16 +24878,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24887: \$? = $ac_status" >&5
+  echo "$as_me:24884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24893: \$? = $ac_status" >&5
+  echo "$as_me:24890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24908,7 +24905,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24981,7 +24978,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24984 "configure"
+#line 24981 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24993,16 +24990,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24999: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25005: \$? = $ac_status" >&5
+  echo "$as_me:25002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25019,7 +25016,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25055,7 +25052,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25066,7 +25063,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25138,7 +25135,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25141 "configure"
+#line 25138 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25150,16 +25147,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25156: \$? = $ac_status" >&5
+  echo "$as_me:25153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25162: \$? = $ac_status" >&5
+  echo "$as_me:25159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25176,7 +25173,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25256,7 +25253,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25273,23 +25270,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25276: checking for db.h" >&5
+echo "$as_me:25273: 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 25282 "configure"
+#line 25279 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25289: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25308,11 +25305,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25311: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25308: 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:25315: checking for version of db" >&5
+echo "$as_me:25312: 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
@@ -25323,10 +25320,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25326: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25329 "configure"
+#line 25326 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25356,16 +25353,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25362: \$? = $ac_status" >&5
+  echo "$as_me:25359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25368: \$? = $ac_status" >&5
+  echo "$as_me:25365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25379,16 +25376,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25382: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25379: 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:25386: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25383: 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:25391: checking for db libraries" >&5
+echo "$as_me:25388: 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
@@ -25418,10 +25415,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25424 "configure"
+#line 25421 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25476,16 +25473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25482: \$? = $ac_status" >&5
+  echo "$as_me:25479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25488: \$? = $ac_status" >&5
+  echo "$as_me:25485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25505,11 +25502,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25508: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25505: 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:25512: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25509: 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
@@ -25535,7 +25532,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25538: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25550,7 +25547,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25553: checking if we should include stdbool.h" >&5
+echo "$as_me:25550: 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
@@ -25558,7 +25555,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25561 "configure"
+#line 25558 "configure"
 #include "confdefs.h"
 
 int
@@ -25570,23 +25567,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25576: \$? = $ac_status" >&5
+  echo "$as_me:25573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25582: \$? = $ac_status" >&5
+  echo "$as_me:25579: \$? = $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 25589 "configure"
+#line 25586 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25602,16 +25599,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25608: \$? = $ac_status" >&5
+  echo "$as_me:25605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25614: \$? = $ac_status" >&5
+  echo "$as_me:25611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25625,13 +25622,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25628: result: yes" >&5
+then	echo "$as_me:25625: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25630: result: no" >&5
+else	echo "$as_me:25627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25634: checking for builtin bool type" >&5
+echo "$as_me:25631: 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
@@ -25639,7 +25636,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25642 "configure"
+#line 25639 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25654,16 +25651,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25660: \$? = $ac_status" >&5
+  echo "$as_me:25657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25666: \$? = $ac_status" >&5
+  echo "$as_me:25663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25676,9 +25673,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25679: result: yes" >&5
+then	echo "$as_me:25676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25681: result: no" >&5
+else	echo "$as_me:25678: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25695,10 +25692,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25698: checking if we already have C++ library" >&5
+	echo "$as_me:25695: 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 25701 "configure"
+#line 25698 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25712,16 +25709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25718: \$? = $ac_status" >&5
+  echo "$as_me:25715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25724: \$? = $ac_status" >&5
+  echo "$as_me:25721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25730,7 +25727,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25733: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25749,7 +25746,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25752: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25749: 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
@@ -25775,7 +25772,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25778 "configure"
+#line 25775 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25789,16 +25786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25795: \$? = $ac_status" >&5
+  echo "$as_me:25792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25801: \$? = $ac_status" >&5
+  echo "$as_me:25798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25810,7 +25807,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25832,7 +25829,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25835: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25832: 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
@@ -25847,15 +25844,15 @@ CF_EOF
 # 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:25850: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25853: \$? = $ac_status" >&5
+  echo "$as_me:25850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25855: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25858: \$? = $ac_status" >&5
+  echo "$as_me:25855: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25866,10 +25863,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25869: result: yes" >&5
+  echo "$as_me:25866: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25872: result: no" >&5
+  echo "$as_me:25869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25889,7 +25886,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25910,7 +25907,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25913 "configure"
+#line 25910 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25924,16 +25921,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25930: \$? = $ac_status" >&5
+  echo "$as_me:25927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25936: \$? = $ac_status" >&5
+  echo "$as_me:25933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25970,7 +25967,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25973 "configure"
+#line 25970 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25984,16 +25981,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25990: \$? = $ac_status" >&5
+  echo "$as_me:25987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25996: \$? = $ac_status" >&5
+  echo "$as_me:25993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26026,7 +26023,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26029: result: $cf_cxx_library" >&5
+	echo "$as_me:26026: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26042,7 +26039,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26045: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26042: 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
@@ -26059,18 +26056,18 @@ do
   # 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 26062 "configure"
+#line 26059 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26067: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26073: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26093,17 +26090,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26096 "configure"
+#line 26093 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26100: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26106: \$? = $ac_status" >&5
+  echo "$as_me:26103: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26140,7 +26137,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26143: result: $CXXCPP" >&5
+echo "$as_me:26140: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26150,18 +26147,18 @@ do
   # 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 26153 "configure"
+#line 26150 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26164: \$? = $ac_status" >&5
+  echo "$as_me:26161: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26184,17 +26181,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26187 "configure"
+#line 26184 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26197: \$? = $ac_status" >&5
+  echo "$as_me:26194: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26222,7 +26219,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26225: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26237,23 +26234,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26240: checking for $ac_header" >&5
+echo "$as_me:26237: 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 26246 "configure"
+#line 26243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26250: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26256: \$? = $ac_status" >&5
+  echo "$as_me:26253: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26272,7 +26269,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26285,23 +26282,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26288: checking for $ac_header" >&5
+echo "$as_me:26285: 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 26294 "configure"
+#line 26291 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26304: \$? = $ac_status" >&5
+  echo "$as_me:26301: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26320,7 +26317,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26331,10 +26328,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26334: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26331: 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 26337 "configure"
+#line 26334 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26351,16 +26348,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26357: \$? = $ac_status" >&5
+  echo "$as_me:26354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26363: \$? = $ac_status" >&5
+  echo "$as_me:26360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26369,7 +26366,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26372: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26380,7 +26377,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26383: checking if we should include stdbool.h" >&5
+echo "$as_me:26380: 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
@@ -26388,7 +26385,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26391 "configure"
+#line 26388 "configure"
 #include "confdefs.h"
 
 int
@@ -26400,23 +26397,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26406: \$? = $ac_status" >&5
+  echo "$as_me:26403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26412: \$? = $ac_status" >&5
+  echo "$as_me:26409: \$? = $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 26419 "configure"
+#line 26416 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26432,16 +26429,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26438: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26444: \$? = $ac_status" >&5
+  echo "$as_me:26441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26455,13 +26452,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26458: result: yes" >&5
+then	echo "$as_me:26455: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26460: result: no" >&5
+else	echo "$as_me:26457: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26464: checking for builtin bool type" >&5
+echo "$as_me:26461: 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
@@ -26469,7 +26466,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26472 "configure"
+#line 26469 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26484,16 +26481,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26490: \$? = $ac_status" >&5
+  echo "$as_me:26487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26496: \$? = $ac_status" >&5
+  echo "$as_me:26493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26506,19 +26503,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26509: result: yes" >&5
+then	echo "$as_me:26506: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26511: result: no" >&5
+else	echo "$as_me:26508: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26515: checking for bool" >&5
+echo "$as_me:26512: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26521 "configure"
+#line 26518 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26553,16 +26550,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26559: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26565: \$? = $ac_status" >&5
+  echo "$as_me:26562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26572,10 +26569,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26575: result: $ac_cv_type_bool" >&5
+echo "$as_me:26572: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26578: checking size of bool" >&5
+echo "$as_me:26575: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26584,7 +26581,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26587 "configure"
+#line 26584 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26616,21 +26613,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26622: \$? = $ac_status" >&5
+  echo "$as_me:26619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26628: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26633 "configure"
+#line 26630 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26662,16 +26659,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26668: \$? = $ac_status" >&5
+  echo "$as_me:26665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26674: \$? = $ac_status" >&5
+  echo "$as_me:26671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26687,7 +26684,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26690 "configure"
+#line 26687 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26719,16 +26716,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26725: \$? = $ac_status" >&5
+  echo "$as_me:26722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26731: \$? = $ac_status" >&5
+  echo "$as_me:26728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26744,7 +26741,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26747 "configure"
+#line 26744 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26776,16 +26773,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26782: \$? = $ac_status" >&5
+  echo "$as_me:26779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26788: \$? = $ac_status" >&5
+  echo "$as_me:26785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26798,12 +26795,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26801: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26798: 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 26806 "configure"
+#line 26803 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26839,15 +26836,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26845: \$? = $ac_status" >&5
+  echo "$as_me:26842: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26850: \$? = $ac_status" >&5
+  echo "$as_me:26847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26863,13 +26860,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26866: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26872: checking for type of bool" >&5
+echo "$as_me:26869: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26888,7 +26885,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26891 "configure"
+#line 26888 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26929,15 +26926,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26932: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26940: \$? = $ac_status" >&5
+  echo "$as_me:26937: \$? = $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
@@ -26954,19 +26951,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26957: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26954: 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:26964: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26961: 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:26969: checking for special defines needed for etip.h" >&5
+echo "$as_me:26966: 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"
@@ -26984,7 +26981,7 @@ do
 	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 26987 "configure"
+#line 26984 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26998,16 +26995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27004: \$? = $ac_status" >&5
+  echo "$as_me:27001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27010: \$? = $ac_status" >&5
+  echo "$as_me:27007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27028,12 +27025,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27031: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27036: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27050,7 +27047,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27053 "configure"
+#line 27050 "configure"
 #include "confdefs.h"
 
 class base
@@ -27069,15 +27066,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27075: \$? = $ac_status" >&5
+  echo "$as_me:27072: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27080: \$? = $ac_status" >&5
+  echo "$as_me:27077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27096,7 +27093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27105,7 +27102,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27108: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27105: 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
@@ -27122,7 +27119,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27125 "configure"
+#line 27122 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27141,15 +27138,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27147: \$? = $ac_status" >&5
+  echo "$as_me:27144: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27152: \$? = $ac_status" >&5
+  echo "$as_me:27149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27168,7 +27165,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27171: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27178,7 +27175,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27181: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27178: 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
@@ -27192,7 +27189,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27195 "configure"
+#line 27192 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27236,16 +27233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27242: \$? = $ac_status" >&5
+  echo "$as_me:27239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27248: \$? = $ac_status" >&5
+  echo "$as_me:27245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27263,7 +27260,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27312,13 +27309,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27315: checking for bool" >&5
+echo "$as_me:27312: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27321 "configure"
+#line 27318 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27353,16 +27350,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27359: \$? = $ac_status" >&5
+  echo "$as_me:27356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27365: \$? = $ac_status" >&5
+  echo "$as_me:27362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27372,10 +27369,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27375: result: $ac_cv_type_bool" >&5
+echo "$as_me:27372: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27378: checking size of bool" >&5
+echo "$as_me:27375: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27384,7 +27381,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27387 "configure"
+#line 27384 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27416,21 +27413,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27422: \$? = $ac_status" >&5
+  echo "$as_me:27419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27428: \$? = $ac_status" >&5
+  echo "$as_me:27425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27433 "configure"
+#line 27430 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27462,16 +27459,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27468: \$? = $ac_status" >&5
+  echo "$as_me:27465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27474: \$? = $ac_status" >&5
+  echo "$as_me:27471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27487,7 +27484,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27490 "configure"
+#line 27487 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27519,16 +27516,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27525: \$? = $ac_status" >&5
+  echo "$as_me:27522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27531: \$? = $ac_status" >&5
+  echo "$as_me:27528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27544,7 +27541,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27547 "configure"
+#line 27544 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27576,16 +27573,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27582: \$? = $ac_status" >&5
+  echo "$as_me:27579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27588: \$? = $ac_status" >&5
+  echo "$as_me:27585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27598,12 +27595,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27601: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27598: 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 27606 "configure"
+#line 27603 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27639,15 +27636,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27645: \$? = $ac_status" >&5
+  echo "$as_me:27642: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27650: \$? = $ac_status" >&5
+  echo "$as_me:27647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27663,13 +27660,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27666: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27672: checking for type of bool" >&5
+echo "$as_me:27669: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27688,7 +27685,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27691 "configure"
+#line 27688 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27729,15 +27726,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27735: \$? = $ac_status" >&5
+  echo "$as_me:27732: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27740: \$? = $ac_status" >&5
+  echo "$as_me:27737: \$? = $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
@@ -27754,26 +27751,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27757: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27754: 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:27764: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27761: 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:27770: checking for fallback type of bool" >&5
+			echo "$as_me:27767: 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:27776: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27773: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27802,7 +27799,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27805: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27802: 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
@@ -27813,7 +27810,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27830,10 +27827,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27833: result: $ADAFLAGS" >&5
+	echo "$as_me:27830: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27836: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27833: 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
@@ -27843,11 +27840,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27846: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27843: 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:27850: checking if GNAT supports generics" >&5
+echo "$as_me:27847: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27857,7 +27854,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27860: result: $cf_gnat_generics" >&5
+echo "$as_me:27857: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27869,7 +27866,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27872: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27869: 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
@@ -27917,7 +27914,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27930,7 +27927,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27933: checking if GNAT supports project files" >&5
+echo "$as_me:27930: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27993,15 +27990,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27996: result: $cf_gnat_projects" >&5
+echo "$as_me:27993: 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:28002: checking if GNAT supports libraries" >&5
+	echo "$as_me:27999: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28004: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28021,7 +28018,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28024: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28033,7 +28030,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28036: checking for Ada95 compiler" >&5
+echo "$as_me:28033: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28044,12 +28041,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28047: result: $cf_ada_compiler" >&5
+echo "$as_me:28044: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28052: checking for Ada95 include directory" >&5
+echo "$as_me:28049: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28066,26 +28063,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28094,10 +28089,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28097: result: $ADA_INCLUDE" >&5
+echo "$as_me:28092: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28100: checking for Ada95 object directory" >&5
+echo "$as_me:28095: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28114,26 +28109,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28142,10 +28135,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28145: result: $ADA_OBJECTS" >&5
+echo "$as_me:28138: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28148: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28141: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28166,11 +28159,11 @@ then
 	fi
 fi
 
-echo "$as_me:28169: result: $with_ada_sharedlib" >&5
+echo "$as_me:28162: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28173: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28166: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28188,7 +28181,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28191: checking for Ada95 curses library name" >&5
+echo "$as_me:28184: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28204,7 +28197,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28207: result: $ADA_LIBNAME" >&5
+echo "$as_me:28200: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28215,13 +28208,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28218: checking for wchar_t" >&5
+	echo "$as_me:28211: 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 28224 "configure"
+#line 28217 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28236,16 +28229,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28242: \$? = $ac_status" >&5
+  echo "$as_me:28235: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28248: \$? = $ac_status" >&5
+  echo "$as_me:28241: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28255,10 +28248,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28261: checking size of wchar_t" >&5
+echo "$as_me:28254: 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
@@ -28267,7 +28260,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28270 "configure"
+#line 28263 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28279,21 +28272,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28285: \$? = $ac_status" >&5
+  echo "$as_me:28278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28291: \$? = $ac_status" >&5
+  echo "$as_me:28284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28296 "configure"
+#line 28289 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28305,16 +28298,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28311: \$? = $ac_status" >&5
+  echo "$as_me:28304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28317: \$? = $ac_status" >&5
+  echo "$as_me:28310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28330,7 +28323,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28333 "configure"
+#line 28326 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28342,16 +28335,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28348: \$? = $ac_status" >&5
+  echo "$as_me:28341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28354: \$? = $ac_status" >&5
+  echo "$as_me:28347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28367,7 +28360,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28370 "configure"
+#line 28363 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28379,16 +28372,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28385: \$? = $ac_status" >&5
+  echo "$as_me:28378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28391: \$? = $ac_status" >&5
+  echo "$as_me:28384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28401,12 +28394,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28404: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28397: 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 28409 "configure"
+#line 28402 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28422,15 +28415,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28428: \$? = $ac_status" >&5
+  echo "$as_me:28421: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28433: \$? = $ac_status" >&5
+  echo "$as_me:28426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28446,7 +28439,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28449: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28442: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28459,7 +28452,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28477,7 +28470,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28480: checking for library subsets" >&5
+echo "$as_me:28473: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28531,7 +28524,7 @@ fi
 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:28534: result: $LIB_SUBSETS" >&5
+echo "$as_me:28527: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28562,7 +28555,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28565: checking default library suffix" >&5
+echo "$as_me:28558: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28573,10 +28566,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28579: checking default library-dependency suffix" >&5
+echo "$as_me:28572: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28659,10 +28652,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28662: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28655: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28665: checking default object directory" >&5
+echo "$as_me:28658: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28678,11 +28671,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28685: checking c++ library-dependency suffix" >&5
+echo "$as_me:28678: 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++)
@@ -28775,7 +28768,7 @@ else
 	fi
 
 fi
-echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28951,19 +28944,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28954: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28947: 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 <<EOF
-#line 28959 "configure"
+#line 28952 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28966: \$? = $ac_status" >&5
+  echo "$as_me:28959: \$? = $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
@@ -28974,10 +28967,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28977 "configure"
+#line 28970 "configure"
 #include "confdefs.h"
 
-#line 28980 "configure"
+#line 28973 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28992,16 +28985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28998: \$? = $ac_status" >&5
+  echo "$as_me:28991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29004: \$? = $ac_status" >&5
+  echo "$as_me:28997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29024,7 +29017,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29027: result: $cf_ldflags_static" >&5
+	echo "$as_me:29020: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29040,7 +29033,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29043: checking where we will install curses.h" >&5
+echo "$as_me:29036: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29050,7 +29043,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29058,7 +29051,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29061: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29054: 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
@@ -29083,7 +29076,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29086: checking for desired basename for form library" >&5
+echo "$as_me:29079: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29103,10 +29096,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29106: result: $FORM_NAME" >&5
+echo "$as_me:29099: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29109: checking for desired basename for menu library" >&5
+echo "$as_me:29102: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29126,10 +29119,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29129: result: $MENU_NAME" >&5
+echo "$as_me:29122: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29132: checking for desired basename for panel library" >&5
+echo "$as_me:29125: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29149,10 +29142,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29152: result: $PANEL_NAME" >&5
+echo "$as_me:29145: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29155: checking for desired basename for cxx library" >&5
+echo "$as_me:29148: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29172,13 +29165,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29175: result: $CXX_NAME" >&5
+echo "$as_me:29168: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29181: checking for src modules" >&5
+echo "$as_me:29174: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29237,7 +29230,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29240: result: $cf_cv_src_modules" >&5
+echo "$as_me:29233: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29398,7 +29391,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29401: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29394: 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//'`
@@ -29409,7 +29402,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29412: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29405: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29425,17 +29418,17 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29428: result: $PKG_CFLAGS" >&5
+echo "$as_me:29421: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
 (cygwin*|msys*|mingw32*|mingw64|os2*)
-	GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*'
-	GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ '
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
 	;;
 (*)
-	GLOB_FULLPATH_ONLY='x/*'
-	GLOB_FULLPATH_ARGS='x/*\ '
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
 	;;
 esac
 
@@ -29497,7 +29490,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29524,7 +29517,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29527: checking for linker search path" >&5
+echo "$as_me:29520: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29572,7 +29565,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29613,7 +29606,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29616: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29609: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29699,7 +29692,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29880,7 +29873,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29883: error: ambiguous option: $1
+    { { echo "$as_me:29876: 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;}
@@ -29899,7 +29892,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29902: error: unrecognized option: $1
+  -*) { { echo "$as_me:29895: 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;}
@@ -30029,7 +30022,7 @@ do
   "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:30032: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30025: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30167,6 +30160,8 @@ s,@AWK@,$AWK,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
+s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
 s,@LINT@,$LINT,;t t
 s,@LINT_OPTS@,$LINT_OPTS,;t t
 s,@LINT_LIBS@,$LINT_LIBS,;t t
@@ -30411,8 +30406,6 @@ s,@MAKE_TESTS@,$MAKE_TESTS,;t t
 s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
 s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
 s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
-s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t
-s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t
 s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
 s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
 s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t
@@ -30553,7 +30546,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30556: creating $ac_file" >&5
+    { echo "$as_me:30549: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30571,7 +30564,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30584,7 +30577,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30587: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30580: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30600,7 +30593,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30603: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30596: 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;}
@@ -30609,7 +30602,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30612: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30605: 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;}
@@ -30654,7 +30647,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30657: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30650: 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;}
@@ -30665,7 +30658,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30668: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30661: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30714,7 +30707,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30725,7 +30718,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30738,7 +30731,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30741: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30734: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30796,7 +30789,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30799: $ac_file is unchanged" >&5
+      { echo "$as_me:30792: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31183,7 +31176,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
@@ -31569,7 +31562,7 @@ CF_EOF
 if test "$WITH_CURSES_H" = yes; then
 	cat >>headers.sh <<CF_EOF
 case \$DST in
-(/*/include/*)
+($GLOB_FULLPATH_POSIX/include/*)
 	END=\`basename \$DST\`
 	for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
 	do
@@ -31586,7 +31579,7 @@ CF_EOF
 else
 	cat >>headers.sh <<CF_EOF
 case \$DST in
-(/*/include/*)
+($GLOB_FULLPATH_POSIX/include/*)
 	END=\`basename \$DST\`
 	for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
 	do
diff --git a/dist.mk b/dist.mk
index 1b269dba5..60831b525 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1624 2024/07/27 13:25:06 tom Exp $
+# $Id: dist.mk,v 1.1626 2024/08/10 09:45:21 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240727
+NCURSES_PATCH = 20240810
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/menu/menu.priv.h b/menu/menu.priv.h
index 0bc6147e0..e464a7c99 100644
--- a/menu/menu.priv.h
+++ b/menu/menu.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: menu.priv.h,v 1.29 2020/05/24 01:40:20 anonymous.maarten Exp $ */
+/* $Id: menu.priv.h,v 1.30 2024/08/03 15:41:22 tom Exp $ */
 
 /***************************************************************************
 * Module menu.priv.h                                                       *
@@ -61,9 +61,6 @@ extern MENU_EXPORT_VAR(MENU) _nc_Default_Menu;
 /* Normalize menu to default if none was given */
 #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu)
 
-#define Get_Menu_Screen( menu ) (menu->userwin ? \
-				 _nc_screen_of(menu->userwin) : CURRENT_SCREEN)
-
 /* Get the user defined (framing) window of the menu */
 #define Get_Menu_UserWin(menu) ((menu)->userwin ? \
     (menu)->userwin : CURRENT_SCREEN->_stdscr)
diff --git a/misc/Makefile.in b/misc/Makefile.in
index e7ec1e847..f83dddc19 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.80 2024/07/20 17:47:13 tom Exp $
+# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
 ##############################################################################
 # Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
@@ -75,6 +75,15 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
+BINDIR		= $(DESTDIR)$(bindir)
+DATADIR		= $(DESTDIR)$(datadir)
+
+@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix)
+@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir)
+@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir)
+@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile)
+@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir)
+
 ################################################################################
 
 @MAKE_PHONY@.PHONY :	all
@@ -103,25 +112,19 @@ sources ::
 @MAKE_DATABASE@install :: @MISC_INSTALL_DATA@
 
 @MAKE_DATABASE@install.data ::	terminfo.tmp \
-@MAKE_DATABASE@		$(DESTDIR)$(libdir) \
-@MAKE_DATABASE@		$(DESTDIR)$(datadir) \
-@MAKE_DATABASE@		$(DESTDIR)$(tabsetdir)
-@MAKE_DATABASE@	DESTDIR=${DESTDIR} \
-@MAKE_DATABASE@	prefix=${prefix} \
-@MAKE_DATABASE@	exec_prefix=${exec_prefix} \
-@MAKE_DATABASE@	bindir=${bindir} \
-@MAKE_DATABASE@	top_srcdir=${top_srcdir} \
-@MAKE_DATABASE@	srcdir=${srcdir} \
-@MAKE_DATABASE@	datadir=${datadir} \
-@MAKE_DATABASE@	ticdir=${ticdir} \
-@MAKE_DATABASE@	source=terminfo.tmp \
-@MAKE_DATABASE@	cross_compiling=@cross_compiling@ \
+@MAKE_DATABASE@		$(LIBDIR) \
+@MAKE_DATABASE@		$(DATADIR) \
+@MAKE_DATABASE@		$(TABSETDIR)
+@MAKE_DATABASE@	INSTALL_PREFIX=${INSTALL_PREFIX} \
+@MAKE_DATABASE@	TICDIR=${TICDIR} \
+@MAKE_DATABASE@	BINDIR=${BINDIR} \
+@MAKE_DATABASE@	tic_source=terminfo.tmp \
 @MAKE_DATABASE@	$(SHELL) ./run_tic.sh
 @MAKE_DATABASE@	@( cd $(srcdir)/tabset && \
 @MAKE_DATABASE@		$(SHELL) -c 'for i in * ; do \
 @MAKE_DATABASE@			if test -f $$i ; then \
 @MAKE_DATABASE@			echo installing $$i; \
-@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
+@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(TABSETDIR)/$$i; \
 @MAKE_DATABASE@			fi; done' )
 install.data ::
 	@echo "finished $@"
@@ -129,8 +132,8 @@ install.data ::
 NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
 
 install \
-install.libs :: $(DESTDIR)$(bindir) ncurses-config
-	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+install.libs :: $(BINDIR) ncurses-config
+	$(INSTALL_SCRIPT) ncurses-config $(BINDIR)/$(NCURSES_CONFIG)
 
 # Make a list of the files that gen-pkgconfig might create:
 @MAKE_PC_FILES@PC_FILES = \
@@ -148,7 +151,7 @@ install.libs :: $(DESTDIR)$(bindir) ncurses-config
 @MAKE_PC_FILES@install \
 @MAKE_PC_FILES@install.libs :: pc-files
 @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
-@MAKE_PC_FILES@		@GLOB_FULLPATH_ONLY@) \
+@MAKE_PC_FILES@		x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
 @MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
 @MAKE_PC_FILES@			for name in $(PC_FILES); do \
 @MAKE_PC_FILES@				test -f $$name || continue; \
@@ -177,23 +180,25 @@ run_tic.sed :
 	datadir=${datadir} \
 	$(SHELL) $(srcdir)/gen_edit.sh >$@
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) \
-$(DESTDIR)$(datadir) \
-$(DESTDIR)$(tabsetdir) :
+$(BINDIR) \
+$(DATADIR) :
 	mkdir -p $@
 
+@MAKE_DATABASE@$(LIBDIR) \
+@MAKE_DATABASE@$(TABSETDIR) :
+@MAKE_DATABASE@	mkdir -p $@
+
 uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
 
 uninstall.data :
-	-test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
-	-test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
-	-test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
+@MAKE_DATABASE@	-test -d $(TABSETDIR) && rm -rf $(TABSETDIR)
+@MAKE_DATABASE@	-test -d $(TICDIR) && rm -rf $(TICDIR)
+@MAKE_DATABASE@	-test -f $(TICFILE) && rm -f $(TICFILE)
 
 uninstall.libs :
-	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+	-rm -f $(BINDIR)/$(NCURSES_CONFIG)
 @MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
-@MAKE_PC_FILES@	@GLOB_FULLPATH_ONLY@) \
+@MAKE_PC_FILES@	x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
 @MAKE_PC_FILES@		for name in $(PC_FILES); do \
 @MAKE_PC_FILES@			test -f $$name || continue; \
 @MAKE_PC_FILES@			echo uninstalling $$name; \
diff --git a/misc/run_tic.in b/misc/run_tic.in
index bd11c4c80..c4edb2711 100644
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
+# $Id: run_tic.in,v 1.41 2024/08/04 14:50:26 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -42,22 +42,25 @@ echo "** Building terminfo database, please wait..."
 # The script is designed to be run from the misc/Makefile as
 #	make install.data
 
-: "${suffix:=@EXEEXT@}"
-: "${DESTDIR:=@DESTDIR@}"
+# Symbols which are not overridden by misc/Makefile:
 : "${prefix:=@prefix@}"
 : "${exec_prefix:=@exec_prefix@}"
-: "${bindir:=@bindir@}"
 : "${top_srcdir:=@top_srcdir@}"
 : "${srcdir:=@srcdir@}"
 : "${datarootdir:=@datarootdir@}"
 : "${datadir:=@datadir@}"
-: "${TIC_PATH:=@TIC@}"
-: "${ticdir:=@TERMINFO@}"
-: "${source:=@TERMINFO_SRC@}"
-: "${cross_compiling:=no}"
+: "${cross_compiling:=@cross_compiling@}"
+: "${suffix:=@EXEEXT@}"
+
 : "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
+: "${tic_path:=@TIC@}"
+: "${ticdir:=@TERMINFO@}"
+: "${tic_source:=@TERMINFO_SRC@}"
 
-test -z "${DESTDIR}" && DESTDIR=
+# Symbols which $DESTDIR and/or install-prefix may affect:
+: "${INSTALL_PREFIX:=$prefix}"
+: "${BINDIR:=@bindir@}"
+: "${TICDIR:=$ticdir}"
 
 # Allow tic to run either from the install-path, or from the build-directory.
 # Do not do this if we appear to be cross-compiling.  In that case, we rely
@@ -68,21 +71,21 @@ then
 	then
 		case "$PATH" in
 		\@PATH_SEPARATOR@*)
-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
+			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}$PATH"
 			;;
 		*)
-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
+			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}@PATH_SEPARATOR@$PATH"
 			;;
 		esac
 		export PATH
 		if test @DFT_LWR_MODEL@ = shared
 		then
 			SHLIB="sh $srcdir/shlib"
-			TIC_PATH="$SHLIB tic"
+			tic_path="$SHLIB tic"
 		else
-			TIC_PATH="tic"
+			tic_path="tic"
 		fi
-	elif test "$TIC_PATH" = unknown
+	elif test "$tic_path" = unknown
 	then
 		echo "? no tic program found"
 		exit 1
@@ -106,7 +109,7 @@ export SHLIB_HOST
 
 # don't use user's TERMINFO variable
 unset TERMINFO_DIRS
-TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO
+TERMINFO="$TICDIR" ; export TERMINFO
 umask 022
 
 # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
@@ -134,7 +137,7 @@ fi
 
 if test "$ext_funcs" = 1 ; then
 cat <<EOF
-Running $TIC_PATH to install $TERMINFO ...
+Running $tic_path to install $TERMINFO ...
 
 	You may see messages regarding extended capabilities, e.g., AX.
 	These are extended terminal capabilities which are compiled
@@ -144,8 +147,8 @@ Running $TIC_PATH to install $TERMINFO ...
 	document, and install the terminfo without the -x option.
 
 EOF
-$TIC_PATH -V
-if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
+$tic_path -V
+if ( $tic_path -x -s -o "$TERMINFO" $tic_source )
 then
 	echo "** built new $TERMINFO"
 else
@@ -154,7 +157,7 @@ else
 fi
 else
 cat <<EOF
-Running $TIC_PATH to install $TERMINFO ...
+Running $tic_path to install $TERMINFO ...
 
 	You may see messages regarding unknown capabilities, e.g., AX.
 	These are extended terminal capabilities which may be compiled
@@ -164,8 +167,8 @@ Running $TIC_PATH to install $TERMINFO ...
 	document, and install the terminfo without the -x option.
 
 EOF
-$TIC_PATH -V
-if ( $TIC_PATH -s -o "$TERMINFO" $source )
+$tic_path -V
+if ( $tic_path -s -o "$TERMINFO" $tic_source )
 then
 	echo "** built new $TERMINFO"
 else
@@ -192,7 +195,7 @@ if test "$TICDIR" != "$TERMINFO" ; then
 			echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
 		fi
 	else
-		cd ${DESTDIR}$prefix || exit
+		cd ${INSTALL_PREFIX} || exit
 		# Construct a symbolic link that only assumes $ticdir has the
 		# same $prefix as the other installed directories.
 		RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 3ead410e7..f38c725d4 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240727) unstable; urgency=low
+ncurses6td (6.5+20240810) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 3ead410e7..f38c725d4 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240727) unstable; urgency=low
+ncurses6td (6.5+20240810) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 83a3ca35b..84bf8bab9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240727) unstable; urgency=low
+ncurses6td (6.5+20240810) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Jul 2024 09:25:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e7750d89e..af9ddf155 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.659 2024/07/27 13:25:06 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0727"
+!define VERSION_MMDD  "0810"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e1f30e509..e848f83da 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240727
+Release: 20240810
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4f50badd7..1d8a6b437 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240727
+Release: 20240810
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 2e02f0b38..412f04fb8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240727
+Release: 20240810
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 7cc4c5bf0..06c1a98dd 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
+dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -2009,13 +2009,14 @@ rm -rf ./conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
+dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
 AC_DEFUN([CF_GETOPT_HEADER],
-[
-AC_HAVE_HEADERS(unistd.h getopt.h)
+[AC_REQUIRE([AC_HEADER_STDC])
+
+AC_CHECK_HEADERS(getopt.h)
 AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
@@ -2035,6 +2036,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
+dnl ----------------
+dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
+AC_DEFUN([CF_GLOB_FULLPATH],[
+AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+AC_SUBST(GLOB_FULLPATH_POSIX)
+AC_SUBST(GLOB_FULLPATH_OTHER)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
@@ -3255,35 +3276,35 @@ case ".$with_cflags" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
+dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
 if test "x$prefix" != xNONE; then
 	cf_path_syntax="$prefix"
 else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".[$]$1" in
-(.\[$]\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x[$]$1" in
+(x\[$]\(*\)*|x\'*\'*)
 	;;
-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
+(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
 	eval $1="[$]$1"
-	case ".[$]$1" in
-	(.NONE/*)
+	case "x[$]$1" in
+	(xNONE/*)
 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -3522,15 +3543,16 @@ CF_ACVERSION_CHECK(2.52,
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
+dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl using the fallback mkinstalldirs script
 AC_DEFUN([CF_PROG_INSTALL],
 [AC_PROG_INSTALL
-case $INSTALL in
-(/*)
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	CF_DIRNAME(cf_dir,$INSTALL)
@@ -4062,12 +4084,12 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
+dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
-AC_HAVE_HEADERS(wchar.h)
+AC_CHECK_HEADERS(wchar.h)
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
 	cf_save_LIBS="$LIBS"
 	AC_TRY_LINK([
@@ -4315,6 +4337,26 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
+dnl ---------------
+dnl For testing, override the derived host system-type which is used to decide
+dnl things such as the linker commands used to build shared libraries.  This is
+dnl normally chosen automatically based on the type of system which you are
+dnl building on.  We use it for testing the configure script.
+dnl
+dnl This is different from the --host option: it is used only for testing parts
+dnl of the configure script which would not be reachable with --host since that
+dnl relies on the build environment being real, rather than mocked up.
+AC_DEFUN([CF_WITH_SYSTYPE],[
+CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
+AC_ARG_WITH(system-type,
+	[  --with-system-type=XXX  test: override derived host system-type],
+[AC_MSG_WARN(overriding system type to $withval)
+	cf_cv_system_name=$withval
+	host_os=$withval
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
 dnl ----------------
 AC_DEFUN([CF_WITH_VALGRIND],[
diff --git a/test/configure b/test/configure
index 2b779d500..3fab6778b 100755
--- a/test/configure
+++ b/test/configure
@@ -680,11 +680,6 @@ EOF
 
   cat <<\EOF
 
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
 X features:
   --x-includes=DIR    X include files are in DIR
   --x-libraries=DIR   X library files are in DIR
@@ -692,6 +687,7 @@ X features:
 System types:
   --build=BUILD           configure for building on BUILD [guessed]
   --host=HOST       build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
 EOF
 fi
 
@@ -699,15 +695,16 @@ if test -n "$ac_init_help"; then
 
   cat <<\EOF
 
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+
 General Options:
+  --with-system-type=XXX  test: override derived host system-type
   --disable-stripping     do not strip (debug info) installed executables
   --with-strip-program=XX specify program to use when stripping in install
   --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics
@@ -937,7 +934,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:940: loading site script $ac_site_file" >&5
+    { echo "$as_me:937: 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"
@@ -948,7 +945,7 @@ if test -r "$cache_file"; then
   # 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:951: loading cache $cache_file" >&5
+    { echo "$as_me:948: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -956,7 +953,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:959: creating cache $cache_file" >&5
+  { echo "$as_me:956: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -972,21 +969,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:975: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:972: 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:979: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:976: 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:985: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:982: 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:987:   former value:  $ac_old_val" >&5
+        { echo "$as_me:984:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:989:   current value: $ac_new_val" >&5
+        { echo "$as_me:986:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1005,9 +1002,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1008: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1005: 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:1010: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1007: 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
@@ -1036,10 +1033,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1042: \$? = $ac_status" >&5
+  echo "$as_me:1039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1071,7 +1068,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1074: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1071: 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
@@ -1081,11 +1078,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1088: checking build system type" >&5
+echo "$as_me:1085: 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
@@ -1094,24 +1091,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1097: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1094: 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:1101: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1098: 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:1106: result: $ac_cv_build" >&5
+echo "$as_me:1103: 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/'`
 
-if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1114: checking host system type" >&5
+echo "$as_me:1110: 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
@@ -1120,18 +1116,46 @@ else
 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:1123: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1119: 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:1128: result: $ac_cv_host" >&5
+echo "$as_me:1124: 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/'`
 host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1132: 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
+else
+  ac_cv_target_alias=$target_alias
+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:1141: 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:1146: 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/'`
+target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
 	system_name="$host_os"
 else
 	system_name="`(uname -s -r) 2>/dev/null`"
@@ -1151,31 +1175,28 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1154: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1178: 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:1158: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1182: 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:1160: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1184: 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
 
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+# 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:1192: 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
+
+fi;
 
-echo "$as_me:1178: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1199: 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
@@ -1195,11 +1216,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1198: result: yes" >&5
+  echo "$as_me:1219: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1202: result: no" >&5
+  echo "$as_me:1223: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1213,7 +1234,7 @@ ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1216: checking for $ac_word" >&5
+echo "$as_me:1237: 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
@@ -1228,7 +1249,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1231: found $ac_dir/$ac_word" >&5
+echo "$as_me:1252: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1236,10 +1257,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1239: result: $CC" >&5
+  echo "$as_me:1260: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1242: result: no" >&5
+  echo "$as_me:1263: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1248,7 +1269,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1251: checking for $ac_word" >&5
+echo "$as_me:1272: 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
@@ -1263,7 +1284,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1266: found $ac_dir/$ac_word" >&5
+echo "$as_me:1287: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1271,10 +1292,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1274: result: $ac_ct_CC" >&5
+  echo "$as_me:1295: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1277: result: no" >&5
+  echo "$as_me:1298: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1287,7 +1308,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1290: checking for $ac_word" >&5
+echo "$as_me:1311: 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
@@ -1302,7 +1323,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1305: found $ac_dir/$ac_word" >&5
+echo "$as_me:1326: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1310,10 +1331,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1313: result: $CC" >&5
+  echo "$as_me:1334: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1316: result: no" >&5
+  echo "$as_me:1337: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1322,7 +1343,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1325: checking for $ac_word" >&5
+echo "$as_me:1346: 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
@@ -1337,7 +1358,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1340: found $ac_dir/$ac_word" >&5
+echo "$as_me:1361: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1345,10 +1366,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1348: result: $ac_ct_CC" >&5
+  echo "$as_me:1369: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1351: result: no" >&5
+  echo "$as_me:1372: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1361,7 +1382,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1364: checking for $ac_word" >&5
+echo "$as_me:1385: 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
@@ -1381,7 +1402,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+echo "$as_me:1405: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1403,10 +1424,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1406: result: $CC" >&5
+  echo "$as_me:1427: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1409: result: no" >&5
+  echo "$as_me:1430: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1417,7 +1438,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1420: checking for $ac_word" >&5
+echo "$as_me:1441: 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
@@ -1432,7 +1453,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1435: found $ac_dir/$ac_word" >&5
+echo "$as_me:1456: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1440,10 +1461,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1443: result: $CC" >&5
+  echo "$as_me:1464: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1446: result: no" >&5
+  echo "$as_me:1467: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1456,7 +1477,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1459: checking for $ac_word" >&5
+echo "$as_me:1480: 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
@@ -1471,7 +1492,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1474: found $ac_dir/$ac_word" >&5
+echo "$as_me:1495: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1479,10 +1500,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1482: result: $ac_ct_CC" >&5
+  echo "$as_me:1503: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1485: result: no" >&5
+  echo "$as_me:1506: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1494,32 +1515,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1497: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1518: 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:1502:" \
+echo "$as_me:1523:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1505: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1526: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1508: \$? = $ac_status" >&5
+  echo "$as_me:1529: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1510: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1531: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1513: \$? = $ac_status" >&5
+  echo "$as_me:1534: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1515: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1536: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1518: \$? = $ac_status" >&5
+  echo "$as_me:1539: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1522 "configure"
+#line 1543 "configure"
 #include "confdefs.h"
 
 int
@@ -1535,13 +1556,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1538: checking for C compiler default output" >&5
+echo "$as_me:1559: 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:1541: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1562: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1544: \$? = $ac_status" >&5
+  echo "$as_me:1565: \$? = $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
@@ -1564,34 +1585,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1567: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1588: 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:1573: result: $ac_file" >&5
+echo "$as_me:1594: 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:1578: checking whether the C compiler works" >&5
+echo "$as_me:1599: 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:1584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1587: \$? = $ac_status" >&5
+  echo "$as_me:1608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1594: error: cannot run C compiled programs.
+	{ { echo "$as_me:1615: 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;}
@@ -1599,24 +1620,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1602: result: yes" >&5
+echo "$as_me:1623: 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:1609: checking whether we are cross compiling" >&5
+echo "$as_me:1630: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1611: result: $cross_compiling" >&5
+echo "$as_me:1632: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1614: checking for executable suffix" >&5
+echo "$as_me:1635: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1619: \$? = $ac_status" >&5
+  echo "$as_me:1640: \$? = $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
@@ -1632,25 +1653,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1635: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1656: 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:1641: result: $ac_cv_exeext" >&5
+echo "$as_me:1662: 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:1647: checking for object suffix" >&5
+echo "$as_me:1668: 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 1653 "configure"
+#line 1674 "configure"
 #include "confdefs.h"
 
 int
@@ -1662,10 +1683,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1668: \$? = $ac_status" >&5
+  echo "$as_me:1689: \$? = $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
@@ -1677,24 +1698,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1680: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1701: 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:1687: result: $ac_cv_objext" >&5
+echo "$as_me:1708: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1691: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1712: 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 1697 "configure"
+#line 1718 "configure"
 #include "confdefs.h"
 
 int
@@ -1709,16 +1730,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1715: \$? = $ac_status" >&5
+  echo "$as_me:1736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1721: \$? = $ac_status" >&5
+  echo "$as_me:1742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1730,19 +1751,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1733: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1754: 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:1739: checking whether $CC accepts -g" >&5
+echo "$as_me:1760: 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 1745 "configure"
+#line 1766 "configure"
 #include "confdefs.h"
 
 int
@@ -1754,16 +1775,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1760: \$? = $ac_status" >&5
+  echo "$as_me:1781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1766: \$? = $ac_status" >&5
+  echo "$as_me:1787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1773,7 +1794,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1776: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1797: 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
@@ -1800,16 +1821,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1806: \$? = $ac_status" >&5
+  echo "$as_me:1827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1812: \$? = $ac_status" >&5
+  echo "$as_me:1833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1821,7 +1842,7 @@ if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1824 "configure"
+#line 1845 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1834,16 +1855,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1840: \$? = $ac_status" >&5
+  echo "$as_me:1861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1846: \$? = $ac_status" >&5
+  echo "$as_me:1867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1853,7 +1874,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1856 "configure"
+#line 1877 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1865,16 +1886,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1871: \$? = $ac_status" >&5
+  echo "$as_me:1892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1877: \$? = $ac_status" >&5
+  echo "$as_me:1898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1904,11 +1925,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1907: checking version of $CC" >&5
+	echo "$as_me:1928: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1911: result: $GCC_VERSION" >&5
+	echo "$as_me:1932: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1917,12 +1938,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1920: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1941: 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 1925 "configure"
+#line 1946 "configure"
 #include "confdefs.h"
 
 int
@@ -1939,16 +1960,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1945: \$? = $ac_status" >&5
+  echo "$as_me:1966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1951: \$? = $ac_status" >&5
+  echo "$as_me:1972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1959,7 +1980,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1962: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1983: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1968,11 +1989,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1971: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1992: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1975 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 
 int
@@ -1989,16 +2010,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1995: \$? = $ac_status" >&5
+  echo "$as_me:2016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2001: \$? = $ac_status" >&5
+  echo "$as_me:2022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2008,7 +2029,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2011: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2032: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2017,30 +2038,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2020: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2041: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2027: checking version of $CC" >&5
+	echo "$as_me:2048: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2031: result: $CLANG_VERSION" >&5
+	echo "$as_me:2052: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2038: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2059: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2043 "configure"
+#line 2064 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2054,16 +2075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2060: \$? = $ac_status" >&5
+  echo "$as_me:2081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2066: \$? = $ac_status" >&5
+  echo "$as_me:2087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2074,13 +2095,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2077: result: $cf_clang_optok" >&5
+		echo "$as_me:2098: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2083: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2104: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2089,7 +2110,7 @@ echo "${as_me:-configure}:2083: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2092: 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
@@ -2097,7 +2118,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2100 "configure"
+#line 2121 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2144,16 +2165,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2150: \$? = $ac_status" >&5
+  echo "$as_me:2171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2156: \$? = $ac_status" >&5
+  echo "$as_me:2177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2170,10 +2191,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2173: result: none needed" >&5
+    echo "$as_me:2194: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2181,13 +2202,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2184: checking \$CFLAGS variable" >&5
+echo "$as_me:2205: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2188: result: broken" >&5
+	echo "$as_me:2209: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2190: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2211: 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=
@@ -2295,18 +2316,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2298: result: ok" >&5
+	echo "$as_me:2319: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2303: checking \$CC variable" >&5
+echo "$as_me:2324: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2307: result: broken" >&5
+	echo "$as_me:2328: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2309: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2330: 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/[ ]*[ ]-[^ ].*//'`
@@ -2423,24 +2444,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2438: result: ok" >&5
+	echo "$as_me:2459: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2443: checking for inline" >&5
+echo "$as_me:2464: 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
@@ -2448,7 +2469,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2451 "configure"
+#line 2472 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -2457,16 +2478,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2463: \$? = $ac_status" >&5
+  echo "$as_me:2484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2469: \$? = $ac_status" >&5
+  echo "$as_me:2490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2477,7 +2498,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:2480: result: $ac_cv_c_inline" >&5
+echo "$as_me:2501: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2496,7 +2517,7 @@ for ac_prog in ggrep grep
 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:2499: checking for $ac_word" >&5
+echo "$as_me:2520: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2511,7 +2532,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2514: found $ac_dir/$ac_word" >&5
+echo "$as_me:2535: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2519,10 +2540,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2522: result: $GREP" >&5
+  echo "$as_me:2543: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2525: result: no" >&5
+  echo "$as_me:2546: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2530,7 +2551,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2533: checking for egrep" >&5
+echo "$as_me:2554: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2542,7 +2563,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2545: checking for $ac_word" >&5
+echo "$as_me:2566: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2559,7 +2580,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2562: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2583: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2570,10 +2591,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2573: result: $EGREP" >&5
+  echo "$as_me:2594: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2576: result: no" >&5
+  echo "$as_me:2597: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2581,12 +2602,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2596,7 +2617,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2599: checking how to run the C preprocessor" >&5
+echo "$as_me:2620: 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
@@ -2617,18 +2638,18 @@ do
   # 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 2620 "configure"
+#line 2641 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2625: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2646: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2631: \$? = $ac_status" >&5
+  echo "$as_me:2652: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2651,17 +2672,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2654 "configure"
+#line 2675 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2679: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2664: \$? = $ac_status" >&5
+  echo "$as_me:2685: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2698,7 +2719,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2701: result: $CPP" >&5
+echo "$as_me:2722: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2708,18 +2729,18 @@ do
   # 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 2711 "configure"
+#line 2732 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2737: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2722: \$? = $ac_status" >&5
+  echo "$as_me:2743: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2742,17 +2763,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2745 "configure"
+#line 2766 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2755: \$? = $ac_status" >&5
+  echo "$as_me:2776: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2780,7 +2801,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2796,7 +2817,7 @@ for ac_prog in mawk gawk nawk awk
 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:2799: checking for $ac_word" >&5
+echo "$as_me:2820: 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
@@ -2811,7 +2832,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2814: found $ac_dir/$ac_word" >&5
+echo "$as_me:2835: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2819,16 +2840,27 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2822: result: $AWK" >&5
+  echo "$as_me:2843: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2825: result: no" >&5
+  echo "$as_me:2846: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2841,7 +2873,7 @@ done
 # 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:2844: checking for a BSD compatible install" >&5
+echo "$as_me:2876: 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
@@ -2890,7 +2922,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2893: result: $INSTALL" >&5
+echo "$as_me:2925: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2901,8 +2933,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-case $INSTALL in
-(/*)
+case x$INSTALL in
+(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
 (*)
 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
@@ -2911,7 +2943,7 @@ case $INSTALL in
 	;;
 esac
 
-echo "$as_me:2914: checking if you want to install stripped executables" >&5
+echo "$as_me:2946: 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.
@@ -2928,7 +2960,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:2931: result: $enable_stripping" >&5
+echo "$as_me:2963: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -2939,7 +2971,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:2942: checking if install accepts -p option" >&5
+echo "$as_me:2974: 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
@@ -2970,10 +3002,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:2973: result: $cf_cv_install_p" >&5
+echo "$as_me:3005: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:2976: checking if install needs to be told about ownership" >&5
+echo "$as_me:3008: 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)
@@ -2984,7 +3016,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:2987: result: $with_install_o" >&5
+echo "$as_me:3019: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -2995,7 +3027,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:2998: checking if you want to specify strip-program" >&5
+	echo "$as_me:3030: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3005,11 +3037,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3008: result: $with_strip_program" >&5
+	echo "$as_me:3040: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3012: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3044: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3030,11 +3062,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3033: result: $check_install_strip" >&5
+		echo "$as_me:3065: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3037: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3069: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3049,7 +3081,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3063,7 +3095,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3066: checking for $ac_word" >&5
+echo "$as_me:3098: 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
@@ -3078,7 +3110,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3081: found $ac_dir/$ac_word" >&5
+echo "$as_me:3113: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3086,10 +3118,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3089: result: $LINT" >&5
+  echo "$as_me:3121: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3092: result: no" >&5
+  echo "$as_me:3124: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3102,7 +3134,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3105: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3137: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3157,14 +3189,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3160: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3192: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3167: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3199: 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
@@ -3191,7 +3223,7 @@ else
 fi
 
 fi
-echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3202,7 +3234,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3205: checking for $ac_word" >&5
+echo "$as_me:3237: 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
@@ -3217,7 +3249,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3220: found $ac_dir/$ac_word" >&5
+echo "$as_me:3252: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3225,10 +3257,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3228: result: $CTAGS" >&5
+  echo "$as_me:3260: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3231: result: no" >&5
+  echo "$as_me:3263: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3239,7 +3271,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3242: checking for $ac_word" >&5
+echo "$as_me:3274: 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
@@ -3254,7 +3286,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3257: found $ac_dir/$ac_word" >&5
+echo "$as_me:3289: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3262,10 +3294,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3265: result: $ETAGS" >&5
+  echo "$as_me:3297: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3268: result: no" >&5
+  echo "$as_me:3300: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3274,7 +3306,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3277: checking for $ac_word" >&5
+echo "$as_me:3309: 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
@@ -3289,7 +3321,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3292: found $ac_dir/$ac_word" >&5
+echo "$as_me:3324: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3298,17 +3330,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3304: result: no" >&5
+  echo "$as_me:3336: 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:3311: checking for $ac_word" >&5
+echo "$as_me:3343: 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
@@ -3323,7 +3355,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+echo "$as_me:3358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3332,10 +3364,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3338: result: no" >&5
+  echo "$as_me:3370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3355,14 +3387,14 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3358: checking if -lm needed for math functions" >&5
+echo "$as_me:3390: 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 3365 "configure"
+#line 3397 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3378,16 +3410,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3384: \$? = $ac_status" >&5
+  echo "$as_me:3416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3390: \$? = $ac_status" >&5
+  echo "$as_me:3422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -3397,7 +3429,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3400: result: $cf_cv_need_libm" >&5
+echo "$as_me:3432: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -3405,14 +3437,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:3408: checking if -lm is available for math functions" >&5
+	echo "$as_me:3440: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3415 "configure"
+#line 3447 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3428,16 +3460,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3434: \$? = $ac_status" >&5
+  echo "$as_me:3466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3440: \$? = $ac_status" >&5
+  echo "$as_me:3472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -3447,7 +3479,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3450: result: $cf_cv_have_libm" >&5
+echo "$as_me:3482: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -3502,7 +3534,7 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
-echo "$as_me:3505: checking for fgrep" >&5
+echo "$as_me:3537: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3514,7 +3546,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3517: checking for $ac_word" >&5
+echo "$as_me:3549: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3531,7 +3563,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3534: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3566: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3542,10 +3574,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3545: result: $FGREP" >&5
+  echo "$as_me:3577: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3548: result: no" >&5
+  echo "$as_me:3580: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3553,16 +3585,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3565: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:3597: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -3579,17 +3611,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:3582: result: $enable_stdnoreturn" >&5
+echo "$as_me:3614: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:3586: checking for C11 _Noreturn feature" >&5
+echo "$as_me:3618: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3592 "configure"
+#line 3624 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3605,16 +3637,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3611: \$? = $ac_status" >&5
+  echo "$as_me:3643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3617: \$? = $ac_status" >&5
+  echo "$as_me:3649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -3625,7 +3657,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -3664,10 +3696,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 3670 "${as_me:-configure}"
+#line 3702 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -3717,12 +3749,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3723: \$? = $ac_status" >&5
+  echo "$as_me:3755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -3781,7 +3813,7 @@ fi
 rm -rf ./conftest*
 fi
 
-echo "$as_me:3784: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3816: 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.
@@ -3791,7 +3823,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:3794: result: $enable_string_hacks" >&5
+echo "$as_me:3826: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -3800,15 +3832,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:3803: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:3835: 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:3805: checking for strlcat" >&5
+	echo "$as_me:3837: 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 3811 "configure"
+#line 3843 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3839,16 +3871,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3845: \$? = $ac_status" >&5
+  echo "$as_me:3877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3851: \$? = $ac_status" >&5
+  echo "$as_me:3883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -3858,7 +3890,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -3868,7 +3900,7 @@ EOF
 
 else
 
-		echo "$as_me:3871: checking for strlcat in -lbsd" >&5
+		echo "$as_me:3903: 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
@@ -3876,7 +3908,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3879 "configure"
+#line 3911 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3895,16 +3927,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3901: \$? = $ac_status" >&5
+  echo "$as_me:3933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3907: \$? = $ac_status" >&5
+  echo "$as_me:3939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -3915,7 +3947,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3918: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3950: 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
 
@@ -3938,23 +3970,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3941: checking for $ac_header" >&5
+echo "$as_me:3973: 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 3947 "configure"
+#line 3979 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3957: \$? = $ac_status" >&5
+  echo "$as_me:3989: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3973,7 +4005,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:3976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:4008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -3994,13 +4026,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3997: checking for $ac_func" >&5
+echo "$as_me:4029: 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 4003 "configure"
+#line 4035 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4031,16 +4063,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4037: \$? = $ac_status" >&5
+  echo "$as_me:4069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4043: \$? = $ac_status" >&5
+  echo "$as_me:4075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4050,7 +4082,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4053: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:4085: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4062,14 +4094,14 @@ done
 
 fi
 
-echo "$as_me:4065: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:4097: 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 4072 "configure"
+#line 4104 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4088,16 +4120,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4094: \$? = $ac_status" >&5
+  echo "$as_me:4126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4100: \$? = $ac_status" >&5
+  echo "$as_me:4132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -4108,7 +4140,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
+echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -4150,14 +4182,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:4153: checking if this is the GNU C library" >&5
+echo "$as_me:4185: 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 4160 "configure"
+#line 4192 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4176,16 +4208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4182: \$? = $ac_status" >&5
+  echo "$as_me:4214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4188: \$? = $ac_status" >&5
+  echo "$as_me:4220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -4196,7 +4228,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
+echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -4204,7 +4236,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:4207: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:4239: 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
@@ -4216,7 +4248,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4219 "configure"
+#line 4251 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4235,16 +4267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4241: \$? = $ac_status" >&5
+  echo "$as_me:4273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4247: \$? = $ac_status" >&5
+  echo "$as_me:4279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -4256,12 +4288,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:4259: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:4291: 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:4264: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:4296: 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
@@ -4366,7 +4398,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4369 "configure"
+#line 4401 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -4386,16 +4418,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4392: \$? = $ac_status" >&5
+  echo "$as_me:4424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4398: \$? = $ac_status" >&5
+  echo "$as_me:4430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -4406,7 +4438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4409: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4441: 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
@@ -4415,14 +4447,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:4418: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:4450: 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 4425 "configure"
+#line 4457 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4437,16 +4469,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4443: \$? = $ac_status" >&5
+  echo "$as_me:4475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4449: \$? = $ac_status" >&5
+  echo "$as_me:4481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4553,7 +4585,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4556 "configure"
+#line 4588 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4568,16 +4600,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4574: \$? = $ac_status" >&5
+  echo "$as_me:4606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4580: \$? = $ac_status" >&5
+  echo "$as_me:4612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4592,12 +4624,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4595: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4627: 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:4600: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:4632: 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
@@ -4607,7 +4639,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4610 "configure"
+#line 4642 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4622,16 +4654,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4628: \$? = $ac_status" >&5
+  echo "$as_me:4660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4634: \$? = $ac_status" >&5
+  echo "$as_me:4666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -4642,7 +4674,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4645: result: $cf_cv_default_source" >&5
+echo "$as_me:4677: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -4679,16 +4711,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4682: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4714: 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}:4688: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4720: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4691 "configure"
+#line 4723 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4703,16 +4735,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4709: \$? = $ac_status" >&5
+  echo "$as_me:4741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4715: \$? = $ac_status" >&5
+  echo "$as_me:4747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4733,7 +4765,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4736 "configure"
+#line 4768 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4748,16 +4780,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4754: \$? = $ac_status" >&5
+  echo "$as_me:4786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4760: \$? = $ac_status" >&5
+  echo "$as_me:4792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4768,7 +4800,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4776,10 +4808,10 @@ echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4782 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4794,16 +4826,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4800: \$? = $ac_status" >&5
+  echo "$as_me:4832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4806: \$? = $ac_status" >&5
+  echo "$as_me:4838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4819,7 +4851,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4822: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4854: 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
@@ -4936,7 +4968,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4939: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4971: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -4968,14 +5000,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:4971: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5003: 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 4978 "configure"
+#line 5010 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4993,16 +5025,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4999: \$? = $ac_status" >&5
+  echo "$as_me:5031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5005: \$? = $ac_status" >&5
+  echo "$as_me:5037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5014,7 +5046,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5017 "configure"
+#line 5049 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5032,16 +5064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:5070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5044: \$? = $ac_status" >&5
+  echo "$as_me:5076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5056,7 +5088,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5216,16 +5248,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5219: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5251: 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}:5225: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5257: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5228 "configure"
+#line 5260 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5240,16 +5272,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5246: \$? = $ac_status" >&5
+  echo "$as_me:5278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5252: \$? = $ac_status" >&5
+  echo "$as_me:5284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5270,7 +5302,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5273 "configure"
+#line 5305 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5285,16 +5317,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5291: \$? = $ac_status" >&5
+  echo "$as_me:5323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5297: \$? = $ac_status" >&5
+  echo "$as_me:5329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5305,7 +5337,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5313,10 +5345,10 @@ echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5319 "configure"
+#line 5351 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5331,16 +5363,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5337: \$? = $ac_status" >&5
+  echo "$as_me:5369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5343: \$? = $ac_status" >&5
+  echo "$as_me:5375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5356,7 +5388,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5359: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5391: 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
@@ -5469,10 +5501,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5475 "configure"
+#line 5507 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5490,23 +5522,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5496: \$? = $ac_status" >&5
+  echo "$as_me:5528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5502: \$? = $ac_status" >&5
+  echo "$as_me:5534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5509: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5541: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5529,7 +5561,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5541,7 +5573,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5629,7 +5661,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5639,7 +5671,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5649,7 +5681,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5652: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5684: 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"
@@ -5661,10 +5693,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5664: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5696: 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 5667 "configure"
+#line 5699 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5679,16 +5711,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5685: \$? = $ac_status" >&5
+  echo "$as_me:5717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5691: \$? = $ac_status" >&5
+  echo "$as_me:5723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5697,12 +5729,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5700: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5732: 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 5705 "configure"
+#line 5737 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5717,16 +5749,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5723: \$? = $ac_status" >&5
+  echo "$as_me:5755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5729: \$? = $ac_status" >&5
+  echo "$as_me:5761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5737,19 +5769,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5745: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5777: 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 5752 "configure"
+#line 5784 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5767,16 +5799,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5773: \$? = $ac_status" >&5
+  echo "$as_me:5805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5779: \$? = $ac_status" >&5
+  echo "$as_me:5811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5788,7 +5820,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5791 "configure"
+#line 5823 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5806,16 +5838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5812: \$? = $ac_status" >&5
+  echo "$as_me:5844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5818: \$? = $ac_status" >&5
+  echo "$as_me:5850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5830,7 +5862,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5977,13 +6009,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:5980: checking for ANSI C header files" >&5
+echo "$as_me:6012: 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 5986 "configure"
+#line 6018 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5991,13 +6023,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5994: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6026: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6000: \$? = $ac_status" >&5
+  echo "$as_me:6032: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6019,7 +6051,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6022 "configure"
+#line 6054 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6037,7 +6069,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6040 "configure"
+#line 6072 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6058,7 +6090,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6061 "configure"
+#line 6093 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6084,15 +6116,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6090: \$? = $ac_status" >&5
+  echo "$as_me:6122: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6095: \$? = $ac_status" >&5
+  echo "$as_me:6127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6105,7 +6137,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6121,28 +6153,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6124: checking for $ac_header" >&5
+echo "$as_me:6156: 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 6130 "configure"
+#line 6162 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6139: \$? = $ac_status" >&5
+  echo "$as_me:6171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6145: \$? = $ac_status" >&5
+  echo "$as_me:6177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6152,7 +6184,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6187: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6162,13 +6194,13 @@ EOF
 fi
 done
 
-echo "$as_me:6165: checking whether exit is declared" >&5
+echo "$as_me:6197: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6171 "configure"
+#line 6203 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6183,16 +6215,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6189: \$? = $ac_status" >&5
+  echo "$as_me:6221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6195: \$? = $ac_status" >&5
+  echo "$as_me:6227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6202,10 +6234,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6208: checking for signal global datatype" >&5
+echo "$as_me:6240: 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
@@ -6217,7 +6249,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6220 "configure"
+#line 6252 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6241,16 +6273,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6247: \$? = $ac_status" >&5
+  echo "$as_me:6279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6253: \$? = $ac_status" >&5
+  echo "$as_me:6285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6264,7 +6296,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6267: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6299: 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 <<EOF
@@ -6273,14 +6305,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6276: checking if SIGWINCH is defined" >&5
+echo "$as_me:6308: 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 6283 "configure"
+#line 6315 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6295,23 +6327,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6301: \$? = $ac_status" >&5
+  echo "$as_me:6333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6307: \$? = $ac_status" >&5
+  echo "$as_me:6339: \$? = $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 6314 "configure"
+#line 6346 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6329,16 +6361,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6335: \$? = $ac_status" >&5
+  echo "$as_me:6367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6341: \$? = $ac_status" >&5
+  echo "$as_me:6373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6352,11 +6384,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6355: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6387: 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:6359: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6391: 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
@@ -6367,7 +6399,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6370 "configure"
+#line 6402 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6389,16 +6421,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6395: \$? = $ac_status" >&5
+  echo "$as_me:6427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6401: \$? = $ac_status" >&5
+  echo "$as_me:6433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6412,7 +6444,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6422,13 +6454,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6425: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6457: 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 6431 "configure"
+#line 6463 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6442,16 +6474,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6448: \$? = $ac_status" >&5
+  echo "$as_me:6480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6454: \$? = $ac_status" >&5
+  echo "$as_me:6486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6462,7 +6494,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6472,7 +6504,7 @@ EOF
 
 	fi
 
-echo "$as_me:6475: checking if you want to use pkg-config" >&5
+echo "$as_me:6507: 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.
@@ -6482,7 +6514,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6485: result: $cf_pkg_config" >&5
+echo "$as_me:6517: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6494,7 +6526,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6497: checking for $ac_word" >&5
+echo "$as_me:6529: 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
@@ -6511,7 +6543,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6514: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6546: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6522,10 +6554,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6525: result: $PKG_CONFIG" >&5
+  echo "$as_me:6557: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6528: result: no" >&5
+  echo "$as_me:6560: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6534,7 +6566,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6537: checking for $ac_word" >&5
+echo "$as_me:6569: 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
@@ -6551,7 +6583,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6554: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6586: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6563,10 +6595,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6569: result: no" >&5
+  echo "$as_me:6601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6590,37 +6622,35 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$PKG_CONFIG" in
-(.\$\(*\)*|.\'*\'*)
+case "x$PKG_CONFIG" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval PKG_CONFIG="$PKG_CONFIG"
-	case ".$PKG_CONFIG" in
-	(.NONE/*)
+	case "x$PKG_CONFIG" in
+	(xNONE/*)
 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6642: 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:6619: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6649: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6623: checking if you want to see long compiling messages" >&5
+echo "$as_me:6653: 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.
@@ -6654,10 +6684,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6657: result: $enableval" >&5
+echo "$as_me:6687: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6660: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6690: 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.
@@ -6667,10 +6697,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6673: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6703: 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.
@@ -6687,10 +6717,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6690: result: $cf_enable_widec" >&5
+echo "$as_me:6720: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6693: checking for specific curses-directory" >&5
+echo "$as_me:6723: 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.
@@ -6700,7 +6730,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6703: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6733: 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"
@@ -6712,26 +6742,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$withval" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$withval" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval withval="$withval"
-	case ".$withval" in
-	(.NONE/*)
+	case "x$withval" in
+	(xNONE/*)
 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6767,7 +6795,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6770 "configure"
+#line 6798 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6779,16 +6807,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6785: \$? = $ac_status" >&5
+  echo "$as_me:6813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6791: \$? = $ac_status" >&5
+  echo "$as_me:6819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6805,7 +6833,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6841,7 +6869,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6854,7 +6882,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6857: checking for specified curses library type" >&5
+echo "$as_me:6885: 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.
@@ -6898,13 +6926,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6901: result: $cf_cv_screen" >&5
+echo "$as_me:6929: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6907: checking for extra include directories" >&5
+echo "$as_me:6935: 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
@@ -6930,7 +6958,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -6940,7 +6968,7 @@ then
 
 fi
 
-echo "$as_me:6943: checking if we have identified curses headers" >&5
+echo "$as_me:6971: 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
@@ -6952,7 +6980,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6955 "configure"
+#line 6983 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -6964,16 +6992,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6970: \$? = $ac_status" >&5
+  echo "$as_me:6998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6976: \$? = $ac_status" >&5
+  echo "$as_me:7004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -6984,11 +7012,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6987: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7015: 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:6991: error: No curses header-files found" >&5
+	{ { echo "$as_me:7019: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6998,23 +7026,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7001: checking for $ac_header" >&5
+echo "$as_me:7029: 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 7007 "configure"
+#line 7035 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7039: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7017: \$? = $ac_status" >&5
+  echo "$as_me:7045: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7033,7 +7061,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7064: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7043,7 +7071,7 @@ EOF
 fi
 done
 
-echo "$as_me:7046: checking for terminfo header" >&5
+echo "$as_me:7074: 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
@@ -7061,7 +7089,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7064 "configure"
+#line 7092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7076,16 +7104,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7082: \$? = $ac_status" >&5
+  echo "$as_me:7110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7088: \$? = $ac_status" >&5
+  echo "$as_me:7116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7101,7 +7129,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7104: result: $cf_cv_term_header" >&5
+echo "$as_me:7132: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7133,7 +7161,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7136: checking for ncurses version" >&5
+echo "$as_me:7164: 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
@@ -7159,10 +7187,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7162: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7190: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7165: \$? = $ac_status" >&5
+  echo "$as_me:7193: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7172,7 +7200,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7175 "configure"
+#line 7203 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7199,15 +7227,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7205: \$? = $ac_status" >&5
+  echo "$as_me:7233: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7210: \$? = $ac_status" >&5
+  echo "$as_me:7238: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7221,17 +7249,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7224: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7252: 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:7231: checking if we have identified curses libraries" >&5
+echo "$as_me:7259: 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 7234 "configure"
+#line 7262 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7243,16 +7271,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7249: \$? = $ac_status" >&5
+  echo "$as_me:7277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7255: \$? = $ac_status" >&5
+  echo "$as_me:7283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7261,13 +7289,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7264: result: $cf_result" >&5
+echo "$as_me:7292: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7270: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7298: 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
@@ -7275,7 +7303,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7278 "configure"
+#line 7306 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7294,16 +7322,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7300: \$? = $ac_status" >&5
+  echo "$as_me:7328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7306: \$? = $ac_status" >&5
+  echo "$as_me:7334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7314,7 +7342,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7317: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7345: 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
 
@@ -7344,7 +7372,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7347: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7375: 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
@@ -7352,7 +7380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7355 "configure"
+#line 7383 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7371,16 +7399,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7377: \$? = $ac_status" >&5
+  echo "$as_me:7405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7383: \$? = $ac_status" >&5
+  echo "$as_me:7411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7391,7 +7419,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7394: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7422: 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
 
@@ -7415,7 +7443,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7418: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7446: 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
@@ -7423,7 +7451,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7426 "configure"
+#line 7454 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7442,16 +7470,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7448: \$? = $ac_status" >&5
+  echo "$as_me:7476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7454: \$? = $ac_status" >&5
+  echo "$as_me:7482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7462,7 +7490,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7465: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7493: 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
 
@@ -7520,7 +7548,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7549,7 +7577,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7580,7 +7608,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7615,7 +7643,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7659,13 +7687,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7662: checking for tgoto" >&5
+		echo "$as_me:7690: 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 7668 "configure"
+#line 7696 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7696,16 +7724,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7702: \$? = $ac_status" >&5
+  echo "$as_me:7730: \$? = $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:7733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7708: \$? = $ac_status" >&5
+  echo "$as_me:7736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -7715,7 +7743,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7718: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7746: 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
@@ -7724,7 +7752,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7727: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7755: 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
@@ -7732,7 +7760,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7735 "configure"
+#line 7763 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7751,16 +7779,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7757: \$? = $ac_status" >&5
+  echo "$as_me:7785: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7763: \$? = $ac_status" >&5
+  echo "$as_me:7791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7771,7 +7799,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7774: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7802: 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
 
@@ -7794,10 +7822,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7797: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7825: 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 7800 "configure"
+#line 7828 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7809,16 +7837,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7815: \$? = $ac_status" >&5
+  echo "$as_me:7843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7821: \$? = $ac_status" >&5
+  echo "$as_me:7849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7827,16 +7855,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7830: result: $cf_result" >&5
+				echo "$as_me:7858: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7836: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7864: 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 7839 "configure"
+#line 7867 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7848,16 +7876,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7854: \$? = $ac_status" >&5
+  echo "$as_me:7882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7860: \$? = $ac_status" >&5
+  echo "$as_me:7888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7866,7 +7894,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7869 "configure"
+#line 7897 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7878,16 +7906,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7884: \$? = $ac_status" >&5
+  echo "$as_me:7912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7890: \$? = $ac_status" >&5
+  echo "$as_me:7918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7899,13 +7927,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7902: result: $cf_result" >&5
+				echo "$as_me:7930: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7908: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7936: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7917,23 +7945,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7920: checking for $ac_header" >&5
+echo "$as_me:7948: 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 7926 "configure"
+#line 7954 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7930: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7958: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7936: \$? = $ac_status" >&5
+  echo "$as_me:7964: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7952,7 +7980,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7983: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7962,7 +7990,7 @@ EOF
 fi
 done
 
-echo "$as_me:7965: checking for multibyte character support" >&5
+echo "$as_me:7993: 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
@@ -7970,7 +7998,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7973 "configure"
+#line 8001 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7987,16 +8015,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7993: \$? = $ac_status" >&5
+  echo "$as_me:8021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7999: \$? = $ac_status" >&5
+  echo "$as_me:8027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8008,12 +8036,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8016 "configure"
+#line 8044 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8026,16 +8054,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8032: \$? = $ac_status" >&5
+  echo "$as_me:8060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8038: \$? = $ac_status" >&5
+  echo "$as_me:8066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8049,7 +8077,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8052 "configure"
+#line 8080 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8062,16 +8090,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8068: \$? = $ac_status" >&5
+  echo "$as_me:8096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8074: \$? = $ac_status" >&5
+  echo "$as_me:8102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8088,9 +8116,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8181,7 +8209,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8189,7 +8217,7 @@ echo "${as_me:-configure}:8184: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8192 "configure"
+#line 8220 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8202,21 +8230,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8208: \$? = $ac_status" >&5
+  echo "$as_me:8236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8214: \$? = $ac_status" >&5
+  echo "$as_me:8242: \$? = $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}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8234,7 +8262,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8309,13 +8337,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8312: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8340: 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 8318 "configure"
+#line 8346 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8328,21 +8356,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8334: \$? = $ac_status" >&5
+  echo "$as_me:8362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+  echo "$as_me:8368: \$? = $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}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8384,7 +8412,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8387: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8415: 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
@@ -8422,7 +8450,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8425 "configure"
+#line 8453 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8434,16 +8462,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8440: \$? = $ac_status" >&5
+  echo "$as_me:8468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8446: \$? = $ac_status" >&5
+  echo "$as_me:8474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8460,7 +8488,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8496,7 +8524,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8526,13 +8554,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8529: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8557: 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:8532: result: yes" >&5
+		echo "$as_me:8560: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8535: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8563: 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
 
@@ -8665,7 +8693,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8668 "configure"
+#line 8696 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8677,37 +8705,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8683: \$? = $ac_status" >&5
+  echo "$as_me:8711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8689: \$? = $ac_status" >&5
+  echo "$as_me:8717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8695 "configure"
+#line 8723 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8705: \$? = $ac_status" >&5
+  echo "$as_me:8733: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8710: \$? = $ac_status" >&5
+  echo "$as_me:8738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8881,7 +8909,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8884 "configure"
+#line 8912 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8893,37 +8921,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8899: \$? = $ac_status" >&5
+  echo "$as_me:8927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8905: \$? = $ac_status" >&5
+  echo "$as_me:8933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8911 "configure"
+#line 8939 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8921: \$? = $ac_status" >&5
+  echo "$as_me:8949: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8926: \$? = $ac_status" >&5
+  echo "$as_me:8954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8940,7 +8968,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8943: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8971: 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"
@@ -8956,7 +8984,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8959: checking for terminfo header" >&5
+echo "$as_me:8987: 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
@@ -8974,7 +9002,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8977 "configure"
+#line 9005 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8989,16 +9017,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8995: \$? = $ac_status" >&5
+  echo "$as_me:9023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9001: \$? = $ac_status" >&5
+  echo "$as_me:9029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9014,7 +9042,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9017: result: $cf_cv_term_header" >&5
+echo "$as_me:9045: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9049,7 +9077,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9052: result: no" >&5
+		echo "$as_me:9080: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9065,7 +9093,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9068: checking for $ac_word" >&5
+echo "$as_me:9096: 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
@@ -9080,7 +9108,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9083: found $ac_dir/$ac_word" >&5
+echo "$as_me:9111: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9088,10 +9116,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9094: result: no" >&5
+  echo "$as_me:9122: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9104,7 +9132,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9107: checking for $ac_word" >&5
+echo "$as_me:9135: 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
@@ -9119,7 +9147,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9122: found $ac_dir/$ac_word" >&5
+echo "$as_me:9150: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9127,10 +9155,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9133: result: no" >&5
+  echo "$as_me:9161: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9287,7 +9315,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9290: checking if we have identified curses headers" >&5
+echo "$as_me:9318: 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
@@ -9299,7 +9327,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9302 "configure"
+#line 9330 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9311,16 +9339,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9317: \$? = $ac_status" >&5
+  echo "$as_me:9345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9323: \$? = $ac_status" >&5
+  echo "$as_me:9351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9331,11 +9359,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9334: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9362: 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:9338: error: No curses header-files found" >&5
+	{ { echo "$as_me:9366: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9345,23 +9373,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9348: checking for $ac_header" >&5
+echo "$as_me:9376: 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 9354 "configure"
+#line 9382 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9358: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9364: \$? = $ac_status" >&5
+  echo "$as_me:9392: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9380,7 +9408,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9383: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9411: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9436,7 +9464,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9439 "configure"
+#line 9467 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9448,16 +9476,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9454: \$? = $ac_status" >&5
+  echo "$as_me:9482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9460: \$? = $ac_status" >&5
+  echo "$as_me:9488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9474,7 +9502,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9493,7 +9521,7 @@ fi
 
 }
 
-echo "$as_me:9496: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9524: 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
@@ -9505,7 +9533,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9508 "configure"
+#line 9536 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9529,16 +9557,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9535: \$? = $ac_status" >&5
+  echo "$as_me:9563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9541: \$? = $ac_status" >&5
+  echo "$as_me:9569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9553,14 +9581,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9556: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9584: 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:9563: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9591: 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
@@ -9681,7 +9709,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9684 "configure"
+#line 9712 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9693,16 +9721,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9699: \$? = $ac_status" >&5
+  echo "$as_me:9727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9719,7 +9747,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9742,7 +9770,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9745 "configure"
+#line 9773 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9766,16 +9794,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9772: \$? = $ac_status" >&5
+  echo "$as_me:9800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9778: \$? = $ac_status" >&5
+  echo "$as_me:9806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9796,12 +9824,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9804: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9832: 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%/[^/]*$%%'`
@@ -9837,7 +9865,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9840 "configure"
+#line 9868 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9849,16 +9877,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9855: \$? = $ac_status" >&5
+  echo "$as_me:9883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9861: \$? = $ac_status" >&5
+  echo "$as_me:9889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9875,7 +9903,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9923,7 +9951,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9926: checking for terminfo header" >&5
+echo "$as_me:9954: 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
@@ -9941,7 +9969,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9944 "configure"
+#line 9972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9956,16 +9984,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9962: \$? = $ac_status" >&5
+  echo "$as_me:9990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9968: \$? = $ac_status" >&5
+  echo "$as_me:9996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9981,7 +10009,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9984: result: $cf_cv_term_header" >&5
+echo "$as_me:10012: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10019,7 +10047,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10022: checking for ncurses version" >&5
+echo "$as_me:10050: 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
@@ -10045,10 +10073,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10048: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10076: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10051: \$? = $ac_status" >&5
+  echo "$as_me:10079: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10058,7 +10086,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10061 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10085,15 +10113,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10091: \$? = $ac_status" >&5
+  echo "$as_me:10119: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10096: \$? = $ac_status" >&5
+  echo "$as_me:10124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10107,7 +10135,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10120,7 +10148,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10123: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10151: 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
@@ -10128,7 +10156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10131 "configure"
+#line 10159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10147,16 +10175,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10153: \$? = $ac_status" >&5
+  echo "$as_me:10181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10159: \$? = $ac_status" >&5
+  echo "$as_me:10187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10167,10 +10195,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10170: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10198: 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:10173: checking for initscr in -lgpm" >&5
+  echo "$as_me:10201: 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
@@ -10178,7 +10206,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10181 "configure"
+#line 10209 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10197,16 +10225,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10203: \$? = $ac_status" >&5
+  echo "$as_me:10231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10209: \$? = $ac_status" >&5
+  echo "$as_me:10237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10217,7 +10245,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10220: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10248: 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"
@@ -10232,7 +10260,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10235: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10263: 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
@@ -10240,7 +10268,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10243 "configure"
+#line 10271 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10259,16 +10287,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10265: \$? = $ac_status" >&5
+  echo "$as_me:10293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10271: \$? = $ac_status" >&5
+  echo "$as_me:10299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10279,7 +10307,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10282: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10310: 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"
@@ -10328,13 +10356,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10331: checking for initscr" >&5
+	echo "$as_me:10359: 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 10337 "configure"
+#line 10365 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10365,16 +10393,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10371: \$? = $ac_status" >&5
+  echo "$as_me:10399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10377: \$? = $ac_status" >&5
+  echo "$as_me:10405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10384,18 +10412,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10387: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10415: 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:10394: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10422: 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 10398 "configure"
+#line 10426 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10407,25 +10435,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10413: \$? = $ac_status" >&5
+  echo "$as_me:10441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10419: \$? = $ac_status" >&5
+  echo "$as_me:10447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10421: result: yes" >&5
+  echo "$as_me:10449: 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:10428: result: no" >&5
+echo "$as_me:10456: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10493,11 +10521,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10496: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10524: 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 10500 "configure"
+#line 10528 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10509,25 +10537,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10515: \$? = $ac_status" >&5
+  echo "$as_me:10543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10521: \$? = $ac_status" >&5
+  echo "$as_me:10549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10523: result: yes" >&5
+  echo "$as_me:10551: 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:10530: result: no" >&5
+echo "$as_me:10558: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10542,7 +10570,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10550,7 +10578,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10553: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10581: 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
@@ -10560,7 +10588,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10563 "configure"
+#line 10591 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10572,23 +10600,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10578: \$? = $ac_status" >&5
+  echo "$as_me:10606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10584: \$? = $ac_status" >&5
+  echo "$as_me:10612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10586: result: yes" >&5
+  echo "$as_me:10614: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10591: result: no" >&5
+echo "$as_me:10619: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10613,13 +10641,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10616: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10644: 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:10619: result: yes" >&5
+		echo "$as_me:10647: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10622: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10650: 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
 
@@ -10752,7 +10780,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10755 "configure"
+#line 10783 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10764,37 +10792,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10770: \$? = $ac_status" >&5
+  echo "$as_me:10798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10776: \$? = $ac_status" >&5
+  echo "$as_me:10804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10782 "configure"
+#line 10810 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10792: \$? = $ac_status" >&5
+  echo "$as_me:10820: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10797: \$? = $ac_status" >&5
+  echo "$as_me:10825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10968,7 +10996,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10971 "configure"
+#line 10999 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10980,37 +11008,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10986: \$? = $ac_status" >&5
+  echo "$as_me:11014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10992: \$? = $ac_status" >&5
+  echo "$as_me:11020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10998 "configure"
+#line 11026 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11008: \$? = $ac_status" >&5
+  echo "$as_me:11036: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11013: \$? = $ac_status" >&5
+  echo "$as_me:11041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11027,7 +11055,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11030: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11058: 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"
@@ -11043,7 +11071,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11046: checking for terminfo header" >&5
+echo "$as_me:11074: 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
@@ -11061,7 +11089,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11064 "configure"
+#line 11092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11076,16 +11104,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11082: \$? = $ac_status" >&5
+  echo "$as_me:11110: \$? = $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:11113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11088: \$? = $ac_status" >&5
+  echo "$as_me:11116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11101,7 +11129,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11104: result: $cf_cv_term_header" >&5
+echo "$as_me:11132: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11136,7 +11164,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11139: result: no" >&5
+		echo "$as_me:11167: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11152,7 +11180,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11155: checking for $ac_word" >&5
+echo "$as_me:11183: 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
@@ -11167,7 +11195,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11170: found $ac_dir/$ac_word" >&5
+echo "$as_me:11198: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11175,10 +11203,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11181: result: no" >&5
+  echo "$as_me:11209: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11191,7 +11219,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11194: checking for $ac_word" >&5
+echo "$as_me:11222: 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
@@ -11206,7 +11234,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11209: found $ac_dir/$ac_word" >&5
+echo "$as_me:11237: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11214,10 +11242,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11220: result: no" >&5
+  echo "$as_me:11248: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11374,7 +11402,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11377: checking if we have identified curses headers" >&5
+echo "$as_me:11405: 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
@@ -11386,7 +11414,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11389 "configure"
+#line 11417 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11398,16 +11426,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11404: \$? = $ac_status" >&5
+  echo "$as_me:11432: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11410: \$? = $ac_status" >&5
+  echo "$as_me:11438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11418,11 +11446,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11421: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11449: 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:11425: error: No curses header-files found" >&5
+	{ { echo "$as_me:11453: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11432,23 +11460,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11435: checking for $ac_header" >&5
+echo "$as_me:11463: 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 11441 "configure"
+#line 11469 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11451: \$? = $ac_status" >&5
+  echo "$as_me:11479: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11467,7 +11495,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11498: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11523,7 +11551,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11526 "configure"
+#line 11554 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11535,16 +11563,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11541: \$? = $ac_status" >&5
+  echo "$as_me:11569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11547: \$? = $ac_status" >&5
+  echo "$as_me:11575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11561,7 +11589,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11580,7 +11608,7 @@ fi
 
 }
 
-echo "$as_me:11583: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11611: 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
@@ -11592,7 +11620,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11595 "configure"
+#line 11623 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11616,16 +11644,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11622: \$? = $ac_status" >&5
+  echo "$as_me:11650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11628: \$? = $ac_status" >&5
+  echo "$as_me:11656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11640,14 +11668,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11643: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11671: 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:11650: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11678: 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
@@ -11768,7 +11796,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11771 "configure"
+#line 11799 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11780,16 +11808,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11786: \$? = $ac_status" >&5
+  echo "$as_me:11814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11792: \$? = $ac_status" >&5
+  echo "$as_me:11820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11806,7 +11834,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11829,7 +11857,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11832 "configure"
+#line 11860 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11853,16 +11881,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11859: \$? = $ac_status" >&5
+  echo "$as_me:11887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11865: \$? = $ac_status" >&5
+  echo "$as_me:11893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11883,12 +11911,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11891: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11919: 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%/[^/]*$%%'`
@@ -11924,7 +11952,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11927 "configure"
+#line 11955 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11936,16 +11964,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11942: \$? = $ac_status" >&5
+  echo "$as_me:11970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11948: \$? = $ac_status" >&5
+  echo "$as_me:11976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11962,7 +11990,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12010,7 +12038,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12013: checking for terminfo header" >&5
+echo "$as_me:12041: 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
@@ -12028,7 +12056,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12031 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12043,16 +12071,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12049: \$? = $ac_status" >&5
+  echo "$as_me:12077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12055: \$? = $ac_status" >&5
+  echo "$as_me:12083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12068,7 +12096,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12071: result: $cf_cv_term_header" >&5
+echo "$as_me:12099: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12106,7 +12134,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12109: checking for ncurses version" >&5
+echo "$as_me:12137: 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
@@ -12132,10 +12160,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12135: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12163: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12138: \$? = $ac_status" >&5
+  echo "$as_me:12166: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12145,7 +12173,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12148 "configure"
+#line 12176 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12172,15 +12200,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12178: \$? = $ac_status" >&5
+  echo "$as_me:12206: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12183: \$? = $ac_status" >&5
+  echo "$as_me:12211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12194,7 +12222,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12207,7 +12235,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12210: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12238: 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
@@ -12215,7 +12243,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12218 "configure"
+#line 12246 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12234,16 +12262,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12240: \$? = $ac_status" >&5
+  echo "$as_me:12268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12246: \$? = $ac_status" >&5
+  echo "$as_me:12274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12254,10 +12282,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12257: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12285: 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:12260: checking for initscr in -lgpm" >&5
+  echo "$as_me:12288: 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
@@ -12265,7 +12293,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12268 "configure"
+#line 12296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12284,16 +12312,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12290: \$? = $ac_status" >&5
+  echo "$as_me:12318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12304,7 +12332,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12307: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12335: 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"
@@ -12319,7 +12347,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12322: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12350: 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
@@ -12327,7 +12355,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12330 "configure"
+#line 12358 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12346,16 +12374,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12352: \$? = $ac_status" >&5
+  echo "$as_me:12380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12358: \$? = $ac_status" >&5
+  echo "$as_me:12386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12366,7 +12394,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12369: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12397: 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"
@@ -12415,13 +12443,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12418: checking for initscr" >&5
+	echo "$as_me:12446: 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 12424 "configure"
+#line 12452 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12452,16 +12480,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12458: \$? = $ac_status" >&5
+  echo "$as_me:12486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12464: \$? = $ac_status" >&5
+  echo "$as_me:12492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12471,18 +12499,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12474: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12502: 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:12481: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12509: 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 12485 "configure"
+#line 12513 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12494,25 +12522,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12500: \$? = $ac_status" >&5
+  echo "$as_me:12528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12506: \$? = $ac_status" >&5
+  echo "$as_me:12534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12508: result: yes" >&5
+  echo "$as_me:12536: 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:12515: result: no" >&5
+echo "$as_me:12543: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12580,11 +12608,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12583: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12611: 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 12587 "configure"
+#line 12615 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12596,25 +12624,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12602: \$? = $ac_status" >&5
+  echo "$as_me:12630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12608: \$? = $ac_status" >&5
+  echo "$as_me:12636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12610: result: yes" >&5
+  echo "$as_me:12638: 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:12617: result: no" >&5
+echo "$as_me:12645: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12629,7 +12657,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12637,7 +12665,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12640: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12668: 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
@@ -12647,7 +12675,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12650 "configure"
+#line 12678 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12659,23 +12687,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12665: \$? = $ac_status" >&5
+  echo "$as_me:12693: \$? = $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:12696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12673: result: yes" >&5
+  echo "$as_me:12701: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12678: result: no" >&5
+echo "$as_me:12706: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12695,7 +12723,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12698: checking for X" >&5
+	echo "$as_me:12726: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12799,17 +12827,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12802 "configure"
+#line 12830 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12806: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12812: \$? = $ac_status" >&5
+  echo "$as_me:12840: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12842,7 +12870,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12845 "configure"
+#line 12873 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12854,16 +12882,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12860: \$? = $ac_status" >&5
+  echo "$as_me:12888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12866: \$? = $ac_status" >&5
+  echo "$as_me:12894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12901,7 +12929,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12904: result: $have_x" >&5
+  echo "$as_me:12932: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12911,7 +12939,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12914: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12942: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -12938,11 +12966,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:12941: checking whether -R must be followed by a space" >&5
+      echo "$as_me:12969: 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 12945 "configure"
+#line 12973 "configure"
 #include "confdefs.h"
 
 int
@@ -12954,16 +12982,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12960: \$? = $ac_status" >&5
+  echo "$as_me:12988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12966: \$? = $ac_status" >&5
+  echo "$as_me:12994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -12973,13 +13001,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:12976: result: no" >&5
+	echo "$as_me:13004: 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 12982 "configure"
+#line 13010 "configure"
 #include "confdefs.h"
 
 int
@@ -12991,16 +13019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12997: \$? = $ac_status" >&5
+  echo "$as_me:13025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13003: \$? = $ac_status" >&5
+  echo "$as_me:13031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13010,11 +13038,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13013: result: yes" >&5
+	  echo "$as_me:13041: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13017: result: neither works" >&5
+	  echo "$as_me:13045: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13034,7 +13062,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13037 "configure"
+#line 13065 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13053,22 +13081,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13059: \$? = $ac_status" >&5
+  echo "$as_me:13087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13065: \$? = $ac_status" >&5
+  echo "$as_me:13093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13071: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13099: 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
@@ -13076,7 +13104,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13079 "configure"
+#line 13107 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13095,16 +13123,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13101: \$? = $ac_status" >&5
+  echo "$as_me:13129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13107: \$? = $ac_status" >&5
+  echo "$as_me:13135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13115,14 +13143,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13118: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13146: 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:13125: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13153: 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
@@ -13130,7 +13158,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13133 "configure"
+#line 13161 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13149,16 +13177,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13155: \$? = $ac_status" >&5
+  echo "$as_me:13183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13161: \$? = $ac_status" >&5
+  echo "$as_me:13189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13169,7 +13197,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13172: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13200: 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"
@@ -13188,13 +13216,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13191: checking for gethostbyname" >&5
+    echo "$as_me:13219: 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 13197 "configure"
+#line 13225 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13225,16 +13253,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13231: \$? = $ac_status" >&5
+  echo "$as_me:13259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13237: \$? = $ac_status" >&5
+  echo "$as_me:13265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13244,11 +13272,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13247: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13275: 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:13251: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13279: 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
@@ -13256,7 +13284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13259 "configure"
+#line 13287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13275,16 +13303,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13281: \$? = $ac_status" >&5
+  echo "$as_me:13309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13287: \$? = $ac_status" >&5
+  echo "$as_me:13315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13295,14 +13323,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13298: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13326: 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:13305: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13333: 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
@@ -13310,7 +13338,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13313 "configure"
+#line 13341 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13329,16 +13357,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13335: \$? = $ac_status" >&5
+  echo "$as_me:13363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13341: \$? = $ac_status" >&5
+  echo "$as_me:13369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13349,7 +13377,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13352: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13380: 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"
@@ -13365,13 +13393,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13368: checking for connect" >&5
+    echo "$as_me:13396: 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 13374 "configure"
+#line 13402 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13402,16 +13430,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13408: \$? = $ac_status" >&5
+  echo "$as_me:13436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13414: \$? = $ac_status" >&5
+  echo "$as_me:13442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13421,11 +13449,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13424: result: $ac_cv_func_connect" >&5
+echo "$as_me:13452: 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:13428: checking for connect in -lsocket" >&5
+      echo "$as_me:13456: 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
@@ -13433,7 +13461,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13436 "configure"
+#line 13464 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13452,16 +13480,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13458: \$? = $ac_status" >&5
+  echo "$as_me:13486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13464: \$? = $ac_status" >&5
+  echo "$as_me:13492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13472,7 +13500,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13475: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13503: 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"
@@ -13481,13 +13509,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13484: checking for remove" >&5
+    echo "$as_me:13512: 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 13490 "configure"
+#line 13518 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13518,16 +13546,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13524: \$? = $ac_status" >&5
+  echo "$as_me:13552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13530: \$? = $ac_status" >&5
+  echo "$as_me:13558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13537,11 +13565,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13540: result: $ac_cv_func_remove" >&5
+echo "$as_me:13568: 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:13544: checking for remove in -lposix" >&5
+      echo "$as_me:13572: 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
@@ -13549,7 +13577,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13552 "configure"
+#line 13580 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13568,16 +13596,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13574: \$? = $ac_status" >&5
+  echo "$as_me:13602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13580: \$? = $ac_status" >&5
+  echo "$as_me:13608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13588,7 +13616,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13591: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13619: 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"
@@ -13597,13 +13625,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13600: checking for shmat" >&5
+    echo "$as_me:13628: 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 13606 "configure"
+#line 13634 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13634,16 +13662,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13640: \$? = $ac_status" >&5
+  echo "$as_me:13668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13646: \$? = $ac_status" >&5
+  echo "$as_me:13674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13653,11 +13681,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13656: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13684: 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:13660: checking for shmat in -lipc" >&5
+      echo "$as_me:13688: 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
@@ -13665,7 +13693,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13668 "configure"
+#line 13696 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13684,16 +13712,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13690: \$? = $ac_status" >&5
+  echo "$as_me:13718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13696: \$? = $ac_status" >&5
+  echo "$as_me:13724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13704,7 +13732,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13707: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13735: 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"
@@ -13722,7 +13750,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13725: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13753: 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
@@ -13730,7 +13758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13733 "configure"
+#line 13761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13749,16 +13777,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13755: \$? = $ac_status" >&5
+  echo "$as_me:13783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13761: \$? = $ac_status" >&5
+  echo "$as_me:13789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13769,7 +13797,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13772: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13800: 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"
@@ -13781,7 +13809,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13784: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13812: 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=
 
@@ -13792,14 +13820,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13795: result: yes" >&5
+	echo "$as_me:13823: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13798: result: no" >&5
+	echo "$as_me:13826: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13802: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13830: 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=
 
@@ -13810,14 +13838,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13813: result: yes" >&5
+	echo "$as_me:13841: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13816: result: no" >&5
+	echo "$as_me:13844: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13820: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13848: 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=
 
@@ -13828,14 +13856,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13831: result: yes" >&5
+	echo "$as_me:13859: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13834: result: no" >&5
+	echo "$as_me:13862: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13838: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13866: 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=
 
@@ -13846,10 +13874,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13849: result: yes" >&5
+	echo "$as_me:13877: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13852: result: no" >&5
+	echo "$as_me:13880: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13869,17 +13897,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13872: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13900: 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}:13878: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13906: 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}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14010,20 +14038,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14013: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14041: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14019: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14047: 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 14026 "configure"
+#line 14054 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14041,16 +14069,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14047: \$? = $ac_status" >&5
+  echo "$as_me:14075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14053: \$? = $ac_status" >&5
+  echo "$as_me:14081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14060,7 +14088,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14072,7 +14100,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14080,17 +14108,17 @@ echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14083: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14111: 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}:14089: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14117: 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}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14210,12 +14238,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14213: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14241: 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}:14218: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14246: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14223,12 +14251,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14226: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14254: 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}:14231: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14259: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14239,7 +14267,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14242: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14270: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14264,17 +14292,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14267: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14295: 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}:14273: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14301: 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}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14395,7 +14423,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14398: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14426: 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
@@ -14403,7 +14431,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14406 "configure"
+#line 14434 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14422,16 +14450,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14428: \$? = $ac_status" >&5
+  echo "$as_me:14456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14434: \$? = $ac_status" >&5
+  echo "$as_me:14462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14442,7 +14470,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14445: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14473: 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
 
@@ -14478,17 +14506,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14481: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14509: 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}:14487: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14515: 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}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14608,24 +14636,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14611: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14639: 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}:14618: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14646: 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}:14624: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14652: 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}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14745,24 +14773,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14748: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14776: 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}:14755: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14783: 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}:14761: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14789: 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}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14882,24 +14910,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14885: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14913: 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}:14892: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14920: 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}:14898: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14926: 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}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15019,7 +15047,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15022: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15050: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15032,17 +15060,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15035: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15063: 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}:15041: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15069: 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}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15163,14 +15191,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15166: checking for usable X dependency" >&5
+echo "$as_me:15194: 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 15173 "configure"
+#line 15201 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15190,16 +15218,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15196: \$? = $ac_status" >&5
+  echo "$as_me:15224: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15202: \$? = $ac_status" >&5
+  echo "$as_me:15230: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15209,30 +15237,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15212: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15240: 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}:15218: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15246: 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}:15225: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15253: 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}:15231: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15259: 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}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15355,12 +15383,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15358: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15386: 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}:15363: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15391: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15368,14 +15396,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15371: checking for usable X Toolkit package" >&5
+echo "$as_me:15399: 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 15378 "configure"
+#line 15406 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15391,16 +15419,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15397: \$? = $ac_status" >&5
+  echo "$as_me:15425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15403: \$? = $ac_status" >&5
+  echo "$as_me:15431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15410,7 +15438,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15424,22 +15452,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15427: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15455: 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}:15432: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15460: 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}:15438: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15466: 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}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15558,17 +15586,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15561: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15589: 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}:15567: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15595: 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}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15697,12 +15725,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15700: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15728: 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}:15705: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15733: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15722,7 +15750,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15807,7 +15835,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15817,7 +15845,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15827,7 +15855,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15830: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15858: 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"
@@ -15836,7 +15864,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15839 "configure"
+#line 15867 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15848,16 +15876,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15854: \$? = $ac_status" >&5
+  echo "$as_me:15882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15860: \$? = $ac_status" >&5
+  echo "$as_me:15888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15865,12 +15893,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15868: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15896: 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}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15878,13 +15906,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15881: checking for XOpenDisplay" >&5
+	echo "$as_me:15909: 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 15887 "configure"
+#line 15915 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15915,16 +15943,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15921: \$? = $ac_status" >&5
+  echo "$as_me:15949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15927: \$? = $ac_status" >&5
+  echo "$as_me:15955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15934,13 +15962,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15937: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15965: 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:15943: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:15971: 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
@@ -15948,7 +15976,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15951 "configure"
+#line 15979 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15967,16 +15995,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15973: \$? = $ac_status" >&5
+  echo "$as_me:16001: \$? = $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:16004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15979: \$? = $ac_status" >&5
+  echo "$as_me:16007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -15987,7 +16015,7 @@ fi
 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_X11_XOpenDisplay" >&5
+echo "$as_me:16018: 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
 
@@ -16011,13 +16039,13 @@ fi
 
 fi
 
-	echo "$as_me:16014: checking for XtAppInitialize" >&5
+	echo "$as_me:16042: 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 16020 "configure"
+#line 16048 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16048,16 +16076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16054: \$? = $ac_status" >&5
+  echo "$as_me:16082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16060: \$? = $ac_status" >&5
+  echo "$as_me:16088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16067,13 +16095,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16070: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16098: 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:16076: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16104: 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
@@ -16081,7 +16109,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16084 "configure"
+#line 16112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16100,16 +16128,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16106: \$? = $ac_status" >&5
+  echo "$as_me:16134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16112: \$? = $ac_status" >&5
+  echo "$as_me:16140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16120,7 +16148,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16123: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16151: 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
 
@@ -16137,7 +16165,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16140: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16168: 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
@@ -16178,14 +16206,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16181: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16209: 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:16184: checking for $cf_test" >&5
+			echo "$as_me:16212: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16188 "configure"
+#line 16216 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16199,16 +16227,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16205: \$? = $ac_status" >&5
+  echo "$as_me:16233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16211: \$? = $ac_status" >&5
+  echo "$as_me:16239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16217,7 +16245,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16220: result: $cf_result" >&5
+		echo "$as_me:16248: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16233,7 +16261,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16236: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16264: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16298,10 +16326,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16301: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16329: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16304 "configure"
+#line 16332 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16318,16 +16346,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16324: \$? = $ac_status" >&5
+  echo "$as_me:16352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16330: \$? = $ac_status" >&5
+  echo "$as_me:16358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16336,7 +16364,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16339: result: $cf_result" >&5
+		echo "$as_me:16367: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16353,7 +16381,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16356: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16384: 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
@@ -16387,7 +16415,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16390: checking for $ac_word" >&5
+echo "$as_me:16418: 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
@@ -16402,7 +16430,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16405: found $ac_dir/$ac_word" >&5
+echo "$as_me:16433: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16410,10 +16438,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16416: result: no" >&5
+  echo "$as_me:16444: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16426,7 +16454,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16429: checking for $ac_word" >&5
+echo "$as_me:16457: 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
@@ -16441,7 +16469,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16444: found $ac_dir/$ac_word" >&5
+echo "$as_me:16472: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16449,10 +16477,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16455: result: no" >&5
+  echo "$as_me:16483: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16587,7 +16615,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16672,7 +16700,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16682,7 +16710,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16692,7 +16720,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16695: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16723: 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"
@@ -16701,7 +16729,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16704 "configure"
+#line 16732 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16713,16 +16741,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16719: \$? = $ac_status" >&5
+  echo "$as_me:16747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16725: \$? = $ac_status" >&5
+  echo "$as_me:16753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16730,12 +16758,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16733: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16761: 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}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16743,7 +16771,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16746: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16774: 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
@@ -16751,7 +16779,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16754 "configure"
+#line 16782 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16770,16 +16798,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16776: \$? = $ac_status" >&5
+  echo "$as_me:16804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16782: \$? = $ac_status" >&5
+  echo "$as_me:16810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16790,7 +16818,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16793: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16821: 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
 
@@ -16812,7 +16840,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16815: checking for XCurses library" >&5
+echo "$as_me:16843: 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
@@ -16835,7 +16863,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16838 "configure"
+#line 16866 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16850,16 +16878,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16856: \$? = $ac_status" >&5
+  echo "$as_me:16884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16862: \$? = $ac_status" >&5
+  echo "$as_me:16890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16870,7 +16898,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16885,23 +16913,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16888: checking for xcurses.h" >&5
+	echo "$as_me:16916: 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 16894 "configure"
+#line 16922 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16898: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16904: \$? = $ac_status" >&5
+  echo "$as_me:16932: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16920,7 +16948,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16923: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16951: 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
 
@@ -16931,26 +16959,26 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:16934: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:16962: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:16969: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:16947: checking for _nc_init_pthreads" >&5
+echo "$as_me:16975: checking for _nc_init_pthreads" >&5
 echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
 if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16953 "configure"
+#line 16981 "configure"
 #include "confdefs.h"
 #define _nc_init_pthreads autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16981,16 +17009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16987: \$? = $ac_status" >&5
+  echo "$as_me:17015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16993: \$? = $ac_status" >&5
+  echo "$as_me:17021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_init_pthreads=yes
 else
@@ -17000,7 +17028,7 @@ ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17003: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "$as_me:17031: result: $ac_cv_func__nc_init_pthreads" >&5
 echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
 if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
@@ -17035,7 +17063,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17038: checking for X11 rgb file" >&5
+echo "$as_me:17066: 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.
@@ -17080,26 +17108,24 @@ else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_path="$cf_path"
-	case ".$cf_path" in
-	(.NONE/*)
+	case "x$cf_path" in
+	(xNONE/*)
 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17107,7 +17133,7 @@ esac
 
 fi
 
-echo "$as_me:17110: result: $RGB_PATH" >&5
+echo "$as_me:17136: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17148,7 +17174,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17151: checking for desired basename for form library" >&5
+echo "$as_me:17177: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17168,10 +17194,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17171: result: $FORM_NAME" >&5
+echo "$as_me:17197: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17174: checking for desired basename for menu library" >&5
+echo "$as_me:17200: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17191,10 +17217,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17194: result: $MENU_NAME" >&5
+echo "$as_me:17220: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17197: checking for desired basename for panel library" >&5
+echo "$as_me:17223: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17214,10 +17240,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17217: result: $PANEL_NAME" >&5
+echo "$as_me:17243: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17220: checking if you want to check for panel functions" >&5
+echo "$as_me:17246: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17234,7 +17260,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17237: result: $cf_enable_panel" >&5
+echo "$as_me:17263: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17245,13 +17271,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17248: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17274: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17251: result: yes" >&5
+		echo "$as_me:17277: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17254: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17280: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17401,7 +17427,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17404 "configure"
+#line 17430 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17413,37 +17439,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17419: \$? = $ac_status" >&5
+  echo "$as_me:17445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17425: \$? = $ac_status" >&5
+  echo "$as_me:17451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17431 "configure"
+#line 17457 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17441: \$? = $ac_status" >&5
+  echo "$as_me:17467: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17446: \$? = $ac_status" >&5
+  echo "$as_me:17472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17460,7 +17486,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17463: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17489: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17481,7 +17507,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17484: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17510: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17489,7 +17515,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17492 "configure"
+#line 17518 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17508,16 +17534,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17514: \$? = $ac_status" >&5
+  echo "$as_me:17540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17520: \$? = $ac_status" >&5
+  echo "$as_me:17546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17528,7 +17554,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17531: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17557: 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
 
@@ -17561,7 +17587,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17564: checking if you want to check for menu functions" >&5
+echo "$as_me:17590: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17578,7 +17604,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17581: result: $cf_enable_menu" >&5
+echo "$as_me:17607: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17587,14 +17613,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17590: checking for NetBSD menu.h" >&5
+echo "$as_me:17616: 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 17597 "configure"
+#line 17623 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17612,16 +17638,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17618: \$? = $ac_status" >&5
+  echo "$as_me:17644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17624: \$? = $ac_status" >&5
+  echo "$as_me:17650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17633,7 +17659,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17650,13 +17676,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17653: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17679: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17656: result: yes" >&5
+		echo "$as_me:17682: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17659: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17685: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17806,7 +17832,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17809 "configure"
+#line 17835 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17818,37 +17844,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17824: \$? = $ac_status" >&5
+  echo "$as_me:17850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17830: \$? = $ac_status" >&5
+  echo "$as_me:17856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17836 "configure"
+#line 17862 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17846: \$? = $ac_status" >&5
+  echo "$as_me:17872: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17851: \$? = $ac_status" >&5
+  echo "$as_me:17877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17865,7 +17891,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17868: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17894: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17886,7 +17912,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17889: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17915: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17894,7 +17920,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17897 "configure"
+#line 17923 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17913,16 +17939,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17919: \$? = $ac_status" >&5
+  echo "$as_me:17945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17925: \$? = $ac_status" >&5
+  echo "$as_me:17951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17933,7 +17959,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17936: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17962: 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
 
@@ -17966,7 +17992,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:17969: checking if you want to check for form functions" >&5
+echo "$as_me:17995: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -17983,7 +18009,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:17986: result: $cf_enable_form" >&5
+echo "$as_me:18012: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -17992,14 +18018,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17995: checking for NetBSD form.h" >&5
+echo "$as_me:18021: 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 18002 "configure"
+#line 18028 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18018,16 +18044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18024: \$? = $ac_status" >&5
+  echo "$as_me:18050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18030: \$? = $ac_status" >&5
+  echo "$as_me:18056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18039,7 +18065,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18056,13 +18082,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18059: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18085: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18062: result: yes" >&5
+		echo "$as_me:18088: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18065: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18091: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18212,7 +18238,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18215 "configure"
+#line 18241 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18224,37 +18250,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18230: \$? = $ac_status" >&5
+  echo "$as_me:18256: \$? = $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:18259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18236: \$? = $ac_status" >&5
+  echo "$as_me:18262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18242 "configure"
+#line 18268 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18278: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18257: \$? = $ac_status" >&5
+  echo "$as_me:18283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18271,7 +18297,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18274: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18300: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18292,7 +18318,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18295: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18321: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18300,7 +18326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18303 "configure"
+#line 18329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18319,16 +18345,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18325: \$? = $ac_status" >&5
+  echo "$as_me:18351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18331: \$? = $ac_status" >&5
+  echo "$as_me:18357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18339,7 +18365,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18342: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18368: 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
 
@@ -18377,23 +18403,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18380: checking for $ac_header" >&5
+echo "$as_me:18406: 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 18386 "configure"
+#line 18412 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18416: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18396: \$? = $ac_status" >&5
+  echo "$as_me:18422: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18412,7 +18438,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18441: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18422,13 +18448,13 @@ EOF
 fi
 done
 
-echo "$as_me:18425: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18451: 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 18431 "configure"
+#line 18457 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18444,16 +18470,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18450: \$? = $ac_status" >&5
+  echo "$as_me:18476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18456: \$? = $ac_status" >&5
+  echo "$as_me:18482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18463,7 +18489,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18466: result: $ac_cv_header_time" >&5
+echo "$as_me:18492: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18474,7 +18500,6 @@ EOF
 fi
 
 for ac_header in \
-getopt.h \
 locale.h \
 math.h \
 stdarg.h \
@@ -18482,27 +18507,26 @@ sys/ioctl.h \
 sys/select.h \
 sys/time.h \
 termios.h \
-unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18489: checking for $ac_header" >&5
+echo "$as_me:18513: 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 18495 "configure"
+#line 18519 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18505: \$? = $ac_status" >&5
+  echo "$as_me:18529: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18521,7 +18545,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18531,26 +18555,26 @@ EOF
 fi
 done
 
-for ac_header in unistd.h getopt.h
+for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18537: checking for $ac_header" >&5
+echo "$as_me:18561: 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 18543 "configure"
+#line 18567 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18553: \$? = $ac_status" >&5
+  echo "$as_me:18577: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18569,7 +18593,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18579,7 +18603,7 @@ EOF
 fi
 done
 
-echo "$as_me:18582: checking for header declaring getopt variables" >&5
+echo "$as_me:18606: 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
@@ -18589,7 +18613,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18592 "configure"
+#line 18616 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18602,16 +18626,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18608: \$? = $ac_status" >&5
+  echo "$as_me:18632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18614: \$? = $ac_status" >&5
+  echo "$as_me:18638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18623,7 +18647,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18641,13 +18665,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18644: checking for clock_gettime" >&5
+echo "$as_me:18668: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18650 "configure"
+#line 18674 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18678,16 +18702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18684: \$? = $ac_status" >&5
+  echo "$as_me:18708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18690: \$? = $ac_status" >&5
+  echo "$as_me:18714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18697,12 +18721,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18700: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18724: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18705: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18729: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18710,7 +18734,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18713 "configure"
+#line 18737 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18729,16 +18753,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18735: \$? = $ac_status" >&5
+  echo "$as_me:18759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18741: \$? = $ac_status" >&5
+  echo "$as_me:18765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18749,7 +18773,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18752: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18776: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18761,14 +18785,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18764: checking if clock_gettime links" >&5
+echo "$as_me:18788: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18771 "configure"
+#line 18795 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18786,16 +18810,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18792: \$? = $ac_status" >&5
+  echo "$as_me:18816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18798: \$? = $ac_status" >&5
+  echo "$as_me:18822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18806,7 +18830,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18820,13 +18844,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18823: checking for gettimeofday" >&5
+echo "$as_me:18847: 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 18829 "configure"
+#line 18853 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18857,16 +18881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18863: \$? = $ac_status" >&5
+  echo "$as_me:18887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18869: \$? = $ac_status" >&5
+  echo "$as_me:18893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18876,7 +18900,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18886,7 +18910,7 @@ EOF
 
 else
 
-echo "$as_me:18889: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18913: 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
@@ -18894,7 +18918,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18897 "configure"
+#line 18921 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18913,16 +18937,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18919: \$? = $ac_status" >&5
+  echo "$as_me:18943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18925: \$? = $ac_status" >&5
+  echo "$as_me:18949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -18933,7 +18957,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18936: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18960: 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
 
@@ -18971,13 +18995,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18974: checking for $ac_func" >&5
+echo "$as_me:18998: 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 18980 "configure"
+#line 19004 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19008,16 +19032,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19014: \$? = $ac_status" >&5
+  echo "$as_me:19038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19020: \$? = $ac_status" >&5
+  echo "$as_me:19044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19027,7 +19051,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19030: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19054: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19038,14 +19062,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19041: checking if we can use termcap.h" >&5
+echo "$as_me:19065: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19048 "configure"
+#line 19072 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19066,16 +19090,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19072: \$? = $ac_status" >&5
+  echo "$as_me:19096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19078: \$? = $ac_status" >&5
+  echo "$as_me:19102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19085,7 +19109,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19088: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19112: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19095,14 +19119,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19098: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19122: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19105 "configure"
+#line 19129 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19123,16 +19147,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19129: \$? = $ac_status" >&5
+  echo "$as_me:19153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19135: \$? = $ac_status" >&5
+  echo "$as_me:19159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19142,7 +19166,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19145: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19169: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19152,7 +19176,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19155: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19179: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19171,13 +19195,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19174: checking for $ac_func" >&5
+echo "$as_me:19198: 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 19180 "configure"
+#line 19204 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19208,16 +19232,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19214: \$? = $ac_status" >&5
+  echo "$as_me:19238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19220: \$? = $ac_status" >&5
+  echo "$as_me:19244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19227,7 +19251,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19254: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19239,7 +19263,7 @@ done
 
 fi
 
-echo "$as_me:19242: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19266: 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
@@ -19247,7 +19271,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19250 "configure"
+#line 19274 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19280,16 +19304,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19286: \$? = $ac_status" >&5
+  echo "$as_me:19310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19292: \$? = $ac_status" >&5
+  echo "$as_me:19316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19299,7 +19323,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19302 "configure"
+#line 19326 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19325,16 +19349,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19331: \$? = $ac_status" >&5
+  echo "$as_me:19355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19337: \$? = $ac_status" >&5
+  echo "$as_me:19361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19348,7 +19372,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19360,7 +19384,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19363: checking for term.h" >&5
+echo "$as_me:19387: 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
@@ -19381,7 +19405,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19384 "configure"
+#line 19408 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19395,16 +19419,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19401: \$? = $ac_status" >&5
+  echo "$as_me:19425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19407: \$? = $ac_status" >&5
+  echo "$as_me:19431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19423,7 +19447,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19426 "configure"
+#line 19450 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19441,16 +19465,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19447: \$? = $ac_status" >&5
+  echo "$as_me:19471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19453: \$? = $ac_status" >&5
+  echo "$as_me:19477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19465,7 +19489,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19468: result: $cf_cv_term_header" >&5
+echo "$as_me:19492: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19492,7 +19516,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19495: checking for unctrl.h" >&5
+echo "$as_me:19519: 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
@@ -19513,7 +19537,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19516 "configure"
+#line 19540 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19527,16 +19551,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19533: \$? = $ac_status" >&5
+  echo "$as_me:19557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19539: \$? = $ac_status" >&5
+  echo "$as_me:19563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19549,12 +19573,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19652,10 +19676,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19655: checking for ${cf_func}" >&5
+	echo "$as_me:19679: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19664,7 +19688,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19667 "configure"
+#line 19691 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19697,16 +19721,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19703: \$? = $ac_status" >&5
+  echo "$as_me:19727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19709: \$? = $ac_status" >&5
+  echo "$as_me:19733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19722,7 +19746,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19725: result: $cf_result" >&5
+	echo "$as_me:19749: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19737,10 +19761,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19740: checking for ${cf_func}" >&5
+	echo "$as_me:19764: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19749,7 +19773,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19752 "configure"
+#line 19776 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19782,16 +19806,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19788: \$? = $ac_status" >&5
+  echo "$as_me:19812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19794: \$? = $ac_status" >&5
+  echo "$as_me:19818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19807,7 +19831,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19810: result: $cf_result" >&5
+	echo "$as_me:19834: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19831,7 +19855,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19834 "configure"
+#line 19858 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19851,21 +19875,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19857: \$? = $ac_status" >&5
+  echo "$as_me:19881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19863: \$? = $ac_status" >&5
+  echo "$as_me:19887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19885,14 +19909,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19888: checking for ncurses extended functions" >&5
+echo "$as_me:19912: 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 19895 "configure"
+#line 19919 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19907,16 +19931,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19913: \$? = $ac_status" >&5
+  echo "$as_me:19937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19919: \$? = $ac_status" >&5
+  echo "$as_me:19943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19924,7 +19948,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19927 "configure"
+#line 19951 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19949,16 +19973,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19955: \$? = $ac_status" >&5
+  echo "$as_me:19979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19961: \$? = $ac_status" >&5
+  echo "$as_me:19985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19972,7 +19996,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19975: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19999: 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
@@ -19986,11 +20010,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19989: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:20013: 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 19993 "configure"
+#line 20017 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20003,16 +20027,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20009: \$? = $ac_status" >&5
+  echo "$as_me:20033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20015: \$? = $ac_status" >&5
+  echo "$as_me:20039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20021,7 +20045,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20024 "configure"
+#line 20048 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20034,16 +20058,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20040: \$? = $ac_status" >&5
+  echo "$as_me:20064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20046: \$? = $ac_status" >&5
+  echo "$as_me:20070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20054,7 +20078,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20057: result: $cf_define_xpg5" >&5
+		echo "$as_me:20081: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20063,14 +20087,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20066: checking for wide-character functions" >&5
+	echo "$as_me:20090: 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 20073 "configure"
+#line 20097 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20087,16 +20111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20093: \$? = $ac_status" >&5
+  echo "$as_me:20117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20099: \$? = $ac_status" >&5
+  echo "$as_me:20123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20107,7 +20131,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20128,14 +20152,14 @@ EOF
 
 fi
 
-echo "$as_me:20131: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20155: 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 20138 "configure"
+#line 20162 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20153,16 +20177,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20159: \$? = $ac_status" >&5
+  echo "$as_me:20183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20165: \$? = $ac_status" >&5
+  echo "$as_me:20189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20173,21 +20197,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20176: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20200: 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:20183: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20207: 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 20190 "configure"
+#line 20214 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20207,16 +20231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20213: \$? = $ac_status" >&5
+  echo "$as_me:20237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20219: \$? = $ac_status" >&5
+  echo "$as_me:20243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20228,7 +20252,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20231: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20255: 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
@@ -20237,7 +20261,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20240: checking for openpty in -lutil" >&5
+echo "$as_me:20264: 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
@@ -20245,7 +20269,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20248 "configure"
+#line 20272 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20264,16 +20288,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20270: \$? = $ac_status" >&5
+  echo "$as_me:20294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20276: \$? = $ac_status" >&5
+  echo "$as_me:20300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20284,7 +20308,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20287: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20311: 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
@@ -20292,7 +20316,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20295: checking for openpty header" >&5
+echo "$as_me:20319: 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
@@ -20319,7 +20343,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20322 "configure"
+#line 20346 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20337,16 +20361,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20343: \$? = $ac_status" >&5
+  echo "$as_me:20367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20349: \$? = $ac_status" >&5
+  echo "$as_me:20373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20364,7 +20388,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20398,7 +20422,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20401: checking for function curses_version" >&5
+echo "$as_me:20425: 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
@@ -20408,7 +20432,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20411 "configure"
+#line 20435 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20424,15 +20448,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20430: \$? = $ac_status" >&5
+  echo "$as_me:20454: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20435: \$? = $ac_status" >&5
+  echo "$as_me:20459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20447,14 +20471,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20450: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20474: 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:20457: checking for alternate character set array" >&5
+echo "$as_me:20481: 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
@@ -20464,7 +20488,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20467 "configure"
+#line 20491 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20480,16 +20504,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20486: \$? = $ac_status" >&5
+  echo "$as_me:20510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20492: \$? = $ac_status" >&5
+  echo "$as_me:20516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20500,7 +20524,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20510,7 +20534,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20513: checking for wide alternate character set array" >&5
+echo "$as_me:20537: 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
@@ -20520,7 +20544,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20523 "configure"
+#line 20547 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20536,16 +20560,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20542: \$? = $ac_status" >&5
+  echo "$as_me:20566: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20548: \$? = $ac_status" >&5
+  echo "$as_me:20572: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20556,7 +20580,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20564,7 +20588,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20567: checking for wide alternate character constants" >&5
+echo "$as_me:20591: 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
@@ -20574,7 +20598,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20577 "configure"
+#line 20601 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20591,16 +20615,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20597: \$? = $ac_status" >&5
+  echo "$as_me:20621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20603: \$? = $ac_status" >&5
+  echo "$as_me:20627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20610,7 +20634,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20613 "configure"
+#line 20637 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20626,16 +20650,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20632: \$? = $ac_status" >&5
+  echo "$as_me:20656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20646,7 +20670,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20656,10 +20680,10 @@ EOF
 
 fi
 
-echo "$as_me:20659: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20683: 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 20662 "configure"
+#line 20686 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20677,16 +20701,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20683: \$? = $ac_status" >&5
+  echo "$as_me:20707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20689: \$? = $ac_status" >&5
+  echo "$as_me:20713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20695,7 +20719,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20698: result: $cf_result" >&5
+echo "$as_me:20722: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20716,14 +20740,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20719: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20743: 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 20726 "configure"
+#line 20750 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20741,23 +20765,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20747: \$? = $ac_status" >&5
+  echo "$as_me:20771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20753: \$? = $ac_status" >&5
+  echo "$as_me:20777: \$? = $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 20760 "configure"
+#line 20784 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20776,16 +20800,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20782: \$? = $ac_status" >&5
+  echo "$as_me:20806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20788: \$? = $ac_status" >&5
+  echo "$as_me:20812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20797,7 +20821,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20820,14 +20844,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20823: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20847: 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 20830 "configure"
+#line 20854 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20845,23 +20869,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20851: \$? = $ac_status" >&5
+  echo "$as_me:20875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20857: \$? = $ac_status" >&5
+  echo "$as_me:20881: \$? = $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 20864 "configure"
+#line 20888 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20880,16 +20904,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20886: \$? = $ac_status" >&5
+  echo "$as_me:20910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20892: \$? = $ac_status" >&5
+  echo "$as_me:20916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20901,7 +20925,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20924,14 +20948,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20927: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20951: 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 20934 "configure"
+#line 20958 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20949,23 +20973,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20955: \$? = $ac_status" >&5
+  echo "$as_me:20979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20961: \$? = $ac_status" >&5
+  echo "$as_me:20985: \$? = $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 20968 "configure"
+#line 20992 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20984,16 +21008,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20990: \$? = $ac_status" >&5
+  echo "$as_me:21014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20996: \$? = $ac_status" >&5
+  echo "$as_me:21020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -21005,7 +21029,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21008: result: $cf_cv_wint_t" >&5
+echo "$as_me:21032: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21029,10 +21053,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21032: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21056: 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 21035 "configure"
+#line 21059 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21050,16 +21074,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21056: \$? = $ac_status" >&5
+  echo "$as_me:21080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21062: \$? = $ac_status" >&5
+  echo "$as_me:21086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21068,7 +21092,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21071: result: $cf_result" >&5
+echo "$as_me:21095: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21090,10 +21114,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21093: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21117: 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 21096 "configure"
+#line 21120 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21111,16 +21135,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21117: \$? = $ac_status" >&5
+  echo "$as_me:21141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21123: \$? = $ac_status" >&5
+  echo "$as_me:21147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21129,7 +21153,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21132: result: $cf_result" >&5
+echo "$as_me:21156: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21151,10 +21175,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21154: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21178: 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 21157 "configure"
+#line 21181 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21172,16 +21196,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21178: \$? = $ac_status" >&5
+  echo "$as_me:21202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21184: \$? = $ac_status" >&5
+  echo "$as_me:21208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21190,7 +21214,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21193: result: $cf_result" >&5
+echo "$as_me:21217: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21219,11 +21243,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21246: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21226 "configure"
+#line 21250 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21256,16 +21280,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21262: \$? = $ac_status" >&5
+  echo "$as_me:21286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21268: \$? = $ac_status" >&5
+  echo "$as_me:21292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21275,7 +21299,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21278: result: $cf_result" >&5
+echo "$as_me:21302: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21287,14 +21311,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21290: checking for data $cf_data in library" >&5
+	echo "$as_me:21314: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21297 "configure"
+#line 21321 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21333,16 +21357,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21339: \$? = $ac_status" >&5
+  echo "$as_me:21363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21345: \$? = $ac_status" >&5
+  echo "$as_me:21369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21354,7 +21378,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21357 "configure"
+#line 21381 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21386,15 +21410,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21392: \$? = $ac_status" >&5
+  echo "$as_me:21416: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21397: \$? = $ac_status" >&5
+  echo "$as_me:21421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21406,7 +21430,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21409: result: $cf_result" >&5
+	echo "$as_me:21433: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21423,7 +21447,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21426: checking for X" >&5
+	echo "$as_me:21450: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21527,17 +21551,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21530 "configure"
+#line 21554 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21534: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21540: \$? = $ac_status" >&5
+  echo "$as_me:21564: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21570,7 +21594,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21573 "configure"
+#line 21597 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21582,16 +21606,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21588: \$? = $ac_status" >&5
+  echo "$as_me:21612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:21618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21629,7 +21653,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21632: result: $have_x" >&5
+  echo "$as_me:21656: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21639,7 +21663,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21642: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21666: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21666,11 +21690,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21669: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21693: 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 21673 "configure"
+#line 21697 "configure"
 #include "confdefs.h"
 
 int
@@ -21682,16 +21706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21688: \$? = $ac_status" >&5
+  echo "$as_me:21712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21694: \$? = $ac_status" >&5
+  echo "$as_me:21718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21701,13 +21725,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21704: result: no" >&5
+	echo "$as_me:21728: 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 21710 "configure"
+#line 21734 "configure"
 #include "confdefs.h"
 
 int
@@ -21719,16 +21743,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21725: \$? = $ac_status" >&5
+  echo "$as_me:21749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21731: \$? = $ac_status" >&5
+  echo "$as_me:21755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21738,11 +21762,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21741: result: yes" >&5
+	  echo "$as_me:21765: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21745: result: neither works" >&5
+	  echo "$as_me:21769: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21762,7 +21786,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21765 "configure"
+#line 21789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21781,22 +21805,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21787: \$? = $ac_status" >&5
+  echo "$as_me:21811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21793: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21799: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21823: 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
@@ -21804,7 +21828,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21807 "configure"
+#line 21831 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21823,16 +21847,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21829: \$? = $ac_status" >&5
+  echo "$as_me:21853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21835: \$? = $ac_status" >&5
+  echo "$as_me:21859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21843,14 +21867,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21846: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21870: 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:21853: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21877: 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
@@ -21858,7 +21882,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21861 "configure"
+#line 21885 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21877,16 +21901,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21883: \$? = $ac_status" >&5
+  echo "$as_me:21907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21889: \$? = $ac_status" >&5
+  echo "$as_me:21913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21897,7 +21921,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21900: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21924: 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"
@@ -21916,13 +21940,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21919: checking for gethostbyname" >&5
+    echo "$as_me:21943: 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 21925 "configure"
+#line 21949 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21953,16 +21977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21959: \$? = $ac_status" >&5
+  echo "$as_me:21983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21965: \$? = $ac_status" >&5
+  echo "$as_me:21989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21972,11 +21996,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21975: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21999: 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:21979: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22003: 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
@@ -21984,7 +22008,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21987 "configure"
+#line 22011 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22003,16 +22027,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22009: \$? = $ac_status" >&5
+  echo "$as_me:22033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22015: \$? = $ac_status" >&5
+  echo "$as_me:22039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22023,14 +22047,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22026: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22050: 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:22033: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22057: 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
@@ -22038,7 +22062,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22041 "configure"
+#line 22065 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22057,16 +22081,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22063: \$? = $ac_status" >&5
+  echo "$as_me:22087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22069: \$? = $ac_status" >&5
+  echo "$as_me:22093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22077,7 +22101,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22080: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22104: 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"
@@ -22093,13 +22117,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22096: checking for connect" >&5
+    echo "$as_me:22120: 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 22102 "configure"
+#line 22126 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22130,16 +22154,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22136: \$? = $ac_status" >&5
+  echo "$as_me:22160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22142: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22149,11 +22173,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22152: result: $ac_cv_func_connect" >&5
+echo "$as_me:22176: 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:22156: checking for connect in -lsocket" >&5
+      echo "$as_me:22180: 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
@@ -22161,7 +22185,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22164 "configure"
+#line 22188 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22180,16 +22204,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22186: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22192: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22200,7 +22224,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22203: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22227: 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"
@@ -22209,13 +22233,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22212: checking for remove" >&5
+    echo "$as_me:22236: 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 22218 "configure"
+#line 22242 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22246,16 +22270,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22252: \$? = $ac_status" >&5
+  echo "$as_me:22276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22258: \$? = $ac_status" >&5
+  echo "$as_me:22282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22265,11 +22289,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22268: result: $ac_cv_func_remove" >&5
+echo "$as_me:22292: 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:22272: checking for remove in -lposix" >&5
+      echo "$as_me:22296: 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
@@ -22277,7 +22301,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22280 "configure"
+#line 22304 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22296,16 +22320,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22302: \$? = $ac_status" >&5
+  echo "$as_me:22326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22308: \$? = $ac_status" >&5
+  echo "$as_me:22332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22316,7 +22340,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22319: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22343: 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"
@@ -22325,13 +22349,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22328: checking for shmat" >&5
+    echo "$as_me:22352: 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 22334 "configure"
+#line 22358 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22362,16 +22386,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22368: \$? = $ac_status" >&5
+  echo "$as_me:22392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22374: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22381,11 +22405,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22384: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22408: 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:22388: checking for shmat in -lipc" >&5
+      echo "$as_me:22412: 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
@@ -22393,7 +22417,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22396 "configure"
+#line 22420 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22412,16 +22436,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22418: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22424: \$? = $ac_status" >&5
+  echo "$as_me:22448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22432,7 +22456,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22435: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22459: 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"
@@ -22450,7 +22474,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22453: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22477: 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
@@ -22458,7 +22482,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22461 "configure"
+#line 22485 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22477,16 +22501,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22483: \$? = $ac_status" >&5
+  echo "$as_me:22507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22489: \$? = $ac_status" >&5
+  echo "$as_me:22513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22497,7 +22521,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22500: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22524: 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"
@@ -22544,16 +22568,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22592,16 +22616,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22640,23 +22664,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22659: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22683: 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.
@@ -22673,7 +22697,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22676: result: $enable_warnings" >&5
+echo "$as_me:22700: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22696,10 +22720,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22702 "${as_me:-configure}"
+#line 22726 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22749,12 +22773,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22755: \$? = $ac_status" >&5
+  echo "$as_me:22779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22832,7 +22856,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22835 "configure"
+#line 22859 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22847,26 +22871,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22853: \$? = $ac_status" >&5
+  echo "$as_me:22877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22859: \$? = $ac_status" >&5
+  echo "$as_me:22883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22862: checking for X11/Xt const-feature" >&5
+echo "$as_me:22886: 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 22869 "configure"
+#line 22893 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22884,16 +22908,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22890: \$? = $ac_status" >&5
+  echo "$as_me:22914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22896: \$? = $ac_status" >&5
+  echo "$as_me:22920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22908,7 +22932,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22937,7 +22961,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22940 "${as_me:-configure}"
+#line 22964 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22953,7 +22977,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22956: checking for $CC warning options..." >&5
+	{ echo "$as_me:22980: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22969,12 +22993,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22975: \$? = $ac_status" >&5
+  echo "$as_me:22999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22982,7 +23006,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22985: checking for $CC warning options..." >&5
+	{ echo "$as_me:23009: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23005,12 +23029,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23011: \$? = $ac_status" >&5
+  echo "$as_me:23035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23018,7 +23042,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23028,7 +23052,7 @@ echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23045,7 +23069,7 @@ fi
 
 fi
 
-echo "$as_me:23048: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23072: 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.
@@ -23067,7 +23091,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23181,23 +23205,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23184: checking for dmalloc.h" >&5
+	echo "$as_me:23208: 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 23190 "configure"
+#line 23214 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23194: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23200: \$? = $ac_status" >&5
+  echo "$as_me:23224: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23216,11 +23240,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23219: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23243: 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:23223: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23247: 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
@@ -23228,7 +23252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23231 "configure"
+#line 23255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23247,16 +23271,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23253: \$? = $ac_status" >&5
+  echo "$as_me:23277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23259: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23267,7 +23291,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23270: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23294: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23282,7 +23306,7 @@ fi
 
 fi
 
-echo "$as_me:23285: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23309: 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.
@@ -23304,7 +23328,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23418,23 +23442,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23421: checking for dbmalloc.h" >&5
+	echo "$as_me:23445: 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 23427 "configure"
+#line 23451 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23437: \$? = $ac_status" >&5
+  echo "$as_me:23461: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23453,11 +23477,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23456: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23480: 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:23460: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23484: 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
@@ -23465,7 +23489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23468 "configure"
+#line 23492 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23484,16 +23508,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23490: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23496: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23504,7 +23528,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23507: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23531: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23519,7 +23543,7 @@ fi
 
 fi
 
-echo "$as_me:23522: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23546: 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.
@@ -23541,7 +23565,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23654,7 +23678,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23657: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23681: 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.
@@ -23665,7 +23689,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23668: result: $with_no_leaks" >&5
+echo "$as_me:23692: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23683,7 +23707,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23686: checking for an rpath option" >&5
+	echo "$as_me:23710: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23714,12 +23738,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23722: checking if we need a space after rpath option" >&5
+		echo "$as_me:23746: 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"
 
@@ -23740,7 +23764,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23743 "configure"
+#line 23767 "configure"
 #include "confdefs.h"
 
 int
@@ -23752,16 +23776,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23758: \$? = $ac_status" >&5
+  echo "$as_me:23782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23764: \$? = $ac_status" >&5
+  echo "$as_me:23788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23771,14 +23795,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23774: result: $cf_rpath_space" >&5
+		echo "$as_me:23798: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23781: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23805: 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.
@@ -23796,22 +23820,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23799: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23823: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23804: checking for updated LDFLAGS" >&5
+echo "$as_me:23828: 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:23807: result: maybe" >&5
+	echo "$as_me:23831: 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:23814: checking for $ac_word" >&5
+echo "$as_me:23838: 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
@@ -23826,7 +23850,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23829: found $ac_dir/$ac_word" >&5
+echo "$as_me:23853: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23834,10 +23858,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23837: result: $cf_ldd_prog" >&5
+  echo "$as_me:23861: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23840: result: no" >&5
+  echo "$as_me:23864: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23851,7 +23875,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23854 "configure"
+#line 23878 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23863,16 +23887,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23869: \$? = $ac_status" >&5
+  echo "$as_me:23893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23875: \$? = $ac_status" >&5
+  echo "$as_me:23899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23900,7 +23924,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23912,11 +23936,11 @@ echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23953,7 +23977,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23966,11 +23990,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24007,7 +24031,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24020,14 +24044,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24030: result: no" >&5
+	echo "$as_me:24054: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24117,7 +24141,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24298,7 +24322,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24301: error: ambiguous option: $1
+    { { echo "$as_me:24325: 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;}
@@ -24317,7 +24341,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24320: error: unrecognized option: $1
+  -*) { { echo "$as_me:24344: 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;}
@@ -24367,7 +24391,7 @@ do
   "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:24370: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24394: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24459,6 +24483,10 @@ s,@host@,$host,;t t
 s,@host_cpu@,$host_cpu,;t t
 s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -24475,6 +24503,8 @@ s,@AWK@,$AWK,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
+s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
 s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
 s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
 s,@LINT@,$LINT,;t t
@@ -24675,7 +24705,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24678: creating $ac_file" >&5
+    { echo "$as_me:24708: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24693,7 +24723,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24706,7 +24736,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24709: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24739: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24722,7 +24752,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24725: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24755: 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;}
@@ -24731,7 +24761,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24734: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24764: 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;}
@@ -24776,7 +24806,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24779: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24809: 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;}
@@ -24787,7 +24817,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24790: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24820: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24836,7 +24866,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24847,7 +24877,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24860,7 +24890,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24863: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24893: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24918,7 +24948,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24921: $ac_file is unchanged" >&5
+      { echo "$as_me:24951: $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/test/configure.in b/test/configure.in
index 4df1c11f9..6c95207ed 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 tom Exp $
+dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -48,12 +48,10 @@ AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin)
 
 CF_INHERIT_SCRIPT(config.guess)
 CF_INHERIT_SCRIPT(config.sub)
-CF_CHECK_CACHE
-
-AC_ARG_PROGRAM
 
 CF_HELP_MESSAGE(General Options:)
 
+CF_WITH_SYSTYPE
 AC_PROG_MAKE_SET
 CF_PROG_CC
 AC_C_INLINE
@@ -240,7 +238,6 @@ AC_CHECK_HEADERS( $cf_curses_headers )
 
 AC_HEADER_TIME
 AC_CHECK_HEADERS( \
-getopt.h \
 locale.h \
 math.h \
 stdarg.h \
@@ -248,7 +245,6 @@ sys/ioctl.h \
 sys/select.h \
 sys/time.h \
 termios.h \
-unistd.h \
 )
 
 CF_GETOPT_HEADER

From 368c4b5f08d93a1adca841b3308b6e65c7ff4a8f Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 18 Aug 2024 01:27:01 +0200
Subject: [PATCH 080/106] ncurses-6.5-20240817.patch.gz

---
 Ada95/Makefile.in                |   16 +-
 Ada95/aclocal.m4                 |   36 +-
 Ada95/configure                  | 2992 ++++++++---------
 Ada95/configure.in               |   19 +-
 Ada95/doc/Makefile.in            |    8 +-
 Ada95/gen/Makefile.in            |   12 +-
 Ada95/samples/Makefile.in        |    8 +-
 Ada95/src/Makefile.in            |    6 +-
 INSTALL                          |    8 +-
 NEWS                             |   11 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   86 +-
 c++/Makefile.in                  |   10 +-
 configure                        | 5140 +++++++++++++++---------------
 configure.in                     |   21 +-
 dist.mk                          |    4 +-
 form/Makefile.in                 |   12 +-
 include/Makefile.in              |    6 +-
 man/Makefile.in                  |   13 +-
 menu/Makefile.in                 |   12 +-
 misc/Makefile.in                 |   28 +-
 misc/terminfo.src                |   63 +-
 mk-1st.awk                       |   70 +-
 ncurses/Makefile.in              |   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 +-
 panel/Makefile.in                |   12 +-
 progs/Makefile.in                |   57 +-
 test/Makefile.in                 |   12 +-
 test/aclocal.m4                  |   36 +-
 test/configure                   | 3922 ++++++++++++-----------
 test/configure.in                |    3 +-
 37 files changed, 6456 insertions(+), 6201 deletions(-)

diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in
index 22b922e96..c937df989 100644
--- a/Ada95/Makefile.in
+++ b/Ada95/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $
+# $Id: Makefile.in,v 1.31 2024/08/11 00:24:28 tom Exp $
 ##############################################################################
-# Copyright 2020-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2020-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2010,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -31,7 +31,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #
 #  Version Control
-#  $Revision: 1.30 $
+#  $Revision: 1.31 $
 #
 SHELL		= @SHELL@
 VPATH		= @srcdir@
@@ -47,12 +47,12 @@ libdir		= @libdir@
 libexecdir	= @libexecdir@
 includedir	= @includedir@
 
-BINDIR		= $(DESTDIR)$(bindir)
-DATADIR		= $(DESTDIR)$(datadir)
-LIBDIR		= $(DESTDIR)$(libdir)
-LIBEXECDIR	= $(DESTDIR)$(libexecdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+LIBEXECDIR	= $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
 
-SUBDIRS         = @ADA_SUBDIRS@
+SUBDIRS		= @ADA_SUBDIRS@
 
 INSTALL		= @INSTALL@ @INSTALL_OPT_O@
 INSTALL_SCRIPT	= @INSTALL@
diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 28b4aa9f3..443e89296 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.221 2024/08/11 00:23:05 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2265,6 +2265,40 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
+dnl -----------------
+dnl Special option for use by system-builders: the install-prefix is used to
+dnl adjust the location into which the actual install is done, so that an
+dnl archive can be built without modifying the host system's configuration.
+AC_DEFUN([CF_INSTALL_PREFIX],[
+AC_MSG_CHECKING(for an installation directory prefix)
+AC_ARG_WITH(install-prefix,
+	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
+	[case "x$withval" in
+	(xyes|xno)
+		;;
+	(*)	DESTDIR="$withval"
+		;;
+	esac])
+AC_MSG_RESULT([${DESTDIR:-(none)}])
+AC_SUBST(DESTDIR)
+
+AC_MSG_CHECKING(if installation directory prefix should be merged)
+CF_ARG_ENABLE(install-prefix,
+	[  --enable-install-prefix merge DESTDIR with installation prefix],
+	cf_install_prefix=yes,
+	cf_install_prefix=no)
+AC_MSG_RESULT($cf_install_prefix)
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
+
+AC_SUBST(MERGE_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
diff --git a/Ada95/configure b/Ada95/configure
index c6515c155..45ac71ddd 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.93 .
+# From configure.in Revision: 1.94 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -714,7 +714,8 @@ General Options:
   --with-pkg-config-libdir[=XXX] use given directory for installing pc-files
   --without-tests         suppress build with test-programs
   --enable-mixed-case     tic should assume mixed-case filenames
-  --with-install-prefix   prefixes actual install-location ($DESTDIR)
+  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
+  --enable-install-prefix merge DESTDIR with installation prefix
 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
@@ -952,7 +953,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:955: loading site script $ac_site_file" >&5
+    { echo "$as_me:956: 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"
@@ -963,7 +964,7 @@ if test -r "$cache_file"; then
   # 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:966: loading cache $cache_file" >&5
+    { echo "$as_me:967: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -971,7 +972,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:974: creating cache $cache_file" >&5
+  { echo "$as_me:975: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -987,21 +988,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:990: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:991: 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:994: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:995: 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:1000: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1001: 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:1002:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1003:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1004:   current value: $ac_new_val" >&5
+        { echo "$as_me:1005:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1020,9 +1021,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1023: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1024: 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:1025: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1026: 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
@@ -1051,10 +1052,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1057: \$? = $ac_status" >&5
+  echo "$as_me:1058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1086,7 +1087,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1089: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1090: 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
@@ -1096,11 +1097,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1100: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1103: checking build system type" >&5
+echo "$as_me:1104: 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
@@ -1109,23 +1110,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1112: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1113: 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:1116: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1117: 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:1121: result: $ac_cv_build" >&5
+echo "$as_me:1122: 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:1128: checking host system type" >&5
+echo "$as_me:1129: 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
@@ -1134,12 +1135,12 @@ else
 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:1137: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1138: 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:1142: result: $ac_cv_host" >&5
+echo "$as_me:1143: 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/'`
@@ -1147,7 +1148,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1150: checking target system type" >&5
+	echo "$as_me:1151: 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
@@ -1156,12 +1157,12 @@ else
 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:1159: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1160: 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:1164: result: $ac_cv_target" >&5
+echo "$as_me:1165: 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/'`
@@ -1193,13 +1194,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1196: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1197: 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:1200: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1201: 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:1202: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1203: 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
@@ -1207,7 +1208,7 @@ fi
 # 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:1210: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1211: 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
@@ -1222,7 +1223,7 @@ for ac_prog in ggrep grep
 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:1225: checking for $ac_word" >&5
+echo "$as_me:1226: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1237,7 +1238,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1240: found $ac_dir/$ac_word" >&5
+echo "$as_me:1241: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1245,10 +1246,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1248: result: $GREP" >&5
+  echo "$as_me:1249: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1251: result: no" >&5
+  echo "$as_me:1252: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1256,7 +1257,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1259: checking for fgrep" >&5
+echo "$as_me:1260: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1268,7 +1269,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1271: checking for $ac_word" >&5
+echo "$as_me:1272: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1285,7 +1286,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1288: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1289: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1296,10 +1297,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1299: result: $FGREP" >&5
+  echo "$as_me:1300: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1302: result: no" >&5
+  echo "$as_me:1303: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1307,16 +1308,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1311: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1316: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1319: checking for prefix" >&5
+echo "$as_me:1320: 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
@@ -1328,11 +1329,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1331: result: $prefix" >&5
+echo "$as_me:1332: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1335: checking for default include-directory" >&5
+echo "$as_me:1336: 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 \
@@ -1355,7 +1356,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1358: result: $includedir" >&5
+echo "$as_me:1359: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1382,7 +1383,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:1385: checking for $ac_word" >&5
+echo "$as_me:1386: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1399,7 +1400,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:1402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1403: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1411,10 +1412,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:1415: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:1417: result: no" >&5
+  echo "$as_me:1418: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1424,7 +1425,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:1427: checking for $cf_prog_gnat version" >&5
+echo "$as_me:1428: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1435,7 +1436,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1438: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1439: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -1464,7 +1465,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:1467: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:1468: 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
@@ -1483,10 +1484,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:1486: result: $cf_gprconfig_value" >&5
+					echo "$as_me:1487: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:1489: result: missing" >&5
+					echo "$as_me:1490: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -1499,7 +1500,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:1502: checking for gnat version" >&5
+echo "$as_me:1503: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1510,7 +1511,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1513: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1514: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -1519,7 +1520,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:1522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:1523: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -1527,7 +1528,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:1530: checking for $ac_word" >&5
+echo "$as_me:1531: 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
@@ -1542,7 +1543,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:1545: found $ac_dir/$ac_word" >&5
+echo "$as_me:1546: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1551,20 +1552,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:1554: result: $M4_exists" >&5
+  echo "$as_me:1555: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:1557: result: no" >&5
+  echo "$as_me:1558: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:1563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:1564: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:1567: checking if GNAT works" >&5
+			echo "$as_me:1568: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -1592,7 +1593,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:1596: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -1608,7 +1609,7 @@ fi
 		# Here is a workaround.
 		# Extract the first word of "gnatgcc", so it can be a program name with args.
 set dummy gnatgcc; ac_word=$2
-echo "$as_me:1611: checking for $ac_word" >&5
+echo "$as_me:1612: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1625,7 +1626,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
-   echo "$as_me:1628: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1629: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1637,16 +1638,16 @@ fi
 cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
 
 if test -n "$cf_cv_path_gnatgcc"; then
-  echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
+  echo "$as_me:1641: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-  echo "$as_me:1643: result: no" >&5
+  echo "$as_me:1644: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			echo "$as_me:1649: checking for improvement" >&5
+			echo "$as_me:1650: checking for improvement" >&5
 echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
@@ -1657,7 +1658,7 @@ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 				cf_cv_path_gnatgcc=no
 				;;
 			esac
-			echo "$as_me:1660: result: $cf_cv_path_gnatgcc" >&5
+			echo "$as_me:1661: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
@@ -1682,7 +1683,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1685: checking for $ac_word" >&5
+echo "$as_me:1686: 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
@@ -1697,7 +1698,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1700: found $ac_dir/$ac_word" >&5
+echo "$as_me:1701: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1705,10 +1706,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1708: result: $CC" >&5
+  echo "$as_me:1709: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1711: result: no" >&5
+  echo "$as_me:1712: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1721,7 +1722,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1724: checking for $ac_word" >&5
+echo "$as_me:1725: 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
@@ -1736,7 +1737,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1739: found $ac_dir/$ac_word" >&5
+echo "$as_me:1740: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1744,10 +1745,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1747: result: $ac_ct_CC" >&5
+  echo "$as_me:1748: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1750: result: no" >&5
+  echo "$as_me:1751: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1757,32 +1758,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:1760: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1761: 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:1765:" \
+echo "$as_me:1766:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1768: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1769: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1771: \$? = $ac_status" >&5
+  echo "$as_me:1772: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1773: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1774: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1776: \$? = $ac_status" >&5
+  echo "$as_me:1777: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1778: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1779: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1781: \$? = $ac_status" >&5
+  echo "$as_me:1782: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1785 "configure"
+#line 1786 "configure"
 #include "confdefs.h"
 
 int
@@ -1798,13 +1799,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1801: checking for C compiler default output" >&5
+echo "$as_me:1802: 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:1804: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1805: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1807: \$? = $ac_status" >&5
+  echo "$as_me:1808: \$? = $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
@@ -1827,34 +1828,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1830: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1831: 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:1836: result: $ac_file" >&5
+echo "$as_me:1837: 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:1841: checking whether the C compiler works" >&5
+echo "$as_me:1842: 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:1847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1850: \$? = $ac_status" >&5
+  echo "$as_me:1851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1857: error: cannot run C compiled programs.
+	{ { echo "$as_me:1858: 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;}
@@ -1862,24 +1863,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1865: result: yes" >&5
+echo "$as_me:1866: 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:1872: checking whether we are cross compiling" >&5
+echo "$as_me:1873: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1874: result: $cross_compiling" >&5
+echo "$as_me:1875: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1877: checking for executable suffix" >&5
+echo "$as_me:1878: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1882: \$? = $ac_status" >&5
+  echo "$as_me:1883: \$? = $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
@@ -1895,25 +1896,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1898: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1899: 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:1904: result: $ac_cv_exeext" >&5
+echo "$as_me:1905: 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:1910: checking for object suffix" >&5
+echo "$as_me:1911: 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 1916 "configure"
+#line 1917 "configure"
 #include "confdefs.h"
 
 int
@@ -1925,10 +1926,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1931: \$? = $ac_status" >&5
+  echo "$as_me:1932: \$? = $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
@@ -1940,24 +1941,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1943: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1944: 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:1950: result: $ac_cv_objext" >&5
+echo "$as_me:1951: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1954: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1955: 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 1960 "configure"
+#line 1961 "configure"
 #include "confdefs.h"
 
 int
@@ -1972,16 +1973,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1978: \$? = $ac_status" >&5
+  echo "$as_me:1979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1984: \$? = $ac_status" >&5
+  echo "$as_me:1985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1993,19 +1994,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1996: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1997: 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:2002: checking whether $CC accepts -g" >&5
+echo "$as_me:2003: 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 2008 "configure"
+#line 2009 "configure"
 #include "confdefs.h"
 
 int
@@ -2017,16 +2018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2023: \$? = $ac_status" >&5
+  echo "$as_me:2024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2029: \$? = $ac_status" >&5
+  echo "$as_me:2030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2036,7 +2037,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2039: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2040: 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
@@ -2063,16 +2064,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2069: \$? = $ac_status" >&5
+  echo "$as_me:2070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2075: \$? = $ac_status" >&5
+  echo "$as_me:2076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2084,7 +2085,7 @@ if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2087 "configure"
+#line 2088 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2097,16 +2098,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2103: \$? = $ac_status" >&5
+  echo "$as_me:2104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2109: \$? = $ac_status" >&5
+  echo "$as_me:2110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2116,7 +2117,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2119 "configure"
+#line 2120 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2128,16 +2129,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2134: \$? = $ac_status" >&5
+  echo "$as_me:2135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2140: \$? = $ac_status" >&5
+  echo "$as_me:2141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2167,11 +2168,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2170: checking version of $CC" >&5
+	echo "$as_me:2171: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2174: result: $GCC_VERSION" >&5
+	echo "$as_me:2175: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2180,12 +2181,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2183: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2184: 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 2188 "configure"
+#line 2189 "configure"
 #include "confdefs.h"
 
 int
@@ -2202,16 +2203,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2208: \$? = $ac_status" >&5
+  echo "$as_me:2209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2214: \$? = $ac_status" >&5
+  echo "$as_me:2215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2222,7 +2223,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2225: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2226: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2231,11 +2232,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2234: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2235: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2238 "configure"
+#line 2239 "configure"
 #include "confdefs.h"
 
 int
@@ -2252,16 +2253,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2258: \$? = $ac_status" >&5
+  echo "$as_me:2259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2264: \$? = $ac_status" >&5
+  echo "$as_me:2265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2271,7 +2272,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2274: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2275: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2280,30 +2281,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2283: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2284: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2290: checking version of $CC" >&5
+	echo "$as_me:2291: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2294: result: $CLANG_VERSION" >&5
+	echo "$as_me:2295: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2301: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2302: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2306 "configure"
+#line 2307 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2317,16 +2318,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2323: \$? = $ac_status" >&5
+  echo "$as_me:2324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2329: \$? = $ac_status" >&5
+  echo "$as_me:2330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2337,13 +2338,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2340: result: $cf_clang_optok" >&5
+		echo "$as_me:2341: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2346: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2347: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2352,7 +2353,7 @@ echo "${as_me:-configure}:2346: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2355: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2356: 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
@@ -2360,7 +2361,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2363 "configure"
+#line 2364 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2407,16 +2408,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2413: \$? = $ac_status" >&5
+  echo "$as_me:2414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2419: \$? = $ac_status" >&5
+  echo "$as_me:2420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2433,10 +2434,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2436: result: none needed" >&5
+    echo "$as_me:2437: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2440: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2444,13 +2445,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2447: checking \$CFLAGS variable" >&5
+echo "$as_me:2448: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2451: result: broken" >&5
+	echo "$as_me:2452: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2453: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2454: 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=
@@ -2558,18 +2559,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2561: result: ok" >&5
+	echo "$as_me:2562: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2566: checking \$CC variable" >&5
+echo "$as_me:2567: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2570: result: broken" >&5
+	echo "$as_me:2571: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2572: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2573: 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/[ ]*[ ]-[^ ].*//'`
@@ -2686,19 +2687,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2690: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2694: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2698: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2701: result: ok" >&5
+	echo "$as_me:2702: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2706,7 +2707,7 @@ esac
 	;;
 esac
 
-echo "$as_me:2709: checking for egrep" >&5
+echo "$as_me:2710: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2718,7 +2719,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2721: checking for $ac_word" >&5
+echo "$as_me:2722: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2735,7 +2736,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2738: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2739: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2746,10 +2747,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2749: result: $EGREP" >&5
+  echo "$as_me:2750: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2752: result: no" >&5
+  echo "$as_me:2753: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2757,12 +2758,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2761: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2766: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2772,7 +2773,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2775: checking how to run the C preprocessor" >&5
+echo "$as_me:2776: 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
@@ -2793,18 +2794,18 @@ do
   # 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 2796 "configure"
+#line 2797 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2801: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2807: \$? = $ac_status" >&5
+  echo "$as_me:2808: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2827,17 +2828,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2830 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2835: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2840: \$? = $ac_status" >&5
+  echo "$as_me:2841: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2874,7 +2875,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2877: result: $CPP" >&5
+echo "$as_me:2878: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2884,18 +2885,18 @@ do
   # 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 2887 "configure"
+#line 2888 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2893: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2898: \$? = $ac_status" >&5
+  echo "$as_me:2899: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2918,17 +2919,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2921 "configure"
+#line 2922 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2931: \$? = $ac_status" >&5
+  echo "$as_me:2932: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2956,7 +2957,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2969,14 +2970,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2972: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2973: 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 2979 "configure"
+#line 2980 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2991,7 +2992,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 2994 "configure"
+#line 2995 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3004,14 +3005,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3007: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3008: 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:3014: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3015: 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
@@ -3026,15 +3027,15 @@ CF_EOF
 # 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:3029: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3032: \$? = $ac_status" >&5
+  echo "$as_me:3033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3037: \$? = $ac_status" >&5
+  echo "$as_me:3038: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3045,10 +3046,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3048: result: yes" >&5
+  echo "$as_me:3049: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3051: result: no" >&5
+  echo "$as_me:3052: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3069,7 +3070,7 @@ for ac_prog in mawk gawk nawk awk
 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:3072: checking for $ac_word" >&5
+echo "$as_me:3073: 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
@@ -3084,7 +3085,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3087: found $ac_dir/$ac_word" >&5
+echo "$as_me:3088: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3092,21 +3093,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3095: result: $AWK" >&5
+  echo "$as_me:3096: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3098: result: no" >&5
+  echo "$as_me:3099: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3106: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:3109: checking for egrep" >&5
+echo "$as_me:3110: 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
@@ -3116,11 +3117,11 @@ else
 		else ac_cv_prog_egrep='egrep'
 	fi
 fi
-echo "$as_me:3119: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3120: 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:3123: error: No egrep program found" >&5
+	test -z "$EGREP" && { { echo "$as_me:3124: error: No egrep program found" >&5
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -3136,7 +3137,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # 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:3139: checking for a BSD compatible install" >&5
+echo "$as_me:3140: 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
@@ -3185,7 +3186,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3188: result: $INSTALL" >&5
+echo "$as_me:3189: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3196,18 +3197,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:3199: checking whether ln -s works" >&5
+echo "$as_me:3200: 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:3203: result: yes" >&5
+  echo "$as_me:3204: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3206: result: no, using $LN_S" >&5
+  echo "$as_me:3207: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3210: checking if $LN_S -f options work" >&5
+echo "$as_me:3211: 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
@@ -3219,7 +3220,7 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:3222: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3223: 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"
@@ -3247,7 +3248,7 @@ esac
 # 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:3250: checking for a BSD compatible install" >&5
+echo "$as_me:3251: 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
@@ -3296,7 +3297,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3299: result: $INSTALL" >&5
+echo "$as_me:3300: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3317,7 +3318,7 @@ case x$INSTALL in
 	;;
 esac
 
-echo "$as_me:3320: checking if you want to install stripped executables" >&5
+echo "$as_me:3321: 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.
@@ -3334,7 +3335,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:3337: result: $enable_stripping" >&5
+echo "$as_me:3338: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -3345,7 +3346,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:3348: checking if install accepts -p option" >&5
+echo "$as_me:3349: 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
@@ -3376,10 +3377,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3379: result: $cf_cv_install_p" >&5
+echo "$as_me:3380: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3382: checking if install needs to be told about ownership" >&5
+echo "$as_me:3383: 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)
@@ -3390,7 +3391,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3393: result: $with_install_o" >&5
+echo "$as_me:3394: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3401,7 +3402,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:3404: checking if you want to specify strip-program" >&5
+	echo "$as_me:3405: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3411,11 +3412,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3414: result: $with_strip_program" >&5
+	echo "$as_me:3415: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3418: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3419: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3436,11 +3437,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3439: result: $check_install_strip" >&5
+		echo "$as_me:3440: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3443: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3444: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3455,7 +3456,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3459: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3465,7 +3466,7 @@ echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
 	fi
 fi
 
-echo "$as_me:3468: checking for long file names" >&5
+echo "$as_me:3469: 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
@@ -3504,7 +3505,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:3507: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3508: 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
 
@@ -3516,7 +3517,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:3519: checking if you want to use pkg-config" >&5
+echo "$as_me:3520: 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.
@@ -3526,7 +3527,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:3529: result: $cf_pkg_config" >&5
+echo "$as_me:3530: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -3538,7 +3539,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:3541: checking for $ac_word" >&5
+echo "$as_me:3542: 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
@@ -3555,7 +3556,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3558: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3559: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3566,10 +3567,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3569: result: $PKG_CONFIG" >&5
+  echo "$as_me:3570: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3572: result: no" >&5
+  echo "$as_me:3573: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3578,7 +3579,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3581: checking for $ac_word" >&5
+echo "$as_me:3582: 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
@@ -3595,7 +3596,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3598: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3599: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3607,10 +3608,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3611: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:3613: result: no" >&5
+  echo "$as_me:3614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3651,24 +3652,24 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:3654: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:3655: 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:3661: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:3662: 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:3667: checking for pkg-config library directory" >&5
+	echo "$as_me:3668: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:3672: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -3695,7 +3696,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3699: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -3706,16 +3707,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:3710: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:3714: result: auto" >&5
+	echo "$as_me:3715: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:3718: checking for search-list" >&5
+	echo "$as_me:3719: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -3750,11 +3751,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:3753: result: $cf_search_path" >&5
+	echo "$as_me:3754: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:3758: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -3762,7 +3763,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:3765: checking for first directory" >&5
+	echo "$as_me:3766: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -3773,7 +3774,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:3776: result: $cf_pkg_config_path" >&5
+	echo "$as_me:3777: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -3783,7 +3784,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:3786: checking for workaround" >&5
+		echo "$as_me:3787: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -3806,12 +3807,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:3810: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
-echo "$as_me:3814: checking if you want to build test-programs" >&5
+echo "$as_me:3815: 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.
@@ -3821,10 +3822,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:3824: result: $cf_with_tests" >&5
+echo "$as_me:3825: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:3827: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3828: 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.
@@ -3834,11 +3835,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:3837: result: $enable_mixedcase" >&5
+echo "$as_me:3838: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:3841: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3842: 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
@@ -3865,7 +3866,7 @@ else
 fi
 
 fi
-echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3869: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3883,7 +3884,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3886: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3887: 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
@@ -3903,16 +3904,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3906: result: yes" >&5
+  echo "$as_me:3907: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3910: result: no" >&5
+  echo "$as_me:3911: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:3915: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3916: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3967,7 +3968,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3971: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -3978,7 +3979,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3981: checking for $ac_word" >&5
+echo "$as_me:3982: 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
@@ -3993,7 +3994,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3996: found $ac_dir/$ac_word" >&5
+echo "$as_me:3997: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4001,10 +4002,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4004: result: $CTAGS" >&5
+  echo "$as_me:4005: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4007: result: no" >&5
+  echo "$as_me:4008: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4015,7 +4016,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4018: checking for $ac_word" >&5
+echo "$as_me:4019: 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
@@ -4030,7 +4031,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4033: found $ac_dir/$ac_word" >&5
+echo "$as_me:4034: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4038,10 +4039,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4041: result: $ETAGS" >&5
+  echo "$as_me:4042: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4044: result: no" >&5
+  echo "$as_me:4045: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4050,7 +4051,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4053: checking for $ac_word" >&5
+echo "$as_me:4054: 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
@@ -4065,7 +4066,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4068: found $ac_dir/$ac_word" >&5
+echo "$as_me:4069: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4074,17 +4075,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4078: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4080: result: no" >&5
+  echo "$as_me:4081: 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:4087: checking for $ac_word" >&5
+echo "$as_me:4088: 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
@@ -4099,7 +4100,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4102: found $ac_dir/$ac_word" >&5
+echo "$as_me:4103: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4108,10 +4109,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4112: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4114: result: no" >&5
+  echo "$as_me:4115: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4131,7 +4132,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:4134: checking for makeflags variable" >&5
+echo "$as_me:4135: 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
@@ -4161,7 +4162,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4165: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -4169,13 +4170,13 @@ echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:4172: result: $cf_cv_makeflags" >&5
+echo "$as_me:4173: 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:4178: checking for $ac_word" >&5
+echo "$as_me:4179: 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
@@ -4190,7 +4191,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4193: found $ac_dir/$ac_word" >&5
+echo "$as_me:4194: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4198,10 +4199,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4201: result: $RANLIB" >&5
+  echo "$as_me:4202: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4204: result: no" >&5
+  echo "$as_me:4205: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4210,7 +4211,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4213: checking for $ac_word" >&5
+echo "$as_me:4214: 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
@@ -4225,7 +4226,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4228: found $ac_dir/$ac_word" >&5
+echo "$as_me:4229: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4234,10 +4235,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4238: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4240: result: no" >&5
+  echo "$as_me:4241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4249,7 +4250,7 @@ fi
 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:4252: checking for $ac_word" >&5
+echo "$as_me:4253: 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
@@ -4264,7 +4265,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:4267: found $ac_dir/$ac_word" >&5
+echo "$as_me:4268: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4272,10 +4273,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:4275: result: $LD" >&5
+  echo "$as_me:4276: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:4278: result: no" >&5
+  echo "$as_me:4279: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4284,7 +4285,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:4287: checking for $ac_word" >&5
+echo "$as_me:4288: 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
@@ -4299,7 +4300,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:4302: found $ac_dir/$ac_word" >&5
+echo "$as_me:4303: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4308,10 +4309,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:4311: result: $ac_ct_LD" >&5
+  echo "$as_me:4312: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:4314: result: no" >&5
+  echo "$as_me:4315: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4323,7 +4324,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4326: checking for $ac_word" >&5
+echo "$as_me:4327: 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
@@ -4338,7 +4339,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4341: found $ac_dir/$ac_word" >&5
+echo "$as_me:4342: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4346,10 +4347,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4349: result: $AR" >&5
+  echo "$as_me:4350: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4352: result: no" >&5
+  echo "$as_me:4353: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4358,7 +4359,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4361: checking for $ac_word" >&5
+echo "$as_me:4362: 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
@@ -4373,7 +4374,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4376: found $ac_dir/$ac_word" >&5
+echo "$as_me:4377: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4382,10 +4383,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4385: result: $ac_ct_AR" >&5
+  echo "$as_me:4386: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4388: result: no" >&5
+  echo "$as_me:4389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4397,7 +4398,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:4400: checking for $ac_word" >&5
+echo "$as_me:4401: 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
@@ -4412,7 +4413,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:4415: found $ac_dir/$ac_word" >&5
+echo "$as_me:4416: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4420,10 +4421,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:4423: result: $AR" >&5
+  echo "$as_me:4424: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:4426: result: no" >&5
+  echo "$as_me:4427: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4432,7 +4433,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:4435: checking for $ac_word" >&5
+echo "$as_me:4436: 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
@@ -4447,7 +4448,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:4450: found $ac_dir/$ac_word" >&5
+echo "$as_me:4451: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4456,10 +4457,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:4459: result: $ac_ct_AR" >&5
+  echo "$as_me:4460: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:4462: result: no" >&5
+  echo "$as_me:4463: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4468,7 +4469,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:4471: checking for options to update archives" >&5
+echo "$as_me:4472: 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
@@ -4505,13 +4506,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4508 "configure"
+#line 4509 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			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"); } ; 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
@@ -4522,7 +4523,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4526: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4532,7 +4533,7 @@ echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4536: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4543,31 +4544,57 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-	echo "$as_me:4546: checking for PATH separator" >&5
+	echo "$as_me:4547: 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:4553: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:4554: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
-echo "$as_me:4556: checking if you have specified an install-prefix" >&5
-echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+echo "$as_me:4557: checking for an installation directory prefix" >&5
+echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
 if test "${with_install_prefix+set}" = set; then
   withval="$with_install_prefix"
-  case "$withval" in
-	(yes|no)
+  case "x$withval" in
+	(xyes|xno)
 		;;
 	(*)	DESTDIR="$withval"
 		;;
 	esac
 fi;
-echo "$as_me:4569: result: $DESTDIR" >&5
-echo "${ECHO_T}$DESTDIR" >&6
+echo "$as_me:4570: result: ${DESTDIR:-(none)}" >&5
+echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+echo "$as_me:4573: checking if installation directory prefix should be merged" >&5
+echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+
+# Check whether --enable-install-prefix or --disable-install-prefix was given.
+if test "${enable_install_prefix+set}" = set; then
+  enableval="$enable_install_prefix"
+  test "$enableval" != yes && enableval=no
+	if test "$enableval" != "no" ; then
+    cf_install_prefix=yes
+	else
+		cf_install_prefix=no
+	fi
+else
+  enableval=no
+	cf_install_prefix=no
+
+fi;
+echo "$as_me:4590: result: $cf_install_prefix" >&5
+echo "${ECHO_T}$cf_install_prefix" >&6
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
 
 ###############################################################################
 
@@ -4594,7 +4621,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4597: checking for $ac_word" >&5
+echo "$as_me:4624: 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
@@ -4609,7 +4636,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:4612: found $ac_dir/$ac_word" >&5
+echo "$as_me:4639: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4617,10 +4644,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:4620: result: $BUILD_CC" >&5
+  echo "$as_me:4647: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:4623: result: no" >&5
+  echo "$as_me:4650: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4629,12 +4656,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:4632: checking for native build C compiler" >&5
+	echo "$as_me:4659: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:4634: result: $BUILD_CC" >&5
+	echo "$as_me:4661: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:4637: checking for native build C preprocessor" >&5
+	echo "$as_me:4664: 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.
@@ -4644,10 +4671,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:4647: result: $BUILD_CPP" >&5
+	echo "$as_me:4674: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:4650: checking for native build C flags" >&5
+	echo "$as_me:4677: 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.
@@ -4655,10 +4682,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:4685: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:4661: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:4688: 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.
@@ -4666,10 +4693,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:4696: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:4672: checking for native build linker-flags" >&5
+	echo "$as_me:4699: 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.
@@ -4677,10 +4704,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:4707: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:4683: checking for native build linker-libraries" >&5
+	echo "$as_me:4710: 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.
@@ -4688,7 +4715,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:4691: result: $BUILD_LIBS" >&5
+	echo "$as_me:4718: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -4697,7 +4724,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:4700: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:4727: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -4711,7 +4738,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4714 "configure"
+#line 4741 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -4721,15 +4748,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4727: \$? = $ac_status" >&5
+  echo "$as_me:4754: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4732: \$? = $ac_status" >&5
+  echo "$as_me:4759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -4744,12 +4771,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:4747: result: $cf_ok_build_cc" >&5
+	echo "$as_me:4774: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:4752: error: Cross-build requires two compilers.
+		{ { echo "$as_me:4779: 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;}
@@ -4774,7 +4801,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:4777: checking if you want to build shared C-objects" >&5
+echo "$as_me:4804: checking if you want to build shared C-objects" >&5
 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
@@ -4784,27 +4811,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:4787: result: $with_shared" >&5
+echo "$as_me:4814: result: $with_shared" >&5
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
-echo "$as_me:4791: checking for specified models" >&5
+echo "$as_me:4818: checking for specified models" >&5
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
-echo "$as_me:4794: result: $cf_list_models" >&5
+echo "$as_me:4821: 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:4799: checking for default model" >&5
+echo "$as_me:4826: 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:4802: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4829: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:4807: checking for specific curses-directory" >&5
+echo "$as_me:4834: 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.
@@ -4814,7 +4841,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:4817: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4844: 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"
@@ -4843,7 +4870,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:4873: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4879,7 +4906,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 4882 "configure"
+#line 4909 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4891,16 +4918,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4897: \$? = $ac_status" >&5
+  echo "$as_me:4924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4903: \$? = $ac_status" >&5
+  echo "$as_me:4930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4917,7 +4944,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4947: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -4953,7 +4980,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4983: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -4968,13 +4995,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:4971: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:4998: 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:4974: result: yes" >&5
+		echo "$as_me:5001: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:4977: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:5004: 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
 
@@ -5107,7 +5134,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 5110 "configure"
+#line 5137 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5119,37 +5146,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5125: \$? = $ac_status" >&5
+  echo "$as_me:5152: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5131: \$? = $ac_status" >&5
+  echo "$as_me:5158: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5137 "configure"
+#line 5164 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5147: \$? = $ac_status" >&5
+  echo "$as_me:5174: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5152: \$? = $ac_status" >&5
+  echo "$as_me:5179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -5323,7 +5350,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5326 "configure"
+#line 5353 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5335,37 +5362,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5341: \$? = $ac_status" >&5
+  echo "$as_me:5368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5347: \$? = $ac_status" >&5
+  echo "$as_me:5374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5353 "configure"
+#line 5380 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5363: \$? = $ac_status" >&5
+  echo "$as_me:5390: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5368: \$? = $ac_status" >&5
+  echo "$as_me:5395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -5382,7 +5409,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:5385: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5412: 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"
@@ -5398,7 +5425,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5401: checking for terminfo header" >&5
+echo "$as_me:5428: 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
@@ -5416,7 +5443,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5419 "configure"
+#line 5446 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5431,16 +5458,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5437: \$? = $ac_status" >&5
+  echo "$as_me:5464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5443: \$? = $ac_status" >&5
+  echo "$as_me:5470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5456,7 +5483,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5459: result: $cf_cv_term_header" >&5
+echo "$as_me:5486: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5491,7 +5518,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5494: result: no" >&5
+		echo "$as_me:5521: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5507,7 +5534,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5510: checking for $ac_word" >&5
+echo "$as_me:5537: 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
@@ -5522,7 +5549,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5525: found $ac_dir/$ac_word" >&5
+echo "$as_me:5552: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5530,10 +5557,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5560: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5536: result: no" >&5
+  echo "$as_me:5563: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5546,7 +5573,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5549: checking for $ac_word" >&5
+echo "$as_me:5576: 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
@@ -5561,7 +5588,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5564: found $ac_dir/$ac_word" >&5
+echo "$as_me:5591: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5569,10 +5596,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5599: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5575: result: no" >&5
+  echo "$as_me:5602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5729,7 +5756,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5732: checking if we have identified curses headers" >&5
+echo "$as_me:5759: 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
@@ -5741,7 +5768,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5744 "configure"
+#line 5771 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5753,16 +5780,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5759: \$? = $ac_status" >&5
+  echo "$as_me:5786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5765: \$? = $ac_status" >&5
+  echo "$as_me:5792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5773,11 +5800,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5776: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5803: 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:5780: error: No curses header-files found" >&5
+	{ { echo "$as_me:5807: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5787,23 +5814,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5790: checking for $ac_header" >&5
+echo "$as_me:5817: 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 5796 "configure"
+#line 5823 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5827: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5806: \$? = $ac_status" >&5
+  echo "$as_me:5833: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5822,7 +5849,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5852: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5878,7 +5905,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5881 "configure"
+#line 5908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5890,16 +5917,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5896: \$? = $ac_status" >&5
+  echo "$as_me:5923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5902: \$? = $ac_status" >&5
+  echo "$as_me:5929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5916,7 +5943,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5946: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5935,7 +5962,7 @@ fi
 
 }
 
-echo "$as_me:5938: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5965: 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
@@ -5947,7 +5974,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5950 "configure"
+#line 5977 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5971,16 +5998,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5977: \$? = $ac_status" >&5
+  echo "$as_me:6004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5983: \$? = $ac_status" >&5
+  echo "$as_me:6010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -5995,14 +6022,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:5998: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:6025: 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:6005: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:6032: 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
@@ -6123,7 +6150,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6126 "configure"
+#line 6153 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6135,16 +6162,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6141: \$? = $ac_status" >&5
+  echo "$as_me:6168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6147: \$? = $ac_status" >&5
+  echo "$as_me:6174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6161,7 +6188,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6191: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6184,7 +6211,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6187 "configure"
+#line 6214 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6208,16 +6235,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6214: \$? = $ac_status" >&5
+  echo "$as_me:6241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6220: \$? = $ac_status" >&5
+  echo "$as_me:6247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -6238,12 +6265,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6268: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:6246: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6273: 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%/[^/]*$%%'`
@@ -6279,7 +6306,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6282 "configure"
+#line 6309 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6291,16 +6318,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6297: \$? = $ac_status" >&5
+  echo "$as_me:6324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6303: \$? = $ac_status" >&5
+  echo "$as_me:6330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6317,7 +6344,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6347: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6365,7 +6392,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:6368: checking for terminfo header" >&5
+echo "$as_me:6395: 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
@@ -6383,7 +6410,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6386 "configure"
+#line 6413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -6398,16 +6425,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6404: \$? = $ac_status" >&5
+  echo "$as_me:6431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6410: \$? = $ac_status" >&5
+  echo "$as_me:6437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6423,7 +6450,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6426: result: $cf_cv_term_header" >&5
+echo "$as_me:6453: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6461,7 +6488,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6464: checking for ncurses version" >&5
+echo "$as_me:6491: 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
@@ -6487,10 +6514,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6490: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6517: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6493: \$? = $ac_status" >&5
+  echo "$as_me:6520: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6500,7 +6527,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6503 "configure"
+#line 6530 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6527,15 +6554,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6533: \$? = $ac_status" >&5
+  echo "$as_me:6560: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6538: \$? = $ac_status" >&5
+  echo "$as_me:6565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6549,7 +6576,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6579: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6562,7 +6589,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6565: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6592: 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
@@ -6570,7 +6597,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6573 "configure"
+#line 6600 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6589,16 +6616,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6595: \$? = $ac_status" >&5
+  echo "$as_me:6622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6609,10 +6636,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6612: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6639: 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:6615: checking for initscr in -lgpm" >&5
+  echo "$as_me:6642: 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
@@ -6620,7 +6647,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6623 "configure"
+#line 6650 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6639,16 +6666,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:6672: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6651: \$? = $ac_status" >&5
+  echo "$as_me:6678: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6659,7 +6686,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6662: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6689: 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"
@@ -6674,7 +6701,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6677: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6704: 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
@@ -6682,7 +6709,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6685 "configure"
+#line 6712 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6701,16 +6728,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6707: \$? = $ac_status" >&5
+  echo "$as_me:6734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6713: \$? = $ac_status" >&5
+  echo "$as_me:6740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6721,7 +6748,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6724: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6751: 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"
@@ -6770,13 +6797,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6773: checking for initscr" >&5
+	echo "$as_me:6800: 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 6779 "configure"
+#line 6806 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6807,16 +6834,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6813: \$? = $ac_status" >&5
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6819: \$? = $ac_status" >&5
+  echo "$as_me:6846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6826,18 +6853,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6829: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6856: 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:6836: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:6863: 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 6840 "configure"
+#line 6867 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6849,25 +6876,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6855: \$? = $ac_status" >&5
+  echo "$as_me:6882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6861: \$? = $ac_status" >&5
+  echo "$as_me:6888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6863: result: yes" >&5
+  echo "$as_me:6890: 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:6870: result: no" >&5
+echo "$as_me:6897: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6935,11 +6962,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6938: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:6965: 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 6942 "configure"
+#line 6969 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6951,25 +6978,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6957: \$? = $ac_status" >&5
+  echo "$as_me:6984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6963: \$? = $ac_status" >&5
+  echo "$as_me:6990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6965: result: yes" >&5
+  echo "$as_me:6992: 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:6972: result: no" >&5
+echo "$as_me:6999: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -6984,7 +7011,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:7014: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6992,7 +7019,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:6995: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:7022: 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
@@ -7002,7 +7029,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7005 "configure"
+#line 7032 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7014,23 +7041,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7020: \$? = $ac_status" >&5
+  echo "$as_me:7047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7026: \$? = $ac_status" >&5
+  echo "$as_me:7053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:7028: result: yes" >&5
+  echo "$as_me:7055: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:7033: result: no" >&5
+echo "$as_me:7060: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -7048,7 +7075,7 @@ else
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:7051: checking for specified curses library type" >&5
+echo "$as_me:7078: 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.
@@ -7068,23 +7095,23 @@ case $cf_cv_screen in
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7071: checking for $ac_header" >&5
+echo "$as_me:7098: 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 7077 "configure"
+#line 7104 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7081: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7108: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7087: \$? = $ac_status" >&5
+  echo "$as_me:7114: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7103,7 +7130,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7106: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7133: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7113,7 +7140,7 @@ EOF
 fi
 done
 
-echo "$as_me:7116: checking for multibyte character support" >&5
+echo "$as_me:7143: 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
@@ -7121,7 +7148,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7124 "configure"
+#line 7151 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7138,16 +7165,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7144: \$? = $ac_status" >&5
+  echo "$as_me:7171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7150: \$? = $ac_status" >&5
+  echo "$as_me:7177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7159,12 +7186,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7189: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7167 "configure"
+#line 7194 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7177,16 +7204,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7183: \$? = $ac_status" >&5
+  echo "$as_me:7210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7189: \$? = $ac_status" >&5
+  echo "$as_me:7216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7200,7 +7227,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7203 "configure"
+#line 7230 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7213,16 +7240,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7219: \$? = $ac_status" >&5
+  echo "$as_me:7246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7225: \$? = $ac_status" >&5
+  echo "$as_me:7252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7239,9 +7266,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7269: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7271: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7332,7 +7359,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7362: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7340,7 +7367,7 @@ echo "${as_me:-configure}:7335: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7343 "configure"
+#line 7370 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7353,21 +7380,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7359: \$? = $ac_status" >&5
+  echo "$as_me:7386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7365: \$? = $ac_status" >&5
+  echo "$as_me:7392: \$? = $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}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7397: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7385,7 +7412,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7415: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7460,13 +7487,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7463: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7490: 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 7469 "configure"
+#line 7496 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7479,21 +7506,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7485: \$? = $ac_status" >&5
+  echo "$as_me:7512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7491: \$? = $ac_status" >&5
+  echo "$as_me:7518: \$? = $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}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7523: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7535,7 +7562,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7538: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7565: 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
@@ -7573,7 +7600,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7576 "configure"
+#line 7603 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7585,16 +7612,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7591: \$? = $ac_status" >&5
+  echo "$as_me:7618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7597: \$? = $ac_status" >&5
+  echo "$as_me:7624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7611,7 +7638,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7647,7 +7674,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7677: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7677,13 +7704,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7680: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:7707: 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:7683: result: yes" >&5
+		echo "$as_me:7710: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7686: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:7713: 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
 
@@ -7816,7 +7843,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7819 "configure"
+#line 7846 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7828,37 +7855,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7834: \$? = $ac_status" >&5
+  echo "$as_me:7861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7840: \$? = $ac_status" >&5
+  echo "$as_me:7867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7846 "configure"
+#line 7873 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7856: \$? = $ac_status" >&5
+  echo "$as_me:7883: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7861: \$? = $ac_status" >&5
+  echo "$as_me:7888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8032,7 +8059,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8035 "configure"
+#line 8062 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8044,37 +8071,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8050: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8056: \$? = $ac_status" >&5
+  echo "$as_me:8083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8062 "configure"
+#line 8089 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8072: \$? = $ac_status" >&5
+  echo "$as_me:8099: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8077: \$? = $ac_status" >&5
+  echo "$as_me:8104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8091,7 +8118,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8094: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:8121: 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"
@@ -8107,7 +8134,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8110: checking for terminfo header" >&5
+echo "$as_me:8137: 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
@@ -8125,7 +8152,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8128 "configure"
+#line 8155 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8140,16 +8167,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8146: \$? = $ac_status" >&5
+  echo "$as_me:8173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8152: \$? = $ac_status" >&5
+  echo "$as_me:8179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8165,7 +8192,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8168: result: $cf_cv_term_header" >&5
+echo "$as_me:8195: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8200,7 +8227,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8203: result: no" >&5
+		echo "$as_me:8230: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8216,7 +8243,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8219: checking for $ac_word" >&5
+echo "$as_me:8246: 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
@@ -8231,7 +8258,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:8234: found $ac_dir/$ac_word" >&5
+echo "$as_me:8261: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8239,10 +8266,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8269: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8245: result: no" >&5
+  echo "$as_me:8272: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8255,7 +8282,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8258: checking for $ac_word" >&5
+echo "$as_me:8285: 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
@@ -8270,7 +8297,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:8273: found $ac_dir/$ac_word" >&5
+echo "$as_me:8300: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8278,10 +8305,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8308: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8284: result: no" >&5
+  echo "$as_me:8311: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8438,7 +8465,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8441: checking if we have identified curses headers" >&5
+echo "$as_me:8468: 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
@@ -8450,7 +8477,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8453 "configure"
+#line 8480 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8462,16 +8489,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8468: \$? = $ac_status" >&5
+  echo "$as_me:8495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8474: \$? = $ac_status" >&5
+  echo "$as_me:8501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8482,11 +8509,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8485: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8512: 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:8489: error: No curses header-files found" >&5
+	{ { echo "$as_me:8516: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8496,23 +8523,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8499: checking for $ac_header" >&5
+echo "$as_me:8526: 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 8505 "configure"
+#line 8532 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8515: \$? = $ac_status" >&5
+  echo "$as_me:8542: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8531,7 +8558,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8587,7 +8614,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8590 "configure"
+#line 8617 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8599,16 +8626,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8605: \$? = $ac_status" >&5
+  echo "$as_me:8632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8611: \$? = $ac_status" >&5
+  echo "$as_me:8638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8625,7 +8652,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8655: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8644,7 +8671,7 @@ fi
 
 }
 
-echo "$as_me:8647: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8674: 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
@@ -8656,7 +8683,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8659 "configure"
+#line 8686 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8680,16 +8707,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8686: \$? = $ac_status" >&5
+  echo "$as_me:8713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8692: \$? = $ac_status" >&5
+  echo "$as_me:8719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8704,14 +8731,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8707: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8734: 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:8714: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8741: 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
@@ -8832,7 +8859,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8835 "configure"
+#line 8862 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8844,16 +8871,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8850: \$? = $ac_status" >&5
+  echo "$as_me:8877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8856: \$? = $ac_status" >&5
+  echo "$as_me:8883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8870,7 +8897,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8900: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8893,7 +8920,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8896 "configure"
+#line 8923 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8917,16 +8944,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8923: \$? = $ac_status" >&5
+  echo "$as_me:8950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8929: \$? = $ac_status" >&5
+  echo "$as_me:8956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8947,12 +8974,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8977: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8955: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8982: 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%/[^/]*$%%'`
@@ -8988,7 +9015,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8991 "configure"
+#line 9018 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9000,16 +9027,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9006: \$? = $ac_status" >&5
+  echo "$as_me:9033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9012: \$? = $ac_status" >&5
+  echo "$as_me:9039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9026,7 +9053,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9056: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9074,7 +9101,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9077: checking for terminfo header" >&5
+echo "$as_me:9104: 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
@@ -9092,7 +9119,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9095 "configure"
+#line 9122 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9107,16 +9134,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9113: \$? = $ac_status" >&5
+  echo "$as_me:9140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9119: \$? = $ac_status" >&5
+  echo "$as_me:9146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9132,7 +9159,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9135: result: $cf_cv_term_header" >&5
+echo "$as_me:9162: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9170,7 +9197,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9173: checking for ncurses version" >&5
+echo "$as_me:9200: 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
@@ -9196,10 +9223,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9199: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9226: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9202: \$? = $ac_status" >&5
+  echo "$as_me:9229: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9209,7 +9236,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9212 "configure"
+#line 9239 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9236,15 +9263,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9242: \$? = $ac_status" >&5
+  echo "$as_me:9269: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9247: \$? = $ac_status" >&5
+  echo "$as_me:9274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9258,7 +9285,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9288: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -9271,7 +9298,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9274: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9301: 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
@@ -9279,7 +9306,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9282 "configure"
+#line 9309 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9298,16 +9325,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9304: \$? = $ac_status" >&5
+  echo "$as_me:9331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9310: \$? = $ac_status" >&5
+  echo "$as_me:9337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9318,10 +9345,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9321: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9348: 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:9324: checking for initscr in -lgpm" >&5
+  echo "$as_me:9351: 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
@@ -9329,7 +9356,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9332 "configure"
+#line 9359 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9348,16 +9375,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9354: \$? = $ac_status" >&5
+  echo "$as_me:9381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9360: \$? = $ac_status" >&5
+  echo "$as_me:9387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9368,7 +9395,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9371: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9398: 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"
@@ -9383,7 +9410,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9386: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9413: 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
@@ -9391,7 +9418,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9394 "configure"
+#line 9421 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9410,16 +9437,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9416: \$? = $ac_status" >&5
+  echo "$as_me:9443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9422: \$? = $ac_status" >&5
+  echo "$as_me:9449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9430,7 +9457,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9433: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9460: 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"
@@ -9479,13 +9506,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9482: checking for initscr" >&5
+	echo "$as_me:9509: 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 9488 "configure"
+#line 9515 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9516,16 +9543,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9522: \$? = $ac_status" >&5
+  echo "$as_me:9549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9528: \$? = $ac_status" >&5
+  echo "$as_me:9555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9535,18 +9562,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9538: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9565: 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:9545: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9572: 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 9549 "configure"
+#line 9576 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9558,25 +9585,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9564: \$? = $ac_status" >&5
+  echo "$as_me:9591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9570: \$? = $ac_status" >&5
+  echo "$as_me:9597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9572: result: yes" >&5
+  echo "$as_me:9599: 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:9579: result: no" >&5
+echo "$as_me:9606: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9644,11 +9671,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9647: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:9674: 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 9651 "configure"
+#line 9678 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9660,25 +9687,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9666: \$? = $ac_status" >&5
+  echo "$as_me:9693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9672: \$? = $ac_status" >&5
+  echo "$as_me:9699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9674: result: yes" >&5
+  echo "$as_me:9701: 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:9681: result: no" >&5
+echo "$as_me:9708: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9693,7 +9720,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:9723: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9701,7 +9728,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9704: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:9731: 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
@@ -9711,7 +9738,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9714 "configure"
+#line 9741 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9723,23 +9750,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9729: \$? = $ac_status" >&5
+  echo "$as_me:9756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9735: \$? = $ac_status" >&5
+  echo "$as_me:9762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9737: result: yes" >&5
+  echo "$as_me:9764: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9742: result: no" >&5
+echo "$as_me:9769: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9764,13 +9791,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9767: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:9794: 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:9770: result: yes" >&5
+		echo "$as_me:9797: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9773: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:9800: 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
 
@@ -9903,7 +9930,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9906 "configure"
+#line 9933 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9915,37 +9942,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9921: \$? = $ac_status" >&5
+  echo "$as_me:9948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:9954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9933 "configure"
+#line 9960 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9943: \$? = $ac_status" >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9948: \$? = $ac_status" >&5
+  echo "$as_me:9975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10119,7 +10146,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10122 "configure"
+#line 10149 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10131,37 +10158,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10137: \$? = $ac_status" >&5
+  echo "$as_me:10164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10143: \$? = $ac_status" >&5
+  echo "$as_me:10170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10149 "configure"
+#line 10176 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10159: \$? = $ac_status" >&5
+  echo "$as_me:10186: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10164: \$? = $ac_status" >&5
+  echo "$as_me:10191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10178,7 +10205,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10181: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:10208: 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"
@@ -10194,7 +10221,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10197: checking for terminfo header" >&5
+echo "$as_me:10224: 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
@@ -10212,7 +10239,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10215 "configure"
+#line 10242 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10227,16 +10254,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10233: \$? = $ac_status" >&5
+  echo "$as_me:10260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10239: \$? = $ac_status" >&5
+  echo "$as_me:10266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10252,7 +10279,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10255: result: $cf_cv_term_header" >&5
+echo "$as_me:10282: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10287,7 +10314,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:10290: result: no" >&5
+		echo "$as_me:10317: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -10303,7 +10330,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:10306: checking for $ac_word" >&5
+echo "$as_me:10333: 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
@@ -10318,7 +10345,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:10321: found $ac_dir/$ac_word" >&5
+echo "$as_me:10348: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10326,10 +10353,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10356: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10332: result: no" >&5
+  echo "$as_me:10359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10342,7 +10369,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10345: checking for $ac_word" >&5
+echo "$as_me:10372: 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
@@ -10357,7 +10384,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10360: found $ac_dir/$ac_word" >&5
+echo "$as_me:10387: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10365,10 +10392,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10395: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10371: result: no" >&5
+  echo "$as_me:10398: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10525,7 +10552,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10528: checking if we have identified curses headers" >&5
+echo "$as_me:10555: 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
@@ -10537,7 +10564,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10540 "configure"
+#line 10567 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10549,16 +10576,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10555: \$? = $ac_status" >&5
+  echo "$as_me:10582: \$? = $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:10585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10561: \$? = $ac_status" >&5
+  echo "$as_me:10588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10569,11 +10596,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10572: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10599: 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:10576: error: No curses header-files found" >&5
+	{ { echo "$as_me:10603: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10583,23 +10610,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10586: checking for $ac_header" >&5
+echo "$as_me:10613: 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 10592 "configure"
+#line 10619 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10596: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10623: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10602: \$? = $ac_status" >&5
+  echo "$as_me:10629: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10618,7 +10645,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10621: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10648: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10674,7 +10701,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10677 "configure"
+#line 10704 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10686,16 +10713,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10692: \$? = $ac_status" >&5
+  echo "$as_me:10719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10698: \$? = $ac_status" >&5
+  echo "$as_me:10725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10712,7 +10739,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10742: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10731,7 +10758,7 @@ fi
 
 }
 
-echo "$as_me:10734: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10761: 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
@@ -10743,7 +10770,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10746 "configure"
+#line 10773 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10767,16 +10794,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10773: \$? = $ac_status" >&5
+  echo "$as_me:10800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10779: \$? = $ac_status" >&5
+  echo "$as_me:10806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10791,14 +10818,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10794: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10821: 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:10801: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10828: 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
@@ -10919,7 +10946,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10922 "configure"
+#line 10949 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10931,16 +10958,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10937: \$? = $ac_status" >&5
+  echo "$as_me:10964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10943: \$? = $ac_status" >&5
+  echo "$as_me:10970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10957,7 +10984,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10987: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10980,7 +11007,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10983 "configure"
+#line 11010 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11004,16 +11031,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11010: \$? = $ac_status" >&5
+  echo "$as_me:11037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:11043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11034,12 +11061,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11064: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11042: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11069: 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%/[^/]*$%%'`
@@ -11075,7 +11102,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11078 "configure"
+#line 11105 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11087,16 +11114,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11093: \$? = $ac_status" >&5
+  echo "$as_me:11120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11099: \$? = $ac_status" >&5
+  echo "$as_me:11126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11113,7 +11140,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11143: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11161,7 +11188,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11164: checking for terminfo header" >&5
+echo "$as_me:11191: 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
@@ -11179,7 +11206,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11182 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11194,16 +11221,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11200: \$? = $ac_status" >&5
+  echo "$as_me:11227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11206: \$? = $ac_status" >&5
+  echo "$as_me:11233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11219,7 +11246,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11222: result: $cf_cv_term_header" >&5
+echo "$as_me:11249: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11257,7 +11284,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:11260: checking for ncurses version" >&5
+echo "$as_me:11287: 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
@@ -11283,10 +11310,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11286: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11313: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11289: \$? = $ac_status" >&5
+  echo "$as_me:11316: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -11296,7 +11323,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11299 "configure"
+#line 11326 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11323,15 +11350,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11329: \$? = $ac_status" >&5
+  echo "$as_me:11356: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11334: \$? = $ac_status" >&5
+  echo "$as_me:11361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11345,7 +11372,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11375: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -11358,7 +11385,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11361: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11388: 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
@@ -11366,7 +11393,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11369 "configure"
+#line 11396 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11385,16 +11412,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11391: \$? = $ac_status" >&5
+  echo "$as_me:11418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11397: \$? = $ac_status" >&5
+  echo "$as_me:11424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11405,10 +11432,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11408: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11435: 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:11411: checking for initscr in -lgpm" >&5
+  echo "$as_me:11438: 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
@@ -11416,7 +11443,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11419 "configure"
+#line 11446 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11435,16 +11462,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11441: \$? = $ac_status" >&5
+  echo "$as_me:11468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11447: \$? = $ac_status" >&5
+  echo "$as_me:11474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11455,7 +11482,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11458: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11485: 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"
@@ -11470,7 +11497,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11473: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11500: 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
@@ -11478,7 +11505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11481 "configure"
+#line 11508 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11497,16 +11524,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11503: \$? = $ac_status" >&5
+  echo "$as_me:11530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11509: \$? = $ac_status" >&5
+  echo "$as_me:11536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11517,7 +11544,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11520: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11547: 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"
@@ -11566,13 +11593,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11569: checking for initscr" >&5
+	echo "$as_me:11596: 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 11575 "configure"
+#line 11602 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11603,16 +11630,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11609: \$? = $ac_status" >&5
+  echo "$as_me:11636: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11615: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11622,18 +11649,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11625: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11652: 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:11632: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11659: 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 11636 "configure"
+#line 11663 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11645,25 +11672,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11651: \$? = $ac_status" >&5
+  echo "$as_me:11678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11657: \$? = $ac_status" >&5
+  echo "$as_me:11684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11659: result: yes" >&5
+  echo "$as_me:11686: 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:11666: result: no" >&5
+echo "$as_me:11693: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11731,11 +11758,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11734: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11761: 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 11738 "configure"
+#line 11765 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11747,25 +11774,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11753: \$? = $ac_status" >&5
+  echo "$as_me:11780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11759: \$? = $ac_status" >&5
+  echo "$as_me:11786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11761: result: yes" >&5
+  echo "$as_me:11788: 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:11768: result: no" >&5
+echo "$as_me:11795: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11780,7 +11807,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11810: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11788,7 +11815,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11818: 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
@@ -11798,7 +11825,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11801 "configure"
+#line 11828 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11810,23 +11837,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11816: \$? = $ac_status" >&5
+  echo "$as_me:11843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11822: \$? = $ac_status" >&5
+  echo "$as_me:11849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11824: result: yes" >&5
+  echo "$as_me:11851: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11829: result: no" >&5
+echo "$as_me:11856: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11846,7 +11873,7 @@ fi
 
 	;;
 (*)
-	{ { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:11876: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11885,10 +11912,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11888: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:11915: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11891: \$? = $ac_status" >&5
+  echo "$as_me:11918: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11906,17 +11933,17 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11909: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11936: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11912: checking if KEY_RESIZE is supported" >&5
+echo "$as_me:11939: checking if KEY_RESIZE is supported" >&5
 echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
 if test "${cf_cv_curses_resizes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11919 "configure"
+#line 11946 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11928,16 +11955,16 @@ int key = KEY_RESIZE; (void)key
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11934: \$? = $ac_status" >&5
+  echo "$as_me:11961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11940: \$? = $ac_status" >&5
+  echo "$as_me:11967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_resizes=yes
 else
@@ -11947,12 +11974,12 @@ cf_cv_curses_resizes=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
+echo "$as_me:11977: result: $cf_cv_curses_resizes" >&5
 echo "${ECHO_T}$cf_cv_curses_resizes" >&6
 cf_cv_enable_sigwinch=0
 test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
 
-echo "$as_me:11955: checking if you want to have a library-prefix" >&5
+echo "$as_me:11982: 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.
@@ -11962,7 +11989,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11965: result: $with_lib_prefix" >&5
+echo "$as_me:11992: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -12000,7 +12027,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:12003: checking for default loader flags" >&5
+echo "$as_me:12030: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -12008,13 +12035,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:12011: result: $LD_MODEL" >&5
+echo "$as_me:12038: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:12017: checking for an rpath option" >&5
+	echo "$as_me:12044: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -12045,12 +12072,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:12075: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:12053: checking if we need a space after rpath option" >&5
+		echo "$as_me:12080: 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"
 
@@ -12071,7 +12098,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12074 "configure"
+#line 12101 "configure"
 #include "confdefs.h"
 
 int
@@ -12083,16 +12110,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12089: \$? = $ac_status" >&5
+  echo "$as_me:12116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12095: \$? = $ac_status" >&5
+  echo "$as_me:12122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -12102,7 +12129,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:12105: result: $cf_rpath_space" >&5
+		echo "$as_me:12132: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -12124,7 +12151,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:12127: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:12154: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -12139,9 +12166,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:12142: result: $withval" >&5
+		echo "$as_me:12169: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:12144: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:12171: 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; }; }
 		;;
@@ -12150,7 +12177,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:12180: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -12173,14 +12200,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:12176: checking which $CC option to use" >&5
+		echo "$as_me:12203: 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 12183 "configure"
+#line 12210 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12192,16 +12219,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12198: \$? = $ac_status" >&5
+  echo "$as_me:12225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12204: \$? = $ac_status" >&5
+  echo "$as_me:12231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12210,7 +12237,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:12240: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -12281,7 +12308,7 @@ CF_EOF
 		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:12284: checking if ld -search_paths_first works" >&5
+		echo "$as_me:12311: 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
@@ -12290,7 +12317,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12293 "configure"
+#line 12320 "configure"
 #include "confdefs.h"
 
 int
@@ -12302,16 +12329,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12308: \$? = $ac_status" >&5
+  echo "$as_me:12335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12314: \$? = $ac_status" >&5
+  echo "$as_me:12341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -12322,7 +12349,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:12325: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:12352: 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"
@@ -12672,7 +12699,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12675 "configure"
+#line 12702 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12684,16 +12711,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12690: \$? = $ac_status" >&5
+  echo "$as_me:12717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12696: \$? = $ac_status" >&5
+  echo "$as_me:12723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12730,7 +12757,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:12760: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12740,7 +12767,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12743 "${as_me:-configure}"
+#line 12770 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12752,18 +12779,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12755: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:12782: 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:12757: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:12784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12760: \$? = $ac_status" >&5
+  echo "$as_me:12787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12762: result: yes" >&5
+				echo "$as_me:12789: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12766: result: no" >&5
+				echo "$as_me:12793: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12778,17 +12805,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12781: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:12808: 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}:12785: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:12812: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12791: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:12818: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12798,7 +12825,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12801: result: $with_rpath_link" >&5
+	echo "$as_me:12828: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12811,7 +12838,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12814: checking if you want broken-linker support code" >&5
+echo "$as_me:12841: 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.
@@ -12821,7 +12848,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12824: result: $with_broken_linker" >&5
+echo "$as_me:12851: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12836,14 +12863,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12839: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12866: 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 12846 "configure"
+#line 12873 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12862,16 +12889,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12868: \$? = $ac_status" >&5
+  echo "$as_me:12895: \$? = $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:12898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12874: \$? = $ac_status" >&5
+  echo "$as_me:12901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12882,7 +12909,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12912: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12924,14 +12951,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12927: checking if this is the GNU C library" >&5
+echo "$as_me:12954: 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 12934 "configure"
+#line 12961 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12950,16 +12977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12956: \$? = $ac_status" >&5
+  echo "$as_me:12983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12962: \$? = $ac_status" >&5
+  echo "$as_me:12989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12970,7 +12997,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
+echo "$as_me:13000: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -12978,7 +13005,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:12981: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:13008: 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
@@ -12990,7 +13017,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12993 "configure"
+#line 13020 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13009,16 +13036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13015: \$? = $ac_status" >&5
+  echo "$as_me:13042: \$? = $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:13045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13021: \$? = $ac_status" >&5
+  echo "$as_me:13048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -13030,12 +13057,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:13033: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:13060: 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:13038: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:13065: 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
@@ -13140,7 +13167,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13143 "configure"
+#line 13170 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13160,16 +13187,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13166: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13172: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -13180,7 +13207,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13183: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:13210: 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
@@ -13189,14 +13216,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:13192: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:13219: 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 13199 "configure"
+#line 13226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13211,16 +13238,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13217: \$? = $ac_status" >&5
+  echo "$as_me:13244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13223: \$? = $ac_status" >&5
+  echo "$as_me:13250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13327,7 +13354,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13330 "configure"
+#line 13357 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13342,16 +13369,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13348: \$? = $ac_status" >&5
+  echo "$as_me:13375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13354: \$? = $ac_status" >&5
+  echo "$as_me:13381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13366,12 +13393,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13369: result: $cf_cv_gnu_source" >&5
+echo "$as_me:13396: 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:13374: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:13401: 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
@@ -13381,7 +13408,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13384 "configure"
+#line 13411 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13396,16 +13423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13402: \$? = $ac_status" >&5
+  echo "$as_me:13429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13408: \$? = $ac_status" >&5
+  echo "$as_me:13435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13416,7 +13443,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13419: result: $cf_cv_default_source" >&5
+echo "$as_me:13446: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13453,16 +13480,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13456: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13483: 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}:13462: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13489: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13465 "configure"
+#line 13492 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13477,16 +13504,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13483: \$? = $ac_status" >&5
+  echo "$as_me:13510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13489: \$? = $ac_status" >&5
+  echo "$as_me:13516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13507,7 +13534,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13510 "configure"
+#line 13537 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13522,16 +13549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13528: \$? = $ac_status" >&5
+  echo "$as_me:13555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13534: \$? = $ac_status" >&5
+  echo "$as_me:13561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13542,7 +13569,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13550,10 +13577,10 @@ echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13580: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13556 "configure"
+#line 13583 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13568,16 +13595,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13574: \$? = $ac_status" >&5
+  echo "$as_me:13601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13580: \$? = $ac_status" >&5
+  echo "$as_me:13607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13593,7 +13620,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13596: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13623: 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
@@ -13710,7 +13737,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13713: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13740: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13742,14 +13769,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13745: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13772: 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 13752 "configure"
+#line 13779 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13767,16 +13794,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13773: \$? = $ac_status" >&5
+  echo "$as_me:13800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13779: \$? = $ac_status" >&5
+  echo "$as_me:13806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13788,7 +13815,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13791 "configure"
+#line 13818 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13806,16 +13833,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13812: \$? = $ac_status" >&5
+  echo "$as_me:13839: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13818: \$? = $ac_status" >&5
+  echo "$as_me:13845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13830,7 +13857,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13860: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13990,16 +14017,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13993: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:14020: 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}:13999: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:14026: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 14002 "configure"
+#line 14029 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14014,16 +14041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14020: \$? = $ac_status" >&5
+  echo "$as_me:14047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14026: \$? = $ac_status" >&5
+  echo "$as_me:14053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -14044,7 +14071,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14047 "configure"
+#line 14074 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14059,16 +14086,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14065: \$? = $ac_status" >&5
+  echo "$as_me:14092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14079,7 +14106,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14087,10 +14114,10 @@ echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14117: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14093 "configure"
+#line 14120 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14105,16 +14132,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14135: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14111: \$? = $ac_status" >&5
+  echo "$as_me:14138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14117: \$? = $ac_status" >&5
+  echo "$as_me:14144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14130,7 +14157,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14133: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14160: 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
@@ -14243,10 +14270,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14273: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14249 "configure"
+#line 14276 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14264,23 +14291,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14270: \$? = $ac_status" >&5
+  echo "$as_me:14297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14276: \$? = $ac_status" >&5
+  echo "$as_me:14303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14283: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14310: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14303,7 +14330,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14333: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14315,7 +14342,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14345: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14403,7 +14430,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14433: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14413,7 +14440,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14443: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14423,7 +14450,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14426: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14453: 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"
@@ -14435,10 +14462,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14438: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14465: 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 14441 "configure"
+#line 14468 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14453,16 +14480,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14459: \$? = $ac_status" >&5
+  echo "$as_me:14486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14465: \$? = $ac_status" >&5
+  echo "$as_me:14492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14471,12 +14498,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14474: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14501: 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 14479 "configure"
+#line 14506 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14491,16 +14518,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14497: \$? = $ac_status" >&5
+  echo "$as_me:14524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14503: \$? = $ac_status" >&5
+  echo "$as_me:14530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14511,19 +14538,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14541: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14519: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14546: 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 14526 "configure"
+#line 14553 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14541,16 +14568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14547: \$? = $ac_status" >&5
+  echo "$as_me:14574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14553: \$? = $ac_status" >&5
+  echo "$as_me:14580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14562,7 +14589,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14565 "configure"
+#line 14592 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14580,16 +14607,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14586: \$? = $ac_status" >&5
+  echo "$as_me:14613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14592: \$? = $ac_status" >&5
+  echo "$as_me:14619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14604,7 +14631,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14634: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14751,13 +14778,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14754: checking for ANSI C header files" >&5
+echo "$as_me:14781: 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 14760 "configure"
+#line 14787 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14765,13 +14792,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14768: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14795: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14774: \$? = $ac_status" >&5
+  echo "$as_me:14801: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14793,7 +14820,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14796 "configure"
+#line 14823 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14811,7 +14838,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14814 "configure"
+#line 14841 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14832,7 +14859,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14835 "configure"
+#line 14862 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14858,15 +14885,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14864: \$? = $ac_status" >&5
+  echo "$as_me:14891: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14869: \$? = $ac_status" >&5
+  echo "$as_me:14896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14879,7 +14906,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14909: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14895,28 +14922,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14898: checking for $ac_header" >&5
+echo "$as_me:14925: 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 14904 "configure"
+#line 14931 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14913: \$? = $ac_status" >&5
+  echo "$as_me:14940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14919: \$? = $ac_status" >&5
+  echo "$as_me:14946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14926,7 +14953,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14929: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14956: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14936,13 +14963,13 @@ EOF
 fi
 done
 
-echo "$as_me:14939: checking whether exit is declared" >&5
+echo "$as_me:14966: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14945 "configure"
+#line 14972 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14957,16 +14984,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14963: \$? = $ac_status" >&5
+  echo "$as_me:14990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14969: \$? = $ac_status" >&5
+  echo "$as_me:14996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -14976,7 +15003,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:15006: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -14986,7 +15013,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14989: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:15016: 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
@@ -14998,7 +15025,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 15001 "configure"
+#line 15028 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15018,16 +15045,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15024: \$? = $ac_status" >&5
+  echo "$as_me:15051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15030: \$? = $ac_status" >&5
+  echo "$as_me:15057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15037,16 +15064,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15043: \$? = $ac_status" >&5
+  echo "$as_me:15070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15049: \$? = $ac_status" >&5
+  echo "$as_me:15076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15060,13 +15087,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:15063: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15090: 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:15069: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15096: 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
@@ -15074,7 +15101,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15077 "configure"
+#line 15104 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15094,16 +15121,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15100: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15112,7 +15139,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15115 "configure"
+#line 15142 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15133,16 +15160,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15139: \$? = $ac_status" >&5
+  echo "$as_me:15166: \$? = $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:15169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15145: \$? = $ac_status" >&5
+  echo "$as_me:15172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15153,7 +15180,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15156: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15183: 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
 
@@ -15163,7 +15190,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15166: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15193: 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
@@ -15171,7 +15198,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15174 "configure"
+#line 15201 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15191,16 +15218,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15197: \$? = $ac_status" >&5
+  echo "$as_me:15224: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15203: \$? = $ac_status" >&5
+  echo "$as_me:15230: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15209,7 +15236,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15212 "configure"
+#line 15239 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15230,16 +15257,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15236: \$? = $ac_status" >&5
+  echo "$as_me:15263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15242: \$? = $ac_status" >&5
+  echo "$as_me:15269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15250,7 +15277,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15253: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15280: 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
 
@@ -15263,7 +15290,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15266: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15293: 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
@@ -15271,7 +15298,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15274 "configure"
+#line 15301 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15286,16 +15313,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15292: \$? = $ac_status" >&5
+  echo "$as_me:15319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15298: \$? = $ac_status" >&5
+  echo "$as_me:15325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15304,7 +15331,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15307 "configure"
+#line 15334 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15320,16 +15347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15326: \$? = $ac_status" >&5
+  echo "$as_me:15353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15332: \$? = $ac_status" >&5
+  echo "$as_me:15359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15340,7 +15367,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15343: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15370: 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
 
@@ -15354,13 +15381,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15357: checking for fseeko" >&5
+echo "$as_me:15384: 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 15363 "configure"
+#line 15390 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15374,16 +15401,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15380: \$? = $ac_status" >&5
+  echo "$as_me:15407: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15386: \$? = $ac_status" >&5
+  echo "$as_me:15413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15393,7 +15420,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15423: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15432,14 +15459,14 @@ fi
 
 	fi
 
-	echo "$as_me:15435: checking whether to use struct dirent64" >&5
+	echo "$as_me:15462: 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 15442 "configure"
+#line 15469 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15466,16 +15493,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15472: \$? = $ac_status" >&5
+  echo "$as_me:15499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15478: \$? = $ac_status" >&5
+  echo "$as_me:15505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15486,7 +15513,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15516: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15496,7 +15523,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15499: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15526: 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.
@@ -15506,7 +15533,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15509: result: $with_rcs_ids" >&5
+echo "$as_me:15536: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15516,7 +15543,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15519: checking if you want to build with function extensions" >&5
+echo "$as_me:15546: 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.
@@ -15526,7 +15553,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15529: result: $with_ext_funcs" >&5
+echo "$as_me:15556: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15544,7 +15571,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15547: checking for extended use of const keyword" >&5
+echo "$as_me:15574: 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.
@@ -15554,7 +15581,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15557: result: $with_ext_const" >&5
+echo "$as_me:15584: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15564,7 +15591,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15567: checking if you want all development code" >&5
+echo "$as_me:15594: 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.
@@ -15574,7 +15601,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15577: result: $with_develop" >&5
+echo "$as_me:15604: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15583,7 +15610,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15586: checking if you want to link with the pthread library" >&5
+echo "$as_me:15613: 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.
@@ -15593,27 +15620,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15596: result: $with_pthread" >&5
+echo "$as_me:15623: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15600: checking for pthread.h" >&5
+	echo "$as_me:15627: 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 15606 "configure"
+#line 15633 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15637: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15616: \$? = $ac_status" >&5
+  echo "$as_me:15643: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15632,7 +15659,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15635: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15662: 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
 
@@ -15642,7 +15669,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15645: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15672: 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"
 
@@ -15663,7 +15690,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15666 "configure"
+#line 15693 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15680,16 +15707,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15686: \$? = $ac_status" >&5
+  echo "$as_me:15713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15692: \$? = $ac_status" >&5
+  echo "$as_me:15719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15699,7 +15726,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15702: result: $with_pthread" >&5
+	    echo "$as_me:15729: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15727,7 +15754,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15757: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15736,7 +15763,7 @@ fi
 
 fi
 
-echo "$as_me:15739: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15766: 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.
@@ -15746,18 +15773,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15749: result: $use_weak_symbols" >&5
+echo "$as_me:15776: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15753: checking if $CC supports weak symbols" >&5
+echo "$as_me:15780: 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 15760 "configure"
+#line 15787 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15783,16 +15810,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15789: \$? = $ac_status" >&5
+  echo "$as_me:15816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15795: \$? = $ac_status" >&5
+  echo "$as_me:15822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15803,7 +15830,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15833: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15832,13 +15859,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15835: checking for _nc_TABSIZE" >&5
+echo "$as_me:15862: 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 15841 "configure"
+#line 15868 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15869,16 +15896,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15875: \$? = $ac_status" >&5
+  echo "$as_me:15902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15881: \$? = $ac_status" >&5
+  echo "$as_me:15908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15888,7 +15915,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15891: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15918: 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
@@ -15900,7 +15927,7 @@ fi
 # 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:15903: checking if you want experimental reentrant code" >&5
+echo "$as_me:15930: 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.
@@ -15910,7 +15937,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15913: result: $with_reentrant" >&5
+echo "$as_me:15940: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15933,7 +15960,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15936: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15963: 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.
@@ -15943,7 +15970,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15973: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15957,7 +15984,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15960: checking if you want to see long compiling messages" >&5
+echo "$as_me:15987: 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.
@@ -15991,10 +16018,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:15994: result: $enableval" >&5
+echo "$as_me:16021: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:15997: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:16024: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -16011,17 +16038,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:16014: result: $enable_stdnoreturn" >&5
+echo "$as_me:16041: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:16018: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16045: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16024 "configure"
+#line 16051 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16037,16 +16064,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16043: \$? = $ac_status" >&5
+  echo "$as_me:16070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16049: \$? = $ac_status" >&5
+  echo "$as_me:16076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -16057,7 +16084,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16087: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16113,16 +16140,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16143: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16148: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16152: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16161,16 +16188,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16196: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16200: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16209,23 +16236,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16244: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16248: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16228: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16255: 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.
@@ -16242,7 +16269,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16245: result: $enable_warnings" >&5
+echo "$as_me:16272: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16266,7 +16293,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16269 "configure"
+#line 16296 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16281,26 +16308,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16287: \$? = $ac_status" >&5
+  echo "$as_me:16314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16293: \$? = $ac_status" >&5
+  echo "$as_me:16320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16296: checking for X11/Xt const-feature" >&5
+echo "$as_me:16323: 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 16303 "configure"
+#line 16330 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16318,16 +16345,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16324: \$? = $ac_status" >&5
+  echo "$as_me:16351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16330: \$? = $ac_status" >&5
+  echo "$as_me:16357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16342,7 +16369,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16372: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16371,7 +16398,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16374 "${as_me:-configure}"
+#line 16401 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16387,7 +16414,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16390: checking for $CC warning options..." >&5
+	{ echo "$as_me:16417: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16403,12 +16430,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16409: \$? = $ac_status" >&5
+  echo "$as_me:16436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16438: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16416,7 +16443,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16419: checking for $CC warning options..." >&5
+	{ echo "$as_me:16446: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16439,12 +16466,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16442: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16445: \$? = $ac_status" >&5
+  echo "$as_me:16472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16474: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16452,7 +16479,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16462,7 +16489,7 @@ echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16492: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16495,10 +16522,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16525: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16501 "${as_me:-configure}"
+#line 16528 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16548,12 +16575,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16554: \$? = $ac_status" >&5
+  echo "$as_me:16581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16583: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16621,7 +16648,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16624: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16651: 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.
@@ -16631,7 +16658,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16634: result: $with_assertions" >&5
+echo "$as_me:16661: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16684,7 +16711,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16687: checking whether to add trace feature to all models" >&5
+echo "$as_me:16714: 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.
@@ -16694,7 +16721,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16697: result: $cf_with_trace" >&5
+echo "$as_me:16724: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16708,7 +16735,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16711: checking if we want to use GNAT projects" >&5
+echo "$as_me:16738: 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.
@@ -16725,21 +16752,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16728: result: $enable_gnat_projects" >&5
+echo "$as_me:16755: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16735: checking if ssp library is needed" >&5
+echo "$as_me:16762: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16742 "configure"
+#line 16769 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16756,16 +16783,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16762: \$? = $ac_status" >&5
+  echo "$as_me:16789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16768: \$? = $ac_status" >&5
+  echo "$as_me:16795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16775,7 +16802,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16778 "configure"
+#line 16805 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16792,16 +16819,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16798: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16804: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16815,7 +16842,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16845: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16843,13 +16870,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16846: checking for clock_gettime" >&5
+echo "$as_me:16873: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16852 "configure"
+#line 16879 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16880,16 +16907,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16886: \$? = $ac_status" >&5
+  echo "$as_me:16913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16892: \$? = $ac_status" >&5
+  echo "$as_me:16919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16899,12 +16926,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16902: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16929: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16907: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16934: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16912,7 +16939,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16915 "configure"
+#line 16942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16931,16 +16958,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16937: \$? = $ac_status" >&5
+  echo "$as_me:16964: \$? = $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:16967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16943: \$? = $ac_status" >&5
+  echo "$as_me:16970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16951,7 +16978,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16954: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16981: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16963,14 +16990,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16966: checking if clock_gettime links" >&5
+echo "$as_me:16993: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16973 "configure"
+#line 17000 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16988,16 +17015,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16994: \$? = $ac_status" >&5
+  echo "$as_me:17021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17000: \$? = $ac_status" >&5
+  echo "$as_me:17027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -17008,7 +17035,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:17038: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17022,13 +17049,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17025: checking for gettimeofday" >&5
+echo "$as_me:17052: 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 17031 "configure"
+#line 17058 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17059,16 +17086,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17065: \$? = $ac_status" >&5
+  echo "$as_me:17092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17071: \$? = $ac_status" >&5
+  echo "$as_me:17098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17078,7 +17105,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17108: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17088,7 +17115,7 @@ EOF
 
 else
 
-echo "$as_me:17091: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17118: 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
@@ -17096,7 +17123,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17099 "configure"
+#line 17126 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17115,16 +17142,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17121: \$? = $ac_status" >&5
+  echo "$as_me:17148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17127: \$? = $ac_status" >&5
+  echo "$as_me:17154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17135,7 +17162,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17138: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17165: 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
 
@@ -17168,13 +17195,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17171: checking for signed char" >&5
+echo "$as_me:17198: 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 17177 "configure"
+#line 17204 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17189,16 +17216,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17195: \$? = $ac_status" >&5
+  echo "$as_me:17222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17201: \$? = $ac_status" >&5
+  echo "$as_me:17228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17208,10 +17235,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17238: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17214: checking size of signed char" >&5
+echo "$as_me:17241: 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
@@ -17220,7 +17247,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17223 "configure"
+#line 17250 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17232,21 +17259,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17238: \$? = $ac_status" >&5
+  echo "$as_me:17265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17244: \$? = $ac_status" >&5
+  echo "$as_me:17271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17249 "configure"
+#line 17276 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17258,16 +17285,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17264: \$? = $ac_status" >&5
+  echo "$as_me:17291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17270: \$? = $ac_status" >&5
+  echo "$as_me:17297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17283,7 +17310,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17286 "configure"
+#line 17313 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17295,16 +17322,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17301: \$? = $ac_status" >&5
+  echo "$as_me:17328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17307: \$? = $ac_status" >&5
+  echo "$as_me:17334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17320,7 +17347,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17323 "configure"
+#line 17350 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17332,16 +17359,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17338: \$? = $ac_status" >&5
+  echo "$as_me:17365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17344: \$? = $ac_status" >&5
+  echo "$as_me:17371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17354,12 +17381,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17357: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17384: 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 17362 "configure"
+#line 17389 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17375,15 +17402,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17381: \$? = $ac_status" >&5
+  echo "$as_me:17408: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17386: \$? = $ac_status" >&5
+  echo "$as_me:17413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17399,7 +17426,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17402: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17429: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17408,13 +17435,13 @@ EOF
 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:17411: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17438: 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 17417 "configure"
+#line 17444 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17429,16 +17456,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17435: \$? = $ac_status" >&5
+  echo "$as_me:17462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17441: \$? = $ac_status" >&5
+  echo "$as_me:17468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17448,7 +17475,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17451: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17478: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17461,7 +17488,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17464: checking for opendir in -ldir" >&5
+  echo "$as_me:17491: 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
@@ -17469,7 +17496,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17472 "configure"
+#line 17499 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17488,16 +17515,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17494: \$? = $ac_status" >&5
+  echo "$as_me:17521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17500: \$? = $ac_status" >&5
+  echo "$as_me:17527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17508,14 +17535,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17511: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17538: 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:17518: checking for opendir in -lx" >&5
+  echo "$as_me:17545: 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
@@ -17523,7 +17550,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17526 "configure"
+#line 17553 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17542,16 +17569,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17548: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17554: \$? = $ac_status" >&5
+  echo "$as_me:17581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17562,7 +17589,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17565: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17592: 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"
@@ -17570,13 +17597,13 @@ fi
 
 fi
 
-echo "$as_me:17573: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17600: 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 17579 "configure"
+#line 17606 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17592,16 +17619,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17598: \$? = $ac_status" >&5
+  echo "$as_me:17625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17604: \$? = $ac_status" >&5
+  echo "$as_me:17631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17611,7 +17638,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17614: result: $ac_cv_header_time" >&5
+echo "$as_me:17641: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17629,13 +17656,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17632: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17659: 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 17638 "configure"
+#line 17665 "configure"
 #include "confdefs.h"
 
 int
@@ -17697,16 +17724,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17703: \$? = $ac_status" >&5
+  echo "$as_me:17730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17709: \$? = $ac_status" >&5
+  echo "$as_me:17736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17716,7 +17743,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17719: result: $ac_cv_c_const" >&5
+echo "$as_me:17746: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17728,7 +17755,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17731: checking if data-only library module links" >&5
+echo "$as_me:17758: 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
@@ -17736,20 +17763,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17739 "configure"
+#line 17766 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17742: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17745: \$? = $ac_status" >&5
+  echo "$as_me:17772: \$? = $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 <<EOF
-#line 17752 "configure"
+#line 17779 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17766,10 +17793,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17796: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17772: \$? = $ac_status" >&5
+  echo "$as_me:17799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17782,7 +17809,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17785 "configure"
+#line 17812 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17793,15 +17820,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17799: \$? = $ac_status" >&5
+  echo "$as_me:17826: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17804: \$? = $ac_status" >&5
+  echo "$as_me:17831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17816,7 +17843,7 @@ fi
 
 fi
 
-echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17846: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17835,23 +17862,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17838: checking for $ac_header" >&5
+echo "$as_me:17865: 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 17844 "configure"
+#line 17871 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17848: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17875: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17854: \$? = $ac_status" >&5
+  echo "$as_me:17881: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17870,7 +17897,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17873: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17900: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17880,7 +17907,7 @@ EOF
 fi
 done
 
-echo "$as_me:17883: checking for working mkstemp" >&5
+echo "$as_me:17910: 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
@@ -17891,7 +17918,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17894 "configure"
+#line 17921 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17926,15 +17953,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17932: \$? = $ac_status" >&5
+  echo "$as_me:17959: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17937: \$? = $ac_status" >&5
+  echo "$as_me:17964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17949,16 +17976,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17952: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17979: 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:17955: checking for mkstemp" >&5
+	echo "$as_me:17982: 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 17961 "configure"
+#line 17988 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17989,16 +18016,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17995: \$? = $ac_status" >&5
+  echo "$as_me:18022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18001: \$? = $ac_status" >&5
+  echo "$as_me:18028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -18008,7 +18035,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18038: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18029,7 +18056,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18059: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18046,10 +18073,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18049: result: $ADAFLAGS" >&5
+	echo "$as_me:18076: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18052: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18079: 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
@@ -18059,11 +18086,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18062: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18089: 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:18066: checking if GNAT supports generics" >&5
+echo "$as_me:18093: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18073,7 +18100,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18076: result: $cf_gnat_generics" >&5
+echo "$as_me:18103: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18085,7 +18112,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18088: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18115: 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
@@ -18133,7 +18160,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18163: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18146,7 +18173,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18149: checking if GNAT supports project files" >&5
+echo "$as_me:18176: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18209,15 +18236,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18212: result: $cf_gnat_projects" >&5
+echo "$as_me:18239: 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:18218: checking if GNAT supports libraries" >&5
+	echo "$as_me:18245: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18220: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18247: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18237,7 +18264,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18240: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18267: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18249,7 +18276,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18252: checking for Ada95 compiler" >&5
+echo "$as_me:18279: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18260,12 +18287,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18263: result: $cf_ada_compiler" >&5
+echo "$as_me:18290: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18268: checking for Ada95 include directory" >&5
+echo "$as_me:18295: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18299,7 +18326,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18329: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18308,10 +18335,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18311: result: $ADA_INCLUDE" >&5
+echo "$as_me:18338: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18314: checking for Ada95 object directory" >&5
+echo "$as_me:18341: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18345,7 +18372,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18375: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18354,10 +18381,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18357: result: $ADA_OBJECTS" >&5
+echo "$as_me:18384: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18360: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18387: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18378,11 +18405,11 @@ then
 	fi
 fi
 
-echo "$as_me:18381: result: $with_ada_sharedlib" >&5
+echo "$as_me:18408: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18385: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18412: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18400,7 +18427,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18403: checking for Ada95 curses library name" >&5
+echo "$as_me:18430: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18416,16 +18443,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18419: result: $ADA_LIBNAME" >&5
+echo "$as_me:18446: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18423: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18450: 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:18428: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18455: 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
@@ -18465,7 +18492,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18468: checking default library suffix" >&5
+echo "$as_me:18495: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18476,10 +18503,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18506: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18482: checking default library-dependency suffix" >&5
+echo "$as_me:18509: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18562,10 +18589,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18565: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18592: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18568: checking default object directory" >&5
+echo "$as_me:18595: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18581,7 +18608,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18611: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18723,7 +18750,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18753: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18904,7 +18931,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18907: error: ambiguous option: $1
+    { { echo "$as_me:18934: 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;}
@@ -18923,7 +18950,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18926: error: unrecognized option: $1
+  -*) { { echo "$as_me:18953: 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;}
@@ -18998,7 +19025,7 @@ do
   "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:19001: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19028: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19143,6 +19170,7 @@ s,@AR@,$AR,;t t
 s,@ac_ct_AR@,$ac_ct_AR,;t t
 s,@ARFLAGS@,$ARFLAGS,;t t
 s,@DESTDIR@,$DESTDIR,;t t
+s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
 s,@BUILD_CC@,$BUILD_CC,;t t
 s,@BUILD_CPP@,$BUILD_CPP,;t t
 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
@@ -19364,7 +19392,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19367: creating $ac_file" >&5
+    { echo "$as_me:19395: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19382,7 +19410,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19413: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19395,7 +19423,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19398: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19426: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19411,7 +19439,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19414: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19442: 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;}
@@ -19420,7 +19448,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19423: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19451: 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;}
@@ -19465,7 +19493,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19468: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19496: 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;}
@@ -19476,7 +19504,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19479: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19507: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19525,7 +19553,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19556: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19536,7 +19564,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19567: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19549,7 +19577,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19552: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19580: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19607,7 +19635,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19610: $ac_file is unchanged" >&5
+      { echo "$as_me:19638: $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/Ada95/configure.in b/Ada95/configure.in
index 2b0e01373..bd58beb77 100644
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: configure.in,v 1.93 2024/05/19 09:12:05 tom Exp $
+dnl $Id: configure.in,v 1.94 2024/08/11 00:22:07 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)
-AC_REVISION($Revision: 1.93 $)
+AC_REVISION($Revision: 1.94 $)
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -115,20 +115,7 @@ AC_CHECK_TOOL(AR, ar, ar)
 CF_AR_FLAGS
 CF_PATHSEP
 
-dnl Special option for use by system-builders: the install-prefix is used to
-dnl adjust the location into which the actual install is done, so that an
-dnl archive can be built without modifying the host system's configuration.
-AC_MSG_CHECKING(if you have specified an install-prefix)
-AC_ARG_WITH(install-prefix,
-	[  --with-install-prefix   prefixes actual install-location ($DESTDIR)],
-	[case "$withval" in
-	(yes|no)
-		;;
-	(*)	DESTDIR="$withval"
-		;;
-	esac])
-AC_MSG_RESULT($DESTDIR)
-AC_SUBST(DESTDIR)
+CF_INSTALL_PREFIX
 
 ###############################################################################
 CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in
index 0aed33feb..f94a341f3 100644
--- a/Ada95/doc/Makefile.in
+++ b/Ada95/doc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $
+# $Id: Makefile.in,v 1.10 2024/08/10 18:18:19 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
 # Copyright 2011-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -49,8 +49,8 @@ INSTALL_DATA	= @INSTALL_DATA@
 DFT_ARG_SUFFIX	= @DFT_ARG_SUFFIX@
 
 THIS		= @ADA_LIBNAME@
-DOCDIR		= $(DESTDIR)$(datadir)/doc/$(THIS)
-MANDIR		= $(DESTDIR)$(mandir)/man1
+DOCDIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)/doc/$(THIS)
+MANDIR		= $(DESTDIR)$(mandir@MERGE_PREFIX@)/man1
 
 ################################################################################
 
diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 6e47b0a66..135a493e5 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -30,7 +30,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #     and:  Thomas E. Dickey, 1997
 #
-#  $Id: Makefile.in,v 1.104 2024/06/15 14:56:14 tom Exp $
+#  $Id: Makefile.in,v 1.105 2024/08/10 17:55:15 tom Exp $
 #
 .SUFFIXES:
 
@@ -48,6 +48,8 @@ exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 includedir	= @includedir@
 
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+
 INSTALL		= @INSTALL@ @INSTALL_OPT_O@
 INSTALL_SCRIPT	= @INSTALL_SCRIPT@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -163,19 +165,19 @@ libs :	$(GEN_TARGETS)
 
 sources:
 
-$(DESTDIR)$(bindir) :
+$(BINDIR) :
 	mkdir -p $@
 
 install \
 install.libs :: \
 		$(GEN_TARGETS) \
-		$(DESTDIR)$(bindir) \
+		$(BINDIR) \
 		$(ADACURSES_CONFIG)
-	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(BINDIR)/$(ADACURSES_CONFIG)
 
 uninstall \
 uninstall.libs ::
-	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+	-rm -f $(BINDIR)/$(ADACURSES_CONFIG)
 
 $(PROG_GENERATE):  gen.o
 	@ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@
diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in
index 61abfc73a..ec7e52e5d 100644
--- a/Ada95/samples/Makefile.in
+++ b/Ada95/samples/Makefile.in
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.65 2024/06/15 15:13:11 tom Exp $
+#  $Id: Makefile.in,v 1.66 2024/08/10 17:56:19 tom Exp $
 #
 .SUFFIXES:
 
@@ -78,9 +78,9 @@ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 RANLIB		= @RANLIB@
 ################################################################################
-BINDIR		= $(DESTDIR)$(bindir)
-DATADIR		= $(DESTDIR)$(datadir)
-LIBDIR		= $(DESTDIR)$(libdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 MY_DATADIR	= $(DATADIR)/@ADA_LIBNAME@
 THIS_DATADIR	= $(datadir)/@ADA_LIBNAME@
diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in
index eb4489b04..c35dbc08e 100644
--- a/Ada95/src/Makefile.in
+++ b/Ada95/src/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1999-2016,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $
+#  $Id: Makefile.in,v 1.97 2024/08/10 18:18:44 tom Exp $
 #
 .SUFFIXES:
 
@@ -51,7 +51,7 @@ exec_prefix	= @exec_prefix@
 includedir	= @includedir@
 libdir		= @libdir@
 
-LIBDIR		= $(DESTDIR)$(libdir)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
 ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
 
diff --git a/INSTALL b/INSTALL
index f7a252c35..73b6d065e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $
+-- $Id: INSTALL,v 1.257 2024/08/10 17:43:39 tom Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -650,6 +650,12 @@ CONFIGURE OPTIONS:
 	may not be accurate, or that your stty settings have disabled the use
 	of tabs.
 
+    --enable-install-prefix
+	Extend the --with-install-prefix feature to replace the prefix value
+	with $DESTDIR rather than simply prepending $DESTDIR to install
+	pathnames.  This works with any "make" which supports AT&T style
+	variable substitution.
+
     --enable-interop
 	Compile-in experimental interop bindings.  These provide generic types
 	for the form-library.
diff --git a/NEWS b/NEWS
index db3ed1c16..163f2ade9 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 tom Exp $
+-- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240817
+	+ review/update foot for 1.18.1 -TD
+	+ add a note about DomTerm 3.2.0 -TD
+	+ add new glob-expressions variables to list in config.status script
+	  (patch by Werner Fink).
+	+ add --enable-install-prefix to modify behavior of $DESTDIR to merge
+	  or replace the value set by --prefix (adapted from suggestion by
+	  Eli Zaretskii).
+
 20240810
 	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
 	  and used only in the makefile.
diff --git a/VERSION b/VERSION
index d40c622eb..69b699ade 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240810
+5:0:10	6.5	20240817
diff --git a/aclocal.m4 b/aclocal.m4
index b68af6bec..d195f3246 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
+dnl $Id: aclocal.m4,v 1.1088 2024/08/11 00:17:28 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4218,6 +4218,40 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
+dnl -----------------
+dnl Special option for use by system-builders: the install-prefix is used to
+dnl adjust the location into which the actual install is done, so that an
+dnl archive can be built without modifying the host system's configuration.
+AC_DEFUN([CF_INSTALL_PREFIX],[
+AC_MSG_CHECKING(for an installation directory prefix)
+AC_ARG_WITH(install-prefix,
+	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
+	[case "x$withval" in
+	(xyes|xno)
+		;;
+	(*)	DESTDIR="$withval"
+		;;
+	esac])
+AC_MSG_RESULT([${DESTDIR:-(none)}])
+AC_SUBST(DESTDIR)
+
+AC_MSG_CHECKING(if installation directory prefix should be merged)
+CF_ARG_ENABLE(install-prefix,
+	[  --enable-install-prefix merge DESTDIR with installation prefix],
+	cf_install_prefix=yes,
+	cf_install_prefix=no)
+AC_MSG_RESULT($cf_install_prefix)
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
+
+AC_SUBST(MERGE_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
@@ -5986,31 +6020,6 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
-dnl -------------
-dnl Check if <limits.h> defines a usable MB_LEN_MAX.  That may be because it is
-dnl not defined, or it may be a bogus value.
-AC_DEFUN([CF_MB_LEN_MAX],[
-AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
-AC_TRY_COMPILE([
-$ac_includes_default
-#include <limits.h>],
-[
-#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
-	${cf_cv_main_return:-return}(0);
-#else
-#error MB_LEN_MAX is not usable
-#endif
-],	[cf_cv_mb_len_max=yes],
-	[cf_cv_mb_len_max=no])])
-if test "$cf_cv_mb_len_max" = yes
-then
-	AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
-else
-	AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
 dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
@@ -6398,6 +6407,31 @@ then
 fi
 ])
 dnl ---------------------------------------------------------------------------
+dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
+dnl -------------
+dnl Check if <limits.h> defines a usable MB_LEN_MAX.  That may be because it is
+dnl not defined, or it may be a bogus value.
+AC_DEFUN([CF_MB_LEN_MAX],[
+AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
+AC_TRY_COMPILE([
+$ac_includes_default
+#include <limits.h>],
+[
+#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+	${cf_cv_main_return:-return}(0);
+#else
+#error MB_LEN_MAX is not usable
+#endif
+],	[cf_cv_mb_len_max=yes],
+	[cf_cv_mb_len_max=no])])
+if test "$cf_cv_mb_len_max" = yes
+then
+	AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
+else
+	AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 99f21da48..61e25e6b2 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.133 2021/07/03 18:53:57 tom Exp $
+# $Id: Makefile.in,v 1.135 2024/08/11 15:48:44 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -54,7 +54,9 @@ libdir		= @libdir@
 includedir	= @includedir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -191,7 +193,7 @@ sources :	$(AUTO_SRC)
 tags:
 	$(CTAGS) *.[h] *.cc
 
-$(DESTDIR)$(libdir) :
+$(LIBDIR) :
 	mkdir -p $@
 
 mostlyclean ::
diff --git a/configure b/configure
index 36b923260..a86d695cd 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.783 .
+# From configure.in Revision: 1.785 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -736,6 +736,7 @@ Optional Features:
   --with-pc-suffix[=XXX]  suffix pkg-config files with XXX
   --enable-mixed-case     tic should assume mixed-case filenames
   --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
+  --enable-install-prefix merge DESTDIR with installation prefix
 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
@@ -1077,7 +1078,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1080: loading site script $ac_site_file" >&5
+    { echo "$as_me:1081: 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"
@@ -1088,7 +1089,7 @@ if test -r "$cache_file"; then
   # 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:1091: loading cache $cache_file" >&5
+    { echo "$as_me:1092: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1096,7 +1097,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1099: creating cache $cache_file" >&5
+  { echo "$as_me:1100: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1112,21 +1113,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1115: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1116: 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:1119: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1120: 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:1125: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1126: 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:1127:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1128:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1129:   current value: $ac_new_val" >&5
+        { echo "$as_me:1130:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1145,9 +1146,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1148: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1149: 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:1150: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1151: 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
@@ -1176,10 +1177,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1180: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1182: \$? = $ac_status" >&5
+  echo "$as_me:1183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1196,7 +1197,7 @@ for ac_prog in ggrep grep
 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:1199: checking for $ac_word" >&5
+echo "$as_me:1200: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1211,7 +1212,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:1214: found $ac_dir/$ac_word" >&5
+echo "$as_me:1215: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1219,10 +1220,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:1222: result: $GREP" >&5
+  echo "$as_me:1223: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:1225: result: no" >&5
+  echo "$as_me:1226: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1230,7 +1231,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:1233: checking for egrep" >&5
+echo "$as_me:1234: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1242,7 +1243,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1245: checking for $ac_word" >&5
+echo "$as_me:1246: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1259,7 +1260,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:1262: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1263: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1270,10 +1271,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:1273: result: $EGREP" >&5
+  echo "$as_me:1274: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:1276: result: no" >&5
+  echo "$as_me:1277: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1281,12 +1282,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1285: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:1290: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -1297,11 +1298,11 @@ cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_abi_default=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
-echo "$as_me:1300: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+echo "$as_me:1301: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
 
 if test -f "$srcdir/VERSION" ; then
-	echo "$as_me:1304: checking for package version" >&5
+	echo "$as_me:1305: 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...
@@ -1313,39 +1314,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1317: 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:1321: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1322: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1326: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1328: checking for package patch date" >&5
+	echo "$as_me:1329: 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:1333: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1334: 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:1340: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1341: 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:1345: result: $VERSION_PATCH" >&5
+	echo "$as_me:1346: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1349: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1353,19 +1354,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
 
-echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1357: testing ABI VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1361: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1365: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
 	PACKAGE=ncurses
 
@@ -1386,7 +1387,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1389: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1390: 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;
@@ -1400,13 +1401,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1403: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1404: 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:1409: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1410: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1416,13 +1417,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1419: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1420: 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:1425: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1426: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1435,7 +1436,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1438: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1439: 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.*)
@@ -1454,13 +1455,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1457: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1458: 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:1463: error: ABI version value is empty" >&5
+  { { echo "$as_me:1464: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1493,7 +1494,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1496: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1497: 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
@@ -1503,11 +1504,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1507: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1510: checking build system type" >&5
+echo "$as_me:1511: 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
@@ -1516,23 +1517,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1519: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1520: 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:1523: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1524: 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:1528: result: $ac_cv_build" >&5
+echo "$as_me:1529: 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:1535: checking host system type" >&5
+echo "$as_me:1536: 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
@@ -1541,12 +1542,12 @@ else
 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:1544: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1545: 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:1549: result: $ac_cv_host" >&5
+echo "$as_me:1550: 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/'`
@@ -1554,7 +1555,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1557: checking target system type" >&5
+	echo "$as_me:1558: 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
@@ -1563,12 +1564,12 @@ else
 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:1566: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1567: 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:1571: result: $ac_cv_target" >&5
+echo "$as_me:1572: 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/'`
@@ -1600,13 +1601,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1603: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1604: 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:1607: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1608: 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:1609: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1610: 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
@@ -1614,7 +1615,7 @@ fi
 # 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:1617: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1618: 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
@@ -1625,7 +1626,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1628: checking for fgrep" >&5
+echo "$as_me:1629: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1637,7 +1638,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1640: checking for $ac_word" >&5
+echo "$as_me:1641: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1654,7 +1655,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1657: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1658: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1665,10 +1666,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1668: result: $FGREP" >&5
+  echo "$as_me:1669: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1671: result: no" >&5
+  echo "$as_me:1672: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1676,16 +1677,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1680: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1685: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1688: checking for prefix" >&5
+echo "$as_me:1689: 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
@@ -1697,11 +1698,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1700: result: $prefix" >&5
+echo "$as_me:1701: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1704: checking for default include-directory" >&5
+echo "$as_me:1705: 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 \
@@ -1724,7 +1725,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1727: result: $includedir" >&5
+echo "$as_me:1728: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1789,20 +1790,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1792: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1793: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1798: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1799: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1805: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1806: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1832,7 +1833,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:1835: checking for $ac_word" >&5
+echo "$as_me:1836: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1849,7 +1850,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:1852: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1853: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1861,10 +1862,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:1865: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:1867: result: no" >&5
+  echo "$as_me:1868: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1874,7 +1875,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:1877: checking for $cf_prog_gnat version" >&5
+echo "$as_me:1878: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1885,7 +1886,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1888: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1889: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -1914,7 +1915,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:1917: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:1918: 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
@@ -1933,10 +1934,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:1936: result: $cf_gprconfig_value" >&5
+					echo "$as_me:1937: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:1939: result: missing" >&5
+					echo "$as_me:1940: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -1949,7 +1950,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:1952: checking for gnat version" >&5
+echo "$as_me:1953: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1960,7 +1961,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1963: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1964: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -1969,7 +1970,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:1972: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:1973: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -1977,7 +1978,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:1980: checking for $ac_word" >&5
+echo "$as_me:1981: 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
@@ -1992,7 +1993,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:1995: found $ac_dir/$ac_word" >&5
+echo "$as_me:1996: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2001,20 +2002,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:2004: result: $M4_exists" >&5
+  echo "$as_me:2005: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:2007: result: no" >&5
+  echo "$as_me:2008: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:2013: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:2014: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:2017: checking if GNAT works" >&5
+			echo "$as_me:2018: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -2042,7 +2043,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:2046: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -2058,7 +2059,7 @@ fi
 		# Here is a workaround.
 		# Extract the first word of "gnatgcc", so it can be a program name with args.
 set dummy gnatgcc; ac_word=$2
-echo "$as_me:2061: checking for $ac_word" >&5
+echo "$as_me:2062: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2075,7 +2076,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
-   echo "$as_me:2078: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2079: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2087,16 +2088,16 @@ fi
 cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
 
 if test -n "$cf_cv_path_gnatgcc"; then
-  echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
+  echo "$as_me:2091: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-  echo "$as_me:2093: result: no" >&5
+  echo "$as_me:2094: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			echo "$as_me:2099: checking for improvement" >&5
+			echo "$as_me:2100: checking for improvement" >&5
 echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
@@ -2107,7 +2108,7 @@ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 				cf_cv_path_gnatgcc=no
 				;;
 			esac
-			echo "$as_me:2110: result: $cf_cv_path_gnatgcc" >&5
+			echo "$as_me:2111: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
@@ -2132,7 +2133,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2135: checking for $ac_word" >&5
+echo "$as_me:2136: 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
@@ -2147,7 +2148,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:2150: found $ac_dir/$ac_word" >&5
+echo "$as_me:2151: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2155,10 +2156,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2158: result: $CC" >&5
+  echo "$as_me:2159: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2161: result: no" >&5
+  echo "$as_me:2162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2171,7 +2172,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2174: checking for $ac_word" >&5
+echo "$as_me:2175: 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
@@ -2186,7 +2187,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:2189: found $ac_dir/$ac_word" >&5
+echo "$as_me:2190: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2194,10 +2195,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2197: result: $ac_ct_CC" >&5
+  echo "$as_me:2198: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2200: result: no" >&5
+  echo "$as_me:2201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2207,32 +2208,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:2210: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2211: 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:2215:" \
+echo "$as_me:2216:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:2218: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2219: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2221: \$? = $ac_status" >&5
+  echo "$as_me:2222: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2223: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2224: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2226: \$? = $ac_status" >&5
+  echo "$as_me:2227: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2228: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2229: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2231: \$? = $ac_status" >&5
+  echo "$as_me:2232: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2235 "configure"
+#line 2236 "configure"
 #include "confdefs.h"
 
 int
@@ -2248,13 +2249,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:2251: checking for C compiler default output" >&5
+echo "$as_me:2252: 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:2254: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2255: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:2257: \$? = $ac_status" >&5
+  echo "$as_me:2258: \$? = $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
@@ -2277,34 +2278,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2280: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2281: 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:2286: result: $ac_file" >&5
+echo "$as_me:2287: 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:2291: checking whether the C compiler works" >&5
+echo "$as_me:2292: 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:2297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2300: \$? = $ac_status" >&5
+  echo "$as_me:2301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2307: error: cannot run C compiled programs.
+	{ { echo "$as_me:2308: 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;}
@@ -2312,24 +2313,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2315: result: yes" >&5
+echo "$as_me:2316: 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:2322: checking whether we are cross compiling" >&5
+echo "$as_me:2323: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2324: result: $cross_compiling" >&5
+echo "$as_me:2325: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2327: checking for executable suffix" >&5
+echo "$as_me:2328: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2332: \$? = $ac_status" >&5
+  echo "$as_me:2333: \$? = $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
@@ -2345,25 +2346,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2348: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2349: 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:2354: result: $ac_cv_exeext" >&5
+echo "$as_me:2355: 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:2360: checking for object suffix" >&5
+echo "$as_me:2361: 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 2366 "configure"
+#line 2367 "configure"
 #include "confdefs.h"
 
 int
@@ -2375,10 +2376,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2381: \$? = $ac_status" >&5
+  echo "$as_me:2382: \$? = $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
@@ -2390,24 +2391,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2393: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2394: 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:2400: result: $ac_cv_objext" >&5
+echo "$as_me:2401: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2404: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2405: 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 2410 "configure"
+#line 2411 "configure"
 #include "confdefs.h"
 
 int
@@ -2422,16 +2423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2428: \$? = $ac_status" >&5
+  echo "$as_me:2429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2434: \$? = $ac_status" >&5
+  echo "$as_me:2435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2443,19 +2444,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2446: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2447: 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:2452: checking whether $CC accepts -g" >&5
+echo "$as_me:2453: 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 2458 "configure"
+#line 2459 "configure"
 #include "confdefs.h"
 
 int
@@ -2467,16 +2468,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2473: \$? = $ac_status" >&5
+  echo "$as_me:2474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2479: \$? = $ac_status" >&5
+  echo "$as_me:2480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2486,7 +2487,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2489: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2490: 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
@@ -2513,16 +2514,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2519: \$? = $ac_status" >&5
+  echo "$as_me:2520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2525: \$? = $ac_status" >&5
+  echo "$as_me:2526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2534,7 +2535,7 @@ if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2537 "configure"
+#line 2538 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2547,16 +2548,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2553: \$? = $ac_status" >&5
+  echo "$as_me:2554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2559: \$? = $ac_status" >&5
+  echo "$as_me:2560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2566,7 +2567,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2569 "configure"
+#line 2570 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2578,16 +2579,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2584: \$? = $ac_status" >&5
+  echo "$as_me:2585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2590: \$? = $ac_status" >&5
+  echo "$as_me:2591: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2617,11 +2618,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2620: checking version of $CC" >&5
+	echo "$as_me:2621: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2624: result: $GCC_VERSION" >&5
+	echo "$as_me:2625: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2630,12 +2631,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2633: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2634: 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 2638 "configure"
+#line 2639 "configure"
 #include "confdefs.h"
 
 int
@@ -2652,16 +2653,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2658: \$? = $ac_status" >&5
+  echo "$as_me:2659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2664: \$? = $ac_status" >&5
+  echo "$as_me:2665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2672,7 +2673,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2675: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2676: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2681,11 +2682,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2684: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2685: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2688 "configure"
+#line 2689 "configure"
 #include "confdefs.h"
 
 int
@@ -2702,16 +2703,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2708: \$? = $ac_status" >&5
+  echo "$as_me:2709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2714: \$? = $ac_status" >&5
+  echo "$as_me:2715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2721,7 +2722,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2724: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2725: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2730,30 +2731,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2733: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2734: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2740: checking version of $CC" >&5
+	echo "$as_me:2741: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2744: result: $CLANG_VERSION" >&5
+	echo "$as_me:2745: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2751: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2752: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2756 "configure"
+#line 2757 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2767,16 +2768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2773: \$? = $ac_status" >&5
+  echo "$as_me:2774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2779: \$? = $ac_status" >&5
+  echo "$as_me:2780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2787,13 +2788,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2790: result: $cf_clang_optok" >&5
+		echo "$as_me:2791: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2796: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2797: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2802,7 +2803,7 @@ echo "${as_me:-configure}:2796: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2805: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2806: 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
@@ -2810,7 +2811,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2813 "configure"
+#line 2814 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2857,16 +2858,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2863: \$? = $ac_status" >&5
+  echo "$as_me:2864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2869: \$? = $ac_status" >&5
+  echo "$as_me:2870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2883,10 +2884,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2886: result: none needed" >&5
+    echo "$as_me:2887: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2890: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2894,13 +2895,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2897: checking \$CFLAGS variable" >&5
+echo "$as_me:2898: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2901: result: broken" >&5
+	echo "$as_me:2902: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2903: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2904: 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=
@@ -3008,18 +3009,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:3011: result: ok" >&5
+	echo "$as_me:3012: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:3016: checking \$CC variable" >&5
+echo "$as_me:3017: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:3020: result: broken" >&5
+	echo "$as_me:3021: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:3022: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:3023: 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/[ ]*[ ]-[^ ].*//'`
@@ -3136,19 +3137,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:3140: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3144: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3148: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:3151: result: ok" >&5
+	echo "$as_me:3152: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -3162,7 +3163,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:3165: checking how to run the C preprocessor" >&5
+echo "$as_me:3166: 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
@@ -3183,18 +3184,18 @@ do
   # 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 3186 "configure"
+#line 3187 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3192: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3197: \$? = $ac_status" >&5
+  echo "$as_me:3198: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3217,17 +3218,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3220 "configure"
+#line 3221 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3225: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3230: \$? = $ac_status" >&5
+  echo "$as_me:3231: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3264,7 +3265,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3267: result: $CPP" >&5
+echo "$as_me:3268: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3274,18 +3275,18 @@ do
   # 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 3277 "configure"
+#line 3278 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3288: \$? = $ac_status" >&5
+  echo "$as_me:3289: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3308,17 +3309,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3311 "configure"
+#line 3312 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3321: \$? = $ac_status" >&5
+  echo "$as_me:3322: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3346,7 +3347,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3350: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3359,14 +3360,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3362: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3363: 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 3369 "configure"
+#line 3370 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3381,7 +3382,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3384 "configure"
+#line 3385 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3394,14 +3395,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3397: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3398: 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:3404: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3405: 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
@@ -3416,15 +3417,15 @@ CF_EOF
 # 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:3419: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3422: \$? = $ac_status" >&5
+  echo "$as_me:3423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3427: \$? = $ac_status" >&5
+  echo "$as_me:3428: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3435,10 +3436,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3438: result: yes" >&5
+  echo "$as_me:3439: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3441: result: no" >&5
+  echo "$as_me:3442: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3452,7 +3453,7 @@ else
 	(*) 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:3455: checking for $ac_word" >&5
+echo "$as_me:3456: 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
@@ -3469,7 +3470,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3472: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3473: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3480,10 +3481,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3483: result: $LDCONFIG" >&5
+  echo "$as_me:3484: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3486: result: no" >&5
+  echo "$as_me:3487: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3491,7 +3492,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3494: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3495: 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.
@@ -3501,7 +3502,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3504: result: $cf_with_cxx" >&5
+echo "$as_me:3505: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3519,7 +3520,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3522: checking for $ac_word" >&5
+echo "$as_me:3523: 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
@@ -3534,7 +3535,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3537: found $ac_dir/$ac_word" >&5
+echo "$as_me:3538: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3542,10 +3543,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3545: result: $CXX" >&5
+  echo "$as_me:3546: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3548: result: no" >&5
+  echo "$as_me:3549: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3558,7 +3559,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3561: checking for $ac_word" >&5
+echo "$as_me:3562: 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
@@ -3573,7 +3574,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3576: found $ac_dir/$ac_word" >&5
+echo "$as_me:3577: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3581,10 +3582,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3584: result: $ac_ct_CXX" >&5
+  echo "$as_me:3585: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3587: result: no" >&5
+  echo "$as_me:3588: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3596,32 +3597,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3599:" \
+echo "$as_me:3600:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3602: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3603: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3605: \$? = $ac_status" >&5
+  echo "$as_me:3606: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3607: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3608: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3610: \$? = $ac_status" >&5
+  echo "$as_me:3611: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3612: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3613: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3615: \$? = $ac_status" >&5
+  echo "$as_me:3616: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3618: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3619: 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 3624 "configure"
+#line 3625 "configure"
 #include "confdefs.h"
 
 int
@@ -3636,16 +3637,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3642: \$? = $ac_status" >&5
+  echo "$as_me:3643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3648: \$? = $ac_status" >&5
+  echo "$as_me:3649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3657,19 +3658,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3660: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3661: 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:3666: checking whether $CXX accepts -g" >&5
+echo "$as_me:3667: 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 3672 "configure"
+#line 3673 "configure"
 #include "confdefs.h"
 
 int
@@ -3681,16 +3682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3687: \$? = $ac_status" >&5
+  echo "$as_me:3688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3693: \$? = $ac_status" >&5
+  echo "$as_me:3694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3700,7 +3701,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3703: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3704: 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
@@ -3727,7 +3728,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3730 "configure"
+#line 3731 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3740,16 +3741,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3746: \$? = $ac_status" >&5
+  echo "$as_me:3747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3752: \$? = $ac_status" >&5
+  echo "$as_me:3753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3759,7 +3760,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3762 "configure"
+#line 3763 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3771,16 +3772,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3783: \$? = $ac_status" >&5
+  echo "$as_me:3784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3814,7 +3815,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3817: checking if $CXX works" >&5
+		echo "$as_me:3818: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3822,7 +3823,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3825 "configure"
+#line 3826 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3839,16 +3840,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3845: \$? = $ac_status" >&5
+  echo "$as_me:3846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3851: \$? = $ac_status" >&5
+  echo "$as_me:3852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3859,11 +3860,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3862: result: $cf_cxx_works" >&5
+		echo "$as_me:3863: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3866: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3867: 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
@@ -3879,7 +3880,7 @@ ac_main_return="return"
 	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:3882: checking for $ac_word" >&5
+echo "$as_me:3883: 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
@@ -3896,7 +3897,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3899: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3900: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3907,17 +3908,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3910: result: $CXX" >&5
+  echo "$as_me:3911: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3913: result: no" >&5
+  echo "$as_me:3914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3920: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3921: 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="";
 		;;
@@ -3926,7 +3927,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3929: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3930: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3934,7 +3935,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3937: result: $GXX_VERSION" >&5
+	echo "$as_me:3938: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3942,12 +3943,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3945: WARNING: templates do not work" >&5
+	{ echo "$as_me:3946: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3950: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3951: 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.
@@ -3957,15 +3958,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3961: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3963: checking if you want to build with Ada" >&5
+echo "$as_me:3964: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3965: result: $cf_with_ada" >&5
+echo "$as_me:3966: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3968: checking if you want to install terminal database" >&5
+echo "$as_me:3969: 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.
@@ -3975,10 +3976,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3978: result: $cf_with_db_install" >&5
+echo "$as_me:3979: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3981: checking if you want to install manpages" >&5
+echo "$as_me:3982: 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.
@@ -3988,10 +3989,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3991: result: $cf_with_manpages" >&5
+echo "$as_me:3992: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3994: checking if you want to build programs such as tic" >&5
+echo "$as_me:3995: 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.
@@ -4001,10 +4002,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:4004: result: $cf_with_progs" >&5
+echo "$as_me:4005: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:4007: checking if you want to build test-programs" >&5
+echo "$as_me:4008: 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.
@@ -4014,10 +4015,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:4017: result: $cf_with_tests" >&5
+echo "$as_me:4018: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:4020: checking if you wish to install curses.h" >&5
+echo "$as_me:4021: 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.
@@ -4027,7 +4028,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:4030: result: $with_curses_h" >&5
+echo "$as_me:4031: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -4051,7 +4052,7 @@ for ac_prog in mawk gawk nawk awk
 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:4054: checking for $ac_word" >&5
+echo "$as_me:4055: 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
@@ -4066,7 +4067,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:4069: found $ac_dir/$ac_word" >&5
+echo "$as_me:4070: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4074,17 +4075,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:4077: result: $AWK" >&5
+  echo "$as_me:4078: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:4080: result: no" >&5
+  echo "$as_me:4081: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:4088: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -4111,7 +4112,7 @@ esac
 # 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:4114: checking for a BSD compatible install" >&5
+echo "$as_me:4115: 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
@@ -4160,7 +4161,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:4163: result: $INSTALL" >&5
+echo "$as_me:4164: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -4185,7 +4186,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4188: checking for $ac_word" >&5
+echo "$as_me:4189: 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
@@ -4200,7 +4201,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4203: found $ac_dir/$ac_word" >&5
+echo "$as_me:4204: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4208,10 +4209,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4211: result: $LINT" >&5
+  echo "$as_me:4212: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4214: result: no" >&5
+  echo "$as_me:4215: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4224,18 +4225,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:4227: checking whether ln -s works" >&5
+echo "$as_me:4228: 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:4231: result: yes" >&5
+  echo "$as_me:4232: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:4234: result: no, using $LN_S" >&5
+  echo "$as_me:4235: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:4238: checking if $LN_S -f options work" >&5
+echo "$as_me:4239: 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
@@ -4247,12 +4248,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:4250: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4251: 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:4255: checking for long file names" >&5
+echo "$as_me:4256: 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
@@ -4291,7 +4292,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4294: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4295: 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
 
@@ -4310,7 +4311,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4313: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4314: 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"
@@ -4320,7 +4321,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4323: checking if you want to use pkg-config" >&5
+echo "$as_me:4324: 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.
@@ -4330,7 +4331,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4333: result: $cf_pkg_config" >&5
+echo "$as_me:4334: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4342,7 +4343,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4345: checking for $ac_word" >&5
+echo "$as_me:4346: 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
@@ -4359,7 +4360,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4362: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4363: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4370,10 +4371,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4373: result: $PKG_CONFIG" >&5
+  echo "$as_me:4374: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4376: result: no" >&5
+  echo "$as_me:4377: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4382,7 +4383,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4385: checking for $ac_word" >&5
+echo "$as_me:4386: 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
@@ -4399,7 +4400,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4403: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4411,10 +4412,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4417: result: no" >&5
+  echo "$as_me:4418: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4455,24 +4456,24 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4458: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4459: 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:4465: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4466: 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:4471: checking for pkg-config library directory" >&5
+	echo "$as_me:4472: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4475: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4499,7 +4500,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4510,16 +4511,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4518: result: auto" >&5
+	echo "$as_me:4519: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4522: checking for search-list" >&5
+	echo "$as_me:4523: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4554,11 +4555,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4557: result: $cf_search_path" >&5
+	echo "$as_me:4558: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4566,7 +4567,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4569: checking for first directory" >&5
+	echo "$as_me:4570: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4577,7 +4578,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4580: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4581: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4587,7 +4588,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4590: checking for workaround" >&5
+		echo "$as_me:4591: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4610,17 +4611,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4620: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4621: 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:4623: checking if we should install .pc files" >&5
+	echo "$as_me:4624: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4631,7 +4632,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4634: result: $enable_pc_files" >&5
+echo "$as_me:4635: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4639,7 +4640,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4668,7 +4669,7 @@ case "x$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4671: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4672: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4682,7 +4683,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4685: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4686: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4697,13 +4698,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4706: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4707: 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.
@@ -4713,11 +4714,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4716: result: $enable_mixedcase" >&5
+echo "$as_me:4717: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4720: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4721: 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
@@ -4744,7 +4745,7 @@ else
 fi
 
 fi
-echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4763,7 +4764,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4766: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4767: 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
@@ -4783,16 +4784,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4786: result: yes" >&5
+  echo "$as_me:4787: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4790: result: no" >&5
+  echo "$as_me:4791: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4795: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4796: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4847,7 +4848,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4858,7 +4859,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4861: checking for $ac_word" >&5
+echo "$as_me:4862: 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
@@ -4873,7 +4874,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4876: found $ac_dir/$ac_word" >&5
+echo "$as_me:4877: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4881,10 +4882,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4884: result: $CTAGS" >&5
+  echo "$as_me:4885: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4887: result: no" >&5
+  echo "$as_me:4888: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4895,7 +4896,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4898: checking for $ac_word" >&5
+echo "$as_me:4899: 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
@@ -4910,7 +4911,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4913: found $ac_dir/$ac_word" >&5
+echo "$as_me:4914: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4918,10 +4919,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4921: result: $ETAGS" >&5
+  echo "$as_me:4922: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4924: result: no" >&5
+  echo "$as_me:4925: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4930,7 +4931,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4933: checking for $ac_word" >&5
+echo "$as_me:4934: 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
@@ -4945,7 +4946,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4948: found $ac_dir/$ac_word" >&5
+echo "$as_me:4949: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4954,17 +4955,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4960: result: no" >&5
+  echo "$as_me:4961: 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:4967: checking for $ac_word" >&5
+echo "$as_me:4968: 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
@@ -4979,7 +4980,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4982: found $ac_dir/$ac_word" >&5
+echo "$as_me:4983: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4988,10 +4989,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4994: result: no" >&5
+  echo "$as_me:4995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5011,7 +5012,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:5014: checking for makeflags variable" >&5
+echo "$as_me:5015: 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
@@ -5041,7 +5042,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -5049,13 +5050,13 @@ echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:5052: result: $cf_cv_makeflags" >&5
+echo "$as_me:5053: 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:5058: checking for $ac_word" >&5
+echo "$as_me:5059: 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
@@ -5070,7 +5071,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5073: found $ac_dir/$ac_word" >&5
+echo "$as_me:5074: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5078,10 +5079,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5081: result: $RANLIB" >&5
+  echo "$as_me:5082: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5084: result: no" >&5
+  echo "$as_me:5085: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5090,7 +5091,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5093: checking for $ac_word" >&5
+echo "$as_me:5094: 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
@@ -5105,7 +5106,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5108: found $ac_dir/$ac_word" >&5
+echo "$as_me:5109: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5114,10 +5115,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5120: result: no" >&5
+  echo "$as_me:5121: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5129,7 +5130,7 @@ fi
 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:5132: checking for $ac_word" >&5
+echo "$as_me:5133: 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
@@ -5144,7 +5145,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:5147: found $ac_dir/$ac_word" >&5
+echo "$as_me:5148: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5152,10 +5153,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:5155: result: $LD" >&5
+  echo "$as_me:5156: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:5158: result: no" >&5
+  echo "$as_me:5159: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5164,7 +5165,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:5167: checking for $ac_word" >&5
+echo "$as_me:5168: 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
@@ -5179,7 +5180,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:5182: found $ac_dir/$ac_word" >&5
+echo "$as_me:5183: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5188,10 +5189,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:5191: result: $ac_ct_LD" >&5
+  echo "$as_me:5192: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:5194: result: no" >&5
+  echo "$as_me:5195: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5203,7 +5204,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5206: checking for $ac_word" >&5
+echo "$as_me:5207: 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
@@ -5218,7 +5219,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5221: found $ac_dir/$ac_word" >&5
+echo "$as_me:5222: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5226,10 +5227,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5229: result: $AR" >&5
+  echo "$as_me:5230: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5232: result: no" >&5
+  echo "$as_me:5233: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5238,7 +5239,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5241: checking for $ac_word" >&5
+echo "$as_me:5242: 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
@@ -5253,7 +5254,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5256: found $ac_dir/$ac_word" >&5
+echo "$as_me:5257: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5262,10 +5263,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5265: result: $ac_ct_AR" >&5
+  echo "$as_me:5266: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5268: result: no" >&5
+  echo "$as_me:5269: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5277,7 +5278,7 @@ fi
 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:5280: checking for $ac_word" >&5
+echo "$as_me:5281: 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
@@ -5292,7 +5293,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5295: found $ac_dir/$ac_word" >&5
+echo "$as_me:5296: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5300,10 +5301,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5303: result: $NM" >&5
+  echo "$as_me:5304: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5306: result: no" >&5
+  echo "$as_me:5307: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5312,7 +5313,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5315: checking for $ac_word" >&5
+echo "$as_me:5316: 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
@@ -5327,7 +5328,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5330: found $ac_dir/$ac_word" >&5
+echo "$as_me:5331: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5336,10 +5337,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5339: result: $ac_ct_NM" >&5
+  echo "$as_me:5340: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5342: result: no" >&5
+  echo "$as_me:5343: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5351,7 +5352,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5354: checking for $ac_word" >&5
+echo "$as_me:5355: 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
@@ -5366,7 +5367,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5369: found $ac_dir/$ac_word" >&5
+echo "$as_me:5370: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5374,10 +5375,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5377: result: $AR" >&5
+  echo "$as_me:5378: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5380: result: no" >&5
+  echo "$as_me:5381: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5386,7 +5387,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5389: checking for $ac_word" >&5
+echo "$as_me:5390: 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
@@ -5401,7 +5402,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5404: found $ac_dir/$ac_word" >&5
+echo "$as_me:5405: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5410,10 +5411,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5413: result: $ac_ct_AR" >&5
+  echo "$as_me:5414: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5416: result: no" >&5
+  echo "$as_me:5417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5422,7 +5423,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5425: checking for options to update archives" >&5
+echo "$as_me:5426: 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
@@ -5459,13 +5460,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5462 "configure"
+#line 5463 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5468: \$? = $ac_status" >&5
+  echo "$as_me:5469: \$? = $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
@@ -5476,7 +5477,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5486,7 +5487,7 @@ echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5497,7 +5498,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5500: checking for an installation directory prefix" >&5
+echo "$as_me:5501: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5510,9 +5511,35 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
+echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
+echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+
+# Check whether --enable-install-prefix or --disable-install-prefix was given.
+if test "${enable_install_prefix+set}" = set; then
+  enableval="$enable_install_prefix"
+  test "$enableval" != yes && enableval=no
+	if test "$enableval" != "no" ; then
+    cf_install_prefix=yes
+	else
+		cf_install_prefix=no
+	fi
+else
+  enableval=no
+	cf_install_prefix=no
+
+fi;
+echo "$as_me:5534: result: $cf_install_prefix" >&5
+echo "${ECHO_T}$cf_install_prefix" >&6
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
+
 ###############################################################################
 
 # If we're cross-compiling, allow the user to override the tools and their
@@ -5545,7 +5572,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5548: checking for $ac_word" >&5
+echo "$as_me:5575: 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
@@ -5560,7 +5587,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5563: found $ac_dir/$ac_word" >&5
+echo "$as_me:5590: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5568,10 +5595,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5571: result: $BUILD_CC" >&5
+  echo "$as_me:5598: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5574: result: no" >&5
+  echo "$as_me:5601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5580,12 +5607,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5583: checking for native build C compiler" >&5
+	echo "$as_me:5610: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5585: result: $BUILD_CC" >&5
+	echo "$as_me:5612: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5588: checking for native build C preprocessor" >&5
+	echo "$as_me:5615: 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.
@@ -5595,10 +5622,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5598: result: $BUILD_CPP" >&5
+	echo "$as_me:5625: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5601: checking for native build C flags" >&5
+	echo "$as_me:5628: 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.
@@ -5606,10 +5633,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5612: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5639: 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.
@@ -5617,10 +5644,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5623: checking for native build linker-flags" >&5
+	echo "$as_me:5650: 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.
@@ -5628,10 +5655,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5634: checking for native build linker-libraries" >&5
+	echo "$as_me:5661: 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.
@@ -5639,7 +5666,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5642: result: $BUILD_LIBS" >&5
+	echo "$as_me:5669: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5648,7 +5675,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5651: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5678: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5662,7 +5689,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5665 "configure"
+#line 5692 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5672,15 +5699,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5678: \$? = $ac_status" >&5
+  echo "$as_me:5705: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5683: \$? = $ac_status" >&5
+  echo "$as_me:5710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5695,12 +5722,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5698: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5725: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5703: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5730: 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;}
@@ -5725,7 +5752,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5728: checking if libtool -version-number should be used" >&5
+echo "$as_me:5755: 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.
@@ -5742,7 +5769,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5745: result: $cf_libtool_version" >&5
+echo "$as_me:5772: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5751,25 +5778,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5754: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5781: 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}:5761: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5788: 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}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5791,7 +5818,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5794: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5821: 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.
@@ -5801,7 +5828,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5804: result: $with_libtool" >&5
+echo "$as_me:5831: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5830,7 +5857,7 @@ case "x$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5843,7 +5870,7 @@ esac
   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:5846: checking for $ac_word" >&5
+echo "$as_me:5873: 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
@@ -5858,7 +5885,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5861: found $ac_dir/$ac_word" >&5
+echo "$as_me:5888: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5866,10 +5893,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5869: result: $LIBTOOL" >&5
+  echo "$as_me:5896: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5872: result: no" >&5
+  echo "$as_me:5899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5882,7 +5909,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5885: checking for $ac_word" >&5
+echo "$as_me:5912: 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
@@ -5897,7 +5924,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5900: found $ac_dir/$ac_word" >&5
+echo "$as_me:5927: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5905,10 +5932,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5911: result: no" >&5
+  echo "$as_me:5938: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5939,7 +5966,7 @@ unset LIBTOOL
   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:5942: checking for $ac_word" >&5
+echo "$as_me:5969: 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
@@ -5954,7 +5981,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5957: found $ac_dir/$ac_word" >&5
+echo "$as_me:5984: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5962,10 +5989,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5965: result: $LIBTOOL" >&5
+  echo "$as_me:5992: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5968: result: no" >&5
+  echo "$as_me:5995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5978,7 +6005,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5981: checking for $ac_word" >&5
+echo "$as_me:6008: 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
@@ -5993,7 +6020,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5996: found $ac_dir/$ac_word" >&5
+echo "$as_me:6023: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6001,10 +6028,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:6007: result: no" >&5
+  echo "$as_me:6034: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6026,7 +6053,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:6029: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6056: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6042,7 +6069,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:6045: checking version of $LIBTOOL" >&5
+	echo "$as_me:6072: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -6053,7 +6080,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 
 	if test -n "$cf_cv_libtool_version"
@@ -6063,19 +6090,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:6066: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6093: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:6072: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6099: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
 else
-	{ { echo "$as_me:6078: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6105: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6111,7 +6138,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:6114: checking if you want to build shared libraries" >&5
+echo "$as_me:6141: 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.
@@ -6121,11 +6148,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:6124: result: $with_shared" >&5
+echo "$as_me:6151: 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:6128: checking if you want to build static libraries" >&5
+echo "$as_me:6155: 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.
@@ -6135,11 +6162,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:6138: result: $with_normal" >&5
+echo "$as_me:6165: 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:6142: checking if you want to build debug libraries" >&5
+echo "$as_me:6169: 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.
@@ -6149,11 +6176,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:6152: result: $with_debug" >&5
+echo "$as_me:6179: 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:6156: checking if you want to build profiling libraries" >&5
+echo "$as_me:6183: 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.
@@ -6163,7 +6190,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:6166: result: $with_profile" >&5
+echo "$as_me:6193: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -6171,7 +6198,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:6174: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6201: 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.
@@ -6181,26 +6208,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:6184: result: $with_shared_cxx" >&5
+echo "$as_me:6211: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:6191: checking for specified models" >&5
+echo "$as_me:6218: 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:6195: result: $cf_list_models" >&5
+echo "$as_me:6222: 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:6200: checking for default model" >&5
+echo "$as_me:6227: 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:6203: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6230: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -6214,7 +6241,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:6217: checking if you want to have a library-prefix" >&5
+echo "$as_me:6244: 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.
@@ -6224,7 +6251,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:6227: result: $with_lib_prefix" >&5
+echo "$as_me:6254: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -6255,24 +6282,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:6258: checking for PATH separator" >&5
+	echo "$as_me:6285: 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:6265: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6292: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:6269: checking for ANSI C header files" >&5
+echo "$as_me:6296: 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 6275 "configure"
+#line 6302 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6280,13 +6307,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6289: \$? = $ac_status" >&5
+  echo "$as_me:6316: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6308,7 +6335,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6311 "configure"
+#line 6338 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6326,7 +6353,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6329 "configure"
+#line 6356 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6347,7 +6374,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6350 "configure"
+#line 6377 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6373,15 +6400,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6379: \$? = $ac_status" >&5
+  echo "$as_me:6406: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6384: \$? = $ac_status" >&5
+  echo "$as_me:6411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6394,7 +6421,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6410,28 +6437,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6413: checking for $ac_header" >&5
+echo "$as_me:6440: 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 6419 "configure"
+#line 6446 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6428: \$? = $ac_status" >&5
+  echo "$as_me:6455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6434: \$? = $ac_status" >&5
+  echo "$as_me:6461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6441,7 +6468,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6444: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6471: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6451,13 +6478,13 @@ EOF
 fi
 done
 
-echo "$as_me:6454: checking whether exit is declared" >&5
+echo "$as_me:6481: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6460 "configure"
+#line 6487 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6472,16 +6499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6478: \$? = $ac_status" >&5
+  echo "$as_me:6505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6484: \$? = $ac_status" >&5
+  echo "$as_me:6511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6491,19 +6518,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6494: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6521: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6500: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6527: 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 6506 "configure"
+#line 6533 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6518,16 +6545,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6524: \$? = $ac_status" >&5
+  echo "$as_me:6551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6530: \$? = $ac_status" >&5
+  echo "$as_me:6557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6537,7 +6564,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6540: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6567: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6550,7 +6577,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6553: checking for opendir in -ldir" >&5
+  echo "$as_me:6580: 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
@@ -6558,7 +6585,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6561 "configure"
+#line 6588 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6577,16 +6604,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6583: \$? = $ac_status" >&5
+  echo "$as_me:6610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6589: \$? = $ac_status" >&5
+  echo "$as_me:6616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6597,14 +6624,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6600: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6627: 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:6607: checking for opendir in -lx" >&5
+  echo "$as_me:6634: 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
@@ -6612,7 +6639,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6615 "configure"
+#line 6642 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6631,16 +6658,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6637: \$? = $ac_status" >&5
+  echo "$as_me:6664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6643: \$? = $ac_status" >&5
+  echo "$as_me:6670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6651,7 +6678,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6654: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6681: 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"
@@ -6661,7 +6688,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6664: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6691: 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.
@@ -6671,10 +6698,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6674: result: $with_termlib" >&5
+echo "$as_me:6701: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6677: checking if you want to build a separate tic library" >&5
+echo "$as_me:6704: 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.
@@ -6684,7 +6711,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6687: result: $with_ticlib" >&5
+echo "$as_me:6714: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6697,7 +6724,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6700: checking for default loader flags" >&5
+echo "$as_me:6727: 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=''   ;;
@@ -6706,13 +6733,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6715: checking if rpath option should be used" >&5
+echo "$as_me:6742: 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.
@@ -6722,10 +6749,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6728: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6755: 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.
@@ -6735,7 +6762,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6738: result: $cf_cv_do_relink" >&5
+echo "$as_me:6765: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6746,7 +6773,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6749: checking for an rpath option" >&5
+	echo "$as_me:6776: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6777,12 +6804,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6785: checking if we need a space after rpath option" >&5
+		echo "$as_me:6812: 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"
 
@@ -6803,7 +6830,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6806 "configure"
+#line 6833 "configure"
 #include "confdefs.h"
 
 int
@@ -6815,16 +6842,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6821: \$? = $ac_status" >&5
+  echo "$as_me:6848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6827: \$? = $ac_status" >&5
+  echo "$as_me:6854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6834,7 +6861,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6837: result: $cf_rpath_space" >&5
+		echo "$as_me:6864: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6856,7 +6883,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6859: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6886: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6871,9 +6898,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6874: result: $withval" >&5
+		echo "$as_me:6901: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6876: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6903: 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; }; }
 		;;
@@ -6882,7 +6909,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6905,14 +6932,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6908: checking which $CC option to use" >&5
+		echo "$as_me:6935: 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 6915 "configure"
+#line 6942 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6924,16 +6951,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6930: \$? = $ac_status" >&5
+  echo "$as_me:6957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6936: \$? = $ac_status" >&5
+  echo "$as_me:6963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6942,7 +6969,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -7013,7 +7040,7 @@ CF_EOF
 		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:7016: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7043: 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
@@ -7022,7 +7049,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7025 "configure"
+#line 7052 "configure"
 #include "confdefs.h"
 
 int
@@ -7034,16 +7061,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7040: \$? = $ac_status" >&5
+  echo "$as_me:7067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7046: \$? = $ac_status" >&5
+  echo "$as_me:7073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -7054,7 +7081,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:7057: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7084: 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"
@@ -7404,7 +7431,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7407 "configure"
+#line 7434 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7416,16 +7443,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7422: \$? = $ac_status" >&5
+  echo "$as_me:7449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7428: \$? = $ac_status" >&5
+  echo "$as_me:7455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7462,7 +7489,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7472,7 +7499,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7475 "${as_me:-configure}"
+#line 7502 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7484,18 +7511,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7487: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7514: 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:7489: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7492: \$? = $ac_status" >&5
+  echo "$as_me:7519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7494: result: yes" >&5
+				echo "$as_me:7521: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7498: result: no" >&5
+				echo "$as_me:7525: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7510,17 +7537,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7513: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7540: 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}:7517: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7544: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7523: checking for additional libtool options" >&5
+echo "$as_me:7550: 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.
@@ -7530,7 +7557,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7533: result: $with_libtool_opts" >&5
+echo "$as_me:7560: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7541,7 +7568,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7544: checking if exported-symbols file should be used" >&5
+echo "$as_me:7571: 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.
@@ -7556,7 +7583,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7559: result: $with_export_syms" >&5
+echo "$as_me:7586: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7567,15 +7594,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7570: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7597: 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:7575: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7602: 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 7578 "configure"
+#line 7605 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7587,16 +7614,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7593: \$? = $ac_status" >&5
+  echo "$as_me:7620: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7599: \$? = $ac_status" >&5
+  echo "$as_me:7626: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7605,18 +7632,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7608: result: $cf_cflags_work" >&5
+		echo "$as_me:7635: 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}:7614: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7641: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7619: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7646: 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.
@@ -7634,18 +7661,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7637: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7664: 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:7642: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7669: 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:7648: result: $with_versioned_syms" >&5
+echo "$as_me:7675: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7661,7 +7688,7 @@ then
 		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}:7664: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7691: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7669,11 +7696,11 @@ echo "${as_me:-configure}:7664: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7672: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7699: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7685,7 +7712,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7688: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7715: 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
 
@@ -7722,7 +7749,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7725 "configure"
+#line 7752 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7753,7 +7780,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7756: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7783: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7766,7 +7793,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7769: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7796: 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.
@@ -7776,27 +7803,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7779: result: $with_gpm" >&5
+echo "$as_me:7806: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7783: checking for gpm.h" >&5
+	echo "$as_me:7810: 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 7789 "configure"
+#line 7816 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7820: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7799: \$? = $ac_status" >&5
+  echo "$as_me:7826: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7815,7 +7842,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7818: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7845: 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
 
@@ -7826,7 +7853,7 @@ EOF
 		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}:7829: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7856: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7834,7 +7861,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7837: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7864: 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
@@ -7842,7 +7869,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7845 "configure"
+#line 7872 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7861,16 +7888,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7867: \$? = $ac_status" >&5
+  echo "$as_me:7894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7873: \$? = $ac_status" >&5
+  echo "$as_me:7900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7881,18 +7908,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7884: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7911: 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:7891: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7918: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7895: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7922: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7903,7 +7930,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7912,7 +7939,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7915: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7942: 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.
@@ -7922,18 +7949,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7925: result: $with_dlsym" >&5
+	echo "$as_me:7952: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7930: checking for dlsym" >&5
+echo "$as_me:7957: 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 7936 "configure"
+#line 7963 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7964,16 +7991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7970: \$? = $ac_status" >&5
+  echo "$as_me:7997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7976: \$? = $ac_status" >&5
+  echo "$as_me:8003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -7983,14 +8010,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7986: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:8013: 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:7993: checking for dlsym in -ldl" >&5
+echo "$as_me:8020: 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
@@ -7998,7 +8025,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8001 "configure"
+#line 8028 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8017,16 +8044,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8023: \$? = $ac_status" >&5
+  echo "$as_me:8050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8029: \$? = $ac_status" >&5
+  echo "$as_me:8056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8037,7 +8064,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8040: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8067: 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
 
@@ -8066,10 +8093,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8069: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8096: 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 8072 "configure"
+#line 8099 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -8087,16 +8114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8093: \$? = $ac_status" >&5
+  echo "$as_me:8120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8099: \$? = $ac_status" >&5
+  echo "$as_me:8126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8107,15 +8134,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8110: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8137: 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:8115: result: ok" >&5
+	echo "$as_me:8142: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8118: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8145: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8123,12 +8150,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8131: checking for soname of gpm library" >&5
+echo "$as_me:8158: 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
@@ -8162,15 +8189,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8168: \$? = $ac_status" >&5
+  echo "$as_me:8195: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8173: \$? = $ac_status" >&5
+  echo "$as_me:8200: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8181,7 +8208,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8249,7 +8276,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8252: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8279: 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
@@ -8257,7 +8284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8260 "configure"
+#line 8287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8276,16 +8303,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8282: \$? = $ac_status" >&5
+  echo "$as_me:8309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8288: \$? = $ac_status" >&5
+  echo "$as_me:8315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8296,11 +8323,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8299: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8326: 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:8303: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8330: 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
@@ -8324,15 +8351,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8327: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8330: \$? = $ac_status" >&5
+  echo "$as_me:8357: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8335: \$? = $ac_status" >&5
+  echo "$as_me:8362: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8344,11 +8371,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8347: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8374: 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:8351: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8378: 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
 
@@ -8356,7 +8383,7 @@ fi
 
 fi
 
-echo "$as_me:8359: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8386: 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.
@@ -8365,7 +8392,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8368: result: $with_pcre2" >&5
+echo "$as_me:8395: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8376,17 +8403,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8379: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8406: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8385: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8412: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8510,7 +8537,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8523,7 +8550,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8526: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8553: 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
@@ -8531,7 +8558,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8534 "configure"
+#line 8561 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8550,16 +8577,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8556: \$? = $ac_status" >&5
+  echo "$as_me:8583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8562: \$? = $ac_status" >&5
+  echo "$as_me:8589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8570,7 +8597,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8573: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8600: 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
 
@@ -8591,7 +8618,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8594: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8621: 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
@@ -8599,7 +8626,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8602 "configure"
+#line 8629 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8618,16 +8645,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8624: \$? = $ac_status" >&5
+  echo "$as_me:8651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8630: \$? = $ac_status" >&5
+  echo "$as_me:8657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8638,7 +8665,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8641: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8668: 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
 
@@ -8659,7 +8686,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8674,23 +8701,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8677: checking for $ac_header" >&5
+echo "$as_me:8704: 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 8683 "configure"
+#line 8710 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8693: \$? = $ac_status" >&5
+  echo "$as_me:8720: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8709,7 +8736,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8722,13 +8749,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8725: checking for $ac_func" >&5
+echo "$as_me:8752: 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 8731 "configure"
+#line 8758 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8759,16 +8786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8765: \$? = $ac_status" >&5
+  echo "$as_me:8792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8771: \$? = $ac_status" >&5
+  echo "$as_me:8798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8778,7 +8805,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8781: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8808: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8792,7 +8819,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8795: checking if you want to use sysmouse" >&5
+echo "$as_me:8822: 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.
@@ -8804,7 +8831,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8807 "configure"
+#line 8834 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8827,16 +8854,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8833: \$? = $ac_status" >&5
+  echo "$as_me:8860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8839: \$? = $ac_status" >&5
+  echo "$as_me:8866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8846,7 +8873,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8849: result: $cf_with_sysmouse" >&5
+echo "$as_me:8876: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8856,7 +8883,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8859: checking if you want to disable library suffixes" >&5
+echo "$as_me:8886: 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.
@@ -8873,13 +8900,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8876: result: $disable_lib_suffixes" >&5
+echo "$as_me:8903: 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:8882: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8909: 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.
@@ -8897,22 +8924,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8900: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8927: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8905: checking for updated LDFLAGS" >&5
+echo "$as_me:8932: 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:8908: result: maybe" >&5
+	echo "$as_me:8935: 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:8915: checking for $ac_word" >&5
+echo "$as_me:8942: 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
@@ -8927,7 +8954,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8930: found $ac_dir/$ac_word" >&5
+echo "$as_me:8957: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8935,10 +8962,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8938: result: $cf_ldd_prog" >&5
+  echo "$as_me:8965: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8941: result: no" >&5
+  echo "$as_me:8968: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8952,7 +8979,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8955 "configure"
+#line 8982 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8964,16 +8991,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8970: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  echo "$as_me:9003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -9001,7 +9028,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9013,11 +9040,11 @@ echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9054,7 +9081,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9067,11 +9094,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9108,7 +9135,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9121,14 +9148,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9131: result: no" >&5
+	echo "$as_me:9158: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9142,7 +9169,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9145: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9172: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9159,7 +9186,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9167,7 +9194,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9170: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9197: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9186,11 +9213,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9189: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9216: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9193: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9220: 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.
@@ -9200,10 +9227,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9203: result: $with_overwrite" >&5
+echo "$as_me:9230: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9206: checking if external terminfo-database is used" >&5
+echo "$as_me:9233: 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.
@@ -9213,7 +9240,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9216: result: $use_database" >&5
+echo "$as_me:9243: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9229,7 +9256,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9232: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9259: 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.
@@ -9237,10 +9264,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9240: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9267: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9243: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9270: 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.
@@ -9250,13 +9277,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9253: result: $with_hashed_db" >&5
+	echo "$as_me:9280: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9259: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9286: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9266,7 +9293,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9274,7 +9301,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9290,7 +9317,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9293: checking for $ac_word" >&5
+echo "$as_me:9320: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9305,7 +9332,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9308: found $ac_dir/$ac_word" >&5
+echo "$as_me:9335: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9313,10 +9340,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9316: result: $TIC" >&5
+  echo "$as_me:9343: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9319: result: no" >&5
+  echo "$as_me:9346: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9325,7 +9352,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9328: checking for $ac_word" >&5
+echo "$as_me:9355: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9340,7 +9367,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9343: found $ac_dir/$ac_word" >&5
+echo "$as_me:9370: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9348,10 +9375,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9351: result: $ac_ct_TIC" >&5
+  echo "$as_me:9378: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9354: result: no" >&5
+  echo "$as_me:9381: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9363,7 +9390,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9366: checking for $ac_word" >&5
+echo "$as_me:9393: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9378,7 +9405,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9381: found $ac_dir/$ac_word" >&5
+echo "$as_me:9408: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9386,10 +9413,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9389: result: $INFOCMP" >&5
+  echo "$as_me:9416: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9392: result: no" >&5
+  echo "$as_me:9419: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9398,7 +9425,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9401: checking for $ac_word" >&5
+echo "$as_me:9428: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9413,7 +9440,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9416: found $ac_dir/$ac_word" >&5
+echo "$as_me:9443: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9421,10 +9448,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9427: result: no" >&5
+  echo "$as_me:9454: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9439,10 +9466,10 @@ 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:9442: checking for tic program for fallbacks" >&5
+  echo "$as_me:9469: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9445: result: $TIC" >&5
+		echo "$as_me:9472: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9468,7 +9495,7 @@ case "x$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9481,7 +9508,7 @@ 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:9484: checking for $ac_word" >&5
+echo "$as_me:9511: 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
@@ -9498,7 +9525,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9501: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9528: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9509,10 +9536,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9512: result: $TIC" >&5
+  echo "$as_me:9539: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9515: result: no" >&5
+  echo "$as_me:9542: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9569,7 +9596,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9584,7 +9611,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9587: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9614: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9593,10 +9620,10 @@ 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:9596: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9623: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9599: result: $INFOCMP" >&5
+		echo "$as_me:9626: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9622,7 +9649,7 @@ case "x$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9635,7 +9662,7 @@ 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:9638: checking for $ac_word" >&5
+echo "$as_me:9665: 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
@@ -9652,7 +9679,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9655: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9682: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9663,10 +9690,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9666: result: $INFOCMP" >&5
+  echo "$as_me:9693: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9669: result: no" >&5
+  echo "$as_me:9696: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9723,7 +9750,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9738,7 +9765,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9741: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9768: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9748,7 +9775,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9751: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9778: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9756,7 +9783,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9759: checking if you want modern xterm or antique" >&5
+echo "$as_me:9786: 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.
@@ -9770,7 +9797,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9773: result: $with_xterm_new" >&5
+echo "$as_me:9800: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9783,7 +9810,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9786: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9813: 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.
@@ -9807,13 +9834,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9810: result: $with_xterm_kbs" >&5
+echo "$as_me:9837: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9816: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9843: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9823,7 +9850,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9826: checking for list of terminfo directories" >&5
+echo "$as_me:9853: 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.
@@ -9861,7 +9888,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9864: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9891: 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; }; }
 	;;
@@ -9884,7 +9911,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9893,13 +9920,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9896: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9923: 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:9902: checking for default terminfo directory" >&5
+echo "$as_me:9929: 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.
@@ -9933,7 +9960,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9942,7 +9969,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9945: result: $TERMINFO" >&5
+echo "$as_me:9972: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9953,7 +9980,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9956: checking if big-core option selected" >&5
+echo "$as_me:9983: 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.
@@ -9965,7 +9992,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9968 "configure"
+#line 9995 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9979,15 +10006,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9985: \$? = $ac_status" >&5
+  echo "$as_me:10012: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9990: \$? = $ac_status" >&5
+  echo "$as_me:10017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -9999,7 +10026,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10002: result: $with_big_core" >&5
+echo "$as_me:10029: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10009,7 +10036,7 @@ EOF
 ### 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:10012: checking if big-strings option selected" >&5
+echo "$as_me:10039: 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.
@@ -10033,14 +10060,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10036: result: $with_big_strings" >&5
+echo "$as_me:10063: 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:10043: checking if you want termcap-fallback support" >&5
+echo "$as_me:10070: 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.
@@ -10050,14 +10077,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10053: result: $with_termcap" >&5
+echo "$as_me:10080: 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:10060: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10087: 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
@@ -10070,13 +10097,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10073: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10100: 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:10079: checking for list of termcap files" >&5
+	echo "$as_me:10106: 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.
@@ -10114,7 +10141,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10117: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10144: 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; }; }
 	;;
@@ -10137,7 +10164,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10140: result: $TERMPATH" >&5
+	echo "$as_me:10167: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10145,7 +10172,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10148: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10175: 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.
@@ -10155,14 +10182,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10158: result: $with_getcap" >&5
+	echo "$as_me:10185: 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:10165: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10192: 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.
@@ -10172,7 +10199,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10175: result: $with_getcap_cache" >&5
+	echo "$as_me:10202: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10182,7 +10209,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10185: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10212: 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.
@@ -10192,14 +10219,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10195: result: $with_home_terminfo" >&5
+echo "$as_me:10222: 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:10202: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10229: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10209,14 +10236,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10212: result: $with_root_environ" >&5
+echo "$as_me:10239: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10219: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10246: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10226,14 +10253,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10229: result: $with_root_access" >&5
+echo "$as_me:10256: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10236: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10263: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10243,7 +10270,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10246: result: $with_setuid_environ" >&5
+echo "$as_me:10273: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10258,23 +10285,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10261: checking for $ac_header" >&5
+echo "$as_me:10288: 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 10267 "configure"
+#line 10294 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10271: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10277: \$? = $ac_status" >&5
+  echo "$as_me:10304: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10293,7 +10320,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10296: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10308,13 +10335,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10311: checking for $ac_func" >&5
+echo "$as_me:10338: 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 10317 "configure"
+#line 10344 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10345,16 +10372,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10351: \$? = $ac_status" >&5
+  echo "$as_me:10378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10357: \$? = $ac_status" >&5
+  echo "$as_me:10384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10364,7 +10391,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10367: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10394: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10381,13 +10408,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10384: checking for $ac_func" >&5
+echo "$as_me:10411: 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 10390 "configure"
+#line 10417 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10418,16 +10445,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10424: \$? = $ac_status" >&5
+  echo "$as_me:10451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10430: \$? = $ac_status" >&5
+  echo "$as_me:10457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10437,7 +10464,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10440: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10448,7 +10475,7 @@ fi
 done
 
 else
-	echo "$as_me:10451: checking if link/symlink functions work" >&5
+	echo "$as_me:10478: 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
@@ -10461,7 +10488,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10464 "configure"
+#line 10491 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10495,15 +10522,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10501: \$? = $ac_status" >&5
+  echo "$as_me:10528: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10506: \$? = $ac_status" >&5
+  echo "$as_me:10533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10521,7 +10548,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10541,7 +10568,7 @@ with_symlinks=no
 # 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:10544: checking if tic should use symbolic links" >&5
+	echo "$as_me:10571: 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.
@@ -10551,21 +10578,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10554: result: $with_symlinks" >&5
+	echo "$as_me:10581: 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:10561: checking if tic should use hard links" >&5
+	echo "$as_me:10588: 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:10568: result: $with_links" >&5
+	echo "$as_me:10595: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10581,7 +10608,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10584: checking if you want broken-linker support code" >&5
+echo "$as_me:10611: 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.
@@ -10591,7 +10618,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10594: result: $with_broken_linker" >&5
+echo "$as_me:10621: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10605,7 +10632,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10608: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10635: 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.
@@ -10615,7 +10642,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10618: result: $with_bsdpad" >&5
+echo "$as_me:10645: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10634,14 +10661,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10637: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10664: 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 10644 "configure"
+#line 10671 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10660,16 +10687,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10666: \$? = $ac_status" >&5
+  echo "$as_me:10693: \$? = $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:10696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10672: \$? = $ac_status" >&5
+  echo "$as_me:10699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10680,7 +10707,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10722,14 +10749,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10725: checking if this is the GNU C library" >&5
+echo "$as_me:10752: 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 10732 "configure"
+#line 10759 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10748,16 +10775,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10754: \$? = $ac_status" >&5
+  echo "$as_me:10781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10760: \$? = $ac_status" >&5
+  echo "$as_me:10787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10768,7 +10795,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10776,7 +10803,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10779: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10806: 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
@@ -10788,7 +10815,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10791 "configure"
+#line 10818 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10807,16 +10834,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10813: \$? = $ac_status" >&5
+  echo "$as_me:10840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10819: \$? = $ac_status" >&5
+  echo "$as_me:10846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10828,12 +10855,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10831: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10858: 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:10836: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10863: 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
@@ -10938,7 +10965,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10941 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10958,16 +10985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10964: \$? = $ac_status" >&5
+  echo "$as_me:10991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10970: \$? = $ac_status" >&5
+  echo "$as_me:10997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -10978,7 +11005,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10981: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11008: 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
@@ -10987,14 +11014,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:10990: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11017: 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 10997 "configure"
+#line 11024 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11009,16 +11036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11015: \$? = $ac_status" >&5
+  echo "$as_me:11042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11021: \$? = $ac_status" >&5
+  echo "$as_me:11048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11125,7 +11152,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11128 "configure"
+#line 11155 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11140,16 +11167,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11146: \$? = $ac_status" >&5
+  echo "$as_me:11173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11152: \$? = $ac_status" >&5
+  echo "$as_me:11179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11164,12 +11191,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11167: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11194: 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:11172: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11199: 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
@@ -11179,7 +11206,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11182 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11194,16 +11221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11200: \$? = $ac_status" >&5
+  echo "$as_me:11227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11206: \$? = $ac_status" >&5
+  echo "$as_me:11233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11214,7 +11241,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11217: result: $cf_cv_default_source" >&5
+echo "$as_me:11244: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11251,16 +11278,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11254: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11281: 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}:11260: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11287: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11263 "configure"
+#line 11290 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11275,16 +11302,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11281: \$? = $ac_status" >&5
+  echo "$as_me:11308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11287: \$? = $ac_status" >&5
+  echo "$as_me:11314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11305,7 +11332,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11308 "configure"
+#line 11335 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11320,16 +11347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11326: \$? = $ac_status" >&5
+  echo "$as_me:11353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11332: \$? = $ac_status" >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11340,7 +11367,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11348,10 +11375,10 @@ echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11378: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11354 "configure"
+#line 11381 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11366,16 +11393,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11372: \$? = $ac_status" >&5
+  echo "$as_me:11399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11378: \$? = $ac_status" >&5
+  echo "$as_me:11405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11391,7 +11418,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11394: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11421: 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
@@ -11508,7 +11535,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11511: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11538: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11540,14 +11567,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11543: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11570: 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 11550 "configure"
+#line 11577 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11565,16 +11592,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11571: \$? = $ac_status" >&5
+  echo "$as_me:11598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11577: \$? = $ac_status" >&5
+  echo "$as_me:11604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11586,7 +11613,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11589 "configure"
+#line 11616 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11604,16 +11631,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11610: \$? = $ac_status" >&5
+  echo "$as_me:11637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11616: \$? = $ac_status" >&5
+  echo "$as_me:11643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11628,7 +11655,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11658: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11788,16 +11815,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11791: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11818: 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}:11797: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11824: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11800 "configure"
+#line 11827 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11812,16 +11839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11818: \$? = $ac_status" >&5
+  echo "$as_me:11845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11824: \$? = $ac_status" >&5
+  echo "$as_me:11851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11842,7 +11869,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11845 "configure"
+#line 11872 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11857,16 +11884,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11863: \$? = $ac_status" >&5
+  echo "$as_me:11890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11869: \$? = $ac_status" >&5
+  echo "$as_me:11896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11877,7 +11904,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11885,10 +11912,10 @@ echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11915: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11891 "configure"
+#line 11918 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11903,16 +11930,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11909: \$? = $ac_status" >&5
+  echo "$as_me:11936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11915: \$? = $ac_status" >&5
+  echo "$as_me:11942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11928,7 +11955,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11931: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11958: 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
@@ -12041,10 +12068,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12071: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12047 "configure"
+#line 12074 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12062,23 +12089,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12068: \$? = $ac_status" >&5
+  echo "$as_me:12095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12074: \$? = $ac_status" >&5
+  echo "$as_me:12101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12081: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12108: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12101,7 +12128,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12131: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12113,7 +12140,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12143: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12201,7 +12228,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12231: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12211,7 +12238,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12241: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12221,7 +12248,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12224: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12251: 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"
@@ -12233,10 +12260,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12236: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12263: 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 12239 "configure"
+#line 12266 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12251,16 +12278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12257: \$? = $ac_status" >&5
+  echo "$as_me:12284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12263: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12269,12 +12296,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12272: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12299: 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 12277 "configure"
+#line 12304 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12289,16 +12316,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12295: \$? = $ac_status" >&5
+  echo "$as_me:12322: \$? = $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:12325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12301: \$? = $ac_status" >&5
+  echo "$as_me:12328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12309,19 +12336,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12339: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12317: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12344: 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 12324 "configure"
+#line 12351 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12339,16 +12366,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12345: \$? = $ac_status" >&5
+  echo "$as_me:12372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12351: \$? = $ac_status" >&5
+  echo "$as_me:12378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12360,7 +12387,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12363 "configure"
+#line 12390 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12378,16 +12405,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12384: \$? = $ac_status" >&5
+  echo "$as_me:12411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12390: \$? = $ac_status" >&5
+  echo "$as_me:12417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12402,7 +12429,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12432: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12553,14 +12580,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12556: checking if SIGWINCH is defined" >&5
+echo "$as_me:12583: 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 12563 "configure"
+#line 12590 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12575,23 +12602,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12581: \$? = $ac_status" >&5
+  echo "$as_me:12608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12587: \$? = $ac_status" >&5
+  echo "$as_me:12614: \$? = $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 12594 "configure"
+#line 12621 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12609,16 +12636,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12615: \$? = $ac_status" >&5
+  echo "$as_me:12642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12621: \$? = $ac_status" >&5
+  echo "$as_me:12648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12632,11 +12659,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12635: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12662: 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:12639: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12666: 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
@@ -12647,7 +12674,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12650 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12669,16 +12696,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12675: \$? = $ac_status" >&5
+  echo "$as_me:12702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12681: \$? = $ac_status" >&5
+  echo "$as_me:12708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12692,7 +12719,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12722: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12702,13 +12729,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12705: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12732: 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 12711 "configure"
+#line 12738 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12722,16 +12749,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12728: \$? = $ac_status" >&5
+  echo "$as_me:12755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12734: \$? = $ac_status" >&5
+  echo "$as_me:12761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12742,7 +12769,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12772: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12756,7 +12783,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12759: checking if you want wide-character code" >&5
+echo "$as_me:12786: 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.
@@ -12766,7 +12793,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12769: result: $with_widec" >&5
+echo "$as_me:12796: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12788,7 +12815,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12791: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12818: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12801,23 +12828,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12804: checking for $ac_header" >&5
+echo "$as_me:12831: 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 12810 "configure"
+#line 12837 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12814: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12820: \$? = $ac_status" >&5
+  echo "$as_me:12847: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12836,7 +12863,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12839: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12846,14 +12873,14 @@ EOF
 fi
 done
 
-echo "$as_me:12849: checking if wchar.h can be used as is" >&5
+echo "$as_me:12876: 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 12856 "configure"
+#line 12883 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12875,16 +12902,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12881: \$? = $ac_status" >&5
+  echo "$as_me:12908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12887: \$? = $ac_status" >&5
+  echo "$as_me:12914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12894,16 +12921,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12897: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12924: 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:12903: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12930: 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 12906 "configure"
+#line 12933 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12919,16 +12946,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12925: \$? = $ac_status" >&5
+  echo "$as_me:12952: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12931: \$? = $ac_status" >&5
+  echo "$as_me:12958: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12937,16 +12964,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12940: result: $cf_result" >&5
+echo "$as_me:12967: 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:12946: checking checking for compatible value versus " >&5
+	echo "$as_me:12973: 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 12949 "configure"
+#line 12976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12962,16 +12989,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12968: \$? = $ac_status" >&5
+  echo "$as_me:12995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12974: \$? = $ac_status" >&5
+  echo "$as_me:13001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -12980,7 +13007,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12983: result: $cf_result" >&5
+	echo "$as_me:13010: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -12990,7 +13017,7 @@ fi
 
 fi
 
-echo "$as_me:12993: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13020: 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
@@ -13061,7 +13088,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13064 "configure"
+#line 13091 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13106,15 +13133,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13112: \$? = $ac_status" >&5
+  echo "$as_me:13139: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13117: \$? = $ac_status" >&5
+  echo "$as_me:13144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13127,7 +13154,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13157: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13138,13 +13165,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13141: checking for $ac_func" >&5
+echo "$as_me:13168: 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 13147 "configure"
+#line 13174 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13175,16 +13202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13181: \$? = $ac_status" >&5
+  echo "$as_me:13208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13187: \$? = $ac_status" >&5
+  echo "$as_me:13214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13194,7 +13221,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13197: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13224: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13209,23 +13236,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13212: checking for $ac_header" >&5
+echo "$as_me:13239: 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 13218 "configure"
+#line 13245 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13222: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13249: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13228: \$? = $ac_status" >&5
+  echo "$as_me:13255: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13244,7 +13271,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13247: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13274: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13254,7 +13281,7 @@ EOF
 fi
 done
 
-echo "$as_me:13257: checking for multibyte character support" >&5
+echo "$as_me:13284: 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
@@ -13262,7 +13289,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13265 "configure"
+#line 13292 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13279,16 +13306,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13285: \$? = $ac_status" >&5
+  echo "$as_me:13312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13291: \$? = $ac_status" >&5
+  echo "$as_me:13318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13300,12 +13327,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13330: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13308 "configure"
+#line 13335 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13318,16 +13345,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13324: \$? = $ac_status" >&5
+  echo "$as_me:13351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13330: \$? = $ac_status" >&5
+  echo "$as_me:13357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13341,7 +13368,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13344 "configure"
+#line 13371 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13354,16 +13381,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13360: \$? = $ac_status" >&5
+  echo "$as_me:13387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13366: \$? = $ac_status" >&5
+  echo "$as_me:13393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13380,9 +13407,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13410: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13412: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13473,7 +13500,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13503: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13481,7 +13508,7 @@ echo "${as_me:-configure}:13476: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13484 "configure"
+#line 13511 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13494,21 +13521,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13500: \$? = $ac_status" >&5
+  echo "$as_me:13527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13506: \$? = $ac_status" >&5
+  echo "$as_me:13533: \$? = $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}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13538: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13526,7 +13553,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13556: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13601,13 +13628,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13604: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13631: 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 13610 "configure"
+#line 13637 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13620,21 +13647,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13626: \$? = $ac_status" >&5
+  echo "$as_me:13653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13632: \$? = $ac_status" >&5
+  echo "$as_me:13659: \$? = $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}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13664: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13676,7 +13703,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13679: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13706: 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
@@ -13714,7 +13741,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13717 "configure"
+#line 13744 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13726,16 +13753,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13732: \$? = $ac_status" >&5
+  echo "$as_me:13759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13738: \$? = $ac_status" >&5
+  echo "$as_me:13765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13752,7 +13779,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13782: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13788,7 +13815,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13818: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13820,14 +13847,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13823: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13850: 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 13830 "configure"
+#line 13857 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13845,23 +13872,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13851: \$? = $ac_status" >&5
+  echo "$as_me:13878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13857: \$? = $ac_status" >&5
+  echo "$as_me:13884: \$? = $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 13864 "configure"
+#line 13891 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13880,16 +13907,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13886: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13892: \$? = $ac_status" >&5
+  echo "$as_me:13919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13901,7 +13928,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13931: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13919,14 +13946,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13922: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13949: 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 13929 "configure"
+#line 13956 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13944,23 +13971,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13950: \$? = $ac_status" >&5
+  echo "$as_me:13977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13956: \$? = $ac_status" >&5
+  echo "$as_me:13983: \$? = $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 13963 "configure"
+#line 13990 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13979,16 +14006,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13985: \$? = $ac_status" >&5
+  echo "$as_me:14012: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13991: \$? = $ac_status" >&5
+  echo "$as_me:14018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14000,7 +14027,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14030: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14023,14 +14050,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14026: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14053: 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 14033 "configure"
+#line 14060 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14048,23 +14075,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14054: \$? = $ac_status" >&5
+  echo "$as_me:14081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14060: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $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 14067 "configure"
+#line 14094 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14083,16 +14110,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14089: \$? = $ac_status" >&5
+  echo "$as_me:14116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14095: \$? = $ac_status" >&5
+  echo "$as_me:14122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14104,7 +14131,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14107: result: $cf_cv_wint_t" >&5
+echo "$as_me:14134: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14136,7 +14163,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14139: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14166: 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.
@@ -14146,7 +14173,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14149: result: $with_lp64" >&5
+echo "$as_me:14176: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14162,7 +14189,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14165: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14192: 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
@@ -14174,7 +14201,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14177 "configure"
+#line 14204 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14194,16 +14221,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14200: \$? = $ac_status" >&5
+  echo "$as_me:14227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14206: \$? = $ac_status" >&5
+  echo "$as_me:14233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14213,16 +14240,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14219: \$? = $ac_status" >&5
+  echo "$as_me:14246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14225: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14236,13 +14263,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14239: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14266: 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:14245: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14272: 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
@@ -14250,7 +14277,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14253 "configure"
+#line 14280 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14270,16 +14297,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14276: \$? = $ac_status" >&5
+  echo "$as_me:14303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14282: \$? = $ac_status" >&5
+  echo "$as_me:14309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14288,7 +14315,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14291 "configure"
+#line 14318 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14309,16 +14336,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14315: \$? = $ac_status" >&5
+  echo "$as_me:14342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14321: \$? = $ac_status" >&5
+  echo "$as_me:14348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14329,7 +14356,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14332: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14359: 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
 
@@ -14339,7 +14366,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14342: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14369: 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
@@ -14347,7 +14374,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14350 "configure"
+#line 14377 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14367,16 +14394,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14373: \$? = $ac_status" >&5
+  echo "$as_me:14400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14379: \$? = $ac_status" >&5
+  echo "$as_me:14406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14385,7 +14412,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14388 "configure"
+#line 14415 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14406,16 +14433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14412: \$? = $ac_status" >&5
+  echo "$as_me:14439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14418: \$? = $ac_status" >&5
+  echo "$as_me:14445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14426,7 +14453,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14429: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14456: 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
 
@@ -14439,7 +14466,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14442: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14469: 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
@@ -14447,7 +14474,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14450 "configure"
+#line 14477 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14462,16 +14489,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14468: \$? = $ac_status" >&5
+  echo "$as_me:14495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14474: \$? = $ac_status" >&5
+  echo "$as_me:14501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14480,7 +14507,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14483 "configure"
+#line 14510 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14496,16 +14523,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14502: \$? = $ac_status" >&5
+  echo "$as_me:14529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14508: \$? = $ac_status" >&5
+  echo "$as_me:14535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14516,7 +14543,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14519: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14546: 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
 
@@ -14530,13 +14557,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14533: checking for fseeko" >&5
+echo "$as_me:14560: 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 14539 "configure"
+#line 14566 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14550,16 +14577,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14556: \$? = $ac_status" >&5
+  echo "$as_me:14583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14562: \$? = $ac_status" >&5
+  echo "$as_me:14589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14569,7 +14596,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14599: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14608,14 +14635,14 @@ fi
 
 	fi
 
-	echo "$as_me:14611: checking whether to use struct dirent64" >&5
+	echo "$as_me:14638: 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 14618 "configure"
+#line 14645 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14642,16 +14669,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14648: \$? = $ac_status" >&5
+  echo "$as_me:14675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14654: \$? = $ac_status" >&5
+  echo "$as_me:14681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14662,7 +14689,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14692: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14672,7 +14699,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14675: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14702: 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.
@@ -14682,14 +14709,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14685: result: $with_tparm_varargs" >&5
+echo "$as_me:14712: 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:14692: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14719: 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.
@@ -14699,14 +14726,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14702: result: $with_tic_depends" >&5
+echo "$as_me:14729: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14709: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14736: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14718,15 +14745,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14721: result: no" >&5
+	echo "$as_me:14748: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14725: result: yes" >&5
+	echo "$as_me:14752: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14729: checking for X11 rgb file" >&5
+echo "$as_me:14756: 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.
@@ -14788,7 +14815,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14818: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14796,7 +14823,7 @@ esac
 
 fi
 
-echo "$as_me:14799: result: $RGB_PATH" >&5
+echo "$as_me:14826: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14811,7 +14838,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14814: checking for type of bool" >&5
+echo "$as_me:14841: 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.
@@ -14821,17 +14848,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
+echo "$as_me:14851: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14855: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14834: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14861: 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.
@@ -14843,16 +14870,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14873: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14877: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14855: checking for type of chtype" >&5
+echo "$as_me:14882: 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.
@@ -14862,11 +14889,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14892: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14896: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14874,7 +14901,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14877: checking for type of ospeed" >&5
+echo "$as_me:14904: 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.
@@ -14884,11 +14911,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14914: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14918: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14896,7 +14923,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14899: checking for type of mmask-t" >&5
+echo "$as_me:14926: 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.
@@ -14906,18 +14933,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14936: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14940: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14920: checking for size CCHARW_MAX" >&5
+echo "$as_me:14947: 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.
@@ -14927,16 +14954,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14957: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14933: checking for signed char" >&5
+echo "$as_me:14960: 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 14939 "configure"
+#line 14966 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14951,16 +14978,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14957: \$? = $ac_status" >&5
+  echo "$as_me:14984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14963: \$? = $ac_status" >&5
+  echo "$as_me:14990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14970,10 +14997,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15000: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14976: checking size of signed char" >&5
+echo "$as_me:15003: 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
@@ -14982,7 +15009,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14985 "configure"
+#line 15012 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14994,21 +15021,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15000: \$? = $ac_status" >&5
+  echo "$as_me:15027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15006: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15011 "configure"
+#line 15038 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15020,16 +15047,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15026: \$? = $ac_status" >&5
+  echo "$as_me:15053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15032: \$? = $ac_status" >&5
+  echo "$as_me:15059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15045,7 +15072,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15048 "configure"
+#line 15075 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15057,16 +15084,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15063: \$? = $ac_status" >&5
+  echo "$as_me:15090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15069: \$? = $ac_status" >&5
+  echo "$as_me:15096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15082,7 +15109,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15085 "configure"
+#line 15112 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15094,16 +15121,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15100: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15116,12 +15143,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15119: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15146: 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 15124 "configure"
+#line 15151 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15137,15 +15164,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15143: \$? = $ac_status" >&5
+  echo "$as_me:15170: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15148: \$? = $ac_status" >&5
+  echo "$as_me:15175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15161,7 +15188,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15191: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15172,7 +15199,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15202: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15182,13 +15209,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15185: result: $with_signed_char" >&5
+echo "$as_me:15212: 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:15191: checking for type of tparm-arg" >&5
+echo "$as_me:15218: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15198,18 +15225,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15228: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15232: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15212: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15239: 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.
@@ -15219,7 +15246,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15222: result: $with_rcs_ids" >&5
+echo "$as_me:15249: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15228,7 +15255,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15231: checking format of man-pages" >&5
+echo "$as_me:15258: 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.
@@ -15319,10 +15346,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15349: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15352: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15363,7 +15390,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15366: checking for manpage renaming" >&5
+echo "$as_me:15393: 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.
@@ -15392,15 +15419,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15422: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15427: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15403: checking if manpage aliases will be installed" >&5
+echo "$as_me:15430: 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.
@@ -15411,7 +15438,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15441: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15425,7 +15452,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15428: checking if manpage symlinks should be used" >&5
+echo "$as_me:15455: 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.
@@ -15438,17 +15465,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15468: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15474: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15451: checking for manpage tbl" >&5
+echo "$as_me:15478: 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.
@@ -15459,7 +15486,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
+echo "$as_me:15489: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15777,7 +15804,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15780: checking if you want to build with function extensions" >&5
+echo "$as_me:15807: 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.
@@ -15787,7 +15814,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15790: result: $with_ext_funcs" >&5
+echo "$as_me:15817: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15844,7 +15871,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15874: 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.
@@ -15854,7 +15881,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15857: result: $with_sp_funcs" >&5
+echo "$as_me:15884: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15873,7 +15900,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15903: 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.
@@ -15883,7 +15910,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15886: result: $with_term_driver" >&5
+echo "$as_me:15913: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15892,19 +15919,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15895: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15922: 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:15900: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15927: 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:15907: checking for extended use of const keyword" >&5
+echo "$as_me:15934: 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.
@@ -15914,7 +15941,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15917: result: $with_ext_const" >&5
+echo "$as_me:15944: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15922,7 +15949,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15925: checking if you want to use extended colors" >&5
+echo "$as_me:15952: 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.
@@ -15932,12 +15959,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15935: result: $with_ext_colors" >&5
+echo "$as_me:15962: 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:15940: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15967: 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)
@@ -15948,7 +15975,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15978: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -15976,7 +16003,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:15979: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16006: 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.
@@ -15986,7 +16013,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:15989: result: $with_ext_mouse" >&5
+echo "$as_me:16016: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -15996,7 +16023,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16026: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16013,7 +16040,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16016: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16043: 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.
@@ -16023,7 +16050,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16026: result: $with_ext_putwin" >&5
+echo "$as_me:16053: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16033,7 +16060,7 @@ EOF
 
 fi
 
-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16063: 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.
@@ -16043,7 +16070,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16046: result: $with_no_padding" >&5
+echo "$as_me:16073: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16051,7 +16078,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16054: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16081: 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.
@@ -16061,7 +16088,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16064: result: $with_sigwinch" >&5
+echo "$as_me:16091: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16076,7 +16103,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16079: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16106: 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.
@@ -16086,7 +16113,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16089: result: $with_tcap_names" >&5
+echo "$as_me:16116: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16100,7 +16127,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
+echo "$as_me:16130: 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.
@@ -16110,27 +16137,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16113: result: $with_pthread" >&5
+echo "$as_me:16140: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16117: checking for pthread.h" >&5
+	echo "$as_me:16144: 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 16123 "configure"
+#line 16150 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:16160: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16149,7 +16176,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16179: 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
 
@@ -16159,7 +16186,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16162: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16189: 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"
 
@@ -16180,7 +16207,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16183 "configure"
+#line 16210 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16197,16 +16224,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16203: \$? = $ac_status" >&5
+  echo "$as_me:16230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16209: \$? = $ac_status" >&5
+  echo "$as_me:16236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16216,7 +16243,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16219: result: $with_pthread" >&5
+	    echo "$as_me:16246: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16244,7 +16271,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16274: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16254,13 +16281,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16257: checking for pthread_kill" >&5
+	echo "$as_me:16284: 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 16263 "configure"
+#line 16290 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16291,16 +16318,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16297: \$? = $ac_status" >&5
+  echo "$as_me:16324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16303: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16310,11 +16337,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16313: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16340: 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:16317: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16344: 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.
@@ -16324,7 +16351,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16354: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16335,7 +16362,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16365: 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.
@@ -16345,18 +16372,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16348: result: $use_weak_symbols" >&5
+	echo "$as_me:16375: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16352: checking if $CC supports weak symbols" >&5
+echo "$as_me:16379: 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 16359 "configure"
+#line 16386 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16382,16 +16409,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16388: \$? = $ac_status" >&5
+  echo "$as_me:16415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16394: \$? = $ac_status" >&5
+  echo "$as_me:16421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16402,7 +16429,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16432: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16452,7 +16479,7 @@ fi
 # 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:16455: checking if you want reentrant code" >&5
+echo "$as_me:16482: 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.
@@ -16462,7 +16489,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16465: result: $with_reentrant" >&5
+echo "$as_me:16492: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16551,7 +16578,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16581: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16563,7 +16590,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16593: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16585,16 +16612,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16588: result: $enable_opaque_curses" >&5
+echo "$as_me:16615: 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:16593: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16620: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16597: checking whether form library structures should be opaque" >&5
+echo "$as_me:16624: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16611,10 +16638,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16614: result: $enable_opaque_form" >&5
+echo "$as_me:16641: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16644: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16631,10 +16658,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16634: result: $enable_opaque_menu" >&5
+echo "$as_me:16661: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16664: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16651,7 +16678,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16654: result: $enable_opaque_panel" >&5
+echo "$as_me:16681: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16661,7 +16688,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16664: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16691: 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.
@@ -16671,7 +16698,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16701: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16684,7 +16711,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16687: checking if you want all development code" >&5
+echo "$as_me:16714: 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.
@@ -16694,11 +16721,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16697: result: $with_develop" >&5
+echo "$as_me:16724: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16728: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16708,7 +16735,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16711: result: $enable_check_size" >&5
+echo "$as_me:16738: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16716,7 +16743,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16719: checking if you want hard-tabs code" >&5
+echo "$as_me:16746: 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.
@@ -16726,7 +16753,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16729: result: $enable_hard_tabs" >&5
+echo "$as_me:16756: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16734,7 +16761,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16737: checking if you want limited support for xmc" >&5
+echo "$as_me:16764: 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.
@@ -16744,7 +16771,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
+echo "$as_me:16774: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16754,7 +16781,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16757: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16784: 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.
@@ -16764,7 +16791,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16767: result: $with_assumed_color" >&5
+echo "$as_me:16794: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16772,7 +16799,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16775: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16802: 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.
@@ -16782,7 +16809,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16785: result: $with_hashmap" >&5
+echo "$as_me:16812: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16790,7 +16817,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16793: checking if you want colorfgbg code" >&5
+echo "$as_me:16820: 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.
@@ -16800,7 +16827,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16803: result: $with_colorfgbg" >&5
+echo "$as_me:16830: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16808,7 +16835,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16838: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16818,14 +16845,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
+echo "$as_me:16848: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16828: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16855: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16834,7 +16861,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16837 "configure"
+#line 16864 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16850,16 +16877,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16856: \$? = $ac_status" >&5
+  echo "$as_me:16883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16862: \$? = $ac_status" >&5
+  echo "$as_me:16889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16871,7 +16898,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16901: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -16986,7 +17013,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17016: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16995,7 +17022,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16998 "configure"
+#line 17025 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17011,16 +17038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17017: \$? = $ac_status" >&5
+  echo "$as_me:17044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17023: \$? = $ac_status" >&5
+  echo "$as_me:17050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17032,7 +17059,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17062: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17155,7 +17182,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17158: checking if you want interop bindings" >&5
+echo "$as_me:17185: 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.
@@ -17165,13 +17192,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17168: result: $with_exp_interop" >&5
+echo "$as_me:17195: 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:17174: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17201: 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.
@@ -17181,13 +17208,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17184: result: $with_safe_sprintf" >&5
+echo "$as_me:17211: 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:17190: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17217: 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.
@@ -17197,7 +17224,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17200: result: $with_scroll_hints" >&5
+echo "$as_me:17227: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17206,7 +17233,7 @@ EOF
 
 fi
 
-echo "$as_me:17209: checking if you want wgetch-events code" >&5
+echo "$as_me:17236: 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.
@@ -17216,7 +17243,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17219: result: $with_wgetch_events" >&5
+echo "$as_me:17246: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17231,7 +17258,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17261: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17241,7 +17268,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17244: result: $with_exp_win32" >&5
+	echo "$as_me:17271: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17267,7 +17294,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17270: checking if you want to see long compiling messages" >&5
+echo "$as_me:17297: 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.
@@ -17301,7 +17328,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17304: result: $enableval" >&5
+echo "$as_me:17331: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17314,7 +17341,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17317: checking if you want to install stripped executables" >&5
+echo "$as_me:17344: 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.
@@ -17331,7 +17358,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17334: result: $enable_stripping" >&5
+echo "$as_me:17361: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17342,7 +17369,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17345: checking if install accepts -p option" >&5
+echo "$as_me:17372: 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
@@ -17373,10 +17400,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17376: result: $cf_cv_install_p" >&5
+echo "$as_me:17403: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17379: checking if install needs to be told about ownership" >&5
+echo "$as_me:17406: 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)
@@ -17387,7 +17414,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17390: result: $with_install_o" >&5
+echo "$as_me:17417: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17398,7 +17425,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17401: checking if you want to specify strip-program" >&5
+	echo "$as_me:17428: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17408,11 +17435,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17411: result: $with_strip_program" >&5
+	echo "$as_me:17438: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17442: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17433,11 +17460,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17436: result: $check_install_strip" >&5
+		echo "$as_me:17463: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17467: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17452,7 +17479,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17482: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17478,7 +17505,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17508: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17495,17 +17522,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
+echo "$as_me:17525: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17529: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17508 "configure"
+#line 17535 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17521,16 +17548,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17527: \$? = $ac_status" >&5
+  echo "$as_me:17554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17533: \$? = $ac_status" >&5
+  echo "$as_me:17560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17541,7 +17568,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17571: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17597,16 +17624,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17627: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17632: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17636: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17645,16 +17672,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17675: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17680: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17684: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17693,23 +17720,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17723: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17728: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17732: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17712: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17739: 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.
@@ -17726,7 +17753,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17729: result: $enable_warnings" >&5
+echo "$as_me:17756: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17750,7 +17777,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17753 "configure"
+#line 17780 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17765,26 +17792,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17771: \$? = $ac_status" >&5
+  echo "$as_me:17798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17777: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
+echo "$as_me:17807: 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 17787 "configure"
+#line 17814 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17802,16 +17829,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17808: \$? = $ac_status" >&5
+  echo "$as_me:17835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17814: \$? = $ac_status" >&5
+  echo "$as_me:17841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17826,7 +17853,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17856: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17855,7 +17882,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17858 "${as_me:-configure}"
+#line 17885 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17871,7 +17898,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17874: checking for $CC warning options..." >&5
+	{ echo "$as_me:17901: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17887,12 +17914,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17893: \$? = $ac_status" >&5
+  echo "$as_me:17920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17922: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17900,7 +17927,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17903: checking for $CC warning options..." >&5
+	{ echo "$as_me:17930: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17923,12 +17950,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17926: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17929: \$? = $ac_status" >&5
+  echo "$as_me:17956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17958: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17936,7 +17963,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17946,7 +17973,7 @@ echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17976: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17979,10 +18006,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18009: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 17985 "${as_me:-configure}"
+#line 18012 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18032,12 +18059,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18038: \$? = $ac_status" >&5
+  echo "$as_me:18065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18067: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18109,12 +18136,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18112: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18139: 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 18117 "configure"
+#line 18144 "configure"
 #include "confdefs.h"
 
 int
@@ -18131,16 +18158,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18137: \$? = $ac_status" >&5
+  echo "$as_me:18164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18143: \$? = $ac_status" >&5
+  echo "$as_me:18170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18151,7 +18178,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18181: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18160,11 +18187,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18163: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18190: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18167 "configure"
+#line 18194 "configure"
 #include "confdefs.h"
 
 int
@@ -18181,16 +18208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18187: \$? = $ac_status" >&5
+  echo "$as_me:18214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18193: \$? = $ac_status" >&5
+  echo "$as_me:18220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18200,7 +18227,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18230: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18209,30 +18236,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18239: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18219: checking version of $CC" >&5
+	echo "$as_me:18246: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18223: result: $CLANG_VERSION" >&5
+	echo "$as_me:18250: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18230: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18257: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18235 "configure"
+#line 18262 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18246,16 +18273,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18258: \$? = $ac_status" >&5
+  echo "$as_me:18285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18266,13 +18293,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18269: result: $cf_clang_optok" >&5
+		echo "$as_me:18296: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18302: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18289,7 +18316,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18292 "configure"
+#line 18319 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18307,7 +18334,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18310: checking for $CC warning options..." >&5
+	{ echo "$as_me:18337: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18324,12 +18351,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18330: \$? = $ac_status" >&5
+  echo "$as_me:18357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18359: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18338,7 +18365,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18368: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18368,16 +18395,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18374: \$? = $ac_status" >&5
+  echo "$as_me:18401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18403: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18407: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18395,7 +18422,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18425: 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.
@@ -18405,7 +18432,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18408: result: $enable_string_hacks" >&5
+echo "$as_me:18435: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18414,15 +18441,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18417: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18444: 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:18419: checking for strlcat" >&5
+	echo "$as_me:18446: 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 18425 "configure"
+#line 18452 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18453,16 +18480,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18459: \$? = $ac_status" >&5
+  echo "$as_me:18486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18465: \$? = $ac_status" >&5
+  echo "$as_me:18492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18472,7 +18499,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18502: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18482,7 +18509,7 @@ EOF
 
 else
 
-		echo "$as_me:18485: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18512: 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
@@ -18490,7 +18517,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18493 "configure"
+#line 18520 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18509,16 +18536,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18515: \$? = $ac_status" >&5
+  echo "$as_me:18542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18521: \$? = $ac_status" >&5
+  echo "$as_me:18548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18529,7 +18556,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18532: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18559: 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
 
@@ -18552,23 +18579,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18555: checking for $ac_header" >&5
+echo "$as_me:18582: 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 18561 "configure"
+#line 18588 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18592: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18571: \$? = $ac_status" >&5
+  echo "$as_me:18598: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18587,7 +18614,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18617: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18608,13 +18635,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18611: checking for $ac_func" >&5
+echo "$as_me:18638: 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 18617 "configure"
+#line 18644 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18645,16 +18672,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18651: \$? = $ac_status" >&5
+  echo "$as_me:18678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18657: \$? = $ac_status" >&5
+  echo "$as_me:18684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18664,7 +18691,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18694: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18677,7 +18704,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18680: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18707: 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.
@@ -18687,7 +18714,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18690: result: $with_assertions" >&5
+echo "$as_me:18717: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18703,7 +18730,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18706: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18733: 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.
@@ -18725,7 +18752,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18755: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18839,23 +18866,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18842: checking for dmalloc.h" >&5
+	echo "$as_me:18869: 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 18848 "configure"
+#line 18875 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18879: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18858: \$? = $ac_status" >&5
+  echo "$as_me:18885: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18874,11 +18901,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18904: 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:18881: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18908: 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
@@ -18886,7 +18913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18889 "configure"
+#line 18916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18905,16 +18932,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18911: \$? = $ac_status" >&5
+  echo "$as_me:18938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18917: \$? = $ac_status" >&5
+  echo "$as_me:18944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18925,7 +18952,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18940,7 +18967,7 @@ fi
 
 fi
 
-echo "$as_me:18943: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18970: 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.
@@ -18962,7 +18989,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18992: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19076,23 +19103,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19079: checking for dbmalloc.h" >&5
+	echo "$as_me:19106: 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 19085 "configure"
+#line 19112 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19116: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19095: \$? = $ac_status" >&5
+  echo "$as_me:19122: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19111,11 +19138,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19141: 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:19118: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19145: 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
@@ -19123,7 +19150,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19126 "configure"
+#line 19153 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19142,16 +19169,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19148: \$? = $ac_status" >&5
+  echo "$as_me:19175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19154: \$? = $ac_status" >&5
+  echo "$as_me:19181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19162,7 +19189,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19165: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19192: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19177,7 +19204,7 @@ fi
 
 fi
 
-echo "$as_me:19180: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19207: 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.
@@ -19199,7 +19226,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19229: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19312,7 +19339,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19342: 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.
@@ -19323,7 +19350,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19326: result: $with_no_leaks" >&5
+echo "$as_me:19353: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19375,7 +19402,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
+echo "$as_me:19405: 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.
@@ -19385,7 +19412,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19388: result: $cf_with_trace" >&5
+echo "$as_me:19415: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19405,7 +19432,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
+echo "$as_me:19435: 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.
@@ -19422,7 +19449,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19425: result: $enable_gnat_projects" >&5
+echo "$as_me:19452: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19435,14 +19462,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19438: checking if ssp library is needed" >&5
+echo "$as_me:19465: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19445 "configure"
+#line 19472 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19459,16 +19486,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19465: \$? = $ac_status" >&5
+  echo "$as_me:19492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19471: \$? = $ac_status" >&5
+  echo "$as_me:19498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19478,7 +19505,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19481 "configure"
+#line 19508 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19495,16 +19522,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19518,7 +19545,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19548: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19547,14 +19574,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19550: checking if -lm needed for math functions" >&5
+echo "$as_me:19577: 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 19557 "configure"
+#line 19584 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19570,16 +19597,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19576: \$? = $ac_status" >&5
+  echo "$as_me:19603: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19582: \$? = $ac_status" >&5
+  echo "$as_me:19609: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19589,7 +19616,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19592: result: $cf_cv_need_libm" >&5
+echo "$as_me:19619: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19597,14 +19624,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19600: checking if -lm is available for math functions" >&5
+	echo "$as_me:19627: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19607 "configure"
+#line 19634 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19620,16 +19647,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19626: \$? = $ac_status" >&5
+  echo "$as_me:19653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19632: \$? = $ac_status" >&5
+  echo "$as_me:19659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19639,7 +19666,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19642: result: $cf_cv_have_libm" >&5
+echo "$as_me:19669: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19661,13 +19688,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19664: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19691: 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 19670 "configure"
+#line 19697 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19683,16 +19710,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19689: \$? = $ac_status" >&5
+  echo "$as_me:19716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19695: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19702,7 +19729,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19705: result: $ac_cv_header_time" >&5
+echo "$as_me:19732: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19717,7 +19744,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19747: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19725,7 +19752,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19728 "configure"
+#line 19755 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19744,16 +19771,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19750: \$? = $ac_status" >&5
+  echo "$as_me:19777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19756: \$? = $ac_status" >&5
+  echo "$as_me:19783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19764,11 +19791,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19794: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19771: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19798: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19776,7 +19803,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19779 "configure"
+#line 19806 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19795,16 +19822,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19801: \$? = $ac_status" >&5
+  echo "$as_me:19828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19807: \$? = $ac_status" >&5
+  echo "$as_me:19834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19815,7 +19842,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19845: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19837,7 +19864,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19867: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19845,7 +19872,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19848 "configure"
+#line 19875 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19864,16 +19891,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19870: \$? = $ac_status" >&5
+  echo "$as_me:19897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19884,7 +19911,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19914: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19906,7 +19933,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19936: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19914,7 +19941,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19917 "configure"
+#line 19944 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19933,16 +19960,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19939: \$? = $ac_status" >&5
+  echo "$as_me:19966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19945: \$? = $ac_status" >&5
+  echo "$as_me:19972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19953,7 +19980,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19983: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -19995,7 +20022,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20025: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20003,7 +20030,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20006 "configure"
+#line 20033 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20022,16 +20049,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20028: \$? = $ac_status" >&5
+  echo "$as_me:20055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20034: \$? = $ac_status" >&5
+  echo "$as_me:20061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20042,7 +20069,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20072: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20070,13 +20097,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20073: checking for regcomp" >&5
+	echo "$as_me:20100: 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 20079 "configure"
+#line 20106 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20107,16 +20134,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20113: \$? = $ac_status" >&5
+  echo "$as_me:20140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20119: \$? = $ac_status" >&5
+  echo "$as_me:20146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20126,7 +20153,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20129: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20156: 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
@@ -20135,7 +20162,7 @@ else
 		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:20138: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20165: 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
@@ -20143,7 +20170,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20146 "configure"
+#line 20173 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20162,16 +20189,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20168: \$? = $ac_status" >&5
+  echo "$as_me:20195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20174: \$? = $ac_status" >&5
+  echo "$as_me:20201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20182,7 +20209,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20185: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20212: 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
 
@@ -20214,13 +20241,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20217: checking for compile" >&5
+	echo "$as_me:20244: 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 20223 "configure"
+#line 20250 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20251,16 +20278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20257: \$? = $ac_status" >&5
+  echo "$as_me:20284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20263: \$? = $ac_status" >&5
+  echo "$as_me:20290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20270,13 +20297,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20273: result: $ac_cv_func_compile" >&5
+echo "$as_me:20300: 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:20279: checking for compile in -lgen" >&5
+		echo "$as_me:20306: 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
@@ -20284,7 +20311,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20287 "configure"
+#line 20314 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20303,16 +20330,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20309: \$? = $ac_status" >&5
+  echo "$as_me:20336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20315: \$? = $ac_status" >&5
+  echo "$as_me:20342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20323,7 +20350,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20326: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20353: 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
 
@@ -20351,11 +20378,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20381: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20358: checking for regular-expression headers" >&5
+echo "$as_me:20385: 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
@@ -20367,7 +20394,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20370 "configure"
+#line 20397 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20384,16 +20411,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20390: \$? = $ac_status" >&5
+  echo "$as_me:20417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20396: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20410,7 +20437,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20413 "configure"
+#line 20440 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20430,16 +20457,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20436: \$? = $ac_status" >&5
+  echo "$as_me:20463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20442: \$? = $ac_status" >&5
+  echo "$as_me:20469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20455,11 +20482,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20485: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20489: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20497,23 +20524,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20500: checking for $ac_header" >&5
+echo "$as_me:20527: 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 20506 "configure"
+#line 20533 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20537: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20516: \$? = $ac_status" >&5
+  echo "$as_me:20543: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20532,7 +20559,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20562: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20545,23 +20572,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20548: checking for $ac_header" >&5
+echo "$as_me:20575: 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 20554 "configure"
+#line 20581 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20564: \$? = $ac_status" >&5
+  echo "$as_me:20591: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20580,7 +20607,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20610: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20590,7 +20617,7 @@ EOF
 fi
 done
 
-echo "$as_me:20593: checking for header declaring getopt variables" >&5
+echo "$as_me:20620: 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
@@ -20600,7 +20627,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20603 "configure"
+#line 20630 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20613,16 +20640,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20619: \$? = $ac_status" >&5
+  echo "$as_me:20646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20625: \$? = $ac_status" >&5
+  echo "$as_me:20652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20634,7 +20661,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20664: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20651,14 +20678,14 @@ EOF
 
 fi
 
-echo "$as_me:20654: checking if external environ is declared" >&5
+echo "$as_me:20681: 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 20661 "configure"
+#line 20688 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20671,16 +20698,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20701: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20677: \$? = $ac_status" >&5
+  echo "$as_me:20704: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20683: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20691,7 +20718,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20721: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20706,14 +20733,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20709: checking if external environ exists" >&5
+echo "$as_me:20736: 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 20716 "configure"
+#line 20743 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20728,16 +20755,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20734: \$? = $ac_status" >&5
+  echo "$as_me:20761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20740: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20748,7 +20775,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20751: result: $cf_cv_have_environ" >&5
+echo "$as_me:20778: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20761,13 +20788,13 @@ EOF
 
 fi
 
-echo "$as_me:20764: checking for getenv" >&5
+echo "$as_me:20791: 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 20770 "configure"
+#line 20797 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20798,16 +20825,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20804: \$? = $ac_status" >&5
+  echo "$as_me:20831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20810: \$? = $ac_status" >&5
+  echo "$as_me:20837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20817,19 +20844,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20820: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20847: 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:20826: checking for $ac_func" >&5
+echo "$as_me:20853: 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 20832 "configure"
+#line 20859 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20860,16 +20887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20866: \$? = $ac_status" >&5
+  echo "$as_me:20893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20872: \$? = $ac_status" >&5
+  echo "$as_me:20899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20879,7 +20906,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20909: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20889,7 +20916,7 @@ EOF
 fi
 done
 
-echo "$as_me:20892: checking if getenv returns consistent values" >&5
+echo "$as_me:20919: 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
@@ -20899,7 +20926,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20902 "configure"
+#line 20929 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21004,15 +21031,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21010: \$? = $ac_status" >&5
+  echo "$as_me:21037: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21015: \$? = $ac_status" >&5
+  echo "$as_me:21042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21025,7 +21052,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21055: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21040,18 +21067,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21043: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21070: 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
 
-echo "$as_me:21047: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21074: 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 21054 "configure"
+#line 21081 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21071,16 +21098,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21077: \$? = $ac_status" >&5
+  echo "$as_me:21104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21083: \$? = $ac_status" >&5
+  echo "$as_me:21110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21092,7 +21119,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21122: 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
@@ -21107,13 +21134,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21110: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21137: 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 21116 "configure"
+#line 21143 "configure"
 #include "confdefs.h"
 
 int
@@ -21175,16 +21202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21181: \$? = $ac_status" >&5
+  echo "$as_me:21208: \$? = $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:21211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21187: \$? = $ac_status" >&5
+  echo "$as_me:21214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21194,7 +21221,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21197: result: $ac_cv_c_const" >&5
+echo "$as_me:21224: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21204,7 +21231,7 @@ EOF
 
 fi
 
-echo "$as_me:21207: checking for inline" >&5
+echo "$as_me:21234: 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
@@ -21212,7 +21239,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21215 "configure"
+#line 21242 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21221,16 +21248,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21227: \$? = $ac_status" >&5
+  echo "$as_me:21254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21233: \$? = $ac_status" >&5
+  echo "$as_me:21260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21241,7 +21268,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
+echo "$as_me:21271: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21267,7 +21294,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21297: 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
@@ -21276,7 +21303,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21279 "configure"
+#line 21306 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21288,16 +21315,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21294: \$? = $ac_status" >&5
+  echo "$as_me:21321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21300: \$? = $ac_status" >&5
+  echo "$as_me:21327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21309,7 +21336,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21339: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21415,7 +21442,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21418: checking for signal global datatype" >&5
+echo "$as_me:21445: 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
@@ -21427,7 +21454,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21430 "configure"
+#line 21457 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21451,16 +21478,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21457: \$? = $ac_status" >&5
+  echo "$as_me:21484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21463: \$? = $ac_status" >&5
+  echo "$as_me:21490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21474,7 +21501,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21504: 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 <<EOF
@@ -21483,7 +21510,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21486: checking for type of chtype" >&5
+echo "$as_me:21513: 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
@@ -21493,7 +21520,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21496 "configure"
+#line 21523 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21528,15 +21555,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21534: \$? = $ac_status" >&5
+  echo "$as_me:21561: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21539: \$? = $ac_status" >&5
+  echo "$as_me:21566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21551,7 +21578,7 @@ fi
 
 fi
 
-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21581: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21563,14 +21590,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21566: checking if unsigned literals are legal" >&5
+echo "$as_me:21593: 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 21573 "configure"
+#line 21600 "configure"
 #include "confdefs.h"
 
 int
@@ -21582,16 +21609,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21588: \$? = $ac_status" >&5
+  echo "$as_me:21615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:21621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21603,7 +21630,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21633: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21619,14 +21646,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21622: checking if external errno is declared" >&5
+echo "$as_me:21649: 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 21629 "configure"
+#line 21656 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21640,16 +21667,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21646: \$? = $ac_status" >&5
+  echo "$as_me:21673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21652: \$? = $ac_status" >&5
+  echo "$as_me:21679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21660,7 +21687,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21690: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21675,14 +21702,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21678: checking if external errno exists" >&5
+echo "$as_me:21705: 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 21685 "configure"
+#line 21712 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21697,16 +21724,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21703: \$? = $ac_status" >&5
+  echo "$as_me:21730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21709: \$? = $ac_status" >&5
+  echo "$as_me:21736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21717,7 +21744,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21720: result: $cf_cv_have_errno" >&5
+echo "$as_me:21747: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21730,7 +21757,7 @@ EOF
 
 fi
 
-echo "$as_me:21733: checking if data-only library module links" >&5
+echo "$as_me:21760: 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
@@ -21738,20 +21765,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21741 "configure"
+#line 21768 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21747: \$? = $ac_status" >&5
+  echo "$as_me:21774: \$? = $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 <<EOF
-#line 21754 "configure"
+#line 21781 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21768,10 +21795,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21774: \$? = $ac_status" >&5
+  echo "$as_me:21801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21784,7 +21811,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21787 "configure"
+#line 21814 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21795,15 +21822,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21801: \$? = $ac_status" >&5
+  echo "$as_me:21828: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21806: \$? = $ac_status" >&5
+  echo "$as_me:21833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21818,7 +21845,7 @@ fi
 
 fi
 
-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21848: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21833,13 +21860,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21836: checking for clock_gettime" >&5
+echo "$as_me:21863: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21842 "configure"
+#line 21869 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21870,16 +21897,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21876: \$? = $ac_status" >&5
+  echo "$as_me:21903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21882: \$? = $ac_status" >&5
+  echo "$as_me:21909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21889,12 +21916,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21919: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21924: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21902,7 +21929,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21905 "configure"
+#line 21932 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21921,16 +21948,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21933: \$? = $ac_status" >&5
+  echo "$as_me:21960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21941,7 +21968,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21971: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21953,14 +21980,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21956: checking if clock_gettime links" >&5
+echo "$as_me:21983: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21963 "configure"
+#line 21990 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21978,16 +22005,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21984: \$? = $ac_status" >&5
+  echo "$as_me:22011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21990: \$? = $ac_status" >&5
+  echo "$as_me:22017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -21998,7 +22025,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22028: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22012,13 +22039,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22015: checking for gettimeofday" >&5
+echo "$as_me:22042: 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 22021 "configure"
+#line 22048 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22049,16 +22076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22055: \$? = $ac_status" >&5
+  echo "$as_me:22082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22061: \$? = $ac_status" >&5
+  echo "$as_me:22088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22068,7 +22095,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22098: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22078,7 +22105,7 @@ EOF
 
 else
 
-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22108: 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
@@ -22086,7 +22113,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22089 "configure"
+#line 22116 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22105,16 +22132,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22111: \$? = $ac_status" >&5
+  echo "$as_me:22138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22117: \$? = $ac_status" >&5
+  echo "$as_me:22144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22125,7 +22152,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22128: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22155: 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
 
@@ -22184,13 +22211,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22187: checking for $ac_func" >&5
+echo "$as_me:22214: 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 22193 "configure"
+#line 22220 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22221,16 +22248,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22227: \$? = $ac_status" >&5
+  echo "$as_me:22254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22233: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22240,7 +22267,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22270: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22250,14 +22277,14 @@ EOF
 fi
 done
 
-echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22280: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22260 "configure"
+#line 22287 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22272,16 +22299,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22278: \$? = $ac_status" >&5
+  echo "$as_me:22305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22284: \$? = $ac_status" >&5
+  echo "$as_me:22311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22291,7 +22318,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22321: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22313,7 +22340,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22343: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22323,7 +22350,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22326 "configure"
+#line 22353 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22336,15 +22363,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22369: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22347: \$? = $ac_status" >&5
+  echo "$as_me:22374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22356,7 +22383,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22386: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22368,14 +22395,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22371: checking for getttynam" >&5
+	echo "$as_me:22398: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22378 "configure"
+#line 22405 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22387,16 +22414,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22393: \$? = $ac_status" >&5
+  echo "$as_me:22420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22399: \$? = $ac_status" >&5
+  echo "$as_me:22426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22406,7 +22433,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22436: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22416,7 +22443,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22446: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22425,7 +22452,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22455: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22438,14 +22465,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22441: checking for terminal-capability database functions" >&5
+echo "$as_me:22468: 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 22448 "configure"
+#line 22475 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22465,16 +22492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22471: \$? = $ac_status" >&5
+  echo "$as_me:22498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22477: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22485,7 +22512,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22488: result: $cf_cv_cgetent" >&5
+echo "$as_me:22515: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22495,14 +22522,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
+echo "$as_me:22525: 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 22505 "configure"
+#line 22532 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22525,16 +22552,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22531: \$? = $ac_status" >&5
+  echo "$as_me:22558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22537: \$? = $ac_status" >&5
+  echo "$as_me:22564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22545,7 +22572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22575: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22559,14 +22586,14 @@ fi
 
 fi
 
-echo "$as_me:22562: checking for isascii" >&5
+echo "$as_me:22589: 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 22569 "configure"
+#line 22596 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22578,16 +22605,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22584: \$? = $ac_status" >&5
+  echo "$as_me:22611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22590: \$? = $ac_status" >&5
+  echo "$as_me:22617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22598,7 +22625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22628: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22606,10 +22633,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22636: 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 22612 "configure"
+#line 22639 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22623,16 +22650,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22629: \$? = $ac_status" >&5
+  echo "$as_me:22656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22635: \$? = $ac_status" >&5
+  echo "$as_me:22662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22640,7 +22667,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22643 "configure"
+#line 22670 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22655,16 +22682,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22661: \$? = $ac_status" >&5
+  echo "$as_me:22688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22667: \$? = $ac_status" >&5
+  echo "$as_me:22694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22680,11 +22707,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22683: result: $sigact_bad" >&5
+echo "$as_me:22710: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22687: checking if nanosleep really works" >&5
+echo "$as_me:22714: 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
@@ -22694,7 +22721,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22697 "configure"
+#line 22724 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22720,15 +22747,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22726: \$? = $ac_status" >&5
+  echo "$as_me:22753: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22731: \$? = $ac_status" >&5
+  echo "$as_me:22758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22740,7 +22767,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22770: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22757,23 +22784,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22760: checking for $ac_header" >&5
+echo "$as_me:22787: 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 22766 "configure"
+#line 22793 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22776: \$? = $ac_status" >&5
+  echo "$as_me:22803: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22792,7 +22819,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22822: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22809,10 +22836,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22812: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22839: 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 22815 "configure"
+#line 22842 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22824,16 +22851,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22830: \$? = $ac_status" >&5
+  echo "$as_me:22857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:22863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22841,7 +22868,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22844 "configure"
+#line 22871 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22855,16 +22882,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22861: \$? = $ac_status" >&5
+  echo "$as_me:22888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22867: \$? = $ac_status" >&5
+  echo "$as_me:22894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22880,19 +22907,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22883: result: $termios_bad" >&5
+	echo "$as_me:22910: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22888: checking for tcgetattr" >&5
+echo "$as_me:22915: 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 22895 "configure"
+#line 22922 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22920,16 +22947,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22926: \$? = $ac_status" >&5
+  echo "$as_me:22953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22932: \$? = $ac_status" >&5
+  echo "$as_me:22959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22939,21 +22966,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22942: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22969: 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:22949: checking for vsscanf function or workaround" >&5
+echo "$as_me:22976: 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 22956 "configure"
+#line 22983 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -22979,16 +23006,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22985: \$? = $ac_status" >&5
+  echo "$as_me:23012: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22991: \$? = $ac_status" >&5
+  echo "$as_me:23018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -22996,7 +23023,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22999 "configure"
+#line 23026 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23018,16 +23045,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23024: \$? = $ac_status" >&5
+  echo "$as_me:23051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23030: \$? = $ac_status" >&5
+  echo "$as_me:23057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23035,7 +23062,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23038 "configure"
+#line 23065 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23057,16 +23084,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23063: \$? = $ac_status" >&5
+  echo "$as_me:23090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23069: \$? = $ac_status" >&5
+  echo "$as_me:23096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23081,7 +23108,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23111: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23107,23 +23134,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23110: checking for $ac_header" >&5
+echo "$as_me:23137: 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 23116 "configure"
+#line 23143 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23147: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23126: \$? = $ac_status" >&5
+  echo "$as_me:23153: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23142,7 +23169,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23172: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23152,7 +23179,7 @@ EOF
 fi
 done
 
-echo "$as_me:23155: checking for working mkstemp" >&5
+echo "$as_me:23182: 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
@@ -23163,7 +23190,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23166 "configure"
+#line 23193 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23198,15 +23225,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23204: \$? = $ac_status" >&5
+  echo "$as_me:23231: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23209: \$? = $ac_status" >&5
+  echo "$as_me:23236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23221,16 +23248,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23251: 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:23227: checking for mkstemp" >&5
+	echo "$as_me:23254: 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 23233 "configure"
+#line 23260 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23261,16 +23288,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23291: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23267: \$? = $ac_status" >&5
+  echo "$as_me:23294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23273: \$? = $ac_status" >&5
+  echo "$as_me:23300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23280,7 +23307,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23310: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23301,21 +23328,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23304: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23331: 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:23307: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23334: 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:23313: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23340: 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 23318 "configure"
+#line 23345 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23332,15 +23359,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23362: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23338: \$? = $ac_status" >&5
+  echo "$as_me:23365: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23343: \$? = $ac_status" >&5
+  echo "$as_me:23370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23353,7 +23380,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23383: 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
 
@@ -23364,13 +23391,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23367: checking for intptr_t" >&5
+echo "$as_me:23394: 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 23373 "configure"
+#line 23400 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23385,16 +23412,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23391: \$? = $ac_status" >&5
+  echo "$as_me:23418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23397: \$? = $ac_status" >&5
+  echo "$as_me:23424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23404,7 +23431,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23407: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23434: 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
   :
@@ -23416,13 +23443,13 @@ EOF
 
 fi
 
-echo "$as_me:23419: checking for ssize_t" >&5
+echo "$as_me:23446: 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 23425 "configure"
+#line 23452 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23437,16 +23464,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23443: \$? = $ac_status" >&5
+  echo "$as_me:23470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23449: \$? = $ac_status" >&5
+  echo "$as_me:23476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23456,7 +23483,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23459: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23486: 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
   :
@@ -23468,14 +23495,14 @@ EOF
 
 fi
 
-echo "$as_me:23471: checking for type sigaction_t" >&5
+echo "$as_me:23498: 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 23478 "configure"
+#line 23505 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23488,16 +23515,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23494: \$? = $ac_status" >&5
+  echo "$as_me:23521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23500: \$? = $ac_status" >&5
+  echo "$as_me:23527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23508,14 +23535,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23538: 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:23518: checking declaration of size-change" >&5
+echo "$as_me:23545: 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
@@ -23536,7 +23563,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23539 "configure"
+#line 23566 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23586,16 +23613,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23592: \$? = $ac_status" >&5
+  echo "$as_me:23619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23598: \$? = $ac_status" >&5
+  echo "$as_me:23625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23614,7 +23641,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
+echo "$as_me:23644: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23632,13 +23659,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23635: checking for memmove" >&5
+echo "$as_me:23662: 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 23641 "configure"
+#line 23668 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23669,16 +23696,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23675: \$? = $ac_status" >&5
+  echo "$as_me:23702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23681: \$? = $ac_status" >&5
+  echo "$as_me:23708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23688,19 +23715,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23691: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23718: 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:23697: checking for bcopy" >&5
+echo "$as_me:23724: 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 23703 "configure"
+#line 23730 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23731,16 +23758,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23737: \$? = $ac_status" >&5
+  echo "$as_me:23764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23743: \$? = $ac_status" >&5
+  echo "$as_me:23770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23750,11 +23777,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23753: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23780: 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:23757: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23784: 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
@@ -23764,7 +23791,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23767 "configure"
+#line 23794 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23780,15 +23807,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23786: \$? = $ac_status" >&5
+  echo "$as_me:23813: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23791: \$? = $ac_status" >&5
+  echo "$as_me:23818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23801,7 +23828,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23831: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23828,13 +23855,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23831: checking for $ac_func" >&5
+echo "$as_me:23858: 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 23837 "configure"
+#line 23864 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23865,16 +23892,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23871: \$? = $ac_status" >&5
+  echo "$as_me:23898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23877: \$? = $ac_status" >&5
+  echo "$as_me:23904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23884,7 +23911,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23914: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23894,7 +23921,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23897: checking if poll really works" >&5
+echo "$as_me:23924: 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
@@ -23904,7 +23931,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23907 "configure"
+#line 23934 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23957,15 +23984,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23963: \$? = $ac_status" >&5
+  echo "$as_me:23990: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23968: \$? = $ac_status" >&5
+  echo "$as_me:23995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -23977,21 +24004,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:23980: result: $cf_cv_working_poll" >&5
+echo "$as_me:24007: 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:23987: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24014: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23994 "configure"
+#line 24021 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24011,16 +24038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24017: \$? = $ac_status" >&5
+  echo "$as_me:24044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24023: \$? = $ac_status" >&5
+  echo "$as_me:24050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24030,7 +24057,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24060: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24040,18 +24067,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24070: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24047: checking for va_copy" >&5
+echo "$as_me:24074: 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 24054 "configure"
+#line 24081 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24068,16 +24095,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24074: \$? = $ac_status" >&5
+  echo "$as_me:24101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24080: \$? = $ac_status" >&5
+  echo "$as_me:24107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24087,7 +24114,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24117: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24099,14 +24126,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24102: checking for __va_copy" >&5
+echo "$as_me:24129: 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 24109 "configure"
+#line 24136 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24123,16 +24150,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24129: \$? = $ac_status" >&5
+  echo "$as_me:24156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24135: \$? = $ac_status" >&5
+  echo "$as_me:24162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24142,7 +24169,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24172: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24154,14 +24181,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24157: checking for __builtin_va_copy" >&5
+echo "$as_me:24184: 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 24164 "configure"
+#line 24191 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24178,16 +24205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24184: \$? = $ac_status" >&5
+  echo "$as_me:24211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24190: \$? = $ac_status" >&5
+  echo "$as_me:24217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24197,7 +24224,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24200: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24227: 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 &&
@@ -24215,14 +24242,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24218: checking if we can simply copy va_list" >&5
+	echo "$as_me:24245: 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 24225 "configure"
+#line 24252 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24239,16 +24266,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24245: \$? = $ac_status" >&5
+  echo "$as_me:24272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24251: \$? = $ac_status" >&5
+  echo "$as_me:24278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24258,19 +24285,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24261: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24288: 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:24266: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24293: 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 24273 "configure"
+#line 24300 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24287,16 +24314,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24293: \$? = $ac_status" >&5
+  echo "$as_me:24320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24299: \$? = $ac_status" >&5
+  echo "$as_me:24326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24306,7 +24333,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24309: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24336: 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
@@ -24317,13 +24344,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24320: checking for pid_t" >&5
+echo "$as_me:24347: 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 24326 "configure"
+#line 24353 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24338,16 +24365,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24344: \$? = $ac_status" >&5
+  echo "$as_me:24371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24350: \$? = $ac_status" >&5
+  echo "$as_me:24377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24357,7 +24384,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24360: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24387: 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
   :
@@ -24372,23 +24399,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24375: checking for $ac_header" >&5
+echo "$as_me:24402: 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 24381 "configure"
+#line 24408 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24412: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24391: \$? = $ac_status" >&5
+  echo "$as_me:24418: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24407,7 +24434,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24437: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24420,13 +24447,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24423: checking for $ac_func" >&5
+echo "$as_me:24450: 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 24429 "configure"
+#line 24456 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24457,16 +24484,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24463: \$? = $ac_status" >&5
+  echo "$as_me:24490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24469: \$? = $ac_status" >&5
+  echo "$as_me:24496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24476,7 +24503,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24488,7 +24515,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24491: checking for working fork" >&5
+  echo "$as_me:24518: 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
@@ -24511,15 +24538,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24517: \$? = $ac_status" >&5
+  echo "$as_me:24544: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24522: \$? = $ac_status" >&5
+  echo "$as_me:24549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24531,7 +24558,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24561: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24545,12 +24572,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24548: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24575: 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:24553: checking for working vfork" >&5
+  echo "$as_me:24580: 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
@@ -24559,7 +24586,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24562 "configure"
+#line 24589 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24652,15 +24679,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24658: \$? = $ac_status" >&5
+  echo "$as_me:24685: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24663: \$? = $ac_status" >&5
+  echo "$as_me:24690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24672,13 +24699,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24675: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24702: 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:24681: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24708: 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
 
@@ -24703,7 +24730,7 @@ EOF
 
 fi
 
-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24733: 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
@@ -24713,7 +24740,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24716 "configure"
+#line 24743 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24748,15 +24775,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24754: \$? = $ac_status" >&5
+  echo "$as_me:24781: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24759: \$? = $ac_status" >&5
+  echo "$as_me:24786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24769,7 +24796,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24799: 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
@@ -24778,7 +24805,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24781: checking for openpty in -lutil" >&5
+echo "$as_me:24808: 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
@@ -24786,7 +24813,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24789 "configure"
+#line 24816 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24805,16 +24832,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24811: \$? = $ac_status" >&5
+  echo "$as_me:24838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24817: \$? = $ac_status" >&5
+  echo "$as_me:24844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24825,7 +24852,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24828: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24855: 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
@@ -24833,7 +24860,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24836: checking for openpty header" >&5
+echo "$as_me:24863: 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
@@ -24860,7 +24887,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24863 "configure"
+#line 24890 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24878,16 +24905,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24884: \$? = $ac_status" >&5
+  echo "$as_me:24911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24890: \$? = $ac_status" >&5
+  echo "$as_me:24917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24905,7 +24932,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24935: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -24978,7 +25005,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24981 "configure"
+#line 25008 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24990,16 +25017,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24996: \$? = $ac_status" >&5
+  echo "$as_me:25023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25002: \$? = $ac_status" >&5
+  echo "$as_me:25029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25016,7 +25043,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25046: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25052,7 +25079,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25082: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25063,7 +25090,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25093: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25135,7 +25162,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25138 "configure"
+#line 25165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25147,16 +25174,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25153: \$? = $ac_status" >&5
+  echo "$as_me:25180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25159: \$? = $ac_status" >&5
+  echo "$as_me:25186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25173,7 +25200,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25203: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25253,7 +25280,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25283: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25270,23 +25297,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25273: checking for db.h" >&5
+echo "$as_me:25300: 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 25279 "configure"
+#line 25306 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25289: \$? = $ac_status" >&5
+  echo "$as_me:25316: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25305,11 +25332,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25335: 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:25312: checking for version of db" >&5
+echo "$as_me:25339: 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
@@ -25320,10 +25347,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25350: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25326 "configure"
+#line 25353 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25353,16 +25380,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25359: \$? = $ac_status" >&5
+  echo "$as_me:25386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25365: \$? = $ac_status" >&5
+  echo "$as_me:25392: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25376,16 +25403,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25406: 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:25383: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25410: 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:25388: checking for db libraries" >&5
+echo "$as_me:25415: 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
@@ -25415,10 +25442,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25445: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25421 "configure"
+#line 25448 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25473,16 +25500,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25479: \$? = $ac_status" >&5
+  echo "$as_me:25506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25485: \$? = $ac_status" >&5
+  echo "$as_me:25512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25502,11 +25529,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25532: 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:25509: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25536: 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
@@ -25532,7 +25559,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25562: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25547,7 +25574,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25550: checking if we should include stdbool.h" >&5
+echo "$as_me:25577: 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
@@ -25555,7 +25582,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25558 "configure"
+#line 25585 "configure"
 #include "confdefs.h"
 
 int
@@ -25567,23 +25594,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25573: \$? = $ac_status" >&5
+  echo "$as_me:25600: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25579: \$? = $ac_status" >&5
+  echo "$as_me:25606: \$? = $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 25586 "configure"
+#line 25613 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25599,16 +25626,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25605: \$? = $ac_status" >&5
+  echo "$as_me:25632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:25638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25622,13 +25649,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25625: result: yes" >&5
+then	echo "$as_me:25652: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25627: result: no" >&5
+else	echo "$as_me:25654: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25631: checking for builtin bool type" >&5
+echo "$as_me:25658: 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
@@ -25636,7 +25663,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25639 "configure"
+#line 25666 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25651,16 +25678,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25657: \$? = $ac_status" >&5
+  echo "$as_me:25684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25663: \$? = $ac_status" >&5
+  echo "$as_me:25690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25673,9 +25700,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25676: result: yes" >&5
+then	echo "$as_me:25703: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25678: result: no" >&5
+else	echo "$as_me:25705: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25692,10 +25719,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25695: checking if we already have C++ library" >&5
+	echo "$as_me:25722: 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 25698 "configure"
+#line 25725 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25709,16 +25736,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25715: \$? = $ac_status" >&5
+  echo "$as_me:25742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25721: \$? = $ac_status" >&5
+  echo "$as_me:25748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25727,7 +25754,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25757: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25746,7 +25773,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25776: 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
@@ -25772,7 +25799,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25775 "configure"
+#line 25802 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25786,16 +25813,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25792: \$? = $ac_status" >&5
+  echo "$as_me:25819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25798: \$? = $ac_status" >&5
+  echo "$as_me:25825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25807,7 +25834,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25837: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25829,7 +25856,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25859: 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
@@ -25844,15 +25871,15 @@ CF_EOF
 # 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:25847: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25850: \$? = $ac_status" >&5
+  echo "$as_me:25877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25855: \$? = $ac_status" >&5
+  echo "$as_me:25882: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25863,10 +25890,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25866: result: yes" >&5
+  echo "$as_me:25893: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25869: result: no" >&5
+  echo "$as_me:25896: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25886,7 +25913,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25916: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25907,7 +25934,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25910 "configure"
+#line 25937 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25921,16 +25948,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25927: \$? = $ac_status" >&5
+  echo "$as_me:25954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25933: \$? = $ac_status" >&5
+  echo "$as_me:25960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25967,7 +25994,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25970 "configure"
+#line 25997 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -25981,16 +26008,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:26014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25993: \$? = $ac_status" >&5
+  echo "$as_me:26020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26023,7 +26050,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26026: result: $cf_cxx_library" >&5
+	echo "$as_me:26053: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26039,7 +26066,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26042: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26069: 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
@@ -26056,18 +26083,18 @@ do
   # 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 26059 "configure"
+#line 26086 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26091: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26070: \$? = $ac_status" >&5
+  echo "$as_me:26097: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26090,17 +26117,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26093 "configure"
+#line 26120 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26124: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26130: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26137,7 +26164,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26140: result: $CXXCPP" >&5
+echo "$as_me:26167: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26147,18 +26174,18 @@ do
   # 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 26150 "configure"
+#line 26177 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26161: \$? = $ac_status" >&5
+  echo "$as_me:26188: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26181,17 +26208,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26184 "configure"
+#line 26211 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26215: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26194: \$? = $ac_status" >&5
+  echo "$as_me:26221: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26219,7 +26246,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26249: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26234,23 +26261,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26237: checking for $ac_header" >&5
+echo "$as_me:26264: 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 26243 "configure"
+#line 26270 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26274: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26253: \$? = $ac_status" >&5
+  echo "$as_me:26280: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26269,7 +26296,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26299: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26282,23 +26309,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26285: checking for $ac_header" >&5
+echo "$as_me:26312: 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 26291 "configure"
+#line 26318 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26301: \$? = $ac_status" >&5
+  echo "$as_me:26328: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26317,7 +26344,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26328,10 +26355,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26331: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26358: 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 26334 "configure"
+#line 26361 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26348,16 +26375,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26354: \$? = $ac_status" >&5
+  echo "$as_me:26381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26360: \$? = $ac_status" >&5
+  echo "$as_me:26387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26366,7 +26393,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26396: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26377,7 +26404,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26380: checking if we should include stdbool.h" >&5
+echo "$as_me:26407: 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
@@ -26385,7 +26412,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26388 "configure"
+#line 26415 "configure"
 #include "confdefs.h"
 
 int
@@ -26397,23 +26424,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26403: \$? = $ac_status" >&5
+  echo "$as_me:26430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26409: \$? = $ac_status" >&5
+  echo "$as_me:26436: \$? = $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 26416 "configure"
+#line 26443 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26429,16 +26456,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26459: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26435: \$? = $ac_status" >&5
+  echo "$as_me:26462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26441: \$? = $ac_status" >&5
+  echo "$as_me:26468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26452,13 +26479,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26455: result: yes" >&5
+then	echo "$as_me:26482: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26457: result: no" >&5
+else	echo "$as_me:26484: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26461: checking for builtin bool type" >&5
+echo "$as_me:26488: 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
@@ -26466,7 +26493,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26469 "configure"
+#line 26496 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26481,16 +26508,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26487: \$? = $ac_status" >&5
+  echo "$as_me:26514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26493: \$? = $ac_status" >&5
+  echo "$as_me:26520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26503,19 +26530,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26506: result: yes" >&5
+then	echo "$as_me:26533: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26508: result: no" >&5
+else	echo "$as_me:26535: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26512: checking for bool" >&5
+echo "$as_me:26539: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26518 "configure"
+#line 26545 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26550,16 +26577,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26556: \$? = $ac_status" >&5
+  echo "$as_me:26583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26562: \$? = $ac_status" >&5
+  echo "$as_me:26589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26569,10 +26596,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
+echo "$as_me:26599: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26575: checking size of bool" >&5
+echo "$as_me:26602: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26581,7 +26608,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26584 "configure"
+#line 26611 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26613,21 +26640,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26619: \$? = $ac_status" >&5
+  echo "$as_me:26646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26625: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26630 "configure"
+#line 26657 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26659,16 +26686,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26665: \$? = $ac_status" >&5
+  echo "$as_me:26692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26671: \$? = $ac_status" >&5
+  echo "$as_me:26698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26684,7 +26711,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26687 "configure"
+#line 26714 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26716,16 +26743,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26722: \$? = $ac_status" >&5
+  echo "$as_me:26749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26728: \$? = $ac_status" >&5
+  echo "$as_me:26755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26741,7 +26768,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26744 "configure"
+#line 26771 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26773,16 +26800,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26779: \$? = $ac_status" >&5
+  echo "$as_me:26806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26785: \$? = $ac_status" >&5
+  echo "$as_me:26812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26795,12 +26822,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26798: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26825: 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 26803 "configure"
+#line 26830 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26836,15 +26863,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26842: \$? = $ac_status" >&5
+  echo "$as_me:26869: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26847: \$? = $ac_status" >&5
+  echo "$as_me:26874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26860,13 +26887,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26890: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26869: checking for type of bool" >&5
+echo "$as_me:26896: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26885,7 +26912,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26888 "configure"
+#line 26915 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26926,15 +26953,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26932: \$? = $ac_status" >&5
+  echo "$as_me:26959: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26937: \$? = $ac_status" >&5
+  echo "$as_me:26964: \$? = $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
@@ -26951,19 +26978,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26981: 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:26961: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26988: 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:26966: checking for special defines needed for etip.h" >&5
+echo "$as_me:26993: 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"
@@ -26981,7 +27008,7 @@ do
 	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 26984 "configure"
+#line 27011 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -26995,16 +27022,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27001: \$? = $ac_status" >&5
+  echo "$as_me:27028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27007: \$? = $ac_status" >&5
+  echo "$as_me:27034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27025,12 +27052,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27055: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27060: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27047,7 +27074,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27050 "configure"
+#line 27077 "configure"
 #include "confdefs.h"
 
 class base
@@ -27066,15 +27093,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27072: \$? = $ac_status" >&5
+  echo "$as_me:27099: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27077: \$? = $ac_status" >&5
+  echo "$as_me:27104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27093,7 +27120,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27123: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27102,7 +27129,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27132: 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
@@ -27119,7 +27146,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27122 "configure"
+#line 27149 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27138,15 +27165,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27144: \$? = $ac_status" >&5
+  echo "$as_me:27171: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27149: \$? = $ac_status" >&5
+  echo "$as_me:27176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27165,7 +27192,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27195: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27175,7 +27202,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27205: 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
@@ -27189,7 +27216,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27192 "configure"
+#line 27219 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27233,16 +27260,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27239: \$? = $ac_status" >&5
+  echo "$as_me:27266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27245: \$? = $ac_status" >&5
+  echo "$as_me:27272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27260,7 +27287,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27290: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27309,13 +27336,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27312: checking for bool" >&5
+echo "$as_me:27339: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27318 "configure"
+#line 27345 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27350,16 +27377,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27356: \$? = $ac_status" >&5
+  echo "$as_me:27383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27362: \$? = $ac_status" >&5
+  echo "$as_me:27389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27369,10 +27396,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
+echo "$as_me:27399: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27375: checking size of bool" >&5
+echo "$as_me:27402: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27381,7 +27408,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27384 "configure"
+#line 27411 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27413,21 +27440,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27419: \$? = $ac_status" >&5
+  echo "$as_me:27446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27425: \$? = $ac_status" >&5
+  echo "$as_me:27452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27430 "configure"
+#line 27457 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27459,16 +27486,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27465: \$? = $ac_status" >&5
+  echo "$as_me:27492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27471: \$? = $ac_status" >&5
+  echo "$as_me:27498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27484,7 +27511,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27487 "configure"
+#line 27514 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27516,16 +27543,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27522: \$? = $ac_status" >&5
+  echo "$as_me:27549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27528: \$? = $ac_status" >&5
+  echo "$as_me:27555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27541,7 +27568,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27544 "configure"
+#line 27571 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27573,16 +27600,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27579: \$? = $ac_status" >&5
+  echo "$as_me:27606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27585: \$? = $ac_status" >&5
+  echo "$as_me:27612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27595,12 +27622,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27598: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27625: 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 27603 "configure"
+#line 27630 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27636,15 +27663,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27642: \$? = $ac_status" >&5
+  echo "$as_me:27669: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27647: \$? = $ac_status" >&5
+  echo "$as_me:27674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27660,13 +27687,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27690: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27669: checking for type of bool" >&5
+echo "$as_me:27696: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27685,7 +27712,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27688 "configure"
+#line 27715 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27726,15 +27753,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27732: \$? = $ac_status" >&5
+  echo "$as_me:27759: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27737: \$? = $ac_status" >&5
+  echo "$as_me:27764: \$? = $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
@@ -27751,26 +27778,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27781: 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:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27788: 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:27767: checking for fallback type of bool" >&5
+			echo "$as_me:27794: 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:27773: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27800: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27799,7 +27826,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27802: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27829: 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
@@ -27810,7 +27837,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27840: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27827,10 +27854,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27830: result: $ADAFLAGS" >&5
+	echo "$as_me:27857: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27860: 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
@@ -27840,11 +27867,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27843: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27870: 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:27847: checking if GNAT supports generics" >&5
+echo "$as_me:27874: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27854,7 +27881,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27857: result: $cf_gnat_generics" >&5
+echo "$as_me:27884: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27866,7 +27893,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27896: 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
@@ -27914,7 +27941,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27944: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27927,7 +27954,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27930: checking if GNAT supports project files" >&5
+echo "$as_me:27957: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -27990,15 +28017,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:27993: result: $cf_gnat_projects" >&5
+echo "$as_me:28020: 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:27999: checking if GNAT supports libraries" >&5
+	echo "$as_me:28026: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28028: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28018,7 +28045,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28048: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28030,7 +28057,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28033: checking for Ada95 compiler" >&5
+echo "$as_me:28060: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28041,12 +28068,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28044: result: $cf_ada_compiler" >&5
+echo "$as_me:28071: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28049: checking for Ada95 include directory" >&5
+echo "$as_me:28076: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28080,7 +28107,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28110: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28089,10 +28116,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28092: result: $ADA_INCLUDE" >&5
+echo "$as_me:28119: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28095: checking for Ada95 object directory" >&5
+echo "$as_me:28122: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28126,7 +28153,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28156: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28135,10 +28162,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28138: result: $ADA_OBJECTS" >&5
+echo "$as_me:28165: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28141: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28168: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28159,11 +28186,11 @@ then
 	fi
 fi
 
-echo "$as_me:28162: result: $with_ada_sharedlib" >&5
+echo "$as_me:28189: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28166: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28193: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28181,7 +28208,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28184: checking for Ada95 curses library name" >&5
+echo "$as_me:28211: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28197,7 +28224,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28200: result: $ADA_LIBNAME" >&5
+echo "$as_me:28227: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28208,13 +28235,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28211: checking for wchar_t" >&5
+	echo "$as_me:28238: 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 28217 "configure"
+#line 28244 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28229,16 +28256,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28235: \$? = $ac_status" >&5
+  echo "$as_me:28262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28241: \$? = $ac_status" >&5
+  echo "$as_me:28268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28248,10 +28275,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28278: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28254: checking size of wchar_t" >&5
+echo "$as_me:28281: 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
@@ -28260,7 +28287,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28263 "configure"
+#line 28290 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28272,21 +28299,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28278: \$? = $ac_status" >&5
+  echo "$as_me:28305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28284: \$? = $ac_status" >&5
+  echo "$as_me:28311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28289 "configure"
+#line 28316 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28298,16 +28325,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28304: \$? = $ac_status" >&5
+  echo "$as_me:28331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28310: \$? = $ac_status" >&5
+  echo "$as_me:28337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28323,7 +28350,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28326 "configure"
+#line 28353 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28335,16 +28362,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28341: \$? = $ac_status" >&5
+  echo "$as_me:28368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28347: \$? = $ac_status" >&5
+  echo "$as_me:28374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28360,7 +28387,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28363 "configure"
+#line 28390 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28372,16 +28399,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28378: \$? = $ac_status" >&5
+  echo "$as_me:28405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28384: \$? = $ac_status" >&5
+  echo "$as_me:28411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28394,12 +28421,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28397: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28424: 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 28402 "configure"
+#line 28429 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28415,15 +28442,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28421: \$? = $ac_status" >&5
+  echo "$as_me:28448: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28426: \$? = $ac_status" >&5
+  echo "$as_me:28453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28439,7 +28466,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28442: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28469: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28452,7 +28479,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28482: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28470,7 +28497,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28473: checking for library subsets" >&5
+echo "$as_me:28500: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28524,7 +28551,7 @@ fi
 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:28527: result: $LIB_SUBSETS" >&5
+echo "$as_me:28554: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28555,7 +28582,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28558: checking default library suffix" >&5
+echo "$as_me:28585: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28566,10 +28593,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28596: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28572: checking default library-dependency suffix" >&5
+echo "$as_me:28599: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28652,10 +28679,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28655: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28682: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28658: checking default object directory" >&5
+echo "$as_me:28685: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28671,11 +28698,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28701: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28678: checking c++ library-dependency suffix" >&5
+echo "$as_me:28705: 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++)
@@ -28768,7 +28795,7 @@ else
 	fi
 
 fi
-echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28798: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28944,19 +28971,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28947: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28974: 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 <<EOF
-#line 28952 "configure"
+#line 28979 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28956: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28959: \$? = $ac_status" >&5
+  echo "$as_me:28986: \$? = $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
@@ -28967,10 +28994,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28970 "configure"
+#line 28997 "configure"
 #include "confdefs.h"
 
-#line 28973 "configure"
+#line 29000 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -28985,16 +29012,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28991: \$? = $ac_status" >&5
+  echo "$as_me:29018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28997: \$? = $ac_status" >&5
+  echo "$as_me:29024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29017,7 +29044,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29020: result: $cf_ldflags_static" >&5
+	echo "$as_me:29047: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29033,7 +29060,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29036: checking where we will install curses.h" >&5
+echo "$as_me:29063: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29043,7 +29070,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29073: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29051,7 +29078,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29054: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29081: 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
@@ -29076,7 +29103,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29079: checking for desired basename for form library" >&5
+echo "$as_me:29106: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29096,10 +29123,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29099: result: $FORM_NAME" >&5
+echo "$as_me:29126: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29102: checking for desired basename for menu library" >&5
+echo "$as_me:29129: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29119,10 +29146,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29122: result: $MENU_NAME" >&5
+echo "$as_me:29149: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29125: checking for desired basename for panel library" >&5
+echo "$as_me:29152: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29142,10 +29169,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29145: result: $PANEL_NAME" >&5
+echo "$as_me:29172: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29148: checking for desired basename for cxx library" >&5
+echo "$as_me:29175: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29165,13 +29192,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29168: result: $CXX_NAME" >&5
+echo "$as_me:29195: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29174: checking for src modules" >&5
+echo "$as_me:29201: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29230,7 +29257,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29233: result: $cf_cv_src_modules" >&5
+echo "$as_me:29260: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29391,7 +29418,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29394: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29421: 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//'`
@@ -29402,7 +29429,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29405: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29432: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29418,7 +29445,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29421: result: $PKG_CFLAGS" >&5
+echo "$as_me:29448: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29490,7 +29517,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29520: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29517,7 +29544,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29520: checking for linker search path" >&5
+echo "$as_me:29547: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29565,7 +29592,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29595: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29606,7 +29633,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29609: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29636: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29692,7 +29719,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29722: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29873,7 +29900,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29876: error: ambiguous option: $1
+    { { echo "$as_me:29903: 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;}
@@ -29892,7 +29919,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29895: error: unrecognized option: $1
+  -*) { { echo "$as_me:29922: 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;}
@@ -29938,6 +29965,8 @@ DFT_LWR_MODEL="$DFT_LWR_MODEL"
 ECHO_LD="$ECHO_LD"
 EXTRA_SUFFIX="$EXTRA_SUFFIX"
 FORM_NAME="$FORM_NAME"
+GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
+GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
 LDCONFIG="$LDCONFIG"
 LIBTOOL_VERSION="$LIBTOOL_VERSION"
 LIB_NAME="$LIB_NAME"
@@ -30022,7 +30051,7 @@ do
   "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:30025: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30054: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30190,6 +30219,7 @@ s,@NM@,$NM,;t t
 s,@ac_ct_NM@,$ac_ct_NM,;t t
 s,@ARFLAGS@,$ARFLAGS,;t t
 s,@DESTDIR@,$DESTDIR,;t t
+s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
 s,@BUILD_CC@,$BUILD_CC,;t t
 s,@BUILD_CPP@,$BUILD_CPP,;t t
 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
@@ -30546,7 +30576,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30549: creating $ac_file" >&5
+    { echo "$as_me:30579: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30564,7 +30594,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30597: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30577,7 +30607,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30580: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30610: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30593,7 +30623,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30596: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30626: 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;}
@@ -30602,7 +30632,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30605: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30635: 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;}
@@ -30647,7 +30677,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30650: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30680: 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;}
@@ -30658,7 +30688,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30661: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30691: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30707,7 +30737,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30740: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30718,7 +30748,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30751: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30731,7 +30761,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30734: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30764: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30789,7 +30819,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30792: $ac_file is unchanged" >&5
+      { echo "$as_me:30822: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31176,7 +31206,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31209: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 76bd06d85..a15756d3d 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 tom Exp $
+dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.783 $)
+AC_REVISION($Revision: 1.785 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -265,20 +265,7 @@ AC_CHECK_TOOL(AR, ar, ar)
 AC_CHECK_TOOL(NM, nm, nm)
 CF_AR_FLAGS
 
-dnl Special option for use by system-builders: the install-prefix is used to
-dnl adjust the location into which the actual install is done, so that an
-dnl archive can be built without modifying the host system's configuration.
-AC_MSG_CHECKING(for an installation directory prefix)
-AC_ARG_WITH(install-prefix,
-	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
-	[case "x$withval" in
-	(xyes|xno)
-		;;
-	(*)	DESTDIR="$withval"
-		;;
-	esac])
-AC_MSG_RESULT([${DESTDIR:-(none)}])
-AC_SUBST(DESTDIR)
+CF_INSTALL_PREFIX
 
 ###############################################################################
 CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
@@ -2553,6 +2540,8 @@ DFT_LWR_MODEL="$DFT_LWR_MODEL"
 ECHO_LD="$ECHO_LD"
 EXTRA_SUFFIX="$EXTRA_SUFFIX"
 FORM_NAME="$FORM_NAME"
+GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
+GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
 LDCONFIG="$LDCONFIG"
 LIBTOOL_VERSION="$LIBTOOL_VERSION"
 LIB_NAME="$LIB_NAME"
diff --git a/dist.mk b/dist.mk
index 60831b525..a097f1612 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1626 2024/08/10 09:45:21 tom Exp $
+# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240810
+NCURSES_PATCH = 20240817
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/form/Makefile.in b/form/Makefile.in
index a950a3e8a..2216972a2 100644
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.72 2021/07/03 15:45:33 tom Exp $
+# $Id: Makefile.in,v 1.74 2024/08/11 00:51:41 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -61,7 +61,9 @@ libdir		= @libdir@
 includedir	= @includedir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -153,8 +155,8 @@ install ::	$(AUTO_SRC) $(LIBRARIES)
 
 sources :	$(AUTO_SRC)
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) :
+$(BINDIR) \
+$(LIBDIR) :
 	mkdir -p $@
 
 # make copies to simplify include-paths while still keeping form's include
diff --git a/include/Makefile.in b/include/Makefile.in
index 351383b0e..4a46cd22a 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.53 2021/07/03 18:56:51 tom Exp $
+# $Id: Makefile.in,v 1.54 2024/08/10 18:19:10 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2013,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -51,7 +51,7 @@ exec_prefix	= @exec_prefix@
 includedir	= @includedir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
diff --git a/man/Makefile.in b/man/Makefile.in
index 9d08a7eed..877068945 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.54 2022/10/22 16:36:40 tom Exp $
+# $Id: Makefile.in,v 1.55 2024/08/10 18:19:16 tom Exp $
 ##############################################################################
-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2013,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -47,7 +47,8 @@ datadir		= @datadir@
 mandir		= @mandir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+MANDIR		= $(DESTDIR)$(mandir@MERGE_PREFIX@)
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -72,12 +73,12 @@ sources :	terminfo.5
 depend :
 tags :
 
-$(DESTDIR)$(mandir) :
+$(MANDIR) :
 	mkdir -p $@
 
-EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
+EDITARGS = $(MANDIR) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
 
-install install.man : terminfo.5 $(DESTDIR)$(mandir)
+install install.man : terminfo.5 $(MANDIR)
 	$(SHELL) ../edit_man.sh normal installing $(EDITARGS)
 
 uninstall uninstall.man :
diff --git a/menu/Makefile.in b/menu/Makefile.in
index b623bf0ee..a91eb4000 100644
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.71 2021/07/03 15:45:33 tom Exp $
+# $Id: Makefile.in,v 1.72 2024/08/11 00:51:30 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -61,7 +61,9 @@ libdir		= @libdir@
 includedir	= @includedir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -155,8 +157,8 @@ install ::	$(AUTO_SRC) $(LIBRARIES)
 
 sources :	$(AUTO_SRC)
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) :
+$(BINDIR) \
+$(LIBDIR) :
 	mkdir -p $@
 
 # make copies to simplify include-paths while still keeping menu's include
diff --git a/misc/Makefile.in b/misc/Makefile.in
index f83dddc19..1a382c2d2 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
+# $Id: Makefile.in,v 1.83 2024/08/10 18:06:18 tom Exp $
 ##############################################################################
 # Copyright 2018-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
@@ -61,7 +61,7 @@ datarootdir	= @datarootdir@
 datadir		= @datadir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
 
 tabsetdir	= $(datadir)/tabset
 ticdir		= @TERMINFO@
@@ -75,14 +75,16 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
-BINDIR		= $(DESTDIR)$(bindir)
-DATADIR		= $(DESTDIR)$(datadir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
 
-@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix)
-@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir)
-@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir)
-@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile)
-@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir)
+@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix@MERGE_PREFIX@)
+@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir@MERGE_PREFIX@)
+@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile@MERGE_PREFIX@)
+@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir@MERGE_PREFIX@)
+
+@MAKE_PC_FILES@INSTALL_CONFIG	= $(DESTDIR)$(PKG_CONFIG_LIBDIR@MERGE_PREFIX@)
 
 ################################################################################
 
@@ -152,11 +154,11 @@ install.libs :: $(BINDIR) ncurses-config
 @MAKE_PC_FILES@install.libs :: pc-files
 @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
 @MAKE_PC_FILES@		x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
-@MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+@MAKE_PC_FILES@			mkdir -p $(INSTALL_CONFIG); \
 @MAKE_PC_FILES@			for name in $(PC_FILES); do \
 @MAKE_PC_FILES@				test -f $$name || continue; \
 @MAKE_PC_FILES@				echo installing $$name; \
-@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(INSTALL_CONFIG)/$$name; \
 @MAKE_PC_FILES@			done \
 @MAKE_PC_FILES@			;; \
 @MAKE_PC_FILES@		*) \
@@ -197,12 +199,12 @@ uninstall.data :
 
 uninstall.libs :
 	-rm -f $(BINDIR)/$(NCURSES_CONFIG)
-@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
+@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(INSTALL_CONFIG) in \
 @MAKE_PC_FILES@	x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
 @MAKE_PC_FILES@		for name in $(PC_FILES); do \
 @MAKE_PC_FILES@			test -f $$name || continue; \
 @MAKE_PC_FILES@			echo uninstalling $$name; \
-@MAKE_PC_FILES@			rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@			rm -f $(INSTALL_CONFIG)/$$name; \
 @MAKE_PC_FILES@		done \
 @MAKE_PC_FILES@		;; \
 @MAKE_PC_FILES@	esac'
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 26e987a41..84d2c6ddd 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1146 $
-#	$Date: 2024/07/27 16:58:08 $
+#	$Revision: 1.1149 $
+#	$Date: 2024/08/17 22:45:40 $
 #
 # 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
@@ -7903,7 +7903,15 @@ kitty+setal|set underline colors (nonstandard),
 
 #### Foot
 # https://codeberg.org/dnkl/foot/
-# Version 1.8.2
+# Version 1.18.1 2024/08/17
+#
+# vttest:
+#	device attributes list 28=rectangular editing
+#	supports rectangle operations, but problems with left/right margins
+#	reports window-size, but not icon or window label
+#	numeric keypad has no application-mode
+#
+# Version 1.8.2 2021/07/31
 #
 # This identifies as a VT220 with 4=sixel and 22=color, however:
 # tack:
@@ -7940,20 +7948,25 @@ foot+base|foot base fragment,
 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
-	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec, rs2=\E[!p\E[4l\E>,
+	kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[4l\E>,
 	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, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=,
+	smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm,
+	rv=\E\\[>1;[0-9][0-9][0-9][0-9][0-9][0-9];0c,
+	xr=\EP>\\|foot\\([0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[a-f[0-9]
+	   +)?\\)?\E\\\\,
 	use=att610+cvis, use=ansi+csr, use=ansi+cup,
 	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
 	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
 	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
-	use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
-	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
-	use=xterm+sl-alt, use=bracketed+paste,
-	use=report+version, use=xterm+focus,
+	use=ecma+strikeout, use=kitty+setal, use=xterm+acs,
+	use=xterm+alt+title, use=xterm+pcfkeys,
+	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
+	use=bracketed+paste, use=report+version,
+	use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -7969,6 +7982,30 @@ foot+base|foot base fragment,
 # 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 AppImage for 3.2.0, on Fedora 40:
+# + appears to implement erase-display by painting a double-line on the screen,
+#   doesn't use full screen for ded though it sort-of works for vi.
+# + sets TERMINFO in its shell, and TERM=domterm-xterm which doesn't work when
+#   doing sudo.  According to the git log, that was April 1, 2023.  The VTE
+#   developers copied this feature (i.e., a partially workable private terminal
+#   database) in February 2024.
+# + the canonical name for the terminal description is still "domterm", and
+#   presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
+#   that look for "xterm".
+# + almost all of the differences between ncurses's "domterm" and DomTerm's
+#   are additions, but (read further) most are untestable due to breakage in
+#   the program.
+# + DomTerm's updated terminal description says it implements italics, but
+# + hangs in tack when doing blink (just before testing italics)
+# + vttest, ncurses test-program also fare badly, e.g., due to improper line
+#   wrapping and/or inability to consistently clear the screen.
+#
+# The review of DomTerm 3.2.0 was prompted by noticing this page
+#     https://domterm.org/Wire-byte-protocol.html
+# which goes on at length for extensions which collide with a commonly-used
+# control for restoring a saved cursor position:
+#     CSI u     Restore cursor (SCORC, also ANSI.SYS).
+#
 # Testing current code (2019/07/06) with Fedora 30:
 # tack
 #	no flash
@@ -27599,4 +27636,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ modify wezterm, omitting its broken left/right margin feature (report
 #	  by Thayne McCombs) -TD
 #
+# 2024-08-17
+#	+ review/update foot for 1.18.1 -TD
+#	+ add a note about DomTerm 3.2.0 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/mk-1st.awk b/mk-1st.awk
index 6a5eafab2..639de74a6 100644
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.125 2023/04/22 15:49:59 tom Exp $
+# $Id: mk-1st.awk,v 1.128 2024/08/11 09:04:32 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2023 Thomas E. Dickey                                  #
+# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -253,9 +253,9 @@ function shlib_install(directory) {
 	}
 function install_dll(directory,filename) {
 		src_name = sprintf("../lib/%s", filename);
-		dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename);
+		dst_name = sprintf("%s/%s", directory, filename);
 		printf "\t@echo installing %s as %s\n", src_name, dst_name
-		if ( directory == "$(bindir)" ) {
+		if ( directory == "$(BINDIR)" ) {
 			program = "$(INSTALL) -m 755";
 		} else {
 			program = "$(INSTALL_LIB)";
@@ -403,14 +403,14 @@ END	{
 
 				if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
 
-					dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
+					dst_dirs = "$(BINDIR) $(LIBDIR)";
 					printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
-					install_dll("$(bindir)",end_name);
-					install_dll("$(libdir)",imp_name);
+					install_dll("$(BINDIR)",end_name);
+					install_dll("$(LIBDIR)",imp_name);
 
 				} else {
 
-					lib_dir = "$(DESTDIR)$(libdir)";
+					lib_dir = "$(LIBDIR)";
 					printf "install.%s :: %s/%s\n", name, lib_dir, end_name
 					print ""
 					if ( ReLink == "yes" ) {
@@ -430,13 +430,13 @@ END	{
 						}
 						ovr_name = sprintf("%scurses%s.a", curses_prefix, suffix)
 						printf "\t@echo linking %s to %s\n", imp_name, ovr_name
-						printf "\tcd $(DESTDIR)$(libdir) && ("
+						printf "\tcd $(LIBDIR) && ("
 						symlink(imp_name, ovr_name)
 						printf ")\n"
 					} else {
 						ovr_name = sprintf("libcurses%s", suffix)
 						printf "\t@echo linking %s to %s\n", end_name, ovr_name
-						printf "\tcd $(DESTDIR)$(libdir) && ("
+						printf "\tcd $(LIBDIR) && ("
 						symlink(end_name, ovr_name)
 						printf ")\n"
 					}
@@ -450,19 +450,19 @@ END	{
 				printf "uninstall.%s ::\n", name
 				if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
 
-					printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
-					printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
+					printf "\t@echo uninstalling $(BINDIR)/%s\n", end_name
+					printf "\t-@rm -f $(BINDIR)/%s\n", end_name
 
-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", imp_name
-					printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", imp_name
+					printf "\t@echo uninstalling $(LIBDIR)/%s\n", imp_name
+					printf "\t-@rm -f $(LIBDIR)/%s\n", imp_name
 
 				} else {
-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", end_name
-					removelinks("$(DESTDIR)$(libdir)")
+					printf "\t@echo uninstalling $(LIBDIR)/%s\n", end_name
+					removelinks("$(LIBDIR)")
 					if ( overwrite == "yes" && name == "ncurses" )
 					{
 						ovr_name = sprintf("libcurses%s", suffix)
-						printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name
+						printf "\t-@rm -f $(LIBDIR)/%s\n", ovr_name
 					}
 				}
 				if ( rmSoLocs == "yes" ) {
@@ -503,7 +503,7 @@ END	{
 				print  "install \\"
 				print  "install.libs \\"
 				printf "install.%s :: \\\n", trim_suffix(name);
-				printf "\t\t$(DESTDIR)$(libdir) \\\n";
+				printf "\t\t$(LIBDIR) \\\n";
 				use_name = TermlibRoot USE_LIB_SUFFIX
 				if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
 					if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) {
@@ -514,14 +514,14 @@ END	{
 					}
 				}
 				printf "\t\t../lib/%s\n", lib_name
-				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
-				printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(DESTDIR)$(libdir)\n", lib_name
+				printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
+				printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(LIBDIR)\n", lib_name
 				print  ""
 				print  "uninstall \\"
 				print  "uninstall.libs \\"
 				printf "uninstall.%s ::\n", trim_suffix(name)
-				printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
-				printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
+				printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
+				printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(LIBDIR)/%s\n", lib_name
 			}
 			else
 			{
@@ -542,41 +542,41 @@ END	{
 				print  ""
 				print  "install \\"
 				print  "install.libs \\"
-				printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
-				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
-				printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+				printf "install.%s :: $(LIBDIR) ../lib/%s\n", name, lib_name
+				printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
+				printf "\t$(INSTALL_DATA) ../lib/%s $(LIBDIR)/%s\n", lib_name, lib_name
 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
 				{
 					printf "\t@echo linking libcurses.a to libncurses.a\n"
-					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
-					printf "\t(cd $(DESTDIR)$(libdir) && "
+					printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
+					printf "\t(cd $(LIBDIR) && "
 					symlink("libncurses.a", "libcurses.a")
 					printf ")\n"
 				}
 				if ( ReRanlib == "yes" )
 				{
-					printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
+					printf "\t$(RANLIB) $(LIBDIR)/%s\n", lib_name
 				}
 				if ( host == "vxworks" )
 				{
-					printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
-					printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(DESTDIR)$(libdir)/lib%s$o\n", name, name
+					printf "\t@echo installing ../lib/lib%s$o as $(LIBDIR)/lib%s$o\n", name, name
+					printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(LIBDIR)/lib%s$o\n", name, name
 				}
 				print  ""
 				print  "uninstall \\"
 				print  "uninstall.libs \\"
 				printf "uninstall.%s ::\n", name
-				printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
-				printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
+				printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
+				printf "\t-@rm -f $(LIBDIR)/%s\n", lib_name
 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
 				{
 					printf "\t@echo linking libcurses.a to libncurses.a\n"
-					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
+					printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
 				}
 				if ( host == "vxworks" )
 				{
-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s$o\n", name
-					printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s$o\n", name
+					printf "\t@echo uninstalling $(LIBDIR)/lib%s$o\n", name
+					printf "\t-@rm -f $(LIBDIR)/lib%s$o\n", name
 				}
 			}
 			print ""
diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index ae198df67..404a4e9f2 100644
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.184 2024/01/19 12:00:00 tom Exp $
+# $Id: Makefile.in,v 1.185 2024/08/10 18:07:57 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
@@ -69,7 +69,9 @@ datarootdir	= @datarootdir@
 datadir		= @datadir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -235,8 +237,8 @@ all libs ::	$(AUTO_SRC) ../lib $(LIBRARIES)
 
 sources:	$(AUTO_SRC)
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) :
+$(BINDIR) \
+$(LIBDIR) :
 	mkdir -p $@
 
 ../lib : ; mkdir $@
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index f38c725d4..17a647ef2 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240810) unstable; urgency=low
+ncurses6td (6.5+20240817) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index f38c725d4..17a647ef2 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240810) unstable; urgency=low
+ncurses6td (6.5+20240817) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 84bf8bab9..9048748d5 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240810) unstable; urgency=low
+ncurses6td (6.5+20240817) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 05:45:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index af9ddf155..b1af1d5b0 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0810"
+!define VERSION_MMDD  "0817"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e848f83da..ca3ca21db 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240810
+Release: 20240817
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1d8a6b437..a6b53eac4 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240810
+Release: 20240817
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 412f04fb8..e094d2b71 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240810
+Release: 20240817
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/panel/Makefile.in b/panel/Makefile.in
index 380f80cf2..8516611d9 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.76 2021/07/03 15:45:33 tom Exp $
+# $Id: Makefile.in,v 1.77 2024/08/10 18:19:45 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -63,7 +63,9 @@ datarootdir	= @datarootdir@
 datadir		= @datadir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -155,8 +157,8 @@ install ::	$(AUTO_SRC) $(LIBRARIES)
 
 sources:	$(AUTO_SRC)
 
-$(DESTDIR)$(bindir) \
-$(DESTDIR)$(libdir) :
+$(BINDIR) \
+$(LIBDIR) :
 	mkdir -p $@
 
 # make a copy to simplify include-paths while still keeping panel's include
diff --git a/progs/Makefile.in b/progs/Makefile.in
index 218e64e0c..a5d0798f7 100644
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.115 2024/04/08 18:33:54 tom Exp $
+# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
 ##############################################################################
 # Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
@@ -66,7 +66,8 @@ datarootdir	= @datarootdir@
 datadir		= @datadir@
 includesubdir	= @includesubdir@
 
-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
+INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
 
 PACKAGE		= @PACKAGE@
 
@@ -230,37 +231,37 @@ transform.h :
 	echo "#define PROG_INIT      \"$(define_init)\""		>>$@
 	echo "#endif /* __TRANSFORM_H */"				>>$@
 
-install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
-@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x     $(DESTDIR)$(bindir)/$(actual_tic)
-@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x     $(DESTDIR)$(bindir)/$(actual_toe)
+install.progs: $(AUTO_SRC) $(PROGS) $(BINDIR)
+@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x     $(BINDIR)/$(actual_tic)
+@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x     $(BINDIR)/$(actual_toe)
 @MAKE_TERMINFO@	@echo "linking $(actual_infotocap) to $(actual_tic)"
-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
-@MAKE_TERMINFO@	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) )
+@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_infotocap)
+@MAKE_TERMINFO@	( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_infotocap) )
 @MAKE_TERMINFO@	@echo "linking $(actual_captoinfo) to $(actual_tic)"
-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
-@MAKE_TERMINFO@	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(DESTDIR)$(bindir)/$(actual_tput)
-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
+@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_captoinfo)
+@MAKE_TERMINFO@	( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(BINDIR)/$(actual_infocmp)
+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(BINDIR)/$(actual_clear)
+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(BINDIR)/$(actual_tabs)
+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(BINDIR)/$(actual_tput)
+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(BINDIR)/$(actual_tset)
 	@echo "linking $(actual_reset) to $(actual_tset)"
-	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) )
+	-@rm -f $(BINDIR)/$(actual_reset)
+	( cd $(BINDIR) && $(LN_S) $(actual_tset) $(actual_reset) )
 
 uninstall.progs:
-@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
-@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_toe)
-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
-	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-
-$(DESTDIR)$(bindir) :
+@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tic)
+@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_toe)
+@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_captoinfo)
+@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_infotocap)
+	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_infocmp)
+	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_clear)
+	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tabs)
+	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tput)
+	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tset)
+	-@rm -f $(BINDIR)/$(actual_reset)
+
+$(BINDIR) :
 	mkdir -p $@
 
 #
diff --git a/test/Makefile.in b/test/Makefile.in
index 1d546285a..ac0468c27 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $
+# $Id: Makefile.in,v 1.131 2024/08/10 18:19:56 tom Exp $
 ##############################################################################
-# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -61,10 +61,10 @@ datadir		= @datadir@
 
 real_bindir	= $(libexecdir)/$(PACKAGE)
 
-BINDIR		= $(DESTDIR)$(bindir)
-LIBEXECDIR	= $(DESTDIR)$(libexecdir)
-LIBDIR		= $(DESTDIR)$(libdir)
-DATADIR		= $(DESTDIR)$(datadir)
+BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+LIBEXECDIR	= $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
+LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
 
 REAL_BINDIR	= $(LIBEXECDIR)/$(PACKAGE)
 
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 06c1a98dd..6b27fdd0e 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
+dnl $Id: aclocal.m4,v 1.228 2024/08/11 09:11:30 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -2390,6 +2390,40 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
+dnl -----------------
+dnl Special option for use by system-builders: the install-prefix is used to
+dnl adjust the location into which the actual install is done, so that an
+dnl archive can be built without modifying the host system's configuration.
+AC_DEFUN([CF_INSTALL_PREFIX],[
+AC_MSG_CHECKING(for an installation directory prefix)
+AC_ARG_WITH(install-prefix,
+	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
+	[case "x$withval" in
+	(xyes|xno)
+		;;
+	(*)	DESTDIR="$withval"
+		;;
+	esac])
+AC_MSG_RESULT([${DESTDIR:-(none)}])
+AC_SUBST(DESTDIR)
+
+AC_MSG_CHECKING(if installation directory prefix should be merged)
+CF_ARG_ENABLE(install-prefix,
+	[  --enable-install-prefix merge DESTDIR with installation prefix],
+	cf_install_prefix=yes,
+	cf_install_prefix=no)
+AC_MSG_RESULT($cf_install_prefix)
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
+
+AC_SUBST(MERGE_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
diff --git a/test/configure b/test/configure
index 3fab6778b..719adb5cb 100755
--- a/test/configure
+++ b/test/configure
@@ -711,6 +711,8 @@ General Options:
   --enable-string-hacks   work around bogus compiler/loader warnings
   --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
   --disable-echo          do not display "compiling" commands
+  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
+  --enable-install-prefix merge DESTDIR with installation prefix
 Curses Version-dependent Options:
   --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables
   --disable-widec         disable checks for wide-character functions
@@ -934,7 +936,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:937: loading site script $ac_site_file" >&5
+    { echo "$as_me:939: 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"
@@ -945,7 +947,7 @@ if test -r "$cache_file"; then
   # 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:948: loading cache $cache_file" >&5
+    { echo "$as_me:950: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -953,7 +955,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:956: creating cache $cache_file" >&5
+  { echo "$as_me:958: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -969,21 +971,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:972: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:974: 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:976: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:978: 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:982: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:984: 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:984:   former value:  $ac_old_val" >&5
+        { echo "$as_me:986:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:986:   current value: $ac_new_val" >&5
+        { echo "$as_me:988:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1002,9 +1004,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1005: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1007: 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:1007: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1009: 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
@@ -1033,10 +1035,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1039: \$? = $ac_status" >&5
+  echo "$as_me:1041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1068,7 +1070,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1073: 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
@@ -1078,11 +1080,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1083: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1085: checking build system type" >&5
+echo "$as_me:1087: 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
@@ -1091,23 +1093,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1096: 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:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1100: 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:1103: result: $ac_cv_build" >&5
+echo "$as_me:1105: 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:1110: checking host system type" >&5
+echo "$as_me:1112: 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
@@ -1116,12 +1118,12 @@ else
 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:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1121: 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:1124: result: $ac_cv_host" >&5
+echo "$as_me:1126: 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/'`
@@ -1129,7 +1131,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1132: checking target system type" >&5
+	echo "$as_me:1134: 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
@@ -1138,12 +1140,12 @@ else
 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:1141: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1143: 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:1146: result: $ac_cv_target" >&5
+echo "$as_me:1148: 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/'`
@@ -1175,13 +1177,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1178: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1180: 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:1182: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1184: 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:1184: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1186: 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
@@ -1189,14 +1191,14 @@ fi
 # 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:1192: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1194: 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
 
 fi;
 
-echo "$as_me:1199: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1201: 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
@@ -1216,11 +1218,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1219: result: yes" >&5
+  echo "$as_me:1221: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1223: result: no" >&5
+  echo "$as_me:1225: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1234,7 +1236,7 @@ ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1237: checking for $ac_word" >&5
+echo "$as_me:1239: 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
@@ -1249,7 +1251,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+echo "$as_me:1254: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1257,10 +1259,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1260: result: $CC" >&5
+  echo "$as_me:1262: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1263: result: no" >&5
+  echo "$as_me:1265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1269,7 +1271,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1272: checking for $ac_word" >&5
+echo "$as_me:1274: 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
@@ -1284,7 +1286,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+echo "$as_me:1289: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1292,10 +1294,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1295: result: $ac_ct_CC" >&5
+  echo "$as_me:1297: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1298: result: no" >&5
+  echo "$as_me:1300: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1308,7 +1310,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1311: checking for $ac_word" >&5
+echo "$as_me:1313: 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
@@ -1323,7 +1325,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1326: found $ac_dir/$ac_word" >&5
+echo "$as_me:1328: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1331,10 +1333,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1334: result: $CC" >&5
+  echo "$as_me:1336: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1337: result: no" >&5
+  echo "$as_me:1339: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1343,7 +1345,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1346: checking for $ac_word" >&5
+echo "$as_me:1348: 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
@@ -1358,7 +1360,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1361: found $ac_dir/$ac_word" >&5
+echo "$as_me:1363: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1366,10 +1368,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1369: result: $ac_ct_CC" >&5
+  echo "$as_me:1371: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1372: result: no" >&5
+  echo "$as_me:1374: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1382,7 +1384,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1385: checking for $ac_word" >&5
+echo "$as_me:1387: 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
@@ -1402,7 +1404,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1405: found $ac_dir/$ac_word" >&5
+echo "$as_me:1407: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1424,10 +1426,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1427: result: $CC" >&5
+  echo "$as_me:1429: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1430: result: no" >&5
+  echo "$as_me:1432: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1438,7 +1440,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1441: checking for $ac_word" >&5
+echo "$as_me:1443: 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
@@ -1453,7 +1455,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1456: found $ac_dir/$ac_word" >&5
+echo "$as_me:1458: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1461,10 +1463,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1464: result: $CC" >&5
+  echo "$as_me:1466: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1467: result: no" >&5
+  echo "$as_me:1469: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1477,7 +1479,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1480: checking for $ac_word" >&5
+echo "$as_me:1482: 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
@@ -1492,7 +1494,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1495: found $ac_dir/$ac_word" >&5
+echo "$as_me:1497: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1500,10 +1502,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1503: result: $ac_ct_CC" >&5
+  echo "$as_me:1505: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1506: result: no" >&5
+  echo "$as_me:1508: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1515,32 +1517,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1518: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1520: 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:1523:" \
+echo "$as_me:1525:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1526: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1528: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1529: \$? = $ac_status" >&5
+  echo "$as_me:1531: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1531: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1533: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1534: \$? = $ac_status" >&5
+  echo "$as_me:1536: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1536: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1538: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1539: \$? = $ac_status" >&5
+  echo "$as_me:1541: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1543 "configure"
+#line 1545 "configure"
 #include "confdefs.h"
 
 int
@@ -1556,13 +1558,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1559: checking for C compiler default output" >&5
+echo "$as_me:1561: 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:1562: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1564: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1565: \$? = $ac_status" >&5
+  echo "$as_me:1567: \$? = $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
@@ -1585,34 +1587,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1588: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1590: 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:1594: result: $ac_file" >&5
+echo "$as_me:1596: 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:1599: checking whether the C compiler works" >&5
+echo "$as_me:1601: 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:1605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1608: \$? = $ac_status" >&5
+  echo "$as_me:1610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1615: error: cannot run C compiled programs.
+	{ { echo "$as_me:1617: 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;}
@@ -1620,24 +1622,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1623: result: yes" >&5
+echo "$as_me:1625: 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:1630: checking whether we are cross compiling" >&5
+echo "$as_me:1632: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1632: result: $cross_compiling" >&5
+echo "$as_me:1634: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1635: checking for executable suffix" >&5
+echo "$as_me:1637: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1640: \$? = $ac_status" >&5
+  echo "$as_me:1642: \$? = $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
@@ -1653,25 +1655,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1656: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1658: 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:1662: result: $ac_cv_exeext" >&5
+echo "$as_me:1664: 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:1668: checking for object suffix" >&5
+echo "$as_me:1670: 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 1674 "configure"
+#line 1676 "configure"
 #include "confdefs.h"
 
 int
@@ -1683,10 +1685,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1689: \$? = $ac_status" >&5
+  echo "$as_me:1691: \$? = $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
@@ -1698,24 +1700,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1701: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1703: 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:1708: result: $ac_cv_objext" >&5
+echo "$as_me:1710: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1712: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1714: 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 1718 "configure"
+#line 1720 "configure"
 #include "confdefs.h"
 
 int
@@ -1730,16 +1732,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1736: \$? = $ac_status" >&5
+  echo "$as_me:1738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1742: \$? = $ac_status" >&5
+  echo "$as_me:1744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1751,19 +1753,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1754: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1756: 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:1760: checking whether $CC accepts -g" >&5
+echo "$as_me:1762: 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 1766 "configure"
+#line 1768 "configure"
 #include "confdefs.h"
 
 int
@@ -1775,16 +1777,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1781: \$? = $ac_status" >&5
+  echo "$as_me:1783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1787: \$? = $ac_status" >&5
+  echo "$as_me:1789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1794,7 +1796,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1797: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1799: 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
@@ -1821,16 +1823,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1827: \$? = $ac_status" >&5
+  echo "$as_me:1829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1833: \$? = $ac_status" >&5
+  echo "$as_me:1835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1842,7 +1844,7 @@ if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1845 "configure"
+#line 1847 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1855,16 +1857,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1861: \$? = $ac_status" >&5
+  echo "$as_me:1863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1867: \$? = $ac_status" >&5
+  echo "$as_me:1869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1874,7 +1876,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1877 "configure"
+#line 1879 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1886,16 +1888,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1892: \$? = $ac_status" >&5
+  echo "$as_me:1894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1898: \$? = $ac_status" >&5
+  echo "$as_me:1900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1925,11 +1927,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1928: checking version of $CC" >&5
+	echo "$as_me:1930: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1932: result: $GCC_VERSION" >&5
+	echo "$as_me:1934: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1938,12 +1940,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1941: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1943: 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 1946 "configure"
+#line 1948 "configure"
 #include "confdefs.h"
 
 int
@@ -1960,16 +1962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1966: \$? = $ac_status" >&5
+  echo "$as_me:1968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1972: \$? = $ac_status" >&5
+  echo "$as_me:1974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1980,7 +1982,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1983: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1985: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1989,11 +1991,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1992: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1994: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1996 "configure"
+#line 1998 "configure"
 #include "confdefs.h"
 
 int
@@ -2010,16 +2012,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2016: \$? = $ac_status" >&5
+  echo "$as_me:2018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2022: \$? = $ac_status" >&5
+  echo "$as_me:2024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2029,7 +2031,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2032: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2034: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2038,30 +2040,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2041: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2043: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2048: checking version of $CC" >&5
+	echo "$as_me:2050: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2052: result: $CLANG_VERSION" >&5
+	echo "$as_me:2054: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2059: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2061: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2064 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2075,16 +2077,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2081: \$? = $ac_status" >&5
+  echo "$as_me:2083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2087: \$? = $ac_status" >&5
+  echo "$as_me:2089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2095,13 +2097,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2098: result: $cf_clang_optok" >&5
+		echo "$as_me:2100: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2104: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2106: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2110,7 +2112,7 @@ echo "${as_me:-configure}:2104: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2115: 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
@@ -2118,7 +2120,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2121 "configure"
+#line 2123 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2165,16 +2167,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 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 @@ fi
 
 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 @@ esac
 # 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 @@ fi
 	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,24 +2446,24 @@ fi
 	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
 
-echo "$as_me:2464: checking for inline" >&5
+echo "$as_me:2466: 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
@@ -2469,7 +2471,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2472 "configure"
+#line 2474 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -2478,16 +2480,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2484: \$? = $ac_status" >&5
+  echo "$as_me:2486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2490: \$? = $ac_status" >&5
+  echo "$as_me:2492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2498,7 +2500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:2501: result: $ac_cv_c_inline" >&5
+echo "$as_me:2503: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2517,7 +2519,7 @@ for ac_prog in ggrep grep
 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:2520: checking for $ac_word" >&5
+echo "$as_me:2522: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2532,7 +2534,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2535: found $ac_dir/$ac_word" >&5
+echo "$as_me:2537: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2540,10 +2542,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2543: result: $GREP" >&5
+  echo "$as_me:2545: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2546: result: no" >&5
+  echo "$as_me:2548: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2551,7 +2553,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2554: checking for egrep" >&5
+echo "$as_me:2556: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2563,7 +2565,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2566: checking for $ac_word" >&5
+echo "$as_me:2568: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2580,7 +2582,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2583: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2585: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2591,10 +2593,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2594: result: $EGREP" >&5
+  echo "$as_me:2596: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2597: result: no" >&5
+  echo "$as_me:2599: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2602,12 +2604,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2607: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2612: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2617,7 +2619,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:2620: checking how to run the C preprocessor" >&5
+echo "$as_me:2622: 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
@@ -2638,18 +2640,18 @@ do
   # 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 2641 "configure"
+#line 2643 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2646: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2648: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2652: \$? = $ac_status" >&5
+  echo "$as_me:2654: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2672,17 +2674,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2675 "configure"
+#line 2677 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2679: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2681: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2685: \$? = $ac_status" >&5
+  echo "$as_me:2687: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2719,7 +2721,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2722: result: $CPP" >&5
+echo "$as_me:2724: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2729,18 +2731,18 @@ do
   # 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 2732 "configure"
+#line 2734 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2737: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2739: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2743: \$? = $ac_status" >&5
+  echo "$as_me:2745: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2763,17 +2765,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2766 "configure"
+#line 2768 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2772: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2776: \$? = $ac_status" >&5
+  echo "$as_me:2778: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2801,7 +2803,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2806: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2817,7 +2819,7 @@ for ac_prog in mawk gawk nawk awk
 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:2820: checking for $ac_word" >&5
+echo "$as_me:2822: 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
@@ -2832,7 +2834,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2835: found $ac_dir/$ac_word" >&5
+echo "$as_me:2837: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2840,10 +2842,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2843: result: $AWK" >&5
+  echo "$as_me:2845: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2846: result: no" >&5
+  echo "$as_me:2848: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2873,7 +2875,7 @@ esac
 # 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:2876: checking for a BSD compatible install" >&5
+echo "$as_me:2878: 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
@@ -2922,7 +2924,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2925: result: $INSTALL" >&5
+echo "$as_me:2927: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2943,7 +2945,7 @@ case x$INSTALL in
 	;;
 esac
 
-echo "$as_me:2946: checking if you want to install stripped executables" >&5
+echo "$as_me:2948: 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.
@@ -2960,7 +2962,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:2963: result: $enable_stripping" >&5
+echo "$as_me:2965: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -2971,7 +2973,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:2974: checking if install accepts -p option" >&5
+echo "$as_me:2976: 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
@@ -3002,10 +3004,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:3005: result: $cf_cv_install_p" >&5
+echo "$as_me:3007: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:3008: checking if install needs to be told about ownership" >&5
+echo "$as_me:3010: 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)
@@ -3016,7 +3018,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:3019: result: $with_install_o" >&5
+echo "$as_me:3021: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -3027,7 +3029,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:3030: checking if you want to specify strip-program" >&5
+	echo "$as_me:3032: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -3037,11 +3039,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:3040: result: $with_strip_program" >&5
+	echo "$as_me:3042: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:3044: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:3046: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -3062,11 +3064,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:3065: result: $check_install_strip" >&5
+		echo "$as_me:3067: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:3069: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:3071: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -3081,7 +3083,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:3086: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -3095,7 +3097,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3098: checking for $ac_word" >&5
+echo "$as_me:3100: 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
@@ -3110,7 +3112,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3113: found $ac_dir/$ac_word" >&5
+echo "$as_me:3115: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3118,10 +3120,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3121: result: $LINT" >&5
+  echo "$as_me:3123: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3124: result: no" >&5
+  echo "$as_me:3126: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3134,7 +3136,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3137: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3139: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3189,14 +3191,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3192: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3194: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3199: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3201: 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
@@ -3223,7 +3225,7 @@ else
 fi
 
 fi
-echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3234,7 +3236,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3237: checking for $ac_word" >&5
+echo "$as_me:3239: 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
@@ -3249,7 +3251,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3252: found $ac_dir/$ac_word" >&5
+echo "$as_me:3254: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3257,10 +3259,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3260: result: $CTAGS" >&5
+  echo "$as_me:3262: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3263: result: no" >&5
+  echo "$as_me:3265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3271,7 +3273,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3274: checking for $ac_word" >&5
+echo "$as_me:3276: 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
@@ -3286,7 +3288,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3289: found $ac_dir/$ac_word" >&5
+echo "$as_me:3291: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3294,10 +3296,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3297: result: $ETAGS" >&5
+  echo "$as_me:3299: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3300: result: no" >&5
+  echo "$as_me:3302: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3306,7 +3308,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3309: checking for $ac_word" >&5
+echo "$as_me:3311: 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
@@ -3321,7 +3323,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3324: found $ac_dir/$ac_word" >&5
+echo "$as_me:3326: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3330,17 +3332,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3336: result: no" >&5
+  echo "$as_me:3338: 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:3343: checking for $ac_word" >&5
+echo "$as_me:3345: 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
@@ -3355,7 +3357,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3358: found $ac_dir/$ac_word" >&5
+echo "$as_me:3360: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3364,10 +3366,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3370: result: no" >&5
+  echo "$as_me:3372: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3387,14 +3389,14 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3390: checking if -lm needed for math functions" >&5
+echo "$as_me:3392: 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 3397 "configure"
+#line 3399 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3410,16 +3412,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3416: \$? = $ac_status" >&5
+  echo "$as_me:3418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3422: \$? = $ac_status" >&5
+  echo "$as_me:3424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -3429,7 +3431,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3432: result: $cf_cv_need_libm" >&5
+echo "$as_me:3434: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -3437,14 +3439,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:3440: checking if -lm is available for math functions" >&5
+	echo "$as_me:3442: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3447 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3460,16 +3462,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3466: \$? = $ac_status" >&5
+  echo "$as_me:3468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3472: \$? = $ac_status" >&5
+  echo "$as_me:3474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -3479,7 +3481,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3482: result: $cf_cv_have_libm" >&5
+echo "$as_me:3484: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -3534,7 +3536,7 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
-echo "$as_me:3537: checking for fgrep" >&5
+echo "$as_me:3539: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3546,7 +3548,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3549: checking for $ac_word" >&5
+echo "$as_me:3551: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3563,7 +3565,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3566: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3568: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3574,10 +3576,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3577: result: $FGREP" >&5
+  echo "$as_me:3579: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3580: result: no" >&5
+  echo "$as_me:3582: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3585,16 +3587,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3597: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:3599: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -3611,17 +3613,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:3614: result: $enable_stdnoreturn" >&5
+echo "$as_me:3616: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:3618: checking for C11 _Noreturn feature" >&5
+echo "$as_me:3620: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3624 "configure"
+#line 3626 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3637,16 +3639,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3643: \$? = $ac_status" >&5
+  echo "$as_me:3645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3649: \$? = $ac_status" >&5
+  echo "$as_me:3651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -3657,7 +3659,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -3696,10 +3698,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 3702 "${as_me:-configure}"
+#line 3704 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -3749,12 +3751,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3755: \$? = $ac_status" >&5
+  echo "$as_me:3757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -3813,7 +3815,7 @@ fi
 rm -rf ./conftest*
 fi
 
-echo "$as_me:3816: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3818: 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.
@@ -3823,7 +3825,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:3826: result: $enable_string_hacks" >&5
+echo "$as_me:3828: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -3832,15 +3834,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:3835: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:3837: 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:3837: checking for strlcat" >&5
+	echo "$as_me:3839: 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 3843 "configure"
+#line 3845 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3871,16 +3873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3877: \$? = $ac_status" >&5
+  echo "$as_me:3879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3883: \$? = $ac_status" >&5
+  echo "$as_me:3885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -3890,7 +3892,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -3900,7 +3902,7 @@ EOF
 
 else
 
-		echo "$as_me:3903: checking for strlcat in -lbsd" >&5
+		echo "$as_me:3905: 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
@@ -3908,7 +3910,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3911 "configure"
+#line 3913 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3927,16 +3929,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3933: \$? = $ac_status" >&5
+  echo "$as_me:3935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3939: \$? = $ac_status" >&5
+  echo "$as_me:3941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -3947,7 +3949,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3950: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3952: 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
 
@@ -3970,23 +3972,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3973: checking for $ac_header" >&5
+echo "$as_me:3975: 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 3979 "configure"
+#line 3981 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3985: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3989: \$? = $ac_status" >&5
+  echo "$as_me:3991: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4005,7 +4007,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:4008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:4010: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4026,13 +4028,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4029: checking for $ac_func" >&5
+echo "$as_me:4031: 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 4035 "configure"
+#line 4037 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4063,16 +4065,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4069: \$? = $ac_status" >&5
+  echo "$as_me:4071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4075: \$? = $ac_status" >&5
+  echo "$as_me:4077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4082,7 +4084,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4085: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:4087: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4094,14 +4096,14 @@ done
 
 fi
 
-echo "$as_me:4097: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:4099: 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 4104 "configure"
+#line 4106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4120,16 +4122,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4126: \$? = $ac_status" >&5
+  echo "$as_me:4128: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4132: \$? = $ac_status" >&5
+  echo "$as_me:4134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -4140,7 +4142,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
+echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -4182,14 +4184,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:4185: checking if this is the GNU C library" >&5
+echo "$as_me:4187: 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 4192 "configure"
+#line 4194 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4208,16 +4210,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4214: \$? = $ac_status" >&5
+  echo "$as_me:4216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4220: \$? = $ac_status" >&5
+  echo "$as_me:4222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -4228,7 +4230,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
+echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -4236,7 +4238,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:4239: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:4241: 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
@@ -4248,7 +4250,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4251 "configure"
+#line 4253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4267,16 +4269,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4273: \$? = $ac_status" >&5
+  echo "$as_me:4275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4279: \$? = $ac_status" >&5
+  echo "$as_me:4281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -4288,12 +4290,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:4291: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:4293: 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:4296: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:4298: 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
@@ -4398,7 +4400,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4401 "configure"
+#line 4403 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -4418,16 +4420,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4424: \$? = $ac_status" >&5
+  echo "$as_me:4426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4430: \$? = $ac_status" >&5
+  echo "$as_me:4432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -4438,7 +4440,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4441: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4443: 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
@@ -4447,14 +4449,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:4450: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:4452: 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 4457 "configure"
+#line 4459 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4469,16 +4471,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4475: \$? = $ac_status" >&5
+  echo "$as_me:4477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4481: \$? = $ac_status" >&5
+  echo "$as_me:4483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4585,7 +4587,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4588 "configure"
+#line 4590 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4600,16 +4602,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4606: \$? = $ac_status" >&5
+  echo "$as_me:4608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4612: \$? = $ac_status" >&5
+  echo "$as_me:4614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4624,12 +4626,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4627: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4629: 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:4632: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:4634: 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
@@ -4639,7 +4641,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4642 "configure"
+#line 4644 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4654,16 +4656,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4660: \$? = $ac_status" >&5
+  echo "$as_me:4662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4666: \$? = $ac_status" >&5
+  echo "$as_me:4668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -4674,7 +4676,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4677: result: $cf_cv_default_source" >&5
+echo "$as_me:4679: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -4711,16 +4713,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4714: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4716: 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}:4720: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4722: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4723 "configure"
+#line 4725 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4735,16 +4737,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4741: \$? = $ac_status" >&5
+  echo "$as_me:4743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4747: \$? = $ac_status" >&5
+  echo "$as_me:4749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4765,7 +4767,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4768 "configure"
+#line 4770 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4780,16 +4782,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4786: \$? = $ac_status" >&5
+  echo "$as_me:4788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4792: \$? = $ac_status" >&5
+  echo "$as_me:4794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4800,7 +4802,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4808,10 +4810,10 @@ echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4813: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4814 "configure"
+#line 4816 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4826,16 +4828,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4832: \$? = $ac_status" >&5
+  echo "$as_me:4834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4838: \$? = $ac_status" >&5
+  echo "$as_me:4840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4851,7 +4853,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4854: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4856: 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
@@ -4968,7 +4970,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4971: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4973: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -5000,14 +5002,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:5003: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5005: 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 5010 "configure"
+#line 5012 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5025,16 +5027,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5031: \$? = $ac_status" >&5
+  echo "$as_me:5033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5037: \$? = $ac_status" >&5
+  echo "$as_me:5039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5046,7 +5048,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5049 "configure"
+#line 5051 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5064,16 +5066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5070: \$? = $ac_status" >&5
+  echo "$as_me:5072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5076: \$? = $ac_status" >&5
+  echo "$as_me:5078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5088,7 +5090,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5093: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5248,16 +5250,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5251: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5253: 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}:5257: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5259: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5260 "configure"
+#line 5262 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5272,16 +5274,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5278: \$? = $ac_status" >&5
+  echo "$as_me:5280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5284: \$? = $ac_status" >&5
+  echo "$as_me:5286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5302,7 +5304,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5305 "configure"
+#line 5307 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5317,16 +5319,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5323: \$? = $ac_status" >&5
+  echo "$as_me:5325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5329: \$? = $ac_status" >&5
+  echo "$as_me:5331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5337,7 +5339,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5345,10 +5347,10 @@ echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5350: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5351 "configure"
+#line 5353 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5363,16 +5365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5369: \$? = $ac_status" >&5
+  echo "$as_me:5371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5375: \$? = $ac_status" >&5
+  echo "$as_me:5377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5388,7 +5390,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5391: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5393: 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
@@ -5501,10 +5503,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5506: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5507 "configure"
+#line 5509 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5522,23 +5524,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5528: \$? = $ac_status" >&5
+  echo "$as_me:5530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5534: \$? = $ac_status" >&5
+  echo "$as_me:5536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5541: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5543: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5561,7 +5563,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5566: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5573,7 +5575,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5578: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5661,7 +5663,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5666: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5671,7 +5673,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5676: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5681,7 +5683,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5684: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5686: 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"
@@ -5693,10 +5695,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5696: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5698: 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 5699 "configure"
+#line 5701 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5711,16 +5713,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5717: \$? = $ac_status" >&5
+  echo "$as_me:5719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5723: \$? = $ac_status" >&5
+  echo "$as_me:5725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5729,12 +5731,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5732: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5734: 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 5737 "configure"
+#line 5739 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5749,16 +5751,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5755: \$? = $ac_status" >&5
+  echo "$as_me:5757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5761: \$? = $ac_status" >&5
+  echo "$as_me:5763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5769,19 +5771,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5774: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5777: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5779: 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 5784 "configure"
+#line 5786 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5799,16 +5801,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5805: \$? = $ac_status" >&5
+  echo "$as_me:5807: \$? = $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:5810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5811: \$? = $ac_status" >&5
+  echo "$as_me:5813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5820,7 +5822,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5823 "configure"
+#line 5825 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5838,16 +5840,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5844: \$? = $ac_status" >&5
+  echo "$as_me:5846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5850: \$? = $ac_status" >&5
+  echo "$as_me:5852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5862,7 +5864,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5867: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -6009,13 +6011,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:6012: checking for ANSI C header files" >&5
+echo "$as_me:6014: 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 6018 "configure"
+#line 6020 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6023,13 +6025,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6026: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6028: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6032: \$? = $ac_status" >&5
+  echo "$as_me:6034: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6051,7 +6053,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6054 "configure"
+#line 6056 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6069,7 +6071,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6072 "configure"
+#line 6074 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6090,7 +6092,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6093 "configure"
+#line 6095 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6116,15 +6118,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6122: \$? = $ac_status" >&5
+  echo "$as_me:6124: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6127: \$? = $ac_status" >&5
+  echo "$as_me:6129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6137,7 +6139,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6142: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6153,28 +6155,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6156: checking for $ac_header" >&5
+echo "$as_me:6158: 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 6162 "configure"
+#line 6164 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6171: \$? = $ac_status" >&5
+  echo "$as_me:6173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6177: \$? = $ac_status" >&5
+  echo "$as_me:6179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6184,7 +6186,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6187: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6189: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6194,13 +6196,13 @@ EOF
 fi
 done
 
-echo "$as_me:6197: checking whether exit is declared" >&5
+echo "$as_me:6199: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6203 "configure"
+#line 6205 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6215,16 +6217,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6221: \$? = $ac_status" >&5
+  echo "$as_me:6223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6227: \$? = $ac_status" >&5
+  echo "$as_me:6229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6234,10 +6236,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6239: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6240: checking for signal global datatype" >&5
+echo "$as_me:6242: 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
@@ -6249,7 +6251,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6252 "configure"
+#line 6254 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6273,16 +6275,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6279: \$? = $ac_status" >&5
+  echo "$as_me:6281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6285: \$? = $ac_status" >&5
+  echo "$as_me:6287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6296,7 +6298,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6299: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6301: 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 <<EOF
@@ -6305,14 +6307,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6308: checking if SIGWINCH is defined" >&5
+echo "$as_me:6310: 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 6315 "configure"
+#line 6317 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6327,23 +6329,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6333: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6339: \$? = $ac_status" >&5
+  echo "$as_me:6341: \$? = $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 6346 "configure"
+#line 6348 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6361,16 +6363,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6367: \$? = $ac_status" >&5
+  echo "$as_me:6369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6373: \$? = $ac_status" >&5
+  echo "$as_me:6375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6384,11 +6386,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6387: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6389: 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:6391: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6393: 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
@@ -6399,7 +6401,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6402 "configure"
+#line 6404 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6421,16 +6423,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6427: \$? = $ac_status" >&5
+  echo "$as_me:6429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6433: \$? = $ac_status" >&5
+  echo "$as_me:6435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6444,7 +6446,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6449: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6454,13 +6456,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6457: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6459: 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 6463 "configure"
+#line 6465 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6474,16 +6476,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6480: \$? = $ac_status" >&5
+  echo "$as_me:6482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6486: \$? = $ac_status" >&5
+  echo "$as_me:6488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6494,7 +6496,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6499: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6504,7 +6506,7 @@ EOF
 
 	fi
 
-echo "$as_me:6507: checking if you want to use pkg-config" >&5
+echo "$as_me:6509: 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.
@@ -6514,7 +6516,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6517: result: $cf_pkg_config" >&5
+echo "$as_me:6519: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6526,7 +6528,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6529: checking for $ac_word" >&5
+echo "$as_me:6531: 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
@@ -6543,7 +6545,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6546: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6548: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6554,10 +6556,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6557: result: $PKG_CONFIG" >&5
+  echo "$as_me:6559: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6560: result: no" >&5
+  echo "$as_me:6562: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6566,7 +6568,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6569: checking for $ac_word" >&5
+echo "$as_me:6571: 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
@@ -6583,7 +6585,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6586: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6588: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6595,10 +6597,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6600: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6601: result: no" >&5
+  echo "$as_me:6603: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6639,18 +6641,18 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6642: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6644: 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:6649: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6651: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6653: checking if you want to see long compiling messages" >&5
+echo "$as_me:6655: 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.
@@ -6684,10 +6686,52 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6687: result: $enableval" >&5
+echo "$as_me:6689: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6690: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6692: checking for an installation directory prefix" >&5
+echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+
+# Check whether --with-install-prefix or --without-install-prefix was given.
+if test "${with_install_prefix+set}" = set; then
+  withval="$with_install_prefix"
+  case "x$withval" in
+	(xyes|xno)
+		;;
+	(*)	DESTDIR="$withval"
+		;;
+	esac
+fi;
+echo "$as_me:6705: result: ${DESTDIR:-(none)}" >&5
+echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+echo "$as_me:6708: checking if installation directory prefix should be merged" >&5
+echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+
+# Check whether --enable-install-prefix or --disable-install-prefix was given.
+if test "${enable_install_prefix+set}" = set; then
+  enableval="$enable_install_prefix"
+  test "$enableval" != yes && enableval=no
+	if test "$enableval" != "no" ; then
+    cf_install_prefix=yes
+	else
+		cf_install_prefix=no
+	fi
+else
+  enableval=no
+	cf_install_prefix=no
+
+fi;
+echo "$as_me:6725: result: $cf_install_prefix" >&5
+echo "${ECHO_T}$cf_install_prefix" >&6
+
+if test "$cf_install_prefix" = yes ; then
+	MERGE_PREFIX=':$(prefix)%=%'
+else
+	MERGE_PREFIX=''
+fi
+
+echo "$as_me:6734: 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.
@@ -6697,10 +6741,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6744: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6703: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6747: 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.
@@ -6717,10 +6761,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6720: result: $cf_enable_widec" >&5
+echo "$as_me:6764: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6723: checking for specific curses-directory" >&5
+echo "$as_me:6767: 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.
@@ -6730,7 +6774,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6733: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6777: 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"
@@ -6759,7 +6803,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6806: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6795,7 +6839,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6798 "configure"
+#line 6842 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6807,16 +6851,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6813: \$? = $ac_status" >&5
+  echo "$as_me:6857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6819: \$? = $ac_status" >&5
+  echo "$as_me:6863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6833,7 +6877,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6869,7 +6913,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6882,7 +6926,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6885: checking for specified curses library type" >&5
+echo "$as_me:6929: 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.
@@ -6926,13 +6970,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6929: result: $cf_cv_screen" >&5
+echo "$as_me:6973: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6935: checking for extra include directories" >&5
+echo "$as_me:6979: 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
@@ -6958,7 +7002,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:7005: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -6968,7 +7012,7 @@ then
 
 fi
 
-echo "$as_me:6971: checking if we have identified curses headers" >&5
+echo "$as_me:7015: 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
@@ -6980,7 +7024,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6983 "configure"
+#line 7027 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -6992,16 +7036,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6998: \$? = $ac_status" >&5
+  echo "$as_me:7042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7004: \$? = $ac_status" >&5
+  echo "$as_me:7048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -7012,11 +7056,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7015: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7059: 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:7019: error: No curses header-files found" >&5
+	{ { echo "$as_me:7063: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7026,23 +7070,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7029: checking for $ac_header" >&5
+echo "$as_me:7073: 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 7035 "configure"
+#line 7079 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7039: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7083: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7045: \$? = $ac_status" >&5
+  echo "$as_me:7089: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7061,7 +7105,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7064: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7108: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7071,7 +7115,7 @@ EOF
 fi
 done
 
-echo "$as_me:7074: checking for terminfo header" >&5
+echo "$as_me:7118: 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
@@ -7089,7 +7133,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7092 "configure"
+#line 7136 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7104,16 +7148,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7110: \$? = $ac_status" >&5
+  echo "$as_me:7154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7116: \$? = $ac_status" >&5
+  echo "$as_me:7160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7129,7 +7173,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7132: result: $cf_cv_term_header" >&5
+echo "$as_me:7176: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7161,7 +7205,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7164: checking for ncurses version" >&5
+echo "$as_me:7208: 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
@@ -7187,10 +7231,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7190: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7234: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7193: \$? = $ac_status" >&5
+  echo "$as_me:7237: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7200,7 +7244,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7203 "configure"
+#line 7247 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7227,15 +7271,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7233: \$? = $ac_status" >&5
+  echo "$as_me:7277: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7238: \$? = $ac_status" >&5
+  echo "$as_me:7282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7249,17 +7293,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7252: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7296: 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:7259: checking if we have identified curses libraries" >&5
+echo "$as_me:7303: 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 7262 "configure"
+#line 7306 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7271,16 +7315,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7289,13 +7333,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7292: result: $cf_result" >&5
+echo "$as_me:7336: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7298: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7342: 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
@@ -7303,7 +7347,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7306 "configure"
+#line 7350 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7322,16 +7366,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7328: \$? = $ac_status" >&5
+  echo "$as_me:7372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7334: \$? = $ac_status" >&5
+  echo "$as_me:7378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7342,7 +7386,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7345: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7389: 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
 
@@ -7372,7 +7416,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7375: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7419: 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
@@ -7380,7 +7424,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7383 "configure"
+#line 7427 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7399,16 +7443,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7405: \$? = $ac_status" >&5
+  echo "$as_me:7449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7411: \$? = $ac_status" >&5
+  echo "$as_me:7455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7419,7 +7463,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7422: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7466: 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
 
@@ -7443,7 +7487,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7446: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7490: 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
@@ -7451,7 +7495,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7454 "configure"
+#line 7498 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7470,16 +7514,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7476: \$? = $ac_status" >&5
+  echo "$as_me:7520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7482: \$? = $ac_status" >&5
+  echo "$as_me:7526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7490,7 +7534,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7493: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7537: 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
 
@@ -7548,7 +7592,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7595: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7577,7 +7621,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7624: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7608,7 +7652,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7655: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7643,7 +7687,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7690: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7687,13 +7731,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7690: checking for tgoto" >&5
+		echo "$as_me:7734: 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 7696 "configure"
+#line 7740 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7724,16 +7768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7730: \$? = $ac_status" >&5
+  echo "$as_me:7774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7736: \$? = $ac_status" >&5
+  echo "$as_me:7780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -7743,7 +7787,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7746: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7790: 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
@@ -7752,7 +7796,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7755: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7799: 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
@@ -7760,7 +7804,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7763 "configure"
+#line 7807 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7779,16 +7823,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7785: \$? = $ac_status" >&5
+  echo "$as_me:7829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7791: \$? = $ac_status" >&5
+  echo "$as_me:7835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7799,7 +7843,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7802: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7846: 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
 
@@ -7822,10 +7866,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7825: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7869: 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 7828 "configure"
+#line 7872 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7837,16 +7881,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7843: \$? = $ac_status" >&5
+  echo "$as_me:7887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7849: \$? = $ac_status" >&5
+  echo "$as_me:7893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7855,16 +7899,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7858: result: $cf_result" >&5
+				echo "$as_me:7902: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7908: 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 7867 "configure"
+#line 7911 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7876,16 +7920,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7882: \$? = $ac_status" >&5
+  echo "$as_me:7926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7888: \$? = $ac_status" >&5
+  echo "$as_me:7932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7894,7 +7938,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7897 "configure"
+#line 7941 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7906,16 +7950,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7912: \$? = $ac_status" >&5
+  echo "$as_me:7956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7918: \$? = $ac_status" >&5
+  echo "$as_me:7962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7927,13 +7971,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7930: result: $cf_result" >&5
+				echo "$as_me:7974: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7936: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7980: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7945,23 +7989,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7948: checking for $ac_header" >&5
+echo "$as_me:7992: 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 7954 "configure"
+#line 7998 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7958: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8002: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7964: \$? = $ac_status" >&5
+  echo "$as_me:8008: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7980,7 +8024,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7983: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8027: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7990,7 +8034,7 @@ EOF
 fi
 done
 
-echo "$as_me:7993: checking for multibyte character support" >&5
+echo "$as_me:8037: 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
@@ -7998,7 +8042,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8001 "configure"
+#line 8045 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8015,16 +8059,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8021: \$? = $ac_status" >&5
+  echo "$as_me:8065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8027: \$? = $ac_status" >&5
+  echo "$as_me:8071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8036,12 +8080,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8044 "configure"
+#line 8088 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8054,16 +8098,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8060: \$? = $ac_status" >&5
+  echo "$as_me:8104: \$? = $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:8107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8066: \$? = $ac_status" >&5
+  echo "$as_me:8110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8077,7 +8121,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8080 "configure"
+#line 8124 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8090,16 +8134,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8096: \$? = $ac_status" >&5
+  echo "$as_me:8140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8102: \$? = $ac_status" >&5
+  echo "$as_me:8146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8116,9 +8160,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8163: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8209,7 +8253,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8217,7 +8261,7 @@ echo "${as_me:-configure}:8212: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8220 "configure"
+#line 8264 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8230,21 +8274,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8236: \$? = $ac_status" >&5
+  echo "$as_me:8280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8286: \$? = $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}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8262,7 +8306,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8337,13 +8381,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8340: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8384: 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 8346 "configure"
+#line 8390 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8356,21 +8400,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8362: \$? = $ac_status" >&5
+  echo "$as_me:8406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8368: \$? = $ac_status" >&5
+  echo "$as_me:8412: \$? = $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}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8412,7 +8456,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8415: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8459: 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
@@ -8450,7 +8494,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8453 "configure"
+#line 8497 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8462,16 +8506,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8468: \$? = $ac_status" >&5
+  echo "$as_me:8512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8474: \$? = $ac_status" >&5
+  echo "$as_me:8518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8488,7 +8532,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8535: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8524,7 +8568,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8571: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8554,13 +8598,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8557: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8601: 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:8560: result: yes" >&5
+		echo "$as_me:8604: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8563: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8607: 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
 
@@ -8693,7 +8737,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8696 "configure"
+#line 8740 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8705,37 +8749,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8711: \$? = $ac_status" >&5
+  echo "$as_me:8755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8717: \$? = $ac_status" >&5
+  echo "$as_me:8761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8723 "configure"
+#line 8767 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8733: \$? = $ac_status" >&5
+  echo "$as_me:8777: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8738: \$? = $ac_status" >&5
+  echo "$as_me:8782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8909,7 +8953,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8912 "configure"
+#line 8956 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8921,37 +8965,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8927: \$? = $ac_status" >&5
+  echo "$as_me:8971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8933: \$? = $ac_status" >&5
+  echo "$as_me:8977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8939 "configure"
+#line 8983 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8949: \$? = $ac_status" >&5
+  echo "$as_me:8993: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8954: \$? = $ac_status" >&5
+  echo "$as_me:8998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8968,7 +9012,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8971: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9015: 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"
@@ -8984,7 +9028,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8987: checking for terminfo header" >&5
+echo "$as_me:9031: 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
@@ -9002,7 +9046,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9005 "configure"
+#line 9049 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9017,16 +9061,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9023: \$? = $ac_status" >&5
+  echo "$as_me:9067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9029: \$? = $ac_status" >&5
+  echo "$as_me:9073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9042,7 +9086,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9045: result: $cf_cv_term_header" >&5
+echo "$as_me:9089: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9077,7 +9121,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9080: result: no" >&5
+		echo "$as_me:9124: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9093,7 +9137,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9096: checking for $ac_word" >&5
+echo "$as_me:9140: 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
@@ -9108,7 +9152,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9111: found $ac_dir/$ac_word" >&5
+echo "$as_me:9155: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9116,10 +9160,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9163: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9122: result: no" >&5
+  echo "$as_me:9166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9132,7 +9176,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9135: checking for $ac_word" >&5
+echo "$as_me:9179: 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
@@ -9147,7 +9191,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9150: found $ac_dir/$ac_word" >&5
+echo "$as_me:9194: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9155,10 +9199,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9202: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9161: result: no" >&5
+  echo "$as_me:9205: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9315,7 +9359,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9318: checking if we have identified curses headers" >&5
+echo "$as_me:9362: 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
@@ -9327,7 +9371,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9330 "configure"
+#line 9374 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9339,16 +9383,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9345: \$? = $ac_status" >&5
+  echo "$as_me:9389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9351: \$? = $ac_status" >&5
+  echo "$as_me:9395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9359,11 +9403,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9362: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9406: 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:9366: error: No curses header-files found" >&5
+	{ { echo "$as_me:9410: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9373,23 +9417,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9376: checking for $ac_header" >&5
+echo "$as_me:9420: 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 9382 "configure"
+#line 9426 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9430: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9392: \$? = $ac_status" >&5
+  echo "$as_me:9436: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9408,7 +9452,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9411: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9455: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9464,7 +9508,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9467 "configure"
+#line 9511 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9476,16 +9520,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9482: \$? = $ac_status" >&5
+  echo "$as_me:9526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9488: \$? = $ac_status" >&5
+  echo "$as_me:9532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9502,7 +9546,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9549: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9521,7 +9565,7 @@ fi
 
 }
 
-echo "$as_me:9524: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9568: 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
@@ -9533,7 +9577,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9536 "configure"
+#line 9580 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9557,16 +9601,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9563: \$? = $ac_status" >&5
+  echo "$as_me:9607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9569: \$? = $ac_status" >&5
+  echo "$as_me:9613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9581,14 +9625,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9584: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9628: 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:9591: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9635: 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
@@ -9709,7 +9753,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9712 "configure"
+#line 9756 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9721,16 +9765,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9727: \$? = $ac_status" >&5
+  echo "$as_me:9771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9733: \$? = $ac_status" >&5
+  echo "$as_me:9777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9747,7 +9791,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9794: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9770,7 +9814,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9773 "configure"
+#line 9817 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9794,16 +9838,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9800: \$? = $ac_status" >&5
+  echo "$as_me:9844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9806: \$? = $ac_status" >&5
+  echo "$as_me:9850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9824,12 +9868,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9871: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9832: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9876: 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%/[^/]*$%%'`
@@ -9865,7 +9909,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9868 "configure"
+#line 9912 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9877,16 +9921,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9883: \$? = $ac_status" >&5
+  echo "$as_me:9927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9889: \$? = $ac_status" >&5
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9903,7 +9947,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9950: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9951,7 +9995,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9954: checking for terminfo header" >&5
+echo "$as_me:9998: 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
@@ -9969,7 +10013,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9972 "configure"
+#line 10016 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9984,16 +10028,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9990: \$? = $ac_status" >&5
+  echo "$as_me:10034: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9996: \$? = $ac_status" >&5
+  echo "$as_me:10040: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10009,7 +10053,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10012: result: $cf_cv_term_header" >&5
+echo "$as_me:10056: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10047,7 +10091,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10050: checking for ncurses version" >&5
+echo "$as_me:10094: 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
@@ -10073,10 +10117,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10076: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10120: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10079: \$? = $ac_status" >&5
+  echo "$as_me:10123: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10086,7 +10130,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10089 "configure"
+#line 10133 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10113,15 +10157,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10119: \$? = $ac_status" >&5
+  echo "$as_me:10163: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10124: \$? = $ac_status" >&5
+  echo "$as_me:10168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10135,7 +10179,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10182: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10148,7 +10192,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10151: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10195: 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
@@ -10156,7 +10200,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10159 "configure"
+#line 10203 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10175,16 +10219,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10181: \$? = $ac_status" >&5
+  echo "$as_me:10225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10187: \$? = $ac_status" >&5
+  echo "$as_me:10231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10195,10 +10239,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10198: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10242: 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:10201: checking for initscr in -lgpm" >&5
+  echo "$as_me:10245: 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
@@ -10206,7 +10250,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10209 "configure"
+#line 10253 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10225,16 +10269,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10231: \$? = $ac_status" >&5
+  echo "$as_me:10275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10237: \$? = $ac_status" >&5
+  echo "$as_me:10281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10245,7 +10289,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10248: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10292: 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"
@@ -10260,7 +10304,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10263: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10307: 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
@@ -10268,7 +10312,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10271 "configure"
+#line 10315 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10287,16 +10331,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10293: \$? = $ac_status" >&5
+  echo "$as_me:10337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10299: \$? = $ac_status" >&5
+  echo "$as_me:10343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10307,7 +10351,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10310: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10354: 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"
@@ -10356,13 +10400,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10359: checking for initscr" >&5
+	echo "$as_me:10403: 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 10365 "configure"
+#line 10409 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10393,16 +10437,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10399: \$? = $ac_status" >&5
+  echo "$as_me:10443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10405: \$? = $ac_status" >&5
+  echo "$as_me:10449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10412,18 +10456,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10415: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10459: 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:10422: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10466: 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 10426 "configure"
+#line 10470 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10435,25 +10479,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10441: \$? = $ac_status" >&5
+  echo "$as_me:10485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10447: \$? = $ac_status" >&5
+  echo "$as_me:10491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10449: result: yes" >&5
+  echo "$as_me:10493: 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:10456: result: no" >&5
+echo "$as_me:10500: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10521,11 +10565,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10524: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10568: 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 10528 "configure"
+#line 10572 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10537,25 +10581,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10543: \$? = $ac_status" >&5
+  echo "$as_me:10587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10549: \$? = $ac_status" >&5
+  echo "$as_me:10593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10551: result: yes" >&5
+  echo "$as_me:10595: 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:10558: result: no" >&5
+echo "$as_me:10602: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10570,7 +10614,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10617: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10578,7 +10622,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10581: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10625: 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
@@ -10588,7 +10632,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10591 "configure"
+#line 10635 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10600,23 +10644,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10606: \$? = $ac_status" >&5
+  echo "$as_me:10650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10612: \$? = $ac_status" >&5
+  echo "$as_me:10656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10614: result: yes" >&5
+  echo "$as_me:10658: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10619: result: no" >&5
+echo "$as_me:10663: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10641,13 +10685,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10644: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10688: 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:10647: result: yes" >&5
+		echo "$as_me:10691: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10650: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10694: 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
 
@@ -10780,7 +10824,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10783 "configure"
+#line 10827 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10792,37 +10836,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10798: \$? = $ac_status" >&5
+  echo "$as_me:10842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10804: \$? = $ac_status" >&5
+  echo "$as_me:10848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10810 "configure"
+#line 10854 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10820: \$? = $ac_status" >&5
+  echo "$as_me:10864: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10825: \$? = $ac_status" >&5
+  echo "$as_me:10869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10996,7 +11040,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10999 "configure"
+#line 11043 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11008,37 +11052,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11014: \$? = $ac_status" >&5
+  echo "$as_me:11058: \$? = $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:11061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11020: \$? = $ac_status" >&5
+  echo "$as_me:11064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11026 "configure"
+#line 11070 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11036: \$? = $ac_status" >&5
+  echo "$as_me:11080: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11041: \$? = $ac_status" >&5
+  echo "$as_me:11085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11055,7 +11099,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11058: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11102: 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"
@@ -11071,7 +11115,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11074: checking for terminfo header" >&5
+echo "$as_me:11118: 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
@@ -11089,7 +11133,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11092 "configure"
+#line 11136 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11104,16 +11148,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11110: \$? = $ac_status" >&5
+  echo "$as_me:11154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11116: \$? = $ac_status" >&5
+  echo "$as_me:11160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11129,7 +11173,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11132: result: $cf_cv_term_header" >&5
+echo "$as_me:11176: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11164,7 +11208,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11167: result: no" >&5
+		echo "$as_me:11211: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11180,7 +11224,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11183: checking for $ac_word" >&5
+echo "$as_me:11227: 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
@@ -11195,7 +11239,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11198: found $ac_dir/$ac_word" >&5
+echo "$as_me:11242: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11203,10 +11247,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11250: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11209: result: no" >&5
+  echo "$as_me:11253: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11219,7 +11263,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11222: checking for $ac_word" >&5
+echo "$as_me:11266: 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
@@ -11234,7 +11278,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11237: found $ac_dir/$ac_word" >&5
+echo "$as_me:11281: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11242,10 +11286,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11289: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11248: result: no" >&5
+  echo "$as_me:11292: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11402,7 +11446,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11405: checking if we have identified curses headers" >&5
+echo "$as_me:11449: 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
@@ -11414,7 +11458,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11417 "configure"
+#line 11461 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11426,16 +11470,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11432: \$? = $ac_status" >&5
+  echo "$as_me:11476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11438: \$? = $ac_status" >&5
+  echo "$as_me:11482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11446,11 +11490,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11449: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11493: 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:11453: error: No curses header-files found" >&5
+	{ { echo "$as_me:11497: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11460,23 +11504,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11463: checking for $ac_header" >&5
+echo "$as_me:11507: 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 11469 "configure"
+#line 11513 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11479: \$? = $ac_status" >&5
+  echo "$as_me:11523: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11495,7 +11539,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11498: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11551,7 +11595,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11554 "configure"
+#line 11598 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11563,16 +11607,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11569: \$? = $ac_status" >&5
+  echo "$as_me:11613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11575: \$? = $ac_status" >&5
+  echo "$as_me:11619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11589,7 +11633,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11636: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11608,7 +11652,7 @@ fi
 
 }
 
-echo "$as_me:11611: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11655: 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
@@ -11620,7 +11664,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11623 "configure"
+#line 11667 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11644,16 +11688,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11650: \$? = $ac_status" >&5
+  echo "$as_me:11694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11656: \$? = $ac_status" >&5
+  echo "$as_me:11700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11668,14 +11712,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11671: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11715: 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:11678: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11722: 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
@@ -11796,7 +11840,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11799 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11808,16 +11852,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11814: \$? = $ac_status" >&5
+  echo "$as_me:11858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11820: \$? = $ac_status" >&5
+  echo "$as_me:11864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11834,7 +11878,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11857,7 +11901,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11860 "configure"
+#line 11904 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11881,16 +11925,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11887: \$? = $ac_status" >&5
+  echo "$as_me:11931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11893: \$? = $ac_status" >&5
+  echo "$as_me:11937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11911,12 +11955,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11958: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11919: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11963: 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%/[^/]*$%%'`
@@ -11952,7 +11996,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11955 "configure"
+#line 11999 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11964,16 +12008,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11970: \$? = $ac_status" >&5
+  echo "$as_me:12014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11976: \$? = $ac_status" >&5
+  echo "$as_me:12020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11990,7 +12034,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12037: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12038,7 +12082,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12041: checking for terminfo header" >&5
+echo "$as_me:12085: 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
@@ -12056,7 +12100,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12059 "configure"
+#line 12103 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12071,16 +12115,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12077: \$? = $ac_status" >&5
+  echo "$as_me:12121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12083: \$? = $ac_status" >&5
+  echo "$as_me:12127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12096,7 +12140,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12099: result: $cf_cv_term_header" >&5
+echo "$as_me:12143: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12134,7 +12178,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12137: checking for ncurses version" >&5
+echo "$as_me:12181: 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
@@ -12160,10 +12204,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12163: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12207: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12166: \$? = $ac_status" >&5
+  echo "$as_me:12210: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12173,7 +12217,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12176 "configure"
+#line 12220 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12200,15 +12244,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12206: \$? = $ac_status" >&5
+  echo "$as_me:12250: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12211: \$? = $ac_status" >&5
+  echo "$as_me:12255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12222,7 +12266,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12269: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12235,7 +12279,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12238: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12282: 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
@@ -12243,7 +12287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12246 "configure"
+#line 12290 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12262,16 +12306,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12268: \$? = $ac_status" >&5
+  echo "$as_me:12312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12274: \$? = $ac_status" >&5
+  echo "$as_me:12318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12282,10 +12326,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12285: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12329: 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:12288: checking for initscr in -lgpm" >&5
+  echo "$as_me:12332: 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
@@ -12293,7 +12337,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12296 "configure"
+#line 12340 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12312,16 +12356,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12324: \$? = $ac_status" >&5
+  echo "$as_me:12368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12332,7 +12376,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12335: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12379: 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"
@@ -12347,7 +12391,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12350: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12394: 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
@@ -12355,7 +12399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12358 "configure"
+#line 12402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12374,16 +12418,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12380: \$? = $ac_status" >&5
+  echo "$as_me:12424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12386: \$? = $ac_status" >&5
+  echo "$as_me:12430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12394,7 +12438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12397: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12441: 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"
@@ -12443,13 +12487,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12446: checking for initscr" >&5
+	echo "$as_me:12490: 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 12452 "configure"
+#line 12496 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12480,16 +12524,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12486: \$? = $ac_status" >&5
+  echo "$as_me:12530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12492: \$? = $ac_status" >&5
+  echo "$as_me:12536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12499,18 +12543,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12502: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12546: 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:12509: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12553: 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 12513 "configure"
+#line 12557 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12522,25 +12566,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12528: \$? = $ac_status" >&5
+  echo "$as_me:12572: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12534: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12536: result: yes" >&5
+  echo "$as_me:12580: 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:12543: result: no" >&5
+echo "$as_me:12587: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12608,11 +12652,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12611: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12655: 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 12615 "configure"
+#line 12659 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12624,25 +12668,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12630: \$? = $ac_status" >&5
+  echo "$as_me:12674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12636: \$? = $ac_status" >&5
+  echo "$as_me:12680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12638: result: yes" >&5
+  echo "$as_me:12682: 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:12645: result: no" >&5
+echo "$as_me:12689: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12657,7 +12701,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12704: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12665,7 +12709,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12668: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12712: 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
@@ -12675,7 +12719,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12678 "configure"
+#line 12722 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12687,23 +12731,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12693: \$? = $ac_status" >&5
+  echo "$as_me:12737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12699: \$? = $ac_status" >&5
+  echo "$as_me:12743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12701: result: yes" >&5
+  echo "$as_me:12745: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12706: result: no" >&5
+echo "$as_me:12750: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12723,7 +12767,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12726: checking for X" >&5
+	echo "$as_me:12770: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12827,17 +12871,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12830 "configure"
+#line 12874 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12840: \$? = $ac_status" >&5
+  echo "$as_me:12884: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12870,7 +12914,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12873 "configure"
+#line 12917 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12882,16 +12926,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12888: \$? = $ac_status" >&5
+  echo "$as_me:12932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12894: \$? = $ac_status" >&5
+  echo "$as_me:12938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12929,7 +12973,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12932: result: $have_x" >&5
+  echo "$as_me:12976: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12939,7 +12983,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12942: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12986: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -12966,11 +13010,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:12969: checking whether -R must be followed by a space" >&5
+      echo "$as_me:13013: 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 12973 "configure"
+#line 13017 "configure"
 #include "confdefs.h"
 
 int
@@ -12982,16 +13026,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12988: \$? = $ac_status" >&5
+  echo "$as_me:13032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12994: \$? = $ac_status" >&5
+  echo "$as_me:13038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -13001,13 +13045,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:13004: result: no" >&5
+	echo "$as_me:13048: 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 13010 "configure"
+#line 13054 "configure"
 #include "confdefs.h"
 
 int
@@ -13019,16 +13063,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13025: \$? = $ac_status" >&5
+  echo "$as_me:13069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13031: \$? = $ac_status" >&5
+  echo "$as_me:13075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13038,11 +13082,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13041: result: yes" >&5
+	  echo "$as_me:13085: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13045: result: neither works" >&5
+	  echo "$as_me:13089: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13062,7 +13106,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13065 "configure"
+#line 13109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13081,22 +13125,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13087: \$? = $ac_status" >&5
+  echo "$as_me:13131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13093: \$? = $ac_status" >&5
+  echo "$as_me:13137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13099: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13143: 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
@@ -13104,7 +13148,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13107 "configure"
+#line 13151 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13123,16 +13167,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13129: \$? = $ac_status" >&5
+  echo "$as_me:13173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13135: \$? = $ac_status" >&5
+  echo "$as_me:13179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13143,14 +13187,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13146: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13190: 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:13153: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13197: 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
@@ -13158,7 +13202,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13161 "configure"
+#line 13205 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13177,16 +13221,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13183: \$? = $ac_status" >&5
+  echo "$as_me:13227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13189: \$? = $ac_status" >&5
+  echo "$as_me:13233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13197,7 +13241,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13200: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13244: 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"
@@ -13216,13 +13260,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13219: checking for gethostbyname" >&5
+    echo "$as_me:13263: 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 13225 "configure"
+#line 13269 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13253,16 +13297,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13259: \$? = $ac_status" >&5
+  echo "$as_me:13303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13265: \$? = $ac_status" >&5
+  echo "$as_me:13309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13272,11 +13316,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13275: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13319: 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:13279: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13323: 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
@@ -13284,7 +13328,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13287 "configure"
+#line 13331 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13303,16 +13347,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13309: \$? = $ac_status" >&5
+  echo "$as_me:13353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13315: \$? = $ac_status" >&5
+  echo "$as_me:13359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13323,14 +13367,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13326: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13370: 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:13333: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13377: 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
@@ -13338,7 +13382,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13341 "configure"
+#line 13385 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13357,16 +13401,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13363: \$? = $ac_status" >&5
+  echo "$as_me:13407: \$? = $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:13410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13369: \$? = $ac_status" >&5
+  echo "$as_me:13413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13377,7 +13421,7 @@ fi
 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_bsd_gethostbyname" >&5
+echo "$as_me:13424: 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"
@@ -13393,13 +13437,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13396: checking for connect" >&5
+    echo "$as_me:13440: 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 13402 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13430,16 +13474,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13436: \$? = $ac_status" >&5
+  echo "$as_me:13480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13442: \$? = $ac_status" >&5
+  echo "$as_me:13486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13449,11 +13493,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13452: result: $ac_cv_func_connect" >&5
+echo "$as_me:13496: 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:13456: checking for connect in -lsocket" >&5
+      echo "$as_me:13500: 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
@@ -13461,7 +13505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13464 "configure"
+#line 13508 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13480,16 +13524,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13486: \$? = $ac_status" >&5
+  echo "$as_me:13530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13492: \$? = $ac_status" >&5
+  echo "$as_me:13536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13500,7 +13544,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13503: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13547: 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"
@@ -13509,13 +13553,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13512: checking for remove" >&5
+    echo "$as_me:13556: 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 13518 "configure"
+#line 13562 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13546,16 +13590,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13552: \$? = $ac_status" >&5
+  echo "$as_me:13596: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13558: \$? = $ac_status" >&5
+  echo "$as_me:13602: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13565,11 +13609,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13568: result: $ac_cv_func_remove" >&5
+echo "$as_me:13612: 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:13572: checking for remove in -lposix" >&5
+      echo "$as_me:13616: 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
@@ -13577,7 +13621,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13580 "configure"
+#line 13624 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13596,16 +13640,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13602: \$? = $ac_status" >&5
+  echo "$as_me:13646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13608: \$? = $ac_status" >&5
+  echo "$as_me:13652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13616,7 +13660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13619: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13663: 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"
@@ -13625,13 +13669,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13628: checking for shmat" >&5
+    echo "$as_me:13672: 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 13634 "configure"
+#line 13678 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13662,16 +13706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13668: \$? = $ac_status" >&5
+  echo "$as_me:13712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13674: \$? = $ac_status" >&5
+  echo "$as_me:13718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13681,11 +13725,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13684: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13728: 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:13688: checking for shmat in -lipc" >&5
+      echo "$as_me:13732: 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
@@ -13693,7 +13737,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13696 "configure"
+#line 13740 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13712,16 +13756,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13718: \$? = $ac_status" >&5
+  echo "$as_me:13762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13724: \$? = $ac_status" >&5
+  echo "$as_me:13768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13732,7 +13776,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13735: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13779: 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"
@@ -13750,7 +13794,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13753: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13797: 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
@@ -13758,7 +13802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13761 "configure"
+#line 13805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13777,16 +13821,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13783: \$? = $ac_status" >&5
+  echo "$as_me:13827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13789: \$? = $ac_status" >&5
+  echo "$as_me:13833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13797,7 +13841,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13800: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13844: 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"
@@ -13809,7 +13853,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13812: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13856: 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=
 
@@ -13820,14 +13864,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13823: result: yes" >&5
+	echo "$as_me:13867: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13826: result: no" >&5
+	echo "$as_me:13870: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13830: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13874: 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=
 
@@ -13838,14 +13882,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13841: result: yes" >&5
+	echo "$as_me:13885: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13844: result: no" >&5
+	echo "$as_me:13888: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13848: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13892: 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=
 
@@ -13856,14 +13900,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13859: result: yes" >&5
+	echo "$as_me:13903: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13862: result: no" >&5
+	echo "$as_me:13906: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13866: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13910: 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=
 
@@ -13874,10 +13918,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13877: result: yes" >&5
+	echo "$as_me:13921: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13880: result: no" >&5
+	echo "$as_me:13924: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13897,17 +13941,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13900: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13944: 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}:13906: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13950: 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}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13954: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14038,20 +14082,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14041: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14085: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14047: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14091: 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 14054 "configure"
+#line 14098 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14069,16 +14113,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14075: \$? = $ac_status" >&5
+  echo "$as_me:14119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14081: \$? = $ac_status" >&5
+  echo "$as_me:14125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14088,7 +14132,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14135: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14100,7 +14144,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14108,17 +14152,17 @@ echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14111: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14155: 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}:14117: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14161: 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}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14165: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14238,12 +14282,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14241: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14285: 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}:14246: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14290: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14251,12 +14295,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14254: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14298: 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}:14259: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14303: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14267,7 +14311,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14270: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14314: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14292,17 +14336,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14295: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14339: 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}:14301: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14345: 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}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14349: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14423,7 +14467,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14426: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14470: 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
@@ -14431,7 +14475,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14434 "configure"
+#line 14478 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14450,16 +14494,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14456: \$? = $ac_status" >&5
+  echo "$as_me:14500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14462: \$? = $ac_status" >&5
+  echo "$as_me:14506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14470,7 +14514,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14473: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14517: 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
 
@@ -14506,17 +14550,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14509: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14553: 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}:14515: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14559: 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}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14563: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14636,24 +14680,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14639: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14683: 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}:14646: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14690: 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}:14652: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14696: 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}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14700: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14773,24 +14817,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14776: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14820: 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}:14783: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14827: 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}:14789: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14833: 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}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14837: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14910,24 +14954,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14913: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14957: 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}:14920: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14964: 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}:14926: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14970: 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}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15047,7 +15091,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15050: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15094: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15060,17 +15104,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15063: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15107: 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}:15069: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15113: 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}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15117: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15191,14 +15235,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15194: checking for usable X dependency" >&5
+echo "$as_me:15238: 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 15201 "configure"
+#line 15245 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15218,16 +15262,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15224: \$? = $ac_status" >&5
+  echo "$as_me:15268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15230: \$? = $ac_status" >&5
+  echo "$as_me:15274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15237,30 +15281,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15240: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15284: 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}:15246: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15290: 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}:15253: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15297: 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}:15259: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15303: 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}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15307: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15383,12 +15427,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15386: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15430: 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}:15391: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15435: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15396,14 +15440,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15399: checking for usable X Toolkit package" >&5
+echo "$as_me:15443: 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 15406 "configure"
+#line 15450 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15419,16 +15463,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15425: \$? = $ac_status" >&5
+  echo "$as_me:15469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15431: \$? = $ac_status" >&5
+  echo "$as_me:15475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15438,7 +15482,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15485: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15452,22 +15496,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15455: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15499: 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}:15460: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15504: 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}:15466: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15510: 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}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15514: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15586,17 +15630,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15589: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15633: 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}:15595: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15639: 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}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15643: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15725,12 +15769,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15728: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15772: 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}:15733: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15777: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15750,7 +15794,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15797: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15835,7 +15879,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15882: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15845,7 +15889,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15892: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15855,7 +15899,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15858: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15902: 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"
@@ -15864,7 +15908,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15867 "configure"
+#line 15911 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15876,16 +15920,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15882: \$? = $ac_status" >&5
+  echo "$as_me:15926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15888: \$? = $ac_status" >&5
+  echo "$as_me:15932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15893,12 +15937,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15896: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15940: 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}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15945: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15906,13 +15950,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15909: checking for XOpenDisplay" >&5
+	echo "$as_me:15953: 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 15915 "configure"
+#line 15959 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15943,16 +15987,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15949: \$? = $ac_status" >&5
+  echo "$as_me:15993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15955: \$? = $ac_status" >&5
+  echo "$as_me:15999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15962,13 +16006,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15965: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:16009: 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:15971: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:16015: 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
@@ -15976,7 +16020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15979 "configure"
+#line 16023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15995,16 +16039,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16001: \$? = $ac_status" >&5
+  echo "$as_me:16045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16007: \$? = $ac_status" >&5
+  echo "$as_me:16051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16015,7 +16059,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16018: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16062: 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
 
@@ -16039,13 +16083,13 @@ fi
 
 fi
 
-	echo "$as_me:16042: checking for XtAppInitialize" >&5
+	echo "$as_me:16086: 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 16048 "configure"
+#line 16092 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16076,16 +16120,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16082: \$? = $ac_status" >&5
+  echo "$as_me:16126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16088: \$? = $ac_status" >&5
+  echo "$as_me:16132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16095,13 +16139,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16098: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16142: 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:16104: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16148: 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
@@ -16109,7 +16153,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16112 "configure"
+#line 16156 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16128,16 +16172,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16134: \$? = $ac_status" >&5
+  echo "$as_me:16178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16140: \$? = $ac_status" >&5
+  echo "$as_me:16184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16148,7 +16192,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16151: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16195: 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
 
@@ -16165,7 +16209,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16168: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16212: 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
@@ -16206,14 +16250,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16209: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16253: 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:16212: checking for $cf_test" >&5
+			echo "$as_me:16256: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16216 "configure"
+#line 16260 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16227,16 +16271,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16233: \$? = $ac_status" >&5
+  echo "$as_me:16277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16239: \$? = $ac_status" >&5
+  echo "$as_me:16283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16245,7 +16289,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16248: result: $cf_result" >&5
+		echo "$as_me:16292: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16261,7 +16305,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16264: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16308: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16326,10 +16370,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16329: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16373: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16332 "configure"
+#line 16376 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16346,16 +16390,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16358: \$? = $ac_status" >&5
+  echo "$as_me:16402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16364,7 +16408,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16367: result: $cf_result" >&5
+		echo "$as_me:16411: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16381,7 +16425,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16384: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16428: 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
@@ -16415,7 +16459,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16418: checking for $ac_word" >&5
+echo "$as_me:16462: 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
@@ -16430,7 +16474,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16433: found $ac_dir/$ac_word" >&5
+echo "$as_me:16477: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16438,10 +16482,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16485: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16444: result: no" >&5
+  echo "$as_me:16488: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16454,7 +16498,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16457: checking for $ac_word" >&5
+echo "$as_me:16501: 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
@@ -16469,7 +16513,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16472: found $ac_dir/$ac_word" >&5
+echo "$as_me:16516: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16477,10 +16521,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16524: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16483: result: no" >&5
+  echo "$as_me:16527: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16615,7 +16659,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16662: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16700,7 +16744,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16747: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16710,7 +16754,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16757: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16720,7 +16764,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16723: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16767: 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"
@@ -16729,7 +16773,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16732 "configure"
+#line 16776 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16741,16 +16785,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16747: \$? = $ac_status" >&5
+  echo "$as_me:16791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16753: \$? = $ac_status" >&5
+  echo "$as_me:16797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16758,12 +16802,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16761: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16805: 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}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16810: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16771,7 +16815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16774: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16818: 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
@@ -16779,7 +16823,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16782 "configure"
+#line 16826 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16798,16 +16842,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16804: \$? = $ac_status" >&5
+  echo "$as_me:16848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16810: \$? = $ac_status" >&5
+  echo "$as_me:16854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16818,7 +16862,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16821: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16865: 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
 
@@ -16840,7 +16884,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16843: checking for XCurses library" >&5
+echo "$as_me:16887: 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
@@ -16863,7 +16907,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16866 "configure"
+#line 16910 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16878,16 +16922,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16884: \$? = $ac_status" >&5
+  echo "$as_me:16928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16890: \$? = $ac_status" >&5
+  echo "$as_me:16934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16898,7 +16942,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16945: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16913,23 +16957,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16916: checking for xcurses.h" >&5
+	echo "$as_me:16960: 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 16922 "configure"
+#line 16966 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16932: \$? = $ac_status" >&5
+  echo "$as_me:16976: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16948,7 +16992,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16951: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16995: 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
 
@@ -16959,26 +17003,26 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:16962: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:17006: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:16969: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:17013: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:16975: checking for _nc_init_pthreads" >&5
+echo "$as_me:17019: checking for _nc_init_pthreads" >&5
 echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
 if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16981 "configure"
+#line 17025 "configure"
 #include "confdefs.h"
 #define _nc_init_pthreads autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17009,16 +17053,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17015: \$? = $ac_status" >&5
+  echo "$as_me:17059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17021: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_init_pthreads=yes
 else
@@ -17028,7 +17072,7 @@ ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17031: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "$as_me:17075: result: $ac_cv_func__nc_init_pthreads" >&5
 echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
 if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
@@ -17063,7 +17107,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17066: checking for X11 rgb file" >&5
+echo "$as_me:17110: 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.
@@ -17125,7 +17169,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17172: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17133,7 +17177,7 @@ esac
 
 fi
 
-echo "$as_me:17136: result: $RGB_PATH" >&5
+echo "$as_me:17180: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17174,7 +17218,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17177: checking for desired basename for form library" >&5
+echo "$as_me:17221: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17194,10 +17238,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17197: result: $FORM_NAME" >&5
+echo "$as_me:17241: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17200: checking for desired basename for menu library" >&5
+echo "$as_me:17244: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17217,10 +17261,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17220: result: $MENU_NAME" >&5
+echo "$as_me:17264: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17223: checking for desired basename for panel library" >&5
+echo "$as_me:17267: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17240,10 +17284,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17243: result: $PANEL_NAME" >&5
+echo "$as_me:17287: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17246: checking if you want to check for panel functions" >&5
+echo "$as_me:17290: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17260,7 +17304,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17263: result: $cf_enable_panel" >&5
+echo "$as_me:17307: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17271,13 +17315,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17274: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17318: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17277: result: yes" >&5
+		echo "$as_me:17321: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17280: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17324: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17427,7 +17471,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17430 "configure"
+#line 17474 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17439,37 +17483,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17445: \$? = $ac_status" >&5
+  echo "$as_me:17489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17451: \$? = $ac_status" >&5
+  echo "$as_me:17495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17457 "configure"
+#line 17501 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17467: \$? = $ac_status" >&5
+  echo "$as_me:17511: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17472: \$? = $ac_status" >&5
+  echo "$as_me:17516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17486,7 +17530,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17489: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17533: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17507,7 +17551,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17510: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17554: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17515,7 +17559,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17518 "configure"
+#line 17562 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17534,16 +17578,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17540: \$? = $ac_status" >&5
+  echo "$as_me:17584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17546: \$? = $ac_status" >&5
+  echo "$as_me:17590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17554,7 +17598,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17557: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17601: 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
 
@@ -17587,7 +17631,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17590: checking if you want to check for menu functions" >&5
+echo "$as_me:17634: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17604,7 +17648,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17607: result: $cf_enable_menu" >&5
+echo "$as_me:17651: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17613,14 +17657,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17616: checking for NetBSD menu.h" >&5
+echo "$as_me:17660: 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 17623 "configure"
+#line 17667 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17638,16 +17682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17644: \$? = $ac_status" >&5
+  echo "$as_me:17688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17650: \$? = $ac_status" >&5
+  echo "$as_me:17694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17659,7 +17703,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17706: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17676,13 +17720,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17679: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17723: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17682: result: yes" >&5
+		echo "$as_me:17726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17685: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17729: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17832,7 +17876,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17835 "configure"
+#line 17879 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17844,37 +17888,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17850: \$? = $ac_status" >&5
+  echo "$as_me:17894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17856: \$? = $ac_status" >&5
+  echo "$as_me:17900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17862 "configure"
+#line 17906 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17872: \$? = $ac_status" >&5
+  echo "$as_me:17916: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17877: \$? = $ac_status" >&5
+  echo "$as_me:17921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17891,7 +17935,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17894: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17938: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17912,7 +17956,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17915: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17959: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17920,7 +17964,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17923 "configure"
+#line 17967 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17939,16 +17983,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17945: \$? = $ac_status" >&5
+  echo "$as_me:17989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17951: \$? = $ac_status" >&5
+  echo "$as_me:17995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17959,7 +18003,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17962: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18006: 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
 
@@ -17992,7 +18036,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:17995: checking if you want to check for form functions" >&5
+echo "$as_me:18039: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -18009,7 +18053,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:18012: result: $cf_enable_form" >&5
+echo "$as_me:18056: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -18018,14 +18062,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:18021: checking for NetBSD form.h" >&5
+echo "$as_me:18065: 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 18028 "configure"
+#line 18072 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18044,16 +18088,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18050: \$? = $ac_status" >&5
+  echo "$as_me:18094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18056: \$? = $ac_status" >&5
+  echo "$as_me:18100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18065,7 +18109,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18112: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18082,13 +18126,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18085: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18129: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18088: result: yes" >&5
+		echo "$as_me:18132: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18091: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18135: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18238,7 +18282,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18241 "configure"
+#line 18285 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18250,37 +18294,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18256: \$? = $ac_status" >&5
+  echo "$as_me:18300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18262: \$? = $ac_status" >&5
+  echo "$as_me:18306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18268 "configure"
+#line 18312 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18278: \$? = $ac_status" >&5
+  echo "$as_me:18322: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18283: \$? = $ac_status" >&5
+  echo "$as_me:18327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18297,7 +18341,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18300: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18344: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18318,7 +18362,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18321: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18365: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18326,7 +18370,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18329 "configure"
+#line 18373 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18345,16 +18389,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18351: \$? = $ac_status" >&5
+  echo "$as_me:18395: \$? = $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:18398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18357: \$? = $ac_status" >&5
+  echo "$as_me:18401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18365,7 +18409,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18368: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18412: 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
 
@@ -18403,23 +18447,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18406: checking for $ac_header" >&5
+echo "$as_me:18450: 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 18412 "configure"
+#line 18456 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18416: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18422: \$? = $ac_status" >&5
+  echo "$as_me:18466: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18438,7 +18482,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18441: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18485: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18448,13 +18492,13 @@ EOF
 fi
 done
 
-echo "$as_me:18451: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18495: 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 18457 "configure"
+#line 18501 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18470,16 +18514,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18476: \$? = $ac_status" >&5
+  echo "$as_me:18520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18482: \$? = $ac_status" >&5
+  echo "$as_me:18526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18489,7 +18533,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18492: result: $ac_cv_header_time" >&5
+echo "$as_me:18536: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18510,23 +18554,23 @@ termios.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18513: checking for $ac_header" >&5
+echo "$as_me:18557: 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 18519 "configure"
+#line 18563 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18529: \$? = $ac_status" >&5
+  echo "$as_me:18573: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18545,7 +18589,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18558,23 +18602,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18561: checking for $ac_header" >&5
+echo "$as_me:18605: 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 18567 "configure"
+#line 18611 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18615: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18577: \$? = $ac_status" >&5
+  echo "$as_me:18621: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18593,7 +18637,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18640: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18603,7 +18647,7 @@ EOF
 fi
 done
 
-echo "$as_me:18606: checking for header declaring getopt variables" >&5
+echo "$as_me:18650: 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
@@ -18613,7 +18657,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18616 "configure"
+#line 18660 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18626,16 +18670,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18632: \$? = $ac_status" >&5
+  echo "$as_me:18676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18638: \$? = $ac_status" >&5
+  echo "$as_me:18682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18647,7 +18691,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18694: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18665,13 +18709,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18668: checking for clock_gettime" >&5
+echo "$as_me:18712: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18674 "configure"
+#line 18718 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18702,16 +18746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18708: \$? = $ac_status" >&5
+  echo "$as_me:18752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18714: \$? = $ac_status" >&5
+  echo "$as_me:18758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18721,12 +18765,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18724: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18768: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18729: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18773: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18734,7 +18778,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18737 "configure"
+#line 18781 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18753,16 +18797,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18759: \$? = $ac_status" >&5
+  echo "$as_me:18803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18765: \$? = $ac_status" >&5
+  echo "$as_me:18809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18773,7 +18817,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18776: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18820: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18785,14 +18829,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18788: checking if clock_gettime links" >&5
+echo "$as_me:18832: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18795 "configure"
+#line 18839 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18810,16 +18854,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18816: \$? = $ac_status" >&5
+  echo "$as_me:18860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18822: \$? = $ac_status" >&5
+  echo "$as_me:18866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18830,7 +18874,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18877: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18844,13 +18888,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18847: checking for gettimeofday" >&5
+echo "$as_me:18891: 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 18853 "configure"
+#line 18897 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18881,16 +18925,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18887: \$? = $ac_status" >&5
+  echo "$as_me:18931: \$? = $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:18934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18893: \$? = $ac_status" >&5
+  echo "$as_me:18937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18900,7 +18944,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18947: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18910,7 +18954,7 @@ EOF
 
 else
 
-echo "$as_me:18913: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18957: 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
@@ -18918,7 +18962,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18921 "configure"
+#line 18965 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18937,16 +18981,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18943: \$? = $ac_status" >&5
+  echo "$as_me:18987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18949: \$? = $ac_status" >&5
+  echo "$as_me:18993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -18957,7 +19001,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18960: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:19004: 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
 
@@ -18995,13 +19039,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18998: checking for $ac_func" >&5
+echo "$as_me:19042: 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 19004 "configure"
+#line 19048 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19032,16 +19076,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19038: \$? = $ac_status" >&5
+  echo "$as_me:19082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19044: \$? = $ac_status" >&5
+  echo "$as_me:19088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19051,7 +19095,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19054: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19098: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19062,14 +19106,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19065: checking if we can use termcap.h" >&5
+echo "$as_me:19109: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19072 "configure"
+#line 19116 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19090,16 +19134,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19096: \$? = $ac_status" >&5
+  echo "$as_me:19140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19102: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19109,7 +19153,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19112: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19156: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19119,14 +19163,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19122: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19166: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19129 "configure"
+#line 19173 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19147,16 +19191,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19153: \$? = $ac_status" >&5
+  echo "$as_me:19197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19159: \$? = $ac_status" >&5
+  echo "$as_me:19203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19166,7 +19210,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19169: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19213: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19176,7 +19220,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19179: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19223: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19195,13 +19239,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19198: checking for $ac_func" >&5
+echo "$as_me:19242: 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 19204 "configure"
+#line 19248 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19232,16 +19276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19238: \$? = $ac_status" >&5
+  echo "$as_me:19282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19244: \$? = $ac_status" >&5
+  echo "$as_me:19288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19251,7 +19295,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19254: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19298: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19263,7 +19307,7 @@ done
 
 fi
 
-echo "$as_me:19266: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19310: 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
@@ -19271,7 +19315,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19274 "configure"
+#line 19318 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19304,16 +19348,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19310: \$? = $ac_status" >&5
+  echo "$as_me:19354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19316: \$? = $ac_status" >&5
+  echo "$as_me:19360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19323,7 +19367,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19326 "configure"
+#line 19370 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19349,16 +19393,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19355: \$? = $ac_status" >&5
+  echo "$as_me:19399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19361: \$? = $ac_status" >&5
+  echo "$as_me:19405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19372,7 +19416,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19419: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19384,7 +19428,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19387: checking for term.h" >&5
+echo "$as_me:19431: 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
@@ -19405,7 +19449,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19408 "configure"
+#line 19452 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19419,16 +19463,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19425: \$? = $ac_status" >&5
+  echo "$as_me:19469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19431: \$? = $ac_status" >&5
+  echo "$as_me:19475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19447,7 +19491,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19450 "configure"
+#line 19494 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19465,16 +19509,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19512: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19471: \$? = $ac_status" >&5
+  echo "$as_me:19515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19477: \$? = $ac_status" >&5
+  echo "$as_me:19521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19489,7 +19533,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19492: result: $cf_cv_term_header" >&5
+echo "$as_me:19536: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19516,7 +19560,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19519: checking for unctrl.h" >&5
+echo "$as_me:19563: 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
@@ -19537,7 +19581,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19540 "configure"
+#line 19584 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19551,16 +19595,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19557: \$? = $ac_status" >&5
+  echo "$as_me:19601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19563: \$? = $ac_status" >&5
+  echo "$as_me:19607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19573,12 +19617,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19620: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19625: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19676,10 +19720,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19679: checking for ${cf_func}" >&5
+	echo "$as_me:19723: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19726: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19688,7 +19732,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19691 "configure"
+#line 19735 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19721,16 +19765,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19727: \$? = $ac_status" >&5
+  echo "$as_me:19771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19733: \$? = $ac_status" >&5
+  echo "$as_me:19777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19746,7 +19790,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19749: result: $cf_result" >&5
+	echo "$as_me:19793: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19761,10 +19805,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19764: checking for ${cf_func}" >&5
+	echo "$as_me:19808: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19811: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19773,7 +19817,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19776 "configure"
+#line 19820 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19806,16 +19850,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19812: \$? = $ac_status" >&5
+  echo "$as_me:19856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19818: \$? = $ac_status" >&5
+  echo "$as_me:19862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19831,7 +19875,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19834: result: $cf_result" >&5
+	echo "$as_me:19878: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19855,7 +19899,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19858 "configure"
+#line 19902 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19875,21 +19919,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19881: \$? = $ac_status" >&5
+  echo "$as_me:19925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19887: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19936: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19909,14 +19953,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19912: checking for ncurses extended functions" >&5
+echo "$as_me:19956: 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 19919 "configure"
+#line 19963 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19931,16 +19975,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19937: \$? = $ac_status" >&5
+  echo "$as_me:19981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19943: \$? = $ac_status" >&5
+  echo "$as_me:19987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19948,7 +19992,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19951 "configure"
+#line 19995 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19973,16 +20017,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19979: \$? = $ac_status" >&5
+  echo "$as_me:20023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19985: \$? = $ac_status" >&5
+  echo "$as_me:20029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19996,7 +20040,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19999: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:20043: 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
@@ -20010,11 +20054,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:20013: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:20057: 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 20017 "configure"
+#line 20061 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20027,16 +20071,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20033: \$? = $ac_status" >&5
+  echo "$as_me:20077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20039: \$? = $ac_status" >&5
+  echo "$as_me:20083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20045,7 +20089,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20048 "configure"
+#line 20092 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20058,16 +20102,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20064: \$? = $ac_status" >&5
+  echo "$as_me:20108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20070: \$? = $ac_status" >&5
+  echo "$as_me:20114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20078,7 +20122,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20081: result: $cf_define_xpg5" >&5
+		echo "$as_me:20125: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20087,14 +20131,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20090: checking for wide-character functions" >&5
+	echo "$as_me:20134: 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 20097 "configure"
+#line 20141 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20111,16 +20155,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:20161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20123: \$? = $ac_status" >&5
+  echo "$as_me:20167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20131,7 +20175,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20178: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20152,14 +20196,14 @@ EOF
 
 fi
 
-echo "$as_me:20155: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20199: 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 20162 "configure"
+#line 20206 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20177,16 +20221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20183: \$? = $ac_status" >&5
+  echo "$as_me:20227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20189: \$? = $ac_status" >&5
+  echo "$as_me:20233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20197,21 +20241,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20200: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20244: 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:20207: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20251: 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 20214 "configure"
+#line 20258 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20231,16 +20275,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20237: \$? = $ac_status" >&5
+  echo "$as_me:20281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20243: \$? = $ac_status" >&5
+  echo "$as_me:20287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20252,7 +20296,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20255: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20299: 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
@@ -20261,7 +20305,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20264: checking for openpty in -lutil" >&5
+echo "$as_me:20308: 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
@@ -20269,7 +20313,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20272 "configure"
+#line 20316 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20288,16 +20332,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20300: \$? = $ac_status" >&5
+  echo "$as_me:20344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20308,7 +20352,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20311: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20355: 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
@@ -20316,7 +20360,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20319: checking for openpty header" >&5
+echo "$as_me:20363: 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
@@ -20343,7 +20387,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20346 "configure"
+#line 20390 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20361,16 +20405,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20367: \$? = $ac_status" >&5
+  echo "$as_me:20411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20373: \$? = $ac_status" >&5
+  echo "$as_me:20417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20388,7 +20432,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20435: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20422,7 +20466,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20425: checking for function curses_version" >&5
+echo "$as_me:20469: 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
@@ -20432,7 +20476,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20435 "configure"
+#line 20479 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20448,15 +20492,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20454: \$? = $ac_status" >&5
+  echo "$as_me:20498: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20459: \$? = $ac_status" >&5
+  echo "$as_me:20503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20471,14 +20515,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20474: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20518: 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:20481: checking for alternate character set array" >&5
+echo "$as_me:20525: 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
@@ -20488,7 +20532,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20491 "configure"
+#line 20535 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20504,16 +20548,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20510: \$? = $ac_status" >&5
+  echo "$as_me:20554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20516: \$? = $ac_status" >&5
+  echo "$as_me:20560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20524,7 +20568,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20571: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20534,7 +20578,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20537: checking for wide alternate character set array" >&5
+echo "$as_me:20581: 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
@@ -20544,7 +20588,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20547 "configure"
+#line 20591 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20560,16 +20604,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20566: \$? = $ac_status" >&5
+  echo "$as_me:20610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20572: \$? = $ac_status" >&5
+  echo "$as_me:20616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20580,7 +20624,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20627: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20588,7 +20632,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20591: checking for wide alternate character constants" >&5
+echo "$as_me:20635: 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
@@ -20598,7 +20642,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20601 "configure"
+#line 20645 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20615,16 +20659,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20621: \$? = $ac_status" >&5
+  echo "$as_me:20665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20627: \$? = $ac_status" >&5
+  echo "$as_me:20671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20634,7 +20678,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20637 "configure"
+#line 20681 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20650,16 +20694,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20656: \$? = $ac_status" >&5
+  echo "$as_me:20700: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20662: \$? = $ac_status" >&5
+  echo "$as_me:20706: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20670,7 +20714,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20717: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20680,10 +20724,10 @@ EOF
 
 fi
 
-echo "$as_me:20683: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20727: 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 20686 "configure"
+#line 20730 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20701,16 +20745,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20707: \$? = $ac_status" >&5
+  echo "$as_me:20751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20713: \$? = $ac_status" >&5
+  echo "$as_me:20757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20719,7 +20763,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20722: result: $cf_result" >&5
+echo "$as_me:20766: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20740,14 +20784,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20743: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20787: 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 20750 "configure"
+#line 20794 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20765,23 +20809,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20771: \$? = $ac_status" >&5
+  echo "$as_me:20815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20777: \$? = $ac_status" >&5
+  echo "$as_me:20821: \$? = $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 20784 "configure"
+#line 20828 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20800,16 +20844,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20806: \$? = $ac_status" >&5
+  echo "$as_me:20850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20812: \$? = $ac_status" >&5
+  echo "$as_me:20856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20821,7 +20865,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20868: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20844,14 +20888,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20847: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20891: 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 20854 "configure"
+#line 20898 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20869,23 +20913,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20875: \$? = $ac_status" >&5
+  echo "$as_me:20919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20881: \$? = $ac_status" >&5
+  echo "$as_me:20925: \$? = $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 20888 "configure"
+#line 20932 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20904,16 +20948,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20910: \$? = $ac_status" >&5
+  echo "$as_me:20954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20916: \$? = $ac_status" >&5
+  echo "$as_me:20960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20925,7 +20969,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20972: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20948,14 +20992,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20951: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20995: 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 20958 "configure"
+#line 21002 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20973,23 +21017,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20979: \$? = $ac_status" >&5
+  echo "$as_me:21023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20985: \$? = $ac_status" >&5
+  echo "$as_me:21029: \$? = $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 20992 "configure"
+#line 21036 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21008,16 +21052,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21014: \$? = $ac_status" >&5
+  echo "$as_me:21058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21020: \$? = $ac_status" >&5
+  echo "$as_me:21064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -21029,7 +21073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21032: result: $cf_cv_wint_t" >&5
+echo "$as_me:21076: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21053,10 +21097,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21056: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21100: 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 21059 "configure"
+#line 21103 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21074,16 +21118,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21080: \$? = $ac_status" >&5
+  echo "$as_me:21124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21086: \$? = $ac_status" >&5
+  echo "$as_me:21130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21092,7 +21136,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21095: result: $cf_result" >&5
+echo "$as_me:21139: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21114,10 +21158,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21117: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21161: 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 21120 "configure"
+#line 21164 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21135,16 +21179,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21141: \$? = $ac_status" >&5
+  echo "$as_me:21185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21147: \$? = $ac_status" >&5
+  echo "$as_me:21191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21153,7 +21197,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21156: result: $cf_result" >&5
+echo "$as_me:21200: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21175,10 +21219,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21178: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21222: 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 21181 "configure"
+#line 21225 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21196,16 +21240,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21202: \$? = $ac_status" >&5
+  echo "$as_me:21246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21208: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21214,7 +21258,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21217: result: $cf_result" >&5
+echo "$as_me:21261: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21243,11 +21287,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21246: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21290: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21250 "configure"
+#line 21294 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21280,16 +21324,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21286: \$? = $ac_status" >&5
+  echo "$as_me:21330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21292: \$? = $ac_status" >&5
+  echo "$as_me:21336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21299,7 +21343,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21302: result: $cf_result" >&5
+echo "$as_me:21346: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21311,14 +21355,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21314: checking for data $cf_data in library" >&5
+	echo "$as_me:21358: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21321 "configure"
+#line 21365 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21357,16 +21401,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21363: \$? = $ac_status" >&5
+  echo "$as_me:21407: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21369: \$? = $ac_status" >&5
+  echo "$as_me:21413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21378,7 +21422,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21381 "configure"
+#line 21425 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21410,15 +21454,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21460: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21421: \$? = $ac_status" >&5
+  echo "$as_me:21465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21430,7 +21474,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21433: result: $cf_result" >&5
+	echo "$as_me:21477: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21447,7 +21491,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21450: checking for X" >&5
+	echo "$as_me:21494: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21551,17 +21595,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21554 "configure"
+#line 21598 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21602: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21564: \$? = $ac_status" >&5
+  echo "$as_me:21608: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21594,7 +21638,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21597 "configure"
+#line 21641 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21606,16 +21650,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21612: \$? = $ac_status" >&5
+  echo "$as_me:21656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21618: \$? = $ac_status" >&5
+  echo "$as_me:21662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21653,7 +21697,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21656: result: $have_x" >&5
+  echo "$as_me:21700: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21663,7 +21707,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21666: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21710: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21690,11 +21734,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21693: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21737: 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 21697 "configure"
+#line 21741 "configure"
 #include "confdefs.h"
 
 int
@@ -21706,16 +21750,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21712: \$? = $ac_status" >&5
+  echo "$as_me:21756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21718: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21725,13 +21769,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21728: result: no" >&5
+	echo "$as_me:21772: 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 21734 "configure"
+#line 21778 "configure"
 #include "confdefs.h"
 
 int
@@ -21743,16 +21787,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21749: \$? = $ac_status" >&5
+  echo "$as_me:21793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21755: \$? = $ac_status" >&5
+  echo "$as_me:21799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21762,11 +21806,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21765: result: yes" >&5
+	  echo "$as_me:21809: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21769: result: neither works" >&5
+	  echo "$as_me:21813: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21786,7 +21830,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21789 "configure"
+#line 21833 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21805,22 +21849,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21811: \$? = $ac_status" >&5
+  echo "$as_me:21855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21817: \$? = $ac_status" >&5
+  echo "$as_me:21861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21823: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21867: 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
@@ -21828,7 +21872,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21831 "configure"
+#line 21875 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21847,16 +21891,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21853: \$? = $ac_status" >&5
+  echo "$as_me:21897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21859: \$? = $ac_status" >&5
+  echo "$as_me:21903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21867,14 +21911,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21870: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21914: 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:21877: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21921: 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
@@ -21882,7 +21926,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21885 "configure"
+#line 21929 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21901,16 +21945,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21907: \$? = $ac_status" >&5
+  echo "$as_me:21951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21913: \$? = $ac_status" >&5
+  echo "$as_me:21957: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21921,7 +21965,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21924: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21968: 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"
@@ -21940,13 +21984,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21943: checking for gethostbyname" >&5
+    echo "$as_me:21987: 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 21949 "configure"
+#line 21993 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21977,16 +22021,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21983: \$? = $ac_status" >&5
+  echo "$as_me:22027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21989: \$? = $ac_status" >&5
+  echo "$as_me:22033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21996,11 +22040,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21999: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:22043: 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:22003: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22047: 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
@@ -22008,7 +22052,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22011 "configure"
+#line 22055 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22027,16 +22071,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:22077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:22083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22047,14 +22091,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22050: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22094: 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:22057: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22101: 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
@@ -22062,7 +22106,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22065 "configure"
+#line 22109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22081,16 +22125,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22087: \$? = $ac_status" >&5
+  echo "$as_me:22131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22093: \$? = $ac_status" >&5
+  echo "$as_me:22137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22101,7 +22145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22104: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22148: 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"
@@ -22117,13 +22161,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22120: checking for connect" >&5
+    echo "$as_me:22164: 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 22126 "configure"
+#line 22170 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22154,16 +22198,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22160: \$? = $ac_status" >&5
+  echo "$as_me:22204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22166: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22173,11 +22217,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22176: result: $ac_cv_func_connect" >&5
+echo "$as_me:22220: 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:22180: checking for connect in -lsocket" >&5
+      echo "$as_me:22224: 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
@@ -22185,7 +22229,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22188 "configure"
+#line 22232 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22204,16 +22248,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22216: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22224,7 +22268,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22227: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22271: 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"
@@ -22233,13 +22277,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22236: checking for remove" >&5
+    echo "$as_me:22280: 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 22242 "configure"
+#line 22286 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22270,16 +22314,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22276: \$? = $ac_status" >&5
+  echo "$as_me:22320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22282: \$? = $ac_status" >&5
+  echo "$as_me:22326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22289,11 +22333,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22292: result: $ac_cv_func_remove" >&5
+echo "$as_me:22336: 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:22296: checking for remove in -lposix" >&5
+      echo "$as_me:22340: 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
@@ -22301,7 +22345,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22304 "configure"
+#line 22348 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22320,16 +22364,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22326: \$? = $ac_status" >&5
+  echo "$as_me:22370: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22332: \$? = $ac_status" >&5
+  echo "$as_me:22376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22340,7 +22384,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22343: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22387: 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"
@@ -22349,13 +22393,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22352: checking for shmat" >&5
+    echo "$as_me:22396: 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 22358 "configure"
+#line 22402 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22386,16 +22430,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22392: \$? = $ac_status" >&5
+  echo "$as_me:22436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22398: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22405,11 +22449,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22408: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22452: 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:22412: checking for shmat in -lipc" >&5
+      echo "$as_me:22456: 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
@@ -22417,7 +22461,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22420 "configure"
+#line 22464 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22436,16 +22480,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22448: \$? = $ac_status" >&5
+  echo "$as_me:22492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22456,7 +22500,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22459: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22503: 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"
@@ -22474,7 +22518,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22477: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22521: 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
@@ -22482,7 +22526,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22485 "configure"
+#line 22529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22501,16 +22545,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22507: \$? = $ac_status" >&5
+  echo "$as_me:22551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22513: \$? = $ac_status" >&5
+  echo "$as_me:22557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22521,7 +22565,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22524: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22568: 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"
@@ -22568,16 +22612,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22615: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22620: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22624: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22616,16 +22660,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22663: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22668: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22672: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22664,23 +22708,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22711: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22716: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22683: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22727: 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.
@@ -22697,7 +22741,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22700: result: $enable_warnings" >&5
+echo "$as_me:22744: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22720,10 +22764,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22767: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22726 "${as_me:-configure}"
+#line 22770 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22773,12 +22817,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22779: \$? = $ac_status" >&5
+  echo "$as_me:22823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22825: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22856,7 +22900,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22859 "configure"
+#line 22903 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22871,26 +22915,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22877: \$? = $ac_status" >&5
+  echo "$as_me:22921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22883: \$? = $ac_status" >&5
+  echo "$as_me:22927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22886: checking for X11/Xt const-feature" >&5
+echo "$as_me:22930: 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 22893 "configure"
+#line 22937 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22908,16 +22952,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22914: \$? = $ac_status" >&5
+  echo "$as_me:22958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22920: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22932,7 +22976,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22979: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22961,7 +23005,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 22964 "${as_me:-configure}"
+#line 23008 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -22977,7 +23021,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:22980: checking for $CC warning options..." >&5
+	{ echo "$as_me:23024: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22993,12 +23037,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22999: \$? = $ac_status" >&5
+  echo "$as_me:23043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23045: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -23006,7 +23050,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:23009: checking for $CC warning options..." >&5
+	{ echo "$as_me:23053: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23029,12 +23073,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23076: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23035: \$? = $ac_status" >&5
+  echo "$as_me:23079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23081: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23042,7 +23086,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23052,7 +23096,7 @@ echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23069,7 +23113,7 @@ fi
 
 fi
 
-echo "$as_me:23072: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23116: 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.
@@ -23091,7 +23135,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23138: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23205,23 +23249,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23208: checking for dmalloc.h" >&5
+	echo "$as_me:23252: 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 23214 "configure"
+#line 23258 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23224: \$? = $ac_status" >&5
+  echo "$as_me:23268: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23240,11 +23284,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23243: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23287: 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:23247: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23291: 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
@@ -23252,7 +23296,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23255 "configure"
+#line 23299 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23271,16 +23315,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23277: \$? = $ac_status" >&5
+  echo "$as_me:23321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23283: \$? = $ac_status" >&5
+  echo "$as_me:23327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23291,7 +23335,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23294: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23338: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23306,7 +23350,7 @@ fi
 
 fi
 
-echo "$as_me:23309: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23353: 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.
@@ -23328,7 +23372,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23375: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23442,23 +23486,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23445: checking for dbmalloc.h" >&5
+	echo "$as_me:23489: 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 23451 "configure"
+#line 23495 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23461: \$? = $ac_status" >&5
+  echo "$as_me:23505: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23477,11 +23521,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23480: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23524: 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:23484: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23528: 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
@@ -23489,7 +23533,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23492 "configure"
+#line 23536 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23508,16 +23552,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23514: \$? = $ac_status" >&5
+  echo "$as_me:23558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:23564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23528,7 +23572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23531: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23575: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23543,7 +23587,7 @@ fi
 
 fi
 
-echo "$as_me:23546: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23590: 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.
@@ -23565,7 +23609,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23612: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23678,7 +23722,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23681: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23725: 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.
@@ -23689,7 +23733,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23692: result: $with_no_leaks" >&5
+echo "$as_me:23736: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23707,7 +23751,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23710: checking for an rpath option" >&5
+	echo "$as_me:23754: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23738,12 +23782,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23785: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23746: checking if we need a space after rpath option" >&5
+		echo "$as_me:23790: 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"
 
@@ -23764,7 +23808,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23767 "configure"
+#line 23811 "configure"
 #include "confdefs.h"
 
 int
@@ -23776,16 +23820,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23782: \$? = $ac_status" >&5
+  echo "$as_me:23826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23788: \$? = $ac_status" >&5
+  echo "$as_me:23832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23795,14 +23839,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23798: result: $cf_rpath_space" >&5
+		echo "$as_me:23842: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23805: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23849: 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.
@@ -23820,22 +23864,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23823: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23867: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23828: checking for updated LDFLAGS" >&5
+echo "$as_me:23872: 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:23831: result: maybe" >&5
+	echo "$as_me:23875: 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:23838: checking for $ac_word" >&5
+echo "$as_me:23882: 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
@@ -23850,7 +23894,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23853: found $ac_dir/$ac_word" >&5
+echo "$as_me:23897: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23858,10 +23902,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23861: result: $cf_ldd_prog" >&5
+  echo "$as_me:23905: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23864: result: no" >&5
+  echo "$as_me:23908: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23875,7 +23919,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23878 "configure"
+#line 23922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23887,16 +23931,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23893: \$? = $ac_status" >&5
+  echo "$as_me:23937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23899: \$? = $ac_status" >&5
+  echo "$as_me:23943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23924,7 +23968,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23936,11 +23980,11 @@ echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23983: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23987: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23977,7 +24021,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23990,11 +24034,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24037: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24041: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24031,7 +24075,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24078: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24044,14 +24088,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24091: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24095: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24054: result: no" >&5
+	echo "$as_me:24098: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24141,7 +24185,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24188: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24322,7 +24366,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24325: error: ambiguous option: $1
+    { { echo "$as_me:24369: 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;}
@@ -24341,7 +24385,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24344: error: unrecognized option: $1
+  -*) { { echo "$as_me:24388: 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;}
@@ -24391,7 +24435,7 @@ do
   "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:24394: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24438: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24555,6 +24599,8 @@ s,@ECHO_LD@,$ECHO_LD,;t t
 s,@RULE_CC@,$RULE_CC,;t t
 s,@SHOW_CC@,$SHOW_CC,;t t
 s,@ECHO_CC@,$ECHO_CC,;t t
+s,@DESTDIR@,$DESTDIR,;t t
+s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
 s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
 s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
@@ -24705,7 +24751,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24708: creating $ac_file" >&5
+    { echo "$as_me:24754: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24723,7 +24769,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24772: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24736,7 +24782,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24739: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24785: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24752,7 +24798,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24755: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24801: 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;}
@@ -24761,7 +24807,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24764: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24810: 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;}
@@ -24806,7 +24852,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24809: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24855: 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;}
@@ -24817,7 +24863,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24820: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24866: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24866,7 +24912,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24915: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24877,7 +24923,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24926: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24890,7 +24936,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24893: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24939: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24948,7 +24994,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24951: $ac_file is unchanged" >&5
+      { echo "$as_me:24997: $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/test/configure.in b/test/configure.in
index 6c95207ed..5f5c279ae 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
+dnl $Id: configure.in,v 1.178 2024/08/11 09:08:54 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -118,6 +118,7 @@ AM_LANGINFO_CODESET
 dnl ---------------------------------------------------------------------------
 CF_PKG_CONFIG
 CF_DISABLE_ECHO
+CF_INSTALL_PREFIX
 
 dnl ---------------------------------------------------------------------------
 CF_HELP_MESSAGE(Curses Version-dependent Options:)

From 62bef27cadb2ef63383a4bcee35759c1fa969fe8 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 25 Aug 2024 02:54:42 +0200
Subject: [PATCH 081/106] ncurses-6.5-20240824.patch.gz

---
 NEWS                             |  6 +++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 package/debian-mingw/changelog   |  4 ++--
 package/debian-mingw64/changelog |  4 ++--
 package/debian/changelog         |  4 ++--
 package/mingw-ncurses.nsi        |  4 ++--
 package/mingw-ncurses.spec       |  2 +-
 package/ncurses.spec             |  2 +-
 package/ncursest.spec            |  2 +-
 progs/Makefile.in                |  4 ++--
 progs/infocmp.c                  | 27 ++++++++++++++++++---------
 progs/tabs.c                     |  9 +++++----
 test/demo_keyok.c                |  6 ++++--
 14 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/NEWS b/NEWS
index 163f2ade9..5a5ca9c75 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 tom Exp $
+-- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240824
+	+ modify infocmp and tabs to use actual name in usage and header.
+	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
+
 20240817
 	+ review/update foot for 1.18.1 -TD
 	+ add a note about DomTerm 3.2.0 -TD
diff --git a/VERSION b/VERSION
index 69b699ade..e7e7f7b2b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240817
+5:0:10	6.5	20240824
diff --git a/dist.mk b/dist.mk
index a097f1612..bc004fc38 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 tom Exp $
+# $Id: dist.mk,v 1.1628 2024/08/24 10:17:07 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240817
+NCURSES_PATCH = 20240824
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 17a647ef2..b001006e6 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240817) unstable; urgency=low
+ncurses6td (6.5+20240824) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 17a647ef2..b001006e6 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240817) unstable; urgency=low
+ncurses6td (6.5+20240824) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9048748d5..2314c51a9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240817) unstable; urgency=low
+ncurses6td (6.5+20240824) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index b1af1d5b0..23f50ebac 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0817"
+!define VERSION_MMDD  "0824"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ca3ca21db..d1824c122 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240817
+Release: 20240824
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a6b53eac4..b82a6b083 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240817
+Release: 20240824
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e094d2b71..ecd401b1d 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240817
+Release: 20240824
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/Makefile.in b/progs/Makefile.in
index a5d0798f7..82c9940ac 100644
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
+# $Id: Makefile.in,v 1.117 2024/08/24 22:51:58 tom Exp $
 ##############################################################################
 # Copyright 2020-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
@@ -95,7 +95,7 @@ CFLAGS		= @CFLAGS@ @EXTRA_CFLAGS@
 
 INCDIR		= $(top_srcdir)/include
 NCUDIR		= $(top_srcdir)/ncurses
-CPPFLAGS	= -DHAVE_CONFIG_H -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
+CPPFLAGS	= -DHAVE_CONFIG_H -DACTUAL_TIC="\"$(actual_tic)\"" -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
 
 CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
 
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 7932203ac..af2ad7790 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,11 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.163 2023/12/16 17:27:47 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.164 2024/08/24 22:57:24 tom Exp $")
+
+#ifndef ACTUAL_TIC
+#define ACTUAL_TIC "tic"
+#endif
 
 #define MAX_STRING	1024	/* maximum formatted string */
 
@@ -61,6 +65,9 @@ typedef char path[PATH_MAX];
 static ENTRY *entries;		/* terminfo entries */
 static int termcount;		/* count of terminal entries */
 
+static const char usage_string[] = \
+"Usage: %s [options] [-A directory] [-B directory] [termname...]";
+
 static bool limited = TRUE;	/* "-r" option is not set */
 static bool quiet = FALSE;
 static bool literal = FALSE;
@@ -1216,7 +1223,6 @@ usage(void)
 #define DATA(s) s "\n"
     static const char head[] =
     {
-	DATA("Usage: infocmp [options] [-A directory] [-B directory] [termname...]")
 	DATA("")
 	DATA("Options:")
     };
@@ -1271,14 +1277,16 @@ usage(void)
     const size_t last = SIZEOF(options);
     const size_t left = (last + 1) / 2;
     size_t n;
+    FILE *fp = stderr;
 
-    fputs(head, stderr);
+    fprintf(fp, usage_string, _nc_progname);
+    fputs(head, fp);
     for (n = 0; n < left; n++) {
 	size_t m = n + left;
 	if (m < last)
-	    fprintf(stderr, "%-40.40s%s\n", options[n], options[m]);
+	    fprintf(fp, "%-40.40s%s\n", options[n], options[m]);
 	else
-	    fprintf(stderr, "%s\n", options[n]);
+	    fprintf(fp, "%s\n", options[n]);
     }
     ExitProgram(EXIT_FAILURE);
 }
@@ -1933,8 +1941,8 @@ main(int argc, char *argv[])
 				   tname[0]);
 		if (!quiet)
 		    (void)
-			printf("#\tReconstructed via infocmp from file: %s\n",
-			       tfile[0]);
+			printf("#\tReconstructed via %s from file: %s\n",
+			       _nc_progname, tfile[0]);
 		dump_entry(&entries[0].tterm,
 			   suppress_untranslatable,
 			   limited,
@@ -1980,7 +1988,8 @@ main(int argc, char *argv[])
     } else if (compare == C_USEALL) {
 	(void) fprintf(stderr, "Sorry, -u doesn't work with -F\n");
     } else if (compare == C_DEFAULT) {
-	(void) fprintf(stderr, "Use `tic -[CI] <file>' for this.\n");
+	(void) fprintf(stderr,
+		       "Use `" ACTUAL_TIC " -[CI] <file>' for this.\n");
     } else if (argc - optind != 2) {
 	(void) fprintf(stderr,
 		       "File comparison needs exactly two file arguments.\n");
diff --git a/progs/tabs.c b/progs/tabs.c
index a630b044e..113c42ab0 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
 #include <progs.priv.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tabs.c,v 1.53 2023/11/04 20:46:09 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.54 2024/08/24 22:56:43 tom Exp $")
 
 static GCC_NORETURN void usage(void);
 
@@ -445,7 +445,6 @@ usage(void)
 #define DATA(s) s "\n"
     static const char msg[] =
     {
-	DATA("Usage: tabs [options] [tabstop-list]")
 	DATA("")
 	DATA("Options:")
 	DATA("  -0       reset tabs")
@@ -468,9 +467,11 @@ usage(void)
 	DATA("or 1,+10,+10 which is the same.")
     };
 #undef DATA
+    FILE *fp = stderr;
 
     fflush(stdout);
-    fputs(msg, stderr);
+    fprintf(fp, "Usage: %s [options] [tabstop-list]\n", _nc_progname);
+    fputs(msg, fp);
     ExitProgram(EXIT_FAILURE);
 }
 
diff --git a/test/demo_keyok.c b/test/demo_keyok.c
index 8f4ae906b..f26d2c9d3 100644
--- a/test/demo_keyok.c
+++ b/test/demo_keyok.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2002-2006,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $
+ * $Id: demo_keyok.c,v 1.10 2024/08/24 17:16:49 tom Exp $
  *
  * Demonstrate the keyok() function.
  * Thomas Dickey - 2002/11/23
@@ -93,6 +93,8 @@ main(int argc, char *argv[])
 
     while ((ch = wgetch(win)) != ERR) {
 	const char *name = keyname(ch);
+	if (ch == QUIT)
+	    break;
 	if (ch == ESCAPE && prior == ch)
 	    break;
 	prior = ch;

From 1d3a870993398cca000970ea429d626f3e74cfdc Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 1 Sep 2024 00:36:56 +0200
Subject: [PATCH 082/106] ncurses-6.5-20240831.patch.gz

---
 NEWS                             | 14 +++++++++++++-
 VERSION                          |  2 +-
 configure                        |  4 ++--
 configure.in                     |  6 +++---
 dist.mk                          |  4 ++--
 include/nc_mingw.h               |  8 +++++---
 include/nc_win32.h               |  8 +++++---
 include/win32_curses.h           |  7 ++-----
 ncurses/base/lib_getch.c         | 10 +++++-----
 ncurses/curses.priv.h            | 32 ++++++++++++++++++++++++++------
 ncurses/tinfo/lib_napms.c        |  6 +++---
 ncurses/tinfo/lib_print.c        |  4 ++--
 ncurses/tinfo/lib_setup.c        |  7 +++----
 ncurses/tinfo/lib_win32con.c     |  6 +++---
 ncurses/tinfo/lib_win32util.c    |  8 ++++----
 ncurses/tinfo/tinfo_driver.c     |  4 ++--
 ncurses/tinfo/write_entry.c      |  4 ++--
 ncurses/trace/lib_trace.c        |  4 ++--
 ncurses/widechar/widechars.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 +-
 package/ncursest.spec            |  2 +-
 test/dots_termcap.c              |  8 ++++----
 test/dots_xcurses.c              |  6 +++---
 test/rain.c                      |  6 +++---
 test/test.priv.h                 | 10 +++++-----
 test/test_mouse.c                |  4 ++--
 test/widechars.h                 |  4 ++--
 32 files changed, 119 insertions(+), 87 deletions(-)

diff --git a/NEWS b/NEWS
index 5a5ca9c75..cdf3387c2 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 tom Exp $
+-- $Id: NEWS,v 1.4169 2024/08/31 21:21:26 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,18 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240831
+	+ build-fix for a case in msys2 where gettimeofday() was available but
+	  the fallback was partly configured.
+	> patch by Rafael Kitover:
+	+ separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE,
+	  for MinGW and other native Win32 support, and _NC_WINDOWS, to make
+	  some Win32 features available under the Cygwin runtime, in this case
+	  the term-driver.
+	+ make some minor adjustments to allow
+	      ./configure --enable-term-driver
+	  to also work on Cygwin platforms such as Cygwin and MSYS2.
+
 20240824
 	+ modify infocmp and tabs to use actual name in usage and header.
 	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
diff --git a/VERSION b/VERSION
index e7e7f7b2b..d39bfce24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240824
+5:0:10	6.5	20240831
diff --git a/configure b/configure
index a86d695cd..839bb6fe6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.785 .
+# From configure.in Revision: 1.786 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -28526,7 +28526,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base"
 if test "$with_term_driver" != no ; then
 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
 	case "$cf_cv_system_name" in
-	(*mingw32*|*mingw64*)
+	(*mingw32*|*mingw64*|*msys*|*cygwin*)
 		if test "x$with_exp_win32" = xyes ; then
 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
 		else
diff --git a/configure.in b/configure.in
index a15756d3d..05f3fdf7b 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 tom Exp $
+dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.785 $)
+AC_REVISION($Revision: 1.786 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -2075,7 +2075,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base"
 if test "$with_term_driver" != no ; then
 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
 	case "$cf_cv_system_name" in
-	(*mingw32*|*mingw64*)
+	(*mingw32*|*mingw64*|*msys*|*cygwin*)
 		if test "x$with_exp_win32" = xyes ; then
 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
 		else
diff --git a/dist.mk b/dist.mk
index bc004fc38..ce9d7ab5a 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1628 2024/08/24 10:17:07 tom Exp $
+# $Id: dist.mk,v 1.1629 2024/08/31 09:52:35 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240824
+NCURSES_PATCH = 20240831
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_mingw.h b/include/nc_mingw.h
index c36f22288..6465e8b16 100644
--- a/include/nc_mingw.h
+++ b/include/nc_mingw.h
@@ -31,12 +31,14 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_mingw.h,v 1.12 2024/05/04 19:16:38 tom Exp $ */
+/* $Id: nc_mingw.h,v 1.13 2024/08/31 15:50:24 tom Exp $ */
 
 #ifndef NC_MINGW_H
 #define NC_MINGW_H 1
 
-#ifdef _WIN32
+#include <ncurses_cfg.h>
+
+#if defined(_WIN32) || defined(__MSYS__) || defined(__CYGWIN__)
 
 #ifdef WINVER
 #  if WINVER < 0x0501
@@ -85,6 +87,6 @@ NCURSES_EXPORT(int) _nc_wcwidth(uint32_t);
 }
 #endif
 
-#endif /* _WIN32 */
+#endif /* _WIN32|__MSYS__|__CYGWIN__ */
 
 #endif /* NC_MINGW_H */
diff --git a/include/nc_win32.h b/include/nc_win32.h
index f069d5043..5ed0baab8 100644
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -31,15 +31,17 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */
+/* $Id: nc_win32.h,v 1.13 2024/08/31 18:17:21 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
 
+#include <ncurses_cfg.h>
+
 #if defined(_WIN32) || defined(_WIN64)
 
-#ifndef _NC_WINDOWS
-#define _NC_WINDOWS
+#ifndef _NC_WINDOWS_NATIVE
+#define _NC_WINDOWS_NATIVE
 #endif
 
 #ifdef TERMIOS
diff --git a/include/win32_curses.h b/include/win32_curses.h
index 0c807a022..06fb20a6b 100644
--- a/include/win32_curses.h
+++ b/include/win32_curses.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  * Author: Juergen Pfeifer, 2008-on                                         *
  ****************************************************************************/
 
-/* $Id: win32_curses.h,v 1.3 2021/06/17 21:26:02 tom Exp $ */
+/* $Id: win32_curses.h,v 1.4 2024/08/31 18:17:44 tom Exp $ */
 
 /*
  * This is the interface we use on Windows to mimic the control of the settings
@@ -68,8 +68,5 @@ extern NCURSES_EXPORT(int)   _nc_console_flush(void* handle);
 #undef sleep
 #define sleep(n) Sleep((n) * 1000)
 
-#undef gettimeofday
-#define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
-
 #endif /* _NC_WIN32_CURSES_H */
 #endif /* _WIN32||_WIN64 */
diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 8e4767918..3d9a06745 100644
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.146 2023/04/29 18:57:12 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.147 2024/08/31 15:54:49 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -135,7 +135,7 @@ _nc_use_meta(WINDOW *win)
 }
 
 #ifdef USE_TERM_DRIVER
-# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER)
+# if defined(_NC_WINDOWS_NATIVE) && !defined(EXP_WIN32_DRIVER)
 static HANDLE
 _nc_get_handle(int fd)
 {
@@ -163,7 +163,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
 				   _nc_console_handle(sp->_ifd),
 				   delay EVENTLIST_2nd(evl));
     } else
-# elif defined(_NC_WINDOWS)
+# elif defined(_NC_WINDOWS_NATIVE)
     /* if we emulate terminfo on console, we have to use the console routine */
     if (IsTermInfoOnConsole(sp)) {
 	HANDLE fd = _nc_get_handle(sp->_ifd);
@@ -315,7 +315,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 				 &buf);
 	    _nc_set_read_thread(FALSE);
 	} else
-# elif defined(_NC_WINDOWS)
+# elif defined(_NC_WINDOWS_NATIVE)
 	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp))
 	    n = _nc_mingw_console_read(sp,
 				       _nc_get_handle(sp->_ifd),
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 6d0dbcdf1..2d579b6c3 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.689 2024/05/11 19:05:45 tom Exp $
+ * $Id: curses.priv.h,v 1.690 2024/08/31 10:46:01 Rafael.Kitover Exp $
  *
  *	curses.priv.h
  *
@@ -88,13 +88,24 @@ extern int errno;
 #endif
 
 /* Some Windows related defines */
+
 #undef _NC_WINDOWS
-#if (defined(_WIN32) || defined(_WIN64))
+#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__) || defined(__CYGWIN__))
 #define _NC_WINDOWS
 #else
 #undef EXP_WIN32_DRIVER
 #endif
 
+#undef _NC_CYGWIN
+#if (defined(__MSYS__) || defined(__CYGWIN__))
+#define _NC_CYGWIN
+#endif
+
+#undef _NC_WINDOWS_NATIVE
+#if (defined(_WIN32) || defined(_WIN64))
+#define _NC_WINDOWS_NATIVE
+#endif
+
 #undef _NC_MINGW
 #if (defined(__MINGW32__) || defined(__MINGW64__))
 #define _NC_MINGW
@@ -197,7 +208,7 @@ extern int errno;
  * the path separator in configure doesn't work properly. So, if building
  * for MinGW, we enforce the correct Windows PATH separator
  */
-#if defined(_NC_WINDOWS)
+#if defined(_NC_WINDOWS_NATIVE)
 #  ifdef NCURSES_PATHSEP
 #    undef NCURSES_PATHSEP
 #  endif
@@ -222,6 +233,15 @@ extern int errno;
 		   0)
 #endif
 
+/*
+ * The stricmp() function is in MSVCRT, and cannot be called or linked from
+ * Cygwin runtime-dependent binaries currently. Use the POSIX strcaseccmp()
+ * function instead which is pretty much the same.
+ */
+#if defined(_NC_CYGWIN)
+#define stricmp(s1, s2) strcasecmp(s1, s2)
+#endif
+
 /*
  * Not all platforms have memmove; some have an equivalent bcopy.  (Some may
  * have neither).
@@ -2238,7 +2258,7 @@ extern NCURSES_EXPORT(int) _nc_eventlist_timeout(_nc_eventlist *);
  */
 #if USE_WIDEC_SUPPORT
 
-#if defined(_NC_WINDOWS) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
+#if defined(_NC_WINDOWS_NATIVE) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */
@@ -2252,9 +2272,9 @@ extern int __MINGW_NOTHROW _nc_mbtowc(wchar_t *, const char *, size_t);
 extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
 #define mblen(s,n) _nc_mblen(s, n)
 
-#endif /* _NC_WINDOWS && !_NC_MSC */
+#endif /* _NC_WINDOWS_NATIVE && !_NC_MSC */
 
-#if defined(_NC_WINDOWS) || defined(_NC_MINGW)
+#if defined(_NC_WINDOWS_NATIVE) || defined(_NC_MINGW)
 /* see wcwidth.c */
 extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t);
 #define wcwidth(ucs) _nc_wcwidth(ucs)
diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index 1b89a54c7..1a1920cac 100644
--- a/ncurses/tinfo/lib_napms.c
+++ b/ncurses/tinfo/lib_napms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_napms.c,v 1.28 2023/09/16 16:09:33 tom Exp $")
+MODULE_ID("$Id: lib_napms.c,v 1.29 2024/08/31 15:55:00 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
@@ -78,7 +78,7 @@ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
 	    request = remaining;
 	}
     }
-#elif defined(_NC_WINDOWS)
+#elif defined(_NC_WINDOWS_NATIVE)
     Sleep((DWORD) ms);
 #else
     _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index f78ca039a..17072a2f1 100644
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -40,7 +40,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_print.c,v 1.32 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_print.c,v 1.33 2024/08/31 10:46:01 Rafael.Kitover Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
@@ -98,7 +98,7 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
      * kernel will ship the contiguous clist items from the last write
      * immediately.
      */
-#ifndef _NC_WINDOWS
+#ifndef _NC_WINDOWS_NATIVE
     (void) sleep(0);
 #endif
     free(mybuf);
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 449c963e3..3174e583a 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.242 2024/07/27 19:14:45 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.244 2024/08/31 21:15:54 tom Exp $")
 
 /****************************************************************************
  *
@@ -334,7 +334,6 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 	char *s;
 	char cc;
 	const char *skipped;
-	int scanned;
 
 	s = memset(buf, '\0', sizeof(buf));
 	do {
@@ -350,7 +349,7 @@ get_position(TERMINAL *termp, int fd, int *row, int *col)
 	cc = '\0';
 	if (skipped != buf
 	    && *skipped != '\0'
-	    && (scanned = sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc)) == 3
+	    && sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc) == 3
 	    && (cc == 'R')) {
 	    *row = y;
 	    *col = x;
@@ -759,7 +758,7 @@ _nc_unicode_locale(void)
     static int result = 0;
 
     if (!initialized) {
-#if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT
+#if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT
 	result = 1;
 #elif HAVE_LANGINFO_CODESET
 	char *env = nl_langinfo(CODESET);
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index 2d6857aeb..ee58ba7fe 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,9 +38,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32con.c,v 1.14 2023/08/05 20:44:38 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.15 2024/08/31 15:55:10 tom Exp $")
 
-#ifdef _NC_WINDOWS
+#if defined(_NC_WINDOWS)
 
 #ifdef _NC_MINGW
 #include <wchar.h>
diff --git a/ncurses/tinfo/lib_win32util.c b/ncurses/tinfo/lib_win32util.c
index c67c8ceb9..92d9e8a38 100644
--- a/ncurses/tinfo/lib_win32util.c
+++ b/ncurses/tinfo/lib_win32util.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,9 +34,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32util.c,v 1.4 2023/06/17 17:19:06 tom Exp $")
+MODULE_ID("$Id: lib_win32util.c,v 1.5 2024/08/31 15:55:16 tom Exp $")
 
-#ifdef _NC_WINDOWS
+#ifdef _NC_WINDOWS_NATIVE
 #include <io.h>
 
 #ifdef _NC_CHECK_MINTTY
@@ -131,4 +131,4 @@ _nc_gettimeofday(struct timeval *tv, void *tz GCC_UNUSED)
 }
 #endif // HAVE_GETTIMEOFDAY == 2
 
-#endif // _NC_WINDOWS
+#endif // _NC_WINDOWS_NATIVE
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index a9f14850d..1ed9c0529 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.75 2024/05/11 19:20:44 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.76 2024/08/31 10:46:01 Rafael.Kitover Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -1504,7 +1504,7 @@ typedef struct DriverEntry {
 
 static DRIVER_ENTRY DriverTable[] =
 {
-#ifdef _NC_WINDOWS
+#ifdef USE_WIN32CON_DRIVER
     {"win32console", &_nc_WIN_DRIVER},
 #endif
     {"tinfo", &_nc_TINFO_DRIVER}	/* must be last */
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index a4cadb050..df62a7a01 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.133 2024/07/27 19:15:16 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.134 2024/08/31 10:46:01 Rafael.Kitover Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -200,7 +200,7 @@ make_db_root(const char *path)
 
 	if ((rc = stat(path, &statbuf)) == -1) {
 	    rc = mkdir(path
-#ifndef _NC_WINDOWS
+#ifndef _NC_WINDOWS_NATIVE
 		       ,0777
 #endif
 		);
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 0904c132f..680187de9 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.106 2024/02/24 18:28:19 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -261,7 +261,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 	if ((pthread_self))
 # endif
 	    fprintf(fp, "%#" PRIxPTR ":",
-#ifdef _NC_WINDOWS
+#ifdef _NC_WINDOWS_NATIVE
 		    CASTxPTR(pthread_self().p)
 #else
 		    CASTxPTR(pthread_self())
diff --git a/ncurses/widechar/widechars.c b/ncurses/widechar/widechars.c
index d05ba98a8..0c676b1a0 100644
--- a/ncurses/widechar/widechars.c
+++ b/ncurses/widechar/widechars.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2012,2013 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,9 +31,9 @@
 
 #if USE_WIDEC_SUPPORT
 
-MODULE_ID("$Id: widechars.c,v 1.9 2020/08/29 16:22:03 juergen Exp $")
+MODULE_ID("$Id: widechars.c,v 1.10 2024/08/31 15:55:27 tom Exp $")
 
-#if (defined(_NC_WINDOWS)) && !defined(_NC_MSC)
+#if defined(_NC_MINGW)
 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */
@@ -148,6 +148,6 @@ _nc_wctomb(char *s, wchar_t wc)
     return result;
 }
 
-#endif /* _NC_WINDOWS */
+#endif /* _NC_MINGW */
 
 #endif /* USE_WIDEC_SUPPORT */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b001006e6..a9cfa2556 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240824) unstable; urgency=low
+ncurses6td (6.5+20240831) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b001006e6..a9cfa2556 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240824) unstable; urgency=low
+ncurses6td (6.5+20240831) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2314c51a9..f5a73f6c9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240824) unstable; urgency=low
+ncurses6td (6.5+20240831) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 23f50ebac..49b20c4bf 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.664 2024/08/31 09:52:35 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0824"
+!define VERSION_MMDD  "0831"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index d1824c122..0f57a7442 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240824
+Release: 20240831
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b82a6b083..a650b33c6 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240824
+Release: 20240831
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index ecd401b1d..7f50b6e09 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240824
+Release: 20240831
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index 65786c411..50946ce4a 100644
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,14 +30,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $
+ * $Id: dots_termcap.c,v 1.33 2024/08/31 15:55:46 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
 #define USE_TINFO
 #include <test.priv.h>
 
-#if !defined(_NC_WINDOWS)
+#if !defined(_NC_WINDOWS_NATIVE)
 #include <sys/time.h>
 #endif
 
@@ -162,7 +162,7 @@ static void
 my_napms(int ms)
 {
     if (ms > 0) {
-#if defined(_NC_WINDOWS)
+#if defined(_NC_WINDOWS_NATIVE)
 	Sleep((unsigned int) ms);
 #else
 	struct timeval data;
diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index b4b52193d..2472dc60f 100644
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,13 +30,13 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $
+ * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
 #include <test.priv.h>
 
-#if !defined(_NC_WINDOWS)
+#if !defined(_NC_WINDOWS_NATIVE)
 #include <sys/time.h>
 #endif
 
diff --git a/test/rain.c b/test/rain.c
index 1b1d81a05..11d0fda55 100644
--- a/test/rain.c
+++ b/test/rain.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $
+ * $Id: rain.c,v 1.58 2024/08/31 15:56:10 tom Exp $
  */
 #include <test.priv.h>
 #include <popup_msg.h>
@@ -229,7 +229,7 @@ draw_drop(void *arg)
      * Find myself in the list of threads so we can count the number of loops.
      */
     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
-#if defined(_NC_WINDOWS) && !defined(__WINPTHREADS_VERSION)
+#if defined(_NC_WINDOWS_NATIVE) && !defined(__WINPTHREADS_VERSION)
 	if (drop_threads[mystats].myself.p == pthread_self().p)
 #else
 	if (drop_threads[mystats].myself == pthread_self())
diff --git a/test/test.priv.h b/test/test.priv.h
index a901185b8..e2a969fef 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */
+/* $Id: test.priv.h,v 1.219 2024/08/31 10:46:01 Rafael.Kitover Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -1047,12 +1047,12 @@ extern int TABSIZE;
 #define EXIT_FAILURE 1
 #endif
 
-#undef _NC_WINDOWS
+#undef _NC_WINDOWS_NATIVE
 #if (defined(_WIN32) || defined(_WIN64))
-#define _NC_WINDOWS 1
+#define _NC_WINDOWS_NATIVE 1
 #endif
 
-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
+#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
 
 #if defined(PDCURSES)
 #ifdef WINVER
@@ -1184,7 +1184,7 @@ extern char *_nc_strstr(const char *, const char *);
 #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
 #endif
 
-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
+#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
 #define SetupAlarm(opt)	(void)opt
 #else
 #define SetupAlarm(opt)	if (opt) alarm((unsigned)opt)
diff --git a/test/test_mouse.c b/test/test_mouse.c
index 5508ea42f..fa37a0af2 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $
+ * $Id: test_mouse.c,v 1.32 2024/08/31 10:46:01 Rafael.Kitover Exp $
  *
  * Author: Leonid S Usov
  *
@@ -31,7 +31,7 @@
 
 #include <test.priv.h>
 
-#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS)
+#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS_NATIVE)
 
 static int logoffset = 0;
 
diff --git a/test/widechars.h b/test/widechars.h
index 2578a9253..fe38243b0 100644
--- a/test/widechars.h
+++ b/test/widechars.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2012 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #if USE_WIDEC_SUPPORT
 
-#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER)
+#if defined(_NC_MINGW)
 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */

From c72b70cbb753a0cd4f86530b8747d770b2583b0a Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 15 Sep 2024 02:18:41 +0200
Subject: [PATCH 083/106] ncurses-6.5-20240914.patch.gz

---
 NEWS                                    |   12 +-
 VERSION                                 |    2 +-
 dist.mk                                 |    4 +-
 doc/html/NCURSES-Programming-HOWTO.html | 4249 ++++++++++++-----------
 doc/html/man/captoinfo.1m.html          |   53 +-
 doc/html/man/curs_bkgd.3x.html          |   14 +-
 doc/html/man/curs_bkgrnd.3x.html        |   28 +-
 doc/html/man/curs_extend.3x.html        |   14 +-
 doc/html/man/curs_get_wch.3x.html       |   18 +-
 doc/html/man/curs_getch.3x.html         |   53 +-
 doc/html/man/curs_initscr.3x.html       |    8 +-
 doc/html/man/curs_inopts.3x.html        |   72 +-
 doc/html/man/curs_ins_wstr.3x.html      |   10 +-
 doc/html/man/curs_instr.3x.html         |   10 +-
 doc/html/man/curs_inwstr.3x.html        |   16 +-
 doc/html/man/curs_kernel.3x.html        |  104 +-
 doc/html/man/curs_outopts.3x.html       |   28 +-
 doc/html/man/curs_refresh.3x.html       |   10 +-
 doc/html/man/curs_scroll.3x.html        |   32 +-
 doc/html/man/curs_termcap.3x.html       |   73 +-
 doc/html/man/curs_terminfo.3x.html      |  278 +-
 doc/html/man/curs_util.3x.html          |    8 +-
 doc/html/man/curs_variables.3x.html     |   16 +-
 doc/html/man/curs_window.3x.html        |   42 +-
 doc/html/man/infocmp.1m.html            |   25 +-
 doc/html/man/legacy_coding.3x.html      |   14 +-
 doc/html/man/ncurses.3x.html            |  625 ++--
 doc/html/man/tabs.1.html                |   75 +-
 doc/html/man/terminfo.5.html            |    4 +-
 doc/html/man/tic.1m.html                |   10 +-
 doc/html/man/tput.1.html                |   12 +-
 man/captoinfo.1m                        |   11 +-
 man/curs_bkgd.3x                        |   10 +-
 man/curs_bkgrnd.3x                      |   19 +-
 man/curs_extend.3x                      |    6 +-
 man/curs_get_wch.3x                     |   14 +-
 man/curs_getch.3x                       |   15 +-
 man/curs_initscr.3x                     |   10 +-
 man/curs_inopts.3x                      |   25 +-
 man/curs_ins_wstr.3x                    |    6 +-
 man/curs_instr.3x                       |   26 +-
 man/curs_inwstr.3x                      |   28 +-
 man/curs_kernel.3x                      |  163 +-
 man/curs_outopts.3x                     |   63 +-
 man/curs_refresh.3x                     |    6 +-
 man/curs_scroll.3x                      |   29 +-
 man/curs_termcap.3x                     |  293 +-
 man/curs_terminfo.3x                    |   99 +-
 man/curs_util.3x                        |   10 +-
 man/curs_variables.3x                   |   60 +-
 man/curs_window.3x                      |   38 +-
 man/infocmp.1m                          |   41 +-
 man/legacy_coding.3x                    |   17 +-
 man/manlinks.sed                        |    3 +-
 man/ncurses.3x                          |   49 +-
 man/tabs.1                              |   42 +-
 man/terminfo.tail                       |    4 +-
 man/tic.1m                              |    6 +-
 man/tput.1                              |    6 +-
 misc/ncurses-config.in                  |    6 +-
 misc/terminfo.src                       |   18 +-
 ncurses/tinfo/lib_tputs.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 +-
 69 files changed, 3805 insertions(+), 3269 deletions(-)

diff --git a/NEWS b/NEWS
index cdf3387c2..4e6144d53 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4169 2024/08/31 21:21:26 tom Exp $
+-- $Id: NEWS,v 1.4175 2024/09/14 23:14:09 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240914
+	+ modify _nc_flush() to also flush stderr to help the flash capability
+	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
+	+ omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ improve examples in NCURSES-Programming-HOWTO.html
+	+ update comments in terminfo.src -TD
+
 20240831
 	+ build-fix for a case in msys2 where gettimeofday() was available but
 	  the fallback was partly configured.
@@ -4387,7 +4395,7 @@ it is not possible to add this information.
 20140621
 	+ change shared-library suffix for AIX 5 and 6 to ".so", avoiding
 	  conflict with the static library (report by Ben Lentz).
-	+ document RPATH_LIST in INSTALLATION file, as part of workarounds for
+	+ document RPATH_LIST in INSTALL file, as part of workarounds for
 	  upgrading an ncurses library using the "--with-shared" option.
 	+ modify test/ncurses.c c/C tests to cycle through subsets of the
 	  total number of colors, to better illustrate 8/16/88/256-colors by
diff --git a/VERSION b/VERSION
index d39bfce24..6f3ed76c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240831
+5:0:10	6.5	20240914
diff --git a/dist.mk b/dist.mk
index ce9d7ab5a..b9ef8f91c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1629 2024/08/31 09:52:35 tom Exp $
+# $Id: dist.mk,v 1.1631 2024/09/14 12:14:00 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240831
+NCURSES_PATCH = 20240914
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/NCURSES-Programming-HOWTO.html b/doc/html/NCURSES-Programming-HOWTO.html
index 9a3f078d2..cc6127d98 100644
--- a/doc/html/NCURSES-Programming-HOWTO.html
+++ b/doc/html/NCURSES-Programming-HOWTO.html
@@ -15,27 +15,53 @@
       <h1 class="TITLE"><a name="AEN2" id="AEN2">NCURSES
       Programming HOWTO</a></h1>
 
-      <h3 class="AUTHOR"><a name="AEN4" id="AEN4">Pradeep
-      Padala</a></h3>
+      <div class="AUTHORGROUP">
+        <a name="AEN4" id="AEN4"></a>
+        <h3 class="AUTHOR"><a name="AEN5" id="AEN5">Pradeep
+        Padala</a></h3>
+
+        <div class="AFFILIATION">
+          <div class="ADDRESS">
+            <p class="ADDRESS"><code class="EMAIL">&lt;<a href=
+            "mailto:ppadala@gmail.com">ppadala@gmail.com</a>&gt;</code>
+            </p>
+          </div>
+        </div>
 
-      <div class="AFFILIATION">
-        <div class="ADDRESS">
-          <p class="ADDRESS"><code class="EMAIL">&lt;<a href=
-          "mailto:ppadala@gmail.com">ppadala@gmail.com</a>&gt;</code>
-          </p>
+        <h3 class="AUTHOR"><a name="AEN11" id="AEN11">Thomas E.
+        Dickey</a></h3>
+
+        <div class="AFFILIATION">
+          <div class="ADDRESS">
+            <p class="ADDRESS"><code class="EMAIL">&lt;<a href=
+            "mailto:dickey@invisible-island.net">dickey@invisible-island.net</a>&gt;</code>
+            </p>
+          </div>
         </div>
       </div>
 
-      <p class="PUBDATE">v1.9, 2005-06-20<br></p>
+      <p class="PUBDATE">v2.1, 2024-09-08<br></p>
 
       <div class="REVHISTORY">
-        <table width="100%" border="0" summary="revisions">
+        <table width="100%" border="0">
           <tr>
             <th align="left" valign="top" colspan="3"><b>Revision
             History</b>
             </th>
           </tr>
 
+          <tr>
+            <td align="left">Revision 2.1</td>
+            <td align="left">2024-09-08</td>
+            <td align="left">Revised by: dickey</td>
+          </tr>
+
+          <tr>
+            <td align="left" colspan="3">Fixes for the sample
+            programs. Remove obsolete mailing addresses. Update
+            publication date.</td>
+          </tr>
+
           <tr>
             <td align="left">Revision 2.0</td>
             <td align="left">2022-12-03</td>
@@ -179,14 +205,14 @@ <h3 class="AUTHOR"><a name="AEN4" id="AEN4">Pradeep
 
       <div>
         <div class="ABSTRACT">
-          <a name="AEN72" id="AEN72"></a>
+          <a name="AEN85" id="AEN85"></a>
           <p><span class="emphasis"><i class="EMPHASIS">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 <a href=
-          "mailto:ppadala@gmail.com" target="_top">this
+          "mailto:bug-ncurses@gnu.org" target="_top">this
           address</a></i></span>
           </p>
         </div>
@@ -223,8 +249,8 @@ <h3 class="AUTHOR"><a name="AEN4" id="AEN4">Pradeep
 
             <dd>
               <dl>
-                <dt>1.6.1. <a href="#LISTFORMATS">Readily available
-                formats from tldp.org</a></dt>
+                <dt>1.6.1. <a href="#LISTFORMATS">Alternative
+                formats</a></dt>
 
                 <dt>1.6.2. <a href="#BUILDSOURCE">Building from
                 source</a></dt>
@@ -299,7 +325,7 @@ <h3 class="AUTHOR"><a name="AEN4" id="AEN4">Pradeep
             <dt>6.1. <a href="#ADDCHCLASS">addch() class of
             functions</a></dt>
 
-            <dt>6.2. <a href="#AEN303">mvaddch(), waddch() and
+            <dt>6.2. <a href="#AEN324">mvaddch(), waddch() and
             mvwaddch()</a></dt>
 
             <dt>6.3. <a href="#PRINTWCLASS">printw() class of
@@ -658,7 +684,7 @@ <h2 class="SECT1"><a name="INTRO" id="INTRO">1.
       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
+      through these series of bytes. These control sequences 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
@@ -767,36 +793,41 @@ <h3 class="SECT2"><a name="WHERETOGETIT" id=
         package</i></span>
         </p>
 
-        <p>NCURSES can be obtained from <a href=
-        "ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses.tar.gz" target=
-        "_top">ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses.tar.gz</a>
-        or any of the ftp sites mentioned in <a href=
-        "https://www.gnu.org/order/ftp.html" target=
-        "_top">https://www.gnu.org/order/ftp.html</a>.</p>
+        <p>NCURSES can be obtained from</p>
 
-        <p>Read the README and INSTALL files for details on to how
-        to install it. It usually involves the following
-        operations.</p>
+        <ul>
+          <li>
+            <p>the home page at <a href=
+            "https://invisible-island.net/" target=
+            "_top">https://invisible-island.net</a>, as well as</p>
+          </li>
 
-        <pre class=
-        "PROGRAMLISTING">    tar zxvf ncurses&lt;version&gt;.tar.gz  # unzip and untar the archive
-    cd ncurses&lt;version&gt;               # cd to the directory
-    ./configure                             # configure the build according to your 
-                                            # environment
-    make                                    # make it
-    su root                                 # become root
-    make install                            # install it</pre>
-        <p><span class="emphasis"><i class="EMPHASIS">Using the
-        RPM</i></span>
-        </p>
+          <li>
+            <p><a href="https://ftp.gnu.org/pub/gnu/ncurses/"
+            target="_top">https://ftp.gnu.org/pub/gnu/ncurses/</a>
+            or</p>
+          </li>
 
-        <p>NCURSES RPM can be found and downloaded from <a href=
-        "https://rpmfind.net" target="_top">https://rpmfind.net</a>
-        . The RPM can be installed with the following command after
-        becoming root.</p>
+          <li>
+            <p>any of the mirror sites mentioned in <a href=
+            "https://www.gnu.org/order/ftp.html" target=
+            "_top">https://www.gnu.org/order/ftp.html</a>.</p>
+          </li>
+        </ul>
+
+        <p>Read the README and <a href=
+        "https://invisible-island.net/ncurses/INSTALL.html" target=
+        "_top">INSTALL</a> files for details on to how to install
+        it. It usually involves the following operations.</p>
 
         <pre class=
-        "PROGRAMLISTING">    rpm -i &lt;downloaded rpm&gt;</pre>
+        "PROGRAMLISTING">    tar zxvf ncurses&lt;version&gt;.tar.gz  # unzip and untar the archive
+    cd ncurses&lt;version&gt;               # cd to the directory
+    ./configure                       # configure the build according to your
+                                      # environment
+    make                              # make it
+    su root                           # become root
+    make install                      # install it</pre>
       </div>
 
       <div class="SECT2">
@@ -819,10 +850,10 @@ <h3 class="SECT2"><a name="PURPOSE" id="PURPOSE">1.4.
         <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
         "ABOUTPROGRAMS">1.5. About the Programs</a></h3>
 
-        <p>All the programs in the document are available in zipped
-        form <a href=
-        "https://www.tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs.tar.gz"
-        target="_top">here</a>. Unzip and untar it. The directory
+        <p>All the programs in the document are available in
+        gzipped form <a href=
+        "https://invisible-island.net/ncurses/howto/ncurses_programs.tar.gz"
+        target="_top">here</a>. Ungzip and untar it. The directory
         structure looks like this.</p>
 
         <pre class="PROGRAMLISTING">ncurses
@@ -850,7 +881,7 @@ <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
     |
     |----&gt; hanoi.c   -- The Towers of Hanoi Solver
     |----&gt; life.c    -- The Game of Life demo
-    |----&gt; magic.c   -- An Odd Order Magic Square builder 
+    |----&gt; magic.c   -- An Odd Order Magic Square builder
     |----&gt; queens.c  -- The famous N-Queens Solver
     |----&gt; shuffle.c -- A fun game, if you have time to kill
     |----&gt; tt.c      -- A very trivial typing tutor
@@ -866,23 +897,23 @@ <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
     |                               -- rt from box()
     |----&gt; printw_example.c      -- A very simple printw() example
     |----&gt; scanw_example.c       -- A very simple getstr() example
-    |----&gt; simple_attr.c         -- A program that can print a c file with 
+    |----&gt; simple_attr.c         -- A program that can print a c file with
     |                               -- comments in attribute
     |----&gt; simple_color.c        -- A simple example demonstrating colors
-    |----&gt; simple_key.c          -- A menu accessible with keyboard UP, DOWN 
+    |----&gt; simple_key.c          -- A menu accessible with keyboard UP, DOWN
     |                               -- arrows
     |----&gt; temp_leave.c          -- Demonstrates temporarily leaving curses mode
     |----&gt; win_border.c          -- Shows Creation of windows and borders
     |----&gt; with_chgat.c          -- chgat() usage example
 
-  forms 
+  forms
     |
     |----&gt; form_attrib.c     -- Usage of field attributes
     |----&gt; form_options.c    -- Usage of field options
     |----&gt; form_simple.c     -- A simple form example
     |----&gt; form_win.c        -- Demo of windows associated with forms
 
-  menus 
+  menus
     |
     |----&gt; menu_attrib.c     -- Usage of menu attributes
     |----&gt; menu_item_data.c  -- Usage of item_name(), etc. functions
@@ -894,9 +925,9 @@ <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
     |----&gt; menu_userptr.c    -- Usage of user pointer
     |----&gt; menu_win.c        -- Demo of windows associated with menus
 
-  panels 
+  panels
     |
-    |----&gt; panel_browse.c    -- Panel browsing through tab. Usage of user 
+    |----&gt; panel_browse.c    -- Panel browsing through tab. Usage of user
     |                           -- pointer
     |----&gt; panel_hide.c      -- Hiding and Un hiding of panels
     |----&gt; panel_resize.c    -- Moving and resizing of panels
@@ -914,12 +945,6 @@ <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
         <p>For every example, I have included path name for the
         file relative to the examples directory.</p>
 
-        <p>If you prefer browsing individual programs, point your
-        browser to <a href=
-        "https://tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs/"
-        target=
-        "_top">https://tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs/</a></p>
-
         <p>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
@@ -933,40 +958,38 @@ <h3 class="SECT2"><a name="ABOUTPROGRAMS" id=
         <h3 class="SECT2"><a name="OTHERFORMATS" id=
         "OTHERFORMATS">1.6. Other Formats of the document</a></h3>
 
-        <p>This howto is also available in various other formats on
-        the tldp.org site. Here are the links to other formats of
-        this document.</p>
+        <p>This howto is also available in other formats. Here are
+        the links to other formats of this document.</p>
 
         <div class="SECT3">
           <hr>
 
           <h4 class="SECT3"><a name="LISTFORMATS" id=
-          "LISTFORMATS">1.6.1. Readily available formats from
-          tldp.org</a></h4>
+          "LISTFORMATS">1.6.1. Alternative formats</a></h4>
 
           <ul>
             <li>
               <p><a href=
-              "https://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/pdf/NCURSES-Programming-HOWTO.pdf"
+              "https://invisible-island.net/ncurses/howto/NCURSES-Programming-HOWTO.pdf"
               target="_top">Acrobat PDF Format</a></p>
             </li>
 
             <li>
               <p><a href=
-              "https://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/ps/NCURSES-Programming-HOWTO.ps.gz"
+              "https://invisible-island.net/ncurses/howto/NCURSES-Programming-HOWTO.ps"
               target="_top">PostScript Format</a></p>
             </li>
 
             <li>
               <p><a href=
-              "https://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html/NCURSES-Programming-HOWTO-html.tar.gz"
+              "https://invisible-island.net/ncurses/howto/NCURSES-Programming-HOWTO-html.tar.gz"
               target="_top">In Multiple HTML pages</a></p>
             </li>
 
             <li>
               <p><a href=
-              "https://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/NCURSES-Programming-HOWTO.html"
-              target="_top">In One big HTML format</a></p>
+              "https://invisible-island.net/ncurses/howto/NCURSES-Programming-HOWTO.html"
+              target="_top">A single HTML file.</a></p>
             </li>
           </ul>
         </div>
@@ -977,37 +1000,29 @@ <h4 class="SECT3"><a name="LISTFORMATS" id=
           <h4 class="SECT3"><a name="BUILDSOURCE" id=
           "BUILDSOURCE">1.6.2. Building from source</a></h4>
 
-          <p>If above links are broken or if you want to experiment
-          with sgml read on.</p>
+          <p>The sources for this HOWTO can be retrieved from</p>
 
-          <pre class=
-          "PROGRAMLISTING">&#13;    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/
-        NCURSES-HOWTO/ncurses_programs.tar.gz
-
-    Unzip ncurses_programs.tar.gz with
-    tar zxvf ncurses_programs.tar.gz
-
-    Use jade to create various formats. For example if you just want to create
-    the multiple html files, you would use
-        jade -t sgml -i html -d &lt;path to docbook html stylesheet&gt;
-        NCURSES-Programming-HOWTO.sgml
-    to get pdf, first create a single html file of the HOWTO with 
-        jade -t sgml -i html -d &lt;path to docbook html stylesheet&gt; -V nochunks
-        NCURSES-Programming-HOWTO.sgml &gt; NCURSES-ONE-BIG-FILE.html
-    then use htmldoc to get pdf file with
-        htmldoc --size universal -t pdf --firstpage p1 -f &lt;output file name.pdf&gt;
-        NCURSES-ONE-BIG-FILE.html
-    for ps, you would use
-        htmldoc --size universal -t ps --firstpage p1 -f &lt;output file name.ps&gt;
-        NCURSES-ONE-BIG-FILE.html</pre>
-          <p>See <a href=
-          "https://www.tldp.org/LDP/LDP-Author-Guide/" target=
-          "_top">LDP Author guide</a> for more details. If all else
-          fails, mail me at <a href="ppadala@gmail.com" target=
-          "_top">ppadala@gmail.com</a></p>
+          <div class="INFORMALEXAMPLE">
+            <a name="AEN164" id="AEN164"></a>
+
+            <pre class="PROGRAMLISTING"><a href=
+            "https://github.com/ThomasDickey/ncurses-howto-snapshots"
+            target=
+            "_top">https://github.com/ThomasDickey/ncurses-howto-snapshots</a></pre>
+          </div>
+
+          <p>These tools were used to format the HOWTO and build
+          the examples:</p>
+
+          <ul>
+            <li>
+              <p>docbook-utils (a Debian package)</p>
+            </li>
+
+            <li>
+              <p>gcc</p>
+            </li>
+          </ul>
         </div>
       </div>
 
@@ -1017,21 +1032,22 @@ <h4 class="SECT3"><a name="BUILDSOURCE" id=
         <h3 class="SECT2"><a name="CREDITS" id="CREDITS">1.7.
         Credits</a></h3>
 
-        <p>I thank <a href="mailto:sharath_1@usa.net" target=
-        "_top">Sharath</a> 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.</p>
-
-        <p>Perl equivalents of the example programs are contributed
-        by <a href="mailto:Aratnaweera@virtusa.com" target=
-        "_top">Anuradha Ratnaweera</a>.</p>
-
-        <p>Then comes <a href="mailto:parimi@ece.arizona.edu"
-        target="_top">Ravi Parimi</a>, my dearest friend, who has
-        been on this project before even one line was written. He
-        constantly bombarded me with suggestions and patiently
+        <p>I thank <span class="emphasis"><i class=
+        "EMPHASIS">Sharath</i></span> and <span class=
+        "emphasis"><i class="EMPHASIS">Emre Akbas</i></span> 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.</p>
+
+        <p>Perl equivalents of the example programs were
+        contributed by <span class="emphasis"><i class=
+        "EMPHASIS">Anuradha Ratnaweera</i></span>.</p>
+
+        <p>Then comes <span class="emphasis"><i class=
+        "EMPHASIS">Ravi Parimi</i></span>, 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.</p>
       </div>
@@ -1150,15 +1166,16 @@ <h3 class="SECT2"><a name="COMPILECURSES" id=
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
-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                */
+int
+main(void)
+{
+    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;
+    return 0;
 }</span></pre>
         </div>
       </div>
@@ -1388,34 +1405,36 @@ <h3 class="SECT2"><a name="INITEX" id="INITEX">4.7. An
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
-int main()
-{       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
-                                         * characters 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                */
+int
+main(void)
+{
+    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
+                                 * characters 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;
+    return 0;
 }</span></pre>
         </div>
 
@@ -1573,7 +1592,7 @@ <h3 class="SECT2"><a name="ADDCHCLASS" id="ADDCHCLASS">6.1.
       <div class="SECT2">
         <hr>
 
-        <h3 class="SECT2"><a name="AEN303" id="AEN303">6.2.
+        <h3 class="SECT2"><a name="AEN324" id="AEN324">6.2.
         mvaddch(), waddch() and mvwaddch()</a></h3>
 
         <p><tt class="LITERAL">mvaddch()</tt> is used to move the
@@ -1669,24 +1688,25 @@ <h4 class="SECT3"><a name="SIMPLEPRINTWEX" id=
 
             <pre class="PROGRAMLISTING"><span class=
             "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
-#include &lt;string.h&gt; 
- 
-int main()
+#include &lt;string.h&gt;
+
+int
+main(void)
 {
- 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 columns 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 */
- 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();
- getch();
- endwin();
-
- return 0;
+    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 columns of the screen */
+    initscr();                  /* start the curses mode */
+    getmaxyx(stdscr, row, col); /* get the number of rows and columns */
+    mvprintw(row / 2, (col - (int) strlen(mesg)) / 2, "%s", mesg);
+    /* 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();
+    getch();
+    endwin();
+
+    return 0;
 }</span></pre>
           </div>
 
@@ -1865,24 +1885,25 @@ <h3 class="SECT2"><a name="GETSTREX" id="GETSTREX">7.4.
 
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
-#include &lt;string.h&gt; 
- 
-int main()
+#include &lt;string.h&gt;
+
+int
+main(void)
 {
- 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 columns 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 */
- getstr(str);
- mvprintw(LINES - 2, 0, "You Entered: %s", str);
- getch();
- endwin();
-
- return 0;
+    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 columns of the screen */
+    initscr();                  /* start the curses mode */
+    getmaxyx(stdscr, row, col); /* get the number of rows and columns */
+    mvprintw(row / 2, (col - (int) strlen(mesg)) / 2, "%s", mesg);
+    /* print the message at the center of the screen */
+    getstr(str);
+    mvprintw(LINES - 2, 0, "You Entered: %s", str);
+    getch();
+    endwin();
+
+    return 0;
 }</span></pre>
         </div>
       </div>
@@ -1911,55 +1932,54 @@ <h2 class="SECT1"><a name="ATTRIB" id="ATTRIB">8.
 #include &lt;curses.h&gt;
 #include &lt;stdlib.h&gt;
 
-int main(int argc, char *argv[])
-{ 
-  int ch, prev, row, col;
-  prev = EOF;
-  FILE *fp;
-  int y, x;
-
-  if(argc != 2)
-  {
-    printf("Usage: %s &lt;a c file name&gt;\n", argv[0]);
-    exit(1);
-  }
-  fp = fopen(argv[1], "r");
-  if(fp == NULL)
-  {
-    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 */
-  {
-    getyx(stdscr, y, x);                /* get the current cursor position */
-    if(y == (row - 1))                  /* are we are at the end of the screen */
-    {
-      printw("&lt;-Press Any Key-&gt;");      /* tell the user to press a key */
-      getch();
-      clear();                          /* clear the screen */
-      move(0, 0);                       /* start at the beginning of the screen */
+int
+main(int argc, char *argv[])
+{
+    int ch, prev, row, col;
+    prev = EOF;
+    FILE *fp;
+    int y, x;
+
+    if (argc != 2) {
+        printf("Usage: %s &lt;a c file name&gt;\n", argv[0]);
+        exit(1);
+    }
+    fp = fopen(argv[1], "r");
+    if (fp == NULL) {
+        perror("Cannot open input file");
+        exit(1);
     }
-    if(prev == '/' &amp;&amp; ch == '*')        /* If it is / and * then only
-                                         * switch bold on */    
+    initscr();                          /* Start curses mode */
+    getmaxyx(stdscr, row, col);         /* find the boundaries of the screeen */
+    (void) col;
+    while ((ch = fgetc(fp)) != EOF)     /* read the file till we reach the end */
     {
-      attron(A_BOLD);                   /* cut bold on */
-      getyx(stdscr, y, x);              /* get the current cursor position */
-      move(y, x - 1);                   /* back up one space */
-      printw("%c%c", '/', ch);          /* The actual printing is done here */
+        getyx(stdscr, y, x);            /* get the current cursor position */
+        if (y == (row - 1))             /* are we are at the end of the screen */
+        {
+            printw("&lt;-Press Any Key-&gt;"); /* tell the user to press a key */
+            getch();
+            clear();                    /* clear the screen */
+            move(0, 0);                 /* start at the beginning of the screen */
+        }
+        if (prev == '/' &amp;&amp; ch == '*')   /* If it is / and * then only
+                                         * switch bold on */
+        {
+            attron(A_BOLD);             /* cut bold on */
+            getyx(stdscr, y, x);        /* get the current cursor 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 == '*' &amp;&amp; ch == '/')
+            attroff(A_BOLD);    /* Switch it off once we got *
+                                 * and then / */
+        prev = ch;
     }
-    else
-      printw("%c", ch);
-    refresh();
-    if(prev == '*' &amp;&amp; ch == '/')
-      attroff(A_BOLD);                  /* Switch it off once we got *
-                                         * and then / */
-    prev = ch;
-  }
-  endwin();                             /* End curses mode */
-  fclose(fp);
-  return 0;
+    endwin();                   /* End curses mode */
+    fclose(fp);
+    return 0;
 }</span></pre>
       </div>
 
@@ -2002,8 +2022,8 @@ <h3 class="SECT2"><a name="ATTRIBDETAILS" id=
         following video attributes, which are defined in
         &lt;curses.h&gt; can be passed to these functions.</p>
 
-        <pre class="PROGRAMLISTING">    
-    A_NORMAL        Normal display (no highlight)
+        <pre class=
+        "PROGRAMLISTING">&#13;    A_NORMAL        Normal display (no highlight)
     A_STANDOUT      Best highlighting mode of the terminal.
     A_UNDERLINE     Underlining
     A_REVERSE       Reverse video
@@ -2014,10 +2034,9 @@ <h3 class="SECT2"><a name="ATTRIBDETAILS" id=
     A_INVIS         Invisible or blank mode
     A_ALTCHARSET    Alternate character set
     A_CHARTEXT      Bit-mask to extract a character
-    COLOR_PAIR(n)   Color-pair number n 
-    </pre>
+    COLOR_PAIR(n)   Color-pair number n&#13;</pre>
         <p>The last one is the most colorful one :-) Colors are
-        explained in the <a href="#color" target="_top">next
+        explained in the <a href="#COLOR" target="_top">next
         sections</a>.</p>
 
         <p>We can OR(|) any number of above attributes to get a
@@ -2129,27 +2148,29 @@ <h3 class="SECT2"><a name="CHGAT" id="CHGAT">8.6. chgat()
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
-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 character
-         * 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;
+int
+main(void)
+{
+    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 character
+     * 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;
 }</span></pre>
         </div>
 
@@ -2222,81 +2243,86 @@ <h3 class="SECT2"><a name="LETBEWINDOW" id=
 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;  
-                }
+int
+main(void)
+{
+    WINDOW *my_win;
+    int startx, starty, width, height;
+    int ch;
+
+    initscr();                  /* Start curses mode            */
+    cbreak();                   /* Line buffering disabled, Pass on
+                                 * every 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;
+    }
+
+    endwin();                   /* End curses mode                */
+    return 0;
 }
 
-WINDOW *create_newwin(int height, int width, int starty, int startx)
-{       WINDOW *local_win;
+WINDOW *
+create_newwin(int height, int width, int starty, int startx)
+{
+    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 its 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);
+void
+destroy_win(WINDOW *local_win)
+{
+    /* box(local_win, ' ', ' '); : This won't produce the desired
+     * result of erasing the window. It will leave its 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);
 }</span></pre>
         </div>
       </div>
@@ -2391,122 +2417,129 @@ <h3 class="SECT2"><a name="OTHERBORDERFUNCS" id=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
 typedef struct _win_border_struct {
-        chtype  ls, rs, ts, bs, 
-                tl, tr, bl, br;
-}WIN_BORDER;
+    chtype ls, rs, ts, bs, tl, tr, bl, br;
+} WIN_BORDER;
 
 typedef struct _WIN_struct {
 
-        int startx, starty;
-        int height, width;
-        WIN_BORDER border;
-}WIN;
-
-void init_win_params(WIN *p_win);
-void print_win_params(WIN *p_win);
-void create_box(WIN *win, bool flag);
-
-int main(int argc, char *argv[])
-{       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(&amp;win);
-        print_win_params(&amp;win);
-
-        attron(COLOR_PAIR(1));
-        printw("Press F1 to exit");
-        refresh();
-        attroff(COLOR_PAIR(1));
-        
-        create_box(&amp;win, TRUE);
-        while((ch = getch()) != KEY_F(1))
-        {       switch(ch)
-                {       case KEY_LEFT:
-                                create_box(&amp;win, FALSE);
-                                --win.startx;
-                                create_box(&amp;win, TRUE);
-                                break;
-                        case KEY_RIGHT:
-                                create_box(&amp;win, FALSE);
-                                ++win.startx;
-                                create_box(&amp;win, TRUE);
-                                break;
-                        case KEY_UP:
-                                create_box(&amp;win, FALSE);
-                                --win.starty;
-                                create_box(&amp;win, TRUE);
-                                break;
-                        case KEY_DOWN:
-                                create_box(&amp;win, FALSE);
-                                ++win.starty;
-                                create_box(&amp;win, TRUE);
-                                break;  
-                }
+    int startx, starty;
+    int height, width;
+    WIN_BORDER border;
+} WIN;
+
+void init_win_params(WIN * p_win);
+void print_win_params(WIN * p_win);
+void create_box(WIN * win, bool flag);
+
+int
+main(void)
+{
+    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(&amp;win);
+    print_win_params(&amp;win);
+
+    attron(COLOR_PAIR(1));
+    printw("Press F1 to exit");
+    refresh();
+    attroff(COLOR_PAIR(1));
+
+    create_box(&amp;win, TRUE);
+    while ((ch = getch()) != KEY_F(1)) {
+        switch (ch) {
+        case KEY_LEFT:
+            create_box(&amp;win, FALSE);
+            --win.startx;
+            create_box(&amp;win, TRUE);
+            break;
+        case KEY_RIGHT:
+            create_box(&amp;win, FALSE);
+            ++win.startx;
+            create_box(&amp;win, TRUE);
+            break;
+        case KEY_UP:
+            create_box(&amp;win, FALSE);
+            --win.starty;
+            create_box(&amp;win, TRUE);
+            break;
+        case KEY_DOWN:
+            create_box(&amp;win, FALSE);
+            ++win.starty;
+            create_box(&amp;win, TRUE);
+            break;
         }
-        endwin();                       /* End curses mode                */
-        return 0;
+    }
+    endwin();                   /* End curses mode                */
+    return 0;
 }
-void init_win_params(WIN *p_win)
+void
+init_win_params(WIN * p_win)
 {
-        p_win-&gt;height = 3;
-        p_win-&gt;width = 10;
-        p_win-&gt;starty = (LINES - p_win-&gt;height)/2;      
-        p_win-&gt;startx = (COLS - p_win-&gt;width)/2;
-
-        p_win-&gt;border.ls = '|';
-        p_win-&gt;border.rs = '|';
-        p_win-&gt;border.ts = '-';
-        p_win-&gt;border.bs = '-';
-        p_win-&gt;border.tl = '+';
-        p_win-&gt;border.tr = '+';
-        p_win-&gt;border.bl = '+';
-        p_win-&gt;border.br = '+';
+    p_win-&gt;height = 3;
+    p_win-&gt;width = 10;
+    p_win-&gt;starty = (LINES - p_win-&gt;height) / 2;
+    p_win-&gt;startx = (COLS - p_win-&gt;width) / 2;
+
+    p_win-&gt;border.ls = '|';
+    p_win-&gt;border.rs = '|';
+    p_win-&gt;border.ts = '-';
+    p_win-&gt;border.bs = '-';
+    p_win-&gt;border.tl = '+';
+    p_win-&gt;border.tr = '+';
+    p_win-&gt;border.bl = '+';
+    p_win-&gt;border.br = '+';
 
 }
-void print_win_params(WIN *p_win)
+
+void
+print_win_params(WIN * p_win)
 {
 #ifdef _DEBUG
-        mvprintw(25, 0, "%d %d %d %d", p_win-&gt;startx, p_win-&gt;starty, 
-                                p_win-&gt;width, p_win-&gt;height);
-        refresh();
+    mvprintw(25, 0, "%d %d %d %d", p_win-&gt;startx, p_win-&gt;starty,
+             p_win-&gt;width, p_win-&gt;height);
+    refresh();
+#else
+    (void) p_win;
 #endif
 }
-void create_box(WIN *p_win, bool flag)
-{       int i, j;
-        int x, y, w, h;
-
-        x = p_win-&gt;startx;
-        y = p_win-&gt;starty;
-        w = p_win-&gt;width;
-        h = p_win-&gt;height;
-
-        if(flag == TRUE)
-        {       mvaddch(y, x, p_win-&gt;border.tl);
-                mvaddch(y, x + w, p_win-&gt;border.tr);
-                mvaddch(y + h, x, p_win-&gt;border.bl);
-                mvaddch(y + h, x + w, p_win-&gt;border.br);
-                mvhline(y, x + 1, p_win-&gt;border.ts, w - 1);
-                mvhline(y + h, x + 1, p_win-&gt;border.bs, w - 1);
-                mvvline(y + 1, x, p_win-&gt;border.ls, h - 1);
-                mvvline(y + 1, x + w, p_win-&gt;border.rs, h - 1);
 
-        }
-        else
-                for(j = y; j &lt;= y + h; ++j)
-                        for(i = x; i &lt;= x + w; ++i)
-                                mvaddch(j, i, ' ');
-                                
-        refresh();
+void
+create_box(WIN * p_win, bool flag)
+{
+    int i, j;
+    int x, y, w, h;
+
+    x = p_win-&gt;startx;
+    y = p_win-&gt;starty;
+    w = p_win-&gt;width;
+    h = p_win-&gt;height;
+
+    if (flag == TRUE) {
+        mvaddch(y, x, p_win-&gt;border.tl);
+        mvaddch(y, x + w, p_win-&gt;border.tr);
+        mvaddch(y + h, x, p_win-&gt;border.bl);
+        mvaddch(y + h, x + w, p_win-&gt;border.br);
+        mvhline(y, x + 1, p_win-&gt;border.ts, w - 1);
+        mvhline(y + h, x + 1, p_win-&gt;border.bs, w - 1);
+        mvvline(y + 1, x, p_win-&gt;border.ls, h - 1);
+        mvvline(y + 1, x + w, p_win-&gt;border.rs, h - 1);
+
+    } else
+        for (j = y; j &lt;= y + h; ++j)
+            for (i = x; i &lt;= x + w; ++i)
+                mvaddch(j, i, ' ');
 
+    refresh();
 }</span></pre>
         </div>
       </div>
@@ -2535,44 +2568,48 @@ <h3 class="SECT2"><a name="COLORBASICS" id=
 #include &lt;string.h&gt;
 #include &lt;curses.h&gt;
 
-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);
+void print_in_middle(WINDOW *win, int starty, int startx, int width, const char *string);
 
-        attron(COLOR_PAIR(1));
-        print_in_middle(stdscr, LINES / 2, 0, 0, "Viola !!! In color ...");
-        attroff(COLOR_PAIR(1));
-        getch();
+int
+main(void)
+{
+    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;
-
-        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();
-}
-</span></pre>
+void
+print_in_middle(WINDOW *win, int starty, int startx, int width, const char *string)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    mvwprintw(win, y, x, "%s", string);
+    refresh();
+}</span></pre>
         </div>
 
         <p>As you can see, to start using color, you should first
@@ -2724,93 +2761,100 @@ <h3 class="SECT2"><a name="SIMPLEKEYEX" id=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
 #define WIDTH 30
-#define HEIGHT 10 
+#define HEIGHT 10
 
 int startx = 0;
 int starty = 0;
 
-char *choices[] = { 
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Exit",
-                  };
+const char *choices[] =
+{
+    "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();
+int
+main(void)
+{
+    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,
+                     "Character pressed is = %3d Hopefully it can be printed as '%c'",
+                     c, c);
+            refresh();
+            break;
+        }
         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, "Character 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;
+        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)
+void
+print_menu(WINDOW *menu_win, int highlight)
 {
-        int x, y, i;    
-
-        x = 2;
-        y = 2;
-        box(menu_win, 0, 0);
-        for(i = 0; i &lt; 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);
-}
-</span></pre>
+    int x, y, i;
+
+    x = 2;
+    y = 2;
+    box(menu_win, 0, 0);
+    for (i = 0; i &lt; n_choices; ++i) {
+        if (highlight == i + 1) /* Highlight 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);
+}</span></pre>
         </div>
       </div>
     </div>
@@ -2904,7 +2948,7 @@ <h3 class="SECT2"><a name="GETTINGEVENTS" id=
         short id;         /* ID to distinguish multiple devices */
         int x, y, z;      /* event coordinates */
         mmask_t bstate;   /* button state bits */
-    }    </pre>
+    }</pre>
         <p>The <tt class="LITERAL">bstate</tt> is the main variable
         we are interested in. It tells the button state of the
         mouse.</p>
@@ -2942,103 +2986,112 @@ <h3 class="SECT2"><a name="MOUSETOGETHER" id=
 int startx = 0;
 int starty = 0;
 
-char *choices[] = {     "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Exit",
-                  };
+const char *choices[] =
+{"Choice 1",
+ "Choice 2",
+ "Choice 3",
+ "Choice 4",
+ "Exit",
+};
 
 int n_choices = sizeof(choices) / sizeof(char *);
 
 void print_menu(WINDOW *menu_win, int highlight);
 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);
-        keypad(menu_win, TRUE);
-        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(&amp;event) == OK)
-                        {       /* When the user clicks left mouse button */
-                                if(event.bstate &amp; BUTTON1_PRESSED)
-                                {       report_choice(event.x + 1, event.y + 1, &amp;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
+main(void)
+{
+    int c, choice = 0;
+    WINDOW *menu_win;
+    MEVENT event;
+
+    /* Initialize curses */
+    initscr();
+    clear();
+    noecho();
+    cbreak();                   /* Line buffering disabled. pass 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);
+    keypad(menu_win, TRUE);
+    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(&amp;event) == OK) {       /* When the user clicks left mouse button */
+                if (event.bstate &amp; BUTTON1_PRESSED) {
+                    report_choice(event.x + 1, event.y + 1, &amp;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;
+    }
+  end:
+    endwin();
+    return 0;
 }
 
-void print_menu(WINDOW *menu_win, int highlight)
+void
+print_menu(WINDOW *menu_win, int highlight)
 {
-        int x, y, i;
-
-        x = 2;
-        y = 2;
-        box(menu_win, 0, 0);
-        for(i = 0; i &lt; 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);
+    int x, y, i;
+
+    x = 2;
+    y = 2;
+    box(menu_win, 0, 0);
+    for (i = 0; i &lt; 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;
-
-        i = startx + 2;
-        j = starty + 3;
-
-        for(choice = 0; choice &lt; n_choices; ++choice)
-                if(mouse_y == j + choice &amp;&amp; mouse_x &gt;= i &amp;&amp; mouse_x &lt;= i + strlen(choices[choice]))
-                {       if(choice == n_choices - 1)
-                                *p_choice = -1;
-                        else
-                                *p_choice = choice + 1;
-                        break;
-                }
+void
+report_choice(int mouse_x, int mouse_y, int *p_choice)
+{
+    int i, j, choice;
+
+    i = startx + 2;
+    j = starty + 3;
+
+    for (choice = 0; choice &lt; n_choices; ++choice)
+        if (mouse_y == j + choice
+            &amp;&amp; mouse_x &gt;= i
+            &amp;&amp; mouse_x &lt;= i + (int) strlen(choices[choice])) {
+            if (choice == n_choices - 1)
+                *p_choice = -1;
+            else
+                *p_choice = choice + 1;
+            break;
+        }
 }</span></pre>
         </div>
       </div>
@@ -3086,7 +3139,7 @@ <h3 class="SECT2"><a name="GETYX" id="GETYX">13.1. getyx()
 
         <pre class="PROGRAMLISTING">    getyx(win, y, x);
     /* win: window pointer
-     *   y, x: y, x co-ordinates will be put into this variables 
+     *   y, x: y, x co-ordinates will be put into this variables
      */</pre>
         <p>The function getparyx() gets the beginning co-ordinates
         of the sub window relative to the main window. This is some
@@ -3195,23 +3248,24 @@ <h3 class="SECT2"><a name="TEMPLEAVE" id="TEMPLEAVE">14.2.
           "INLINEMEDIAOBJECT">#include &lt;stdlib.h&gt;
 #include &lt;curses.h&gt;
 
-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;
+int
+main(void)
+{
+    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;
 }</span></pre>
         </div>
       </div>
@@ -3239,47 +3293,47 @@ <h3 class="SECT2"><a name="ACSVARS" id="ACSVARS">14.3. ACS_
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;curses.h&gt;
 
-int main()
+int main(void)
 {
-        initscr();
-
-        printw("Upper left corner           "); addch(ACS_ULCORNER); printw("\n"); 
-        printw("Lower left corner           "); addch(ACS_LLCORNER); printw("\n");
-        printw("Lower right corner          "); addch(ACS_LRCORNER); printw("\n");
-        printw("Tee pointing right          "); addch(ACS_LTEE); printw("\n");
-        printw("Tee pointing left           "); addch(ACS_RTEE); printw("\n");
-        printw("Tee pointing up             "); addch(ACS_BTEE); printw("\n");
-        printw("Tee pointing down           "); addch(ACS_TTEE); printw("\n");
-        printw("Horizontal line             "); addch(ACS_HLINE); printw("\n");
-        printw("Vertical line               "); addch(ACS_VLINE); printw("\n");
-        printw("Large Plus or cross over    "); addch(ACS_PLUS); printw("\n");
-        printw("Scan Line 1                 "); addch(ACS_S1); printw("\n");
-        printw("Scan Line 3                 "); addch(ACS_S3); printw("\n");
-        printw("Scan Line 7                 "); addch(ACS_S7); printw("\n");
-        printw("Scan Line 9                 "); addch(ACS_S9); printw("\n");
-        printw("Diamond                     "); addch(ACS_DIAMOND); printw("\n");
-        printw("Checker board (stipple)     "); addch(ACS_CKBOARD); printw("\n");
-        printw("Degree Symbol               "); addch(ACS_DEGREE); printw("\n");
-        printw("Plus/Minus Symbol           "); addch(ACS_PLMINUS); printw("\n");
-        printw("Bullet                      "); addch(ACS_BULLET); printw("\n");
-        printw("Arrow Pointing Left         "); addch(ACS_LARROW); printw("\n");
-        printw("Arrow Pointing Right        "); addch(ACS_RARROW); printw("\n");
-        printw("Arrow Pointing Down         "); addch(ACS_DARROW); printw("\n");
-        printw("Arrow Pointing Up           "); addch(ACS_UARROW); printw("\n");
-        printw("Board of squares            "); addch(ACS_BOARD); printw("\n");
-        printw("Lantern Symbol              "); addch(ACS_LANTERN); printw("\n");
-        printw("Solid Square Block          "); addch(ACS_BLOCK); printw("\n");
-        printw("Less/Equal sign             "); addch(ACS_LEQUAL); printw("\n");
-        printw("Greater/Equal sign          "); addch(ACS_GEQUAL); printw("\n");
-        printw("Pi                          "); addch(ACS_PI); printw("\n");
-        printw("Not equal                   "); addch(ACS_NEQUAL); printw("\n");
-        printw("UK pound sign               "); addch(ACS_STERLING); printw("\n");
+    initscr();
+
+    printw("Upper left corner           "); addch(ACS_ULCORNER); printw("\n"); 
+    printw("Lower left corner           "); addch(ACS_LLCORNER); printw("\n");
+    printw("Lower right corner          "); addch(ACS_LRCORNER); printw("\n");
+    printw("Tee pointing right          "); addch(ACS_LTEE); printw("\n");
+    printw("Tee pointing left           "); addch(ACS_RTEE); printw("\n");
+    printw("Tee pointing up             "); addch(ACS_BTEE); printw("\n");
+    printw("Tee pointing down           "); addch(ACS_TTEE); printw("\n");
+    printw("Horizontal line             "); addch(ACS_HLINE); printw("\n");
+    printw("Vertical line               "); addch(ACS_VLINE); printw("\n");
+    printw("Large Plus or cross over    "); addch(ACS_PLUS); printw("\n");
+    printw("Scan Line 1                 "); addch(ACS_S1); printw("\n");
+    printw("Scan Line 3                 "); addch(ACS_S3); printw("\n");
+    printw("Scan Line 7                 "); addch(ACS_S7); printw("\n");
+    printw("Scan Line 9                 "); addch(ACS_S9); printw("\n");
+    printw("Diamond                     "); addch(ACS_DIAMOND); printw("\n");
+    printw("Checker board (stipple)     "); addch(ACS_CKBOARD); printw("\n");
+    printw("Degree Symbol               "); addch(ACS_DEGREE); printw("\n");
+    printw("Plus/Minus Symbol           "); addch(ACS_PLMINUS); printw("\n");
+    printw("Bullet                      "); addch(ACS_BULLET); printw("\n");
+    printw("Arrow Pointing Left         "); addch(ACS_LARROW); printw("\n");
+    printw("Arrow Pointing Right        "); addch(ACS_RARROW); printw("\n");
+    printw("Arrow Pointing Down         "); addch(ACS_DARROW); printw("\n");
+    printw("Arrow Pointing Up           "); addch(ACS_UARROW); printw("\n");
+    printw("Board of squares            "); addch(ACS_BOARD); printw("\n");
+    printw("Lantern Symbol              "); addch(ACS_LANTERN); printw("\n");
+    printw("Solid Square Block          "); addch(ACS_BLOCK); printw("\n");
+    printw("Less/Equal sign             "); addch(ACS_LEQUAL); printw("\n");
+    printw("Greater/Equal sign          "); addch(ACS_GEQUAL); printw("\n");
+    printw("Pi                          "); addch(ACS_PI); printw("\n");
+    printw("Not equal                   "); addch(ACS_NEQUAL); printw("\n");
+    printw("UK pound sign               "); addch(ACS_STERLING); printw("\n");
 
-        refresh();
-        getch();
-        endwin();
+    refresh();
+    getch();
+    endwin();
 
-        return 0;
+    return 0;
 }</span></pre>
         </div>
       </div>
@@ -3415,42 +3469,45 @@ <h3 class="SECT2"><a name="COMPILEPANELS" id=
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;panel.h&gt;
 
-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 &lt; 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();
-}
-</span></pre>
+int
+main(void)
+{
+    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 &lt; 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();
+    return 0;
+}</span></pre>
         </div>
 
         <p>As you can see, above program follows a simple flow as
@@ -3484,116 +3541,128 @@ <h3 class="SECT2"><a name="PANELBROWSING" id=
 #define NCOLS 40
 
 void init_wins(WINDOW **wins, int n);
-void win_show(WINDOW *win, char *label, int label_color);
-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();
+void win_show(WINDOW *win, const char *label, int label_color);
+void print_in_middle(WINDOW *win, int starty, int startx,
+                     int width, const char *string, chtype color);
 
-        /* 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();
+int
+main(void)
+{
+    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;
         }
-        endwin();
-        return 0;
+        update_panels();
+        doupdate();
+    }
+    endwin();
+    return 0;
 }
 
 /* Put all the windows */
-void init_wins(WINDOW **wins, int n)
-{       int x, y, i;
-        char label[80];
-
-        y = 2;
-        x = 10;
-        for(i = 0; i &lt; 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;
-        }
+void
+init_wins(WINDOW **wins, int n)
+{
+    int x, y, i;
+    char label[80];
+
+    y = 2;
+    x = 10;
+    for (i = 0; i &lt; 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;
-
-        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));
+void
+win_show(WINDOW *win, const char *label, int label_color)
+{
+    int height, width;
+
+    getmaxyx(win, height, width);
+    (void) height;
+
+    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;
-
-        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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
       </div>
@@ -3660,236 +3729,253 @@ <h3 class="SECT2"><a name="PANELMOVERESIZE" id=
 #include &lt;panel.h&gt;
 
 typedef struct _PANEL_DATA {
-        int x, y, w, h;
-        char label[80]; 
-        int label_color;
-        PANEL *next;
-}PANEL_DATA;
+    int x, y, w, h;
+    char label[80];
+    int label_color;
+    PANEL *next;
+} PANEL_DATA;
 
 #define NLINES 10
 #define NCOLS 40
 
 void init_wins(WINDOW **wins, int n);
-void win_show(WINDOW *win, char *label, int label_color);
-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+void win_show(WINDOW *win, const char *label, int label_color);
+void print_in_middle(WINDOW *win, int starty, int startx,
+                     int width, const char *string, chtype color);
 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();
+int
+main(void)
+{
+    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-&gt;x;
+    newy = top-&gt;y;
+    neww = top-&gt;w;
+    newh = top-&gt;h;
+    while ((ch = getch()) != KEY_F(1)) {
+        switch (ch) {
+        case 9:         /* Tab */
+            top = (PANEL_DATA *) panel_userptr(stack_top);
+            top_panel(top-&gt;next);
+            stack_top = top-&gt;next;
+            top = (PANEL_DATA *) panel_userptr(stack_top);
+            newx = top-&gt;x;
+            newy = top-&gt;y;
+            neww = top-&gt;w;
+            newh = top-&gt;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 &lt;ENTER&gt; 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 &lt;ENTER&gt; 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-&gt;label, top-&gt;label_color);
+                delwin(old_win);
+                size = FALSE;
+            }
+            if (move == TRUE) {
+                move_panel(stack_top, newy, newx);
+                move = FALSE;
+            }
+            break;
 
-        /* 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)");
+        mvprintw(LINES - 2, 0,
+                 "Use tab to browse through the windows (F1 to Exit)");
         attroff(COLOR_PAIR(4));
+        refresh();
+        update_panels();
         doupdate();
-
-        stack_top = my_panels[2];
-        top = (PANEL_DATA *)panel_userptr(stack_top);
-        newx = top-&gt;x;
-        newy = top-&gt;y;
-        neww = top-&gt;w;
-        newh = top-&gt;h;
-        while((ch = getch()) != KEY_F(1))
-        {       switch(ch)
-                {       case 9:         /* Tab */
-                                top = (PANEL_DATA *)panel_userptr(stack_top);
-                                top_panel(top-&gt;next);
-                                stack_top = top-&gt;next;
-                                top = (PANEL_DATA *)panel_userptr(stack_top);
-                                newx = top-&gt;x;
-                                newy = top-&gt;y;
-                                neww = top-&gt;w;
-                                newh = top-&gt;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 &lt;ENTER&gt; 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 &lt;ENTER&gt; 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-&gt;label, top-&gt;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;
+    }
+    endwin();
+    return 0;
 }
 
 /* Put all the windows */
-void init_wins(WINDOW **wins, int n)
-{       int x, y, i;
-        char label[80];
-
-        y = 2;
-        x = 10;
-        for(i = 0; i &lt; 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;
-        }
+void
+init_wins(WINDOW **wins, int n)
+{
+    int x, y, i;
+    char label[80];
+
+    y = 2;
+    x = 10;
+    for (i = 0; i &lt; 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 &lt; 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], &amp;ptrs[i]);
-        }
+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((size_t) n, sizeof(PANEL_DATA));
+
+    for (i = 0; i &lt; 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], &amp;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;
-
-        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));
+void
+win_show(WINDOW *win, const char *label, int label_color)
+{
+    int height, width;
+
+    getmaxyx(win, height, width);
+    (void) height;
+
+    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;
-
-        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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
 
@@ -3952,158 +4038,167 @@ <h3 class="SECT2"><a name="PANELSHOWHIDE" id=
 #include &lt;panel.h&gt;
 
 typedef struct _PANEL_DATA {
-        int hide;       /* TRUE if panel is hidden */
-}PANEL_DATA;
+    int hide;                   /* TRUE if panel is hidden */
+} PANEL_DATA;
 
 #define NLINES 10
 #define NCOLS 40
 
 void init_wins(WINDOW **wins, int n);
-void win_show(WINDOW *win, char *label, int label_color);
-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 data 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], &amp;panel_datas[0]);
-        set_panel_userptr(my_panels[1], &amp;panel_datas[1]);
-        set_panel_userptr(my_panels[2], &amp;panel_datas[2]);
-
-        /* Update the stacking order. 2nd panel will be on top */
-        update_panels();
+void win_show(WINDOW *win, const char *label, int label_color);
+void print_in_middle(WINDOW *win, int starty, int startx,
+                     int width, const char *string, chtype color);
 
-        /* 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-&gt;hide == FALSE)
-                                {       hide_panel(my_panels[0]);
-                                        temp-&gt;hide = TRUE;
-                                }
-                                else
-                                {       show_panel(my_panels[0]);
-                                        temp-&gt;hide = FALSE;
-                                }
-                                break;
-                        case 'b':
-                                temp = (PANEL_DATA *)panel_userptr(my_panels[1]);
-                                if(temp-&gt;hide == FALSE)
-                                {       hide_panel(my_panels[1]);
-                                        temp-&gt;hide = TRUE;
-                                }
-                                else
-                                {       show_panel(my_panels[1]);
-                                        temp-&gt;hide = FALSE;
-                                }
-                                break;
-                        case 'c':
-                                temp = (PANEL_DATA *)panel_userptr(my_panels[2]);
-                                if(temp-&gt;hide == FALSE)
-                                {       hide_panel(my_panels[2]);
-                                        temp-&gt;hide = TRUE;
-                                }
-                                else
-                                {       show_panel(my_panels[2]);
-                                        temp-&gt;hide = FALSE;
-                                }
-                                break;
-                }
-                update_panels();
-                doupdate();
+int
+main(void)
+{
+    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 data 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], &amp;panel_datas[0]);
+    set_panel_userptr(my_panels[1], &amp;panel_datas[1]);
+    set_panel_userptr(my_panels[2], &amp;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-&gt;hide == FALSE) {
+                hide_panel(my_panels[0]);
+                temp-&gt;hide = TRUE;
+            } else {
+                show_panel(my_panels[0]);
+                temp-&gt;hide = FALSE;
+            }
+            break;
+        case 'b':
+            temp = (PANEL_DATA *) panel_userptr(my_panels[1]);
+            if (temp-&gt;hide == FALSE) {
+                hide_panel(my_panels[1]);
+                temp-&gt;hide = TRUE;
+            } else {
+                show_panel(my_panels[1]);
+                temp-&gt;hide = FALSE;
+            }
+            break;
+        case 'c':
+            temp = (PANEL_DATA *) panel_userptr(my_panels[2]);
+            if (temp-&gt;hide == FALSE) {
+                hide_panel(my_panels[2]);
+                temp-&gt;hide = TRUE;
+            } else {
+                show_panel(my_panels[2]);
+                temp-&gt;hide = FALSE;
+            }
+            break;
         }
-        endwin();
-        return 0;
+        update_panels();
+        doupdate();
+    }
+    endwin();
+    return 0;
 }
 
 /* Put all the windows */
-void init_wins(WINDOW **wins, int n)
-{       int x, y, i;
-        char label[80];
-
-        y = 2;
-        x = 10;
-        for(i = 0; i &lt; 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;
-        }
+void
+init_wins(WINDOW **wins, int n)
+{
+    int x, y, i;
+    char label[80];
+
+    y = 2;
+    x = 10;
+    for (i = 0; i &lt; 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;
-
-        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));
+void
+win_show(WINDOW *win, const char *label, int label_color)
+{
+    int height, width;
+
+    getmaxyx(win, height, width);
+    (void) height;
+
+    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;
-
-        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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
       </div>
@@ -4235,56 +4330,56 @@ <h3 class="SECT2"><a name="COMPILEMENUS" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD   4
 
-char *choices[] = {
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Exit",
-                  };
-
-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 &lt; 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();
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "Exit",
+};
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    int n_choices, i;
+
+    initscr();
+    cbreak();
+    noecho();
+    keypad(stdscr, TRUE);
+
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
+
+    for (i = 0; i &lt; 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;
-                }
-        }       
+    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();
-}
-        </span></pre>
+    free_item(my_items[0]);
+    free_item(my_items[1]);
+    free_menu(my_menu);
+    endwin();
+}</span></pre>
         </div>
 
         <p>This program demonstrates the basic concepts involved in
@@ -4304,21 +4399,21 @@ <h3 class="SECT2"><a name="COMPILEMENUS" id=
         requests.</p>
 
         <pre class=
-        "PROGRAMLISTING">&#13;     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.
-     REQ_SCR_ULINE       Scroll up a line.
-     REQ_SCR_DLINE          Scroll down a line.
-     REQ_SCR_DPAGE          Scroll down a page.
-     REQ_SCR_UPAGE         Scroll up a page.
+        "PROGRAMLISTING">&#13;     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.
+     REQ_SCR_ULINE      Scroll up a line.
+     REQ_SCR_DLINE      Scroll down a line.
+     REQ_SCR_DPAGE      Scroll down a page.
+     REQ_SCR_UPAGE      Scroll up a page.
      REQ_FIRST_ITEM     Move to the first item.
-     REQ_LAST_ITEM         Move to the last item.
-     REQ_NEXT_ITEM         Move to the next item.
-     REQ_PREV_ITEM         Move to the previous item. 
-     REQ_TOGGLE_ITEM     Select/deselect an item.
-     REQ_CLEAR_PATTERN     Clear the menu pattern buffer.
-     REQ_BACK_PATTERN      Delete the previous character from the pattern buffer.
+     REQ_LAST_ITEM      Move to the last item.
+     REQ_NEXT_ITEM      Move to the next item.
+     REQ_PREV_ITEM      Move to the previous item.
+     REQ_TOGGLE_ITEM    Select/deselect an item.
+     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.&#13;</pre>
         <p>Don't get overwhelmed by the number of options. We will
@@ -4485,105 +4580,113 @@ <h3 class="SECT2"><a name="MENUWINDOWS" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD   4
 
-char *choices[] = {
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "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;
-        WINDOW *my_menu_win;
-        int n_choices, i;
-        
-        /* Initialize curses */
-        initscr();
-        start_color();
-        cbreak();
-        noecho();
-        keypad(stdscr, TRUE);
-        init_pair(1, COLOR_RED, COLOR_BLACK);
-
-        /* Create items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
-        for(i = 0; i &lt; n_choices; ++i)
-                my_items[i] = new_item(choices[i], choices[i]);
-
-        /* Create menu */
-        my_menu = new_menu((ITEM **)my_items);
-
-        /* 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_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(my_menu, " * ");
-
-        /* 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();
-        
-        /* Post the menu */
-        post_menu(my_menu);
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "Exit",
+    (char *) NULL,
+};
+
+void print_in_middle(WINDOW *win, int starty, int startx,
+                     int width, const char *string, chtype color);
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    WINDOW *my_menu_win;
+    int n_choices, i;
+
+    /* Initialize curses */
+    initscr();
+    start_color();
+    cbreak();
+    noecho();
+    keypad(stdscr, TRUE);
+    init_pair(1, COLOR_RED, COLOR_BLACK);
+
+    /* Create items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
+    for (i = 0; i &lt; n_choices; ++i)
+        my_items[i] = new_item(choices[i], choices[i]);
+
+    /* Create menu */
+    my_menu = new_menu((ITEM **) my_items);
+
+    /* 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_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(my_menu, " * ");
+
+    /* 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();
+
+    /* 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);
+    }
 
-        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_menu(my_menu);
-        free_menu(my_menu);
-        for(i = 0; i &lt; n_choices; ++i)
-                free_item(my_items[i]);
-        endwin();
+    /* Unpost and free all the memory taken up */
+    unpost_menu(my_menu);
+    free_menu(my_menu);
+    for (i = 0; i &lt; n_choices; ++i)
+        free_item(my_items[i]);
+    endwin();
 }
 
-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
-{       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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
 
@@ -4624,123 +4727,132 @@ <h3 class="SECT2"><a name="SCROLLMENUS" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #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",
-                        "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;
-        WINDOW *my_menu_win;
-        int n_choices, i;
-        
-        /* Initialize curses */
-        initscr();
-        start_color();
-        cbreak();
-        noecho();
-        keypad(stdscr, TRUE);
-        init_pair(1, COLOR_RED, COLOR_BLACK);
-        init_pair(2, COLOR_CYAN, COLOR_BLACK);
-
-        /* Create items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
-        for(i = 0; i &lt; n_choices; ++i)
-                my_items[i] = new_item(choices[i], choices[i]);
-
-        /* Create menu */
-        my_menu = new_menu((ITEM **)my_items);
-
-        /* 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_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_mark(my_menu, " * ");
-
-        /* 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);
-        
-        /* Post the menu */
-        post_menu(my_menu);
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "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, const char *string, chtype color);
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    WINDOW *my_menu_win;
+    int n_choices, i;
+
+    /* Initialize curses */
+    initscr();
+    start_color();
+    cbreak();
+    noecho();
+    keypad(stdscr, TRUE);
+    init_pair(1, COLOR_RED, COLOR_BLACK);
+    init_pair(2, COLOR_CYAN, COLOR_BLACK);
+
+    /* Create items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
+    for (i = 0; i &lt; n_choices; ++i)
+        my_items[i] = new_item(choices[i], choices[i]);
+
+    /* Create menu */
+    my_menu = new_menu((ITEM **) my_items);
+
+    /* 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_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_mark(my_menu, " * ");
+
+    /* 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);
+
+    /* Post the menu */
+    post_menu(my_menu);
+    wrefresh(my_menu_win);
+
+    attron(COLOR_PAIR(2));
+    mvprintw(LINES - 2, 0,
+             "Use PageUp and PageDown to scroll 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);
-        
-        attron(COLOR_PAIR(2));
-        mvprintw(LINES - 2, 0, "Use PageUp and PageDown to scroll 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_menu(my_menu);
-        free_menu(my_menu);
-        for(i = 0; i &lt; n_choices; ++i)
-                free_item(my_items[i]);
-        endwin();
+    /* Unpost and free all the memory taken up */
+    unpost_menu(my_menu);
+    free_menu(my_menu);
+    for (i = 0; i &lt; n_choices; ++i)
+        free_item(my_items[i]);
+    endwin();
 }
 
-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
-{       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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
 
@@ -4785,96 +4897,99 @@ <h3 class="SECT2"><a name="MULTICOLUMN" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #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",
-                        "Exit",
-                        (char *)NULL,
-                  };
-
-int main()
-{       ITEM **my_items;
-        int c;                          
-        MENU *my_menu;
-        WINDOW *my_menu_win;
-        int n_choices, i;
-        
-        /* Initialize curses */
-        initscr();
-        start_color();
-        cbreak();
-        noecho();
-        keypad(stdscr, TRUE);
-        init_pair(1, COLOR_RED, COLOR_BLACK);
-        init_pair(2, COLOR_CYAN, COLOR_BLACK);
-
-        /* Create items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
-        for(i = 0; i &lt; n_choices; ++i)
-                my_items[i] = new_item(choices[i], choices[i]);
-
-        /* Create menu */
-        my_menu = new_menu((ITEM **)my_items);
-
-        /* Set menu option not to show the description */
-        menu_opts_off(my_menu, O_SHOWDESC);
-
-        /* 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_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, " * ");
-
-        /* 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();
+const 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",
+    "Exit",
+    (char *) NULL,
+};
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    WINDOW *my_menu_win;
+    int n_choices, i;
+
+    /* Initialize curses */
+    initscr();
+    start_color();
+    cbreak();
+    noecho();
+    keypad(stdscr, TRUE);
+    init_pair(1, COLOR_RED, COLOR_BLACK);
+    init_pair(2, COLOR_CYAN, COLOR_BLACK);
+
+    /* Create items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
+    for (i = 0; i &lt; n_choices; ++i)
+        my_items[i] = new_item(choices[i], choices[i]);
+
+    /* Create menu */
+    my_menu = new_menu((ITEM **) my_items);
+
+    /* Set menu option not to show the description */
+    menu_opts_off(my_menu, O_SHOWDESC);
+
+    /* 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_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, " * ");
+
+    /* 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);
+    /* 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);
-        
-        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_menu(my_menu);
-        free_menu(my_menu);
-        for(i = 0; i &lt; n_choices; ++i)
-                free_item(my_items[i]);
-        endwin();
+    }
+
+    /* Unpost and free all the memory taken up */
+    unpost_menu(my_menu);
+    free_menu(my_menu);
+    for (i = 0; i &lt; n_choices; ++i)
+        free_item(my_items[i]);
+    endwin();
 }</span></pre>
         </div>
 
@@ -4940,84 +5055,87 @@ <h3 class="SECT2"><a name="MULTIVALUEMENUS" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD   4
 
-char *choices[] = {
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Choice 5",
-                        "Choice 6",
-                        "Choice 7",
-                        "Exit",
-                  };
-
-int main()
-{       ITEM **my_items;
-        int c;                          
-        MENU *my_menu;
-        int n_choices, i;
-        ITEM *cur_item;
-        
-        /* Initialize curses */ 
-        initscr();
-        cbreak();
-        noecho();
-        keypad(stdscr, TRUE);
-
-        /* Initialize items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
-        for(i = 0; i &lt; 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);
-
-        /* Make the menu multi valued */
-        menu_opts_off(my_menu, O_ONEVALUE);
-
-        mvprintw(LINES - 3, 0, "Use &lt;SPACE&gt; to select or unselect an item.");
-        mvprintw(LINES - 2, 0, "&lt;ENTER&gt; to see presently selected items(F1 to Exit)");
-        post_menu(my_menu);
-        refresh();
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "Choice 5",
+    "Choice 6",
+    "Choice 7",
+    "Exit",
+};
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    int n_choices, i;
+
+    /* Initialize curses */
+    initscr();
+    cbreak();
+    noecho();
+    keypad(stdscr, TRUE);
+
+    /* Initialize items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
+    for (i = 0; i &lt; 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);
+
+    /* Make the menu multi valued */
+    menu_opts_off(my_menu, O_ONEVALUE);
+
+    mvprintw(LINES - 3, 0, "Use &lt;SPACE&gt; to select or unselect an item.");
+    mvprintw(LINES - 2, 0,
+             "&lt;ENTER&gt; 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 &lt; 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 &lt; item_count(my_menu); ++i)
+                    if (item_value(items[i]) == TRUE) {
+                        strcat(temp, item_name(items[i]));
+                        strcat(temp, " ");
+                    }
+                move(20, 0);
+                clrtoeol();
+                mvaddstr(20, 0, temp);
+                refresh();
+            }
+            break;
+        }
+    }
 
-        free_item(my_items[0]);
-        free_item(my_items[1]);
-        free_menu(my_menu);
-        endwin();
-}
-        </span></pre>
+    free_item(my_items[0]);
+    free_item(my_items[1]);
+    free_menu(my_menu);
+    endwin();
+}</span></pre>
         </div>
 
         <p>Whew, A lot of new functions. Let's take them one after
@@ -5077,81 +5195,82 @@ <h3 class="SECT2"><a name="MENUOPT" id="MENUOPT">17.8. Menu
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD   4
 
-char *choices[] = {
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Choice 5",
-                        "Choice 6",
-                        "Choice 7",
-                        "Exit",
-                  };
-
-int main()
-{       ITEM **my_items;
-        int c;                          
-        MENU *my_menu;
-        int n_choices, i;
-        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);
-
-        /* Initialize items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
-        for(i = 0; i &lt; 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 &lt;ENTER&gt; to see the option selected");
-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
-        post_menu(my_menu);
-        refresh();
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "Choice 5",
+    "Choice 6",
+    "Choice 7",
+    "Exit",
+};
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    int n_choices, i;
+
+    /* 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);
+
+    /* Initialize items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
+    for (i = 0; i &lt; 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 &lt;ENTER&gt; to see the option selected");
+    mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (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 &lt; n_choices; ++i)
-                free_item(my_items[i]);
-        free_menu(my_menu);
-        endwin();
-}
-        </span></pre>
+    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 &lt; n_choices; ++i)
+        free_item(my_items[i]);
+    free_menu(my_menu);
+    endwin();
+}</span></pre>
         </div>
       </div>
 
@@ -5181,87 +5300,99 @@ <h3 class="SECT2"><a name="MENUUSERPTR" id=
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD   4
 
-char *choices[] = {
-                        "Choice 1",
-                        "Choice 2",
-                        "Choice 3",
-                        "Choice 4",
-                        "Choice 5",
-                        "Choice 6",
-                        "Choice 7",
-                        "Exit",
-                  };
-void func(char *name);
-
-int main()
-{       ITEM **my_items;
-        int c;                          
-        MENU *my_menu;
-        int n_choices, i;
-        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);
-
-        /* Initialize items */
-        n_choices = ARRAY_SIZE(choices);
-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
-        for(i = 0; i &lt; 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;
+const char *choices[] =
+{
+    "Choice 1",
+    "Choice 2",
+    "Choice 3",
+    "Choice 4",
+    "Choice 5",
+    "Choice 6",
+    "Choice 7",
+    "Exit",
+};
+
+typedef union {
+    void (*my_func) (const char *);
+    void *data;
+} MY_DATA;
+
+void func(const char *name);
+
+int
+main(void)
+{
+    ITEM **my_items;
+    int c;
+    MENU *my_menu;
+    int n_choices, i;
+
+    /* 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);
+
+    /* Initialize items */
+    n_choices = ARRAY_SIZE(choices);
+    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
+    for (i = 0; i &lt; n_choices; ++i) {
+        MY_DATA data = { func };
+        my_items[i] = new_item(choices[i], choices[i]);
+        /* Set the user pointer */
+        set_item_userptr(my_items[i], (void *) &amp;data);
+    }
+    my_items[n_choices] = (ITEM *) NULL;
 
-        /* Create menu */
-        my_menu = new_menu((ITEM **)my_items);
+    /* Create menu */
+    my_menu = new_menu((ITEM **) my_items);
 
-        /* Post the menu */
-        mvprintw(LINES - 3, 0, "Press &lt;ENTER&gt; to see the option selected");
-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
-        post_menu(my_menu);
-        refresh();
+    /* Post the menu */
+    mvprintw(LINES - 3, 0, "Press &lt;ENTER&gt; to see the option selected");
+    mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (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 &lt; n_choices; ++i)
-                free_item(my_items[i]);
-        free_menu(my_menu);
-        endwin();
+    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;
+                const MY_DATA *data;
+
+                cur = current_item(my_menu);
+                data = item_userptr(cur);
+                data-&gt;my_func(item_name(cur));
+                pos_menu_cursor(my_menu);
+                break;
+            }
+            break;
+        }
+    }
+    unpost_menu(my_menu);
+    for (i = 0; i &lt; 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);
-}       </span></pre>
+void
+func(const char *name)
+{
+    move(20, 0);
+    clrtoeol();
+    mvprintw(20, 0, "Item selected is : %s", name);
+}</span></pre>
         </div>
       </div>
     </div>
@@ -5384,69 +5515,71 @@ <h3 class="SECT2"><a name="COMPILEFORMS" id=
           <pre class="PROGRAMLISTING"><span class=
           "INLINEMEDIAOBJECT">#include &lt;form.h&gt;
 
-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 */
+int
+main(void)
+{
+    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);
+    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();
+    /* Create the form and post it */
+    my_form = new_form(field);
+    post_form(my_form);
+    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;
-                }
+    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]); 
+    /* 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;
+    endwin();
+    return 0;
 }</span></pre>
         </div>
 
@@ -5502,7 +5635,7 @@ <h4 class="SECT3"><a name="FETCHINFO" id=
 
           <pre class=
           "PROGRAMLISTING">int field_info(     FIELD *field,              /* field from which to fetch */
-                    int *height, *int width,   /* field size */ 
+                    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 */</pre>
@@ -5562,21 +5695,21 @@ <h4 class="SECT3"><a name="FIELDDISPATTRIB" id=
 
           <pre class=
           "PROGRAMLISTING">&#13;int set_field_fore(FIELD *field,        /* field to alter */
-                   chtype attr);        /* attribute to set */ 
+                   chtype attr);        /* attribute to set */
 
 chtype field_fore(FIELD *field);        /* field to query */
                                         /* returns foreground attribute */
 
 int set_field_back(FIELD *field,        /* field to alter */
-                   chtype attr);        /* attribute to set */ 
+                   chtype attr);        /* attribute to set */
 
 chtype field_back(FIELD *field);        /* field to query */
                                         /* returns background attribute */
 
 int set_field_pad(FIELD *field,         /* field to alter */
-                  int pad);             /* pad character to set */ 
+                  int pad);             /* pad character to set */
 
-chtype field_pad(FIELD *field);         /* field to query */  
+chtype field_pad(FIELD *field);         /* field to query */
                                         /* returns present pad character */&#13;</pre>
           <p>Though above functions seem quite simple, using colors
           with set_field_fore() may be frustrating in the
@@ -5599,78 +5732,81 @@ <h4 class="SECT3"><a name="FIELDDISPATTRIB" id=
             <pre class="PROGRAMLISTING"><span class=
             "INLINEMEDIAOBJECT">#include &lt;form.h&gt;
 
-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 */
+int
+main(void)
+{
+    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_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);
+    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();
+    /* Create the form and post it */
+    my_form = new_form(field);
+    post_form(my_form);
+    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;
-                }
+    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]); 
+    /* 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;
+    endwin();
+    return 0;
 }</span></pre>
           </div>
 
@@ -5694,15 +5830,15 @@ <h4 class="SECT3"><a name="FIELDOPTIONBITS" id=
 
           <pre class=
           "PROGRAMLISTING">int set_field_opts(FIELD *field,          /* field to alter */
-                   int attr);             /* attribute to set */ 
+                   int attr);             /* attribute to set */
 
 int field_opts_on(FIELD *field,           /* field to alter */
-                  int attr);              /* attributes to turn on */ 
+                  int attr);              /* attributes to turn on */
 
 int field_opts_off(FIELD *field,          /* field to alter */
-                  int attr);              /* attributes to turn off */ 
+                  int attr);              /* attributes to turn off */
 
-int field_opts(FIELD *field);             /* field to query */ </pre>
+int field_opts(FIELD *field);             /* field to query */</pre>
           <p>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
@@ -5842,73 +5978,75 @@ <h4 class="SECT3"><a name="FIELDOPTIONBITS" id=
 
 #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 &lt; 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();
+int
+main(void)
+{
+    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 &lt; 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();
 
-        /* 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;
-                }
+    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]); 
+    /* 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;
+    endwin();
+    return 0;
 }</span></pre>
           </div>
 
@@ -5961,7 +6099,7 @@ <h4 class="SECT3"><a name="FIELDUSERPTR" id=
           pointer.</p>
 
           <pre class=
-          "PROGRAMLISTING">int set_field_userptr(FIELD *field,   
+          "PROGRAMLISTING">int set_field_userptr(FIELD *field,
            char *userptr);      /* the user pointer you wish to associate */
                                 /* with the field    */
 
@@ -6132,115 +6270,122 @@ <h3 class="SECT2"><a name="FORMWINDOWS" id=
           "INLINEMEDIAOBJECT">#include &lt;string.h&gt;
 #include &lt;form.h&gt;
 
-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+void print_in_middle(WINDOW *win, int starty, int startx,
+                     int width, const char *string, chtype color);
 
-int main()
+int
+main(void)
 {
-        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, &amp;rows, &amp;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_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 */
-        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();
+    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, &amp;rows, &amp;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_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 */
+    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;
-                }
+    /* 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]); 
+    /* 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;
+    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;
-
-        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();
+void
+print_in_middle(WINDOW *win, int starty, int startx,
+                int width, const char *string, chtype color)
+{
+    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 = (int) strlen(string);
+    temp = (float) (width - length) / 2;
+    x = startx + (int) temp;
+    wattron(win, color);
+    mvwprintw(win, y, x, "%s", string);
+    wattroff(win, color);
+    refresh();
 }</span></pre>
         </div>
       </div>
@@ -6290,8 +6435,8 @@ <h3 class="SECT2"><a name="FILEDVALIDATE" id=
         can also specify custom validation, though it is a bit
         tricky and cumbersome.</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1074" id=
-        "AEN1074"></a>TYPE_ALPHA</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1095" id=
+        "AEN1095"></a>TYPE_ALPHA</h1>
 
         <p>This field type accepts alphabetic data; no blanks, no
         digits, no special characters (this is checked at
@@ -6308,8 +6453,8 @@ <h1 class="BRIDGEHEAD"><a name="AEN1074" id=
         width, the validation check will always fail. A minimum
         width of zero makes field completion optional.</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1078" id=
-        "AEN1078"></a>TYPE_ALNUM</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1099" id=
+        "AEN1099"></a>TYPE_ALNUM</h1>
 
         <p>This field type accepts alphabetic data and digits; no
         blanks, no special characters (this is checked at
@@ -6325,8 +6470,8 @@ <h1 class="BRIDGEHEAD"><a name="AEN1078" id=
         validation check will always fail. A minimum width of zero
         makes field completion optional.</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1082" id=
-        "AEN1082"></a>TYPE_ENUM</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1103" id=
+        "AEN1103"></a>TYPE_ENUM</h1>
 
         <p>This type allows you to restrict a field's values to be
         among a specified set of string values (for example, the
@@ -6358,8 +6503,8 @@ <h1 class="BRIDGEHEAD"><a name="AEN1082" id=
         <p>The REQ_NEXT_CHOICE and REQ_PREV_CHOICE input requests
         can be particularly useful with these fields.</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1089" id=
-        "AEN1089"></a>TYPE_INTEGER</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1110" id=
+        "AEN1110"></a>TYPE_INTEGER</h1>
 
         <p>This field type accepts an integer. It is set up as
         follows:</p>
@@ -6381,8 +6526,8 @@ <h1 class="BRIDGEHEAD"><a name="AEN1089" id=
         <p>A TYPE_INTEGER value buffer can conveniently be
         interpreted with the C library function atoi(3).</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1095" id=
-        "AEN1095"></a>TYPE_NUMERIC</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1116" id=
+        "AEN1116"></a>TYPE_NUMERIC</h1>
 
         <p>This field type accepts a decimal number. It is set up
         as follows:</p>
@@ -6404,8 +6549,8 @@ <h1 class="BRIDGEHEAD"><a name="AEN1095" id=
         <p>A TYPE_NUMERIC value buffer can conveniently be
         interpreted with the C library function atof(3).</p>
 
-        <h1 class="BRIDGEHEAD"><a name="AEN1101" id=
-        "AEN1101"></a>TYPE_REGEXP</h1>
+        <h1 class="BRIDGEHEAD"><a name="AEN1122" id=
+        "AEN1122"></a>TYPE_REGEXP</h1>
 
         <p>This field type accepts data matching a regular
         expression. It is set up as follows:</p>
@@ -7034,7 +7179,7 @@ <h4 class="SECT3"><a name="WIDGETLIST" id=
 Alphalist             Allows a user to select from a list of words, with
                       the ability to narrow the search list by typing in a
                       few characters of the desired word.
-Buttonbox             This creates a multiple button widget. 
+Buttonbox             This creates a multiple button widget.
 Calendar              Creates a little simple calendar widget.
 Dialog                Prompts the user with a message, and the user
                       can pick an answer from the buttons provided.
@@ -7057,17 +7202,17 @@ <h4 class="SECT3"><a name="WIDGETLIST" id=
                       field)
 Radio List            Creates a radio button list.
 Scale                 Creates a numeric scale. Used for allowing a user to
-                      pick a numeric value and restrict them to a range of 
+                      pick a numeric value and restrict them to a range of
                       values.
 Scrolling List        Creates a scrolling list/menu list.
-Scrolling Window      Creates a scrolling log file viewer. Can add 
-                      information into the window while its running. 
+Scrolling Window      Creates a scrolling log file viewer. Can add
+                      information into the window while its running.
                       A good widget for displaying the progress of
                       something. (akin to a console window)
 Selection List        Creates a multiple option selection list.
 Slider                Akin to the scale widget, this widget provides a
                       visual slide bar to represent the numeric value.
-Template              Creates a entry field with character sensitive 
+Template              Creates a entry field with character sensitive
                       positions. Used for pre-formatted fields like
                       dates and phone numbers.
 Viewer                This is a file/information viewer. Very useful
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 92f9905e2..889505ed6 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp @
+  * @Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2024-03-23 ncurses 6.5 User commands</TITLE>
+<TITLE>captoinfo 1m 2024-09-13 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2024-09-13 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -77,12 +77,11 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
 
 </PRE><H3><a name="h3-Translations-from-Nonstandard-Capabilities">Translations from Nonstandard Capabilities</a></H3><PRE>
        <STRONG>captoinfo</STRONG>  translates  some  obsolete,  nonstandard  capabilities  into
-       standard  (SVr4/XSI  Curses)  <EM>terminfo</EM>  capabilities.   It   issues   a
-       diagnostic  to the standard error stream for each, inviting the user to
-       check that it has not mistakenly  translated  an  unknown  or  mistyped
-       capability name.
+       standard <EM>terminfo</EM> capabilities.  It issues a diagnostic to the standard
+       error  stream  for  each,  inviting  the  user to check that it has not
+       mistakenly translated an unknown or mistyped capability name.
 
-                     <STRONG>Name</STRONG>
+                 <STRONG><EM>termcap</EM></STRONG> <STRONG>Code</STRONG>
               <STRONG>Obsolete</STRONG>   <STRONG>Standard</STRONG>    <STRONG>Origin</STRONG>      <STRONG><EM>terminfo</EM></STRONG> <STRONG>capability</STRONG>
               ---------------------------------------------------------
                  <STRONG>BO</STRONG>         <STRONG>mr</STRONG>        AT&amp;T      <STRONG>enter_reverse_mode</STRONG>
@@ -111,14 +110,14 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
                  <STRONG>KE</STRONG>         <STRONG>F4</STRONG>      Tektronix   <STRONG>key_f14</STRONG>
                  <STRONG>KF</STRONG>         <STRONG>F5</STRONG>      Tektronix   <STRONG>key_f15</STRONG>
                  <STRONG>BC</STRONG>         <STRONG>Sb</STRONG>      Tektronix   <STRONG>set_background</STRONG>
-
                  <STRONG>FC</STRONG>         <STRONG>Sf</STRONG>      Tektronix   <STRONG>set_foreground</STRONG>
+
                  <STRONG>HS</STRONG>         <STRONG>mh</STRONG>        IRIX      <STRONG>enter_dim_mode</STRONG>
 
        XENIX <EM>termcap</EM> had a set of extension capabilities, corresponding to box
        drawing characters of CCSID ("code page") 437, as follows.
 
-                      <STRONG><EM>termcap</EM></STRONG> <STRONG>Name</STRONG>            <STRONG>Graphic</STRONG>
+                      <STRONG><EM>termcap</EM></STRONG> <STRONG>Code</STRONG>            <STRONG>Graphic</STRONG>
                       -----------------------------------------
                            <STRONG>G2</STRONG>        upper left corner
                            <STRONG>G3</STRONG>        lower left corner
@@ -144,27 +143,27 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
                            <STRONG>Gc</STRONG>        double intersection
                            <STRONG>GG</STRONG>        ACS magic cookie count
 
-       <STRONG>captoinfo</STRONG> composes single-line capabilities into an  <STRONG>acsc</STRONG>  string,  and
+       <STRONG>captoinfo</STRONG>  composes  single-line  capabilities into an <STRONG>acsc</STRONG> string, and
        discards <STRONG>GG</STRONG> and double-line capabilities with a warning diagnostic.
 
-       IBM's  AIX  has  a  <EM>terminfo</EM> facility descended from SVr1 <EM>terminfo</EM>, but
-       which is incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG>  translates  the
+       IBM's AIX has a <EM>terminfo</EM> facility descended  from  SVr1  <EM>terminfo</EM>,  but
+       which  is  incompatible with the SVr4 format.  <STRONG>captoinfo</STRONG> translates the
        following AIX extensions.
 
-                                     <STRONG>IBM</STRONG>    <STRONG>XSI</STRONG>
-                                    -------------
-                                    ksel    kslt
-                                    kbtab   kcbt
-                                    font0   s0ds
-                                    font1   s1ds
-                                    font2   s2ds
-                                    font3   s3ds
+                                    <STRONG>IBM</STRONG>    <STRONG>X/Open</STRONG>
+                                   ---------------
+                                   ksel    kslt
+                                   kbtab   kcbt
+                                   font0   s0ds
+                                   font1   s1ds
+                                   font2   s2ds
+                                   font3   s3ds
 
-       Additionally,  this  program  translates  the AIX <STRONG>box1</STRONG> capability to an
+       Additionally, this program translates the AIX  <STRONG>box1</STRONG>  capability  to  an
        <STRONG>acsc</STRONG> string.
 
-       The  HP-UX  <EM>terminfo</EM>  library   supports   two   nonstandard   <EM>terminfo</EM>
-       capabilities,  <STRONG>meml</STRONG>  (memory lock) and <STRONG>memu</STRONG> (memory unlock).  <STRONG>captoinfo</STRONG>
+       The   HP-UX   <EM>terminfo</EM>   library   supports  two  nonstandard  <EM>terminfo</EM>
+       capabilities, <STRONG>meml</STRONG> (memory lock) and <STRONG>memu</STRONG> (memory  unlock).   <STRONG>captoinfo</STRONG>
        discards these with a warning message.
 
 
@@ -174,11 +173,11 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 7 (2009) describes <STRONG>tic</STRONG>  briefly,  but  omits  this
+       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
        program.
 
        SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from <STRONG>tic</STRONG>.  Its
-       <STRONG>-v</STRONG> option does not accept a trace level argument <EM>n</EM>; repeat <STRONG>-v</STRONG>  <EM>n</EM>  times
+       <STRONG>-v</STRONG>  option  does not accept a trace level argument <EM>n</EM>; repeat <STRONG>-v</STRONG> <EM>n</EM> times
        instead.
 
        NetBSD does not provide this application.
@@ -194,7 +193,7 @@ <H1 class="no-header">captoinfo 1m 2024-03-23 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-03-23                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.5                       2024-09-13                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 47d2e13b8..2d2b3cf61 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -64,7 +64,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <EM>background</EM>  of  a  <EM>curses</EM>  window  (in  the  library's  non-"wide"
+       The  <EM>background</EM>  of  a  <EM>curses</EM>  window  (in  the   library's   non-wide
        configuration)   is  a  <EM>chtype</EM>  combining  a  set  of  attributes  (see
        <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with a character called the <EM>blank</EM> <EM>character.</EM>
 
@@ -177,19 +177,19 @@ <H1 class="no-header">curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
        rendition  of  characters  on  the  screen  updates  when <STRONG>bkgd</STRONG> or <STRONG>wbkgd</STRONG>
        changes the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does  not
-       (in  its  non-"wide"  configuration)  store  the  background and window
+       (in  its  non-wide  configuration)  store  the  background  and  window
        attribute contributions to each character cell separately.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes the corresponding  functions  in  the  "wide"
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes  the  corresponding  functions  in  the  wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index a11a68c57..96d82f2dc 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -65,15 +65,15 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <EM>background</EM>  of  a  <EM>curses</EM>  window   (in   the   library's   "wide"
-       configuration)  is  a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  combining  a  set  of  attributes  (see
-       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with a complex character called the <EM>blank</EM> <EM>character.</EM>
+       The <EM>background</EM> of a <EM>curses</EM> window (in the library's wide configuration)
+       is a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> combining a set of attributes (see <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with the
+       window's blank character.
 
-       The blank character is a spacing character that  populates  a  window's
-       character  cells  when  their  contents are erased without replacement.
-       The background's attributes are combined with all non-blank  characters
-       written  to  the  window,  as  with  the  <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG>
-       families of functions.
+       The <EM>blank</EM> <EM>character</EM> is a spacing complex  character  that  populates  a
+       window's  character  cells  when  their  contents  are  erased  without
+       replacement.  The background's attributes are combined  with  all  non-
+       blank  characters  written  to the window, as with the <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and
+       <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
 
        The blank character and  attributes  of  the  background  combine  with
        characters  written  to  the window as described below.  The background
@@ -156,7 +156,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be implemented as macros.
 
-       Unlike  their  counterparts in the non-"wide" configuration of <EM>ncurses</EM>,
+       Unlike  their  counterparts  in  the non-wide configuration of <EM>ncurses</EM>,
        <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> supply the background character and  attribute
        in a modifiable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, not as the return value.
 
@@ -170,14 +170,14 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the corresponding functions in the non-"wide"
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the  corresponding  functions in the non-wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 36bba46b4..e2a9234f1 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp @
+  * @Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -110,13 +110,13 @@ <H1 class="no-header">curs_extend 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <EM>ncurses</EM> offers several other extensions to the X/Open Curses API.
 
-       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,     <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,     <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,    <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>,
-       <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+       <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,    <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,   <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,   <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,
+       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index b9e7bd91d..e2ce5a98b 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -48,16 +48,16 @@ <H1 class="no-header">curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>get_wch</STRONG>,  <STRONG>wget_wch</STRONG>,  <STRONG>mvget_wch</STRONG>,  <STRONG>mvwget_wch</STRONG>,  <STRONG>unget_wch</STRONG>  - get (or push
-       back) a wide character from <EM>curses</EM> terminal keyboard
+       back) a wide character from <EM>curses</EM> terminal keyboard buffer
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>get_wch(wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wget_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvget_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwget_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>get_wch(wint_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wget_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvget_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwget_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>unget_wch(const</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
 
@@ -172,7 +172,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 01a060f83..f017ec8ff 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp @
+  * @Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -49,16 +49,16 @@ <H1 class="no-header">curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, <STRONG>mvwgetch</STRONG>, <STRONG>ungetch</STRONG>, <STRONG>has_key</STRONG> - get (or push back)
-       characters from <EM>curses</EM> terminal keyboard
+       characters from <EM>curses</EM> terminal keyboard buffer
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>getch(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wgetch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wgetch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvgetch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>ungetch(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
 
@@ -367,16 +367,17 @@ <H1 class="no-header">curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
        codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
        <STRONG>KEY_PPAGE</STRONG> (Page Up), <STRONG>KEY_NPAGE</STRONG> (Page  Down),  <STRONG>KEY_IC</STRONG>  (Insert),  <STRONG>KEY_DC</STRONG>
-       (Delete), and <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG> for 1 &lt;= <EM>n</EM> &lt;= 12.
+       (Delete), <STRONG>KEY_A1</STRONG>, <STRONG>KEY_A3</STRONG>, <STRONG>KEY_B2</STRONG>, <STRONG>KEY_C1</STRONG>, <STRONG>KEY_C3</STRONG>, and <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG> for 1 &lt;=
+       <EM>n</EM> &lt;= 12.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        In <EM>ncurses</EM>, when a window's "no time-out" mode is <EM>not</EM> set, the <STRONG>ESCDELAY</STRONG>
-       variable configures the duration of the timer used  to  disambiguate  a
-       function  key character sequence from a series of key strokes beginning
+       variable  configures  the  duration of the timer used to disambiguate a
+       function key character sequence from a series of key strokes  beginning
        with ESC typed by the user; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       <STRONG>has_key</STRONG> was designed for <EM>ncurses</EM>, and is  not  found  in  SVr4  <EM>curses</EM>,
+       <STRONG>has_key</STRONG>  was  designed  for  <EM>ncurses</EM>,  and is not found in SVr4 <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
@@ -384,50 +385,50 @@ <H1 class="no-header">curs_getch 3x 2024-07-20 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except as noted in section "EXTENSIONS" above, X/Open Curses,  Issue  4
+       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
        describes these functions.  It specifies no error conditions for them.
 
        <STRONG>wgetch</STRONG> reads only single-byte characters.
 
-       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
+       The echo behavior of these functions on  input  of  <STRONG>KEY_</STRONG>  or  backspace
        characters is not documented in SVr4 <EM>curses</EM>.
 
-       The behavior of <STRONG>wgetch</STRONG> in  the  presence  of  signal  handlers  is  not
-       documented  in  SVr4  <EM>curses</EM>  and  is unspecified by X/Open Curses.  In
-       historical <EM>curses</EM> implementations, it varied depending on  whether  the
-       operating  system's  dispatch  of  a  signal to a handler interrupted a
+       The  behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of signal handlers is not
+       documented in SVr4 <EM>curses</EM> and is  unspecified  by  X/Open  Curses.   In
+       historical  <EM>curses</EM>  implementations, it varied depending on whether the
+       operating system's dispatch of a signal  to  a  handler  interrupted  a
        <STRONG>read(2)</STRONG> call in progress, and also (in some implementations) whether an
-       input  timeout  or  non-blocking  mode had been set.  A portable <EM>curses</EM>
-       application prepares  for  two  cases:  (a)  signal  receipt  does  not
+       input timeout or non-blocking mode had been  set.   A  portable  <EM>curses</EM>
+       application  prepares  for  two  cases:  (a)  signal  receipt  does not
        interrupt <STRONG>wgetch</STRONG>; or (b) signal receipt interrupts <STRONG>wgetch</STRONG> and causes it
        to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
+       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> and <STRONG>has_key</STRONG> are extensions first  implemented  for  <EM>ncurses</EM>.
+       <STRONG>KEY_RESIZE</STRONG>  and  <STRONG>has_key</STRONG>  are extensions first implemented for <EM>ncurses</EM>.
        By  2022,  <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  had  added  them  along  with
        <STRONG>KEY_MOUSE</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
+       ECMA-6  "7-bit  coded  Character  Set" &lt;https://ecma-international.org/
        publications-and-standards/standards/ecma-6/&gt;
 
-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
+       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   &lt;https://
        ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
 
-       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
 
 
-ncurses 6.5                       2024-07-20                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 9b77d4c39..8cbe7ddef 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp @
+  * @Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -303,7 +303,7 @@ <H1 class="no-header">curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-11                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 964ea1f86..49124ab53 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp @
+  * @Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        buffering and erase and kill character processing (the interrupt, quit,
        suspend,  and  flow  control  characters  are  unaffected)  and   makes
        characters  typed  by  the  user  immediately available to the program.
-       <STRONG>nocbreak</STRONG> returns the terminal to normal ("cooked") mode.
+       <STRONG>nocbreak</STRONG> restores the terminal's normal ("cooked") line discipline.
 
        The state of the terminal is unknown to a <EM>curses</EM>  application  when  it
        starts; therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explicitly.
@@ -163,24 +163,24 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
        Initially, whether the terminal returns 7- or 8-bit character codes  on
-       input  depends  on  the  configuration  of  the  terminal  driver;  see
-       <STRONG>termios(3)</STRONG>.  To force 8 bits to be returned, call <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>TRUE)</STRONG>; this
-       is  equivalent,  on  POSIX  systems,  to  setting  the  CS8 flag on the
-       terminal.  To force 7 bits to be returned, call <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>FALSE)</STRONG>;  this
-       is  equivalent,  on  POSIX  systems,  to  setting  the  CS7 flag on the
-       terminal.  The window argument, <EM>win</EM>, is always ignored.  If  the  <EM>term-</EM>
-       <EM>info</EM>  string  capabilities <STRONG>meta_on</STRONG> (<STRONG>smm</STRONG>) and <STRONG>meta_off</STRONG> (<STRONG>rmm</STRONG>) are defined
-       for the terminal type, enabling meta mode sends <STRONG>smm</STRONG> to the terminal and
-       disabling it sends <STRONG>rmm</STRONG> to the terminal.
+       input  depends  on  the  configuration of the terminal driver; on POSIX
+       systems, see  <STRONG>termios(3)</STRONG>.   To  force  8  bits  to  be  returned,  call
+       <STRONG>meta(</STRONG>...<STRONG>,</STRONG>  <STRONG>TRUE)</STRONG>;  this is equivalent, on POSIX systems, to setting the
+       CS8 flag on the terminal.   To  force  7  bits  to  be  returned,  call
+       <STRONG>meta(</STRONG>...<STRONG>,</STRONG>  <STRONG>FALSE)</STRONG>; this is equivalent, on POSIX systems, to setting the
+       CS7 flag on the terminal.  The window argument, <EM>win</EM>, is always ignored.
+       If  the  <EM>terminfo</EM>  string capabilities <STRONG>meta_on</STRONG> (<STRONG>smm</STRONG>) and <STRONG>meta_off</STRONG> (<STRONG>rmm</STRONG>)
+       are defined for the terminal type, enabling meta mode sends <STRONG>smm</STRONG> to  the
+       terminal and disabling it sends <STRONG>rmm</STRONG> to the terminal.
 
 
 </PRE><H3><a name="h3-nl_nonl">nl, nonl</a></H3><PRE>
        Initially,  whether  the  terminal  reports a carriage return using the
        character code for a line feed in cbreak or raw modes  depends  on  the
        configuration  of  the  terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures
-       the terminal to perform this translation.  <STRONG>nonl</STRONG> disables it.  In normal
-       (or  "cooked")  mode,  the  terminal  driver always translates carriage
-       returns to line feeds.
+       the terminal to perform this translation.  <STRONG>nonl</STRONG> disables it.  Under its
+       normal   ("cooked")   line   discipline,  the  terminal  driver  always
+       translates carriage returns to line feeds.
 
 
 </PRE><H3><a name="h3-nodelay">nodelay</a></H3><PRE>
@@ -202,17 +202,17 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush, noqiflush</a></H3><PRE>
        <STRONG>qiflush</STRONG> and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of  its
        input and output queues when it handles the interrupt, suspend, or quit
-       characters  in  <EM>cbreak</EM>  and  "cooked"  modes;  on  POSIX  systems,  see
-       <STRONG>termios(3)</STRONG>.  The default behavior is inherited from the terminal driver
-       settings.  Calling <STRONG>qiflush</STRONG> configures the terminal to flush the  queues
-       when  any  of  these  events  occurs,  giving  the impression of faster
-       response to user input, but making the library's model  of  the  screen
-       contents  incorrect.   Calling  <STRONG>noqiflush</STRONG>  prevents  such flushing, but
-       might frustrate impatient users on slow connections if a <EM>curses</EM>  update
-       of the screen is in progress when the event occurs; see <STRONG>typeahead</STRONG> below
-       for a mitigation of this problem.  You may want to call <STRONG>noqiflush</STRONG> in  a
-       signal  handler  if you want output to continue after the handler exits
-       as though the interrupt had not occurred.
+       characters under the normal ("cooked") or  cbreak  line  discplines  on
+       POSIX  systems; see <STRONG>termios(3)</STRONG>.  The default behavior is inherited from
+       the terminal driver settings.  Calling <STRONG>qiflush</STRONG> configures the  terminal
+       to  flush  the  queues  when  any  of  these  events occurs, giving the
+       impression of faster response to user input, but making  the  library's
+       model  of  the  screen  contents incorrect.  Calling <STRONG>noqiflush</STRONG> prevents
+       such flushing, but might frustrate impatient users on slow  connections
+       if  a <EM>curses</EM> update of the screen is in progress when the event occurs;
+       see <STRONG>typeahead</STRONG> below for a mitigation of this problem.  You may want  to
+       call <STRONG>noqiflush</STRONG> in a signal handler if you want output to continue after
+       the handler exits as though the interrupt had not occurred.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
@@ -222,8 +222,8 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        control   characters  uninterpreted  to  the  application,  instead  of
        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
-       configuration parameters that <EM>curses</EM> does not  handle.   <STRONG>noraw</STRONG>  returns
-       the terminal to normal ("cooked") mode.
+       configuration parameters that <EM>curses</EM> does not handle.   <STRONG>noraw</STRONG>  restores
+       the terminal's normal ("cooked") line discipline.
 
 
 </PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
@@ -272,10 +272,10 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
        <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
-       restore normal ("cooked") mode from raw and cbreak modes, respectively.
-       Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  calls  with  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG> calls leads to terminal
-       driver control states that are hard to predict or understand; doing  so
-       is not recommended.
+       restore the terminal's normal ("cooked") line discipline from  raw  and
+       cbreak,  respectively.   Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  calls  with <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
+       calls leads to terminal driver control states that are hard to  predict
+       or understand; doing so is not recommended.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
@@ -312,8 +312,8 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
        <EM>curses</EM>, clearing the terminal driver's "echo"  flag  when  initializing
        the  screen.  BSD <EM>curses</EM> did not, but its <EM>raw</EM> function turned it off as
        a side effect.  For best portability, call <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly
-       just  after  initialization,  even  if  your  program remains in normal
-       ("cooked") mode.
+       just  after initialization, even if your program retains the terminal's
+       normal ("cooked") line discipline.
 
        X/Open Curses is ambiguous regarding whether  <EM>raw</EM>  should  disable  the
        carriage  return and line feed translation feature controlled by <EM>nl</EM> and
@@ -382,7 +382,7 @@ <H1 class="no-header">curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-15                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index f3614ab53..53bcf476d 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        functions named <EM>winswstr</EM> and <EM>winsnwstr</EM> (and the usual variants).  These
        were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
        They  differ from X/Open's later <EM>wins</EM><STRONG>_</STRONG><EM>wstr</EM> and <EM>wins</EM><STRONG>_</STRONG><EM>nwstr</EM> in that their
-       <EM>wstr</EM> parameters are not <EM>const</EM>-qualified<EM>.</EM>
+       <EM>wstr</EM> parameters are not <EM>const</EM>-qualified.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 9ff33254e..037a6e1fc 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp @
+  * @Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>instr</STRONG>,  <STRONG>innstr</STRONG>, <STRONG>winstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinstr</STRONG>, <STRONG>mvwinnstr</STRONG>
+       <STRONG>instr</STRONG>,  <STRONG>winstr</STRONG>, <STRONG>mvinstr</STRONG>, <STRONG>mvwinstr</STRONG>, <STRONG>innstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, <STRONG>mvwinnstr</STRONG>
        - get a string from a <EM>curses</EM> window
 
 
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_instr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index d5777a283..673ca4ca2 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -47,7 +47,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
-       <STRONG>inwstr</STRONG>,  <STRONG>innwstr</STRONG>,  <STRONG>winwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, <STRONG>mvwinwstr</STRONG>,
+       <STRONG>inwstr</STRONG>,  <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  <STRONG>mvwinwstr</STRONG>,  <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>,
        <STRONG>mvwinnwstr</STRONG> - get a wide-character string from a <EM>curses</EM> window
 
 
@@ -70,9 +70,9 @@ <H1 class="no-header">curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        starting  at the cursor and stopping at the end of the line, and stores
        it in <EM>wstr</EM>, terminating it with a wide null character and omitting  any
        attributes  and  color pair identifier that <EM>curses</EM> associates with each
-       character.  <STRONG>winnwstr</STRONG> does the same, but copies  at  most  <EM>n</EM>  characters
-       from  <EM>win</EM>.   An  <EM>n</EM>  of  <STRONG>-1</STRONG>  implies  no limit; <STRONG>winnwstr</STRONG> then works like
-       <STRONG>winwstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
+       character.   <STRONG>winnwstr</STRONG>  does  the  same,  but  copies  at  most  <EM>n</EM>  wide
+       characters  from <EM>win</EM>.  An <EM>n</EM> of <STRONG>-1</STRONG> implies no limit; <STRONG>winnwstr</STRONG> then works
+       like <STRONG>winwstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -135,7 +135,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 6d821c12e..2fadf7db6 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp @
+  * @Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -124,10 +124,10 @@ <H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-curs_set">curs_set</a></H3><PRE>
-       The  <STRONG>curs_set</STRONG>  routine  sets  the cursor state to invisible, normal, or
-       very visible for <STRONG>visibility</STRONG> equal to <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG> respectively.   If  the
-       terminal  supports  the <EM>visibility</EM> requested, the previous <EM>cursor</EM> state
-       is returned; otherwise, <STRONG>ERR</STRONG> is returned.
+       <STRONG>curs_set</STRONG> adjusts the cursor visibility to "invisible", "visible", "very
+       visible", as its argument is <STRONG>0</STRONG>, <STRONG>1</STRONG>, or <STRONG>2</STRONG>, respectively.  It returns  the
+       previous  <EM>visibility</EM>  if  the  requested  one  is  supported,  and  <STRONG>ERR</STRONG>
+       otherwise.
 
 
 </PRE><H3><a name="h3-mvcur">mvcur</a></H3><PRE>
@@ -178,41 +178,44 @@ <H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except for <STRONG>curs_set</STRONG>, these routines always return <STRONG>OK</STRONG>.
+       Except  for  <STRONG>curs_set</STRONG>,  these functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on
+       failure.
 
-       <STRONG>curs_set</STRONG>  returns  the  previous  cursor state, or <STRONG>ERR</STRONG> if the requested
-       <EM>visibility</EM> is not supported.
+       <STRONG>curs_set</STRONG> returns the previous cursor visibility, and returns <STRONG>ERR</STRONG> if the
+       terminal type does not support the requested <EM>visibility</EM>.
 
-       X/Open defines no error conditions.  In this implementation
+       <STRONG>napms</STRONG> always succeeds.
 
-       <STRONG>def_prog_mode</STRONG>, <STRONG>def_shell_mode</STRONG>, <STRONG>reset_prog_mode</STRONG>, <STRONG>reset_shell_mode</STRONG>
-            return <STRONG>ERR</STRONG> if the terminal was not initialized, or if the I/O call
-            to obtain the terminal settings fails.
+       <STRONG>mvcur</STRONG>  fails  if  the  position  (<EM>newrow</EM>, <EM>newcol</EM>) is outside the screen
+       boundaries.
 
-       <STRONG>ripoffline</STRONG>
-            returns  <STRONG>ERR</STRONG> if the maximum number of ripped-off lines exceeds the
-            maximum (5).
+       In <EM>ncurses</EM>,
 
+       <STRONG>o</STRONG>   <STRONG>def_prog_mode</STRONG>,      <STRONG>def_shell_mode</STRONG>,      <STRONG>reset_prog_mode</STRONG>,       and
+           <STRONG>reset_shell_mode</STRONG> return <STRONG>ERR</STRONG> if the terminal was not initialized, or
+           if the operating system's function for obtaining terminal  settings
+           fails.
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>getsyx</STRONG> is a macro, so <STRONG>&amp;</STRONG> is not necessary before the variables
-       <EM>y</EM> and <EM>x</EM>.
+       <STRONG>o</STRONG>   <STRONG>ripoffline</STRONG>  returns  <STRONG>ERR</STRONG>  if the maximum number of ripped-off lines
+           exceeds the maximum (5).
 
-       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
-       currently incorrect".  This implementation gets it right, but it may be
-       unwise to count on the correctness of the return value anywhere else.
 
-       Both <EM>ncurses</EM> and SVr4 will call <STRONG>curs_set</STRONG> in <STRONG>endwin</STRONG> if <STRONG>curs_set</STRONG> has been
-       called to make the cursor other than normal, i.e., either invisible  or
-       very  visible.   There  is  no way for <EM>ncurses</EM> to determine the initial
-       cursor state to restore that.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>getsyx</STRONG> is a macro; use of  the  <STRONG>&amp;</STRONG>  operator  before  its  arguments  is
+       unnecessary.
+
+       The  <STRONG>endwin</STRONG>  function of both <EM>ncurses</EM> and SVr4 <EM>curses</EM> calls <STRONG>curs_set</STRONG> if
+       the latter has previously been called to set the cursor visiblility  to
+       a  value  other than normal; that is, either invisible or very visible.
+       There is no way for <EM>ncurses</EM> to determine the initial cursor  visibility
+       to restore it.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       In <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.   This
-       value  tells <EM>ncurses</EM> that the old location is unknown, and that it must
-       use only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>)  capability,
-       rather  than  the  least  costly  combination  of absolute and relative
+       In  <EM>ncurses</EM>, <STRONG>mvcur</STRONG> accepts <STRONG>-1</STRONG> for either or both old coordinates.  This
+       value tells <EM>ncurses</EM> that the old location is unknown, and that it  must
+       use  only absolute motion, as with the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability,
+       rather than the least  costly  combination  of  absolute  and  relative
        motion.
 
 
@@ -220,28 +223,37 @@ <H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       The  <EM>virtual</EM>  <EM>screen</EM>  functions  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> are not described in
-       X/Open Curses, Issue 4.  All other functions are as described in X/Open
-       Curses.
+       The <EM>virtual</EM> <EM>screen</EM> functions <EM>setsyx</EM> and <EM>getsyx</EM>  are  not  described  in
+       X/Open  Curses  Issue 4.   SVr4  documents each of them as returning an
+       <EM>int</EM>.  This is  misleading,  as  they  are  macros  with  no  documented
+       semantics for returning values.
+
+       All other functions are as described in X/Open Curses.  It specifies no
+       error conditions for them, except as described for <EM>curs</EM><STRONG>_</STRONG><EM>set</EM> in  section
+       "RETURN VALUE" above.
+
+       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
+       currently incorrect".  This implementation gets it right, but  counting
+       on its correctness anywhere else may be unwise.
 
-       The  SVr4  documentation  describes  <STRONG>setsyx</STRONG> and <STRONG>getsyx</STRONG> as having return
-       type int.  This is misleading, as they are macros  with  no  documented
-       semantics for the return value.
+       X/Open  Curses specifies <EM>ripoffline</EM> as returning <STRONG>OK</STRONG> with no possibility
+       of failure ("[c]alls to <EM>ripoffline</EM> above this limit [five  lines]  have
+       no effect but report success").
 
        X/Open Curses notes:
 
-              "After  use  of <EM>mvcur</EM>(), the model Curses maintains of the state
-              of the  terminal  might  not  match  the  actual  state  of  the
-              terminal.   An  application  should touch and refresh the window
-              before resuming conventional use of Curses."
+              After use of <EM>mvcur</EM>(), the model Curses maintains of the state of
+              the terminal might not match the actual state of  the  terminal.
+              An  application  should  touch  and  refresh  the  window before
+              resuming conventional use of Curses.
 
-       Both <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement  <STRONG>mvcur</STRONG>  using  the  <EM>SCREEN</EM>  data
+       Both <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using  the  <EM>SCREEN</EM>  object
        allocated  in  either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open Curses states
-       that the old location must be given for <STRONG>mvcur</STRONG> to accommodate  terminals
+       that the old location must be given for <EM>mvcur</EM> to accommodate  terminals
        that lack absolute cursor positioning.
 
-       If interrupted, <EM>ncurses</EM> restarts <STRONG>napms</STRONG>.  That, and the limitation to 30
-       seconds, are different from other implementations.
+       If  interrupted  by  a  signal,  <EM>ncurses</EM> restarts <EM>napms</EM>.  That, and the
+       limitation to 30 seconds, differ from other implementations.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -250,7 +262,7 @@ <H1 class="no-header">curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 89fdc9c08..0fd6b4714 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -166,22 +166,22 @@ <H1 class="no-header">curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  It  specifies
-       no error conditions for them.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       Some  historic  curses implementations had, as an undocumented feature,
-       the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
-       <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
+       Some  historic  <EM>curses</EM> implementations, as an undocumented feature, did
+       the  equivalent  of  "<STRONG>clearok(</STRONG>...<STRONG>,</STRONG>   <STRONG>1)</STRONG>"   when   <STRONG>touchwin(stdstr)</STRONG>   or
+       <STRONG>clear(stdstr)</STRONG> were used.  This trick does not work with <EM>ncurses</EM>.
 
-       Earlier  System  V  curses implementations specified that with <STRONG>scrollok</STRONG>
+       Early  System V  <EM>curses</EM>  implementations  specified  that with <STRONG>scrollok</STRONG>
        enabled, any window modification triggering  a  scroll  also  forced  a
        physical  refresh.   X/Open  Curses  does not require this, and <EM>ncurses</EM>
-       avoids doing it  to  perform  better  vertical-motion  optimization  at
-       <STRONG>wrefresh</STRONG> time.
+       avoids  doing  so  to  better  optimize   vertical   motions   upon   a
+       <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>.
 
        X/Open Curses does not mention that the cursor should be made invisible
-       as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 curses documentation does this,  but
-       the code does not.  Use <STRONG>curs_set</STRONG> to make the cursor invisible.
+       as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 <EM>curses</EM> documentation notes this, but
+       the code neglects it.  Use <STRONG><A HREF="curs_kernel.3x.html">curs_set(3x)</A></STRONG> to make the cursor invisible.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -195,7 +195,7 @@ <H1 class="no-header">curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 7af81c14e..629f6821a 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -155,11 +155,11 @@ <H1 class="no-header">curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG> <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 8b830748b..476dd173e 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp @
+  * @Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -63,16 +63,18 @@ <H1 class="no-header">curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        <STRONG>scroll</STRONG>  scrolls  the  given window up one line.  That is, every visible
        line we might number <EM>i</EM> becomes line <EM>i</EM>-1.  The text of the top  line  in
        the  window  disappears  and  the  bottom  line is populated with blank
-       characters; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> or <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.  As  an  optimization,  if  the
-       scrolling  region  of  the  window  is  the entire screen, the physical
-       screen may be scrolled at the same time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
+       characters; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> (wide-character API users: <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  As an
+       optimization,  if  the  scrolling  region  of  the window is the entire
+       screen, the physical screen may be  scrolled  at  the  same  time;  see
+       <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
-       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scroll  <STRONG>stdscr</STRONG>  or  the  specified  window  up  or  down
-       depending on the sign of <EM>n</EM>.
+       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scrolls the specified window <EM>win</EM> up or down per the sign
+       of <EM>n</EM>.
 
        <STRONG>o</STRONG>   For positive <EM>n</EM>, line <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM> (scrolling up);
 
-       <STRONG>o</STRONG>   for negative <EM>n</EM>, line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling down).
+       <STRONG>o</STRONG>   for negative <EM>n</EM>, line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling  down).   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+           describes the <STRONG>scrl</STRONG> variant of this function.
 
        The  cursor does not move.  These functions perform no operation unless
        scrolling is enabled for the window via <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
@@ -102,12 +104,12 @@ <H1 class="no-header">curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        SVr4  indicates  that  the   optimization   of   physically   scrolling
        immediately  if  the scroll region is the entire screen "is" performed,
        not "may be" performed.  <EM>ncurses</EM> deliberately does not  guarantee  that
-       this  will occur, to leave open the possibility of smarter optimization
-       of multiple scroll actions on the next update.
+       this  occurs,  to  leave open the possibility of better optimization of
+       multiple scroll actions on the next update.
 
-       Neither SVr4 <EM>curses</EM> nor  X/Open  Curses  specify  whether  the  current
-       attribute  or  current  color  pair  of  blanks generated by the scroll
-       function are zeroed.  <EM>ncurses</EM> does so.
+       Neither SVr4 <EM>curses</EM> nor X/Open Curses specify whether  these  functions
+       zero  the  attributes  or color pair identifier of the blank character.
+       In <EM>ncurses</EM>, they do not.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -115,7 +117,7 @@ <H1 class="no-header">curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index e2bb7de01..97f6ecad7 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp @
+  * @Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -229,55 +229,55 @@ <H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
            functions, marking them as "TO BE WITHDRAWN".
 
-       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) marks the  <EM>termcap</EM>  interface  (along
-           with <STRONG>vwprintw</STRONG> and <STRONG>vwscanw</STRONG>) as withdrawn.
+       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) withdrew the <EM>termcap</EM> interface (along
+           with the <EM>vwprintw</EM> and <EM>vwscanw</EM> functions).
 
        Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
-       values of <STRONG>tgetent</STRONG> correctly, though all three shown here were  in  fact
+       values of <EM>tgetent</EM> correctly, though all three shown here were  in  fact
        returned  ever  since  SVr1.   In particular, an omission in the X/Open
-       Curses specification has  been  misinterpreted  to  mean  that  <STRONG>tgetent</STRONG>
+       Curses specification has  been  misinterpreted  to  mean  that  <EM>tgetent</EM>
        returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>.   Because  the  purpose  of these functions is to
        provide compatibility with the <EM>termcap</EM> library, that  is  a  defect  in
        X/Open Curses, Issue 4, Version 2 rather than in <EM>ncurses</EM>.
 
-   <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <EM>termcap</EM>
-       Externally  visible  variables  are  provided  for  support  of certain
+   <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <STRONG><EM>termcap</EM></STRONG>
+       <EM>ncurses</EM>  provides  externally  visible  variables  to  support  certain
        <EM>termcap</EM>  applications.   However,  their  correct   usage   is   poorly
        documented; for example, it is unclear when reading and writing them is
        meaningful.  In particular, some applications are reported  to  declare
        and/or modify <STRONG>ospeed</STRONG>.
 
        The  constraint  that only the first two characters of the <EM>id</EM> parameter
-       are used escapes many application developers.  The BSD <EM>termcap</EM>  library
-       did  not require a trailing null character on the capability identifier
-       passed to <STRONG>tgetstr</STRONG>,  <STRONG>tgetnum</STRONG>,  and  <STRONG>tgetflag</STRONG>.   Some  applications  thus
-       assume  that  the  <EM>termcap</EM> interface does not require the trailing null
-       character for the capability identifier.
+       are looked  up  in  the  terminal  database  escapes  many  application
+       developers.   The  BSD  <EM>termcap</EM> library did not require a trailing null
+       character after the capability identifier passed to  <EM>tgetstr</EM>,  <EM>tgetnum</EM>,
+       and <EM>tgetflag</EM>.  Some applications thus assume that the <EM>termcap</EM> interface
+       does not  require  the  trailing  null  character  for  the  capability
+       identifier.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> disallows matches by the <EM>termcap</EM> interface against extended
-           capability   names   that  are  longer  than  two  characters;  see
-           <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
+       <EM>ncurses</EM>  disallows  matches  by  the <EM>termcap</EM> interface against extended
+       capability names that are longer than two characters; see <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
-       The BSD <EM>termcap</EM> function <STRONG>tgetent</STRONG> returns the text of a <EM>termcap</EM> entry in
+       The BSD <EM>termcap</EM> function <EM>tgetent</EM> returns the text of a <EM>termcap</EM> entry in
        the  buffer  passed  as an argument.  This library, like other <EM>terminfo</EM>
        implementations, does not store terminal type descriptions as text.  It
        sets the buffer contents to a null-terminated string.
 
 
 </PRE><H3><a name="h3-Header-File">Header File</a></H3><PRE>
-       This  library  includes a <EM>termcap.h</EM> header for compatibility with other
-       implementations, but the  header  is  rarely  used  because  the  other
-       implementations are not strictly compatible.
+       This  library  includes  a <EM>termcap.h</EM> header file for compatibility with
+       other  implementations,  but  it  is  rarely  used  because  the  other
+       implementations are not mutually compatible; see below.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
        Bill  Joy  originated  a  forerunner  of <EM>termcap</EM> called "ttycap", dated
        September 1977, and released in 1BSD (March 1978).  It used many of the
-       same  function  names  as the later <EM>termcap</EM>, such as <STRONG>tgetent</STRONG>, <STRONG>tgetflag</STRONG>,
-       <STRONG>tgetnum</STRONG>, and <STRONG>tgetstr</STRONG>.
+       same  function  names  as the later <EM>termcap</EM>, such as <EM>tgetent</EM>, <EM>tgetflag</EM>,
+       <EM>tgetnum</EM>, and <EM>tgetstr</EM>.
 
        A clear descendant, the <EM>termlib</EM> library, followed in 2BSD  (May  1979),
-       adding <STRONG>tgoto</STRONG> and <STRONG>tputs</STRONG>.  The former applied at that time only to cursor
+       adding <EM>tgoto</EM> and <EM>tputs</EM>.  The former applied at that time only to cursor
        positioning  capabilities,  thus  the  overly  specific  name.   Little
        changed  in 3BSD (late 1979) except the addition of test programs and a
        <EM>termlib</EM> man page, which documented the API shown in section  "SYNOPSIS"
@@ -300,18 +300,18 @@ <H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
            shows that this was added in mid-1992.  The <EM>libedit</EM> header file was
            used  internally  as  a  convenience  for  compiling  the  <EM>editline</EM>
            library.  It declared function prototypes, but no global variables.
-           This header file was added to NetBSD's <EM>termcap</EM> library in mid-1994.
+           NetBSD's <EM>termcap</EM> library added this header file in mid-1994.
 
        Meanwhile, GNU <EM>termcap</EM> began development in 1990.   Its  first  release
-       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header.   Its  second (1.1) in
-       September 1992 modified the  header  to  use  <EM>const</EM>  for  the  function
-       prototypes  in  the  header where one would expect the parameters to be
-       read-only.   BSD  <EM>termcap</EM>  did  not.   The  prototype  for  <STRONG>tputs</STRONG>  also
+       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header file.  Its second (1.1)
+       release in September 1992 modified  the  file  to  use  <EM>const</EM>  for  the
+       function  prototypes in the header where one would expect parameters to
+       be read-only.  BSD <EM>termcap</EM> did  not.   The  prototype  for  <EM>tputs</EM>  also
        differed,  but  in that instance, it was <EM>libedit</EM> that differed from BSD
        <EM>termcap</EM>.
 
-       GNU <EM>termcap</EM> 1.3 was bundled with <STRONG>bash(1)</STRONG> in  mid-1993  to  support  the
-       <STRONG>readline(3)</STRONG> library.
+       GNU <STRONG>bash(1)</STRONG> has bundled GNU <EM>termcap</EM> 1.3 since mid-1993 to  support  its
+       <STRONG>readline(3)</STRONG> library, and continues to use it if configured to do so.
 
        <EM>ncurses</EM>  1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It reflected
        influence  from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than   <STRONG>jove(1)</STRONG>),
@@ -321,9 +321,9 @@ <H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>const</EM>-qualified function prototypes, and
 
-       <STRONG>o</STRONG>   a prototype for <STRONG>tparam</STRONG>, a GNU <EM>termcap</EM> feature.
+       <STRONG>o</STRONG>   a prototype for <EM>tparam</EM>, a GNU <EM>termcap</EM> feature.
 
-       Later  (in mid-1996) the <STRONG>tparam</STRONG> function was removed from <EM>ncurses</EM>.  Any
+       Later  (in mid-1996) the <EM>tparam</EM> function was removed from <EM>ncurses</EM>.  Any
        two of the four implementations thus differ, and programs  that  intend
        to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
@@ -363,13 +363,14 @@ <H1 class="no-header">curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <EM>TCTEST</EM> <EM>-</EM> <EM>A</EM> <EM>Termcap</EM> <EM>Test</EM> <EM>Utility</EM>
+       &lt;https://invisible-island.net/ncurses/tctest.html&gt;
 
-       https://invisible-island.net/ncurses/tctest.html
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-22                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 4ba139ae5..ed9d1cf45 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -210,81 +210,80 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>setupterm</STRONG>  stores  its  information  about  the  terminal in a <EM>TERMINAL</EM>
        structure pointed to by the global variable <STRONG>cur_term</STRONG>.  If it detects an
        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
-       generic), it discards this information,  making  it  not  available  to
+       generic), it  discards  this  information,  making  it  unavailable  to
        applications.
 
-       If  <STRONG>setupterm</STRONG>  is called repeatedly for the same terminal type, it will
-       reuse  the  information.   It  maintains  only  one  copy  of  a  given
-       terminal's  capabilities  in  memory.   If  it  is called for different
-       terminal types,  <STRONG>setupterm</STRONG>  allocates  new  storage  for  each  set  of
-       terminal capabilities.
+       If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type, it reuses
+       the information.   It  maintains  only  one  copy  of  a  given  type's
+       capabilities  in  memory.   If  called  for  different types, <STRONG>setupterm</STRONG>
+       allocates new storage for each set of terminal capabilities.
 
-       <STRONG>set_curterm</STRONG>  sets  <STRONG>cur_term</STRONG>  to  <EM>nterm</EM>,  and  makes all of the <EM>terminfo</EM>
-       Boolean, numeric, and string variables use the values from  <EM>nterm</EM>.   It
-       returns the old value of <STRONG>cur_term</STRONG>.
+       <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, making all of the <EM>terminfo</EM> Boolean,
+       numeric, and string capabilities use the values from <EM>nterm</EM>.  It returns
+       the old value of <STRONG>cur_term</STRONG>.
 
-       <STRONG>del_curterm</STRONG>  frees the space pointed to by <EM>oterm</EM> and makes it available
-       for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references  to  any
-       of  the  <EM>terminfo</EM> Boolean, numeric, and string variables thereafter may
-       refer to invalid memory locations  until  another  <STRONG>setupterm</STRONG>  has  been
-       called.
+       <STRONG>del_curterm</STRONG> frees the memory pointed to by <STRONG>oterm</STRONG>, making  it  available
+       for  further  use.  If <STRONG>oterm</STRONG> is the same as <STRONG>cur_term</STRONG>, references to any
+       of the <EM>terminfo</EM> Boolean, numeric, and  string  capabilities  thereafter
+       may refer to invalid memory locations until <STRONG>setupterm</STRONG> is called again.
 
-       <STRONG>restartterm</STRONG>  is  similar  to  <STRONG>setupterm</STRONG>  and <STRONG>initscr</STRONG>, except that it is
-       called after restoring memory to a previous state  (for  example,  when
-       reloading a game saved as a core image dump).  <STRONG>restartterm</STRONG> assumes that
-       the windows and the input and output  options  are  the  same  as  when
-       memory was saved, but the terminal type and baud rate may be different.
-       Accordingly, <STRONG>restartterm</STRONG>  saves  various  terminal  state  bits,  calls
-       <STRONG>setupterm</STRONG>, and then restores the bits.
+       <STRONG>restartterm</STRONG>  is  similar  to  <STRONG>setupterm</STRONG>,  but is intended for use after
+       restoring program  memory  to  a  previous  state  (for  example,  when
+       reloading  an  application  that  has  been suspended from one terminal
+       session and restored in another).  <STRONG>restartterm</STRONG> assumes that the display
+       dimensions and the input and output options are the same as when memory
+       was  saved,  but  the  terminal  type  and  line  speed   may   differ.
+       Accordingly,   <STRONG>restartterm</STRONG>   saves   relevant   terminal  state,  calls
+       <STRONG>setupterm</STRONG>, then restores that state.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       <STRONG>tparm</STRONG>  instantiates  the  string  <EM>str</EM> with parameters <EM>pi</EM>.  A pointer is
+       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi</EM>.   A  pointer  is
        returned to the result of <EM>str</EM> with the parameters applied.  Application
        developers should keep in mind these quirks of the interface:
 
-       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
+       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
            prototype expects <EM>long</EM> (integer) values.
 
-       <STRONG>o</STRONG>   Aside from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most  terminal
+       <STRONG>o</STRONG>   Aside  from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most terminal
            capabilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
+       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
+       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG>  is  a  newer  form  of  <STRONG>tparm</STRONG> which uses <EM>stdarg.h</EM> rather than a
-       fixed-parameter list.  Its numeric  parameters  are  <EM>int</EM>s  rather  than
+       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG>  which  uses  <EM>stdarg.h</EM>  rather  than  a
+       fixed-parameter  list.   Its  numeric  parameters  are <EM>int</EM>s rather than
        <EM>long</EM>s.
 
-       Both  <STRONG>tparm</STRONG>  and  <STRONG>tiparm</STRONG>  assume that the application passes parameters
-       consistent with the terminal description.  Two extensions are  provided
+       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
+       consistent  with the terminal description.  Two extensions are provided
        as alternatives to deal with untrusted data.
 
-       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG>  is an extension which is a safer formatting function than
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
            <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the <EM>curses</EM>
-           library  how  many  parameters to expect in the parameter list, and
+           library how many parameters to expect in the  parameter  list,  and
            which may be string parameters.
 
-           The <EM>mask</EM> parameter has one bit set for each of the  parameters  (up
+           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
            to 9) passed as <EM>char</EM> pointers rather than numbers.
 
-       <STRONG>o</STRONG>   The   extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect  a
+       <STRONG>o</STRONG>   The  extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect   a
            formatting capability to see what the <EM>curses</EM> library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       String capabilities can  contain  padding  information,  a  time  delay
+       String  capabilities  can  contain  padding  information,  a time delay
        (accommodating performance limitations of hardware terminals) expressed
        as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM>
        exceeds 30,000 (thirty seconds), it is capped at that value.
 
-       <STRONG>tputs</STRONG>  interprets  time-delay information in the string <EM>str</EM> and outputs
+       <STRONG>tputs</STRONG> interprets time-delay information in the string <EM>str</EM>  and  outputs
        it, executing the delays:
 
-       <STRONG>o</STRONG>   The <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the  return
+       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the return
            value of <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>.
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or <STRONG>1</STRONG> if not applicable.
@@ -292,8 +291,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   <EM>putc</EM> is a <EM>putchar</EM>-like function to which the characters are passed,
            one at a time.
 
-           If <STRONG>tputs</STRONG> processes  a  time-delay,  it  uses  the  <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
-           function,  routing  any  resulting  padding characters through this
+           If  <STRONG>tputs</STRONG>  processes  a  time-delay,  it  uses the <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
+           function, routing any resulting  padding  characters  through  this
            function.
 
        <STRONG>putp</STRONG> calls "<STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>".  The output of <STRONG>putp</STRONG> always goes to
@@ -305,30 +304,30 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
        <STRONG>vidattr</STRONG> is like <STRONG>vidputs</STRONG>, except that it outputs through <STRONG>putchar(3)</STRONG>.
 
-       <STRONG>vid_attr</STRONG>  and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>, respectively.
-       They use multiple parameters to represent the character attributes  and
+       <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>,  respectively.
+       They  use multiple parameters to represent the character attributes and
        color; namely,
 
        <STRONG>o</STRONG>   <EM>attrs</EM>, of type <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, for the attributes and
 
        <STRONG>o</STRONG>   <EM>pair</EM>, of type <EM>short</EM>, for the color pair number.
 
-       Use  the  attribute  constants  prefixed  with  "<STRONG>WA_</STRONG>" with <STRONG>vid_attr</STRONG> and
+       Use the attribute constants  prefixed  with  "<STRONG>WA_</STRONG>"  with  <STRONG>vid_attr</STRONG>  and
        <STRONG>vid_puts</STRONG>.
 
-       X/Open Curses reserves the <EM>opts</EM> argument for future  use,  saying  that
-       applications  must  provide  a  null pointer for that argument; but see
+       X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
+       applications must provide a null pointer for  that  argument;  but  see
        section "EXTENSIONS" below.
 
-       While <STRONG>putp</STRONG> is a low-level function that does not use high-level  <EM>curses</EM>
-       state,  <EM>ncurses</EM>  declares it in <EM>curses.h</EM> because System V did this (see
+       While  <STRONG>putp</STRONG> is a low-level function that does not use high-level <EM>curses</EM>
+       state, <EM>ncurses</EM> declares it in <EM>curses.h</EM> because System V did  this  (see
        section "HISTORY" below).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
-       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, and <STRONG>tigetstr</STRONG> return the value  of  the  capability
-       corresponding  to  the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed to them.
-       The <EM>cap-code</EM> for each capability is given in the table column  entitled
+       <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG>,  and  <STRONG>tigetstr</STRONG> return the value of the capability
+       corresponding to the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed  to  them.
+       The  <EM>cap-code</EM> for each capability is given in the table column entitled
        <EM>cap-code</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        These functions return special values to denote errors.
@@ -371,26 +370,26 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
-       description.  As a side effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
+       description.   As  a  side  effect,  it  sets <STRONG>cur_term</STRONG> to point to this
        memory.  If an application calls
 
               del_curterm(cur_term);
 
        the memory will be freed.
 
-       The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
+       The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
        by <STRONG>setupterm</STRONG> as follows.
 
-       <STRONG>o</STRONG>   They add the "static" <EM>terminfo</EM>  variables  [a-z].   Before  <EM>ncurses</EM>
+       <STRONG>o</STRONG>   They  add  the  "static"  <EM>terminfo</EM> variables [a-z].  Before <EM>ncurses</EM>
            6.3, those were shared by all screens.  With <EM>ncurses</EM> 6.3, those are
            allocated per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       <STRONG>o</STRONG>   To improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
-           <EM>terminfo</EM>  strings  for  their parameter types.  That is stored as a
+       <STRONG>o</STRONG>   To  improve performance, <EM>ncurses</EM> 6.3 caches the result of analyzing
+           <EM>terminfo</EM> strings for their parameter types.  That is  stored  as  a
            binary tree referenced from the <EM>TERMINAL</EM> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
-       they  do  not free this memory, but it is possible to do that using the
+       they do not free this memory, but it is possible to do that  using  the
        <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG> function.
 
 
@@ -406,35 +405,35 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
             fails if the associated call to <STRONG>setupterm</STRONG> returns <STRONG>ERR</STRONG>.
 
        <STRONG>setupterm</STRONG>
-            fails if it cannot allocate enough memory, or create  the  initial
-            windows  (<STRONG>stdscr</STRONG>,  <STRONG>curscr</STRONG>,  and <STRONG>newscr</STRONG>) Other error conditions are
+            fails  if  it cannot allocate enough memory, or create the initial
+            windows (<STRONG>stdscr</STRONG>, <STRONG>curscr</STRONG>, and <STRONG>newscr</STRONG>) Other  error  conditions  are
             documented above.
 
        <STRONG>tparm</STRONG>
-            returns a null pointer if the capability would require  unexpected
-            parameters;  that  is,  too  many,  too  few,  or  incorrect types
+            returns  a null pointer if the capability would require unexpected
+            parameters; that  is,  too  many,  too  few,  or  incorrect  types
             (strings where integers are expected, or vice versa).
 
        <STRONG>tputs</STRONG>
-            fails if the string parameter is null.  It  does  not  detect  I/O
-            errors:  X/Open  Curses states that <STRONG>tputs</STRONG> ignores the return value
+            fails  if  the  string  parameter is null.  It does not detect I/O
+            errors: X/Open Curses states that <STRONG>tputs</STRONG> ignores the  return  value
             of the output function <EM>putc</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The <STRONG>vid_attr</STRONG> function in <EM>ncurses</EM> is a special case.  It was  originally
+       The  <STRONG>vid_attr</STRONG> function in <EM>ncurses</EM> is a special case.  It was originally
        implemented based on a draft of X/Open Curses, as a macro, before other
-       parts of the <EM>ncurses</EM> wide-character API were developed, and unlike  the
-       other  wide-character  functions,  is  also  provided  in the non-wide-
+       parts  of the <EM>ncurses</EM> wide-character API were developed, and unlike the
+       other wide-character functions,  is  also  provided  in  the  non-wide-
        character configuration.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The functions marked as extensions were designed for <EM>ncurses</EM>,  and  are
-       not  found  in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM>
+       The  functions  marked as extensions were designed for <EM>ncurses</EM>, and are
+       not found in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other  previous  <EM>curses</EM>
        implementation.
 
-       <EM>ncurses</EM> allows <EM>opts</EM> to be a pointer to <EM>int</EM>, which  overrides  the  <EM>pair</EM>
+       <EM>ncurses</EM>  allows  <EM>opts</EM>  to be a pointer to <EM>int</EM>, which overrides the <EM>pair</EM>
        (<EM>short</EM>) argument.
 
 
@@ -444,78 +443,79 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Compatibility-Macros">Compatibility Macros</a></H3><PRE>
-       This implementation  provides  a  few  macros  for  compatibility  with
-       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
-       <STRONG>Bcrmode</STRONG>, <STRONG>Bfixterm</STRONG>, <STRONG>Bgettmode</STRONG>,  <STRONG>Bnocrmode</STRONG>,  <STRONG>Bresetterm</STRONG>,  <STRONG>Bsaveterm</STRONG>,  and
+       This  implementation  provides  a  few  macros  for  compatibility with
+       systems before  SVr4  (see  section  "HISTORY"  below).   They  include
+       <STRONG>Bcrmode</STRONG>,  <STRONG>Bfixterm</STRONG>,  <STRONG>Bgettmode</STRONG>,  <STRONG>Bnocrmode</STRONG>,  <STRONG>Bresetterm</STRONG>, <STRONG>Bsaveterm</STRONG>, and
        <STRONG>Bsetterm</STRONG>.
 
-       In  SVr4,  these  are  found  in  <EM>curses.h</EM>, but except for <STRONG>setterm</STRONG>, are
+       In SVr4, these are found in  <EM>curses.h</EM>,  but  except  for  <STRONG>setterm</STRONG>,  are
        likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
        page.  It further notes that <STRONG>setterm</STRONG> was replaced by <STRONG>setupterm</STRONG>, stating
        that the call
               setupterm(<EM>term</EM>, 1, (int *)0)
-       provides the same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>,  discouraging  the
-       latter  for  new programs.  <EM>ncurses</EM> implements each of these symbols as
+
+       provides  the  same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>, discouraging the
+       latter for new programs.  <EM>ncurses</EM> implements each of these  symbols  as
        macros for BSD <EM>curses</EM> compatibility.
 
 
 </PRE><H3><a name="h3-Legacy-Data">Legacy Data</a></H3><PRE>
-       <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>.  This  is  not
+       <STRONG>setupterm</STRONG>  copies  the terminal name to the array <STRONG>ttytype</STRONG>.  This is not
        part of X/Open Curses, but is assumed by some applications.
 
-       Other  implementions  may not declare the capability name arrays.  Some
-       provide them without declaring them.  X/Open Curses  does  not  specify
+       Other implementions may not declare the capability name  arrays.   Some
+       provide  them  without  declaring them.  X/Open Curses does not specify
        them.
 
-       Extended  terminal  capability  names,  as defined by "<STRONG>tic</STRONG> <STRONG>-x</STRONG>", are not
+       Extended terminal capability names, as defined by  "<STRONG>tic</STRONG>  <STRONG>-x</STRONG>",  are  not
        stored in the arrays described here.
 
 
 </PRE><H3><a name="h3-Output-Buffering">Output Buffering</a></H3><PRE>
-       Older versions of <EM>ncurses</EM> assumed that the file  descriptor  passed  to
+       Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
        <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
-       the corresponding stream.  In  addition  to  the  limitation  that  the
-       terminal  was  left  in  block-buffered  mode  on  exit  (like System V
-       <EM>curses</EM>), it was problematic because <EM>ncurses</EM> did not  allow  a  reliable
+       the  corresponding  stream.   In  addition  to  the limitation that the
+       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+       <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
        way to clean up on receiving <STRONG>SIGTSTP</STRONG>.
 
-       The  current version (ncurses6) uses output buffers managed directly by
+       The current version (ncurses6) uses output buffers managed directly  by
        <EM>ncurses</EM>.  Some of the low-level functions described in this manual page
-       write  to  the  standard  output.  They are not signal-safe.  The high-
+       write to the standard output.  They are  not  signal-safe.   The  high-
        level functions in <EM>ncurses</EM> employ alternate versions of these functions
        using the more reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
-       The  X/Open  Curses  prototypes  are  based  on  the SVr4 <EM>curses</EM> header
-       declarations, which were defined at the same time the  C  language  was
+       The X/Open Curses prototypes  are  based  on  the  SVr4  <EM>curses</EM>  header
+       declarations,  which  were  defined at the same time the C language was
        first standardized in the late 1980s.
 
-       <STRONG>o</STRONG>   X/Open  Curses  uses  <EM>const</EM>  less  effectively  than a later design
-           might, sometimes applying it needlessly to values that are  already
-           constant,  and  in  most cases overlooking parameters that normally
-           would use <EM>const</EM>.  Passing <EM>const</EM>-qualified parameters  to  functions
-           that  do  not  declare  them  <EM>const</EM>  may  prevent  the program from
-           compiling.   On  the  other  hand,  "writable   strings"   are   an
+       <STRONG>o</STRONG>   X/Open Curses uses <EM>const</EM>  less  effectively  than  a  later  design
+           might,  sometimes applying it needlessly to values that are already
+           constant, and in most cases overlooking  parameters  that  normally
+           would  use  <EM>const</EM>.  Passing <EM>const</EM>-qualified parameters to functions
+           that do not  declare  them  <EM>const</EM>  may  prevent  the  program  from
+           compiling.    On   the   other  hand,  "writable  strings"  are  an
            obsolescent feature.
 
-           As  an  extension,  this implementation can be configured to change
-           the function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM>  ABI
+           As an extension, this implementation can be  configured  to  change
+           the  function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI
            6 enables this feature by default.
 
-       <STRONG>o</STRONG>   X/Open  Curses  prototypes <STRONG>tparm</STRONG> with a fixed number of parameters,
+       <STRONG>o</STRONG>   X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number  of  parameters,
            rather than a variable argument list.
 
-           This implementation uses a  variable  argument  list,  but  can  be
-           configured  to use the fixed-parameter list.  Portable applications
-           should provide nine parameters after the format;  zeroes  are  fine
+           This  implementation  uses  a  variable  argument  list, but can be
+           configured to use the fixed-parameter list.  Portable  applications
+           should  provide  nine  parameters after the format; zeroes are fine
            for this purpose.
 
-           In  response  to review comments by Thomas E. Dickey, X/Open Curses
+           In response to review comments by Thomas E. Dickey,  X/Open  Curses
            Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
 
-           While <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is  only
-           available  as  a build-time configuration option.  If not specially
+           While  <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is only
+           available as a build-time configuration option.  If  not  specially
            configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
 
        Both forms of <STRONG>tparm</STRONG> have drawbacks:
@@ -523,56 +523,56 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
            nine on each call is awkward.
 
-           Using  <EM>long</EM>  for the numeric parameter type is a workaround to make
-           the parameter use the same amount of  stack  as  a  pointer.   That
-           approach  dates  back  to the mid-1980s, before C was standardized.
-           Since then, there is a standard (and pointers are not  required  to
+           Using <EM>long</EM> for the numeric parameter type is a workaround  to  make
+           the  parameter  use  the  same  amount of stack as a pointer.  That
+           approach dates back to the mid-1980s, before  C  was  standardized.
+           Since  then,  there is a standard (and pointers are not required to
            fit in a <EM>long</EM>).
 
-       <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
+       <STRONG>o</STRONG>   Providing the right number of parameters for  a  variadic  function
            such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
-           parameters.   However,  only a few <EM>terminfo</EM> capabilities use string
-           parameters (for instance, the ones used for  programmable  function
+           parameters.  However, only a few <EM>terminfo</EM> capabilities  use  string
+           parameters  (for  instance, the ones used for programmable function
            keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           <STRONG>ERR</STRONG> if the capability mishandles string parameters.  But it  cannot
+           <STRONG>ERR</STRONG>  if the capability mishandles string parameters.  But it cannot
            check if a calling program provides strings in the right places for
            the <STRONG>tparm</STRONG> calls.
 
-           The <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> program checks its use of  these  capabilities  with  a
+           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
            table, so that it calls <STRONG>tparm</STRONG> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
        If configured to use the terminal driver, as with the MinGW port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
            value "unknown".
 
            SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The difference  between  the  two  is  that  the  former  uses  the
-           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
+           The  difference  between  the  two  is  that  the  former  uses the
+           <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) <EM>terminfo</EM> capability, while the latter  does  not.
            A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver  by
-           checking  if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of that
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
+           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
            string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In SVr4, <STRONG>set_curterm</STRONG> returns an <EM>int</EM>, <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
+       In  SVr4,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>  returns  an  <EM>int</EM>, <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
        implement the X/Open Curses semantics.
 
-       In SVr4, the third argument of <STRONG>tputs</STRONG> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
+       In SVr4, the third argument of <EM>tputs</EM> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
 
-       At  least one implementation of X/Open Curses (Solaris) returns a value
-       other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>.  It instead returns the length of  the
+       At least one implementation of X/Open Curses (Solaris) returns a  value
+       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <EM>tputs</EM>.  It instead returns the length of the
        string, and does no error checking.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
+       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -592,7 +592,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
        <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
 
-       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
@@ -604,11 +604,11 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>tgoto</STRONG>      apply parameters to given capability
        <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
 
-       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
+       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
        structure initialized by <STRONG>setupterm</STRONG>.
 
-       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
-       capability  values  (like the <EM>termcap</EM> interface), and reusing <STRONG>tgoto</STRONG> and
+       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
+       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
        <STRONG>tputs</STRONG>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -617,7 +617,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
        <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
 
-       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
+       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -630,37 +630,37 @@ <H1 class="no-header">curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        saveterm    def_prog_mode
        setterm     setupterm
 
-       SVr3  kept  the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG>, and <STRONG>tputs</STRONG>.  The latter were needed to support  padding,  and  to
-       handle  capabilities  accessed by functions such as <STRONG>vidattr</STRONG> (which used
+       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
+       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
+       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
        more than the two parameters supported by <STRONG>tgoto</STRONG>).
 
-       SVr3  introduced  the  functions   for   switching   between   terminal
-       descriptions;   for   example,  <STRONG>set_curterm</STRONG>.   Some  changes  reflected
+       SVr3   introduced   the   functions   for  switching  between  terminal
+       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
+       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various  global  variables  such as <STRONG>boolnames</STRONG> were mentioned in the
-           programming manual at this point, though  the  variables  had  been
+       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
+           programming  manual  at  this  point, though the variables had been
            provided in SVr2.
 
        SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
 
-       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
-       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
+       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index f013ea078..81c6ba1da 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-09-11 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-09-11 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -405,7 +405,7 @@ <H1 class="no-header">curs_util 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-09-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index a72a37e30..bf49fe098 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp @
+  * @Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -258,15 +258,15 @@ <H1 class="no-header">curs_variables 3x 2024-06-22 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-
-       [UAX  #29]  "Unicode  Standard  Annex  #29: Unicode Text Segmentation";
+       [UAX #29] "Unicode Standard Annex #29: Unicode Text Segmentation"
        &lt;https://unicode.org/reports/tr29/&gt;
 
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
 
 
-ncurses 6.5                       2024-06-22                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index ebc4de7bd..03292a19c 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp @
+  * @Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-06-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-06-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -54,23 +54,23 @@ <H1 class="no-header">curs_window 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>WINDOW</STRONG> <STRONG>*newwin(</STRONG>
-             <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>delwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*subwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>orig</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*derwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>orig</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
-             <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvderwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>par</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>par</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*dupwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wsyncup(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>syncok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wcursyncup(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>wsyncdown(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>newwin(</STRONG>
+            <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
+            <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>delwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>subwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>orig</EM><STRONG>,</STRONG>
+            <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
+            <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>derwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>orig</EM><STRONG>,</STRONG>
+            <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG>
+            <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvderwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>par</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>par</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>dupwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wsyncup(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>syncok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wcursyncup(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>wsyncdown(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -248,7 +248,7 @@ <H1 class="no-header">curs_window 3x 2024-06-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-01                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index dd23d8b05..f4367c773 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp @
+  * @Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2024-09-14 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-09-14 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -52,10 +52,9 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>infocmp</STRONG> [<STRONG>-1cCdDeEFgGiIKlLnpqrtTuUVWx</STRONG>]
-             [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-Q</STRONG> <EM>n</EM>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>]
-             [<STRONG>-w</STRONG> <EM>width</EM>] [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
-             [<EM>terminal-type</EM> ...]
+       <STRONG>infocmp</STRONG> [<STRONG>-1cCdDeEFgGiIKlLnpqrtTuUVWx]</STRONG> [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
+              [<STRONG>-Q</STRONG> <EM>encoding</EM>] [<STRONG>-R</STRONG> <EM>subset</EM>] [<STRONG>-s</STRONG> <EM>key</EM>] [<STRONG>-v</STRONG> <EM>level</EM>] [<STRONG>-w</STRONG> <EM>width</EM>]
+              [<EM>terminal-type</EM> ... ]
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -84,7 +83,7 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
        <STRONG>o</STRONG>   <STRONG>NULL</STRONG> for missing integer or string variables
 
-       Use the <STRONG>-q</STRONG> option to show the distinction between <EM>absent</EM> and  <EM>cancelled</EM>
+       Use the <STRONG>-q</STRONG> option to show the distinction between <EM>absent</EM>  and  <EM>canceled</EM>
        capabilities.
 
        These  options  produce a list which you can use to compare two or more
@@ -217,7 +216,7 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
        are superfluous.  <STRONG>infocmp</STRONG> will flag any other <EM>terminal-type</EM> <EM>use=</EM> fields
        that were not needed.
 
-   <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <EM>directory</EM>] [-B <EM>directory</EM>]
+   <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <STRONG><EM>directory</EM></STRONG><STRONG>]</STRONG> <STRONG>[-B</STRONG> <STRONG><EM>directory</EM></STRONG><STRONG>]</STRONG>
        Like  other  <EM>ncurses</EM>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
        descriptions   in  several  places.   You  can  use  the  <EM>TERMINFO</EM>  and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variables to override the compiled-in default
@@ -313,10 +312,10 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
                       LL            home-down
                       RSR           reset scroll region
                       -----------------------------------------
-
                       DECSTR        soft reset (VT320)
                       S7C1T         7-bit controls (VT220)
                       -----------------------------------------
+
                       ISO DEC G0    enable DEC graphics for G0
                       ISO UK G0     enable UK chars for G0
                       ISO US G0     enable US chars for G0
@@ -378,7 +377,7 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
                 and using "-" for absent capabilities, "@" for canceled rather
                 than "NULL".
 
-            <STRONG>o</STRONG>   However,   show   differences  between  absent  and  cancelled
+            <STRONG>o</STRONG>   However,   show   differences   between  absent  and  canceled
                 capabilities.
 
             <STRONG>o</STRONG>   Omit the "Reconstructed from" comment for source listings.
@@ -472,7 +471,7 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
        The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>
        and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
 
-       SVr4   infocmp  does  not  distinguish  between  absent  and  cancelled
+       SVr4   infocmp   does  not  distinguish  between  absent  and  canceled
        capabilities.  Also, it shows missing integer capabilities as  <STRONG>-1</STRONG>  (the
        internal   value   used   to   represent   missing   integers).    This
        implementation shows those as  "NULL",  for  consistency  with  missing
@@ -531,7 +530,7 @@ <H1 class="no-header">infocmp 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2024-09-14                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index d9a3c7902..bb72afed6 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp @
+  * @Id: legacy_coding.3x,v 1.32 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>                Library calls               <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
@@ -58,11 +58,11 @@ <H1 class="no-header">legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>use_legacy_coding</STRONG> is an extension to the <EM>curses</EM> library.  It allows the
-       caller to change the result of <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>, suppressing <STRONG>isprint(3)</STRONG>-based
+       <STRONG>use_legacy_coding</STRONG>,  an <EM>ncurses</EM> extension to the <EM>curses</EM> library, permits
+       customiztion  of  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>  behavior,  suppressing   <STRONG>isprint(3)</STRONG>-based
        checks  within  the  library  that  would  normally  cause  nonprinting
        characters to be rendered in visible form.  The alteration affects only
-       eight-bit characters.
+       byte-wide characters with the most significant bit set.
 
        The <EM>level</EM> parameter controls the result.
 
@@ -105,7 +105,7 @@ <H1 class="no-header">legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                 <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 333cf04a8..0c3e071fd 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp @
+  * @Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -57,11 +57,11 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The  "new  curses" library offers the programmer a terminal-independent
-       means of reading keyboard and mouse input and  updating  character-cell
-       terminals  with  output  optimized to minimize screen updates.  <EM>ncurses</EM>
+       means of reading keyboard and mouse input and writing to character-cell
+       displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240727).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240914).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -122,7 +122,7 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        behavior from the library when the locale has not been set up.
 
        <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> must be called to initialize  <EM>curses</EM>  before
-       use of any functions that deal with windows and screens.
+       use of any functions that access or manipulate windows or screens.
 
        To  get  character-at-a-time  input  without echoing--most interactive,
        screen-oriented programs want this--use the following sequence.
@@ -232,7 +232,7 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        The  "w"  function  is typically the elemental one; the removal of this
        prefix usually indicates operation on <STRONG>stdscr</STRONG>.
 
-       Four functions prefixed with "p" require a pad argument.
+       Four functions prefixed with "p" require a <EM>pad</EM> argument; see below.
 
        In function synopses, <EM>ncurses</EM> man pages apply the  following  names  to
        parameters.  We introduce the character types in the next subsection.
@@ -280,60 +280,59 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                  variants  to  their  non-wide  counterparts; where a non-wide
                  function name contains "ch" or "str", prefix it with "_w"  to
                  obtain  the  wide  counterpart.   For example, <STRONG>waddch</STRONG> becomes
-                 <STRONG>wadd_wch</STRONG>.  (Exceptions that add only  "w"  comprise  <STRONG>addwstr</STRONG>,
-                 <STRONG>inwstr</STRONG>,  and their variants.)  Another exception is <STRONG>ins_nwstr</STRONG>
-                 and  its  variants,  which  is  spelled   thus   instead   of
-                 "insn_wstr".
+                 <STRONG>wadd_wch</STRONG>.  Another exception is <STRONG>ins_nwstr</STRONG> (and its variants),
+                 spelled  thus  instead  of "insn_wstr".  (Exceptions that add
+                 only "w" comprise <STRONG>addwstr</STRONG>, <STRONG>inwstr</STRONG>, and their variants.)
 
-                 This  convention  is  inapplicable  to some non-wide function
+                 This convention is inapplicable  to  some  non-wide  function
                  names,  so  other  transformations  are  used  for  the  wide
                  configuration:  the  window  background  management  function
-                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
-                 -clearing  functions  are suffixed with "_set"; and character
-                 attribute  manipulation  functions   like   "attron"   become
+                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+                 -clearing functions are suffixed with "_set";  and  character
+                 attribute   manipulation   functions   like  "attron"  become
                  "attr_on".
 
                  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is a <EM>curses</EM> <EM>complex</EM> <EM>character</EM> and corresponds to the
-                          non-wide configuration's <EM>chtype</EM>.  It is a  structure
-                          type   because  it  requires  more  storage  than  a
-                          standard scalar type offers.  A character  code  may
-                          not  be  representable  as a <EM>char</EM>, and moreover more
+                          non-wide  configuration's <EM>chtype</EM>.  It is a structure
+                          type  because  it  requires  more  storage  than   a
+                          standard  scalar  type offers.  A character code may
+                          not be representable as a <EM>char</EM>,  and  moreover  more
                           than one character may occupy a cell (as with accent
-                          marks  and  other diacritics).  Each character is of
+                          marks and other diacritics).  Each character  is  of
                           type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a  complex  character  contains  one
                           spacing  character  and  zero  or  more  non-spacing
-                          characters  (see  below).   A  string   of   complex
-                          characters  ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> member
-                          is the null wide character.  Attributes and a  color
+                          characters   (see   below).   A  string  of  complex
+                          characters ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  member
+                          is  the null wide character.  Attributes and a color
                           pair identifier are stored in separate fields of the
                           structure,  not  combined  into  an  integer  as  in
                           <EM>chtype</EM>.
 
                  Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
-                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>  and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
-                 data.  The wide library API of <EM>ncurses</EM> depends  on  two  data
+                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG> and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
+                 data.   The  wide  library API of <EM>ncurses</EM> depends on two data
                  types standardized by ISO C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype</EM>, it may be an
-                          alias of <EM>int</EM>.  Depending on the character  encoding,
-                          a  wide  character  may  be <EM>spacing</EM>, meaning that it
-                          occupies a character cell by  itself  and  typically
-                          accompanies   cursor  advancement,  or  <EM>non-spacing</EM>,
-                          meaning that it occupies the same cell as a  spacing
-                          character,  is often regarded as a "modifier" of the
-                          base glyph with which  it  combines,  and  typically
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype</EM>, it may be  an
+                          alias  of <EM>int</EM>.  Depending on the character encoding,
+                          a wide character may be  <EM>spacing</EM>,  meaning  that  it
+                          occupies  a  character  cell by itself and typically
+                          accompanies  cursor  advancement,  or   <EM>non-spacing</EM>,
+                          meaning  that it occupies the same cell as a spacing
+                          character, is often regarded as a "modifier" of  the
+                          base  glyph  with  which  it combines, and typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can   store   a   <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or  the  constant  <STRONG>WEOF</STRONG>,
-                          analogously to the <EM>int</EM>-sized character  manipulation
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
+                          analogously  to the <EM>int</EM>-sized character manipulation
                           functions of ISO C and its constant <STRONG>EOF</STRONG>.
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
-       and wide APIs and the  corresponding  man  pages  that  describe  them.
-       Those  flagged  with  "*"  are  <EM>ncurses</EM>-specific,  neither described by
+       and  wide  APIs  and  the  corresponding  man pages that describe them.
+       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
        X/Open Curses nor present in SVr4.
 
                     <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
@@ -385,8 +384,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     def_prog_mode            <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     def_shell_mode           <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
-
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
@@ -452,8 +451,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     in_wch                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     in_wchnstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
-
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -519,8 +518,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     mvaddnstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddnwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
-
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     mvcur                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
@@ -586,8 +585,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     mvwins_wch               <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvwins_wstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
-
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+
                     mvwinsstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
@@ -653,8 +652,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     slk_attr_set             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attroff              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_attrset              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_clear                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -720,8 +719,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     wadd_wchstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     waddch                   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
                     waddchnstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
-
                     waddchstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+
                     waddnstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
@@ -787,8 +786,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     wprintw                  <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     wredrawln                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wrefresh                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
-
                     wresize                  <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>*
+
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
@@ -802,43 +801,43 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       <EM>ncurses</EM>'s   <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional    functions
-       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
+       <EM>ncurses</EM>'s    <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional   functions
+       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       The availability of some extensions is  configurable  when  <EM>ncurses</EM>  is
-       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
+       The  availability  of  some  extensions is configurable when <EM>ncurses</EM> is
+       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
        below.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Unless otherwise noted,  functions  that  return  integers  return  the
-       constants  <STRONG>OK</STRONG>  on  success  and <STRONG>ERR</STRONG> on failure; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
-       Functions that return pointers  return  <STRONG>NULL</STRONG>  on  failure.   Typically,
-       <EM>ncurses</EM>  treats  a  null  pointer  passed  as a function parameter as a
-       failure.  Functions prefixed with "mv" first  perform  cursor  movement
+       Unless  otherwise  noted,  functions  that  return  integers return the
+       constants <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG>  on  failure;  see  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       Functions  that  return  pointers  return  <STRONG>NULL</STRONG> on failure.  Typically,
+       <EM>ncurses</EM> treats a null pointer passed  as  a  function  parameter  as  a
+       failure.   Functions  prefixed  with "mv" first perform cursor movement
        and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The  following  symbols  from  the  process  environment  customize the
-       runtime  behavior  of  <EM>ncurses</EM>  applications.   The  library   may   be
-       configured   to   disregard   the  variables  <EM>TERMINFO</EM>,  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
-       <EM>TERMPATH</EM>, and <EM>HOME</EM>, if  the  user  is  the  superuser  (root),  or  the
+       The following  symbols  from  the  process  environment  customize  the
+       runtime   behavior   of  <EM>ncurses</EM>  applications.   The  library  may  be
+       configured  to  disregard  the   variables   <EM>TERMINFO</EM>,   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
+       <EM>TERMPATH</EM>,  and  <EM>HOME</EM>,  if  the  user  is  the  superuser (root), or the
        application uses <STRONG>setuid(2)</STRONG> or <STRONG>setgid(2)</STRONG>.
 
 
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
-       The  debugging  library  checks  this variable when the application has
-       redirected output to a file.  Its integral value is used for  the  baud
-       rate.   If  that  value  is absent or invalid, <EM>ncurses</EM> uses 9600.  This
-       feature allows developers to construct repeatable test cases that  take
-       into  account optimization decisions that depend on the terminal's line
-       speed.
+       The debugging library checks this variable  when  the  application  has
+       redirected  output to a file.  <EM>ncurses</EM> interprets its integral value as
+       the terminal's line speed in bits per second.  If that value is  absent
+       or  invalid,  <EM>ncurses</EM>  uses  9600.   This  feature allows developers to
+       construct repeatable test cases that  take  into  account  optimization
+       decisions that depend on the terminal's line speed.
 
 
 </PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
-       When set, the <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of  loaded
+       When  set,  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability value of loaded
        <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
@@ -849,9 +848,10 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        This  variable  specifies  the  width  of  the  screen  in  characters.
-       Applications  running  in  a  windowing environment usually are able to
-       obtain the width of the window in which they are executing.  If <EM>COLUMNS</EM>
-       is not defined and the terminal's screen size is not available from the
+       Applications running in a windowing environment  usually  are  able  to
+       obtain  the  width  of the window in which they are executing.  <EM>ncurses</EM>
+       enforces an upper limit of 512 when reading the value.  If  <EM>COLUMNS</EM>  is
+       not  defined  and  the terminal's screen size is not available from the
        terminal driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG>  (<STRONG>cols</STRONG>)
        capability  of  the  terminal type's entry in the <EM>terminfo</EM> database, if
        any.
@@ -864,177 +864,176 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        overrides  the  library's  use  of  the  screen  size obtained from the
        operating system.
 
-       The  <EM>COLUMNS</EM>  and  <EM>LINES</EM>  variables  may  be  specified  independently.
-       <EM>ncurses</EM>  enforces an upper limit of 512 on each when reading the value.
-       This property is useful to circumvent misfeatures  of  legacy  terminal
-       type  descriptions; <STRONG>xterm(1)</STRONG> descriptions specifying 65 lines were once
-       notorious.   For  best  results,  avoid  specifying  <STRONG>cols</STRONG>   and   <STRONG>lines</STRONG>
+       The <EM>COLUMNS</EM> and <EM>LINES</EM> variables may be specified  independently.   This
+       property  is  useful  to circumvent misfeatures of legacy terminal type
+       descriptions; <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were  once
+       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
        capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
 
-       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>  can  disable use of the process environment in determining
-       the screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to  match
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
+       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
        the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
-       press of the "Escape" key on the input device  from  one  beginning  an
+       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
+       press  of  the  "Escape"  key on the input device from one beginning an
        <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
-       receiving the  escape  character  to  see  if  further  characters  are
-       available  on  the  input  stream  within  a  short interval.  A global
-       variable <STRONG>ESCDELAY</STRONG> stores this interval in  milliseconds.   The  default
+       receiving  the  escape  character  to  see  if  further  characters are
+       available on the input  stream  within  a  short  interval.   A  global
+       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
        value of 1000 (one second) is adequate for most uses.  This environment
-       variable overrides it; <EM>ncurses</EM> enforces an upper limit  of  30,000  (30
+       variable  overrides  it;  <EM>ncurses</EM> enforces an upper limit of 30,000 (30
        seconds) when reading the value.
 
-       The  most common instance where you may wish to change this value is to
+       The most common instance where you may wish to change this value is  to
        work with a remote host over a slow communication channel.  If the host
-       running  a  <EM>curses</EM>  application  does  not receive the characters of an
-       escape sequence in a timely manner, the library can interpret  them  as
+       running a <EM>curses</EM> application does not  receive  the  characters  of  an
+       escape  sequence  in a timely manner, the library can interpret them as
        multiple key stroke events.
 
        <STRONG>xterm(1)</STRONG> mouse events are a form of escape sequence; therefore, if your
-       application makes heavy use  of  multiple-clicking,  you  may  wish  to
-       lengthen  the  default value because the delay applies to the composite
+       application  makes  heavy  use  of  multiple-clicking,  you may wish to
+       lengthen the default value because the delay applies to  the  composite
        multi-click event as well as the individual clicks.
 
-       Portable applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG>  in
-       either  form,  but  setting  the  environment  variable rather than the
+       Portable  applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG> in
+       either form, but setting  the  environment  variable  rather  than  the
        global variable does not create problems when compiling an application.
 
-       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
+       If  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  is  disabled  for  the <EM>curses</EM> window receiving input, a
        program must disambiguate escape sequences itself.
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       <EM>ncurses</EM>  may read and write auxiliary terminal descriptions in <EM>.termcap</EM>
+       <EM>ncurses</EM> may read and write auxiliary terminal descriptions in  <EM>.termcap</EM>
        and <EM>.terminfo</EM> files in the user's home directory.
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       This counterpart to <EM>COLUMNS</EM> specifies  the  height  of  the  screen  in
-       characters.   The  corresponding <EM>terminfo</EM> capability and code is <STRONG>lines</STRONG>.
+       This  counterpart  to  <EM>COLUMNS</EM>  specifies  the  height of the screen in
+       characters.  The corresponding <EM>terminfo</EM> capability and code  is  <STRONG>lines</STRONG>.
        See the description of the <EM>COLUMNS</EM> variable above.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
-       with  other platforms, such that 1 is the left button, 2 the right, and
-       3 the middle.  This variable customizes  the  mouse  button  numbering.
-       Its  value  must be three digits 1-3 in any order.  By default, <EM>ncurses</EM>
+       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
+       with other platforms, such that 1 is the left button, 2 the right,  and
+       3  the  middle.   This  variable customizes the mouse button numbering.
+       Its value must be three digits 1-3 in any order.  By  default,  <EM>ncurses</EM>
        assumes a numbering of "132".
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       If set, this  variable  overrides  the  <EM>ncurses</EM>  library's  compiled-in
-       assumption  that  the terminal's default colors are white on black; see
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.  Set the foreground  and  background  color  values
-       with  this  environment  variable  by  assigning  it two integer values
+       If  set,  this  variable  overrides  the  <EM>ncurses</EM> library's compiled-in
+       assumption that the terminal's default colors are white on  black;  see
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.   Set  the  foreground  and background color values
+       with this environment variable  by  assigning  it  two  integer  values
        separated  by  a  comma,  indicating  foregound  and  background  color
        numbers, respectively.
 
-       For  example,  to tell <EM>ncurses</EM> not to assume anything about the colors,
-       use a value of "-1,-1".  To make the  default  color  scheme  green  on
-       black,  use  "2,0".   <EM>ncurses</EM> accepts integral values from -1 up to the
+       For example, to tell <EM>ncurses</EM> not to assume anything about  the  colors,
+       use  a  value  of  "-1,-1".   To make the default color scheme green on
+       black, use "2,0".  <EM>ncurses</EM> accepts integral values from -1  up  to  the
        value of the <EM>terminfo</EM> <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>) capability.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       (MinGW  port  only)  The  <EM>Console2</EM>  program  defectively  handles   the
-       Microsoft  Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.  Applications
-       that use it will hang.  However, it is possible to simulate the  action
-       of  this  call  by mapping coordinates, explicitly saving and restoring
-       the original screen contents.  Setting the environment  variable  <EM>NCGDB</EM>
+       (MinGW   port  only)  The  <EM>Console2</EM>  program  defectively  handles  the
+       Microsoft Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.   Applications
+       that  use it will hang.  However, it is possible to simulate the action
+       of this call by mapping coordinates, explicitly  saving  and  restoring
+       the  original  screen contents.  Setting the environment variable <EM>NCGDB</EM>
        has the same effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       (Linux  only) When <EM>ncurses</EM> is configured to use the GPM interface, this
-       variable may list  one  or  more  terminal  type  names,  delimited  by
-       vertical  bars  (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM> variable (see
-       below) is matched.  An empty value disables the  GPM  interface,  using
-       <EM>ncurses</EM>'s  built-in  support  for <STRONG>xterm(1)</STRONG> mouse protocols instead.  If
-       the variable is absent, <EM>ncurses</EM> attempts to open GPM if  <EM>TERM</EM>  contains
+       (Linux only) When <EM>ncurses</EM> is configured to use the GPM interface,  this
+       variable  may  list  one  or  more  terminal  type  names, delimited by
+       vertical bars (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM>  variable  (see
+       below)  is  matched.   An empty value disables the GPM interface, using
+       <EM>ncurses</EM>'s built-in support for <STRONG>xterm(1)</STRONG> mouse  protocols  instead.   If
+       the  variable  is absent, <EM>ncurses</EM> attempts to open GPM if <EM>TERM</EM> contains
        "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM>  may  use  tab  characters in cursor movement optimization.  In
-       some cases, your terminal driver may not  handle  them  properly.   Set
+       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
+       some  cases,  your  terminal  driver may not handle them properly.  Set
        this environment variable to any value to disable the feature.  You can
        also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Many terminals store video attributes as  a  property  of  a  character
-       cell,  as  <EM>curses</EM>  does.   Historically, some recorded changes in video
-       attributes as data that  logically  <EM>occupies</EM>  character  cells  on  the
-       display,  switching attributes on or off, similarly to tags in a markup
-       language; these are termed "magic cookies", and  must  be  subsequently
-       overprinted.   If  the  <EM>terminfo</EM>  entry for your terminal type does not
+       Many  terminals  store  video  attributes  as a property of a character
+       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
+       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
+       display, switching attributes on or off, similarly to tags in a  markup
+       language;  these  are  termed "magic cookies", and must be subsequently
+       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
        adequately describe its handling of magic cookies, set this variable to
        any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
-       hardware  devices.   Many  people  use  <EM>curses</EM>-based  applications   in
-       terminal  emulator programs that run in a windowing environment.  These
-       programs can duplicate all of the  important  features  of  a  hardware
-       terminal,  but  often lack their limitations.  Chief among these absent
+       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
+       terminal emulator programs that run in a windowing environment.   These
+       programs  can  duplicate  all  of  the important features of a hardware
+       terminal, but often lack their limitations.  Chief among  these  absent
        drawbacks is the problem of data flow management; that is, limiting the
-       speed  of  communication  to  what the hardware could handle.  Unless a
-       hardware terminal is interfaced into  a  terminal  concentrator  (which
-       does  flow  control), an application must manage flow itself to prevent
+       speed of communication to what the hardware  could  handle.   Unless  a
+       hardware  terminal  is  interfaced  into a terminal concentrator (which
+       does flow control), an application must manage flow itself  to  prevent
        overruns and data loss.
 
-       A solution that comes at no hardware cost  is  for  an  application  to
-       pause  after  directing  a  terminal  to  execute  an operation that it
-       performs slowly, such as clearing  the  display.   Many  terminal  type
-       descriptions,  including that for the VT100, embed delay specifications
-       in capabilities.  You may  wish  to  use  these  terminal  descriptions
-       without  paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to any
-       value to disable all but mandatory padding.  Mandatory padding is  used
+       A  solution  that  comes  at  no hardware cost is for an application to
+       pause after directing a  terminal  to  execute  an  operation  that  it
+       performs  slowly,  such  as  clearing  the display.  Many terminal type
+       descriptions, including that for the VT100, embed delay  specifications
+       in  capabilities.   You  may  wish  to  use these terminal descriptions
+       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
+       value  to disable all but mandatory padding.  Mandatory padding is used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       (Obsolete)  Prior to internal changes developed in <EM>ncurses</EM> 5.9 (patches
-       20120825 through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable  fully
-       buffered  output  when initializing the terminal.  This was done, as in
-       SVr4 <EM>curses</EM>, to increase performance.  For testing  purposes,  both  of
-       <EM>ncurses</EM>  and  of  certain applications, this feature was made optional.
-       Setting this variable disabled output  buffering,  leaving  the  output
+       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
+       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
+       buffered output when initializing the terminal.  This was done,  as  in
+       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
+       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
+       Setting  this  variable  disabled  output buffering, leaving the output
        stream in the original (usually line-buffered) mode.
 
-       Nowadays,  <EM>ncurses</EM> performs its own buffering and does not require this
-       workaround; it does not modify the buffering  of  the  standard  output
-       stream.   This  approach makes signal handling, as for interrupts, more
-       robust.  A drawback  is  that  certain  unconventional  programs  mixed
-       <STRONG>stdio(3)</STRONG>  calls  with <EM>ncurses</EM> calls and (usually) got the behavior they
-       expected.  This is no longer the case; <EM>ncurses</EM> does not  write  to  the
+       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
+       workaround;  it  does  not  modify the buffering of the standard output
+       stream.  This approach makes signal handling, as for  interrupts,  more
+       robust.   A  drawback  is  that  certain  unconventional programs mixed
+       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
+       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
        standard output file descriptor through a <EM>stdio</EM>-buffered stream.
 
-       As  a  special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still use the
-       standard output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG>  do
+       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
+       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
        not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       At  initialization,  <EM>ncurses</EM> inspects the <EM>TERM</EM> environment variable for
-       special  cases  where   VT100   forms-drawing   characters   (and   the
-       corresponding  alternate character set <EM>terminfo</EM> capabilities) are known
+       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
+       special   cases   where   VT100   forms-drawing   characters  (and  the
+       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
-       virtual console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.   Set
+       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
        this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
        terminal's ACS support is broken; the library then outputs Unicode code
        points that correspond to the forms-drawing characters.  Set it to zero
        (or a non-integer) to disable the special check for terminal type names
-       matching  "linux" or "screen", directing <EM>ncurses</EM> to assume that the ACS
+       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
        feature works if the terminal type description advertises it.
 
-       As an alternative to use  of  this  variable,  <EM>ncurses</EM>  checks  for  an
+       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
        extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
        <STRONG>-x</STRONG>".  Examples follow.
 
@@ -1047,62 +1046,62 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The two-character name "U8" was chosen to permit its use via  <EM>ncurses</EM>'s
+       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
        <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       At  initialization, <EM>ncurses</EM> (in its debugging configuration) checks for
-       this variable's presence.  If  defined  with  an  integral  value,  the
+       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
+       this  variable's  presence.   If  defined  with  an integral value, the
        library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       The  <EM>TERM</EM> variable denotes the terminal type.  Each is distinct, though
-       many are similar.  It is commonly set by  terminal  emulators  to  help
-       applications  find  a  workable  terminal  description.   Some choose a
-       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
-       an  exact  fit to their capabilities.  Not infrequently, an application
-       will have problems with that approach; for example, a  key  stroke  may
-       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
+       many  are  similar.   It  is commonly set by terminal emulators to help
+       applications find a  workable  terminal  description.   Some  choose  a
+       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+       an exact fit to their capabilities.  Not infrequently,  an  application
+       will  have  problems  with that approach; for example, a key stroke may
+       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
        characters on the screen.
 
-       Setting <EM>TERM</EM> has no effect on hardware operation; it  affects  the  way
-       applications  communicate  with  the  terminal.  Likewise, as a general
-       rule (<STRONG>xterm(1)</STRONG> being a rare exception), terminal emulators  that  allow
+       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
+       applications communicate with the terminal.   Likewise,  as  a  general
+       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
        you to specify <EM>TERM</EM> as a parameter or configuration value do not change
        their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
-       type  description  in  <EM>termcap</EM>  format if one in <EM>terminfo</EM> format is not
-       available.  Setting this variable directs <EM>ncurses</EM> to ignore  the  usual
-       <EM>termcap</EM>  database  location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM> below.  <EM>TERMCAP</EM>
-       should contain either a terminal description  (with  newlines  stripped
-       out),  or  a file name indicating where the information required by the
+       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
+       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
+       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
+       should  contain  either  a terminal description (with newlines stripped
+       out), or a file name indicating where the information required  by  the
        <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM> can be configured to read terminal type  description  databases
-       in  various locations using different formats.  This variable overrides
+       <EM>ncurses</EM>  can  be configured to read terminal type description databases
+       in various locations using different formats.  This variable  overrides
        the default location.
 
-       <STRONG>o</STRONG>   Descriptions in <EM>terminfo</EM> format are normally stored in a  directory
-           tree  using subdirectories named by the common first letters of the
+       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
+           tree using subdirectories named by the common first letters of  the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
-           name  its  location,  such  as  <EM>/usr/share/terminfo.db</EM>, rather than
+           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
            <EM>/usr/share/terminfo/</EM>.
 
-       The hashed database uses less disk space and is a  little  faster  than
+       The  hashed  database  uses less disk space and is a little faster than
        the directory tree.  However, some applications assume the existence of
        the directory tree, and read it directly rather than using the <EM>terminfo</EM>
        API.
 
-       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  configured with <EM>termcap</EM> support, this variable may
+       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
            contain the location of a <EM>termcap</EM> file.
 
        <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
@@ -1112,10 +1111,10 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
                   TERMINFO=$(infocmp -0 -Q2 -q)
                   export TERMINFO
 
-           The compiled description is used only  if  it  corresponds  to  the
+           The  compiled  description  is  used  only if it corresponds to the
            terminal type identified by <EM>TERM</EM>.
 
-       Setting  <EM>TERMINFO</EM>  is  the  simplest,  but  not the only, way to direct
+       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
        <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
        <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
@@ -1133,16 +1132,16 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       This  variable  specifies  a  list of locations, akin to <EM>PATH</EM>, in which
-       <EM>ncurses</EM> searches  for  the  terminal  type  descriptions  described  by
-       <EM>TERMINFO</EM>  above.   The  list  items are separated by colons on Unix and
-       semicolons on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a  corresponding
+       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
+       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
+       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
+       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
        feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
        If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
-       <EM>ncurses</EM> checks the contents of <EM>TERMPATH</EM>, a list of locations,  akin  to
+       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
        <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
        list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
@@ -1152,9 +1151,9 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
-       options  given  to the <EM>configure</EM> script when building the library.  Run
-       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
+       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
+       options given to the <EM>configure</EM> script when building the  library.   Run
+       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        <STRONG>--disable-overwrite</STRONG>
@@ -1163,24 +1162,24 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This option is used to avoid file name conflicts  between  <EM>ncurses</EM>
-            and  an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM> is
-            installed disabling overwrite, it  puts  its  header  files  in  a
+            This  option  is used to avoid file name conflicts between <EM>ncurses</EM>
+            and an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM>  is
+            installed  disabling  overwrite,  it  puts  its  header files in a
             subdirectory.  Here is an example.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            Installation  also  omits  a  symbolic  link  that would cause the
-            compiler's <STRONG>-lcurses</STRONG> option  to  link  object  files  with  <EM>ncurses</EM>
+            Installation also omits a  symbolic  link  that  would  cause  the
+            compiler's  <STRONG>-lcurses</STRONG>  option  to  link  object  files with <EM>ncurses</EM>
             instead of the system <EM>curses</EM> library.
 
-            The  directory  used  by this configuration of <EM>ncurses</EM> is shown in
+            The directory used by this configuration of <EM>ncurses</EM>  is  shown  in
             section "SYNOPSIS" above.
 
        <STRONG>--enable-widec</STRONG>
-            The  configure  script   renames   the   library   and   (if   the
-            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
-            different subdirectory.  All of  the  library  names  have  a  "w"
+            The   configure   script   renames   the   library   and  (if  the
+            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
+            different  subdirectory.   All  of  the  library  names have a "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1189,62 +1188,62 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You  must  also  enable  the wide-character features in the header
-            file when compiling for the  wide-character  library  to  use  the
-            extended  (wide-character)  functions.   The  symbol which enables
+            You must also enable the wide-character  features  in  the  header
+            file  when  compiling  for  the  wide-character library to use the
+            extended (wide-character) functions.   The  symbol  which  enables
             these features has changed since X/Open Curses, Issue 4:
 
-            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
+            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
+            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
                 to 500.
 
-            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
-                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
+            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
+                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
-                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
-                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
+                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
+                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The <EM>curses.h</EM> header file installed for the wide-character  library
-            is  designed  to be compatible with the non-wide library's header.
-            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
+            The  <EM>curses.h</EM> header file installed for the wide-character library
+            is designed to be compatible with the non-wide  library's  header.
+            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character library's headers should be  installed  last,  to  allow
+            character  library's  headers  should  be installed last, to allow
             applications to be built using either library from the same set of
             headers.
 
        <STRONG>--with-pthread</STRONG>
-            The configure script renames the  library.   All  of  the  library
-            names  have  a  "t"  appended  to  them  (before  any "w" added by
+            The  configure  script  renames  the  library.  All of the library
+            names have a "t"  appended  to  them  (before  any  "w"  added  by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to set these values.  Some applications  (very  few)  may  require
+            to  set  these  values.   Some applications (very few) may require
             changes to work with this convention.
 
        <STRONG>--with-shared</STRONG>
        <STRONG>--with-normal</STRONG>
        <STRONG>--with-debug</STRONG>
        <STRONG>--with-profile</STRONG>
-            The  shared  and  normal  (static)  library  names differ by their
-            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+            The shared and normal  (static)  library  names  differ  by  their
+            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
+            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        <STRONG>--with-termlib</STRONG>
-            Low-level functions which do not depend upon whether  the  library
+            Low-level  functions  which do not depend upon whether the library
             supports wide-characters, are provided in the tinfo library.
 
-            By  doing  this, it is possible to share the tinfo library between
-            wide/normal configurations as well  as  reduce  the  size  of  the
+            By doing this, it is possible to share the tinfo  library  between
+            wide/normal  configurations  as  well  as  reduce  the size of the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1264,8 +1263,8 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        <STRONG>--with-trace</STRONG>
-            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
-            is sometimes useful to  configure  this  in  the  shared  library.
+            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
+            is  sometimes  useful  to  configure  this  in the shared library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1279,213 +1278,213 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open Curses permits most functions it specifies to be made  available
+       X/Open  Curses permits most functions it specifies to be made available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
+       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
            another operation), and
 
        <STRONG>o</STRONG>   in a few special cases.
 
-       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
-       redirected  to  something  that  is  not a terminal device, the library
-       writes screen updates to the standard error file descriptor.  This  was
+       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
+       redirected to something that is not  a  terminal  device,  the  library
+       writes  screen updates to the standard error file descriptor.  This was
        an undocumented feature of SVr3 <EM>curses</EM>.
 
-       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
+       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
+       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
        terminals, including <STRONG>xterm(1)</STRONG>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
-       when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
+       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
+       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open   Curses  by  allowing  the  application  programmer  to  define
-       additional key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
+       X/Open  Curses  by  allowing  the  application  programmer  to   define
+       additional  key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
        <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From a user's perspective, the application is  able
-       to  draw colored text on a background whose color is set independently,
+       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
+       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
+       application to reset  the  terminal  to  its  original  foreground  and
+       background  colors.  From a user's perspective, the application is able
+       to draw colored text on a background whose color is set  independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An <EM>ncurses</EM> application  can  eschew  knowledge  of  <EM>SCREEN</EM>  and  <EM>WINDOW</EM>
-       structure   internals,   instead   using  accessor  functions  such  as
+       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>SCREEN</EM> and <EM>WINDOW</EM>
+       structure  internals,  instead  using  accessor   functions   such   as
        <STRONG><A HREF="curs_inopts.3x.html">is_cbreak(3x)</A></STRONG> and <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> enables an application  to  direct  its  output  to  a  printer
+       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
        attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
-       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that  can  gather  color  information  from  them  when many colors are
+       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
+       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that can gather color  information  from  them  when  many  colors  are
        supported.
 
-       <EM>ncurses</EM>   permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;    see
+       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
        <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
 
-       Rudimentary  support  for multi-threaded applications may be available;
+       Rudimentary support for multi-threaded applications may  be  available;
        see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       Functions that ease the management of multiple screens can be  exposed;
+       Functions  that ease the management of multiple screens can be exposed;
        see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       To  aid  applications  to  debug their memory usage, <EM>ncurses</EM> optionally
-       offers functions  to  more  aggressively  free  memory  it  dynamically
+       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
+       offers  functions  to  more  aggressively  free  memory  it dynamically
        allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       The  library  facilitates auditing and troubleshooting of its behavior;
+       The library facilitates auditing and troubleshooting of  its  behavior;
        see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       Compiling <EM>ncurses</EM> with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to  fall  back
-       to  reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
+       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
+       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
        <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
-       recommended,  as  it essentially includes an entire <EM>termcap</EM> compiler in
-       the <EM>ncurses</EM> startup code, at a cost in  memory  usage  and  application
+       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
+       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
        launch latency.
 
-       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
+       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
-       Curses,  and  supports  all  features  of its enhanced level except the
+       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
+       Curses, and supports all features of  its  enhanced  level  except  the
        <EM>untic</EM> utility.
 
-       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
+       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
-       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
-       is done primarily to guard  against  programmer  error.   The  standard
+       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
+       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
+       is  done  primarily  to  guard  against programmer error.  The standard
        interface does not provide a way for the library to tell an application
-       which of several possible errors occurred.  An application that  relies
-       on  <EM>ncurses</EM>  to  check  its function parameters for validity limits its
+       which  of several possible errors occurred.  An application that relies
+       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
        portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
-       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
+       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
+       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
-       NUL bytes to the device.  This method is slightly more  expensive,  but
-       narrows   the   interface   to   the   Unix  kernel  significantly  and
+       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
+       NUL  bytes  to the device.  This method is slightly more expensive, but
+       narrows  the  interface  to   the   Unix   kernel   significantly   and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
+       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
+           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
        <STRONG>o</STRONG>   The first <EM>curses</EM>, in 4BSD, provided a <EM>curses.h</EM> file.
 
-           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
+           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
-           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
+           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
+           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
+       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
-           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
+           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
+           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
+       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
            <EM>unctrl.h</EM>.
 
-           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
+           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
+       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
            HP-UX and AIX.
 
-           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
+           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again,  <EM>ncurses</EM>  and
+           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again, <EM>ncurses</EM> and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
+       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
            require it to do so.
 
-           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
-           and  must  include  both header files in the same module.  Very old
-           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
+           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
+           and must include both header files in the same  module.   Very  old
+           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
            <EM>term.h</EM>.
 
-           The  header  files supplied by <EM>ncurses</EM> include the standard library
-           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
-           files  can  be  included  in  any  order.  But for portability, you
-           should include <EM>curses.h</EM> before <EM>term.h</EM>.
+           The header files supplied by <EM>ncurses</EM> include the  standard  library
+           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
+           files can be included in any order.  For portability  even  to  old
+           AIX systems, include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
-           file  does  not  necessarily  make visible all of the symbols in it
+       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
+           file does not necessarily make visible all of  the  symbols  in  it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
-           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
-           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
+           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
+           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
+           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
-           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
-           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
+           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
+           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
+           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
-           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
-           possibility  that  an application might include either <EM>varargs.h</EM> or
-           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
-           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
-           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
-           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
-           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
-           call's  actual  parameters  against the formal ones declared in its
+           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
+           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
+           possibility that an application might include either  <EM>varargs.h</EM>  or
+           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
+           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
+           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
+           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
+           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
+           call's actual parameters against the formal ones  declared  in  its
            prototype.
 
-           No  conforming  implementations  of  X/Open   Curses   require   an
+           No   conforming   implementations   of  X/Open  Curses  require  an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
+           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1499,7 +1498,7 @@ <H1 class="no-header">ncurses 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-09-14                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index c2ef365d9..bc2291730 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp @
+  * @Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-06-22 ncurses 6.5 User commands</TITLE>
+<TITLE>tabs 1 2024-09-14 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-06-22 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -195,61 +195,60 @@ <H1 class="no-header">tabs 1 2024-06-22 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
-       (POSIX.1-2008) describes a <STRONG>tabs</STRONG> utility.  However,
+       IEEE  Std   1003.1/The   Open   Group   Base   Specifications   Issue 7
+       (POSIX.1-2008) describes a <EM>tabs</EM> utility.  However,
 
        <STRONG>o</STRONG>   this  standard  describes  a  <STRONG>+m</STRONG>  option  to  set a terminal's left
            margin.  Very few of the entries in the terminal  database  provide
            the   <STRONG>set_left_margin</STRONG>   (<STRONG>smgl</STRONG>)   or   <STRONG>set_left_margin_parm</STRONG>  (<STRONG>smglp</STRONG>)
            capabilities needed to support the feature.
 
-       <STRONG>o</STRONG>   There is no counterpart in X/Open Curses Issue 7 for this  utility,
-           unlike <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>.
+       <STRONG>o</STRONG>   Unlike <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <EM>tabs</EM> has no specification in X/Open Curses Issue 7.
 
-       The  <STRONG>-d</STRONG>  (debug)  and  <STRONG>-n</STRONG>  (no-op)  options  are <EM>ncurses</EM> extensions not
+       The <STRONG>-d</STRONG> (debug) and  <STRONG>-n</STRONG>  (no-op)  options  are  <EM>ncurses</EM>  extensions  not
        provided by other implementations.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       A <STRONG>tabs</STRONG> utility appeared in PWB/Unix  1.0  (1977).   A  reduced  version
-       shipped  in  Seventh  Edition  Unix (early 1979) and in 3BSD (later the
-       same year); it supported a "-n" option to set the first tab stop at the
-       left margin.  That option is not specified by POSIX.
-
-       The  PWB/Unix  <STRONG>tabs</STRONG>  utility  returned  in  System III (1980), and used
-       built-in tables to support a  half-dozen  hardcopy  terminal  (printer)
-       types.   It  also had logic to support setting the left margin, as well
+       A  <EM>tabs</EM>  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
+       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
+       same  year);  it  supported an option "-n" to set the first tab stop at
+       the left margin.  That option is not specified by POSIX.
+
+       The PWB/Unix <STRONG>tabs</STRONG> utility returned  in  System  III  (1980),  and  used
+       built-in  tables  to  support  a half-dozen hardcopy terminal (printer)
+       types.  It also had logic to support setting the left margin,  as  well
        as a feature for copying the tab settings from a file.
 
-       Versions of the program in later releases of AT&amp;T Unix, such  as  SVr4,
-       added  support  for  the  terminal database, but retained the tables to
-       support the printers.  By this time, System V <STRONG>tput</STRONG> had incorporated the
-       tab  stop  initialization feature of BSD's <STRONG>tset</STRONG> from 1982, but employed
+       Versions  of  the program in later releases of AT&amp;T Unix, such as SVr4,
+       added support for the terminal database, but  retained  the  tables  to
+       support the printers.  By this time, System V <EM>tput</EM> had incorporated the
+       tab stop initialization feature of BSD's <EM>tset</EM> from 1982,  but  employed
        the <EM>terminfo</EM> database to do so.
 
-       The <STRONG>+m</STRONG> option was documented in the POSIX Base Specifications  Issue  5
-       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
-       motivation, though an introductory comment "and optionally adjusts  the
-       margin"   remains,   overlooked  in  the  removal.   The  <STRONG>tabs</STRONG>  utility
-       documented in Issues 6 and later has no mechanism for setting  margins.
-       The  <STRONG>+m</STRONG>  option  in <EM>ncurses</EM> <STRONG>tabs</STRONG> differs from the SVr4 feature by using
-       terminal capabilities rather than built-in tables.
-
-       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
-       implementations impose one; the limit is 20 in PWB/Unix's <STRONG>tabs</STRONG> utility.
-       While some terminals may not accept an arbitrary number of  tab  stops,
-       <EM>ncurses</EM>  <STRONG>tabs</STRONG>  attempts  to set tab stops up to the right margin if the
+       The  <STRONG>+m</STRONG>  option was documented in the POSIX Base Specifications Issue 5
+       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
+       motivation,  though an introductory comment "and optionally adjusts the
+       margin"  remains,  overlooked  in  the  removal.   The   <EM>tabs</EM>   utility
+       documented  in Issues 6 and later has no mechanism for setting margins.
+       The <STRONG>+m</STRONG> option in <EM>ncurses</EM> <EM>tabs</EM> (<STRONG>tabs</STRONG>) differs from the SVr4  feature  by
+       using terminal capabilities rather than built-in tables.
+
+       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
+       implementations impose one; the limit is 20 in PWB/Unix's <EM>tabs</EM> utility.
+       While  some  terminals may not accept an arbitrary number of tab stops,
+       <EM>ncurses</EM> <STRONG>tabs</STRONG> attempts to set tab stops up to the right  margin  if  the
        list thereof is sufficiently long.
 
-       The "Rationale" section of the Issue 6 <STRONG>tabs</STRONG> reference page details  how
-       the  committee  considered  redesigning  the  <STRONG>tabs</STRONG>  and <STRONG>tput</STRONG> utilities,
+       The  "Rationale" section of the Issue 6 <EM>tabs</EM> reference page details how
+       the committee considered  redesigning  the  <EM>tabs</EM>  and  <EM>tput</EM>  utilities,
        without settling on an improved solution.  It claims that
 
-           no known historical version of  <EM>tabs</EM>  supports  the  capability  of
+           no  known  historical  version  of  <EM>tabs</EM> supports the capability of
            setting arbitrary tab stops.
 
-       The   feature  described  in  subsection  "Explicit  Lists"  above  was
-       implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
+       The  feature  described  in  subsection  "Explicit  Lists"  above   was
+       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
        stops nevertheless.
 
 
@@ -258,7 +257,7 @@ <H1 class="no-header">tabs 1 2024-06-22 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-06-22                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 5dde24bc8..9168cdfae 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240727).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240914).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -2437,7 +2437,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        X/Open  Curses  does  not  mention italics.  Portable applications must
        assume that  numeric  capabilities  are  signed  16-bit  values.   This
        includes  the  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
-       used for italics with <STRONG>ncv</STRONG> can be confused with an absent  or  cancelled
+       used for italics with <STRONG>ncv</STRONG> can be confused with an  absent  or  canceled
        <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> value must be
        specified, even if it is zero.
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 30efeb1a1..3af79916a 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp @
+  * @Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>tic 1m 2024-09-14 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tic 1m 2024-09-14 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -420,7 +420,7 @@ <H1 class="no-header">tic 1m 2024-05-11 ncurses 6.5 User commands</H1>
        System  V  Release  2  provided  a  <STRONG>tic</STRONG>  utility.  It accepted a single
        option: <STRONG>-v</STRONG> (optionally  followed  by  a  number).   According  to  Ross
        Ridge's comment in <EM>mytinfo</EM>, this version of <STRONG>tic</STRONG> was unable to represent
-       cancelled capabilities.
+       canceled capabilities.
 
        System V Release 3 provided a different <STRONG>tic</STRONG> utility, written  by  Pavel
        Curtis,  (originally named "compile" in <EM>pcurses</EM>).  This added an option
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 623be9c75..14a3a0aad 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp @
+  * @Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-06-22 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2024-09-14 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-06-22 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2024-09-14 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -411,8 +411,8 @@ <H1 class="no-header">tput 1 2024-06-22 ncurses 6.5 User commands</H1>
        <STRONG>o</STRONG>   It assigns exit status 255  to  a  numeric  variable  that  is  not
            specified in the <EM>terminfo</EM> database.  That likely is a documentation
            error, mistaking  the  "-1"  written  to  the  standard  output  to
-           indicate   an   absent  or  cancelled  numeric  capability  for  an
-           (unsigned) exit status.
+           indicate an absent or canceled numeric capability for an (unsigned)
+           exit status.
 
        The various System V implementations (AIX, HP-UX, Solaris) use the same
        exit statuses as <EM>ncurses</EM>.
@@ -559,7 +559,7 @@ <H1 class="no-header">tput 1 2024-06-22 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-06-22                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 4693b06b3..467260823 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp $
-.TH @CAPTOINFO@ 1M 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp $
+.TH @CAPTOINFO@ 1M 2024-09-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -84,7 +84,6 @@ with this program and exits with a successful status.
 .SS "Translations from Nonstandard Capabilities"
 \fB\%@CAPTOINFO@\fP translates some obsolete,
 nonstandard capabilities into standard
-(SVr4/XSI Curses)
 \fI\%\%term\%info\fP capabilities.
 It issues a diagnostic to the standard error stream for each,
 inviting the user to check that it has not mistakenly translated an
@@ -96,7 +95,7 @@ center;
 Cb S  L  L
 Cb Cb Cb Cb
 Cb Cb C  Lb.
-Name
+\f(BItermcap\fP Code
 Obsolete	Standard	Origin	\f(BIterminfo\fP capability
 _
 BO	mr	AT&T	enter_reverse_mode
@@ -138,7 +137,7 @@ as follows.
 center;
 cb cb
 cb l .
-\f(BItermcap\fP Name	Graphic
+\f(BItermcap\fP Code	Graphic
 _
 G2	upper left corner
 G3	lower left corner
@@ -184,7 +183,7 @@ but which is incompatible with the SVr4 format.
 center;
 cb cb
 l  l .
-IBM	XSI
+IBM	X/Open
 _
 ksel	kslt
 kbtab	kcbt
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 25ba1f9f7..9ef707f3c 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp $
-.TH curs_bkgd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp $
+.TH curs_bkgd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,7 +69,7 @@ The
 of a
 .I curses
 window
-(in the library's non-\*(``wide\*('' configuration)
+(in the library's non-wide configuration)
 is a
 .I \%chtype
 combining a set of attributes
@@ -213,12 +213,12 @@ changes the background character.
 like SVr4
 .IR curses ,
 does not
-(in its non-\*(``wide\*('' configuration)
+(in its non-wide configuration)
 store the background and window attribute contributions to each
 character cell separately.
 .SH SEE ALSO
 \fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
-\*(``wide\*('' configuration of
+wide configuration of
 .IR \%ncurses .
 .PP
 \fB\%curses\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 2551924c1..f7ea27208 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp $
-.TH curs_bkgrnd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp $
+.TH curs_bkgrnd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,16 +71,17 @@ The
 of a
 .I curses
 window
-(in the library's \*(``wide\*('' configuration)
+(in the library's wide configuration)
 is a
 .I \%cchar_t
 combining a set of attributes
 (see \fB\%curs_attr\fP(3X))
-with a complex character called the
-.I "blank character."
+with the window's blank character.
 .PP
-The blank character is a spacing character that populates a window's
-character cells when their contents are erased without replacement.
+The
+.I "blank character"
+is a spacing complex character that populates a window's character cells
+when their contents are erased without replacement.
 The background's attributes are combined with all non-blank characters
 written to the window,
 as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
@@ -191,7 +192,7 @@ is null.
 \fB\%getbkgrnd\fP
 may be implemented as macros.
 .PP
-Unlike their counterparts in the non-\*(``wide\*('' configuration of
+Unlike their counterparts in the non-wide configuration of
 .IR \%ncurses ,
 \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
 and attribute in a modifiable
@@ -208,7 +209,7 @@ This implementation follows the approach used in SVr4
 .IR curses .
 .SH SEE ALSO
 \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
-non-\*(``wide\*('' configuration of
+non-wide configuration of
 .IR \%ncurses .
 .PP
 \fB\%curses\fP(3X),
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 64a34f176..740ec14f1 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp $
-.TH curs_extend 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
+.TH curs_extend 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,6 +115,7 @@ Thomas Dickey
 offers several other extensions to the X/Open Curses API.
 .PP
 \fB\%curs_getch\fP(3X),
+\fB\%curs_inopts\fP(3X),
 \fB\%curs_mouse\fP(3X),
 \fB\%curs_print\fP(3X),
 \fB\%curs_util\fP(3X),
@@ -122,5 +123,6 @@ offers several other extensions to the X/Open Curses API.
 \fB\%define_key\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%new_pair\fP(3X),
 \fB\%resizeterm\fP(3X),
 \fB\%wresize\fP(3X)
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index e0caac6d9..56087beb2 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp $
-.TH curs_get_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+.TH curs_get_wch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -50,15 +50,15 @@
 \fB\%mvget_wch\fP,
 \fB\%mvwget_wch\fP,
 \fB\%unget_wch\fP \-
-get (or push back) a wide character from \fIcurses\fR terminal keyboard
+get (or push back) a wide character from \fIcurses\fR terminal keyboard buffer
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint get_wch(wint_t *\fIwch\fP);
-\fBint wget_wch(WINDOW *\fIwin\fP, wint_t *\fIwch\fP);
-\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
-\fBint mvwget_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
+\fBint get_wch(wint_t * \fIwch\fP);
+\fBint wget_wch(WINDOW * \fIwin\fP, wint_t * \fIwch\fP);
+\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t * \fIwch\fP);
+\fBint mvwget_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwch\fP);
 .PP
 \fBint unget_wch(const wchar_t \fIwc\fP);
 .fi
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index ccc3b5bbf..0bc365962 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp $
-.TH curs_getch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp $
+.TH curs_getch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,15 +57,15 @@
 \fB\%mvwgetch\fP,
 \fB\%ungetch\fP,
 \fB\%has_key\fP \-
-get (or push back) characters from \fIcurses\fR terminal keyboard
+get (or push back) characters from \fIcurses\fR terminal keyboard buffer
 .SH SYNOPSIS
 .nf
 .B #include <curses.h>
 .PP
 .B int getch(void);
-.B int wgetch(WINDOW *\fIwin\fP);
+.B int wgetch(WINDOW * \fIwin\fP);
 .B int mvgetch(int \fIy\fP, int \fIx\fP);
-.B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.B int mvwgetch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
 .B int ungetch(int \fIc\fP);
 .PP
@@ -594,6 +594,11 @@ application can expect such a keyboard to transmit key codes
 (Insert),
 .B \%KEY_DC
 (Delete),
+.BR \%KEY_A1 ","
+.BR \%KEY_A3 ","
+.BR \%KEY_B2 ","
+.BR \%KEY_C1 ","
+.BR \%KEY_C3 ","
 and
 .BI \%KEY_F( n )
 for 1 \(<=
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 1e30604a7..699a7a6de 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp $
-.TH curs_initscr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp $
+.TH curs_initscr 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -77,7 +77,7 @@ For multiple-terminal applications,
 .PP
 The initscr code determines the terminal type and initializes all \fBcurses\fP
 data structures.
-\fBinitscr\fP also causes the first call to \fBrefresh\fP(3X)
+\fBinitscr\fP also causes the first call to \fB\%refresh\fP(3X)
 to clear the screen.
 If errors occur, \fBinitscr\fP writes an appropriate error
 message to standard error and exits;
@@ -128,11 +128,11 @@ stops cursor-addressing mode using the \fIexit_ca_mode\fP terminal capability,
 .bP
 restores tty modes (see \fBreset_shell_mode\fP(3X)).
 .PP
-Calling \fBrefresh\fP(3X) or \fBdoupdate\fP(3X) after a
+Calling \fB\%refresh\fP(3X) or \fBdoupdate\fP(3X) after a
 temporary escape causes the program to resume visual mode.
 .SS isendwin
 The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
-called without any subsequent calls to \fBwrefresh\fP,
+called without any subsequent calls to \fB\%wrefresh\fP,
 and \fBFALSE\fP otherwise.
 .SS set_term
 The \fBset_term\fP routine is used to switch between different terminals.
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 2c5d7b69f..b343fda14 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp $
-.TH curs_inopts 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp $
+.TH curs_inopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -147,7 +147,7 @@ and flow control characters are unaffected)
 and makes characters typed by the user immediately available to the
 program.
 .B \%nocbreak
-returns the terminal to normal (\*(``cooked\*('') mode.
+restores the terminal's normal (\*(``cooked\*('') line discipline.
 .PP
 The state of the terminal is unknown to a
 .I curses
@@ -283,6 +283,7 @@ a window's keypad mode is off.
 Initially,
 whether the terminal returns 7- or 8-bit character codes on input
 depends on the configuration of the terminal driver;
+on POSIX systems,
 see \fI\%termios\fP(3).
 To force 8 bits to be returned,
 call
@@ -327,7 +328,7 @@ see \fI\%termios\fP(3).
 configures the terminal to perform this translation.
 .B nonl
 disables it.
-In normal (or \*(``cooked\*('') mode,
+Under its normal (\*(``cooked\*('') line discipline,
 the terminal driver always translates carriage returns to line feeds.
 .\"
 .SS nodelay
@@ -364,10 +365,8 @@ and
 configure the terminal driver's treatment of its input and output queues
 when it handles the interrupt,
 suspend,
-or quit characters in
-.I \%cbreak
-and \*(``cooked\*('' modes;
-on POSIX systems,
+or quit characters under the normal (\*(``cooked\*('')
+or cbreak line discplines on POSIX systems;
 see \fI\%termios\fP(3).
 The default behavior is inherited from the terminal driver settings.
 Calling
@@ -413,7 +412,7 @@ depends on terminal driver configuration parameters that
 .I curses
 does not handle.
 .B \%noraw
-returns the terminal to normal (\*(``cooked\*('') mode.
+restores the terminal's normal (\*(``cooked\*('') line discipline.
 .\"
 .SS "timeout, wtimeout"
 .B \%wtimeout
@@ -558,8 +557,9 @@ may be implemented as macros.
 .B \%noraw
 and
 .B \%nocbreak
-follow historical practice in that they attempt to restore normal
-(\*(``cooked\*('') mode from raw and cbreak modes,
+follow historical practice in that they attempt to restore
+the terminal's normal (\*(``cooked\*('') line discipline
+from raw and cbreak,
 respectively.
 Mixing
 .BR \%raw / noraw
@@ -642,7 +642,8 @@ call
 or
 .B \%noecho
 explicitly just after initialization,
-even if your program remains in normal (\*(``cooked\*('') mode.
+even if your program retains the terminal's normal (\*(``cooked\*('')
+line discipline.
 .PP
 X/Open Curses is ambiguous regarding whether
 .I raw
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 5638f5b0a..a2d49d1a1 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp $
-.TH curs_ins_wstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp $
+.TH curs_ins_wstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -188,7 +188,7 @@ and
 in that their
 .I wstr
 parameters are not
-.IR const -qualified .
+.IR const "-qualified."
 .SH SEE ALSO
 \fB\%curs_insstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 911d4e895..9a858fb48 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp $
-.TH curs_instr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp $
+.TH curs_instr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,27 +46,27 @@
 ..
 .SH NAME
 \fB\%instr\fP,
-\fB\%innstr\fP,
 \fB\%winstr\fP,
-\fB\%winnstr\fP,
 \fB\%mvinstr\fP,
-\fB\%mvinnstr\fP,
 \fB\%mvwinstr\fP,
+\fB\%innstr\fP,
+\fB\%winnstr\fP,
+\fB\%mvinnstr\fP,
 \fB\%mvwinnstr\fP \-
 get a string from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint instr(char *\ \fIstr\fP);
-\fBint winstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP);
-\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
-\fBint mvwinstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
+\fBint instr(char * \fIstr\fP);
+\fBint winstr(WINDOW * \fIwin\fP, char * \fIstr\fP);
+\fBint mvinstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
+\fBint mvwinstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
 .PP
-\fBint innstr(char *\ \fIstr\fP, int \fIn\fP);
-\fBint winnstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP, int \fIn\fP);
-\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
-\fBint mvwinnstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
+\fBint innstr(char * \fIstr\fP, int \fIn\fP);
+\fBint winnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%winstr
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index a557cbe3c..f30ea5b9f 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp $
-.TH curs_inwstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+.TH curs_inwstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,27 +45,27 @@
 ..
 .SH NAME
 \fB\%inwstr\fP,
-\fB\%innwstr\fP,
 \fB\%winwstr\fP,
-\fB\%winnwstr\fP,
 \fB\%mvinwstr\fP,
-\fB\%mvinnwstr\fP,
 \fB\%mvwinwstr\fP,
+\fB\%innwstr\fP,
+\fB\%winnwstr\fP,
+\fB\%mvinnwstr\fP,
 \fB\%mvwinnwstr\fP \-
 get a wide-character string from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
-\fBint inwstr(wchar_t *\ \fIwstr\fP);
-\fBint winwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP);
-\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
-\fBint mvwinwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
+\fBint inwstr(wchar_t * \fIwstr\fP);
+\fBint winwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP);
+\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP);
+\fBint mvwinwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP);
 .PP
-\fBint innwstr(wchar_t *\ \fIwstr\fP, int \fIn\fP);
-\fBint winnwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
-\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
-\fBint mvwinnwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint innwstr(wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint winnwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%winwstr
@@ -86,7 +86,7 @@ associates with each character.
 does the same,
 but copies at most
 .I n
-characters from
+wide characters from
 .IR win "."
 An
 .I n
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 457db4da2..40afb0eb6 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp $
-.TH curs_kernel 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp $
+.TH curs_kernel 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,12 +167,23 @@ then call \fB\%doupdate\fP(3X).
 Few applications use this feature;
 most call \fB\%wmove\fP(3X) instead.
 .SS curs_set
-The \fBcurs_set\fP routine sets the cursor state to invisible,
-normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
-\fB1\fP, or \fB2\fP respectively.
-If the terminal supports the \fIvisibility\fP requested,
-the previous \fIcursor\fP state is returned;
-otherwise, \fBERR\fP is returned.
+.B \%curs_set
+adjusts the cursor visibility to
+\*(``invisible\*('',
+\*(``visible\*('',
+\*(``very visible\*('',
+as its argument is
+.BR 0 ,
+.BR 1 ,
+or
+.BR 2 ,
+respectively.
+It returns the previous
+.I visibility
+if the requested one is supported,
+and
+.B ERR
+otherwise.
 .SS mvcur
 .B \%mvcur
 provides low-level cursor motion.
@@ -245,41 +256,72 @@ It is allowable to call \fBwnoutrefresh\fP during the initialization routine.
 \fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
 \fBnewterm\fP.
 .SH RETURN VALUE
-Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
+Except for
+.BR \%curs_set ","
+these functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-\fBcurs_set\fP
-returns the previous cursor state, or \fBERR\fP if the
-requested \fIvisibility\fP is not supported.
+.B \%curs_set
+returns the previous cursor visibility,
+and returns
+.B ERR
+if the terminal type does not support the requested
+.IR visibility "."
 .PP
-X/Open defines no error conditions.
-In this implementation
-.TP 5
-\fBdef_prog_mode\fP, \fBdef_shell_mode\fP, \fBreset_prog_mode\fP, \fBreset_shell_mode\fP
+.B \%napms
+always succeeds.
+.PP
+.B \%mvcur
+fails if the position
+.RI ( newrow ,
+.IR newcol )
+is outside the screen boundaries.
+.PP
+In
+.IR \%ncurses ","
+.bP
+.BR \%def_prog_mode ","
+.BR \%def_shell_mode ","
+.BR \%reset_prog_mode ","
+and
+.B \%reset_shell_mode
 return
 .B ERR
-if the terminal was not initialized, or
-if the I/O call to obtain the terminal settings fails.
-.TP 5
-\fBripoffline\fP
+if the terminal was not initialized,
+or if the operating system's function for obtaining terminal settings
+fails.
+.bP
+.B \%ripoffline
 returns
 .B ERR
 if the maximum number of ripped-off lines
 exceeds the maximum (5).
 .SH NOTES
-Note that \fBgetsyx\fP is a macro, so \fB&\fP is not necessary before
-the variables \fIy\fP and \fIx\fP.
-.PP
-Older SVr4 man pages warn that the return value
-of \fBcurs_set\fP \*(``is currently incorrect\*(''.
-This implementation gets it right, but it may be unwise to count
-on the correctness of the return value anywhere else.
+.B \%getsyx
+is a macro;
+use of the
+.B &
+operator before its arguments is unnecessary.
 .PP
-Both \fI\%ncurses\fP and SVr4 will call \fBcurs_set\fP in \fBendwin\fP
-if \fBcurs_set\fP
-has been called to make the cursor other than normal, i.e., either
+The
+.B \%endwin
+function of both
+.I \%ncurses
+and SVr4
+.I curses
+calls
+.B \%curs_set
+if the latter has previously been called to set the cursor visiblility
+to a value other than normal;
+that is,
+either
 invisible or very visible.
-There is no way for \fI\%ncurses\fP to determine the initial cursor
-state to restore that.
+There is no way for
+.I \%ncurses
+to determine the initial cursor visibility to restore it.
 .SH EXTENSIONS
 In
 .IR \%ncurses ","
@@ -304,24 +346,51 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
-are not described in X/Open Curses, Issue 4.
+The
+.I "virtual screen"
+functions
+.I \%setsyx
+and
+.I \%getsyx
+are not described in X/Open Curses Issue\ 4.
+SVr4 documents each of them
+as returning an
+.IR int "."
+This is misleading,
+as they are macros with no documented semantics for returning values.
+.PP
 All other functions are as described in X/Open Curses.
+It specifies no error conditions for them,
+except as described for
+.I \%curs_set
+in section \*(``RETURN VALUE\*('' above.
 .PP
-The SVr4 documentation describes \fBsetsyx\fP and \fBgetsyx\fP
-as having return type int.
-This is misleading, as they are macros with no documented semantics
-for the return value.
+Older SVr4 man pages warn that the return value of
+.B \%curs_set
+\*(``is currently incorrect\*(''.
+This implementation gets it right,
+but counting on its correctness anywhere else may be unwise.
+.PP
+X/Open Curses specifies
+.I \%ripoffline
+as returning
+.B OK
+with no possibility of failure
+(\*(``[c]alls to
+.I \%ripoffline
+above this limit
+[five lines]
+have no effect but report success\*('').
 .PP
 X/Open Curses notes:
 .RS
 .PP
-\*(``After use of
+After use of
 .IR \%mvcur "(),"
 the model Curses maintains of the state of the terminal might not
 match the actual state of the terminal.
 An application should touch and refresh the window before
-resuming conventional use of Curses.\*(''
+resuming conventional use of Curses.
 .RE
 .PP
 Both
@@ -332,15 +401,19 @@ implement
 .B \%mvcur
 using the
 .I SCREEN
-data allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
+object allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
 X/Open Curses states that the old location must be given for
-.B \%mvcur
+.I \%mvcur
 to accommodate terminals that lack absolute cursor positioning.
 .\" X/Open Curses Issue 7, p. 161
 .PP
-If interrupted, \fI\%ncurses\fP restarts \fBnapms\fP.
-That, and the limitation to 30 seconds,
-are different from other implementations.
+If interrupted by a signal,
+.I \%ncurses
+restarts
+.IR \%napms "."
+That,
+and the limitation to 30 seconds,
+differ from other implementations.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index a441160a9..920cd1e7d 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp $
-.TH curs_outopts 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp $
+.TH curs_outopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -166,25 +177,45 @@ Note that
 The \fBimmedok\fP routine is useful for windows that are used as terminal
 emulators.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses,
+Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-Some historic curses implementations had, as an undocumented feature, the
-ability to do the equivalent of \fBclearok(..., 1)\fP by saying
-\fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
-This will not work under \fI\%ncurses\fP.
+Some historic
+.I curses
+implementations,
+as an undocumented feature,
+did the equivalent of
+.RB \*(`` \%clearok( .\|.\|. ", 1)" \*(''
+when
+.B \%touchwin(stdstr)
+or
+.B \%clear(stdstr)
+were used.
+This trick does not work with
+.IR \%ncurses .
 .PP
-Earlier System V curses implementations specified that with \fBscrollok\fP
-enabled, any window modification triggering a scroll also forced a physical
-refresh.
-X/Open Curses does not require this, and \fI\%ncurses\fP avoids doing
-it to perform better vertical-motion optimization at \fBwrefresh\fP
-time.
+Early System\ V
+.I curses
+implementations specified that with
+.B \%scrollok
+enabled,
+any window modification triggering a scroll
+also forced a physical refresh.
+X/Open Curses does not require this,
+and
+.I \%ncurses
+avoids doing so to better optimize vertical motions upon a
+\fB\%wrefresh\fP(3X).
 .PP
 X/Open Curses does not mention that the cursor should be
-made invisible as a side-effect of \fBleaveok\fP.
-SVr4 curses documentation does this, but the code does not.
-Use \fBcurs_set\fP to make the cursor invisible.
+made invisible as a side-effect of
+.BR \%leaveok .
+SVr4
+.I curses
+documentation notes this,
+but the code neglects it.
+Use \fB\%curs_set\fP(3X) to make the cursor invisible.
 .SH HISTORY
 .I \%ncurses
 formerly treated \fBnl\fP(3X) and \fBnonl\fP(3X) as both input
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 14b002c1a..cd50712bf 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp $
-.TH curs_refresh 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp $
+.TH curs_refresh 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -164,5 +164,5 @@ Instead, you can do an explicit \fBtouchwin\fP before the
 \fBwnoutrefresh\fP call to guarantee an entire-contents copy anywhere.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
-\fB\%curs_outopts\fP(3X)
+\fB\%curs_outopts\fP(3X),
 \fB\%curs_variables\fP(3X)
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 6dee97c50..6815e974d 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp $
-.TH curs_scroll 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+.TH curs_scroll 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -68,7 +68,8 @@ becomes line
 .IR i "\-1."
 The text of the top line in the window disappears and the bottom line
 is populated with blank characters;
-see \fB\%bkgd\fP(3X) or \fB\%bkgrnd\fP(3X).
+see \fB\%bkgd\fP(3X)
+(wide-character API users: \fB\%bkgrnd\fP(3X)).
 As an optimization,
 if the scrolling region of the window is the entire screen,
 the physical screen may be scrolled at the same time;
@@ -77,9 +78,9 @@ see \fB\%curscr\fP(3X).
 .B \%scrl
 and
 .B \%wscrl
-scroll
-.B \%stdscr
-or the specified window up or down depending on the sign of
+scrolls the specified window
+.I win
+up or down per the sign of
 .IR n "."
 .bP
 For positive
@@ -97,6 +98,9 @@ line
 becomes
 .I i
 (scrolling down).
+\fB\%ncurses\fP(3X) describes the
+.B \%scrl
+variant of this function.
 .PP
 The cursor does not move.
 These functions perform no operation unless scrolling is enabled for the
@@ -147,16 +151,17 @@ SVr4 indicates that the optimization of physically scrolling immediately
 if the scroll region is the entire screen \*(``is\*('' performed,
 not \*(``may be\*('' performed.
 .I \%ncurses
-deliberately does not guarantee that this will occur,
-to leave open the possibility of smarter optimization of multiple scroll
+deliberately does not guarantee that this occurs,
+to leave open the possibility of better optimization of multiple scroll
 actions on the next update.
 .PP
 Neither SVr4
 .I curses
-nor X/Open Curses specify whether the current attribute or current color
-pair of blanks generated by the scroll function are zeroed.
-.I \%ncurses
-does so.
+nor X/Open Curses specify whether these functions zero the attributes or
+color pair identifier of the blank character.
+In
+.IR \%ncurses ","
+they do not.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index f7bb8d6bf..75fd276db 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp $
-.TH curs_termcap 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp $
+.TH curs_termcap 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -45,6 +45,51 @@
 .el    .IP \(bu 2
 ..
 .
+.\" URL hyperlink support macros from groff's "an-ext.tmac"
+.
+.\" Save the automatic hyphenation mode.
+.\"
+.\" In AT&T troff, there was no register exposing the hyphenation mode,
+.\" and no way to save and restore it.  Set `mH` to a reasonable value
+.\" for your implementation and preference.
+.de mY
+.  ie !\\n(.g \
+.    nr mH 14
+.  el \
+.    do nr mH \\n[.hy] \" groff extension register
+..
+.
+.\" Prepare link text for mail/web hyperlinks.  `MT` and `UR` call this.
+.de mV
+.  ds mU \\$1\"
+..
+.
+.\" Emit hyperlink.  The optional argument supplies trailing punctuation
+.\" after link text.  `ME` and `UE` call this.
+.de mQ
+.  mY
+.  nh
+<\\*(mU>\\$1
+.  hy \\n(mH
+.  rm mU
+..
+.
+.\" Start URL.
+.\" .UR url
+.if !\n(.g \{\
+.de UR
+.  mV \\$1
+..
+.\}
+.
+.\" End URL.
+.\" .UE [punctuation]
+.if !\n(.g \{\
+.de UE
+.  mQ \\$1
+..
+.\}
+.
 .SH NAME
 \fB\%PC\fP,
 \fB\%UP\fP,
@@ -302,96 +347,148 @@ and
 .SH PORTABILITY
 These functions are no longer standardized
 (and the variables never were);
-\fI\%ncurses\fP provides them to support legacy applications.
+.I \%ncurses
+provides them to support legacy applications.
 They should not be used in new programs.
 .SS Standards
 .bP
-X/Open Curses, Issue 4, Version 2 (1996),
+X/Open Curses,
+Issue 4,
+Version 2 (1996),
 describes these functions,
 marking them as
 \*(``TO BE WITHDRAWN\*(''.
 .bP
-X/Open Curses, Issue 7 (2009) marks the \fItermcap\fP interface
-(along with \fB\%vwprintw\fP and \fB\%vwscanw\fP) as withdrawn.
+X/Open Curses,
+Issue 7 (2009) withdrew the
+.I termcap
+interface
+(along with the
+.I \%vwprintw
+and
+.I \%vwscanw
+functions).
 .PP
 Neither X/Open Curses nor the SVr4 man pages documented the return
-values of \fB\%tgetent\fP correctly,
+values of
+.I \%tgetent
+correctly,
 though all three shown here were in fact returned ever since SVr1.
 In particular,
 an omission in the X/Open Curses specification has been misinterpreted
-to mean that \fB\%tgetent\fP returns \fBOK\fP or \fBERR\fP.
+to mean that
+.I \%tgetent
+returns
+.B OK
+or
+.BR ERR "."
 Because the purpose of these functions is to provide compatibility with
-the \fItermcap\fP library,
-that is a defect in X/Open Curses, Issue 4, Version 2
-rather than in \fI\%ncurses\fP.
-.SS "Compatibility with BSD \fItermcap\fP"
-Externally visible variables are provided for support of certain
-\fItermcap\fP applications.
+the
+.I termcap
+library,
+that is a defect in X/Open Curses,
+Issue 4,
+Version 2
+rather than in
+.IR \%ncurses "."
+.SS "Compatibility with BSD \f(BItermcap\fP"
+.I \%ncurses
+provides externally visible variables to support certain
+.I termcap
+applications.
 However,
 their correct usage is poorly documented;
 for example,
 it is unclear when reading and writing them is meaningful.
 In particular,
-some applications are reported to declare and/or modify \fB\%ospeed\fP.
+some applications are reported to declare and/or modify
+.BR \%ospeed "."
 .PP
-The constraint that only the first two characters of the \fIid\fP
-parameter are used escapes many application developers.
-The BSD \fItermcap\fP library did not require a trailing null character
-on the capability identifier passed to \fB\%tgetstr\fP,
-\fB\%tgetnum\fP,
+The constraint that only the first two characters of the
+.I id
+parameter are looked up in the terminal database
+escapes many application developers.
+The BSD
+.I termcap
+library did not require a trailing null character
+after the capability identifier passed to
+.IR \%tgetstr ","
+.IR \%tgetnum ","
 and
-\fB\%tgetflag\fP.
+.IR \%tgetflag "."
 .\" See <https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/\
 .\"   termlib/termcap.c>.
-Some applications thus assume that the \fItermcap\fP interface does not
-require the trailing null character for the capability identifier.
-.bP
+Some applications thus assume that the
+.I termcap
+interface does not require the trailing null character
+for the capability identifier.
+.PP
 .I \%ncurses
-disallows matches by the \fItermcap\fP interface against extended
-capability names that are longer than two characters;
+disallows matches by the
+.I termcap
+interface against extended capability names
+that are longer than two characters;
 see \fB\%user_caps\fP(5).
 .PP
-The BSD \fItermcap\fP function \fB\%tgetent\fP returns the text of a
-\fItermcap\fP entry in the buffer passed as an argument.
+The BSD
+.I termcap
+function
+.I \%tgetent
+returns the text of a
+.I termcap
+entry in the buffer passed as an argument.
 This library,
-like other \fI\%term\%info\fP implementations,
+like other
+.I \%term\%info
+implementations,
 does not store terminal type descriptions as text.
 It sets the buffer contents to a null-terminated string.
 .SS "Header File"
-This library includes a \fI\%termcap.h\fP header for compatibility with
-other implementations,
-but the header is rarely used because the other implementations are not
-strictly compatible.
+This library includes a
+.I \%termcap.h
+header file for compatibility with other implementations,
+but it is rarely used because the other implementations
+are not mutually compatible;
+see below.
 .SH HISTORY
 .\" See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
 .\" for much BSD release history.
-Bill Joy originated a forerunner of \fItermcap\fP called
-\*(``ttycap\*('',
+Bill Joy originated a forerunner of
+.I termcap
+called \*(``ttycap\*('',
 dated September 1977,
 and released in 1BSD
 (March 1978).
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s7/ttycap.c
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
-It used many of the same function names as the later \fItermcap\fP,
+It used many of the same function names as the later
+.IR termcap ","
 such as
-\fB\%tgetent\fP,
-\fB\%tgetflag\fP,
-\fB\%tgetnum\fP,
+.IR \%tgetent ","
+.IR \%tgetflag ","
+.IR \%tgetnum ","
 and
-\fB\%tgetstr\fP.
+.IR \%tgetstr "."
 .PP
 A clear descendant,
-the \fItermlib\fP library,
+the
+.I termlib
+library,
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/termlib/
 followed in 2BSD
 (May 1979),
-adding \fB\%tgoto\fP and \fB\%tputs\fP.
+adding
+.I \%tgoto
+and
+.IR \%tputs "."
 The former applied at that time only to cursor positioning capabilities,
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/bin/etc/termcap
 thus the overly specific name.
 Little changed in 3BSD
 (late 1979)
-except the addition of test programs and a \fI\%termlib\fP man page,
+except the addition of test programs and a
+.I termlib
+man page,
 which documented the API shown in section \*(``SYNOPSIS\*('' above.
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/lib/\
 .\"   libtermlib/
@@ -400,7 +497,10 @@ which documented the API shown in section \*(``SYNOPSIS\*('' above.
 .PP
 4BSD
 (November 1980)
-renamed \fItermlib\fP to \fItermcap\fP
+renamed
+.I termlib
+to
+.I termcap
 .\" ...except in the source tree...
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
 .\"   libtermlib/makefile
@@ -418,8 +518,9 @@ Function prototypes were a feature of ANSI C (1989).
 The library long antedated the standard and thus provided no header file
 declaring them.
 Nevertheless,
-the BSD sources included two different \fI\%termcap.h\fP header files
-over time.
+the BSD sources included two different
+.I \%termcap.h
+header files over time.
 .bP
 One was used internally by \fIjove\fP(1) from 4.3BSD onward.
 .\" 2BSD became a branch retaining support for non-virtual memory
@@ -435,55 +536,93 @@ One was used internally by \fIjove\fP(1) from 4.3BSD onward.
 .\"   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
 .\"     jove/Makefile
 .\" --much too late for 2BSD (1979).
-It declared global symbols for the \fItermcap\fP variables that it used.
+It declared global symbols for the
+.I termcap
+variables that it used.
 .bP
 The other appeared in 4.4BSD-Lite Release 2
 (June 1995)
-as part of \fIlibedit\fP
-(also known as the \fI\%edit\%line\fP library).
+as part of
+.I libedit
+(also known as the
+.I \%edit\%line
+library).
 CSRG source history shows that this was added in mid-1992.
-The \fIlibedit\fP header file was used internally as a convenience for
-compiling the \fI\%edit\%line\fP library.
+The
+.I libedit
+header file was used internally as a convenience
+for compiling the
+.I \%edit\%line
+library.
 It declared function prototypes,
 but no global variables.
-This header file was added to NetBSD's \fItermcap\fP library in
-mid-1994.
+NetBSD's
+.I termcap
+library added this header file in mid-1994.
 .PP
 Meanwhile,
-GNU \fItermcap\fP began development in 1990.
-Its first release (1.0) in 1991 included a \fI\%termcap.h\fP header.
-Its second (1.1) in September 1992 modified the header to use
-\fIconst\fP for the function prototypes in the header where one would
-expect the parameters to be read-only.
-BSD \fItermcap\fP did not.
-The prototype for \fB\%tputs\fP also differed,
+GNU
+.I termcap
+began development in 1990.
+Its first release (1.0) in 1991 included a
+.I \%termcap.h
+header file.
+Its second (1.1) release in September 1992 modified the file to use
+.I const
+for the function prototypes in the header where one would
+expect parameters to be read-only.
+BSD
+.I termcap
+did not.
+The prototype for
+.I \%tputs
+also differed,
 but in that instance,
-it was \fIlibedit\fP that differed from BSD \fItermcap\fP.
+it was
+.I libedit
+that differed from BSD
+.IR termcap "."
 .PP
-GNU \fItermcap\fP 1.3 was bundled with \fIbash\fP(1) in mid-1993 to
-support the \fI\%readline\fP(3) library.
+GNU \fIbash\fP(1) has bundled GNU
+.I termcap
+1.3 since mid-1993 to support its \fI\%readline\fP(3) library,
+and continues to use it if configured to do so.
 .PP
-\fI\%ncurses\fP 1.8.1
+.I \%ncurses
+1.8.1
 (November 1993)
-provided a \fI\%termcap.h\fP file.
-It reflected influence from GNU \fItermcap\fP and \fI\%emacs\fP(1)
+provided a
+.I \%termcap.h
+file.
+It reflected influence from GNU
+.I termcap
+and \fI\%emacs\fP(1)
 (rather than \fIjove\fP(1)),
 providing the following interface:
 .bP
-global symbols used by \fI\%emacs\fP,
+global symbols used by
+.IR \%emacs ","
 .bP
-\fIconst\fP-qualified function prototypes,
+.IR const -qualified
+function prototypes,
 and
 .bP
-a prototype for \fBtparam\fP,
-a GNU \fItermcap\fP feature.
+a prototype for
+.IR tparam ","
+a GNU
+.I termcap
+feature.
 .PP
 Later
 (in mid-1996)
-the \fB\%tparam\fP function was removed from \fI\%ncurses\fP.
+the
+.I tparam
+function was removed from
+.IR \%ncurses "."
 Any two of the four implementations thus differ,
-and programs that intend to work with all \fItermcap\fP library
-interfaces must account for that fact.
+and programs that intend to work with all
+.I termcap
+library interfaces must account for that fact.
 .SH BUGS
 If you call \fB\%tgetstr\fP to fetch
 .B \%column_address
@@ -538,10 +677,14 @@ and modifies the data shared with,
 the \fItermcap\fP interface to accommodate the latter's limitation in
 this respect.
 .SH "SEE ALSO"
+.na
+.UR https://invisible\-island.net/ncurses/tctest.html
+\fITCTEST - A Termcap Test Utility\fP
+.UE
+.ad
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
 \fB\%putc\fP(3),
 \fB\%term_variables\fP(3X),
 \fB\%terminfo\fP(5)
-.PP
-https://invisible\-island.net/ncurses/tctest.html
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 2c373f6f6..6dcfc8b8d 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp $
-.TH curs_terminfo 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp $
+.TH curs_terminfo 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -330,57 +330,76 @@ which uses all the defaults and sends the output to
 .RE
 .\" ********************************************************************
 .SS "The Terminal State"
-\fB\%setupterm\fP stores its information about the terminal in a
+.B \%setupterm
+stores its information about the terminal in a
 .I \%TERMINAL
-structure pointed to by the global variable \fB\%cur_term\fP.
+structure pointed to by the global variable
+.BR \%cur_term "."
 If it detects an error,
 or decides that the terminal is unsuitable
 (hardcopy or generic),
 it discards this information,
-making it not available to applications.
+making it unavailable to applications.
 .PP
-If \fB\%setupterm\fP is called repeatedly for the same terminal type,
-it will reuse the information.
-It maintains only one copy of a given terminal's capabilities in memory.
-If it is called for different terminal types,
-\fB\%setupterm\fP allocates new storage for each set of terminal
-capabilities.
+If
+.B \%setupterm
+is called repeatedly for the same terminal type,
+it reuses the information.
+It maintains only one copy of a given type's capabilities in memory.
+If called for different types,
+.B \%setupterm
+allocates new storage for each set of terminal capabilities.
 .PP
-\fB\%set_curterm\fP sets \fB\%cur_term\fP to
-.IR \%nterm ,
-and makes all of the
+.B \%set_curterm
+sets
+.B \%cur_term
+to
+.IR \%nterm ","
+making all of the
 .I \%term\%info
 Boolean,
 numeric,
-and string variables use the values from
-.IR \%nterm .
-It returns the old value of \fB\%cur_term\fP.
+and string capabilities use the values from
+.IR \%nterm "."
+It returns the old value of
+.BR \%cur_term "."
 .PP
-\fB\%del_curterm\fP frees the space pointed to by
-.I \%oterm
-and makes it available for further use.
+.B \%del_curterm
+frees the memory pointed to by
+.BR \%oterm ","
+making it available for further use.
 If
-.I \%oterm
+.B \%oterm
 is
-the same as \fB\%cur_term\fP,
+the same as
+.BR \%cur_term ","
 references to any of the
 .I \%term\%info
 Boolean,
 numeric,
-and string variables thereafter may refer to invalid memory locations
-until another \fB\%setupterm\fP has been called.
+and string capabilities thereafter may refer to invalid memory locations
+until
+.B \%setupterm
+is called again.
 .PP
-\fB\%restartterm\fP is similar to \fB\%setupterm\fP and \fB\%initscr\fP,
-except that it is called after restoring memory to a previous state
+.B \%restartterm
+is similar to
+.BR \%setupterm ","
+but is intended for use after restoring program memory
+to a previous state
 (for example,
-when reloading a game saved as a core image dump).
-\fB\%restartterm\fP assumes that the windows and the input and output
-options are the same as when memory was saved,
-but the terminal type and baud rate may be different.
+when reloading an application that has been suspended from one terminal
+session and restored in another).
+.B \%restartterm
+assumes that the display dimensions
+and the input and output options are the same as when memory was saved,
+but the terminal type and line speed may differ.
 Accordingly,
-\fB\%restartterm\fP saves various terminal state bits,
-calls \fB\%setupterm\fP,
-and then restores the bits.
+.B \%restartterm
+saves relevant terminal state,
+calls
+.BR \%setupterm ","
+then restores that state.
 .\" ********************************************************************
 .SS "Formatting Output"
 \fB\%tparm\fP instantiates the string
@@ -922,15 +941,18 @@ the windows console driver by checking if \fB$TERM\fP is set to
 \*(``#win32con\*('' or an abbreviation of that string.
 .SS "Other Portability Issues"
 In SVr4,
-\fB\%set_curterm\fP returns an
-.IR int ,
+.I \%set_curterm
+returns an
+.IR int ","
 .B OK
 or
-.BR ERR .
+.BR ERR "."
 We have chosen to implement the X/Open Curses semantics.
 .PP
 In SVr4,
-the third argument of \fB\%tputs\fP has the type
+the third argument of
+.I \%tputs
+has the type
 .RB \*(`` "int (*putc)(char)" \*(''.
 .PP
 At least one implementation of X/Open Curses (Solaris) returns a value
@@ -938,7 +960,8 @@ other than
 .B OK
 or
 .B ERR
-from \fB\%tputs\fP.
+from
+.IR \%tputs "."
 It instead returns the length of the string,
 and does no error checking.
 .\" ********************************************************************
diff --git a/man/curs_util.3x b/man/curs_util.3x
index fb557d992..5a40accff 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp $
-.TH curs_util 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp $
+.TH curs_util 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -418,7 +418,7 @@ This is the case that X/Open Curses documented.
 the parameter is in the range 128\-159,
 i.e.,
 a C1 control code.
-If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
+If \fB\%use_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
 \fBunctrl\fP returns the parameter,
 i.e.,
 a one-character string with
@@ -453,7 +453,7 @@ Or they may ignore C1 controls and treat all of the upper-128 codes as
 printable.
 This implementation uses 8 bits
 but does not modify the string to reflect locale.
-The \fBuse_legacy_coding\fP(3X) function allows the caller to
+The \fB\%use_legacy_coding\fP(3X) function allows the caller to
 change the output of \fBunctrl\fP.
 .PP
 Likewise,
@@ -462,7 +462,7 @@ of \fBkeyname\fP,
 i.e.,
 it determines whether to use the \*(``M\-\*('' prefix
 for \*(``meta\*('' keys (codes in the range 128 to 255).
-Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
+Both \fB\%use_legacy_coding\fP(3X) and \fBmeta\fP(3X) 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
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 8b1501476..fe0ca63b8 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp $
-.TH curs_variables 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
+.TH curs_variables 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -48,6 +48,51 @@
 .el    .IP \(bu 2
 ..
 .
+.\" URL hyperlink support macros from groff's "an-ext.tmac"
+.
+.\" Save the automatic hyphenation mode.
+.\"
+.\" In AT&T troff, there was no register exposing the hyphenation mode,
+.\" and no way to save and restore it.  Set `mH` to a reasonable value
+.\" for your implementation and preference.
+.de mY
+.  ie !\\n(.g \
+.    nr mH 14
+.  el \
+.    do nr mH \\n[.hy] \" groff extension register
+..
+.
+.\" Prepare link text for mail/web hyperlinks.  `MT` and `UR` call this.
+.de mV
+.  ds mU \\$1\"
+..
+.
+.\" Emit hyperlink.  The optional argument supplies trailing punctuation
+.\" after link text.  `ME` and `UE` call this.
+.de mQ
+.  mY
+.  nh
+<\\*(mU>\\$1
+.  hy \\n(mH
+.  rm mU
+..
+.
+.\" Start URL.
+.\" .UR url
+.if !\n(.g \{\
+.de UR
+.  mV \\$1
+..
+.\}
+.
+.\" End URL.
+.\" .UE [punctuation]
+.if !\n(.g \{\
+.de UE
+.  mQ \\$1
+..
+.\}
+.
 .SH NAME
 \fI\%bool\fP,
 \fI\%chtype\fP,
@@ -316,6 +361,13 @@ Consequently,
 most users have decided either to override the value,
 or to rely upon its default.
 .SH SEE ALSO
+.na
+.UR https://\*:unicode\*:.org/\*:reports/\*:tr29/
+[UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
+Segmentation\*(''
+.UE
+.ad
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_color\fP(3X),
 \fB\%curs_opaque\fP(3X),
@@ -323,7 +375,3 @@ or to rely upon its default.
 \fB\%curs_threads\fP(3X),
 \fB\%term_variables\fP(3X),
 \fB\%terminfo\fP(5)
-.PP
-[UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
-Segmentation\*('';
-\%<https://\*:unicode\*:.org/\*:reports/\*:tr29/>
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 88bb4a348..4920de461 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp $
-.TH curs_window 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp $
+.TH curs_window 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%newwin\fP,
 \fB\%delwin\fP,
@@ -46,23 +46,23 @@ create and manipulate \fIcurses\fR windows
 .nf
 \fB#include <curses.h>
 .PP
-\fBWINDOW *newwin(
-      \fBint \fInlines\fB, int \fIncols\fB,\fR
-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-\fBint delwin(WINDOW *\fIwin\fB);\fR
-\fBint mvwin(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBWINDOW *subwin(WINDOW *\fIorig\fB,\fR
-      \fBint \fInlines\fB, int \fIncols\fB,\fR
-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-\fBWINDOW *derwin(WINDOW *\fIorig\fB,\fR
-      \fBint \fInlines\fB, int \fIncols\fB,\fR
-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-\fBint mvderwin(WINDOW *\fIwin\fB, int \fIpar_y\fB, int \fIpar_x\fB);\fR
-\fBWINDOW *dupwin(WINDOW *\fIwin\fB);\fR
-\fBvoid wsyncup(WINDOW *\fIwin\fB);\fR
-\fBint syncok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
-\fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
+\fBWINDOW * newwin(
+	int \fInlines\fP, int \fIncols\fP,
+	int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBint delwin(WINDOW * \fIwin\fP);
+\fBint mvwin(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBWINDOW * subwin(WINDOW * \fIorig\fP,
+	int \fInlines\fP, int \fIncols\fP,
+	int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBWINDOW * derwin(WINDOW * \fIorig\fP,
+	int \fInlines\fP, int \fIncols\fP,
+	int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBint mvderwin(WINDOW * \fIwin\fP, int \fIpar_y\fP, int \fIpar_x\fP);
+\fBWINDOW * dupwin(WINDOW * \fIwin\fP);
+\fBvoid wsyncup(WINDOW * \fIwin\fP);
+\fBint syncok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBvoid wcursyncup(WINDOW * \fIwin\fP);
+\fBvoid wsyncdown(WINDOW * \fIwin\fP);
 .fi
 .SH DESCRIPTION
 .SS newwin
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 661a0861d..e4de4219a 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp $
-.TH @INFOCMP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp $
+.TH @INFOCMP@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,7 +53,10 @@
 \fB@INFOCMP@\fP \-
 compare or print out \fIterminfo\fP descriptions
 .SH SYNOPSIS
-\fB@INFOCMP@\fP [\fB\-\
+.na
+.HP
+.B @INFOCMP@
+.RB [ \-\
 1\
 c\
 C\
@@ -80,10 +83,24 @@ U\
 V\
 W\
 x\
-\fP]
-      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fBsubset\fR]
-      [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
-      [\fIterminal-type\fP ...]
+]
+.RB [ \-A\ \c
+.IR directory ]
+.RB [ \-B\ \c
+.IR directory ]
+.RB [ \-Q\ \c
+.IR encoding ]
+.RB [ \-R\ \c
+.IR subset ]
+.RB [ \-s\ \c
+.IR key ]
+.RB [ \-v\ \c
+.IR level ]
+.RB [ \-w\ \c
+.IR width ]
+.RI [ \%terminal\%-type
+\&.\|.\|.\& ]
+.ad
 .SH DESCRIPTION
 \fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
 terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
@@ -111,7 +128,7 @@ terminals, the value returned depends on the type of the capability:
 \fBNULL\fP for missing integer or string variables
 .PP
 Use the \fB\-q\fP option to show the distinction between
-\fIabsent\fP and \fIcancelled\fP capabilities.
+\fIabsent\fP and \fIcanceled\fP capabilities.
 .PP
 These options produce a list which you can use to compare two
 or more terminal descriptions:
@@ -277,7 +294,7 @@ the compilation time, is specifying extra \fBuse=\fP fields that are
 superfluous.
 \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
 were not needed.
-.SS "Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]"
+.SS "Changing Databases [\-A \f(BIdirectory\fP] [\-B \f(BIdirectory\fP]"
 Like other \fI\%ncurses\fP utilities,
 \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
 You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
@@ -478,7 +495,8 @@ Make the comparison listing shorter by omitting subheadings, and using
 \*(``\-\*('' for absent capabilities, \*(``@\*(''
 for canceled rather than \*(``NULL\*(''.
 .bP
-However, show differences between absent and cancelled capabilities.
+However,
+show differences between absent and canceled capabilities.
 .bP
 Omit the \*(``Reconstructed from\*('' comment for source listings.
 .RE
@@ -607,7 +625,8 @@ The
 \fB\-t\fP
 options are not supported in SVr4 curses.
 .PP
-SVr4 infocmp does not distinguish between absent and cancelled capabilities.
+SVr4
+infocmp does not distinguish between absent and canceled capabilities.
 Also, it shows missing integer capabilities as \fB\-1\fP
 (the internal value used to represent missing integers).
 This implementation shows those as \*(``NULL\*('',
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index d9ee73f7b..12b39538b 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp $
-.TH legacy_coding 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: legacy_coding.3x,v 1.32 2024/09/14 20:06:50 tom Exp $
+.TH legacy_coding 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
@@ -41,15 +41,18 @@ override \fIcurses\fR locale encoding checks
 \fBint use_legacy_coding(int \fIlevel\fP);
 .fi
 .SH DESCRIPTION
-.B \%use_legacy_coding
-is an extension to the
+.BR \%use_legacy_coding ","
+an
+.I \%ncurses
+extension to the
 .I curses
-library.
-It allows the caller to change the result of \fB\%unctrl\fP(3X),
+library,
+permits customiztion of \fB\%unctrl\fP(3X) behavior,
 suppressing \fI\%isprint\fP(3)-based checks within the library that
 would normally cause nonprinting characters to be rendered in visible
 form.
-The alteration affects only eight-bit characters.
+The alteration affects only byte-wide characters with the most
+significant bit set.
 .PP
 The
 .I level
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 6e2d2b869..011824481 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,4 +1,4 @@
-# $Id: manlinks.sed,v 1.21 2024/04/20 22:25:36 tom Exp $
+# $Id: manlinks.sed,v 1.22 2024/09/14 23:49:39 tom Exp $
 ##############################################################################
 # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
@@ -53,6 +53,7 @@ s/^[ 	][ 	]*//
 s/[ 	][ 	]*$//
 s/[ 	][ 	]*/ /g
 /^$/d
+/^[<>]/d
 #
 # convert ".SH" into a more manageable form
 s/\.SH[ 	][ 	]*/.SH_(/
diff --git a/man/ncurses.3x b/man/ncurses.3x
index d3795d66e..363546ec5 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp $
-.TH ncurses 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp $
+.TH ncurses 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,7 +64,7 @@ character-cell terminal interface with optimized output
 .SH DESCRIPTION
 The \*(``new curses\*('' library offers the programmer a
 terminal-independent means of reading keyboard and mouse input and
-updating character-cell terminals with output optimized to minimize
+writing to character-cell displays with output optimized to minimize
 screen updates.
 .I \%ncurses
 replaces the
@@ -200,7 +200,8 @@ not been set up.
 \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
 must be called to initialize
 .I curses
-before use of any functions that deal with windows and screens.
+before use of any functions
+that access or manipulate windows or screens.
 .PP
 To get character-at-a-time input without echoing\(emmost interactive,
 screen-oriented programs want this\(emuse the following sequence.
@@ -419,7 +420,10 @@ The \*(``w\*('' function is typically the elemental one;
 the removal of this prefix usually indicates operation on
 .BR \%stdscr .
 .PP
-Four functions prefixed with \*(``p\*('' require a pad argument.
+Four functions prefixed with \*(``p\*('' require a
+.I pad
+argument;
+see below.
 .PP
 In function synopses,
 .I \%ncurses
@@ -507,6 +511,10 @@ where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
 prefix it with \*(``_w\*('' to obtain the wide counterpart.
 For example,
 \fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+Another exception is
+.B \%ins_nwstr
+(and its variants),
+spelled thus instead of \*(``insn_wstr\*(''.
 (Exceptions that add only \*(``w\*('' comprise
 .BR \%addwstr ,
 .BR \%inwstr ,
@@ -517,10 +525,6 @@ and their variants.)
 .\" operated on `chtype`s assuming that they were wide enough for a
 .\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
 .\" standardize these.
-Another exception is
-.B \%ins_nwstr
-and its variants,
-which is spelled thus instead of \*(``insn_wstr\*(''.
 .IP
 This convention is inapplicable to some non-wide function names,
 so other transformations are used for the wide configuration:
@@ -1119,7 +1123,9 @@ or the application uses \fI\%setuid\fP(2) or \fI\%setgid\fP(2).
 .SS "\fIBAUDRATE\fP"
 The debugging library checks this variable when the application has
 redirected output to a file.
-Its integral value is used for the baud rate.
+.I \%ncurses
+interprets its integral value as the terminal's line speed
+in bits per second.
 If that value is absent or invalid,
 .I \%ncurses
 uses 9600.
@@ -1146,6 +1152,8 @@ ignores its value if it is not one character in length.
 This variable specifies the width of the screen in characters.
 Applications running in a windowing environment usually are able to
 obtain the width of the window in which they are executing.
+.I \%ncurses
+enforces an upper limit of 512 when reading the value.
 If
 .I \%COLUMNS
 is not defined and the terminal's screen size is not available from the
@@ -1176,8 +1184,6 @@ The
 and
 .I \%LINES
 variables may be specified independently.
-.I \%ncurses
-enforces an upper limit of 512 on each when reading the value.
 This property is useful to circumvent misfeatures of legacy terminal
 type descriptions;
 \fI\%xterm\fP(1) descriptions specifying 65 lines were once notorious.
@@ -1719,7 +1725,7 @@ determined by the options given to the
 .I \%configure
 script when building the library.
 Run the script with the
-.B \-\-help
+.B \%\-\-help
 option to peruse them all.
 A few are of particular significance to the application developer
 employing
@@ -1759,7 +1765,7 @@ Here is an example.
 .RE
 .PP
 Installation also omits a symbolic link that would cause the compiler's
-.B \-lcurses
+.B \%\-lcurses
 option to link object files with
 .I \%ncurses
 instead of the system
@@ -1773,7 +1779,9 @@ is shown in section \*(``SYNOPSIS\*('' above.
 .TP 5
 .B \-\-enable\-widec
 The configure script renames the library and
-(if the \fB\-\-disable\-overwrite\fP option is used)
+(if the
+.B \%\-\-disable\-overwrite
+option is used)
 puts the header files in a different subdirectory.
 All of the library names have a \*(``w\*('' appended to them,
 i.e., instead of
@@ -1781,7 +1789,7 @@ i.e., instead of
 .PP
 .RS 4
 .EX
-\fB\-lncurses\fP
+.B \-lncurses
 .EE
 .RE
 .PP
@@ -1789,7 +1797,7 @@ you link with
 .PP
 .RS 4
 .EX
-\fB\-lncursesw\fP
+.B \-lncursesw
 .EE
 .RE
 .PP
@@ -1829,7 +1837,8 @@ from the same set of headers.
 .B \-\-with\-pthread
 The configure script renames the library.
 All of the library names have a \*(``t\*('' appended to them
-(before any \*(``w\*('' added by \fB\-\-enable\-widec\fP).
+(before any \*(``w\*('' added by
+.BR \%\-\-enable\-widec ).
 .IP
 The global variables such as \fBLINES\fP are replaced by macros to
 allow read-only access.
@@ -2244,8 +2253,8 @@ include the standard library headers required for its declarations,
 so
 .IR \%ncurses 's
 own header files can be included in any order.
-But for portability,
-you should include
+For portability even to old AIX systems,
+include
 .I \%curses.h
 before
 .IR \%term.h .
diff --git a/man/tabs.1 b/man/tabs.1
index 116860399..5147211c2 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp $
-.TH @TABS@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp $
+.TH @TABS@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -78,7 +78,7 @@ you should either reset tab-stops to the standard interval
 .PP
 .RS 4
 .EX
-tabs \-8
+@TABS@ \-8
 .EE
 .RE
 .PP
@@ -128,8 +128,8 @@ They are separated by a comma or a blank, for example,
 .PP
 .RS 4
 .EX
-tabs 1,6,11,16,21
-tabs 1 6 11 16 21
+@TABS@ 1,6,11,16,21
+@TABS@ 1 6 11 16 21
 .EE
 .RE
 .PP
@@ -139,7 +139,7 @@ e.g.,
 .PP
 .RS 4
 .EX
-tabs 1,+5,+5,+5,+5
+@TABS@ 1,+5,+5,+5,+5
 .EE
 .RE
 .PP
@@ -229,10 +229,10 @@ When setting or resetting the left margin,
 .I @DATADIR@/tabset
 tab stop initialization database
 .SH PORTABILITY
-IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
 (POSIX.1-2008)
 describes a
-.B tabs
+.I tabs
 utility.
 However,
 .bP
@@ -247,8 +247,9 @@ or
 .RB \%( smglp )
 capabilities needed to support the feature.
 .bP
-There is no counterpart in X/Open Curses Issue 7 for this utility,
-unlike \fB@TPUT@\fP(1).
+Unlike \fB@TPUT@\fP(1),
+.I tabs
+has no specification in X/Open Curses Issue\ 7.
 .PP
 The
 .B \-d
@@ -259,7 +260,7 @@ The
 extensions not provided by other implementations.
 .SH HISTORY
 A
-.B tabs
+.I tabs
 utility appeared in PWB/Unix 1.0 (1977).
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
 .\"   tabs.c
@@ -270,7 +271,7 @@ and in 3BSD
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
 .\"   tabs.c
 (later the same year);
-it supported a \*(``\-n\*('' option to set the first tab stop at the
+it supported an option \*(``\-n\*('' to set the first tab stop at the
 left margin.
 That option is not specified by POSIX.
 .PP
@@ -289,9 +290,9 @@ added support for the terminal database,
 but retained the tables to support the printers.
 By this time,
 System\ V
-.B tput
+.I tput
 had incorporated the tab stop initialization feature of BSD's
-.B tset
+.I tset
 from 1982,
 but employed the
 .I \%term\%info
@@ -308,20 +309,21 @@ though an introductory comment
 \*(``and optionally adjusts the margin\*('' remains,
 overlooked in the removal.
 The
-.B tabs
+.I tabs
 utility documented in Issues 6 and later has no mechanism for setting
 margins.
 The
 .B +m
 option in
 .I \%ncurses
-\fB\%@TABS@\fP differs from the SVr4 feature by using terminal
+.I tabs
+(\fB\%@TABS@\fP) differs from the SVr4 feature by using terminal
 capabilities rather than built-in tables.
 .PP
 POSIX documents no limit on the number of tab stops.
 Other implementations impose one;
 the limit is 20 in PWB/Unix's
-.B tabs
+.I tabs
 utility.
 While some terminals may not accept an arbitrary number of tab stops,
 .I \%ncurses
@@ -329,13 +331,13 @@ While some terminals may not accept an arbitrary number of tab stops,
 list thereof is sufficiently long.
 .PP
 The \*(``Rationale\*('' section of the Issue 6
-.B tabs
+.I tabs
 reference page
 .\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
 details how the committee considered redesigning the
-.B tabs
+.I tabs
 and
-.B tput
+.I tput
 utilities,
 without settling on an improved solution.
 It claims that
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 7f4001177..81e9cd09f 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.151 2024/06/22 21:25:23 tom Exp $
+.\" $Id: terminfo.tail,v 1.152 2024/09/14 00:43:08 Branden.Robinson Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -2059,7 +2059,7 @@ Portable applications must assume that numeric capabilities are
 signed 16-bit values.
 This includes the \fIno_color_video\fP (\fBncv\fP) capability.
 The 32768 mask value used for italics with \fBncv\fP can be confused with
-an absent or cancelled \fBncv\fP.
+an absent or canceled \fBncv\fP.
 If italics should work with colors,
 then the \fBncv\fP value must be specified, even if it is zero.
 .PP
diff --git a/man/tic.1m b/man/tic.1m
index b73b3c618..d58dfa7c1 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp $
-.TH @TIC@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp $
+.TH @TIC@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -547,7 +547,7 @@ 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.
+unable to represent canceled capabilities.
 .PP
 System V Release 3 provided a different \fBtic\fP utility,
 written by Pavel Curtis,
diff --git a/man/tput.1 b/man/tput.1
index 60aeb72db..ffc4b1cd5 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp $
-.TH @TPUT@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp $
+.TH @TPUT@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -730,7 +730,7 @@ in the
 database.
 That likely is a documentation error,
 mistaking the \*(``\-1\*('' written to the standard output to indicate
-an absent or cancelled numeric capability for an (unsigned) exit status.
+an absent or canceled numeric capability for an (unsigned) exit status.
 .PP
 The various System\ V implementations
 (AIX,
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 5608d1844..75b231c6b 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
+# $Id: ncurses-config.in,v 1.55 2024/09/14 22:16:56 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
@@ -208,7 +208,7 @@ while [ $# -gt 0 ]; do
 		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[OW]*)
+			x-[fgOW]*)
 				opt=
 				;;
 			esac
@@ -244,7 +244,7 @@ while [ $# -gt 0 ]; do
 		for opt in $CFLAGS
 		do
 			case "x$opt" in
-			x-[I]*|x-[OW]*)
+			x-[I]*|x-[fgOW]*)
 				opt=
 				;;
 			esac
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 84d2c6ddd..0d7d9f9fd 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1149 $
-#	$Date: 2024/08/17 22:45:40 $
+#	$Revision: 1.1150 $
+#	$Date: 2024/09/07 16:23:31 $
 #
 # 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
@@ -3683,7 +3683,8 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 # features.
 #
 # iTerm2 3.5.0 comes with a 4-year-old copy of xterm's terminfo (June 2020),
-# which is modified:
+# which is modified, using the ncurses TERMINFO_DIRS variable to substitute
+# this locally:
 # + xterm-nrc and xterm+pcfN are removed
 # + the developer made changes to adapt it to the 16-year-old version of
 #   ncurses bundled with MacOS, i.e., changing the mouse protocol to the
@@ -7985,10 +7986,10 @@ foot+base|foot base fragment,
 # Testing AppImage for 3.2.0, on Fedora 40:
 # + appears to implement erase-display by painting a double-line on the screen,
 #   doesn't use full screen for ded though it sort-of works for vi.
-# + sets TERMINFO in its shell, and TERM=domterm-xterm which doesn't work when
-#   doing sudo.  According to the git log, that was April 1, 2023.  The VTE
-#   developers copied this feature (i.e., a partially workable private terminal
-#   database) in February 2024.
+# + sets TERMINFO in its shell (imitating iTerm2), and TERM=domterm-xterm which
+#   doesn't work when doing sudo.  According to the git log, that was April 1,
+#   2023.  The VTE developers copied the feature (i.e., a partially workable
+#   private terminal database) in February 2024.
 # + the canonical name for the terminal description is still "domterm", and
 #   presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
 #   that look for "xterm".
@@ -27640,4 +27641,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ review/update foot for 1.18.1 -TD
 #	+ add a note about DomTerm 3.2.0 -TD
 #
+# 2024-09-07
+#	+ update comments -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index f834532c9..6a89a2a9e 100644
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.111 2023/09/16 16:05:15 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.113 2024/09/14 23:11:32 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -150,12 +150,14 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 		}
 	    }
 	} else if (SP_PARM->out_buffer == 0) {
-	    TR(TRACE_CHARPUT, ("flushing stdout"));
+	    TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
 	    fflush(stdout);
+	    fflush(stderr);
 	}
     } else {
-	TR(TRACE_CHARPUT, ("flushing stdout"));
+	TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
 	fflush(stdout);
+	fflush(stderr);
     }
     if (SP_PARM != 0)
 	SP_PARM->out_inuse = 0;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index a9cfa2556..4245a2f8d 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240831) unstable; urgency=low
+ncurses6td (6.5+20240914) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index a9cfa2556..4245a2f8d 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240831) unstable; urgency=low
+ncurses6td (6.5+20240914) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index f5a73f6c9..bb9e57491 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240831) unstable; urgency=low
+ncurses6td (6.5+20240914) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2024 05:52:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 49b20c4bf..068c72cf6 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.664 2024/08/31 09:52:35 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.666 2024/09/13 23:30:09 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0831"
+!define VERSION_MMDD  "0914"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0f57a7442..c9ec1a490 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240831
+Release: 20240914
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a650b33c6..122431b16 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240831
+Release: 20240914
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7f50b6e09..e776d3760 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240831
+Release: 20240914
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 356ebac2c0ca0839d0e0e5b0d20ba80c0a0b4556 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 23 Sep 2024 01:25:11 +0200
Subject: [PATCH 084/106] ncurses-6.5-20240922.patch.gz

---
 NEWS                                |  16 +-
 VERSION                             |   2 +-
 dist.mk                             |   4 +-
 doc/html/man/curs_addch.3x.html     | 133 +++++-----
 doc/html/man/curs_attr.3x.html      |  14 +-
 doc/html/man/curs_bkgd.3x.html      |  85 +++---
 doc/html/man/curs_bkgrnd.3x.html    |  67 ++---
 doc/html/man/curs_delch.3x.html     |  16 +-
 doc/html/man/curs_deleteln.3x.html  |  31 +--
 doc/html/man/curs_initscr.3x.html   | 160 ++++++------
 doc/html/man/curs_inopts.3x.html    |  10 +-
 doc/html/man/curs_kernel.3x.html    |  12 +-
 doc/html/man/curs_move.3x.html      |  10 +-
 doc/html/man/curs_scr_dump.3x.html  |  25 +-
 doc/html/man/curs_scroll.3x.html    |  22 +-
 doc/html/man/curs_termcap.3x.html   |  75 +++---
 doc/html/man/curs_util.3x.html      |  12 +-
 doc/html/man/curs_variables.3x.html |  10 +-
 doc/html/man/infocmp.1m.html        |  55 ++--
 doc/html/man/ncurses.3x.html        |  36 +--
 doc/html/man/tabs.1.html            |  20 +-
 doc/html/man/terminfo.5.html        |   4 +-
 doc/html/man/wresize.3x.html        |  33 +--
 man/curs_addch.3x                   |   9 +-
 man/curs_attr.3x                    |   6 +-
 man/curs_bkgd.3x                    |  53 ++--
 man/curs_bkgrnd.3x                  |  50 ++--
 man/curs_delch.3x                   |   6 +-
 man/curs_deleteln.3x                |  15 +-
 man/curs_initscr.3x                 | 388 +++++++++++++++++++---------
 man/curs_inopts.3x                  |   6 +-
 man/curs_kernel.3x                  |   8 +-
 man/curs_move.3x                    |  10 +-
 man/curs_scr_dump.3x                |  22 +-
 man/curs_scroll.3x                  |   8 +-
 man/curs_termcap.3x                 |  15 +-
 man/curs_util.3x                    |   6 +-
 man/curs_variables.3x               |   6 +-
 man/infocmp.1m                      |  87 ++++---
 man/ncurses.3x                      |  20 +-
 man/tabs.1                          |  21 +-
 man/terminfo.tail                   |   6 +-
 man/wresize.3x                      |  11 +-
 misc/ncurses-config.in              |  25 +-
 ncurses/base/MKlib_gen.sh           |  50 +++-
 ncurses/base/lib_refresh.c          |   8 +-
 ncurses/base/lib_screen.c           |  31 ++-
 ncurses/base/resizeterm.c           |  15 +-
 ncurses/tinfo/access.c              |  39 ++-
 ncurses/wcwidth.h                   |   3 +-
 package/debian-mingw/changelog      |   4 +-
 package/debian-mingw64/changelog    |   4 +-
 package/debian/changelog            |   4 +-
 package/mingw-ncurses.nsi           |   4 +-
 package/mingw-ncurses.spec          |   2 +-
 package/ncurses.spec                |   2 +-
 package/ncursest.spec               |   2 +-
 test/back_ground.c                  |  26 +-
 test/background.c                   |  38 ++-
 59 files changed, 1108 insertions(+), 754 deletions(-)

diff --git a/NEWS b/NEWS
index 4e6144d53..6dfb8a333 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4175 2024/09/14 23:14:09 tom Exp $
+-- $Id: NEWS,v 1.4182 2024/09/22 20:50:07 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,20 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240922
+	+ add a few null-pointer checks in ncurses
+	+ improve test-driver in ncurses/link_test.c
+	+ restore background character in manpages as described in X/Open
+	  Curses section 3.3.6, and add option "-c" to test programs to
+	  illustrate a non-blank character in the window background property.
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ modify ncurses*-config to add -I option in --cflag where needed for
+	  --disable-overwrite to match ".pc" files.
+	+ disallow directories and block/character devices in safe-open.
+	+ amend scr_restore() and scr_init() to remove the target window only
+	  after validating the source window which will replace the target
+	  (report by Zixi Liu).
+
 20240914
 	+ modify _nc_flush() to also flush stderr to help the flash capability
 	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
diff --git a/VERSION b/VERSION
index 6f3ed76c5..d9f6bcb70 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240914
+5:0:10	6.5	20240922
diff --git a/dist.mk b/dist.mk
index b9ef8f91c..65a3c162b 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1631 2024/09/14 12:14:00 tom Exp $
+# $Id: dist.mk,v 1.1633 2024/09/22 18:38:38 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240914
+NCURSES_PATCH = 20240922
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 427f92aaa..157e46d32 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp @
+  * @Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -110,22 +110,23 @@ <H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-wechochar">wechochar</a></H3><PRE>
        <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
-       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these functions as a hint that only a
-       single  character  is  being  output;  for  non-control  characters,  a
-       considerable performance gain may be enjoyed by employing them.
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these  functions  as  a  hint  to its
+       optimizer that only a single character cell  in  the  window  is  being
+       altered  between  refreshes; for non-control characters, a considerable
+       performance gain may be enjoyed by employing them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
-       <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
-       to write line-drawing and  other  special  characters  to  the  screen.
-       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
-       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
-       define  a  terminal-specific replacement for it, or if the terminal and
-       locale configuration requires Unicode to access  these  characters  but
+       <EM>curses</EM> defines macros starting with <STRONG>ACS_</STRONG> that can be used  with  <STRONG>waddch</STRONG>
+       to  write  line-drawing  and  other  special  characters to the screen.
+       <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS  default  listed
+       below  is  used  if  the  <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not
+       define a terminal-specific replacement for it, or if the  terminal  and
+       locale  configuration  requires  Unicode to access these characters but
        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
        corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
        string capability, and the characters in it may appear on the screen if
-       the terminal type's database entry incorrectly advertises ACS  support.
+       the  terminal type's database entry incorrectly advertises ACS support.
        The name "ACS" originates in the Alternate Character Set feature of the
        DEC VT100 terminal.
 
@@ -173,24 +174,24 @@ <H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
 
-       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
-           been  called  on  <EM>win</EM>  when a write to its bottom right location is
+       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
+           been called on <EM>win</EM> when a write to its  bottom  right  location  is
            attempted, or
 
-       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
+       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
            position.
 
        The last may be due to different causes:
 
-       <STRONG>o</STRONG>   conversion  of  a  wide character to a multibyte character sequence
+       <STRONG>o</STRONG>   conversion of a wide character to a  multibyte  character  sequence
            can fail, or
 
-       <STRONG>o</STRONG>   at least one of the bytes resulting from wide character  conversion
-           to  a  multibyte  character sequence cannot be added to the window.
-           See section "PORTABILITY" below regarding the use  of  <STRONG>waddch</STRONG>  with
+       <STRONG>o</STRONG>   at  least one of the bytes resulting from wide character conversion
+           to a multibyte character sequence cannot be added  to  the  window.
+           See  section  "PORTABILITY"  below regarding the use of <STRONG>waddch</STRONG> with
            wide characters.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -201,7 +202,7 @@ <H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       SVr4 and other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG>  variable,  but
+       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
        X/Open Curses does not specify it; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
@@ -209,90 +210,90 @@ <H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
        error conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
+       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
        value other than <STRONG>ERR</STRONG>".
 
-       The defaults specified for forms-drawing characters apply in the  POSIX
+       The  defaults specified for forms-drawing characters apply in the POSIX
        locale.
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open  Curses  states  that  the  <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
+       X/Open Curses states that the  <STRONG>ACS_</STRONG>  definitions  are  <EM>char</EM>  constants.
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
+       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
            others define them as elements of an array.
 
-           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
+           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
+       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
+           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
-           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
-           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
+       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
+           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
            implementations use "i" (small i).
 
-           None  of  the terminal descriptions on Unix platforms use uppercase
-           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
-           apparently  based on the X/Open documentation around 1995).  On the
-           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
+           None of the terminal descriptions on Unix platforms  use  uppercase
+           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
+           apparently based on the X/Open documentation around 1995).  On  the
+           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
            description uses lowercase i.
 
-       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
-       released  System V.   However, many publicly available <EM>terminfo</EM> entries
-       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
-       embedded,  and  a  second-hand list of their character descriptions has
-       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
+       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
+       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
+       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
+       embedded, and a second-hand list of their  character  descriptions  has
+       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character configurations  (the  former  is  capable  of  displaying
+           character  configurations  (the  former  is  capable  of displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
-       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
+       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
-       single character.  That character may have been more  than  eight  bits
-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
-       width of a non-wide character code unspecified.  The  standard  further
-       does  not specify the internal structure of a <EM>chtype</EM>, though the use of
-       bit operations to combine the character  code  with  attributes  and  a
+       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
+       single  character.   That  character may have been more than eight bits
+       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+       width  of  a non-wide character code unspecified.  The standard further
+       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
+       bit  operations  to  combine  the  character code with attributes and a
        color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
-       a multibyte character sequence to be passed via a succession  of  calls
-       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
-       exactly one character, which may be rendered  in  one  or  more  screen
-       locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
-       Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
-       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
-       character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
-       character   and  advances  the  cursor.   If  the  calling  application
+       a  multibyte  character sequence to be passed via a succession of calls
+       to <STRONG>waddch</STRONG>.  Other implementations  do  not;  a  <STRONG>waddch</STRONG>  call  transmits
+       exactly  one  character,  which  may  be rendered in one or more screen
+       locations depending  on  whether  it  is  printable  (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
+       Depending  on  the  locale,  <EM>ncurses</EM>  inspects  the byte passed in each
+       <STRONG>waddch</STRONG> call and checks whether the latest call  continues  a  multibyte
+       character.    When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays  the
+       character  and  advances  the  cursor.   If  the  calling   application
        interrupts the succession of bytes in a multibyte character sequence by
-       changing  the  current  location--for  example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
+       changing the current  location--for  example,  with  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
        discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
-       foregoing  behavior.  Check whether a character can be represented as a
+       foregoing behavior.  Check whether a character can be represented as  a
        single byte in the current locale.
 
        <STRONG>o</STRONG>   If it can, call either <EM>waddch</EM> or <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>.
@@ -307,16 +308,16 @@ <H1 class="no-header">curs_addch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index cc4cb8536..4a302dc31 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp @
+  * @Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -406,9 +406,9 @@ <H1 class="no-header">curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
 
        Goodheart did not mention the background character or the <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> type.
-       Those are respectively SVr4 and X/Open features.  He did mention the <STRONG>A_</STRONG>
-       constants, but did not indicate their values.  Those were not the  same
-       in different systems, even for those marked as System V.
+       Those  are respectively SVr3.1 and X/Open features.  He did mention the
+       <STRONG>A_</STRONG> constants, but did not indicate their values.  Those  were  not  the
+       same in different systems, even for those marked as System V.
 
        Different  Unix  systems  used  different  sizes  for the bit-fields in
        <EM>chtype</EM> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 2d2b3cf61..725c0a786 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -64,20 +64,24 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <EM>background</EM>  of  a  <EM>curses</EM>  window  (in  the   library's   non-wide
-       configuration)   is  a  <EM>chtype</EM>  combining  a  set  of  attributes  (see
-       <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with a character called the <EM>blank</EM> <EM>character.</EM>
+       Every <EM>curses</EM> window has a background property.  In the  library's  non-
+       wide  configuration,  this property is a <EM>chtype</EM> which combines a set of
+       attributes with the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>).   The
+       background character is a spacing character.
 
-       The blank character is a spacing character that  populates  a  window's
-       character  cells  when  their  contents are erased without replacement.
-       The background's attributes are combined with all non-blank  characters
-       written  to  the window, as with the <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> and <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families
-       of functions.
+       When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
+       background character.  <EM>curses</EM> also  uses  the  window  background  when
+       writing characters to the screen:
 
-       The blank character and  attributes  of  the  background  combine  with
-       characters  written  to  the window as described below.  The background
-       becomes a property of the character  and  moves  with  it  through  any
-       scrolling and insert/delete line/character operations.
+       <STRONG>o</STRONG>   The attribute part of the background is combined with all non-blank
+           characters that are written into the window, as with the <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>
+           and <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families of functions.
+
+       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
+           combined with blank characters that are written into the window.
+
+       The background becomes a property of the character and  moves  with  it
+       through any scrolling and insert/delete line/character operations.
 
        To  the  extent possible on a given terminal, the attribute part of the
        background is displayed as the graphic rendition of the  character  put
@@ -101,8 +105,8 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        blank.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
-           specified  blank  character;  if they match, <EM>ncurses</EM> writes the new
-           blank character to the cell.
+           specified  background  character; if they match, <EM>ncurses</EM> writes the
+           new background character to the cell.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
            value  is  nonzero.   If not, it simply replaces the attributes and
@@ -121,75 +125,76 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            the current background, and then adding  attributes  from  the  new
            background.
 
-       <EM>ncurses</EM>  treats  a  background  character  value of zero (0) as a blank
-       character.
+       If the new background's character is nonspacing, <EM>ncurses</EM> reuses the old
+       background character, except for one special  case:  <EM>ncurses</EM>  treats  a
+       background character value of zero (0) as a space.
 
-       If the terminal does not support  color,  or  if  color  has  not  been
-       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       If  the  terminal  does  not  support  color,  or if color has not been
+       initialized with <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>, <EM>ncurses</EM> ignores  the  new  background
        character's color attribute.
 
 
 </PRE><H3><a name="h3-bkgdset_wbkgdset">bkgdset, wbkgdset</a></H3><PRE>
-       <STRONG>bkgdset</STRONG> and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the  applicable
+       <STRONG>bkgdset</STRONG>  and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the applicable
        window, without updating the character cells as <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> do; only
        future writes reflect the updated background.
 
 
 </PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
-       <STRONG>getbkgd</STRONG> obtains the given window's background character  and  attribute
+       <STRONG>getbkgd</STRONG>  obtains  the given window's background character and attribute
        combination.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions  returning  an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns <STRONG>ERR</STRONG> if
-       the library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG>  if
+       Functions returning an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns  <STRONG>ERR</STRONG>  if
+       the  library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> if
        a <EM>WINDOW</EM> pointer argument is null.
 
        <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value.
 
-       <STRONG>getbkgd</STRONG>   returns   a   window's  background  character  and  attribute
+       <STRONG>getbkgd</STRONG>  returns  a  window's  background   character   and   attribute
        combination.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Unusually, there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one  would
+       Unusually,  there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one would
        expect <STRONG>wgetbkgd</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
        <STRONG>bkgd</STRONG> and <STRONG>bkgdset</STRONG> may be implemented as macros.
 
-       X/Open  Curses  mentions that the character part of the background must
-       be a single-byte value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>,  checks  to  ensure
+       X/Open Curses mentions that the character part of the  background  must
+       be  a  single-byte  value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, checks to ensure
        that, and will reuse the old background character if the check fails.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4 describes these functions.  It specifies that
-       <STRONG>bkgd</STRONG>, <STRONG>wbkgd</STRONG>, and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> on failure  (in  the  case  of  the
+       X/Open Curses, Issue 4 describes these functions.   It  specifies  that
+       <STRONG>bkgd</STRONG>,  <STRONG>wbkgd</STRONG>,  and  <STRONG>getbkgd</STRONG>  return  <STRONG>ERR</STRONG> on failure (in the case of the
        last,  this  value  is  cast  to  <EM>chtype</EM>),  but  describes  no  failure
        conditions.
 
-       The SVr4.0 manual says that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return  <STRONG>OK</STRONG>  "or  a  non-
-       negative  integer  if <STRONG>immedok</STRONG> is set", which refers to the return value
-       from <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, used to implement the  immediate  repainting.   SVr4
-       <EM>curses</EM>'s  <STRONG>wrefresh</STRONG>  returns  the  number  of  characters written to the
+       The  SVr4.0  manual  says  that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return <STRONG>OK</STRONG> "or a non-
+       negative integer if <STRONG>immedok</STRONG> is set", which refers to the  return  value
+       from  <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>,  used  to implement the immediate repainting.  SVr4
+       <EM>curses</EM>'s <STRONG>wrefresh</STRONG> returns the  number  of  characters  written  to  the
        screen during the refresh.  <EM>ncurses</EM> does not do that.
 
-       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
-       rendition  of  characters  on  the  screen  updates  when <STRONG>bkgd</STRONG> or <STRONG>wbkgd</STRONG>
-       changes the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does  not
+       Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
+       rendition of characters on  the  screen  updates  when  <STRONG>bkgd</STRONG>  or  <STRONG>wbkgd</STRONG>
+       changes  the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does not
        (in  its  non-wide  configuration)  store  the  background  and  window
        attribute contributions to each character cell separately.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes  the  corresponding  functions  in  the  wide
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>  describes  the  corresponding  functions  in  the wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-14                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.5                       2024-09-22                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 96d82f2dc..8214dfed6 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -65,20 +65,24 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The <EM>background</EM> of a <EM>curses</EM> window (in the library's wide configuration)
-       is a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> combining a set of attributes (see <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>) with the
-       window's blank character.
+       Every <EM>curses</EM> window has a background property.  In the  library's  wide
+       configuration,  this  property  is  a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  which combines a set of
+       attributes  with  the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>)  The
+       background character is a spacing character.
 
-       The <EM>blank</EM> <EM>character</EM> is a spacing complex  character  that  populates  a
-       window's  character  cells  when  their  contents  are  erased  without
-       replacement.  The background's attributes are combined  with  all  non-
-       blank  characters  written  to the window, as with the <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and
-       <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
+       When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
+       background character.  <EM>curses</EM> also  uses  the  window  background  when
+       writing characters to the screen:
 
-       The blank character and  attributes  of  the  background  combine  with
-       characters  written  to  the window as described below.  The background
-       becomes a property of the character  and  moves  with  it  through  any
-       scrolling and insert/delete line/character operations.
+       <STRONG>o</STRONG>   The attribute part of the background is combined with all non-blank
+           characters  that  are  written  into  the  window,  as   with   the
+           <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
+
+       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
+           combined with blank characters that are written into the window.
+
+       The background becomes a property of the character and  moves  with  it
+       through any scrolling and insert/delete line/character operations.
 
        To  the  extent possible on a given terminal, the attribute part of the
        background is displayed as the graphic rendition of the  character  put
@@ -102,8 +106,8 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        blank.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
-           specified  blank  character;  if they match, <EM>ncurses</EM> writes the new
-           blank character to the cell.
+           specified  background  character; if they match, <EM>ncurses</EM> writes the
+           new background character to the cell.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
            value  is  nonzero.   If not, it simply replaces the attributes and
@@ -122,30 +126,31 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            the current background, and then adding  attributes  from  the  new
            background.
 
-       <EM>ncurses</EM>  treats  a  background  character  value of zero (0) as a blank
-       character.
+       If the new background's character is nonspacing, <EM>ncurses</EM> reuses the old
+       background character, except for one special  case:  <EM>ncurses</EM>  treats  a
+       background character value of zero (0) as a space.
 
-       If the terminal does not support  color,  or  if  color  has  not  been
-       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       If  the  terminal  does  not  support  color,  or if color has not been
+       initialized with <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>, <EM>ncurses</EM> ignores  the  new  background
        character's color attribute.
 
 
 </PRE><H3><a name="h3-bkgrndset_wbkgrndset">bkgrndset, wbkgrndset</a></H3><PRE>
-       <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> manipulate the background  of  the  applicable
-       window,  without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG> do;
+       <STRONG>bkgrndset</STRONG>  and  <STRONG>wbkgrndset</STRONG>  manipulate the background of the applicable
+       window, without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG>  do;
        only future writes reflect the updated background.
 
 
 </PRE><H3><a name="h3-getbkgrnd_wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
-       The <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the background  character
-       and  attribute  pair of <STRONG>stdscr</STRONG> or the specified window and store it via
+       The  <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the background character
+       and attribute pair of <STRONG>stdscr</STRONG> or the specified window and store  it  via
        the <EM>wch</EM> pointer.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> do not return a value.
 
-       The other functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG>  upon  success.   In
+       The  other  functions  return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.  In
        <EM>ncurses</EM>, failure occurs if
 
        <STRONG>o</STRONG>   a <EM>WINDOW</EM> pointer <EM>win</EM> is null, or
@@ -156,13 +161,13 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be implemented as macros.
 
-       Unlike  their  counterparts  in  the non-wide configuration of <EM>ncurses</EM>,
-       <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> supply the background character and  attribute
+       Unlike their counterparts in the  non-wide  configuration  of  <EM>ncurses</EM>,
+       <STRONG>getbkgrnd</STRONG>  and <STRONG>wgetbkgrnd</STRONG> supply the background character and attribute
        in a modifiable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, not as the return value.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
        X/Open Curses does not provide details of how the rendition is updated.
@@ -170,14 +175,14 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the  corresponding  functions in the non-wide
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG> describes the corresponding  functions  in  the  non-wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2024-09-22                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 03154b992..43b2e41de 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp @
+  * @Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -64,10 +64,10 @@ <H1 class="no-header">curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        <STRONG>wdelch</STRONG> deletes the character at the cursor position in <EM>win</EM>.   It  moves
        all  characters to the right of the cursor on the same line to the left
        one position and replaces the contents of the rightmost position on the
-       line  with  the  window's blank character; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> (wide-character
-       API users: <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  The cursor position  does  not  change  (after
-       moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of
-       this function.
+       line  with  the  window's  background  character;  see  <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> (wide-
+       character API users: <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  The cursor position does not  change
+       (after  moving  to  (<EM>y</EM>,  <EM>x</EM>),  if specified).  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the
+       variants of this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_delch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index ff353b7ae..68bbb4cf2 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -67,15 +67,16 @@ <H1 class="no-header">curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wdeleteln</STRONG> deletes the line at the cursor in <EM>win</EM>;  all  lines  below  it
        move  up  one  line.  <EM>curses</EM> then fills the bottom line of <EM>win</EM> with the
-       blank character configured by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character  API  users:
-       <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).  The cursor position does not change.
+       background character configured  by  <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>  (wide-character  API
+       users: <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).  The cursor position does not change.
 
-       <STRONG>winsertln</STRONG>  inserts  a  line  of  blank characters above the line at the
-       cursor in <EM>win</EM>; the content of the window's bottom line  is  lost.   The
-       cursor position does not change.
+       <STRONG>winsertln</STRONG> inserts a new, empty line of characters above the line at the
+       cursor in <EM>win</EM>, shifting the existing lines down by one.  The content of
+       the  window's  bottom  line is lost; <EM>curses</EM> fills the new line with the
+       background character.  The cursor position does not change.
 
-       <STRONG>winsdelln</STRONG>  inserts  or  deletes  <EM>n</EM> lines  in  <EM>win</EM>  as  <EM>n</EM> is positive or
-       negative, respectively,  as  if  by  repeatedly  calling  <STRONG>winsertln</STRONG>  or
+       <STRONG>winsdelln</STRONG> inserts or deletes  <EM>n</EM> lines  in  <EM>win</EM>  as  <EM>n</EM>  is  positive  or
+       negative,  respectively,  as  if  by  repeatedly  calling  <STRONG>winsertln</STRONG> or
        <STRONG>wdeleteln</STRONG>.
 
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
@@ -90,16 +91,16 @@ <H1 class="no-header">curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>winsdelln</STRONG> may be implemented as macros.
 
-       These  functions  do  not require the terminal to possess hardware line
-       deletion or insertion capabilities.   Even  if  available,  by  default
+       These functions do not require the terminal to  possess  hardware  line
+       deletion  or  insertion  capabilities.   Even  if available, by default
        <EM>curses</EM> does not use them; see <STRONG><A HREF="idlok.3x.html">idlok(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
        value other than <STRONG>ERR</STRONG>".
 
 
@@ -114,7 +115,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2024-09-22                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 8cbe7ddef..456765d24 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp @
+  * @Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -54,127 +54,145 @@ <H1 class="no-header">curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>WINDOW</STRONG> <STRONG>*initscr(void);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>initscr(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>endwin(void);</STRONG>
 
        <STRONG>bool</STRONG> <STRONG>isendwin(void);</STRONG>
 
-       <STRONG>SCREEN</STRONG> <STRONG>*newterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>inf</EM><STRONG>);</STRONG>
-       <STRONG>SCREEN</STRONG> <STRONG>*set_term(SCREEN</STRONG> <STRONG>*</STRONG><EM>new</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>delscreen(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> <STRONG>newterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG> <EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG> <EM>inf</EM><STRONG>);</STRONG>
+       <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> <STRONG>set_term(SCREEN</STRONG> <STRONG>*</STRONG> <EM>new</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>delscreen(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-initscr">initscr</a></H3><PRE>
-       <STRONG>initscr</STRONG> is normally the first <STRONG>curses</STRONG> routine to call when  initializing
-       a  program.   A few special routines sometimes need to be called before
-       it; these are <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>, <STRONG>filter</STRONG>, <STRONG>ripoffline</STRONG>, <STRONG>use_env</STRONG>.  For multiple-
-       terminal applications, <STRONG>newterm</STRONG> may be called before <STRONG>initscr</STRONG>.
+       <STRONG>initscr</STRONG> determines the terminal  type  and  initializes  the  library's
+       <EM>SCREEN</EM>,  <EM>WINDOW</EM>,  and  other data structures.  It is normally the first
+       <EM>curses</EM> function call a program performs.  However, an application  with
+       unusual needs might employ a few other <EM>curses</EM> functions beforehand:
 
-       The  initscr  code  determines  the  terminal  type and initializes all
-       <STRONG>curses</STRONG>  data  structures.   <STRONG>initscr</STRONG>  also  causes  the  first  call  to
-       <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to  clear  the screen.  If errors occur, <STRONG>initscr</STRONG> writes an
-       appropriate error message to standard error  and  exits;  otherwise,  a
-       pointer is returned to <STRONG>stdscr</STRONG>.
+       <STRONG>o</STRONG>   <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> to set up soft-label keys;
 
+       <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">filter(3x)</A></STRONG>  if  the  program  is  designed  to operate in a process
+           pipeline;
 
-</PRE><H3><a name="h3-newterm">newterm</a></H3><PRE>
-       A program that outputs to more than one terminal should use the <STRONG>newterm</STRONG>
-       routine for each terminal instead of <STRONG>initscr</STRONG>.  A program that needs  to
-       inspect capabilities, so it can continue to run in a line-oriented mode
-       if the terminal cannot support a screen-oriented  program,  would  also
-       use <STRONG>newterm</STRONG>.
+       <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">ripoffline(3x)</A></STRONG> to reserve up to five lines at the top and/or bottom
+           of  the  screen  from  management  by  <STRONG>stdscr</STRONG>,  the standard <EM>curses</EM>
+           window; and
+
+       <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> and/or <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> to configure use of  the  process
+           environment  and  operating system's terminal driver, respectively,
+           when determining the dimensions of the terminal display.
+
+       Further, a <EM>curses</EM> program might call <STRONG>newterm</STRONG> prior  to  or  instead  of
+       <STRONG>initscr</STRONG> in two specialized cases described in its subsection below.
+
+       <STRONG>initscr</STRONG>  causes  the  first  <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  call to clear the screen.  If
+       errors occur, <STRONG>initscr</STRONG> writes an appropriate diagnostic message  to  the
+       standard  error  stream  and  exits; otherwise, it returns a pointer to
+       <STRONG>stdscr</STRONG>.
 
-       The  routine  <STRONG>newterm</STRONG>  should  be  called  once  for each terminal.  It
-       returns a variable of  type  <EM>SCREEN</EM>  <EM>*</EM>  which  should  be  saved  as  a
-       reference to that terminal.  <STRONG>newterm</STRONG>'s arguments are
 
-       <STRONG>o</STRONG>   the <EM>type</EM> of the terminal to be used in place of <STRONG>$TERM</STRONG>,
+</PRE><H3><a name="h3-newterm">newterm</a></H3><PRE>
+       An application that manages multiple terminals should call <STRONG>newterm</STRONG> once
+       for each such device <EM>instead</EM> of <STRONG>initscr</STRONG>.  <STRONG>newterm</STRONG>'s arguments are
+
+       <STRONG>o</STRONG>   the  <EM>type</EM>  of  the  associated  terminal,  or  <EM>NULL</EM> to use the <EM>TERM</EM>
+           environment variable;
 
-       <STRONG>o</STRONG>   an output stream connected to the terminal, and
+       <STRONG>o</STRONG>   an output stream <EM>outf</EM> connected to the terminal; and
 
-       <STRONG>o</STRONG>   an input stream connected to the terminal
+       <STRONG>o</STRONG>   an input stream <EM>inf</EM>  connected  to  the  terminal.   It  returns  a
+           variable  of  structure  type  <EM>SCREEN</EM>  <STRONG>*</STRONG>, which should be saved for
+           later use with <STRONG>set_term</STRONG> and <STRONG>delscreen</STRONG>.
 
-       If the <EM>type</EM> parameter is <STRONG>NULL</STRONG>, <STRONG>$TERM</STRONG> will be used.
+       <STRONG>newterm</STRONG> passes the file descriptor of the output stream to the <EM>terminfo</EM>
+       function <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>, which returns a pointer to a <EM>TERMINAL</EM> structure
+       that <STRONG>newterm</STRONG> stores in the <EM>SCREEN</EM> it returns to the application.
 
-       The  file  descriptor  of the output stream is passed to <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>,
-       which returns a pointer to  a  <EM>TERMINAL</EM>  structure.   <STRONG>newterm</STRONG>'s  return
-       value holds a pointer to the <EM>TERMINAL</EM> structure.
+       An application that needs to inspect a terminal type's capabilities, so
+       that  it  can  continue  to run in a line-oriented mode if the terminal
+       cannot support a screen-oriented program, would also use  <STRONG>newterm</STRONG>.   If
+       at most one terminal connection is needed, the programmer could perform
+       such a capability test, decide which mode in  which  to  operate,  then
+       call  <STRONG>delscreen</STRONG>  on  the  pointer returned by <STRONG>newterm</STRONG>, and proceed with
+       either <STRONG>initscr</STRONG> or a non-<EM>curses</EM> interface.
 
 
 </PRE><H3><a name="h3-endwin">endwin</a></H3><PRE>
-       The  program  must also call <STRONG>endwin</STRONG> for each terminal being used before
-       exiting from <STRONG>curses</STRONG>.  If <STRONG>newterm</STRONG> is called more than once for the  same
+       The program must also call <STRONG>endwin</STRONG> for each terminal being  used  before
+       exiting  from <EM>curses</EM>.  If <STRONG>newterm</STRONG> is called more than once for the same
        terminal, the first terminal referred to must be the last one for which
        <STRONG>endwin</STRONG> is called.
 
-       A program should always call <STRONG>endwin</STRONG> before  exiting  or  escaping  from
-       <STRONG>curses</STRONG> mode temporarily.  This routine
+       A  program  should always call <STRONG>endwin</STRONG> before exiting the application or
+       temporarily suspending <EM>curses</EM>'s management of the terminal.  <STRONG>endwin</STRONG>:
 
        <STRONG>o</STRONG>   resets colors to correspond with the default color pair 0,
 
        <STRONG>o</STRONG>   moves the cursor to the lower left-hand corner of the screen,
 
-       <STRONG>o</STRONG>   clears  the  remainder  of  the  line  so  that it uses the default
+       <STRONG>o</STRONG>   clears the remainder of the  line  so  that  it  uses  the  default
            colors,
 
        <STRONG>o</STRONG>   sets the cursor to normal visibility (see <STRONG><A HREF="curs_kernel.3x.html">curs_set(3x)</A></STRONG>),
 
-       <STRONG>o</STRONG>   stops  cursor-addressing  mode  using  the  <EM>exit</EM><STRONG>_</STRONG><EM>ca</EM><STRONG>_</STRONG><EM>mode</EM>   terminal
-           capability,
+       <STRONG>o</STRONG>   if  applicable, stops cursor-addressing mode using the <STRONG>exit_ca_mode</STRONG>
+           (<STRONG>rmcup</STRONG>) terminal capability, and
 
-       <STRONG>o</STRONG>   restores tty modes (see <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG>).
+       <STRONG>o</STRONG>   restores terminal modes (see <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG>).
 
-       Calling <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> after a temporary escape causes the
-       program to resume visual mode.
+       Calling <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> after  a  temporary  escape  causes
+       <EM>curses</EM> to resume managing the terminal.
 
 
 </PRE><H3><a name="h3-isendwin">isendwin</a></H3><PRE>
-       The <STRONG>isendwin</STRONG> routine returns <STRONG>TRUE</STRONG> if <STRONG>endwin</STRONG> has been called without any
-       subsequent calls to <STRONG>wrefresh</STRONG>, and <STRONG>FALSE</STRONG> otherwise.
+       <STRONG>isendwin</STRONG>  returns <STRONG>TRUE</STRONG> if <STRONG>endwin</STRONG> has been called without any subsequent
+       calls to <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, and <STRONG>FALSE</STRONG> otherwise.
 
 
 </PRE><H3><a name="h3-set_term">set_term</a></H3><PRE>
-       The  <STRONG>set_term</STRONG>  routine  is  used to switch between different terminals.
-       The screen  reference  <EM>new</EM>  becomes  the  new  current  terminal.   The
-       previous terminal is returned by the routine.  This is the only routine
-       which manipulates <EM>SCREEN</EM> pointers; all other routines affect  only  the
-       current terminal.
+       <STRONG>set_term</STRONG> re-orients the <EM>curses</EM> library's operations to another terminal
+       when the application has arranged to manage more than one with <STRONG>newterm</STRONG>.
+       <STRONG>set_term</STRONG> expects a <EM>SCREEN</EM> pointer previously returned by <STRONG>newterm</STRONG> as  an
+       argument,  and  returns  the previous one.  <STRONG>set_term</STRONG> is the only <EM>curses</EM>
+       API function that manipulates <EM>SCREEN</EM> pointers; all others  affect  only
+       the current terminal.
 
 
 </PRE><H3><a name="h3-delscreen">delscreen</a></H3><PRE>
-       The  <STRONG>delscreen</STRONG>  routine  frees  storage associated with the <EM>SCREEN</EM> data
-       structure.  The <STRONG>endwin</STRONG> routine does not do this, so <STRONG>delscreen</STRONG> should be
-       called after <STRONG>endwin</STRONG> if a particular <EM>SCREEN</EM> is no longer needed.
+       <STRONG>delscreen</STRONG>  frees  the  storage  backing  the  supplied  <EM>SCREEN</EM>  pointer
+       argument.  <STRONG>endwin</STRONG> does not, so that an application can resume  managing
+       a  terminal  with  <EM>curses</EM>  after  a (possibly conditional or temporary)
+       suspension; see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>.  Call <STRONG>delscreen</STRONG> after  <STRONG>endwin</STRONG>  when  a
+       particular <EM>SCREEN</EM> structure is no longer needed.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>endwin</STRONG>  returns  the  integer  <STRONG>ERR</STRONG>  upon failure and <STRONG>OK</STRONG> upon successful
-       completion.
+       <STRONG>endwin</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Routines that return pointers always return <STRONG>NULL</STRONG> on error.
-
-       X/Open defines no error conditions.  In this implementation
+       In <EM>ncurses</EM>,
 
        <STRONG>o</STRONG>   <STRONG>endwin</STRONG> returns <STRONG>ERR</STRONG> if
 
-           <STRONG>o</STRONG>   the terminal was not initialized, or
+           <STRONG>o</STRONG>   the terminal was not initialized,
 
            <STRONG>o</STRONG>   <STRONG>endwin</STRONG> is called more than once without updating the screen, or
 
-           <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> return <STRONG>ERR</STRONG>.
+           <STRONG>o</STRONG>   <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> returns <STRONG>ERR</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>newterm</STRONG> returns <STRONG>ERR</STRONG> if it cannot allocate the data  structures  for
-           the  screen,  or for the top-level windows within the screen, i.e.,
-           <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, or <STRONG>stdscr</STRONG>.
+       <STRONG>o</STRONG>   <STRONG>newterm</STRONG>  returns  <STRONG>ERR</STRONG>  if it cannot allocate storage for the <EM>SCREEN</EM>
+           data structure or the top-level windows  thereof:  <STRONG>curscr</STRONG>,  <STRONG>newscr</STRONG>,
+           and <STRONG>stdscr</STRONG>.
 
-       <STRONG>o</STRONG>   <STRONG>set_term</STRONG> returns no error.
+       Functions  that  return  pointers  return  <EM>NULL</EM>  on error.  In <EM>ncurses</EM>,
+       <STRONG>set_term</STRONG> does not fail.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions were described in X/Open Curses, Issue 4.  As of  2015,
-       the current document is X/Open Curses, Issue 7.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
 
 </PRE><H3><a name="h3-Differences">Differences</a></H3><PRE>
@@ -222,19 +240,17 @@ <H1 class="no-header">curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</H1>
        descriptor can have different behavior  depending  on  which  structure
        holds the corresponding descriptor.
 
-       For example
-
-       <STRONG>o</STRONG>   NetBSD's  <STRONG><A HREF="curs_termattrs.3x.html">baudrate(3x)</A></STRONG>  function  uses  the descriptor in <EM>TERMINAL</EM>.
-           <EM>ncurses</EM> and SVr4 use the descriptor in <EM>SCREEN</EM>.
+       <STRONG>o</STRONG>   NetBSD's   <EM>baudrate</EM>  function  uses  the  descriptor  in  <EM>TERMINAL</EM>.
+           <EM>ncurses</EM> and SVr4 <EM>curses</EM> use the descriptor in <EM>SCREEN</EM>.
 
        <STRONG>o</STRONG>   NetBSD and <EM>ncurses</EM> use the descriptor in <EM>TERMINAL</EM> for terminal  I/O
            modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
            uses the descriptor in <EM>SCREEN</EM>.
 
-   <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
+   <STRONG>Unset</STRONG> <STRONG><EM>TERM</EM></STRONG> <STRONG>Variable</STRONG>
        If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
        "unknown",  which  normally  corresponds  to  a terminal entry with the
-       <EM>generic</EM> (<EM>gn</EM>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
+       <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
        and  cannot  be  used for full-screen operation.  Other implementations
        may handle a missing/empty <EM>TERM</EM> variable differently.
 
@@ -303,7 +319,7 @@ <H1 class="no-header">curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-11                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 49124ab53..ffb08c4c2 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -202,7 +202,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush, noqiflush</a></H3><PRE>
        <STRONG>qiflush</STRONG> and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of  its
        input and output queues when it handles the interrupt, suspend, or quit
-       characters under the normal ("cooked") or  cbreak  line  discplines  on
+       characters under the normal ("cooked") or cbreak  line  disciplines  on
        POSIX  systems; see <STRONG>termios(3)</STRONG>.  The default behavior is inherited from
        the terminal driver settings.  Calling <STRONG>qiflush</STRONG> configures the  terminal
        to  flush  the  queues  when  any  of  these  events occurs, giving the
@@ -382,7 +382,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 2fadf7db6..0102f43bd 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp @
+  * @Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -196,8 +196,8 @@ <H1 class="no-header">curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            if the operating system's function for obtaining terminal  settings
            fails.
 
-       <STRONG>o</STRONG>   <STRONG>ripoffline</STRONG>  returns  <STRONG>ERR</STRONG>  if the maximum number of ripped-off lines
-           exceeds the maximum (5).
+       <STRONG>o</STRONG>   <STRONG>ripoffline</STRONG>  returns  <STRONG>ERR</STRONG>  if the accumulated quantity of ripped-off
+           lines would exceed the maximum (5).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -262,7 +262,7 @@ <H1 class="no-header">curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 3efe2e2b7..23fe50d89 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp @
+  * @Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_move 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        They fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       In <EM>ncurses</EM>, <STRONG>wmove</STRONG> fails if its <EM>WINDOW</EM> pointer argument is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, <STRONG>wmove</STRONG> fails if <EM>win</EM> is <STRONG>NULL</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -93,7 +93,7 @@ <H1 class="no-header">curs_move 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 56aafbb4d..748a6f612 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -139,19 +139,30 @@ <H1 class="no-header">curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        considered  invalid  "if the time-stamp of the tty is old" but does not
        define "old".
 
+       As of 2024, PDCurses provides these functions.  NetBSD curses does  not
+       provide these functions, although it provides <STRONG>getwin</STRONG>.
+
+       Other  implementations  of curses store the window in binary form.  One
+       drawback to binary form is that this makes the dump dependent upon  the
+       curses  library's  internal  data  structures.   Rather  than  do that,
+       ncurses stores the dump in textual form, allowing more flexible use  of
+       the  data.   For  instance,  SVr4  curses <STRONG>scr_restore</STRONG> requires that the
+       dumped window have the same dimensions as the restored window.  ncurses
+       uses <STRONG>wresize</STRONG> to adjust the restored window size.
+
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3 (1987) introduced <STRONG>scr_dump</STRONG>,  <STRONG>scr_init</STRONG>,  and  <STRONG>scr_restore</STRONG>.   SVr3.1
+       SVr3  (1987)  introduced  <STRONG>scr_dump</STRONG>,  <STRONG>scr_init</STRONG>, and <STRONG>scr_restore</STRONG>.  SVr3.1
        added <STRONG>scr_set</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
-       <STRONG>system(3)</STRONG>, <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG>system(3)</STRONG>, <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-06-08                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 476dd173e..fd30c47aa 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -62,11 +62,11 @@ <H1 class="no-header">curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>scroll</STRONG>  scrolls  the  given window up one line.  That is, every visible
        line we might number <EM>i</EM> becomes line <EM>i</EM>-1.  The text of the top  line  in
-       the  window  disappears  and  the  bottom  line is populated with blank
-       characters; see <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG> (wide-character API users: <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  As an
-       optimization,  if  the  scrolling  region  of  the window is the entire
-       screen, the physical screen may be  scrolled  at  the  same  time;  see
-       <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
+       the  window  disappears  and  the  bottom  line  is  populated with the
+       background  character;  see   <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG>   (wide-character   API   users:
+       <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  As an optimization, if the scrolling region of the window
+       is the entire screen, the physical screen may be scrolled at  the  same
+       time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
        <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scrolls the specified window <EM>win</EM> up or down per the sign
        of <EM>n</EM>.
@@ -108,8 +108,8 @@ <H1 class="no-header">curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        multiple scroll actions on the next update.
 
        Neither SVr4 <EM>curses</EM> nor X/Open Curses specify whether  these  functions
-       zero  the  attributes  or color pair identifier of the blank character.
-       In <EM>ncurses</EM>, they do not.
+       zero  the  attributes  or  color  pair  identifier  of  the  background
+       character.  In <EM>ncurses</EM>, they do not.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2024-09-22                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 97f6ecad7..5150c7865 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -284,37 +284,38 @@ <H1 class="no-header">curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        above.
 
        4BSD  (November 1980) renamed <EM>termlib</EM> to <EM>termcap</EM> and added another test
-       program.  The library remained much the same though 4.3BSD (June 1986).
-       4.4BSD-Lite (June 1994) refactored it, leaving the API unchanged.
+       program.  The library remained  much  the  same  through  4.3BSD  (June
+       1986).    4.4BSD-Lite  (June  1994)  refactored  it,  leaving  the  API
+       unchanged.
 
-       Function  prototypes were a feature of ANSI C (1989).  The library long
+       Function prototypes were a feature of ANSI C (1989).  The library  long
        antedated the standard and thus provided no header file declaring them.
-       Nevertheless,  the  BSD sources included two different <EM>termcap.h</EM> header
+       Nevertheless, the BSD sources included two different  <EM>termcap.h</EM>  header
        files over time.
 
        <STRONG>o</STRONG>   One was used internally by <STRONG>jove(1)</STRONG> from 4.3BSD onward.  It declared
            global symbols for the <EM>termcap</EM> variables that it used.
 
-       <STRONG>o</STRONG>   The  other appeared in 4.4BSD-Lite Release 2 (June 1995) as part of
-           <EM>libedit</EM> (also known as the <EM>editline</EM> library).  CSRG source  history
+       <STRONG>o</STRONG>   The other appeared in 4.4BSD-Lite Release 2 (June 1995) as part  of
+           <EM>libedit</EM>  (also known as the <EM>editline</EM> library).  CSRG source history
            shows that this was added in mid-1992.  The <EM>libedit</EM> header file was
            used  internally  as  a  convenience  for  compiling  the  <EM>editline</EM>
            library.  It declared function prototypes, but no global variables.
            NetBSD's <EM>termcap</EM> library added this header file in mid-1994.
 
-       Meanwhile, GNU <EM>termcap</EM> began development in 1990.   Its  first  release
-       (1.0)  in  1991  included  a  <EM>termcap.h</EM>  header file.  Its second (1.1)
-       release in September 1992 modified  the  file  to  use  <EM>const</EM>  for  the
-       function  prototypes in the header where one would expect parameters to
-       be read-only.  BSD <EM>termcap</EM> did  not.   The  prototype  for  <EM>tputs</EM>  also
-       differed,  but  in that instance, it was <EM>libedit</EM> that differed from BSD
+       Meanwhile,  GNU  <EM>termcap</EM>  began development in 1990.  Its first release
+       (1.0) in 1991 included a  <EM>termcap.h</EM>  header  file.   Its  second  (1.1)
+       release  in  September  1992  modified  the  file  to use <EM>const</EM> for the
+       function prototypes in the header where one would expect parameters  to
+       be  read-only.   BSD  <EM>termcap</EM>  did  not.   The prototype for <EM>tputs</EM> also
+       differed, but in that instance, it was <EM>libedit</EM> that differed  from  BSD
        <EM>termcap</EM>.
 
-       GNU <STRONG>bash(1)</STRONG> has bundled GNU <EM>termcap</EM> 1.3 since mid-1993 to  support  its
+       GNU  <STRONG>bash(1)</STRONG>  has bundled GNU <EM>termcap</EM> 1.3 since mid-1993 to support its
        <STRONG>readline(3)</STRONG> library, and continues to use it if configured to do so.
 
-       <EM>ncurses</EM>  1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It reflected
-       influence  from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than   <STRONG>jove(1)</STRONG>),
+       <EM>ncurses</EM> 1.8.1 (November 1993) provided a <EM>termcap.h</EM> file.  It  reflected
+       influence   from  GNU  <EM>termcap</EM>  and  <STRONG>emacs(1)</STRONG>  (rather  than  <STRONG>jove(1)</STRONG>),
        providing the following interface:
 
        <STRONG>o</STRONG>   global symbols used by <EM>emacs</EM>,
@@ -323,54 +324,54 @@ <H1 class="no-header">curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   a prototype for <EM>tparam</EM>, a GNU <EM>termcap</EM> feature.
 
-       Later  (in mid-1996) the <EM>tparam</EM> function was removed from <EM>ncurses</EM>.  Any
-       two of the four implementations thus differ, and programs  that  intend
+       Later (in mid-1996) the <EM>tparam</EM> function was removed from <EM>ncurses</EM>.   Any
+       two  of  the four implementations thus differ, and programs that intend
        to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
        If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>column_address</STRONG>  (<STRONG>ch</STRONG>)  or  any  other
-       parameterized string capability, be aware that it is returned in  <EM>term-</EM>
+       parameterized  string capability, be aware that it is returned in <EM>term-</EM>
        <EM>info</EM> notation, not the older and not-quite-compatible <EM>termcap</EM> notation.
-       This does not cause problems if all you do with it  is  call  <STRONG>tgoto</STRONG>  or
-       <STRONG>tparm</STRONG>,   which   both   parametrically   expand  <EM>terminfo</EM>-style  string
-       capabilities as <EM>terminfo</EM> does.  (If <EM>ncurses</EM> is  configured  to  support
-       <EM>termcap,</EM>  <STRONG>tgoto</STRONG>  checks whether the string is <EM>terminfo</EM>-style by looking
-       for "<STRONG>%p</STRONG>" parameters or "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"  delays,  and  invokes  a  <EM>termcap</EM>-style
+       This  does  not  cause  problems if all you do with it is call <STRONG>tgoto</STRONG> or
+       <STRONG>tparm</STRONG>,  which  both   parametrically   expand   <EM>terminfo</EM>-style   string
+       capabilities  as  <EM>terminfo</EM>  does.  (If <EM>ncurses</EM> is configured to support
+       <EM>termcap,</EM> <STRONG>tgoto</STRONG> checks whether the string is <EM>terminfo</EM>-style  by  looking
+       for  "<STRONG>%p</STRONG>"  parameters  or  "<STRONG>&lt;</STRONG>...<STRONG>&gt;</STRONG>"  delays, and invokes a <EM>termcap</EM>-style
        parser if the string appears not to use <EM>terminfo</EM> syntax.)
 
-       Because  <EM>terminfo</EM>'s  syntax  for padding in string capabilities differs
+       Because <EM>terminfo</EM>'s syntax for padding in  string  capabilities  differs
        from <EM>termcap</EM>'s, users can be surprised.
 
-       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG> in a <EM>terminfo</EM> system transmits "50" rather  than  busy-
+       <STRONG>o</STRONG>   <STRONG>tputs("50")</STRONG>  in  a <EM>terminfo</EM> system transmits "50" rather than busy-
            waiting for 50 milliseconds.
 
-       <STRONG>o</STRONG>   However,  if  <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it may also
+       <STRONG>o</STRONG>   However, if <EM>ncurses</EM> is configured to support <EM>termcap</EM>, it  may  also
            have been configured to support BSD-style padding.
 
-           In that case, <STRONG>tputs</STRONG> inspects strings  passed  to  it,  looking  for
+           In  that  case,  <STRONG>tputs</STRONG>  inspects  strings passed to it, looking for
            digits at the beginning of the string.
 
-           <STRONG>tputs("50")</STRONG>  in  a <EM>termcap</EM> system may busy-wait for 50 milliseconds
+           <STRONG>tputs("50")</STRONG> in a <EM>termcap</EM> system may busy-wait for  50  milliseconds
            rather than transmitting "50".
 
        <EM>termcap</EM>  has  nothing  analogous  to  <EM>terminfo</EM>'s  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)
-       capability.   One  consequence is that <EM>termcap</EM> applications assume that
-       "<STRONG>me</STRONG>" (equivalent to <EM>terminfo</EM>'s <STRONG>exit_attribute_mode</STRONG>  (<STRONG>sgr0</STRONG>)  capability)
-       does  not  reset  the alternate character set.  <EM>ncurses</EM> checks for, and
+       capability.  One consequence is that <EM>termcap</EM> applications  assume  that
+       "<STRONG>me</STRONG>"  (equivalent  to <EM>terminfo</EM>'s <STRONG>exit_attribute_mode</STRONG> (<STRONG>sgr0</STRONG>) capability)
+       does not reset the alternate character set.  <EM>ncurses</EM>  checks  for,  and
        modifies the data shared with, the <EM>termcap</EM> interface to accommodate the
        latter's limitation in this respect.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <EM>TCTEST</EM> <EM>-</EM> <EM>A</EM> <EM>Termcap</EM> <EM>Test</EM> <EM>Utility</EM>
-       &lt;https://invisible-island.net/ncurses/tctest.html&gt;
+       <EM>TCTEST</EM> <EM>--</EM> <EM>A</EM> <EM>Termcap</EM> <EM>Test</EM> <EM>Utility</EM> &lt;https://invisible-island.net/ncurses/
+       tctest.html&gt;
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 81c6ba1da..dfb737122 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp @
+  * @Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-09-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-09-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -399,13 +399,13 @@ <H1 class="no-header">curs_util 3x 2024-09-11 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>,        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>,        <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>, <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-11                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index bf49fe098..8728ded74 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -258,7 +258,7 @@ <H1 class="no-header">curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       [UAX #29] "Unicode Standard Annex #29: Unicode Text Segmentation"
+       [UAX #29] "Unicode  Standard  Annex  #29:  Unicode  Text  Segmentation"
        &lt;https://unicode.org/reports/tr29/&gt;
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
@@ -266,7 +266,7 @@ <H1 class="no-header">curs_variables 3x 2024-09-14 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-09-14                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index f4367c773..5877cf6aa 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp @
+  * @Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-09-14 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2024-09-21 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-09-14 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -52,8 +52,8 @@ <H1 class="no-header">infocmp 1m 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-       <STRONG>infocmp</STRONG> [<STRONG>-1cCdDeEFgGiIKlLnpqrtTuUVWx]</STRONG> [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
-              [<STRONG>-Q</STRONG> <EM>encoding</EM>] [<STRONG>-R</STRONG> <EM>subset</EM>] [<STRONG>-s</STRONG> <EM>key</EM>] [<STRONG>-v</STRONG> <EM>level</EM>] [<STRONG>-w</STRONG> <EM>width</EM>]
+       <STRONG>infocmp</STRONG>   [<STRONG>-1cCdDeEFgGiIKlLnpqrtTuUVWx]</STRONG>  [<STRONG>-A</STRONG> <EM>directory</EM>]  [<STRONG>-B</STRONG> <EM>directory</EM>]
+              [<STRONG>-Q</STRONG> <EM>encoding</EM>]   [<STRONG>-R</STRONG> <EM>subset</EM>]   [<STRONG>-s</STRONG> <EM>key</EM>]   [<STRONG>-v</STRONG> <EM>level</EM>]   [<STRONG>-w</STRONG> <EM>width</EM>]
               [<EM>terminal-type</EM> ... ]
 
 
@@ -468,48 +468,47 @@ <H1 class="no-header">infocmp 1m 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>
-       and <STRONG>-t</STRONG> options are not supported in SVr4 curses.
+       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-E</STRONG>, <STRONG>-f</STRONG>, <STRONG>-F</STRONG>, <STRONG>-g</STRONG>, <STRONG>-G</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG>, <STRONG>-Q</STRONG>, <STRONG>-R</STRONG>, <STRONG>-t</STRONG>, <STRONG>-T</STRONG>,
+       and <STRONG>-V</STRONG> options are <EM>ncurses</EM> extensions.
 
-       SVr4   infocmp   does  not  distinguish  between  absent  and  canceled
-       capabilities.  Also, it shows missing integer capabilities as  <STRONG>-1</STRONG>  (the
-       internal   value   used   to   represent   missing   integers).    This
-       implementation shows those as  "NULL",  for  consistency  with  missing
-       strings.
 
-       The  <STRONG>-r</STRONG>  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 <STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open  Curses,  Issue 7 (2009) specifies <EM>infocmp</EM>.  It does not mention
+       options for producing descriptions in <EM>termcap</EM> format.
 
+       SVr4  <EM>infocmp</EM>  does  not  distinguish  between  absent   and   canceled
+       capabilities.   It  furthermore reports missing integer capabilities as
+       <STRONG>-1</STRONG> (its internal representation).  <EM>ncurses</EM> shows these  as  "NULL"  for
+       consistency with missing string capabilities.
 
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  7 (2009) provides a description of <STRONG>infocmp</STRONG>.  It
-       does not mention the options used for converting to termcap format.
+       The  <STRONG>-r</STRONG>  option  of  <EM>ncurses</EM> <EM>infocmp</EM> uses SVr4's notion of of "termcap"
+       capabilities.  BSD <EM>curses</EM> had a more restricted set.  To see only those
+       present in 4.4BSD, use "<STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Although System V Release 2 provided a  terminfo  library,  it  had  no
+       Although  System  V  Release  2  provided a terminfo library, it had no
        documented tool for decompiling the terminal descriptions.  Tony Hansen
        (AT&amp;T) wrote the first <STRONG>infocmp</STRONG> in early 1984, for System V Release 3.
 
-       Eric Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide  an
-       equivalent  <STRONG>infocmp</STRONG>  for  <EM>ncurses</EM>.   In  addition,  he  added a few new
+       Eric  Raymond  used  the  AT&amp;T  documentation  in  1995  to  provide an
+       equivalent <STRONG>infocmp</STRONG> for <EM>ncurses</EM>.   In  addition,  he  added  a  few  new
        features such as:
 
-       <STRONG>o</STRONG>   the  <STRONG>-e</STRONG>  option,  to  support   <EM>fallback</EM>   (compiled-in)   terminal
+       <STRONG>o</STRONG>   the   <STRONG>-e</STRONG>   option,   to  support  <EM>fallback</EM>  (compiled-in)  terminal
            descriptions
 
        <STRONG>o</STRONG>   the <STRONG>-i</STRONG> option, to help with analysis
 
-       Later,  Thomas  Dickey added the <STRONG>-x</STRONG> (user-defined capabilities) option,
-       and the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with  user-defined
+       Later, Thomas Dickey added the <STRONG>-x</STRONG> (user-defined  capabilities)  option,
+       and  the  <STRONG>-E</STRONG>  option  to  support  fallback  entries  with user-defined
        capabilities.
 
        For a complete list, see the <EM>EXTENSIONS</EM> section.
 
-       In  2010,  Roy  Marples  provided an <STRONG>infocmp</STRONG> program for NetBSD.  It is
-       less capable than the SVr4 or <EM>ncurses</EM>  versions  (e.g.,  it  lacks  the
-       sorting  options  documented in X/Open), but does include the <STRONG>-x</STRONG> option
+       In 2010, Roy Marples provided an <STRONG>infocmp</STRONG> program  for  NetBSD.   It  is
+       less  capable  than  the  SVr4  or <EM>ncurses</EM> versions (e.g., it lacks the
+       sorting options documented in X/Open), but does include the  <STRONG>-x</STRONG>  option
        adapted from <EM>ncurses</EM>.
 
 
@@ -530,7 +529,7 @@ <H1 class="no-header">infocmp 1m 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-14                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2024-09-21                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 0c3e071fd..a0a6aa8c5 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp @
+  * @Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240914).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20240921).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -188,12 +188,12 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        VT100 and other terminals.  See <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
        <EM>curses</EM> is implemented using the operating system's terminal driver; key
-       events are received not as scan codes but as byte sequences.  Graphical
-       keycaps  (alphanumeric  and punctuation keys, and the space) appear as-
-       is.  Everything else, including the tab, enter/return,  keypad,  arrow,
-       and function keys, appears as a control character or a multibyte <EM>escape</EM>
-       <EM>sequence.</EM>  <EM>curses</EM> can translate the latter into unique <EM>key</EM> <EM>codes.</EM>   See
-       <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> and <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+       events are received not as scan  codes  but  as  byte  sequences.   The
+       driver  reports  graphical  keycaps (alphanumeric and punctuation keys,
+       and  the  space)  as-is.    Everything   else,   including   the   tab,
+       enter/return,  keypad, arrow, and function keys, appears to <EM>curses</EM> as a
+       control character or a multibyte <EM>escape</EM> <EM>sequence.</EM>  <EM>curses</EM> can translate
+       the latter into unique <EM>key</EM> <EM>codes.</EM>  See <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> and <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
 
        <EM>ncurses</EM> provides reimplementations of the SVr4 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>, <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>, and
        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>  libraries;  they  permit   overlapping   windows   and   ease
@@ -308,11 +308,11 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
                           structure,  not  combined  into  an  integer  as  in
                           <EM>chtype</EM>.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+                 Each cell of a <EM>WINDOW</EM> is stored as a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.   <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>
+                 and <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG> store and retrieve <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> data.
 
-                 <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG> and  <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>  store  and  retrieve  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
-                 data.   The  wide  library API of <EM>ncurses</EM> depends on two data
-                 types standardized by ISO C95.
+                 The  wide  library  API  of <EM>ncurses</EM> depends on two data types
+                 standardized by ISO C95.
 
                  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype</EM>, it may be  an
                           alias  of <EM>int</EM>.  Depending on the character encoding,
@@ -324,9 +324,9 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
                           base  glyph  with  which  it combines, and typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <STRONG>WEOF</STRONG>,
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <EM>WEOF</EM>,
                           analogously  to the <EM>int</EM>-sized character manipulation
-                          functions of ISO C and its constant <STRONG>EOF</STRONG>.
+                          functions of ISO C and its constant <EM>EOF</EM>.
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
@@ -1089,7 +1089,7 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        the default location.
 
        <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
-           tree using subdirectories named by the common first letters of  the
+           tree using subdirectories named for the common first letters of the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
@@ -1498,7 +1498,7 @@ <H1 class="no-header">ncurses 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index bc2291730..7d6b42c6f 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp @
+  * @Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-09-14 ncurses 6.5 User commands</TITLE>
+<TITLE>tabs 1 2024-09-21 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tabs 1 2024-09-21 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -203,7 +203,7 @@ <H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
            the   <STRONG>set_left_margin</STRONG>   (<STRONG>smgl</STRONG>)   or   <STRONG>set_left_margin_parm</STRONG>  (<STRONG>smglp</STRONG>)
            capabilities needed to support the feature.
 
-       <STRONG>o</STRONG>   Unlike <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <EM>tabs</EM> has no specification in X/Open Curses Issue 7.
+       <STRONG>o</STRONG>   Unlike <EM>tput</EM>, <EM>tabs</EM> has no specification in X/Open Curses Issue 7.
 
        The <STRONG>-d</STRONG> (debug) and  <STRONG>-n</STRONG>  (no-op)  options  are  <EM>ncurses</EM>  extensions  not
        provided by other implementations.
@@ -215,7 +215,7 @@ <H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
        same  year);  it  supported an option "-n" to set the first tab stop at
        the left margin.  That option is not specified by POSIX.
 
-       The PWB/Unix <STRONG>tabs</STRONG> utility returned  in  System  III  (1980),  and  used
+       The PWB/Unix <EM>tabs</EM> utility returned  in  System  III  (1980),  and  used
        built-in  tables  to  support  a half-dozen hardcopy terminal (printer)
        types.  It also had logic to support setting the left margin,  as  well
        as a feature for copying the tab settings from a file.
@@ -231,14 +231,14 @@ <H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
        motivation,  though an introductory comment "and optionally adjusts the
        margin"  remains,  overlooked  in  the  removal.   The   <EM>tabs</EM>   utility
        documented  in Issues 6 and later has no mechanism for setting margins.
-       The <STRONG>+m</STRONG> option in <EM>ncurses</EM> <EM>tabs</EM> (<STRONG>tabs</STRONG>) differs from the SVr4  feature  by
-       using terminal capabilities rather than built-in tables.
+       The <STRONG>+m</STRONG> option in <EM>ncurses</EM>'s implementation differs from the SVr4 feature
+       by using terminal capabilities rather than built-in tables.
 
        POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
        implementations impose one; the limit is 20 in PWB/Unix's <EM>tabs</EM> utility.
        While  some  terminals may not accept an arbitrary number of tab stops,
-       <EM>ncurses</EM> <STRONG>tabs</STRONG> attempts to set tab stops up to the right  margin  if  the
-       list thereof is sufficiently long.
+       <EM>ncurses</EM> attempts to set tab stops up to the right margin  if  the  list
+       thereof is sufficiently long.
 
        The  "Rationale" section of the Issue 6 <EM>tabs</EM> reference page details how
        the committee considered  redesigning  the  <EM>tabs</EM>  and  <EM>tput</EM>  utilities,
@@ -257,7 +257,7 @@ <H1 class="no-header">tabs 1 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2024-09-21                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 9168cdfae..b8644d32d 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240914).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20240921).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -2108,7 +2108,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        <STRONG>o</STRONG>   Tektronix-like terminals have a predefined set of <EM>N</EM> colors (where <EM>N</EM>
            is usually 8), and can set character-cell foreground and background
-           characters independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
+           colors independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
 
        <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
            separately  (foreground  and  background  are   not   independently
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index b421d2ba1..047b853f8 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp @
+  * @Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>wresize 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -60,27 +60,28 @@ <H1 class="no-header">wresize 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wresize</STRONG>,  an  <EM>ncurses</EM>  extension  to  the  <EM>curses</EM>  library, reallocates
        storage for <EM>win</EM>, adjusting its dimensions to  <EM>lines</EM>  and  <EM>columns</EM>.   If
-       either  dimension  is  larger than its current value, <EM>ncurses</EM> fills the
-       expanded part of the window with  the  blank  character  configured  by
-       <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character API users: <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
+       either dimension is larger than its current value, <EM>ncurses</EM> the expanded
+       part of the window is filled with blanks merged with current background
+       rendition  (configured  by  <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>,  or  by  wide-character  API:
+       <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wresize</STRONG>  returns  <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.  It fails if either
-       <EM>lines</EM> or <EM>columns</EM> is less than or equal to zero, or if an  error  occurs
+       <STRONG>wresize</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.  It fails  if  either
+       <EM>lines</EM>  or  <EM>columns</EM> is less than or equal to zero, or if an error occurs
        while (re)allocating memory for <EM>win</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  only restriction placed on the values of <EM>lines</EM> and <EM>columns</EM> is that
-       they be greater than zero.  They are <EM>not</EM> compared to the dimensions  of
-       the  <EM>curses</EM> screen; this keeps the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.  The
-       caller must ensure that  <EM>win</EM>'s  dimensions  fit  within  those  of  the
+       The only restriction placed on the values of <EM>lines</EM> and <EM>columns</EM> is  that
+       they  be greater than zero.  They are <EM>not</EM> compared to the dimensions of
+       the <EM>curses</EM> screen; this keeps the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.   The
+       caller  must  ensure  that  <EM>win</EM>'s  dimensions  fit  within those of the
        screen.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>wresize</STRONG>  is  an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in SVr4 <EM>curses</EM>,
+       <STRONG>wresize</STRONG> is an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in  SVr4  <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
@@ -88,14 +89,14 @@ <H1 class="no-header">wresize 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       NetBSD  <EM>curses</EM> adopted <EM>wresize</EM> in 2001 (release 1.5.3), and <EM>PDCurses</EM> in
+       NetBSD <EM>curses</EM> adopted <EM>wresize</EM> in 2001 (release 1.5.3), and <EM>PDCurses</EM>  in
        2004 (version 2.7).
 
        It is not possible to resize windows with SVr4 <EM>curses</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Thomas Dickey developed <EM>wresize</EM> as an extension to BSD <EM>curses</EM> in  1988,
+       Thomas  Dickey developed <EM>wresize</EM> as an extension to BSD <EM>curses</EM> in 1988,
        and brought it to <EM>ncurses</EM> in mid-1995.
 
 
@@ -108,7 +109,7 @@ <H1 class="no-header">wresize 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2024-09-21                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 187911c4c..c70b8a869 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp $
-.TH curs_addch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp $
+.TH curs_addch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -149,8 +149,9 @@ are equivalent to calling
 followed by
 .RB \%( w ) refresh .
 .I curses
-interprets these functions as a hint that only a single character is
-being output;
+interprets these functions as a hint to its optimizer
+that only a single character cell in the window
+is being altered between refreshes;
 for non-control characters,
 a considerable performance gain may be enjoyed by employing them.
 .\" TODO: Combine the following with the "Line Drawing" subsection of
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 9072b2938..37a466d9a 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp $
-.TH curs_attr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp $
+.TH curs_attr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -589,7 +589,7 @@ pads, soft-keys were added in SVr3, and
 Goodheart did not mention the background character or the
 .I \%cchar_t
 type.
-Those are respectively SVr4 and X/Open features.
+Those are respectively SVr3.1 and X/Open features.
 He did mention the \fBA_\fP constants, but did not indicate their values.
 Those were not the same in different systems,
 even for those marked as System V.
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 9ef707f3c..d7fb06c7d 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp $
-.TH curs_bkgd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp $
+.TH curs_bkgd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,28 +64,31 @@ manipulate background of a \fIcurses\fR window of characters
 \fBchtype getbkgd(WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
-The
-.I background
-of a
+Every
 .I curses
-window
-(in the library's non-wide configuration)
-is a
+window has a background property.
+In the library's non-wide configuration,
+this property is a
 .I \%chtype
-combining a set of attributes
-(see \fB\%curs_attr\fP(3X))
-with a character called the
-.I "blank character."
-.PP
-The blank character is a spacing character that populates a window's
-character cells when their contents are erased without replacement.
-The background's attributes are combined with all non-blank characters
-written to the window,
+which combines a set of attributes with the
+.I "background character"
+(see \fB\%curs_attr\fP(3X)).
+The background character is a spacing character.
+.PP
+When erasing parts of the screen,
+.I curses
+fills the cells with the background character.
+.I curses
+also uses the window background when writing characters to the screen:
+.bP
+The attribute part of the background is combined with all
+non-blank characters that are written into the window,
 as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
 functions.
+.bP
+Both the character and attribute parts of the background are combined with
+blank characters that are written into the window.
 .PP
-The blank character and attributes of the background combine with
-characters written to the window as described below.
 The background becomes a property of the character and moves with it
 through any scrolling and insert/delete line/character operations.
 .PP
@@ -111,11 +114,11 @@ The library applies to following procedure to each cell in the window,
 whether or not it is blank.
 .bP
 .I \%ncurses
-first compares the cell's character to the previously specified blank
-character;
+first compares the cell's character to the previously specified
+background character;
 if they match,
 .I \%ncurses
-writes the new blank character to the cell.
+writes the new background character to the cell.
 .bP
 .I \%ncurses
 then checks if the cell uses color,
@@ -141,8 +144,12 @@ updates only the non-color attributes,
 first removing those that may have come from the current background,
 and then adding attributes from the new background.
 .PP
+If the new background's character is nonspacing,
+.I \%ncurses
+reuses the old background character,
+except for one special case:
 .I \%ncurses
-treats a background character value of zero (0) as a blank character.
+treats a background character value of zero (0) as a space.
 .PP
 If the terminal does not support color,
 or if color has not been initialized with \fB\%start_color\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index f7ea27208..41412b9b9 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp $
-.TH curs_bkgrnd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp $
+.TH curs_bkgrnd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,29 +66,31 @@ manipulate background of a \fIcurses\fP window of wide characters
 \fBint wgetbkgrnd(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
 .fi
 .SH DESCRIPTION
-The
-.I background
-of a
+Every
 .I curses
-window
-(in the library's wide configuration)
-is a
+window has a background property.
+In the library's wide configuration,
+this property is a
 .I \%cchar_t
-combining a set of attributes
+which combines a set of attributes with the
+.I "background character"
 (see \fB\%curs_attr\fP(3X))
-with the window's blank character.
+The background character is a spacing character.
 .PP
-The
-.I "blank character"
-is a spacing complex character that populates a window's character cells
-when their contents are erased without replacement.
-The background's attributes are combined with all non-blank characters
-written to the window,
+When erasing parts of the screen,
+.I curses
+fills the cells with the background character.
+.I curses
+also uses the window background when writing characters to the screen:
+.bP
+The attribute part of the background is combined with all
+non-blank characters that are written into the window,
 as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
 functions.
+.bP
+Both the character and attribute parts of the background are combined with
+blank characters that are written into the window.
 .PP
-The blank character and attributes of the background combine with
-characters written to the window as described below.
 The background becomes a property of the character and moves with it
 through any scrolling and insert/delete line/character operations.
 .PP
@@ -114,11 +116,11 @@ The library applies to following procedure to each cell in the window,
 whether or not it is blank.
 .bP
 .I \%ncurses
-first compares the cell's character to the previously specified blank
-character;
+first compares the cell's character to the previously specified
+background character;
 if they match,
 .I \%ncurses
-writes the new blank character to the cell.
+writes the new background character to the cell.
 .bP
 .I \%ncurses
 then checks if the cell uses color,
@@ -144,8 +146,12 @@ updates only the non-color attributes,
 first removing those that may have come from the current background,
 and then adding attributes from the new background.
 .PP
+If the new background's character is nonspacing,
+.I \%ncurses
+reuses the old background character,
+except for one special case:
 .I \%ncurses
-treats a background character value of zero (0) as a blank character.
+treats a background character value of zero (0) as a space.
 .PP
 If the terminal does not support color,
 or if color has not been initialized with \fB\%start_color\fP(3X),
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 260969325..df6ff230a 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp $
-.TH curs_delch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp $
+.TH curs_delch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -60,7 +60,7 @@ deletes the character at the cursor position in
 .IR win .
 It moves all characters to the right of the cursor on the same line to
 the left one position and replaces the contents of the rightmost
-position on the line with the window's blank character;
+position on the line with the window's background character;
 see \fB\%bkgd\fP(3X)
 (wide-character API users: \fB\%bkgrnd\fP(3X)).
 The cursor position does not change
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 7af323238..b85c30a28 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp $
-.TH curs_deleteln 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp $
+.TH curs_deleteln 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,15 +69,18 @@ all lines below it move up one line.
 .I curses
 then fills the bottom line of
 .I win
-with the blank character
+with the background character
 configured by \fB\%wbkgdset\fP(3X)
 (wide-character API users: \fB\%wbkgrndset\fP(3X)).
 The cursor position does not change.
 .PP
 .B \%winsertln
-inserts a line of blank characters above the line at the cursor in
-.IR win ;
-the content of the window's bottom line is lost.
+inserts a new, empty line of characters above the line at the cursor in
+.IR win ,
+shifting the existing lines down by one.
+The content of the window's bottom line is lost;
+.I curses
+fills the new line with the background character.
 The cursor position does not change.
 .PP
 .B \%winsdelln
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 699a7a6de..6ac1f2e96 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp $
-.TH curs_initscr 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp $
+.TH curs_initscr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -56,65 +56,149 @@ initialize, manipulate, or tear down \fIcurses\fR terminal interface
 .nf
 \fB#include <curses.h>
 .PP
-\fBWINDOW *initscr(void);
+\fBWINDOW * initscr(void);
 \fBint endwin(void);
 .PP
 \fBbool isendwin(void);
 .PP
-\fBSCREEN *newterm(const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
-\fBSCREEN *set_term(SCREEN *\fInew\fP);
-\fBvoid delscreen(SCREEN* \fIsp\fP);
+\fBSCREEN * newterm(const char * \fItype\fP, FILE * \fIoutf\fP, FILE * \fIinf\fP);
+\fBSCREEN * set_term(SCREEN * \fInew\fP);
+\fBvoid delscreen(SCREEN * \fIsp\fP);
 .fi
 .SH DESCRIPTION
 .SS initscr
-\fBinitscr\fP is normally the first \fBcurses\fP routine to call when
-initializing a program.
-A few special routines sometimes need to be called before it;
-these are \fBslk_init\fP(3X), \fBfilter\fP, \fBripoffline\fP,
-\fBuse_env\fP.
-For multiple-terminal applications,
-\fBnewterm\fP may be called before \fBinitscr\fP.
+.B \%initscr
+determines the terminal type and initializes the library's
+.IR SCREEN ","
+.IR WINDOW ","
+and other data structures.
+It is normally the first
+.I curses
+function call a program performs.
+However,
+an application with unusual needs might employ a few other
+.I curses
+functions beforehand:
+.bP
+\fB\%slk_init\fP(3X) to set up soft-label keys;
+.bP
+\fB\%filter\fP(3X) if the program is designed to operate in a process
+pipeline;
+.bP
+\fB\%ripoffline\fP(3X) to reserve up to five lines at the top and/or
+bottom of the screen from management by
+.BR \%stdscr ","
+the standard
+.I curses
+window;
+and
+.bP
+\fB\%use_env\fP(3X) and/or \fB\%use_tioctl\fP(3X) to configure use of
+the process environment and operating system's terminal driver,
+respectively,
+when determining the dimensions of the terminal display.
 .PP
-The initscr code determines the terminal type and initializes all \fBcurses\fP
-data structures.
-\fBinitscr\fP also causes the first call to \fB\%refresh\fP(3X)
-to clear the screen.
-If errors occur, \fBinitscr\fP writes an appropriate error
-message to standard error and exits;
-otherwise, a pointer is returned to \fBstdscr\fP.
-.SS newterm
-A program that outputs to more than one terminal should use the \fBnewterm\fP
-routine for each terminal instead of \fBinitscr\fP.
-A program that needs to inspect capabilities,
-so it can continue to run in a line-oriented mode if the
-terminal cannot support a screen-oriented program, would also use
-\fBnewterm\fP.
+Further,
+a
+.I curses
+program might call
+.B \%newterm
+prior to or instead of
+.B \%initscr
+in two specialized cases described in its subsection below.
 .PP
-The routine \fBnewterm\fP should be called once for each terminal.
-It returns a variable of type \fISCREEN *\fP which should be saved
-as a reference to that terminal.
-\fBnewterm\fP's arguments are
+.B \%initscr
+causes the first \fB\%refresh\fP(3X) call to clear the screen.
+If errors occur,
+.B \%initscr
+writes an appropriate diagnostic message to the standard error stream
+and exits;
+otherwise,
+it returns a pointer to
+.BR stdscr "."
+.SS newterm
+An application that manages multiple terminals should call
+.B \%newterm
+once for each such device
+.I instead
+of
+.BR \%initscr "."
+.BR \%newterm 's
+arguments are
 .bP
-the \fItype\fP of the terminal to be used in place of \fB$TERM\fP,
+the
+.I type
+of the associated terminal,
+or
+.I NULL
+to use the
+.I TERM
+environment variable;
 .bP
-an output stream connected to the terminal, and
+an output stream
+.I outf
+connected to the terminal;
+and
 .bP
-an input stream connected to the terminal
+an input stream
+.I inf
+connected to the terminal.
+It returns a variable of structure type
+.I SCREEN
+.BR * ","
+which should be saved for later use with
+.B \%set_term
+and
+.BR \%delscreen "."
 .PP
-If the \fItype\fP parameter is \fBNULL\fP, \fB$TERM\fP will be used.
+.B \%newterm
+passes the file descriptor of the output stream to the
+.I \%term\%info
+function \fB\%setupterm\fP(3X),
+which returns a pointer to a
+.I \%TERMINAL
+structure that
+.B \%newterm
+stores in the
+.I SCREEN
+it returns to the application.
 .PP
-The file descriptor of the output stream is passed to \fBsetupterm\fP(3X),
-which returns a pointer to a \fI\%TERMINAL\fP structure.
-\fBnewterm\fP's return value holds a pointer to the \fI\%TERMINAL\fP structure.
+An application that needs to inspect a terminal type's capabilities,
+so that it can continue to run in a line-oriented mode
+if the terminal cannot support a screen-oriented program,
+would also use
+.BR \%newterm "."
+If at most one terminal connection is needed,
+the programmer could perform such a capability test,
+decide which mode in which to operate,
+then call
+.B \%delscreen
+on the pointer returned by
+.BR \%newterm ","
+and proceed with either
+.B \%initscr
+or a
+.RI non- curses
+interface.
 .SS endwin
 The program must also call
-\fBendwin\fP for each terminal being used before exiting from \fBcurses\fP.
-If \fBnewterm\fP is called more than once for the same terminal, the first
-terminal referred to must be the last one for which \fBendwin\fP is called.
+.B \%endwin
+for each terminal being used before exiting from
+.IR curses "."
+If
+.B \%newterm
+is called more than once for the same terminal,
+the first terminal referred to must be the last one for which
+.B \%endwin
+is called.
 .PP
-A program should always call \fBendwin\fP before exiting or escaping from
-\fBcurses\fP mode temporarily.
-This routine
+A program should always call
+.B \%endwin
+before exiting the application
+or temporarily suspending
+.IR curses "'s"
+management of the terminal.
+.BR \%endwin ":"
 .bP
 resets colors to correspond with the default color pair 0,
 .bP
@@ -122,132 +206,200 @@ moves the cursor to the lower left-hand corner of the screen,
 .bP
 clears the remainder of the line so that it uses the default colors,
 .bP
-sets the cursor to normal visibility (see \fBcurs_set\fP(3X)),
+sets the cursor to normal visibility
+(see \fB\%curs_set\fP(3X)),
 .bP
-stops cursor-addressing mode using the \fIexit_ca_mode\fP terminal capability,
+if applicable,
+stops cursor-addressing mode using the
+.B \%exit_ca_mode
+.RB \%( rmcup )
+terminal capability,
+and
 .bP
-restores tty modes (see \fBreset_shell_mode\fP(3X)).
+restores terminal modes (see \fB\%reset_shell_mode\fP(3X)).
 .PP
-Calling \fB\%refresh\fP(3X) or \fBdoupdate\fP(3X) after a
-temporary escape causes the program to resume visual mode.
+Calling \fB\%refresh\fP(3X) or \fB\%doupdate\fP(3X) after a
+temporary escape causes
+.I curses
+to resume managing the terminal.
 .SS isendwin
-The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
-called without any subsequent calls to \fB\%wrefresh\fP,
-and \fBFALSE\fP otherwise.
+.B \%isendwin
+returns
+.B TRUE
+if
+.B \%endwin
+has been called without any subsequent calls to \fB\%wrefresh\fP(3X),
+and
+.B FALSE
+otherwise.
 .SS set_term
-The \fBset_term\fP routine is used to switch between different terminals.
-The screen reference \fInew\fP becomes the new current terminal.
-The previous terminal is returned by the routine.
-This is the only routine which manipulates \fISCREEN\fP pointers;
-all other routines affect only the current terminal.
+.B \%set_term
+re-orients the
+.I curses
+library's operations to another terminal
+when the application has arranged to manage more than one with
+.BR \%newterm "."
+.B \%set_term
+expects a
+.I SCREEN
+pointer previously returned by
+.B \%newterm
+as an argument,
+and returns the previous one.
+.B \%set_term
+is the only
+.I curses
+API function that manipulates
+.I SCREEN
+pointers;
+all others affect only the current terminal.
 .SS delscreen
-The \fBdelscreen\fP routine frees storage associated with the
-\fISCREEN\fP data structure.
-The \fBendwin\fP routine does not do
-this, so \fBdelscreen\fP should be called after \fBendwin\fP if a
-particular \fISCREEN\fP is no longer needed.
+.B \%delscreen
+frees the storage backing the supplied
+.I SCREEN
+pointer argument.
+.B \%endwin
+does not,
+so that an application can resume managing a terminal with
+.I curses
+after a
+(possibly conditional or temporary)
+suspension;
+see \fB\%curs_kernel\fP(3X).
+Call
+.B \%delscreen
+after
+.B \%endwin
+when a particular
+.I SCREEN
+structure
+is no longer needed.
 .SH RETURN VALUE
-\fBendwin\fP returns the integer \fBERR\fP upon failure and \fBOK\fP
-upon successful completion.
-.PP
-Routines that return pointers always return \fBNULL\fP on error.
+.B \%endwin
+returns
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open defines no error conditions.
-In this implementation
+In
+.IR \%ncurses ","
 .bP
-\fBendwin\fP returns
+.B \%endwin
+returns
 .B ERR
 if
 .RS
 .bP
-the terminal was not initialized, or
+the terminal was not initialized,
 .bP
-\fBendwin\fP is called more than once without updating the screen, or
+.B \%endwin
+is called more than once without updating the screen,
+or
 .bP
-\fBreset_shell_mode\fP(3X) return
+\fB\%reset_shell_mode\fP(3X) returns
 .BR ERR "."
 .RE
 .bP
-\fBnewterm\fP
+.B \%newterm
 returns
 .B ERR
-if it cannot allocate the data structures for the screen,
-or for the top-level windows within the screen,
-i.e.,
-\fBcurscr\fP, \fBnewscr\fP, or \fBstdscr\fP.
-.bP
-\fBset_term\fP
-returns no error.
+if it cannot allocate storage for the
+.I SCREEN
+data structure
+or the top-level windows thereof:
+.BR \%curscr ","
+.BR \%newscr ","
+and
+.BR \%stdscr "."
+.PP
+Functions that return pointers return
+.I NULL
+on error.
+In
+.IR \%ncurses ","
+.B \%set_term
+does not fail.
 .SH PORTABILITY
-These functions were described in X/Open Curses, Issue 4.
-As of 2015, the current document is X/Open Curses, Issue 7.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .SS Differences
 X/Open Curses specifies that portable applications must not
-call \fBinitscr\fP more than once:
+call \fB\%initscr\fP more than once:
 .bP
-The portable way to use \fBinitscr\fP is once only,
+The portable way to use \fB\%initscr\fP is once only,
 using \fB\%refresh\fP(3X)
-to restore the screen after \fBendwin\fP.
+to restore the screen after \fB\%endwin\fP.
 .bP
-This implementation allows using \fBinitscr\fP after \fBendwin\fP.
+This implementation allows using \fB\%initscr\fP after \fB\%endwin\fP.
 .PP
 Old versions of curses, e.g., BSD 4.4, would return a null pointer
-from \fBinitscr\fP when an error is detected, rather than exiting.
-It is safe but redundant to check the return value of \fBinitscr\fP
+from \fB\%initscr\fP when an error is detected, rather than exiting.
+It is safe but redundant to check the return value of \fB\%initscr\fP
 in X/Open Curses.
 .PP
-Calling \fBendwin\fP does not dispose of the memory allocated in \fBinitscr\fP
-or \fBnewterm\fP.
+Calling \fB\%endwin\fP does not dispose of the memory allocated in
+\fB\%initscr\fP or \fB\%newterm\fP.
 Deleting a \fISCREEN\fP provides a way to do this:
 .bP
-X/Open Curses does not say what happens to \fI\%WINDOW\fPs when \fBdelscreen\fP
+X/Open Curses does not say what happens to \fI\%WINDOW\fPs when
+\fB\%delscreen\fP
 \*(``frees storage associated with the \fISCREEN\fP\*(''
 nor does the SVr4 documentation help,
-adding that it should be called after \fBendwin\fP if a \fISCREEN\fP
+adding that it should be called after \fB\%endwin\fP if a \fISCREEN\fP
 is no longer needed.
 .bP
 However, \fI\%WINDOW\fPs are implicitly associated with a \fISCREEN\fP.
-so that it is reasonable to expect \fBdelscreen\fP to deal with these.
+so that it is reasonable to expect \fB\%delscreen\fP to deal with these.
 .bP
 SVr4 curses deletes the standard \fI\%WINDOW\fP structures
-\fBstdscr\fP and \fBcurscr\fP as well as a work area \fBnewscr\fP.
+\fB\%stdscr\fP and \fB\%curscr\fP as well as a work area \fB\%newscr\fP.
 SVr4 curses ignores other windows.
 .bP
 Since version 4.0 (1996),
 \fI\%ncurses\fP has maintained a list of all windows for each screen,
-using that information to delete those windows when \fBdelscreen\fP is called.
+using that information to delete those windows when \fB\%delscreen\fP is
+called.
 .bP
 NetBSD copied this feature of \fI\%ncurses\fP in 2001.
 PDCurses follows the SVr4 model,
 deleting only the standard \fI\%WINDOW\fP structures.
 .SS "High-level versus Low-level"
 Different implementations may disagree regarding the level of some functions.
-For example, \fISCREEN\fP (returned by \fBnewterm\fP) and
-\fI\%TERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
-the output stream.
-If an application switches screens using \fBset_term\fR,
-or switches terminals using \fBset_curterm\fP(3X),
+For example, \fISCREEN\fP (returned by \fB\%newterm\fP) and
+\fI\%TERMINAL\fP (returned by \fB\%setupterm\fP(3X)) hold file
+descriptors for the output stream.
+If an application switches screens using \fB\%set_term\fR,
+or switches terminals using \fB\%set_curterm\fP(3X),
 applications which use the output file descriptor can have different
 behavior depending on which structure holds the corresponding descriptor.
-.PP
-For example
 .bP
-NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fI\%TERMINAL\fP.
-\fI\%ncurses\fP and SVr4 use the descriptor in \fISCREEN\fP.
+NetBSD's
+.I \%baudrate
+function uses the descriptor in
+.IR \%TERMINAL "."
+.I \%ncurses
+and SVr4
+.I curses
+use the descriptor in
+.IR SCREEN "."
 .bP
 NetBSD and \fI\%ncurses\fP use the descriptor
 in \fI\%TERMINAL\fP
 for terminal I/O modes,
 e.g.,
-\fBdef_shell_mode\fP(3X),
-\fBdef_prog_mode\fP(3X).
+\fB\%def_shell_mode\fP(3X),
+\fB\%def_prog_mode\fP(3X).
 SVr4 curses uses the descriptor in \fISCREEN\fP.
-.SS "Unset \fITERM\fP Variable"
-If the \fITERM\fP variable is missing or empty, \fBinitscr\fP uses the
+.SS "Unset \f(BITERM\fP Variable"
+If the \fITERM\fP variable is missing or empty, \fB\%initscr\fP uses the
 value \*(``unknown\*('',
-which normally corresponds to a terminal entry with the \fIgeneric\fP
-(\fIgn\fP) capability.
-Generic entries are detected by \fBsetupterm\fP(3X)
+which normally corresponds to a terminal entry with the
+.B \%generic
+.RB ( gn )
+capability.
+Generic entries are detected by \fB\%setupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle
 a missing/empty \fITERM\fP variable differently.
@@ -271,7 +423,7 @@ with respect to signals.\|.\|.
 .RE
 .PP
 This implementation establishes signal handlers during initialization,
-e.g., \fBinitscr\fP or \fBnewterm\fP.
+e.g., \fB\%initscr\fP or \fB\%newterm\fP.
 Applications which must handle these signals should set up the corresponding
 handlers \fIafter\fP initializing the library:
 .TP 5
@@ -283,18 +435,18 @@ Although it \fIusually\fP works as expected, there are limitations:
 Walking the \fISCREEN\fP list is unsafe, since all list management
 is done without any signal blocking.
 .bP
-On systems which have \fBREENTRANT\fP turned on, \fBset_term\fP uses
+On systems which have \fB\%REENTRANT\fP turned on, \fB\%set_term\fP uses
 functions which could deadlock or misbehave in other ways.
 .bP
-\fBendwin\fP calls other functions,
+\fB\%endwin\fP calls other functions,
 many of which use \fI\%stdio\fP(3) or other library functions which are
 clearly unsafe.
 .RE
 .TP 5
 .B SIGTERM
-This uses the same handler as \fBSIGINT\fP, with the same limitations.
+This uses the same handler as \fB\%SIGINT\fP, with the same limitations.
 It is not mentioned in X/Open Curses, but is more suitable for this
-purpose than \fBSIGQUIT\fP (which is used in debugging).
+purpose than \fB\%SIGQUIT\fP (which is used in debugging).
 .TP 5
 .B SIGTSTP
 This handles the \fIstop\fP signal, used in job control.
@@ -324,8 +476,8 @@ parameter to
 .BR \%KEY_RESIZE "."
 .RE
 .IP
-At the same time, \fI\%ncurses\fP calls \fBresizeterm\fP to adjust the
-standard screen \fBstdscr\fP,
+At the same time, \fI\%ncurses\fP calls \fB\%resizeterm\fP to adjust the
+standard screen \fB\%stdscr\fP,
 and update other data such as \fBLINES\fP and \fBCOLS\fP.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index b343fda14..5ee8e95d4 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp $
-.TH curs_inopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp $
+.TH curs_inopts 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -366,7 +366,7 @@ configure the terminal driver's treatment of its input and output queues
 when it handles the interrupt,
 suspend,
 or quit characters under the normal (\*(``cooked\*('')
-or cbreak line discplines on POSIX systems;
+or cbreak line disciplines on POSIX systems;
 see \fI\%termios\fP(3).
 The default behavior is inherited from the terminal driver settings.
 Calling
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 40afb0eb6..c7b1a54d4 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp $
-.TH curs_kernel 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp $
+.TH curs_kernel 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -297,8 +297,8 @@ fails.
 .B \%ripoffline
 returns
 .B ERR
-if the maximum number of ripped-off lines
-exceeds the maximum (5).
+if the accumulated quantity of ripped-off lines
+would exceed the maximum (5).
 .SH NOTES
 .B \%getsyx
 is a macro;
diff --git a/man/curs_move.3x b/man/curs_move.3x
index eea39b2a8..001d5e91d 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp $
-.TH curs_move 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp $
+.TH curs_move 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -85,9 +85,9 @@ is outside the window boundaries.
 In
 .IR \%ncurses ,
 .B \%wmove
-fails if its
-.I \%WINDOW
-pointer argument is
+fails if
+.I win
+is
 .BR NULL .
 .SH NOTES
 .B \%move
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index ba9881e53..0cde3da8c 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp $
-.TH curs_scr_dump 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp $
+.TH curs_scr_dump 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -202,6 +202,19 @@ SVr4 documentation describes
 such that the dump data is also considered invalid
 \*(``if the time-stamp of the tty is old\*(''
 but does not define \*(``old\*(''.
+.PP
+As of 2024, PDCurses provides these functions.
+NetBSD curses does not provide these functions,
+although it provides \fB\%getwin\fP.
+.PP
+Other implementations of curses store the window in binary form.
+One drawback to binary form is that this makes the dump dependent upon
+the curses library's internal data structures.
+Rather than do that, ncurses stores the dump in textual form,
+allowing more flexible use of the data.
+For instance, SVr4 curses \fB\%scr_restore\fP requires that the
+dumped window have the same dimensions as the restored window.
+ncurses uses \fB\%wresize\fP to adjust the restored window size.
 .SH HISTORY
 SVr3 (1987) introduced
 .BR \%scr_dump ","
@@ -211,10 +224,13 @@ and
 SVr3.1 added
 .BR \%scr_set "."
 .SH SEE ALSO
+.na
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_refresh\fP(3X),
 \fB\%curs_util\fP(3X),
 \fB\%system\fP(3),
 \fB\%scr_dump\fP(5),
-\fB\%terminfo\fP(5)
+\fB\%terminfo\fP(5),
+\fB\%wresize\fP(3X)
+.ad
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 6815e974d..1db9532ac 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
-.TH curs_scroll 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp $
+.TH curs_scroll 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -67,7 +67,7 @@ every visible line we might number
 becomes line
 .IR i "\-1."
 The text of the top line in the window disappears and the bottom line
-is populated with blank characters;
+is populated with the background character;
 see \fB\%bkgd\fP(3X)
 (wide-character API users: \fB\%bkgrnd\fP(3X)).
 As an optimization,
@@ -158,7 +158,7 @@ actions on the next update.
 Neither SVr4
 .I curses
 nor X/Open Curses specify whether these functions zero the attributes or
-color pair identifier of the blank character.
+color pair identifier of the background character.
 In
 .IR \%ncurses ","
 they do not.
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 75fd276db..03215dac3 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp $
-.TH curs_termcap 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp $
+.TH curs_termcap 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,6 +40,9 @@
 .el   .ds '' ""
 .\}
 .
+.ie \n(.g .ds : \:
+.el       .ds : \" empty
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -505,7 +508,7 @@ to
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
 .\"   libtermlib/makefile
 and added another test program.
-The library remained much the same though 4.3BSD
+The library remained much the same through 4.3BSD
 (June 1986).
 4.4BSD-Lite
 (June 1994)
@@ -677,11 +680,9 @@ and modifies the data shared with,
 the \fItermcap\fP interface to accommodate the latter's limitation in
 this respect.
 .SH "SEE ALSO"
-.na
-.UR https://invisible\-island.net/ncurses/tctest.html
-\fITCTEST - A Termcap Test Utility\fP
+.UR https://\*:invisible\-\*:island\*:.net/\*:ncurses/\*:tctest\*:.html
+.I "TCTEST \(em A Termcap Test Utility"
 .UE
-.ad
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 5a40accff..8894f23ad 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp $
-.TH curs_util 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp $
+.TH curs_util 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -523,6 +523,7 @@ and
 and 6.0 (2015)
 .IR \%use_tioctl "." \" 20120714
 .SH SEE ALSO
+.na
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_inopts\fP(3X),
@@ -531,3 +532,4 @@ and 6.0 (2015)
 \fB\%curs_sp_funcs\fP(3X),
 \fB\%curs_variables\fP(3X),
 \fB\%legacy_coding\fP(3X)
+.ad
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index fe0ca63b8..2c27977d2 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
-.TH curs_variables 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp $
+.TH curs_variables 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -361,12 +361,10 @@ Consequently,
 most users have decided either to override the value,
 or to rely upon its default.
 .SH SEE ALSO
-.na
 .UR https://\*:unicode\*:.org/\*:reports/\*:tr29/
 [UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
 Segmentation\*(''
 .UE
-.ad
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_color\fP(3X),
diff --git a/man/infocmp.1m b/man/infocmp.1m
index e4de4219a..659a1752d 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp $
-.TH @INFOCMP@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp $
+.TH @INFOCMP@ 1M 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,7 +53,6 @@
 \fB@INFOCMP@\fP \-
 compare or print out \fIterminfo\fP descriptions
 .SH SYNOPSIS
-.na
 .HP
 .B @INFOCMP@
 .RB [ \-\
@@ -100,7 +99,6 @@ x\
 .IR width ]
 .RI [ \%terminal\%-type
 \&.\|.\|.\& ]
-.ad
 .SH DESCRIPTION
 \fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
 terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
@@ -605,41 +603,58 @@ using the \fB\-x\fP option of \fB@TIC@\fP.
 compiled terminal description database
 .SH EXTENSIONS
 The
-\fB\-0\fP,
-\fB\-1\fP,
-\fB\-E\fP,
-\fB\-F\fP,
-\fB\-G\fP,
-\fB\-Q\fP,
-\fB\-R\fP,
-\fB\-T\fP,
-\fB\-V\fP,
-\fB\-a\fP,
-\fB\-e\fP,
-\fB\-f\fP,
-\fB\-g\fP,
-\fB\-i\fP,
-\fB\-l\fP,
-\fB\-p\fP,
-\fB\-q\fP and
-\fB\-t\fP
-options are not supported in SVr4 curses.
+.BR \-0 ","
+.BR \-1 ","
+.BR \-a ","
+.BR \-e ","
+.BR \-E ","
+.BR \-f ","
+.BR \-F ","
+.BR \-g ","
+.BR \-G ","
+.BR \-i ","
+.BR \-l ","
+.BR \-p ","
+.BR \-q ","
+.BR \-Q ","
+.BR \-R ","
+.BR \-t ","
+.BR \-T ","
+and
+.B \-V
+options are
+.I \%ncurses
+extensions.
+.SH PORTABILITY
+X/Open Curses, Issue 7 (2009) specifies
+.IR \%infocmp "."
+It does not mention options for producing descriptions in
+.I \%term\%cap
+format.
 .PP
 SVr4
-infocmp does not distinguish between absent and canceled capabilities.
-Also, it shows missing integer capabilities as \fB\-1\fP
-(the internal value used to represent missing integers).
-This implementation shows those as \*(``NULL\*('',
-for consistency with missing strings.
+.I \%infocmp
+does not distinguish between absent and canceled capabilities.
+It furthermore reports missing integer capabilities as
+.B \-1
+(its internal representation).
+.I \%ncurses
+shows these as \*(``NULL\*(''
+for consistency with missing string capabilities.
 .PP
-The \fB\-r\fP 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 \fB\-r\fP \fB\-RBSD\fP.
-.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.
+The
+.B \-r
+option
+of
+.I \%ncurses
+.I \%infocmp
+uses SVr4's notion of of \*(``termcap\*('' capabilities.
+BSD
+.I curses
+had a more restricted set.
+To see only those present in 4.4BSD,
+use
+.RB \*(`` "\-r \-RBSD" \*(''.
 .SH HISTORY
 Although System V Release 2 provided a terminfo library,
 it had no documented tool for decompiling the terminal descriptions.
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 363546ec5..cb0784bab 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp $
-.TH ncurses 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp $
+.TH ncurses 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -333,17 +333,19 @@ See \fB\%addch\fP(3X).
 .I curses
 is implemented using the operating system's terminal driver;
 key events are received not as scan codes but as byte sequences.
-Graphical keycaps
+The driver reports graphical keycaps
 (alphanumeric and punctuation keys,
 and the space)
-appear as-is.
+as-is.
 Everything else,
 including the tab,
 enter/return,
 keypad,
 arrow,
 and function keys,
-appears as a control character or a multibyte
+appears to
+.I curses
+as a control character or a multibyte
 .I "escape sequence."
 .I curses
 can translate the latter into unique
@@ -566,11 +568,11 @@ Each cell of a
 .I \%WINDOW
 is stored as a
 .IR \%cchar_t .
-.PP
 \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
 store and retrieve
 .I \%cchar_t
 data.
+.PP
 The wide library API of
 .I \%ncurses
 depends on two data types standardized by ISO C95.
@@ -597,11 +599,11 @@ and typically does not advance the cursor.
 can store a
 .I \%wchar_t
 or the constant
-.BR \%WEOF ,
+.IR \%WEOF ,
 analogously to the
 .IR int -sized
 character manipulation functions of ISO C and its constant
-.BR \%EOF .
+.IR \%EOF .
 .RE
 .\"
 .SS "Function Name Index"
@@ -1578,7 +1580,7 @@ This variable overrides the default location.
 Descriptions in
 .I \%term\%info
 format are normally stored in a directory tree using subdirectories
-named by the common first letters of the terminal types named therein.
+named for the common first letters of the terminal types named therein.
 This is the scheme used in System\ V.
 .bP
 If
diff --git a/man/tabs.1 b/man/tabs.1
index 5147211c2..30df4dd6b 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp $
-.TH @TABS@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp $
+.TH @TABS@ 1 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -247,7 +247,8 @@ or
 .RB \%( smglp )
 capabilities needed to support the feature.
 .bP
-Unlike \fB@TPUT@\fP(1),
+Unlike
+.IR tput ,
 .I tabs
 has no specification in X/Open Curses Issue\ 7.
 .PP
@@ -276,7 +277,7 @@ left margin.
 That option is not specified by POSIX.
 .PP
 The PWB/Unix
-.B tabs
+.I tabs
 utility returned in System III (1980),
 and used built-in tables
 to support a half-dozen hardcopy terminal (printer) types.
@@ -315,10 +316,10 @@ margins.
 The
 .B +m
 option in
-.I \%ncurses
-.I tabs
-(\fB\%@TABS@\fP) differs from the SVr4 feature by using terminal
-capabilities rather than built-in tables.
+.IR \%ncurses 's
+implementation
+differs from the SVr4 feature by using terminal capabilities
+rather than built-in tables.
 .PP
 POSIX documents no limit on the number of tab stops.
 Other implementations impose one;
@@ -327,8 +328,8 @@ the limit is 20 in PWB/Unix's
 utility.
 While some terminals may not accept an arbitrary number of tab stops,
 .I \%ncurses
-\fB\%@TABS@\fP attempts to set tab stops up to the right margin if the
-list thereof is sufficiently long.
+attempts to set tab stops up to the right margin
+if the list thereof is sufficiently long.
 .PP
 The \*(``Rationale\*('' section of the Issue 6
 .I tabs
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 81e9cd09f..b47d2326b 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.152 2024/09/14 00:43:08 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.153 2024/09/21 17:54:42 Branden.Robinson Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -1629,8 +1629,8 @@ Tektronix-like
 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 \fIN\fP\ *\ \fIN\fP color pairs.
+character-cell foreground and background colors independently,
+mixing them 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).
diff --git a/man/wresize.3x b/man/wresize.3x
index f9db3d1e4..5b50c4d6d 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp $
-.TH wresize 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp $
+.TH wresize 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -55,9 +55,10 @@ and
 .IR columns "."
 If either dimension is larger than its current value,
 .I \%ncurses
-fills the expanded part of the window with the blank character
-configured by \fB\%wbkgdset\fP(3X)
-(wide-character API users: \fB\%wbkgrndset\fP(3X)).
+the expanded part of the window is filled with blanks merged with
+current background rendition
+(configured by \fB\%wbkgdset\fP(3X),
+or by wide-character API: \fB\%wbkgrndset\fP(3X)).
 .SH RETURN VALUE
 .B \%wresize
 returns
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 75b231c6b..f9307d76c 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.55 2024/09/14 22:16:56 tom Exp $
+# $Id: ncurses-config.in,v 1.56 2024/09/21 17:24:52 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
@@ -50,8 +50,6 @@ THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
-includesubdir="@includedir@/${THIS}"
-
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
 # in some special cases of installation using a relative path.
@@ -80,11 +78,14 @@ fi
 # the headers to include like this:
 #	<ncurses@LIB_SUFFIX@/curses.h>
 if [ x@WITH_OVERWRITE@ = xno ]; then
+	includesubdir="@includedir@/${THIS}"
 	case $includedir in
 	$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
 		;;
 	esac
+else
+	includesubdir="@includedir@"
 fi
 
 LIBS="@LIBS@"
@@ -95,20 +96,10 @@ else
 fi
 
 CFLAGS="@PKG_CFLAGS@"
-if [ "$includedir" != "/usr/include" ]; then
-	if [ "x@WITH_OVERWRITE@" = xno ]
-	then
-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-		CFLAGS="$CFLAGS -I${includesubdir}"
-	fi
-	[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-	CFLAGS="$CFLAGS-I${includedir}"
-	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
-	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
-	if [ "x$includetop" != "x$includedir" ]
-	then
-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
-		CFLAGS="$CFLAGS-I$includetop"
+if [ "$includesubdir" != "/usr/include" ]; then
+	CFLAGS="$CFLAGS -I${includesubdir}"
+	if [ "$includedir" != "/usr/include" ]; then
+		[ x@WITH_OVERWRITE@ = xno ] && CFLAGS="$CFLAGS -I${includedir}"
 	fi
 fi
 
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index f0ac0452e..5b53ec67c 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.73 2022/10/01 13:14:20 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.74 2024/09/22 20:41:58 tom Exp $)
 #
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -464,8 +464,11 @@ BEGIN		{
 		}
 END		{
 		if ( "$USE" != "generated" ) {
-			print "int main(void)"
-			print "{"
+			print  "static int link_test(int code)"
+			print  "{"
+			print  "  switch(code)"
+			print  "  {"
+			casenum = 1;
 			for (n = 1; n < start; ++n) {
 				value = calls[n];
 				if ( value !~ /P_POUNDC/ ) {
@@ -480,13 +483,15 @@ END		{
 					sub(/^/,"call_",value);
 					gsub(/ (a[0-9]|z) /, " 0 ", value);
 					gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
-					printf "\t%s;\n", value;
+					printf "    case %d: %s; break;\n", casenum++, value;
 				} else {
 					print value;
 				}
 			}
-			print "	return 0;"
-			print "}"
+			print  "  default: return 0; /* case did not exist */"
+			print  "  }"
+			print  "  return 1; /* case exists */"
+			print  "}"
 		}
 		}
 EOF1
@@ -527,3 +532,34 @@ $preprocessor $TMP 2>/dev/null \
 	-e '/#ident/d' \
 	-e '/#line/d' \
 | sed -f $ED4
+
+# a simple test-driver checks one or all of the linkages
+if test "$USE" = "implemented"
+then
+cat <<"EOF"
+int main(int argc, char *argv[])
+{
+	int n;
+	int rc;
+	if (argc > 1)
+	{
+		rc = !link_test(atoi(argv[1]));
+	}
+	else
+	{
+		rc = 0;
+		for (n = 1; ; ++n)
+		{
+			printf("TEST %d\n", n);
+			fflush(stdout);
+			if (!link_test(n))
+			{
+				rc = 1;
+				break;
+			}
+		}
+	}
+	return rc;
+}
+EOF
+fi
diff --git a/ncurses/base/lib_refresh.c b/ncurses/base/lib_refresh.c
index bcaa4624b..e43e28d6b 100644
--- a/ncurses/base/lib_refresh.c
+++ b/ncurses/base/lib_refresh.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_refresh.c,v 1.48 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: lib_refresh.c,v 1.49 2024/09/22 20:17:40 tom Exp $")
 
 NCURSES_EXPORT(int)
 wrefresh(WINDOW *win)
@@ -55,7 +55,7 @@ wrefresh(WINDOW *win)
 
     T((T_CALLED("wrefresh(%p)"), (void *) win));
 
-    if (win == 0) {
+    if (SP_PARM == NULL || win == NULL) {
 	code = ERR;
     } else if (win == CurScreen(SP_PARM)) {
 	CurScreen(SP_PARM)->_clear = TRUE;
@@ -92,7 +92,7 @@ wnoutrefresh(WINDOW *win)
 
     T((T_CALLED("wnoutrefresh(%p)"), (void *) win));
 
-    if (win == NULL)
+    if (SP_PARM == NULL || win == NULL)
 	returnCode(ERR);
 
     /*
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index 5f727688f..270cb4811 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.106 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.108 2024/09/22 20:20:36 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -960,7 +960,6 @@ replace_window(WINDOW *target, FILE *source)
 	}
     }
 #endif
-    delwin(target);
     return result;
 }
 
@@ -972,14 +971,17 @@ NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
 
     T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
 
-    if (_nc_access(file, R_OK) >= 0
+    if (SP_PARM != NULL
+	&& _nc_access(file, R_OK) >= 0
 	&& (fp = safe_fopen(file, BIN_R)) != 0) {
-	NewScreen(SP_PARM) = replace_window(NewScreen(SP_PARM), fp);
+	WINDOW *my_newscr = replace_window(NewScreen(SP_PARM), fp);
+	(void) fclose(fp);
+	if (my_newscr != NULL) {
+	    delwin(NewScreen(SP_PARM));
+	    NewScreen(SP_PARM) = my_newscr;
 #if !USE_REENTRANT
-	newscr = NewScreen(SP_PARM);
+	    newscr = my_newscr;
 #endif
-	(void) fclose(fp);
-	if (NewScreen(SP_PARM) != 0) {
 	    code = OK;
 	}
     }
@@ -1020,7 +1022,7 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
 
     T((T_CALLED("scr_init(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
 
-    if (SP_PARM != 0 &&
+    if (SP_PARM != NULL &&
 #ifdef USE_TERM_DRIVER
 	InfoOf(SP_PARM).caninit
 #else
@@ -1031,12 +1033,14 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
 
 	if (_nc_access(file, R_OK) >= 0
 	    && (fp = safe_fopen(file, BIN_R)) != 0) {
-	    CurScreen(SP_PARM) = replace_window(CurScreen(SP_PARM), fp);
+	    WINDOW *my_curscr = replace_window(CurScreen(SP_PARM), fp);
+	    (void) fclose(fp);
+	    if (my_curscr != NULL) {
+		delwin(CurScreen(SP_PARM));
+		CurScreen(SP_PARM) = my_curscr;
 #if !USE_REENTRANT
-	    curscr = CurScreen(SP_PARM);
+		curscr = my_curscr;
 #endif
-	    (void) fclose(fp);
-	    if (CurScreen(SP_PARM) != 0) {
 		code = OK;
 	    }
 	}
@@ -1059,7 +1063,8 @@ NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file)
 
     T((T_CALLED("scr_set(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
 
-    if (NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) {
+    if (SP_PARM != NULL
+	&& NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) {
 	delwin(NewScreen(SP_PARM));
 	NewScreen(SP_PARM) = dupwin(curscr);
 #if !USE_REENTRANT
diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index 5818f1142..e54b7df64 100644
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.55 2024/07/27 23:04:55 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.56 2024/09/22 20:25:15 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -105,6 +105,7 @@ NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols)
     T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
     returnCode(ToLines > 0
 	       && ToCols > 0
+	       && SP_PARM != NULL
 	       && (ToLines != screen_lines(SP_PARM)
 		   || ToCols != screen_columns(SP_PARM)));
 }
@@ -354,10 +355,10 @@ NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols)
 
     T((T_CALLED("resize_term(%p,%d,%d) old(%d,%d)"),
        (void *) SP_PARM, ToLines, ToCols,
-       (SP_PARM == 0) ? -1 : screen_lines(SP_PARM),
-       (SP_PARM == 0) ? -1 : screen_columns(SP_PARM)));
+       (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM),
+       (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM)));
 
-    if (SP_PARM == 0 || ToLines <= 0 || ToCols <= 0) {
+    if (SP_PARM == NULL || ToLines <= 0 || ToCols <= 0) {
 	returnCode(ERR);
     }
 
@@ -473,10 +474,10 @@ NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols)
 
     T((T_CALLED("resizeterm(%p, %d,%d) old(%d,%d)"),
        (void *) SP_PARM, ToLines, ToCols,
-       (SP_PARM == 0) ? -1 : screen_lines(SP_PARM),
-       (SP_PARM == 0) ? -1 : screen_columns(SP_PARM)));
+       (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM),
+       (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM)));
 
-    if (SP_PARM != 0 && ToLines > 0 && ToCols > 0) {
+    if (SP_PARM != NULL && ToLines > 0 && ToCols > 0) {
 	result = OK;
 	SP_PARM->_sig_winch = FALSE;
 
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 50a5769c3..ff1a7f379 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.37 2023/06/24 21:55:09 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.39 2024/09/21 15:12:56 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -247,6 +247,29 @@ _nc_env_access(void)
 }
 
 #ifndef USE_ROOT_ACCESS
+static int
+is_a_file(int fd)
+{
+    int result = FALSE;
+    if (fd >= 0) {
+	struct stat sb;
+	if (fstat(fd, &sb) == 0) {
+	    switch (sb.st_mode & S_IFMT) {
+	    case S_IFBLK:
+	    case S_IFCHR:
+	    case S_IFDIR:
+		/* disallow devices and directories */
+		break;
+	    default:
+		/* allow regular files, fifos and sockets */
+		result = TRUE;
+		break;
+	    }
+	}
+    }
+    return result;
+}
+
 /*
  * Limit privileges if possible; otherwise disallow access for updating files.
  */
@@ -263,6 +286,12 @@ _nc_safe_fopen(const char *path, const char *mode)
 	result = fopen(path, mode);
     }
 #endif
+    if (result != NULL) {
+	if (!is_a_file(fileno(result))) {
+	    fclose(result);
+	    result = NULL;
+	}
+    }
     return result;
 }
 
@@ -279,6 +308,12 @@ _nc_safe_open3(const char *path, int flags, mode_t mode)
 	result = open(path, flags, mode);
     }
 #endif
+    if (result >= 0) {
+	if (!is_a_file(result)) {
+	    close(result);
+	    result = -1;
+	}
+    }
     return result;
 }
 #endif /* USE_ROOT_ACCESS */
diff --git a/ncurses/wcwidth.h b/ncurses/wcwidth.h
index ab96bef13..5d181cdf6 100644
--- a/ncurses/wcwidth.h
+++ b/ncurses/wcwidth.h
@@ -1,4 +1,4 @@
-/* $Id: wcwidth.h,v 1.6 2024/05/04 18:44:25 tom Exp $ */
+/* $Id: wcwidth.h,v 1.7 2024/09/21 15:49:15 tom Exp $ */
 
 /*
  * Copyright 2002-2023,2024 by Thomas E. Dickey
@@ -124,6 +124,7 @@ extern "C" {
 #include <ncurses_dll.h>
 
 #include <wchar.h>
+#include <stdint.h>
 
 struct interval {
   unsigned long first;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4245a2f8d..72d8f0d70 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240914) unstable; urgency=low
+ncurses6td (6.5+20240922) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4245a2f8d..72d8f0d70 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240914) unstable; urgency=low
+ncurses6td (6.5+20240922) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bb9e57491..d26a574af 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240914) unstable; urgency=low
+ncurses6td (6.5+20240922) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Sep 2024 19:30:09 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 068c72cf6..cf437074c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.666 2024/09/13 23:30:09 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.668 2024/09/22 18:38:38 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0914"
+!define VERSION_MMDD  "0922"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index c9ec1a490..54175e2a9 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240914
+Release: 20240922
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 122431b16..fbffe01f3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240914
+Release: 20240922
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e776d3760..54aa4ca88 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240914
+Release: 20240922
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/back_ground.c b/test/back_ground.c
index c53c2a36b..04f4304ec 100644
--- a/test/back_ground.c
+++ b/test/back_ground.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2021,2022 Thomas E. Dickey                                     *
+ * Copyright 2021-2022,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $
+ * $Id: back_ground.c,v 1.11 2024/09/22 21:33:17 tom Exp $
  */
 
 #include <test.priv.h>
@@ -40,7 +40,7 @@
 
 static int default_bg = COLOR_BLACK;
 static int default_fg = COLOR_WHITE;
-static wchar_t wide_fill = L' ';
+static wchar_t fill_char = L' ';
 
 static wchar_t
 decode_wchar(const char *value)
@@ -78,7 +78,7 @@ test_background(void)
     }
     dump_window(stdscr);
 
-    blank[0] = wide_fill;
+    blank[0] = fill_char;
     blank[1] = L'\0';
 
     printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
@@ -182,6 +182,7 @@ usage(int ok)
 	," -a       invoke assume_default_colors, repeat to use in init_pair"
 #endif
 	," -b XXX   specify background color"
+	," -c XXX   specify background character"
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors, repeat to use in init_pair"
 #endif
@@ -214,7 +215,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:wW:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:wW:")) != -1) {
 	switch (ch) {
 #if HAVE_ASSUME_DEFAULT_COLORS
 	case 'a':
@@ -224,6 +225,17 @@ main(int argc, char *argv[])
 	case 'b':
 	    default_bg = color_code(optarg);
 	    break;
+	case 'c':
+	    if (strlen(optarg) > 1) {
+		char *check = NULL;
+		long value = strtol(optarg, &check, 0);
+		if (*check != '\0')
+		    usage(FALSE);
+		fill_char = (wchar_t) value;
+	    } else {
+		fill_char = *optarg;
+	    }
+	    break;
 #if HAVE_USE_DEFAULT_COLORS
 	case 'd':
 	    ++d_option;
@@ -237,10 +249,10 @@ main(int argc, char *argv[])
 		usage(FALSE);
 	    break;
 	case 'w':
-	    wide_fill = L'\u2591';
+	    fill_char = L'\u2591';
 	    break;
 	case 'W':
-	    wide_fill = decode_wchar(optarg);
+	    fill_char = decode_wchar(optarg);
 	    break;
 	case OPTS_VERSION:
 	    show_version(argv);
diff --git a/test/background.c b/test/background.c
index 5942debbb..63144cda9 100644
--- a/test/background.c
+++ b/test/background.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $
+ * $Id: background.c,v 1.27 2024/09/22 22:34:49 tom Exp $
  */
 
 #define NEED_COLOR_CODE 1
@@ -37,6 +37,7 @@
 
 static int default_bg = COLOR_BLACK;
 static int default_fg = COLOR_WHITE;
+static unsigned char fill_char = ' ';
 
 static void
 test_background(void)
@@ -45,6 +46,7 @@ test_background(void)
     int row;
     int chr;
 
+    printw("Background character %#x\n", fill_char);
     if (pair_content(0, &f, &b) == ERR) {
 	printw("pair 0 contains no data\n");
     } else {
@@ -54,13 +56,13 @@ test_background(void)
 
     printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
     init_pair(1, COLOR_RED, (NCURSES_COLOR_T) default_bg);
-    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
+    bkgdset((chtype) (fill_char | COLOR_PAIR(1)));
     printw("RED/BLACK\n");
     dump_window(stdscr);
 
     printw("Initializing pair 2 to %s/blue\n", color_name(default_fg));
     init_pair(2, (NCURSES_COLOR_T) default_fg, COLOR_BLUE);
-    bkgdset((chtype) (' ' | COLOR_PAIR(2)));
+    bkgdset((chtype) (fill_char | COLOR_PAIR(2)));
     printw("This line should be %s/blue\n", color_name(default_fg));
     dump_window(stdscr);
 
@@ -98,33 +100,33 @@ test_background(void)
     printw("j\n");
     dump_window(stdscr);
 
-    bkgdset((chtype) (' ' | COLOR_PAIR(0)));
+    bkgdset((chtype) (fill_char | COLOR_PAIR(0)));
     printw("Default Colors\n");
     dump_window(stdscr);
 
     printw("Resetting colors to pair 1\n");
-    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
+    bkgdset((chtype) (fill_char | COLOR_PAIR(1)));
     printw("This line should be red/%s\n", color_name(default_bg));
     dump_window(stdscr);
 
     printw("Setting screen to pair 0\n");
-    bkgd((chtype) (' ' | COLOR_PAIR(0)));
+    bkgd((chtype) (fill_char | COLOR_PAIR(0)));
     dump_window(stdscr);
 
     printw("Setting screen to pair 1\n");
-    bkgd((chtype) (' ' | COLOR_PAIR(1)));
+    bkgd((chtype) (fill_char | COLOR_PAIR(1)));
     dump_window(stdscr);
 
     printw("Setting screen to pair 2\n");
-    bkgd((chtype) (' ' | COLOR_PAIR(2)));
+    bkgd((chtype) (fill_char | COLOR_PAIR(2)));
     dump_window(stdscr);
 
     printw("Setting screen to pair 3\n");
-    bkgd((chtype) (' ' | COLOR_PAIR(3)));
+    bkgd((chtype) (fill_char | COLOR_PAIR(3)));
     dump_window(stdscr);
 
     printw("Setting screen to pair 0\n");
-    bkgd((chtype) (' ' | COLOR_PAIR(0)));
+    bkgd((chtype) (fill_char | COLOR_PAIR(0)));
     dump_window(stdscr);
 }
 
@@ -141,6 +143,7 @@ usage(int ok)
 	," -a       invoke assume_default_colors, repeat to use in init_pair"
 #endif
 	," -b XXX   specify background color"
+	," -c XXX   specify background character"
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors, repeat to use in init_pair"
 #endif
@@ -171,7 +174,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:")) != -1) {
 	switch (ch) {
 #if HAVE_ASSUME_DEFAULT_COLORS
 	case 'a':
@@ -181,6 +184,17 @@ main(int argc, char *argv[])
 	case 'b':
 	    default_bg = color_code(optarg);
 	    break;
+	case 'c':
+	    if (strlen(optarg) > 1) {
+		char *check = NULL;
+		long value = strtol(optarg, &check, 0);
+		if (*check != '\0')
+		    usage(FALSE);
+		fill_char = (unsigned char) value;
+	    } else {
+		fill_char = (unsigned char) *optarg;
+	    }
+	    break;
 #if HAVE_USE_DEFAULT_COLORS
 	case 'd':
 	    ++d_option;

From fcc7d1c331db1123fb03bd3919ec5cc2ea7e7682 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 29 Sep 2024 00:43:54 +0200
Subject: [PATCH 085/106] ncurses-6.5-20240928.patch.gz

---
 NEWS                             | 10 +++++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 misc/gen-pkgconfig.in            | 10 +++++-----
 misc/ncurses-config.in           | 10 +++++-----
 ncurses/base/lib_newwin.c        | 13 +++----------
 ncurses/base/lib_pad.c           |  8 ++++----
 ncurses/base/wresize.c           |  8 +++++---
 ncurses/curses.priv.h            |  4 +++-
 ncurses/tinfo/write_entry.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/infocmp.c                  | 32 +++++++++++++++++++++++++++-----
 test/back_ground.c               |  4 ++--
 19 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/NEWS b/NEWS
index 6dfb8a333..cc581e168 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4182 2024/09/22 20:50:07 tom Exp $
+-- $Id: NEWS,v 1.4185 2024/09/28 20:27:44 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20240928
+	+ improve error-message from infocmp when a terminal entry cannot be
+	  opened (patch by Branden Robinson).
+	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
+	  misc/ncurses-config.in
+	+ add check in wresize() for out-of-range dimensions (report by Peter
+	  Bierma). 
+
 20240922
 	+ add a few null-pointer checks in ncurses
 	+ improve test-driver in ncurses/link_test.c
diff --git a/VERSION b/VERSION
index d9f6bcb70..225aa120c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240922
+5:0:10	6.5	20240928
diff --git a/dist.mk b/dist.mk
index 65a3c162b..dd79379ef 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1633 2024/09/22 18:38:38 tom Exp $
+# $Id: dist.mk,v 1.1634 2024/09/28 09:53:21 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240922
+NCURSES_PATCH = 20240928
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 3affeefcc..c369dd26a 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.57 2024/06/22 21:02:53 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.58 2024/09/28 20:21:23 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
@@ -112,7 +112,7 @@ do
 		@LD_SEARCHPATH@) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
 			then
-				lib_first=yes
+				lib_first=no
 				IFS_save="$IFS"
 				IFS='|'
 				LIBDIRS="@LD_SEARCHPATH@"
@@ -120,11 +120,11 @@ do
 				do
 					if [ -d "$lib_check" ]
 					then
-						if [ "$lib_check" != "$libdir" ]
+						if [ "$lib_check" = "$libdir" ]
 						then
-							lib_first=no
+							lib_first=yes
+							break
 						fi
-						break
 					fi
 				done
 				IFS="$IFS_save"
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index f9307d76c..c671407cd 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.56 2024/09/21 17:24:52 tom Exp $
+# $Id: ncurses-config.in,v 1.57 2024/09/28 20:18:19 tom Exp $
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
@@ -132,7 +132,7 @@ do
 		@LD_SEARCHPATH@) # skip standard libdir
 			if [ "$lib_check" = "$libdir" ]
 			then
-				lib_first=yes
+				lib_first=no
 				IFS_save="$IFS"
 				IFS='|'
 				LIBDIRS="@LD_SEARCHPATH@"
@@ -140,11 +140,11 @@ do
 				do
 					if [ -d "$lib_check" ]
 					then
-						if [ "$lib_check" != "$libdir" ]
+						if [ "$lib_check" = "$libdir" ]
 						then
-							lib_first=no
+							lib_first=yes
+							break
 						fi
-						break
 					fi
 				done
 				IFS="$IFS_save"
diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index a6723197c..ef9da9265 100644
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #include <curses.priv.h>
 #include <stddef.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.76 2021/10/23 18:53:38 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.77 2024/09/28 15:55:56 tom Exp $")
 
 #define window_is(name) ((sp)->_##name == win)
 
@@ -255,13 +255,6 @@ subwin(WINDOW *w, int l, int c, int y, int x)
     returnWin(result);
 }
 
-static bool
-dimension_limit(int value)
-{
-    NCURSES_SIZE_T test = (NCURSES_SIZE_T) value;
-    return (test == value && value > 0);
-}
-
 NCURSES_EXPORT(WINDOW *)
 NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
 			      int num_lines,
@@ -281,7 +274,7 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
     if (SP_PARM == 0)
 	returnWin(0);
 
-    if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
+    if (!OK_DIMENSION(num_lines) || !OK_DIMENSION(num_columns))
 	returnWin(0);
 
     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
diff --git a/ncurses/base/lib_pad.c b/ncurses/base/lib_pad.c
index d4bd7f111..10ac53720 100644
--- a/ncurses/base/lib_pad.c
+++ b/ncurses/base/lib_pad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_pad.c,v 1.50 2021/10/23 22:57:27 tom Exp $")
+MODULE_ID("$Id: lib_pad.c,v 1.51 2024/09/28 15:40:42 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
@@ -197,8 +197,8 @@ pnoutrefresh(WINDOW *win,
 #endif /* TRACE */
 #if USE_SCROLL_HINTS
     if (win->_pad._pad_y >= 0) {
-	displaced = pminrow - win->_pad._pad_y
-	    - (sminrow - win->_pad._pad_top);
+	displaced = ((pminrow - win->_pad._pad_y) -
+		     (sminrow - win->_pad._pad_top));
 	T(("pad being shifted by %d line(s)", displaced));
     } else
 	displaced = 0;
diff --git a/ncurses/base/wresize.c b/ncurses/base/wresize.c
index 6d5589e27..576efa522 100644
--- a/ncurses/base/wresize.c
+++ b/ncurses/base/wresize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: wresize.c,v 1.43 2023/10/21 11:13:03 tom Exp $")
+MODULE_ID("$Id: wresize.c,v 1.44 2024/09/28 15:56:07 tom Exp $")
 
 static int
 cleanup_lines(struct ldat *data, int length)
@@ -125,9 +125,11 @@ wresize(WINDOW *win, int ToLines, int ToCols)
     }
 #endif
 
-    if (!win || --ToLines < 0 || --ToCols < 0)
+    if (!win || !OK_DIMENSION(ToLines) || !OK_DIMENSION(ToCols))
 	returnCode(ERR);
 
+    ToLines--;
+    ToCols--;
     size_x = win->_maxx;
     size_y = win->_maxy;
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 2d579b6c3..9a549c11c 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.690 2024/08/31 10:46:01 Rafael.Kitover Exp $
+ * $Id: curses.priv.h,v 1.691 2024/09/28 15:35:01 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1550,6 +1550,8 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 		((x) >= 0 && (x) <= (w)->_maxx && \
 		 (y) >= 0 && (y) <= (w)->_maxy))
 
+#define OK_DIMENSION(n)	((NCURSES_SIZE_T)(n) == (n) && (n) > 0)
+
 #define CHANGED_CELL(line,col) \
 	if (line->firstchar == _NOCHANGE) \
 		line->firstchar = line->lastchar = (NCURSES_SIZE_T) (col); \
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index df62a7a01..afe703b21 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.134 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.135 2024/09/28 17:31:09 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -153,8 +153,12 @@ make_db_path(char *dst, const char *src, size_t limit)
 	    rc = 0;
 	}
     } else {
-	if ((strlen(top) + strlen(src) + 6) <= limit) {
-	    _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
+	size_t len_top = strlen(top);
+	size_t len_src = strlen(src);
+	if ((len_top + len_src + 6) <= limit) {
+	    _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%.*s/%.*s",
+			(int) len_top, top,
+			(int) len_src, src);
 	    rc = 0;
 	}
     }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 72d8f0d70..5651c339d 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240922) unstable; urgency=low
+ncurses6td (6.5+20240928) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 72d8f0d70..5651c339d 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240922) unstable; urgency=low
+ncurses6td (6.5+20240928) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d26a574af..069f31a97 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240922) unstable; urgency=low
+ncurses6td (6.5+20240928) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2024 14:38:38 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index cf437074c..ac2f6bdfa 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.668 2024/09/22 18:38:38 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.669 2024/09/28 09:53:21 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0922"
+!define VERSION_MMDD  "0928"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 54175e2a9..085d645d1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240922
+Release: 20240928
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index fbffe01f3..1ae4700d3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240922
+Release: 20240928
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 54aa4ca88..f78c44975 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240922
+Release: 20240928
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index af2ad7790..e0621bc0e 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.164 2024/08/24 22:57:24 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.165 2024/09/28 20:26:22 Branden.Robinson Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -1878,10 +1878,32 @@ main(int argc, char *argv[])
 	    }
 
 	    if (status <= 0) {
-		(void) fprintf(stderr,
-			       "%s: couldn't open terminfo file %s.\n",
-			       _nc_progname,
-			       tfile[termcount]);
+		switch (status) {
+		case TGETENT_NO:
+		    (void) fprintf(stderr,
+				   "%s: error: no match in terminfo"
+				   " database for terminal type"
+				   " \"%s\"\n",
+				   _nc_progname,
+				   tname[termcount]);
+		    break;
+		case TGETENT_ERR:
+		    /*
+		     * Several database files might be checked; their
+		     * file names are not exposed via this API.  The
+		     * best we can do is report how the final one
+		     * attempted failed.  Also, tfile[termcount] is
+		     * deeply misleading when a hashed database is used.
+		     */
+		    (void) fprintf(stderr,
+				   "%s: error: unable to open terminfo"
+				   " database: %s\n",
+				   _nc_progname,
+				   strerror(errno));
+		    break;
+		default:
+		    assert(0 == "unhandled _nc_read_entry2 return");
+		}
 		MAIN_LEAKS();
 		ExitProgram(EXIT_FAILURE);
 	    }
diff --git a/test/back_ground.c b/test/back_ground.c
index 04f4304ec..bc866a1a5 100644
--- a/test/back_ground.c
+++ b/test/back_ground.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: back_ground.c,v 1.11 2024/09/22 21:33:17 tom Exp $
+ * $Id: back_ground.c,v 1.12 2024/09/28 16:19:19 tom Exp $
  */
 
 #include <test.priv.h>
@@ -233,7 +233,7 @@ main(int argc, char *argv[])
 		    usage(FALSE);
 		fill_char = (wchar_t) value;
 	    } else {
-		fill_char = *optarg;
+		fill_char = (wchar_t) *optarg;
 	    }
 	    break;
 #if HAVE_USE_DEFAULT_COLORS

From 026db3de77cf0c5cff632f11e63d1c60ffdb834d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 7 Oct 2024 01:44:01 +0200
Subject: [PATCH 086/106] ncurses-6.5-20241006.patch.gz

---
 NEWS                             |  6 +++-
 VERSION                          |  2 +-
 c++/cursesf.cc                   |  6 ++--
 c++/cursesf.h                    |  6 ++--
 c++/cursesm.cc                   |  6 ++--
 c++/cursesm.h                    |  6 ++--
 c++/cursesp.cc                   |  6 ++--
 c++/cursespad.cc                 |  6 ++--
 c++/cursslk.cc                   | 12 +++----
 c++/cursslk.h                    |  6 ++--
 dist.mk                          |  4 +--
 misc/terminfo.src                | 23 +++++++++---
 ncurses/base/lib_screen.c        |  4 +--
 ncurses/base/new_pair.c          |  4 +--
 ncurses/curses.priv.h            |  4 +--
 ncurses/new_pair.h               |  4 +--
 ncurses/tinfo/trim_sgr0.c        |  7 ++--
 ncurses/tty/lib_twait.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 +-
 test/blue.c                      | 10 +++---
 test/bs.c                        |  8 ++---
 test/cardfile.c                  | 12 +++----
 test/chgat.c                     |  6 ++--
 test/clip_printw.c               |  8 ++---
 test/color_name.h                |  6 ++--
 test/demo_defkey.c               |  4 +--
 test/demo_forms.c                | 22 ++++++------
 test/demo_menus.c                | 32 +++++++++--------
 test/demo_new_pair.c             |  4 +--
 test/demo_panels.c               | 16 ++++-----
 test/demo_termcap.c              | 18 +++++-----
 test/demo_terminfo.c             | 18 +++++-----
 test/dots.c                      |  6 ++--
 test/dots_mvcur.c                |  6 ++--
 test/dots_termcap.c              |  8 ++---
 test/dup_field.c                 | 14 ++++----
 test/filter.c                    |  6 ++--
 test/form_driver_w.c             |  6 ++--
 test/gdc.c                       | 10 +++---
 test/inch_wide.c                 |  6 ++--
 test/inchs.c                     |  6 ++--
 test/ins_wide.c                  |  6 ++--
 test/insdelln.c                  |  8 ++---
 test/inserts.c                   |  6 ++--
 test/knight.c                    |  7 ++--
 test/list_keys.c                 |  8 ++---
 test/move_field.c                | 18 +++++-----
 test/movewindow.c                | 16 ++++-----
 test/ncurses.c                   | 61 +++++++++++++++++---------------
 test/padview.c                   | 12 +++----
 test/parse_rgb.h                 |  6 ++--
 test/picsmap.c                   | 14 ++++----
 test/popup_msg.c                 |  8 ++---
 test/popup_msg.h                 |  6 ++--
 test/railroad.c                  |  6 ++--
 test/rain.c                      | 20 +++++------
 test/redraw.c                    |  6 ++--
 test/savescreen.c                | 14 ++++----
 test/tclock.c                    |  4 +--
 test/test.priv.h                 | 10 +++---
 test/test_add_wchstr.c           |  6 ++--
 test/test_addchstr.c             |  6 ++--
 test/test_addstr.c               |  6 ++--
 test/test_addwstr.c              |  6 ++--
 test/test_endwin.c               |  6 ++--
 test/test_get_wstr.c             |  8 ++---
 test/test_getstr.c               |  8 ++---
 test/test_instr.c                |  8 ++---
 test/test_inwstr.c               |  8 ++---
 test/test_mouse.c                |  4 +--
 test/test_opaque.c               |  8 ++---
 test/test_sgr.c                  | 26 +++++++-------
 test/test_tparm.c                | 12 +++----
 test/test_vidputs.c              |  6 ++--
 test/testcurs.c                  |  8 ++---
 test/testscanw.c                 |  6 ++--
 test/view.c                      | 21 +++++------
 83 files changed, 392 insertions(+), 369 deletions(-)

diff --git a/NEWS b/NEWS
index cc581e168..ebcc37467 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4185 2024/09/28 20:27:44 tom Exp $
+-- $Id: NEWS,v 1.4188 2024/10/06 08:53:45 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241006
+	+ fixes for compiler warnings/cppcheck.
+	+ use xterm+alt+title in wezterm -TD
+
 20240928
 	+ improve error-message from infocmp when a terminal entry cannot be
 	  opened (patch by Branden Robinson).
diff --git a/VERSION b/VERSION
index 225aa120c..7bf30eb8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20240928
+5:0:10	6.5	20241006
diff --git a/c++/cursesf.cc b/c++/cursesf.cc
index 5d316489e..bf89ecafc 100644
--- a/c++/cursesf.cc
+++ b/c++/cursesf.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2005,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include "cursesf.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursesf.cc,v 1.26 2021/04/17 18:11:08 tom Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.27 2024/10/05 22:47:12 tom Exp $")
 
 NCursesFormField::~NCursesFormField () THROWS(NCursesException)
 {
@@ -76,7 +76,7 @@ NCursesForm::mapFields(NCursesFormField* nfields[])
 
 void NCursesForm::setDefaultAttributes()
 {
-  NCursesApplication* S = NCursesApplication::getApplication();
+  const NCursesApplication* S = NCursesApplication::getApplication();
 
   int n = count();
   if (n > 0) {
diff --git a/c++/cursesf.h b/c++/cursesf.h
index e29e7adbf..f242fc745 100644
--- a/c++/cursesf.h
+++ b/c++/cursesf.h
@@ -1,7 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: cursesf.h,v 1.39 2022/08/20 20:52:15 tom Exp $
+// $Id: cursesf.h,v 1.40 2024/10/05 22:47:12 tom Exp $
 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1
@@ -384,7 +384,7 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
   }
 
   inline void *get_user() {
-    UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
+    const UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
     assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
     return uptr->m_user;
   }
diff --git a/c++/cursesm.cc b/c++/cursesm.cc
index 64f36358c..3d3ed76f4 100644
--- a/c++/cursesm.cc
+++ b/c++/cursesm.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include "cursesm.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursesm.cc,v 1.27 2021/04/17 18:11:08 tom Exp $")
+MODULE_ID("$Id: cursesm.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
 
 NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException)
 {
@@ -168,7 +168,7 @@ NCursesMenu::InitMenu(NCursesMenuItem* nitems[],
 void
 NCursesMenu::setDefaultAttributes()
 {
-  NCursesApplication* S = NCursesApplication::getApplication();
+  const NCursesApplication* S = NCursesApplication::getApplication();
   if (S) {
     ::set_menu_fore(menu, S->foregrounds());
     ::set_menu_back(menu, S->backgrounds());
diff --git a/c++/cursesm.h b/c++/cursesm.h
index 9651195fd..27ccec44d 100644
--- a/c++/cursesm.h
+++ b/c++/cursesm.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: cursesm.h,v 1.35 2022/08/20 20:52:15 tom Exp $
+// $Id: cursesm.h,v 1.36 2024/10/05 22:47:12 tom Exp $
 
 #ifndef NCURSES_CURSESM_H_incl
 #define NCURSES_CURSESM_H_incl 1
@@ -245,7 +245,7 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
   }
 
   inline void *get_user() {
-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
+    const UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
     assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
     return uptr->m_user;
   }
diff --git a/c++/cursesp.cc b/c++/cursesp.cc
index 58b2a8fa4..96f9e3541 100644
--- a/c++/cursesp.cc
+++ b/c++/cursesp.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 #include "internal.h"
 #include "cursesp.h"
 
-MODULE_ID("$Id: cursesp.cc,v 1.27 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursesp.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
 
 NCursesPanel* NCursesPanel::dummy = static_cast<NCursesPanel*>(0);
 
@@ -64,7 +64,7 @@ NCursesPanel::~NCursesPanel() THROWS(NCursesException)
 void
 NCursesPanel::redraw()
 {
-  PANEL *pan;
+  const PANEL *pan;
 
   pan = ::panel_above(NULL);
   while (pan) {
diff --git a/c++/cursespad.cc b/c++/cursespad.cc
index 6065923bd..4d30a5c7e 100644
--- a/c++/cursespad.cc
+++ b/c++/cursespad.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1999-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <cursesw.h>
 
-MODULE_ID("$Id: cursespad.cc,v 1.18 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursespad.cc,v 1.19 2024/10/05 22:47:12 tom Exp $")
 
 NCursesPad::NCursesPad(int nlines, int ncols)
   : NCursesWindow(),
@@ -221,7 +221,7 @@ void NCursesPad::setSubWindow(NCursesWindow& sub)
 void NCursesFramedPad::OnOperation(int pad_req)
 {
   (void) pad_req;
-  NCursesWindow* W = Win();
+  const NCursesWindow* W = Win();
   NCursesWindow* W2 = getWindow();
 
   if ((static_cast<NCursesWindow*>(0) != W) && (static_cast<NCursesWindow*>(0) != W2)) {
diff --git a/c++/cursslk.cc b/c++/cursslk.cc
index 0212971d2..5ff7dd9dd 100644
--- a/c++/cursslk.cc
+++ b/c++/cursslk.cc
@@ -35,10 +35,10 @@
 #include "internal.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursslk.cc,v 1.22 2024/06/15 21:07:30 tom Exp $")
+MODULE_ID("$Id: cursslk.cc,v 1.23 2024/10/05 19:36:22 tom Exp $")
 
 Soft_Label_Key_Set::Soft_Label_Key&
-  Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
+  Soft_Label_Key_Set::Soft_Label_Key::operator=(const char *text)
 {
   delete[] label;
   size_t need = 1 + ::strlen(text);
@@ -111,11 +111,11 @@ int Soft_Label_Key_Set::labels() const {
 
 void Soft_Label_Key_Set::activate_label(int i, bool bf) {
   if (!b_attrInit) {
-    NCursesApplication* A = NCursesApplication::getApplication();
+    const NCursesApplication* A = NCursesApplication::getApplication();
     if (A) attrset(A->labels());
     b_attrInit = TRUE;
   }
-  Soft_Label_Key& K = (*this)[i];
+  const Soft_Label_Key& K = (*this)[i];
   if (ERR==::slk_set(K.num,bf?K.label:"",K.format))
     Error("slk_set");
   noutrefresh();
@@ -124,12 +124,12 @@ void Soft_Label_Key_Set::activate_label(int i, bool bf) {
 void Soft_Label_Key_Set::activate_labels(bool bf)
 {
   if (!b_attrInit) {
-    NCursesApplication* A = NCursesApplication::getApplication();
+    const NCursesApplication* A = NCursesApplication::getApplication();
     if (A) attrset(A->labels());
     b_attrInit = TRUE;
   }
   for(int i=1; i <= num_labels; i++) {
-    Soft_Label_Key& K = (*this)[i];
+    const Soft_Label_Key& K = (*this)[i];
     if (ERR==::slk_set(K.num,bf?K.label:"",K.format))
       Error("slk_set");
   }
diff --git a/c++/cursslk.h b/c++/cursslk.h
index 66564fe3a..7b02ed446 100644
--- a/c++/cursslk.h
+++ b/c++/cursslk.h
@@ -1,7 +1,7 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: cursslk.h,v 1.19 2021/04/17 18:11:08 tom Exp $
+// $Id: cursslk.h,v 1.20 2024/10/05 22:47:12 tom Exp $
 
 #ifndef NCURSES_CURSSLK_H_incl
 #define NCURSES_CURSSLK_H_incl
@@ -62,7 +62,7 @@ class NCURSES_CXX_IMPEXP Soft_Label_Key_Set {
 
   public:
     // Set the text of the Label
-    Soft_Label_Key& operator=(char *text);
+    Soft_Label_Key& operator=(const char *text);
 
     // Set the Justification of the Label
     Soft_Label_Key& operator=(Justification just) {
diff --git a/dist.mk b/dist.mk
index dd79379ef..70085c8f9 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1634 2024/09/28 09:53:21 tom Exp $
+# $Id: dist.mk,v 1.1636 2024/10/06 08:53:45 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20240928
+NCURSES_PATCH = 20241006
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 0d7d9f9fd..533fe42b4 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1150 $
-#	$Date: 2024/09/07 16:23:31 $
+#	$Revision: 1.1153 $
+#	$Date: 2024/10/05 16:04:17 $
 #
 # 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
@@ -8060,6 +8060,17 @@ domterm|DomTerm web client,
 # "wezterm is a terminal emulator with support for modern features
 #  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
 #
+# The documentation bears mention.  It refers to the "ANSI" standard and
+# 	https://wezfurlong.org/wezterm/what-is-a-terminal.html#ansi-and-ecma-48
+# X3.64 (withdrawn long ago).  A related website
+#	https://github.com/wez/ecma48
+# states that ECMA-48 was issued in 1979 and not revised since.  Actually that
+# was the second revision; the fifth revision in 1991 is current.  The source
+# code refers to the second revision in a half-dozen places.  Further, there
+# are three times as many references to Wikipedia as to xterm's documentation.
+# The git commit comments in several instances hint at an incomplete reading
+# of the relevant standards.
+#
 # wezterm-20240203-110809-5046fc22 tested with MacOS
 # General:
 # + initial screensize is now 80x24
@@ -8094,7 +8105,7 @@ domterm|DomTerm web client,
 # + poor (doesn't copy anyone, most of the results are wrong)
 # vttest:
 # + DA is VT5xx with sixel, selective erase, user windows, color
-# + DA2 is VT220 version 277
+# + DA2 is VT220 version 277, perhaps a reference to xterm #277
 # + only the VT100 character set works, contrary to DA/DA2.
 # + no NRCS, either
 # + double-sized character work, with some debris
@@ -8136,7 +8147,7 @@ wezterm|Wez's Terminal Emulator,
 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
 	use=report+version, use=vt220+cvis,
-	use=xterm+256color2, use=xterm+alt1049,
+	use=xterm+256color2, use=xterm+alt+title,
 	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
 	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
 	use=xterm+tmux,
@@ -27644,4 +27655,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2024-09-07
 #	+ update comments -TD
 #
+# 2024-10-05
+#	+ use xterm+alt+title in wezterm -TD
+#	+ update comments -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index 270cb4811..c1640bb29 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.108 2024/09/22 20:20:36 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.109 2024/10/05 20:47:44 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -943,7 +943,7 @@ putwin(WINDOW *win, FILE *filep)
  * Replace a window covering the whole screen, i.e., newscr or curscr.
  */
 static WINDOW *
-replace_window(WINDOW *target, FILE *source)
+replace_window(const WINDOW *target, FILE *source)
 {
     WINDOW *result = getwin(source);
 #if NCURSES_EXT_FUNCS
diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c
index 7de5bd2b3..9ce0bb7f0 100644
--- a/ncurses/base/new_pair.c
+++ b/ncurses/base/new_pair.c
@@ -61,7 +61,7 @@
 
 #endif
 
-MODULE_ID("$Id: new_pair.c,v 1.24 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.25 2024/10/05 20:51:29 tom Exp $")
 
 #if NCURSES_EXT_COLORS
 
@@ -193,7 +193,7 @@ _nc_free_ordered_pairs(SCREEN *sp)
  * pair table.
  */
 NCURSES_EXPORT(void)
-_nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next)
+_nc_reset_color_pair(SCREEN *sp, int pair, const colorpair_t * next)
 {
     colorpair_t *last;
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 9a549c11c..6ba124c34 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.691 2024/09/28 15:35:01 tom Exp $
+ * $Id: curses.priv.h,v 1.692 2024/10/05 21:01:50 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2170,7 +2170,7 @@ extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *);
 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const);
 extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
-extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
+extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
 extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
 extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
 extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 055b237d1..91e230176 100644
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -34,7 +34,7 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.14 2024/05/25 23:10:33 tom Exp $
+ * $Id: new_pair.h,v 1.15 2024/10/05 20:57:47 tom Exp $
  */
 
 #ifndef NEW_PAIR_H
@@ -116,7 +116,7 @@ colorpair_t;
 #if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
 extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
 extern NCURSES_EXPORT(void)     _nc_free_ordered_pairs(SCREEN*);
-extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, colorpair_t*);
+extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, const colorpair_t*);
 extern NCURSES_EXPORT(void)     _nc_set_color_pair(SCREEN*, int, int);
 #else
 #define _nc_free_ordered_pairs(sp) /* nothing */
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index e2fc5baa2..1589db0a7 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -37,7 +37,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.23 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.24 2024/10/05 20:53:48 tom Exp $")
 
 #undef CUR
 #define CUR tp->
@@ -237,12 +237,10 @@ _nc_trim_sgr0(TERMTYPE2 *tp)
 
     if (PRESENT(exit_attribute_mode)
 	&& PRESENT(set_attributes)) {
-	bool found = FALSE;
 	char *on = set_attribute_9(tp, 1);
 	char *off = set_attribute_9(tp, 0);
 	char *end = strdup(exit_attribute_mode);
 	char *tmp;
-	size_t i, j, k;
 
 	TR(TRACE_DATABASE, ("checking if we can trim sgr0 based on sgr"));
 	TR(TRACE_DATABASE, ("sgr0       %s", _nc_visbuf(end)));
@@ -255,6 +253,9 @@ _nc_trim_sgr0(TERMTYPE2 *tp)
 	    FreeIfNeeded(off);
 	} else if (similar_sgr(off, end)
 		   && !similar_sgr(off, on)) {
+	    bool found = FALSE;
+	    size_t i, j, k;
+
 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
 	    result = off;
 	    /*
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 6fa73eedb..3c21f801d 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.81 2023/09/16 16:30:40 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.82 2024/10/05 22:47:12 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -168,7 +168,7 @@ _nc_eventlist_timeout(_nc_eventlist * evl)
  * descriptors.
  */
 NCURSES_EXPORT(int)
-_nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
+_nc_timed_wait(const SCREEN *sp MAYBE_UNUSED,
 	       int mode MAYBE_UNUSED,
 	       int milliseconds,
 	       int *timeleft
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 5651c339d..241270ac3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240928) unstable; urgency=low
+ncurses6td (6.5+20241006) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 5651c339d..241270ac3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240928) unstable; urgency=low
+ncurses6td (6.5+20241006) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 069f31a97..b01424303 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240928) unstable; urgency=low
+ncurses6td (6.5+20241006) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Sep 2024 05:53:21 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ac2f6bdfa..f3b5ce49d 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.669 2024/09/28 09:53:21 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.671 2024/10/06 08:53:45 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0928"
+!define VERSION_MMDD  "1006"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 085d645d1..9c34b2e6e 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240928
+Release: 20241006
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 1ae4700d3..182e5a568 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240928
+Release: 20241006
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index f78c44975..967abb241 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240928
+Release: 20241006
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/blue.c b/test/blue.c
index 90f240b62..e02f48bd7 100644
--- a/test/blue.c
+++ b/test/blue.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $
+ * $Id: blue.c,v 1.56 2024/10/05 19:26:24 tom Exp $
  */
 
 #include <test.priv.h>
@@ -437,7 +437,7 @@ game_finished(int deal)
 static void
 use_pc_display(void)
 {
-    char *check = nl_langinfo(CODESET);
+    const char *check = nl_langinfo(CODESET);
     if (!strcmp(check, "UTF-8")) {
 #if USE_WIDEC_SUPPORT
 	suits = uglyphs;
@@ -448,8 +448,8 @@ use_pc_display(void)
 	    !strcmp(check, "CP437") ||
 	    !strcmp(check, "IBM850") ||
 	    !strcmp(check, "CP850")) {
-	    char *smacs = tigetstr("smacs");
-	    char *smpch = tigetstr("smpch");
+	    const char *smacs = tigetstr("smacs");
+	    const char *smpch = tigetstr("smpch");
 	    /*
 	     * The ncurses library makes this check to decide whether to allow
 	     * the alternate character set for the (normally) nonprinting codes.
diff --git a/test/bs.c b/test/bs.c
index c7569cf20..e258ea6ae 100644
--- a/test/bs.c
+++ b/test/bs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *
- * $Id: bs.c,v 1.79 2023/05/27 20:13:10 tom Exp $
+ * $Id: bs.c,v 1.80 2024/10/05 19:26:24 tom Exp $
  */
 
 #include <test.priv.h>
@@ -147,7 +147,7 @@ typedef struct {
     bool placed;		/* has it been placed on the board? */
 } ship_t;
 
-static bool checkplace(int b, ship_t * ss, int vis);
+static bool checkplace(int b, const ship_t * ss, int vis);
 
 #define SHIPIT(name, symbol, length) { name, 0, symbol, length, 0,0, 0, FALSE }
 
@@ -686,7 +686,7 @@ collidecheck(int b, int y, int x)
 }
 
 static bool
-checkplace(int b, ship_t * ss, int vis)
+checkplace(int b, const ship_t * ss, int vis)
 {
     int l, xend, yend;
 
diff --git a/test/cardfile.c b/test/cardfile.c
index 092483b02..2652ba9f0 100644
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.51 2022/12/04 00:40:11 tom Exp $
+ * $Id: cardfile.c,v 1.52 2024/10/05 19:26:24 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -161,7 +161,7 @@ new_card(void)
 }
 
 static CARD *
-find_card(char *title)
+find_card(const char *title)
 {
     CARD *card;
 
@@ -173,7 +173,7 @@ find_card(char *title)
 }
 
 static void
-read_data(char *fname)
+read_data(const char *fname)
 {
     FILE *fp;
 
@@ -341,7 +341,7 @@ form_virtualize(WINDOW *w)
 }
 
 static FIELD **
-make_fields(CARD * p, int form_high, int form_wide)
+make_fields(const CARD * p, int form_high, int form_wide)
 {
     FIELD **f = typeCalloc(FIELD *, (size_t) 3);
 
@@ -385,7 +385,7 @@ free_form_fields(FIELD **f)
 /*******************************************************************************/
 
 static void
-cardfile(char *fname)
+cardfile(const char *fname)
 {
     WINDOW *win;
     CARD *p;
diff --git a/test/chgat.c b/test/chgat.c
index ab91b8aec..da5ebab80 100644
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: chgat.c,v 1.21 2024/06/29 17:45:32 tom Exp $
+ * $Id: chgat.c,v 1.23 2024/10/06 22:35:55 tom Exp $
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
@@ -160,7 +160,7 @@ show_status(WINDOW *win, STATUS * sp)
 }
 
 static void
-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
+do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
 {
     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
 			  sp->y_beg + 1, sp->x_beg + 1);
@@ -204,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp)
 static void
 show_help(WINDOW *win)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"Basic commands:"
 	,"Use h/j/k/l or arrow keys to move the cursor."
diff --git a/test/clip_printw.c b/test/clip_printw.c
index c34a1e09f..d45e85d1f 100644
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: clip_printw.c,v 1.23 2023/09/30 19:57:44 tom Exp $
+ * $Id: clip_printw.c,v 1.25 2024/10/06 22:36:25 tom Exp $
  *
  * demonstrate how to use printw with/without wrapping.
  */
@@ -212,7 +212,7 @@ show_status(WINDOW *win, STATUS * sp)
 }
 
 static void
-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
+do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
 {
     WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN),
 			  sp->x_max - (2 * MARGIN),
@@ -268,7 +268,7 @@ init_status(WINDOW *win, STATUS * sp)
 static void
 show_help(WINDOW *win)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"Basic commands:"
 	,"Use h/j/k/l or arrow keys to move the cursor."
diff --git a/test/color_name.h b/test/color_name.h
index 867396ca5..4ef5faea6 100644
--- a/test/color_name.h
+++ b/test/color_name.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 2011-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_name.h,v 1.9 2021/04/24 23:25:29 tom Exp $
+ * $Id: color_name.h,v 1.10 2024/10/05 19:26:24 tom Exp $
  */
 
 #ifndef __COLORNAME_H
@@ -63,7 +63,6 @@ color_code(const char *color)
 {
     int result = 0;
     char *endp = 0;
-    size_t n;
 
     if ((result = (int) strtol(color, &endp, 0)) >= 0
 	&& (endp == 0 || *endp == 0)) {
@@ -71,6 +70,7 @@ color_code(const char *color)
     } else if (!strcmp(color, "default")) {
 	result = -1;
     } else {
+	size_t n;
 	for (n = 0; n < SIZEOF(the_color_names); ++n) {
 	    if (!strcmp(the_color_names[n], color)) {
 		result = (int) n;
diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index 441667263..215f79b08 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $
+ * $Id: demo_defkey.c,v 1.36 2024/10/05 18:20:04 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -199,7 +199,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code)
 }
 
 static void
-redefine(WINDOW *win, char *string, int code)
+redefine(WINDOW *win, const char *string, int code)
 {
     really_define_key(win, string, code);
 }
diff --git a/test/demo_forms.c b/test/demo_forms.c
index 62e8c644e..a9737590e 100644
--- a/test/demo_forms.c
+++ b/test/demo_forms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_forms.c,v 1.63 2023/11/11 00:29:53 tom Exp $
+ * $Id: demo_forms.c,v 1.67 2024/10/06 21:15:12 tom Exp $
  *
  * Demonstrate a variety of functions from the form library.
  * Thomas Dickey - 2003/4/26
@@ -148,7 +148,7 @@ read_data(const char *filename)
 }
 
 static FIELD *
-make_label(const char *label, int frow, int fcol)
+make_label(NCURSES_CONST char *label, int frow, int fcol)
 {
     FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0);
 
@@ -242,7 +242,7 @@ show_insert_mode(bool insert_mode)
 #define O_SELECTABLE (O_ACTIVE | O_VISIBLE)
 
 static FIELD *
-another_field(FORM *form, const FIELD *const field)
+another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field)
 {
     FIELD **f = form_fields(form);
     FIELD *result = 0;
@@ -306,9 +306,9 @@ my_form_driver(FORM *form, int c)
 }
 
 static void
-show_current_field(WINDOW *win, FORM *form)
+show_current_field(WINDOW *win, NCURSES_CONST FORM *form)
 {
-    FIELD *field;
+    NCURSES_CONST FIELD *field;
     int field_rows, field_cols, field_max;
     int currow, curcol;
 
@@ -325,7 +325,7 @@ show_current_field(WINDOW *win, FORM *form)
     waddch(win, '\n');
 
     if ((field = current_field(form)) != 0) {
-	FIELDTYPE *type;
+	NCURSES_CONST FIELDTYPE *type;
 	int nbuf;
 
 	wprintw(win, "Page %d%s, Field %d/%d%s:",
@@ -383,7 +383,7 @@ show_current_field(WINDOW *win, FORM *form)
 
 	waddstr(win, "\n");
 	for (nbuf = 0; nbuf <= 2; ++nbuf) {
-	    char *buffer;
+	    NCURSES_CONST char *buffer;
 	    if ((buffer = field_buffer(field, nbuf)) != 0) {
 		wprintw(win, "buffer %d:", nbuf);
 		(void) wattrset(win, A_REVERSE);
@@ -408,8 +408,8 @@ demo_forms(void)
     int c;
     unsigned n = 0;
     int pg;
-    const char *fname;
-    static const char *my_enum[] =
+    NCURSES_CONST char *fname;
+    static NCURSES_CONST char *my_enum[] =
     {"first", "second", "third", 0};
 
 #ifdef NCURSES_MOUSE_VERSION
@@ -515,7 +515,7 @@ demo_forms(void)
     f[n] = (FIELD *) 0;
 
     if ((form = new_form(f)) != 0) {
-	WINDOW *w;
+	NCURSES_CONST WINDOW *w;
 	WINDOW *also;
 	int finished = 0;
 
diff --git a/test/demo_menus.c b/test/demo_menus.c
index 7b0bf3031..22a6a9bf1 100644
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.80 2023/05/27 20:13:10 tom Exp $
+ * $Id: demo_menus.c,v 1.82 2024/10/06 19:58:28 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -185,7 +185,7 @@ menu_virtualize(int c)
 }
 
 static int
-menu_getc(MENU * m)
+menu_getc(NCURSES_CONST MENU * m)
 {
     return wGetchar(menu_win(m));
 }
@@ -214,7 +214,7 @@ static void
 my_menu_init(MENU * menu)
 {
     Trace(("called MenuHook my_menu_init"));
-    mvwprintw(status, 2, 0, "menu_init %p", (void *) menu);
+    mvwprintw(status, 2, 0, "menu_init %p", (const void *) menu);
     wclrtoeol(status);
     wrefresh(status);
 }
@@ -223,7 +223,7 @@ static void
 my_menu_term(MENU * menu)
 {
     Trace(("called MenuHook my_menu_term"));
-    mvwprintw(status, 2, 0, "menu_term %p", (void *) menu);
+    mvwprintw(status, 2, 0, "menu_term %p", (const void *) menu);
     wclrtoeol(status);
     wrefresh(status);
 }
@@ -231,7 +231,7 @@ my_menu_term(MENU * menu)
 static void
 my_item_init(MENU * menu)
 {
-    ITEM *item = current_item(menu);
+    NCURSES_CONST ITEM *item = current_item(menu);
     const char *name = item_name(item);
 
     Trace(("called MenuHook my_item_init (%s)", name));
@@ -243,7 +243,7 @@ my_item_init(MENU * menu)
 static void
 my_item_term(MENU * menu)
 {
-    ITEM *item = current_item(menu);
+    NCURSES_CONST ITEM *item = current_item(menu);
     const char *name = item_name(item);
 
     Trace(("called MenuHook my_item_term (%s)", name));
@@ -348,7 +348,7 @@ menu_destroy(MENU * m, int itemsToo)
 
 /* force the given menu to appear */
 static void
-menu_display(MENU * m)
+menu_display(NCURSES_CONST MENU * m)
 {
     touchwin(menu_win(m));
     wrefresh(menu_win(m));
@@ -584,10 +584,10 @@ tracetrace(unsigned tlevel)
  * the others
  */
 static bool
-update_trace_menu(MENU * m)
+update_trace_menu(NCURSES_CONST MENU * m)
 {
     ITEM **items;
-    ITEM *i;
+    NCURSES_CONST ITEM *i;
     bool changed = FALSE;
 
     items = menu_items(m);
@@ -613,7 +613,7 @@ perform_trace_menu(int cmd)
     int result;
 
     for (ip = menu_items(mpTrace); *ip; ip++) {
-	MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
+	NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
 	unsigned mask = td->mask;
 	if (mask == 0)
 	    set_item_value(*ip, _nc_tracing == 0);
@@ -628,7 +628,7 @@ perform_trace_menu(int cmd)
 	    unsigned newtrace = 0;
 	    for (ip = menu_items(mpTrace); *ip; ip++) {
 		if (item_value(*ip)) {
-		    MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
+		    NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
 		    newtrace |= td->mask;
 		}
 	    }
@@ -718,7 +718,9 @@ build_menus(char *filename)
 }
 
 static int
-move_menu(MENU * menu, MENU * current, int by_y, int by_x)
+move_menu(NCURSES_CONST MENU * menu,
+	  NCURSES_CONST MENU * current,
+	  int by_y, int by_x)
 {
     WINDOW *top_win = menu_win(menu);
     WINDOW *sub_win = menu_sub(menu);
@@ -798,7 +800,7 @@ resize_menus(MENU * current)
 #endif /* defined(KEY_RESIZE) && NCURSES_EXT_FUNCS */
 
 static void
-show_status(int ch, MENU * menu)
+show_status(int ch, NCURSES_CONST MENU * menu)
 {
     wmove(status, 0, 0);
     wprintw(status, "key %s, menu %d, mark %s, match %s",
@@ -919,7 +921,7 @@ perform_menus(void)
 	wrefresh(menu_win(last_menu));
 	if (code == E_UNKNOWN_COMMAND
 	    || code == E_NOT_POSTED) {
-	    ITEM *item = current_item(last_menu);
+	    NCURSES_CONST ITEM *item = current_item(last_menu);
 	    MENU_DATA *td = (MENU_DATA *) item_userptr(item);
 	    td->func((int) td->mask);
 	}
diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c
index ed095d9cf..89a4da80e 100644
--- a/test/demo_new_pair.c
+++ b/test/demo_new_pair.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_new_pair.c,v 1.28 2024/06/29 19:30:26 tom Exp $
+ * $Id: demo_new_pair.c,v 1.29 2024/10/05 18:21:44 tom Exp $
  *
  * Demonstrate the alloc_pair() function.
  */
@@ -49,7 +49,7 @@
 static bool
 valid_cap(NCURSES_CONST char *name)
 {
-    char *value = tigetstr(name);
+    const char *value = tigetstr(name);
     return (value != 0 && value != (char *) -1) ? TRUE : FALSE;
 }
 
diff --git a/test/demo_panels.c b/test/demo_panels.c
index 6c8258915..0553a824f 100644
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.48 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_panels.c,v 1.50 2024/10/06 20:01:21 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -42,7 +42,7 @@
 #define TEMP_POS '>'
 
 typedef void (*InitPanel) (void);
-typedef void (*FillPanel) (PANEL *);
+typedef void (*FillPanel) (NCURSES_CONST PANEL *);
 
 static bool use_colors = FALSE;
 static bool unboxed = FALSE;
@@ -301,7 +301,7 @@ my_move_panel(PANEL **pans, int which, bool continuous)
 	int code;
 	int y0, x0;
 	int y1, x1;
-	WINDOW *win = panel_window(pans[which]);
+	NCURSES_CONST WINDOW *win = panel_window(pans[which]);
 	char also[80];
 
 	getbegyx(win, y0, x0);
@@ -368,7 +368,7 @@ init_panel(void)
 }
 
 static void
-fill_panel(PANEL *pan)
+fill_panel(NCURSES_CONST PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -388,7 +388,7 @@ fill_panel(PANEL *pan)
 }
 
 static void
-fill_unboxed(PANEL *pan)
+fill_unboxed(NCURSES_CONST PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -431,7 +431,7 @@ init_wide_panel(void)
 }
 
 static void
-fill_wide_panel(PANEL *pan)
+fill_wide_panel(NCURSES_CONST PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     int num = ((const char *) panel_userptr(pan))[1];
@@ -453,7 +453,7 @@ fill_wide_panel(PANEL *pan)
 #define MAX_PANELS 5
 
 static int
-which_panel(PANEL *px[MAX_PANELS + 1], PANEL *pan)
+which_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST PANEL *pan)
 {
     int result = 0;
     int j;
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 6e2aba700..67140665d 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.65 2023/05/27 20:13:10 tom Exp $
+ * $Id: demo_termcap.c,v 1.70 2024/10/06 20:05:09 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -256,7 +256,7 @@ dumpit(NCURSES_CONST char *cap)
      * to hold all of the strings extracted from the terminal entry.
      */
     char area[1024], *ap = area;
-    char *str;
+    NCURSES_CONST char *str;
     int num;
 
     if ((str = tgetstr(cap, &ap)) != 0) {
@@ -289,7 +289,7 @@ dumpit(NCURSES_CONST char *cap)
 }
 
 static void
-brute_force(const char *name)
+brute_force(NCURSES_CONST char *name)
 {
     char buffer[1024];
 
@@ -369,7 +369,7 @@ demo_termcap(NCURSES_CONST char *name)
 #ifdef NCURSES_VERSION
 	if (x_opt && (my_blob == 0) && y_opt) {
 #if NCURSES_XNAMES
-	    TERMTYPE *term = (TERMTYPE *) cur_term;
+	    NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
 	    if (term != 0
 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
 		    || (NUM_NUMBERS(term) != NUMCOUNT)
@@ -781,12 +781,12 @@ main(int argc, char *argv[])
 {
     int ch;
     int n;
-    char *name;
+    NCURSES_CONST char *name;
     bool a_opt = FALSE;
 #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
     bool v_opt = FALSE;
 #endif
-    char *input_name = 0;
+    NCURSES_CONST char *input_name = 0;
 
     int repeat;
     int r_opt = 1;
@@ -867,7 +867,7 @@ main(int argc, char *argv[])
 	    } else if ((name = getenv("TERM")) != 0) {
 		brute_force(name);
 	    } else {
-		static char dumb[] = "dumb";
+		static NCURSES_CONST char dumb[] = "dumb";
 		brute_force(dumb);
 	    }
 	}
@@ -894,7 +894,7 @@ main(int argc, char *argv[])
 	    } else if ((name = getenv("TERM")) != 0) {
 		demo_termcap(name);
 	    } else {
-		static char dumb[] = "dumb";
+		static NCURSES_CONST char dumb[] = "dumb";
 		demo_termcap(dumb);
 	    }
 	}
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index 5e78015c3..8841711ff 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.57 2023/05/27 20:13:10 tom Exp $
+ * $Id: demo_terminfo.c,v 1.59 2024/10/06 21:16:43 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -253,7 +253,7 @@ dumpit(NCURSES_CONST char *cap, const char *show)
 #define LegalItem(c,n) (n)
 
 static void
-brute_force(const char *name)
+brute_force(NCURSES_CONST char *name)
 {
 #define MAX_FORCE 5		/* omit "colors", since CPU-time is a problem */
     static const char legal[] = "\
@@ -324,7 +324,7 @@ abcdefghijklmnopqrstuvwxyz_";
 #endif
 
 static void
-demo_terminfo(char *name)
+demo_terminfo(NCURSES_CONST char *name)
 {
     unsigned n;
     NCURSES_CONST char *cap;
@@ -366,7 +366,7 @@ demo_terminfo(char *name)
     if (x_opt && (my_blob == 0)) {
 	if (y_opt) {
 #if NCURSES_XNAMES
-	    TERMTYPE *term = (TERMTYPE *) cur_term;
+	    const TERMTYPE *term = (TERMTYPE *) cur_term;
 	    if (term != 0
 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
 		    || (NUM_NUMBERS(term) != NUMCOUNT)
@@ -813,9 +813,9 @@ main(int argc, char *argv[])
     int ch;
     int n;
     int repeat;
-    char *name;
+    NCURSES_CONST char *name;
     int r_opt = 1;
-    char *input_name = 0;
+    const char *input_name = 0;
 
     while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) {
 	switch (ch) {
@@ -891,7 +891,7 @@ main(int argc, char *argv[])
 	    } else if ((name = getenv("TERM")) != 0) {
 		brute_force(name);
 	    } else {
-		static char dumb[] = "dumb";
+		static NCURSES_CONST char dumb[] = "dumb";
 		brute_force(dumb);
 	    }
 	}
@@ -918,7 +918,7 @@ main(int argc, char *argv[])
 	    } else if ((name = getenv("TERM")) != 0) {
 		demo_terminfo(name);
 	    } else {
-		static char dumb[] = "dumb";
+		static NCURSES_CONST char dumb[] = "dumb";
 		demo_terminfo(dumb);
 	    }
 	}
diff --git a/test/dots.c b/test/dots.c
index 05aa85451..1b84eaf86 100644
--- a/test/dots.c
+++ b/test/dots.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1999-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 1999
  *
- * $Id: dots.c,v 1.45 2023/01/07 17:21:48 tom Exp $
+ * $Id: dots.c,v 1.46 2024/10/06 21:17:54 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -61,7 +61,7 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
-outs(const char *s)
+outs(NCURSES_CONST char *s)
 {
     if (VALID_STRING(s)) {
 	tputs(s, 1, outc);
diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index a6119237b..2595d8ad6 100644
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2007-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
- * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $
+ * $Id: dots_mvcur.c,v 1.32 2024/10/06 21:17:54 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -62,7 +62,7 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
-outs(const char *s)
+outs(NCURSES_CONST char *s)
 {
     if (VALID_STRING(s)) {
 	tputs(s, 1, outc);
diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index 50946ce4a..050bdc98b 100644
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.33 2024/08/31 15:55:46 tom Exp $
+ * $Id: dots_termcap.c,v 1.35 2024/10/06 21:18:35 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -113,7 +113,7 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
-outs(char *s)
+outs(NCURSES_CONST char *s)
 {
     if (VALID_STRING(s)) {
 	tputs(s, 1, outc);
@@ -178,7 +178,7 @@ static int
 get_number(NCURSES_CONST char *cap, const char *env)
 {
     int result = tgetnum(cap);
-    char *value = env ? getenv(env) : 0;
+    const char *value = env ? getenv(env) : 0;
     if (value != 0 && *value != 0) {
 	char *next = 0;
 	long check = strtol(value, &next, 10);
@@ -229,7 +229,7 @@ main(int argc, char *argv[])
     double c;
     char buffer[1024];
     char area[1024];
-    char *name;
+    NCURSES_CONST char *name;
     size_t need;
     char *my_env;
 
diff --git a/test/dup_field.c b/test/dup_field.c
index 163dad677..7ef7151f8 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: dup_field.c,v 1.9 2024/06/29 17:45:32 tom Exp $
+ * $Id: dup_field.c,v 1.11 2024/10/06 20:07:19 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -146,27 +146,27 @@ erase_form(FORM *f)
 }
 
 static FieldAttrs *
-my_field_attrs(FIELD *f)
+my_field_attrs(NCURSES_CONST FIELD *f)
 {
     return (FieldAttrs *) field_userptr(f);
 }
 
 static int
-buffer_length(FIELD *f)
+buffer_length(NCURSES_CONST FIELD *f)
 {
     return my_field_attrs(f)->row_lengths[0];
 }
 
 static void
-set_buffer_length(FIELD *f, int length)
+set_buffer_length(NCURSES_CONST FIELD *f, int length)
 {
     my_field_attrs(f)->row_lengths[0] = length;
 }
 
 static int
-offset_in_field(FORM *form)
+offset_in_field(NCURSES_CONST FORM *form)
 {
-    FIELD *field = current_field(form);
+    NCURSES_CONST FIELD *field = current_field(form);
     int currow, curcol;
 
     form_getyx(form, currow, curcol);
@@ -245,7 +245,7 @@ my_edit_field(FORM *form, int *result)
 
 	default:
 	    modified = (ch < MIN_FORM_COMMAND
-			&& isprint(ch));
+			&& isprint(UChar(ch)));
 	    break;
 	}
 
diff --git a/test/filter.c b/test/filter.c
index b7444569b..53adf687f 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $
+ * $Id: filter.c,v 1.39 2024/10/05 19:26:24 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -65,7 +65,7 @@ show_prompt(int underline, bool clocked)
     if (clocked) {
 	if (limit >= 3) {
 	    time_t now = time((time_t *) 0);
-	    struct tm *my = localtime(&now);
+	    const struct tm *my = localtime(&now);
 	    char buffer[80];
 	    int skip, y, x;
 	    int margin;
diff --git a/test/form_driver_w.c b/test/form_driver_w.c
index 544060dcc..ff60f45cb 100644
--- a/test/form_driver_w.c
+++ b/test/form_driver_w.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $
+ * $Id: form_driver_w.c,v 1.18 2024/10/06 23:13:40 tom Exp $
  *
  * Test form_driver_w (int, int, wchar_t), a wide char aware
  * replacement of form_driver.
@@ -68,7 +68,7 @@ VERSION_COMMON()
 int
 main(int argc, char *argv[])
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  ^D,^Q,ESC           - quit program",
diff --git a/test/gdc.c b/test/gdc.c
index 44bcaa7cc..fbf97ba34 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.60 2024/06/29 19:59:06 tom Exp $
+ * $Id: gdc.c,v 1.62 2024/10/06 20:08:59 tom Exp $
  */
 
 #include <test.priv.h>
@@ -181,7 +181,7 @@ parse_time(const char *value)
     int check;
     time_t result;
     char c = 0;
-    struct tm *tm;
+    NCURSES_CONST struct tm *tm;
 
     switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) {
     default:
@@ -243,7 +243,7 @@ int
 main(int argc, char *argv[])
 {
     time_t now;
-    struct tm *tm;
+    NCURSES_CONST struct tm *tm;
     long t, a;
     int i, j, s, k, ch;
     int count = 0;
@@ -293,7 +293,7 @@ main(int argc, char *argv[])
 
     InitAndCatch({
 	if (redirected) {
-	    char *name = getenv("TERM");
+	    NCURSES_CONST char *name = getenv("TERM");
 	    if (name == 0
 		|| newterm(name, ofp, ifp) == 0) {
 		fprintf(stderr, "cannot open terminal\n");
@@ -431,7 +431,7 @@ main(int argc, char *argv[])
 	    _nc_STRNCPY(buf, ctime(&now), (size_t) 30);
 	    {
 		char *d2 = buf + 10;
-		char *s2 = buf + 19;
+		NCURSES_CONST char *s2 = buf + 19;
 		while ((*d2++ = *s2++) != '\0') ;
 	    }
 	    MvAddStr(16, 30, buf);
diff --git a/test/inch_wide.c b/test/inch_wide.c
index 7b838d1df..7359a9c58 100644
--- a/test/inch_wide.c
+++ b/test/inch_wide.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $
+ * $Id: inch_wide.c,v 1.14 2024/10/06 23:14:31 tom Exp $
  */
 /*
        int in_wch(cchar_t *wcval);
@@ -61,7 +61,7 @@ Quit(int ch)
 static int
 test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Test input from screen using inch(), etc., in a moveable viewport.",
 	"",
diff --git a/test/inchs.c b/test/inchs.c
index b5922dd65..211ca9d66 100644
--- a/test/inchs.c
+++ b/test/inchs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $
+ * $Id: inchs.c,v 1.20 2024/10/06 21:17:54 tom Exp $
  *
  * Author: Thomas E Dickey
  */
@@ -71,7 +71,7 @@ Quit(int ch)
 static int
 test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Test input from screen using inch(), etc., in a moveable viewport.",
 	"",
diff --git a/test/ins_wide.c b/test/ins_wide.c
index a73244933..7887f695f 100644
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $
+ * $Id: ins_wide.c,v 1.31 2024/10/05 19:26:24 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -73,7 +73,7 @@ static bool w_opt = FALSE;
 static int n_opt = -1;
 
 static void
-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
+legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
 {
     const char *showstate;
 
diff --git a/test/insdelln.c b/test/insdelln.c
index 52ccfb620..7fc841416 100644
--- a/test/insdelln.c
+++ b/test/insdelln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $
+ * $Id: insdelln.c,v 1.17 2024/10/06 21:08:52 tom Exp $
  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */
@@ -160,7 +160,7 @@ reshow_status(WINDOW *win, STATUS * sp)
 }
 
 static void
-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
+do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
 {
     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
 			  sp->y_beg + 1, sp->x_beg + 1);
@@ -204,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp)
 static void
 show_help(WINDOW *win)
 {
-    static const char *table[] =
+    static NCURSES_CONST char *table[] =
     {
 	"Basic commands:"
 	,"Use h/j/k/l or arrow keys to move the cursor."
diff --git a/test/inserts.c b/test/inserts.c
index b106ffc7d..edc14adcd 100644
--- a/test/inserts.c
+++ b/test/inserts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $
+ * $Id: inserts.c,v 1.35 2024/10/05 19:26:24 tom Exp $
  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19
@@ -98,7 +98,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length)
 }
 
 static int
-ColOf(char *buffer, int length, int margin)
+ColOf(const char *buffer, int length, int margin)
 {
     int n;
     int result;
diff --git a/test/knight.c b/test/knight.c
index b15c4d237..274e175d7 100644
--- a/test/knight.c
+++ b/test/knight.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *
- * $Id: knight.c,v 1.52 2022/12/04 00:40:11 tom Exp $
+ * $Id: knight.c,v 1.53 2024/10/05 19:38:58 tom Exp $
  */
 
 #include <test.priv.h>
@@ -450,7 +450,8 @@ iabs(int num)
 }
 
 static bool
-evaluate_move(SQUARES squares, HISTORY * doneData, int doneSize, int row, int column)
+evaluate_move(SQUARES squares, const HISTORY * doneData, int doneSize,
+	      int row, int column)
 {
     if (doneSize <= 1)
 	return (TRUE);
diff --git a/test/list_keys.c b/test/list_keys.c
index b616919f4..4496cb5ac 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.33 2023/11/11 00:35:05 tom Exp $
+ * $Id: list_keys.c,v 1.34 2024/10/05 19:26:24 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -297,7 +297,7 @@ list_keys(TERMINAL **terms, int count)
 #if NCURSES_XNAMES
     if (x_opt) {
 	for (k = 0; k < count; ++k) {
-	    TERMTYPE *term;
+	    const TERMTYPE *term;
 	    set_curterm(terms[k]);
 	    term = (TERMTYPE *) cur_term;
 	    total += (size_t) (NUM_STRINGS(term) - STRCOUNT);
@@ -348,7 +348,7 @@ list_keys(TERMINAL **terms, int count)
 	widths1 = (int) strlen(modifier);
 
     for (k = 0; k < count; ++k) {
-	char *value;
+	const char *value;
 	set_curterm(terms[k]);
 	if ((value = termname()) == NULL)
 	    failed("termname");
diff --git a/test/move_field.c b/test/move_field.c
index 4b6e28d33..db834140c 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: move_field.c,v 1.16 2024/06/29 17:45:02 tom Exp $
+ * $Id: move_field.c,v 1.19 2024/10/06 21:12:35 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -146,27 +146,27 @@ erase_form(FORM *f)
 }
 
 static FieldAttrs *
-my_field_attrs(FIELD *f)
+my_field_attrs(NCURSES_CONST FIELD *f)
 {
     return (FieldAttrs *) field_userptr(f);
 }
 
 static int
-buffer_length(FIELD *f)
+buffer_length(NCURSES_CONST FIELD *f)
 {
     return my_field_attrs(f)->row_lengths[0];
 }
 
 static void
-set_buffer_length(FIELD *f, int length)
+set_buffer_length(NCURSES_CONST FIELD *f, int length)
 {
     my_field_attrs(f)->row_lengths[0] = length;
 }
 
 static int
-offset_in_field(FORM *form)
+offset_in_field(NCURSES_CONST FORM *form)
 {
-    FIELD *field = current_field(form);
+    NCURSES_CONST FIELD *field = current_field(form);
     int currow, curcol;
 
     form_getyx(form, currow, curcol);
@@ -245,7 +245,7 @@ my_edit_field(FORM *form, int *result)
 
 	default:
 	    modified = (ch < MIN_FORM_COMMAND
-			&& isprint(ch));
+			&& isprint(UChar(ch)));
 	    break;
 	}
 
@@ -275,9 +275,9 @@ copy_fields(FIELD **source, size_t length)
 
 /* display a status message to show what's happening */
 static void
-show_status(FORM *form, FIELD *field)
+show_status(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *field)
 {
-    WINDOW *sub = form_sub(form);
+    NCURSES_CONST WINDOW *sub = form_sub(form);
     int currow, curcol;
 
     getyx(stdscr, currow, curcol);
diff --git a/test/movewindow.c b/test/movewindow.c
index 07797ca67..a01b616cf 100644
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2006-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.54 2023/05/27 20:13:10 tom Exp $
+ * $Id: movewindow.c,v 1.56 2024/10/06 18:44:26 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -135,7 +135,7 @@ tail_line(CONST_FMT char *fmt, ...)
  */
 static PAIR *
 selectcell(WINDOW *parent,
-	   WINDOW *child,
+	   NCURSES_CONST WINDOW *child,
 	   int uli, int ulj,
 	   int lri, int lrj,
 	   bool relative,
@@ -252,7 +252,7 @@ getwindow(WINDOW *parent, PAIR * ul, PAIR * lr)
     int max_col = (parent == stdscr) ? COL_MAX : getmaxx(parent);
     int min_line = (parent == stdscr) ? LINE_MIN : 0;
     int max_line = (parent == stdscr) ? LINE_MAX : getmaxy(parent);
-    PAIR *tmp;
+    NCURSES_CONST PAIR *tmp;
     bool result = FALSE;
 
     head_line("Use arrows to move cursor, anything else to mark corner 1");
@@ -346,7 +346,7 @@ window2num(const WINDOW *const win)
 }
 
 static WINDOW *
-parent_of(WINDOW *win)
+parent_of(NCURSES_CONST WINDOW *win)
 {
     WINDOW *result = 0;
     int n = window2num(win);
@@ -435,7 +435,7 @@ move_window(WINDOW *win, bool recur)
 	int max_col = top ? COL_MAX : getmaxx(parent);
 	int min_line = top ? LINE_MIN : 0;
 	int max_line = top ? LINE_MAX : getmaxy(parent);
-	PAIR *tmp;
+	NCURSES_CONST PAIR *tmp;
 	bool more;
 
 	head_line("Select new position for %swindow", top ? "" : "sub");
@@ -474,7 +474,7 @@ move_window(WINDOW *win, bool recur)
 }
 
 static void
-show_derwin(WINDOW *win)
+show_derwin(NCURSES_CONST WINDOW *win)
 {
     int pary, parx, maxy, maxx;
 
@@ -500,7 +500,7 @@ move_derwin(WINDOW *win)
 	int max_col = top ? COL_MAX : getmaxx(parent);
 	int min_line = top ? LINE_MIN : 0;
 	int max_line = top ? LINE_MAX : getmaxy(parent);
-	PAIR *tmp;
+	NCURSES_CONST PAIR *tmp;
 	bool more;
 
 	show_derwin(win);
diff --git a/test/ncurses.c b/test/ncurses.c
index a272d1423..fbdcc122d 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.538 2023/11/11 01:23:59 tom Exp $
+$Id: ncurses.c,v 1.541 2024/10/06 20:18:59 tom Exp $
 
 ***************************************************************************/
 
@@ -273,7 +273,7 @@ wGetstring(WINDOW *win, char *buffer, int limit)
 	    ++x;
 	    break;
 	default:
-	    if (!isprint(ch) || ch >= KEY_MIN) {
+	    if (!isprint(UChar(ch)) || ch >= KEY_MIN) {
 		beep();
 	    } else if ((int) strlen(buffer) < limit) {
 		int j;
@@ -928,7 +928,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay)
 		/* at least Solaris SVR4 curses breaks unctrl(128), etc. */
 		c2 &= 0x7f;
 #endif
-		if (isprint(c))
+		if (isprint(UChar(c)))
 		    (void) wprintw(win, "%c", UChar(c));
 		else if (c2 != UChar(c))
 		    (void) wprintw(win, "M-%s", unctrl(c2));
@@ -1693,7 +1693,7 @@ attr_test(bool recur GCC_UNUSED)
 	    chtype extras = (chtype) ac;
 
 	    if (UseColors) {
-		NCURSES_PAIRS_T pair = 0;
+		NCURSES_PAIRS_T pair;
 		if ((fg != COLOR_BLACK) || (bg != COLOR_BLACK)) {
 		    pair = 1;
 		    if (init_pair(pair, fg, bg) == ERR) {
@@ -2345,7 +2345,6 @@ color_test(bool recur GCC_UNUSED)
 	for (i = (NCURSES_PAIRS_T) (base_row * per_row); i < pairs_max; i++) {
 	    int row = grid_top + (i / per_row) - base_row;
 	    int col = (i % per_row + 1) * width;
-	    NCURSES_PAIRS_T pair = i;
 
 	    if ((i / per_row) > row_limit)
 		break;
@@ -2355,6 +2354,7 @@ color_test(bool recur GCC_UNUSED)
 	    if (row >= 0 && move(row, col) != ERR) {
 		NCURSES_COLOR_T fg = (NCURSES_COLOR_T) InxToFG(i);
 		NCURSES_COLOR_T bg = (NCURSES_COLOR_T) InxToBG(i);
+		NCURSES_PAIRS_T pair = i;
 
 		init_pair(pair, fg, bg);
 		attron(COLOR_PAIR(pair));
@@ -2517,7 +2517,7 @@ color_test(bool recur GCC_UNUSED)
 static int
 x_color_test(bool recur GCC_UNUSED)
 {
-    long i;
+    int i;
     int top = 0, width;
     int base_row = 0;
     int grid_top = top + 3;
@@ -2613,17 +2613,17 @@ x_color_test(bool recur GCC_UNUSED)
 	/* show color names/numbers across the top */
 	for (i = 0; i < per_row; i++) {
 	    show_color_name(top + 2,
-			    ((int) i + 1) * width,
-			    (int) i * zoom_size + MinColors,
+			    (i + 1) * width,
+			    i * zoom_size + MinColors,
 			    opt_wide,
 			    opt_zoom);
 	}
 
 	/* show a grid of colors, with color names/ numbers on the left */
 	for (i = (base_row * per_row); i < pairs_max; i++) {
-	    int row = grid_top + ((int) i / per_row) - base_row;
-	    int col = ((int) i % per_row + 1) * width;
-	    int pair = (int) i;
+	    int row = grid_top + (i / per_row) - base_row;
+	    int col = (i % per_row + 1) * width;
+	    int pair = i;
 
 	    if ((i / per_row) > row_limit)
 		break;
@@ -2828,7 +2828,7 @@ reset_all_colors(void)
 #define DecodeRGB(n) (NCURSES_COLOR_T) ((n * 1000) / 0xffff)
 
 static void
-init_all_colors(bool xterm_colors, char *palette_file)
+init_all_colors(bool xterm_colors, NCURSES_CONST char *palette_file)
 {
     NCURSES_PAIRS_T cp;
     all_colors = typeMalloc(RGB_DATA, (unsigned) MaxColors);
@@ -3317,7 +3317,7 @@ slk_test(bool recur GCC_UNUSED)
 {
     int c, fmt = 1;
     char buf[9];
-    char *s;
+    NCURSES_CONST char *s;
     attr_t attr = A_NORMAL;
     unsigned at_code = 0;
 #if HAVE_SLK_COLOR
@@ -3938,8 +3938,7 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p
 
     *dst = *src;
     do {
-	int count;
-	TEST_CCHAR(src, count, {
+	TEST_CCHAR(src, {
 	    attr |= (test_attrs & A_ALTCHARSET);
 	    setcchar(dst, test_wch, attr, pair, NULL);
 	}, {
@@ -4810,7 +4809,8 @@ getwindow(void)
 /* Ask user for a window definition */
 {
     WINDOW *rwindow;
-    pair ul, lr, *tmp;
+    pair ul, lr;
+    NCURSES_CONST pair *tmp;
 
     move(0, 0);
     clrtoeol();
@@ -5014,7 +5014,8 @@ scroll_test(bool recur GCC_UNUSED)
 #if HAVE_WRESIZE
 	case CTRL('X'):	/* resize window */
 	    if (current) {
-		pair *tmp, ul, lr;
+		NCURSES_CONST pair *tmp;
+		pair ul, lr;
 		int mx, my;
 
 		move(0, 0);
@@ -5249,7 +5250,7 @@ init_panel(WINDOW *win)
 }
 
 static void
-fill_panel(PANEL *pan)
+fill_panel(NCURSES_CONST PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -5286,7 +5287,7 @@ init_wide_panel(WINDOW *win)
 }
 
 static void
-fill_wide_panel(PANEL *pan)
+fill_wide_panel(NCURSES_CONST PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -5336,7 +5337,7 @@ canned_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST char *cmd)
 }
 
 static int
-demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *))
+demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (NCURSES_CONST PANEL *))
 {
     int count;
     int itmp;
@@ -6246,7 +6247,8 @@ static int
 run_trace_menu(MENU * m)
 {
     ITEM **items;
-    ITEM *i, **p;
+    NCURSES_CONST ITEM *i;
+    ITEM **p;
 
     for (;;) {
 	bool changed = FALSE;
@@ -6424,7 +6426,7 @@ edit_secure(FIELD *me, int c)
 
     if (field_info(me, &rows, &cols, &frow, &fcol, &nrow, &nbuf) == E_OK
 	&& nbuf > 0) {
-	char *source = field_buffer(me, 1);
+	NCURSES_CONST char *source = field_buffer(me, 1);
 	size_t have = (source ? strlen(source) : 0) + 1;
 	size_t need = 80 + have;
 	char *temp = malloc(need);
@@ -6434,7 +6436,7 @@ edit_secure(FIELD *me, int c)
 	    _nc_STRNCPY(temp, source ? source : "", have + 1);
 	    len = (size_t) (char *) field_userptr(me);
 	    if (c <= KEY_MAX) {
-		if (isgraph(c) && (len + 1) < sizeof(temp)) {
+		if (isgraph(UChar(c)) && (len + 1) < sizeof(temp)) {
 		    temp[len++] = (char) c;
 		    temp[len] = 0;
 		    set_field_buffer(me, 1, temp);
@@ -6484,7 +6486,7 @@ edit_secure(FIELD *me, int c)
 }
 
 static int
-form_virtualize(FORM *f, WINDOW *w)
+form_virtualize(NCURSES_CONST FORM *f, WINDOW *w)
 {
     /* *INDENT-OFF* */
     static const struct {
@@ -6658,7 +6660,7 @@ CHAR_CHECK_CB(mi_char_check)
 static
 FIELDCHECK_CB(pw_field_check)
 {
-    char *s = field_buffer(fld, 0);
+    NCURSES_CONST char *s = field_buffer(fld, 0);
     int n;
 
     for (n = 0; s[n] != '\0'; ++n) {
@@ -6680,7 +6682,8 @@ static int
 form_test(bool recur GCC_UNUSED)
 {
     FORM *form;
-    FIELD *f[12], *secure;
+    FIELD *f[12];
+    NCURSES_CONST FIELD *secure;
     FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check);
     FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check);
     int c;
@@ -7176,7 +7179,7 @@ overlap_test_3(WINDOW *a)
 }
 
 static void
-overlap_test_4(int flavor, WINDOW *a, WINDOW *b)
+overlap_test_4(int flavor, NCURSES_CONST WINDOW *a, WINDOW *b)
 {
     switch ((otCOPY) flavor) {
     case otCOPY_overwrite:
@@ -7899,7 +7902,7 @@ main(int argc, char *argv[])
     bool monochrome = FALSE;
 #if HAVE_COLOR_CONTENT
     bool xterm_colors = FALSE;
-    char *palette_file = 0;
+    NCURSES_CONST char *palette_file = 0;
 #endif
 
     setlocale(LC_ALL, "");
diff --git a/test/padview.c b/test/padview.c
index 0defee343..35167f332 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.22 2022/12/04 00:40:11 tom Exp $
+ * $Id: padview.c,v 1.24 2024/10/06 21:08:25 tom Exp $
  */
 
 #include <test.priv.h>
@@ -182,7 +182,7 @@ read_file(const char *filename)
 
 #if USE_WIDEC_SUPPORT
     if (!memcmp("\357\273\277", my_blob, 3)) {
-	char *s = my_blob + 3;
+	const char *s = my_blob + 3;
 	char *d = my_blob;
 	Trace(("trim BOM"));
 	do {
@@ -213,7 +213,7 @@ read_file(const char *filename)
     for (k = 0; my_vec[k]; ++k) {
 	char *s;
 #if USE_WIDEC_SUPPORT
-	char *last = my_vec[k] + (int) strlen(my_vec[k]);
+	const char *last = my_vec[k] + (int) strlen(my_vec[k]);
 	wchar_t wch[2];
 	size_t rc;
 #ifndef state_unused
@@ -279,7 +279,7 @@ VERSION_COMMON()
 int
 main(int argc, char *argv[])
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  q,^Q,ESC       - quit this program",
@@ -532,7 +532,7 @@ main(int argc, char *argv[])
 	    beep();
 	    break;
 	}
-	if (c >= KEY_MIN || (c > 0 && !isdigit(c))) {
+	if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) {
 	    got_number = FALSE;
 	    value = 0;
 	}
diff --git a/test/parse_rgb.h b/test/parse_rgb.h
index df315b58b..b931ed00a 100644
--- a/test/parse_rgb.h
+++ b/test/parse_rgb.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: parse_rgb.h,v 1.5 2020/02/02 23:34:34 tom Exp $
+ * $Id: parse_rgb.h,v 1.6 2024/10/05 19:26:24 tom Exp $
  *
  * Sample implementation of ncurses RGB extension from user_caps(5).
  */
@@ -49,7 +49,7 @@ parse_rgb(int *r_max, int *g_max, int *b_max)
 	int bits;
 	int pwr2;
 	int r = 0, g = 0, b = 0;
-	char *data;
+	const char *data;
 	char ch;
 
 	for (max_bits = 0, pwr2 = 1;
diff --git a/test/picsmap.c b/test/picsmap.c
index b582f3aad..46ec7251d 100644
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2017,2018 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.149 2023/04/23 23:20:37 tom Exp $
+ * $Id: picsmap.c,v 1.150 2024/10/05 19:26:24 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -574,7 +574,7 @@ read_palette(const char *filename)
 	    _nc_STRCAT(full_name, filename, need);
 	    if (tries & 4) {
 		char *t = s;
-		char *tc;
+		const char *tc;
 		int num;
 		char chr;
 		int found = 0;
@@ -1374,8 +1374,8 @@ parse_img(const char *filename)
 		int r, g, b, nocolor;
 		float rf, gf, bf;
 		unsigned check;
-		char *t;
-		char *s = t = strchr(buffer, '#');
+		char *s = strchr(buffer, '#');
+		const char *t = s;
 		bool matched = FALSE;
 
 		if (s != 0) {
@@ -1492,7 +1492,7 @@ read_picture(const char *filename, char **data)
 #define fg_color(pics,n) (pics->fgcol[n].fgcol)
 
 static void
-dump_picture(PICS_HEAD * pics)
+dump_picture(const PICS_HEAD * pics)
 {
     int y, x;
 
@@ -1767,7 +1767,7 @@ main(int argc, char *argv[])
 #if USE_EXTENDED_COLORS
 	case 'x':
 	    {
-		char *s = optarg;
+		const char *s = optarg;
 		while (*s) {
 		    switch (*s++) {
 		    case 'p':
diff --git a/test/popup_msg.c b/test/popup_msg.c
index 7a260dd70..d658b6281 100644
--- a/test/popup_msg.c
+++ b/test/popup_msg.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: popup_msg.c,v 1.12 2024/06/29 18:34:58 tom Exp $
+ * $Id: popup_msg.c,v 1.13 2024/10/06 21:07:01 tom Exp $
  *
  * Show a multi-line message in a window which may extend beyond the screen.
  *
@@ -62,7 +62,7 @@ end_popup(void)
  * Display a temporary window, e.g., to display a help-message.
  */
 void
-popup_msg(WINDOW *parent, const char *const *msg)
+popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
 {
     int x0 = 4;
     int y0 = 2;
@@ -171,12 +171,12 @@ popup_msg(WINDOW *parent, const char *const *msg)
 void
 popup_msg2(WINDOW *parent, char **msg)
 {
-    popup_msg(parent, (const char *const *) msg);
+    popup_msg(parent, (NCURSES_CONST char *const *) msg);
 }
 
 #else
 void
-popup_msg(WINDOW *parent, const char *const *msg)
+popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
 {
     (void) parent;
     (void) msg;
diff --git a/test/popup_msg.h b/test/popup_msg.h
index 88dff73b2..6b08fd787 100644
--- a/test/popup_msg.h
+++ b/test/popup_msg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: popup_msg.h,v 1.5 2020/02/02 23:34:34 tom Exp $
+ * $Id: popup_msg.h,v 1.6 2024/10/06 21:17:54 tom Exp $
  *
  * Utility functions for a popup-message or help-screen.
  */
@@ -37,7 +37,7 @@
 
 #include <test.priv.h>
 
-extern void popup_msg(WINDOW *parent, const char *const *msg);
+extern void popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg);
 extern void popup_msg2(WINDOW *parent, char **msg);
 
 #endif /* POPUP_MSG_H_incl */
diff --git a/test/railroad.c b/test/railroad.c
index 4d7c0700d..fa9590a29 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 2000-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $
+ * $Id: railroad.c,v 1.27 2024/10/05 19:26:24 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -113,7 +113,7 @@ Underline(int flag)
 static void
 ShowSign(char *string)
 {
-    char *base = string;
+    const char *base = string;
     int first, last;
 
     if (moveit != 0) {
diff --git a/test/rain.c b/test/rain.c
index 11d0fda55..06a5ff4f2 100644
--- a/test/rain.c
+++ b/test/rain.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: rain.c,v 1.58 2024/08/31 15:56:10 tom Exp $
+ * $Id: rain.c,v 1.62 2024/10/06 21:09:00 tom Exp $
  */
 #include <test.priv.h>
 #include <popup_msg.h>
@@ -45,7 +45,7 @@ WANT_USE_WINDOW();
 
 struct DATA;
 
-typedef void (*DrawPart) (struct DATA *);
+typedef void (*DrawPart) (const struct DATA *);
 
 typedef struct DATA {
     int y, x;
@@ -118,25 +118,25 @@ next_j(int j)
 }
 
 static void
-part1(DATA * drop)
+part1(const DATA * drop)
 {
     MvAddCh(drop->y, drop->x, '.');
 }
 
 static void
-part2(DATA * drop)
+part2(const DATA * drop)
 {
     MvAddCh(drop->y, drop->x, 'o');
 }
 
 static void
-part3(DATA * drop)
+part3(const DATA * drop)
 {
     MvAddCh(drop->y, drop->x, 'O');
 }
 
 static void
-part4(DATA * drop)
+part4(const DATA * drop)
 {
     MvAddCh(drop->y - 1, drop->x, '-');
     MvAddStr(drop->y, drop->x - 1, "|.|");
@@ -144,7 +144,7 @@ part4(DATA * drop)
 }
 
 static void
-part5(DATA * drop)
+part5(const DATA * drop)
 {
     MvAddCh(drop->y - 2, drop->x, '-');
     MvAddStr(drop->y - 1, drop->x - 1, "/ \\");
@@ -154,7 +154,7 @@ part5(DATA * drop)
 }
 
 static void
-part6(DATA * drop)
+part6(const DATA * drop)
 {
     MvAddCh(drop->y - 2, drop->x, ' ');
     MvAddStr(drop->y - 1, drop->x - 1, "   ");
@@ -186,7 +186,7 @@ really_draw(WINDOW *win, void *arg)
 }
 
 static void
-draw_part(void (*func) (DATA *), int state, DATA * data)
+draw_part(void (*func) (const DATA *), int state, DATA * data)
 {
     data->func = func;
     data->state = state;
@@ -328,7 +328,7 @@ VERSION_COMMON()
 int
 main(int argc, char *argv[])
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	" q/Q        exit the program",
diff --git a/test/redraw.c b/test/redraw.c
index 749f790b3..bdc7bdd8e 100644
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $
+ * $Id: redraw.c,v 1.18 2024/10/06 21:17:54 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
@@ -61,7 +61,7 @@ trash(int beg_x, int max_x, int cur_x)
 static void
 test_redraw(WINDOW *win)
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  ^Q/ESC/q   - quit",
diff --git a/test/savescreen.c b/test/savescreen.c
index 3ea619306..878f9c3e1 100644
--- a/test/savescreen.c
+++ b/test/savescreen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 2006-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $
+ * $Id: savescreen.c,v 1.65 2024/10/06 21:10:09 tom Exp $
  *
  * Demonstrate save/restore functions from the curses library.
  * Thomas Dickey - 2007/7/14
@@ -96,7 +96,7 @@ cleanup(char *files[])
 }
 
 static int
-load_screen(char *filename)
+load_screen(NCURSES_CONST char *filename)
 {
     int result;
 
@@ -170,7 +170,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors)
 #if USE_WIDEC_SUPPORT
     cchar_t mycc;
 #endif
-    char *filename = files[which];
+    NCURSES_CONST char *filename = files[which];
     bool dumped = FALSE;
 
     if (filename != 0) {
@@ -216,7 +216,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors)
 static void
 editor_help(void)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"You are now in the screen-editor, which allows you to make some",
 	"lines on the screen, as well as save copies of the screen to a",
@@ -238,7 +238,7 @@ editor_help(void)
 static void
 replay_help(void)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"You are now in the screen-loader, which allows you to view",
 	"the dumped/restored screens.",
@@ -286,7 +286,7 @@ main(int argc, char *argv[])
     bool replaying = FALSE;
     bool done = FALSE;
     char **files;
-    char *fill_by = 0;
+    NCURSES_CONST char *fill_by = 0;
 #if USE_WIDEC_SUPPORT
     cchar_t mycc;
     static const wchar_t mywc[2] =
diff --git a/test/tclock.c b/test/tclock.c
index 1a7496289..8491c5efc 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.48 2023/02/25 16:42:22 tom Exp $ */
+/* $Id: tclock.c,v 1.49 2024/10/05 18:47:56 tom Exp $ */
 
 #define NEED_TIME_H
 #include <test.priv.h>
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
     int lastbeep = -1;
     bool odd = FALSE;
     time_t tim;
-    struct tm *t;
+    const struct tm *t;
     char szChar[20];
     char *text;
     short my_bg = COLOR_BLACK;
diff --git a/test/test.priv.h b/test/test.priv.h
index e2a969fef..f495a6987 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.219 2024/08/31 10:46:01 Rafael.Kitover Exp $ */
+/* $Id: test.priv.h,v 1.220 2024/10/05 19:01:00 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -765,8 +765,8 @@ extern int optind;
 
 #define VERSION_COMMON() \
 static char *version_common(char **argv) { \
-	char *base = argv[0]; \
-	char *part = strrchr(base, '/'); \
+	const char *base = argv[0]; \
+	const char *part = strrchr(base, '/'); \
 	size_t need = strlen(base) + 80; \
 	char *result = malloc(need); \
 	if (result != NULL) { \
@@ -916,8 +916,8 @@ extern int TABSIZE;
  * Workaround in case getcchar() returns a positive value when the source
  * string produces only a L'\0'.
  */
-#define TEST_CCHAR(s, count, then_stmt, else_stmt) \
-	if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \
+#define TEST_CCHAR(s, then_stmt, else_stmt) \
+	if (getcchar(s, NULL, NULL, NULL, NULL) > 0) { \
 	    wchar_t test_wch[CCHARW_MAX + 2]; \
 	    attr_t test_attrs; \
 	    NCURSES_PAIRS_T test_pair; \
diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c
index f69e1ddc2..2c5e91156 100644
--- a/test/test_add_wchstr.c
+++ b/test/test_add_wchstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.35 2024/10/05 19:26:24 tom Exp $
  *
  * Demonstrate the waddwchstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -158,7 +158,7 @@ ChWStr(const wchar_t *source)
 }
 
 static void
-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
+legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
 {
     const char *showstate;
 
diff --git a/test/test_addchstr.c b/test/test_addchstr.c
index cddc31528..1de86c07b 100644
--- a/test/test_addchstr.c
+++ b/test/test_addchstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $
+ * $Id: test_addchstr.c,v 1.30 2024/10/05 19:26:24 tom Exp $
  *
  * Demonstrate the waddchstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -169,7 +169,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length)
 }
 
 static int
-ColOf(char *buffer, int length, int margin)
+ColOf(const char *buffer, int length, int margin)
 {
     int n;
     int result;
diff --git a/test/test_addstr.c b/test/test_addstr.c
index ba8a90e5c..940404bb8 100644
--- a/test/test_addstr.c
+++ b/test/test_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $
+ * $Id: test_addstr.c,v 1.21 2024/10/05 19:27:33 tom Exp $
  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -91,7 +91,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length)
 }
 
 static int
-ColOf(char *buffer, int length, int margin)
+ColOf(const char *buffer, int length, int margin)
 {
     int n;
     int result;
diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index 9e51f49df..cfc4e8177 100644
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
+ * $Id: test_addwstr.c,v 1.23 2024/10/05 19:27:33 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -82,7 +82,7 @@ static bool w_opt = FALSE;
 static int n_opt = -1;
 
 static void
-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
+legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
 {
     const char *showstate;
 
diff --git a/test/test_endwin.c b/test/test_endwin.c
index 8e0d283cd..b761f22ad 100644
--- a/test/test_endwin.c
+++ b/test/test_endwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2023 Thomas E. Dickey                                          *
+ * Copyright 2023,2024 Thomas E. Dickey                                     *
  *                                                                          *
  * 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: test_endwin.c,v 1.2 2023/11/10 15:17:19 tom Exp $
+ * $Id: test_endwin.c,v 1.3 2024/10/05 19:27:33 tom Exp $
  */
 #include <test.priv.h>
 
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
     int rc_e1 = OK;
     int rc_e2 = OK;
     int rc_e3 = OK;
-    SCREEN *sp = NULL;
+    const SCREEN *sp = NULL;
     bool opt_e = FALSE;
     bool opt_i = FALSE;
     bool opt_n = FALSE;
diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c
index 2a788fce8..78887dbb7 100644
--- a/test/test_get_wstr.c
+++ b/test/test_get_wstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $
+ * $Id: test_get_wstr.c,v 1.16 2024/10/06 23:15:10 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -69,7 +69,7 @@ Quit(int ch)
 }
 
 static int
-Remainder(WINDOW *txtwin)
+Remainder(const WINDOW *txtwin)
 {
     int result = getmaxx(txtwin) - getcurx(txtwin);
     return (result > 0) ? result : 0;
@@ -138,7 +138,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
 static int
 recursive_test(int level, char **argv, WINDOW *strwin)
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  q,^Q,ESC       - quit this program",
diff --git a/test/test_getstr.c b/test/test_getstr.c
index dbc0a0a27..15cd4c96b 100644
--- a/test/test_getstr.c
+++ b/test/test_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $
+ * $Id: test_getstr.c,v 1.19 2024/10/06 22:36:46 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -76,7 +76,7 @@ Quit(int ch)
 }
 
 static int
-Remainder(WINDOW *txtwin)
+Remainder(NCURSES_CONST WINDOW *txtwin)
 {
     int result = getmaxx(txtwin) - getcurx(txtwin);
     return (result > 0) ? result : 0;
@@ -145,7 +145,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
 static int
 recursive_test(int level, char **argv, WINDOW *strwin)
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  q,^Q,ESC       - quit this program",
diff --git a/test/test_instr.c b/test/test_instr.c
index 677b3d40c..80717471a 100644
--- a/test/test_instr.c
+++ b/test/test_instr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_instr.c,v 1.13 2024/06/29 18:42:53 tom Exp $
+ * $Id: test_instr.c,v 1.15 2024/10/06 21:11:54 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -56,13 +56,13 @@ Quit(int ch)
 }
 
 static void
-show_1st(WINDOW *win, int line, char *buffer)
+show_1st(WINDOW *win, int line, NCURSES_CONST char *buffer)
 {
     MvWAddStr(win, line, 5, buffer);
 }
 
 static void
-showmore(WINDOW *win, int line, char *buffer)
+showmore(WINDOW *win, int line, NCURSES_CONST char *buffer)
 {
     wmove(win, line, 0);
     wclrtoeol(win);
@@ -72,7 +72,7 @@ showmore(WINDOW *win, int line, char *buffer)
 static void
 show_help(WINDOW *win)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"Show file contents and a viewport from the variants of winstr."
 	,"Use h/j/k/l or arrow keys to move the viewport."
diff --git a/test/test_inwstr.c b/test/test_inwstr.c
index 0196f5bb7..1cf5e56f5 100644
--- a/test/test_inwstr.c
+++ b/test/test_inwstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_inwstr.c,v 1.9 2024/06/29 18:40:02 tom Exp $
+ * $Id: test_inwstr.c,v 1.11 2024/10/06 23:15:38 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -59,13 +59,13 @@ Quit(int ch)
 }
 
 static void
-show_1st(WINDOW *win, int line, wchar_t *buffer)
+show_1st(WINDOW *win, int line, const wchar_t *buffer)
 {
     (void) mvwaddwstr(win, line, 5, buffer);
 }
 
 static void
-showmore(WINDOW *win, int line, wchar_t *buffer)
+showmore(WINDOW *win, int line, const wchar_t *buffer)
 {
     wmove(win, line, 0);
     wclrtoeol(win);
@@ -75,7 +75,7 @@ showmore(WINDOW *win, int line, wchar_t *buffer)
 static void
 show_help(WINDOW *win)
 {
-    static const char *msgs[] =
+    static NCURSES_CONST char *msgs[] =
     {
 	"Show file contents and a viewport from the variants of winwstr."
 	,"Use h/j/k/l or arrow keys to move the viewport."
diff --git a/test/test_mouse.c b/test/test_mouse.c
index fa37a0af2..9e9a72c9c 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.32 2024/08/31 10:46:01 Rafael.Kitover Exp $
+ * $Id: test_mouse.c,v 1.33 2024/10/05 18:47:56 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -38,7 +38,7 @@ static int logoffset = 0;
 static void
 raw_loop(void)
 {
-    char *xtermcap;
+    const char *xtermcap;
 
     printf("Entering raw mode. Ctrl-c to quit.\n");
 
diff --git a/test/test_opaque.c b/test/test_opaque.c
index 09b98c009..cc8d657d6 100644
--- a/test/test_opaque.c
+++ b/test/test_opaque.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $
+ * $Id: test_opaque.c,v 1.16 2024/10/05 19:27:33 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -157,13 +157,13 @@ test_opaque_syncok(WINDOW *win, int mode)
 }
 
 static int
-status_y(WINDOW *stswin, int cell)
+status_y(const WINDOW *stswin, int cell)
 {
     return (cell % getmaxy(stswin));
 }
 
 static int
-status_x(WINDOW *stswin, int cell)
+status_x(const WINDOW *stswin, int cell)
 {
     return (15 * (cell / getmaxy(stswin)));
 }
diff --git a/test/test_sgr.c b/test/test_sgr.c
index 8763dca3c..f7a7863b5 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
+ * $Id: test_sgr.c,v 1.25 2024/10/06 21:05:50 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -142,10 +142,10 @@ free_dblist(void)
 #define MASK_REV  (1 << 2)
 
 static void
-dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
+dumpit(unsigned bits, unsigned ignore, NCURSES_CONST char *sgr, NCURSES_CONST char *sgr0)
 {
-    static const char sample[] = "abcdefghijklm";
-    static char params[] = "SURBDBIPA";
+    static NCURSES_CONST char sample[] = "abcdefghijklm";
+    static NCURSES_CONST char params[] = "SURBDBIPA";
     unsigned n;
 
     printf("%4u ", bits);
@@ -177,12 +177,11 @@ one_bit(unsigned a, unsigned b)
 static void
 brute_force(const char *name)
 {
-    unsigned count;
-    char *my_sgr;
-    char *my_sgr0;
-    char *my_bold;
-    char *my_revs;
-    char *my_smso;
+    NCURSES_CONST char *my_sgr;
+    NCURSES_CONST char *my_sgr0;
+    NCURSES_CONST char *my_bold;
+    NCURSES_CONST char *my_revs;
+    NCURSES_CONST char *my_smso;
     char *my_name = strdup(name);
 
     if (db_list) {
@@ -219,6 +218,7 @@ brute_force(const char *name)
 	unsigned ignore = 0;
 	unsigned reason = 0;
 	unsigned repeat = 0;
+	unsigned count;
 	for (count = 0; count < MAXSGR; ++count) {
 	    values[count] = tparm(my_sgr,
 				  BITS2P(1),
@@ -334,7 +334,7 @@ int
 main(int argc, char *argv[])
 {
     int ch;
-    char *name;
+    const char *name;
 
     while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) {
 	switch (ch) {
@@ -369,7 +369,7 @@ main(int argc, char *argv[])
     } else if ((name = getenv("TERM")) != 0) {
 	brute_force(name);
     } else {
-	static char dumb[] = "dumb";
+	static const char dumb[] = "dumb";
 	brute_force(dumb);
     }
 
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 50289defd..5a8f65021 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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_tparm.c,v 1.39 2023/11/11 01:00:03 tom Exp $
+ * $Id: test_tparm.c,v 1.42 2024/10/06 20:50:27 tom Exp $
  *
  * Exercise tparm/tiparm, either for all possible capabilities with fixed
  * parameters, or one capability with specific combinations of parameters.
@@ -107,7 +107,7 @@ output_func(int ch)
 }
 
 static int
-isNumeric(char *source)
+isNumeric(NCURSES_CONST char *source)
 {
     char *next = 0;
     long value = strtol(source, &next, 0);
@@ -245,7 +245,7 @@ analyze_format(const char *format, int *mask, char **p_is_s)
 #define NS_9(fmt)	NS_8(fmt), NumStr(8)
 
 static void
-test_tparm(const char *name, const char *format, long *number, char **string)
+test_tparm(const char *name, NCURSES_CONST char *format, long *number, char **string)
 {
     char *use_strings[MAX_PARM];
     char *result = NULL;
@@ -527,7 +527,7 @@ main(int argc, char *argv[])
 	    }
 	} else {
 	    char *s = t_opt;
-	    char *t;
+	    NCURSES_CONST char *t;
 	    while ((t = strtok(s, ",")) != 0) {
 		s = 0;
 		if (len_terms + 2 >= max_terms) {
@@ -603,7 +603,7 @@ main(int argc, char *argv[])
 #if NCURSES_XNAMES
 	    len_caps = std_caps;
 	    if (cur_term) {
-		TERMTYPE *term = (TERMTYPE *) cur_term;
+		NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
 		for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
 		    GrowArray(all_caps, max_caps, len_caps);
 		    GrowArray(cap_name, max_name, len_caps);
diff --git a/test/test_vidputs.c b/test/test_vidputs.c
index 31dc9da4d..0c02cdee0 100644
--- a/test/test_vidputs.c
+++ b/test/test_vidputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $
+ * $Id: test_vidputs.c,v 1.16 2024/10/06 21:17:54 tom Exp $
  *
  * Demonstrate the vidputs and vidattr functions.
  * Thomas Dickey - 2013/01/12
@@ -51,7 +51,7 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
-outs(const char *s)
+outs(NCURSES_CONST char *s)
 {
     if (VALID_STRING(s)) {
 	tputs(s, 1, outc);
diff --git a/test/testcurs.c b/test/testcurs.c
index 750e5a450..7e6594b9a 100644
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
- * $Id: testcurs.c,v 1.58 2023/05/28 14:23:34 tom Exp $
+ * $Id: testcurs.c,v 1.59 2024/10/05 19:17:19 tom Exp $
  */
 
 #include <test.priv.h>
@@ -245,7 +245,7 @@ inputTest(WINDOW *win)
 	wclrtobot(win);
 	if (c >= KEY_MIN)
 	    wprintw(win, "Key Pressed: %s", keyname(c));
-	else if (isprint(c))
+	else if (isprint(UChar(c)))
 	    wprintw(win, "Key Pressed: %c", c);
 	else
 	    wprintw(win, "Key Pressed: %s", unctrl(UChar(c)));
@@ -748,8 +748,8 @@ main(int argc, char *argv[])
 	keypad(stdscr, TRUE);
 	raw();
 	key = getch();
-	if (key < KEY_MIN && key > 0 && isalpha(key)) {
-	    if (islower(key))
+	if (key < KEY_MIN && key > 0 && isalpha(UChar(key))) {
+	    if (islower(UChar(key)))
 		key = toupper(key);
 	    for (n = 0; n < MAX_OPTIONS; ++n) {
 		if (key == command[n].text[0]) {
diff --git a/test/testscanw.c b/test/testscanw.c
index 415250c6e..ec33b06e5 100644
--- a/test/testscanw.c
+++ b/test/testscanw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2002,2006 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
  * Date:  1997/03/17
  * From:  bayern@morpheus.cis.yale.edu
  *
- * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $
+ * $Id: testscanw.c,v 1.16 2024/10/05 19:27:33 tom Exp $
  */
 #include <test.priv.h>
 
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
     curses_trace(TRACE_UPDATE | TRACE_CALLS);
 #endif
     while (optind < argc) {
-	char *token = argv[optind++];
+	const char *token = argv[optind++];
 	if (isdigit(UChar(*token)))
 	    move(atoi(token), 0);
 	else if (!strcmp(token, "k+"))
diff --git a/test/view.c b/test/view.c
index 72e0cfbb6..7009508ab 100644
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.145 2022/12/04 00:40:11 tom Exp $
+ * $Id: view.c,v 1.147 2024/10/06 21:08:05 tom Exp $
  */
 
 #include <test.priv.h>
@@ -93,8 +93,7 @@ ch_len(NCURSES_CH_T *src)
 
 #if USE_WIDEC_SUPPORT
     for (;;) {
-	int count;
-	TEST_CCHAR(src, count, {
+	TEST_CCHAR(src, {
 	    int len = wcwidth(test_wch[0]);
 	    result += (len > 0) ? len : 1;
 	    ++src;
@@ -186,12 +185,10 @@ show_all(const char *tag)
 	     */
 	    {
 		int j;
-		int width = 1;
+		int width;
 
 		for (j = actual = 0; j < shift; ++j) {
-		    int count;
-
-		    TEST_CCHAR(s + j, count, {
+		    TEST_CCHAR(s + j, {
 			width = wcwidth(test_wch[0]);
 		    }
 		    , {
@@ -294,7 +291,7 @@ read_file(const char *filename)
 
 #if USE_WIDEC_SUPPORT
     if (!memcmp("\357\273\277", my_blob, 3)) {
-	char *s = my_blob + 3;
+	const char *s = my_blob + 3;
 	char *d = my_blob;
 	Trace(("trim BOM"));
 	do {
@@ -329,7 +326,7 @@ read_file(const char *filename)
 	char *s;
 	int y, x;
 #if USE_WIDEC_SUPPORT
-	char *last = my_vec[k] + (int) strlen(my_vec[k]);
+	const char *last = my_vec[k] + (int) strlen(my_vec[k]);
 	wchar_t wch[2];
 	size_t rc;
 #ifndef state_unused
@@ -408,7 +405,7 @@ VERSION_COMMON()
 int
 main(int argc, char *argv[])
 {
-    static const char *help[] =
+    static NCURSES_CONST char *help[] =
     {
 	"Commands:",
 	"  q,^Q,ESC       - quit this program",
@@ -659,7 +656,7 @@ main(int argc, char *argv[])
 	    beep();
 	    break;
 	}
-	if (c >= KEY_MIN || (c > 0 && !isdigit(c))) {
+	if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) {
 	    got_number = FALSE;
 	    value = 0;
 	}

From 971cdeff8d617f68184ee9ac4850431d2a1effce Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 20 Oct 2024 01:59:17 +0200
Subject: [PATCH 087/106] ncurses-6.5-20241019.patch.gz

---
 NEWS                             |  6 ++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 include/nc_win32.h               |  4 ++--
 ncurses/base/lib_delch.c         |  6 ++---
 ncurses/base/lib_mouse.c         |  6 ++---
 ncurses/base/lib_set_term.c      | 10 ++++++---
 ncurses/curses.priv.h            |  8 +++----
 ncurses/tinfo/captoinfo.c        |  5 ++---
 ncurses/tinfo/entries.c          |  4 ++--
 ncurses/tinfo/lib_setup.c        |  4 ++--
 ncurses/tinfo/lib_win32con.c     |  4 ++--
 ncurses/tinfo/parse_entry.c      |  4 ++--
 ncurses/tinfo/trim_sgr0.c        |  6 +++--
 ncurses/tinfo/write_entry.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 +-
 progs/clear.c                    |  6 ++---
 progs/dump_entry.c               | 24 +++++++++++---------
 progs/infocmp.c                  | 36 +++++++++++++++---------------
 progs/tabs.c                     |  8 +++----
 progs/tic.c                      | 38 ++++++++++++++++----------------
 progs/toe.c                      | 22 +++++++++---------
 progs/tset.c                     |  6 ++---
 test/demo_menus.c                |  4 ++--
 30 files changed, 127 insertions(+), 116 deletions(-)

diff --git a/NEWS b/NEWS
index ebcc37467..09b0a763c 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4188 2024/10/06 08:53:45 tom Exp $
+-- $Id: NEWS,v 1.4191 2024/10/19 21:59:42 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241019
+	+ fixes for compiler warnings/cppcheck.
+	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
+
 20241006
 	+ fixes for compiler warnings/cppcheck.
 	+ use xterm+alt+title in wezterm -TD
diff --git a/VERSION b/VERSION
index 7bf30eb8c..516be4167 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241006
+5:0:10	6.5	20241019
diff --git a/dist.mk b/dist.mk
index 70085c8f9..c5612b839 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1636 2024/10/06 08:53:45 tom Exp $
+# $Id: dist.mk,v 1.1637 2024/10/19 09:59:06 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241006
+NCURSES_PATCH = 20241019
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_win32.h b/include/nc_win32.h
index 5ed0baab8..d2668c355 100644
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.13 2024/08/31 18:17:21 tom Exp $ */
+/* $Id: nc_win32.h,v 1.14 2024/10/19 21:06:23 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
@@ -105,7 +105,7 @@ extern NCURSES_EXPORT(WORD)   _nc_console_MapColor(bool fore, int color);
 extern NCURSES_EXPORT(void)   _nc_console_selectActiveHandle(void);
 extern NCURSES_EXPORT(bool)   _nc_console_get_SBI(void);
 extern NCURSES_EXPORT(void)   _nc_console_set_scrollback(bool normal, CONSOLE_SCREEN_BUFFER_INFO * info);
-extern NCURSES_EXPORT(int)    _nc_console_testmouse(SCREEN *,HANDLE,int EVENTLIST_2nd(_nc_eventlist*));
+extern NCURSES_EXPORT(int)    _nc_console_testmouse(const SCREEN *,HANDLE,int EVENTLIST_2nd(_nc_eventlist*));
 extern NCURSES_EXPORT(int)    _nc_console_keyok(int keycode,int flag);
 extern NCURSES_EXPORT(bool)   _nc_console_keyExist(int keycode);
 extern NCURSES_EXPORT(bool)   _nc_console_checkinit(bool initFlag, bool assumeTermInfo);
diff --git a/ncurses/base/lib_delch.c b/ncurses/base/lib_delch.c
index a4c7d247b..a24cb677a 100644
--- a/ncurses/base/lib_delch.c
+++ b/ncurses/base/lib_delch.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delch.c,v 1.15 2024/07/27 19:23:21 tom Exp $")
+MODULE_ID("$Id: lib_delch.c,v 1.16 2024/10/19 21:20:46 tom Exp $")
 
 NCURSES_EXPORT(int)
 wdelch(WINDOW *win)
@@ -54,8 +54,8 @@ wdelch(WINDOW *win)
 	NCURSES_CH_T blank = win->_nc_bkgd;
 	struct ldat *line = &(win->_line[win->_cury]);
 	NCURSES_CH_T *end = &(line->text[win->_maxx]);
-	NCURSES_CH_T *temp2 = &(line->text[win->_curx + 1]);
-	NCURSES_CH_T *temp1 = temp2 - 1;
+	NCURSES_CH_T *temp1 = &(line->text[win->_curx]);
+	const NCURSES_CH_T *temp2 = temp1 + 1;
 
 	CHANGED_TO_EOL(line, win->_curx, win->_maxx);
 	while (temp1 < end)
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index a03d8b8e1..ddb0c8d84 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.200 2024/02/17 21:13:01 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.201 2024/10/19 21:03:19 tom Exp $")
 
 #include <tic.h>
 
@@ -1219,7 +1219,7 @@ typedef struct {
 } SGR_DATA;
 
 static bool
-read_SGR(SCREEN *sp, SGR_DATA * result)
+read_SGR(const SCREEN *sp, SGR_DATA * result)
 {
     char kbuf[80];		/* bigger than any possible mouse response */
     int grabbed = 0;
@@ -2042,7 +2042,7 @@ mouseinterval(int maxclick)
 /* This may be used by other routines to ask for the existence of mouse
    support */
 NCURSES_EXPORT(bool)
-_nc_has_mouse(SCREEN *sp)
+_nc_has_mouse(const SCREEN *sp)
 {
     return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
 }
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 78de85920..a4f1931ea 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,6 +47,10 @@
 #include <tic.h>
 #include <new_pair.h>
 
+#ifdef __DJGPP__
+#include <io.h>
+#endif
+
 #if USE_GPM_SUPPORT
 #ifdef HAVE_LIBDL
 /* use dynamic loader to avoid linkage dependency */
@@ -57,7 +61,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.184 2022/12/10 21:34:12 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.186 2024/10/19 19:41:09 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -423,7 +427,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #ifdef __DJGPP__
     T(("setting output mode to binary"));
     fflush(output);
-    setmode(output, O_BINARY);
+    setmode(fileno(output), O_BINARY);
 #endif
 #if defined(EXP_WIN32_DRIVER)
     T(("setting output mode to binary"));
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 6ba124c34..1e148f3d4 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.692 2024/10/05 21:01:50 tom Exp $
+ * $Id: curses.priv.h,v 1.694 2024/10/19 21:23:40 tom Exp $
  *
  *	curses.priv.h
  *
@@ -208,7 +208,7 @@ extern int errno;
  * the path separator in configure doesn't work properly. So, if building
  * for MinGW, we enforce the correct Windows PATH separator
  */
-#if defined(_NC_WINDOWS_NATIVE)
+#if defined(_NC_WINDOWS_NATIVE) || defined(__DJGPP__)
 #  ifdef NCURSES_PATHSEP
 #    undef NCURSES_PATHSEP
 #  endif
@@ -2059,7 +2059,7 @@ extern NCURSES_EXPORT(void) _nc_screen_resume (void);
 extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
 
 /* lib_mouse.c */
-extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *);
+extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *);
 
 /* lib_mvcur.c */
 #define INFINITY	1000000	/* cost: too high to use */
@@ -2175,7 +2175,7 @@ extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
 extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
 extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
 extern NCURSES_EXPORT(void) _nc_flush (void);
-extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE2 *);
+extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, const TERMTYPE2 *);
 extern NCURSES_EXPORT(void) _nc_freeall (void);
 extern NCURSES_EXPORT(void) _nc_hash_map (void);
 extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *);
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index 3c80ec0f6..c3bf0d3c2 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.103 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.104 2024/10/19 21:18:54 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -535,8 +535,7 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 static int
 bcd_expression(const char *str)
 {
-    /* leave this non-const for HPUX */
-    static char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+";
+    static const char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+";
     int len = 0;
     char ch1, ch2;
 
diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index e5dc1acd4..33c7e40a2 100644
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: entries.c,v 1.36 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.37 2024/10/19 21:23:31 tom Exp $")
 
 /****************************************************************************
  *
@@ -91,7 +91,7 @@ _nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm)
 }
 
 NCURSES_EXPORT(void)
-_nc_free_entry(ENTRY * headp, TERMTYPE2 *tterm)
+_nc_free_entry(ENTRY * headp, const TERMTYPE2 *tterm)
 /* free the allocated storage consumed by the given list entry */
 {
     ENTRY *ep;
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 3174e583a..54fbe7522 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.244 2024/08/31 21:15:54 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.245 2024/10/19 21:17:36 tom Exp $")
 
 /****************************************************************************
  *
@@ -320,7 +320,7 @@ is_expected(const char *value, const char *expected)
 }
 
 static bool
-get_position(TERMINAL *termp, int fd, int *row, int *col)
+get_position(const TERMINAL *termp, int fd, int *row, int *col)
 {
     bool result = FALSE;
     size_t need = strlen(user7);
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index ee58ba7fe..ece50f0d4 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -38,7 +38,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32con.c,v 1.15 2024/08/31 15:55:10 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.16 2024/10/19 21:06:11 tom Exp $")
 
 #if defined(_NC_WINDOWS)
 
@@ -996,7 +996,7 @@ _nc_console_twait(
 
 NCURSES_EXPORT(int)
 _nc_console_testmouse(
-			 SCREEN *sp,
+			 const SCREEN *sp,
 			 HANDLE hdl,
 			 int delay
 			 EVENTLIST_2nd(_nc_eventlist * evl))
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 78548193a..23433697a 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.109 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.110 2024/10/19 21:22:04 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -707,7 +707,7 @@ append_acs0(string_desc * dst, int code, const char *src, size_t off)
 }
 
 static void
-append_acs(string_desc * dst, int code, char *src)
+append_acs(string_desc * dst, int code, const char *src)
 {
     if (VALID_STRING(src) && strlen(src) == 1) {
 	append_acs0(dst, code, src, 0);
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index 1589db0a7..1c5570901 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -37,7 +37,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.24 2024/10/05 20:53:48 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.25 2024/10/19 21:18:18 tom Exp $")
 
 #undef CUR
 #define CUR tp->
@@ -254,7 +254,7 @@ _nc_trim_sgr0(TERMTYPE2 *tp)
 	} else if (similar_sgr(off, end)
 		   && !similar_sgr(off, on)) {
 	    bool found = FALSE;
-	    size_t i, j, k;
+	    size_t i, j;
 
 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
 	    result = off;
@@ -262,6 +262,8 @@ _nc_trim_sgr0(TERMTYPE2 *tp)
 	     * If rmacs is a substring of sgr(0), remove that chunk.
 	     */
 	    if (PRESENT(exit_alt_charset_mode)) {
+		size_t k;
+
 		TR(TRACE_DATABASE, ("scan for rmacs %s", _nc_visbuf(exit_alt_charset_mode)));
 		j = strlen(off);
 		k = strlen(exit_alt_charset_mode);
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index afe703b21..4903ece9c 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.135 2024/09/28 17:31:09 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.136 2024/10/19 21:19:32 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -125,12 +125,12 @@ check_writeable(int code)
     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
     static bool verified[sizeof(dirnames)];
 
-    char dir[sizeof(LEAF_FMT)];
     const char *s = 0;
 
     if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
     } else if (!verified[s - dirnames]) {
+	char dir[sizeof(LEAF_FMT)];
 	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
 	if (make_db_root(dir) < 0) {
 	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 241270ac3..fb8a5e030 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241006) unstable; urgency=low
+ncurses6td (6.5+20241019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 241270ac3..fb8a5e030 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241006) unstable; urgency=low
+ncurses6td (6.5+20241019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index b01424303..471ccd178 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241006) unstable; urgency=low
+ncurses6td (6.5+20241019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Oct 2024 04:53:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f3b5ce49d..dd0a79c57 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.671 2024/10/06 08:53:45 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.672 2024/10/19 09:59:06 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1006"
+!define VERSION_MMDD  "1019"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9c34b2e6e..cb8d08f1c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241006
+Release: 20241019
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 182e5a568..9c1c97168 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241006
+Release: 20241019
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 967abb241..4ab72dbec 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241006
+Release: 20241019
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/clear.c b/progs/clear.c
index 97cb0f365..e0de8ce47 100644
--- a/progs/clear.c
+++ b/progs/clear.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <clear_cmd.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: clear.c,v 1.24 2021/03/20 18:23:14 tom Exp $")
+MODULE_ID("$Id: clear.c,v 1.25 2024/10/19 22:00:53 tom Exp $")
 
 const char *_nc_progname = "clear";
 
@@ -71,7 +71,7 @@ main(
     TTY tty_settings;
     int fd;
     int c;
-    char *term;
+    NCURSES_CONST char *term;
     bool opt_x = FALSE;		/* clear scrollback if possible */
 
     _nc_progname = _nc_rootname(argv[0]);
diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index be332d2e7..652c9e321 100644
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <termsort.h>		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.196 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.197 2024/10/19 22:00:53 tom Exp $")
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
@@ -725,7 +725,7 @@ indent_DYN(DYNBUF * buffer, int level)
  * given leading text.
  */
 static bool
-leading_DYN(DYNBUF * buffer, const char *leading)
+leading_DYN(const DYNBUF * buffer, const char *leading)
 {
     bool result = FALSE;
     size_t need = strlen(leading);
@@ -1118,7 +1118,7 @@ fmt_entry(TERMTYPE2 *tterm,
 			      : ((*srccap == 'k')
 				 ? 0
 				 : has_params(srccap, FALSE)));
-		char *cv = _nc_infotocap(name, srccap, params);
+		const char *cv = _nc_infotocap(name, srccap, params);
 
 		if (cv == 0) {
 		    if (outform == F_TCONVERR) {
@@ -1129,7 +1129,8 @@ fmt_entry(TERMTYPE2 *tterm,
 		    } else if (suppress_untranslatable) {
 			continue;
 		    } else {
-			char *s = srccap, *d = buffer;
+			const char *s = srccap;
+			char *d = buffer;
 			int need = 3 + (int) strlen(name);
 			while ((*d = *s++) != 0) {
 			    if ((d - buffer + 2) >= (int) sizeof(buffer)) {
@@ -1210,7 +1211,8 @@ fmt_entry(TERMTYPE2 *tterm,
 	    bool box_ok = TRUE;
 	    const char *acstrans = "lqkxjmwuvtn";
 	    const char *cp;
-	    char *tp, *sp, boxchars[11];
+	    const char *sp;
+	    char *tp, boxchars[11];
 
 	    tp = boxchars;
 	    for (cp = acstrans; *cp; cp++) {
@@ -1324,7 +1326,7 @@ kill_string(TERMTYPE2 *tterm, const char *const cap)
 }
 
 static char *
-find_string(TERMTYPE2 *tterm, char *name)
+find_string(TERMTYPE2 *tterm, const char *name)
 {
     PredIdx n;
     for (n = 0; n < NUM_STRINGS(tterm); ++n) {
@@ -1352,7 +1354,7 @@ kill_labels(TERMTYPE2 *tterm, int target)
     char name[20];
 
     for (n = 0; n <= 10; ++n) {
-	char *cap;
+	const char *cap;
 
 	_nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n);
 	cap = find_string(tterm, name);
@@ -1379,7 +1381,7 @@ kill_fkeys(TERMTYPE2 *tterm, int target)
     char name[20];
 
     for (n = 60; n >= 0; --n) {
-	char *cap;
+	const char *cap;
 
 	_nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n);
 	cap = find_string(tterm, name);
@@ -1444,7 +1446,7 @@ purged_acs(TERMTYPE2 *tterm)
 }
 
 static void
-encode_b64(char *target, char *source, unsigned state, int *saved)
+encode_b64(char *target, const char *source, unsigned state, int *saved)
 {
     /* RFC-4648 */
     static const char data[] =
@@ -1509,7 +1511,7 @@ dump_entry(TERMTYPE2 *tterm,
 		}
 	    }
 	    if (quickdump & 2) {
-		static char padding[] =
+		static const char padding[] =
 		{0, 0};
 		int value = 0;
 
diff --git a/progs/infocmp.c b/progs/infocmp.c
index e0621bc0e..f763ac540 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.165 2024/09/28 20:26:22 Branden.Robinson Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.166 2024/10/19 21:43:11 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -132,7 +132,7 @@ failed(const char *s)
 }
 
 static void
-canonical_name(char *source, char *target)
+canonical_name(const char *source, char *target)
 /* extract the terminal type's primary name */
 {
     int limit = NAMESIZE;
@@ -214,8 +214,6 @@ use_predicate(unsigned type, PredIdx idx)
     switch (type) {
     case BOOLEAN:
 	{
-	    int is_set = FALSE;
-
 	    /*
 	     * This assumes that multiple use entries are supposed
 	     * to contribute the logical or of their boolean capabilities.
@@ -228,6 +226,8 @@ use_predicate(unsigned type, PredIdx idx)
 	     * recorded in the terminfo database.
 	     */
 	    if (idx < NUM_BOOLEANS(&(entries[0].tterm))) {
+		int is_set = FALSE;
+
 		for (ep = &entries[1]; ep < entries + termcount; ep++) {
 		    if (idx < NUM_BOOLEANS(&(ep->tterm))
 			&& (is_set = ep->tterm.Booleans[idx])) {
@@ -242,14 +242,14 @@ use_predicate(unsigned type, PredIdx idx)
 
     case NUMBER:
 	{
-	    int value = ABSENT_NUMERIC;
-
 	    /*
 	     * We take the semantics of multiple uses to be 'each
 	     * capability gets the first non-default value found
 	     * in the sequence of use entries'.
 	     */
 	    if (idx < NUM_NUMBERS(&(entries[0].tterm))) {
+		int value = ABSENT_NUMERIC;
+
 		for (ep = &entries[1]; ep < entries + termcount; ep++)
 		    if (idx < NUM_NUMBERS(&(ep->tterm))
 			&& VALID_NUMERIC(ep->tterm.Numbers[idx])) {
@@ -265,8 +265,8 @@ use_predicate(unsigned type, PredIdx idx)
 
     case STRING:
 	{
-	    char *termstr = entries[0].tterm.Strings[idx];
-	    char *usestr = ABSENT_STRING;
+	    const char *termstr = entries[0].tterm.Strings[idx];
+	    const char *usestr = ABSENT_STRING;
 
 	    /*
 	     * We take the semantics of multiple uses to be 'each
@@ -302,7 +302,7 @@ use_predicate(unsigned type, PredIdx idx)
 }
 
 static bool
-useeq(ENTRY * e1, ENTRY * e2)
+useeq(const ENTRY * e1, const ENTRY * e2)
 /* are the use references in two entries equivalent? */
 {
     unsigned i, j;
@@ -329,7 +329,7 @@ useeq(ENTRY * e1, ENTRY * e2)
 }
 
 static bool
-entryeq(TERMTYPE2 *t1, TERMTYPE2 *t2)
+entryeq(const TERMTYPE2 *t1, const TERMTYPE2 *t2)
 /* are two entries equivalent? */
 {
     unsigned i;
@@ -352,7 +352,7 @@ entryeq(TERMTYPE2 *t1, TERMTYPE2 *t2)
 #define TIC_EXPAND(result) _nc_tic_expand(result, outform==F_TERMINFO, numbers)
 
 static void
-print_uses(ENTRY * ep, FILE *fp)
+print_uses(const ENTRY * ep, FILE *fp)
 /* print an entry's use references */
 {
     if (!ep->nuses) {
@@ -404,7 +404,7 @@ dump_numeric(int val, char *buf)
 }
 
 static void
-dump_string(char *val, char *buf)
+dump_string(const char *val, char *buf)
 /* display the value of a string capability */
 {
     if (val == ABSENT_STRING)
@@ -479,13 +479,13 @@ static void
 compare_predicate(PredType type, PredIdx idx, const char *name)
 /* predicate function to use for entry difference reports */
 {
-    ENTRY *e1 = &entries[0];
-    ENTRY *e2 = &entries[1];
+    const ENTRY *e1 = &entries[0];
+    const ENTRY *e2 = &entries[1];
     char buf1[MAX_STRING];
     char buf2[MAX_STRING];
     int b1, b2;
     int n1, n2;
-    char *s1, *s2;
+    const char *s1, *s2;
     bool found;
     int extra = 1;
 
@@ -866,7 +866,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE2 *tp)
 
 	/* first, check other capabilities in this entry */
 	for (i = 0; i < STRCOUNT; i++) {
-	    char *cp = tp->Strings[i];
+	    const char *cp = tp->Strings[i];
 
 	    /* don't use function-key capabilities */
 	    if (strnames[i] == NULL)
@@ -1331,7 +1331,7 @@ string_variable(const char *type)
 
 /* dump C initializers for the terminal type */
 static void
-dump_initializers(TERMTYPE2 *term)
+dump_initializers(const TERMTYPE2 *term)
 {
     unsigned n;
     const char *str = 0;
@@ -1455,7 +1455,7 @@ dump_initializers(TERMTYPE2 *term)
 
 /* dump C initializers for the terminal type */
 static void
-dump_termtype(TERMTYPE2 *term)
+dump_termtype(const TERMTYPE2 *term)
 {
     (void) printf("\t%s\n\t\t%s,\n", L_CURL, name_initializer("alias"));
     (void) printf("\t\t(char *)0,\t/* pointer to string table */\n");
diff --git a/progs/tabs.c b/progs/tabs.c
index 113c42ab0..42560ea38 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -39,7 +39,7 @@
 #include <progs.priv.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tabs.c,v 1.54 2024/08/24 22:56:43 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.55 2024/10/19 21:45:18 tom Exp $")
 
 static GCC_NORETURN void usage(void);
 
@@ -78,7 +78,7 @@ ansi_clear_tabs(void)
 {
     bool result = FALSE;
     if (VALID_STRING(clear_all_tabs)) {
-	char *param = skip_csi(clear_all_tabs);
+	const char *param = skip_csi(clear_all_tabs);
 	if (!strcmp(param, "3g"))
 	    result = TRUE;
     }
@@ -86,7 +86,7 @@ ansi_clear_tabs(void)
 }
 
 static void
-do_tabs(int *tab_list)
+do_tabs(const int *tab_list)
 {
     int last = 1;
     int stop;
@@ -229,7 +229,7 @@ print_ruler(const int *const tab_list, const char *new_line)
  * ruler.
  */
 static void
-write_tabs(int *tab_list, const char *new_line)
+write_tabs(const int *tab_list, const char *new_line)
 {
     int stop;
 
diff --git a/progs/tic.c b/progs/tic.c
index fc77b3444..6f588fd7f 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.325 2024/03/02 19:33:22 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.326 2024/10/19 21:31:50 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -203,7 +203,8 @@ write_it(ENTRY * ep)
 {
     unsigned n;
     int ch;
-    char *s, *d, *t;
+    char *s, *d;
+    const char *t;
     char result[MAX_ENTRY_SIZE];
 
     /*
@@ -411,7 +412,6 @@ copy_input(FILE *source, const char *filename, char *alt_file)
     char my_altfile[PATH_MAX];
     FILE *result = 0;
     FILE *target;
-    int ch;
 
     if (alt_file == NULL)
 	alt_file = my_altfile;
@@ -423,7 +423,7 @@ copy_input(FILE *source, const char *filename, char *alt_file)
     } else {
 	clearerr(source);
 	for (;;) {
-	    ch = fgetc(source);
+	    int ch = fgetc(source);
 	    if (feof(source)) {
 		break;
 	    } else if (ferror(source)) {
@@ -1119,7 +1119,7 @@ main(int argc, char *argv[])
  * Check if the alternate character-set capabilities are consistent.
  */
 static void
-check_acs(TERMTYPE2 *tp)
+check_acs(const TERMTYPE2 *tp)
 {
     int vt100_smacs = 0;
     int vt100_rmacs = 0;
@@ -1332,7 +1332,7 @@ keypad_index(const char *string)
 
     if ((ch = keypad_final(string)) != '\0') {
 	const char *list = "PQRSwxymtuvlqrsPpn";	/* app-keypad except "Enter" */
-	char *test = (strchr) (list, ch);
+	const char *test = (strchr) (list, ch);
 	if (test != 0)
 	    result = (long) (test - list);
     }
@@ -1363,7 +1363,7 @@ check_ansi_cursor(char *list[4])
 	}
     }
     if (!repeated) {
-	char *up = list[1];
+	const char *up = list[1];
 	size_t prefix = (size_t) csi_length(up);
 	size_t suffix;
 
@@ -1410,7 +1410,7 @@ check_ansi_cursor(char *list[4])
 #define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why)
 
 static void
-check_noaddress(TERMTYPE2 *tp, const char *why)
+check_noaddress(const TERMTYPE2 *tp, const char *why)
 {
     UNEXPECTED(column_address);
     UNEXPECTED(cursor_address);
@@ -1541,7 +1541,7 @@ check_cursor(TERMTYPE2 *tp)
  * is mapped inconsistently.
  */
 static void
-check_keypad(TERMTYPE2 *tp)
+check_keypad(const TERMTYPE2 *tp)
 {
     char show[80];
 
@@ -1727,7 +1727,7 @@ check_screen(TERMTYPE2 *tp)
 	bool have_kmouse = FALSE;
 	bool use_sgr_39_49 = FALSE;
 	const char *name_39_49 = "orig_pair or orig_colors";
-	char *name = _nc_first_name(tp->term_names);
+	const char *name = _nc_first_name(tp->term_names);
 	bool is_screen = !strncmp(name, "screen", 6);
 	bool screen_base = (is_screen
 			    && strchr(name, '.') == NULL);
@@ -1985,7 +1985,7 @@ line_capability(const char *name)
  * markers.
  */
 static void
-check_params(TERMTYPE2 *tp, const char *name, const char *value, int extended)
+check_params(const TERMTYPE2 *tp, const char *name, const char *value, int extended)
 {
     int expected = expected_params(name);
     int actual = 0;
@@ -2149,7 +2149,7 @@ skip_DECSCNM(const char *value, int *flag)
 }
 
 static void
-check_delays(TERMTYPE2 *tp, const char *name, const char *value)
+check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
 {
     const char *p, *q;
     const char *first = 0;
@@ -2575,7 +2575,7 @@ static bool
 similar_sgr(int num, char *a, char *b)
 {
     char *base_a = a;
-    char *base_b = b;
+    const char *base_b = b;
     int delaying = 0;
 
     while (*b != 0) {
@@ -2631,7 +2631,7 @@ check_tparm_err(int num)
 }
 
 static char *
-check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name)
+check_sgr(const TERMTYPE2 *tp, const char *zero, int num, char *cap, const char *name)
 {
     char *test;
 
@@ -2731,7 +2731,7 @@ get_fkey_list(TERMTYPE2 *tp)
 }
 
 static void
-show_fkey_name(NAME_VALUE * data)
+show_fkey_name(const NAME_VALUE * data)
 {
     if (data->keycode > 0) {
 	fprintf(stderr, " %s", keyname(data->keycode));
@@ -2909,7 +2909,7 @@ is_sgr_string(char *value)
  * Check if the given capability contains a given SGR attribute.
  */
 static void
-check_sgr_param(TERMTYPE2 *tp, int code, const char *name, char *value)
+check_sgr_param(TERMTYPE2 *tp, int code, const char *name, const char *const value)
 {
     if (VALID_STRING(value)) {
 	int ncv = ((code != 0) ? (1 << (code - 1)) : 0);
@@ -3111,7 +3111,7 @@ isValidEscape(const char *value, const char *expect)
 }
 
 static int
-guess_ANSI_VTxx(TERMTYPE2 *tp)
+guess_ANSI_VTxx(const TERMTYPE2 *tp)
 {
     int result = -1;
     int checks = 0;
@@ -3151,7 +3151,7 @@ guess_ANSI_VTxx(TERMTYPE2 *tp)
  */
 #if defined(user6) && defined(user7) && defined(user8) && defined(user9)
 static void
-check_user_6789(TERMTYPE2 *tp)
+check_user_6789(const TERMTYPE2 *tp)
 {
     /*
      * Check if the terminal is known to not 
@@ -3200,7 +3200,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     check_conflict(tp);
 
     for_each_string(j, tp) {
-	char *a = tp->Strings[j];
+	const char *a = tp->Strings[j];
 	if (VALID_STRING(a)) {
 	    const char *name = ExtStrname(tp, (int) j, strnames);
 	    /*
diff --git a/progs/toe.c b/progs/toe.c
index ecbfd53b5..f46224a9e 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.89 2023/07/01 17:04:46 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.90 2024/10/19 22:00:53 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -265,10 +265,10 @@ make_db_name(char *dst, const char *src, unsigned limit)
 typedef void (DescHook) (int /* db_index */ ,
 			 int /* db_limit */ ,
 			 const char * /* term_name */ ,
-			 TERMTYPE2 * /* term */ );
+			 const TERMTYPE2 * /* term */ );
 
 static const char *
-term_description(TERMTYPE2 *tp)
+term_description(const TERMTYPE2 *tp)
 {
     const char *desc;
 
@@ -283,7 +283,7 @@ term_description(TERMTYPE2 *tp)
 
 /* display a description for the type */
 static void
-deschook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)
+deschook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp)
 {
     (void) db_index;
     (void) db_limit;
@@ -307,7 +307,7 @@ string_sum(const char *value)
 }
 
 static unsigned long
-checksum_of(TERMTYPE2 *tp)
+checksum_of(const TERMTYPE2 *tp)
 {
     unsigned long result = string_sum(tp->term_names);
     unsigned i;
@@ -326,7 +326,7 @@ checksum_of(TERMTYPE2 *tp)
 
 /* collect data, to sort before display */
 static void
-sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)
+sorthook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp)
 {
     TERMDATA *data = new_termdata();
 
@@ -385,7 +385,7 @@ show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
 
 #if NCURSES_USE_DATABASE
 static char *
-copy_entryname(DIRENT * src)
+copy_entryname(const DIRENT * src)
 {
     size_t len = NAMLEN(src);
     char *result = malloc(len + 1);
@@ -411,7 +411,7 @@ typelist(int eargc, char *eargv[],
 	if (_nc_is_dir_path(eargv[i])) {
 	    char *cwd_buf = 0;
 	    DIR *termdir;
-	    DIRENT *subdir;
+	    const DIRENT *subdir;
 
 	    if ((termdir = opendir(eargv[i])) == 0) {
 		(void) fflush(stdout);
@@ -428,7 +428,7 @@ typelist(int eargc, char *eargv[],
 		size_t cwd_len;
 		char *name_1;
 		DIR *entrydir;
-		DIRENT *entry;
+		const DIRENT *entry;
 
 		name_1 = copy_entryname(subdir);
 		if (isDotname(name_1)) {
@@ -605,7 +605,7 @@ main(int argc, char *argv[])
     bool direct_dependencies = FALSE;
     bool invert_dependencies = FALSE;
     bool header = FALSE;
-    char *report_file = 0;
+    const char *report_file = 0;
     int code;
     int this_opt, last_opt = '?';
     unsigned v_opt = 0;
diff --git a/progs/tset.c b/progs/tset.c
index 69f4aba87..c143504d2 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.135 2024/04/20 22:20:41 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.136 2024/10/19 21:40:28 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -543,7 +543,7 @@ static const char *
 get_termcap_entry(int fd, char *userarg)
 {
     int errret;
-    char *p;
+    const char *p;
     const char *ttype;
 #if HAVE_PATH_TTYS
 #if HAVE_GETTTYNAM
@@ -676,7 +676,7 @@ static void
 obsolete(char **argv)
 {
     for (; *argv; ++argv) {
-	char *parm = argv[0];
+	const char *parm = argv[0];
 
 	if (parm[0] == '-' && parm[1] == '\0') {
 	    argv[0] = strdup("-q");
diff --git a/test/demo_menus.c b/test/demo_menus.c
index 22a6a9bf1..b5428f88f 100644
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.82 2024/10/06 19:58:28 tom Exp $
+ * $Id: demo_menus.c,v 1.83 2024/10/19 21:53:57 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -755,7 +755,7 @@ move_menu(NCURSES_CONST MENU * menu,
  * Move the menus around on the screen, to test mvwin().
  */
 static void
-move_menus(MENU * current, int by_y, int by_x)
+move_menus(NCURSES_CONST MENU * current, int by_y, int by_x)
 {
     if (move_menu(mpBanner, current, by_y, by_x) != ERR) {
 	erase();

From 1aac608289b46430ecca773156e2575056c8bf52 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sat, 26 Oct 2024 22:19:11 +0200
Subject: [PATCH 088/106] ncurses-6.5-20241026.patch.gz

---
 NEWS                             |  8 +++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +-
 misc/terminfo.src                | 63 +++++++++++++++++++++++++++-----
 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/popup_msg.c                 |  6 +--
 12 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/NEWS b/NEWS
index 09b0a763c..44d728467 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4191 2024/10/19 21:59:42 tom Exp $
+-- $Id: NEWS,v 1.4193 2024/10/26 19:40:20 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241026
+	+ update ms-terminal -TD
+	+ add ms-terminal-direct -TD
+	+ correct dimensions in test/popup_msg.c, fixing an overrun (patch by
+	  Stas Sergeev, cf: 20211219).
+
 20241019
 	+ fixes for compiler warnings/cppcheck.
 	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
diff --git a/VERSION b/VERSION
index 516be4167..047388b6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241019
+5:0:10	6.5	20241026
diff --git a/dist.mk b/dist.mk
index c5612b839..60e0b9e7c 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1637 2024/10/19 09:59:06 tom Exp $
+# $Id: dist.mk,v 1.1638 2024/10/26 10:01:22 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241019
+NCURSES_PATCH = 20241026
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 533fe42b4..8ca714547 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1153 $
-#	$Date: 2024/10/05 16:04:17 $
+#	$Revision: 1.1155 $
+#	$Date: 2024/10/26 19:09:10 $
 #
 # 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
@@ -4634,11 +4634,45 @@ winconsole|Windows 10 new console,
 	use=ansi+local, use=ecma+sgr, use=ecma+color,
 	use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys,
 
-# Windows Terminal (Preview)
+# Windows Terminal
 # https://github.com/microsoft/terminal
 #
+# Version 1.21.2911.0
+# 2024-10-17
+#
+# - The "About" dialog has a pointer to the release notes, but that turns out
+#   to be for all branches.  This particular version (unlike those previously
+#   tested) happens to be a non-preview version.
+# - Windows Terminal #2958 has relevant discussion.
+#
+# tack:
+# - keypad escapes still do not work
+# - meta mode does not work
+# - when running tests, the screen maximized and did not resume normal size
+#
+# vttest:
+# - identifies as a VT100-level terminal supporting Greek and Turkish (not
+#   applicable to a VT100), horizontal scrolling () and DRCS (seems to work)
+# - left/right margins work
+# - DECSCUSR is okay except for mode 1
+# - SL/SR fail
+# - does not support XTVERSION
+# - some mouse controls work, but not highlight tracking and X10 compatibility
+# - mouse focus events appear - but not in the test-screen (like VTE).
+# - cursor position after alternate screen is correct for 1049, not otherwise
+# - window reporting does not work
+#
+# wraptest:
+# - DECRC does not restore wrap
+#
+# other:
+# - change history says it supports bracketed paste
+# - Greek and Turkish character sets work with GL, not GR
+# - source code says it implements OSC 52, as well as 12, 112, but not 104.
+#
 # Windows 10 22H2 (also Windows 11)
 # Version 1.16.10261.0
+# 2020-01-25
 #
 # - Windows Terminal #1553: "Feature Request:  Mouse/Touch/Pointer Bindings
 #   (like middle-click paste, right-click context menu, etc.)", compare to
@@ -4649,6 +4683,7 @@ winconsole|Windows 10 new console,
 #
 # Windows 10 21H1
 # Version 1.9.1942.0
+# 2021-07-13
 #
 # This has longstanding issues with CR/LF mapping, e.g.,
 # - first reported by Juergen Pfeifer August 13, 2020, with workaround
@@ -4698,6 +4733,7 @@ winconsole|Windows 10 new console,
 #
 # Windows 10 1903
 # Version 0.2.1831.0
+# 2019-07-02
 #
 # The task manager shows this as "OpenConsole.exe", which differs
 # from the "Windows Command Processor" used for the command-prompt.
@@ -4734,13 +4770,18 @@ winconsole|Windows 10 new console,
 # - color palette can be altered, but OSC 104 for resetting does not work
 # - crashed with a script used for testing NRCS.
 # - does not recognize either xterm+direct or xterm+indirect escapes.
-ms-terminal|Windows10 terminal,
+ms-terminal|Windows terminal,
+	use=xterm+256color, use=ms+terminal,
+ms-terminal-direct|Windows terminal with direct-colors,
+	use=xterm+direct, use=ms+terminal,
+ms+terminal|building block for Windows terminal,
 	npc,
-	cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
-	Cr@, Ms@, use=linux+kbs, use=xterm+256color,
-	use=xterm+pcfkeys, use=ansi+rep, use=xterm+sm+1006,
-	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
-	use=xterm-basic, use=xterm+tmux,
+	cud1=\E[B, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@, smkx=\E[?1h,
+	smm@, rv=\E\\[>0;10;1c, use=linux+kbs,
+	use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep,
+	use=xterm+sm+1006, use=ecma+index, use=ecma+italics,
+	use=ecma+strikeout, use=vt420+lrmm, use=xterm-basic,
+	use=xterm+focus, use=xterm+tmux,
 
 #### Visual Studio
 # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
@@ -27659,4 +27700,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ use xterm+alt+title in wezterm -TD
 #	+ update comments -TD
 #
+# 2024-10-26
+#	+ update ms-terminal -TD
+#	+ add ms-terminal-direct -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fb8a5e030..d123bccb0 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241019) unstable; urgency=low
+ncurses6td (6.5+20241026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fb8a5e030..d123bccb0 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241019) unstable; urgency=low
+ncurses6td (6.5+20241026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 471ccd178..803aeba8a 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241019) unstable; urgency=low
+ncurses6td (6.5+20241026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2024 05:59:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index dd0a79c57..a23621eb3 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.672 2024/10/19 09:59:06 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.673 2024/10/26 10:01:22 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1019"
+!define VERSION_MMDD  "1026"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index cb8d08f1c..7e27a31ad 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241019
+Release: 20241026
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 9c1c97168..25fdedf17 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241019
+Release: 20241026
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 4ab72dbec..6cc56deb8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241019
+Release: 20241026
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/popup_msg.c b/test/popup_msg.c
index d658b6281..245bb5878 100644
--- a/test/popup_msg.c
+++ b/test/popup_msg.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: popup_msg.c,v 1.13 2024/10/06 21:07:01 tom Exp $
+ * $Id: popup_msg.c,v 1.14 2024/10/26 19:28:11 Stas.Sergeev Exp $
  *
  * Show a multi-line message in a window which may extend beyond the screen.
  *
@@ -83,11 +83,11 @@ popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
 	if (width < check)
 	    width = check;
     }
-    length = n + 2;
+    length = n;
 
     if ((help = newwin(high, wide, y0, x0)) == 0)
 	return;
-    if ((data = newpad(length + 1, width + 1)) == 0) {
+    if ((data = newpad(length + 2, width + 1)) == 0) {
 	delwin(help);
 	return;
     }

From 5a225474a5c6447e8817e72567981a3b3bb9afb0 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 3 Nov 2024 01:56:48 +0100
Subject: [PATCH 089/106] ncurses-6.5-20241102.patch.gz

---
 NEWS                             |  7 +++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 misc/terminfo.src                | 40 ++++++++++++++++++++++++++------
 ncurses/base/lib_set_term.c      |  7 +-----
 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 +-
 12 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/NEWS b/NEWS
index 44d728467..13c22dd3e 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4193 2024/10/26 19:40:20 tom Exp $
+-- $Id: NEWS,v 1.4195 2024/11/02 21:08:17 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241102
+	+ remove djgpp-specific initialization to binary mode (report/patch by
+	  Stas Sergeev).
+	+ add extended-keys for djgpp 2.05 -TD
+
 20241026
 	+ update ms-terminal -TD
 	+ add ms-terminal-direct -TD
diff --git a/VERSION b/VERSION
index 047388b6d..0c76fddc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241026
+5:0:10	6.5	20241102
diff --git a/dist.mk b/dist.mk
index 60e0b9e7c..d786ef990 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1638 2024/10/26 10:01:22 tom Exp $
+# $Id: dist.mk,v 1.1639 2024/11/02 09:59:53 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241026
+NCURSES_PATCH = 20241102
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 8ca714547..489c4802b 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1155 $
-#	$Date: 2024/10/26 19:09:10 $
+#	$Revision: 1.1157 $
+#	$Date: 2024/11/02 20:48:46 $
 #
 # 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
@@ -9514,6 +9514,7 @@ cygwinDBG|Debug Version for Cygwin,
 # Oddly enough, while several combinations of modifiers are tabulated, there is
 # none for shifted cursor keys.
 #
+# kf1-kf12:
 #	F1			\E[[A
 #	F2			\E[[B
 #	F3			\E[[C
@@ -9538,6 +9539,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Right Arrow		\E[C
 #	Up Arrow		\E[A
 #
+# kf13-kf24:
 #	Shift-F1		\E[25~
 #	Shift-F2		\E[26~
 #	Shift-F3		\E[27~
@@ -9551,6 +9553,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Shift-F11		\E[35~
 #	Shift-F12		\E[36~
 #
+# kf25-kf36:
 #	Ctrl-F1			\E[47~
 #	Ctrl-F2			\E[48~
 #	Ctrl-F3			\E[49~
@@ -9575,6 +9578,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Ctrl-Right Arrow	\E[40~
 #	Ctrl-Up Arrow		\E[37~
 #
+# kf37-kf48:
 #	Alt-F1			\E[59~
 #	Alt-F2			\E[60~
 #	Alt-F3			\E[61~
@@ -9588,6 +9592,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Alt-F11			\E[79~
 #	Alt-F12			\E[80~
 #
+# ignore (conflicting):
 #	Alt-Delete		\E[65~
 #	Alt-Down Arrow		\E[60~
 #	Alt-End			\E[66~
@@ -9626,7 +9631,7 @@ cygwinDBG|Debug Version for Cygwin,
 #	Alt-X			\E[104~
 #	Alt-Y			\E[105~
 #	Alt-Z			\E[106~
-djgpp|ANSI emulation for DJGPP alpha,
+djgpp|ANSI emulation for DJGPP 2.05,
 	am, bce, msgr, xhp, xon, xt,
 	colors#8, it#8, pairs#64,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
@@ -9637,16 +9642,34 @@ djgpp|ANSI emulation for DJGPP alpha,
 	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
 	ich1=\E[@, ind=\E[S, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
+	kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~,
+	kf2=\E[[B, kf20=\E[32~, kf21=\E[33~, kf22=\E[34~,
+	kf23=\E[35~, kf24=\E[36~, kf25=\E[47~, kf26=\E[48~,
+	kf27=\E[49~, kf28=\E[50~, kf29=\E[51~, kf3=\E[[C,
+	kf30=\E[52~, kf31=\E[53~, kf32=\E[54~, kf33=\E[55~,
+	kf34=\E[56~, kf35=\E[57~, kf36=\E[58~, kf37=\E[59~,
+	kf38=\E[60~, kf39=\E[61~, kf4=\E[[D, kf40=\E[62~,
+	kf41=\E[63~, kf42=\E[64~, kf43=\E[65~, kf44=\E[66~,
+	kf45=\E[67~, kf46=\E[68~, kf48=\E[80~, kf5=\E[[E,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khome=\E[1~, nel=\r\n, op=\E[37;40m, 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=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
-	use=ecma+index,
+	alt_A=\E[82~, alt_B=\E[82~, alt_C=\E[83~, alt_D=\E[84~,
+	alt_E=\E[85~, alt_F=\E[86~, alt_G=\E[87~, alt_H=\E[88~,
+	alt_I=\E[89~, alt_J=\E[90~, alt_K=\E[91~, alt_L=\E[92~,
+	alt_M=\E[93~, alt_N=\E[94~, alt_O=\E[95~, alt_P=\E[96~,
+	alt_Q=\E[97~, alt_R=\E[98~, alt_S=\E[99~, alt_T=\E[100~,
+	alt_U=\E[101~, alt_V=\E[102~, alt_W=\E[103~,
+	alt_X=\E[104~, alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~,
+	kDN5=\E[38~, kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~,
+	kLFT5=\E[39~, kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~,
+	kUP5=\E[37~, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgr,
+	use=vt220+pcedit, use=ecma+index,
 
 djgpp203|entry for DJGPP 2.03,
 	OTbs, am,
@@ -27704,4 +27727,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ update ms-terminal -TD
 #	+ add ms-terminal-direct -TD
 #
+# 2024-11-02
+#	+ add extended-keys for djgpp 2.05 -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index a4f1931ea..17235a682 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -61,7 +61,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.186 2024/10/19 19:41:09 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.187 2024/11/02 21:00:54 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -424,11 +424,6 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #endif
 	T(("filter screensize %dx%d", slines, scolumns));
     }
-#ifdef __DJGPP__
-    T(("setting output mode to binary"));
-    fflush(output);
-    setmode(fileno(output), O_BINARY);
-#endif
 #if defined(EXP_WIN32_DRIVER)
     T(("setting output mode to binary"));
     fflush(output);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index d123bccb0..fb081e982 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241026) unstable; urgency=low
+ncurses6td (6.5+20241102) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index d123bccb0..fb081e982 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241026) unstable; urgency=low
+ncurses6td (6.5+20241102) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 803aeba8a..f7518ac94 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241026) unstable; urgency=low
+ncurses6td (6.5+20241102) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Oct 2024 06:01:22 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index a23621eb3..cdc9f27e7 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.673 2024/10/26 10:01:22 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.674 2024/11/02 09:59:53 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1026"
+!define VERSION_MMDD  "1102"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7e27a31ad..d6b94a088 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241026
+Release: 20241102
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 25fdedf17..4ff6f729f 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241026
+Release: 20241102
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6cc56deb8..8c4b8bc3d 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241026
+Release: 20241102
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From aed65e3049156a7aec6cf9f707f543ed2b005e3f Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 10 Nov 2024 02:10:49 +0100
Subject: [PATCH 090/106] ncurses-6.5-20241109.patch.gz

---
 Ada95/aclocal.m4                 |   11 +-
 Ada95/configure                  |  951 ++++-----
 NEWS                             |   10 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   15 +-
 configure                        | 3241 +++++++++++++++---------------
 dist.mk                          |    4 +-
 ncurses/base/lib_set_term.c      |    6 +-
 ncurses/tinfo/access.c           |    4 +-
 ncurses/tinfo/alloc_entry.c      |    9 +-
 ncurses/tinfo/hashed_db.c        |   33 +-
 ncurses/tinfo/write_entry.c      |   25 +-
 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/infocmp.c                  |    4 +-
 progs/tic.c                      |    6 +-
 test/aclocal.m4                  |    7 +-
 test/configure                   | 3185 ++++++++++++++---------------
 test/demo_new_pair.c             |   10 +-
 test/demo_panels.c               |    5 +-
 25 files changed, 3798 insertions(+), 3752 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 443e89296..26dd9df08 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.221 2024/08/11 00:23:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.222 2024/11/09 23:14:10 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4777,7 +4777,7 @@ weak_symbol(fopen);
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
+dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29
 dnl -----------
 dnl Check for the Ada compiler (unless requested to not do this), which causes
 dnl a further check for a C compiler which can work with the Ada compiler.
@@ -4800,7 +4800,7 @@ then
 		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			AC_MSG_CHECKING(for improvement) 
+			AC_MSG_CHECKING(for improvement)
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
 			(*script*)
@@ -5217,7 +5217,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
+dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -5280,6 +5280,9 @@ case "$host_os" in
 (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
+	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
 	;;
diff --git a/Ada95/configure b/Ada95/configure
index 45ac71ddd..349fedb89 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -13457,6 +13457,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6
 
 fi
 
+	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
 	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
@@ -13480,16 +13483,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13483: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13486: 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}:13489: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13492: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13492 "configure"
+#line 13495 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13504,16 +13507,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13510: \$? = $ac_status" >&5
+  echo "$as_me:13513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13516: \$? = $ac_status" >&5
+  echo "$as_me:13519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13534,7 +13537,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13537 "configure"
+#line 13540 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13549,16 +13552,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13555: \$? = $ac_status" >&5
+  echo "$as_me:13558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13561: \$? = $ac_status" >&5
+  echo "$as_me:13564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13569,7 +13572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13577,10 +13580,10 @@ echo "${as_me:-configure}:13572: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13580: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13583 "configure"
+#line 13586 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13595,16 +13598,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13601: \$? = $ac_status" >&5
+  echo "$as_me:13604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13607: \$? = $ac_status" >&5
+  echo "$as_me:13610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13620,7 +13623,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13623: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13626: 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
@@ -13737,7 +13740,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13740: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:13743: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13769,14 +13772,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13772: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13775: 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 13779 "configure"
+#line 13782 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13794,16 +13797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13800: \$? = $ac_status" >&5
+  echo "$as_me:13803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13806: \$? = $ac_status" >&5
+  echo "$as_me:13809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13815,7 +13818,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13818 "configure"
+#line 13821 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13833,16 +13836,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13839: \$? = $ac_status" >&5
+  echo "$as_me:13842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13845: \$? = $ac_status" >&5
+  echo "$as_me:13848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13857,7 +13860,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13860: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13863: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14017,16 +14020,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:14020: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:14023: 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}:14026: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:14029: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 14029 "configure"
+#line 14032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14041,16 +14044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14047: \$? = $ac_status" >&5
+  echo "$as_me:14050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14053: \$? = $ac_status" >&5
+  echo "$as_me:14056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -14071,7 +14074,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14074 "configure"
+#line 14077 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14086,16 +14089,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14092: \$? = $ac_status" >&5
+  echo "$as_me:14095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14098: \$? = $ac_status" >&5
+  echo "$as_me:14101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14106,7 +14109,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14112: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14114,10 +14117,10 @@ echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14117: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14120: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14120 "configure"
+#line 14123 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14132,16 +14135,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14138: \$? = $ac_status" >&5
+  echo "$as_me:14141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14144: \$? = $ac_status" >&5
+  echo "$as_me:14147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14157,7 +14160,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14160: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14163: 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
@@ -14270,10 +14273,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14273: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14276: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14276 "configure"
+#line 14279 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14291,23 +14294,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14297: \$? = $ac_status" >&5
+  echo "$as_me:14300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14303: \$? = $ac_status" >&5
+  echo "$as_me:14306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14310: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:14313: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14330,7 +14333,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14333: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14336: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14342,7 +14345,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14345: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14348: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14430,7 +14433,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14433: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14440,7 +14443,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14443: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14446: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14450,7 +14453,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14453: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14456: 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"
@@ -14462,10 +14465,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14465: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:14468: 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 14468 "configure"
+#line 14471 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14480,16 +14483,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14486: \$? = $ac_status" >&5
+  echo "$as_me:14489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14492: \$? = $ac_status" >&5
+  echo "$as_me:14495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14498,12 +14501,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14501: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:14504: 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 14506 "configure"
+#line 14509 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14518,16 +14521,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14524: \$? = $ac_status" >&5
+  echo "$as_me:14527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14530: \$? = $ac_status" >&5
+  echo "$as_me:14533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14538,19 +14541,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14541: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:14544: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14546: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14549: 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 14553 "configure"
+#line 14556 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14568,16 +14571,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14574: \$? = $ac_status" >&5
+  echo "$as_me:14577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14580: \$? = $ac_status" >&5
+  echo "$as_me:14583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14589,7 +14592,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14592 "configure"
+#line 14595 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14607,16 +14610,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14613: \$? = $ac_status" >&5
+  echo "$as_me:14616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14619: \$? = $ac_status" >&5
+  echo "$as_me:14622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14631,7 +14634,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14634: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14637: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14778,13 +14781,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14781: checking for ANSI C header files" >&5
+echo "$as_me:14784: 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 14787 "configure"
+#line 14790 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14792,13 +14795,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14795: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14801: \$? = $ac_status" >&5
+  echo "$as_me:14804: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14820,7 +14823,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14823 "configure"
+#line 14826 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14838,7 +14841,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14841 "configure"
+#line 14844 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14859,7 +14862,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14862 "configure"
+#line 14865 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14885,15 +14888,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14891: \$? = $ac_status" >&5
+  echo "$as_me:14894: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14896: \$? = $ac_status" >&5
+  echo "$as_me:14899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14906,7 +14909,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14909: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14912: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14922,28 +14925,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14925: checking for $ac_header" >&5
+echo "$as_me:14928: 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 14931 "configure"
+#line 14934 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14940: \$? = $ac_status" >&5
+  echo "$as_me:14943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14946: \$? = $ac_status" >&5
+  echo "$as_me:14949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14953,7 +14956,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14956: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14959: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14963,13 +14966,13 @@ EOF
 fi
 done
 
-echo "$as_me:14966: checking whether exit is declared" >&5
+echo "$as_me:14969: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14972 "configure"
+#line 14975 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14984,16 +14987,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14990: \$? = $ac_status" >&5
+  echo "$as_me:14993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14996: \$? = $ac_status" >&5
+  echo "$as_me:14999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -15003,7 +15006,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15006: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:15009: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -15013,7 +15016,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:15016: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:15019: 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
@@ -15025,7 +15028,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 15028 "configure"
+#line 15031 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15045,16 +15048,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15051: \$? = $ac_status" >&5
+  echo "$as_me:15054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15057: \$? = $ac_status" >&5
+  echo "$as_me:15060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15064,16 +15067,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15070: \$? = $ac_status" >&5
+  echo "$as_me:15073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15076: \$? = $ac_status" >&5
+  echo "$as_me:15079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15087,13 +15090,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:15090: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15093: 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:15096: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15099: 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
@@ -15101,7 +15104,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15104 "configure"
+#line 15107 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15121,16 +15124,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15127: \$? = $ac_status" >&5
+  echo "$as_me:15130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15133: \$? = $ac_status" >&5
+  echo "$as_me:15136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15139,7 +15142,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15142 "configure"
+#line 15145 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15160,16 +15163,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15166: \$? = $ac_status" >&5
+  echo "$as_me:15169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15172: \$? = $ac_status" >&5
+  echo "$as_me:15175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15180,7 +15183,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15183: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15186: 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
 
@@ -15190,7 +15193,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15193: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15196: 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
@@ -15198,7 +15201,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15201 "configure"
+#line 15204 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15218,16 +15221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15224: \$? = $ac_status" >&5
+  echo "$as_me:15227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15230: \$? = $ac_status" >&5
+  echo "$as_me:15233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15236,7 +15239,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15239 "configure"
+#line 15242 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15257,16 +15260,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15263: \$? = $ac_status" >&5
+  echo "$as_me:15266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15269: \$? = $ac_status" >&5
+  echo "$as_me:15272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15277,7 +15280,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15280: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15283: 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
 
@@ -15290,7 +15293,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15293: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15296: 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
@@ -15298,7 +15301,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15301 "configure"
+#line 15304 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15313,16 +15316,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15319: \$? = $ac_status" >&5
+  echo "$as_me:15322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15325: \$? = $ac_status" >&5
+  echo "$as_me:15328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15331,7 +15334,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15334 "configure"
+#line 15337 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15347,16 +15350,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15353: \$? = $ac_status" >&5
+  echo "$as_me:15356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15359: \$? = $ac_status" >&5
+  echo "$as_me:15362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15367,7 +15370,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15370: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15373: 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
 
@@ -15381,13 +15384,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15384: checking for fseeko" >&5
+echo "$as_me:15387: 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 15390 "configure"
+#line 15393 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15401,16 +15404,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15407: \$? = $ac_status" >&5
+  echo "$as_me:15410: \$? = $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:15413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15413: \$? = $ac_status" >&5
+  echo "$as_me:15416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15420,7 +15423,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15423: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15426: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15459,14 +15462,14 @@ fi
 
 	fi
 
-	echo "$as_me:15462: checking whether to use struct dirent64" >&5
+	echo "$as_me:15465: 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 15469 "configure"
+#line 15472 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15493,16 +15496,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15499: \$? = $ac_status" >&5
+  echo "$as_me:15502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15505: \$? = $ac_status" >&5
+  echo "$as_me:15508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15513,7 +15516,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15516: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15519: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15523,7 +15526,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15526: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15529: 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.
@@ -15533,7 +15536,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15536: result: $with_rcs_ids" >&5
+echo "$as_me:15539: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15543,7 +15546,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15546: checking if you want to build with function extensions" >&5
+echo "$as_me:15549: 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.
@@ -15553,7 +15556,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15556: result: $with_ext_funcs" >&5
+echo "$as_me:15559: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15571,7 +15574,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15574: checking for extended use of const keyword" >&5
+echo "$as_me:15577: 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.
@@ -15581,7 +15584,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15584: result: $with_ext_const" >&5
+echo "$as_me:15587: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15591,7 +15594,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15594: checking if you want all development code" >&5
+echo "$as_me:15597: 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.
@@ -15601,7 +15604,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15604: result: $with_develop" >&5
+echo "$as_me:15607: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15610,7 +15613,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15613: checking if you want to link with the pthread library" >&5
+echo "$as_me:15616: 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.
@@ -15620,27 +15623,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15623: result: $with_pthread" >&5
+echo "$as_me:15626: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15627: checking for pthread.h" >&5
+	echo "$as_me:15630: 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 15633 "configure"
+#line 15636 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15637: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15640: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15643: \$? = $ac_status" >&5
+  echo "$as_me:15646: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15659,7 +15662,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15662: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15665: 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
 
@@ -15669,7 +15672,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15672: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:15675: 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"
 
@@ -15690,7 +15693,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15693 "configure"
+#line 15696 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15707,16 +15710,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15713: \$? = $ac_status" >&5
+  echo "$as_me:15716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15719: \$? = $ac_status" >&5
+  echo "$as_me:15722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15726,7 +15729,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15729: result: $with_pthread" >&5
+	    echo "$as_me:15732: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15754,7 +15757,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15757: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:15760: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15763,7 +15766,7 @@ fi
 
 fi
 
-echo "$as_me:15766: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:15769: 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.
@@ -15773,18 +15776,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15776: result: $use_weak_symbols" >&5
+echo "$as_me:15779: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15780: checking if $CC supports weak symbols" >&5
+echo "$as_me:15783: 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 15787 "configure"
+#line 15790 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15810,16 +15813,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15816: \$? = $ac_status" >&5
+  echo "$as_me:15819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15822: \$? = $ac_status" >&5
+  echo "$as_me:15825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15830,7 +15833,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15833: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15836: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15859,13 +15862,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15862: checking for _nc_TABSIZE" >&5
+echo "$as_me:15865: 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 15868 "configure"
+#line 15871 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15896,16 +15899,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15902: \$? = $ac_status" >&5
+  echo "$as_me:15905: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15908: \$? = $ac_status" >&5
+  echo "$as_me:15911: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15915,7 +15918,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15918: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:15921: 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
@@ -15927,7 +15930,7 @@ fi
 # 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:15930: checking if you want experimental reentrant code" >&5
+echo "$as_me:15933: 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.
@@ -15937,7 +15940,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15940: result: $with_reentrant" >&5
+echo "$as_me:15943: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15960,7 +15963,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15963: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:15966: 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.
@@ -15970,7 +15973,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15973: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:15976: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15984,7 +15987,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15987: checking if you want to see long compiling messages" >&5
+echo "$as_me:15990: 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.
@@ -16018,10 +16021,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16021: result: $enableval" >&5
+echo "$as_me:16024: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:16024: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:16027: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -16038,17 +16041,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:16041: result: $enable_stdnoreturn" >&5
+echo "$as_me:16044: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:16045: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16048: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16051 "configure"
+#line 16054 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16064,16 +16067,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16070: \$? = $ac_status" >&5
+  echo "$as_me:16073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16076: \$? = $ac_status" >&5
+  echo "$as_me:16079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -16084,7 +16087,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16087: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16090: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16140,16 +16143,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16143: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16146: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16148: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16151: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16152: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16155: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16188,16 +16191,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16194: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16196: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16199: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16200: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16203: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16236,23 +16239,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16242: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16244: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16247: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16248: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16251: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16255: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16258: 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.
@@ -16269,7 +16272,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16272: result: $enable_warnings" >&5
+echo "$as_me:16275: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16293,7 +16296,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16296 "configure"
+#line 16299 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16308,26 +16311,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16314: \$? = $ac_status" >&5
+  echo "$as_me:16317: \$? = $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:16320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16320: \$? = $ac_status" >&5
+  echo "$as_me:16323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16323: checking for X11/Xt const-feature" >&5
+echo "$as_me:16326: 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 16330 "configure"
+#line 16333 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16345,16 +16348,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16351: \$? = $ac_status" >&5
+  echo "$as_me:16354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16357: \$? = $ac_status" >&5
+  echo "$as_me:16360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16369,7 +16372,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16372: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16375: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16398,7 +16401,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16401 "${as_me:-configure}"
+#line 16404 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16414,7 +16417,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16417: checking for $CC warning options..." >&5
+	{ echo "$as_me:16420: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16430,12 +16433,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16433: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16436: \$? = $ac_status" >&5
+  echo "$as_me:16439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16438: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16441: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16443,7 +16446,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16446: checking for $CC warning options..." >&5
+	{ echo "$as_me:16449: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16466,12 +16469,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16469: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16472: \$? = $ac_status" >&5
+  echo "$as_me:16475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16474: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16477: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16479,7 +16482,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16485: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16489,7 +16492,7 @@ echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16492: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16495: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16522,10 +16525,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16525: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16528: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16528 "${as_me:-configure}"
+#line 16531 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16575,12 +16578,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16581: \$? = $ac_status" >&5
+  echo "$as_me:16584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16583: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16586: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16648,7 +16651,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16651: checking if you want to enable runtime assertions" >&5
+echo "$as_me:16654: 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.
@@ -16658,7 +16661,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16661: result: $with_assertions" >&5
+echo "$as_me:16664: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16711,7 +16714,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16714: checking whether to add trace feature to all models" >&5
+echo "$as_me:16717: 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.
@@ -16721,7 +16724,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16724: result: $cf_with_trace" >&5
+echo "$as_me:16727: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16735,7 +16738,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16738: checking if we want to use GNAT projects" >&5
+echo "$as_me:16741: 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.
@@ -16752,21 +16755,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16755: result: $enable_gnat_projects" >&5
+echo "$as_me:16758: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16762: checking if ssp library is needed" >&5
+echo "$as_me:16765: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16769 "configure"
+#line 16772 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16783,16 +16786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16789: \$? = $ac_status" >&5
+  echo "$as_me:16792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16795: \$? = $ac_status" >&5
+  echo "$as_me:16798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16802,7 +16805,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16805 "configure"
+#line 16808 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16819,16 +16822,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16825: \$? = $ac_status" >&5
+  echo "$as_me:16828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16831: \$? = $ac_status" >&5
+  echo "$as_me:16834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16842,7 +16845,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16845: result: $cf_cv_need_libssp" >&5
+echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16870,13 +16873,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16873: checking for clock_gettime" >&5
+echo "$as_me:16876: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16879 "configure"
+#line 16882 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16907,16 +16910,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16913: \$? = $ac_status" >&5
+  echo "$as_me:16916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16919: \$? = $ac_status" >&5
+  echo "$as_me:16922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16926,12 +16929,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16929: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16934: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16939,7 +16942,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16942 "configure"
+#line 16945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16958,16 +16961,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16964: \$? = $ac_status" >&5
+  echo "$as_me:16967: \$? = $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:16970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16970: \$? = $ac_status" >&5
+  echo "$as_me:16973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16978,7 +16981,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16981: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16990,14 +16993,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16993: checking if clock_gettime links" >&5
+echo "$as_me:16996: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17000 "configure"
+#line 17003 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17015,16 +17018,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17021: \$? = $ac_status" >&5
+  echo "$as_me:17024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17027: \$? = $ac_status" >&5
+  echo "$as_me:17030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -17035,7 +17038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17038: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17049,13 +17052,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17052: checking for gettimeofday" >&5
+echo "$as_me:17055: 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 17058 "configure"
+#line 17061 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17086,16 +17089,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17092: \$? = $ac_status" >&5
+  echo "$as_me:17095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17098: \$? = $ac_status" >&5
+  echo "$as_me:17101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17105,7 +17108,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17108: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17115,7 +17118,7 @@ EOF
 
 else
 
-echo "$as_me:17118: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:17121: 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
@@ -17123,7 +17126,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17126 "configure"
+#line 17129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17142,16 +17145,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17148: \$? = $ac_status" >&5
+  echo "$as_me:17151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17154: \$? = $ac_status" >&5
+  echo "$as_me:17157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17162,7 +17165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17165: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:17168: 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
 
@@ -17195,13 +17198,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17198: checking for signed char" >&5
+echo "$as_me:17201: 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 17204 "configure"
+#line 17207 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17216,16 +17219,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17222: \$? = $ac_status" >&5
+  echo "$as_me:17225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17228: \$? = $ac_status" >&5
+  echo "$as_me:17231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17235,10 +17238,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17238: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17241: checking size of signed char" >&5
+echo "$as_me:17244: 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
@@ -17247,7 +17250,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17250 "configure"
+#line 17253 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17259,21 +17262,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17265: \$? = $ac_status" >&5
+  echo "$as_me:17268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17271: \$? = $ac_status" >&5
+  echo "$as_me:17274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17276 "configure"
+#line 17279 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17285,16 +17288,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17291: \$? = $ac_status" >&5
+  echo "$as_me:17294: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17297: \$? = $ac_status" >&5
+  echo "$as_me:17300: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17310,7 +17313,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17313 "configure"
+#line 17316 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17322,16 +17325,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17328: \$? = $ac_status" >&5
+  echo "$as_me:17331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17334: \$? = $ac_status" >&5
+  echo "$as_me:17337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17347,7 +17350,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17350 "configure"
+#line 17353 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17359,16 +17362,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17365: \$? = $ac_status" >&5
+  echo "$as_me:17368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17371: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17381,12 +17384,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17384: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17387: 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 17389 "configure"
+#line 17392 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17402,15 +17405,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17408: \$? = $ac_status" >&5
+  echo "$as_me:17411: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17413: \$? = $ac_status" >&5
+  echo "$as_me:17416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17426,7 +17429,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17429: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17435,13 +17438,13 @@ EOF
 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:17438: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:17441: 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 17444 "configure"
+#line 17447 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17456,16 +17459,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17462: \$? = $ac_status" >&5
+  echo "$as_me:17465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17468: \$? = $ac_status" >&5
+  echo "$as_me:17471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17475,7 +17478,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17478: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17488,7 +17491,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17491: checking for opendir in -ldir" >&5
+  echo "$as_me:17494: 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
@@ -17496,7 +17499,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17499 "configure"
+#line 17502 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17515,16 +17518,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17521: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17527: \$? = $ac_status" >&5
+  echo "$as_me:17530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17535,14 +17538,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17538: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:17541: 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:17545: checking for opendir in -lx" >&5
+  echo "$as_me:17548: 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
@@ -17550,7 +17553,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17553 "configure"
+#line 17556 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17569,16 +17572,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17575: \$? = $ac_status" >&5
+  echo "$as_me:17578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17581: \$? = $ac_status" >&5
+  echo "$as_me:17584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17589,7 +17592,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17592: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:17595: 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"
@@ -17597,13 +17600,13 @@ fi
 
 fi
 
-echo "$as_me:17600: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17603: 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 17606 "configure"
+#line 17609 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17619,16 +17622,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17625: \$? = $ac_status" >&5
+  echo "$as_me:17628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17631: \$? = $ac_status" >&5
+  echo "$as_me:17634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17638,7 +17641,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17641: result: $ac_cv_header_time" >&5
+echo "$as_me:17644: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17656,13 +17659,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17659: checking for an ANSI C-conforming const" >&5
+echo "$as_me:17662: 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 17665 "configure"
+#line 17668 "configure"
 #include "confdefs.h"
 
 int
@@ -17724,16 +17727,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17730: \$? = $ac_status" >&5
+  echo "$as_me:17733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17736: \$? = $ac_status" >&5
+  echo "$as_me:17739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17743,7 +17746,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17746: result: $ac_cv_c_const" >&5
+echo "$as_me:17749: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17755,7 +17758,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17758: checking if data-only library module links" >&5
+echo "$as_me:17761: 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
@@ -17763,20 +17766,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17766 "configure"
+#line 17769 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17772: \$? = $ac_status" >&5
+  echo "$as_me:17775: \$? = $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 <<EOF
-#line 17779 "configure"
+#line 17782 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17793,10 +17796,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17796: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17799: \$? = $ac_status" >&5
+  echo "$as_me:17802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17809,7 +17812,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17812 "configure"
+#line 17815 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17820,15 +17823,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17826: \$? = $ac_status" >&5
+  echo "$as_me:17829: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17831: \$? = $ac_status" >&5
+  echo "$as_me:17834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17843,7 +17846,7 @@ fi
 
 fi
 
-echo "$as_me:17846: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17862,23 +17865,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17865: checking for $ac_header" >&5
+echo "$as_me:17868: 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 17871 "configure"
+#line 17874 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17875: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17881: \$? = $ac_status" >&5
+  echo "$as_me:17884: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17897,7 +17900,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17900: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17907,7 +17910,7 @@ EOF
 fi
 done
 
-echo "$as_me:17910: checking for working mkstemp" >&5
+echo "$as_me:17913: 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
@@ -17918,7 +17921,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17921 "configure"
+#line 17924 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17953,15 +17956,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17959: \$? = $ac_status" >&5
+  echo "$as_me:17962: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17964: \$? = $ac_status" >&5
+  echo "$as_me:17967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17976,16 +17979,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17979: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:17982: 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:17982: checking for mkstemp" >&5
+	echo "$as_me:17985: 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 17988 "configure"
+#line 17991 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18016,16 +18019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18022: \$? = $ac_status" >&5
+  echo "$as_me:18025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18028: \$? = $ac_status" >&5
+  echo "$as_me:18031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -18035,7 +18038,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18038: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18056,7 +18059,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18059: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18073,10 +18076,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18076: result: $ADAFLAGS" >&5
+	echo "$as_me:18079: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18079: checking if GNATPREP supports -T option" >&5
+echo "$as_me:18082: 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
@@ -18086,11 +18089,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18089: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:18092: 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:18093: checking if GNAT supports generics" >&5
+echo "$as_me:18096: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18100,7 +18103,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18103: result: $cf_gnat_generics" >&5
+echo "$as_me:18106: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18112,7 +18115,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18115: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18118: 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
@@ -18160,7 +18163,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18163: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18173,7 +18176,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18176: checking if GNAT supports project files" >&5
+echo "$as_me:18179: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18236,15 +18239,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18239: result: $cf_gnat_projects" >&5
+echo "$as_me:18242: 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:18245: checking if GNAT supports libraries" >&5
+	echo "$as_me:18248: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18247: result: $cf_gnat_libraries" >&5
+	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18264,7 +18267,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18267: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18276,7 +18279,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18279: checking for Ada95 compiler" >&5
+echo "$as_me:18282: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18287,12 +18290,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18290: result: $cf_ada_compiler" >&5
+echo "$as_me:18293: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18295: checking for Ada95 include directory" >&5
+echo "$as_me:18298: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18326,7 +18329,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18329: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18332: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18335,10 +18338,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18338: result: $ADA_INCLUDE" >&5
+echo "$as_me:18341: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18341: checking for Ada95 object directory" >&5
+echo "$as_me:18344: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18372,7 +18375,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18375: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18378: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18381,10 +18384,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18384: result: $ADA_OBJECTS" >&5
+echo "$as_me:18387: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18387: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:18390: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18405,11 +18408,11 @@ then
 	fi
 fi
 
-echo "$as_me:18408: result: $with_ada_sharedlib" >&5
+echo "$as_me:18411: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18412: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:18415: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18427,7 +18430,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18430: checking for Ada95 curses library name" >&5
+echo "$as_me:18433: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18443,16 +18446,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18446: result: $ADA_LIBNAME" >&5
+echo "$as_me:18449: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18450: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:18453: 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:18455: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:18458: 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
@@ -18492,7 +18495,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18495: checking default library suffix" >&5
+echo "$as_me:18498: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18503,10 +18506,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18506: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18509: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18509: checking default library-dependency suffix" >&5
+echo "$as_me:18512: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18589,10 +18592,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18592: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18595: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18595: checking default object directory" >&5
+echo "$as_me:18598: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18608,7 +18611,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18611: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18614: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18750,7 +18753,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18753: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18756: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18931,7 +18934,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18934: error: ambiguous option: $1
+    { { echo "$as_me:18937: 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;}
@@ -18950,7 +18953,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18953: error: unrecognized option: $1
+  -*) { { echo "$as_me:18956: 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;}
@@ -19025,7 +19028,7 @@ do
   "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:19028: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19031: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19392,7 +19395,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19395: creating $ac_file" >&5
+    { echo "$as_me:19398: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19410,7 +19413,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19413: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19416: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19423,7 +19426,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19426: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19429: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19439,7 +19442,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19442: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19445: 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;}
@@ -19448,7 +19451,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19451: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19454: 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;}
@@ -19493,7 +19496,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19496: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19499: 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;}
@@ -19504,7 +19507,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19507: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19510: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19553,7 +19556,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19556: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19559: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19564,7 +19567,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19567: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19570: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19577,7 +19580,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19580: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19583: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19635,7 +19638,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19638: $ac_file is unchanged" >&5
+      { echo "$as_me:19641: $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/NEWS b/NEWS
index 13c22dd3e..5e9dd8968 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4195 2024/11/02 21:08:17 tom Exp $
+-- $Id: NEWS,v 1.4199 2024/11/09 23:12:36 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241109
+	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
+	  #920266).
+	+ improve error-reporting in write_entry.c (report by Changqing Li).
+	+ remove unused #include from DJGPP configuration (report by Stas
+	  Sergeev).
+	+ workaround/fix issues from clang-analyze
+
 20241102
 	+ remove djgpp-specific initialization to binary mode (report/patch by
 	  Stas Sergeev).
diff --git a/VERSION b/VERSION
index 0c76fddc7..7b38aa1d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241102
+5:0:10	6.5	20241109
diff --git a/aclocal.m4 b/aclocal.m4
index d195f3246..a8a72f958 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1088 2024/08/11 00:17:28 tom Exp $
+dnl $Id: aclocal.m4,v 1.1090 2024/11/09 23:12:47 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1750,7 +1750,7 @@ esac
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CPP_OVERRIDE version: 1 updated: 2022/08/20 16:07:10
+dnl CF_CPP_OVERRIDE version: 2 updated: 2024/11/09 18:07:29
 dnl ---------------
 dnl Check if the C++ compiler accepts the override keyword.  This is a C++-11
 dnl feature.
@@ -1765,7 +1765,7 @@ AC_CACHE_CHECK(if $CXX accepts override keyword,cf_cv_cpp_override,[
 class base
 {
 public:
-	virtual int foo(float x) = 0; 
+	virtual int foo(float x) = 0;
 };
 
 
@@ -9081,7 +9081,7 @@ $1_ABI=$cf_cv_abi_version
 cf_cv_abi_default=$cf_cv_abi_version
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
+dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29
 dnl -----------
 dnl Check for the Ada compiler (unless requested to not do this), which causes
 dnl a further check for a C compiler which can work with the Ada compiler.
@@ -9104,7 +9104,7 @@ then
 		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			AC_MSG_CHECKING(for improvement) 
+			AC_MSG_CHECKING(for improvement)
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
 			(*script*)
@@ -10219,7 +10219,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
+dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -10282,6 +10282,9 @@ case "$host_os" in
 (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
+	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
 	;;
diff --git a/configure b/configure
index 839bb6fe6..4bafbcd4e 100755
--- a/configure
+++ b/configure
@@ -11255,6 +11255,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6
 
 fi
 
+	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
 	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
@@ -11278,16 +11281,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11281: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11284: 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}:11287: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11290: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11290 "configure"
+#line 11293 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11302,16 +11305,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11308: \$? = $ac_status" >&5
+  echo "$as_me:11311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11332,7 +11335,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11335 "configure"
+#line 11338 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11347,16 +11350,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11353: \$? = $ac_status" >&5
+  echo "$as_me:11356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11359: \$? = $ac_status" >&5
+  echo "$as_me:11362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11367,7 +11370,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11375,10 +11378,10 @@ echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11378: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11381: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11381 "configure"
+#line 11384 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11393,16 +11396,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11399: \$? = $ac_status" >&5
+  echo "$as_me:11402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11405: \$? = $ac_status" >&5
+  echo "$as_me:11408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11418,7 +11421,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11421: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11424: 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
@@ -11535,7 +11538,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11538: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11541: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11567,14 +11570,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11570: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11573: 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 11577 "configure"
+#line 11580 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11592,16 +11595,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11598: \$? = $ac_status" >&5
+  echo "$as_me:11601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11604: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11613,7 +11616,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11616 "configure"
+#line 11619 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11631,16 +11634,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11637: \$? = $ac_status" >&5
+  echo "$as_me:11640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11643: \$? = $ac_status" >&5
+  echo "$as_me:11646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11655,7 +11658,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11658: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11661: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11815,16 +11818,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11818: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11821: 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}:11824: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11827: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11827 "configure"
+#line 11830 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11839,16 +11842,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11845: \$? = $ac_status" >&5
+  echo "$as_me:11848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11851: \$? = $ac_status" >&5
+  echo "$as_me:11854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11869,7 +11872,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11872 "configure"
+#line 11875 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11884,16 +11887,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11890: \$? = $ac_status" >&5
+  echo "$as_me:11893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  echo "$as_me:11899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11904,7 +11907,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11912,10 +11915,10 @@ echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11915: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11918: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11918 "configure"
+#line 11921 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11930,16 +11933,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11936: \$? = $ac_status" >&5
+  echo "$as_me:11939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11942: \$? = $ac_status" >&5
+  echo "$as_me:11945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11955,7 +11958,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11958: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11961: 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
@@ -12068,10 +12071,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12071: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12074: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12074 "configure"
+#line 12077 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12089,23 +12092,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12095: \$? = $ac_status" >&5
+  echo "$as_me:12098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12101: \$? = $ac_status" >&5
+  echo "$as_me:12104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12108: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12111: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12128,7 +12131,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12131: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12134: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12140,7 +12143,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12143: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12146: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12228,7 +12231,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12231: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12234: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12238,7 +12241,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12241: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12244: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12248,7 +12251,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12251: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12254: 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"
@@ -12260,10 +12263,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12263: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12266: 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 12266 "configure"
+#line 12269 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12278,16 +12281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12284: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12290: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12296,12 +12299,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12299: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12302: 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 12304 "configure"
+#line 12307 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12316,16 +12319,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12322: \$? = $ac_status" >&5
+  echo "$as_me:12325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12328: \$? = $ac_status" >&5
+  echo "$as_me:12331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12336,19 +12339,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12339: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12342: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12344: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12347: 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 12351 "configure"
+#line 12354 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12366,16 +12369,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12372: \$? = $ac_status" >&5
+  echo "$as_me:12375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12378: \$? = $ac_status" >&5
+  echo "$as_me:12381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12387,7 +12390,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12390 "configure"
+#line 12393 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12405,16 +12408,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12411: \$? = $ac_status" >&5
+  echo "$as_me:12414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12417: \$? = $ac_status" >&5
+  echo "$as_me:12420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12429,7 +12432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12432: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12435: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12580,14 +12583,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12583: checking if SIGWINCH is defined" >&5
+echo "$as_me:12586: 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 12590 "configure"
+#line 12593 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12602,23 +12605,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12608: \$? = $ac_status" >&5
+  echo "$as_me:12611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12614: \$? = $ac_status" >&5
+  echo "$as_me:12617: \$? = $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 12621 "configure"
+#line 12624 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12636,16 +12639,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12642: \$? = $ac_status" >&5
+  echo "$as_me:12645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12648: \$? = $ac_status" >&5
+  echo "$as_me:12651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12659,11 +12662,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12662: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12665: 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:12666: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12669: 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
@@ -12674,7 +12677,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12677 "configure"
+#line 12680 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12696,16 +12699,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12702: \$? = $ac_status" >&5
+  echo "$as_me:12705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12708: \$? = $ac_status" >&5
+  echo "$as_me:12711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12719,7 +12722,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12722: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12725: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12729,13 +12732,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12732: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12735: 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 12738 "configure"
+#line 12741 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12749,16 +12752,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12755: \$? = $ac_status" >&5
+  echo "$as_me:12758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12761: \$? = $ac_status" >&5
+  echo "$as_me:12764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12769,7 +12772,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12772: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12775: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12783,7 +12786,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12786: checking if you want wide-character code" >&5
+echo "$as_me:12789: 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.
@@ -12793,7 +12796,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12796: result: $with_widec" >&5
+echo "$as_me:12799: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12815,7 +12818,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12818: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12821: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12828,23 +12831,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12831: checking for $ac_header" >&5
+echo "$as_me:12834: 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 12837 "configure"
+#line 12840 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12844: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12847: \$? = $ac_status" >&5
+  echo "$as_me:12850: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12863,7 +12866,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12869: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12873,14 +12876,14 @@ EOF
 fi
 done
 
-echo "$as_me:12876: checking if wchar.h can be used as is" >&5
+echo "$as_me:12879: 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 12883 "configure"
+#line 12886 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12902,16 +12905,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12908: \$? = $ac_status" >&5
+  echo "$as_me:12911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12914: \$? = $ac_status" >&5
+  echo "$as_me:12917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12921,16 +12924,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12924: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12927: 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:12930: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12933: 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 12933 "configure"
+#line 12936 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12946,16 +12949,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12952: \$? = $ac_status" >&5
+  echo "$as_me:12955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12958: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12964,16 +12967,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12967: result: $cf_result" >&5
+echo "$as_me:12970: 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:12973: checking checking for compatible value versus " >&5
+	echo "$as_me:12976: 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 12976 "configure"
+#line 12979 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12989,16 +12992,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12995: \$? = $ac_status" >&5
+  echo "$as_me:12998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13001: \$? = $ac_status" >&5
+  echo "$as_me:13004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -13007,7 +13010,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13010: result: $cf_result" >&5
+	echo "$as_me:13013: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -13017,7 +13020,7 @@ fi
 
 fi
 
-echo "$as_me:13020: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13023: 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
@@ -13088,7 +13091,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13091 "configure"
+#line 13094 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13133,15 +13136,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13139: \$? = $ac_status" >&5
+  echo "$as_me:13142: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13144: \$? = $ac_status" >&5
+  echo "$as_me:13147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13154,7 +13157,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13157: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13160: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13165,13 +13168,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13168: checking for $ac_func" >&5
+echo "$as_me:13171: 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 13174 "configure"
+#line 13177 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13202,16 +13205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13208: \$? = $ac_status" >&5
+  echo "$as_me:13211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13214: \$? = $ac_status" >&5
+  echo "$as_me:13217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13221,7 +13224,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13224: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13227: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13236,23 +13239,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13239: checking for $ac_header" >&5
+echo "$as_me:13242: 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 13245 "configure"
+#line 13248 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13249: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13252: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13255: \$? = $ac_status" >&5
+  echo "$as_me:13258: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13271,7 +13274,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13274: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13277: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13281,7 +13284,7 @@ EOF
 fi
 done
 
-echo "$as_me:13284: checking for multibyte character support" >&5
+echo "$as_me:13287: 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
@@ -13289,7 +13292,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13292 "configure"
+#line 13295 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13306,16 +13309,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13312: \$? = $ac_status" >&5
+  echo "$as_me:13315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13318: \$? = $ac_status" >&5
+  echo "$as_me:13321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13327,12 +13330,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13330: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13333: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13335 "configure"
+#line 13338 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13345,16 +13348,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13351: \$? = $ac_status" >&5
+  echo "$as_me:13354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13357: \$? = $ac_status" >&5
+  echo "$as_me:13360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13368,7 +13371,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13371 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13381,16 +13384,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13387: \$? = $ac_status" >&5
+  echo "$as_me:13390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13393: \$? = $ac_status" >&5
+  echo "$as_me:13396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13407,9 +13410,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13410: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13413: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13412: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13415: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13500,7 +13503,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13503: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13506: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13508,7 +13511,7 @@ echo "${as_me:-configure}:13503: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13511 "configure"
+#line 13514 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13521,21 +13524,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13527: \$? = $ac_status" >&5
+  echo "$as_me:13530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13533: \$? = $ac_status" >&5
+  echo "$as_me:13536: \$? = $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}:13538: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13541: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13553,7 +13556,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13556: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13559: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13628,13 +13631,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13631: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13634: 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 13637 "configure"
+#line 13640 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13647,21 +13650,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13653: \$? = $ac_status" >&5
+  echo "$as_me:13656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13659: \$? = $ac_status" >&5
+  echo "$as_me:13662: \$? = $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}:13664: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13667: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13703,7 +13706,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13706: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13709: 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
@@ -13741,7 +13744,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13744 "configure"
+#line 13747 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13753,16 +13756,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13759: \$? = $ac_status" >&5
+  echo "$as_me:13762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13765: \$? = $ac_status" >&5
+  echo "$as_me:13768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13779,7 +13782,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13782: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13785: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13815,7 +13818,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13818: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13821: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13847,14 +13850,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13850: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13853: 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 13857 "configure"
+#line 13860 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13872,23 +13875,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13878: \$? = $ac_status" >&5
+  echo "$as_me:13881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13884: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $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 13891 "configure"
+#line 13894 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13907,16 +13910,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13913: \$? = $ac_status" >&5
+  echo "$as_me:13916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13919: \$? = $ac_status" >&5
+  echo "$as_me:13922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13928,7 +13931,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13931: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13934: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13946,14 +13949,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13949: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13952: 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 13956 "configure"
+#line 13959 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13971,23 +13974,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13977: \$? = $ac_status" >&5
+  echo "$as_me:13980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13983: \$? = $ac_status" >&5
+  echo "$as_me:13986: \$? = $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 13990 "configure"
+#line 13993 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14006,16 +14009,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14012: \$? = $ac_status" >&5
+  echo "$as_me:14015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14018: \$? = $ac_status" >&5
+  echo "$as_me:14021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14027,7 +14030,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14030: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14033: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14050,14 +14053,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14053: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14056: 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 14060 "configure"
+#line 14063 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14075,23 +14078,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14081: \$? = $ac_status" >&5
+  echo "$as_me:14084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14090: \$? = $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 14094 "configure"
+#line 14097 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14110,16 +14113,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14116: \$? = $ac_status" >&5
+  echo "$as_me:14119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14122: \$? = $ac_status" >&5
+  echo "$as_me:14125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14131,7 +14134,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14134: result: $cf_cv_wint_t" >&5
+echo "$as_me:14137: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14163,7 +14166,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14166: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14169: 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.
@@ -14173,7 +14176,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14176: result: $with_lp64" >&5
+echo "$as_me:14179: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14189,7 +14192,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14192: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14195: 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
@@ -14201,7 +14204,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14204 "configure"
+#line 14207 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14221,16 +14224,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14227: \$? = $ac_status" >&5
+  echo "$as_me:14230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14233: \$? = $ac_status" >&5
+  echo "$as_me:14236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14240,16 +14243,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14246: \$? = $ac_status" >&5
+  echo "$as_me:14249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14252: \$? = $ac_status" >&5
+  echo "$as_me:14255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14263,13 +14266,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14266: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14269: 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:14272: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14275: 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
@@ -14277,7 +14280,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14280 "configure"
+#line 14283 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14297,16 +14300,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14303: \$? = $ac_status" >&5
+  echo "$as_me:14306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14309: \$? = $ac_status" >&5
+  echo "$as_me:14312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14315,7 +14318,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14318 "configure"
+#line 14321 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14336,16 +14339,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14342: \$? = $ac_status" >&5
+  echo "$as_me:14345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14348: \$? = $ac_status" >&5
+  echo "$as_me:14351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14356,7 +14359,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14359: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14362: 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
 
@@ -14366,7 +14369,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14369: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14372: 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
@@ -14374,7 +14377,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14377 "configure"
+#line 14380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14394,16 +14397,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14400: \$? = $ac_status" >&5
+  echo "$as_me:14403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14406: \$? = $ac_status" >&5
+  echo "$as_me:14409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14412,7 +14415,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14415 "configure"
+#line 14418 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14433,16 +14436,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14439: \$? = $ac_status" >&5
+  echo "$as_me:14442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14445: \$? = $ac_status" >&5
+  echo "$as_me:14448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14453,7 +14456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14456: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14459: 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
 
@@ -14466,7 +14469,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14469: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14472: 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
@@ -14474,7 +14477,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14477 "configure"
+#line 14480 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14489,16 +14492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14495: \$? = $ac_status" >&5
+  echo "$as_me:14498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14501: \$? = $ac_status" >&5
+  echo "$as_me:14504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14507,7 +14510,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14510 "configure"
+#line 14513 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14523,16 +14526,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14529: \$? = $ac_status" >&5
+  echo "$as_me:14532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14535: \$? = $ac_status" >&5
+  echo "$as_me:14538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14543,7 +14546,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14546: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14549: 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
 
@@ -14557,13 +14560,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14560: checking for fseeko" >&5
+echo "$as_me:14563: 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 14566 "configure"
+#line 14569 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14577,16 +14580,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14583: \$? = $ac_status" >&5
+  echo "$as_me:14586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14589: \$? = $ac_status" >&5
+  echo "$as_me:14592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14596,7 +14599,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14599: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14602: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14635,14 +14638,14 @@ fi
 
 	fi
 
-	echo "$as_me:14638: checking whether to use struct dirent64" >&5
+	echo "$as_me:14641: 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 14645 "configure"
+#line 14648 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14669,16 +14672,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14675: \$? = $ac_status" >&5
+  echo "$as_me:14678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14681: \$? = $ac_status" >&5
+  echo "$as_me:14684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14689,7 +14692,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14692: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14695: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14699,7 +14702,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14702: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14705: 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.
@@ -14709,14 +14712,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14712: result: $with_tparm_varargs" >&5
+echo "$as_me:14715: 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:14719: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14722: 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.
@@ -14726,14 +14729,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14729: result: $with_tic_depends" >&5
+echo "$as_me:14732: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14736: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14739: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14745,15 +14748,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14748: result: no" >&5
+	echo "$as_me:14751: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14752: result: yes" >&5
+	echo "$as_me:14755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14756: checking for X11 rgb file" >&5
+echo "$as_me:14759: 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.
@@ -14815,7 +14818,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14818: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14821: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14823,7 +14826,7 @@ esac
 
 fi
 
-echo "$as_me:14826: result: $RGB_PATH" >&5
+echo "$as_me:14829: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14838,7 +14841,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14841: checking for type of bool" >&5
+echo "$as_me:14844: 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.
@@ -14848,17 +14851,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14851: result: $NCURSES_BOOL" >&5
+echo "$as_me:14854: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14855: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14858: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14861: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14864: 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.
@@ -14870,16 +14873,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14873: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14876: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14877: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14880: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14882: checking for type of chtype" >&5
+echo "$as_me:14885: 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.
@@ -14889,11 +14892,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14892: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14895: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14896: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14899: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14901,7 +14904,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14904: checking for type of ospeed" >&5
+echo "$as_me:14907: 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.
@@ -14911,11 +14914,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14914: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14917: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14918: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14921: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14923,7 +14926,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14926: checking for type of mmask-t" >&5
+echo "$as_me:14929: 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.
@@ -14933,18 +14936,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14936: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14939: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14940: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14943: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14947: checking for size CCHARW_MAX" >&5
+echo "$as_me:14950: 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.
@@ -14954,16 +14957,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14957: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14960: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14960: checking for signed char" >&5
+echo "$as_me:14963: 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 14966 "configure"
+#line 14969 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14978,16 +14981,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14984: \$? = $ac_status" >&5
+  echo "$as_me:14987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14990: \$? = $ac_status" >&5
+  echo "$as_me:14993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14997,10 +15000,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15000: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15003: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:15003: checking size of signed char" >&5
+echo "$as_me:15006: 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
@@ -15009,7 +15012,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15012 "configure"
+#line 15015 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15021,21 +15024,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15027: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15033: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15038 "configure"
+#line 15041 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15047,16 +15050,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15053: \$? = $ac_status" >&5
+  echo "$as_me:15056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15059: \$? = $ac_status" >&5
+  echo "$as_me:15062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15072,7 +15075,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15075 "configure"
+#line 15078 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15084,16 +15087,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15090: \$? = $ac_status" >&5
+  echo "$as_me:15093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15096: \$? = $ac_status" >&5
+  echo "$as_me:15099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15109,7 +15112,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15112 "configure"
+#line 15115 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15121,16 +15124,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15127: \$? = $ac_status" >&5
+  echo "$as_me:15130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15133: \$? = $ac_status" >&5
+  echo "$as_me:15136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15143,12 +15146,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15146: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15149: 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 15151 "configure"
+#line 15154 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15164,15 +15167,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15170: \$? = $ac_status" >&5
+  echo "$as_me:15173: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15175: \$? = $ac_status" >&5
+  echo "$as_me:15178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15188,7 +15191,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15191: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15194: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15199,7 +15202,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15202: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15205: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15209,13 +15212,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15212: result: $with_signed_char" >&5
+echo "$as_me:15215: 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:15218: checking for type of tparm-arg" >&5
+echo "$as_me:15221: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15225,18 +15228,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15228: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15231: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15232: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15235: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15239: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15242: 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.
@@ -15246,7 +15249,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15249: result: $with_rcs_ids" >&5
+echo "$as_me:15252: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15255,7 +15258,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15258: checking format of man-pages" >&5
+echo "$as_me:15261: 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.
@@ -15346,10 +15349,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15349: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15352: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15352: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15355: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15390,7 +15393,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15393: checking for manpage renaming" >&5
+echo "$as_me:15396: 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.
@@ -15419,15 +15422,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15422: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15425: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15427: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15430: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15430: checking if manpage aliases will be installed" >&5
+echo "$as_me:15433: 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.
@@ -15438,7 +15441,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15441: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15444: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15452,7 +15455,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15455: checking if manpage symlinks should be used" >&5
+echo "$as_me:15458: 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.
@@ -15465,17 +15468,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15468: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15471: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15474: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15477: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15478: checking for manpage tbl" >&5
+echo "$as_me:15481: 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.
@@ -15486,7 +15489,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15489: result: $MANPAGE_TBL" >&5
+echo "$as_me:15492: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15804,7 +15807,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15807: checking if you want to build with function extensions" >&5
+echo "$as_me:15810: 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.
@@ -15814,7 +15817,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15817: result: $with_ext_funcs" >&5
+echo "$as_me:15820: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15871,7 +15874,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15874: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15877: 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.
@@ -15881,7 +15884,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15884: result: $with_sp_funcs" >&5
+echo "$as_me:15887: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15900,7 +15903,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15903: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15906: 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.
@@ -15910,7 +15913,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15913: result: $with_term_driver" >&5
+echo "$as_me:15916: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15919,19 +15922,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15922: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15925: 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:15927: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15930: 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:15934: checking for extended use of const keyword" >&5
+echo "$as_me:15937: 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.
@@ -15941,7 +15944,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15944: result: $with_ext_const" >&5
+echo "$as_me:15947: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15949,7 +15952,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15952: checking if you want to use extended colors" >&5
+echo "$as_me:15955: 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.
@@ -15959,12 +15962,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15962: result: $with_ext_colors" >&5
+echo "$as_me:15965: 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:15967: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15970: 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)
@@ -15975,7 +15978,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15978: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15981: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16003,7 +16006,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16006: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16009: 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.
@@ -16013,7 +16016,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16016: result: $with_ext_mouse" >&5
+echo "$as_me:16019: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16023,7 +16026,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16026: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16029: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16040,7 +16043,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16043: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16046: 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.
@@ -16050,7 +16053,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16053: result: $with_ext_putwin" >&5
+echo "$as_me:16056: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16060,7 +16063,7 @@ EOF
 
 fi
 
-echo "$as_me:16063: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16066: 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.
@@ -16070,7 +16073,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16073: result: $with_no_padding" >&5
+echo "$as_me:16076: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16078,7 +16081,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16081: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16084: 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.
@@ -16088,7 +16091,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16091: result: $with_sigwinch" >&5
+echo "$as_me:16094: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16103,7 +16106,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16106: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16109: 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.
@@ -16113,7 +16116,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16116: result: $with_tcap_names" >&5
+echo "$as_me:16119: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16127,7 +16130,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16130: checking if you want to link with the pthread library" >&5
+echo "$as_me:16133: 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.
@@ -16137,27 +16140,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16140: result: $with_pthread" >&5
+echo "$as_me:16143: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16144: checking for pthread.h" >&5
+	echo "$as_me:16147: 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 16150 "configure"
+#line 16153 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16160: \$? = $ac_status" >&5
+  echo "$as_me:16163: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16176,7 +16179,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16179: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16182: 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
 
@@ -16186,7 +16189,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16189: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16192: 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"
 
@@ -16207,7 +16210,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16210 "configure"
+#line 16213 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16224,16 +16227,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16230: \$? = $ac_status" >&5
+  echo "$as_me:16233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16236: \$? = $ac_status" >&5
+  echo "$as_me:16239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16243,7 +16246,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16246: result: $with_pthread" >&5
+	    echo "$as_me:16249: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16271,7 +16274,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16274: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16277: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16281,13 +16284,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16284: checking for pthread_kill" >&5
+	echo "$as_me:16287: 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 16290 "configure"
+#line 16293 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16318,16 +16321,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16324: \$? = $ac_status" >&5
+  echo "$as_me:16327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16330: \$? = $ac_status" >&5
+  echo "$as_me:16333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16337,11 +16340,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16340: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16343: 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:16344: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16347: 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.
@@ -16351,7 +16354,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16354: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16357: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16362,7 +16365,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16365: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16368: 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.
@@ -16372,18 +16375,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16375: result: $use_weak_symbols" >&5
+	echo "$as_me:16378: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16379: checking if $CC supports weak symbols" >&5
+echo "$as_me:16382: 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 16386 "configure"
+#line 16389 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16409,16 +16412,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16415: \$? = $ac_status" >&5
+  echo "$as_me:16418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16421: \$? = $ac_status" >&5
+  echo "$as_me:16424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16429,7 +16432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16432: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16435: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16479,7 +16482,7 @@ fi
 # 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:16482: checking if you want reentrant code" >&5
+echo "$as_me:16485: 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.
@@ -16489,7 +16492,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16492: result: $with_reentrant" >&5
+echo "$as_me:16495: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16578,7 +16581,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16581: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16584: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16590,7 +16593,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16593: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16596: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16612,16 +16615,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16615: result: $enable_opaque_curses" >&5
+echo "$as_me:16618: 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:16620: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16623: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16624: checking whether form library structures should be opaque" >&5
+echo "$as_me:16627: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16638,10 +16641,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16641: result: $enable_opaque_form" >&5
+echo "$as_me:16644: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16644: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16647: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16658,10 +16661,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16661: result: $enable_opaque_menu" >&5
+echo "$as_me:16664: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16664: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16667: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16678,7 +16681,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16681: result: $enable_opaque_panel" >&5
+echo "$as_me:16684: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16688,7 +16691,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16691: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16694: 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.
@@ -16698,7 +16701,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16701: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16704: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16711,7 +16714,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16714: checking if you want all development code" >&5
+echo "$as_me:16717: 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.
@@ -16721,11 +16724,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16724: result: $with_develop" >&5
+echo "$as_me:16727: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16728: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16731: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16735,7 +16738,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16738: result: $enable_check_size" >&5
+echo "$as_me:16741: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16743,7 +16746,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16746: checking if you want hard-tabs code" >&5
+echo "$as_me:16749: 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.
@@ -16753,7 +16756,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16756: result: $enable_hard_tabs" >&5
+echo "$as_me:16759: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16761,7 +16764,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16764: checking if you want limited support for xmc" >&5
+echo "$as_me:16767: 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.
@@ -16771,7 +16774,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16774: result: $enable_xmc_glitch" >&5
+echo "$as_me:16777: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16781,7 +16784,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16784: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16787: 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.
@@ -16791,7 +16794,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16794: result: $with_assumed_color" >&5
+echo "$as_me:16797: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16799,7 +16802,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16802: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16805: 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.
@@ -16809,7 +16812,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16812: result: $with_hashmap" >&5
+echo "$as_me:16815: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16817,7 +16820,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16820: checking if you want colorfgbg code" >&5
+echo "$as_me:16823: 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.
@@ -16827,7 +16830,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16830: result: $with_colorfgbg" >&5
+echo "$as_me:16833: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16835,7 +16838,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16838: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16841: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16845,14 +16848,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16848: result: $cf_with_fvisibility" >&5
+echo "$as_me:16851: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16855: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16858: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16861,7 +16864,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16864 "configure"
+#line 16867 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16877,16 +16880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16883: \$? = $ac_status" >&5
+  echo "$as_me:16886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16889: \$? = $ac_status" >&5
+  echo "$as_me:16892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16898,7 +16901,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16901: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16904: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17013,7 +17016,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17016: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17019: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17022,7 +17025,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17025 "configure"
+#line 17028 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17038,16 +17041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17044: \$? = $ac_status" >&5
+  echo "$as_me:17047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:17053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17059,7 +17062,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17062: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17065: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17182,7 +17185,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17185: checking if you want interop bindings" >&5
+echo "$as_me:17188: 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.
@@ -17192,13 +17195,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17195: result: $with_exp_interop" >&5
+echo "$as_me:17198: 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:17201: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17204: 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.
@@ -17208,13 +17211,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17211: result: $with_safe_sprintf" >&5
+echo "$as_me:17214: 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:17217: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17220: 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.
@@ -17224,7 +17227,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17227: result: $with_scroll_hints" >&5
+echo "$as_me:17230: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17233,7 +17236,7 @@ EOF
 
 fi
 
-echo "$as_me:17236: checking if you want wgetch-events code" >&5
+echo "$as_me:17239: 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.
@@ -17243,7 +17246,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17246: result: $with_wgetch_events" >&5
+echo "$as_me:17249: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17258,7 +17261,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17261: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17264: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17268,7 +17271,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17271: result: $with_exp_win32" >&5
+	echo "$as_me:17274: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17294,7 +17297,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17297: checking if you want to see long compiling messages" >&5
+echo "$as_me:17300: 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.
@@ -17328,7 +17331,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17331: result: $enableval" >&5
+echo "$as_me:17334: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17341,7 +17344,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17344: checking if you want to install stripped executables" >&5
+echo "$as_me:17347: 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.
@@ -17358,7 +17361,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17361: result: $enable_stripping" >&5
+echo "$as_me:17364: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17369,7 +17372,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17372: checking if install accepts -p option" >&5
+echo "$as_me:17375: 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
@@ -17400,10 +17403,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17403: result: $cf_cv_install_p" >&5
+echo "$as_me:17406: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17406: checking if install needs to be told about ownership" >&5
+echo "$as_me:17409: 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)
@@ -17414,7 +17417,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17417: result: $with_install_o" >&5
+echo "$as_me:17420: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17425,7 +17428,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17428: checking if you want to specify strip-program" >&5
+	echo "$as_me:17431: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17435,11 +17438,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17438: result: $with_strip_program" >&5
+	echo "$as_me:17441: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17442: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17445: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17460,11 +17463,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17463: result: $check_install_strip" >&5
+		echo "$as_me:17466: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17467: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17470: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17479,7 +17482,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17482: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17485: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17505,7 +17508,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17508: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17511: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17522,17 +17525,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17525: result: $enable_stdnoreturn" >&5
+echo "$as_me:17528: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17529: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17532: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17535 "configure"
+#line 17538 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17548,16 +17551,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17554: \$? = $ac_status" >&5
+  echo "$as_me:17557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17560: \$? = $ac_status" >&5
+  echo "$as_me:17563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17568,7 +17571,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17571: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17574: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17624,16 +17627,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17627: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17630: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17632: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17635: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17636: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17639: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17672,16 +17675,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17675: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17678: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17680: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17683: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17684: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17687: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17720,23 +17723,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17723: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17726: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17728: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17731: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17732: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17739: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17742: 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.
@@ -17753,7 +17756,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17756: result: $enable_warnings" >&5
+echo "$as_me:17759: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17777,7 +17780,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17780 "configure"
+#line 17783 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17792,26 +17795,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17798: \$? = $ac_status" >&5
+  echo "$as_me:17801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17804: \$? = $ac_status" >&5
+  echo "$as_me:17807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17807: checking for X11/Xt const-feature" >&5
+echo "$as_me:17810: 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 17814 "configure"
+#line 17817 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17829,16 +17832,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17835: \$? = $ac_status" >&5
+  echo "$as_me:17838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17841: \$? = $ac_status" >&5
+  echo "$as_me:17844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17853,7 +17856,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17856: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17859: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17882,7 +17885,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17885 "${as_me:-configure}"
+#line 17888 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17898,7 +17901,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17901: checking for $CC warning options..." >&5
+	{ echo "$as_me:17904: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17914,12 +17917,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17917: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17920: \$? = $ac_status" >&5
+  echo "$as_me:17923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17922: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17925: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17927,7 +17930,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17930: checking for $CC warning options..." >&5
+	{ echo "$as_me:17933: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17950,12 +17953,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17953: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17956: \$? = $ac_status" >&5
+  echo "$as_me:17959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17958: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17961: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17963,7 +17966,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17973,7 +17976,7 @@ echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17976: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17979: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18006,10 +18009,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18009: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18012: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18012 "${as_me:-configure}"
+#line 18015 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18059,12 +18062,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18062: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18065: \$? = $ac_status" >&5
+  echo "$as_me:18068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18067: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18070: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18136,12 +18139,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18139: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18142: 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 18144 "configure"
+#line 18147 "configure"
 #include "confdefs.h"
 
 int
@@ -18158,16 +18161,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18164: \$? = $ac_status" >&5
+  echo "$as_me:18167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18170: \$? = $ac_status" >&5
+  echo "$as_me:18173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18178,7 +18181,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18181: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18184: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18187,11 +18190,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18190: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18193: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18194 "configure"
+#line 18197 "configure"
 #include "confdefs.h"
 
 int
@@ -18208,16 +18211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18214: \$? = $ac_status" >&5
+  echo "$as_me:18217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18220: \$? = $ac_status" >&5
+  echo "$as_me:18223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18227,7 +18230,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18230: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18233: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18236,30 +18239,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18239: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18242: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18246: checking version of $CC" >&5
+	echo "$as_me:18249: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18250: result: $CLANG_VERSION" >&5
+	echo "$as_me:18253: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18257: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18260: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18262 "configure"
+#line 18265 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18273,16 +18276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18279: \$? = $ac_status" >&5
+  echo "$as_me:18282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18285: \$? = $ac_status" >&5
+  echo "$as_me:18288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18293,13 +18296,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18296: result: $cf_clang_optok" >&5
+		echo "$as_me:18299: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18302: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18305: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18316,7 +18319,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18319 "configure"
+#line 18322 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18334,7 +18337,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18337: checking for $CC warning options..." >&5
+	{ echo "$as_me:18340: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18351,12 +18354,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18357: \$? = $ac_status" >&5
+  echo "$as_me:18360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18359: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18362: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18365,7 +18368,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18368: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18371: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18395,16 +18398,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18401: \$? = $ac_status" >&5
+  echo "$as_me:18404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18403: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18406: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18407: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18410: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18422,7 +18425,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18425: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18428: 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.
@@ -18432,7 +18435,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18435: result: $enable_string_hacks" >&5
+echo "$as_me:18438: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18441,15 +18444,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18444: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18447: 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:18446: checking for strlcat" >&5
+	echo "$as_me:18449: 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 18452 "configure"
+#line 18455 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18480,16 +18483,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18486: \$? = $ac_status" >&5
+  echo "$as_me:18489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18492: \$? = $ac_status" >&5
+  echo "$as_me:18495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18499,7 +18502,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18502: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18505: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18509,7 +18512,7 @@ EOF
 
 else
 
-		echo "$as_me:18512: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18515: 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
@@ -18517,7 +18520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18520 "configure"
+#line 18523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18536,16 +18539,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18542: \$? = $ac_status" >&5
+  echo "$as_me:18545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18548: \$? = $ac_status" >&5
+  echo "$as_me:18551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18556,7 +18559,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18559: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18562: 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
 
@@ -18579,23 +18582,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18582: checking for $ac_header" >&5
+echo "$as_me:18585: 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 18588 "configure"
+#line 18591 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18592: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18598: \$? = $ac_status" >&5
+  echo "$as_me:18601: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18614,7 +18617,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18617: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18635,13 +18638,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18638: checking for $ac_func" >&5
+echo "$as_me:18641: 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 18644 "configure"
+#line 18647 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18672,16 +18675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18678: \$? = $ac_status" >&5
+  echo "$as_me:18681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18684: \$? = $ac_status" >&5
+  echo "$as_me:18687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18691,7 +18694,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18694: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18697: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18704,7 +18707,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18707: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18710: 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.
@@ -18714,7 +18717,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18717: result: $with_assertions" >&5
+echo "$as_me:18720: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18730,7 +18733,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18733: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18736: 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.
@@ -18752,7 +18755,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18755: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18758: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18866,23 +18869,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18869: checking for dmalloc.h" >&5
+	echo "$as_me:18872: 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 18875 "configure"
+#line 18878 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18879: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18882: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18885: \$? = $ac_status" >&5
+  echo "$as_me:18888: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18901,11 +18904,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18904: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18907: 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:18908: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18911: 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
@@ -18913,7 +18916,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18916 "configure"
+#line 18919 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18932,16 +18935,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18938: \$? = $ac_status" >&5
+  echo "$as_me:18941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18944: \$? = $ac_status" >&5
+  echo "$as_me:18947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18952,7 +18955,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18958: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18967,7 +18970,7 @@ fi
 
 fi
 
-echo "$as_me:18970: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18973: 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.
@@ -18989,7 +18992,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18992: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18995: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19103,23 +19106,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19106: checking for dbmalloc.h" >&5
+	echo "$as_me:19109: 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 19112 "configure"
+#line 19115 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19116: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19122: \$? = $ac_status" >&5
+  echo "$as_me:19125: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19138,11 +19141,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19141: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19144: 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:19145: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19148: 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
@@ -19150,7 +19153,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19153 "configure"
+#line 19156 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19169,16 +19172,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19175: \$? = $ac_status" >&5
+  echo "$as_me:19178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19181: \$? = $ac_status" >&5
+  echo "$as_me:19184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19189,7 +19192,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19192: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19195: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19204,7 +19207,7 @@ fi
 
 fi
 
-echo "$as_me:19207: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19210: 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.
@@ -19226,7 +19229,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19229: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19232: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19339,7 +19342,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19342: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19345: 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.
@@ -19350,7 +19353,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19353: result: $with_no_leaks" >&5
+echo "$as_me:19356: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19402,7 +19405,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19405: checking whether to add trace feature to all models" >&5
+echo "$as_me:19408: 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.
@@ -19412,7 +19415,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19415: result: $cf_with_trace" >&5
+echo "$as_me:19418: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19432,7 +19435,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19435: checking if we want to use GNAT projects" >&5
+echo "$as_me:19438: 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.
@@ -19449,7 +19452,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19452: result: $enable_gnat_projects" >&5
+echo "$as_me:19455: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19462,14 +19465,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19465: checking if ssp library is needed" >&5
+echo "$as_me:19468: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19472 "configure"
+#line 19475 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19486,16 +19489,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19492: \$? = $ac_status" >&5
+  echo "$as_me:19495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19498: \$? = $ac_status" >&5
+  echo "$as_me:19501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19505,7 +19508,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19508 "configure"
+#line 19511 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19522,16 +19525,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19528: \$? = $ac_status" >&5
+  echo "$as_me:19531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19534: \$? = $ac_status" >&5
+  echo "$as_me:19537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19545,7 +19548,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19548: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19551: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19574,14 +19577,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19577: checking if -lm needed for math functions" >&5
+echo "$as_me:19580: 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 19584 "configure"
+#line 19587 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19597,16 +19600,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19603: \$? = $ac_status" >&5
+  echo "$as_me:19606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19609: \$? = $ac_status" >&5
+  echo "$as_me:19612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19616,7 +19619,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19619: result: $cf_cv_need_libm" >&5
+echo "$as_me:19622: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19624,14 +19627,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19627: checking if -lm is available for math functions" >&5
+	echo "$as_me:19630: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19634 "configure"
+#line 19637 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19647,16 +19650,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19653: \$? = $ac_status" >&5
+  echo "$as_me:19656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19659: \$? = $ac_status" >&5
+  echo "$as_me:19662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19666,7 +19669,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19669: result: $cf_cv_have_libm" >&5
+echo "$as_me:19672: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19688,13 +19691,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19691: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19694: 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 19697 "configure"
+#line 19700 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19710,16 +19713,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:19719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19722: \$? = $ac_status" >&5
+  echo "$as_me:19725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19729,7 +19732,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19732: result: $ac_cv_header_time" >&5
+echo "$as_me:19735: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19744,7 +19747,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19747: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19750: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19752,7 +19755,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19755 "configure"
+#line 19758 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19771,16 +19774,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19791,11 +19794,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19794: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19797: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19798: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19801: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19803,7 +19806,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19806 "configure"
+#line 19809 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19822,16 +19825,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19828: \$? = $ac_status" >&5
+  echo "$as_me:19831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19834: \$? = $ac_status" >&5
+  echo "$as_me:19837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19842,7 +19845,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19845: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19848: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19864,7 +19867,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19867: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19870: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19872,7 +19875,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19875 "configure"
+#line 19878 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19891,16 +19894,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19897: \$? = $ac_status" >&5
+  echo "$as_me:19900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19903: \$? = $ac_status" >&5
+  echo "$as_me:19906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19911,7 +19914,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19914: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19917: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19933,7 +19936,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19936: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19939: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19941,7 +19944,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19944 "configure"
+#line 19947 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19960,16 +19963,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19966: \$? = $ac_status" >&5
+  echo "$as_me:19969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19972: \$? = $ac_status" >&5
+  echo "$as_me:19975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19980,7 +19983,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19983: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19986: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20022,7 +20025,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20025: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20028: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20030,7 +20033,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20033 "configure"
+#line 20036 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20049,16 +20052,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20055: \$? = $ac_status" >&5
+  echo "$as_me:20058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20069,7 +20072,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20072: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20075: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20097,13 +20100,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20100: checking for regcomp" >&5
+	echo "$as_me:20103: 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 20106 "configure"
+#line 20109 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20134,16 +20137,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20140: \$? = $ac_status" >&5
+  echo "$as_me:20143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20146: \$? = $ac_status" >&5
+  echo "$as_me:20149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20153,7 +20156,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20156: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20159: 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
@@ -20162,7 +20165,7 @@ else
 		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:20165: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20168: 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
@@ -20170,7 +20173,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20173 "configure"
+#line 20176 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20189,16 +20192,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20195: \$? = $ac_status" >&5
+  echo "$as_me:20198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20201: \$? = $ac_status" >&5
+  echo "$as_me:20204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20209,7 +20212,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20212: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20215: 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
 
@@ -20241,13 +20244,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20244: checking for compile" >&5
+	echo "$as_me:20247: 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 20250 "configure"
+#line 20253 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20278,16 +20281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20284: \$? = $ac_status" >&5
+  echo "$as_me:20287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20290: \$? = $ac_status" >&5
+  echo "$as_me:20293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20297,13 +20300,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20300: result: $ac_cv_func_compile" >&5
+echo "$as_me:20303: 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:20306: checking for compile in -lgen" >&5
+		echo "$as_me:20309: 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
@@ -20311,7 +20314,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20314 "configure"
+#line 20317 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20330,16 +20333,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20336: \$? = $ac_status" >&5
+  echo "$as_me:20339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20342: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20350,7 +20353,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20353: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20356: 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
 
@@ -20378,11 +20381,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20381: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20384: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20385: checking for regular-expression headers" >&5
+echo "$as_me:20388: 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
@@ -20394,7 +20397,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20397 "configure"
+#line 20400 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20411,16 +20414,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20417: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20437,7 +20440,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20440 "configure"
+#line 20443 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20457,16 +20460,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20463: \$? = $ac_status" >&5
+  echo "$as_me:20466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20469: \$? = $ac_status" >&5
+  echo "$as_me:20472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20482,11 +20485,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20485: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20488: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20489: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20492: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20524,23 +20527,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20527: checking for $ac_header" >&5
+echo "$as_me:20530: 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 20533 "configure"
+#line 20536 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20537: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20540: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20543: \$? = $ac_status" >&5
+  echo "$as_me:20546: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20559,7 +20562,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20562: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20565: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20572,23 +20575,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20575: checking for $ac_header" >&5
+echo "$as_me:20578: 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 20581 "configure"
+#line 20584 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20591: \$? = $ac_status" >&5
+  echo "$as_me:20594: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20607,7 +20610,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20610: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20613: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20617,7 +20620,7 @@ EOF
 fi
 done
 
-echo "$as_me:20620: checking for header declaring getopt variables" >&5
+echo "$as_me:20623: 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
@@ -20627,7 +20630,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20630 "configure"
+#line 20633 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20640,16 +20643,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20646: \$? = $ac_status" >&5
+  echo "$as_me:20649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20652: \$? = $ac_status" >&5
+  echo "$as_me:20655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20661,7 +20664,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20664: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20667: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20678,14 +20681,14 @@ EOF
 
 fi
 
-echo "$as_me:20681: checking if external environ is declared" >&5
+echo "$as_me:20684: 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 20688 "configure"
+#line 20691 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20698,16 +20701,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20704: \$? = $ac_status" >&5
+  echo "$as_me:20707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20710: \$? = $ac_status" >&5
+  echo "$as_me:20713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20718,7 +20721,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20721: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20724: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20733,14 +20736,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20736: checking if external environ exists" >&5
+echo "$as_me:20739: 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 20743 "configure"
+#line 20746 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20755,16 +20758,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20761: \$? = $ac_status" >&5
+  echo "$as_me:20764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20775,7 +20778,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20778: result: $cf_cv_have_environ" >&5
+echo "$as_me:20781: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20788,13 +20791,13 @@ EOF
 
 fi
 
-echo "$as_me:20791: checking for getenv" >&5
+echo "$as_me:20794: 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 20797 "configure"
+#line 20800 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20825,16 +20828,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20831: \$? = $ac_status" >&5
+  echo "$as_me:20834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20837: \$? = $ac_status" >&5
+  echo "$as_me:20840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20844,19 +20847,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20847: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20850: 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:20853: checking for $ac_func" >&5
+echo "$as_me:20856: 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 20859 "configure"
+#line 20862 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20887,16 +20890,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20893: \$? = $ac_status" >&5
+  echo "$as_me:20896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20899: \$? = $ac_status" >&5
+  echo "$as_me:20902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20906,7 +20909,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20909: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20916,7 +20919,7 @@ EOF
 fi
 done
 
-echo "$as_me:20919: checking if getenv returns consistent values" >&5
+echo "$as_me:20922: 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
@@ -20926,7 +20929,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20929 "configure"
+#line 20932 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21031,15 +21034,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21037: \$? = $ac_status" >&5
+  echo "$as_me:21040: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21052,7 +21055,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21055: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21058: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21067,18 +21070,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21070: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21073: 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
 
-echo "$as_me:21074: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21077: 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 21081 "configure"
+#line 21084 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21098,16 +21101,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21104: \$? = $ac_status" >&5
+  echo "$as_me:21107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21110: \$? = $ac_status" >&5
+  echo "$as_me:21113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21119,7 +21122,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21122: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21125: 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
@@ -21134,13 +21137,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21137: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21140: 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 21143 "configure"
+#line 21146 "configure"
 #include "confdefs.h"
 
 int
@@ -21202,16 +21205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21208: \$? = $ac_status" >&5
+  echo "$as_me:21211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21214: \$? = $ac_status" >&5
+  echo "$as_me:21217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21221,7 +21224,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21224: result: $ac_cv_c_const" >&5
+echo "$as_me:21227: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21231,7 +21234,7 @@ EOF
 
 fi
 
-echo "$as_me:21234: checking for inline" >&5
+echo "$as_me:21237: 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
@@ -21239,7 +21242,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21242 "configure"
+#line 21245 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21248,16 +21251,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21254: \$? = $ac_status" >&5
+  echo "$as_me:21257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21260: \$? = $ac_status" >&5
+  echo "$as_me:21263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21268,7 +21271,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21271: result: $ac_cv_c_inline" >&5
+echo "$as_me:21274: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21294,7 +21297,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21297: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21300: 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
@@ -21303,7 +21306,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21306 "configure"
+#line 21309 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21315,16 +21318,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21321: \$? = $ac_status" >&5
+  echo "$as_me:21324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21327: \$? = $ac_status" >&5
+  echo "$as_me:21330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21336,7 +21339,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21339: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21342: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21442,7 +21445,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21445: checking for signal global datatype" >&5
+echo "$as_me:21448: 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
@@ -21454,7 +21457,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21457 "configure"
+#line 21460 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21478,16 +21481,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21484: \$? = $ac_status" >&5
+  echo "$as_me:21487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21490: \$? = $ac_status" >&5
+  echo "$as_me:21493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21501,7 +21504,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21504: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21507: 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 <<EOF
@@ -21510,7 +21513,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21513: checking for type of chtype" >&5
+echo "$as_me:21516: 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
@@ -21520,7 +21523,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21523 "configure"
+#line 21526 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21555,15 +21558,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21561: \$? = $ac_status" >&5
+  echo "$as_me:21564: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21566: \$? = $ac_status" >&5
+  echo "$as_me:21569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21578,7 +21581,7 @@ fi
 
 fi
 
-echo "$as_me:21581: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21584: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21590,14 +21593,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21593: checking if unsigned literals are legal" >&5
+echo "$as_me:21596: 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 21600 "configure"
+#line 21603 "configure"
 #include "confdefs.h"
 
 int
@@ -21609,16 +21612,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21615: \$? = $ac_status" >&5
+  echo "$as_me:21618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21621: \$? = $ac_status" >&5
+  echo "$as_me:21624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21630,7 +21633,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21633: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21636: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21646,14 +21649,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21649: checking if external errno is declared" >&5
+echo "$as_me:21652: 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 21656 "configure"
+#line 21659 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21667,16 +21670,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21673: \$? = $ac_status" >&5
+  echo "$as_me:21676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21679: \$? = $ac_status" >&5
+  echo "$as_me:21682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21687,7 +21690,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21690: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21693: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21702,14 +21705,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21705: checking if external errno exists" >&5
+echo "$as_me:21708: 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 21712 "configure"
+#line 21715 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21724,16 +21727,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21730: \$? = $ac_status" >&5
+  echo "$as_me:21733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21736: \$? = $ac_status" >&5
+  echo "$as_me:21739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21744,7 +21747,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21747: result: $cf_cv_have_errno" >&5
+echo "$as_me:21750: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21757,7 +21760,7 @@ EOF
 
 fi
 
-echo "$as_me:21760: checking if data-only library module links" >&5
+echo "$as_me:21763: 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
@@ -21765,20 +21768,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21768 "configure"
+#line 21771 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21774: \$? = $ac_status" >&5
+  echo "$as_me:21777: \$? = $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 <<EOF
-#line 21781 "configure"
+#line 21784 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21795,10 +21798,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21798: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21801: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21801: \$? = $ac_status" >&5
+  echo "$as_me:21804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21811,7 +21814,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21814 "configure"
+#line 21817 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21822,15 +21825,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21828: \$? = $ac_status" >&5
+  echo "$as_me:21831: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21833: \$? = $ac_status" >&5
+  echo "$as_me:21836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21845,7 +21848,7 @@ fi
 
 fi
 
-echo "$as_me:21848: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21851: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21860,13 +21863,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21863: checking for clock_gettime" >&5
+echo "$as_me:21866: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21869 "configure"
+#line 21872 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21897,16 +21900,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21903: \$? = $ac_status" >&5
+  echo "$as_me:21906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21909: \$? = $ac_status" >&5
+  echo "$as_me:21912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21916,12 +21919,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21919: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21922: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21924: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21927: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21929,7 +21932,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21932 "configure"
+#line 21935 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21948,16 +21951,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21960: \$? = $ac_status" >&5
+  echo "$as_me:21963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21968,7 +21971,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21971: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21974: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21980,14 +21983,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21983: checking if clock_gettime links" >&5
+echo "$as_me:21986: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21990 "configure"
+#line 21993 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22005,16 +22008,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22011: \$? = $ac_status" >&5
+  echo "$as_me:22014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22017: \$? = $ac_status" >&5
+  echo "$as_me:22020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22025,7 +22028,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22028: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22031: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22039,13 +22042,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22042: checking for gettimeofday" >&5
+echo "$as_me:22045: 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 22048 "configure"
+#line 22051 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22076,16 +22079,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22082: \$? = $ac_status" >&5
+  echo "$as_me:22085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22088: \$? = $ac_status" >&5
+  echo "$as_me:22091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22095,7 +22098,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22098: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22101: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22105,7 +22108,7 @@ EOF
 
 else
 
-echo "$as_me:22108: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22111: 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
@@ -22113,7 +22116,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22116 "configure"
+#line 22119 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22132,16 +22135,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22138: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22144: \$? = $ac_status" >&5
+  echo "$as_me:22147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22152,7 +22155,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22155: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22158: 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
 
@@ -22211,13 +22214,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22214: checking for $ac_func" >&5
+echo "$as_me:22217: 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 22220 "configure"
+#line 22223 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22248,16 +22251,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22254: \$? = $ac_status" >&5
+  echo "$as_me:22257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22267,7 +22270,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22270: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22273: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22277,14 +22280,14 @@ EOF
 fi
 done
 
-echo "$as_me:22280: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22283: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22287 "configure"
+#line 22290 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22299,16 +22302,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22305: \$? = $ac_status" >&5
+  echo "$as_me:22308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22311: \$? = $ac_status" >&5
+  echo "$as_me:22314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22318,7 +22321,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22321: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22324: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22340,7 +22343,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22343: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22346: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22350,7 +22353,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22353 "configure"
+#line 22356 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22363,15 +22366,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22369: \$? = $ac_status" >&5
+  echo "$as_me:22372: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22374: \$? = $ac_status" >&5
+  echo "$as_me:22377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22383,7 +22386,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22386: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22389: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22395,14 +22398,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22398: checking for getttynam" >&5
+	echo "$as_me:22401: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22405 "configure"
+#line 22408 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22414,16 +22417,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22420: \$? = $ac_status" >&5
+  echo "$as_me:22423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22426: \$? = $ac_status" >&5
+  echo "$as_me:22429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22433,7 +22436,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22436: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22439: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22443,7 +22446,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22446: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22449: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22452,7 +22455,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22455: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22458: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22465,14 +22468,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22468: checking for terminal-capability database functions" >&5
+echo "$as_me:22471: 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 22475 "configure"
+#line 22478 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22492,16 +22495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22498: \$? = $ac_status" >&5
+  echo "$as_me:22501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22512,7 +22515,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22515: result: $cf_cv_cgetent" >&5
+echo "$as_me:22518: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22522,14 +22525,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22525: checking if cgetent uses const parameter" >&5
+echo "$as_me:22528: 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 22532 "configure"
+#line 22535 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22552,16 +22555,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22558: \$? = $ac_status" >&5
+  echo "$as_me:22561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22572,7 +22575,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22575: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22578: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22586,14 +22589,14 @@ fi
 
 fi
 
-echo "$as_me:22589: checking for isascii" >&5
+echo "$as_me:22592: 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 22596 "configure"
+#line 22599 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22605,16 +22608,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22611: \$? = $ac_status" >&5
+  echo "$as_me:22614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22617: \$? = $ac_status" >&5
+  echo "$as_me:22620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22625,7 +22628,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22628: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22631: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22633,10 +22636,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22636: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22639: 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 22639 "configure"
+#line 22642 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22650,16 +22653,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22656: \$? = $ac_status" >&5
+  echo "$as_me:22659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22662: \$? = $ac_status" >&5
+  echo "$as_me:22665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22667,7 +22670,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22670 "configure"
+#line 22673 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22682,16 +22685,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22688: \$? = $ac_status" >&5
+  echo "$as_me:22691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22694: \$? = $ac_status" >&5
+  echo "$as_me:22697: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22707,11 +22710,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22710: result: $sigact_bad" >&5
+echo "$as_me:22713: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22714: checking if nanosleep really works" >&5
+echo "$as_me:22717: 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
@@ -22721,7 +22724,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22724 "configure"
+#line 22727 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22747,15 +22750,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22753: \$? = $ac_status" >&5
+  echo "$as_me:22756: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22758: \$? = $ac_status" >&5
+  echo "$as_me:22761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22767,7 +22770,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22770: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22773: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22784,23 +22787,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22787: checking for $ac_header" >&5
+echo "$as_me:22790: 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 22793 "configure"
+#line 22796 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22803: \$? = $ac_status" >&5
+  echo "$as_me:22806: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22819,7 +22822,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22822: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22836,10 +22839,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22839: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22842: 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 22842 "configure"
+#line 22845 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22851,16 +22854,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22857: \$? = $ac_status" >&5
+  echo "$as_me:22860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22863: \$? = $ac_status" >&5
+  echo "$as_me:22866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22868,7 +22871,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22871 "configure"
+#line 22874 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22882,16 +22885,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22888: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22894: \$? = $ac_status" >&5
+  echo "$as_me:22897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22907,19 +22910,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22910: result: $termios_bad" >&5
+	echo "$as_me:22913: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22915: checking for tcgetattr" >&5
+echo "$as_me:22918: 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 22922 "configure"
+#line 22925 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22947,16 +22950,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22953: \$? = $ac_status" >&5
+  echo "$as_me:22956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22959: \$? = $ac_status" >&5
+  echo "$as_me:22962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22966,21 +22969,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22969: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22972: 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:22976: checking for vsscanf function or workaround" >&5
+echo "$as_me:22979: 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 22983 "configure"
+#line 22986 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23006,16 +23009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23012: \$? = $ac_status" >&5
+  echo "$as_me:23015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23018: \$? = $ac_status" >&5
+  echo "$as_me:23021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23023,7 +23026,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23026 "configure"
+#line 23029 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23045,16 +23048,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23051: \$? = $ac_status" >&5
+  echo "$as_me:23054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23057: \$? = $ac_status" >&5
+  echo "$as_me:23060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23062,7 +23065,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23065 "configure"
+#line 23068 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23084,16 +23087,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23090: \$? = $ac_status" >&5
+  echo "$as_me:23093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23096: \$? = $ac_status" >&5
+  echo "$as_me:23099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23108,7 +23111,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23111: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23114: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23134,23 +23137,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23137: checking for $ac_header" >&5
+echo "$as_me:23140: 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 23143 "configure"
+#line 23146 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23147: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23153: \$? = $ac_status" >&5
+  echo "$as_me:23156: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23169,7 +23172,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23172: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23179,7 +23182,7 @@ EOF
 fi
 done
 
-echo "$as_me:23182: checking for working mkstemp" >&5
+echo "$as_me:23185: 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
@@ -23190,7 +23193,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23193 "configure"
+#line 23196 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23225,15 +23228,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23231: \$? = $ac_status" >&5
+  echo "$as_me:23234: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23236: \$? = $ac_status" >&5
+  echo "$as_me:23239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23248,16 +23251,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23251: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23254: 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:23254: checking for mkstemp" >&5
+	echo "$as_me:23257: 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 23260 "configure"
+#line 23263 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23288,16 +23291,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23294: \$? = $ac_status" >&5
+  echo "$as_me:23297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23300: \$? = $ac_status" >&5
+  echo "$as_me:23303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23307,7 +23310,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23310: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23313: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23328,21 +23331,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23331: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23334: 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:23334: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23337: 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:23340: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23343: 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 23345 "configure"
+#line 23348 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23359,15 +23362,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23365: \$? = $ac_status" >&5
+  echo "$as_me:23368: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23370: \$? = $ac_status" >&5
+  echo "$as_me:23373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23380,7 +23383,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23383: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23386: 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
 
@@ -23391,13 +23394,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23394: checking for intptr_t" >&5
+echo "$as_me:23397: 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 23400 "configure"
+#line 23403 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23412,16 +23415,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23418: \$? = $ac_status" >&5
+  echo "$as_me:23421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23424: \$? = $ac_status" >&5
+  echo "$as_me:23427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23431,7 +23434,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23434: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23437: 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
   :
@@ -23443,13 +23446,13 @@ EOF
 
 fi
 
-echo "$as_me:23446: checking for ssize_t" >&5
+echo "$as_me:23449: 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 23452 "configure"
+#line 23455 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23464,16 +23467,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23470: \$? = $ac_status" >&5
+  echo "$as_me:23473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23476: \$? = $ac_status" >&5
+  echo "$as_me:23479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23483,7 +23486,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23486: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23489: 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
   :
@@ -23495,14 +23498,14 @@ EOF
 
 fi
 
-echo "$as_me:23498: checking for type sigaction_t" >&5
+echo "$as_me:23501: 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 23505 "configure"
+#line 23508 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23515,16 +23518,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23521: \$? = $ac_status" >&5
+  echo "$as_me:23524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23527: \$? = $ac_status" >&5
+  echo "$as_me:23530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23535,14 +23538,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23538: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23541: 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:23545: checking declaration of size-change" >&5
+echo "$as_me:23548: 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
@@ -23563,7 +23566,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23566 "configure"
+#line 23569 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23613,16 +23616,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23619: \$? = $ac_status" >&5
+  echo "$as_me:23622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23625: \$? = $ac_status" >&5
+  echo "$as_me:23628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23641,7 +23644,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23644: result: $cf_cv_sizechange" >&5
+echo "$as_me:23647: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23659,13 +23662,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23662: checking for memmove" >&5
+echo "$as_me:23665: 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 23668 "configure"
+#line 23671 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23696,16 +23699,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23702: \$? = $ac_status" >&5
+  echo "$as_me:23705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23708: \$? = $ac_status" >&5
+  echo "$as_me:23711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23715,19 +23718,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23718: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23721: 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:23724: checking for bcopy" >&5
+echo "$as_me:23727: 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 23730 "configure"
+#line 23733 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23758,16 +23761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23764: \$? = $ac_status" >&5
+  echo "$as_me:23767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23770: \$? = $ac_status" >&5
+  echo "$as_me:23773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23777,11 +23780,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23780: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23783: 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:23784: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23787: 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
@@ -23791,7 +23794,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23794 "configure"
+#line 23797 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23807,15 +23810,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23813: \$? = $ac_status" >&5
+  echo "$as_me:23816: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23818: \$? = $ac_status" >&5
+  echo "$as_me:23821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23828,7 +23831,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23831: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23834: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23855,13 +23858,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23858: checking for $ac_func" >&5
+echo "$as_me:23861: 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 23864 "configure"
+#line 23867 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23892,16 +23895,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23898: \$? = $ac_status" >&5
+  echo "$as_me:23901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23904: \$? = $ac_status" >&5
+  echo "$as_me:23907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23911,7 +23914,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23914: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23917: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23921,7 +23924,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23924: checking if poll really works" >&5
+echo "$as_me:23927: 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
@@ -23931,7 +23934,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23934 "configure"
+#line 23937 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23984,15 +23987,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23990: \$? = $ac_status" >&5
+  echo "$as_me:23993: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23995: \$? = $ac_status" >&5
+  echo "$as_me:23998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24004,21 +24007,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24007: result: $cf_cv_working_poll" >&5
+echo "$as_me:24010: 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:24014: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24017: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24021 "configure"
+#line 24024 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24038,16 +24041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24044: \$? = $ac_status" >&5
+  echo "$as_me:24047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24050: \$? = $ac_status" >&5
+  echo "$as_me:24053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24057,7 +24060,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24060: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24063: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24067,18 +24070,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24070: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24073: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24074: checking for va_copy" >&5
+echo "$as_me:24077: 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 24081 "configure"
+#line 24084 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24095,16 +24098,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24101: \$? = $ac_status" >&5
+  echo "$as_me:24104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24107: \$? = $ac_status" >&5
+  echo "$as_me:24110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24114,7 +24117,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24117: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24120: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24126,14 +24129,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24129: checking for __va_copy" >&5
+echo "$as_me:24132: 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 24136 "configure"
+#line 24139 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24150,16 +24153,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24156: \$? = $ac_status" >&5
+  echo "$as_me:24159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24169,7 +24172,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24172: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24175: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24181,14 +24184,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24184: checking for __builtin_va_copy" >&5
+echo "$as_me:24187: 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 24191 "configure"
+#line 24194 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24205,16 +24208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24211: \$? = $ac_status" >&5
+  echo "$as_me:24214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24217: \$? = $ac_status" >&5
+  echo "$as_me:24220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24224,7 +24227,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24227: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24230: 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 &&
@@ -24242,14 +24245,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24245: checking if we can simply copy va_list" >&5
+	echo "$as_me:24248: 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 24252 "configure"
+#line 24255 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24266,16 +24269,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24272: \$? = $ac_status" >&5
+  echo "$as_me:24275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24278: \$? = $ac_status" >&5
+  echo "$as_me:24281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24285,19 +24288,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24288: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24291: 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:24293: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24296: 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 24300 "configure"
+#line 24303 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24314,16 +24317,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24320: \$? = $ac_status" >&5
+  echo "$as_me:24323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24326: \$? = $ac_status" >&5
+  echo "$as_me:24329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24333,7 +24336,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24336: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24339: 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
@@ -24344,13 +24347,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24347: checking for pid_t" >&5
+echo "$as_me:24350: 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 24353 "configure"
+#line 24356 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24365,16 +24368,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24371: \$? = $ac_status" >&5
+  echo "$as_me:24374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24377: \$? = $ac_status" >&5
+  echo "$as_me:24380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24384,7 +24387,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24387: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24390: 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
   :
@@ -24399,23 +24402,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24402: checking for $ac_header" >&5
+echo "$as_me:24405: 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 24408 "configure"
+#line 24411 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24412: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24418: \$? = $ac_status" >&5
+  echo "$as_me:24421: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24434,7 +24437,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24437: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24447,13 +24450,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24450: checking for $ac_func" >&5
+echo "$as_me:24453: 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 24456 "configure"
+#line 24459 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24484,16 +24487,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24490: \$? = $ac_status" >&5
+  echo "$as_me:24493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24496: \$? = $ac_status" >&5
+  echo "$as_me:24499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24503,7 +24506,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24515,7 +24518,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24518: checking for working fork" >&5
+  echo "$as_me:24521: 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
@@ -24538,15 +24541,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24544: \$? = $ac_status" >&5
+  echo "$as_me:24547: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24549: \$? = $ac_status" >&5
+  echo "$as_me:24552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24558,7 +24561,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24561: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24564: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24572,12 +24575,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24575: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24578: 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:24580: checking for working vfork" >&5
+  echo "$as_me:24583: 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
@@ -24586,7 +24589,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24589 "configure"
+#line 24592 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24679,15 +24682,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24685: \$? = $ac_status" >&5
+  echo "$as_me:24688: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24690: \$? = $ac_status" >&5
+  echo "$as_me:24693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24699,13 +24702,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24702: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24705: 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:24708: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24711: 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
 
@@ -24730,7 +24733,7 @@ EOF
 
 fi
 
-echo "$as_me:24733: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24736: 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
@@ -24740,7 +24743,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24743 "configure"
+#line 24746 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24775,15 +24778,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24781: \$? = $ac_status" >&5
+  echo "$as_me:24784: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24786: \$? = $ac_status" >&5
+  echo "$as_me:24789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24796,7 +24799,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24799: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24802: 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
@@ -24805,7 +24808,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24808: checking for openpty in -lutil" >&5
+echo "$as_me:24811: 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
@@ -24813,7 +24816,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24816 "configure"
+#line 24819 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24832,16 +24835,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24838: \$? = $ac_status" >&5
+  echo "$as_me:24841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24844: \$? = $ac_status" >&5
+  echo "$as_me:24847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24852,7 +24855,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24855: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24858: 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
@@ -24860,7 +24863,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24863: checking for openpty header" >&5
+echo "$as_me:24866: 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
@@ -24887,7 +24890,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24890 "configure"
+#line 24893 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24905,16 +24908,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24911: \$? = $ac_status" >&5
+  echo "$as_me:24914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24917: \$? = $ac_status" >&5
+  echo "$as_me:24920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24932,7 +24935,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24935: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24938: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25005,7 +25008,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25008 "configure"
+#line 25011 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25017,16 +25020,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25023: \$? = $ac_status" >&5
+  echo "$as_me:25026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25029: \$? = $ac_status" >&5
+  echo "$as_me:25032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25043,7 +25046,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25046: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25049: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25079,7 +25082,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25082: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25085: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25090,7 +25093,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25093: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25096: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25162,7 +25165,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25165 "configure"
+#line 25168 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25174,16 +25177,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25180: \$? = $ac_status" >&5
+  echo "$as_me:25183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25186: \$? = $ac_status" >&5
+  echo "$as_me:25189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25200,7 +25203,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25203: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25206: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25280,7 +25283,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25283: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25286: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25297,23 +25300,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25300: checking for db.h" >&5
+echo "$as_me:25303: 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 25306 "configure"
+#line 25309 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25316: \$? = $ac_status" >&5
+  echo "$as_me:25319: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25332,11 +25335,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25335: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25338: 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:25339: checking for version of db" >&5
+echo "$as_me:25342: 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
@@ -25347,10 +25350,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25350: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25353: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25353 "configure"
+#line 25356 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25380,16 +25383,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25386: \$? = $ac_status" >&5
+  echo "$as_me:25389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25392: \$? = $ac_status" >&5
+  echo "$as_me:25395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25403,16 +25406,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25406: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25409: 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:25410: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25413: 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:25415: checking for db libraries" >&5
+echo "$as_me:25418: 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
@@ -25442,10 +25445,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25445: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25448: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25448 "configure"
+#line 25451 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25500,16 +25503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25506: \$? = $ac_status" >&5
+  echo "$as_me:25509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25512: \$? = $ac_status" >&5
+  echo "$as_me:25515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25529,11 +25532,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25532: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25535: 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:25536: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25539: 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
@@ -25559,7 +25562,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25562: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25565: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25574,7 +25577,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25577: checking if we should include stdbool.h" >&5
+echo "$as_me:25580: 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
@@ -25582,7 +25585,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25585 "configure"
+#line 25588 "configure"
 #include "confdefs.h"
 
 int
@@ -25594,23 +25597,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25600: \$? = $ac_status" >&5
+  echo "$as_me:25603: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25606: \$? = $ac_status" >&5
+  echo "$as_me:25609: \$? = $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 25613 "configure"
+#line 25616 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25626,16 +25629,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25632: \$? = $ac_status" >&5
+  echo "$as_me:25635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25638: \$? = $ac_status" >&5
+  echo "$as_me:25641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25649,13 +25652,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25652: result: yes" >&5
+then	echo "$as_me:25655: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25654: result: no" >&5
+else	echo "$as_me:25657: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25658: checking for builtin bool type" >&5
+echo "$as_me:25661: 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
@@ -25663,7 +25666,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25666 "configure"
+#line 25669 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25678,16 +25681,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25684: \$? = $ac_status" >&5
+  echo "$as_me:25687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25690: \$? = $ac_status" >&5
+  echo "$as_me:25693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25700,9 +25703,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25703: result: yes" >&5
+then	echo "$as_me:25706: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25705: result: no" >&5
+else	echo "$as_me:25708: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25719,10 +25722,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25722: checking if we already have C++ library" >&5
+	echo "$as_me:25725: 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 25725 "configure"
+#line 25728 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25736,16 +25739,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25742: \$? = $ac_status" >&5
+  echo "$as_me:25745: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25748: \$? = $ac_status" >&5
+  echo "$as_me:25751: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25754,7 +25757,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25757: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25760: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25773,7 +25776,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25776: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25779: 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
@@ -25799,7 +25802,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25802 "configure"
+#line 25805 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25813,16 +25816,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25819: \$? = $ac_status" >&5
+  echo "$as_me:25822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25825: \$? = $ac_status" >&5
+  echo "$as_me:25828: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25834,7 +25837,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25837: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25840: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25856,7 +25859,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25859: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25862: 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
@@ -25871,15 +25874,15 @@ CF_EOF
 # 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:25874: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25877: \$? = $ac_status" >&5
+  echo "$as_me:25880: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25879: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25882: \$? = $ac_status" >&5
+  echo "$as_me:25885: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25890,10 +25893,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25893: result: yes" >&5
+  echo "$as_me:25896: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25896: result: no" >&5
+  echo "$as_me:25899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25913,7 +25916,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25916: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25919: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25934,7 +25937,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25937 "configure"
+#line 25940 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25948,16 +25951,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25954: \$? = $ac_status" >&5
+  echo "$as_me:25957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25960: \$? = $ac_status" >&5
+  echo "$as_me:25963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25994,7 +25997,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25997 "configure"
+#line 26000 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26008,16 +26011,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26014: \$? = $ac_status" >&5
+  echo "$as_me:26017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26050,7 +26053,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26053: result: $cf_cxx_library" >&5
+	echo "$as_me:26056: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26066,7 +26069,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26069: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26072: 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
@@ -26083,18 +26086,18 @@ do
   # 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 26086 "configure"
+#line 26089 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26091: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26094: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26097: \$? = $ac_status" >&5
+  echo "$as_me:26100: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26117,17 +26120,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26120 "configure"
+#line 26123 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26124: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26130: \$? = $ac_status" >&5
+  echo "$as_me:26133: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26164,7 +26167,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26167: result: $CXXCPP" >&5
+echo "$as_me:26170: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26174,18 +26177,18 @@ do
   # 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 26177 "configure"
+#line 26180 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26185: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26188: \$? = $ac_status" >&5
+  echo "$as_me:26191: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26208,17 +26211,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26211 "configure"
+#line 26214 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26215: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26221: \$? = $ac_status" >&5
+  echo "$as_me:26224: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26246,7 +26249,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26249: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26252: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26261,23 +26264,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26264: checking for $ac_header" >&5
+echo "$as_me:26267: 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 26270 "configure"
+#line 26273 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26274: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26277: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26280: \$? = $ac_status" >&5
+  echo "$as_me:26283: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26296,7 +26299,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26299: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26302: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26309,23 +26312,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26312: checking for $ac_header" >&5
+echo "$as_me:26315: 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 26318 "configure"
+#line 26321 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26328: \$? = $ac_status" >&5
+  echo "$as_me:26331: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26344,7 +26347,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26355,10 +26358,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26358: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26361: 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 26361 "configure"
+#line 26364 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26375,16 +26378,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26381: \$? = $ac_status" >&5
+  echo "$as_me:26384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26387: \$? = $ac_status" >&5
+  echo "$as_me:26390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26393,7 +26396,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26396: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26399: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26404,7 +26407,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26407: checking if we should include stdbool.h" >&5
+echo "$as_me:26410: 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
@@ -26412,7 +26415,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26415 "configure"
+#line 26418 "configure"
 #include "confdefs.h"
 
 int
@@ -26424,23 +26427,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26430: \$? = $ac_status" >&5
+  echo "$as_me:26433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26436: \$? = $ac_status" >&5
+  echo "$as_me:26439: \$? = $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 26443 "configure"
+#line 26446 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26456,16 +26459,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26462: \$? = $ac_status" >&5
+  echo "$as_me:26465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26468: \$? = $ac_status" >&5
+  echo "$as_me:26471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26479,13 +26482,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26482: result: yes" >&5
+then	echo "$as_me:26485: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26484: result: no" >&5
+else	echo "$as_me:26487: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26488: checking for builtin bool type" >&5
+echo "$as_me:26491: 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
@@ -26493,7 +26496,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26496 "configure"
+#line 26499 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26508,16 +26511,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26514: \$? = $ac_status" >&5
+  echo "$as_me:26517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26520: \$? = $ac_status" >&5
+  echo "$as_me:26523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26530,19 +26533,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26533: result: yes" >&5
+then	echo "$as_me:26536: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26535: result: no" >&5
+else	echo "$as_me:26538: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26539: checking for bool" >&5
+echo "$as_me:26542: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26545 "configure"
+#line 26548 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26577,16 +26580,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26583: \$? = $ac_status" >&5
+  echo "$as_me:26586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26589: \$? = $ac_status" >&5
+  echo "$as_me:26592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26596,10 +26599,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26599: result: $ac_cv_type_bool" >&5
+echo "$as_me:26602: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26602: checking size of bool" >&5
+echo "$as_me:26605: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26608,7 +26611,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26611 "configure"
+#line 26614 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26640,21 +26643,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26646: \$? = $ac_status" >&5
+  echo "$as_me:26649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26657 "configure"
+#line 26660 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26686,16 +26689,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26692: \$? = $ac_status" >&5
+  echo "$as_me:26695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26698: \$? = $ac_status" >&5
+  echo "$as_me:26701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26711,7 +26714,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26714 "configure"
+#line 26717 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26743,16 +26746,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26749: \$? = $ac_status" >&5
+  echo "$as_me:26752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26755: \$? = $ac_status" >&5
+  echo "$as_me:26758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26768,7 +26771,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26771 "configure"
+#line 26774 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26800,16 +26803,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26806: \$? = $ac_status" >&5
+  echo "$as_me:26809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26812: \$? = $ac_status" >&5
+  echo "$as_me:26815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26822,12 +26825,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26825: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26828: 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 26830 "configure"
+#line 26833 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26863,15 +26866,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26869: \$? = $ac_status" >&5
+  echo "$as_me:26872: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26874: \$? = $ac_status" >&5
+  echo "$as_me:26877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26887,13 +26890,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26890: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26893: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26896: checking for type of bool" >&5
+echo "$as_me:26899: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26912,7 +26915,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26915 "configure"
+#line 26918 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26953,15 +26956,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26959: \$? = $ac_status" >&5
+  echo "$as_me:26962: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26964: \$? = $ac_status" >&5
+  echo "$as_me:26967: \$? = $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
@@ -26978,19 +26981,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26981: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26984: 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:26988: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26991: 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:26993: checking for special defines needed for etip.h" >&5
+echo "$as_me:26996: 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"
@@ -27008,7 +27011,7 @@ do
 	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 27011 "configure"
+#line 27014 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27022,16 +27025,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27028: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27034: \$? = $ac_status" >&5
+  echo "$as_me:27037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27052,12 +27055,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27055: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27058: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27060: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27063: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27074,7 +27077,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27077 "configure"
+#line 27080 "configure"
 #include "confdefs.h"
 
 class base
@@ -27093,15 +27096,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27099: \$? = $ac_status" >&5
+  echo "$as_me:27102: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27104: \$? = $ac_status" >&5
+  echo "$as_me:27107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27120,7 +27123,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27123: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27126: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27129,7 +27132,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27132: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27135: 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
@@ -27146,7 +27149,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27149 "configure"
+#line 27152 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27165,15 +27168,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27171: \$? = $ac_status" >&5
+  echo "$as_me:27174: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27176: \$? = $ac_status" >&5
+  echo "$as_me:27179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27192,7 +27195,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27195: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27198: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27202,7 +27205,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27205: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27208: 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
@@ -27216,7 +27219,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27219 "configure"
+#line 27222 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27260,16 +27263,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27266: \$? = $ac_status" >&5
+  echo "$as_me:27269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27272: \$? = $ac_status" >&5
+  echo "$as_me:27275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27287,7 +27290,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27290: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27293: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27336,13 +27339,13 @@ else
 	else
 		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27339: checking for bool" >&5
+echo "$as_me:27342: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27345 "configure"
+#line 27348 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27377,16 +27380,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27383: \$? = $ac_status" >&5
+  echo "$as_me:27386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27389: \$? = $ac_status" >&5
+  echo "$as_me:27392: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27396,10 +27399,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27399: result: $ac_cv_type_bool" >&5
+echo "$as_me:27402: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27402: checking size of bool" >&5
+echo "$as_me:27405: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27408,7 +27411,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27411 "configure"
+#line 27414 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27440,21 +27443,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27446: \$? = $ac_status" >&5
+  echo "$as_me:27449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27452: \$? = $ac_status" >&5
+  echo "$as_me:27455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27457 "configure"
+#line 27460 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27486,16 +27489,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27492: \$? = $ac_status" >&5
+  echo "$as_me:27495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27498: \$? = $ac_status" >&5
+  echo "$as_me:27501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27511,7 +27514,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27514 "configure"
+#line 27517 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27543,16 +27546,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27549: \$? = $ac_status" >&5
+  echo "$as_me:27552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27555: \$? = $ac_status" >&5
+  echo "$as_me:27558: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27568,7 +27571,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27571 "configure"
+#line 27574 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27600,16 +27603,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27606: \$? = $ac_status" >&5
+  echo "$as_me:27609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27612: \$? = $ac_status" >&5
+  echo "$as_me:27615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27622,12 +27625,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27625: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27628: 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 27630 "configure"
+#line 27633 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27663,15 +27666,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27669: \$? = $ac_status" >&5
+  echo "$as_me:27672: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27674: \$? = $ac_status" >&5
+  echo "$as_me:27677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27687,13 +27690,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27690: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27693: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27696: checking for type of bool" >&5
+echo "$as_me:27699: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27712,7 +27715,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27715 "configure"
+#line 27718 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27753,15 +27756,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27759: \$? = $ac_status" >&5
+  echo "$as_me:27762: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27764: \$? = $ac_status" >&5
+  echo "$as_me:27767: \$? = $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
@@ -27778,26 +27781,26 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27781: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27784: 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:27788: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27791: 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:27794: checking for fallback type of bool" >&5
+			echo "$as_me:27797: 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:27800: result: $cf_cv_type_of_bool" >&5
+			echo "$as_me:27803: result: $cf_cv_type_of_bool" >&5
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 		fi
 	fi
@@ -27826,7 +27829,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27829: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27832: 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
@@ -27837,7 +27840,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27840: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27843: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27854,10 +27857,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27857: result: $ADAFLAGS" >&5
+	echo "$as_me:27860: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27860: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27863: 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
@@ -27867,11 +27870,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27870: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27873: 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:27874: checking if GNAT supports generics" >&5
+echo "$as_me:27877: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27881,7 +27884,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27884: result: $cf_gnat_generics" >&5
+echo "$as_me:27887: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27893,7 +27896,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27896: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27899: 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
@@ -27941,7 +27944,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27944: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27947: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27954,7 +27957,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27957: checking if GNAT supports project files" >&5
+echo "$as_me:27960: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28017,15 +28020,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28020: result: $cf_gnat_projects" >&5
+echo "$as_me:28023: 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:28026: checking if GNAT supports libraries" >&5
+	echo "$as_me:28029: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28028: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28031: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28045,7 +28048,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28048: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28051: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28057,7 +28060,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28060: checking for Ada95 compiler" >&5
+echo "$as_me:28063: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28068,12 +28071,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28071: result: $cf_ada_compiler" >&5
+echo "$as_me:28074: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28076: checking for Ada95 include directory" >&5
+echo "$as_me:28079: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28107,7 +28110,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28110: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28113: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28116,10 +28119,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28119: result: $ADA_INCLUDE" >&5
+echo "$as_me:28122: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28122: checking for Ada95 object directory" >&5
+echo "$as_me:28125: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28153,7 +28156,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28156: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28159: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28162,10 +28165,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28165: result: $ADA_OBJECTS" >&5
+echo "$as_me:28168: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28168: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28171: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28186,11 +28189,11 @@ then
 	fi
 fi
 
-echo "$as_me:28189: result: $with_ada_sharedlib" >&5
+echo "$as_me:28192: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28193: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28196: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28208,7 +28211,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28211: checking for Ada95 curses library name" >&5
+echo "$as_me:28214: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28224,7 +28227,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28227: result: $ADA_LIBNAME" >&5
+echo "$as_me:28230: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28235,13 +28238,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28238: checking for wchar_t" >&5
+	echo "$as_me:28241: 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 28244 "configure"
+#line 28247 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28256,16 +28259,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28262: \$? = $ac_status" >&5
+  echo "$as_me:28265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28268: \$? = $ac_status" >&5
+  echo "$as_me:28271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28275,10 +28278,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28278: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28281: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28281: checking size of wchar_t" >&5
+echo "$as_me:28284: 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
@@ -28287,7 +28290,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28290 "configure"
+#line 28293 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28299,21 +28302,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28305: \$? = $ac_status" >&5
+  echo "$as_me:28308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28311: \$? = $ac_status" >&5
+  echo "$as_me:28314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28316 "configure"
+#line 28319 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28325,16 +28328,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28331: \$? = $ac_status" >&5
+  echo "$as_me:28334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28337: \$? = $ac_status" >&5
+  echo "$as_me:28340: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28350,7 +28353,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28353 "configure"
+#line 28356 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28362,16 +28365,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28368: \$? = $ac_status" >&5
+  echo "$as_me:28371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28374: \$? = $ac_status" >&5
+  echo "$as_me:28377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28387,7 +28390,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28390 "configure"
+#line 28393 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28399,16 +28402,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28405: \$? = $ac_status" >&5
+  echo "$as_me:28408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28411: \$? = $ac_status" >&5
+  echo "$as_me:28414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28421,12 +28424,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28424: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28427: 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 28429 "configure"
+#line 28432 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28442,15 +28445,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28448: \$? = $ac_status" >&5
+  echo "$as_me:28451: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28453: \$? = $ac_status" >&5
+  echo "$as_me:28456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28466,7 +28469,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28469: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28472: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28479,7 +28482,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28482: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28485: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28497,7 +28500,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28500: checking for library subsets" >&5
+echo "$as_me:28503: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28551,7 +28554,7 @@ fi
 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:28554: result: $LIB_SUBSETS" >&5
+echo "$as_me:28557: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28582,7 +28585,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28585: checking default library suffix" >&5
+echo "$as_me:28588: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28593,10 +28596,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28596: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28599: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28599: checking default library-dependency suffix" >&5
+echo "$as_me:28602: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28679,10 +28682,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28682: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28685: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28685: checking default object directory" >&5
+echo "$as_me:28688: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28698,11 +28701,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28701: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28704: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28705: checking c++ library-dependency suffix" >&5
+echo "$as_me:28708: 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++)
@@ -28795,7 +28798,7 @@ else
 	fi
 
 fi
-echo "$as_me:28798: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28801: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28971,19 +28974,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28974: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28977: 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 <<EOF
-#line 28979 "configure"
+#line 28982 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28983: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28986: \$? = $ac_status" >&5
+  echo "$as_me:28989: \$? = $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
@@ -28994,10 +28997,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28997 "configure"
+#line 29000 "configure"
 #include "confdefs.h"
 
-#line 29000 "configure"
+#line 29003 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29012,16 +29015,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29018: \$? = $ac_status" >&5
+  echo "$as_me:29021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29024: \$? = $ac_status" >&5
+  echo "$as_me:29027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29044,7 +29047,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29047: result: $cf_ldflags_static" >&5
+	echo "$as_me:29050: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29060,7 +29063,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29063: checking where we will install curses.h" >&5
+echo "$as_me:29066: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29070,7 +29073,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29073: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29076: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29078,7 +29081,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29081: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29084: 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
@@ -29103,7 +29106,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29106: checking for desired basename for form library" >&5
+echo "$as_me:29109: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29123,10 +29126,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29126: result: $FORM_NAME" >&5
+echo "$as_me:29129: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29129: checking for desired basename for menu library" >&5
+echo "$as_me:29132: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29146,10 +29149,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29149: result: $MENU_NAME" >&5
+echo "$as_me:29152: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29152: checking for desired basename for panel library" >&5
+echo "$as_me:29155: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29169,10 +29172,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29172: result: $PANEL_NAME" >&5
+echo "$as_me:29175: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29175: checking for desired basename for cxx library" >&5
+echo "$as_me:29178: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29192,13 +29195,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29195: result: $CXX_NAME" >&5
+echo "$as_me:29198: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29201: checking for src modules" >&5
+echo "$as_me:29204: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29257,7 +29260,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29260: result: $cf_cv_src_modules" >&5
+echo "$as_me:29263: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29418,7 +29421,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29421: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29424: 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//'`
@@ -29429,7 +29432,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29432: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29435: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29445,7 +29448,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29448: result: $PKG_CFLAGS" >&5
+echo "$as_me:29451: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29517,7 +29520,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29520: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29523: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29544,7 +29547,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29547: checking for linker search path" >&5
+echo "$as_me:29550: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29592,7 +29595,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29595: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29598: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29633,7 +29636,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29636: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29639: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29719,7 +29722,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29722: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29725: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29900,7 +29903,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29903: error: ambiguous option: $1
+    { { echo "$as_me:29906: 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;}
@@ -29919,7 +29922,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29922: error: unrecognized option: $1
+  -*) { { echo "$as_me:29925: 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;}
@@ -30051,7 +30054,7 @@ do
   "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:30054: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30057: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30576,7 +30579,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30579: creating $ac_file" >&5
+    { echo "$as_me:30582: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30594,7 +30597,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30597: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30600: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30607,7 +30610,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30610: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30613: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30623,7 +30626,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30626: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30629: 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;}
@@ -30632,7 +30635,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30635: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30638: 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;}
@@ -30677,7 +30680,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30680: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30683: 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;}
@@ -30688,7 +30691,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30691: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30694: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30737,7 +30740,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30740: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30743: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30748,7 +30751,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30751: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30754: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30761,7 +30764,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30764: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30767: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30819,7 +30822,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30822: $ac_file is unchanged" >&5
+      { echo "$as_me:30825: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31206,7 +31209,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31209: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31212: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index d786ef990..bdcdcab76 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1639 2024/11/02 09:59:53 tom Exp $
+# $Id: dist.mk,v 1.1640 2024/11/09 11:12:30 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241102
+NCURSES_PATCH = 20241109
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 17235a682..9286f71fb 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -47,10 +47,6 @@
 #include <tic.h>
 #include <new_pair.h>
 
-#ifdef __DJGPP__
-#include <io.h>
-#endif
-
 #if USE_GPM_SUPPORT
 #ifdef HAVE_LIBDL
 /* use dynamic loader to avoid linkage dependency */
@@ -61,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.187 2024/11/02 21:00:54 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.188 2024/11/09 16:36:29 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index ff1a7f379..9129aeeec 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.39 2024/09/21 15:12:56 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.40 2024/11/09 18:30:28 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -132,6 +132,7 @@ _nc_access(const char *path, int mode)
     int result;
 
     if (path == 0) {
+	errno = ENOENT;
 	result = -1;
     } else if (ACCESS(path, mode) < 0) {
 	if ((mode & W_OK) != 0
@@ -150,6 +151,7 @@ _nc_access(const char *path, int mode)
 
 	    result = ACCESS(head, R_OK | W_OK | X_OK);
 	} else {
+	    errno = EPERM;
 	    result = -1;
 	}
     } else {
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 6280ad4a2..aa2bc6ed0 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.79 2023/09/15 08:16:12 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.80 2024/11/09 20:36:48 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -194,7 +194,10 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     }
 
     TYPE_MALLOC(char, next_free, tp->str_table);
-    (void) memcpy(tp->str_table, stringbuf, next_free);
+    if (stringbuf == NULL)
+	(void) memset(tp->str_table, 0, next_free);
+    else
+	(void) memcpy(tp->str_table, stringbuf, next_free);
 
     tp->term_names = tp->str_table + n;
     for_each_string(i, &(ep->tterm)) {
diff --git a/ncurses/tinfo/hashed_db.c b/ncurses/tinfo/hashed_db.c
index b78d98f87..f051e2f66 100644
--- a/ncurses/tinfo/hashed_db.c
+++ b/ncurses/tinfo/hashed_db.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 2006-2011,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #if USE_HASHED_DB
 
-MODULE_ID("$Id: hashed_db.c,v 1.19 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: hashed_db.c,v 1.20 2024/11/09 19:23:11 tom Exp $")
 
 #if HASHED_DB_API >= 2
 static DBC *cursor;
@@ -94,22 +94,25 @@ drop_connection(DB * db)
     }
 }
 
-static void
+static bool
 make_connection(DB * db, const char *path, bool modify)
 {
+    bool code = FALSE;
     MYCONN *p = typeCalloc(MYCONN, 1);
 
-    if (p != 0) {
-	p->db = db;
+    if (p != NULL) {
 	p->path = strdup(path);
-	p->modify = modify;
-	if (p->path != 0) {
+	if (p->path != NULL) {
+	    p->db = db;
+	    p->modify = modify;
 	    p->next = connections;
 	    connections = p;
+	    code = TRUE;
 	} else {
 	    free(p);
 	}
     }
+    return code;
 }
 
 /*
@@ -118,13 +121,13 @@ make_connection(DB * db, const char *path, bool modify)
 NCURSES_EXPORT(DB *)
 _nc_db_open(const char *path, bool modify)
 {
-    DB *result = 0;
+    DB *result = NULL;
     int code;
 
     if (connections == 0)
 	atexit(cleanup);
 
-    if ((result = find_connection(path, modify)) == 0) {
+    if ((result = find_connection(path, modify)) == NULL) {
 
 #if HASHED_DB_API >= 4
 	db_create(&result, NULL, 0);
@@ -135,7 +138,7 @@ _nc_db_open(const char *path, bool modify)
 				 DB_HASH,
 				 modify ? DB_CREATE : DB_RDONLY,
 				 0644)) != 0) {
-	    result = 0;
+	    result = NULL;
 	}
 #elif HASHED_DB_API >= 3
 	db_create(&result, NULL, 0);
@@ -145,7 +148,7 @@ _nc_db_open(const char *path, bool modify)
 				 DB_HASH,
 				 modify ? DB_CREATE : DB_RDONLY,
 				 0644)) != 0) {
-	    result = 0;
+	    result = NULL;
 	}
 #elif HASHED_DB_API >= 2
 	if ((code = db_open(path,
@@ -155,7 +158,7 @@ _nc_db_open(const char *path, bool modify)
 			    (DB_ENV *) 0,
 			    (DB_INFO *) 0,
 			    &result)) != 0) {
-	    result = 0;
+	    result = NULL;
 	}
 #else
 	if ((result = dbopen(path,
@@ -166,11 +169,11 @@ _nc_db_open(const char *path, bool modify)
 	    code = errno;
 	}
 #endif
-	if (result != 0) {
-	    make_connection(result, path, modify);
+	if (result != NULL && make_connection(result, path, modify)) {
 	    T(("opened %s", path));
 	} else {
-	    T(("cannot open %s: %s", path, strerror(code)));
+	    T(("cannot open %s: (errno %d) %s", path, code, strerror(code)));
+	    errno = code;
 	}
     }
     return result;
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 4903ece9c..69acb8434 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.136 2024/10/19 21:19:32 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.137 2024/11/09 19:24:01 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -86,17 +86,21 @@ write_file(char *filename, TERMTYPE2 *tp)
 	size_t actual;
 
 	if (fp == 0) {
-	    perror(filename);
-	    _nc_syserr_abort("cannot open %s/%s", _nc_tic_dir(0), filename);
+	    _nc_syserr_abort("cannot open %s/%s: (errno %d) %s",
+			     _nc_tic_dir(0),
+			     filename,
+			     errno,
+			     strerror(errno));
 	}
 
 	actual = fwrite(buffer, sizeof(char), (size_t) offset, fp);
 	if (actual != offset) {
 	    int myerr = ferror(fp) ? errno : 0;
 	    if (myerr) {
-		_nc_syserr_abort("error writing %s/%s: %s",
+		_nc_syserr_abort("error writing %s/%s: (errno %d) %s",
 				 _nc_tic_dir(NULL),
 				 filename,
+				 myerr,
 				 strerror(myerr));
 	    } else {
 		_nc_syserr_abort("error writing %s/%s: %u bytes vs actual %lu",
@@ -133,7 +137,11 @@ check_writeable(int code)
 	char dir[sizeof(LEAF_FMT)];
 	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
 	if (make_db_root(dir) < 0) {
-	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir);
+	    _nc_err_abort("%s/%s: (errno %d) %s",
+			  _nc_tic_dir(NULL),
+			  dir,
+			  errno,
+			  strerror(errno));
 	} else {
 	    verified[s - dirnames] = TRUE;
 	}
@@ -211,6 +219,7 @@ make_db_root(const char *path)
 	} else if (_nc_access(path, R_OK | W_OK | X_OK) < 0) {
 	    rc = -1;		/* permission denied */
 	} else if (!(S_ISDIR(statbuf.st_mode))) {
+	    errno = ENOTDIR;
 	    rc = -1;		/* not a directory */
 	}
 #endif
@@ -248,8 +257,10 @@ _nc_set_writedir(const char *dir)
 	    }
 	}
 	if (!success) {
-	    _nc_err_abort("%s: permission denied (errno %d)",
-			  destination, errno);
+	    _nc_err_abort("%s: (errno %d) %s",
+			  destination,
+			  errno,
+			  strerror(errno));
 	}
     }
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fb081e982..f89695100 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241102) unstable; urgency=low
+ncurses6td (6.5+20241109) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fb081e982..f89695100 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241102) unstable; urgency=low
+ncurses6td (6.5+20241109) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index f7518ac94..4d9eda7ef 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241102) unstable; urgency=low
+ncurses6td (6.5+20241109) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 02 Nov 2024 05:59:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index cdc9f27e7..c51ea2fff 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.674 2024/11/02 09:59:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.675 2024/11/09 11:12:30 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1102"
+!define VERSION_MMDD  "1109"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index d6b94a088..8791a6476 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241102
+Release: 20241109
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4ff6f729f..c0cd8eaf3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241102
+Release: 20241109
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 8c4b8bc3d..8c8bde2c0 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241102
+Release: 20241109
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index f763ac540..b7f90ec7b 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.166 2024/10/19 21:43:11 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.167 2024/11/09 19:33:50 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -1053,7 +1053,7 @@ file_comparison(int argc, char *argv[])
 
     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
 	if (freopen(argv[n], "r", stdin) == 0)
-	    _nc_err_abort("Can't open %s", argv[n]);
+	    _nc_err_abort("Can't open %s: %s", argv[n], strerror(errno));
 
 #if NO_LEAKS
 	entered[n].head = _nc_head;
diff --git a/progs/tic.c b/progs/tic.c
index 6f588fd7f..e1c5fdd22 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.326 2024/10/19 21:31:50 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.328 2024/11/09 23:03:26 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -517,8 +517,10 @@ make_namelist(char *src)
 	    }
 	    if (pass == 1) {
 		if ((dst = typeCalloc(char *, nn + 1)) == NULL)
-		      failed("make_namelist");
+		      failed("make_namelist (alloc)");
 		rewind(fp);
+		if (errno != 0)
+		      failed("make_namelist (rewind)");
 	    }
 	}
 	fclose(fp);
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 6b27fdd0e..3a1dec93b 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.228 2024/08/11 09:11:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.229 2024/11/09 23:15:41 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -4551,7 +4551,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
+dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4614,6 +4614,9 @@ case "$host_os" in
 (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
+	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
 	;;
diff --git a/test/configure b/test/configure
index 719adb5cb..e31212fc5 100755
--- a/test/configure
+++ b/test/configure
@@ -4690,6 +4690,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6
 
 fi
 
+	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
 	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
@@ -4713,16 +4716,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4716: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4719: 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}:4722: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4725: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4725 "configure"
+#line 4728 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4737,16 +4740,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4743: \$? = $ac_status" >&5
+  echo "$as_me:4746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4749: \$? = $ac_status" >&5
+  echo "$as_me:4752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4767,7 +4770,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4770 "configure"
+#line 4773 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4782,16 +4785,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4788: \$? = $ac_status" >&5
+  echo "$as_me:4791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4794: \$? = $ac_status" >&5
+  echo "$as_me:4797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4802,7 +4805,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4810,10 +4813,10 @@ echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4813: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4816: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4816 "configure"
+#line 4819 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4828,16 +4831,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4834: \$? = $ac_status" >&5
+  echo "$as_me:4837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4840: \$? = $ac_status" >&5
+  echo "$as_me:4843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4853,7 +4856,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4856: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4859: 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
@@ -4970,7 +4973,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4973: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4976: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -5002,14 +5005,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:5005: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5008: 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 5012 "configure"
+#line 5015 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5027,16 +5030,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5033: \$? = $ac_status" >&5
+  echo "$as_me:5036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5039: \$? = $ac_status" >&5
+  echo "$as_me:5042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5048,7 +5051,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5051 "configure"
+#line 5054 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5066,16 +5069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5072: \$? = $ac_status" >&5
+  echo "$as_me:5075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5078: \$? = $ac_status" >&5
+  echo "$as_me:5081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5090,7 +5093,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5093: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5096: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5250,16 +5253,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5253: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5256: 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}:5259: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5262: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5262 "configure"
+#line 5265 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5274,16 +5277,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5280: \$? = $ac_status" >&5
+  echo "$as_me:5283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5286: \$? = $ac_status" >&5
+  echo "$as_me:5289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5304,7 +5307,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5307 "configure"
+#line 5310 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5319,16 +5322,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5325: \$? = $ac_status" >&5
+  echo "$as_me:5328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5331: \$? = $ac_status" >&5
+  echo "$as_me:5334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5339,7 +5342,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5347,10 +5350,10 @@ echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5350: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5353: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5353 "configure"
+#line 5356 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5365,16 +5368,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5371: \$? = $ac_status" >&5
+  echo "$as_me:5374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5377: \$? = $ac_status" >&5
+  echo "$as_me:5380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5390,7 +5393,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5393: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5396: 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
@@ -5503,10 +5506,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5506: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5509: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5509 "configure"
+#line 5512 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5524,23 +5527,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5530: \$? = $ac_status" >&5
+  echo "$as_me:5533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5536: \$? = $ac_status" >&5
+  echo "$as_me:5539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5543: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5546: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5563,7 +5566,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5566: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5569: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5575,7 +5578,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5578: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5581: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5663,7 +5666,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5666: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5669: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5673,7 +5676,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5676: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5683,7 +5686,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5686: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5689: 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"
@@ -5695,10 +5698,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5698: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5701: 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 5701 "configure"
+#line 5704 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5713,16 +5716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5719: \$? = $ac_status" >&5
+  echo "$as_me:5722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5725: \$? = $ac_status" >&5
+  echo "$as_me:5728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5731,12 +5734,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5734: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5737: 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 5739 "configure"
+#line 5742 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5751,16 +5754,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5757: \$? = $ac_status" >&5
+  echo "$as_me:5760: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5763: \$? = $ac_status" >&5
+  echo "$as_me:5766: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5771,19 +5774,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5774: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5777: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5779: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5782: 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 5786 "configure"
+#line 5789 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5801,16 +5804,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5807: \$? = $ac_status" >&5
+  echo "$as_me:5810: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5813: \$? = $ac_status" >&5
+  echo "$as_me:5816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5822,7 +5825,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5825 "configure"
+#line 5828 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5840,16 +5843,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5846: \$? = $ac_status" >&5
+  echo "$as_me:5849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5852: \$? = $ac_status" >&5
+  echo "$as_me:5855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5864,7 +5867,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5867: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5870: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -6011,13 +6014,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:6014: checking for ANSI C header files" >&5
+echo "$as_me:6017: 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 6020 "configure"
+#line 6023 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6025,13 +6028,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6028: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6031: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6034: \$? = $ac_status" >&5
+  echo "$as_me:6037: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6053,7 +6056,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6056 "configure"
+#line 6059 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6071,7 +6074,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6074 "configure"
+#line 6077 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6092,7 +6095,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6095 "configure"
+#line 6098 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6118,15 +6121,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6124: \$? = $ac_status" >&5
+  echo "$as_me:6127: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6129: \$? = $ac_status" >&5
+  echo "$as_me:6132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6139,7 +6142,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6142: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6145: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6155,28 +6158,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6158: checking for $ac_header" >&5
+echo "$as_me:6161: 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 6164 "configure"
+#line 6167 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6173: \$? = $ac_status" >&5
+  echo "$as_me:6176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6179: \$? = $ac_status" >&5
+  echo "$as_me:6182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6186,7 +6189,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6189: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6196,13 +6199,13 @@ EOF
 fi
 done
 
-echo "$as_me:6199: checking whether exit is declared" >&5
+echo "$as_me:6202: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6205 "configure"
+#line 6208 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6217,16 +6220,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6223: \$? = $ac_status" >&5
+  echo "$as_me:6226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6229: \$? = $ac_status" >&5
+  echo "$as_me:6232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6236,10 +6239,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6239: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6242: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6242: checking for signal global datatype" >&5
+echo "$as_me:6245: 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
@@ -6251,7 +6254,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6254 "configure"
+#line 6257 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6275,16 +6278,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6281: \$? = $ac_status" >&5
+  echo "$as_me:6284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6287: \$? = $ac_status" >&5
+  echo "$as_me:6290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6298,7 +6301,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6301: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6304: 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 <<EOF
@@ -6307,14 +6310,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6310: checking if SIGWINCH is defined" >&5
+echo "$as_me:6313: 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 6317 "configure"
+#line 6320 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6329,23 +6332,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6335: \$? = $ac_status" >&5
+  echo "$as_me:6338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6341: \$? = $ac_status" >&5
+  echo "$as_me:6344: \$? = $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 6348 "configure"
+#line 6351 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6363,16 +6366,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6369: \$? = $ac_status" >&5
+  echo "$as_me:6372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6375: \$? = $ac_status" >&5
+  echo "$as_me:6378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6386,11 +6389,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6389: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6392: 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:6393: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6396: 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
@@ -6401,7 +6404,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6404 "configure"
+#line 6407 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6423,16 +6426,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6429: \$? = $ac_status" >&5
+  echo "$as_me:6432: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6435: \$? = $ac_status" >&5
+  echo "$as_me:6438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6446,7 +6449,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6449: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6452: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6456,13 +6459,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6459: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6462: 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 6465 "configure"
+#line 6468 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6476,16 +6479,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6482: \$? = $ac_status" >&5
+  echo "$as_me:6485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6488: \$? = $ac_status" >&5
+  echo "$as_me:6491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6496,7 +6499,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6499: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6502: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6506,7 +6509,7 @@ EOF
 
 	fi
 
-echo "$as_me:6509: checking if you want to use pkg-config" >&5
+echo "$as_me:6512: 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.
@@ -6516,7 +6519,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6519: result: $cf_pkg_config" >&5
+echo "$as_me:6522: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6528,7 +6531,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6531: checking for $ac_word" >&5
+echo "$as_me:6534: 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
@@ -6545,7 +6548,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6548: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6551: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6556,10 +6559,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6559: result: $PKG_CONFIG" >&5
+  echo "$as_me:6562: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6562: result: no" >&5
+  echo "$as_me:6565: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6568,7 +6571,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6571: checking for $ac_word" >&5
+echo "$as_me:6574: 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
@@ -6585,7 +6588,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6588: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6591: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6597,10 +6600,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6600: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6603: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6603: result: no" >&5
+  echo "$as_me:6606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6641,18 +6644,18 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6644: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6647: 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:6651: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6654: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6655: checking if you want to see long compiling messages" >&5
+echo "$as_me:6658: 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.
@@ -6686,10 +6689,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6689: result: $enableval" >&5
+echo "$as_me:6692: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6692: checking for an installation directory prefix" >&5
+echo "$as_me:6695: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -6702,10 +6705,10 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:6705: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:6708: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
-echo "$as_me:6708: checking if installation directory prefix should be merged" >&5
+echo "$as_me:6711: checking if installation directory prefix should be merged" >&5
 echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
 
 # Check whether --enable-install-prefix or --disable-install-prefix was given.
@@ -6722,7 +6725,7 @@ else
 	cf_install_prefix=no
 
 fi;
-echo "$as_me:6725: result: $cf_install_prefix" >&5
+echo "$as_me:6728: result: $cf_install_prefix" >&5
 echo "${ECHO_T}$cf_install_prefix" >&6
 
 if test "$cf_install_prefix" = yes ; then
@@ -6731,7 +6734,7 @@ else
 	MERGE_PREFIX=''
 fi
 
-echo "$as_me:6734: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6737: 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.
@@ -6741,10 +6744,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6744: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6747: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6747: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6750: 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.
@@ -6761,10 +6764,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6764: result: $cf_enable_widec" >&5
+echo "$as_me:6767: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6767: checking for specific curses-directory" >&5
+echo "$as_me:6770: 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.
@@ -6774,7 +6777,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6777: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6780: 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"
@@ -6803,7 +6806,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6806: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6809: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6839,7 +6842,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6842 "configure"
+#line 6845 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6851,16 +6854,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6857: \$? = $ac_status" >&5
+  echo "$as_me:6860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6863: \$? = $ac_status" >&5
+  echo "$as_me:6866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6877,7 +6880,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6883: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6913,7 +6916,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6926,7 +6929,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6929: checking for specified curses library type" >&5
+echo "$as_me:6932: 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.
@@ -6970,13 +6973,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6973: result: $cf_cv_screen" >&5
+echo "$as_me:6976: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6979: checking for extra include directories" >&5
+echo "$as_me:6982: 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
@@ -7002,7 +7005,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:7005: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:7008: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -7012,7 +7015,7 @@ then
 
 fi
 
-echo "$as_me:7015: checking if we have identified curses headers" >&5
+echo "$as_me:7018: 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
@@ -7024,7 +7027,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7027 "configure"
+#line 7030 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -7036,16 +7039,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7042: \$? = $ac_status" >&5
+  echo "$as_me:7045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7048: \$? = $ac_status" >&5
+  echo "$as_me:7051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -7056,11 +7059,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7059: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7062: 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:7063: error: No curses header-files found" >&5
+	{ { echo "$as_me:7066: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7070,23 +7073,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7073: checking for $ac_header" >&5
+echo "$as_me:7076: 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 7079 "configure"
+#line 7082 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7083: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7086: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7089: \$? = $ac_status" >&5
+  echo "$as_me:7092: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7105,7 +7108,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7108: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7111: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7115,7 +7118,7 @@ EOF
 fi
 done
 
-echo "$as_me:7118: checking for terminfo header" >&5
+echo "$as_me:7121: 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
@@ -7133,7 +7136,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7136 "configure"
+#line 7139 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7148,16 +7151,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7154: \$? = $ac_status" >&5
+  echo "$as_me:7157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7160: \$? = $ac_status" >&5
+  echo "$as_me:7163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7173,7 +7176,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7176: result: $cf_cv_term_header" >&5
+echo "$as_me:7179: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7205,7 +7208,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7208: checking for ncurses version" >&5
+echo "$as_me:7211: 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
@@ -7231,10 +7234,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7234: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7237: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7237: \$? = $ac_status" >&5
+  echo "$as_me:7240: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7244,7 +7247,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7247 "configure"
+#line 7250 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7271,15 +7274,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7280: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7282: \$? = $ac_status" >&5
+  echo "$as_me:7285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7293,17 +7296,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7296: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7299: 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:7303: checking if we have identified curses libraries" >&5
+echo "$as_me:7306: 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 7306 "configure"
+#line 7309 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7315,16 +7318,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7321: \$? = $ac_status" >&5
+  echo "$as_me:7324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7327: \$? = $ac_status" >&5
+  echo "$as_me:7330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7333,13 +7336,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7336: result: $cf_result" >&5
+echo "$as_me:7339: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7342: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7345: 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
@@ -7347,7 +7350,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7350 "configure"
+#line 7353 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7366,16 +7369,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7372: \$? = $ac_status" >&5
+  echo "$as_me:7375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7378: \$? = $ac_status" >&5
+  echo "$as_me:7381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7386,7 +7389,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7389: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7392: 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
 
@@ -7416,7 +7419,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7419: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7422: 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
@@ -7424,7 +7427,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7427 "configure"
+#line 7430 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7443,16 +7446,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7449: \$? = $ac_status" >&5
+  echo "$as_me:7452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7455: \$? = $ac_status" >&5
+  echo "$as_me:7458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7463,7 +7466,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7466: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7469: 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
 
@@ -7487,7 +7490,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7490: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7493: 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
@@ -7495,7 +7498,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7498 "configure"
+#line 7501 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7514,16 +7517,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7520: \$? = $ac_status" >&5
+  echo "$as_me:7523: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7526: \$? = $ac_status" >&5
+  echo "$as_me:7529: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7534,7 +7537,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7537: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7540: 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
 
@@ -7592,7 +7595,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7595: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7598: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7621,7 +7624,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7624: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7627: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7652,7 +7655,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7655: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7658: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7687,7 +7690,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7690: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7731,13 +7734,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7734: checking for tgoto" >&5
+		echo "$as_me:7737: 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 7740 "configure"
+#line 7743 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7768,16 +7771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7774: \$? = $ac_status" >&5
+  echo "$as_me:7777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7780: \$? = $ac_status" >&5
+  echo "$as_me:7783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -7787,7 +7790,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7790: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7793: 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
@@ -7796,7 +7799,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7799: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7802: 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
@@ -7804,7 +7807,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7807 "configure"
+#line 7810 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7823,16 +7826,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7829: \$? = $ac_status" >&5
+  echo "$as_me:7832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7835: \$? = $ac_status" >&5
+  echo "$as_me:7838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7843,7 +7846,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7846: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7849: 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
 
@@ -7866,10 +7869,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7869: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7872: 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 7872 "configure"
+#line 7875 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7881,16 +7884,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7887: \$? = $ac_status" >&5
+  echo "$as_me:7890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7893: \$? = $ac_status" >&5
+  echo "$as_me:7896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7899,16 +7902,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7902: result: $cf_result" >&5
+				echo "$as_me:7905: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7908: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7911: 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 7911 "configure"
+#line 7914 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7920,16 +7923,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7926: \$? = $ac_status" >&5
+  echo "$as_me:7929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7932: \$? = $ac_status" >&5
+  echo "$as_me:7935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7938,7 +7941,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7941 "configure"
+#line 7944 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7950,16 +7953,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7956: \$? = $ac_status" >&5
+  echo "$as_me:7959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7962: \$? = $ac_status" >&5
+  echo "$as_me:7965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7971,13 +7974,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7974: result: $cf_result" >&5
+				echo "$as_me:7977: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7980: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7983: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7989,23 +7992,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7992: checking for $ac_header" >&5
+echo "$as_me:7995: 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 7998 "configure"
+#line 8001 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8002: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8008: \$? = $ac_status" >&5
+  echo "$as_me:8011: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8024,7 +8027,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8027: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8034,7 +8037,7 @@ EOF
 fi
 done
 
-echo "$as_me:8037: checking for multibyte character support" >&5
+echo "$as_me:8040: 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
@@ -8042,7 +8045,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8045 "configure"
+#line 8048 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8059,16 +8062,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8065: \$? = $ac_status" >&5
+  echo "$as_me:8068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8071: \$? = $ac_status" >&5
+  echo "$as_me:8074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8080,12 +8083,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:8083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8086: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8088 "configure"
+#line 8091 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8098,16 +8101,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  echo "$as_me:8107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8110: \$? = $ac_status" >&5
+  echo "$as_me:8113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8121,7 +8124,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8124 "configure"
+#line 8127 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8134,16 +8137,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8140: \$? = $ac_status" >&5
+  echo "$as_me:8143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8146: \$? = $ac_status" >&5
+  echo "$as_me:8149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8160,9 +8163,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8163: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8166: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8168: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8253,7 +8256,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8259: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8261,7 +8264,7 @@ echo "${as_me:-configure}:8256: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8264 "configure"
+#line 8267 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8274,21 +8277,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8280: \$? = $ac_status" >&5
+  echo "$as_me:8283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8286: \$? = $ac_status" >&5
+  echo "$as_me:8289: \$? = $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}:8291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8294: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8306,7 +8309,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8312: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8381,13 +8384,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8384: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8387: 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 8390 "configure"
+#line 8393 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8400,21 +8403,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8406: \$? = $ac_status" >&5
+  echo "$as_me:8409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8412: \$? = $ac_status" >&5
+  echo "$as_me:8415: \$? = $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}:8417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8420: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8456,7 +8459,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8459: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8462: 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
@@ -8494,7 +8497,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8497 "configure"
+#line 8500 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8506,16 +8509,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8512: \$? = $ac_status" >&5
+  echo "$as_me:8515: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8518: \$? = $ac_status" >&5
+  echo "$as_me:8521: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8532,7 +8535,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8535: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8538: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8568,7 +8571,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8571: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8574: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8598,13 +8601,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8601: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8604: 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:8604: result: yes" >&5
+		echo "$as_me:8607: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8607: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8610: 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
 
@@ -8737,7 +8740,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8740 "configure"
+#line 8743 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8749,37 +8752,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8755: \$? = $ac_status" >&5
+  echo "$as_me:8758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8761: \$? = $ac_status" >&5
+  echo "$as_me:8764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8767 "configure"
+#line 8770 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8777: \$? = $ac_status" >&5
+  echo "$as_me:8780: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8782: \$? = $ac_status" >&5
+  echo "$as_me:8785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8953,7 +8956,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8956 "configure"
+#line 8959 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8965,37 +8968,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8971: \$? = $ac_status" >&5
+  echo "$as_me:8974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8977: \$? = $ac_status" >&5
+  echo "$as_me:8980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8983 "configure"
+#line 8986 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8993: \$? = $ac_status" >&5
+  echo "$as_me:8996: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8998: \$? = $ac_status" >&5
+  echo "$as_me:9001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -9012,7 +9015,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:9015: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9018: 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"
@@ -9028,7 +9031,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:9031: checking for terminfo header" >&5
+echo "$as_me:9034: 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
@@ -9046,7 +9049,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9049 "configure"
+#line 9052 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9061,16 +9064,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9067: \$? = $ac_status" >&5
+  echo "$as_me:9070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9073: \$? = $ac_status" >&5
+  echo "$as_me:9076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9086,7 +9089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9089: result: $cf_cv_term_header" >&5
+echo "$as_me:9092: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9121,7 +9124,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9124: result: no" >&5
+		echo "$as_me:9127: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9137,7 +9140,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9140: checking for $ac_word" >&5
+echo "$as_me:9143: 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
@@ -9152,7 +9155,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9155: found $ac_dir/$ac_word" >&5
+echo "$as_me:9158: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9160,10 +9163,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9163: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9166: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9166: result: no" >&5
+  echo "$as_me:9169: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9176,7 +9179,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9179: checking for $ac_word" >&5
+echo "$as_me:9182: 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
@@ -9191,7 +9194,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9194: found $ac_dir/$ac_word" >&5
+echo "$as_me:9197: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9199,10 +9202,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9202: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9205: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9205: result: no" >&5
+  echo "$as_me:9208: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9359,7 +9362,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9362: checking if we have identified curses headers" >&5
+echo "$as_me:9365: 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
@@ -9371,7 +9374,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9374 "configure"
+#line 9377 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9383,16 +9386,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9389: \$? = $ac_status" >&5
+  echo "$as_me:9392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9395: \$? = $ac_status" >&5
+  echo "$as_me:9398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9403,11 +9406,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9406: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9409: 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:9410: error: No curses header-files found" >&5
+	{ { echo "$as_me:9413: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9417,23 +9420,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9420: checking for $ac_header" >&5
+echo "$as_me:9423: 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 9426 "configure"
+#line 9429 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9430: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9433: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9436: \$? = $ac_status" >&5
+  echo "$as_me:9439: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9452,7 +9455,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9455: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9458: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9508,7 +9511,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9511 "configure"
+#line 9514 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9520,16 +9523,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9526: \$? = $ac_status" >&5
+  echo "$as_me:9529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9532: \$? = $ac_status" >&5
+  echo "$as_me:9535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9546,7 +9549,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9549: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9552: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9565,7 +9568,7 @@ fi
 
 }
 
-echo "$as_me:9568: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9571: 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
@@ -9577,7 +9580,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9580 "configure"
+#line 9583 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9601,16 +9604,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9607: \$? = $ac_status" >&5
+  echo "$as_me:9610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9613: \$? = $ac_status" >&5
+  echo "$as_me:9616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9625,14 +9628,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9628: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9631: 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:9635: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9638: 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
@@ -9753,7 +9756,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9756 "configure"
+#line 9759 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9765,16 +9768,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9771: \$? = $ac_status" >&5
+  echo "$as_me:9774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9777: \$? = $ac_status" >&5
+  echo "$as_me:9780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9791,7 +9794,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9794: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9797: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9814,7 +9817,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9817 "configure"
+#line 9820 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9838,16 +9841,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9844: \$? = $ac_status" >&5
+  echo "$as_me:9847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9850: \$? = $ac_status" >&5
+  echo "$as_me:9853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9868,12 +9871,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9871: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9874: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9876: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9879: 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%/[^/]*$%%'`
@@ -9909,7 +9912,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9912 "configure"
+#line 9915 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9921,16 +9924,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:9930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  echo "$as_me:9936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9947,7 +9950,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9950: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9953: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9995,7 +9998,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9998: checking for terminfo header" >&5
+echo "$as_me:10001: 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
@@ -10013,7 +10016,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10016 "configure"
+#line 10019 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10028,16 +10031,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10034: \$? = $ac_status" >&5
+  echo "$as_me:10037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10040: \$? = $ac_status" >&5
+  echo "$as_me:10043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10053,7 +10056,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10056: result: $cf_cv_term_header" >&5
+echo "$as_me:10059: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10091,7 +10094,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10094: checking for ncurses version" >&5
+echo "$as_me:10097: 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
@@ -10117,10 +10120,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10120: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10123: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10123: \$? = $ac_status" >&5
+  echo "$as_me:10126: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10130,7 +10133,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10133 "configure"
+#line 10136 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10157,15 +10160,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10163: \$? = $ac_status" >&5
+  echo "$as_me:10166: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10168: \$? = $ac_status" >&5
+  echo "$as_me:10171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10179,7 +10182,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10182: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10185: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10192,7 +10195,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10195: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10198: 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
@@ -10200,7 +10203,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10203 "configure"
+#line 10206 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10219,16 +10222,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10225: \$? = $ac_status" >&5
+  echo "$as_me:10228: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10231: \$? = $ac_status" >&5
+  echo "$as_me:10234: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10239,10 +10242,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10242: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10245: 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:10245: checking for initscr in -lgpm" >&5
+  echo "$as_me:10248: 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
@@ -10250,7 +10253,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10253 "configure"
+#line 10256 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10269,16 +10272,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10275: \$? = $ac_status" >&5
+  echo "$as_me:10278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10281: \$? = $ac_status" >&5
+  echo "$as_me:10284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10289,7 +10292,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10292: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10295: 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"
@@ -10304,7 +10307,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10307: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10310: 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
@@ -10312,7 +10315,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10315 "configure"
+#line 10318 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10331,16 +10334,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10337: \$? = $ac_status" >&5
+  echo "$as_me:10340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10343: \$? = $ac_status" >&5
+  echo "$as_me:10346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10351,7 +10354,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10354: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10357: 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"
@@ -10400,13 +10403,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10403: checking for initscr" >&5
+	echo "$as_me:10406: 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 10409 "configure"
+#line 10412 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10437,16 +10440,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10443: \$? = $ac_status" >&5
+  echo "$as_me:10446: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10449: \$? = $ac_status" >&5
+  echo "$as_me:10452: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10456,18 +10459,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10459: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10462: 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:10466: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10469: 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 10470 "configure"
+#line 10473 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10479,25 +10482,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10485: \$? = $ac_status" >&5
+  echo "$as_me:10488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10491: \$? = $ac_status" >&5
+  echo "$as_me:10494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10493: result: yes" >&5
+  echo "$as_me:10496: 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:10500: result: no" >&5
+echo "$as_me:10503: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10565,11 +10568,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10568: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10571: 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 10572 "configure"
+#line 10575 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10581,25 +10584,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10587: \$? = $ac_status" >&5
+  echo "$as_me:10590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10593: \$? = $ac_status" >&5
+  echo "$as_me:10596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10595: result: yes" >&5
+  echo "$as_me:10598: 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:10602: result: no" >&5
+echo "$as_me:10605: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10614,7 +10617,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10617: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10620: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10622,7 +10625,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10625: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10628: 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
@@ -10632,7 +10635,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10635 "configure"
+#line 10638 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10644,23 +10647,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10650: \$? = $ac_status" >&5
+  echo "$as_me:10653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10658: result: yes" >&5
+  echo "$as_me:10661: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10663: result: no" >&5
+echo "$as_me:10666: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10685,13 +10688,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10688: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10691: 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:10691: result: yes" >&5
+		echo "$as_me:10694: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10694: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10697: 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
 
@@ -10824,7 +10827,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10827 "configure"
+#line 10830 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10836,37 +10839,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10842: \$? = $ac_status" >&5
+  echo "$as_me:10845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10848: \$? = $ac_status" >&5
+  echo "$as_me:10851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10854 "configure"
+#line 10857 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10864: \$? = $ac_status" >&5
+  echo "$as_me:10867: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10869: \$? = $ac_status" >&5
+  echo "$as_me:10872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -11040,7 +11043,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11043 "configure"
+#line 11046 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11052,37 +11055,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11058: \$? = $ac_status" >&5
+  echo "$as_me:11061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11070 "configure"
+#line 11073 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11080: \$? = $ac_status" >&5
+  echo "$as_me:11083: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11085: \$? = $ac_status" >&5
+  echo "$as_me:11088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11099,7 +11102,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11102: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11105: 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"
@@ -11115,7 +11118,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11118: checking for terminfo header" >&5
+echo "$as_me:11121: 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
@@ -11133,7 +11136,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11136 "configure"
+#line 11139 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11148,16 +11151,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11154: \$? = $ac_status" >&5
+  echo "$as_me:11157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11160: \$? = $ac_status" >&5
+  echo "$as_me:11163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11173,7 +11176,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11176: result: $cf_cv_term_header" >&5
+echo "$as_me:11179: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11208,7 +11211,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11211: result: no" >&5
+		echo "$as_me:11214: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11224,7 +11227,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11227: checking for $ac_word" >&5
+echo "$as_me:11230: 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
@@ -11239,7 +11242,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11242: found $ac_dir/$ac_word" >&5
+echo "$as_me:11245: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11247,10 +11250,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11250: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11253: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11253: result: no" >&5
+  echo "$as_me:11256: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11263,7 +11266,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11266: checking for $ac_word" >&5
+echo "$as_me:11269: 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
@@ -11278,7 +11281,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11281: found $ac_dir/$ac_word" >&5
+echo "$as_me:11284: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11286,10 +11289,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11289: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11292: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11292: result: no" >&5
+  echo "$as_me:11295: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11446,7 +11449,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11449: checking if we have identified curses headers" >&5
+echo "$as_me:11452: 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
@@ -11458,7 +11461,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11461 "configure"
+#line 11464 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11470,16 +11473,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11476: \$? = $ac_status" >&5
+  echo "$as_me:11479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11482: \$? = $ac_status" >&5
+  echo "$as_me:11485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11490,11 +11493,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11493: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11496: 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:11497: error: No curses header-files found" >&5
+	{ { echo "$as_me:11500: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11504,23 +11507,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11507: checking for $ac_header" >&5
+echo "$as_me:11510: 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 11513 "configure"
+#line 11516 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11520: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11523: \$? = $ac_status" >&5
+  echo "$as_me:11526: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11539,7 +11542,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11545: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11595,7 +11598,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11598 "configure"
+#line 11601 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11607,16 +11610,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11619: \$? = $ac_status" >&5
+  echo "$as_me:11622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11633,7 +11636,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11636: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11639: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11652,7 +11655,7 @@ fi
 
 }
 
-echo "$as_me:11655: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11658: 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
@@ -11664,7 +11667,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11667 "configure"
+#line 11670 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11688,16 +11691,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11694: \$? = $ac_status" >&5
+  echo "$as_me:11697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11700: \$? = $ac_status" >&5
+  echo "$as_me:11703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11712,14 +11715,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11715: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11718: 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:11722: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11725: 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
@@ -11840,7 +11843,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11843 "configure"
+#line 11846 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11852,16 +11855,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11858: \$? = $ac_status" >&5
+  echo "$as_me:11861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11864: \$? = $ac_status" >&5
+  echo "$as_me:11867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11878,7 +11881,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11884: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11901,7 +11904,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11904 "configure"
+#line 11907 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11925,16 +11928,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11931: \$? = $ac_status" >&5
+  echo "$as_me:11934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11937: \$? = $ac_status" >&5
+  echo "$as_me:11940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11955,12 +11958,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11958: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11961: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11963: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11966: 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%/[^/]*$%%'`
@@ -11996,7 +11999,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11999 "configure"
+#line 12002 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12008,16 +12011,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12014: \$? = $ac_status" >&5
+  echo "$as_me:12017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12020: \$? = $ac_status" >&5
+  echo "$as_me:12023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12034,7 +12037,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:12037: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12082,7 +12085,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12085: checking for terminfo header" >&5
+echo "$as_me:12088: 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
@@ -12100,7 +12103,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12103 "configure"
+#line 12106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12115,16 +12118,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12121: \$? = $ac_status" >&5
+  echo "$as_me:12124: \$? = $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:12127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12127: \$? = $ac_status" >&5
+  echo "$as_me:12130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12140,7 +12143,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12143: result: $cf_cv_term_header" >&5
+echo "$as_me:12146: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12178,7 +12181,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12181: checking for ncurses version" >&5
+echo "$as_me:12184: 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
@@ -12204,10 +12207,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12207: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12210: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12210: \$? = $ac_status" >&5
+  echo "$as_me:12213: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12217,7 +12220,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12220 "configure"
+#line 12223 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12244,15 +12247,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12250: \$? = $ac_status" >&5
+  echo "$as_me:12253: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12255: \$? = $ac_status" >&5
+  echo "$as_me:12258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12266,7 +12269,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12269: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12272: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12279,7 +12282,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12282: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12285: 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
@@ -12287,7 +12290,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12290 "configure"
+#line 12293 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12306,16 +12309,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12312: \$? = $ac_status" >&5
+  echo "$as_me:12315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12326,10 +12329,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12329: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12332: 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:12332: checking for initscr in -lgpm" >&5
+  echo "$as_me:12335: 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
@@ -12337,7 +12340,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12340 "configure"
+#line 12343 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12356,16 +12359,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12362: \$? = $ac_status" >&5
+  echo "$as_me:12365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12368: \$? = $ac_status" >&5
+  echo "$as_me:12371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12376,7 +12379,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12379: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12382: 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"
@@ -12391,7 +12394,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12394: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12397: 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
@@ -12399,7 +12402,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12402 "configure"
+#line 12405 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12418,16 +12421,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12424: \$? = $ac_status" >&5
+  echo "$as_me:12427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12430: \$? = $ac_status" >&5
+  echo "$as_me:12433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12438,7 +12441,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12441: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12444: 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"
@@ -12487,13 +12490,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12490: checking for initscr" >&5
+	echo "$as_me:12493: 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 12496 "configure"
+#line 12499 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12524,16 +12527,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12530: \$? = $ac_status" >&5
+  echo "$as_me:12533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:12539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12543,18 +12546,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12546: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12549: 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:12553: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12556: 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 12557 "configure"
+#line 12560 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12566,25 +12569,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12572: \$? = $ac_status" >&5
+  echo "$as_me:12575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12580: result: yes" >&5
+  echo "$as_me:12583: 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:12587: result: no" >&5
+echo "$as_me:12590: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12652,11 +12655,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12655: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12658: 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 12659 "configure"
+#line 12662 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12668,25 +12671,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12674: \$? = $ac_status" >&5
+  echo "$as_me:12677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12680: \$? = $ac_status" >&5
+  echo "$as_me:12683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12682: result: yes" >&5
+  echo "$as_me:12685: 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:12689: result: no" >&5
+echo "$as_me:12692: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12701,7 +12704,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12704: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12707: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12709,7 +12712,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12712: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12715: 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
@@ -12719,7 +12722,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12722 "configure"
+#line 12725 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12731,23 +12734,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12737: \$? = $ac_status" >&5
+  echo "$as_me:12740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12743: \$? = $ac_status" >&5
+  echo "$as_me:12746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12745: result: yes" >&5
+  echo "$as_me:12748: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12750: result: no" >&5
+echo "$as_me:12753: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12767,7 +12770,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12770: checking for X" >&5
+	echo "$as_me:12773: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12871,17 +12874,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12874 "configure"
+#line 12877 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12881: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12884: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12914,7 +12917,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12917 "configure"
+#line 12920 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12926,16 +12929,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12932: \$? = $ac_status" >&5
+  echo "$as_me:12935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12938: \$? = $ac_status" >&5
+  echo "$as_me:12941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12973,7 +12976,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12976: result: $have_x" >&5
+  echo "$as_me:12979: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12983,7 +12986,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12986: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12989: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -13010,11 +13013,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:13013: checking whether -R must be followed by a space" >&5
+      echo "$as_me:13016: 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 13017 "configure"
+#line 13020 "configure"
 #include "confdefs.h"
 
 int
@@ -13026,16 +13029,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13032: \$? = $ac_status" >&5
+  echo "$as_me:13035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13038: \$? = $ac_status" >&5
+  echo "$as_me:13041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -13045,13 +13048,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:13048: result: no" >&5
+	echo "$as_me:13051: 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 13054 "configure"
+#line 13057 "configure"
 #include "confdefs.h"
 
 int
@@ -13063,16 +13066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13069: \$? = $ac_status" >&5
+  echo "$as_me:13072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13075: \$? = $ac_status" >&5
+  echo "$as_me:13078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13082,11 +13085,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13085: result: yes" >&5
+	  echo "$as_me:13088: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13089: result: neither works" >&5
+	  echo "$as_me:13092: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13106,7 +13109,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13109 "configure"
+#line 13112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13125,22 +13128,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13131: \$? = $ac_status" >&5
+  echo "$as_me:13134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13137: \$? = $ac_status" >&5
+  echo "$as_me:13140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13143: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13146: 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
@@ -13148,7 +13151,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13151 "configure"
+#line 13154 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13167,16 +13170,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13173: \$? = $ac_status" >&5
+  echo "$as_me:13176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13179: \$? = $ac_status" >&5
+  echo "$as_me:13182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13187,14 +13190,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13190: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13193: 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:13197: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13200: 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
@@ -13202,7 +13205,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13205 "configure"
+#line 13208 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13221,16 +13224,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13227: \$? = $ac_status" >&5
+  echo "$as_me:13230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13233: \$? = $ac_status" >&5
+  echo "$as_me:13236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13241,7 +13244,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13244: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13247: 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"
@@ -13260,13 +13263,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13263: checking for gethostbyname" >&5
+    echo "$as_me:13266: 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 13269 "configure"
+#line 13272 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13297,16 +13300,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13303: \$? = $ac_status" >&5
+  echo "$as_me:13306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13309: \$? = $ac_status" >&5
+  echo "$as_me:13312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13316,11 +13319,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13319: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13322: 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:13323: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13326: 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
@@ -13328,7 +13331,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13331 "configure"
+#line 13334 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13347,16 +13350,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13353: \$? = $ac_status" >&5
+  echo "$as_me:13356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13359: \$? = $ac_status" >&5
+  echo "$as_me:13362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13367,14 +13370,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13370: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13373: 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:13377: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13380: 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
@@ -13382,7 +13385,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13385 "configure"
+#line 13388 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13401,16 +13404,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13407: \$? = $ac_status" >&5
+  echo "$as_me:13410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13413: \$? = $ac_status" >&5
+  echo "$as_me:13416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13421,7 +13424,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13424: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13427: 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"
@@ -13437,13 +13440,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13440: checking for connect" >&5
+    echo "$as_me:13443: 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 13446 "configure"
+#line 13449 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13474,16 +13477,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13480: \$? = $ac_status" >&5
+  echo "$as_me:13483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13486: \$? = $ac_status" >&5
+  echo "$as_me:13489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13493,11 +13496,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13496: result: $ac_cv_func_connect" >&5
+echo "$as_me:13499: 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:13500: checking for connect in -lsocket" >&5
+      echo "$as_me:13503: 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
@@ -13505,7 +13508,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13508 "configure"
+#line 13511 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13524,16 +13527,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13530: \$? = $ac_status" >&5
+  echo "$as_me:13533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13536: \$? = $ac_status" >&5
+  echo "$as_me:13539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13544,7 +13547,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13547: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13550: 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"
@@ -13553,13 +13556,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13556: checking for remove" >&5
+    echo "$as_me:13559: 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 13562 "configure"
+#line 13565 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13590,16 +13593,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13596: \$? = $ac_status" >&5
+  echo "$as_me:13599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13602: \$? = $ac_status" >&5
+  echo "$as_me:13605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13609,11 +13612,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13612: result: $ac_cv_func_remove" >&5
+echo "$as_me:13615: 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:13616: checking for remove in -lposix" >&5
+      echo "$as_me:13619: 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
@@ -13621,7 +13624,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13624 "configure"
+#line 13627 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13640,16 +13643,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13646: \$? = $ac_status" >&5
+  echo "$as_me:13649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13652: \$? = $ac_status" >&5
+  echo "$as_me:13655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13660,7 +13663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13663: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13666: 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"
@@ -13669,13 +13672,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13672: checking for shmat" >&5
+    echo "$as_me:13675: 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 13678 "configure"
+#line 13681 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13706,16 +13709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13712: \$? = $ac_status" >&5
+  echo "$as_me:13715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13718: \$? = $ac_status" >&5
+  echo "$as_me:13721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13725,11 +13728,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13728: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13731: 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:13732: checking for shmat in -lipc" >&5
+      echo "$as_me:13735: 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
@@ -13737,7 +13740,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13740 "configure"
+#line 13743 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13756,16 +13759,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13762: \$? = $ac_status" >&5
+  echo "$as_me:13765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13768: \$? = $ac_status" >&5
+  echo "$as_me:13771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13776,7 +13779,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13779: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13782: 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"
@@ -13794,7 +13797,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13797: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13800: 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
@@ -13802,7 +13805,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13805 "configure"
+#line 13808 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13821,16 +13824,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13827: \$? = $ac_status" >&5
+  echo "$as_me:13830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13833: \$? = $ac_status" >&5
+  echo "$as_me:13836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13841,7 +13844,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13844: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13847: 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"
@@ -13853,7 +13856,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13856: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13859: 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=
 
@@ -13864,14 +13867,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13867: result: yes" >&5
+	echo "$as_me:13870: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13870: result: no" >&5
+	echo "$as_me:13873: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13874: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13877: 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=
 
@@ -13882,14 +13885,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13885: result: yes" >&5
+	echo "$as_me:13888: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13888: result: no" >&5
+	echo "$as_me:13891: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13892: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13895: 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=
 
@@ -13900,14 +13903,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13903: result: yes" >&5
+	echo "$as_me:13906: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13906: result: no" >&5
+	echo "$as_me:13909: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13910: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13913: 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=
 
@@ -13918,10 +13921,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13921: result: yes" >&5
+	echo "$as_me:13924: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13924: result: no" >&5
+	echo "$as_me:13927: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13941,17 +13944,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13944: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13947: 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}:13950: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13953: 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}:13954: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13957: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14082,20 +14085,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14085: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14088: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14091: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14094: 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 14098 "configure"
+#line 14101 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14113,16 +14116,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14119: \$? = $ac_status" >&5
+  echo "$as_me:14122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14132,7 +14135,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14135: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14138: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14144,7 +14147,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14152,17 +14155,17 @@ echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14155: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14158: 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}:14161: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14164: 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}:14165: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14168: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14282,12 +14285,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14285: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14288: 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}:14290: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14293: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14295,12 +14298,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14298: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14301: 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}:14303: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14306: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14311,7 +14314,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14314: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14317: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14336,17 +14339,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14339: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14342: 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}:14345: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14348: 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}:14349: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14352: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14467,7 +14470,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14470: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14473: 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
@@ -14475,7 +14478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14478 "configure"
+#line 14481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14494,16 +14497,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14500: \$? = $ac_status" >&5
+  echo "$as_me:14503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14506: \$? = $ac_status" >&5
+  echo "$as_me:14509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14514,7 +14517,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14517: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14520: 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
 
@@ -14550,17 +14553,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14553: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14556: 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}:14559: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14562: 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}:14563: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14566: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14680,24 +14683,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14683: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14686: 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}:14690: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14693: 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}:14696: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14699: 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}:14700: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14703: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14817,24 +14820,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14820: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14823: 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}:14827: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14830: 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}:14833: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14836: 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}:14837: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14840: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14954,24 +14957,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14957: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14960: 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}:14964: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14967: 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}:14970: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14973: 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}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14977: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15091,7 +15094,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15094: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15097: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15104,17 +15107,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15107: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15110: 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}:15113: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15116: 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}:15117: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15235,14 +15238,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15238: checking for usable X dependency" >&5
+echo "$as_me:15241: 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 15245 "configure"
+#line 15248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15262,16 +15265,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15268: \$? = $ac_status" >&5
+  echo "$as_me:15271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15274: \$? = $ac_status" >&5
+  echo "$as_me:15277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15281,30 +15284,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15284: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15287: 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}:15290: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15293: 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}:15297: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15300: 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}:15303: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15306: 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}:15307: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15310: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15427,12 +15430,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15430: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15433: 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}:15435: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15438: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15440,14 +15443,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15443: checking for usable X Toolkit package" >&5
+echo "$as_me:15446: 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 15450 "configure"
+#line 15453 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15463,16 +15466,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15469: \$? = $ac_status" >&5
+  echo "$as_me:15472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15475: \$? = $ac_status" >&5
+  echo "$as_me:15478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15482,7 +15485,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15485: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15488: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15496,22 +15499,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15499: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15502: 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}:15504: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15507: 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}:15510: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15513: 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}:15514: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15630,17 +15633,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15633: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15636: 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}:15639: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15642: 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}:15643: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15646: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15769,12 +15772,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15772: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15775: 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}:15777: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15780: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15794,7 +15797,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15797: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15800: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15879,7 +15882,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15882: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15889,7 +15892,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15892: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15895: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15899,7 +15902,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15902: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15905: 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"
@@ -15908,7 +15911,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15911 "configure"
+#line 15914 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15920,16 +15923,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15926: \$? = $ac_status" >&5
+  echo "$as_me:15929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15932: \$? = $ac_status" >&5
+  echo "$as_me:15935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15937,12 +15940,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15940: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15943: 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}:15945: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15948: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15950,13 +15953,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15953: checking for XOpenDisplay" >&5
+	echo "$as_me:15956: 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 15959 "configure"
+#line 15962 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15987,16 +15990,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15993: \$? = $ac_status" >&5
+  echo "$as_me:15996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15999: \$? = $ac_status" >&5
+  echo "$as_me:16002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -16006,13 +16009,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16009: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:16012: 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:16015: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:16018: 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
@@ -16020,7 +16023,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16023 "configure"
+#line 16026 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16039,16 +16042,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16045: \$? = $ac_status" >&5
+  echo "$as_me:16048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16051: \$? = $ac_status" >&5
+  echo "$as_me:16054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16059,7 +16062,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16062: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16065: 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
 
@@ -16083,13 +16086,13 @@ fi
 
 fi
 
-	echo "$as_me:16086: checking for XtAppInitialize" >&5
+	echo "$as_me:16089: 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 16092 "configure"
+#line 16095 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16120,16 +16123,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16126: \$? = $ac_status" >&5
+  echo "$as_me:16129: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16132: \$? = $ac_status" >&5
+  echo "$as_me:16135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16139,13 +16142,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16142: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16145: 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:16148: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16151: 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
@@ -16153,7 +16156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16156 "configure"
+#line 16159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16172,16 +16175,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16178: \$? = $ac_status" >&5
+  echo "$as_me:16181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16184: \$? = $ac_status" >&5
+  echo "$as_me:16187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16192,7 +16195,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16195: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16198: 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
 
@@ -16209,7 +16212,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16212: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16215: 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
@@ -16250,14 +16253,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16253: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16256: 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:16256: checking for $cf_test" >&5
+			echo "$as_me:16259: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16260 "configure"
+#line 16263 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16271,16 +16274,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16277: \$? = $ac_status" >&5
+  echo "$as_me:16280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16283: \$? = $ac_status" >&5
+  echo "$as_me:16286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16289,7 +16292,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16292: result: $cf_result" >&5
+		echo "$as_me:16295: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16305,7 +16308,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16308: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16311: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16370,10 +16373,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16373: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16376: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16376 "configure"
+#line 16379 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16390,16 +16393,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16396: \$? = $ac_status" >&5
+  echo "$as_me:16399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16402: \$? = $ac_status" >&5
+  echo "$as_me:16405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16408,7 +16411,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16411: result: $cf_result" >&5
+		echo "$as_me:16414: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16425,7 +16428,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16428: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16431: 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
@@ -16459,7 +16462,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16462: checking for $ac_word" >&5
+echo "$as_me:16465: 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
@@ -16474,7 +16477,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16477: found $ac_dir/$ac_word" >&5
+echo "$as_me:16480: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16482,10 +16485,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16485: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16488: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16488: result: no" >&5
+  echo "$as_me:16491: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16498,7 +16501,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16501: checking for $ac_word" >&5
+echo "$as_me:16504: 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
@@ -16513,7 +16516,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16516: found $ac_dir/$ac_word" >&5
+echo "$as_me:16519: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16521,10 +16524,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16524: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16527: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16527: result: no" >&5
+  echo "$as_me:16530: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16659,7 +16662,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16662: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16665: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16744,7 +16747,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16747: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16754,7 +16757,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16757: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16760: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16764,7 +16767,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16767: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16770: 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"
@@ -16773,7 +16776,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16776 "configure"
+#line 16779 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16785,16 +16788,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16791: \$? = $ac_status" >&5
+  echo "$as_me:16794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16797: \$? = $ac_status" >&5
+  echo "$as_me:16800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16802,12 +16805,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16805: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16808: 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}:16810: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16813: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16815,7 +16818,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16818: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16821: 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
@@ -16823,7 +16826,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16826 "configure"
+#line 16829 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16842,16 +16845,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16848: \$? = $ac_status" >&5
+  echo "$as_me:16851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16854: \$? = $ac_status" >&5
+  echo "$as_me:16857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16862,7 +16865,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16865: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16868: 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
 
@@ -16884,7 +16887,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16887: checking for XCurses library" >&5
+echo "$as_me:16890: 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
@@ -16907,7 +16910,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16910 "configure"
+#line 16913 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16922,16 +16925,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16928: \$? = $ac_status" >&5
+  echo "$as_me:16931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16934: \$? = $ac_status" >&5
+  echo "$as_me:16937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16942,7 +16945,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16945: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16948: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16957,23 +16960,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16960: checking for xcurses.h" >&5
+	echo "$as_me:16963: 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 16966 "configure"
+#line 16969 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16976: \$? = $ac_status" >&5
+  echo "$as_me:16979: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16992,7 +16995,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16995: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16998: 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
 
@@ -17003,26 +17006,26 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:17006: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:17009: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:17013: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:17016: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:17019: checking for _nc_init_pthreads" >&5
+echo "$as_me:17022: checking for _nc_init_pthreads" >&5
 echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
 if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17025 "configure"
+#line 17028 "configure"
 #include "confdefs.h"
 #define _nc_init_pthreads autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17053,16 +17056,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17059: \$? = $ac_status" >&5
+  echo "$as_me:17062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17065: \$? = $ac_status" >&5
+  echo "$as_me:17068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_init_pthreads=yes
 else
@@ -17072,7 +17075,7 @@ ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17075: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "$as_me:17078: result: $ac_cv_func__nc_init_pthreads" >&5
 echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
 if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
@@ -17107,7 +17110,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17110: checking for X11 rgb file" >&5
+echo "$as_me:17113: 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.
@@ -17169,7 +17172,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17172: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17175: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17177,7 +17180,7 @@ esac
 
 fi
 
-echo "$as_me:17180: result: $RGB_PATH" >&5
+echo "$as_me:17183: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17218,7 +17221,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17221: checking for desired basename for form library" >&5
+echo "$as_me:17224: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17238,10 +17241,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17241: result: $FORM_NAME" >&5
+echo "$as_me:17244: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17244: checking for desired basename for menu library" >&5
+echo "$as_me:17247: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17261,10 +17264,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17264: result: $MENU_NAME" >&5
+echo "$as_me:17267: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17267: checking for desired basename for panel library" >&5
+echo "$as_me:17270: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17284,10 +17287,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17287: result: $PANEL_NAME" >&5
+echo "$as_me:17290: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17290: checking if you want to check for panel functions" >&5
+echo "$as_me:17293: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17304,7 +17307,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17307: result: $cf_enable_panel" >&5
+echo "$as_me:17310: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17315,13 +17318,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17318: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17321: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17321: result: yes" >&5
+		echo "$as_me:17324: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17324: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17327: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17471,7 +17474,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17474 "configure"
+#line 17477 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17483,37 +17486,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17489: \$? = $ac_status" >&5
+  echo "$as_me:17492: \$? = $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:17495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17495: \$? = $ac_status" >&5
+  echo "$as_me:17498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17501 "configure"
+#line 17504 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17511: \$? = $ac_status" >&5
+  echo "$as_me:17514: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17516: \$? = $ac_status" >&5
+  echo "$as_me:17519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17530,7 +17533,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17533: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17536: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17551,7 +17554,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17554: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17557: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17559,7 +17562,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17562 "configure"
+#line 17565 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17578,16 +17581,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17584: \$? = $ac_status" >&5
+  echo "$as_me:17587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17590: \$? = $ac_status" >&5
+  echo "$as_me:17593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17598,7 +17601,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17601: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17604: 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
 
@@ -17631,7 +17634,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17634: checking if you want to check for menu functions" >&5
+echo "$as_me:17637: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17648,7 +17651,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17651: result: $cf_enable_menu" >&5
+echo "$as_me:17654: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17657,14 +17660,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17660: checking for NetBSD menu.h" >&5
+echo "$as_me:17663: 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 17667 "configure"
+#line 17670 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17682,16 +17685,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17688: \$? = $ac_status" >&5
+  echo "$as_me:17691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17694: \$? = $ac_status" >&5
+  echo "$as_me:17697: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17703,7 +17706,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17706: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17709: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17720,13 +17723,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17723: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17726: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17726: result: yes" >&5
+		echo "$as_me:17729: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17729: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17732: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17876,7 +17879,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17879 "configure"
+#line 17882 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17888,37 +17891,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17894: \$? = $ac_status" >&5
+  echo "$as_me:17897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17900: \$? = $ac_status" >&5
+  echo "$as_me:17903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17906 "configure"
+#line 17909 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17916: \$? = $ac_status" >&5
+  echo "$as_me:17919: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17921: \$? = $ac_status" >&5
+  echo "$as_me:17924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17935,7 +17938,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17938: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17941: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17956,7 +17959,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17959: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17962: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17964,7 +17967,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17967 "configure"
+#line 17970 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17983,16 +17986,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17989: \$? = $ac_status" >&5
+  echo "$as_me:17992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17995: \$? = $ac_status" >&5
+  echo "$as_me:17998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18003,7 +18006,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18006: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18009: 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
 
@@ -18036,7 +18039,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:18039: checking if you want to check for form functions" >&5
+echo "$as_me:18042: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -18053,7 +18056,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:18056: result: $cf_enable_form" >&5
+echo "$as_me:18059: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -18062,14 +18065,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:18065: checking for NetBSD form.h" >&5
+echo "$as_me:18068: 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 18072 "configure"
+#line 18075 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18088,16 +18091,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18094: \$? = $ac_status" >&5
+  echo "$as_me:18097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18100: \$? = $ac_status" >&5
+  echo "$as_me:18103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18109,7 +18112,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18112: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18115: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18126,13 +18129,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18129: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18132: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18132: result: yes" >&5
+		echo "$as_me:18135: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18135: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18138: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18282,7 +18285,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18285 "configure"
+#line 18288 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18294,37 +18297,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18300: \$? = $ac_status" >&5
+  echo "$as_me:18303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18306: \$? = $ac_status" >&5
+  echo "$as_me:18309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18312 "configure"
+#line 18315 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18322: \$? = $ac_status" >&5
+  echo "$as_me:18325: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18327: \$? = $ac_status" >&5
+  echo "$as_me:18330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18341,7 +18344,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18344: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18347: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18362,7 +18365,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18365: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18368: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18370,7 +18373,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18373 "configure"
+#line 18376 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18389,16 +18392,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18395: \$? = $ac_status" >&5
+  echo "$as_me:18398: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18401: \$? = $ac_status" >&5
+  echo "$as_me:18404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18409,7 +18412,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18412: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18415: 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
 
@@ -18447,23 +18450,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18450: checking for $ac_header" >&5
+echo "$as_me:18453: 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 18456 "configure"
+#line 18459 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18463: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18466: \$? = $ac_status" >&5
+  echo "$as_me:18469: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18482,7 +18485,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18485: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18492,13 +18495,13 @@ EOF
 fi
 done
 
-echo "$as_me:18495: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18498: 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 18501 "configure"
+#line 18504 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18514,16 +18517,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18520: \$? = $ac_status" >&5
+  echo "$as_me:18523: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18526: \$? = $ac_status" >&5
+  echo "$as_me:18529: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18533,7 +18536,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18536: result: $ac_cv_header_time" >&5
+echo "$as_me:18539: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18554,23 +18557,23 @@ termios.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18557: checking for $ac_header" >&5
+echo "$as_me:18560: 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 18563 "configure"
+#line 18566 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18573: \$? = $ac_status" >&5
+  echo "$as_me:18576: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18589,7 +18592,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18602,23 +18605,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18605: checking for $ac_header" >&5
+echo "$as_me:18608: 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 18611 "configure"
+#line 18614 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18615: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18621: \$? = $ac_status" >&5
+  echo "$as_me:18624: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18637,7 +18640,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18640: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18647,7 +18650,7 @@ EOF
 fi
 done
 
-echo "$as_me:18650: checking for header declaring getopt variables" >&5
+echo "$as_me:18653: 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
@@ -18657,7 +18660,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18660 "configure"
+#line 18663 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18670,16 +18673,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18676: \$? = $ac_status" >&5
+  echo "$as_me:18679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18682: \$? = $ac_status" >&5
+  echo "$as_me:18685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18691,7 +18694,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18694: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18697: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18709,13 +18712,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18712: checking for clock_gettime" >&5
+echo "$as_me:18715: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18718 "configure"
+#line 18721 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18746,16 +18749,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18752: \$? = $ac_status" >&5
+  echo "$as_me:18755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18758: \$? = $ac_status" >&5
+  echo "$as_me:18761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18765,12 +18768,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18768: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18771: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18773: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18776: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18778,7 +18781,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18781 "configure"
+#line 18784 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18797,16 +18800,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18803: \$? = $ac_status" >&5
+  echo "$as_me:18806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18809: \$? = $ac_status" >&5
+  echo "$as_me:18812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18817,7 +18820,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18820: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18823: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18829,14 +18832,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18832: checking if clock_gettime links" >&5
+echo "$as_me:18835: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18839 "configure"
+#line 18842 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18854,16 +18857,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18860: \$? = $ac_status" >&5
+  echo "$as_me:18863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18866: \$? = $ac_status" >&5
+  echo "$as_me:18869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18874,7 +18877,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18877: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18880: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18888,13 +18891,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18891: checking for gettimeofday" >&5
+echo "$as_me:18894: 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 18897 "configure"
+#line 18900 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18925,16 +18928,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18931: \$? = $ac_status" >&5
+  echo "$as_me:18934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18937: \$? = $ac_status" >&5
+  echo "$as_me:18940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18944,7 +18947,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18947: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18950: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18954,7 +18957,7 @@ EOF
 
 else
 
-echo "$as_me:18957: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18960: 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
@@ -18962,7 +18965,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18965 "configure"
+#line 18968 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18981,16 +18984,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18987: \$? = $ac_status" >&5
+  echo "$as_me:18990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18993: \$? = $ac_status" >&5
+  echo "$as_me:18996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -19001,7 +19004,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19004: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:19007: 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
 
@@ -19039,13 +19042,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19042: checking for $ac_func" >&5
+echo "$as_me:19045: 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 19048 "configure"
+#line 19051 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19076,16 +19079,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19082: \$? = $ac_status" >&5
+  echo "$as_me:19085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19088: \$? = $ac_status" >&5
+  echo "$as_me:19091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19095,7 +19098,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19098: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19101: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19106,14 +19109,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19109: checking if we can use termcap.h" >&5
+echo "$as_me:19112: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19116 "configure"
+#line 19119 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19134,16 +19137,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19140: \$? = $ac_status" >&5
+  echo "$as_me:19143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19146: \$? = $ac_status" >&5
+  echo "$as_me:19149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19153,7 +19156,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19156: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19159: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19163,14 +19166,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19166: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19169: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19173 "configure"
+#line 19176 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19191,16 +19194,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19197: \$? = $ac_status" >&5
+  echo "$as_me:19200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19203: \$? = $ac_status" >&5
+  echo "$as_me:19206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19210,7 +19213,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19213: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19216: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19220,7 +19223,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19223: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19226: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19239,13 +19242,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19242: checking for $ac_func" >&5
+echo "$as_me:19245: 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 19248 "configure"
+#line 19251 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19276,16 +19279,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19282: \$? = $ac_status" >&5
+  echo "$as_me:19285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19288: \$? = $ac_status" >&5
+  echo "$as_me:19291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19295,7 +19298,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19298: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19301: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19307,7 +19310,7 @@ done
 
 fi
 
-echo "$as_me:19310: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19313: 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
@@ -19315,7 +19318,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19318 "configure"
+#line 19321 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19348,16 +19351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19354: \$? = $ac_status" >&5
+  echo "$as_me:19357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19360: \$? = $ac_status" >&5
+  echo "$as_me:19363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19367,7 +19370,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19370 "configure"
+#line 19373 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19393,16 +19396,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19399: \$? = $ac_status" >&5
+  echo "$as_me:19402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19405: \$? = $ac_status" >&5
+  echo "$as_me:19408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19416,7 +19419,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19419: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19422: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19428,7 +19431,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19431: checking for term.h" >&5
+echo "$as_me:19434: 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
@@ -19449,7 +19452,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19452 "configure"
+#line 19455 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19463,16 +19466,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19469: \$? = $ac_status" >&5
+  echo "$as_me:19472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19475: \$? = $ac_status" >&5
+  echo "$as_me:19478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19491,7 +19494,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19494 "configure"
+#line 19497 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19509,16 +19512,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19515: \$? = $ac_status" >&5
+  echo "$as_me:19518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19521: \$? = $ac_status" >&5
+  echo "$as_me:19524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19533,7 +19536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19536: result: $cf_cv_term_header" >&5
+echo "$as_me:19539: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19560,7 +19563,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19563: checking for unctrl.h" >&5
+echo "$as_me:19566: 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
@@ -19581,7 +19584,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19584 "configure"
+#line 19587 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19595,16 +19598,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19601: \$? = $ac_status" >&5
+  echo "$as_me:19604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19607: \$? = $ac_status" >&5
+  echo "$as_me:19610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19617,12 +19620,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19620: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19623: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19625: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19628: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19720,10 +19723,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19723: checking for ${cf_func}" >&5
+	echo "$as_me:19726: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19726: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19729: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19732,7 +19735,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19735 "configure"
+#line 19738 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19765,16 +19768,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19771: \$? = $ac_status" >&5
+  echo "$as_me:19774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19790,7 +19793,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19793: result: $cf_result" >&5
+	echo "$as_me:19796: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19805,10 +19808,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19808: checking for ${cf_func}" >&5
+	echo "$as_me:19811: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19811: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19814: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19817,7 +19820,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19820 "configure"
+#line 19823 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19850,16 +19853,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19856: \$? = $ac_status" >&5
+  echo "$as_me:19859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19862: \$? = $ac_status" >&5
+  echo "$as_me:19865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19875,7 +19878,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19878: result: $cf_result" >&5
+	echo "$as_me:19881: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19899,7 +19902,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19902 "configure"
+#line 19905 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19919,21 +19922,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19925: \$? = $ac_status" >&5
+  echo "$as_me:19928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19931: \$? = $ac_status" >&5
+  echo "$as_me:19934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19936: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19939: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19953,14 +19956,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19956: checking for ncurses extended functions" >&5
+echo "$as_me:19959: 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 19963 "configure"
+#line 19966 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19975,16 +19978,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19981: \$? = $ac_status" >&5
+  echo "$as_me:19984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19987: \$? = $ac_status" >&5
+  echo "$as_me:19990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19992,7 +19995,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19995 "configure"
+#line 19998 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20017,16 +20020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20023: \$? = $ac_status" >&5
+  echo "$as_me:20026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20029: \$? = $ac_status" >&5
+  echo "$as_me:20032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -20040,7 +20043,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20043: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:20046: 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
@@ -20054,11 +20057,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:20057: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:20060: 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 20061 "configure"
+#line 20064 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20071,16 +20074,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20077: \$? = $ac_status" >&5
+  echo "$as_me:20080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20083: \$? = $ac_status" >&5
+  echo "$as_me:20086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20089,7 +20092,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20092 "configure"
+#line 20095 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20102,16 +20105,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20108: \$? = $ac_status" >&5
+  echo "$as_me:20111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20114: \$? = $ac_status" >&5
+  echo "$as_me:20117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20122,7 +20125,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20125: result: $cf_define_xpg5" >&5
+		echo "$as_me:20128: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20131,14 +20134,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20134: checking for wide-character functions" >&5
+	echo "$as_me:20137: 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 20141 "configure"
+#line 20144 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20155,16 +20158,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20161: \$? = $ac_status" >&5
+  echo "$as_me:20164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20167: \$? = $ac_status" >&5
+  echo "$as_me:20170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20175,7 +20178,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20178: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20181: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20196,14 +20199,14 @@ EOF
 
 fi
 
-echo "$as_me:20199: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20202: 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 20206 "configure"
+#line 20209 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20221,16 +20224,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20227: \$? = $ac_status" >&5
+  echo "$as_me:20230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20233: \$? = $ac_status" >&5
+  echo "$as_me:20236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20241,21 +20244,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20244: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20247: 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:20251: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20254: 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 20258 "configure"
+#line 20261 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20275,16 +20278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20281: \$? = $ac_status" >&5
+  echo "$as_me:20284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20287: \$? = $ac_status" >&5
+  echo "$as_me:20290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20296,7 +20299,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20299: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20302: 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
@@ -20305,7 +20308,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20308: checking for openpty in -lutil" >&5
+echo "$as_me:20311: 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
@@ -20313,7 +20316,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20316 "configure"
+#line 20319 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20332,16 +20335,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20338: \$? = $ac_status" >&5
+  echo "$as_me:20341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20344: \$? = $ac_status" >&5
+  echo "$as_me:20347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20352,7 +20355,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20355: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20358: 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
@@ -20360,7 +20363,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20363: checking for openpty header" >&5
+echo "$as_me:20366: 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
@@ -20387,7 +20390,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20390 "configure"
+#line 20393 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20405,16 +20408,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20411: \$? = $ac_status" >&5
+  echo "$as_me:20414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20417: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20432,7 +20435,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20435: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20438: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20466,7 +20469,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20469: checking for function curses_version" >&5
+echo "$as_me:20472: 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
@@ -20476,7 +20479,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20479 "configure"
+#line 20482 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20492,15 +20495,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20498: \$? = $ac_status" >&5
+  echo "$as_me:20501: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20503: \$? = $ac_status" >&5
+  echo "$as_me:20506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20515,14 +20518,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20518: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20521: 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:20525: checking for alternate character set array" >&5
+echo "$as_me:20528: 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
@@ -20532,7 +20535,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20535 "configure"
+#line 20538 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20548,16 +20551,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20554: \$? = $ac_status" >&5
+  echo "$as_me:20557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20560: \$? = $ac_status" >&5
+  echo "$as_me:20563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20568,7 +20571,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20571: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20574: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20578,7 +20581,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20581: checking for wide alternate character set array" >&5
+echo "$as_me:20584: 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
@@ -20588,7 +20591,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20591 "configure"
+#line 20594 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20604,16 +20607,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20610: \$? = $ac_status" >&5
+  echo "$as_me:20613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20616: \$? = $ac_status" >&5
+  echo "$as_me:20619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20624,7 +20627,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20627: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20630: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20632,7 +20635,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20635: checking for wide alternate character constants" >&5
+echo "$as_me:20638: 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
@@ -20642,7 +20645,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20645 "configure"
+#line 20648 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20659,16 +20662,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20665: \$? = $ac_status" >&5
+  echo "$as_me:20668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20671: \$? = $ac_status" >&5
+  echo "$as_me:20674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20678,7 +20681,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20681 "configure"
+#line 20684 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20694,16 +20697,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20700: \$? = $ac_status" >&5
+  echo "$as_me:20703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20706: \$? = $ac_status" >&5
+  echo "$as_me:20709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20714,7 +20717,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20717: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20720: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20724,10 +20727,10 @@ EOF
 
 fi
 
-echo "$as_me:20727: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20730: 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 20730 "configure"
+#line 20733 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20745,16 +20748,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20751: \$? = $ac_status" >&5
+  echo "$as_me:20754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20757: \$? = $ac_status" >&5
+  echo "$as_me:20760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20763,7 +20766,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20766: result: $cf_result" >&5
+echo "$as_me:20769: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20784,14 +20787,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20787: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20790: 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 20794 "configure"
+#line 20797 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20809,23 +20812,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20815: \$? = $ac_status" >&5
+  echo "$as_me:20818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20821: \$? = $ac_status" >&5
+  echo "$as_me:20824: \$? = $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 20828 "configure"
+#line 20831 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20844,16 +20847,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20850: \$? = $ac_status" >&5
+  echo "$as_me:20853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20856: \$? = $ac_status" >&5
+  echo "$as_me:20859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20865,7 +20868,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20868: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20871: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20888,14 +20891,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20891: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20894: 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 20898 "configure"
+#line 20901 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20913,23 +20916,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20919: \$? = $ac_status" >&5
+  echo "$as_me:20922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20925: \$? = $ac_status" >&5
+  echo "$as_me:20928: \$? = $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 20932 "configure"
+#line 20935 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20948,16 +20951,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20954: \$? = $ac_status" >&5
+  echo "$as_me:20957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20960: \$? = $ac_status" >&5
+  echo "$as_me:20963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20969,7 +20972,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20972: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20975: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20992,14 +20995,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20995: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20998: 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 21002 "configure"
+#line 21005 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21017,23 +21020,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21023: \$? = $ac_status" >&5
+  echo "$as_me:21026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21029: \$? = $ac_status" >&5
+  echo "$as_me:21032: \$? = $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 21036 "configure"
+#line 21039 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21052,16 +21055,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21058: \$? = $ac_status" >&5
+  echo "$as_me:21061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21064: \$? = $ac_status" >&5
+  echo "$as_me:21067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -21073,7 +21076,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21076: result: $cf_cv_wint_t" >&5
+echo "$as_me:21079: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21097,10 +21100,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21100: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21103: 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 21103 "configure"
+#line 21106 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21118,16 +21121,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21124: \$? = $ac_status" >&5
+  echo "$as_me:21127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:21133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21136,7 +21139,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21139: result: $cf_result" >&5
+echo "$as_me:21142: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21158,10 +21161,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21161: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21164: 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 21164 "configure"
+#line 21167 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21179,16 +21182,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21185: \$? = $ac_status" >&5
+  echo "$as_me:21188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21191: \$? = $ac_status" >&5
+  echo "$as_me:21194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21197,7 +21200,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21200: result: $cf_result" >&5
+echo "$as_me:21203: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21219,10 +21222,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21222: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21225: 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 21225 "configure"
+#line 21228 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21240,16 +21243,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21246: \$? = $ac_status" >&5
+  echo "$as_me:21249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21252: \$? = $ac_status" >&5
+  echo "$as_me:21255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21258,7 +21261,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21261: result: $cf_result" >&5
+echo "$as_me:21264: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21287,11 +21290,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21290: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21293: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21294 "configure"
+#line 21297 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21324,16 +21327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21330: \$? = $ac_status" >&5
+  echo "$as_me:21333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21336: \$? = $ac_status" >&5
+  echo "$as_me:21339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21343,7 +21346,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21346: result: $cf_result" >&5
+echo "$as_me:21349: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21355,14 +21358,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21358: checking for data $cf_data in library" >&5
+	echo "$as_me:21361: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21365 "configure"
+#line 21368 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21401,16 +21404,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21407: \$? = $ac_status" >&5
+  echo "$as_me:21410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21413: \$? = $ac_status" >&5
+  echo "$as_me:21416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21422,7 +21425,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21425 "configure"
+#line 21428 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21454,15 +21457,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21460: \$? = $ac_status" >&5
+  echo "$as_me:21463: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21465: \$? = $ac_status" >&5
+  echo "$as_me:21468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21474,7 +21477,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21477: result: $cf_result" >&5
+	echo "$as_me:21480: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21491,7 +21494,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21494: checking for X" >&5
+	echo "$as_me:21497: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21595,17 +21598,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21598 "configure"
+#line 21601 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21602: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21608: \$? = $ac_status" >&5
+  echo "$as_me:21611: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21638,7 +21641,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21641 "configure"
+#line 21644 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21650,16 +21653,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21656: \$? = $ac_status" >&5
+  echo "$as_me:21659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21662: \$? = $ac_status" >&5
+  echo "$as_me:21665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21697,7 +21700,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21700: result: $have_x" >&5
+  echo "$as_me:21703: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21707,7 +21710,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21710: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21713: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21734,11 +21737,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21737: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21740: 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 21741 "configure"
+#line 21744 "configure"
 #include "confdefs.h"
 
 int
@@ -21750,16 +21753,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21756: \$? = $ac_status" >&5
+  echo "$as_me:21759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21762: \$? = $ac_status" >&5
+  echo "$as_me:21765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21769,13 +21772,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21772: result: no" >&5
+	echo "$as_me:21775: 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 21778 "configure"
+#line 21781 "configure"
 #include "confdefs.h"
 
 int
@@ -21787,16 +21790,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21793: \$? = $ac_status" >&5
+  echo "$as_me:21796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21799: \$? = $ac_status" >&5
+  echo "$as_me:21802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21806,11 +21809,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21809: result: yes" >&5
+	  echo "$as_me:21812: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21813: result: neither works" >&5
+	  echo "$as_me:21816: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21830,7 +21833,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21833 "configure"
+#line 21836 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21849,22 +21852,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21855: \$? = $ac_status" >&5
+  echo "$as_me:21858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21861: \$? = $ac_status" >&5
+  echo "$as_me:21864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21867: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21870: 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
@@ -21872,7 +21875,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21875 "configure"
+#line 21878 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21891,16 +21894,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21897: \$? = $ac_status" >&5
+  echo "$as_me:21900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21903: \$? = $ac_status" >&5
+  echo "$as_me:21906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21911,14 +21914,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21914: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21917: 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:21921: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21924: 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
@@ -21926,7 +21929,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21929 "configure"
+#line 21932 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21945,16 +21948,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21951: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21957: \$? = $ac_status" >&5
+  echo "$as_me:21960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21965,7 +21968,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21968: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21971: 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"
@@ -21984,13 +21987,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21987: checking for gethostbyname" >&5
+    echo "$as_me:21990: 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 21993 "configure"
+#line 21996 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22021,16 +22024,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22027: \$? = $ac_status" >&5
+  echo "$as_me:22030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:22036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -22040,11 +22043,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22043: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:22046: 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:22047: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22050: 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
@@ -22052,7 +22055,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22055 "configure"
+#line 22058 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22071,16 +22074,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22077: \$? = $ac_status" >&5
+  echo "$as_me:22080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22083: \$? = $ac_status" >&5
+  echo "$as_me:22086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22091,14 +22094,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22094: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22097: 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:22101: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22104: 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
@@ -22106,7 +22109,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22109 "configure"
+#line 22112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22125,16 +22128,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22137: \$? = $ac_status" >&5
+  echo "$as_me:22140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22145,7 +22148,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22148: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22151: 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"
@@ -22161,13 +22164,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22164: checking for connect" >&5
+    echo "$as_me:22167: 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 22170 "configure"
+#line 22173 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22198,16 +22201,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22204: \$? = $ac_status" >&5
+  echo "$as_me:22207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22217,11 +22220,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22220: result: $ac_cv_func_connect" >&5
+echo "$as_me:22223: 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:22224: checking for connect in -lsocket" >&5
+      echo "$as_me:22227: 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
@@ -22229,7 +22232,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22232 "configure"
+#line 22235 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22248,16 +22251,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22254: \$? = $ac_status" >&5
+  echo "$as_me:22257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22268,7 +22271,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22271: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22274: 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"
@@ -22277,13 +22280,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22280: checking for remove" >&5
+    echo "$as_me:22283: 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 22286 "configure"
+#line 22289 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22314,16 +22317,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22320: \$? = $ac_status" >&5
+  echo "$as_me:22323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22326: \$? = $ac_status" >&5
+  echo "$as_me:22329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22333,11 +22336,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22336: result: $ac_cv_func_remove" >&5
+echo "$as_me:22339: 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:22340: checking for remove in -lposix" >&5
+      echo "$as_me:22343: 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
@@ -22345,7 +22348,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22348 "configure"
+#line 22351 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22364,16 +22367,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22370: \$? = $ac_status" >&5
+  echo "$as_me:22373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22376: \$? = $ac_status" >&5
+  echo "$as_me:22379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22384,7 +22387,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22387: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22390: 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"
@@ -22393,13 +22396,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22396: checking for shmat" >&5
+    echo "$as_me:22399: 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 22402 "configure"
+#line 22405 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22430,16 +22433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22436: \$? = $ac_status" >&5
+  echo "$as_me:22439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22449,11 +22452,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22452: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22455: 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:22456: checking for shmat in -lipc" >&5
+      echo "$as_me:22459: 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
@@ -22461,7 +22464,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22464 "configure"
+#line 22467 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22480,16 +22483,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22486: \$? = $ac_status" >&5
+  echo "$as_me:22489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22492: \$? = $ac_status" >&5
+  echo "$as_me:22495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22500,7 +22503,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22503: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22506: 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"
@@ -22518,7 +22521,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22521: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22524: 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
@@ -22526,7 +22529,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22529 "configure"
+#line 22532 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22545,16 +22548,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22551: \$? = $ac_status" >&5
+  echo "$as_me:22554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22557: \$? = $ac_status" >&5
+  echo "$as_me:22560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22565,7 +22568,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22568: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22571: 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"
@@ -22612,16 +22615,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22615: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22618: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22620: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22623: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22624: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22627: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22660,16 +22663,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22663: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22666: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22668: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22671: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22672: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22675: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22708,23 +22711,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22711: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22714: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22716: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22719: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22723: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22727: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22730: 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.
@@ -22741,7 +22744,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22744: result: $enable_warnings" >&5
+echo "$as_me:22747: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22764,10 +22767,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22767: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22770: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22770 "${as_me:-configure}"
+#line 22773 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22817,12 +22820,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22823: \$? = $ac_status" >&5
+  echo "$as_me:22826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22825: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22828: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22900,7 +22903,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22903 "configure"
+#line 22906 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22915,26 +22918,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22921: \$? = $ac_status" >&5
+  echo "$as_me:22924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22927: \$? = $ac_status" >&5
+  echo "$as_me:22930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22930: checking for X11/Xt const-feature" >&5
+echo "$as_me:22933: 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 22937 "configure"
+#line 22940 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22952,16 +22955,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22958: \$? = $ac_status" >&5
+  echo "$as_me:22961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22976,7 +22979,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22979: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22982: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -23005,7 +23008,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 23008 "${as_me:-configure}"
+#line 23011 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -23021,7 +23024,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:23024: checking for $CC warning options..." >&5
+	{ echo "$as_me:23027: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -23037,12 +23040,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23040: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23043: \$? = $ac_status" >&5
+  echo "$as_me:23046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23045: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23048: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -23050,7 +23053,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:23053: checking for $CC warning options..." >&5
+	{ echo "$as_me:23056: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23073,12 +23076,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23076: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23079: \$? = $ac_status" >&5
+  echo "$as_me:23082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23081: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23084: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23086,7 +23089,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23096,7 +23099,7 @@ echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23113,7 +23116,7 @@ fi
 
 fi
 
-echo "$as_me:23116: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23119: 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.
@@ -23135,7 +23138,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23138: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23141: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23249,23 +23252,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23252: checking for dmalloc.h" >&5
+	echo "$as_me:23255: 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 23258 "configure"
+#line 23261 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23262: \"$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:23268: \$? = $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_c_preproc_warn_flag
@@ -23284,11 +23287,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23287: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23290: 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:23291: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23294: 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
@@ -23296,7 +23299,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23299 "configure"
+#line 23302 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23315,16 +23318,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23321: \$? = $ac_status" >&5
+  echo "$as_me:23324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23327: \$? = $ac_status" >&5
+  echo "$as_me:23330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23335,7 +23338,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23338: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23341: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23350,7 +23353,7 @@ fi
 
 fi
 
-echo "$as_me:23353: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23356: 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.
@@ -23372,7 +23375,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23375: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23378: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23486,23 +23489,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23489: checking for dbmalloc.h" >&5
+	echo "$as_me:23492: 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 23495 "configure"
+#line 23498 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23502: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23505: \$? = $ac_status" >&5
+  echo "$as_me:23508: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23521,11 +23524,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23524: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23527: 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:23528: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23531: 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
@@ -23533,7 +23536,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23536 "configure"
+#line 23539 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23552,16 +23555,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23558: \$? = $ac_status" >&5
+  echo "$as_me:23561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23564: \$? = $ac_status" >&5
+  echo "$as_me:23567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23572,7 +23575,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23575: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23578: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23587,7 +23590,7 @@ fi
 
 fi
 
-echo "$as_me:23590: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23593: 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.
@@ -23609,7 +23612,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23612: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23615: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23722,7 +23725,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23725: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23728: 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.
@@ -23733,7 +23736,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23736: result: $with_no_leaks" >&5
+echo "$as_me:23739: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23751,7 +23754,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23754: checking for an rpath option" >&5
+	echo "$as_me:23757: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23782,12 +23785,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23785: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23788: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23790: checking if we need a space after rpath option" >&5
+		echo "$as_me:23793: 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"
 
@@ -23808,7 +23811,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23811 "configure"
+#line 23814 "configure"
 #include "confdefs.h"
 
 int
@@ -23820,16 +23823,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23826: \$? = $ac_status" >&5
+  echo "$as_me:23829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23832: \$? = $ac_status" >&5
+  echo "$as_me:23835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23839,14 +23842,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23842: result: $cf_rpath_space" >&5
+		echo "$as_me:23845: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23849: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23852: 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.
@@ -23864,22 +23867,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23867: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23870: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23872: checking for updated LDFLAGS" >&5
+echo "$as_me:23875: 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:23875: result: maybe" >&5
+	echo "$as_me:23878: 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:23882: checking for $ac_word" >&5
+echo "$as_me:23885: 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
@@ -23894,7 +23897,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23897: found $ac_dir/$ac_word" >&5
+echo "$as_me:23900: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23902,10 +23905,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23905: result: $cf_ldd_prog" >&5
+  echo "$as_me:23908: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23908: result: no" >&5
+  echo "$as_me:23911: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23919,7 +23922,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23922 "configure"
+#line 23925 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23931,16 +23934,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23937: \$? = $ac_status" >&5
+  echo "$as_me:23940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23943: \$? = $ac_status" >&5
+  echo "$as_me:23946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23968,7 +23971,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23980,11 +23983,11 @@ echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23983: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23986: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23987: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23990: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -24021,7 +24024,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24027: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24034,11 +24037,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24037: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24040: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24041: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24044: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24075,7 +24078,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24078: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24081: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24088,14 +24091,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24091: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24094: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24095: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24098: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24098: result: no" >&5
+	echo "$as_me:24101: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24185,7 +24188,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24188: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24191: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24366,7 +24369,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24369: error: ambiguous option: $1
+    { { echo "$as_me:24372: 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;}
@@ -24385,7 +24388,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24388: error: unrecognized option: $1
+  -*) { { echo "$as_me:24391: 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;}
@@ -24435,7 +24438,7 @@ do
   "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:24438: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24441: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24751,7 +24754,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24754: creating $ac_file" >&5
+    { echo "$as_me:24757: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24769,7 +24772,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24772: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24775: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24782,7 +24785,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24785: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24788: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24798,7 +24801,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24801: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24804: 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;}
@@ -24807,7 +24810,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24810: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24813: 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;}
@@ -24852,7 +24855,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24855: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24858: 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;}
@@ -24863,7 +24866,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24866: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24869: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24912,7 +24915,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24915: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24918: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24923,7 +24926,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24926: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24929: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24936,7 +24939,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24939: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24942: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24994,7 +24997,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24997: $ac_file is unchanged" >&5
+      { echo "$as_me:25000: $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/test/demo_new_pair.c b/test/demo_new_pair.c
index 89a4da80e..83124a962 100644
--- a/test/demo_new_pair.c
+++ b/test/demo_new_pair.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_new_pair.c,v 1.29 2024/10/05 18:21:44 tom Exp $
+ * $Id: demo_new_pair.c,v 1.31 2024/11/09 20:43:56 tom Exp $
  *
  * Demonstrate the alloc_pair() function.
  */
@@ -205,7 +205,7 @@ main(int argc, char *argv[])
     wchar_t wch[2];
     time_t start = now();
     long total_cells = 0;
-    FILE *output = 0;
+    FILE *output = NULL;
 
     setlocale(LC_ALL, "");
 
@@ -245,7 +245,8 @@ main(int argc, char *argv[])
     }
     if (newterm(NULL, output, stdin) == 0) {
 	fprintf(stderr, "Cannot initialize terminal\n");
-	fclose(output);
+	if (output != NULL)
+	    fclose(output);
 	ExitProgram(EXIT_FAILURE);
     }
     (void) cbreak();		/* read chars without wait for \n */
@@ -384,7 +385,8 @@ main(int argc, char *argv[])
 	++current;
     }
     stop_curses();
-    fclose(output);
+    if (output != NULL)
+	fclose(output);
 
     printf("%.1f cells/second\n",
 	   (double) (total_cells) / (double) (now() - start));
diff --git a/test/demo_panels.c b/test/demo_panels.c
index 0553a824f..2e5d6b27a 100644
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.50 2024/10/06 20:01:21 tom Exp $
+ * $Id: demo_panels.c,v 1.51 2024/11/09 22:54:38 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -656,8 +656,9 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit)
 	(void) wgetch(win);
     } else {
 	int c0 = 0;
-	for (;;) {
+	while (length < limit - 3) {
 	    int ch = wgetch(win);
+	    memset(buffer + length, 0, 3);
 	    if (ch == ERR || ch == QUIT || ch == ESCAPE) {
 		buffer[0] = '\0';
 		break;

From e47c330370c6d558543851ec3d0c304e3eaa582b Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 24 Nov 2024 02:16:21 +0100
Subject: [PATCH 091/106] ncurses-6.5-20241123.patch.gz

---
 NEWS                             |   7 +-
 VERSION                          |   2 +-
 configure                        | 339 +++++++++++++++----------------
 configure.in                     |  15 +-
 dist.mk                          |   4 +-
 menu/m_item_new.c                |   6 +-
 ncurses/base/lib_color.c         |  10 +-
 ncurses/base/lib_mouse.c         |  16 +-
 ncurses/base/lib_newterm.c       |   4 +-
 ncurses/base/lib_set_term.c      |   6 +-
 ncurses/base/lib_touch.c         |  12 +-
 ncurses/base/resizeterm.c        |   4 +-
 ncurses/curses.priv.h            |  12 +-
 ncurses/llib-lncurses            |  20 +-
 ncurses/llib-lncursest           |  20 +-
 ncurses/llib-lncursestw          |  22 +-
 ncurses/llib-lncursesw           |  22 +-
 ncurses/llib-ltinfo              |  14 +-
 ncurses/llib-ltinfot             |  14 +-
 ncurses/llib-ltinfotw            |  14 +-
 ncurses/llib-ltinfow             |  14 +-
 ncurses/tinfo/comp_scan.c        |   4 +-
 ncurses/tinfo/lib_has_cap.c      |   8 +-
 ncurses/tinfo/lib_options.c      |   6 +-
 ncurses/tinfo/lib_setup.c        |  12 +-
 ncurses/tinfo/parse_entry.c      |   4 +-
 ncurses/trace/lib_trace.c        |   6 +-
 ncurses/trace/lib_tracechr.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 +-
 progs/infocmp.c                  |   4 +-
 progs/toe.c                      |   4 +-
 progs/tput.c                     |   6 +-
 progs/tset.c                     |   6 +-
 test/demo_panels.c               |   4 +-
 test/test_opaque.c               |  20 +-
 41 files changed, 336 insertions(+), 351 deletions(-)

diff --git a/NEWS b/NEWS
index 5e9dd8968..9c8a694ff 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4199 2024/11/09 23:12:36 tom Exp $
+-- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241123
+	+ remove dependency on stdbool.h from configure script check for type
+	  of bool when C++ binding is omitted (report by Sam James).
+	+ compiler-warning fixes
+
 20241109
 	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
 	  #920266).
diff --git a/VERSION b/VERSION
index 7b38aa1d0..9bacf90cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241109
+5:0:10	6.5	20241123
diff --git a/configure b/configure
index 4bafbcd4e..4f4c1a619 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.786 .
+# From configure.in Revision: 1.787 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -27337,15 +27337,14 @@ else
 		cf_cv_type_of_bool=$NCURSES_BOOL
 		cf_cv_header_stdbool_h=0
 	else
-		if test "$cf_cv_header_stdbool_h" = 1 ; then
 
-echo "$as_me:27342: checking for bool" >&5
+echo "$as_me:27341: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27348 "configure"
+#line 27347 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27380,16 +27379,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27386: \$? = $ac_status" >&5
+  echo "$as_me:27385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27392: \$? = $ac_status" >&5
+  echo "$as_me:27391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27399,10 +27398,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27402: result: $ac_cv_type_bool" >&5
+echo "$as_me:27401: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27405: checking size of bool" >&5
+echo "$as_me:27404: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27411,7 +27410,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27414 "configure"
+#line 27413 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27443,21 +27442,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27449: \$? = $ac_status" >&5
+  echo "$as_me:27448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27455: \$? = $ac_status" >&5
+  echo "$as_me:27454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27460 "configure"
+#line 27459 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27489,16 +27488,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27495: \$? = $ac_status" >&5
+  echo "$as_me:27494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27501: \$? = $ac_status" >&5
+  echo "$as_me:27500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27514,7 +27513,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27517 "configure"
+#line 27516 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27546,16 +27545,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27552: \$? = $ac_status" >&5
+  echo "$as_me:27551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27558: \$? = $ac_status" >&5
+  echo "$as_me:27557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27571,7 +27570,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27574 "configure"
+#line 27573 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27603,16 +27602,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27609: \$? = $ac_status" >&5
+  echo "$as_me:27608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27615: \$? = $ac_status" >&5
+  echo "$as_me:27614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27625,12 +27624,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27628: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27627: 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 27633 "configure"
+#line 27632 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27666,15 +27665,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27672: \$? = $ac_status" >&5
+  echo "$as_me:27671: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27677: \$? = $ac_status" >&5
+  echo "$as_me:27676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27690,13 +27689,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27693: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27699: checking for type of bool" >&5
+echo "$as_me:27698: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27715,7 +27714,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27718 "configure"
+#line 27717 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27756,15 +27755,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27762: \$? = $ac_status" >&5
+  echo "$as_me:27761: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27767: \$? = $ac_status" >&5
+  echo "$as_me:27766: \$? = $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
@@ -27781,28 +27780,18 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27784: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27783: 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:27791: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27790: 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:27797: 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:27803: result: $cf_cv_type_of_bool" >&5
-echo "${ECHO_T}$cf_cv_type_of_bool" >&6
-		fi
 	fi
 fi
 
@@ -27829,7 +27818,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27832: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27821: 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
@@ -27840,7 +27829,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27843: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27857,10 +27846,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27860: result: $ADAFLAGS" >&5
+	echo "$as_me:27849: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27863: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27852: 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
@@ -27870,11 +27859,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27873: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27862: 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:27877: checking if GNAT supports generics" >&5
+echo "$as_me:27866: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27884,7 +27873,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27887: result: $cf_gnat_generics" >&5
+echo "$as_me:27876: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27896,7 +27885,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27899: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27888: 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
@@ -27944,7 +27933,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27947: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27957,7 +27946,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27960: checking if GNAT supports project files" >&5
+echo "$as_me:27949: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28020,15 +28009,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28023: result: $cf_gnat_projects" >&5
+echo "$as_me:28012: 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:28029: checking if GNAT supports libraries" >&5
+	echo "$as_me:28018: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28031: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28020: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28048,7 +28037,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28051: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28040: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28060,7 +28049,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28063: checking for Ada95 compiler" >&5
+echo "$as_me:28052: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28071,12 +28060,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28074: result: $cf_ada_compiler" >&5
+echo "$as_me:28063: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28079: checking for Ada95 include directory" >&5
+echo "$as_me:28068: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28110,7 +28099,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28113: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28119,10 +28108,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28122: result: $ADA_INCLUDE" >&5
+echo "$as_me:28111: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28125: checking for Ada95 object directory" >&5
+echo "$as_me:28114: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28156,7 +28145,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28159: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28165,10 +28154,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28168: result: $ADA_OBJECTS" >&5
+echo "$as_me:28157: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28171: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28189,11 +28178,11 @@ then
 	fi
 fi
 
-echo "$as_me:28192: result: $with_ada_sharedlib" >&5
+echo "$as_me:28181: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28196: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28211,7 +28200,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28214: checking for Ada95 curses library name" >&5
+echo "$as_me:28203: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28227,7 +28216,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28230: result: $ADA_LIBNAME" >&5
+echo "$as_me:28219: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28238,13 +28227,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28241: checking for wchar_t" >&5
+	echo "$as_me:28230: 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 28247 "configure"
+#line 28236 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28259,16 +28248,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28265: \$? = $ac_status" >&5
+  echo "$as_me:28254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28271: \$? = $ac_status" >&5
+  echo "$as_me:28260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28278,10 +28267,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28281: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28284: checking size of wchar_t" >&5
+echo "$as_me:28273: 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
@@ -28290,7 +28279,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28293 "configure"
+#line 28282 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28302,21 +28291,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28308: \$? = $ac_status" >&5
+  echo "$as_me:28297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28314: \$? = $ac_status" >&5
+  echo "$as_me:28303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28319 "configure"
+#line 28308 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28328,16 +28317,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28334: \$? = $ac_status" >&5
+  echo "$as_me:28323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28340: \$? = $ac_status" >&5
+  echo "$as_me:28329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28353,7 +28342,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28356 "configure"
+#line 28345 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28365,16 +28354,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28371: \$? = $ac_status" >&5
+  echo "$as_me:28360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28377: \$? = $ac_status" >&5
+  echo "$as_me:28366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28390,7 +28379,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28393 "configure"
+#line 28382 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28402,16 +28391,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28408: \$? = $ac_status" >&5
+  echo "$as_me:28397: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28414: \$? = $ac_status" >&5
+  echo "$as_me:28403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28424,12 +28413,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28427: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28416: 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 28432 "configure"
+#line 28421 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28445,15 +28434,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28451: \$? = $ac_status" >&5
+  echo "$as_me:28440: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28456: \$? = $ac_status" >&5
+  echo "$as_me:28445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28469,7 +28458,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28472: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28482,7 +28471,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28485: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28500,7 +28489,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28503: checking for library subsets" >&5
+echo "$as_me:28492: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28554,7 +28543,7 @@ fi
 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:28557: result: $LIB_SUBSETS" >&5
+echo "$as_me:28546: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28585,7 +28574,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28588: checking default library suffix" >&5
+echo "$as_me:28577: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28596,10 +28585,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28599: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28602: checking default library-dependency suffix" >&5
+echo "$as_me:28591: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28682,10 +28671,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28685: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28674: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28688: checking default object directory" >&5
+echo "$as_me:28677: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28701,11 +28690,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28704: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28708: checking c++ library-dependency suffix" >&5
+echo "$as_me:28697: 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++)
@@ -28798,7 +28787,7 @@ else
 	fi
 
 fi
-echo "$as_me:28801: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28974,19 +28963,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28977: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28966: 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 <<EOF
-#line 28982 "configure"
+#line 28971 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28989: \$? = $ac_status" >&5
+  echo "$as_me:28978: \$? = $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
@@ -28997,10 +28986,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29000 "configure"
+#line 28989 "configure"
 #include "confdefs.h"
 
-#line 29003 "configure"
+#line 28992 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29015,16 +29004,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29021: \$? = $ac_status" >&5
+  echo "$as_me:29010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29027: \$? = $ac_status" >&5
+  echo "$as_me:29016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29047,7 +29036,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29050: result: $cf_ldflags_static" >&5
+	echo "$as_me:29039: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29063,7 +29052,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29066: checking where we will install curses.h" >&5
+echo "$as_me:29055: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29073,7 +29062,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29076: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29081,7 +29070,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29084: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29073: 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
@@ -29106,7 +29095,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29109: checking for desired basename for form library" >&5
+echo "$as_me:29098: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29126,10 +29115,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29129: result: $FORM_NAME" >&5
+echo "$as_me:29118: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29132: checking for desired basename for menu library" >&5
+echo "$as_me:29121: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29149,10 +29138,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29152: result: $MENU_NAME" >&5
+echo "$as_me:29141: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29155: checking for desired basename for panel library" >&5
+echo "$as_me:29144: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29172,10 +29161,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29175: result: $PANEL_NAME" >&5
+echo "$as_me:29164: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29178: checking for desired basename for cxx library" >&5
+echo "$as_me:29167: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29195,13 +29184,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29198: result: $CXX_NAME" >&5
+echo "$as_me:29187: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29204: checking for src modules" >&5
+echo "$as_me:29193: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29260,7 +29249,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29263: result: $cf_cv_src_modules" >&5
+echo "$as_me:29252: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29421,7 +29410,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29424: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29413: 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//'`
@@ -29432,7 +29421,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29435: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29448,7 +29437,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29451: result: $PKG_CFLAGS" >&5
+echo "$as_me:29440: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29520,7 +29509,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29523: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29547,7 +29536,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29550: checking for linker search path" >&5
+echo "$as_me:29539: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29595,7 +29584,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29598: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29636,7 +29625,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29639: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29628: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29722,7 +29711,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29725: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29903,7 +29892,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29906: error: ambiguous option: $1
+    { { echo "$as_me:29895: 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;}
@@ -29922,7 +29911,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29925: error: unrecognized option: $1
+  -*) { { echo "$as_me:29914: 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;}
@@ -30054,7 +30043,7 @@ do
   "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:30057: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30046: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30579,7 +30568,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30582: creating $ac_file" >&5
+    { echo "$as_me:30571: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30597,7 +30586,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30600: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30610,7 +30599,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30613: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30602: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30626,7 +30615,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30629: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30618: 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;}
@@ -30635,7 +30624,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30638: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30627: 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;}
@@ -30680,7 +30669,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30683: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30672: 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;}
@@ -30691,7 +30680,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30694: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30683: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30740,7 +30729,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30743: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30751,7 +30740,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30754: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30764,7 +30753,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30767: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30756: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30822,7 +30811,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30825: $ac_file is unchanged" >&5
+      { echo "$as_me:30814: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31209,7 +31198,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31212: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 05f3fdf7b..d8e81148c 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover Exp $
+dnl $Id: configure.in,v 1.787 2024/11/23 22:52:31 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.786 $)
+AC_REVISION($Revision: 1.787 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1942,16 +1942,7 @@ else
 		cf_cv_type_of_bool=$NCURSES_BOOL
 		cf_cv_header_stdbool_h=0
 	else
-		if test "$cf_cv_header_stdbool_h" = 1 ; then
-			CF_BOOL_SIZE
-		else
-			AC_MSG_CHECKING(for fallback type of bool)
-			case "$host_cpu" in
-			(i?86)	cf_cv_type_of_bool=char	;;
-			(*)	cf_cv_type_of_bool=int	;;
-			esac
-			AC_MSG_RESULT($cf_cv_type_of_bool)
-		fi
+		CF_BOOL_SIZE
 	fi
 fi
 AC_SUBST(CXXLIBS)
diff --git a/dist.mk b/dist.mk
index bdcdcab76..f4e0a71fa 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1640 2024/11/09 11:12:30 tom Exp $
+# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241109
+NCURSES_PATCH = 20241123
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/menu/m_item_new.c b/menu/m_item_new.c
index 28b71caf5..a4d85098f 100644
--- a/menu/m_item_new.c
+++ b/menu/m_item_new.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $")
+MODULE_ID("$Id: m_item_new.c,v 1.39 2024/11/23 19:16:50 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -60,7 +60,7 @@ MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $")
 static bool
 Is_Printable_String(const char *s)
 {
-  int result = TRUE;
+  bool result = TRUE;
 
 #if USE_WIDEC_SUPPORT
   int count = (int)mbstowcs(0, s, 0);
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index 654b63df0..4d3e69ea8 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.151 2024/05/25 23:10:42 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.152 2024/11/23 18:27:25 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -776,7 +776,7 @@ init_color(NCURSES_COLOR_T color,
 NCURSES_EXPORT(bool)
 NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL)
 {
-    int result = FALSE;
+    bool result = FALSE;
 
     T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM));
 
@@ -784,7 +784,7 @@ NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL)
 	result = TRUE;
     }
 
-    returnCode(result);
+    returnBool(result);
 }
 
 #if NCURSES_SP_FUNCS
@@ -798,7 +798,7 @@ can_change_color(void)
 NCURSES_EXPORT(bool)
 NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
 {
-    int code = FALSE;
+    bool code = FALSE;
 
     (void) SP_PARM;
     T((T_CALLED("has_colors(%p)"), (void *) SP_PARM));
@@ -814,7 +814,7 @@ NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
 		     || set_color_pair)) ? TRUE : FALSE);
 #endif
     }
-    returnCode(code);
+    returnBool(code);
 }
 
 #if NCURSES_SP_FUNCS
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index ddb0c8d84..949a9dab1 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.201 2024/10/19 21:03:19 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.202 2024/11/23 19:06:20 tom Exp $")
 
 #include <tic.h>
 
@@ -440,7 +440,7 @@ init_xterm_mouse(SCREEN *sp)
 #endif
 
 static void
-enable_xterm_mouse(SCREEN *sp, int enable)
+enable_xterm_mouse(SCREEN *sp, bool enable)
 {
     TPUTS_TRACE(enable
 		? "xterm mouse initialization"
@@ -455,7 +455,7 @@ enable_xterm_mouse(SCREEN *sp, int enable)
 
 #if defined(USE_TERM_DRIVER)
 static void
-enable_win32_mouse(SCREEN *sp, int enable)
+enable_win32_mouse(SCREEN *sp, bool enable)
 {
 #if defined(EXP_WIN32_DRIVER)
     enable_xterm_mouse(sp, enable);
@@ -485,7 +485,7 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED)
 	const char *env = getenv("TERM");
 	if (list != 0) {
 	    if (env != 0) {
-		result = _nc_name_match(list, env, "|:");
+		result = _nc_name_match(list, env, "|:") ? TRUE : FALSE;
 	    }
 	} else {
 	    /* GPM checks the beginning of the $TERM variable to decide if it
@@ -796,7 +796,7 @@ _nc_mouse_init(SCREEN *sp)
 	}
 	result = sp->_mouse_initialized;
     }
-    returnCode(result);
+    returnBool(result);
 }
 
 /*
@@ -1404,7 +1404,7 @@ _nc_mouse_inline(SCREEN *sp)
 }
 
 static void
-mouse_activate(SCREEN *sp, int on)
+mouse_activate(SCREEN *sp, bool on)
 {
     T((T_CALLED("mouse_activate(%p,%s)"),
        (void *) SP_PARM, on ? "on" : "off"));
@@ -1422,7 +1422,7 @@ mouse_activate(SCREEN *sp, int on)
 #if NCURSES_EXT_FUNCS
 	    NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on);
 #endif
-	    enable_xterm_mouse(sp, 1);
+	    enable_xterm_mouse(sp, TRUE);
 	    break;
 #if USE_GPM_SUPPORT
 	case M_GPM:
@@ -1462,7 +1462,7 @@ mouse_activate(SCREEN *sp, int on)
 
 	switch (sp->_mouse_type) {
 	case M_XTERM:
-	    enable_xterm_mouse(sp, 0);
+	    enable_xterm_mouse(sp, FALSE);
 	    break;
 #if USE_GPM_SUPPORT
 	case M_GPM:
diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 2ec3c8941..0993312e6 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -49,7 +49,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.105 2024/05/11 19:06:59 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.106 2024/11/23 18:33:35 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -212,7 +212,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 	   TINFO_SETUP_TERM(&new_term, name,
 			    fileno(_ofp), &errret, FALSE) != ERR) {
 	int slk_format;
-	int filter_mode;
+	bool filter_mode;
 
 	_nc_set_screen(0);
 #ifdef USE_TERM_DRIVER
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 9286f71fb..18f7b4336 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.188 2024/11/09 16:36:29 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.189 2024/11/23 18:33:50 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -315,7 +315,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 				     int slines,
 				     int scolumns,
 				     FILE *output,
-				     int filtered,
+				     bool filtered,
 				     int slk_format)
 {
 #ifndef USE_TERM_DRIVER
@@ -766,7 +766,7 @@ NCURSES_EXPORT(int)
 _nc_setupscreen(int slines GCC_UNUSED,
 		int scolumns GCC_UNUSED,
 		FILE *output,
-		int filtered,
+		bool filtered,
 		int slk_format)
 {
     SCREEN *sp = 0;
diff --git a/ncurses/base/lib_touch.c b/ncurses/base/lib_touch.c
index d8d59e138..130a76d6a 100644
--- a/ncurses/base/lib_touch.c
+++ b/ncurses/base/lib_touch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_touch.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_touch.c,v 1.17 2024/11/23 19:17:05 tom Exp $")
 
 #undef is_linetouched
 
@@ -55,10 +55,10 @@ is_linetouched(WINDOW *win, int line)
 
     /* XSI doesn't define any error, and gcc ultimately made it impossible */
     if (!win || (line > win->_maxy) || (line < 0)) {
-	returnCode(FALSE);
+	returnBool(FALSE);
     }
 
-    returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
+    returnBool(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
 }
 
 NCURSES_EXPORT(bool)
@@ -71,9 +71,9 @@ is_wintouched(WINDOW *win)
 
 	for (i = 0; i <= win->_maxy; i++)
 	    if (win->_line[i].firstchar != _NOCHANGE)
-		returnCode(TRUE);
+		returnBool(TRUE);
     }
-    returnCode(FALSE);
+    returnBool(FALSE);
 }
 
 NCURSES_EXPORT(int)
diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index e54b7df64..6312412ca 100644
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.56 2024/09/22 20:25:15 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.57 2024/11/23 18:35:34 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -103,7 +103,7 @@ NCURSES_EXPORT(bool)
 NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols)
 {
     T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
-    returnCode(ToLines > 0
+    returnBool(ToLines > 0
 	       && ToCols > 0
 	       && SP_PARM != NULL
 	       && (ToLines != screen_lines(SP_PARM)
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 1e148f3d4..eb82dd0bb 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.694 2024/10/19 21:23:40 tom Exp $
+ * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $
  *
  *	curses.priv.h
  *
@@ -1733,7 +1733,7 @@ typedef void VoidFunc(void);
 #define returnPtrDB(rc)		do { TR(TRACE_DATABASE,(T_RETURN("%p"), (rc))); return (rc); } while (0)
 #define returnVoidDB		do { TR(TRACE_DATABASE,(T_RETURN(""))); return; } while (0)
 
-extern NCURSES_EXPORT(NCURSES_BOOL)     _nc_retrace_bool (int);
+extern NCURSES_EXPORT(bool)             _nc_retrace_bool (bool);
 extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *);
 extern NCURSES_EXPORT(SCREEN *)         _nc_retrace_sp (SCREEN *);
 extern NCURSES_EXPORT(WINDOW *)         _nc_retrace_win (WINDOW *);
@@ -2067,7 +2067,7 @@ extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *);
 
 /* lib_setup.c */
 extern NCURSES_EXPORT(char *) _nc_get_locale(void);
-extern NCURSES_EXPORT(int)    _nc_unicode_locale(void);
+extern NCURSES_EXPORT(bool)   _nc_unicode_locale(void);
 extern NCURSES_EXPORT(int)    _nc_locale_breaks_acs(TERMINAL *);
 extern NCURSES_EXPORT(int)    _nc_setupterm(const char *, int, int *, int);
 extern NCURSES_EXPORT(void)   _nc_tinfo_cmdch(TERMINAL *, int);
@@ -2161,7 +2161,7 @@ extern NCURSES_EXPORT(int) _nc_access (const char *, int);
 extern NCURSES_EXPORT(int) _nc_baudrate (int);
 extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
 extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
-extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int);
+extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
 extern NCURSES_EXPORT(int) _nc_ospeed (int);
 extern NCURSES_EXPORT(int) _nc_outch (int);
 extern NCURSES_EXPORT(int) _nc_putchar (int);
@@ -2169,7 +2169,7 @@ extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *);
 extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *);
 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const);
 extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
-extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
+extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
 extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
 extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
 extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
@@ -2627,7 +2627,7 @@ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const c
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int));
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int);
+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
 extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC);
 extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t);
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index 5069c2222..19eecc5fe 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -1475,7 +1475,7 @@ int	mouseinterval(
 
 #undef _nc_has_mouse
 NCURSES_BOOL _nc_has_mouse(
-		SCREEN	*sp)
+		const SCREEN *sp)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef has_mouse_sp
@@ -2032,7 +2032,7 @@ int	_nc_setupscreen_sp(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -2041,7 +2041,7 @@ int	_nc_setupscreen(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -2994,7 +2994,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE *tterm)
+		const TERMTYPE *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -3339,7 +3339,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -3525,8 +3525,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -3848,7 +3848,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -4054,7 +4054,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 7c8bac9c4..19dbf157f 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -1484,7 +1484,7 @@ int	mouseinterval(
 
 #undef _nc_has_mouse
 NCURSES_BOOL _nc_has_mouse(
-		SCREEN	*sp)
+		const SCREEN *sp)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef has_mouse_sp
@@ -2041,7 +2041,7 @@ int	_nc_setupscreen_sp(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -2050,7 +2050,7 @@ int	_nc_setupscreen(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -3008,7 +3008,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE *tterm)
+		const TERMTYPE *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -3394,7 +3394,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -3602,8 +3602,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -3947,7 +3947,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -4164,7 +4164,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 3aa57eee9..aa0ad9482 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -2065,7 +2065,7 @@ int	mouseinterval(
 
 #undef _nc_has_mouse
 NCURSES_BOOL _nc_has_mouse(
-		SCREEN	*sp)
+		const SCREEN *sp)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef has_mouse_sp
@@ -2622,7 +2622,7 @@ int	_nc_setupscreen_sp(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -2631,7 +2631,7 @@ int	_nc_setupscreen(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -3581,7 +3581,7 @@ void	_nc_free_ordered_pairs(
 void	_nc_reset_color_pair(
 		SCREEN	*sp,
 		int	pair,
-		colorpair_t *next)
+		const colorpair_t *next)
 		{ /* void */ }
 
 #undef _nc_set_color_pair
@@ -3959,7 +3959,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE2 *tterm)
+		const TERMTYPE2 *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -4355,7 +4355,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -4563,8 +4563,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -4908,7 +4908,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -5136,7 +5136,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index dbf535db4..f2e039943 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -2056,7 +2056,7 @@ int	mouseinterval(
 
 #undef _nc_has_mouse
 NCURSES_BOOL _nc_has_mouse(
-		SCREEN	*sp)
+		const SCREEN *sp)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef has_mouse_sp
@@ -2613,7 +2613,7 @@ int	_nc_setupscreen_sp(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -2622,7 +2622,7 @@ int	_nc_setupscreen(
 		int	slines,
 		int	scolumns,
 		FILE	*output,
-		int	filtered,
+		NCURSES_BOOL filtered,
 		int	slk_format)
 		{ return(*(int *)0); }
 
@@ -3572,7 +3572,7 @@ void	_nc_free_ordered_pairs(
 void	_nc_reset_color_pair(
 		SCREEN	*sp,
 		int	pair,
-		colorpair_t *next)
+		const colorpair_t *next)
 		{ /* void */ }
 
 #undef _nc_set_color_pair
@@ -3945,7 +3945,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE2 *tterm)
+		const TERMTYPE2 *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -4300,7 +4300,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -4486,8 +4486,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -4809,7 +4809,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -5026,7 +5026,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index 5cfa111a2..9adcfcfff 100644
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -265,7 +265,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE *tterm)
+		const TERMTYPE *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -610,7 +610,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -796,8 +796,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -1119,7 +1119,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -1325,7 +1325,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 94ca9a7f0..77c31240d 100644
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -270,7 +270,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE *tterm)
+		const TERMTYPE *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -656,7 +656,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -864,8 +864,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -1209,7 +1209,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -1426,7 +1426,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw
index 3b21b8765..43b4f4b60 100644
--- a/ncurses/llib-ltinfotw
+++ b/ncurses/llib-ltinfotw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -282,7 +282,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE2 *tterm)
+		const TERMTYPE2 *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -678,7 +678,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -886,8 +886,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -1231,7 +1231,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -1459,7 +1459,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow
index fd3081807..07f2f47ef 100644
--- a/ncurses/llib-ltinfow
+++ b/ncurses/llib-ltinfow
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -277,7 +277,7 @@ ENTRY	*_nc_tail;
 #undef _nc_free_entry
 void	_nc_free_entry(
 		ENTRY	*headp,
-		TERMTYPE2 *tterm)
+		const TERMTYPE2 *tterm)
 		{ /* void */ }
 
 #undef _nc_free_entries
@@ -632,7 +632,7 @@ int	_nc_putp_flush_sp(
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp,
-		int	flag)
+		NCURSES_BOOL flag)
 		{ return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
@@ -818,8 +818,8 @@ char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
 
 #undef _nc_unicode_locale
-int	_nc_unicode_locale(void)
-		{ return(*(int *)0); }
+NCURSES_BOOL _nc_unicode_locale(void)
+		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_locale_breaks_acs
 int	_nc_locale_breaks_acs(
@@ -1141,7 +1141,7 @@ void	_tracef(
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-		int	code)
+		NCURSES_BOOL code)
 		{ return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_retrace_char
@@ -1358,7 +1358,7 @@ int	resetty(void)
 
 #undef _nc_timed_wait
 int	_nc_timed_wait(
-		SCREEN	*sp,
+		const SCREEN *sp,
 		int	mode,
 		int	milliseconds,
 		int	*timeleft)
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index a4c332a63..6c7e82022 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.124 2024/11/23 18:45:01 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -61,7 +61,7 @@ MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $")
 
 #define iswhite(ch)	(ch == ' '  ||  ch == '\t')
 
-NCURSES_EXPORT_VAR (int) _nc_syntax = 0;         /* termcap or terminfo? */
+NCURSES_EXPORT_VAR (int) _nc_syntax = SYN_TERMINFO;  /* termcap or terminfo? */
 NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1;  /* ncurses extended termcap? */
 NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */
 NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */
diff --git a/ncurses/tinfo/lib_has_cap.c b/ncurses/tinfo/lib_has_cap.c
index cbf68b316..9f436675f 100644
--- a/ncurses/tinfo/lib_has_cap.c
+++ b/ncurses/tinfo/lib_has_cap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_has_cap.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_has_cap.c,v 1.12 2024/11/23 19:17:15 tom Exp $")
 
 NCURSES_EXPORT(bool)
 NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
@@ -62,7 +62,7 @@ NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
 		&& (delete_character || parm_dch)) ? TRUE : FALSE;
     }
 
-    returnCode(code);
+    returnBool(code);
 }
 
 #if NCURSES_SP_FUNCS
@@ -83,7 +83,7 @@ NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0)
 		&& (delete_line || parm_delete_line)) ? TRUE : FALSE;
     }
 
-    returnCode(code);
+    returnBool(code);
 }
 
 #if NCURSES_SP_FUNCS
diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index 6a8bb3948..053e9a0c1 100644
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_options.c,v 1.83 2023/04/29 18:56:12 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.84 2024/11/23 19:17:25 tom Exp $")
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
@@ -330,7 +330,7 @@ _nc_putp_flush(const char *name, const char *value)
  * the terminal state _before_ switching modes.
  */
 NCURSES_EXPORT(int)
-_nc_keypad(SCREEN *sp, int flag)
+_nc_keypad(SCREEN *sp, bool flag)
 {
     int rc = ERR;
 
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 54fbe7522..954f2d2b7 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.245 2024/10/19 21:17:36 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.246 2024/11/23 18:32:54 tom Exp $")
 
 /****************************************************************************
  *
@@ -751,24 +751,24 @@ _nc_get_locale(void)
 /*
  * Check if we are running in a UTF-8 locale.
  */
-NCURSES_EXPORT(int)
+NCURSES_EXPORT(bool)
 _nc_unicode_locale(void)
 {
     static bool initialized = FALSE;
-    static int result = 0;
+    static bool result = FALSE;
 
     if (!initialized) {
 #if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT
-	result = 1;
+	result = TRUE;
 #elif HAVE_LANGINFO_CODESET
 	char *env = nl_langinfo(CODESET);
-	result = !strcmp(env, "UTF-8");
+	result = !strcmp(env, "UTF-8") ? TRUE : FALSE;
 	T(("_nc_unicode_locale(%s) ->%d", env, result));
 #else
 	char *env = _nc_get_locale();
 	if (env != 0) {
 	    if (strstr(env, ".UTF-8") != 0) {
-		result = 1;
+		result = TRUE;
 		T(("_nc_unicode_locale(%s) ->%d", env, result));
 	    }
 	}
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 23433697a..c824eb8e3 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.110 2024/10/19 21:22:04 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.111 2024/11/23 18:49:08 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -395,7 +395,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 	} else {
 	    /* normal token lookup */
 	    entry_ptr = _nc_find_entry(_nc_curr_token.tk_name,
-				       _nc_get_hash_table(_nc_syntax));
+				       _nc_get_hash_table(_nc_syntax == SYN_TERMCAP));
 
 	    /*
 	     * Our kluge to handle aliasing.  The reason it is done
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 680187de9..db8609f58 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.108 2024/11/23 18:40:23 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -295,8 +295,8 @@ _tracef(const char *fmt, ...)
 }
 
 /* Trace 'bool' return-values */
-NCURSES_EXPORT(NCURSES_BOOL)
-_nc_retrace_bool(int code)
+NCURSES_EXPORT(bool)
+_nc_retrace_bool(bool code)
 {
     T((T_RETURN("%s"), code ? "TRUE" : "FALSE"));
     return code;
diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index 9c879dc67..029b9ad80 100644
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -40,7 +40,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracechr.c,v 1.24 2024/02/04 00:11:35 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.25 2024/11/23 19:50:34 tom Exp $")
 
 #ifdef TRACE
 
@@ -59,7 +59,7 @@ _nc_tracechar(SCREEN *sp, int ch)
 	if (name == 0 || *name == '\0')
 	    name = "NULL";
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
-		    "'%.30s' = \\x%02x", name, ch);
+		    "'%.30s' = \\x%02x", name, UChar(ch));
     } else if (!is8bits(ch)
 	       || (_nc_unicode_locale() && !is7bits(ch))
 	       || !isprint(UChar(ch))) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index f89695100..2f180ad32 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241109) unstable; urgency=low
+ncurses6td (6.5+20241123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index f89695100..2f180ad32 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241109) unstable; urgency=low
+ncurses6td (6.5+20241123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 4d9eda7ef..3c3e8651f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241109) unstable; urgency=low
+ncurses6td (6.5+20241123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Nov 2024 06:12:30 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index c51ea2fff..40b9e4fbb 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.675 2024/11/09 11:12:30 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1109"
+!define VERSION_MMDD  "1123"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 8791a6476..0c8c5b923 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241109
+Release: 20241123
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index c0cd8eaf3..20e315fbe 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241109
+Release: 20241123
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 8c8bde2c0..e6b2d6c0e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241109
+Release: 20241123
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index b7f90ec7b..a677e202e 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.167 2024/11/09 19:33:50 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -1344,7 +1344,7 @@ dump_initializers(const TERMTYPE2 *term)
 	    char buf[MAX_STRING], *sp, *tp;
 
 	    tp = buf;
-#define TP_LIMIT	((MAX_STRING - 5) - (size_t)(tp - buf))
+#define TP_LIMIT	((MAX_STRING - 6) - (size_t)(tp - buf))
 	    *tp++ = '"';
 	    for (sp = term->Strings[n];
 		 *sp != 0 && TP_LIMIT > 2;
diff --git a/progs/toe.c b/progs/toe.c
index f46224a9e..76f3707fb 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -45,7 +45,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.90 2024/10/19 22:00:53 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.91 2024/11/23 20:09:23 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -436,7 +436,7 @@ typelist(int eargc, char *eargv[],
 		    continue;
 		}
 
-		cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3;
+		cwd_len = strlen(name_1) + strlen(eargv[i]) + 3;
 		cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
 		if (cwd_buf == 0)
 		    failed("realloc cwd_buf");
diff --git a/progs/tput.c b/progs/tput.c
index f9321b60a..466beedfa 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.104 2024/04/20 22:20:51 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -182,8 +182,8 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	    NCURSES_INT2 my_rows = lines;
 	    NCURSES_INT2 my_cols = columns;
 	    set_window_size(fd, &my_rows, &my_cols);
-	    lines = my_rows;
-	    columns = my_cols;
+	    lines = (short) my_rows;
+	    columns = (short) my_cols;
 	}
 #else
 	(void) fd;
diff --git a/progs/tset.c b/progs/tset.c
index c143504d2..8ed82f04d 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.136 2024/10/19 21:40:28 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -872,8 +872,8 @@ main(int argc, char **argv)
 	    NCURSES_INT2 my_rows = lines;
 	    NCURSES_INT2 my_cols = columns;
 	    set_window_size(my_fd, &my_rows, &my_cols);
-	    lines = my_rows;
-	    columns = my_cols;
+	    lines = (short) my_rows;
+	    columns = (short) my_cols;
 	}
 #endif
 	if (opt_c) {
diff --git a/test/demo_panels.c b/test/demo_panels.c
index 2e5d6b27a..853f28bf0 100644
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.51 2024/11/09 22:54:38 tom Exp $
+ * $Id: demo_panels.c,v 1.52 2024/11/23 19:07:23 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -509,7 +509,7 @@ show_panels(PANEL *px[MAX_PANELS + 1])
     for (j = 1; j <= MAX_PANELS; ++j) {
 	table[j].valid = (px[j] != 0);
 	if (table[j].valid) {
-	    table[j].hidden = panel_hidden(px[j]);
+	    table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE;
 	    table[j].above = panel_above(px[j]);
 	    table[j].below = panel_below(px[j]);
 	}
diff --git a/test/test_opaque.c b/test/test_opaque.c
index cc8d657d6..3a032fbe2 100644
--- a/test/test_opaque.c
+++ b/test/test_opaque.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_opaque.c,v 1.16 2024/10/05 19:27:33 tom Exp $
+ * $Id: test_opaque.c,v 1.17 2024/11/23 19:10:23 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -79,7 +79,7 @@ static bool
 test_opaque_idcok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	idcok(win, mode);
+	idcok(win, (bool) mode);
     }
     return is_idcok(win);
 }
@@ -88,7 +88,7 @@ static bool
 test_opaque_idlok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	idlok(win, mode);
+	idlok(win, (bool) mode);
     }
     return is_idlok(win);
 }
@@ -97,7 +97,7 @@ static bool
 test_opaque_immedok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	immedok(win, mode);
+	immedok(win, (bool) mode);
     }
     return is_immedok(win);
 }
@@ -106,7 +106,7 @@ static bool
 test_opaque_keypad(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	keypad(win, mode);
+	keypad(win, (bool) mode);
     }
     return is_keypad(win);
 }
@@ -115,7 +115,7 @@ static bool
 test_opaque_leaveok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	leaveok(win, mode);
+	leaveok(win, (bool) mode);
     }
     return is_leaveok(win);
 }
@@ -124,7 +124,7 @@ static bool
 test_opaque_nodelay(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	nodelay(win, mode);
+	nodelay(win, (bool) mode);
     }
     return is_nodelay(win);
 }
@@ -133,7 +133,7 @@ static bool
 test_opaque_notimeout(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	notimeout(win, mode);
+	notimeout(win, (bool) mode);
     }
     return is_notimeout(win);
 }
@@ -142,7 +142,7 @@ static bool
 test_opaque_scrollok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	scrollok(win, mode);
+	scrollok(win, (bool) mode);
     }
     return is_scrollok(win);
 }
@@ -151,7 +151,7 @@ static bool
 test_opaque_syncok(WINDOW *win, int mode)
 {
     if (mode >= 0) {
-	syncok(win, mode);
+	syncok(win, (bool) mode);
     }
     return is_syncok(win);
 }

From f9c5ab493af1e54aeeb0038ba046d2623156891e Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 1 Dec 2024 02:12:32 +0100
Subject: [PATCH 092/106] ncurses-6.5-20241130.patch.gz

---
 NEWS                             |    9 +-
 VERSION                          |    2 +-
 aclocal.m4                       |    9 +-
 configure                        | 4461 +++++++++++++++---------------
 dist.mk                          |    4 +-
 form/fld_def.c                   |    6 +-
 form/fld_dup.c                   |    6 +-
 menu/mf_common.h                 |    6 +-
 ncurses/base/lib_addch.c         |    4 +-
 ncurses/curses.priv.h            |    4 +-
 ncurses/tinfo/comp_expand.c      |    6 +-
 ncurses/tinfo/hashed_db.c        |    4 +-
 ncurses/trace/visbuf.c           |    6 +-
 ncurses/win32con/win_driver.c    |   13 +-
 package/debian-mingw/changelog   |    4 +-
 package/debian-mingw64/changelog |    4 +-
 package/debian/changelog         |    4 +-
 package/mingw-ncurses.nsi        |    4 +-
 package/mingw-ncurses.spec       |    2 +-
 package/ncurses.spec             |    2 +-
 package/ncursest.spec            |    2 +-
 progs/infocmp.c                  |    4 +-
 progs/tic.c                      |   10 +-
 progs/tput.c                     |    8 +-
 progs/tset.c                     |    4 +-
 test/aclocal.m4                  |    9 +-
 test/back_ground.c               |   12 +-
 test/background.c                |   12 +-
 test/bs.c                        |    8 +-
 test/cardfile.c                  |    8 +-
 test/color_content.c             |   12 +-
 test/combine.c                   |   22 +-
 test/configure                   | 3449 +++++++++++------------
 test/demo_menus.c                |    8 +-
 test/demo_tabs.c                 |   10 +-
 test/demo_termcap.c              |    6 +-
 test/demo_terminfo.c             |    6 +-
 test/dots_curses.c               |    6 +-
 test/dots_xcurses.c              |    4 +-
 test/filter.c                    |   14 +-
 test/gdc.c                       |    4 +-
 test/hashtest.c                  |   22 +-
 test/list_keys.c                 |    6 +-
 test/ncurses.c                   |   12 +-
 test/padview.c                   |   14 +-
 test/pair_content.c              |   12 +-
 test/picsmap.c                   |   10 +-
 test/savescreen.c                |    4 +-
 test/test_arrays.c               |   32 +-
 test/test_endwin.c               |   12 +-
 test/test_mouse.c                |    6 +-
 test/view.c                      |   14 +-
 test/worm.c                      |   33 +-
 53 files changed, 4182 insertions(+), 4173 deletions(-)

diff --git a/NEWS b/NEWS
index 9c8a694ff..11c4d8447 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 tom Exp $
+-- $Id: NEWS,v 1.4207 2024/11/30 19:41:55 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241130
+	+ improve configure check for lint program.
+	+ adjust options in test-programs to allow for consistent use of -c/-l
+	  for command/logging.
+	+ modify win_driver.c for MinGW to handle shift-tab and control-tab as
+	  back-tab (report by Axel Reinhold)
+
 20241123
 	+ remove dependency on stdbool.h from configure script check for type
 	  of bool when C++ binding is omitted (report by Sam James).
diff --git a/VERSION b/VERSION
index 9bacf90cb..f64e28d71 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241123
+5:0:10	6.5	20241130
diff --git a/aclocal.m4 b/aclocal.m4
index a8a72f958..283c9a802 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1090 2024/11/09 23:12:47 tom Exp $
+dnl $Id: aclocal.m4,v 1.1091 2024/11/30 19:41:19 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -7169,14 +7169,17 @@ fi
 AC_SUBST(LDCONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
+dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
 AC_CHECK_PROGS(LINT, lint cppcheck splint)
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 AC_SUBST(LINT_OPTS)
diff --git a/configure b/configure
index 4f4c1a619..2a28320c9 100755
--- a/configure
+++ b/configure
@@ -4220,23 +4220,26 @@ fi
 done
 
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 
-echo "$as_me:4228: checking whether ln -s works" >&5
+echo "$as_me:4231: 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:4232: result: yes" >&5
+  echo "$as_me:4235: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:4235: result: no, using $LN_S" >&5
+  echo "$as_me:4238: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:4239: checking if $LN_S -f options work" >&5
+echo "$as_me:4242: 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
@@ -4248,12 +4251,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:4251: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4254: 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:4256: checking for long file names" >&5
+echo "$as_me:4259: 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
@@ -4292,7 +4295,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4295: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4298: 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
 
@@ -4311,7 +4314,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4314: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4317: 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"
@@ -4321,7 +4324,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4324: checking if you want to use pkg-config" >&5
+echo "$as_me:4327: 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.
@@ -4331,7 +4334,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4334: result: $cf_pkg_config" >&5
+echo "$as_me:4337: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4343,7 +4346,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4346: checking for $ac_word" >&5
+echo "$as_me:4349: 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
@@ -4360,7 +4363,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4363: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4366: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4371,10 +4374,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4374: result: $PKG_CONFIG" >&5
+  echo "$as_me:4377: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4377: result: no" >&5
+  echo "$as_me:4380: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4383,7 +4386,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4386: 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_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4400,7 +4403,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4403: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4406: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4412,10 +4415,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4418: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4418: result: no" >&5
+  echo "$as_me:4421: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4456,24 +4459,24 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4459: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4462: 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:4466: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4469: 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:4472: checking for pkg-config library directory" >&5
+	echo "$as_me:4475: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4479: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4500,7 +4503,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4506: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4511,16 +4514,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4517: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4519: result: auto" >&5
+	echo "$as_me:4522: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4523: checking for search-list" >&5
+	echo "$as_me:4526: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4555,11 +4558,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4558: result: $cf_search_path" >&5
+	echo "$as_me:4561: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4565: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4567,7 +4570,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4570: checking for first directory" >&5
+	echo "$as_me:4573: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4578,7 +4581,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4581: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4584: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4588,7 +4591,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4591: checking for workaround" >&5
+		echo "$as_me:4594: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4611,17 +4614,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4617: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4621: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4624: 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:4624: checking if we should install .pc files" >&5
+	echo "$as_me:4627: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4632,7 +4635,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4635: result: $enable_pc_files" >&5
+echo "$as_me:4638: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4640,7 +4643,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4646: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4669,7 +4672,7 @@ case "x$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4672: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4675: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4683,7 +4686,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4686: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4689: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4698,13 +4701,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4704: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4707: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4710: 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.
@@ -4714,11 +4717,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4717: result: $enable_mixedcase" >&5
+echo "$as_me:4720: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4721: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4724: 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
@@ -4745,7 +4748,7 @@ else
 fi
 
 fi
-echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4751: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4764,7 +4767,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4767: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4770: 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
@@ -4784,16 +4787,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4787: result: yes" >&5
+  echo "$as_me:4790: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4791: result: no" >&5
+  echo "$as_me:4794: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4796: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4799: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4848,7 +4851,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4854: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4859,7 +4862,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4862: checking for $ac_word" >&5
+echo "$as_me:4865: 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
@@ -4874,7 +4877,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4877: found $ac_dir/$ac_word" >&5
+echo "$as_me:4880: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4882,10 +4885,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4885: result: $CTAGS" >&5
+  echo "$as_me:4888: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4888: result: no" >&5
+  echo "$as_me:4891: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4896,7 +4899,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4899: checking for $ac_word" >&5
+echo "$as_me:4902: 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
@@ -4911,7 +4914,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4914: found $ac_dir/$ac_word" >&5
+echo "$as_me:4917: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4919,10 +4922,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4922: result: $ETAGS" >&5
+  echo "$as_me:4925: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4925: result: no" >&5
+  echo "$as_me:4928: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4931,7 +4934,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4934: checking for $ac_word" >&5
+echo "$as_me:4937: 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
@@ -4946,7 +4949,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4949: found $ac_dir/$ac_word" >&5
+echo "$as_me:4952: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4955,17 +4958,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4961: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4961: result: no" >&5
+  echo "$as_me:4964: 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:4968: checking for $ac_word" >&5
+echo "$as_me:4971: 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
@@ -4980,7 +4983,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4983: found $ac_dir/$ac_word" >&5
+echo "$as_me:4986: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4989,10 +4992,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4995: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4995: result: no" >&5
+  echo "$as_me:4998: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5012,7 +5015,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:5015: checking for makeflags variable" >&5
+echo "$as_me:5018: 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
@@ -5042,7 +5045,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -5050,13 +5053,13 @@ echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:5053: result: $cf_cv_makeflags" >&5
+echo "$as_me:5056: 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:5059: checking for $ac_word" >&5
+echo "$as_me:5062: 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
@@ -5071,7 +5074,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5074: found $ac_dir/$ac_word" >&5
+echo "$as_me:5077: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5079,10 +5082,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5082: result: $RANLIB" >&5
+  echo "$as_me:5085: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5085: result: no" >&5
+  echo "$as_me:5088: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5091,7 +5094,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5094: checking for $ac_word" >&5
+echo "$as_me:5097: 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
@@ -5106,7 +5109,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5109: found $ac_dir/$ac_word" >&5
+echo "$as_me:5112: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5115,10 +5118,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5121: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5121: result: no" >&5
+  echo "$as_me:5124: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5130,7 +5133,7 @@ fi
 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:5133: checking for $ac_word" >&5
+echo "$as_me:5136: 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
@@ -5145,7 +5148,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:5148: found $ac_dir/$ac_word" >&5
+echo "$as_me:5151: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5153,10 +5156,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:5156: result: $LD" >&5
+  echo "$as_me:5159: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:5159: result: no" >&5
+  echo "$as_me:5162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5165,7 +5168,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:5168: checking for $ac_word" >&5
+echo "$as_me:5171: 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
@@ -5180,7 +5183,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:5183: found $ac_dir/$ac_word" >&5
+echo "$as_me:5186: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5189,10 +5192,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:5192: result: $ac_ct_LD" >&5
+  echo "$as_me:5195: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:5195: result: no" >&5
+  echo "$as_me:5198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5204,7 +5207,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5207: checking for $ac_word" >&5
+echo "$as_me:5210: 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
@@ -5219,7 +5222,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5222: found $ac_dir/$ac_word" >&5
+echo "$as_me:5225: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5227,10 +5230,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5230: result: $AR" >&5
+  echo "$as_me:5233: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5233: result: no" >&5
+  echo "$as_me:5236: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5239,7 +5242,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5242: checking for $ac_word" >&5
+echo "$as_me:5245: 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
@@ -5254,7 +5257,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5257: found $ac_dir/$ac_word" >&5
+echo "$as_me:5260: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5263,10 +5266,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5266: result: $ac_ct_AR" >&5
+  echo "$as_me:5269: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5269: result: no" >&5
+  echo "$as_me:5272: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5278,7 +5281,7 @@ fi
 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:5281: checking for $ac_word" >&5
+echo "$as_me:5284: 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
@@ -5293,7 +5296,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5296: found $ac_dir/$ac_word" >&5
+echo "$as_me:5299: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5301,10 +5304,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5304: result: $NM" >&5
+  echo "$as_me:5307: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5307: result: no" >&5
+  echo "$as_me:5310: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5313,7 +5316,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5316: checking for $ac_word" >&5
+echo "$as_me:5319: 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
@@ -5328,7 +5331,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5331: found $ac_dir/$ac_word" >&5
+echo "$as_me:5334: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5337,10 +5340,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5340: result: $ac_ct_NM" >&5
+  echo "$as_me:5343: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5343: result: no" >&5
+  echo "$as_me:5346: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5352,7 +5355,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5355: checking for $ac_word" >&5
+echo "$as_me:5358: 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
@@ -5367,7 +5370,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5370: found $ac_dir/$ac_word" >&5
+echo "$as_me:5373: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5375,10 +5378,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5378: result: $AR" >&5
+  echo "$as_me:5381: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5381: result: no" >&5
+  echo "$as_me:5384: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5387,7 +5390,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5390: checking for $ac_word" >&5
+echo "$as_me:5393: 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
@@ -5402,7 +5405,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5405: found $ac_dir/$ac_word" >&5
+echo "$as_me:5408: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5411,10 +5414,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5414: result: $ac_ct_AR" >&5
+  echo "$as_me:5417: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5417: result: no" >&5
+  echo "$as_me:5420: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5423,7 +5426,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5426: checking for options to update archives" >&5
+echo "$as_me:5429: 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
@@ -5460,13 +5463,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5463 "configure"
+#line 5466 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5469: \$? = $ac_status" >&5
+  echo "$as_me:5472: \$? = $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
@@ -5477,7 +5480,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5487,7 +5490,7 @@ echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5493: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5498,7 +5501,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5501: checking for an installation directory prefix" >&5
+echo "$as_me:5504: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5511,10 +5514,10 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5517: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
-echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
+echo "$as_me:5520: checking if installation directory prefix should be merged" >&5
 echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
 
 # Check whether --enable-install-prefix or --disable-install-prefix was given.
@@ -5531,7 +5534,7 @@ else
 	cf_install_prefix=no
 
 fi;
-echo "$as_me:5534: result: $cf_install_prefix" >&5
+echo "$as_me:5537: result: $cf_install_prefix" >&5
 echo "${ECHO_T}$cf_install_prefix" >&6
 
 if test "$cf_install_prefix" = yes ; then
@@ -5572,7 +5575,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5575: checking for $ac_word" >&5
+echo "$as_me:5578: 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
@@ -5587,7 +5590,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5590: found $ac_dir/$ac_word" >&5
+echo "$as_me:5593: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5595,10 +5598,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5598: result: $BUILD_CC" >&5
+  echo "$as_me:5601: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5601: result: no" >&5
+  echo "$as_me:5604: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5607,12 +5610,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5610: checking for native build C compiler" >&5
+	echo "$as_me:5613: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5612: result: $BUILD_CC" >&5
+	echo "$as_me:5615: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5615: checking for native build C preprocessor" >&5
+	echo "$as_me:5618: 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.
@@ -5622,10 +5625,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5625: result: $BUILD_CPP" >&5
+	echo "$as_me:5628: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5628: checking for native build C flags" >&5
+	echo "$as_me:5631: 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.
@@ -5633,10 +5636,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5639: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5639: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5642: 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.
@@ -5644,10 +5647,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5650: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5650: checking for native build linker-flags" >&5
+	echo "$as_me:5653: 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.
@@ -5655,10 +5658,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5661: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5661: checking for native build linker-libraries" >&5
+	echo "$as_me:5664: 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.
@@ -5666,7 +5669,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5669: result: $BUILD_LIBS" >&5
+	echo "$as_me:5672: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5675,7 +5678,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5678: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5681: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5689,7 +5692,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5692 "configure"
+#line 5695 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5699,15 +5702,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5705: \$? = $ac_status" >&5
+  echo "$as_me:5708: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5710: \$? = $ac_status" >&5
+  echo "$as_me:5713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5722,12 +5725,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5725: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5728: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5730: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5733: 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;}
@@ -5752,7 +5755,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5755: checking if libtool -version-number should be used" >&5
+echo "$as_me:5758: 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.
@@ -5769,7 +5772,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5772: result: $cf_libtool_version" >&5
+echo "$as_me:5775: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5778,25 +5781,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5781: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5784: 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}:5788: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5791: 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}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5798: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5802: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5818,7 +5821,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5821: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5824: 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.
@@ -5828,7 +5831,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5831: result: $with_libtool" >&5
+echo "$as_me:5834: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5857,7 +5860,7 @@ case "x$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5863: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5870,7 +5873,7 @@ esac
   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:5873: checking for $ac_word" >&5
+echo "$as_me:5876: 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
@@ -5885,7 +5888,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5888: found $ac_dir/$ac_word" >&5
+echo "$as_me:5891: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5893,10 +5896,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5896: result: $LIBTOOL" >&5
+  echo "$as_me:5899: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5899: result: no" >&5
+  echo "$as_me:5902: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5909,7 +5912,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5912: checking for $ac_word" >&5
+echo "$as_me:5915: 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
@@ -5924,7 +5927,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5927: found $ac_dir/$ac_word" >&5
+echo "$as_me:5930: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5932,10 +5935,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5938: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5938: result: no" >&5
+  echo "$as_me:5941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5966,7 +5969,7 @@ unset LIBTOOL
   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:5969: checking for $ac_word" >&5
+echo "$as_me:5972: 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
@@ -5981,7 +5984,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5984: found $ac_dir/$ac_word" >&5
+echo "$as_me:5987: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5989,10 +5992,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5992: result: $LIBTOOL" >&5
+  echo "$as_me:5995: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5995: result: no" >&5
+  echo "$as_me:5998: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6005,7 +6008,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:6008: checking for $ac_word" >&5
+echo "$as_me:6011: 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
@@ -6020,7 +6023,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:6023: found $ac_dir/$ac_word" >&5
+echo "$as_me:6026: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6028,10 +6031,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:6034: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:6034: result: no" >&5
+  echo "$as_me:6037: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6053,7 +6056,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:6056: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6059: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6069,7 +6072,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:6072: checking version of $LIBTOOL" >&5
+	echo "$as_me:6075: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -6080,7 +6083,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6086: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 
 	if test -n "$cf_cv_libtool_version"
@@ -6090,19 +6093,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:6093: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6096: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:6099: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6102: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
 else
-	{ { echo "$as_me:6105: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6108: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6138,7 +6141,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:6141: checking if you want to build shared libraries" >&5
+echo "$as_me:6144: 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.
@@ -6148,11 +6151,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:6151: result: $with_shared" >&5
+echo "$as_me:6154: 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:6155: checking if you want to build static libraries" >&5
+echo "$as_me:6158: 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.
@@ -6162,11 +6165,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:6165: result: $with_normal" >&5
+echo "$as_me:6168: 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:6169: checking if you want to build debug libraries" >&5
+echo "$as_me:6172: 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.
@@ -6176,11 +6179,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:6179: result: $with_debug" >&5
+echo "$as_me:6182: 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:6183: checking if you want to build profiling libraries" >&5
+echo "$as_me:6186: 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.
@@ -6190,7 +6193,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:6193: result: $with_profile" >&5
+echo "$as_me:6196: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -6198,7 +6201,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:6201: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6204: 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.
@@ -6208,26 +6211,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:6211: result: $with_shared_cxx" >&5
+echo "$as_me:6214: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:6218: checking for specified models" >&5
+echo "$as_me:6221: 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:6222: result: $cf_list_models" >&5
+echo "$as_me:6225: 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:6227: checking for default model" >&5
+echo "$as_me:6230: 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:6230: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6233: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -6241,7 +6244,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:6244: checking if you want to have a library-prefix" >&5
+echo "$as_me:6247: 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.
@@ -6251,7 +6254,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:6254: result: $with_lib_prefix" >&5
+echo "$as_me:6257: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -6282,24 +6285,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:6285: checking for PATH separator" >&5
+	echo "$as_me:6288: 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:6292: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6295: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:6296: checking for ANSI C header files" >&5
+echo "$as_me:6299: 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 6302 "configure"
+#line 6305 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6307,13 +6310,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6316: \$? = $ac_status" >&5
+  echo "$as_me:6319: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6335,7 +6338,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6338 "configure"
+#line 6341 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6353,7 +6356,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6356 "configure"
+#line 6359 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6374,7 +6377,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6377 "configure"
+#line 6380 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6400,15 +6403,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6406: \$? = $ac_status" >&5
+  echo "$as_me:6409: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6411: \$? = $ac_status" >&5
+  echo "$as_me:6414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6421,7 +6424,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6427: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6437,28 +6440,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6440: checking for $ac_header" >&5
+echo "$as_me:6443: 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 6446 "configure"
+#line 6449 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6455: \$? = $ac_status" >&5
+  echo "$as_me:6458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6461: \$? = $ac_status" >&5
+  echo "$as_me:6464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6468,7 +6471,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6471: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6478,13 +6481,13 @@ EOF
 fi
 done
 
-echo "$as_me:6481: checking whether exit is declared" >&5
+echo "$as_me:6484: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6487 "configure"
+#line 6490 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6499,16 +6502,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6505: \$? = $ac_status" >&5
+  echo "$as_me:6508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6511: \$? = $ac_status" >&5
+  echo "$as_me:6514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6518,19 +6521,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6521: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6524: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6527: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6530: 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 6533 "configure"
+#line 6536 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6545,16 +6548,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6551: \$? = $ac_status" >&5
+  echo "$as_me:6554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6557: \$? = $ac_status" >&5
+  echo "$as_me:6560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6564,7 +6567,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6567: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6570: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6577,7 +6580,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6580: checking for opendir in -ldir" >&5
+  echo "$as_me:6583: 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
@@ -6585,7 +6588,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6588 "configure"
+#line 6591 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6604,16 +6607,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6610: \$? = $ac_status" >&5
+  echo "$as_me:6613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6616: \$? = $ac_status" >&5
+  echo "$as_me:6619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6624,14 +6627,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6627: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6630: 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:6634: checking for opendir in -lx" >&5
+  echo "$as_me:6637: 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
@@ -6639,7 +6642,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6642 "configure"
+#line 6645 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6658,16 +6661,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6664: \$? = $ac_status" >&5
+  echo "$as_me:6667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6670: \$? = $ac_status" >&5
+  echo "$as_me:6673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6678,7 +6681,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6681: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6684: 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"
@@ -6688,7 +6691,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6691: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6694: 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.
@@ -6698,10 +6701,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6701: result: $with_termlib" >&5
+echo "$as_me:6704: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6704: checking if you want to build a separate tic library" >&5
+echo "$as_me:6707: 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.
@@ -6711,7 +6714,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6714: result: $with_ticlib" >&5
+echo "$as_me:6717: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6724,7 +6727,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6727: checking for default loader flags" >&5
+echo "$as_me:6730: 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=''   ;;
@@ -6733,13 +6736,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6739: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6742: checking if rpath option should be used" >&5
+echo "$as_me:6745: 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.
@@ -6749,10 +6752,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6755: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6755: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6758: 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.
@@ -6762,7 +6765,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6765: result: $cf_cv_do_relink" >&5
+echo "$as_me:6768: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6773,7 +6776,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6776: checking for an rpath option" >&5
+	echo "$as_me:6779: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6804,12 +6807,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6810: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6812: checking if we need a space after rpath option" >&5
+		echo "$as_me:6815: 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"
 
@@ -6830,7 +6833,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6833 "configure"
+#line 6836 "configure"
 #include "confdefs.h"
 
 int
@@ -6842,16 +6845,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6848: \$? = $ac_status" >&5
+  echo "$as_me:6851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6854: \$? = $ac_status" >&5
+  echo "$as_me:6857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6861,7 +6864,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6864: result: $cf_rpath_space" >&5
+		echo "$as_me:6867: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6883,7 +6886,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6886: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6889: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6898,9 +6901,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6901: result: $withval" >&5
+		echo "$as_me:6904: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6903: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6906: 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; }; }
 		;;
@@ -6909,7 +6912,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6915: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6932,14 +6935,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6935: checking which $CC option to use" >&5
+		echo "$as_me:6938: 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 6942 "configure"
+#line 6945 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6951,16 +6954,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6957: \$? = $ac_status" >&5
+  echo "$as_me:6960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6963: \$? = $ac_status" >&5
+  echo "$as_me:6966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6969,7 +6972,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6975: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -7040,7 +7043,7 @@ CF_EOF
 		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:7043: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7046: 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
@@ -7049,7 +7052,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7052 "configure"
+#line 7055 "configure"
 #include "confdefs.h"
 
 int
@@ -7061,16 +7064,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7067: \$? = $ac_status" >&5
+  echo "$as_me:7070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7073: \$? = $ac_status" >&5
+  echo "$as_me:7076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -7081,7 +7084,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:7084: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7087: 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"
@@ -7431,7 +7434,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7434 "configure"
+#line 7437 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7443,16 +7446,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7449: \$? = $ac_status" >&5
+  echo "$as_me:7452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7455: \$? = $ac_status" >&5
+  echo "$as_me:7458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7489,7 +7492,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7495: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7499,7 +7502,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7502 "${as_me:-configure}"
+#line 7505 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7511,18 +7514,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7514: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7517: 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:7516: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7519: \$? = $ac_status" >&5
+  echo "$as_me:7522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7521: result: yes" >&5
+				echo "$as_me:7524: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7525: result: no" >&5
+				echo "$as_me:7528: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7537,17 +7540,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7540: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7543: 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}:7544: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7547: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7550: checking for additional libtool options" >&5
+echo "$as_me:7553: 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.
@@ -7557,7 +7560,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7560: result: $with_libtool_opts" >&5
+echo "$as_me:7563: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7568,7 +7571,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7571: checking if exported-symbols file should be used" >&5
+echo "$as_me:7574: 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.
@@ -7583,7 +7586,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7586: result: $with_export_syms" >&5
+echo "$as_me:7589: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7594,15 +7597,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7597: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7600: 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:7602: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7605: 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 7605 "configure"
+#line 7608 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7614,16 +7617,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7620: \$? = $ac_status" >&5
+  echo "$as_me:7623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7626: \$? = $ac_status" >&5
+  echo "$as_me:7629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7632,18 +7635,18 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7635: result: $cf_cflags_work" >&5
+		echo "$as_me:7638: 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}:7641: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7644: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7646: checking if versioned-symbols file should be used" >&5
+echo "$as_me:7649: 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.
@@ -7661,18 +7664,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7664: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7667: 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:7669: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7672: 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:7675: result: $with_versioned_syms" >&5
+echo "$as_me:7678: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7688,7 +7691,7 @@ then
 		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}:7691: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7694: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7696,11 +7699,11 @@ echo "${as_me:-configure}:7691: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7699: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7702: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7706: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7712,7 +7715,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7715: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7718: 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
 
@@ -7749,7 +7752,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7752 "configure"
+#line 7755 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7780,7 +7783,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7783: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7786: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7793,7 +7796,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7796: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7799: 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.
@@ -7803,27 +7806,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7806: result: $with_gpm" >&5
+echo "$as_me:7809: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7810: checking for gpm.h" >&5
+	echo "$as_me:7813: 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 7816 "configure"
+#line 7819 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7820: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7823: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7826: \$? = $ac_status" >&5
+  echo "$as_me:7829: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7842,7 +7845,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7845: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7848: 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
 
@@ -7853,7 +7856,7 @@ EOF
 		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}:7856: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7859: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7861,7 +7864,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7864: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7867: 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
@@ -7869,7 +7872,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7872 "configure"
+#line 7875 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7888,16 +7891,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7894: \$? = $ac_status" >&5
+  echo "$as_me:7897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7900: \$? = $ac_status" >&5
+  echo "$as_me:7903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7908,18 +7911,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7911: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7914: 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:7918: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7921: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7922: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7925: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7930,7 +7933,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7936: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7939,7 +7942,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7942: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7945: 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.
@@ -7949,18 +7952,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7952: result: $with_dlsym" >&5
+	echo "$as_me:7955: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7957: checking for dlsym" >&5
+echo "$as_me:7960: 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 7963 "configure"
+#line 7966 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7991,16 +7994,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7997: \$? = $ac_status" >&5
+  echo "$as_me:8000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8003: \$? = $ac_status" >&5
+  echo "$as_me:8006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -8010,14 +8013,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8013: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:8016: 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:8020: checking for dlsym in -ldl" >&5
+echo "$as_me:8023: 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
@@ -8025,7 +8028,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8028 "configure"
+#line 8031 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8044,16 +8047,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8050: \$? = $ac_status" >&5
+  echo "$as_me:8053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8056: \$? = $ac_status" >&5
+  echo "$as_me:8059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8064,7 +8067,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8067: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8070: 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
 
@@ -8093,10 +8096,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8096: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8099: 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 8099 "configure"
+#line 8102 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -8114,16 +8117,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8120: \$? = $ac_status" >&5
+  echo "$as_me:8123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8126: \$? = $ac_status" >&5
+  echo "$as_me:8129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8134,15 +8137,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8137: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8140: 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:8142: result: ok" >&5
+	echo "$as_me:8145: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8145: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8148: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8150,12 +8153,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8156: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8158: checking for soname of gpm library" >&5
+echo "$as_me:8161: 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
@@ -8189,15 +8192,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8195: \$? = $ac_status" >&5
+  echo "$as_me:8198: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8200: \$? = $ac_status" >&5
+  echo "$as_me:8203: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8208,7 +8211,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8214: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8276,7 +8279,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8279: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8282: 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
@@ -8284,7 +8287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8287 "configure"
+#line 8290 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8303,16 +8306,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8309: \$? = $ac_status" >&5
+  echo "$as_me:8312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8315: \$? = $ac_status" >&5
+  echo "$as_me:8318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8323,11 +8326,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8326: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8329: 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:8330: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8333: 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
@@ -8351,15 +8354,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8357: \$? = $ac_status" >&5
+  echo "$as_me:8360: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8362: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8362: \$? = $ac_status" >&5
+  echo "$as_me:8365: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8371,11 +8374,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8374: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8377: 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:8378: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8381: 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
 
@@ -8383,7 +8386,7 @@ fi
 
 fi
 
-echo "$as_me:8386: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8389: 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.
@@ -8392,7 +8395,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8395: result: $with_pcre2" >&5
+echo "$as_me:8398: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8403,17 +8406,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8406: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8409: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8412: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8415: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8419: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8537,7 +8540,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8543: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8550,7 +8553,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8553: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8556: 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
@@ -8558,7 +8561,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8561 "configure"
+#line 8564 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8577,16 +8580,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8583: \$? = $ac_status" >&5
+  echo "$as_me:8586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8589: \$? = $ac_status" >&5
+  echo "$as_me:8592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8597,7 +8600,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8600: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8603: 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
 
@@ -8618,7 +8621,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8621: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8624: 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
@@ -8626,7 +8629,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8629 "configure"
+#line 8632 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8645,16 +8648,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8651: \$? = $ac_status" >&5
+  echo "$as_me:8654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8657: \$? = $ac_status" >&5
+  echo "$as_me:8660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8665,7 +8668,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8668: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8671: 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
 
@@ -8686,7 +8689,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8692: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8701,23 +8704,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8704: checking for $ac_header" >&5
+echo "$as_me:8707: 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 8710 "configure"
+#line 8713 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8717: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8720: \$? = $ac_status" >&5
+  echo "$as_me:8723: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8736,7 +8739,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8749,13 +8752,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8752: checking for $ac_func" >&5
+echo "$as_me:8755: 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 8758 "configure"
+#line 8761 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8786,16 +8789,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8792: \$? = $ac_status" >&5
+  echo "$as_me:8795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8798: \$? = $ac_status" >&5
+  echo "$as_me:8801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8805,7 +8808,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8808: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8811: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8819,7 +8822,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8822: checking if you want to use sysmouse" >&5
+echo "$as_me:8825: 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.
@@ -8831,7 +8834,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8834 "configure"
+#line 8837 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8854,16 +8857,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8860: \$? = $ac_status" >&5
+  echo "$as_me:8863: \$? = $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:8866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8866: \$? = $ac_status" >&5
+  echo "$as_me:8869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8873,7 +8876,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8876: result: $cf_with_sysmouse" >&5
+echo "$as_me:8879: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8883,7 +8886,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8886: checking if you want to disable library suffixes" >&5
+echo "$as_me:8889: 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.
@@ -8900,13 +8903,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8903: result: $disable_lib_suffixes" >&5
+echo "$as_me:8906: 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:8909: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8912: 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.
@@ -8924,22 +8927,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8927: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8930: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8932: checking for updated LDFLAGS" >&5
+echo "$as_me:8935: 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:8935: result: maybe" >&5
+	echo "$as_me:8938: 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:8942: checking for $ac_word" >&5
+echo "$as_me:8945: 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
@@ -8954,7 +8957,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8957: found $ac_dir/$ac_word" >&5
+echo "$as_me:8960: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8962,10 +8965,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8965: result: $cf_ldd_prog" >&5
+  echo "$as_me:8968: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8968: result: no" >&5
+  echo "$as_me:8971: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8979,7 +8982,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8982 "configure"
+#line 8985 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8991,16 +8994,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8997: \$? = $ac_status" >&5
+  echo "$as_me:9000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9003: \$? = $ac_status" >&5
+  echo "$as_me:9006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -9028,7 +9031,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9040,11 +9043,11 @@ echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9046: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9050: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9081,7 +9084,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9087: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9094,11 +9097,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9100: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9104: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9135,7 +9138,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9141: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9148,14 +9151,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9154: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9158: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9158: result: no" >&5
+	echo "$as_me:9161: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9169,7 +9172,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9172: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9175: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9186,7 +9189,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9192: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9194,7 +9197,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9197: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9200: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9213,11 +9216,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9216: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9219: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9220: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9223: 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.
@@ -9227,10 +9230,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9230: result: $with_overwrite" >&5
+echo "$as_me:9233: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9233: checking if external terminfo-database is used" >&5
+echo "$as_me:9236: 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.
@@ -9240,7 +9243,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9243: result: $use_database" >&5
+echo "$as_me:9246: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9256,7 +9259,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9259: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9262: 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.
@@ -9264,10 +9267,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9267: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9270: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9270: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9273: 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.
@@ -9277,13 +9280,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9280: result: $with_hashed_db" >&5
+	echo "$as_me:9283: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9286: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9289: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9293,7 +9296,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9299: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9301,7 +9304,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9307: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9317,7 +9320,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9320: checking for $ac_word" >&5
+echo "$as_me:9323: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9332,7 +9335,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9335: found $ac_dir/$ac_word" >&5
+echo "$as_me:9338: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9340,10 +9343,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9343: result: $TIC" >&5
+  echo "$as_me:9346: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9346: result: no" >&5
+  echo "$as_me:9349: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9352,7 +9355,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9355: checking for $ac_word" >&5
+echo "$as_me:9358: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9367,7 +9370,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9370: found $ac_dir/$ac_word" >&5
+echo "$as_me:9373: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9375,10 +9378,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9378: result: $ac_ct_TIC" >&5
+  echo "$as_me:9381: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9381: result: no" >&5
+  echo "$as_me:9384: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9390,7 +9393,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9393: checking for $ac_word" >&5
+echo "$as_me:9396: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9405,7 +9408,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9408: found $ac_dir/$ac_word" >&5
+echo "$as_me:9411: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9413,10 +9416,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9416: result: $INFOCMP" >&5
+  echo "$as_me:9419: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9419: result: no" >&5
+  echo "$as_me:9422: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9425,7 +9428,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9428: checking for $ac_word" >&5
+echo "$as_me:9431: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9440,7 +9443,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9443: found $ac_dir/$ac_word" >&5
+echo "$as_me:9446: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9448,10 +9451,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9454: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9454: result: no" >&5
+  echo "$as_me:9457: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9466,10 +9469,10 @@ 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:9469: checking for tic program for fallbacks" >&5
+  echo "$as_me:9472: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9472: result: $TIC" >&5
+		echo "$as_me:9475: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9495,7 +9498,7 @@ case "x$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9501: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9508,7 +9511,7 @@ 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:9511: checking for $ac_word" >&5
+echo "$as_me:9514: 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
@@ -9525,7 +9528,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9528: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9531: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9536,10 +9539,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9539: result: $TIC" >&5
+  echo "$as_me:9542: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9542: result: no" >&5
+  echo "$as_me:9545: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9596,7 +9599,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9602: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9611,7 +9614,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9614: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9617: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9620,10 +9623,10 @@ 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:9623: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9626: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9626: result: $INFOCMP" >&5
+		echo "$as_me:9629: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9649,7 +9652,7 @@ case "x$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9655: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9662,7 +9665,7 @@ 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:9665: checking for $ac_word" >&5
+echo "$as_me:9668: 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
@@ -9679,7 +9682,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9682: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9685: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9690,10 +9693,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9693: result: $INFOCMP" >&5
+  echo "$as_me:9696: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9696: result: no" >&5
+  echo "$as_me:9699: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9750,7 +9753,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9756: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9765,7 +9768,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9768: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9771: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9775,7 +9778,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9778: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9781: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9783,7 +9786,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9786: checking if you want modern xterm or antique" >&5
+echo "$as_me:9789: 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.
@@ -9797,7 +9800,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9800: result: $with_xterm_new" >&5
+echo "$as_me:9803: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9810,7 +9813,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9813: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9816: 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.
@@ -9834,13 +9837,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9837: result: $with_xterm_kbs" >&5
+echo "$as_me:9840: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9843: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9846: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9850,7 +9853,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9853: checking for list of terminfo directories" >&5
+echo "$as_me:9856: 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.
@@ -9888,7 +9891,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9891: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9894: 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; }; }
 	;;
@@ -9911,7 +9914,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9917: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9920,13 +9923,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9923: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9926: 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:9929: checking for default terminfo directory" >&5
+echo "$as_me:9932: 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.
@@ -9960,7 +9963,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9966: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9969,7 +9972,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9972: result: $TERMINFO" >&5
+echo "$as_me:9975: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9980,7 +9983,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9983: checking if big-core option selected" >&5
+echo "$as_me:9986: 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.
@@ -9992,7 +9995,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9995 "configure"
+#line 9998 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10006,15 +10009,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10012: \$? = $ac_status" >&5
+  echo "$as_me:10015: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10017: \$? = $ac_status" >&5
+  echo "$as_me:10020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -10026,7 +10029,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10029: result: $with_big_core" >&5
+echo "$as_me:10032: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10036,7 +10039,7 @@ EOF
 ### 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:10039: checking if big-strings option selected" >&5
+echo "$as_me:10042: 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.
@@ -10060,14 +10063,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10063: result: $with_big_strings" >&5
+echo "$as_me:10066: 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:10070: checking if you want termcap-fallback support" >&5
+echo "$as_me:10073: 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.
@@ -10077,14 +10080,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10080: result: $with_termcap" >&5
+echo "$as_me:10083: 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:10087: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10090: 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
@@ -10097,13 +10100,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10100: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10103: 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:10106: checking for list of termcap files" >&5
+	echo "$as_me:10109: 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.
@@ -10141,7 +10144,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10144: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10147: 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; }; }
 	;;
@@ -10164,7 +10167,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10167: result: $TERMPATH" >&5
+	echo "$as_me:10170: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10172,7 +10175,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10175: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10178: 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.
@@ -10182,14 +10185,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10185: result: $with_getcap" >&5
+	echo "$as_me:10188: 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:10192: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10195: 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.
@@ -10199,7 +10202,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10202: result: $with_getcap_cache" >&5
+	echo "$as_me:10205: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10209,7 +10212,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10212: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10215: 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.
@@ -10219,14 +10222,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10222: result: $with_home_terminfo" >&5
+echo "$as_me:10225: 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:10229: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10232: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10236,14 +10239,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10239: result: $with_root_environ" >&5
+echo "$as_me:10242: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10246: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10249: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10253,14 +10256,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10256: result: $with_root_access" >&5
+echo "$as_me:10259: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10263: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10266: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10270,7 +10273,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10273: result: $with_setuid_environ" >&5
+echo "$as_me:10276: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10285,23 +10288,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10288: checking for $ac_header" >&5
+echo "$as_me:10291: 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 10294 "configure"
+#line 10297 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10304: \$? = $ac_status" >&5
+  echo "$as_me:10307: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10320,7 +10323,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10335,13 +10338,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10338: checking for $ac_func" >&5
+echo "$as_me:10341: 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 10344 "configure"
+#line 10347 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10372,16 +10375,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10378: \$? = $ac_status" >&5
+  echo "$as_me:10381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10384: \$? = $ac_status" >&5
+  echo "$as_me:10387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10391,7 +10394,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10394: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10397: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10408,13 +10411,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10411: checking for $ac_func" >&5
+echo "$as_me:10414: 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 10417 "configure"
+#line 10420 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10445,16 +10448,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10451: \$? = $ac_status" >&5
+  echo "$as_me:10454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10457: \$? = $ac_status" >&5
+  echo "$as_me:10460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10464,7 +10467,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10470: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10475,7 +10478,7 @@ fi
 done
 
 else
-	echo "$as_me:10478: checking if link/symlink functions work" >&5
+	echo "$as_me:10481: 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
@@ -10488,7 +10491,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10491 "configure"
+#line 10494 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10522,15 +10525,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10528: \$? = $ac_status" >&5
+  echo "$as_me:10531: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10533: \$? = $ac_status" >&5
+  echo "$as_me:10536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10548,7 +10551,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10554: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10568,7 +10571,7 @@ with_symlinks=no
 # 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:10571: checking if tic should use symbolic links" >&5
+	echo "$as_me:10574: 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.
@@ -10578,21 +10581,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10581: result: $with_symlinks" >&5
+	echo "$as_me:10584: 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:10588: checking if tic should use hard links" >&5
+	echo "$as_me:10591: 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:10595: result: $with_links" >&5
+	echo "$as_me:10598: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10608,7 +10611,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10611: checking if you want broken-linker support code" >&5
+echo "$as_me:10614: 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.
@@ -10618,7 +10621,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10621: result: $with_broken_linker" >&5
+echo "$as_me:10624: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10632,7 +10635,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10635: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10638: 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.
@@ -10642,7 +10645,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10645: result: $with_bsdpad" >&5
+echo "$as_me:10648: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10661,14 +10664,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10664: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10667: 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 10671 "configure"
+#line 10674 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10687,16 +10690,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10693: \$? = $ac_status" >&5
+  echo "$as_me:10696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10699: \$? = $ac_status" >&5
+  echo "$as_me:10702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10707,7 +10710,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10713: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10749,14 +10752,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10752: checking if this is the GNU C library" >&5
+echo "$as_me:10755: 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 10759 "configure"
+#line 10762 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10775,16 +10778,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10781: \$? = $ac_status" >&5
+  echo "$as_me:10784: \$? = $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:10787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10787: \$? = $ac_status" >&5
+  echo "$as_me:10790: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10795,7 +10798,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10801: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10803,7 +10806,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10806: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10809: 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
@@ -10815,7 +10818,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10818 "configure"
+#line 10821 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10834,16 +10837,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10840: \$? = $ac_status" >&5
+  echo "$as_me:10843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10846: \$? = $ac_status" >&5
+  echo "$as_me:10849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10855,12 +10858,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10858: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10861: 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:10863: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10866: 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
@@ -10965,7 +10968,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10968 "configure"
+#line 10971 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10985,16 +10988,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10991: \$? = $ac_status" >&5
+  echo "$as_me:10994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10997: \$? = $ac_status" >&5
+  echo "$as_me:11000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11005,7 +11008,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11008: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11011: 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
@@ -11014,14 +11017,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11017: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11020: 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 11024 "configure"
+#line 11027 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11036,16 +11039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11042: \$? = $ac_status" >&5
+  echo "$as_me:11045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11048: \$? = $ac_status" >&5
+  echo "$as_me:11051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11152,7 +11155,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11155 "configure"
+#line 11158 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11167,16 +11170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11173: \$? = $ac_status" >&5
+  echo "$as_me:11176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11179: \$? = $ac_status" >&5
+  echo "$as_me:11182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11191,12 +11194,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11194: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11197: 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:11199: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11202: 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
@@ -11206,7 +11209,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11209 "configure"
+#line 11212 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11221,16 +11224,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11227: \$? = $ac_status" >&5
+  echo "$as_me:11230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11233: \$? = $ac_status" >&5
+  echo "$as_me:11236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11241,7 +11244,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11244: result: $cf_cv_default_source" >&5
+echo "$as_me:11247: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11281,16 +11284,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11284: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11287: 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}:11290: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11293: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11293 "configure"
+#line 11296 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11305,16 +11308,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11311: \$? = $ac_status" >&5
+  echo "$as_me:11314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11317: \$? = $ac_status" >&5
+  echo "$as_me:11320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11335,7 +11338,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11338 "configure"
+#line 11341 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11350,16 +11353,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11356: \$? = $ac_status" >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11362: \$? = $ac_status" >&5
+  echo "$as_me:11365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11370,7 +11373,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11378,10 +11381,10 @@ echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11381: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11384: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11384 "configure"
+#line 11387 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11396,16 +11399,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11402: \$? = $ac_status" >&5
+  echo "$as_me:11405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11408: \$? = $ac_status" >&5
+  echo "$as_me:11411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11421,7 +11424,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11424: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11427: 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
@@ -11538,7 +11541,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11541: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11544: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11570,14 +11573,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11573: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11576: 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 11580 "configure"
+#line 11583 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11595,16 +11598,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11601: \$? = $ac_status" >&5
+  echo "$as_me:11604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11616,7 +11619,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11619 "configure"
+#line 11622 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11634,16 +11637,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11640: \$? = $ac_status" >&5
+  echo "$as_me:11643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11646: \$? = $ac_status" >&5
+  echo "$as_me:11649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11658,7 +11661,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11661: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11664: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11818,16 +11821,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11821: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11824: 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}:11827: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11830: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11830 "configure"
+#line 11833 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11842,16 +11845,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11848: \$? = $ac_status" >&5
+  echo "$as_me:11851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11854: \$? = $ac_status" >&5
+  echo "$as_me:11857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11872,7 +11875,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11875 "configure"
+#line 11878 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11887,16 +11890,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11893: \$? = $ac_status" >&5
+  echo "$as_me:11896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11899: \$? = $ac_status" >&5
+  echo "$as_me:11902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11907,7 +11910,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11915,10 +11918,10 @@ echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11918: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11921: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11921 "configure"
+#line 11924 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11933,16 +11936,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11939: \$? = $ac_status" >&5
+  echo "$as_me:11942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11945: \$? = $ac_status" >&5
+  echo "$as_me:11948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11958,7 +11961,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11961: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11964: 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
@@ -12071,10 +12074,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12074: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12077: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12077 "configure"
+#line 12080 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12092,23 +12095,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12098: \$? = $ac_status" >&5
+  echo "$as_me:12101: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12111: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12114: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12131,7 +12134,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12134: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12137: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12143,7 +12146,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12146: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12149: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12231,7 +12234,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12234: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12237: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12241,7 +12244,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12244: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12247: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12251,7 +12254,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12254: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12257: 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"
@@ -12263,10 +12266,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12266: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12269: 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 12269 "configure"
+#line 12272 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12281,16 +12284,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12299,12 +12302,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12302: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12305: 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 12307 "configure"
+#line 12310 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12319,16 +12322,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12325: \$? = $ac_status" >&5
+  echo "$as_me:12328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12331: \$? = $ac_status" >&5
+  echo "$as_me:12334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12339,19 +12342,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12342: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12347: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12350: 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 12354 "configure"
+#line 12357 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12369,16 +12372,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12375: \$? = $ac_status" >&5
+  echo "$as_me:12378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12381: \$? = $ac_status" >&5
+  echo "$as_me:12384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12390,7 +12393,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12393 "configure"
+#line 12396 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12408,16 +12411,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12414: \$? = $ac_status" >&5
+  echo "$as_me:12417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12432,7 +12435,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12435: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12438: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12583,14 +12586,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12586: checking if SIGWINCH is defined" >&5
+echo "$as_me:12589: 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 12593 "configure"
+#line 12596 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12605,23 +12608,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12611: \$? = $ac_status" >&5
+  echo "$as_me:12614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
+  echo "$as_me:12620: \$? = $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 12624 "configure"
+#line 12627 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12639,16 +12642,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12645: \$? = $ac_status" >&5
+  echo "$as_me:12648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12651: \$? = $ac_status" >&5
+  echo "$as_me:12654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12662,11 +12665,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12665: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12668: 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:12669: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12672: 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
@@ -12677,7 +12680,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12680 "configure"
+#line 12683 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12699,16 +12702,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12705: \$? = $ac_status" >&5
+  echo "$as_me:12708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12711: \$? = $ac_status" >&5
+  echo "$as_me:12714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12722,7 +12725,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12725: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12728: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12732,13 +12735,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12735: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12738: 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 12741 "configure"
+#line 12744 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12752,16 +12755,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12758: \$? = $ac_status" >&5
+  echo "$as_me:12761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12764: \$? = $ac_status" >&5
+  echo "$as_me:12767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12772,7 +12775,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12775: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12778: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12786,7 +12789,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12789: checking if you want wide-character code" >&5
+echo "$as_me:12792: 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.
@@ -12796,7 +12799,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12799: result: $with_widec" >&5
+echo "$as_me:12802: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12818,7 +12821,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12821: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12824: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12831,23 +12834,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12834: checking for $ac_header" >&5
+echo "$as_me:12837: 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 12840 "configure"
+#line 12843 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12844: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12850: \$? = $ac_status" >&5
+  echo "$as_me:12853: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12866,7 +12869,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12869: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12872: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12876,14 +12879,14 @@ EOF
 fi
 done
 
-echo "$as_me:12879: checking if wchar.h can be used as is" >&5
+echo "$as_me:12882: 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 12886 "configure"
+#line 12889 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12905,16 +12908,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12911: \$? = $ac_status" >&5
+  echo "$as_me:12914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12917: \$? = $ac_status" >&5
+  echo "$as_me:12920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12924,16 +12927,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12927: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12930: 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:12933: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12936: 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 12936 "configure"
+#line 12939 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12949,16 +12952,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12955: \$? = $ac_status" >&5
+  echo "$as_me:12958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12961: \$? = $ac_status" >&5
+  echo "$as_me:12964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12967,16 +12970,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12970: result: $cf_result" >&5
+echo "$as_me:12973: 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:12976: checking checking for compatible value versus " >&5
+	echo "$as_me:12979: 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 12979 "configure"
+#line 12982 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12992,16 +12995,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12998: \$? = $ac_status" >&5
+  echo "$as_me:13001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13004: \$? = $ac_status" >&5
+  echo "$as_me:13007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -13010,7 +13013,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13013: result: $cf_result" >&5
+	echo "$as_me:13016: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -13020,7 +13023,7 @@ fi
 
 fi
 
-echo "$as_me:13023: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13026: 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
@@ -13091,7 +13094,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13094 "configure"
+#line 13097 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13136,15 +13139,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13142: \$? = $ac_status" >&5
+  echo "$as_me:13145: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13147: \$? = $ac_status" >&5
+  echo "$as_me:13150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13157,7 +13160,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13160: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13163: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13168,13 +13171,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13171: checking for $ac_func" >&5
+echo "$as_me:13174: 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 13177 "configure"
+#line 13180 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13205,16 +13208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13211: \$? = $ac_status" >&5
+  echo "$as_me:13214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13217: \$? = $ac_status" >&5
+  echo "$as_me:13220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13224,7 +13227,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13227: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13239,23 +13242,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13242: checking for $ac_header" >&5
+echo "$as_me:13245: 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 13248 "configure"
+#line 13251 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13252: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13255: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13258: \$? = $ac_status" >&5
+  echo "$as_me:13261: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13274,7 +13277,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13277: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13280: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13284,7 +13287,7 @@ EOF
 fi
 done
 
-echo "$as_me:13287: checking for multibyte character support" >&5
+echo "$as_me:13290: 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
@@ -13292,7 +13295,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13295 "configure"
+#line 13298 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13309,16 +13312,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13315: \$? = $ac_status" >&5
+  echo "$as_me:13318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13321: \$? = $ac_status" >&5
+  echo "$as_me:13324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13330,12 +13333,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13333: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13338 "configure"
+#line 13341 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13348,16 +13351,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13354: \$? = $ac_status" >&5
+  echo "$as_me:13357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13360: \$? = $ac_status" >&5
+  echo "$as_me:13363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13371,7 +13374,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13374 "configure"
+#line 13377 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13384,16 +13387,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13390: \$? = $ac_status" >&5
+  echo "$as_me:13393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13396: \$? = $ac_status" >&5
+  echo "$as_me:13399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13410,9 +13413,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13413: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13416: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13415: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13418: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13503,7 +13506,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13506: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13509: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13511,7 +13514,7 @@ echo "${as_me:-configure}:13506: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13514 "configure"
+#line 13517 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13524,21 +13527,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13530: \$? = $ac_status" >&5
+  echo "$as_me:13533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13536: \$? = $ac_status" >&5
+  echo "$as_me:13539: \$? = $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}:13541: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13544: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13556,7 +13559,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13559: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13562: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13631,13 +13634,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13634: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13637: 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 13640 "configure"
+#line 13643 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13650,21 +13653,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13656: \$? = $ac_status" >&5
+  echo "$as_me:13659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13662: \$? = $ac_status" >&5
+  echo "$as_me:13665: \$? = $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}:13667: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13670: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13706,7 +13709,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13709: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13712: 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
@@ -13744,7 +13747,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13747 "configure"
+#line 13750 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13756,16 +13759,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13762: \$? = $ac_status" >&5
+  echo "$as_me:13765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13768: \$? = $ac_status" >&5
+  echo "$as_me:13771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13782,7 +13785,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13785: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13788: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13818,7 +13821,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13821: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13824: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13850,14 +13853,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13853: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13856: 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 13860 "configure"
+#line 13863 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13875,23 +13878,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13881: \$? = $ac_status" >&5
+  echo "$as_me:13884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13887: \$? = $ac_status" >&5
+  echo "$as_me:13890: \$? = $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 13894 "configure"
+#line 13897 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13910,16 +13913,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13916: \$? = $ac_status" >&5
+  echo "$as_me:13919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13922: \$? = $ac_status" >&5
+  echo "$as_me:13925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13931,7 +13934,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13934: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13937: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13949,14 +13952,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13952: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13955: 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 13959 "configure"
+#line 13962 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13974,23 +13977,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13980: \$? = $ac_status" >&5
+  echo "$as_me:13983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13986: \$? = $ac_status" >&5
+  echo "$as_me:13989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13993 "configure"
+#line 13996 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14009,16 +14012,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14015: \$? = $ac_status" >&5
+  echo "$as_me:14018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:14024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14030,7 +14033,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14033: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14036: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14053,14 +14056,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14056: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14059: 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 14063 "configure"
+#line 14066 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14078,23 +14081,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14084: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14090: \$? = $ac_status" >&5
+  echo "$as_me:14093: \$? = $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 14097 "configure"
+#line 14100 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14113,16 +14116,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14119: \$? = $ac_status" >&5
+  echo "$as_me:14122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14134,7 +14137,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14137: result: $cf_cv_wint_t" >&5
+echo "$as_me:14140: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14166,7 +14169,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14169: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14172: 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.
@@ -14176,7 +14179,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14179: result: $with_lp64" >&5
+echo "$as_me:14182: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14192,7 +14195,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14195: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14198: 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
@@ -14204,7 +14207,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14207 "configure"
+#line 14210 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14224,16 +14227,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14230: \$? = $ac_status" >&5
+  echo "$as_me:14233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14236: \$? = $ac_status" >&5
+  echo "$as_me:14239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14243,16 +14246,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14249: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14255: \$? = $ac_status" >&5
+  echo "$as_me:14258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14266,13 +14269,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14269: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14272: 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:14275: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14278: 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
@@ -14280,7 +14283,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14283 "configure"
+#line 14286 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14300,16 +14303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14306: \$? = $ac_status" >&5
+  echo "$as_me:14309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14312: \$? = $ac_status" >&5
+  echo "$as_me:14315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14318,7 +14321,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14321 "configure"
+#line 14324 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14339,16 +14342,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14345: \$? = $ac_status" >&5
+  echo "$as_me:14348: \$? = $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:14351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14351: \$? = $ac_status" >&5
+  echo "$as_me:14354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14359,7 +14362,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14362: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14365: 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
 
@@ -14369,7 +14372,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14372: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14375: 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
@@ -14377,7 +14380,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14380 "configure"
+#line 14383 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14397,16 +14400,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14403: \$? = $ac_status" >&5
+  echo "$as_me:14406: \$? = $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:14409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14409: \$? = $ac_status" >&5
+  echo "$as_me:14412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14415,7 +14418,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14418 "configure"
+#line 14421 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14436,16 +14439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14442: \$? = $ac_status" >&5
+  echo "$as_me:14445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14448: \$? = $ac_status" >&5
+  echo "$as_me:14451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14456,7 +14459,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14459: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14462: 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
 
@@ -14469,7 +14472,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14472: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14475: 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
@@ -14477,7 +14480,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14480 "configure"
+#line 14483 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14492,16 +14495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14498: \$? = $ac_status" >&5
+  echo "$as_me:14501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14504: \$? = $ac_status" >&5
+  echo "$as_me:14507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14510,7 +14513,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14513 "configure"
+#line 14516 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14526,16 +14529,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14532: \$? = $ac_status" >&5
+  echo "$as_me:14535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14538: \$? = $ac_status" >&5
+  echo "$as_me:14541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14546,7 +14549,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14549: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14552: 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
 
@@ -14560,13 +14563,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14563: checking for fseeko" >&5
+echo "$as_me:14566: 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 14569 "configure"
+#line 14572 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14580,16 +14583,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14586: \$? = $ac_status" >&5
+  echo "$as_me:14589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14592: \$? = $ac_status" >&5
+  echo "$as_me:14595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14599,7 +14602,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14602: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14605: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14638,14 +14641,14 @@ fi
 
 	fi
 
-	echo "$as_me:14641: checking whether to use struct dirent64" >&5
+	echo "$as_me:14644: 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 14648 "configure"
+#line 14651 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14672,16 +14675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14678: \$? = $ac_status" >&5
+  echo "$as_me:14681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14684: \$? = $ac_status" >&5
+  echo "$as_me:14687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14692,7 +14695,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14695: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14698: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14702,7 +14705,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14705: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14708: 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.
@@ -14712,14 +14715,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14715: result: $with_tparm_varargs" >&5
+echo "$as_me:14718: 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:14722: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14725: 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.
@@ -14729,14 +14732,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14732: result: $with_tic_depends" >&5
+echo "$as_me:14735: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14739: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14742: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14748,15 +14751,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14751: result: no" >&5
+	echo "$as_me:14754: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14755: result: yes" >&5
+	echo "$as_me:14758: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14759: checking for X11 rgb file" >&5
+echo "$as_me:14762: 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.
@@ -14818,7 +14821,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14821: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14824: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14826,7 +14829,7 @@ esac
 
 fi
 
-echo "$as_me:14829: result: $RGB_PATH" >&5
+echo "$as_me:14832: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14841,7 +14844,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14844: checking for type of bool" >&5
+echo "$as_me:14847: 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.
@@ -14851,17 +14854,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14854: result: $NCURSES_BOOL" >&5
+echo "$as_me:14857: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14858: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14861: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14864: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14867: 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.
@@ -14873,16 +14876,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14876: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14879: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14880: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14883: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14885: checking for type of chtype" >&5
+echo "$as_me:14888: 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.
@@ -14892,11 +14895,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14895: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14898: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14899: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14902: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14904,7 +14907,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14907: checking for type of ospeed" >&5
+echo "$as_me:14910: 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.
@@ -14914,11 +14917,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14917: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14920: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14921: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14924: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14926,7 +14929,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14929: checking for type of mmask-t" >&5
+echo "$as_me:14932: 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.
@@ -14936,18 +14939,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14939: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14942: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14943: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14946: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14950: checking for size CCHARW_MAX" >&5
+echo "$as_me:14953: 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.
@@ -14957,16 +14960,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14960: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14963: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14963: checking for signed char" >&5
+echo "$as_me:14966: 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 14969 "configure"
+#line 14972 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14981,16 +14984,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14987: \$? = $ac_status" >&5
+  echo "$as_me:14990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14993: \$? = $ac_status" >&5
+  echo "$as_me:14996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -15000,10 +15003,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15003: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15006: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:15006: checking size of signed char" >&5
+echo "$as_me:15009: 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
@@ -15012,7 +15015,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15015 "configure"
+#line 15018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15024,21 +15027,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15030: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15036: \$? = $ac_status" >&5
+  echo "$as_me:15039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15041 "configure"
+#line 15044 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15050,16 +15053,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15062: \$? = $ac_status" >&5
+  echo "$as_me:15065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15075,7 +15078,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15078 "configure"
+#line 15081 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15087,16 +15090,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15093: \$? = $ac_status" >&5
+  echo "$as_me:15096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15099: \$? = $ac_status" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15112,7 +15115,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15115 "configure"
+#line 15118 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15124,16 +15127,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15130: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15136: \$? = $ac_status" >&5
+  echo "$as_me:15139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15146,12 +15149,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15149: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15152: 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 15154 "configure"
+#line 15157 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15167,15 +15170,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15173: \$? = $ac_status" >&5
+  echo "$as_me:15176: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15178: \$? = $ac_status" >&5
+  echo "$as_me:15181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15191,7 +15194,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15194: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15197: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15202,7 +15205,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15205: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15208: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15212,13 +15215,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15215: result: $with_signed_char" >&5
+echo "$as_me:15218: 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:15221: checking for type of tparm-arg" >&5
+echo "$as_me:15224: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15228,18 +15231,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15231: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15234: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15235: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15238: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15242: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15245: 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.
@@ -15249,7 +15252,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15252: result: $with_rcs_ids" >&5
+echo "$as_me:15255: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15258,7 +15261,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15261: checking format of man-pages" >&5
+echo "$as_me:15264: 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.
@@ -15349,10 +15352,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15352: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15355: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15355: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15358: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15393,7 +15396,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15396: checking for manpage renaming" >&5
+echo "$as_me:15399: 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.
@@ -15422,15 +15425,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15425: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15428: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15430: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15433: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15433: checking if manpage aliases will be installed" >&5
+echo "$as_me:15436: 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.
@@ -15441,7 +15444,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15444: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15447: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15455,7 +15458,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15458: checking if manpage symlinks should be used" >&5
+echo "$as_me:15461: 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.
@@ -15468,17 +15471,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15471: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15474: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15477: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15480: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15481: checking for manpage tbl" >&5
+echo "$as_me:15484: 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.
@@ -15489,7 +15492,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15492: result: $MANPAGE_TBL" >&5
+echo "$as_me:15495: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15807,7 +15810,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15810: checking if you want to build with function extensions" >&5
+echo "$as_me:15813: 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.
@@ -15817,7 +15820,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15820: result: $with_ext_funcs" >&5
+echo "$as_me:15823: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15874,7 +15877,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15877: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15880: 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.
@@ -15884,7 +15887,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15887: result: $with_sp_funcs" >&5
+echo "$as_me:15890: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15903,7 +15906,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15906: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15909: 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.
@@ -15913,7 +15916,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15916: result: $with_term_driver" >&5
+echo "$as_me:15919: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15922,19 +15925,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15925: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15928: 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:15930: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15933: 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:15937: checking for extended use of const keyword" >&5
+echo "$as_me:15940: 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.
@@ -15944,7 +15947,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15947: result: $with_ext_const" >&5
+echo "$as_me:15950: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15952,7 +15955,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15955: checking if you want to use extended colors" >&5
+echo "$as_me:15958: 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.
@@ -15962,12 +15965,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15965: result: $with_ext_colors" >&5
+echo "$as_me:15968: 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:15970: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15973: 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)
@@ -15978,7 +15981,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15981: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15984: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16006,7 +16009,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16009: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16012: 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.
@@ -16016,7 +16019,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16019: result: $with_ext_mouse" >&5
+echo "$as_me:16022: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16026,7 +16029,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16029: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16032: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16043,7 +16046,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16046: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16049: 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.
@@ -16053,7 +16056,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16056: result: $with_ext_putwin" >&5
+echo "$as_me:16059: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16063,7 +16066,7 @@ EOF
 
 fi
 
-echo "$as_me:16066: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16069: 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.
@@ -16073,7 +16076,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16076: result: $with_no_padding" >&5
+echo "$as_me:16079: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16081,7 +16084,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16084: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16087: 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.
@@ -16091,7 +16094,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16094: result: $with_sigwinch" >&5
+echo "$as_me:16097: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16106,7 +16109,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16109: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16112: 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.
@@ -16116,7 +16119,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16119: result: $with_tcap_names" >&5
+echo "$as_me:16122: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16130,7 +16133,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16133: checking if you want to link with the pthread library" >&5
+echo "$as_me:16136: 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.
@@ -16140,27 +16143,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16143: result: $with_pthread" >&5
+echo "$as_me:16146: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16147: checking for pthread.h" >&5
+	echo "$as_me:16150: 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 16153 "configure"
+#line 16156 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16163: \$? = $ac_status" >&5
+  echo "$as_me:16166: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16179,7 +16182,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16182: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16185: 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
 
@@ -16189,7 +16192,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16192: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16195: 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"
 
@@ -16210,7 +16213,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16213 "configure"
+#line 16216 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16227,16 +16230,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16233: \$? = $ac_status" >&5
+  echo "$as_me:16236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16239: \$? = $ac_status" >&5
+  echo "$as_me:16242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16246,7 +16249,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16249: result: $with_pthread" >&5
+	    echo "$as_me:16252: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16274,7 +16277,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16277: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16280: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16284,13 +16287,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16287: checking for pthread_kill" >&5
+	echo "$as_me:16290: 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 16293 "configure"
+#line 16296 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16321,16 +16324,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16327: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16333: \$? = $ac_status" >&5
+  echo "$as_me:16336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16340,11 +16343,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16343: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16346: 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:16347: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16350: 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.
@@ -16354,7 +16357,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16357: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16360: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16365,7 +16368,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16368: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16371: 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.
@@ -16375,18 +16378,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16378: result: $use_weak_symbols" >&5
+	echo "$as_me:16381: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16382: checking if $CC supports weak symbols" >&5
+echo "$as_me:16385: 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 16389 "configure"
+#line 16392 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16412,16 +16415,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16418: \$? = $ac_status" >&5
+  echo "$as_me:16421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16424: \$? = $ac_status" >&5
+  echo "$as_me:16427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16432,7 +16435,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16435: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16438: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16482,7 +16485,7 @@ fi
 # 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:16485: checking if you want reentrant code" >&5
+echo "$as_me:16488: 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.
@@ -16492,7 +16495,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16495: result: $with_reentrant" >&5
+echo "$as_me:16498: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16581,7 +16584,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16584: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16587: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16593,7 +16596,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16596: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16599: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16615,16 +16618,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16618: result: $enable_opaque_curses" >&5
+echo "$as_me:16621: 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:16623: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16626: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16627: checking whether form library structures should be opaque" >&5
+echo "$as_me:16630: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16641,10 +16644,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16644: result: $enable_opaque_form" >&5
+echo "$as_me:16647: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16647: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16650: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16661,10 +16664,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16664: result: $enable_opaque_menu" >&5
+echo "$as_me:16667: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16667: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16670: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16681,7 +16684,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16684: result: $enable_opaque_panel" >&5
+echo "$as_me:16687: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16691,7 +16694,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16694: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16697: 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.
@@ -16701,7 +16704,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16704: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16707: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16714,7 +16717,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16717: checking if you want all development code" >&5
+echo "$as_me:16720: 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.
@@ -16724,11 +16727,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16727: result: $with_develop" >&5
+echo "$as_me:16730: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16731: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16734: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16738,7 +16741,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16741: result: $enable_check_size" >&5
+echo "$as_me:16744: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16746,7 +16749,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16749: checking if you want hard-tabs code" >&5
+echo "$as_me:16752: 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.
@@ -16756,7 +16759,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16759: result: $enable_hard_tabs" >&5
+echo "$as_me:16762: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16764,7 +16767,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16767: checking if you want limited support for xmc" >&5
+echo "$as_me:16770: 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.
@@ -16774,7 +16777,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16777: result: $enable_xmc_glitch" >&5
+echo "$as_me:16780: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16784,7 +16787,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16787: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16790: 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.
@@ -16794,7 +16797,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16797: result: $with_assumed_color" >&5
+echo "$as_me:16800: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16802,7 +16805,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16805: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16808: 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.
@@ -16812,7 +16815,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16815: result: $with_hashmap" >&5
+echo "$as_me:16818: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16820,7 +16823,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16823: checking if you want colorfgbg code" >&5
+echo "$as_me:16826: 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.
@@ -16830,7 +16833,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16833: result: $with_colorfgbg" >&5
+echo "$as_me:16836: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16838,7 +16841,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16841: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16844: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16848,14 +16851,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16851: result: $cf_with_fvisibility" >&5
+echo "$as_me:16854: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16858: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16861: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16864,7 +16867,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16867 "configure"
+#line 16870 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16880,16 +16883,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16886: \$? = $ac_status" >&5
+  echo "$as_me:16889: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16892: \$? = $ac_status" >&5
+  echo "$as_me:16895: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16901,7 +16904,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16904: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16907: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17016,7 +17019,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17019: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17022: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17025,7 +17028,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17028 "configure"
+#line 17031 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17041,16 +17044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17047: \$? = $ac_status" >&5
+  echo "$as_me:17050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17053: \$? = $ac_status" >&5
+  echo "$as_me:17056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17062,7 +17065,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17065: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17068: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17185,7 +17188,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17188: checking if you want interop bindings" >&5
+echo "$as_me:17191: 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.
@@ -17195,13 +17198,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17198: result: $with_exp_interop" >&5
+echo "$as_me:17201: 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:17204: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17207: 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.
@@ -17211,13 +17214,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17214: result: $with_safe_sprintf" >&5
+echo "$as_me:17217: 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:17220: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17223: 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.
@@ -17227,7 +17230,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17230: result: $with_scroll_hints" >&5
+echo "$as_me:17233: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17236,7 +17239,7 @@ EOF
 
 fi
 
-echo "$as_me:17239: checking if you want wgetch-events code" >&5
+echo "$as_me:17242: 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.
@@ -17246,7 +17249,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17249: result: $with_wgetch_events" >&5
+echo "$as_me:17252: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17261,7 +17264,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17264: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17267: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17271,7 +17274,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17274: result: $with_exp_win32" >&5
+	echo "$as_me:17277: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17297,7 +17300,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17300: checking if you want to see long compiling messages" >&5
+echo "$as_me:17303: 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.
@@ -17331,7 +17334,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17334: result: $enableval" >&5
+echo "$as_me:17337: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17344,7 +17347,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17347: checking if you want to install stripped executables" >&5
+echo "$as_me:17350: 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.
@@ -17361,7 +17364,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17364: result: $enable_stripping" >&5
+echo "$as_me:17367: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17372,7 +17375,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17375: checking if install accepts -p option" >&5
+echo "$as_me:17378: 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
@@ -17403,10 +17406,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17406: result: $cf_cv_install_p" >&5
+echo "$as_me:17409: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17409: checking if install needs to be told about ownership" >&5
+echo "$as_me:17412: 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)
@@ -17417,7 +17420,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17420: result: $with_install_o" >&5
+echo "$as_me:17423: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17428,7 +17431,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17431: checking if you want to specify strip-program" >&5
+	echo "$as_me:17434: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17438,11 +17441,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17441: result: $with_strip_program" >&5
+	echo "$as_me:17444: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17445: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17448: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17463,11 +17466,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17466: result: $check_install_strip" >&5
+		echo "$as_me:17469: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17470: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17473: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17482,7 +17485,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17485: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17488: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17508,7 +17511,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17511: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17514: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17525,17 +17528,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17528: result: $enable_stdnoreturn" >&5
+echo "$as_me:17531: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17532: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17535: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17538 "configure"
+#line 17541 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17551,16 +17554,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17557: \$? = $ac_status" >&5
+  echo "$as_me:17560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17563: \$? = $ac_status" >&5
+  echo "$as_me:17566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17571,7 +17574,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17574: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17577: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17627,16 +17630,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17630: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17633: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17635: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17638: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17639: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17642: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17675,16 +17678,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17678: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17681: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17683: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17686: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17687: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17690: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17723,23 +17726,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17726: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17729: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17731: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17734: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17738: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17742: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17745: 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.
@@ -17756,7 +17759,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17759: result: $enable_warnings" >&5
+echo "$as_me:17762: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17780,7 +17783,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17783 "configure"
+#line 17786 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17795,26 +17798,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17801: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17807: \$? = $ac_status" >&5
+  echo "$as_me:17810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17810: checking for X11/Xt const-feature" >&5
+echo "$as_me:17813: 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 17817 "configure"
+#line 17820 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17832,16 +17835,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17838: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17838: \$? = $ac_status" >&5
+  echo "$as_me:17841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17844: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17856,7 +17859,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17859: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17862: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17885,7 +17888,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17888 "${as_me:-configure}"
+#line 17891 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17901,7 +17904,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17904: checking for $CC warning options..." >&5
+	{ echo "$as_me:17907: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17917,12 +17920,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17920: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17923: \$? = $ac_status" >&5
+  echo "$as_me:17926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17925: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17930,7 +17933,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17933: checking for $CC warning options..." >&5
+	{ echo "$as_me:17936: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17953,12 +17956,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17956: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17959: \$? = $ac_status" >&5
+  echo "$as_me:17962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17961: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17964: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17966,7 +17969,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17976,7 +17979,7 @@ echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17979: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17982: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18009,10 +18012,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18012: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18015: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18015 "${as_me:-configure}"
+#line 18018 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18062,12 +18065,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18068: \$? = $ac_status" >&5
+  echo "$as_me:18071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18070: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18073: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18139,12 +18142,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18142: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18145: 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 18147 "configure"
+#line 18150 "configure"
 #include "confdefs.h"
 
 int
@@ -18161,16 +18164,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18167: \$? = $ac_status" >&5
+  echo "$as_me:18170: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18173: \$? = $ac_status" >&5
+  echo "$as_me:18176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18181,7 +18184,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18184: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18187: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18190,11 +18193,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18193: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18196: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18197 "configure"
+#line 18200 "configure"
 #include "confdefs.h"
 
 int
@@ -18211,16 +18214,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18217: \$? = $ac_status" >&5
+  echo "$as_me:18220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18223: \$? = $ac_status" >&5
+  echo "$as_me:18226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18230,7 +18233,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18233: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18236: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18239,30 +18242,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18242: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18245: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18249: checking version of $CC" >&5
+	echo "$as_me:18252: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18253: result: $CLANG_VERSION" >&5
+	echo "$as_me:18256: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18260: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18263: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18265 "configure"
+#line 18268 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18276,16 +18279,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18282: \$? = $ac_status" >&5
+  echo "$as_me:18285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18288: \$? = $ac_status" >&5
+  echo "$as_me:18291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18296,13 +18299,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18299: result: $cf_clang_optok" >&5
+		echo "$as_me:18302: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18305: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18308: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18319,7 +18322,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18322 "configure"
+#line 18325 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18337,7 +18340,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18340: checking for $CC warning options..." >&5
+	{ echo "$as_me:18343: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18354,12 +18357,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18357: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18360: \$? = $ac_status" >&5
+  echo "$as_me:18363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18362: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18365: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18368,7 +18371,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18371: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18374: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18398,16 +18401,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18404: \$? = $ac_status" >&5
+  echo "$as_me:18407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18406: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18409: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18410: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18413: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18425,7 +18428,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18428: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18431: 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.
@@ -18435,7 +18438,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18438: result: $enable_string_hacks" >&5
+echo "$as_me:18441: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18444,15 +18447,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18447: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18450: 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:18449: checking for strlcat" >&5
+	echo "$as_me:18452: 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 18455 "configure"
+#line 18458 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18483,16 +18486,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18489: \$? = $ac_status" >&5
+  echo "$as_me:18492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18495: \$? = $ac_status" >&5
+  echo "$as_me:18498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18502,7 +18505,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18505: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18508: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18512,7 +18515,7 @@ EOF
 
 else
 
-		echo "$as_me:18515: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18518: 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
@@ -18520,7 +18523,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18523 "configure"
+#line 18526 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18539,16 +18542,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18545: \$? = $ac_status" >&5
+  echo "$as_me:18548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18551: \$? = $ac_status" >&5
+  echo "$as_me:18554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18559,7 +18562,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18562: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18565: 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
 
@@ -18582,23 +18585,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18585: checking for $ac_header" >&5
+echo "$as_me:18588: 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 18591 "configure"
+#line 18594 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18601: \$? = $ac_status" >&5
+  echo "$as_me:18604: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18617,7 +18620,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18638,13 +18641,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18641: checking for $ac_func" >&5
+echo "$as_me:18644: 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 18647 "configure"
+#line 18650 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18675,16 +18678,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18681: \$? = $ac_status" >&5
+  echo "$as_me:18684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18687: \$? = $ac_status" >&5
+  echo "$as_me:18690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18694,7 +18697,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18697: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18700: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18707,7 +18710,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18710: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18713: 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.
@@ -18717,7 +18720,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18720: result: $with_assertions" >&5
+echo "$as_me:18723: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18733,7 +18736,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18736: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18739: 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.
@@ -18755,7 +18758,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18758: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18761: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18869,23 +18872,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18872: checking for dmalloc.h" >&5
+	echo "$as_me:18875: 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 18878 "configure"
+#line 18881 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18882: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18885: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18888: \$? = $ac_status" >&5
+  echo "$as_me:18891: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18904,11 +18907,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18907: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18910: 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:18911: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18914: 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
@@ -18916,7 +18919,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18919 "configure"
+#line 18922 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18935,16 +18938,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18941: \$? = $ac_status" >&5
+  echo "$as_me:18944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18947: \$? = $ac_status" >&5
+  echo "$as_me:18950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18955,7 +18958,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18958: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18961: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18970,7 +18973,7 @@ fi
 
 fi
 
-echo "$as_me:18973: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18976: 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.
@@ -18992,7 +18995,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18995: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18998: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19106,23 +19109,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19109: checking for dbmalloc.h" >&5
+	echo "$as_me:19112: 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 19115 "configure"
+#line 19118 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19122: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19125: \$? = $ac_status" >&5
+  echo "$as_me:19128: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19141,11 +19144,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19144: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19147: 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:19148: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19151: 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
@@ -19153,7 +19156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19156 "configure"
+#line 19159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19172,16 +19175,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19178: \$? = $ac_status" >&5
+  echo "$as_me:19181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19184: \$? = $ac_status" >&5
+  echo "$as_me:19187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19192,7 +19195,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19195: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19198: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19207,7 +19210,7 @@ fi
 
 fi
 
-echo "$as_me:19210: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19213: 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.
@@ -19229,7 +19232,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19232: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19235: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19342,7 +19345,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19345: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19348: 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.
@@ -19353,7 +19356,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19356: result: $with_no_leaks" >&5
+echo "$as_me:19359: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19405,7 +19408,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19408: checking whether to add trace feature to all models" >&5
+echo "$as_me:19411: 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.
@@ -19415,7 +19418,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19418: result: $cf_with_trace" >&5
+echo "$as_me:19421: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19435,7 +19438,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19438: checking if we want to use GNAT projects" >&5
+echo "$as_me:19441: 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.
@@ -19452,7 +19455,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19455: result: $enable_gnat_projects" >&5
+echo "$as_me:19458: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19465,14 +19468,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19468: checking if ssp library is needed" >&5
+echo "$as_me:19471: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19475 "configure"
+#line 19478 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19489,16 +19492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19495: \$? = $ac_status" >&5
+  echo "$as_me:19498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19508,7 +19511,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19511 "configure"
+#line 19514 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19525,16 +19528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19531: \$? = $ac_status" >&5
+  echo "$as_me:19534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19537: \$? = $ac_status" >&5
+  echo "$as_me:19540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19548,7 +19551,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19551: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19554: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19577,14 +19580,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19580: checking if -lm needed for math functions" >&5
+echo "$as_me:19583: 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 19587 "configure"
+#line 19590 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19600,16 +19603,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19606: \$? = $ac_status" >&5
+  echo "$as_me:19609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19612: \$? = $ac_status" >&5
+  echo "$as_me:19615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19619,7 +19622,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19622: result: $cf_cv_need_libm" >&5
+echo "$as_me:19625: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19627,14 +19630,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19630: checking if -lm is available for math functions" >&5
+	echo "$as_me:19633: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19637 "configure"
+#line 19640 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19650,16 +19653,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19656: \$? = $ac_status" >&5
+  echo "$as_me:19659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19662: \$? = $ac_status" >&5
+  echo "$as_me:19665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19669,7 +19672,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19672: result: $cf_cv_have_libm" >&5
+echo "$as_me:19675: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19691,13 +19694,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19694: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19697: 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 19700 "configure"
+#line 19703 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19713,16 +19716,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19719: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19725: \$? = $ac_status" >&5
+  echo "$as_me:19728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19732,7 +19735,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19735: result: $ac_cv_header_time" >&5
+echo "$as_me:19738: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19747,7 +19750,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19750: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19753: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19755,7 +19758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19758 "configure"
+#line 19761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19774,16 +19777,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:19783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:19789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19794,11 +19797,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19797: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19800: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19801: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19804: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19806,7 +19809,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19809 "configure"
+#line 19812 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19825,16 +19828,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19831: \$? = $ac_status" >&5
+  echo "$as_me:19834: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19837: \$? = $ac_status" >&5
+  echo "$as_me:19840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19845,7 +19848,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19848: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19851: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19867,7 +19870,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19870: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19873: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19875,7 +19878,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19878 "configure"
+#line 19881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19894,16 +19897,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19900: \$? = $ac_status" >&5
+  echo "$as_me:19903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19906: \$? = $ac_status" >&5
+  echo "$as_me:19909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19914,7 +19917,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19917: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19920: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19936,7 +19939,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19939: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19942: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19944,7 +19947,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19947 "configure"
+#line 19950 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19963,16 +19966,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19969: \$? = $ac_status" >&5
+  echo "$as_me:19972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19975: \$? = $ac_status" >&5
+  echo "$as_me:19978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19983,7 +19986,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19986: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19989: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20025,7 +20028,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20028: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20031: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20033,7 +20036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20036 "configure"
+#line 20039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20052,16 +20055,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20058: \$? = $ac_status" >&5
+  echo "$as_me:20061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20064: \$? = $ac_status" >&5
+  echo "$as_me:20067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20072,7 +20075,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20075: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20078: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20100,13 +20103,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20103: checking for regcomp" >&5
+	echo "$as_me:20106: 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 20109 "configure"
+#line 20112 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20137,16 +20140,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20143: \$? = $ac_status" >&5
+  echo "$as_me:20146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20149: \$? = $ac_status" >&5
+  echo "$as_me:20152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20156,7 +20159,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20159: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20162: 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
@@ -20165,7 +20168,7 @@ else
 		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:20168: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20171: 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
@@ -20173,7 +20176,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20176 "configure"
+#line 20179 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20192,16 +20195,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20198: \$? = $ac_status" >&5
+  echo "$as_me:20201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20204: \$? = $ac_status" >&5
+  echo "$as_me:20207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20212,7 +20215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20215: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20218: 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
 
@@ -20244,13 +20247,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20247: checking for compile" >&5
+	echo "$as_me:20250: 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 20253 "configure"
+#line 20256 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20281,16 +20284,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20287: \$? = $ac_status" >&5
+  echo "$as_me:20290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20293: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20300,13 +20303,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20303: result: $ac_cv_func_compile" >&5
+echo "$as_me:20306: 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:20309: checking for compile in -lgen" >&5
+		echo "$as_me:20312: 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
@@ -20314,7 +20317,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20317 "configure"
+#line 20320 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20333,16 +20336,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20339: \$? = $ac_status" >&5
+  echo "$as_me:20342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20353,7 +20356,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20356: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20359: 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
 
@@ -20381,11 +20384,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20384: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20387: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20388: checking for regular-expression headers" >&5
+echo "$as_me:20391: 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
@@ -20397,7 +20400,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20400 "configure"
+#line 20403 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20414,16 +20417,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20420: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20426: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20440,7 +20443,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20443 "configure"
+#line 20446 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -20460,16 +20463,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20466: \$? = $ac_status" >&5
+  echo "$as_me:20469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20472: \$? = $ac_status" >&5
+  echo "$as_me:20475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20485,11 +20488,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20488: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20491: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20492: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20495: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20527,23 +20530,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20530: checking for $ac_header" >&5
+echo "$as_me:20533: 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 20536 "configure"
+#line 20539 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20540: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20543: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20546: \$? = $ac_status" >&5
+  echo "$as_me:20549: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20562,7 +20565,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20565: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20568: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20575,23 +20578,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20578: checking for $ac_header" >&5
+echo "$as_me:20581: 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 20584 "configure"
+#line 20587 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20594: \$? = $ac_status" >&5
+  echo "$as_me:20597: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20610,7 +20613,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20613: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20616: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20620,7 +20623,7 @@ EOF
 fi
 done
 
-echo "$as_me:20623: checking for header declaring getopt variables" >&5
+echo "$as_me:20626: 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
@@ -20630,7 +20633,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20633 "configure"
+#line 20636 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20643,16 +20646,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20649: \$? = $ac_status" >&5
+  echo "$as_me:20652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20655: \$? = $ac_status" >&5
+  echo "$as_me:20658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20664,7 +20667,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20667: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20670: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20681,14 +20684,14 @@ EOF
 
 fi
 
-echo "$as_me:20684: checking if external environ is declared" >&5
+echo "$as_me:20687: 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 20691 "configure"
+#line 20694 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20701,16 +20704,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20707: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20713: \$? = $ac_status" >&5
+  echo "$as_me:20716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20721,7 +20724,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20724: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20727: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20736,14 +20739,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20739: checking if external environ exists" >&5
+echo "$as_me:20742: 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 20746 "configure"
+#line 20749 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20758,16 +20761,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20764: \$? = $ac_status" >&5
+  echo "$as_me:20767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20770: \$? = $ac_status" >&5
+  echo "$as_me:20773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20778,7 +20781,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20781: result: $cf_cv_have_environ" >&5
+echo "$as_me:20784: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20791,13 +20794,13 @@ EOF
 
 fi
 
-echo "$as_me:20794: checking for getenv" >&5
+echo "$as_me:20797: 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 20800 "configure"
+#line 20803 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20828,16 +20831,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20834: \$? = $ac_status" >&5
+  echo "$as_me:20837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20840: \$? = $ac_status" >&5
+  echo "$as_me:20843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20847,19 +20850,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20850: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20853: 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:20856: checking for $ac_func" >&5
+echo "$as_me:20859: 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 20862 "configure"
+#line 20865 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20890,16 +20893,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20896: \$? = $ac_status" >&5
+  echo "$as_me:20899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20902: \$? = $ac_status" >&5
+  echo "$as_me:20905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20909,7 +20912,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20915: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20919,7 +20922,7 @@ EOF
 fi
 done
 
-echo "$as_me:20922: checking if getenv returns consistent values" >&5
+echo "$as_me:20925: 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
@@ -20929,7 +20932,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20932 "configure"
+#line 20935 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21034,15 +21037,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21040: \$? = $ac_status" >&5
+  echo "$as_me:21043: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21045: \$? = $ac_status" >&5
+  echo "$as_me:21048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21055,7 +21058,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21058: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21061: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21070,18 +21073,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21073: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21076: 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
 
-echo "$as_me:21077: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21080: 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 21084 "configure"
+#line 21087 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21101,16 +21104,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21107: \$? = $ac_status" >&5
+  echo "$as_me:21110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21113: \$? = $ac_status" >&5
+  echo "$as_me:21116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21122,7 +21125,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21125: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21128: 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
@@ -21137,13 +21140,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21140: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21143: 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 21146 "configure"
+#line 21149 "configure"
 #include "confdefs.h"
 
 int
@@ -21205,16 +21208,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21211: \$? = $ac_status" >&5
+  echo "$as_me:21214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21217: \$? = $ac_status" >&5
+  echo "$as_me:21220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21224,7 +21227,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21227: result: $ac_cv_c_const" >&5
+echo "$as_me:21230: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21234,7 +21237,7 @@ EOF
 
 fi
 
-echo "$as_me:21237: checking for inline" >&5
+echo "$as_me:21240: 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
@@ -21242,7 +21245,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21245 "configure"
+#line 21248 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21251,16 +21254,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21257: \$? = $ac_status" >&5
+  echo "$as_me:21260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21263: \$? = $ac_status" >&5
+  echo "$as_me:21266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21271,7 +21274,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21274: result: $ac_cv_c_inline" >&5
+echo "$as_me:21277: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21297,7 +21300,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21300: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21303: 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
@@ -21306,7 +21309,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21309 "configure"
+#line 21312 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21318,16 +21321,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21324: \$? = $ac_status" >&5
+  echo "$as_me:21327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21330: \$? = $ac_status" >&5
+  echo "$as_me:21333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21339,7 +21342,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21342: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21345: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21445,7 +21448,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21448: checking for signal global datatype" >&5
+echo "$as_me:21451: 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
@@ -21457,7 +21460,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21460 "configure"
+#line 21463 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21481,16 +21484,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21487: \$? = $ac_status" >&5
+  echo "$as_me:21490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21493: \$? = $ac_status" >&5
+  echo "$as_me:21496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21504,7 +21507,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21507: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21510: 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 <<EOF
@@ -21513,7 +21516,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21516: checking for type of chtype" >&5
+echo "$as_me:21519: 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
@@ -21523,7 +21526,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21526 "configure"
+#line 21529 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21558,15 +21561,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21564: \$? = $ac_status" >&5
+  echo "$as_me:21567: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21569: \$? = $ac_status" >&5
+  echo "$as_me:21572: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21581,7 +21584,7 @@ fi
 
 fi
 
-echo "$as_me:21584: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21587: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21593,14 +21596,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21596: checking if unsigned literals are legal" >&5
+echo "$as_me:21599: 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 21603 "configure"
+#line 21606 "configure"
 #include "confdefs.h"
 
 int
@@ -21612,16 +21615,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21618: \$? = $ac_status" >&5
+  echo "$as_me:21621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21624: \$? = $ac_status" >&5
+  echo "$as_me:21627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21633,7 +21636,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21636: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21639: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21649,14 +21652,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21652: checking if external errno is declared" >&5
+echo "$as_me:21655: 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 21659 "configure"
+#line 21662 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21670,16 +21673,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21676: \$? = $ac_status" >&5
+  echo "$as_me:21679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21682: \$? = $ac_status" >&5
+  echo "$as_me:21685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21690,7 +21693,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21693: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21696: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21705,14 +21708,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21708: checking if external errno exists" >&5
+echo "$as_me:21711: 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 21715 "configure"
+#line 21718 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21727,16 +21730,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21730: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21733: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21733: \$? = $ac_status" >&5
+  echo "$as_me:21736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21739: \$? = $ac_status" >&5
+  echo "$as_me:21742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21747,7 +21750,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21750: result: $cf_cv_have_errno" >&5
+echo "$as_me:21753: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21760,7 +21763,7 @@ EOF
 
 fi
 
-echo "$as_me:21763: checking if data-only library module links" >&5
+echo "$as_me:21766: 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
@@ -21768,20 +21771,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21771 "configure"
+#line 21774 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21777: \$? = $ac_status" >&5
+  echo "$as_me:21780: \$? = $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 <<EOF
-#line 21784 "configure"
+#line 21787 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21798,10 +21801,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21801: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21804: \$? = $ac_status" >&5
+  echo "$as_me:21807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21814,7 +21817,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21817 "configure"
+#line 21820 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21825,15 +21828,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21831: \$? = $ac_status" >&5
+  echo "$as_me:21834: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21836: \$? = $ac_status" >&5
+  echo "$as_me:21839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21848,7 +21851,7 @@ fi
 
 fi
 
-echo "$as_me:21851: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21854: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21863,13 +21866,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21866: checking for clock_gettime" >&5
+echo "$as_me:21869: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21872 "configure"
+#line 21875 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21900,16 +21903,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21906: \$? = $ac_status" >&5
+  echo "$as_me:21909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21912: \$? = $ac_status" >&5
+  echo "$as_me:21915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21919,12 +21922,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21922: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21925: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21927: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21930: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21932,7 +21935,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21935 "configure"
+#line 21938 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21951,16 +21954,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21957: \$? = $ac_status" >&5
+  echo "$as_me:21960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21963: \$? = $ac_status" >&5
+  echo "$as_me:21966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21971,7 +21974,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21974: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21977: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21983,14 +21986,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21986: checking if clock_gettime links" >&5
+echo "$as_me:21989: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21993 "configure"
+#line 21996 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22008,16 +22011,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22014: \$? = $ac_status" >&5
+  echo "$as_me:22017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22020: \$? = $ac_status" >&5
+  echo "$as_me:22023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22028,7 +22031,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22031: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22034: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22042,13 +22045,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22045: checking for gettimeofday" >&5
+echo "$as_me:22048: 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 22051 "configure"
+#line 22054 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22079,16 +22082,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22085: \$? = $ac_status" >&5
+  echo "$as_me:22088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22091: \$? = $ac_status" >&5
+  echo "$as_me:22094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22098,7 +22101,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22101: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22104: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22108,7 +22111,7 @@ EOF
 
 else
 
-echo "$as_me:22111: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22114: 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
@@ -22116,7 +22119,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22119 "configure"
+#line 22122 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22135,16 +22138,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22147: \$? = $ac_status" >&5
+  echo "$as_me:22150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22155,7 +22158,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22158: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22161: 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
 
@@ -22214,13 +22217,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22217: checking for $ac_func" >&5
+echo "$as_me:22220: 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 22223 "configure"
+#line 22226 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22251,16 +22254,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22257: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22263: \$? = $ac_status" >&5
+  echo "$as_me:22266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22270,7 +22273,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22273: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22276: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22280,14 +22283,14 @@ EOF
 fi
 done
 
-echo "$as_me:22283: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22286: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22290 "configure"
+#line 22293 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22302,16 +22305,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22308: \$? = $ac_status" >&5
+  echo "$as_me:22311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22314: \$? = $ac_status" >&5
+  echo "$as_me:22317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22321,7 +22324,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22324: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22327: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22343,7 +22346,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22346: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22349: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22353,7 +22356,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22356 "configure"
+#line 22359 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22366,15 +22369,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22372: \$? = $ac_status" >&5
+  echo "$as_me:22375: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22377: \$? = $ac_status" >&5
+  echo "$as_me:22380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22386,7 +22389,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22389: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22392: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22398,14 +22401,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22401: checking for getttynam" >&5
+	echo "$as_me:22404: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22408 "configure"
+#line 22411 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22417,16 +22420,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22423: \$? = $ac_status" >&5
+  echo "$as_me:22426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22429: \$? = $ac_status" >&5
+  echo "$as_me:22432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22436,7 +22439,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22439: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22442: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22446,7 +22449,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22449: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22452: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22455,7 +22458,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22458: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22461: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22468,14 +22471,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22471: checking for terminal-capability database functions" >&5
+echo "$as_me:22474: 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 22478 "configure"
+#line 22481 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22495,16 +22498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22501: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22507: \$? = $ac_status" >&5
+  echo "$as_me:22510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22515,7 +22518,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22518: result: $cf_cv_cgetent" >&5
+echo "$as_me:22521: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22525,14 +22528,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22528: checking if cgetent uses const parameter" >&5
+echo "$as_me:22531: 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 22535 "configure"
+#line 22538 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22555,16 +22558,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22561: \$? = $ac_status" >&5
+  echo "$as_me:22564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22567: \$? = $ac_status" >&5
+  echo "$as_me:22570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22575,7 +22578,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22578: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22581: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22589,14 +22592,14 @@ fi
 
 fi
 
-echo "$as_me:22592: checking for isascii" >&5
+echo "$as_me:22595: 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 22599 "configure"
+#line 22602 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22608,16 +22611,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22614: \$? = $ac_status" >&5
+  echo "$as_me:22617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22620: \$? = $ac_status" >&5
+  echo "$as_me:22623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22628,7 +22631,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22631: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22634: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22636,10 +22639,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22639: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22642: 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 22642 "configure"
+#line 22645 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22653,16 +22656,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22659: \$? = $ac_status" >&5
+  echo "$as_me:22662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22665: \$? = $ac_status" >&5
+  echo "$as_me:22668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22670,7 +22673,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22673 "configure"
+#line 22676 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22685,16 +22688,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22691: \$? = $ac_status" >&5
+  echo "$as_me:22694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22697: \$? = $ac_status" >&5
+  echo "$as_me:22700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22710,11 +22713,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22713: result: $sigact_bad" >&5
+echo "$as_me:22716: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22717: checking if nanosleep really works" >&5
+echo "$as_me:22720: 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
@@ -22724,7 +22727,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22727 "configure"
+#line 22730 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22750,15 +22753,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22756: \$? = $ac_status" >&5
+  echo "$as_me:22759: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22761: \$? = $ac_status" >&5
+  echo "$as_me:22764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22770,7 +22773,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22773: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22776: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22787,23 +22790,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22790: checking for $ac_header" >&5
+echo "$as_me:22793: 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 22796 "configure"
+#line 22799 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22806: \$? = $ac_status" >&5
+  echo "$as_me:22809: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22822,7 +22825,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22839,10 +22842,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22842: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22845: 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 22845 "configure"
+#line 22848 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22854,16 +22857,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22860: \$? = $ac_status" >&5
+  echo "$as_me:22863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22866: \$? = $ac_status" >&5
+  echo "$as_me:22869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22871,7 +22874,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22874 "configure"
+#line 22877 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22885,16 +22888,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22891: \$? = $ac_status" >&5
+  echo "$as_me:22894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22897: \$? = $ac_status" >&5
+  echo "$as_me:22900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22910,19 +22913,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22913: result: $termios_bad" >&5
+	echo "$as_me:22916: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22918: checking for tcgetattr" >&5
+echo "$as_me:22921: 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 22925 "configure"
+#line 22928 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22950,16 +22953,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22956: \$? = $ac_status" >&5
+  echo "$as_me:22959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22962: \$? = $ac_status" >&5
+  echo "$as_me:22965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22969,21 +22972,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22972: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22975: 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:22979: checking for vsscanf function or workaround" >&5
+echo "$as_me:22982: 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 22986 "configure"
+#line 22989 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23009,16 +23012,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23015: \$? = $ac_status" >&5
+  echo "$as_me:23018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23021: \$? = $ac_status" >&5
+  echo "$as_me:23024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23026,7 +23029,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23029 "configure"
+#line 23032 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23048,16 +23051,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23054: \$? = $ac_status" >&5
+  echo "$as_me:23057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23060: \$? = $ac_status" >&5
+  echo "$as_me:23063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23065,7 +23068,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23068 "configure"
+#line 23071 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23087,16 +23090,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23090: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23093: \$? = $ac_status" >&5
+  echo "$as_me:23096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23099: \$? = $ac_status" >&5
+  echo "$as_me:23102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23111,7 +23114,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23114: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23117: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23137,23 +23140,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23140: checking for $ac_header" >&5
+echo "$as_me:23143: 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 23146 "configure"
+#line 23149 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23153: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23156: \$? = $ac_status" >&5
+  echo "$as_me:23159: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23172,7 +23175,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23178: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23182,7 +23185,7 @@ EOF
 fi
 done
 
-echo "$as_me:23185: checking for working mkstemp" >&5
+echo "$as_me:23188: 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
@@ -23193,7 +23196,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23196 "configure"
+#line 23199 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23228,15 +23231,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23234: \$? = $ac_status" >&5
+  echo "$as_me:23237: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23239: \$? = $ac_status" >&5
+  echo "$as_me:23242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23251,16 +23254,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23254: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23257: 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:23257: checking for mkstemp" >&5
+	echo "$as_me:23260: 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 23263 "configure"
+#line 23266 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23291,16 +23294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23297: \$? = $ac_status" >&5
+  echo "$as_me:23300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23303: \$? = $ac_status" >&5
+  echo "$as_me:23306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23310,7 +23313,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23313: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23316: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23331,21 +23334,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23337: 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:23337: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23340: 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:23343: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23346: 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 23348 "configure"
+#line 23351 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23362,15 +23365,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23368: \$? = $ac_status" >&5
+  echo "$as_me:23371: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23373: \$? = $ac_status" >&5
+  echo "$as_me:23376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23383,7 +23386,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23386: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23389: 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
 
@@ -23394,13 +23397,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23397: checking for intptr_t" >&5
+echo "$as_me:23400: 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 23403 "configure"
+#line 23406 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23415,16 +23418,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23421: \$? = $ac_status" >&5
+  echo "$as_me:23424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23427: \$? = $ac_status" >&5
+  echo "$as_me:23430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23434,7 +23437,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23437: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23440: 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
   :
@@ -23446,13 +23449,13 @@ EOF
 
 fi
 
-echo "$as_me:23449: checking for ssize_t" >&5
+echo "$as_me:23452: 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 23455 "configure"
+#line 23458 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23467,16 +23470,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23473: \$? = $ac_status" >&5
+  echo "$as_me:23476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23479: \$? = $ac_status" >&5
+  echo "$as_me:23482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23486,7 +23489,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23489: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23492: 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
   :
@@ -23498,14 +23501,14 @@ EOF
 
 fi
 
-echo "$as_me:23501: checking for type sigaction_t" >&5
+echo "$as_me:23504: 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 23508 "configure"
+#line 23511 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23518,16 +23521,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23524: \$? = $ac_status" >&5
+  echo "$as_me:23527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23530: \$? = $ac_status" >&5
+  echo "$as_me:23533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23538,14 +23541,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23541: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23544: 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:23548: checking declaration of size-change" >&5
+echo "$as_me:23551: 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
@@ -23566,7 +23569,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23569 "configure"
+#line 23572 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23616,16 +23619,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23622: \$? = $ac_status" >&5
+  echo "$as_me:23625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23628: \$? = $ac_status" >&5
+  echo "$as_me:23631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23644,7 +23647,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23647: result: $cf_cv_sizechange" >&5
+echo "$as_me:23650: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23662,13 +23665,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23665: checking for memmove" >&5
+echo "$as_me:23668: 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 23671 "configure"
+#line 23674 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23699,16 +23702,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23705: \$? = $ac_status" >&5
+  echo "$as_me:23708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23711: \$? = $ac_status" >&5
+  echo "$as_me:23714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23718,19 +23721,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23721: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23724: 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:23727: checking for bcopy" >&5
+echo "$as_me:23730: 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 23733 "configure"
+#line 23736 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23761,16 +23764,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23767: \$? = $ac_status" >&5
+  echo "$as_me:23770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23773: \$? = $ac_status" >&5
+  echo "$as_me:23776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23780,11 +23783,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23783: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23786: 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:23787: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23790: 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
@@ -23794,7 +23797,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23797 "configure"
+#line 23800 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23810,15 +23813,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23816: \$? = $ac_status" >&5
+  echo "$as_me:23819: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23821: \$? = $ac_status" >&5
+  echo "$as_me:23824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23831,7 +23834,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23834: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23837: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23858,13 +23861,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23861: checking for $ac_func" >&5
+echo "$as_me:23864: 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 23867 "configure"
+#line 23870 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23895,16 +23898,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23901: \$? = $ac_status" >&5
+  echo "$as_me:23904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23907: \$? = $ac_status" >&5
+  echo "$as_me:23910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23914,7 +23917,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23917: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23920: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23924,7 +23927,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23927: checking if poll really works" >&5
+echo "$as_me:23930: 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
@@ -23934,7 +23937,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23937 "configure"
+#line 23940 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23987,15 +23990,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23993: \$? = $ac_status" >&5
+  echo "$as_me:23996: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23998: \$? = $ac_status" >&5
+  echo "$as_me:24001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24007,21 +24010,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24010: result: $cf_cv_working_poll" >&5
+echo "$as_me:24013: 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:24017: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24020: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24024 "configure"
+#line 24027 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24041,16 +24044,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24047: \$? = $ac_status" >&5
+  echo "$as_me:24050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24053: \$? = $ac_status" >&5
+  echo "$as_me:24056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24060,7 +24063,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24063: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24066: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24070,18 +24073,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24073: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24076: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24077: checking for va_copy" >&5
+echo "$as_me:24080: 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 24084 "configure"
+#line 24087 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24098,16 +24101,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24104: \$? = $ac_status" >&5
+  echo "$as_me:24107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24110: \$? = $ac_status" >&5
+  echo "$as_me:24113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24117,7 +24120,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24120: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24123: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24129,14 +24132,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24132: checking for __va_copy" >&5
+echo "$as_me:24135: 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 24139 "configure"
+#line 24142 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24153,16 +24156,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24159: \$? = $ac_status" >&5
+  echo "$as_me:24162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24165: \$? = $ac_status" >&5
+  echo "$as_me:24168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24172,7 +24175,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24175: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24178: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24184,14 +24187,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24187: checking for __builtin_va_copy" >&5
+echo "$as_me:24190: 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 24194 "configure"
+#line 24197 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24208,16 +24211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24214: \$? = $ac_status" >&5
+  echo "$as_me:24217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24220: \$? = $ac_status" >&5
+  echo "$as_me:24223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24227,7 +24230,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24230: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24233: 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 &&
@@ -24245,14 +24248,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24248: checking if we can simply copy va_list" >&5
+	echo "$as_me:24251: 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 24255 "configure"
+#line 24258 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24269,16 +24272,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24275: \$? = $ac_status" >&5
+  echo "$as_me:24278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24281: \$? = $ac_status" >&5
+  echo "$as_me:24284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24288,19 +24291,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24291: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24294: 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:24296: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24299: 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 24303 "configure"
+#line 24306 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24317,16 +24320,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24323: \$? = $ac_status" >&5
+  echo "$as_me:24326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24329: \$? = $ac_status" >&5
+  echo "$as_me:24332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24336,7 +24339,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24339: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24342: 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
@@ -24347,13 +24350,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24350: checking for pid_t" >&5
+echo "$as_me:24353: 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 24356 "configure"
+#line 24359 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24368,16 +24371,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24374: \$? = $ac_status" >&5
+  echo "$as_me:24377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24380: \$? = $ac_status" >&5
+  echo "$as_me:24383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24387,7 +24390,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24390: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24393: 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
   :
@@ -24402,23 +24405,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24405: checking for $ac_header" >&5
+echo "$as_me:24408: 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 24411 "configure"
+#line 24414 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24418: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24421: \$? = $ac_status" >&5
+  echo "$as_me:24424: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24437,7 +24440,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24443: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24450,13 +24453,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24453: checking for $ac_func" >&5
+echo "$as_me:24456: 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 24459 "configure"
+#line 24462 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24487,16 +24490,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24493: \$? = $ac_status" >&5
+  echo "$as_me:24496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24499: \$? = $ac_status" >&5
+  echo "$as_me:24502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24506,7 +24509,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24512: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24518,7 +24521,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24521: checking for working fork" >&5
+  echo "$as_me:24524: 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
@@ -24541,15 +24544,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24547: \$? = $ac_status" >&5
+  echo "$as_me:24550: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24552: \$? = $ac_status" >&5
+  echo "$as_me:24555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24561,7 +24564,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24564: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24567: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24575,12 +24578,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24578: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24581: 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:24583: checking for working vfork" >&5
+  echo "$as_me:24586: 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
@@ -24589,7 +24592,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24592 "configure"
+#line 24595 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24682,15 +24685,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24688: \$? = $ac_status" >&5
+  echo "$as_me:24691: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24693: \$? = $ac_status" >&5
+  echo "$as_me:24696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24702,13 +24705,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24705: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24708: 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:24711: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24714: 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
 
@@ -24733,7 +24736,7 @@ EOF
 
 fi
 
-echo "$as_me:24736: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24739: 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
@@ -24743,7 +24746,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24746 "configure"
+#line 24749 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24778,15 +24781,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24784: \$? = $ac_status" >&5
+  echo "$as_me:24787: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24789: \$? = $ac_status" >&5
+  echo "$as_me:24792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24799,7 +24802,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24802: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24805: 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
@@ -24808,7 +24811,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:24811: checking for openpty in -lutil" >&5
+echo "$as_me:24814: 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
@@ -24816,7 +24819,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24819 "configure"
+#line 24822 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24835,16 +24838,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24841: \$? = $ac_status" >&5
+  echo "$as_me:24844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24847: \$? = $ac_status" >&5
+  echo "$as_me:24850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24855,7 +24858,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24858: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:24861: 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
@@ -24863,7 +24866,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24866: checking for openpty header" >&5
+echo "$as_me:24869: 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
@@ -24890,7 +24893,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24893 "configure"
+#line 24896 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24908,16 +24911,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24914: \$? = $ac_status" >&5
+  echo "$as_me:24917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24920: \$? = $ac_status" >&5
+  echo "$as_me:24923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24935,7 +24938,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24938: result: $cf_cv_func_openpty" >&5
+echo "$as_me:24941: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25008,7 +25011,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25011 "configure"
+#line 25014 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25020,16 +25023,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25026: \$? = $ac_status" >&5
+  echo "$as_me:25029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25032: \$? = $ac_status" >&5
+  echo "$as_me:25035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25046,7 +25049,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25049: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25052: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25082,7 +25085,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25085: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25088: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25093,7 +25096,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25096: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25099: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25165,7 +25168,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25168 "configure"
+#line 25171 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25177,16 +25180,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25183: \$? = $ac_status" >&5
+  echo "$as_me:25186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25189: \$? = $ac_status" >&5
+  echo "$as_me:25192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25203,7 +25206,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25206: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25209: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25283,7 +25286,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25286: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25289: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25300,23 +25303,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25303: checking for db.h" >&5
+echo "$as_me:25306: 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 25309 "configure"
+#line 25312 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25319: \$? = $ac_status" >&5
+  echo "$as_me:25322: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25335,11 +25338,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25338: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25341: 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:25342: checking for version of db" >&5
+echo "$as_me:25345: 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
@@ -25350,10 +25353,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25353: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25356: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25356 "configure"
+#line 25359 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25383,16 +25386,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25389: \$? = $ac_status" >&5
+  echo "$as_me:25392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25395: \$? = $ac_status" >&5
+  echo "$as_me:25398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25406,16 +25409,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25409: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25412: 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:25413: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25416: 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:25418: checking for db libraries" >&5
+echo "$as_me:25421: 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
@@ -25445,10 +25448,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25448: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25451: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25451 "configure"
+#line 25454 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25503,16 +25506,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25509: \$? = $ac_status" >&5
+  echo "$as_me:25512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25515: \$? = $ac_status" >&5
+  echo "$as_me:25518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25532,11 +25535,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25535: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25538: 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:25539: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25542: 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
@@ -25562,7 +25565,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25565: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25568: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25577,7 +25580,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25580: checking if we should include stdbool.h" >&5
+echo "$as_me:25583: 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
@@ -25585,7 +25588,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25588 "configure"
+#line 25591 "configure"
 #include "confdefs.h"
 
 int
@@ -25597,23 +25600,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25603: \$? = $ac_status" >&5
+  echo "$as_me:25606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25609: \$? = $ac_status" >&5
+  echo "$as_me:25612: \$? = $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 25616 "configure"
+#line 25619 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25629,16 +25632,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25635: \$? = $ac_status" >&5
+  echo "$as_me:25638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25641: \$? = $ac_status" >&5
+  echo "$as_me:25644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25652,13 +25655,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25655: result: yes" >&5
+then	echo "$as_me:25658: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25657: result: no" >&5
+else	echo "$as_me:25660: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25661: checking for builtin bool type" >&5
+echo "$as_me:25664: 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
@@ -25666,7 +25669,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25669 "configure"
+#line 25672 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25681,16 +25684,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25687: \$? = $ac_status" >&5
+  echo "$as_me:25690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25693: \$? = $ac_status" >&5
+  echo "$as_me:25696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25703,9 +25706,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25706: result: yes" >&5
+then	echo "$as_me:25709: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25708: result: no" >&5
+else	echo "$as_me:25711: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25722,10 +25725,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25725: checking if we already have C++ library" >&5
+	echo "$as_me:25728: 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 25728 "configure"
+#line 25731 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25739,16 +25742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25745: \$? = $ac_status" >&5
+  echo "$as_me:25748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25751: \$? = $ac_status" >&5
+  echo "$as_me:25754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25757,7 +25760,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25760: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25763: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25776,7 +25779,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25779: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25782: 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
@@ -25802,7 +25805,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25805 "configure"
+#line 25808 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25816,16 +25819,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25822: \$? = $ac_status" >&5
+  echo "$as_me:25825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25828: \$? = $ac_status" >&5
+  echo "$as_me:25831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25837,7 +25840,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25840: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:25843: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25859,7 +25862,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25862: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:25865: 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
@@ -25874,15 +25877,15 @@ CF_EOF
 # 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:25877: \"$ac_try\"") >&5
+if { (eval echo "$as_me:25880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25880: \$? = $ac_status" >&5
+  echo "$as_me:25883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25882: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:25885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25885: \$? = $ac_status" >&5
+  echo "$as_me:25888: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25893,10 +25896,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25896: result: yes" >&5
+  echo "$as_me:25899: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25899: result: no" >&5
+  echo "$as_me:25902: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25916,7 +25919,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25919: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:25922: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25937,7 +25940,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25940 "configure"
+#line 25943 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25951,16 +25954,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25957: \$? = $ac_status" >&5
+  echo "$as_me:25960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25963: \$? = $ac_status" >&5
+  echo "$as_me:25966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -25997,7 +26000,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26000 "configure"
+#line 26003 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26011,16 +26014,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26017: \$? = $ac_status" >&5
+  echo "$as_me:26020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26023: \$? = $ac_status" >&5
+  echo "$as_me:26026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26053,7 +26056,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26056: result: $cf_cxx_library" >&5
+	echo "$as_me:26059: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26069,7 +26072,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26072: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26075: 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
@@ -26086,18 +26089,18 @@ do
   # 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 26089 "configure"
+#line 26092 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26094: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26100: \$? = $ac_status" >&5
+  echo "$as_me:26103: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26120,17 +26123,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26123 "configure"
+#line 26126 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26133: \$? = $ac_status" >&5
+  echo "$as_me:26136: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26167,7 +26170,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26170: result: $CXXCPP" >&5
+echo "$as_me:26173: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26177,18 +26180,18 @@ do
   # 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 26180 "configure"
+#line 26183 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26185: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26191: \$? = $ac_status" >&5
+  echo "$as_me:26194: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26211,17 +26214,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26214 "configure"
+#line 26217 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26224: \$? = $ac_status" >&5
+  echo "$as_me:26227: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26249,7 +26252,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26252: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26255: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26264,23 +26267,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26267: checking for $ac_header" >&5
+echo "$as_me:26270: 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 26273 "configure"
+#line 26276 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26277: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26280: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26283: \$? = $ac_status" >&5
+  echo "$as_me:26286: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26299,7 +26302,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26302: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26312,23 +26315,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26315: checking for $ac_header" >&5
+echo "$as_me:26318: 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 26321 "configure"
+#line 26324 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26328: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26331: \$? = $ac_status" >&5
+  echo "$as_me:26334: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26347,7 +26350,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26353: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26358,10 +26361,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26361: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26364: 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 26364 "configure"
+#line 26367 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26378,16 +26381,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26384: \$? = $ac_status" >&5
+  echo "$as_me:26387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26390: \$? = $ac_status" >&5
+  echo "$as_me:26393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26396,7 +26399,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26399: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26402: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26407,7 +26410,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26410: checking if we should include stdbool.h" >&5
+echo "$as_me:26413: 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
@@ -26415,7 +26418,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26418 "configure"
+#line 26421 "configure"
 #include "confdefs.h"
 
 int
@@ -26427,23 +26430,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26433: \$? = $ac_status" >&5
+  echo "$as_me:26436: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26439: \$? = $ac_status" >&5
+  echo "$as_me:26442: \$? = $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 26446 "configure"
+#line 26449 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26459,16 +26462,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26465: \$? = $ac_status" >&5
+  echo "$as_me:26468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26471: \$? = $ac_status" >&5
+  echo "$as_me:26474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26482,13 +26485,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26485: result: yes" >&5
+then	echo "$as_me:26488: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26487: result: no" >&5
+else	echo "$as_me:26490: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26491: checking for builtin bool type" >&5
+echo "$as_me:26494: 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
@@ -26496,7 +26499,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26499 "configure"
+#line 26502 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26511,16 +26514,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26517: \$? = $ac_status" >&5
+  echo "$as_me:26520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26523: \$? = $ac_status" >&5
+  echo "$as_me:26526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26533,19 +26536,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26536: result: yes" >&5
+then	echo "$as_me:26539: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26538: result: no" >&5
+else	echo "$as_me:26541: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26542: checking for bool" >&5
+echo "$as_me:26545: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26548 "configure"
+#line 26551 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26580,16 +26583,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26586: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26586: \$? = $ac_status" >&5
+  echo "$as_me:26589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26592: \$? = $ac_status" >&5
+  echo "$as_me:26595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26599,10 +26602,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26602: result: $ac_cv_type_bool" >&5
+echo "$as_me:26605: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26605: checking size of bool" >&5
+echo "$as_me:26608: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26611,7 +26614,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26614 "configure"
+#line 26617 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26643,21 +26646,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26649: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26655: \$? = $ac_status" >&5
+  echo "$as_me:26658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26660 "configure"
+#line 26663 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26689,16 +26692,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26695: \$? = $ac_status" >&5
+  echo "$as_me:26698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26701: \$? = $ac_status" >&5
+  echo "$as_me:26704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26714,7 +26717,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26717 "configure"
+#line 26720 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26746,16 +26749,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26752: \$? = $ac_status" >&5
+  echo "$as_me:26755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26758: \$? = $ac_status" >&5
+  echo "$as_me:26761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26771,7 +26774,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26774 "configure"
+#line 26777 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26803,16 +26806,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26809: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26809: \$? = $ac_status" >&5
+  echo "$as_me:26812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26815: \$? = $ac_status" >&5
+  echo "$as_me:26818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26825,12 +26828,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26828: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26831: 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 26833 "configure"
+#line 26836 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26866,15 +26869,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26872: \$? = $ac_status" >&5
+  echo "$as_me:26875: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26877: \$? = $ac_status" >&5
+  echo "$as_me:26880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26890,13 +26893,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26893: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26896: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26899: checking for type of bool" >&5
+echo "$as_me:26902: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26915,7 +26918,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26918 "configure"
+#line 26921 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26956,15 +26959,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26962: \$? = $ac_status" >&5
+  echo "$as_me:26965: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26967: \$? = $ac_status" >&5
+  echo "$as_me:26970: \$? = $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
@@ -26981,19 +26984,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26984: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26987: 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:26991: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:26994: 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:26996: checking for special defines needed for etip.h" >&5
+echo "$as_me:26999: 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"
@@ -27011,7 +27014,7 @@ do
 	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 27014 "configure"
+#line 27017 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27025,16 +27028,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27031: \$? = $ac_status" >&5
+  echo "$as_me:27034: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27037: \$? = $ac_status" >&5
+  echo "$as_me:27040: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27055,12 +27058,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27058: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27061: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27063: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27066: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27077,7 +27080,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27080 "configure"
+#line 27083 "configure"
 #include "confdefs.h"
 
 class base
@@ -27096,15 +27099,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27102: \$? = $ac_status" >&5
+  echo "$as_me:27105: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27107: \$? = $ac_status" >&5
+  echo "$as_me:27110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27123,7 +27126,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27126: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27129: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27132,7 +27135,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27135: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27138: 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
@@ -27149,7 +27152,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27152 "configure"
+#line 27155 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27168,15 +27171,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27174: \$? = $ac_status" >&5
+  echo "$as_me:27177: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27179: \$? = $ac_status" >&5
+  echo "$as_me:27182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27195,7 +27198,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27198: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27201: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27205,7 +27208,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27208: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27211: 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
@@ -27219,7 +27222,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27222 "configure"
+#line 27225 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27263,16 +27266,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27269: \$? = $ac_status" >&5
+  echo "$as_me:27272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27275: \$? = $ac_status" >&5
+  echo "$as_me:27278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27290,7 +27293,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27293: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27296: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27338,13 +27341,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27341: checking for bool" >&5
+echo "$as_me:27344: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27347 "configure"
+#line 27350 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27379,16 +27382,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27385: \$? = $ac_status" >&5
+  echo "$as_me:27388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27391: \$? = $ac_status" >&5
+  echo "$as_me:27394: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27398,10 +27401,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27401: result: $ac_cv_type_bool" >&5
+echo "$as_me:27404: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27404: checking size of bool" >&5
+echo "$as_me:27407: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27410,7 +27413,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27413 "configure"
+#line 27416 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27442,21 +27445,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27448: \$? = $ac_status" >&5
+  echo "$as_me:27451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27454: \$? = $ac_status" >&5
+  echo "$as_me:27457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27459 "configure"
+#line 27462 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27488,16 +27491,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27494: \$? = $ac_status" >&5
+  echo "$as_me:27497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27500: \$? = $ac_status" >&5
+  echo "$as_me:27503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27513,7 +27516,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27516 "configure"
+#line 27519 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27545,16 +27548,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27551: \$? = $ac_status" >&5
+  echo "$as_me:27554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27557: \$? = $ac_status" >&5
+  echo "$as_me:27560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27570,7 +27573,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27573 "configure"
+#line 27576 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27602,16 +27605,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27608: \$? = $ac_status" >&5
+  echo "$as_me:27611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27614: \$? = $ac_status" >&5
+  echo "$as_me:27617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27624,12 +27627,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27627: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27630: 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 27632 "configure"
+#line 27635 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27665,15 +27668,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27671: \$? = $ac_status" >&5
+  echo "$as_me:27674: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27676: \$? = $ac_status" >&5
+  echo "$as_me:27679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27689,13 +27692,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27695: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27698: checking for type of bool" >&5
+echo "$as_me:27701: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27714,7 +27717,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27717 "configure"
+#line 27720 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27755,15 +27758,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27761: \$? = $ac_status" >&5
+  echo "$as_me:27764: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27766: \$? = $ac_status" >&5
+  echo "$as_me:27769: \$? = $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
@@ -27780,14 +27783,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27783: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27786: 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:27790: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27793: 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
@@ -27818,7 +27821,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27821: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27824: 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
@@ -27829,7 +27832,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27835: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27846,10 +27849,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27849: result: $ADAFLAGS" >&5
+	echo "$as_me:27852: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27852: checking if GNATPREP supports -T option" >&5
+echo "$as_me:27855: 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
@@ -27859,11 +27862,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27862: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27865: 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:27866: checking if GNAT supports generics" >&5
+echo "$as_me:27869: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27873,7 +27876,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27876: result: $cf_gnat_generics" >&5
+echo "$as_me:27879: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27885,7 +27888,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27888: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27891: 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
@@ -27933,7 +27936,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27939: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27946,7 +27949,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27949: checking if GNAT supports project files" >&5
+echo "$as_me:27952: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28009,15 +28012,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28012: result: $cf_gnat_projects" >&5
+echo "$as_me:28015: 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:28018: checking if GNAT supports libraries" >&5
+	echo "$as_me:28021: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28020: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28023: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28037,7 +28040,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28040: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28043: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28049,7 +28052,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28052: checking for Ada95 compiler" >&5
+echo "$as_me:28055: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28060,12 +28063,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28063: result: $cf_ada_compiler" >&5
+echo "$as_me:28066: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28068: checking for Ada95 include directory" >&5
+echo "$as_me:28071: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28099,7 +28102,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28105: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28108,10 +28111,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28111: result: $ADA_INCLUDE" >&5
+echo "$as_me:28114: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28114: checking for Ada95 object directory" >&5
+echo "$as_me:28117: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28145,7 +28148,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28151: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28154,10 +28157,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28157: result: $ADA_OBJECTS" >&5
+echo "$as_me:28160: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28163: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28178,11 +28181,11 @@ then
 	fi
 fi
 
-echo "$as_me:28181: result: $with_ada_sharedlib" >&5
+echo "$as_me:28184: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28188: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28200,7 +28203,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28203: checking for Ada95 curses library name" >&5
+echo "$as_me:28206: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28216,7 +28219,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28219: result: $ADA_LIBNAME" >&5
+echo "$as_me:28222: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28227,13 +28230,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28230: checking for wchar_t" >&5
+	echo "$as_me:28233: 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 28236 "configure"
+#line 28239 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28248,16 +28251,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28254: \$? = $ac_status" >&5
+  echo "$as_me:28257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28260: \$? = $ac_status" >&5
+  echo "$as_me:28263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28267,10 +28270,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28273: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28273: checking size of wchar_t" >&5
+echo "$as_me:28276: 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
@@ -28279,7 +28282,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28282 "configure"
+#line 28285 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28291,21 +28294,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28297: \$? = $ac_status" >&5
+  echo "$as_me:28300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28303: \$? = $ac_status" >&5
+  echo "$as_me:28306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28308 "configure"
+#line 28311 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28317,16 +28320,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28323: \$? = $ac_status" >&5
+  echo "$as_me:28326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28329: \$? = $ac_status" >&5
+  echo "$as_me:28332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28342,7 +28345,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28345 "configure"
+#line 28348 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28354,16 +28357,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28360: \$? = $ac_status" >&5
+  echo "$as_me:28363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28366: \$? = $ac_status" >&5
+  echo "$as_me:28369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28379,7 +28382,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28382 "configure"
+#line 28385 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28391,16 +28394,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28397: \$? = $ac_status" >&5
+  echo "$as_me:28400: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28403: \$? = $ac_status" >&5
+  echo "$as_me:28406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28413,12 +28416,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28416: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28419: 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 28421 "configure"
+#line 28424 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28434,15 +28437,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28440: \$? = $ac_status" >&5
+  echo "$as_me:28443: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28445: \$? = $ac_status" >&5
+  echo "$as_me:28448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28458,7 +28461,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28464: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28471,7 +28474,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28477: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28489,7 +28492,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28492: checking for library subsets" >&5
+echo "$as_me:28495: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28543,7 +28546,7 @@ fi
 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:28546: result: $LIB_SUBSETS" >&5
+echo "$as_me:28549: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28574,7 +28577,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28577: checking default library suffix" >&5
+echo "$as_me:28580: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28585,10 +28588,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28591: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28591: checking default library-dependency suffix" >&5
+echo "$as_me:28594: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28671,10 +28674,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28674: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28677: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28677: checking default object directory" >&5
+echo "$as_me:28680: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28690,11 +28693,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28696: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28697: checking c++ library-dependency suffix" >&5
+echo "$as_me:28700: 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++)
@@ -28787,7 +28790,7 @@ else
 	fi
 
 fi
-echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28793: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28963,19 +28966,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28966: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:28969: 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 <<EOF
-#line 28971 "configure"
+#line 28974 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:28978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28978: \$? = $ac_status" >&5
+  echo "$as_me:28981: \$? = $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
@@ -28986,10 +28989,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28989 "configure"
+#line 28992 "configure"
 #include "confdefs.h"
 
-#line 28992 "configure"
+#line 28995 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29004,16 +29007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29010: \$? = $ac_status" >&5
+  echo "$as_me:29013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29016: \$? = $ac_status" >&5
+  echo "$as_me:29019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29036,7 +29039,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29039: result: $cf_ldflags_static" >&5
+	echo "$as_me:29042: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29052,7 +29055,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29055: checking where we will install curses.h" >&5
+echo "$as_me:29058: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29062,7 +29065,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29068: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29070,7 +29073,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29073: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29076: 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
@@ -29095,7 +29098,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29098: checking for desired basename for form library" >&5
+echo "$as_me:29101: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29115,10 +29118,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29118: result: $FORM_NAME" >&5
+echo "$as_me:29121: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29121: checking for desired basename for menu library" >&5
+echo "$as_me:29124: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29138,10 +29141,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29141: result: $MENU_NAME" >&5
+echo "$as_me:29144: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29144: checking for desired basename for panel library" >&5
+echo "$as_me:29147: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29161,10 +29164,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29164: result: $PANEL_NAME" >&5
+echo "$as_me:29167: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29167: checking for desired basename for cxx library" >&5
+echo "$as_me:29170: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29184,13 +29187,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29187: result: $CXX_NAME" >&5
+echo "$as_me:29190: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29193: checking for src modules" >&5
+echo "$as_me:29196: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29249,7 +29252,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29252: result: $cf_cv_src_modules" >&5
+echo "$as_me:29255: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29410,7 +29413,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29413: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29416: 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//'`
@@ -29421,7 +29424,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29427: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29437,7 +29440,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29440: result: $PKG_CFLAGS" >&5
+echo "$as_me:29443: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29509,7 +29512,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29515: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29536,7 +29539,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29539: checking for linker search path" >&5
+echo "$as_me:29542: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29584,7 +29587,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29590: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29625,7 +29628,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29628: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29631: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29711,7 +29714,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29717: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29892,7 +29895,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29895: error: ambiguous option: $1
+    { { echo "$as_me:29898: 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;}
@@ -29911,7 +29914,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29914: error: unrecognized option: $1
+  -*) { { echo "$as_me:29917: 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;}
@@ -30043,7 +30046,7 @@ do
   "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:30046: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30049: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30568,7 +30571,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30571: creating $ac_file" >&5
+    { echo "$as_me:30574: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30586,7 +30589,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30592: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30599,7 +30602,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30602: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30605: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30615,7 +30618,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30618: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30621: 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;}
@@ -30624,7 +30627,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30627: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30630: 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;}
@@ -30669,7 +30672,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30672: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30675: 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;}
@@ -30680,7 +30683,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30683: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30686: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30729,7 +30732,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30735: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30740,7 +30743,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30746: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30753,7 +30756,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30756: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30759: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30811,7 +30814,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30814: $ac_file is unchanged" >&5
+      { echo "$as_me:30817: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31198,7 +31201,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31204: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index f4e0a71fa..a5481dd90 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 tom Exp $
+# $Id: dist.mk,v 1.1643 2024/11/30 10:55:07 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241123
+NCURSES_PATCH = 20241130
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/form/fld_def.c b/form/fld_def.c
index 51bdc6485..2f6cb2764 100644
--- a/form/fld_def.c
+++ b/form/fld_def.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_def.c,v 1.44 2021/03/27 23:49:53 tom Exp $")
+MODULE_ID("$Id: fld_def.c,v 1.45 2024/11/30 21:41:08 tom Exp $")
 
 /* this can't be readonly */
 static FIELD default_field =
@@ -313,7 +313,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
 	  size_t len;
 
 	  len = Total_Buffer_Size(New_Field);
-	  if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
+	  if ((New_Field->buf = (FIELD_CELL *)malloc(len)) != NULL)
 	    {
 	      /* Prefill buffers with blanks and insert terminating zeroes
 	         between buffers */
diff --git a/form/fld_dup.c b/form/fld_dup.c
index e195df958..33cf073b9 100644
--- a/form/fld_dup.c
+++ b/form/fld_dup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_dup.c,v 1.18 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.19 2024/11/30 21:40:55 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -83,7 +83,7 @@ dup_field(FIELD *field, int frow, int fcol)
 	  size_t len;
 
 	  len = Total_Buffer_Size(New_Field);
-	  if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))
+	  if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)) != NULL)
 	    {
 	      memcpy(New_Field->buf, field->buf, len);
 	      returnField(New_Field);
diff --git a/menu/mf_common.h b/menu/mf_common.h
index fcbd565c5..9b8d94a4d 100644
--- a/menu/mf_common.h
+++ b/menu/mf_common.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2005,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: mf_common.h,v 0.25 2020/02/02 23:34:34 tom Exp $ */
+/* $Id: mf_common.h,v 0.26 2024/11/30 21:41:20 tom Exp $ */
 
 /* Common internal header for menu and form library */
 
@@ -64,7 +64,7 @@ extern int errno;
 #if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
-#define MODULE_ID(id)		/*nothing */
+#define MODULE_ID(id)		/* nothing */
 #endif
 
 /* Maximum regular 8-bit character code */
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index ac472a662..93c51d05a 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.142 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.143 2024/11/30 21:18:07 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -456,7 +456,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 	       s[1] == 0
 	)
 	|| (
-	       (isprint((int) t) && !iscntrl((int) t))
+	       (isprint(UChar(t)) && !iscntrl(UChar(t)))
 #if USE_WIDEC_SUPPORT
 	       || ((sp == 0 || !sp->_legacy_coding) &&
 		   (WINDOW_EXT(win, addch_used)
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index eb82dd0bb..a9969f0c2 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $
+ * $Id: curses.priv.h,v 1.696 2024/11/30 21:32:44 tom Exp $
  *
  *	curses.priv.h
  *
@@ -59,7 +59,7 @@ extern "C" {
 #if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
-#define MODULE_ID(id) /*nothing*/
+#define MODULE_ID(id)		/* nothing */
 #endif
 
 #include <stddef.h>		/* for offsetof */
diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index e971384f5..4e4f84eae 100644
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.35 2023/04/28 20:59:06 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.36 2024/11/30 21:24:57 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -129,7 +129,7 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 		    if (dst != 0
 			&& *dst == R_BRACE
 			&& value < 127
-			&& isprint((int) value)) {
+			&& isprint(UChar(value))) {
 			ch = (int) value;
 			buffer[bufp++] = S_QUOTE;
 			if (ch == '\\'
diff --git a/ncurses/tinfo/hashed_db.c b/ncurses/tinfo/hashed_db.c
index f051e2f66..3960efdf1 100644
--- a/ncurses/tinfo/hashed_db.c
+++ b/ncurses/tinfo/hashed_db.c
@@ -37,7 +37,7 @@
 
 #if USE_HASHED_DB
 
-MODULE_ID("$Id: hashed_db.c,v 1.20 2024/11/09 19:23:11 tom Exp $")
+MODULE_ID("$Id: hashed_db.c,v 1.21 2024/11/30 21:16:41 tom Exp $")
 
 #if HASHED_DB_API >= 2
 static DBC *cursor;
@@ -167,6 +167,8 @@ _nc_db_open(const char *path, bool modify)
 			     DB_HASH,
 			     NULL)) == 0) {
 	    code = errno;
+	} else {
+	    code = 0;
 	}
 #endif
 	if (result != NULL && make_connection(result, path, modify)) {
diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c
index 590e42306..b04150f5c 100644
--- a/ncurses/trace/visbuf.c
+++ b/ncurses/trace/visbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 #include <tic.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: visbuf.c,v 1.54 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.55 2024/11/30 21:24:09 tom Exp $")
 
 #define NUM_VISBUFS 4
 
@@ -72,7 +72,7 @@ _nc_vischar(char *tp, unsigned c LIMIT_ARG)
     } else if (c == '"' || c == '\\') {
 	*tp++ = '\\';
 	*tp++ = (char) c;
-    } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) {
+    } else if (is7bits(UChar(c)) && (isgraph(UChar(c)) || c == ' ')) {
 	*tp++ = (char) c;
     } else if (c == '\n') {
 	*tp++ = '\\';
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index fc6064036..df735a728 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.75 2024/07/20 17:04:48 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -96,7 +96,8 @@ static const LONG keylist[] =
     GenMap(VK_RIGHT,  KEY_RIGHT),
     GenMap(VK_DOWN,   KEY_DOWN),
     GenMap(VK_DELETE, KEY_DC),
-    GenMap(VK_INSERT, KEY_IC)
+    GenMap(VK_INSERT, KEY_IC),
+    GenMap(VK_TAB,    KEY_BTAB)
 };
 static const LONG ansi_keys[] =
 {
@@ -109,7 +110,8 @@ static const LONG ansi_keys[] =
     GenMap(VK_RIGHT,  'M'),
     GenMap(VK_DOWN,   'P'),
     GenMap(VK_DELETE, 'S'),
-    GenMap(VK_INSERT, 'R')
+    GenMap(VK_INSERT, 'R'),
+    GenMap(VK_TAB,    'Z')
 };
 /* *INDENT-ON* */
 #define N_INI ((int)array_length(keylist))
@@ -2154,6 +2156,11 @@ _nc_mingw_console_read(
 			  & (SHIFT_PRESSED | CONTROL_PRESSED))) {
 			*buf = KEY_BACKSPACE;
 		    }
+		} else if (vk == VK_TAB) {
+		    if ((inp_rec.Event.KeyEvent.dwControlKeyState
+			 & (SHIFT_PRESSED | CONTROL_PRESSED))) {
+			*buf = KEY_BTAB;
+		    }
 		}
 		break;
 	    } else if (inp_rec.EventType == MOUSE_EVENT) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2f180ad32..b240e042a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241123) unstable; urgency=low
+ncurses6td (6.5+20241130) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2f180ad32..b240e042a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241123) unstable; urgency=low
+ncurses6td (6.5+20241130) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 3c3e8651f..f50b35b7e 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241123) unstable; urgency=low
+ncurses6td (6.5+20241130) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Nov 2024 05:51:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 40b9e4fbb..b2269ecfc 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.678 2024/11/27 21:55:07 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1123"
+!define VERSION_MMDD  "1130"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0c8c5b923..f372562bb 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241123
+Release: 20241130
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 20e315fbe..883719a0b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241123
+Release: 20241130
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index e6b2d6c0e..d00ddb600 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241123
+Release: 20241130
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index a677e202e..79e220050 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.169 2024/11/30 21:29:41 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -835,7 +835,7 @@ lookup_params(const assoc * table, char *dst, char *src)
 		_nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH);
 	    _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH);
 	} while
-	    ((ep = strtok((char *) 0, ";")));
+	    ((ep = strtok((char *) 0, ";")) != NULL);
 
 	dst[strlen(dst) - 1] = '\0';
 
diff --git a/progs/tic.c b/progs/tic.c
index e1c5fdd22..e2d2bd03c 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.328 2024/11/09 23:03:26 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.329 2024/11/30 21:29:07 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -231,7 +231,7 @@ write_it(ENTRY * ep)
 			&& value > 0
 			&& value != '\\'	/* FIXME */
 			&& value < 127
-			&& isprint((int) value)) {
+			&& isprint(UChar(value))) {
 			*d++ = S_QUOTE;
 			*d++ = (char) value;
 			*d++ = S_QUOTE;
@@ -659,8 +659,8 @@ show_databases(const char *outdir)
 	tried = outdir;
     }
 
-    if ((outdir = _nc_home_terminfo())) {
-	if ((result = valid_db_path(outdir)) != 0) {
+    if ((outdir = _nc_home_terminfo()) != NULL) {
+	if ((result = valid_db_path(outdir)) != NULL) {
 	    printf("%s\n", result);
 	    free(result);
 	} else if (!specific) {
@@ -2025,7 +2025,7 @@ check_params(const TERMTYPE2 *tp, const char *name, const char *value, int exten
 		_nc_warning("expected character after %% in %s", name);
 		break;
 	    } else if (*s == 'p') {
-		if (*++s == '\0' || !isdigit((int) *s)) {
+		if (*++s == '\0' || !isdigit(UChar(*s))) {
 		    _nc_warning("expected digit after %%p in %s", name);
 		    return;
 		} else {
diff --git a/progs/tput.c b/progs/tput.c
index 466beedfa..821a85682 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.106 2024/11/30 21:47:34 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -120,11 +120,11 @@ check_aliases(char *name, bool program)
     static char my_clear[] = "clear";
 
     char *result = name;
-    if ((is_init = same_program(name, program ? PROG_INIT : my_init)))
+    if ((is_init = same_program(name, program ? PROG_INIT : my_init)) == TRUE)
 	result = my_init;
-    if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)))
+    if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)) == TRUE)
 	result = my_reset;
-    if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)))
+    if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)) == TRUE)
 	result = my_clear;
     return result;
 }
diff --git a/progs/tset.c b/progs/tset.c
index 8ed82f04d..5ceef1a0a 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.138 2024/11/30 21:30:49 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -574,7 +574,7 @@ get_termcap_entry(int fd, char *userarg)
 	 * there's an /etc/ttys to look up device-to-type mappings in.
 	 * Try ttyname(3); check for dialup or other mapping.
 	 */
-	if ((t = getttynam(p))) {
+	if ((t = getttynam(p)) != NULL) {
 	    ttype = t->ty_type;
 	    goto map;
 	}
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 3a1dec93b..2c892f675 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.229 2024/11/09 23:15:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.230 2024/11/30 19:43:11 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -3596,14 +3596,17 @@ case x$INSTALL in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
+dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
 AC_CHECK_PROGS(LINT, lint cppcheck splint)
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 AC_SUBST(LINT_OPTS)
diff --git a/test/back_ground.c b/test/back_ground.c
index bc866a1a5..71a16057a 100644
--- a/test/back_ground.c
+++ b/test/back_ground.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: back_ground.c,v 1.12 2024/09/28 16:19:19 tom Exp $
+ * $Id: back_ground.c,v 1.14 2024/11/30 18:36:56 tom Exp $
  */
 
 #include <test.priv.h>
@@ -182,12 +182,12 @@ usage(int ok)
 	," -a       invoke assume_default_colors, repeat to use in init_pair"
 #endif
 	," -b XXX   specify background color"
-	," -c XXX   specify background character"
+	," -B XXX   specify background character"
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors, repeat to use in init_pair"
 #endif
 	," -f XXX   specify foreground color"
-	," -l FILE  log window-dumps to this file"
+	," -L FILE  log window-dumps to this file"
 	," -w       fill background with stipple pattern"
 	," -W CODE  fill background with this Unicode value"
     };
@@ -215,7 +215,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:wW:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:W:ab:df:w")) != -1) {
 	switch (ch) {
 #if HAVE_ASSUME_DEFAULT_COLORS
 	case 'a':
@@ -225,7 +225,7 @@ main(int argc, char *argv[])
 	case 'b':
 	    default_bg = color_code(optarg);
 	    break;
-	case 'c':
+	case 'B':
 	    if (strlen(optarg) > 1) {
 		char *check = NULL;
 		long value = strtol(optarg, &check, 0);
@@ -244,7 +244,7 @@ main(int argc, char *argv[])
 	case 'f':
 	    default_fg = color_code(optarg);
 	    break;
-	case 'l':
+	case 'L':
 	    if (!open_dump(optarg))
 		usage(FALSE);
 	    break;
diff --git a/test/background.c b/test/background.c
index 63144cda9..0e9f3bc7a 100644
--- a/test/background.c
+++ b/test/background.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: background.c,v 1.27 2024/09/22 22:34:49 tom Exp $
+ * $Id: background.c,v 1.29 2024/11/30 18:37:15 tom Exp $
  */
 
 #define NEED_COLOR_CODE 1
@@ -143,12 +143,12 @@ usage(int ok)
 	," -a       invoke assume_default_colors, repeat to use in init_pair"
 #endif
 	," -b XXX   specify background color"
-	," -c XXX   specify background character"
+	," -B XXX   specify background character"
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors, repeat to use in init_pair"
 #endif
 	," -f XXX   specify foreground color"
-	," -l FILE  log window-dumps to this file"
+	," -L FILE  log window-dumps to this file"
     };
     size_t n;
 
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:ab:df:")) != -1) {
 	switch (ch) {
 #if HAVE_ASSUME_DEFAULT_COLORS
 	case 'a':
@@ -184,7 +184,7 @@ main(int argc, char *argv[])
 	case 'b':
 	    default_bg = color_code(optarg);
 	    break;
-	case 'c':
+	case 'B':
 	    if (strlen(optarg) > 1) {
 		char *check = NULL;
 		long value = strtol(optarg, &check, 0);
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 	case 'f':
 	    default_fg = color_code(optarg);
 	    break;
-	case 'l':
+	case 'L':
 	    if (!open_dump(optarg))
 		usage(FALSE);
 	    break;
diff --git a/test/bs.c b/test/bs.c
index e258ea6ae..d7fd23194 100644
--- a/test/bs.c
+++ b/test/bs.c
@@ -35,7 +35,7 @@
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *
- * $Id: bs.c,v 1.80 2024/10/05 19:26:24 tom Exp $
+ * $Id: bs.c,v 1.81 2024/11/30 16:47:02 tom Exp $
  */
 
 #include <test.priv.h>
@@ -1193,7 +1193,7 @@ usage(int ok)
 	,USAGE_COMMON
 	,"Options:"
 	," -b       play a blitz game"
-	," -c       ships may be adjacent"
+	," -p       ships may be packed/adjacent"
 	," -s       play a salvo game"
     };
     size_t n;
@@ -1212,7 +1212,7 @@ main(int argc, char *argv[])
 {
     int ch;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "bps")) != -1) {
 	switch (ch) {
 	case 'b':
 	    blitz = 1;
@@ -1230,7 +1230,7 @@ main(int argc, char *argv[])
 		ExitProgram(EXIT_FAILURE);
 	    }
 	    break;
-	case 'c':
+	case 'p':
 	    closepack = 1;
 	    break;
 	case OPTS_VERSION:
diff --git a/test/cardfile.c b/test/cardfile.c
index 2652ba9f0..f6af4d251 100644
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.52 2024/10/05 19:26:24 tom Exp $
+ * $Id: cardfile.c,v 1.53 2024/11/30 16:47:59 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -558,7 +558,7 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -c       use color if terminal supports it"
+	," -C       use color if terminal supports it"
     };
     size_t n;
     for (n = 0; n < SIZEOF(msg); n++)
@@ -578,9 +578,9 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "C")) != -1) {
 	switch (ch) {
-	case 'c':
+	case 'C':
 	    try_color = TRUE;
 	    break;
 	case OPTS_VERSION:
diff --git a/test/color_content.c b/test/color_content.c
index d08dffb09..7e769d7e7 100644
--- a/test/color_content.c
+++ b/test/color_content.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: color_content.c,v 1.19 2023/02/25 16:48:02 tom Exp $
+ * $Id: color_content.c,v 1.21 2024/11/30 18:31:01 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -220,10 +220,10 @@ usage(int ok)
 	,"Options:"
 	," -f COLOR first color value to test (default: 0)"
 	," -i       interactive, showing test-progress"
-	," -l COLOR last color value to test (default: max_colors-1)"
+	," -F COLOR last color value to test (default: max_colors-1)"
 	," -n       do not initialize color pairs"
 	," -p       print data for color content instead of testing"
-	," -r COUNT repeat for given count"
+	," -r NUM   repeat tests NUM times"
 	," -s       initialize pairs sequentially rather than random"
 #if USE_EXTENDED_COLOR
 	," -x       use extended color pairs/values"
@@ -243,7 +243,7 @@ main(int argc, char *argv[])
 {
     int ch;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
 	switch (ch) {
 	case 'f':
 	    if ((f_opt = atoi(optarg)) <= 0)
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
 	case 'i':
 	    i_opt = 1;
 	    break;
-	case 'l':
+	case 'F':
 	    if ((l_opt = atoi(optarg)) <= 0)
 		usage(FALSE);
 	    break;
diff --git a/test/combine.c b/test/combine.c
index eca72b807..954b7c717 100644
--- a/test/combine.c
+++ b/test/combine.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2021,2022 Thomas E. Dickey                                     *
+,* Copyright 2021-2022,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $
+ * $Id: combine.c,v 1.25 2024/11/30 19:08:20 tom Exp $
  */
 
 #include <test.priv.h>
@@ -37,7 +37,7 @@
 #include <dump_window.h>
 #include <popup_msg.h>
 
-static int c_opt;
+static int k_opt;
 static int r_opt;
 
 static int
@@ -68,7 +68,7 @@ do_row(int row, int base_ch, int over_ch)
     move(row, col);
     printw("[U+%04X]", over_ch);
     do {
-	if (c_opt) {
+	if (k_opt) {
 	    wchar_t source[2];
 	    cchar_t target;
 	    attr_t attr = reverse ? A_REVERSE : A_NORMAL;
@@ -191,8 +191,8 @@ usage(int ok)
 	,"Demonstrate combining-characters."
 	,""
 	,"Options:"
-	," -c       use cchar_t data rather than wchar_t string"
-	," -l FILE  log window-dumps to this file"
+	," -k       use cchar_t data rather than wchar_t string"
+	," -L FILE  log window-dumps to this file"
 	," -r       draw even-numbered rows in reverse-video"
     };
     unsigned n;
@@ -215,12 +215,12 @@ main(int argc, char *argv[])
     bool log_option = FALSE;
     const char *dump_log = "combine.log";
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "kL:r")) != -1) {
 	switch (ch) {
-	case 'c':
-	    c_opt = TRUE;
+	case 'k':
+	    k_opt = TRUE;
 	    break;
-	case 'l':
+	case 'L':
 	    log_option = TRUE;
 	    if (!open_dump(optarg))
 		usage(FALSE);
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
 	    left_at = next_char(left_at);
 	    break;
 	case 'c':
-	    c_opt = !c_opt;
+	    k_opt = !k_opt;
 	    break;
 	case 'r':
 	    r_opt = !r_opt;
diff --git a/test/configure b/test/configure
index e31212fc5..5256ae88b 100755
--- a/test/configure
+++ b/test/configure
@@ -3131,12 +3131,15 @@ fi
 done
 
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 
-echo "$as_me:3139: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3142: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3191,14 +3194,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3194: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3197: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3201: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3204: 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
@@ -3225,7 +3228,7 @@ else
 fi
 
 fi
-echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3231: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3236,7 +3239,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3239: checking for $ac_word" >&5
+echo "$as_me:3242: 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
@@ -3251,7 +3254,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3254: found $ac_dir/$ac_word" >&5
+echo "$as_me:3257: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3259,10 +3262,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3262: result: $CTAGS" >&5
+  echo "$as_me:3265: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3265: result: no" >&5
+  echo "$as_me:3268: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3273,7 +3276,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3276: checking for $ac_word" >&5
+echo "$as_me:3279: 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
@@ -3288,7 +3291,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3291: found $ac_dir/$ac_word" >&5
+echo "$as_me:3294: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3296,10 +3299,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3299: result: $ETAGS" >&5
+  echo "$as_me:3302: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3302: result: no" >&5
+  echo "$as_me:3305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3308,7 +3311,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3311: checking for $ac_word" >&5
+echo "$as_me:3314: 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
@@ -3323,7 +3326,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+echo "$as_me:3329: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3332,17 +3335,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3338: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3338: result: no" >&5
+  echo "$as_me:3341: 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:3345: checking for $ac_word" >&5
+echo "$as_me:3348: 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
@@ -3357,7 +3360,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3360: found $ac_dir/$ac_word" >&5
+echo "$as_me:3363: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3366,10 +3369,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3372: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3372: result: no" >&5
+  echo "$as_me:3375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3389,14 +3392,14 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:3392: checking if -lm needed for math functions" >&5
+echo "$as_me:3395: 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 3399 "configure"
+#line 3402 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3412,16 +3415,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3418: \$? = $ac_status" >&5
+  echo "$as_me:3421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3424: \$? = $ac_status" >&5
+  echo "$as_me:3427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -3431,7 +3434,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3434: result: $cf_cv_need_libm" >&5
+echo "$as_me:3437: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -3439,14 +3442,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:3442: checking if -lm is available for math functions" >&5
+	echo "$as_me:3445: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3449 "configure"
+#line 3452 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -3462,16 +3465,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3468: \$? = $ac_status" >&5
+  echo "$as_me:3471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3474: \$? = $ac_status" >&5
+  echo "$as_me:3477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -3481,7 +3484,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3484: result: $cf_cv_have_libm" >&5
+echo "$as_me:3487: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -3536,7 +3539,7 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
-echo "$as_me:3539: checking for fgrep" >&5
+echo "$as_me:3542: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3548,7 +3551,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3551: checking for $ac_word" >&5
+echo "$as_me:3554: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3565,7 +3568,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3568: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3571: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3576,10 +3579,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3579: result: $FGREP" >&5
+  echo "$as_me:3582: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3582: result: no" >&5
+  echo "$as_me:3585: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3587,16 +3590,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3593: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3598: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3599: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:3602: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -3613,17 +3616,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:3616: result: $enable_stdnoreturn" >&5
+echo "$as_me:3619: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:3620: checking for C11 _Noreturn feature" >&5
+echo "$as_me:3623: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3626 "configure"
+#line 3629 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3639,16 +3642,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3645: \$? = $ac_status" >&5
+  echo "$as_me:3648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3651: \$? = $ac_status" >&5
+  echo "$as_me:3654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -3659,7 +3662,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:3665: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -3698,10 +3701,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3704: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 3704 "${as_me:-configure}"
+#line 3707 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -3751,12 +3754,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3757: \$? = $ac_status" >&5
+  echo "$as_me:3760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3762: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -3815,7 +3818,7 @@ fi
 rm -rf ./conftest*
 fi
 
-echo "$as_me:3818: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3821: 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.
@@ -3825,7 +3828,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:3828: result: $enable_string_hacks" >&5
+echo "$as_me:3831: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -3834,15 +3837,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:3837: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:3840: 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:3839: checking for strlcat" >&5
+	echo "$as_me:3842: 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 3845 "configure"
+#line 3848 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -3873,16 +3876,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3879: \$? = $ac_status" >&5
+  echo "$as_me:3882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3885: \$? = $ac_status" >&5
+  echo "$as_me:3888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -3892,7 +3895,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3898: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -3902,7 +3905,7 @@ EOF
 
 else
 
-		echo "$as_me:3905: checking for strlcat in -lbsd" >&5
+		echo "$as_me:3908: 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
@@ -3910,7 +3913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3913 "configure"
+#line 3916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3929,16 +3932,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3935: \$? = $ac_status" >&5
+  echo "$as_me:3938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:3938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3941: \$? = $ac_status" >&5
+  echo "$as_me:3944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -3949,7 +3952,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3952: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3955: 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
 
@@ -3972,23 +3975,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3975: checking for $ac_header" >&5
+echo "$as_me:3978: 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 3981 "configure"
+#line 3984 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3985: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3988: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3991: \$? = $ac_status" >&5
+  echo "$as_me:3994: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4007,7 +4010,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:4010: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:4013: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4028,13 +4031,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4031: checking for $ac_func" >&5
+echo "$as_me:4034: 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 4037 "configure"
+#line 4040 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4065,16 +4068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4071: \$? = $ac_status" >&5
+  echo "$as_me:4074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4077: \$? = $ac_status" >&5
+  echo "$as_me:4080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4084,7 +4087,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4087: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:4090: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -4096,14 +4099,14 @@ done
 
 fi
 
-echo "$as_me:4099: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:4102: 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 4106 "configure"
+#line 4109 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4122,16 +4125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4128: \$? = $ac_status" >&5
+  echo "$as_me:4131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4134: \$? = $ac_status" >&5
+  echo "$as_me:4137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -4142,7 +4145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
+echo "$as_me:4148: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -4184,14 +4187,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:4187: checking if this is the GNU C library" >&5
+echo "$as_me:4190: 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 4194 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4210,16 +4213,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4216: \$? = $ac_status" >&5
+  echo "$as_me:4219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4222: \$? = $ac_status" >&5
+  echo "$as_me:4225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -4230,7 +4233,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
+echo "$as_me:4236: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -4238,7 +4241,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:4241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:4244: 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
@@ -4250,7 +4253,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4253 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4269,16 +4272,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4275: \$? = $ac_status" >&5
+  echo "$as_me:4278: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4281: \$? = $ac_status" >&5
+  echo "$as_me:4284: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -4290,12 +4293,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:4293: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:4296: 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:4298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:4301: 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
@@ -4400,7 +4403,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4403 "configure"
+#line 4406 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -4420,16 +4423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4426: \$? = $ac_status" >&5
+  echo "$as_me:4429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4432: \$? = $ac_status" >&5
+  echo "$as_me:4435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -4440,7 +4443,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4443: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4446: 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
@@ -4449,14 +4452,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:4452: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:4455: 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 4459 "configure"
+#line 4462 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4471,16 +4474,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4477: \$? = $ac_status" >&5
+  echo "$as_me:4480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4483: \$? = $ac_status" >&5
+  echo "$as_me:4486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4587,7 +4590,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4590 "configure"
+#line 4593 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4602,16 +4605,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4608: \$? = $ac_status" >&5
+  echo "$as_me:4611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4614: \$? = $ac_status" >&5
+  echo "$as_me:4617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -4626,12 +4629,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4629: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4632: 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:4634: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:4637: 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
@@ -4641,7 +4644,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 4644 "configure"
+#line 4647 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4656,16 +4659,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4662: \$? = $ac_status" >&5
+  echo "$as_me:4665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4668: \$? = $ac_status" >&5
+  echo "$as_me:4671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -4676,7 +4679,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4679: result: $cf_cv_default_source" >&5
+echo "$as_me:4682: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -4716,16 +4719,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4719: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4722: 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}:4725: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4728: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4728 "configure"
+#line 4731 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4740,16 +4743,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4746: \$? = $ac_status" >&5
+  echo "$as_me:4749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4752: \$? = $ac_status" >&5
+  echo "$as_me:4755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4770,7 +4773,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4773 "configure"
+#line 4776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4785,16 +4788,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4791: \$? = $ac_status" >&5
+  echo "$as_me:4794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4797: \$? = $ac_status" >&5
+  echo "$as_me:4800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4805,7 +4808,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4811: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4813,10 +4816,10 @@ echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4816: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4819: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4819 "configure"
+#line 4822 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4831,16 +4834,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4837: \$? = $ac_status" >&5
+  echo "$as_me:4840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4843: \$? = $ac_status" >&5
+  echo "$as_me:4846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4856,7 +4859,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4859: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4862: 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
@@ -4973,7 +4976,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4976: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4979: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -5005,14 +5008,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:5008: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5011: 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 5015 "configure"
+#line 5018 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5030,16 +5033,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5036: \$? = $ac_status" >&5
+  echo "$as_me:5039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5042: \$? = $ac_status" >&5
+  echo "$as_me:5045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5051,7 +5054,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5054 "configure"
+#line 5057 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5069,16 +5072,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5075: \$? = $ac_status" >&5
+  echo "$as_me:5078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5081: \$? = $ac_status" >&5
+  echo "$as_me:5084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5093,7 +5096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5096: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5099: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5253,16 +5256,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:5256: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:5259: 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}:5262: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:5265: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5265 "configure"
+#line 5268 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5277,16 +5280,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5283: \$? = $ac_status" >&5
+  echo "$as_me:5286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5289: \$? = $ac_status" >&5
+  echo "$as_me:5292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -5307,7 +5310,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5310 "configure"
+#line 5313 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5322,16 +5325,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5328: \$? = $ac_status" >&5
+  echo "$as_me:5331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5334: \$? = $ac_status" >&5
+  echo "$as_me:5337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5342,7 +5345,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5348: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -5350,10 +5353,10 @@ echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:5353: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5356: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5356 "configure"
+#line 5359 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -5368,16 +5371,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5374: \$? = $ac_status" >&5
+  echo "$as_me:5377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5380: \$? = $ac_status" >&5
+  echo "$as_me:5383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5393,7 +5396,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5396: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5399: 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
@@ -5506,10 +5509,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:5509: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5512: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5512 "configure"
+#line 5515 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5527,23 +5530,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5533: \$? = $ac_status" >&5
+  echo "$as_me:5536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5539: \$? = $ac_status" >&5
+  echo "$as_me:5542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:5546: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:5549: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -5566,7 +5569,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5569: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5572: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -5578,7 +5581,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5581: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5584: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -5666,7 +5669,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:5669: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5672: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -5676,7 +5679,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:5679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5682: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -5686,7 +5689,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:5689: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5692: 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"
@@ -5698,10 +5701,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:5701: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:5704: 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 5704 "configure"
+#line 5707 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5716,16 +5719,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5722: \$? = $ac_status" >&5
+  echo "$as_me:5725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5728: \$? = $ac_status" >&5
+  echo "$as_me:5731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -5734,12 +5737,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:5737: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:5740: 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 5742 "configure"
+#line 5745 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -5754,16 +5757,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5760: \$? = $ac_status" >&5
+  echo "$as_me:5763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5766: \$? = $ac_status" >&5
+  echo "$as_me:5769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -5774,19 +5777,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:5777: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5780: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:5782: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5785: 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 5789 "configure"
+#line 5792 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5804,16 +5807,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5810: \$? = $ac_status" >&5
+  echo "$as_me:5813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5816: \$? = $ac_status" >&5
+  echo "$as_me:5819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5825,7 +5828,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5828 "configure"
+#line 5831 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5843,16 +5846,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5849: \$? = $ac_status" >&5
+  echo "$as_me:5852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5855: \$? = $ac_status" >&5
+  echo "$as_me:5858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5867,7 +5870,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5870: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5873: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -6014,13 +6017,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:6017: checking for ANSI C header files" >&5
+echo "$as_me:6020: 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 6023 "configure"
+#line 6026 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6028,13 +6031,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6031: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6034: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6037: \$? = $ac_status" >&5
+  echo "$as_me:6040: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6056,7 +6059,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6059 "configure"
+#line 6062 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6074,7 +6077,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6077 "configure"
+#line 6080 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6095,7 +6098,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6098 "configure"
+#line 6101 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6121,15 +6124,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6127: \$? = $ac_status" >&5
+  echo "$as_me:6130: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6132: \$? = $ac_status" >&5
+  echo "$as_me:6135: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6142,7 +6145,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6145: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6148: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6158,28 +6161,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6161: checking for $ac_header" >&5
+echo "$as_me:6164: 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 6167 "configure"
+#line 6170 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6176: \$? = $ac_status" >&5
+  echo "$as_me:6179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6182: \$? = $ac_status" >&5
+  echo "$as_me:6185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6189,7 +6192,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6195: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6199,13 +6202,13 @@ EOF
 fi
 done
 
-echo "$as_me:6202: checking whether exit is declared" >&5
+echo "$as_me:6205: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6208 "configure"
+#line 6211 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6220,16 +6223,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6226: \$? = $ac_status" >&5
+  echo "$as_me:6229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6232: \$? = $ac_status" >&5
+  echo "$as_me:6235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6239,10 +6242,10 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6242: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6245: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:6245: checking for signal global datatype" >&5
+echo "$as_me:6248: 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
@@ -6254,7 +6257,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6257 "configure"
+#line 6260 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6278,16 +6281,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6284: \$? = $ac_status" >&5
+  echo "$as_me:6287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6290: \$? = $ac_status" >&5
+  echo "$as_me:6293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -6301,7 +6304,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:6304: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:6307: 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 <<EOF
@@ -6310,14 +6313,14 @@ EOF
 
 # Work around breakage on OS X
 
-echo "$as_me:6313: checking if SIGWINCH is defined" >&5
+echo "$as_me:6316: 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 6320 "configure"
+#line 6323 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6332,23 +6335,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6338: \$? = $ac_status" >&5
+  echo "$as_me:6341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6344: \$? = $ac_status" >&5
+  echo "$as_me:6347: \$? = $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 6351 "configure"
+#line 6354 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6366,16 +6369,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6372: \$? = $ac_status" >&5
+  echo "$as_me:6375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6378: \$? = $ac_status" >&5
+  echo "$as_me:6381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -6389,11 +6392,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6392: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6395: 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:6396: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6399: 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
@@ -6404,7 +6407,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6407 "configure"
+#line 6410 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -6426,16 +6429,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6432: \$? = $ac_status" >&5
+  echo "$as_me:6435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6438: \$? = $ac_status" >&5
+  echo "$as_me:6441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -6449,7 +6452,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:6452: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6455: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6459,13 +6462,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:6462: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:6465: 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 6468 "configure"
+#line 6471 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6479,16 +6482,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6485: \$? = $ac_status" >&5
+  echo "$as_me:6488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6491: \$? = $ac_status" >&5
+  echo "$as_me:6494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6499,7 +6502,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6502: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6505: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -6509,7 +6512,7 @@ EOF
 
 	fi
 
-echo "$as_me:6512: checking if you want to use pkg-config" >&5
+echo "$as_me:6515: 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.
@@ -6519,7 +6522,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:6522: result: $cf_pkg_config" >&5
+echo "$as_me:6525: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -6531,7 +6534,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:6534: checking for $ac_word" >&5
+echo "$as_me:6537: 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
@@ -6548,7 +6551,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6551: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6554: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6559,10 +6562,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:6562: result: $PKG_CONFIG" >&5
+  echo "$as_me:6565: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:6565: result: no" >&5
+  echo "$as_me:6568: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6571,7 +6574,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:6574: checking for $ac_word" >&5
+echo "$as_me:6577: 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
@@ -6588,7 +6591,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:6591: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6594: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6600,10 +6603,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:6603: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:6606: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:6606: result: no" >&5
+  echo "$as_me:6609: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6644,18 +6647,18 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6647: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:6650: 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:6654: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:6657: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
-echo "$as_me:6658: checking if you want to see long compiling messages" >&5
+echo "$as_me:6661: 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.
@@ -6689,10 +6692,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6692: result: $enableval" >&5
+echo "$as_me:6695: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6695: checking for an installation directory prefix" >&5
+echo "$as_me:6698: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -6705,10 +6708,10 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:6708: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:6711: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
-echo "$as_me:6711: checking if installation directory prefix should be merged" >&5
+echo "$as_me:6714: checking if installation directory prefix should be merged" >&5
 echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
 
 # Check whether --enable-install-prefix or --disable-install-prefix was given.
@@ -6725,7 +6728,7 @@ else
 	cf_install_prefix=no
 
 fi;
-echo "$as_me:6728: result: $cf_install_prefix" >&5
+echo "$as_me:6731: result: $cf_install_prefix" >&5
 echo "${ECHO_T}$cf_install_prefix" >&6
 
 if test "$cf_install_prefix" = yes ; then
@@ -6734,7 +6737,7 @@ else
 	MERGE_PREFIX=''
 fi
 
-echo "$as_me:6737: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6740: 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.
@@ -6744,10 +6747,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-echo "$as_me:6747: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6750: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
-echo "$as_me:6750: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6753: 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.
@@ -6764,10 +6767,10 @@ else
 	cf_enable_widec=yes
 
 fi;
-echo "$as_me:6767: result: $cf_enable_widec" >&5
+echo "$as_me:6770: result: $cf_enable_widec" >&5
 echo "${ECHO_T}$cf_enable_widec" >&6
 
-echo "$as_me:6770: checking for specific curses-directory" >&5
+echo "$as_me:6773: 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.
@@ -6777,7 +6780,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:6780: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6783: 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"
@@ -6806,7 +6809,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:6809: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:6812: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6842,7 +6845,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6845 "configure"
+#line 6848 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6854,16 +6857,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6860: \$? = $ac_status" >&5
+  echo "$as_me:6863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6866: \$? = $ac_status" >&5
+  echo "$as_me:6869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6880,7 +6883,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6883: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6886: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6916,7 +6919,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6922: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6929,7 +6932,7 @@ fi
 
 cf_cv_screen=curses
 
-echo "$as_me:6932: checking for specified curses library type" >&5
+echo "$as_me:6935: 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.
@@ -6973,13 +6976,13 @@ fi;
 fi;
 fi;
 
-echo "$as_me:6976: result: $cf_cv_screen" >&5
+echo "$as_me:6979: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
-echo "$as_me:6982: checking for extra include directories" >&5
+echo "$as_me:6985: 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
@@ -7005,7 +7008,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:7008: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:7011: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -7015,7 +7018,7 @@ then
 
 fi
 
-echo "$as_me:7018: checking if we have identified curses headers" >&5
+echo "$as_me:7021: 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
@@ -7027,7 +7030,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7030 "configure"
+#line 7033 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -7039,16 +7042,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7045: \$? = $ac_status" >&5
+  echo "$as_me:7048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7051: \$? = $ac_status" >&5
+  echo "$as_me:7054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -7059,11 +7062,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7062: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7065: 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:7066: error: No curses header-files found" >&5
+	{ { echo "$as_me:7069: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7073,23 +7076,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7076: checking for $ac_header" >&5
+echo "$as_me:7079: 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 7082 "configure"
+#line 7085 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7086: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7092: \$? = $ac_status" >&5
+  echo "$as_me:7095: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7108,7 +7111,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7111: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7114: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7118,7 +7121,7 @@ EOF
 fi
 done
 
-echo "$as_me:7121: checking for terminfo header" >&5
+echo "$as_me:7124: 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
@@ -7136,7 +7139,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7139 "configure"
+#line 7142 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -7151,16 +7154,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7157: \$? = $ac_status" >&5
+  echo "$as_me:7160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7163: \$? = $ac_status" >&5
+  echo "$as_me:7166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7176,7 +7179,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:7179: result: $cf_cv_term_header" >&5
+echo "$as_me:7182: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7208,7 +7211,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7211: checking for ncurses version" >&5
+echo "$as_me:7214: 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
@@ -7234,10 +7237,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7237: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:7240: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7240: \$? = $ac_status" >&5
+  echo "$as_me:7243: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -7247,7 +7250,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7250 "configure"
+#line 7253 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7274,15 +7277,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7280: \$? = $ac_status" >&5
+  echo "$as_me:7283: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
+  echo "$as_me:7288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7296,17 +7299,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:7299: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7302: 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:7306: checking if we have identified curses libraries" >&5
+echo "$as_me:7309: 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 7309 "configure"
+#line 7312 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7318,16 +7321,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7324: \$? = $ac_status" >&5
+  echo "$as_me:7327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7330: \$? = $ac_status" >&5
+  echo "$as_me:7333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7336,13 +7339,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:7339: result: $cf_result" >&5
+echo "$as_me:7342: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:7345: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:7348: 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
@@ -7350,7 +7353,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7353 "configure"
+#line 7356 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7369,16 +7372,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7375: \$? = $ac_status" >&5
+  echo "$as_me:7378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7381: \$? = $ac_status" >&5
+  echo "$as_me:7384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -7389,7 +7392,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7392: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7395: 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
 
@@ -7419,7 +7422,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:7422: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:7425: 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
@@ -7427,7 +7430,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7430 "configure"
+#line 7433 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7446,16 +7449,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7452: \$? = $ac_status" >&5
+  echo "$as_me:7455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7458: \$? = $ac_status" >&5
+  echo "$as_me:7461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -7466,7 +7469,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7469: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:7472: 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
 
@@ -7490,7 +7493,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:7493: checking for initscr in -lHcurses" >&5
+		echo "$as_me:7496: 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
@@ -7498,7 +7501,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7501 "configure"
+#line 7504 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7517,16 +7520,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7523: \$? = $ac_status" >&5
+  echo "$as_me:7526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7529: \$? = $ac_status" >&5
+  echo "$as_me:7532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -7537,7 +7540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7540: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:7543: 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
 
@@ -7595,7 +7598,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7598: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7624,7 +7627,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7627: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7630: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7655,7 +7658,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7658: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7661: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7690,7 +7693,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7696: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7734,13 +7737,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:7737: checking for tgoto" >&5
+		echo "$as_me:7740: 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 7743 "configure"
+#line 7746 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7771,16 +7774,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7777: \$? = $ac_status" >&5
+  echo "$as_me:7780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7783: \$? = $ac_status" >&5
+  echo "$as_me:7786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -7790,7 +7793,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7793: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7796: 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
@@ -7799,7 +7802,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:7802: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7805: 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
@@ -7807,7 +7810,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7810 "configure"
+#line 7813 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7826,16 +7829,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7832: \$? = $ac_status" >&5
+  echo "$as_me:7835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7838: \$? = $ac_status" >&5
+  echo "$as_me:7841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -7846,7 +7849,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7849: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7852: 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
 
@@ -7869,10 +7872,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:7872: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:7875: 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 7875 "configure"
+#line 7878 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7884,16 +7887,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7890: \$? = $ac_status" >&5
+  echo "$as_me:7893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7896: \$? = $ac_status" >&5
+  echo "$as_me:7899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7902,16 +7905,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7905: result: $cf_result" >&5
+				echo "$as_me:7908: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:7911: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:7914: 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 7914 "configure"
+#line 7917 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7923,16 +7926,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7929: \$? = $ac_status" >&5
+  echo "$as_me:7932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7935: \$? = $ac_status" >&5
+  echo "$as_me:7938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -7941,7 +7944,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 7944 "configure"
+#line 7947 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7953,16 +7956,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7959: \$? = $ac_status" >&5
+  echo "$as_me:7962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7965: \$? = $ac_status" >&5
+  echo "$as_me:7968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -7974,13 +7977,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:7977: result: $cf_result" >&5
+				echo "$as_me:7980: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7983: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:7986: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7992,23 +7995,23 @@ fi
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7995: checking for $ac_header" >&5
+echo "$as_me:7998: 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 8001 "configure"
+#line 8004 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8008: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8011: \$? = $ac_status" >&5
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8027,7 +8030,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8033: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8037,7 +8040,7 @@ EOF
 fi
 done
 
-echo "$as_me:8040: checking for multibyte character support" >&5
+echo "$as_me:8043: 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
@@ -8045,7 +8048,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8048 "configure"
+#line 8051 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8062,16 +8065,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8068: \$? = $ac_status" >&5
+  echo "$as_me:8071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8074: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8083,12 +8086,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:8086: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8089: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8091 "configure"
+#line 8094 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8101,16 +8104,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8107: \$? = $ac_status" >&5
+  echo "$as_me:8110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8113: \$? = $ac_status" >&5
+  echo "$as_me:8116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8124,7 +8127,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8127 "configure"
+#line 8130 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8137,16 +8140,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8143: \$? = $ac_status" >&5
+  echo "$as_me:8146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8149: \$? = $ac_status" >&5
+  echo "$as_me:8152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -8163,9 +8166,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:8166: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8169: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:8168: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8171: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8256,7 +8259,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8259: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8262: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -8264,7 +8267,7 @@ echo "${as_me:-configure}:8259: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8267 "configure"
+#line 8270 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8277,21 +8280,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8283: \$? = $ac_status" >&5
+  echo "$as_me:8286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8289: \$? = $ac_status" >&5
+  echo "$as_me:8292: \$? = $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}:8294: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8297: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8309,7 +8312,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:8312: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8315: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8384,13 +8387,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:8387: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8390: 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 8393 "configure"
+#line 8396 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8403,21 +8406,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8409: \$? = $ac_status" >&5
+  echo "$as_me:8412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8415: \$? = $ac_status" >&5
+  echo "$as_me:8418: \$? = $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}:8420: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8423: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -8459,7 +8462,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8462: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8465: 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
@@ -8497,7 +8500,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8500 "configure"
+#line 8503 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8509,16 +8512,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8515: \$? = $ac_status" >&5
+  echo "$as_me:8518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8521: \$? = $ac_status" >&5
+  echo "$as_me:8524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8535,7 +8538,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8538: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8541: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8571,7 +8574,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8574: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8577: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -8601,13 +8604,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:8604: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8607: 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:8607: result: yes" >&5
+		echo "$as_me:8610: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:8610: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8613: 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
 
@@ -8740,7 +8743,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8743 "configure"
+#line 8746 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8752,37 +8755,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8758: \$? = $ac_status" >&5
+  echo "$as_me:8761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8764: \$? = $ac_status" >&5
+  echo "$as_me:8767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8770 "configure"
+#line 8773 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8780: \$? = $ac_status" >&5
+  echo "$as_me:8783: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8785: \$? = $ac_status" >&5
+  echo "$as_me:8788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -8956,7 +8959,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8959 "configure"
+#line 8962 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8968,37 +8971,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8974: \$? = $ac_status" >&5
+  echo "$as_me:8977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8980: \$? = $ac_status" >&5
+  echo "$as_me:8983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8986 "configure"
+#line 8989 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8996: \$? = $ac_status" >&5
+  echo "$as_me:8999: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9001: \$? = $ac_status" >&5
+  echo "$as_me:9004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -9015,7 +9018,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:9018: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9021: 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"
@@ -9031,7 +9034,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:9034: checking for terminfo header" >&5
+echo "$as_me:9037: 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
@@ -9049,7 +9052,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9052 "configure"
+#line 9055 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9064,16 +9067,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9070: \$? = $ac_status" >&5
+  echo "$as_me:9073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9076: \$? = $ac_status" >&5
+  echo "$as_me:9079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9089,7 +9092,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9092: result: $cf_cv_term_header" >&5
+echo "$as_me:9095: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9124,7 +9127,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9127: result: no" >&5
+		echo "$as_me:9130: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9140,7 +9143,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9143: checking for $ac_word" >&5
+echo "$as_me:9146: 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
@@ -9155,7 +9158,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9158: found $ac_dir/$ac_word" >&5
+echo "$as_me:9161: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9163,10 +9166,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9166: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9169: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9169: result: no" >&5
+  echo "$as_me:9172: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9179,7 +9182,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9182: checking for $ac_word" >&5
+echo "$as_me:9185: 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
@@ -9194,7 +9197,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9197: found $ac_dir/$ac_word" >&5
+echo "$as_me:9200: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9202,10 +9205,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9205: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9208: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9208: result: no" >&5
+  echo "$as_me:9211: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9362,7 +9365,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9365: checking if we have identified curses headers" >&5
+echo "$as_me:9368: 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
@@ -9374,7 +9377,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9377 "configure"
+#line 9380 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9386,16 +9389,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9392: \$? = $ac_status" >&5
+  echo "$as_me:9395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9398: \$? = $ac_status" >&5
+  echo "$as_me:9401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9406,11 +9409,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9409: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9412: 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:9413: error: No curses header-files found" >&5
+	{ { echo "$as_me:9416: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9420,23 +9423,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9423: checking for $ac_header" >&5
+echo "$as_me:9426: 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 9429 "configure"
+#line 9432 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9433: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9436: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9439: \$? = $ac_status" >&5
+  echo "$as_me:9442: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9455,7 +9458,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9458: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9511,7 +9514,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9514 "configure"
+#line 9517 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9523,16 +9526,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9529: \$? = $ac_status" >&5
+  echo "$as_me:9532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9535: \$? = $ac_status" >&5
+  echo "$as_me:9538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9549,7 +9552,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9552: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9555: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9568,7 +9571,7 @@ fi
 
 }
 
-echo "$as_me:9571: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9574: 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
@@ -9580,7 +9583,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9583 "configure"
+#line 9586 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9604,16 +9607,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9610: \$? = $ac_status" >&5
+  echo "$as_me:9613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9616: \$? = $ac_status" >&5
+  echo "$as_me:9619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9628,14 +9631,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9631: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9634: 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:9638: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9641: 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
@@ -9756,7 +9759,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9759 "configure"
+#line 9762 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9768,16 +9771,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9774: \$? = $ac_status" >&5
+  echo "$as_me:9777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9780: \$? = $ac_status" >&5
+  echo "$as_me:9783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9794,7 +9797,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9797: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9800: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9817,7 +9820,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9820 "configure"
+#line 9823 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9841,16 +9844,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9847: \$? = $ac_status" >&5
+  echo "$as_me:9850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9853: \$? = $ac_status" >&5
+  echo "$as_me:9856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9871,12 +9874,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9874: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9877: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9879: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9882: 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%/[^/]*$%%'`
@@ -9912,7 +9915,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9915 "configure"
+#line 9918 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9924,16 +9927,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9930: \$? = $ac_status" >&5
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9936: \$? = $ac_status" >&5
+  echo "$as_me:9939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9950,7 +9953,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9953: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9956: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9998,7 +10001,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10001: checking for terminfo header" >&5
+echo "$as_me:10004: 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
@@ -10016,7 +10019,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10019 "configure"
+#line 10022 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10031,16 +10034,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10037: \$? = $ac_status" >&5
+  echo "$as_me:10040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10043: \$? = $ac_status" >&5
+  echo "$as_me:10046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10056,7 +10059,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10059: result: $cf_cv_term_header" >&5
+echo "$as_me:10062: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10094,7 +10097,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10097: checking for ncurses version" >&5
+echo "$as_me:10100: 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
@@ -10120,10 +10123,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10123: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10126: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10126: \$? = $ac_status" >&5
+  echo "$as_me:10129: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10133,7 +10136,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10136 "configure"
+#line 10139 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10160,15 +10163,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10166: \$? = $ac_status" >&5
+  echo "$as_me:10169: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10171: \$? = $ac_status" >&5
+  echo "$as_me:10174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10182,7 +10185,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10185: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10188: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10195,7 +10198,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10198: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10201: 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
@@ -10203,7 +10206,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10206 "configure"
+#line 10209 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10222,16 +10225,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10228: \$? = $ac_status" >&5
+  echo "$as_me:10231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10234: \$? = $ac_status" >&5
+  echo "$as_me:10237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10242,10 +10245,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10245: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10248: 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:10248: checking for initscr in -lgpm" >&5
+  echo "$as_me:10251: 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
@@ -10253,7 +10256,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10256 "configure"
+#line 10259 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10272,16 +10275,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10278: \$? = $ac_status" >&5
+  echo "$as_me:10281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10284: \$? = $ac_status" >&5
+  echo "$as_me:10287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10292,7 +10295,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10295: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10298: 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"
@@ -10307,7 +10310,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10310: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10313: 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
@@ -10315,7 +10318,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10318 "configure"
+#line 10321 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10334,16 +10337,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10340: \$? = $ac_status" >&5
+  echo "$as_me:10343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10346: \$? = $ac_status" >&5
+  echo "$as_me:10349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10354,7 +10357,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10357: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10360: 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"
@@ -10403,13 +10406,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10406: checking for initscr" >&5
+	echo "$as_me:10409: 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 10412 "configure"
+#line 10415 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10440,16 +10443,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10446: \$? = $ac_status" >&5
+  echo "$as_me:10449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10452: \$? = $ac_status" >&5
+  echo "$as_me:10455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10459,18 +10462,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10462: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10465: 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:10469: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10472: 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 10473 "configure"
+#line 10476 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10482,25 +10485,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10488: \$? = $ac_status" >&5
+  echo "$as_me:10491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10494: \$? = $ac_status" >&5
+  echo "$as_me:10497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10496: result: yes" >&5
+  echo "$as_me:10499: 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:10503: result: no" >&5
+echo "$as_me:10506: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10568,11 +10571,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10571: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10574: 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 10575 "configure"
+#line 10578 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10584,25 +10587,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10590: \$? = $ac_status" >&5
+  echo "$as_me:10593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10596: \$? = $ac_status" >&5
+  echo "$as_me:10599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10598: result: yes" >&5
+  echo "$as_me:10601: 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:10605: result: no" >&5
+echo "$as_me:10608: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10617,7 +10620,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10620: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10623: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10625,7 +10628,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10628: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10631: 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
@@ -10635,7 +10638,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10638 "configure"
+#line 10641 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10647,23 +10650,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10653: \$? = $ac_status" >&5
+  echo "$as_me:10656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10659: \$? = $ac_status" >&5
+  echo "$as_me:10662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10661: result: yes" >&5
+  echo "$as_me:10664: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10666: result: no" >&5
+echo "$as_me:10669: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10688,13 +10691,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10691: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10694: 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:10694: result: yes" >&5
+		echo "$as_me:10697: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10697: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10700: 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
 
@@ -10827,7 +10830,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10830 "configure"
+#line 10833 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10839,37 +10842,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10845: \$? = $ac_status" >&5
+  echo "$as_me:10848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10851: \$? = $ac_status" >&5
+  echo "$as_me:10854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10857 "configure"
+#line 10860 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10867: \$? = $ac_status" >&5
+  echo "$as_me:10870: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10872: \$? = $ac_status" >&5
+  echo "$as_me:10875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -11043,7 +11046,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11046 "configure"
+#line 11049 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11055,37 +11058,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11061: \$? = $ac_status" >&5
+  echo "$as_me:11064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11067: \$? = $ac_status" >&5
+  echo "$as_me:11070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11073 "configure"
+#line 11076 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11083: \$? = $ac_status" >&5
+  echo "$as_me:11086: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11088: \$? = $ac_status" >&5
+  echo "$as_me:11091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11102,7 +11105,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11105: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11108: 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"
@@ -11118,7 +11121,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11121: checking for terminfo header" >&5
+echo "$as_me:11124: 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
@@ -11136,7 +11139,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11139 "configure"
+#line 11142 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11151,16 +11154,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11157: \$? = $ac_status" >&5
+  echo "$as_me:11160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11163: \$? = $ac_status" >&5
+  echo "$as_me:11166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11176,7 +11179,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11179: result: $cf_cv_term_header" >&5
+echo "$as_me:11182: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11211,7 +11214,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11214: result: no" >&5
+		echo "$as_me:11217: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11227,7 +11230,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11230: checking for $ac_word" >&5
+echo "$as_me:11233: 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
@@ -11242,7 +11245,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11245: found $ac_dir/$ac_word" >&5
+echo "$as_me:11248: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11250,10 +11253,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11253: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11256: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11256: result: no" >&5
+  echo "$as_me:11259: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11266,7 +11269,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11269: checking for $ac_word" >&5
+echo "$as_me:11272: 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
@@ -11281,7 +11284,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11284: found $ac_dir/$ac_word" >&5
+echo "$as_me:11287: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11289,10 +11292,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11292: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11295: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11295: result: no" >&5
+  echo "$as_me:11298: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11449,7 +11452,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11452: checking if we have identified curses headers" >&5
+echo "$as_me:11455: 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
@@ -11461,7 +11464,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11464 "configure"
+#line 11467 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11473,16 +11476,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11479: \$? = $ac_status" >&5
+  echo "$as_me:11482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11485: \$? = $ac_status" >&5
+  echo "$as_me:11488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11493,11 +11496,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11496: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11499: 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:11500: error: No curses header-files found" >&5
+	{ { echo "$as_me:11503: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11507,23 +11510,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11510: checking for $ac_header" >&5
+echo "$as_me:11513: 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 11516 "configure"
+#line 11519 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11520: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11526: \$? = $ac_status" >&5
+  echo "$as_me:11529: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11542,7 +11545,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11545: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11598,7 +11601,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11601 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11610,16 +11613,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11616: \$? = $ac_status" >&5
+  echo "$as_me:11619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11622: \$? = $ac_status" >&5
+  echo "$as_me:11625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11636,7 +11639,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11639: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11642: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11655,7 +11658,7 @@ fi
 
 }
 
-echo "$as_me:11658: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11661: 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
@@ -11667,7 +11670,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11670 "configure"
+#line 11673 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11691,16 +11694,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11697: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11697: \$? = $ac_status" >&5
+  echo "$as_me:11700: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11703: \$? = $ac_status" >&5
+  echo "$as_me:11706: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11715,14 +11718,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11718: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11721: 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:11725: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11728: 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
@@ -11843,7 +11846,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11846 "configure"
+#line 11849 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11855,16 +11858,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11861: \$? = $ac_status" >&5
+  echo "$as_me:11864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11867: \$? = $ac_status" >&5
+  echo "$as_me:11870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11881,7 +11884,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11884: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11887: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11904,7 +11907,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11907 "configure"
+#line 11910 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11928,16 +11931,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11934: \$? = $ac_status" >&5
+  echo "$as_me:11937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11940: \$? = $ac_status" >&5
+  echo "$as_me:11943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11958,12 +11961,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11961: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11964: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11966: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11969: 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%/[^/]*$%%'`
@@ -11999,7 +12002,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 12002 "configure"
+#line 12005 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12011,16 +12014,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12017: \$? = $ac_status" >&5
+  echo "$as_me:12020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12023: \$? = $ac_status" >&5
+  echo "$as_me:12026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12037,7 +12040,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12085,7 +12088,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12088: checking for terminfo header" >&5
+echo "$as_me:12091: 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
@@ -12103,7 +12106,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12106 "configure"
+#line 12109 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12118,16 +12121,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12124: \$? = $ac_status" >&5
+  echo "$as_me:12127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12130: \$? = $ac_status" >&5
+  echo "$as_me:12133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12143,7 +12146,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12146: result: $cf_cv_term_header" >&5
+echo "$as_me:12149: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12181,7 +12184,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12184: checking for ncurses version" >&5
+echo "$as_me:12187: 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
@@ -12207,10 +12210,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12210: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12213: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12213: \$? = $ac_status" >&5
+  echo "$as_me:12216: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12220,7 +12223,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12223 "configure"
+#line 12226 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12247,15 +12250,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12253: \$? = $ac_status" >&5
+  echo "$as_me:12256: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12258: \$? = $ac_status" >&5
+  echo "$as_me:12261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12269,7 +12272,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12272: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12275: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12282,7 +12285,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12285: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12288: 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
@@ -12290,7 +12293,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12293 "configure"
+#line 12296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12309,16 +12312,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12315: \$? = $ac_status" >&5
+  echo "$as_me:12318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12321: \$? = $ac_status" >&5
+  echo "$as_me:12324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12329,10 +12332,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12332: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12335: 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:12335: checking for initscr in -lgpm" >&5
+  echo "$as_me:12338: 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
@@ -12340,7 +12343,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12343 "configure"
+#line 12346 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12359,16 +12362,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12365: \$? = $ac_status" >&5
+  echo "$as_me:12368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12371: \$? = $ac_status" >&5
+  echo "$as_me:12374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12379,7 +12382,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12382: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12385: 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"
@@ -12394,7 +12397,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12397: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12400: 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
@@ -12402,7 +12405,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12405 "configure"
+#line 12408 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12421,16 +12424,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12427: \$? = $ac_status" >&5
+  echo "$as_me:12430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12433: \$? = $ac_status" >&5
+  echo "$as_me:12436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12441,7 +12444,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12444: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12447: 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"
@@ -12490,13 +12493,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12493: checking for initscr" >&5
+	echo "$as_me:12496: 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 12499 "configure"
+#line 12502 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12527,16 +12530,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12533: \$? = $ac_status" >&5
+  echo "$as_me:12536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12539: \$? = $ac_status" >&5
+  echo "$as_me:12542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12546,18 +12549,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12549: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12552: 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:12556: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12559: 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 12560 "configure"
+#line 12563 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12569,25 +12572,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12575: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12581: \$? = $ac_status" >&5
+  echo "$as_me:12584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12583: result: yes" >&5
+  echo "$as_me:12586: 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:12590: result: no" >&5
+echo "$as_me:12593: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12655,11 +12658,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12658: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12661: 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 12662 "configure"
+#line 12665 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12671,25 +12674,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12677: \$? = $ac_status" >&5
+  echo "$as_me:12680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12683: \$? = $ac_status" >&5
+  echo "$as_me:12686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12685: result: yes" >&5
+  echo "$as_me:12688: 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:12692: result: no" >&5
+echo "$as_me:12695: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12704,7 +12707,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12707: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12710: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12712,7 +12715,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12715: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12718: 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
@@ -12722,7 +12725,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12725 "configure"
+#line 12728 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12734,23 +12737,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12740: \$? = $ac_status" >&5
+  echo "$as_me:12743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12746: \$? = $ac_status" >&5
+  echo "$as_me:12749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12748: result: yes" >&5
+  echo "$as_me:12751: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12753: result: no" >&5
+echo "$as_me:12756: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12770,7 +12773,7 @@ fi
 
 	;;
 (pdcurses)
-	echo "$as_me:12773: checking for X" >&5
+	echo "$as_me:12776: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12874,17 +12877,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12877 "configure"
+#line 12880 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12881: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12884: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12887: \$? = $ac_status" >&5
+  echo "$as_me:12890: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12917,7 +12920,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12920 "configure"
+#line 12923 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12929,16 +12932,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12935: \$? = $ac_status" >&5
+  echo "$as_me:12938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12941: \$? = $ac_status" >&5
+  echo "$as_me:12944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12976,7 +12979,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12979: result: $have_x" >&5
+  echo "$as_me:12982: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12986,7 +12989,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12989: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12992: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -13013,11 +13016,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:13016: checking whether -R must be followed by a space" >&5
+      echo "$as_me:13019: 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 13020 "configure"
+#line 13023 "configure"
 #include "confdefs.h"
 
 int
@@ -13029,16 +13032,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13035: \$? = $ac_status" >&5
+  echo "$as_me:13038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13041: \$? = $ac_status" >&5
+  echo "$as_me:13044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -13048,13 +13051,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:13051: result: no" >&5
+	echo "$as_me:13054: 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 13057 "configure"
+#line 13060 "configure"
 #include "confdefs.h"
 
 int
@@ -13066,16 +13069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13072: \$? = $ac_status" >&5
+  echo "$as_me:13075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13078: \$? = $ac_status" >&5
+  echo "$as_me:13081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13085,11 +13088,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13088: result: yes" >&5
+	  echo "$as_me:13091: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13092: result: neither works" >&5
+	  echo "$as_me:13095: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13109,7 +13112,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13112 "configure"
+#line 13115 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13128,22 +13131,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13134: \$? = $ac_status" >&5
+  echo "$as_me:13137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13140: \$? = $ac_status" >&5
+  echo "$as_me:13143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13146: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13149: 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
@@ -13151,7 +13154,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13154 "configure"
+#line 13157 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13170,16 +13173,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13176: \$? = $ac_status" >&5
+  echo "$as_me:13179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13182: \$? = $ac_status" >&5
+  echo "$as_me:13185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13190,14 +13193,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13193: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13196: 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:13200: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13203: 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
@@ -13205,7 +13208,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13208 "configure"
+#line 13211 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13224,16 +13227,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13230: \$? = $ac_status" >&5
+  echo "$as_me:13233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13236: \$? = $ac_status" >&5
+  echo "$as_me:13239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13244,7 +13247,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13247: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13250: 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"
@@ -13263,13 +13266,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13266: checking for gethostbyname" >&5
+    echo "$as_me:13269: 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 13272 "configure"
+#line 13275 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13300,16 +13303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13306: \$? = $ac_status" >&5
+  echo "$as_me:13309: \$? = $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:13312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13312: \$? = $ac_status" >&5
+  echo "$as_me:13315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13319,11 +13322,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13322: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13325: 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:13326: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13329: 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
@@ -13331,7 +13334,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13334 "configure"
+#line 13337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13350,16 +13353,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13356: \$? = $ac_status" >&5
+  echo "$as_me:13359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13362: \$? = $ac_status" >&5
+  echo "$as_me:13365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13370,14 +13373,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13373: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13376: 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:13380: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13383: 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
@@ -13385,7 +13388,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13388 "configure"
+#line 13391 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13404,16 +13407,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13410: \$? = $ac_status" >&5
+  echo "$as_me:13413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13416: \$? = $ac_status" >&5
+  echo "$as_me:13419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13424,7 +13427,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13427: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13430: 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"
@@ -13440,13 +13443,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13443: checking for connect" >&5
+    echo "$as_me:13446: 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 13449 "configure"
+#line 13452 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13477,16 +13480,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13483: \$? = $ac_status" >&5
+  echo "$as_me:13486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13489: \$? = $ac_status" >&5
+  echo "$as_me:13492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13496,11 +13499,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13499: result: $ac_cv_func_connect" >&5
+echo "$as_me:13502: 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:13503: checking for connect in -lsocket" >&5
+      echo "$as_me:13506: 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
@@ -13508,7 +13511,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13511 "configure"
+#line 13514 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13527,16 +13530,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13533: \$? = $ac_status" >&5
+  echo "$as_me:13536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13539: \$? = $ac_status" >&5
+  echo "$as_me:13542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13547,7 +13550,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13550: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13553: 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"
@@ -13556,13 +13559,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13559: checking for remove" >&5
+    echo "$as_me:13562: 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 13565 "configure"
+#line 13568 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13593,16 +13596,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13599: \$? = $ac_status" >&5
+  echo "$as_me:13602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13605: \$? = $ac_status" >&5
+  echo "$as_me:13608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13612,11 +13615,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13615: result: $ac_cv_func_remove" >&5
+echo "$as_me:13618: 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:13619: checking for remove in -lposix" >&5
+      echo "$as_me:13622: 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
@@ -13624,7 +13627,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13627 "configure"
+#line 13630 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13643,16 +13646,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13649: \$? = $ac_status" >&5
+  echo "$as_me:13652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13655: \$? = $ac_status" >&5
+  echo "$as_me:13658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13663,7 +13666,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13666: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13669: 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"
@@ -13672,13 +13675,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13675: checking for shmat" >&5
+    echo "$as_me:13678: 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 13681 "configure"
+#line 13684 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13709,16 +13712,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13715: \$? = $ac_status" >&5
+  echo "$as_me:13718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13721: \$? = $ac_status" >&5
+  echo "$as_me:13724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13728,11 +13731,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13731: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13734: 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:13735: checking for shmat in -lipc" >&5
+      echo "$as_me:13738: 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
@@ -13740,7 +13743,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13743 "configure"
+#line 13746 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13759,16 +13762,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13765: \$? = $ac_status" >&5
+  echo "$as_me:13768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13771: \$? = $ac_status" >&5
+  echo "$as_me:13774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13779,7 +13782,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13782: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13785: 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"
@@ -13797,7 +13800,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13800: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13803: 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
@@ -13805,7 +13808,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13808 "configure"
+#line 13811 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13824,16 +13827,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13830: \$? = $ac_status" >&5
+  echo "$as_me:13833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13836: \$? = $ac_status" >&5
+  echo "$as_me:13839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13844,7 +13847,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13847: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13850: 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"
@@ -13856,7 +13859,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13859: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13862: 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=
 
@@ -13867,14 +13870,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13870: result: yes" >&5
+	echo "$as_me:13873: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13873: result: no" >&5
+	echo "$as_me:13876: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13877: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13880: 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=
 
@@ -13885,14 +13888,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13888: result: yes" >&5
+	echo "$as_me:13891: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13891: result: no" >&5
+	echo "$as_me:13894: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13895: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13898: 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=
 
@@ -13903,14 +13906,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13906: result: yes" >&5
+	echo "$as_me:13909: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13909: result: no" >&5
+	echo "$as_me:13912: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13913: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13916: 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=
 
@@ -13921,10 +13924,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13924: result: yes" >&5
+	echo "$as_me:13927: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13927: result: no" >&5
+	echo "$as_me:13930: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13944,17 +13947,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13947: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13950: 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}:13953: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13956: 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}:13957: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13960: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14085,20 +14088,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14088: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14091: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14094: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14097: 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 14101 "configure"
+#line 14104 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14116,16 +14119,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14122: \$? = $ac_status" >&5
+  echo "$as_me:14125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14128: \$? = $ac_status" >&5
+  echo "$as_me:14131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14135,7 +14138,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14138: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14141: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14147,7 +14150,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14155,17 +14158,17 @@ echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14158: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14161: 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}:14164: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14167: 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}:14168: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14171: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14285,12 +14288,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14288: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14291: 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}:14293: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14296: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14298,12 +14301,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14301: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14304: 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}:14306: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14309: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14314,7 +14317,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14317: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14320: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14339,17 +14342,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14342: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14345: 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}:14348: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14351: 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}:14352: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14355: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14470,7 +14473,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14473: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14476: 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
@@ -14478,7 +14481,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14481 "configure"
+#line 14484 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14497,16 +14500,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14503: \$? = $ac_status" >&5
+  echo "$as_me:14506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14509: \$? = $ac_status" >&5
+  echo "$as_me:14512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14517,7 +14520,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14520: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14523: 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
 
@@ -14553,17 +14556,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14556: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14559: 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}:14562: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14565: 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}:14566: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14569: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14683,24 +14686,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14686: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14689: 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}:14693: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14696: 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}:14699: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14702: 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}:14703: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14706: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14820,24 +14823,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14823: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14826: 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}:14830: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14833: 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}:14836: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14839: 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}:14840: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14957,24 +14960,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14960: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14963: 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}:14967: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14970: 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}:14973: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14976: 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}:14977: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14980: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15094,7 +15097,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15097: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15100: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15107,17 +15110,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15110: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15113: 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}:15116: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15119: 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}:15120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15123: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15238,14 +15241,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15241: checking for usable X dependency" >&5
+echo "$as_me:15244: 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 15248 "configure"
+#line 15251 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15265,16 +15268,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15271: \$? = $ac_status" >&5
+  echo "$as_me:15274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15277: \$? = $ac_status" >&5
+  echo "$as_me:15280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15284,30 +15287,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15287: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15290: 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}:15293: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15296: 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}:15300: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15303: 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}:15306: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15309: 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}:15310: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15313: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15430,12 +15433,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15433: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15436: 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}:15438: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15441: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15443,14 +15446,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15446: checking for usable X Toolkit package" >&5
+echo "$as_me:15449: 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 15453 "configure"
+#line 15456 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15466,16 +15469,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15472: \$? = $ac_status" >&5
+  echo "$as_me:15475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15478: \$? = $ac_status" >&5
+  echo "$as_me:15481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15485,7 +15488,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15488: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15491: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15499,22 +15502,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15502: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15505: 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}:15507: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15510: 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}:15513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15516: 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}:15517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15633,17 +15636,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15636: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15639: 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}:15642: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15645: 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}:15646: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15772,12 +15775,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15775: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15778: 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}:15780: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15783: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15797,7 +15800,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15800: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15803: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15882,7 +15885,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15888: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15892,7 +15895,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15895: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15898: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15902,7 +15905,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15905: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15908: 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"
@@ -15911,7 +15914,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15914 "configure"
+#line 15917 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15923,16 +15926,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15929: \$? = $ac_status" >&5
+  echo "$as_me:15932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15935: \$? = $ac_status" >&5
+  echo "$as_me:15938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15940,12 +15943,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15943: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15946: 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}:15948: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15951: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15953,13 +15956,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15956: checking for XOpenDisplay" >&5
+	echo "$as_me:15959: 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 15962 "configure"
+#line 15965 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15990,16 +15993,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15996: \$? = $ac_status" >&5
+  echo "$as_me:15999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16002: \$? = $ac_status" >&5
+  echo "$as_me:16005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -16009,13 +16012,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16012: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:16015: 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:16018: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:16021: 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
@@ -16023,7 +16026,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16026 "configure"
+#line 16029 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16042,16 +16045,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16048: \$? = $ac_status" >&5
+  echo "$as_me:16051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16054: \$? = $ac_status" >&5
+  echo "$as_me:16057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16062,7 +16065,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16065: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16068: 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
 
@@ -16086,13 +16089,13 @@ fi
 
 fi
 
-	echo "$as_me:16089: checking for XtAppInitialize" >&5
+	echo "$as_me:16092: 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 16095 "configure"
+#line 16098 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16123,16 +16126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16129: \$? = $ac_status" >&5
+  echo "$as_me:16132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16135: \$? = $ac_status" >&5
+  echo "$as_me:16138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16142,13 +16145,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16145: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16148: 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:16151: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16154: 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
@@ -16156,7 +16159,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16159 "configure"
+#line 16162 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16175,16 +16178,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16181: \$? = $ac_status" >&5
+  echo "$as_me:16184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16187: \$? = $ac_status" >&5
+  echo "$as_me:16190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16195,7 +16198,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16198: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16201: 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
 
@@ -16212,7 +16215,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16215: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16218: 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
@@ -16253,14 +16256,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16256: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16259: 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:16259: checking for $cf_test" >&5
+			echo "$as_me:16262: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16263 "configure"
+#line 16266 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16274,16 +16277,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16280: \$? = $ac_status" >&5
+  echo "$as_me:16283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16286: \$? = $ac_status" >&5
+  echo "$as_me:16289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16292,7 +16295,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16295: result: $cf_result" >&5
+		echo "$as_me:16298: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16308,7 +16311,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16311: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16314: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16373,10 +16376,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16376: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16379: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16379 "configure"
+#line 16382 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16393,16 +16396,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16399: \$? = $ac_status" >&5
+  echo "$as_me:16402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16405: \$? = $ac_status" >&5
+  echo "$as_me:16408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16411,7 +16414,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16414: result: $cf_result" >&5
+		echo "$as_me:16417: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16428,7 +16431,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16431: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16434: 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
@@ -16462,7 +16465,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16465: checking for $ac_word" >&5
+echo "$as_me:16468: 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
@@ -16477,7 +16480,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16480: found $ac_dir/$ac_word" >&5
+echo "$as_me:16483: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16485,10 +16488,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16488: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16491: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16491: result: no" >&5
+  echo "$as_me:16494: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16501,7 +16504,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16504: checking for $ac_word" >&5
+echo "$as_me:16507: 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
@@ -16516,7 +16519,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16519: found $ac_dir/$ac_word" >&5
+echo "$as_me:16522: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16524,10 +16527,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16527: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16530: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16530: result: no" >&5
+  echo "$as_me:16533: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16662,7 +16665,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16665: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16668: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16747,7 +16750,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16753: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16757,7 +16760,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16760: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16763: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16767,7 +16770,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16770: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16773: 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"
@@ -16776,7 +16779,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16779 "configure"
+#line 16782 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16788,16 +16791,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16794: \$? = $ac_status" >&5
+  echo "$as_me:16797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16800: \$? = $ac_status" >&5
+  echo "$as_me:16803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16805,12 +16808,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16808: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16811: 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}:16813: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16816: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16818,7 +16821,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16821: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16824: 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
@@ -16826,7 +16829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16829 "configure"
+#line 16832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16845,16 +16848,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16851: \$? = $ac_status" >&5
+  echo "$as_me:16854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16857: \$? = $ac_status" >&5
+  echo "$as_me:16860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16865,7 +16868,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16868: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16871: 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
 
@@ -16887,7 +16890,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16890: checking for XCurses library" >&5
+echo "$as_me:16893: 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
@@ -16910,7 +16913,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16913 "configure"
+#line 16916 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16925,16 +16928,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16931: \$? = $ac_status" >&5
+  echo "$as_me:16934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16937: \$? = $ac_status" >&5
+  echo "$as_me:16940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16945,7 +16948,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16948: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16951: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16960,23 +16963,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16963: checking for xcurses.h" >&5
+	echo "$as_me:16966: 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 16969 "configure"
+#line 16972 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16976: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16979: \$? = $ac_status" >&5
+  echo "$as_me:16982: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16995,7 +16998,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16998: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:17001: 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
 
@@ -17006,26 +17009,26 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:17009: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:17012: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:17016: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:17019: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:17022: checking for _nc_init_pthreads" >&5
+echo "$as_me:17025: checking for _nc_init_pthreads" >&5
 echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
 if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17028 "configure"
+#line 17031 "configure"
 #include "confdefs.h"
 #define _nc_init_pthreads autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17056,16 +17059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17062: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17068: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_init_pthreads=yes
 else
@@ -17075,7 +17078,7 @@ ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17078: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "$as_me:17081: result: $ac_cv_func__nc_init_pthreads" >&5
 echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
 if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
@@ -17110,7 +17113,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17113: checking for X11 rgb file" >&5
+echo "$as_me:17116: 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.
@@ -17172,7 +17175,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17175: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17178: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17180,7 +17183,7 @@ esac
 
 fi
 
-echo "$as_me:17183: result: $RGB_PATH" >&5
+echo "$as_me:17186: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17221,7 +17224,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17224: checking for desired basename for form library" >&5
+echo "$as_me:17227: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17241,10 +17244,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17244: result: $FORM_NAME" >&5
+echo "$as_me:17247: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17247: checking for desired basename for menu library" >&5
+echo "$as_me:17250: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17264,10 +17267,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17267: result: $MENU_NAME" >&5
+echo "$as_me:17270: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17270: checking for desired basename for panel library" >&5
+echo "$as_me:17273: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17287,10 +17290,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17290: result: $PANEL_NAME" >&5
+echo "$as_me:17293: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17293: checking if you want to check for panel functions" >&5
+echo "$as_me:17296: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17307,7 +17310,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17310: result: $cf_enable_panel" >&5
+echo "$as_me:17313: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17318,13 +17321,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17321: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17324: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17324: result: yes" >&5
+		echo "$as_me:17327: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17327: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17330: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17474,7 +17477,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17477 "configure"
+#line 17480 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17486,37 +17489,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17492: \$? = $ac_status" >&5
+  echo "$as_me:17495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17498: \$? = $ac_status" >&5
+  echo "$as_me:17501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17504 "configure"
+#line 17507 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17514: \$? = $ac_status" >&5
+  echo "$as_me:17517: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17519: \$? = $ac_status" >&5
+  echo "$as_me:17522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17533,7 +17536,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17536: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17539: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17554,7 +17557,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17557: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17560: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17562,7 +17565,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17565 "configure"
+#line 17568 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17581,16 +17584,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17587: \$? = $ac_status" >&5
+  echo "$as_me:17590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17593: \$? = $ac_status" >&5
+  echo "$as_me:17596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17601,7 +17604,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17604: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17607: 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
 
@@ -17634,7 +17637,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17637: checking if you want to check for menu functions" >&5
+echo "$as_me:17640: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17651,7 +17654,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17654: result: $cf_enable_menu" >&5
+echo "$as_me:17657: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17660,14 +17663,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17663: checking for NetBSD menu.h" >&5
+echo "$as_me:17666: 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 17670 "configure"
+#line 17673 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17685,16 +17688,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17691: \$? = $ac_status" >&5
+  echo "$as_me:17694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17697: \$? = $ac_status" >&5
+  echo "$as_me:17700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17706,7 +17709,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17709: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17712: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17723,13 +17726,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17726: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17729: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17729: result: yes" >&5
+		echo "$as_me:17732: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17732: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17735: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17879,7 +17882,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17882 "configure"
+#line 17885 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17891,37 +17894,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17897: \$? = $ac_status" >&5
+  echo "$as_me:17900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17903: \$? = $ac_status" >&5
+  echo "$as_me:17906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17909 "configure"
+#line 17912 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17919: \$? = $ac_status" >&5
+  echo "$as_me:17922: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17924: \$? = $ac_status" >&5
+  echo "$as_me:17927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17938,7 +17941,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17941: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17944: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17959,7 +17962,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17962: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17965: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17967,7 +17970,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17970 "configure"
+#line 17973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17986,16 +17989,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17992: \$? = $ac_status" >&5
+  echo "$as_me:17995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17998: \$? = $ac_status" >&5
+  echo "$as_me:18001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18006,7 +18009,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18009: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18012: 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
 
@@ -18039,7 +18042,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:18042: checking if you want to check for form functions" >&5
+echo "$as_me:18045: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -18056,7 +18059,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:18059: result: $cf_enable_form" >&5
+echo "$as_me:18062: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -18065,14 +18068,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:18068: checking for NetBSD form.h" >&5
+echo "$as_me:18071: 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 18075 "configure"
+#line 18078 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18091,16 +18094,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18097: \$? = $ac_status" >&5
+  echo "$as_me:18100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18103: \$? = $ac_status" >&5
+  echo "$as_me:18106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18112,7 +18115,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18115: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18118: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18129,13 +18132,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18132: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18135: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18135: result: yes" >&5
+		echo "$as_me:18138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18138: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18141: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18285,7 +18288,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18288 "configure"
+#line 18291 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18297,37 +18300,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18303: \$? = $ac_status" >&5
+  echo "$as_me:18306: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18309: \$? = $ac_status" >&5
+  echo "$as_me:18312: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18315 "configure"
+#line 18318 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18325: \$? = $ac_status" >&5
+  echo "$as_me:18328: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18330: \$? = $ac_status" >&5
+  echo "$as_me:18333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18344,7 +18347,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18347: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18350: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18365,7 +18368,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18368: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18371: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18373,7 +18376,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18376 "configure"
+#line 18379 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18392,16 +18395,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18398: \$? = $ac_status" >&5
+  echo "$as_me:18401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18404: \$? = $ac_status" >&5
+  echo "$as_me:18407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18412,7 +18415,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18418: 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
 
@@ -18450,23 +18453,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18453: checking for $ac_header" >&5
+echo "$as_me:18456: 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 18459 "configure"
+#line 18462 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18463: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18466: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18469: \$? = $ac_status" >&5
+  echo "$as_me:18472: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18485,7 +18488,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18491: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18495,13 +18498,13 @@ EOF
 fi
 done
 
-echo "$as_me:18498: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18501: 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 18504 "configure"
+#line 18507 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18517,16 +18520,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18523: \$? = $ac_status" >&5
+  echo "$as_me:18526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18529: \$? = $ac_status" >&5
+  echo "$as_me:18532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18536,7 +18539,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18539: result: $ac_cv_header_time" >&5
+echo "$as_me:18542: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18557,23 +18560,23 @@ termios.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18560: checking for $ac_header" >&5
+echo "$as_me:18563: 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 18566 "configure"
+#line 18569 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18576: \$? = $ac_status" >&5
+  echo "$as_me:18579: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18592,7 +18595,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18598: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18605,23 +18608,23 @@ done
 for ac_header in getopt.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:18611: 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 18617 "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:18621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:18627: \$? = $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 +18643,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18646: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18650,7 +18653,7 @@ EOF
 fi
 done
 
-echo "$as_me:18653: checking for header declaring getopt variables" >&5
+echo "$as_me:18656: 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
@@ -18660,7 +18663,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18663 "configure"
+#line 18666 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18673,16 +18676,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18679: \$? = $ac_status" >&5
+  echo "$as_me:18682: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18685: \$? = $ac_status" >&5
+  echo "$as_me:18688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18694,7 +18697,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18697: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18700: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18712,13 +18715,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18715: checking for clock_gettime" >&5
+echo "$as_me:18718: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18721 "configure"
+#line 18724 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18749,16 +18752,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18755: \$? = $ac_status" >&5
+  echo "$as_me:18758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18761: \$? = $ac_status" >&5
+  echo "$as_me:18764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18768,12 +18771,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18771: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18774: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18776: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18779: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18781,7 +18784,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18784 "configure"
+#line 18787 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18800,16 +18803,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18806: \$? = $ac_status" >&5
+  echo "$as_me:18809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18812: \$? = $ac_status" >&5
+  echo "$as_me:18815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18820,7 +18823,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18823: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18826: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18832,14 +18835,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18835: checking if clock_gettime links" >&5
+echo "$as_me:18838: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18842 "configure"
+#line 18845 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18857,16 +18860,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18863: \$? = $ac_status" >&5
+  echo "$as_me:18866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18869: \$? = $ac_status" >&5
+  echo "$as_me:18872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18877,7 +18880,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18880: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18883: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18891,13 +18894,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18894: checking for gettimeofday" >&5
+echo "$as_me:18897: 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 18900 "configure"
+#line 18903 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18928,16 +18931,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18934: \$? = $ac_status" >&5
+  echo "$as_me:18937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18940: \$? = $ac_status" >&5
+  echo "$as_me:18943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18947,7 +18950,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18950: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18953: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18957,7 +18960,7 @@ EOF
 
 else
 
-echo "$as_me:18960: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18963: 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
@@ -18965,7 +18968,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18968 "configure"
+#line 18971 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18984,16 +18987,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18990: \$? = $ac_status" >&5
+  echo "$as_me:18993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18996: \$? = $ac_status" >&5
+  echo "$as_me:18999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -19004,7 +19007,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19007: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:19010: 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
 
@@ -19042,13 +19045,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19045: checking for $ac_func" >&5
+echo "$as_me:19048: 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 19051 "configure"
+#line 19054 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19079,16 +19082,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19085: \$? = $ac_status" >&5
+  echo "$as_me:19088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19091: \$? = $ac_status" >&5
+  echo "$as_me:19094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19098,7 +19101,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19101: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19104: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19109,14 +19112,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19112: checking if we can use termcap.h" >&5
+echo "$as_me:19115: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19119 "configure"
+#line 19122 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19137,16 +19140,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19143: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19149: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19156,7 +19159,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19159: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19162: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19166,14 +19169,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19169: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19172: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19176 "configure"
+#line 19179 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19194,16 +19197,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19200: \$? = $ac_status" >&5
+  echo "$as_me:19203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19206: \$? = $ac_status" >&5
+  echo "$as_me:19209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19213,7 +19216,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19216: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19219: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19223,7 +19226,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19226: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19229: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19242,13 +19245,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19245: checking for $ac_func" >&5
+echo "$as_me:19248: 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 19251 "configure"
+#line 19254 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19279,16 +19282,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19285: \$? = $ac_status" >&5
+  echo "$as_me:19288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19291: \$? = $ac_status" >&5
+  echo "$as_me:19294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19298,7 +19301,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19301: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19304: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19310,7 +19313,7 @@ done
 
 fi
 
-echo "$as_me:19313: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19316: 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
@@ -19318,7 +19321,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19321 "configure"
+#line 19324 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19351,16 +19354,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19357: \$? = $ac_status" >&5
+  echo "$as_me:19360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19363: \$? = $ac_status" >&5
+  echo "$as_me:19366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19370,7 +19373,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19373 "configure"
+#line 19376 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19396,16 +19399,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19402: \$? = $ac_status" >&5
+  echo "$as_me:19405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19408: \$? = $ac_status" >&5
+  echo "$as_me:19411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19419,7 +19422,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19422: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19425: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19431,7 +19434,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19434: checking for term.h" >&5
+echo "$as_me:19437: 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
@@ -19452,7 +19455,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19455 "configure"
+#line 19458 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19466,16 +19469,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19472: \$? = $ac_status" >&5
+  echo "$as_me:19475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19478: \$? = $ac_status" >&5
+  echo "$as_me:19481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19494,7 +19497,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19497 "configure"
+#line 19500 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19512,16 +19515,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19518: \$? = $ac_status" >&5
+  echo "$as_me:19521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19524: \$? = $ac_status" >&5
+  echo "$as_me:19527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19536,7 +19539,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19539: result: $cf_cv_term_header" >&5
+echo "$as_me:19542: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19563,7 +19566,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19566: checking for unctrl.h" >&5
+echo "$as_me:19569: 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
@@ -19584,7 +19587,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19587 "configure"
+#line 19590 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19598,16 +19601,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19604: \$? = $ac_status" >&5
+  echo "$as_me:19607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19610: \$? = $ac_status" >&5
+  echo "$as_me:19613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19620,12 +19623,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19623: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19626: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19628: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19631: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19723,10 +19726,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19726: checking for ${cf_func}" >&5
+	echo "$as_me:19729: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19729: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19735,7 +19738,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19738 "configure"
+#line 19741 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19768,16 +19771,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19774: \$? = $ac_status" >&5
+  echo "$as_me:19777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:19783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19793,7 +19796,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19796: result: $cf_result" >&5
+	echo "$as_me:19799: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19808,10 +19811,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19811: checking for ${cf_func}" >&5
+	echo "$as_me:19814: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19814: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19817: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19820,7 +19823,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19823 "configure"
+#line 19826 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19853,16 +19856,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19859: \$? = $ac_status" >&5
+  echo "$as_me:19862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19865: \$? = $ac_status" >&5
+  echo "$as_me:19868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19878,7 +19881,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19881: result: $cf_result" >&5
+	echo "$as_me:19884: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19902,7 +19905,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19905 "configure"
+#line 19908 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19922,21 +19925,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19928: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19934: \$? = $ac_status" >&5
+  echo "$as_me:19937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19939: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19942: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19956,14 +19959,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19959: checking for ncurses extended functions" >&5
+echo "$as_me:19962: 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 19966 "configure"
+#line 19969 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19978,16 +19981,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19984: \$? = $ac_status" >&5
+  echo "$as_me:19987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19990: \$? = $ac_status" >&5
+  echo "$as_me:19993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19995,7 +19998,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19998 "configure"
+#line 20001 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20020,16 +20023,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20026: \$? = $ac_status" >&5
+  echo "$as_me:20029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20032: \$? = $ac_status" >&5
+  echo "$as_me:20035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -20043,7 +20046,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20046: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:20049: 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
@@ -20057,11 +20060,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:20060: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:20063: 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 20064 "configure"
+#line 20067 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20074,16 +20077,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20080: \$? = $ac_status" >&5
+  echo "$as_me:20083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20086: \$? = $ac_status" >&5
+  echo "$as_me:20089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20092,7 +20095,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20095 "configure"
+#line 20098 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20105,16 +20108,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20111: \$? = $ac_status" >&5
+  echo "$as_me:20114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:20120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20125,7 +20128,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20128: result: $cf_define_xpg5" >&5
+		echo "$as_me:20131: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20134,14 +20137,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20137: checking for wide-character functions" >&5
+	echo "$as_me:20140: 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 20144 "configure"
+#line 20147 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20158,16 +20161,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20164: \$? = $ac_status" >&5
+  echo "$as_me:20167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20170: \$? = $ac_status" >&5
+  echo "$as_me:20173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20178,7 +20181,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20181: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20184: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20199,14 +20202,14 @@ EOF
 
 fi
 
-echo "$as_me:20202: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20205: 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 20209 "configure"
+#line 20212 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20224,16 +20227,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20230: \$? = $ac_status" >&5
+  echo "$as_me:20233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20236: \$? = $ac_status" >&5
+  echo "$as_me:20239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20244,21 +20247,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20247: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20250: 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:20254: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20257: 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 20261 "configure"
+#line 20264 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20278,16 +20281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20284: \$? = $ac_status" >&5
+  echo "$as_me:20287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20290: \$? = $ac_status" >&5
+  echo "$as_me:20293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20299,7 +20302,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20302: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20305: 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
@@ -20308,7 +20311,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20311: checking for openpty in -lutil" >&5
+echo "$as_me:20314: 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
@@ -20316,7 +20319,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20319 "configure"
+#line 20322 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20335,16 +20338,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20341: \$? = $ac_status" >&5
+  echo "$as_me:20344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20347: \$? = $ac_status" >&5
+  echo "$as_me:20350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20355,7 +20358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20358: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20361: 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
@@ -20363,7 +20366,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20366: checking for openpty header" >&5
+echo "$as_me:20369: 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
@@ -20390,7 +20393,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20393 "configure"
+#line 20396 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20408,16 +20411,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20414: \$? = $ac_status" >&5
+  echo "$as_me:20417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20420: \$? = $ac_status" >&5
+  echo "$as_me:20423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20435,7 +20438,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20438: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20441: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20469,7 +20472,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20472: checking for function curses_version" >&5
+echo "$as_me:20475: 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
@@ -20479,7 +20482,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20482 "configure"
+#line 20485 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20495,15 +20498,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20501: \$? = $ac_status" >&5
+  echo "$as_me:20504: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20506: \$? = $ac_status" >&5
+  echo "$as_me:20509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20518,14 +20521,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20521: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20524: 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:20528: checking for alternate character set array" >&5
+echo "$as_me:20531: 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
@@ -20535,7 +20538,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20538 "configure"
+#line 20541 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20551,16 +20554,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20557: \$? = $ac_status" >&5
+  echo "$as_me:20560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20563: \$? = $ac_status" >&5
+  echo "$as_me:20566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20571,7 +20574,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20574: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20577: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20581,7 +20584,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20584: checking for wide alternate character set array" >&5
+echo "$as_me:20587: 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
@@ -20591,7 +20594,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20594 "configure"
+#line 20597 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20607,16 +20610,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20613: \$? = $ac_status" >&5
+  echo "$as_me:20616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20619: \$? = $ac_status" >&5
+  echo "$as_me:20622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20627,7 +20630,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20630: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20633: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20635,7 +20638,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20638: checking for wide alternate character constants" >&5
+echo "$as_me:20641: 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
@@ -20645,7 +20648,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20648 "configure"
+#line 20651 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20662,16 +20665,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20668: \$? = $ac_status" >&5
+  echo "$as_me:20671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20674: \$? = $ac_status" >&5
+  echo "$as_me:20677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20681,7 +20684,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20684 "configure"
+#line 20687 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20697,16 +20700,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20703: \$? = $ac_status" >&5
+  echo "$as_me:20706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20709: \$? = $ac_status" >&5
+  echo "$as_me:20712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20717,7 +20720,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20720: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20723: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20727,10 +20730,10 @@ EOF
 
 fi
 
-echo "$as_me:20730: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20733: 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 20733 "configure"
+#line 20736 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20748,16 +20751,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20754: \$? = $ac_status" >&5
+  echo "$as_me:20757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20760: \$? = $ac_status" >&5
+  echo "$as_me:20763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20766,7 +20769,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20769: result: $cf_result" >&5
+echo "$as_me:20772: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20787,14 +20790,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20790: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20793: 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 20797 "configure"
+#line 20800 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20812,23 +20815,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20818: \$? = $ac_status" >&5
+  echo "$as_me:20821: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20824: \$? = $ac_status" >&5
+  echo "$as_me:20827: \$? = $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 20831 "configure"
+#line 20834 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20847,16 +20850,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20853: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20853: \$? = $ac_status" >&5
+  echo "$as_me:20856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20859: \$? = $ac_status" >&5
+  echo "$as_me:20862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20868,7 +20871,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20871: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20874: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20891,14 +20894,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20894: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20897: 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 20901 "configure"
+#line 20904 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20916,23 +20919,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20922: \$? = $ac_status" >&5
+  echo "$as_me:20925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20928: \$? = $ac_status" >&5
+  echo "$as_me:20931: \$? = $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 20935 "configure"
+#line 20938 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20951,16 +20954,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20957: \$? = $ac_status" >&5
+  echo "$as_me:20960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20963: \$? = $ac_status" >&5
+  echo "$as_me:20966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20972,7 +20975,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20975: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20978: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20995,14 +20998,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20998: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:21001: 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 21005 "configure"
+#line 21008 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21020,23 +21023,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21026: \$? = $ac_status" >&5
+  echo "$as_me:21029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21032: \$? = $ac_status" >&5
+  echo "$as_me:21035: \$? = $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 21039 "configure"
+#line 21042 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21055,16 +21058,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21061: \$? = $ac_status" >&5
+  echo "$as_me:21064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21067: \$? = $ac_status" >&5
+  echo "$as_me:21070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -21076,7 +21079,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21079: result: $cf_cv_wint_t" >&5
+echo "$as_me:21082: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21100,10 +21103,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21103: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21106: 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 21106 "configure"
+#line 21109 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21121,16 +21124,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21127: \$? = $ac_status" >&5
+  echo "$as_me:21130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21133: \$? = $ac_status" >&5
+  echo "$as_me:21136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21139,7 +21142,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21142: result: $cf_result" >&5
+echo "$as_me:21145: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21161,10 +21164,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21164: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21167: 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 21167 "configure"
+#line 21170 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21182,16 +21185,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21188: \$? = $ac_status" >&5
+  echo "$as_me:21191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21194: \$? = $ac_status" >&5
+  echo "$as_me:21197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21200,7 +21203,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21203: result: $cf_result" >&5
+echo "$as_me:21206: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21222,10 +21225,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21225: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21228: 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 21228 "configure"
+#line 21231 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21243,16 +21246,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21249: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21255: \$? = $ac_status" >&5
+  echo "$as_me:21258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21261,7 +21264,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21264: result: $cf_result" >&5
+echo "$as_me:21267: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21290,11 +21293,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21293: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21296: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21297 "configure"
+#line 21300 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21327,16 +21330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21333: \$? = $ac_status" >&5
+  echo "$as_me:21336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21339: \$? = $ac_status" >&5
+  echo "$as_me:21342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21346,7 +21349,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21349: result: $cf_result" >&5
+echo "$as_me:21352: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21358,14 +21361,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21361: checking for data $cf_data in library" >&5
+	echo "$as_me:21364: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21368 "configure"
+#line 21371 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21404,16 +21407,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21410: \$? = $ac_status" >&5
+  echo "$as_me:21413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21425,7 +21428,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21428 "configure"
+#line 21431 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21457,15 +21460,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21463: \$? = $ac_status" >&5
+  echo "$as_me:21466: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21468: \$? = $ac_status" >&5
+  echo "$as_me:21471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21477,7 +21480,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21480: result: $cf_result" >&5
+	echo "$as_me:21483: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21494,7 +21497,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21497: checking for X" >&5
+	echo "$as_me:21500: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21598,17 +21601,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21601 "configure"
+#line 21604 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21608: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21611: \$? = $ac_status" >&5
+  echo "$as_me:21614: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21641,7 +21644,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21644 "configure"
+#line 21647 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21653,16 +21656,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21659: \$? = $ac_status" >&5
+  echo "$as_me:21662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21665: \$? = $ac_status" >&5
+  echo "$as_me:21668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21700,7 +21703,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21703: result: $have_x" >&5
+  echo "$as_me:21706: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21710,7 +21713,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21713: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21716: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21737,11 +21740,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21740: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21743: 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 21744 "configure"
+#line 21747 "configure"
 #include "confdefs.h"
 
 int
@@ -21753,16 +21756,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21759: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21765: \$? = $ac_status" >&5
+  echo "$as_me:21768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21772,13 +21775,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21775: result: no" >&5
+	echo "$as_me:21778: 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 21781 "configure"
+#line 21784 "configure"
 #include "confdefs.h"
 
 int
@@ -21790,16 +21793,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21796: \$? = $ac_status" >&5
+  echo "$as_me:21799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21802: \$? = $ac_status" >&5
+  echo "$as_me:21805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21809,11 +21812,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21812: result: yes" >&5
+	  echo "$as_me:21815: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21816: result: neither works" >&5
+	  echo "$as_me:21819: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21833,7 +21836,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21836 "configure"
+#line 21839 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21852,22 +21855,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21858: \$? = $ac_status" >&5
+  echo "$as_me:21861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21864: \$? = $ac_status" >&5
+  echo "$as_me:21867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21870: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21873: 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
@@ -21875,7 +21878,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21878 "configure"
+#line 21881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21894,16 +21897,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21900: \$? = $ac_status" >&5
+  echo "$as_me:21903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21906: \$? = $ac_status" >&5
+  echo "$as_me:21909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21914,14 +21917,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21917: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21920: 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:21924: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21927: 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
@@ -21929,7 +21932,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21932 "configure"
+#line 21935 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21948,16 +21951,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:21957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21960: \$? = $ac_status" >&5
+  echo "$as_me:21963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21968,7 +21971,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21971: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21974: 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"
@@ -21987,13 +21990,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21990: checking for gethostbyname" >&5
+    echo "$as_me:21993: 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 21996 "configure"
+#line 21999 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22024,16 +22027,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22030: \$? = $ac_status" >&5
+  echo "$as_me:22033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22036: \$? = $ac_status" >&5
+  echo "$as_me:22039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -22043,11 +22046,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22046: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:22049: 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:22050: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22053: 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
@@ -22055,7 +22058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22058 "configure"
+#line 22061 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22074,16 +22077,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22080: \$? = $ac_status" >&5
+  echo "$as_me:22083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22086: \$? = $ac_status" >&5
+  echo "$as_me:22089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22094,14 +22097,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22097: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22100: 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:22104: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22107: 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
@@ -22109,7 +22112,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22112 "configure"
+#line 22115 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22128,16 +22131,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22134: \$? = $ac_status" >&5
+  echo "$as_me:22137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22140: \$? = $ac_status" >&5
+  echo "$as_me:22143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22148,7 +22151,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22151: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22154: 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"
@@ -22164,13 +22167,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22167: checking for connect" >&5
+    echo "$as_me:22170: 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 22173 "configure"
+#line 22176 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22201,16 +22204,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22207: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22213: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22220,11 +22223,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22223: result: $ac_cv_func_connect" >&5
+echo "$as_me:22226: 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:22227: checking for connect in -lsocket" >&5
+      echo "$as_me:22230: 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
@@ -22232,7 +22235,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22235 "configure"
+#line 22238 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22251,16 +22254,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22257: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22263: \$? = $ac_status" >&5
+  echo "$as_me:22266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22271,7 +22274,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22274: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22277: 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"
@@ -22280,13 +22283,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22283: checking for remove" >&5
+    echo "$as_me:22286: 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 22289 "configure"
+#line 22292 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22317,16 +22320,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22323: \$? = $ac_status" >&5
+  echo "$as_me:22326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22329: \$? = $ac_status" >&5
+  echo "$as_me:22332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22336,11 +22339,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22339: result: $ac_cv_func_remove" >&5
+echo "$as_me:22342: 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:22343: checking for remove in -lposix" >&5
+      echo "$as_me:22346: 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
@@ -22348,7 +22351,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22351 "configure"
+#line 22354 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22367,16 +22370,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22373: \$? = $ac_status" >&5
+  echo "$as_me:22376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22379: \$? = $ac_status" >&5
+  echo "$as_me:22382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22387,7 +22390,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22390: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22393: 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"
@@ -22396,13 +22399,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22399: checking for shmat" >&5
+    echo "$as_me:22402: 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 22405 "configure"
+#line 22408 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22433,16 +22436,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22439: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22445: \$? = $ac_status" >&5
+  echo "$as_me:22448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22452,11 +22455,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22455: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22458: 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:22459: checking for shmat in -lipc" >&5
+      echo "$as_me:22462: 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
@@ -22464,7 +22467,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22467 "configure"
+#line 22470 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22483,16 +22486,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22489: \$? = $ac_status" >&5
+  echo "$as_me:22492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22495: \$? = $ac_status" >&5
+  echo "$as_me:22498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22503,7 +22506,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22506: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22509: 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"
@@ -22521,7 +22524,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22524: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22527: 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
@@ -22529,7 +22532,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22532 "configure"
+#line 22535 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22548,16 +22551,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22554: \$? = $ac_status" >&5
+  echo "$as_me:22557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22560: \$? = $ac_status" >&5
+  echo "$as_me:22563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22568,7 +22571,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22571: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22574: 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"
@@ -22615,16 +22618,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22618: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22621: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22623: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22626: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22627: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22630: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22663,16 +22666,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22666: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22669: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22671: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22674: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22675: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22678: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22711,23 +22714,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22714: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22717: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22719: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22722: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22723: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22726: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22730: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22733: 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.
@@ -22744,7 +22747,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22747: result: $enable_warnings" >&5
+echo "$as_me:22750: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22767,10 +22770,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22770: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22773: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22773 "${as_me:-configure}"
+#line 22776 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22820,12 +22823,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22826: \$? = $ac_status" >&5
+  echo "$as_me:22829: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22828: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22831: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22903,7 +22906,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22906 "configure"
+#line 22909 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22918,26 +22921,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22924: \$? = $ac_status" >&5
+  echo "$as_me:22927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22930: \$? = $ac_status" >&5
+  echo "$as_me:22933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22933: checking for X11/Xt const-feature" >&5
+echo "$as_me:22936: 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 22940 "configure"
+#line 22943 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22955,16 +22958,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22961: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22967: \$? = $ac_status" >&5
+  echo "$as_me:22970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22979,7 +22982,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22982: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22985: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -23008,7 +23011,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 23011 "${as_me:-configure}"
+#line 23014 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -23024,7 +23027,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:23027: checking for $CC warning options..." >&5
+	{ echo "$as_me:23030: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -23040,12 +23043,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23046: \$? = $ac_status" >&5
+  echo "$as_me:23049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23048: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23051: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -23053,7 +23056,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:23056: checking for $CC warning options..." >&5
+	{ echo "$as_me:23059: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23076,12 +23079,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23079: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23082: \$? = $ac_status" >&5
+  echo "$as_me:23085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23084: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23087: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23089,7 +23092,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23099,7 +23102,7 @@ echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23105: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23116,7 +23119,7 @@ fi
 
 fi
 
-echo "$as_me:23119: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23122: 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.
@@ -23138,7 +23141,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23141: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23144: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23252,23 +23255,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23255: checking for dmalloc.h" >&5
+	echo "$as_me:23258: 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 23261 "configure"
+#line 23264 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23271: \$? = $ac_status" >&5
+  echo "$as_me:23274: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23287,11 +23290,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23290: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23293: 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:23294: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23297: 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
@@ -23299,7 +23302,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23302 "configure"
+#line 23305 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23318,16 +23321,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23324: \$? = $ac_status" >&5
+  echo "$as_me:23327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23330: \$? = $ac_status" >&5
+  echo "$as_me:23333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23338,7 +23341,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23341: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23344: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23353,7 +23356,7 @@ fi
 
 fi
 
-echo "$as_me:23356: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23359: 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.
@@ -23375,7 +23378,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23378: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23381: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23489,23 +23492,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23492: checking for dbmalloc.h" >&5
+	echo "$as_me:23495: 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 23498 "configure"
+#line 23501 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23502: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23505: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23508: \$? = $ac_status" >&5
+  echo "$as_me:23511: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23524,11 +23527,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23527: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23530: 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:23531: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23534: 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
@@ -23536,7 +23539,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23539 "configure"
+#line 23542 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23555,16 +23558,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23561: \$? = $ac_status" >&5
+  echo "$as_me:23564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23567: \$? = $ac_status" >&5
+  echo "$as_me:23570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23575,7 +23578,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23578: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23581: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23590,7 +23593,7 @@ fi
 
 fi
 
-echo "$as_me:23593: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23596: 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.
@@ -23612,7 +23615,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23615: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23618: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23725,7 +23728,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23728: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23731: 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.
@@ -23736,7 +23739,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23739: result: $with_no_leaks" >&5
+echo "$as_me:23742: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23754,7 +23757,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23757: checking for an rpath option" >&5
+	echo "$as_me:23760: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23785,12 +23788,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23788: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23791: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23793: checking if we need a space after rpath option" >&5
+		echo "$as_me:23796: 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"
 
@@ -23811,7 +23814,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23814 "configure"
+#line 23817 "configure"
 #include "confdefs.h"
 
 int
@@ -23823,16 +23826,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23829: \$? = $ac_status" >&5
+  echo "$as_me:23832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23835: \$? = $ac_status" >&5
+  echo "$as_me:23838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23842,14 +23845,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23845: result: $cf_rpath_space" >&5
+		echo "$as_me:23848: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23852: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23855: 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.
@@ -23867,22 +23870,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23870: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23873: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23875: checking for updated LDFLAGS" >&5
+echo "$as_me:23878: 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:23878: result: maybe" >&5
+	echo "$as_me:23881: 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:23885: 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_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23897,7 +23900,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23900: found $ac_dir/$ac_word" >&5
+echo "$as_me:23903: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23905,10 +23908,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23908: result: $cf_ldd_prog" >&5
+  echo "$as_me:23911: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23911: result: no" >&5
+  echo "$as_me:23914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23922,7 +23925,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23925 "configure"
+#line 23928 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23934,16 +23937,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23940: \$? = $ac_status" >&5
+  echo "$as_me:23943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23946: \$? = $ac_status" >&5
+  echo "$as_me:23949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23971,7 +23974,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23983,11 +23986,11 @@ echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23986: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23990: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -24024,7 +24027,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24027: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24037,11 +24040,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24040: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24044: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24047: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24078,7 +24081,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24081: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24091,14 +24094,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24094: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24097: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24098: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24101: result: no" >&5
+	echo "$as_me:24104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24188,7 +24191,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24191: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24194: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24369,7 +24372,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24372: error: ambiguous option: $1
+    { { echo "$as_me:24375: 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;}
@@ -24388,7 +24391,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24391: error: unrecognized option: $1
+  -*) { { echo "$as_me:24394: 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;}
@@ -24438,7 +24441,7 @@ do
   "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:24441: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24444: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24754,7 +24757,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24757: creating $ac_file" >&5
+    { echo "$as_me:24760: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24772,7 +24775,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24775: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24778: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24785,7 +24788,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24788: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24791: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24801,7 +24804,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24804: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24807: 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;}
@@ -24810,7 +24813,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24813: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24816: 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;}
@@ -24855,7 +24858,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24858: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24861: 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;}
@@ -24866,7 +24869,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24869: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24872: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24915,7 +24918,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24918: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24921: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24926,7 +24929,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24929: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24932: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24939,7 +24942,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24942: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24945: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24997,7 +25000,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:25000: $ac_file is unchanged" >&5
+      { echo "$as_me:25003: $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/test/demo_menus.c b/test/demo_menus.c
index b5428f88f..c11954465 100644
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.83 2024/10/19 21:53:57 tom Exp $
+ * $Id: demo_menus.c,v 1.85 2024/11/30 18:52:09 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -991,7 +991,7 @@ usage(int ok)
 	," -H       rip-off header line (can repeat)"
 #endif
 #ifdef TRACE
-	," -t mask  specify default trace-level (may toggle with ^T)"
+	," -D mask  specify trace mask (may toggle with ^T)"
 #endif
     };
     size_t n;
@@ -1011,7 +1011,7 @@ main(int argc, char *argv[])
     setlocale(LC_ALL, "");
     START_TRACE();
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "D:FH")) != -1) {
 	switch (ch) {
 #if HAVE_RIPOFFLINE
 	case 'F':
@@ -1022,7 +1022,7 @@ main(int argc, char *argv[])
 	    break;
 #endif /* HAVE_RIPOFFLINE */
 #ifdef TRACE
-	case 't':
+	case 'D':
 	    curses_trace((unsigned) strtoul(optarg, 0, 0));
 	    break;
 #endif
diff --git a/test/demo_tabs.c b/test/demo_tabs.c
index 16c1ad57c..1879ad844 100644
--- a/test/demo_tabs.c
+++ b/test/demo_tabs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_tabs.c,v 1.12 2024/11/30 18:47:39 tom Exp $
  *
  * A simple demo of tabs in curses.
  */
@@ -48,7 +48,7 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -l COUNT total number of lines to show"
+	," -m NUM   total number of lines to show"
 	," -t NUM   set TABSIZE variable to the given value"
     };
     unsigned n;
@@ -69,9 +69,9 @@ main(int argc, char *argv[])
     int line_limit = -1;
     int curses_stops = -1;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "m:t:")) != -1) {
 	switch (ch) {
-	case 'l':
+	case 'm':
 	    line_limit = atoi(optarg);
 	    break;
 	case 't':
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 67140665d..d229a15b0 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.70 2024/10/06 20:05:09 tom Exp $
+ * $Id: demo_termcap.c,v 1.72 2024/11/30 18:31:01 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -756,10 +756,10 @@ usage(int ok)
 	," -b       print boolean-capabilities"
 	," -d LIST  colon-separated list of databases to use"
 	," -e NAME  environment variable to set with -d option"
-	," -i NAME  terminal description to use as names for \"-a\" option, etc."
+	," -i NAME  terminal description to use as names for \"-a\" option"
 	," -n       print numeric-capabilities"
 	," -q       quiet (prints only counts)"
-	," -r COUNT repeat for given count"
+	," -r NUM   repeat tests NUM times"
 	," -s       print string-capabilities"
 	," -v       print termcap-variables"
 #ifdef NCURSES_VERSION
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index 8841711ff..d74373a96 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.59 2024/10/06 21:16:43 tom Exp $
+ * $Id: demo_terminfo.c,v 1.61 2024/11/30 18:31:01 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -786,11 +786,11 @@ usage(int ok)
 	," -b       print boolean-capabilities"
 	," -d LIST  colon-separated list of databases to use"
 	," -e NAME  environment variable to set with -d option"
-	," -f       print full names"
+	," -f       print full terminfo names"
 	," -i NAME  terminal description to use as names for \"-a\" option"
 	," -n       print numeric-capabilities"
 	," -q       quiet (prints only counts)"
-	," -r COUNT repeat for given count"
+	," -r NUM   repeat tests NUM times"
 	," -s       print string-capabilities"
 #ifdef NCURSES_VERSION
 	," -x       print extended capabilities"
diff --git a/test/dots_curses.c b/test/dots_curses.c
index 1a553213c..ea285cde8 100644
--- a/test/dots_curses.c
+++ b/test/dots_curses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2014,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $
+ * $Id: dots_curses.c,v 1.26 2024/11/30 17:48:07 tom Exp $
  *
  * A simple demo of the curses interface used for comparison with termcap.
  */
@@ -97,7 +97,7 @@ usage(int ok)
 	,"Options:"
 	," -T TERM  override $TERM"
 #if HAVE_USE_DEFAULT_COLORS
-	," -d       invoke use_default_colors()"
+	," -d       invoke use_default_colors"
 #endif
 #if HAVE_USE_ENV
 	," -e       allow environment $LINES / $COLUMNS"
diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index 2472dc60f..ac403dc79 100644
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
+ * $Id: dots_xcurses.c,v 1.31 2024/11/30 17:41:18 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
@@ -120,7 +120,7 @@ usage(int ok)
 	,"Options:"
 	," -T TERM  override $TERM"
 #if HAVE_USE_DEFAULT_COLORS
-	," -d       invoke use_default_colors()"
+	," -d       invoke use_default_colors"
 #endif
 #if HAVE_USE_ENV
 	," -e       allow environment $LINES / $COLUMNS"
diff --git a/test/filter.c b/test/filter.c
index 53adf687f..a11c08592 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -30,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.39 2024/10/05 19:26:24 tom Exp $
+ * $Id: filter.c,v 1.40 2024/11/30 16:49:53 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -310,7 +310,7 @@ usage(int ok)
 #ifdef NCURSES_VERSION
 	," -a       suppress xterm alternate-screen by amending smcup/rmcup"
 #endif
-	," -c       show current time on prompt line with \"Command\""
+	," -t       show current time on prompt line with \"Command\""
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors"
 #endif
@@ -335,7 +335,7 @@ main(int argc, char *argv[])
 #ifdef NCURSES_VERSION
     bool a_option = FALSE;
 #endif
-    bool c_option = FALSE;
+    bool t_option = FALSE;
 #if HAVE_USE_DEFAULT_COLORS
     bool d_option = FALSE;
 #endif
@@ -344,15 +344,15 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "adtip")) != -1) {
 	switch (ch) {
 #ifdef NCURSES_VERSION
 	case 'a':
 	    a_option = TRUE;
 	    break;
 #endif
-	case 'c':
-	    c_option = TRUE;
+	case 't':
+	    t_option = TRUE;
 	    break;
 #if HAVE_USE_DEFAULT_COLORS
 	case 'd':
@@ -408,7 +408,7 @@ main(int argc, char *argv[])
 
     for (;;) {
 	int code = new_command(buffer, sizeof(buffer) - 1,
-			       underline, c_option, p_option);
+			       underline, t_option, p_option);
 	if (code == ERR || *buffer == '\0')
 	    break;
 	reset_shell_mode();
diff --git a/test/gdc.c b/test/gdc.c
index fbf97ba34..e1d452f1f 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.62 2024/10/06 20:08:59 tom Exp $
+ * $Id: gdc.c,v 1.63 2024/11/30 18:56:02 tom Exp $
  */
 
 #include <test.priv.h>
@@ -166,7 +166,7 @@ usage(int ok)
 #endif
 	," -n       reads input from /dev/null"
 	," -s       scrolls each digit into place"
-	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
+	," -t TIME  specify starting time as hh:mm:ss (default is \"now\")"
     };
     unsigned j;
     for (j = 0; j < SIZEOF(msg); j++)
diff --git a/test/hashtest.c b/test/hashtest.c
index be79c0e10..d88e6390c 100644
--- a/test/hashtest.c
+++ b/test/hashtest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *
  * Generate timing statistics for vertical-motion optimization.
  *
- * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $
+ * $Id: hashtest.c,v 1.42 2024/11/30 18:54:40 tom Exp $
  */
 
 #include <test.priv.h>
@@ -158,13 +158,13 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -c       continuous (don't reset between refresh's)"
-	," -F num   leave 'num' lines constant for footer"
-	," -H num   leave 'num' lines constant for header"
-	," -l num   repeat test 'num' times"
+	," -S       continuous (don't reset between refresh's)"
+	," -F NUM   leave NUM lines constant for footer"
+	," -H NUM   leave NUM lines constant for header"
+	," -r NUM   repeat tests NUM times"
 	," -n       test the normal optimizer"
 	," -o       test the hashed optimizer"
-	," -r       reverse the loops"
+	," -R       reverse the loops"
 	," -s       single-step"
 	," -x       assume lower-right corner extension"
     };
@@ -188,9 +188,9 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "F:H:RSnor:sx")) != -1) {
 	switch (ch) {
-	case 'c':
+	case 'S':
 	    continuous = TRUE;
 	    break;
 	case 'F':
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
 	case 'H':
 	    head_lines = atoi(optarg);
 	    break;
-	case 'l':
+	case 'r':
 	    test_loops = atoi(optarg);
 	    assert(test_loops >= 0);
 	    break;
@@ -209,7 +209,7 @@ main(int argc, char *argv[])
 	case 'o':
 	    test_optimize = TRUE;
 	    break;
-	case 'r':
+	case 'R':
 	    reverse_loops = TRUE;
 	    break;
 	case 's':
diff --git a/test/list_keys.c b/test/list_keys.c
index 4496cb5ac..044119095 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.34 2024/10/05 19:26:24 tom Exp $
+ * $Id: list_keys.c,v 1.36 2024/11/30 18:07:01 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -440,9 +440,9 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -f       print full names"
+	," -f       print full terminfo names"
 	," -m       print modifier-column for shift/control keys"
-	," -t       print result as CSV table"
+	," -t       print the result as CSV table"
 #ifdef NCURSES_VERSION
 	," -x       print extended capabilities"
 #endif
diff --git a/test/ncurses.c b/test/ncurses.c
index fbdcc122d..6f138cec0 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.541 2024/10/06 20:18:59 tom Exp $
+$Id: ncurses.c,v 1.544 2024/11/30 18:54:06 tom Exp $
 
 ***************************************************************************/
 
@@ -7647,7 +7647,7 @@ usage(int ok)
 	," -E       call use_env(FALSE) to ignore $LINES and $COLUMNS"
 #endif
 #if USE_SOFTKEYS
-	," -e fmt   specify format for soft-keys test (e)"
+	," -e FMT   specify format for soft-keys test (e)"
 #endif
 #if HAVE_RIPOFFLINE
 	," -F       rip-off footer line (can repeat)"
@@ -7658,13 +7658,13 @@ usage(int ok)
 	," -p file  rgb values to use in 'd' rather than ncurses's builtin"
 #endif
 #if USE_LIBPANEL
-	," -s msec  specify nominal time for panel-demo (default: 1, to hold)"
+	," -s MSECS specify nominal time for panel-demo (default: 1, to hold)"
 #endif
 #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS)
 	," -T       call use_tioctl(TRUE) to allow SIGWINCH to override environment"
 #endif
 #ifdef TRACE
-	," -t mask  specify default trace-level (may toggle with ^T)"
+	," -D mask  specify trace mask (may toggle with ^T)"
 #endif
 #if HAVE_COLOR_CONTENT
 	," -x       use xterm-compatible control for reading color palette"
@@ -7907,7 +7907,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "D:EFHTa:de:mp:s:x")) != -1) {
 	switch (ch) {
 #ifdef NCURSES_VERSION_PATCH
 #if HAVE_USE_DEFAULT_COLORS
@@ -7971,7 +7971,7 @@ main(int argc, char *argv[])
 	    break;
 #endif
 #ifdef TRACE
-	case 't':
+	case 'D':
 	    save_trace = (unsigned) strtol(optarg, 0, 0);
 	    break;
 #endif
diff --git a/test/padview.c b/test/padview.c
index 35167f332..5893c7d03 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -29,7 +29,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.24 2024/10/06 21:08:25 tom Exp $
+ * $Id: padview.c,v 1.26 2024/11/30 18:14:46 tom Exp $
  */
 
 #include <test.priv.h>
@@ -256,15 +256,15 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -c       use color if terminal supports it"
+	," -C       use color if terminal supports it"
 	," -i       ignore INT, QUIT, TERM signals"
 #if USE_WIDEC_SUPPORT
 	," -n       use waddch (bytes) rather then wadd_wch (wide-chars)"
 #endif
-	," -s       start in single-step mode, waiting for input"
+	," -s       start in single-step mode"
 #ifdef TRACE
 	," -t       trace screen updates"
-	," -T NUM   specify trace mask"
+	," -D NUM   specify trace mask"
 #endif
     };
     size_t n;
@@ -318,9 +318,9 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
 	switch (ch) {
-	case 'c':
+	case 'C':
 	    try_color = TRUE;
 	    break;
 	case 'i':
@@ -335,7 +335,7 @@ main(int argc, char *argv[])
 	    single_step = TRUE;
 	    break;
 #ifdef TRACE
-	case 'T':
+	case 'D':
 	    {
 		char *next = 0;
 		int tvalue = (int) strtol(optarg, &next, 0);
diff --git a/test/pair_content.c b/test/pair_content.c
index 2b759a824..75ec8230a 100644
--- a/test/pair_content.c
+++ b/test/pair_content.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $
+ * $Id: pair_content.c,v 1.24 2024/11/30 18:31:01 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -213,10 +213,10 @@ usage(int ok)
 	,"Options:"
 	," -f PAIR  first color pair to test (default: 1)"
 	," -i       interactive, showing test-progress"
-	," -l PAIR  last color pair to test (default: max_pairs-1)"
+	," -F PAIR  last color pair to test (default: max_pairs-1)"
 	," -n       do not initialize color pairs"
 	," -p       print data for color pairs instead of testing"
-	," -r COUNT repeat for given count"
+	," -r NUM   repeat tests NUM times"
 	," -s       initialize pairs sequentially rather than random"
 #if USE_EXTENDED_COLOR
 	," -x       use extended color pairs/values"
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
 {
     int ch;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
 	switch (ch) {
 	case 'f':
 	    if ((f_opt = atoi(optarg)) <= 0)
@@ -245,7 +245,7 @@ main(int argc, char *argv[])
 	case 'i':
 	    i_opt = 1;
 	    break;
-	case 'l':
+	case 'F':
 	    if ((l_opt = atoi(optarg)) <= 0)
 		usage(FALSE);
 	    break;
diff --git a/test/picsmap.c b/test/picsmap.c
index 46ec7251d..294be84a5 100644
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.150 2024/10/05 19:26:24 tom Exp $
+ * $Id: picsmap.c,v 1.152 2024/11/30 21:39:57 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -494,7 +494,7 @@ usage(int ok)
 	," -d       invoke use_default_colors"
 #endif
 	," -L       add debugging information to logfile"
-	," -l FILE  write informational messages to FILE"
+	," -F FILE  write informational messages to FILE"
 	," -p FILE  color-palette file (default \"$TERM.dat\")"
 	," -q       less verbose"
 	," -r FILE  xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")"
@@ -948,6 +948,7 @@ parse_rgb(char **data)
     for (n = 0; data[n] != 0; ++n) {
 	if (strlen(t = data[n]) >= sizeof(buf) - 1)
 	    continue;
+	t = strcpy(buf, t);
 	if (*(s = skip_s(t)) == '!')
 	    continue;
 
@@ -1156,6 +1157,7 @@ parse_xpm(char **data)
     for (n = 0; data[n] != 0; ++n) {
 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
 	    continue;
+	s = strcpy(buf, s);
 	switch (state) {
 	case 0:
 	    if (match_c(s, " /* XPM */ ")) {
@@ -1730,7 +1732,7 @@ main(int argc, char *argv[])
     const char *palette_path = 0;
     const char *rgb_path = RGB_PATH;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) {
 	switch (ch) {
 	case 'a':
 	    if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1
@@ -1748,7 +1750,7 @@ main(int argc, char *argv[])
 	case 'L':
 	    debugging = TRUE;
 	    break;
-	case 'l':
+	case 'F':
 	    if ((logfp = fopen(optarg, "a")) == 0)
 		failed(optarg);
 	    break;
diff --git a/test/savescreen.c b/test/savescreen.c
index 878f9c3e1..91a3c04ca 100644
--- a/test/savescreen.c
+++ b/test/savescreen.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: savescreen.c,v 1.65 2024/10/06 21:10:09 tom Exp $
+ * $Id: savescreen.c,v 1.66 2024/11/30 18:48:40 tom Exp $
  *
  * Demonstrate save/restore functions from the curses library.
  * Thomas Dickey - 2007/7/14
@@ -261,7 +261,7 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -f file  fill/initialize screen using text from this file"
+	," -f FILE  fill/initialize screen using text from this file"
 	," -i       use scr_init/scr_restore rather than scr_set"
 	," -k       keep the restored dump-files rather than removing them"
 	," -r       replay the screen-dump files"
diff --git a/test/test_arrays.c b/test/test_arrays.c
index f89cb280f..d10dcf975 100644
--- a/test/test_arrays.c
+++ b/test/test_arrays.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $
+ * $Id: test_arrays.c,v 1.14 2024/11/30 17:00:55 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -53,7 +53,7 @@ extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
 
 static bool opt_C;
 static bool opt_T;
-static bool opt_c;
+static bool opt_s;
 static bool opt_f;
 static bool opt_n;
 static bool opt_t;
@@ -75,15 +75,15 @@ static void
 dump_plain(void)
 {
     PLAIN(opt_T && opt_n, boolnames);
-    PLAIN(opt_C && opt_c, boolcodes);
+    PLAIN(opt_C && opt_s, boolcodes);
     PLAIN(opt_T && opt_f, boolfnames);
 
     PLAIN(opt_T && opt_n, numnames);
-    PLAIN(opt_C && opt_c, numcodes);
+    PLAIN(opt_C && opt_s, numcodes);
     PLAIN(opt_T && opt_f, numfnames);
 
     PLAIN(opt_T && opt_n, strnames);
-    PLAIN(opt_C && opt_c, strcodes);
+    PLAIN(opt_C && opt_s, strcodes);
     PLAIN(opt_T && opt_f, strfnames);
 }
 
@@ -99,7 +99,7 @@ dump_table(void)
     STRING(opt_t, "Index");
     STRING(opt_t, "Type");
     STRING(opt_n, "Name");
-    STRING(opt_c, "Code");
+    STRING(opt_s, "Code");
     STRING(opt_f, "FName");
     printf("\n");
 
@@ -108,7 +108,7 @@ dump_table(void)
 	NUMBER(opt_t, r);
 	STRING(opt_t, "bool");
 	STRING(opt_T && opt_n, boolnames[r]);
-	STRING(opt_C && opt_c, boolcodes[r]);
+	STRING(opt_C && opt_s, boolcodes[r]);
 	STRING(opt_T && opt_f, boolfnames[r]);
 	printf("\n");
     }
@@ -118,7 +118,7 @@ dump_table(void)
 	NUMBER(opt_t, r);
 	STRING(opt_t, "num");
 	STRING(opt_T && opt_n, numnames[r]);
-	STRING(opt_C && opt_c, numcodes[r]);
+	STRING(opt_C && opt_s, numcodes[r]);
 	STRING(opt_T && opt_f, numfnames[r]);
 	printf("\n");
     }
@@ -128,7 +128,7 @@ dump_table(void)
 	NUMBER(opt_t, r);
 	STRING(opt_t, "str");
 	STRING(opt_T && opt_n, strnames[r]);
-	STRING(opt_C && opt_c, strcodes[r]);
+	STRING(opt_C && opt_s, strcodes[r]);
 	STRING(opt_T && opt_f, strfnames[r]);
 	printf("\n");
     }
@@ -148,7 +148,7 @@ usage(int ok)
 	,"Options:"
 	," -C       print termcap names"
 	," -T       print terminfo names"
-	," -c       print termcap names"
+	," -s       print short termcap names"
 	," -f       print full terminfo names"
 	," -n       print short terminfo names"
 	," -t       print the result as CSV table"
@@ -168,7 +168,7 @@ main(int argc, char *argv[])
 {
     int ch;
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "CTsfnt")) != -1) {
 	switch (ch) {
 	case 'C':
 	    opt_C = TRUE;
@@ -176,8 +176,8 @@ main(int argc, char *argv[])
 	case 'T':
 	    opt_T = TRUE;
 	    break;
-	case 'c':
-	    opt_c = TRUE;
+	case 's':
+	    opt_s = TRUE;
 	    break;
 	case 'f':
 	    opt_f = TRUE;
@@ -202,8 +202,8 @@ main(int argc, char *argv[])
     if (!(opt_T || opt_C)) {
 	opt_T = opt_C = TRUE;
     }
-    if (!(opt_c || opt_f || opt_n)) {
-	opt_c = opt_f = opt_n = TRUE;
+    if (!(opt_s || opt_f || opt_n)) {
+	opt_s = opt_f = opt_n = TRUE;
     }
 
     if (opt_t) {
diff --git a/test/test_endwin.c b/test/test_endwin.c
index b761f22ad..e1825ba7e 100644
--- a/test/test_endwin.c
+++ b/test/test_endwin.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_endwin.c,v 1.3 2024/10/05 19:27:33 tom Exp $
+ * $Id: test_endwin.c,v 1.4 2024/11/30 17:34:56 tom Exp $
  */
 #include <test.priv.h>
 
@@ -38,11 +38,11 @@ usage(int ok)
 	"Usage: test_endwin [options]"
 	,""
 	,"Options:"
-	," -e   call endwin() an extra time"
-	," -i   call initscr() before endwin()"
-	," -n   call newterm() before endwin()"
-	," -r   call refresh() before endwin()"
-	," -s   call getch() after endwin(), to refresh screen"
+	," -e       call endwin() an extra time"
+	," -i       call initscr() before endwin()"
+	," -n       call newterm() before endwin()"
+	," -r       call refresh() before endwin()"
+	," -s       call getch() after endwin(), to refresh screen"
 	,""
 	,USAGE_COMMON
     };
diff --git a/test/test_mouse.c b/test/test_mouse.c
index 9e9a72c9c..fcbe52674 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.33 2024/10/05 18:47:56 tom Exp $
+ * $Id: test_mouse.c,v 1.35 2024/11/30 18:46:48 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -214,8 +214,8 @@ usage(int ok)
 	,USAGE_COMMON
 	,"Options:"
 	," -r       show raw input stream, injecting a new line before every ESC"
-	," -i n     set mouse interval to n; default is 0 (no double-clicks)"
-	," -T term  use terminal description other than $TERM"
+	," -i NUM   set mouse interval to NUM; default is 0 (no double-clicks)"
+	," -T TERM  override $TERM"
     };
     unsigned n;
     for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) {
diff --git a/test/view.c b/test/view.c
index 7009508ab..194e6042f 100644
--- a/test/view.c
+++ b/test/view.c
@@ -52,7 +52,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.147 2024/10/06 21:08:05 tom Exp $
+ * $Id: view.c,v 1.149 2024/11/30 18:15:06 tom Exp $
  */
 
 #include <test.priv.h>
@@ -382,15 +382,15 @@ usage(int ok)
 	,""
 	,USAGE_COMMON
 	,"Options:"
-	," -c       use color if terminal supports it"
+	," -C       use color if terminal supports it"
 	," -i       ignore INT, QUIT, TERM signals"
 #if USE_WIDEC_SUPPORT
 	," -n       use waddch (bytes) rather then wadd_wch (wide-chars)"
 #endif
-	," -s       start in single-step mode, waiting for input"
+	," -s       start in single-step mode"
 #ifdef TRACE
 	," -t       trace screen updates"
-	," -T NUM   specify trace mask"
+	," -D NUM   specify trace mask"
 #endif
     };
     size_t n;
@@ -443,9 +443,9 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
 	switch (ch) {
-	case 'c':
+	case 'C':
 	    try_color = TRUE;
 	    break;
 	case 'i':
@@ -460,7 +460,7 @@ main(int argc, char *argv[])
 	    single_step = TRUE;
 	    break;
 #ifdef TRACE
-	case 'T':
+	case 'D':
 	    {
 		char *next = 0;
 		int tvalue = (int) strtol(optarg, &next, 0);
diff --git a/test/worm.c b/test/worm.c
index 7c4842e40..d08322478 100644
--- a/test/worm.c
+++ b/test/worm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -53,7 +53,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.89 2022/12/24 20:46:49 tom Exp $
+  $Id: worm.c,v 1.93 2024/11/30 18:53:39 tom Exp $
 */
 
 #include <test.priv.h>
@@ -119,9 +119,6 @@ pthread_mutex_t pending_mutex;
 #define Locked(statement) statement
 #endif
 
-#ifdef TRACE
-static int generation, trace_start, trace_end;
-#endif /* TRACE */
 /* *INDENT-OFF* */
 static const struct options {
     int nopts;
@@ -463,11 +460,10 @@ usage(int ok)
 	," -d       invoke use_default_colors"
 #endif
 	," -f       fill screen with copies of \"WORM\" at start"
-	," -l <n>   set length of worms"
-	," -n <n>   set number of worms"
+	," -M NUM   set length of worms"
+	," -n NUM   set number of worms"
 	," -t       leave trail of \".\""
 #ifdef TRACE
-	," -T <start>,<end> set trace interval"
 	," -N       suppress cursor-movement optimization"
 #endif
     };
@@ -497,7 +493,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfn:t")) != -1) {
 	switch (ch) {
 #if HAVE_USE_DEFAULT_COLORS
 	case 'd':
@@ -507,7 +503,7 @@ main(int argc, char *argv[])
 	case 'f':
 	    field = "WORM";
 	    break;
-	case 'l':
+	case 'M':
 	    if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) {
 		fprintf(stderr, "%s: Invalid length\n", *argv);
 		usage(FALSE);
@@ -523,10 +519,6 @@ main(int argc, char *argv[])
 	    trail = '.';
 	    break;
 #ifdef TRACE
-	case 'T':
-	    if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2)
-		usage(FALSE);
-	    break;
 	case 'N':
 	    _nc_optimize_enable ^= OPTIMIZE_ALL;	/* declared by ncurses */
 	    break;
@@ -631,19 +623,6 @@ main(int argc, char *argv[])
     while (!done) {
 	Locked(++sequence);
 	if ((ch = get_input()) > 0) {
-#ifdef TRACE
-	    if (trace_start || trace_end) {
-		if (generation == trace_start) {
-		    curses_trace(TRACE_CALLS);
-		    get_input();
-		} else if (generation == trace_end) {
-		    curses_trace(0);
-		    get_input();
-		}
-
-		generation++;
-	    }
-#endif
 
 #ifdef KEY_RESIZE
 	    if (ch == KEY_RESIZE) {

From 55d5caf1547148b278f65270054b5df724d95cb1 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 8 Dec 2024 03:11:12 +0100
Subject: [PATCH 093/106] ncurses-6.5-20241207.patch.gz

---
 NEWS                               |   5 +-
 VERSION                            |   2 +-
 dist.mk                            |   4 +-
 form/fld_arg.c                     |   6 +-
 form/fld_attr.c                    |   6 +-
 form/fld_current.c                 |  12 +-
 form/fld_def.c                     |  26 ++--
 form/form.priv.h                   |   8 +-
 form/frm_driver.c                  |  28 ++--
 form/frm_req_name.c                |   6 +-
 form/fty_enum.c                    |   6 +-
 form/fty_generic.c                 |  13 +-
 form/fty_int.c                     |   4 +-
 form/fty_num.c                     |   4 +-
 form/fty_regex.c                   |   8 +-
 include/curses.h.in                |   8 +-
 menu/m_driver.c                    |   8 +-
 menu/m_global.c                    |  14 +-
 menu/m_item_new.c                  |  10 +-
 menu/m_pattern.c                   |   6 +-
 menu/m_req_name.c                  |   6 +-
 menu/mf_common.h                   |   4 +-
 ncurses/base/MKkeyname.awk         |  30 ++---
 ncurses/base/MKlib_gen.sh          |   5 +-
 ncurses/base/MKunctrl.awk          |  10 +-
 ncurses/base/define_key.c          |  10 +-
 ncurses/base/key_defined.c         |  10 +-
 ncurses/base/keybound.c            |   8 +-
 ncurses/base/keyok.c               |   8 +-
 ncurses/base/legacy_coding.c       |   6 +-
 ncurses/base/lib_addch.c           |   6 +-
 ncurses/base/lib_addstr.c          |  10 +-
 ncurses/base/lib_beep.c            |   6 +-
 ncurses/base/lib_bkgd.c            |   6 +-
 ncurses/base/lib_color.c           |  38 +++---
 ncurses/base/lib_colorset.c        |   6 +-
 ncurses/base/lib_delwin.c          |   6 +-
 ncurses/base/lib_dft_fgbg.c        |   8 +-
 ncurses/base/lib_echo.c            |   8 +-
 ncurses/base/lib_erase.c           |   6 +-
 ncurses/base/lib_freeall.c         |  14 +-
 ncurses/base/lib_getch.c           |   6 +-
 ncurses/base/lib_initscr.c         |   6 +-
 ncurses/base/lib_insch.c           |   6 +-
 ncurses/base/lib_insnstr.c         |   8 +-
 ncurses/base/lib_instr.c           |  12 +-
 ncurses/base/lib_mouse.c           |  28 ++--
 ncurses/base/lib_newterm.c         |  18 +--
 ncurses/base/lib_newwin.c          |  67 +++++-----
 ncurses/base/lib_nl.c              |   8 +-
 ncurses/base/lib_overlay.c         |  10 +-
 ncurses/base/lib_pad.c             |  16 +--
 ncurses/base/lib_printw.c          |   6 +-
 ncurses/base/lib_redrawln.c        |   6 +-
 ncurses/base/lib_restart.c         |   6 +-
 ncurses/base/lib_screen.c          |  56 ++++----
 ncurses/base/lib_set_term.c        |  74 +++++------
 ncurses/base/lib_slk.c             |  20 +--
 ncurses/base/lib_slkatr_set.c      |   8 +-
 ncurses/base/lib_slkatrof.c        |   6 +-
 ncurses/base/lib_slkatron.c        |   6 +-
 ncurses/base/lib_slkatrset.c       |   6 +-
 ncurses/base/lib_slkattr.c         |   6 +-
 ncurses/base/lib_slkclear.c        |   6 +-
 ncurses/base/lib_slkcolor.c        |   8 +-
 ncurses/base/lib_slklab.c          |   8 +-
 ncurses/base/lib_slkrefr.c         |   8 +-
 ncurses/base/lib_slkset.c          |  16 +--
 ncurses/base/lib_slktouch.c        |   6 +-
 ncurses/base/lib_ungetch.c         |   6 +-
 ncurses/base/lib_wattron.c         |   6 +-
 ncurses/base/lib_winch.c           |   6 +-
 ncurses/base/lib_window.c          |  14 +-
 ncurses/base/nc_panel.c            |   6 +-
 ncurses/base/new_pair.c            |  12 +-
 ncurses/base/resizeterm.c          |  24 ++--
 ncurses/base/tries.c               |  20 +--
 ncurses/base/wresize.c             |  16 +--
 ncurses/curses.priv.h              |  50 ++++----
 ncurses/new_pair.h                 |   4 +-
 ncurses/report_offsets.c           |   8 +-
 ncurses/tinfo/MKcaptab.awk         |   6 +-
 ncurses/tinfo/MKcaptab.sh          |  22 ++--
 ncurses/tinfo/MKcodes.awk          |   6 +-
 ncurses/tinfo/MKfallback.sh        |   6 +-
 ncurses/tinfo/MKnames.awk          |   6 +-
 ncurses/tinfo/MKuserdefs.sh        |   8 +-
 ncurses/tinfo/access.c             |  12 +-
 ncurses/tinfo/add_tries.c          |  18 +--
 ncurses/tinfo/alloc_entry.c        |  12 +-
 ncurses/tinfo/alloc_ttype.c        |  12 +-
 ncurses/tinfo/captoinfo.c          |  24 ++--
 ncurses/tinfo/comp_error.c         |  16 +--
 ncurses/tinfo/comp_expand.c        |  18 +--
 ncurses/tinfo/comp_hash.c          |  14 +-
 ncurses/tinfo/comp_parse.c         |  20 +--
 ncurses/tinfo/comp_scan.c          |  62 ++++-----
 ncurses/tinfo/db_iterator.c        |  54 ++++----
 ncurses/tinfo/doalloc.c            |   6 +-
 ncurses/tinfo/entries.c            |  24 ++--
 ncurses/tinfo/getenv_num.c         |   8 +-
 ncurses/tinfo/home_terminfo.c      |   8 +-
 ncurses/tinfo/init_keytry.c        |   6 +-
 ncurses/tinfo/lib_acs.c            |  12 +-
 ncurses/tinfo/lib_baudrate.c       |   6 +-
 ncurses/tinfo/lib_cur_term.c       |  14 +-
 ncurses/tinfo/lib_data.c           |  26 ++--
 ncurses/tinfo/lib_kernel.c         |  10 +-
 ncurses/tinfo/lib_options.c        |  16 +--
 ncurses/tinfo/lib_print.c          |   6 +-
 ncurses/tinfo/lib_raw.c            |  18 +--
 ncurses/tinfo/lib_setup.c          |  49 +++----
 ncurses/tinfo/lib_termcap.c        |  44 +++----
 ncurses/tinfo/lib_termname.c       |   8 +-
 ncurses/tinfo/lib_ti.c             |  10 +-
 ncurses/tinfo/lib_tparm.c          |  32 ++---
 ncurses/tinfo/lib_tputs.c          |  22 ++--
 ncurses/tinfo/lib_ttyflags.c       |  28 ++--
 ncurses/tinfo/make_hash.c          |  38 +++---
 ncurses/tinfo/make_keys.c          |  22 ++--
 ncurses/tinfo/name_match.c         |  14 +-
 ncurses/tinfo/obsolete.c           |   8 +-
 ncurses/tinfo/parse_entry.c        |  24 ++--
 ncurses/tinfo/read_entry.c         |  22 ++--
 ncurses/tinfo/strings.c            |  14 +-
 ncurses/tinfo/trim_sgr0.c          |  12 +-
 ncurses/tinfo/write_entry.c        |  12 +-
 ncurses/trace/lib_trace.c          |  16 +--
 ncurses/trace/lib_traceatr.c       |  24 ++--
 ncurses/trace/lib_tracebits.c      |   6 +-
 ncurses/trace/lib_tracechr.c       |   8 +-
 ncurses/trace/lib_tracedmp.c       |   8 +-
 ncurses/trace/lib_tracemse.c       |  10 +-
 ncurses/trace/trace_buf.c          |  26 ++--
 ncurses/trace/trace_tries.c        |  10 +-
 ncurses/trace/varargs.c            |  10 +-
 ncurses/trace/visbuf.c             |  20 +--
 ncurses/tty/MKexpanded.sh          |  11 +-
 ncurses/tty/hardscroll.c           |  12 +-
 ncurses/tty/hashmap.c              |   6 +-
 ncurses/tty/lib_mvcur.c            |  24 ++--
 ncurses/tty/lib_tstp.c             |   8 +-
 ncurses/tty/lib_twait.c            |   4 +-
 ncurses/tty/lib_vidattr.c          |  10 +-
 ncurses/tty/tty_update.c           |  28 ++--
 ncurses/wcwidth.h                  |   4 +-
 ncurses/widechar/lib_add_wch.c     |   4 +-
 ncurses/widechar/lib_box_set.c     |   6 +-
 ncurses/widechar/lib_cchar.c       |   4 +-
 ncurses/widechar/lib_get_wch.c     |   8 +-
 ncurses/widechar/lib_hline_set.c   |   6 +-
 ncurses/widechar/lib_in_wch.c      |   8 +-
 ncurses/widechar/lib_in_wchnstr.c  |   6 +-
 ncurses/widechar/lib_ins_wch.c     |   8 +-
 ncurses/widechar/lib_inwstr.c      |   6 +-
 ncurses/widechar/lib_pecho_wchar.c |   6 +-
 ncurses/widechar/lib_slk_wset.c    |   8 +-
 ncurses/widechar/lib_unget_wch.c   |  10 +-
 ncurses/widechar/lib_vid_attr.c    |  26 ++--
 ncurses/widechar/lib_vline_set.c   |   6 +-
 ncurses/widechar/lib_wacs.c        |   8 +-
 ncurses/widechar/lib_wunctrl.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 +-
 package/ncursest.spec              |   2 +-
 panel/p_above.c                    |  16 +--
 panel/p_below.c                    |  18 +--
 panel/p_new.c                      |   6 +-
 panel/panel.c                      |  18 +--
 panel/panel.priv.h                 |   6 +-
 progs/dump_entry.c                 |  40 +++---
 progs/infocmp.c                    |  56 ++++----
 progs/reset_cmd.c                  |  18 +--
 progs/tabs.c                       |  38 +++---
 progs/tic.c                        | 118 ++++++++---------
 progs/toe.c                        |  50 ++++----
 progs/tput.c                       |  14 +-
 progs/tset.c                       |  54 ++++----
 test/blue.c                        |   4 +-
 test/bs.c                          |  12 +-
 test/cardfile.c                    |  52 ++++----
 test/chgat.c                       |  24 ++--
 test/clip_printw.c                 |  24 ++--
 test/color_content.c               |   4 +-
 test/color_name.h                  |   8 +-
 test/combine.c                     |   4 +-
 test/demo_altkeys.c                |  12 +-
 test/demo_defkey.c                 |  30 ++---
 test/demo_forms.c                  |  36 +++---
 test/demo_keyok.c                  |   4 +-
 test/demo_menus.c                  |  58 ++++-----
 test/demo_new_pair.c               |   8 +-
 test/demo_panels.c                 |  48 +++----
 test/demo_termcap.c                |  64 +++++-----
 test/demo_terminfo.c               |  66 +++++-----
 test/ditto.c                       |  20 +--
 test/dots.c                        |   8 +-
 test/dots_curses.c                 |   4 +-
 test/dots_mvcur.c                  |  10 +-
 test/dots_termcap.c                |  16 +--
 test/dots_xcurses.c                |   4 +-
 test/dump_window.c                 |  18 +--
 test/dup_field.c                   |  12 +-
 test/echochar.c                    |  10 +-
 test/edit_field.c                  |  14 +-
 test/filter.c                      |  12 +-
 test/foldkeys.c                    |  16 +--
 test/form_driver_w.c               |   4 +-
 test/gdc.c                         |   6 +-
 test/inch_wide.c                   |  14 +-
 test/inchs.c                       |  16 +--
 test/ins_wide.c                    |   8 +-
 test/insdelln.c                    |  22 ++--
 test/inserts.c                     |   8 +-
 test/key_names.c                   |   6 +-
 test/keynames.c                    |   6 +-
 test/linedata.h                    |  10 +-
 test/list_keys.c                   |  12 +-
 test/move_field.c                  |  12 +-
 test/movewindow.c                  |  42 +++---
 test/ncurses.c                     | 199 +++++++++++++++--------------
 test/padview.c                     |  18 +--
 test/pair_content.c                |   4 +-
 test/picsmap.c                     | 132 +++++++++----------
 test/popup_msg.c                   |   8 +-
 test/railroad.c                    |  30 ++---
 test/rain.c                        |   4 +-
 test/redraw.c                      |   4 +-
 test/savescreen.c                  |  22 ++--
 test/sp_tinfo.c                    |  10 +-
 test/tclock.c                      |   4 +-
 test/test_add_wchstr.c             |  18 +--
 test/test_addchstr.c               |  18 +--
 test/test_addstr.c                 |   8 +-
 test/test_addwstr.c                |   8 +-
 test/test_arrays.c                 |   4 +-
 test/test_get_wstr.c               |  14 +-
 test/test_getstr.c                 |  14 +-
 test/test_instr.c                  |  14 +-
 test/test_inwstr.c                 |  14 +-
 test/test_opaque.c                 |  12 +-
 test/test_setupterm.c              |  10 +-
 test/test_sgr.c                    |  24 ++--
 test/test_tparm.c                  |  49 +++----
 test/test_vid_puts.c               |   6 +-
 test/test_vidputs.c                |   4 +-
 test/testcurs.c                    |  12 +-
 test/view.c                        |  26 ++--
 test/xmas.c                        |  66 +++++-----
 253 files changed, 2116 insertions(+), 2094 deletions(-)

diff --git a/NEWS b/NEWS
index 11c4d8447..a842aed76 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4207 2024/11/30 19:41:55 tom Exp $
+-- $Id: NEWS,v 1.4209 2024/12/07 23:51:39 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241207
+	+ strict compiler-warning fixes for upcoming gcc15
+
 20241130
 	+ improve configure check for lint program.
 	+ adjust options in test-programs to allow for consistent use of -c/-l
diff --git a/VERSION b/VERSION
index f64e28d71..fd885601e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241130
+5:0:10	6.5	20241207
diff --git a/dist.mk b/dist.mk
index a5481dd90..4a5d640c5 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1643 2024/11/30 10:55:07 tom Exp $
+# $Id: dist.mk,v 1.1644 2024/12/07 11:51:44 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241130
+NCURSES_PATCH = 20241207
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/form/fld_arg.c b/form/fld_arg.c
index 2f6c47715..7dc4ac323 100644
--- a/form/fld_arg.c
+++ b/form/fld_arg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_arg.c,v 1.18 2020/12/11 22:05:24 tom Exp $")
+MODULE_ID("$Id: fld_arg.c,v 1.19 2024/12/07 23:00:37 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -75,7 +75,7 @@ set_fieldtype_arg(FIELDTYPE *typ,
      TR_FUNC_ARG(1, copy_arg),
      TR_FUNC_ARG(2, free_arg)));
 
-  if (typ != 0 && make_arg != (void *)0)
+  if (typ != NULL && make_arg != NULL)
     {
       SetStatus(typ, _HAS_ARGS);
       typ->makearg = make_arg;
diff --git a/form/fld_attr.c b/form/fld_attr.c
index 4ce6b1c52..7827d1c49 100644
--- a/form/fld_attr.c
+++ b/form/fld_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_attr.c,v 1.15 2020/12/11 22:05:24 tom Exp $")
+MODULE_ID("$Id: fld_attr.c,v 1.16 2024/12/07 23:01:42 tom Exp $")
 
 /*----------------------------------------------------------------------------
   Field-Attribute manipulation routines
@@ -47,7 +47,7 @@ FORM_IMPEXP int NCURSES_API set_field_ ## name (FIELD * field, chtype attr)\
    if ( attr==A_NORMAL || ((attr & A_ATTRIBUTES)==attr) )\
      {\
        Normalize_Field( field );\
-       if (field != 0) \
+       if (field != NULL) \
 	 { \
 	 if ((field -> name) != attr)\
 	   {\
diff --git a/form/fld_current.c b/form/fld_current.c
index 264007ef5..fc958db15 100644
--- a/form/fld_current.c
+++ b/form/fld_current.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_current.c,v 1.16 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: fld_current.c,v 1.17 2024/12/07 23:01:42 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -54,7 +54,7 @@ set_current_field(FORM *form, FIELD *field)
   int err = E_OK;
 
   T((T_CALLED("set_current_field(%p,%p)"), (void *)form, (void *)field));
-  if (form == 0 || field == 0)
+  if (form == NULL || field == NULL)
     {
       RETURN(E_BAD_ARGUMENT);
     }
@@ -117,11 +117,11 @@ FORM_EXPORT(int)
 unfocus_current_field(FORM *const form)
 {
   T((T_CALLED("unfocus_current_field(%p)"), (const void *)form));
-  if (form == 0)
+  if (form == NULL)
     {
       RETURN(E_BAD_ARGUMENT);
     }
-  else if (form->current == 0)
+  else if (form->current == NULL)
     {
       RETURN(E_REQUEST_DENIED);
     }
@@ -158,7 +158,7 @@ FORM_EXPORT(int)
 field_index(const FIELD *field)
 {
   T((T_CALLED("field_index(%p)"), (const void *)field));
-  returnCode((field != 0 && field->form != 0) ? (int)field->index : -1);
+  returnCode((field != NULL && field->form != NULL) ? (int)field->index : -1);
 }
 
 /* fld_current.c ends here */
diff --git a/form/fld_def.c b/form/fld_def.c
index 2f6cb2764..5251bfbef 100644
--- a/form/fld_def.c
+++ b/form/fld_def.c
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_def.c,v 1.45 2024/11/30 21:41:08 tom Exp $")
+MODULE_ID("$Id: fld_def.c,v 1.46 2024/12/07 21:56:21 tom Exp $")
 
 /* this can't be readonly */
 static FIELD default_field =
@@ -87,14 +87,14 @@ _nc_Make_Argument(const FIELDTYPE *typ, va_list *ap, int *err)
 {
   TypeArgument *res = (TypeArgument *)0;
 
-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
+  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
     {
       assert(err != 0 && ap != (va_list *)0);
       if ((typ->status & _LINKED_TYPE) != 0)
 	{
 	  TypeArgument *p = typeMalloc(TypeArgument, 1);
 
-	  if (p != 0)
+	  if (p != NULL)
 	    {
 	      p->left = _nc_Make_Argument(typ->left, ap, err);
 	      p->right = _nc_Make_Argument(typ->right, ap, err);
@@ -134,14 +134,14 @@ _nc_Copy_Argument(const FIELDTYPE *typ, const TypeArgument *argp, int *err)
 {
   TypeArgument *res = (TypeArgument *)0;
 
-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
+  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
     {
       assert(err != 0 && argp != 0);
       if ((typ->status & _LINKED_TYPE) != 0)
 	{
 	  TypeArgument *p = typeMalloc(TypeArgument, 1);
 
-	  if (p != 0)
+	  if (p != NULL)
 	    {
 	      p->left = _nc_Copy_Argument(typ, argp->left, err);
 	      p->right = _nc_Copy_Argument(typ, argp->right, err);
@@ -180,11 +180,11 @@ _nc_Copy_Argument(const FIELDTYPE *typ, const TypeArgument *argp, int *err)
 FORM_EXPORT(void)
 _nc_Free_Argument(const FIELDTYPE *typ, TypeArgument *argp)
 {
-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
+  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
     {
       if ((typ->status & _LINKED_TYPE) != 0)
 	{
-	  if (argp != 0)
+	  if (argp != NULL)
 	    {
 	      _nc_Free_Argument(typ->left, argp->left);
 	      _nc_Free_Argument(typ->right, argp->right);
@@ -229,7 +229,7 @@ _nc_Copy_Type(FIELD *dst, FIELD const *src)
     }
   else
     {
-      if (dst->type != 0)
+      if (dst->type != NULL)
 	{
 	  dst->type->ref++;
 	}
@@ -249,7 +249,7 @@ FORM_EXPORT(void)
 _nc_Free_Type(FIELD *field)
 {
   assert(field != 0);
-  if (field->type != 0)
+  if (field->type != NULL)
     {
       field->type->ref--;
       _nc_Free_Argument(field->type, (TypeArgument *)(field->arg));
@@ -289,7 +289,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
       nrow >= 0 &&
       nbuf >= 0 &&
       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
-      (New_Field = typeMalloc(FIELD, 1)) != 0)
+      (New_Field = typeMalloc(FIELD, 1)) != NULL)
     {
       T((T_CREATE("field %p"), (void *)New_Field));
       *New_Field = default_field;
@@ -360,13 +360,13 @@ free_field(FIELD *field)
     {
       RETURN(E_BAD_ARGUMENT);
     }
-  else if (field->form != 0)
+  else if (field->form != NULL)
     {
       RETURN(E_CONNECTED);
     }
   else if (field == field->link)
     {
-      if (field->buf != 0)
+      if (field->buf != NULL)
 	free(field->buf);
     }
   else
@@ -380,7 +380,7 @@ free_field(FIELD *field)
     }
   _nc_Free_Type(field);
 #if USE_WIDEC_SUPPORT
-  if (field->expanded != 0)
+  if (field->expanded != NULL)
     {
       int n;
 
diff --git a/form/form.priv.h b/form/form.priv.h
index ad5af63ad..e5a26a408 100644
--- a/form/form.priv.h
+++ b/form/form.priv.h
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: form.priv.h,v 0.49 2024/02/24 12:17:31 tom Exp $ */
+/* $Id: form.priv.h,v 0.50 2024/12/07 21:57:21 tom Exp $ */
 
 #ifndef FORM_PRIV_H
 #define FORM_PRIV_H 1
@@ -93,11 +93,11 @@ extern FORM_EXPORT_VAR(FIELDTYPE *) _nc_Default_FieldType;
 
 /* If form is NULL replace form argument by default-form */
 #define Normalize_Form(form) \
-  ((form) = (form != 0) ? (form) : _nc_Default_Form)
+  ((form) = (form != NULL) ? (form) : _nc_Default_Form)
 
 /* If field is NULL replace field argument by default-field */
 #define Normalize_Field(field) \
-  ((field) = (field != 0) ? (field) : _nc_Default_Field)
+  ((field) = (field != NULL) ? (field) : _nc_Default_Field)
 
 #if NCURSES_SP_FUNCS
 #define Get_Form_Screen(form) \
@@ -260,7 +260,7 @@ extern FORM_EXPORT(Form_Hook)    _nc_retrace_form_hook (Form_Hook);
       int len; \
       int n; \
       wchar_t *list = _nc_Widen_String((char *)buffer, &len); \
-      if (list != 0) \
+      if (list != NULL) \
 	{ \
 	  result = TRUE; \
 	  for (n = 0; n < len; ++n) \
diff --git a/form/frm_driver.c b/form/frm_driver.c
index 179e403cf..276f97f4b 100644
--- a/form/frm_driver.c
+++ b/form/frm_driver.c
@@ -33,7 +33,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_driver.c,v 1.136 2024/07/27 18:49:18 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.137 2024/12/07 21:57:21 tom Exp $")
 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority
@@ -734,7 +734,7 @@ Field_Grown(FIELD *field, int amount)
 	    {
 	      WINDOW *new_window = newpad(field->drows, field->dcols);
 
-	      if (new_window != 0)
+	      if (new_window != NULL)
 		{
 		  assert(form != (FORM *)0);
 		  if (form->w)
@@ -802,7 +802,7 @@ static int
 Field_encloses(FIELD *field, int ry, int rx)
 {
   T((T_CALLED("Field_encloses(%p)"), (void *)field));
-  if (field != 0
+  if (field != NULL
       && field->frow <= ry
       && (field->frow + field->rows) > ry
       && field->fcol <= rx
@@ -1251,7 +1251,7 @@ Synchronize_Linked_Fields(FIELD *field)
     return (E_SYSTEM_ERROR);
 
   for (linked_field = field->link;
-       (linked_field != field) && (linked_field != 0);
+       (linked_field != field) && (linked_field != NULL);
        linked_field = linked_field->link)
     {
       int syncres;
@@ -1458,7 +1458,7 @@ _nc_Unset_Current_Field(FORM *form)
 	      werase(form->w);
 	      Perform_Justification(field, form->w);
 	      if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
-		  (form->w->_parent == 0))
+		  (form->w->_parent == NULL))
 		{
 		  copywin(form->w,
 			  Get_Form_Window(form),
@@ -1480,7 +1480,7 @@ _nc_Unset_Current_Field(FORM *form)
     }
   delwin(form->w);
   form->w = (WINDOW *)0;
-  form->current = 0;
+  form->current = NULL;
 }
 
 /*---------------------------------------------------------------------------
@@ -4758,7 +4758,7 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
   int len;
 
 #if USE_WIDEC_SUPPORT
-  FIELD_CELL *widevalue = 0;
+  FIELD_CELL *widevalue = NULL;
 #endif
 
   T((T_CALLED("set_field_buffer(%p,%d,%s)"), (void *)field, buffer, _nc_visbuf(value)));
@@ -4807,7 +4807,7 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
   wclear(field->working);
   (void)mvwaddstr(field->working, 0, 0, value);
 
-  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == 0)
+  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == NULL)
     {
       RETURN(E_SYSTEM_ERROR);
     }
@@ -4869,7 +4869,7 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
 FORM_EXPORT(char *)
 field_buffer(const FIELD *field, int buffer)
 {
-  char *result = 0;
+  char *result = NULL;
 
   T((T_CALLED("field_buffer(%p,%d)"), (const void *)field, buffer));
 
@@ -4890,14 +4890,14 @@ field_buffer(const FIELD *field, int buffer)
 	      size_t next;
 
 	      init_mb(state);
-	      next = _nc_wcrtomb(0, data[n].chars[0], &state);
+	      next = _nc_wcrtomb(NULL, data[n].chars[0], &state);
 	      if (next > 0)
 		need += next;
 	    }
 	}
 
       /* allocate a place to store the expanded string */
-      if (field->expanded[buffer] != 0)
+      if (field->expanded[buffer] != NULL)
 	free(field->expanded[buffer]);
       field->expanded[buffer] = typeMalloc(char, need + 1);
 
@@ -4909,7 +4909,7 @@ field_buffer(const FIELD *field, int buffer)
        * contain embedded wide-character extensions).  Change the null-padding
        * to blanks as needed.
        */
-      if ((result = field->expanded[buffer]) != 0)
+      if ((result = field->expanded[buffer]) != NULL)
 	{
 	  wclear(field->working);
 	  wmove(field->working, 0, 0);
@@ -4937,7 +4937,7 @@ field_buffer(const FIELD *field, int buffer)
 FORM_EXPORT(wchar_t *)
 _nc_Widen_String(char *source, int *lengthp)
 {
-  wchar_t *result = 0;
+  wchar_t *result = NULL;
   wchar_t wch = 0;
   size_t given = strlen(source);
   size_t tries;
@@ -4999,7 +4999,7 @@ _nc_Widen_String(char *source, int *lengthp)
 	  result = typeCalloc(wchar_t, need);
 
 	  *lengthp = (int)need;
-	  if (result == 0)
+	  if (result == NULL)
 	    break;
 	}
     }
diff --git a/form/frm_req_name.c b/form/frm_req_name.c
index 8b76a8e4f..6c98ace91 100644
--- a/form/frm_req_name.c
+++ b/form/frm_req_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_req_name.c,v 1.23 2021/06/17 21:11:08 tom Exp $")
+MODULE_ID("$Id: frm_req_name.c,v 1.24 2024/12/07 23:00:37 tom Exp $")
 
 #define DATA(s) { s }
 
@@ -153,7 +153,7 @@ form_request_by_name(const char *str)
 
   T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str)));
 
-  if (str != 0 && (i = strlen(str)) != 0)
+  if (str != NULL && (i = strlen(str)) != 0)
     {
       char buf[16];		/* longest name is 10 chars */
 
diff --git a/form/fty_enum.c b/form/fty_enum.c
index 07a501e87..bac5c5359 100644
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_enum.c,v 1.34 2024/07/27 18:50:22 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
 
 typedef struct
   {
@@ -104,7 +104,7 @@ Generic_Enum_Type(void *arg)
 	      argp->kwds = typeMalloc(char *, cnt + 1);
 
 	      kp = kwds;
-	      if ((kptarget = argp->kwds) != 0)
+	      if ((kptarget = argp->kwds) != NULL)
 		{
 		  while (kp && (*kp))
 		    {
@@ -168,7 +168,7 @@ Copy_Enum_Type(const void *argp)
 	      char **kp = ap->kwds;
 	      result->kwds = typeMalloc(char *, 1 + ap->count);
 
-	      if ((kptarget = result->kwds) != 0)
+	      if ((kptarget = result->kwds) != NULL)
 		{
 		  while (kp && (*kp))
 		    {
diff --git a/form/fty_generic.c b/form/fty_generic.c
index 5914d258d..443a7fe20 100644
--- a/form/fty_generic.c
+++ b/form/fty_generic.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_generic.c,v 1.16 2024/07/27 18:51:24 tom Exp $")
+MODULE_ID("$Id: fty_generic.c,v 1.17 2024/12/07 23:12:11 tom Exp $")
 
 /*
  * This is not a full implementation of a field type, but adds some
@@ -170,7 +170,10 @@ GenericArgument(const FIELDTYPE *typ,
 {
   TypeArgument *res = (TypeArgument *)0;
 
-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0 && err != 0 && argiterator != 0)
+  if (typ != NULL
+      && (typ->status & _HAS_ARGS) != 0
+      && err != NULL
+      && argiterator != NULL)
     {
       if (typ->status & _LINKED_TYPE)
 	{
@@ -189,14 +192,14 @@ GenericArgument(const FIELDTYPE *typ,
       else
 	{
 	  assert(typ->genericarg != (void *)0);
-	  if (typ->genericarg == 0)
+	  if (typ->genericarg == NULL)
 	    *err += 1;
 	  else
 	    {
 	      void *argp;
 	      int valid = argiterator(&argp);
 
-	      if (valid == 0 || argp == 0 ||
+	      if (valid == 0 || argp == NULL ||
 		  !(res = (TypeArgument *)typ->genericarg(argp)))
 		{
 		  *err += 1;
@@ -282,7 +285,7 @@ _nc_form_cursor(const FORM *form, int *pRow, int *pCol)
   int code = E_SYSTEM_ERROR;
   WINDOW *res = (WINDOW *)0;
 
-  if (form != 0 && pRow != 0 && pCol != 0)
+  if (form != NULL && pRow != NULL && pCol != NULL)
     {
       *pRow = form->currow;
       *pCol = form->curcol;
diff --git a/form/fty_int.c b/form/fty_int.c
index 328780bbd..80a59be2c 100644
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_int.c,v 1.34 2024/07/27 18:35:02 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
@@ -184,7 +184,7 @@ Check_This_Field(FIELD *field, const void *argp)
 	  int len;
 	  wchar_t *list = _nc_Widen_String((char *)bp, &len);
 
-	  if (list != 0)
+	  if (list != NULL)
 	    {
 	      bool blank = FALSE;
 	      int n;
diff --git a/form/fty_num.c b/form/fty_num.c
index c51bca892..180ef1064 100644
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_num.c,v 1.38 2024/07/27 18:33:58 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.39 2024/12/07 21:58:32 tom Exp $")
 
 #if HAVE_LOCALE_H
 #include <locale.h>
@@ -203,7 +203,7 @@ Check_This_Field(FIELD *field, const void *argp)
 	  int len;
 	  wchar_t *list = _nc_Widen_String((char *)bp, &len);
 
-	  if (list != 0)
+	  if (list != NULL)
 	    {
 	      bool blank = FALSE;
 	      int state = 0;
diff --git a/form/fty_regex.c b/form/fty_regex.c
index 62dcab58c..66e7351e2 100644
--- a/form/fty_regex.c
+++ b/form/fty_regex.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_regex.c,v 1.33 2021/08/14 15:01:52 tom Exp $")
+MODULE_ID("$Id: fty_regex.c,v 1.34 2024/12/07 23:02:27 tom Exp $")
 
 #if HAVE_REGEX_H_FUNCS || HAVE_LIB_PCRE2	/* We prefer POSIX regex */
 
@@ -157,12 +157,12 @@ Generic_RegularExpression_Type(void *arg MAYBE_UNUSED)
       if (preg)
 	{
 	  T((T_CREATE("RegExp_Arg %p"), (void *)preg));
-	  if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
+	  if (((preg->pRegExp = typeMalloc(regex_t, 1)) != NULL)
 	      && !regcomp(preg->pRegExp, rx,
 			  (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
 	    {
 	      T((T_CREATE("regex_t %p"), (void *)preg->pRegExp));
-	      if ((preg->refCount = typeMalloc(unsigned long, 1)) != 0)
+	      if ((preg->refCount = typeMalloc(unsigned long, 1)) != NULL)
 		 *(preg->refCount) = 1;
 	    }
 	  else
diff --git a/include/curses.h.in b/include/curses.h.in
index 8cfa0b9ff..02dda52fc 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.282 2024/01/19 11:50:07 tom Exp $ */
+/* $Id: curses.h.in,v 1.284 2024/12/07 17:14:44 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -125,10 +125,10 @@
  * doing so makes it incompatible with other implementations of X/Open Curses.
  */
 #undef  NCURSES_CONST
-#define NCURSES_CONST @NCURSES_CONST@
+#define NCURSES_CONST @NCURSES_CONST@	/* for old compilers */
 
 #undef NCURSES_INLINE
-#define NCURSES_INLINE @NCURSES_INLINE@
+#define NCURSES_INLINE @NCURSES_INLINE@	/* for old compilers */
 
 /*
  * The standard type used for color values, and for color-pairs.  The latter
@@ -833,7 +833,7 @@ extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
 extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_printw)	/* implemented */
 		GCC_PRINTFLIKE(2,0);
 extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *, va_list)	/* implemented */
-		GCC_PRINTFLIKE(2,0);	
+		GCC_PRINTFLIKE(2,0);
 extern NCURSES_EXPORT(int) vwscanw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_scanw)	/* implemented */
 		GCC_SCANFLIKE(2,0);
 extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, const char *, va_list)	/* implemented */
diff --git a/menu/m_driver.c b/menu/m_driver.c
index 93882b288..168eeede0 100644
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_driver.c,v 1.38 2024/07/27 18:14:20 tom Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.39 2024/12/07 22:01:57 tom Exp $")
 
 /* Macros */
 
@@ -307,7 +307,7 @@ menu_driver(MENU *menu, int c)
 	  else
 	    {
 	      my_top_row += rdiff;
-	      while (rdiff-- > 0 && item != 0 && item->down != 0)
+	      while (rdiff-- > 0 && item != NULL && item->down != NULL)
 		item = item->down;
 	    }
 	  break;
@@ -320,7 +320,7 @@ menu_driver(MENU *menu, int c)
 	  else
 	    {
 	      my_top_row -= rdiff;
-	      while (rdiff-- > 0 && item != 0 && item->up != 0)
+	      while (rdiff-- > 0 && item != NULL && item->up != NULL)
 		item = item->up;
 	    }
 	  break;
@@ -548,7 +548,7 @@ menu_driver(MENU *menu, int c)
 	result = E_UNKNOWN_COMMAND;
     }
 
-  if (item == 0)
+  if (item == NULL)
     {
       result = E_BAD_STATE;
     }
diff --git a/menu/m_global.c b/menu/m_global.c
index 4bc8ef8fc..f50b2c805 100644
--- a/menu/m_global.c
+++ b/menu/m_global.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_global.c,v 1.34 2023/09/16 16:39:26 tom Exp $")
+MODULE_ID("$Id: m_global.c,v 1.35 2024/12/07 23:02:27 tom Exp $")
 
 static char mark[] = "-";
 /* *INDENT-OFF* */
@@ -256,13 +256,13 @@ _nc_Calculate_Text_Width(const TEXT *item /*FIXME: limit length */ )
   int result = item->length;
 
   T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item));
-  if (result != 0 && item->str != 0)
+  if (result != 0 && item->str != NULL)
     {
-      int count = (int)mbstowcs(0, item->str, 0);
-      wchar_t *temp = 0;
+      int count = (int)mbstowcs(NULL, item->str, 0);
+      wchar_t *temp = NULL;
 
       if (count > 0
-	  && (temp = typeMalloc(wchar_t, 2 + count)) != 0)
+	  && (temp = typeMalloc(wchar_t, 2 + count)) != NULL)
 	{
 	  int n;
 
@@ -296,7 +296,7 @@ calculate_actual_width(MENU *menu, bool name)
 
   assert(menu && menu->items);
 
-  if (menu->items != 0)
+  if (menu->items != NULL)
     {
       ITEM **items;
 
diff --git a/menu/m_item_new.c b/menu/m_item_new.c
index a4d85098f..1af18a2fc 100644
--- a/menu/m_item_new.c
+++ b/menu/m_item_new.c
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: m_item_new.c,v 1.39 2024/11/23 19:16:50 tom Exp $")
+MODULE_ID("$Id: m_item_new.c,v 1.40 2024/12/07 22:01:57 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -63,13 +63,13 @@ Is_Printable_String(const char *s)
   bool result = TRUE;
 
 #if USE_WIDEC_SUPPORT
-  int count = (int)mbstowcs(0, s, 0);
-  wchar_t *temp = 0;
+  int count = (int)mbstowcs(NULL, s, 0);
+  wchar_t *temp = NULL;
 
   assert(s);
 
   if (count > 0
-      && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != 0)
+      && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != NULL)
     {
       int n;
 
@@ -231,7 +231,7 @@ set_menu_mark(MENU *menu, const char *mark)
 	  else
 	    {
 	      menu->mark = old_mark;
-	      menu->marklen = (short)((old_mark != 0) ? strlen(old_mark) : 0);
+	      menu->marklen = (short)((old_mark != NULL) ? strlen(old_mark) : 0);
 	      RETURN(E_SYSTEM_ERROR);
 	    }
 	}
diff --git a/menu/m_pattern.c b/menu/m_pattern.c
index 6fbef236f..5eb6119f8 100644
--- a/menu/m_pattern.c
+++ b/menu/m_pattern.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_pattern.c,v 1.20 2021/06/17 21:20:30 tom Exp $")
+MODULE_ID("$Id: m_pattern.c,v 1.21 2024/12/07 23:00:37 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -57,7 +57,7 @@ menu_pattern(const MENU *menu)
   static char empty[] = "";
 
   T((T_CALLED("menu_pattern(%p)"), (const void *)menu));
-  returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : 0);
+  returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : NULL);
 }
 
 /*---------------------------------------------------------------------------
diff --git a/menu/m_req_name.c b/menu/m_req_name.c
index c72116fa4..d4af02d0d 100644
--- a/menu/m_req_name.c
+++ b/menu/m_req_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_req_name.c,v 1.27 2021/06/17 21:11:08 tom Exp $")
+MODULE_ID("$Id: m_req_name.c,v 1.28 2024/12/07 23:00:37 tom Exp $")
 
 #define DATA(s) { s }
 
@@ -106,7 +106,7 @@ menu_request_by_name(const char *str)
 
   T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str)));
 
-  if (str != 0 && (i = strlen(str)) != 0)
+  if (str != NULL && (i = strlen(str)) != 0)
     {
       char buf[16];
 
diff --git a/menu/mf_common.h b/menu/mf_common.h
index 9b8d94a4d..c54e8cdf7 100644
--- a/menu/mf_common.h
+++ b/menu/mf_common.h
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: mf_common.h,v 0.26 2024/11/30 21:41:20 tom Exp $ */
+/* $Id: mf_common.h,v 0.27 2024/12/07 22:01:18 tom Exp $ */
 
 /* Common internal header for menu and form library */
 
@@ -88,7 +88,7 @@ extern int errno;
 
 /* Call object hook */
 #define Call_Hook( object, handler ) \
-   if ( (object) != 0 && ((object)->handler) != (void *) 0 )\
+   if ( (object) != NULL && ((object)->handler) != (void *) 0 )\
    {\
 	SetStatus(object, _IN_DRIVER);\
 	(object)->handler(object);\
diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index b3d04ee77..545661f7e 100644
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.51 2020/02/02 23:34:34 tom Exp $
+# $Id: MKkeyname.awk,v 1.53 2024/12/07 21:09:39 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -59,7 +59,7 @@ END {
 	if (bigstrings) {
 		printf "\t{ -1, 0 }};\n"
 		print ""
-		print "static const char key_names[] = "names";"
+		print "static const char key_names[] ="names";"
 	} else {
 		printf "\t{ 0, 0 }};\n"
 	}
@@ -72,7 +72,7 @@ END {
 	print "safe_keyname (SCREEN *sp, int c)"
 	print "{"
 	print "	char name[20];"
-	print "	NCURSES_CONST char *result = 0;"
+	print "	NCURSES_CONST char *result = NULL;"
 	print ""
 	print "	if (c == -1) {"
 	print "		result = \"-1\";"
@@ -86,7 +86,7 @@ END {
 		print "			}"
 		print "		}"
 	} else {
-		print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
+		print "		for (i = 0; _nc_key_names[i].name != NULL; i++) {"
 		print "			if (_nc_key_names[i].code == c) {"
 		print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
 		print "				break;"
@@ -94,12 +94,12 @@ END {
 		print "		}"
 	}
 	print ""
-	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
-	print "			if (MyTable == 0)"
+	print "		if (result == NULL && (c >= 0 && c < SIZEOF_TABLE)) {"
+	print "			if (MyTable == NULL)"
 	print "				MyTable = typeCalloc(char *, SIZEOF_TABLE);"
 	print ""
-	print "			if (MyTable != 0) {"
-	print "				int m_prefix = (sp == 0 || sp->_use_meta);"
+	print "			if (MyTable != NULL) {"
+	print "				int m_prefix = (sp == NULL || sp->_use_meta);"
 	print ""
 	print "				/* if sense of meta() changed, discard cached data */"
 	print "				if (MyInit != (m_prefix + 1)) {"
@@ -112,7 +112,7 @@ END {
 	print "				}"
 	print ""
 	print "				/* create and cache result as needed */"
-	print "				if (MyTable[c] == 0) {"
+	print "				if (MyTable[c] == NULL) {"
 	print "					int cc = c;"
 	print "					char *p = name;"
 	print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))"
@@ -132,22 +132,22 @@ END {
 	print "				result = MyTable[c];"
 	print "			}"
 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
-	print "		} else if (result == 0 && HasTerminal(sp)) {"
+	print "		} else if (result == NULL && HasTerminal(sp)) {"
 	print "			int j, k;"
 	print "			char * bound;"
 	print "			TERMTYPE2 *tp = &TerminalType(TerminalOf(sp));"
 	print "			unsigned save_trace = _nc_tracing;"
 	print ""
 	print "			_nc_tracing = 0;	/* prevent recursion via keybound() */"
-	print "			for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {"
+	print "			for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != NULL; ++j) {"
 	print "				for(k = STRCOUNT; k < (int) NUM_STRINGS(tp);  k++) {"
-	print "					if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {"
+	print "					if (tp->Strings[k] != NULL && !strcmp(bound, tp->Strings[k])) {"
 	print "						result = ExtStrname(tp, k, strnames);"
 	print "						break;"
 	print "					}"
 	print "				}"
 	print "				free(bound);"
-	print "				if (result != 0)"
+	print "				if (result != NULL)"
 	print "					break;"
 	print "			}"
 	print "			_nc_tracing = save_trace;"
@@ -166,7 +166,7 @@ END {
 	print "#if NO_LEAKS"
 	print "void _nc_keyname_leaks(void)"
 	print "{"
-	print "	if (MyTable != 0) {"
+	print "	if (MyTable != NULL) {"
 	print "		int j;"
 	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
 	print "			FreeIfNeeded(MyTable[j]);"
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 5b53ec67c..bbdc869ac 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.74 2024/09/22 20:41:58 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.75 2024/12/07 21:50:24 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
@@ -188,6 +188,9 @@ if test "$USE" = generated ; then
 cat >$ED4 <<EOF
 	s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
 	/attr_[sg]et.* z)/s,z),z GCC_UNUSED),
+	s/\(((\)0\([ ]*!=[ ]*(const void\)/\1NULL\2/g
+	/returnCode(wborder_set/s,0,NULL,g
+	/returnWin/s,0,NULL,
 EOF
 else
 cat >$ED4 <<EOF
diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk
index e5362bd60..c8f669661 100644
--- a/ncurses/base/MKunctrl.awk
+++ b/ncurses/base/MKunctrl.awk
@@ -1,4 +1,4 @@
-# $Id: MKunctrl.awk,v 1.30 2024/02/03 21:09:14 tom Exp $
+# $Id: MKunctrl.awk,v 1.31 2024/12/07 21:06:39 tom Exp $
 ##############################################################################
 # Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 1998-2012,2017 Free Software Foundation, Inc.                    #
@@ -135,7 +135,7 @@ END	{
 
 		print ""
 		if (bigstrings) {
-			print "static const char unctrl_blob[] = "blob";"
+			print "static const char unctrl_blob[] ="blob";"
 			print ""
 			stringname = "unctrl_blob + unctrl"
 		} else {
@@ -147,7 +147,7 @@ END	{
 		print  "\t(void) sp;"
 		print  "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
 		print  "#if NCURSES_EXT_FUNCS"
-		print  "\t\tif ((sp != 0)"
+		print  "\t\tif ((sp != NULL)"
 		print  "\t\t && (sp->_legacy_coding > 1)"
 		print  "\t\t && (check >= 128)"
 		print  "\t\t && (check < 160))"
@@ -156,7 +156,7 @@ END	{
 		print  "\t\tif ((check >= 160)"
 		print  "\t\t && (check < 256)"
 		print  "\t\t && !_nc_unicode_locale()"
-		print  "\t\t && ((sp != 0)"
+		print  "\t\t && ((sp != NULL)"
 		print  "\t\t  && ((sp->_legacy_coding > 0)"
 		print  "\t\t   || (sp->_legacy_coding == 0"
 		print  "\t\t       && isprint(check)))))"
@@ -165,7 +165,7 @@ END	{
 		print  "#endif /* NCURSES_EXT_FUNCS */"
 		printf "\t\t\tresult = %s_table[check];\n", stringname;
 		print  "\t} else {"
-		print  "\t\tresult = 0;"
+		print  "\t\tresult = NULL;"
 		print  "\t}"
 		print  "\treturn (NCURSES_CONST char *)result;"
 		print  "}"
diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c
index fb9ae36be..2ef5fad40 100644
--- a/ncurses/base/define_key.c
+++ b/ncurses/base/define_key.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: define_key.c,v 1.22 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: define_key.c,v 1.23 2024/12/07 21:24:18 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
@@ -42,7 +42,7 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
     int code = ERR;
 
     T((T_CALLED("define_key(%p, %s,%d)"), (void *) SP_PARM, _nc_visbuf(str), keycode));
-    if (SP_PARM == 0 || !HasTInfoTerminal(SP_PARM)) {
+    if (SP_PARM == NULL || !HasTInfoTerminal(SP_PARM)) {
 	code = ERR;
     } else if (keycode > 0) {
 	unsigned ukey = (unsigned) keycode;
@@ -53,13 +53,13 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
 #define CallHasKey(keycode) NCURSES_SP_NAME(has_key)(NCURSES_SP_ARGx keycode)
 #endif
 
-	if (str != 0) {
+	if (str != NULL) {
 	    NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0);
 	} else if (CallHasKey(keycode)) {
 	    while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
 		code = OK;
 	}
-	if (str != 0) {
+	if (str != NULL) {
 	    if (NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx str) == 0) {
 		if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) {
 		    code = OK;
diff --git a/ncurses/base/key_defined.c b/ncurses/base/key_defined.c
index 147e5fe2d..28939edeb 100644
--- a/ncurses/base/key_defined.c
+++ b/ncurses/base/key_defined.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2003-2006,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: key_defined.c,v 1.11 2023/06/24 15:36:32 tom Exp $")
+MODULE_ID("$Id: key_defined.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
 
 static int
 find_definition(TRIES * tree, const char *str)
@@ -43,9 +43,9 @@ find_definition(TRIES * tree, const char *str)
     int result = OK;
 
     if (VALID_STRING(str) && *str != '\0') {
-	for (ptr = tree; ptr != 0; ptr = ptr->sibling) {
+	for (ptr = tree; ptr != NULL; ptr = ptr->sibling) {
 	    if (UChar(*str) == UChar(ptr->ch)) {
-		if (str[1] == '\0' && ptr->child != 0) {
+		if (str[1] == '\0' && ptr->child != NULL) {
 		    result = ERR;
 		} else if ((result = find_definition(ptr->child, str + 1))
 			   == OK) {
@@ -72,7 +72,7 @@ NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str)
     int code = ERR;
 
     T((T_CALLED("key_defined(%p, %s)"), (void *) SP_PARM, _nc_visbuf(str)));
-    if (SP_PARM != 0 && str != 0) {
+    if (SP_PARM != NULL && str != NULL) {
 	code = find_definition(SP_PARM->_keytry, str);
     }
 
diff --git a/ncurses/base/keybound.c b/ncurses/base/keybound.c
index bbd912a0d..9dc404670 100644
--- a/ncurses/base/keybound.c
+++ b/ncurses/base/keybound.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1999-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keybound.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: keybound.c,v 1.13 2024/12/07 21:24:18 tom Exp $")
 
 /*
  * Returns the count'th string definition which is associated with the
@@ -43,10 +43,10 @@ MODULE_ID("$Id: keybound.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count)
 {
-    char *result = 0;
+    char *result = NULL;
 
     T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count));
-    if (SP_PARM != 0 && code >= 0) {
+    if (SP_PARM != NULL && code >= 0) {
 	result = _nc_expand_try(SP_PARM->_keytry,
 				(unsigned) code,
 				&count,
diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c
index 945228aa8..3b2953f55 100644
--- a/ncurses/base/keyok.c
+++ b/ncurses/base/keyok.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keyok.c,v 1.17 2021/06/17 21:26:02 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.18 2024/12/07 21:24:18 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -63,7 +63,7 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
 
 	    if (flag) {
 		while ((s = _nc_expand_try(SP_PARM->_key_ok,
-					   ch, &count, (size_t) 0)) != 0) {
+					   ch, &count, (size_t) 0)) != NULL) {
 		    if (_nc_remove_key(&(SP_PARM->_key_ok), ch)) {
 			code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
 			free(s);
@@ -76,7 +76,7 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
 		}
 	    } else {
 		while ((s = _nc_expand_try(SP_PARM->_keytry,
-					   ch, &count, (size_t) 0)) != 0) {
+					   ch, &count, (size_t) 0)) != NULL) {
 		    if (_nc_remove_key(&(SP_PARM->_keytry), ch)) {
 			code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
 			free(s);
diff --git a/ncurses/base/legacy_coding.c b/ncurses/base/legacy_coding.c
index a71aee014..3da1414d8 100644
--- a/ncurses/base/legacy_coding.c
+++ b/ncurses/base/legacy_coding.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2005,2009 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: legacy_coding.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: legacy_coding.c,v 1.7 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level)
@@ -42,7 +42,7 @@ NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level)
     int result = ERR;
 
     T((T_CALLED("use_legacy_coding(%p,%d)"), (void *) SP_PARM, level));
-    if (level >= 0 && level <= 2 && SP_PARM != 0) {
+    if (level >= 0 && level <= 2 && SP_PARM != NULL) {
 	result = SP_PARM->_legacy_coding;
 	SP_PARM->_legacy_coding = level;
     }
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 93c51d05a..634714a62 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.143 2024/11/30 21:18:07 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.144 2024/12/07 17:18:07 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -451,14 +451,14 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     if ((AttrOf(ch) & A_ALTCHARSET)
 	|| (
 #if USE_WIDEC_SUPPORT
-	       (sp != 0 && sp->_legacy_coding) &&
+	       (sp != NULL && sp->_legacy_coding) &&
 #endif
 	       s[1] == 0
 	)
 	|| (
 	       (isprint(UChar(t)) && !iscntrl(UChar(t)))
 #if USE_WIDEC_SUPPORT
-	       || ((sp == 0 || !sp->_legacy_coding) &&
+	       || ((sp == NULL || !sp->_legacy_coding) &&
 		   (WINDOW_EXT(win, addch_used)
 		    || !_nc_is_charable(CharOf(ch))))
 #endif
diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index a3753af0d..7c0fc6b1c 100644
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.62 2023/11/21 21:47:23 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.63 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -55,7 +55,7 @@ waddnstr(WINDOW *win, const char *astr, int n)
 
     T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
 
-    if (win && (str != 0) && (n != 0)) {
+    if (win && (str != NULL) && (n != 0)) {
 	bool explicit = (n > 0);
 
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
@@ -123,7 +123,7 @@ NCURSES_EXPORT(int)
 _nc_wchstrlen(const cchar_t *s)
 {
     int result = 0;
-    if (s != 0) {
+    if (s != NULL) {
 	while (CharOf(s[result]) != L'\0') {
 	    result++;
 	}
@@ -230,7 +230,7 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 
     T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
 
-    if (win && (str != 0) && (n != 0)) {
+    if (win && (str != NULL) && (n != 0)) {
 	bool explicit = (n > 0);
 
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index b1a60b923..dc8b3e4d7 100644
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_beep.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_beep.c,v 1.19 2024/12/07 20:00:48 tom Exp $")
 
 /*
  *	beep()
@@ -69,7 +69,7 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
 #else
     /* FIXME: should make sure that we are not in altchar mode */
-    if (cur_term == 0) {
+    if (cur_term == NULL) {
 	res = ERR;
     } else if (bell) {
 	res = NCURSES_PUTP2_FLUSH("bell", bell);
diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index 4f9908083..0358f4a2d 100644
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_bkgd.c,v 1.63 2021/05/08 14:58:12 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.64 2024/12/07 20:00:48 tom Exp $")
 
 static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
 
@@ -136,7 +136,7 @@ _nc_background(WINDOW *win, const ARG_CH_T ch, bool narrow)
 #define TraceChar(c) _tracechar(CharOf(c))
 #endif
 
-    if (SP == 0) {
+    if (SP == NULL) {
 	;
     } else if (win) {
 	NCURSES_CH_T new_bkgd = CHDEREF(ch);
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index 4d3e69ea8..d34e9d5ea 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.152 2024/11/23 18:27:25 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.153 2024/12/07 17:28:13 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -146,13 +146,13 @@ NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette = hls_palette;
 static int
 default_fg(NCURSES_SP_DCL0)
 {
-    return (SP_PARM != 0) ? SP_PARM->_default_fg : COLOR_WHITE;
+    return (SP_PARM != NULL) ? SP_PARM->_default_fg : COLOR_WHITE;
 }
 
 static int
 default_bg(NCURSES_SP_DCL0)
 {
-    return SP_PARM != 0 ? SP_PARM->_default_bg : COLOR_BLACK;
+    return SP_PARM != NULL ? SP_PARM->_default_bg : COLOR_BLACK;
 }
 #else
 #define default_fg(sp) COLOR_WHITE
@@ -273,7 +273,7 @@ init_direct_colors(NCURSES_SP_DCL0)
 	    result->bits.red = UChar(n);
 	    result->bits.green = UChar(n);
 	    result->bits.blue = UChar(n);
-	} else if ((s = tigetstr(name)) != 0 && VALID_STRING(s)) {
+	} else if ((s = tigetstr(name)) != NULL && VALID_STRING(s)) {
 	    int red = n;
 	    int green = n;
 	    int blue = width - (2 * n);
@@ -312,7 +312,7 @@ reset_color_pair(NCURSES_SP_DCL0)
     bool result = FALSE;
 
     (void) SP_PARM;
-    if (orig_pair != 0) {
+    if (orig_pair != NULL) {
 	(void) NCURSES_PUTP2("orig_pair", orig_pair);
 	result = TRUE;
     }
@@ -339,7 +339,7 @@ NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_DCL0)
 #ifdef USE_TERM_DRIVER
     result = CallDriver(SP_PARM, td_rescolors);
 #else
-    if (orig_colors != 0) {
+    if (orig_colors != NULL) {
 	NCURSES_PUTP2("orig_colors", orig_colors);
 	result = TRUE;
     }
@@ -362,7 +362,7 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
 
     T((T_CALLED("start_color(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM == 0) {
+    if (SP_PARM == NULL) {
 	result = ERR;
     } else if (SP_PARM->_coloron) {
 	result = OK;
@@ -406,12 +406,12 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
 #endif
 
 	    ReservePairs(SP_PARM, 16);
-	    if (SP_PARM->_color_pairs != 0) {
+	    if (SP_PARM->_color_pairs != NULL) {
 		if (init_direct_colors(NCURSES_SP_ARG)) {
 		    result = OK;
 		} else {
 		    TYPE_CALLOC(color_t, maxcolors, SP_PARM->_color_table);
-		    if (SP_PARM->_color_table != 0) {
+		    if (SP_PARM->_color_table != NULL) {
 			MakeColorPair(SP_PARM->_color_pairs[0],
 				      default_fg(NCURSES_SP_ARG),
 				      default_bg(NCURSES_SP_ARG));
@@ -425,7 +425,7 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
 		       COLORS, COLOR_PAIRS));
 
 		    SP_PARM->_coloron = 1;
-		} else if (SP_PARM->_color_pairs != 0) {
+		} else if (SP_PARM->_color_pairs != NULL) {
 		    FreeAndNull(SP_PARM->_color_pairs);
 		}
 	    }
@@ -526,13 +526,13 @@ _nc_reserve_pairs(SCREEN *sp, int want)
     if (have > sp->_pair_limit)
 	have = sp->_pair_limit;
 
-    if (sp->_color_pairs == 0) {
+    if (sp->_color_pairs == NULL) {
 	TYPE_CALLOC(colorpair_t, have, sp->_color_pairs);
     } else if (have > sp->_pair_alloc) {
 #if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS
 	colorpair_t *next;
 
-	if ((next = typeCalloc(colorpair_t, have)) == 0)
+	if ((next = typeCalloc(colorpair_t, have)) == NULL)
 	    _nc_err_abort(MSG_NO_MEMORY);
 	memcpy(next, sp->_color_pairs, (size_t) sp->_pair_alloc * sizeof(*next));
 	_nc_copy_pairs(sp, next, sp->_color_pairs, sp->_pair_alloc);
@@ -546,7 +546,7 @@ _nc_reserve_pairs(SCREEN *sp, int want)
 	}
 #endif
     }
-    if (sp->_color_pairs != 0) {
+    if (sp->_color_pairs != NULL) {
 	sp->_pair_alloc = have;
     }
 }
@@ -713,7 +713,7 @@ _nc_init_color(SCREEN *sp, int color, int r, int g, int b)
        color,
        r, g, b));
 
-    if (sp == 0 || sp->_direct_color.value)
+    if (sp == NULL || sp->_direct_color.value)
 	returnCode(result);
 
     maxcolors = MaxColors;
@@ -837,7 +837,7 @@ _nc_color_content(SCREEN *sp, int color, int *r, int *g, int *b)
        (void *) g,
        (void *) b));
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	int maxcolors = MaxColors;
 
 	if (color >= 0 && OkColorHi(color) && sp->_coloron) {
@@ -1008,14 +1008,14 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 				    TIPARM_1(set_color_pair, pair),
 				    1, outc);
 	    return;
-	} else if (SP_PARM != 0) {
+	} else if (SP_PARM != NULL) {
 	    if (_nc_pair_content(SP_PARM, pair, &fg, &bg) == ERR)
 		return;
 	}
     }
 
     if (old_pair >= 0
-	&& SP_PARM != 0
+	&& SP_PARM != NULL
 	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
@@ -1115,11 +1115,11 @@ NCURSES_SP_NAME(extended_pair_content) (NCURSES_SP_DCLx
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(reset_color_pairs) (NCURSES_SP_DCL0)
 {
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	if (SP_PARM->_color_pairs) {
 	    _nc_free_ordered_pairs(SP_PARM);
 	    free(SP_PARM->_color_pairs);
-	    SP_PARM->_color_pairs = 0;
+	    SP_PARM->_color_pairs = NULL;
 	    SP_PARM->_pair_alloc = 0;
 	    ReservePairs(SP_PARM, 16);
 	    clearok(CurScreen(SP_PARM), TRUE);
diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c
index 387edef61..d200b9f09 100644
--- a/ncurses/base/lib_colorset.c
+++ b/ncurses/base/lib_colorset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_colorset.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_colorset.c,v 1.17 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts)
@@ -53,7 +53,7 @@ wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts)
     T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair));
     set_extended_pair(opts, color_pair);
     if (win
-	&& (SP != 0)
+	&& (SP != NULL)
 	&& (color_pair >= 0)
 	&& (color_pair < SP->_pair_limit)) {
 	TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win)));
diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 28b4c806d..855671ca7 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.28 2024/07/27 18:57:35 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.29 2024/12/07 17:28:13 tom Exp $")
 
 static bool
 cannot_delete(const WINDOW *win)
@@ -80,7 +80,7 @@ delwin(WINDOW *win)
     T((T_CALLED("delwin(%p)"), (void *) win));
 
     if (_nc_try_global(curses) == 0) {
-	if (win == 0
+	if (win == NULL
 	    || cannot_delete(win)) {
 	    result = ERR;
 	} else if (IS_PAD(win)) {
@@ -92,7 +92,7 @@ delwin(WINDOW *win)
 #endif
 	    if (IS_SUBWIN(win)) {
 		touchwin(win->_parent);
-	    } else if (CurScreen(SP_PARM) != 0) {
+	    } else if (CurScreen(SP_PARM) != NULL) {
 		touchwin(CurScreen(SP_PARM));
 	    }
 	    result = _nc_freewin(win);
diff --git a/ncurses/base/lib_dft_fgbg.c b/ncurses/base/lib_dft_fgbg.c
index 4dd43bb1b..99b70b0b1 100644
--- a/ncurses/base/lib_dft_fgbg.c
+++ b/ncurses/base/lib_dft_fgbg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.31 2021/04/03 22:27:18 tom Exp $")
+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.32 2024/12/07 20:00:48 tom Exp $")
 
 /*
  * Modify the behavior of color-pair 0 so that the library doesn't assume that
@@ -69,7 +69,7 @@ NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg)
     int code = ERR;
 
     T((T_CALLED("assume_default_colors(%p,%d,%d)"), (void *) SP_PARM, fg, bg));
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 #ifdef USE_TERM_DRIVER
 	code = CallDriver_2(SP_PARM, td_defaultcolors, fg, bg);
 #else
@@ -79,7 +79,7 @@ NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg)
 	    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
 	    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
 	    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
-	    if (SP_PARM->_color_pairs != 0) {
+	    if (SP_PARM->_color_pairs != NULL) {
 		bool save = SP_PARM->_default_color;
 		SP_PARM->_assumed_color = TRUE;
 		SP_PARM->_default_color = TRUE;
diff --git a/ncurses/base/lib_echo.c b/ncurses/base/lib_echo.c
index de7832f4a..381f51fbe 100644
--- a/ncurses/base/lib_echo.c
+++ b/ncurses/base/lib_echo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,13 +45,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_echo.c,v 1.10 2023/04/29 18:57:12 tom Exp $")
+MODULE_ID("$Id: lib_echo.c,v 1.11 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("echo(%p)"), (void *) SP_PARM));
-    if (0 == SP_PARM)
+    if (NULL == SP_PARM)
 	returnCode(ERR);
     IsEcho(SP_PARM) = TRUE;
     returnCode(OK);
@@ -69,7 +69,7 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("noecho(%p)"), (void *) SP_PARM));
-    if (0 == SP_PARM)
+    if (NULL == SP_PARM)
 	returnCode(ERR);
     IsEcho(SP_PARM) = FALSE;
     returnCode(OK);
diff --git a/ncurses/base/lib_erase.c b/ncurses/base/lib_erase.c
index aa9437a19..461acddaf 100644
--- a/ncurses/base/lib_erase.c
+++ b/ncurses/base/lib_erase.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_erase.c,v 1.20 2022/09/03 21:40:27 tom Exp $")
+MODULE_ID("$Id: lib_erase.c,v 1.21 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 werase(WINDOW *win)
@@ -71,7 +71,7 @@ werase(WINDOW *win)
 	     */
 	    if_WIDEC({
 		if (isWidecExt(start[0])) {
-		    int x = (win->_parent != 0) ? (win->_begx) : 0;
+		    int x = (win->_parent != NULL) ? (win->_begx) : 0;
 		    while (x-- > 0) {
 			if (isWidecBase(start[-1])) {
 			    --start;
diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 0a3ee1254..304ef8f6a 100644
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -40,7 +40,7 @@
 extern int malloc_errfd;	/* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.77 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.78 2024/12/07 18:00:11 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -54,11 +54,11 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
     T((T_CALLED("_nc_freeall()")));
 #if NO_LEAKS
     _nc_globals.leak_checking = TRUE;
-    if (SP_PARM != 0) {
-	if (SP_PARM->_oldnum_list != 0) {
+    if (SP_PARM != NULL) {
+	if (SP_PARM->_oldnum_list != NULL) {
 	    FreeAndNull(SP_PARM->_oldnum_list);
 	}
-	if (SP_PARM->_panelHook.destroy != 0) {
+	if (SP_PARM->_panelHook.destroy != NULL) {
 	    SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel);
 	}
 #if NCURSES_EXT_COLORS
@@ -66,10 +66,10 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
 #endif
     }
 #endif
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	_nc_lock_global(curses);
 
-	while (WindowList(SP_PARM) != 0) {
+	while (WindowList(SP_PARM) != NULL) {
 	    WINDOWLIST *p, *q;
 	    bool deleted = FALSE;
 
@@ -119,7 +119,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
 	_nc_unlock_global(curses);
     }
 
-    (void) _nc_printf_string(0, empty_va);
+    (void) _nc_printf_string(NULL, empty_va);
 #ifdef TRACE
     (void) _nc_trace_buf(-1, (size_t) 0);
 #endif
diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 3d9a06745..a8d720c30 100644
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -44,7 +44,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.147 2024/08/31 15:54:49 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.148 2024/12/07 17:40:33 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -414,7 +414,7 @@ recur_wgetnstr(WINDOW *win, char *buf)
     SCREEN *sp = _nc_screen_of(win);
     int rc;
 
-    if (sp != 0) {
+    if (sp != NULL) {
 #ifdef USE_PTHREADS
 	if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
 	    SCREEN *save_SP;
@@ -457,7 +457,7 @@ _nc_wgetch(WINDOW *win,
     *result = 0;
 
     sp = _nc_screen_of(win);
-    if (win == 0 || sp == 0) {
+    if (win == NULL || sp == NULL) {
 	returnCode(ERR);
     }
 
diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 6b9149135..10d433591 100644
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -46,7 +46,7 @@
 #include <sys/termio.h>		/* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.48 2020/09/07 14:26:48 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.49 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
@@ -90,7 +90,7 @@ initscr(void)
 	    }
 	}
 #endif
-	if (newterm(name, stdout, stdin) == 0) {
+	if (newterm(name, stdout, stdin) == NULL) {
 	    fprintf(stderr, "Error opening terminal: %s.\n", name);
 	    ExitProgram(EXIT_FAILURE);
 	}
diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c
index f1ca96d36..430bcf210 100644
--- a/ncurses/base/lib_insch.c
+++ b/ncurses/base/lib_insch.c
@@ -44,7 +44,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insch.c,v 1.38 2024/07/27 19:23:21 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.39 2024/12/07 17:40:33 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -85,7 +85,7 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 #endif
 	       (isprint(ch8) ||
 		(ChAttrOf(ch) & A_ALTCHARSET) ||
-		(sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) {
+		(sp != NULL && sp->_legacy_coding && !iscntrl(ch8)))) {
 	    if (win->_curx <= win->_maxx) {
 		struct ldat *line = &(win->_line[win->_cury]);
 		NCURSES_CH_T *end = &(line->text[win->_curx]);
@@ -151,7 +151,7 @@ winsch(WINDOW *win, chtype c)
 
     T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
 
-    if (win != 0) {
+    if (win != NULL) {
 	NCURSES_SIZE_T oy = win->_cury;
 	NCURSES_SIZE_T ox = win->_curx;
 
diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c
index caec48e8e..b3eb216b9 100644
--- a/ncurses/base/lib_insnstr.c
+++ b/ncurses/base/lib_insnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2004-2009,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insnstr.c,v 1.10 2023/11/21 21:58:03 tom Exp $")
+MODULE_ID("$Id: lib_insnstr.c,v 1.11 2024/12/07 20:00:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)
@@ -51,7 +51,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 
     T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n));
 
-    if (win != 0 && str != 0 && n != 0) {
+    if (win != NULL && str != NULL && n != 0) {
 	SCREEN *sp = _nc_screen_of(win);
 #if USE_WIDEC_SUPPORT
 	/*
@@ -64,7 +64,7 @@ winsnstr(WINDOW *win, const char *s, int n)
 	if (sp->_screen_unicode) {
 	    size_t nn = (n > 0) ? (size_t) n : strlen(s);
 	    wchar_t *buffer = typeMalloc(wchar_t, nn + 1);
-	    if (buffer != 0) {
+	    if (buffer != NULL) {
 		mbstate_t state;
 		size_t n3;
 		init_mb(state);
diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index b483785cd..c9016b659 100644
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.27 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.28 2024/12/07 17:53:39 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
@@ -72,17 +72,17 @@ winnstr(WINDOW *win, char *str, int n)
 		wchar_t *wch;
 		int n2;
 
-		n2 = getcchar(cell, 0, 0, 0, 0);
+		n2 = getcchar(cell, NULL, NULL, NULL, NULL);
 		if (n2 > 0
-		    && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != 0) {
+		    && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != NULL) {
 		    bool done = FALSE;
 
-		    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
+		    if (getcchar(cell, wch, &attrs, &pair, NULL) == OK) {
 			mbstate_t state;
 			size_t n3;
 
 			init_mb(state);
-			n3 = wcstombs(0, wch, (size_t) 0);
+			n3 = wcstombs(NULL, wch, (size_t) 0);
 			if (!isEILSEQ(n3) && (n3 != 0) && (n3 <= MB_LEN_MAX)) {
 			    size_t need = n3 + 10 + (size_t) i;
 			    int have = (int) n3 + i;
@@ -90,7 +90,7 @@ winnstr(WINDOW *win, char *str, int n)
 			    /* check for loop-done as well as overflow */
 			    if (have > n || (int) need <= 0) {
 				done = TRUE;
-			    } else if ((tmp = typeCalloc(char, need)) == 0) {
+			    } else if ((tmp = typeCalloc(char, need)) == NULL) {
 				done = TRUE;
 			    } else {
 				size_t i3;
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 949a9dab1..f9b3b67d3 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.202 2024/11/23 19:06:20 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.203 2024/12/07 17:40:33 tom Exp $")
 
 #include <tic.h>
 
@@ -391,7 +391,7 @@ init_xterm_mouse(SCREEN *sp)
     sp->_mouse_xtermcap = tigetstr("XM");
     if (VALID_STRING(sp->_mouse_xtermcap)) {
 	char *code = strstr(sp->_mouse_xtermcap, "[?");
-	if (code != 0) {
+	if (code != NULL) {
 	    code += 2;
 	    while ((*code >= '0') && (*code <= '9')) {
 		char *next = code;
@@ -761,7 +761,7 @@ initialize_mousetype(SCREEN *sp)
     /* we know how to recognize mouse events under "xterm" */
     if (NonEmpty(key_mouse)) {
 	init_xterm_mouse(sp);
-    } else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) {
+    } else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
 	if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
 	    init_xterm_mouse(sp);
     }
@@ -778,7 +778,7 @@ _nc_mouse_init(SCREEN *sp)
 
     T((T_CALLED("_nc_mouse_init(%p)"), (void *) sp));
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	if (!sp->_mouse_initialized) {
 	    int i;
 
@@ -1834,10 +1834,10 @@ NCURSES_SP_NAME(getmouse) (NCURSES_SP_DCLx MEVENT * aevent)
 
     T((T_CALLED("getmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent));
 
-    if ((aevent != 0) &&
-	(SP_PARM != 0) &&
+    if ((aevent != NULL) &&
+	(SP_PARM != NULL) &&
 	(SP_PARM->_mouse_type != M_NONE) &&
-	(eventp = SP_PARM->_mouse_eventp) != 0) {
+	(eventp = SP_PARM->_mouse_eventp) != NULL) {
 	/* compute the current-event pointer */
 	MEVENT *prev = PREV(eventp);
 
@@ -1890,9 +1890,9 @@ NCURSES_SP_NAME(ungetmouse) (NCURSES_SP_DCLx MEVENT * aevent)
 
     T((T_CALLED("ungetmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent));
 
-    if (aevent != 0 &&
-	SP_PARM != 0 &&
-	(eventp = SP_PARM->_mouse_eventp) != 0) {
+    if (aevent != NULL &&
+	SP_PARM != NULL &&
+	(eventp = SP_PARM->_mouse_eventp) != NULL) {
 
 	/* stick the given event in the next-free slot */
 	*eventp = *aevent;
@@ -1926,7 +1926,7 @@ NCURSES_SP_NAME(mousemask) (NCURSES_SP_DCLx mmask_t newmask, mmask_t * oldmask)
        (unsigned long) newmask,
        (void *) oldmask));
 
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	if (oldmask)
 	    *oldmask = SP_PARM->_mouse_mask;
 
@@ -1988,7 +1988,7 @@ wenclose(const WINDOW *win, int y, int x)
 
     T((T_CALLED("wenclose(%p,%d,%d)"), (const void *) win, y, x));
 
-    if (win != 0) {
+    if (win != NULL) {
 	y -= win->_yoffset;
 	if (IS_PAD(win)) {
 	    if (win->_pad._pad_y >= 0 &&
@@ -2020,7 +2020,7 @@ NCURSES_SP_NAME(mouseinterval) (NCURSES_SP_DCLx int maxclick)
 
     T((T_CALLED("mouseinterval(%p,%d)"), (void *) SP_PARM, maxclick));
 
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	oldval = SP_PARM->_maxclick;
 	if (maxclick >= 0)
 	    SP_PARM->_maxclick = maxclick;
@@ -2044,7 +2044,7 @@ mouseinterval(int maxclick)
 NCURSES_EXPORT(bool)
 _nc_has_mouse(const SCREEN *sp)
 {
-    return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
+    return (((NULL == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
 }
 
 NCURSES_EXPORT(bool)
diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 0993312e6..15dd50daa 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -49,7 +49,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.106 2024/11/23 18:33:35 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.107 2024/12/07 17:41:36 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -175,12 +175,12 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 			  FILE *ifp)
 {
     int errret;
-    SCREEN *result = 0;
+    SCREEN *result = NULL;
     SCREEN *current;
     TERMINAL *its_term;
     FILE *_ofp = ofp ? ofp : stdout;
     FILE *_ifp = ifp ? ifp : stdin;
-    TERMINAL *new_term = 0;
+    TERMINAL *new_term = NULL;
 
     START_TRACE();
     T((T_CALLED("newterm(%p, \"%s\", %p,%p)"),
@@ -191,7 +191,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
 #if NCURSES_SP_FUNCS
     assert(SP_PARM != 0);
-    if (SP_PARM == 0)
+    if (SP_PARM == NULL)
 	returnSP(SP_PARM);
 #endif
 
@@ -199,7 +199,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
     _nc_lock_global(curses);
 
     current = CURRENT_SCREEN;
-    its_term = (current ? current->_term : 0);
+    its_term = (current ? current->_term : NULL);
 
 #if defined(EXP_WIN32_DRIVER)
     _setmode(fileno(_ifp), _O_BINARY);
@@ -214,7 +214,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 	int slk_format;
 	bool filter_mode;
 
-	_nc_set_screen(0);
+	_nc_set_screen(NULL);
 #ifdef USE_TERM_DRIVER
 	assert(new_term != 0);
 #endif
@@ -241,7 +241,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 						 filter_mode,
 						 slk_format) == ERR) {
 	    _nc_set_screen(current);
-	    result = 0;
+	    result = NULL;
 	} else {
 	    int value;
 	    int cols;
@@ -318,7 +318,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
 	    NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);		/* sets a field in the screen structure */
 
-	    SP_PARM->_keytry = 0;
+	    SP_PARM->_keytry = NULL;
 
 	    /* compute movement costs so we can do better move optimization */
 #ifdef USE_TERM_DRIVER
@@ -333,7 +333,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 	     * properly if we remove rmso or rmul.  Curses applications
 	     * shouldn't be looking at this detail.
 	     */
-#define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
+#define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode))
 	    SP_PARM->_use_rmso = SGR0_TEST(exit_standout_mode);
 	    SP_PARM->_use_rmul = SGR0_TEST(exit_underline_mode);
 #if USE_ITALIC
diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index ef9da9265..507ed7112 100644
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -44,7 +44,7 @@
 #include <curses.priv.h>
 #include <stddef.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.77 2024/09/28 15:55:56 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.78 2024/12/07 20:19:18 tom Exp $")
 
 #define window_is(name) ((sp)->_##name == win)
 
@@ -53,9 +53,9 @@ MODULE_ID("$Id: lib_newwin.c,v 1.77 2024/09/28 15:55:56 tom Exp $")
 		sp->_##name = 0
 #else
 #define remove_window(name) \
-		sp->_##name = 0; \
+		sp->_##name = NULL; \
 		if (win == name) \
-		    name = 0
+		    name = NULL
 #endif
 
 static void
@@ -64,7 +64,7 @@ remove_window_from_screen(WINDOW *win)
     SCREEN *sp;
 
 #ifdef USE_SP_WINDOWLIST
-    if ((sp = _nc_screen_of(win)) != 0) {
+    if ((sp = _nc_screen_of(win)) != NULL) {
 	if (window_is(curscr)) {
 	    remove_window(curscr);
 	} else if (window_is(stdscr)) {
@@ -99,17 +99,17 @@ _nc_freewin(WINDOW *win)
 
     T((T_CALLED("_nc_freewin(%p)"), (void *) win));
 
-    if (win != 0) {
+    if (win != NULL) {
 
 	if (_nc_nonsp_try_global(curses) == 0) {
 	    WINDOWLIST *p, *q;
 
-	    q = 0;
+	    q = NULL;
 	    for (each_window(sp, p)) {
 
 		if (&(p->win) == win) {
 		    remove_window_from_screen(win);
-		    if (q == 0)
+		    if (q == NULL)
 			WindowList(sp) = p->next;
 		    else
 			q->next = p->next;
@@ -150,8 +150,8 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
 	|| begx < 0
 	|| num_lines < 0
 	|| num_columns < 0
-	|| SP_PARM == 0)
-	returnWin(0);
+	|| SP_PARM == NULL)
+	returnWin(NULL);
 
     if (num_lines == 0)
 	num_lines = SP_PARM->_lines_avail - begy;
@@ -160,14 +160,14 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
 
     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx
 					num_lines, num_columns, begy, begx, 0);
-    if (win == 0)
-	returnWin(0);
+    if (win == NULL)
+	returnWin(NULL);
 
     for (i = 0; i < num_lines; i++) {
 	win->_line[i].text = typeCalloc(NCURSES_CH_T, (unsigned) num_columns);
-	if (win->_line[i].text == 0) {
+	if (win->_line[i].text == NULL) {
 	    (void) _nc_freewin(win);
-	    returnWin(0);
+	    returnWin(NULL);
 	}
 	for (ptr = win->_line[i].text;
 	     ptr < win->_line[i].text + num_columns;
@@ -207,11 +207,14 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
     /*
      * make sure window fits inside the original one
      */
-    if (begy < 0 || begx < 0 || orig == 0 || num_lines < 0 || num_columns < 0)
-	returnWin(0);
-    if (begy + num_lines > orig->_maxy + 1
+    if (begy < 0
+	|| begx < 0
+	|| orig == NULL
+	|| num_lines < 0
+	|| num_columns < 0
+	|| begy + num_lines > orig->_maxy + 1
 	|| begx + num_columns > orig->_maxx + 1)
-	returnWin(0);
+	returnWin(NULL);
 
     if (num_lines == 0)
 	num_lines = orig->_maxy + 1 - begy;
@@ -225,8 +228,8 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns,
 					orig->_begy + begy,
 					orig->_begx + begx, flags);
-    if (win == 0)
-	returnWin(0);
+    if (win == NULL)
+	returnWin(NULL);
 
     win->_pary = begy;
     win->_parx = begx;
@@ -244,10 +247,10 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 NCURSES_EXPORT(WINDOW *)
 subwin(WINDOW *w, int l, int c, int y, int x)
 {
-    WINDOW *result = 0;
+    WINDOW *result = NULL;
 
     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x));
-    if (w != 0) {
+    if (w != NULL) {
 	T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));
 
 	result = derwin(w, l, c, y - w->_begy, x - w->_begx);
@@ -271,20 +274,20 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
     T((T_CALLED("_nc_makenew(%p,%d,%d,%d,%d)"),
        (void *) SP_PARM, num_lines, num_columns, begy, begx));
 
-    if (SP_PARM == 0)
-	returnWin(0);
+    if (SP_PARM == NULL)
+	returnWin(NULL);
 
     if (!OK_DIMENSION(num_lines) || !OK_DIMENSION(num_columns))
-	returnWin(0);
+	returnWin(NULL);
 
-    if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
-	returnWin(0);
+    if ((wp = typeCalloc(WINDOWLIST, 1)) == NULL)
+	returnWin(NULL);
 
     win = &(wp->win);
 
-    if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
+    if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == NULL) {
 	free(wp);
-	returnWin(0);
+	returnWin(NULL);
     }
 
     _nc_nonsp_lock_global(curses);
@@ -315,7 +318,7 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
     win->_sync = 0;
     win->_parx = -1;
     win->_pary = -1;
-    win->_parent = 0;
+    win->_parent = NULL;
 
     win->_regtop = 0;
     win->_regbottom = (NCURSES_SIZE_T) (num_lines - 1);
@@ -382,18 +385,18 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
 NCURSES_EXPORT(WINDOW *)
 _nc_curscr_of(SCREEN *sp)
 {
-    return (sp == 0) ? NULL : CurScreen(sp);
+    return (sp == NULL) ? NULL : CurScreen(sp);
 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_newscr_of(SCREEN *sp)
 {
-    return (sp == 0) ? NULL : NewScreen(sp);
+    return (sp == NULL) ? NULL : NewScreen(sp);
 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_stdscr_of(SCREEN *sp)
 {
-    return (sp == 0) ? NULL : StdScreen(sp);
+    return (sp == NULL) ? NULL : StdScreen(sp);
 }
 #endif
diff --git a/ncurses/base/lib_nl.c b/ncurses/base/lib_nl.c
index 417b257d0..e11953191 100644
--- a/ncurses/base/lib_nl.c
+++ b/ncurses/base/lib_nl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_nl.c,v 1.14 2023/04/29 18:51:49 tom Exp $")
+MODULE_ID("$Id: lib_nl.c,v 1.15 2024/12/07 20:00:48 tom Exp $")
 
 #ifdef __EMX__
 #include <io.h>
@@ -55,7 +55,7 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("nl(%p)"), (void *) SP_PARM));
-    if (0 == SP_PARM)
+    if (NULL == SP_PARM)
 	returnCode(ERR);
     IsNl(SP_PARM) = TRUE;
 #ifdef __EMX__
@@ -77,7 +77,7 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("nonl(%p)"), (void *) SP_PARM));
-    if (0 == SP_PARM)
+    if (NULL == SP_PARM)
 	returnCode(ERR);
     IsNl(SP_PARM) = FALSE;
 #ifdef __EMX__
diff --git a/ncurses/base/lib_overlay.c b/ncurses/base/lib_overlay.c
index 6d21c7617..6ab8cf059 100644
--- a/ncurses/base/lib_overlay.c
+++ b/ncurses/base/lib_overlay.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_overlay.c,v 1.34 2023/09/16 16:39:07 tom Exp $")
+MODULE_ID("$Id: lib_overlay.c,v 1.35 2024/12/07 20:03:37 tom Exp $")
 
 static int
 overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
@@ -50,7 +50,7 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
 
     T((T_CALLED("overlap(%p,%p,%d)"), (const void *) src, (void *) dst, flag));
 
-    if (src != 0 && dst != 0) {
+    if (src != NULL && dst != NULL) {
 	int sx1, sy1, sx2, sy2;
 	int dx1, dy1, dx2, dy2;
 
@@ -146,8 +146,8 @@ copywin(const WINDOW *src, WINDOW *dst,
        dminrow, dmincol,
        dmaxrow, dmaxcol, over));
 
-    if (src != 0
-	&& dst != 0
+    if (src != NULL
+	&& dst != NULL
 	&& dmaxrow >= dminrow
 	&& dmaxcol >= dmincol) {
 	attr_t bk;
diff --git a/ncurses/base/lib_pad.c b/ncurses/base/lib_pad.c
index 10ac53720..c5bfd6053 100644
--- a/ncurses/base/lib_pad.c
+++ b/ncurses/base/lib_pad.c
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_pad.c,v 1.51 2024/09/28 15:40:42 tom Exp $")
+MODULE_ID("$Id: lib_pad.c,v 1.52 2024/12/07 17:44:59 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
@@ -55,17 +55,17 @@ NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
     T((T_CALLED("newpad(%p,%d, %d)"), (void *) SP_PARM, l, c));
 
     if (l <= 0 || c <= 0)
-	returnWin(0);
+	returnWin(NULL);
 
     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx l, c, 0, 0, _ISPAD);
     if (win == NULL)
-	returnWin(0);
+	returnWin(NULL);
 
     for (i = 0; i < l; i++) {
 	if_USE_SCROLL_HINTS(win->_line[i].oldindex = _NEWINDEX);
-	if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == 0) {
+	if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == NULL) {
 	    (void) _nc_freewin(win);
-	    returnWin(0);
+	    returnWin(NULL);
 	}
 	for (ptr = win->_line[i].text; ptr < win->_line[i].text + c; ptr++)
 	    SetChar(*ptr, BLANK_TEXT, BLANK_ATTR);
@@ -92,7 +92,7 @@ subpad(WINDOW *orig, int l, int c, int begy, int begx)
     if (orig) {
 	if (!IS_PAD(orig)
 	    || ((win = derwin(orig, l, c, begy, begx)) == NULL))
-	    returnWin(0);
+	    returnWin(NULL);
     }
     returnWin(win);
 }
@@ -143,7 +143,7 @@ pnoutrefresh(WINDOW *win,
     T((T_CALLED("pnoutrefresh(%p, %d, %d, %d, %d, %d, %d)"),
        (void *) win, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol));
 
-    if (win == 0)
+    if (win == NULL)
 	returnCode(ERR);
 
     if (!IS_PAD(win))
@@ -331,7 +331,7 @@ pechochar(WINDOW *pad, const chtype ch)
 {
     T((T_CALLED("pechochar(%p, %s)"), (void *) pad, _tracechtype(ch)));
 
-    if (pad == 0)
+    if (pad == NULL)
 	returnCode(ERR);
 
     if (!IS_PAD(pad))
diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c
index 0b168ccac..fa1a153b3 100644
--- a/ncurses/base/lib_printw.c
+++ b/ncurses/base/lib_printw.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_printw.c,v 1.29 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_printw.c,v 1.30 2024/12/07 17:44:59 tom Exp $")
 
 NCURSES_EXPORT(int)
 printw(const char *fmt, ...)
@@ -142,7 +142,7 @@ vwprintw(WINDOW *win, const char *fmt, va_list argp)
     T((T_CALLED("vwprintw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
 
     buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
-    if (buf != 0) {
+    if (buf != NULL) {
 	code = waddstr(win, buf);
     }
     returnCode(code);
@@ -160,7 +160,7 @@ vw_printw(WINDOW *win, const char *fmt, va_list argp)
     T((T_CALLED("vw_printw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
 
     buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
-    if (buf != 0) {
+    if (buf != NULL) {
 	code = waddstr(win, buf);
     }
     returnCode(code);
diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index c99d6992a..99c02490d 100644
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_redrawln.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_redrawln.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 wredrawln(WINDOW *win, int beg, int num)
@@ -52,7 +52,7 @@ wredrawln(WINDOW *win, int beg, int num)
 
     T((T_CALLED("wredrawln(%p,%d,%d)"), (void *) win, beg, num));
 
-    if (win == 0)
+    if (win == NULL)
 	returnCode(ERR);
 
     sp = _nc_screen_of(win);
diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index 0c61cb7ea..f6fbd4388 100644
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_restart.c,v 1.18 2023/04/29 19:01:25 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
@@ -64,7 +64,7 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
 
     if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
 	result = ERR;
-    } else if (SP_PARM != 0) {
+    } else if (SP_PARM != NULL) {
 	TTY_FLAGS save_flags = SP_PARM->_tty_flags;
 
 #ifdef USE_TERM_DRIVER
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index c1640bb29..f272220cb 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.109 2024/10/05 20:47:44 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.110 2024/12/07 17:46:49 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -172,7 +172,7 @@ read_txt(FILE *fp)
     char *result = malloc(limit);
     char *buffer;
 
-    if (result != 0) {
+    if (result != NULL) {
 	int ch = 0;
 	size_t used = 0;
 
@@ -182,9 +182,9 @@ read_txt(FILE *fp)
 	    if (used + 2 >= limit) {
 		limit += 1024;
 		buffer = realloc(result, limit);
-		if (buffer == 0) {
+		if (buffer == NULL) {
 		    free(result);
-		    result = 0;
+		    result = NULL;
 		    break;
 		}
 		result = buffer;
@@ -201,7 +201,7 @@ read_txt(FILE *fp)
 	    TR(TRACE_IEVENT, ("READ:%s", result));
 	} else if (used == 0) {
 	    free(result);
-	    result = 0;
+	    result = NULL;
 	}
     }
     return result;
@@ -306,7 +306,7 @@ decode_char(char *source, int *target)
 	    *target = 0;
 	    while (limit-- > 0) {
 		const char *find = strchr(digits, *source++);
-		int ch = (find != 0) ? (int) (find - digits) : -1;
+		int ch = (find != NULL) ? (int) (find - digits) : -1;
 		*target *= base;
 		if (ch >= 0 && ch < base) {
 		    *target += ch;
@@ -387,14 +387,14 @@ read_win(WINDOW *win, FILE *fp)
 	char *value;
 	char *txt = read_txt(fp);
 
-	if (txt == 0)
+	if (txt == NULL)
 	    break;
 	if (!strcmp(txt, "rows:")) {
 	    free(txt);
 	    code = OK;
 	    break;
 	}
-	if ((value = strchr(txt, '=')) == 0) {
+	if ((value = strchr(txt, '=')) == NULL) {
 	    free(txt);
 	    continue;
 	}
@@ -506,8 +506,8 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 
     T((T_CALLED("getwin(%p)"), (void *) filep));
 
-    if (filep == 0) {
-	returnWin(0);
+    if (filep == NULL) {
+	returnWin(NULL);
     }
 
     /*
@@ -515,7 +515,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
      * screen-dump, or new-format.
      */
     if (read_block(&tmp, (size_t) 4, filep) < 0) {
-	returnWin(0);
+	returnWin(NULL);
     }
     /*
      * If this is a new-format file, and we do not support it, give up.
@@ -524,9 +524,9 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 #if NCURSES_EXT_PUTWIN
 	if (read_win(&tmp, filep) < 0)
 #endif
-	    returnWin(0);
+	    returnWin(NULL);
     } else if (read_block(((char *) &tmp) + 4, sizeof(WINDOW) - 4, filep) < 0) {
-	returnWin(0);
+	returnWin(NULL);
     } else {
 	old_format = TRUE;
     }
@@ -538,7 +538,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 	tmp._maxy > MAX_SIZE ||
 	tmp._maxx == 0 ||
 	tmp._maxx > MAX_SIZE) {
-	returnWin(0);
+	returnWin(NULL);
     }
 
     if (IS_PAD(&tmp)) {
@@ -556,7 +556,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
      * fields, because the window hierarchy within which they
      * made sense is probably gone.
      */
-    if (nwin != 0) {
+    if (nwin != NULL) {
 	int n;
 	size_t linesize = sizeof(NCURSES_CH_T) * (size_t) (tmp._maxx + 1);
 
@@ -594,13 +594,13 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 	    for (n = 0; n <= nwin->_maxy; n++) {
 		if (read_block(nwin->_line[n].text, linesize, filep) < 0) {
 		    delwin(nwin);
-		    returnWin(0);
+		    returnWin(NULL);
 		}
 	    }
 	}
 #if NCURSES_EXT_PUTWIN
 	else {
-	    char *txt = 0;
+	    char *txt = NULL;
 	    bool success = TRUE;
 	    NCURSES_CH_T prior = blank;
 
@@ -609,7 +609,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 		long row;
 		char *next;
 
-		if ((txt = read_txt(filep)) == 0) {
+		if ((txt = read_txt(filep)) == NULL) {
 		    T(("...failed to read string for row %d", n + 1));
 		    success = FALSE;
 		    break;
@@ -628,13 +628,13 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep)
 		    break;
 		}
 		free(txt);
-		txt = 0;
+		txt = NULL;
 	    }
 
 	    if (!success) {
 		free(txt);
 		delwin(nwin);
-		returnWin(0);
+		returnWin(NULL);
 	    }
 	}
 #endif
@@ -798,7 +798,7 @@ putwin(WINDOW *win, FILE *filep)
     T((T_CALLED("putwin(%p,%p)"), (void *) win, (void *) filep));
 
 #if NCURSES_EXT_PUTWIN
-    if (win != 0) {
+    if (win != NULL) {
 	const char *version = curses_version();
 	char buffer[1024];
 	NCURSES_CH_T last_cell;
@@ -966,14 +966,14 @@ replace_window(const WINDOW *target, FILE *source)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
 {
-    FILE *fp = 0;
+    FILE *fp = NULL;
     int code = ERR;
 
     T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
 
     if (SP_PARM != NULL
 	&& _nc_access(file, R_OK) >= 0
-	&& (fp = safe_fopen(file, BIN_R)) != 0) {
+	&& (fp = safe_fopen(file, BIN_R)) != NULL) {
 	WINDOW *my_newscr = replace_window(NewScreen(SP_PARM), fp);
 	(void) fclose(fp);
 	if (my_newscr != NULL) {
@@ -1000,12 +1000,12 @@ NCURSES_EXPORT(int)
 scr_dump(const char *file)
 {
     int result;
-    FILE *fp = 0;
+    FILE *fp = NULL;
 
     T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file)));
 
     if (_nc_access(file, W_OK) < 0
-	|| (fp = safe_fopen(file, BIN_W)) == 0) {
+	|| (fp = safe_fopen(file, BIN_W)) == NULL) {
 	result = ERR;
     } else {
 	(void) putwin(newscr, fp);
@@ -1029,10 +1029,10 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
 	!(exit_ca_mode && non_rev_rmcup)
 #endif
 	) {
-	FILE *fp = 0;
+	FILE *fp = NULL;
 
 	if (_nc_access(file, R_OK) >= 0
-	    && (fp = safe_fopen(file, BIN_R)) != 0) {
+	    && (fp = safe_fopen(file, BIN_R)) != NULL) {
 	    WINDOW *my_curscr = replace_window(CurScreen(SP_PARM), fp);
 	    (void) fclose(fp);
 	    if (my_curscr != NULL) {
@@ -1070,7 +1070,7 @@ NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file)
 #if !USE_REENTRANT
 	newscr = NewScreen(SP_PARM);
 #endif
-	if (NewScreen(SP_PARM) != 0) {
+	if (NewScreen(SP_PARM) != NULL) {
 	    code = OK;
 	}
     }
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 18f7b4336..60ff31618 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.189 2024/11/23 18:33:50 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.190 2024/12/07 17:58:16 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -81,7 +81,7 @@ set_term(SCREEN *screenp)
     _nc_set_screen(screenp);
     newSP = screenp;
 
-    if (newSP != 0) {
+    if (newSP != NULL) {
 	TINFO_SET_CURTERM(newSP, newSP->_term);
 #if !USE_REENTRANT
 	curscr = CurScreen(newSP);
@@ -91,11 +91,11 @@ set_term(SCREEN *screenp)
 	COLOR_PAIRS = newSP->_pair_count;
 #endif
     } else {
-	TINFO_SET_CURTERM(oldSP, 0);
+	TINFO_SET_CURTERM(oldSP, NULL);
 #if !USE_REENTRANT
-	curscr = 0;
-	newscr = 0;
-	stdscr = 0;
+	curscr = NULL;
+	newscr = NULL;
+	stdscr = NULL;
 	COLORS = 0;
 	COLOR_PAIRS = 0;
 #endif
@@ -110,7 +110,7 @@ set_term(SCREEN *screenp)
 static void
 _nc_free_keytry(TRIES * kt)
 {
-    if (kt != 0) {
+    if (kt != NULL) {
 	_nc_free_keytry(kt->child);
 	_nc_free_keytry(kt->sibling);
 	free(kt);
@@ -120,7 +120,7 @@ _nc_free_keytry(TRIES * kt)
 static bool
 delink_screen(SCREEN *sp)
 {
-    SCREEN *last = 0;
+    SCREEN *last = NULL;
     SCREEN *temp;
     bool result = FALSE;
 
@@ -174,9 +174,9 @@ delscreen(SCREEN *sp)
 	    }
 	}
 
-	if (sp->_slk != 0) {
+	if (sp->_slk != NULL) {
 
-	    if (sp->_slk->ent != 0) {
+	    if (sp->_slk->ent != NULL) {
 		int i;
 
 		for (i = 0; i < sp->_slk->labcnt; ++i) {
@@ -186,14 +186,14 @@ delscreen(SCREEN *sp)
 		free(sp->_slk->ent);
 	    }
 	    free(sp->_slk);
-	    sp->_slk = 0;
+	    sp->_slk = NULL;
 	}
 
 	_nc_free_keytry(sp->_keytry);
-	sp->_keytry = 0;
+	sp->_keytry = NULL;
 
 	_nc_free_keytry(sp->_key_ok);
-	sp->_key_ok = 0;
+	sp->_key_ok = NULL;
 
 	FreeIfNeeded(sp->_current_attr);
 
@@ -232,17 +232,17 @@ delscreen(SCREEN *sp)
 	 */
 	if (is_current) {
 #if !USE_REENTRANT
-	    curscr = 0;
-	    newscr = 0;
-	    stdscr = 0;
+	    curscr = NULL;
+	    newscr = NULL;
+	    stdscr = NULL;
 	    COLORS = 0;
 	    COLOR_PAIRS = 0;
 #endif
-	    _nc_set_screen(0);
+	    _nc_set_screen(NULL);
 #if USE_WIDEC_SUPPORT
-	    if (SP == 0) {
+	    if (SP == NULL) {
 		FreeIfNeeded(_nc_wacs);
-		_nc_wacs = 0;
+		_nc_wacs = NULL;
 	    }
 #endif
 	} else {
@@ -303,7 +303,7 @@ extract_fgbg(const char *src, int *result)
 }
 #endif
 
-#define ReturnScreenError() do { _nc_set_screen(0); \
+#define ReturnScreenError() do { _nc_set_screen(NULL); \
                             returnCode(ERR); } while (0)
 
 /* OS-independent screen initializations */
@@ -357,7 +357,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     sp->_next_screen = _nc_screen_chain;
     _nc_screen_chain = sp;
 
-    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) {
+    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) {
 	ReturnScreenError();
     }
 #else
@@ -437,7 +437,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 	_setmode(fileno(output), _O_BINARY);
 #endif
     sp->out_limit = (size_t) ((2 + slines) * (6 + scolumns));
-    if ((sp->out_buffer = malloc(sp->out_limit)) == 0)
+    if ((sp->out_buffer = malloc(sp->out_limit)) == NULL)
 	sp->out_limit = 0;
     sp->out_inuse = 0;
 
@@ -479,7 +479,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
      * Allow those assumed/default color assumptions to be overridden at
      * runtime:
      */
-    if ((env = getenv("NCURSES_ASSUMED_COLORS")) != 0) {
+    if ((env = getenv("NCURSES_ASSUMED_COLORS")) != NULL) {
 	int fg, bg;
 	char sep1, sep2;
 	int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
@@ -555,7 +555,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
      * in the environment, reset the support-flag.
      */
     if (magic_cookie_glitch >= 0) {
-	if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) {
+	if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) {
 	    support_cookies = FALSE;
 	}
     }
@@ -633,10 +633,10 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG);
 #if USE_WIDEC_SUPPORT
     sp->_screen_unicode = _nc_unicode_locale();
-    if (_nc_wacs == 0) {
+    if (_nc_wacs == NULL) {
 	_nc_init_wacs();
     }
-    if (_nc_wacs == 0) {
+    if (_nc_wacs == NULL) {
 	ReturnScreenError();
     }
 
@@ -644,7 +644,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 			   && _nc_locale_breaks_acs(sp->_term));
 #endif
     env = _nc_get_locale();
-    sp->_legacy_coding = ((env == 0)
+    sp->_legacy_coding = ((env == NULL)
 			  || !strcmp(env, "C")
 			  || !strcmp(env, "POSIX"));
     T(("legacy-coding %d", sp->_legacy_coding));
@@ -652,19 +652,19 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     sp->_nc_sp_idcok = TRUE;
     sp->_nc_sp_idlok = FALSE;
 
-    sp->oldhash = 0;
-    sp->newhash = 0;
+    sp->oldhash = NULL;
+    sp->newhash = NULL;
 
     T(("creating newscr"));
     NewScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns,
 					     0, 0);
-    if (NewScreen(sp) == 0) {
+    if (NewScreen(sp) == NULL) {
 	ReturnScreenError();
     }
     T(("creating curscr"));
     CurScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns,
 					     0, 0);
-    if (CurScreen(sp) == 0) {
+    if (CurScreen(sp) == NULL) {
 	ReturnScreenError();
     }
 #if !USE_REENTRANT
@@ -684,7 +684,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
      * unless we use the term-driver.
      */
 #ifndef USE_TERM_DRIVER
-    if (cur_term != 0 &&
+    if (cur_term != NULL &&
 	!memcmp(&cur_term->Ottyb, &null_TTY, sizeof(TTY)))
 #endif
     {
@@ -750,7 +750,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     assert((sp->_lines_avail + sp->_topstolen + bottom_stolen) == slines);
     if ((StdScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx
 						  sp->_lines_avail,
-						  scolumns, 0, 0)) == 0) {
+						  scolumns, 0, 0)) == NULL) {
 	ReturnScreenError();
     }
     SET_LINES(sp->_lines_avail);
@@ -769,7 +769,7 @@ _nc_setupscreen(int slines GCC_UNUSED,
 		bool filtered,
 		int slk_format)
 {
-    SCREEN *sp = 0;
+    SCREEN *sp = NULL;
     int rc = NCURSES_SP_NAME(_nc_setupscreen) (&sp,
 					       slines,
 					       scolumns,
@@ -777,7 +777,7 @@ _nc_setupscreen(int slines GCC_UNUSED,
 					       filtered,
 					       slk_format);
     if (rc != OK)
-	_nc_set_screen(0);
+	_nc_set_screen(NULL);
     return rc;
 }
 #endif
@@ -800,13 +800,13 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx
        TR_FUNC_ARG(0, init)));
 
 #if NCURSES_SP_FUNCS
-    if (SP_PARM != 0 && SP_PARM->_prescreen)
+    if (SP_PARM != NULL && SP_PARM->_prescreen)
 #endif
     {
 	if (line == 0) {
 	    code = OK;
 	} else {
-	    if (safe_ripoff_sp == 0) {
+	    if (safe_ripoff_sp == NULL) {
 		safe_ripoff_sp = safe_ripoff_stack;
 	    }
 	    if (safe_ripoff_sp < safe_ripoff_stack + N_RIPS) {
diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index 47e57e0bc..7f35006d9 100644
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $")
+MODULE_ID("$Id: lib_slk.c,v 1.51 2024/12/07 20:03:37 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -68,7 +68,7 @@ MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $")
 static int
 slk_failed(NCURSES_SP_DCL0)
 {
-    if ((0 != SP_PARM) && SP_PARM->_slk) {
+    if ((NULL != SP_PARM) && SP_PARM->_slk) {
 	FreeIfNeeded(SP_PARM->_slk->ent);
 	free(SP_PARM->_slk);
 	SP_PARM->_slk = (SLK *) 0;
@@ -148,7 +148,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
     assert(stwin);
 
     sp = _nc_screen_of(stwin);
-    if (0 == sp)
+    if (NULL == sp)
 	returnCode(ERR);
 
     assert(TerminalOf(SP_PARM));
@@ -157,7 +157,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
 
     if (SP_PARM->_slk) {	/* we did this already, so simply return */
 	returnCode(OK);
-    } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == 0)
+    } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == NULL)
 	returnCode(ERR);
 
     if (!SP_PARM->slk_format)
@@ -196,13 +196,13 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
     for (i = 0; i < SP_PARM->_slk->labcnt; i++) {
 	size_t used = max_length + 1;
 
-	SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used);
-	if (SP_PARM->_slk->ent[i].ent_text == 0)
+	SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(NULL, used);
+	if (SP_PARM->_slk->ent[i].ent_text == NULL)
 	    returnCode(slk_failed(NCURSES_SP_ARG));
 	memset(SP_PARM->_slk->ent[i].ent_text, 0, used);
 
-	SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used);
-	if (SP_PARM->_slk->ent[i].form_text == 0)
+	SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(NULL, used);
+	if (SP_PARM->_slk->ent[i].form_text == NULL)
 	    returnCode(slk_failed(NCURSES_SP_ARG));
 
 	if (used > 1) {
@@ -235,7 +235,7 @@ NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("slk_restore(%p)"), (void *) SP_PARM));
 
-    if (0 == SP_PARM)
+    if (NULL == SP_PARM)
 	returnCode(ERR);
     if (SP_PARM->_slk == NULL)
 	returnCode(ERR);
diff --git a/ncurses/base/lib_slkatr_set.c b/ncurses/base/lib_slkatr_set.c
index 7c5a23acd..4c2c36223 100644
--- a/ncurses/base/lib_slkatr_set.c
+++ b/ncurses/base/lib_slkatr_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkatr_set.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkatr_set.c,v 1.18 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
@@ -56,8 +56,8 @@ NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
        color_pair));
 
     set_extended_pair(opts, color_pair);
-    if (SP_PARM != 0
-	&& SP_PARM->_slk != 0
+    if (SP_PARM != NULL
+	&& SP_PARM->_slk != NULL
 	&& color_pair >= 0
 	&& color_pair < SP_PARM->_pair_limit) {
 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
diff --git a/ncurses/base/lib_slkatrof.c b/ncurses/base/lib_slkatrof.c
index 2d53ab206..03c09cf17 100644
--- a/ncurses/base/lib_slkatrof.c
+++ b/ncurses/base/lib_slkatrof.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2005,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,14 +39,14 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkatrof.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkatrof.c,v 1.13 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr)
 {
     T((T_CALLED("slk_attroff(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
 
-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
 	RemAttr(SP_PARM->_slk->attr, attr);
 	if ((attr & A_COLOR) != 0) {
diff --git a/ncurses/base/lib_slkatron.c b/ncurses/base/lib_slkatron.c
index accc2f2ac..0e714eddf 100644
--- a/ncurses/base/lib_slkatron.c
+++ b/ncurses/base/lib_slkatron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,14 +39,14 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkatron.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkatron.c,v 1.14 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
 {
     T((T_CALLED("slk_attron(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
 
-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
 	AddAttr(SP_PARM->_slk->attr, attr);
 	if ((attr & A_COLOR) != 0) {
diff --git a/ncurses/base/lib_slkatrset.c b/ncurses/base/lib_slkatrset.c
index 11fa7e6f9..2d410be53 100644
--- a/ncurses/base/lib_slkatrset.c
+++ b/ncurses/base/lib_slkatrset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2005,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,14 +39,14 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkatrset.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkatrset.c,v 1.12 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr)
 {
     T((T_CALLED("slk_attrset(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
 
-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
 	SetAttr(SP_PARM->_slk->attr, attr);
 	returnCode(OK);
     } else
diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c
index af49f3bb7..9a6339137 100644
--- a/ncurses/base/lib_slkattr.c
+++ b/ncurses/base/lib_slkattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,14 +39,14 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkattr.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkattr.c,v 1.13 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(attr_t)
 NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
 	attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
 	int pair = GetPair(SP_PARM->_slk->attr);
 
diff --git a/ncurses/base/lib_slkclear.c b/ncurses/base/lib_slkclear.c
index 10531e4df..5d54623f1 100644
--- a/ncurses/base/lib_slkclear.c
+++ b/ncurses/base/lib_slkclear.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2007,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkclear.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkclear.c,v 1.16 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
@@ -50,7 +50,7 @@ NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
 
     T((T_CALLED("slk_clear(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
 	SP_PARM->_slk->hidden = TRUE;
 	/* For simulated SLK's it looks much more natural to
 	   inherit those attributes from the standard screen */
diff --git a/ncurses/base/lib_slkcolor.c b/ncurses/base/lib_slkcolor.c
index 00d1eaa05..1801364ce 100644
--- a/ncurses/base/lib_slkcolor.c
+++ b/ncurses/base/lib_slkcolor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkcolor.c,v 1.20 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkcolor.c,v 1.21 2024/12/07 20:03:37 tom Exp $")
 
 static int
 _nc_slk_color(SCREEN *sp, int pair_arg)
@@ -48,8 +48,8 @@ _nc_slk_color(SCREEN *sp, int pair_arg)
 
     T((T_CALLED("slk_color(%p,%d)"), (void *) sp, pair_arg));
 
-    if (sp != 0
-	&& sp->_slk != 0
+    if (sp != NULL
+	&& sp->_slk != NULL
 	&& pair_arg >= 0
 	&& pair_arg < sp->_pair_limit) {
 	TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(sp->_slk->attr))));
diff --git a/ncurses/base/lib_slklab.c b/ncurses/base/lib_slklab.c
index 894ff26db..235550398 100644
--- a/ncurses/base/lib_slklab.c
+++ b/ncurses/base/lib_slklab.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,15 +41,15 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slklab.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slklab.c,v 1.12 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)
 {
     T((T_CALLED("slk_label(%p,%d)"), (void *) SP_PARM, n));
 
-    if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt)
-	returnPtr(0);
+    if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt)
+	returnPtr(NULL);
     returnPtr(SP_PARM->_slk->ent[n - 1].ent_text);
 }
 
diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c
index 85b777482..f0abcc400 100644
--- a/ncurses/base/lib_slkrefr.c
+++ b/ncurses/base/lib_slkrefr.c
@@ -44,7 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slkrefr.c,v 1.33 2024/07/27 19:23:59 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.34 2024/12/07 17:58:16 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels    InfoOf(SP_PARM).numlabels
@@ -83,7 +83,7 @@ slk_intern_refresh(SCREEN *sp)
     SLK *slk;
     int numlab;
 
-    if (sp == 0)
+    if (sp == NULL)
 	return;
 
     slk = sp->_slk;
@@ -145,7 +145,7 @@ NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("slk_noutrefresh(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
 	returnCode(ERR);
     if (SP_PARM->_slk->hidden)
 	returnCode(OK);
@@ -170,7 +170,7 @@ NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("slk_refresh(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
 	returnCode(ERR);
     if (SP_PARM->_slk->hidden)
 	returnCode(OK);
diff --git a/ncurses/base/lib_slkset.c b/ncurses/base/lib_slkset.c
index 3e777f146..5476c5a6e 100644
--- a/ncurses/base/lib_slkset.c
+++ b/ncurses/base/lib_slkset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_slkset.c,v 1.26 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slkset.c,v 1.27 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
@@ -60,14 +60,14 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
 
     T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), (void *) SP_PARM, i, str, format));
 
-    if (SP_PARM == 0
-	|| (slk = SP_PARM->_slk) == 0
+    if (SP_PARM == NULL
+	|| (slk = SP_PARM->_slk) == NULL
 	|| i < 1
 	|| i > slk->labcnt
 	|| format < 0
 	|| format > 2)
 	returnCode(ERR);
-    if (str == 0)
+    if (str == NULL)
 	str = "";
     --i;			/* Adjust numbering of labels */
 
@@ -84,7 +84,7 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
 	size_t need;
 
 	init_mb(state);
-	need = mbrtowc(0, p, strlen(p), &state);
+	need = mbrtowc(NULL, p, strlen(p), &state);
 	if (need == (size_t) -1)
 	    break;
 	mbrtowc(&wc, p, need, &state);
@@ -107,14 +107,14 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
 #endif
 
     FreeIfNeeded(slk->ent[i].ent_text);
-    if ((slk->ent[i].ent_text = strdup(str)) == 0)
+    if ((slk->ent[i].ent_text = strdup(str)) == NULL)
 	returnCode(ERR);
     slk->ent[i].ent_text[numchrs] = '\0';
 
     if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text,
 						      (size_t) (limit +
 								numchrs + 1))
-	) == 0)
+	) == NULL)
 	returnCode(ERR);
 
     switch (format) {
diff --git a/ncurses/base/lib_slktouch.c b/ncurses/base/lib_slktouch.c
index 6696a25f4..f269b9137 100644
--- a/ncurses/base/lib_slktouch.c
+++ b/ncurses/base/lib_slktouch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,14 +39,14 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slktouch.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slktouch.c,v 1.10 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("slk_touch(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
 	returnCode(ERR);
     SP_PARM->_slk->dirty = TRUE;
 
diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index fcbe6f4a9..8729f1fdf 100644
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ungetch.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.18 2024/12/07 20:03:37 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -65,7 +65,7 @@ safe_ungetch(SCREEN *sp, int ch)
 
     T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
 
-    if (sp != 0 && tail >= 0) {
+    if (sp != NULL && tail >= 0) {
 	if (head < 0) {
 	    head = 0;
 	    t_inc();
diff --git a/ncurses/base/lib_wattron.c b/ncurses/base/lib_wattron.c
index 906021d3b..f15f3a4f9 100644
--- a/ncurses/base/lib_wattron.c
+++ b/ncurses/base/lib_wattron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,13 +43,13 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_wattron.c,v 1.13 2022/04/15 22:34:38 tom Exp $")
+MODULE_ID("$Id: lib_wattron.c,v 1.14 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(int)
 wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
 {
     T((T_CALLED("wattr_on(%p,%s)"), (void *) win, _traceattr(at)));
-    if (win != 0) {
+    if (win != NULL) {
 	T(("... current %s (%d)",
 	   _traceattr(WINDOW_ATTRS(win)),
 	   GET_WINDOW_PAIR(win)));
diff --git a/ncurses/base/lib_winch.c b/ncurses/base/lib_winch.c
index 91253d106..2fb4f1c42 100644
--- a/ncurses/base/lib_winch.c
+++ b/ncurses/base/lib_winch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,13 +40,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_winch.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_winch.c,v 1.10 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(chtype)
 winch(WINDOW *win)
 {
     T((T_CALLED("winch(%p)"), (void *) win));
-    if (win != 0) {
+    if (win != NULL) {
 	returnChtype((chtype) CharOf(win->_line[win->_cury].text[win->_curx])
 		     | AttrOf(win->_line[win->_cury].text[win->_curx]));
     } else {
diff --git a/ncurses/base/lib_window.c b/ncurses/base/lib_window.c
index 5323fbf03..d69b22b2e 100644
--- a/ncurses/base/lib_window.c
+++ b/ncurses/base/lib_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_window.c,v 1.32 2021/10/23 23:06:24 tom Exp $")
+MODULE_ID("$Id: lib_window.c,v 1.33 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(void)
 _nc_synchook(WINDOW *win)
@@ -61,8 +61,8 @@ mvderwin(WINDOW *win, int y, int x)
 
     T((T_CALLED("mvderwin(%p,%d,%d)"), (void *) win, y, x));
 
-    if (win != 0
-	&& (orig = win->_parent) != 0
+    if (win != NULL
+	&& (orig = win->_parent) != NULL
 	&& (x >= 0 && y >= 0)
 	&& (x + getmaxx(win) <= getmaxx(orig))
 	&& (y + getmaxy(win) <= getmaxy(orig))) {
@@ -178,11 +178,11 @@ NCURSES_EXPORT(WINDOW *)
 dupwin(WINDOW *win)
 /* make an exact duplicate of the given window */
 {
-    WINDOW *nwin = 0;
+    WINDOW *nwin = NULL;
 
     T((T_CALLED("dupwin(%p)"), (void *) win));
 
-    if (win != 0) {
+    if (win != NULL) {
 #if NCURSES_SP_FUNCS
 	SCREEN *sp = _nc_screen_of(win);
 #endif
@@ -199,7 +199,7 @@ dupwin(WINDOW *win)
 					    win->_begx);
 	}
 
-	if (nwin != 0) {
+	if (nwin != NULL) {
 	    int i;
 	    size_t linesize;
 
diff --git a/ncurses/base/nc_panel.c b/ncurses/base/nc_panel.c
index 002f118ef..b6e0642f7 100644
--- a/ncurses/base/nc_panel.c
+++ b/ncurses/base/nc_panel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: nc_panel.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: nc_panel.c,v 1.7 2024/12/07 20:03:37 tom Exp $")
 
 NCURSES_EXPORT(struct panelhook *)
 NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0)
@@ -42,7 +42,7 @@ NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0)
 	    ? &(SP_PARM->_panelHook)
 	    : (CURRENT_SCREEN
 	       ? &(CURRENT_SCREEN->_panelHook)
-	       : 0));
+	       : NULL));
 }
 
 #if NCURSES_SP_FUNCS
diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c
index 9ce0bb7f0..89a1a56f8 100644
--- a/ncurses/base/new_pair.c
+++ b/ncurses/base/new_pair.c
@@ -61,7 +61,7 @@
 
 #endif
 
-MODULE_ID("$Id: new_pair.c,v 1.25 2024/10/05 20:51:29 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.26 2024/12/07 18:05:04 tom Exp $")
 
 #if NCURSES_EXT_COLORS
 
@@ -148,9 +148,9 @@ _nc_find_color_pair(SCREEN *sp, int fg, int bg)
 
     find.fg = fg;
     find.bg = bg;
-    if (sp != 0) {
+    if (sp != NULL) {
 	void *pp;
-	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
+	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != NULL) {
 	    const colorpair_t *temp = *(colorpair_t **) pp;
 	    result = (int) (temp - sp->_color_pairs);
 	}
@@ -253,7 +253,7 @@ _nc_copy_pairs(SCREEN *sp, colorpair_t * target, colorpair_t * source, int lengt
     int n;
     for (n = 0; n < length; ++n) {
 	const void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
-	if (find != 0) {
+	if (find != NULL) {
 	    tdelete(source + n, &sp->_ordered_pairs, compare_data);
 	    tsearch(target + n, &sp->_ordered_pairs, compare_data);
 	}
@@ -266,7 +266,7 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
     int pair;
 
     T((T_CALLED("alloc_pair(%d,%d)"), fg, bg));
-    if (SP_PARM == 0) {
+    if (SP_PARM == NULL) {
 	pair = -1;
     } else if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
 	/*
@@ -291,7 +291,7 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
 	    if (!found && (SP_PARM->_pair_alloc < SP_PARM->_pair_limit)) {
 		pair = SP_PARM->_pair_alloc;
 		ReservePairs(SP_PARM, pair);
-		if (SP_PARM->_color_pairs == 0) {
+		if (SP_PARM->_color_pairs == NULL) {
 		    pair = -1;
 		} else {
 		    found = TRUE;
diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index 6312412ca..041401aac 100644
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.57 2024/11/23 18:35:34 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.58 2024/12/07 18:05:04 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -123,10 +123,10 @@ is_term_resized(int ToLines, int ToCols)
 static ripoff_t *
 ripped_window(WINDOW *win)
 {
-    ripoff_t *result = 0;
+    ripoff_t *result = NULL;
     ripoff_t *rop;
 
-    if (win != 0) {
+    if (win != NULL) {
 #ifdef USE_SP_RIPOFF
 	SCREEN *sp = _nc_screen_of(win);
 #endif
@@ -149,7 +149,7 @@ ripped_bottom(WINDOW *win)
 {
     int result = 0;
 
-    if (win != 0) {
+    if (win != NULL) {
 	ripoff_t *rop;
 
 #ifdef USE_SP_RIPOFF
@@ -175,7 +175,7 @@ child_depth(WINDOW *cmp)
 {
     int depth = 0;
 
-    if (cmp != 0) {
+    if (cmp != NULL) {
 #ifdef USE_SP_WINDOWLIST
 	SCREEN *sp = _nc_screen_of(cmp);
 #endif
@@ -200,9 +200,9 @@ parent_depth(WINDOW *cmp)
 {
     int depth = 0;
 
-    if (cmp != 0) {
+    if (cmp != NULL) {
 	WINDOW *tst;
-	while ((tst = cmp->_parent) != 0) {
+	while ((tst = cmp->_parent) != NULL) {
 	    ++depth;
 	    cmp = tst;
 	}
@@ -224,13 +224,13 @@ adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS)
 
     T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"),
        (void *) win, ToLines, ToCols,
-       (rop != 0) ? " (rip)" : "",
+       (rop != NULL) ? " (rip)" : "",
        parent_depth(win),
        child_depth(win),
        (long) getmaxy(win), (long) getmaxx(win),
        (long) getbegy(win) + win->_yoffset, (long) getbegx(win)));
 
-    if (rop != 0 && rop->line < 0) {
+    if (rop != NULL && rop->line < 0) {
 	/*
 	 * If it is a ripped-off window at the bottom of the screen, simply
 	 * move it to the same relative position.
@@ -484,8 +484,8 @@ NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols)
 	if (NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_ARGx ToLines, ToCols)) {
 #if USE_SIGWINCH
 	    ripoff_t *rop;
-	    bool slk_visible = (SP_PARM != 0
-				&& SP_PARM->_slk != 0
+	    bool slk_visible = (SP_PARM != NULL
+				&& SP_PARM->_slk != NULL
 				&& !(SP_PARM->_slk->hidden));
 
 	    if (slk_visible) {
@@ -506,7 +506,7 @@ NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols)
 	     */
 	    for (each_ripoff(rop)) {
 		if (rop->win != StdScreen(SP_PARM)
-		    && rop->win != 0
+		    && rop->win != NULL
 		    && rop->line < 0) {
 
 		    if (rop->hook != _nc_slk_initialize) {
diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index 0f8c0516e..2f080d5eb 100644
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: tries.c,v 1.32 2023/06/24 15:36:23 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.33 2024/12/07 21:24:18 tom Exp $")
 
 /*
  * Expand a keycode into the string that it corresponds to, returning null if
@@ -51,12 +51,12 @@ NCURSES_EXPORT(char *)
 _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
 {
     TRIES *ptr = tree;
-    char *result = 0;
+    char *result = NULL;
 
     if (code != 0) {
-	while (ptr != 0) {
+	while (ptr != NULL) {
 	    if ((result = _nc_expand_try(ptr->child, code, count, len + 1))
-		!= 0) {
+		!= NULL) {
 		break;
 	    }
 	    if (ptr->value == code) {
@@ -69,8 +69,8 @@ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
 	    ptr = ptr->sibling;
 	}
     }
-    if (result != 0) {
-	if (ptr != 0 && (result[len] = (char) ptr->ch) == 0)
+    if (result != NULL) {
+	if (ptr != NULL && (result[len] = (char) ptr->ch) == 0)
 	    *((unsigned char *) (result + len)) = 128;
 #ifdef TRACE
 	if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
@@ -96,7 +96,7 @@ _nc_remove_key(TRIES ** tree, unsigned code)
     if (code == 0)
 	returnCode(FALSE);
 
-    while (*tree != 0) {
+    while (*tree != NULL) {
 	if (_nc_remove_key(&(*tree)->child, code)) {
 	    returnCode(TRUE);
 	}
@@ -128,11 +128,11 @@ _nc_remove_string(TRIES ** tree, const char *string)
     if (!VALID_STRING(string) || *string == 0)
 	returnCode(FALSE);
 
-    while (*tree != 0) {
+    while (*tree != NULL) {
 	if (UChar((*tree)->ch) == UChar(*string)) {
 	    if (string[1] != 0)
 		returnCode(_nc_remove_string(&(*tree)->child, string + 1));
-	    if ((*tree)->child == 0) {
+	    if ((*tree)->child == NULL) {
 		TRIES *to_free = *tree;
 		*tree = (*tree)->sibling;
 		free(to_free);
diff --git a/ncurses/base/wresize.c b/ncurses/base/wresize.c
index 576efa522..957a5035b 100644
--- a/ncurses/base/wresize.c
+++ b/ncurses/base/wresize.c
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: wresize.c,v 1.44 2024/09/28 15:56:07 tom Exp $")
+MODULE_ID("$Id: wresize.c,v 1.45 2024/12/07 18:08:56 tom Exp $")
 
 static int
 cleanup_lines(struct ldat *data, int length)
@@ -109,7 +109,7 @@ wresize(WINDOW *win, int ToLines, int ToCols)
 {
     int col, row, size_x, size_y;
     struct ldat *pline;
-    struct ldat *new_lines = 0;
+    struct ldat *new_lines = NULL;
 
 #ifdef TRACE
     T((T_CALLED("wresize(%p,%d,%d)"), (void *) win, ToLines, ToCols));
@@ -149,7 +149,7 @@ wresize(WINDOW *win, int ToLines, int ToCols)
 	}
 	pline = win->_parent->_line;
     } else {
-	pline = 0;
+	pline = NULL;
     }
 
     /*
@@ -158,7 +158,7 @@ wresize(WINDOW *win, int ToLines, int ToCols)
      * (at least temporarily) the array pointing to the individual lines.
      */
     new_lines = typeCalloc(struct ldat, (unsigned) (ToLines + 1));
-    if (new_lines == 0)
+    if (new_lines == NULL)
 	returnCode(ERR);
 
     /*
@@ -175,7 +175,7 @@ wresize(WINDOW *win, int ToLines, int ToCols)
 	    if (row <= size_y) {
 		if (ToCols != size_x) {
 		    s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1);
-		    if (s == 0)
+		    if (s == NULL)
 			returnCode(cleanup_lines(new_lines, row));
 		    for (col = 0; col <= ToCols; ++col) {
 			bool valid = (col <= size_x);
@@ -195,15 +195,15 @@ wresize(WINDOW *win, int ToLines, int ToCols)
 		}
 	    } else {
 		s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1);
-		if (s == 0)
+		if (s == NULL)
 		    returnCode(cleanup_lines(new_lines, row));
 		for (col = 0; col <= ToCols; ++col)
 		    s[col] = win->_nc_bkgd;
 	    }
-	} else if (pline != 0 && pline[win->_pary + row].text != 0) {
+	} else if (pline != NULL && pline[win->_pary + row].text != NULL) {
 	    s = &pline[win->_pary + row].text[win->_parx];
 	} else {
-	    s = 0;
+	    s = NULL;
 	}
 
 	if_USE_SCROLL_HINTS(new_lines[row].oldindex = row);
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index a9969f0c2..30fa618b8 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.696 2024/11/30 21:32:44 tom Exp $
+ * $Id: curses.priv.h,v 1.697 2024/12/07 18:27:10 tom Exp $
  *
  *	curses.priv.h
  *
@@ -445,8 +445,8 @@ typedef union {
 #include <term.priv.h>
 #include <nc_termios.h>
 
-#define IsPreScreen(sp)      (((sp) != 0) && sp->_prescreen)
-#define HasTerminal(sp)      (((sp) != 0) && (0 != ((sp)->_term)))
+#define IsPreScreen(sp)      (((sp) != NULL) && sp->_prescreen)
+#define HasTerminal(sp)      (((sp) != NULL) && (NULL != ((sp)->_term)))
 #define IsValidScreen(sp)    (HasTerminal(sp) && !IsPreScreen(sp))
 
 #if USE_REENTRANT
@@ -1291,7 +1291,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define WINDOW_EXT(w,m) (((WINDOWLIST *)((void *)((char *)(w) - offsetof(WINDOWLIST, win))))->m)
 
 #ifdef USE_SP_WINDOWLIST
-#define SP_INIT_WINDOWLIST(sp)	WindowList(sp) = 0
+#define SP_INIT_WINDOWLIST(sp)	WindowList(sp) = NULL
 #else
 #define SP_INIT_WINDOWLIST(sp)	/* nothing */
 #endif
@@ -1308,7 +1308,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
     sp->_cursor            = -1;                \
     SP_INIT_WINDOWLIST(sp);                     \
     sp->_outch             = NCURSES_OUTC_FUNC; \
-    sp->jump               = 0                  \
+    sp->jump               = NULL               \
 
 /* usually in <limits.h> */
 #ifndef UCHAR_MAX
@@ -1546,7 +1546,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define CHANGED     -1
 
 #define LEGALYX(w, y, x) \
-	      ((w) != 0 && \
+	      ((w) != NULL && \
 		((x) >= 0 && (x) <= (w)->_maxx && \
 		 (y) >= 0 && (y) <= (w)->_maxy))
 
@@ -1579,12 +1579,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #include <nc_alloc.h>
 #include <nc_access.h>
 
-#define FreeIfNeeded(p)  if ((p) != 0) free(p)
+#define FreeIfNeeded(p)  if ((p) != NULL) free(p)
 
 /* FreeAndNull() is not a comma-separated expression because some compilers
  * do not accept a mixture of void with values.
  */
-#define FreeAndNull(p)   do { free(p); p = 0; } while (0)
+#define FreeAndNull(p)   do { free(p); p = NULL; } while (0)
 
 #ifdef EXP_OOM_TESTING
 extern NCURSES_EXPORT(void *)	_nc_oom_malloc(size_t size);
@@ -1606,21 +1606,21 @@ extern NCURSES_EXPORT(char *)	_nc_oom_strdup(const char *ptr);
 #define TYPE_MALLOC(type, size, name) \
 	do { \
 	    name = typeMalloc(type, size); \
-	    if (name == 0) \
+	    if (name == NULL) \
 		_nc_err_abort(MSG_NO_MEMORY); \
 	} while (0)
 
 #define TYPE_CALLOC(type, size, name) \
 	do { \
 	    name = typeCalloc(type, size); \
-	    if (name == 0) \
+	    if (name == NULL) \
 		_nc_err_abort(MSG_NO_MEMORY); \
 	} while (0)
 
 #define TYPE_REALLOC(type, size, name) \
 	do { \
 	    name = typeRealloc(type, size, name); \
-	    if (name == 0) \
+	    if (name == NULL) \
 		_nc_err_abort(MSG_NO_MEMORY); \
 	} while (0)
 
@@ -1652,8 +1652,8 @@ extern NCURSES_EXPORT(char *)	_nc_oom_strdup(const char *ptr);
 /*
  * Standardize/simplify common loops
  */
-#define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen
-#define each_window(sp,p) p = WindowList(sp); p != 0; p = (p)->next
+#define each_screen(p) p = _nc_screen_chain; p != NULL; p = (p)->_next_screen
+#define each_window(sp,p) p = WindowList(sp); p != NULL; p = (p)->next
 #define each_ripoff(p) p = safe_ripoff_stack; (p - safe_ripoff_stack) < N_RIPS; ++p
 
 /*
@@ -1665,8 +1665,8 @@ extern NCURSES_EXPORT(char *)	_nc_oom_strdup(const char *ptr);
 #define T_CREATE(fmt) "create :" fmt
 #define T_RETURN(fmt) "return }" fmt
 
-#define NonNull(s)              ((s) != 0 ? s : "<null>")
-#define NonEmpty(s)             ((s) != 0 && *(s) != '\0')
+#define NonNull(s)              ((s) != NULL ? s : "<null>")
+#define NonEmpty(s)             ((s) != NULL && *(s) != '\0')
 
 #ifdef TRACE
 
@@ -1858,18 +1858,18 @@ extern	NCURSES_EXPORT(void) name (void); \
    TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));}
 
 #define DelCharCost(sp,count) \
-		((parm_dch != 0) \
+		((parm_dch != NULL) \
 		? sp->_dch_cost \
-		: ((delete_character != 0) \
+		: ((delete_character != NULL) \
 			? (sp->_dch1_cost * count) \
 			: INFINITY))
 
 #define InsCharCost(sp,count) \
-		((parm_ich != 0) \
+		((parm_ich != NULL) \
 		? sp->_ich_cost \
 		: ((enter_insert_mode && exit_insert_mode) \
 		  ? sp->_smir_cost + sp->_rmir_cost + (sp->_ip_cost * count) \
-		  : ((insert_character != 0) \
+		  : ((insert_character != NULL) \
 		    ? ((sp->_ich1_cost + sp->_ip_cost) * count) \
 		    : INFINITY)))
 
@@ -1956,7 +1956,7 @@ extern NCURSES_EXPORT(void) _nc_expanded (void);
 #endif
 
 #define save_ttytype(termp) \
-	if (TerminalType(termp).term_names != 0) { \
+	if (TerminalType(termp).term_names != NULL) { \
 	    _nc_STRNCPY(ttytype, \
 	    		TerminalType(termp).term_names, \
 			NAMESIZE - 1); \
@@ -2034,7 +2034,7 @@ extern NCURSES_EXPORT(void) _nc_reserve_pairs(SCREEN *, int);
 extern NCURSES_EXPORT(void) _nc_change_pair(SCREEN *, int);
 
 #define ReservePairs(sp,want) \
-	    if ((sp->_color_pairs == 0) || (want >= sp->_pair_alloc)) \
+	    if ((sp->_color_pairs == NULL) || (want >= sp->_pair_alloc)) \
 		_nc_reserve_pairs(sp, want)
 
 /* lib_getch.c */
@@ -2077,7 +2077,7 @@ extern NCURSES_EXPORT(SCREEN *) _nc_find_prescr(void);
 extern NCURSES_EXPORT(void)   _nc_forget_prescr(void);
 #else
 #define _nc_find_prescr()     _nc_prescreen.allocated
-#define _nc_forget_prescr()   _nc_prescreen.allocated = 0
+#define _nc_forget_prescr()   _nc_prescreen.allocated = NULL
 #endif
 
 /* lib_set_term.c */
@@ -2311,7 +2311,7 @@ extern NCURSES_EXPORT_VAR(int *) _nc_oldnums;
 
 #define USE_SETBUF_0 0
 
-#define NC_OUTPUT(sp) ((sp != 0 && sp->_ofp != 0) ? sp->_ofp : stdout)
+#define NC_OUTPUT(sp) ((sp != NULL && sp->_ofp != NULL) ? sp->_ofp : stdout)
 
 /*
  * On systems with a broken linker, define 'SP' as a function to force the
@@ -2385,7 +2385,7 @@ extern NCURSES_EXPORT(int) _nc_get_tty_mode(TTY *);
 #define SetSafeOutcWrapper(outc)	    \
     SCREEN* sp = CURRENT_SCREEN;            \
     struct screen outc_wrapper;		    \
-    if (sp==0) {                            \
+    if (sp == NULL) {                       \
 	sp = &outc_wrapper;                 \
 	memset(sp,0,sizeof(struct screen)); \
 	sp->_outch = _nc_outc_wrapper;      \
@@ -2579,7 +2579,7 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
 #  endif
 #else
 #  define IsTermInfo(sp)       TRUE
-#  define HasTInfoTerminal(sp) (0 != TerminalOf(sp))
+#  define HasTInfoTerminal(sp) (NULL != TerminalOf(sp))
 #  if defined(EXP_WIN32_DRIVER)
 #    define IsTermInfoOnConsole(sp) _nc_console_test(TerminalOf(sp)->Filedes)
 #  else
diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 91e230176..82f768cb7 100644
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -34,7 +34,7 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.15 2024/10/05 20:57:47 tom Exp $
+ * $Id: new_pair.h,v 1.16 2024/12/07 17:27:35 tom Exp $
  */
 
 #ifndef NEW_PAIR_H
@@ -111,7 +111,7 @@ colorpair_t;
  * that the index is within the limits of the table which we allocated.
  */
 #define ValidPair(sp,pair) \
-    ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
+    ((sp != NULL) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
 
 #if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
 extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
diff --git a/ncurses/report_offsets.c b/ncurses/report_offsets.c
index 034a789a6..6f7e4266f 100644
--- a/ncurses/report_offsets.c
+++ b/ncurses/report_offsets.c
@@ -34,10 +34,10 @@
 #define NEW_PAIR_INTERNAL 1
 #include <curses.priv.h>
 
-MODULE_ID("$Id: report_offsets.c,v 1.29 2024/05/25 23:00:26 tom Exp $")
+MODULE_ID("$Id: report_offsets.c,v 1.30 2024/12/07 21:18:23 tom Exp $")
 
 #define show_size(type) \
-	flag = 0; \
+	flag = NULL; \
 	last = 0; \
 	printf("%5lu   " #type "\n", (unsigned long)sizeof(type))
 #define show_name(name) \
@@ -48,7 +48,7 @@ MODULE_ID("$Id: report_offsets.c,v 1.29 2024/05/25 23:00:26 tom Exp $")
 		printf("?? incorrect order for " #type "." #member "\n"); \
 	printf("%5lu %c " #type "." #member "\n", next, flag ? *flag : ' '); \
 	last = next; \
-	flag = 0
+	flag = NULL
 
 #if NCURSES_WIDECHAR && NCURSES_EXT_COLORS
 #define show_COLORS(type,member) { flag = "c"; show_offset(type,member); }
@@ -104,7 +104,7 @@ MODULE_ID("$Id: report_offsets.c,v 1.29 2024/05/25 23:00:26 tom Exp $")
 int
 main(void)
 {
-    const char *flag = 0;
+    const char *flag = NULL;
     unsigned long last, next;
 
     printf("Size/offsets of data structures:\n");
diff --git a/ncurses/tinfo/MKcaptab.awk b/ncurses/tinfo/MKcaptab.awk
index ee4e2e9b8..cd6730e5b 100644
--- a/ncurses/tinfo/MKcaptab.awk
+++ b/ncurses/tinfo/MKcaptab.awk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2024 Thomas E. Dickey                                       #
 # Copyright 1998-2006,2007 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKcaptab.awk,v 1.21 2020/02/02 23:34:34 tom Exp $
+# $Id: MKcaptab.awk,v 1.22 2024/12/07 20:52:55 tom Exp $
 function add_string(text) {
     if (text != "IGNORE") {
 	offsets[num_strings] = offset;
@@ -53,7 +53,7 @@ BEGIN {
 		printf "/* generated by MKcaptab.awk %s(%d) */\n", tablename, bigstrings;
 		print ""
 		if (bigstrings) {
-		    printf "static struct alias *_nc_%s_table = 0;\n", tablename;
+		    printf "static struct alias *_nc_%s_table = NULL;\n", tablename;
 		    print "";
 		    printf "static const char %s_text[] = \"\\\n", tablename;
 		} else {
diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh
index 5f4135028..a55d48075 100755
--- a/ncurses/tinfo/MKcaptab.sh
+++ b/ncurses/tinfo/MKcaptab.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2019-2020,2023 Thomas E. Dickey                                  #
+# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2007-2010,2011 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -27,13 +27,13 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKcaptab.sh,v 1.20 2023/04/22 15:12:57 tom Exp $
+# $Id: MKcaptab.sh,v 1.22 2024/12/07 21:30:44 tom Exp $
 
 if test $# != 0
 then
 	AWK="$1"; shift 1
 else
-	AWK=awk
+	AWK="awk"
 fi
 
 if test $# != 0
@@ -71,12 +71,12 @@ cat <<'EOF'
 /* *INDENT-OFF* */
 EOF
 
-cat "$@" |./make_hash 1 info $OPT1
-cat "$@" |./make_hash 3 cap  $OPT1
+cat "$@" |./make_hash 1 info "$OPT1"
+cat "$@" |./make_hash 3 cap  "$OPT1"
 
-cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias
+cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=capalias
 
-cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=infoalias
+cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=infoalias
 
 cat <<EOF
 /* *INDENT-ON* */
@@ -93,9 +93,9 @@ _nc_build_names(struct name_table_entry **actual,
 		const name_table_data * source,
 		const char *strings)
 {
-    if (*actual == 0) {
+    if (*actual == NULL) {
 	*actual = typeCalloc(struct name_table_entry, CAPTABSIZE);
-	if (*actual != 0) {
+	if (*actual != NULL) {
 	    unsigned n;
 	    unsigned len = 0;
 	    for (n = 0; n < CAPTABSIZE; ++n) {
@@ -121,9 +121,9 @@ _nc_build_alias(struct alias **actual,
 		const char *strings,
 		size_t tablesize)
 {
-    if (*actual == 0) {
+    if (*actual == NULL) {
 	*actual = typeCalloc(struct alias, tablesize + 1);
-	if (*actual != 0) {
+	if (*actual != NULL) {
 	    size_t n;
 	    for (n = 0; n < tablesize; ++n) {
 		add_alias(from);
diff --git a/ncurses/tinfo/MKcodes.awk b/ncurses/tinfo/MKcodes.awk
index 48f4800b3..ca82c2e34 100644
--- a/ncurses/tinfo/MKcodes.awk
+++ b/ncurses/tinfo/MKcodes.awk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2024 Thomas E. Dickey                                  #
 # Copyright 2007-2009,2010 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKcodes.awk,v 1.11 2020/02/02 23:34:34 tom Exp $
+# $Id: MKcodes.awk,v 1.12 2024/12/07 20:03:37 tom Exp $
 function large_item(value) {
 	result = sprintf("%d,", offset);
 	offset = offset + length(value) + 1;
@@ -105,7 +105,7 @@ END	{
 		print  "#if BROKEN_LINKER || USE_REENTRANT"
 		print  ""
 		if (bigstrings) {
-			printf "static const char _nc_code_blob[] = \n"
+			printf "static const char _nc_code_blob[] =\n"
 			printf "%s;\n", bigstr;
 			print_offsets("boolcodes", large_boolcodes);
 			print_offsets("numcodes", large_numcodes);
diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 02b36ed73..95b0b2675 100755
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -27,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKfallback.sh,v 1.26 2023/04/22 15:12:57 tom Exp $
+# $Id: MKfallback.sh,v 1.27 2024/12/07 20:57:05 tom Exp $
 #
 # MKfallback.sh -- create fallback table for entry reads
 #
@@ -150,8 +150,8 @@ NCURSES_EXPORT(const TERMTYPE *)
 _nc_fallback (const char *name)
 {
     const TERMTYPE2 *tp = _nc_fallback2(name);
-    const TERMTYPE *result = 0;
-    if (tp != 0) {
+    const TERMTYPE *result = NULL;
+    if (tp != NULL) {
 	static TERMTYPE temp;
 	_nc_export_termtype2(&temp, tp);
 	result = &temp;
diff --git a/ncurses/tinfo/MKnames.awk b/ncurses/tinfo/MKnames.awk
index 4594c728d..659bdfb66 100644
--- a/ncurses/tinfo/MKnames.awk
+++ b/ncurses/tinfo/MKnames.awk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2008,2009 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKnames.awk,v 1.24 2020/02/02 23:34:34 tom Exp $
+# $Id: MKnames.awk,v 1.25 2024/12/07 20:04:23 tom Exp $
 function large_item(value) {
 	result = sprintf("%d,", offset);
 	offset = offset + length(value) + 1;
@@ -111,7 +111,7 @@ END	{
 		print  "#if BROKEN_LINKER || USE_REENTRANT"
 		print  ""
 		if (bigstrings) {
-			printf "static const char _nc_name_blob[] = \n"
+			printf "static const char _nc_name_blob[] =\n"
 			printf "%s;\n", bigstr;
 			print_offsets("boolfnames", large_boolfnames);
 			print_offsets("boolnames", large_boolnames);
diff --git a/ncurses/tinfo/MKuserdefs.sh b/ncurses/tinfo/MKuserdefs.sh
index 109dd6445..872c5ae13 100755
--- a/ncurses/tinfo/MKuserdefs.sh
+++ b/ncurses/tinfo/MKuserdefs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2024 Thomas E. Dickey                                  #
 #                                                                            #
 # 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: MKuserdefs.sh,v 1.10 2020/02/02 23:34:34 tom Exp $
+# $Id: MKuserdefs.sh,v 1.11 2024/12/07 20:04:23 tom Exp $
 AWK=${1-awk}; shift 1
 OPT1=${1-0}; shift 1
 
@@ -69,9 +69,9 @@ _nc_build_names(struct user_table_entry **actual,
 		const user_table_data *source,
 		const char *strings)
 {
-    if (*actual == 0) {
+    if (*actual == NULL) {
 	*actual = typeCalloc(struct user_table_entry, USERTABSIZE);
-	if (*actual != 0) {
+	if (*actual != NULL) {
 	    unsigned n;
 	    unsigned len = 0;
 	    for (n = 0; n < USERTABSIZE; ++n) {
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 9129aeeec..9bd0fa5b1 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.40 2024/11/09 18:30:28 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.41 2024/12/07 18:05:04 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -70,7 +70,7 @@ _nc_rootname(char *path)
     static char *temp;
     char *s;
 
-    if ((temp = strdup(result)) != 0)
+    if ((temp = strdup(result)) != NULL)
 	result = temp;
 #if !MIXEDCASE_FILENAMES
     for (s = result; *s != '\0'; ++s) {
@@ -97,7 +97,7 @@ _nc_is_abs_path(const char *path)
 #define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
 		  || (((s)[0] != 0) && ((s)[1] == ':')))
 #else
-#define is_pathname(s) ((s) != 0 && (s)[0] == '/')
+#define is_pathname(s) ((s) != NULL && (s)[0] == '/')
 #endif
     return is_pathname(path);
 }
@@ -113,7 +113,7 @@ _nc_pathlast(const char *path)
     if (test == 0)
 	test = strrchr(path, '\\');
 #endif
-    if (test == 0)
+    if (test == NULL)
 	test = path;
     else
 	test++;
@@ -131,7 +131,7 @@ _nc_access(const char *path, int mode)
 {
     int result;
 
-    if (path == 0) {
+    if (path == NULL) {
 	errno = ENOENT;
 	result = -1;
     } else if (ACCESS(path, mode) < 0) {
@@ -143,7 +143,7 @@ _nc_access(const char *path, int mode)
 
 	    _nc_STRCPY(head, path, sizeof(head));
 	    leaf = _nc_basename(head);
-	    if (leaf == 0)
+	    if (leaf == NULL)
 		leaf = head;
 	    *leaf = '\0';
 	    if (head == leaf)
diff --git a/ncurses/tinfo/add_tries.c b/ncurses/tinfo/add_tries.c
index 9d215575f..ff41c103d 100644
--- a/ncurses/tinfo/add_tries.c
+++ b/ncurses/tinfo/add_tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: add_tries.c,v 1.13 2023/06/24 15:36:13 tom Exp $")
+MODULE_ID("$Id: add_tries.c,v 1.14 2024/12/07 20:04:23 tom Exp $")
 
 #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
 #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
@@ -57,14 +57,14 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
     if (!VALID_STRING(str) || *txt == '\0' || code == 0)
 	returnCode(ERR);
 
-    if ((*tree) != 0) {
+    if ((*tree) != NULL) {
 	ptr = savedptr = (*tree);
 
 	for (;;) {
 	    unsigned char cmp = *txt;
 
 	    while (!CMP_TRY(ptr->ch, cmp)
-		   && ptr->sibling != 0)
+		   && ptr->sibling != NULL)
 		ptr = ptr->sibling;
 
 	    if (CMP_TRY(ptr->ch, cmp)) {
@@ -72,12 +72,12 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
 		    ptr->value = (unsigned short) code;
 		    returnCode(OK);
 		}
-		if (ptr->child != 0)
+		if (ptr->child != NULL)
 		    ptr = ptr->child;
 		else
 		    break;
 	    } else {
-		if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) {
+		if ((ptr->sibling = typeCalloc(TRIES, 1)) == NULL) {
 		    returnCode(ERR);
 		}
 
@@ -91,7 +91,7 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
     } else {			/* (*tree) == 0 :: First sequence to be added */
 	savedptr = ptr = (*tree) = typeCalloc(TRIES, 1);
 
-	if (ptr == 0) {
+	if (ptr == NULL) {
 	    returnCode(ERR);
 	}
 
@@ -106,8 +106,8 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
 
 	ptr = ptr->child;
 
-	if (ptr == 0) {
-	    while ((ptr = savedptr) != 0) {
+	if (ptr == NULL) {
+	    while ((ptr = savedptr) != NULL) {
 		savedptr = ptr->child;
 		free(ptr);
 	    }
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index aa2bc6ed0..84fc48492 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.80 2024/11/09 20:36:48 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.81 2024/12/07 21:12:53 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -104,7 +104,7 @@ _nc_copy_entry(ENTRY * oldp)
 NCURSES_EXPORT(char *)
 _nc_save_str(const char *string)
 {
-    char *result = 0;
+    char *result = NULL;
     size_t old_next_free = next_free;
 
     if (stringbuf != NULL) {
@@ -164,7 +164,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 	}
 
 	for (i = 0; i < nuses; i++) {
-	    if (ep->uses[i].name == 0) {
+	    if (ep->uses[i].name == NULL) {
 		ep->uses[i].name = _nc_save_str(ep->uses[i].name);
 	    }
 	}
@@ -187,7 +187,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     }
 
     for (i = 0; i < nuses; i++) {
-	if (ep->uses[i].name == 0)
+	if (ep->uses[i].name == NULL)
 	    useoffsets[i] = ABSENT_OFFSET;
 	else
 	    useoffsets[i] = (int) (ep->uses[i].name - stringbuf);
@@ -237,7 +237,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 
     for (i = 0; i < nuses; i++) {
 	if (useoffsets[i] == ABSENT_OFFSET) {
-	    ep->uses[i].name = 0;
+	    ep->uses[i].name = NULL;
 	} else {
 	    ep->uses[i].name = strdup(tp->str_table + useoffsets[i]);
 	}
@@ -258,7 +258,7 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
 #endif
     unsigned i;
 
-    if (source == 0 || from == 0 || target == 0 || to == 0)
+    if (source == NULL || from == NULL || target == NULL || to == NULL)
 	return;
 
 #if NCURSES_XNAMES
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index ae45b0023..6266263b7 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.52 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.53 2024/12/07 18:08:56 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -532,8 +532,8 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
     char *new_table;
     size_t new_table_size;
 #if NCURSES_EXT_NUMBERS
-    short *oldptr = 0;
-    int *newptr = 0;
+    short *oldptr = NULL;
+    int *newptr = NULL;
 #endif
 
     DEBUG(2, (T_CALLED("copy_termtype(dst=%p, src=%p, mode=%d)"), (void *)
@@ -594,7 +594,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	TYPE_MALLOC(int, NUM_NUMBERS(dst), newptr);
 	dst->Numbers = newptr;
     }
-    if ((mode == srcINT) && (oldptr != 0)) {
+    if ((mode == srcINT) && (oldptr != NULL)) {
 	DEBUG(2, ("...copy int ->short"));
 	for (i = 0; i < NUM_NUMBERS(dst); ++i) {
 	    if (src->Numbers[i] > MAX_OF_TYPE(short)) {
@@ -603,7 +603,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 		oldptr[i] = (short) src->Numbers[i];
 	    }
 	}
-    } else if ((mode == dstINT) && (newptr != 0)) {
+    } else if ((mode == dstINT) && (newptr != NULL)) {
 	DEBUG(2, ("...copy short ->int"));
 	for (i = 0; i < NUM_NUMBERS(dst); ++i) {
 	    newptr[i] = ((const short *) (src->Numbers))[i];
@@ -672,7 +672,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	    }
 	}
     } else {
-	dst->ext_Names = 0;
+	dst->ext_Names = NULL;
     }
 #endif
     (void) new_table_size;
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index c3bf0d3c2..f9f7d4c49 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.104 2024/10/19 21:18:54 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.105 2024/12/07 21:12:53 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -124,7 +124,7 @@ static char *
 init_string(void)
 /* initialize 'my_string', 'my_length' */
 {
-    if (my_string == 0)
+    if (my_string == NULL)
 	TYPE_MALLOC(char, my_length = 256, my_string);
 
     *my_string = '\0';
@@ -138,7 +138,7 @@ save_string(char *d, const char *const s)
     size_t need = have + strlen(s) + 2;
     if (need > my_length) {
 	my_string = (char *) _nc_doalloc(my_string, my_length = (need + need));
-	if (my_string == 0)
+	if (my_string == NULL)
 	    _nc_err_abort(MSG_NO_MEMORY);
 	d = my_string + have;
     }
@@ -313,8 +313,8 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
     dp = init_string();
 
     /* skip the initial padding (if we haven't been told not to) */
-    capstart = 0;
-    if (s == 0)
+    capstart = NULL;
+    if (s == NULL)
 	s = "";
     if (parameterized >= 0 && isdigit(UChar(*s)))
 	for (capstart = s; *s != '\0'; s++)
@@ -619,7 +619,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 {
     int seenone = 0, seentwo = 0, saw_m = 0, saw_n = 0;
     const char *padding;
-    const char *trimmed = 0;
+    const char *trimmed = NULL;
     int in0, in1, in2;
     char ch1 = 0, ch2 = 0;
     char *bufptr = init_string();
@@ -655,9 +655,9 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 
     for (; !syntax_error &&
 	 *str &&
-	 ((trimmed == 0) || (str < trimmed)); str++) {
+	 ((trimmed == NULL) || (str < trimmed)); str++) {
 	int c1, c2;
-	char *cp = 0;
+	char *cp = NULL;
 
 	if (str[0] == '^') {
 	    if (str[1] == '\0' || (str + 1) == trimmed) {
@@ -743,7 +743,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 				++myfix;
 			    }
 			}
-		    } else if (strchr("E\\nrtbf", xx1) == 0) {
+		    } else if (strchr("E\\nrtbf", xx1) == NULL) {
 			switch (xx1) {
 			case 'e':
 			    xx1 = 'E';
@@ -814,7 +814,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 		   && ((in0 == 4 && in1 == 10 && in2 == 48)
 		       || (in0 == 3 && in1 == 9 && in2 == 38))) {
 	    /* dumb-down an optimized case from xterm-256color for termcap */
-	    if ((str = strstr(str, ";m")) == 0)
+	    if ((str = strstr(str, ";m")) == NULL)
 		break;		/* cannot happen */
 	    ++str;
 	    if (in2 == 48) {
@@ -981,7 +981,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 	 * but that may not be the end of the string.
 	 */
 	assert(str != 0);
-	if (str == 0 || *str == '\0')
+	if (str == NULL || *str == '\0')
 	    break;
 
     }				/* endwhile (*str) */
@@ -1050,7 +1050,7 @@ main(int argc, char *argv[])
 NCURSES_EXPORT(void)
 _nc_captoinfo_leaks(void)
 {
-    if (my_string != 0) {
+    if (my_string != NULL) {
 	FreeAndNull(my_string);
     }
     my_length = 0;
diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c
index 3e6b4022a..d49164e6a 100644
--- a/ncurses/tinfo/comp_error.c
+++ b/ncurses/tinfo/comp_error.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_error.c,v 1.44 2023/06/15 20:27:02 tom Exp $")
+MODULE_ID("$Id: comp_error.c,v 1.45 2024/12/07 20:04:23 tom Exp $")
 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
@@ -75,9 +75,9 @@ NCURSES_EXPORT(void)
 _nc_set_type(const char *const name)
 {
 #define MY_SIZE (size_t) MAX_NAME_SIZE
-    if (TermType == 0)
+    if (TermType == NULL)
 	TermType = typeMalloc(char, MY_SIZE + 1);
-    if (TermType != 0) {
+    if (TermType != NULL) {
 	TermType[0] = '\0';
 	if (name) {
 	    _nc_STRNCAT(TermType, name, MY_SIZE, MY_SIZE);
@@ -89,13 +89,13 @@ NCURSES_EXPORT(void)
 _nc_get_type(char *name)
 {
 #if NO_LEAKS
-    if (name == 0 && TermType != 0) {
+    if (name == NULL && TermType != NULL) {
 	FreeAndNull(TermType);
 	return;
     }
 #endif
-    if (name != 0)
-	_nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE);
+    if (name != NULL)
+	_nc_STRCPY(name, TermType != NULL ? TermType : "", MAX_NAME_SIZE);
 }
 
 static NCURSES_INLINE void
@@ -106,7 +106,7 @@ where_is_problem(void)
 	fprintf(stderr, ", line %d", _nc_curr_line);
     if (_nc_curr_col > 0)
 	fprintf(stderr, ", col %d", _nc_curr_col);
-    if (TermType != 0 && TermType[0] != '\0')
+    if (TermType != NULL && TermType[0] != '\0')
 	fprintf(stderr, ", terminal '%s'", TermType);
     fputc(':', stderr);
     fputc(' ', stderr);
diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index 4e4f84eae..5ea100e60 100644
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.36 2024/11/30 21:24:57 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.37 2024/12/07 21:12:53 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -73,18 +73,18 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 	int offset;
     } fixups[MAX_TC_FIXUPS];
 
-    if (srcp == 0) {
+    if (srcp == NULL) {
 #if NO_LEAKS
-	if (buffer != 0) {
+	if (buffer != NULL) {
 	    FreeAndNull(buffer);
 	    length = 0;
 	}
 #endif
-	return 0;
+	return NULL;
     }
-    if (buffer == 0 || need > length) {
-	if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
-	      return 0;
+    if (buffer == NULL || need > length) {
+	if ((buffer = typeRealloc(char, length = need, buffer)) == NULL)
+	      return NULL;
     }
 
     DEBUG_THIS(("_nc_tic_expand %s:%s:%s",
@@ -124,9 +124,9 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 	    case 1:
 		if (str[0] == L_BRACE
 		    && isdigit(UChar(str[1]))) {
-		    char *dst = 0;
+		    char *dst = NULL;
 		    long value = strtol(str + 1, &dst, 0);
-		    if (dst != 0
+		    if (dst != NULL
 			&& *dst == R_BRACE
 			&& value < 127
 			&& isprint(UChar(value))) {
diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
index 4b081afa2..4554b923a 100644
--- a/ncurses/tinfo/comp_hash.c
+++ b/ncurses/tinfo/comp_hash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #include <tic.h>
 #include <hashsize.h>
 
-MODULE_ID("$Id: comp_hash.c,v 1.55 2023/06/24 13:29:43 tom Exp $")
+MODULE_ID("$Id: comp_hash.c,v 1.56 2024/12/07 20:05:08 tom Exp $")
 
 /*
  * Finds the entry for the given string in the hash table if present.
@@ -58,7 +58,7 @@ _nc_find_entry(const char *string,
     bool termcap = (hash_table != _nc_get_hash_table(FALSE));
     const HashData *data = _nc_get_hash_info(termcap);
     int hashvalue;
-    struct name_table_entry const *ptr = 0;
+    struct name_table_entry const *ptr = NULL;
     struct name_table_entry const *real_table;
 
     hashvalue = data->hash_of(string);
@@ -71,7 +71,7 @@ _nc_find_entry(const char *string,
 	ptr = real_table + data->table_data[hashvalue];
 	while (!data->compare_names(ptr->nte_name, string)) {
 	    if (ptr->nte_link < 0) {
-		ptr = 0;
+		ptr = NULL;
 		break;
 	    }
 	    ptr = real_table + (ptr->nte_link
@@ -108,7 +108,7 @@ _nc_find_type_entry(const char *string,
 	    while (ptr->nte_type != type
 		   || !data->compare_names(ptr->nte_name, string)) {
 		if (ptr->nte_link < 0) {
-		    ptr = 0;
+		    ptr = NULL;
 		    break;
 		}
 		ptr = table + (ptr->nte_link + data->table_data[data->table_size]);
@@ -125,7 +125,7 @@ _nc_find_user_entry(const char *string)
 {
     const HashData *data = _nc_get_hash_user();
     int hashvalue;
-    struct user_table_entry const *ptr = 0;
+    struct user_table_entry const *ptr = NULL;
     struct user_table_entry const *real_table;
 
     hashvalue = data->hash_of(string);
@@ -138,7 +138,7 @@ _nc_find_user_entry(const char *string)
 	ptr = real_table + data->table_data[hashvalue];
 	while (!data->compare_names(ptr->ute_name, string)) {
 	    if (ptr->ute_link < 0) {
-		ptr = 0;
+		ptr = NULL;
 		break;
 	    }
 	    ptr = real_table + (ptr->ute_link
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 3cda08930..4cb55ac4d 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.135 2024/07/27 19:15:16 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.136 2024/12/07 21:12:53 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -64,13 +64,13 @@ enqueue(ENTRY * ep)
     DEBUG(2, (T_CALLED("enqueue(ep=%p)"), (void *) ep));
 
     newp = _nc_copy_entry(ep);
-    if (newp == 0)
+    if (newp == NULL)
 	_nc_err_abort(MSG_NO_MEMORY);
 
     newp->last = _nc_tail;
     _nc_tail = newp;
 
-    newp->next = 0;
+    newp->next = NULL;
     if (newp->last)
 	newp->last->next = newp;
     DEBUG(2, (T_RETURN("")));
@@ -81,7 +81,7 @@ enqueue(ENTRY * ep)
 static char *
 force_bar(char *dst, char *src)
 {
-    if (strchr(src, '|') == 0) {
+    if (strchr(src, '|') == NULL) {
 	size_t len = strlen(src);
 	if (len > MAX_NAME_SIZE)
 	    len = MAX_NAME_SIZE;
@@ -91,7 +91,7 @@ force_bar(char *dst, char *src)
     }
     return src;
 }
-#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)
+#define ForceBar(dst, src) ((strchr(src, '|') == NULL) ? force_bar(dst, src) : src)
 
 #if NCURSES_USE_TERMCAP && NCURSES_XNAMES
 static char *
@@ -152,7 +152,7 @@ static char *
 name_ending(char *name)
 {
     if (*name == '\0') {
-	name = 0;
+	name = NULL;
     } else {
 	while (*name != '\0' && *name != '|')
 	    ++name;
@@ -403,7 +403,7 @@ NCURSES_EXPORT(int)
 _nc_resolve_uses2(bool fullresolve, bool literal)
 /* try to resolve all use capabilities */
 {
-    ENTRY *qp, *rp, *lastread = 0;
+    ENTRY *qp, *rp, *lastread = NULL;
     bool keepgoing;
     unsigned i, j;
     int total_unresolved, multiples;
@@ -452,7 +452,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 	    char *lookfor = qp->uses[i].name;
 	    long lookline = qp->uses[i].line;
 
-	    if (lookfor == 0)
+	    if (lookfor == NULL)
 		continue;
 
 	    foundit = FALSE;
@@ -518,7 +518,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 
 		_nc_curr_line = (int) lookline;
 		_nc_warning("resolution of use=%s failed", lookfor);
-		qp->uses[i].link = 0;
+		qp->uses[i].link = NULL;
 	    }
 	}
     }
@@ -758,7 +758,7 @@ _nc_leaks_tic(void)
     _nc_names_leaks();
     _nc_codes_leaks();
 #endif
-    _nc_tic_expand(0, FALSE, 0);
+    _nc_tic_expand(NULL, FALSE, 0);
     T((T_RETURN("")));
 }
 
diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index 6c7e82022..0cfa9694e 100644
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.124 2024/11/23 18:45:01 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.125 2024/12/07 21:17:54 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -70,7 +70,7 @@ NCURSES_EXPORT_VAR (long) _nc_start_line = 0;    /* start line of current entry
 
 NCURSES_EXPORT_VAR (struct token) _nc_curr_token =
 {
-    0, 0, 0
+    NULL, 0, NULL
 };
 
 /*****************************************************************************
@@ -116,12 +116,12 @@ _nc_reset_input(FILE *fp, char *buf)
        (T_CALLED("_nc_reset_input(fp=%p, buf=%p)"), (void *) fp, buf));
 
     pushtype = NO_PUSHBACK;
-    if (pushname != 0)
+    if (pushname != NULL)
 	pushname[0] = '\0';
     yyin = fp;
     bufstart = bufptr = buf;
     _nc_curr_file_pos = 0L;
-    if (fp != 0)
+    if (fp != NULL)
 	_nc_curr_line = 0;
     _nc_curr_col = 0;
 
@@ -197,18 +197,18 @@ next_char(void)
     int the_char;
 
     if (!yyin) {
-	if (result != 0) {
+	if (result != NULL) {
 	    FreeAndNull(result);
 	    FreeAndNull(pushname);
-	    bufptr = 0;
-	    bufstart = 0;
+	    bufptr = NULL;
+	    bufstart = NULL;
 	    allocated = 0;
 	}
 	/*
 	 * An string with an embedded null will truncate the input.  This is
 	 * intentional (we don't read binary files here).
 	 */
-	if (bufptr == 0 || *bufptr == '\0')
+	if (bufptr == NULL || *bufptr == '\0')
 	    return (EOF);
 	if (*bufptr == '\n') {
 	    _nc_curr_line++;
@@ -227,12 +227,12 @@ next_char(void)
 
 	do {
 	    size_t used = 0;
-	    bufstart = 0;
+	    bufstart = NULL;
 	    do {
 		if (used + (LEXBUFSIZ / 4) >= allocated) {
 		    allocated += (allocated + LEXBUFSIZ);
 		    result = typeRealloc(char, allocated, result);
-		    if (result == 0)
+		    if (result == NULL)
 			return (EOF);
 		    if (bufstart)
 			bufstart = result;
@@ -254,7 +254,7 @@ next_char(void)
 		    if (used != 0)
 			_nc_STRCAT(result, "\n", allocated);
 		}
-		if ((bufptr = bufstart) != 0) {
+		if ((bufptr = bufstart) != NULL) {
 		    used = strlen(bufptr);
 		    if (used == 0)
 			return (EOF);
@@ -407,12 +407,12 @@ _nc_get_token(bool silent)
     if (pushtype != NO_PUSHBACK) {
 	int retval = pushtype;
 
-	_nc_set_type(pushname != 0 ? pushname : "");
+	_nc_set_type(pushname != NULL ? pushname : "");
 	DEBUG(3, ("pushed-back token: `%s', class %d",
 		  _nc_curr_token.tk_name, pushtype));
 
 	pushtype = NO_PUSHBACK;
-	if (pushname != 0)
+	if (pushname != NULL)
 	    pushname[0] = '\0';
 
 	/* currtok wasn't altered by _nc_push_token() */
@@ -421,11 +421,11 @@ _nc_get_token(bool silent)
     }
 
     if (end_of_stream()) {
-	yyin = 0;
+	yyin = NULL;
 	(void) next_char();	/* frees its allocated memory */
-	if (tok_buf != 0) {
+	if (tok_buf != NULL) {
 	    if (_nc_curr_token.tk_name == tok_buf)
-		_nc_curr_token.tk_name = 0;
+		_nc_curr_token.tk_name = NULL;
 	}
 	DEBUG(3, (T_RETURN("%d"), EOF));
 	return (EOF);
@@ -439,7 +439,7 @@ _nc_get_token(bool silent)
     }
 
     ch = eat_escaped_newline(ch);
-    _nc_curr_token.tk_valstring = 0;
+    _nc_curr_token.tk_valstring = NULL;
 
 #ifdef TRACE
     old_line = _nc_curr_line;
@@ -475,7 +475,7 @@ _nc_get_token(bool silent)
 #if NCURSES_EXT_FUNCS
 	    && !(ch == '.' && _nc_disable_period)
 #endif
-	    && ((strchr) (terminfo_punct, (char) ch) == 0)) {
+	    && ((strchr) (terminfo_punct, (char) ch) == NULL)) {
 	    if (!silent)
 		_nc_warning("Illegal character (expected alphanumeric or %s) - '%s'",
 			    terminfo_punct, unctrl(UChar(ch)));
@@ -483,7 +483,7 @@ _nc_get_token(bool silent)
 	    goto start_token;
 	}
 
-	if (tok_buf == 0)
+	if (tok_buf == NULL)
 	    tok_buf = typeMalloc(char, TOK_BUF_SIZE);
 
 #ifdef TRACE
@@ -499,14 +499,14 @@ _nc_get_token(bool silent)
 	    _nc_start_line = _nc_curr_line;
 
 	    _nc_syntax = ERR;
-	    after_name = 0;
-	    after_list = 0;
+	    after_name = NULL;
+	    after_list = NULL;
 	    while ((ch = next_char()) != '\n') {
 		if (ch == EOF) {
 		    _nc_err_abort(MSG_NO_INPUTS);
 		} else if (ch == '|') {
 		    after_list = tok_ptr;
-		    if (after_name == 0)
+		    if (after_name == NULL)
 			after_name = tok_ptr;
 		} else if (ch == ':' && last_char(0) != ',') {
 		    _nc_syntax = SYN_TERMCAP;
@@ -519,7 +519,7 @@ _nc_get_token(bool silent)
 		     * If we did not see a '|', then we found a name with no
 		     * aliases or description.
 		     */
-		    if (after_name == 0)
+		    if (after_name == NULL)
 			break;
 		    /*
 		     * We saw a comma, but are not entirely sure this is
@@ -614,7 +614,7 @@ _nc_get_token(bool silent)
 	     * for following warning messages.  If there's no '|', then there
 	     * is no description.
 	     */
-	    if (after_name != 0) {
+	    if (after_name != NULL) {
 		ch = *after_name;
 		*after_name = '\0';
 		_nc_set_type(tok_buf);
@@ -625,11 +625,11 @@ _nc_get_token(bool silent)
 	     * Compute the boundary between the aliases and the description
 	     * field for syntax-checking purposes.
 	     */
-	    if (after_list != 0) {
+	    if (after_list != NULL) {
 		if (!silent) {
 		    if (*after_list == '\0' || strchr("|", after_list[1]) != NULL) {
 			_nc_warning("empty longname field");
-		    } else if (strchr(after_list, ' ') == 0) {
+		    } else if (strchr(after_list, ' ') == NULL) {
 			_nc_warning("older tic versions may treat the description field as an alias");
 		    }
 		}
@@ -805,7 +805,7 @@ _nc_get_token(bool silent)
 	type = _nc_get_token(silent);
 
     DEBUG(3, ("token: `%s', class %d",
-	      ((_nc_curr_token.tk_name != 0)
+	      ((_nc_curr_token.tk_name != NULL)
 	       ? _nc_curr_token.tk_name
 	       : "<null>"),
 	      type));
@@ -1023,12 +1023,12 @@ _nc_push_token(int tokclass)
      * _nc_get_token() touches.
      */
     pushtype = tokclass;
-    if (pushname == 0)
+    if (pushname == NULL)
 	pushname = typeMalloc(char, MAX_NAME_SIZE + 1);
     _nc_get_type(pushname);
 
     DEBUG(3, ("pushing token: `%s', class %d",
-	      ((_nc_curr_token.tk_name != 0)
+	      ((_nc_curr_token.tk_name != NULL)
 	       ? _nc_curr_token.tk_name
 	       : "<null>"),
 	      pushtype));
@@ -1053,10 +1053,10 @@ _nc_panic_mode(char ch)
 NCURSES_EXPORT(void)
 _nc_comp_scan_leaks(void)
 {
-    if (pushname != 0) {
+    if (pushname != NULL) {
 	FreeAndNull(pushname);
     }
-    if (tok_buf != 0) {
+    if (tok_buf != NULL) {
 	FreeAndNull(tok_buf);
     }
 }
diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index d8eb3ddb2..255c1687d 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.51 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.52 2024/12/07 18:23:25 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -127,12 +127,12 @@ update_getenv(const char *name, DBDIRS which)
 	const char *cached_value = my_vars[which].value;
 	bool same_value;
 
-	if ((value = getenv(name)) != 0) {
+	if ((value = getenv(name)) != NULL) {
 	    value = strdup(value);
 	}
-	same_value = ((value == 0 && cached_value == 0) ||
-		      (value != 0 &&
-		       cached_value != 0 &&
+	same_value = ((value == NULL && cached_value == NULL) ||
+		      (value != NULL &&
+		       cached_value != NULL &&
 		       strcmp(value, cached_value) == 0));
 
 	/* Set variable name to enable checks in cache_expired(). */
@@ -153,7 +153,7 @@ update_getenv(const char *name, DBDIRS which)
 static char *
 cache_getenv(const char *name, DBDIRS which)
 {
-    char *result = 0;
+    char *result = NULL;
 
     (void) update_getenv(name, which);
     if (which < dbdLAST) {
@@ -185,7 +185,7 @@ cache_expired(void)
     } else {
 	DBDIRS n;
 	for (n = (DBDIRS) 0; n < dbdLAST; ++n) {
-	    if (my_vars[n].name != 0
+	    if (my_vars[n].name != NULL
 		&& update_getenv(my_vars[n].name, n)) {
 		result = TRUE;
 		break;
@@ -225,7 +225,7 @@ _nc_tic_dir(const char *path)
 	} else if (HaveTicDirectory == 0) {
 	    if (use_terminfo_vars()) {
 		const char *envp;
-		if ((envp = getenv("TERMINFO")) != 0)
+		if ((envp = getenv("TERMINFO")) != NULL)
 		    return _nc_tic_dir(envp);
 	    }
 	}
@@ -251,7 +251,7 @@ _nc_keep_tic_dir(const char *path)
 NCURSES_EXPORT(void)
 _nc_last_db(void)
 {
-    if (my_blob != 0 && cache_expired()) {
+    if (my_blob != NULL && cache_expired()) {
 	free_cache();
     }
 }
@@ -268,14 +268,14 @@ _nc_next_db(DBDIRS * state, int *offset)
 
     (void) offset;
     if ((int) *state < my_size
-	&& my_list != 0
-	&& my_list[*state] != 0) {
+	&& my_list != NULL
+	&& my_list[*state] != NULL) {
 	result = my_list[*state];
 	(*state)++;
     } else {
-	result = 0;
+	result = NULL;
     }
-    if (result != 0) {
+    if (result != NULL) {
 	T(("_nc_next_db %d %s", *state, result));
     }
     return result;
@@ -293,7 +293,7 @@ _nc_first_db(DBDIRS * state, int *offset)
     /* build a blob containing all of the strings we will use for a lookup
      * table.
      */
-    if (my_blob == 0 || (cache_has_expired = cache_expired())) {
+    if (my_blob == NULL || (cache_has_expired = cache_expired())) {
 	size_t blobsize = 0;
 	const char *values[dbdLAST];
 	struct stat *my_stat;
@@ -303,7 +303,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 	    free_cache();
 
 	for (j = 0; j < dbdLAST; ++j)
-	    values[j] = 0;
+	    values[j] = NULL;
 
 	/*
 	 * This is the first item in the list, and is used only when tic is
@@ -344,13 +344,13 @@ _nc_first_db(DBDIRS * state, int *offset)
 	}
 
 	for (j = 0; j < dbdLAST; ++j) {
-	    if (values[j] == 0)
+	    if (values[j] == NULL)
 		values[j] = "";
 	    blobsize += 2 + strlen(values[j]);
 	}
 
 	my_blob = malloc(blobsize);
-	if (my_blob != 0) {
+	if (my_blob != NULL) {
 	    *my_blob = '\0';
 	    for (j = 0; j < dbdLAST; ++j) {
 		add_to_blob(values[j], blobsize);
@@ -366,7 +366,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 	    }
 	    my_list = typeCalloc(char *, blobsize);
 	    my_stat = typeCalloc(struct stat, blobsize);
-	    if (my_list != 0 && my_stat != 0) {
+	    if (my_list != NULL && my_stat != NULL) {
 		int k = 0;
 		my_list[k++] = my_blob;
 		for (j = 0; my_blob[j] != '\0'; ++j) {
@@ -381,11 +381,11 @@ _nc_first_db(DBDIRS * state, int *offset)
 		/*
 		 * Eliminate duplicates from the list.
 		 */
-		for (j = 0; my_list[j] != 0; ++j) {
+		for (j = 0; my_list[j] != NULL; ++j) {
 #ifdef TERMINFO
 		    if (*my_list[j] == '\0') {
 			char *my_copy = strdup(TERMINFO);
-			if (my_copy != 0)
+			if (my_copy != NULL)
 			    my_list[j] = my_copy;
 		    }
 #endif
@@ -394,7 +394,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 			if (!strcmp(my_list[j], my_list[k])) {
 			    T(("duplicate %s", my_list[j]));
 			    k = j - 1;
-			    while ((my_list[j] = my_list[j + 1]) != 0) {
+			    while ((my_list[j] = my_list[j + 1]) != NULL) {
 				++j;
 			    }
 			    j = k;
@@ -407,7 +407,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 		 * Eliminate non-existent databases, and those that happen to
 		 * be symlinked to another location.
 		 */
-		for (j = 0; my_list[j] != 0; ++j) {
+		for (j = 0; my_list[j] != NULL; ++j) {
 		    bool found = check_existence(my_list[j], &my_stat[j]);
 #if HAVE_LINK
 		    if (found) {
@@ -423,7 +423,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 		    if (!found) {
 			T(("not found %s", my_list[j]));
 			k = j;
-			while ((my_list[k] = my_list[k + 1]) != 0) {
+			while ((my_list[k] = my_list[k + 1]) != NULL) {
 			    ++k;
 			}
 			--j;
@@ -446,14 +446,14 @@ _nc_db_iterator_leaks(void)
 {
     DBDIRS which;
 
-    if (my_blob != 0)
+    if (my_blob != NULL)
 	FreeAndNull(my_blob);
-    if (my_list != 0)
+    if (my_list != NULL)
 	FreeAndNull(my_list);
     for (which = 0; (int) which < dbdLAST; ++which) {
-	my_vars[which].name = 0;
+	my_vars[which].name = NULL;
 	FreeIfNeeded(my_vars[which].value);
-	my_vars[which].value = 0;
+	my_vars[which].value = NULL;
     }
     update_tic_dir(NULL);
 }
diff --git a/ncurses/tinfo/doalloc.c b/ncurses/tinfo/doalloc.c
index e3b1a2e96..dac28f60f 100644
--- a/ncurses/tinfo/doalloc.c
+++ b/ncurses/tinfo/doalloc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2002,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: doalloc.c,v 1.14 2021/04/24 23:43:39 tom Exp $")
+MODULE_ID("$Id: doalloc.c,v 1.15 2024/12/07 20:05:08 tom Exp $")
 
 void *
 _nc_doalloc(void *oldp, size_t amount)
@@ -51,7 +51,7 @@ _nc_doalloc(void *oldp, size_t amount)
 	if (amount == 0) {
 	    free(oldp);
 	    newp = NULL;
-	} else if ((newp = realloc(oldp, amount)) == 0) {
+	} else if ((newp = realloc(oldp, amount)) == NULL) {
 	    free(oldp);
 	    errno = ENOMEM;	/* just in case 'free' reset */
 	}
diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 33c7e40a2..3f27076ba 100644
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: entries.c,v 1.37 2024/10/19 21:23:31 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.38 2024/12/07 18:23:25 tom Exp $")
 
 /****************************************************************************
  *
@@ -61,8 +61,8 @@ MODULE_ID("$Id: entries.c,v 1.37 2024/10/19 21:23:31 tom Exp $")
  *	   _nc_head                _nc_tail
  */
 
-NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_head = NULL;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = NULL;
 
 static ENTRY *
 _nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm)
@@ -70,12 +70,12 @@ _nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm)
 {
     ENTRY *ep, *last;
 
-    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
+    for (last = NULL, ep = headp; ep != NULL; last = ep, ep = ep->next) {
 	if (&(ep->tterm) == tterm) {
-	    if (last != 0) {
+	    if (last != NULL) {
 		last->next = ep->next;
 	    }
-	    if (ep->next != 0) {
+	    if (ep->next != NULL) {
 		ep->next->last = last;
 	    }
 	    if (ep == _nc_head) {
@@ -96,7 +96,7 @@ _nc_free_entry(ENTRY * headp, const TERMTYPE2 *tterm)
 {
     ENTRY *ep;
 
-    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
+    if ((ep = _nc_delink_entry(headp, tterm)) != NULL) {
 	free(ep);
     }
 }
@@ -107,7 +107,7 @@ _nc_free_entries(ENTRY * headp)
 {
     (void) headp;		/* unused - _nc_head is altered here! */
 
-    while (_nc_head != 0) {
+    while (_nc_head != NULL) {
 	_nc_free_termtype2(&(_nc_head->tterm));
     }
 }
@@ -141,7 +141,7 @@ _nc_leaks_tinfo(void)
     }
     _nc_unlock_global(screen);
 #endif
-    if (TerminalOf(CURRENT_SCREEN) != 0) {
+    if (TerminalOf(CURRENT_SCREEN) != NULL) {
 	del_curterm(TerminalOf(CURRENT_SCREEN));
     }
     _nc_forget_prescr();
@@ -149,8 +149,8 @@ _nc_leaks_tinfo(void)
     _nc_comp_captab_leaks();
     _nc_comp_userdefs_leaks();
     _nc_free_entries(_nc_head);
-    _nc_get_type(0);
-    _nc_first_name(0);
+    _nc_get_type(NULL);
+    _nc_first_name(NULL);
     _nc_db_iterator_leaks();
     _nc_keyname_leaks();
 #if BROKEN_LINKER || USE_REENTRANT
@@ -160,7 +160,7 @@ _nc_leaks_tinfo(void)
 #endif
     _nc_comp_error_leaks();
 
-    if ((s = _nc_home_terminfo()) != 0)
+    if ((s = _nc_home_terminfo()) != NULL)
 	free(s);
 
 #ifdef TRACE
diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c
index 82c460f0d..0d584e394 100644
--- a/ncurses/tinfo/getenv_num.c
+++ b/ncurses/tinfo/getenv_num.c
@@ -37,16 +37,16 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: getenv_num.c,v 1.9 2024/07/27 19:23:59 tom Exp $")
+MODULE_ID("$Id: getenv_num.c,v 1.10 2024/12/07 18:14:49 tom Exp $")
 
 NCURSES_EXPORT(int)
 _nc_getenv_num(const char *name)
 {
-    char *dst = 0;
+    char *dst = NULL;
     const char *src = getenv(name);
     long value;
 
-    if ((src == 0)
+    if ((src == NULL)
 	|| (value = strtol(src, &dst, 0)) < 0
 	|| (dst == src)
 	|| (*dst != '\0')
@@ -59,7 +59,7 @@ _nc_getenv_num(const char *name)
 NCURSES_EXPORT(void)
 _nc_setenv_num(const char *name, int value)
 {
-    if (name != 0 && value >= 0) {
+    if (name != NULL && value >= 0) {
 	char buffer[128];
 #if HAVE_SETENV
 	_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%d", value);
diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c
index 3c381b9f0..7201de463 100644
--- a/ncurses/tinfo/home_terminfo.c
+++ b/ncurses/tinfo/home_terminfo.c
@@ -38,7 +38,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: home_terminfo.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
+MODULE_ID("$Id: home_terminfo.c,v 1.19 2024/12/07 18:14:49 tom Exp $")
 
 /* ncurses extension...fall back on user's private directory */
 
@@ -47,14 +47,14 @@ MODULE_ID("$Id: home_terminfo.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
 NCURSES_EXPORT(char *)
 _nc_home_terminfo(void)
 {
-    char *result = 0;
+    char *result = NULL;
 #if USE_HOME_TERMINFO
     if (use_terminfo_vars()) {
 
-	if (MyBuffer == 0) {
+	if (MyBuffer == NULL) {
 	    const char *home;
 
-	    if ((home = getenv("HOME")) != 0) {
+	    if ((home = getenv("HOME")) != NULL) {
 		size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
 		TYPE_MALLOC(char, want, MyBuffer);
 		_nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home);
diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index 5f4c54990..78f8b3e4e 100644
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -30,7 +30,7 @@
 #include <curses.priv.h>
 #include <tic.h>		/* struct tinfo_fkeys */
 
-MODULE_ID("$Id: init_keytry.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.22 2024/12/07 18:14:49 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -74,7 +74,7 @@ _nc_init_keytry(SCREEN *sp)
      * mouse_activate() (which will call keyok()) are first called.
      */
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	unsigned n;
 
 	for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
@@ -95,7 +95,7 @@ _nc_init_keytry(SCREEN *sp)
 	    for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
 		const char *name = ExtStrname(tp, (int) n, strnames);
 		const char *value = tp->Strings[n];
-		if (name != 0
+		if (name != NULL
 		    && *name == 'k'
 		    && VALID_STRING(value)
 		    && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
diff --git a/ncurses/tinfo/lib_acs.c b/ncurses/tinfo/lib_acs.c
index 4ede53f6b..4f3b38fd5 100644
--- a/ncurses/tinfo/lib_acs.c
+++ b/ncurses/tinfo/lib_acs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_acs.c,v 1.50 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_acs.c,v 1.51 2024/12/07 20:05:08 tom Exp $")
 
 #if BROKEN_LINKER || USE_REENTRANT
 #define MyBuffer _nc_prescreen.real_acs_map
@@ -81,7 +81,7 @@ NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0)
 {
     chtype *fake_map = acs_map;
-    chtype *real_map = SP_PARM != 0 ? SP_PARM->_acs_map : fake_map;
+    chtype *real_map = SP_PARM != NULL ? SP_PARM->_acs_map : fake_map;
     int j;
 
     T(("initializing ACS map"));
@@ -183,7 +183,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0)
      *
      * test/blue.c uses this feature.
      */
-#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b))
+#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b))
     if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) &&
 	PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) {
 	size_t i;
@@ -191,7 +191,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0)
 	    if (real_map[i] == 0) {
 		real_map[i] = (chtype) i;
 		if (real_map != fake_map) {
-		    if (SP != 0)
+		    if (SP != NULL)
 			SP->_screen_acs_map[i] = TRUE;
 		}
 	    }
@@ -210,7 +210,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0)
 		   (int) i,
 		   _tracechar(UChar(acs_chars[i])),
 		   _tracechtype(real_map[UChar(acs_chars[i])])));
-		if (SP != 0) {
+		if (SP != NULL) {
 		    SP->_screen_acs_map[UChar(acs_chars[i])] = TRUE;
 		}
 	    }
diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 311c41ac9..b3a78369c 100644
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -84,7 +84,7 @@
 #undef USE_OLD_TTY
 #endif /* USE_OLD_TTY */
 
-MODULE_ID("$Id: lib_baudrate.c,v 1.45 2020/09/05 21:15:32 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.46 2024/12/07 20:05:08 tom Exp $")
 
 /*
  *	int
@@ -279,7 +279,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
 #ifdef TRACE
     if (IsValidTIScreen(SP_PARM)
 	&& !NC_ISATTY(fileno((SP_PARM && SP_PARM->_ofp) ? SP_PARM->_ofp : stdout))
-	&& getenv("BAUDRATE") != 0) {
+	&& getenv("BAUDRATE") != NULL) {
 	int ret;
 	if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
 	    ret = 9600;
diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 1f8db2c1e..3466a0b42 100644
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
-,* Copyright 2020-2021,2022 Thomas E. Dickey                                *
+,* Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>		/* VALID_STRING */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.49 2022/05/28 17:56:55 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.50 2024/12/07 20:05:08 tom Exp $")
 
 #undef CUR
 #define CUR TerminalType(termp).
@@ -74,7 +74,7 @@ NCURSES_PUBLIC_VAR(cur_term) (void)
 }
 
 #else
-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
+NCURSES_EXPORT_VAR(TERMINAL *) cur_term = NULL;
 #endif
 
 NCURSES_EXPORT(TERMINAL *)
@@ -93,7 +93,7 @@ NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL *termp)
 #else
     cur_term = termp;
 #endif
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 	ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
@@ -134,7 +134,7 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL *termp)
 
     T((T_CALLED("del_curterm(%p, %p)"), (void *) SP_PARM, (void *) termp));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 #endif
@@ -155,11 +155,11 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL *termp)
 #endif
 	_nc_free_termtype2(&TerminalType(termp));
 	if (termp == cur)
-	    NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx 0);
+	    NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx NULL);
 
 	FreeIfNeeded(termp->_termname);
 #if USE_HOME_TERMINFO
-	if (_nc_globals.home_terminfo != 0) {
+	if (_nc_globals.home_terminfo != NULL) {
 	    FreeAndNull(_nc_globals.home_terminfo);
 	}
 #endif
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index b817f49bd..b05117c8b 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.89 2024/02/24 18:11:38 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.90 2024/12/07 18:23:25 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -66,12 +66,12 @@ NCURSES_PUBLIC_VAR(newscr) (void)
     return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0;
 }
 #else
-NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0;
-NCURSES_EXPORT_VAR(WINDOW *) curscr = 0;
-NCURSES_EXPORT_VAR(WINDOW *) newscr = 0;
+NCURSES_EXPORT_VAR(WINDOW *) stdscr = NULL;
+NCURSES_EXPORT_VAR(WINDOW *) curscr = NULL;
+NCURSES_EXPORT_VAR(WINDOW *) newscr = NULL;
 #endif
 
-NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0;
+NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = NULL;
 
 /*
  * The variable 'SP' will be defined as a function on systems that cannot link
@@ -129,7 +129,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 
     FALSE,			/* have_tic_directory */
     FALSE,			/* keep_tic_directory */
-    0,				/* tic_directory */
+    NULL,			/* tic_directory */
 
     NULL,			/* dbi_list */
     0,				/* dbi_size */
@@ -150,11 +150,11 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     0,				/* tgetent_sequence */
     0,				/* terminal_count */
 
-    0,				/* dbd_blob */
-    0,				/* dbd_list */
+    NULL,			/* dbd_blob */
+    NULL,			/* dbd_list */
     0,				/* dbd_size */
     0,				/* dbd_time */
-    { { 0, 0 } },		/* dbd_vars */
+    { { NULL, NULL } },		/* dbd_vars */
 
 #if HAVE_TSEARCH
     NULL,			/* cached_tparm */
@@ -230,7 +230,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #define STACK_FRAME_0s	{ STACK_FRAME_0 }
 #define NUM_VARS_0s	{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
 
-#define RIPOFF_0	{ 0,0,0 }
+#define RIPOFF_0	{ NULL,0,NULL }
 #define RIPOFF_0s	{ RIPOFF_0 }
 
 NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
@@ -258,7 +258,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
     },
     NULL,			/* saved_tty */
     FALSE,			/* use_tioctl */
-    0,				/* _outch */
+    NULL,			/* _outch */
 #ifndef USE_SP_RIPOFF
     RIPOFF_0s,			/* ripoff */
     NULL,			/* rsp */
@@ -291,9 +291,9 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
 NCURSES_EXPORT(SCREEN *)
 _nc_screen_of(WINDOW *win)
 {
-    SCREEN *sp = 0;
+    SCREEN *sp = NULL;
 
-    if (win != 0) {
+    if (win != NULL) {
 	sp = WINDOW_EXT(win, screen);
     }
     return (sp);
diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 46f652b0a..0cdf3e822 100644
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_kernel.c,v 1.36 2023/06/10 13:29:06 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.37 2024/12/07 20:05:08 tom Exp $")
 
 #ifdef TERMIOS
 static int
@@ -89,7 +89,7 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
 
     T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef TERMIOS
 	result = termp->Ottyb.c_cc[VERASE];
 	if (result == _nc_vdisable())
@@ -126,7 +126,7 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
 
     T((T_CALLED("killchar(%p)"), (void *) SP_PARM));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef TERMIOS
 	result = termp->Ottyb.c_cc[VKILL];
 	if (result == _nc_vdisable())
@@ -177,7 +177,7 @@ NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
 
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	if (NC_ISATTY(SP_PARM->_ifd))
 	    flush_input(SP_PARM->_ifd);
 	else if (NC_ISATTY(SP_PARM->_ofd))
diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index 053e9a0c1..1894b28fc 100644
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_options.c,v 1.84 2024/11/23 19:17:25 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.85 2024/12/07 18:24:47 tom Exp $")
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
@@ -57,7 +57,7 @@ idlok(WINDOW *win, bool flag)
 
     if (win) {
 	SCREEN *sp = _nc_screen_of(win);
-	if (sp != 0
+	if (sp != NULL
 #ifdef USE_TERM_DRIVER
 	    && IsTermInfo(sp)
 #endif
@@ -158,14 +158,14 @@ NCURSES_EXPORT(int)
 meta(WINDOW *win GCC_UNUSED, bool flag)
 {
     int result = ERR;
-    SCREEN *sp = (win == 0) ? CURRENT_SCREEN : _nc_screen_of(win);
+    SCREEN *sp = (win == NULL) ? CURRENT_SCREEN : _nc_screen_of(win);
 
     /* Ok, we stay relaxed and don't signal an error if win is NULL */
     T((T_CALLED("meta(%p,%d)"), (void *) win, flag));
 
     /* Ok, we stay relaxed and don't signal an error if win is NULL */
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	sp->_use_meta = flag;
 #ifdef USE_TERM_DRIVER
 	if (IsTermInfo(sp)) {
@@ -195,7 +195,7 @@ NCURSES_SP_NAME(curs_set) (NCURSES_SP_DCLx int vis)
     int code = ERR;
     T((T_CALLED("curs_set(%p,%d)"), (void *) SP_PARM, vis));
 
-    if (SP_PARM != 0 && vis >= 0 && vis <= 2) {
+    if (SP_PARM != NULL && vis >= 0 && vis <= 2) {
 	int cursor = SP_PARM->_cursor;
 	if (vis == cursor) {
 	    code = cursor;
@@ -269,7 +269,7 @@ typeahead(int fd)
 static int
 has_key_internal(int keycode, TRIES * tp)
 {
-    if (tp == 0)
+    if (tp == NULL)
 	return (FALSE);
     else if (tp->value == keycode)
 	return (TRUE);
@@ -290,7 +290,7 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode)
 {
     T((T_CALLED("has_key(%p,%d)"), (void *) SP_PARM, keycode));
-    returnCode(SP != 0 ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE);
+    returnCode(SP != NULL ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE);
 }
 
 #if NCURSES_SP_FUNCS
@@ -334,7 +334,7 @@ _nc_keypad(SCREEN *sp, bool flag)
 {
     int rc = ERR;
 
-    if (sp != 0) {
+    if (sp != NULL) {
 #ifdef USE_PTHREADS
 	/*
 	 * We might have this situation in a multithreaded application that
diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index 17072a2f1..247397f19 100644
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -40,7 +40,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_print.c,v 1.33 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+MODULE_ID("$Id: lib_print.c,v 1.34 2024/12/07 18:05:04 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
@@ -72,8 +72,8 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
 
     need = onsize + (size_t) len + offsize;
 
-    if (switchon == 0
-	|| (mybuf = typeMalloc(char, need + 1)) == 0) {
+    if (switchon == NULL
+	|| (mybuf = typeMalloc(char, need + 1)) == NULL) {
 	free(mybuf);
 	errno = ENOMEM;
 	return (ERR);
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 7a76d92ee..b4d50bcee 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -50,7 +50,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.31 2024/05/25 20:18:20 Branden.Robinson Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.32 2024/12/07 18:24:47 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -85,7 +85,7 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("raw(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 
 	BEFORE("raw");
@@ -141,7 +141,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("cbreak(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 
 	BEFORE("cbreak");
@@ -185,7 +185,7 @@ NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("qiflush(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 	int result;
 
@@ -220,7 +220,7 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("noraw(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 
 	BEFORE("noraw");
@@ -275,7 +275,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("nocbreak(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 
 	BEFORE("nocbreak");
@@ -316,7 +316,7 @@ NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0)
     TERMINAL *termp;
 
     T((T_CALLED("noqiflush(%p)"), (void *) SP_PARM));
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 	int result;
 
@@ -354,10 +354,10 @@ NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag)
     TERMINAL *termp;
 
     T((T_CALLED("intrflush(%p,%d)"), (void *) SP_PARM, flag));
-    if (SP_PARM == 0)
+    if (SP_PARM == NULL)
 	returnCode(ERR);
 
-    if ((termp = TerminalOf(SP_PARM)) != 0) {
+    if ((termp = TerminalOf(SP_PARM)) != NULL) {
 	TTY buf;
 
 	BEFORE("intrflush");
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 954f2d2b7..2741cd174 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.246 2024/11/23 18:32:54 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.247 2024/12/07 20:21:01 tom Exp $")
 
 /****************************************************************************
  *
@@ -533,7 +533,7 @@ _nc_get_screensize(SCREEN *sp,
 	    errno = 0;
 	    do {
 		if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) >= 0) {
-		    *linep = ((sp != 0 && sp->_filtered)
+		    *linep = ((sp != NULL && sp->_filtered)
 			      ? 1
 			      : WINSIZE_ROWS(size));
 		    *colp = WINSIZE_COLS(size);
@@ -553,7 +553,8 @@ _nc_get_screensize(SCREEN *sp,
 		/*
 		 * If environment variables are used, update them.
 		 */
-		if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
+		if ((sp == NULL || !sp->_filtered) &&
+		    _nc_getenv_num("LINES") > 0) {
 		    _nc_setenv_num("LINES", *linep);
 		}
 		if (_nc_getenv_num("COLUMNS") > 0) {
@@ -636,17 +637,17 @@ _nc_update_screensize(SCREEN *sp)
     int old_cols = columns;
 #endif
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
 	/*
 	 * See is_term_resized() and resizeterm().
 	 * We're doing it this way because those functions belong to the upper
 	 * ncurses library, while this resides in the lower terminfo library.
 	 */
-	if (sp->_resize != 0) {
+	if (sp->_resize != NULL) {
 	    if ((new_lines != old_lines) || (new_cols != old_cols)) {
 		sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
-	    } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
+	    } else if (sp->_sig_winch && (sp->_ungetch != NULL)) {
 		sp->_ungetch(SP_PARM, KEY_RESIZE);	/* so application can know this */
 	    }
 	    sp->_sig_winch = FALSE;
@@ -708,7 +709,7 @@ _nc_tinfo_cmdch(TERMINAL *termp, int proto)
      * since it is fairly common for developers to set the C compiler
      * name as an environment variable - using the same symbol.
      */
-    if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
+    if ((tmp = getenv("CC")) != NULL && strlen(tmp) == 1) {
 	unsigned i;
 	char CC = *tmp;
 
@@ -736,7 +737,7 @@ _nc_get_locale(void)
      * This is preferable to using getenv() since it ensures that we are using
      * the locale which was actually initialized by the application.
      */
-    env = setlocale(LC_CTYPE, 0);
+    env = setlocale(LC_CTYPE, NULL);
 #else
     if (((env = getenv("LANG")) != 0 && *env != '\0')
 	|| ((env = getenv("LC_CTYPE")) != 0 && *env != '\0')
@@ -778,8 +779,8 @@ _nc_unicode_locale(void)
     return result;
 }
 
-#define CONTROL_N(s) ((s) != 0 && strstr(s, "\016") != 0)
-#define CONTROL_O(s) ((s) != 0 && strstr(s, "\017") != 0)
+#define CONTROL_N(s) ((s) != NULL && strstr(s, "\016") != NULL)
+#define CONTROL_O(s) ((s) != NULL && strstr(s, "\017") != NULL)
 
 /*
  * Check for known broken cases where a UTF-8 locale breaks the alternate
@@ -794,17 +795,17 @@ _nc_locale_breaks_acs(TERMINAL *termp)
     int result = 0;
 
     T((T_CALLED("_nc_locale_breaks_acs:%d"), result));
-    if (getenv(env_name) != 0) {
+    if (getenv(env_name) != NULL) {
 	result = _nc_getenv_num(env_name);
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
-    } else if ((env = getenv("TERM")) != 0) {
+    } else if ((env = getenv("TERM")) != NULL) {
 	if (strstr(env, "linux")) {
 	    result = 1;		/* always broken */
-	} else if (strstr(env, "screen") != 0
-		   && ((env = getenv("TERMCAP")) != 0
-		       && strstr(env, "screen") != 0)
-		   && strstr(env, "hhII00") != 0) {
+	} else if (strstr(env, "screen") != NULL
+		   && ((env = getenv("TERMCAP")) != NULL
+		       && strstr(env, "screen") != NULL)
+		   && strstr(env, "hhII00") != NULL) {
 	    if (CONTROL_N(enter_alt_charset_mode) ||
 		CONTROL_O(enter_alt_charset_mode) ||
 		CONTROL_N(set_attributes) ||
@@ -827,7 +828,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
     TERMINAL_CONTROL_BLOCK *TCB = 0;
 #endif
     TERMINAL *termp;
-    SCREEN *sp = 0;
+    SCREEN *sp = NULL;
     char *myname;
     int code = ERR;
 
@@ -847,7 +848,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
     T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, (void *) errret));
 #endif
 
-    if (tname == 0) {
+    if (tname == NULL) {
 	tname = getenv("TERM");
 #if defined(EXP_WIN32_DRIVER)
 	if (!VALID_TERM_ENV(tname, NO_TERMINAL)) {
@@ -902,9 +903,9 @@ TINFO_SETUP_TERM(TERMINAL **tp,
      * properly with this feature).
      */
     if (reuse
-	&& (termp != 0)
+	&& (termp != NULL)
 	&& termp->Filedes == Filedes
-	&& termp->_termname != 0
+	&& termp->_termname != NULL
 	&& !strcmp(termp->_termname, myname)
 	&& _nc_name_match(TerminalType(termp).term_names, myname, "|")) {
 	T(("reusing existing terminal information and mode-settings"));
@@ -923,7 +924,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
 	termp = typeCalloc(TERMINAL, 1);
 #endif
-	if (termp == 0) {
+	if (termp == NULL) {
 	    ret_error1(TGETENT_ERR,
 		       "Not enough memory to create terminal structure.\n",
 		       myname, free(myname));
@@ -1129,10 +1130,10 @@ new_prescr(void)
     T((T_CALLED("new_prescr()")));
 
     _nc_lock_global(screen);
-    if ((sp = _nc_find_prescr()) == 0) {
+    if ((sp = _nc_find_prescr()) == NULL) {
 	sp = _nc_alloc_screen_sp();
 	T(("_nc_alloc_screen_sp %p", (void *) sp));
-	if (sp != 0) {
+	if (sp != NULL) {
 #ifdef USE_PTHREADS
 	    PRESCREEN_LIST *p = typeCalloc(PRESCREEN_LIST, 1);
 	    if (p != 0) {
@@ -1151,7 +1152,7 @@ new_prescr(void)
 	    sp->_no_padding = _nc_prescreen._no_padding;
 #endif
 	    sp->slk_format = 0;
-	    sp->_slk = 0;
+	    sp->_slk = NULL;
 	    sp->_prescreen = TRUE;
 	    SP_PRE_INIT(sp);
 #if USE_REENTRANT
diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index a5ac2ecc3..ec2c22b7f 100644
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -49,10 +49,10 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_termcap.c,v 1.90 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.91 2024/12/07 18:26:04 tom Exp $")
 
-NCURSES_EXPORT_VAR(char *) UP = 0;
-NCURSES_EXPORT_VAR(char *) BC = 0;
+NCURSES_EXPORT_VAR(char *) UP = NULL;
+NCURSES_EXPORT_VAR(char *) BC = NULL;
 
 #define MyCache  _nc_globals.tgetent_cache
 #define CacheInx _nc_globals.tgetent_index
@@ -125,18 +125,18 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 	bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp);
 	if (same_result) {
 	    CacheInx = n;
-	    if (FIX_SGR0 != 0) {
+	    if (FIX_SGR0 != NULL) {
 		FreeAndNull(FIX_SGR0);
 	    }
 	    /*
 	     * Also free the terminfo data that we loaded (much bigger leak).
 	     */
-	    if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) {
+	    if (LAST_TRM != NULL && LAST_TRM != TerminalOf(SP_PARM)) {
 		const TERMINAL *trm = LAST_TRM;
 		NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM);
 		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
 		    if (LAST_TRM == trm)
-			LAST_TRM = 0;
+			LAST_TRM = NULL;
 		CacheInx = n;
 	    }
 	    found_cache = TRUE;
@@ -157,13 +157,13 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 	LAST_TRM = TerminalOf(SP_PARM);
 	LAST_SEQ = ++CacheSeq;
     } else {
-	LAST_TRM = 0;
+	LAST_TRM = NULL;
     }
 
     PC = 0;
-    UP = 0;
-    BC = 0;
-    FIX_SGR0 = 0;		/* don't free it - application may still use */
+    UP = NULL;
+    BC = NULL;
+    FIX_SGR0 = NULL;		/* don't free it - application may still use */
 
     if (rc == 1) {
 
@@ -180,12 +180,12 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
 	    BC = backspace_if_not_bs;
 
 	if ((FIX_SGR0 = _nc_trim_sgr0(&TerminalType(TerminalOf(SP_PARM))))
-	    != 0) {
+	    != NULL) {
 	    if (!strcmp(FIX_SGR0, exit_attribute_mode)) {
 		if (FIX_SGR0 != exit_attribute_mode) {
 		    free(FIX_SGR0);
 		}
-		FIX_SGR0 = 0;
+		FIX_SGR0 = NULL;
 	    }
 	}
 	LAST_BUF = bufp;
@@ -246,7 +246,7 @@ NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx const char *id)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(id, BOOLEAN, TRUE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
@@ -298,7 +298,7 @@ NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx const char *id)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(id, NUMBER, TRUE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
@@ -350,7 +350,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx const char *id, char **area)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(id, STRING, TRUE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
@@ -371,12 +371,12 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx const char *id, char **area)
 	    /* setupterm forces canceled strings to null */
 	    if (VALID_STRING(result)) {
 		if (result == exit_attribute_mode
-		    && FIX_SGR0 != 0) {
+		    && FIX_SGR0 != NULL) {
 		    result = FIX_SGR0;
 		    TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
 		}
-		if (area != 0
-		    && *area != 0) {
+		if (area != NULL
+		    && *area != NULL) {
 		    _nc_STRCPY(*area, result, 1024);
 		    result = *area;
 		    *area += strlen(*area) + 1;
@@ -401,13 +401,13 @@ tgetstr(const char *id, char **area)
 NCURSES_EXPORT(void)
 _nc_tgetent_leak(const TERMINAL *const termp)
 {
-    if (termp != 0) {
+    if (termp != NULL) {
 	int num;
 	for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
 	    if (LAST_TRM == termp) {
 		FreeAndNull(FIX_SGR0);
-		if (LAST_TRM != 0) {
-		    LAST_TRM = 0;
+		if (LAST_TRM != NULL) {
+		    LAST_TRM = NULL;
 		}
 		break;
 	    }
@@ -420,7 +420,7 @@ _nc_tgetent_leaks(void)
 {
     int num;
     for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
-	if (LAST_TRM != 0) {
+	if (LAST_TRM != NULL) {
 	    del_curterm(LAST_TRM);
 	    _nc_tgetent_leak(LAST_TRM);
 	}
diff --git a/ncurses/tinfo/lib_termname.c b/ncurses/tinfo/lib_termname.c
index 2d80bb349..2dfed0da5 100644
--- a/ncurses/tinfo/lib_termname.c
+++ b/ncurses/tinfo/lib_termname.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,17 +29,17 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_termname.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_termname.c,v 1.14 2024/12/07 20:05:27 tom Exp $")
 
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
 {
-    char *name = 0;
+    char *name = NULL;
 
     T((T_CALLED("termname(%p)"), (void *) SP_PARM));
 
 #if NCURSES_SP_FUNCS
-    if (TerminalOf(SP_PARM) != 0) {
+    if (TerminalOf(SP_PARM) != NULL) {
 	name = TerminalOf(SP_PARM)->_termname;
     }
 #else
diff --git a/ncurses/tinfo/lib_ti.c b/ncurses/tinfo/lib_ti.c
index 5cb77b850..720c7c2ed 100644
--- a/ncurses/tinfo/lib_ti.c
+++ b/ncurses/tinfo/lib_ti.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_ti.c,v 1.34 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_ti.c,v 1.35 2024/12/07 20:06:49 tom Exp $")
 
 #if 0
 static bool
@@ -63,7 +63,7 @@ NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx const char *str)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(str, BOOLEAN, FALSE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
@@ -108,7 +108,7 @@ NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx const char *str)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(str, NUMBER, FALSE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
@@ -155,7 +155,7 @@ NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx const char *str)
 	int j = -1;
 
 	entry_ptr = _nc_find_type_entry(str, STRING, FALSE);
-	if (entry_ptr != 0) {
+	if (entry_ptr != NULL) {
 	    j = entry_ptr->nte_index;
 	}
 #if NCURSES_XNAMES
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 2d8d3268f..2e175cb50 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.154 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.155 2024/12/07 18:26:59 tom Exp $")
 
 /*
  *	char *
@@ -343,7 +343,7 @@ static NCURSES_INLINE int
 #define spop(tps) \
     ((TPS(stack_ptr)-- > 0) \
      ? ((!TPS(stack)[TPS(stack_ptr)].num_type \
-        && TPS(stack)[TPS(stack_ptr)].data.str != 0) \
+        && TPS(stack)[TPS(stack_ptr)].data.str != NULL) \
          ? TPS(stack)[TPS(stack_ptr)].data.str \
          : dummy) \
      : (tparm_error(tps, "spop: stack underflow"), \
@@ -361,7 +361,7 @@ static NCURSES_INLINE const char *
 parse_format(const char *s, char *format, int *len)
 {
     *len = 0;
-    if (format != 0) {
+    if (format != NULL) {
 	bool done = FALSE;
 	bool allowminus = FALSE;
 	bool dot = FALSE;
@@ -475,13 +475,13 @@ _nc_tparm_analyze(TERMINAL *term, const char *string, char **p_is_s, int *popcou
     int level = -1;
     const char *cp = string;
 
-    if (cp == 0)
+    if (cp == NULL)
 	return 0;
 
     if ((len2 = strlen(cp)) + 2 > TPS(fmt_size)) {
 	TPS(fmt_size) += len2 + 2;
 	TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
-	if (TPS(fmt_buff) == 0)
+	if (TPS(fmt_buff) == NULL)
 	    return 0;
     }
 
@@ -616,14 +616,14 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result)
 	void *ft;
 
 	result->format = string;
-	if ((ft = tfind(result, &MyCache, cmp_format)) != 0) {
+	if ((ft = tfind(result, &MyCache, cmp_format)) != NULL) {
 	    size_t len2;
 	    fs = *(TPARM_DATA **) ft;
 	    *result = *fs;
 	    if ((len2 = strlen(string)) + 2 > TPS(fmt_size)) {
 		TPS(fmt_size) += len2 + 2;
 		TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
-		if (TPS(fmt_buff) == 0)
+		if (TPS(fmt_buff) == NULL)
 		    return ERR;
 	    }
 	} else
@@ -637,7 +637,7 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result)
 	    result->num_parsed = _nc_tparm_analyze(term, string,
 						   result->p_is_s,
 						   &(result->num_popped));
-	    if (TPS(fmt_buff) == 0) {
+	    if (TPS(fmt_buff) == NULL) {
 		TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname)));
 		rc = ERR;
 	    } else {
@@ -654,10 +654,10 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result)
 			result->tparm_type |= (1 << n);
 		}
 #if HAVE_TSEARCH
-		if ((fs = typeCalloc(TPARM_DATA, 1)) != 0) {
+		if ((fs = typeCalloc(TPARM_DATA, 1)) != NULL) {
 		    *fs = *result;
-		    if ((fs->format = strdup(string)) != 0) {
-			if (tsearch(fs, &MyCache, cmp_format) != 0) {
+		    if ((fs->format = strdup(string)) != NULL) {
+			if (tsearch(fs, &MyCache, cmp_format) != NULL) {
 			    ++MyCount;
 			} else {
 			    free(fs);
@@ -690,9 +690,9 @@ tparm_copy_valist(TPARM_DATA *data, int use_TPARM_ARG, va_list ap)
     int i;
 
     for (i = 0; i < data->num_actual; i++) {
-	if (data->p_is_s[i] != 0) {
+	if (data->p_is_s[i] != NULL) {
 	    char *value = va_arg(ap, char *);
-	    if (value == 0)
+	    if (value == NULL)
 		value = dummy;
 	    data->p_is_s[i] = value;
 	    data->param[i] = 0;
@@ -740,7 +740,7 @@ tparm_trace_call(TPARM_STATE *tps, const char *string, TPARM_DATA *data)
     if (USE_TRACEF(TRACE_CALLS)) {
 	int i;
 	for (i = 0; i < data->num_actual; i++) {
-	    if (data->p_is_s[i] != 0) {
+	    if (data->p_is_s[i] != NULL) {
 		save_text(tps, ", %s", _nc_visbuf(data->p_is_s[i]), 0);
 	    } else if ((long) data->param[i] > MAX_OF_TYPE(NCURSES_INT2) ||
 		       (long) data->param[i] < 0) {
@@ -1003,12 +1003,12 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data)
 		 */
 		if (!incremented_two) {
 		    incremented_two = TRUE;
-		    if (data->p_is_s[0] == 0) {
+		    if (data->p_is_s[0] == NULL) {
 			data->param[0]++;
 			if (termcap_hack)
 			    TPS(stack)[0].data.num = (int) data->param[0];
 		    }
-		    if (data->p_is_s[1] == 0) {
+		    if (data->p_is_s[1] == NULL) {
 			data->param[1]++;
 			if (termcap_hack)
 			    TPS(stack)[1].data.num = (int) data->param[1];
diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 6a89a2a9e..8a0d137a8 100644
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -52,7 +52,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.113 2024/09/14 23:11:32 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.115 2024/12/07 21:04:53 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -63,7 +63,7 @@ NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;
 NCURSES_EXPORT(void)
 _nc_set_no_padding(SCREEN *sp)
 {
-    bool no_padding = (getenv("NCURSES_NO_PADDING") != 0);
+    bool no_padding = (getenv("NCURSES_NO_PADDING") != NULL);
 
     if (sp)
 	sp->_no_padding = no_padding;
@@ -124,7 +124,7 @@ NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {
     T((T_CALLED("_nc_flush(%p)"), (void *) SP_PARM));
-    if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
+    if (SP_PARM != NULL && SP_PARM->_ofd >= 0) {
 	TR(TRACE_CHARPUT, ("ofd:%d inuse:%lu buffer:%p",
 			   SP_PARM->_ofd,
 			   (unsigned long) SP_PARM->out_inuse,
@@ -149,7 +149,7 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 		    break;	/* an error we can not recover from */
 		}
 	    }
-	} else if (SP_PARM->out_buffer == 0) {
+	} else if (SP_PARM->out_buffer == NULL) {
 	    TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
 	    fflush(stdout);
 	    fflush(stderr);
@@ -159,7 +159,7 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 	fflush(stdout);
 	fflush(stderr);
     }
-    if (SP_PARM != 0)
+    if (SP_PARM != NULL)
 	SP_PARM->out_inuse = 0;
     returnVoid;
 }
@@ -180,8 +180,8 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
     COUNT_OUTCHARS(1);
 
     if (HasTInfoTerminal(SP_PARM)
-	&& SP_PARM != 0) {
-	if (SP_PARM->out_buffer != 0) {
+	&& SP_PARM != NULL) {
+	if (SP_PARM->out_buffer != NULL) {
 	    if (SP_PARM->out_inuse + 1 >= SP_PARM->out_limit)
 		NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
 	    SP_PARM->out_buffer[SP_PARM->out_inuse++] = (char) ch;
@@ -259,7 +259,7 @@ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
 {
     int rc = ERR;
 
-    if (string != 0) {
+    if (string != NULL) {
 	TPUTS_TRACE(name);
 	rc = NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 				     string, 1, NCURSES_SP_NAME(_nc_outch));
@@ -314,10 +314,10 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
     if (!VALID_STRING(string))
 	return ERR;
 
-    if (SP_PARM != 0 && HasTInfoTerminal(SP_PARM)) {
+    if (SP_PARM != NULL && HasTInfoTerminal(SP_PARM)) {
 	if (
 #if NCURSES_SP_FUNCS
-	       (SP_PARM != 0 && SP_PARM->_term == 0)
+	       (SP_PARM != NULL && SP_PARM->_term == NULL)
 #else
 	       cur_term == 0
 #endif
@@ -444,7 +444,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 NCURSES_EXPORT(int)
 _nc_outc_wrapper(SCREEN *sp, int c)
 {
-    if (0 == sp) {
+    if (NULL == sp) {
 	return fputc(c, stdout);
     } else {
 	return sp->jump(c);
diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c
index 6363a805b..ceb34c337 100644
--- a/ncurses/tinfo/lib_ttyflags.c
+++ b/ncurses/tinfo/lib_ttyflags.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_ttyflags.c,v 1.36 2020/09/05 22:54:47 tom Exp $")
+MODULE_ID("$Id: lib_ttyflags.c,v 1.37 2024/12/07 21:24:18 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
@@ -50,7 +50,7 @@ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
     TERMINAL *termp = TerminalOf(SP_PARM);
     int result = OK;
 
-    if (buf == 0 || termp == 0) {
+    if (buf == NULL || termp == NULL) {
 	result = ERR;
     } else {
 
@@ -75,7 +75,7 @@ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
 			termp ? termp->Filedes : -1,
 			_nc_trace_ttymode(buf)));
     }
-    if (result == ERR && buf != 0)
+    if (result == ERR && buf != NULL)
 	memset(buf, 0, sizeof(*buf));
 
     return (result);
@@ -94,12 +94,12 @@ NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf)
 {
     int result = OK;
 
-    if (buf == 0 || SP_PARM == 0) {
+    if (buf == NULL || SP_PARM == NULL) {
 	result = ERR;
     } else {
 	TERMINAL *termp = TerminalOf(SP_PARM);
 
-	if (0 == termp) {
+	if (NULL == termp) {
 	    result = ERR;
 	} else {
 #ifdef USE_TERM_DRIVER
@@ -113,7 +113,7 @@ NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf)
 		    ) {
 		    if (errno == EINTR)
 			continue;
-		    if ((errno == ENOTTY) && (SP_PARM != 0))
+		    if ((errno == ENOTTY) && (SP_PARM != NULL))
 			SP_PARM->_notty = TRUE;
 		    result = ERR;
 		}
@@ -145,7 +145,7 @@ NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0)
     T((T_CALLED("def_shell_mode(%p) ->term %p"),
        (void *) SP_PARM, (void *) termp));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	rc = CallDriver_2(SP_PARM, td_mode, FALSE, TRUE);
 #else
@@ -185,7 +185,7 @@ NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0)
 
     T((T_CALLED("def_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	rc = CallDriver_2(SP_PARM, td_mode, TRUE, TRUE);
 #else
@@ -223,7 +223,7 @@ NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0)
 
     T((T_CALLED("reset_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	rc = CallDriver_2(SP_PARM, td_mode, TRUE, FALSE);
 #else
@@ -256,7 +256,7 @@ NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0)
     T((T_CALLED("reset_shell_mode(%p) ->term %p"),
        (void *) SP_PARM, (void *) termp));
 
-    if (termp != 0) {
+    if (termp != NULL) {
 #ifdef USE_TERM_DRIVER
 	rc = CallDriver_2(SP_PARM, td_mode, FALSE, FALSE);
 #else
@@ -281,12 +281,12 @@ reset_shell_mode(void)
 static TTY *
 saved_tty(NCURSES_SP_DCL0)
 {
-    TTY *result = 0;
+    TTY *result = NULL;
 
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	result = (TTY *) & (SP_PARM->_saved_tty);
     } else {
-	if (_nc_prescreen.saved_tty == 0) {
+	if (_nc_prescreen.saved_tty == NULL) {
 	    _nc_prescreen.saved_tty = typeCalloc(TTY, 1);
 	}
 	result = _nc_prescreen.saved_tty;
diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 78a684cc8..0c2c5fa3c 100644
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -44,7 +44,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: make_hash.c,v 1.34 2024/03/02 19:35:40 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.36 2024/12/07 20:51:15 tom Exp $")
 
 /*
  *	_nc_make_hash_table()
@@ -79,7 +79,7 @@ strmalloc(char *s)
 {
     size_t need = strlen(s) + 1;
     char *result = malloc(need);
-    if (result == 0)
+    if (result == NULL)
 	failed("strmalloc");
     _nc_STRCPY(result, s, need);
     return result;
@@ -153,7 +153,7 @@ static int
 count_columns(char **list)
 {
     int result = 0;
-    if (list != 0) {
+    if (list != NULL) {
 	while (*list++) {
 	    ++result;
 	}
@@ -168,17 +168,17 @@ parse_columns(char *buffer)
 
     int col = 0;
 
-    if (buffer == 0) {
+    if (buffer == NULL) {
 	free(list);
-	list = 0;
-	return 0;
+	list = NULL;
+	return NULL;
     }
 
     if (*buffer != '#') {
-	if (list == 0) {
+	if (list == NULL) {
 	    list = typeCalloc(char *, (MAX_COLUMNS + 1));
-	    if (list == 0)
-		return (0);
+	    if (list == NULL)
+		return (NULL);
 	}
 	while (*buffer != '\0') {
 	    char *s;
@@ -205,7 +205,7 @@ parse_columns(char *buffer)
 		break;
 	}
     }
-    return col ? list : 0;
+    return col ? list : NULL;
 }
 
 #define SetType(n,t) \
@@ -272,8 +272,8 @@ main(int argc, char **argv)
 	|| (column >= MAX_COLUMNS)
 	|| *(root_name = argv[2]) == 0
 	|| (bigstring = atoi(argv[3])) < 0
-	|| name_table == 0
-	|| hash_table == 0) {
+	|| name_table == NULL
+	|| hash_table == NULL) {
 	fprintf(stderr, "usage: make_hash column root_name bigstring\n");
 	exit(EXIT_FAILURE);
     }
@@ -291,7 +291,7 @@ main(int argc, char **argv)
 	else
 	    buffer[sizeof(buffer) - 2] = '\0';
 	list = parse_columns(buffer);
-	if (list == 0)		/* blank or comment */
+	if (list == NULL)	/* blank or comment */
 	    continue;
 	if (is_user) {
 	    if (strcmp(list[0], "userdef"))
@@ -382,15 +382,15 @@ main(int argc, char **argv)
 		printf("\t%d,%d,",
 		       name_table[n].ute_argc,
 		       name_table[n].ute_args);
-	    printf("\t%3d, %3d %s%c\n",
+	    printf("\t%3d, %3d %s%s\n",
 		   name_table[n].ute_index,
 		   name_table[n].ute_link,
 		   R_BRACE,
-		   n < tablesize - 1 ? ',' : ' ');
+		   n < tablesize - 1 ? "," : "");
 	    len += (int) strlen(name_table[n].ute_name) + 1;
 	}
 	printf("%s;\n\n", R_BRACE);
-	printf("static struct %s_table_entry *_nc_%s_table = 0;\n\n",
+	printf("static struct %s_table_entry *_nc_%s_table = NULL;\n\n",
 	       table_name,
 	       root_name);
     } else {
@@ -407,11 +407,11 @@ main(int argc, char **argv)
 		printf("\t%d,%d,",
 		       name_table[n].ute_argc,
 		       name_table[n].ute_args);
-	    printf("\t%3d, %3d %s%c\n",
+	    printf("\t%3d, %3d %s%s\n",
 		   name_table[n].ute_index,
 		   name_table[n].ute_link,
 		   R_BRACE,
-		   n < tablesize - 1 ? ',' : ' ');
+		   n < tablesize - 1 ? "," : "");
 	}
 	printf("%s;\n\n", R_BRACE);
     }
@@ -439,7 +439,7 @@ main(int argc, char **argv)
 	free((void *) name_table[n].ute_name);
     }
     free(name_table);
-    parse_columns(0);
+    parse_columns(NULL);
 
     return EXIT_SUCCESS;
 }
diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c
index b8eb93435..8308266ef 100644
--- a/ncurses/tinfo/make_keys.c
+++ b/ncurses/tinfo/make_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #define USE_TERMLIB 1
 #include <build.priv.h>
 
-MODULE_ID("$Id: make_keys.c,v 1.23 2021/08/18 20:55:25 tom Exp $")
+MODULE_ID("$Id: make_keys.c,v 1.24 2024/12/07 20:06:49 tom Exp $")
 
 #include <names.c>
 
@@ -51,10 +51,10 @@ unknown(void)
 
     if (result == 0) {
 	unsigned n;
-	for (n = 0; strnames[n] != 0; n++) {
+	for (n = 0; strnames[n] != NULL; n++) {
 	    ++result;
 	}
-	for (n = 0; strfnames[n] != 0; n++) {
+	for (n = 0; strfnames[n] != NULL; n++) {
 	    ++result;
 	}
     }
@@ -66,14 +66,14 @@ lookup(const char *name)
 {
     unsigned n;
     bool found = FALSE;
-    for (n = 0; strnames[n] != 0; n++) {
+    for (n = 0; strnames[n] != NULL; n++) {
 	if (!strcmp(name, strnames[n])) {
 	    found = TRUE;
 	    break;
 	}
     }
     if (!found) {
-	for (n = 0; strfnames[n] != 0; n++) {
+	for (n = 0; strfnames[n] != NULL; n++) {
 	    if (!strcmp(name, strfnames[n])) {
 		found = TRUE;
 		break;
@@ -93,7 +93,7 @@ make_keys(FILE *ifp, FILE *ofp)
     unsigned maxlen = 16;
     int scanned;
 
-    while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) {
+    while (fgets(buffer, (int) sizeof(buffer), ifp) != NULL) {
 	if (*buffer == '#')
 	    continue;
 
@@ -119,7 +119,7 @@ make_keys(FILE *ifp, FILE *ofp)
 static void
 write_list(FILE *ofp, const char **list)
 {
-    while (*list != 0)
+    while (*list != NULL)
 	fprintf(ofp, "%s\n", *list++);
 }
 
@@ -139,14 +139,14 @@ main(int argc, char *argv[])
 	"static",
 	"#endif",
 	"const struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
-	0
+	NULL
     };
     static const char *suffix[] =
     {
 	"\t{ 0, 0} };",
 	"",
 	"#endif /* _INIT_KEYTRY_H */",
-	0
+	NULL
     };
 
     write_list(stdout, prefix);
@@ -154,7 +154,7 @@ main(int argc, char *argv[])
 	int n;
 	for (n = 1; n < argc; n++) {
 	    FILE *fp = fopen(argv[n], "r");
-	    if (fp != 0) {
+	    if (fp != NULL) {
 		make_keys(fp, stdout);
 		fclose(fp);
 	    }
diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index 71e584d77..44d4ead0c 100644
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: name_match.c,v 1.25 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.26 2024/12/07 21:24:18 tom Exp $")
 
 #define FirstName _nc_globals.first_name
 
@@ -60,17 +60,17 @@ NCURSES_EXPORT(char *)
 _nc_first_name(const char *const sp)
 {
 #if NO_LEAKS
-    if (sp == 0) {
-	if (FirstName != 0) {
+    if (sp == NULL) {
+	if (FirstName != NULL) {
 	    FreeAndNull(FirstName);
 	}
     } else
 #endif
     {
-	if (FirstName == 0)
+	if (FirstName == NULL)
 	    FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
 
-	if (FirstName != 0) {
+	if (FirstName != NULL) {
 	    unsigned n;
 	    const char *src = sp;
 #if NCURSES_USE_TERMCAP && NCURSES_XNAMES
@@ -95,7 +95,7 @@ _nc_name_match(const char *const namelst, const char *const name, const char *co
 {
     const char *s;
 
-    if ((s = namelst) != 0) {
+    if ((s = namelst) != NULL) {
 	while (*s != '\0') {
 	    const char *d, *t;
 	    int code, found;
diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c
index cc62f18cb..25d1dbb6a 100644
--- a/ncurses/tinfo/obsolete.c
+++ b/ncurses/tinfo/obsolete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2013-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: obsolete.c,v 1.11 2023/10/21 15:38:47 tom Exp $")
+MODULE_ID("$Id: obsolete.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
 
 /*
  * Obsolete entrypoint retained for binary compatibility.
@@ -126,7 +126,7 @@ _nc_conv_to_utf8(unsigned char *target, unsigned source, unsigned limit)
 	rc = 0;
     }
 
-    if (target != 0) {
+    if (target != NULL) {
 	switch (rc) {
 	case 1:
 	    target[0] = CH(0);
@@ -225,7 +225,7 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit)
 	}
     }
 
-    if (target != 0) {
+    if (target != NULL) {
 	int shift = 0;
 	*target = 0;
 	for (j = 1; j < rc; j++) {
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index c824eb8e3..29035b850 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.111 2024/11/23 18:49:08 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.112 2024/12/07 21:13:36 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -204,7 +204,7 @@ expected_type(const char *name, int token_type, bool silent)
 {
     struct user_table_entry const *entry = _nc_find_user_entry(name);
     bool result = TRUE;
-    if ((entry != 0) && (token_type != CANCEL)) {
+    if ((entry != NULL) && (token_type != CANCEL)) {
 	int have_type = (1 << token_type);
 	if (!(entry->ute_type & have_type)) {
 	    if (!silent)
@@ -332,7 +332,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 
     entryp->tterm.str_table = entryp->tterm.term_names = _nc_save_str(ptr);
 
-    if (entryp->tterm.str_table == 0)
+    if (entryp->tterm.str_table == NULL)
 	returnDB(ERR);
 
     DEBUG(2, ("Starting '%s'", ptr));
@@ -350,7 +350,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
     _nc_set_type(name);
 
     /* check for overly-long names and aliases */
-    for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != 0;
+    for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != NULL;
 	 base = ptr + 1) {
 	if (ptr - base > MAX_ALIAS) {
 	    _nc_warning("%s `%.*s' may be too long",
@@ -459,7 +459,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 		if (expected_type(_nc_curr_token.tk_name, token_type, silent)) {
 		    if ((entry_ptr = _nc_extend_names(entryp,
 						      _nc_curr_token.tk_name,
-						      token_type)) != 0) {
+						      token_type)) != NULL) {
 			if (_nc_tracing >= DEBUG_LEVEL(1)) {
 			    _nc_warning("extended capability '%s'",
 					_nc_curr_token.tk_name);
@@ -629,7 +629,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 		 * have picked up defaults via translation.
 		 */
 		for (i = 0; i < entryp->nuses; i++) {
-		    if (entryp->uses[i].name != 0
+		    if (entryp->uses[i].name != NULL
 			&& !strchr(entryp->uses[i].name, '+'))
 			has_base_entry = TRUE;
 		}
@@ -697,7 +697,7 @@ _nc_capcmp(const char *s, const char *t)
 static void
 append_acs0(string_desc * dst, int code, const char *src, size_t off)
 {
-    if (src != 0 && off < strlen(src)) {
+    if (src != NULL && off < strlen(src)) {
 	char temp[3];
 	temp[0] = (char) code;
 	temp[1] = src[off];
@@ -929,15 +929,15 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base)
 
 	/* we're going to use this for a special case later */
 	dp = strchr(other_non_function_keys, 'i');
-	foundim = (dp != 0) && (dp[1] == 'm');
+	foundim = (dp != NULL) && (dp[1] == 'm');
 
 	/* look at each comma-separated capability in the ko string... */
 	for (base = other_non_function_keys;
-	     (cp = strchr(base, ',')) != 0;
+	     (cp = strchr(base, ',')) != NULL;
 	     base = cp + 1) {
 	    size_t len = (unsigned) (cp - base);
 	    size_t n;
-	    assoc const *ap = 0;
+	    assoc const *ap = NULL;
 
 	    for (n = 0; n < SIZEOF(ko_xlate); ++n) {
 		if (len == strlen(ko_xlate[n].from)
@@ -946,7 +946,7 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base)
 		    break;
 		}
 	    }
-	    if (ap == 0) {
+	    if (ap == NULL) {
 		_nc_warning("unknown capability `%.*s' in ko string",
 			    (int) len, base);
 		continue;
@@ -1143,7 +1143,7 @@ lookup_fullname(const char *find)
 	    return NOTFOUND;
 	}
 
-	for (count = 0; names[count] != 0; count++) {
+	for (count = 0; names[count] != NULL; count++) {
 	    if (!strcmp(names[count], find)) {
 		struct name_table_entry const *entry_ptr = _nc_get_table(FALSE);
 		while (entry_ptr->nte_type != state
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 9fcbaab22..5b284dec9 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.173 2024/07/27 23:07:02 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.174 2024/12/07 21:02:00 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -237,11 +237,11 @@ _nc_init_termtype(TERMTYPE2 *const tp)
     tp->ext_Numbers = 0;
     tp->ext_Strings = 0;
 #endif
-    if (tp->Booleans == 0)
+    if (tp->Booleans == NULL)
 	TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans);
-    if (tp->Numbers == 0)
+    if (tp->Numbers == NULL)
 	TYPE_MALLOC(NCURSES_INT2, NUMCOUNT, tp->Numbers);
-    if (tp->Strings == 0)
+    if (tp->Strings == NULL)
 	TYPE_MALLOC(char *, STRCOUNT, tp->Strings);
 
     for_each_boolean(i, tp)
@@ -346,7 +346,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
     want = (unsigned) (str_size + name_size + 1);
     /* try to allocate space for the string table */
     if (str_count * SIZEOF_SHORT >= max_entry_size
-	|| (string_table = typeMalloc(char, want)) == 0) {
+	|| (string_table = typeMalloc(char, want)) == NULL) {
 	returnDB(TGETENT_NO);
     }
 
@@ -483,7 +483,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
 
 	if (ext_str_limit) {
 	    ptr->ext_str_table = typeMalloc(char, (size_t) ext_str_limit);
-	    if (ptr->ext_str_table == 0) {
+	    if (ptr->ext_str_table == NULL) {
 		returnDB(TGETENT_NO);
 	    }
 	    if (Read(ptr->ext_str_table, (unsigned) ext_str_limit) != ext_str_limit) {
@@ -582,11 +582,11 @@ NCURSES_EXPORT(int)
 _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
 /* return 1 if read, 0 if not found or garbled */
 {
-    FILE *fp = 0;
+    FILE *fp = NULL;
     int code;
 
     if (_nc_access(filename, R_OK) < 0
-	|| (fp = safe_fopen(filename, BIN_R)) == 0) {
+	|| (fp = safe_fopen(filename, BIN_R)) == NULL) {
 	TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
 	code = TGETENT_NO;
     } else {
@@ -881,7 +881,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 {
     int code = TGETENT_NO;
 
-    if (name == 0)
+    if (name == NULL)
 	return _nc_read_entry2("", filename, tp);
 
     _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
@@ -891,7 +891,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 	|| strcmp(name, ".") == 0
 	|| strcmp(name, "..") == 0
 	|| _nc_pathlast(name) != 0
-	|| strchr(name, NCURSES_PATHSEP) != 0) {
+	|| strchr(name, NCURSES_PATHSEP) != NULL) {
 	TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name));
     } else {
 #if NCURSES_USE_DATABASE
@@ -901,7 +901,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 
 	_nc_first_db(&state, &offset);
 	code = TGETENT_ERR;
-	while ((path = _nc_next_db(&state, &offset)) != 0) {
+	while ((path = _nc_next_db(&state, &offset)) != NULL) {
 	    code = _nc_read_tic_entry(filename, PATH_MAX, path, name, tp);
 	    if (code == TGETENT_YES) {
 		_nc_last_db();
diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c
index 03f59c24e..7ae15e84c 100644
--- a/ncurses/tinfo/strings.c
+++ b/ncurses/tinfo/strings.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2000-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: strings.c,v 1.11 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: strings.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
 
 /****************************************************************************
  * Useful string functions (especially for mvcur)
@@ -71,12 +71,12 @@ _nc_strstr(const char *haystack, const char *needle)
 NCURSES_EXPORT(string_desc *)
 _nc_str_init(string_desc * dst, char *src, size_t len)
 {
-    if (dst != 0) {
+    if (dst != NULL) {
 	dst->s_head = src;
 	dst->s_tail = src;
 	dst->s_size = len - 1;
 	dst->s_init = dst->s_size;
-	if (src != 0)
+	if (src != NULL)
 	    *src = 0;
     }
     return dst;
@@ -88,7 +88,7 @@ _nc_str_init(string_desc * dst, char *src, size_t len)
 NCURSES_EXPORT(string_desc *)
 _nc_str_null(string_desc * dst, size_t len)
 {
-    return _nc_str_init(dst, 0, len);
+    return _nc_str_init(dst, NULL, len);
 }
 
 /*
@@ -111,7 +111,7 @@ _nc_safe_strcat(string_desc * dst, const char *src)
 	size_t len = strlen(src);
 
 	if (len < dst->s_size) {
-	    if (dst->s_tail != 0) {
+	    if (dst->s_tail != NULL) {
 		_nc_STRCPY(dst->s_tail, src, dst->s_size);
 		dst->s_tail += len;
 	    }
@@ -132,7 +132,7 @@ _nc_safe_strcpy(string_desc * dst, const char *src)
 	size_t len = strlen(src);
 
 	if (len < dst->s_size) {
-	    if (dst->s_head != 0) {
+	    if (dst->s_head != NULL) {
 		_nc_STRCPY(dst->s_head, src, dst->s_size);
 		dst->s_tail = dst->s_head + len;
 	    }
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index 1c5570901..bab323b93 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -37,7 +37,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.25 2024/10/19 21:18:18 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.26 2024/12/07 21:02:59 tom Exp $")
 
 #undef CUR
 #define CUR tp->
@@ -52,7 +52,7 @@ set_attribute_9(const TERMTYPE2 *tp, int flag)
     if (PRESENT(value))
 	result = strdup(value);
     else
-	result = 0;
+	result = NULL;
     return result;
 }
 
@@ -60,7 +60,7 @@ static int
 is_csi(const char *s)
 {
     int result = 0;
-    if (s != 0) {
+    if (s != NULL) {
 	if (UChar(s[0]) == CSI_CHR)
 	    result = 1;
 	else if (s[0] == ESC_CHR && s[1] == L_BLOCK)
@@ -101,7 +101,7 @@ skip_delay(const char *s)
 static bool
 rewrite_sgr(char *s, const char *attr)
 {
-    if (s != 0) {
+    if (s != NULL) {
 	if (PRESENT(attr)) {
 	    size_t len_s = strlen(s);
 	    size_t len_a = strlen(attr);
@@ -125,7 +125,7 @@ static bool
 similar_sgr(char *a, char *b)
 {
     bool result = FALSE;
-    if (a != 0 && b != 0) {
+    if (a != NULL && b != NULL) {
 	int csi_a = is_csi(a);
 	int csi_b = is_csi(b);
 	size_t len_a;
@@ -300,7 +300,7 @@ _nc_trim_sgr0(TERMTYPE2 *tp)
 		}
 	    }
 	    if (!found
-		&& (tmp = strstr(end, off)) != 0
+		&& (tmp = strstr(end, off)) != NULL
 		&& strcmp(end, off) != 0) {
 		i = (size_t) (tmp - end);
 		j = strlen(off);
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 69acb8434..eb6e36274 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.137 2024/11/09 19:24:01 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.138 2024/12/07 21:13:36 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -82,12 +82,12 @@ write_file(char *filename, TERMTYPE2 *tp)
     } else {
 	FILE *fp = ((_nc_access(filename, W_OK) == 0)
 		    ? safe_fopen(filename, BIN_W)
-		    : 0);
+		    : NULL);
 	size_t actual;
 
-	if (fp == 0) {
+	if (fp == NULL) {
 	    _nc_syserr_abort("cannot open %s/%s: (errno %d) %s",
-			     _nc_tic_dir(0),
+			     _nc_tic_dir(NULL),
 			     filename,
 			     errno,
 			     strerror(errno));
@@ -129,9 +129,9 @@ check_writeable(int code)
     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
     static bool verified[sizeof(dirnames)];
 
-    const char *s = 0;
+    const char *s = NULL;
 
-    if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
+    if (code == 0 || (s = (strchr) (dirnames, code)) == NULL) {
 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
     } else if (!verified[s - dirnames]) {
 	char dir[sizeof(LEAF_FMT)];
diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index db8609f58..a7197b0d3 100644
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.108 2024/11/23 18:40:23 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.109 2024/12/07 21:02:00 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -135,7 +135,7 @@ curses_trace(unsigned tracelevel)
 
     Locked(result = _nc_tracing);
 
-    if ((MyFP == 0) && tracelevel) {
+    if ((MyFP == NULL) && tracelevel) {
 	MyInit = TRUE;
 	if (MyFD >= 0) {
 	    MyFP = fdopen(MyFD, BIN_W);
@@ -149,7 +149,7 @@ curses_trace(unsigned tracelevel)
 #define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR)
 	    if (_nc_access(myFile, W_OK) < 0
 		|| (MyFD = safe_open3(myFile, SAFE_MODE, 0600)) < 0
-		|| (MyFP = fdopen(MyFD, BIN_W)) == 0) {
+		|| (MyFP = fdopen(MyFD, BIN_W)) == NULL) {
 		;		/* EMPTY */
 	    }
 	}
@@ -158,7 +158,7 @@ curses_trace(unsigned tracelevel)
 	 * 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 (MyFP != NULL) {
 #if HAVE_SETVBUF		/* ANSI */
 	    (void) setvbuf(MyFP, (char *) 0, _IOLBF, (size_t) 0);
 #elif HAVE_SETBUF /* POSIX */
@@ -188,10 +188,10 @@ curses_trace(unsigned tracelevel)
 	    _tracef("- DEBUG_LEVEL(%u)", tracelevel >> TRACE_SHIFT);
 	}
     } else if (tracelevel == 0) {
-	if (MyFP != 0) {
+	if (MyFP != NULL) {
 	    MyFD = dup(MyFD);	/* allow reopen of same file */
 	    fclose(MyFP);
-	    MyFP = 0;
+	    MyFP = NULL;
 	}
 	Locked(_nc_tracing = tracelevel);
     } else if (_nc_tracing != tracelevel) {
@@ -226,7 +226,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 
 #ifdef TRACE
     /* verbose-trace in the command-line utilities relies on this */
-    if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
+    if (fp == NULL && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
 	fp = stderr;
 #endif
 
@@ -246,7 +246,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 	}
     }
 
-    if (doit != 0 && fp != 0) {
+    if (doit != 0 && fp != NULL) {
 #ifdef USE_PTHREADS
 	/*
 	 * TRACE_ICALLS is "really" needed to show normal use with threaded
diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index aa3a9ddbf..68e227451 100644
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -44,7 +44,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.97 2024/07/27 19:08:04 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.98 2024/12/07 21:12:53 tom Exp $")
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
@@ -126,7 +126,7 @@ _traceattr2(int bufnum, chtype newmode)
 #undef DATA
     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
-    if (result != 0) {
+    if (result != NULL) {
 	size_t n;
 	unsigned save_nc_tracing = _nc_tracing;
 
@@ -167,7 +167,7 @@ _traceattr2(int bufnum, chtype newmode)
 	    }
 	}
 	if (ChAttrOf(newmode) == A_NORMAL) {
-	    if (result != 0 && result[1] != '\0')
+	    if (result != NULL && result[1] != '\0')
 		(void) _nc_trace_bufcat(bufnum, "|");
 	    (void) _nc_trace_bufcat(bufnum, "A_NORMAL");
 	}
@@ -248,14 +248,14 @@ _nc_altcharset_name(attr_t attr, chtype ch)
     };
 #undef DATA
 
-    const char *result = 0;
+    const char *result = NULL;
 
 #if NCURSES_SP_FUNCS
     (void) sp;
 #endif
-    if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
+    if (SP_PARM != NULL && (attr & A_ALTCHARSET) && (acs_chars != NULL)) {
 	char *cp;
-	const char *found = 0;
+	const char *found = NULL;
 
 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
 	    if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
@@ -264,7 +264,7 @@ _nc_altcharset_name(attr_t attr, chtype ch)
 	    }
 	}
 
-	if (found != 0) {
+	if (found != NULL) {
 	    size_t n;
 
 	    ch = ChCharOf(UChar(*found));
@@ -284,12 +284,12 @@ _tracechtype2(int bufnum, chtype ch)
 {
     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
-    if (result != 0) {
+    if (result != NULL) {
 	const char *found;
 	attr_t attr = ChAttrOf(ch);
 
 	_nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
-	if ((found = _nc_altcharset_name(attr, ch)) != 0) {
+	if ((found = _nc_altcharset_name(attr, ch)) != NULL) {
 	    (void) _nc_trace_bufcat(bufnum, found);
 	    attr &= ~A_ALTCHARSET;
 	} else
@@ -328,13 +328,13 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
 {
     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
-    if (result != 0) {
+    if (result != NULL) {
 	_nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
-	if (ch != 0) {
+	if (ch != NULL) {
 	    const char *found;
 	    attr_t attr = AttrOfD(ch);
 
-	    if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
+	    if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != NULL) {
 		(void) _nc_trace_bufcat(bufnum, found);
 		attr &= ~A_ALTCHARSET;
 	    } else if (isWidecExt(CHDEREF(ch))) {
diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c
index 4bc50f3b0..1142c5342 100644
--- a/ncurses/trace/lib_tracebits.c
+++ b/ncurses/trace/lib_tracebits.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $")
+MODULE_ID("$Id: lib_tracebits.c,v 1.32 2024/12/07 21:24:18 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -172,7 +172,7 @@ _nc_trace_ttymode(const TTY * tty)
 			8 + sizeof(cflags) +
 			8 + sizeof(lflags) +
 			8);
-    if (buf != 0) {
+    if (buf != NULL) {
 
 	if (tty->c_iflag & ALLIN)
 	    lookup_bits(buf, iflags, "iflags", tty->c_iflag);
diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index 029b9ad80..db3cb5309 100644
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -40,7 +40,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracechr.c,v 1.25 2024/11/23 19:50:34 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.26 2024/12/07 21:02:00 tom Exp $")
 
 #ifdef TRACE
 
@@ -50,13 +50,13 @@ NCURSES_EXPORT(char *)
 _nc_tracechar(SCREEN *sp, int ch)
 {
     NCURSES_CONST char *name;
-    char *MyBuffer = ((sp != 0)
+    char *MyBuffer = ((sp != NULL)
 		      ? sp->tracechr_buf
 		      : _nc_globals.tracechr_buf);
 
     if ((ch > KEY_MIN && !_nc_unicode_locale()) || ch < 0) {
 	name = safe_keyname(SP_PARM, ch);
-	if (name == 0 || *name == '\0')
+	if (name == NULL || *name == '\0')
 	    name = "NULL";
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
 		    "'%.30s' = \\x%02x", name, UChar(ch));
@@ -72,7 +72,7 @@ _nc_tracechar(SCREEN *sp, int ch)
 		    "\\x%02x", ch);
     } else {
 	name = safe_unctrl(SP_PARM, (chtype) ch);
-	if (name == 0 || *name == 0)
+	if (name == NULL || *name == 0)
 	    name = "null";	/* shouldn't happen */
 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
 		    "'%.30s' = \\x%02x", name, ch);
diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index 529148bb7..218a15e0f 100644
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracedmp.c,v 1.37 2023/06/24 15:49:45 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.38 2024/12/07 20:06:49 tom Exp $")
 
 #ifdef TRACE
 
@@ -72,7 +72,7 @@ _tracedump(const char *name, WINDOW *win)
 	my_length = (unsigned) (2 * (width + 1));
 	my_buffer = typeRealloc(char, my_length, my_buffer);
     }
-    if (my_buffer == 0)
+    if (my_buffer == NULL)
 	return;
 
     for (n = 0; n <= win->_maxy; ++n) {
@@ -177,7 +177,7 @@ _tracedump(const char *name, WINDOW *win)
     }
 #if NO_LEAKS
     free(my_buffer);
-    my_buffer = 0;
+    my_buffer = NULL;
     my_length = 0;
 #endif
 }
diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c
index 33d4d3d30..bbca18b00 100644
--- a/ncurses/trace/lib_tracemse.c
+++ b/ncurses/trace/lib_tracemse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_tracemse.c,v 1.23 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_tracemse.c,v 1.24 2024/12/07 20:06:49 tom Exp $")
 
 #ifdef TRACE
 
@@ -117,9 +117,9 @@ _nc_trace_mmask_t(SCREEN *sp, mmask_t code)
 NCURSES_EXPORT(char *)
 _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
 {
-    char *result = 0;
+    char *result = NULL;
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	_nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer))
 		    TRACEMSE_FMT,
 		    ep->id,
@@ -138,7 +138,7 @@ _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
 NCURSES_EXPORT(mmask_t)
 _nc_retrace_mmask_t(SCREEN *sp, mmask_t code)
 {
-    if (sp != 0) {
+    if (sp != NULL) {
 	*my_buffer = '\0';
 	T((T_RETURN("{%s}"), _nc_trace_mmask_t(sp, code)));
     } else {
diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c
index 91b12e45c..0ab258d43 100644
--- a/ncurses/trace/trace_buf.c
+++ b/ncurses/trace/trace_buf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_buf.c,v 1.22 2023/06/24 13:37:25 tom Exp $")
+MODULE_ID("$Id: trace_buf.c,v 1.23 2024/12/07 21:24:18 tom Exp $")
 
 #ifdef TRACE
 
@@ -46,22 +46,22 @@ MODULE_ID("$Id: trace_buf.c,v 1.22 2023/06/24 13:37:25 tom Exp $")
 static char *
 _nc_trace_alloc(int bufnum, size_t want)
 {
-    char *result = 0;
+    char *result = NULL;
 
     if (bufnum >= 0) {
 	if ((size_t) (bufnum + 1) > MySize) {
 	    size_t need = (size_t) (bufnum + 1) * 2;
-	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != 0) {
+	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != NULL) {
 		while (need > MySize)
-		    MyList[MySize++].text = 0;
+		    MyList[MySize++].text = NULL;
 	    }
 	}
 
-	if (MyList != 0) {
-	    if (MyList[bufnum].text == 0
+	if (MyList != NULL) {
+	    if (MyList[bufnum].text == NULL
 		|| want > MyList[bufnum].size) {
 		MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text);
-		if (MyList[bufnum].text != 0)
+		if (MyList[bufnum].text != NULL)
 		    MyList[bufnum].size = want;
 	    }
 	    result = MyList[bufnum].text;
@@ -72,12 +72,12 @@ _nc_trace_alloc(int bufnum, size_t want)
 	if (MySize) {
 	    if (MyList) {
 		while (MySize--) {
-		    if (MyList[MySize].text != 0) {
+		    if (MyList[MySize].text != NULL) {
 			free(MyList[MySize].text);
 		    }
 		}
 		free(MyList);
-		MyList = 0;
+		MyList = NULL;
 	    }
 	    MySize = 0;
 	}
@@ -93,7 +93,7 @@ NCURSES_EXPORT(char *)
 _nc_trace_buf(int bufnum, size_t want)
 {
     char *result = _nc_trace_alloc(bufnum, want);
-    if (result != 0)
+    if (result != NULL)
 	*result = '\0';
     return result;
 }
@@ -109,12 +109,12 @@ _nc_trace_bufcat(int bufnum, const char *value)
     if (value == NULL)
 	value = "";
     buffer = _nc_trace_alloc(bufnum, (size_t) 0);
-    if (buffer != 0) {
+    if (buffer != NULL) {
 	size_t have = strlen(buffer);
 	size_t need = strlen(value) + have;
 
 	buffer = _nc_trace_alloc(bufnum, 1 + need);
-	if (buffer != 0)
+	if (buffer != NULL)
 	    _nc_STRCPY(buffer + have, value, need);
 
     }
diff --git a/ncurses/trace/trace_tries.c b/ncurses/trace/trace_tries.c
index 14f704b4a..8d2592aa7 100644
--- a/ncurses/trace/trace_tries.c
+++ b/ncurses/trace/trace_tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1999-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_tries.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: trace_tries.c,v 1.19 2024/12/07 21:24:18 tom Exp $")
 
 #ifdef TRACE
 #define my_buffer _nc_globals.tracetry_buf
@@ -50,8 +50,8 @@ recur_tries(TRIES * tree, unsigned level)
 	my_buffer = (unsigned char *) _nc_doalloc(my_buffer, my_length);
     }
 
-    if (my_buffer != 0) {
-	while (tree != 0) {
+    if (my_buffer != NULL) {
+	while (tree != NULL) {
 	    if ((my_buffer[level] = tree->ch) == 0)
 		my_buffer[level] = 128;
 	    my_buffer[level + 1] = 0;
@@ -69,7 +69,7 @@ recur_tries(TRIES * tree, unsigned level)
 NCURSES_EXPORT(void)
 _nc_trace_tries(TRIES * tree)
 {
-    if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != 0) {
+    if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != NULL) {
 	_tracef("BEGIN tries %p", (void *) tree);
 	recur_tries(tree, 0);
 	_tracef(". . . tries %p", (void *) tree);
diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c
index 0fc56477b..9b157a4bf 100644
--- a/ncurses/trace/varargs.c
+++ b/ncurses/trace/varargs.c
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: varargs.c,v 1.14 2024/07/27 19:23:59 tom Exp $")
+MODULE_ID("$Id: varargs.c,v 1.15 2024/12/07 18:00:11 tom Exp $")
 
 #ifdef TRACE
 
@@ -63,17 +63,17 @@ _nc_varargs(const char *fmt, va_list ap)
     const char *param;
     int n;
 
-    if (fmt == 0 || *fmt == '\0')
+    if (fmt == NULL || *fmt == '\0')
 	return NULL;
     if (MyLength == 0)
 	MyBuffer = typeMalloc(char, MyLength = BUFSIZ);
-    if (MyBuffer == 0)
+    if (MyBuffer == NULL)
 	return NULL;
     *MyBuffer = '\0';
 
     while (*fmt != '\0') {
 	if (*fmt == '%') {
-	    const char *pval = 0;	/* avoid const-cast */
+	    const char *pval = NULL;	/* avoid const-cast */
 	    const char *sval = "";
 	    double fval = 0.0;
 	    int done = FALSE;
@@ -169,7 +169,7 @@ _nc_varargs(const char *fmt, va_list ap)
 			}
 			MyLength += strlen(param) + 2;
 			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
-			if (MyBuffer != 0) {
+			if (MyBuffer != NULL) {
 			    _nc_SPRINTF(MyBuffer + strlen(MyBuffer),
 					_nc_SLIMIT(MyLength - strlen(MyBuffer))
 					", %s", param);
diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c
index b04150f5c..2fdd554c5 100644
--- a/ncurses/trace/visbuf.c
+++ b/ncurses/trace/visbuf.c
@@ -43,7 +43,7 @@
 #include <tic.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: visbuf.c,v 1.55 2024/11/30 21:24:09 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.56 2024/12/07 21:12:53 tom Exp $")
 
 #define NUM_VISBUFS 4
 
@@ -109,11 +109,11 @@ _nc_vischar(char *tp, unsigned c LIMIT_ARG)
 static const char *
 _nc_visbuf2n(int bufnum, const char *buf, int len)
 {
-    const char *vbuf = 0;
+    const char *vbuf = NULL;
     char *tp;
     int count;
 
-    if (buf == 0)
+    if (buf == NULL)
 	return ("(null)");
     if (buf == CANCELLED_STRING)
 	return ("(cancelled)");
@@ -140,7 +140,7 @@ _nc_visbuf2n(int bufnum, const char *buf, int len)
 	}
     }
 #endif
-    if (tp != 0) {
+    if (tp != NULL) {
 	int c;
 
 	*tp++ = D_QUOTE;
@@ -196,7 +196,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
     char *tp;
     int count;
 
-    if (buf == 0)
+    if (buf == NULL)
 	return ("(null)");
 
     if (len < 0)
@@ -212,7 +212,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
 	vbuf = tp = mybuf[bufnum];
     }
 #endif
-    if (tp != 0) {
+    if (tp != NULL) {
 	wchar_t c;
 
 	*tp++ = D_QUOTE;
@@ -267,12 +267,12 @@ _nc_viswibuf(const wint_t *buf)
     }
     if (mylen < ++n) {
 	mylen = n + 80;
-	if (mybuf != 0)
+	if (mybuf != NULL)
 	    mybuf = typeRealloc(wchar_t, mylen, mybuf);
 	else
 	    mybuf = typeMalloc(wchar_t, mylen);
     }
-    if (mybuf != 0) {
+    if (mybuf != NULL) {
 	for (n = 0; buf[n] != 0; ++n) {
 	    mybuf[n] = (wchar_t) buf[n];
 	}
@@ -289,7 +289,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T *buf, int len)
 {
     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
-    if (result != 0) {
+    if (result != NULL) {
 	int first = 0;
 
 #if USE_WIDEC_SUPPORT
@@ -317,7 +317,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T *buf, int len)
 	    for (j = first; j <= last; ++j) {
 		const char *found = _nc_altcharset_name(attr, (chtype)
 							CharOf(buf[j]));
-		if (found != 0) {
+		if (found != NULL) {
 		    (void) _nc_trace_bufcat(bufnum, found);
 		    attr &= ~A_ALTCHARSET;
 		} else
diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index 0072be2cd..576959958 100755
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##############################################################################
-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 #
 # Author: Thomas E. Dickey, 1997-on
 #
-# $Id: MKexpanded.sh,v 1.24 2022/02/05 17:27:18 tom Exp $
+# $Id: MKexpanded.sh,v 1.25 2024/12/07 20:48:46 tom Exp $
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
@@ -127,7 +127,12 @@ _nc_UpdateAttrs (CARG_CH_T c)
 EOF
 
 $preprocessor $TMP 2>/dev/null | \
-	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#[ 	]*if_/#if /' -e "s,$TMP,expanded.c,"
+	sed -e '1,/^IGNORE$/d' \
+		-e 's/^@/#/' \
+		-e 's/^#[ 	]*if_/#if /' \
+		-e "s,$TMP,expanded.c," \
+		-e 's/[ 	][ 	]*$//' \
+		-e '/^#[ 	]*[0-9]/d'
 
 cat <<EOF
 #else /* ! NCURSES_EXPANDED */
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 2b1f079e4..2f50761cb 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.58 2023/09/09 16:04:08 Nicholas.Marriott Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.59 2024/12/07 20:06:49 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -169,7 +169,7 @@ extern				NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
    if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from
    somewhere. */
 NCURSES_EXPORT_VAR (int *)
-  _nc_oldnums = 0;		/* obsolete: keep for ABI compat */
+  _nc_oldnums = NULL;		/* obsolete: keep for ABI compat */
 
 # if USE_HASHMAP
 #  define oldnums(sp)   (sp)->_oldnum_list
@@ -196,7 +196,7 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
     /* get enough storage */
     assert(OLDNUM_SIZE(SP_PARM) >= 0);
     assert(screen_lines(SP_PARM) > 0);
-    if ((oldnums(SP_PARM) == 0)
+    if ((oldnums(SP_PARM) == NULL)
 	|| (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))) {
 	int need_lines = ((OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))
 			  ? screen_lines(SP_PARM)
@@ -308,11 +308,11 @@ NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0)
 /* dump the state of the real and virtual oldnum fields */
 {
     if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
-	char *buf = 0;
+	char *buf = NULL;
 	size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4;
 	(void) SP_PARM;
 
-	if ((buf = typeMalloc(char, want)) != 0) {
+	if ((buf = typeMalloc(char, want)) != NULL) {
 	    int n;
 
 	    *buf = '\0';
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 3b396a0c6..76d590433 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -74,7 +74,7 @@ AUTHOR
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: hashmap.c,v 1.72 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.73 2024/12/07 17:18:07 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -311,10 +311,10 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
 	}
     } else {
 	/* re-hash all */
-	if (oldhash(SP_PARM) == 0)
+	if (oldhash(SP_PARM) == NULL)
 	    oldhash(SP_PARM) = typeCalloc(unsigned long,
 					    (size_t) screen_lines(SP_PARM));
-	if (newhash(SP_PARM) == 0)
+	if (newhash(SP_PARM) == NULL)
 	    newhash(SP_PARM) = typeCalloc(unsigned long,
 					    (size_t) screen_lines(SP_PARM));
 	if (!oldhash(SP_PARM) || !newhash(SP_PARM)) {
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 8fad93c72..010daed44 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.161 2023/09/16 16:29:02 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.162 2024/12/07 20:06:49 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -222,7 +222,7 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcnt)
 /* compute the cost of a given operation */
 {
-    if (cap == 0)
+    if (cap == NULL)
 	return (INFINITY);
     else {
 	const char *cp;
@@ -364,7 +364,7 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
     SP_PARM->_home_cost = CostOf(cursor_home, 0);
     SP_PARM->_ll_cost = CostOf(cursor_to_ll, 0);
 #if USE_HARD_TABS
-    if (getenv("NCURSES_NO_HARD_TABS") == 0
+    if (getenv("NCURSES_NO_HARD_TABS") == NULL
 	&& dest_tabs_magic_smso == 0
 	&& HasHardTabs()) {
 	SP_PARM->_ht_cost = CostOf(tab, 0);
@@ -461,12 +461,12 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
      * nested on the various terminals (vt100, xterm, etc.) which use this
      * feature.
      */
-    if (save_cursor != 0
-	&& enter_ca_mode != 0
-	&& strstr(enter_ca_mode, save_cursor) != 0) {
+    if (save_cursor != NULL
+	&& enter_ca_mode != NULL
+	&& strstr(enter_ca_mode, save_cursor) != NULL) {
 	T(("...suppressed sc/rc capability due to conflict with smcup/rmcup"));
-	save_cursor = 0;
-	restore_cursor = 0;
+	save_cursor = NULL;
+	restore_cursor = NULL;
     }
 
     /*
@@ -580,7 +580,7 @@ relative_move(NCURSES_SP_DCLx
     if (to_y != from_y) {
 	vcost = INFINITY;
 
-	if (row_address != 0
+	if (row_address != NULL
 	    && _nc_safe_strcat(target, TIPARM_1(row_address, to_y))) {
 	    vcost = SP_PARM->_vpa_cost;
 	}
@@ -984,7 +984,7 @@ _nc_real_mvcur(NCURSES_SP_DCLx
     TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_real_mvcur(%p,%d,%d,%d,%d)"),
 				  (void *) SP_PARM, yold, xold, ynew, xnew));
 
-    if (SP_PARM == 0) {
+    if (SP_PARM == NULL) {
 	code = ERR;
     } else if (yold == ynew && xold == xnew) {
 	code = OK;
@@ -1079,7 +1079,7 @@ NCURSES_SP_NAME(_nc_mvcur) (NCURSES_SP_DCLx
      * external calls.  Flush the output if the screen has not been
      * initialized, e.g., when used from low-level terminfo programs.
      */
-    if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial))
+    if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial))
 	NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     return rc;
 }
diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index dd925c7ef..2ae17e082 100644
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <SigAction.h>
 
-MODULE_ID("$Id: lib_tstp.c,v 1.54 2022/12/24 22:22:10 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.55 2024/12/07 20:06:49 tom Exp $")
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
@@ -159,7 +159,7 @@ handle_SIGTSTP(int dummy GCC_UNUSED)
      *
      * Don't do this if we're not in curses -
      */
-    if (sp != 0 && (sp->_endwin == ewRunning))
+    if (sp != NULL && (sp->_endwin == ewRunning))
 #if HAVE_TCGETPGRP
 	if (tcgetpgrp(STDIN_FILENO) == getpgrp())
 #endif
@@ -269,7 +269,7 @@ handle_SIGINT(int sig)
 	{
 	    SCREEN *scan;
 	    for (each_screen(scan)) {
-		if (scan->_ofp != 0
+		if (scan->_ofp != NULL
 		    && NC_ISATTY(fileno(scan->_ofp))) {
 		    scan->_outch = NCURSES_SP_NAME(_nc_outch);
 		}
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 3c21f801d..ebb2e22da 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.82 2024/10/05 22:47:12 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.83 2024/12/07 21:02:00 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -120,7 +120,7 @@ _nc_eventlist_timeout(_nc_eventlist * evl)
 {
     int event_delay = -1;
 
-    if (evl != 0) {
+    if (evl != NULL) {
 	int n;
 
 	for (n = 0; n < evl->count; ++n) {
diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 2c7a0b27b..97a599e96 100644
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -70,7 +70,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vidattr.c,v 1.79 2023/04/28 20:59:26 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.80 2024/12/07 20:08:15 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -114,9 +114,9 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
     attr_t turn_on, turn_off;
     int pair;
     bool reverse = FALSE;
-    bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);
+    bool can_color = (SP_PARM == NULL || SP_PARM->_coloron);
 #if NCURSES_EXT_FUNCS
-    bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);
+    bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color);
 #else
 #define fix_pair0 FALSE
 #endif
@@ -134,7 +134,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 
     TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));
 
-    if ((SP_PARM != 0)
+    if ((SP_PARM != NULL)
 	&& (magic_cookie_glitch > 0)) {
 #if USE_XMC_SUPPORT
 	static const chtype table[] =
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 0427024cb..340b8a56f 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -85,7 +85,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: tty_update.c,v 1.316 2024/02/04 00:09:34 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.317 2024/12/07 18:00:11 tom Exp $")
 
 /*
  * This define controls the line-breakout optimization.  Every once in a
@@ -262,7 +262,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
 		|| (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
 		|| (AttrOf(attr) & A_ALTCHARSET
 		    && ((CharOfD(ch) < ACS_LEN
-			 && SP_PARM->_acs_map != 0
+			 && SP_PARM->_acs_map != NULL
 			 && SP_PARM->_acs_map[CharOfD(ch)] != 0)
 			|| (CharOfD(ch) >= 128))))) {
 	    ;
@@ -275,7 +275,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
 #endif
 
     if ((AttrOf(attr) & A_ALTCHARSET)
-	&& SP_PARM->_acs_map != 0
+	&& SP_PARM->_acs_map != NULL
 	&& ((CharOfD(ch) < ACS_LEN)
 #if !NCURSES_WCWIDTH_GRAPHICS
 	    || is_wacs_value(CharOfD(ch))
@@ -621,7 +621,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num)
 		} else {
 		    return 1;	/* cursor stays in the middle */
 		}
-	    } else if (repeat_char != 0 &&
+	    } else if (repeat_char != NULL &&
 #if BSD_TPUTS
 		       !isdigit(UChar(CharOf(ntext0))) &&
 #endif
@@ -643,7 +643,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num)
 		UpdateAttrs(SP_PARM, ntext0);
 		temp = ntext0;
 		if ((AttrOf(temp) & A_ALTCHARSET) &&
-		    SP_PARM->_acs_map != 0 &&
+		    SP_PARM->_acs_map != NULL &&
 		    (SP_PARM->_acs_map[CharOf(temp)] & A_CHARTEXT) != 0) {
 		    SetChar(temp,
 			    (SP_PARM->_acs_map[CharOf(ntext0)] & A_CHARTEXT),
@@ -745,7 +745,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 
     _nc_lock_global(update);
 
-    if (SP_PARM == 0) {
+    if (SP_PARM == NULL) {
 	_nc_unlock_global(update);
 	returnCode(ERR);
     }
@@ -762,7 +762,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
     if (SP_PARM == CURRENT_SCREEN) {
 #endif
 #define SyncScreens(internal,exported) \
-	if (internal == 0) internal = exported; \
+	if (internal == NULL) internal = exported; \
 	if (internal != exported) exported = internal
 
 	SyncScreens(CurScreen(SP_PARM), curscr);
@@ -773,9 +773,9 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 #endif
 #endif /* !USE_REENTRANT */
 
-    if (CurScreen(SP_PARM) == 0
-	|| NewScreen(SP_PARM) == 0
-	|| StdScreen(SP_PARM) == 0) {
+    if (CurScreen(SP_PARM) == NULL
+	|| NewScreen(SP_PARM) == NULL
+	|| StdScreen(SP_PARM) == NULL) {
 	_nc_unlock_global(update);
 	returnCode(ERR);
     }
@@ -1132,7 +1132,7 @@ static void
 ClrUpdate(NCURSES_SP_DCL0)
 {
     TR(TRACE_UPDATE, (T_CALLED("ClrUpdate")));
-    if (0 != SP_PARM) {
+    if (NULL != SP_PARM) {
 	int i;
 	NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));
 	int nonempty = Min(screen_lines(SP_PARM),
@@ -1159,7 +1159,7 @@ ClrUpdate(NCURSES_SP_DCL0)
 static void
 ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, int needclear)
 {
-    if (CurScreen(SP_PARM) != 0
+    if (CurScreen(SP_PARM) != NULL
 	&& SP_PARM->_cursrow >= 0) {
 	int j;
 
@@ -2223,7 +2223,7 @@ _nc_screen_init(void)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_screen_wrap) (NCURSES_SP_DCL0)
 {
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 
 	UpdateAttrs(SP_PARM, normal);
 #if NCURSES_EXT_FUNCS
@@ -2265,7 +2265,7 @@ _nc_screen_wrap(void)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_do_xmc_glitch) (NCURSES_SP_DCLx attr_t previous)
 {
-    if (SP_PARM != 0) {
+    if (SP_PARM != NULL) {
 	attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP_PARM)));
 
 	while (chg != 0) {
diff --git a/ncurses/wcwidth.h b/ncurses/wcwidth.h
index 5d181cdf6..32518e763 100644
--- a/ncurses/wcwidth.h
+++ b/ncurses/wcwidth.h
@@ -1,4 +1,4 @@
-/* $Id: wcwidth.h,v 1.7 2024/09/21 15:49:15 tom Exp $ */
+/* $Id: wcwidth.h,v 1.8 2024/12/07 16:20:09 tom Exp $ */
 
 /*
  * Copyright 2002-2023,2024 by Thomas E. Dickey
@@ -230,7 +230,7 @@ NCURSES_EXPORT(int) mk_wcwidth(uint32_t ucs)
 
   /* sorted list of non-overlapping intervals of non-spacing characters */
   /* generated by
-   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c 
+   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c
    */
   /* *INDENT-OFF* */
   /* generated by run-uniset 1.9 */
diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c
index f8160135b..a2a12be3a 100644
--- a/ncurses/widechar/lib_add_wch.c
+++ b/ncurses/widechar/lib_add_wch.c
@@ -40,7 +40,7 @@
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_add_wch.c,v 1.19 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_add_wch.c,v 1.20 2024/12/07 18:00:11 tom Exp $")
 
 /* clone/adapt lib_addch.c */
 static const cchar_t blankchar = NewChar(BLANK_TEXT);
@@ -384,7 +384,7 @@ wadd_wch_nosync(WINDOW *win, cchar_t ch)
 	win->_flags &= ~_WRAPPED;
 	break;
     default:
-	if ((s = wunctrl(&ch)) != 0) {
+	if ((s = wunctrl(&ch)) != NULL) {
 	    while (*s) {
 		cchar_t sch;
 		SetChar(sch, *s++, AttrOf(ch));
diff --git a/ncurses/widechar/lib_box_set.c b/ncurses/widechar/lib_box_set.c
index ef2e1a7d1..9525cd0ac 100644
--- a/ncurses/widechar/lib_box_set.c
+++ b/ncurses/widechar/lib_box_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_box_set.c,v 1.7 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_box_set.c,v 1.8 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 wborder_set(WINDOW *win,
@@ -67,7 +67,7 @@ wborder_set(WINDOW *win,
     if (!win)
 	returnCode(ERR);
 
-#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == 0) ? *(const ARG_CH_T)def : *ch)
+#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == NULL) ? *(const ARG_CH_T)def : *ch)
 
     RENDER_WITH_DEFAULT(ls, WACS_VLINE);
     RENDER_WITH_DEFAULT(rs, WACS_VLINE);
diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 81bef8ad3..b53594616 100644
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <wchar.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.39 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.40 2024/12/07 18:07:52 tom Exp $")
 
 /*
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -135,7 +135,7 @@ getcchar(const cchar_t *wcval,
 	     * If the value is not a null, return the length plus 1 for null.
 	     */
 	    code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX;
-	} else if (attrs == 0 || pair_arg == 0) {
+	} else if (attrs == NULL || pair_arg == NULL) {
 	    code = ERR;
 	} else if (len >= 0) {
 	    int color_pair;
diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index 9f10d3bcf..342022b5d 100644
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 2002-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_get_wch.c,v 1.26 2021/04/17 16:12:54 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.27 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 wget_wch(WINDOW *win, wint_t *result)
@@ -62,7 +62,7 @@ wget_wch(WINDOW *win, wint_t *result)
     _nc_lock_global(curses);
     sp = _nc_screen_of(win);
 
-    if (sp != 0) {
+    if (sp != NULL) {
 	size_t count = 0;
 
 	for (;;) {
@@ -112,7 +112,7 @@ wget_wch(WINDOW *win, wint_t *result)
 	code = ERR;
     }
 
-    if (result != 0)
+    if (result != NULL)
 	*result = (wint_t) value;
 
     _nc_unlock_global(curses);
diff --git a/ncurses/widechar/lib_hline_set.c b/ncurses/widechar/lib_hline_set.c
index 8d5e02638..3cb59c260 100644
--- a/ncurses/widechar/lib_hline_set.c
+++ b/ncurses/widechar/lib_hline_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_hline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_hline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 whline_set(WINDOW *win, const cchar_t *ch, int n)
@@ -60,7 +60,7 @@ whline_set(WINDOW *win, const cchar_t *ch, int n)
 
 	CHANGED_RANGE(line, start, end);
 
-	if (ch == 0)
+	if (ch == NULL)
 	    wch = *WACS_HLINE;
 	else
 	    wch = *ch;
diff --git a/ncurses/widechar/lib_in_wch.c b/ncurses/widechar/lib_in_wch.c
index 1d2733227..a401305dc 100644
--- a/ncurses/widechar/lib_in_wch.c
+++ b/ncurses/widechar/lib_in_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2009,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_in_wch.c,v 1.7 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_in_wch.c,v 1.8 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 win_wch(WINDOW *win, cchar_t *wcval)
@@ -49,8 +49,8 @@ win_wch(WINDOW *win, cchar_t *wcval)
 
     TR(TRACE_CCALLS, (T_CALLED("win_wch(%p,%p)"), (void *) win, (void *) wcval));
 
-    if (win != 0
-	&& wcval != 0) {
+    if (win != NULL
+	&& wcval != NULL) {
 	int row, col;
 
 	getyx(win, row, col);
diff --git a/ncurses/widechar/lib_in_wchnstr.c b/ncurses/widechar/lib_in_wchnstr.c
index fd453b658..6f24888ba 100644
--- a/ncurses/widechar/lib_in_wchnstr.c
+++ b/ncurses/widechar/lib_in_wchnstr.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_in_wchnstr.c,v 1.10 2024/07/27 19:23:21 tom Exp $")
+MODULE_ID("$Id: lib_in_wchnstr.c,v 1.11 2024/12/07 18:03:14 tom Exp $")
 
 NCURSES_EXPORT(int)
 win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
@@ -48,8 +48,8 @@ win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
     int code = OK;
 
     T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n));
-    if (win != 0
-	&& wchstr != 0) {
+    if (win != NULL
+	&& wchstr != NULL) {
 	const NCURSES_CH_T *src;
 	int row, col;
 	int j, k, limit;
diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index 8d4899914..5550c8255 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.30 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.31 2024/12/07 18:03:14 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -87,7 +87,7 @@ wins_wch(WINDOW *win, const cchar_t *wch)
 
     T((T_CALLED("wins_wch(%p, %s)"), (void *) win, _tracecchar_t(wch)));
 
-    if (win != 0) {
+    if (win != NULL) {
 	NCURSES_SIZE_T oy = win->_cury;
 	NCURSES_SIZE_T ox = win->_curx;
 
@@ -108,8 +108,8 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
     T((T_CALLED("wins_nwstr(%p,%s,%d)"),
        (void *) win, _nc_viswbufn(wstr, n), n));
 
-    if (win != 0
-	&& wstr != 0
+    if (win != NULL
+	&& wstr != NULL
 	&& n != 0) {
 
 	if (n < 0) {
diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index 77feece87..d081e02c8 100644
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.11 2024/07/27 19:02:27 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.12 2024/12/07 18:03:14 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
@@ -49,7 +49,7 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
     const cchar_t *text;
 
     T((T_CALLED("winnwstr(%p,%p,%d)"), (void *) win, (void *) wstr, n));
-    if (wstr != 0) {
+    if (wstr != NULL) {
 	if (win) {
 	    int row, col;
 	    int last = 0;
@@ -99,7 +99,7 @@ winwstr(WINDOW *win, wchar_t *wstr)
     int result = ERR;
 
     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
-    if (win != 0) {
+    if (win != NULL) {
 	result = winnwstr(win, wstr,
 			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
     }
diff --git a/ncurses/widechar/lib_pecho_wchar.c b/ncurses/widechar/lib_pecho_wchar.c
index 502967fd4..617ee3e4b 100644
--- a/ncurses/widechar/lib_pecho_wchar.c
+++ b/ncurses/widechar/lib_pecho_wchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 2004,2009 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,14 +33,14 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_pecho_wchar.c,v 1.4 2021/10/23 17:07:56 tom Exp $")
+MODULE_ID("$Id: lib_pecho_wchar.c,v 1.5 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 pecho_wchar(WINDOW *pad, const cchar_t *wch)
 {
     T((T_CALLED("pecho_wchar(%p, %s)"), (void *) pad, _tracech_t(wch)));
 
-    if (pad == 0)
+    if (pad == NULL)
 	returnCode(ERR);
 
     if (!IS_PAD(pad))
diff --git a/ncurses/widechar/lib_slk_wset.c b/ncurses/widechar/lib_slk_wset.c
index 5aa75ff96..eb4c10a12 100644
--- a/ncurses/widechar/lib_slk_wset.c
+++ b/ncurses/widechar/lib_slk_wset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2003-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_slk_wset.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_slk_wset.c,v 1.16 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 slk_wset(int i, const wchar_t *astr, int format)
@@ -52,7 +52,7 @@ slk_wset(int i, const wchar_t *astr, int format)
 
     T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format));
 
-    if (astr != 0) {
+    if (astr != NULL) {
 	size_t arglen;
 
 	init_mb(state);
@@ -61,7 +61,7 @@ slk_wset(int i, const wchar_t *astr, int format)
 	if ((arglen = wcsrtombs(NULL, &str, (size_t) 0, &state)) != (size_t) -1) {
 	    char *mystr;
 
-	    if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) {
+	    if ((mystr = (char *) _nc_doalloc(NULL, arglen + 1)) != NULL) {
 		str = astr;
 		if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) {
 		    /* glibc documentation claims that the terminating L'\0'
diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index 1a81fecc8..9f3308bc3 100644
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.18 2023/06/03 12:50:52 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.19 2024/12/07 20:08:15 tom Exp $")
 
 /*
  * Wrapper for wcrtomb() which obtains the length needed for the given
@@ -51,7 +51,7 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
 {
     int result;
 
-    if (target == 0) {
+    if (target == NULL) {
 	wchar_t temp[2];
 	const wchar_t *tempp = temp;
 	temp[0] = source;
@@ -75,13 +75,13 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
     T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
 
     init_mb(state);
-    length = _nc_wcrtomb(0, wch, &state);
+    length = _nc_wcrtomb(NULL, wch, &state);
 
     if (length != (size_t) (-1)
 	&& length != 0) {
 	char *string;
 
-	if ((string = (char *) malloc(length)) != 0) {
+	if ((string = (char *) malloc(length)) != NULL) {
 	    int n;
 
 	    init_mb(state);
diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index f108b307d..864f73e9c 100644
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.31 2023/04/28 20:59:34 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.32 2024/12/07 20:08:59 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -87,9 +87,9 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 
     attr_t turn_on, turn_off;
     bool reverse = FALSE;
-    bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);
+    bool can_color = (SP_PARM == NULL || SP_PARM->_coloron);
 #if NCURSES_EXT_FUNCS
-    bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);
+    bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color);
 #else
 #define fix_pair0 FALSE
 #endif
@@ -193,15 +193,15 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 	    TPUTS_TRACE("set_attributes");
 	    NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 				    TIPARM_9(set_attributes,
-					       (newmode & A_STANDOUT) != 0,
-					       (newmode & A_UNDERLINE) != 0,
-					       (newmode & A_REVERSE) != 0,
-					       (newmode & A_BLINK) != 0,
-					       (newmode & A_DIM) != 0,
-					       (newmode & A_BOLD) != 0,
-					       (newmode & A_INVIS) != 0,
-					       (newmode & A_PROTECT) != 0,
-					       (newmode & A_ALTCHARSET) != 0),
+					     (newmode & A_STANDOUT) != 0,
+					     (newmode & A_UNDERLINE) != 0,
+					     (newmode & A_REVERSE) != 0,
+					     (newmode & A_BLINK) != 0,
+					     (newmode & A_DIM) != 0,
+					     (newmode & A_BOLD) != 0,
+					     (newmode & A_INVIS) != 0,
+					     (newmode & A_PROTECT) != 0,
+					     (newmode & A_ALTCHARSET) != 0),
 				    1, outc);
 	    previous_attr &= ALL_BUT_COLOR;
 	    previous_pair = 0;
diff --git a/ncurses/widechar/lib_vline_set.c b/ncurses/widechar/lib_vline_set.c
index f7bb5819b..e7af3bfef 100644
--- a/ncurses/widechar/lib_vline_set.c
+++ b/ncurses/widechar/lib_vline_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2010,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_vline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_vline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $")
 
 NCURSES_EXPORT(int)
 wvline_set(WINDOW *win, const cchar_t *ch, int n)
@@ -58,7 +58,7 @@ wvline_set(WINDOW *win, const cchar_t *ch, int n)
 	if (end > win->_maxy)
 	    end = win->_maxy;
 
-	if (ch == 0)
+	if (ch == NULL)
 	    wch = *WACS_VLINE;
 	else
 	    wch = *ch;
diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c
index 5b6f6da28..d88279afd 100644
--- a/ncurses/widechar/lib_wacs.c
+++ b/ncurses/widechar/lib_wacs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2002-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,9 +33,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_wacs.c,v 1.20 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.21 2024/12/07 20:08:32 tom Exp $")
 
-NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
+NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = NULL;
 
 NCURSES_EXPORT(void)
 _nc_init_wacs(void)
@@ -119,7 +119,7 @@ _nc_init_wacs(void)
     T(("initializing WIDE-ACS map (Unicode is%s active)",
        active ? "" : " not"));
 
-    if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) {
+    if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != NULL) {
 	unsigned n;
 
 	for (n = 0; n < SIZEOF(table); ++n) {
diff --git a/ncurses/widechar/lib_wunctrl.c b/ncurses/widechar/lib_wunctrl.c
index b1c4f1a45..259b68aa2 100644
--- a/ncurses/widechar/lib_wunctrl.c
+++ b/ncurses/widechar/lib_wunctrl.c
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_wunctrl.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
+MODULE_ID("$Id: lib_wunctrl.c,v 1.19 2024/12/07 18:03:14 tom Exp $")
 
 NCURSES_EXPORT(wchar_t *)
 NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
@@ -44,9 +44,9 @@ NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
     static wchar_t str[CCHARW_MAX + 1];
     wchar_t *result;
 
-    if (wc == 0) {
-	result = 0;
-    } else if (SP_PARM != 0 && Charable(*wc)) {
+    if (wc == NULL) {
+	result = NULL;
+    } else if (SP_PARM != NULL && Charable(*wc)) {
 	wchar_t *wsp;
 	const char *p =
 	NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b240e042a..92e9bb47e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241130) unstable; urgency=low
+ncurses6td (6.5+20241207) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b240e042a..92e9bb47e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241130) unstable; urgency=low
+ncurses6td (6.5+20241207) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index f50b35b7e..2c3c5480d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241130) unstable; urgency=low
+ncurses6td (6.5+20241207) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Nov 2024 16:55:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index b2269ecfc..fe9352f3c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.678 2024/11/27 21:55:07 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.679 2024/12/07 11:51:44 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1130"
+!define VERSION_MMDD  "1207"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index f372562bb..22d26fc9d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241130
+Release: 20241207
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 883719a0b..b9ea50a2b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241130
+Release: 20241207
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index d00ddb600..85989b064 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241130
+Release: 20241207
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/panel/p_above.c b/panel/p_above.c
index 2a6fde55c..7e30f639b 100644
--- a/panel/p_above.c
+++ b/panel/p_above.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,11 +37,11 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_above.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: p_above.c,v 1.12 2024/12/07 23:05:20 tom Exp $")
 
 #if NCURSES_SP_FUNCS
 PANEL_EXPORT(PANEL *)
-ground_panel(SCREEN * sp)
+ground_panel(SCREEN *sp)
 {
   T((T_CALLED("ground_panel(%p)"), (void *)sp));
   if (sp)
@@ -51,12 +51,12 @@ ground_panel(SCREEN * sp)
       if (_nc_bottom_panel)	/* this is the pseudo panel */
 	returnPanel(_nc_bottom_panel->above);
       else
-	returnPanel(0);
+	returnPanel(NULL);
     }
   else
     {
-      if (0 == CURRENT_SCREEN)
-	returnPanel(0);
+      if (NULL == CURRENT_SCREEN)
+	returnPanel(NULL);
       else
 	returnPanel(ground_panel(CURRENT_SCREEN));
     }
@@ -64,7 +64,7 @@ ground_panel(SCREEN * sp)
 #endif
 
 PANEL_EXPORT(PANEL *)
-panel_above(const PANEL * pan)
+panel_above(const PANEL *pan)
 {
   PANEL *result;
 
@@ -78,7 +78,7 @@ panel_above(const PANEL * pan)
 #else
       /* if top and bottom are equal, we have no or only the pseudo panel;
          if not, we return the panel above the pseudo panel */
-      result = EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above;
+      result = EMPTY_STACK()? (PANEL *)0 : _nc_bottom_panel->above;
 #endif
     }
   returnPanel(result);
diff --git a/panel/p_below.c b/panel/p_below.c
index 100393d53..759739422 100644
--- a/panel/p_below.c
+++ b/panel/p_below.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,11 +37,11 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_below.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: p_below.c,v 1.12 2024/12/07 23:05:20 tom Exp $")
 
 #if NCURSES_SP_FUNCS
 PANEL_EXPORT(PANEL *)
-ceiling_panel(SCREEN * sp)
+ceiling_panel(SCREEN *sp)
 {
   T((T_CALLED("ceiling_panel(%p)"), (void *)sp));
   if (sp)
@@ -49,12 +49,12 @@ ceiling_panel(SCREEN * sp)
       struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
 
       /* if top and bottom are equal, we have no or only the pseudo panel */
-      returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel);
+      returnPanel(EMPTY_STACK()? (PANEL *)0 : _nc_top_panel);
     }
   else
     {
-      if (0 == CURRENT_SCREEN)
-	returnPanel(0);
+      if (NULL == CURRENT_SCREEN)
+	returnPanel(NULL);
       else
 	returnPanel(ceiling_panel(CURRENT_SCREEN));
     }
@@ -62,7 +62,7 @@ ceiling_panel(SCREEN * sp)
 #endif
 
 PANEL_EXPORT(PANEL *)
-panel_below(const PANEL * pan)
+panel_below(const PANEL *pan)
 {
   PANEL *result;
 
@@ -71,7 +71,7 @@ panel_below(const PANEL * pan)
     {
       GetHook(pan);
       /* we must not return the pseudo panel */
-      result = Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below;
+      result = Is_Pseudo(pan->below) ? (PANEL *)0 : pan->below;
     }
   else
     {
@@ -79,7 +79,7 @@ panel_below(const PANEL * pan)
       result = ceiling_panel(CURRENT_SCREEN);
 #else
       /* if top and bottom are equal, we have no or only the pseudo panel */
-      result = EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel;
+      result = EMPTY_STACK()? (PANEL *)0 : _nc_top_panel;
 #endif
     }
   returnPanel(result);
diff --git a/panel/p_new.c b/panel/p_new.c
index cf1164034..b5c198bc9 100644
--- a/panel/p_new.c
+++ b/panel/p_new.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_new.c,v 1.24 2021/10/23 15:12:06 tom Exp $")
+MODULE_ID("$Id: p_new.c,v 1.25 2024/12/07 23:00:37 tom Exp $")
 
 #ifdef TRACE
 static char *stdscr_id;
@@ -86,7 +86,7 @@ root_panel(NCURSES_SP_DCL0)
       ph->destroy = del_panel;
 #endif
       _nc_stdscr_pseudo_panel = AllocPanel("root_panel");
-      if (_nc_stdscr_pseudo_panel != 0)
+      if (_nc_stdscr_pseudo_panel != NULL)
 	{
 	  PANEL *pan = _nc_stdscr_pseudo_panel;
 	  WINDOW *win = SP_PARM->_stdscr;
diff --git a/panel/panel.c b/panel/panel.c
index 1b2d6e834..39730d454 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,14 +37,14 @@
 /* panel.c -- implementation of panels library, some core routines */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: panel.c,v 1.30 2020/09/26 18:05:17 tom Exp $")
+MODULE_ID("$Id: panel.c,v 1.31 2024/12/07 23:05:20 tom Exp $")
 
 /*+-------------------------------------------------------------------------
 	_nc_retrace_panel (pan)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(PANEL *)
-_nc_retrace_panel(PANEL * pan)
+_nc_retrace_panel(PANEL *pan)
 {
   T((T_RETURN("%p"), (void *)pan));
   return pan;
@@ -61,7 +61,7 @@ _nc_my_visbuf(const void *ptr, int n)
 {
   char temp[32];
 
-  if (ptr != 0)
+  if (ptr != NULL)
     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%p", ptr);
   else
     _nc_STRCPY(temp, "<null>", sizeof(temp));
@@ -75,7 +75,7 @@ _nc_my_visbuf(const void *ptr, int n)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(void)
-_nc_dPanel(const char *text, const PANEL * pan)
+_nc_dPanel(const char *text, const PANEL *pan)
 {
   _tracef("%s id=%s b=%s a=%s y=%d x=%d",
 	  text, USER_PTR(pan->user, 1),
@@ -90,7 +90,7 @@ _nc_dPanel(const char *text, const PANEL * pan)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(void)
-_nc_dStack(const char *fmt, int num, const PANEL * pan)
+_nc_dStack(const char *fmt, int num, const PANEL *pan)
 {
   char s80[80];
 
@@ -116,7 +116,7 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(void)
-_nc_Wnoutrefresh(const PANEL * pan)
+_nc_Wnoutrefresh(const PANEL *pan)
 {
   dPanel("wnoutrefresh", pan);
   wnoutrefresh(pan->win);
@@ -128,7 +128,7 @@ _nc_Wnoutrefresh(const PANEL * pan)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(void)
-_nc_Touchpan(const PANEL * pan)
+_nc_Touchpan(const PANEL *pan)
 {
   dPanel("Touchpan", pan);
   touchwin(pan->win);
@@ -140,7 +140,7 @@ _nc_Touchpan(const PANEL * pan)
 --------------------------------------------------------------------------*/
 #ifdef TRACE
 PANEL_EXPORT(void)
-_nc_Touchline(const PANEL * pan, int start, int count)
+_nc_Touchline(const PANEL *pan, int start, int count)
 {
   char s80[80];
 
diff --git a/panel/panel.priv.h b/panel/panel.priv.h
index 029a4f33c..49eadf98f 100644
--- a/panel/panel.priv.h
+++ b/panel/panel.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 
-/* $Id: panel.priv.h,v 1.30 2020/09/26 18:05:32 tom Exp $ */
+/* $Id: panel.priv.h,v 1.31 2024/12/07 23:01:42 tom Exp $ */
 
 #ifndef NCURSES_PANEL_PRIV_H
 #define NCURSES_PANEL_PRIV_H 1
@@ -86,7 +86,7 @@ struct screen;              /* forward declaration */
 #define GetScreenHook(sp) \
 			struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp)
 #define GetPanelHook(pan) \
-			GetScreenHook(pan ? _nc_screen_of((pan)->win) : 0)
+			GetScreenHook(pan ? _nc_screen_of((pan)->win) : NULL)
 #define GetWindowHook(win) \
 			SCREEN* sp = _nc_screen_of(win); \
 			GetScreenHook(sp)
diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 652c9e321..3618f8b33 100644
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -40,7 +40,7 @@
 #include <termsort.h>		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.197 2024/10/19 22:00:53 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.198 2024/12/07 22:06:39 tom Exp $")
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
@@ -121,7 +121,7 @@ strncpy_DYN(DYNBUF * dst, const char *src, size_t need)
     if (want > dst->size) {
 	dst->size += (want + 1024);	/* be generous */
 	dst->text = typeRealloc(char, dst->size, dst->text);
-	if (dst->text == 0)
+	if (dst->text == NULL)
 	    failed("strncpy_DYN");
     }
     _nc_STRNCPY(dst->text + dst->used, src, need + 1);
@@ -132,7 +132,7 @@ strncpy_DYN(DYNBUF * dst, const char *src, size_t need)
 static void
 strcpy_DYN(DYNBUF * dst, const char *src)
 {
-    if (src == 0) {
+    if (src == NULL) {
 	dst->used = 0;
 	strcpy_DYN(dst, "");
     } else {
@@ -144,9 +144,9 @@ strcpy_DYN(DYNBUF * dst, const char *src)
 static void
 free_DYN(DYNBUF * p)
 {
-    if (p->text != 0)
+    if (p->text != NULL)
 	free(p->text);
-    p->text = 0;
+    p->text = NULL;
     p->size = 0;
     p->used = 0;
 }
@@ -170,7 +170,7 @@ nametrans(const char *name)
 {
     const struct name_table_entry *np;
 
-    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) {
+    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) {
 	switch (np->nte_type) {
 	case BOOLEAN:
 	    NameTrans(bool_from_termcap, boolcodes);
@@ -186,7 +186,7 @@ nametrans(const char *name)
 	}
     }
 
-    return (0);
+    return (NULL);
 }
 
 void
@@ -212,7 +212,7 @@ dump_init(const char *version,
     did_wrap = (width <= 0);
 
     /* versions */
-    if (version == 0)
+    if (version == NULL)
 	tversion = V_ALLCAPS;
     else if (!strcmp(version, "SVr1") || !strcmp(version, "SVR1")
 	     || !strcmp(version, "Ultrix"))
@@ -458,7 +458,7 @@ op_length(const char *src, int offset)
 		}
 		n++;
 	    }
-	} else if (strchr("pPg", ch) != 0) {
+	} else if (strchr("pPg", ch) != NULL) {
 	    result += 2;
 	} else {
 	    result++;		/* ordinary operator */
@@ -526,7 +526,7 @@ fill_spaces(const char *src)
     const char *fill = "\\s";
     size_t need = strlen(src);
     size_t size = strlen(fill);
-    char *result = 0;
+    char *result = NULL;
     int pass;
     size_t s, d;
     for (pass = 0; pass < 2; ++pass) {
@@ -550,7 +550,7 @@ fill_spaces(const char *src)
 	    result[d] = '\0';
 	} else {
 	    result = calloc(need + 1, sizeof(char));
-	    if (result == 0)
+	    if (result == NULL)
 		failed("fill_spaces");
 	}
     }
@@ -598,7 +598,7 @@ wrap_concat(const char *src, int need, unsigned mode)
 	if (TcOutput())
 	    trailer = "\\\n\t ";
 
-	if (!TcOutput() && (p = strchr(fill, '=')) != 0) {
+	if (!TcOutput() && (p = strchr(fill, '=')) != NULL) {
 	    base = (int) (p + 1 - fill);
 	    if (base > 8)
 		base = 8;
@@ -612,7 +612,7 @@ wrap_concat(const char *src, int need, unsigned mode)
 	    align[base] = '\0';
 	}
 	/* "pretty" overrides wrapping if it already split the line */
-	if (!pretty || strchr(fill, '\n') == 0) {
+	if (!pretty || strchr(fill, '\n') == NULL) {
 	    int tag = 0;
 
 	    if (TcOutput() && outbuf.used && !wrap_1ST(mode)) {
@@ -841,7 +841,7 @@ fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level)
 		    strncpy_DYN(&tmpbuf, src++, (size_t) 1);
 		    if (src[0] == '%'
 			&& src[1] != '\0'
-			&& (strchr("?e;", src[1])) == 0) {
+			&& (strchr("?e;", src[1])) == NULL) {
 			tmpbuf.text[tmpbuf.used++] = '\n';
 			indent_DYN(&tmpbuf, level);
 		    }
@@ -926,12 +926,12 @@ fmt_entry(TERMTYPE2 *tterm,
 
     len = 12;			/* terminfo file-header */
 
-    if (pred == 0) {
+    if (pred == NULL) {
 	cur_type = tterm;
 	pred = dump_predicate;
     }
 
-    strcpy_DYN(&outbuf, 0);
+    strcpy_DYN(&outbuf, NULL);
     if (content_only) {
 	column = indent;	/* workaround to prevent empty lines */
     } else {
@@ -1120,7 +1120,7 @@ fmt_entry(TERMTYPE2 *tterm,
 				 : has_params(srccap, FALSE)));
 		const char *cv = _nc_infotocap(name, srccap, params);
 
-		if (cv == 0) {
+		if (cv == NULL) {
 		    if (outform == F_TCONVERR) {
 			_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
 				    "%s=!!! %s WILL NOT CONVERT !!!",
@@ -1169,7 +1169,7 @@ fmt_entry(TERMTYPE2 *tterm,
 		char *src = _nc_tic_expand(capability,
 					   outform == F_TERMINFO, numbers);
 
-		strcpy_DYN(&tmpbuf, 0);
+		strcpy_DYN(&tmpbuf, NULL);
 		strcpy_DYN(&tmpbuf, name);
 		strcpy_DYN(&tmpbuf, "=");
 		if (pretty
@@ -1400,7 +1400,7 @@ kill_fkeys(TERMTYPE2 *tterm, int target)
  * Check if the given acsc string is a 1-1 mapping, i.e., just-like-vt100.
  * Also, since this is for termcap, we only care about the line-drawing map.
  */
-#define isLine(c) (strchr("lmkjtuvwqxn", c) != 0)
+#define isLine(c) (strchr("lmkjtuvwqxn", c) != NULL)
 
 static bool
 one_one_mapping(const char *mapping)
@@ -1703,7 +1703,7 @@ show_entry(void)
 	}
 	outbuf.text[outbuf.used] = '\0';
     }
-    if (outbuf.text != 0) {
+    if (outbuf.text != NULL) {
 	(void) fputs(outbuf.text, stdout);
 	putchar('\n');
     }
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 79e220050..8c923af8d 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.169 2024/11/30 21:29:41 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.170 2024/12/07 22:10:45 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -694,7 +694,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name)
 #define DATAX()        DATA("", "")
 
 typedef struct {
-    const char from[4];
+    const char from[8];
     const char to[12];
 } assoc;
 
@@ -812,10 +812,10 @@ same_param(const char *table, const char *param, size_t length)
 static char *
 lookup_params(const assoc * table, char *dst, char *src)
 {
-    char *result = 0;
+    char *result = NULL;
     const char *ep = strtok(src, ";");
 
-    if (ep != 0) {
+    if (ep != NULL) {
 	const assoc *ap;
 
 	do {
@@ -861,7 +861,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE2 *tp)
 	int csi;
 	size_t len = 0;
 	size_t next;
-	const char *expansion = 0;
+	const char *expansion = NULL;
 	char buf3[MAX_TERMINFO_LENGTH];
 
 	/* first, check other capabilities in this entry */
@@ -1052,14 +1052,14 @@ file_comparison(int argc, char *argv[])
 	      FALSE, 0, 65535, itrace, FALSE, FALSE, FALSE);
 
     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
-	if (freopen(argv[n], "r", stdin) == 0)
+	if (freopen(argv[n], "r", stdin) == NULL)
 	    _nc_err_abort("Can't open %s: %s", argv[n], strerror(errno));
 
 #if NO_LEAKS
 	entered[n].head = _nc_head;
 	entered[n].tail = _nc_tail;
 #endif
-	_nc_head = _nc_tail = 0;
+	_nc_head = _nc_tail = NULL;
 
 	/* parse entries out of the source file */
 	_nc_set_source(argv[n]);
@@ -1187,7 +1187,7 @@ file_comparison(int argc, char *argv[])
 
 		names[0] = name1;
 		names[1] = name2;
-		names[2] = 0;
+		names[2] = NULL;
 
 		entries[0] = *qp;
 		entries[1] = *rp;
@@ -1298,12 +1298,12 @@ any_initializer(const char *fmt, const char *type)
     static size_t need;
     char *s;
 
-    if (initializer == 0) {
+    if (initializer == NULL) {
 	need = (strlen(entries->tterm.term_names)
 		+ strlen(type)
 		+ strlen(fmt));
 	initializer = (char *) malloc(need + 1);
-	if (initializer == 0)
+	if (initializer == NULL)
 	    failed("any_initializer");
     }
 
@@ -1334,7 +1334,7 @@ static void
 dump_initializers(const TERMTYPE2 *term)
 {
     unsigned n;
-    const char *str = 0;
+    const char *str = NULL;
 
     printf("\nstatic char %s[] = \"%s\";\n\n",
 	   name_initializer("alias"), entries->tterm.term_names);
@@ -1496,10 +1496,10 @@ dump_termtype(const TERMTYPE2 *term)
 static int
 optarg_to_number(void)
 {
-    char *temp = 0;
+    char *temp = NULL;
     long value = strtol(optarg, &temp, 0);
 
-    if (temp == 0 || temp == optarg || *temp != 0) {
+    if (temp == NULL || temp == optarg || *temp != 0) {
 	fprintf(stderr, "Expected a number, not \"%s\"\n", optarg);
 	ExitProgram(EXIT_FAILURE);
     }
@@ -1511,7 +1511,7 @@ terminal_env(void)
 {
     char *terminal;
 
-    if ((terminal = getenv("TERM")) == 0) {
+    if ((terminal = getenv("TERM")) == NULL) {
 	(void) fprintf(stderr,
 		       "%s: environment variable TERM not set\n",
 		       _nc_progname);
@@ -1531,7 +1531,7 @@ show_databases(void)
     const char *path2;
 
     _nc_first_db(&state, &offset);
-    while ((path2 = _nc_next_db(&state, &offset)) != 0) {
+    while ((path2 = _nc_next_db(&state, &offset)) != NULL) {
 	printf("%s\n", path2);
     }
     _nc_last_db();
@@ -1559,8 +1559,8 @@ main(int argc, char *argv[])
 {
     /* Avoid "local data >32k" error with mwcc */
     /* Also avoid overflowing smaller stacks on systems like AmigaOS */
-    path *tfile = 0;
-    char **tname = 0;
+    path *tfile = NULL;
+    char **tname = NULL;
     size_t maxterms;
 
     char **myargv;
@@ -1576,7 +1576,7 @@ main(int argc, char *argv[])
     bool wrap_strings = FALSE;
 
     /* where is the terminfo database location going to default to? */
-    restdir = firstdir = 0;
+    restdir = firstdir = NULL;
 
 #if NCURSES_XNAMES
     use_extended_names(FALSE);
@@ -1587,7 +1587,7 @@ main(int argc, char *argv[])
 
     /* make sure we have enough space to add two terminal entries */
     myargv = typeCalloc(char *, (size_t) (argc + 3));
-    if (myargv == 0)
+    if (myargv == NULL)
 	failed("myargv");
 
     memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
@@ -1671,7 +1671,7 @@ main(int argc, char *argv[])
 	    outform = F_TERMINFO;
 	    if (sortmode == S_DEFAULT)
 		sortmode = S_VARIABLE;
-	    tversion = 0;
+	    tversion = NULL;
 	    break;
 
 	case 'i':
@@ -1712,7 +1712,7 @@ main(int argc, char *argv[])
 	    break;
 
 	case 'r':
-	    tversion = 0;
+	    tversion = NULL;
 	    break;
 
 	case 's':
@@ -1780,20 +1780,20 @@ main(int argc, char *argv[])
     }
 
     maxterms = (size_t) (argc + 2 - optind);
-    if ((tfile = typeMalloc(path, maxterms)) == 0)
+    if ((tfile = typeMalloc(path, maxterms)) == NULL)
 	failed("tfile");
-    if ((tname = typeCalloc(char *, maxterms)) == 0)
+    if ((tname = typeCalloc(char *, maxterms)) == NULL)
 	  failed("tname");
-    if ((entries = typeCalloc(ENTRY, maxterms)) == 0)
+    if ((entries = typeCalloc(ENTRY, maxterms)) == NULL)
 	failed("entries");
 #if NO_LEAKS
-    if ((entered = typeCalloc(ENTERED, maxterms)) == 0)
+    if ((entered = typeCalloc(ENTERED, maxterms)) == NULL)
 	failed("entered");
 #endif
 
-    if (tfile == 0
-	|| tname == 0
-	|| entries == 0) {
+    if (tfile == NULL
+	|| tname == NULL
+	|| entries == NULL) {
 	fprintf(stderr, "%s: not enough memory\n", _nc_progname);
 	ExitProgram(EXIT_FAILURE);
     }
diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c
index 6ae3b673e..d364592c3 100644
--- a/progs/reset_cmd.c
+++ b/progs/reset_cmd.c
@@ -53,7 +53,7 @@
 #include <sys/ptem.h>
 #endif
 
-MODULE_ID("$Id: reset_cmd.c,v 1.37 2024/04/08 17:29:34 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.38 2024/12/07 22:12:53 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -104,8 +104,8 @@ cat_file(char *file)
     char buf[BUFSIZ];
     bool sent = FALSE;
 
-    if (file != 0) {
-	if ((fp = safe_fopen(file, "r")) == 0)
+    if (file != NULL) {
+	if ((fp = safe_fopen(file, "r")) == NULL)
 	    failed(file);
 
 	while ((nr = fread(buf, sizeof(char), sizeof(buf), fp)) != 0) {
@@ -528,7 +528,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 
     (void) old_settings;
 #if TAB3
-    if (old_settings != 0 &&
+    if (old_settings != NULL &&
 	old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) {
 	old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET);
 	SET_TTY(fd, old_settings);
@@ -539,11 +539,11 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 	    IGNORE_RC(system(init_prog));
 	}
 
-	need_flush |= sent_string((use_reset && (reset_1string != 0))
+	need_flush |= sent_string((use_reset && (reset_1string != NULL))
 				  ? reset_1string
 				  : init_1string);
 
-	need_flush |= sent_string((use_reset && (reset_2string != 0))
+	need_flush |= sent_string((use_reset && (reset_2string != NULL))
 				  ? reset_2string
 				  : init_2string);
 
@@ -584,7 +584,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings)
 
 	need_flush |= cat_file((use_reset && reset_file) ? reset_file : init_file);
 
-	need_flush |= sent_string((use_reset && (reset_3string != 0))
+	need_flush |= sent_string((use_reset && (reset_3string != NULL))
 				  ? reset_3string
 				  : init_3string);
     }
@@ -629,7 +629,7 @@ show_tty_change(TTY * old_settings,
 	 */
     } else if (newer == 0177) {
 	(void) fprintf(stderr, "delete.\n");
-    } else if ((p = key_backspace) != 0
+    } else if ((p = key_backspace) != NULL
 	       && newer == (unsigned char) p[0]
 	       && p[1] == '\0') {
 	(void) fprintf(stderr, "backspace.\n");
@@ -655,7 +655,7 @@ reset_start(FILE *fp, bool is_reset, bool is_init)
 void
 reset_flush(void)
 {
-    if (my_file != 0)
+    if (my_file != NULL)
 	fflush(my_file);
 }
 
diff --git a/progs/tabs.c b/progs/tabs.c
index 42560ea38..1716e2b44 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -39,7 +39,7 @@
 #include <progs.priv.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tabs.c,v 1.55 2024/10/19 21:45:18 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.56 2024/12/07 22:10:45 tom Exp $")
 
 static GCC_NORETURN void usage(void);
 
@@ -147,7 +147,7 @@ decode_tabs(const char *tab_list, int margin)
 			"%s: tab-stops are not in increasing order: %d %d\n",
 			_nc_progname, value, result[n - 1]);
 		free(result);
-		result = 0;
+		result = NULL;
 		break;
 	    }
 	    ++n;
@@ -159,7 +159,7 @@ decode_tabs(const char *tab_list, int margin)
 	}
     }
 
-    if (result != 0) {
+    if (result != NULL) {
 	/*
 	 * If there is only one value, then it is an option such as "-8".
 	 */
@@ -250,7 +250,7 @@ static char *
 trimmed_tab_list(const char *source)
 {
     char *result = strdup(source);
-    if (result != 0) {
+    if (result != NULL) {
 	int j, k, last;
 
 	for (j = k = last = 0; result[j] != 0; ++j) {
@@ -280,7 +280,7 @@ comma_is_needed(const char *source)
 {
     bool result = FALSE;
 
-    if (source != 0) {
+    if (source != NULL) {
 	size_t len = strlen(source);
 	if (len != 0)
 	    result = (source[len - 1] != ',');
@@ -303,7 +303,7 @@ add_to_tab_list(char **append, const char *value)
     char *result = *append;
     char *copied = trimmed_tab_list(value);
 
-    if (copied != 0 && *copied != '\0') {
+    if (copied != NULL && *copied != '\0') {
 	const char *comma = ",";
 	size_t need = 1 + strlen(copied);
 
@@ -313,15 +313,15 @@ add_to_tab_list(char **append, const char *value)
 	    comma = "";
 
 	need += strlen(comma);
-	if (*append != 0)
+	if (*append != NULL)
 	    need += strlen(*append);
 
 	result = malloc(need);
-	if (result == 0)
+	if (result == NULL)
 	    failed("add_to_tab_list");
 
 	*result = '\0';
-	if (*append != 0) {
+	if (*append != NULL) {
 	    _nc_STRCPY(result, *append, need);
 	    free(*append);
 	}
@@ -402,7 +402,7 @@ legal_tab_list(const char *tab_list)
 {
     bool result = TRUE;
 
-    if (tab_list != 0 && *tab_list != '\0') {
+    if (tab_list != NULL && *tab_list != '\0') {
 	if (comma_is_needed(tab_list)) {
 	    int n;
 
@@ -433,7 +433,7 @@ skip_list(char *value)
     while (*value != '\0' &&
 	   (isdigit(UChar(*value)) ||
 	    isspace(UChar(*value)) ||
-	    strchr("+,", UChar(*value)) != 0)) {
+	    strchr("+,", UChar(*value)) != NULL)) {
 	++value;
     }
     return value;
@@ -483,9 +483,9 @@ main(int argc, char *argv[])
     bool no_op = FALSE;
     bool change_tty = FALSE;
     int n, ch;
-    NCURSES_CONST char *term_name = 0;
-    char *append = 0;
-    const char *tab_list = 0;
+    NCURSES_CONST char *term_name = NULL;
+    char *append = NULL;
+    const char *tab_list = NULL;
     const char *new_line = "\n";
     int margin = -1;
     TTY tty_settings;
@@ -493,7 +493,7 @@ main(int argc, char *argv[])
 
     _nc_progname = _nc_rootname(argv[0]);
 
-    if ((term_name = getenv("TERM")) == 0)
+    if ((term_name = getenv("TERM")) == NULL)
 	term_name = "ansi+tabs";
 
     /* cannot use getopt, since some options are two-character */
@@ -617,11 +617,11 @@ main(int argc, char *argv[])
 	    }
 	    break;
 	default:
-	    if (append != 0) {
+	    if (append != NULL) {
 		if (tab_list != (const char *) append) {
 		    /* one of the predefined options was used */
 		    free(append);
-		    append = 0;
+		    append = NULL;
 		}
 	    }
 	    tab_list = add_to_tab_list(&append, option);
@@ -683,7 +683,7 @@ main(int argc, char *argv[])
 
 	list = decode_tabs(tab_list, margin);
 
-	if (list != 0) {
+	if (list != NULL) {
 	    if (!no_op)
 		do_tabs(list);
 	    if (debug) {
@@ -704,7 +704,7 @@ main(int argc, char *argv[])
 	}
 	rc = EXIT_SUCCESS;
     }
-    if (append != 0)
+    if (append != NULL)
 	free(append);
     ExitProgram(rc);
 }
diff --git a/progs/tic.c b/progs/tic.c
index e2d2bd03c..14fc792d1 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.329 2024/11/30 21:29:07 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.331 2024/12/07 23:19:49 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -61,7 +61,7 @@ static bool capdump = FALSE;	/* running as infotocap? */
 static bool infodump = FALSE;	/* running as captoinfo? */
 static bool showsummary = FALSE;
 static unsigned debug_level;
-static char **namelst = 0;
+static char **namelst = NULL;
 static const char *to_remove;
 
 #if NCURSES_XNAMES
@@ -104,9 +104,9 @@ source-file\n";
 static void
 free_namelist(char **src)
 {
-    if (src != 0) {
+    if (src != NULL) {
 	int n;
-	for (n = 0; src[n] != 0; ++n)
+	for (n = 0; src[n] != NULL; ++n)
 	    free(src[n]);
 	free(src);
     }
@@ -120,9 +120,9 @@ cleanup(void)
     free_namelist(namelst);
     _nc_leaks_dump_entry();
 #endif
-    if (tmp_fp != 0)
+    if (tmp_fp != NULL)
 	fclose(tmp_fp);
-    if (to_remove != 0) {
+    if (to_remove != NULL) {
 	int rc;
 
 #if HAVE_REMOVE
@@ -214,7 +214,7 @@ write_it(ENTRY * ep)
     for (n = 0; n < STRCOUNT; n++) {
 	s = ep->tterm.Strings[n];
 	if (VALID_STRING(s)
-	    && strchr(s, L_BRACE) != 0) {
+	    && strchr(s, L_BRACE) != NULL) {
 	    d = result;
 	    t = s;
 	    while ((ch = *t++) != 0) {
@@ -224,9 +224,9 @@ write_it(ENTRY * ep)
 			break;
 		} else if ((ch == '%')
 			   && (*t == L_BRACE)) {
-		    char *v = 0;
+		    char *v = NULL;
 		    long value = strtol(t + 1, &v, 0);
-		    if (v != 0
+		    if (v != NULL
 			&& *v == R_BRACE
 			&& value > 0
 			&& value != '\\'	/* FIXME */
@@ -334,14 +334,14 @@ put_translate(int c)
 	    in_name = FALSE;
 
 	    suffix[0] = '\0';
-	    if ((up = strchr(namebuf, '#')) != 0
-		|| (up = strchr(namebuf, '=')) != 0
-		|| ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {
+	    if ((up = strchr(namebuf, '#')) != NULL
+		|| (up = strchr(namebuf, '=')) != NULL
+		|| ((up = strchr(namebuf, '@')) != NULL && up[1] == '>')) {
 		_nc_STRCPY(suffix, up, have);
 		*up = '\0';
 	    }
 
-	    if ((tp = nametrans(namebuf)) != 0) {
+	    if ((tp = nametrans(namebuf)) != NULL) {
 		(void) putchar(':');
 		(void) fputs(tp, stdout);
 		(void) fputs(suffix, stdout);
@@ -368,7 +368,7 @@ put_translate(int c)
 static char *
 stripped(char *src)
 {
-    char *dst = 0;
+    char *dst = NULL;
 
     while (isspace(UChar(*src)))
 	src++;
@@ -388,7 +388,7 @@ stripped(char *src)
 static FILE *
 open_tempfile(char *filename)
 {
-    FILE *result = 0;
+    FILE *result = NULL;
 
     _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX);
 #if HAVE_MKSTEMP
@@ -410,7 +410,7 @@ static FILE *
 copy_input(FILE *source, const char *filename, char *alt_file)
 {
     char my_altfile[PATH_MAX];
-    FILE *result = 0;
+    FILE *result = NULL;
     FILE *target;
 
     if (alt_file == NULL)
@@ -476,7 +476,7 @@ open_input(const char *filename, char *alt_file)
 	    ExitProgram(EXIT_FAILURE);
 	}
 	if (mode != S_IFREG) {
-	    if (alt_file != 0) {
+	    if (alt_file != NULL) {
 		FILE *fp2 = copy_input(fp, filename, alt_file);
 		fp = fp2;
 	    } else {
@@ -493,7 +493,7 @@ open_input(const char *filename, char *alt_file)
 static char **
 make_namelist(char *src)
 {
-    char **dst = 0;
+    char **dst = NULL;
 
     char *s, *base;
     unsigned pass, n, nn;
@@ -501,14 +501,14 @@ make_namelist(char *src)
 
     if (src == NULL) {
 	/* EMPTY */ ;
-    } else if (strchr(src, '/') != 0) {		/* a filename */
+    } else if (strchr(src, '/') != NULL) {	/* a filename */
 	FILE *fp = open_input(src, (char *) 0);
 
 	for (pass = 1; pass <= 2; pass++) {
 	    nn = 0;
-	    while (fgets(buffer, sizeof(buffer), fp) != 0) {
-		if ((s = stripped(buffer)) != 0) {
-		    if (dst != 0)
+	    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+		if ((s = stripped(buffer)) != NULL) {
+		    if (dst != NULL)
 			dst[nn] = s;
 		    else
 			free(s);
@@ -520,7 +520,7 @@ make_namelist(char *src)
 		      failed("make_namelist (alloc)");
 		rewind(fp);
 		if (errno != 0)
-		      failed("make_namelist (rewind)");
+		    failed("make_namelist (rewind)");
 	    }
 	}
 	fclose(fp);
@@ -533,7 +533,7 @@ make_namelist(char *src)
 			nn++;
 		    } else {
 			src[n] = '\0';
-			if ((s = stripped(base)) != 0)
+			if ((s = stripped(base)) != NULL)
 			    dst[nn++] = s;
 			base = &src[n + 1];
 		    }
@@ -547,9 +547,9 @@ make_namelist(char *src)
 	    }
 	}
     }
-    if (showsummary && (dst != 0)) {
+    if (showsummary && (dst != NULL)) {
 	fprintf(log_fp, "Entries that will be compiled:\n");
-	for (n = 0; dst[n] != 0; n++)
+	for (n = 0; dst[n] != NULL; n++)
 	    fprintf(log_fp, "%u:%s\n", n + 1, dst[n]);
     }
     return dst;
@@ -561,10 +561,10 @@ matches(char **needle, const char *haystack)
 {
     bool code = FALSE;
 
-    if (needle != 0) {
+    if (needle != NULL) {
 	size_t n;
 
-	for (n = 0; needle[n] != 0; n++) {
+	for (n = 0; needle[n] != NULL; n++) {
 	    if (_nc_name_match(haystack, needle[n], "|")) {
 		code = TRUE;
 		break;
@@ -608,7 +608,7 @@ valid_db_path(const char *nominal)
 	    || access(result, R_OK | W_OK | X_OK) != 0) {
 	    DEBUG(1, ("...not a writable directory"));
 	    free(result);
-	    result = 0;
+	    result = NULL;
 	}
 #endif
     } else {
@@ -626,12 +626,12 @@ valid_db_path(const char *nominal)
 	    } else {
 		DEBUG(1, ("...parent directory %s is not writable", result));
 		free(result);
-		result = 0;
+		result = NULL;
 	    }
 	} else {
 	    DEBUG(1, ("... no parent directory"));
 	    free(result);
-	    result = 0;
+	    result = NULL;
 	}
     }
     return result;
@@ -645,14 +645,14 @@ valid_db_path(const char *nominal)
 static void
 show_databases(const char *outdir)
 {
-    bool specific = (outdir != 0) || getenv("TERMINFO") != 0;
+    bool specific = (outdir != NULL) || getenv("TERMINFO") != NULL;
     char *result;
-    const char *tried = 0;
+    const char *tried = NULL;
 
     if (outdir == NULL) {
 	outdir = _nc_tic_dir(NULL);
     }
-    if ((result = valid_db_path(outdir)) != 0) {
+    if ((result = valid_db_path(outdir)) != NULL) {
 	printf("%s\n", result);
 	free(result);
     } else {
@@ -924,13 +924,13 @@ main(int argc, char *argv[])
 	if (infodump == TRUE) {
 	    /* captoinfo's no-argument case */
 	    source_file = "/etc/termcap";
-	    if ((termcap = getenv("TERMCAP")) != 0
-		&& (namelst = make_namelist(getenv("TERM"))) != 0) {
+	    if ((termcap = getenv("TERMCAP")) != NULL
+		&& (namelst = make_namelist(getenv("TERM"))) != NULL) {
 		if (access(termcap, F_OK) == 0) {
 		    /* file exists */
 		    source_file = termcap;
 		} else {
-		    if ((tmp_fp = open_tempfile(my_tmpname)) != 0) {
+		    if ((tmp_fp = open_tempfile(my_tmpname)) != NULL) {
 			source_file = my_tmpname;
 			fprintf(tmp_fp, "%s\n", termcap);
 			fclose(tmp_fp);
@@ -1335,7 +1335,7 @@ keypad_index(const char *string)
     if ((ch = keypad_final(string)) != '\0') {
 	const char *list = "PQRSwxymtuvlqrsPpn";	/* app-keypad except "Enter" */
 	const char *test = (strchr) (list, ch);
-	if (test != 0)
+	if (test != NULL)
 	    result = (long) (test - list);
     }
     return result;
@@ -1712,8 +1712,8 @@ check_printer(TERMTYPE2 *tp)
 static bool
 uses_SGR_39_49(const char *value)
 {
-    return (strstr(value, "39;49") != 0
-	    || strstr(value, "49;39") != 0);
+    return (strstr(value, "39;49") != NULL
+	    || strstr(value, "49;39") != NULL);
 }
 
 /*
@@ -1897,7 +1897,7 @@ expected_params(const char *name)
 static struct user_table_entry const *
 lookup_user_capability(const char *name)
 {
-    struct user_table_entry const *result = 0;
+    struct user_table_entry const *result = NULL;
     if (*name != 'k') {
 	result = _nc_find_user_entry(name);
     }
@@ -1929,7 +1929,7 @@ is_user_capability(const char *name)
 #if NCURSES_XNAMES
     else if (using_extensions) {
 	struct user_table_entry const *p = lookup_user_capability(name);
-	if (p != 0) {
+	if (p != NULL) {
 	    result = (int) p->ute_argc;
 	}
     }
@@ -2134,7 +2134,7 @@ static const char *
 skip_DECSCNM(const char *value, int *flag)
 {
     *flag = -1;
-    if (value != 0) {
+    if (value != NULL) {
 	int skip = csi_length(value);
 	if (skip > 0 &&
 	    value[skip++] == '?' &&
@@ -2154,13 +2154,13 @@ static void
 check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
 {
     const char *p, *q;
-    const char *first = 0;
-    const char *last = 0;
+    const char *first = NULL;
+    const char *last = NULL;
 
     for (p = value; *p != '\0'; ++p) {
 	if (p[0] == '$' && p[1] == '<') {
 	    const char *base = p + 2;
-	    const char *mark = 0;
+	    const char *mark = NULL;
 	    bool mixed = FALSE;
 	    int proportional = 0;
 	    int mandatory = 0;
@@ -2179,7 +2179,7 @@ check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
 			++mandatory;
 		    if (mark == NULL)
 			mark = q;
-		} else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != 0)) {
+		} else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != NULL)) {
 		    break;
 		} else if (proportional || mandatory) {
 		    mixed = TRUE;
@@ -2215,7 +2215,7 @@ check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
     if (!strcmp(name, "flash") ||
 	!strcmp(name, "beep")) {
 
-	if (first != 0) {
+	if (first != NULL) {
 	    if (first == value || *last == 0) {
 		/*
 		 * Delay is on one end or the other.
@@ -2229,9 +2229,9 @@ check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
 	     * 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 &&
+	    if ((p = skip_DECSCNM(value, &flag)) != NULL &&
 		flag > 0 &&
-		skip_DECSCNM(p, &flag) != 0 &&
+		skip_DECSCNM(p, &flag) != NULL &&
 		flag == 0) {
 		_nc_warning("expected a delay in %s", name);
 	    }
@@ -2304,7 +2304,7 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
 	break;
     case Other:
     default:
-#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
+#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
 	result = TPARM_9(value,
 			 myParam(1),
 			 myParam(2),
@@ -2648,7 +2648,7 @@ check_sgr(const TERMTYPE2 *tp, const char *zero, int num, char *cap, const char
 		    num == 7,
 		    num == 8,
 		    num == 9);
-    if (test != 0) {
+    if (test != NULL) {
 	if (PRESENT(cap)) {
 	    if (!similar_sgr(num, test, cap)) {
 		_nc_warning("%s differs from sgr(%d)\n\t%s=%s\n\tsgr(%d)=%s",
@@ -2868,7 +2868,7 @@ check_conflict(TERMTYPE2 *tp)
 static void
 check_exit_attribute(const char *name, char *test, char *trimmed, char *untrimmed)
 {
-    if (VALID_STRING(test) && (trimmed != 0)) {
+    if (VALID_STRING(test) && (trimmed != NULL)) {
 	if (similar_sgr(-1, trimmed, test) ||
 	    similar_sgr(-1, untrimmed, test)) {
 	    _nc_warning("%s matches exit_attribute_mode", name);
@@ -2963,7 +2963,7 @@ standard_type(const char *name)
     int result = -1;
     const struct name_table_entry *np;
 
-    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) {
+    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) {
 	result = np->nte_type;
     }
     return result;
@@ -2990,7 +2990,7 @@ name_of_type(int type)
 static void
 check_user_capability_type(const char *name, int actual)
 {
-    if (lookup_user_capability(name) == 0) {
+    if (lookup_user_capability(name) == NULL) {
 	int expected = standard_type(name);
 	if (expected >= 0) {
 	    _nc_warning("expected %s to be %s, but actually %s",
@@ -3156,7 +3156,7 @@ static void
 check_user_6789(const TERMTYPE2 *tp)
 {
     /*
-     * Check if the terminal is known to not 
+     * Check if the terminal is known to not
      */
 #define NO_QUERY(longname,shortname) \
 	if (PRESENT(longname)) _nc_warning(#shortname " is not supported")
@@ -3272,7 +3272,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     ANDMISSING(clear_all_tabs, set_tab);
 
     if (PRESENT(set_attributes)) {
-	char *zero = 0;
+	char *zero = NULL;
 
 	_nc_tparm_err = 0;
 	if (PRESENT(exit_attribute_mode)) {
@@ -3282,7 +3282,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
 	}
 	check_tparm_err(0);
 
-	if (zero != 0) {
+	if (zero != NULL) {
 	    CHECK_SGR(1, enter_standout_mode);
 	    CHECK_SGR(2, enter_underline_mode);
 	    CHECK_SGR(3, enter_reverse_mode);
@@ -3368,6 +3368,6 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     /*
      * Finally, do the non-verbose checks
      */
-    if (save_check_termtype != 0)
+    if (save_check_termtype != NULL)
 	save_check_termtype(tp, literal);
 }
diff --git a/progs/toe.c b/progs/toe.c
index 76f3707fb..81221ee52 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -45,7 +45,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.91 2024/11/23 20:09:23 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.92 2024/12/07 22:12:53 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -86,7 +86,7 @@ static char *
 strmalloc(const char *value)
 {
     char *result = strdup(value);
-    if (result == 0) {
+    if (result == NULL) {
 	failed("strmalloc");
     }
     return result;
@@ -100,7 +100,7 @@ new_termdata(void)
     if (want >= len_termdata) {
 	len_termdata = (2 * want) + 10;
 	ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata);
-	if (ptr_termdata == 0)
+	if (ptr_termdata == NULL)
 	    failed("ptr_termdata");
     }
 
@@ -200,14 +200,14 @@ show_termdata(int eargc, char **eargv)
 static void
 free_termdata(void)
 {
-    if (ptr_termdata != 0) {
+    if (ptr_termdata != NULL) {
 	while (use_termdata != 0) {
 	    --use_termdata;
 	    free(ptr_termdata[use_termdata].term_name);
 	    free(ptr_termdata[use_termdata].description);
 	}
 	free(ptr_termdata);
-	ptr_termdata = 0;
+	ptr_termdata = NULL;
     }
     use_termdata = 0;
     len_termdata = 0;
@@ -217,7 +217,7 @@ static char **
 allocArgv(size_t count)
 {
     char **result = typeCalloc(char *, count + 1);
-    if (result == 0)
+    if (result == NULL)
 	failed("realloc eargv");
 
     assert(result != 0);
@@ -272,8 +272,8 @@ term_description(const TERMTYPE2 *tp)
 {
     const char *desc;
 
-    if (tp->term_names == 0
-	|| (desc = strrchr(tp->term_names, '|')) == 0
+    if (tp->term_names == NULL
+	|| (desc = strrchr(tp->term_names, '|')) == NULL
 	|| (*++desc == '\0')) {
 	desc = "(No description)";
     }
@@ -389,7 +389,7 @@ copy_entryname(const DIRENT * src)
 {
     size_t len = NAMLEN(src);
     char *result = malloc(len + 1);
-    if (result == 0)
+    if (result == NULL)
 	failed("copy entryname");
     memcpy(result, src->d_name, len);
     result[len] = '\0';
@@ -409,11 +409,11 @@ typelist(int eargc, char *eargv[],
     for (i = 0; i < eargc; i++) {
 #if NCURSES_USE_DATABASE
 	if (_nc_is_dir_path(eargv[i])) {
-	    char *cwd_buf = 0;
+	    char *cwd_buf = NULL;
 	    DIR *termdir;
 	    const DIRENT *subdir;
 
-	    if ((termdir = opendir(eargv[i])) == 0) {
+	    if ((termdir = opendir(eargv[i])) == NULL) {
 		(void) fflush(stdout);
 		(void) fprintf(stderr,
 			       "%s: can't open terminfo directory %s\n",
@@ -424,7 +424,7 @@ typelist(int eargc, char *eargv[],
 	    if (verbosity)
 		(void) printf("#\n#%s:\n#\n", eargv[i]);
 
-	    while ((subdir = readdir(termdir)) != 0) {
+	    while ((subdir = readdir(termdir)) != NULL) {
 		size_t cwd_len;
 		char *name_1;
 		DIR *entrydir;
@@ -438,7 +438,7 @@ typelist(int eargc, char *eargv[],
 
 		cwd_len = strlen(name_1) + strlen(eargv[i]) + 3;
 		cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
-		if (cwd_buf == 0)
+		if (cwd_buf == NULL)
 		    failed("realloc cwd_buf");
 
 		assert(cwd_buf != 0);
@@ -451,11 +451,11 @@ typelist(int eargc, char *eargv[],
 		    continue;
 
 		entrydir = opendir(".");
-		if (entrydir == 0) {
+		if (entrydir == NULL) {
 		    perror(cwd_buf);
 		    continue;
 		}
-		while ((entry = readdir(entrydir)) != 0) {
+		while ((entry = readdir(entrydir)) != NULL) {
 		    char *name_2;
 		    TERMTYPE2 lterm;
 		    char *cn;
@@ -489,7 +489,7 @@ typelist(int eargc, char *eargv[],
 		closedir(entrydir);
 	    }
 	    closedir(termdir);
-	    if (cwd_buf != 0)
+	    if (cwd_buf != NULL)
 		free(cwd_buf);
 	    continue;
 	}
@@ -605,7 +605,7 @@ main(int argc, char *argv[])
     bool direct_dependencies = FALSE;
     bool invert_dependencies = FALSE;
     bool header = FALSE;
-    const char *report_file = 0;
+    const char *report_file = NULL;
     int code;
     int this_opt, last_opt = '?';
     unsigned v_opt = 0;
@@ -660,8 +660,8 @@ main(int argc, char *argv[])
     }
     use_verbosity(v_opt);
 
-    if (report_file != 0) {
-	if (freopen(report_file, "r", stdin) == 0) {
+    if (report_file != NULL) {
+	if (freopen(report_file, "r", stdin) == NULL) {
 	    (void) fflush(stdout);
 	    fprintf(stderr, "%s: can't open %s\n", _nc_progname, report_file);
 	    ExitProgram(EXIT_FAILURE);
@@ -669,7 +669,7 @@ main(int argc, char *argv[])
 
 	/* parse entries out of the source file */
 	_nc_set_source(report_file);
-	_nc_read_entry_source(stdin, 0, FALSE, FALSE, NULLHOOK);
+	_nc_read_entry_source(stdin, NULL, FALSE, FALSE, NULLHOOK);
     }
 
     /* maybe we want a direct-dependency listing? */
@@ -729,7 +729,7 @@ main(int argc, char *argv[])
 	DBDIRS state;
 	int offset;
 	int pass;
-	char **eargv = 0;
+	char **eargv = NULL;
 
 	code = EXIT_FAILURE;
 	for (pass = 0; pass < 2; ++pass) {
@@ -737,7 +737,7 @@ main(int argc, char *argv[])
 	    const char *path;
 
 	    _nc_first_db(&state, &offset);
-	    while ((path = _nc_next_db(&state, &offset)) != 0) {
+	    while ((path = _nc_next_db(&state, &offset)) != NULL) {
 		if (quick_prefix(path))
 		    continue;
 		if (pass) {
@@ -747,7 +747,7 @@ main(int argc, char *argv[])
 	    }
 	    if (!pass) {
 		eargv = allocArgv(count);
-		if (eargv == 0)
+		if (eargv == NULL)
 		    failed("eargv");
 	    } else {
 		code = typelist((int) count, eargv, header, hook);
@@ -761,10 +761,10 @@ main(int argc, char *argv[])
 	char **eargv = allocArgv((size_t) 2);
 	size_t count = 0;
 
-	if (eargv == 0)
+	if (eargv == NULL)
 	    failed("eargv");
 	_nc_first_db(&state, &offset);
-	if ((path = _nc_next_db(&state, &offset)) != 0) {
+	if ((path = _nc_next_db(&state, &offset)) != NULL) {
 	    if (!quick_prefix(path))
 		eargv[count++] = strmalloc(path);
 	}
diff --git a/progs/tput.c b/progs/tput.c
index 821a85682..5d1b924e7 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.106 2024/11/30 21:47:34 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.107 2024/12/07 22:12:53 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -256,15 +256,15 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	     */
 
 	    for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
-		char *tmp = 0;
+		char *tmp = NULL;
 		strings[k] = argv[k];
 		numbers[k] = strtol(argv[k], &tmp, 0);
-		if (tmp == 0 || *tmp != 0)
+		if (tmp == NULL || *tmp != 0)
 		    numbers[k] = 0;
 	    }
 	    for (k = argc; k <= NUM_PARM; k++) {
 		numbers[k] = 0;
-		strings[k] = 0;
+		strings[k] = NULL;
 	    }
 
 	    paramType = tparm_type(name);
@@ -342,7 +342,7 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 		/* FALLTHRU */
 	    default:
 		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
-#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
+#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
 		s = TPARM_9(s,
 			    myParam(1),
 			    myParam(2),
@@ -440,7 +440,7 @@ main(int argc, char **argv)
 	argv += optind;
     }
 
-    if (term == 0 || *term == '\0')
+    if (term == NULL || *term == '\0')
 	quit(ErrUsage, "No value for $TERM and no -T specified");
 
     fd = save_tty_settings(&tty_settings, need_tty);
@@ -464,7 +464,7 @@ main(int argc, char **argv)
 	ExitProgram(code);
     }
 
-    while (fgets(buf, sizeof(buf), stdin) != 0) {
+    while (fgets(buf, sizeof(buf), stdin) != NULL) {
 	size_t need = strlen(buf);
 	char **argvec = typeCalloc(char *, need + 1);
 	char **argnow;
diff --git a/progs/tset.c b/progs/tset.c
index 5ceef1a0a..921a68907 100644
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.138 2024/11/30 21:30:49 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.139 2024/12/07 22:14:46 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -185,19 +185,19 @@ askuser(const char *dflt)
 	    (void) fprintf(stderr, "Terminal type? ");
 	(void) fflush(stderr);
 
-	if (fgets(answer, sizeof(answer), stdin) == 0) {
-	    if (dflt == 0) {
+	if (fgets(answer, sizeof(answer), stdin) == NULL) {
+	    if (dflt == NULL) {
 		exit_error();
 		/* NOTREACHED */
 	    }
 	    return (dflt);
 	}
 
-	if ((p = strchr(answer, '\n')) != 0)
+	if ((p = strchr(answer, '\n')) != NULL)
 	    *p = '\0';
 	if (answer[0])
 	    return (answer);
-	if (dflt != 0)
+	if (dflt != NULL)
 	    return (dflt);
     }
 }
@@ -344,7 +344,7 @@ static const SPEEDS speeds[] =
 static int
 tbaudrate(char *rate)
 {
-    const SPEEDS *sp = 0;
+    const SPEEDS *sp = NULL;
     size_t n;
 
     /* The baudrate number can be preceded by a 'B', which is ignored. */
@@ -361,7 +361,7 @@ tbaudrate(char *rate)
 	    break;
 	}
     }
-    if (sp == 0)
+    if (sp == NULL)
 	err("unknown baud rate %s", rate);
     return (sp->speed);
 }
@@ -377,18 +377,18 @@ add_mapping(const char *port, char *arg)
     MAP *mapp;
     char *copy, *p;
     const char *termp;
-    char *base = 0;
+    char *base = NULL;
 
     copy = strdup(arg);
     mapp = typeMalloc(MAP, 1);
-    if (copy == 0 || mapp == 0)
+    if (copy == NULL || mapp == NULL)
 	failed("malloc");
 
     assert(copy != 0);
     assert(mapp != 0);
 
-    mapp->next = 0;
-    if (maplist == 0)
+    mapp->next = NULL;
+    if (maplist == NULL)
 	cur = maplist = mapp;
     else {
 	cur->next = mapp;
@@ -400,14 +400,14 @@ add_mapping(const char *port, char *arg)
 
     arg = strpbrk(arg, "><@=!:");
 
-    if (arg == 0) {		/* [?]term */
+    if (arg == NULL) {		/* [?]term */
 	mapp->type = mapp->porttype;
-	mapp->porttype = 0;
+	mapp->porttype = NULL;
 	goto done;
     }
 
     if (arg == mapp->porttype)	/* [><@=! baud]:term */
-	termp = mapp->porttype = 0;
+	termp = mapp->porttype = NULL;
     else
 	termp = base = arg;
 
@@ -442,7 +442,7 @@ add_mapping(const char *port, char *arg)
 	++arg;
     } else {			/* Optional baudrate. */
 	arg = strchr(p = arg, ':');
-	if (arg == 0)
+	if (arg == NULL)
 	    goto badmopt;
 	*arg++ = '\0';
 	mapp->speed = tbaudrate(p);
@@ -451,7 +451,7 @@ add_mapping(const char *port, char *arg)
     mapp->type = arg;
 
     /* Terminate porttype, if specified. */
-    if (termp != 0)
+    if (termp != NULL)
 	*base = '\0';
 
     /* If a NOT conditional, reverse the test. */
@@ -499,7 +499,7 @@ mapped(const char *type)
     int match;
 
     for (mapp = maplist; mapp; mapp = mapp->next)
-	if (mapp->porttype == 0 || !strcmp(mapp->porttype, type)) {
+	if (mapp->porttype == NULL || !strcmp(mapp->porttype, type)) {
 	    switch (mapp->conditional) {
 	    case 0:		/* No test specified. */
 		match = TRUE;
@@ -562,11 +562,11 @@ get_termcap_entry(int fd, char *userarg)
     }
 
     /* Try the environment. */
-    if ((ttype = getenv("TERM")) != 0)
+    if ((ttype = getenv("TERM")) != NULL)
 	goto map;
 
 #if HAVE_PATH_TTYS
-    if ((ttypath = ttyname(fd)) != 0) {
+    if ((ttypath = ttyname(fd)) != NULL) {
 	p = _nc_basename(ttypath);
 #if HAVE_GETTTYNAM
 	/*
@@ -616,14 +616,14 @@ get_termcap_entry(int fd, char *userarg)
      * by out of date stuff in the environment.
      */
   found:
-    if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) {
+    if ((p = getenv("TERMCAP")) != NULL && !_nc_is_abs_path(p)) {
 	/* 'unsetenv("TERMCAP")' is not portable.
 	 * The 'environ' array is better.
 	 */
 	int n;
-	for (n = 0; environ[n] != 0; n++) {
+	for (n = 0; environ[n] != NULL; n++) {
 	    if (!strncmp("TERMCAP=", environ[n], (size_t) 8)) {
-		while ((environ[n] = environ[n + 1]) != 0) {
+		while ((environ[n] = environ[n + 1]) != NULL) {
 		    n++;
 		}
 		break;
@@ -639,7 +639,7 @@ get_termcap_entry(int fd, char *userarg)
 	if (ttype[1] != '\0')
 	    ttype = askuser(ttype + 1);
 	else
-	    ttype = askuser(0);
+	    ttype = askuser(NULL);
     }
     /* Find the terminfo entry.  If it doesn't exist, ask the user. */
     while (setupterm((NCURSES_CONST char *) ttype, fd, &errret)
@@ -647,12 +647,12 @@ get_termcap_entry(int fd, char *userarg)
 	if (errret == 0) {
 	    (void) fprintf(stderr, "%s: unknown terminal type %s\n",
 			   _nc_progname, ttype);
-	    ttype = 0;
+	    ttype = NULL;
 	} else {
 	    (void) fprintf(stderr,
 			   "%s: can't initialize terminal type %s (error %d)\n",
 			   _nc_progname, ttype, errret);
-	    ttype = 0;
+	    ttype = NULL;
 	}
 	ttype = askuser(ttype);
     }
@@ -713,7 +713,7 @@ print_shell_commands(const char *ttype)
      * Figure out what shell we're using.  A hack, we look for an
      * environmental variable SHELL ending in "csh".
      */
-    if ((var = getenv("SHELL")) != 0
+    if ((var = getenv("SHELL")) != NULL
 	&& ((len = (int) strlen(leaf = _nc_basename(var))) >= 3)
 	&& !strcmp(leaf + len - 3, "csh"))
 	p = "set noglob;\nsetenv TERM %s;\nunset noglob;\n";
@@ -806,7 +806,7 @@ main(int argc, char **argv)
 	    tkillchar = arg_to_char();
 	    break;
 	case 'm':		/* map identifier to type */
-	    add_mapping(0, optarg);
+	    add_mapping(NULL, optarg);
 	    break;
 	case 'p':		/* OBSOLETE: map identifier to type */
 	    add_mapping("plugboard", optarg);
diff --git a/test/blue.c b/test/blue.c
index e02f48bd7..8f6f8bcb9 100644
--- a/test/blue.c
+++ b/test/blue.c
@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.56 2024/10/05 19:26:24 tom Exp $
+ * $Id: blue.c,v 1.57 2024/12/07 22:27:13 tom Exp $
  */
 
 #include <test.priv.h>
@@ -454,7 +454,7 @@ use_pc_display(void)
 	     * The ncurses library makes this check to decide whether to allow
 	     * the alternate character set for the (normally) nonprinting codes.
 	     */
-	    if (smacs != 0 && smpch != 0 && !strcmp(smacs, smpch)) {
+	    if (smacs != NULL && smpch != NULL && !strcmp(smacs, smpch)) {
 		suits = glyphs;
 	    }
 	}
diff --git a/test/bs.c b/test/bs.c
index d7fd23194..41f252aa4 100644
--- a/test/bs.c
+++ b/test/bs.c
@@ -35,7 +35,7 @@
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *
- * $Id: bs.c,v 1.81 2024/11/30 16:47:02 tom Exp $
+ * $Id: bs.c,v 1.82 2024/12/07 22:18:28 tom Exp $
  */
 
 #include <test.priv.h>
@@ -224,12 +224,12 @@ intro(void)
 {
     const char *tmpname;
 
-    srand((unsigned) (time(0L) + getpid()));	/* Kick the random number generator */
+    srand((unsigned) (time(NULL) + getpid()));	/* Kick the random number generator */
 
     InitAndCatch(initscr(), uninitgame);
 
-    if ((tmpname = getlogin()) != 0 &&
-	(your_name = strdup(tmpname)) != 0) {
+    if ((tmpname = getlogin()) != NULL &&
+	(your_name = strdup(tmpname)) != NULL) {
 	your_name[0] = (char) toupper(UChar(your_name[0]));
     } else {
 	your_name = strdup(dftname);
@@ -475,7 +475,7 @@ initgame(void)
 	} else if (c == FF) {
 	    (void) clearok(stdscr, TRUE);
 	    (void) refresh();
-	} else if (ss == 0) {
+	} else if (ss == NULL) {
 	    beep();		/* simple to verify, unlikely to happen */
 	} else if (c == 'r') {
 	    prompt(1, "Random-placing your %s", ss->name);
@@ -877,7 +877,7 @@ plyturn(void)
 	    m = " You'll pick up survivors from my %s, I hope...!";
 	    break;
 	}
-	if (m != 0) {
+	if (m != NULL) {
 	    (void) printw(m, ss->name);
 	}
 	(void) beep();
diff --git a/test/cardfile.c b/test/cardfile.c
index f6af4d251..d85800dd3 100644
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.53 2024/11/30 16:47:59 tom Exp $
+ * $Id: cardfile.c,v 1.54 2024/12/07 22:27:13 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -47,7 +47,7 @@
 #define pair_1 1
 #define pair_2 2
 
-#define isVisible(cardp) ((cardp)->panel != 0)
+#define isVisible(cardp) ((cardp)->panel != NULL)
 
 enum {
     MY_CTRL_x = MAX_FORM_COMMAND
@@ -100,7 +100,7 @@ add_title(const char *title)
 {
     CARD *card, *p, *q;
 
-    for (p = all_cards, q = 0; p != 0; q = p, p = p->link) {
+    for (p = all_cards, q = NULL; p != NULL; q = p, p = p->link) {
 	int cmp = strcmp(p->title, title);
 	if (cmp == 0)
 	    return p;
@@ -112,7 +112,7 @@ add_title(const char *title)
     card->title = strdup(title);
     card->content = strdup("");
 
-    if (q == 0) {
+    if (q == NULL) {
 	card->link = all_cards;
 	all_cards = card;
     } else {
@@ -132,7 +132,7 @@ add_content(CARD * card, const char *content)
     if ((total = strlen(content)) != 0) {
 	size_t offset;
 
-	if (card->content != 0 && (offset = strlen(card->content)) != 0) {
+	if (card->content != NULL && (offset = strlen(card->content)) != 0) {
 	    total += 1 + offset;
 	    card->content = typeRealloc(char, total + 1, card->content);
 	    if (card->content) {
@@ -141,7 +141,7 @@ add_content(CARD * card, const char *content)
 	    }
 	} else {
 	    offset = 0;
-	    if (card->content != 0)
+	    if (card->content != NULL)
 		free(card->content);
 	    card->content = typeMalloc(char, total + 1);
 	}
@@ -165,7 +165,7 @@ find_card(const char *title)
 {
     CARD *card;
 
-    for (card = all_cards; card != 0; card = card->link)
+    for (card = all_cards; card != NULL; card = card->link)
 	if (!strcmp(card->title, title))
 	    break;
 
@@ -177,17 +177,17 @@ read_data(const char *fname)
 {
     FILE *fp;
 
-    if ((fp = fopen(fname, "r")) != 0) {
-	CARD *card = 0;
+    if ((fp = fopen(fname, "r")) != NULL) {
+	CARD *card = NULL;
 	char buffer[BUFSIZ];
 
 	while (fgets(buffer, sizeof(buffer), fp)) {
 	    trim(buffer);
 	    if (isspace(UChar(*buffer))) {
-		if (card == 0)
+		if (card == NULL)
 		    card = add_title("");
 		add_content(card, buffer);
-	    } else if ((card = find_card(buffer)) == 0) {
+	    } else if ((card = find_card(buffer)) == NULL) {
 		card = add_title(buffer);
 	    }
 	}
@@ -205,17 +205,17 @@ write_data(const char *fname)
     if (!strcmp(fname, default_name))
 	fname = "cardfile.out";
 
-    if ((fp = fopen(fname, "w")) != 0) {
-	CARD *p = 0;
+    if ((fp = fopen(fname, "w")) != NULL) {
+	CARD *p = NULL;
 
-	for (p = all_cards; p != 0; p = p->link) {
+	for (p = all_cards; p != NULL; p = p->link) {
 	    FIELD **f = form_fields(p->form);
 	    int n;
 
-	    for (n = 0; f[n] != 0; n++) {
+	    for (n = 0; f[n] != NULL; n++) {
 		char *s = field_buffer(f[n], 0);
-		if (s != 0
-		    && (s = strdup(s)) != 0) {
+		if (s != NULL
+		    && (s = strdup(s)) != NULL) {
 		    trim(s);
 		    fprintf(fp, "%s%s\n", n ? "\t" : "", s);
 		    free(s);
@@ -237,7 +237,7 @@ count_cards(void)
     CARD *p;
     int count = 0;
 
-    for (p = all_cards; p != 0; p = p->link)
+    for (p = all_cards; p != NULL; p = p->link)
 	count++;
 
     return count;
@@ -263,7 +263,7 @@ order_cards(CARD * first, int depth)
 static CARD *
 next_card(CARD * now)
 {
-    if (now->link != 0) {
+    if (now->link != NULL) {
 	CARD *tst = now->link;
 	if (isVisible(tst))
 	    now = tst;
@@ -280,7 +280,7 @@ static CARD *
 prev_card(CARD * now)
 {
     CARD *p;
-    for (p = all_cards; p != 0; p = p->link) {
+    for (p = all_cards; p != NULL; p = p->link) {
 	if (p->link == now) {
 	    if (!isVisible(p))
 		p = prev_card(p);
@@ -355,7 +355,7 @@ make_fields(const CARD * p, int form_high, int form_wide)
     set_field_just(f[1], JUSTIFY_LEFT);
     field_opts_off(f[1], O_BLANK);
 
-    f[2] = 0;
+    f[2] = NULL;
     return f;
 }
 
@@ -375,7 +375,7 @@ free_form_fields(FIELD **f)
 {
     int n;
 
-    for (n = 0; f[n] != 0; ++n) {
+    for (n = 0; f[n] != NULL; ++n) {
 	free_field(f[n]);
     }
     free(f);
@@ -414,9 +414,9 @@ cardfile(const char *fname)
     x = 0;
 
     /* make a panel for each CARD */
-    for (p = all_cards; p != 0; p = p->link) {
+    for (p = all_cards; p != NULL; p = p->link) {
 
-	if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
+	if ((win = newwin(panel_high, panel_wide, y, x)) == NULL)
 	    break;
 
 	wbkgd(win, (chtype) COLOR_PAIR(pair_2));
@@ -478,7 +478,7 @@ cardfile(const char *fname)
 		x = 0;
 
 		show_legend();
-		for (p = all_cards; p != 0; p = p->link) {
+		for (p = all_cards; p != NULL; p = p->link) {
 		    FIELD **oldf = form_fields(p->form);
 		    WINDOW *olds = form_sub(p->form);
 
@@ -528,7 +528,7 @@ cardfile(const char *fname)
 	}
     }
 #if NO_LEAKS
-    while (all_cards != 0) {
+    while (all_cards != NULL) {
 	p = all_cards;
 	all_cards = all_cards->link;
 
diff --git a/test/chgat.c b/test/chgat.c
index da5ebab80..ebbe0dd99 100644
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: chgat.c,v 1.23 2024/10/06 22:35:55 tom Exp $
+ * $Id: chgat.c,v 1.24 2024/12/07 22:27:13 tom Exp $
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
@@ -77,7 +77,7 @@ color_params(size_t state, short *pair)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (has_colors()) {
 	static bool first = TRUE;
@@ -114,7 +114,7 @@ video_params(size_t state, attr_t *attr)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (state < SIZEOF(table)) {
 	*attr = table[state].attr;
@@ -151,9 +151,9 @@ show_status(WINDOW *win, STATUS * sp)
     getyx(win, y, x);
     wmove(win, 0, 0);
     wprintw(win, "Count %d", sp->count);
-    if (sp->v_msg != 0)
+    if (sp->v_msg != NULL)
 	wprintw(win, " Video %s", sp->v_msg);
-    if (sp->c_msg != 0)
+    if (sp->c_msg != NULL)
 	wprintw(win, " Color %s", sp->c_msg);
     wclrtoeol(win);
     wmove(win, y, x);
@@ -165,10 +165,10 @@ do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
 			  sp->y_beg + 1, sp->x_beg + 1);
 
-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
+    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
 	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
 
-	if (win2 != 0) {
+	if (win2 != NULL) {
 	    box(win1, 0, 0);
 	    wrefresh(win1);
 	    func(win2);
@@ -180,7 +180,7 @@ do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
 	delwin(win1);
 	touchwin(win);
     } else {
-	if (win1 != 0)
+	if (win1 != NULL)
 	    delwin(win1);
 	beep();
     }
@@ -218,7 +218,7 @@ show_help(WINDOW *win)
 	,"=     resets count to zero."
 	,"-     negates count."
 	,"?     shows this help-window"
-	,0
+	,NULL
     };
 
     popup_msg(win, msgs);
@@ -230,14 +230,14 @@ update_status(WINDOW *win, STATUS * sp)
     switch (sp->ch) {
     case ' ':			/* next test-iteration */
 	if (has_colors()) {
-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
+	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 		}
 	    }
 	} else {
-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 	    }
 	}
diff --git a/test/clip_printw.c b/test/clip_printw.c
index d45e85d1f..2ceac4d39 100644
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: clip_printw.c,v 1.25 2024/10/06 22:36:25 tom Exp $
+ * $Id: clip_printw.c,v 1.26 2024/12/07 22:22:51 tom Exp $
  *
  * demonstrate how to use printw with/without wrapping.
  */
@@ -122,7 +122,7 @@ color_params(unsigned state, int *pair)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (has_colors()) {
 	static bool first = TRUE;
@@ -161,7 +161,7 @@ video_params(unsigned state, attr_t *attr)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (state < SIZEOF(table)) {
 	*attr = table[state].attr;
@@ -201,9 +201,9 @@ show_status(WINDOW *win, STATUS * sp)
     wmove(win, 0, 0);
     wprintw(win, "Clip %s", sp->single ? "line" : "window");
     wprintw(win, " Count %d", sp->count);
-    if (sp->v_msg != 0)
+    if (sp->v_msg != NULL)
 	wprintw(win, " Video %s", sp->v_msg);
-    if (sp->c_msg != 0)
+    if (sp->c_msg != NULL)
 	wprintw(win, " Color %s", sp->c_msg);
     wprintw(win, " (%d)", sp->status);
     wclrtoeol(win);
@@ -219,14 +219,14 @@ do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
 			  sp->y_beg + MARGIN,
 			  sp->x_beg + MARGIN);
 
-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
+    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
 	WINDOW *win2 = derwin(win1,
 			      sp->y_max - (2 * MARGIN) - 2,
 			      sp->x_max - (2 * MARGIN) - 2,
 			      (win == stdscr) ? Y_BASE : Y_BASE,
 			      MARGIN);
 
-	if (win2 != 0) {
+	if (win2 != NULL) {
 	    box(win1, 0, 0);
 	    wrefresh(win1);
 	    func(win2);
@@ -283,7 +283,7 @@ show_help(WINDOW *win)
 	,".     calls vw_printw at the current position with the given count."
 	,"=     resets count to zero."
 	,"?     shows this help-window"
-	,0
+	,NULL
     };
 
     popup_msg(win, msgs);
@@ -297,14 +297,14 @@ update_status(WINDOW *win, STATUS * sp)
     switch (sp->ch) {
     case ' ':			/* next test-iteration */
 	if (has_colors()) {
-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
+	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 		}
 	    }
 	} else {
-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 	    }
 	}
@@ -396,7 +396,7 @@ test_clipping(WINDOW *win)
 		need = (unsigned) want - 1;
 		_nc_STRCPY(fmt, "%c%s%c", sizeof(fmt));
 	    }
-	    if ((buffer = typeMalloc(char, need + 1)) != 0) {
+	    if ((buffer = typeMalloc(char, need + 1)) != NULL) {
 		for (j = 0; j < need; ++j) {
 		    buffer[j] = (char) ('A' + (j % 26));
 		}
diff --git a/test/color_content.c b/test/color_content.c
index 7e769d7e7..4927d2dec 100644
--- a/test/color_content.c
+++ b/test/color_content.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_content.c,v 1.21 2024/11/30 18:31:01 tom Exp $
+ * $Id: color_content.c,v 1.22 2024/12/07 22:22:51 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -186,7 +186,7 @@ run_test(void)
 	my_color_t g;
 	my_color_t b;
 	if (ColorContent(color, &r, &g, &b) == OK) {
-	    if (expected != 0) {
+	    if (expected != NULL) {
 		if (r != expected[color].r)
 		    success = FALSE;
 		if (g != expected[color].g)
diff --git a/test/color_name.h b/test/color_name.h
index 4ef5faea6..6f884a342 100644
--- a/test/color_name.h
+++ b/test/color_name.h
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_name.h,v 1.10 2024/10/05 19:26:24 tom Exp $
+ * $Id: color_name.h,v 1.11 2024/12/07 22:17:24 tom Exp $
  */
 
 #ifndef __COLORNAME_H
@@ -62,10 +62,10 @@ static int
 color_code(const char *color)
 {
     int result = 0;
-    char *endp = 0;
+    char *endp = NULL;
 
     if ((result = (int) strtol(color, &endp, 0)) >= 0
-	&& (endp == 0 || *endp == 0)) {
+	&& (endp == NULL || *endp == 0)) {
 	;
     } else if (!strcmp(color, "default")) {
 	result = -1;
@@ -87,7 +87,7 @@ static const char *
 color_name(int color)
 {
     static char temp[20];
-    const char *result = 0;
+    const char *result = NULL;
 
     if (color >= (int) SIZEOF(the_color_names)) {
 	_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%d", color);
diff --git a/test/combine.c b/test/combine.c
index 954b7c717..ade17798b 100644
--- a/test/combine.c
+++ b/test/combine.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: combine.c,v 1.25 2024/11/30 19:08:20 tom Exp $
+ * $Id: combine.c,v 1.26 2024/12/07 22:22:51 tom Exp $
  */
 
 #include <test.priv.h>
@@ -174,7 +174,7 @@ show_help(WINDOW *current)
 	++d;
     }
     popup_msg2(current, msgs);
-    for (s = 0; msgs[s] != 0; ++s) {
+    for (s = 0; msgs[s] != NULL; ++s) {
 	free(msgs[s]);
     }
     free(msgs);
diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c
index ea6a7e64b..254b8cbb3 100644
--- a/test/demo_altkeys.c
+++ b/test/demo_altkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_altkeys.c,v 1.17 2023/02/25 18:08:02 tom Exp $
+ * $Id: demo_altkeys.c,v 1.18 2024/12/07 23:02:27 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2005/10/22
@@ -49,7 +49,7 @@ log_last_line(WINDOW *win)
 {
     FILE *fp;
 
-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
 	char temp[256];
 	int y, x, n;
 	int need = sizeof(temp) - 1;
@@ -114,7 +114,7 @@ main(int argc, char *argv[])
     unlink(MY_LOGFILE);
 
     setlocale(LC_ALL, "");
-    if (newterm(0, stdout, stdin) == 0) {
+    if (newterm(NULL, stdout, stdin) == NULL) {
 	fprintf(stderr, "Cannot initialize terminal\n");
 	ExitProgram(EXIT_FAILURE);
     }
@@ -135,7 +135,7 @@ main(int argc, char *argv[])
     }
     for (n = KEY_MIN; n < KEY_MAX; ++n) {
 	char *value;
-	if ((value = keybound(n, 0)) != 0) {
+	if ((value = keybound(n, 0)) != NULL) {
 	    size_t need = strlen(value) + 2;
 	    char *temp = typeMalloc(char, need);
 	    _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
@@ -158,7 +158,7 @@ main(int argc, char *argv[])
 	printw("Keycode %d, name %s%s\n",
 	       ch,
 	       escaped ? "ESC-" : "",
-	       name != 0 ? name : "<null>");
+	       name != NULL ? name : "<null>");
 	log_last_line(stdscr);
 	clrtoeol();
 	if (ch == 'q')
diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index 215f79b08..da03cace7 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.36 2024/10/05 18:20:04 tom Exp $
+ * $Id: demo_defkey.c,v 1.37 2024/12/07 22:22:51 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -47,7 +47,7 @@ log_last_line(WINDOW *win)
 {
     FILE *fp;
 
-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
 	char temp[256];
 	int y, x, n;
 	int need = sizeof(temp) - 1;
@@ -98,7 +98,7 @@ visichar(int ch)
 static char *
 visible(const char *string)
 {
-    char *result = 0;
+    char *result = NULL;
 
     if (VALID_STRING(string) && *string != '\0') {
 	int pass;
@@ -130,15 +130,15 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     int rc;
     const char *code_name = keyname(code);
     char *old_string;
-    char *vis_string = 0;
+    char *vis_string = NULL;
     char temp[80];
 
-    if (code_name == 0) {
+    if (code_name == NULL) {
 	_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "Keycode %d", code);
 	code_name = temp;
     }
 
-    if ((old_string = keybound(code, 0)) != 0) {
+    if ((old_string = keybound(code, 0)) != NULL) {
 	wprintw(win, "%s is %s\n",
 		code_name,
 		vis_string = visible(old_string));
@@ -153,7 +153,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     if ((rc = key_defined(new_string)) > 0) {
 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
 	log_last_line(win);
-    } else if (new_string != 0 && rc < 0) {
+    } else if (new_string != NULL && rc < 0) {
 	wprintw(win, "%s conflicts with longer strings\n", vis_string);
 	log_last_line(win);
     }
@@ -161,18 +161,18 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     if (rc == ERR) {
 	wprintw(win, "%s unchanged\n", code_name);
 	log_last_line(win);
-    } else if (new_string != 0) {
+    } else if (new_string != NULL) {
 	wprintw(win, "%s is now bound to %s\n",
 		vis_string,
 		code_name);
 	log_last_line(win);
-    } else if (old_string != 0) {
+    } else if (old_string != NULL) {
 	wprintw(win, "%s deleted\n", code_name);
 	log_last_line(win);
     }
-    if (vis_string != 0)
+    if (vis_string != NULL)
 	free(vis_string);
-    if (old_string != 0)
+    if (old_string != NULL)
 	free(old_string);
 }
 
@@ -182,14 +182,14 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code)
     char *value = tigetstr(name);
 
     if (VALID_STRING(value)) {
-	const char *prefix = 0;
+	const char *prefix = NULL;
 
 	if (!(strncmp) (value, "\033[", (size_t) 2)) {
 	    prefix = "\033O";
 	} else if (!(strncmp) (value, "\033O", (size_t) 2)) {
 	    prefix = "\033[";
 	}
-	if (prefix != 0) {
+	if (prefix != NULL) {
 	    char temp[BUFSIZ];
 	    _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
 			"%s%s", prefix, value + 2);
@@ -207,7 +207,7 @@ redefine(WINDOW *win, const char *string, int code)
 static void
 remove_definition(WINDOW *win, int code)
 {
-    really_define_key(win, 0, code);
+    really_define_key(win, NULL, code);
 }
 
 static void
@@ -297,7 +297,7 @@ main(int argc, char *argv[])
 	const char *name = keyname(ch);
 	wprintw(win, "Keycode %d, name %s\n",
 		ch,
-		name != 0 ? name : "<null>");
+		name != NULL ? name : "<null>");
 	log_last_line(win);
 	wclrtoeol(win);
 	if (ch == 'q')
diff --git a/test/demo_forms.c b/test/demo_forms.c
index a9737590e..c8ba2e2e7 100644
--- a/test/demo_forms.c
+++ b/test/demo_forms.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_forms.c,v 1.67 2024/10/06 21:15:12 tom Exp $
+ * $Id: demo_forms.c,v 1.68 2024/12/07 22:27:13 tom Exp $
  *
  * Demonstrate a variety of functions from the form library.
  * Thomas Dickey - 2003/4/26
@@ -50,7 +50,7 @@ static int d_option = 0;
 static int j_value = 0;
 static int m_value = 0;
 static int o_value = 0;
-static char *t_value = 0;
+static char *t_value = NULL;
 
 static void
 failed(const char *s)
@@ -82,9 +82,9 @@ static char *
 get_data(const char *name)
 {
     char *result = t_value;
-    if (my_data != 0) {
+    if (my_data != NULL) {
 	int n;
-	for (n = 0; my_data[n].name != 0; ++n) {
+	for (n = 0; my_data[n].name != NULL; ++n) {
 	    if (!strcmp(name, my_data[n].name)) {
 		result = my_data[n].value;
 		break;
@@ -102,21 +102,21 @@ read_data(const char *filename)
 {
     FILE *fp = fopen(filename, "r");
 
-    if (fp != 0) {
+    if (fp != NULL) {
 	char buffer[BUFSIZ];
 	char *colon;
 	int more = 0;
 	int item = 0;
 
 	my_data = typeCalloc(MY_DATA, (size_t) 100);	/* FIXME */
-	while (fgets(buffer, sizeof(buffer), fp) != 0) {
+	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
 	    chomp(buffer);
 	    if (more) {
 		if (strcmp(buffer, ".")) {
 		    char *prior = my_data[more - 1].value;
 		    size_t need = strlen(buffer) + 2 + strlen(prior);
 		    char *value = typeRealloc(char, need, prior);
-		    if (value == 0)
+		    if (value == NULL)
 			failed("realloc");
 		    _nc_STRCAT(value, "\n", need);
 		    _nc_STRCAT(value, buffer, need);
@@ -126,13 +126,13 @@ read_data(const char *filename)
 		}
 	    } else if (*buffer == '#') {
 		continue;
-	    } else if ((colon = strchr(buffer, ':')) != 0) {
+	    } else if ((colon = strchr(buffer, ':')) != NULL) {
 		char *name;
 		char *value;
 		*colon++ = '\0';
 		name = strdup(buffer);
 		value = strdup(colon);
-		if (name == 0 || value == 0)
+		if (name == NULL || value == NULL)
 		    failed("strdup");
 		my_data[item].name = name;
 		my_data[item].value = value;
@@ -245,10 +245,10 @@ static FIELD *
 another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field)
 {
     FIELD **f = form_fields(form);
-    FIELD *result = 0;
+    FIELD *result = NULL;
     int n;
 
-    for (n = 0; f[n] != 0; ++n) {
+    for (n = 0; f[n] != NULL; ++n) {
 	if (f[n] != field) {
 	    result = f[n];
 	    field_opts_on(result, O_SELECTABLE);
@@ -273,7 +273,7 @@ my_form_driver(FORM *form, int c)
 	help_edit_field();
 	break;
     case MY_EDT_MODE:
-	if ((field = current_field(form)) != 0) {
+	if ((field = current_field(form)) != NULL) {
 	    set_current_field(form, another_field(form, field));
 	    if ((unsigned) field_opts(field) & O_EDIT) {
 		field_opts_off(field, O_EDIT);
@@ -324,7 +324,7 @@ show_current_field(WINDOW *win, NCURSES_CONST FORM *form)
 	waddstr(win, " behind");
     waddch(win, '\n');
 
-    if ((field = current_field(form)) != 0) {
+    if ((field = current_field(form)) != NULL) {
 	NCURSES_CONST FIELDTYPE *type;
 	int nbuf;
 
@@ -333,7 +333,7 @@ show_current_field(WINDOW *win, NCURSES_CONST FORM *form)
 		new_page(field) ? "*" : "",
 		field_index(field), field_count(form),
 		field_arg(field) ? "(arg)" : "");
-	if ((type = field_type(field)) != 0) {
+	if ((type = field_type(field)) != NULL) {
 	    if (type == TYPE_ALNUM)
 		waddstr(win, "ALNUM");
 	    else if (type == TYPE_ALPHA)
@@ -384,7 +384,7 @@ show_current_field(WINDOW *win, NCURSES_CONST FORM *form)
 	waddstr(win, "\n");
 	for (nbuf = 0; nbuf <= 2; ++nbuf) {
 	    NCURSES_CONST char *buffer;
-	    if ((buffer = field_buffer(field, nbuf)) != 0) {
+	    if ((buffer = field_buffer(field, nbuf)) != NULL) {
 		wprintw(win, "buffer %d:", nbuf);
 		(void) wattrset(win, A_REVERSE);
 		if (nbuf) {
@@ -410,7 +410,7 @@ demo_forms(void)
     int pg;
     NCURSES_CONST char *fname;
     static NCURSES_CONST char *my_enum[] =
-    {"first", "second", "third", 0};
+    {"first", "second", "third", NULL};
 
 #ifdef NCURSES_MOUSE_VERSION
     mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
@@ -514,7 +514,7 @@ demo_forms(void)
 
     f[n] = (FIELD *) 0;
 
-    if ((form = new_form(f)) != 0) {
+    if ((form = new_form(f)) != NULL) {
 	NCURSES_CONST WINDOW *w;
 	WINDOW *also;
 	int finished = 0;
@@ -543,7 +543,7 @@ demo_forms(void)
 
 	free_form(form);
     }
-    for (c = 0; f[c] != 0; c++) {
+    for (c = 0; f[c] != NULL; c++) {
 	free_edit_field(f[c]);
 	free_field(f[c]);
     }
diff --git a/test/demo_keyok.c b/test/demo_keyok.c
index f26d2c9d3..36e51f814 100644
--- a/test/demo_keyok.c
+++ b/test/demo_keyok.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_keyok.c,v 1.10 2024/08/24 17:16:49 tom Exp $
+ * $Id: demo_keyok.c,v 1.11 2024/12/07 22:22:51 tom Exp $
  *
  * Demonstrate the keyok() function.
  * Thomas Dickey - 2002/11/23
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
 	prior = ch;
 	wprintw(win, "Keycode %d, name %s\n",
 		ch,
-		name != 0 ? name : "<null>");
+		name != NULL ? name : "<null>");
 	wclrtoeol(win);
 	wrefresh(win);
 	if (ch >= KEY_MIN) {
diff --git a/test/demo_menus.c b/test/demo_menus.c
index c11954465..e1b49357e 100644
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.85 2024/11/30 18:52:09 tom Exp $
+ * $Id: demo_menus.c,v 1.86 2024/12/07 22:27:13 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -311,9 +311,9 @@ static void
 menu_destroy(MENU * m, int itemsToo)
 {
     Trace(("menu_destroy %p", (void *) m));
-    if (m != 0) {
+    if (m != NULL) {
 	ITEM **items = menu_items(m);
-	const char *blob = 0;
+	const char *blob = NULL;
 	int count;
 
 	count = item_count(m);
@@ -335,7 +335,7 @@ menu_destroy(MENU * m, int itemsToo)
 	if (count > 0 && itemsToo) {
 	    if (itemsToo & 1) {
 		ITEM **ip = items;
-		if (ip != 0) {
+		if (ip != NULL) {
 		    while (*ip)
 			free_item(*ip++);
 		}
@@ -362,14 +362,14 @@ build_file_menu(MenuNo number)
     static MENU_DATA table[] =
     {
 	{"Exit", call_files, 0},
-	{(char *) 0, 0, 0}
+	{(char *) 0, NULL, 0}
     };
     static ITEM *items[SIZEOF(table)];
 
     ITEM **ip = items;
     int n;
 
-    for (n = 0; table[n].name != 0; ++n) {
+    for (n = 0; table[n].name != NULL; ++n) {
 	*ip = new_item(table[n].name, empty);
 	set_item_userptr(*ip, (void *) &table[n]);
 	++ip;
@@ -413,17 +413,17 @@ build_select_menu(MenuNo number, char *filename)
 	MY_DATA("Pumas"),
 	MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"),
 	MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs, Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"),
-	{(char *) 0, 0, 0}
+	{(char *) 0, NULL, 0}
     };
     static ITEM **items;
 
     ITEM **ip;
-    MENU_DATA *ap = 0;
-    MENU_DATA *myList = 0;
+    MENU_DATA *ap = NULL;
+    MENU_DATA *myList = NULL;
     int i;
     size_t count = 0;
 
-    if (filename != 0) {
+    if (filename != NULL) {
 	struct stat sb;
 	if (stat(filename, &sb) == 0
 	    && (sb.st_mode & S_IFMT) == S_IFREG
@@ -436,9 +436,9 @@ build_select_menu(MenuNo number, char *filename)
 	    Trace(("build_select_menu blob=%p, items=%p",
 		   (void *) blob,
 		   (void *) items));
-	    if (blob != 0 && list != 0) {
+	    if (blob != NULL && list != NULL) {
 		FILE *fp = fopen(filename, "r");
-		if (fp != 0) {
+		if (fp != NULL) {
 		    if (fread(blob, sizeof(char), size, fp) == size) {
 			bool mark = TRUE;
 			unsigned j, k;
@@ -456,7 +456,7 @@ build_select_menu(MenuNo number, char *filename)
 				blob[j] = ' ';	/* menu items are printable */
 			    }
 			}
-			list[k].name = 0;
+			list[k].name = NULL;
 			count = k;
 			ap = myList = list;
 		    }
@@ -464,28 +464,28 @@ build_select_menu(MenuNo number, char *filename)
 		}
 		loaded_file = TRUE;
 	    }
-	    if (ap == 0)
+	    if (ap == NULL)
 		free(items);
 	}
     }
-    if (ap == 0) {
+    if (ap == NULL) {
 	count = SIZEOF(table) - 1;
 	items = typeCalloc(ITEM *, count + 1);
 	ap = table;
     }
 
     ip = items;
-    for (i = 0; ap[i].name != 0; ++i) {
+    for (i = 0; ap[i].name != NULL; ++i) {
 	ap[i].func = call_select;
 	ap[i].mask = (unsigned) i;
 	*ip = new_item(ap[i].name, empty);
 	set_item_userptr(*ip, (void *) &table[i]);
 	++ip;
     }
-    *ip = 0;
+    *ip = NULL;
 
     mpSelect = menu_create(items, (int) count, 1, number);
-    if (myList != 0)
+    if (myList != NULL)
 	free(myList);
 }
 
@@ -527,7 +527,7 @@ static MENU_DATA t_tbl[] =
     T_TBL(TRACE_ATTRS),
     T_TBL(TRACE_MAXIMUM),
     {
-	(char *) 0, 0, 0
+	(char *) 0, NULL, 0
     }
 };
 
@@ -539,7 +539,7 @@ build_trace_menu(MenuNo number)
     ITEM **ip = items;
     int n;
 
-    for (n = 0; t_tbl[n].name != 0; n++) {
+    for (n = 0; t_tbl[n].name != NULL; n++) {
 	*ip = new_item(t_tbl[n].name, empty);
 	set_item_userptr(*ip, (void *) &t_tbl[n]);
 	++ip;
@@ -556,8 +556,8 @@ tracetrace(unsigned tlevel)
     static size_t need = 12;
     int n;
 
-    if (buf == 0) {
-	for (n = 0; t_tbl[n].name != 0; n++)
+    if (buf == NULL) {
+	for (n = 0; t_tbl[n].name != NULL; n++)
 	    need += strlen(t_tbl[n].name) + 2;
 	buf = typeMalloc(char, need);
 	if (!buf)
@@ -568,7 +568,7 @@ tracetrace(unsigned tlevel)
 	_nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need);
 	_nc_STRCAT(buf, ", ", need);
     } else {
-	for (n = 1; t_tbl[n].name != 0; n++)
+	for (n = 1; t_tbl[n].name != NULL; n++)
 	    if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) {
 		_nc_STRCAT(buf, t_tbl[n].name, need);
 		_nc_STRCAT(buf, ", ", need);
@@ -595,7 +595,7 @@ update_trace_menu(NCURSES_CONST MENU * m)
     if (i == items[0]) {
 	if (item_value(i)) {
 	    ITEM **p;
-	    for (p = items + 1; *p != 0; p++)
+	    for (p = items + 1; *p != NULL; p++)
 		if (item_value(*p)) {
 		    set_item_value(*p, FALSE);
 		    changed = TRUE;
@@ -670,7 +670,7 @@ current_menu(void)
 	break;
 #endif
     default:
-	result = 0;
+	result = NULL;
 	break;
     }
     return result;
@@ -693,14 +693,14 @@ build_menus(char *filename)
 #ifdef TRACE
 	{"Trace", call_menus, 2},
 #endif
-	{(char *) 0, 0, 0}
+	{(char *) 0, NULL, 0}
     };
     static ITEM *items[SIZEOF(table)];
 
     ITEM **ip = items;
     int n;
 
-    for (n = 0; table[n].name != 0; ++n) {
+    for (n = 0; table[n].name != NULL; ++n) {
 	*ip = new_item(table[n].name, empty);
 	set_item_userptr(*ip, (void *) &table[n]);
 	++ip;
@@ -1023,7 +1023,7 @@ main(int argc, char *argv[])
 #endif /* HAVE_RIPOFFLINE */
 #ifdef TRACE
 	case 'D':
-	    curses_trace((unsigned) strtoul(optarg, 0, 0));
+	    curses_trace((unsigned) strtoul(optarg, NULL, 0));
 	    break;
 #endif
 	case OPTS_VERSION:
@@ -1046,7 +1046,7 @@ main(int argc, char *argv[])
 	init_pair(2, COLOR_BLUE, COLOR_WHITE);
     }
     status = newwin(3, COLS, LINES - 3, 0);
-    build_menus(argc > 1 ? argv[1] : 0);
+    build_menus(argc > 1 ? argv[1] : NULL);
     perform_menus();
     destroy_menus();
 
diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c
index 83124a962..d31a15e74 100644
--- a/test/demo_new_pair.c
+++ b/test/demo_new_pair.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_new_pair.c,v 1.31 2024/11/09 20:43:56 tom Exp $
+ * $Id: demo_new_pair.c,v 1.32 2024/12/07 22:22:51 tom Exp $
  *
  * Demonstrate the alloc_pair() function.
  */
@@ -50,7 +50,7 @@ static bool
 valid_cap(NCURSES_CONST char *name)
 {
     const char *value = tigetstr(name);
-    return (value != 0 && value != (char *) -1) ? TRUE : FALSE;
+    return (value != NULL && value != (char *) -1) ? TRUE : FALSE;
 }
 
 static attr_t
@@ -188,7 +188,7 @@ main(int argc, char *argv[])
 	"  ?      print this screen (exit on any character).",
 	"",
 	"To exit this program, press ^Q, ^[ or \"q\".",
-	0
+	NULL
     };
 
     bool done = FALSE;
@@ -243,7 +243,7 @@ main(int argc, char *argv[])
 	fprintf(stderr, "cannot open terminal for output\n");
 	ExitProgram(EXIT_FAILURE);
     }
-    if (newterm(NULL, output, stdin) == 0) {
+    if (newterm(NULL, output, stdin) == NULL) {
 	fprintf(stderr, "Cannot initialize terminal\n");
 	if (output != NULL)
 	    fclose(output);
diff --git a/test/demo_panels.c b/test/demo_panels.c
index 853f28bf0..91efafad7 100644
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.52 2024/11/23 19:07:23 tom Exp $
+ * $Id: demo_panels.c,v 1.53 2024/12/07 22:27:13 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -52,18 +52,18 @@ static FILE *log_out;
 static void
 close_input(void)
 {
-    if (log_in != 0) {
+    if (log_in != NULL) {
 	fclose(log_in);
-	log_in = 0;
+	log_in = NULL;
     }
 }
 
 static void
 close_output(void)
 {
-    if (log_out != 0) {
+    if (log_out != NULL) {
 	fclose(log_out);
-	log_out = 0;
+	log_out = NULL;
     }
 }
 
@@ -88,7 +88,7 @@ static void
 saywhat(NCURSES_CONST char *text)
 {
     WINDOW *win = statusline();
-    if (text != 0 && *text != '\0') {
+    if (text != NULL && *text != '\0') {
 	waddstr(win, text);
 	waddstr(win, "; ");
     }
@@ -124,7 +124,7 @@ get_position(NCURSES_CONST char *text,
 
     show_position(text, also, which, y1, x1);
 
-    if (log_in != 0) {
+    if (log_in != NULL) {
 	if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) {
 	    switch (cmd) {
 	    case LAST_POS:
@@ -204,12 +204,12 @@ static PANEL *
 mkpanel(short color, int rows, int cols, int tly, int tlx)
 {
     WINDOW *win;
-    PANEL *pan = 0;
+    PANEL *pan = NULL;
     char *userdata = typeMalloc(char, 6);
 
-    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
+    if ((win = newwin(rows, cols, tly, tlx)) != NULL) {
 	keypad(win, TRUE);
-	if ((pan = new_panel(win)) == 0) {
+	if ((pan = new_panel(win)) == NULL) {
 	    delwin(win);
 	} else if (use_colors) {
 	    short fg = (short) ((color == COLOR_BLUE)
@@ -231,7 +231,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
 static void
 my_remove_panel(PANEL **pans, int which)
 {
-    if (pans[which] != 0) {
+    if (pans[which] != NULL) {
 	PANEL *pan = pans[which];
 	WINDOW *win = panel_window(pan);
 	char *user = (char *) panel_userptr(pan);
@@ -240,7 +240,7 @@ my_remove_panel(PANEL **pans, int which)
 	del_panel(pan);
 	delwin(win);
 
-	pans[which] = 0;
+	pans[which] = NULL;
     }
 }
 
@@ -297,7 +297,7 @@ my_create_panel(PANEL **pans, int which, FillPanel myFill)
 static void
 my_move_panel(PANEL **pans, int which, bool continuous)
 {
-    if (pans[which] != 0) {
+    if (pans[which] != NULL) {
 	int code;
 	int y0, x0;
 	int y1, x1;
@@ -322,7 +322,7 @@ my_move_panel(PANEL **pans, int which, bool continuous)
 static void
 my_resize_panel(PANEL **pans, int which, FillPanel myFill)
 {
-    if (pans[which] != 0) {
+    if (pans[which] != NULL) {
 	int code;
 	int y0, x0;
 	int y1, x1;
@@ -341,7 +341,7 @@ my_resize_panel(PANEL **pans, int which, FillPanel myFill)
 				  ABS(x1 - x0) + 1,
 				  MIN(y0, y1),
 				  MIN(x0, x1));
-	    if (next != 0) {
+	    if (next != NULL) {
 		keypad(next, TRUE);
 		if (use_colors) {
 		    wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' '));
@@ -411,7 +411,7 @@ make_fullwidth_digit(cchar_t *target, int digit)
 
     source[0] = (wchar_t) (digit + 0xff10);
     source[1] = 0;
-    setcchar(target, source, A_NORMAL, 0, 0);
+    setcchar(target, source, A_NORMAL, 0, NULL);
 }
 
 static void
@@ -507,7 +507,7 @@ show_panels(PANEL *px[MAX_PANELS + 1])
 
     memset(table, 0, sizeof(table));
     for (j = 1; j <= MAX_PANELS; ++j) {
-	table[j].valid = (px[j] != 0);
+	table[j].valid = (px[j] != NULL);
 	if (table[j].valid) {
 	    table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE;
 	    table[j].above = panel_above(px[j]);
@@ -515,11 +515,11 @@ show_panels(PANEL *px[MAX_PANELS + 1])
 	}
     }
 
-    if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
+    if ((win = newwin(LINES - 1, COLS, 0, 0)) != NULL) {
 	PANEL *pan;
 
 	keypad(win, TRUE);
-	if ((pan = new_panel(win)) != 0) {
+	if ((pan = new_panel(win)) != NULL) {
 	    werase(win);
 	    MvWPrintw(win, 0, 0, "Panels:\n");
 	    for (j = 1; j <= MAX_PANELS; ++j) {
@@ -554,7 +554,7 @@ show_panels(PANEL *px[MAX_PANELS + 1])
 static int my_##func(PANEL *pan) \
 { \
     int code = ERR; \
-    if (pan != 0) { \
+    if (pan != NULL) { \
 	code = func(pan); \
     } \
     return code; \
@@ -578,7 +578,7 @@ do_panel(PANEL *px[MAX_PANELS + 1],
 	return;
     }
 
-    if (log_in != 0) {
+    if (log_in != NULL) {
 	pflush();
     }
 
@@ -617,7 +617,7 @@ do_panel(PANEL *px[MAX_PANELS + 1],
 static bool
 ok_letter(int ch)
 {
-    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0;
+    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != NULL;
 }
 
 static bool
@@ -644,8 +644,8 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit)
     waddstr(win, "Command:");
     buffer[length = 0] = '\0';
 
-    if (log_in != 0) {
-	if (fgets(buffer, limit - 3, log_in) != 0) {
+    if (log_in != NULL) {
+	if (fgets(buffer, limit - 3, log_in) != NULL) {
 	    length = (int) strlen(buffer);
 	    while (length > 0 && isspace(UChar(buffer[length - 1])))
 		buffer[--length] = '\0';
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index d229a15b0..8ec75de82 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.72 2024/11/30 18:31:01 tom Exp $
+ * $Id: demo_termcap.c,v 1.73 2024/12/07 22:27:13 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -101,7 +101,7 @@ static long total_b_values;
 static long total_n_values;
 static long total_s_values;
 
-#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == 0)
+#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == NULL)
 #define EachCapName(n) n = 33; n < 127; ++n
 
 static char *
@@ -150,17 +150,17 @@ make_dblist(void)
 static char *
 next_dbitem(void)
 {
-    char *result = 0;
+    char *result = NULL;
 
     if (db_list) {
-	if ((result = db_list[db_item]) == 0) {
+	if ((result = db_list[db_item]) == NULL) {
 	    db_item = 0;
 	    result = db_list[0];
 	} else {
 	    db_item++;
 	}
     }
-    if (result != 0)
+    if (result != NULL)
 	printf("** %s\n", result);
     return result;
 }
@@ -174,7 +174,7 @@ free_dblist(void)
 	for (n = 0; db_list[n]; ++n)
 	    free(db_list[n]);
 	free(db_list);
-	db_list = 0;
+	db_list = NULL;
     }
 }
 #endif /* NO_LEAKS */
@@ -259,7 +259,7 @@ dumpit(NCURSES_CONST char *cap)
     NCURSES_CONST char *str;
     int num;
 
-    if ((str = tgetstr(cap, &ap)) != 0) {
+    if ((str = tgetstr(cap, &ap)) != NULL) {
 	total_values++;
 	total_s_values++;
 	if (!q_opt) {
@@ -343,7 +343,7 @@ demo_termcap(NCURSES_CONST char *name)
 	if (b_opt) {
 	    for (n = 0;; ++n) {
 		cap = my_boolcodes[n];
-		if (cap == 0)
+		if (cap == NULL)
 		    break;
 		dumpit(cap);
 	    }
@@ -352,7 +352,7 @@ demo_termcap(NCURSES_CONST char *name)
 	if (n_opt) {
 	    for (n = 0;; ++n) {
 		cap = my_numcodes[n];
-		if (cap == 0)
+		if (cap == NULL)
 		    break;
 		dumpit(cap);
 	    }
@@ -361,16 +361,16 @@ demo_termcap(NCURSES_CONST char *name)
 	if (s_opt) {
 	    for (n = 0;; ++n) {
 		cap = my_strcodes[n];
-		if (cap == 0)
+		if (cap == NULL)
 		    break;
 		dumpit(cap);
 	    }
 	}
 #ifdef NCURSES_VERSION
-	if (x_opt && (my_blob == 0) && y_opt) {
+	if (x_opt && (my_blob == NULL) && y_opt) {
 #if NCURSES_XNAMES
 	    NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
-	    if (term != 0
+	    if (term != NULL
 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
 		    || (NUM_NUMBERS(term) != NUMCOUNT)
 		    || (NUM_STRINGS(term) != STRCOUNT))) {
@@ -429,16 +429,16 @@ parse_description(const char *input_name)
      * None of the arrays could be larger than the input-file, and since it
      * is small, just allocate the maximum for simplicity.
      */
-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 ||
-	(my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) {
+    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL ||
+	(my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) {
 	failed("cannot allocate memory for input-file");
     }
 
-    if ((fp = fopen(input_name, "r")) == 0) {
+    if ((fp = fopen(input_name, "r")) == NULL) {
 	failed("cannot open input-file");
     } else {
 	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
@@ -674,11 +674,11 @@ parse_description(const char *input_name)
 	    break;
 	}
     }
-    my_boolcodes[count_bools] = 0;
-    my_numcodes[count_nums] = 0;
-    my_numvalues[count_nums] = 0;
-    my_strcodes[count_strs] = 0;
-    my_strvalues[count_strs] = 0;
+    my_boolcodes[count_bools] = NULL;
+    my_numcodes[count_nums] = NULL;
+    my_numvalues[count_nums] = NULL;
+    my_strcodes[count_strs] = NULL;
+    my_strvalues[count_strs] = NULL;
 
 #if 0
     printf("bools:%d\n", (int) count_bools);
@@ -702,11 +702,11 @@ copy_code_list(NCURSES_CONST char *const *list)
     int pass;
     size_t count;
     size_t length = 1;
-    char **result = 0;
-    char *unused = 0;
+    char **result = NULL;
+    char *unused = NULL;
 
     for (pass = 0; pass < 2; ++pass) {
-	for (count = 0; list[count] != 0; ++count) {
+	for (count = 0; list[count] != NULL; ++count) {
 	    size_t chunk = strlen(list[count]) + 1;
 	    if (pass == 0) {
 		length += chunk;
@@ -720,7 +720,7 @@ copy_code_list(NCURSES_CONST char *const *list)
 	    char *blob = malloc(length);
 	    result = typeCalloc(char *, count + 1);
 	    unused = blob;
-	    if (blob == 0 || result == 0)
+	    if (blob == NULL || result == NULL)
 		failed("copy_code_list failed");
 	}
     }
@@ -786,7 +786,7 @@ main(int argc, char *argv[])
 #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
     bool v_opt = FALSE;
 #endif
-    NCURSES_CONST char *input_name = 0;
+    NCURSES_CONST char *input_name = NULL;
 
     int repeat;
     int r_opt = 1;
@@ -864,7 +864,7 @@ main(int argc, char *argv[])
 		for (n = optind; n < argc; ++n) {
 		    brute_force(argv[n]);
 		}
-	    } else if ((name = getenv("TERM")) != 0) {
+	    } else if ((name = getenv("TERM")) != NULL) {
 		brute_force(name);
 	    } else {
 		static NCURSES_CONST char dumb[] = "dumb";
@@ -872,7 +872,7 @@ main(int argc, char *argv[])
 	    }
 	}
     } else {
-	if (input_name != 0) {
+	if (input_name != NULL) {
 	    parse_description(input_name);
 	}
 #if USE_CODE_LISTS
@@ -891,7 +891,7 @@ main(int argc, char *argv[])
 		for (n = optind; n < argc; ++n) {
 		    demo_termcap(argv[n]);
 		}
-	    } else if ((name = getenv("TERM")) != 0) {
+	    } else if ((name = getenv("TERM")) != NULL) {
 		demo_termcap(name);
 	    } else {
 		static NCURSES_CONST char dumb[] = "dumb";
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index d74373a96..42e323e70 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.61 2024/11/30 18:31:01 tom Exp $
+ * $Id: demo_terminfo.c,v 1.62 2024/12/07 22:27:13 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -141,17 +141,17 @@ make_dblist(void)
 static char *
 next_dbitem(void)
 {
-    char *result = 0;
+    char *result = NULL;
 
     if (db_list) {
-	if ((result = db_list[db_item]) == 0) {
+	if ((result = db_list[db_item]) == NULL) {
 	    db_item = 0;
 	    result = db_list[0];
 	} else {
 	    db_item++;
 	}
     }
-    if (result != 0)
+    if (result != NULL)
 	printf("** %s\n", result);
     return result;
 }
@@ -165,7 +165,7 @@ free_dblist(void)
 	for (n = 0; db_list[n]; ++n)
 	    free(db_list[n]);
 	free(db_list);
-	db_list = 0;
+	db_list = NULL;
     }
 }
 #endif
@@ -176,7 +176,7 @@ dumpit(NCURSES_CONST char *cap, const char *show)
     const char *str;
     int num;
 
-    if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) {
+    if ((str = tigetstr(cap)) != NULL && (str != (char *) -1)) {
 	total_values++;
 	total_s_values++;
 	if (!q_opt) {
@@ -339,7 +339,7 @@ demo_terminfo(NCURSES_CONST char *name)
     if (b_opt) {
 	for (n = 0;; ++n) {
 	    cap = my_boolcodes[n];
-	    if (cap == 0)
+	    if (cap == NULL)
 		break;
 	    dumpit(cap, fullname(bool, n));
 	}
@@ -348,7 +348,7 @@ demo_terminfo(NCURSES_CONST char *name)
     if (n_opt) {
 	for (n = 0;; ++n) {
 	    cap = my_numcodes[n];
-	    if (cap == 0)
+	    if (cap == NULL)
 		break;
 	    dumpit(cap, fullname(num, n));
 	}
@@ -357,17 +357,17 @@ demo_terminfo(NCURSES_CONST char *name)
     if (s_opt) {
 	for (n = 0;; ++n) {
 	    cap = my_strcodes[n];
-	    if (cap == 0)
+	    if (cap == NULL)
 		break;
 	    dumpit(cap, fullname(str, n));
 	}
     }
 #ifdef NCURSES_VERSION
-    if (x_opt && (my_blob == 0)) {
+    if (x_opt && (my_blob == NULL)) {
 	if (y_opt) {
 #if NCURSES_XNAMES
 	    const TERMTYPE *term = (TERMTYPE *) cur_term;
-	    if (term != 0
+	    if (term != NULL
 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
 		    || (NUM_NUMBERS(term) != NUMCOUNT)
 		    || (NUM_STRINGS(term) != STRCOUNT))) {
@@ -455,16 +455,16 @@ parse_description(const char *input_name)
      * None of the arrays could be larger than the input-file, and since it
      * is small, just allocate the maximum for simplicity.
      */
-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 ||
-	(my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 ||
-	  (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) {
+    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL ||
+	(my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL ||
+	  (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) {
 	failed("cannot allocate memory for input-file");
     }
 
-    if ((fp = fopen(input_name, "r")) == 0) {
+    if ((fp = fopen(input_name, "r")) == NULL) {
 	failed("cannot open input-file");
     } else {
 	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
@@ -704,11 +704,11 @@ parse_description(const char *input_name)
 	    break;
 	}
     }
-    my_boolcodes[count_bools] = 0;
-    my_numcodes[count_nums] = 0;
-    my_numvalues[count_nums] = 0;
-    my_strcodes[count_strs] = 0;
-    my_strvalues[count_strs] = 0;
+    my_boolcodes[count_bools] = NULL;
+    my_numcodes[count_nums] = NULL;
+    my_numvalues[count_nums] = NULL;
+    my_strcodes[count_strs] = NULL;
+    my_strvalues[count_strs] = NULL;
 
 #if 0
     printf("# bools:%d\n", (int) count_bools);
@@ -732,11 +732,11 @@ copy_code_list(NCURSES_CONST char *const *list)
     int pass;
     size_t count;
     size_t length = 1;
-    char **result = 0;
-    char *unused = 0;
+    char **result = NULL;
+    char *unused = NULL;
 
     for (pass = 0; pass < 2; ++pass) {
-	for (count = 0; list[count] != 0; ++count) {
+	for (count = 0; list[count] != NULL; ++count) {
 	    size_t chunk = strlen(list[count]) + 1;
 	    if (pass == 0) {
 		length += chunk;
@@ -750,7 +750,7 @@ copy_code_list(NCURSES_CONST char *const *list)
 	    char *blob = malloc(length);
 	    result = typeCalloc(char *, count + 1);
 	    unused = blob;
-	    if (blob == 0 || result == 0)
+	    if (blob == NULL || result == NULL)
 		failed("copy_code_list failed");
 	}
     }
@@ -815,7 +815,7 @@ main(int argc, char *argv[])
     int repeat;
     NCURSES_CONST char *name;
     int r_opt = 1;
-    const char *input_name = 0;
+    const char *input_name = NULL;
 
     while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) {
 	switch (ch) {
@@ -888,7 +888,7 @@ main(int argc, char *argv[])
 		for (n = optind; n < argc; ++n) {
 		    brute_force(argv[n]);
 		}
-	    } else if ((name = getenv("TERM")) != 0) {
+	    } else if ((name = getenv("TERM")) != NULL) {
 		brute_force(name);
 	    } else {
 		static NCURSES_CONST char dumb[] = "dumb";
@@ -896,7 +896,7 @@ main(int argc, char *argv[])
 	    }
 	}
     } else {
-	if (input_name != 0) {
+	if (input_name != NULL) {
 	    parse_description(input_name);
 	}
 #if USE_CODE_LISTS
@@ -915,7 +915,7 @@ main(int argc, char *argv[])
 		for (n = optind; n < argc; ++n) {
 		    demo_terminfo(argv[n]);
 		}
-	    } else if ((name = getenv("TERM")) != 0) {
+	    } else if ((name = getenv("TERM")) != NULL) {
 		demo_terminfo(name);
 	    } else {
 		static NCURSES_CONST char dumb[] = "dumb";
@@ -933,8 +933,8 @@ main(int argc, char *argv[])
 
 #if NO_LEAKS
     free_dblist();
-    if (input_name != 0) {
-	if (my_blob != 0) {
+    if (input_name != NULL) {
+	if (my_blob != NULL) {
 	    free(my_blob);
 	    free(my_boolcodes);
 	    free(my_numcodes);
diff --git a/test/ditto.c b/test/ditto.c
index acac8377a..bf2b930ab 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 tom Exp $
+ * $Id: ditto.c,v 1.60 2024/12/07 23:02:27 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -157,15 +157,15 @@ open_tty(char *path)
     int aslave;
     char slave_name[1024];
     char s_option[sizeof(slave_name) + 80];
-    const char *xterm_prog = 0;
+    const char *xterm_prog = NULL;
 
-    if ((xterm_prog = getenv("XTERM_PROG")) == 0)
+    if ((xterm_prog = getenv("XTERM_PROG")) == NULL)
 	xterm_prog = "xterm";
 
-    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
+    if (openpty(&amaster, &aslave, slave_name, NULL, NULL) != 0
 	|| strlen(slave_name) > sizeof(slave_name) - 1)
 	failed("openpty");
-    if (strrchr(slave_name, '/') == 0) {
+    if (strrchr(slave_name, '/') == NULL) {
 	errno = EISDIR;
 	failed(slave_name);
     }
@@ -176,7 +176,7 @@ open_tty(char *path)
 	_exit(0);
     }
     fp = fdopen(amaster, "r+");
-    if (fp == 0)
+    if (fp == NULL)
 	failed(path);
 #else
     struct stat sb;
@@ -266,7 +266,7 @@ open_screen(DITTO * target, char **source, int length, int which1)
 			     target->output,
 			     target->input);
 
-    if (target->screen == 0)
+    if (target->screen == NULL)
 	failed("newterm");
 
     (void) USING_SCREEN(target->screen, init_screen, target);
@@ -429,7 +429,7 @@ main(int argc, char *argv[])
 	}
     }
 
-    if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
+    if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL)
 	failed("calloc data");
 
     assert(data != 0);
@@ -478,7 +478,7 @@ main(int argc, char *argv[])
      */
     for (j = argc - 1; j >= 0; j--) {
 	LockIt();
-	USING_SCREEN(data[j].screen, close_screen, 0);
+	USING_SCREEN(data[j].screen, close_screen, NULL);
 	fprintf(data[j].output, "**Closed\r\n");
 
 	/*
diff --git a/test/dots.c b/test/dots.c
index 1b84eaf86..c50d4d1bf 100644
--- a/test/dots.c
+++ b/test/dots.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 1999
  *
- * $Id: dots.c,v 1.46 2024/10/06 21:17:54 tom Exp $
+ * $Id: dots.c,v 1.47 2024/12/07 22:27:13 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -102,7 +102,7 @@ static int
 get_number(NCURSES_CONST char *cap, int map)
 {
     int result = map;
-    if (cap != 0) {
+    if (cap != NULL) {
 	int check = tigetnum(cap);
 	if (check > 0)
 	    result = check;
@@ -191,12 +191,12 @@ main(int argc, char *argv[])
     SetupAlarm(r_option);
     InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig);
 
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     outs(clear_screen);
     outs(cursor_invisible);
 
-#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln)
+#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln)
     my_colors = GetNumber(max_colors, colors);
     if (my_colors > 1) {
 	if (!VALID_STRING(set_a_foreground)
diff --git a/test/dots_curses.c b/test/dots_curses.c
index ea285cde8..0396fcdaf 100644
--- a/test/dots_curses.c
+++ b/test/dots_curses.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_curses.c,v 1.26 2024/11/30 17:48:07 tom Exp $
+ * $Id: dots_curses.c,v 1.27 2024/12/07 22:32:11 tom Exp $
  *
  * A simple demo of the curses interface used for comparison with termcap.
  */
@@ -170,7 +170,7 @@ main(int argc, char *argv[])
 	}
     }
 
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     SetupAlarm(r_option);
     InitAndCatch(initscr(), onsig);
diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 2595d8ad6..c0a45ca48 100644
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
- * $Id: dots_mvcur.c,v 1.32 2024/10/06 21:17:54 tom Exp $
+ * $Id: dots_mvcur.c,v 1.33 2024/12/07 22:32:11 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -103,7 +103,7 @@ static int
 get_number(NCURSES_CONST char *cap, int map)
 {
     int result = map;
-    if (cap != 0) {
+    if (cap != NULL) {
 	int check = tigetnum(cap);
 	if (check > 0)
 	    result = check;
@@ -195,18 +195,18 @@ main(int argc, char *argv[])
     InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig);
     refresh();			/* needed with Solaris curses to cancel endwin */
 
-    if (sp == 0) {
+    if (sp == NULL) {
 	fprintf(stderr, "Cannot initialize terminal\n");
 	ExitProgram(EXIT_FAILURE);
     }
 
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     outs(clear_screen);
     outs(cursor_home);
     outs(cursor_invisible);
 
-#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln)
+#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln)
     my_colors = GetNumber(max_colors, colors);
     if (my_colors > 1) {
 	if (!VALID_STRING(set_a_foreground)
diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index 050bdc98b..e505389da 100644
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.35 2024/10/06 21:18:35 tom Exp $
+ * $Id: dots_termcap.c,v 1.37 2024/12/07 22:32:11 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -153,7 +153,7 @@ ranf(void)
 /*
  * napms is a curses function which happens to be usable without initializing
  * the screen, but if this program happened to be build with a "real" termcap
- * library, there is nothing like napms. 
+ * library, there is nothing like napms.
  */
 #if HAVE_NAPMS
 #define my_napms(ms) napms(ms)
@@ -178,9 +178,9 @@ static int
 get_number(NCURSES_CONST char *cap, const char *env)
 {
     int result = tgetnum(cap);
-    const char *value = env ? getenv(env) : 0;
-    if (value != 0 && *value != 0) {
-	char *next = 0;
+    const char *value = env ? getenv(env) : NULL;
+    if (value != NULL && *value != 0) {
+	char *next = NULL;
 	long check = strtol(value, &next, 10);
 	if (check > 0 && *next == '\0')
 	    result = (int) check;
@@ -263,12 +263,12 @@ main(int argc, char *argv[])
 	}
     }
 
-    if ((name = getenv("TERM")) == 0) {
+    if ((name = getenv("TERM")) == NULL) {
 	fprintf(stderr, "TERM is not set\n");
 	ExitProgram(EXIT_FAILURE);
     }
 
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     SetupAlarm((unsigned) r_option);
     InitAndCatch(ch = tgetent(buffer, name), onsig);
@@ -285,7 +285,7 @@ main(int argc, char *argv[])
     }
 
     num_colors = tgetnum("Co");
-#define GetNumber(cap,env) get_number(cap, e_option ? env : 0)
+#define GetNumber(cap,env) get_number(cap, e_option ? env : NULL)
     num_lines = GetNumber("li", "LINES");
     num_columns = GetNumber("co", "COLUMNS");
 
diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index ac403dc79..e1677ea28 100644
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_xcurses.c,v 1.31 2024/11/30 17:41:18 tom Exp $
+ * $Id: dots_xcurses.c,v 1.32 2024/12/07 22:32:11 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
@@ -202,7 +202,7 @@ main(int argc, char *argv[])
     }
 
     setlocale(LC_ALL, "");
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     SetupAlarm(r_option);
     InitAndCatch(initscr(), onsig);
diff --git a/test/dump_window.c b/test/dump_window.c
index eed4dbcbd..e6115eb8b 100644
--- a/test/dump_window.c
+++ b/test/dump_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  *                                                                          *
  * 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: dump_window.c,v 1.5 2023/11/11 00:30:50 tom Exp $
+ * $Id: dump_window.c,v 1.6 2024/12/07 23:03:07 tom Exp $
  */
 #include <dump_window.h>
 
@@ -37,7 +37,7 @@ open_dump(const char *fn)
 {
     int result = 0;
     close_dump();
-    if ((dumpfp = fopen(fn, "a")) != 0)
+    if ((dumpfp = fopen(fn, "a")) != NULL)
 	result = 1;
     return result;
 }
@@ -45,9 +45,9 @@ open_dump(const char *fn)
 void
 close_dump(void)
 {
-    if (dumpfp != 0) {
+    if (dumpfp != NULL) {
 	fclose(dumpfp);
-	dumpfp = 0;
+	dumpfp = NULL;
     }
 }
 
@@ -55,14 +55,14 @@ void
 dump_window(WINDOW *w)
 {
     wgetch(w);
-    if (dumpfp != 0) {
+    if (dumpfp != NULL) {
 	int y, x;
 	int oldy, oldx;
 	int maxy, maxx;
 	int pass;
-	char *cvec = 0;
-	char *avec = 0;
-	char *pvec = 0;
+	char *cvec = NULL;
+	char *avec = NULL;
+	char *pvec = NULL;
 	int ccnt = 0;
 	int acnt = 0;
 	int pcnt = 0;
diff --git a/test/dup_field.c b/test/dup_field.c
index 7ef7151f8..8f6db8e80 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: dup_field.c,v 1.11 2024/10/06 20:07:19 tom Exp $
+ * $Id: dup_field.c,v 1.12 2024/12/07 22:32:11 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -91,7 +91,7 @@ my_help_edit_field(void)
 	const char *code = keyname(commands[n].code);
 	size_t need = 5;
 #ifdef NCURSES_VERSION
-	if ((name = form_request_name(commands[n].result)) == 0)
+	if ((name = form_request_name(commands[n].result)) == NULL)
 #endif
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
@@ -101,9 +101,9 @@ my_help_edit_field(void)
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
-    msgs[used] = 0;
+    msgs[used] = NULL;
     popup_msg2(stdscr, msgs);
-    for (n = 0; msgs[n] != 0; ++n) {
+    for (n = 0; msgs[n] != NULL; ++n) {
 	free(msgs[n]);
     }
     free(msgs);
@@ -347,7 +347,7 @@ demo_forms(void)
 
     all_fields[n] = (FIELD *) 0;
 
-    if ((form = new_form(all_fields)) != 0) {
+    if ((form = new_form(all_fields)) != NULL) {
 	int finished = 0;
 
 	post_form(form);
@@ -369,7 +369,7 @@ demo_forms(void)
 
 	free_form(form);
     }
-    for (c = 0; all_fields[c] != 0; c++) {
+    for (c = 0; all_fields[c] != NULL; c++) {
 	free_edit_field(all_fields[c]);
 	free_field(all_fields[c]);
     }
diff --git a/test/echochar.c b/test/echochar.c
index 084970694..e1ce8f1d0 100644
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2006-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: echochar.c,v 1.26 2023/05/27 20:13:10 tom Exp $
+ * $Id: echochar.c,v 1.27 2024/12/07 23:03:07 tom Exp $
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
     double c;
     bool use_colors;
     bool opt_r = FALSE;
-    char *my_pairs = 0;
+    char *my_pairs = NULL;
     int last_fg = 0;
     int last_bg = 0;
 
@@ -134,10 +134,10 @@ main(int argc, char *argv[])
 	if (COLOR_PAIRS > 0) {
 	    my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS);
 	}
-	use_colors = (my_pairs != 0);
+	use_colors = (my_pairs != NULL);
     }
 
-    srand((unsigned) time(0));
+    srand((unsigned) time(NULL));
 
     curs_set(0);
 
diff --git a/test/edit_field.c b/test/edit_field.c
index e62a51fd3..fd6248ca3 100644
--- a/test/edit_field.c
+++ b/test/edit_field.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: edit_field.c,v 1.32 2024/06/29 17:49:56 tom Exp $
+ * $Id: edit_field.c,v 1.33 2024/12/07 22:22:51 tom Exp $
  *
  * A wrapper for form_driver() which keeps track of the user's editing changes
  * for each field, and makes the resulting length available as a
@@ -188,7 +188,7 @@ help_edit_field(void)
 	const char *code = keyname(commands[n].code);
 	size_t need = 5;
 #ifdef NCURSES_VERSION
-	if ((name = form_request_name(commands[n].result)) == 0)
+	if ((name = form_request_name(commands[n].result)) == NULL)
 #endif
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
@@ -198,9 +198,9 @@ help_edit_field(void)
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
-    msgs[used] = 0;
+    msgs[used] = NULL;
     popup_msg2(stdscr, msgs);
-    for (n = 0; msgs[n] != 0; ++n) {
+    for (n = 0; msgs[n] != NULL; ++n) {
 	free(msgs[n]);
     }
     free(msgs);
@@ -249,7 +249,7 @@ init_edit_field(FIELD *f, char *value)
 {
     char empty[1];
     FieldAttrs *ptr = field_attrs(f);
-    if (ptr == 0) {
+    if (ptr == NULL) {
 	int rows, cols, frow, fcol, nrow, nbuf;
 
 	ptr = typeCalloc(FieldAttrs, (size_t) 1);
@@ -259,7 +259,7 @@ init_edit_field(FIELD *f, char *value)
 	    ptr->row_lengths = typeCalloc(int, (size_t) nrow + 1);
 	}
     }
-    if (value == 0) {
+    if (value == NULL) {
 	value = empty;
 	*value = '\0';
     }
@@ -421,7 +421,7 @@ void
 free_edit_field(FIELD *f)
 {
     FieldAttrs *ptr = field_attrs(f);
-    if (ptr != 0) {
+    if (ptr != NULL) {
 	free(ptr->row_lengths);
 	free(ptr);
     }
diff --git a/test/filter.c b/test/filter.c
index a11c08592..66c511025 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -30,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.40 2024/11/30 16:49:53 tom Exp $
+ * $Id: filter.c,v 1.41 2024/12/07 22:40:19 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -264,12 +264,12 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 /*
  * Cancel xterm's alternate-screen mode (from dialog -TD)
  */
-#define isprivate(s) ((s) != 0 && strstr(s, "\033[?") != 0)
+#define isprivate(s) ((s) != NULL && strstr(s, "\033[?") != NULL)
 static void
 cancel_altscreen(void)
 {
     if (isatty(fileno(stdout))
-	&& key_mouse != 0	/* xterm and kindred */
+	&& key_mouse != NULL	/* xterm and kindred */
 	&& isprivate(enter_ca_mode)
 	&& isprivate(exit_ca_mode)) {
 	/*
@@ -292,8 +292,8 @@ cancel_altscreen(void)
 	 * implementation of alternate-screen in rxvt, etc., which clear more
 	 * of the display than they should.
 	 */
-	enter_ca_mode = 0;
-	exit_ca_mode = 0;
+	enter_ca_mode = NULL;
+	exit_ca_mode = NULL;
     }
 }
 #endif
@@ -380,7 +380,7 @@ main(int argc, char *argv[])
     if (i_option) {
 	initscr();
     } else {
-	if (newterm((char *) 0, stdout, stdin) == 0) {
+	if (newterm((char *) 0, stdout, stdin) == NULL) {
 	    fprintf(stderr, "cannot initialize terminal\n");
 	    ExitProgram(EXIT_FAILURE);
 	}
diff --git a/test/foldkeys.c b/test/foldkeys.c
index bb3801e28..d7205b146 100644
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $
+ * $Id: foldkeys.c,v 1.13 2024/12/07 23:03:07 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -55,7 +55,7 @@ log_last_line(WINDOW *win)
 {
     FILE *fp;
 
-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
 	char temp[256];
 	int y, x, n;
 	int need = sizeof(temp) - 1;
@@ -112,7 +112,7 @@ demo_foldkeys(void)
     for (code = 0; code < STRCOUNT; ++code) {
 	NCURSES_CONST char *name = strnames[code];
 	NCURSES_CONST char *value = tigetstr(name);
-	if (value != 0 && value != (NCURSES_CONST char *) -1) {
+	if (value != NULL && value != (NCURSES_CONST char *) -1) {
 	    info[info_len].name = strnames[code];
 	    info[info_len].code = key_defined(value);
 	    info[info_len].value = value;
@@ -129,7 +129,7 @@ demo_foldkeys(void)
      */
     for (code = KEY_MAX; code < MAX_KEYS; ++code) {
 	NCURSES_CONST char *name = keyname(code);
-	if (name != 0) {
+	if (name != NULL) {
 	    info[info_len].name = name;
 	    info[info_len].code = code;
 	    info[info_len].value = tigetstr(name);
@@ -156,7 +156,7 @@ demo_foldkeys(void)
 		      final) == 3
 	    && *final != ';'
 	    && (need = strlen(info[j].value)) != 0
-	    && (value = strdup(info[j].value)) != 0) {
+	    && (value = strdup(info[j].value)) != NULL) {
 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
 	    _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
 	    for (k = 0; k < info_len; ++k) {
@@ -232,7 +232,7 @@ main(int argc, char *argv[])
     if (optind < argc)
 	usage(FALSE);
 
-    if (newterm(0, stdout, stdin) == 0) {
+    if (newterm(NULL, stdout, stdin) == NULL) {
 	fprintf(stderr, "Cannot initialize terminal\n");
 	ExitProgram(EXIT_FAILURE);
     }
@@ -262,7 +262,7 @@ main(int argc, char *argv[])
 	printw("Keycode %d, name %s%s\n",
 	       ch,
 	       escaped ? "ESC-" : "",
-	       name != 0 ? name : "<null>");
+	       name != NULL ? name : "<null>");
 	log_last_line(stdscr);
 	clrtoeol();
 	if (ch == 'q')
diff --git a/test/form_driver_w.c b/test/form_driver_w.c
index ff60f45cb..327281b49 100644
--- a/test/form_driver_w.c
+++ b/test/form_driver_w.c
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: form_driver_w.c,v 1.18 2024/10/06 23:13:40 tom Exp $
+ * $Id: form_driver_w.c,v 1.19 2024/12/07 22:32:11 tom Exp $
  *
  * Test form_driver_w (int, int, wchar_t), a wide char aware
  * replacement of form_driver.
@@ -74,7 +74,7 @@ main(int argc, char *argv[])
 	"  ^D,^Q,ESC           - quit program",
 	"  <Tab>,<Down>        - move to next field",
 	"  <BackTab>,<Up>      - move to previous field",
-	0
+	NULL
     };
 
 #define NUM_FIELDS 3
diff --git a/test/gdc.c b/test/gdc.c
index e1d452f1f..5a7635933 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.63 2024/11/30 18:56:02 tom Exp $
+ * $Id: gdc.c,v 1.64 2024/12/07 22:32:11 tom Exp $
  */
 
 #include <test.priv.h>
@@ -294,8 +294,8 @@ main(int argc, char *argv[])
     InitAndCatch({
 	if (redirected) {
 	    NCURSES_CONST char *name = getenv("TERM");
-	    if (name == 0
-		|| newterm(name, ofp, ifp) == 0) {
+	    if (name == NULL
+		|| newterm(name, ofp, ifp) == NULL) {
 		fprintf(stderr, "cannot open terminal\n");
 		ExitProgram(EXIT_FAILURE);
 	    }
diff --git a/test/inch_wide.c b/test/inch_wide.c
index 7359a9c58..ce9c30f5d 100644
--- a/test/inch_wide.c
+++ b/test/inch_wide.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inch_wide.c,v 1.14 2024/10/06 23:14:31 tom Exp $
+ * $Id: inch_wide.c,v 1.15 2024/12/07 22:32:11 tom Exp $
  */
 /*
        int in_wch(cchar_t *wcval);
@@ -70,11 +70,11 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	" h,j,k,l (and arrow-keys) - move viewport",
 	" w                        - recur to new window",
 	"                            for next input file",
-	0
+	NULL
     };
 
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int j;
     int txt_x = 0, txt_y = 0;
@@ -82,7 +82,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     cchar_t ch;
     cchar_t text[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -110,7 +110,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((j = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(j)) != OK) {
 		break;
@@ -155,7 +155,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    break;
 	case 'w':
 	    test_inchs(level + 1, argv, chrwin, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/inchs.c b/test/inchs.c
index 211ca9d66..5298d5436 100644
--- a/test/inchs.c
+++ b/test/inchs.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inchs.c,v 1.20 2024/10/06 21:17:54 tom Exp $
+ * $Id: inchs.c,v 1.21 2024/12/07 22:32:11 tom Exp $
  *
  * Author: Thomas E Dickey
  */
@@ -80,17 +80,17 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	" h,j,k,l (and arrow-keys) - move viewport",
 	" w                        - recur to new window",
 	"                            for next input file",
-	0
+	NULL
     };
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch, j;
     int txt_x = 0, txt_y = 0;
     int base_y;
     chtype text[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -109,7 +109,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	txtwin = stdscr;
 	base_y = BASE_Y;
     }
-    if (txtwin == 0)
+    if (txtwin == NULL)
 	failed("cannot create txtwin");
 
     keypad(txtwin, TRUE);	/* enable keyboard mapping */
@@ -120,7 +120,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((j = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(j)) != OK) {
 		break;
@@ -165,7 +165,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    break;
 	case 'w':
 	    test_inchs(level + 1, argv, chrwin, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/ins_wide.c b/test/ins_wide.c
index 7887f695f..e316a3277 100644
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: ins_wide.c,v 1.31 2024/10/05 19:26:24 tom Exp $
+ * $Id: ins_wide.c,v 1.32 2024/12/07 22:32:11 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -225,9 +225,9 @@ test_inserts(int level)
     int row2, col2;
     int length;
     wchar_t buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((int) (m_opt ? oMove : oDefault)
 				| (int) ((w_opt || (level > 0))
diff --git a/test/insdelln.c b/test/insdelln.c
index 7fc841416..5488b94fa 100644
--- a/test/insdelln.c
+++ b/test/insdelln.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: insdelln.c,v 1.17 2024/10/06 21:08:52 tom Exp $
+ * $Id: insdelln.c,v 1.18 2024/12/07 22:32:11 tom Exp $
  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */
@@ -71,7 +71,7 @@ color_params(unsigned state, int *pair)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (has_colors()) {
 	static bool first = TRUE;
@@ -107,7 +107,7 @@ video_params(unsigned state, unsigned *attr)
     };
     /* *INDENT-ON* */
 
-    const char *result = 0;
+    const char *result = NULL;
 
     if (state < SIZEOF(table)) {
 	*attr = table[state].attr;
@@ -144,9 +144,9 @@ show_status(WINDOW *win, STATUS * sp)
     getyx(win, y, x);
     wmove(win, 0, 0);
     wprintw(win, "Count %d", sp->count);
-    if (sp->v_msg != 0)
+    if (sp->v_msg != NULL)
 	wprintw(win, " Video %s", sp->v_msg);
-    if (sp->c_msg != 0)
+    if (sp->c_msg != NULL)
 	wprintw(win, " Color %s", sp->c_msg);
     wclrtoeol(win);
     wmove(win, y, x);
@@ -165,10 +165,10 @@ do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
 			  sp->y_beg + 1, sp->x_beg + 1);
 
-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
+    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
 	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
 
-	if (win2 != 0) {
+	if (win2 != NULL) {
 	    box(win1, 0, 0);
 	    wrefresh(win1);
 	    func(win2);
@@ -222,7 +222,7 @@ show_help(WINDOW *win)
 	,"q     quit"
 	,"=     resets count to zero."
 	,"?     shows this help-window"
-	,0
+	,NULL
     };
 
     popup_msg(win, table);
@@ -234,14 +234,14 @@ update_status(WINDOW *win, STATUS * sp)
     switch (sp->ch) {
     case ' ':			/* next test-iteration */
 	if (has_colors()) {
-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
+	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 		}
 	    }
 	} else {
-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
+	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
 	    }
 	}
diff --git a/test/inserts.c b/test/inserts.c
index edc14adcd..6efb513bb 100644
--- a/test/inserts.c
+++ b/test/inserts.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inserts.c,v 1.35 2024/10/05 19:26:24 tom Exp $
+ * $Id: inserts.c,v 1.36 2024/12/07 22:33:32 tom Exp $
  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19
@@ -147,9 +147,9 @@ test_inserts(int level)
     int row2, col2;
     int length;
     char buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((unsigned) (m_opt
 					    ? oMove
diff --git a/test/key_names.c b/test/key_names.c
index fa7fdba63..2a49f1bd3 100644
--- a/test/key_names.c
+++ b/test/key_names.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2007-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: key_names.c,v 1.11 2022/12/04 00:40:11 tom Exp $
+ * $Id: key_names.c,v 1.12 2024/12/07 23:00:37 tom Exp $
  */
 
 #include <test.priv.h>
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
     for (n = -1; n < KEY_MAX + 512; n++) {
 	int check = wcwidth((wchar_t) n);
 	const char *result = check >= 0 ? key_name((wchar_t) n) : "?";
-	if (result != 0)
+	if (result != NULL)
 	    printf("%d(%5o):%s\n", n, n, result);
     }
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/keynames.c b/test/keynames.c
index cae260f63..00f2cc142 100644
--- a/test/keynames.c
+++ b/test/keynames.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2022 Thomas E. Dickey                                     *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2006,2008 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: keynames.c,v 1.13 2022/12/04 00:40:11 tom Exp $
+ * $Id: keynames.c,v 1.14 2024/12/07 23:00:37 tom Exp $
  */
 
 #include <test.priv.h>
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
 
     for (n = -1; n < KEY_MAX + 512; n++) {
 	const char *result = keyname(n);
-	if (result != 0)
+	if (result != NULL)
 	    printf("%d(%5o):%s\n", n, n, result);
     }
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/linedata.h b/test/linedata.h
index f042ab44b..3ca9d4636 100644
--- a/test/linedata.h
+++ b/test/linedata.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2009-2010,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 /*
- * $Id: linedata.h,v 1.8 2020/02/02 23:34:34 tom Exp $
+ * $Id: linedata.h,v 1.9 2024/12/07 23:00:37 tom Exp $
  *
  * Utility functions for reading a line of text from a file.
  */
@@ -55,7 +55,7 @@ failed(const char *s)
 static void
 init_linedata(const char *name)
 {
-    if ((linedata = fopen(name, "r")) == 0) {
+    if ((linedata = fopen(name, "r")) == NULL) {
 	failed(name);
     }
 }
@@ -64,11 +64,11 @@ static int
 read_linedata(WINDOW *work)
 {
     int result;
-    if (linedata != 0) {
+    if (linedata != NULL) {
 	result = fgetc(linedata);
 	if (result == EOF) {
 	    fclose(linedata);
-	    linedata = 0;
+	    linedata = NULL;
 	    result = read_linedata(work);
 	} else {
 	    wrefresh(work);
diff --git a/test/list_keys.c b/test/list_keys.c
index 044119095..aa8a3e573 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.36 2024/11/30 18:07:01 tom Exp $
+ * $Id: list_keys.c,v 1.37 2024/12/07 22:33:32 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -86,7 +86,7 @@ full_name(const char *name)
 {
     const char *result = name;
     int n;
-    for (n = 0; strnames[n] != 0; ++n) {
+    for (n = 0; strnames[n] != NULL; ++n) {
 	if (!strcmp(name, strnames[n])) {
 	    result = strfnames[n];
 	    break;
@@ -104,7 +104,7 @@ show_key(const char *name, bool show)
     if (show && t_opt)
 	fputc('"', stdout);
 
-    if (value != 0 && value != (char *) -1) {
+    if (value != NULL && value != (char *) -1) {
 	while (*value != 0) {
 	    char buffer[10];
 	    int ch = UChar(*value++);
@@ -356,7 +356,7 @@ list_keys(TERMINAL **terms, int count)
 	if (widths2 < check)
 	    widths2 = check;
     }
-    for (j = 0; Name(j) != 0; ++j) {
+    for (j = 0; Name(j) != NULL; ++j) {
 	if (valid_key(Name(j), terms, count)) {
 	    const char *label = f_opt ? full_name(Name(j)) : Name(j);
 	    check = (int) strlen(label);
@@ -399,7 +399,7 @@ list_keys(TERMINAL **terms, int count)
 
     widthsx = widths0 + ((count + 1) * widths2);
 
-    for (j = 0; Name(j) != 0; ++j) {
+    for (j = 0; Name(j) != NULL; ++j) {
 	if (j == 0 || (Type(j) != Type(j - 1)))
 	    draw_line(widthsx);
 	if (valid_key(Name(j), terms, count)) {
@@ -498,7 +498,7 @@ main(int argc, char *argv[])
 	int n;
 	for (n = optind; n < argc; ++n) {
 	    setupterm((NCURSES_CONST char *) argv[n], 1, &status);
-	    if (status > 0 && cur_term != 0) {
+	    if (status > 0 && cur_term != NULL) {
 		terms[found++] = cur_term;
 	    }
 	}
diff --git a/test/move_field.c b/test/move_field.c
index db834140c..a87fb68d5 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: move_field.c,v 1.19 2024/10/06 21:12:35 tom Exp $
+ * $Id: move_field.c,v 1.20 2024/12/07 22:33:32 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -91,7 +91,7 @@ my_help_edit_field(void)
 	const char *code = keyname(commands[n].code);
 	size_t need = 5;
 #ifdef NCURSES_VERSION
-	if ((name = form_request_name(commands[n].result)) == 0)
+	if ((name = form_request_name(commands[n].result)) == NULL)
 #endif
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
@@ -101,9 +101,9 @@ my_help_edit_field(void)
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
-    msgs[used] = 0;
+    msgs[used] = NULL;
     popup_msg2(stdscr, msgs);
-    for (n = 0; msgs[n] != 0; ++n) {
+    for (n = 0; msgs[n] != NULL; ++n) {
 	free(msgs[n]);
     }
     free(msgs);
@@ -444,7 +444,7 @@ demo_forms(void)
 
     all_fields[n] = (FIELD *) 0;
 
-    if ((form = new_form(all_fields)) != 0) {
+    if ((form = new_form(all_fields)) != NULL) {
 	int finished = 0;
 
 	post_form(form);
@@ -466,7 +466,7 @@ demo_forms(void)
 
 	free_form(form);
     }
-    for (c = 0; all_fields[c] != 0; c++) {
+    for (c = 0; all_fields[c] != NULL; c++) {
 	free_edit_field(all_fields[c]);
 	free_field(all_fields[c]);
     }
diff --git a/test/movewindow.c b/test/movewindow.c
index a01b616cf..5039258c1 100644
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.56 2024/10/06 18:44:26 tom Exp $
+ * $Id: movewindow.c,v 1.57 2024/12/07 22:33:32 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -149,7 +149,7 @@ selectcell(WINDOW *parent,
     res.y = uli;
     res.x = ulj;
 
-    if (child != 0) {
+    if (child != NULL) {
 	if (relative) {
 	    getparyx(child, i, j);
 	} else {
@@ -256,20 +256,20 @@ getwindow(WINDOW *parent, PAIR * ul, PAIR * lr)
     bool result = FALSE;
 
     head_line("Use arrows to move cursor, anything else to mark corner 1");
-    if ((tmp = selectcell(parent, 0,
+    if ((tmp = selectcell(parent, NULL,
 			  min_line, min_col,
 			  max_line, max_col,
 			  FALSE,
-			  (bool *) 0)) != 0) {
+			  (bool *) 0)) != NULL) {
 	*ul = *tmp;
 	MvWAddCh(parent, ul->y, ul->x, '*');
 
 	head_line("Use arrows to move cursor, anything else to mark corner 2");
-	if ((tmp = selectcell(parent, 0,
+	if ((tmp = selectcell(parent, NULL,
 			      ul->y, ul->x,
 			      max_line, max_col,
 			      FALSE,
-			      (bool *) 0)) != 0) {
+			      (bool *) 0)) != NULL) {
 	    *lr = *tmp;
 	    MvWAddCh(parent, lr->y, lr->x, '*');
 	    wmove(parent, lr->y, lr->x);
@@ -348,7 +348,7 @@ window2num(const WINDOW *const win)
 static WINDOW *
 parent_of(NCURSES_CONST WINDOW *win)
 {
-    WINDOW *result = 0;
+    WINDOW *result = NULL;
     int n = window2num(win);
     if (n >= 0)
 	result = all_windows[n].parent;
@@ -429,7 +429,7 @@ move_window(WINDOW *win, bool recur)
     WINDOW *parent = parent_of(win);
     bool result = FALSE;
 
-    if (parent != 0) {
+    if (parent != NULL) {
 	bool top = (parent == stdscr);
 	int min_col = top ? COL_MIN : 0;
 	int max_col = top ? COL_MAX : getmaxx(parent);
@@ -445,7 +445,7 @@ move_window(WINDOW *win, bool recur)
 				 min_line, min_col,
 				 max_line, max_col,
 				 FALSE,
-				 &more)) != 0) {
+				 &more)) != NULL) {
 	    int y0, x0;
 	    getbegyx(parent, y0, x0);
 	    /*
@@ -494,7 +494,7 @@ move_derwin(WINDOW *win)
     WINDOW *parent = parent_of(win);
     bool result = FALSE;
 
-    if (parent != 0) {
+    if (parent != NULL) {
 	bool top = (parent == stdscr);
 	int min_col = top ? COL_MIN : 0;
 	int max_col = top ? COL_MAX : getmaxx(parent);
@@ -509,7 +509,7 @@ move_derwin(WINDOW *win)
 				 min_line, min_col,
 				 max_line, max_col,
 				 TRUE,
-				 &more)) != 0) {
+				 &more)) != NULL) {
 	    if (mvderwin(win, tmp->y, tmp->x) != ERR) {
 		refresh_all(win);
 		doupdate();
@@ -577,16 +577,16 @@ static WINDOW *
 create_my_window(WINDOW *current)
 {
     PAIR ul, lr;
-    WINDOW *result = 0;
+    WINDOW *result = NULL;
 
     if (getwindow(stdscr, &ul, &lr)) {
 	result = newwin(lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
-	if (result != 0) {
+	if (result != NULL) {
 	    fill_window(result, 'c');
 	    add_window(stdscr, result);
 	}
     }
-    if (result == 0)
+    if (result == NULL)
 	result = current;
     return result;
 }
@@ -595,16 +595,16 @@ static WINDOW *
 create_my_derwin(WINDOW *parent)
 {
     PAIR ul, lr;
-    WINDOW *result = 0;
+    WINDOW *result = NULL;
 
     if (getwindow(parent, &ul, &lr)) {
 	result = derwin(parent, lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
-	if (result != 0) {
+	if (result != NULL) {
 	    fill_window(result, 'd');
 	    add_window(parent, result);
 	}
     }
-    if (result == 0)
+    if (result == NULL)
 	result = parent;
     return result;
 }
@@ -613,7 +613,7 @@ static WINDOW *
 create_my_subwin(WINDOW *parent)
 {
     PAIR ul, lr;
-    WINDOW *result = 0;
+    WINDOW *result = NULL;
 
     if (getwindow(parent, &ul, &lr)) {
 	result = subwin(parent,
@@ -621,12 +621,12 @@ create_my_subwin(WINDOW *parent)
 			cols_of(ul, lr),
 			ul.y + getbegy(parent),
 			ul.x + getbegx(parent));
-	if (result != 0) {
+	if (result != NULL) {
 	    fill_window(result, 's');
 	    add_window(parent, result);
 	}
     }
-    if (result == 0)
+    if (result == NULL)
 	result = parent;
     return result;
 }
@@ -718,7 +718,7 @@ main(int argc, char *argv[])
     nonl();
     intrflush(stdscr, FALSE);
 
-    add_window(0, current_win = stdscr);
+    add_window(NULL, current_win = stdscr);
 
 #ifdef NCURSES_MOUSE_VERSION
     (void) mousemask(BUTTON1_CLICKED, (mmask_t *) NULL);
diff --git a/test/ncurses.c b/test/ncurses.c
index 6f138cec0..5f4fdf1cc 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.544 2024/11/30 18:54:06 tom Exp $
+$Id: ncurses.c,v 1.545 2024/12/07 23:22:39 tom Exp $
 
 ***************************************************************************/
 
@@ -121,23 +121,23 @@ static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS;
 #endif
 
 #if HAVE_WCSRTOMBS
-#define count_wchars(src, len, state)      wcsrtombs(0,   &src, len, state)
-#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state)
+#define count_wchars(src, len, state)      wcsrtombs(NULL, &src, len, state)
+#define trans_wchars(dst, src, len, state) wcsrtombs(dst,  &src, len, state)
 #define reset_wchars(state) init_mb(state)
 #elif HAVE_WCSTOMBS && HAVE_MBTOWC && HAVE_MBLEN
-#define count_wchars(src, len, state)      wcstombs(0,   src, len)
-#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len)
+#define count_wchars(src, len, state)      wcstombs(NULL, src, len)
+#define trans_wchars(dst, src, len, state) wcstombs(dst,  src, len)
 #define reset_wchars(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
 #define state_unused
 #endif
 
 #if HAVE_MBSRTOWCS
-#define count_mbytes(src, len, state)      mbsrtowcs(0,   &src, len, state)
-#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state)
+#define count_mbytes(src, len, state)      mbsrtowcs(NULL, &src, len, state)
+#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst,  &src, len, state)
 #define reset_mbytes(state) init_mb(state)
 #elif HAVE_MBSTOWCS && HAVE_MBTOWC && HAVE_MBLEN
-#define count_mbytes(src, len, state)      mbstowcs(0,   src, len)
-#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len)
+#define count_mbytes(src, len, state)      mbstowcs(NULL, src, len)
+#define trans_mbytes(dst, src, len, state) mbstowcs(dst,  src, len)
 #define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
 #define state_unused
 #endif
@@ -328,7 +328,7 @@ make_fullwidth_digit(cchar_t *target, int digit)
 
     source[0] = fullwidth_digit(digit + '0');
     source[1] = 0;
-    setcchar(target, source, A_NORMAL, 0, 0);
+    setcchar(target, source, A_NORMAL, 0, NULL);
 }
 #endif
 
@@ -683,7 +683,7 @@ wgetch_help(WINDOW *win, GetchFlags flags)
 	const char *msg = help[n];
 	int row = 1 + (int) (n % chk);
 	int col = (n >= chk) ? COLS / 2 : 0;
-	int flg = ((strstr(msg, "toggle") != 0)
+	int flg = ((strstr(msg, "toggle") != NULL)
 		   && (flags[UChar(*msg)] != FALSE));
 	if (*msg == '^' && ExitOnEscape())
 	    msg = "^[,^q -- quit";
@@ -717,16 +717,16 @@ typedef struct {
     WINDOW *frame;
 } WINSTACK;
 
-static WINSTACK *winstack = 0;
+static WINSTACK *winstack = NULL;
 static unsigned len_winstack = 0;
 
 static void
 forget_boxes(void)
 {
-    if (winstack != 0) {
+    if (winstack != NULL) {
 	free(winstack);
     }
-    winstack = 0;
+    winstack = NULL;
     len_winstack = 0;
 }
 
@@ -737,7 +737,7 @@ remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win)
 
     assert(level < (unsigned) COLS);
 
-    if (winstack == 0) {
+    if (winstack == NULL) {
 	len_winstack = 20;
 	winstack = typeMalloc(WINSTACK, len_winstack);
     } else if (need >= len_winstack) {
@@ -1030,7 +1030,7 @@ resize_wide_boxes(unsigned level, const WINDOW *const win)
 	high -= 2;
 	wide -= 2;
 	werase(winstack[n].text);
-	box_set(winstack[n].frame, 0, 0);
+	box_set(winstack[n].frame, NULL, NULL);
 	wnoutrefresh(winstack[n].frame);
 	wprintw(winstack[n].text,
 		"size %dx%d\n",
@@ -1048,7 +1048,7 @@ static char *
 wcstos(const wchar_t *src)
 {
     int need;
-    char *result = 0;
+    char *result = NULL;
     const wchar_t *tmp = src;
 #ifndef state_unused
     mbstate_t state;
@@ -1057,11 +1057,11 @@ wcstos(const wchar_t *src)
     reset_wchars(state);
     if ((need = (int) count_wchars(tmp, 0, &state)) > 0) {
 	unsigned have = (unsigned) need;
-	if ((result = typeCalloc(char, have + 1)) != 0) {
+	if ((result = typeCalloc(char, have + 1)) != NULL) {
 	    tmp = src;
 	    if (trans_wchars(result, tmp, have, &state) != have) {
 		free(result);
-		result = 0;
+		result = NULL;
 	    }
 	} else {
 	    failed("wcstos");
@@ -1124,7 +1124,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
 		for (n = 0; (wchar_buf[n] = (wchar_t) wint_buf[n]) != 0; ++n) {
 		    ;
 		}
-		if ((temp = wcstos(wchar_buf)) != 0) {
+		if ((temp = wcstos(wchar_buf)) != NULL) {
 		    wprintw(win, "I saw %d characters:\n\t`%s'.",
 			    (int) wcslen(wchar_buf), temp);
 		    free(temp);
@@ -1161,7 +1161,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
 		WINDOW *wb = newwin(high, wide, new_y, new_x);
 		WINDOW *wi = newwin(high - 2, wide - 2, new_y + 1, new_x + 1);
 
-		box_set(wb, 0, 0);
+		box_set(wb, NULL, NULL);
 		wrefresh(wb);
 		wmove(wi, 0, 0);
 		remember_boxes(level, wi, wb);
@@ -1614,7 +1614,7 @@ attr_getc(int *skip,
 		Repaint();
 		break;
 	    case HELP_KEY_1:
-		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
+		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
 		    box(helpwin, 0, 0);
 		    attr_legend(helpwin);
 		    wGetchar(helpwin);
@@ -1837,7 +1837,7 @@ set_wide_background(NCURSES_PAIRS_T pair)
 
     blank[0] = ' ';
     blank[1] = 0;
-    setcchar(&normal, blank, A_NORMAL, pair, 0);
+    setcchar(&normal, blank, A_NORMAL, pair, NULL);
     bkgrnd(&normal);
     bkgrndset(&normal);
 }
@@ -1854,7 +1854,7 @@ get_wide_background(void)
     if (getbkgrnd(&ch) != ERR) {
 	wchar_t wch[CCHARW_MAX];
 
-	if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) {
+	if (getcchar(&ch, wch, &attr, &pair, NULL) != ERR) {
 	    result = attr;
 	}
     }
@@ -1895,17 +1895,17 @@ wide_show_attr(WINDOW *win,
 	    wchar_t fill[2];
 	    fill[0] = *s;
 	    fill[1] = L'\0';
-	    setcchar(&ch, fill, attr, pair, 0);
+	    setcchar(&ch, fill, attr, pair, NULL);
 	    (void) wadd_wch(win, &ch);
 	}
     } else {
 	attr_t old_attr = 0;
 	NCURSES_PAIRS_T old_pair = 0;
 
-	(void) (wattr_get) (win, &old_attr, &old_pair, 0);
-	(void) wattr_set(win, attr, pair, 0);
+	(void) (wattr_get) (win, &old_attr, &old_pair, NULL);
+	(void) wattr_set(win, attr, pair, NULL);
 	(void) waddwstr(win, wide_attr_test_string);
-	(void) wattr_set(win, old_attr, old_pair, 0);
+	(void) wattr_set(win, old_attr, old_pair, NULL);
     }
     if (skip)
 	printw("%*s", skip, " ");
@@ -1969,8 +1969,8 @@ wide_attr_getc(int *skip,
 		Repaint();
 		break;
 	    case HELP_KEY_1:
-		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
-		    box_set(helpwin, 0, 0);
+		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
+		    box_set(helpwin, NULL, NULL);
 		    attr_legend(helpwin);
 		    wGetchar(helpwin);
 		    delwin(helpwin);
@@ -2074,7 +2074,7 @@ x_attr_test(bool recur GCC_UNUSED)
 	    set_wide_background(pair);
 	    erase();
 
-	    box_set(stdscr, 0, 0);
+	    box_set(stdscr, NULL, NULL);
 	    MvAddStr(0, 20, "Character attribute test display");
 
 	    for (j = 0; j < my_size; ++j) {
@@ -2258,7 +2258,7 @@ color_test(bool recur GCC_UNUSED)
     int col_limit;
     int row_limit;
     int per_row;
-    char *numbered = 0;
+    char *numbered = NULL;
     const char *hello;
     bool done = FALSE;
     bool opt_acsc = FALSE;
@@ -2275,7 +2275,7 @@ color_test(bool recur GCC_UNUSED)
     }
 
     numbered = typeCalloc(char, COLS + 1);
-    done = ((COLS < 16) || (numbered == 0));
+    done = ((COLS < 16) || (numbered == NULL));
 
     /*
      * Because the number of colors is usually a power of two, we also use
@@ -2481,7 +2481,7 @@ color_test(bool recur GCC_UNUSED)
 	    }
 	    break;
 	case HELP_KEY_1:
-	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
+	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
 		box(helpwin, 0, 0);
 		color_legend(helpwin, FALSE);
 		wGetchar(helpwin);
@@ -2527,7 +2527,7 @@ x_color_test(bool recur GCC_UNUSED)
     int col_limit;
     int row_limit;
     int per_row;
-    char *numbered = 0;
+    char *numbered = NULL;
     const char *hello;
     bool done = FALSE;
     bool opt_acsc = FALSE;
@@ -2537,7 +2537,7 @@ x_color_test(bool recur GCC_UNUSED)
     bool opt_nums = FALSE;
     bool opt_xchr = FALSE;
     int opt_zoom = 0;
-    wchar_t *buffer = 0;
+    wchar_t *buffer = NULL;
     WINDOW *helpwin;
 
     if (!UseColors) {
@@ -2546,7 +2546,7 @@ x_color_test(bool recur GCC_UNUSED)
     }
     numbered = typeCalloc(char, COLS + 1);
     buffer = typeCalloc(wchar_t, COLS + 1);
-    done = ((COLS < 16) || (numbered == 0) || (buffer == 0));
+    done = ((COLS < 16) || (numbered == NULL) || (buffer == NULL));
 
     /*
      * Because the number of colors is usually a power of two, we also use
@@ -2765,7 +2765,7 @@ x_color_test(bool recur GCC_UNUSED)
 	    }
 	    break;
 	case HELP_KEY_1:
-	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
+	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
 		box(helpwin, 0, 0);
 		color_legend(helpwin, TRUE);
 		wGetchar(helpwin);
@@ -2875,14 +2875,14 @@ init_all_colors(bool xterm_colors, NCURSES_CONST char *palette_file)
 	}
 	reset_prog_mode();
     }
-    if (palette_file != 0) {
+    if (palette_file != NULL) {
 	FILE *fp = fopen(palette_file, "r");
-	if (fp != 0) {
+	if (fp != NULL) {
 	    char buffer[BUFSIZ];
 	    int red, green, blue;
 	    int scale = 1000;
 	    int c;
-	    while (fgets(buffer, sizeof(buffer), fp) != 0) {
+	    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
 		if (sscanf(buffer, "scale:%d", &c) == 1) {
 		    scale = c;
 		    if (scale < 100)
@@ -3387,7 +3387,7 @@ slk_test(bool recur GCC_UNUSED)
 	case '8':
 	    MvAddStr(SLK_WORK, 0, "Please enter the label value: ");
 	    _nc_STRCPY(buf, "", sizeof(buf));
-	    if ((s = slk_label(c - '0')) != 0) {
+	    if ((s = slk_label(c - '0')) != NULL) {
 		_nc_STRNCPY(buf, s, (size_t) 8);
 	    }
 	    wGetstring(stdscr, buf, 8);
@@ -3508,7 +3508,7 @@ x_slk_test(bool recur GCC_UNUSED)
 	case '8':
 	    MvAddStr(SLK_WORK, 0, "Please enter the label value: ");
 	    *buf = 0;
-	    if ((s = slk_label(c - '0')) != 0) {
+	    if ((s = slk_label(c - '0')) != NULL) {
 		char *temp = strdup(s);
 		size_t used = strlen(temp);
 		size_t want = SLKLEN;
@@ -3821,7 +3821,7 @@ acs_test(bool recur GCC_UNUSED)
     int c = 'a';
     int pagesize = 32;
     char *term = getenv("TERM");
-    const char *pch_kludge = ((term != 0 && strstr(term, "linux"))
+    const char *pch_kludge = ((term != NULL && strstr(term, "linux"))
 			      ? "p=PC, "
 			      : "");
     attr_t attr = A_NORMAL;
@@ -3831,7 +3831,7 @@ acs_test(bool recur GCC_UNUSED)
     int bg = COLOR_BLACK;
     unsigned at_code = 0;
     NCURSES_PAIRS_T pair = 0;
-    void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = 0;
+    void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = NULL;
     ATTR_TBL my_list[SIZEOF(attrs_to_test)];
     unsigned my_size = init_attr_list(my_list, termattrs());
 
@@ -3864,12 +3864,12 @@ acs_test(bool recur GCC_UNUSED)
 	case '2':
 	case '3':
 	    digit = (c - '0');
-	    last_show_acs = 0;
+	    last_show_acs = NULL;
 	    break;
 	case '-':
 	    if (digit > 0) {
 		--digit;
-		last_show_acs = 0;
+		last_show_acs = NULL;
 	    } else {
 		beep();
 	    }
@@ -3877,7 +3877,7 @@ acs_test(bool recur GCC_UNUSED)
 	case '+':
 	    if (digit < 3) {
 		++digit;
-		last_show_acs = 0;
+		last_show_acs = NULL;
 	    } else {
 		beep();
 	    }
@@ -3901,7 +3901,7 @@ acs_test(bool recur GCC_UNUSED)
 	}
 	if (pagesize != 32) {
 	    show_256_chars(repeat, attr, pair);
-	} else if (last_show_acs != 0) {
+	} else if (last_show_acs != NULL) {
 	    last_show_acs(repeat, attr, pair);
 	} else {
 	    show_upper_chars(digit * pagesize + 128, pagesize, repeat, attr, pair);
@@ -3941,8 +3941,8 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p
 	TEST_CCHAR(src, {
 	    attr |= (test_attrs & A_ALTCHARSET);
 	    setcchar(dst, test_wch, attr, pair, NULL);
-	}, {
-	    ;
+	}
+	, {;
 	});
     } while (0);
     return dst;
@@ -3981,7 +3981,7 @@ show_paged_widechars(unsigned base,
 
 	memset(&codes, 0, sizeof(codes));
 	codes[0] = code;
-	setcchar(&temp, codes, attr, pair, 0);
+	setcchar(&temp, codes, attr, pair, NULL);
 	move(row, col);
 	if (wcwidth(code) == 0 && code != 0) {
 	    AddCh((chtype) space |
@@ -4020,7 +4020,7 @@ show_upper_widechars(unsigned first, int repeat, int space, attr_t attr, NCURSES
 
 	memset(&codes, 0, sizeof(codes));
 	codes[0] = code;
-	setcchar(&temp, codes, attr, pair, 0);
+	setcchar(&temp, codes, attr, pair, NULL);
 
 	do {
 	    int y, x;
@@ -4298,10 +4298,10 @@ show_2_wacs(int n, const char *name, const char *code, attr_t attr, NCURSES_PAIR
     char temp[80];
 
     MvPrintw(row, col, "%*s : ", COLS / 4, name);
-    (void) attr_set(attr, pair, 0);
+    (void) attr_set(attr, pair, NULL);
     _nc_STRNCPY(temp, code, 20);
     addstr(temp);
-    (void) attr_set(A_NORMAL, 0, 0);
+    (void) attr_set(A_NORMAL, 0, NULL);
     return n + 1;
 }
 
@@ -4373,7 +4373,7 @@ x_acs_test(bool recur GCC_UNUSED)
     int bg = COLOR_BLACK;
     unsigned at_code = 0;
     NCURSES_PAIRS_T pair = 0;
-    void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0;
+    void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = NULL;
     W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)];
     unsigned my_size = init_w_attr_list(my_list, term_attrs());
     char at_page[20];
@@ -4436,26 +4436,26 @@ x_acs_test(bool recur GCC_UNUSED)
 		    at_page[--len] = '\0';
 	    } else if (c < 256 && isdigit(c)) {
 		digit = (unsigned) (c - '0');
-		last_show_wacs = 0;
+		last_show_wacs = NULL;
 	    } else if (c == '+') {
 		++digit;
 		_nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit);
-		last_show_wacs = 0;
+		last_show_wacs = NULL;
 	    } else if (c == '-' && digit > 0) {
 		--digit;
 		_nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x",
 			    UChar(digit));
-		last_show_wacs = 0;
+		last_show_wacs = NULL;
 	    } else if (c == '>' && repeat < (COLS / 4)) {
 		++repeat;
 	    } else if (c == '<' && repeat > 1) {
 		--repeat;
 	    } else if (c == '_') {
 		space = (space == ' ') ? '_' : ' ';
-		last_show_wacs = 0;
+		last_show_wacs = NULL;
 	    } else if (cycle_w_attr(c, &at_code, &attr, my_list, my_size)
 		       || cycle_colors(c, &fg, &bg, &pair)) {
-		if (last_show_wacs != 0)
+		if (last_show_wacs != NULL)
 		    break;
 	    } else {
 		beep();
@@ -4465,7 +4465,7 @@ x_acs_test(bool recur GCC_UNUSED)
 	}
 	if (pagesize != 32) {
 	    show_paged_widechars(digit, pagesize, repeat, space, attr, pair);
-	} else if (last_show_wacs != 0) {
+	} else if (last_show_wacs != NULL) {
 	    last_show_wacs(repeat, attr, pair);
 	} else {
 	    show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
@@ -4615,7 +4615,7 @@ FRAME
 static WINDOW *
 frame_win(FRAME * curp)
 {
-    return (curp != 0) ? curp->wind : stdscr;
+    return (curp != NULL) ? curp->wind : stdscr;
 }
 
 /* We need to know if these flags are actually set, so don't look in FRAME.
@@ -4834,7 +4834,7 @@ getwindow(void)
     outerbox(ul, lr, TRUE);
     refresh();
 
-    if (rwindow != 0)
+    if (rwindow != NULL)
 	wrefresh(rwindow);
 
     move(0, 0);
@@ -4865,9 +4865,9 @@ newwin_move(FRAME * curp, int dy, int dx)
 static FRAME *
 delete_framed(FRAME * fp, bool showit)
 {
-    FRAME *np = 0;
+    FRAME *np = NULL;
 
-    if (fp != 0) {
+    if (fp != NULL) {
 	fp->last->next = fp->next;
 	fp->next->last = fp->last;
 
@@ -4905,7 +4905,7 @@ scroll_test(bool recur GCC_UNUSED)
 	transient((FRAME *) 0, (char *) 0);
 	switch (c) {
 	case CTRL('C'):
-	    if ((neww = typeCalloc(FRAME, (size_t) 1)) == 0) {
+	    if ((neww = typeCalloc(FRAME, (size_t) 1)) == NULL) {
 		failed("scroll_test");
 		goto breakout;
 	    }
@@ -4915,7 +4915,7 @@ scroll_test(bool recur GCC_UNUSED)
 		goto breakout;
 	    }
 
-	    if (current == 0) {	/* First element,  */
+	    if (current == NULL) {	/* First element,  */
 		neww->next = neww;	/*   so point it at itself */
 		neww->last = neww;
 	    } else {
@@ -4970,7 +4970,7 @@ scroll_test(bool recur GCC_UNUSED)
 
 #if HAVE_PUTWIN && HAVE_GETWIN
 	case CTRL('W'):	/* save and delete window */
-	    if ((current != 0) && (current == current->next)) {
+	    if ((current != NULL) && (current == current->next)) {
 		transient(current, "Will not save/delete ONLY window");
 		break;
 	    } else if ((fp = fopen(DUMPFILE, "w")) == (FILE *) 0) {
@@ -4991,13 +4991,13 @@ scroll_test(bool recur GCC_UNUSED)
 	    if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) {
 		transient(current, "Can't open screen dump file");
 	    } else {
-		if ((neww = typeCalloc(FRAME, (size_t) 1)) != 0) {
+		if ((neww = typeCalloc(FRAME, (size_t) 1)) != NULL) {
 
-		    neww->next = current ? current->next : 0;
+		    neww->next = current ? current->next : NULL;
 		    neww->last = current;
-		    if (neww->last != 0)
+		    if (neww->last != NULL)
 			neww->last->next = neww;
-		    if (neww->next != 0)
+		    if (neww->next != NULL)
 			neww->next->last = neww;
 
 		    neww->wind = getwin(fp);
@@ -5119,7 +5119,7 @@ scroll_test(bool recur GCC_UNUSED)
 	 && (c != ERR));
 
   breakout:
-    while (current != 0)
+    while (current != NULL)
 	current = delete_framed(current, FALSE);
 
     scrollok(stdscr, TRUE);	/* reset to driver's default */
@@ -5180,7 +5180,7 @@ saywhat(NCURSES_CONST char *text)
 {
     wmove(stdscr, LINES - 1, 0);
     wclrtoeol(stdscr);
-    if (text != 0 && *text != '\0') {
+    if (text != NULL && *text != '\0') {
 	waddstr(stdscr, text);
 	waddstr(stdscr, "; ");
     }
@@ -5194,10 +5194,10 @@ static PANEL *
 mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx)
 {
     WINDOW *win;
-    PANEL *pan = 0;
+    PANEL *pan = NULL;
 
-    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
-	if ((pan = new_panel(win)) == 0) {
+    if ((win = newwin(rows, cols, tly, tlx)) != NULL) {
+	if ((pan = new_panel(win)) == NULL) {
 	    delwin(win);
 	} else if (UseColors) {
 	    NCURSES_COLOR_T fg = (NCURSES_COLOR_T) ((color == COLOR_BLUE)
@@ -5337,7 +5337,8 @@ canned_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST char *cmd)
 }
 
 static int
-demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (NCURSES_CONST PANEL *))
+demo_panels(void (*InitPanel) (WINDOW *),
+	    void (*FillPanel) (NCURSES_CONST PANEL *))
 {
     int count;
     int itmp;
@@ -5927,7 +5928,7 @@ pad_test(bool recur GCC_UNUSED)
 {
     WINDOW *panpad = newpad(PAD_HIGH, PAD_WIDE);
 
-    if (panpad == 0) {
+    if (panpad == NULL) {
 	Cannot("cannot create requested pad");
 	return ERR;
     }
@@ -5990,7 +5991,7 @@ flushinp_test(bool recur GCC_UNUSED)
     getbegyx(win, by, bx);
     sw = w / 3;
     sh = h / 3;
-    if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == 0)
+    if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == NULL)
 	return ERR;
 
 #ifdef A_COLOR
@@ -6138,7 +6139,7 @@ menu_test(bool recur GCC_UNUSED)
     refresh();
 
     for (ap = animals; *ap; ap++) {
-	if ((*ip = new_item(*ap, "")) != 0)
+	if ((*ip = new_item(*ap, "")) != NULL)
 	    ++ip;
     }
     *ip = (ITEM *) 0;
@@ -6216,8 +6217,8 @@ tracetrace(unsigned tlevel)
     static size_t need = 12;
     int n;
 
-    if (buf == 0) {
-	for (n = 0; t_tbl[n].name != 0; n++)
+    if (buf == NULL) {
+	for (n = 0; t_tbl[n].name != NULL; n++)
 	    need += strlen(t_tbl[n].name) + 2;
 	buf = typeMalloc(char, need);
 	if (!buf)
@@ -6228,7 +6229,7 @@ tracetrace(unsigned tlevel)
 	_nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need);
 	_nc_STRCAT(buf, ", ", need);
     } else {
-	for (n = 1; t_tbl[n].name != 0; n++)
+	for (n = 1; t_tbl[n].name != NULL; n++)
 	    if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) {
 		_nc_STRCAT(buf, t_tbl[n].name, need);
 		_nc_STRCAT(buf, ", ", need);
@@ -6260,14 +6261,14 @@ run_trace_menu(MENU * m)
 	    i = current_item(m);
 	    if (i == items[0]) {
 		if (item_value(i)) {
-		    for (p = items + 1; *p != 0; p++)
+		    for (p = items + 1; *p != NULL; p++)
 			if (item_value(*p)) {
 			    set_item_value(*p, FALSE);
 			    changed = TRUE;
 			}
 		}
 	    } else {
-		for (p = items + 1; *p != 0; p++)
+		for (p = items + 1; *p != NULL; p++)
 		    if (item_value(*p)) {
 			set_item_value(items[0], FALSE);
 			changed = TRUE;
@@ -6300,8 +6301,8 @@ trace_set(bool recur GCC_UNUSED)
 
     refresh();
 
-    for (n = 0; t_tbl[n].name != 0; n++) {
-	if ((*ip = new_item(t_tbl[n].name, "")) != 0) {
+    for (n = 0; t_tbl[n].name != NULL; n++) {
+	if ((*ip = new_item(t_tbl[n].name, "")) != NULL) {
 	    ++ip;
 	}
     }
@@ -6431,7 +6432,7 @@ edit_secure(FIELD *me, int c)
 	size_t need = 80 + have;
 	char *temp = malloc(need);
 
-	if (temp != 0) {
+	if (temp != NULL) {
 	    size_t len;
 	    _nc_STRNCPY(temp, source ? source : "", have + 1);
 	    len = (size_t) (char *) field_userptr(me);
@@ -6735,7 +6736,7 @@ form_test(bool recur GCC_UNUSED)
     set_field_type(f[n - 1], fty_passwd);
     f[n] = (FIELD *) 0;
 
-    if ((form = new_form(f)) != 0) {
+    if ((form = new_form(f)) != NULL) {
 	WINDOW *w;
 	int finished = 0;
 
@@ -6764,7 +6765,7 @@ form_test(bool recur GCC_UNUSED)
 
 	free_form(form);
     }
-    for (c = 0; f[c] != 0; c++)
+    for (c = 0; f[c] != NULL; c++)
 	free_field(f[c]);
     free_fieldtype(fty_middle);
     free_fieldtype(fty_passwd);
@@ -6798,7 +6799,7 @@ make_overlap(int n)
     getmaxyx(stdscr, y, x);
     if (y < 23 || x < 80) {
 	Cannot("The screen is too small for this test");
-	result = 0;
+	result = NULL;
     } else {
 	int ymax = y - (overlap_HEAD + overlap_FOOT);
 	int high = ymax / 5;	/* equal-sized parts for cross */
@@ -7206,9 +7207,9 @@ overlap_test(bool recur GCC_UNUSED)
     int shift = 0, last_refresh = -1;
     int state, flavor[OVERLAP_FLAVORS];
 
-    if ((win1 = make_overlap(0)) == 0) {
+    if ((win1 = make_overlap(0)) == NULL) {
 	return ERR;
-    } else if ((win2 = make_overlap(1)) == 0) {
+    } else if ((win2 = make_overlap(1)) == NULL) {
 	delwin(win1);
 	return ERR;
     }
@@ -7406,9 +7407,9 @@ x_overlap_test(bool recur GCC_UNUSED)
     int shift = 0, last_refresh = -1;
     int state, flavor[OVERLAP_FLAVORS];
 
-    if ((win1 = make_overlap(0)) == 0) {
+    if ((win1 = make_overlap(0)) == NULL) {
 	return ERR;
-    } else if ((win2 = make_overlap(1)) == 0) {
+    } else if ((win2 = make_overlap(1)) == NULL) {
 	delwin(win1);
 	return ERR;
     }
@@ -7902,7 +7903,7 @@ main(int argc, char *argv[])
     bool monochrome = FALSE;
 #if HAVE_COLOR_CONTENT
     bool xterm_colors = FALSE;
-    NCURSES_CONST char *palette_file = 0;
+    NCURSES_CONST char *palette_file = NULL;
 #endif
 
     setlocale(LC_ALL, "");
@@ -7972,7 +7973,7 @@ main(int argc, char *argv[])
 #endif
 #ifdef TRACE
 	case 'D':
-	    save_trace = (unsigned) strtol(optarg, 0, 0);
+	    save_trace = (unsigned) strtol(optarg, NULL, 0);
 	    break;
 #endif
 #if HAVE_COLOR_CONTENT
diff --git a/test/padview.c b/test/padview.c
index 5893c7d03..356f5fc8c 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -29,7 +29,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.26 2024/11/30 18:14:46 tom Exp $
+ * $Id: padview.c,v 1.27 2024/12/07 22:40:19 tom Exp $
  */
 
 #include <test.priv.h>
@@ -124,7 +124,7 @@ read_file(const char *filename)
     size_t len;
     struct stat sb;
     char *my_blob;
-    char **my_vec = 0;
+    char **my_vec = NULL;
     WINDOW *my_pad;
 
     if (stat(filename, &sb) != 0
@@ -136,11 +136,11 @@ read_file(const char *filename)
 	failed("input is empty");
     }
 
-    if ((fp = fopen(filename, "r")) == 0) {
+    if ((fp = fopen(filename, "r")) == NULL) {
 	failed("cannot open input-file");
     }
 
-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) {
+    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) {
 	failed("cannot allocate memory for input-file");
     }
 
@@ -171,7 +171,7 @@ read_file(const char *filename)
 	}
 	num_lines = k;
 	if (pass == 0) {
-	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
+	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) {
 		failed("cannot allocate line-vector #1");
 	    }
 	} else {
@@ -199,7 +199,7 @@ read_file(const char *filename)
     }
     width = (width + 1) * 5;
     my_pad = newpad(height, width);
-    if (my_pad == 0)
+    if (my_pad == NULL)
 	failed("cannot allocate pad workspace");
     if (try_color) {
 	wattrset(my_pad, COLOR_PAIR(my_pair));
@@ -301,7 +301,7 @@ main(int argc, char *argv[])
 	"  s              - use entered count for halfdelay() parameter",
 	"                 - if no entered count, stop nodelay()",
 	"  <space>        - begin nodelay()",
-	0
+	NULL
     };
 
     int ch;
@@ -337,9 +337,9 @@ main(int argc, char *argv[])
 #ifdef TRACE
 	case 'D':
 	    {
-		char *next = 0;
+		char *next = NULL;
 		int tvalue = (int) strtol(optarg, &next, 0);
-		if (tvalue < 0 || (next != 0 && *next != 0))
+		if (tvalue < 0 || (next != NULL && *next != 0))
 		    usage(FALSE);
 		curses_trace((unsigned) tvalue);
 	    }
diff --git a/test/pair_content.c b/test/pair_content.c
index 75ec8230a..096a4ffcb 100644
--- a/test/pair_content.c
+++ b/test/pair_content.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: pair_content.c,v 1.24 2024/11/30 18:31:01 tom Exp $
+ * $Id: pair_content.c,v 1.25 2024/12/07 22:45:15 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -181,7 +181,7 @@ run_test(void)
 	my_color_t fg;
 	my_color_t bg;
 	if (PairContent(pair, &fg, &bg) == OK) {
-	    if (expected != 0) {
+	    if (expected != NULL) {
 		if (fg != expected[pair].fg)
 		    success = FALSE;
 		if (bg != expected[pair].bg)
diff --git a/test/picsmap.c b/test/picsmap.c
index 294be84a5..a0b7897e7 100644
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.152 2024/11/30 21:39:57 tom Exp $
+ * $Id: picsmap.c,v 1.153 2024/12/07 22:48:03 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -109,7 +109,7 @@ static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
 static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
 static int gather_c_values(int);
 
-static FILE *logfp = 0;
+static FILE *logfp = NULL;
 static double aspect_ratio = 0.6;
 static bool in_curses = FALSE;
 static bool debugging = FALSE;
@@ -138,7 +138,7 @@ static bool use_extended_colors = FALSE;
 static void
 logmsg(const char *fmt, ...)
 {
-    if (logfp != 0) {
+    if (logfp != NULL) {
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(logfp, fmt, ap);
@@ -151,7 +151,7 @@ logmsg(const char *fmt, ...)
 static void
 logmsg2(const char *fmt, ...)
 {
-    if (logfp != 0) {
+    if (logfp != NULL) {
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(logfp, fmt, ap);
@@ -163,7 +163,7 @@ logmsg2(const char *fmt, ...)
 static void
 close_log(void)
 {
-    if (logfp != 0) {
+    if (logfp != NULL) {
 	logmsg("Allocations:");
 	logmsg("%8ld file", (long) how_much.file);
 	logmsg("%8ld name", (long) how_much.name);
@@ -174,7 +174,7 @@ close_log(void)
 	logmsg("%8ld cell", (long) how_much.cell);
 	logmsg("%8ld window", LINES * COLS * (long) sizeof(NCURSES_CH_T));
 	fclose(logfp);
-	logfp = 0;
+	logfp = NULL;
     }
 }
 
@@ -199,7 +199,7 @@ failed(const char *msg)
 static void
 warning(const char *fmt, ...)
 {
-    if (logfp != 0) {
+    if (logfp != NULL) {
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(logfp, fmt, ap);
@@ -219,7 +219,7 @@ warning(const char *fmt, ...)
 static void
 free_data(char **data)
 {
-    if (data != 0) {
+    if (data != NULL) {
 	free(data[0]);
 	free(data);
     }
@@ -228,12 +228,12 @@ free_data(char **data)
 static PICS_HEAD *
 free_pics_head(PICS_HEAD * pics)
 {
-    if (pics != 0) {
+    if (pics != NULL) {
 	free(pics->fgcol);
 	free(pics->cells);
 	free(pics->name);
 	free(pics);
-	pics = 0;
+	pics = NULL;
     }
     return pics;
 }
@@ -305,14 +305,14 @@ gather_c_values(int fg)
     reading_ncols[next].count = 0;
 
     check_c_values(__LINE__);
-    if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != 0) {
+    if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != NULL) {
 	found = P2I(*ft);
     } else {
 	if (reading_last + 2 >= reading_size) {
 	    int more = ((MAX(reading_last, reading_size) + 2) * 3) / 2;
 	    int last = reading_last + 1;
 	    FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols);
-	    if (p == 0)
+	    if (p == NULL)
 		goto done;
 
 	    reading_size = more;
@@ -323,7 +323,7 @@ gather_c_values(int fg)
 	}
 	++reading_last;
 	how_much.pair += sizeof(FG_NODE);
-	if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != 0) {
+	if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != NULL) {
 	    found = P2I(*ft);
 	    if (found != next)
 		logmsg("OOPS expected slot %d, got %d", next, found);
@@ -370,24 +370,24 @@ finish_c_values(PICS_HEAD * head)
 
     reading_last = 0;
     reading_size = 0;
-    reading_ncols = 0;
+    reading_ncols = NULL;
 }
 
 static void
 dispose_c_values(void)
 {
 #if HAVE_TSEARCH
-    if (reading_ntree != 0) {
+    if (reading_ntree != NULL) {
 	int n;
 	for (n = 0; n < reading_last; ++n) {
 	    tdelete(I2P(n), &reading_ntree, compare_c_values);
 	}
-	reading_ntree = 0;
+	reading_ntree = NULL;
     }
 #endif
-    if (reading_ncols != 0) {
+    if (reading_ncols != NULL) {
 	free(reading_ncols);
-	reading_ncols = 0;
+	reading_ncols = NULL;
     }
     reading_last = 0;
     reading_size = 0;
@@ -413,7 +413,7 @@ is_file(const char *filename, struct stat *sb)
 static char **
 read_file(const char *filename)
 {
-    char **result = 0;
+    char **result = NULL;
     struct stat sb;
 
     if (!quiet) {
@@ -430,9 +430,9 @@ read_file(const char *filename)
 	result = typeCalloc(char *, size + 1);
 	how_much.file += ((size + 1) * 2);
 
-	if (blob != 0 && result != 0) {
+	if (blob != NULL && result != NULL) {
 	    FILE *fp = fopen(filename, "r");
-	    if (fp != 0) {
+	    if (fp != NULL) {
 		logmsg("opened %s", filename);
 
 		if (fread(blob, sizeof(char), size, fp) == size) {
@@ -457,7 +457,7 @@ read_file(const char *filename)
 			    result[k++] = blob + j;
 			}
 		    }
-		    result[k] = 0;
+		    result[k] = NULL;
 		    if (k && !binary) {
 			debugmsg2("[%5d] %s\n", k, result[k - 1]);
 		    }
@@ -471,7 +471,7 @@ read_file(const char *filename)
 	    debugmsg("...file is empty");
 	    free(blob);
 	    free(result);
-	    result = 0;
+	    result = NULL;
 	} else if (binary) {
 	    debugmsg("...file is non-text");
 	}
@@ -548,20 +548,20 @@ static char **
 read_palette(const char *filename)
 {
     static const char *data_dir = DATA_DIR;
-    char **result = 0;
+    char **result = NULL;
     size_t last = strlen(filename);
     size_t need = (strlen(data_dir) + 20 + last);
     char *full_name = malloc(need);
     char *s;
     struct stat sb;
 
-    if (full_name != 0) {
+    if (full_name != NULL) {
 	int tries;
 	for (tries = 0; tries < 8; ++tries) {
 
 	    *(s = full_name) = '\0';
 	    if (tries & 1) {
-		if (strchr(filename, '/') == 0) {
+		if (strchr(filename, '/') == NULL) {
 		    _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir);
 		} else {
 		    continue;
@@ -582,7 +582,7 @@ read_palette(const char *filename)
 		    if (*t == '-') {
 			if (sscanf(t, "-%d%c", &num, &chr) == 2 &&
 			    chr == 'c' &&
-			    (tc = strchr(t, chr)) != 0 &&
+			    (tc = strchr(t, chr)) != NULL &&
 			    !(strncmp) (tc, "color", 5)) {
 			    found = 1;
 			}
@@ -622,7 +622,7 @@ read_palette(const char *filename)
 static void
 init_palette(const char *palette_file)
 {
-    if (palette_file != 0) {
+    if (palette_file != NULL) {
 	char **data = read_palette(palette_file);
 
 	all_colors = typeMalloc(RGB_DATA, (unsigned) COLORS);
@@ -641,12 +641,12 @@ init_palette(const char *palette_file)
 #else
 	memset(all_colors, 0, sizeof(RGB_DATA) * (size_t) COLORS);
 #endif
-	if (data != 0) {
+	if (data != NULL) {
 	    int n;
 	    int red, green, blue;
 	    int scale = MaxSCALE;
 	    int c;
-	    for (n = 0; data[n] != 0; ++n) {
+	    for (n = 0; data[n] != NULL; ++n) {
 		if (sscanf(data[n], "scale:%d", &c) == 1) {
 		    scale = c;
 		} else if (sscanf(data[n], "%d:%d %d %d",
@@ -677,9 +677,9 @@ init_palette(const char *palette_file)
 	}
 
 	if ((power2 != COLORS) || ((shift % 3) != 0)) {
-	    if (all_colors == 0) {
+	    if (all_colors == NULL) {
 		init_palette(getenv("TERM"));
-		if (all_colors == 0) {
+		if (all_colors == NULL) {
 		    giveup("With %d colors, you need a palette-file", COLORS);
 		}
 	    }
@@ -704,7 +704,7 @@ map_color(int value)
 	int green = (value & 0x00ff00) >> 8;
 	int blue  = (value & 0x0000ff) >> 0;
 
-	if (all_colors != 0) {
+	if (all_colors != NULL) {
 #define Diff2(n,m) ((m) - all_colors[n].m) * ((m) - all_colors[n].m)
 #define Diff2S(n) Diff2(n,red) + Diff2(n,green) + Diff2(n,blue)
 	    int d2 = Diff2S(0);
@@ -823,7 +823,7 @@ match_c(const char *source, const char *pattern, ...)
 		limit = -1;
 		ip = va_arg(ap, int *);
 		lv = strtol(source, &cp, ch == 'd' ? 10 : 16);
-		if (cp != 0 && cp != source) {
+		if (cp != NULL && cp != source) {
 		    *ip = (int) lv;
 		    source = cp;
 		} else {
@@ -834,13 +834,13 @@ match_c(const char *source, const char *pattern, ...)
 		/* floating point for pixels... */
 		fp = va_arg(ap, float *);
 		lv = strtol(source, &cp, 10);
-		if (cp == 0 || cp == source)
+		if (cp == NULL || cp == source)
 		    goto finish;
 		*fp = (float) lv;
 		source = cp;
 		if (*source == '.') {
 		    lv = strtol(++source, &cp, 10);
-		    if (cp == 0 || cp == source)
+		    if (cp == NULL || cp == source)
 			goto finish;
 		    {
 			float scale = 1.0f;
@@ -907,7 +907,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3)
 	    s += cpp;
 	    while (*s++ == '\t') {
 		char *t;
-		for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) {
+		for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == NULL;) {
 		    if (*s == ' ') {
 			s = skip_cs(s);
 			break;
@@ -915,7 +915,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3)
 		    *t++ = *s++;
 		    *t = '\0';
 		}
-		for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == 0;) {
+		for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == NULL;) {
 		    *t++ = *s++;
 		    *t = '\0';
 		}
@@ -938,14 +938,14 @@ parse_rgb(char **data)
     char *s, *t;
     size_t item = 0;
     size_t need;
-    RGB_NAME *result = 0;
+    RGB_NAME *result = NULL;
 
-    for (need = 0; data[need] != 0; ++need) ;
+    for (need = 0; data[need] != NULL; ++need) ;
 
     result = typeCalloc(RGB_NAME, need + 2);
     how_much.name += (sizeof(RGB_NAME) * (need + 2));
 
-    for (n = 0; data[n] != 0; ++n) {
+    for (n = 0; data[n] != NULL; ++n) {
 	if (strlen(t = data[n]) >= sizeof(buf) - 1)
 	    continue;
 	t = strcpy(buf, t);
@@ -993,10 +993,10 @@ CaselessCmp(const char *a, const char *b)
 static RGB_NAME *
 lookup_rgb(const char *name)
 {
-    RGB_NAME *result = 0;
-    if (rgb_table != 0) {
+    RGB_NAME *result = NULL;
+    if (rgb_table != NULL) {
 	int n;
-	for (n = 0; rgb_table[n].name != 0; ++n) {
+	for (n = 0; rgb_table[n].name != NULL; ++n) {
 	    if (!CaselessCmp(name, rgb_table[n].name)) {
 		result = &rgb_table[n];
 		break;
@@ -1029,7 +1029,7 @@ parse_xbm(char **data)
     gather_c_values(0);
     gather_c_values(0xffffff);
 
-    for (n = 0; data[n] != 0; ++n) {
+    for (n = 0; data[n] != NULL; ++n) {
 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
 	    continue;
 	switch (state) {
@@ -1037,10 +1037,10 @@ parse_xbm(char **data)
 	case 1:
 	case 2:
 	    if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) {
-		if ((t = strstr(buf, "_width")) != 0) {
+		if ((t = strstr(buf, "_width")) != NULL) {
 		    state |= 1;
 		    result->wide = (short) bytes_of(num);
-		} else if ((t = strstr(buf, "_height")) != 0) {
+		} else if ((t = strstr(buf, "_height")) != NULL) {
 		    state |= 2;
 		    result->high = (short) num;
 		} else {
@@ -1067,7 +1067,7 @@ parse_xbm(char **data)
 		result->cells = typeCalloc(PICS_CELL, cells);
 		how_much.cell += (sizeof(PICS_CELL) * cells);
 
-		if ((s = strchr(s, L_CURLY)) == 0)
+		if ((s = strchr(s, L_CURLY)) == NULL)
 		    break;
 		++s;
 	    } else {
@@ -1147,14 +1147,14 @@ parse_xpm(char **data)
     char arg1[BUFSIZ];
     char arg2[BUFSIZ];
     char arg3[BUFSIZ];
-    char **list = 0;
+    char **list = NULL;
 
     debugmsg("called parse_xpm");
 
     result = typeCalloc(PICS_HEAD, 1);
     how_much.head += sizeof(PICS_HEAD);
 
-    for (n = 0; data[n] != 0; ++n) {
+    for (n = 0; data[n] != NULL; ++n) {
 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
 	    continue;
 	s = strcpy(buf, s);
@@ -1201,7 +1201,7 @@ parse_xpm(char **data)
 	    num_colors++;
 	    free(list[reading_last]);
 	    list[reading_last] = strdup(arg1);
-	    if ((by_name = lookup_rgb(arg3)) != 0) {
+	    if ((by_name = lookup_rgb(arg3)) != NULL) {
 		found = gather_c_values(by_name->value);
 	    } else if (*arg3 == '#') {
 		char *rgb = arg3 + 1;
@@ -1227,7 +1227,7 @@ parse_xpm(char **data)
 	    if (num_colors >= result->colors) {
 		finish_c_values(result);
 		state = 4;
-		if (list[0] == 0)
+		if (list[0] == NULL)
 		    list[0] = strdup("\033");
 	    }
 	    break;
@@ -1239,7 +1239,7 @@ parse_xpm(char **data)
 
 		    /* FIXME - factor out */
 		    for (c = 0; c < result->colors; ++c) {
-			if (list[c] == 0) {
+			if (list[c] == NULL) {
 			    /* should not happen... */
 			    continue;
 			}
@@ -1314,8 +1314,8 @@ parse_img(const char *filename)
     result = typeCalloc(PICS_HEAD, 1);
     how_much.head += sizeof(PICS_HEAD);
 
-    if ((pp = popen(cmd, "r")) != 0) {
-	if (fgets(buffer, sizeof(buffer), pp) != 0) {
+    if ((pp = popen(cmd, "r")) != NULL) {
+	if (fgets(buffer, sizeof(buffer), pp) != NULL) {
 	    size_t n = strlen(filename);
 	    debugmsg2("...read %s", buffer);
 	    if (strlen(buffer) > n &&
@@ -1341,12 +1341,12 @@ parse_img(const char *filename)
 	_nc_STRCAT(cmd, " 2>/dev/null", need);
 
     logmsg("...opening pipe to %s", cmd);
-    if ((pp = popen(cmd, "r")) != 0) {
+    if ((pp = popen(cmd, "r")) != NULL) {
 	int count = 0;
 	int col = 0;
 	int row = 0;
 	int len = 0;
-	while (fgets(buffer, sizeof(buffer), pp) != 0) {
+	while (fgets(buffer, sizeof(buffer), pp) != NULL) {
 	    debugmsg2("[%5d] %s", count + 1, buffer);
 	    if (strlen(buffer) > 160) {		/* 80 columns would be enough */
 		okay = FALSE;
@@ -1380,7 +1380,7 @@ parse_img(const char *filename)
 		const char *t = s;
 		bool matched = FALSE;
 
-		if (s != 0) {
+		if (s != NULL) {
 		    /* after the "#RGB", there are differences - just ignore */
 		    while (*s != '\0' && !isspace(UChar(*s)))
 			++s;
@@ -1472,11 +1472,11 @@ static PICS_HEAD *
 read_picture(const char *filename, char **data)
 {
     PICS_HEAD *pics;
-    if ((pics = parse_xbm(data)) == 0) {
+    if ((pics = parse_xbm(data)) == NULL) {
 	dispose_c_values();
-	if ((pics = parse_xpm(data)) == 0) {
+	if ((pics = parse_xpm(data)) == NULL) {
 	    dispose_c_values();
-	    if ((pics = parse_img(filename)) == 0) {
+	    if ((pics = parse_img(filename)) == NULL) {
 		dispose_c_values();
 		free_data(data);
 		warning("unexpected file-format for \"%s\"", filename);
@@ -1638,7 +1638,7 @@ report_colors(PICS_HEAD * pics)
     int total;
     char buffer[256];
 
-    if (logfp == 0)
+    if (logfp == NULL)
 	return;
 
     qsort(pics->fgcol, (size_t) pics->colors, sizeof(FG_NODE), compare_fg_counts);
@@ -1729,7 +1729,7 @@ main(int argc, char *argv[])
     int ch;
     int opt_d = FALSE;
     char ignore_ch;
-    const char *palette_path = 0;
+    const char *palette_path = NULL;
     const char *rgb_path = RGB_PATH;
 
     while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) {
@@ -1751,7 +1751,7 @@ main(int argc, char *argv[])
 	    debugging = TRUE;
 	    break;
 	case 'F':
-	    if ((logfp = fopen(optarg, "a")) == 0)
+	    if ((logfp = fopen(optarg, "a")) == NULL)
 		failed(optarg);
 	    break;
 	case 'p':
@@ -1810,11 +1810,11 @@ main(int argc, char *argv[])
 	    PICS_HEAD *pics;
 	    char **data = read_file(argv[n]);
 
-	    if (data == 0) {
+	    if (data == NULL) {
 		warning("cannot read \"%s\"", argv[n]);
 		continue;
 	    }
-	    if ((pics = read_picture(argv[n], data)) != 0) {
+	    if ((pics = read_picture(argv[n], data)) != NULL) {
 		if (in_curses) {
 		    show_picture(pics);
 		} else {
diff --git a/test/popup_msg.c b/test/popup_msg.c
index 245bb5878..7bacfacb2 100644
--- a/test/popup_msg.c
+++ b/test/popup_msg.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: popup_msg.c,v 1.14 2024/10/26 19:28:11 Stas.Sergeev Exp $
+ * $Id: popup_msg.c,v 1.15 2024/12/07 22:22:51 tom Exp $
  *
  * Show a multi-line message in a window which may extend beyond the screen.
  *
@@ -78,16 +78,16 @@ popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
     int last_y;
     int ch = ERR;
 
-    for (n = 0; msg[n] != 0; ++n) {
+    for (n = 0; msg[n] != NULL; ++n) {
 	int check = (int) strlen(msg[n]);
 	if (width < check)
 	    width = check;
     }
     length = n;
 
-    if ((help = newwin(high, wide, y0, x0)) == 0)
+    if ((help = newwin(high, wide, y0, x0)) == NULL)
 	return;
-    if ((data = newpad(length + 2, width + 1)) == 0) {
+    if ((data = newpad(length + 2, width + 1)) == NULL) {
 	delwin(help);
 	return;
     }
diff --git a/test/railroad.c b/test/railroad.c
index fa9590a29..f119311d0 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.27 2024/10/05 19:26:24 tom Exp $
+ * $Id: railroad.c,v 1.28 2024/12/07 22:48:03 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -83,13 +83,13 @@ PutChar(int ch)
 static void
 Backup(void)
 {
-    tputs(backup != 0 ? backup : "\b", 1, outc);
+    tputs(backup != NULL ? backup : "\b", 1, outc);
 }
 
 static void
 MyShowCursor(int flag)
 {
-    if (startC != 0 && finisC != 0) {
+    if (startC != NULL && finisC != NULL) {
 	tputs(flag ? startC : finisC, 1, outc);
     }
 }
@@ -97,7 +97,7 @@ MyShowCursor(int flag)
 static void
 StandOut(int flag)
 {
-    if (startS != 0 && finisS != 0) {
+    if (startS != NULL && finisS != NULL) {
 	tputs(flag ? startS : finisS, 1, outc);
     }
 }
@@ -105,7 +105,7 @@ StandOut(int flag)
 static void
 Underline(int flag)
 {
-    if (startU != 0 && finisU != 0) {
+    if (startU != NULL && finisU != NULL) {
 	tputs(flag ? startU : finisU, 1, outc);
     }
 }
@@ -116,7 +116,7 @@ ShowSign(char *string)
     const char *base = string;
     int first, last;
 
-    if (moveit != 0) {
+    if (moveit != NULL) {
 	tputs(tgoto(moveit, 0, height - 1), 1, outc);
 	tputs(wipeit, 1, outc);
     }
@@ -124,7 +124,7 @@ ShowSign(char *string)
     while (*string != 0) {
 	int ch = *string;
 	if (ch != ' ') {
-	    if (moveit != 0) {
+	    if (moveit != NULL) {
 		for (first = length - 2; first >= (string - base); first--) {
 		    if (first < length - 1) {
 			tputs(tgoto(moveit, first + 1, height - 1), 1, outc);
@@ -152,7 +152,7 @@ ShowSign(char *string)
 		    Underline(0);
 		}
 	    }
-	    if (moveit != 0)
+	    if (moveit != NULL)
 		Backup();
 	}
 	StandOut(1);
@@ -161,7 +161,7 @@ ShowSign(char *string)
 	fflush(stdout);
 	string++;
     }
-    if (moveit != 0)
+    if (moveit != NULL)
 	tputs(wipeit, 1, outc);
     putchar('\n');
 }
@@ -190,7 +190,7 @@ railroad(char **args)
     char area[1024], *ap = area;
     int z;
 
-    if (name == 0)
+    if (name == NULL)
 #ifdef EXP_WIN32_DRIVER
 	name = "ms-terminal";
 #else
@@ -205,12 +205,12 @@ railroad(char **args)
 	length = tgetnum("co");
 	moveit = tgetstr("cm", &ap);
 
-	if (wipeit == 0
-	    || moveit == 0
+	if (wipeit == NULL
+	    || moveit == NULL
 	    || height <= 0
 	    || length <= 0) {
-	    wipeit = 0;
-	    moveit = 0;
+	    wipeit = NULL;
+	    moveit = NULL;
 	    height = 0;
 	    length = 0;
 	}
@@ -276,7 +276,7 @@ main(int argc, char *argv[])
     } else {
 	static char world[] = "Hello World";
 	static char *hello[] =
-	{world, 0};
+	{world, NULL};
 	railroad(hello);
     }
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/rain.c b/test/rain.c
index 06a5ff4f2..75bc9f6b9 100644
--- a/test/rain.c
+++ b/test/rain.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: rain.c,v 1.62 2024/10/06 21:09:00 tom Exp $
+ * $Id: rain.c,v 1.63 2024/12/07 22:46:42 tom Exp $
  */
 #include <test.priv.h>
 #include <popup_msg.h>
@@ -335,7 +335,7 @@ main(int argc, char *argv[])
 	" s          do single-step",
 	" <space>    undo single-step",
 	"",
-	0
+	NULL
     };
 
     bool done = FALSE;
diff --git a/test/redraw.c b/test/redraw.c
index bdc7bdd8e..9605ac64c 100644
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.18 2024/10/06 21:17:54 tom Exp $
+ * $Id: redraw.c,v 1.19 2024/12/07 22:46:42 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
@@ -76,7 +76,7 @@ test_redraw(WINDOW *win)
 	"",
 	"Other control characters are added to the screen in printable form.",
 	"Other printable characters are added to the screen as is.",
-	0
+	NULL
     };
 
     WINDOW *win1;
diff --git a/test/savescreen.c b/test/savescreen.c
index 91a3c04ca..092a09761 100644
--- a/test/savescreen.c
+++ b/test/savescreen.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: savescreen.c,v 1.66 2024/11/30 18:48:40 tom Exp $
+ * $Id: savescreen.c,v 1.67 2024/12/07 22:46:42 tom Exp $
  *
  * Demonstrate save/restore functions from the curses library.
  * Thomas Dickey - 2007/7/14
@@ -89,7 +89,7 @@ cleanup(char *files[])
     if (!keep_dumps) {
 	int n;
 
-	for (n = 0; files[n] != 0; ++n) {
+	for (n = 0; files[n] != NULL; ++n) {
 	    unlink(files[n]);
 	}
     }
@@ -173,7 +173,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors)
     NCURSES_CONST char *filename = files[which];
     bool dumped = FALSE;
 
-    if (filename != 0) {
+    if (filename != NULL) {
 	dumped = TRUE;
 	show_what(color, ++which, last);
 	if (scr_dump(filename) == ERR) {
@@ -230,7 +230,7 @@ editor_help(void)
 	"   a           toggle between '#' and graphic symbol for drawing",
 	"   c           change color drawn by line to next in palette",
 	"   h,j,k,l or arrows to move around the screen, drawing",
-	0
+	NULL
     };
     popup_msg(stdscr, msgs);
 }
@@ -247,7 +247,7 @@ replay_help(void)
 	"   q           quit",
 	"   <space>     load the next screen",
 	"   <backspace> load the previous screen",
-	0
+	NULL
     };
     popup_msg(stdscr, msgs);
 }
@@ -286,7 +286,7 @@ main(int argc, char *argv[])
     bool replaying = FALSE;
     bool done = FALSE;
     char **files;
-    NCURSES_CONST char *fill_by = 0;
+    NCURSES_CONST char *fill_by = NULL;
 #if USE_WIDEC_SUPPORT
     cchar_t mycc;
     static const wchar_t mywc[2] =
@@ -366,7 +366,7 @@ main(int argc, char *argv[])
 	 * After that, use color pairs for constructing a test-pattern, e.g.,
 	 * imitating xterm's scripts.
 	 */
-	if (fill_by == 0) {
+	if (fill_by == NULL) {
 	    if (COLORS <= 256) {
 		for (n = 0; n < COLORS; ++n)
 		    init_pair((short) (n + MAX_ANSI), (short) n, (short) n);
@@ -407,7 +407,7 @@ main(int argc, char *argv[])
 	    }
 #endif
 	}
-	if ((fill_by == 0) && !replaying) {
+	if ((fill_by == NULL) && !replaying) {
 #if USE_WIDEC_SUPPORT
 	    int cube = 0;
 #endif
@@ -484,9 +484,9 @@ main(int argc, char *argv[])
 	}
     }
 
-    if (fill_by != 0) {
+    if (fill_by != NULL) {
 	FILE *fp = fopen(fill_by, "r");
-	if (fp != 0) {
+	if (fp != NULL) {
 	    bool filled = FALSE;
 	    move(1, 0);
 	    while ((ch = fgetc(fp)) != EOF) {
@@ -577,7 +577,7 @@ main(int argc, char *argv[])
 	int x = 0;
 	int color = 0;
 	int altchars = 0;
-	bool dirty = use_colors || (fill_by != 0);
+	bool dirty = use_colors || (fill_by != NULL);
 
 	while (!done) {
 	    switch (get_command(color, which, last)) {
diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c
index 72b20cfb0..ba0c09fde 100644
--- a/test/sp_tinfo.c
+++ b/test/sp_tinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
  * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 /*
- * $Id: sp_tinfo.c,v 1.29 2023/06/24 14:14:56 tom Exp $
+ * $Id: sp_tinfo.c,v 1.30 2024/12/07 23:03:07 tom Exp $
  *
  * TOTO: add option for non-sp-funcs interface
  */
@@ -138,7 +138,7 @@ static void
 show_string(MYDATA * data, const char *name, const char *value)
 {
     fprintf(data->fp, " %s = ", name);
-    if (value == 0) {
+    if (value == NULL) {
 	fprintf(data->fp, "(missing)");
     } else if (value == (char *) -1) {
 	fprintf(data->fp, "(canceled)");
@@ -218,7 +218,7 @@ do_stuff(MYDATA * data)
     define_key_sp(sp, my_text, my_code);
     has_key_sp(sp, 0);
     key_defined_sp(sp, my_text);
-    if ((s = keybound_sp(sp, my_code, 0)) != 0)
+    if ((s = keybound_sp(sp, my_code, 0)) != NULL)
 	free(s);
 #endif
     keyname_sp(sp, '?');
@@ -240,7 +240,7 @@ do_stuff(MYDATA * data)
     typeahead_sp(sp, FALSE);	/* waddch */
     use_env_sp(sp, FALSE);	/* newterm */
     use_tioctl_sp(sp, FALSE);	/* newterm */
-    intrflush_sp(sp, 0, 0);	/* wgetch */
+    intrflush_sp(sp, NULL, 0);	/* wgetch */
     flushinp_sp(sp);		/* waddch */
     halfdelay_sp(sp, 5);	/* wgetch */
 
diff --git a/test/tclock.c b/test/tclock.c
index 8491c5efc..da56918eb 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.49 2024/10/05 18:47:56 tom Exp $ */
+/* $Id: tclock.c,v 1.50 2024/12/07 22:46:42 tom Exp $ */
 
 #define NEED_TIME_H
 #include <test.priv.h>
@@ -220,7 +220,7 @@ main(int argc, char *argv[])
     for (;;) {
 	napms(100);
 
-	tim = time(0);
+	tim = time(NULL);
 	t = localtime(&tim);
 
 	hours = (t->tm_hour + (t->tm_min / 60.0));
diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c
index 2c5e91156..7d6f34a59 100644
--- a/test/test_add_wchstr.c
+++ b/test/test_add_wchstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_add_wchstr.c,v 1.35 2024/10/05 19:26:24 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.36 2024/12/07 22:41:11 tom Exp $
  *
  * Demonstrate the waddwchstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -88,7 +88,7 @@ static cchar_t *temp_buffer;
 static size_t temp_length;
 
 #define TempBuffer(source_len, source_cast) \
-    if (source != 0) { \
+    if (source != NULL) { \
 	const char *temp; \
 	size_t need = source_len + 1; \
 	wchar_t have[2]; \
@@ -107,7 +107,7 @@ static size_t temp_length;
 	    if (!pass_ctls \
 	     && have[0] != 0 \
 	     && have[0] < 256 \
-	     && (temp = unctrl((chtype) have[0])) != 0 \
+	     && (temp = unctrl((chtype) have[0])) != NULL \
 	     && strlen(temp) > 1) { \
 		while (*temp != '\0') { \
 		    have[0] = (wchar_t) *temp++; \
@@ -117,9 +117,9 @@ static size_t temp_length;
 		setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \
 	    } \
 	} while (have[0] != 0); \
-    } else if (temp_buffer != 0) { \
+    } else if (temp_buffer != NULL) { \
 	free(temp_buffer); \
-	temp_buffer = 0; \
+	temp_buffer = NULL; \
 	temp_length = 0; \
     } \
     return temp_buffer;
@@ -136,7 +136,7 @@ ChWLen(const wchar_t *source)
 	for (n = 0; source[n] != 0; ++n) {
 	    const char *s;
 
-	    if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) {
+	    if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != NULL) {
 		adjust += (strlen(s) - 1);
 	    }
 	}
@@ -310,9 +310,9 @@ recursive_test(int level)
     int row2, col2;
     int length;
     wchar_t buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((unsigned) (m_opt
 					    ? oMove
diff --git a/test/test_addchstr.c b/test/test_addchstr.c
index 1de86c07b..55834c666 100644
--- a/test/test_addchstr.c
+++ b/test/test_addchstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addchstr.c,v 1.30 2024/10/05 19:26:24 tom Exp $
+ * $Id: test_addchstr.c,v 1.31 2024/12/07 22:41:11 tom Exp $
  *
  * Demonstrate the waddchstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -82,7 +82,7 @@ ChLen(const char *source)
 
 	for (n = 0; n < result; ++n) {
 	    const char *s = unctrl(UChar(source[n]));
-	    if (s != 0) {
+	    if (s != NULL) {
 		adjust += (strlen(s) - 1);
 	    }
 	}
@@ -94,7 +94,7 @@ ChLen(const char *source)
 static chtype *
 ChStr(const char *source)
 {
-    if (source != 0) {
+    if (source != NULL) {
 	size_t need = ChLen(source) + 1;
 	int n = 0;
 
@@ -107,7 +107,7 @@ ChStr(const char *source)
 	do {
 	    const char *s;
 	    chtype ch = UChar(*source++);
-	    if (!pass_ctls && (s = unctrl(ch)) != 0) {
+	    if (!pass_ctls && (s = unctrl(ch)) != NULL) {
 		while (*s != '\0') {
 		    temp_buffer[n++] = UChar(*s++);
 		}
@@ -116,9 +116,9 @@ ChStr(const char *source)
 	    }
 	} while (source[0] != 0);
 	temp_buffer[n] = 0;
-    } else if (temp_buffer != 0) {
+    } else if (temp_buffer != NULL) {
 	free(temp_buffer);
-	temp_buffer = 0;
+	temp_buffer = NULL;
 	temp_length = 0;
     }
     return temp_buffer;
@@ -218,9 +218,9 @@ recursive_test(int level)
     int row2, col2;
     int length;
     char buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((unsigned) (m_opt
 					    ? oMove
diff --git a/test/test_addstr.c b/test/test_addstr.c
index 940404bb8..8fab6dff7 100644
--- a/test/test_addstr.c
+++ b/test/test_addstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addstr.c,v 1.21 2024/10/05 19:27:33 tom Exp $
+ * $Id: test_addstr.c,v 1.22 2024/12/07 22:41:11 tom Exp $
  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -140,9 +140,9 @@ recursive_test(int level)
     int row2, col2;
     int length;
     char buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((unsigned) (m_opt
 					    ? oMove
diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index cfc4e8177..9ea7b15c5 100644
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.23 2024/10/05 19:27:33 tom Exp $
+ * $Id: test_addwstr.c,v 1.24 2024/12/07 22:41:11 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -233,9 +233,9 @@ recursive_test(int level)
     int row2, col2;
     int length;
     wchar_t buffer[BUFSIZ];
-    WINDOW *look = 0;
-    WINDOW *work = 0;
-    WINDOW *show = 0;
+    WINDOW *look = NULL;
+    WINDOW *work = NULL;
+    WINDOW *show = NULL;
     int margin = (2 * MY_TABSIZE) - 1;
     Options option = (Options) ((unsigned) (m_opt
 					    ? oMove
diff --git a/test/test_arrays.c b/test/test_arrays.c
index d10dcf975..38eacd878 100644
--- a/test/test_arrays.c
+++ b/test/test_arrays.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_arrays.c,v 1.14 2024/11/30 17:00:55 tom Exp $
+ * $Id: test_arrays.c,v 1.15 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -66,7 +66,7 @@ dump_array(const char *name, NCURSES_CONST char *const *list)
     int n;
 
     printf("%s:\n", name);
-    for (n = 0; list[n] != 0; ++n) {
+    for (n = 0; list[n] != NULL; ++n) {
 	printf("%5d:%s\n", n, list[n]);
     }
 }
diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c
index 78887dbb7..fc010a6c5 100644
--- a/test/test_get_wstr.c
+++ b/test/test_get_wstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_get_wstr.c,v 1.16 2024/10/06 23:15:10 tom Exp $
+ * $Id: test_get_wstr.c,v 1.17 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -158,10 +158,10 @@ recursive_test(int level, char **argv, WINDOW *strwin)
 	"",
 	"  w              - recur to subwindow",
 	"  ?,<F1>         - show help-screen",
-	0
+	NULL
     };
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch;
     int rc;
@@ -172,7 +172,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
     int actual;
     wint_t buffer[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -200,7 +200,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((ch = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(ch)) != OK) {
 		break;
@@ -250,7 +250,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
 
 	case 'w':
 	    recursive_test(level + 1, argv, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/test_getstr.c b/test/test_getstr.c
index 15cd4c96b..48e6478d5 100644
--- a/test/test_getstr.c
+++ b/test/test_getstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_getstr.c,v 1.19 2024/10/06 22:36:46 tom Exp $
+ * $Id: test_getstr.c,v 1.20 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -165,10 +165,10 @@ recursive_test(int level, char **argv, WINDOW *strwin)
 	"",
 	"  w              - recur to subwindow",
 	"  ?,<F1>         - show help-screen",
-	0
+	NULL
     };
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch;
     int rc;
@@ -180,7 +180,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
 
     char buffer[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -208,7 +208,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((ch = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(ch)) != OK) {
 		break;
@@ -258,7 +258,7 @@ recursive_test(int level, char **argv, WINDOW *strwin)
 
 	case 'w':
 	    recursive_test(level + 1, argv, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/test_instr.c b/test/test_instr.c
index 80717471a..9ef838968 100644
--- a/test/test_instr.c
+++ b/test/test_instr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_instr.c,v 1.15 2024/10/06 21:11:54 tom Exp $
+ * $Id: test_instr.c,v 1.16 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -83,7 +83,7 @@ show_help(WINDOW *win)
 	,"w     opens new window on the next filename."
 	,"q     quits the current file/window."
 	,"?     shows this help-window"
-	,0
+	,NULL
     };
 
     popup_msg(win, msgs);
@@ -92,8 +92,8 @@ show_help(WINDOW *win)
 static int
 recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch;
     int txt_x = 0, txt_y = 0;
@@ -102,7 +102,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 
     char buffer[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -131,7 +131,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((ch = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(ch)) != OK) {
 		break;
@@ -174,7 +174,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    break;
 	case 'w':
 	    recursive_test(level + 1, argv, chrwin, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/test_inwstr.c b/test/test_inwstr.c
index 1cf5e56f5..8ab10a6d5 100644
--- a/test/test_inwstr.c
+++ b/test/test_inwstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_inwstr.c,v 1.11 2024/10/06 23:15:38 tom Exp $
+ * $Id: test_inwstr.c,v 1.12 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -86,7 +86,7 @@ show_help(WINDOW *win)
 	,"w     opens new window on the next filename."
 	,"q     quits the current file/window."
 	,"?     shows this help-window"
-	,0
+	,NULL
     };
 
     popup_msg(win, msgs);
@@ -95,8 +95,8 @@ show_help(WINDOW *win)
 static int
 recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch;
     int txt_x = 0, txt_y = 0;
@@ -104,7 +104,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     int limit = getmaxx(strwin) - 5;
     wchar_t buffer[MAX_COLS];
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -132,7 +132,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((ch = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(ch)) != OK) {
 		break;
@@ -175,7 +175,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 	    break;
 	case 'w':
 	    recursive_test(level + 1, argv, chrwin, strwin);
-	    if (txtbox != 0) {
+	    if (txtbox != NULL) {
 		touchwin(txtbox);
 		wnoutrefresh(txtbox);
 	    } else {
diff --git a/test/test_opaque.c b/test/test_opaque.c
index 3a032fbe2..65bd0bbc5 100644
--- a/test/test_opaque.c
+++ b/test/test_opaque.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_opaque.c,v 1.17 2024/11/23 19:10:23 tom Exp $
+ * $Id: test_opaque.c,v 1.18 2024/12/07 22:46:42 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -269,8 +269,8 @@ show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active)
 static int
 test_opaque(int level, char **argv, WINDOW *stswin)
 {
-    WINDOW *txtbox = 0;
-    WINDOW *txtwin = 0;
+    WINDOW *txtbox = NULL;
+    WINDOW *txtwin = NULL;
     FILE *fp;
     int ch;
     int txt_x = 0, txt_y = 0;
@@ -278,7 +278,7 @@ test_opaque(int level, char **argv, WINDOW *stswin)
     bool in_status = FALSE;
     int active = 0;
 
-    if (argv[level] == 0) {
+    if (argv[level] == NULL) {
 	beep();
 	return FALSE;
     }
@@ -306,7 +306,7 @@ test_opaque(int level, char **argv, WINDOW *stswin)
     txt_x = 0;
     wmove(txtwin, txt_y, txt_x);
 
-    if ((fp = fopen(argv[level], "r")) != 0) {
+    if ((fp = fopen(argv[level], "r")) != NULL) {
 	while ((ch = fgetc(fp)) != EOF) {
 	    if (waddch(txtwin, UChar(ch)) != OK) {
 		break;
@@ -393,7 +393,7 @@ test_opaque(int level, char **argv, WINDOW *stswin)
 		break;
 	    case 'w':
 		test_opaque(level + 1, argv, stswin);
-		if (txtbox != 0) {
+		if (txtbox != NULL) {
 		    touchwin(txtbox);
 		    wnoutrefresh(txtbox);
 		} else {
diff --git a/test/test_setupterm.c b/test/test_setupterm.c
index 24d7c46c7..f7374f461 100644
--- a/test/test_setupterm.c
+++ b/test/test_setupterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
  * Copyright 2015,2016 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_setupterm.c,v 1.17 2023/06/24 14:19:52 tom Exp $
+ * $Id: test_setupterm.c,v 1.18 2024/12/07 23:03:07 tom Exp $
  *
  * A simple demo of setupterm/restartterm.
  */
@@ -98,9 +98,9 @@ test_rc(NCURSES_CONST char *name, int actual_rc, int actual_err)
     int expect_rc = -1;
     int expect_err = -1;
 
-    if (name == 0)
+    if (name == NULL)
 	name = getenv("TERM");
-    if (name == 0)
+    if (name == NULL)
 	name = "?";
 
     switch (*name) {
@@ -244,7 +244,7 @@ main(int argc, char *argv[])
     }
 
     if (a_opt) {
-	static char predef[][9] =
+	static char predef[][12] =
 	{"vt100", "dumb", "lpr", "unknown", "none-such"};
 	if (optind < argc) {
 	    usage(FALSE);
diff --git a/test/test_sgr.c b/test/test_sgr.c
index f7a7863b5..20cb74052 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.25 2024/10/06 21:05:50 tom Exp $
+ * $Id: test_sgr.c,v 1.26 2024/12/07 22:48:21 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -106,10 +106,10 @@ make_dblist(void)
 static char *
 next_dbitem(void)
 {
-    char *result = 0;
+    char *result = NULL;
 
     if (db_list) {
-	if ((result = db_list[db_item]) == 0) {
+	if ((result = db_list[db_item]) == NULL) {
 	    db_item = 0;
 	    result = db_list[0];
 	} else {
@@ -129,7 +129,7 @@ free_dblist(void)
 	for (n = 0; db_list[n]; ++n)
 	    free(db_list[n]);
 	free(db_list);
-	db_list = 0;
+	db_list = NULL;
     }
 }
 #endif
@@ -230,20 +230,20 @@ brute_force(const char *name)
 				  BITS2P(7),
 				  BITS2P(8),
 				  BITS2P(9));
-	    if (values[count] != 0) {
+	    if (values[count] != NULL) {
 		values[count] = strdup(values[count]);
 	    }
 	}
 	for (count = 0; count < MAXSGR; ++count) {
-	    if (values[count] != 0) {
+	    if (values[count] != NULL) {
 		for (j = count + 1; j < MAXSGR; ++j) {
-		    if (values[j] == 0)
+		    if (values[j] == NULL)
 			continue;
 		    if (strcmp(values[count], values[j]))
 			continue;
 		    if (one_bit(count, j)) {
 			free(values[j]);
-			values[j] = 0;
+			values[j] = NULL;
 		    }
 		}
 	    }
@@ -253,7 +253,7 @@ brute_force(const char *name)
 	    for (count = 0; count < MAXSGR; ++count) {
 		if ((count & mask) != 0)
 		    continue;
-		if (values[count] != 0 && values[count + mask] != 0) {
+		if (values[count] != NULL && values[count + mask] != NULL) {
 		    mask = 0;
 		    break;
 		}
@@ -272,14 +272,14 @@ brute_force(const char *name)
 	    }
 	}
 	for (count = 0; count < MAXSGR; ++count) {
-	    if (values[count] != 0) {
+	    if (values[count] != NULL) {
 		bool found = FALSE;
 		if ((repeat & MASK_SMSO) != 0
 		    && (count & MASK_SMSO) != 0) {
 		    found = TRUE;
 		} else {
 		    for (j = 0; j < count; ++j) {
-			if (values[j] != 0 && !strcmp(values[j], values[count])) {
+			if (values[j] != NULL && !strcmp(values[j], values[count])) {
 			    if ((repeat & MASK_SMSO) != 0
 				&& (j & MASK_SMSO) != 0
 				&& (count & reason) != 0) {
@@ -366,7 +366,7 @@ main(int argc, char *argv[])
 	for (n = optind; n < argc; ++n) {
 	    brute_force(argv[n]);
 	}
-    } else if ((name = getenv("TERM")) != 0) {
+    } else if ((name = getenv("TERM")) != NULL) {
 	brute_force(name);
     } else {
 	static const char dumb[] = "dumb";
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 5a8f65021..7dabe6b11 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.42 2024/10/06 20:50:27 tom Exp $
+ * $Id: test_tparm.c,v 1.43 2024/12/07 23:13:34 tom Exp $
  *
  * Exercise tparm/tiparm, either for all possible capabilities with fixed
  * parameters, or one capability with specific combinations of parameters.
@@ -52,7 +52,7 @@
 	    if (length + 2 >= limit) { \
 		limit *= 2; \
 		array = typeRealloc(char *, limit, array); \
-		if (array == 0) { \
+		if (array == NULL) { \
 		    failed("no memory: " #array); \
 		} \
 	    }
@@ -109,9 +109,9 @@ output_func(int ch)
 static int
 isNumeric(NCURSES_CONST char *source)
 {
-    char *next = 0;
+    char *next = NULL;
     long value = strtol(source, &next, 0);
-    int result = (next == 0 || next == source || *next != '\0') ? 0 : 1;
+    int result = (next == NULL || next == source || *next != '\0') ? 0 : 1;
     (void) value;
     return result;
 }
@@ -121,10 +121,10 @@ relevant(const char *name, const char *value)
 {
     int code = 1;
     if (VALID_STRING(value)) {
-	if (strstr(value, "%p") == 0
-	    && strstr(value, "%d") == 0
-	    && strstr(value, "%s") == 0
-	    && (!p_opt || strstr(value, "$<") == 0)) {
+	if (strstr(value, "%p") == NULL
+	    && strstr(value, "%d") == NULL
+	    && strstr(value, "%s") == NULL
+	    && (!p_opt || strstr(value, "$<") == NULL)) {
 	    if (v_opt > 2)
 		printf("? %s noparams\n", name);
 	    code = 0;
@@ -334,7 +334,7 @@ test_tparm(const char *name, NCURSES_CONST char *format, long *number, char **st
     }
     if (v_opt > 1) {
 	int n;
-	printf(".. %3d =", result != 0 ? (int) strlen(result) : -1);
+	printf(".. %3d =", result != NULL ? (int) strlen(result) : -1);
 	for (n = 0; n < nparam; ++n) {
 	    if (use_strings[n]) {
 		if (number[n]) {
@@ -398,7 +398,7 @@ main(int argc, char *argv[])
     int r_run, t_run, n_run;
     char *old_term = getenv("TERM");
     int r_opt = 1;
-    char *t_opt = 0;
+    char *t_opt = NULL;
 
     int std_caps = 0;		/* predefine items in all_caps[] */
     int len_caps = 0;		/* cur # of items in all_caps[] */
@@ -423,7 +423,10 @@ main(int argc, char *argv[])
     char **str_parms = typeCalloc(char *, max_parms);
     long use_parms = 1;
 
-    if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0)
+    if (all_caps == NULL
+	|| all_terms == NULL
+	|| num_parms == NULL
+	|| str_parms == NULL)
 	failed("no memory");
 
     while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) {
@@ -479,7 +482,7 @@ main(int argc, char *argv[])
      */
     while (optind < argc) {
 	if (isNumeric(argv[optind])) {
-	    char *dummy = 0;
+	    char *dummy = NULL;
 	    long value = strtol(argv[optind], &dummy, 0);
 	    num_parms[len_parms] = (int) value;
 	}
@@ -504,11 +507,11 @@ main(int argc, char *argv[])
      * Make a list of values for $TERM.  Accept "-" for standard input to
      * simplify scripting a check of the whole database.
      */
-    old_term = strdup((old_term == 0) ? "unknown" : old_term);
-    if (t_opt != 0) {
+    old_term = strdup((old_term == NULL) ? "unknown" : old_term);
+    if (t_opt != NULL) {
 	if (!strcmp(t_opt, "-")) {
 	    char buffer[BUFSIZ];
-	    while (fgets(buffer, sizeof(buffer) - 1, stdin) != 0) {
+	    while (fgets(buffer, sizeof(buffer) - 1, stdin) != NULL) {
 		char *s = buffer;
 		char *t;
 		while (isspace(UChar(s[0])))
@@ -520,7 +523,7 @@ main(int argc, char *argv[])
 		if (len_terms + 2 >= max_terms) {
 		    max_terms *= 2;
 		    all_terms = typeRealloc(char *, max_terms, all_terms);
-		    if (all_terms == 0)
+		    if (all_terms == NULL)
 			failed("no memory: all_terms");
 		}
 		all_terms[len_terms++] = s;
@@ -528,12 +531,12 @@ main(int argc, char *argv[])
 	} else {
 	    char *s = t_opt;
 	    NCURSES_CONST char *t;
-	    while ((t = strtok(s, ",")) != 0) {
-		s = 0;
+	    while ((t = strtok(s, ",")) != NULL) {
+		s = NULL;
 		if (len_terms + 2 >= max_terms) {
 		    max_terms *= 2;
 		    all_terms = typeRealloc(char *, max_terms, all_terms);
-		    if (all_terms == 0)
+		    if (all_terms == NULL)
 			failed("no memory: all_terms");
 		}
 		all_terms[len_terms++] = strdup(t);
@@ -542,7 +545,7 @@ main(int argc, char *argv[])
     } else {
 	all_terms[len_terms++] = strdup(old_term);
     }
-    all_terms[len_terms] = 0;
+    all_terms[len_terms] = NULL;
     if (v_opt) {
 	printf("%d term%s:\n", PLURAL(len_terms));
 	if (v_opt > 3) {
@@ -561,7 +564,7 @@ main(int argc, char *argv[])
      */
     if (len_caps == 0) {
 #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
-	for (n = 0; strnames[n] != 0; ++n) {
+	for (n = 0; strnames[n] != NULL; ++n) {
 	    GrowArray(all_caps, max_caps, len_caps);
 	    all_caps[len_caps++] = strdup(strnames[n]);
 	}
@@ -571,7 +574,7 @@ main(int argc, char *argv[])
 #endif
     }
     std_caps = len_caps;
-    all_caps[len_caps] = 0;
+    all_caps[len_caps] = NULL;
     if (v_opt) {
 	printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps));
 	if (v_opt > 3) {
@@ -664,7 +667,7 @@ main(int argc, char *argv[])
 		free(all_caps[n]);
 	    }
 #endif
-	    if (cur_term != 0) {
+	    if (cur_term != NULL) {
 		del_curterm(cur_term);
 	    } else {
 		printf("? no cur_term\n");
diff --git a/test/test_vid_puts.c b/test/test_vid_puts.c
index 0d7d7abbe..620aea74c 100644
--- a/test/test_vid_puts.c
+++ b/test/test_vid_puts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $
+ * $Id: test_vid_puts.c,v 1.18 2024/12/07 23:03:19 tom Exp $
  *
  * Demonstrate the vid_puts and vid_attr functions.
  * Thomas Dickey - 2013/01/12
@@ -63,7 +63,7 @@ outs(const char *s)
 static void
 cleanup(void)
 {
-    if (cur_term != 0) {
+    if (cur_term != NULL) {
 	outs(exit_attribute_mode);
 	if (!outs(orig_colors))
 	    outs(orig_pair);
diff --git a/test/test_vidputs.c b/test/test_vidputs.c
index 0c02cdee0..9a87642a1 100644
--- a/test/test_vidputs.c
+++ b/test/test_vidputs.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vidputs.c,v 1.16 2024/10/06 21:17:54 tom Exp $
+ * $Id: test_vidputs.c,v 1.17 2024/12/07 22:53:07 tom Exp $
  *
  * Demonstrate the vidputs and vidattr functions.
  * Thomas Dickey - 2013/01/12
@@ -63,7 +63,7 @@ outs(NCURSES_CONST char *s)
 static void
 cleanup(void)
 {
-    if (cur_term != 0) {
+    if (cur_term != NULL) {
 	outs(exit_attribute_mode);
 	if (!outs(orig_colors))
 	    outs(orig_pair);
diff --git a/test/testcurs.c b/test/testcurs.c
index 7e6594b9a..da39bbf5b 100644
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
- * $Id: testcurs.c,v 1.59 2024/10/05 19:17:19 tom Exp $
+ * $Id: testcurs.c,v 1.60 2024/12/07 22:53:07 tom Exp $
  */
 
 #include <test.priv.h>
@@ -488,14 +488,14 @@ outputTest(WINDOW *win)
     *Buffer = 0;
     scanw("%s", Buffer);
 
-    if (TIGETSTR("cvvis", "vs") != 0) {
+    if (TIGETSTR("cvvis", "vs") != NULL) {
 	wclear(win);
 	curs_set(2);
 	MvWAddStr(win, 1, 1, "The cursor should appear as a block (visible)");
 	Continue(win);
     }
 
-    if (TIGETSTR("civis", "vi") != 0) {
+    if (TIGETSTR("civis", "vi") != NULL) {
 	wclear(win);
 	curs_set(0);
 	MvWAddStr(win, 1, 1,
@@ -503,7 +503,7 @@ outputTest(WINDOW *win)
 	Continue(win);
     }
 
-    if (TIGETSTR("cnorm", "ve") != 0) {
+    if (TIGETSTR("cnorm", "ve") != NULL) {
 	wclear(win);
 	curs_set(1);
 	MvWAddStr(win, 1, 1, "The cursor should be an underline (normal)");
@@ -592,7 +592,7 @@ padTest(WINDOW *dummy GCC_UNUSED)
 {
     WINDOW *pad;
 
-    if ((pad = newpad(50, 100)) != 0) {
+    if ((pad = newpad(50, 100)) != NULL) {
 	WINDOW *spad;
 
 	wattron(pad, A_REVERSE);
@@ -609,7 +609,7 @@ padTest(WINDOW *dummy GCC_UNUSED)
 	raw();
 	wgetch(pad);
 
-	if ((spad = subpad(pad, 12, 25, 6, 52)) != 0) {
+	if ((spad = subpad(pad, 12, 25, 6, 52)) != NULL) {
 	    MvWAddStr(spad, 2, 2, "This is a new subpad");
 	    box(spad, 0, 0);
 	    delwin(spad);
diff --git a/test/view.c b/test/view.c
index 194e6042f..f2444e8e2 100644
--- a/test/view.c
+++ b/test/view.c
@@ -52,7 +52,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.149 2024/11/30 18:15:06 tom Exp $
+ * $Id: view.c,v 1.150 2024/12/07 22:53:07 tom Exp $
  */
 
 #include <test.priv.h>
@@ -114,7 +114,7 @@ finish(int sig)
 {
     endwin();
 #if NO_LEAKS
-    if (vec_lines != 0) {
+    if (vec_lines != NULL) {
 	int n;
 	for (n = 0; n < num_lines; ++n) {
 	    free(vec_lines[n]);
@@ -172,7 +172,7 @@ show_all(const char *tag)
 	move(i, 0);
 	printw("%*d:", digits, actual);
 	clrtoeol();
-	if ((s = lptr[i - 1]) == 0) {
+	if ((s = lptr[i - 1]) == NULL) {
 	    continue;
 	}
 	len = ch_len(s);
@@ -233,7 +233,7 @@ read_file(const char *filename)
     size_t len;
     struct stat sb;
     char *my_blob;
-    char **my_vec = 0;
+    char **my_vec = NULL;
     WINDOW *my_win;
 
     if (stat(filename, &sb) != 0
@@ -245,11 +245,11 @@ read_file(const char *filename)
 	failed("input is empty");
     }
 
-    if ((fp = fopen(filename, "r")) == 0) {
+    if ((fp = fopen(filename, "r")) == NULL) {
 	failed("cannot open input-file");
     }
 
-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) {
+    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) {
 	failed("cannot allocate memory for input-file");
     }
 
@@ -280,7 +280,7 @@ read_file(const char *filename)
 	}
 	num_lines = k;
 	if (pass == 0) {
-	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
+	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) {
 		failed("cannot allocate line-vector #1");
 	    }
 	} else {
@@ -307,11 +307,11 @@ read_file(const char *filename)
     }
     width = (width + 1) * 5;
     my_win = newwin(2, width, 0, 0);
-    if (my_win == 0) {
+    if (my_win == NULL) {
 	failed("cannot allocate temporary window");
     }
 
-    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) {
+    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == NULL) {
 	failed("cannot allocate line-vector #2");
     }
 
@@ -358,7 +358,7 @@ read_file(const char *filename)
 	    x = width - 1;
 	wmove(my_win, 0, 0);
 	/* "x + 1" works with standard curses; some implementations are buggy */
-	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) {
+	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == NULL) {
 	    failed("cannot allocate line-vector #3");
 	}
 #if USE_WIDEC_SUPPORT
@@ -427,7 +427,7 @@ main(int argc, char *argv[])
 	"  s              - use entered count for halfdelay() parameter",
 	"                 - if no entered count, stop nodelay()",
 	"  <space>        - begin nodelay()",
-	0
+	NULL
     };
 
     int ch;
@@ -462,9 +462,9 @@ main(int argc, char *argv[])
 #ifdef TRACE
 	case 'D':
 	    {
-		char *next = 0;
+		char *next = NULL;
 		int tvalue = (int) strtol(optarg, &next, 0);
-		if (tvalue < 0 || (next != 0 && *next != 0))
+		if (tvalue < 0 || (next != NULL && *next != 0))
 		    usage(FALSE);
 		curses_trace((unsigned) tvalue);
 	    }
diff --git a/test/xmas.c b/test/xmas.c
index 9ba3a26c0..6b4d386fd 100644
--- a/test/xmas.c
+++ b/test/xmas.c
@@ -92,7 +92,7 @@
 /******************************************************************************/
 
 /*
- * $Id: xmas.c,v 1.39 2022/12/04 00:40:11 tom Exp $
+ * $Id: xmas.c,v 1.40 2024/12/07 22:53:07 tom Exp $
  */
 #include <test.priv.h>
 
@@ -140,7 +140,7 @@ set_color(WINDOW *win, chtype color)
 {
     if (has_colors()) {
 	int n = (int) (color + 1);
-	if (my_pairs == 0)
+	if (my_pairs == NULL)
 	    my_pairs = typeCalloc(bool, (size_t) (COLORS + 1));
 	if (!my_pairs[n]) {
 	    init_pair((short) n, (short) color, (short) my_bg);
@@ -638,7 +638,7 @@ done(int sig GCC_UNUSED)
     stop_curses();
 
 #if NO_LEAKS
-    if (my_pairs != 0)
+    if (my_pairs != NULL)
 	free(my_pairs);
 #endif
 
@@ -715,44 +715,44 @@ main(int argc, char *argv[])
     }
     curs_set(0);
 
-    if ((treescrn = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn2 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn3 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn4 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn5 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn6 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn7 = newwin(16, 27, 3, 53)) == 0 ||
-	(treescrn8 = newwin(16, 27, 3, 53)) == 0 ||
+    if ((treescrn = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn2 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn3 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn4 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn5 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn6 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn7 = newwin(16, 27, 3, 53)) == NULL ||
+	(treescrn8 = newwin(16, 27, 3, 53)) == NULL ||
 
-	(dotdeer0 = newwin(3, 71, 0, 8)) == 0 ||
+	(dotdeer0 = newwin(3, 71, 0, 8)) == NULL ||
 
-	(stardeer0 = newwin(4, 56, 0, 8)) == 0 ||
+	(stardeer0 = newwin(4, 56, 0, 8)) == NULL ||
 
-	(lildeer0 = newwin(7, 53, 0, 8)) == 0 ||
-	(lildeer1 = newwin(2, 4, 0, 0)) == 0 ||
-	(lildeer2 = newwin(2, 4, 0, 0)) == 0 ||
-	(lildeer3 = newwin(2, 4, 0, 0)) == 0 ||
+	(lildeer0 = newwin(7, 53, 0, 8)) == NULL ||
+	(lildeer1 = newwin(2, 4, 0, 0)) == NULL ||
+	(lildeer2 = newwin(2, 4, 0, 0)) == NULL ||
+	(lildeer3 = newwin(2, 4, 0, 0)) == NULL ||
 
-	(middeer0 = newwin(15, 42, 0, 8)) == 0 ||
-	(middeer1 = newwin(3, 7, 0, 0)) == 0 ||
-	(middeer2 = newwin(3, 7, 0, 0)) == 0 ||
-	(middeer3 = newwin(3, 7, 0, 0)) == 0 ||
+	(middeer0 = newwin(15, 42, 0, 8)) == NULL ||
+	(middeer1 = newwin(3, 7, 0, 0)) == NULL ||
+	(middeer2 = newwin(3, 7, 0, 0)) == NULL ||
+	(middeer3 = newwin(3, 7, 0, 0)) == NULL ||
 
-	(bigdeer0 = newwin(10, 23, 0, 0)) == 0 ||
-	(bigdeer1 = newwin(10, 23, 0, 0)) == 0 ||
-	(bigdeer2 = newwin(10, 23, 0, 0)) == 0 ||
-	(bigdeer3 = newwin(10, 23, 0, 0)) == 0 ||
-	(bigdeer4 = newwin(10, 23, 0, 0)) == 0 ||
+	(bigdeer0 = newwin(10, 23, 0, 0)) == NULL ||
+	(bigdeer1 = newwin(10, 23, 0, 0)) == NULL ||
+	(bigdeer2 = newwin(10, 23, 0, 0)) == NULL ||
+	(bigdeer3 = newwin(10, 23, 0, 0)) == NULL ||
+	(bigdeer4 = newwin(10, 23, 0, 0)) == NULL ||
 
-	(lookdeer0 = newwin(10, 25, 0, 0)) == 0 ||
-	(lookdeer1 = newwin(10, 25, 0, 0)) == 0 ||
-	(lookdeer2 = newwin(10, 25, 0, 0)) == 0 ||
-	(lookdeer3 = newwin(10, 25, 0, 0)) == 0 ||
-	(lookdeer4 = newwin(10, 25, 0, 0)) == 0 ||
+	(lookdeer0 = newwin(10, 25, 0, 0)) == NULL ||
+	(lookdeer1 = newwin(10, 25, 0, 0)) == NULL ||
+	(lookdeer2 = newwin(10, 25, 0, 0)) == NULL ||
+	(lookdeer3 = newwin(10, 25, 0, 0)) == NULL ||
+	(lookdeer4 = newwin(10, 25, 0, 0)) == NULL ||
 
-	(w_holiday = newwin(1, 26, 3, 27)) == 0 ||
+	(w_holiday = newwin(1, 26, 3, 27)) == NULL ||
 
-	(w_del_msg = newwin(1, 19, 23, 60)) == 0) {
+	(w_del_msg = newwin(1, 19, 23, 60)) == NULL) {
 	stop_curses();
 	fprintf(stderr, "Cannot create windows - screen too small\n");
 	ExitProgram(EXIT_FAILURE);

From 328934a2cf4949f7e117e5de326d3ccbac3b289c Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 15 Dec 2024 03:04:34 +0100
Subject: [PATCH 094/106] ncurses-6.5-20241214.patch.gz

---
 NEWS                             |    9 +-
 VERSION                          |    2 +-
 aclocal.m4                       |   93 +-
 c++/cursesw.h                    |    5 +-
 c++/etip.h.in                    |   12 +-
 configure                        | 4024 ++++++++++++++++--------------
 configure.in                     |    8 +-
 dist.mk                          |    4 +-
 include/curses.h.in              |    6 +-
 include/ncurses_defs             |   12 +-
 ncurses/base/lib_beep.c          |    4 +-
 ncurses/base/lib_color.c         |    4 +-
 ncurses/base/lib_driver.c        |   10 +-
 ncurses/base/lib_flash.c         |    6 +-
 ncurses/base/lib_newwin.c        |    4 +-
 ncurses/base/lib_restart.c       |    4 +-
 ncurses/base/lib_set_term.c      |    4 +-
 ncurses/build.priv.h             |    6 +-
 ncurses/curses.priv.h            |    6 +-
 ncurses/tinfo/MKcodes.awk        |    8 +-
 ncurses/tinfo/MKnames.awk        |    8 +-
 ncurses/tinfo/entries.c          |    4 +-
 ncurses/tinfo/lib_acs.c          |    6 +-
 ncurses/tinfo/lib_cur_term.c     |    4 +-
 ncurses/tinfo/lib_data.c         |   12 +-
 ncurses/tinfo/lib_napms.c        |    4 +-
 ncurses/tinfo/lib_setup.c        |   28 +-
 ncurses/tinfo/lib_termcap.c      |    6 +-
 ncurses/tinfo/lib_ttyflags.c     |    4 +-
 ncurses/tinfo/tinfo_driver.c     |   50 +-
 ncurses/tty/lib_mvcur.c          |    4 +-
 ncurses/tty/lib_tstp.c           |    2 +-
 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 +-
 39 files changed, 2320 insertions(+), 2065 deletions(-)

diff --git a/NEWS b/NEWS
index a842aed76..70fa5178a 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4209 2024/12/07 23:51:39 tom Exp $
+-- $Id: NEWS,v 1.4212 2024/12/14 20:03:39 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241214
+	+ avoid redefining bool in curses.h if the platform already supports
+	  that type (cf: 20241123).
+	+ move include <curses.h> from etip.h.in to cursesw.hh, to work around
+	  breakage in Apple's port of ncurses.
+	+ strict compiler-warning fixes for upcoming gcc15
+
 20241207
 	+ strict compiler-warning fixes for upcoming gcc15
 
diff --git a/VERSION b/VERSION
index fd885601e..70e3d6fbe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241207
+5:0:10	6.5	20241214
diff --git a/aclocal.m4 b/aclocal.m4
index 283c9a802..e34211b7e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1091 2024/11/30 19:41:19 tom Exp $
+dnl $Id: aclocal.m4,v 1.1096 2024/12/14 21:33:29 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -645,7 +645,7 @@ else	AC_MSG_RESULT(no)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_SIZE version: 20 updated: 2023/02/18 17:41:25
+dnl CF_BOOL_SIZE version: 21 updated: 2024/12/14 16:09:34
 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 has been deprecated.
@@ -702,7 +702,7 @@ $ac_includes_default
 int main(void)
 {
 	FILE *fp = fopen("cf_test.out", "w");
-	if (fp != 0) {
+	if (fp != NULL) {
 		bool x = true;
 		if ((bool)(-x) >= 0)
 			fputs("unsigned ", fp);
@@ -741,7 +741,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
+dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -819,7 +819,7 @@ if test "$cross_compiling" = yes ; then
 	AC_TRY_RUN([#include <stdio.h>
 		int main(int argc, char *argv[])
 		{
-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
 		}
 	],
 		cf_ok_build_cc=yes,
@@ -1196,7 +1196,7 @@ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_GETENV version: 4 updated: 2023/12/03 10:18:09
+dnl CF_CHECK_GETENV version: 5 updated: 2024/12/14 16:09:34
 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.
@@ -1248,7 +1248,7 @@ int main(void)
 	for (j = 0; environ[j]; ++j) {
 		mynames[j] = str_alloc(environ[j]);
 		equals = strchr(mynames[j], '=');
-		if (equals != 0) {
+		if (equals != NULL) {
 			*equals++ = '\\0';
 			myvalues[j] = str_alloc(equals);
 		} else {
@@ -1447,6 +1447,19 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_TYPE2 version: 2 updated: 2024/12/14 16:33:06
+dnl --------------
+dnl CF_CHECK_TYPE version: 5 updated: 2024/12/14 16:09:34
+dnl -------------
+dnl Check if the given type can be declared via the given header.
+dnl $1 = the type to check
+dnl $2 = the header (i.e., not one of the default includes)
+AC_DEFUN([CF_CHECK_TYPE2],[
+	AC_CHECK_TYPES($1,,,[
+$ac_includes_default
+ifelse($2,,,[#include <$2>])])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34
 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
@@ -1477,7 +1490,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCWIDTH_GRAPHICS version: 4 updated: 2023/12/03 10:17:07
+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 5 updated: 2024/12/14 16:09:34
 dnl -------------------------
 dnl Most "modern" terminal emulators are based to some degree on VT100, and
 dnl should support line-drawing.  Even with Unicode.  There is a problem.
@@ -1596,8 +1609,8 @@ main(void)
 		setlocale(LC_ALL, "en_US.UTF-8") ||
 		setlocale(LC_ALL, "en_US.utf8") ||
 		setlocale(LC_ALL, "en_US.utf-8")) {
-		if ((fp = fopen("conftest.in", "r")) != 0) {
-			while (fgets(buffer, MY_LEN, fp) != 0) {
+		if ((fp = fopen("conftest.in", "r")) != NULL) {
+			while (fgets(buffer, MY_LEN, fp) != NULL) {
 				if (*buffer == '-') {
 					fprintf(stderr, "\\t%s", buffer);
 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
@@ -1689,7 +1702,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
+dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -1716,7 +1729,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 AC_TRY_COMPILE(
 [
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 ],
 [String foo = malloc(1); free((void*)foo)],[
@@ -1727,7 +1740,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 		],[String foo = malloc(1); *foo = 0],[
 			cf_cv_const_x_string=no
@@ -2536,7 +2549,7 @@ fi
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FOPEN_BIN_R version: 3 updated: 2023/01/05 18:05:46
+dnl CF_FOPEN_BIN_R version: 4 updated: 2024/12/14 16:09:34
 dnl --------------
 dnl Check if fopen works when the "b" (binary) flag is added to the mode
 dnl parameter.  POSIX ignores the "b", which c89 specified.  Some very old
@@ -2550,14 +2563,14 @@ int main(void)
 {
 	FILE *fp = fopen("conftest.tmp", "wb");
 	int rc = 0;
-	if (fp != 0) {
+	if (fp != NULL) {
 		int p, q;
 		for (p = 0; p < 256; ++p) {
 			fputc(p, fp);
 		}
 		fclose(fp);
 		fp = fopen("conftest.tmp", "rb");
-		if (fp != 0) {
+		if (fp != NULL) {
 			for (p = 0; p < 256; ++p) {
 				q = fgetc(fp);
 				if (q != p) {
@@ -2590,7 +2603,7 @@ unset ac_ct_$1
 unset $1
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44
+dnl CF_FUNC_DLSYM version: 5 updated: 2024/12/14 16:09:34
 dnl -------------
 dnl Test for dlsym() and related functions, as well as libdl.
 dnl
@@ -2610,9 +2623,12 @@ if test "$cf_have_dlsym" = yes ; then
 	test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) }
 
 	AC_MSG_CHECKING(whether able to link to dl*() functions)
-	AC_TRY_LINK([#include <dlfcn.h>],[
+	AC_TRY_LINK([
+	#include <stdio.h>
+	#include <dlfcn.h>
+	],[
 		void *obj;
-		if ((obj = dlopen("filename", 0)) != 0) {
+		if ((obj = dlopen("filename", 0)) != NULL) {
 			if (dlsym(obj, "symbolname") == 0) {
 			dlclose(obj);
 			}
@@ -2669,7 +2685,7 @@ AC_CHECK_LIB(bsd, gettimeofday,
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETTTYNAM version: 2 updated: 2023/01/05 18:06:28
+dnl CF_FUNC_GETTTYNAM version: 3 updated: 2024/12/14 16:09:34
 dnl -----------------
 dnl Check if the 4.3BSD function getttyname exists, as well as if <ttyent.h>
 dnl defines the _PATH_TTYS symbol.  If the corresponding file exists, but the
@@ -2706,7 +2722,7 @@ $ac_includes_default
 
 int main(void) {
 	FILE *fp = fopen(_PATH_TTYS, "r");
-	${cf_cv_main_return:-return} (fp == 0);
+	${cf_cv_main_return:-return} (fp == NULL);
 }],
 			[cf_cv_have_PATH_TTYS=yes],
 			[cf_cv_have_PATH_TTYS=no],
@@ -3099,7 +3115,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
+dnl CF_GCC_WARNINGS version: 42 updated: 2024/12/14 09:09:41
 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:
@@ -3125,7 +3141,7 @@ AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 cat > "conftest.$ac_ext" <<EOF
 #line __oline__ "${as_me:-configure}"
-int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == (void*)0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 then
@@ -3713,7 +3729,7 @@ if test "$GXX" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GXX_WARNINGS version: 11 updated: 2021/01/08 16:50:55
+dnl CF_GXX_WARNINGS version: 12 updated: 2024/12/14 16:09:34
 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl
@@ -3745,7 +3761,7 @@ AC_LANG_CPLUSPLUS
 
 cat > conftest.$ac_ext <<EOF
 #line __oline__ "configure"
-int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == (void*)0) ; }
 EOF
 
 if test "$INTEL_CPLUSPLUS" = yes
@@ -3876,7 +3892,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_LIBS version: 10 updated: 2021/01/02 17:09:14
+dnl CF_HASHED_DB_LIBS version: 11 updated: 2024/12/14 16:09:34
 dnl -----------------
 dnl Given that we have the header and version for hashed database, find the
 dnl library information.
@@ -3898,7 +3914,7 @@ $ac_includes_default
 	char *path = "/tmp/foo";
 #ifdef DB_VERSION_MAJOR
 #if DB_VERSION_MAJOR >= 4
-	DB *result = 0;
+	DB *result = NULL;
 	db_create(&result, NULL, 0);
 	result->open(result,
 		NULL,
@@ -3908,7 +3924,7 @@ $ac_includes_default
 		DB_CREATE,
 		0644);
 #elif DB_VERSION_MAJOR >= 3
-	DB *result = 0;
+	DB *result = NULL;
 	db_create(&result, NULL, 0);
 	result->open(result,
 		path,
@@ -3917,7 +3933,7 @@ $ac_includes_default
 		DB_CREATE,
 		0644);
 #elif DB_VERSION_MAJOR >= 2
-	DB *result = 0;
+	DB *result = NULL;
 	db_open(path,
 		DB_HASH,
 		DB_CREATE,
@@ -3933,7 +3949,7 @@ $ac_includes_default
 		     DB_HASH,
 		     0);
 #endif
-	${cf_cv_main_return:-return}(result != 0)
+	${cf_cv_main_return:-return}(result != NULL)
 ],[
 	if test -n "$cf_db_libs" ; then
 		cf_cv_hashed_db_libs=$cf_db_libs
@@ -5530,7 +5546,7 @@ AC_SUBST(BROKEN_LINKER)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_FUNCS version: 13 updated: 2023/12/03 09:24:04
+dnl CF_LINK_FUNCS version: 14 updated: 2024/12/14 16:09:34
 dnl -------------
 dnl Most Unix systems have both link and symlink, a few don't have symlink.
 dnl A few non-Unix systems implement symlink, but not link.
@@ -5565,7 +5581,7 @@ int main(void)
 	char dst[] = "conftest.chk";
 	struct stat src_sb, dst_sb;
 	FILE *fp = fopen(src, "w");
-	if (fp == 0) { fail = 3; } else {
+	if (fp == NULL) { fail = 3; } else {
 		fclose(fp); stat(src, &src_sb);
 		if ($cf_func(src, dst) < 0) {
 			fail = 1;
@@ -7208,7 +7224,7 @@ AC_MSG_RESULT($cf_prog_ln_sf)
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59
+dnl CF_REGEX version: 19 updated: 2024/12/14 16:09:34
 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
@@ -7279,8 +7295,9 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regex.h
 	do
 		AC_TRY_LINK([#include <sys/types.h>
+#include <stdio.h>
 #include <$cf_regex_hdr>],[
-			regex_t *p = 0;
+			regex_t *p = NULL;
 			int x = regcomp(p, "", 0);
 			int y = regexec(p, "", 0, 0, 0);
 			(void)x;
@@ -7506,7 +7523,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
+dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -8022,7 +8039,7 @@ cat > conftest.$ac_ext <<EOF
 int main(int argc, char *argv[[]])
 {
 	printf("hello\\n");
-	return (argv[[argc-1]] == 0) ;
+	return (argv[[argc-1]] == NULL) ;
 }
 EOF
 		cf_save_CFLAGS="$CFLAGS"
@@ -8654,7 +8671,7 @@ if test "$cf_cv_xopen_source" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_TYPEOF_CHTYPE version: 11 updated: 2023/01/05 17:57:59
+dnl CF_TYPEOF_CHTYPE version: 12 updated: 2024/12/14 16:09:34
 dnl ----------------
 dnl Determine the type we should use for chtype (and attr_t, which is treated
 dnl as the same thing).  We want around 32 bits, so on most machines want a
@@ -8670,7 +8687,7 @@ $ac_includes_default
 int main(void)
 {
 	FILE *fp = fopen("cf_test.out", "w");
-	if (fp != 0) {
+	if (fp != NULL) {
 		char *result = "long";
 		if (sizeof(unsigned long) > sizeof(unsigned int)) {
 			int n;
diff --git a/c++/cursesw.h b/c++/cursesw.h
index eef5a631c..075262012 100644
--- a/c++/cursesw.h
+++ b/c++/cursesw.h
@@ -1,7 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
 #ifndef NCURSES_CURSESW_H_incl
 #define NCURSES_CURSESW_H_incl 1
 
-// $Id: cursesw.h,v 1.59 2022/08/20 20:52:15 tom Exp $
+// $Id: cursesw.h,v 1.60 2024/12/14 19:08:22 tom Exp $
 
 extern "C" {
 #  include   <curses.h>
@@ -50,6 +50,7 @@ extern "C" {
 #define NCURSES_CXX_EXPORT_VAR(type) NCURSES_CXX_IMPEXP type
 
 #include <etip.h>
+#include <curses.h>
 
 /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
    Undefine it here, because NCursesWindow uses lines as a method.  */
diff --git a/c++/etip.h.in b/c++/etip.h.in
index 70842ef6b..b9f8702f6 100644
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: etip.h.in,v 1.50 2022/08/20 20:50:00 tom Exp $
+// $Id: etip.h.in,v 1.51 2024/12/14 19:08:16 tom Exp $
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
@@ -118,7 +118,9 @@
 #  include <generic.h>
 #endif
 
-#include <curses.h>
+// This used to include <curses.h>, but Apple's configuration as of 2024
+// provides only a broken version of ncurses's header, which interferes
+// with the configure script.
 
 extern "C" {
 #if HAVE_VALUES_H
@@ -128,6 +130,10 @@ extern "C" {
 #include <assert.h>
 #include <eti.h>
 #include <errno.h>
+
+#ifndef HAVE_CONFIG_H
+int endwin(void);	// needed for the configure check
+#endif
 }
 
 // Language features
diff --git a/configure b/configure
index 2a28320c9..aafbe5528 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.787 .
+# From configure.in Revision: 1.788 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -5697,7 +5697,7 @@ else
 #include <stdio.h>
 		int main(int argc, char *argv[])
 		{
-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
 		}
 
 _ACEOF
@@ -7507,7 +7507,7 @@ cat > conftest.$ac_ext <<EOF
 int main(int argc, char *argv[])
 {
 	printf("hello\\n");
-	return (argv[argc-1] == 0) ;
+	return (argv[argc-1] == NULL) ;
 }
 EOF
 		cf_save_CFLAGS="$CFLAGS"
@@ -8101,13 +8101,16 @@ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
 #line 8102 "configure"
 #include "confdefs.h"
-#include <dlfcn.h>
+
+	#include <stdio.h>
+	#include <dlfcn.h>
+
 int
 main (void)
 {
 
 		void *obj;
-		if ((obj = dlopen("filename", 0)) != 0) {
+		if ((obj = dlopen("filename", 0)) != NULL) {
 			if (dlsym(obj, "symbolname") == 0) {
 			dlclose(obj);
 			}
@@ -8117,16 +8120,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8123: \$? = $ac_status" >&5
+  echo "$as_me:8126: \$? = $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:8129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8129: \$? = $ac_status" >&5
+  echo "$as_me:8132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8137,15 +8140,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8140: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8143: 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:8145: result: ok" >&5
+	echo "$as_me:8148: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8148: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8151: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8153,12 +8156,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8156: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8159: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8161: checking for soname of gpm library" >&5
+echo "$as_me:8164: 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
@@ -8192,15 +8195,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8198: \$? = $ac_status" >&5
+  echo "$as_me:8201: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8203: \$? = $ac_status" >&5
+  echo "$as_me:8206: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8211,7 +8214,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8214: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8217: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8279,7 +8282,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8282: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8285: 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
@@ -8287,7 +8290,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8290 "configure"
+#line 8293 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8306,16 +8309,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8312: \$? = $ac_status" >&5
+  echo "$as_me:8315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8318: \$? = $ac_status" >&5
+  echo "$as_me:8321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8326,11 +8329,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8329: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8332: 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:8333: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8336: 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
@@ -8354,15 +8357,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8360: \$? = $ac_status" >&5
+  echo "$as_me:8363: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8362: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8365: \$? = $ac_status" >&5
+  echo "$as_me:8368: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8374,11 +8377,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8377: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8380: 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:8381: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8384: 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
 
@@ -8386,7 +8389,7 @@ fi
 
 fi
 
-echo "$as_me:8389: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8392: 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.
@@ -8395,7 +8398,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8398: result: $with_pcre2" >&5
+echo "$as_me:8401: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8406,17 +8409,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8409: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8412: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8415: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8418: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8419: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8422: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8540,7 +8543,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8543: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8546: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8553,7 +8556,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8556: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8559: 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
@@ -8561,7 +8564,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8564 "configure"
+#line 8567 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8580,16 +8583,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8586: \$? = $ac_status" >&5
+  echo "$as_me:8589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8592: \$? = $ac_status" >&5
+  echo "$as_me:8595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8600,7 +8603,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8603: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8606: 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
 
@@ -8621,7 +8624,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8624: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8627: 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
@@ -8629,7 +8632,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8632 "configure"
+#line 8635 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8648,16 +8651,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8654: \$? = $ac_status" >&5
+  echo "$as_me:8657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8660: \$? = $ac_status" >&5
+  echo "$as_me:8663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8668,7 +8671,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8671: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8674: 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
 
@@ -8689,7 +8692,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8692: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8695: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8704,23 +8707,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8707: 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 8713 "configure"
+#line 8716 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8717: \"$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:8723: \$? = $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
@@ -8739,7 +8742,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8742: 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 <<EOF
@@ -8752,13 +8755,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8755: checking for $ac_func" >&5
+echo "$as_me:8758: 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 8761 "configure"
+#line 8764 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8789,16 +8792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8795: \$? = $ac_status" >&5
+  echo "$as_me:8798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8801: \$? = $ac_status" >&5
+  echo "$as_me:8804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8808,7 +8811,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8811: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8814: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8822,7 +8825,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8825: checking if you want to use sysmouse" >&5
+echo "$as_me:8828: 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.
@@ -8834,7 +8837,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8837 "configure"
+#line 8840 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8857,16 +8860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8863: \$? = $ac_status" >&5
+  echo "$as_me:8866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8869: \$? = $ac_status" >&5
+  echo "$as_me:8872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8876,7 +8879,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8879: result: $cf_with_sysmouse" >&5
+echo "$as_me:8882: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8886,7 +8889,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8889: checking if you want to disable library suffixes" >&5
+echo "$as_me:8892: 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.
@@ -8903,13 +8906,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8906: result: $disable_lib_suffixes" >&5
+echo "$as_me:8909: 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:8912: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8915: 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.
@@ -8927,22 +8930,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8930: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8933: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8935: checking for updated LDFLAGS" >&5
+echo "$as_me:8938: 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:8938: result: maybe" >&5
+	echo "$as_me:8941: 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:8945: checking for $ac_word" >&5
+echo "$as_me:8948: 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
@@ -8957,7 +8960,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8960: found $ac_dir/$ac_word" >&5
+echo "$as_me:8963: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8965,10 +8968,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8968: result: $cf_ldd_prog" >&5
+  echo "$as_me:8971: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8971: result: no" >&5
+  echo "$as_me:8974: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8982,7 +8985,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8985 "configure"
+#line 8988 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8994,16 +8997,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9000: \$? = $ac_status" >&5
+  echo "$as_me:9003: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9006: \$? = $ac_status" >&5
+  echo "$as_me:9009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -9031,7 +9034,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9037: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9043,11 +9046,11 @@ echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9046: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9049: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9050: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9053: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9084,7 +9087,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9087: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9090: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9097,11 +9100,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9100: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9103: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9104: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9107: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9138,7 +9141,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9141: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9144: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9151,14 +9154,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9154: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9157: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9158: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9161: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9161: result: no" >&5
+	echo "$as_me:9164: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9172,7 +9175,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9175: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9178: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9189,7 +9192,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9192: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9195: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9197,7 +9200,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9200: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9203: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9216,11 +9219,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9219: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9222: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9223: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9226: 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.
@@ -9230,10 +9233,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9233: result: $with_overwrite" >&5
+echo "$as_me:9236: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9236: checking if external terminfo-database is used" >&5
+echo "$as_me:9239: 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.
@@ -9243,7 +9246,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9246: result: $use_database" >&5
+echo "$as_me:9249: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9259,7 +9262,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9262: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9265: 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.
@@ -9267,10 +9270,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9270: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9273: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9273: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9276: 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.
@@ -9280,13 +9283,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9283: result: $with_hashed_db" >&5
+	echo "$as_me:9286: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9289: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9292: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9296,7 +9299,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9299: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9302: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9304,7 +9307,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9307: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9310: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9320,7 +9323,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9323: checking for $ac_word" >&5
+echo "$as_me:9326: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9335,7 +9338,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9338: found $ac_dir/$ac_word" >&5
+echo "$as_me:9341: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9343,10 +9346,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9346: result: $TIC" >&5
+  echo "$as_me:9349: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9349: result: no" >&5
+  echo "$as_me:9352: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9355,7 +9358,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9358: checking for $ac_word" >&5
+echo "$as_me:9361: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9370,7 +9373,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9373: found $ac_dir/$ac_word" >&5
+echo "$as_me:9376: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9378,10 +9381,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9381: result: $ac_ct_TIC" >&5
+  echo "$as_me:9384: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9384: result: no" >&5
+  echo "$as_me:9387: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9393,7 +9396,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9396: checking for $ac_word" >&5
+echo "$as_me:9399: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9408,7 +9411,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9411: found $ac_dir/$ac_word" >&5
+echo "$as_me:9414: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9416,10 +9419,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9419: result: $INFOCMP" >&5
+  echo "$as_me:9422: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9422: result: no" >&5
+  echo "$as_me:9425: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9428,7 +9431,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9431: checking for $ac_word" >&5
+echo "$as_me:9434: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9443,7 +9446,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9446: found $ac_dir/$ac_word" >&5
+echo "$as_me:9449: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9451,10 +9454,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9454: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9457: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9457: result: no" >&5
+  echo "$as_me:9460: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9469,10 +9472,10 @@ 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:9472: checking for tic program for fallbacks" >&5
+  echo "$as_me:9475: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9475: result: $TIC" >&5
+		echo "$as_me:9478: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9498,7 +9501,7 @@ case "x$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9501: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9504: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9511,7 +9514,7 @@ 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:9514: checking for $ac_word" >&5
+echo "$as_me:9517: 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
@@ -9528,7 +9531,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9531: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9534: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9539,10 +9542,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9542: result: $TIC" >&5
+  echo "$as_me:9545: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9545: result: no" >&5
+  echo "$as_me:9548: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9599,7 +9602,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9602: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9605: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9614,7 +9617,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9617: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9620: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9623,10 +9626,10 @@ 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:9626: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9629: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9629: result: $INFOCMP" >&5
+		echo "$as_me:9632: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9652,7 +9655,7 @@ case "x$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9655: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9658: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9665,7 +9668,7 @@ 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:9668: checking for $ac_word" >&5
+echo "$as_me:9671: 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
@@ -9682,7 +9685,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9685: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9688: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9693,10 +9696,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9696: result: $INFOCMP" >&5
+  echo "$as_me:9699: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9699: result: no" >&5
+  echo "$as_me:9702: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9753,7 +9756,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9756: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9759: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9768,7 +9771,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9771: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9774: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9778,7 +9781,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9781: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9784: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9786,7 +9789,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9789: checking if you want modern xterm or antique" >&5
+echo "$as_me:9792: 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.
@@ -9800,7 +9803,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9803: result: $with_xterm_new" >&5
+echo "$as_me:9806: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9813,7 +9816,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9816: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9819: 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.
@@ -9837,13 +9840,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9840: result: $with_xterm_kbs" >&5
+echo "$as_me:9843: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9846: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9849: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9853,7 +9856,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9856: checking for list of terminfo directories" >&5
+echo "$as_me:9859: 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.
@@ -9891,7 +9894,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9894: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9897: 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; }; }
 	;;
@@ -9914,7 +9917,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9917: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9920: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9923,13 +9926,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9926: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9929: 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:9932: checking for default terminfo directory" >&5
+echo "$as_me:9935: 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.
@@ -9963,7 +9966,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9966: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9969: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9972,7 +9975,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9975: result: $TERMINFO" >&5
+echo "$as_me:9978: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9983,7 +9986,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9986: checking if big-core option selected" >&5
+echo "$as_me:9989: 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.
@@ -9995,7 +9998,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9998 "configure"
+#line 10001 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10009,15 +10012,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10015: \$? = $ac_status" >&5
+  echo "$as_me:10018: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10020: \$? = $ac_status" >&5
+  echo "$as_me:10023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -10029,7 +10032,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10032: result: $with_big_core" >&5
+echo "$as_me:10035: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10039,7 +10042,7 @@ EOF
 ### 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:10042: checking if big-strings option selected" >&5
+echo "$as_me:10045: 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.
@@ -10063,14 +10066,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10066: result: $with_big_strings" >&5
+echo "$as_me:10069: 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:10073: checking if you want termcap-fallback support" >&5
+echo "$as_me:10076: 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.
@@ -10080,14 +10083,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10083: result: $with_termcap" >&5
+echo "$as_me:10086: 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:10090: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10093: 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
@@ -10100,13 +10103,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10103: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10106: 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:10109: checking for list of termcap files" >&5
+	echo "$as_me:10112: 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.
@@ -10144,7 +10147,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10147: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10150: 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; }; }
 	;;
@@ -10167,7 +10170,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10170: result: $TERMPATH" >&5
+	echo "$as_me:10173: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10175,7 +10178,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10178: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10181: 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.
@@ -10185,14 +10188,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10188: result: $with_getcap" >&5
+	echo "$as_me:10191: 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:10195: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10198: 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.
@@ -10202,7 +10205,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10205: result: $with_getcap_cache" >&5
+	echo "$as_me:10208: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10212,7 +10215,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10215: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10218: 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.
@@ -10222,14 +10225,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10225: result: $with_home_terminfo" >&5
+echo "$as_me:10228: 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:10232: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10235: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10239,14 +10242,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10242: result: $with_root_environ" >&5
+echo "$as_me:10245: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10249: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10252: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10256,14 +10259,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10259: result: $with_root_access" >&5
+echo "$as_me:10262: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10266: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10269: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10273,7 +10276,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10276: result: $with_setuid_environ" >&5
+echo "$as_me:10279: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10288,23 +10291,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10291: checking for $ac_header" >&5
+echo "$as_me:10294: 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 10297 "configure"
+#line 10300 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10304: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10307: \$? = $ac_status" >&5
+  echo "$as_me:10310: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10323,7 +10326,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10329: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10338,13 +10341,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10341: checking for $ac_func" >&5
+echo "$as_me:10344: 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 10347 "configure"
+#line 10350 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10375,16 +10378,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10381: \$? = $ac_status" >&5
+  echo "$as_me:10384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10387: \$? = $ac_status" >&5
+  echo "$as_me:10390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10394,7 +10397,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10397: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10400: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10411,13 +10414,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10414: checking for $ac_func" >&5
+echo "$as_me:10417: 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 10420 "configure"
+#line 10423 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10448,16 +10451,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10454: \$? = $ac_status" >&5
+  echo "$as_me:10457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10460: \$? = $ac_status" >&5
+  echo "$as_me:10463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10467,7 +10470,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10470: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10473: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10478,7 +10481,7 @@ fi
 done
 
 else
-	echo "$as_me:10481: checking if link/symlink functions work" >&5
+	echo "$as_me:10484: 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
@@ -10491,7 +10494,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10494 "configure"
+#line 10497 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10503,7 +10506,7 @@ int main(void)
 	char dst[] = "conftest.chk";
 	struct stat src_sb, dst_sb;
 	FILE *fp = fopen(src, "w");
-	if (fp == 0) { fail = 3; } else {
+	if (fp == NULL) { fail = 3; } else {
 		fclose(fp); stat(src, &src_sb);
 		if ($cf_func(src, dst) < 0) {
 			fail = 1;
@@ -10525,15 +10528,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10531: \$? = $ac_status" >&5
+  echo "$as_me:10534: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10536: \$? = $ac_status" >&5
+  echo "$as_me:10539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10551,7 +10554,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10554: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10557: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10571,7 +10574,7 @@ with_symlinks=no
 # 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:10574: checking if tic should use symbolic links" >&5
+	echo "$as_me:10577: 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.
@@ -10581,21 +10584,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10584: result: $with_symlinks" >&5
+	echo "$as_me:10587: 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:10591: checking if tic should use hard links" >&5
+	echo "$as_me:10594: 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:10598: result: $with_links" >&5
+	echo "$as_me:10601: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10611,7 +10614,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10614: checking if you want broken-linker support code" >&5
+echo "$as_me:10617: 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.
@@ -10621,7 +10624,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10624: result: $with_broken_linker" >&5
+echo "$as_me:10627: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10635,7 +10638,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10638: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10641: 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.
@@ -10645,7 +10648,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10648: result: $with_bsdpad" >&5
+echo "$as_me:10651: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10664,14 +10667,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10667: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10670: 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 10674 "configure"
+#line 10677 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10690,16 +10693,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10696: \$? = $ac_status" >&5
+  echo "$as_me:10699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10702: \$? = $ac_status" >&5
+  echo "$as_me:10705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10710,7 +10713,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10713: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10716: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10752,14 +10755,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10755: checking if this is the GNU C library" >&5
+echo "$as_me:10758: 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 10762 "configure"
+#line 10765 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10778,16 +10781,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10784: \$? = $ac_status" >&5
+  echo "$as_me:10787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10790: \$? = $ac_status" >&5
+  echo "$as_me:10793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10798,7 +10801,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10801: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10804: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10806,7 +10809,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10809: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10812: 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
@@ -10818,7 +10821,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10821 "configure"
+#line 10824 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10837,16 +10840,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10843: \$? = $ac_status" >&5
+  echo "$as_me:10846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10849: \$? = $ac_status" >&5
+  echo "$as_me:10852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10858,12 +10861,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10861: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10864: 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:10866: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10869: 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
@@ -10968,7 +10971,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10971 "configure"
+#line 10974 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10988,16 +10991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10994: \$? = $ac_status" >&5
+  echo "$as_me:10997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11000: \$? = $ac_status" >&5
+  echo "$as_me:11003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11008,7 +11011,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11011: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11014: 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
@@ -11017,14 +11020,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11020: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11023: 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 11027 "configure"
+#line 11030 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11039,16 +11042,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11045: \$? = $ac_status" >&5
+  echo "$as_me:11048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11051: \$? = $ac_status" >&5
+  echo "$as_me:11054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11155,7 +11158,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11158 "configure"
+#line 11161 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11170,16 +11173,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11176: \$? = $ac_status" >&5
+  echo "$as_me:11179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11182: \$? = $ac_status" >&5
+  echo "$as_me:11185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11194,12 +11197,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11197: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11200: 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:11202: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11205: 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
@@ -11209,7 +11212,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11212 "configure"
+#line 11215 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11224,16 +11227,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11230: \$? = $ac_status" >&5
+  echo "$as_me:11233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11236: \$? = $ac_status" >&5
+  echo "$as_me:11239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11244,7 +11247,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11247: result: $cf_cv_default_source" >&5
+echo "$as_me:11250: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11284,16 +11287,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11287: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11290: 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}:11293: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11296: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11296 "configure"
+#line 11299 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11308,16 +11311,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11320: \$? = $ac_status" >&5
+  echo "$as_me:11323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11338,7 +11341,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11341 "configure"
+#line 11344 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11353,16 +11356,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11359: \$? = $ac_status" >&5
+  echo "$as_me:11362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11365: \$? = $ac_status" >&5
+  echo "$as_me:11368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11373,7 +11376,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11379: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11381,10 +11384,10 @@ echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11384: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11387: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11387 "configure"
+#line 11390 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11399,16 +11402,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11405: \$? = $ac_status" >&5
+  echo "$as_me:11408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11411: \$? = $ac_status" >&5
+  echo "$as_me:11414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11424,7 +11427,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11427: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11430: 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
@@ -11541,7 +11544,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11544: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11547: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11573,14 +11576,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11576: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11579: 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 11583 "configure"
+#line 11586 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11598,16 +11601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11604: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11610: \$? = $ac_status" >&5
+  echo "$as_me:11613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11619,7 +11622,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11622 "configure"
+#line 11625 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11637,16 +11640,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11643: \$? = $ac_status" >&5
+  echo "$as_me:11646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11649: \$? = $ac_status" >&5
+  echo "$as_me:11652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11661,7 +11664,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11664: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11667: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11821,16 +11824,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11824: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11827: 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}:11830: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11833: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11833 "configure"
+#line 11836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11845,16 +11848,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11851: \$? = $ac_status" >&5
+  echo "$as_me:11854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11857: \$? = $ac_status" >&5
+  echo "$as_me:11860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11875,7 +11878,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11878 "configure"
+#line 11881 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11890,16 +11893,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  echo "$as_me:11899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11902: \$? = $ac_status" >&5
+  echo "$as_me:11905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11910,7 +11913,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11916: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11918,10 +11921,10 @@ echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11921: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11924: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11924 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11936,16 +11939,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11942: \$? = $ac_status" >&5
+  echo "$as_me:11945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11948: \$? = $ac_status" >&5
+  echo "$as_me:11951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11961,7 +11964,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11964: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11967: 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
@@ -12074,10 +12077,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12077: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12080: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12080 "configure"
+#line 12083 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12095,23 +12098,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12101: \$? = $ac_status" >&5
+  echo "$as_me:12104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12107: \$? = $ac_status" >&5
+  echo "$as_me:12110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12114: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12117: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12134,7 +12137,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12137: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12140: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12146,7 +12149,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12149: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12152: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12234,7 +12237,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12237: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12240: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12244,7 +12247,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12247: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12250: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12254,7 +12257,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12257: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12260: 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"
@@ -12266,10 +12269,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12269: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12272: 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 12272 "configure"
+#line 12275 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12284,16 +12287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12290: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12302,12 +12305,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12305: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12308: 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 12310 "configure"
+#line 12313 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12322,16 +12325,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12328: \$? = $ac_status" >&5
+  echo "$as_me:12331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12334: \$? = $ac_status" >&5
+  echo "$as_me:12337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12342,19 +12345,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12348: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12350: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12353: 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 12357 "configure"
+#line 12360 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12372,16 +12375,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12378: \$? = $ac_status" >&5
+  echo "$as_me:12381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12384: \$? = $ac_status" >&5
+  echo "$as_me:12387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12393,7 +12396,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12396 "configure"
+#line 12399 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12411,16 +12414,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12417: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12417: \$? = $ac_status" >&5
+  echo "$as_me:12420: \$? = $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:12423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12423: \$? = $ac_status" >&5
+  echo "$as_me:12426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12435,7 +12438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12438: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12441: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12586,14 +12589,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12589: checking if SIGWINCH is defined" >&5
+echo "$as_me:12592: 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 12596 "configure"
+#line 12599 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12608,23 +12611,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12614: \$? = $ac_status" >&5
+  echo "$as_me:12617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12620: \$? = $ac_status" >&5
+  echo "$as_me:12623: \$? = $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 12627 "configure"
+#line 12630 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12642,16 +12645,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12648: \$? = $ac_status" >&5
+  echo "$as_me:12651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12654: \$? = $ac_status" >&5
+  echo "$as_me:12657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12665,11 +12668,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12668: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12671: 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:12672: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12675: 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
@@ -12680,7 +12683,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12683 "configure"
+#line 12686 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12702,16 +12705,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12708: \$? = $ac_status" >&5
+  echo "$as_me:12711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12714: \$? = $ac_status" >&5
+  echo "$as_me:12717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12725,7 +12728,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12728: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12731: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12735,13 +12738,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12738: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12741: 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 12744 "configure"
+#line 12747 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12755,16 +12758,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12761: \$? = $ac_status" >&5
+  echo "$as_me:12764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12767: \$? = $ac_status" >&5
+  echo "$as_me:12770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12775,7 +12778,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12778: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12781: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12789,7 +12792,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12792: checking if you want wide-character code" >&5
+echo "$as_me:12795: 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.
@@ -12799,7 +12802,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12802: result: $with_widec" >&5
+echo "$as_me:12805: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12821,7 +12824,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12824: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12827: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12834,23 +12837,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12837: checking for $ac_header" >&5
+echo "$as_me:12840: 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 12843 "configure"
+#line 12846 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12850: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12853: \$? = $ac_status" >&5
+  echo "$as_me:12856: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12869,7 +12872,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12872: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12875: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12879,14 +12882,14 @@ EOF
 fi
 done
 
-echo "$as_me:12882: checking if wchar.h can be used as is" >&5
+echo "$as_me:12885: 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 12889 "configure"
+#line 12892 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12908,16 +12911,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12914: \$? = $ac_status" >&5
+  echo "$as_me:12917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12920: \$? = $ac_status" >&5
+  echo "$as_me:12923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12927,16 +12930,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12930: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12933: 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:12936: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12939: 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 12939 "configure"
+#line 12942 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12952,16 +12955,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12958: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12964: \$? = $ac_status" >&5
+  echo "$as_me:12967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12970,16 +12973,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12973: result: $cf_result" >&5
+echo "$as_me:12976: 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:12979: checking checking for compatible value versus " >&5
+	echo "$as_me:12982: 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 12982 "configure"
+#line 12985 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12995,16 +12998,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13001: \$? = $ac_status" >&5
+  echo "$as_me:13004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13007: \$? = $ac_status" >&5
+  echo "$as_me:13010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -13013,7 +13016,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13016: result: $cf_result" >&5
+	echo "$as_me:13019: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -13023,7 +13026,7 @@ fi
 
 fi
 
-echo "$as_me:13026: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13029: 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
@@ -13094,7 +13097,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13097 "configure"
+#line 13100 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13118,8 +13121,8 @@ main(void)
 		setlocale(LC_ALL, "en_US.UTF-8") ||
 		setlocale(LC_ALL, "en_US.utf8") ||
 		setlocale(LC_ALL, "en_US.utf-8")) {
-		if ((fp = fopen("conftest.in", "r")) != 0) {
-			while (fgets(buffer, MY_LEN, fp) != 0) {
+		if ((fp = fopen("conftest.in", "r")) != NULL) {
+			while (fgets(buffer, MY_LEN, fp) != NULL) {
 				if (*buffer == '-') {
 					fprintf(stderr, "\\t%s", buffer);
 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
@@ -13139,15 +13142,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13145: \$? = $ac_status" >&5
+  echo "$as_me:13148: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13150: \$? = $ac_status" >&5
+  echo "$as_me:13153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13160,7 +13163,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13163: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13166: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13171,13 +13174,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13174: checking for $ac_func" >&5
+echo "$as_me:13177: 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 13180 "configure"
+#line 13183 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13208,16 +13211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13214: \$? = $ac_status" >&5
+  echo "$as_me:13217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13220: \$? = $ac_status" >&5
+  echo "$as_me:13223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13227,7 +13230,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13233: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13242,23 +13245,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13245: checking for $ac_header" >&5
+echo "$as_me:13248: 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 13251 "configure"
+#line 13254 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13255: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13258: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13261: \$? = $ac_status" >&5
+  echo "$as_me:13264: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13277,7 +13280,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13280: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13283: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13287,7 +13290,7 @@ EOF
 fi
 done
 
-echo "$as_me:13290: checking for multibyte character support" >&5
+echo "$as_me:13293: 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
@@ -13295,7 +13298,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13298 "configure"
+#line 13301 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13312,16 +13315,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13318: \$? = $ac_status" >&5
+  echo "$as_me:13321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13324: \$? = $ac_status" >&5
+  echo "$as_me:13327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13333,12 +13336,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13339: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13341 "configure"
+#line 13344 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13351,16 +13354,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13357: \$? = $ac_status" >&5
+  echo "$as_me:13360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13363: \$? = $ac_status" >&5
+  echo "$as_me:13366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13374,7 +13377,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13377 "configure"
+#line 13380 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13387,16 +13390,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13393: \$? = $ac_status" >&5
+  echo "$as_me:13396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13399: \$? = $ac_status" >&5
+  echo "$as_me:13402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13413,9 +13416,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13416: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13419: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13418: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13421: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13506,7 +13509,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13509: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13512: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13514,7 +13517,7 @@ echo "${as_me:-configure}:13509: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13517 "configure"
+#line 13520 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13527,21 +13530,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13533: \$? = $ac_status" >&5
+  echo "$as_me:13536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13539: \$? = $ac_status" >&5
+  echo "$as_me:13542: \$? = $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}:13544: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13547: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13559,7 +13562,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13562: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13565: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13634,13 +13637,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13637: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13640: 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 13643 "configure"
+#line 13646 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13653,21 +13656,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13659: \$? = $ac_status" >&5
+  echo "$as_me:13662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13665: \$? = $ac_status" >&5
+  echo "$as_me:13668: \$? = $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}:13670: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13673: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13709,7 +13712,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13712: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13715: 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
@@ -13747,7 +13750,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13750 "configure"
+#line 13753 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13759,16 +13762,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13765: \$? = $ac_status" >&5
+  echo "$as_me:13768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13771: \$? = $ac_status" >&5
+  echo "$as_me:13774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13785,7 +13788,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13788: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13791: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13821,7 +13824,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13824: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13827: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13853,14 +13856,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13856: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13859: 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 13863 "configure"
+#line 13866 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13878,23 +13881,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13884: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13890: \$? = $ac_status" >&5
+  echo "$as_me:13893: \$? = $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 13897 "configure"
+#line 13900 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13913,16 +13916,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13919: \$? = $ac_status" >&5
+  echo "$as_me:13922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13925: \$? = $ac_status" >&5
+  echo "$as_me:13928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13934,7 +13937,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13937: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13940: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13952,14 +13955,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13955: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13958: 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 13962 "configure"
+#line 13965 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13977,23 +13980,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13983: \$? = $ac_status" >&5
+  echo "$as_me:13986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13989: \$? = $ac_status" >&5
+  echo "$as_me:13992: \$? = $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 13996 "configure"
+#line 13999 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14012,16 +14015,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14018: \$? = $ac_status" >&5
+  echo "$as_me:14021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14024: \$? = $ac_status" >&5
+  echo "$as_me:14027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14033,7 +14036,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14036: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14039: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14056,14 +14059,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14059: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14062: 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 14066 "configure"
+#line 14069 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14081,23 +14084,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14090: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14093: \$? = $ac_status" >&5
+  echo "$as_me:14096: \$? = $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 14100 "configure"
+#line 14103 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14116,16 +14119,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14122: \$? = $ac_status" >&5
+  echo "$as_me:14125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14128: \$? = $ac_status" >&5
+  echo "$as_me:14131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14137,7 +14140,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14140: result: $cf_cv_wint_t" >&5
+echo "$as_me:14143: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14169,7 +14172,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14172: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14175: 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.
@@ -14179,7 +14182,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14182: result: $with_lp64" >&5
+echo "$as_me:14185: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14195,7 +14198,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14198: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14201: 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
@@ -14207,7 +14210,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14210 "configure"
+#line 14213 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14227,16 +14230,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14233: \$? = $ac_status" >&5
+  echo "$as_me:14236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14239: \$? = $ac_status" >&5
+  echo "$as_me:14242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14246,16 +14249,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14252: \$? = $ac_status" >&5
+  echo "$as_me:14255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14258: \$? = $ac_status" >&5
+  echo "$as_me:14261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14269,13 +14272,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14272: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14275: 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:14278: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14281: 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
@@ -14283,7 +14286,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14286 "configure"
+#line 14289 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14303,16 +14306,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14309: \$? = $ac_status" >&5
+  echo "$as_me:14312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14315: \$? = $ac_status" >&5
+  echo "$as_me:14318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14321,7 +14324,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14324 "configure"
+#line 14327 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14342,16 +14345,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14348: \$? = $ac_status" >&5
+  echo "$as_me:14351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14354: \$? = $ac_status" >&5
+  echo "$as_me:14357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14362,7 +14365,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14365: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14368: 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
 
@@ -14372,7 +14375,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14375: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14378: 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
@@ -14380,7 +14383,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14383 "configure"
+#line 14386 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14400,16 +14403,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14406: \$? = $ac_status" >&5
+  echo "$as_me:14409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14412: \$? = $ac_status" >&5
+  echo "$as_me:14415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14418,7 +14421,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14421 "configure"
+#line 14424 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14439,16 +14442,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14445: \$? = $ac_status" >&5
+  echo "$as_me:14448: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14451: \$? = $ac_status" >&5
+  echo "$as_me:14454: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14459,7 +14462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14462: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14465: 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
 
@@ -14472,7 +14475,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14475: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14478: 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
@@ -14480,7 +14483,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14483 "configure"
+#line 14486 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14495,16 +14498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14501: \$? = $ac_status" >&5
+  echo "$as_me:14504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14507: \$? = $ac_status" >&5
+  echo "$as_me:14510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14513,7 +14516,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14516 "configure"
+#line 14519 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14529,16 +14532,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14535: \$? = $ac_status" >&5
+  echo "$as_me:14538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14541: \$? = $ac_status" >&5
+  echo "$as_me:14544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14549,7 +14552,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14552: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14555: 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
 
@@ -14563,13 +14566,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14566: checking for fseeko" >&5
+echo "$as_me:14569: 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 14572 "configure"
+#line 14575 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14583,16 +14586,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14589: \$? = $ac_status" >&5
+  echo "$as_me:14592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14595: \$? = $ac_status" >&5
+  echo "$as_me:14598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14602,7 +14605,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14605: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14641,14 +14644,14 @@ fi
 
 	fi
 
-	echo "$as_me:14644: checking whether to use struct dirent64" >&5
+	echo "$as_me:14647: 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 14651 "configure"
+#line 14654 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14675,16 +14678,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14681: \$? = $ac_status" >&5
+  echo "$as_me:14684: \$? = $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:14687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14687: \$? = $ac_status" >&5
+  echo "$as_me:14690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14695,7 +14698,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14698: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14701: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14705,7 +14708,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14708: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14711: 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.
@@ -14715,14 +14718,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14718: result: $with_tparm_varargs" >&5
+echo "$as_me:14721: 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:14725: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14728: 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.
@@ -14732,14 +14735,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14735: result: $with_tic_depends" >&5
+echo "$as_me:14738: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14742: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14745: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14751,15 +14754,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14754: result: no" >&5
+	echo "$as_me:14757: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14758: result: yes" >&5
+	echo "$as_me:14761: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14762: checking for X11 rgb file" >&5
+echo "$as_me:14765: 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.
@@ -14821,7 +14824,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14824: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14827: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14829,7 +14832,7 @@ esac
 
 fi
 
-echo "$as_me:14832: result: $RGB_PATH" >&5
+echo "$as_me:14835: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14844,7 +14847,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14847: checking for type of bool" >&5
+echo "$as_me:14850: 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.
@@ -14854,17 +14857,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14857: result: $NCURSES_BOOL" >&5
+echo "$as_me:14860: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14861: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14864: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14867: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14870: 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.
@@ -14876,16 +14879,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14879: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14882: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14883: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14886: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14888: checking for type of chtype" >&5
+echo "$as_me:14891: 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.
@@ -14895,11 +14898,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14898: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14901: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14902: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14905: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14907,7 +14910,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14910: checking for type of ospeed" >&5
+echo "$as_me:14913: 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.
@@ -14917,11 +14920,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14920: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14923: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14924: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14927: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14929,7 +14932,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14932: checking for type of mmask-t" >&5
+echo "$as_me:14935: 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.
@@ -14939,18 +14942,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14942: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14945: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14946: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14949: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14953: checking for size CCHARW_MAX" >&5
+echo "$as_me:14956: 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.
@@ -14960,16 +14963,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14963: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14966: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14966: checking for signed char" >&5
+echo "$as_me:14969: 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 14972 "configure"
+#line 14975 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14984,16 +14987,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14990: \$? = $ac_status" >&5
+  echo "$as_me:14993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14996: \$? = $ac_status" >&5
+  echo "$as_me:14999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -15003,10 +15006,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15006: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15009: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:15009: checking size of signed char" >&5
+echo "$as_me:15012: 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
@@ -15015,7 +15018,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15018 "configure"
+#line 15021 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15027,21 +15030,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15033: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15039: \$? = $ac_status" >&5
+  echo "$as_me:15042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15044 "configure"
+#line 15047 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15053,16 +15056,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15059: \$? = $ac_status" >&5
+  echo "$as_me:15062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15065: \$? = $ac_status" >&5
+  echo "$as_me:15068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15078,7 +15081,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15081 "configure"
+#line 15084 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15090,16 +15093,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15096: \$? = $ac_status" >&5
+  echo "$as_me:15099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15102: \$? = $ac_status" >&5
+  echo "$as_me:15105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15115,7 +15118,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15118 "configure"
+#line 15121 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15127,16 +15130,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15133: \$? = $ac_status" >&5
+  echo "$as_me:15136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15139: \$? = $ac_status" >&5
+  echo "$as_me:15142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15149,12 +15152,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15152: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15155: 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 15157 "configure"
+#line 15160 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15170,15 +15173,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15176: \$? = $ac_status" >&5
+  echo "$as_me:15179: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15181: \$? = $ac_status" >&5
+  echo "$as_me:15184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15194,7 +15197,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15197: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15200: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15205,7 +15208,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15208: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15211: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15215,13 +15218,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15218: result: $with_signed_char" >&5
+echo "$as_me:15221: 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:15224: checking for type of tparm-arg" >&5
+echo "$as_me:15227: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15231,18 +15234,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15234: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15237: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15238: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15241: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15245: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15248: 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.
@@ -15252,7 +15255,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15255: result: $with_rcs_ids" >&5
+echo "$as_me:15258: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15261,7 +15264,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15264: checking format of man-pages" >&5
+echo "$as_me:15267: 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.
@@ -15352,10 +15355,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15355: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15358: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15358: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15361: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15396,7 +15399,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15399: checking for manpage renaming" >&5
+echo "$as_me:15402: 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.
@@ -15425,15 +15428,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15428: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15431: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15433: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15436: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15436: checking if manpage aliases will be installed" >&5
+echo "$as_me:15439: 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.
@@ -15444,7 +15447,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15447: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15450: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15458,7 +15461,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15461: checking if manpage symlinks should be used" >&5
+echo "$as_me:15464: 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.
@@ -15471,17 +15474,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15474: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15477: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15480: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15483: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15484: checking for manpage tbl" >&5
+echo "$as_me:15487: 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.
@@ -15492,7 +15495,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15495: result: $MANPAGE_TBL" >&5
+echo "$as_me:15498: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15810,7 +15813,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15813: checking if you want to build with function extensions" >&5
+echo "$as_me:15816: 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.
@@ -15820,7 +15823,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15823: result: $with_ext_funcs" >&5
+echo "$as_me:15826: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15877,7 +15880,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15880: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15883: 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.
@@ -15887,7 +15890,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15890: result: $with_sp_funcs" >&5
+echo "$as_me:15893: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15906,7 +15909,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15909: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15912: 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.
@@ -15916,7 +15919,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15919: result: $with_term_driver" >&5
+echo "$as_me:15922: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15925,19 +15928,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15928: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15931: 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:15933: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15936: 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:15940: checking for extended use of const keyword" >&5
+echo "$as_me:15943: 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.
@@ -15947,7 +15950,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15950: result: $with_ext_const" >&5
+echo "$as_me:15953: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15955,7 +15958,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15958: checking if you want to use extended colors" >&5
+echo "$as_me:15961: 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.
@@ -15965,12 +15968,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15968: result: $with_ext_colors" >&5
+echo "$as_me:15971: 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:15973: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15976: 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)
@@ -15981,7 +15984,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15984: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15987: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16009,7 +16012,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16012: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16015: 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.
@@ -16019,7 +16022,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16022: result: $with_ext_mouse" >&5
+echo "$as_me:16025: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16029,7 +16032,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16032: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16035: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16046,7 +16049,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16049: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16052: 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.
@@ -16056,7 +16059,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16059: result: $with_ext_putwin" >&5
+echo "$as_me:16062: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16066,7 +16069,7 @@ EOF
 
 fi
 
-echo "$as_me:16069: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16072: 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.
@@ -16076,7 +16079,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16079: result: $with_no_padding" >&5
+echo "$as_me:16082: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16084,7 +16087,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16087: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16090: 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.
@@ -16094,7 +16097,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16097: result: $with_sigwinch" >&5
+echo "$as_me:16100: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16109,7 +16112,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16112: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16115: 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.
@@ -16119,7 +16122,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16122: result: $with_tcap_names" >&5
+echo "$as_me:16125: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16133,7 +16136,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16136: checking if you want to link with the pthread library" >&5
+echo "$as_me:16139: 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.
@@ -16143,27 +16146,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16146: result: $with_pthread" >&5
+echo "$as_me:16149: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16150: checking for pthread.h" >&5
+	echo "$as_me:16153: 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 16156 "configure"
+#line 16159 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16163: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16166: \$? = $ac_status" >&5
+  echo "$as_me:16169: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16182,7 +16185,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16185: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16188: 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
 
@@ -16192,7 +16195,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16195: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16198: 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"
 
@@ -16213,7 +16216,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16216 "configure"
+#line 16219 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16230,16 +16233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16236: \$? = $ac_status" >&5
+  echo "$as_me:16239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16242: \$? = $ac_status" >&5
+  echo "$as_me:16245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16249,7 +16252,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16252: result: $with_pthread" >&5
+	    echo "$as_me:16255: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16277,7 +16280,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16280: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16283: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16287,13 +16290,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16290: checking for pthread_kill" >&5
+	echo "$as_me:16293: 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 16296 "configure"
+#line 16299 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16324,16 +16327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16330: \$? = $ac_status" >&5
+  echo "$as_me:16333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16336: \$? = $ac_status" >&5
+  echo "$as_me:16339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16343,11 +16346,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16346: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16349: 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:16350: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16353: 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.
@@ -16357,7 +16360,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16360: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16363: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16368,7 +16371,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16371: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16374: 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.
@@ -16378,18 +16381,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16381: result: $use_weak_symbols" >&5
+	echo "$as_me:16384: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16385: checking if $CC supports weak symbols" >&5
+echo "$as_me:16388: 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 16392 "configure"
+#line 16395 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16415,16 +16418,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16421: \$? = $ac_status" >&5
+  echo "$as_me:16424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16427: \$? = $ac_status" >&5
+  echo "$as_me:16430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16435,7 +16438,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16438: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16441: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16485,7 +16488,7 @@ fi
 # 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:16488: checking if you want reentrant code" >&5
+echo "$as_me:16491: 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.
@@ -16495,7 +16498,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16498: result: $with_reentrant" >&5
+echo "$as_me:16501: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16584,7 +16587,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16587: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16596,7 +16599,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16599: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16602: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16618,16 +16621,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16621: result: $enable_opaque_curses" >&5
+echo "$as_me:16624: 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:16626: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16629: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16630: checking whether form library structures should be opaque" >&5
+echo "$as_me:16633: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16644,10 +16647,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16647: result: $enable_opaque_form" >&5
+echo "$as_me:16650: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16650: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16653: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16664,10 +16667,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16667: result: $enable_opaque_menu" >&5
+echo "$as_me:16670: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16670: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16673: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16684,7 +16687,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16687: result: $enable_opaque_panel" >&5
+echo "$as_me:16690: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16694,7 +16697,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16697: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16700: 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.
@@ -16704,7 +16707,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16707: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16710: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16717,7 +16720,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16720: checking if you want all development code" >&5
+echo "$as_me:16723: 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.
@@ -16727,11 +16730,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16730: result: $with_develop" >&5
+echo "$as_me:16733: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16734: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16737: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16741,7 +16744,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16744: result: $enable_check_size" >&5
+echo "$as_me:16747: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16749,7 +16752,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16752: checking if you want hard-tabs code" >&5
+echo "$as_me:16755: 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.
@@ -16759,7 +16762,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16762: result: $enable_hard_tabs" >&5
+echo "$as_me:16765: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16767,7 +16770,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16770: checking if you want limited support for xmc" >&5
+echo "$as_me:16773: 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.
@@ -16777,7 +16780,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16780: result: $enable_xmc_glitch" >&5
+echo "$as_me:16783: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16787,7 +16790,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16790: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16793: 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.
@@ -16797,7 +16800,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16800: result: $with_assumed_color" >&5
+echo "$as_me:16803: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16805,7 +16808,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16808: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16811: 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.
@@ -16815,7 +16818,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16818: result: $with_hashmap" >&5
+echo "$as_me:16821: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16823,7 +16826,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16826: checking if you want colorfgbg code" >&5
+echo "$as_me:16829: 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.
@@ -16833,7 +16836,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16836: result: $with_colorfgbg" >&5
+echo "$as_me:16839: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16841,7 +16844,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16844: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16847: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16851,14 +16854,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16854: result: $cf_with_fvisibility" >&5
+echo "$as_me:16857: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16861: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16864: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16867,7 +16870,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16870 "configure"
+#line 16873 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16883,16 +16886,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16889: \$? = $ac_status" >&5
+  echo "$as_me:16892: \$? = $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:16895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16895: \$? = $ac_status" >&5
+  echo "$as_me:16898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16904,7 +16907,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16907: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16910: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17019,7 +17022,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17022: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17025: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17028,7 +17031,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17031 "configure"
+#line 17034 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17044,16 +17047,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:17053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17056: \$? = $ac_status" >&5
+  echo "$as_me:17059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17065,7 +17068,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17068: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17071: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17188,7 +17191,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17191: checking if you want interop bindings" >&5
+echo "$as_me:17194: 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.
@@ -17198,13 +17201,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17201: result: $with_exp_interop" >&5
+echo "$as_me:17204: 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:17207: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17210: 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.
@@ -17214,13 +17217,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17217: result: $with_safe_sprintf" >&5
+echo "$as_me:17220: 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:17223: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17226: 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.
@@ -17230,7 +17233,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17233: result: $with_scroll_hints" >&5
+echo "$as_me:17236: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17239,7 +17242,7 @@ EOF
 
 fi
 
-echo "$as_me:17242: checking if you want wgetch-events code" >&5
+echo "$as_me:17245: 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.
@@ -17249,7 +17252,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17252: result: $with_wgetch_events" >&5
+echo "$as_me:17255: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17264,7 +17267,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17267: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17270: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17274,7 +17277,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17277: result: $with_exp_win32" >&5
+	echo "$as_me:17280: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17300,7 +17303,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17303: checking if you want to see long compiling messages" >&5
+echo "$as_me:17306: 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.
@@ -17334,7 +17337,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17337: result: $enableval" >&5
+echo "$as_me:17340: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17347,7 +17350,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17350: checking if you want to install stripped executables" >&5
+echo "$as_me:17353: 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.
@@ -17364,7 +17367,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17367: result: $enable_stripping" >&5
+echo "$as_me:17370: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17375,7 +17378,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17378: checking if install accepts -p option" >&5
+echo "$as_me:17381: 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
@@ -17406,10 +17409,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17409: result: $cf_cv_install_p" >&5
+echo "$as_me:17412: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17412: checking if install needs to be told about ownership" >&5
+echo "$as_me:17415: 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)
@@ -17420,7 +17423,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17423: result: $with_install_o" >&5
+echo "$as_me:17426: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17431,7 +17434,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17434: checking if you want to specify strip-program" >&5
+	echo "$as_me:17437: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17441,11 +17444,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17444: result: $with_strip_program" >&5
+	echo "$as_me:17447: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17448: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17451: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17466,11 +17469,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17469: result: $check_install_strip" >&5
+		echo "$as_me:17472: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17473: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17476: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17485,7 +17488,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17488: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17491: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17511,7 +17514,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17514: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17517: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17528,17 +17531,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17531: result: $enable_stdnoreturn" >&5
+echo "$as_me:17534: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17535: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17538: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17541 "configure"
+#line 17544 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17554,16 +17557,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17560: \$? = $ac_status" >&5
+  echo "$as_me:17563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17566: \$? = $ac_status" >&5
+  echo "$as_me:17569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17574,7 +17577,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17577: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17580: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17630,16 +17633,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17633: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17636: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17638: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17641: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17642: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17645: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17678,16 +17681,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17681: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17684: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17686: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17689: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17690: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17693: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17726,23 +17729,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17729: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17732: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17734: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17737: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17738: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17741: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17745: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17748: 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.
@@ -17759,7 +17762,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17762: result: $enable_warnings" >&5
+echo "$as_me:17765: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17783,10 +17786,10 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17786 "configure"
+#line 17789 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
@@ -17798,32 +17801,32 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17804: \$? = $ac_status" >&5
+  echo "$as_me:17807: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17810: \$? = $ac_status" >&5
+  echo "$as_me:17813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17813: checking for X11/Xt const-feature" >&5
+echo "$as_me:17816: 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 17820 "configure"
+#line 17823 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
@@ -17835,16 +17838,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17841: \$? = $ac_status" >&5
+  echo "$as_me:17844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17847: \$? = $ac_status" >&5
+  echo "$as_me:17850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17859,7 +17862,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17862: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17865: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17888,8 +17891,8 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17891 "${as_me:-configure}"
-int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+#line 17894 "${as_me:-configure}"
+int main(int argc, char *argv[]) { return (argv[argc-1] == (void*)0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 then
@@ -17904,7 +17907,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17907: checking for $CC warning options..." >&5
+	{ echo "$as_me:17910: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17920,12 +17923,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17926: \$? = $ac_status" >&5
+  echo "$as_me:17929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17933,7 +17936,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17936: checking for $CC warning options..." >&5
+	{ echo "$as_me:17939: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17956,12 +17959,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17959: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17962: \$? = $ac_status" >&5
+  echo "$as_me:17965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17964: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17967: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17969,7 +17972,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17975: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17979,7 +17982,7 @@ echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17982: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17985: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18012,10 +18015,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18015: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18018: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18018 "${as_me:-configure}"
+#line 18021 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18065,12 +18068,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18068: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18071: \$? = $ac_status" >&5
+  echo "$as_me:18074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18073: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18076: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18142,12 +18145,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18145: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18148: 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 18150 "configure"
+#line 18153 "configure"
 #include "confdefs.h"
 
 int
@@ -18164,16 +18167,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18170: \$? = $ac_status" >&5
+  echo "$as_me:18173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18176: \$? = $ac_status" >&5
+  echo "$as_me:18179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18184,7 +18187,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18187: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18190: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18193,11 +18196,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18196: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18199: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18200 "configure"
+#line 18203 "configure"
 #include "confdefs.h"
 
 int
@@ -18214,16 +18217,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18220: \$? = $ac_status" >&5
+  echo "$as_me:18223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18226: \$? = $ac_status" >&5
+  echo "$as_me:18229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18233,7 +18236,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18236: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18239: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18242,30 +18245,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18245: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18248: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18252: checking version of $CC" >&5
+	echo "$as_me:18255: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18256: result: $CLANG_VERSION" >&5
+	echo "$as_me:18259: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18263: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18266: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18268 "configure"
+#line 18271 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18279,16 +18282,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18285: \$? = $ac_status" >&5
+  echo "$as_me:18288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18291: \$? = $ac_status" >&5
+  echo "$as_me:18294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18299,13 +18302,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18302: result: $cf_clang_optok" >&5
+		echo "$as_me:18305: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18308: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18311: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18322,7 +18325,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18325 "configure"
+#line 18328 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18340,7 +18343,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18343: checking for $CC warning options..." >&5
+	{ echo "$as_me:18346: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18357,12 +18360,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18363: \$? = $ac_status" >&5
+  echo "$as_me:18366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18365: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18368: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18371,7 +18374,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18374: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18377: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18401,16 +18404,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18407: \$? = $ac_status" >&5
+  echo "$as_me:18410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18409: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18412: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18413: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18416: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18428,7 +18431,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18431: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18434: 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.
@@ -18438,7 +18441,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18441: result: $enable_string_hacks" >&5
+echo "$as_me:18444: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18447,15 +18450,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18450: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18453: 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:18452: checking for strlcat" >&5
+	echo "$as_me:18455: 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 18458 "configure"
+#line 18461 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18486,16 +18489,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18492: \$? = $ac_status" >&5
+  echo "$as_me:18495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18498: \$? = $ac_status" >&5
+  echo "$as_me:18501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18505,7 +18508,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18508: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18511: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18515,7 +18518,7 @@ EOF
 
 else
 
-		echo "$as_me:18518: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18521: 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
@@ -18523,7 +18526,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18526 "configure"
+#line 18529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18542,16 +18545,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18548: \$? = $ac_status" >&5
+  echo "$as_me:18551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18554: \$? = $ac_status" >&5
+  echo "$as_me:18557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18562,7 +18565,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18565: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18568: 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
 
@@ -18585,23 +18588,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18588: checking for $ac_header" >&5
+echo "$as_me:18591: 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 18594 "configure"
+#line 18597 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18604: \$? = $ac_status" >&5
+  echo "$as_me:18607: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18620,7 +18623,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18626: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18641,13 +18644,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18644: checking for $ac_func" >&5
+echo "$as_me:18647: 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 18650 "configure"
+#line 18653 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18678,16 +18681,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18684: \$? = $ac_status" >&5
+  echo "$as_me:18687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18690: \$? = $ac_status" >&5
+  echo "$as_me:18693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18697,7 +18700,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18700: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18703: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18710,7 +18713,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18713: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18716: 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.
@@ -18720,7 +18723,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18723: result: $with_assertions" >&5
+echo "$as_me:18726: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18736,7 +18739,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18739: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18742: 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.
@@ -18758,7 +18761,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18761: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18764: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18872,23 +18875,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18875: checking for dmalloc.h" >&5
+	echo "$as_me:18878: 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 18881 "configure"
+#line 18884 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18885: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18891: \$? = $ac_status" >&5
+  echo "$as_me:18894: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18907,11 +18910,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18910: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18913: 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:18914: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18917: 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
@@ -18919,7 +18922,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18922 "configure"
+#line 18925 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18938,16 +18941,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18944: \$? = $ac_status" >&5
+  echo "$as_me:18947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18950: \$? = $ac_status" >&5
+  echo "$as_me:18953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18958,7 +18961,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18961: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18964: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18973,7 +18976,7 @@ fi
 
 fi
 
-echo "$as_me:18976: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18979: 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.
@@ -18995,7 +18998,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18998: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:19001: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19109,23 +19112,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19112: checking for dbmalloc.h" >&5
+	echo "$as_me:19115: 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 19118 "configure"
+#line 19121 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19122: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19125: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19128: \$? = $ac_status" >&5
+  echo "$as_me:19131: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19144,11 +19147,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19147: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19150: 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:19151: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19154: 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
@@ -19156,7 +19159,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19159 "configure"
+#line 19162 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19175,16 +19178,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19181: \$? = $ac_status" >&5
+  echo "$as_me:19184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19187: \$? = $ac_status" >&5
+  echo "$as_me:19190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19195,7 +19198,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19198: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19201: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19210,7 +19213,7 @@ fi
 
 fi
 
-echo "$as_me:19213: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19216: 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.
@@ -19232,7 +19235,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19235: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19238: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19345,7 +19348,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19348: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19351: 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.
@@ -19356,7 +19359,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19359: result: $with_no_leaks" >&5
+echo "$as_me:19362: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19408,7 +19411,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19411: checking whether to add trace feature to all models" >&5
+echo "$as_me:19414: 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.
@@ -19418,7 +19421,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19421: result: $cf_with_trace" >&5
+echo "$as_me:19424: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19438,7 +19441,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19441: checking if we want to use GNAT projects" >&5
+echo "$as_me:19444: 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.
@@ -19455,7 +19458,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19458: result: $enable_gnat_projects" >&5
+echo "$as_me:19461: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19468,14 +19471,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19471: checking if ssp library is needed" >&5
+echo "$as_me:19474: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19478 "configure"
+#line 19481 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19492,16 +19495,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19498: \$? = $ac_status" >&5
+  echo "$as_me:19501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19504: \$? = $ac_status" >&5
+  echo "$as_me:19507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19511,7 +19514,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19514 "configure"
+#line 19517 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19528,16 +19531,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19534: \$? = $ac_status" >&5
+  echo "$as_me:19537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19540: \$? = $ac_status" >&5
+  echo "$as_me:19543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19551,7 +19554,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19554: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19557: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19580,14 +19583,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19583: checking if -lm needed for math functions" >&5
+echo "$as_me:19586: 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 19590 "configure"
+#line 19593 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19603,16 +19606,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19609: \$? = $ac_status" >&5
+  echo "$as_me:19612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19615: \$? = $ac_status" >&5
+  echo "$as_me:19618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19622,7 +19625,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19625: result: $cf_cv_need_libm" >&5
+echo "$as_me:19628: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19630,14 +19633,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19633: checking if -lm is available for math functions" >&5
+	echo "$as_me:19636: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19640 "configure"
+#line 19643 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19653,16 +19656,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19659: \$? = $ac_status" >&5
+  echo "$as_me:19662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19665: \$? = $ac_status" >&5
+  echo "$as_me:19668: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19672,7 +19675,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19675: result: $cf_cv_have_libm" >&5
+echo "$as_me:19678: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19694,13 +19697,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19697: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19700: 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 19703 "configure"
+#line 19706 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19716,16 +19719,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19722: \$? = $ac_status" >&5
+  echo "$as_me:19725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19728: \$? = $ac_status" >&5
+  echo "$as_me:19731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19735,7 +19738,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19738: result: $ac_cv_header_time" >&5
+echo "$as_me:19741: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19750,7 +19753,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19753: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19756: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19758,7 +19761,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19761 "configure"
+#line 19764 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19777,16 +19780,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19789: \$? = $ac_status" >&5
+  echo "$as_me:19792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19797,11 +19800,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19800: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19803: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19804: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19807: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19809,7 +19812,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19812 "configure"
+#line 19815 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19828,16 +19831,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19834: \$? = $ac_status" >&5
+  echo "$as_me:19837: \$? = $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:19840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19840: \$? = $ac_status" >&5
+  echo "$as_me:19843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19848,7 +19851,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19851: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19854: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19870,7 +19873,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19873: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19876: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19878,7 +19881,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19881 "configure"
+#line 19884 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19897,16 +19900,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19903: \$? = $ac_status" >&5
+  echo "$as_me:19906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19909: \$? = $ac_status" >&5
+  echo "$as_me:19912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19917,7 +19920,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19920: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19923: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19939,7 +19942,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19942: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19945: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19947,7 +19950,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19950 "configure"
+#line 19953 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19966,16 +19969,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19972: \$? = $ac_status" >&5
+  echo "$as_me:19975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19978: \$? = $ac_status" >&5
+  echo "$as_me:19981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19986,7 +19989,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19989: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19992: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20028,7 +20031,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20031: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20034: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20036,7 +20039,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20039 "configure"
+#line 20042 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20055,16 +20058,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20067: \$? = $ac_status" >&5
+  echo "$as_me:20070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20075,7 +20078,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20078: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20081: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20103,13 +20106,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20106: checking for regcomp" >&5
+	echo "$as_me:20109: 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 20112 "configure"
+#line 20115 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20140,16 +20143,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20146: \$? = $ac_status" >&5
+  echo "$as_me:20149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20152: \$? = $ac_status" >&5
+  echo "$as_me:20155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20159,7 +20162,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20162: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20165: 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
@@ -20168,7 +20171,7 @@ else
 		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:20171: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20174: 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
@@ -20176,7 +20179,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20179 "configure"
+#line 20182 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20195,16 +20198,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20201: \$? = $ac_status" >&5
+  echo "$as_me:20204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20207: \$? = $ac_status" >&5
+  echo "$as_me:20210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20215,7 +20218,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20218: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20221: 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
 
@@ -20247,13 +20250,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20250: checking for compile" >&5
+	echo "$as_me:20253: 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 20256 "configure"
+#line 20259 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20284,16 +20287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20290: \$? = $ac_status" >&5
+  echo "$as_me:20293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20296: \$? = $ac_status" >&5
+  echo "$as_me:20299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20303,13 +20306,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20306: result: $ac_cv_func_compile" >&5
+echo "$as_me:20309: 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:20312: checking for compile in -lgen" >&5
+		echo "$as_me:20315: 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
@@ -20317,7 +20320,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20320 "configure"
+#line 20323 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20336,16 +20339,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20342: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20348: \$? = $ac_status" >&5
+  echo "$as_me:20351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20356,7 +20359,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20359: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20362: 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
 
@@ -20384,11 +20387,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20387: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20390: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20391: checking for regular-expression headers" >&5
+echo "$as_me:20394: 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
@@ -20400,7 +20403,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20403 "configure"
+#line 20406 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20417,16 +20420,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20443,15 +20446,16 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20446 "configure"
+#line 20449 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
+#include <stdio.h>
 #include <$cf_regex_hdr>
 int
 main (void)
 {
 
-			regex_t *p = 0;
+			regex_t *p = NULL;
 			int x = regcomp(p, "", 0);
 			int y = regexec(p, "", 0, 0, 0);
 			(void)x;
@@ -20463,16 +20467,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20469: \$? = $ac_status" >&5
+  echo "$as_me:20473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20475: \$? = $ac_status" >&5
+  echo "$as_me:20479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20488,11 +20492,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20491: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20495: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20495: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20499: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20530,23 +20534,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20533: checking for $ac_header" >&5
+echo "$as_me:20537: 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 20539 "configure"
+#line 20543 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20543: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20549: \$? = $ac_status" >&5
+  echo "$as_me:20553: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20565,7 +20569,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20568: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20578,23 +20582,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20581: checking for $ac_header" >&5
+echo "$as_me:20585: 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 20587 "configure"
+#line 20591 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20597: \$? = $ac_status" >&5
+  echo "$as_me:20601: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20613,7 +20617,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20616: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20623,7 +20627,7 @@ EOF
 fi
 done
 
-echo "$as_me:20626: checking for header declaring getopt variables" >&5
+echo "$as_me:20630: 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
@@ -20633,7 +20637,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20636 "configure"
+#line 20640 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20646,16 +20650,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20652: \$? = $ac_status" >&5
+  echo "$as_me:20656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20658: \$? = $ac_status" >&5
+  echo "$as_me:20662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20667,7 +20671,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20670: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20674: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20684,14 +20688,14 @@ EOF
 
 fi
 
-echo "$as_me:20687: checking if external environ is declared" >&5
+echo "$as_me:20691: 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 20694 "configure"
+#line 20698 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20704,16 +20708,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20710: \$? = $ac_status" >&5
+  echo "$as_me:20714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20716: \$? = $ac_status" >&5
+  echo "$as_me:20720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20724,7 +20728,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20727: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20731: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20739,14 +20743,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20742: checking if external environ exists" >&5
+echo "$as_me:20746: 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 20749 "configure"
+#line 20753 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20761,16 +20765,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20773: \$? = $ac_status" >&5
+  echo "$as_me:20777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20781,7 +20785,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20784: result: $cf_cv_have_environ" >&5
+echo "$as_me:20788: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20794,13 +20798,13 @@ EOF
 
 fi
 
-echo "$as_me:20797: checking for getenv" >&5
+echo "$as_me:20801: 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 20803 "configure"
+#line 20807 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20831,16 +20835,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20837: \$? = $ac_status" >&5
+  echo "$as_me:20841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20843: \$? = $ac_status" >&5
+  echo "$as_me:20847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20850,19 +20854,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20853: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20857: 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:20859: checking for $ac_func" >&5
+echo "$as_me:20863: 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 20865 "configure"
+#line 20869 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20893,16 +20897,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20899: \$? = $ac_status" >&5
+  echo "$as_me:20903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20905: \$? = $ac_status" >&5
+  echo "$as_me:20909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20912,7 +20916,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20915: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20919: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20922,7 +20926,7 @@ EOF
 fi
 done
 
-echo "$as_me:20925: checking if getenv returns consistent values" >&5
+echo "$as_me:20929: 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
@@ -20932,7 +20936,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20935 "configure"
+#line 20939 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20976,7 +20980,7 @@ int main(void)
 	for (j = 0; environ[j]; ++j) {
 		mynames[j] = str_alloc(environ[j]);
 		equals = strchr(mynames[j], '=');
-		if (equals != 0) {
+		if (equals != NULL) {
 			*equals++ = '\\0';
 			myvalues[j] = str_alloc(equals);
 		} else {
@@ -21037,15 +21041,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21043: \$? = $ac_status" >&5
+  echo "$as_me:21047: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
+  echo "$as_me:21052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21058,7 +21062,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21061: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21065: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21073,18 +21077,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21076: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21080: 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
 
-echo "$as_me:21080: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21084: 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 21087 "configure"
+#line 21091 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21104,16 +21108,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21110: \$? = $ac_status" >&5
+  echo "$as_me:21114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21116: \$? = $ac_status" >&5
+  echo "$as_me:21120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21125,7 +21129,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21128: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21132: 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
@@ -21140,13 +21144,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21143: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21147: 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 21149 "configure"
+#line 21153 "configure"
 #include "confdefs.h"
 
 int
@@ -21208,16 +21212,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21214: \$? = $ac_status" >&5
+  echo "$as_me:21218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21220: \$? = $ac_status" >&5
+  echo "$as_me:21224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21227,7 +21231,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21230: result: $ac_cv_c_const" >&5
+echo "$as_me:21234: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21237,7 +21241,7 @@ EOF
 
 fi
 
-echo "$as_me:21240: checking for inline" >&5
+echo "$as_me:21244: 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
@@ -21245,7 +21249,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21248 "configure"
+#line 21252 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21254,16 +21258,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21260: \$? = $ac_status" >&5
+  echo "$as_me:21264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21266: \$? = $ac_status" >&5
+  echo "$as_me:21270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21274,7 +21278,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21277: result: $ac_cv_c_inline" >&5
+echo "$as_me:21281: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21300,7 +21304,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21303: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21307: 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
@@ -21309,7 +21313,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21312 "configure"
+#line 21316 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21321,16 +21325,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21327: \$? = $ac_status" >&5
+  echo "$as_me:21331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21333: \$? = $ac_status" >&5
+  echo "$as_me:21337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21342,7 +21346,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21345: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21349: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21448,7 +21452,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21451: checking for signal global datatype" >&5
+echo "$as_me:21455: 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
@@ -21460,7 +21464,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21463 "configure"
+#line 21467 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21484,16 +21488,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21490: \$? = $ac_status" >&5
+  echo "$as_me:21494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21496: \$? = $ac_status" >&5
+  echo "$as_me:21500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21507,7 +21511,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21510: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21514: 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 <<EOF
@@ -21516,7 +21520,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21519: checking for type of chtype" >&5
+echo "$as_me:21523: 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
@@ -21526,7 +21530,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21529 "configure"
+#line 21533 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21534,7 +21538,7 @@ $ac_includes_default
 int main(void)
 {
 	FILE *fp = fopen("cf_test.out", "w");
-	if (fp != 0) {
+	if (fp != NULL) {
 		char *result = "long";
 		if (sizeof(unsigned long) > sizeof(unsigned int)) {
 			int n;
@@ -21561,15 +21565,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21567: \$? = $ac_status" >&5
+  echo "$as_me:21571: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21572: \$? = $ac_status" >&5
+  echo "$as_me:21576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21584,7 +21588,7 @@ fi
 
 fi
 
-echo "$as_me:21587: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21591: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21596,14 +21600,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21599: checking if unsigned literals are legal" >&5
+echo "$as_me:21603: 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 21606 "configure"
+#line 21610 "configure"
 #include "confdefs.h"
 
 int
@@ -21615,16 +21619,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21621: \$? = $ac_status" >&5
+  echo "$as_me:21625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21627: \$? = $ac_status" >&5
+  echo "$as_me:21631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21636,7 +21640,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21639: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21643: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21652,14 +21656,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21655: checking if external errno is declared" >&5
+echo "$as_me:21659: 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 21662 "configure"
+#line 21666 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21673,16 +21677,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21679: \$? = $ac_status" >&5
+  echo "$as_me:21683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21685: \$? = $ac_status" >&5
+  echo "$as_me:21689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21693,7 +21697,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21696: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21700: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21708,14 +21712,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21711: checking if external errno exists" >&5
+echo "$as_me:21715: 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 21718 "configure"
+#line 21722 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21730,16 +21734,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21736: \$? = $ac_status" >&5
+  echo "$as_me:21740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21742: \$? = $ac_status" >&5
+  echo "$as_me:21746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21750,7 +21754,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21753: result: $cf_cv_have_errno" >&5
+echo "$as_me:21757: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21763,7 +21767,7 @@ EOF
 
 fi
 
-echo "$as_me:21766: checking if data-only library module links" >&5
+echo "$as_me:21770: 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
@@ -21771,20 +21775,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21774 "configure"
+#line 21778 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	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"); } ; 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 <<EOF
-#line 21787 "configure"
+#line 21791 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21801,10 +21805,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21807: \$? = $ac_status" >&5
+  echo "$as_me:21811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21817,7 +21821,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21820 "configure"
+#line 21824 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21828,15 +21832,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21834: \$? = $ac_status" >&5
+  echo "$as_me:21838: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21839: \$? = $ac_status" >&5
+  echo "$as_me:21843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21851,7 +21855,7 @@ fi
 
 fi
 
-echo "$as_me:21854: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21858: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21866,13 +21870,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21869: checking for clock_gettime" >&5
+echo "$as_me:21873: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21875 "configure"
+#line 21879 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21903,16 +21907,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21909: \$? = $ac_status" >&5
+  echo "$as_me:21913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21915: \$? = $ac_status" >&5
+  echo "$as_me:21919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21922,12 +21926,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21925: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21929: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21930: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21934: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21935,7 +21939,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21938 "configure"
+#line 21942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21954,16 +21958,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21960: \$? = $ac_status" >&5
+  echo "$as_me:21964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21966: \$? = $ac_status" >&5
+  echo "$as_me:21970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21974,7 +21978,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21977: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21981: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21986,14 +21990,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21989: checking if clock_gettime links" >&5
+echo "$as_me:21993: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21996 "configure"
+#line 22000 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22011,16 +22015,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22017: \$? = $ac_status" >&5
+  echo "$as_me:22021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22023: \$? = $ac_status" >&5
+  echo "$as_me:22027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22031,7 +22035,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22034: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22038: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22045,13 +22049,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22048: checking for gettimeofday" >&5
+echo "$as_me:22052: 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 22054 "configure"
+#line 22058 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22082,16 +22086,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22088: \$? = $ac_status" >&5
+  echo "$as_me:22092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22094: \$? = $ac_status" >&5
+  echo "$as_me:22098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22101,7 +22105,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22104: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22108: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22111,7 +22115,7 @@ EOF
 
 else
 
-echo "$as_me:22114: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22118: 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
@@ -22119,7 +22123,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22122 "configure"
+#line 22126 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22138,16 +22142,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22144: \$? = $ac_status" >&5
+  echo "$as_me:22148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22150: \$? = $ac_status" >&5
+  echo "$as_me:22154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22158,7 +22162,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22161: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22165: 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
 
@@ -22217,13 +22221,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22220: checking for $ac_func" >&5
+echo "$as_me:22224: 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 22226 "configure"
+#line 22230 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22254,16 +22258,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22266: \$? = $ac_status" >&5
+  echo "$as_me:22270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22273,7 +22277,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22276: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22280: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22283,14 +22287,14 @@ EOF
 fi
 done
 
-echo "$as_me:22286: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22290: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22293 "configure"
+#line 22297 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22305,16 +22309,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22311: \$? = $ac_status" >&5
+  echo "$as_me:22315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22317: \$? = $ac_status" >&5
+  echo "$as_me:22321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22324,7 +22328,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22327: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22331: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22346,7 +22350,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22349: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22353: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22356,7 +22360,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22359 "configure"
+#line 22363 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22365,19 +22369,19 @@ $ac_includes_default
 
 int main(void) {
 	FILE *fp = fopen(_PATH_TTYS, "r");
-	${cf_cv_main_return:-return} (fp == 0);
+	${cf_cv_main_return:-return} (fp == NULL);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22375: \$? = $ac_status" >&5
+  echo "$as_me:22379: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22380: \$? = $ac_status" >&5
+  echo "$as_me:22384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22389,7 +22393,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22392: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22396: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22401,14 +22405,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22404: checking for getttynam" >&5
+	echo "$as_me:22408: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22411 "configure"
+#line 22415 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22420,16 +22424,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22426: \$? = $ac_status" >&5
+  echo "$as_me:22430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22432: \$? = $ac_status" >&5
+  echo "$as_me:22436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22439,7 +22443,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22442: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22446: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22449,7 +22453,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22452: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22456: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22458,7 +22462,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22461: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22465: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22471,14 +22475,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22474: checking for terminal-capability database functions" >&5
+echo "$as_me:22478: 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 22481 "configure"
+#line 22485 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22498,16 +22502,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22510: \$? = $ac_status" >&5
+  echo "$as_me:22514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22518,7 +22522,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22521: result: $cf_cv_cgetent" >&5
+echo "$as_me:22525: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22528,14 +22532,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22531: checking if cgetent uses const parameter" >&5
+echo "$as_me:22535: 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 22538 "configure"
+#line 22542 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22558,16 +22562,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22568: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22570: \$? = $ac_status" >&5
+  echo "$as_me:22574: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22578,7 +22582,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22581: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22585: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22592,14 +22596,14 @@ fi
 
 fi
 
-echo "$as_me:22595: checking for isascii" >&5
+echo "$as_me:22599: 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 22602 "configure"
+#line 22606 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22611,16 +22615,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22617: \$? = $ac_status" >&5
+  echo "$as_me:22621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22623: \$? = $ac_status" >&5
+  echo "$as_me:22627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22631,7 +22635,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22634: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22638: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22639,10 +22643,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22642: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22646: 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 22645 "configure"
+#line 22649 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22656,16 +22660,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22662: \$? = $ac_status" >&5
+  echo "$as_me:22666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22673,7 +22677,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22676 "configure"
+#line 22680 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22688,16 +22692,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22694: \$? = $ac_status" >&5
+  echo "$as_me:22698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22700: \$? = $ac_status" >&5
+  echo "$as_me:22704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22713,11 +22717,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22716: result: $sigact_bad" >&5
+echo "$as_me:22720: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22720: checking if nanosleep really works" >&5
+echo "$as_me:22724: 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
@@ -22727,7 +22731,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22730 "configure"
+#line 22734 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22753,15 +22757,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22759: \$? = $ac_status" >&5
+  echo "$as_me:22763: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22764: \$? = $ac_status" >&5
+  echo "$as_me:22768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22773,7 +22777,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22776: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22780: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22790,23 +22794,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22793: checking for $ac_header" >&5
+echo "$as_me:22797: 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 22799 "configure"
+#line 22803 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22807: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22809: \$? = $ac_status" >&5
+  echo "$as_me:22813: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22825,7 +22829,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22832: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22842,10 +22846,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22845: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22849: 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 22848 "configure"
+#line 22852 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22857,16 +22861,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22863: \$? = $ac_status" >&5
+  echo "$as_me:22867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22869: \$? = $ac_status" >&5
+  echo "$as_me:22873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22874,7 +22878,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22877 "configure"
+#line 22881 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22888,16 +22892,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22894: \$? = $ac_status" >&5
+  echo "$as_me:22898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22900: \$? = $ac_status" >&5
+  echo "$as_me:22904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22913,19 +22917,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22916: result: $termios_bad" >&5
+	echo "$as_me:22920: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22921: checking for tcgetattr" >&5
+echo "$as_me:22925: 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 22928 "configure"
+#line 22932 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22953,16 +22957,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22959: \$? = $ac_status" >&5
+  echo "$as_me:22963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22965: \$? = $ac_status" >&5
+  echo "$as_me:22969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22972,21 +22976,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22975: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22979: 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:22982: checking for vsscanf function or workaround" >&5
+echo "$as_me:22986: 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 22989 "configure"
+#line 22993 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23012,16 +23016,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23018: \$? = $ac_status" >&5
+  echo "$as_me:23022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23024: \$? = $ac_status" >&5
+  echo "$as_me:23028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23029,7 +23033,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23032 "configure"
+#line 23036 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23051,16 +23055,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23057: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23063: \$? = $ac_status" >&5
+  echo "$as_me:23067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23068,7 +23072,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23071 "configure"
+#line 23075 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23090,16 +23094,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23096: \$? = $ac_status" >&5
+  echo "$as_me:23100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23102: \$? = $ac_status" >&5
+  echo "$as_me:23106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23114,7 +23118,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23117: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23121: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23140,23 +23144,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23143: checking for $ac_header" >&5
+echo "$as_me:23147: 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 23149 "configure"
+#line 23153 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23153: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23159: \$? = $ac_status" >&5
+  echo "$as_me:23163: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23175,7 +23179,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23178: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23185,7 +23189,7 @@ EOF
 fi
 done
 
-echo "$as_me:23188: checking for working mkstemp" >&5
+echo "$as_me:23192: 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
@@ -23196,7 +23200,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23199 "configure"
+#line 23203 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23231,15 +23235,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23241: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23242: \$? = $ac_status" >&5
+  echo "$as_me:23246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23254,16 +23258,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23257: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23261: 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:23260: checking for mkstemp" >&5
+	echo "$as_me:23264: 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 23266 "configure"
+#line 23270 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23294,16 +23298,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23300: \$? = $ac_status" >&5
+  echo "$as_me:23304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23306: \$? = $ac_status" >&5
+  echo "$as_me:23310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23313,7 +23317,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23316: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23320: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23334,21 +23338,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23337: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23341: 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:23340: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23344: 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:23346: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23350: 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 23351 "configure"
+#line 23355 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23365,15 +23369,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23371: \$? = $ac_status" >&5
+  echo "$as_me:23375: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23376: \$? = $ac_status" >&5
+  echo "$as_me:23380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23386,7 +23390,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23389: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23393: 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
 
@@ -23397,13 +23401,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23400: checking for intptr_t" >&5
+echo "$as_me:23404: 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 23406 "configure"
+#line 23410 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23418,16 +23422,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23424: \$? = $ac_status" >&5
+  echo "$as_me:23428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23430: \$? = $ac_status" >&5
+  echo "$as_me:23434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23437,7 +23441,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23440: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23444: 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
   :
@@ -23449,13 +23453,13 @@ EOF
 
 fi
 
-echo "$as_me:23452: checking for ssize_t" >&5
+echo "$as_me:23456: 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 23458 "configure"
+#line 23462 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23470,16 +23474,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23476: \$? = $ac_status" >&5
+  echo "$as_me:23480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23482: \$? = $ac_status" >&5
+  echo "$as_me:23486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23489,7 +23493,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23492: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23496: 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
   :
@@ -23501,14 +23505,14 @@ EOF
 
 fi
 
-echo "$as_me:23504: checking for type sigaction_t" >&5
+echo "$as_me:23508: 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 23511 "configure"
+#line 23515 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23521,16 +23525,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23527: \$? = $ac_status" >&5
+  echo "$as_me:23531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23533: \$? = $ac_status" >&5
+  echo "$as_me:23537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23541,14 +23545,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23544: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23548: 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:23551: checking declaration of size-change" >&5
+echo "$as_me:23555: 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
@@ -23569,7 +23573,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23572 "configure"
+#line 23576 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23619,16 +23623,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23625: \$? = $ac_status" >&5
+  echo "$as_me:23629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23631: \$? = $ac_status" >&5
+  echo "$as_me:23635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23647,7 +23651,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23650: result: $cf_cv_sizechange" >&5
+echo "$as_me:23654: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23665,13 +23669,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23668: checking for memmove" >&5
+echo "$as_me:23672: 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 23674 "configure"
+#line 23678 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23702,16 +23706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23708: \$? = $ac_status" >&5
+  echo "$as_me:23712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23714: \$? = $ac_status" >&5
+  echo "$as_me:23718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23721,19 +23725,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23724: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23728: 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:23730: checking for bcopy" >&5
+echo "$as_me:23734: 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 23736 "configure"
+#line 23740 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23764,16 +23768,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23770: \$? = $ac_status" >&5
+  echo "$as_me:23774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23776: \$? = $ac_status" >&5
+  echo "$as_me:23780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23783,11 +23787,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23786: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23790: 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:23790: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23794: 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
@@ -23797,7 +23801,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23800 "configure"
+#line 23804 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23813,15 +23817,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23819: \$? = $ac_status" >&5
+  echo "$as_me:23823: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23824: \$? = $ac_status" >&5
+  echo "$as_me:23828: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23834,7 +23838,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23837: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23841: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23861,13 +23865,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23864: checking for $ac_func" >&5
+echo "$as_me:23868: 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 23870 "configure"
+#line 23874 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23898,16 +23902,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23904: \$? = $ac_status" >&5
+  echo "$as_me:23908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23910: \$? = $ac_status" >&5
+  echo "$as_me:23914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23917,7 +23921,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23920: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23924: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23927,7 +23931,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23930: checking if poll really works" >&5
+echo "$as_me:23934: 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
@@ -23937,7 +23941,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23940 "configure"
+#line 23944 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23990,15 +23994,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23996: \$? = $ac_status" >&5
+  echo "$as_me:24000: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24001: \$? = $ac_status" >&5
+  echo "$as_me:24005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24010,21 +24014,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24013: result: $cf_cv_working_poll" >&5
+echo "$as_me:24017: 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:24020: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24024: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24027 "configure"
+#line 24031 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24044,16 +24048,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24050: \$? = $ac_status" >&5
+  echo "$as_me:24054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24056: \$? = $ac_status" >&5
+  echo "$as_me:24060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24063,7 +24067,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24066: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24070: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24073,18 +24077,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24076: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24080: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24080: checking for va_copy" >&5
+echo "$as_me:24084: 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 24087 "configure"
+#line 24091 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24101,16 +24105,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24107: \$? = $ac_status" >&5
+  echo "$as_me:24111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24113: \$? = $ac_status" >&5
+  echo "$as_me:24117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24120,7 +24124,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24123: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24127: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24132,14 +24136,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24135: checking for __va_copy" >&5
+echo "$as_me:24139: 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 24142 "configure"
+#line 24146 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24156,16 +24160,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24168: \$? = $ac_status" >&5
+  echo "$as_me:24172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24175,7 +24179,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24178: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24182: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24187,14 +24191,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24190: checking for __builtin_va_copy" >&5
+echo "$as_me:24194: 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 24197 "configure"
+#line 24201 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24211,16 +24215,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24217: \$? = $ac_status" >&5
+  echo "$as_me:24221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24223: \$? = $ac_status" >&5
+  echo "$as_me:24227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24230,7 +24234,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24233: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24237: 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 &&
@@ -24248,14 +24252,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24251: checking if we can simply copy va_list" >&5
+	echo "$as_me:24255: 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 24258 "configure"
+#line 24262 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24272,16 +24276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24278: \$? = $ac_status" >&5
+  echo "$as_me:24282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24284: \$? = $ac_status" >&5
+  echo "$as_me:24288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24291,19 +24295,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24294: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24298: 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:24299: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24303: 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 24306 "configure"
+#line 24310 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24320,16 +24324,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24326: \$? = $ac_status" >&5
+  echo "$as_me:24330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24332: \$? = $ac_status" >&5
+  echo "$as_me:24336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24339,7 +24343,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24342: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24346: 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
@@ -24350,13 +24354,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24353: checking for pid_t" >&5
+echo "$as_me:24357: 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 24359 "configure"
+#line 24363 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24371,16 +24375,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24377: \$? = $ac_status" >&5
+  echo "$as_me:24381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24383: \$? = $ac_status" >&5
+  echo "$as_me:24387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24390,7 +24394,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24393: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24397: 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
   :
@@ -24405,23 +24409,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24408: checking for $ac_header" >&5
+echo "$as_me:24412: 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 24414 "configure"
+#line 24418 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24418: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24422: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24424: \$? = $ac_status" >&5
+  echo "$as_me:24428: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24440,7 +24444,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24443: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24447: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24453,13 +24457,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24456: checking for $ac_func" >&5
+echo "$as_me:24460: 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 24462 "configure"
+#line 24466 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24490,16 +24494,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24496: \$? = $ac_status" >&5
+  echo "$as_me:24500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24502: \$? = $ac_status" >&5
+  echo "$as_me:24506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24509,7 +24513,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24512: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24516: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24521,7 +24525,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24524: checking for working fork" >&5
+  echo "$as_me:24528: 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
@@ -24544,15 +24548,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24550: \$? = $ac_status" >&5
+  echo "$as_me:24554: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24555: \$? = $ac_status" >&5
+  echo "$as_me:24559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24564,7 +24568,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24567: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24571: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24578,12 +24582,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24581: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24585: 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:24586: checking for working vfork" >&5
+  echo "$as_me:24590: 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
@@ -24592,7 +24596,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24595 "configure"
+#line 24599 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24685,15 +24689,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24691: \$? = $ac_status" >&5
+  echo "$as_me:24695: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24696: \$? = $ac_status" >&5
+  echo "$as_me:24700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24705,13 +24709,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24708: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24712: 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:24714: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24718: 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
 
@@ -24736,7 +24740,7 @@ EOF
 
 fi
 
-echo "$as_me:24739: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24743: 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
@@ -24746,7 +24750,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24749 "configure"
+#line 24753 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24755,14 +24759,14 @@ int main(void)
 {
 	FILE *fp = fopen("conftest.tmp", "wb");
 	int rc = 0;
-	if (fp != 0) {
+	if (fp != NULL) {
 		int p, q;
 		for (p = 0; p < 256; ++p) {
 			fputc(p, fp);
 		}
 		fclose(fp);
 		fp = fopen("conftest.tmp", "rb");
-		if (fp != 0) {
+		if (fp != NULL) {
 			for (p = 0; p < 256; ++p) {
 				q = fgetc(fp);
 				if (q != p) {
@@ -24781,15 +24785,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24787: \$? = $ac_status" >&5
+  echo "$as_me:24791: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24792: \$? = $ac_status" >&5
+  echo "$as_me:24796: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24802,16 +24806,228 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24805: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24809: 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
 EOF
 
+	echo "$as_me:24816: checking for cc_t" >&5
+echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+if test "${ac_cv_type_cc_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24822 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+#include <termios.h>
+
+int
+main (void)
+{
+if ((cc_t *) 0)
+  return 0;
+if (sizeof (cc_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:24843: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:24849: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_type_cc_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_type_cc_t=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:24859: result: $ac_cv_type_cc_t" >&5
+echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+if test "$ac_cv_type_cc_t" = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_CC_T 1
+EOF
+
+fi
+
+	echo "$as_me:24869: checking for speed_t" >&5
+echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+if test "${ac_cv_type_speed_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24875 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+#include <termios.h>
+
+int
+main (void)
+{
+if ((speed_t *) 0)
+  return 0;
+if (sizeof (speed_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24893: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:24896: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:24902: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_type_speed_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_type_speed_t=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:24912: result: $ac_cv_type_speed_t" >&5
+echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+if test "$ac_cv_type_speed_t" = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_SPEED_T 1
+EOF
+
+fi
+
+	echo "$as_me:24922: checking for tcflag_t" >&5
+echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+if test "${ac_cv_type_tcflag_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24928 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+#include <termios.h>
+
+int
+main (void)
+{
+if ((tcflag_t *) 0)
+  return 0;
+if (sizeof (tcflag_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24946: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:24949: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24952: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:24955: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_type_tcflag_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_type_tcflag_t=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:24965: result: $ac_cv_type_tcflag_t" >&5
+echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+if test "$ac_cv_type_tcflag_t" = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_TCFLAG_T 1
+EOF
+
+fi
+
+	echo "$as_me:24975: checking for sigset_t" >&5
+echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+if test "${ac_cv_type_sigset_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24981 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+#include <signal.h>
+
+int
+main (void)
+{
+if ((sigset_t *) 0)
+  return 0;
+if (sizeof (sigset_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:25002: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:25008: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_type_sigset_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_type_sigset_t=no
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+echo "$as_me:25018: result: $ac_cv_type_sigset_t" >&5
+echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+if test "$ac_cv_type_sigset_t" = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_SIGSET_T 1
+EOF
+
+fi
+
 # special check for test/ditto.c
 
-echo "$as_me:24814: checking for openpty in -lutil" >&5
+echo "$as_me:25030: 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
@@ -24819,7 +25035,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24822 "configure"
+#line 25038 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24838,16 +25054,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24844: \$? = $ac_status" >&5
+  echo "$as_me:25060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24850: \$? = $ac_status" >&5
+  echo "$as_me:25066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -24858,7 +25074,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24861: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:25077: 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
@@ -24866,7 +25082,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:24869: checking for openpty header" >&5
+echo "$as_me:25085: 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
@@ -24893,7 +25109,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24896 "configure"
+#line 25112 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24911,16 +25127,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25130: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24917: \$? = $ac_status" >&5
+  echo "$as_me:25133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24923: \$? = $ac_status" >&5
+  echo "$as_me:25139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -24938,7 +25154,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:24941: result: $cf_cv_func_openpty" >&5
+echo "$as_me:25157: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25011,7 +25227,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25014 "configure"
+#line 25230 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25023,16 +25239,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25029: \$? = $ac_status" >&5
+  echo "$as_me:25245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25035: \$? = $ac_status" >&5
+  echo "$as_me:25251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25049,7 +25265,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25052: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25268: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25085,7 +25301,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25088: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25304: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25096,7 +25312,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25099: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25315: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25168,7 +25384,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25171 "configure"
+#line 25387 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25180,16 +25396,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25186: \$? = $ac_status" >&5
+  echo "$as_me:25402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25192: \$? = $ac_status" >&5
+  echo "$as_me:25408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25206,7 +25422,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25209: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25425: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25286,7 +25502,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25289: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25505: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25303,23 +25519,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25306: checking for db.h" >&5
+echo "$as_me:25522: 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 25312 "configure"
+#line 25528 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25532: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25322: \$? = $ac_status" >&5
+  echo "$as_me:25538: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25338,11 +25554,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25341: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25557: 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:25345: checking for version of db" >&5
+echo "$as_me:25561: 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
@@ -25353,10 +25569,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25356: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25572: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25359 "configure"
+#line 25575 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25386,16 +25602,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25392: \$? = $ac_status" >&5
+  echo "$as_me:25608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25398: \$? = $ac_status" >&5
+  echo "$as_me:25614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25409,16 +25625,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25412: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25628: 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:25416: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25632: 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:25421: checking for db libraries" >&5
+echo "$as_me:25637: 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
@@ -25448,10 +25664,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25451: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25667: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25454 "configure"
+#line 25670 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25464,7 +25680,7 @@ main (void)
 	char *path = "/tmp/foo";
 #ifdef DB_VERSION_MAJOR
 #if DB_VERSION_MAJOR >= 4
-	DB *result = 0;
+	DB *result = NULL;
 	db_create(&result, NULL, 0);
 	result->open(result,
 		NULL,
@@ -25474,7 +25690,7 @@ main (void)
 		DB_CREATE,
 		0644);
 #elif DB_VERSION_MAJOR >= 3
-	DB *result = 0;
+	DB *result = NULL;
 	db_create(&result, NULL, 0);
 	result->open(result,
 		path,
@@ -25483,7 +25699,7 @@ main (void)
 		DB_CREATE,
 		0644);
 #elif DB_VERSION_MAJOR >= 2
-	DB *result = 0;
+	DB *result = NULL;
 	db_open(path,
 		DB_HASH,
 		DB_CREATE,
@@ -25499,23 +25715,23 @@ main (void)
 		     DB_HASH,
 		     0);
 #endif
-	${cf_cv_main_return:-return}(result != 0)
+	${cf_cv_main_return:-return}(result != NULL)
 
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25512: \$? = $ac_status" >&5
+  echo "$as_me:25728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25518: \$? = $ac_status" >&5
+  echo "$as_me:25734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25535,11 +25751,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25538: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25754: 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:25542: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25758: 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
@@ -25565,7 +25781,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25568: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25784: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25580,7 +25796,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25583: checking if we should include stdbool.h" >&5
+echo "$as_me:25799: 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
@@ -25588,7 +25804,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25591 "configure"
+#line 25807 "configure"
 #include "confdefs.h"
 
 int
@@ -25600,23 +25816,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25606: \$? = $ac_status" >&5
+  echo "$as_me:25822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25612: \$? = $ac_status" >&5
+  echo "$as_me:25828: \$? = $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 25619 "configure"
+#line 25835 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25632,16 +25848,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25638: \$? = $ac_status" >&5
+  echo "$as_me:25854: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25644: \$? = $ac_status" >&5
+  echo "$as_me:25860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25655,13 +25871,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25658: result: yes" >&5
+then	echo "$as_me:25874: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25660: result: no" >&5
+else	echo "$as_me:25876: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25664: checking for builtin bool type" >&5
+echo "$as_me:25880: 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
@@ -25669,7 +25885,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25672 "configure"
+#line 25888 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25684,16 +25900,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25690: \$? = $ac_status" >&5
+  echo "$as_me:25906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25696: \$? = $ac_status" >&5
+  echo "$as_me:25912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25706,9 +25922,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25709: result: yes" >&5
+then	echo "$as_me:25925: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25711: result: no" >&5
+else	echo "$as_me:25927: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25725,10 +25941,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25728: checking if we already have C++ library" >&5
+	echo "$as_me:25944: 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 25731 "configure"
+#line 25947 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25742,16 +25958,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25748: \$? = $ac_status" >&5
+  echo "$as_me:25964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25754: \$? = $ac_status" >&5
+  echo "$as_me:25970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25760,7 +25976,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25763: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25979: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25779,7 +25995,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25782: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:25998: 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
@@ -25805,7 +26021,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25808 "configure"
+#line 26024 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -25819,16 +26035,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25825: \$? = $ac_status" >&5
+  echo "$as_me:26041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25831: \$? = $ac_status" >&5
+  echo "$as_me:26047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -25840,7 +26056,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:25843: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26059: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -25862,7 +26078,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:25865: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26081: 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
@@ -25877,15 +26093,15 @@ CF_EOF
 # 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:25880: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25883: \$? = $ac_status" >&5
+  echo "$as_me:26099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25885: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25888: \$? = $ac_status" >&5
+  echo "$as_me:26104: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -25896,10 +26112,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:25899: result: yes" >&5
+  echo "$as_me:26115: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:25902: result: no" >&5
+  echo "$as_me:26118: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25919,7 +26135,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:25922: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26138: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -25940,7 +26156,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25943 "configure"
+#line 26159 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -25954,16 +26170,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25960: \$? = $ac_status" >&5
+  echo "$as_me:26176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25966: \$? = $ac_status" >&5
+  echo "$as_me:26182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26000,7 +26216,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26003 "configure"
+#line 26219 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26014,16 +26230,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26056,7 +26272,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26059: result: $cf_cxx_library" >&5
+	echo "$as_me:26275: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26072,7 +26288,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26075: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26291: 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
@@ -26089,18 +26305,18 @@ do
   # 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 26092 "configure"
+#line 26308 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26319: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26123,17 +26339,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26126 "configure"
+#line 26342 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26136: \$? = $ac_status" >&5
+  echo "$as_me:26352: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26170,7 +26386,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26173: result: $CXXCPP" >&5
+echo "$as_me:26389: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26180,18 +26396,18 @@ do
   # 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 26183 "configure"
+#line 26399 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26404: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26194: \$? = $ac_status" >&5
+  echo "$as_me:26410: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26214,17 +26430,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26217 "configure"
+#line 26433 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26437: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26227: \$? = $ac_status" >&5
+  echo "$as_me:26443: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26252,7 +26468,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26255: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26471: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26267,23 +26483,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26270: checking for $ac_header" >&5
+echo "$as_me:26486: 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 26276 "configure"
+#line 26492 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26280: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26496: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26286: \$? = $ac_status" >&5
+  echo "$as_me:26502: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26302,7 +26518,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26521: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26315,23 +26531,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26318: checking for $ac_header" >&5
+echo "$as_me:26534: 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 26324 "configure"
+#line 26540 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26328: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26544: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26334: \$? = $ac_status" >&5
+  echo "$as_me:26550: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26350,7 +26566,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26353: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26569: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26361,10 +26577,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26364: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26580: 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 26367 "configure"
+#line 26583 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26381,16 +26597,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26387: \$? = $ac_status" >&5
+  echo "$as_me:26603: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26393: \$? = $ac_status" >&5
+  echo "$as_me:26609: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26399,7 +26615,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26402: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26618: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26410,7 +26626,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26413: checking if we should include stdbool.h" >&5
+echo "$as_me:26629: 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
@@ -26418,7 +26634,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26421 "configure"
+#line 26637 "configure"
 #include "confdefs.h"
 
 int
@@ -26430,23 +26646,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26436: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26442: \$? = $ac_status" >&5
+  echo "$as_me:26658: \$? = $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 26449 "configure"
+#line 26665 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26462,16 +26678,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26468: \$? = $ac_status" >&5
+  echo "$as_me:26684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26474: \$? = $ac_status" >&5
+  echo "$as_me:26690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26485,13 +26701,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26488: result: yes" >&5
+then	echo "$as_me:26704: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26490: result: no" >&5
+else	echo "$as_me:26706: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26494: checking for builtin bool type" >&5
+echo "$as_me:26710: 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
@@ -26499,7 +26715,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26502 "configure"
+#line 26718 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26514,16 +26730,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26520: \$? = $ac_status" >&5
+  echo "$as_me:26736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26526: \$? = $ac_status" >&5
+  echo "$as_me:26742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26536,19 +26752,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26539: result: yes" >&5
+then	echo "$as_me:26755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26541: result: no" >&5
+else	echo "$as_me:26757: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26545: checking for bool" >&5
+echo "$as_me:26761: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26551 "configure"
+#line 26767 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26583,16 +26799,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26586: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26589: \$? = $ac_status" >&5
+  echo "$as_me:26805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26595: \$? = $ac_status" >&5
+  echo "$as_me:26811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26602,10 +26818,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26605: result: $ac_cv_type_bool" >&5
+echo "$as_me:26821: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26608: checking size of bool" >&5
+echo "$as_me:26824: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26614,7 +26830,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26617 "configure"
+#line 26833 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26646,21 +26862,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26658: \$? = $ac_status" >&5
+  echo "$as_me:26874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26663 "configure"
+#line 26879 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26692,16 +26908,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26698: \$? = $ac_status" >&5
+  echo "$as_me:26914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26704: \$? = $ac_status" >&5
+  echo "$as_me:26920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26717,7 +26933,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26720 "configure"
+#line 26936 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26749,16 +26965,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26755: \$? = $ac_status" >&5
+  echo "$as_me:26971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26761: \$? = $ac_status" >&5
+  echo "$as_me:26977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26774,7 +26990,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26777 "configure"
+#line 26993 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26806,16 +27022,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26812: \$? = $ac_status" >&5
+  echo "$as_me:27028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26818: \$? = $ac_status" >&5
+  echo "$as_me:27034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -26828,12 +27044,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26831: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27047: 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 26836 "configure"
+#line 27052 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26869,15 +27085,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26875: \$? = $ac_status" >&5
+  echo "$as_me:27091: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26880: \$? = $ac_status" >&5
+  echo "$as_me:27096: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -26893,13 +27109,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:26896: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27112: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:26902: checking for type of bool" >&5
+echo "$as_me:27118: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26918,7 +27134,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26921 "configure"
+#line 27137 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26944,7 +27160,7 @@ $ac_includes_default
 int main(void)
 {
 	FILE *fp = fopen("cf_test.out", "w");
-	if (fp != 0) {
+	if (fp != NULL) {
 		bool x = true;
 		if ((bool)(-x) >= 0)
 			fputs("unsigned ", fp);
@@ -26959,15 +27175,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26965: \$? = $ac_status" >&5
+  echo "$as_me:27181: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26970: \$? = $ac_status" >&5
+  echo "$as_me:27186: \$? = $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
@@ -26984,19 +27200,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:26987: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27203: 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:26994: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27210: 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:26999: checking for special defines needed for etip.h" >&5
+echo "$as_me:27215: 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"
@@ -27014,7 +27230,7 @@ do
 	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 27017 "configure"
+#line 27233 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27028,16 +27244,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27034: \$? = $ac_status" >&5
+  echo "$as_me:27250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27040: \$? = $ac_status" >&5
+  echo "$as_me:27256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27058,12 +27274,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27061: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27277: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27066: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27282: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27080,7 +27296,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27083 "configure"
+#line 27299 "configure"
 #include "confdefs.h"
 
 class base
@@ -27099,15 +27315,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27105: \$? = $ac_status" >&5
+  echo "$as_me:27321: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27110: \$? = $ac_status" >&5
+  echo "$as_me:27326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27126,7 +27342,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27129: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27345: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27135,7 +27351,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27138: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27354: 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
@@ -27152,7 +27368,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27155 "configure"
+#line 27371 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27171,15 +27387,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27177: \$? = $ac_status" >&5
+  echo "$as_me:27393: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27182: \$? = $ac_status" >&5
+  echo "$as_me:27398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27198,7 +27414,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27201: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27417: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27208,7 +27424,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27211: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27427: 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
@@ -27222,7 +27438,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27225 "configure"
+#line 27441 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27266,16 +27482,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27272: \$? = $ac_status" >&5
+  echo "$as_me:27488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27278: \$? = $ac_status" >&5
+  echo "$as_me:27494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27293,7 +27509,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27296: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27512: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27341,13 +27557,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27344: checking for bool" >&5
+echo "$as_me:27560: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27350 "configure"
+#line 27566 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27382,16 +27598,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27388: \$? = $ac_status" >&5
+  echo "$as_me:27604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27394: \$? = $ac_status" >&5
+  echo "$as_me:27610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27401,10 +27617,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27404: result: $ac_cv_type_bool" >&5
+echo "$as_me:27620: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27407: checking size of bool" >&5
+echo "$as_me:27623: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27413,7 +27629,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27416 "configure"
+#line 27632 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27445,21 +27661,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27451: \$? = $ac_status" >&5
+  echo "$as_me:27667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27457: \$? = $ac_status" >&5
+  echo "$as_me:27673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27462 "configure"
+#line 27678 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27491,16 +27707,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27497: \$? = $ac_status" >&5
+  echo "$as_me:27713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27503: \$? = $ac_status" >&5
+  echo "$as_me:27719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27516,7 +27732,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27519 "configure"
+#line 27735 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27548,16 +27764,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27554: \$? = $ac_status" >&5
+  echo "$as_me:27770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27560: \$? = $ac_status" >&5
+  echo "$as_me:27776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27573,7 +27789,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27576 "configure"
+#line 27792 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27605,16 +27821,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27611: \$? = $ac_status" >&5
+  echo "$as_me:27827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27617: \$? = $ac_status" >&5
+  echo "$as_me:27833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27627,12 +27843,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27630: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27846: 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 27635 "configure"
+#line 27851 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27668,15 +27884,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27674: \$? = $ac_status" >&5
+  echo "$as_me:27890: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27679: \$? = $ac_status" >&5
+  echo "$as_me:27895: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27692,13 +27908,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27695: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27911: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27701: checking for type of bool" >&5
+echo "$as_me:27917: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27717,7 +27933,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27720 "configure"
+#line 27936 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27743,7 +27959,7 @@ $ac_includes_default
 int main(void)
 {
 	FILE *fp = fopen("cf_test.out", "w");
-	if (fp != 0) {
+	if (fp != NULL) {
 		bool x = true;
 		if ((bool)(-x) >= 0)
 			fputs("unsigned ", fp);
@@ -27758,15 +27974,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27764: \$? = $ac_status" >&5
+  echo "$as_me:27980: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27769: \$? = $ac_status" >&5
+  echo "$as_me:27985: \$? = $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
@@ -27783,14 +27999,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27786: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:28002: 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:27793: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:28009: 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
@@ -27821,7 +28037,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:27824: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:28040: 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
@@ -27832,7 +28048,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:27835: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:28051: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -27849,10 +28065,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:27852: result: $ADAFLAGS" >&5
+	echo "$as_me:28068: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:27855: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28071: 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
@@ -27862,11 +28078,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:27865: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28081: 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:27869: checking if GNAT supports generics" >&5
+echo "$as_me:28085: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -27876,7 +28092,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:27879: result: $cf_gnat_generics" >&5
+echo "$as_me:28095: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -27888,7 +28104,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:27891: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28107: 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
@@ -27936,7 +28152,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:27939: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28155: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -27949,7 +28165,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:27952: checking if GNAT supports project files" >&5
+echo "$as_me:28168: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28012,15 +28228,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28015: result: $cf_gnat_projects" >&5
+echo "$as_me:28231: 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:28021: checking if GNAT supports libraries" >&5
+	echo "$as_me:28237: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28023: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28239: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28040,7 +28256,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28043: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28259: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28052,7 +28268,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28055: checking for Ada95 compiler" >&5
+echo "$as_me:28271: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28063,12 +28279,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28066: result: $cf_ada_compiler" >&5
+echo "$as_me:28282: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28071: checking for Ada95 include directory" >&5
+echo "$as_me:28287: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28102,7 +28318,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28105: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28321: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28111,10 +28327,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28114: result: $ADA_INCLUDE" >&5
+echo "$as_me:28330: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28117: checking for Ada95 object directory" >&5
+echo "$as_me:28333: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28148,7 +28364,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28151: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28367: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28157,10 +28373,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28160: result: $ADA_OBJECTS" >&5
+echo "$as_me:28376: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28163: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28379: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28181,11 +28397,11 @@ then
 	fi
 fi
 
-echo "$as_me:28184: result: $with_ada_sharedlib" >&5
+echo "$as_me:28400: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28188: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28404: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28203,7 +28419,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28206: checking for Ada95 curses library name" >&5
+echo "$as_me:28422: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28219,7 +28435,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28222: result: $ADA_LIBNAME" >&5
+echo "$as_me:28438: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28230,13 +28446,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28233: checking for wchar_t" >&5
+	echo "$as_me:28449: 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 28239 "configure"
+#line 28455 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28251,16 +28467,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28257: \$? = $ac_status" >&5
+  echo "$as_me:28473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28263: \$? = $ac_status" >&5
+  echo "$as_me:28479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28270,10 +28486,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28273: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28489: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28276: checking size of wchar_t" >&5
+echo "$as_me:28492: 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
@@ -28282,7 +28498,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28285 "configure"
+#line 28501 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28294,21 +28510,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28300: \$? = $ac_status" >&5
+  echo "$as_me:28516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28306: \$? = $ac_status" >&5
+  echo "$as_me:28522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28311 "configure"
+#line 28527 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28320,16 +28536,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28326: \$? = $ac_status" >&5
+  echo "$as_me:28542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28332: \$? = $ac_status" >&5
+  echo "$as_me:28548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28345,7 +28561,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28348 "configure"
+#line 28564 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28357,16 +28573,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28363: \$? = $ac_status" >&5
+  echo "$as_me:28579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28369: \$? = $ac_status" >&5
+  echo "$as_me:28585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28382,7 +28598,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28385 "configure"
+#line 28601 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28394,16 +28610,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28400: \$? = $ac_status" >&5
+  echo "$as_me:28616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28406: \$? = $ac_status" >&5
+  echo "$as_me:28622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28416,12 +28632,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28419: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28635: 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 28424 "configure"
+#line 28640 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28437,15 +28653,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28443: \$? = $ac_status" >&5
+  echo "$as_me:28659: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28448: \$? = $ac_status" >&5
+  echo "$as_me:28664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28461,7 +28677,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28464: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28680: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28474,7 +28690,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28477: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28693: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28492,7 +28708,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28495: checking for library subsets" >&5
+echo "$as_me:28711: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28546,7 +28762,7 @@ fi
 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:28549: result: $LIB_SUBSETS" >&5
+echo "$as_me:28765: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28577,7 +28793,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28580: checking default library suffix" >&5
+echo "$as_me:28796: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28588,10 +28804,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28591: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28807: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28594: checking default library-dependency suffix" >&5
+echo "$as_me:28810: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28674,10 +28890,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28677: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28893: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28680: checking default object directory" >&5
+echo "$as_me:28896: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28693,11 +28909,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28696: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28912: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28700: checking c++ library-dependency suffix" >&5
+echo "$as_me:28916: 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++)
@@ -28790,7 +29006,7 @@ else
 	fi
 
 fi
-echo "$as_me:28793: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:29009: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -28966,19 +29182,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:28969: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29185: 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 <<EOF
-#line 28974 "configure"
+#line 29190 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:28978: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28981: \$? = $ac_status" >&5
+  echo "$as_me:29197: \$? = $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
@@ -28989,10 +29205,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28992 "configure"
+#line 29208 "configure"
 #include "confdefs.h"
 
-#line 28995 "configure"
+#line 29211 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29007,16 +29223,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29013: \$? = $ac_status" >&5
+  echo "$as_me:29229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29019: \$? = $ac_status" >&5
+  echo "$as_me:29235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29039,7 +29255,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29042: result: $cf_ldflags_static" >&5
+	echo "$as_me:29258: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29055,7 +29271,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29058: checking where we will install curses.h" >&5
+echo "$as_me:29274: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29065,7 +29281,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29068: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29284: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29073,7 +29289,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29076: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29292: 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
@@ -29098,7 +29314,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29101: checking for desired basename for form library" >&5
+echo "$as_me:29317: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29118,10 +29334,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29121: result: $FORM_NAME" >&5
+echo "$as_me:29337: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29124: checking for desired basename for menu library" >&5
+echo "$as_me:29340: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29141,10 +29357,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29144: result: $MENU_NAME" >&5
+echo "$as_me:29360: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29147: checking for desired basename for panel library" >&5
+echo "$as_me:29363: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29164,10 +29380,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29167: result: $PANEL_NAME" >&5
+echo "$as_me:29383: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29170: checking for desired basename for cxx library" >&5
+echo "$as_me:29386: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29187,13 +29403,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29190: result: $CXX_NAME" >&5
+echo "$as_me:29406: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29196: checking for src modules" >&5
+echo "$as_me:29412: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29252,7 +29468,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29255: result: $cf_cv_src_modules" >&5
+echo "$as_me:29471: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29413,7 +29629,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29416: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29632: 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//'`
@@ -29424,7 +29640,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29427: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29643: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29440,7 +29656,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29443: result: $PKG_CFLAGS" >&5
+echo "$as_me:29659: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29512,7 +29728,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29515: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29731: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29539,7 +29755,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29542: checking for linker search path" >&5
+echo "$as_me:29758: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29587,7 +29803,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29590: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29806: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29628,7 +29844,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29631: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29847: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29714,7 +29930,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29717: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29933: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -29895,7 +30111,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:29898: error: ambiguous option: $1
+    { { echo "$as_me:30114: 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;}
@@ -29914,7 +30130,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:29917: error: unrecognized option: $1
+  -*) { { echo "$as_me:30133: 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;}
@@ -30046,7 +30262,7 @@ do
   "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:30049: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30265: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30571,7 +30787,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30574: creating $ac_file" >&5
+    { echo "$as_me:30790: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30589,7 +30805,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30592: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30808: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30602,7 +30818,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30605: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30821: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30618,7 +30834,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30621: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30837: 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;}
@@ -30627,7 +30843,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30630: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30846: 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;}
@@ -30672,7 +30888,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30675: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30891: 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;}
@@ -30683,7 +30899,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30686: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30902: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30732,7 +30948,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30735: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30951: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30743,7 +30959,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30746: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30962: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30756,7 +30972,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30759: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30975: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30814,7 +31030,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30817: $ac_file is unchanged" >&5
+      { echo "$as_me:31033: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31201,7 +31417,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31204: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31420: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index d8e81148c..39f9ef9bd 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.787 2024/11/23 22:52:31 tom Exp $
+dnl $Id: configure.in,v 1.788 2024/12/14 21:14:32 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.787 $)
+AC_REVISION($Revision: 1.788 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1871,6 +1871,10 @@ CF_MB_LEN_MAX
 CF_VA_COPY
 AC_FUNC_VFORK
 CF_FOPEN_BIN_R
+CF_CHECK_TYPE2(cc_t,termios.h)
+CF_CHECK_TYPE2(speed_t,termios.h)
+CF_CHECK_TYPE2(tcflag_t,termios.h)
+CF_CHECK_TYPE2(sigset_t,signal.h)
 
 # special check for test/ditto.c
 CF_FUNC_OPENPTY
diff --git a/dist.mk b/dist.mk
index 4a5d640c5..0a439d92b 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1644 2024/12/07 11:51:44 tom Exp $
+# $Id: dist.mk,v 1.1645 2024/12/14 11:34:56 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241207
+NCURSES_PATCH = 20241214
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/curses.h.in b/include/curses.h.in
index 02dda52fc..d245dde1c 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.284 2024/12/07 17:14:44 tom Exp $ */
+/* $Id: curses.h.in,v 1.287 2024/12/14 23:49:34 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -296,7 +296,7 @@ typedef @cf_cv_type_of_bool@ NCURSES_BOOL;
 #include <stdbool.h>
 /* use whatever the C compiler decides bool really is */
 #define NCURSES_BOOL bool
-#else
+#elif !defined(__cplusplus) && !@cf_cv_builtin_bool@
 /* there is no predefined bool - use our own */
 #undef bool
 #define bool NCURSES_BOOL
@@ -311,7 +311,7 @@ extern "C" {
 #define NCURSES_CAST(type,value) (type)(value)
 #endif
 
-#define NCURSES_OK_ADDR(p) (0 != NCURSES_CAST(const void *, (p)))
+#define NCURSES_OK_ADDR(p) (NULL != NCURSES_CAST(const void *, (p)))
 
 /*
  * X/Open attributes.  In the ncurses implementation, they are identical to the
diff --git a/include/ncurses_defs b/include/ncurses_defs
index bf00f7555..804cc93fa 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.112 2024/05/19 09:02:51 tom Exp $
+# $Id: ncurses_defs,v 1.113 2024/12/14 21:20:43 tom Exp $
 ##############################################################################
 # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
@@ -50,6 +50,7 @@ HAVE_BSD_SIGNAL_H
 HAVE_BSD_STRING_H
 HAVE_BTOWC
 HAVE_BUILTIN_H
+HAVE_CC_T
 HAVE_CHGAT	1
 HAVE_CLOCK_GETTIME
 HAVE_COLOR_CONTENT	1
@@ -158,11 +159,13 @@ HAVE_SETUPTERM	1
 HAVE_SETVBUF
 HAVE_SGTTY_H
 HAVE_SIGACTION
+HAVE_SIGSET_T
 HAVE_SIGVEC
 HAVE_SIZECHANGE
 HAVE_SLK_COLOR
 HAVE_SLK_INIT	1
 HAVE_SNPRINTF
+HAVE_SPEED_T
 HAVE_STDINT_H
 HAVE_STRDUP
 HAVE_STRLCAT
@@ -170,8 +173,8 @@ HAVE_STRLCPY
 HAVE_STRSTR
 HAVE_SYMLINK
 HAVE_SYSCONF
-HAVE_SYS_BSDTYPES_H
 HAVE_SYS_AUXV_H
+HAVE_SYS_BSDTYPES_H
 HAVE_SYS_IOCTL_H
 HAVE_SYS_PARAM_H
 HAVE_SYS_POLL_H
@@ -180,6 +183,7 @@ HAVE_SYS_TERMIO_H
 HAVE_SYS_TIMES_H
 HAVE_SYS_TIME_H
 HAVE_SYS_TIME_SELECT
+HAVE_TCFLAG_T
 HAVE_TCGETATTR
 HAVE_TCGETPGRP
 HAVE_TELL
@@ -193,10 +197,10 @@ HAVE_TERM_H	1
 HAVE_TGETENT	1
 HAVE_TIGETNUM	1
 HAVE_TIGETSTR	1
+HAVE_TIMES
 HAVE_TIPARM	1
 HAVE_TIPARM_S	1
 HAVE_TISCAN_S	1
-HAVE_TIMES
 HAVE_TPUTS_SP
 HAVE_TSEARCH
 HAVE_TYPEAHEAD	1
@@ -231,8 +235,8 @@ HAVE_WORKING_POLL
 HAVE_WRESIZE
 HAVE_WSYNCDOWN	1
 HAVE__DOSCAN
-HAVE__TRACEF
 HAVE__NC_TPARM_ANALYZE 1
+HAVE__TRACEF
 MIXEDCASE_FILENAMES
 NCURSES_CHAR_EQ
 NCURSES_EXPANDED
diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index dc8b3e4d7..20a53d52a 100644
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_beep.c,v 1.19 2024/12/07 20:00:48 tom Exp $")
+MODULE_ID("$Id: lib_beep.c,v 1.20 2024/12/15 00:03:48 tom Exp $")
 
 /*
  *	beep()
@@ -65,7 +65,7 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
     T((T_CALLED("beep(%p)"), (void *) SP_PARM));
 
 #ifdef USE_TERM_DRIVER
-    if (SP_PARM != 0)
+    if (SP_PARM != NULL)
 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
 #else
     /* FIXME: should make sure that we are not in altchar mode */
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index d34e9d5ea..342d6ed8e 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.153 2024/12/07 17:28:13 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.154 2024/12/14 23:49:54 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -540,7 +540,7 @@ _nc_reserve_pairs(SCREEN *sp, int want)
 	sp->_color_pairs = next;
 #else
 	TYPE_REALLOC(colorpair_t, have, sp->_color_pairs);
-	if (sp->_color_pairs != 0) {
+	if (sp->_color_pairs != NULL) {
 	    memset(sp->_color_pairs + sp->_pair_alloc, 0,
 		   sizeof(colorpair_t) * (size_t) (have - sp->_pair_alloc));
 	}
diff --git a/ncurses/base/lib_driver.c b/ncurses/base/lib_driver.c
index c53802f37..3d3fec258 100644
--- a/ncurses/base/lib_driver.c
+++ b/ncurses/base/lib_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
  * Copyright 2009-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_driver.c,v 1.9 2020/08/29 19:53:35 tom Exp $")
+MODULE_ID("$Id: lib_driver.c,v 1.10 2024/12/14 22:31:35 tom Exp $")
 
 #ifndef EXP_WIN32_DRIVER
 typedef struct DriverEntry {
@@ -56,7 +56,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret)
     int code = ERR;
     size_t i;
     TERM_DRIVER *res = (TERM_DRIVER *) 0;
-    TERM_DRIVER *use = 0;
+    TERM_DRIVER *use = NULL;
 
     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
        (void *) TCB, NonNull(name), (void *) errret));
@@ -72,7 +72,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret)
 	    }
 	}
     }
-    if (use != 0) {
+    if (use != NULL) {
 	TCB->drv = use;
 	code = OK;
     }
@@ -98,7 +98,7 @@ NCURSES_SP_NAME(_nc_mcprint) (SCREEN *sp, char *data, int len)
 {
     int code = ERR;
 
-    if (0 != TerminalOf(sp))
+    if (NULL != TerminalOf(sp))
 	code = CallDriver_2(sp, td_print, data, len);
     return (code);
 }
diff --git a/ncurses/base/lib_flash.c b/ncurses/base/lib_flash.c
index 975d5f567..13e9bbb16 100644
--- a/ncurses/base/lib_flash.c
+++ b/ncurses/base/lib_flash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_flash.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_flash.c,v 1.16 2024/12/14 22:31:47 tom Exp $")
 
 /*
  *	flash()
@@ -64,7 +64,7 @@ NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)
 
     T((T_CALLED("flash(%p)"), (void *) SP_PARM));
 #ifdef USE_TERM_DRIVER
-    if (SP_PARM != 0)
+    if (SP_PARM != NULL)
 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, FALSE);
 #else
     if (HasTerminal(SP_PARM)) {
diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index 507ed7112..3085453d9 100644
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -44,13 +44,13 @@
 #include <curses.priv.h>
 #include <stddef.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.78 2024/12/07 20:19:18 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.79 2024/12/14 23:50:18 tom Exp $")
 
 #define window_is(name) ((sp)->_##name == win)
 
 #if USE_REENTRANT
 #define remove_window(name) \
-		sp->_##name = 0
+		sp->_##name = NULL
 #else
 #define remove_window(name) \
 		sp->_##name = NULL; \
diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index f6fbd4388..fa2b3957e 100644
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_restart.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.20 2024/12/15 00:04:09 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
@@ -52,7 +52,7 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
 {
     int result;
 #ifdef USE_TERM_DRIVER
-    TERMINAL *new_term = 0;
+    TERMINAL *new_term = NULL;
 #endif
 
     START_TRACE();
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 60ff31618..372c3865c 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.190 2024/12/07 17:58:16 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.191 2024/12/15 00:04:13 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -160,7 +160,7 @@ delscreen(SCREEN *sp)
 		 rop++) {
 		if (rop->win) {
 		    (void) delwin(rop->win);
-		    rop->win = 0;
+		    rop->win = NULL;
 		}
 	    }
 	}
diff --git a/ncurses/build.priv.h b/ncurses/build.priv.h
index 9014e74ab..0e2fdeccb 100644
--- a/ncurses/build.priv.h
+++ b/ncurses/build.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
  * Copyright 2010,2012 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: build.priv.h,v 1.12 2020/02/02 23:34:34 tom Exp $
+ * $Id: build.priv.h,v 1.13 2024/12/14 22:32:09 tom Exp $
  *
  *	build.priv.h
  *
@@ -78,7 +78,7 @@ extern "C" {
 #define EXIT_FAILURE 1
 #endif
 
-#define FreeAndNull(p)   do { free(p); p = 0; } while (0)
+#define FreeAndNull(p)   do { free(p); p = NULL; } while (0)
 #define UChar(c)         ((unsigned char)(c))
 #define SIZEOF(v)        (sizeof(v) / sizeof(v[0]))
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 30fa618b8..61ac7b62d 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.697 2024/12/07 18:27:10 tom Exp $
+ * $Id: curses.priv.h,v 1.698 2024/12/15 00:04:23 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2568,8 +2568,8 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
 	 && strncmp(value, "/dev/pts/", 9))
 
 #ifdef USE_TERM_DRIVER
-#  define IsTermInfo(sp)       ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo)))
-#  define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
+#  define IsTermInfo(sp)       ((TCBOf(sp) != NULL) && ((TCBOf(sp)->drv->isTerminfo)))
+#  define HasTInfoTerminal(sp) ((NULL != TerminalOf(sp)) && IsTermInfo(sp))
 #  if defined(EXP_WIN32_DRIVER)
 #    define IsTermInfoOnConsole(sp) (IsTermInfo(sp) && _nc_console_test(TerminalOf(sp)->Filedes))
 #  elif defined(USE_WIN32CON_DRIVER)
diff --git a/ncurses/tinfo/MKcodes.awk b/ncurses/tinfo/MKcodes.awk
index ca82c2e34..1c7f5a9e6 100644
--- a/ncurses/tinfo/MKcodes.awk
+++ b/ncurses/tinfo/MKcodes.awk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKcodes.awk,v 1.12 2024/12/07 20:03:37 tom Exp $
+# $Id: MKcodes.awk,v 1.13 2024/12/14 23:45:36 tom Exp $
 function large_item(value) {
 	result = sprintf("%d,", offset);
 	offset = offset + length(value) + 1;
@@ -63,7 +63,7 @@ function print_offsets(name,value) {
 	printf "%s",  value
 	print  "};"
 	print  ""
-	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
+	printf "static NCURSES_CONST char ** ptr_%s = NULL;\n", name
 	print  ""
 }
 
@@ -114,8 +114,8 @@ END	{
 			print  "static IT *"
 			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
 			print  "{"
-			print  "	if (*value == 0) {"
-			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
+			print  "	if (*value == NULL) {"
+			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != NULL) {"
 			print  "			unsigned n;"
 			print  "			for (n = 0; n < size; ++n) {"
 			print  "				(*value)[n] = (NCURSES_CONST char *) _nc_code_blob + offsets[n];"
diff --git a/ncurses/tinfo/MKnames.awk b/ncurses/tinfo/MKnames.awk
index 659bdfb66..18b97dd77 100644
--- a/ncurses/tinfo/MKnames.awk
+++ b/ncurses/tinfo/MKnames.awk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKnames.awk,v 1.25 2024/12/07 20:04:23 tom Exp $
+# $Id: MKnames.awk,v 1.26 2024/12/14 23:44:37 tom Exp $
 function large_item(value) {
 	result = sprintf("%d,", offset);
 	offset = offset + length(value) + 1;
@@ -63,7 +63,7 @@ function print_offsets(name,value) {
 	printf "%s",  value
 	print  "};"
 	print  ""
-	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
+	printf "static NCURSES_CONST char ** ptr_%s = NULL;\n", name
 	print  ""
 }
 
@@ -123,8 +123,8 @@ END	{
 			print  "static IT *"
 			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
 			print  "{"
-			print  "	if (*value == 0) {"
-			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
+			print  "	if (*value == NULL) {"
+			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != NULL) {"
 			print  "			unsigned n;"
 			print  "			for (n = 0; n < size; ++n) {"
 			print  "				(*value)[n] = (NCURSES_CONST char *) _nc_name_blob + offsets[n];"
diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 3f27076ba..57272a8f6 100644
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: entries.c,v 1.38 2024/12/07 18:23:25 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.39 2024/12/14 23:48:20 tom Exp $")
 
 /****************************************************************************
  *
@@ -133,7 +133,7 @@ _nc_leaks_tinfo(void)
     {
 	PRESCREEN_LIST *p;
 	pthread_t id = GetThreadID();
-	for (p = _nc_prescreen.allocated; p != 0; p = p->next) {
+	for (p = _nc_prescreen.allocated; p != NULL; p = p->next) {
 	    if (p->id == id && p->sp != CURRENT_SCREEN) {
 		FreeAndNull(p->sp);
 	    }
diff --git a/ncurses/tinfo/lib_acs.c b/ncurses/tinfo/lib_acs.c
index 4f3b38fd5..c66c45dbb 100644
--- a/ncurses/tinfo/lib_acs.c
+++ b/ncurses/tinfo/lib_acs.c
@@ -40,14 +40,14 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_acs.c,v 1.51 2024/12/07 20:05:08 tom Exp $")
+MODULE_ID("$Id: lib_acs.c,v 1.52 2024/12/15 00:11:15 tom Exp $")
 
 #if BROKEN_LINKER || USE_REENTRANT
 #define MyBuffer _nc_prescreen.real_acs_map
 NCURSES_EXPORT(chtype *)
 NCURSES_PUBLIC_VAR(acs_map) (void)
 {
-    if (MyBuffer == 0)
+    if (MyBuffer == NULL)
 	MyBuffer = typeCalloc(chtype, ACS_LEN);
     return MyBuffer;
 }
@@ -66,7 +66,7 @@ NCURSES_SP_NAME(_nc_acs_char) (NCURSES_SP_DCLx int c)
     chtype *map;
     if (c < 0 || c >= ACS_LEN)
 	return (chtype) 0;
-    map = (SP_PARM != 0) ? SP_PARM->_acs_map :
+    map = (SP_PARM != NULL) ? SP_PARM->_acs_map :
 #if BROKEN_LINKER || USE_REENTRANT
 	_nc_prescreen.real_acs_map
 #else
diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 3466a0b42..2911d5614 100644
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -41,7 +41,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>		/* VALID_STRING */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.50 2024/12/07 20:05:08 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.51 2024/12/14 23:48:20 tom Exp $")
 
 #undef CUR
 #define CUR TerminalType(termp).
@@ -51,7 +51,7 @@ MODULE_ID("$Id: lib_cur_term.c,v 1.50 2024/12/07 20:05:08 tom Exp $")
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
 {
-    return ((0 != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
+    return ((NULL != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
 }
 
 #if NCURSES_SP_FUNCS
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index b05117c8b..f22cc9280 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.90 2024/12/07 18:23:25 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.92 2024/12/15 01:28:56 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -53,17 +53,17 @@ MODULE_ID("$Id: lib_data.c,v 1.90 2024/12/07 18:23:25 tom Exp $")
 NCURSES_EXPORT(WINDOW *)
 NCURSES_PUBLIC_VAR(stdscr) (void)
 {
-    return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : 0;
+    return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : NULL;
 }
 NCURSES_EXPORT(WINDOW *)
 NCURSES_PUBLIC_VAR(curscr) (void)
 {
-    return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : 0;
+    return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : NULL;
 }
 NCURSES_EXPORT(WINDOW *)
 NCURSES_PUBLIC_VAR(newscr) (void)
 {
-    return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0;
+    return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : NULL;
 }
 #else
 NCURSES_EXPORT_VAR(WINDOW *) stdscr = NULL;
@@ -162,7 +162,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #endif /* HAVE_TSEARCH */
 
 #ifdef USE_TERM_DRIVER
-    0,				/* term_driver */
+    NULL,			/* term_driver */
 #endif
 
 #ifndef USE_SP_WINDOWLIST
@@ -272,7 +272,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
     0,				/* COLS */
     8,				/* TABSIZE */
     1000,			/* ESCDELAY */
-    0,				/* cur_term */
+    NULL,			/* cur_term */
 #endif
 #ifdef TRACE
 #if BROKEN_LINKER || USE_REENTRANT
diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index 1a1920cac..6c742fd9e 100644
--- a/ncurses/tinfo/lib_napms.c
+++ b/ncurses/tinfo/lib_napms.c
@@ -52,7 +52,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_napms.c,v 1.29 2024/08/31 15:55:00 tom Exp $")
+MODULE_ID("$Id: lib_napms.c,v 1.30 2024/12/14 23:57:01 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
@@ -81,7 +81,7 @@ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
 #elif defined(_NC_WINDOWS_NATIVE)
     Sleep((DWORD) ms);
 #else
-    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
+    _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL));
 #endif
 #endif /* !USE_TERM_DRIVER */
 
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 2741cd174..3782e091d 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.247 2024/12/07 20:21:01 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.248 2024/12/15 00:12:19 tom Exp $")
 
 /****************************************************************************
  *
@@ -115,7 +115,7 @@ NCURSES_PUBLIC_VAR(ttytype) (void)
 #if NCURSES_SP_FUNCS
     if (CURRENT_SCREEN) {
 	TERMINAL *termp = TerminalOf(CURRENT_SCREEN);
-	if (termp != 0) {
+	if (termp != NULL) {
 	    result = TerminalType(termp).term_names;
 	}
     }
@@ -475,7 +475,7 @@ _nc_get_screensize(SCREEN *sp,
     TCB->drv->td_size(TCB, linep, colp);
 
 #if USE_REENTRANT
-    if (sp != 0) {
+    if (sp != NULL) {
 	sp->_TABSIZE = my_tabsize;
     }
 #else
@@ -606,7 +606,7 @@ _nc_get_screensize(SCREEN *sp,
 	my_tabsize = 8;
 
 #if USE_REENTRANT
-    if (sp != 0)
+    if (sp != NULL)
 	sp->_TABSIZE = my_tabsize;
 #else
     TABSIZE = my_tabsize;
@@ -825,7 +825,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 		 int reuse)
 {
 #ifdef USE_TERM_DRIVER
-    TERMINAL_CONTROL_BLOCK *TCB = 0;
+    TERMINAL_CONTROL_BLOCK *TCB = NULL;
 #endif
     TERMINAL *termp;
     SCREEN *sp = NULL;
@@ -838,7 +838,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
     T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"),
        (void *) tp, _nc_visbuf(tname), Filedes, (void *) errret));
 
-    if (tp == 0) {
+    if (tp == NULL) {
 	ret_error0(TGETENT_ERR,
 		   "Invalid parameter, internal error.\n");
     } else
@@ -916,8 +916,8 @@ TINFO_SETUP_TERM(TERMINAL **tp,
     } else {
 #ifdef USE_TERM_DRIVER
 	TERMINAL_CONTROL_BLOCK *my_tcb;
-	termp = 0;
-	if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != 0)
+	termp = NULL;
+	if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != NULL)
 	    termp = &(my_tcb->term);
 #else
 	int status;
@@ -1076,10 +1076,10 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 NCURSES_EXPORT(SCREEN *)
 _nc_find_prescr(void)
 {
-    SCREEN *result = 0;
+    SCREEN *result = NULL;
     PRESCREEN_LIST *p;
     pthread_t id = GetThreadID();
-    for (p = _nc_prescreen.allocated; p != 0; p = p->next) {
+    for (p = _nc_prescreen.allocated; p != NULL; p = p->next) {
 	if (p->id == id) {
 	    result = p->sp;
 	    break;
@@ -1099,7 +1099,7 @@ _nc_forget_prescr(void)
     PRESCREEN_LIST *p, *q;
     pthread_t id = GetThreadID();
     _nc_lock_global(screen);
-    for (p = _nc_prescreen.allocated, q = 0; p != 0; q = p, p = p->next) {
+    for (p = _nc_prescreen.allocated, q = NULL; p != NULL; q = p, p = p->next) {
 	if (p->id == id) {
 	    if (q) {
 		q->next = p->next;
@@ -1136,7 +1136,7 @@ new_prescr(void)
 	if (sp != NULL) {
 #ifdef USE_PTHREADS
 	    PRESCREEN_LIST *p = typeCalloc(PRESCREEN_LIST, 1);
-	    if (p != 0) {
+	    if (p != NULL) {
 		p->id = GetThreadID();
 		p->sp = sp;
 		p->next = _nc_prescreen.allocated;
@@ -1180,14 +1180,14 @@ _nc_setupterm(const char *tname,
 	      int reuse)
 {
     int rc = ERR;
-    TERMINAL *termp = 0;
+    TERMINAL *termp = NULL;
 
     _nc_init_pthreads();
     _nc_lock_global(prescreen);
     START_TRACE();
     if (TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse) == OK) {
 	_nc_forget_prescr();
-	if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != 0) {
+	if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != NULL) {
 	    rc = OK;
 	}
     }
diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index ec2c22b7f..2bfd8a1fa 100644
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_termcap.c,v 1.91 2024/12/07 18:26:04 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.92 2024/12/15 00:12:19 tom Exp $")
 
 NCURSES_EXPORT_VAR(char *) UP = NULL;
 NCURSES_EXPORT_VAR(char *) BC = NULL;
@@ -95,7 +95,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
     int n;
     bool found_cache = FALSE;
 #ifdef USE_TERM_DRIVER
-    TERMINAL *termp = 0;
+    TERMINAL *termp = NULL;
 #endif
 
     START_TRACE();
@@ -104,7 +104,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name)
     TINFO_SETUP_TERM(&termp, name, STDOUT_FILENO, &rc, TRUE);
 
 #ifdef USE_TERM_DRIVER
-    if (termp == 0 ||
+    if (termp == NULL ||
 	!((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
 	returnCode(rc);
 #endif
diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c
index ceb34c337..51fe99894 100644
--- a/ncurses/tinfo/lib_ttyflags.c
+++ b/ncurses/tinfo/lib_ttyflags.c
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_ttyflags.c,v 1.37 2024/12/07 21:24:18 tom Exp $")
+MODULE_ID("$Id: lib_ttyflags.c,v 1.38 2024/12/15 00:12:19 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
@@ -55,7 +55,7 @@ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
     } else {
 
 #ifdef USE_TERM_DRIVER
-	if (SP_PARM != 0) {
+	if (SP_PARM != NULL) {
 	    result = CallDriver_2(SP_PARM, td_sgmode, FALSE, buf);
 	} else {
 	    result = ERR;
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index 1ed9c0529..e0e0dd533 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.76 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.77 2024/12/15 00:23:20 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -215,7 +215,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
      * _nc_setupscreen().  Do it now anyway, so we can initialize the
      * baudrate.
      */
-    if (sp == 0 && NC_ISATTY(termp->Filedes)) {
+    if (sp == NULL && NC_ISATTY(termp->Filedes)) {
 	get_baudrate(termp);
     }
 #if NCURSES_EXT_NUMBERS
@@ -323,7 +323,7 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg)
     AssertTCB();
     SetSP();
 
-    if (sp != 0 && orig_pair && orig_colors && (initialize_pair != 0)) {
+    if (sp != NULL && orig_pair && orig_colors && (initialize_pair != NULL)) {
 #if NCURSES_EXT_FUNCS
 	sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
 	sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx
@@ -331,7 +331,7 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg)
 			      == TRUE);
 	sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
 	sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
-	if (sp->_color_pairs != 0) {
+	if (sp->_color_pairs != NULL) {
 	    bool save = sp->_default_color;
 	    sp->_default_color = TRUE;
 	    NCURSES_SP_NAME(init_pair) (NCURSES_SP_ARGx
@@ -391,7 +391,7 @@ drv_rescol(TERMINAL_CONTROL_BLOCK * TCB)
     AssertTCB();
     SetSP();
 
-    if (orig_pair != 0) {
+    if (orig_pair != NULL) {
 	NCURSES_PUTP2("orig_pair", orig_pair);
 	result = TRUE;
     }
@@ -407,7 +407,7 @@ drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB)
     AssertTCB();
     SetSP();
 
-    if (orig_colors != 0) {
+    if (orig_colors != NULL) {
 	NCURSES_PUTP2("orig_colors", orig_colors);
 	result = TRUE;
     }
@@ -470,7 +470,7 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp)
 		errno = 0;
 		do {
 		    if (ioctl(termp->Filedes, IOCTL_WINSIZE, &size) >= 0) {
-			*linep = ((sp != 0 && sp->_filtered)
+			*linep = ((sp != NULL && sp->_filtered)
 				  ? 1
 				  : WINSIZE_ROWS(size));
 			*colp = WINSIZE_COLS(size);
@@ -489,7 +489,7 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp)
 		/*
 		 * If environment variables are used, update them.
 		 */
-		if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
+		if ((sp == NULL || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
 		    _nc_setenv_num("LINES", *linep);
 		}
 		if (_nc_getenv_num("COLUMNS") > 0) {
@@ -676,7 +676,7 @@ drv_release(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED)
 {
 }
 
-#  define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
+#  define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode))
 
 static void
 drv_screen_init(SCREEN *sp)
@@ -791,7 +791,7 @@ static int
 default_fg(SCREEN *sp)
 {
 #if NCURSES_EXT_FUNCS
-    return (sp != 0) ? sp->_default_fg : COLOR_WHITE;
+    return (sp != NULL) ? sp->_default_fg : COLOR_WHITE;
 #else
     return COLOR_WHITE;
 #endif
@@ -801,7 +801,7 @@ static int
 default_bg(SCREEN *sp)
 {
 #if NCURSES_EXT_FUNCS
-    return sp != 0 ? sp->_default_bg : COLOR_BLACK;
+    return sp != NULL ? sp->_default_bg : COLOR_BLACK;
 #else
     return COLOR_BLACK;
 #endif
@@ -833,7 +833,7 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
     int old_fg, old_bg;
 
     AssertTCB();
-    if (sp == 0)
+    if (sp == NULL)
 	return;
 
     if (pair < 0 || pair >= COLOR_PAIRS) {
@@ -844,13 +844,13 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
 	    NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 				    TIPARM_1(set_color_pair, pair), 1, outc);
 	    return;
-	} else if (sp != 0) {
+	} else if (sp != NULL) {
 	    _nc_pair_content(SP_PARM, pair, &fg, &bg);
 	}
     }
 
     if (old_pair >= 0
-	&& sp != 0
+	&& sp != NULL
 	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
@@ -921,10 +921,10 @@ drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB)
     SetSP();
 
     /* we know how to recognize mouse events under "xterm" */
-    if (sp != 0) {
+    if (sp != NULL) {
 	if (NonEmpty(key_mouse)) {
 	    init_xterm_mouse(sp);
-	} else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) {
+	} else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
 	    if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
 		init_xterm_mouse(sp);
 	}
@@ -1091,7 +1091,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map)
      *
      * test/blue.c uses this feature.
      */
-#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b))
+#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b))
     if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) &&
 	PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) {
 	size_t i;
@@ -1099,7 +1099,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map)
 	    if (real_map[i] == 0) {
 		real_map[i] = (chtype) i;
 		if (real_map != fake_map) {
-		    if (sp != 0)
+		    if (sp != NULL)
 			sp->_screen_acs_map[i] = TRUE;
 		}
 	    }
@@ -1118,7 +1118,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map)
 		   (int) i,
 		   _tracechar(UChar(acs_chars[i])),
 		   _tracechtype(real_map[UChar(acs_chars[i])])));
-		if (sp != 0) {
+		if (sp != NULL) {
 		    sp->_screen_acs_map[UChar(acs_chars[i])] = TRUE;
 		}
 	    }
@@ -1163,7 +1163,7 @@ _nc_cookie_init(SCREEN *sp)
     bool support_cookies = USE_XMC_SUPPORT;
     TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) (sp->_term);
 
-    if (sp == 0 || !ENSURE_TINFO(sp))
+    if (sp == NULL || !ENSURE_TINFO(sp))
 	return;
 
 #if USE_XMC_SUPPORT
@@ -1172,7 +1172,7 @@ _nc_cookie_init(SCREEN *sp)
      * in the environment, reset the support-flag.
      */
     if (magic_cookie_glitch >= 0) {
-	if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) {
+	if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) {
 	    support_cookies = FALSE;
 	}
     }
@@ -1313,7 +1313,7 @@ drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms)
 #elif defined(EXP_WIN32_DRIVER)
     Sleep((DWORD) ms);
 #else
-    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
+    _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL));
 #endif
     return OK;
 }
@@ -1380,7 +1380,7 @@ drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag)
 	unsigned ch = (unsigned) c;
 	if (flag) {
 	    while ((s = _nc_expand_try(sp->_key_ok,
-				       ch, &count, (size_t) 0)) != 0) {
+				       ch, &count, (size_t) 0)) != NULL) {
 		if (_nc_remove_key(&(sp->_key_ok), ch)) {
 		    code = _nc_add_to_try(&(sp->_keytry), s, ch);
 		    free(s);
@@ -1393,7 +1393,7 @@ drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag)
 	    }
 	} else {
 	    while ((s = _nc_expand_try(sp->_keytry,
-				       ch, &count, (size_t) 0)) != 0) {
+				       ch, &count, (size_t) 0)) != NULL) {
 		if (_nc_remove_key(&(sp->_keytry), ch)) {
 		    code = _nc_add_to_try(&(sp->_key_ok), s, ch);
 		    free(s);
@@ -1420,7 +1420,7 @@ drv_cursorSet(TERMINAL_CONTROL_BLOCK * TCB, int vis)
 
     T((T_CALLED("tinfo:drv_cursorSet(%p,%d)"), (void *) SP_PARM, vis));
 
-    if (SP_PARM != 0 && IsTermInfo(SP_PARM)) {
+    if (SP_PARM != NULL && IsTermInfo(SP_PARM)) {
 	switch (vis) {
 	case 2:
 	    code = NCURSES_PUTP2_FLUSH("cursor_visible", cursor_visible);
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 010daed44..d026290b5 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.162 2024/12/07 20:06:49 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.163 2024/12/15 00:04:06 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -1106,7 +1106,7 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
 			ynew, xnew,
 			NCURSES_SP_NAME(_nc_outch),
 			TRUE);
-    if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial))
+    if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial))
 	NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     return rc;
diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index 2ae17e082..cc131cc18 100644
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -43,7 +43,7 @@
 
 #include <SigAction.h>
 
-MODULE_ID("$Id: lib_tstp.c,v 1.55 2024/12/07 20:06:49 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.57 2024/12/15 02:01:17 tom Exp $")
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 92e9bb47e..e2bad8ee2 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241207) unstable; urgency=low
+ncurses6td (6.5+20241214) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 92e9bb47e..e2bad8ee2 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241207) unstable; urgency=low
+ncurses6td (6.5+20241214) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2c3c5480d..68c2c95d0 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241207) unstable; urgency=low
+ncurses6td (6.5+20241214) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2024 06:51:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index fe9352f3c..d8d56fd9e 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.679 2024/12/07 11:51:44 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.680 2024/12/14 11:34:56 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1207"
+!define VERSION_MMDD  "1214"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 22d26fc9d..12a9cc73d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241207
+Release: 20241214
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b9ea50a2b..2aa89027b 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241207
+Release: 20241214
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 85989b064..dcb35236e 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241207
+Release: 20241214
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 8d6f42779fa5cafc11d4d89ac1001bfc67fcc194 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 22 Dec 2024 02:11:31 +0100
Subject: [PATCH 095/106] ncurses-6.5-20241221.patch.gz

---
 Ada95/aclocal.m4                 | 18 ++++----
 Ada95/configure                  |  8 ++--
 NEWS                             | 11 ++++-
 VERSION                          |  2 +-
 aclocal.m4                       | 10 ++---
 c++/cursesw.h                    |  7 +--
 configure                        |  2 +-
 dist.mk                          |  4 +-
 form/form.priv.h                 |  5 ++-
 form/fty_int.c                   |  6 +--
 form/fty_num.c                   |  6 +--
 ncurses/base/MKlib_gen.sh        |  3 +-
 ncurses/tinfo/MKfallback.sh      |  4 +-
 ncurses/tinfo/lib_data.c         |  4 +-
 ncurses/tinfo/trim_sgr0.c        | 75 ++++++++++++++++++++++++++++++--
 ncurses/tinfo/write_entry.c      |  8 ++--
 ncurses/trace/lib_tracebits.c    |  6 +--
 ncurses/tty/lib_tstp.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 +-
 progs/infocmp.c                  |  4 +-
 test/aclocal.m4                  | 10 ++---
 test/configure                   |  4 +-
 test/foldkeys.c                  |  4 +-
 test/padview.c                   |  5 ++-
 30 files changed, 156 insertions(+), 78 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 26dd9df08..faecc037c 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.222 2024/11/09 23:14:10 tom Exp $
+dnl $Id: aclocal.m4,v 1.223 2024/12/21 15:29:41 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -477,7 +477,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
+dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -555,7 +555,7 @@ if test "$cross_compiling" = yes ; then
 	AC_TRY_RUN([#include <stdio.h>
 		int main(int argc, char *argv[])
 		{
-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
 		}
 	],
 		cf_ok_build_cc=yes,
@@ -901,7 +901,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
+dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -928,7 +928,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 AC_TRY_COMPILE(
 [
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 ],
 [String foo = malloc(1); free((void*)foo)],[
@@ -939,7 +939,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 		],[String foo = malloc(1); *foo = 0],[
 			cf_cv_const_x_string=no
@@ -1508,7 +1508,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
+dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
 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:
@@ -4013,7 +4013,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
+dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4529,7 +4529,7 @@ cat > conftest.$ac_ext <<EOF
 int main(int argc, char *argv[[]])
 {
 	printf("hello\\n");
-	return (argv[[argc-1]] == 0) ;
+	return (argv[[argc-1]] == NULL) ;
 }
 EOF
 		cf_save_CFLAGS="$CFLAGS"
diff --git a/Ada95/configure b/Ada95/configure
index 349fedb89..a2c7aff8e 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -4743,7 +4743,7 @@ else
 #include <stdio.h>
 		int main(int argc, char *argv[])
 		{
-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
 		}
 
 _ACEOF
@@ -12772,7 +12772,7 @@ cat > conftest.$ac_ext <<EOF
 int main(int argc, char *argv[])
 {
 	printf("hello\\n");
-	return (argv[argc-1] == 0) ;
+	return (argv[argc-1] == NULL) ;
 }
 EOF
 		cf_save_CFLAGS="$CFLAGS"
@@ -16299,7 +16299,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #line 16299 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
@@ -16336,7 +16336,7 @@ else
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
diff --git a/NEWS b/NEWS
index 70fa5178a..8c86dddac 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4212 2024/12/14 20:03:39 tom Exp $
+-- $Id: NEWS,v 1.4216 2024/12/21 20:43:26 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,10 +46,17 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241221
+	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
+	  lacks BSD-style \< and \>
+	+ trim padding from sgr expresion used in trim_sgr0, to avoid copying
+	  the padding into the resulting sgr0 (report by Rajeev Pillai).
+	+ strict compiler-warning fixes for upcoming gcc15
+
 20241214
 	+ avoid redefining bool in curses.h if the platform already supports
 	  that type (cf: 20241123).
-	+ move include <curses.h> from etip.h.in to cursesw.hh, to work around
+	+ move include <curses.h> from etip.h.in to cursesw.h, to work around
 	  breakage in Apple's port of ncurses.
 	+ strict compiler-warning fixes for upcoming gcc15
 
diff --git a/VERSION b/VERSION
index 70e3d6fbe..4a7915326 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241214
+5:0:10	6.5	20241221
diff --git a/aclocal.m4 b/aclocal.m4
index e34211b7e..b08857740 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1096 2024/12/14 21:33:29 tom Exp $
+dnl $Id: aclocal.m4,v 1.1097 2024/12/21 13:44:45 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3115,7 +3115,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 42 updated: 2024/12/14 09:09:41
+dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
 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:
@@ -3141,7 +3141,7 @@ AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 cat > "conftest.$ac_ext" <<EOF
 #line __oline__ "${as_me:-configure}"
-int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == (void*)0) ; }
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 then
@@ -3729,7 +3729,7 @@ if test "$GXX" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GXX_WARNINGS version: 12 updated: 2024/12/14 16:09:34
+dnl CF_GXX_WARNINGS version: 13 updated: 2024/12/21 08:44:12
 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl
@@ -3761,7 +3761,7 @@ AC_LANG_CPLUSPLUS
 
 cat > conftest.$ac_ext <<EOF
 #line __oline__ "configure"
-int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == (void*)0) ; }
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 
 if test "$INTEL_CPLUSPLUS" = yes
diff --git a/c++/cursesw.h b/c++/cursesw.h
index 075262012..8ef0868cd 100644
--- a/c++/cursesw.h
+++ b/c++/cursesw.h
@@ -32,11 +32,9 @@
 #ifndef NCURSES_CURSESW_H_incl
 #define NCURSES_CURSESW_H_incl 1
 
-// $Id: cursesw.h,v 1.60 2024/12/14 19:08:22 tom Exp $
+// $Id: cursesw.h,v 1.61 2024/12/15 16:06:49 tom Exp $
 
-extern "C" {
-#  include   <curses.h>
-}
+#include <curses.h>
 
 #if defined(BUILDING_NCURSES_CXX)
 # define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_EXPORT
@@ -50,7 +48,6 @@ extern "C" {
 #define NCURSES_CXX_EXPORT_VAR(type) NCURSES_CXX_IMPEXP type
 
 #include <etip.h>
-#include <curses.h>
 
 /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
    Undefine it here, because NCursesWindow uses lines as a method.  */
diff --git a/configure b/configure
index aafbe5528..6a6df419c 100755
--- a/configure
+++ b/configure
@@ -17892,7 +17892,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
 #line 17894 "${as_me:-configure}"
-int main(int argc, char *argv[]) { return (argv[argc-1] == (void*)0) ; }
+int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 then
diff --git a/dist.mk b/dist.mk
index 0a439d92b..08c5ee6e9 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1645 2024/12/14 11:34:56 tom Exp $
+# $Id: dist.mk,v 1.1646 2024/12/21 10:55:02 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241214
+NCURSES_PATCH = 20241221
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/form/form.priv.h b/form/form.priv.h
index e5a26a408..4abdb78cc 100644
--- a/form/form.priv.h
+++ b/form/form.priv.h
@@ -31,7 +31,7 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
-/* $Id: form.priv.h,v 0.50 2024/12/07 21:57:21 tom Exp $ */
+/* $Id: form.priv.h,v 0.51 2024/12/21 17:09:39 tom Exp $ */
 
 #ifndef FORM_PRIV_H
 #define FORM_PRIV_H 1
@@ -172,6 +172,9 @@ TypeArgument;
 
 #define C_ZEROS '\0'
 
+#define MAX_DIGITS	64
+#define MaxDigits(n)	((n) > MAX_DIGITS ? MAX_DIGITS : ((n) > 0 ? (n) : 0))
+
 extern FORM_EXPORT(TypeArgument *) _nc_Make_Argument (const FIELDTYPE*, va_list*, int*);
 extern FORM_EXPORT(TypeArgument *) _nc_Copy_Argument (const FIELDTYPE*, const TypeArgument*, int*);
 extern FORM_EXPORT(void) _nc_Free_Argument (const FIELDTYPE*, TypeArgument*);
diff --git a/form/fty_int.c b/form/fty_int.c
index 80a59be2c..7cd90bb02 100644
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_int.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.36 2024/12/21 17:14:36 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
@@ -235,10 +235,10 @@ Check_This_Field(FIELD *field, const void *argp)
 	    }
 	  if (result)
 	    {
-	      char buf[100];
+	      char buf[MAX_DIGITS + 3];
 
 	      _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
-			  "%.*ld", (prec > 0 ? prec : 0), val);
+			  "%.*ld", MaxDigits(prec), val);
 	      set_field_buffer(field, 0, buf);
 	    }
 	}
diff --git a/form/fty_num.c b/form/fty_num.c
index 180ef1064..9f03b2e6e 100644
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -35,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_num.c,v 1.39 2024/12/07 21:58:32 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.40 2024/12/21 17:16:09 tom Exp $")
 
 #if HAVE_LOCALE_H
 #include <locale.h>
@@ -273,10 +273,10 @@ Check_This_Field(FIELD *field, const void *argp)
 	    }
 	  if (result)
 	    {
-	      char buf[64];
+	      char buf[MAX_DIGITS * 6];
 
 	      _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
-			  "%.*f", (prec > 0 ? prec : 0), val);
+			  "%.*f", MaxDigits(prec), val);
 	      set_field_buffer(field, 0, buf);
 	    }
 	}
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index bbdc869ac..a41e18c2c 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.75 2024/12/07 21:50:24 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.76 2024/12/21 16:51:25 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
@@ -191,6 +191,7 @@ cat >$ED4 <<EOF
 	s/\(((\)0\([ ]*!=[ ]*(const void\)/\1NULL\2/g
 	/returnCode(wborder_set/s,0,NULL,g
 	/returnWin/s,0,NULL,
+	/_parent/s,0,NULL,
 EOF
 else
 cat >$ED4 <<EOF
diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 95b0b2675..cfdfa7daf 100755
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -27,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKfallback.sh,v 1.27 2024/12/07 20:57:05 tom Exp $
+# $Id: MKfallback.sh,v 1.28 2024/12/21 18:45:15 tom Exp $
 #
 # MKfallback.sh -- create fallback table for entry reads
 #
@@ -95,7 +95,7 @@ EOF
 	for x in "$@"
 	do
 		echo "/* $x */"
-		"$infocmp_path" -E "$x" | sed -e 's/\<short\>/NCURSES_INT2/g'
+		"$infocmp_path" -E "$x" | sed -e 's/[ 	]short[ 	]/ NCURSES_INT2 /g'
 	done
 
 	cat <<EOF
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index f22cc9280..cf7115bbf 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.92 2024/12/15 01:28:56 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.93 2024/12/21 20:27:36 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -188,7 +188,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     0,				/* nested_tracef */
     0,				/* use_pthreads */
 #if USE_PTHREADS_EINTR
-    0,				/* read_thread */
+    (pthread_t)	0,		/* read_thread */
 #endif
 #endif
 #if USE_WIDEC_SUPPORT
diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index bab323b93..d9c38d878 100644
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -37,11 +37,77 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: trim_sgr0.c,v 1.26 2024/12/07 21:02:59 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.27 2024/12/21 20:15:26 tom Exp $")
 
 #undef CUR
 #define CUR tp->
 
+/*
+ * Skip a padding token, e.g., "<5>", "<5.1>", "<5/>", "<5*>", or "<5/>".
+ * If the pattern does not match, return null.
+ */
+static char *
+skip_padding(char *value)
+{
+    char *result = NULL;
+    if (*value++ == '$' && *value++ == '<') {
+	int ch;
+	int state = 0;		/* 1=integer, 2=decimal, 3=fraction */
+	while ((ch = UChar(*value++)) != '\0') {
+	    if (ch == '*' || ch == '/') {
+		if (!state)
+		    break;
+	    } else if (ch == '>') {
+		if (state)
+		    result = value;
+		break;
+	    } else if (ch == '.') {
+		if (state < 2) {
+		    state = 2;
+		} else {
+		    break;	/* a single decimal point is allowed */
+		}
+	    } else if (isdigit(ch)) {
+		if (state < 2) {
+		    state = 1;
+		} else if (state == 2) {
+		    state = 3;
+		} else {
+		    break;	/* only a single digit after decimal point */
+		}
+	    } else {
+		break;
+	    }
+	}
+    }
+    return result;
+}
+
+static void
+strip_padding(char *value)
+{
+    char *s = value;
+    char ch;
+
+    while ((ch = *s) != '\0') {
+	if (ch == '\\') {
+	    if (*++s == '\0')
+		break;
+	    ++s;
+	} else {
+	    char *d = NULL;
+	    if (ch == '$')
+		d = skip_padding(s);
+	    if (d != NULL) {
+		char *t = s;
+		while ((*t++ = *d++) != '\0') ;
+	    } else {
+		++s;
+	    }
+	}
+    }
+}
+
 static char *
 set_attribute_9(const TERMTYPE2 *tp, int flag)
 {
@@ -49,10 +115,13 @@ set_attribute_9(const TERMTYPE2 *tp, int flag)
     char *result;
 
     value = TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag);
-    if (PRESENT(value))
+    if (PRESENT(value)) {
 	result = strdup(value);
-    else
+	if (result != NULL)
+	    strip_padding(result);
+    } else {
 	result = NULL;
+    }
     return result;
 }
 
diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index eb6e36274..a250677de 100644
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: write_entry.c,v 1.138 2024/12/07 21:13:36 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.139 2024/12/21 16:42:33 tom Exp $")
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
@@ -132,10 +132,10 @@ check_writeable(int code)
     const char *s = NULL;
 
     if (code == 0 || (s = (strchr) (dirnames, code)) == NULL) {
-	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
+	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", UChar(code));
     } else if (!verified[s - dirnames]) {
 	char dir[sizeof(LEAF_FMT)];
-	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
+	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, UChar(code));
 	if (make_db_root(dir) < 0) {
 	    _nc_err_abort("%s/%s: (errno %d) %s",
 			  _nc_tic_dir(NULL),
@@ -495,7 +495,7 @@ _nc_write_entry(TERMTYPE2 *const tp)
 
 	check_writeable(ptr[0]);
 	_nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
-		    LEAF_FMT "/%.*s", ptr[0],
+		    LEAF_FMT "/%.*s", UChar(ptr[0]),
 		    (int) sizeof(linkname) - (2 + LEAF_LEN), ptr);
 
 	if (strcmp(filename, linkname) == 0) {
diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c
index 1142c5342..d953fb6e6 100644
--- a/ncurses/trace/lib_tracebits.c
+++ b/ncurses/trace/lib_tracebits.c
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_tracebits.c,v 1.32 2024/12/07 21:24:18 tom Exp $")
+MODULE_ID("$Id: lib_tracebits.c,v 1.33 2024/12/21 16:39:29 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -79,14 +79,14 @@ MODULE_ID("$Id: lib_tracebits.c,v 1.32 2024/12/07 21:24:18 tom Exp $")
 #endif
 
 typedef struct {
-    unsigned int val;
+    unsigned long val;
     const char name[BITNAMELEN];
 } BITNAMES;
 
 #define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size)
 
 static void
-lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val)
+lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned long val)
 {
     const BITNAMES *sp;
 
diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index cc131cc18..daca203a0 100644
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -43,7 +43,7 @@
 
 #include <SigAction.h>
 
-MODULE_ID("$Id: lib_tstp.c,v 1.57 2024/12/15 02:01:17 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.58 2024/12/21 18:43:50 tom Exp $")
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
@@ -294,7 +294,7 @@ _nc_set_read_thread(bool enable)
 #  endif
 	    _nc_globals.read_thread = pthread_self();
     } else {
-	_nc_globals.read_thread = 0;
+	_nc_globals.read_thread = (pthread_t) 0;
     }
     _nc_unlock_global(curses);
 }
@@ -310,7 +310,7 @@ handle_SIGWINCH(int sig GCC_UNUSED)
     if (_nc_globals.read_thread) {
 	if (!pthread_equal(pthread_self(), _nc_globals.read_thread))
 	    pthread_kill(_nc_globals.read_thread, SIGWINCH);
-	_nc_globals.read_thread = 0;
+	_nc_globals.read_thread = (pthread_t) 0;
     }
 # endif
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index e2bad8ee2..9667d8b54 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241214) unstable; urgency=low
+ncurses6td (6.5+20241221) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index e2bad8ee2..9667d8b54 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241214) unstable; urgency=low
+ncurses6td (6.5+20241221) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 68c2c95d0..be91acbc3 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241214) unstable; urgency=low
+ncurses6td (6.5+20241221) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 14 Dec 2024 06:34:56 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d8d56fd9e..29c75fb5a 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.680 2024/12/14 11:34:56 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.681 2024/12/21 10:55:02 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1214"
+!define VERSION_MMDD  "1221"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 12a9cc73d..9293ebd1b 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241214
+Release: 20241221
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2aa89027b..5c741cf4e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241214
+Release: 20241221
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index dcb35236e..c52670c98 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241214
+Release: 20241221
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 8c923af8d..ff8e25d3c 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.170 2024/12/07 22:10:45 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.171 2024/12/21 17:02:07 tom Exp $")
 
 #ifndef ACTUAL_TIC
 #define ACTUAL_TIC "tic"
@@ -1347,7 +1347,7 @@ dump_initializers(const TERMTYPE2 *term)
 #define TP_LIMIT	((MAX_STRING - 6) - (size_t)(tp - buf))
 	    *tp++ = '"';
 	    for (sp = term->Strings[n];
-		 *sp != 0 && TP_LIMIT > 2;
+		 *sp != 0 && TP_LIMIT > 5;
 		 sp++) {
 		if (isascii(UChar(*sp))
 		    && isprint(UChar(*sp))
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 2c892f675..c5415799c 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.230 2024/11/30 19:43:11 tom Exp $
+dnl $Id: aclocal.m4,v 1.231 2024/12/21 15:24:55 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -697,7 +697,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
+dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -724,7 +724,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 AC_TRY_COMPILE(
 [
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 ],
 [String foo = malloc(1); free((void*)foo)],[
@@ -735,7 +735,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 		],[String foo = malloc(1); *foo = 0],[
 			cf_cv_const_x_string=no
@@ -1895,7 +1895,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
+dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
 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:
diff --git a/test/configure b/test/configure
index 5256ae88b..b8d3f4390 100755
--- a/test/configure
+++ b/test/configure
@@ -22909,7 +22909,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #line 22909 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
@@ -22946,7 +22946,7 @@ else
 #undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
-#include <stdlib.h>
+$ac_includes_default
 #include <X11/Intrinsic.h>
 
 int
diff --git a/test/foldkeys.c b/test/foldkeys.c
index d7205b146..1f8b7d4eb 100644
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.13 2024/12/07 23:03:07 tom Exp $
+ * $Id: foldkeys.c,v 1.14 2024/12/21 17:25:16 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -156,7 +156,7 @@ demo_foldkeys(void)
 		      final) == 3
 	    && *final != ';'
 	    && (need = strlen(info[j].value)) != 0
-	    && (value = strdup(info[j].value)) != NULL) {
+	    && (value = malloc(need + 8)) != NULL) {
 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
 	    _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
 	    for (k = 0; k < info_len; ++k) {
diff --git a/test/padview.c b/test/padview.c
index 356f5fc8c..5fcd8a07b 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -29,7 +29,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.27 2024/12/07 22:40:19 tom Exp $
+ * $Id: padview.c,v 1.28 2024/12/21 17:34:13 tom Exp $
  */
 
 #include <test.priv.h>
@@ -88,8 +88,9 @@ show_all(const char *tag, WINDOW *my_pad, int my_row)
     wattrset(stdscr, COLOR_PAIR(my_pair));
     clear();
 
+    i = (int) (sizeof(temp) - strlen(tag) - 8);
     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
-		"view %.*s", (int) strlen(tag), tag);
+		"view %.*s", i, tag);
     i = (int) strlen(temp);
     _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i)
 		" %.*s", (int) sizeof(temp) - i - 2, fname);

From 47f92b9e178f7946242788bc79e83155153bf301 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 29 Dec 2024 02:42:13 +0100
Subject: [PATCH 096/106] ncurses-6.5-20241228.patch.gz

---
 INSTALL                                    |   41 +-
 NEWS                                       |   11 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   11 +-
 configure                                  | 2526 ++++++++++----------
 configure.in                               |    5 +-
 dist.mk                                    |    4 +-
 doc/html/man/curs_add_wch.3x.html          |   22 +-
 doc/html/man/curs_add_wchstr.3x.html       |   12 +-
 doc/html/man/curs_addch.3x.html            |  143 +-
 doc/html/man/curs_addchstr.3x.html         |   12 +-
 doc/html/man/curs_addstr.3x.html           |   12 +-
 doc/html/man/curs_addwstr.3x.html          |   12 +-
 doc/html/man/curs_attr.3x.html             |   16 +-
 doc/html/man/curs_bkgd.3x.html             |   83 +-
 doc/html/man/curs_bkgrnd.3x.html           |   56 +-
 doc/html/man/curs_color.3x.html            |   14 +-
 doc/html/man/curs_delch.3x.html            |   10 +-
 doc/html/man/curs_deleteln.3x.html         |   10 +-
 doc/html/man/curs_get_wch.3x.html          |   14 +-
 doc/html/man/curs_get_wstr.3x.html         |   12 +-
 doc/html/man/curs_getch.3x.html            |   14 +-
 doc/html/man/curs_getstr.3x.html           |   12 +-
 doc/html/man/curs_in_wch.3x.html           |   10 +-
 doc/html/man/curs_inch.3x.html             |   10 +-
 doc/html/man/curs_inchstr.3x.html          |   10 +-
 doc/html/man/curs_initscr.3x.html          |   10 +-
 doc/html/man/curs_inopts.3x.html           |   24 +-
 doc/html/man/curs_ins_wch.3x.html          |   10 +-
 doc/html/man/curs_ins_wstr.3x.html         |   12 +-
 doc/html/man/curs_insch.3x.html            |   10 +-
 doc/html/man/curs_insstr.3x.html           |   12 +-
 doc/html/man/curs_instr.3x.html            |   12 +-
 doc/html/man/curs_inwstr.3x.html           |   12 +-
 doc/html/man/curs_mouse.3x.html            |   24 +-
 doc/html/man/curs_move.3x.html             |   10 +-
 doc/html/man/curs_opaque.3x.html           |   10 +-
 doc/html/man/curs_pad.3x.html              |   10 +-
 doc/html/man/curs_scr_dump.3x.html         |   31 +-
 doc/html/man/curs_slk.3x.html              |   12 +-
 doc/html/man/curs_termattrs.3x.html        |   10 +-
 doc/html/man/curs_termcap.3x.html          |   44 +-
 doc/html/man/curs_terminfo.3x.html         |  380 ++-
 doc/html/man/curs_touch.3x.html            |   10 +-
 doc/html/man/curs_trace.3x.html            |   12 +-
 doc/html/man/curs_util.3x.html             |   77 +-
 doc/html/man/curs_window.3x.html           |   10 +-
 doc/html/man/define_key.3x.html            |   12 +-
 doc/html/man/form.3x.html                  |   12 +-
 doc/html/man/form_field.3x.html            |   14 +-
 doc/html/man/form_field_buffer.3x.html     |   10 +-
 doc/html/man/form_field_new.3x.html        |   10 +-
 doc/html/man/form_field_userptr.3x.html    |   10 +-
 doc/html/man/form_field_validation.3x.html |   10 +-
 doc/html/man/form_fieldtype.3x.html        |   10 +-
 doc/html/man/form_hook.3x.html             |   18 +-
 doc/html/man/form_new.3x.html              |   12 +-
 doc/html/man/form_page.3x.html             |   10 +-
 doc/html/man/form_requestname.3x.html      |   10 +-
 doc/html/man/form_userptr.3x.html          |   10 +-
 doc/html/man/form_win.3x.html              |   14 +-
 doc/html/man/infocmp.1m.html               |  116 +-
 doc/html/man/keybound.3x.html              |   10 +-
 doc/html/man/menu.3x.html                  |   12 +-
 doc/html/man/menu_hook.3x.html             |   18 +-
 doc/html/man/menu_items.3x.html            |   14 +-
 doc/html/man/menu_mark.3x.html             |   16 +-
 doc/html/man/menu_new.3x.html              |   12 +-
 doc/html/man/menu_pattern.3x.html          |   12 +-
 doc/html/man/menu_requestname.3x.html      |   10 +-
 doc/html/man/menu_spacing.3x.html          |   10 +-
 doc/html/man/menu_userptr.3x.html          |   10 +-
 doc/html/man/menu_win.3x.html              |   14 +-
 doc/html/man/mitem_current.3x.html         |   12 +-
 doc/html/man/mitem_name.3x.html            |   10 +-
 doc/html/man/mitem_new.3x.html             |   10 +-
 doc/html/man/mitem_userptr.3x.html         |   10 +-
 doc/html/man/ncurses.3x.html               |   16 +-
 doc/html/man/panel.3x.html                 |   12 +-
 doc/html/man/resizeterm.3x.html            |   12 +-
 doc/html/man/term_variables.3x.html        |  109 +-
 doc/html/man/terminfo.5.html               |    6 +-
 doc/html/man/tput.1.html                   |   10 +-
 doc/html/man/tset.1.html                   |   10 +-
 doc/html/man/wresize.3x.html               |   33 +-
 include/MKterm.h.awk.in                    |   14 +-
 include/curses.h.in                        |    4 +-
 man/curs_add_wch.3x                        |   19 +-
 man/curs_add_wchstr.3x                     |    8 +-
 man/curs_addch.3x                          |   16 +-
 man/curs_addchstr.3x                       |    8 +-
 man/curs_addstr.3x                         |    8 +-
 man/curs_addwstr.3x                        |    8 +-
 man/curs_attr.3x                           |   14 +-
 man/curs_bkgd.3x                           |  165 +-
 man/curs_bkgrnd.3x                         |  103 +-
 man/curs_color.3x                          |   11 +-
 man/curs_delch.3x                          |    6 +-
 man/curs_deleteln.3x                       |    6 +-
 man/curs_get_wch.3x                        |    8 +-
 man/curs_get_wstr.3x                       |   12 +-
 man/curs_getch.3x                          |   10 +-
 man/curs_getstr.3x                         |   10 +-
 man/curs_in_wch.3x                         |    6 +-
 man/curs_inch.3x                           |    6 +-
 man/curs_inchstr.3x                        |    8 +-
 man/curs_initscr.3x                        |    7 +-
 man/curs_inopts.3x                         |   18 +-
 man/curs_ins_wch.3x                        |    6 +-
 man/curs_ins_wstr.3x                       |    8 +-
 man/curs_insch.3x                          |    6 +-
 man/curs_insstr.3x                         |    8 +-
 man/curs_instr.3x                          |    8 +-
 man/curs_inwstr.3x                         |    8 +-
 man/curs_mouse.3x                          |   26 +-
 man/curs_move.3x                           |    6 +-
 man/curs_opaque.3x                         |    8 +-
 man/curs_pad.3x                            |    6 +-
 man/curs_scr_dump.3x                       |   51 +-
 man/curs_slk.3x                            |   11 +-
 man/curs_termattrs.3x                      |    8 +-
 man/curs_termcap.3x                        |   72 +-
 man/curs_terminfo.3x                       |  438 ++--
 man/curs_touch.3x                          |    7 +-
 man/curs_trace.3x                          |   10 +-
 man/curs_util.3x                           |   16 +-
 man/curs_window.3x                         |    8 +-
 man/define_key.3x                          |    8 +-
 man/form.3x                                |   12 +-
 man/form_field.3x                          |   15 +-
 man/form_field_buffer.3x                   |    8 +-
 man/form_field_new.3x                      |    7 +-
 man/form_field_userptr.3x                  |    7 +-
 man/form_field_validation.3x               |    8 +-
 man/form_fieldtype.3x                      |    8 +-
 man/form_hook.3x                           |   27 +-
 man/form_new.3x                            |   11 +-
 man/form_page.3x                           |    8 +-
 man/form_requestname.3x                    |    8 +-
 man/form_userptr.3x                        |    7 +-
 man/form_win.3x                            |   16 +-
 man/infocmp.1m                             |  180 +-
 man/keybound.3x                            |    6 +-
 man/man_db.renames.in                      |    3 +-
 man/manhtml.aliases                        |    3 +-
 man/manlinks.sed                           |   43 +-
 man/menu.3x                                |   12 +-
 man/menu_hook.3x                           |   28 +-
 man/menu_items.3x                          |   13 +-
 man/menu_mark.3x                           |   17 +-
 man/menu_new.3x                            |   11 +-
 man/menu_pattern.3x                        |    9 +-
 man/menu_requestname.3x                    |    8 +-
 man/menu_spacing.3x                        |    8 +-
 man/menu_userptr.3x                        |    7 +-
 man/menu_win.3x                            |   16 +-
 man/mitem_current.3x                       |   10 +-
 man/mitem_name.3x                          |    7 +-
 man/mitem_new.3x                           |    8 +-
 man/mitem_userptr.3x                       |    7 +-
 man/ncurses.3x                             |    8 +-
 man/panel.3x                               |   20 +-
 man/resizeterm.3x                          |   13 +-
 man/term_variables.3x                      |  226 +-
 man/terminfo.tail                          |    9 +-
 man/tput.1                                 |    6 +-
 man/tset.1                                 |    6 +-
 man/wresize.3x                             |   12 +-
 misc/terminfo.src                          |  288 ++-
 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 +-
 176 files changed, 3716 insertions(+), 3118 deletions(-)

diff --git a/INSTALL b/INSTALL
index 73b6d065e..afbe12a26 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.257 2024/08/10 17:43:39 tom Exp $
+-- $Id: INSTALL,v 1.258 2024/12/28 21:37:40 Branden.Robinson Exp $
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@@ -709,7 +709,7 @@ CONFIGURE OPTIONS:
 	Use rpath option when generating shared libraries, and (with some
 	restrictions) when linking the corresponding programs.  This originally
 	(in 1997) applied mainly to systems using the GNU linker (read the
-	manpage).
+	man page).
 
 	More recently it is useful for systems that require special treatment
 	shared libraries in "unusual" locations.  The "system" libraries reside
@@ -1103,34 +1103,35 @@ CONFIGURE OPTIONS:
 		./configure --enable-static
 
     --with-manpage-aliases
-	Tell the configure script you wish to create entries in the
-	man-directory for aliases to manpages which list them, e.g., the
-	functions in the panel manpage.  This is the default.  You can disable
-	it if your man program does this.  You can also disable
-	--with-manpage-symlinks to install files containing a ".so" command
-	rather than symbolic links.
+	Create files in subdirectories of the installation "man" directory that
+	alias the man pages documenting them.  For example, the "beep" man page
+	also documents the function "flash".  This is the default.  You can
+	disable this procedure if your system's makewhatis(8) or mandb(8)
+	program indexes the directory to which the pages are installed.  If you
+	disable man page symlinks by specifying "--without-manpage-symlinks",
+	the alias pages are created as stubs containing ".so" *roff requests.
 
     --with-manpage-format=XXX
 	Tell the configure script how you would like to install man-pages.  The
-	option value must be one of these:  gzip, compress, BSDI, normal,
-	formatted.  If you do not give this option, the configure script
+	option value must be one of these: "gzip", "compress", "BSDI", "normal",
+	"formatted".  If you do not specify this option, the configure script
 	attempts to determine which is the case.
 
     --with-manpage-renames=XXX
-	Tell the configure script that you wish to rename the manpages while
-	installing.  Currently the only distribution which does this is Debian.
+	Tell the configure script that you wish to rename the man pages when
+	installing them.  Debian and distributions descended from it do this.
 	The option value specifies the name of a file that lists the renamed
-	files, e.g., $srcdir/man/man_db.renames
+	files, e.g., "$srcdir/man/man_db.renames".
 
     --with-manpage-symlinks
 	Tell the configure script that you wish to make symbolic links in the
 	man-directory for aliases to the man-pages.  This is the default, but
-	can be disabled for systems that provide this automatically.  Doing
-	this on systems that do not support symbolic links will result in
-	copying the man-page for each alias.
+	can be disabled for systems that provide this service automatically.
+	Doing this on systems that do not support symbolic links creates a copy
+	of the target man page for each alias.
 
     --with-manpage-tbl
-	Tell the configure script that you wish to preprocess the manpages
+	Tell the configure script that you wish to preprocess the man pages
 	by running them through tbl to generate tables understandable by
 	nroff.
 
@@ -1397,10 +1398,10 @@ CONFIGURE OPTIONS:
 
     --without-curses-h
 	Don't install the ncurses header with the name "curses.h".  Rather,
-	install as "ncurses.h" and modify the installed headers and manpages
+	install as "ncurses.h" and modify the installed headers and man pages
 	accordingly.
 
-	Likewise, do not install an alias "curses" for the ncurses manpage.
+	Likewise, do not install an alias "curses" for the ncurses man page.
 
     --without-cxx
 	XSI curses declares "bool" as part of the interface.  C++ also declares
@@ -1423,7 +1424,7 @@ CONFIGURE OPTIONS:
 	Do not use dlsym() to load GPM dynamically.
 
     --without-manpages
-	Tell the configure script to suppress the install of ncurses' manpages.
+	Tell the configure script to suppress the install of ncurses' man pages.
 
     --without-progs
 	Tell the configure script to suppress the build of ncurses' application
diff --git a/NEWS b/NEWS
index 8c86dddac..d5a2eccfb 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4216 2024/12/21 20:43:26 tom Exp $
+-- $Id: NEWS,v 1.4220 2024/12/29 00:59:43 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20241228
+	+ correct conditional-compile for a case when the C compiler does not
+	  have a bool type.
+	+ add ghostty -TD
+	> patches by Branden Robinson:
+	+ add comments to generated term.h to hint the configure options used
+	+ use same subdir-convention for term.h, in configure script
+	+ improve formatting/style of manpages
+
 20241221
 	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
 	  lacks BSD-style \< and \>
diff --git a/VERSION b/VERSION
index 4a7915326..9ad974fa9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241221
+5:0:10	6.5	20241228
diff --git a/aclocal.m4 b/aclocal.m4
index b08857740..6f30941fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1097 2024/12/21 13:44:45 tom Exp $
+dnl $Id: aclocal.m4,v 1.1099 2024/12/28 21:40:09 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -6036,7 +6036,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
+dnl CF_MAN_PAGES version: 60 updated: 2024/12/28 16:38:35
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -6213,14 +6213,17 @@ CF_EOF
 
 if test "$with_overwrite" != yes ; then
 cat >>$cf_edit_man <<CF_EOF
-	sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
+	sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," \
+	    -e "/\\#[    ]*include/s,<term.h,<ncurses$LIB_SUFFIX/term.h," \
+	  < \$TMP >\$TMP.out
 	mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 if test "$with_curses_h" != yes ; then
 cat >>$cf_edit_man <<CF_EOF
-	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," \
+	  < \$TMP >\$TMP.out
 	mv \$TMP.out \$TMP
 CF_EOF
 fi
diff --git a/configure b/configure
index 6a6df419c..47b01a5b6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.788 .
+# From configure.in Revision: 1.789 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -15662,14 +15662,17 @@ CF_EOF
 
 if test "$with_overwrite" != yes ; then
 cat >>$cf_edit_man <<CF_EOF
-	sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
+	sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," \
+	    -e "/\\#[    ]*include/s,<term.h,<ncurses$LIB_SUFFIX/term.h," \
+	  < \$TMP >\$TMP.out
 	mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 if test "$with_curses_h" != yes ; then
 cat >>$cf_edit_man <<CF_EOF
-	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," \
+	  < \$TMP >\$TMP.out
 	mv \$TMP.out \$TMP
 CF_EOF
 fi
@@ -15813,7 +15816,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15816: checking if you want to build with function extensions" >&5
+echo "$as_me:15819: 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.
@@ -15823,7 +15826,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15826: result: $with_ext_funcs" >&5
+echo "$as_me:15829: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15880,7 +15883,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15883: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15886: 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.
@@ -15890,7 +15893,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15893: result: $with_sp_funcs" >&5
+echo "$as_me:15896: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15909,7 +15912,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15912: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15915: 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.
@@ -15919,7 +15922,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15922: result: $with_term_driver" >&5
+echo "$as_me:15925: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15928,19 +15931,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15931: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15934: 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:15936: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15939: 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:15943: checking for extended use of const keyword" >&5
+echo "$as_me:15946: 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.
@@ -15950,7 +15953,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15953: result: $with_ext_const" >&5
+echo "$as_me:15956: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15958,7 +15961,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15961: checking if you want to use extended colors" >&5
+echo "$as_me:15964: 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.
@@ -15968,12 +15971,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15971: result: $with_ext_colors" >&5
+echo "$as_me:15974: 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:15976: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15979: 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)
@@ -15984,7 +15987,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15987: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:15990: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16012,7 +16015,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16015: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16018: 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.
@@ -16022,7 +16025,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16025: result: $with_ext_mouse" >&5
+echo "$as_me:16028: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16032,7 +16035,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16035: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16038: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16049,7 +16052,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16052: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16055: 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.
@@ -16059,7 +16062,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16062: result: $with_ext_putwin" >&5
+echo "$as_me:16065: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16069,7 +16072,7 @@ EOF
 
 fi
 
-echo "$as_me:16072: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16075: 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.
@@ -16079,7 +16082,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16082: result: $with_no_padding" >&5
+echo "$as_me:16085: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16087,7 +16090,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16090: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16093: 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.
@@ -16097,7 +16100,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16100: result: $with_sigwinch" >&5
+echo "$as_me:16103: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16112,7 +16115,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16115: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16118: 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.
@@ -16122,7 +16125,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16125: result: $with_tcap_names" >&5
+echo "$as_me:16128: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16136,7 +16139,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16139: checking if you want to link with the pthread library" >&5
+echo "$as_me:16142: 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.
@@ -16146,27 +16149,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16149: result: $with_pthread" >&5
+echo "$as_me:16152: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16153: checking for pthread.h" >&5
+	echo "$as_me:16156: 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 16159 "configure"
+#line 16162 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16163: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16166: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16169: \$? = $ac_status" >&5
+  echo "$as_me:16172: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16185,7 +16188,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16188: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16191: 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
 
@@ -16195,7 +16198,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16198: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16201: 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"
 
@@ -16216,7 +16219,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16219 "configure"
+#line 16222 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16233,16 +16236,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16239: \$? = $ac_status" >&5
+  echo "$as_me:16242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16245: \$? = $ac_status" >&5
+  echo "$as_me:16248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16252,7 +16255,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16255: result: $with_pthread" >&5
+	    echo "$as_me:16258: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16280,7 +16283,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16283: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16286: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16290,13 +16293,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16293: checking for pthread_kill" >&5
+	echo "$as_me:16296: 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 16299 "configure"
+#line 16302 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16327,16 +16330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16333: \$? = $ac_status" >&5
+  echo "$as_me:16336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16339: \$? = $ac_status" >&5
+  echo "$as_me:16342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16346,11 +16349,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16349: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16352: 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:16353: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16356: 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.
@@ -16360,7 +16363,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16363: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16366: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16371,7 +16374,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16374: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16377: 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.
@@ -16381,18 +16384,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16384: result: $use_weak_symbols" >&5
+	echo "$as_me:16387: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16388: checking if $CC supports weak symbols" >&5
+echo "$as_me:16391: 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 16395 "configure"
+#line 16398 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16418,16 +16421,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16424: \$? = $ac_status" >&5
+  echo "$as_me:16427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16430: \$? = $ac_status" >&5
+  echo "$as_me:16433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16438,7 +16441,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16441: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16444: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16488,7 +16491,7 @@ fi
 # 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:16491: checking if you want reentrant code" >&5
+echo "$as_me:16494: 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.
@@ -16498,7 +16501,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16501: result: $with_reentrant" >&5
+echo "$as_me:16504: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16587,7 +16590,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16599,7 +16602,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16602: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16605: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16621,16 +16624,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16624: result: $enable_opaque_curses" >&5
+echo "$as_me:16627: 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:16629: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16632: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16633: checking whether form library structures should be opaque" >&5
+echo "$as_me:16636: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16647,10 +16650,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16650: result: $enable_opaque_form" >&5
+echo "$as_me:16653: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16653: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16656: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16667,10 +16670,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16670: result: $enable_opaque_menu" >&5
+echo "$as_me:16673: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16673: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16676: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16687,7 +16690,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16690: result: $enable_opaque_panel" >&5
+echo "$as_me:16693: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16697,7 +16700,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16700: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16703: 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.
@@ -16707,7 +16710,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16710: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16713: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16720,7 +16723,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16723: checking if you want all development code" >&5
+echo "$as_me:16726: 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.
@@ -16730,11 +16733,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16733: result: $with_develop" >&5
+echo "$as_me:16736: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16737: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16740: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16744,7 +16747,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16747: result: $enable_check_size" >&5
+echo "$as_me:16750: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16752,7 +16755,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16755: checking if you want hard-tabs code" >&5
+echo "$as_me:16758: 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.
@@ -16762,7 +16765,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16765: result: $enable_hard_tabs" >&5
+echo "$as_me:16768: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16770,7 +16773,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16773: checking if you want limited support for xmc" >&5
+echo "$as_me:16776: 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.
@@ -16780,7 +16783,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16783: result: $enable_xmc_glitch" >&5
+echo "$as_me:16786: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16790,7 +16793,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16793: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16796: 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.
@@ -16800,7 +16803,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16803: result: $with_assumed_color" >&5
+echo "$as_me:16806: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16808,7 +16811,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16811: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16814: 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.
@@ -16818,7 +16821,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16821: result: $with_hashmap" >&5
+echo "$as_me:16824: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16826,7 +16829,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16829: checking if you want colorfgbg code" >&5
+echo "$as_me:16832: 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.
@@ -16836,7 +16839,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16839: result: $with_colorfgbg" >&5
+echo "$as_me:16842: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16844,7 +16847,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16847: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16850: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16854,14 +16857,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16857: result: $cf_with_fvisibility" >&5
+echo "$as_me:16860: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16864: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16867: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16870,7 +16873,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16873 "configure"
+#line 16876 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16886,16 +16889,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16892: \$? = $ac_status" >&5
+  echo "$as_me:16895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16898: \$? = $ac_status" >&5
+  echo "$as_me:16901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16907,7 +16910,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16910: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16913: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17022,7 +17025,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17025: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17028: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17031,7 +17034,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17034 "configure"
+#line 17037 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17047,16 +17050,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17053: \$? = $ac_status" >&5
+  echo "$as_me:17056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17059: \$? = $ac_status" >&5
+  echo "$as_me:17062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17068,7 +17071,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17071: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17074: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17191,7 +17194,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17194: checking if you want interop bindings" >&5
+echo "$as_me:17197: 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.
@@ -17201,13 +17204,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17204: result: $with_exp_interop" >&5
+echo "$as_me:17207: 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:17210: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17213: 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.
@@ -17217,13 +17220,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17220: result: $with_safe_sprintf" >&5
+echo "$as_me:17223: 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:17226: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17229: 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.
@@ -17233,7 +17236,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17236: result: $with_scroll_hints" >&5
+echo "$as_me:17239: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17242,7 +17245,7 @@ EOF
 
 fi
 
-echo "$as_me:17245: checking if you want wgetch-events code" >&5
+echo "$as_me:17248: 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.
@@ -17252,7 +17255,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17255: result: $with_wgetch_events" >&5
+echo "$as_me:17258: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17267,7 +17270,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17270: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17273: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17277,7 +17280,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17280: result: $with_exp_win32" >&5
+	echo "$as_me:17283: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17303,7 +17306,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17306: checking if you want to see long compiling messages" >&5
+echo "$as_me:17309: 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.
@@ -17337,7 +17340,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17340: result: $enableval" >&5
+echo "$as_me:17343: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17350,7 +17353,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17353: checking if you want to install stripped executables" >&5
+echo "$as_me:17356: 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.
@@ -17367,7 +17370,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17370: result: $enable_stripping" >&5
+echo "$as_me:17373: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17378,7 +17381,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17381: checking if install accepts -p option" >&5
+echo "$as_me:17384: 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
@@ -17409,10 +17412,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17412: result: $cf_cv_install_p" >&5
+echo "$as_me:17415: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17415: checking if install needs to be told about ownership" >&5
+echo "$as_me:17418: 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)
@@ -17423,7 +17426,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17426: result: $with_install_o" >&5
+echo "$as_me:17429: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17434,7 +17437,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17437: checking if you want to specify strip-program" >&5
+	echo "$as_me:17440: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17444,11 +17447,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17447: result: $with_strip_program" >&5
+	echo "$as_me:17450: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17451: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17454: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17469,11 +17472,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17472: result: $check_install_strip" >&5
+		echo "$as_me:17475: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17476: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17479: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17488,7 +17491,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17491: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17494: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17514,7 +17517,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17517: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17520: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17531,17 +17534,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17534: result: $enable_stdnoreturn" >&5
+echo "$as_me:17537: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17538: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17541: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17544 "configure"
+#line 17547 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17557,16 +17560,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17563: \$? = $ac_status" >&5
+  echo "$as_me:17566: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17569: \$? = $ac_status" >&5
+  echo "$as_me:17572: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17577,7 +17580,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17580: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17583: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17633,16 +17636,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17636: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17639: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17641: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17644: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17645: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17648: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17681,16 +17684,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17684: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17687: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17689: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17692: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17693: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17696: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17729,23 +17732,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17732: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17735: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17737: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17740: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17741: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17744: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17748: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17751: 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.
@@ -17762,7 +17765,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17765: result: $enable_warnings" >&5
+echo "$as_me:17768: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17786,7 +17789,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17789 "configure"
+#line 17792 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17801,26 +17804,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17807: \$? = $ac_status" >&5
+  echo "$as_me:17810: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17813: \$? = $ac_status" >&5
+  echo "$as_me:17816: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17816: checking for X11/Xt const-feature" >&5
+echo "$as_me:17819: 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 17823 "configure"
+#line 17826 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17838,16 +17841,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17844: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17850: \$? = $ac_status" >&5
+  echo "$as_me:17853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17862,7 +17865,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17865: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17868: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17891,7 +17894,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17894 "${as_me:-configure}"
+#line 17897 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17907,7 +17910,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17910: checking for $CC warning options..." >&5
+	{ echo "$as_me:17913: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17923,12 +17926,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17929: \$? = $ac_status" >&5
+  echo "$as_me:17932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17936,7 +17939,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17939: checking for $CC warning options..." >&5
+	{ echo "$as_me:17942: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17959,12 +17962,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17962: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17965: \$? = $ac_status" >&5
+  echo "$as_me:17968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17967: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17970: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17972,7 +17975,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17975: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17978: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17982,7 +17985,7 @@ echo "${as_me:-configure}:17975: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17985: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17988: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18015,10 +18018,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18018: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18021: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18021 "${as_me:-configure}"
+#line 18024 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18068,12 +18071,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18071: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18074: \$? = $ac_status" >&5
+  echo "$as_me:18077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18076: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18079: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18145,12 +18148,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18148: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18151: 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 18153 "configure"
+#line 18156 "configure"
 #include "confdefs.h"
 
 int
@@ -18167,16 +18170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18173: \$? = $ac_status" >&5
+  echo "$as_me:18176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18179: \$? = $ac_status" >&5
+  echo "$as_me:18182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18187,7 +18190,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18190: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18193: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18196,11 +18199,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18199: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18202: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18203 "configure"
+#line 18206 "configure"
 #include "confdefs.h"
 
 int
@@ -18217,16 +18220,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18223: \$? = $ac_status" >&5
+  echo "$as_me:18226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18229: \$? = $ac_status" >&5
+  echo "$as_me:18232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18236,7 +18239,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18239: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18242: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18245,30 +18248,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18248: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18251: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18255: checking version of $CC" >&5
+	echo "$as_me:18258: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18259: result: $CLANG_VERSION" >&5
+	echo "$as_me:18262: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18266: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18269: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18271 "configure"
+#line 18274 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18282,16 +18285,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18288: \$? = $ac_status" >&5
+  echo "$as_me:18291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18294: \$? = $ac_status" >&5
+  echo "$as_me:18297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18302,13 +18305,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18305: result: $cf_clang_optok" >&5
+		echo "$as_me:18308: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18311: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18314: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18325,7 +18328,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18328 "configure"
+#line 18331 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18343,7 +18346,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18346: checking for $CC warning options..." >&5
+	{ echo "$as_me:18349: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18360,12 +18363,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18366: \$? = $ac_status" >&5
+  echo "$as_me:18369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18368: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18371: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18374,7 +18377,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18377: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18380: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18404,16 +18407,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18407: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18410: \$? = $ac_status" >&5
+  echo "$as_me:18413: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18412: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18415: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18416: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18419: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18431,7 +18434,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18434: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18437: 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.
@@ -18441,7 +18444,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18444: result: $enable_string_hacks" >&5
+echo "$as_me:18447: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18450,15 +18453,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18453: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18456: 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:18455: checking for strlcat" >&5
+	echo "$as_me:18458: 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 18461 "configure"
+#line 18464 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18489,16 +18492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18495: \$? = $ac_status" >&5
+  echo "$as_me:18498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18501: \$? = $ac_status" >&5
+  echo "$as_me:18504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18508,7 +18511,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18511: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18514: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18518,7 +18521,7 @@ EOF
 
 else
 
-		echo "$as_me:18521: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18524: 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
@@ -18526,7 +18529,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18529 "configure"
+#line 18532 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18545,16 +18548,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18551: \$? = $ac_status" >&5
+  echo "$as_me:18554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18557: \$? = $ac_status" >&5
+  echo "$as_me:18560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18565,7 +18568,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18568: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18571: 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
 
@@ -18588,23 +18591,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18591: checking for $ac_header" >&5
+echo "$as_me:18594: 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 18597 "configure"
+#line 18600 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18607: \$? = $ac_status" >&5
+  echo "$as_me:18610: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18623,7 +18626,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18626: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18629: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18644,13 +18647,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18647: checking for $ac_func" >&5
+echo "$as_me:18650: 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 18653 "configure"
+#line 18656 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18681,16 +18684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18687: \$? = $ac_status" >&5
+  echo "$as_me:18690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18693: \$? = $ac_status" >&5
+  echo "$as_me:18696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18700,7 +18703,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18703: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18706: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18713,7 +18716,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18716: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18719: 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.
@@ -18723,7 +18726,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18726: result: $with_assertions" >&5
+echo "$as_me:18729: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18739,7 +18742,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18742: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18745: 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.
@@ -18761,7 +18764,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18764: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18767: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18875,23 +18878,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18878: checking for dmalloc.h" >&5
+	echo "$as_me:18881: 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 18884 "configure"
+#line 18887 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18894: \$? = $ac_status" >&5
+  echo "$as_me:18897: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18910,11 +18913,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18913: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18916: 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:18917: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18920: 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
@@ -18922,7 +18925,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18925 "configure"
+#line 18928 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18941,16 +18944,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18947: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18947: \$? = $ac_status" >&5
+  echo "$as_me:18950: \$? = $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:18953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18953: \$? = $ac_status" >&5
+  echo "$as_me:18956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18961,7 +18964,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18964: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18967: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18976,7 +18979,7 @@ fi
 
 fi
 
-echo "$as_me:18979: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18982: 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.
@@ -18998,7 +19001,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:19001: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:19004: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19112,23 +19115,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19115: checking for dbmalloc.h" >&5
+	echo "$as_me:19118: 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 19121 "configure"
+#line 19124 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19125: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19131: \$? = $ac_status" >&5
+  echo "$as_me:19134: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19147,11 +19150,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19150: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19153: 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:19154: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19157: 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
@@ -19159,7 +19162,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19162 "configure"
+#line 19165 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19178,16 +19181,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19184: \$? = $ac_status" >&5
+  echo "$as_me:19187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19198,7 +19201,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19201: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19204: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19213,7 +19216,7 @@ fi
 
 fi
 
-echo "$as_me:19216: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19219: 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.
@@ -19235,7 +19238,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19238: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19241: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19348,7 +19351,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19351: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19354: 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.
@@ -19359,7 +19362,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19362: result: $with_no_leaks" >&5
+echo "$as_me:19365: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19411,7 +19414,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19414: checking whether to add trace feature to all models" >&5
+echo "$as_me:19417: 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.
@@ -19421,7 +19424,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19424: result: $cf_with_trace" >&5
+echo "$as_me:19427: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19441,7 +19444,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19444: checking if we want to use GNAT projects" >&5
+echo "$as_me:19447: 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.
@@ -19458,7 +19461,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19461: result: $enable_gnat_projects" >&5
+echo "$as_me:19464: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19471,14 +19474,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19474: checking if ssp library is needed" >&5
+echo "$as_me:19477: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19481 "configure"
+#line 19484 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19495,16 +19498,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19514,7 +19517,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19517 "configure"
+#line 19520 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19531,16 +19534,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19537: \$? = $ac_status" >&5
+  echo "$as_me:19540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19543: \$? = $ac_status" >&5
+  echo "$as_me:19546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19554,7 +19557,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19557: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19560: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19583,14 +19586,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19586: checking if -lm needed for math functions" >&5
+echo "$as_me:19589: 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 19593 "configure"
+#line 19596 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19606,16 +19609,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19612: \$? = $ac_status" >&5
+  echo "$as_me:19615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19618: \$? = $ac_status" >&5
+  echo "$as_me:19621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19625,7 +19628,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19628: result: $cf_cv_need_libm" >&5
+echo "$as_me:19631: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19633,14 +19636,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19636: checking if -lm is available for math functions" >&5
+	echo "$as_me:19639: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19643 "configure"
+#line 19646 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19656,16 +19659,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19662: \$? = $ac_status" >&5
+  echo "$as_me:19665: \$? = $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:19668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19668: \$? = $ac_status" >&5
+  echo "$as_me:19671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19675,7 +19678,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19678: result: $cf_cv_have_libm" >&5
+echo "$as_me:19681: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19697,13 +19700,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19700: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19703: 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 19706 "configure"
+#line 19709 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19719,16 +19722,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19725: \$? = $ac_status" >&5
+  echo "$as_me:19728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19731: \$? = $ac_status" >&5
+  echo "$as_me:19734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19738,7 +19741,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19741: result: $ac_cv_header_time" >&5
+echo "$as_me:19744: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19753,7 +19756,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19756: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19759: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19761,7 +19764,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19764 "configure"
+#line 19767 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19780,16 +19783,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:19789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19792: \$? = $ac_status" >&5
+  echo "$as_me:19795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19800,11 +19803,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19803: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19806: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19807: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19810: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19812,7 +19815,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19815 "configure"
+#line 19818 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19831,16 +19834,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19837: \$? = $ac_status" >&5
+  echo "$as_me:19840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19843: \$? = $ac_status" >&5
+  echo "$as_me:19846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19851,7 +19854,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19854: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19857: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19873,7 +19876,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19876: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19879: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19881,7 +19884,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19884 "configure"
+#line 19887 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19900,16 +19903,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19906: \$? = $ac_status" >&5
+  echo "$as_me:19909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19912: \$? = $ac_status" >&5
+  echo "$as_me:19915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19920,7 +19923,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19923: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19926: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19942,7 +19945,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19945: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19948: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19950,7 +19953,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19953 "configure"
+#line 19956 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19969,16 +19972,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19975: \$? = $ac_status" >&5
+  echo "$as_me:19978: \$? = $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:19981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19981: \$? = $ac_status" >&5
+  echo "$as_me:19984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19989,7 +19992,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19992: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19995: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20031,7 +20034,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20034: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20037: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20039,7 +20042,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20042 "configure"
+#line 20045 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20058,16 +20061,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20064: \$? = $ac_status" >&5
+  echo "$as_me:20067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20070: \$? = $ac_status" >&5
+  echo "$as_me:20073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20078,7 +20081,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20081: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20084: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20106,13 +20109,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20109: checking for regcomp" >&5
+	echo "$as_me:20112: 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 20115 "configure"
+#line 20118 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20143,16 +20146,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20149: \$? = $ac_status" >&5
+  echo "$as_me:20152: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20155: \$? = $ac_status" >&5
+  echo "$as_me:20158: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20162,7 +20165,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20165: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20168: 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
@@ -20171,7 +20174,7 @@ else
 		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:20174: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20177: 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
@@ -20179,7 +20182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20182 "configure"
+#line 20185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20198,16 +20201,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20204: \$? = $ac_status" >&5
+  echo "$as_me:20207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20210: \$? = $ac_status" >&5
+  echo "$as_me:20213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20218,7 +20221,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20221: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20224: 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
 
@@ -20250,13 +20253,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20253: checking for compile" >&5
+	echo "$as_me:20256: 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 20259 "configure"
+#line 20262 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20287,16 +20290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20293: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20299: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20306,13 +20309,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20309: result: $ac_cv_func_compile" >&5
+echo "$as_me:20312: 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:20315: checking for compile in -lgen" >&5
+		echo "$as_me:20318: 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
@@ -20320,7 +20323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20323 "configure"
+#line 20326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20339,16 +20342,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20351: \$? = $ac_status" >&5
+  echo "$as_me:20354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20359,7 +20362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20362: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20365: 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
 
@@ -20387,11 +20390,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20390: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20393: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20394: checking for regular-expression headers" >&5
+echo "$as_me:20397: 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
@@ -20403,7 +20406,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20406 "configure"
+#line 20409 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20420,16 +20423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20426: \$? = $ac_status" >&5
+  echo "$as_me:20429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20432: \$? = $ac_status" >&5
+  echo "$as_me:20435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20446,7 +20449,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20449 "configure"
+#line 20452 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -20467,16 +20470,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20473: \$? = $ac_status" >&5
+  echo "$as_me:20476: \$? = $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:20479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20479: \$? = $ac_status" >&5
+  echo "$as_me:20482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20492,11 +20495,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20495: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20498: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20499: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20502: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20534,23 +20537,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20537: checking for $ac_header" >&5
+echo "$as_me:20540: 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 20543 "configure"
+#line 20546 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20550: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20553: \$? = $ac_status" >&5
+  echo "$as_me:20556: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20569,7 +20572,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20575: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20582,23 +20585,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20585: checking for $ac_header" >&5
+echo "$as_me:20588: 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 20591 "configure"
+#line 20594 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20601: \$? = $ac_status" >&5
+  echo "$as_me:20604: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20617,7 +20620,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20627,7 +20630,7 @@ EOF
 fi
 done
 
-echo "$as_me:20630: checking for header declaring getopt variables" >&5
+echo "$as_me:20633: 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
@@ -20637,7 +20640,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20640 "configure"
+#line 20643 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20650,16 +20653,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20656: \$? = $ac_status" >&5
+  echo "$as_me:20659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20662: \$? = $ac_status" >&5
+  echo "$as_me:20665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20671,7 +20674,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20674: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20677: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20688,14 +20691,14 @@ EOF
 
 fi
 
-echo "$as_me:20691: checking if external environ is declared" >&5
+echo "$as_me:20694: 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 20698 "configure"
+#line 20701 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20708,16 +20711,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20714: \$? = $ac_status" >&5
+  echo "$as_me:20717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20720: \$? = $ac_status" >&5
+  echo "$as_me:20723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20728,7 +20731,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20731: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20734: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20743,14 +20746,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20746: checking if external environ exists" >&5
+echo "$as_me:20749: 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 20753 "configure"
+#line 20756 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20765,16 +20768,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20771: \$? = $ac_status" >&5
+  echo "$as_me:20774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20777: \$? = $ac_status" >&5
+  echo "$as_me:20780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20785,7 +20788,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20788: result: $cf_cv_have_environ" >&5
+echo "$as_me:20791: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20798,13 +20801,13 @@ EOF
 
 fi
 
-echo "$as_me:20801: checking for getenv" >&5
+echo "$as_me:20804: 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 20807 "configure"
+#line 20810 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20835,16 +20838,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20841: \$? = $ac_status" >&5
+  echo "$as_me:20844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20847: \$? = $ac_status" >&5
+  echo "$as_me:20850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20854,19 +20857,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20857: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20860: 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:20863: checking for $ac_func" >&5
+echo "$as_me:20866: 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 20869 "configure"
+#line 20872 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20897,16 +20900,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20903: \$? = $ac_status" >&5
+  echo "$as_me:20906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20909: \$? = $ac_status" >&5
+  echo "$as_me:20912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20916,7 +20919,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20919: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20922: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20926,7 +20929,7 @@ EOF
 fi
 done
 
-echo "$as_me:20929: checking if getenv returns consistent values" >&5
+echo "$as_me:20932: 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
@@ -20936,7 +20939,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20939 "configure"
+#line 20942 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21041,15 +21044,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21047: \$? = $ac_status" >&5
+  echo "$as_me:21050: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21052: \$? = $ac_status" >&5
+  echo "$as_me:21055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21062,7 +21065,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21065: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21068: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21077,18 +21080,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21080: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21083: 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
 
-echo "$as_me:21084: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21087: 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 21091 "configure"
+#line 21094 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21108,16 +21111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21114: \$? = $ac_status" >&5
+  echo "$as_me:21117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21120: \$? = $ac_status" >&5
+  echo "$as_me:21123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21129,7 +21132,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21132: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21135: 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
@@ -21144,13 +21147,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21147: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21150: 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 21153 "configure"
+#line 21156 "configure"
 #include "confdefs.h"
 
 int
@@ -21212,16 +21215,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21218: \$? = $ac_status" >&5
+  echo "$as_me:21221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21224: \$? = $ac_status" >&5
+  echo "$as_me:21227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21231,7 +21234,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21234: result: $ac_cv_c_const" >&5
+echo "$as_me:21237: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21241,7 +21244,7 @@ EOF
 
 fi
 
-echo "$as_me:21244: checking for inline" >&5
+echo "$as_me:21247: 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
@@ -21249,7 +21252,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21252 "configure"
+#line 21255 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21258,16 +21261,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21264: \$? = $ac_status" >&5
+  echo "$as_me:21267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21270: \$? = $ac_status" >&5
+  echo "$as_me:21273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21278,7 +21281,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21281: result: $ac_cv_c_inline" >&5
+echo "$as_me:21284: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21304,7 +21307,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21307: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21310: 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
@@ -21313,7 +21316,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21316 "configure"
+#line 21319 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21325,16 +21328,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21331: \$? = $ac_status" >&5
+  echo "$as_me:21334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21337: \$? = $ac_status" >&5
+  echo "$as_me:21340: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21346,7 +21349,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21349: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21352: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21452,7 +21455,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21455: checking for signal global datatype" >&5
+echo "$as_me:21458: 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
@@ -21464,7 +21467,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21467 "configure"
+#line 21470 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21488,16 +21491,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21494: \$? = $ac_status" >&5
+  echo "$as_me:21497: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21500: \$? = $ac_status" >&5
+  echo "$as_me:21503: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21511,7 +21514,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21514: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21517: 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 <<EOF
@@ -21520,7 +21523,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21523: checking for type of chtype" >&5
+echo "$as_me:21526: 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
@@ -21530,7 +21533,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21533 "configure"
+#line 21536 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21565,15 +21568,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21571: \$? = $ac_status" >&5
+  echo "$as_me:21574: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21576: \$? = $ac_status" >&5
+  echo "$as_me:21579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21588,7 +21591,7 @@ fi
 
 fi
 
-echo "$as_me:21591: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21594: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21600,14 +21603,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21603: checking if unsigned literals are legal" >&5
+echo "$as_me:21606: 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 21610 "configure"
+#line 21613 "configure"
 #include "confdefs.h"
 
 int
@@ -21619,16 +21622,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21625: \$? = $ac_status" >&5
+  echo "$as_me:21628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21631: \$? = $ac_status" >&5
+  echo "$as_me:21634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21640,7 +21643,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21643: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21646: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21656,14 +21659,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21659: checking if external errno is declared" >&5
+echo "$as_me:21662: 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 21666 "configure"
+#line 21669 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21677,16 +21680,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21683: \$? = $ac_status" >&5
+  echo "$as_me:21686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21689: \$? = $ac_status" >&5
+  echo "$as_me:21692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21697,7 +21700,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21700: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21703: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21712,14 +21715,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21715: checking if external errno exists" >&5
+echo "$as_me:21718: 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 21722 "configure"
+#line 21725 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21734,16 +21737,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21740: \$? = $ac_status" >&5
+  echo "$as_me:21743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21746: \$? = $ac_status" >&5
+  echo "$as_me:21749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21754,7 +21757,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21757: result: $cf_cv_have_errno" >&5
+echo "$as_me:21760: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21767,7 +21770,7 @@ EOF
 
 fi
 
-echo "$as_me:21770: checking if data-only library module links" >&5
+echo "$as_me:21773: 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
@@ -21775,20 +21778,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21778 "configure"
+#line 21781 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21781: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21784: \$? = $ac_status" >&5
+  echo "$as_me:21787: \$? = $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 <<EOF
-#line 21791 "configure"
+#line 21794 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21805,10 +21808,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21811: \$? = $ac_status" >&5
+  echo "$as_me:21814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21821,7 +21824,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21824 "configure"
+#line 21827 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21832,15 +21835,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21838: \$? = $ac_status" >&5
+  echo "$as_me:21841: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21843: \$? = $ac_status" >&5
+  echo "$as_me:21846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21855,7 +21858,7 @@ fi
 
 fi
 
-echo "$as_me:21858: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21861: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21870,13 +21873,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21873: checking for clock_gettime" >&5
+echo "$as_me:21876: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21879 "configure"
+#line 21882 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21907,16 +21910,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21913: \$? = $ac_status" >&5
+  echo "$as_me:21916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21919: \$? = $ac_status" >&5
+  echo "$as_me:21922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21926,12 +21929,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21929: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21932: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21934: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21937: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21939,7 +21942,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21942 "configure"
+#line 21945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21958,16 +21961,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21964: \$? = $ac_status" >&5
+  echo "$as_me:21967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21970: \$? = $ac_status" >&5
+  echo "$as_me:21973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21978,7 +21981,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21981: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:21984: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21990,14 +21993,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21993: checking if clock_gettime links" >&5
+echo "$as_me:21996: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22000 "configure"
+#line 22003 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22015,16 +22018,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22021: \$? = $ac_status" >&5
+  echo "$as_me:22024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22027: \$? = $ac_status" >&5
+  echo "$as_me:22030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22035,7 +22038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22038: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22041: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22049,13 +22052,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22052: checking for gettimeofday" >&5
+echo "$as_me:22055: 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 22058 "configure"
+#line 22061 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22086,16 +22089,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22092: \$? = $ac_status" >&5
+  echo "$as_me:22095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22098: \$? = $ac_status" >&5
+  echo "$as_me:22101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22105,7 +22108,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22108: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22111: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22115,7 +22118,7 @@ EOF
 
 else
 
-echo "$as_me:22118: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22121: 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
@@ -22123,7 +22126,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22126 "configure"
+#line 22129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22142,16 +22145,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22148: \$? = $ac_status" >&5
+  echo "$as_me:22151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22154: \$? = $ac_status" >&5
+  echo "$as_me:22157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22162,7 +22165,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22165: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22168: 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
 
@@ -22221,13 +22224,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22224: checking for $ac_func" >&5
+echo "$as_me:22227: 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 22230 "configure"
+#line 22233 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22258,16 +22261,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22264: \$? = $ac_status" >&5
+  echo "$as_me:22267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22270: \$? = $ac_status" >&5
+  echo "$as_me:22273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22277,7 +22280,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22280: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22283: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22287,14 +22290,14 @@ EOF
 fi
 done
 
-echo "$as_me:22290: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22293: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22297 "configure"
+#line 22300 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22309,16 +22312,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22315: \$? = $ac_status" >&5
+  echo "$as_me:22318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22321: \$? = $ac_status" >&5
+  echo "$as_me:22324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22328,7 +22331,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22331: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22334: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22350,7 +22353,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22353: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22356: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22360,7 +22363,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22363 "configure"
+#line 22366 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22373,15 +22376,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22379: \$? = $ac_status" >&5
+  echo "$as_me:22382: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22384: \$? = $ac_status" >&5
+  echo "$as_me:22387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22393,7 +22396,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22396: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22399: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22405,14 +22408,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22408: checking for getttynam" >&5
+	echo "$as_me:22411: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22415 "configure"
+#line 22418 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22424,16 +22427,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22430: \$? = $ac_status" >&5
+  echo "$as_me:22433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22436: \$? = $ac_status" >&5
+  echo "$as_me:22439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22443,7 +22446,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22446: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22449: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22453,7 +22456,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22456: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22459: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22462,7 +22465,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22465: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22468: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22475,14 +22478,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22478: checking for terminal-capability database functions" >&5
+echo "$as_me:22481: 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 22485 "configure"
+#line 22488 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22502,16 +22505,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22508: \$? = $ac_status" >&5
+  echo "$as_me:22511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22514: \$? = $ac_status" >&5
+  echo "$as_me:22517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22522,7 +22525,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22525: result: $cf_cv_cgetent" >&5
+echo "$as_me:22528: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22532,14 +22535,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22535: checking if cgetent uses const parameter" >&5
+echo "$as_me:22538: 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 22542 "configure"
+#line 22545 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22562,16 +22565,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22568: \$? = $ac_status" >&5
+  echo "$as_me:22571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22574: \$? = $ac_status" >&5
+  echo "$as_me:22577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22582,7 +22585,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22585: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22588: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22596,14 +22599,14 @@ fi
 
 fi
 
-echo "$as_me:22599: checking for isascii" >&5
+echo "$as_me:22602: 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 22606 "configure"
+#line 22609 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22615,16 +22618,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22621: \$? = $ac_status" >&5
+  echo "$as_me:22624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22627: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22635,7 +22638,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22638: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22641: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22643,10 +22646,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22646: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22649: 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 22649 "configure"
+#line 22652 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22660,16 +22663,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22666: \$? = $ac_status" >&5
+  echo "$as_me:22669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22672: \$? = $ac_status" >&5
+  echo "$as_me:22675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22677,7 +22680,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22680 "configure"
+#line 22683 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22692,16 +22695,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22698: \$? = $ac_status" >&5
+  echo "$as_me:22701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22704: \$? = $ac_status" >&5
+  echo "$as_me:22707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22717,11 +22720,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22720: result: $sigact_bad" >&5
+echo "$as_me:22723: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22724: checking if nanosleep really works" >&5
+echo "$as_me:22727: 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
@@ -22731,7 +22734,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22734 "configure"
+#line 22737 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22757,15 +22760,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22763: \$? = $ac_status" >&5
+  echo "$as_me:22766: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22768: \$? = $ac_status" >&5
+  echo "$as_me:22771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22777,7 +22780,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22780: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22783: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22794,23 +22797,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22797: checking for $ac_header" >&5
+echo "$as_me:22800: 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 22803 "configure"
+#line 22806 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22807: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22810: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22813: \$? = $ac_status" >&5
+  echo "$as_me:22816: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22829,7 +22832,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22832: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22835: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22846,10 +22849,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22849: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22852: 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 22852 "configure"
+#line 22855 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22861,16 +22864,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22867: \$? = $ac_status" >&5
+  echo "$as_me:22870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22873: \$? = $ac_status" >&5
+  echo "$as_me:22876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22878,7 +22881,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22881 "configure"
+#line 22884 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22892,16 +22895,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22898: \$? = $ac_status" >&5
+  echo "$as_me:22901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22904: \$? = $ac_status" >&5
+  echo "$as_me:22907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22917,19 +22920,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22920: result: $termios_bad" >&5
+	echo "$as_me:22923: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22925: checking for tcgetattr" >&5
+echo "$as_me:22928: 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 22932 "configure"
+#line 22935 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22957,16 +22960,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22963: \$? = $ac_status" >&5
+  echo "$as_me:22966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22969: \$? = $ac_status" >&5
+  echo "$as_me:22972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22976,21 +22979,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22979: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22982: 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:22986: checking for vsscanf function or workaround" >&5
+echo "$as_me:22989: 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 22993 "configure"
+#line 22996 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23016,16 +23019,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23022: \$? = $ac_status" >&5
+  echo "$as_me:23025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23028: \$? = $ac_status" >&5
+  echo "$as_me:23031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23033,7 +23036,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23036 "configure"
+#line 23039 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23055,16 +23058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23061: \$? = $ac_status" >&5
+  echo "$as_me:23064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23067: \$? = $ac_status" >&5
+  echo "$as_me:23070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23072,7 +23075,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23075 "configure"
+#line 23078 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23094,16 +23097,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23100: \$? = $ac_status" >&5
+  echo "$as_me:23103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23106: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23118,7 +23121,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23121: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23124: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23144,23 +23147,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23147: checking for $ac_header" >&5
+echo "$as_me:23150: 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 23153 "configure"
+#line 23156 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23163: \$? = $ac_status" >&5
+  echo "$as_me:23166: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23179,7 +23182,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23189,7 +23192,7 @@ EOF
 fi
 done
 
-echo "$as_me:23192: checking for working mkstemp" >&5
+echo "$as_me:23195: 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
@@ -23200,7 +23203,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23203 "configure"
+#line 23206 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23235,15 +23238,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23241: \$? = $ac_status" >&5
+  echo "$as_me:23244: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23246: \$? = $ac_status" >&5
+  echo "$as_me:23249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23258,16 +23261,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23261: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23264: 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:23264: checking for mkstemp" >&5
+	echo "$as_me:23267: 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 23270 "configure"
+#line 23273 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23298,16 +23301,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23304: \$? = $ac_status" >&5
+  echo "$as_me:23307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23310: \$? = $ac_status" >&5
+  echo "$as_me:23313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23317,7 +23320,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23320: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23323: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23338,21 +23341,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23341: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23344: 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:23344: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23347: 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:23350: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23353: 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 23355 "configure"
+#line 23358 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23369,15 +23372,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23375: \$? = $ac_status" >&5
+  echo "$as_me:23378: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23380: \$? = $ac_status" >&5
+  echo "$as_me:23383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23390,7 +23393,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23393: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23396: 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
 
@@ -23401,13 +23404,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23404: checking for intptr_t" >&5
+echo "$as_me:23407: 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 23410 "configure"
+#line 23413 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23422,16 +23425,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23428: \$? = $ac_status" >&5
+  echo "$as_me:23431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23434: \$? = $ac_status" >&5
+  echo "$as_me:23437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23441,7 +23444,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23444: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23447: 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
   :
@@ -23453,13 +23456,13 @@ EOF
 
 fi
 
-echo "$as_me:23456: checking for ssize_t" >&5
+echo "$as_me:23459: 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 23462 "configure"
+#line 23465 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23474,16 +23477,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23480: \$? = $ac_status" >&5
+  echo "$as_me:23483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23486: \$? = $ac_status" >&5
+  echo "$as_me:23489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23493,7 +23496,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23496: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23499: 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
   :
@@ -23505,14 +23508,14 @@ EOF
 
 fi
 
-echo "$as_me:23508: checking for type sigaction_t" >&5
+echo "$as_me:23511: 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 23515 "configure"
+#line 23518 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23525,16 +23528,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23528: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23531: \$? = $ac_status" >&5
+  echo "$as_me:23534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23537: \$? = $ac_status" >&5
+  echo "$as_me:23540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23545,14 +23548,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23548: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23551: 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:23555: checking declaration of size-change" >&5
+echo "$as_me:23558: 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
@@ -23573,7 +23576,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23576 "configure"
+#line 23579 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23623,16 +23626,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23629: \$? = $ac_status" >&5
+  echo "$as_me:23632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23635: \$? = $ac_status" >&5
+  echo "$as_me:23638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23651,7 +23654,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23654: result: $cf_cv_sizechange" >&5
+echo "$as_me:23657: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23669,13 +23672,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23672: checking for memmove" >&5
+echo "$as_me:23675: 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 23678 "configure"
+#line 23681 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23706,16 +23709,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23712: \$? = $ac_status" >&5
+  echo "$as_me:23715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23718: \$? = $ac_status" >&5
+  echo "$as_me:23721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23725,19 +23728,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23728: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23731: 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:23734: checking for bcopy" >&5
+echo "$as_me:23737: 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 23740 "configure"
+#line 23743 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23768,16 +23771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23774: \$? = $ac_status" >&5
+  echo "$as_me:23777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23780: \$? = $ac_status" >&5
+  echo "$as_me:23783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23787,11 +23790,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23790: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23793: 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:23794: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23797: 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
@@ -23801,7 +23804,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23804 "configure"
+#line 23807 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23817,15 +23820,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23823: \$? = $ac_status" >&5
+  echo "$as_me:23826: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23828: \$? = $ac_status" >&5
+  echo "$as_me:23831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23838,7 +23841,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23841: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23844: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23865,13 +23868,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23868: checking for $ac_func" >&5
+echo "$as_me:23871: 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 23874 "configure"
+#line 23877 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23902,16 +23905,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23908: \$? = $ac_status" >&5
+  echo "$as_me:23911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23914: \$? = $ac_status" >&5
+  echo "$as_me:23917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23921,7 +23924,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23924: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23927: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23931,7 +23934,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23934: checking if poll really works" >&5
+echo "$as_me:23937: 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
@@ -23941,7 +23944,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23944 "configure"
+#line 23947 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23994,15 +23997,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24000: \$? = $ac_status" >&5
+  echo "$as_me:24003: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24005: \$? = $ac_status" >&5
+  echo "$as_me:24008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24014,21 +24017,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24017: result: $cf_cv_working_poll" >&5
+echo "$as_me:24020: 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:24024: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24027: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24031 "configure"
+#line 24034 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24048,16 +24051,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24054: \$? = $ac_status" >&5
+  echo "$as_me:24057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24060: \$? = $ac_status" >&5
+  echo "$as_me:24063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24067,7 +24070,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24070: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24073: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24077,18 +24080,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24080: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24083: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24084: checking for va_copy" >&5
+echo "$as_me:24087: 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 24091 "configure"
+#line 24094 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24105,16 +24108,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24111: \$? = $ac_status" >&5
+  echo "$as_me:24114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24117: \$? = $ac_status" >&5
+  echo "$as_me:24120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24124,7 +24127,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24127: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24130: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24136,14 +24139,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24139: checking for __va_copy" >&5
+echo "$as_me:24142: 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 24146 "configure"
+#line 24149 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24160,16 +24163,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24166: \$? = $ac_status" >&5
+  echo "$as_me:24169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24172: \$? = $ac_status" >&5
+  echo "$as_me:24175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24179,7 +24182,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24182: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24185: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24191,14 +24194,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24194: checking for __builtin_va_copy" >&5
+echo "$as_me:24197: 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 24201 "configure"
+#line 24204 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24215,16 +24218,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24221: \$? = $ac_status" >&5
+  echo "$as_me:24224: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24227: \$? = $ac_status" >&5
+  echo "$as_me:24230: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24234,7 +24237,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24237: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24240: 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 &&
@@ -24252,14 +24255,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24255: checking if we can simply copy va_list" >&5
+	echo "$as_me:24258: 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 24262 "configure"
+#line 24265 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24276,16 +24279,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24282: \$? = $ac_status" >&5
+  echo "$as_me:24285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24288: \$? = $ac_status" >&5
+  echo "$as_me:24291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24295,19 +24298,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24298: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24301: 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:24303: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24306: 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 24310 "configure"
+#line 24313 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24324,16 +24327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24330: \$? = $ac_status" >&5
+  echo "$as_me:24333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24336: \$? = $ac_status" >&5
+  echo "$as_me:24339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24343,7 +24346,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24346: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24349: 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
@@ -24354,13 +24357,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24357: checking for pid_t" >&5
+echo "$as_me:24360: 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 24363 "configure"
+#line 24366 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24375,16 +24378,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24381: \$? = $ac_status" >&5
+  echo "$as_me:24384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24387: \$? = $ac_status" >&5
+  echo "$as_me:24390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24394,7 +24397,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24397: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24400: 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
   :
@@ -24409,23 +24412,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24412: checking for $ac_header" >&5
+echo "$as_me:24415: 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 24418 "configure"
+#line 24421 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24422: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24428: \$? = $ac_status" >&5
+  echo "$as_me:24431: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24444,7 +24447,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24447: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24450: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24457,13 +24460,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24460: checking for $ac_func" >&5
+echo "$as_me:24463: 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 24466 "configure"
+#line 24469 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24494,16 +24497,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24500: \$? = $ac_status" >&5
+  echo "$as_me:24503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24506: \$? = $ac_status" >&5
+  echo "$as_me:24509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24513,7 +24516,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24516: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24519: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24525,7 +24528,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24528: checking for working fork" >&5
+  echo "$as_me:24531: 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
@@ -24548,15 +24551,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24554: \$? = $ac_status" >&5
+  echo "$as_me:24557: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24559: \$? = $ac_status" >&5
+  echo "$as_me:24562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24568,7 +24571,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24571: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24574: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24582,12 +24585,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24585: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24588: 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:24590: checking for working vfork" >&5
+  echo "$as_me:24593: 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
@@ -24596,7 +24599,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24599 "configure"
+#line 24602 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24689,15 +24692,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24695: \$? = $ac_status" >&5
+  echo "$as_me:24698: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24700: \$? = $ac_status" >&5
+  echo "$as_me:24703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24709,13 +24712,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24712: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24715: 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:24718: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24721: 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
 
@@ -24740,7 +24743,7 @@ EOF
 
 fi
 
-echo "$as_me:24743: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24746: 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
@@ -24750,7 +24753,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24753 "configure"
+#line 24756 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24785,15 +24788,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24791: \$? = $ac_status" >&5
+  echo "$as_me:24794: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24796: \$? = $ac_status" >&5
+  echo "$as_me:24799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24806,20 +24809,20 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24809: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24812: 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
 EOF
 
-	echo "$as_me:24816: checking for cc_t" >&5
+	echo "$as_me:24819: checking for cc_t" >&5
 echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
 if test "${ac_cv_type_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24822 "configure"
+#line 24825 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24837,16 +24840,16 @@ if (sizeof (cc_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24843: \$? = $ac_status" >&5
+  echo "$as_me:24846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24849: \$? = $ac_status" >&5
+  echo "$as_me:24852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_cc_t=yes
 else
@@ -24856,7 +24859,7 @@ ac_cv_type_cc_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24859: result: $ac_cv_type_cc_t" >&5
+echo "$as_me:24862: result: $ac_cv_type_cc_t" >&5
 echo "${ECHO_T}$ac_cv_type_cc_t" >&6
 if test "$ac_cv_type_cc_t" = yes; then
 
@@ -24866,13 +24869,13 @@ EOF
 
 fi
 
-	echo "$as_me:24869: checking for speed_t" >&5
+	echo "$as_me:24872: checking for speed_t" >&5
 echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
 if test "${ac_cv_type_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24875 "configure"
+#line 24878 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24890,16 +24893,16 @@ if (sizeof (speed_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24896: \$? = $ac_status" >&5
+  echo "$as_me:24899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24902: \$? = $ac_status" >&5
+  echo "$as_me:24905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_speed_t=yes
 else
@@ -24909,7 +24912,7 @@ ac_cv_type_speed_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24912: result: $ac_cv_type_speed_t" >&5
+echo "$as_me:24915: result: $ac_cv_type_speed_t" >&5
 echo "${ECHO_T}$ac_cv_type_speed_t" >&6
 if test "$ac_cv_type_speed_t" = yes; then
 
@@ -24919,13 +24922,13 @@ EOF
 
 fi
 
-	echo "$as_me:24922: checking for tcflag_t" >&5
+	echo "$as_me:24925: checking for tcflag_t" >&5
 echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
 if test "${ac_cv_type_tcflag_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24928 "configure"
+#line 24931 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24943,16 +24946,16 @@ if (sizeof (tcflag_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24949: \$? = $ac_status" >&5
+  echo "$as_me:24952: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24955: \$? = $ac_status" >&5
+  echo "$as_me:24958: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_tcflag_t=yes
 else
@@ -24962,7 +24965,7 @@ ac_cv_type_tcflag_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24965: result: $ac_cv_type_tcflag_t" >&5
+echo "$as_me:24968: result: $ac_cv_type_tcflag_t" >&5
 echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
 if test "$ac_cv_type_tcflag_t" = yes; then
 
@@ -24972,13 +24975,13 @@ EOF
 
 fi
 
-	echo "$as_me:24975: checking for sigset_t" >&5
+	echo "$as_me:24978: checking for sigset_t" >&5
 echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
 if test "${ac_cv_type_sigset_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24981 "configure"
+#line 24984 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24996,16 +24999,16 @@ if (sizeof (sigset_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25002: \$? = $ac_status" >&5
+  echo "$as_me:25005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25008: \$? = $ac_status" >&5
+  echo "$as_me:25011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_sigset_t=yes
 else
@@ -25015,7 +25018,7 @@ ac_cv_type_sigset_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25018: result: $ac_cv_type_sigset_t" >&5
+echo "$as_me:25021: result: $ac_cv_type_sigset_t" >&5
 echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
 if test "$ac_cv_type_sigset_t" = yes; then
 
@@ -25027,7 +25030,7 @@ fi
 
 # special check for test/ditto.c
 
-echo "$as_me:25030: checking for openpty in -lutil" >&5
+echo "$as_me:25033: 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
@@ -25035,7 +25038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25038 "configure"
+#line 25041 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25054,16 +25057,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25060: \$? = $ac_status" >&5
+  echo "$as_me:25063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25066: \$? = $ac_status" >&5
+  echo "$as_me:25069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -25074,7 +25077,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25077: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:25080: 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
@@ -25082,7 +25085,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:25085: checking for openpty header" >&5
+echo "$as_me:25088: 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
@@ -25109,7 +25112,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25112 "configure"
+#line 25115 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -25127,16 +25130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25133: \$? = $ac_status" >&5
+  echo "$as_me:25136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25139: \$? = $ac_status" >&5
+  echo "$as_me:25142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -25154,7 +25157,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:25157: result: $cf_cv_func_openpty" >&5
+echo "$as_me:25160: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25227,7 +25230,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25230 "configure"
+#line 25233 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25239,16 +25242,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25245: \$? = $ac_status" >&5
+  echo "$as_me:25248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25251: \$? = $ac_status" >&5
+  echo "$as_me:25254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25265,7 +25268,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25268: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25271: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25301,7 +25304,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25304: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25307: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25312,7 +25315,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25315: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25318: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25384,7 +25387,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25387 "configure"
+#line 25390 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25396,16 +25399,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25402: \$? = $ac_status" >&5
+  echo "$as_me:25405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25408: \$? = $ac_status" >&5
+  echo "$as_me:25411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25422,7 +25425,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25425: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25428: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25502,7 +25505,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25505: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25508: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25519,23 +25522,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25522: checking for db.h" >&5
+echo "$as_me:25525: 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 25528 "configure"
+#line 25531 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25532: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25535: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25538: \$? = $ac_status" >&5
+  echo "$as_me:25541: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25554,11 +25557,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25557: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25560: 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:25561: checking for version of db" >&5
+echo "$as_me:25564: 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
@@ -25569,10 +25572,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25572: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25575: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25575 "configure"
+#line 25578 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25602,16 +25605,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25608: \$? = $ac_status" >&5
+  echo "$as_me:25611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25614: \$? = $ac_status" >&5
+  echo "$as_me:25617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25625,16 +25628,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25628: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25631: 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:25632: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25635: 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:25637: checking for db libraries" >&5
+echo "$as_me:25640: 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
@@ -25664,10 +25667,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25667: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25670: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25670 "configure"
+#line 25673 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25722,16 +25725,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25728: \$? = $ac_status" >&5
+  echo "$as_me:25731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25734: \$? = $ac_status" >&5
+  echo "$as_me:25737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25751,11 +25754,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25754: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25757: 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:25758: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25761: 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
@@ -25781,7 +25784,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25784: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25787: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25796,7 +25799,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25799: checking if we should include stdbool.h" >&5
+echo "$as_me:25802: 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
@@ -25804,7 +25807,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25807 "configure"
+#line 25810 "configure"
 #include "confdefs.h"
 
 int
@@ -25816,23 +25819,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25822: \$? = $ac_status" >&5
+  echo "$as_me:25825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25828: \$? = $ac_status" >&5
+  echo "$as_me:25831: \$? = $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 25835 "configure"
+#line 25838 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25848,16 +25851,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25854: \$? = $ac_status" >&5
+  echo "$as_me:25857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25860: \$? = $ac_status" >&5
+  echo "$as_me:25863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25871,13 +25874,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25874: result: yes" >&5
+then	echo "$as_me:25877: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25876: result: no" >&5
+else	echo "$as_me:25879: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25880: checking for builtin bool type" >&5
+echo "$as_me:25883: 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
@@ -25885,7 +25888,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25888 "configure"
+#line 25891 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25900,16 +25903,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25906: \$? = $ac_status" >&5
+  echo "$as_me:25909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25912: \$? = $ac_status" >&5
+  echo "$as_me:25915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25922,9 +25925,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25925: result: yes" >&5
+then	echo "$as_me:25928: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25927: result: no" >&5
+else	echo "$as_me:25930: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25941,10 +25944,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25944: checking if we already have C++ library" >&5
+	echo "$as_me:25947: 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 25947 "configure"
+#line 25950 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25958,16 +25961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25964: \$? = $ac_status" >&5
+  echo "$as_me:25967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25970: \$? = $ac_status" >&5
+  echo "$as_me:25973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25976,7 +25979,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25979: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:25982: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25995,7 +25998,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:25998: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:26001: 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
@@ -26021,7 +26024,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26024 "configure"
+#line 26027 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26035,16 +26038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26041: \$? = $ac_status" >&5
+  echo "$as_me:26044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26047: \$? = $ac_status" >&5
+  echo "$as_me:26050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -26056,7 +26059,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:26059: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26062: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -26078,7 +26081,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:26081: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26084: 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
@@ -26093,15 +26096,15 @@ CF_EOF
 # 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:26096: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26099: \$? = $ac_status" >&5
+  echo "$as_me:26102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26101: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26104: \$? = $ac_status" >&5
+  echo "$as_me:26107: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -26112,10 +26115,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:26115: result: yes" >&5
+  echo "$as_me:26118: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:26118: result: no" >&5
+  echo "$as_me:26121: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26135,7 +26138,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:26138: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26141: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -26156,7 +26159,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26159 "configure"
+#line 26162 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -26170,16 +26173,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26176: \$? = $ac_status" >&5
+  echo "$as_me:26179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26182: \$? = $ac_status" >&5
+  echo "$as_me:26185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26216,7 +26219,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26219 "configure"
+#line 26222 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26230,16 +26233,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26236: \$? = $ac_status" >&5
+  echo "$as_me:26239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26242: \$? = $ac_status" >&5
+  echo "$as_me:26245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26272,7 +26275,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26275: result: $cf_cxx_library" >&5
+	echo "$as_me:26278: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26288,7 +26291,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26291: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26294: 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
@@ -26305,18 +26308,18 @@ do
   # 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 26308 "configure"
+#line 26311 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26319: \$? = $ac_status" >&5
+  echo "$as_me:26322: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26339,17 +26342,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26342 "configure"
+#line 26345 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26349: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26352: \$? = $ac_status" >&5
+  echo "$as_me:26355: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26386,7 +26389,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26389: result: $CXXCPP" >&5
+echo "$as_me:26392: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26396,18 +26399,18 @@ do
   # 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 26399 "configure"
+#line 26402 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26404: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26407: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26410: \$? = $ac_status" >&5
+  echo "$as_me:26413: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26430,17 +26433,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26433 "configure"
+#line 26436 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26437: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26440: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26443: \$? = $ac_status" >&5
+  echo "$as_me:26446: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26468,7 +26471,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26471: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26474: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26483,23 +26486,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26486: checking for $ac_header" >&5
+echo "$as_me:26489: 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 26492 "configure"
+#line 26495 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26496: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26502: \$? = $ac_status" >&5
+  echo "$as_me:26505: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26518,7 +26521,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26521: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26531,23 +26534,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26534: checking for $ac_header" >&5
+echo "$as_me:26537: 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 26540 "configure"
+#line 26543 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26544: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26550: \$? = $ac_status" >&5
+  echo "$as_me:26553: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26566,7 +26569,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26569: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26577,10 +26580,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26580: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26583: 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 26583 "configure"
+#line 26586 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26597,16 +26600,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26603: \$? = $ac_status" >&5
+  echo "$as_me:26606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26609: \$? = $ac_status" >&5
+  echo "$as_me:26612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26615,7 +26618,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26618: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26621: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26626,7 +26629,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26629: checking if we should include stdbool.h" >&5
+echo "$as_me:26632: 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
@@ -26634,7 +26637,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26637 "configure"
+#line 26640 "configure"
 #include "confdefs.h"
 
 int
@@ -26646,23 +26649,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26658: \$? = $ac_status" >&5
+  echo "$as_me:26661: \$? = $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 26665 "configure"
+#line 26668 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26678,16 +26681,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26684: \$? = $ac_status" >&5
+  echo "$as_me:26687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26690: \$? = $ac_status" >&5
+  echo "$as_me:26693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26701,13 +26704,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26704: result: yes" >&5
+then	echo "$as_me:26707: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26706: result: no" >&5
+else	echo "$as_me:26709: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26710: checking for builtin bool type" >&5
+echo "$as_me:26713: 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
@@ -26715,7 +26718,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26718 "configure"
+#line 26721 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26730,16 +26733,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26736: \$? = $ac_status" >&5
+  echo "$as_me:26739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26742: \$? = $ac_status" >&5
+  echo "$as_me:26745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26752,19 +26755,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26755: result: yes" >&5
+then	echo "$as_me:26758: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26757: result: no" >&5
+else	echo "$as_me:26760: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26761: checking for bool" >&5
+echo "$as_me:26764: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26767 "configure"
+#line 26770 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26799,16 +26802,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26805: \$? = $ac_status" >&5
+  echo "$as_me:26808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26811: \$? = $ac_status" >&5
+  echo "$as_me:26814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26818,10 +26821,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26821: result: $ac_cv_type_bool" >&5
+echo "$as_me:26824: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26824: checking size of bool" >&5
+echo "$as_me:26827: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26830,7 +26833,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26833 "configure"
+#line 26836 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26862,21 +26865,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26868: \$? = $ac_status" >&5
+  echo "$as_me:26871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26874: \$? = $ac_status" >&5
+  echo "$as_me:26877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26879 "configure"
+#line 26882 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26908,16 +26911,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26914: \$? = $ac_status" >&5
+  echo "$as_me:26917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26920: \$? = $ac_status" >&5
+  echo "$as_me:26923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26933,7 +26936,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26936 "configure"
+#line 26939 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26965,16 +26968,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26971: \$? = $ac_status" >&5
+  echo "$as_me:26974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26977: \$? = $ac_status" >&5
+  echo "$as_me:26980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26990,7 +26993,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26993 "configure"
+#line 26996 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27022,16 +27025,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27028: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27034: \$? = $ac_status" >&5
+  echo "$as_me:27037: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27044,12 +27047,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27047: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27050: 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 27052 "configure"
+#line 27055 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27085,15 +27088,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27091: \$? = $ac_status" >&5
+  echo "$as_me:27094: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27096: \$? = $ac_status" >&5
+  echo "$as_me:27099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27109,13 +27112,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27112: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27115: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27118: checking for type of bool" >&5
+echo "$as_me:27121: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27134,7 +27137,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27137 "configure"
+#line 27140 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27175,15 +27178,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27181: \$? = $ac_status" >&5
+  echo "$as_me:27184: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27186: \$? = $ac_status" >&5
+  echo "$as_me:27189: \$? = $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
@@ -27200,19 +27203,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27203: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27206: 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:27210: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27213: 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:27215: checking for special defines needed for etip.h" >&5
+echo "$as_me:27218: 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"
@@ -27230,7 +27233,7 @@ do
 	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 27233 "configure"
+#line 27236 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27244,16 +27247,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27250: \$? = $ac_status" >&5
+  echo "$as_me:27253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27256: \$? = $ac_status" >&5
+  echo "$as_me:27259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27274,12 +27277,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27277: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27280: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27282: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27285: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27296,7 +27299,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27299 "configure"
+#line 27302 "configure"
 #include "confdefs.h"
 
 class base
@@ -27315,15 +27318,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27321: \$? = $ac_status" >&5
+  echo "$as_me:27324: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27326: \$? = $ac_status" >&5
+  echo "$as_me:27329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27342,7 +27345,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27345: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27348: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27351,7 +27354,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27354: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27357: 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
@@ -27368,7 +27371,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27371 "configure"
+#line 27374 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27387,15 +27390,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27393: \$? = $ac_status" >&5
+  echo "$as_me:27396: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27398: \$? = $ac_status" >&5
+  echo "$as_me:27401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27414,7 +27417,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27417: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27420: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27424,7 +27427,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27427: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27430: 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
@@ -27438,7 +27441,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27441 "configure"
+#line 27444 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27482,16 +27485,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27488: \$? = $ac_status" >&5
+  echo "$as_me:27491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27494: \$? = $ac_status" >&5
+  echo "$as_me:27497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27509,7 +27512,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27512: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27515: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27557,13 +27560,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27560: checking for bool" >&5
+echo "$as_me:27563: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27566 "configure"
+#line 27569 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27598,16 +27601,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27604: \$? = $ac_status" >&5
+  echo "$as_me:27607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27610: \$? = $ac_status" >&5
+  echo "$as_me:27613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27617,10 +27620,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27620: result: $ac_cv_type_bool" >&5
+echo "$as_me:27623: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27623: checking size of bool" >&5
+echo "$as_me:27626: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27629,7 +27632,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27632 "configure"
+#line 27635 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27661,21 +27664,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27667: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27667: \$? = $ac_status" >&5
+  echo "$as_me:27670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27673: \$? = $ac_status" >&5
+  echo "$as_me:27676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27678 "configure"
+#line 27681 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27707,16 +27710,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27713: \$? = $ac_status" >&5
+  echo "$as_me:27716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27719: \$? = $ac_status" >&5
+  echo "$as_me:27722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27732,7 +27735,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27735 "configure"
+#line 27738 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27764,16 +27767,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27770: \$? = $ac_status" >&5
+  echo "$as_me:27773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27776: \$? = $ac_status" >&5
+  echo "$as_me:27779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27789,7 +27792,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27792 "configure"
+#line 27795 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27821,16 +27824,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27827: \$? = $ac_status" >&5
+  echo "$as_me:27830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27833: \$? = $ac_status" >&5
+  echo "$as_me:27836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27843,12 +27846,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27846: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27849: 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 27851 "configure"
+#line 27854 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27884,15 +27887,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27890: \$? = $ac_status" >&5
+  echo "$as_me:27893: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27895: \$? = $ac_status" >&5
+  echo "$as_me:27898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27908,13 +27911,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27911: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27914: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27917: checking for type of bool" >&5
+echo "$as_me:27920: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27933,7 +27936,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27936 "configure"
+#line 27939 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27974,15 +27977,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27980: \$? = $ac_status" >&5
+  echo "$as_me:27983: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27985: \$? = $ac_status" >&5
+  echo "$as_me:27988: \$? = $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
@@ -27999,14 +28002,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:28002: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:28005: 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:28009: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:28012: 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
@@ -28037,7 +28040,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:28040: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:28043: 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
@@ -28048,7 +28051,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:28051: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:28054: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -28065,10 +28068,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:28068: result: $ADAFLAGS" >&5
+	echo "$as_me:28071: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:28071: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28074: 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
@@ -28078,11 +28081,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:28081: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28084: 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:28085: checking if GNAT supports generics" >&5
+echo "$as_me:28088: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -28092,7 +28095,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:28095: result: $cf_gnat_generics" >&5
+echo "$as_me:28098: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -28104,7 +28107,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:28107: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28110: 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
@@ -28152,7 +28155,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:28155: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28158: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -28165,7 +28168,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:28168: checking if GNAT supports project files" >&5
+echo "$as_me:28171: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28228,15 +28231,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28231: result: $cf_gnat_projects" >&5
+echo "$as_me:28234: 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:28237: checking if GNAT supports libraries" >&5
+	echo "$as_me:28240: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28239: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28242: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28256,7 +28259,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28259: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28262: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28268,7 +28271,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28271: checking for Ada95 compiler" >&5
+echo "$as_me:28274: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28279,12 +28282,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28282: result: $cf_ada_compiler" >&5
+echo "$as_me:28285: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28287: checking for Ada95 include directory" >&5
+echo "$as_me:28290: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28318,7 +28321,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28321: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28324: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28327,10 +28330,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28330: result: $ADA_INCLUDE" >&5
+echo "$as_me:28333: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28333: checking for Ada95 object directory" >&5
+echo "$as_me:28336: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28364,7 +28367,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28367: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28370: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28373,10 +28376,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28376: result: $ADA_OBJECTS" >&5
+echo "$as_me:28379: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28379: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28382: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28397,11 +28400,11 @@ then
 	fi
 fi
 
-echo "$as_me:28400: result: $with_ada_sharedlib" >&5
+echo "$as_me:28403: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28404: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28407: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28419,7 +28422,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28422: checking for Ada95 curses library name" >&5
+echo "$as_me:28425: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28435,7 +28438,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28438: result: $ADA_LIBNAME" >&5
+echo "$as_me:28441: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28446,13 +28449,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28449: checking for wchar_t" >&5
+	echo "$as_me:28452: 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 28455 "configure"
+#line 28458 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28467,16 +28470,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28473: \$? = $ac_status" >&5
+  echo "$as_me:28476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28479: \$? = $ac_status" >&5
+  echo "$as_me:28482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28486,10 +28489,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28489: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28492: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28492: checking size of wchar_t" >&5
+echo "$as_me:28495: 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
@@ -28498,7 +28501,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28501 "configure"
+#line 28504 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28510,21 +28513,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28516: \$? = $ac_status" >&5
+  echo "$as_me:28519: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28522: \$? = $ac_status" >&5
+  echo "$as_me:28525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28527 "configure"
+#line 28530 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28536,16 +28539,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28542: \$? = $ac_status" >&5
+  echo "$as_me:28545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28548: \$? = $ac_status" >&5
+  echo "$as_me:28551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28561,7 +28564,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28564 "configure"
+#line 28567 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28573,16 +28576,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28579: \$? = $ac_status" >&5
+  echo "$as_me:28582: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28585: \$? = $ac_status" >&5
+  echo "$as_me:28588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28598,7 +28601,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28601 "configure"
+#line 28604 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28610,16 +28613,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28616: \$? = $ac_status" >&5
+  echo "$as_me:28619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28622: \$? = $ac_status" >&5
+  echo "$as_me:28625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28632,12 +28635,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28635: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28638: 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 28640 "configure"
+#line 28643 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28653,15 +28656,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28659: \$? = $ac_status" >&5
+  echo "$as_me:28662: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28664: \$? = $ac_status" >&5
+  echo "$as_me:28667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28677,7 +28680,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28680: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28683: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28690,7 +28693,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28693: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28696: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28708,7 +28711,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28711: checking for library subsets" >&5
+echo "$as_me:28714: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28762,7 +28765,7 @@ fi
 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:28765: result: $LIB_SUBSETS" >&5
+echo "$as_me:28768: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28793,7 +28796,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28796: checking default library suffix" >&5
+echo "$as_me:28799: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28804,10 +28807,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28807: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28810: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28810: checking default library-dependency suffix" >&5
+echo "$as_me:28813: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28890,10 +28893,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28893: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28896: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28896: checking default object directory" >&5
+echo "$as_me:28899: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28909,11 +28912,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28912: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28915: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28916: checking c++ library-dependency suffix" >&5
+echo "$as_me:28919: 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++)
@@ -29006,7 +29009,7 @@ else
 	fi
 
 fi
-echo "$as_me:29009: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:29012: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -29182,19 +29185,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:29185: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29188: 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 <<EOF
-#line 29190 "configure"
+#line 29193 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:29194: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29197: \$? = $ac_status" >&5
+  echo "$as_me:29200: \$? = $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
@@ -29205,10 +29208,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29208 "configure"
+#line 29211 "configure"
 #include "confdefs.h"
 
-#line 29211 "configure"
+#line 29214 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29223,16 +29226,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29229: \$? = $ac_status" >&5
+  echo "$as_me:29232: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29235: \$? = $ac_status" >&5
+  echo "$as_me:29238: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29255,7 +29258,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29258: result: $cf_ldflags_static" >&5
+	echo "$as_me:29261: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29271,7 +29274,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29274: checking where we will install curses.h" >&5
+echo "$as_me:29277: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29281,7 +29284,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29284: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29287: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29289,7 +29292,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29292: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29295: 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
@@ -29314,7 +29317,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29317: checking for desired basename for form library" >&5
+echo "$as_me:29320: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29334,10 +29337,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29337: result: $FORM_NAME" >&5
+echo "$as_me:29340: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29340: checking for desired basename for menu library" >&5
+echo "$as_me:29343: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29357,10 +29360,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29360: result: $MENU_NAME" >&5
+echo "$as_me:29363: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29363: checking for desired basename for panel library" >&5
+echo "$as_me:29366: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29380,10 +29383,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29383: result: $PANEL_NAME" >&5
+echo "$as_me:29386: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29386: checking for desired basename for cxx library" >&5
+echo "$as_me:29389: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29403,13 +29406,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29406: result: $CXX_NAME" >&5
+echo "$as_me:29409: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29412: checking for src modules" >&5
+echo "$as_me:29415: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29468,7 +29471,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29471: result: $cf_cv_src_modules" >&5
+echo "$as_me:29474: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29629,7 +29632,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29632: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29635: 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//'`
@@ -29640,7 +29643,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29643: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29646: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29656,7 +29659,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29659: result: $PKG_CFLAGS" >&5
+echo "$as_me:29662: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29728,7 +29731,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29731: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29734: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29755,7 +29758,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29758: checking for linker search path" >&5
+echo "$as_me:29761: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29803,7 +29806,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29806: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29809: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29844,7 +29847,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29847: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29850: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29930,7 +29933,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29933: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29936: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -30111,7 +30114,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:30114: error: ambiguous option: $1
+    { { echo "$as_me:30117: 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;}
@@ -30130,7 +30133,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:30133: error: unrecognized option: $1
+  -*) { { echo "$as_me:30136: 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;}
@@ -30262,7 +30265,7 @@ do
   "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:30265: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30268: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30578,6 +30581,7 @@ s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t
 s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t
 s,@TEST_LIBS@,$TEST_LIBS,;t t
 s,@TEST_LIBS2@,$TEST_LIBS2,;t t
+s,@cf_cv_cc_bool_type@,$cf_cv_cc_bool_type,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
 s,@CXX_AR@,$CXX_AR,;t t
@@ -30787,7 +30791,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30790: creating $ac_file" >&5
+    { echo "$as_me:30794: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30805,7 +30809,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30808: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30812: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30818,7 +30822,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30821: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30825: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30834,7 +30838,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30837: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30841: 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;}
@@ -30843,7 +30847,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30846: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30850: 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;}
@@ -30888,7 +30892,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30891: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30895: 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;}
@@ -30899,7 +30903,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30902: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30906: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30948,7 +30952,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30951: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30955: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30959,7 +30963,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30962: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30966: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30972,7 +30976,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30975: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30979: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31030,7 +31034,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:31033: $ac_file is unchanged" >&5
+      { echo "$as_me:31037: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31417,7 +31421,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31420: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31424: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 39f9ef9bd..f4fe2d0d1 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.788 2024/12/14 21:14:32 tom Exp $
+dnl $Id: configure.in,v 1.789 2024/12/29 00:50:56 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.788 $)
+AC_REVISION($Revision: 1.789 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1901,6 +1901,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 CF_BOOL_DECL(cf_cv_cc_bool_type)
+AC_SUBST(cf_cv_cc_bool_type)
 
 # Check for C++ compiler characteristics (and ensure that it's there!)
 if test -n "$CXX" ; then
diff --git a/dist.mk b/dist.mk
index 08c5ee6e9..75399ea8f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1646 2024/12/21 10:55:02 tom Exp $
+# $Id: dist.mk,v 1.1647 2024/12/28 11:24:50 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241221
+NCURSES_PATCH = 20241228
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 1f4d9d565..ce928a79c 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -120,7 +120,11 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        itself, but its <STRONG><A HREF="curs_util.3x.html">wunctrl(3x)</A></STRONG> representation.
 
        A <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> can be copied from  place  to  place  using  <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG>  and
-       <STRONG>wadd_wch</STRONG>.
+       <STRONG>wadd_wch</STRONG>.   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined constants that
+       can be usefully "or"ed with  characters.   A  complex  character  whose
+       character  component  is  a  wide  space,  and  whose only attribute is
+       <STRONG>WA_NORMAL</STRONG>, is a  <EM>blank</EM>  <EM>character</EM>,  and  therefore  combines  with  the
+       background character; see <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-wecho_wchar">wecho_wchar</a></H3><PRE>
@@ -175,11 +179,11 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        <STRONG>WACS_S7</STRONG>         0x23bc    -         r      scan line 7
        <STRONG>WACS_S9</STRONG>         0x23bd    _         s      scan line 9
        <STRONG>WACS_STERLING</STRONG>   0x00a3    f         }      pound-sterling symbol
+
        <STRONG>WACS_TTEE</STRONG>       0x252c    +         w      top tee
        <STRONG>WACS_UARROW</STRONG>     0x2191    ^         -      arrow pointing up
        <STRONG>WACS_ULCORNER</STRONG>   0x250c    +         l      upper left-hand corner
        <STRONG>WACS_URCORNER</STRONG>   0x2510    +         k      upper right-hand corner
-
        <STRONG>WACS_VLINE</STRONG>      0x2502    |         x      vertical line
 
        The wide-character configuration of <EM>ncurses</EM> also  defines  symbols  for
@@ -233,7 +237,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.   In  <EM>ncurses</EM>,
        <STRONG>wadd_wch</STRONG> returns <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
        <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
            been called on <EM>win</EM> when writing to its  bottom  right  location  is
@@ -359,12 +363,12 @@ <H1 class="no-header">curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>,  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 1d0e9798c..b18f70935 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -95,9 +95,9 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</H
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
 
-       <STRONG>o</STRONG>   <EM>wchstr</EM> is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   <EM>wchstr</EM> is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -130,7 +130,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-07-27               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 157e46d32..93059ab86 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp @
+  * @Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -105,28 +105,31 @@ <H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        The  object or expression <EM>ch</EM> may contain attributes and/or a color pair
        identifier.  (A  <EM>chtype</EM>  can  be  copied  from  place  to  place  using
        <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>  and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined
-       constants that can be usefully "or"ed with characters.
+       constants that can be usefully "or"ed  with  characters.   A  <EM>ch</EM>  whose
+       character  component  is a space, and whose only attribute is <STRONG>A_NORMAL</STRONG>,
+       is a <EM>blank</EM>  <EM>character</EM>,  and  therefore  combines  with  the  background
+       character; see <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-wechochar">wechochar</a></H3><PRE>
-       <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
-       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.   <EM>curses</EM>  interprets  these  functions  as  a  hint  to its
-       optimizer that only a single character cell  in  the  window  is  being
-       altered  between  refreshes; for non-control characters, a considerable
+       <STRONG>echochar</STRONG>  and  <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG> followed by
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM>  interprets  these  functions  as  a  hint  to  its
+       optimizer  that  only  a  single  character cell in the window is being
+       altered between refreshes; for non-control characters,  a  considerable
        performance gain may be enjoyed by employing them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
-       <EM>curses</EM> defines macros starting with <STRONG>ACS_</STRONG> that can be used  with  <STRONG>waddch</STRONG>
-       to  write  line-drawing  and  other  special  characters to the screen.
-       <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS  default  listed
-       below  is  used  if  the  <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not
-       define a terminal-specific replacement for it, or if the  terminal  and
-       locale  configuration  requires  Unicode to access these characters but
+       <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
+       to write line-drawing and  other  special  characters  to  the  screen.
+       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
+       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
+       define  a  terminal-specific replacement for it, or if the terminal and
+       locale configuration requires Unicode to access  these  characters  but
        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
        corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
        string capability, and the characters in it may appear on the screen if
-       the  terminal type's database entry incorrectly advertises ACS support.
+       the terminal type's database entry incorrectly advertises ACS  support.
        The name "ACS" originates in the Alternate Character Set feature of the
        DEC VT100 terminal.
 
@@ -172,26 +175,26 @@ <H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
-           been called on <EM>win</EM> when a write to its  bottom  right  location  is
+       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
+           been  called  on  <EM>win</EM>  when a write to its bottom right location is
            attempted, or
 
-       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
+       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
            position.
 
        The last may be due to different causes:
 
-       <STRONG>o</STRONG>   conversion of a wide character to a  multibyte  character  sequence
+       <STRONG>o</STRONG>   conversion  of  a  wide character to a multibyte character sequence
            can fail, or
 
-       <STRONG>o</STRONG>   at  least one of the bytes resulting from wide character conversion
-           to a multibyte character sequence cannot be added  to  the  window.
-           See  section  "PORTABILITY"  below regarding the use of <STRONG>waddch</STRONG> with
+       <STRONG>o</STRONG>   at least one of the bytes resulting from wide character  conversion
+           to  a  multibyte  character sequence cannot be added to the window.
+           See section "PORTABILITY" below regarding the use  of  <STRONG>waddch</STRONG>  with
            wide characters.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -202,7 +205,7 @@ <H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       SVr4  and  other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG> variable, but
+       SVr4 and other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG>  variable,  but
        X/Open Curses does not specify it; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
 
@@ -210,90 +213,90 @@ <H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
+       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
        value other than <STRONG>ERR</STRONG>".
 
-       The  defaults specified for forms-drawing characters apply in the POSIX
+       The defaults specified for forms-drawing characters apply in the  POSIX
        locale.
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open Curses states that the  <STRONG>ACS_</STRONG>  definitions  are  <EM>char</EM>  constants.
+       X/Open  Curses  states  that  the  <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
        Some implementations are problematic.
 
-       <STRONG>o</STRONG>   Solaris  <EM>curses</EM>, for example, defines the ACS symbols as constants;
+       <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
            others define them as elements of an array.
 
-           This implementation uses an array, <STRONG>acs_map</STRONG>,  as  did  SVr4  <EM>curses</EM>.
+           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
            NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
            for compatibility.
 
-       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
-           <STRONG>WACS_</STRONG>  symbols  as  if  the  <STRONG>ACS_</STRONG> symbols were wide characters (see
-           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).  The  misdefined  symbols  are  the  arrows  and
+       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
+           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
+           <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
            others that are not used for line drawing.
 
-       <STRONG>o</STRONG>   X/Open  Curses  (Issues  2 through 7) has a typographical error for
-           the <STRONG>ACS_LANTERN</STRONG> symbol, equating  its  "VT100+  Character"  to  "I"
-           (capital  I),  while  the  header  files  for SVr4 <EM>curses</EM> and other
+       <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
            implementations use "i" (small i).
 
-           None of the terminal descriptions on Unix platforms  use  uppercase
-           I,  except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for <STRONG>screen(1)</STRONG>,
-           apparently based on the X/Open documentation around 1995).  On  the
-           other  hand,  its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS Terminal Emulator)
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  <EM>terminfo</EM>  entry  for  <STRONG>screen(1)</STRONG>,
+           apparently  based on the X/Open documentation around 1995).  On the
+           other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
            description uses lowercase i.
 
-       Some ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>,  <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>,  and  <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in any publicly
-       released System V.  However, many publicly available  <EM>terminfo</EM>  entries
-       include  <STRONG>acsc</STRONG>  capabilities in which their key characters (<STRONG>pryz{|}</STRONG>) are
-       embedded, and a second-hand list of their  character  descriptions  has
-       come  to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names for
+       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
+       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
+       released  System V.   However, many publicly available <EM>terminfo</EM> entries
+       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
+       embedded,  and  a  second-hand list of their character descriptions has
+       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
        them.
 
        The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
-           character  configurations  (the  former  is  capable  of displaying
+           character configurations  (the  former  is  capable  of  displaying
            Unicode while the latter is not), and
 
        <STRONG>o</STRONG>   whether the locale uses UTF-8 encoding.
 
-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
-       characters   <EM>except</EM>   by   using  UTF-8;  see  the  discussion  of  the
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  <EM>except</EM>  by  using  UTF-8;  see  the   discussion   of   the
        <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM> environment variable in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open Curses assumes that the parameter passed to  <STRONG>waddch</STRONG>  contains  a
-       single  character.   That  character may have been more than eight bits
-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
-       width  of  a non-wide character code unspecified.  The standard further
-       does not specify the internal structure of a <EM>chtype</EM>, though the use  of
-       bit  operations  to  combine  the  character code with attributes and a
+       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
+       single character.  That character may have been more  than  eight  bits
+       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+       width of a non-wide character code unspecified.  The  standard  further
+       does  not specify the internal structure of a <EM>chtype</EM>, though the use of
+       bit operations to combine the character  code  with  attributes  and  a
        color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
-       a  multibyte  character sequence to be passed via a succession of calls
-       to <STRONG>waddch</STRONG>.  Other implementations  do  not;  a  <STRONG>waddch</STRONG>  call  transmits
-       exactly  one  character,  which  may  be rendered in one or more screen
-       locations depending  on  whether  it  is  printable  (see  <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
-       Depending  on  the  locale,  <EM>ncurses</EM>  inspects  the byte passed in each
-       <STRONG>waddch</STRONG> call and checks whether the latest call  continues  a  multibyte
-       character.    When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays  the
-       character  and  advances  the  cursor.   If  the  calling   application
+       a multibyte character sequence to be passed via a succession  of  calls
+       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
+       exactly one character, which may be rendered  in  one  or  more  screen
+       locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
+       Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
+       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
+       character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
+       character   and  advances  the  cursor.   If  the  calling  application
        interrupts the succession of bytes in a multibyte character sequence by
-       changing the current  location--for  example,  with  <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
+       changing  the  current  location--for  example, with <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>--<EM>ncurses</EM>
        discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
-       foregoing behavior.  Check whether a character can be represented as  a
+       foregoing  behavior.  Check whether a character can be represented as a
        single byte in the current locale.
 
        <STRONG>o</STRONG>   If it can, call either <EM>waddch</EM> or <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>.
@@ -308,16 +311,16 @@ <H1 class="no-header">curs_addch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>,    <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>,   <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,    <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putchar(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-09-21                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 07c9c457d..5f986e677 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -91,9 +91,9 @@ <H1 class="no-header">curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
 
-       <STRONG>o</STRONG>   <EM>chstr</EM> is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   <EM>chstr</EM> is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 550d1d7fe..f50a67fba 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp @
+  * @Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -80,9 +80,9 @@ <H1 class="no-header">curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>str</EM> is <EM>NULL</EM>, or
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 0254d9e22..59c2cfb02 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -84,9 +84,9 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <EM>NULL</EM>, or
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 4a302dc31..7afa149cc 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp @
+  * @Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -245,11 +245,11 @@ <H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
 
        <STRONG>wcolor_set</STRONG> returns <STRONG>ERR</STRONG> if <EM>pair</EM> is outside the range <STRONG>0</STRONG>..<STRONG>COLOR_PAIRS-1</STRONG>.
 
-       <STRONG>wattr_get</STRONG> does <EM>not</EM> fail if its <EM>attrs</EM> or <EM>pair</EM> parameter is <STRONG>NULL</STRONG>.
+       <STRONG>wattr_get</STRONG> does <EM>not</EM> fail if its <EM>attrs</EM> or <EM>pair</EM> parameter is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -278,7 +278,7 @@ <H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        Each  of  the functions added by XSI Curses has a parameter <EM>opts</EM>, which
        X/Open Curses  still  (after  more  than  twenty  years)  documents  as
-       reserved  for  future  use,  saying  that  it  should  be  <STRONG>NULL</STRONG>.   This
+       reserved  for  future  use,  saying  that  it  should  be  <EM>NULL</EM>.   This
        implementation uses that parameter in ABI 6  for  the  functions  which
        have a color pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
 
@@ -292,7 +292,7 @@ <H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
            standard pointer to <EM>short</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the  <EM>opts</EM>
-           parameter is ignored except except to check that it is <STRONG>NULL</STRONG>.
+           parameter is ignored except except to check that it is <EM>NULL</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -497,7 +497,7 @@ <H1 class="no-header">curs_attr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index 725c0a786..d3b55ddf1 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -71,21 +71,21 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
        When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
        background character.  <EM>curses</EM> also  uses  the  window  background  when
-       writing characters to the screen:
+       writing characters to the screen.
 
-       <STRONG>o</STRONG>   The attribute part of the background is combined with all non-blank
-           characters that are written into the window, as with the <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>
-           and <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families of functions.
+       <STRONG>o</STRONG>   The  attribute  part  of the background combines with all non-blank
+           characters written into the window,  as  with  the  <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>  and
+           <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families of functions.
 
-       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
-           combined with blank characters that are written into the window.
+       <STRONG>o</STRONG>   Both  the  character  and attribute parts of the background combine
+           with blank characters that are written into the window.
 
        The background becomes a property of the character and  moves  with  it
        through any scrolling and insert/delete line/character operations.
 
-       To  the  extent possible on a given terminal, the attribute part of the
-       background is displayed as the graphic rendition of the  character  put
-       on the screen.
+       To  the  extent  possible  on  a  given  terminal,  <EM>curses</EM> displays the
+       attributes of the background as the graphic rendition of the  character
+       put on the screen.
 
 
 </PRE><H3><a name="h3-bkgd_wbkgd">bkgd, wbkgd</a></H3><PRE>
@@ -100,15 +100,15 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
            new background character.
 
        <EM>ncurses</EM>  updates  the rendition of each character cell by comparing the
-       character, non-color attributes, and colors.  The  library  applies  to
-       following  procedure  to  each cell in the window, whether or not it is
-       blank.
+       character, non-color attributes, and color pair selection.  The library
+       applies  the following procedure to each cell in the window, whether or
+       not it is blank.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
            specified  background  character; if they match, <EM>ncurses</EM> writes the
            new background character to the cell.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color; that is, its color pair
            value  is  nonzero.   If not, it simply replaces the attributes and
            color  pair  in  the  cell  with  those  from  the  new  background
            character.
@@ -125,9 +125,9 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
            the current background, and then adding  attributes  from  the  new
            background.
 
-       If the new background's character is nonspacing, <EM>ncurses</EM> reuses the old
-       background character, except for one special  case:  <EM>ncurses</EM>  treats  a
-       background character value of zero (0) as a space.
+       If  the  new  background's character is nonspacing, <EM>ncurses</EM> retains the
+       existing background character, except for  one  special  case:  <EM>ncurses</EM>
+       treats a background character value of zero (0) as a space.
 
        If  the  terminal  does  not  support  color,  or if color has not been
        initialized with <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>, <EM>ncurses</EM> ignores  the  new  background
@@ -141,19 +141,21 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
-       <STRONG>getbkgd</STRONG>  obtains  the given window's background character and attribute
-       combination.
+       <STRONG>getbkgd</STRONG>  returns  the  given window's background character, attributes,
+       and color pair as a <EM>chtype</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions returning an <EM>int</EM> return <STRONG>OK</STRONG> on success.  <STRONG>bkgd</STRONG> returns  <STRONG>ERR</STRONG>  if
-       the  library has not been initialized.  <STRONG>wbkgd</STRONG> and <STRONG>getbkgd</STRONG> return <STRONG>ERR</STRONG> if
-       a <EM>WINDOW</EM> pointer argument is null.
+       <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value
 
-       <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value.
+       Functions returning an <EM>int</EM> return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
+       In <EM>ncurses</EM>, failure occurs if
 
-       <STRONG>getbkgd</STRONG>  returns  a  window's  background   character   and   attribute
-       combination.
+       <STRONG>o</STRONG>   if the library has not been initialized, or
+
+       <STRONG>o</STRONG>   if <EM>win</EM> is <EM>NULL</EM>.
+
+       <STRONG>getbkgd</STRONG>'s return value is as described above.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -164,28 +166,32 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
        X/Open Curses mentions that the character part of the  background  must
        be  a  single-byte  value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, checks to ensure
-       that, and will reuse the old background character if the check fails.
+       that, and retains the existing background character if the check fails.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.   It  specifies  that
-       <STRONG>bkgd</STRONG>,  <STRONG>wbkgd</STRONG>,  and  <STRONG>getbkgd</STRONG>  return  <STRONG>ERR</STRONG> on failure (in the case of the
-       last,  this  value  is  cast  to  <EM>chtype</EM>),  but  describes  no  failure
-       conditions.
+       X/Open Curses, Issue 4 describes these functions.   It  indicates  that
+       <EM>bkgd</EM>,  <EM>wbkgd</EM>,  and  <EM>getbkgd</EM>  return  <STRONG>ERR</STRONG> on failure (in the case of the
+       last, this value is cast to <EM>chtype</EM>), but specifies no error  conditions
+       for them.
 
-       The  SVr4.0  manual  says  that <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> may return <STRONG>OK</STRONG> "or a non-
+       SVr4  documentation  says  that  <EM>bkgd</EM>  and  <EM>wbkgd</EM>  return <STRONG>OK</STRONG> "or a non-
        negative integer if <STRONG>immedok</STRONG> is set", which refers to the  return  value
-       from  <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>,  used  to implement the immediate repainting.  SVr4
-       <EM>curses</EM>'s <STRONG>wrefresh</STRONG> returns the  number  of  characters  written  to  the
-       screen during the refresh.  <EM>ncurses</EM> does not do that.
+       from  <EM>wrefresh()</EM>,  used  to  implement  the immediate repainting.  SVr4
+       <EM>curses</EM>'s <EM>wrefresh</EM> returns the  number  of  characters  written  to  the
+       screen during the refresh; that of <EM>ncurses</EM> does not.
 
        Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
-       rendition of characters on  the  screen  updates  when  <STRONG>bkgd</STRONG>  or  <STRONG>wbkgd</STRONG>
+       rendition of characters on  the  screen  updates  when  <EM>bkgd</EM>  or  <EM>wbkgd</EM>
        changes  the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does not
        (in  its  non-wide  configuration)  store  the  background  and  window
        attribute contributions to each character cell separately.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr3.1 (1987) introduced these functions.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>  describes  the  corresponding  functions  in  the wide
        configuration of <EM>ncurses</EM>.
@@ -194,7 +200,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-22                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -210,6 +216,7 @@ <H1 class="no-header">curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 8214dfed6..e740754ac 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -67,26 +67,26 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        Every <EM>curses</EM> window has a background property.  In the  library's  wide
        configuration,  this  property  is  a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  which combines a set of
-       attributes  with  the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>)  The
+       attributes with the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>).   The
        background character is a spacing character.
 
        When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
        background character.  <EM>curses</EM> also  uses  the  window  background  when
-       writing characters to the screen:
+       writing characters to the screen.
 
-       <STRONG>o</STRONG>   The attribute part of the background is combined with all non-blank
-           characters  that  are  written  into  the  window,  as   with   the
-           <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
+       <STRONG>o</STRONG>   The  attribute  part  of the background combines with all non-blank
+           characters written into the window, as with  the  <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>  and
+           <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
 
-       <STRONG>o</STRONG>   Both  the  character  and  attribute  parts  of  the background are
-           combined with blank characters that are written into the window.
+       <STRONG>o</STRONG>   Both  the  character  and attribute parts of the background combine
+           with blank characters that are written into the window.
 
        The background becomes a property of the character and  moves  with  it
        through any scrolling and insert/delete line/character operations.
 
-       To  the  extent possible on a given terminal, the attribute part of the
-       background is displayed as the graphic rendition of the  character  put
-       on the screen.
+       To  the  extent  possible  on  a  given  terminal,  <EM>curses</EM> displays the
+       attributes of the background as the graphic rendition of the  character
+       put on the screen.
 
 
 </PRE><H3><a name="h3-bkgrnd_wbkgrnd">bkgrnd, wbkgrnd</a></H3><PRE>
@@ -101,15 +101,15 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
            new background character.
 
        <EM>ncurses</EM>  updates  the rendition of each character cell by comparing the
-       character, non-color attributes, and colors.  The  library  applies  to
-       following  procedure  to  each cell in the window, whether or not it is
-       blank.
+       character, non-color attributes, and color pair selection.  The library
+       applies  to  following procedure to each cell in the window, whether or
+       not it is blank.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
            specified  background  character; if they match, <EM>ncurses</EM> writes the
            new background character to the cell.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color, that is, its color pair
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color; that is, its color pair
            value  is  nonzero.   If not, it simply replaces the attributes and
            color  pair  in  the  cell  with  those  from  the  new  background
            character.
@@ -142,9 +142,9 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-getbkgrnd_wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
-       The  <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> functions obtain the background character
-       and attribute pair of <STRONG>stdscr</STRONG> or the specified window and store  it  via
-       the <EM>wch</EM> pointer.
+       <STRONG>getbkgrnd</STRONG>  and  <STRONG>wgetbkgrnd</STRONG>  respectively  obtain  <STRONG>stdscr</STRONG>'s or the given
+       window's background character, attributes, and color pair, and store it
+       in their <EM>wch</EM> argument.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -153,9 +153,9 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
        The  other  functions  return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.  In
        <EM>ncurses</EM>, failure occurs if
 
-       <STRONG>o</STRONG>   a <EM>WINDOW</EM> pointer <EM>win</EM> is null, or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>, or
 
-       <STRONG>o</STRONG>   a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> pointer <EM>wch</EM> is null.
+       <STRONG>o</STRONG>   <EM>wch</EM> is <EM>NULL</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -171,18 +171,23 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
        error conditions for them.
 
        X/Open Curses does not provide details of how the rendition is updated.
-       This implementation follows the approach used in SVr4 <EM>curses</EM>.
+       <EM>ncurses</EM> follows the approach used in SVr4 <EM>curses</EM>'s  non-wide  functions
+       for manipulating the window background.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These functions were initially specified by X/Open Curses, Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG> describes the corresponding  functions  in  the  non-wide
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the  corresponding  functions in the non-wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-22                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -198,6 +203,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 4a0f5872b..483319f61 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_color 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -503,10 +503,10 @@ <H1 class="no-header">curs_color 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
        Other implementations of curses had different limits:
 
-       <STRONG>o</STRONG>   PCCurses (1987-1990) provided for only eight (8) colors.
+       <STRONG>o</STRONG>   <EM>PCCurses</EM> (1987-1990) provided for only eight (8) colors.
 
-       <STRONG>o</STRONG>   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
-           PCCurses, but changed this to 256 in version 2.5 (2001), along with
+       <STRONG>o</STRONG>   <EM>PDCurses</EM>  (1992-present)  inherited  the  8-color  limitation  from
+           <EM>PCCurses</EM>, but changed this to 256 in version 2.5 (2001), along with
            changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
 
        <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
@@ -539,7 +539,7 @@ <H1 class="no-header">curs_color 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 43b2e41de..61a2edf98 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp @
+  * @Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -73,7 +73,7 @@ <H1 class="no-header">curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_delch 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 68bbb4cf2..627d42203 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -85,7 +85,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they fail if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they fail if <EM>win</EM> is <EM>NULL</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-22                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index e2ce5a98b..d7da68938 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -83,8 +83,8 @@ <H1 class="no-header">curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
        happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG>  has
        been  called,  it  occurs  when the next newline is read.  (Because the
-       terminal's normal or "cooked" mode is line-buffered, multiple  <STRONG>wget_wch</STRONG>
-       calls   may   then   be  necessary  to  empty  the  input  queue.)   If
+       terminal's  canonical  or  "cooked"  mode  is  line-buffered,  multiple
+       <STRONG>wget_wch</STRONG>  calls  may  then  be necessary to empty the input queue.)  If
        <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
        the specified delay elapses.
 
@@ -123,7 +123,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
            to <STRONG>EINTR</STRONG>.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -172,7 +172,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index b4ec79d4c..649755fab 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -174,8 +174,8 @@ <H1 class="no-header">curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   For  analogy  with  <STRONG>wgetnstr</STRONG>,  <EM>ncurses</EM>  6.2  uses a limit (based on
            <STRONG>LINE_MAX</STRONG>).
 
-       <STRONG>o</STRONG>   Some other implementations (such as Solaris xcurses) do  the  same,
-           while others (PDCurses) do not allow this.
+       <STRONG>o</STRONG>   Some other implementations (such as Solaris <EM>xcurses</EM>) do  the  same,
+           while others (<EM>PDCurses</EM>) do not allow this.
 
        <STRONG>o</STRONG>   NetBSD  7 curses imitates <EM>ncurses</EM> 6.1 in this regard, treating a <STRONG>-1</STRONG>
            as an indefinite number of characters.
@@ -189,7 +189,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index f017ec8ff..a18ae93dc 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
        happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG> has
        been called, it occurs when the next newline  is  read.   (Because  the
-       terminal's  normal  or  "cooked" mode is line-buffered, multiple <STRONG>wgetch</STRONG>
+       terminal's canonical or "cooked" mode is line-buffered, multiple <STRONG>wgetch</STRONG>
        calls  may  then  be  necessary  to  empty  the   input   queue.)    If
        <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
        the specified delay elapses.
@@ -315,7 +315,7 @@ <H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        <STRONG>has_key</STRONG> returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -352,7 +352,7 @@ <H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   It usually produces a control code for carriage return (<STRONG>^M</STRONG>) or line
            feed (<STRONG>^J</STRONG>).
 
-       <STRONG>o</STRONG>   Depending on the terminal mode  (raw,  cbreak,  or  "cooked"),  and
+       <STRONG>o</STRONG>   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
            whether  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  or  <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG>  has  been  called, <STRONG>wgetch</STRONG> may return
            either a carriage return or line feed upon an Enter or  Return  key
            stroke.
@@ -428,7 +428,7 @@ <H1 class="no-header">curs_getch 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 226514a4c..5a93fd40b 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp @
+  * @Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -112,7 +112,7 @@ <H1 class="no-header">curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>, or
 
        <STRONG>o</STRONG>   if an internal <STRONG>wgetch</STRONG> call fails.
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
        While <STRONG>wgetnstr</STRONG> is conceptually a series of calls  to  <STRONG>wgetch</STRONG>,  it  also
        temporarily  changes  properties  of the <EM>curses</EM> screen to permit simple
        editing of the input buffer.  It saves  the  screen's  state  and  then
-       calls  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  and,  if  the  screen  was  in  normal  ("cooked") mode,
+       calls  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  and,  if  the  screen  was in canonical ("cooked") mode,
        <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>.  Before returning, it  restores  the  saved  screen  state.
        Other   implementations  differ  in  detail,  affecting  which  control
        characters they can accept in the  buffer;  see  section  "PORTABILITY"
@@ -258,7 +258,7 @@ <H1 class="no-header">curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 2078aecf3..43e717a04 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 8a0eab01b..c6f5e3678 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp @
+  * @Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they return return <STRONG>ERR</STRONG> if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, they return return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_inch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 87c2c2f4c..8ad975a59 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -66,7 +66,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines return a NULL-terminated  array  of  <STRONG>chtype</STRONG>  quantities,
+       These routines return a <EM>NULL</EM>-terminated  array  of  <STRONG>chtype</STRONG>  quantities,
        starting  at the current cursor position in the named window and ending
        at the right margin of the window.
 
@@ -120,7 +120,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 456765d24..aee4300f0 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp @
+  * @Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -227,7 +227,7 @@ <H1 class="no-header">curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
            windows  for  each  screen,  using that information to delete those
            windows when <STRONG>delscreen</STRONG> is called.
 
-       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in  2001.   PDCurses  follows
+       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in  2001.   <EM>PDCurses</EM>  follows
            the SVr4 model, deleting only the standard <EM>WINDOW</EM> structures.
 
 
@@ -319,7 +319,7 @@ <H1 class="no-header">curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index ffb08c4c2..e6c101ea5 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp @
+  * @Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        buffering and erase and kill character processing (the interrupt, quit,
        suspend,  and  flow  control  characters  are  unaffected)  and   makes
        characters  typed  by  the  user  immediately available to the program.
-       <STRONG>nocbreak</STRONG> restores the terminal's normal ("cooked") line discipline.
+       <STRONG>nocbreak</STRONG> restores the terminal's canonical ("cooked") line discipline.
 
        The state of the terminal is unknown to a <EM>curses</EM>  application  when  it
        starts; therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explicitly.
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        character code for a line feed in cbreak or raw modes  depends  on  the
        configuration  of  the  terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures
        the terminal to perform this translation.  <STRONG>nonl</STRONG> disables it.  Under its
-       normal   ("cooked")   line   discipline,  the  terminal  driver  always
+       canonical  ("cooked")  line  discipline,  the  terminal  driver  always
        translates carriage returns to line feeds.
 
 
@@ -202,7 +202,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush, noqiflush</a></H3><PRE>
        <STRONG>qiflush</STRONG> and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of  its
        input and output queues when it handles the interrupt, suspend, or quit
-       characters under the normal ("cooked") or cbreak  line  disciplines  on
+       characters under the canonical ("cooked") or cbreak line disciplines on
        POSIX  systems; see <STRONG>termios(3)</STRONG>.  The default behavior is inherited from
        the terminal driver settings.  Calling <STRONG>qiflush</STRONG> configures the  terminal
        to  flush  the  queues  when  any  of  these  events occurs, giving the
@@ -223,7 +223,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
        configuration parameters that <EM>curses</EM> does not handle.   <STRONG>noraw</STRONG>  restores
-       the terminal's normal ("cooked") line discipline.
+       the terminal's canonical ("cooked") line discipline.
 
 
 </PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
@@ -258,7 +258,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   the terminal is not initialized or
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> (except  for  <STRONG>intrflush</STRONG>  and  <STRONG>meta</STRONG>,  which  ignore  its
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> (except  for  <STRONG>intrflush</STRONG>  and  <STRONG>meta</STRONG>,  which  ignore  its
            value).
 
        Further, <STRONG>halfdelay</STRONG> returns <STRONG>ERR</STRONG> if <EM>delay</EM> is outside the range 1..255.
@@ -272,8 +272,8 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
        <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
-       restore the terminal's normal ("cooked") line discipline from  raw  and
-       cbreak,  respectively.   Mixing  <STRONG>raw</STRONG>/<STRONG>noraw</STRONG>  calls  with <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
+       restore the terminal's canonical ("cooked") line  discipline  from  raw
+       and  cbreak, respectively.  Mixing <STRONG>raw</STRONG>/<STRONG>noraw</STRONG> calls with <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
        calls leads to terminal driver control states that are hard to  predict
        or understand; doing so is not recommended.
 
@@ -313,7 +313,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        the  screen.  BSD <EM>curses</EM> did not, but its <EM>raw</EM> function turned it off as
        a side effect.  For best portability, call <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly
        just  after initialization, even if your program retains the terminal's
-       normal ("cooked") line discipline.
+       canonical ("cooked") line discipline.
 
        X/Open Curses is ambiguous regarding whether  <EM>raw</EM>  should  disable  the
        carriage  return and line feed translation feature controlled by <EM>nl</EM> and
@@ -382,7 +382,7 @@ <H1 class="no-header">curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 187c3b767..6ec2f4b60 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -108,7 +108,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 53bcf476d..f3e6fc3ea 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -84,9 +84,9 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <EM>NULL</EM>,
 
        <STRONG>o</STRONG>   the first wide character in <EM>wstr</EM> is a non-spacing character, or
 
@@ -131,7 +131,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 9e36e4240..6ebe0b286 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp @
+  * @Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <STRONG>NULL</STRONG>.
+       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_insch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 34b9c28d3..1b054176c 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp @
+  * @Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -82,9 +82,9 @@ <H1 class="no-header">curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG>,
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>, or
+       <STRONG>o</STRONG>   <EM>str</EM> is <EM>NULL</EM>, or
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 037a6e1fc..5e8cd9485 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -81,9 +81,9 @@ <H1 class="no-header">curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
 
-       <STRONG>o</STRONG>   <EM>str</EM> is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   <EM>str</EM> is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_instr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 673ca4ca2..eb6771d54 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -85,9 +85,9 @@ <H1 class="no-header">curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, these functions return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <STRONG>NULL</STRONG> or
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
 
-       <STRONG>o</STRONG>   <EM>wstr</EM> is <STRONG>NULL</STRONG>.
+       <STRONG>o</STRONG>   <EM>wstr</EM> is <EM>NULL</EM>.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -135,7 +135,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 04a1f35ae..3db707b7c 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -89,10 +89,10 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
        The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
        successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
 
-       Mouse  events  are  ignored  when input is in cooked mode, and cause an
-       error beep when cooked mode  is  being  simulated  in  a  window  by  a
-       function  such  as  <STRONG>getstr</STRONG>  that  expects  a  linefeed  for  input-loop
-       termination.
+       Mouse  events  are  ignored when input is in canonical ("cooked") mode,
+       and cause an error beep when canonical mode is  being  simulated  in  a
+       window  by a function such as <STRONG>getstr</STRONG> that expects a linefeed for input-
+       loop termination.
 
 
 </PRE><H3><a name="h3-mousemask">mousemask</a></H3><PRE>
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            If the screen has not been initialized, or if the terminal does not
            support mouse-events, this function returns 0.
 
-       <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-<STRONG>NULL</STRONG>, this function fills the indicated  location
+       <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-<EM>NULL</EM>, this function fills the indicated  location
            with the previous value of the current screen's mouse event mask.
 
        As  a  side  effect,  setting  a zero mouse mask may turn off the mouse
@@ -201,7 +201,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            through  the  pointers.   If  the  conversion  was  successful, the
            function returns <STRONG>TRUE</STRONG>.
 
-           If one of the parameters was <STRONG>NULL</STRONG> or the location is not inside the
+           If one of the parameters was <EM>NULL</EM> or the location is not inside the
            window, <STRONG>FALSE</STRONG> is returned.
 
        <STRONG>o</STRONG>   If   <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>FALSE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must  reference
@@ -209,7 +209,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            coordinates  if  the  window <EM>win</EM> encloses this point.  In this case
            the function returns <STRONG>TRUE</STRONG>.
 
-           If one of the parameters is <STRONG>NULL</STRONG> or the point  is  not  inside  the
+           If one of the parameters is <EM>NULL</EM> or the point  is  not  inside  the
            window, <STRONG>FALSE</STRONG> is returned.
 
        The   referenced   coordinates  are  only  replaced  by  the  converted
@@ -369,7 +369,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in cooked  mode  if  they  have
+       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in canonical mode if they  have
        been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
        appears in the string read.
 
@@ -394,7 +394,7 @@ <H1 class="no-header">curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 23fe50d89..38f87724d 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp @
+  * @Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_move 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        They fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
-       In <EM>ncurses</EM>, <STRONG>wmove</STRONG> fails if <EM>win</EM> is <STRONG>NULL</STRONG>.
+       In <EM>ncurses</EM>, <STRONG>wmove</STRONG> fails if <EM>win</EM> is <EM>NULL</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
@@ -93,7 +93,7 @@ <H1 class="no-header">curs_move 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 50bb9ee64..a0086e0f3 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -124,7 +124,7 @@ <H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</H1>
               returns the delay timeout set by <STRONG><A HREF="wtimeout.3x.html">wtimeout(3x)</A></STRONG>.
 
        <STRONG>wgetparent</STRONG>
-              returns the parent <EM>WINDOW</EM> pointer for subwindows,  or  <STRONG>NULL</STRONG>  for
+              returns the parent <EM>WINDOW</EM> pointer for subwindows,  or  <EM>NULL</EM>  for
               windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 2ff106866..8b1f82b4c 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
        completion.
 
-       Functions  that  return pointers return <STRONG>NULL</STRONG> on error, and set <EM>errno</EM> to
+       Functions  that  return pointers return <EM>NULL</EM> on error, and set <EM>errno</EM> to
        <STRONG>ENOMEM</STRONG>.
 
        In this implementation
@@ -228,7 +228,7 @@ <H1 class="no-header">curs_pad 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index 748a6f612..e1908c4b9 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -135,25 +135,24 @@ <H1 class="no-header">curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        SVr4 omitted the <EM>const</EM> qualifiers.
 
-       SVr4 documentation describes <STRONG>scr_init</STRONG> such that the dump data  is  also
+       SVr4 documentation describes <EM>scr</EM><STRONG>_</STRONG><EM>init</EM> such that the dump data  is  also
        considered  invalid  "if the time-stamp of the tty is old" but does not
        define "old".
 
-       As of 2024, PDCurses provides these functions.  NetBSD curses does  not
-       provide these functions, although it provides <STRONG>getwin</STRONG>.
+       As of 2024, <EM>PDCurses</EM> provides these functions.  NetBSD <EM>curses</EM> does not.
 
-       Other  implementations  of curses store the window in binary form.  One
-       drawback to binary form is that this makes the dump dependent upon  the
-       curses  library's  internal  data  structures.   Rather  than  do that,
-       ncurses stores the dump in textual form, allowing more flexible use  of
-       the  data.   For  instance,  SVr4  curses <STRONG>scr_restore</STRONG> requires that the
-       dumped window have the same dimensions as the restored window.  ncurses
-       uses <STRONG>wresize</STRONG> to adjust the restored window size.
+       Other implementations of <EM>curses</EM> store the window in binary form,  which
+       makes  the  dump  dependent  upon  the  <EM>curses</EM>  library's internal data
+       structures.  <EM>ncurses</EM> avoids  this  drawback  by  storing  the  dump  in
+       textual  form,  allowing  more flexible use of the data.  For instance,
+       the <EM>scr</EM><STRONG>_</STRONG><EM>restore</EM> of SVr4 <EM>curses</EM> requires that the dumped window have the
+       same  dimensions  as the restored window.  <EM>ncurses</EM> uses its <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+       extension to adjust the restored window size.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3  (1987)  introduced  <STRONG>scr_dump</STRONG>,  <STRONG>scr_init</STRONG>, and <STRONG>scr_restore</STRONG>.  SVr3.1
-       added <STRONG>scr_set</STRONG>.
+       SVr3 (1987) introduced <EM>scr</EM><STRONG>_</STRONG><EM>dump</EM>,  <EM>scr</EM><STRONG>_</STRONG><EM>init</EM>,  and  <EM>scr</EM><STRONG>_</STRONG><EM>restore</EM>.   SVr3.1
+       added <EM>scr</EM><STRONG>_</STRONG><EM>set</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -162,7 +161,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 5802ec28b..935d377aa 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp @
+  * @Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -197,7 +197,7 @@ <H1 class="no-header">curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</H1>
                returns <STRONG>ERR</STRONG> if the format parameter is outside the range 0..3.
 
           <STRONG>slk_label</STRONG>
-               returns <STRONG>NULL</STRONG> on error.
+               returns <EM>NULL</EM> on error.
 
           <STRONG>slk_set</STRONG>
                returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
@@ -268,7 +268,7 @@ <H1 class="no-header">curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</H1>
            If there are more than 16 elements, <STRONG>slk_start</STRONG> returns <STRONG>ERR</STRONG>.
 
        <STRONG>o</STRONG>   The  format  codes  <STRONG>2</STRONG>  and  <STRONG>3</STRONG> for <STRONG>slk_init</STRONG> were added by <EM>ncurses</EM> in
-           1996.  PDCurses 2.4 added this feature in 2001.
+           1996.  <EM>PDCurses</EM> 2.4 added this feature in 2001.
 
        The function <STRONG>slk_attr</STRONG> was added by <EM>ncurses</EM> in 1996.
 
@@ -312,7 +312,7 @@ <H1 class="no-header">curs_slk 3x 2024-06-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-22                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 681a1a1a8..4772bea6a 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -127,7 +127,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>longname</STRONG> and <STRONG>termname</STRONG> return <STRONG>NULL</STRONG> on error.
+       <STRONG>longname</STRONG> and <STRONG>termname</STRONG> return <EM>NULL</EM> on error.
 
        Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
        only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
@@ -149,7 +149,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-05-11                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 5150c7865..2cc0336a5 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp @
+  * @Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -60,12 +60,12 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>BC;</STRONG>
        <STRONG>short</STRONG> <STRONG>ospeed;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>tgetent(char</STRONG> <STRONG>*</STRONG><EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>name</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tgetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>id</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tgetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>id</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*tgetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>id</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG><EM>area</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*tgoto(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetent(char</STRONG> <STRONG>*</STRONG> <EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>name</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG> <EM>area</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgoto(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>cap</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG> <EM>putc</EM><STRONG>)(int));</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -80,13 +80,13 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        <STRONG>tgetent</STRONG> loads the terminal database entry for <EM>name</EM>; see <STRONG><A HREF="term.7.html">term(7)</A></STRONG>.   This
        must be done before calling any of the other functions.  It returns
 
-          1    on success,
+          <STRONG>1</STRONG>    on success,
 
-          0    if there is no such entry (or if the matching entry describes a
+          <STRONG>0</STRONG>    if there is no such entry (or if the matching entry describes a
                generic terminal, having  too  little  information  for  <EM>curses</EM>
                applications to run), and
 
-          -1   if the <EM>terminfo</EM> database could not be found.
+          <STRONG>-1</STRONG>   if the <EM>terminfo</EM> database could not be found.
 
        This implementation differs from those of historical <EM>termcap</EM> libraries.
 
@@ -110,15 +110,15 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        <STRONG>tgetnum</STRONG> obtains the numeric entry for <EM>id</EM>, or -1 if it is not available.
 
-       <STRONG>tgetstr</STRONG>  returns  the  string  entry  for  <EM>id</EM>,  or  <STRONG>NULL</STRONG>  if  it is not
+       <STRONG>tgetstr</STRONG>  returns  the  string  entry  for  <EM>id</EM>,  or  <EM>NULL</EM>  if  it is not
        available.   Use  <STRONG>tputs</STRONG>  to  output  the  string  returned.   The  <EM>area</EM>
        parameter is used as follows.
 
           <STRONG>o</STRONG>   It is assumed to be the address of a pointer to a buffer managed
               by the calling application.
 
-          <STRONG>o</STRONG>   However, <EM>ncurses</EM> checks to ensure that <EM>area</EM>  is  not  <STRONG>NULL</STRONG>,  and
-              also  that  the resulting buffer pointer is not <STRONG>NULL</STRONG>.  If either
+          <STRONG>o</STRONG>   However, <EM>ncurses</EM> checks to ensure that <EM>area</EM>  is  not  <EM>NULL</EM>,  and
+              also  that  the resulting buffer pointer is not <EM>NULL</EM>.  If either
               check fails, <EM>area</EM> is ignored.
 
           <STRONG>o</STRONG>   If the checks succeed, <EM>ncurses</EM> also copies the return  value  to
@@ -167,11 +167,11 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Global-Variables">Global Variables</a></H3><PRE>
-       The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the <EM>terminfo</EM>  entry's
-       data for <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG> and <STRONG>backspace_if_not_bs</STRONG>, respectively.  <STRONG>UP</STRONG>
-       is not used by <EM>ncurses</EM>.  <STRONG>PC</STRONG> is used by <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>.  <STRONG>BC</STRONG> is used by
-       <STRONG>tgoto</STRONG> emulation.  The variable <STRONG>ospeed</STRONG> is set by <EM>ncurses</EM> using a system-
-       specific encoding to indicate the terminal's data rate.
+       <STRONG>tgetent</STRONG> sets the variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG>, and <STRONG>BC</STRONG> to the <EM>terminfo</EM> entry's  data
+       for  <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG>, and <STRONG>backspace_if_not_bs</STRONG>, respectively.  <STRONG>UP</STRONG> is
+       not used by <EM>ncurses</EM>.  <STRONG>PC</STRONG> is used by <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>.  <STRONG>BC</STRONG>  is  used  by
+       <STRONG>tgoto</STRONG> emulation.  <EM>ncurses</EM> assigns the variable <STRONG>ospeed</STRONG> a system-specific
+       value to encode the terminal's data rate.
 
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
@@ -198,7 +198,7 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        The return values of  <STRONG>tgetent</STRONG>,  <STRONG>tgetflag</STRONG>,  <STRONG>tgetname</STRONG>,  and  <STRONG>tgetstr</STRONG>  are
        documented above.
 
-       <STRONG>tgoto</STRONG> returns <STRONG>NULL</STRONG> on error.  Error conditions include:
+       <STRONG>tgoto</STRONG> returns <EM>NULL</EM> on error.  Error conditions include:
 
        <STRONG>o</STRONG>   uninitialized state (<STRONG>tgetent</STRONG> was not called successfully),
 
@@ -371,7 +371,7 @@ <H1 class="no-header">curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index ed9d1cf45..7ccb3f60a 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -57,7 +57,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
        <STRONG>#include</STRONG> <STRONG>&lt;term.h&gt;</STRONG>
 
-       <STRONG>TERMINAL</STRONG> <STRONG>*cur_term;</STRONG>
+       <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG> <STRONG>cur_term;</STRONG>
 
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>const</STRONG> <STRONG>boolnames[];</STRONG>
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>const</STRONG> <STRONG>boolcodes[];</STRONG>
@@ -69,35 +69,38 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>const</STRONG> <STRONG>strcodes[];</STRONG>
        <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>const</STRONG> <STRONG>strfnames[];</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>setupterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-       <STRONG>TERMINAL</STRONG> <STRONG>*set_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>nterm</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>del_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>setupterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>errret</EM><STRONG>);</STRONG>
+       <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG> <STRONG>set_curterm(TERMINAL</STRONG> <STRONG>*</STRONG> <EM>nterm</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>del_curterm(TERMINAL</STRONG> <STRONG>*</STRONG> <EM>oterm</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>errret</EM><STRONG>);</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
             <EM>/*</EM> <EM>or</EM> <EM>*/</EM>
-       <STRONG>char</STRONG> <STRONG>*tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>long</STRONG> <EM>p1</EM> ... <STRONG>long</STRONG> <EM>p9</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>long</STRONG> <EM>p1</EM> ... <STRONG>long</STRONG> <EM>p9</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
-       <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG> <EM>putc</EM><STRONG>)(int));</STRONG>
+       <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>vidputs(chtype</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
+       <STRONG>int</STRONG> <STRONG>vidputs(chtype</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG> <EM>putc</EM><STRONG>)(int));</STRONG>
        <STRONG>int</STRONG> <STRONG>vidattr(chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vid_puts(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
-       <STRONG>int</STRONG> <STRONG>vid_attr(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>vid_puts(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <STRONG>(*</STRONG> <EM>putc</EM><STRONG>)(int));</STRONG>
+       <STRONG>int</STRONG> <STRONG>vid_attr(attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>cap-code</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tigetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>cap-code</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tigetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>cap-code</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tigetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>cap-code</EM><STRONG>);</STRONG>
 
-       <STRONG>char</STRONG> <STRONG>*tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tiparm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> ...<STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
-       <STRONG>char</STRONG> <STRONG>*tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tiscan_s(int</STRONG> <STRONG>*</STRONG><EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tiparm_s(int</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>mask</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tiscan_s(int</STRONG> <STRONG>*</STRONG> <EM>expected</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>mask</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>deprecated</EM> <EM>*/</EM>
-       <STRONG>int</STRONG> <STRONG>setterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>setterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>term</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -116,78 +119,66 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       Initially, <STRONG>setupterm</STRONG> should be called.  The high-level <EM>curses</EM> functions
-       <STRONG>initscr</STRONG>  and  <STRONG>newterm</STRONG> call <STRONG>setupterm</STRONG> to initialize the low-level set of
-       terminal-dependent variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
+       Call <STRONG>setupterm</STRONG> from  your  application  to  have  <EM>terminfo</EM>  manage  the
+       terminal   device;   this  action  initializes  the  terminal-dependent
+       variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  (A <EM>curses</EM> application  calling
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> achieves the same result.)  Applications can
+       use the terminal capabilities either directly,  by  object  definitions
+       corresponding to capability names and codes (see <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>) or
+       by calling the functions documented here.   <STRONG>setupterm</STRONG>  initializes  the
+       <EM>terminfo</EM> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> as described in <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>.
 
-       Applications can use the terminal  capabilities  either  directly  (via
-       header  definitions),  or  by  special  functions.   The  header  files
-       <EM>curses.h</EM> and <EM>term.h</EM> should be included  (in  that  order)  to  get  the
-       definitions for these strings, numbers, and flags.
+       Pass   parameterized   string   capability   values  through  <STRONG>tparm</STRONG>  to
+       instantiate them.  All <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>)
+       should  be  sent  to  the  terminal  device  with  <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call
+       <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> to restore the terminal modes before exiting.   (A
+       <EM>curses</EM> application calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> achieves the same result.)
 
-       The  <EM>terminfo</EM>  variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> are initialized by <STRONG>setupterm</STRONG>
-       as follows.
+       Programs that use cursor addressing should emit certain capabilities at
+       specific times.  Specifically, output
 
-       <STRONG>o</STRONG>   If <STRONG>use_env(FALSE)</STRONG> has been called, values  for  <STRONG>lines</STRONG>  and  <STRONG>columns</STRONG>
-           specified in <EM>terminfo</EM> are used.
+       <STRONG>o</STRONG>   <STRONG>enter_ca_mode</STRONG> upon startup, and
 
-       <STRONG>o</STRONG>   Otherwise,  if  the  environment variables <EM>LINES</EM> and <EM>COLUMNS</EM> exist,
-           their values are used.  If these environment variables do not exist
-           and  the program is running in a window, the current window size is
-           used.  Otherwise, if the environment variables do  not  exist,  the
-           values for <STRONG>lines</STRONG> and <STRONG>columns</STRONG> specified in the <EM>terminfo</EM> database are
-           used.
-
-       Parameterized strings should be passed  through  <STRONG>tparm</STRONG>  to  instantiate
-       them.   All  <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>) should be
-       sent to the terminal device with <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call  <STRONG>reset_shell_mode</STRONG>
-       to restore the terminal modes before exiting; see <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>.
-
-       Programs that use cursor addressing should
-
-       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> upon startup and
-
-       <STRONG>o</STRONG>   output <STRONG>exit_ca_mode</STRONG> before exiting.
+       <STRONG>o</STRONG>   <STRONG>exit_ca_mode</STRONG> before exiting.
 
        Programs that execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call  <STRONG>reset_shell_mode</STRONG>  and output <STRONG>exit_ca_mode</STRONG> before the shell is
-           called and
+       <STRONG>o</STRONG>   call <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell
+           is called, and
 
-       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG>reset_prog_mode</STRONG> after returning  from
-           the shell.
+       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG>  and call <STRONG><A HREF="curs_kernel.3x.html">reset_prog_mode(3x)</A></STRONG> after returning
+           from the shell.
 
-       <STRONG>setupterm</STRONG>  reads  in  the  <EM>terminfo</EM> database, initializing the <EM>terminfo</EM>
-       structures, but does not set up the  output  virtualization  structures
+       <STRONG>setupterm</STRONG> reads in the <EM>terminfo</EM>  database,  initializing  the  <EM>terminfo</EM>
+       structures,  but  does  not set up the output virtualization structures
        used by <EM>curses</EM>.  Its parameters follow.
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <EM>TERM</EM> is read.
 
           <EM>filedes</EM>
-               is the file descriptor used for getting  and  setting  terminal
+               is  the  file  descriptor used for getting and setting terminal
                I/O modes.
 
-               Higher-level  applications  use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to initialize the
-               terminal, passing an output <EM>stream</EM> rather  than  a  <EM>descriptor</EM>.
-               In   <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>  calls
-               <STRONG>setupterm</STRONG>, passing the file descriptor derived from its  output
+               Higher-level applications use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to  initialize  the
+               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
+               In  <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
+               <STRONG>setupterm</STRONG>,  passing the file descriptor derived from its output
                stream parameter.
 
           <EM>errret</EM>
-               points  to  an  optional  location where an error status can be
-               returned to the caller.  If <EM>errret</EM> is not null, then  <STRONG>setupterm</STRONG>
-               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
-               pointed to by <EM>errret</EM>.  A  return  value  of  <STRONG>OK</STRONG>  combined  with
+               points to an optional location where an  error  status  can  be
+               returned  to the caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
+               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
+               pointed  to  by  <EM>errret</EM>.   A  return  value of <STRONG>OK</STRONG> combined with
                status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
                If <STRONG>ERR</STRONG> is returned, examine <EM>errret:</EM>
 
-               <STRONG>1</STRONG>    means  that  the  terminal is hardcopy, and cannot be used
-                    for <EM>curses</EM> applications.
-
-                    <STRONG>setupterm</STRONG> determines if the entry is a  hardcopy  type  by
-                    checking the <STRONG>hardcopy</STRONG> (<STRONG>hc</STRONG>) capability.
+               <STRONG>1</STRONG>    means  that  the  terminal  is  a  hard-copy  type  (lacks
+                    destructive  backspace),  and  cannot  be  used for <EM>curses</EM>
+                    applications.   The  library  determines  this   fact   by
+                    checking the terminal type's <STRONG>hardcopy</STRONG> (<STRONG>hc</STRONG>) capability.
 
                <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
                     a generic type, having too little information  for  <EM>curses</EM>
@@ -201,9 +192,9 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
                If <EM>errret</EM> is null, <STRONG>setupterm</STRONG>  reports  an  error  message  upon
                finding an error and exits.  Thus, the simplest call is:
 
-                      setupterm((char *)0, 1, (int *)0);
+                      setupterm((char *) NULL, 1, (int *) NULL);
 
-               which uses all the defaults and sends the output to <STRONG>stdout</STRONG>.
+               which uses all the defaults and sends the output to <EM>stdout</EM>.
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
@@ -222,8 +213,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        numeric, and string capabilities use the values from <EM>nterm</EM>.  It returns
        the old value of <STRONG>cur_term</STRONG>.
 
-       <STRONG>del_curterm</STRONG> frees the memory pointed to by <STRONG>oterm</STRONG>, making  it  available
-       for  further  use.  If <STRONG>oterm</STRONG> is the same as <STRONG>cur_term</STRONG>, references to any
+       <STRONG>del_curterm</STRONG> frees the memory pointed to by <EM>oterm</EM>, making  it  available
+       for  further  use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references to any
        of the <EM>terminfo</EM> Boolean, numeric, and  string  capabilities  thereafter
        may refer to invalid memory locations until <STRONG>setupterm</STRONG> is called again.
 
@@ -275,10 +266,10 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       String  capabilities  can  contain  padding  information,  a time delay
-       (accommodating performance limitations of hardware terminals) expressed
-       as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM>
-       exceeds 30,000 (thirty seconds), it is capped at that value.
+       String  capabilities  can  contain <EM>padding</EM>, a time delay (accommodating
+       performance limitations of hardware terminals) expressed as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where
+       <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM> exceeds 30,000
+       (thirty seconds), it is capped at that value.
 
        <STRONG>tputs</STRONG> interprets time-delay information in the string <EM>str</EM>  and  outputs
        it, executing the delays:
@@ -296,7 +287,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            function.
 
        <STRONG>putp</STRONG> calls "<STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>".  The output of <STRONG>putp</STRONG> always goes to
-       <STRONG>stdout</STRONG>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
+       <EM>stdout</EM>, rather than the <EM>filedes</EM> specified in <STRONG>setupterm</STRONG>.
 
        <STRONG>vidputs</STRONG> displays the string on the terminal in the video attribute mode
        <EM>attrs</EM>, which is any combination of the attributes listed in <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
@@ -327,8 +318,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
        <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG>,  and  <STRONG>tigetstr</STRONG> return the value of the capability
        corresponding to the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed  to  them.
-       The  <EM>cap-code</EM> for each capability is given in the table column entitled
-       <EM>cap-code</EM> code in the capabilities section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+       The  <EM>cap-code</EM>  for each capability is given in the table column of that
+       name in the "Predefined Capabilities" section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        These functions return special values to denote errors.
 
@@ -349,7 +340,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>(char</STRONG> <STRONG>*)-1</STRONG>
               if <EM>cap-code</EM> is not a string capability, or
 
-       <STRONG>0</STRONG>      if it is canceled or absent from the terminal description.
+       <STRONG>NULL</STRONG>   if it is canceled or absent from the terminal description.
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Names">Terminal Capability Names</a></H3><PRE>
@@ -372,9 +363,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
        description.   As  a  side  effect,  it  sets <STRONG>cur_term</STRONG> to point to this
        memory.  If an application calls
-
               del_curterm(cur_term);
-
        the memory will be freed.
 
        The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
@@ -406,7 +395,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
        <STRONG>setupterm</STRONG>
             fails  if  it cannot allocate enough memory, or create the initial
-            windows (<STRONG>stdscr</STRONG>, <STRONG>curscr</STRONG>, and <STRONG>newscr</STRONG>) Other  error  conditions  are
+            windows (<STRONG>stdscr</STRONG>, <STRONG>curscr</STRONG>, and <STRONG>newscr</STRONG>).  Other error conditions  are
             documented above.
 
        <STRONG>tparm</STRONG>
@@ -438,29 +427,34 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       <STRONG>setterm</STRONG> is not described by X/Open and must be considered non-portable.
+       <EM>setterm</EM> is not described by X/Open and must be considered non-portable.
        All other functions are as described by X/Open.
 
 
+</PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
+       On  legacy <EM>curses</EM> systems, include <EM>curses.h</EM> and <EM>term.h</EM> in that order to
+       get the definitions for these strings, numbers, and flags.
+
+
 </PRE><H3><a name="h3-Compatibility-Macros">Compatibility Macros</a></H3><PRE>
-       This  implementation  provides  a  few  macros  for  compatibility with
-       systems before  SVr4  (see  section  "HISTORY"  below).   They  include
-       <STRONG>Bcrmode</STRONG>,  <STRONG>Bfixterm</STRONG>,  <STRONG>Bgettmode</STRONG>,  <STRONG>Bnocrmode</STRONG>,  <STRONG>Bresetterm</STRONG>, <STRONG>Bsaveterm</STRONG>, and
-       <STRONG>Bsetterm</STRONG>.
-
-       In SVr4, these are found in  <EM>curses.h</EM>,  but  except  for  <STRONG>setterm</STRONG>,  are
-       likewise macros.  The one function, <STRONG>setterm</STRONG>, is mentioned in the manual
-       page.  It further notes that <STRONG>setterm</STRONG> was replaced by <STRONG>setupterm</STRONG>, stating
+       This implementation  provides  a  few  macros  for  compatibility  with
+       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
+       <EM>Bcrmode</EM>, <EM>Bfixterm</EM>, <EM>Bgettmode</EM>, <EM>Bnocrmode</EM>,  <EM>Bresetterm</EM>,  <EM>Bsaveterm</EM>,  and"
+       <EM>Bsetterm</EM>.   <EM>ncurses</EM>  implements each of these symbols as macros for BSD
+       <EM>curses</EM> compatibility.
+
+       In SVr4, these are found in  <EM>curses.h</EM>,  but  except  for  <EM>setterm</EM>,  are
+       likewise macros.  The one function, <EM>setterm</EM>, is mentioned in the manual
+       page.  It further notes that <EM>setterm</EM> was replaced by <EM>setupterm</EM>, stating
        that the call
-              setupterm(<EM>term</EM>, 1, (int *)0)
-
-       provides  the  same  functionality  as  <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>, discouraging the
-       latter for new programs.  <EM>ncurses</EM> implements each of these  symbols  as
-       macros for BSD <EM>curses</EM> compatibility.
+              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
+       provides the same functionality as
+              <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>
+       and discouraging the latter for new programs.
 
 
 </PRE><H3><a name="h3-Legacy-Data">Legacy Data</a></H3><PRE>
-       <STRONG>setupterm</STRONG>  copies  the terminal name to the array <STRONG>ttytype</STRONG>.  This is not
+       <EM>setupterm</EM>  copies  the terminal name to the array <EM>ttytype</EM>.  This is not
        part of X/Open Curses, but is assumed by some applications.
 
        Other implementions may not declare the capability name  arrays.   Some
@@ -473,17 +467,17 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Output-Buffering">Output Buffering</a></H3><PRE>
        Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
-       <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to
+       <EM>setupterm</EM> from <EM>initscr</EM> or <EM>newterm</EM> uses buffered I/O, and would write to
        the  corresponding  stream.   In  addition  to  the limitation that the
        terminal was  left  in  block-buffered  mode  on  exit  (like  System V
        <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
        way to clean up on receiving <STRONG>SIGTSTP</STRONG>.
 
-       The current version (ncurses6) uses output buffers managed directly  by
-       <EM>ncurses</EM>.  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 <EM>ncurses</EM> employ alternate versions of these functions
-       using the more reliable buffering scheme.
+       <EM>ncurses</EM> 6.<EM>x</EM> uses output buffers managed directly by <EM>ncurses</EM>.   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  <EM>ncurses</EM> employ alternate versions of these functions using the more
+       reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
@@ -494,16 +488,16 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   X/Open Curses uses <EM>const</EM>  less  effectively  than  a  later  design
            might,  sometimes applying it needlessly to values that are already
            constant, and in most cases overlooking  parameters  that  normally
-           would  use  <EM>const</EM>.  Passing <EM>const</EM>-qualified parameters to functions
-           that do not  declare  them  <EM>const</EM>  may  prevent  the  program  from
-           compiling.    On   the   other  hand,  "writable  strings"  are  an
-           obsolescent feature.
+           would  benefit  from  <EM>const</EM>.  Passing <EM>const</EM>-qualified parameters to
+           functions that do not declare them <EM>const</EM> may  prevent  the  program
+           from  compiling.   On  the  other  hand,  "writable strings" are an
+           obsolescent C language feature.
 
            As an extension, this implementation can be  configured  to  change
            the  function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI
            6 enables this feature by default.
 
-       <STRONG>o</STRONG>   X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number  of  parameters,
+       <STRONG>o</STRONG>   X/Open Curses prototypes <EM>tparm</EM> with a fixed number  of  parameters,
            rather than a variable argument list.
 
            This  implementation  uses  a  variable  argument  list, but can be
@@ -512,25 +506,25 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            for this purpose.
 
            In response to review comments by Thomas E. Dickey,  X/Open  Curses
-           Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009.
+           Issue 7 proposed the <EM>tiparm</EM> function in mid-2009.
 
-           While  <STRONG>tiparm</STRONG> is always provided in <EM>ncurses</EM>, the older form is only
-           available as a build-time configuration option.  If  not  specially
-           configured, <STRONG>tparm</STRONG> is the same as <STRONG>tiparm</STRONG>.
+           While  <EM>tiparm</EM>  is  always  provided  in  <EM>ncurses</EM>, the older form is
+           available only  as  a  build-time  configuration  option.   If  not
+           specially configured, <EM>tparm</EM> is the same as <EM>tiparm</EM>.
 
-       Both forms of <STRONG>tparm</STRONG> have drawbacks:
+       Both forms of <EM>tparm</EM> have drawbacks.
 
-       <STRONG>o</STRONG>   Most of the calls to <STRONG>tparm</STRONG> use only one or two parameters.  Passing
+       <STRONG>o</STRONG>   Most  calls  to  <EM>tparm</EM> require only one or two parameters.  Passing
            nine on each call is awkward.
 
            Using <EM>long</EM> for the numeric parameter type is a workaround  to  make
-           the  parameter  use  the  same  amount of stack as a pointer.  That
-           approach dates back to the mid-1980s, before  C  was  standardized.
-           Since  then,  there is a standard (and pointers are not required to
-           fit in a <EM>long</EM>).
+           the  parameter  use  the  same amount of stack memory as a pointer.
+           That approach dates to the mid-1980s, before  C  was  standardized.
+           Since  ANSI C (1989), C language standards do not require a pointer
+           to fit in a <EM>long</EM>).
 
        <STRONG>o</STRONG>   Providing the right number of parameters for  a  variadic  function
-           such  as  <STRONG>tiparm</STRONG>  can  be  a  problem,  in  particular  for  string
+           such  as  <EM>tiparm</EM>  can  be  a  problem,  in  particular  for  string
            parameters.  However, only a few <EM>terminfo</EM> capabilities  use  string
            parameters  (for  instance, the ones used for programmable function
            keys).
@@ -538,129 +532,130 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
            <STRONG>ERR</STRONG>  if the capability mishandles string parameters.  But it cannot
            check if a calling program provides strings in the right places for
-           the <STRONG>tparm</STRONG> calls.
+           the <EM>tparm</EM> calls.
 
-           The  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  program  checks  its use of these capabilities with a
-           table, so that it calls <STRONG>tparm</STRONG> correctly.
+           <EM>ncurses</EM>'s  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  checks  its  use  of  these capabilities with a
+           table, so that it calls <EM>tparm</EM> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
-       If configured to use the terminal driver, as with the MinGW port,
+       If <EM>ncurses</EM> is configured to use the terminal driver, as with the  MinGW
+       port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> interprets a missing/empty <EM>TERM</EM> variable as  the  special
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
            value "unknown".
 
            SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The  difference  between  the  two  is  that  the  former  uses the
-           <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) <EM>terminfo</EM> capability, while the latter  does  not.
+           The difference  between  the  two  is  that  the  former  uses  the
+           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
            A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  allows explicit use of the the windows console driver by
-           checking if <STRONG>$TERM</STRONG> is set to "#win32con" or an abbreviation of  that
-           string.
+       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use  of  the  Microsoft  Windows  console
+           driver  by  checking  whether the <EM>TERM</EM> environment variable has the
+           value "#win32con" or an abbreviation of that string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In  SVr4,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>  returns  an  <EM>int</EM>, <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>.  We have chosen to
+       In SVr4, <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM> returns an <EM>int</EM>, <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
        implement the X/Open Curses semantics.
 
-       In SVr4, the third argument of <EM>tputs</EM> has the type "<STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>".
+       In SVr4, the third argument of <EM>tputs</EM> has the type "<STRONG>int</STRONG> <STRONG>(*)(char)</STRONG>".
 
-       At least one implementation of X/Open Curses (Solaris) returns a  value
-       other  than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <EM>tputs</EM>.  It instead returns the length of the
-       string, and does no error checking.
+       At  least one implementation of X/Open Curses (Solaris <EM>xcurses</EM>) returns
+       a value other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <EM>tputs</EM>.  It instead returns the length
+       of the string, and does no error checking.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
+       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>fixterm</STRONG>     restore terminal to "in <EM>curses</EM>" state
-       <STRONG>gettmode</STRONG>    establish current terminal modes
-       <STRONG>mvcur</STRONG>       low level cursor motion
-       <STRONG>putp</STRONG>        use <STRONG>tputs</STRONG> to send characters via <EM>putchar</EM>
-       <STRONG>resetterm</STRONG>   set terminal modes to "out of <EM>curses</EM>" state
-       <STRONG>resetty</STRONG>     reset terminal flags to stored value
-       <STRONG>saveterm</STRONG>    save current modes as "in <EM>curses</EM>" state
-       <STRONG>savetty</STRONG>     store current terminal flags
-       <STRONG>setterm</STRONG>     establish terminal with given type
-       <STRONG>setupterm</STRONG>   establish terminal with given type
-       <STRONG>tparm</STRONG>       interpolate parameters into string capability
-       <STRONG>tputs</STRONG>       apply padding information to a string
-       <STRONG>vidattr</STRONG>     like <STRONG>vidputs</STRONG>, but output through <EM>putchar</EM>
-       <STRONG>vidputs</STRONG>     write string to terminal, applying specified attributes
-
-       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
+       <EM>fixterm</EM>     restore terminal to "in <EM>curses</EM>" state
+       <EM>gettmode</EM>    establish current terminal modes
+       <EM>mvcur</EM>       low level cursor motion
+       <EM>putp</EM>        use <EM>tputs</EM> to send characters via <EM>putchar</EM>
+       <EM>resetterm</EM>   set terminal modes to "out of <EM>curses</EM>" state
+       <EM>resetty</EM>     reset terminal flags to stored value
+       <EM>saveterm</EM>    save current modes as "in <EM>curses</EM>" state
+       <EM>savetty</EM>     store current terminal flags
+       <EM>setterm</EM>     establish terminal with given type
+       <EM>setupterm</EM>   establish terminal with given type
+       <EM>tparm</EM>       interpolate parameters into string capability
+       <EM>tputs</EM>       apply padding information to a string
+       <EM>vidattr</EM>     like <EM>vidputs</EM>, but output through <EM>putchar</EM>
+       <EM>vidputs</EM>     write string to terminal, applying specified attributes
+
+       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>tgetent</STRONG>    look up <EM>termcap</EM> entry for given <EM>name</EM>
-       <STRONG>tgetflag</STRONG>   get Boolean entry for given <EM>id</EM>
-       <STRONG>tgetnum</STRONG>    get numeric entry for given <EM>id</EM>
-       <STRONG>tgetstr</STRONG>    get string entry for given <EM>id</EM>
-       <STRONG>tgoto</STRONG>      apply parameters to given capability
-       <STRONG>tputs</STRONG>      write characters via a function parameter, applying padding
+       <EM>tgetent</EM>    look up <EM>termcap</EM> entry for given <EM>name</EM>
+       <EM>tgetflag</EM>   get Boolean entry for given <EM>id</EM>
+       <EM>tgetnum</EM>    get numeric entry for given <EM>id</EM>
+       <EM>tgetstr</EM>    get string entry for given <EM>id</EM>
+       <EM>tgoto</EM>      apply parameters to given capability
+       <EM>tputs</EM>      write characters via a function parameter, applying padding
 
-       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
-       structure initialized by <STRONG>setupterm</STRONG>.
+       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
+       structure initialized by <EM>setupterm</EM>.
 
-       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
-       capability values (like the <EM>termcap</EM> interface), and reusing  <STRONG>tgoto</STRONG>  and
-       <STRONG>tputs</STRONG>.
+       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
+       capability  values  (like the <EM>termcap</EM> interface), and reusing <EM>tgoto</EM> and
+       <EM>tputs</EM>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>tigetflag</STRONG>   get Boolean entry for given <EM>id</EM>
-       <STRONG>tigetnum</STRONG>    get numeric entry for given <EM>id</EM>
-       <STRONG>tigetstr</STRONG>    get string entry for given <EM>id</EM>
+       <EM>tigetflag</EM>   get Boolean entry for given <EM>id</EM>
+       <EM>tigetnum</EM>    get numeric entry for given <EM>id</EM>
+       <EM>tigetstr</EM>    get string entry for given <EM>id</EM>
 
-       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
+       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
        ------------------------------------------------------------------------
-       crmode      cbreak
-       fixterm     reset_prog_mode
-       gettmode    <EM>n/a</EM>
-       nocrmode    nocbreak
-       resetterm   reset_shell_mode
-       saveterm    def_prog_mode
-       setterm     setupterm
-
-       SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG>, and <STRONG>vidputs</STRONG> functions, along  with  <STRONG>putp</STRONG>,
-       <STRONG>tparm</STRONG>,  and  <STRONG>tputs</STRONG>.   The latter were needed to support padding, and to
-       handle capabilities accessed by functions such as <STRONG>vidattr</STRONG>  (which  used
-       more than the two parameters supported by <STRONG>tgoto</STRONG>).
-
-       SVr3   introduced   the   functions   for  switching  between  terminal
-       descriptions;  for  example,  <STRONG>set_curterm</STRONG>.   Some   changes   reflected
+       <EM>crmode</EM>      <EM>cbreak</EM>
+       <EM>fixterm</EM>     <EM>reset</EM><STRONG>_</STRONG><EM>prog</EM><STRONG>_</STRONG><EM>mode</EM>
+       <EM>gettmode</EM>    n/a
+       <EM>nocrmode</EM>    <EM>nocbreak</EM>
+       <EM>resetterm</EM>   <EM>reset</EM><STRONG>_</STRONG><EM>shell</EM><STRONG>_</STRONG><EM>mode</EM>
+       <EM>saveterm</EM>    <EM>def</EM><STRONG>_</STRONG><EM>prog</EM><STRONG>_</STRONG><EM>mode</EM>
+       <EM>setterm</EM>     <EM>setupterm</EM>
+
+       SVr3  kept  the <EM>mvcur</EM>, <EM>vidattr</EM>, and <EM>vidputs</EM> functions, along with <EM>putp</EM>,
+       <EM>tparm</EM>, and <EM>tputs</EM>.  The latter were needed to support  padding,  and  to
+       handle  capabilities  accessed by functions such as <EM>vidattr</EM> (which used
+       more than the two parameters supported by <EM>tgoto</EM>).
+
+       SVr3  introduced  the  functions   for   switching   between   terminal
+       descriptions;   for   example,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>.   Some  changes  reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
+       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various global variables such as <STRONG>boolnames</STRONG> were  mentioned  in  the
-           programming  manual  at  this  point, though the variables had been
+       <STRONG>o</STRONG>   Various  global  variables  such as <EM>boolnames</EM> were mentioned in the
+           programming manual at this point, though  the  variables  had  been
            provided in SVr2.
 
-       SVr4 (1989) added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions.
+       SVr4 (1989) added the <EM>vid</EM><STRONG>_</STRONG><EM>attr</EM> and <EM>vid</EM><STRONG>_</STRONG><EM>puts</EM> functions.
 
-       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
+       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-14                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -682,6 +677,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
+<li><a href="#h3-Header-Files">Header Files</a></li>
 <li><a href="#h3-Compatibility-Macros">Compatibility Macros</a></li>
 <li><a href="#h3-Legacy-Data">Legacy Data</a></li>
 <li><a href="#h3-Output-Buffering">Output Buffering</a></li>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 8351b568e..efb6149ca 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -121,7 +121,7 @@ <H1 class="no-header">curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
        file, for instance, defines both an actual function and macro for each.
        The macros give the same result as the actual functions.   SVr4  <EM>curses</EM>
-       does  not check the window parameter <EM>win</EM> to ensure that it is not <STRONG>NULL</STRONG>;
+       does  not check the window parameter <EM>win</EM> to ensure that it is not <EM>NULL</EM>;
        otherwise this implementation behaves the same as SVr4.
 
        X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
@@ -133,7 +133,7 @@ <H1 class="no-header">curs_touch 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index c1ea937fd..6d6abbe16 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp @
+  * @Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -230,11 +230,11 @@ <H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
            The SVr4 tracing feature is undocumented.
 
-       <STRONG>o</STRONG>   PDCurses  provides  <STRONG>traceon</STRONG>  and  <STRONG>traceoff</STRONG>,  which  (like SVr4) are
+       <STRONG>o</STRONG>   <EM>PDCurses</EM>  provides  <STRONG>traceon</STRONG>  and  <STRONG>traceoff</STRONG>,  which  (like SVr4) are
            always available, and enable tracing to the "trace" file only  when
            a debug-library is built.
 
-           PDCurses  has  a  short description of these functions, with a note
+           <EM>PDCurses</EM>  has  a  short description of these functions, with a note
            that they are not present in X/Open Curses, <EM>ncurses</EM> or NetBSD.   It
            does  not  mention  SVr4,  but the functions' inclusion in a header
            file section labeled "Quasi-standard" hints at the origin.
@@ -261,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index dfb737122..c20721e25 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp @
+  * @Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -251,7 +251,7 @@ <H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        failure  and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")
        upon successful completion.
 
-       Routines that return pointers return <STRONG>NULL</STRONG> on error.
+       Routines that return pointers return <EM>NULL</EM> on error.
 
        In this implementation
 
@@ -316,32 +316,33 @@ <H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
-           older <EM>ncurses</EM> versions.  This implementation (as well as the X/Open
-           variant of Solaris curses, dated 1995) uses textual dumps.
+           file.   These  include SVr4 <EM>curses</EM>, NetBSD <EM>curses</EM>, and <EM>PDCurses</EM>, as
+           well as older <EM>ncurses</EM> versions.  This implementation  (as  well  as
+           the  X/Open  variant  of  Solaris  curses, dated 1995) uses textual
+           dumps.
 
-           The  implementations  that use binary dumps use block-I/O (<STRONG>write(2)</STRONG>
+           The implementations that use binary dumps use  block-I/O  (<STRONG>write(2)</STRONG>
            and <STRONG>read(2)</STRONG> 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.  However,  reading  from  a  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.  However, reading from a file
            written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.  It states  that  <STRONG>unctrl</STRONG>  and  <STRONG>wunctrl</STRONG>  will
-       return  a null pointer if unsuccessful.  This implementation checks for
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error  conditions  for  them.   It  states that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will
+       return a null pointer if unsuccessful.  This implementation checks  for
        three cases:
 
-       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
-           returns  the  parameter,  i.e.,  a  one-character  string  with the
-           parameter as the first  character.   Otherwise,  it  returns  "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -352,33 +353,33 @@ <H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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 printable.
-       This implementation uses 8 bits but  does  not  modify  the  string  to
-       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
+       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  printable.
+       This  implementation  uses  8  bits  but  does not modify the string to
+       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
-       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
-       "meta"   keys   (codes   in   the   range   128    to    255).     Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses  is
-       initialized.  X/Open Curses does not document the  treatment  of  codes
+       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
+       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
+       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before  initializing  curses),  this  implementation  returns   strings
+       before   initializing  curses),  this  implementation  returns  strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
+       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
-       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
-       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
+       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
+       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
+       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
@@ -387,8 +388,8 @@ <H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
        SVr2 (1984) introduced <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
 
-       SVr3 (1987) added <EM>filter</EM>.  Later that year, SVr3.1 brought  <EM>getwin</EM>  and
-       <EM>putwin</EM>,  reading  and writing window dumps with <STRONG>fread(3)</STRONG> and <STRONG>fwrite(3)</STRONG>,
+       SVr3  (1987)  added <EM>filter</EM>.  Later that year, SVr3.1 brought <EM>getwin</EM> and
+       <EM>putwin</EM>, reading and writing window dumps with <STRONG>fread(3)</STRONG>  and  <STRONG>fwrite(3)</STRONG>,
        respectively.
 
        SVr4 (1989) supplied <EM>use</EM><STRONG>_</STRONG><EM>env</EM>.
@@ -405,7 +406,7 @@ <H1 class="no-header">curs_util 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 03292a19c..1c89eb1a6 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -162,7 +162,7 @@ <H1 class="no-header">curs_window 3x 2024-09-14 ncurses 6.5 Library calls</H1>
        <STRONG>OK</STRONG>  (SVr4  only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon
        successful completion.
 
-       Routines that return pointers return <STRONG>NULL</STRONG> on error.
+       Routines that return pointers return <EM>NULL</EM> on error.
 
        X/Open defines no error conditions.  In this implementation
 
@@ -248,7 +248,7 @@ <H1 class="no-header">curs_window 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index 29cf51ac3..84caa9b4d 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1997
-  * @Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp @
+  * @Id: define_key.3x,v 1.52 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>define_key 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>define_key 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">define_key 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">define_key 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">define_key 3x 2024-07-27 ncurses 6.5 Library calls</H1>
        binding  as  it  does  those  in  the  <EM>terminfo</EM>  database entry for the
        terminal type.
 
-       A <EM>definition</EM> of  <STRONG>NULL</STRONG>  removes  any  existing  binding  from  <EM>key-code</EM>.
+       A <EM>definition</EM> of  <EM>NULL</EM>  removes  any  existing  binding  from  <EM>key-code</EM>.
        Similarly,  a  non-positive  <EM>key-code</EM>  removes  an existing binding for
        <EM>definition</EM>, if any.
 
@@ -73,7 +73,7 @@ <H1 class="no-header">define_key 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>define_key</STRONG> returns <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>definition</EM> is <STRONG>NULL</STRONG> and <EM>key-code</EM> is nonpositive, or
+       <STRONG>o</STRONG>   <EM>definition</EM> is <EM>NULL</EM> and <EM>key-code</EM> is nonpositive, or
 
        <STRONG>o</STRONG>   insufficient memory is available to bind <EM>definition</EM> to <EM>key-code</EM>.
 
@@ -100,7 +100,7 @@ <H1 class="no-header">define_key 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 5ebc12750..e6ee9cca1 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp @
+  * @Id: form.3x,v 1.58 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>form 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 
@@ -78,7 +78,7 @@ <H1 class="no-header">form 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-Current-Default-Values-for-Field-Attributes">Current Default Values for Field Attributes</a></H3><PRE>
        The  <STRONG>form</STRONG>  library maintains a default value for field attributes.  You
        can get or  set  this  default  by  calling  the  appropriate  <STRONG>set_</STRONG>  or
-       retrieval  routine  with  a  <STRONG>NULL</STRONG> field pointer.  Changing this default
+       retrieval  routine  with  a  <EM>NULL</EM> field pointer.  Changing this default
        with a <STRONG>set_</STRONG> function affects  future  field  creations,  but  does  not
        change the rendering of fields already created.
 
@@ -169,7 +169,7 @@ <H1 class="no-header">form 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers return <STRONG>NULL</STRONG> on error, and set <STRONG>errno</STRONG> to
+       Routines  that  return  pointers return <EM>NULL</EM> on error, and set <STRONG>errno</STRONG> to
        the  corresponding  error-code  returned  by  functions  returning   an
        integer.   Routines  that return an integer return one of the following
        error codes:
@@ -245,7 +245,7 @@ <H1 class="no-header">form 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                          <STRONG><A HREF="form.3x.html">form(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html
index 8eb58d4c6..1d8219667 100644
--- a/doc/html/man/form_field.3x.html
+++ b/doc/html/man/form_field.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 
@@ -62,7 +62,7 @@ <H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The  function  <STRONG>set_form_fields</STRONG>  changes  the field pointer array of the
-       given <EM>form</EM>.  The array must be terminated by a <STRONG>NULL</STRONG>.
+       given <EM>form</EM>.  The array must be terminated by a <EM>NULL</EM>.
 
        The function <STRONG>form_fields</STRONG> returns the field array of the given form.
 
@@ -73,10 +73,10 @@ <H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function  <STRONG>form_fields</STRONG>  returns  a pointer (which may be <STRONG>NULL</STRONG>).  It
+       The  function  <STRONG>form_fields</STRONG>  returns  a pointer (which may be <EM>NULL</EM>).  It
        does not set <STRONG>errno</STRONG>.
 
-       The function <STRONG>field_count</STRONG> returns <STRONG>ERR</STRONG> if the <EM>form</EM> parameter is <STRONG>NULL</STRONG>.
+       The function <STRONG>field_count</STRONG> returns <STRONG>ERR</STRONG> if the <EM>form</EM> parameter is <EM>NULL</EM>.
 
        The  functions  <STRONG>set_form_fields</STRONG>  and  <STRONG>move_field</STRONG>  return  one  of   the
        following codes on error:
@@ -114,7 +114,7 @@ <H1 class="no-header">form_field 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="form_field.3x.html">form_field(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 47d6c8b3e..88063f352 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.47 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>            Library calls           <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 
@@ -104,7 +104,7 @@ <H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls<
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The <STRONG>field_buffer</STRONG>  function  returns  NULL  on  error.   It  sets  <STRONG>errno</STRONG>
+       The <STRONG>field_buffer</STRONG>  function  returns  <EM>NULL</EM>  on  error.   It  sets  <STRONG>errno</STRONG>
        according to their success:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -152,7 +152,7 @@ <H1 class="no-header">form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls<
 
 
 
-ncurses 6.5                       2024-03-16             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28             <STRONG><A HREF="form_field_buffer.3x.html">form_field_buffer(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index c7bedd9a2..870dc77cd 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field_new.3x,v 1.43 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_new 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_new 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The functions <STRONG>new_field</STRONG>, <STRONG>dup_field</STRONG>, <STRONG>link_field</STRONG> return  <STRONG>NULL</STRONG>  on  error.
+       The functions <STRONG>new_field</STRONG>, <STRONG>dup_field</STRONG>, <STRONG>link_field</STRONG> return  <EM>NULL</EM>  on  error.
        They set <STRONG>errno</STRONG> according to their success:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -122,7 +122,7 @@ <H1 class="no-header">form_field_new 3x 2024-03-16 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-03-16                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                <STRONG><A HREF="form_field_new.3x.html">form_field_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index 128698edb..afe3b6468 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field_userptr.3x,v 1.32 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>           Library calls          <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The function <STRONG>field_userptr</STRONG> returns a pointer (which may be  <STRONG>NULL</STRONG>).   It
+       The function <STRONG>field_userptr</STRONG> returns a pointer (which may be  <EM>NULL</EM>).   It
        does not set <STRONG>errno</STRONG>.
 
        The function <STRONG>set_field_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
@@ -89,7 +89,7 @@ <H1 class="no-header">form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls
 
 
 
-ncurses 6.5                       2024-03-16            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28            <STRONG><A HREF="form_field_userptr.3x.html">form_field_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index e66d71c26..9dcc76645 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -197,7 +197,7 @@ <H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.5 Library ca
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The functions <STRONG>field_type</STRONG> and  <STRONG>field_arg</STRONG>  return  <STRONG>NULL</STRONG>  on  error.   The
+       The functions <STRONG>field_type</STRONG> and  <STRONG>field_arg</STRONG>  return  <EM>NULL</EM>  on  error.   The
        function <STRONG>set_field_type</STRONG> returns one of the following:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2024-03-16 ncurses 6.5 Library ca
 
 
 
-ncurses 6.5                       2024-03-16         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 369f25c5f..cb962dfb1 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -118,7 +118,7 @@ <H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</H1
             Frees an argument-block structure.
 
        You must supply the <EM>make</EM><STRONG>_</STRONG><EM>arg</EM> function.  The other two are optional: you
-       may  supply NULL for them.  In this case, the form library assumes that
+       may  supply <EM>NULL</EM> for them.  In this case, the form library assumes that
        <EM>make</EM><STRONG>_</STRONG><EM>arg</EM> does not allocate memory but simply loads the argument into  a
        single scalar value.
 
@@ -183,7 +183,7 @@ <H1 class="no-header">form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-03-16                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 4845771f8..67ae929f5 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_hook.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_hook 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_hook 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_hook 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 
@@ -78,7 +78,7 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-field_init">field_init</a></H3><PRE>
-       returns the current field init hook, if any (<STRONG>NULL</STRONG> if there is  no  such
+       returns the current field init hook, if any (<EM>NULL</EM> if there is  no  such
        hook).
 
 
@@ -88,7 +88,7 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-field_term">field_term</a></H3><PRE>
-       returns the current field term hook, if any (<STRONG>NULL</STRONG> if there is  no  such
+       returns the current field term hook, if any (<EM>NULL</EM> if there is  no  such
        hook).
 
 
@@ -98,7 +98,7 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-form_init">form_init</a></H3><PRE>
-       returns the current form init hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
+       returns the current form init hook, if any (<EM>NULL</EM> if there  is  no  such
        hook).
 
 
@@ -108,12 +108,12 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-form_term">form_term</a></H3><PRE>
-       returns the current form term hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
+       returns the current form term hook, if any (<EM>NULL</EM> if there  is  no  such
        hook).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers  return <STRONG>NULL</STRONG> on error.  Other routines
+       Routines  that  return  pointers  return <EM>NULL</EM> on error.  Other routines
        return one of the following:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -137,7 +137,7 @@ <H1 class="no-header">form_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="form_hook.3x.html">form_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html
index 7a1877cad..28adfa6a3 100644
--- a/doc/html/man/form_new.3x.html
+++ b/doc/html/man/form_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_new.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_new 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_new 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 
@@ -59,14 +59,14 @@ <H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>new_form</STRONG> creates a new form connected to a specified field
-       pointer array (which must be <STRONG>NULL</STRONG>-terminated).
+       pointer array (which must be <EM>NULL</EM>-terminated).
 
        The function <STRONG>free_form</STRONG> disconnects <EM>form</EM> from its field array and  frees
        the storage allocated for the form.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function  <STRONG>new_form</STRONG> returns <STRONG>NULL</STRONG> on error.  It sets <STRONG>errno</STRONG> according
+       The  function  <STRONG>new_form</STRONG> returns <EM>NULL</EM> on error.  It sets <STRONG>errno</STRONG> according
        to the function's success:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -106,7 +106,7 @@ <H1 class="no-header">form_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="form_new.3x.html">form_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html
index b882db2be..c7e561580 100644
--- a/doc/html/man/form_page.3x.html
+++ b/doc/html/man/form_page.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_page.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_page 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_page 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_page 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
        The function <STRONG>unfocus_current_field</STRONG> removes the focus from  the  current
        field  of  the  form.  In such state, inquiries via <STRONG>current_field</STRONG> shall
-       return a NULL pointer.
+       return a <EM>NULL</EM> pointer.
 
        The function <STRONG>set_form_page</STRONG> sets the form's page number (goes to page  <EM>n</EM>
        of the form).
@@ -120,7 +120,7 @@ <H1 class="no-header">form_page 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="form_page.3x.html">form_page(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html
index ecb5992d4..2bb507aad 100644
--- a/doc/html/man/form_requestname.3x.html
+++ b/doc/html/man/form_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_requestname.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_requestname 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_requestname 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 
@@ -66,7 +66,7 @@ <H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>form_request_name</STRONG>   returns   <STRONG>NULL</STRONG>   on   error   and   sets  <STRONG>errno</STRONG>  to
+       <STRONG>form_request_name</STRONG>   returns   <EM>NULL</EM>   on   error   and   sets  <STRONG>errno</STRONG>  to
        <STRONG>E_BAD_ARGUMENT</STRONG>.
 
        <STRONG>form_request_by_name</STRONG> returns <STRONG>E_NO_MATCH</STRONG> on  error.   It  does  not  set
@@ -89,7 +89,7 @@ <H1 class="no-header">form_requestname 3x 2024-03-16 ncurses 6.5 Library calls</
 
 
 
-ncurses 6.5                       2024-03-16              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28              <STRONG><A HREF="form_requestname.3x.html">form_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index db79de202..996912a3c 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_userptr.3x,v 1.38 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_userptr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_userptr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The function <STRONG>form_userptr</STRONG> returns a pointer (which may  be  <STRONG>NULL</STRONG>).   It
+       The function <STRONG>form_userptr</STRONG> returns a pointer (which may  be  <EM>NULL</EM>).   It
        does not set <STRONG>errno</STRONG>.
 
        The function <STRONG>set_form_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
@@ -89,7 +89,7 @@ <H1 class="no-header">form_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="form_userptr.3x.html">form_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html
index 976ef2714..68dac08a0 100644
--- a/doc/html/man/form_win.3x.html
+++ b/doc/html/man/form_win.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_win.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_win 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_win 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_win 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 
@@ -72,8 +72,8 @@ <H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        necessary to set either window; by default, the driver code uses <STRONG>stdscr</STRONG>
        for both.
 
-       In the <STRONG>set_</STRONG> functions, window argument of <STRONG>NULL</STRONG> is treated as though  it
-       were <STRONG>stsdcr</STRONG>.  A form argument of <STRONG>NULL</STRONG> is treated as a request to change
+       In the <STRONG>set_</STRONG> functions, window argument of <EM>NULL</EM> is treated as though  it
+       were <STRONG>stsdcr</STRONG>.  A form argument of <EM>NULL</EM> is treated as a request to change
        the system default form window or subwindow.
 
        The function <STRONG>scale_form</STRONG> returns  the  minimum  size  required  for  the
@@ -81,7 +81,7 @@ <H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers  return  <STRONG>NULL</STRONG> on error.  Routines that
+       Routines  that  return  pointers  return  <EM>NULL</EM> on error.  Routines that
        return an integer return one of the following error codes:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -114,7 +114,7 @@ <H1 class="no-header">form_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="form_win.3x.html">form_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 5877cf6aa..8c1ef3883 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp @
+  * @Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-09-21 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2024-12-28 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2024-12-28 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -58,60 +58,22 @@ <H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       <STRONG>infocmp</STRONG>  can  be  used  to  compare  a binary <STRONG>terminfo</STRONG> entry with other
-       terminfo entries, rewrite a <STRONG>terminfo</STRONG> description to take  advantage  of
-       the  <STRONG>use=</STRONG>  terminfo field, or print out a <STRONG>terminfo</STRONG> description from the
-       binary file (<STRONG>term</STRONG>) in a variety of formats.  In all cases, the  Boolean
-       fields  will be printed first, followed by the numeric fields, followed
-       by the string fields.
+       <STRONG>infocmp</STRONG>  reports  a  human-readable  terminal  type  description from a
+       compiled entry in the <EM>terminfo</EM> database  in  a  variety  of  selectable
+       formats,  compares such entries to each other, and rewrites an entry to
+       replace  "<STRONG>use</STRONG>"  expressions  with  the  content  of  other  entries  by
+       reference.   A  <EM>terminfo</EM>  <EM>entry</EM>  entry  comprises a list of one or more
+       terminal type identifiers, a human-readable description of the terminal
+       type,  and  a  list  of  terminal  <EM>capabilities</EM>  that  characterize its
+       programming interface.  In all  cases,  the  program  reports  Boolean-
+       valued  capabilities  first, followed by numeric ones, and then string-
+       valued capabilities.
 
 
 </PRE><H3><a name="h3-Default-Options">Default Options</a></H3><PRE>
-       If no  options  are  specified  and  zero  or  one  <EM>terminal-types</EM>  are
-       specified,  the  <STRONG>-I</STRONG> option will be assumed.  If more than one <EM>terminal-</EM>
-       <EM>type</EM> is specified, the <STRONG>-d</STRONG> option will be assumed.
-
-
-</PRE><H3><a name="h3-Comparison-Options_d_c_n_">Comparison Options [-d] [-c] [-n]</a></H3><PRE>
-       <STRONG>infocmp</STRONG>  compares  the  <STRONG>terminfo</STRONG>  description  of  the  first  terminal
-       <EM>terminal-type</EM>  with  each  of the descriptions given by the entries for
-       the other terminal's <EM>terminal-types</EM>.  If a capability  is  defined  for
-       only  one  of  the terminals, the value returned depends on the type of
-       the capability:
-
-       <STRONG>o</STRONG>   <STRONG>F</STRONG> for missing Boolean variables
-
-       <STRONG>o</STRONG>   <STRONG>NULL</STRONG> for missing integer or string variables
-
-       Use the <STRONG>-q</STRONG> option to show the distinction between <EM>absent</EM>  and  <EM>canceled</EM>
-       capabilities.
-
-       These  options  produce a list which you can use to compare two or more
-       terminal descriptions:
-
-       <STRONG>-d</STRONG>   produces a list of each capability that is <EM>different</EM>  between  two
-            entries.   Each  item  in  the list shows ":" after the capability
-            name, followed by the capability values, separated by a comma.
-
-       <STRONG>-c</STRONG>   produces a list of each capability that is <EM>common</EM> between  two  or
-            more entries.  Missing capabilities are ignored.  Each item in the
-            list  shows  "="  after  the  capability  name,  followed  by  the
-            capability value.
-
-            The  <STRONG>-u</STRONG>  option  provides  a  related  output,  showing  the first
-            terminal description rewritten to use the  second  as  a  building
-            block via the "use=" clause.
-
-       <STRONG>-n</STRONG>   produces  a  list  of each capability that is in <EM>none</EM> of the given
-            entries.  Each item in the list shows "!"  before  the  capability
-            name.
-
-            Normally only the conventional capabilities are shown.  Use the <STRONG>-x</STRONG>
-            option to add the BSD-compatibility capabilities  (names  prefixed
-            with "OT").
-
-            If  no  <EM>terminal-types</EM>  are  given,  <STRONG>infocmp</STRONG>  uses the environment
-            variable <EM>TERM</EM> for each of the <EM>terminal-types</EM>.
+       If  no  options  are  specified  and  zero  or  one  <EM>terminal-types</EM>  is
+       specified,  <STRONG>infocmp</STRONG>  assumes  the  <STRONG>-I</STRONG>  option.   If  more  than  one is
+       specified, the program assumes the <STRONG>-d</STRONG> option.
 
 
 </PRE><H3><a name="h3-Source-Listing-Options_I_L_C_r_">Source Listing Options [-I] [-L] [-C] [-r]</a></H3><PRE>
@@ -177,6 +139,46 @@ <H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
                  <STRONG>%p2</STRONG>...<STRONG>%p1</STRONG>                  <STRONG>%r</STRONG>        hpgeneric
 
 
+</PRE><H3><a name="h3-Entry-Comparison-Options_d_c_n_">Entry Comparison Options [-d] [-c] [-n]</a></H3><PRE>
+       Given <STRONG>-c</STRONG>, <STRONG>-d</STRONG>, or <STRONG>-n</STRONG>, <STRONG>infocmp</STRONG> compares the <EM>terminfo</EM> description  of  the
+       first  specified  <EM>terminal-type</EM>  with  those  of each of the subsequent
+       operands.  If fewer <EM>terminal-types</EM> than required are specified, <STRONG>infocmp</STRONG>
+       uses the environment variable <EM>TERM</EM> in their place.
+
+       If  a  capability  is  defined  for  only  one terminal type, the value
+       reported depends on the capability's type:
+
+       <STRONG>o</STRONG>   <STRONG>F</STRONG> for missing Boolean variables
+
+       <STRONG>o</STRONG>   <STRONG>NULL</STRONG> for missing integer or string variables
+
+       The <STRONG>-c</STRONG> and <STRONG>-d</STRONG> options  report  string  capability  values  between  "'"
+       characters.   Use  the  <STRONG>-q</STRONG>  option  to  distinguish <EM>absent</EM> and <EM>canceled</EM>
+       capabilities; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
+       The comparison option selects the form of report.
+
+       <STRONG>-d</STRONG>   lists each capability that  <EM>differs</EM>  between  two  entries.   Each
+            capability  name is followed by ":" and comma-separated capability
+            values, then a period.
+
+       <STRONG>-c</STRONG>   lists each capability that two entries have  in  <EM>common</EM>.   <STRONG>infocmp</STRONG>
+            ignores  capabilities  missing from either entry.  Each capability
+            name is followed by "=", a space, and the capability value, then a
+            period.
+
+            If  the  <STRONG>-u</STRONG>  option  is  further  specified,  <STRONG>infocmp</STRONG> rewrites the
+            description of the first type employing "use=" syntax to  use  the
+            second as a building block.
+
+       <STRONG>-n</STRONG>   lists  capabilities  that  are in <EM>none</EM> of the given entries.  Each
+            capability name is preceded by "!"  and followed by a period.
+
+            Normally only conventional capabilities are  shown.   Use  the  <STRONG>-x</STRONG>
+            option  to add BSD-compatibility capabilities (names prefixed with
+            "OT").
+
+
 </PRE><H3><a name="h3-Use_Option_u_">Use= Option [-u]</a></H3><PRE>
        The <STRONG>-u</STRONG> option produces a  <STRONG>terminfo</STRONG>  source  description  of  the  first
        terminal <EM>terminal-type</EM> which is relative to the sum of the descriptions
@@ -315,8 +317,8 @@ <H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
                       DECSTR        soft reset (VT320)
                       S7C1T         7-bit controls (VT220)
                       -----------------------------------------
-
                       ISO DEC G0    enable DEC graphics for G0
+
                       ISO UK G0     enable UK chars for G0
                       ISO US G0     enable US chars for G0
                       ISO DEC G1    enable DEC graphics for G1
@@ -529,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-21                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2024-12-28                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -538,8 +540,8 @@ <H1 class="no-header">infocmp 1m 2024-09-21 ncurses 6.5 User commands</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
 <li><a href="#h3-Default-Options">Default Options</a></li>
-<li><a href="#h3-Comparison-Options_d_c_n_">Comparison Options [-d] [-c] [-n]</a></li>
 <li><a href="#h3-Source-Listing-Options_I_L_C_r_">Source Listing Options [-I] [-L] [-C] [-r]</a></li>
+<li><a href="#h3-Entry-Comparison-Options_d_c_n_">Entry Comparison Options [-d] [-c] [-n]</a></li>
 <li><a href="#h3-Use_Option_u_">Use= Option [-u]</a></li>
 <li><a href="#h3-Other-Options">Other Options</a></li>
 </ul>
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index cc3ae3a14..3ac1a95a2 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999
-  * @Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp @
+  * @Id: keybound.3x,v 1.42 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>keybound 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>keybound 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">keybound 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">keybound 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 
@@ -72,7 +72,7 @@ <H1 class="no-header">keybound 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        If <EM>key-code</EM> corresponds to a function key defined by the application or
        the terminal type in use, <STRONG>keybound</STRONG> allocates and returns a string  that
-       must be freed by the application.  <STRONG>keybound</STRONG> returns <STRONG>NULL</STRONG> if <EM>key-code</EM> is
+       must be freed by the application.  <STRONG>keybound</STRONG> returns <EM>NULL</EM> if <EM>key-code</EM> is
        not positive or if it does not correspond to a key code definition.
 
 
@@ -94,7 +94,7 @@ <H1 class="no-header">keybound 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index a5d29e431..b61a1e90b 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp @
+  * @Id: menu.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>                         Library calls                        <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 
@@ -71,7 +71,7 @@ <H1 class="no-header">menu 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-Current-Default-Values-for-Item-Attributes">Current Default Values for Item Attributes</a></H3><PRE>
        The <STRONG>menu</STRONG> library maintains a default value for  item  attributes.   You
        can  get  or  set  this default by calling the appropriate <STRONG>get_</STRONG> or <STRONG>set_</STRONG>
-       routine with a <STRONG>NULL</STRONG> item pointer.  Changing this default  with  a  <STRONG>set_</STRONG>
+       routine with a <EM>NULL</EM> item pointer.  Changing this default  with  a  <STRONG>set_</STRONG>
        function  affects  future  item  creations,  but  does  not  change the
        rendering of items already created.
 
@@ -150,7 +150,7 @@ <H1 class="no-header">menu 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers  return  <STRONG>NULL</STRONG> on error.  Routines that
+       Routines  that  return  pointers  return  <EM>NULL</EM> on error.  Routines that
        return an integer return one of the following error codes:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -220,7 +220,7 @@ <H1 class="no-header">menu 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                          <STRONG><A HREF="menu.3x.html">menu(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index ca1810c27..b6def77d7 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_hook.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_hook 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_hook 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 
@@ -73,27 +73,27 @@ <H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
        The  function  <STRONG>set_item_init</STRONG> sets a hook to be called at menu-post time
        and each time the selected item changes (after the change).   <STRONG>item_init</STRONG>
-       returns  the  current  item init hook, if any (<STRONG>NULL</STRONG> if there is no such
+       returns  the  current  item init hook, if any (<EM>NULL</EM> if there is no such
        hook).
 
        The function <STRONG>set_item_term</STRONG> sets a hook to be called at menu-unpost time
        and each time the selected item changes (before the change).  <STRONG>item_term</STRONG>
-       returns the current item term hook, if any (<STRONG>NULL</STRONG> if there  is  no  such
+       returns the current item term hook, if any (<EM>NULL</EM> if there  is  no  such
        hook).
 
        The  function  <STRONG>set_menu_init</STRONG> sets a hook to be called at menu-post time
        and just after the top row on the  menu  changes  once  it  is  posted.
-       <STRONG>menu_init</STRONG>  returns the current menu init hook, if any (<STRONG>NULL</STRONG> if there is
+       <STRONG>menu_init</STRONG>  returns the current menu init hook, if any (<EM>NULL</EM> if there is
        no such hook).
 
        The function <STRONG>set_menu_term</STRONG> sets a hook to be called at menu-unpost time
        and  just  before  the  top  row on the menu changes once it is posted.
-       <STRONG>menu_term</STRONG> returns the current menu term hook, if any (<STRONG>NULL</STRONG> if there  is
+       <STRONG>menu_term</STRONG> returns the current menu term hook, if any (<EM>NULL</EM> if there  is
        no such hook).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers  return <STRONG>NULL</STRONG> on error.  Other routines
+       Routines  that  return  pointers  return <EM>NULL</EM> on error.  Other routines
        return one of the following:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -117,7 +117,7 @@ <H1 class="no-header">menu_hook 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="menu_hook.3x.html">menu_hook(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html
index 7f1c08249..49369e83c 100644
--- a/doc/html/man/menu_items.3x.html
+++ b/doc/html/man/menu_items.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_items.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_items 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_items 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_items 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_menu_items</STRONG> changes the item pointer array of the given
-       <EM>menu</EM>.  The array must be terminated by a <STRONG>NULL</STRONG>.
+       <EM>menu</EM>.  The array must be terminated by a <EM>NULL</EM>.
 
        The function <STRONG>menu_items</STRONG> returns the item array of the given menu.
 
@@ -69,11 +69,11 @@ <H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The function <STRONG>menu_items</STRONG> returns a pointer (which may be <STRONG>NULL</STRONG>).  It does
+       The function <STRONG>menu_items</STRONG> returns a pointer (which may be <EM>NULL</EM>).  It does
        not set <STRONG>errno</STRONG>.
 
        The function <STRONG>item_count</STRONG> returns <STRONG>ERR</STRONG> (the general  <STRONG>curses</STRONG>  error  return
-       value) if its <EM>menu</EM> parameter is <STRONG>NULL</STRONG>.
+       value) if its <EM>menu</EM> parameter is <EM>NULL</EM> <EM>.</EM>
 
        The  function  <STRONG>set_menu_items</STRONG>  returns  one  of  the following codes on
        error:
@@ -111,7 +111,7 @@ <H1 class="no-header">menu_items 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="menu_items.3x.html">menu_items(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html
index 1cdb2b051..bbbb74d55 100644
--- a/doc/html/man/menu_mark.3x.html
+++ b/doc/html/man/menu_mark.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_mark.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_mark 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_mark 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 
@@ -67,15 +67,15 @@ <H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        string.   Note  that  changing the length of the mark string for a menu
        while the menu is posted is likely to produce unhelpful behavior.
 
-       The default string is "-" (a dash).  Calling <STRONG>set_menu_mark</STRONG> with a  non-
-       <STRONG>NULL</STRONG> menu argument will change this default.
+       The default string is "-" (a dash).  Calling <STRONG>set_menu_mark</STRONG> with a  <EM>non-</EM>
+       NULL menu argument will change this default.
 
-       The function <STRONG>menu_mark</STRONG> returns the menu's mark string (or <STRONG>NULL</STRONG> if there
+       The function <STRONG>menu_mark</STRONG> returns the menu's mark string (or <EM>NULL</EM> if there
        is none).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The function <STRONG>menu_mark</STRONG> returns a pointer (which may be <STRONG>NULL</STRONG>).  It  does
+       The function <STRONG>menu_mark</STRONG> returns a pointer (which may be <EM>NULL</EM>).  It  does
        not set <STRONG>errno</STRONG>.
 
        The function <STRONG>set_menu_mark</STRONG> may return the following error codes:
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_mark 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="menu_mark.3x.html">menu_mark(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index e53eacb65..042a8922d 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_new.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_new 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_new 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 
@@ -59,14 +59,14 @@ <H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The  function <STRONG>new_menu</STRONG> creates a new menu connected to a specified item
-       pointer array (which must be <STRONG>NULL</STRONG>-terminated).
+       pointer array (which must be <EM>NULL</EM>-terminated).
 
        The function <STRONG>free_menu</STRONG> disconnects <EM>menu</EM> from its item array  and  frees
        the storage allocated for the menu.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function  <STRONG>new_menu</STRONG> returns <STRONG>NULL</STRONG> on error.  It sets <STRONG>errno</STRONG> according
+       The  function  <STRONG>new_menu</STRONG> returns <EM>NULL</EM> on error.  It sets <STRONG>errno</STRONG> according
        to the function's failure:
 
        <STRONG>E_NOT_CONNECTED</STRONG>
@@ -104,7 +104,7 @@ <H1 class="no-header">menu_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="menu_new.3x.html">menu_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 34d6f98d2..927fcc9a4 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_pattern.3x,v 1.40 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 
@@ -70,8 +70,8 @@ <H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function <STRONG>menu_pattern</STRONG> returns a pointer, which is <STRONG>NULL</STRONG> if the <EM>menu</EM>
-       parameter is <STRONG>NULL</STRONG>.  Otherwise, it is a pointer to  a  string  which  is
+       The  function <STRONG>menu_pattern</STRONG> returns a pointer, which is <EM>NULL</EM> if the <EM>menu</EM>
+       parameter is <EM>NULL</EM>.  Otherwise, it is a pointer to  a  string  which  is
        empty if no pattern has been set.  It does not set <STRONG>errno</STRONG>.
 
        The function <STRONG>set_menu_pattern</STRONG> may return the following error codes:
@@ -109,7 +109,7 @@ <H1 class="no-header">menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="menu_pattern.3x.html">menu_pattern(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html
index 0a06ada49..1a9dba0c3 100644
--- a/doc/html/man/menu_requestname.3x.html
+++ b/doc/html/man/menu_requestname.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_requestname.3x,v 1.35 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>             Library calls            <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 
@@ -67,7 +67,7 @@ <H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>menu_request_name</STRONG>   returns   <STRONG>NULL</STRONG>   on   error   and   sets  <STRONG>errno</STRONG>  to
+       <STRONG>menu_request_name</STRONG>   returns   <EM>NULL</EM>   on   error   and   sets  <STRONG>errno</STRONG>  to
        <STRONG>E_BAD_ARGUMENT</STRONG>.
        <STRONG>menu_request_by_name</STRONG> returns <STRONG>E_NO_MATCH</STRONG> on  error.   It  does  not  set
        <STRONG>errno</STRONG>.
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls</
 
 
 
-ncurses 6.5                       2024-03-16              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28              <STRONG><A HREF="menu_requestname.3x.html">menu_requestname(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index 5526b4dea..4c95e4e39 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_spacing.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 
@@ -87,7 +87,7 @@ <H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</H1>
               values resets them to the default, which is 1 for all of them.
 
        The function <STRONG>menu_spacing</STRONG> returns the spacing information for the menu.
-       If  a  pointer  is  NULL,  the  corresponding information is simply not
+       If  a  pointer  is  <EM>NULL</EM>,  the  corresponding information is simply not
        returned.
 
 
@@ -113,7 +113,7 @@ <H1 class="no-header">menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="menu_spacing.3x.html">menu_spacing(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index d2b52f1df..487648787 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_userptr.3x,v 1.35 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>menu_userptr</STRONG> returns a pointer (which may be <STRONG>NULL</STRONG>).  It  does  not  set
+       <STRONG>menu_userptr</STRONG> returns a pointer (which may be <EM>NULL</EM>).  It  does  not  set
        <STRONG>errno</STRONG>.
 
        <STRONG>set_menu_userptr</STRONG> returns <STRONG>E_OK</STRONG> (success).
@@ -89,7 +89,7 @@ <H1 class="no-header">menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                  <STRONG><A HREF="menu_userptr.3x.html">menu_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html
index 9688e0f50..41c0753fb 100644
--- a/doc/html/man/menu_win.3x.html
+++ b/doc/html/man/menu_win.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_win.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_win 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_win 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_win 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 
@@ -72,8 +72,8 @@ <H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        necessary to set either window; by default, the driver code uses <STRONG>stdscr</STRONG>
        for both.
 
-       In the <STRONG>set_</STRONG> functions, window argument of <STRONG>NULL</STRONG> is treated as though  it
-       were <STRONG>stsdcr</STRONG>.  A menu argument of <STRONG>NULL</STRONG> is treated as a request to change
+       In the <STRONG>set_</STRONG> functions, window argument of <EM>NULL</EM> is treated as though  it
+       were <STRONG>stsdcr</STRONG>.  A menu argument of <EM>NULL</EM> is treated as a request to change
        the system default menu window or subwindow.
 
        The function <STRONG>scale_menu</STRONG> returns  the  minimum  size  required  for  the
@@ -81,7 +81,7 @@ <H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  pointers  return  <STRONG>NULL</STRONG> on error.  Routines that
+       Routines  that  return  pointers  return  <EM>NULL</EM> on error.  Routines that
        return an integer return one of the following error codes:
 
        <STRONG>E_OK</STRONG> The routine succeeded.
@@ -114,7 +114,7 @@ <H1 class="no-header">menu_win 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                      <STRONG><A HREF="menu_win.3x.html">menu_win(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html
index ea8a33f7d..a0dd48609 100644
--- a/doc/html/man/mitem_current.3x.html
+++ b/doc/html/man/mitem_current.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
+  * @Id: mitem_current.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>mitem_current 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">mitem_current 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 
@@ -78,11 +78,11 @@ <H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>current_item</STRONG> returns a pointer (which may be <STRONG>NULL</STRONG>).  It  does  not  set
+       <STRONG>current_item</STRONG> returns a pointer (which may be <EM>NULL</EM>).  It  does  not  set
        <STRONG>errno</STRONG>.
 
        <STRONG>top_row</STRONG>  and  <STRONG>item_index</STRONG> return <STRONG>ERR</STRONG> (the general <STRONG>curses</STRONG> error value) if
-       their <EM>menu</EM> parameter is <STRONG>NULL</STRONG>.
+       their <EM>menu</EM> parameter is <EM>NULL</EM>.
 
        <STRONG>set_current_item</STRONG> and <STRONG>set_top_row</STRONG> return one of the following:
 
@@ -119,7 +119,7 @@ <H1 class="no-header">mitem_current 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="mitem_current.3x.html">mitem_current(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index 1ff53c8a9..7498870a3 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp @
+  * @Id: mitem_name.3x,v 1.33 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>mitem_name 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">mitem_name 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 
@@ -64,7 +64,7 @@ <H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These routines return a pointer (which may be <STRONG>NULL</STRONG>).  They do  not  set
+       These routines return a pointer (which may be <EM>NULL</EM>).  They do  not  set
        <STRONG>errno</STRONG>.
 
 
@@ -83,7 +83,7 @@ <H1 class="no-header">mitem_name 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="mitem_name.3x.html">mitem_name(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index b4ed66765..03f34f4ce 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: mitem_new.3x,v 1.38 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>mitem_new 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">mitem_new 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 
@@ -69,7 +69,7 @@ <H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The  function  <STRONG>new_item</STRONG> returns <STRONG>NULL</STRONG> on error.  It sets <STRONG>errno</STRONG> according
+       The  function  <STRONG>new_item</STRONG> returns <EM>NULL</EM> on error.  It sets <STRONG>errno</STRONG> according
        to the function's failure:
 
        <STRONG>E_BAD_ARGUMENT</STRONG>
@@ -107,7 +107,7 @@ <H1 class="no-header">mitem_new 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                     <STRONG><A HREF="mitem_new.3x.html">mitem_new(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index afb442d81..d2b0fa852 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: mitem_userptr.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 
@@ -65,7 +65,7 @@ <H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The function <STRONG>item_userptr</STRONG> returns a pointer (possibly <STRONG>NULL</STRONG>).   It  does
+       The function <STRONG>item_userptr</STRONG> returns a pointer (possibly <EM>NULL</EM>).   It  does
        not set <STRONG>errno</STRONG>.
 
        The <STRONG>set_item_userptr</STRONG> always returns <STRONG>E_OK</STRONG> (success).
@@ -89,7 +89,7 @@ <H1 class="no-header">mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                 <STRONG><A HREF="mitem_userptr.3x.html">mitem_userptr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index a0a6aa8c5..7bebb469f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp @
+  * @Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20240921).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20241228).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -143,8 +143,8 @@ <H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        and represents all or part  of  its  display  with  <EM>WINDOW</EM>  structures.
        Distinct  properties apply to each; for example, the <EM>line</EM> <EM>discipline</EM> of
        a typical Unix terminal driver is in one of three modes:  raw,  cbreak,
-       or  normal ("cooked").  In <EM>curses</EM>, the line discipline is a property of
-       the screen, applying identically to all windows associated with it.
+       or  canonical ("cooked").  In <EM>curses</EM>, the line discipline is a property
+       of the screen, applying identically to all windows associated with it.
 
        A <EM>window</EM> is a rectangular grid of character cells,  addressed  by  line
        and column coordinates (<EM>y</EM>, <EM>x</EM>), with the upper left corner as (0, 0).  A
@@ -813,7 +813,7 @@ <H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        Unless  otherwise  noted,  functions  that  return  integers return the
        constants <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG>  on  failure;  see  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
-       Functions  that  return  pointers  return  <STRONG>NULL</STRONG> on failure.  Typically,
+       Functions  that  return  pointers  return  <EM>NULL</EM> on failure.  Typically,
        <EM>ncurses</EM> treats a null pointer passed  as  a  function  parameter  as  a
        failure.   Functions  prefixed  with "mv" first perform cursor movement
        and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -1498,7 +1498,7 @@ <H1 class="no-header">ncurses 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 791ae717d..3a8353c32 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp @
+  * @Id: panel.3x,v 1.68 2024/12/28 21:26:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>panel 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>panel 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">panel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">panel 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>                        Library calls                       <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 
@@ -193,7 +193,7 @@ <H1 class="no-header">panel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Each routine that returns a pointer returns <STRONG>NULL</STRONG> if  an  error  occurs.
+       Each routine that returns a pointer returns <EM>NULL</EM> if  an  error  occurs.
        Each  routine  that  returns  an  int  value  returns <STRONG>OK</STRONG> if it executes
        successfully and <STRONG>ERR</STRONG> if not.
 
@@ -236,7 +236,7 @@ <H1 class="no-header">panel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
            library.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> (since version 0.6 in 1993) and <EM>PDCurses</EM> (since version 2.2
-           in  1995) provide a panel library whose common ancestor is a public
+           in  1995) provide a <EM>panel</EM> library whose common ancestor is a public
            domain implementation by Warren Tucker published  in  <EM>u386mon</EM>  2.20
            (1990).
 
@@ -266,7 +266,7 @@ <H1 class="no-header">panel 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                         <STRONG><A HREF="panel.3x.html">panel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html
index 234914627..e67be6697 100644
--- a/doc/html/man/resizeterm.3x.html
+++ b/doc/html/man/resizeterm.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996-on
-  * @Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
+  * @Id: resizeterm.3x,v 1.58 2024/12/28 21:18:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>resizeterm 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">resizeterm 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 
@@ -178,8 +178,8 @@ <H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
        Doing that clears the screen and is visually distracting.
 
-       This  extension  of <EM>ncurses</EM> was introduced in mid-1995.  It was adopted
-       in NetBSD <EM>curses</EM> (2001) and PDCurses (2003).
+       <EM>ncurses</EM>  introduced  this extension in mid-1995.  NetBSD <EM>curses</EM> adopted
+       it in 2001 and <EM>PDCurses</EM> in 2003.
 
 
 </PRE><H2><a name="h2-AUTHORS">AUTHORS</a></H2><PRE>
@@ -192,7 +192,7 @@ <H1 class="no-header">resizeterm 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                    <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 99b6786bc..62d1cc342 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
+  * @Id: term_variables.3x,v 1.40 2024/12/28 21:35:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>term_variables 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>term_variables 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">term_variables 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
@@ -78,97 +78,96 @@ <H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       This  page  summarizes  variables provided by the <STRONG>curses</STRONG> library's low-
-       level terminfo interface.  A more complete description is given in  the
+       This  page summarizes variables provided by the <EM>curses</EM> library's lower-
+       level <EM>terminfo</EM> interface.  Locate a more complete  description  in  the
        <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> manual page.
 
-       Depending  on  the  configuration,  these  may  be actual variables, or
-       macros  (see  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>)  which  provide  read-only  access   to
-       <EM>curses</EM>'s  state.   In  either  case,  applications should treat them as
-       read-only to avoid confusing the library.
+       Depending  on  <EM>ncurses</EM>'s  build-time configuration, these may be actual
+       variables, or macros  (see  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>)  that  provide  read-only
+       access  to  <EM>curses</EM>'s  state.  In either case, applications should treat
+       them as read-only to avoid confusing the library.
 
 
 </PRE><H3><a name="h3-Alternate-Character-Set-Mapping">Alternate Character Set Mapping</a></H3><PRE>
-       After initializing the curses or terminfo interfaces, the <STRONG>acs_map</STRONG> array
+       After initializing the <EM>curses</EM> or <EM>terminfo</EM> interfaces, the <STRONG>acs_map</STRONG> array
        holds  information  used to translate cells with the <STRONG>A_ALTCHARSET</STRONG> video
        attribute into line-drawing characters.
 
        The encoding of the information in this array has changed periodically.
        Application  developers  need  only know that it is used for the "ACS_"
-       constants in &lt;curses.h&gt;.
+       constants in <EM>curses.h</EM>.
 
-       The comparable  data  for  the  wide-character  library  is  a  private
-       variable.
+       The comparable data for the wide-character library are not  exposed  as
+       symbols in the API.
 
 
 </PRE><H3><a name="h3-Current-Terminal-Data">Current Terminal Data</a></H3><PRE>
-       After  initializing  the  curses  or  terminfo interfaces, the <STRONG>cur_term</STRONG>
-       contains data describing the current terminal.  This variable  is  also
-       set as a side-effect of <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG> and <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG>.
+       After initializing the <EM>curses</EM> or <EM>terminfo</EM> interfaces, <STRONG>cur_term</STRONG> contains
+       data describing the current terminal.  It is also updated  as  a  side-
+       effect of <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG> and <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG>.
 
        It  is  possible  to  save  a value of <STRONG>cur_term</STRONG> for subsequent use as a
-       parameter to <STRONG>set_term</STRONG>, for switching between  screens.   Alternatively,
-       one can save the return value from <STRONG>newterm</STRONG> or <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to reuse in
-       <STRONG>set_term</STRONG>.
+       parameter   to   <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG>   for    switching    between    screens.
+       Alternatively,  one  can  save  the  return  value  from <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> or
+       <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to reuse in <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-terminfo-Lookup-Tables"><EM>terminfo</EM> Lookup Tables</a></H3><PRE>
        The <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> and <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG> 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 hash-tables used by the terminfo and termcap
-       functions are not available.
+       short  names  of  <EM>terminfo</EM>  capabilities,  as well as the corresponding
+       names  for  <EM>termcap</EM>  capabilities.   These  are  available   to   other
+       applications,  though  the hash tables used by the <EM>terminfo</EM> and <EM>termcap</EM>
+       functions are not.
 
-       The long terminfo capability names use a  "f"  (eff)  in  their  names:
-       <STRONG>boolfnames</STRONG>, <STRONG>numfnames</STRONG>, and <STRONG>strfnames</STRONG>.
-
-       These  are  the  short  names  for  terminfo  capabilities:  <STRONG>boolnames</STRONG>,
-       <STRONG>numnames</STRONG>, and <STRONG>strnames</STRONG>.
-
-       These are  the  corresponding  names  used  for  termcap  descriptions:
-       <STRONG>boolcodes</STRONG>, <STRONG>numcodes</STRONG>, and <STRONG>strcodes</STRONG>.
+       <EM>terminfo</EM> stores capability names in arrays with an "f" (eff)  in  their
+       names:  <STRONG>boolfnames</STRONG>,  <STRONG>numfnames</STRONG>,  and  <STRONG>strfnames</STRONG>.  It stores the briefer
+       capability codes in arrays without the "f":  <STRONG>boolnames</STRONG>,  <STRONG>numnames</STRONG>,  and
+       <STRONG>strnames</STRONG>.   The  corresponding  <EM>termcap</EM>  capability codes are stored in
+       <STRONG>boolcodes</STRONG>, <STRONG>numcodes</STRONG>, and <STRONG>strcodes</STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> catalogs these.
 
 
 </PRE><H3><a name="h3-Terminal-Type">Terminal Type</a></H3><PRE>
        A terminal description begins with one or more terminal names separated
-       by "|" (vertical bars).  On initialization of the  curses  or  terminfo
-       interfaces,  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  copies  the  terminal  names  to  the array
+       by  "|"  (vertical  bars).  On initialization of the <EM>curses</EM> or <EM>terminfo</EM>
+       interfaces,  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  copies  the  terminal  name  to  the  array
        <STRONG>ttytype</STRONG>.
 
 
 </PRE><H3><a name="h3-terminfo-Names"><EM>terminfo</EM> Names</a></H3><PRE>
-       In addition to the variables, <STRONG>&lt;term.h&gt;</STRONG> also defines a symbol  for  each
-       terminfo  capability  <EM>long</EM> <EM>name</EM>.  These are in terms of the symbol <STRONG>CUR</STRONG>,
-       which is defined
+       In  addition  to  the  variables, <EM>term.h</EM> also defines a symbol for each
+       <EM>terminfo</EM> capability name.  These are in terms of the symbol <STRONG>CUR</STRONG>,  which
+       is defined
 
-       #define CUR ((TERMTYPE *)(cur_term))-&gt;
+              #define CUR ((TERMTYPE *)(cur_term))-&gt;
 
-       These  symbols  provide  a  faster   method   of   accessing   terminfo
-       capabilities than using <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, etc.
+       These   symbols   provide   a   faster  method  of  accessing  <EM>terminfo</EM>
+       capabilities than using, for example, <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>.
 
-       The  actual definition of <STRONG>CUR</STRONG> depends upon the implementation, but each
-       terminfo library provides these long names defined to  point  into  the
-       current terminal description loaded into memory.
+       The definition of <STRONG>CUR</STRONG> is implementation-dependent,  but  each  <EM>terminfo</EM>
+       library  defines these names to point into the in-memory description of
+       the  current  terminal.   For  example,  in  <EM>ncurses</EM>,  the  expressions
+       <STRONG>tigetstr("key_dc")</STRONG> and "<STRONG>CUR</STRONG> <STRONG>Strings[59]"</STRONG> are equivalent.
 
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  low-level  terminfo  interface is initialized using <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
-       The upper-level curses interface uses the low-level terminfo interface,
-       internally.
+</PRE><H3><a name="h3-terminfo-and-curses"><EM>terminfo</EM> and curses</a></H3><PRE>
+       <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  initializes  the  lower-level  <EM>terminfo</EM>  interface.  The
+       higher-level <EM>curses</EM> interface uses the <EM>terminfo</EM>  interface  internally;
+       the symbol <STRONG>SP</STRONG> bridges the <EM>curses</EM> <EM>SCREEN</EM> type with the <EM>terminfo</EM> <EM>TERMINAL</EM>
+       type.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses does not describe any of these except for <STRONG>cur_term</STRONG>.  (The
-       inclusion  of  <STRONG>cur_term</STRONG>  appears  to  be  an  oversight,  since   other
-       comparable low-level information is omitted by X/Open).
+       X/Open Curses does  not  describe  any  of  these  symbols  except  for
+       <EM>cur</EM><STRONG>_</STRONG><EM>term</EM>.  (The inclusion of <EM>cur</EM><STRONG>_</STRONG><EM>term</EM> appears to be an oversight, since
+       other comparable low-level information is omitted by X/Open.)
 
-       Other    implementations   may   have   comparable   variables.    Some
+       Other   implementations   may   have   comparable   variables.     Some
        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 <STRONG>Terminfo</STRONG> <STRONG>Names</STRONG> section.  Most, but  not  all,  base
-       the definition upon the <STRONG>cur_term</STRONG> variable.
+       All implementations that provide <EM>terminfo</EM> interfaces add definitions as
+       described  in  the  "<EM>terminfo</EM> Names" section above.  Most, but not all,
+       base the definition upon the <EM>cur</EM><STRONG>_</STRONG><EM>term</EM> variable.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -176,7 +175,7 @@ <H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-03-16                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -189,9 +188,9 @@ <H1 class="no-header">term_variables 3x 2024-03-16 ncurses 6.5 Library calls</H1
 <li><a href="#h3-terminfo-Lookup-Tables">terminfo Lookup Tables</a></li>
 <li><a href="#h3-Terminal-Type">Terminal Type</a></li>
 <li><a href="#h3-terminfo-Names">terminfo Names</a></li>
+<li><a href="#h3-terminfo-and-curses">terminfo and curses</a></li>
 </ul>
 </li>
-<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index b8644d32d..d618f7353 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20240921).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20241228).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -1382,8 +1382,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        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 line and column offset by
-       a blank character, thus
+       A final example is the LSI ADM-3A, which uses line and column offset by
+       a space, thus
               cup=\E=%p1%' '%+%c%p2%' '%+%c
 
        After  sending "\E=", this pushes the first parameter, pushes the ASCII
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 14a3a0aad..922286dbb 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp @
+  * @Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-09-14 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2024-12-28 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-09-14 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -166,7 +166,7 @@ <H1 class="no-header">tput 1 2024-09-14 ncurses 6.5 User commands</H1>
 
                   (1)  <STRONG>tput</STRONG> sets the the terminal modes to a "sane" state,
 
-                       <STRONG>o</STRONG>   enabling cooked and echo modes,
+                       <STRONG>o</STRONG>   enabling canonical ("cooked") and echo modes,
 
                        <STRONG>o</STRONG>   disabling cbreak and raw modes,
 
@@ -559,7 +559,7 @@ <H1 class="no-header">tput 1 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2024-12-28                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index cbec400c0..3c3c3a0f8 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp @
+  * @Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-06-08 ncurses 6.5 User commands</TITLE>
+<TITLE>tset 1 2024-12-28 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-06-08 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tset 1 2024-12-28 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -128,7 +128,7 @@ <H1 class="no-header">tset 1 2024-06-08 ncurses 6.5 User commands</H1>
 </PRE><H3><a name="h3-reset----reinitialization"><EM>reset</EM> -- reinitialization</a></H3><PRE>
        When invoked as <STRONG>reset</STRONG>, <STRONG>tset</STRONG> sets the terminal modes to "sane" values:
 
-       <STRONG>o</STRONG>   sets cooked and echo modes,
+       <STRONG>o</STRONG>   sets canonical ("cooked") and echo modes,
 
        <STRONG>o</STRONG>   turns off cbreak and raw modes,
 
@@ -395,7 +395,7 @@ <H1 class="no-header">tset 1 2024-06-08 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-06-08                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.5                       2024-12-28                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 047b853f8..5f8c6816f 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp @
+  * @Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>wresize 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">wresize 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -60,28 +60,27 @@ <H1 class="no-header">wresize 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wresize</STRONG>,  an  <EM>ncurses</EM>  extension  to  the  <EM>curses</EM>  library, reallocates
        storage for <EM>win</EM>, adjusting its dimensions to  <EM>lines</EM>  and  <EM>columns</EM>.   If
-       either dimension is larger than its current value, <EM>ncurses</EM> the expanded
-       part of the window is filled with blanks merged with current background
-       rendition  (configured  by  <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG>,  or  by  wide-character  API:
-       <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
+       either  dimension  is  larger than its current value, <EM>ncurses</EM> fills the
+       expanded part of the window with the background character and rendition
+       configured by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character API: <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wresize</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.  It fails  if  either
-       <EM>lines</EM>  or  <EM>columns</EM> is less than or equal to zero, or if an error occurs
+       <STRONG>wresize</STRONG>  returns  <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.  It fails if either
+       <EM>lines</EM> or <EM>columns</EM> is less than or equal to zero, or if an  error  occurs
        while (re)allocating memory for <EM>win</EM>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The only restriction placed on the values of <EM>lines</EM> and <EM>columns</EM> is  that
-       they  be greater than zero.  They are <EM>not</EM> compared to the dimensions of
-       the <EM>curses</EM> screen; this keeps the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.   The
-       caller  must  ensure  that  <EM>win</EM>'s  dimensions  fit  within those of the
+       The  only restriction placed on the values of <EM>lines</EM> and <EM>columns</EM> is that
+       they be greater than zero.  They are <EM>not</EM> compared to the dimensions  of
+       the  <EM>curses</EM> screen; this keeps the logic of <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> simple.  The
+       caller must ensure that  <EM>win</EM>'s  dimensions  fit  within  those  of  the
        screen.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>wresize</STRONG> is an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in  SVr4  <EM>curses</EM>,
+       <STRONG>wresize</STRONG>  is  an <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extension, and is not found in SVr4 <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
@@ -89,14 +88,14 @@ <H1 class="no-header">wresize 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       NetBSD <EM>curses</EM> adopted <EM>wresize</EM> in 2001 (release 1.5.3), and <EM>PDCurses</EM>  in
+       NetBSD  <EM>curses</EM> adopted <EM>wresize</EM> in 2001 (release 1.5.3), and <EM>PDCurses</EM> in
        2004 (version 2.7).
 
        It is not possible to resize windows with SVr4 <EM>curses</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Thomas  Dickey developed <EM>wresize</EM> as an extension to BSD <EM>curses</EM> in 1988,
+       Thomas Dickey developed <EM>wresize</EM> as an extension to BSD <EM>curses</EM> in  1988,
        and brought it to <EM>ncurses</EM> in mid-1995.
 
 
@@ -109,7 +108,7 @@ <H1 class="no-header">wresize 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2024-12-28                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index a93d8e86e..f27678f5c 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -26,7 +26,7 @@ BEGIN {
 	lcurl = "{";
 	rcurl = "}";
 	print  "/****************************************************************************"
-	print  " * Copyright 2018-2021,2023 Thomas E. Dickey                                *"
+	print  " * Copyright 2018-2023,2024 Thomas E. Dickey                                *"
 	print  " * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *"
 	print  " *                                                                          *"
 	print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
@@ -60,7 +60,7 @@ BEGIN {
 	print  "/*    and: Thomas E. Dickey                        1995-on                  */"
 	print  "/****************************************************************************/"
 	print  ""
-	print  "/* $Id: MKterm.h.awk.in,v 1.85 2023/04/23 19:15:36 tom Exp $ */"
+	print  "/* $Id: MKterm.h.awk.in,v 1.87 2024/12/28 21:42:15 tom Exp $ */"
 	print  ""
 	print  "/*"
 	print  "**	term.h -- Definition of struct term"
@@ -86,6 +86,7 @@ BEGIN {
 	print  ""
 	print  "typedef struct screen  SCREEN;"
 	print  ""
+	print  "/* configured with --enable-sp-funcs? */"
 	print  "#if @NCURSES_SP_FUNCS@"
 	print  "#undef  NCURSES_SP_FUNCS"
 	print  "#define NCURSES_SP_FUNCS @NCURSES_PATCH@"
@@ -146,6 +147,7 @@ BEGIN {
 	print  "#else /* !HAVE_TERMIO_H */"
 	print  ""
 	print  "#if (defined(_WIN32) || defined(_WIN64))"
+	print  "/* configured with --enable-exp-win32? */"
 	print  "#if @EXP_WIN32_DRIVER@"
 	print  "#include <win32_curses.h>"
 	print  "#define TTY struct winconmode"
@@ -166,6 +168,7 @@ BEGIN {
 	print  "#ifdef TERMIOS"
 	print  "#define GET_TTY(fd, buf) tcgetattr(fd, buf)"
 	print  "#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)"
+	print  "/* configured with --enable-exp-win32? */"
 	print  "#elif @EXP_WIN32_DRIVER@ && (defined(_WIN32) || defined(_WIN64))"
 	print  "#define GET_TTY(fd, buf) _nc_console_getmode(_nc_console_fd2handle(fd),buf)"
 	print  "#define SET_TTY(fd, buf) _nc_console_setmode(_nc_console_fd2handle(fd),buf)"
@@ -255,6 +258,7 @@ END {
 	print  "TERMINAL;"
 	print  ""
 	if (@NCURSES_EXT_COLORS@) {
+	print  "/* configured with --enable-ext-colors */"
 	declare_termtype("int","2");
 	} else {
 	print  "#undef TERMTYPE2"
@@ -268,9 +272,10 @@ END {
 	print  ""
 	print  "#endif /* NCURSES_INTERNALS */"
 	print  ""
-	print  ""
+	print  "/* configured with --enable-broken_linker and reentrancy disabled */"
 	print  "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@"
 	print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+	print  "/* reentrancy enabled */"
 	print  "#elif @cf_cv_enable_reentrant@"
 	print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
 	print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
@@ -278,6 +283,7 @@ END {
 	print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
 	print  "#endif"
 	print  ""
+	print  "/* configured with --enable-broken_linker or reentrancy enabled */"
 	print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
 	print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
 	print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
@@ -348,6 +354,7 @@ END {
 	print  "extern NCURSES_EXPORT(int) tigetflag (const char *);"
 	print  "extern NCURSES_EXPORT(int) tigetnum (const char *);"
 	print  ""
+	print  "/* configured without --disable-tparm-varargs? */"
 	print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
 	print  "extern NCURSES_EXPORT(char *) tparm (const char *, ...);	/* special */"
 	print  "#else"
@@ -380,6 +387,7 @@ END {
 	print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetflag) (SCREEN*, const char *);"
 	print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetnum) (SCREEN*, const char *);"
 	print  ""
+	print  "/* configured without --disable-tparm-varargs? */"
 	print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
 	print  "extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, const char *, ...);	/* special */"
 	print  "#else"
diff --git a/include/curses.h.in b/include/curses.h.in
index d245dde1c..8547ec3aa 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.287 2024/12/14 23:49:34 tom Exp $ */
+/* $Id: curses.h.in,v 1.288 2024/12/29 00:53:27 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -296,7 +296,7 @@ typedef @cf_cv_type_of_bool@ NCURSES_BOOL;
 #include <stdbool.h>
 /* use whatever the C compiler decides bool really is */
 #define NCURSES_BOOL bool
-#elif !defined(__cplusplus) && !@cf_cv_builtin_bool@
+#elif !defined(__cplusplus) && !@cf_cv_cc_bool_type@
 /* there is no predefined bool - use our own */
 #undef bool
 #define bool NCURSES_BOOL
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 8e293b928..8c538be17 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp $
-.TH curs_add_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp $
+.TH curs_add_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,7 +96,8 @@ of the
 If
 .I wch
 contains only non-spacing characters,
-.\" XXX: see wadd_wch_literal (the beginning of the array may be nonspacing)
+.\" XXX: see wadd_wch_literal (the beginning of the array may be
+.\" nonspacing)
 they are combined with the active complex character.
 .I curses
 ignores its attributes and color pair identifier,
@@ -159,6 +160,15 @@ A
 .I \%cchar_t
 can be copied from place to place using \fB\%win_wch\fP(3X) and
 .BR \%wadd_wch "."
+See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+usefully \*(``or\*(''ed with characters.
+A complex character whose character component is a wide space,
+and whose only attribute is
+.BR \%WA_NORMAL ,
+is a
+.IR "blank character" ","
+and therefore combines with the background character;
+see \fB\%curs_bkgrnd\fP(3X).
 .SS wecho_wchar
 .B \%echo_wchar
 and
@@ -384,7 +394,7 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
@@ -555,6 +565,7 @@ library in its non-wide-character configuration.
 \fB\%curs_addwstr\fP(3X),
 \fB\%curs_add_wchstr\fP(3X),
 \fB\%curs_attr\fP(3X),
+\fB\%curs_bkgrnd\fP(3X),
 \fB\%curs_clear\fP(3X),
 \fB\%curs_getcchar\fP(3X),
 \fB\%curs_outopts\fP(3X),
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 145a270ff..b3a3548f4 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp $
-.TH curs_add_wchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp $
+.TH curs_add_wchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -120,12 +120,12 @@ if
 .bP
 .I win
 is
-.B NULL
+.I NULL
 or
 .bP
 .I wchstr
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index c70b8a869..b8056ee28 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp $
-.TH curs_addch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp $
+.TH curs_addch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -140,6 +140,15 @@ can be copied from place to place using \fB\%winch\fP(3X) and
 .BR \%waddch .)
 See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
 usefully \*(``or\*(''ed with characters.
+A
+.I ch
+whose character component is a space,
+and whose only attribute is
+.BR \%A_NORMAL ,
+is a
+.IR "blank character" ","
+and therefore combines with the background character;
+see \fB\%curs_bkgd\fP(3X).
 .SS wechochar
 .B \%echochar
 and
@@ -241,7 +250,7 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
@@ -497,6 +506,7 @@ library in its wide-character configuration
 \fB\%curs_addchstr\fP(3X),
 \fB\%curs_addstr\fP(3X),
 \fB\%curs_attr\fP(3X),
+\fB\%curs_bkgd\fP(3X),
 \fB\%curs_clear\fP(3X),
 \fB\%curs_inch\fP(3X),
 \fB\%curs_outopts\fP(3X),
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 5d1a5c568..78c5fba93 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp $
-.TH curs_addchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
+.TH curs_addchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -120,12 +120,12 @@ if
 .bP
 .I win
 is
-.B NULL
+.I NULL
 or
 .bP
 .I chstr
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index a213544cf..0f9a7316d 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp $
-.TH curs_addstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp $
+.TH curs_addstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -107,11 +107,11 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 .I str
 is
-.BR NULL ","
+.IR NULL ","
 or
 .bP
 an internal \fB\%waddch\fP(3X) call returns
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index c5db7c592..0b3174c00 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp $
-.TH curs_addwstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
+.TH curs_addwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -117,11 +117,11 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 .I wstr
 is
-.BR NULL ","
+.IR NULL ","
 or
 .bP
 an internal \fB\%wadd_wch\fP(3X) call returns
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 37a466d9a..f89a64ed3 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp $
-.TH curs_attr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp $
+.TH curs_attr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -332,7 +332,7 @@ they return
 if
 .I win
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 .B \%wcolor_set
 returns
@@ -350,7 +350,7 @@ fail if its
 or
 .I \%pair
 parameter is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -390,7 +390,8 @@ This implementation makes the assumption that
 .PP
 Each of the functions added by XSI Curses has a parameter \fIopts\fP,
 which X/Open Curses still (after more than twenty years) documents
-as reserved for future use, saying that it should be \fBNULL\fP.
+as reserved for future use, saying that it should be
+.IR NULL "."
 This implementation uses that parameter in ABI 6 for the functions which
 have a color pair parameter to support \fIextended color pairs\fP:
 .bP
@@ -418,7 +419,8 @@ parameter.
 For functions which turn attributes off, e.g.,
 \fBwattr_off\fP,
 the \fIopts\fP parameter is ignored except
-except to check that it is \fBNULL\fP.
+except to check that it is
+.IR NULL "."
 .\" ---------------------------------------------------------------------------
 .SH PORTABILITY
 These functions are described in X/Open Curses, Issue 4.
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index d7fb06c7d..6b5c8e38b 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp $
-.TH curs_bkgd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp $
+.TH curs_bkgd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,25 +79,30 @@ When erasing parts of the screen,
 .I curses
 fills the cells with the background character.
 .I curses
-also uses the window background when writing characters to the screen:
+also uses the window background when writing characters to the screen.
 .bP
-The attribute part of the background is combined with all
-non-blank characters that are written into the window,
+The attribute part of the background combines with all
+non-blank characters written into the window,
 as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
 functions.
 .bP
-Both the character and attribute parts of the background are combined with
+Both the character and attribute parts of the background combine with
 blank characters that are written into the window.
 .PP
 The background becomes a property of the character and moves with it
 through any scrolling and insert/delete line/character operations.
 .PP
 To the extent possible on a given terminal,
-the attribute part of the background is displayed as the graphic
-rendition of the character put on the screen.
+.I curses
+displays the attributes of the background
+as the graphic rendition of the character put on the screen.
 .SS "bkgd, wbkgd"
-\fB\%bkgd\fP and \fB\%wbkgd\fP set the background property of
-\fB\%stdscr\fP or the specified window and then apply this setting to
+.B \%bkgd
+and
+.B \%wbkgd
+set the background property of
+.B \%stdscr
+or the specified window and then apply this setting to
 every character cell in that window.
 .bP
 The rendition of every character in the window changes to the new
@@ -109,8 +114,8 @@ it changes to the new background character.
 .I \%ncurses
 updates the rendition of each character cell by comparing the character,
 non-color attributes,
-and colors.
-The library applies to following procedure to each cell in the window,
+and color pair selection.
+The library applies the following procedure to each cell in the window,
 whether or not it is blank.
 .bP
 .I \%ncurses
@@ -121,7 +126,7 @@ if they match,
 writes the new background character to the cell.
 .bP
 .I \%ncurses
-then checks if the cell uses color,
+then checks if the cell uses color;
 that is,
 its color pair value is nonzero.
 If not,
@@ -146,7 +151,7 @@ and then adding attributes from the new background.
 .PP
 If the new background's character is nonspacing,
 .I \%ncurses
-reuses the old background character,
+retains the existing background character,
 except for one special case:
 .I \%ncurses
 treats a background character value of zero (0) as a space.
@@ -156,77 +161,133 @@ or if color has not been initialized with \fB\%start_color\fP(3X),
 .I \%ncurses
 ignores the new background character's color attribute.
 .SS "bkgdset, wbkgdset"
-\fB\%bkgdset\fP and \fB\%wbkgdset\fP manipulate the background of
-the applicable window,
-without updating the character cells as \fB\%bkgd\fP and
-\fB\%wbkgd\fP do;
+.B \%bkgdset
+and
+.B \%wbkgdset
+manipulate the background of the applicable window,
+without updating the character cells as
+.B \%bkgd
+and
+.B \%wbkgd
+do;
 only future writes reflect the updated background.
 .SS getbkgd
-\fB\%getbkgd\fP obtains the given window's background character and
-attribute combination.
+.B \%getbkgd
+returns the given window's background character,
+attributes,
+and color pair as a
+.IR \%chtype "."
 .SH RETURN VALUE
-Functions returning an \fIint\fP return \fBOK\fP on success.
-\fB\%bkgd\fP returns \fBERR\fP if the library has not been initialized.
-\fB\%wbkgd\fP and \fB\%getbkgd\fP return \fBERR\fP if a \fI\%WINDOW\fP
-pointer argument is null.
+.B \%bkgdset
+and
+.B \%wbkgdset
+do not return a value
 .PP
-\fB\%bkgdset\fP and \fBwbkgdset\fP do not return a value.
+Functions returning an
+.I int
+return
+.B ERR
+upon failure and
+.B OK
+upon success.
+In
+.IR \%ncurses ","
+failure occurs if
+.bP
+if the library has not been initialized,
+or
+.bP
+if
+.I win
+is
+.IR NULL "."
 .PP
-\fB\%getbkgd\fP returns a window's background character and attribute
-combination.
+.BR \%getbkgd 's
+return value is as described above.
 .SH NOTES
 Unusually,
-there is no \fB\%wgetbkgd\fP function;
-\fB\%getbkgd\fP behaves as one would expect \fB\%wgetbkgd\fP to,
-accepting a \fI\%WINDOW\fP pointer argument.
+there is no
+.B \%wgetbkgd
+function;
+.B \%getbkgd
+behaves as one would expect
+.B \%wgetbkgd
+to,
+accepting a
+.I \%WINDOW
+pointer argument.
 .PP
-\fB\%bkgd\fP and
-\fB\%bkgdset\fP
+.B \%bkgd
+and
+.B \%bkgdset
 may be implemented as macros.
 .PP
 X/Open Curses mentions that the character part of the background must
 be a single-byte value.
-\fI\%ncurses\fP,
-like SVr4 \fIcurses\fP,
+.IR \%ncurses ","
+like SVr4
+.IR curses ","
 checks to ensure that,
-and will reuse the old background character if the check fails.
+and retains the existing background character if the check fails.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
-It specifies that
-\fB\%bkgd\fP,
-\fB\%wbkgd\fP,
+It indicates that
+.IR bkgd ","
+.IR wbkgd ","
 and
-\fB\%getbkgd\fP
-return \fBERR\fP on failure
+.I getbkgd
+return
+.B ERR
+on failure
 (in the case of the last,
 this value is cast to
 .IR \%chtype ),
-but describes no failure conditions.
+but specifies no error conditions for them.
 .PP
-The SVr4.0 manual says that \fB\%bkgd\fP and \fB\%wbkgd\fP may return
-\fBOK\fP
-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
-which refers to the return value from \fB\%wrefresh\fP(3X),
+SVr4 documentation
+.\" SVID 4, vol. 3, p. 482
+says that
+.I \%bkgd
+and
+.I \%wbkgd
+return
+.B OK
+\*(``or a non-negative integer if
+.B \%immedok
+is set\*('',
+which refers to the return value from
+.IR \%wrefresh() ","
 used to implement the immediate repainting.
-SVr4 \fIcurses\fP's \fB\%wrefresh\fP returns the number of characters
-written to the screen during the refresh.
-\fI\%ncurses\fP does not do that.
+SVr4
+.IR curses 's
+.I \%wrefresh
+returns the number of characters
+written to the screen during the refresh;
+that of
+.I \%ncurses
+does not.
 .PP
 Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
-of characters on the screen updates when \fB\%bkgd\fP or \fB\%wbkgd\fP
+of characters on the screen updates when
+.I \%bkgd
+or
+.I \%wbkgd
 changes the background character.
-.IR \%ncurses ,
+.IR \%ncurses ","
 like SVr4
-.IR curses ,
+.IR curses ","
 does not
 (in its non-wide configuration)
 store the background and window attribute contributions to each
 character cell separately.
+.SH HISTORY
+SVr3.1 (1987)
+introduced these functions.
 .SH SEE ALSO
 \fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
 wide configuration of
-.IR \%ncurses .
+.IR \%ncurses "."
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 41412b9b9..38f428f82 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp $
-.TH curs_bkgrnd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+.TH curs_bkgrnd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -74,32 +74,37 @@ this property is a
 .I \%cchar_t
 which combines a set of attributes with the
 .I "background character"
-(see \fB\%curs_attr\fP(3X))
+(see \fB\%curs_attr\fP(3X)).
 The background character is a spacing character.
 .PP
 When erasing parts of the screen,
 .I curses
 fills the cells with the background character.
 .I curses
-also uses the window background when writing characters to the screen:
+also uses the window background when writing characters to the screen.
 .bP
-The attribute part of the background is combined with all
-non-blank characters that are written into the window,
+The attribute part of the background combines with all
+non-blank characters written into the window,
 as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
 functions.
 .bP
-Both the character and attribute parts of the background are combined with
+Both the character and attribute parts of the background combine with
 blank characters that are written into the window.
 .PP
 The background becomes a property of the character and moves with it
 through any scrolling and insert/delete line/character operations.
 .PP
 To the extent possible on a given terminal,
-the attribute part of the background is displayed as the graphic
-rendition of the character put on the screen.
+.I curses
+displays the attributes of the background
+as the graphic rendition of the character put on the screen.
 .SS "bkgrnd, wbkgrnd"
-\fB\%bkgrnd\fP and \fB\%wbkgrnd\fP set the background property of
-\fB\%stdscr\fP or the specified window and then apply this setting to
+.B \%bkgrnd
+and
+.B \%wbkgrnd
+set the background property of
+.B \%stdscr
+or the specified window and then apply this setting to
 every character cell in that window.
 .bP
 The rendition of every character in the window changes to the new
@@ -111,7 +116,7 @@ it changes to the new background character.
 .I \%ncurses
 updates the rendition of each character cell by comparing the character,
 non-color attributes,
-and colors.
+and color pair selection.
 The library applies to following procedure to each cell in the window,
 whether or not it is blank.
 .bP
@@ -123,7 +128,7 @@ if they match,
 writes the new background character to the cell.
 .bP
 .I \%ncurses
-then checks if the cell uses color,
+then checks if the cell uses color;
 that is,
 its color pair value is nonzero.
 If not,
@@ -158,19 +163,33 @@ or if color has not been initialized with \fB\%start_color\fP(3X),
 .I \%ncurses
 ignores the new background character's color attribute.
 .SS "bkgrndset, wbkgrndset"
-\fB\%bkgrndset\fP and \fB\%wbkgrndset\fP manipulate the background of
-the applicable window,
-without updating the character cells as \fB\%bkgrnd\fP and
-\fB\%wbkgrnd\fP do;
+.B \%bkgrndset
+and
+.B \%wbkgrndset
+manipulate the background of the applicable window,
+without updating the character cells as
+.B \%bkgrnd
+and
+.B \%wbkgrnd
+do;
 only future writes reflect the updated background.
 .SS "getbkgrnd, wgetbkgrnd"
-The \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP functions obtain the
-background character and attribute pair of \fB\%stdscr\fP or the
-specified window and store it via the
+.B \%getbkgrnd
+and
+.B \%wgetbkgrnd
+respectively obtain
+.BR \%stdscr 's
+or the given window's background character,
+attributes,
+and color pair,
+and store it in their
 .I wch
-pointer.
+argument.
 .SH RETURN VALUE
-\fBbkgrndset\fP and \fBwbkgrndset\fP do not return a value.
+.B \%bkgrndset
+and
+.B \%wbkgrndset
+do not return a value.
 .PP
 The other functions return
 .B ERR
@@ -178,29 +197,30 @@ upon failure and
 .B OK
 upon success.
 In
-.IR \%ncurses ,
+.IR \%ncurses ","
 failure occurs if
 .bP
-a
-.I \%WINDOW
-pointer
 .I win
-is null, or
+is
+.IR NULL ","
+or
 .bP
-a
-.I \%cchar_t
-pointer
 .I wch
-is null.
+is
+.IR NULL "."
 .SH NOTES
-\fB\%bkgrnd\fP,
-\fB\%bkgrndset\fP, and
-\fB\%getbkgrnd\fP
+.BR \%bkgrnd ","
+.BR \%bkgrndset ","
+and
+.B \%getbkgrnd
 may be implemented as macros.
 .PP
 Unlike their counterparts in the non-wide configuration of
-.IR \%ncurses ,
-\fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
+.IR \%ncurses ","
+.B \%getbkgrnd
+and
+.B \%wgetbkgrnd
+supply the background character
 and attribute in a modifiable
 .I \%cchar_t
 parameter,
@@ -211,12 +231,17 @@ Issue 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses does not provide details of how the rendition is updated.
-This implementation follows the approach used in SVr4
-.IR curses .
+.I \%ncurses
+follows the approach used in SVr4
+.IR curses 's
+non-wide functions for manipulating the window background.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
 .SH SEE ALSO
 \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
 non-wide configuration of
-.IR \%ncurses .
+.IR \%ncurses "."
 .PP
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_color.3x b/man/curs_color.3x
index bf33f6f4a..71df2838e 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp $
-.TH curs_color 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp $
+.TH curs_color 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -551,9 +551,12 @@ in the \fB\%chtype\fP data type (denoted by \fB\%A_COLOR\fP).
 .PP
 Other implementations of curses had different limits:
 .bP
-PCCurses (1987-1990) provided for only eight (8) colors.
+.I \%PCCurses
+(1987-1990) provided for only eight (8) colors.
 .bP
-PDCurses (1992-present) inherited the 8-color limitation from PCCurses,
+.I \%PDCurses
+(1992-present) inherited the 8-color limitation from
+.IR \%PCCurses ,
 but changed this to 256 in version 2.5 (2001),
 along with changing \fB\%chtype\fP from 16-bits to 32-bits.
 .bP
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index df6ff230a..010140f84 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp $
-.TH curs_delch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp $
+.TH curs_delch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -83,7 +83,7 @@ they return
 if
 .I win
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index b85c30a28..f24987340 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp $
-.TH curs_deleteln 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
+.TH curs_deleteln 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,7 +110,7 @@ In
 they fail if
 .I win
 is
-.BR NULL "."
+.IR NULL "."
 .SH NOTES
 All of these functions except
 .B \%winsdelln
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 56087beb2..a9ef525bc 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
-.TH curs_get_wch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp $
+.TH curs_get_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,7 +109,7 @@ this happens after one character is read.
 If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
-(Because the terminal's normal or \*(``cooked\*('' mode
+(Because the terminal's canonical or \*(``cooked\*('' mode
 is line-buffered,
 multiple
 .B \%wget_wch
@@ -194,7 +194,7 @@ is set to
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 3893bb95f..72dcc57ed 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp $
-.TH curs_get_wstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp $
+.TH curs_get_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -214,8 +214,12 @@ X/Open Curses does not specify what happens if the length \fIn\fP is negative.
 For analogy with \fBwgetnstr\fP,
 \fI\%ncurses\fP 6.2 uses a limit (based on \fBLINE_MAX\fP).
 .bP
-Some other implementations (such as Solaris xcurses) do the same,
-while others (PDCurses) do not allow this.
+Some other implementations (such as Solaris
+.IR xcurses )
+do the same,
+while others
+.RI \%( PDCurses )
+do not allow this.
 .bP
 NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
 treating a \fB\-1\fP as an indefinite number of characters.
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 0bc365962..853d7ad47 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp $
-.TH curs_getch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp $
+.TH curs_getch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,7 +109,7 @@ this happens after one character is read.
 If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
-(Because the terminal's normal or \*(``cooked\*('' mode
+(Because the terminal's canonical or \*(``cooked\*('' mode
 is line-buffered,
 multiple
 .B \%wgetch
@@ -478,7 +478,7 @@ or
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -558,7 +558,7 @@ Depending on the terminal mode
 (raw,
 cbreak,
 or
-\*(``cooked\*(''),
+canonical),
 and whether \fB\%nl\fP(3X) or \fB\%nonl\fP(3X) has been called,
 .B \%wgetch
 may return either a carriage return or line feed upon an Enter or Return
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 8ad2471f6..34d606f44 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp $
-.TH curs_getstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp $
+.TH curs_getstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -158,7 +158,7 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 or
 .bP
 if an internal
@@ -206,7 +206,7 @@ it also temporarily changes properties of the
 .I curses
 screen to permit simple editing of the input buffer.
 It saves the screen's state and then calls \fBnl\fP(3X) and,
-if the screen was in normal (\*(``cooked\*('') mode,
+if the screen was in canonical (\*(``cooked\*('') mode,
 \fB\%cbreak\fP(3X).
 Before returning,
 it restores the saved screen state.
@@ -304,7 +304,7 @@ some do not.
 .bP
 .I \%ncurses
 6.1 and
-.I PDCurses
+.I \%PDCurses
 do not count the null character toward the limit,
 while Solaris and NetBSD
 .I curses
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index 88bf4074a..bf95b5d5f 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp $
-.TH curs_in_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+.TH curs_in_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -80,7 +80,7 @@ they return
 if
 .I win
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index a281537d2..74ef7d147 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp $
-.TH curs_inch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp $
+.TH curs_inch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,7 +87,7 @@ return
 if
 .I win
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index a9903e880..57eef1329 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp $
-.TH curs_inchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+.TH curs_inchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,7 +69,9 @@ get a \fIcurses\fR character string from a window
 \fBint mvwinchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a NULL-terminated array of \fBchtype\fP quantities,
+These routines return a
+.IR NULL -terminated
+array of \fBchtype\fP quantities,
 starting at the current cursor position in the named window and ending at the
 right margin of the window.
 .PP
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 6ac1f2e96..b1f1a6ad4 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp $
-.TH curs_initscr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp $
+.TH curs_initscr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -363,7 +363,8 @@ using that information to delete those windows when \fB\%delscreen\fP is
 called.
 .bP
 NetBSD copied this feature of \fI\%ncurses\fP in 2001.
-PDCurses follows the SVr4 model,
+.I \%PDCurses
+follows the SVr4 model,
 deleting only the standard \fI\%WINDOW\fP structures.
 .SS "High-level versus Low-level"
 Different implementations may disagree regarding the level of some functions.
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 5ee8e95d4..9bd8cbfc0 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp $
-.TH curs_inopts 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp $
+.TH curs_inopts 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -147,7 +147,7 @@ and flow control characters are unaffected)
 and makes characters typed by the user immediately available to the
 program.
 .B \%nocbreak
-restores the terminal's normal (\*(``cooked\*('') line discipline.
+restores the terminal's canonical (\*(``cooked\*('') line discipline.
 .PP
 The state of the terminal is unknown to a
 .I curses
@@ -328,7 +328,7 @@ see \fI\%termios\fP(3).
 configures the terminal to perform this translation.
 .B nonl
 disables it.
-Under its normal (\*(``cooked\*('') line discipline,
+Under its canonical (\*(``cooked\*('') line discipline,
 the terminal driver always translates carriage returns to line feeds.
 .\"
 .SS nodelay
@@ -365,7 +365,7 @@ and
 configure the terminal driver's treatment of its input and output queues
 when it handles the interrupt,
 suspend,
-or quit characters under the normal (\*(``cooked\*('')
+or quit characters under the canonical (\*(``cooked\*('')
 or cbreak line disciplines on POSIX systems;
 see \fI\%termios\fP(3).
 The default behavior is inherited from the terminal driver settings.
@@ -412,7 +412,7 @@ depends on terminal driver configuration parameters that
 .I curses
 does not handle.
 .B \%noraw
-restores the terminal's normal (\*(``cooked\*('') line discipline.
+restores the terminal's canonical (\*(``cooked\*('') line discipline.
 .\"
 .SS "timeout, wtimeout"
 .B \%wtimeout
@@ -515,7 +515,7 @@ the terminal is not initialized or
 .bP
 .I win
 is
-.B NULL
+.I NULL
 (except for
 .B \%intrflush
 and
@@ -558,7 +558,7 @@ may be implemented as macros.
 and
 .B \%nocbreak
 follow historical practice in that they attempt to restore
-the terminal's normal (\*(``cooked\*('') line discipline
+the terminal's canonical (\*(``cooked\*('') line discipline
 from raw and cbreak,
 respectively.
 Mixing
@@ -642,7 +642,7 @@ call
 or
 .B \%noecho
 explicitly just after initialization,
-even if your program retains the terminal's normal (\*(``cooked\*('')
+even if your program retains the terminal's canonical (\*(``cooked\*('')
 line discipline.
 .PP
 X/Open Curses is ambiguous regarding whether
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 5573a769f..8735c85db 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp $
-.TH curs_ins_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
+.TH curs_ins_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -73,7 +73,7 @@ These functions return \fBOK\fP on success and \fBERR\fP on failure.
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
-.BR NULL .
+.IR NULL .
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index a2d49d1a1..e453f1497 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp $
-.TH curs_ins_wstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+.TH curs_ins_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -119,11 +119,11 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 .I wstr
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 the first wide character in
 .I wstr
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index d88a64a9e..d073fcf97 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp $
-.TH curs_insch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
+.TH curs_insch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -77,7 +77,7 @@ on failure.
 Functions taking a
 .I \%WINDOW
 pointer argument fail if the pointer is
-.BR NULL .
+.IR NULL .
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 30c4da20d..ede20deda 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp $
-.TH curs_insstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp $
+.TH curs_insstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -119,11 +119,11 @@ if
 .bP
 .I win
 is
-.BR NULL ","
+.IR NULL ","
 .bP
 .I str
 is
-.BR NULL ","
+.IR NULL ","
 or
 .bP
 an internal \fBwinsch\fP(3X) call returns
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 9a858fb48..7795a8877 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp $
-.TH curs_instr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp $
+.TH curs_instr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,12 +115,12 @@ if
 .bP
 .I win
 is
-.B NULL
+.I NULL
 or
 .bP
 .I str
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index f30ea5b9f..33fd46c23 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
-.TH curs_inwstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+.TH curs_inwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -129,12 +129,12 @@ if
 .bP
 .I win
 is
-.B NULL
+.I NULL
 or
 .bP
 .I wstr
 is
-.BR NULL "."
+.IR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 41622522f..e5ea3782b 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp $
-.TH curs_mouse 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp $
+.TH curs_mouse 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -93,10 +93,10 @@ The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
 has been successfully initialized,
 and \fBFALSE\fP otherwise.
 .PP
-Mouse events are ignored when input is in cooked mode, and
-cause an error beep when cooked mode is being simulated in a window by a
-function such as \fB\%getstr\fP that expects a linefeed for input-loop
-termination.
+Mouse events are ignored when input is in canonical (\*(``cooked\*('')
+mode, and cause an error beep when canonical mode is being simulated in
+a window by a function such as \fB\%getstr\fP that expects a linefeed
+for input-loop termination.
 .SS mousemask
 To make mouse events visible, use the \fB\%mousemask\fP function.
 This sets the mouse events to be reported.
@@ -109,7 +109,8 @@ If the screen has not been initialized,
 or if the terminal does not support mouse-events,
 this function returns 0.
 .bP
-If \fIoldmask\fP is non-\fBNULL\fP,
+If \fIoldmask\fP is
+.RI non- NULL ","
 this function fills the indicated location with the previous value of the
 current screen's mouse event mask.
 .PP
@@ -216,7 +217,9 @@ They are converted to \fB\%stdscr\fP-relative coordinates and returned
 through the pointers.
 If the conversion was successful, the function returns \fBTRUE\fP.
 .IP
-If one of the parameters was \fBNULL\fP or the location is
+If one of the parameters was
+.I NULL
+or the location is
 not inside the window, \fBFALSE\fP is returned.
 .bP
 If \fIto_screen\fP is
@@ -226,7 +229,9 @@ They are converted to window-relative coordinates if the
 window \fIwin\fP encloses this point.
 In this case the function returns \fBTRUE\fP.
 .IP
-If one of the parameters is \fBNULL\fP or the point is not inside the
+If one of the parameters is
+.I NULL
+or the point is not inside the
 window, \fBFALSE\fP is returned.
 .PP
 The referenced coordinates
@@ -483,7 +488,8 @@ Mouse events from
 .I \%xterm
 are
 .I not
-ignored in cooked mode if they have been enabled by \fB\%mousemask\fP.
+ignored in canonical mode if they have been enabled by
+\fB\%mousemask\fP.
 Instead,
 the
 .I \%xterm
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 001d5e91d..065c39c55 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp $
-.TH curs_move 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+.TH curs_move 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -88,7 +88,7 @@ In
 fails if
 .I win
 is
-.BR NULL .
+.IR NULL .
 .SH NOTES
 .B \%move
 may be implemented as a macro.
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index fa623eea1..8454d20c8 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp $
-.TH curs_opaque 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp $
+.TH curs_opaque 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -136,7 +136,9 @@ returns the delay timeout set by \fB\%wtimeout\fP(3X).
 .TP
 \fBwgetparent\fP
 returns the parent \fI\%WINDOW\fP pointer for subwindows,
-or \fBNULL\fP for windows having no parent.
+or
+.I NULL
+for windows having no parent.
 .TP
 \fBwgetscrreg\fP
 stores the the top and bottom rows for the scrolling margin set by
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 575722c32..689438182 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp $
-.TH curs_pad 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp $
+.TH curs_pad 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -179,7 +179,7 @@ upon failure and
 upon successful completion.
 .PP
 Functions that return pointers return
-.B NULL
+.I NULL
 on error,
 and set
 .I \%errno
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 0cde3da8c..96aef6a2d 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp $
-.TH curs_scr_dump 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp $
+.TH curs_scr_dump 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -198,31 +198,48 @@ SVr4 omitted the
 qualifiers.
 .PP
 SVr4 documentation describes
-.B \%scr_init
+.I \%scr_init
 such that the dump data is also considered invalid
 \*(``if the time-stamp of the tty is old\*(''
 but does not define \*(``old\*(''.
 .PP
-As of 2024, PDCurses provides these functions.
-NetBSD curses does not provide these functions,
-although it provides \fB\%getwin\fP.
+As of 2024,
+.I \%PDCurses
+provides these functions.
+NetBSD
+.I curses
+does not.
 .PP
-Other implementations of curses store the window in binary form.
-One drawback to binary form is that this makes the dump dependent upon
-the curses library's internal data structures.
-Rather than do that, ncurses stores the dump in textual form,
+Other implementations of
+.I curses
+store the window in binary form,
+which makes the dump dependent
+upon the
+.I curses
+library's internal data structures.
+.I \%ncurses
+avoids this drawback by storing the dump in textual form,
 allowing more flexible use of the data.
-For instance, SVr4 curses \fB\%scr_restore\fP requires that the
-dumped window have the same dimensions as the restored window.
-ncurses uses \fB\%wresize\fP to adjust the restored window size.
+For instance,
+the
+.I \%scr_restore
+of SVr4
+.I curses
+requires that the dumped window have the same dimensions
+as the restored window.
+.I \%ncurses
+uses its
+\fB\%wresize\fP(3X)
+extension
+to adjust the restored window size.
 .SH HISTORY
 SVr3 (1987) introduced
-.BR \%scr_dump ","
-.BR \%scr_init ","
+.IR \%scr_dump ","
+.IR \%scr_init ","
 and
-.BR \%scr_restore "."
+.IR \%scr_restore "."
 SVr3.1 added
-.BR \%scr_set "."
+.IR \%scr_set "."
 .SH SEE ALSO
 .na
 \fB\%curses\fP(3X),
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index e141d7b68..c723bf445 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp $
-.TH curs_slk 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp $
+.TH curs_slk 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -255,7 +255,9 @@ returns
 if the format parameter is outside the range 0..3.
 .TP 5
 \fBslk_label\fP
-returns \fBNULL\fP on error.
+returns
+.I NULL
+on error.
 .TP 5
 \fBslk_set\fP
 returns
@@ -343,7 +345,8 @@ If there are more than 16 elements, \fB\%slk_start\fP returns
 .bP
 The format codes \fB2\fP and \fB3\fP for \fB\%slk_init\fP
 were added by \fI\%ncurses\fP in 1996.
-PDCurses 2.4 added this feature in 2001.
+.I \%PDCurses
+2.4 added this feature in 2001.
 .PP
 The function \fB\%slk_attr\fP was added by \fI\%ncurses\fP in 1996.
 .PP
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 019522e74..f0c232e64 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp $
-.TH curs_termattrs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
+.TH curs_termattrs 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -110,7 +110,9 @@ needs complete control over the appearance of the screen.
 .SS termname
 The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
 .SH RETURN VALUE
-\fBlongname\fP and \fBtermname\fP return \fBNULL\fP on error.
+\fBlongname\fP and \fBtermname\fP return
+.I NULL
+on error.
 .PP
 Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
 (SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 03215dac3..71acd3aa8 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp $
-.TH curs_termcap 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp $
+.TH curs_termcap 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,12 +115,12 @@
 \fBchar * BC;
 \fB@NCURSES_OSPEED@ ospeed;
 .PP
-\fBint tgetent(char *\fIbp\fP, const char *\fIname\fP);
-\fBint tgetflag(const char *\fIid\fP);
-\fBint tgetnum(const char *\fIid\fP);
-\fBchar *tgetstr(const char *\fIid\fP, char **\fIarea\fP);
-\fBchar *tgoto(const char *\fIcap\fP, int \fIcol\fP, int \fIrow\fP);
-\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+\fBint tgetent(char * \fIbp\fP, const char * \fIname\fP);
+\fBint tgetflag(const char * \fIid\fP);
+\fBint tgetnum(const char * \fIid\fP);
+\fBchar * tgetstr(const char * \fIid\fP, char ** \fIarea\fP);
+\fBchar * tgoto(const char * \fIcap\fP, int \fIcol\fP, int \fIrow\fP);
+\fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
 .fi
 .SH DESCRIPTION
 .I \%ncurses
@@ -138,10 +138,10 @@ This must be done before calling any of the other functions.
 It returns
 .RS 3
 .TP 5 \" "-1" + 2n + adjust for PDF
-1
+.B 1
 on success,
 .TP
-0
+.B 0
 if there is no such entry
 (or if the matching entry describes a generic terminal,
 having too little information for
@@ -149,8 +149,10 @@ having too little information for
 applications to run),
 and
 .TP
-\-1
-if the \fI\%term\%info\fP database could not be found.
+.B \-1
+if the
+.I \%term\%info
+database could not be found.
 .RE
 .PP
 This implementation differs from those of historical \fItermcap\fP
@@ -185,7 +187,7 @@ or \-1 if it is not available.
 .PP
 \fB\%tgetstr\fP returns the string entry for \fIid\fP,
 or
-.B NULL
+.I NULL
 if it is not available.
 Use \fB\%tputs\fP to output the string returned.
 The
@@ -200,9 +202,9 @@ However,
 \fI\%ncurses\fP checks to ensure that
 .I area
 is not
-.BR NULL ,
+.IR NULL ","
 and also that the resulting buffer pointer is not
-.BR NULL .
+.IR NULL "."
 If either check fails,
 .I area
 is ignored.
@@ -264,20 +266,32 @@ availability.
 It can retrieve capabilities by either \fItermcap\fP or
 \fI\%term\%info\fP code.
 .SS "Global Variables"
-The variables
-\fBPC\fP,
-\fBUP\fP and
-\fBBC\fP
-are set by \fB\%tgetent\fP to the \fI\%term\%info\fP entry's data for
-\fB\%pad_char\fP,
-\fB\%cursor_up\fP and
-\fB\%backspace_if_not_bs\fP,
+.B \%tgetent
+sets the variables
+.BR PC ","
+.BR UP ","
+and
+.B BC
+to the
+.I \%term\%info
+entry's data for
+.BR \%pad_char ","
+.BR \%cursor_up ","
+and
+.BR \%backspace_if_not_bs ","
 respectively.
-\fBUP\fP is not used by \fI\%ncurses\fP.
-\fBPC\fP is used by \fB\%delay_output\fP(3X).
-\fBBC\fP is used by \fB\%tgoto\fP emulation.
-The variable \fB\%ospeed\fP is set by \fI\%ncurses\fP using a
-system-specific encoding to indicate the terminal's data rate.
+\fBUP\fP is not used by
+.IR \%ncurses "."
+.B PC
+is used by \fB\%delay_output\fP(3X).
+.B BC
+is used by
+.B \%tgoto
+emulation.
+.I \%ncurses
+assigns the variable
+.B \%ospeed
+a system-specific value to encode the terminal's data rate.
 .SS "Releasing Memory"
 The \fItermcap\fP functions provide no means of freeing memory,
 because legacy \fItermcap\fP implementations used only the buffer
@@ -318,7 +332,7 @@ and
 are documented above.
 .PP
 \fB\%tgoto\fP returns
-.B NULL
+.I NULL
 on error.
 Error conditions include:
 .bP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 6dcfc8b8d..9ca87c71b 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp $
-.TH curs_terminfo 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp $
+.TH curs_terminfo 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,7 +70,7 @@
 \fB#include <curses.h>
 \fB#include <term.h>
 .PP
-\fBTERMINAL *cur_term;
+\fBTERMINAL * cur_term;
 .PP
 \fBconst char * const boolnames[];
 \fBconst char * const boolcodes[];
@@ -82,35 +82,38 @@
 \fBconst char * const strcodes[];
 \fBconst char * const strfnames[];
 .PP
-\fBint setupterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
-\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fP);
-\fBint del_curterm(TERMINAL *\fIoterm\fP);
-\fBint restartterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+\fBint setupterm(const char * \fIterm\fP, int \fIfiledes\fP, int * \fIerrret\fP);
+\fBTERMINAL * set_curterm(TERMINAL * \fInterm\fP);
+\fBint del_curterm(TERMINAL * \fIoterm\fP);
+\fBint restartterm(const char * \fIterm\fP, int \fIfiledes\fP,
+      int * \fIerrret\fP);
 .PP
-\fBchar *tparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
+\fBchar * tparm(const char * \fIstr\fP, \fR.\|.\|.\fP);
 	\fI/* or */
-\fBchar *tparm(const char *\fIstr\fP, long \fIp1\fP \fR.\|.\|.\fP \fBlong\fP \fIp9\fP);
+\fBchar * tparm(const char * \fIstr\fP, long \fIp1\fP \fR.\|.\|.\fP \fBlong\fP \fIp9\fP);
 .PP
-\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
-\fBint putp(const char *\fIstr\fP);
+\fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
+\fBint putp(const char * \fIstr\fP);
 .PP
-\fBint vidputs(chtype \fIattrs\fP, int (*\fIputc\fP)(int));
+\fBint vidputs(chtype \fIattrs\fP, int (* \fIputc\fP)(int));
 \fBint vidattr(chtype \fIattrs\fP);
-\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP, int (*\fIputc\fP)(int));
-\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
+\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP,
+      int (* \fIputc\fP)(int));
+\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
 .PP
-\fBint tigetflag(const char *\fIcap-code\fP);
-\fBint tigetnum(const char *\fIcap-code\fP);
-\fBchar *tigetstr(const char *\fIcap-code\fP);
+\fBint tigetflag(const char * \fIcap-code\fP);
+\fBint tigetnum(const char * \fIcap-code\fP);
+\fBchar * tigetstr(const char * \fIcap-code\fP);
 .PP
-\fBchar *tiparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
+\fBchar * tiparm(const char * \fIstr\fP, \fR.\|.\|.\fP);
 .PP
 \fI/* extensions */
-\fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, ...);
-\fBint tiscan_s(int *\fIexpected\fP, int *\fImask\fP, const char *\fIstr\fP);
+\fBchar * tiparm_s(int \fIexpected\fP, int \fImask\fP,
+      const char * \fIstr\fP, .\|.\|.);
+\fBint tiscan_s(int * \fIexpected\fP, int * \fImask\fP, const char * \fIstr\fP);
 .PP
 \fI/* deprecated */
-\fBint setterm(const char *\fIterm\fP);
+\fBint setterm(const char * \fIterm\fP);
 .fi
 .SH DESCRIPTION
 These low-level functions must be called by programs that deal directly
@@ -131,92 +134,75 @@ Capability names and codes use the POSIX portable character set.
 Capability string values have no associated encoding;
 they are strings of 8-bit characters.
 .SS Initialization
-Initially,
-\fB\%setupterm\fP should be called.
-The high-level
-.I curses
-functions \fB\%initscr\fP and \fB\%newterm\fP call \fB\%setupterm\fP to
-initialize the low-level set of terminal-dependent variables listed in
+Call
+.B \%setupterm
+from your application to have
+.I \%term\%info
+manage the terminal device;
+this action initializes the terminal-dependent variables listed in
 \fB\%term_variables\fP(3X).
-.PP
-Applications can use the terminal capabilities either directly
-(via header definitions),
-or by special functions.
-The header files
-.I \%curses.h
-and
-.I \%term.h
-should be included
-(in that order)
-to get the definitions for these strings,
-numbers,
-and flags.
-.PP
-The
+(A
+.I curses
+application calling \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) achieves
+the same result.)
+Applications can use the terminal capabilities either directly,
+by object definitions corresponding to capability names and codes
+(see \fB\%term_variables\fP(3X))
+or by calling the functions documented here.
+.B \%setupterm
+initializes the
 .I \%term\%info
 variables
 .B \%lines
 and
 .B \%columns
-are initialized by \fB\%setupterm\fP as follows.
-.bP
-If \fB\%use_env(FALSE)\fP has been called,
-values for
-.B \%lines
-and
-.B \%columns
-specified in
-.I \%term\%info
-are used.
-.bP
-Otherwise,
-if the environment variables
-.I LINES
-and
-.I \%COLUMNS
-exist,
-their values are used.
-If these environment variables do not exist and the program is running
-in a window,
-the current window size
-is used.
-Otherwise,
-if the environment variables do not exist,
-the values for
-.B \%lines
-and
-.B \%columns
-specified in the
-.I \%term\%info
-database are used.
+as described in \fB\%use_env\fP(3X).
 .PP
-Parameterized strings should be passed through \fB\%tparm\fP to
-instantiate them.
+Pass parameterized string capability values through
+.B \%tparm
+to instantiate them.
 All
 .I \%term\%info
 strings
-(including the output of \fB\%tparm\fP)
-should be sent to the terminal device with \fB\%tputs\fP or
-\fB\%putp\fP.
-Call \fB\%reset_shell_mode\fP to restore the terminal modes before
-exiting;
-see \fB\%curs_kernel\fP(3X).
+(including the output of
+.BR \%tparm ")"
+should be sent to the terminal device with
+.B \%tputs
+or
+.BR \%putp "."
+Call
+\fB\%reset_shell_mode\fP(3X) to restore the terminal modes before
+exiting.
+(A
+.I curses
+application calling \fB\%endwin\fP(3X) achieves the same result.)
+.\" XXX: What should a "pure" terminfo application that wants to link
+.\" only with libtinfo, and not libcurses, do?
 .PP
-Programs that use
-cursor addressing should
+Programs that use cursor addressing should emit certain capabilities
+at specific times.
+Specifically,
+output
 .bP
-output \fB\%enter_ca_mode\fP upon startup and
+.B \%enter_ca_mode
+upon startup,
+and
 .bP
-output \fB\%exit_ca_mode\fP before exiting.
+.B \%exit_ca_mode
+before exiting.
 .PP
 Programs that execute shell subprocesses should
 .bP
-call \fB\%reset_shell_mode\fP and
-output \fB\%exit_ca_mode\fP before the shell
-is called and
+call \fB\%reset_shell_mode\fP(3X) and output
+.B \%exit_ca_mode
+before the shell is called,
+and
 .bP
-output \fB\%enter_ca_mode\fP and
-call \fB\%reset_prog_mode\fP after returning from the shell.
+output
+.B \%enter_ca_mode
+and call \fB\%reset_prog_mode\fP(3X) after returning from the shell.
+.\" XXX: What should a "pure" terminfo application that wants to link
+.\" only with libtinfo, and not libcurses, do?
 .PP
 \fB\%setupterm\fP reads in the
 .I \%term\%info
@@ -259,7 +245,9 @@ the caller.
 If
 .I errret
 is not null,
-then \fB\%setupterm\fP returns
+then
+.B \%setupterm
+returns
 .B OK
 or
 .B ERR
@@ -281,13 +269,12 @@ examine
 .RS
 .TP 5
 .B 1
-means that the terminal is hardcopy,
+means that the terminal is a hard-copy type
+(lacks destructive backspace),
 and cannot be used for
 .I curses
 applications.
-.IP
-\fB\%setupterm\fP determines if the entry is a hardcopy type by
-checking the
+The library determines this fact by checking the terminal type's
 .B \%hardcopy
 .RB ( hc )
 capability.
@@ -299,8 +286,8 @@ having too little information for
 .I curses
 applications to run.
 .IP
-\fB\%setupterm\fP determines if the entry is a generic type by
-checking the
+.B \%setupterm
+determines if the entry is a generic type by checking the
 .B \%generic_type
 .RB ( gn )
 capability.
@@ -314,19 +301,19 @@ database could not be found.
 If
 .I errret
 is null,
-\fB\%setupterm\fP reports an error message upon finding an error and
-exits.
+.B \%setupterm
+reports an error message upon finding an error and exits.
 Thus,
 the simplest call is:
 .RS
 .IP
 .EX
-setupterm((char *)0, 1, (int *)0);
+setupterm((char *) NULL, 1, (int *) NULL);
 .EE
 .RE
 .IP
 which uses all the defaults and sends the output to
-.BR stdout .
+.IR stdout .
 .RE
 .\" ********************************************************************
 .SS "The Terminal State"
@@ -366,10 +353,10 @@ It returns the old value of
 .PP
 .B \%del_curterm
 frees the memory pointed to by
-.BR \%oterm ","
+.IR \%oterm ","
 making it available for further use.
 If
-.B \%oterm
+.I \%oterm
 is
 the same as
 .BR \%cur_term ","
@@ -460,7 +447,8 @@ formatting capability to see what the
 library would assume.
 .\" ********************************************************************
 .SS "Output Functions"
-String capabilities can contain padding information,
+String capabilities can contain
+.IR padding ,
 a time delay
 (accommodating performance limitations of hardware terminals)
 expressed as \fB$<\fIn\fB>\fR,
@@ -504,7 +492,7 @@ routing any resulting padding characters through this function.
 .IB str ", 1, putchar)\c"
 \*(''.
 The output of \fB\%putp\fP always goes to
-.BR stdout ,
+.IR stdout ,
 rather than the
 .I \%file\%des
 specified in \fB\%setupterm\fP.
@@ -577,9 +565,8 @@ such as
 passed to them.
 The
 .I cap-code
-for each capability is given in the table column entitled
-.I cap-code
-code in the capabilities section of \fB\%terminfo\fP(5).
+for each capability is given in the table column of that name
+in the \*(``Predefined Capabilities\*('' section of \fB\%terminfo\fP(5).
 .PP
 These functions return special values to denote errors.
 .PP
@@ -613,7 +600,7 @@ if
 is not a string capability,
 or
 .TP
-.B 0
+.B NULL
 if it is canceled or absent from the terminal description.
 .\" ********************************************************************
 .SS "Terminal Capability Names"
@@ -644,11 +631,11 @@ terminal description.
 As a side effect,
 it sets \fB\%cur_term\fP to point to this memory.
 If an application calls
-.IP
+.RS
 .EX
 del_curterm(cur_term);
 .EE
-.PP
+.RE
 the memory will be freed.
 .PP
 The formatting functions \fB\%tparm\fP and \fB\%tiparm\fP extend the
@@ -703,7 +690,7 @@ or create the initial windows
 .RB \%( stdscr ,
 .BR \%curscr ,
 and
-.BR \%newscr )
+.BR \%newscr ).
 Other error conditions are documented above.
 .TP 5
 .B tparm
@@ -758,46 +745,69 @@ which overrides the
 argument.
 .\" ********************************************************************
 .SH PORTABILITY
-\fB\%setterm\fP is not described by X/Open and must be considered
-non-portable.
+.I \%setterm
+is not described by X/Open and must be considered non-portable.
 All other functions are as described by X/Open.
+.SS "Header Files"
+On legacy
+.I curses
+systems,
+include
+.I \%curses.h
+and
+.I \%term.h
+in that order
+to get the definitions for these strings,
+numbers,
+and flags.
 .SS "Compatibility Macros"
 This implementation provides a few macros for compatibility with systems
 before SVr4
 (see section \*(``HISTORY\*('' below).
 They include
-\fB\%Bcrmode\fP,
-\fB\%Bfixterm\fP,
-\fB\%Bgettmode\fP,
-\fB\%Bnocrmode\fP,
-\fB\%Bresetterm\fP,
-\fB\%Bsaveterm\fP,
-and
-\fB\%Bsetterm\fP.
+.IR \%Bcrmode ","
+.IR \%Bfixterm ","
+.IR \%Bgettmode ","
+.IR \%Bnocrmode ","
+.IR \%Bresetterm ","
+.IR \%Bsaveterm ","
+and"
+.IR \%Bsetterm "."
+.I \%ncurses
+implements each of these symbols as macros for BSD
+.I curses
+compatibility.
 .PP
 In SVr4,
 these are found in
 .IR \%curses.h ,
-but except for \fB\%setterm\fP,
+but except for
+.IR \%setterm ","
 are likewise macros.
 The one function,
-\fB\%setterm\fP,
+.IR \%setterm ","
 is mentioned in the manual page.
-It further notes that \fB\%setterm\fP was replaced by \fB\%setupterm\fP,
+It further notes that
+.I \%setterm
+was replaced by
+.IR \%setupterm ","
 stating that the call
 .RS
 .EX
-setupterm(\fIterm\fP, 1, (int *)0)
+.BI setupterm( term ", 1, (int *)0)"
 .EE
 .RE
-provides the same functionality as \fB\%setterm(\fIterm\fB)\fR,
-discouraging the latter for new programs.
-.I \%ncurses
-implements each of these symbols as macros for BSD
-.I curses
-compatibility.
+provides the same functionality as
+.RS
+.EX
+.BI setterm( term )
+.EE
+.RE
+and discouraging the latter for new programs.
 .SS "Legacy Data"
-\fB\%setupterm\fP copies the terminal name to the array \fB\%ttytype\fP.
+.I \%setupterm
+copies the terminal name to the array
+.IR \%ttytype "."
 This is not part of X/Open Curses,
 but is assumed by some applications.
 .PP
@@ -810,9 +820,15 @@ as defined by
 .RB \%\*(`` "@TIC@ \-x" \*('',
 are not stored in the arrays described here.
 .SS "Output Buffering"
-Older versions of \fI\%ncurses\fP assumed that the file descriptor
-passed to \fB\%setupterm\fP from \fB\%initscr\fP or \fB\%newterm\fP uses
-buffered I/O,
+Older versions of
+.I \%ncurses
+assumed that the file descriptor passed to
+.I \%setupterm
+from
+.I \%initscr
+or
+.I \%newterm
+uses buffered I/O,
 and would write to the corresponding stream.
 In addition to the limitation that the terminal was left in
 block-buffered mode on exit
@@ -823,7 +839,8 @@ it was problematic because
 did not allow a reliable way to clean up on receiving
 .BR SIGTSTP .
 .PP
-The current version (ncurses6)
+.I \%ncurses
+.RI 6. x
 uses output buffers managed directly by
 .IR \%ncurses .
 Some of the low-level functions described in this manual page write
@@ -844,7 +861,8 @@ X/Open Curses uses
 .I \%const
 less effectively than a later design might,
 sometimes applying it needlessly to values that are already constant,
-and in most cases overlooking parameters that normally would use
+and in most cases overlooking parameters that normally would benefit
+from
 .IR \%const .
 Passing
 .IR \%const -qualified
@@ -852,7 +870,7 @@ parameters to functions that do not declare them
 .I \%const
 may prevent the program from compiling.
 On the other hand,
-\*(``writable strings\*('' are an obsolescent feature.
+\*(``writable strings\*('' are an obsolescent C language feature.
 .IP
 As an extension,
 this implementation can be configured to change the function prototypes
@@ -863,8 +881,9 @@ The
 .I \%ncurses
 ABI 6 enables this feature by default.
 .bP
-X/Open Curses prototypes \fB\%tparm\fP with a fixed number of
-parameters,
+X/Open Curses prototypes
+.I \%tparm
+with a fixed number of parameters,
 rather than a variable argument list.
 .IP
 This implementation uses a variable argument list,
@@ -873,31 +892,43 @@ Portable applications should provide nine parameters after the format;
 zeroes are fine for this purpose.
 .IP
 In response to review comments by Thomas E. Dickey,
-X/Open Curses Issue 7 proposed the \fB\%tiparm\fP function in mid-2009.
+X/Open Curses Issue 7 proposed the
+.I \%tiparm
+function in mid-2009.
 .IP
-While \fB\%tiparm\fP is always provided in \fI\%ncurses\fP,
-the older form is only available as a build-time configuration option.
+While
+.I \%tiparm
+is always provided in
+.IR \%ncurses ","
+the older form is available only as a build-time configuration option.
 If not specially configured,
-\fB\%tparm\fP is the same as \fB\%tiparm\fP.
+.I \%tparm
+is the same as
+.IR \%tiparm "."
 .PP
-Both forms of \fB\%tparm\fP have drawbacks:
+Both forms of
+.I \%tparm
+have drawbacks.
 .bP
-Most of the calls to \fB\%tparm\fP use only one or two parameters.
+Most calls to
+.I \%tparm
+require only one or two parameters.
 Passing nine on each call is awkward.
 .IP
 Using
 .I long
 for the numeric parameter type is a workaround to make the parameter use
-the same amount of stack as a pointer.
-That approach dates back to the mid-1980s,
+the same amount of stack memory as a pointer.
+That approach dates to the mid-1980s,
 before C was standardized.
-Since then,
-there is a standard
-(and pointers are not required to fit in a
+Since ANSI\ C (1989),
+C language standards do not require a pointer to fit in a
 .IR long ).
 .bP
 Providing the right number of parameters for a variadic function
-such as \fB\%tiparm\fP can be a problem,
+such as
+.I \%tiparm
+can be a problem,
 in particular for string parameters.
 However,
 only a few
@@ -906,23 +937,33 @@ capabilities use string parameters
 (for instance,
 the ones used for programmable function keys).
 .IP
-The \fI\%ncurses\fP library checks usage of these capabilities,
+The
+.I \%ncurses
+library checks usage of these capabilities,
 and returns
 .B ERR
 if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
-places for the \fB\%tparm\fP calls.
+places for the
+.I \%tparm
+calls.
 .IP
-The \fB\%@TPUT@\fR(1) program checks its use of these capabilities with
-a table,
-so that it calls \fB\%tparm\fP correctly.
+.IR \%ncurses 's
+\fB\%@TPUT@\fR(1) checks its use of these capabilities with a table,
+so that it calls
+.I \%tparm
+correctly.
 .SS "Special \fITERM\fP treatment"
-If configured to use the terminal driver,
+If
+.I \%ncurses
+is configured to use the terminal driver,
 .\" XXX: as opposed to the Unix terminal driver, termio(s)?
 as with the MinGW port,
 .bP
-\fB\%setupterm\fP interprets a missing/empty \fITERM\fP variable as the
-special value \*(``unknown\*(''.
+.B \%setupterm
+interprets a missing/empty
+.I TERM
+variable as the special value \*(``unknown\*(''.
 .IP
 SVr4
 .I curses
@@ -936,9 +977,12 @@ capability,
 while the latter does not.
 A generic terminal is unsuitable for full-screen applications.
 .bP
-\fB\%setupterm\fP allows explicit use of the
-the windows console driver by checking if \fB$TERM\fP is set to
-\*(``#win32con\*('' or an abbreviation of that string.
+.B \%setupterm
+allows explicit use of the Microsoft Windows console driver by checking
+whether the
+.I TERM
+environment variable has the value \*(``#win32con\*(''
+or an abbreviation of that string.
 .SS "Other Portability Issues"
 In SVr4,
 .I \%set_curterm
@@ -953,10 +997,12 @@ In SVr4,
 the third argument of
 .I \%tputs
 has the type
-.RB \*(`` "int (*putc)(char)" \*(''.
+.RB \*(`` "int (*)(char)" \*(''.
 .PP
-At least one implementation of X/Open Curses (Solaris) returns a value
-other than
+At least one implementation of X/Open Curses
+(Solaris
+.IR \%xcurses ")"
+returns a value other than
 .B OK
 or
 .B ERR
@@ -973,13 +1019,13 @@ Its programming manual mentioned the following low-level functions.
 .PP
 .TS
 lB lB
-lB lx.
+lI lx.
 Function	Description
 _
 fixterm	restore terminal to \*(``in \fIcurses\fP\*('' state
 gettmode	establish current terminal modes
 mvcur	low level cursor motion
-putp	use \fBtputs\fP to send characters via \fIputchar\fP
+putp	use \fItputs\fP to send characters via \fIputchar\fP
 resetterm	set terminal modes to \*(``out of \fIcurses\fP\*(''\
  state
 resetty	reset terminal flags to stored value
@@ -989,7 +1035,7 @@ setterm	establish terminal with given type
 setupterm	establish terminal with given type
 tparm	interpolate parameters into string capability
 tputs	apply padding information to a string
-vidattr	like \fBvidputs\fP, but output through \fIputchar\fP
+vidattr	like \fIvidputs\fP, but output through \fIputchar\fP
 vidputs	T{
 write string to terminal, applying specified attributes
 T}
@@ -1003,7 +1049,7 @@ compatibility
 .PP
 .TS
 lB lB
-lB lx.
+lI lx.
 Function	Description
 _
 tgetent	look up \fItermcap\fP entry for given \fIname\fP
@@ -1020,7 +1066,8 @@ Early
 .I \%term\%info
 programs obtained capability values from the
 .I \%TERMINAL
-structure initialized by \fB\%setupterm\fP.
+structure initialized by
+.IR \%setupterm "."
 .PP
 SVr3 (1987) extended
 .I \%term\%info
@@ -1028,12 +1075,15 @@ by adding functions to retrieve capability values
 (like the
 .I termcap
 interface),
-and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
+and reusing
+.I \%tgoto
+and
+.IR \%tputs "."
 .PP
 .ne 4v
 .TS
 lB lB
-lB lx.
+lI lx.
 Function	Description
 _
 tigetflag	get Boolean entry for given \fIid\fP
@@ -1050,32 +1100,39 @@ documenting them as obsolete.
 .PP
 .TS
 lB lB
-l  lx.
+lI lIx.
 Function	Replaced by
 _
 crmode	cbreak
 fixterm	reset_prog_mode
-gettmode	\fIn/a\fP
+gettmode	\fRn/a\fP
 nocrmode	nocbreak
 resetterm	reset_shell_mode
 saveterm	def_prog_mode
 setterm	setupterm
 .TE
 .PP
-SVr3 kept the \fB\%mvcur\fP,
-\fB\%vidattr\fP,
-and \fB\%vidputs\fP functions,
-along with \fB\%putp\fP,
-\fB\%tparm\fP,
-and \fB\%tputs\fP.
+SVr3 kept the
+.IR \%mvcur ","
+.IR \%vidattr ","
+and
+.I \%vidputs
+functions,
+along with
+.IR \%putp ","
+.IR \%tparm ","
+and
+.IR \%tputs "."
 The latter were needed to support padding,
-and to handle capabilities accessed by functions such as \fB\%vidattr\fP
-(which used more than the two parameters supported by \fB\%tgoto\fP).
+and to handle capabilities accessed by functions such as
+.I \%vidattr
+(which used more than the two parameters supported by
+.IR \%tgoto ")."
 .PP
 SVr3 introduced the functions for switching between terminal
 descriptions;
 for example,
-\fB\%set_curterm\fP.
+.IR \%set_curterm "."
 Some changes reflected incremental improvements to the SVr2 library.
 .bP
 The
@@ -1085,11 +1142,16 @@ for the
 .I term
 structure provided in SVr2.
 .bP
-Various global variables such as \fB\%boolnames\fP were mentioned
-in the programming manual at this point,
+Various global variables such as
+.I \%boolnames
+were mentioned in the programming manual at this point,
 though the variables had been provided in SVr2.
 .PP
-SVr4 (1989) added the \fB\%vid_attr\fP and \fB\%vid_puts\fP functions.
+SVr4 (1989) added the
+.I \%vid_attr
+and
+.I \%vid_puts
+functions.
 .PP
 Other low-level functions are declared in the
 .I curses
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 1c8dadbd8..4d49d279b 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp $
-.TH curs_touch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp $
+.TH curs_touch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -114,7 +114,8 @@ The Solaris \fIcurses\fP header file,
 for instance, defines both an actual function and macro for each.
 The macros give the same result as the actual functions.
 SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
-that it is not \fBNULL\fP;
+that it is not
+.IR NULL ";"
 otherwise this implementation behaves the same as SVr4.
 .PP
 X/Open Curses, Issue 4 describes these functions.
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index ddae79112..19e5d49bf 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp $
-.TH curs_trace 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp $
+.TH curs_trace 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -264,13 +264,15 @@ if \fBDEBUG\fP was defined when building the library.
 .IP
 The SVr4 tracing feature is undocumented.
 .bP
-PDCurses provides \fBtraceon\fP and \fBtraceoff\fP,
+.I \%PDCurses
+provides \fBtraceon\fP and \fBtraceoff\fP,
 which (like SVr4) are always available,
 and enable tracing
 to the \*(``trace\*('' file
 only when a debug-library is built.
 .IP
-PDCurses has a short description of these functions,
+.I \%PDCurses
+has a short description of these functions,
 with a note that they are not present in X/Open Curses,
 \fI\%ncurses\fP or NetBSD.
 It does not mention SVr4,
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 8894f23ad..e34b76350 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp $
-.TH curs_util 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp $
+.TH curs_util 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -308,7 +308,9 @@ return \fBERR\fP upon failure and \fBOK\fP
 (SVr4 specifies only "an integer value other than \fBERR\fP")
 upon successful completion.
 .PP
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 .PP
 In this implementation
 .RS 3
@@ -386,8 +388,12 @@ there are no such functions in the 4.3BSD curses sources.
 .bP
 Most implementations simply dump the binary \fI\%WINDOW\fP structure
 to the file.
-These include SVr4 curses,
-NetBSD and PDCurses,
+These include SVr4
+.IR curses ,
+NetBSD
+.IR curses ,
+and
+.IR \%PDCurses ,
 as well as older \fI\%ncurses\fP versions.
 This implementation
 (as well as the X/Open variant of Solaris curses,
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 4920de461..f8d7ba356 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp $
-.TH curs_window 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp $
+.TH curs_window 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%newwin\fP,
 \fB\%delwin\fP,
@@ -163,7 +163,9 @@ Routines that return an integer return the integer \fBERR\fP upon failure and
 \fBOK\fP (SVr4 only specifies "an integer value other than \fBERR\fP") upon
 successful completion.
 .PP
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 .PP
 X/Open defines no error conditions.
 In this implementation
diff --git a/man/define_key.3x b/man/define_key.3x
index 0042d8de5..a64c9a06e 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp $
-.TH define_key 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
+.TH define_key 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -71,7 +71,7 @@ database entry for the terminal type.
 A
 .I definition
 of
-.B NULL
+.I NULL
 removes any existing binding from
 .IR key-code "."
 Similarly,
@@ -88,7 +88,7 @@ if
 .bP
 .I definition
 is
-.B NULL
+.I NULL
 and
 .I key-code
 is nonpositive,
diff --git a/man/form.3x b/man/form.3x
index b17e41f7c..bef63a2bf 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp $
-.TH form 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form.3x,v 1.58 2024/12/28 21:26:21 tom Exp $
+.TH form 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,7 +79,9 @@ The \fBform\fP library maintains a default value for field attributes.
 You
 can get or set this default by calling the appropriate \fBset_\fP
 or retrieval
-routine with a \fBNULL\fP field pointer.
+routine with a
+.I NULL
+field pointer.
 Changing this default with a
 \fBset_\fP function affects future field creations, but does not change the
 rendering of fields already created.
@@ -173,7 +175,9 @@ unfocus_current_field	\fBform_page\fP(3X)*
 unpost_form	\fBform_post\fP(3X)
 .TE
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error,
+Routines that return pointers return
+.I NULL
+on error,
 and set \fBerrno\fP to the corresponding error-code returned by functions
 returning an integer.
 Routines that return
diff --git a/man/form_field.3x b/man/form_field.3x
index 9799d0c0c..700a97cd4 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH form_field 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
+.TH form_field 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
@@ -44,7 +44,8 @@ make and break connections between fields and forms
 .fi
 .SH DESCRIPTION
 The function \fBset_form_fields\fP changes the field pointer array of
-the given \fIform\fP.  The array must be terminated by a \fBNULL\fP.
+the given \fIform\fP.  The array must be terminated by a
+.IR NULL "."
 .PP
 The function \fBform_fields\fP returns the field array of the given form.
 .PP
@@ -53,11 +54,13 @@ The function \fBfield_count\fP returns the count of fields in \fIform\fP.
 The function \fBmove_field\fP moves the given field (which must be disconnected)
 to a specified location on the screen.
 .SH RETURN VALUE
-The function \fBform_fields\fP returns a pointer (which may be \fBNULL\fP).
+The function \fBform_fields\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
-The function \fBfield_count\fP returns \fBERR\fP if the \fIform\fP parameter
-is \fBNULL\fP.
+The function \fBfield_count\fP returns \fBERR\fP if the \fIform\fP
+parameter is
+.IR NULL "."
 .PP
 The functions \fBset_form_fields\fP and \fBmove_field\fP return one of
 the following codes on error:
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index ba176d3e1..020ce41c2 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
-.TH form_field_buffer 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_buffer.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
+.TH form_field_buffer 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,7 +104,9 @@ is set to a nonzero value whenever the field changes.
 The function \fBset_max_field\fP sets the maximum size for a dynamic field.
 An argument of 0 turns off any maximum size threshold for that field.
 .SH RETURN VALUE
-The \fBfield_buffer\fP function returns NULL on error.
+The \fBfield_buffer\fP function returns
+.I NULL
+on error.
 It sets \fBerrno\fP according to their success:
 .TP 5
 .B E_OK
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 9cf08adb5..fdf1ff558 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp $
-.TH form_field_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_new.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
+.TH form_field_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_field\fP,
 \fBdup_field\fP,
@@ -66,7 +66,8 @@ Attribute data is separate.
 The function \fBfree_field\fP de-allocates storage associated with a field.
 .SH RETURN VALUE
 The functions \fBnew_field\fP, \fBdup_field\fP, \fBlink_field\fP return
-\fBNULL\fP on error.
+.I NULL
+on error.
 They set \fBerrno\fP according to their success:
 .TP 5
 .B E_OK
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 6eea09201..ef511e59f 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp $
-.TH form_field_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_userptr.3x,v 1.32 2024/12/28 21:26:21 tom Exp $
+.TH form_field_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_field_userptr\fP,
 \fBfield_userptr\fP \-
@@ -46,7 +46,8 @@ Every form field has a field that can be used to hold application-specific data
 These functions get and set
 that field.
 .SH RETURN VALUE
-The function \fBfield_userptr\fP returns a pointer (which may be \fBNULL\fP).
+The function \fBfield_userptr\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_field_userptr\fP returns \fBE_OK\fP (success).
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index 54fa2a72a..f85c4cadf 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp $
-.TH form_field_validation 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp $
+.TH form_field_validation 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -187,7 +187,9 @@ The address itself is not validated.
 This is an \fI\%ncurses\fP extension;
 this field type may not be available in other curses implementations.
 .SH RETURN VALUE
-The functions \fBfield_type\fP and \fBfield_arg\fP return \fBNULL\fP on error.
+The functions \fBfield_type\fP and \fBfield_arg\fP return
+.I NULL
+on error.
 The function \fBset_field_type\fP returns one of the following:
 .TP 5
 .B E_OK
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 81a58b1d8..35b9dd42c 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH form_fieldtype 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+.TH form_fieldtype 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -102,7 +102,9 @@ This function may be used by applications to copy argument-blocks.
 Frees an argument-block structure.
 .PP
 You must supply the \fImake_arg\fP function.
-The other two are optional: you may supply NULL for them.
+The other two are optional: you may supply
+.I NULL
+for them.
 In this case, the form library assumes
 that \fImake_arg\fP does not allocate memory but simply loads the
 argument into a single scalar value.
diff --git a/man/form_hook.3x b/man/form_hook.3x
index d93d8d875..f75b85ecd 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
-.TH form_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_hook.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
+.TH form_hook 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
@@ -55,28 +55,35 @@ points in the automatic processing of input event codes by \fBform_driver\fP.
 sets a hook to be called at form-post time
 and each time the selected field changes (after the change).
 .SS field_init
-returns the current field init hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current field init hook, if any
+.RI ( NULL
+if there is no such hook).
 .SS set_field_term
 sets a hook to be called at form-unpost time
 and each time the selected field changes (before the change).
 .SS field_term
-returns the current field term hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current field term hook, if any
+.RI ( NULL
+if there is no such hook).
 .SS set_form_init
 sets a hook to be called at form-post time and
 just after a page change once it is posted.
 .SS form_init
 returns the current form init hook,
-if any (\fBNULL\fP if there is no such hook).
+if any
+.RI ( NULL
+if there is no such hook).
 .SS set_form_term
 sets a hook to be called at form-unpost time
 and just before a page change once it is posted.
 .SS form_term
-returns the current form term hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current form term hook, if any
+.RI ( NULL
+if there is no such hook).
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 Other routines
 return one of the following:
 .TP 5
diff --git a/man/form_new.3x b/man/form_new.3x
index dc45e183f..0fd4a0210 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
-.TH form_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_new.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
+.TH form_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_form\fP,
 \fBfree_form\fP \-
@@ -42,12 +42,15 @@ create and destroy forms
 .fi
 .SH DESCRIPTION
 The function \fBnew_form\fP creates a new form connected to a specified field
-pointer array (which must be \fBNULL\fP-terminated).
+pointer array (which must be
+.IR NULL -terminated).
 .PP
 The function \fBfree_form\fP disconnects \fIform\fP from its field array
 and frees the storage allocated for the form.
 .SH RETURN VALUE
-The function \fBnew_form\fP returns \fBNULL\fP on error.
+The function \fBnew_form\fP returns
+.I NULL
+on error.
 It sets \fBerrno\fP according to the function's success:
 .TP 5
 .B E_OK
diff --git a/man/form_page.3x b/man/form_page.3x
index fa538c620..47f60a7bd 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
-.TH form_page 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_page.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
+.TH form_page 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_page\fP \-
 set and get form page number
@@ -52,7 +52,9 @@ form; \fBcurrent_field\fP returns the current field of the given form.
 .PP
 The function \fBunfocus_current_field\fP removes the focus from the current
 field of the form.
-In such state, inquiries via \fBcurrent_field\fP shall return a NULL pointer.
+In such state, inquiries via \fBcurrent_field\fP shall return a
+.I NULL
+pointer.
 .PP
 The function \fBset_form_page\fP sets the form's page number (goes to page
 \fIn\fP of the form).
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 4075ea73c..27c897c96 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH form_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_requestname.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+.TH form_requestname 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_request_by_name\fP,
 \fBform_request_name\fP \-
@@ -47,7 +47,9 @@ The function \fBform_request_by_name\fP searches in the name-table for a request
 with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE
-\fBform_request_name\fP returns \fBNULL\fP on error and sets \fBerrno\fP
+\fBform_request_name\fP returns
+.I NULL
+on error and sets \fBerrno\fP
 to \fBE_BAD_ARGUMENT\fP.
 .PP
 \fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 11c990c00..b4f5d576a 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH form_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_userptr.3x,v 1.38 2024/12/28 21:26:21 tom Exp $
+.TH form_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_form_userptr\fP,
 \fBform_userptr\fP \-
@@ -45,7 +45,8 @@ Every form and every form item has a field that can be used to hold
 application-specific data (that is, the form-driver code leaves it alone).
 These functions get and set the form user pointer field.
 .SH RETURN VALUE
-The function \fBform_userptr\fP returns a pointer (which may be \fBNULL\fP).
+The function \fBform_userptr\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_form_userptr\fP returns \fBE_OK\fP (success).
diff --git a/man/form_win.3x b/man/form_win.3x
index 4a75b294c..ef6b27cfb 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH form_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_win.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+.TH form_win 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
@@ -54,14 +54,20 @@ The first four functions get and set those windows.
 It is not necessary to set
 either window; by default, the driver code uses \fBstdscr\fP for both.
 .PP
-In the \fBset_\fP functions, window argument of \fBNULL\fP is treated as though
-it were \fBstsdcr\fP.  A form argument of \fBNULL\fP is treated as a request
+In the \fBset_\fP functions, window argument of
+.I NULL
+is treated as though
+it were \fBstsdcr\fP.  A form argument of
+.I NULL
+is treated as a request
 to change the system default form window or subwindow.
 .PP
 The function \fBscale_form\fP returns the minimum size required for the
 subwindow of \fIform\fP.
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 Routines that return
 an integer return one of the following error codes:
 .TP 5
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 659a1752d..f77b7a082 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp $
-.TH @INFOCMP@ 1M 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp $
+.TH @INFOCMP@ 1M 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -100,65 +100,41 @@ x\
 .RI [ \%terminal\%-type
 \&.\|.\|.\& ]
 .SH DESCRIPTION
-\fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
-terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
-\fBuse=\fP terminfo field, or print out a \fBterminfo\fP description from the
-binary file (\fBterm\fP) in a variety of formats.
-In all cases, the Boolean
-fields will be printed first, followed by the numeric fields, followed by the
-string fields.
+.B @INFOCMP@
+reports a human-readable terminal type description
+from a compiled entry in the
+.I \%term\%info
+database in a variety of selectable formats,
+compares such entries to each other,
+and rewrites an entry to replace
+.RB \*(`` use \*(''
+expressions with the content of other entries by reference.
+A
+.I "\%term\%info entry"
+entry comprises
+a list of one or more terminal type identifiers,
+a human-readable description of the terminal type,
+and a list of terminal
+.I capabilities
+that characterize its programming interface.
+In all cases,
+the program reports
+Boolean-valued capabilities first,
+followed by numeric ones,
+and then string-valued capabilities.
 .SS "Default Options"
-If no options are specified and zero or one \fIterminal-types\fP are
-specified,
-the
-\fB\-I\fP option will be assumed.
-If more than one \fIterminal-type\fP is specified,
-the \fB\-d\fP option will be assumed.
-.SS "Comparison Options [\-d] [\-c] [\-n]"
-\fB@INFOCMP@\fP compares the \fBterminfo\fP description of the first terminal
-\fIterminal-type\fP with each of the descriptions given by the entries
-for the other terminal's \fIterminal-types\fP.
-If a capability is defined for only one of the
-terminals, the value returned depends on the type of the capability:
-.bP
-\fBF\fP for missing Boolean variables
-.bP
-\fBNULL\fP for missing integer or string variables
-.PP
-Use the \fB\-q\fP option to show the distinction between
-\fIabsent\fP and \fIcanceled\fP capabilities.
-.PP
-These options produce a list which you can use to compare two
-or more terminal descriptions:
-.TP 5
-\fB\-d\fP
-produces a list of each capability that is \fIdifferent\fP
-between two entries.
-Each item in the list shows \*(``:\*('' after the capability name,
-followed by the capability values, separated by a comma.
-.TP
-\fB\-c\fP
-produces a list of each capability that is \fIcommon\fP between
-two or more entries.
-Missing capabilities are ignored.
-Each item in the list shows \*(``=\*('' after the capability name,
-followed by the capability value.
-.IP
-The \fB\-u\fP option provides a related output,
-showing the first terminal description rewritten to use the second
-as a building block via the \*(``use=\*('' clause.
-.TP
-\fB\-n\fP
-produces a list of each capability that is in \fInone\fP of the given entries.
-Each item in the list shows \*(``!\*('' before the capability name.
-.IP
-Normally only the conventional capabilities are shown.
-Use the \fB\-x\fP option to add the BSD-compatibility
-capabilities (names prefixed with \*(``OT\*('').
-.IP
-If no \fIterminal-types\fP are given,
-\fB@INFOCMP@\fP uses the environment variable \fITERM\fP
-for each of the \fIterminal-types\fP.
+If no options are specified and zero or one
+.I terminal-types
+is specified,
+.B @INFOCMP@
+assumes the
+.B \-I
+option.
+If more than one is specified,
+the program
+assumes the
+.B \-d
+option.
 .SS "Source Listing Options [\-I] [\-L] [\-C] [\-r]"
 The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
 a source listing for each terminal named.
@@ -245,6 +221,90 @@ _
 .\" hpgeneric cup
 %p2\fR\|.\|.\|.\|\fP%p1	%r	hpgeneric
 .TE
+.SS "Entry Comparison Options [-d] [-c] [-n]"
+Given
+.BR \-c ,
+.BR \-d ,
+or
+.BR \-n ,
+.B @INFOCMP@
+compares the
+.I \%term\%info
+description of the first specified
+.I terminal-type
+with those of each of the subsequent operands.
+If fewer
+.I terminal-types
+than required are specified,
+.B @INFOCMP@
+uses the environment variable
+.I TERM
+in their place.
+.PP
+If a capability is defined for only one terminal type,
+the value reported depends on the capability's type:
+.bP
+.B F
+for missing Boolean variables
+.bP
+.B NULL
+for missing integer or string variables
+.PP
+The
+.B \-c
+and
+.B \-d
+options report string capability values
+between \*(``\*'\*('' characters.
+Use the
+.B \-q
+option to distinguish
+.I absent
+and
+.I canceled
+capabilities;
+see \fB\%terminfo\fP(5).
+.PP
+The comparison option selects the form of report.
+.TP 5
+.B \-d
+lists each capability that
+.I differs
+between two entries.
+Each capability name is followed by \*(``:\*(''
+and comma-separated capability values,
+then a period.
+.TP
+.B \-c
+lists each capability that two entries have in
+.IR common "."
+.B @INFOCMP@
+ignores capabilities missing from either entry.
+Each capability name is followed by \*(``=\*('',
+a space,
+and the capability value,
+then a period.
+.IP
+If the
+.B \-u
+option is further specified,
+.B @INFOCMP@
+rewrites the description of the first type
+employing \*(``use=\*('' syntax
+to use the second as a building block.
+.TP
+.B \-n
+lists capabilities that are in
+.I none
+of the given entries.
+Each capability name is preceded by \*(``!\*(''
+and followed by a period.
+.IP
+Normally only conventional capabilities are shown.
+Use the
+.B \-x
+option to add BSD-compatibility capabilities
+(names prefixed with \*(``OT\*('').
 .SS "Use= Option [\-u]"
 The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
 terminal \fIterminal-type\fP which is relative to the sum of the
diff --git a/man/keybound.3x b/man/keybound.3x
index 03725503a..19c14bf6d 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp $
-.TH keybound 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keybound.3x,v 1.42 2024/12/28 21:26:21 tom Exp $
+.TH keybound 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of a \fIcurses\fP function key code
@@ -78,7 +78,7 @@ allocates and returns a string
 that must be freed by the application.
 .B \%keybound
 returns
-.B NULL
+.I NULL
 if
 .I key-code
 is not positive
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 79fbba2a1..5966ff7e4 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.78 2024/07/20 20:55:37 tom Exp $
+# $Id: man_db.renames.in,v 1.79 2024/12/28 21:30:24 Branden.Robinson Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -242,6 +242,7 @@ putp.3x			putp.3ncurses
 putwin.3x			putwin.3ncurses
 raw.3x				raw.3ncurses
 refresh.3x			refresh.3ncurses
+reset_prog_mode.3x		reset_prog_mode.3ncurses
 reset_shell_mode.3x		reset_shell_mode.3ncurses
 restartterm.3x			restartterm.3ncurses
 ripoffline.3x			ripoffline.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index fe68cf5b5..9c493173e 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.41 2024/06/22 23:03:10 tom Exp $
+# $Id: manhtml.aliases,v 1.42 2024/12/28 21:50:30 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -92,6 +92,7 @@ putp(3X)		curs_terminfo(3X)
 putwin(3X)		curs_util(3X)
 raw(3X)			curs_inopts(3X)
 refresh(3X)		curs_refresh(3X)
+reset_prog_mode(3X)	curs_kernel(3X)
 reset_shell_mode(3X)	curs_kernel(3X)
 restartterm(3X)		curs_terminfo(3X)
 ripoffline(3X)		curs_kernel(3X)
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 011824481..1effdd739 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,4 +1,4 @@
-# $Id: manlinks.sed,v 1.22 2024/09/14 23:49:39 tom Exp $
+# $Id: manlinks.sed,v 1.23 2024/12/28 21:36:50 Branden.Robinson Exp $
 ##############################################################################
 # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
@@ -31,9 +31,6 @@
 # listed in the "NAME" section, i.e., the names that we would like to use
 # as aliases for the manpage -T.Dickey
 #
-# workaround for manpages without a SYNOPSIS
-s/^\.\\"SH/.SH/
-#
 # eliminate formatting controls that get in the way
 /^'\\"/d
 /\.\\"/d
@@ -75,42 +72,8 @@ s/ /\
 /g
 }
 #
-# in ".SH SYNOPSIS"
-# For readability, the NAME section may not contain all function names, but we
-# still want to make aliases for those.  Do this by extracting names from the
-# list of function prototypes in the synopsis.
-#
-# Remove any line that does not contain a '(', since we only want functions. 
-# then strip off return-type of each function.
-#
-# Finally, remove the parameter list, which begins with a '('.
-/^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
-/^\.ti/d
-/^[^(]*$/d
-# reduce
-#	.B "int add_wch( const cchar_t *\fIwch\fB );"
-# to
-#	add_wch( const cchar_t *\fIwch\fB );"
-s/^\([^ (]* [^ (]* [*]*\)//g
-s/^\([^ (]* [*]*\)//g
-# trim blanks in case we have
-#	void (*) (FORM *) field_init(const FORM *form);
-s/) (/)(/g
-# reduce stuff like
-#	void (*)(FORM *) field_init(const FORM *form);
-# to
-#	field_init(const FORM *form);
-s/^\(([^)]*)\)\(([^)]*)\)*[ ]*//g
-# rename marker temporarily
-s/\.SH_(/.SH_/
-# kill lines with ");", and trim off beginning of argument list.
-s/[()].*//
-# rename marker back
-s/\.SH_/.SH_(/
-}
-#
-# delete ".SH DESCRIPTION" and following lines
-/^\.SH_(DESCRIPTION/,${
+# delete remainder of document
+/^\.SH_([^N]/,${
 d
 }
 #
diff --git a/man/menu.3x b/man/menu.3x
index 99d5c1e6a..ad1315965 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp $
-.TH menu 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+.TH menu 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,7 +70,9 @@ To use the \fBmenu\fP library, link with the options
 The \fBmenu\fP library maintains a default value for item attributes.
 You can
 get or set this default by calling the appropriate \fBget_\fP or \fBset_\fP
-routine with a \fBNULL\fP item pointer.
+routine with a
+.I NULL
+item pointer.
 Changing this default with a
 \fBset_\fP function affects future item creations, but does not change the
 rendering of items already created.
@@ -150,7 +152,9 @@ top_row   	\fBmitem_current\fP(3X)
 unpost_menu	\fBmenu_post\fP(3X)
 .TE
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 Routines that return
 an integer return one of the following error codes:
 .TP 5
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 839e199b8..66bc383c8 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
-.TH menu_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_hook.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
+.TH menu_hook 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
@@ -55,27 +55,33 @@ points in the automatic processing of input event codes by \fBmenu_driver\fP.
 The function \fBset_item_init\fP sets a hook to be called at menu-post time and
 each time the selected item changes (after the change).
 \fBitem_init\fP
-returns the current item init hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current item init hook, if any
+.RI ( NULL
+if there is no such hook).
 .PP
 The function \fBset_item_term\fP sets a hook to be called at menu-unpost time
 and each time the selected item changes (before the change).
 \fBitem_term\fP
-returns the current item term hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current item term hook, if any
+.RI ( NULL
+if there is no such hook).
 .PP
 The function \fBset_menu_init\fP sets a hook to be called at menu-post time and
 just after the top row on the menu changes once it is posted.
 \fBmenu_init\fP
-returns the current menu init hook, if any (\fBNULL\fP if there is no such
-hook).
+returns the current menu init hook, if any
+.RI ( NULL
+if there is no such hook).
 .PP
 The function \fBset_menu_term\fP sets a hook to be called at menu-unpost time
 and just before the top row on the menu changes once it is posted.
-\fBmenu_term\fP returns the current menu term hook, if any (\fBNULL\fP if there
-is no such hook).
+\fBmenu_term\fP returns the current menu term hook, if any
+.RI ( NULL
+if there is no such hook).
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 Other routines
 return one of the following:
 .TP 5
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 43409fef8..8def448ea 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH menu_items 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_items.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
+.TH menu_items 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_items\fP,
 \fBmenu_items\fP,
@@ -44,17 +44,20 @@ make and break connections between items and menus
 .fi
 .SH DESCRIPTION
 The function \fBset_menu_items\fP changes the item pointer array of the given
-\fImenu\fP.  The array must be terminated by a \fBNULL\fP.
+\fImenu\fP.  The array must be terminated by a
+.IR NULL "."
 .PP
 The function \fBmenu_items\fP returns the item array of the given menu.
 .PP
 The function \fBitem_count\fP returns the count of items in \fImenu\fP.
 .SH RETURN VALUE
-The function \fBmenu_items\fP returns a pointer (which may be \fBNULL\fP).
+The function \fBmenu_items\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 The function \fBitem_count\fP returns \fBERR\fP (the general \fBcurses\fP error
-return value) if its \fImenu\fP parameter is \fBNULL\fP.
+return value) if its \fImenu\fP parameter is
+.I NULL "."
 .PP
 The function \fBset_menu_items\fP returns one of the following codes on error:
 .TP 5
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index e3f3a9286..7630e2e53 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH menu_mark 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_mark.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+.TH menu_mark 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_mark\fP,
 \fBmenu_mark\fP \-
@@ -51,13 +51,16 @@ Note that changing the length of the mark string for a menu while the
 menu is posted is likely to produce unhelpful behavior.
 .PP
 The default string is "\-" (a dash).
-Calling \fBset_menu_mark\fP with
-a non-\fBNULL\fP menu argument will change this default.
+Calling \fBset_menu_mark\fP with a
+.IR non- NULL
+menu argument will change this default.
 .PP
-The function \fBmenu_mark\fP returns the menu's mark string (or \fBNULL\fP if
-there is none).
+The function \fBmenu_mark\fP returns the menu's mark string (or
+.I NULL
+if there is none).
 .SH RETURN VALUE
-The function \fBmenu_mark\fP returns a pointer (which may be \fBNULL\fP).
+The function \fBmenu_mark\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 The function \fBset_menu_mark\fP may return the following error codes:
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 1a133745a..af781e3d4 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH menu_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_new.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+.TH menu_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_menu\fP,
 \fBfree_menu\fP \-
@@ -42,12 +42,15 @@ create and destroy menus
 .fi
 .SH DESCRIPTION
 The function \fBnew_menu\fP creates a new menu connected to a specified item
-pointer array (which must be \fBNULL\fP-terminated).
+pointer array (which must be
+.IR NULL -terminated).
 .PP
 The function \fBfree_menu\fP disconnects \fImenu\fP from its item array
 and frees the storage allocated for the menu.
 .SH RETURN VALUE
-The function \fBnew_menu\fP returns \fBNULL\fP on error.
+The function \fBnew_menu\fP returns
+.I NULL
+on error.
 It sets \fBerrno\fP according to the function's failure:
 .TP 5
 .B E_NOT_CONNECTED
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index a66a368dd..eae100193 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
-.TH menu_pattern 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_pattern.3x,v 1.40 2024/12/28 21:26:21 tom Exp $
+.TH menu_pattern 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_pattern\fP,
 \fBmenu_pattern\fP \-
@@ -55,7 +55,10 @@ The function \fBmenu_pattern\fP returns the pattern buffer of the given
 \fImenu\fP.
 .SH RETURN VALUE
 The function \fBmenu_pattern\fP returns a pointer,
-which is \fBNULL\fP if the \fImenu\fP parameter is \fBNULL\fP.
+which is
+.I NULL
+if the \fImenu\fP parameter is
+.IR NULL "."
 Otherwise, it is a pointer to a string which is empty
 if no pattern has been set.
 It does not set \fBerrno\fP.
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index a0363fb28..71e47fdba 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
-.TH menu_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_requestname.3x,v 1.35 2024/12/28 21:26:21 tom Exp $
+.TH menu_requestname 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_request_by_name\fP,
 \fBmenu_request_name\fP \-
@@ -48,7 +48,9 @@ The function \fBmenu_request_by_name\fP searches in the name-table for a request
 with the given name and returns its request code.
 Otherwise E_NO_MATCH is returned.
 .SH RETURN VALUE
-\fBmenu_request_name\fP returns \fBNULL\fP on error
+\fBmenu_request_name\fP returns
+.I NULL
+on error
 and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
 .br
 \fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index d15e77d54..abfe15a90 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
-.TH menu_spacing 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_spacing.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
+.TH menu_spacing 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_spacing\fP,
 \fBmenu_spacing\fP \-
@@ -73,7 +73,9 @@ A value of 0 for all the spacing values resets them to the default,
 which is 1 for all of them.
 .PP
 The function \fBmenu_spacing\fP returns the spacing information for the menu.
-If a pointer is NULL, the corresponding information is simply not returned.
+If a pointer is
+.IR NULL ","
+the corresponding information is simply not returned.
 .SH RETURN VALUE
 Both routines return \fBE_OK\fP on success.
 \fBset_menu_spacing\fP may return
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 292bbd6b8..4465bc791 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
-.TH menu_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_userptr.3x,v 1.35 2024/12/28 21:26:21 tom Exp $
+.TH menu_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_menu_userptr\fP,
 \fBmenu_userptr\fP \-
@@ -45,7 +45,8 @@ Every menu and every menu item has a field that can be used to hold
 application-specific data (that is, the menu-driver code leaves it alone).
 These functions get and set the menu user pointer field.
 .SH RETURN VALUE
-\fBmenu_userptr\fP returns a pointer (which may be \fBNULL\fP).
+\fBmenu_userptr\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 36f6129dc..b9d8b4974 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
-.TH menu_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_win.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
+.TH menu_win 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
@@ -54,14 +54,20 @@ The first four functions get and set those windows.
 It is not necessary to set
 either window; by default, the driver code uses \fBstdscr\fP for both.
 .PP
-In the \fBset_\fP functions, window argument of \fBNULL\fP is treated as though
-it were \fBstsdcr\fP.  A menu argument of \fBNULL\fP is treated as a request
+In the \fBset_\fP functions, window argument of
+.I NULL
+is treated as though
+it were \fBstsdcr\fP.  A menu argument of
+.I NULL
+is treated as a request
 to change the system default menu window or subwindow.
 .PP
 The function \fBscale_menu\fP returns the minimum size required for the
 subwindow of \fImenu\fP.
 .SH RETURN VALUE
-Routines that return pointers return \fBNULL\fP on error.
+Routines that return pointers return
+.I NULL
+on error.
 Routines that return
 an integer return one of the following error codes:
 .TP 5
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index 42d36c397..39e805383 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
-.TH mitem_current 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: mitem_current.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
+.TH mitem_current 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
@@ -61,11 +61,13 @@ row being displayed.
 The function \fBitem_index\fP returns the (zero-origin) index of \fIitem\fP in
 the menu's item pointer list.
 .SH RETURN VALUE
-\fBcurrent_item\fP returns a pointer (which may be \fBNULL\fP).
+\fBcurrent_item\fP returns a pointer (which may be
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 \fBtop_row\fP and \fBitem_index\fP return \fBERR\fP (the general \fBcurses\fP
-error value) if their \fImenu\fP parameter is \fBNULL\fP.
+error value) if their \fImenu\fP parameter is
+.IR NULL "."
 .PP
 \fBset_current_item\fP and \fBset_top_row\fP return one of the following:
 .TP 5
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index 3606bb5d2..d92477c8a 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp $
-.TH mitem_name 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: mitem_name.3x,v 1.33 2024/12/28 21:26:21 tom Exp $
+.TH mitem_name 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBitem_name\fP,
 \fBitem_description\fP \-
@@ -46,7 +46,8 @@ The function \fBitem_name\fP returns the name part of the given item.
 The function \fBitem_description\fP returns the description part of the given
 item.
 .SH RETURN VALUE
-These routines return a pointer (which may be \fBNULL\fP).
+These routines return a pointer (which may be
+.IR NULL ")."
 They do not set \fBerrno\fP.
 .SH PORTABILITY
 These routines emulate the System V menu library.
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 66bd29bce..1ca7edba0 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH mitem_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: mitem_new.3x,v 1.38 2024/12/28 21:26:21 tom Exp $
+.TH mitem_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBnew_item\fP,
 \fBfree_item\fP \-
@@ -55,7 +55,9 @@ Please notice that it
 is the responsibility of the application to release the memory for the
 name or the description of the item.
 .SH RETURN VALUE
-The function \fBnew_item\fP returns \fBNULL\fP on error.
+The function \fBnew_item\fP returns
+.I NULL
+on error.
 It sets \fBerrno\fP according to the function's failure:
 .TP 5
 .B E_BAD_ARGUMENT
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index f0eab8bd8..219618dfb 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH mitem_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: mitem_userptr.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
+.TH mitem_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fBset_item_userptr\fP,
 \fBitem_userptr\fP \-
@@ -46,7 +46,8 @@ Every menu item has a field that can be used to hold application-specific data
 These functions get and set
 that field.
 .SH RETURN VALUE
-The function \fBitem_userptr\fP returns a pointer (possibly \fBNULL\fP).
+The function \fBitem_userptr\fP returns a pointer (possibly
+.IR NULL ")."
 It does not set \fBerrno\fP.
 .PP
 The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
diff --git a/man/ncurses.3x b/man/ncurses.3x
index cb0784bab..75a9fc8db 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp $
-.TH ncurses 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp $
+.TH ncurses 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -243,7 +243,7 @@ of a typical Unix terminal driver
 is in one of three modes:
 raw,
 \%cbreak,
-or normal (\*(``cooked\*('').
+or canonical (\*(``cooked\*('').
 In
 .IR curses ","
 the line discipline is a property of the screen,
@@ -1099,7 +1099,7 @@ on success and
 on failure;
 see \fB\%curs_variables\fP(3X).
 Functions that return pointers return
-.B NULL
+.I NULL
 on failure.
 Typically,
 .I \%ncurses
diff --git a/man/panel.3x b/man/panel.3x
index 41aca0076..15bc81fdf 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp $
-.TH panel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: panel.3x,v 1.68 2024/12/28 21:26:21 tom Exp $
+.TH panel 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -215,8 +215,9 @@ Use this function and not \fB\%wrefresh\fP(3X) or
 but \fB\%doupdate\fP is the function responsible for updating
 the physical screen.
 .SH "RETURN VALUE"
-Each routine that returns a pointer returns \fBNULL\fP if an error
-occurs.
+Each routine that returns a pointer returns
+.I NULL
+if an error occurs.
 Each routine that returns an int value returns \fBOK\fP if it
 executes successfully and \fBERR\fP if not.
 .PP
@@ -263,9 +264,14 @@ Systems based on SVr4 source code,
 such as Solaris,
 provide this library.
 .bP
-\fI\%ncurses\fP (since version 0.6 in 1993)
-and \fIPDCurses\fP (since version 2.2 in 1995)
-provide a panel library whose common ancestor
+.I \%ncurses
+(since version 0.6 in 1993)
+and
+.I \%PDCurses
+(since version 2.2 in 1995)
+provide a
+.I panel
+library whose common ancestor
 is a public domain implementation by Warren Tucker
 published in \fIu386mon\fP 2.20 (1990).
 .IP
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 5e23d9fb3..2b8f9766f 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996-on
 .\"
-.\" $Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
-.TH resizeterm 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: resizeterm.3x,v 1.58 2024/12/28 21:18:35 tom Exp $
+.TH resizeterm 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -170,8 +170,13 @@ resuming using \fB\%refresh\fP(3X).
 .PP
 Doing that clears the screen and is visually distracting.
 .PP
-This extension of \fI\%ncurses\fP was introduced in mid-1995.
-It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
+.I \%ncurses
+introduced this extension in mid-1995.
+NetBSD
+.I curses
+adopted it in 2001 and
+.I \%PDCurses
+in 2003.
 .SH AUTHORS
 Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
 .SH SEE ALSO
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 6aee63f48..62aefc81a 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
-.TH term_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: term_variables.3x,v 1.40 2024/12/28 21:35:10 tom Exp $
+.TH term_variables 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,99 +81,193 @@
 \fBNCURSES_CONST char * const strnames[];
 .fi
 .SH DESCRIPTION
-This page summarizes variables provided by the \fBcurses\fP library's
-low-level terminfo interface.
-A more complete description is given in the \fBcurs_terminfo\fP(3X) manual page.
-.PP
-Depending on the configuration, these may be actual variables,
-or macros (see \fBcurs_threads\fP(3X))
-which provide read-only access to \fIcurses\fP's state.
-In either case, applications should treat them as read-only to avoid
-confusing the library.
+This page summarizes variables provided by the
+.I curses
+library's lower-level
+.I \%term\%info
+interface.
+Locate a more complete description in the \fBcurs_terminfo\fP(3X) manual
+page.
+.PP
+Depending on
+.IR \%ncurses 's
+build-time configuration,
+these may be actual variables,
+or macros
+(see \fBcurs_threads\fP(3X))
+that provide read-only access to
+.IR curses 's
+state.
+In either case,
+applications should treat them as read-only to avoid confusing the
+library.
 .SS "Alternate Character Set Mapping"
-After initializing the curses or terminfo interfaces,
-the \fBacs_map\fP array holds information used to translate cells
-with the \fBA_ALTCHARSET\fP video attribute into line-drawing characters.
+After initializing the
+.I curses
+or
+.I \%term\%info
+interfaces,
+the
+.B acs_map
+array holds information used to translate cells with the
+.B \%A_ALTCHARSET
+video attribute into line-drawing characters.
 .PP
 The encoding of the information in this array has changed periodically.
-Application developers need only know that it is used for the \*(``ACS_\*(''
-constants in <curses.h>.
+Application developers need only know that it is used for the
+\*(``ACS_\*('' constants in
+.IR \%curses.h "."
 .PP
-The comparable data for the wide-character library is a private variable.
+The comparable data for the wide-character library are not exposed as
+symbols in the API.
 .SS "Current Terminal Data"
-After initializing the curses or terminfo interfaces,
-the \fBcur_term\fP contains data describing the current terminal.
-This variable is also set as a side-effect of \fBset_term\fP(3X)
-and \fBdelscreen\fP(3X).
-.PP
-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(3X) to reuse in \fBset_term\fP.
+After initializing the
+.I curses
+or
+.I \%term\%info
+interfaces,
+.B cur_term
+contains data describing the current terminal.
+It is also updated as a side-effect of \fBset_term\fP(3X) and
+\fBdelscreen\fP(3X).
+.PP
+It is possible to save a value of
+.B cur_term
+for subsequent use as a parameter to \fBset_term\fP(3X)
+for switching between screens.
+Alternatively,
+one can save the return value from \fBnewterm\fP(3X) or
+\fBsetupterm\fP(3X) to reuse in \fBset_term\fP(3X).
 .SS "\fIterminfo\fP Lookup Tables"
 The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for
-the long and short names of terminfo capabilities,
-as well as the corresponding names for termcap capabilities.
+the long and short names of
+.I \%term\%info
+capabilities,
+as well as the corresponding names for
+.I termcap
+capabilities.
 These are available to other applications,
-although the hash-tables used by
-the terminfo and termcap functions are not available.
-.PP
-The long terminfo capability names use a \*(``f\*('' (eff) in their names:
-\fBboolfnames\fP,
-\fBnumfnames\fP, and
-\fBstrfnames\fP.
-.PP
-These are the short names for terminfo capabilities:
-\fBboolnames\fP,
-\fBnumnames\fP, and
-\fBstrnames\fP.
-.PP
-These are the corresponding names used for termcap descriptions:
-\fBboolcodes\fP,
-\fBnumcodes\fP, and
-\fBstrcodes\fP.
+though the hash tables used by the
+.I \%term\%info
+and
+.I termcap
+functions are not.
+.PP
+.I \%term\%info
+stores capability names in arrays with an \*(``f\*('' (eff) in their
+names:
+.BR \%boolfnames ","
+.BR \%numfnames ","
+and
+.BR \%strfnames "."
+It stores the briefer capability codes in arrays without the
+\*(``f\*('':
+.BR \%boolnames ","
+.BR \%numnames ","
+and
+.BR \%strnames "."
+The corresponding
+.I termcap
+capability codes are stored in
+.BR \%boolcodes ","
+.BR \%numcodes ","
+and
+.BR \%strcodes "."
+\fB\%terminfo\fP(5) catalogs these.
 .\"
 .SS "Terminal Type"
 A terminal description begins with one or more terminal names
 separated by \*(``|\*('' (vertical bars).
-On initialization of the curses or terminfo interfaces,
-\fBsetupterm\fP(3X) copies the terminal names to the array \fBttytype\fP.
+On initialization of the
+.I curses
+or
+.I \%term\%info
+interfaces,
+\fBsetupterm\fP(3X) copies the terminal name to the array
+.BR ttytype "."
 .\"
 .SS "\fIterminfo\fP Names"
-In addition to the variables, \fB<term.h>\fP also defines a symbol for each
-terminfo capability \fIlong name\fP.
-These are in terms of the symbol \fBCUR\fP,
+In addition to the variables,
+.I term.h
+also defines a symbol for each
+.I \%term\%info
+capability name.
+These are in terms of the symbol
+.BR CUR ","
 which is defined
 .PP
+.RS
 .EX
 #define CUR ((TERMTYPE *)(cur_term))\->
 .EE
+.RE
 .PP
-These symbols provide a faster method of accessing terminfo capabilities
-than using \fBtigetstr\fP(3X), etc.
+These symbols provide a faster method of accessing
+.I \%term\%info
+capabilities than using,
+for example,
+\fBtigetstr\fP(3X).
 .PP
-The actual definition of \fBCUR\fP depends upon the implementation,
-but each terminfo library provides these long names defined to point
-into the current terminal description loaded into memory.
+The definition of
+.B CUR
+is implementation-dependent,
+but each
+.I \%term\%info
+library defines these names to point
+into the in-memory description of the current terminal.
+For example,
+in
+.IR \%ncurses ","
+the expressions
+.B tigetstr("key_dc")
+and
+\*(``\c \" `` string not reliable in a macro call on DWB/Heirloom nroffs
+.B "CUR Strings[59]\c"
+\*('' \" '' string not reliable in a macro call on DWB/Heirloom nroffs
+are equivalent.
 .\"
-.SH NOTES
-The low-level terminfo interface is initialized using
-\fB\%setupterm\fP(3X).
-The upper-level curses interface uses the low-level terminfo interface,
-internally.
+.SS "\fIterminfo\fP and \fIcurses"
+\fB\%setupterm\fP(3X) initializes the lower-level
+.I \%term\%info
+interface.
+The higher-level
+.I curses
+interface uses the
+.I \%term\%info
+interface internally;
+the symbol
+.B SP
+bridges the
+.I curses
+.I SCREEN
+type with the
+.I \%term\%info
+.I TERMINAL
+type.
 .\"
 .SH PORTABILITY
-X/Open Curses does not describe any of these except for \fBcur_term\fP.
-(The inclusion of \fBcur_term\fP appears to be an oversight,
-since other comparable low-level information is omitted by X/Open).
+X/Open Curses does not describe any of these symbols except for
+.IR \%cur_term "."
+(The inclusion of
+.I \%cur_term
+appears to be an oversight,
+since other comparable low-level information is omitted by X/Open.)
 .PP
 Other implementations may have comparable variables.
 Some implementations provide the variables in their libraries,
 but omit them from the header files.
 .PP
-All implementations which provide terminfo interfaces add definitions
-as described in the \fBTerminfo Names\fP section.
-Most, but not all, base the definition upon the \fBcur_term\fP variable.
+All implementations that provide
+.I \%term\%info
+interfaces add definitions
+as described in the
+.RI \*(`` terminfo
+Names\*('' section above.
+Most,
+but not all,
+base the definition upon the
+.I \%cur_term
+variable.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_terminfo\fP(3X),
diff --git a/man/terminfo.tail b/man/terminfo.tail
index b47d2326b..65bf78dae 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.153 2024/09/21 17:54:42 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.154 2024/12/28 21:21:36 Branden.Robinson Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -632,10 +632,13 @@ This is necessary because it is not always safe to transmit \fB\en\fP
 tabs are never expanded, so \et is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
 .PP
-A final example is the \s-1LSI ADM\s0-3a, which uses line and column
-offset by a blank character, thus
+A final example is the LSI ADM-3A,
+which uses line and column offset by a space,
+thus
 .RS
+.EX
 cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
+.EE
 .RE
 .PP
 After sending \*(``\eE=\*('', this pushes the first parameter, pushes the
diff --git a/man/tput.1 b/man/tput.1
index ffc4b1cd5..1f0e2282f 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp $
-.TH @TPUT@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp $
+.TH @TPUT@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -216,7 +216,7 @@ A reset differs from initialization in two ways.
 \fB\%@TPUT@\fP sets the the terminal modes to a \*(``sane\*('' state,
 .RS
 .bP
-enabling cooked and echo modes,
+enabling canonical (\*(``cooked\*('') and echo modes,
 .bP
 disabling cbreak and raw modes,
 .bP
diff --git a/man/tset.1 b/man/tset.1
index 8542bba43..a30456b7e 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp $
-.TH @TSET@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp $
+.TH @TSET@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,7 +135,7 @@ standard error output.
 When invoked as \fB@RESET@\fP, \fB@TSET@\fP sets the terminal
 modes to \*(``sane\*('' values:
 .bP
-sets cooked and echo modes,
+sets canonical (\*(``cooked\*('') and echo modes,
 .bP
 turns off cbreak and raw modes,
 .bP
diff --git a/man/wresize.3x b/man/wresize.3x
index 5b50c4d6d..4e50589b7 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp $
-.TH wresize 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp $
+.TH wresize 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -55,10 +55,10 @@ and
 .IR columns "."
 If either dimension is larger than its current value,
 .I \%ncurses
-the expanded part of the window is filled with blanks merged with
-current background rendition
-(configured by \fB\%wbkgdset\fP(3X),
-or by wide-character API: \fB\%wbkgrndset\fP(3X)).
+fills the expanded part of the window
+with the background character and rendition configured by
+\fB\%wbkgdset\fP(3X)
+(wide-character API: \fB\%wbkgrndset\fP(3X)).
 .SH RETURN VALUE
 .B \%wresize
 returns
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 489c4802b..ccd4c3209 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1157 $
-#	$Date: 2024/11/02 20:48:46 $
+#	$Revision: 1.1160 $
+#	$Date: 2024/12/28 20:42:05 $
 #
 # 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
@@ -579,10 +579,9 @@ ansi77|ANSI 3.64 standard 1977 version,
 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
 	OTbs, am, mir, msgr,
 	cols#80, lines#24,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M,
-	home=\E[H, ht=^I, il1=\E[L, ind=\n, use=ansi+arrows,
-	use=ansi+erase, use=ansi+inittabs, use=ansi+local1,
-	use=klone+sgr-dumb,
+	bel=^G, cr=\r, dch1=\E[P, dl1=\E[M, il1=\E[L, ind=\n,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+inittabs, use=ansi+local1, use=klone+sgr-dumb,
 
 pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
 	lines#25, use=pcansi-m,
@@ -1150,8 +1149,7 @@ kon|kon2|Kanji ON Linux console,
 	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
 	it#8, ncv#18,
 	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
-	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
+	cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F,
 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
 	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -1165,9 +1163,9 @@ kon|kon2|Kanji ON Linux console,
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
-	use=klone+color, use=vt220+pcedit,
+	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+	use=ecma+sgr, use=klone+color, use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -3858,15 +3856,15 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X,
 xnuppc+basic|Darwin PowerPC console basic capabilities,
 	am, bce, mir, xenl, NQ,
 	it#8,
-	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
-	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	bold=\E[1m, cr=\r, dsl=\E]2;\007, el1=\E[1K, ht=^I, hts=\EH,
+	ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
-	use=ansi+csr, use=ansi+erase, use=ansi+local,
-	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+	use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	ncv#32, use=klone+color,
@@ -4907,9 +4905,7 @@ xterm-r6|xterm X11R6 version,
 	cols#80, it#8, lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, enacs=\E)0, home=\E[H, ht=^I,
-	hts=\EH, ind=\n,
+	dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -4920,9 +4916,10 @@ xterm-r6|xterm X11R6 version,
 	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
-	use=xterm+alt47, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
-	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
+	use=xterm+alt47, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit,
+	use=xterm+kbs, use=vt100+enq,
 
 xterm-old|antique xterm version,
 	use=xterm-r6,
@@ -8179,11 +8176,10 @@ wezterm|Wez's Terminal Emulator,
 	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
-	u9=\E[c, Smol=\E[53m, Smulx=\E[4:%p1%dm,
+	Smol=\E[53m, Smulx=\E[4:%p1%dm,
 	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
@@ -8273,6 +8269,131 @@ contour|contour-latest|Contour Terminal Emulator,
 contour-direct|Contour terminal with direct colors,
 	use=xterm+direct, use=contour,
 
+#### Ghostty
+# https://github.com/ghostty-org/ghostty
+#
+# Its readme and manpage begin with a lot of hype, concluding with
+#
+#	While aiming for this ambitious goal, our first step is to make Ghostty
+#	one of the best fully standards compliant terminal emulator, remaining
+#	compatible with all existing shells and software while supporting all
+#	of the latest terminal innovations in the ecosystem.  You can use
+#	Ghostty as a drop-in replacement for your existing terminal emulator.
+#
+# However, it uses xterm as a standard:
+#
+#	We believe Ghostty is one of the most compliant terminal emulators
+#	available.  Terminal behavior is partially a de jure standard (i.e. 
+#	[ECMA-48](https://ecma-international.org/publications-and-standards/stand>
+#	but mostly a de facto standard as defined by popular terminal emulators
+#	worldwide.  Ghostty takes the approach that our behavior is defined by
+#	(1) standards, if available, (2) xterm, if the feature exists, (3)
+#	other popular terminals, in that order.  This defines what the Ghostty
+#	project views as a "standard."
+#
+# while xterm uses ECMA-48 and DEC 070 along with related documentation such as
+# the DEC terminal reference manuals.  xterm's documentation does not attempt
+# to duplicate those sources of information, so that developers should rely
+# upon both xterm's documentation and the published standards.
+#
+# Comments in ghostty's source code and commits demonstrate that the developers
+# study xterm's source code closer than xterm's documentation.  The quote above
+# is the only mention of ECMA-48.
+#
+# ghostty 1.0.0 tested with Arch Linux:
+# -------------
+# tack:
+# - does not implement blinking text
+# - does not implement meta mode (kmm).
+# - implements VT100-style alternate character set
+# - testing video-attributes unexpectedly clears the display before acsc
+# - italics and strike-out work
+# - function-keys mostly match; however because this client (unlike X11
+#   clients) does not work with a remote display, some (such as control/alt key
+#   combinations, and the shifted editing keys) are untestable because
+# - numeric keypad does not send VT100-style escapes
+# wraptest:
+# - matches xterm
+# vttest:
+# - ghostty hangs in more than one menu, making it impossible to test more than
+#   a small part of the program.  In particular, these are untestable:
+#	1. Test of cursor movements 
+#	2. Test of screen features
+#	4. Test of double-sized characters
+# - ghostty has tabs (imitating gnome-terminal); when closing a tab with a
+#   running process (e.g., a hung vttest), ghostty does not prompt about the 
+#   process to be killed.
+# - identifies as a "VT220 with color":
+#	<27> [ ? 6 2 ; 2 2 c
+# - although claiming to be a VT220, it does not support NRCS.  Actually, it
+#   fails the VT100 character set test as well.  This is a complete failure:
+#	3. Test of character sets
+# - it does not hang in this menu entry:
+#	8. Test of VT102 features (Insert/Delete Char/Line)
+#   although because it does not implement double-sized characters, most of
+#   that test counts as a failure.
+# - implements VT220 DECTCEM and ECH, but not SRM or DECSCA
+# - implements VT420 left/right margins
+# - does not implement VT420 rectangle operations
+# - does not implement 8-bit controls
+# - does implement ISO-6429 cursor-movement
+# - supports BCE partially: ED/EL work, but not ECH and indexing.
+# - does not support blinking text
+# - responds to XTVERSION
+# - responds to DECRPM controls, though many are "unknown"
+# - does not respond to most DECRQSS except for SGR, DECSCUSR, DECSTBM
+# - implements most of xterm mouse protocol except for
+#   - Mouse Highlight Tracking
+#   - DEC Locator Events
+# - some window reporting works:
+#   14 - size of text area in pixels
+#   16 - size of character in pixels
+#   18 - size of window in chars
+#   21 - report window label
+# - window-modifying does not work
+# - cursor position is incorrect after switching to/from alternate screen
+#
+# The developers set "Tc" in their terminal description to hint that it
+# supports direct-colors, but the feature did not work with this version -TD
+ghostty|Ghostty terminal emulator,
+	am, bce, km, mc5i, mir, msgr, npc, xenl, AX, XT,
+	cols#80, lines#24, pairs#0x7fff,
+	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+	     yzz{{||}}~~,
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
+	cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?,
+	kcbt=\E[Z, kend=\EOF, kent=\EOM, kf13=\E[1;2P,
+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf25=\E[1;5P,
+	kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, kf37=\E[1;6P,
+	kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S, kf49=\E[1;3P,
+	kf50=\E[1;3Q, kf51=\E[1;3R, kf52=\E[1;3S, kf61=\E[1;4P,
+	kf62=\E[1;4Q, kf63=\E[1;4R, op=\E[39;49m, rev=\E[7m,
+	ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	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,
+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+	    %t;7%;%?%p5%t;2%;%?%p7%t;8%;m,
+	sgr0=\E(B\E[m, smam=\E[?7h, smcup=\E[?1049h,
+	smkx=\E[?1h\E=, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007,
+	Se=\E[2 q, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	xr=\EP>\\|ghostty [!-z]+\E\\, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
+	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=ansi+local1, use=ansi+rca2,
+	use=ansi+rep, use=ansi+sgrso, use=ansi+sgrul,
+	use=ansi+tabs, use=ecma+index, use=ecma+italics,
+	use=ecma+strikeout, use=report+version, use=vt220+cvis,
+	use=xterm+256color2, use=xterm+acs,
+	use=xterm+alt+title, use=bracketed+paste,
+	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
+	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf0,
+	use=xterm+sm+1006, use=xterm+sl-twm,
+
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
 
@@ -8940,9 +9061,8 @@ elks-vt52|ELKS VT52 console,
 	home=\EH, use=elks-glasstty,
 
 elks-ansi|ELKS ANSI console,
-	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	el=\E[K, home=\E[H, use=ansi+local1, use=ansi+sgrso,
-	use=elks-glasstty,
+	clear=\E[H\E[2J, el=\E[K, use=ansi+cup, use=ansi+local1,
+	use=ansi+sgrso, use=elks-glasstty,
 
 # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
 # instead of VT52, but the "elks" entry still refers to the latter.
@@ -9462,8 +9582,7 @@ cygwinB19|ANSI emulation for cygwin32,
 cygwin|ANSI emulation for Cygwin,
 	am, hs, mir, msgr, xon,
 	colors#8, it#8, pairs#64,
-	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
-	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, fsl=^G, home=\E[H, ht=^I,
+	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
 	ind=\n, invis=\E[8m, kb2=\E[G, 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~,
@@ -9475,10 +9594,10 @@ cygwin|ANSI emulation for Cygwin,
 	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, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
-	tsl=\E];, use=ansi+arrows, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+local, use=ansi+rca2,
-	use=vt220+pcedit, use=vt102+enq, use=klone+acs,
-	use=xterm+alt47,
+	tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idc, use=ansi+idl, use=ansi+local,
+	use=ansi+rca2, use=vt220+pcedit, use=vt102+enq,
+	use=klone+acs, use=xterm+alt47,
 
 # I've supplied this so that you can help test new values and add other
 # features.  Cheers, earnie_boyd@yahoo.com.
@@ -9488,20 +9607,20 @@ cygwin|ANSI emulation for Cygwin,
 # this list, but DOES cause problems so it has been removed
 cygwinDBG|Debug Version for Cygwin,
 	am, eo, mir, msgr, xon,
-	cols#80, lines#24, ncv#3,
-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
-	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~, kspd=^Z,
-	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
+	cols#80, lines#24,
+	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n,
+	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, 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~, kspd=^Z, nel=\r\n,
+	op=\E[39;49m, rc=\E8, ri=\EM, 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%;%?%p7%t;8%;%?%p9%t;12%;m,
 	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
 	use=klone+acs, use=klone+color, use=vt220+pcedit,
 	use=vt220+cvis, use=vt102+enq,
@@ -14021,9 +14140,8 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
 	     z{{||}}~~,
-	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
-	fsl=\E8, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, dch1=\E[P, dim=\E[2m,
+	dl1=\E[M, fsl=\E8, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
 	is1=\E[?3l\E)0,
 	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
@@ -14042,8 +14160,8 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	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, tsl=\E7\E[25;%p1%{1}%+%dH,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+local1, use=ansi+sgrbold,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+local1, use=ansi+sgrbold,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -15409,10 +15527,9 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
 	cols#80,
 	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
-	el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
-	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
-	is1=\E[m\E7\E[H\E9\E8,
+	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K$<5>,
+	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>,
+	il1=\E[L$<3>, ind=^K, is1=\E[m\E7\E[H\E9\E8,
 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
 	kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK,
 	kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP,
@@ -15423,15 +15540,12 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
-	rmm=\E[>52l, sc=\E7,
-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
-	    %;%?%p7%t8;%;m,
-	sgr0=\E[m,
+	rmm=\E[>52l, sc=\E7, sgr0=\E[m,
 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
 	     \\,
 	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+rep, use=ansi+sgrbold,
+	use=ansi+cup, use=ansi+idl, use=ansi+inittabs,
+	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -20052,17 +20166,16 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\ER, clear=^L,
 	cnorm=\ES, cr=\r, csr=\EU%p1%{32}%+%c%p2%{32}%+%c,
-	cub1=^H, cud1=\E[B, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\EM, dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r,
-	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
+	cub1=^H, dch=\E[%p1%dP, dch1=\EM, dl=\E[%p1%dM, dl1=\EL,
+	fsl=\r, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
 	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
 	khome=\E[H, rc=\EX, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
 	rmacs=\Ed, rmam=\E[?7l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
 	sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB,
-	use=ansi+apparrows, use=ansi+local, use=ansi+sgrso,
-	use=ansi+sgrul,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 #### Tandem
 #
@@ -20782,18 +20895,16 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	cols#80, it#8, lines#24,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, clear=\Ec, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
-	hpa=\E[%i%p1%dG, ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB,
-	invis=\E[30;40m, kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240,
-	kf10=\251, kf2=\241, kf3=\242, kf4=\243, kf5=\244, kf6=\245,
-	kf7=\246, kf8=\247, kf9=\250, kich1=\E[^H, knp=\E[U,
-	kpp=\E[V, ll=\E[24;1H, nel=\r, rev=\E[7m, ri=\E[T\E[A,
-	rin=\E[%p1%dT\E[%p1%dA,
+	bel=^G, clear=\Ec, cr=\r, ech=\E[%p1%dX, hpa=\E[%i%p1%dG,
+	ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m,
+	kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241,
+	kf3=\242, kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247,
+	kf9=\250, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H,
+	nel=\r, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
-	sgr0=\E[m, use=ansi+arrows, use=ansi+local,
-	use=ansi+sgrbold,
+	sgr0=\E[m, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+local, use=ansi+sgrbold,
 
 #### Apple II
 #
@@ -23116,13 +23227,12 @@ graphos|graphos III,
 	am, mir,
 	cols#80, it#8, lines#24,
 	clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z,
-	cr=\r, cub1=^H, cud=\E[%p1%dB, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
-	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
-	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
-	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
-	use=ansi+sgrso,
+	cr=\r, cub1=^H, cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P,
+	ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l, rmir=\E[4l, sc=\E7,
+	sgr0=\E[m, smdc=\E[4h, smir=\E[4h, use=ansi+arrows,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso,
 
 graphos-30|graphos III with 30 lines,
 	lines#30,
@@ -23324,9 +23434,8 @@ rca|RCA vp3301/vp3501,
 hirez100|Selanar HiREZ-100,
 	OTbs, OTpt, mir, msgr, xon,
 	OTkn#4, cols#80, it#8, lines#48, vt#3,
-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
-	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, hts=\EH,
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
+	cud1=\n, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ht=^I, hts=\EH,
 	is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
 	lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[48H, mc0=\E[i,
@@ -23335,8 +23444,8 @@ hirez100|Selanar HiREZ-100,
 	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=, tbc=\E[3g,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgrso, use=ansi+sgrul,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
@@ -27730,4 +27839,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2024-11-02
 #	+ add extended-keys for djgpp 2.05 -TD
 #
+# 2024-12-28
+#	+ add ghostty -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9667d8b54..afdba21b1 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241221) unstable; urgency=low
+ncurses6td (6.5+20241228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9667d8b54..afdba21b1 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241221) unstable; urgency=low
+ncurses6td (6.5+20241228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index be91acbc3..110596a4f 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241221) unstable; urgency=low
+ncurses6td (6.5+20241228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2024 05:50:45 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 29c75fb5a..82713f3d9 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.681 2024/12/21 10:55:02 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.682 2024/12/28 11:24:50 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1221"
+!define VERSION_MMDD  "1228"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9293ebd1b..b3b7c904b 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241221
+Release: 20241228
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 5c741cf4e..0739d278e 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241221
+Release: 20241228
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c52670c98..0970e1c38 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241221
+Release: 20241228
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 5c4c54ad1938a702ef9fc27e34267602a1668800 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 5 Jan 2025 02:21:57 +0100
Subject: [PATCH 097/106] ncurses-6.5-20250104.patch.gz

---
 Ada95/package/debian/copyright        |   4 +-
 COPYING                               |   4 +-
 NEWS                                  |  14 +-
 VERSION                               |   2 +-
 dist.mk                               |   6 +-
 include/nc_tparm.h                    |   5 +-
 man/manlinks.sed                      |  43 +-
 misc/terminfo.src                     | 832 +++++++++++---------------
 ncurses/base/MKlib_gen.sh             |  10 +-
 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 +-
 package/ncursest.spec                 |   2 +-
 progs/tput.c                          | 138 +++--
 test/package/debian-mingw/copyright   |   4 +-
 test/package/debian-mingw64/copyright |   4 +-
 test/package/debian/copyright         |   4 +-
 23 files changed, 528 insertions(+), 578 deletions(-)

diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright
index b4060150e..d4bbc9971 100644
--- a/Ada95/package/debian/copyright
+++ b/Ada95/package/debian/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 2017-2024,2025 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2010-2023,2024 by Thomas E. Dickey
+Copyright: 2010-2024,2025 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/COPYING b/COPYING
index 540047f12..6182a3bc6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright 2018-2023,2024 Thomas E. Dickey
+Copyright 2018-2024,2025 Thomas E. Dickey
 Copyright 1998-2017,2018 Free Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written
 authorization.
 
 -- vile:txtmode fc=72
--- $Id: COPYING,v 1.13 2024/01/05 21:13:17 tom Exp $
+-- $Id: COPYING,v 1.14 2025/01/04 10:53:46 tom Exp $
diff --git a/NEWS b/NEWS
index d5a2eccfb..045f52dca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
+-- Copyright 2018-2024,2025 Thomas E. Dickey                                 --
 -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4220 2024/12/29 00:59:43 tom Exp $
+-- $Id: NEWS,v 1.4226 2025/01/05 00:18:47 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250104
+	+ modify tput to warn about capabilities which expect parameters where
+	  none are given; also repair the feature where multiple capabilities
+	  can be handled on a single line.
+	+ cleanup use-clauses -TD
+	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
+	+ add vt220+ufkeys, vt220+sfkeys
+	+ revert man/manlinks.sed change, which loses aliases (cf: 20241228).
+	+ modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L
+
 20241228
 	+ correct conditional-compile for a case when the C compiler does not
 	  have a bool type.
diff --git a/VERSION b/VERSION
index 9ad974fa9..e539ae91c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20241228
+5:0:10	6.5	20250104
diff --git a/dist.mk b/dist.mk
index 75399ea8f..108034367 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1647 2024/12/28 11:24:50 tom Exp $
+# $Id: dist.mk,v 1.1649 2025/01/04 09:55:25 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20241228
+NCURSES_PATCH = 20250104
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_tparm.h b/include/nc_tparm.h
index 78170993f..12fb422ec 100644
--- a/include/nc_tparm.h
+++ b/include/nc_tparm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey                        2006                    *
  ****************************************************************************/
 
-/* $Id: nc_tparm.h,v 1.12 2023/04/16 17:57:28 tom Exp $ */
+/* $Id: nc_tparm.h,v 1.13 2025/01/04 23:42:30 tom Exp $ */
 
 #ifndef NC_TPARM_included
 #define NC_TPARM_included 1
@@ -88,6 +88,7 @@
 #define TIPARM_7(s,a,b,c,d,e,f,g) _nc_tiparm(7,s,a,b,c,d,e,f,g)
 #define TIPARM_8(s,a,b,c,d,e,f,g,h) _nc_tiparm(8,s,a,b,c,d,e,f,g,h)
 #define TIPARM_9(s,a,b,c,d,e,f,g,h,i) _nc_tiparm(9,s,a,b,c,d,e,f,g,h,i)
+#define TIPARM_N(N,s,a,b,c,d,e,f,g,h,i) _nc_tiparm(N,s,a,b,c,d,e,f,g,h,i)
 #endif
 
 #endif /* NC_TPARM_included */
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 1effdd739..f42986f69 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,4 +1,4 @@
-# $Id: manlinks.sed,v 1.23 2024/12/28 21:36:50 Branden.Robinson Exp $
+# $Id: manlinks.sed,v 1.24 2024/12/29 11:34:59 tom Exp $
 ##############################################################################
 # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
@@ -31,6 +31,9 @@
 # listed in the "NAME" section, i.e., the names that we would like to use
 # as aliases for the manpage -T.Dickey
 #
+# workaround for manpages without a SYNOPSIS
+s/^\.\\"SH/.SH/
+#
 # eliminate formatting controls that get in the way
 /^'\\"/d
 /\.\\"/d
@@ -72,8 +75,42 @@ s/ /\
 /g
 }
 #
-# delete remainder of document
-/^\.SH_([^N]/,${
+# in ".SH SYNOPSIS"
+# For readability, the NAME section may not contain all function names, but we
+# still want to make aliases for those.  Do this by extracting names from the
+# list of function prototypes in the synopsis.
+#
+# Remove any line that does not contain a '(', since we only want functions. 
+# then strip off return-type of each function.
+#
+# Finally, remove the parameter list, which begins with a '('.
+/^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
+/^\.ti/d
+/^[^(]*$/d
+# reduce
+#	.B "int add_wch( const cchar_t *\fIwch\fB );"
+# to
+#	add_wch( const cchar_t *\fIwch\fB );"
+s/^\([^ (]* [^ (]* [*]*\)//g
+s/^\([^ (]* [*]*\)//g
+# trim blanks in case we have
+#	void (*) (FORM *) field_init(const FORM *form);
+s/) (/)(/g
+# reduce stuff like
+#	void (*)(FORM *) field_init(const FORM *form);
+# to
+#	field_init(const FORM *form);
+s/^\(([^)]*)\)\(([^)]*)\)*[ ]*//g
+# rename marker temporarily
+s/\.SH_(/.SH_/
+# kill lines with ");", and trim off beginning of argument list.
+s/[()].*//
+# rename marker back
+s/\.SH_/.SH_(/
+}
+#
+# delete ".SH DESCRIPTION" and following lines
+/^\.SH_(DESCRIPTION/,${
 d
 }
 #
diff --git a/misc/terminfo.src b/misc/terminfo.src
index ccd4c3209..cffd49024 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1160 $
-#	$Date: 2024/12/28 20:42:05 $
+#	$Revision: 1.1163 $
+#	$Date: 2025/01/04 21:02:11 $
 #
 # 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
@@ -927,8 +927,7 @@ beterm|BeOS Terminal,
 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
-	kf1=\E[11~, kf10=\E[20~, kf11=\E[21~, kf12=\E[22~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~,
+	kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf6=\E[16~,
 	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
 	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
 	rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm,
@@ -937,6 +936,7 @@ beterm|BeOS Terminal,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=klone+color, use=vt220+pcedit,
+	use=xterm+r5+fkeys,
 
 #### Linux consoles
 #
@@ -975,25 +975,29 @@ linux-basic|Linux console (basic),
 	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
 	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, 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~, kmous=\E[M, kspd=^Z,
-	nel=\r\n, ri=\EM, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec\E]R,
+	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
+	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM,
+	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
 	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, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
 	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=vt220+pcedit, use=vt102+enq,
-	use=klone+sgr, use=ecma+color, use=linux+sfkeys,
+	use=klone+sgr, use=ecma+color, use=linux+lockeys,
+	use=linux+sfkeys, use=vt220+ufkeys,
+
+# VT220 uses F1-F5 for "local" manipulation, normally not sending anything to
+# the host.  Rather than adapt the numbering scheme used by xterm, Linux used
+# this arrangement which doubles the "[", making it inconsistent with most
+# terminals having function-keys in the same format as control sequences -TD
+linux+lockeys|Linux "local" keys in vt220 scheme,
+	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
 
 linux+decid|ncurses extension for Linux console DECID,
 	u8=\E[?6c, use=decid+cpr,
 
 linux+sfkeys|shifted function-keys for Linux console,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
+	use=vt220+sfkeys,
 
 linux-m|Linux console no color,
 	colors@, pairs@,
@@ -1146,26 +1150,23 @@ linux-vt|Linux console using VT codes for graphics,
 #
 # Note: The status-line support is buggy (dsl does not work).
 kon|kon2|Kanji ON Linux console,
-	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
+	am, bce, ccc, eo, mir, msgr, xenl, xon,
 	it#8, ncv#18,
 	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
 	cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F,
-	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+	ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
-	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~, kspd=^Z,
-	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec,
+	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec,
 	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;11%;m,
 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
-	use=ecma+sgr, use=klone+color, use=vt220+pcedit,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=ansi+rca2,
+	use=dec+sl, use=ecma+sgr, use=klone+color,
+	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+	use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -1237,16 +1238,12 @@ bterm|bogl virtual terminal,
 	acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J,
 	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
 	el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
-	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~,
-	kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[49m\E[39m, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N,
-	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=vt220+pcedit, use=vt220+cvis,
+	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
+	op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
+	rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
+	use=ansi+arrows, use=linux+lockeys, use=linux+sfkeys,
+	use=vt220+pcedit, use=vt220+cvis, use=vt220+ufkeys,
 
 #### Mach
 #
@@ -1327,14 +1324,10 @@ hurd|The GNU Hurd console server,
 	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
 	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
-	kb2=\E[G, kbs=^?, kcbt=\E[Z, 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~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m,
-	ri=\E[T, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\EM\E[?1000l,
+	kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+	kf4=\EOS, khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
+	op=\E[39;49m, ri=\E[T, rmir=\E[4l, rmso=\E[27m,
+	rmul=\E[24m, rs1=\EM\E[?1000l,
 	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,
 	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
@@ -1342,7 +1335,8 @@ hurd|The GNU Hurd console server,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
 	use=ecma+index, use=ecma+italics, use=klone+acs,
-	use=klone+color, use=vt220+cvis,
+	use=klone+color, use=linux+sfkeys, use=xterm+r5+fkeys,
+	use=vt220+cvis,
 
 #### QNX
 #
@@ -1674,14 +1668,10 @@ iris-color|xwsh|IRIX ANSI with color,
 #		CSI ? 5 h Reverse Video (DECSCNM).
 #
 pccon+keys|OpenBSD PC keyboard keys,
-	kbs=^?, kend=\E[8~, kent=\r, 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~, kf21=\E[35~,
-	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[7~, krfr=^R, use=ansi+arrows,
-	use=vt220+pcedit,
+	kbs=^?, kend=\E[8~, kent=\r, kf21=\E[35~, kf22=\E[36~,
+	kf23=\E[37~, kf24=\E[38~, khome=\E[7~, krfr=^R,
+	use=ansi+arrows, use=vt220+pcedit, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 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,
@@ -1806,11 +1796,9 @@ pcvt50w|DEC VT220 emulation with 50 lines and 132 cols,
 pcvt25-color|DEC VT220 emulation with 25 lines and color,
 	cols#80, lines#25,
 	is2=\E[1;25r\E[25;1H, kf1=\EOP, kf10=\E[29~, 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[17~,
+	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
 	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, use=pcvtXX,
-	use=ecma+color,
+	use=ecma+color, use=vt220+sfkeys,
 
 # Terminfo entries to enable the use of the ncurses library in colour on a
 # NetBSD-arm32 console (only tested on a RiscPC).
@@ -1884,10 +1872,9 @@ ofcons|DNARD OpenFirmware console,
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
 	bce,
 	colors#8, lines#25, pairs#64,
-	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	khome=\E[7~, op=\E[m, rs1=\Ec, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm, use=vt220,
+	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, khome=\E[7~,
+	op=\E[m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	use=xterm+r5+lockeys, use=vt220,
 
 wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta,
 	km, use=wsvt25,
@@ -2198,10 +2185,8 @@ teken-2022|teken as of 2022,
 	use=ansi+tabs, use=klone+color,
 
 teken-vt+fkeys|teken's xterm special keys,
-	kend=\E[F, 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[H,
-	use=vt220+pcedit,
+	kend=\E[F, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+	khome=\E[H, use=vt220+pcedit, use=xterm+r5+fkeys,
 
 teken-sc+fkeys|teken's syscons special keys,
 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
@@ -2708,20 +2693,19 @@ vt220-base|DEC VT220 as emulated,
 	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
 	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED,
 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
-	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, lf1=pf1,
-	lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
-	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m, rs1=\E[?3l,
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf13=\E[25~,
+	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, khlp=\E[28~,
+	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
+	rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l,
 	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+csr,
 	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
 	use=ansi+idl, use=ansi+local, use=vt220+vtedit,
+	use=vt220+ufkeys,
 
 vt220|vt200|DEC VT220,
 	use=vt220+cvis, use=vt220-base,
@@ -2766,10 +2750,17 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC VT220/200 in 8-bit mode,
 # See vt220 for an alternate mapping.
 #
 vt220d|DEC VT220 in VT100 mode with DEC function key labeling,
-	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~, kf20=\E[34~, kf5@, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220-old,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220+sfkeys,
+	use=vt220-old,
+
+# These are often mapped to unshifted/shifted keys on PC-keyboards -TD
+vt220+ufkeys|first 8 function-keys for VT220,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+vt220+sfkeys|second 8 function-keys for VT220,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
 
 vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins,
 	am@,
@@ -2836,27 +2827,23 @@ vt320|vt300|DEC VT320 7 bit terminal,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
+	el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
-	kbs=^?, kdch1=\E[3~, kel=\E[4~, 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~,
-	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
-	kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rev=\E[7m,
+	kbs=^?, kdch1=\E[3~, kel=\E[4~, kf12=\E[24~, khome=\E[1~,
+	kich1=\E[2~, knp=\E[6~, knxt=^I, kpp=\E[5~, kprv=\E[Z,
+	kslt=\E[4~, nel=\EE, rev=\E[7m,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
 	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=ansi+apparrows, use=ansi+csr, use=ansi+enq,
-	use=ansi+idl, use=ansi+local, use=dec+pp, use=vt220+cvis,
-	use=vt220+keypad, use=dec+sl,
+	smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul, use=dec+pp, use=dec+sl, use=vt220+cvis,
+	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
 
 vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy,
 	am@,
@@ -3015,24 +3002,24 @@ vt420|DEC VT420,
 # application has to know it.
 #
 vt420pc|DEC VT420 w/PC keyboard,
-	kdch1=^?, kend=\E[4~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kdch1=^?, kend=\E[4~, kf10=\E[21~, kf11=\E[23~,
 	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
 	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
-	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
+	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[23~,
 	kf26=\E[24~, kf27=\E[25~, kf28=\E[26~, kf29=\E[28~,
-	kf3=\E[13~, kf30=\E[29~, kf31=\E[31~, kf32=\E[32~,
-	kf33=\E[33~, kf34=\E[34~, kf35=\E[35~, kf36=\E[36~,
-	kf37=\E[23;2~, kf38=\E[24;2~, kf39=\E[25;2~, kf4=\E[14~,
-	kf40=\E[26;2~, kf41=\E[28;2~, kf42=\E[29;2~,
-	kf43=\E[31;2~, kf44=\E[32;2~, kf45=\E[33;2~,
-	kf46=\E[34;2~, kf47=\E[35;2~, kf48=\E[36;2~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	kf30=\E[29~, kf31=\E[31~, kf32=\E[32~, kf33=\E[33~,
+	kf34=\E[34~, kf35=\E[35~, kf36=\E[36~, kf37=\E[23;2~,
+	kf38=\E[24;2~, kf39=\E[25;2~, kf40=\E[26;2~,
+	kf41=\E[28;2~, kf42=\E[29;2~, kf43=\E[31;2~,
+	kf44=\E[32;2~, kf45=\E[33;2~, kf46=\E[34;2~,
+	kf47=\E[35;2~, kf48=\E[36;2~, 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,
+	use=xterm+r5+lockeys, use=vt420,
 
 vt420pcdos|DEC VT420 w/PC for DOS Merge,
 	lines#25,
@@ -3043,12 +3030,8 @@ vt420pcdos|DEC VT420 w/PC for DOS Merge,
 	sgr0=\E[m, smsc=\E[?1;2r\E[34h, use=vt420pc,
 
 vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys,
-	kdch1=^?, 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~,
-	khome=\E[H, lf1=\EOP, lf2=\EOQ, lf3=\EOR, lf4=\EOS,
+	kdch1=^?, kf10=\E[21~, khome=\E[H, lf1=\EOP, lf2=\EOQ,
+	lf3=\EOR, lf4=\EOS, use=vt220+sfkeys, use=xterm+r5+fkeys,
 	use=vt420,
 
 vt510|DEC VT510,
@@ -3456,13 +3439,11 @@ nsterm-c-s|AppKit Terminal.app v51+ w/MacRoman charset (full color w/statusline)
 nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
 	bw@, mir, npc,
 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
-	kdch1=\E[3~, kend=\E[F, 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[22~, kf19=\E[33~,
-	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
-	vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc,
-	use=xterm+alt47, use=nsterm-c-s-acs, use=vt220+cvis,
+	kdch1=\E[3~, kend=\E[F, kf18=\E[22~, kf5=\E[15~,
+	khome=\E[H, knp=\E[6~, kpp=\E[5~, vpa=\E[%i%p1%dd,
+	kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=vt220+cvis,
+	use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47,
+	use=nsterm-c-s-acs,
 
 # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
 # the background color erase feature. The newer version 240.2 in Mac OS X
@@ -3636,9 +3617,7 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
 	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
-	kend=\EOF, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
+	kend=\EOF, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
@@ -3647,8 +3626,9 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
-	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
-	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
+	use=vt100+pfkeys, use=xterm+r5+fkeys, use=xterm+alt47,
+	use=xterm+sl-twm, use=xterm+x11mouse,
+	use=xterm+256setaf, use=vt220+cvis,
 
 # iTerm2
 #
@@ -4276,11 +4256,7 @@ putty+fnkeys|fn-keys for PuTTY,
 	use=putty+fnkeys+esc,
 
 putty+fnkeys+esc|ESC[n~ fn-keys for PuTTY,
-	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~,
+	use=vt220+sfkeys, use=xterm+r5+fkeys,
 
 putty+fnkeys+linux|Linux fn-keys for PuTTY,
 	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
@@ -4435,16 +4411,14 @@ teraterm2.3|Tera Term Pro 2.3,
 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, 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~, op=\E[100m, rev=\E[7m, ri=\EM,
-	rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, smso=\E[7m,
-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+idl,
-	use=vt220+vtedit, use=vt100+enq, use=klone+color,
-	use=vt100, use=vt220+cvis,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m,
+	ri=\EM, rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017,
+	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+	use=xterm+r5+lockeys, use=ansi+idl, use=vt220+vtedit,
+	use=vt100+enq, use=klone+color, use=vt100,
+	use=vt220+cvis, use=vt220+sfkeys,
 
 # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary
 # to choose a Windows OEM font).
@@ -4882,18 +4856,23 @@ xterm-r5|xterm R5 version,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
 	hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
-	kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM,
+	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m,
 	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
 	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
 	use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local,
-	use=vt220+pcedit, use=vt100+enq,
+	use=vt220+pcedit, use=vt100+enq, use=xterm+r5+fkeys,
+
+# X11R5 used function-keys based on, but different from VT220, assigning keys
+# F1-R5 (unlike VT220), and limiting to F12 (perhaps influenced by other
+# keyboards).
+xterm+r5+fkeys|VT220-like function keys in X11R5 xterm,
+	use=xterm+r5+lockeys, use=vt220+ufkeys,
+xterm+r5+lockeys|XTerm "local" keys in vt220 scheme,
+	kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 
 # Compatible with the R6 xterm
 # (from XFree86 3.2 distribution, <acsc> and <it> added, <blink@> removed)
@@ -4907,19 +4886,16 @@ xterm-r6|xterm X11R6 version,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~, kmous=\E[M, meml=\El, memu=\Em,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kmous=\E[M,
+	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+	rmkx=\E[?1l\E>,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
 	use=xterm+alt47, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
 	use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit,
-	use=xterm+kbs, use=vt100+enq,
+	use=xterm+kbs, use=vt100+enq, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 xterm-old|antique xterm version,
 	use=xterm-r6,
@@ -4943,14 +4919,10 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
 	home=\E[H, hpa=\E[%i%p1%dG, ind=\n,
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
-	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, 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~, kmous=\E[M, kslt=\E[4~,
-	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=^O,
+	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kfnd=\E[1~,
+	kmous=\E[M, kslt=\E[4~, meml=\El, memu=\Em, rev=\E[7m,
+	ri=\EM, rmacs=^O, rmam=\E[?7l, 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>,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
@@ -4963,8 +4935,8 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
 	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
-	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
-	use=vt220+pcedit,
+	use=xterm+r5+fkeys, use=ecma+color, use=vt220+cvis,
+	use=vt220+keypad, use=vt220+pcedit, use=vt220+sfkeys,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -5095,17 +5067,13 @@ xterm+pcfkeys|xterm fragment for PC-style fkeys,
 # kf21 control f1       = \E[42~
 # kf31 shift control f1 = \E[52~
 xterm+nopcfkeys|fragment without PC-style fkeys,
-	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~, kf21=\E[42~, kf22=\E[43~, kf23=\E[44~,
-	kf24=\E[45~, kf25=\E[46~, kf26=\E[47~, kf27=\E[48~,
-	kf28=\E[49~, kf29=\E[50~, kf3=\E[13~, kf30=\E[51~,
-	kf31=\E[52~, kf32=\E[53~, kf33=\E[54~, kf34=\E[55~,
-	kf35=\E[56~, kf36=\E[57~, kf37=\E[58~, kf38=\E[59~,
-	kf39=\E[60~, kf4=\E[14~, kf40=\E[61~, kf41=\E[62~,
-	kf42=\E[63~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~,
+	kf21=\E[42~, kf22=\E[43~, kf23=\E[44~, kf24=\E[45~,
+	kf25=\E[46~, kf26=\E[47~, kf27=\E[48~, kf28=\E[49~,
+	kf29=\E[50~, kf30=\E[51~, kf31=\E[52~, kf32=\E[53~,
+	kf33=\E[54~, kf34=\E[55~, kf35=\E[56~, kf36=\E[57~,
+	kf37=\E[58~, kf38=\E[59~, kf39=\E[60~, kf40=\E[61~,
+	kf41=\E[62~, kf42=\E[63~, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 vt100+noapp|fragment with cursor keys in normal mode,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
@@ -5250,8 +5218,7 @@ xterm+edit|fragment for 6-key editing-keypad,
 	use=xterm+pc+edit, use=vt220+pcedit,
 
 xterm+decedit|fragment for vt220 6-key editing-keypad,
-	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	use=xterm+vt+edit,
+	use=vt220+vtedit, use=xterm+vt+edit,
 
 xterm+pc+edit|fragment for pc-style editing keypad,
 	kend=\E[4~, khome=\E[1~,
@@ -5699,14 +5666,11 @@ xterm-sco|xterm with SCO function keys,
 #
 xterm-vt220|xterm emulating VT220,
 	npc,
-	kcbt=\E[Z, kend=\E[4~, 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~,
-	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, nel=\EE,
+	kcbt=\E[Z, kend=\E[4~, khome=\E[1~, kmous=\E[M, nel=\EE,
 	use=xterm+app, use=xterm+edit, use=vt220+keypad,
 	use=ecma+italics, use=ecma+index, use=ansi+rep,
-	use=ecma+strikeout, use=xterm+focus, use=xterm+sm+1006,
+	use=ecma+strikeout, use=vt220+sfkeys,
+	use=xterm+r5+fkeys, use=xterm+focus, use=xterm+sm+1006,
 	use=xterm+tmux, use=xterm+keypad, use=xterm-basic,
 
 xterm-vt52|xterm emulating DEC VT52,
@@ -6090,20 +6054,18 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
 	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I,
 	ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l,
-	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	kend=\E[8~, khome=\E[7~, kich1=\E[2~, kmous=\E[M,
+	knp=\E[6~, kpp=\E[5~, rev=\E[7m, ri=\EM, rmacs=^O,
+	rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l, 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<,
 	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=ansi+apparrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=decid+cpr,
-	use=ecma+color, use=vt220+keypad,
+	smul=\E[4m, use=xterm+r5+fkeys, use=ansi+apparrows,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=decid+cpr, use=ecma+color, use=vt220+keypad,
 
 # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
 # work in that case.  This entry uses xterm+acs, to work around that problem.
@@ -6620,11 +6582,10 @@ konsole+pcfkeys|konsole subset of xterm+pcfkeys,
 # it is still useful for deriving the other entries, since the developer
 # provided function-keys based on xterm.
 konsole-vt100|KDE console window with VT100 (sic) keyboard,
-	kend=\E[F, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
-	kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
-	use=konsole-base,
+	kend=\E[F, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@,
+	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf20@, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	use=xterm+r5+lockeys, use=konsole-base,
 
 # Obsolete: vt420pc.keytab was added in June 2000, dropped from the install in
 # September 2008 and removed in June 2016.  The developer who removed it stated
@@ -7271,21 +7232,17 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
 	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	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~, nel=\EE,
-	op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+	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, smkx=\E[?1h\E=,
 	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
 	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
 	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
-	use=ecma+index, use=vt220+cvis,
+	use=ecma+index, use=vt220+cvis, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 #### VWM
 # http://vwm.sourceforge.net/
@@ -7300,9 +7257,7 @@ vwmterm|VWM terminal,
 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
 	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[22~, 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~,
+	kdch1=\E[3~, kend=\E[4~, kf11=\E[22~, kf12=\E[23~,
 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmacs=\E[10m,
 	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
 	setaf=\E[3%p1%dm,
@@ -7310,7 +7265,8 @@ vwmterm|VWM terminal,
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
 	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
 	smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr,
-	use=vt220+cvis, use=xterm+alt1049,
+	use=linux+lockeys, use=vt220+cvis, use=vt220+ufkeys,
+	use=xterm+alt1049,
 
 #### MGR
 #
@@ -7341,10 +7297,8 @@ mgr-sun|Mgr window with Sun keyboard,
 	kopn=\E[198z, kpp=\E[216z, kund=\E[195z, use=mgr,
 mgr-linux|Mgr window with Linux keyboard,
 	ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~,
-	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, 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~, knp=\E[6~, kpp=\E[5~, use=mgr,
+	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, khome=\E[1~, knp=\E[6~,
+	kpp=\E[5~, use=linux+lockeys, use=vt220+ufkeys, use=mgr,
 
 #### SIMPLETERM
 # st.suckless.org
@@ -7479,16 +7433,15 @@ simpleterm|old-st|simpleterm 0.1.1,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
 	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
 	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, 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~,
+	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m,
 	rmul=\E[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, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
 	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
-	use=ecma+index, use=klone+color, use=xterm+acs,
+	use=ecma+index, use=klone+color, use=xterm+r5+fkeys,
+	use=xterm+acs,
 
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
@@ -7585,20 +7538,20 @@ terminator|Terminator no line wrap,
 	flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, 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=^?,
-	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~, 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,
+	kf1=\EOP, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
+	kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[1~,
+	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,
 	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, smacs=\E(0, smir=\E[4h, smso=\E[7m,
 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
 	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
-	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
+	use=bracketed+paste, use=ecma+italics, use=ecma+index,
+	use=vt220+cvis, use=vt220+pcedit, use=xterm+r5+fkeys,
 	use=xterm+256setaf, use=xterm+sl-twm,
-	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
+	use=xterm+alt1049,
 
 #### TERMINOLOGY
 # https://www.enlightenment.org/about-terminology
@@ -8166,17 +8119,16 @@ domterm|DomTerm web client,
 # + reports window size, none of the other window reports
 wezterm|Wez's Terminal Emulator,
 	am, bce, km, mir, msgr, npc, xenl,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
 	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
 	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
-	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]104\007,
+	rs2=\E[!p\E[?3;4l\E[4l\E>,
 	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, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	Smol=\E[53m, Smulx=\E[4:%p1%dm,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, Smol=\E[53m,
+	Smulx=\E[4:%p1%dm,
 	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
@@ -8184,10 +8136,10 @@ wezterm|Wez's Terminal Emulator,
 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
 	use=report+version, use=vt220+cvis,
-	use=xterm+256color2, use=xterm+alt+title,
-	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
-	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
-	use=xterm+tmux,
+	use=xterm+256color2, use=xterm+acs,
+	use=xterm+alt+title, use=xterm+focus, use=xterm+pcc2,
+	use=xterm+pce2, use=xterm+pcf2, use=xterm+sl-alt,
+	use=xterm+sm+1006, use=xterm+tmux,
 
 #### Contour
 # https://github.com/contour-terminal/contour
@@ -8364,12 +8316,7 @@ ghostty|Ghostty terminal emulator,
 	cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n,
 	cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
 	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?,
-	kcbt=\E[Z, kend=\EOF, kent=\EOM, kf13=\E[1;2P,
-	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf25=\E[1;5P,
-	kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, kf37=\E[1;6P,
-	kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S, kf49=\E[1;3P,
-	kf50=\E[1;3Q, kf51=\E[1;3R, kf52=\E[1;3S, kf61=\E[1;4P,
-	kf62=\E[1;4Q, kf63=\E[1;4R, op=\E[39;49m, rev=\E[7m,
+	kcbt=\E[Z, kend=\EOF, kent=\EOM, op=\E[39;49m, rev=\E[7m,
 	ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>,
 	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
 	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
@@ -8391,7 +8338,7 @@ ghostty|Ghostty terminal emulator,
 	use=xterm+256color2, use=xterm+acs,
 	use=xterm+alt+title, use=bracketed+paste,
 	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
-	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf0,
+	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
 	use=xterm+sm+1006, use=xterm+sl-twm,
 
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
@@ -8547,9 +8494,7 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
-	kbs=^?, kcbt=\E[Z, 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~,
+	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
 	rs2=\Ec\E[?1000l\E[?25h,
@@ -8561,6 +8506,7 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
 	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
 	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
+	use=xterm+r5+fkeys,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8915,14 +8861,9 @@ dvtm|dynamic virtual terminal manager,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
 	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^,
-	kend=\E[8~, kent=\EOM, kf0=\E[21~, 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~, kf21=\E[23$,
-	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, rev=\E[7m,
-	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf21=\E[23$,
+	kf22=\E[24$, khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b,
+	rev=\E[7m, ri=\EM, rmir=\E[4l, 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,
@@ -8933,7 +8874,8 @@ dvtm|dynamic virtual terminal manager,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+idl, use=ansi+local, use=xterm+alt47,
 	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
-	use=ecma+italics, use=vt100+4bsd,
+	use=ecma+italics, use=vt100+4bsd, use=vt220+sfkeys,
+	use=xterm+r5+fkeys,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
 	colors#0x100, pairs#0x10000,
@@ -9021,10 +8963,9 @@ ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in VT220-8 mode (no status line),
 #
 ncsa-vt220|NCSA Telnet using VT220-compatible function keys,
 	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, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, use=ncsa,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf2=\EOQ, kf3=\EOR,
+	kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	use=ncsa, use=vt220+sfkeys,
 
 #### Pilot Pro Palm-Top
 #
@@ -9174,9 +9115,8 @@ sun-17|Sun 17-line window,
 sun-12|Sun 12-line window,
 	cols#80, lines#12, use=sun,
 sun-1|Sun 1-line window for sysline,
-	eslok, hs,
-	cols#80, lines#1,
-	dsl=^L, fsl=\E[K, tsl=\r, use=sun,
+	lines#1,
+	dsl=^L, fsl=\E[K, tsl=\r, use=sun, use=dec+sl,
 sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character,
 	ich1@, rmir@, smir@, use=sun,
 sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history,
@@ -9429,12 +9369,11 @@ nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
 	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
 # (news517-w: this had :TY=sjis:. --esr)
 nwp517-w|nwp-517-w|nwp-517 VT200 132 cols 50 rows,
-	eslok, hs,
 	cols#132, lines#50,
-	OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$},
+	OTi2=\E[2$~\n, dsl=\E[1$~,
 	is2=\E7\E[r\E8\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
 	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
-	tsl=\E[1$}\E[;%df, use=vt220-base,
+	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
 
 #### Common Desktop Environment
 #
@@ -9451,11 +9390,6 @@ dtterm|CDE desktop terminal,
 	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH,
 	ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l,
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
-	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~,
 	khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l,
 	rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
@@ -9463,8 +9397,9 @@ dtterm|CDE desktop terminal,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr, use=vt220+vtedit,
-	use=vt220+cvis, use=ecma+color,
+	use=ansi+sgr, use=decid+cpr, use=ecma+color,
+	use=vt220+cvis, use=vt220+sfkeys, use=vt220+vtedit,
+	use=xterm+r5+fkeys,
 
 ######## Non-Unix Consoles
 #
@@ -9583,21 +9518,18 @@ cygwin|ANSI emulation for Cygwin,
 	am, hs, mir, msgr, xon,
 	colors#8, it#8, pairs#64,
 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
-	ind=\n, invis=\E[8m, kb2=\E[G, 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~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
-	rev=\E[7m, ri=\EM, 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,
+	ind=\n, invis=\E[8m, kb2=\E[G, khome=\E[1~, kspd=^Z,
+	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+	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,
 	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
 	tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
 	use=ansi+idc, use=ansi+idl, use=ansi+local,
 	use=ansi+rca2, use=vt220+pcedit, use=vt102+enq,
-	use=klone+acs, use=xterm+alt47,
+	use=klone+acs, use=linux+lockeys, use=vt220+sfkeys,
+	use=vt220+ufkeys, use=xterm+alt47,
 
 # I've supplied this so that you can help test new values and add other
 # features.  Cheers, earnie_boyd@yahoo.com.
@@ -9610,20 +9542,17 @@ cygwinDBG|Debug Version for Cygwin,
 	cols#80, lines#24,
 	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n,
-	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, 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~, kspd=^Z, nel=\r\n,
-	op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
+	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~,
+	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, 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%;%?%p7%t;8%;%?%p9%t;12%;m,
 	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
 	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
-	use=klone+acs, use=klone+color, use=vt220+pcedit,
-	use=vt220+cvis, use=vt102+enq,
+	use=klone+acs, use=klone+color, use=linux+lockeys,
+	use=vt102+enq, use=vt220+pcedit, use=vt220+cvis,
+	use=vt220+sfkeys, use=vt220+ufkeys,
 
 #### DJGPP
 
@@ -9757,38 +9686,35 @@ djgpp|ANSI emulation for DJGPP 2.05,
 	     \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, civis=\E[1v, cnorm=\E[v, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v,
-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
-	ich1=\E[@, ind=\E[S, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
+	cub1=^H, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
+	ech=\E[%p1%dX, el1=\E[1K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
+	ind=\E[S, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
 	kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~,
-	kf2=\E[[B, kf20=\E[32~, kf21=\E[33~, kf22=\E[34~,
-	kf23=\E[35~, kf24=\E[36~, kf25=\E[47~, kf26=\E[48~,
-	kf27=\E[49~, kf28=\E[50~, kf29=\E[51~, kf3=\E[[C,
-	kf30=\E[52~, kf31=\E[53~, kf32=\E[54~, kf33=\E[55~,
-	kf34=\E[56~, kf35=\E[57~, kf36=\E[58~, kf37=\E[59~,
-	kf38=\E[60~, kf39=\E[61~, kf4=\E[[D, kf40=\E[62~,
-	kf41=\E[63~, kf42=\E[64~, kf43=\E[65~, kf44=\E[66~,
-	kf45=\E[67~, kf46=\E[68~, kf48=\E[80~, kf5=\E[[E,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T, rmso=\E[m,
+	kf20=\E[32~, kf21=\E[33~, kf22=\E[34~, kf23=\E[35~,
+	kf24=\E[36~, kf25=\E[47~, kf26=\E[48~, kf27=\E[49~,
+	kf28=\E[50~, kf29=\E[51~, kf30=\E[52~, kf31=\E[53~,
+	kf32=\E[54~, kf33=\E[55~, kf34=\E[56~, kf35=\E[57~,
+	kf36=\E[58~, kf37=\E[59~, kf38=\E[60~, kf39=\E[61~,
+	kf40=\E[62~, kf41=\E[63~, kf42=\E[64~, kf43=\E[65~,
+	kf44=\E[66~, kf45=\E[67~, kf46=\E[68~, kf48=\E[80~,
+	kf6=\E[17~, khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T,
 	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,
-	alt_A=\E[82~, alt_B=\E[82~, alt_C=\E[83~, alt_D=\E[84~,
-	alt_E=\E[85~, alt_F=\E[86~, alt_G=\E[87~, alt_H=\E[88~,
-	alt_I=\E[89~, alt_J=\E[90~, alt_K=\E[91~, alt_L=\E[92~,
-	alt_M=\E[93~, alt_N=\E[94~, alt_O=\E[95~, alt_P=\E[96~,
-	alt_Q=\E[97~, alt_R=\E[98~, alt_S=\E[99~, alt_T=\E[100~,
-	alt_U=\E[101~, alt_V=\E[102~, alt_W=\E[103~,
-	alt_X=\E[104~, alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~,
-	kDN5=\E[38~, kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~,
-	kLFT5=\E[39~, kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~,
-	kUP5=\E[37~, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
-	use=vt220+pcedit, use=ecma+index,
+	sgr0=\E[m, smul=\E[4m, alt_A=\E[82~, alt_B=\E[82~,
+	alt_C=\E[83~, alt_D=\E[84~, alt_E=\E[85~, alt_F=\E[86~,
+	alt_G=\E[87~, alt_H=\E[88~, alt_I=\E[89~, alt_J=\E[90~,
+	alt_K=\E[91~, alt_L=\E[92~, alt_M=\E[93~, alt_N=\E[94~,
+	alt_O=\E[95~, alt_P=\E[96~, alt_Q=\E[97~, alt_R=\E[98~,
+	alt_S=\E[99~, alt_T=\E[100~, alt_U=\E[101~,
+	alt_V=\E[102~, alt_W=\E[103~, alt_X=\E[104~,
+	alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~, kDN5=\E[38~,
+	kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~, kLFT5=\E[39~,
+	kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~, kUP5=\E[37~,
+	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+	use=ansi+sgr, use=ansi+sgrso, use=ecma+index,
+	use=linux+lockeys, use=vt220+pcedit, use=vt220+ufkeys,
 
 djgpp203|entry for DJGPP 2.03,
 	OTbs, am,
@@ -9804,13 +9730,12 @@ djgpp204|entry for DJGPP 2.04,
 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP,
 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
 	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
-	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~, kll=\E[4~, 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=ansi+arrows,
-	use=ansi+idl, use=ansi+local, use=vt220+pcedit,
-	use=ecma+index,
+	kf0=\E[21~, kf10=\E[21~, kf6=\E[17~, kf7=\E[18~,
+	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kll=\E[4~, 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=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=linux+lockeys, use=vt220+pcedit, use=ecma+index,
 
 #### U/Win
 
@@ -12962,13 +12887,12 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	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,
-	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
-	kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h,
-	nel=\EE, prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
+	kcuu1=\EOA, kf1=\EOP, kf17=\E[K, kf18=\E[31~, kf19=\E[32~,
+	kf2=\EOQ, kf20=\E[33~, kf21=\E[34~, kf22=\E[35~,
+	kf23=\E[1~, kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M,
+	ll=\E[24E, mc0=\E[?19h, nel=\EE, prot=\E[1"q, 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,
@@ -12976,7 +12900,7 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	    %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, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
-	use=ansi+pp, use=ansi+sgrbold,
+	use=ansi+pp, use=ansi+sgrbold, use=vt220+ufkeys,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
@@ -13143,16 +13067,13 @@ wy75|wyse75|Wyse 75,
 	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
-	kf1=\E[?5i, 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[?3i,
-	kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
-	khlp=\E[28~, kich1=\E[@, kil1=\E[L, knp=\E[6~, kpp=\E[5~,
-	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, rc=\E8, rev=\E[1t\E[7m,
-	ri=\EM$<2>, 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$<80>, rs3=\E[?5l, sc=\E7,
+	kf1=\E[?5i, kf2=\E[?3i, kf21=\E[35~, kf3=\E[2i, kf4=\E[@,
+	kf5=\E[M, kfnd=\E[1~, khlp=\E[28~, kich1=\E[@, kil1=\E[L,
+	knp=\E[6~, kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i,
+	rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, 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$<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%;,
@@ -13160,7 +13081,8 @@ wy75|wyse75|Wyse 75,
 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
 	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
 	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
-	use=vt220+cvis, use=vt220+keypad,
+	use=vt220+cvis, use=vt220+keypad, use=vt220+sfkeys,
+	use=vt220+ufkeys,
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -13209,13 +13131,9 @@ wy85|wyse85|Wyse 85,
 	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
 	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
-	is3=\E>\E(B\E)0\017\E[m, 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~,
-	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmam=\E[?7l,
-	rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
+	is3=\E>\E(B\E)0\017\E[m, khlp=\E[28~, khome=\E[26~,
+	lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
 	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	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%;,
@@ -13224,7 +13142,7 @@ wy85|wyse85|Wyse 85,
 	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad,
+	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|Wyse 85 with visible bell,
@@ -13304,14 +13222,10 @@ wy185|wyse185|Wyse 185,
 	hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
 	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
-	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, 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~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
-	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
-	rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[27m, rmul=\E[24m,
+	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, khlp=\E[28~,
+	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
+	rc=\E8, ri=\EM$<2>, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
+	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%;%?
@@ -13321,6 +13235,7 @@ wy185|wyse185|Wyse 185,
 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
+	use=vt220+sfkeys, use=vt220+ufkeys,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|Wyse 185 with 24 data lines,
@@ -13509,30 +13424,25 @@ wy370-nk|Wyse 370 without function keys,
 #
 wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard,
 	kcbt=\E[Z, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\E[?3i,
-	kf3=\E[2i, kf4=\E[@, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kich1=\EOP, kil1=\EOP, knp=\E[U,
-	kpp=\E[V, use=ansi+arrows, use=wy370-nk,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf2=\E[?3i, kf3=\E[2i, kf4=\E[@, kf5=\E[M, kich1=\EOP,
+	kil1=\EOP, knp=\E[U, kpp=\E[V, use=ansi+arrows,
+	use=vt220+ufkeys, use=wy370-nk,
 #
 #	Function key set for the VT-320 (and wy85) compatible keyboard
 #
 wy370-105k|Wyse 370 with 105 key keyboard,
-	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~, kf20=\E[34~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
-	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
-	lf4=PF4, use=ansi+arrows, use=vt220+vtedit, use=wy370-nk,
-	use=vt220+keypad,
+	kfnd=\E[1~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
+	lf3=PF3, lf4=PF4, use=ansi+arrows, use=vt220+vtedit,
+	use=wy370-nk, use=vt220+keypad, use=vt220+sfkeys,
+	use=vt220+ufkeys,
 #
 #	Function key set for the PC compatible keyboard
 #
 wy370-EPC|Wyse 370 with 102 key keyboard,
-	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	kich1=\E[2~, knp=\E[U, kpp=\E[V, use=ansi+arrows,
+	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, kf5=\E[M, kich1=\E[2~, knp=\E[U,
+	kpp=\E[V, use=ansi+arrows, use=vt220+ufkeys,
 	use=wy370-nk,
 #
 #	Wyse 370 with visual bell.
@@ -13639,14 +13549,11 @@ wy520|wyse520|Wyse 520,
 	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
-	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~, kf20=\E[34~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
-	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
-	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,
+	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
+	lf4=PF4, mc0=\E[0i, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
+	rmcup=\E[ R, rmir=\E[4l, 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,
 	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,
@@ -13655,6 +13562,7 @@ wy520|wyse520|Wyse 520,
 	use=ansi+arrows, use=ansi+csr, use=ansi+local,
 	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
 	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+	use=vt220+sfkeys, use=vt220+ufkeys,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13687,9 +13595,8 @@ wy520-wvb|wyse520-wvb|Wyse 520 with visible bell 132-columns,
 #                  to CTRL-C: stty intr '^c') for it to work since the
 #                  Delete key sends 7FH.
 wy520-epc|wyse520-epc|Wyse 520 with EPC keyboard,
-	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, kf1=\E[11~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, khome=\E[H,
-	use=wy520,
+	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, khome=\E[H,
+	use=xterm+r5+fkeys, use=wy520,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 #       with EPC keyboard.
@@ -15596,13 +15503,12 @@ aaa-28|Ann Arbor Ambassador/28 lines,
 	rmcup=\E[60;0;0;28p\E[28;1H\E[K,
 	smcup=\E[H\E[J$<156>\E[28;0;0;28p, use=aaa+unk,
 aaa-30-s|aaa-s|Ann Arbor Ambassador/30 lines w/status,
-	eslok, hs,
 	lines#29,
 	dsl=\E7\E[60;0;0;30p\E[1;1H\E[K\E[H\E8\r\n\E[K,
-	fsl=\E[>51l, is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
+	is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
 	rmcup=\E[60;1;0;30p\E[29;1H\E[K,
 	smcup=\E[H\E[J$<156>\E[30;1;0;30p\E[30;1H\E[K,
-	tsl=\E[>51h\E[1;%p1%dH\E[2K, use=aaa+unk,
+	use=aaa+unk, use=guru+s,
 aaa-30-s-rv|aaa-s-rv|Ann Arbor Ambassador/30 lines+status+reverse video,
 	use=aaa+rv, use=aaa-30-s,
 aaa-s-ctxt|aaa-30-s-ctxt|Ann Arbor Ambassador/30 lines+status+save context,
@@ -16843,14 +16749,13 @@ dg+color|Color info for Data General D470C terminals in ANSI mode,
 	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,
 	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
+	use=dg+color8,
 
 dgmode+color|Color info for Data General D470C terminals in DG mode,
 	colors#16, pairs#0x100,
@@ -16861,8 +16766,6 @@ dgmode+color|Color info for Data General D470C terminals in DG mode,
 	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}%*
@@ -16870,7 +16773,7 @@ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
 	oc=\036RG01A00FF00000000\036RG01B00000000FF00
 	   \036RG01C007F00000000\036RG01D000000007F00,
 	op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D,
-	scp=\036RG2%p1%02X,
+	scp=\036RG2%p1%02X, use=dg+ccc,
 
 # Colors are in the order:  normal, reverse, dim, dim + reverse.
 dg+ccc|Configurable color info for DG D430C terminals in DG mode,
@@ -19128,13 +19031,10 @@ prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
 	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
-	is2=\E[&p\E[<12l\E F, kclr=^L, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+	is2=\E[&p\E[<12l\E F, kclr=^L, kf13=\E[25~, kf14=\E[26~,
 	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\r\n, 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,
+	nel=\r\n, 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\sF\E[3g\E[9;17;25;33;41;49;57;65;73
 	    \sN,
 	sc=\E[%y,
@@ -19143,7 +19043,7 @@ prism9|p9|P9|MDC Prism-9 in ANSI mode,
 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp,
+	use=ansi+pp, use=xterm+r5+fkeys,
 
 # p9-w: Prism-9 in 132 column mode
 # --------------------------------
@@ -19561,17 +19461,13 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	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,
-	kf0=\EOy, 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~, kf20=\E[34~,
-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
+	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
+	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
+	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
+	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+	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>,
 	sc=\E7,
@@ -19581,7 +19477,7 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
 	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
 
 ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 	cols#132,
@@ -19619,17 +19515,13 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	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,
-	kf0=\EOy, 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~, kf20=\E[34~,
-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m,
+	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
+	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
+	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
+	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+	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>,
 	sc=\E7,
@@ -19639,7 +19531,7 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
 	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
-	use=ncr260vt+sl,
+	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
 
 ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 	cols#132,
@@ -21374,24 +21266,22 @@ osexec|Osborne executive,
 # See
 #	https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
 minix|minix console (v3),
-	NQ,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
-	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
+	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf10=\E[21~,
 	kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~,
 	kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~,
-	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~,
+	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~,
 	kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~,
 	kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~,
 	kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~,
-	kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~,
+	kf29=\E[20;5~, kf30=\E[21;5~, kf31=\E[11;6~,
 	kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~,
 	kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~,
-	kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~,
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
-	use=minix-3.0,
+	kf38=\E[19;6~, kf39=\E[20;6~, kf40=\E[21;6~, kich1=\E[@,
+	knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
+	use=xterm+r5+fkeys, use=minix-3.0,
 
 minix-3.0|minix console (v3.0),
 	use=ecma+color, use=minix-1.7,
@@ -21778,7 +21668,7 @@ screen.minitel1b-nb|Screen specific for minitel1b-nb,
 # From: Alexandre Montaron, 29 Sep 2016
 
 linux-m1|Linux Minitel 1 "like" Couleurs,
-	am, bw@, ccc, mir, msgr, xenl,
+	am, ccc, mir, msgr, xenl,
 	it#8, ncv#16,
 	acsc=a\261f\370g\361h\260j\274k\273l\311m\310n\316q\315t
 	     \314u\271v\312w\313x\272y\363z\362{\343|\252~\372,
@@ -21790,19 +21680,15 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	      %{255}%&%02X,
 	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
 	kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r,
-	kdl1=\E\E[A, 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~, kil1=\E\E[B, kmous=\E[M, nel=\EE,
-	oc=\E]R\E]P3FFFF80, op=\E[39;49m, 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], sgr0=\E[m,
-	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m,
-	smso=\E[7m, tbc=\E[3g, 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,
+	kdl1=\E\E[A, kent=\EOM, kf2=\E[[B, khome=\E[1~,
+	kil1=\E\E[B, kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80,
+	op=\E[39;49m, 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], sgr0=\E[m, smacs=^N, smam=\E[?7h,
+	smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g,
+	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
@@ -21814,8 +21700,9 @@ linux-m1|Linux Minitel 1 "like" Couleurs,
 	   \n\n\n\n\n\n\n\n\n\n,
 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local1,
-	use=klone+color, use=vt220+pcedit, use=vt220+cvis,
-	use=linux+decid,
+	use=klone+color, use=linux+decid, use=linux+lockeys,
+	use=vt220+pcedit, use=vt220+cvis, use=vt220+sfkeys,
+	use=vt220+ufkeys,
 
 # 1. Using double-shapes for VT100 graphical chars (eg: mc).
 # 2. Native brown color corrected to good yellow color.
@@ -21872,9 +21759,7 @@ linux-s|Linux console with added status line at bottom,
 
 screen.linux-m1|Linux m1 specific for screen,
 	ncv@,
-	kclr=\E\r, 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@,
+	kclr=\E\r, kdl1=\E\E[A, kil1=\E\E[B, rmul@, smul@,
 	u8=\E[?1;2c,
 	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
@@ -21885,6 +21770,7 @@ screen.linux-m1|Linux m1 specific for screen,
 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\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=decid+cpr, use=xterm+x11mouse, use=screen,
+	use=vt220+sfkeys,
 
 screen.linux-m1b|Linux m1b specific for screen,
 	colors@, pairs@,
@@ -21898,24 +21784,24 @@ screen.linux-m2|Linux m2 specific for screen,
 # Putty :
 
 putty-m1|Putty Minitel 1 "like" Couleurs,
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m1,
+	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m1,
 
 putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m1b,
+	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m1b,
 
 putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
 	     {||}}~~,
-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
-	use=ecma+index, use=linux-m2,
+	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+	use=xterm+r5+lockeys, use=xterm+alt47,
+	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+	use=linux-m2,
 
 putty+screen|PuTTY with screen resizing extensions (building-block),
 	.WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l,
@@ -22176,7 +22062,7 @@ bg1.25|BBN BitGraph 1.25,
 # This entry covers the following terminals:
 # dku7102, tws2102, and tws models 2105 to 2112
 tws-generic|dku7102|Bull Questar tws terminals,
-	am, eslok, hs, mir, msgr, xenl, xhp@, xon,
+	am, mir, msgr, xenl, xhp@, xon,
 	cols#80, lines#24, wsl#80,
 	acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~,
 	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
@@ -22200,7 +22086,7 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgrdim,
+	use=ansi+local, use=ansi+sgrdim, use=dec+sl,
 
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
@@ -22306,15 +22192,12 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	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, kc1=\EOq, kc3=\EOs, 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,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
-	nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
-	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,
+	kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+	kf4=\EOS, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
+	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B,
+	rmam=\E[?7l, 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,
 	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,
@@ -22322,7 +22205,7 @@ bq300|Bull VT320 ISO Latin 1 80 columns terminal,
 	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
 	use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis,
-	use=vt220+vtedit,
+	use=vt220+vtedit, use=vt220+sfkeys, use=vt220+ufkeys,
 
 bq300-rv|Bull VT320 reverse 80 columns,
 	flash=\E[?5l$<50>\E[?5h,
@@ -27842,4 +27725,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2024-12-28
 #	+ add ghostty -TD
 #
+# 2025-01-04
+#	+ cleanup use-clauses -TD
+#	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
+#	+ add vt220+ufkeys, vt220+sfkeys
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index a41e18c2c..2e0265efd 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.76 2024/12/21 16:51:25 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.77 2024/12/29 10:49:59 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
@@ -188,10 +188,10 @@ if test "$USE" = generated ; then
 cat >$ED4 <<EOF
 	s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
 	/attr_[sg]et.* z)/s,z),z GCC_UNUSED),
-	s/\(((\)0\([ ]*!=[ ]*(const void\)/\1NULL\2/g
-	/returnCode(wborder_set/s,0,NULL,g
-	/returnWin/s,0,NULL,
-	/_parent/s,0,NULL,
+	s/\(((\)0[L]*\([ ]*!=[ ]*(const void\)/\1NULL\2/g
+	/returnCode(wborder_set/s,0[L]*,NULL,g
+	/returnWin/s,0[L]*,NULL,
+	/_parent/s,0[L]*,NULL,
 EOF
 else
 cat >$ED4 <<EOF
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index afdba21b1..083d8a721 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241228) unstable; urgency=low
+ncurses6td (6.5+20250104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright
index 32396640b..bd7ea56a3 100644
--- a/package/debian-mingw/copyright
+++ b/package/debian-mingw/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 2017-2024,2025 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2023,2024 by Thomas E. Dickey
+Copyright: 1996-2024,2025 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index afdba21b1..083d8a721 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241228) unstable; urgency=low
+ncurses6td (6.5+20250104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright
index 32396640b..bd7ea56a3 100644
--- a/package/debian-mingw64/copyright
+++ b/package/debian-mingw64/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 2017-2024,2025 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2023,2024 by Thomas E. Dickey
+Copyright: 1996-2024,2025 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian/changelog b/package/debian/changelog
index 110596a4f..477c6bc8c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20241228) unstable; urgency=low
+ncurses6td (6.5+20250104) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 28 Dec 2024 06:24:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/copyright b/package/debian/copyright
index 32396640b..bd7ea56a3 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 2017-2024,2025 by Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2023,2024 by Thomas E. Dickey
+Copyright: 1996-2024,2025 by Thomas E. Dickey
 License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 82713f3d9..f44fa934c 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.682 2024/12/28 11:24:50 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.683 2025/01/04 09:55:25 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -9,8 +9,8 @@
 
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
-!define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "1228"
+!define VERSION_YYYY  "2025"
+!define VERSION_MMDD  "0104"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b3b7c904b..08ba5baa0 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20241228
+Release: 20250104
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 0739d278e..37a31cdf6 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20241228
+Release: 20250104
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 0970e1c38..9323c2b7c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20241228
+Release: 20250104
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tput.c b/progs/tput.c
index 5d1b924e7..47f88e3f5 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.107 2024/12/07 22:12:53 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.109 2025/01/05 00:10:46 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -239,54 +239,71 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 #endif
 	quit(ErrCapName, "unknown terminfo capability '%s'", name);
     } else if (VALID_STRING(s)) {
-	if (argc > 1) {
-	    int k;
-	    int narg;
-	    int analyzed;
-	    int provided;
-	    int popcount;
-	    long numbers[1 + NUM_PARM];
-	    char *strings[1 + NUM_PARM];
-	    char *p_is_s[NUM_PARM];
-	    TParams paramType;
-
-	    /* Nasty hack time. The tparm function needs to see numeric
-	     * parameters as numbers, not as pointers to their string
-	     * representations
-	     */
-
-	    for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
-		char *tmp = NULL;
-		strings[k] = argv[k];
-		numbers[k] = strtol(argv[k], &tmp, 0);
-		if (tmp == NULL || *tmp != 0)
-		    numbers[k] = 0;
-	    }
-	    for (k = argc; k <= NUM_PARM; k++) {
-		numbers[k] = 0;
-		strings[k] = NULL;
-	    }
-
-	    paramType = tparm_type(name);
+	TParams paramType;
+	long numbers[1 + NUM_PARM];
+	char *strings[1 + NUM_PARM];
+	char *p_is_s[NUM_PARM];
+	int k;
+	int narg;
+	int analyzed = 0;
+	int provided = 0;
+	int popcount = 0;
+
+	paramType = tparm_type(name);
 #if NCURSES_XNAMES
-	    /*
-	     * If the capability is an extended one, analyze the string.
-	     */
-	    if (paramType == Numbers) {
-		struct name_table_entry const *entry_ptr;
-		entry_ptr = _nc_find_type_entry(name, STRING, FALSE);
-		if (entry_ptr == NULL) {
-		    paramType = Other;
-		}
+	/*
+	 * If the capability is an extended one, analyze the string.
+	 */
+	if (paramType == Numbers) {
+	    struct name_table_entry const *entry_ptr;
+	    entry_ptr = _nc_find_type_entry(name, STRING, FALSE);
+	    if (entry_ptr == NULL) {
+		paramType = Other;
 	    }
+	}
 #endif
+	/* Nasty hack time.  The tparm function needs to see numeric parameters
+	 * as numbers, not as pointers to their string representations
+	 */
+	for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
+	    char *tmp = NULL;
+	    strings[k] = argv[k];
+	    numbers[k] = strtol(argv[k], &tmp, 0);
+	    if (tmp == NULL || *tmp != 0)
+		numbers[k] = 0;
+	}
+	for (k = argc; k <= NUM_PARM; k++) {
+	    numbers[k] = 0;
+	    strings[k] = NULL;
+	}
 
-	    popcount = 0;
+	switch (paramType) {
+	case Str:
+	    analyzed = 1;
+	    break;
+	case Str_Str:
+	    analyzed = 2;
+	    break;
+	case Num_Str:
+	    analyzed = 2;
+	    break;
+	case Num_Str_Str:
+	    analyzed = 3;
+	    break;
+	case Numbers:
+	case Other:
+	    analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
+	    break;
+	}
+	if (analyzed < popcount) {
+	    analyzed = popcount;
+	}
+
+	if (argc > 1) {
 	    _nc_reset_tparm(NULL);
 	    /*
 	     * Count the number of numeric parameters which are provided.
 	     */
-	    provided = 0;
 	    for (narg = 1; narg < argc; ++narg) {
 		char *ending = NULL;
 		long check = strtol(argv[narg], &ending, 0);
@@ -297,13 +314,11 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	    switch (paramType) {
 	    case Str:
 		s = TPARM_1(s, strings[1]);
-		analyzed = 1;
 		if (provided == 0 && argc >= 1)
 		    provided++;
 		break;
 	    case Str_Str:
 		s = TPARM_2(s, strings[1], strings[2]);
-		analyzed = 2;
 		if (provided == 0 && argc >= 1)
 		    provided++;
 		if (provided == 1 && argc >= 2)
@@ -311,22 +326,19 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 		break;
 	    case Num_Str:
 		s = TPARM_2(s, numbers[1], strings[2]);
-		analyzed = 2;
 		if (provided == 1 && argc >= 2)
 		    provided++;
 		break;
 	    case Num_Str_Str:
 		s = TPARM_3(s, numbers[1], strings[2], strings[3]);
-		analyzed = 3;
 		if (provided == 1 && argc >= 2)
 		    provided++;
 		if (provided == 2 && argc >= 3)
 		    provided++;
 		break;
 	    case Numbers:
-		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
 #define myParam(n) numbers[n]
-		s = TIPARM_9(s,
+		s = TIPARM_N(analyzed, s,
 			     myParam(1),
 			     myParam(2),
 			     myParam(3),
@@ -341,24 +353,20 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	    case Other:
 		/* FALLTHRU */
 	    default:
-		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
 #define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
-		s = TPARM_9(s,
-			    myParam(1),
-			    myParam(2),
-			    myParam(3),
-			    myParam(4),
-			    myParam(5),
-			    myParam(6),
-			    myParam(7),
-			    myParam(8),
-			    myParam(9));
+		s = TIPARM_N(analyzed, s,
+			     myParam(1),
+			     myParam(2),
+			     myParam(3),
+			     myParam(4),
+			     myParam(5),
+			     myParam(6),
+			     myParam(7),
+			     myParam(8),
+			     myParam(9));
 #undef myParam
 		break;
 	    }
-	    if (analyzed < popcount) {
-		analyzed = popcount;
-	    }
 	    if (opt_v && (analyzed != provided)) {
 		fprintf(stderr, "%s: %s parameters for \"%s\"\n",
 			_nc_progname,
@@ -366,6 +374,12 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 			argv[0]);
 	    }
 	    *used += provided;
+	} else {
+	    if (opt_v) {
+		fprintf(stderr, "%s: missing parameters for \"%s\"\n",
+			_nc_progname,
+			argv[0]);
+	    }
 	}
 
 	/* use putp() in order to perform padding */
diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright
index 7546e1cc1..539642f9c 100644
--- a/test/package/debian-mingw/copyright
+++ b/test/package/debian-mingw/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 Thomas E. Dickey
+Copyright: 2017-2024,2025 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2023,2024 by Thomas E. Dickey
+Copyright: 2003-2024,2025 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright
index 7546e1cc1..539642f9c 100644
--- a/test/package/debian-mingw64/copyright
+++ b/test/package/debian-mingw64/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 Thomas E. Dickey
+Copyright: 2017-2024,2025 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2023,2024 by Thomas E. Dickey
+Copyright: 2003-2024,2025 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/test/package/debian/copyright b/test/package/debian/copyright
index 7546e1cc1..539642f9c 100644
--- a/test/package/debian/copyright
+++ b/test/package/debian/copyright
@@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 2017-2023,2024 Thomas E. Dickey
+Copyright: 2017-2024,2025 Thomas E. Dickey
 Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 License: X11
 
 Files: aclocal.m4 package
-Copyright: 2003-2023,2024 by Thomas E. Dickey
+Copyright: 2003-2024,2025 by Thomas E. Dickey
 License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a

From ef4cd046cabfc763610c48b3b9480fa0b2db02e4 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 12 Jan 2025 02:47:24 +0100
Subject: [PATCH 098/106] ncurses-6.5-20250111.patch.gz

---
 NEWS                             |  8 ++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 include/curses.wide              |  4 ++--
 include/term_entry.h             |  9 ++++----
 ncurses/base/lib_screen.c        |  8 +++----
 ncurses/base/lib_set_term.c      | 10 ++++-----
 ncurses/curses.priv.h            |  6 +++---
 ncurses/tinfo/alloc_entry.c      |  6 +++---
 ncurses/tinfo/comp_parse.c       | 33 ++++++++++++++++++++++++-----
 ncurses/tinfo/db_iterator.c      |  8 +++----
 ncurses/tinfo/hashed_db.c        | 18 ++++++++--------
 ncurses/tinfo/lib_termname.c     |  6 +++---
 ncurses/tinfo/lib_tgoto.c        | 18 ++++++++--------
 ncurses/tinfo/lib_tputs.c        |  6 +++---
 ncurses/tinfo/name_match.c       |  6 +++---
 ncurses/tinfo/parse_entry.c      | 11 +++++++---
 ncurses/tinfo/read_entry.c       |  8 +++----
 ncurses/tinfo/read_termcap.c     | 36 ++++++++++++++++----------------
 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                      |  6 +++---
 progs/toe.c                      | 14 ++++++-------
 progs/tput.c                     |  4 ++--
 test/demo_altkeys.c              | 12 ++++++-----
 test/demo_termcap.c              | 11 ++++++----
 test/demo_terminfo.c             | 11 ++++++----
 test/dup_field.c                 | 10 +++++----
 test/edit_field.c                | 10 +++++----
 test/foldkeys.c                  |  6 ++++--
 test/move_field.c                | 10 +++++----
 test/movewindow.c                | 16 ++++++++------
 test/test_sgr.c                  | 11 ++++++----
 38 files changed, 204 insertions(+), 146 deletions(-)

diff --git a/NEWS b/NEWS
index 045f52dca..a92255e31 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4226 2025/01/05 00:18:47 tom Exp $
+-- $Id: NEWS,v 1.4229 2025/01/11 21:55:20 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250111
+	+ add check for infinite loop in tic's use-resolution.
+	+ increase limit on use-clauses from 32 to 40, warn but allow entries
+	  which exceed the old limit.
+	+ add some null-pointer checks after mallocs in test-programs.
+
 20250104
 	+ modify tput to warn about capabilities which expect parameters where
 	  none are given; also repair the feature where multiple capabilities
diff --git a/VERSION b/VERSION
index e539ae91c..f6667d19a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250104
+5:0:10	6.5	20250111
diff --git a/dist.mk b/dist.mk
index 108034367..2c83e9eda 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1649 2025/01/04 09:55:25 tom Exp $
+# $Id: dist.mk,v 1.1650 2025/01/11 12:30:15 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250104
+NCURSES_PATCH = 20250111
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/curses.wide b/include/curses.wide
index 33adb070d..5efff15e4 100644
--- a/include/curses.wide
+++ b/include/curses.wide
@@ -1,4 +1,4 @@
-/* $Id: curses.wide,v 1.51 2021/05/22 20:28:29 tom Exp $ */
+/* $Id: curses.wide,v 1.52 2025/01/12 00:39:32 tom Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
@@ -240,7 +240,7 @@ extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *);	/
 #define bkgrnd(c)			wbkgrnd(stdscr,(c))
 #define bkgrndset(c)			wbkgrndset(stdscr,(c))
 #define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,(l),(r),(t),(b),tl,tr,bl,br)
-#define box_set(w,v,h)			wborder_set((w),(v),(v),(h),(h),0,0,0,0)
+#define box_set(w,v,h)			wborder_set((w),(v),(v),(h),(h),NULL,NULL,NULL,NULL)
 #define echo_wchar(c)			wecho_wchar(stdscr,(c))
 #define get_wch(c)			wget_wch(stdscr,(c))
 #define get_wstr(t)			wget_wstr(stdscr,(t))
diff --git a/include/term_entry.h b/include/term_entry.h
index 24389ad38..8d5a65405 100644
--- a/include/term_entry.h
+++ b/include/term_entry.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1998-on                 *
  ****************************************************************************/
 
-/* $Id: term_entry.h,v 1.64 2023/04/22 13:37:14 tom Exp $ */
+/* $Id: term_entry.h,v 1.65 2025/01/11 20:37:28 tom Exp $ */
 
 /*
  *	term_entry.h -- interface to entry-manipulation code
@@ -108,7 +108,8 @@ typedef enum {
 	dbdLAST
 } DBDIRS;
 
-#define MAX_USES	32
+#define WARN_MAX_USES	32
+#define HARD_MAX_USES	40
 #define MAX_CROSSLINKS	16
 
 typedef struct entry ENTRY;
@@ -122,7 +123,7 @@ typedef struct {
 struct entry {
 	TERMTYPE2 tterm;
 	unsigned nuses;
-	ENTRY_USES uses[MAX_USES];
+	ENTRY_USES uses[HARD_MAX_USES];
 	int ncrosslinks;
 	ENTRY *crosslinks[MAX_CROSSLINKS];
 	long cstart;
diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index f272220cb..111c5704e 100644
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_screen.c,v 1.110 2024/12/07 17:46:49 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.112 2025/01/12 00:31:03 tom Exp $")
 
 #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
 
@@ -58,7 +58,7 @@ MODULE_ID("$Id: lib_screen.c,v 1.110 2024/12/07 17:46:49 tom Exp $")
 #define ARG_SLIMIT(name)	/* nothing */
 #endif
 
-#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target - base))
+#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target + 1 - base))
 #define TOP_SLIMIT _nc_SLIMIT(sizeof(buffer))
 
 /*
@@ -917,7 +917,7 @@ putwin(WINDOW *win, FILE *filep)
      * ncurses is compiled with wide-character support, and also may depend
      * on the version of ncurses, e.g., if the WINDOW structure is extended.
      */
-    if (win != 0) {
+    if (win != NULL) {
 	size_t len = (size_t) (win->_maxx + 1);
 	int y;
 
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 372c3865c..780e27ea2 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.191 2024/12/15 00:04:13 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.192 2025/01/12 00:41:56 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -362,8 +362,8 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     }
 #else
     if (!_nc_alloc_screen()
-	|| ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == 0)
-	|| ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == 0)) {
+	|| ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == NULL)
+	|| ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == NULL)) {
 	returnCode(ERR);
     }
 
@@ -373,7 +373,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     sp->_next_screen = _nc_screen_chain;
     _nc_screen_chain = sp;
 
-    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) {
+    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) {
 	returnCode(ERR);
     }
 #endif
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 61ac7b62d..ad1b709f0 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.698 2024/12/15 00:04:23 tom Exp $
+ * $Id: curses.priv.h,v 1.699 2025/01/12 00:41:56 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2329,7 +2329,7 @@ extern NCURSES_EXPORT(void)     _nc_set_screen (SCREEN *);
 /* current screen is private data; avoid possible linking conflicts too */
 extern NCURSES_EXPORT_VAR(SCREEN *) SP;
 #define CURRENT_SCREEN SP
-#define _nc_alloc_screen()      ((SP = _nc_alloc_screen_sp()) != 0)
+#define _nc_alloc_screen()      ((SP = _nc_alloc_screen_sp()) != NULL)
 #define _nc_set_screen(sp)      SP = sp
 #endif
 
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 84fc48492..68d87d54b 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.81 2024/12/07 21:12:53 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.82 2025/01/11 20:37:19 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -140,7 +140,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {
     int offsets[MAX_ENTRY_SIZE / sizeof(short)];
-    int useoffsets[MAX_USES];
+    int useoffsets[HARD_MAX_USES];
     unsigned i, n;
     unsigned nuses;
     TERMTYPE2 *tp;
diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 4cb55ac4d..13af6e3cc 100644
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.136 2024/12/07 21:12:53 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.138 2025/01/12 00:36:01 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -99,7 +99,7 @@ skip_index(char *name)
 {
     char *bar = strchr(name, '|');
 
-    if (bar != 0 && (bar - name) == 2)
+    if (bar != NULL && (bar - name) == 2)
 	name = bar + 1;
 
     return name;
@@ -538,12 +538,18 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
      */
     if (fullresolve) {
 	do {
+	    bool attempts;
+	    bool progress;
 	    ENTRY merged;
 
+	    attempts = FALSE;
+	    progress = FALSE;
 	    keepgoing = FALSE;
 
 	    for_entry_list(qp) {
 		if (qp->nuses > 0) {
+		    attempts = TRUE;
+
 		    DEBUG(2, ("%s: attempting merge of %d entries",
 			      _nc_first_name(qp->tterm.term_names),
 			      qp->nuses));
@@ -599,16 +605,33 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 #endif
 		    qp->tterm = merged.tterm;
 		    _nc_wrap_entry(qp, TRUE);
+		    progress = TRUE;
 
 		    /*
-		     * We know every entry is resolvable because name resolution
-		     * didn't bomb.  So go back for another pass.
+		     * Every entry should be resolvable because name resolution
+		     * did not fail.  Continue if we have just made a change,
+		     * or another entry may be changeable.
 		     */
 		    /* FALLTHRU */
 		  incomplete:
 		    keepgoing = TRUE;
 		}
 	    }
+
+	    /*
+	     * If we went all the way through the list without making any
+	     * changes, while there were remaining use-linkages, something went
+	     * wrong.  Give up.
+	     */
+	    if (!progress && attempts) {
+		for_entry_list(qp) {
+		    for (i = 0; i < qp->nuses; ++i) {
+			_nc_warning("problem with use=%s", qp->uses[i].name);
+		    }
+		}
+		_nc_warning("merge failed, infinite loop");
+		return FALSE;
+	    }
 	} while
 	    (keepgoing);
 
diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 255c1687d..b428bbd03 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.52 2024/12/07 18:23:25 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.53 2025/01/12 00:41:56 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -335,9 +335,9 @@ _nc_first_db(DBDIRS * state, int *offset)
 #if NCURSES_USE_TERMCAP
 	    values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
 	    /* only use $TERMCAP if it is an absolute path */
-	    if (values[dbdEnvOnce2] != 0
+	    if (values[dbdEnvOnce2] != NULL
 		&& *values[dbdEnvOnce2] != '/') {
-		values[dbdEnvOnce2] = 0;
+		values[dbdEnvOnce2] = NULL;
 	    }
 	    values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
 #endif /* NCURSES_USE_TERMCAP */
diff --git a/ncurses/tinfo/hashed_db.c b/ncurses/tinfo/hashed_db.c
index 3960efdf1..afd1bda82 100644
--- a/ncurses/tinfo/hashed_db.c
+++ b/ncurses/tinfo/hashed_db.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2006-2011,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #if USE_HASHED_DB
 
-MODULE_ID("$Id: hashed_db.c,v 1.21 2024/11/30 21:16:41 tom Exp $")
+MODULE_ID("$Id: hashed_db.c,v 1.22 2025/01/11 23:52:18 tom Exp $")
 
 #if HASHED_DB_API >= 2
 static DBC *cursor;
@@ -55,7 +55,7 @@ static MYCONN *connections;
 static void
 cleanup(void)
 {
-    while (connections != 0) {
+    while (connections != NULL) {
 	_nc_db_close(connections->db);
     }
 }
@@ -63,10 +63,10 @@ cleanup(void)
 static DB *
 find_connection(const char *path, bool modify)
 {
-    DB *result = 0;
+    DB *result = NULL;
     MYCONN *p;
 
-    for (p = connections; p != 0; p = p->next) {
+    for (p = connections; p != NULL; p = p->next) {
 	if (!strcmp(p->path, path) && p->modify == modify) {
 	    result = p->db;
 	    break;
@@ -81,9 +81,9 @@ drop_connection(DB * db)
 {
     MYCONN *p, *q;
 
-    for (p = connections, q = 0; p != 0; q = p, p = p->next) {
+    for (p = connections, q = NULL; p != NULL; q = p, p = p->next) {
 	if (p->db == db) {
-	    if (q != 0)
+	    if (q != NULL)
 		q->next = p->next;
 	    else
 		connections = p->next;
@@ -124,7 +124,7 @@ _nc_db_open(const char *path, bool modify)
     DB *result = NULL;
     int code;
 
-    if (connections == 0)
+    if (connections == NULL)
 	atexit(cleanup);
 
     if ((result = find_connection(path, modify)) == NULL) {
@@ -165,7 +165,7 @@ _nc_db_open(const char *path, bool modify)
 			     modify ? (O_CREAT | O_RDWR) : O_RDONLY,
 			     0644,
 			     DB_HASH,
-			     NULL)) == 0) {
+			     NULL)) == NULL) {
 	    code = errno;
 	} else {
 	    code = 0;
diff --git a/ncurses/tinfo/lib_termname.c b/ncurses/tinfo/lib_termname.c
index 2dfed0da5..a0dca6204 100644
--- a/ncurses/tinfo/lib_termname.c
+++ b/ncurses/tinfo/lib_termname.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2024 Thomas E. Dickey                                     *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_termname.c,v 1.14 2024/12/07 20:05:27 tom Exp $")
+MODULE_ID("$Id: lib_termname.c,v 1.15 2025/01/12 00:41:56 tom Exp $")
 
 NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
@@ -43,7 +43,7 @@ NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
 	name = TerminalOf(SP_PARM)->_termname;
     }
 #else
-    if (cur_term != 0)
+    if (cur_term != NULL)
 	name = cur_term->_termname;
 #endif
 
diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 58b561fa7..2f7f63f56 100644
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 2000-2008,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <termcap.h>
 
-MODULE_ID("$Id: lib_tgoto.c,v 1.23 2023/04/16 17:19:40 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.24 2025/01/12 00:41:56 tom Exp $")
 
 #if !PURE_TERMINFO
 static bool
@@ -44,7 +44,7 @@ is_termcap(const char *string)
 {
     bool result = TRUE;
 
-    if (string == 0 || *string == '\0') {
+    if (string == NULL || *string == '\0') {
 	result = FALSE;		/* tparm() handles empty strings */
     } else {
 	while ((*string != '\0') && result) {
@@ -89,13 +89,13 @@ tgoto_internal(const char *string, int x, int y)
     while (*string != 0) {
 	if ((used + need) > length) {
 	    length += (used + need);
-	    if ((result = typeRealloc(char, length, result)) == 0) {
+	    if ((result = typeRealloc(char, length, result)) == NULL) {
 		length = 0;
 		break;
 	    }
 	}
 	if (*string == '%') {
-	    const char *fmt = 0;
+	    const char *fmt = NULL;
 
 	    switch (*++string) {
 	    case '\0':
@@ -122,7 +122,7 @@ tgoto_internal(const char *string, int x, int y)
 		 * and \r, but I don't see that it could work -TD
 		 */
 		if (*value == 0) {
-		    if (BC != 0) {
+		    if (BC != NULL) {
 			*value += 1;
 			need_BC = TRUE;
 		    } else {
@@ -166,11 +166,11 @@ tgoto_internal(const char *string, int x, int y)
 		*value -= 2 * (*value % 16);
 		break;
 	    }
-	    if (fmt != 0) {
+	    if (fmt != NULL) {
 		_nc_SPRINTF(result + used, _nc_SLIMIT(length - used)
 			    fmt, *value++);
 		used += strlen(result + used);
-		fmt = 0;
+		fmt = NULL;
 	    }
 	    if (value - param > 2) {
 		value = param + 2;
@@ -181,7 +181,7 @@ tgoto_internal(const char *string, int x, int y)
 	}
 	string++;
     }
-    if (result != 0) {
+    if (result != NULL) {
 	if (need_BC) {
 	    _nc_STRCPY(result + used, BC, length - used);
 	    used += strlen(BC);
diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 8a0d137a8..92232f6ef 100644
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.115 2024/12/07 21:04:53 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.116 2025/01/12 00:41:56 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -319,7 +319,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 #if NCURSES_SP_FUNCS
 	       (SP_PARM != NULL && SP_PARM->_term == NULL)
 #else
-	       cur_term == 0
+	       cur_term == NULL
 #endif
 	    ) {
 	    always_delay = FALSE;
diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c
index 44d4ead0c..8cdaac79d 100644
--- a/ncurses/tinfo/name_match.c
+++ b/ncurses/tinfo/name_match.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2024 Thomas E. Dickey                                     *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: name_match.c,v 1.26 2024/12/07 21:24:18 tom Exp $")
+MODULE_ID("$Id: name_match.c,v 1.27 2025/01/12 00:41:56 tom Exp $")
 
 #define FirstName _nc_globals.first_name
 
@@ -44,7 +44,7 @@ skip_index(const char *name)
 {
     if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
 	const char *bar = strchr(name, '|');
-	if (bar != 0 && (bar - name) == 2)
+	if (bar != NULL && (bar - name) == 2)
 	    name = bar + 1;
     }
     return name;
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 29035b850..2824645e3 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.112 2024/12/07 21:13:36 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.113 2025/01/11 20:19:34 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -379,10 +379,15 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 		_nc_warning("invalid name for use-clause \"%s\"",
 			    _nc_curr_token.tk_valstring);
 		continue;
-	    } else if (entryp->nuses >= MAX_USES) {
+	    } else if (entryp->nuses >= HARD_MAX_USES) {
 		_nc_warning("too many use-clauses, ignored \"%s\"",
 			    _nc_curr_token.tk_valstring);
 		continue;
+	    } else if (entryp->nuses >= WARN_MAX_USES) {
+		_nc_warning("possibly too many use-clauses (%d vs %d), \"%s\"",
+			    entryp->nuses,
+			    WARN_MAX_USES,
+			    _nc_curr_token.tk_valstring);
 	    }
 	    if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) {
 		entryp->uses[entryp->nuses].name = saved;
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 5b284dec9..fd5f77168 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.174 2024/12/07 21:02:00 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.175 2025/01/11 23:52:18 tom Exp $")
 
 #define MyNumber(n) (short) LOW_MSB(n)
 
@@ -797,13 +797,13 @@ _nc_read_tic_entry(char *filename,
     } else
 #if USE_HASHED_DB
 	if (make_db_filename(filename, limit, path)
-	    && (capdbp = _nc_db_open(filename, FALSE)) != 0) {
+	    && (capdbp = _nc_db_open(filename, FALSE)) != NULL) {
 
 	DBT key, data;
 	int reccnt = 0;
 	char *save = strdup(name);
 
-	if (save == 0)
+	if (save == NULL)
 	    returnDB(code);
 
 	memset(&key, 0, sizeof(key));
diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index 1a294848b..9c78614db 100644
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.104 2023/06/24 21:53:16 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.105 2025/01/12 00:42:58 tom Exp $")
 
 #if !PURE_TERMINFO
 
@@ -72,7 +72,7 @@ get_termpath(void)
 {
     const char *result;
 
-    if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == 0)
+    if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == NULL)
 	result = TERMPATH;
     TR(TRACE_DATABASE, ("TERMPATH is %s", result));
     return result;
@@ -720,7 +720,7 @@ get_tc_token(char **srcp, int *endp)
     int ch;
     bool found = FALSE;
     char *s, *base;
-    char *tok = 0;
+    char *tok = NULL;
 
     *endp = TRUE;
     for (s = base = *srcp; *s != '\0';) {
@@ -749,7 +749,7 @@ get_tc_token(char **srcp, int *endp)
     }
 
     /* malformed entry may end without a ':' */
-    if (tok == 0 && found) {
+    if (tok == NULL && found) {
 	tok = base;
     }
 
@@ -768,7 +768,7 @@ copy_tc_token(char *dst, const char *src, size_t len)
 	    continue;
 	}
 	if (--len == 0) {
-	    dst = 0;
+	    dst = NULL;
 	    break;
 	}
 	*dst++ = (char) ch;
@@ -813,13 +813,13 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
     if (cp == NULL) {
 	_nc_safe_strcpy(&desc, get_termpath());
     } else if (!_nc_is_abs_path(cp)) {	/* TERMCAP holds an entry */
-	if ((termpath = get_termpath()) != 0) {
+	if ((termpath = get_termpath()) != NULL) {
 	    _nc_safe_strcat(&desc, termpath);
 	} else {
 	    char temp[PBUFSIZ];
 	    temp[0] = 0;
-	    if ((home = getenv("HOME")) != 0 && *home != '\0'
-		&& strchr(home, ' ') == 0
+	    if ((home = getenv("HOME")) != NULL && *home != '\0'
+		&& strchr(home, ' ') == NULL
 		&& strlen(home) < sizeof(temp) - 10) {	/* setup path */
 		_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
 			    "%s/", home);	/* $HOME first */
@@ -850,7 +850,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 	    }
 	}
     }
-    *fname = 0;			/* mark end of vector */
+    *fname = NULL;		/* mark end of vector */
 #if !HAVE_BSD_CGETENT
     (void) _nc_cgetset(0);
 #endif
@@ -875,7 +875,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 
 	pd = bp;
 	ps = dummy;
-	while (!endflag && (tok = get_tc_token(&ps, &endflag)) != 0) {
+	while (!endflag && (tok = get_tc_token(&ps, &endflag)) != NULL) {
 	    bool ignore = FALSE;
 
 	    for (n = 1; n < count; n++) {
@@ -889,7 +889,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 	    if (ignore != TRUE) {
 		list[count++] = tok;
 		pd = copy_tc_token(pd, tok, (size_t) (TBUFSIZ - (2 + pd - bp)));
-		if (pd == 0) {
+		if (pd == NULL) {
 		    i = -1;
 		    break;
 		}
@@ -901,7 +901,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 
     FreeIfNeeded(dummy);
     FreeIfNeeded(the_source);
-    the_source = 0;
+    the_source = NULL;
 
     /* This is not related to the BSD cgetent(), but to fake up a suitable
      * filename for ncurses' error reporting.  (If we are not using BSD
@@ -917,7 +917,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 	if (_nc_access(temp, R_OK) == 0) {
 	    _nc_safe_strcpy(&desc, pathvec[i]);
 	}
-	if ((the_source = strdup(temp)) != 0)
+	if ((the_source = strdup(temp)) != NULL)
 	    *sourcename = the_source;
 #else
 	if ((the_source = strdup(pathvec[i])) != 0)
@@ -966,7 +966,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 #endif
 #if USE_GETCAP
     char *p, tc[TBUFSIZ];
-    char *tc_buf = 0;
+    char *tc_buf = NULL;
 #define MY_SIZE sizeof(tc) - 1
     int status;
     static char *source;
@@ -982,7 +982,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 	return TGETENT_NO;
     }
 
-    if (use_terminfo_vars() && (p = getenv("TERMCAP")) != 0
+    if (use_terminfo_vars() && (p = getenv("TERMCAP")) != NULL
 	&& !_nc_is_abs_path(p) && _nc_name_match(p, tn, "|:")) {
 	/* TERMCAP holds a termcap entry */
 	tc_buf = strdup(p);
@@ -996,7 +996,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 	_nc_set_source(source);
 	tc_buf = tc;
     }
-    if (tc_buf == 0)
+    if (tc_buf == NULL)
 	return (TGETENT_ERR);
     _nc_read_entry_source((FILE *) 0, tc_buf, FALSE, TRUE, NULLHOOK);
     if (tc_buf != tc)
@@ -1144,7 +1144,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 	free(copied);
 #endif /* USE_GETCAP */
 
-    if (_nc_head == 0)
+    if (_nc_head == NULL)
 	return (TGETENT_ERR);
 
     /* resolve all use references */
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 083d8a721..73cbed3da 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250104) unstable; urgency=low
+ncurses6td (6.5+20250111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 083d8a721..73cbed3da 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250104) unstable; urgency=low
+ncurses6td (6.5+20250111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 477c6bc8c..8059f1d07 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250104) unstable; urgency=low
+ncurses6td (6.5+20250111) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Dec 2024 04:55:25 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f44fa934c..817c1c859 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.683 2025/01/04 09:55:25 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.684 2025/01/11 12:30:15 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0104"
+!define VERSION_MMDD  "0111"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 08ba5baa0..1af6f7873 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250104
+Release: 20250111
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 37a31cdf6..6bee8514d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250104
+Release: 20250111
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9323c2b7c..47e4051bd 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250104
+Release: 20250111
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/tic.c b/progs/tic.c
index 14fc792d1..d9321185e 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.331 2024/12/07 23:19:49 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.332 2025/01/11 23:52:18 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -601,7 +601,7 @@ valid_db_path(const char *nominal)
 	    || access(result, R_OK | W_OK) != 0) {
 	    DEBUG(1, ("...not a writable file"));
 	    free(result);
-	    result = 0;
+	    result = NULL;
 	}
 #else
 	if (!S_ISDIR(sb.st_mode)
diff --git a/progs/toe.c b/progs/toe.c
index 81221ee52..f85c358dc 100644
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.92 2024/12/07 22:12:53 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.94 2025/01/12 00:36:48 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -374,10 +374,10 @@ show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
 
     memset(&data, 0, sizeof(data));
     data.term_names = strmalloc(buffer);
-    while ((next = strtok(list, "|")) != 0) {
+    while ((next = strtok(list, "|")) != NULL) {
 	if (next != last)
 	    hook(db_index, db_limit, next, &data);
-	list = 0;
+	list = NULL;
     }
     free(data.term_names);
 }
@@ -502,7 +502,7 @@ typelist(int eargc, char *eargv[],
 		(void) printf("#\n#%s:\n#\n", eargv[i]);
 
 	    if (make_db_name(filename, eargv[i], sizeof(filename))) {
-		if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
+		if ((capdbp = _nc_db_open(filename, FALSE)) != NULL) {
 		    DBT key, data;
 		    int code;
 
@@ -536,13 +536,13 @@ typelist(int eargc, char *eargv[],
 #if HAVE_BSD_CGETENT
 	{
 	    CGETENT_CONST char *db_array[2];
-	    char *buffer = 0;
+	    char *buffer = NULL;
 
 	    if (verbosity)
 		(void) printf("#\n#%s:\n#\n", eargv[i]);
 
 	    db_array[0] = eargv[i];
-	    db_array[1] = 0;
+	    db_array[1] = NULL;
 
 	    if (cgetfirst(&buffer, db_array) > 0) {
 		if (is_termcap(buffer)) {
diff --git a/progs/tput.c b/progs/tput.c
index 47f88e3f5..74e408f23 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.109 2025/01/05 00:10:46 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.110 2025/01/12 00:36:15 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -219,7 +219,7 @@ tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used)
 	    const struct name_table_entry *np;
 
 	    termcap = TRUE;
-	    if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) {
+	    if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != NULL) {
 		switch (np->nte_type) {
 		case BOOLEAN:
 		    name = boolnames[np->nte_index];
diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c
index 254b8cbb3..73557b3a0 100644
--- a/test/demo_altkeys.c
+++ b/test/demo_altkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_altkeys.c,v 1.18 2024/12/07 23:02:27 tom Exp $
+ * $Id: demo_altkeys.c,v 1.19 2025/01/11 14:54:49 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2005/10/22
@@ -138,9 +138,11 @@ main(int argc, char *argv[])
 	if ((value = keybound(n, 0)) != NULL) {
 	    size_t need = strlen(value) + 2;
 	    char *temp = typeMalloc(char, need);
-	    _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
-	    define_key(temp, n + MY_KEYS);
-	    free(temp);
+	    if (temp != NULL) {
+		_nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
+		define_key(temp, n + MY_KEYS);
+		free(temp);
+	    }
 	    free(value);
 	}
     }
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 8ec75de82..b62ce9081 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.73 2024/12/07 22:27:13 tom Exp $
+ * $Id: demo_termcap.c,v 1.74 2025/01/11 14:54:49 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -107,9 +107,12 @@ static long total_s_values;
 static char *
 make_dbitem(const char *const p, const char *const q)
 {
-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
+    size_t diff = (size_t) (p - q);
+    size_t need = strlen(e_opt) + 2 + diff;
     char *result = malloc(need);
-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
+    if (result != NULL) {
+	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
+    }
     return result;
 }
 
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index 42e323e70..639dac7d8 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.62 2024/12/07 22:27:13 tom Exp $
+ * $Id: demo_terminfo.c,v 1.63 2025/01/11 14:54:49 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -98,9 +98,12 @@ static long total_s_values;
 static char *
 make_dbitem(const char *const p, const char *const q)
 {
-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
+    size_t diff = (size_t) (p - q);
+    size_t need = strlen(e_opt) + 2 + diff;
     char *result = malloc(need);
-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
+    if (result != NULL) {
+	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
+    }
     return result;
 }
 
diff --git a/test/dup_field.c b/test/dup_field.c
index 8f6db8e80..0fe8234b5 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  *                                                                          *
  * 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: dup_field.c,v 1.12 2024/12/07 22:32:11 tom Exp $
+ * $Id: dup_field.c,v 1.13 2025/01/11 14:54:49 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -96,8 +96,10 @@ my_help_edit_field(void)
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
 	msg = typeMalloc(char, need);
-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
-	msgs[used++] = msg;
+	if (msg != NULL) {
+	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+	    msgs[used++] = msg;
+	}
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
diff --git a/test/edit_field.c b/test/edit_field.c
index fd6248ca3..7bea65a2f 100644
--- a/test/edit_field.c
+++ b/test/edit_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: edit_field.c,v 1.33 2024/12/07 22:22:51 tom Exp $
+ * $Id: edit_field.c,v 1.34 2025/01/11 14:54:49 tom Exp $
  *
  * A wrapper for form_driver() which keeps track of the user's editing changes
  * for each field, and makes the resulting length available as a
@@ -193,8 +193,10 @@ help_edit_field(void)
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
 	msg = typeMalloc(char, need);
-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
-	msgs[used++] = msg;
+	if (msg != NULL) {
+	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+	    msgs[used++] = msg;
+	}
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
diff --git a/test/foldkeys.c b/test/foldkeys.c
index 1f8b7d4eb..dd8e1007c 100644
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.14 2024/12/21 17:25:16 tom Exp $
+ * $Id: foldkeys.c,v 1.15 2025/01/11 14:54:49 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -155,6 +155,8 @@ demo_foldkeys(void)
 		      &second,
 		      final) == 3
 	    && *final != ';'
+	    && first >= 0
+	    && first < 1024
 	    && (need = strlen(info[j].value)) != 0
 	    && (value = malloc(need + 8)) != NULL) {
 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
diff --git a/test/move_field.c b/test/move_field.c
index a87fb68d5..3e8b06cbf 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  *                                                                          *
  * 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: move_field.c,v 1.20 2024/12/07 22:33:32 tom Exp $
+ * $Id: move_field.c,v 1.21 2025/01/11 14:54:49 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -96,8 +96,10 @@ my_help_edit_field(void)
 	    name = commands[n].help;
 	need = 5 + strlen(code) + strlen(name);
 	msg = typeMalloc(char, need);
-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
-	msgs[used++] = msg;
+	if (msg != NULL) {
+	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+	    msgs[used++] = msg;
+	}
     }
     msgs[used++] =
 	strdup("Arrow keys move within a field as you would expect.");
diff --git a/test/movewindow.c b/test/movewindow.c
index 5039258c1..76a1b7584 100644
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2006-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.57 2024/12/07 22:33:32 tom Exp $
+ * $Id: movewindow.c,v 1.58 2025/01/11 14:54:49 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -658,12 +658,16 @@ show_help(WINDOW *current)
 
     char **msgs = typeCalloc(char *, SIZEOF(help) + 1);
     size_t n;
+    size_t used;
 
-    for (n = 0; n < SIZEOF(help); ++n) {
+    for (n = used = 0; n < SIZEOF(help); ++n) {
 	size_t need = (21 + strlen(help[n].msg));
-	msgs[n] = typeMalloc(char, need);
-	_nc_SPRINTF(msgs[n], _nc_SLIMIT(need)
-		    "%-20s%s", keyname(help[n].key), help[n].msg);
+	char *msg = typeMalloc(char, need);
+	if (msg != NULL) {
+	    _nc_SPRINTF(msg, _nc_SLIMIT(need)
+			"%-20s%s", keyname(help[n].key), help[n].msg);
+	    msgs[used++] = msg;
+	}
     }
     popup_msg2(current, msgs);
     for (n = 0; n < SIZEOF(help); ++n) {
diff --git a/test/test_sgr.c b/test/test_sgr.c
index 20cb74052..d69964ad2 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.26 2024/12/07 22:48:21 tom Exp $
+ * $Id: test_sgr.c,v 1.27 2025/01/11 14:54:49 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -63,9 +63,12 @@ static long total_values;
 static char *
 make_dbitem(const char *const p, const char *const q)
 {
-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
+    size_t diff = (size_t) (p - q);
+    size_t need = strlen(e_opt) + 2 + diff;
     char *result = malloc(need);
-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
+    if (result != NULL) {
+	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
+    }
     return result;
 }
 

From 73c052021be3645cf76546be969d204c6858b764 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 19 Jan 2025 02:57:00 +0100
Subject: [PATCH 099/106] ncurses-6.5-20250118.patch.gz

---
 Ada95/aclocal.m4                           |  207 +-
 Ada95/configure                            | 3532 +++++++++-----
 NEWS                                       |   14 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   42 +-
 configure                                  | 5116 ++++++++++----------
 configure.in                               |    8 +-
 dist.mk                                    |    4 +-
 doc/html/man/captoinfo.1m.html             |   12 +-
 doc/html/man/clear.1.html                  |   12 +-
 doc/html/man/curs_add_wch.3x.html          |  127 +-
 doc/html/man/curs_add_wchstr.3x.html       |   46 +-
 doc/html/man/curs_addch.3x.html            |   96 +-
 doc/html/man/curs_addchstr.3x.html         |   23 +-
 doc/html/man/curs_addstr.3x.html           |   36 +-
 doc/html/man/curs_addwstr.3x.html          |   38 +-
 doc/html/man/curs_attr.3x.html             |  284 +-
 doc/html/man/curs_beep.3x.html             |   14 +-
 doc/html/man/curs_bkgd.3x.html             |  105 +-
 doc/html/man/curs_bkgrnd.3x.html           |  121 +-
 doc/html/man/curs_border.3x.html           |   28 +-
 doc/html/man/curs_border_set.3x.html       |   16 +-
 doc/html/man/curs_clear.3x.html            |   37 +-
 doc/html/man/curs_color.3x.html            |  388 +-
 doc/html/man/curs_delch.3x.html            |   20 +-
 doc/html/man/curs_deleteln.3x.html         |   18 +-
 doc/html/man/curs_extend.3x.html           |   14 +-
 doc/html/man/curs_get_wch.3x.html          |   72 +-
 doc/html/man/curs_get_wstr.3x.html         |  188 +-
 doc/html/man/curs_getcchar.3x.html         |  194 +-
 doc/html/man/curs_getch.3x.html            |   65 +-
 doc/html/man/curs_getstr.3x.html           |  138 +-
 doc/html/man/curs_getyx.3x.html            |   34 +-
 doc/html/man/curs_in_wch.3x.html           |   22 +-
 doc/html/man/curs_in_wchstr.3x.html        |   39 +-
 doc/html/man/curs_inch.3x.html             |   14 +-
 doc/html/man/curs_inchstr.3x.html          |   33 +-
 doc/html/man/curs_initscr.3x.html          |   16 +-
 doc/html/man/curs_inopts.3x.html           |   52 +-
 doc/html/man/curs_ins_wch.3x.html          |   24 +-
 doc/html/man/curs_ins_wstr.3x.html         |   47 +-
 doc/html/man/curs_insch.3x.html            |   16 +-
 doc/html/man/curs_insstr.3x.html           |   41 +-
 doc/html/man/curs_instr.3x.html            |   35 +-
 doc/html/man/curs_inwstr.3x.html           |   63 +-
 doc/html/man/curs_kernel.3x.html           |   33 +-
 doc/html/man/curs_mouse.3x.html            |  278 +-
 doc/html/man/curs_move.3x.html             |   17 +-
 doc/html/man/curs_opaque.3x.html           |   26 +-
 doc/html/man/curs_outopts.3x.html          |   35 +-
 doc/html/man/curs_overlay.3x.html          |   35 +-
 doc/html/man/curs_pad.3x.html              |  121 +-
 doc/html/man/curs_printw.3x.html           |   22 +-
 doc/html/man/curs_refresh.3x.html          |   31 +-
 doc/html/man/curs_scanw.3x.html            |   26 +-
 doc/html/man/curs_scr_dump.3x.html         |   14 +-
 doc/html/man/curs_scroll.3x.html           |   18 +-
 doc/html/man/curs_slk.3x.html              |   60 +-
 doc/html/man/curs_sp_funcs.3x.html         |   12 +-
 doc/html/man/curs_termattrs.3x.html        |  113 +-
 doc/html/man/curs_termcap.3x.html          |  117 +-
 doc/html/man/curs_terminfo.3x.html         |  318 +-
 doc/html/man/curs_touch.3x.html            |   48 +-
 doc/html/man/curs_trace.3x.html            |   14 +-
 doc/html/man/curs_util.3x.html             |  313 +-
 doc/html/man/curs_variables.3x.html        |  112 +-
 doc/html/man/curs_window.3x.html           |   86 +-
 doc/html/man/form_field_opts.3x.html       |   12 +-
 doc/html/man/form_field_validation.3x.html |   10 +-
 doc/html/man/form_fieldtype.3x.html        |   12 +-
 doc/html/man/form_opts.3x.html             |   12 +-
 doc/html/man/infocmp.1m.html               |   14 +-
 doc/html/man/infotocap.1m.html             |   12 +-
 doc/html/man/menu_opts.3x.html             |   12 +-
 doc/html/man/mitem_opts.3x.html            |   12 +-
 doc/html/man/ncurses.3x.html               |  700 +--
 doc/html/man/new_pair.3x.html              |   16 +-
 doc/html/man/scr_dump.5.html               |   12 +-
 doc/html/man/tabs.1.html                   |   10 +-
 doc/html/man/terminfo.5.html               |  921 ++--
 doc/html/man/tic.1m.html                   |   12 +-
 doc/html/man/tput.1.html                   |  221 +-
 doc/html/man/tset.1.html                   |   12 +-
 doc/html/man/wresize.3x.html               |   12 +-
 include/curses.wide                        |    5 +-
 man/captoinfo.1m                           |    9 +-
 man/clear.1                                |   10 +-
 man/curs_add_wch.3x                        |   50 +-
 man/curs_add_wchstr.3x                     |   29 +-
 man/curs_addch.3x                          |   43 +-
 man/curs_addchstr.3x                       |   19 +-
 man/curs_addstr.3x                         |   29 +-
 man/curs_addwstr.3x                        |   38 +-
 man/curs_attr.3x                           |  312 +-
 man/curs_beep.3x                           |    9 +-
 man/curs_bkgd.3x                           |  113 +-
 man/curs_bkgrnd.3x                         |   89 +-
 man/curs_border.3x                         |   36 +-
 man/curs_border_set.3x                     |   26 +-
 man/curs_clear.3x                          |   42 +-
 man/curs_color.3x                          |  415 +-
 man/curs_delch.3x                          |   17 +-
 man/curs_deleteln.3x                       |   15 +-
 man/curs_extend.3x                         |   14 +-
 man/curs_get_wch.3x                        |   52 +-
 man/curs_get_wstr.3x                       |  386 +-
 man/curs_getcchar.3x                       |  385 +-
 man/curs_getch.3x                          |   30 +-
 man/curs_getstr.3x                         |  162 +-
 man/curs_getyx.3x                          |   52 +-
 man/curs_in_wch.3x                         |   17 +-
 man/curs_in_wchstr.3x                      |   42 +-
 man/curs_inch.3x                           |    9 +-
 man/curs_inchstr.3x                        |   46 +-
 man/curs_initscr.3x                        |   13 +-
 man/curs_inopts.3x                         |   47 +-
 man/curs_ins_wch.3x                        |   21 +-
 man/curs_ins_wstr.3x                       |   50 +-
 man/curs_insch.3x                          |   15 +-
 man/curs_insstr.3x                         |   53 +-
 man/curs_instr.3x                          |   31 +-
 man/curs_inwstr.3x                         |   44 +-
 man/curs_kernel.3x                         |   14 +-
 man/curs_mouse.3x                          |  516 +-
 man/curs_move.3x                           |   16 +-
 man/curs_opaque.3x                         |   27 +-
 man/curs_outopts.3x                        |   53 +-
 man/curs_overlay.3x                        |   52 +-
 man/curs_pad.3x                            |  198 +-
 man/curs_printw.3x                         |   18 +-
 man/curs_refresh.3x                        |   20 +-
 man/curs_scanw.3x                          |   19 +-
 man/curs_scr_dump.3x                       |    9 +-
 man/curs_scroll.3x                         |   16 +-
 man/curs_slk.3x                            |   45 +-
 man/curs_sp_funcs.3x                       |    8 +-
 man/curs_termattrs.3x                      |  191 +-
 man/curs_termcap.3x                        |  126 +-
 man/curs_terminfo.3x                       |  198 +-
 man/curs_touch.3x                          |   64 +-
 man/curs_trace.3x                          |    8 +-
 man/curs_util.3x                           |  160 +-
 man/curs_variables.3x                      |   90 +-
 man/curs_window.3x                         |  166 +-
 man/form_field_opts.3x                     |   20 +-
 man/form_field_validation.3x               |    8 +-
 man/form_fieldtype.3x                      |   19 +-
 man/form_opts.3x                           |   20 +-
 man/infocmp.1m                             |   10 +-
 man/infotocap.1m                           |    9 +-
 man/man_db.renames.in                      |    8 +-
 man/manhtml.aliases                        |    6 +-
 man/menu_opts.3x                           |   20 +-
 man/mitem_opts.3x                          |   20 +-
 man/ncurses.3x                             |   15 +-
 man/new_pair.3x                            |   12 +-
 man/scr_dump.5                             |    8 +-
 man/tabs.1                                 |   12 +-
 man/terminfo.tail                          |   13 +-
 man/tic.1m                                 |   10 +-
 man/tput.1                                 |  239 +-
 man/tset.1                                 |   12 +-
 man/wresize.3x                             |    8 +-
 ncurses/base/lib_color.c                   |    6 +-
 ncurses/base/lib_dft_fgbg.c                |    6 +-
 ncurses/base/lib_getstr.c                  |    8 +-
 ncurses/base/lib_mouse.c                   |    8 +-
 ncurses/curses.priv.h                      |    8 +-
 ncurses/tinfo/captoinfo.c                  |    6 +-
 ncurses/tinfo/lib_setup.c                  |    6 +-
 ncurses/tinfo/lib_tparm.c                  |   12 +-
 ncurses/tinfo/tinfo_driver.c               |    8 +-
 ncurses/tty/hardscroll.c                   |    6 +-
 ncurses/tty/hashmap.c                      |    6 +-
 ncurses/tty/lib_mvcur.c                    |   12 +-
 ncurses/widechar/lib_add_wch.c             |    6 +-
 ncurses/widechar/lib_inwstr.c              |   22 +-
 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/clear_cmd.c                          |    6 +-
 test/aclocal.m4                            |   38 +-
 test/configure                             | 2687 +++++-----
 test/parse_rgb.h                           |   10 +-
 test/test.priv.h                           |   10 +-
 test/test_mouse.c                          |    6 +-
 190 files changed, 13428 insertions(+), 10043 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index faecc037c..38744d31d 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
+dnl Copyright 2018-2024,2025 Thomas E. Dickey                                *
 dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.223 2024/12/21 15:29:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.226 2025/01/11 00:55:54 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -962,6 +962,52 @@ esac
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27
+dnl ----------------
+dnl Tie together the configure-script macros for curses.  It may be ncurses,
+dnl but unless asked, we do not make a special search for ncurses.  However,
+dnl still check for the ncurses version number, for use in other macros.
+AC_DEFUN([CF_CURSES_CONFIG],
+[
+CF_CURSES_CPPFLAGS
+CF_NCURSES_VERSION
+CF_CURSES_LIBS
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20
+dnl ------------------
+dnl Look for the curses headers.
+AC_DEFUN([CF_CURSES_CPPFLAGS],[
+
+AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
+cf_cv_curses_incdir=no
+case "$host_os" in
+(hpux10.*)
+	if test "x$cf_cv_screen" = "xcurses_colr"
+	then
+		test -d /usr/include/curses_colr && \
+		cf_cv_curses_incdir="-I/usr/include/curses_colr"
+	fi
+	;;
+(sunos3*|sunos4*)
+	if test "x$cf_cv_screen" = "xcurses_5lib"
+	then
+		test -d /usr/5lib && \
+		test -d /usr/5include && \
+		cf_cv_curses_incdir="-I/usr/5include"
+	fi
+	;;
+esac
+])
+if test "$cf_cv_curses_incdir" != no
+then
+	CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir)
+fi
+
+CF_CURSES_HEADER
+CF_TERM_HEADER
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52
 dnl ----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
@@ -987,6 +1033,136 @@ fi
 
 # cheat, to get the right #define's for HAVE_NCURSES_H, etc.
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52
+dnl --------------
+dnl Look for the curses libraries.  Older curses implementations may require
+dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
+AC_DEFUN([CF_CURSES_LIBS],[
+
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+AC_MSG_CHECKING(if we have identified curses libraries)
+AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+	[initscr(); endwin()],
+	cf_result=yes,
+	cf_result=no)
+AC_MSG_RESULT($cf_result)
+
+if test "$cf_result" = no ; then
+case "$host_os" in
+(freebsd*)
+	AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
+	;;
+(hpux10.*)
+	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
+	# next (1998), and xcurses "newer" (2000).  There is no header file for
+	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
+	# term.h) for cur_colr
+	if test "x$cf_cv_screen" = "xcurses_colr"
+	then
+		AC_CHECK_LIB(cur_colr,initscr,[
+			CF_ADD_LIBS(-lcur_colr)
+			ac_cv_func_initscr=yes
+			],[
+		AC_CHECK_LIB(Hcurses,initscr,[
+			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+			CF_ADD_LIBS(-lHcurses)
+			CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES)
+			ac_cv_func_initscr=yes
+			])])
+	fi
+	;;
+(linux*)
+	case `arch 2>/dev/null` in
+	(x86_64)
+		if test -d /lib64
+		then
+			CF_ADD_LIBDIR(/lib64)
+		else
+			CF_ADD_LIBDIR(/lib)
+		fi
+		;;
+	(*)
+		CF_ADD_LIBDIR(/lib)
+		;;
+	esac
+	;;
+(sunos3*|sunos4*)
+	if test "x$cf_cv_screen" = "xcurses_5lib"
+	then
+		if test -d /usr/5lib ; then
+			CF_ADD_LIBDIR(/usr/5lib)
+			CF_ADD_LIBS(-lcurses -ltermcap)
+		fi
+	fi
+	ac_cv_func_initscr=yes
+	;;
+esac
+
+if test ".$ac_cv_func_initscr" != .yes ; then
+	cf_save_LIBS="$LIBS"
+
+	if test ".${cf_cv_ncurses_version:-no}" != .no
+	then
+		cf_check_list="ncurses curses cursesX"
+	else
+		cf_check_list="cursesX curses ncurses"
+	fi
+
+	# Check for library containing tgoto.  Do this before curses library
+	# because it may be needed to link the test-case for initscr.
+	if test "x$cf_term_lib" = x
+	then
+		AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
+			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+			do
+				AC_CHECK_LIB($cf_term_lib,tgoto,[
+					: "${cf_nculib_root:=$cf_term_lib}"
+					break
+				])
+			done
+		])
+	fi
+
+	# Check for library containing initscr
+	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+	if test "x$cf_curs_lib" = x
+	then
+		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+		do
+			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+				AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
+				AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+					[initscr()],
+					[cf_result=yes],
+					[cf_result=no])
+				AC_MSG_RESULT($cf_result)
+				test "$cf_result" = yes && break
+			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+				cf_result=no
+			elif test "$cf_term_lib" != predefined ; then
+				AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
+				AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+					[initscr(); endwin();],
+					[cf_result=no],
+					[
+					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+					AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+						[initscr()],
+						[cf_result=yes],
+						[cf_result=error])
+					])
+				AC_MSG_RESULT($cf_result)
+				test "$cf_result" != error && break
+			fi
+		done
+	fi
+	test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found)
+fi
+fi
+
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42
@@ -3073,7 +3249,7 @@ printf("old\\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37
+dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
@@ -3134,6 +3310,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
 			;;
 		esac
 
+		CF_REQUIRE_PKG($cf_ncuconfig_root)
 		CF_APPEND_CFLAGS($cf_pkg_cflags)
 		CF_ADD_LIBS($cf_pkg_libs)
 
@@ -3977,6 +4154,30 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
+dnl --------------
+dnl Update $REQUIRE_PKG, which lists the known required packages for this
+dnl program.
+dnl
+dnl $1 = package(s) to require, e.g., in the generated ".pc" file
+define([CF_REQUIRE_PKG],
+[
+for cf_required in $1
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+AC_SUBST(REQUIRE_PKG)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
 dnl ---------------------
 dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
diff --git a/Ada95/configure b/Ada95/configure
index a2c7aff8e..b7e8e5f62 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -5207,6 +5207,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			;;
 		esac
 
+for cf_required in $cf_ncuconfig_root
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+
 for cf_add_cflags in $cf_pkg_cflags
 do
 	case "x$cf_add_cflags" in
@@ -5350,7 +5364,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 5353 "configure"
+#line 5367 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -5362,37 +5376,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5368: \$? = $ac_status" >&5
+  echo "$as_me:5382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5374: \$? = $ac_status" >&5
+  echo "$as_me:5388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5380 "configure"
+#line 5394 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5390: \$? = $ac_status" >&5
+  echo "$as_me:5404: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5395: \$? = $ac_status" >&5
+  echo "$as_me:5409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -5409,7 +5423,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:5412: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:5426: 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"
@@ -5425,7 +5439,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:5428: checking for terminfo header" >&5
+echo "$as_me:5442: 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
@@ -5443,7 +5457,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5446 "configure"
+#line 5460 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -5458,16 +5472,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5464: \$? = $ac_status" >&5
+  echo "$as_me:5478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5470: \$? = $ac_status" >&5
+  echo "$as_me:5484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -5483,7 +5497,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5486: result: $cf_cv_term_header" >&5
+echo "$as_me:5500: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -5518,7 +5532,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:5521: result: no" >&5
+		echo "$as_me:5535: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -5534,7 +5548,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5537: checking for $ac_word" >&5
+echo "$as_me:5551: 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
@@ -5549,7 +5563,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:5552: found $ac_dir/$ac_word" >&5
+echo "$as_me:5566: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5557,10 +5571,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:5560: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5574: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5563: result: no" >&5
+  echo "$as_me:5577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5573,7 +5587,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5576: checking for $ac_word" >&5
+echo "$as_me:5590: 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
@@ -5588,7 +5602,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:5591: found $ac_dir/$ac_word" >&5
+echo "$as_me:5605: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5596,10 +5610,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:5599: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:5613: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:5602: result: no" >&5
+  echo "$as_me:5616: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5756,7 +5770,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:5759: checking if we have identified curses headers" >&5
+echo "$as_me:5773: 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
@@ -5768,7 +5782,7 @@ for cf_header in \
 	curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5771 "configure"
+#line 5785 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -5780,16 +5794,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5786: \$? = $ac_status" >&5
+  echo "$as_me:5800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5792: \$? = $ac_status" >&5
+  echo "$as_me:5806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5800,11 +5814,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5803: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5817: 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:5807: error: No curses header-files found" >&5
+	{ { echo "$as_me:5821: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5814,23 +5828,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5817: checking for $ac_header" >&5
+echo "$as_me:5831: 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 5823 "configure"
+#line 5837 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5827: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5833: \$? = $ac_status" >&5
+  echo "$as_me:5847: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5849,7 +5863,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5852: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5905,7 +5919,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 5908 "configure"
+#line 5922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5917,16 +5931,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5923: \$? = $ac_status" >&5
+  echo "$as_me:5937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5929: \$? = $ac_status" >&5
+  echo "$as_me:5943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5943,7 +5957,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:5946: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5960: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5962,7 +5976,7 @@ fi
 
 }
 
-echo "$as_me:5965: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5979: 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
@@ -5974,7 +5988,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5977 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5998,16 +6012,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6004: \$? = $ac_status" >&5
+  echo "$as_me:6018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6010: \$? = $ac_status" >&5
+  echo "$as_me:6024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -6022,14 +6036,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:6025: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:6039: 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:6032: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:6046: 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
@@ -6150,7 +6164,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6153 "configure"
+#line 6167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6162,16 +6176,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6168: \$? = $ac_status" >&5
+  echo "$as_me:6182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6174: \$? = $ac_status" >&5
+  echo "$as_me:6188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6188,7 +6202,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6191: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6205: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6211,7 +6225,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6214 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6235,16 +6249,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6241: \$? = $ac_status" >&5
+  echo "$as_me:6255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6247: \$? = $ac_status" >&5
+  echo "$as_me:6261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -6265,12 +6279,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6268: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6282: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:6273: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6287: 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%/[^/]*$%%'`
@@ -6306,7 +6320,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 6309 "configure"
+#line 6323 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6318,16 +6332,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6324: \$? = $ac_status" >&5
+  echo "$as_me:6338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6330: \$? = $ac_status" >&5
+  echo "$as_me:6344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6344,7 +6358,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6347: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6361: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6392,7 +6406,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:6395: checking for terminfo header" >&5
+echo "$as_me:6409: 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
@@ -6410,7 +6424,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6413 "configure"
+#line 6427 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -6425,16 +6439,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6431: \$? = $ac_status" >&5
+  echo "$as_me:6445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6437: \$? = $ac_status" >&5
+  echo "$as_me:6451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -6450,7 +6464,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:6453: result: $cf_cv_term_header" >&5
+echo "$as_me:6467: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -6488,7 +6502,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:6491: checking for ncurses version" >&5
+echo "$as_me:6505: 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
@@ -6514,10 +6528,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:6517: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:6531: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:6520: \$? = $ac_status" >&5
+  echo "$as_me:6534: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -6527,7 +6541,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6530 "configure"
+#line 6544 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6554,15 +6568,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6560: \$? = $ac_status" >&5
+  echo "$as_me:6574: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6565: \$? = $ac_status" >&5
+  echo "$as_me:6579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6576,7 +6590,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:6579: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6593: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -6589,7 +6603,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:6592: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:6606: 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
@@ -6597,7 +6611,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6600 "configure"
+#line 6614 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6616,16 +6630,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6622: \$? = $ac_status" >&5
+  echo "$as_me:6636: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6628: \$? = $ac_status" >&5
+  echo "$as_me:6642: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -6636,10 +6650,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6639: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6653: 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:6642: checking for initscr in -lgpm" >&5
+  echo "$as_me:6656: 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
@@ -6647,7 +6661,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6650 "configure"
+#line 6664 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6666,16 +6680,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6672: \$? = $ac_status" >&5
+  echo "$as_me:6686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6678: \$? = $ac_status" >&5
+  echo "$as_me:6692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -6686,7 +6700,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6689: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6703: 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"
@@ -6701,7 +6715,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:6704: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:6718: 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
@@ -6709,7 +6723,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6712 "configure"
+#line 6726 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6728,16 +6742,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6734: \$? = $ac_status" >&5
+  echo "$as_me:6748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6740: \$? = $ac_status" >&5
+  echo "$as_me:6754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -6748,7 +6762,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6751: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6765: 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"
@@ -6758,29 +6772,1060 @@ fi
 	;;
 esac
 
-cf_add_libs="$LIBS"
-# reverse order
-cf_add_0lib=
-for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
-# filter duplicates
-for cf_add_1lib in $cf_add_0lib; do
-	for cf_add_2lib in $cf_add_libs; do
-		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
-			cf_add_1lib=
-			break
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
+then
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+else
+
+	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+	cf_libdir=""
+	echo "$as_me:6814: 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 6820 "configure"
+#include "confdefs.h"
+#define initscr autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef initscr
+
+#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 initscr (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_initscr) || defined (__stub___initscr)
+#error found stub for initscr
+#endif
+
+	return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6854: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6860: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_initscr=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_initscr=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:6870: 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:6877: 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 6881 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+initscr()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6893: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6896: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6899: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6902: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:6904: 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:6911: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cf_search=
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case "$cf_library_path" in
+		(-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "x$cf_library_path" != "xNONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+	test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+	test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+	test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=
+
+test "x$prefix" != "xNONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+	test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+	test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+	test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+	test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+	test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+	test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+	test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+done
+
+cf_search="$cf_library_path_list $cf_search"
+
+			for cf_libdir in $cf_search
+			do
+				echo "$as_me:6979: 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 6983 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+initscr()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6995: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6998: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7004: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:7006: 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:7013: result: no" >&5
+echo "${ECHO_T}no" >&6
+					 LIBS="$cf_save_LIBS"
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+			done
+
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+fi
+
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+if test "$cf_found_library" = no ; then
+	{ { echo "$as_me:7028: error: Cannot link $cf_nculib_root library" >&5
+echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+
+if test -n "$cf_ncurses_LIBS" ; then
+	echo "$as_me:7036: 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
+		q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`
+		if test "$q" != "$LIBS" ; then
+			LIBS="$q"
+		fi
+	done
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 7046 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+initscr(); mousemask(0,0); tigetstr((char *)0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7058: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7061: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7064: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7067: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:7069: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:7074: result: no" >&5
+echo "${ECHO_T}no" >&6
+		 LIBS="$cf_ncurses_SAVE"
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+
+cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+cat >>confdefs.h <<EOF
+#define $cf_nculib_ROOT 1
+EOF
+
+	fi
+else
+	NCURSES_CONFIG=none
+fi
+
+echo "$as_me:7092: 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.
+if test "${with_screen+set}" = set; then
+  withval="$with_screen"
+  cf_cv_screen=$withval
+else
+  cf_cv_screen=ncurses
+fi;
+
+case $cf_cv_screen in
+(curses|curses_*)
+
+echo "$as_me:7106: 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
+else
+
+cf_cv_curses_incdir=no
+case "$host_os" in
+(hpux10.*)
+	if test "x$cf_cv_screen" = "xcurses_colr"
+	then
+		test -d /usr/include/curses_colr && \
+		cf_cv_curses_incdir="-I/usr/include/curses_colr"
+	fi
+	;;
+(sunos3*|sunos4*)
+	if test "x$cf_cv_screen" = "xcurses_5lib"
+	then
+		test -d /usr/5lib && \
+		test -d /usr/5include && \
+		cf_cv_curses_incdir="-I/usr/5include"
+	fi
+	;;
+esac
+
+fi
+echo "$as_me:7132: result: $cf_cv_curses_incdir" >&5
+echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+if test "$cf_cv_curses_incdir" != no
+then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir"
+
+fi
+
+echo "$as_me:7142: 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
+else
+
+cf_cv_ncurses_header=none
+for cf_header in \
+	ncurses.h  \
+	curses.h  ncurses/ncurses.h ncurses/curses.h
+do
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7154 "configure"
+#include "confdefs.h"
+#include <${cf_header}>
+int
+main (void)
+{
+initscr(); endwin()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:7169: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7175: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_ncurses_header=$cf_header; break
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+done
+
+fi
+echo "$as_me:7186: 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:7190: error: No curses header-files found" >&5
+echo "$as_me: error: No curses header-files found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# cheat, to get the right #define's for HAVE_NCURSES_H, etc.
+
+for ac_header in $cf_cv_ncurses_header
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:7200: 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 7206 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:7210: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:7216: \$? = $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:7235: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:7245: 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
+else
+
+case "${cf_cv_ncurses_header}" in
+(*/ncurses.h|*/ncursesw.h)
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
+	;;
+(*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7263 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <${cf_cv_ncurses_header:-curses.h}>
+#include <$cf_test>
+
+int
+main (void)
+{
+int x = auto_left_margin; (void)x
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7278: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:7281: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7284: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7287: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+	cf_cv_term_header="$cf_test"
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+	cf_cv_term_header=unknown
+
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+	test "$cf_cv_term_header" != unknown && break
+done
+
+fi
+echo "$as_me:7303: result: $cf_cv_term_header" >&5
+echo "${ECHO_T}$cf_cv_term_header" >&6
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case "$cf_cv_term_header" in
+(*term.h)
+
+cat >>confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+esac
+
+case "$cf_cv_term_header" in
+(ncurses/term.h)
+
+cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+(ncursesw/term.h)
+
+cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+echo "$as_me:7335: 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
+else
+
+	cf_cv_ncurses_version=no
+	cf_tempfile=out$$
+	rm -f "$cf_tempfile"
+	if test "$cross_compiling" = yes; then
+
+	# This will not work if the preprocessor splits the line after the
+	# Autoconf token.  The 'unproto' program does that.
+	cat > "conftest.$ac_ext" <<EOF
+#include <${cf_cv_ncurses_header:-curses.h}>
+#undef Autoconf
+#ifdef NCURSES_VERSION
+Autoconf NCURSES_VERSION
+#else
+#ifdef __NCURSES_H
+Autoconf "old"
+#endif
+;
+#endif
+EOF
+	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+	{ (eval echo "$as_me:7361: \"$cf_try\"") >&5
+  (eval $cf_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7364: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+	if test -f conftest.out ; then
+		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
+		rm -f conftest.out
+	fi
+
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7374 "configure"
+#include "confdefs.h"
+
+$ac_includes_default
+
+#include <${cf_cv_ncurses_header:-curses.h}>
+
+int main(void)
+{
+	FILE *fp = fopen("$cf_tempfile", "w");
+#ifdef NCURSES_VERSION
+# ifdef NCURSES_VERSION_PATCH
+	fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+# else
+	fprintf(fp, "%s\\n", NCURSES_VERSION);
+# endif
+#else
+# ifdef __NCURSES_H
+	fprintf(fp, "old\\n");
+# else
+	#error expected ncurses header to define __NCURSES_H
+# endif
+#endif
+	${cf_cv_main_return:-return}(0);
+}
+_ACEOF
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:7401: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7404: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:7406: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7409: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+	cf_cv_ncurses_version=`cat $cf_tempfile`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+fi
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+	rm -f "$cf_tempfile"
+
+fi
+echo "$as_me:7423: 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:7430: 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 7433 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+initscr(); endwin()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7448: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7454: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_result=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_result=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+echo "$as_me:7463: result: $cf_result" >&5
+echo "${ECHO_T}$cf_result" >&6
+
+if test "$cf_result" = no ; then
+case "$host_os" in
+(freebsd*)
+	echo "$as_me:7469: 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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmytinfo  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7477 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char tgoto (void);
+int
+main (void)
+{
+tgoto ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7496: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7499: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7502: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7505: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_mytinfo_tgoto=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_mytinfo_tgoto=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7516: 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_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+fi
+
+	;;
+(hpux10.*)
+	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
+	# next (1998), and xcurses "newer" (2000).  There is no header file for
+	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
+	# term.h) for cur_colr
+	if test "x$cf_cv_screen" = "xcurses_colr"
+	then
+		echo "$as_me:7546: 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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcur_colr  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7554 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char initscr (void);
+int
+main (void)
+{
+initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7573: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7576: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7582: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_cur_colr_initscr=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_cur_colr_initscr=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7593: 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
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+			ac_cv_func_initscr=yes
+
+else
+
+		echo "$as_me:7617: 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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lHcurses  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7625 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char initscr (void);
+int
+main (void)
+{
+initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7644: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7647: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7650: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7653: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_lib_Hcurses_initscr=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_lib_Hcurses_initscr=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7664: 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
+
+			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES"
+
+			ac_cv_func_initscr=yes
+
+fi
+
+fi
+
+	fi
+	;;
+(linux*)
+	case `arch 2>/dev/null` in
+	(x86_64)
+		if test -d /lib64
+		then
+
+if test -n "/lib64" ; then
+	for cf_add_libdir in /lib64
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:7722: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+		else
+
+if test -n "/lib" ; then
+	for cf_add_libdir in /lib
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:7751: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+		fi
+		;;
+	(*)
+
+if test -n "/lib" ; then
+	for cf_add_libdir in /lib
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:7782: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+		;;
+	esac
+	;;
+(sunos3*|sunos4*)
+	if test "x$cf_cv_screen" = "xcurses_5lib"
+	then
+		if test -d /usr/5lib ; then
+
+if test -n "/usr/5lib" ; then
+	for cf_add_libdir in /usr/5lib
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:7817: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
 		fi
 	done
-	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
-done
-LIBS="$cf_add_libs"
-
-if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
-then
+fi
 
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
-for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
 	for cf_add_2lib in $cf_add_libs; do
@@ -6793,21 +7838,37 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-else
+		fi
+	fi
+	ac_cv_func_initscr=yes
+	;;
+esac
 
-	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
-	cf_libdir=""
-	echo "$as_me:6800: checking for initscr" >&5
-echo $ECHO_N "checking for initscr... $ECHO_C" >&6
-if test "${ac_cv_func_initscr+set}" = set; then
+if test ".$ac_cv_func_initscr" != .yes ; then
+	cf_save_LIBS="$LIBS"
+
+	if test ".${cf_cv_ncurses_version:-no}" != .no
+	then
+		cf_check_list="ncurses curses cursesX"
+	else
+		cf_check_list="cursesX curses ncurses"
+	fi
+
+	# Check for library containing tgoto.  Do this before curses library
+	# because it may be needed to link the test-case for initscr.
+	if test "x$cf_term_lib" = x
+	then
+		echo "$as_me:7861: 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 6806 "configure"
+#line 7867 "configure"
 #include "confdefs.h"
-#define initscr autoconf_temporary
+#define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
-#undef initscr
+#undef tgoto
 
 #ifdef __cplusplus
 extern "C"
@@ -6815,7 +7876,7 @@ extern "C"
 
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char initscr (void);
+char tgoto (void);
 
 int
 main (void)
@@ -6824,149 +7885,118 @@ 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_initscr) || defined (__stub___initscr)
-#error found stub for initscr
+#if defined (__stub_tgoto) || defined (__stub___tgoto)
+#error found stub for tgoto
 #endif
 
-	return initscr ();
+	return tgoto ();
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:7901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6846: \$? = $ac_status" >&5
+  echo "$as_me:7907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  ac_cv_func_initscr=yes
+  ac_cv_func_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-ac_cv_func_initscr=no
+ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6856: 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'
+echo "$as_me:7917: 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
 else
 
-		cf_save_LIBS="$LIBS"
-		echo "$as_me:6863: 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 6867 "configure"
+			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:7926: 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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$cf_term_lib  $LIBS"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7934 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header:-curses.h}>
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char tgoto (void);
 int
 main (void)
 {
-initscr()
+tgoto ();
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6882: \$? = $ac_status" >&5
+  echo "$as_me:7956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6888: \$? = $ac_status" >&5
+  echo "$as_me:7962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6890: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
-
+  eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:6897: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-cf_search=
-cf_library_path_list=""
-if test -n "${LDFLAGS}${LIBS}" ; then
-	for cf_library_path in $LDFLAGS $LIBS
-	do
-		case "$cf_library_path" in
-		(-L*)
-			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-
-test "x$cf_library_path" != "xNONE" && \
-test -d "$cf_library_path" && \
- {
-	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
-	test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
-	test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-	test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-	test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-	test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
-			cf_library_path_list="$cf_library_path_list $cf_search"
-			;;
-		esac
-	done
+eval "$as_ac_Lib=no"
 fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7973: 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_search=
-
-test "x$prefix" != "xNONE" && \
-test -d "$prefix" && \
- {
-	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
-	test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
-	test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-	test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-	test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-	test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
-}
+					: "${cf_nculib_root:=$cf_term_lib}"
+					break
 
-for cf_subdir_prefix in \
-	/usr \
-	/usr/local \
-	/usr/pkg \
-	/opt \
-	/opt/local \
-	$HOME
-do
+fi
 
-test "x$cf_subdir_prefix" != "x$prefix" && \
-test -d "$cf_subdir_prefix" && \
-{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
-	test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-	test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-	test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-	test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-	test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
-}
+			done
 
-done
+fi
 
-cf_search="$cf_library_path_list $cf_search"
+	fi
 
-			for cf_libdir in $cf_search
-			do
-				echo "$as_me:6965: 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"
+	# Check for library containing initscr
+	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+	if test "x$cf_curs_lib" = x
+	then
+		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+		do
+			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+				echo "$as_me:7996: 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 6969 "configure"
+#line 7999 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6978,140 +8008,131 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6984: \$? = $ac_status" >&5
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6990: \$? = $ac_status" >&5
+  echo "$as_me:8020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6992: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
-					 break
+  cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:6999: result: no" >&5
-echo "${ECHO_T}no" >&6
-					 LIBS="$cf_save_LIBS"
-fi
-rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			done
-
+cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+				echo "$as_me:8029: result: $cf_result" >&5
+echo "${ECHO_T}$cf_result" >&6
+				test "$cf_result" = yes && break
+			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+				cf_result=no
+			elif test "$cf_term_lib" != predefined ; then
+				echo "$as_me:8035: 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 8038 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main (void)
+{
+initscr(); endwin();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8053: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8059: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_result=no
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
 
-fi
-
-eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
-
-if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:7014: error: Cannot link $cf_nculib_root library" >&5
-echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:7022: 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
-		q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`
-		if test "$q" != "$LIBS" ; then
-			LIBS="$q"
-		fi
-	done
-	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7032 "configure"
+					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+					cat >"conftest.$ac_ext" <<_ACEOF
+#line 8068 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
-initscr(); mousemask(0,0); tigetstr((char *)0);
+initscr()
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7047: \$? = $ac_status" >&5
+  echo "$as_me:8083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7053: \$? = $ac_status" >&5
+  echo "$as_me:8089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:7055: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:7060: result: no" >&5
-echo "${ECHO_T}no" >&6
-		 LIBS="$cf_ncurses_SAVE"
+cf_result=error
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-fi
-
-cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
-cat >>confdefs.h <<EOF
-#define $cf_nculib_ROOT 1
-EOF
 
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+				echo "$as_me:8101: result: $cf_result" >&5
+echo "${ECHO_T}$cf_result" >&6
+				test "$cf_result" != error && break
+			fi
+		done
 	fi
-else
-	NCURSES_CONFIG=none
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:8107: error: no curses library found" >&5
+echo "$as_me: error: no curses library found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 fi
 
-echo "$as_me:7078: 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.
-if test "${with_screen+set}" = set; then
-  withval="$with_screen"
-  cf_cv_screen=$withval
-else
-  cf_cv_screen=ncurses
-fi;
-
-case $cf_cv_screen in
-(curses|curses_*)
-	CF_CURSES_CONFIG
 	;;
 (ncursesw*)
 
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7098: checking for $ac_header" >&5
+echo "$as_me:8119: 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 7104 "configure"
+#line 8125 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7108: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8129: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7114: \$? = $ac_status" >&5
+  echo "$as_me:8135: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7130,7 +8151,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7133: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8154: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7140,7 +8161,7 @@ EOF
 fi
 done
 
-echo "$as_me:7143: checking for multibyte character support" >&5
+echo "$as_me:8164: 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
@@ -7148,7 +8169,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7151 "configure"
+#line 8172 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7165,16 +8186,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7171: \$? = $ac_status" >&5
+  echo "$as_me:8192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7177: \$? = $ac_status" >&5
+  echo "$as_me:8198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -7186,12 +8207,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:7189: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8210: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7194 "configure"
+#line 8215 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7204,16 +8225,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7210: \$? = $ac_status" >&5
+  echo "$as_me:8231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7216: \$? = $ac_status" >&5
+  echo "$as_me:8237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7227,7 +8248,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7230 "configure"
+#line 8251 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7240,16 +8261,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7246: \$? = $ac_status" >&5
+  echo "$as_me:8267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7252: \$? = $ac_status" >&5
+  echo "$as_me:8273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -7266,9 +8287,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:7269: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8290: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:7271: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8292: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7359,7 +8380,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7362: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8383: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -7367,7 +8388,7 @@ echo "${as_me:-configure}:7362: testing ... testing $cf_cv_header_path_utf8 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7370 "configure"
+#line 8391 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7380,21 +8401,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7386: \$? = $ac_status" >&5
+  echo "$as_me:8407: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7392: \$? = $ac_status" >&5
+  echo "$as_me:8413: \$? = $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}:7397: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8418: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7412,7 +8433,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:7415: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8436: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7487,13 +8508,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:7490: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8511: 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 7496 "configure"
+#line 8517 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7506,21 +8527,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7512: \$? = $ac_status" >&5
+  echo "$as_me:8533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7518: \$? = $ac_status" >&5
+  echo "$as_me:8539: \$? = $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}:7523: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8544: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -7562,7 +8583,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7565: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8586: 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
@@ -7600,7 +8621,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 7603 "configure"
+#line 8624 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7612,16 +8633,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7618: \$? = $ac_status" >&5
+  echo "$as_me:8639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7624: \$? = $ac_status" >&5
+  echo "$as_me:8645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -7638,7 +8659,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8662: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7674,7 +8695,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7677: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7704,13 +8725,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:7707: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:8728: 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:7710: result: yes" >&5
+		echo "$as_me:8731: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:7713: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:8734: 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
 
@@ -7843,7 +8864,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7846 "configure"
+#line 8867 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7855,37 +8876,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7861: \$? = $ac_status" >&5
+  echo "$as_me:8882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7867: \$? = $ac_status" >&5
+  echo "$as_me:8888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7873 "configure"
+#line 8894 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7883: \$? = $ac_status" >&5
+  echo "$as_me:8904: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7888: \$? = $ac_status" >&5
+  echo "$as_me:8909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -7916,6 +8937,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			;;
 		esac
 
+for cf_required in $cf_ncuconfig_root
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+
 for cf_add_cflags in $cf_pkg_cflags
 do
 	case "x$cf_add_cflags" in
@@ -8059,7 +9094,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8062 "configure"
+#line 9097 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8071,37 +9106,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8077: \$? = $ac_status" >&5
+  echo "$as_me:9112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8083: \$? = $ac_status" >&5
+  echo "$as_me:9118: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8089 "configure"
+#line 9124 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8099: \$? = $ac_status" >&5
+  echo "$as_me:9134: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  echo "$as_me:9139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -8118,7 +9153,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:8121: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9156: 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"
@@ -8134,7 +9169,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:8137: checking for terminfo header" >&5
+echo "$as_me:9172: 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
@@ -8152,7 +9187,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8155 "configure"
+#line 9190 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -8167,16 +9202,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8173: \$? = $ac_status" >&5
+  echo "$as_me:9208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8179: \$? = $ac_status" >&5
+  echo "$as_me:9214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8192,7 +9227,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8195: result: $cf_cv_term_header" >&5
+echo "$as_me:9230: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8227,7 +9262,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:8230: result: no" >&5
+		echo "$as_me:9265: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -8243,7 +9278,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:8246: checking for $ac_word" >&5
+echo "$as_me:9281: 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
@@ -8258,7 +9293,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:8261: found $ac_dir/$ac_word" >&5
+echo "$as_me:9296: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8266,10 +9301,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8269: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9304: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8272: result: no" >&5
+  echo "$as_me:9307: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8282,7 +9317,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8285: checking for $ac_word" >&5
+echo "$as_me:9320: 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
@@ -8297,7 +9332,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:8300: found $ac_dir/$ac_word" >&5
+echo "$as_me:9335: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8305,10 +9340,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:8308: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9343: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8311: result: no" >&5
+  echo "$as_me:9346: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8465,7 +9500,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:8468: checking if we have identified curses headers" >&5
+echo "$as_me:9503: 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
@@ -8477,7 +9512,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8480 "configure"
+#line 9515 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8489,16 +9524,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8495: \$? = $ac_status" >&5
+  echo "$as_me:9530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8501: \$? = $ac_status" >&5
+  echo "$as_me:9536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8509,11 +9544,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8512: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9547: 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:8516: error: No curses header-files found" >&5
+	{ { echo "$as_me:9551: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8523,23 +9558,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8526: checking for $ac_header" >&5
+echo "$as_me:9561: 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 8532 "configure"
+#line 9567 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8542: \$? = $ac_status" >&5
+  echo "$as_me:9577: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8558,7 +9593,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8614,7 +9649,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8617 "configure"
+#line 9652 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8626,16 +9661,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8632: \$? = $ac_status" >&5
+  echo "$as_me:9667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8638: \$? = $ac_status" >&5
+  echo "$as_me:9673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8652,7 +9687,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8655: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9690: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8671,7 +9706,7 @@ fi
 
 }
 
-echo "$as_me:8674: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9709: 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
@@ -8683,7 +9718,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8686 "configure"
+#line 9721 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8707,16 +9742,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8713: \$? = $ac_status" >&5
+  echo "$as_me:9748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8719: \$? = $ac_status" >&5
+  echo "$as_me:9754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -8731,14 +9766,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:8734: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9769: 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:8741: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9776: 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
@@ -8859,7 +9894,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 8862 "configure"
+#line 9897 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8871,16 +9906,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8877: \$? = $ac_status" >&5
+  echo "$as_me:9912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8883: \$? = $ac_status" >&5
+  echo "$as_me:9918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8897,7 +9932,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8900: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9935: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8920,7 +9955,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8923 "configure"
+#line 9958 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8944,16 +9979,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8950: \$? = $ac_status" >&5
+  echo "$as_me:9985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8956: \$? = $ac_status" >&5
+  echo "$as_me:9991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -8974,12 +10009,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8977: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10012: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:8982: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10017: 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%/[^/]*$%%'`
@@ -9015,7 +10050,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9018 "configure"
+#line 10053 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9027,16 +10062,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9033: \$? = $ac_status" >&5
+  echo "$as_me:10068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9039: \$? = $ac_status" >&5
+  echo "$as_me:10074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9053,7 +10088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9056: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10091: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9101,7 +10136,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9104: checking for terminfo header" >&5
+echo "$as_me:10139: 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
@@ -9119,7 +10154,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9122 "configure"
+#line 10157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9134,16 +10169,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9140: \$? = $ac_status" >&5
+  echo "$as_me:10175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9146: \$? = $ac_status" >&5
+  echo "$as_me:10181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9159,7 +10194,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9162: result: $cf_cv_term_header" >&5
+echo "$as_me:10197: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9197,7 +10232,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9200: checking for ncurses version" >&5
+echo "$as_me:10235: 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
@@ -9223,10 +10258,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9226: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10261: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9229: \$? = $ac_status" >&5
+  echo "$as_me:10264: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -9236,7 +10271,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9239 "configure"
+#line 10274 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9263,15 +10298,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9269: \$? = $ac_status" >&5
+  echo "$as_me:10304: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9274: \$? = $ac_status" >&5
+  echo "$as_me:10309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9285,7 +10320,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:9288: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10323: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -9298,7 +10333,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9301: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10336: 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
@@ -9306,7 +10341,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9309 "configure"
+#line 10344 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9325,16 +10360,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9331: \$? = $ac_status" >&5
+  echo "$as_me:10366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9337: \$? = $ac_status" >&5
+  echo "$as_me:10372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9345,10 +10380,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9348: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10383: 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:9351: checking for initscr in -lgpm" >&5
+  echo "$as_me:10386: 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
@@ -9356,7 +10391,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9359 "configure"
+#line 10394 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9375,16 +10410,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9381: \$? = $ac_status" >&5
+  echo "$as_me:10416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9387: \$? = $ac_status" >&5
+  echo "$as_me:10422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9395,7 +10430,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9398: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10433: 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"
@@ -9410,7 +10445,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9413: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10448: 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
@@ -9418,7 +10453,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9421 "configure"
+#line 10456 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9437,16 +10472,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9443: \$? = $ac_status" >&5
+  echo "$as_me:10478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9449: \$? = $ac_status" >&5
+  echo "$as_me:10484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9457,7 +10492,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9460: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10495: 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"
@@ -9506,13 +10541,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:9509: checking for initscr" >&5
+	echo "$as_me:10544: 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 9515 "configure"
+#line 10550 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9543,16 +10578,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9549: \$? = $ac_status" >&5
+  echo "$as_me:10584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9555: \$? = $ac_status" >&5
+  echo "$as_me:10590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9562,18 +10597,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9565: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10600: 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:9572: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10607: 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 9576 "configure"
+#line 10611 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9585,25 +10620,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9591: \$? = $ac_status" >&5
+  echo "$as_me:10626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9597: \$? = $ac_status" >&5
+  echo "$as_me:10632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9599: result: yes" >&5
+  echo "$as_me:10634: 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:9606: result: no" >&5
+echo "$as_me:10641: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -9671,11 +10706,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9674: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10709: 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 9678 "configure"
+#line 10713 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9687,25 +10722,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9693: \$? = $ac_status" >&5
+  echo "$as_me:10728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9699: \$? = $ac_status" >&5
+  echo "$as_me:10734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9701: result: yes" >&5
+  echo "$as_me:10736: 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:9708: result: no" >&5
+echo "$as_me:10743: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9720,7 +10755,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:9723: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10758: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9728,7 +10763,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9731: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10766: 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
@@ -9738,7 +10773,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9741 "configure"
+#line 10776 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9750,23 +10785,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9756: \$? = $ac_status" >&5
+  echo "$as_me:10791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9762: \$? = $ac_status" >&5
+  echo "$as_me:10797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:9764: result: yes" >&5
+  echo "$as_me:10799: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9769: result: no" >&5
+echo "$as_me:10804: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -9791,13 +10826,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:9794: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10829: 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:9797: result: yes" >&5
+		echo "$as_me:10832: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:9800: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10835: 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
 
@@ -9930,7 +10965,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9933 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -9942,37 +10977,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9948: \$? = $ac_status" >&5
+  echo "$as_me:10983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9954: \$? = $ac_status" >&5
+  echo "$as_me:10989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9960 "configure"
+#line 10995 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:11005: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9975: \$? = $ac_status" >&5
+  echo "$as_me:11010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10003,6 +11038,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			;;
 		esac
 
+for cf_required in $cf_ncuconfig_root
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+
 for cf_add_cflags in $cf_pkg_cflags
 do
 	case "x$cf_add_cflags" in
@@ -10146,7 +11195,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10149 "configure"
+#line 11198 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10158,37 +11207,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10164: \$? = $ac_status" >&5
+  echo "$as_me:11213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10170: \$? = $ac_status" >&5
+  echo "$as_me:11219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10176 "configure"
+#line 11225 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10186: \$? = $ac_status" >&5
+  echo "$as_me:11235: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10191: \$? = $ac_status" >&5
+  echo "$as_me:11240: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -10205,7 +11254,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:10208: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11257: 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"
@@ -10221,7 +11270,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:10224: checking for terminfo header" >&5
+echo "$as_me:11273: 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
@@ -10239,7 +11288,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10242 "configure"
+#line 11291 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10254,16 +11303,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10260: \$? = $ac_status" >&5
+  echo "$as_me:11309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10266: \$? = $ac_status" >&5
+  echo "$as_me:11315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10279,7 +11328,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10282: result: $cf_cv_term_header" >&5
+echo "$as_me:11331: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10314,7 +11363,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:10317: result: no" >&5
+		echo "$as_me:11366: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -10330,7 +11379,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:10333: checking for $ac_word" >&5
+echo "$as_me:11382: 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
@@ -10345,7 +11394,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:10348: found $ac_dir/$ac_word" >&5
+echo "$as_me:11397: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10353,10 +11402,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:10356: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11405: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10359: result: no" >&5
+  echo "$as_me:11408: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10369,7 +11418,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10372: checking for $ac_word" >&5
+echo "$as_me:11421: 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
@@ -10384,7 +11433,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:10387: found $ac_dir/$ac_word" >&5
+echo "$as_me:11436: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10392,10 +11441,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:10395: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11444: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:10398: result: no" >&5
+  echo "$as_me:11447: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10552,7 +11601,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:10555: checking if we have identified curses headers" >&5
+echo "$as_me:11604: 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
@@ -10564,7 +11613,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10567 "configure"
+#line 11616 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10576,16 +11625,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10582: \$? = $ac_status" >&5
+  echo "$as_me:11631: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10588: \$? = $ac_status" >&5
+  echo "$as_me:11637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10596,11 +11645,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10599: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11648: 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:10603: error: No curses header-files found" >&5
+	{ { echo "$as_me:11652: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10610,23 +11659,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10613: checking for $ac_header" >&5
+echo "$as_me:11662: 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 10619 "configure"
+#line 11668 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10623: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10629: \$? = $ac_status" >&5
+  echo "$as_me:11678: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10645,7 +11694,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10648: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11697: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10701,7 +11750,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10704 "configure"
+#line 11753 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10713,16 +11762,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10719: \$? = $ac_status" >&5
+  echo "$as_me:11768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10725: \$? = $ac_status" >&5
+  echo "$as_me:11774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10739,7 +11788,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10742: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11791: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10758,7 +11807,7 @@ fi
 
 }
 
-echo "$as_me:10761: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11810: 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
@@ -10770,7 +11819,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10773 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10794,16 +11843,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10800: \$? = $ac_status" >&5
+  echo "$as_me:11849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10806: \$? = $ac_status" >&5
+  echo "$as_me:11855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10818,14 +11867,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:10821: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11870: 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:10828: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11877: 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
@@ -10946,7 +11995,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10949 "configure"
+#line 11998 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10958,16 +12007,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10964: \$? = $ac_status" >&5
+  echo "$as_me:12013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10970: \$? = $ac_status" >&5
+  echo "$as_me:12019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10984,7 +12033,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10987: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12036: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11007,7 +12056,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11010 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11031,16 +12080,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11037: \$? = $ac_status" >&5
+  echo "$as_me:12086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11043: \$? = $ac_status" >&5
+  echo "$as_me:12092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11061,12 +12110,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11064: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12113: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11069: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12118: 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%/[^/]*$%%'`
@@ -11102,7 +12151,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11105 "configure"
+#line 12154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11114,16 +12163,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11120: \$? = $ac_status" >&5
+  echo "$as_me:12169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11126: \$? = $ac_status" >&5
+  echo "$as_me:12175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11140,7 +12189,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11143: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12192: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11188,7 +12237,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11191: checking for terminfo header" >&5
+echo "$as_me:12240: 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
@@ -11206,7 +12255,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11209 "configure"
+#line 12258 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11221,16 +12270,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11227: \$? = $ac_status" >&5
+  echo "$as_me:12276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11233: \$? = $ac_status" >&5
+  echo "$as_me:12282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11246,7 +12295,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11249: result: $cf_cv_term_header" >&5
+echo "$as_me:12298: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11284,7 +12333,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:11287: checking for ncurses version" >&5
+echo "$as_me:12336: 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
@@ -11310,10 +12359,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11313: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12362: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11316: \$? = $ac_status" >&5
+  echo "$as_me:12365: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -11323,7 +12372,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11326 "configure"
+#line 12375 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11350,15 +12399,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11356: \$? = $ac_status" >&5
+  echo "$as_me:12405: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11361: \$? = $ac_status" >&5
+  echo "$as_me:12410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11372,7 +12421,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:11375: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12424: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -11385,7 +12434,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11388: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12437: 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
@@ -11393,7 +12442,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11396 "configure"
+#line 12445 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11412,16 +12461,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11418: \$? = $ac_status" >&5
+  echo "$as_me:12467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11424: \$? = $ac_status" >&5
+  echo "$as_me:12473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11432,10 +12481,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11435: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12484: 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:11438: checking for initscr in -lgpm" >&5
+  echo "$as_me:12487: 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
@@ -11443,7 +12492,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11446 "configure"
+#line 12495 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11462,16 +12511,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11468: \$? = $ac_status" >&5
+  echo "$as_me:12517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11474: \$? = $ac_status" >&5
+  echo "$as_me:12523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11482,7 +12531,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11485: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12534: 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"
@@ -11497,7 +12546,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11500: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12549: 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
@@ -11505,7 +12554,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11508 "configure"
+#line 12557 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11524,16 +12573,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11530: \$? = $ac_status" >&5
+  echo "$as_me:12579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11536: \$? = $ac_status" >&5
+  echo "$as_me:12585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11544,7 +12593,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11547: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12596: 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"
@@ -11593,13 +12642,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:11596: checking for initscr" >&5
+	echo "$as_me:12645: 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 11602 "configure"
+#line 12651 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11630,16 +12679,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11636: \$? = $ac_status" >&5
+  echo "$as_me:12685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+  echo "$as_me:12691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11649,18 +12698,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11652: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12701: 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:11659: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12708: 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 11663 "configure"
+#line 12712 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11672,25 +12721,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11678: \$? = $ac_status" >&5
+  echo "$as_me:12727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11684: \$? = $ac_status" >&5
+  echo "$as_me:12733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11686: result: yes" >&5
+  echo "$as_me:12735: 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:11693: result: no" >&5
+echo "$as_me:12742: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -11758,11 +12807,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11761: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12810: 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 11765 "configure"
+#line 12814 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11774,25 +12823,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11780: \$? = $ac_status" >&5
+  echo "$as_me:12829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11786: \$? = $ac_status" >&5
+  echo "$as_me:12835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11788: result: yes" >&5
+  echo "$as_me:12837: 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:11795: result: no" >&5
+echo "$as_me:12844: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11807,7 +12856,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:11810: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12859: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11815,7 +12864,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11818: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12867: 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
@@ -11825,7 +12874,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11828 "configure"
+#line 12877 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11837,23 +12886,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11843: \$? = $ac_status" >&5
+  echo "$as_me:12892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11849: \$? = $ac_status" >&5
+  echo "$as_me:12898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:11851: result: yes" >&5
+  echo "$as_me:12900: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:11856: result: no" >&5
+echo "$as_me:12905: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11873,7 +12922,7 @@ fi
 
 	;;
 (*)
-	{ { echo "$as_me:11876: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:12925: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11912,10 +12961,10 @@ else
 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-		{ (eval echo "$as_me:11915: \"$cf_try\"") >&5
+		{ (eval echo "$as_me:12964: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11918: \$? = $ac_status" >&5
+  echo "$as_me:12967: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 		if test -f conftest.out ; then
 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
@@ -11933,17 +12982,17 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
-echo "$as_me:11936: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:12985: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
-echo "$as_me:11939: checking if KEY_RESIZE is supported" >&5
+echo "$as_me:12988: checking if KEY_RESIZE is supported" >&5
 echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
 if test "${cf_cv_curses_resizes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11946 "configure"
+#line 12995 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11955,16 +13004,16 @@ int key = KEY_RESIZE; (void)key
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11961: \$? = $ac_status" >&5
+  echo "$as_me:13010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11967: \$? = $ac_status" >&5
+  echo "$as_me:13016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_resizes=yes
 else
@@ -11974,12 +13023,12 @@ cf_cv_curses_resizes=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:11977: result: $cf_cv_curses_resizes" >&5
+echo "$as_me:13026: result: $cf_cv_curses_resizes" >&5
 echo "${ECHO_T}$cf_cv_curses_resizes" >&6
 cf_cv_enable_sigwinch=0
 test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
 
-echo "$as_me:11982: checking if you want to have a library-prefix" >&5
+echo "$as_me:13031: 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.
@@ -11989,7 +13038,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:11992: result: $with_lib_prefix" >&5
+echo "$as_me:13041: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -12027,7 +13076,7 @@ if test X"$CC_G_OPT" = X"" ; then
 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
-echo "$as_me:12030: checking for default loader flags" >&5
+echo "$as_me:13079: checking for default loader flags" >&5
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
@@ -12035,13 +13084,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:12038: result: $LD_MODEL" >&5
+echo "$as_me:13087: result: $LD_MODEL" >&5
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:12044: checking for an rpath option" >&5
+	echo "$as_me:13093: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -12072,12 +13121,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:12075: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:13124: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:12080: checking if we need a space after rpath option" >&5
+		echo "$as_me:13129: 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"
 
@@ -12098,7 +13147,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12101 "configure"
+#line 13150 "configure"
 #include "confdefs.h"
 
 int
@@ -12110,16 +13159,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12116: \$? = $ac_status" >&5
+  echo "$as_me:13165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12122: \$? = $ac_status" >&5
+  echo "$as_me:13171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -12129,7 +13178,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:12132: result: $cf_rpath_space" >&5
+		echo "$as_me:13181: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -12151,7 +13200,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:12154: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:13203: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -12166,9 +13215,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:12169: result: $withval" >&5
+		echo "$as_me:13218: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:12171: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:13220: 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; }; }
 		;;
@@ -12177,7 +13226,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:12180: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:13229: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -12200,14 +13249,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:12203: checking which $CC option to use" >&5
+		echo "$as_me:13252: 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 12210 "configure"
+#line 13259 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12219,16 +13268,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12225: \$? = $ac_status" >&5
+  echo "$as_me:13274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12231: \$? = $ac_status" >&5
+  echo "$as_me:13280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12237,7 +13286,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:12240: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:13289: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -12308,7 +13357,7 @@ CF_EOF
 		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:12311: checking if ld -search_paths_first works" >&5
+		echo "$as_me:13360: 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
@@ -12317,7 +13366,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 12320 "configure"
+#line 13369 "configure"
 #include "confdefs.h"
 
 int
@@ -12329,16 +13378,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12335: \$? = $ac_status" >&5
+  echo "$as_me:13384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12341: \$? = $ac_status" >&5
+  echo "$as_me:13390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -12349,7 +13398,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:12352: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:13401: 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"
@@ -12699,7 +13748,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 12702 "configure"
+#line 13751 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12711,16 +13760,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12717: \$? = $ac_status" >&5
+  echo "$as_me:13766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12723: \$? = $ac_status" >&5
+  echo "$as_me:13772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -12757,7 +13806,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:12760: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:13809: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -12767,7 +13816,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 12770 "${as_me:-configure}"
+#line 13819 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -12779,18 +13828,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:12782: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:13831: 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:12784: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:13833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12787: \$? = $ac_status" >&5
+  echo "$as_me:13836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:12789: result: yes" >&5
+				echo "$as_me:13838: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:12793: result: no" >&5
+				echo "$as_me:13842: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -12805,17 +13854,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:12808: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:13857: 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}:12812: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:13861: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
-	echo "$as_me:12818: checking if you want to link sample programs with rpath option" >&5
+	echo "$as_me:13867: checking if you want to link sample programs with rpath option" >&5
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
@@ -12825,7 +13874,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
-	echo "$as_me:12828: result: $with_rpath_link" >&5
+	echo "$as_me:13877: result: $with_rpath_link" >&5
 echo "${ECHO_T}$with_rpath_link" >&6
 	if test "$with_rpath_link" = no
 	then
@@ -12838,7 +13887,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:12841: checking if you want broken-linker support code" >&5
+echo "$as_me:13890: 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.
@@ -12848,7 +13897,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:12851: result: $with_broken_linker" >&5
+echo "$as_me:13900: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -12863,14 +13912,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:12866: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:13915: 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 12873 "configure"
+#line 13922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12889,16 +13938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12895: \$? = $ac_status" >&5
+  echo "$as_me:13944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12901: \$? = $ac_status" >&5
+  echo "$as_me:13950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -12909,7 +13958,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12912: result: $cf_cv_posix_visible" >&5
+echo "$as_me:13961: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -12951,14 +14000,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:12954: checking if this is the GNU C library" >&5
+echo "$as_me:14003: 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 12961 "configure"
+#line 14010 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12977,16 +14026,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12983: \$? = $ac_status" >&5
+  echo "$as_me:14032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12989: \$? = $ac_status" >&5
+  echo "$as_me:14038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -12997,7 +14046,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13000: result: $cf_cv_gnu_library" >&5
+echo "$as_me:14049: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -13005,7 +14054,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:13008: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:14057: 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
@@ -13017,7 +14066,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13020 "configure"
+#line 14069 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13036,16 +14085,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13042: \$? = $ac_status" >&5
+  echo "$as_me:14091: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13048: \$? = $ac_status" >&5
+  echo "$as_me:14097: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -13057,12 +14106,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:13060: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:14109: 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:13065: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:14114: 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
@@ -13167,7 +14216,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13170 "configure"
+#line 14219 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13187,16 +14236,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13193: \$? = $ac_status" >&5
+  echo "$as_me:14242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13199: \$? = $ac_status" >&5
+  echo "$as_me:14248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -13207,7 +14256,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13210: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:14259: 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
@@ -13216,14 +14265,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:13219: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:14268: 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 13226 "configure"
+#line 14275 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13238,16 +14287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13244: \$? = $ac_status" >&5
+  echo "$as_me:14293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13250: \$? = $ac_status" >&5
+  echo "$as_me:14299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13354,7 +14403,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13357 "configure"
+#line 14406 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13369,16 +14418,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13375: \$? = $ac_status" >&5
+  echo "$as_me:14424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13381: \$? = $ac_status" >&5
+  echo "$as_me:14430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -13393,12 +14442,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13396: result: $cf_cv_gnu_source" >&5
+echo "$as_me:14445: 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:13401: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:14450: 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
@@ -13408,7 +14457,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13411 "configure"
+#line 14460 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13423,16 +14472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13429: \$? = $ac_status" >&5
+  echo "$as_me:14478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13435: \$? = $ac_status" >&5
+  echo "$as_me:14484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -13443,7 +14492,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13446: result: $cf_cv_default_source" >&5
+echo "$as_me:14495: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -13483,16 +14532,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:13486: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:14535: 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}:13492: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:14541: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13495 "configure"
+#line 14544 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13507,16 +14556,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13513: \$? = $ac_status" >&5
+  echo "$as_me:14562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13519: \$? = $ac_status" >&5
+  echo "$as_me:14568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -13537,7 +14586,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13540 "configure"
+#line 14589 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13552,16 +14601,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13558: \$? = $ac_status" >&5
+  echo "$as_me:14607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13564: \$? = $ac_status" >&5
+  echo "$as_me:14613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13572,7 +14621,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:14624: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -13580,10 +14629,10 @@ echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:14632: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13586 "configure"
+#line 14635 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13598,16 +14647,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13604: \$? = $ac_status" >&5
+  echo "$as_me:14653: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13610: \$? = $ac_status" >&5
+  echo "$as_me:14659: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13623,7 +14672,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13626: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:14675: 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
@@ -13740,7 +14789,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:13743: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:14792: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -13772,14 +14821,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:13775: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:14824: 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 13782 "configure"
+#line 14831 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13797,16 +14846,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13803: \$? = $ac_status" >&5
+  echo "$as_me:14852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13809: \$? = $ac_status" >&5
+  echo "$as_me:14858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13818,7 +14867,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13821 "configure"
+#line 14870 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13836,16 +14885,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13842: \$? = $ac_status" >&5
+  echo "$as_me:14891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13848: \$? = $ac_status" >&5
+  echo "$as_me:14897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13860,7 +14909,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13863: result: $cf_cv_xopen_source" >&5
+echo "$as_me:14912: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14020,16 +15069,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:14023: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:15072: 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}:14029: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:15078: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 14032 "configure"
+#line 15081 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14044,16 +15093,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14050: \$? = $ac_status" >&5
+  echo "$as_me:15099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14056: \$? = $ac_status" >&5
+  echo "$as_me:15105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -14074,7 +15123,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14077 "configure"
+#line 15126 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14089,16 +15138,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14095: \$? = $ac_status" >&5
+  echo "$as_me:15144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14101: \$? = $ac_status" >&5
+  echo "$as_me:15150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14109,7 +15158,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:14112: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:15161: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -14117,10 +15166,10 @@ echo "${as_me:-configure}:14112: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:14120: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:15169: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14123 "configure"
+#line 15172 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -14135,16 +15184,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14141: \$? = $ac_status" >&5
+  echo "$as_me:15190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14147: \$? = $ac_status" >&5
+  echo "$as_me:15196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14160,7 +15209,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14163: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:15212: 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
@@ -14273,10 +15322,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:14276: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:15325: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14279 "configure"
+#line 15328 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14294,23 +15343,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14300: \$? = $ac_status" >&5
+  echo "$as_me:15349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14306: \$? = $ac_status" >&5
+  echo "$as_me:15355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:14313: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:15362: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -14333,7 +15382,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14336: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15385: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -14345,7 +15394,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14348: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15397: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -14433,7 +15482,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15485: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14443,7 +15492,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14446: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15495: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14453,7 +15502,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14456: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15505: 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"
@@ -14465,10 +15514,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:14468: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:15517: 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 14471 "configure"
+#line 15520 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14483,16 +15532,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14489: \$? = $ac_status" >&5
+  echo "$as_me:15538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14495: \$? = $ac_status" >&5
+  echo "$as_me:15544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -14501,12 +15550,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:14504: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:15553: 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 14509 "configure"
+#line 15558 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -14521,16 +15570,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14527: \$? = $ac_status" >&5
+  echo "$as_me:15576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14533: \$? = $ac_status" >&5
+  echo "$as_me:15582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -14541,19 +15590,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:14544: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:15593: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:14549: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:15598: 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 14556 "configure"
+#line 15605 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14571,16 +15620,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14577: \$? = $ac_status" >&5
+  echo "$as_me:15626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14583: \$? = $ac_status" >&5
+  echo "$as_me:15632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14592,7 +15641,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14595 "configure"
+#line 15644 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14610,16 +15659,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14616: \$? = $ac_status" >&5
+  echo "$as_me:15665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14622: \$? = $ac_status" >&5
+  echo "$as_me:15671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -14634,7 +15683,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14637: result: $cf_cv_xopen_source" >&5
+echo "$as_me:15686: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -14781,13 +15830,13 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:14784: checking for ANSI C header files" >&5
+echo "$as_me:15833: 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 14790 "configure"
+#line 15839 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14795,13 +15844,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14804: \$? = $ac_status" >&5
+  echo "$as_me:15853: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14823,7 +15872,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14826 "configure"
+#line 15875 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14841,7 +15890,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14844 "configure"
+#line 15893 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14862,7 +15911,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14865 "configure"
+#line 15914 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14888,15 +15937,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14894: \$? = $ac_status" >&5
+  echo "$as_me:15943: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:14896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14899: \$? = $ac_status" >&5
+  echo "$as_me:15948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14909,7 +15958,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:14912: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15961: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14925,28 +15974,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14928: checking for $ac_header" >&5
+echo "$as_me:15977: 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 14934 "configure"
+#line 15983 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14943: \$? = $ac_status" >&5
+  echo "$as_me:15992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14949: \$? = $ac_status" >&5
+  echo "$as_me:15998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14956,7 +16005,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14959: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -14966,13 +16015,13 @@ EOF
 fi
 done
 
-echo "$as_me:14969: checking whether exit is declared" >&5
+echo "$as_me:16018: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14975 "configure"
+#line 16024 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14987,16 +16036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14993: \$? = $ac_status" >&5
+  echo "$as_me:16042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14999: \$? = $ac_status" >&5
+  echo "$as_me:16048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -15006,7 +16055,7 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15009: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:16058: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 # Check whether --enable-largefile or --disable-largefile was given.
@@ -15016,7 +16065,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:15019: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:16068: 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
@@ -15028,7 +16077,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 15031 "configure"
+#line 16080 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15048,16 +16097,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15054: \$? = $ac_status" >&5
+  echo "$as_me:16103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15060: \$? = $ac_status" >&5
+  echo "$as_me:16109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15067,16 +16116,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15073: \$? = $ac_status" >&5
+  echo "$as_me:16122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15079: \$? = $ac_status" >&5
+  echo "$as_me:16128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15090,13 +16139,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:15093: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:16142: 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:15099: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:16148: 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
@@ -15104,7 +16153,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15107 "configure"
+#line 16156 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15124,16 +16173,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15130: \$? = $ac_status" >&5
+  echo "$as_me:16179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15136: \$? = $ac_status" >&5
+  echo "$as_me:16185: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15142,7 +16191,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15145 "configure"
+#line 16194 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15163,16 +16212,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15169: \$? = $ac_status" >&5
+  echo "$as_me:16218: \$? = $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:16221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15175: \$? = $ac_status" >&5
+  echo "$as_me:16224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15183,7 +16232,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15186: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:16235: 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
 
@@ -15193,7 +16242,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:15196: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:16245: 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
@@ -15201,7 +16250,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15204 "configure"
+#line 16253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15221,16 +16270,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15227: \$? = $ac_status" >&5
+  echo "$as_me:16276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15233: \$? = $ac_status" >&5
+  echo "$as_me:16282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15239,7 +16288,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15242 "configure"
+#line 16291 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15260,16 +16309,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15266: \$? = $ac_status" >&5
+  echo "$as_me:16315: \$? = $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:16318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15272: \$? = $ac_status" >&5
+  echo "$as_me:16321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15280,7 +16329,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15283: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:16332: 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
 
@@ -15293,7 +16342,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:15296: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:16345: 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
@@ -15301,7 +16350,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15304 "configure"
+#line 16353 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -15316,16 +16365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15322: \$? = $ac_status" >&5
+  echo "$as_me:16371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15328: \$? = $ac_status" >&5
+  echo "$as_me:16377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -15334,7 +16383,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15337 "configure"
+#line 16386 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15350,16 +16399,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15356: \$? = $ac_status" >&5
+  echo "$as_me:16405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15362: \$? = $ac_status" >&5
+  echo "$as_me:16411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15370,7 +16419,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:15373: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:16422: 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
 
@@ -15384,13 +16433,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15387: checking for fseeko" >&5
+echo "$as_me:16436: 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 15393 "configure"
+#line 16442 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -15404,16 +16453,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15410: \$? = $ac_status" >&5
+  echo "$as_me:16459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15416: \$? = $ac_status" >&5
+  echo "$as_me:16465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15423,7 +16472,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15426: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:16475: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15462,14 +16511,14 @@ fi
 
 	fi
 
-	echo "$as_me:15465: checking whether to use struct dirent64" >&5
+	echo "$as_me:16514: 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 15472 "configure"
+#line 16521 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -15496,16 +16545,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15502: \$? = $ac_status" >&5
+  echo "$as_me:16551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15508: \$? = $ac_status" >&5
+  echo "$as_me:16557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15516,7 +16565,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15519: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:16568: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15526,7 +16575,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15529: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:16578: 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.
@@ -15536,7 +16585,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15539: result: $with_rcs_ids" >&5
+echo "$as_me:16588: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -15546,7 +16595,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15549: checking if you want to build with function extensions" >&5
+echo "$as_me:16598: 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.
@@ -15556,7 +16605,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15559: result: $with_ext_funcs" >&5
+echo "$as_me:16608: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15574,7 +16623,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:15577: checking for extended use of const keyword" >&5
+echo "$as_me:16626: 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.
@@ -15584,7 +16633,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:15587: result: $with_ext_const" >&5
+echo "$as_me:16636: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -15594,7 +16643,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:15597: checking if you want all development code" >&5
+echo "$as_me:16646: 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.
@@ -15604,7 +16653,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:15607: result: $with_develop" >&5
+echo "$as_me:16656: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -15613,7 +16662,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:15616: checking if you want to link with the pthread library" >&5
+echo "$as_me:16665: 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.
@@ -15623,27 +16672,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:15626: result: $with_pthread" >&5
+echo "$as_me:16675: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:15630: checking for pthread.h" >&5
+	echo "$as_me:16679: 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 15636 "configure"
+#line 16685 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:15640: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16689: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15646: \$? = $ac_status" >&5
+  echo "$as_me:16695: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15662,7 +16711,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15665: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16714: 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
 
@@ -15672,7 +16721,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:15675: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16724: 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"
 
@@ -15693,7 +16742,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 15696 "configure"
+#line 16745 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -15710,16 +16759,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15716: \$? = $ac_status" >&5
+  echo "$as_me:16765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15722: \$? = $ac_status" >&5
+  echo "$as_me:16771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -15729,7 +16778,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:15732: result: $with_pthread" >&5
+	    echo "$as_me:16781: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -15757,7 +16806,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:15760: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16809: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15766,7 +16815,7 @@ fi
 
 fi
 
-echo "$as_me:15769: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:16818: 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.
@@ -15776,18 +16825,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:15779: result: $use_weak_symbols" >&5
+echo "$as_me:16828: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:15783: checking if $CC supports weak symbols" >&5
+echo "$as_me:16832: 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 15790 "configure"
+#line 16839 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15813,16 +16862,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15819: \$? = $ac_status" >&5
+  echo "$as_me:16868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15825: \$? = $ac_status" >&5
+  echo "$as_me:16874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -15833,7 +16882,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15836: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16885: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -15862,13 +16911,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:15865: checking for _nc_TABSIZE" >&5
+echo "$as_me:16914: 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 15871 "configure"
+#line 16920 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15899,16 +16948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15905: \$? = $ac_status" >&5
+  echo "$as_me:16954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15911: \$? = $ac_status" >&5
+  echo "$as_me:16960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -15918,7 +16967,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15921: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:16970: 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
@@ -15930,7 +16979,7 @@ fi
 # 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:15933: checking if you want experimental reentrant code" >&5
+echo "$as_me:16982: 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.
@@ -15940,7 +16989,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:15943: result: $with_reentrant" >&5
+echo "$as_me:16992: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -15963,7 +17012,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:15966: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:17015: 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.
@@ -15973,7 +17022,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:15976: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:17025: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -15987,7 +17036,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:15990: checking if you want to see long compiling messages" >&5
+echo "$as_me:17039: 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.
@@ -16021,10 +17070,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:16024: result: $enableval" >&5
+echo "$as_me:17073: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:16027: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17076: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -16041,17 +17090,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:16044: result: $enable_stdnoreturn" >&5
+echo "$as_me:17093: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:16048: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17097: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16054 "configure"
+#line 17103 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16067,16 +17116,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16073: \$? = $ac_status" >&5
+  echo "$as_me:17122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16079: \$? = $ac_status" >&5
+  echo "$as_me:17128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -16087,7 +17136,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16090: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17139: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -16143,16 +17192,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16146: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17195: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16151: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17200: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16155: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17204: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16191,16 +17240,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16194: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17243: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:16199: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17248: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16203: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17252: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -16239,23 +17288,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16242: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17291: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:16247: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17296: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16251: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17300: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:16258: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17307: 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.
@@ -16272,7 +17321,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:16275: result: $enable_warnings" >&5
+echo "$as_me:17324: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -16296,7 +17345,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16299 "configure"
+#line 17348 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16311,26 +17360,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16314: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16317: \$? = $ac_status" >&5
+  echo "$as_me:17366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16323: \$? = $ac_status" >&5
+  echo "$as_me:17372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:16326: checking for X11/Xt const-feature" >&5
+echo "$as_me:17375: 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 16333 "configure"
+#line 17382 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -16348,16 +17397,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16354: \$? = $ac_status" >&5
+  echo "$as_me:17403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16360: \$? = $ac_status" >&5
+  echo "$as_me:17409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -16372,7 +17421,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16375: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17424: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -16401,7 +17450,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 16404 "${as_me:-configure}"
+#line 17453 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -16417,7 +17466,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:16420: checking for $CC warning options..." >&5
+	{ echo "$as_me:17469: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -16433,12 +17482,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16436: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16439: \$? = $ac_status" >&5
+  echo "$as_me:17488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16441: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16446,7 +17495,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:16449: checking for $CC warning options..." >&5
+	{ echo "$as_me:17498: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -16469,12 +17518,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:16472: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16475: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16477: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -16482,7 +17531,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16485: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16492,7 +17541,7 @@ echo "${as_me:-configure}:16485: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:16495: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -16525,10 +17574,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16528: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 16531 "${as_me:-configure}"
+#line 17580 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -16578,12 +17627,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:16581: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16584: \$? = $ac_status" >&5
+  echo "$as_me:17633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:16586: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -16651,7 +17700,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:16654: checking if you want to enable runtime assertions" >&5
+echo "$as_me:17703: 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.
@@ -16661,7 +17710,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:16664: result: $with_assertions" >&5
+echo "$as_me:17713: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -16714,7 +17763,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:16717: checking whether to add trace feature to all models" >&5
+echo "$as_me:17766: 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.
@@ -16724,7 +17773,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:16727: result: $cf_with_trace" >&5
+echo "$as_me:17776: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -16738,7 +17787,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:16741: checking if we want to use GNAT projects" >&5
+echo "$as_me:17790: 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.
@@ -16755,21 +17804,21 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:16758: result: $enable_gnat_projects" >&5
+echo "$as_me:17807: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
 case $cf_cv_system_name in
 (*mingw32*)
 
-echo "$as_me:16765: checking if ssp library is needed" >&5
+echo "$as_me:17814: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16772 "configure"
+#line 17821 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16786,16 +17835,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16792: \$? = $ac_status" >&5
+  echo "$as_me:17841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16798: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -16805,7 +17854,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16808 "configure"
+#line 17857 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16822,16 +17871,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16828: \$? = $ac_status" >&5
+  echo "$as_me:17877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16834: \$? = $ac_status" >&5
+  echo "$as_me:17883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -16845,7 +17894,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
+echo "$as_me:17897: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -16873,13 +17922,13 @@ fi
 (*)
 
 cf_save_libs="$LIBS"
-echo "$as_me:16876: checking for clock_gettime" >&5
+echo "$as_me:17925: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16882 "configure"
+#line 17931 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16910,16 +17959,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16916: \$? = $ac_status" >&5
+  echo "$as_me:17965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16922: \$? = $ac_status" >&5
+  echo "$as_me:17971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -16929,12 +17978,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:17981: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:17986: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16942,7 +17991,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16945 "configure"
+#line 17994 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16961,16 +18010,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16967: \$? = $ac_status" >&5
+  echo "$as_me:18016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16973: \$? = $ac_status" >&5
+  echo "$as_me:18022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -16981,7 +18030,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:18033: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -16993,14 +18042,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:16996: checking if clock_gettime links" >&5
+echo "$as_me:18045: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17003 "configure"
+#line 18052 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17018,16 +18067,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17024: \$? = $ac_status" >&5
+  echo "$as_me:18073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17030: \$? = $ac_status" >&5
+  echo "$as_me:18079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -17038,7 +18087,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:18090: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -17052,13 +18101,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:17055: checking for gettimeofday" >&5
+echo "$as_me:18104: 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 17061 "configure"
+#line 18110 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17089,16 +18138,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17095: \$? = $ac_status" >&5
+  echo "$as_me:18144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17101: \$? = $ac_status" >&5
+  echo "$as_me:18150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -17108,7 +18157,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18160: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -17118,7 +18167,7 @@ EOF
 
 else
 
-echo "$as_me:17121: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18170: 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
@@ -17126,7 +18175,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17129 "configure"
+#line 18178 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17145,16 +18194,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17151: \$? = $ac_status" >&5
+  echo "$as_me:18200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17157: \$? = $ac_status" >&5
+  echo "$as_me:18206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -17165,7 +18214,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17168: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18217: 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
 
@@ -17198,13 +18247,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:17201: checking for signed char" >&5
+echo "$as_me:18250: 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 17207 "configure"
+#line 18256 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17219,16 +18268,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17225: \$? = $ac_status" >&5
+  echo "$as_me:18274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17231: \$? = $ac_status" >&5
+  echo "$as_me:18280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -17238,10 +18287,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:18290: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:17244: checking size of signed char" >&5
+echo "$as_me:18293: 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
@@ -17250,7 +18299,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17253 "configure"
+#line 18302 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17262,21 +18311,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17268: \$? = $ac_status" >&5
+  echo "$as_me:18317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17274: \$? = $ac_status" >&5
+  echo "$as_me:18323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17279 "configure"
+#line 18328 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17288,16 +18337,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17294: \$? = $ac_status" >&5
+  echo "$as_me:18343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17300: \$? = $ac_status" >&5
+  echo "$as_me:18349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -17313,7 +18362,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17316 "configure"
+#line 18365 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17325,16 +18374,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17331: \$? = $ac_status" >&5
+  echo "$as_me:18380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17337: \$? = $ac_status" >&5
+  echo "$as_me:18386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -17350,7 +18399,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17353 "configure"
+#line 18402 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17362,16 +18411,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17368: \$? = $ac_status" >&5
+  echo "$as_me:18417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17374: \$? = $ac_status" >&5
+  echo "$as_me:18423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -17384,12 +18433,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17387: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:18436: 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 17392 "configure"
+#line 18441 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -17405,15 +18454,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17411: \$? = $ac_status" >&5
+  echo "$as_me:18460: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17416: \$? = $ac_status" >&5
+  echo "$as_me:18465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -17429,7 +18478,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:18481: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -17438,13 +18487,13 @@ EOF
 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:17441: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:18490: 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 17447 "configure"
+#line 18496 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -17459,16 +18508,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17465: \$? = $ac_status" >&5
+  echo "$as_me:18514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17471: \$? = $ac_status" >&5
+  echo "$as_me:18520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -17478,7 +18527,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18530: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17491,7 +18540,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:17494: checking for opendir in -ldir" >&5
+  echo "$as_me:18543: 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
@@ -17499,7 +18548,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17502 "configure"
+#line 18551 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17518,16 +18567,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17524: \$? = $ac_status" >&5
+  echo "$as_me:18573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17530: \$? = $ac_status" >&5
+  echo "$as_me:18579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -17538,14 +18587,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17541: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:18590: 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:17548: checking for opendir in -lx" >&5
+  echo "$as_me:18597: 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
@@ -17553,7 +18602,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17556 "configure"
+#line 18605 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17572,16 +18621,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17578: \$? = $ac_status" >&5
+  echo "$as_me:18627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17584: \$? = $ac_status" >&5
+  echo "$as_me:18633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -17592,7 +18641,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17595: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:18644: 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"
@@ -17600,13 +18649,13 @@ fi
 
 fi
 
-echo "$as_me:17603: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18652: 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 17609 "configure"
+#line 18658 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -17622,16 +18671,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17628: \$? = $ac_status" >&5
+  echo "$as_me:18677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17634: \$? = $ac_status" >&5
+  echo "$as_me:18683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -17641,7 +18690,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17644: result: $ac_cv_header_time" >&5
+echo "$as_me:18693: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -17659,13 +18708,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17662: checking for an ANSI C-conforming const" >&5
+echo "$as_me:18711: 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 17668 "configure"
+#line 18717 "configure"
 #include "confdefs.h"
 
 int
@@ -17727,16 +18776,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17733: \$? = $ac_status" >&5
+  echo "$as_me:18782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17739: \$? = $ac_status" >&5
+  echo "$as_me:18788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -17746,7 +18795,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:17749: result: $ac_cv_c_const" >&5
+echo "$as_me:18798: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -17758,7 +18807,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:17761: checking if data-only library module links" >&5
+echo "$as_me:18810: 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
@@ -17766,20 +18815,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 17769 "configure"
+#line 18818 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:18821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17775: \$? = $ac_status" >&5
+  echo "$as_me:18824: \$? = $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 <<EOF
-#line 17782 "configure"
+#line 18831 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -17796,10 +18845,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:17799: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:18848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17802: \$? = $ac_status" >&5
+  echo "$as_me:18851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -17812,7 +18861,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17815 "configure"
+#line 18864 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -17823,15 +18872,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17829: \$? = $ac_status" >&5
+  echo "$as_me:18878: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17834: \$? = $ac_status" >&5
+  echo "$as_me:18883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -17846,7 +18895,7 @@ fi
 
 fi
 
-echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:18898: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -17865,23 +18914,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17868: checking for $ac_header" >&5
+echo "$as_me:18917: 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 17874 "configure"
+#line 18923 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18927: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:17884: \$? = $ac_status" >&5
+  echo "$as_me:18933: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17900,7 +18949,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18952: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -17910,7 +18959,7 @@ EOF
 fi
 done
 
-echo "$as_me:17913: checking for working mkstemp" >&5
+echo "$as_me:18962: 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
@@ -17921,7 +18970,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17924 "configure"
+#line 18973 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17956,15 +19005,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17962: \$? = $ac_status" >&5
+  echo "$as_me:19011: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17967: \$? = $ac_status" >&5
+  echo "$as_me:19016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -17979,16 +19028,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:17982: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:19031: 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:17985: checking for mkstemp" >&5
+	echo "$as_me:19034: 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 17991 "configure"
+#line 19040 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18019,16 +19068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18025: \$? = $ac_status" >&5
+  echo "$as_me:19074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18031: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -18038,7 +19087,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:19090: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -18059,7 +19108,7 @@ cf_with_ada=yes
 if test "$cf_with_ada" != "no" ; then
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:19111: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -18076,10 +19125,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:18079: result: $ADAFLAGS" >&5
+	echo "$as_me:19128: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:18082: checking if GNATPREP supports -T option" >&5
+echo "$as_me:19131: 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
@@ -18089,11 +19138,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:18092: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:19141: 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:18096: checking if GNAT supports generics" >&5
+echo "$as_me:19145: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -18103,7 +19152,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:18106: result: $cf_gnat_generics" >&5
+echo "$as_me:19155: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -18115,7 +19164,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:18118: checking if GNAT supports SIGINT" >&5
+echo "$as_me:19167: 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
@@ -18163,7 +19212,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:19215: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -18176,7 +19225,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:18179: checking if GNAT supports project files" >&5
+echo "$as_me:19228: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -18239,15 +19288,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:18242: result: $cf_gnat_projects" >&5
+echo "$as_me:19291: 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:18248: checking if GNAT supports libraries" >&5
+	echo "$as_me:19297: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
+	echo "$as_me:19299: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -18267,7 +19316,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:19319: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -18279,7 +19328,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:18282: checking for Ada95 compiler" >&5
+echo "$as_me:19331: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -18290,12 +19339,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:18293: result: $cf_ada_compiler" >&5
+echo "$as_me:19342: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:18298: checking for Ada95 include directory" >&5
+echo "$as_me:19347: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -18329,7 +19378,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18332: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:19381: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18338,10 +19387,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:18341: result: $ADA_INCLUDE" >&5
+echo "$as_me:19390: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:18344: checking for Ada95 object directory" >&5
+echo "$as_me:19393: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -18375,7 +19424,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18378: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:19427: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18384,10 +19433,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:18387: result: $ADA_OBJECTS" >&5
+echo "$as_me:19436: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:18390: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:19439: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -18408,11 +19457,11 @@ then
 	fi
 fi
 
-echo "$as_me:18411: result: $with_ada_sharedlib" >&5
+echo "$as_me:19460: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:18415: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:19464: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -18430,7 +19479,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:18433: checking for Ada95 curses library name" >&5
+echo "$as_me:19482: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -18446,16 +19495,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:18449: result: $ADA_LIBNAME" >&5
+echo "$as_me:19498: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:18453: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:19502: 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:18458: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:19507: 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
@@ -18495,7 +19544,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:18498: checking default library suffix" >&5
+echo "$as_me:19547: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18506,10 +19555,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18509: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:19558: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:18512: checking default library-dependency suffix" >&5
+echo "$as_me:19561: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -18592,10 +19641,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:18595: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:19644: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:18598: checking default object directory" >&5
+echo "$as_me:19647: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -18611,7 +19660,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:18614: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:19663: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -18753,7 +19802,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18756: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:19805: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -18934,7 +19983,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:18937: error: ambiguous option: $1
+    { { echo "$as_me:19986: 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;}
@@ -18953,7 +20002,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:18956: error: unrecognized option: $1
+  -*) { { echo "$as_me:20005: 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;}
@@ -19028,7 +20077,7 @@ do
   "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:19031: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:20080: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19184,6 +20233,7 @@ s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t
 s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t
 s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
 s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
+s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
 s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
 s,@cf_cv_screen@,$cf_cv_screen,;t t
@@ -19395,7 +20445,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19398: creating $ac_file" >&5
+    { echo "$as_me:20448: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19413,7 +20463,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19416: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:20466: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -19426,7 +20476,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19429: error: cannot find input file: $f" >&5
+           { { echo "$as_me:20479: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19442,7 +20492,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19445: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:20495: 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;}
@@ -19451,7 +20501,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19454: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:20504: 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;}
@@ -19496,7 +20546,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:19499: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:20549: 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;}
@@ -19507,7 +20557,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:19510: WARNING: Some variables may not be substituted:
+      { echo "$as_me:20560: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19556,7 +20606,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19559: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:20609: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19567,7 +20617,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19570: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:20620: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19580,7 +20630,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19583: error: cannot find input file: $f" >&5
+           { { echo "$as_me:20633: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19638,7 +20688,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19641: $ac_file is unchanged" >&5
+      { echo "$as_me:20691: $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/NEWS b/NEWS
index a92255e31..2e8ab22c7 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4229 2025/01/11 21:55:20 tom Exp $
+-- $Id: NEWS,v 1.4233 2025/01/19 01:24:13 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,18 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250118
+	+ improve pattern used for configure --with-xterm-kbs option (report by
+	  Mingyu Wang)
+	+ update configure macros, from work on cdk and dialog.
+	+ change a parameter name in curs_sp_funcs.3x, for consistency (patch
+	  by "WHR").
+	> patches by Branden Robinson:
+	+ improve formatting/style of manpages
+	+ change winwstr() to a generated function, using the macro definition,
+	  moving its handling of negative length parameter into winnwstr().
+	+ correct actual-function name in a few trace calls.
+
 20250111
 	+ add check for infinite loop in tic's use-resolution.
 	+ increase limit on use-clauses from 32 to 40, warn but allow entries
diff --git a/VERSION b/VERSION
index f6667d19a..d2b8914cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250111
+5:0:10	6.5	20250118
diff --git a/aclocal.m4 b/aclocal.m4
index 6f30941fc..319d1814d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
+dnl Copyright 2018-2024,2025 Thomas E. Dickey                                *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1099 2024/12/28 21:40:09 tom Exp $
+dnl $Id: aclocal.m4,v 1.1100 2025/01/15 22:07:11 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -7372,6 +7372,30 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
+dnl --------------
+dnl Update $REQUIRE_PKG, which lists the known required packages for this
+dnl program.
+dnl
+dnl $1 = package(s) to require, e.g., in the generated ".pc" file
+define([CF_REQUIRE_PKG],
+[
+for cf_required in $1
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+AC_SUBST(REQUIRE_PKG)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
 dnl ---------------------
 dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
@@ -8622,7 +8646,7 @@ top_builddir=ifelse($1,,`pwd`,$1)
 AC_SUBST(top_builddir)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15
+dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54
 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
@@ -8639,6 +8663,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"
 	CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
 	CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
+	CF_REQUIRE_PKG($1)
 	CF_ADD_CFLAGS($cf_pkgconfig_incs)
 	CF_ADD_LIBS($cf_pkgconfig_libs)
 	ifelse([$2],,:,[$2])
@@ -8890,7 +8915,7 @@ AC_DEFUN([CF_VERBOSE],
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_VERSION_INFO version: 9 updated: 2024/06/12 04:04:13
+dnl CF_VERSION_INFO version: 10 updated: 2025/01/10 19:55:54
 dnl ---------------
 dnl Define several useful symbols derived from the VERSION file.  A separate
 dnl file is preferred to embedding the version numbers in various scripts.
@@ -8968,8 +8993,10 @@ AC_SUBST(VERSION_PATCH)
 dnl if a package name is given, define its corresponding version info.  We
 dnl need the package name to ensure that the defined symbols are unique.
 ifelse($1,,,[
+	PROGRAM=$1
 	PACKAGE=ifelse($2,,$1,$2)
 	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
+	AC_SUBST(PROGRAM)
 	AC_SUBST(PACKAGE)
 	AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package])
 	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}")
@@ -10016,7 +10043,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 14 updated: 2024/08/03 12:34:02
+dnl CF_WITH_VERSIONED_SYMS version: 15 updated: 2025/01/15 17:07:11
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -10028,6 +10055,9 @@ AC_DEFUN([CF_WITH_VERSIONED_SYMS],
 AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_REQUIRE([CF_GLOB_FULLPATH])dnl
 
+if test "$with_libtool" = "yes" ; then
+	:
+elif test "$with_shared" = "yes" ; then
 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
 	[[  --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE]],
@@ -10151,6 +10181,8 @@ EOF
 		rm -f conftest.*
 	fi
 fi
+
+fi
 AC_SUBST(RESULTING_SYMS)
 AC_SUBST(VERSIONED_SYMS)
 AC_SUBST(WILDCARD_SYMS)
diff --git a/configure b/configure
index 47b01a5b6..37e80e6e4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.789 .
+# From configure.in Revision: 1.790 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -1368,6 +1368,7 @@ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
 echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
+	PROGRAM=NCURSES
 	PACKAGE=ncurses
 
 cat >>confdefs.h <<EOF
@@ -1387,7 +1388,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # 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:1390: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1391: 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;
@@ -1401,13 +1402,13 @@ if test -n "$NCURSES_MAJOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1404: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+	{ { echo "$as_me:1405: 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:1410: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1411: error: Release major-version value is empty" >&5
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1417,13 +1418,13 @@ if test -n "$NCURSES_MINOR" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1420: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+	{ { echo "$as_me:1421: 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:1426: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1427: error: Release minor-version value is empty" >&5
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1436,7 +1437,7 @@ if test "${with_abi_version+set}" = set; then
 
 	if test "x$cf_cv_abi_version" != "x$withval"
 	then
-		{ echo "$as_me:1439: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1440: 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.*)
@@ -1455,13 +1456,13 @@ if test -n "$cf_cv_abi_version" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1458: error: ABI version is not a number: $cf_cv_abi_version" >&5
+	{ { echo "$as_me:1459: 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:1464: error: ABI version value is empty" >&5
+  { { echo "$as_me:1465: error: ABI version value is empty" >&5
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1494,7 +1495,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1497: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1498: 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
@@ -1504,11 +1505,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1507: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1508: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1511: checking build system type" >&5
+echo "$as_me:1512: 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
@@ -1517,23 +1518,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1520: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1521: 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:1524: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1525: 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:1529: result: $ac_cv_build" >&5
+echo "$as_me:1530: 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:1536: checking host system type" >&5
+echo "$as_me:1537: 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
@@ -1542,12 +1543,12 @@ else
 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:1545: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1546: 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:1550: result: $ac_cv_host" >&5
+echo "$as_me:1551: 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/'`
@@ -1555,7 +1556,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1558: checking target system type" >&5
+	echo "$as_me:1559: 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
@@ -1564,12 +1565,12 @@ else
 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:1567: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1568: 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:1572: result: $ac_cv_target" >&5
+echo "$as_me:1573: 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/'`
@@ -1601,13 +1602,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1604: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1605: 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:1608: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1609: 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:1610: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1611: 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
@@ -1615,7 +1616,7 @@ fi
 # 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:1618: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1619: 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
@@ -1626,7 +1627,7 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###	Default install-location
-echo "$as_me:1629: checking for fgrep" >&5
+echo "$as_me:1630: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1638,7 +1639,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1641: checking for $ac_word" >&5
+echo "$as_me:1642: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1655,7 +1656,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:1658: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1659: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1666,10 +1667,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:1669: result: $FGREP" >&5
+  echo "$as_me:1670: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:1672: result: no" >&5
+  echo "$as_me:1673: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1677,16 +1678,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1680: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1681: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:1685: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:1686: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:1689: checking for prefix" >&5
+echo "$as_me:1690: 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
@@ -1698,11 +1699,11 @@ if test "x$prefix" = "xNONE" ; then
 		;;
 	esac
 fi
-echo "$as_me:1701: result: $prefix" >&5
+echo "$as_me:1702: result: $prefix" >&5
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1705: checking for default include-directory" >&5
+echo "$as_me:1706: 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 \
@@ -1725,7 +1726,7 @@ do
 	fi
 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
 done
-echo "$as_me:1728: result: $includedir" >&5
+echo "$as_me:1729: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 fi
 
@@ -1790,20 +1791,20 @@ if test -n "$withval" ; then
   (0)
  	;;
   (*)
-	{ { echo "$as_me:1793: error: ABI altered is not a number: $withval" >&5
+	{ { echo "$as_me:1794: error: ABI altered is not a number: $withval" >&5
 echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
    { (exit 1); exit 1; }; }
  	;;
   esac
 else
-  { { echo "$as_me:1799: error: ABI altered value is empty" >&5
+  { { echo "$as_me:1800: error: ABI altered value is empty" >&5
 echo "$as_me: error: ABI altered value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	if test "$cf_cv_abi_version" != "$withval"
 	then
-		{ echo "$as_me:1806: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+		{ echo "$as_me:1807: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
 		cf_cv_abi_version=$withval
 	fi
@@ -1833,7 +1834,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:1836: checking for $ac_word" >&5
+echo "$as_me:1837: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1850,7 +1851,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:1853: found $ac_dir/$ac_word" >&5
+   echo "$as_me:1854: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -1862,10 +1863,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:1865: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:1866: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:1868: result: no" >&5
+  echo "$as_me:1869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1875,7 +1876,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:1878: checking for $cf_prog_gnat version" >&5
+echo "$as_me:1879: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1886,7 +1887,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1889: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1890: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -1915,7 +1916,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:1918: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:1919: 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
@@ -1934,10 +1935,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
-					echo "$as_me:1937: result: $cf_gprconfig_value" >&5
+					echo "$as_me:1938: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:1940: result: missing" >&5
+					echo "$as_me:1941: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -1950,7 +1951,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:1953: checking for gnat version" >&5
+echo "$as_me:1954: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1961,7 +1962,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:1964: result: $cf_cv_gnat_version" >&5
+echo "$as_me:1965: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -1970,7 +1971,7 @@ case "$cf_cv_gnat_version" in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:1973: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:1974: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -1978,7 +1979,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:1981: checking for $ac_word" >&5
+echo "$as_me:1982: 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
@@ -1993,7 +1994,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:1996: found $ac_dir/$ac_word" >&5
+echo "$as_me:1997: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2002,20 +2003,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:2005: result: $M4_exists" >&5
+  echo "$as_me:2006: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:2008: result: no" >&5
+  echo "$as_me:2009: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:2014: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:2015: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:2018: checking if GNAT works" >&5
+			echo "$as_me:2019: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
@@ -2043,7 +2044,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
-			echo "$as_me:2046: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:2047: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -2059,7 +2060,7 @@ fi
 		# Here is a workaround.
 		# Extract the first word of "gnatgcc", so it can be a program name with args.
 set dummy gnatgcc; ac_word=$2
-echo "$as_me:2062: checking for $ac_word" >&5
+echo "$as_me:2063: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2076,7 +2077,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
-   echo "$as_me:2079: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2080: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2088,16 +2089,16 @@ fi
 cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
 
 if test -n "$cf_cv_path_gnatgcc"; then
-  echo "$as_me:2091: result: $cf_cv_path_gnatgcc" >&5
+  echo "$as_me:2092: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 else
-  echo "$as_me:2094: result: no" >&5
+  echo "$as_me:2095: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$cf_cv_path_gnatgcc" != no
 		then
-			echo "$as_me:2100: checking for improvement" >&5
+			echo "$as_me:2101: checking for improvement" >&5
 echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
 			case "x$cf_file_gnatgcc" in
@@ -2108,7 +2109,7 @@ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
 				cf_cv_path_gnatgcc=no
 				;;
 			esac
-			echo "$as_me:2111: result: $cf_cv_path_gnatgcc" >&5
+			echo "$as_me:2112: result: $cf_cv_path_gnatgcc" >&5
 echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
@@ -2133,7 +2134,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2136: checking for $ac_word" >&5
+echo "$as_me:2137: 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
@@ -2148,7 +2149,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:2151: found $ac_dir/$ac_word" >&5
+echo "$as_me:2152: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2156,10 +2157,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:2159: result: $CC" >&5
+  echo "$as_me:2160: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:2162: result: no" >&5
+  echo "$as_me:2163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2172,7 +2173,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2175: checking for $ac_word" >&5
+echo "$as_me:2176: 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
@@ -2187,7 +2188,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:2190: found $ac_dir/$ac_word" >&5
+echo "$as_me:2191: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2195,10 +2196,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:2198: result: $ac_ct_CC" >&5
+  echo "$as_me:2199: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:2201: result: no" >&5
+  echo "$as_me:2202: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2208,32 +2209,32 @@ done
   CC=$ac_ct_CC
 fi
 
-test -z "$CC" && { { echo "$as_me:2211: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:2212: 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:2216:" \
+echo "$as_me:2217:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:2219: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2220: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2222: \$? = $ac_status" >&5
+  echo "$as_me:2223: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2224: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2225: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2227: \$? = $ac_status" >&5
+  echo "$as_me:2228: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:2229: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2230: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:2232: \$? = $ac_status" >&5
+  echo "$as_me:2233: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2236 "configure"
+#line 2237 "configure"
 #include "confdefs.h"
 
 int
@@ -2249,13 +2250,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:2252: checking for C compiler default output" >&5
+echo "$as_me:2253: 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:2255: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:2256: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:2258: \$? = $ac_status" >&5
+  echo "$as_me:2259: \$? = $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
@@ -2278,34 +2279,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2281: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:2282: 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:2287: result: $ac_file" >&5
+echo "$as_me:2288: 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:2292: checking whether the C compiler works" >&5
+echo "$as_me:2293: 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:2298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2301: \$? = $ac_status" >&5
+  echo "$as_me:2302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2308: error: cannot run C compiled programs.
+	{ { echo "$as_me:2309: 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;}
@@ -2313,24 +2314,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2316: result: yes" >&5
+echo "$as_me:2317: 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:2323: checking whether we are cross compiling" >&5
+echo "$as_me:2324: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2325: result: $cross_compiling" >&5
+echo "$as_me:2326: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2328: checking for executable suffix" >&5
+echo "$as_me:2329: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2333: \$? = $ac_status" >&5
+  echo "$as_me:2334: \$? = $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
@@ -2346,25 +2347,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2349: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2350: 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:2355: result: $ac_cv_exeext" >&5
+echo "$as_me:2356: 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:2361: checking for object suffix" >&5
+echo "$as_me:2362: 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 2367 "configure"
+#line 2368 "configure"
 #include "confdefs.h"
 
 int
@@ -2376,10 +2377,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2382: \$? = $ac_status" >&5
+  echo "$as_me:2383: \$? = $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
@@ -2391,24 +2392,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:2394: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2395: 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:2401: result: $ac_cv_objext" >&5
+echo "$as_me:2402: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2405: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2406: 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 2411 "configure"
+#line 2412 "configure"
 #include "confdefs.h"
 
 int
@@ -2423,16 +2424,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2429: \$? = $ac_status" >&5
+  echo "$as_me:2430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2435: \$? = $ac_status" >&5
+  echo "$as_me:2436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2444,19 +2445,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2447: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2448: 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:2453: checking whether $CC accepts -g" >&5
+echo "$as_me:2454: 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 2459 "configure"
+#line 2460 "configure"
 #include "confdefs.h"
 
 int
@@ -2468,16 +2469,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2474: \$? = $ac_status" >&5
+  echo "$as_me:2475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2480: \$? = $ac_status" >&5
+  echo "$as_me:2481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2487,7 +2488,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:2490: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2491: 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
@@ -2514,16 +2515,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2520: \$? = $ac_status" >&5
+  echo "$as_me:2521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2526: \$? = $ac_status" >&5
+  echo "$as_me:2527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -2535,7 +2536,7 @@ if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2538 "configure"
+#line 2539 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2548,16 +2549,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2554: \$? = $ac_status" >&5
+  echo "$as_me:2555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2560: \$? = $ac_status" >&5
+  echo "$as_me:2561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2567,7 +2568,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2570 "configure"
+#line 2571 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2579,16 +2580,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2585: \$? = $ac_status" >&5
+  echo "$as_me:2586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2591: \$? = $ac_status" >&5
+  echo "$as_me:2592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2618,11 +2619,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2621: checking version of $CC" >&5
+	echo "$as_me:2622: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2625: result: $GCC_VERSION" >&5
+	echo "$as_me:2626: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2631,12 +2632,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2634: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2635: 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 2639 "configure"
+#line 2640 "configure"
 #include "confdefs.h"
 
 int
@@ -2653,16 +2654,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2659: \$? = $ac_status" >&5
+  echo "$as_me:2660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2665: \$? = $ac_status" >&5
+  echo "$as_me:2666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2673,7 +2674,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2676: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2677: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2682,11 +2683,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2685: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2686: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2689 "configure"
+#line 2690 "configure"
 #include "confdefs.h"
 
 int
@@ -2703,16 +2704,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2709: \$? = $ac_status" >&5
+  echo "$as_me:2710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2715: \$? = $ac_status" >&5
+  echo "$as_me:2716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2722,7 +2723,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2725: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2726: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2731,30 +2732,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2734: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2735: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2741: checking version of $CC" >&5
+	echo "$as_me:2742: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2745: result: $CLANG_VERSION" >&5
+	echo "$as_me:2746: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2752: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2753: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2757 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2768,16 +2769,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2774: \$? = $ac_status" >&5
+  echo "$as_me:2775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2780: \$? = $ac_status" >&5
+  echo "$as_me:2781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2788,13 +2789,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2791: result: $cf_clang_optok" >&5
+		echo "$as_me:2792: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2797: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2798: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2803,7 +2804,7 @@ echo "${as_me:-configure}:2797: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2806: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2807: 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
@@ -2811,7 +2812,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2814 "configure"
+#line 2815 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2858,16 +2859,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2864: \$? = $ac_status" >&5
+  echo "$as_me:2865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2870: \$? = $ac_status" >&5
+  echo "$as_me:2871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2884,10 +2885,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2887: result: none needed" >&5
+    echo "$as_me:2888: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2890: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2891: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2895,13 +2896,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2898: checking \$CFLAGS variable" >&5
+echo "$as_me:2899: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2902: result: broken" >&5
+	echo "$as_me:2903: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2904: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2905: 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=
@@ -3009,18 +3010,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:3012: result: ok" >&5
+	echo "$as_me:3013: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:3017: checking \$CC variable" >&5
+echo "$as_me:3018: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:3021: result: broken" >&5
+	echo "$as_me:3022: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:3023: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:3024: 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/[ ]*[ ]-[^ ].*//'`
@@ -3137,19 +3138,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:3140: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:3141: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3144: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3145: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:3148: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:3149: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:3152: result: ok" >&5
+	echo "$as_me:3153: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -3163,7 +3164,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:3166: checking how to run the C preprocessor" >&5
+echo "$as_me:3167: 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
@@ -3184,18 +3185,18 @@ do
   # 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 3187 "configure"
+#line 3188 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3192: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3193: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3198: \$? = $ac_status" >&5
+  echo "$as_me:3199: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3218,17 +3219,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3221 "configure"
+#line 3222 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3225: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3226: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3231: \$? = $ac_status" >&5
+  echo "$as_me:3232: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3265,7 +3266,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3268: result: $CPP" >&5
+echo "$as_me:3269: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3275,18 +3276,18 @@ do
   # 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 3278 "configure"
+#line 3279 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3284: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3289: \$? = $ac_status" >&5
+  echo "$as_me:3290: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3309,17 +3310,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3312 "configure"
+#line 3313 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:3317: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3322: \$? = $ac_status" >&5
+  echo "$as_me:3323: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3347,7 +3348,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3350: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3351: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3360,14 +3361,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:3363: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3364: 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 3370 "configure"
+#line 3371 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -3382,7 +3383,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 3385 "configure"
+#line 3386 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -3395,14 +3396,14 @@ rm -rf conftest*
 
   fi
 fi
-echo "$as_me:3398: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3399: 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:3405: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3406: 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
@@ -3417,15 +3418,15 @@ CF_EOF
 # 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:3420: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3423: \$? = $ac_status" >&5
+  echo "$as_me:3424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3425: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3428: \$? = $ac_status" >&5
+  echo "$as_me:3429: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CC_c_o=yes
@@ -3436,10 +3437,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CC_c_o" = yes; then
-  echo "$as_me:3439: result: yes" >&5
+  echo "$as_me:3440: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3442: result: no" >&5
+  echo "$as_me:3443: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3453,7 +3454,7 @@ else
 	(*) 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:3456: checking for $ac_word" >&5
+echo "$as_me:3457: 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
@@ -3470,7 +3471,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3473: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3474: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3481,10 +3482,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
-  echo "$as_me:3484: result: $LDCONFIG" >&5
+  echo "$as_me:3485: result: $LDCONFIG" >&5
 echo "${ECHO_T}$LDCONFIG" >&6
 else
-  echo "$as_me:3487: result: no" >&5
+  echo "$as_me:3488: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3492,7 +3493,7 @@ fi
 	esac
 fi
 
-echo "$as_me:3495: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3496: 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.
@@ -3502,7 +3503,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
-echo "$as_me:3505: result: $cf_with_cxx" >&5
+echo "$as_me:3506: result: $cf_with_cxx" >&5
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
 	CXX=""
@@ -3520,7 +3521,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:3523: checking for $ac_word" >&5
+echo "$as_me:3524: 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
@@ -3535,7 +3536,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:3538: found $ac_dir/$ac_word" >&5
+echo "$as_me:3539: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3543,10 +3544,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:3546: result: $CXX" >&5
+  echo "$as_me:3547: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3549: result: no" >&5
+  echo "$as_me:3550: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3559,7 +3560,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3562: checking for $ac_word" >&5
+echo "$as_me:3563: 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
@@ -3574,7 +3575,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:3577: found $ac_dir/$ac_word" >&5
+echo "$as_me:3578: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3582,10 +3583,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:3585: result: $ac_ct_CXX" >&5
+  echo "$as_me:3586: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:3588: result: no" >&5
+  echo "$as_me:3589: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3597,32 +3598,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:3600:" \
+echo "$as_me:3601:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:3603: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3604: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3606: \$? = $ac_status" >&5
+  echo "$as_me:3607: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3608: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3609: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3611: \$? = $ac_status" >&5
+  echo "$as_me:3612: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:3613: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3614: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:3616: \$? = $ac_status" >&5
+  echo "$as_me:3617: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
-echo "$as_me:3619: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3620: 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 3625 "configure"
+#line 3626 "configure"
 #include "confdefs.h"
 
 int
@@ -3637,16 +3638,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3643: \$? = $ac_status" >&5
+  echo "$as_me:3644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3649: \$? = $ac_status" >&5
+  echo "$as_me:3650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -3658,19 +3659,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:3661: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3662: 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:3667: checking whether $CXX accepts -g" >&5
+echo "$as_me:3668: 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 3673 "configure"
+#line 3674 "configure"
 #include "confdefs.h"
 
 int
@@ -3682,16 +3683,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3688: \$? = $ac_status" >&5
+  echo "$as_me:3689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3694: \$? = $ac_status" >&5
+  echo "$as_me:3695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -3701,7 +3702,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:3704: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3705: 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
@@ -3728,7 +3729,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3731 "configure"
+#line 3732 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -3741,16 +3742,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3747: \$? = $ac_status" >&5
+  echo "$as_me:3748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3753: \$? = $ac_status" >&5
+  echo "$as_me:3754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3760,7 +3761,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3763 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -3772,16 +3773,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3778: \$? = $ac_status" >&5
+  echo "$as_me:3779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3784: \$? = $ac_status" >&5
+  echo "$as_me:3785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -3815,7 +3816,7 @@ ac_main_return="return"
 	then
 		# Several of the C++ configurations do not work, particularly when
 		# cross-compiling (20140913 -TD)
-		echo "$as_me:3818: checking if $CXX works" >&5
+		echo "$as_me:3819: checking if $CXX works" >&5
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
 		save_CPPFLAGS="$CPPFLAGS"
@@ -3823,7 +3824,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3826 "configure"
+#line 3827 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3840,16 +3841,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3846: \$? = $ac_status" >&5
+  echo "$as_me:3847: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3852: \$? = $ac_status" >&5
+  echo "$as_me:3853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_works=yes
 else
@@ -3860,11 +3861,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$save_CPPFLAGS"
 
-		echo "$as_me:3863: result: $cf_cxx_works" >&5
+		echo "$as_me:3864: result: $cf_cxx_works" >&5
 echo "${ECHO_T}$cf_cxx_works" >&6
 		if test "x$cf_cxx_works" = xno
 		then
-			{ echo "$as_me:3867: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+			{ echo "$as_me:3868: 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
@@ -3880,7 +3881,7 @@ ac_main_return="return"
 	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:3883: checking for $ac_word" >&5
+echo "$as_me:3884: 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
@@ -3897,7 +3898,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
-   echo "$as_me:3900: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3908,17 +3909,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
-  echo "$as_me:3911: result: $CXX" >&5
+  echo "$as_me:3912: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:3914: result: no" >&5
+  echo "$as_me:3915: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	case "x$CXX" in
 	(x|xg++)
-		{ echo "$as_me:3921: WARNING: You don't have any C++ compiler, too bad" >&5
+		{ echo "$as_me:3922: 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="";
 		;;
@@ -3927,7 +3928,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
-	echo "$as_me:3930: checking version of ${CXX:-g++}" >&5
+	echo "$as_me:3931: checking version of ${CXX:-g++}" >&5
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	if test -z "$GXX_VERSION"
@@ -3935,7 +3936,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
 		GXX_VERSION=unknown
 		GXX=no
 	fi
-	echo "$as_me:3938: result: $GXX_VERSION" >&5
+	echo "$as_me:3939: result: $GXX_VERSION" >&5
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
@@ -3943,12 +3944,12 @@ case "$GXX_VERSION" in
 ([1-9][0-9].*)
 	;;
 (1.*|2.[0-6]*)
-	{ echo "$as_me:3946: WARNING: templates do not work" >&5
+	{ echo "$as_me:3947: WARNING: templates do not work" >&5
 echo "$as_me: WARNING: templates do not work" >&2;}
 	;;
 esac
 
-echo "$as_me:3951: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3952: 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.
@@ -3958,15 +3959,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
-echo "$as_me:3961: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3962: result: $cf_with_cxx_binding" >&5
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
-echo "$as_me:3964: checking if you want to build with Ada" >&5
+echo "$as_me:3965: checking if you want to build with Ada" >&5
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
-echo "$as_me:3966: result: $cf_with_ada" >&5
+echo "$as_me:3967: result: $cf_with_ada" >&5
 echo "${ECHO_T}$cf_with_ada" >&6
 
-echo "$as_me:3969: checking if you want to install terminal database" >&5
+echo "$as_me:3970: 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.
@@ -3976,10 +3977,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
-echo "$as_me:3979: result: $cf_with_db_install" >&5
+echo "$as_me:3980: result: $cf_with_db_install" >&5
 echo "${ECHO_T}$cf_with_db_install" >&6
 
-echo "$as_me:3982: checking if you want to install manpages" >&5
+echo "$as_me:3983: 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.
@@ -3989,10 +3990,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
-echo "$as_me:3992: result: $cf_with_manpages" >&5
+echo "$as_me:3993: result: $cf_with_manpages" >&5
 echo "${ECHO_T}$cf_with_manpages" >&6
 
-echo "$as_me:3995: checking if you want to build programs such as tic" >&5
+echo "$as_me:3996: 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.
@@ -4002,10 +4003,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
-echo "$as_me:4005: result: $cf_with_progs" >&5
+echo "$as_me:4006: result: $cf_with_progs" >&5
 echo "${ECHO_T}$cf_with_progs" >&6
 
-echo "$as_me:4008: checking if you want to build test-programs" >&5
+echo "$as_me:4009: 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.
@@ -4015,10 +4016,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
-echo "$as_me:4018: result: $cf_with_tests" >&5
+echo "$as_me:4019: result: $cf_with_tests" >&5
 echo "${ECHO_T}$cf_with_tests" >&6
 
-echo "$as_me:4021: checking if you wish to install curses.h" >&5
+echo "$as_me:4022: 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.
@@ -4028,7 +4029,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
-echo "$as_me:4031: result: $with_curses_h" >&5
+echo "$as_me:4032: result: $with_curses_h" >&5
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
@@ -4052,7 +4053,7 @@ for ac_prog in mawk gawk nawk awk
 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:4055: checking for $ac_word" >&5
+echo "$as_me:4056: 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
@@ -4067,7 +4068,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:4070: found $ac_dir/$ac_word" >&5
+echo "$as_me:4071: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4075,17 +4076,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:4078: result: $AWK" >&5
+  echo "$as_me:4079: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:4081: result: no" >&5
+  echo "$as_me:4082: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:4088: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:4089: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -4112,7 +4113,7 @@ esac
 # 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:4115: checking for a BSD compatible install" >&5
+echo "$as_me:4116: 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
@@ -4161,7 +4162,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:4164: result: $INSTALL" >&5
+echo "$as_me:4165: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -4186,7 +4187,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4189: checking for $ac_word" >&5
+echo "$as_me:4190: 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
@@ -4201,7 +4202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4204: found $ac_dir/$ac_word" >&5
+echo "$as_me:4205: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4209,10 +4210,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4212: result: $LINT" >&5
+  echo "$as_me:4213: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4215: result: no" >&5
+  echo "$as_me:4216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4228,18 +4229,18 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:4231: checking whether ln -s works" >&5
+echo "$as_me:4232: 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:4235: result: yes" >&5
+  echo "$as_me:4236: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:4238: result: no, using $LN_S" >&5
+  echo "$as_me:4239: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:4242: checking if $LN_S -f options work" >&5
+echo "$as_me:4243: 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
@@ -4251,12 +4252,12 @@ else
 	cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
-echo "$as_me:4254: result: $cf_prog_ln_sf" >&5
+echo "$as_me:4255: 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:4259: checking for long file names" >&5
+echo "$as_me:4260: 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
@@ -4295,7 +4296,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
   rm -rf "$ac_xdir" 2>/dev/null
 done
 fi
-echo "$as_me:4298: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:4299: 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
 
@@ -4314,7 +4315,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
 	(xyes|xno)
-		{ echo "$as_me:4317: WARNING: expected a value for config-suffix option" >&5
+		{ echo "$as_me:4318: 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"
@@ -4324,7 +4325,7 @@ fi;
 
 # If we find pkg-config, check if we should install the ".pc" files.
 
-echo "$as_me:4327: checking if you want to use pkg-config" >&5
+echo "$as_me:4328: 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.
@@ -4334,7 +4335,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:4337: result: $cf_pkg_config" >&5
+echo "$as_me:4338: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -4346,7 +4347,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:4349: checking for $ac_word" >&5
+echo "$as_me:4350: 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
@@ -4363,7 +4364,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4366: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4367: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4374,10 +4375,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:4377: result: $PKG_CONFIG" >&5
+  echo "$as_me:4378: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:4380: result: no" >&5
+  echo "$as_me:4381: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4386,7 +4387,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:4389: checking for $ac_word" >&5
+echo "$as_me:4390: 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
@@ -4403,7 +4404,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:4406: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4407: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4415,10 +4416,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:4418: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4419: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:4421: result: no" >&5
+  echo "$as_me:4422: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4459,24 +4460,24 @@ case "x$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4462: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:4463: 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:4469: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:4470: 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:4475: checking for pkg-config library directory" >&5
+	echo "$as_me:4476: checking for pkg-config library directory" >&5
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
 	;;
 (*)
-	echo "$as_me:4479: checking for $PKG_CONFIG library directory" >&5
+	echo "$as_me:4480: checking for $PKG_CONFIG library directory" >&5
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
 	;;
 esac
@@ -4503,7 +4504,7 @@ fi;
 case "x$cf_search_path" in
 (xlibdir)
 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
-	echo "$as_me:4506: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4507: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
@@ -4514,16 +4515,16 @@ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	PKG_CONFIG_LIBDIR="$cf_search_path"
-	echo "$as_me:4517: result: $PKG_CONFIG_LIBDIR" >&5
+	echo "$as_me:4518: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	cf_search_path=
 	;;
 (xyes|xauto)
-	echo "$as_me:4522: result: auto" >&5
+	echo "$as_me:4523: result: auto" >&5
 echo "${ECHO_T}auto" >&6
 	cf_search_path=
 	# Look for the library directory using the same prefix as the executable
-	echo "$as_me:4526: checking for search-list" >&5
+	echo "$as_me:4527: checking for search-list" >&5
 echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 	if test "x$PKG_CONFIG" != xnone
 	then
@@ -4558,11 +4559,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
 "`
 	fi
 
-	echo "$as_me:4561: result: $cf_search_path" >&5
+	echo "$as_me:4562: result: $cf_search_path" >&5
 echo "${ECHO_T}$cf_search_path" >&6
 	;;
 (*)
-	{ { echo "$as_me:4565: error: Unexpected option value: $cf_search_path" >&5
+	{ { echo "$as_me:4566: error: Unexpected option value: $cf_search_path" >&5
 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4570,7 +4571,7 @@ esac
 
 if test -n "$cf_search_path"
 then
-	echo "$as_me:4573: checking for first directory" >&5
+	echo "$as_me:4574: checking for first directory" >&5
 echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 	cf_pkg_config_path=none
 	for cf_config in $cf_search_path
@@ -4581,7 +4582,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
 			break
 		fi
 	done
-	echo "$as_me:4584: result: $cf_pkg_config_path" >&5
+	echo "$as_me:4585: result: $cf_pkg_config_path" >&5
 echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test "x$cf_pkg_config_path" != xnone ; then
@@ -4591,7 +4592,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6
 
 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
 	then
-		echo "$as_me:4594: checking for workaround" >&5
+		echo "$as_me:4595: checking for workaround" >&5
 echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 		if test "$prefix" = "NONE" ; then
 			cf_prefix="$ac_default_prefix"
@@ -4614,17 +4615,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
 			esac
 		done
 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
-		echo "$as_me:4617: result: $PKG_CONFIG_LIBDIR" >&5
+		echo "$as_me:4618: result: $PKG_CONFIG_LIBDIR" >&5
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 	fi
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
-	echo "$as_me:4624: checking if we should install .pc files for $PKG_CONFIG" >&5
+	echo "$as_me:4625: 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:4627: checking if we should install .pc files" >&5
+	echo "$as_me:4628: checking if we should install .pc files" >&5
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
@@ -4635,7 +4636,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
-echo "$as_me:4638: result: $enable_pc_files" >&5
+echo "$as_me:4639: result: $enable_pc_files" >&5
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
@@ -4643,7 +4644,7 @@ then
 	MAKE_PC_FILES=
 	case "x$PKG_CONFIG_LIBDIR" in
 	(xno|xnone|xyes|x)
-		{ echo "$as_me:4646: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+		{ echo "$as_me:4647: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
 		;;
 	(*)
@@ -4672,7 +4673,7 @@ case "x$cf_pkg_config_libdir" in
 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:4675: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+	{ { echo "$as_me:4676: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4686,7 +4687,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
-	echo "$as_me:4689: checking for suffix to add to pkg-config files" >&5
+	echo "$as_me:4690: checking for suffix to add to pkg-config files" >&5
 echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
@@ -4701,13 +4702,13 @@ if test "${with_pc_suffix+set}" = set; then
 	esac
 fi;
 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
-	echo "$as_me:4704: result: $PC_MODULE_SUFFIX" >&5
+	echo "$as_me:4705: result: $PC_MODULE_SUFFIX" >&5
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
-echo "$as_me:4710: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4711: 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.
@@ -4717,11 +4718,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
-echo "$as_me:4720: result: $enable_mixedcase" >&5
+echo "$as_me:4721: result: $enable_mixedcase" >&5
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
-echo "$as_me:4724: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4725: 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
@@ -4748,7 +4749,7 @@ else
 fi
 
 fi
-echo "$as_me:4751: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4752: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4767,7 +4768,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:4770: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4771: 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
@@ -4787,16 +4788,16 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:4790: result: yes" >&5
+  echo "$as_me:4791: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:4794: result: no" >&5
+  echo "$as_me:4795: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-echo "$as_me:4799: checking for \".PHONY\" make-support" >&5
+echo "$as_me:4800: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4851,7 +4852,7 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:4854: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:4855: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
@@ -4862,7 +4863,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4865: checking for $ac_word" >&5
+echo "$as_me:4866: 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
@@ -4877,7 +4878,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:4880: found $ac_dir/$ac_word" >&5
+echo "$as_me:4881: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4885,10 +4886,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:4888: result: $CTAGS" >&5
+  echo "$as_me:4889: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:4891: result: no" >&5
+  echo "$as_me:4892: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4899,7 +4900,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4902: checking for $ac_word" >&5
+echo "$as_me:4903: 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
@@ -4914,7 +4915,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:4917: found $ac_dir/$ac_word" >&5
+echo "$as_me:4918: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4922,10 +4923,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:4925: result: $ETAGS" >&5
+  echo "$as_me:4926: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:4928: result: no" >&5
+  echo "$as_me:4929: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4934,7 +4935,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:4937: checking for $ac_word" >&5
+echo "$as_me:4938: 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
@@ -4949,7 +4950,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:4952: found $ac_dir/$ac_word" >&5
+echo "$as_me:4953: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4958,17 +4959,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:4961: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4962: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:4964: result: no" >&5
+  echo "$as_me:4965: 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:4971: checking for $ac_word" >&5
+echo "$as_me:4972: 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
@@ -4983,7 +4984,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:4986: found $ac_dir/$ac_word" >&5
+echo "$as_me:4987: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4992,10 +4993,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:4995: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4996: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:4998: result: no" >&5
+  echo "$as_me:4999: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5015,7 +5016,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:5018: checking for makeflags variable" >&5
+echo "$as_me:5019: 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
@@ -5045,7 +5046,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:5049: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -5053,13 +5054,13 @@ echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:5056: result: $cf_cv_makeflags" >&5
+echo "$as_me:5057: 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:5062: checking for $ac_word" >&5
+echo "$as_me:5063: 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
@@ -5074,7 +5075,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5077: found $ac_dir/$ac_word" >&5
+echo "$as_me:5078: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5082,10 +5083,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5085: result: $RANLIB" >&5
+  echo "$as_me:5086: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5088: result: no" >&5
+  echo "$as_me:5089: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5094,7 +5095,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5097: checking for $ac_word" >&5
+echo "$as_me:5098: 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
@@ -5109,7 +5110,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5112: found $ac_dir/$ac_word" >&5
+echo "$as_me:5113: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5118,10 +5119,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5121: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5122: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5124: result: no" >&5
+  echo "$as_me:5125: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5133,7 +5134,7 @@ fi
 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:5136: checking for $ac_word" >&5
+echo "$as_me:5137: 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
@@ -5148,7 +5149,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:5151: found $ac_dir/$ac_word" >&5
+echo "$as_me:5152: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5156,10 +5157,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:5159: result: $LD" >&5
+  echo "$as_me:5160: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:5162: result: no" >&5
+  echo "$as_me:5163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5168,7 +5169,7 @@ if test -z "$ac_cv_prog_LD"; then
   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:5171: checking for $ac_word" >&5
+echo "$as_me:5172: 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
@@ -5183,7 +5184,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:5186: found $ac_dir/$ac_word" >&5
+echo "$as_me:5187: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5192,10 +5193,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:5195: result: $ac_ct_LD" >&5
+  echo "$as_me:5196: result: $ac_ct_LD" >&5
 echo "${ECHO_T}$ac_ct_LD" >&6
 else
-  echo "$as_me:5198: result: no" >&5
+  echo "$as_me:5199: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5207,7 +5208,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5210: checking for $ac_word" >&5
+echo "$as_me:5211: 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
@@ -5222,7 +5223,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5225: found $ac_dir/$ac_word" >&5
+echo "$as_me:5226: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5230,10 +5231,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5233: result: $AR" >&5
+  echo "$as_me:5234: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5236: result: no" >&5
+  echo "$as_me:5237: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5242,7 +5243,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5245: checking for $ac_word" >&5
+echo "$as_me:5246: 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
@@ -5257,7 +5258,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5260: found $ac_dir/$ac_word" >&5
+echo "$as_me:5261: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5266,10 +5267,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5269: result: $ac_ct_AR" >&5
+  echo "$as_me:5270: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5272: result: no" >&5
+  echo "$as_me:5273: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5281,7 +5282,7 @@ fi
 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:5284: checking for $ac_word" >&5
+echo "$as_me:5285: 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
@@ -5296,7 +5297,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"
-echo "$as_me:5299: found $ac_dir/$ac_word" >&5
+echo "$as_me:5300: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5304,10 +5305,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  echo "$as_me:5307: result: $NM" >&5
+  echo "$as_me:5308: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 else
-  echo "$as_me:5310: result: no" >&5
+  echo "$as_me:5311: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5316,7 +5317,7 @@ if test -z "$ac_cv_prog_NM"; then
   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:5319: checking for $ac_word" >&5
+echo "$as_me:5320: 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
@@ -5331,7 +5332,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"
-echo "$as_me:5334: found $ac_dir/$ac_word" >&5
+echo "$as_me:5335: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5340,10 +5341,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
-  echo "$as_me:5343: result: $ac_ct_NM" >&5
+  echo "$as_me:5344: result: $ac_ct_NM" >&5
 echo "${ECHO_T}$ac_ct_NM" >&6
 else
-  echo "$as_me:5346: result: no" >&5
+  echo "$as_me:5347: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5355,7 +5356,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:5358: checking for $ac_word" >&5
+echo "$as_me:5359: 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
@@ -5370,7 +5371,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:5373: found $ac_dir/$ac_word" >&5
+echo "$as_me:5374: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5378,10 +5379,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:5381: result: $AR" >&5
+  echo "$as_me:5382: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:5384: result: no" >&5
+  echo "$as_me:5385: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5390,7 +5391,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:5393: checking for $ac_word" >&5
+echo "$as_me:5394: 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
@@ -5405,7 +5406,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:5408: found $ac_dir/$ac_word" >&5
+echo "$as_me:5409: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5414,10 +5415,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:5417: result: $ac_ct_AR" >&5
+  echo "$as_me:5418: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:5420: result: no" >&5
+  echo "$as_me:5421: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5426,7 +5427,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:5429: checking for options to update archives" >&5
+echo "$as_me:5430: 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
@@ -5463,13 +5464,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 5466 "configure"
+#line 5467 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:5469: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5472: \$? = $ac_status" >&5
+  echo "$as_me:5473: \$? = $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
@@ -5480,7 +5481,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5484: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -5490,7 +5491,7 @@ echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:5493: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5494: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -5501,7 +5502,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:5504: checking for an installation directory prefix" >&5
+echo "$as_me:5505: checking for an installation directory prefix" >&5
 echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
@@ -5514,10 +5515,10 @@ if test "${with_install_prefix+set}" = set; then
 		;;
 	esac
 fi;
-echo "$as_me:5517: result: ${DESTDIR:-(none)}" >&5
+echo "$as_me:5518: result: ${DESTDIR:-(none)}" >&5
 echo "${ECHO_T}${DESTDIR:-(none)}" >&6
 
-echo "$as_me:5520: checking if installation directory prefix should be merged" >&5
+echo "$as_me:5521: checking if installation directory prefix should be merged" >&5
 echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
 
 # Check whether --enable-install-prefix or --disable-install-prefix was given.
@@ -5534,7 +5535,7 @@ else
 	cf_install_prefix=no
 
 fi;
-echo "$as_me:5537: result: $cf_install_prefix" >&5
+echo "$as_me:5538: result: $cf_install_prefix" >&5
 echo "${ECHO_T}$cf_install_prefix" >&6
 
 if test "$cf_install_prefix" = yes ; then
@@ -5575,7 +5576,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5578: checking for $ac_word" >&5
+echo "$as_me:5579: 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
@@ -5590,7 +5591,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:5593: found $ac_dir/$ac_word" >&5
+echo "$as_me:5594: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5598,10 +5599,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:5601: result: $BUILD_CC" >&5
+  echo "$as_me:5602: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:5604: result: no" >&5
+  echo "$as_me:5605: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5610,12 +5611,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:5613: checking for native build C compiler" >&5
+	echo "$as_me:5614: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:5615: result: $BUILD_CC" >&5
+	echo "$as_me:5616: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:5618: checking for native build C preprocessor" >&5
+	echo "$as_me:5619: 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.
@@ -5625,10 +5626,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:5628: result: $BUILD_CPP" >&5
+	echo "$as_me:5629: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:5631: checking for native build C flags" >&5
+	echo "$as_me:5632: 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.
@@ -5636,10 +5637,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:5639: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:5640: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:5642: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:5643: 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.
@@ -5647,10 +5648,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:5650: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:5651: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:5653: checking for native build linker-flags" >&5
+	echo "$as_me:5654: 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.
@@ -5658,10 +5659,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:5661: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:5662: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:5664: checking for native build linker-libraries" >&5
+	echo "$as_me:5665: 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.
@@ -5669,7 +5670,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:5672: result: $BUILD_LIBS" >&5
+	echo "$as_me:5673: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -5678,7 +5679,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:5681: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:5682: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -5692,7 +5693,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5695 "configure"
+#line 5696 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -5702,15 +5703,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5708: \$? = $ac_status" >&5
+  echo "$as_me:5709: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5713: \$? = $ac_status" >&5
+  echo "$as_me:5714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -5725,12 +5726,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:5728: result: $cf_ok_build_cc" >&5
+	echo "$as_me:5729: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:5733: error: Cross-build requires two compilers.
+		{ { echo "$as_me:5734: 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;}
@@ -5755,7 +5756,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
-echo "$as_me:5758: checking if libtool -version-number should be used" >&5
+echo "$as_me:5759: 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.
@@ -5772,7 +5773,7 @@ else
 	cf_libtool_version=yes
 
 fi;
-echo "$as_me:5775: result: $cf_libtool_version" >&5
+echo "$as_me:5776: result: $cf_libtool_version" >&5
 echo "${ECHO_T}$cf_libtool_version" >&6
 
 if test "$cf_libtool_version" = yes ; then
@@ -5781,25 +5782,25 @@ else
 	LIBTOOL_VERSION="-version-info"
 	case "x$VERSION" in
 	(x)
-		{ echo "$as_me:5784: WARNING: VERSION was not set" >&5
+		{ echo "$as_me:5785: 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}:5791: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5792: 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}:5798: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5799: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:5802: WARNING: unexpected VERSION value: $VERSION" >&5
+		{ echo "$as_me:5803: WARNING: unexpected VERSION value: $VERSION" >&5
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
 		;;
 	esac
@@ -5821,7 +5822,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:5824: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5825: 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.
@@ -5831,7 +5832,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:5834: result: $with_libtool" >&5
+echo "$as_me:5835: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -5860,7 +5861,7 @@ case "x$with_libtool" in
 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:5863: error: expected a pathname, not \"$with_libtool\"" >&5
+	{ { echo "$as_me:5864: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -5873,7 +5874,7 @@ esac
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:5876: checking for $ac_word" >&5
+echo "$as_me:5877: 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
@@ -5888,7 +5889,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5891: found $ac_dir/$ac_word" >&5
+echo "$as_me:5892: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5896,10 +5897,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5899: result: $LIBTOOL" >&5
+  echo "$as_me:5900: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5902: result: no" >&5
+  echo "$as_me:5903: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5912,7 +5913,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5915: checking for $ac_word" >&5
+echo "$as_me:5916: 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
@@ -5927,7 +5928,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:5930: found $ac_dir/$ac_word" >&5
+echo "$as_me:5931: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5935,10 +5936,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:5938: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5939: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:5941: result: no" >&5
+  echo "$as_me:5942: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5969,7 +5970,7 @@ unset LIBTOOL
   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:5972: checking for $ac_word" >&5
+echo "$as_me:5973: 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
@@ -5984,7 +5985,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
-echo "$as_me:5987: found $ac_dir/$ac_word" >&5
+echo "$as_me:5988: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5992,10 +5993,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
-  echo "$as_me:5995: result: $LIBTOOL" >&5
+  echo "$as_me:5996: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:5998: result: no" >&5
+  echo "$as_me:5999: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6008,7 +6009,7 @@ if test -z "$LIBTOOL"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:6011: checking for $ac_word" >&5
+echo "$as_me:6012: 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
@@ -6023,7 +6024,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
-echo "$as_me:6026: found $ac_dir/$ac_word" >&5
+echo "$as_me:6027: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6031,10 +6032,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
-  echo "$as_me:6034: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:6035: result: $ac_ct_LIBTOOL" >&5
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
-  echo "$as_me:6037: result: no" >&5
+  echo "$as_me:6038: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6056,7 +6057,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 		fi
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:6059: error: Cannot find libtool" >&5
+		{ { echo "$as_me:6060: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6072,7 +6073,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
-	echo "$as_me:6075: checking version of $LIBTOOL" >&5
+	echo "$as_me:6076: checking version of $LIBTOOL" >&5
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
@@ -6083,7 +6084,7 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
-	echo "$as_me:6086: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:6087: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 
 	if test -n "$cf_cv_libtool_version"
@@ -6093,19 +6094,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
 		(*...GNU-libtool...*)
 			;;
 		(*)
-			{ { echo "$as_me:6096: error: This is not GNU libtool" >&5
+			{ { echo "$as_me:6097: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 			;;
 		esac
 	else
-		{ { echo "$as_me:6102: error: No version found for $LIBTOOL" >&5
+		{ { echo "$as_me:6103: error: No version found for $LIBTOOL" >&5
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
 else
-	{ { echo "$as_me:6108: error: GNU libtool has not been found" >&5
+	{ { echo "$as_me:6109: error: GNU libtool has not been found" >&5
 echo "$as_me: error: GNU libtool has not been found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6141,7 +6142,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
-echo "$as_me:6144: checking if you want to build shared libraries" >&5
+echo "$as_me:6145: 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.
@@ -6151,11 +6152,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
-echo "$as_me:6154: result: $with_shared" >&5
+echo "$as_me:6155: 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:6158: checking if you want to build static libraries" >&5
+echo "$as_me:6159: 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.
@@ -6165,11 +6166,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
-echo "$as_me:6168: result: $with_normal" >&5
+echo "$as_me:6169: 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:6172: checking if you want to build debug libraries" >&5
+echo "$as_me:6173: 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.
@@ -6179,11 +6180,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
-echo "$as_me:6182: result: $with_debug" >&5
+echo "$as_me:6183: 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:6186: checking if you want to build profiling libraries" >&5
+echo "$as_me:6187: 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.
@@ -6193,7 +6194,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
-echo "$as_me:6196: result: $with_profile" >&5
+echo "$as_me:6197: result: $with_profile" >&5
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
@@ -6201,7 +6202,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
-echo "$as_me:6204: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:6205: 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.
@@ -6211,26 +6212,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
-echo "$as_me:6214: result: $with_shared_cxx" >&5
+echo "$as_me:6215: result: $with_shared_cxx" >&5
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
-echo "$as_me:6221: checking for specified models" >&5
+echo "$as_me:6222: 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:6225: result: $cf_list_models" >&5
+echo "$as_me:6226: 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:6230: checking for default model" >&5
+echo "$as_me:6231: 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:6233: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:6234: result: $DFT_LWR_MODEL" >&5
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -6244,7 +6245,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
-echo "$as_me:6247: checking if you want to have a library-prefix" >&5
+echo "$as_me:6248: 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.
@@ -6254,7 +6255,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
-echo "$as_me:6257: result: $with_lib_prefix" >&5
+echo "$as_me:6258: result: $with_lib_prefix" >&5
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
@@ -6285,24 +6286,24 @@ fi
 
 LIB_SUFFIX=
 
-	echo "$as_me:6288: checking for PATH separator" >&5
+	echo "$as_me:6289: 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:6295: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6296: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # headers needed for checks...
-echo "$as_me:6299: checking for ANSI C header files" >&5
+echo "$as_me:6300: 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 6305 "configure"
+#line 6306 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6310,13 +6311,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:6313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6319: \$? = $ac_status" >&5
+  echo "$as_me:6320: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6338,7 +6339,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6341 "configure"
+#line 6342 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -6356,7 +6357,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6359 "configure"
+#line 6360 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -6377,7 +6378,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6380 "configure"
+#line 6381 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6403,15 +6404,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6409: \$? = $ac_status" >&5
+  echo "$as_me:6410: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6414: \$? = $ac_status" >&5
+  echo "$as_me:6415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6424,7 +6425,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:6427: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6428: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6440,28 +6441,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6443: checking for $ac_header" >&5
+echo "$as_me:6444: 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 6449 "configure"
+#line 6450 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6458: \$? = $ac_status" >&5
+  echo "$as_me:6459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6464: \$? = $ac_status" >&5
+  echo "$as_me:6465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6471,7 +6472,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6475: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6481,13 +6482,13 @@ EOF
 fi
 done
 
-echo "$as_me:6484: checking whether exit is declared" >&5
+echo "$as_me:6485: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6490 "configure"
+#line 6491 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6502,16 +6503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6508: \$? = $ac_status" >&5
+  echo "$as_me:6509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6514: \$? = $ac_status" >&5
+  echo "$as_me:6515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -6521,19 +6522,19 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6524: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:6525: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:6530: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:6531: 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 6536 "configure"
+#line 6537 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -6548,16 +6549,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6554: \$? = $ac_status" >&5
+  echo "$as_me:6555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6560: \$? = $ac_status" >&5
+  echo "$as_me:6561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6567,7 +6568,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6570: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6571: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6580,7 +6581,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:6583: checking for opendir in -ldir" >&5
+  echo "$as_me:6584: 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
@@ -6588,7 +6589,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6591 "configure"
+#line 6592 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6607,16 +6608,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6613: \$? = $ac_status" >&5
+  echo "$as_me:6614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6619: \$? = $ac_status" >&5
+  echo "$as_me:6620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -6627,14 +6628,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6630: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:6631: 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:6637: checking for opendir in -lx" >&5
+  echo "$as_me:6638: 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
@@ -6642,7 +6643,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6645 "configure"
+#line 6646 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6661,16 +6662,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6667: \$? = $ac_status" >&5
+  echo "$as_me:6668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6673: \$? = $ac_status" >&5
+  echo "$as_me:6674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -6681,7 +6682,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6684: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:6685: 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"
@@ -6691,7 +6692,7 @@ fi
 
 ###############################################################################
 
-echo "$as_me:6694: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:6695: 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.
@@ -6701,10 +6702,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
-echo "$as_me:6704: result: $with_termlib" >&5
+echo "$as_me:6705: result: $with_termlib" >&5
 echo "${ECHO_T}$with_termlib" >&6
 
-echo "$as_me:6707: checking if you want to build a separate tic library" >&5
+echo "$as_me:6708: 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.
@@ -6714,7 +6715,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
-echo "$as_me:6717: result: $with_ticlib" >&5
+echo "$as_me:6718: result: $with_ticlib" >&5
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
@@ -6727,7 +6728,7 @@ if test X"$CXX_G_OPT" = X"" ; then
 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
-echo "$as_me:6730: checking for default loader flags" >&5
+echo "$as_me:6731: 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=''   ;;
@@ -6736,13 +6737,13 @@ case "$DFT_LWR_MODEL" in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
-echo "$as_me:6739: result: ${LD_MODEL:-(none)}" >&5
+echo "$as_me:6740: result: ${LD_MODEL:-(none)}" >&5
 echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
 
 case "$DFT_LWR_MODEL" in
 (shared)
 
-echo "$as_me:6745: checking if rpath option should be used" >&5
+echo "$as_me:6746: 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.
@@ -6752,10 +6753,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
-echo "$as_me:6755: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:6756: result: $cf_cv_enable_rpath" >&5
 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
 
-echo "$as_me:6758: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:6759: 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.
@@ -6765,7 +6766,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
-echo "$as_me:6768: result: $cf_cv_do_relink" >&5
+echo "$as_me:6769: result: $cf_cv_do_relink" >&5
 echo "${ECHO_T}$cf_cv_do_relink" >&6
 	;;
 esac
@@ -6776,7 +6777,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:6779: checking for an rpath option" >&5
+	echo "$as_me:6780: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -6807,12 +6808,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:6810: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:6811: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:6815: checking if we need a space after rpath option" >&5
+		echo "$as_me:6816: 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"
 
@@ -6833,7 +6834,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6836 "configure"
+#line 6837 "configure"
 #include "confdefs.h"
 
 int
@@ -6845,16 +6846,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6851: \$? = $ac_status" >&5
+  echo "$as_me:6852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6857: \$? = $ac_status" >&5
+  echo "$as_me:6858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -6864,7 +6865,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:6867: result: $cf_rpath_space" >&5
+		echo "$as_me:6868: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -6886,7 +6887,7 @@ fi
 	cf_ld_rpath_opt=
 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
-	echo "$as_me:6889: checking whether to use release or ABI version in shared library file names" >&5
+	echo "$as_me:6890: checking whether to use release or ABI version in shared library file names" >&5
 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
@@ -6901,9 +6902,9 @@ if test "${with_shlib_version+set}" = set; then
 		cf_cv_shlib_version=$withval
 		;;
 	(*)
-		echo "$as_me:6904: result: $withval" >&5
+		echo "$as_me:6905: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-		{ { echo "$as_me:6906: error: option value must be one of: rel, abi, or auto" >&5
+		{ { echo "$as_me:6907: 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; }; }
 		;;
@@ -6912,7 +6913,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
-	echo "$as_me:6915: result: $cf_cv_shlib_version" >&5
+	echo "$as_me:6916: result: $cf_cv_shlib_version" >&5
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	cf_cv_rm_so_locs=no
@@ -6935,14 +6936,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
 	if test "$cf_try_fPIC" = yes
 	then
-		echo "$as_me:6938: checking which $CC option to use" >&5
+		echo "$as_me:6939: 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 6945 "configure"
+#line 6946 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6954,16 +6955,16 @@ int x = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6957: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6960: \$? = $ac_status" >&5
+  echo "$as_me:6961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6966: \$? = $ac_status" >&5
+  echo "$as_me:6967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -6972,7 +6973,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		done
-		echo "$as_me:6975: result: $CC_SHARED_OPTS" >&5
+		echo "$as_me:6976: result: $CC_SHARED_OPTS" >&5
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 		CFLAGS="$cf_save_CFLAGS"
 	fi
@@ -7043,7 +7044,7 @@ CF_EOF
 		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:7046: checking if ld -search_paths_first works" >&5
+		echo "$as_me:7047: 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
@@ -7052,7 +7053,7 @@ else
 			cf_save_LDFLAGS=$LDFLAGS
 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7055 "configure"
+#line 7056 "configure"
 #include "confdefs.h"
 
 int
@@ -7064,16 +7065,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7070: \$? = $ac_status" >&5
+  echo "$as_me:7071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7076: \$? = $ac_status" >&5
+  echo "$as_me:7077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
@@ -7084,7 +7085,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 				LDFLAGS=$cf_save_LDFLAGS
 fi
-echo "$as_me:7087: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:7088: 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"
@@ -7434,7 +7435,7 @@ CF_EOF
 			do
 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 7437 "configure"
+#line 7438 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7446,16 +7447,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7452: \$? = $ac_status" >&5
+  echo "$as_me:7453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7458: \$? = $ac_status" >&5
+  echo "$as_me:7459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7492,7 +7493,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
 			;;
 		(*)
-			{ echo "$as_me:7495: WARNING: ignored --with-shlib-version" >&5
+			{ echo "$as_me:7496: WARNING: ignored --with-shlib-version" >&5
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 			;;
 		esac
@@ -7502,7 +7503,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 	if test -n "$cf_try_cflags"
 	then
 cat > conftest.$ac_ext <<EOF
-#line 7505 "${as_me:-configure}"
+#line 7506 "${as_me:-configure}"
 #include <stdio.h>
 int main(int argc, char *argv[])
 {
@@ -7514,18 +7515,18 @@ EOF
 		for cf_opt in $cf_try_cflags
 		do
 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
-			echo "$as_me:7517: checking if CFLAGS option -$cf_opt works" >&5
+			echo "$as_me:7518: 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:7519: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:7520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7522: \$? = $ac_status" >&5
+  echo "$as_me:7523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-				echo "$as_me:7524: result: yes" >&5
+				echo "$as_me:7525: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cf_save_CFLAGS="$CFLAGS"
 			else
-				echo "$as_me:7528: result: no" >&5
+				echo "$as_me:7529: result: no" >&5
 echo "${ECHO_T}no" >&6
 			fi
 		done
@@ -7540,17 +7541,17 @@ echo "${ECHO_T}no" >&6
 
 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
-echo "${as_me:-configure}:7543: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:7544: 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}:7547: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7548: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 for model in $cf_list_models ; do
 	case "$model" in
 	(libtool)
 
-echo "$as_me:7553: checking for additional libtool options" >&5
+echo "$as_me:7554: 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.
@@ -7560,7 +7561,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7563: result: $with_libtool_opts" >&5
+echo "$as_me:7564: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7571,7 +7572,7 @@ case .$with_libtool_opts in
 	;;
 esac
 
-echo "$as_me:7574: checking if exported-symbols file should be used" >&5
+echo "$as_me:7575: 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.
@@ -7586,7 +7587,7 @@ then
 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
-echo "$as_me:7589: result: $with_export_syms" >&5
+echo "$as_me:7590: result: $with_export_syms" >&5
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
@@ -7597,15 +7598,15 @@ fi
 		;;
 	(shared)
 		if test "$CC_SHARED_OPTS" = "unknown"; then
-			{ { echo "$as_me:7600: error: Shared libraries are not supported in this version" >&5
+			{ { echo "$as_me:7601: 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:7605: checking if current CFLAGS link properly" >&5
+		echo "$as_me:7606: 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 7608 "configure"
+#line 7609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7617,16 +7618,16 @@ printf("Hello work\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7623: \$? = $ac_status" >&5
+  echo "$as_me:7624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7629: \$? = $ac_status" >&5
+  echo "$as_me:7630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cflags_work=yes
 else
@@ -7635,18 +7636,21 @@ cat "conftest.$ac_ext" >&5
 cf_cflags_work=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:7638: result: $cf_cflags_work" >&5
+		echo "$as_me:7639: 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}:7644: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:7645: testing try to work around by appending shared-options ..." 1>&5
 
 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
 		fi
 
-echo "$as_me:7649: checking if versioned-symbols file should be used" >&5
+if test "$with_libtool" = "yes" ; then
+	:
+elif test "$with_shared" = "yes" ; then
+echo "$as_me:7653: 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.
@@ -7664,18 +7668,18 @@ case "x$with_versioned_syms" in
 (xno)
 	;;
 (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
-	test -f "$with_versioned_syms" || { { echo "$as_me:7667: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7671: 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:7672: error: expected a filename: $with_versioned_syms" >&5
+	test -f "$with_versioned_syms" || { { echo "$as_me:7676: 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:7678: result: $with_versioned_syms" >&5
+echo "$as_me:7682: result: $with_versioned_syms" >&5
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
@@ -7691,7 +7695,7 @@ then
 		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}:7694: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7698: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*-dy\ *)
@@ -7699,11 +7703,11 @@ echo "${as_me:-configure}:7694: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 		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}:7702: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7706: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
 		;;
 	(*)
-		{ echo "$as_me:7706: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7710: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7715,7 +7719,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7718: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7722: 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
 
@@ -7752,7 +7756,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7755 "configure"
+#line 7759 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7783,10 +7787,12 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7786: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7790: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
+fi
+
 fi
 
 		;;
@@ -7796,7 +7802,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7799: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7805: 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.
@@ -7806,27 +7812,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7809: result: $with_gpm" >&5
+echo "$as_me:7815: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7813: checking for gpm.h" >&5
+	echo "$as_me:7819: 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 7819 "configure"
+#line 7825 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7823: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7829: \$? = $ac_status" >&5
+  echo "$as_me:7835: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7845,7 +7851,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7848: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7854: 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
 
@@ -7856,7 +7862,7 @@ EOF
 		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}:7859: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7865: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7864,7 +7870,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7867: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7873: 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
@@ -7872,7 +7878,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7875 "configure"
+#line 7881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7891,16 +7897,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7897: \$? = $ac_status" >&5
+  echo "$as_me:7903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7903: \$? = $ac_status" >&5
+  echo "$as_me:7909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7911,18 +7917,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7914: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7920: 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:7921: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7927: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7925: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7931: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7933,7 +7939,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7936: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7942: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7942,7 +7948,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7945: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7951: 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.
@@ -7952,18 +7958,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7955: result: $with_dlsym" >&5
+	echo "$as_me:7961: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7960: checking for dlsym" >&5
+echo "$as_me:7966: 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 7966 "configure"
+#line 7972 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -7994,16 +8000,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8000: \$? = $ac_status" >&5
+  echo "$as_me:8006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8006: \$? = $ac_status" >&5
+  echo "$as_me:8012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -8013,14 +8019,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8016: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:8022: 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:8023: checking for dlsym in -ldl" >&5
+echo "$as_me:8029: 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
@@ -8028,7 +8034,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8031 "configure"
+#line 8037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8047,16 +8053,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8053: \$? = $ac_status" >&5
+  echo "$as_me:8059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8059: \$? = $ac_status" >&5
+  echo "$as_me:8065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8067,7 +8073,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8070: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8076: 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
 
@@ -8096,10 +8102,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8099: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8105: 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 8102 "configure"
+#line 8108 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -8120,16 +8126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8126: \$? = $ac_status" >&5
+  echo "$as_me:8132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8132: \$? = $ac_status" >&5
+  echo "$as_me:8138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8140,15 +8146,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8143: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8149: 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:8148: result: ok" >&5
+	echo "$as_me:8154: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8151: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8157: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8156,12 +8162,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8159: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8165: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8164: checking for soname of gpm library" >&5
+echo "$as_me:8170: 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
@@ -8195,15 +8201,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8198: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8201: \$? = $ac_status" >&5
+  echo "$as_me:8207: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8203: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8206: \$? = $ac_status" >&5
+  echo "$as_me:8212: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8214,7 +8220,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8217: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8223: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8282,7 +8288,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8285: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8291: 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
@@ -8290,7 +8296,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8293 "configure"
+#line 8299 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8309,16 +8315,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8315: \$? = $ac_status" >&5
+  echo "$as_me:8321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8321: \$? = $ac_status" >&5
+  echo "$as_me:8327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8329,11 +8335,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8332: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8338: 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:8336: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8342: 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
@@ -8357,15 +8363,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8363: \$? = $ac_status" >&5
+  echo "$as_me:8369: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8365: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8368: \$? = $ac_status" >&5
+  echo "$as_me:8374: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8377,11 +8383,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8380: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8386: 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:8384: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8390: 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
 
@@ -8389,7 +8395,7 @@ fi
 
 fi
 
-echo "$as_me:8392: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8398: 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.
@@ -8398,7 +8404,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8401: result: $with_pcre2" >&5
+echo "$as_me:8407: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8409,17 +8415,31 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8412: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8418: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8418: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8424: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8422: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8428: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in $cf_with_pcre2
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -8543,7 +8563,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8546: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8566: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8556,7 +8576,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8559: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8579: 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
@@ -8564,7 +8584,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8567 "configure"
+#line 8587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8583,16 +8603,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8589: \$? = $ac_status" >&5
+  echo "$as_me:8609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8595: \$? = $ac_status" >&5
+  echo "$as_me:8615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8603,7 +8623,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8606: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8626: 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
 
@@ -8624,7 +8644,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8627: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8647: 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
@@ -8632,7 +8652,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8635 "configure"
+#line 8655 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8651,16 +8671,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8657: \$? = $ac_status" >&5
+  echo "$as_me:8677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8663: \$? = $ac_status" >&5
+  echo "$as_me:8683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8671,7 +8691,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8674: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8694: 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
 
@@ -8692,7 +8712,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8695: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8715: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8707,23 +8727,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8710: checking for $ac_header" >&5
+echo "$as_me:8730: 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 8716 "configure"
+#line 8736 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8720: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8726: \$? = $ac_status" >&5
+  echo "$as_me:8746: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8742,7 +8762,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8745: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8765: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8755,13 +8775,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8758: checking for $ac_func" >&5
+echo "$as_me:8778: 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 8764 "configure"
+#line 8784 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8792,16 +8812,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8798: \$? = $ac_status" >&5
+  echo "$as_me:8818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8804: \$? = $ac_status" >&5
+  echo "$as_me:8824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8811,7 +8831,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8814: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8834: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8825,7 +8845,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8828: checking if you want to use sysmouse" >&5
+echo "$as_me:8848: 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.
@@ -8837,7 +8857,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8840 "configure"
+#line 8860 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8860,16 +8880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8866: \$? = $ac_status" >&5
+  echo "$as_me:8886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8872: \$? = $ac_status" >&5
+  echo "$as_me:8892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8879,7 +8899,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8882: result: $cf_with_sysmouse" >&5
+echo "$as_me:8902: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8889,7 +8909,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8892: checking if you want to disable library suffixes" >&5
+echo "$as_me:8912: 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.
@@ -8906,13 +8926,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8909: result: $disable_lib_suffixes" >&5
+echo "$as_me:8929: 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:8915: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8935: 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.
@@ -8930,22 +8950,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8933: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8953: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8938: checking for updated LDFLAGS" >&5
+echo "$as_me:8958: 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:8941: result: maybe" >&5
+	echo "$as_me:8961: 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:8948: checking for $ac_word" >&5
+echo "$as_me:8968: 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
@@ -8960,7 +8980,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8963: found $ac_dir/$ac_word" >&5
+echo "$as_me:8983: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8968,10 +8988,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8971: result: $cf_ldd_prog" >&5
+  echo "$as_me:8991: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8974: result: no" >&5
+  echo "$as_me:8994: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8985,7 +9005,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8988 "configure"
+#line 9008 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8997,16 +9017,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9003: \$? = $ac_status" >&5
+  echo "$as_me:9023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9009: \$? = $ac_status" >&5
+  echo "$as_me:9029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -9034,7 +9054,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:9037: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9057: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9046,11 +9066,11 @@ echo "${as_me:-configure}:9037: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9049: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9069: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9053: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9073: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9087,7 +9107,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9090: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9110: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9100,11 +9120,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9103: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9123: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9107: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9127: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9141,7 +9161,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9144: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9164: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9154,14 +9174,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9157: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9177: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9161: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9164: result: no" >&5
+	echo "$as_me:9184: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9175,7 +9195,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9178: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9198: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9192,7 +9212,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9195: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9215: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9200,7 +9220,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9203: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9223: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9219,11 +9239,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9222: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9242: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9226: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9246: 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.
@@ -9233,10 +9253,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9236: result: $with_overwrite" >&5
+echo "$as_me:9256: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9239: checking if external terminfo-database is used" >&5
+echo "$as_me:9259: 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.
@@ -9246,7 +9266,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9249: result: $use_database" >&5
+echo "$as_me:9269: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9262,7 +9282,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9265: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9285: 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.
@@ -9270,10 +9290,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9273: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9293: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9276: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9296: 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.
@@ -9283,13 +9303,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9286: result: $with_hashed_db" >&5
+	echo "$as_me:9306: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9292: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9312: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9299,7 +9319,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9302: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9322: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9307,7 +9327,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9310: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9330: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9323,7 +9343,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9326: checking for $ac_word" >&5
+echo "$as_me:9346: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9338,7 +9358,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9341: found $ac_dir/$ac_word" >&5
+echo "$as_me:9361: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9346,10 +9366,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9349: result: $TIC" >&5
+  echo "$as_me:9369: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9352: result: no" >&5
+  echo "$as_me:9372: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9358,7 +9378,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9361: checking for $ac_word" >&5
+echo "$as_me:9381: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9373,7 +9393,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9376: found $ac_dir/$ac_word" >&5
+echo "$as_me:9396: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9381,10 +9401,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9384: result: $ac_ct_TIC" >&5
+  echo "$as_me:9404: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9387: result: no" >&5
+  echo "$as_me:9407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9396,7 +9416,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9399: checking for $ac_word" >&5
+echo "$as_me:9419: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9411,7 +9431,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9414: found $ac_dir/$ac_word" >&5
+echo "$as_me:9434: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9419,10 +9439,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9422: result: $INFOCMP" >&5
+  echo "$as_me:9442: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9425: result: no" >&5
+  echo "$as_me:9445: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9431,7 +9451,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9434: checking for $ac_word" >&5
+echo "$as_me:9454: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9446,7 +9466,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9449: found $ac_dir/$ac_word" >&5
+echo "$as_me:9469: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9454,10 +9474,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9457: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9477: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9460: result: no" >&5
+  echo "$as_me:9480: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9472,10 +9492,10 @@ 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:9475: checking for tic program for fallbacks" >&5
+  echo "$as_me:9495: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9478: result: $TIC" >&5
+		echo "$as_me:9498: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9501,7 +9521,7 @@ case "x$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9504: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9524: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9514,7 +9534,7 @@ 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:9517: checking for $ac_word" >&5
+echo "$as_me:9537: 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
@@ -9531,7 +9551,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9534: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9554: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9542,10 +9562,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9545: result: $TIC" >&5
+  echo "$as_me:9565: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9548: result: no" >&5
+  echo "$as_me:9568: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9602,7 +9622,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9605: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9625: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9617,7 +9637,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9620: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9640: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9626,10 +9646,10 @@ 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:9629: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9649: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9632: result: $INFOCMP" >&5
+		echo "$as_me:9652: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9655,7 +9675,7 @@ case "x$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9658: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9678: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9668,7 +9688,7 @@ 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:9671: checking for $ac_word" >&5
+echo "$as_me:9691: 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
@@ -9685,7 +9705,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9688: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9708: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9696,10 +9716,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9699: result: $INFOCMP" >&5
+  echo "$as_me:9719: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9702: result: no" >&5
+  echo "$as_me:9722: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9756,7 +9776,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9759: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9779: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9771,7 +9791,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9774: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9794: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9781,7 +9801,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9784: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9804: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9789,7 +9809,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9792: checking if you want modern xterm or antique" >&5
+echo "$as_me:9812: 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.
@@ -9803,12 +9823,12 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9806: result: $with_xterm_new" >&5
+echo "$as_me:9826: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
 case $host_os in
-(*linux-gnu|*cygwin|*mingw32|*msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl)
 	want_xterm_kbs=DEL
 	;;
 (*)
@@ -9816,7 +9836,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9819: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9839: 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.
@@ -9840,13 +9860,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9843: result: $with_xterm_kbs" >&5
+echo "$as_me:9863: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9849: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9869: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9856,7 +9876,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9859: checking for list of terminfo directories" >&5
+echo "$as_me:9879: 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.
@@ -9894,7 +9914,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9897: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9917: 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; }; }
 	;;
@@ -9917,7 +9937,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9920: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9940: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9926,13 +9946,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9929: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9949: 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:9935: checking for default terminfo directory" >&5
+echo "$as_me:9955: 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.
@@ -9966,7 +9986,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9969: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9989: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9975,7 +9995,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9978: result: $TERMINFO" >&5
+echo "$as_me:9998: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -9986,7 +10006,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:9989: checking if big-core option selected" >&5
+echo "$as_me:10009: 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.
@@ -9998,7 +10018,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10001 "configure"
+#line 10021 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10012,15 +10032,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10018: \$? = $ac_status" >&5
+  echo "$as_me:10038: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10023: \$? = $ac_status" >&5
+  echo "$as_me:10043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -10032,7 +10052,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10035: result: $with_big_core" >&5
+echo "$as_me:10055: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10042,7 +10062,7 @@ EOF
 ### 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:10045: checking if big-strings option selected" >&5
+echo "$as_me:10065: 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.
@@ -10066,14 +10086,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10069: result: $with_big_strings" >&5
+echo "$as_me:10089: 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:10076: checking if you want termcap-fallback support" >&5
+echo "$as_me:10096: 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.
@@ -10083,14 +10103,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10086: result: $with_termcap" >&5
+echo "$as_me:10106: 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:10093: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10113: 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
@@ -10103,13 +10123,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10106: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10126: 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:10112: checking for list of termcap files" >&5
+	echo "$as_me:10132: 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.
@@ -10147,7 +10167,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10150: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10170: 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; }; }
 	;;
@@ -10170,7 +10190,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10173: result: $TERMPATH" >&5
+	echo "$as_me:10193: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10178,7 +10198,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10181: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10201: 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.
@@ -10188,14 +10208,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10191: result: $with_getcap" >&5
+	echo "$as_me:10211: 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:10198: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10218: 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.
@@ -10205,7 +10225,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10208: result: $with_getcap_cache" >&5
+	echo "$as_me:10228: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10215,7 +10235,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10218: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10238: 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.
@@ -10225,14 +10245,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10228: result: $with_home_terminfo" >&5
+echo "$as_me:10248: 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:10235: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10255: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10242,14 +10262,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10245: result: $with_root_environ" >&5
+echo "$as_me:10265: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10252: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10272: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10259,14 +10279,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10262: result: $with_root_access" >&5
+echo "$as_me:10282: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10269: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10289: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10276,7 +10296,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10279: result: $with_setuid_environ" >&5
+echo "$as_me:10299: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10291,23 +10311,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10294: checking for $ac_header" >&5
+echo "$as_me:10314: 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 10300 "configure"
+#line 10320 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10304: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10324: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10310: \$? = $ac_status" >&5
+  echo "$as_me:10330: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10326,7 +10346,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10329: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10341,13 +10361,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10344: checking for $ac_func" >&5
+echo "$as_me:10364: 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 10350 "configure"
+#line 10370 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10378,16 +10398,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10384: \$? = $ac_status" >&5
+  echo "$as_me:10404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10390: \$? = $ac_status" >&5
+  echo "$as_me:10410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10397,7 +10417,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10400: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10420: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10414,13 +10434,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10417: checking for $ac_func" >&5
+echo "$as_me:10437: 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 10423 "configure"
+#line 10443 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10451,16 +10471,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10454: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10457: \$? = $ac_status" >&5
+  echo "$as_me:10477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10463: \$? = $ac_status" >&5
+  echo "$as_me:10483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10470,7 +10490,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10473: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10493: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10481,7 +10501,7 @@ fi
 done
 
 else
-	echo "$as_me:10484: checking if link/symlink functions work" >&5
+	echo "$as_me:10504: 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
@@ -10494,7 +10514,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10497 "configure"
+#line 10517 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10528,15 +10548,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10534: \$? = $ac_status" >&5
+  echo "$as_me:10554: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10539: \$? = $ac_status" >&5
+  echo "$as_me:10559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10554,7 +10574,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10557: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10577: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10574,7 +10594,7 @@ with_symlinks=no
 # 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:10577: checking if tic should use symbolic links" >&5
+	echo "$as_me:10597: 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.
@@ -10584,21 +10604,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10587: result: $with_symlinks" >&5
+	echo "$as_me:10607: 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:10594: checking if tic should use hard links" >&5
+	echo "$as_me:10614: 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:10601: result: $with_links" >&5
+	echo "$as_me:10621: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10614,7 +10634,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10617: checking if you want broken-linker support code" >&5
+echo "$as_me:10637: 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.
@@ -10624,7 +10644,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10627: result: $with_broken_linker" >&5
+echo "$as_me:10647: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10638,7 +10658,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10641: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10661: 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.
@@ -10648,7 +10668,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10651: result: $with_bsdpad" >&5
+echo "$as_me:10671: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10667,14 +10687,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10670: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10690: 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 10677 "configure"
+#line 10697 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10693,16 +10713,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10699: \$? = $ac_status" >&5
+  echo "$as_me:10719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10705: \$? = $ac_status" >&5
+  echo "$as_me:10725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10713,7 +10733,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10716: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10736: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10755,14 +10775,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10758: checking if this is the GNU C library" >&5
+echo "$as_me:10778: 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 10765 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10781,16 +10801,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10787: \$? = $ac_status" >&5
+  echo "$as_me:10807: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10793: \$? = $ac_status" >&5
+  echo "$as_me:10813: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10801,7 +10821,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10804: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10824: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10809,7 +10829,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10812: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10832: 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
@@ -10821,7 +10841,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10824 "configure"
+#line 10844 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10840,16 +10860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10846: \$? = $ac_status" >&5
+  echo "$as_me:10866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10852: \$? = $ac_status" >&5
+  echo "$as_me:10872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10861,12 +10881,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10864: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10884: 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:10869: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10889: 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
@@ -10971,7 +10991,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10974 "configure"
+#line 10994 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10991,16 +11011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10997: \$? = $ac_status" >&5
+  echo "$as_me:11017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11003: \$? = $ac_status" >&5
+  echo "$as_me:11023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11011,7 +11031,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11014: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11034: 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
@@ -11020,14 +11040,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11023: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11043: 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 11030 "configure"
+#line 11050 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11042,16 +11062,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11048: \$? = $ac_status" >&5
+  echo "$as_me:11068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11054: \$? = $ac_status" >&5
+  echo "$as_me:11074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11158,7 +11178,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11161 "configure"
+#line 11181 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11173,16 +11193,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11179: \$? = $ac_status" >&5
+  echo "$as_me:11199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11185: \$? = $ac_status" >&5
+  echo "$as_me:11205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11197,12 +11217,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11200: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11220: 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:11205: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11225: 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
@@ -11212,7 +11232,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11215 "configure"
+#line 11235 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11227,16 +11247,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11233: \$? = $ac_status" >&5
+  echo "$as_me:11253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11239: \$? = $ac_status" >&5
+  echo "$as_me:11259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11247,7 +11267,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11250: result: $cf_cv_default_source" >&5
+echo "$as_me:11270: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11287,16 +11307,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11290: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11310: 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}:11296: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11316: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11299 "configure"
+#line 11319 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11311,16 +11331,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11314: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11317: \$? = $ac_status" >&5
+  echo "$as_me:11337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11323: \$? = $ac_status" >&5
+  echo "$as_me:11343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11341,7 +11361,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11344 "configure"
+#line 11364 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11356,16 +11376,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11362: \$? = $ac_status" >&5
+  echo "$as_me:11382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11368: \$? = $ac_status" >&5
+  echo "$as_me:11388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11376,7 +11396,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11379: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11399: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11384,10 +11404,10 @@ echo "${as_me:-configure}:11379: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11387: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11407: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11390 "configure"
+#line 11410 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11402,16 +11422,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11408: \$? = $ac_status" >&5
+  echo "$as_me:11428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11414: \$? = $ac_status" >&5
+  echo "$as_me:11434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11427,7 +11447,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11430: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11450: 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
@@ -11544,7 +11564,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11547: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11567: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11576,14 +11596,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11579: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11599: 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 11586 "configure"
+#line 11606 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11601,16 +11621,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11622,7 +11642,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11625 "configure"
+#line 11645 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11640,16 +11660,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11646: \$? = $ac_status" >&5
+  echo "$as_me:11666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11652: \$? = $ac_status" >&5
+  echo "$as_me:11672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11664,7 +11684,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11667: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11687: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11824,16 +11844,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11827: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11847: 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}:11833: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11853: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11836 "configure"
+#line 11856 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11848,16 +11868,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11854: \$? = $ac_status" >&5
+  echo "$as_me:11874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11860: \$? = $ac_status" >&5
+  echo "$as_me:11880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11878,7 +11898,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11881 "configure"
+#line 11901 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11893,16 +11913,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11899: \$? = $ac_status" >&5
+  echo "$as_me:11919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11905: \$? = $ac_status" >&5
+  echo "$as_me:11925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11913,7 +11933,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11916: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11936: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11921,10 +11941,10 @@ echo "${as_me:-configure}:11916: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11924: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11944: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11927 "configure"
+#line 11947 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11939,16 +11959,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11945: \$? = $ac_status" >&5
+  echo "$as_me:11965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11951: \$? = $ac_status" >&5
+  echo "$as_me:11971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11964,7 +11984,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11967: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11987: 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
@@ -12077,10 +12097,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12080: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12100: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12083 "configure"
+#line 12103 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12098,23 +12118,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12110: \$? = $ac_status" >&5
+  echo "$as_me:12130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12117: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12137: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12137,7 +12157,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12140: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12160: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12149,7 +12169,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12152: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12172: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12237,7 +12257,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12240: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12260: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12247,7 +12267,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12250: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12270: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12257,7 +12277,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12260: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12280: 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"
@@ -12269,10 +12289,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12272: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12292: 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 12275 "configure"
+#line 12295 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12287,16 +12307,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12305,12 +12325,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12308: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12328: 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 12313 "configure"
+#line 12333 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12325,16 +12345,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12331: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12337: \$? = $ac_status" >&5
+  echo "$as_me:12357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12345,19 +12365,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12348: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12368: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12353: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12373: 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 12360 "configure"
+#line 12380 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12375,16 +12395,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12381: \$? = $ac_status" >&5
+  echo "$as_me:12401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12387: \$? = $ac_status" >&5
+  echo "$as_me:12407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12396,7 +12416,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12399 "configure"
+#line 12419 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12414,16 +12434,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12426: \$? = $ac_status" >&5
+  echo "$as_me:12446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12438,7 +12458,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12441: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12461: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12589,14 +12609,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12592: checking if SIGWINCH is defined" >&5
+echo "$as_me:12612: 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 12599 "configure"
+#line 12619 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12611,23 +12631,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
+  echo "$as_me:12637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12643: \$? = $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 12630 "configure"
+#line 12650 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12645,16 +12665,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12651: \$? = $ac_status" >&5
+  echo "$as_me:12671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12657: \$? = $ac_status" >&5
+  echo "$as_me:12677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12668,11 +12688,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12671: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12691: 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:12675: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12695: 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
@@ -12683,7 +12703,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12686 "configure"
+#line 12706 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12705,16 +12725,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12711: \$? = $ac_status" >&5
+  echo "$as_me:12731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12717: \$? = $ac_status" >&5
+  echo "$as_me:12737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12728,7 +12748,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12731: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12751: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12738,13 +12758,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12741: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12761: 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 12747 "configure"
+#line 12767 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12758,16 +12778,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12764: \$? = $ac_status" >&5
+  echo "$as_me:12784: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12770: \$? = $ac_status" >&5
+  echo "$as_me:12790: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12778,7 +12798,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12781: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12801: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12792,7 +12812,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12795: checking if you want wide-character code" >&5
+echo "$as_me:12815: 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.
@@ -12802,7 +12822,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12805: result: $with_widec" >&5
+echo "$as_me:12825: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12824,7 +12844,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12827: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12847: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12837,23 +12857,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12840: checking for $ac_header" >&5
+echo "$as_me:12860: 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 12846 "configure"
+#line 12866 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12850: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12870: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12856: \$? = $ac_status" >&5
+  echo "$as_me:12876: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12872,7 +12892,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12875: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12895: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12882,14 +12902,14 @@ EOF
 fi
 done
 
-echo "$as_me:12885: checking if wchar.h can be used as is" >&5
+echo "$as_me:12905: 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 12892 "configure"
+#line 12912 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12911,16 +12931,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12917: \$? = $ac_status" >&5
+  echo "$as_me:12937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12923: \$? = $ac_status" >&5
+  echo "$as_me:12943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12930,16 +12950,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12933: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12953: 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:12939: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12959: 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 12942 "configure"
+#line 12962 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12955,16 +12975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12961: \$? = $ac_status" >&5
+  echo "$as_me:12981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12967: \$? = $ac_status" >&5
+  echo "$as_me:12987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12973,16 +12993,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12976: result: $cf_result" >&5
+echo "$as_me:12996: 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:12982: checking checking for compatible value versus " >&5
+	echo "$as_me:13002: 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 12985 "configure"
+#line 13005 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12998,16 +13018,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13004: \$? = $ac_status" >&5
+  echo "$as_me:13024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13010: \$? = $ac_status" >&5
+  echo "$as_me:13030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -13016,7 +13036,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13019: result: $cf_result" >&5
+	echo "$as_me:13039: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -13026,7 +13046,7 @@ fi
 
 fi
 
-echo "$as_me:13029: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13049: 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
@@ -13097,7 +13117,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13100 "configure"
+#line 13120 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13142,15 +13162,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13148: \$? = $ac_status" >&5
+  echo "$as_me:13168: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13163,7 +13183,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13166: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13186: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13174,13 +13194,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13177: checking for $ac_func" >&5
+echo "$as_me:13197: 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 13183 "configure"
+#line 13203 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13211,16 +13231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13217: \$? = $ac_status" >&5
+  echo "$as_me:13237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13223: \$? = $ac_status" >&5
+  echo "$as_me:13243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13230,7 +13250,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13233: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13253: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13245,23 +13265,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13248: checking for $ac_header" >&5
+echo "$as_me:13268: 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 13254 "configure"
+#line 13274 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13258: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13278: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13264: \$? = $ac_status" >&5
+  echo "$as_me:13284: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13280,7 +13300,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13283: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13303: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13290,7 +13310,7 @@ EOF
 fi
 done
 
-echo "$as_me:13293: checking for multibyte character support" >&5
+echo "$as_me:13313: 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
@@ -13298,7 +13318,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13301 "configure"
+#line 13321 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13315,16 +13335,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13321: \$? = $ac_status" >&5
+  echo "$as_me:13341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13327: \$? = $ac_status" >&5
+  echo "$as_me:13347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13336,12 +13356,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13339: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13359: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13344 "configure"
+#line 13364 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13354,16 +13374,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13360: \$? = $ac_status" >&5
+  echo "$as_me:13380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13366: \$? = $ac_status" >&5
+  echo "$as_me:13386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13377,7 +13397,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13380 "configure"
+#line 13400 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13390,16 +13410,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13396: \$? = $ac_status" >&5
+  echo "$as_me:13416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13402: \$? = $ac_status" >&5
+  echo "$as_me:13422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13416,9 +13436,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13419: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13439: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13421: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13441: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13509,7 +13529,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13512: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13532: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13517,7 +13537,7 @@ echo "${as_me:-configure}:13512: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13520 "configure"
+#line 13540 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13530,21 +13550,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13536: \$? = $ac_status" >&5
+  echo "$as_me:13556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13542: \$? = $ac_status" >&5
+  echo "$as_me:13562: \$? = $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}:13547: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13567: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13562,7 +13582,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13565: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13585: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13637,13 +13657,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13640: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13660: 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 13646 "configure"
+#line 13666 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13656,21 +13676,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13662: \$? = $ac_status" >&5
+  echo "$as_me:13682: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13668: \$? = $ac_status" >&5
+  echo "$as_me:13688: \$? = $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}:13673: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13693: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13712,7 +13732,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13715: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13735: 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
@@ -13750,7 +13770,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13753 "configure"
+#line 13773 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13762,16 +13782,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13768: \$? = $ac_status" >&5
+  echo "$as_me:13788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13774: \$? = $ac_status" >&5
+  echo "$as_me:13794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13788,7 +13808,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13791: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13811: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13824,7 +13844,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13827: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13847: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13856,14 +13876,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13859: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13879: 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 13866 "configure"
+#line 13886 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13881,23 +13901,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13887: \$? = $ac_status" >&5
+  echo "$as_me:13907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13893: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $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 13900 "configure"
+#line 13920 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13916,16 +13936,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13922: \$? = $ac_status" >&5
+  echo "$as_me:13942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13928: \$? = $ac_status" >&5
+  echo "$as_me:13948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13937,7 +13957,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13940: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13960: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13955,14 +13975,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13958: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13978: 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 13965 "configure"
+#line 13985 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13980,23 +14000,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13986: \$? = $ac_status" >&5
+  echo "$as_me:14006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13992: \$? = $ac_status" >&5
+  echo "$as_me:14012: \$? = $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 13999 "configure"
+#line 14019 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14015,16 +14035,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:14041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14027: \$? = $ac_status" >&5
+  echo "$as_me:14047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14036,7 +14056,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14039: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14059: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14059,14 +14079,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14062: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14082: 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 14069 "configure"
+#line 14089 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14084,23 +14104,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14090: \$? = $ac_status" >&5
+  echo "$as_me:14110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14096: \$? = $ac_status" >&5
+  echo "$as_me:14116: \$? = $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 14103 "configure"
+#line 14123 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14119,16 +14139,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14131: \$? = $ac_status" >&5
+  echo "$as_me:14151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14140,7 +14160,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14143: result: $cf_cv_wint_t" >&5
+echo "$as_me:14163: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14172,7 +14192,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14175: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14195: 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.
@@ -14182,7 +14202,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14185: result: $with_lp64" >&5
+echo "$as_me:14205: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14198,7 +14218,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14201: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14221: 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
@@ -14210,7 +14230,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14213 "configure"
+#line 14233 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14230,16 +14250,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14236: \$? = $ac_status" >&5
+  echo "$as_me:14256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14242: \$? = $ac_status" >&5
+  echo "$as_me:14262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14249,16 +14269,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14255: \$? = $ac_status" >&5
+  echo "$as_me:14275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14261: \$? = $ac_status" >&5
+  echo "$as_me:14281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14272,13 +14292,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14275: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14295: 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:14281: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14301: 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
@@ -14286,7 +14306,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14289 "configure"
+#line 14309 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14306,16 +14326,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14312: \$? = $ac_status" >&5
+  echo "$as_me:14332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14318: \$? = $ac_status" >&5
+  echo "$as_me:14338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14324,7 +14344,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14327 "configure"
+#line 14347 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14345,16 +14365,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14351: \$? = $ac_status" >&5
+  echo "$as_me:14371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14357: \$? = $ac_status" >&5
+  echo "$as_me:14377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14365,7 +14385,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14368: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14388: 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
 
@@ -14375,7 +14395,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14378: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14398: 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
@@ -14383,7 +14403,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14386 "configure"
+#line 14406 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14403,16 +14423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14409: \$? = $ac_status" >&5
+  echo "$as_me:14429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14415: \$? = $ac_status" >&5
+  echo "$as_me:14435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14421,7 +14441,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14424 "configure"
+#line 14444 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14442,16 +14462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14448: \$? = $ac_status" >&5
+  echo "$as_me:14468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14454: \$? = $ac_status" >&5
+  echo "$as_me:14474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14462,7 +14482,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14465: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14485: 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
 
@@ -14475,7 +14495,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14478: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14498: 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
@@ -14483,7 +14503,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14486 "configure"
+#line 14506 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14498,16 +14518,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14504: \$? = $ac_status" >&5
+  echo "$as_me:14524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14510: \$? = $ac_status" >&5
+  echo "$as_me:14530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14516,7 +14536,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14519 "configure"
+#line 14539 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14532,16 +14552,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14538: \$? = $ac_status" >&5
+  echo "$as_me:14558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14544: \$? = $ac_status" >&5
+  echo "$as_me:14564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14552,7 +14572,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14555: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14575: 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
 
@@ -14566,13 +14586,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14569: checking for fseeko" >&5
+echo "$as_me:14589: 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 14575 "configure"
+#line 14595 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14586,16 +14606,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14592: \$? = $ac_status" >&5
+  echo "$as_me:14612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14598: \$? = $ac_status" >&5
+  echo "$as_me:14618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14605,7 +14625,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14628: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14644,14 +14664,14 @@ fi
 
 	fi
 
-	echo "$as_me:14647: checking whether to use struct dirent64" >&5
+	echo "$as_me:14667: 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 14654 "configure"
+#line 14674 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14678,16 +14698,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14684: \$? = $ac_status" >&5
+  echo "$as_me:14704: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14690: \$? = $ac_status" >&5
+  echo "$as_me:14710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14698,7 +14718,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14701: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14721: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14708,7 +14728,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14711: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14731: 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.
@@ -14718,14 +14738,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14721: result: $with_tparm_varargs" >&5
+echo "$as_me:14741: 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:14728: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14748: 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.
@@ -14735,14 +14755,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14738: result: $with_tic_depends" >&5
+echo "$as_me:14758: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14745: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14765: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14754,15 +14774,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14757: result: no" >&5
+	echo "$as_me:14777: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14761: result: yes" >&5
+	echo "$as_me:14781: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14765: checking for X11 rgb file" >&5
+echo "$as_me:14785: 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.
@@ -14824,7 +14844,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14827: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14847: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14832,7 +14852,7 @@ esac
 
 fi
 
-echo "$as_me:14835: result: $RGB_PATH" >&5
+echo "$as_me:14855: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14847,7 +14867,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14850: checking for type of bool" >&5
+echo "$as_me:14870: 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.
@@ -14857,17 +14877,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14860: result: $NCURSES_BOOL" >&5
+echo "$as_me:14880: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14864: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14884: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14870: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14890: 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.
@@ -14879,16 +14899,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14882: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14902: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14886: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14906: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14891: checking for type of chtype" >&5
+echo "$as_me:14911: 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.
@@ -14898,11 +14918,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14901: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14921: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14905: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14925: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14910,7 +14930,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14913: checking for type of ospeed" >&5
+echo "$as_me:14933: 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.
@@ -14920,11 +14940,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14923: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14943: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14927: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14947: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14932,7 +14952,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14935: checking for type of mmask-t" >&5
+echo "$as_me:14955: 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.
@@ -14942,18 +14962,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14945: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14965: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14949: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14969: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14956: checking for size CCHARW_MAX" >&5
+echo "$as_me:14976: 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.
@@ -14963,16 +14983,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14966: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14986: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14969: checking for signed char" >&5
+echo "$as_me:14989: 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 14975 "configure"
+#line 14995 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14987,16 +15007,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14993: \$? = $ac_status" >&5
+  echo "$as_me:15013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14999: \$? = $ac_status" >&5
+  echo "$as_me:15019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -15006,10 +15026,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15009: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15029: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:15012: checking size of signed char" >&5
+echo "$as_me:15032: 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
@@ -15018,7 +15038,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15021 "configure"
+#line 15041 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15030,21 +15050,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15036: \$? = $ac_status" >&5
+  echo "$as_me:15056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15042: \$? = $ac_status" >&5
+  echo "$as_me:15062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15047 "configure"
+#line 15067 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15056,16 +15076,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15062: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15068: \$? = $ac_status" >&5
+  echo "$as_me:15088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15081,7 +15101,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15084 "configure"
+#line 15104 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15093,16 +15113,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15099: \$? = $ac_status" >&5
+  echo "$as_me:15119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15105: \$? = $ac_status" >&5
+  echo "$as_me:15125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15118,7 +15138,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15121 "configure"
+#line 15141 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15130,16 +15150,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15136: \$? = $ac_status" >&5
+  echo "$as_me:15156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15142: \$? = $ac_status" >&5
+  echo "$as_me:15162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15152,12 +15172,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15155: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15175: 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 15160 "configure"
+#line 15180 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15173,15 +15193,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15179: \$? = $ac_status" >&5
+  echo "$as_me:15199: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15184: \$? = $ac_status" >&5
+  echo "$as_me:15204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15197,7 +15217,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15200: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15220: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15208,7 +15228,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15211: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15231: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15218,13 +15238,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15221: result: $with_signed_char" >&5
+echo "$as_me:15241: 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:15227: checking for type of tparm-arg" >&5
+echo "$as_me:15247: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15234,18 +15254,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15237: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15257: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15241: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15261: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15248: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15268: 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.
@@ -15255,7 +15275,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15258: result: $with_rcs_ids" >&5
+echo "$as_me:15278: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15264,7 +15284,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15267: checking format of man-pages" >&5
+echo "$as_me:15287: 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.
@@ -15355,10 +15375,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15358: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15378: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15361: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15381: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15399,7 +15419,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15402: checking for manpage renaming" >&5
+echo "$as_me:15422: 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.
@@ -15428,15 +15448,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15431: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15451: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15436: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15456: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15439: checking if manpage aliases will be installed" >&5
+echo "$as_me:15459: 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.
@@ -15447,7 +15467,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15450: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15470: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15461,7 +15481,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15464: checking if manpage symlinks should be used" >&5
+echo "$as_me:15484: 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.
@@ -15474,17 +15494,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15477: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15497: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15483: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15503: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15487: checking for manpage tbl" >&5
+echo "$as_me:15507: 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.
@@ -15495,7 +15515,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15498: result: $MANPAGE_TBL" >&5
+echo "$as_me:15518: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15816,7 +15836,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15819: checking if you want to build with function extensions" >&5
+echo "$as_me:15839: 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.
@@ -15826,7 +15846,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15829: result: $with_ext_funcs" >&5
+echo "$as_me:15849: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15883,7 +15903,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15886: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15906: 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.
@@ -15893,7 +15913,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15896: result: $with_sp_funcs" >&5
+echo "$as_me:15916: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15912,7 +15932,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15915: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15935: 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.
@@ -15922,7 +15942,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15925: result: $with_term_driver" >&5
+echo "$as_me:15945: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15931,19 +15951,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15934: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15954: 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:15939: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15959: 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:15946: checking for extended use of const keyword" >&5
+echo "$as_me:15966: 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.
@@ -15953,7 +15973,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15956: result: $with_ext_const" >&5
+echo "$as_me:15976: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15961,7 +15981,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15964: checking if you want to use extended colors" >&5
+echo "$as_me:15984: 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.
@@ -15971,12 +15991,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15974: result: $with_ext_colors" >&5
+echo "$as_me:15994: 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:15979: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:15999: 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)
@@ -15987,7 +16007,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:15990: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16010: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16015,7 +16035,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16018: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16038: 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.
@@ -16025,7 +16045,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16028: result: $with_ext_mouse" >&5
+echo "$as_me:16048: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16035,7 +16055,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16038: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16058: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16052,7 +16072,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16055: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16075: 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.
@@ -16062,7 +16082,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16065: result: $with_ext_putwin" >&5
+echo "$as_me:16085: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16072,7 +16092,7 @@ EOF
 
 fi
 
-echo "$as_me:16075: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16095: 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.
@@ -16082,7 +16102,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16085: result: $with_no_padding" >&5
+echo "$as_me:16105: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16090,7 +16110,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16093: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16113: 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.
@@ -16100,7 +16120,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16103: result: $with_sigwinch" >&5
+echo "$as_me:16123: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16115,7 +16135,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16118: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16138: 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.
@@ -16125,7 +16145,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16128: result: $with_tcap_names" >&5
+echo "$as_me:16148: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16139,7 +16159,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16142: checking if you want to link with the pthread library" >&5
+echo "$as_me:16162: 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.
@@ -16149,27 +16169,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16152: result: $with_pthread" >&5
+echo "$as_me:16172: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16156: checking for pthread.h" >&5
+	echo "$as_me:16176: 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 16162 "configure"
+#line 16182 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16166: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16186: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16172: \$? = $ac_status" >&5
+  echo "$as_me:16192: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16188,7 +16208,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16191: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16211: 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
 
@@ -16198,7 +16218,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16201: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16221: 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"
 
@@ -16219,7 +16239,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16222 "configure"
+#line 16242 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16236,16 +16256,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16242: \$? = $ac_status" >&5
+  echo "$as_me:16262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16248: \$? = $ac_status" >&5
+  echo "$as_me:16268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16255,7 +16275,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16258: result: $with_pthread" >&5
+	    echo "$as_me:16278: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16283,7 +16303,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16286: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16306: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16293,13 +16313,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16296: checking for pthread_kill" >&5
+	echo "$as_me:16316: 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 16302 "configure"
+#line 16322 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16330,16 +16350,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16336: \$? = $ac_status" >&5
+  echo "$as_me:16356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16342: \$? = $ac_status" >&5
+  echo "$as_me:16362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16349,11 +16369,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16352: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16372: 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:16356: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16376: 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.
@@ -16363,7 +16383,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16366: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16386: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16374,7 +16394,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16377: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16397: 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.
@@ -16384,18 +16404,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16387: result: $use_weak_symbols" >&5
+	echo "$as_me:16407: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16391: checking if $CC supports weak symbols" >&5
+echo "$as_me:16411: 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 16398 "configure"
+#line 16418 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16421,16 +16441,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16427: \$? = $ac_status" >&5
+  echo "$as_me:16447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16433: \$? = $ac_status" >&5
+  echo "$as_me:16453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16441,7 +16461,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16444: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16464: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16491,7 +16511,7 @@ fi
 # 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:16494: checking if you want reentrant code" >&5
+echo "$as_me:16514: 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.
@@ -16501,7 +16521,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16504: result: $with_reentrant" >&5
+echo "$as_me:16524: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16590,7 +16610,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16613: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16602,7 +16622,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16605: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16625: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16624,16 +16644,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16627: result: $enable_opaque_curses" >&5
+echo "$as_me:16647: 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:16632: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16652: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16636: checking whether form library structures should be opaque" >&5
+echo "$as_me:16656: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16650,10 +16670,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16653: result: $enable_opaque_form" >&5
+echo "$as_me:16673: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16656: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16676: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16670,10 +16690,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16673: result: $enable_opaque_menu" >&5
+echo "$as_me:16693: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16676: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16696: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16690,7 +16710,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16693: result: $enable_opaque_panel" >&5
+echo "$as_me:16713: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16700,7 +16720,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16703: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16723: 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.
@@ -16710,7 +16730,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16713: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16733: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16723,7 +16743,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16726: checking if you want all development code" >&5
+echo "$as_me:16746: 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.
@@ -16733,11 +16753,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16736: result: $with_develop" >&5
+echo "$as_me:16756: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16740: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16760: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16747,7 +16767,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16750: result: $enable_check_size" >&5
+echo "$as_me:16770: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16755,7 +16775,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16758: checking if you want hard-tabs code" >&5
+echo "$as_me:16778: 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.
@@ -16765,7 +16785,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16768: result: $enable_hard_tabs" >&5
+echo "$as_me:16788: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16773,7 +16793,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16776: checking if you want limited support for xmc" >&5
+echo "$as_me:16796: 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.
@@ -16783,7 +16803,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16786: result: $enable_xmc_glitch" >&5
+echo "$as_me:16806: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16793,7 +16813,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16796: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16816: 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.
@@ -16803,7 +16823,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16806: result: $with_assumed_color" >&5
+echo "$as_me:16826: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16811,7 +16831,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16814: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16834: 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.
@@ -16821,7 +16841,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16824: result: $with_hashmap" >&5
+echo "$as_me:16844: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16829,7 +16849,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16832: checking if you want colorfgbg code" >&5
+echo "$as_me:16852: 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.
@@ -16839,7 +16859,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16842: result: $with_colorfgbg" >&5
+echo "$as_me:16862: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16847,7 +16867,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16850: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16870: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16857,14 +16877,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16860: result: $cf_with_fvisibility" >&5
+echo "$as_me:16880: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16867: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16887: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16873,7 +16893,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16876 "configure"
+#line 16896 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16889,16 +16909,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16895: \$? = $ac_status" >&5
+  echo "$as_me:16915: \$? = $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:16918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16901: \$? = $ac_status" >&5
+  echo "$as_me:16921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16910,7 +16930,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16913: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16933: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17025,7 +17045,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17028: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17048: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17034,7 +17054,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17037 "configure"
+#line 17057 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17050,16 +17070,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17056: \$? = $ac_status" >&5
+  echo "$as_me:17076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17062: \$? = $ac_status" >&5
+  echo "$as_me:17082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17071,7 +17091,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17074: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17094: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17194,7 +17214,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17197: checking if you want interop bindings" >&5
+echo "$as_me:17217: 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.
@@ -17204,13 +17224,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17207: result: $with_exp_interop" >&5
+echo "$as_me:17227: 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:17213: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17233: 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.
@@ -17220,13 +17240,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17223: result: $with_safe_sprintf" >&5
+echo "$as_me:17243: 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:17229: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17249: 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.
@@ -17236,7 +17256,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17239: result: $with_scroll_hints" >&5
+echo "$as_me:17259: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17245,7 +17265,7 @@ EOF
 
 fi
 
-echo "$as_me:17248: checking if you want wgetch-events code" >&5
+echo "$as_me:17268: 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.
@@ -17255,7 +17275,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17258: result: $with_wgetch_events" >&5
+echo "$as_me:17278: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17270,7 +17290,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17273: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17293: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17280,7 +17300,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17283: result: $with_exp_win32" >&5
+	echo "$as_me:17303: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17306,7 +17326,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17309: checking if you want to see long compiling messages" >&5
+echo "$as_me:17329: 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.
@@ -17340,7 +17360,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17343: result: $enableval" >&5
+echo "$as_me:17363: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17353,7 +17373,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17356: checking if you want to install stripped executables" >&5
+echo "$as_me:17376: 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.
@@ -17370,7 +17390,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17373: result: $enable_stripping" >&5
+echo "$as_me:17393: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17381,7 +17401,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17384: checking if install accepts -p option" >&5
+echo "$as_me:17404: 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
@@ -17412,10 +17432,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17415: result: $cf_cv_install_p" >&5
+echo "$as_me:17435: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17418: checking if install needs to be told about ownership" >&5
+echo "$as_me:17438: 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)
@@ -17426,7 +17446,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17429: result: $with_install_o" >&5
+echo "$as_me:17449: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17437,7 +17457,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17440: checking if you want to specify strip-program" >&5
+	echo "$as_me:17460: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17447,11 +17467,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17450: result: $with_strip_program" >&5
+	echo "$as_me:17470: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17454: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17474: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17472,11 +17492,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17475: result: $check_install_strip" >&5
+		echo "$as_me:17495: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17479: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17499: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17491,7 +17511,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17494: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17514: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17517,7 +17537,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17520: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17540: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17534,17 +17554,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17537: result: $enable_stdnoreturn" >&5
+echo "$as_me:17557: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17541: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17561: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17547 "configure"
+#line 17567 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17560,16 +17580,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17566: \$? = $ac_status" >&5
+  echo "$as_me:17586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17572: \$? = $ac_status" >&5
+  echo "$as_me:17592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17580,7 +17600,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17583: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17603: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17636,16 +17656,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17639: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17659: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17644: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17664: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17648: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17668: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17684,16 +17704,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17687: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17692: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17712: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17696: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17716: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17732,23 +17752,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17735: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17740: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17760: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17744: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17751: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17771: 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.
@@ -17765,7 +17785,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17768: result: $enable_warnings" >&5
+echo "$as_me:17788: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17789,7 +17809,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17792 "configure"
+#line 17812 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17804,26 +17824,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17810: \$? = $ac_status" >&5
+  echo "$as_me:17830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17816: \$? = $ac_status" >&5
+  echo "$as_me:17836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17819: checking for X11/Xt const-feature" >&5
+echo "$as_me:17839: 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 17826 "configure"
+#line 17846 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17841,16 +17861,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17847: \$? = $ac_status" >&5
+  echo "$as_me:17867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17853: \$? = $ac_status" >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17865,7 +17885,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17868: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17888: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17894,7 +17914,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17897 "${as_me:-configure}"
+#line 17917 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17910,7 +17930,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17913: checking for $CC warning options..." >&5
+	{ echo "$as_me:17933: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17926,12 +17946,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17932: \$? = $ac_status" >&5
+  echo "$as_me:17952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17954: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17939,7 +17959,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17942: checking for $CC warning options..." >&5
+	{ echo "$as_me:17962: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17962,12 +17982,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17965: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17968: \$? = $ac_status" >&5
+  echo "$as_me:17988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17970: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17975,7 +17995,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17978: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17985,7 +18005,7 @@ echo "${as_me:-configure}:17978: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17988: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:18008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18018,10 +18038,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18021: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18041: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18024 "${as_me:-configure}"
+#line 18044 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18071,12 +18091,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18074: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18077: \$? = $ac_status" >&5
+  echo "$as_me:18097: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18079: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18099: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18148,12 +18168,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18151: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18171: 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 18156 "configure"
+#line 18176 "configure"
 #include "confdefs.h"
 
 int
@@ -18170,16 +18190,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18176: \$? = $ac_status" >&5
+  echo "$as_me:18196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18182: \$? = $ac_status" >&5
+  echo "$as_me:18202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18190,7 +18210,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18193: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18213: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18199,11 +18219,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18202: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18222: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18206 "configure"
+#line 18226 "configure"
 #include "confdefs.h"
 
 int
@@ -18220,16 +18240,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18226: \$? = $ac_status" >&5
+  echo "$as_me:18246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18232: \$? = $ac_status" >&5
+  echo "$as_me:18252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18239,7 +18259,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18242: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18262: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18248,30 +18268,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18251: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18271: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18258: checking version of $CC" >&5
+	echo "$as_me:18278: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18262: result: $CLANG_VERSION" >&5
+	echo "$as_me:18282: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18269: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18289: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18274 "configure"
+#line 18294 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18285,16 +18305,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18291: \$? = $ac_status" >&5
+  echo "$as_me:18311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18297: \$? = $ac_status" >&5
+  echo "$as_me:18317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18305,13 +18325,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18308: result: $cf_clang_optok" >&5
+		echo "$as_me:18328: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18314: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18334: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18328,7 +18348,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18331 "configure"
+#line 18351 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18346,7 +18366,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18349: checking for $CC warning options..." >&5
+	{ echo "$as_me:18369: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18363,12 +18383,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18366: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18369: \$? = $ac_status" >&5
+  echo "$as_me:18389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18371: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18391: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18377,7 +18397,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18380: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18400: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18407,16 +18427,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18410: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18413: \$? = $ac_status" >&5
+  echo "$as_me:18433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18415: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18435: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18419: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18439: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18434,7 +18454,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18437: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18457: 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.
@@ -18444,7 +18464,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18447: result: $enable_string_hacks" >&5
+echo "$as_me:18467: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18453,15 +18473,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18456: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18476: 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:18458: checking for strlcat" >&5
+	echo "$as_me:18478: 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 18464 "configure"
+#line 18484 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18492,16 +18512,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18498: \$? = $ac_status" >&5
+  echo "$as_me:18518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18504: \$? = $ac_status" >&5
+  echo "$as_me:18524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18511,7 +18531,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18514: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18534: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18521,7 +18541,7 @@ EOF
 
 else
 
-		echo "$as_me:18524: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18544: 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
@@ -18529,7 +18549,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18532 "configure"
+#line 18552 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18548,16 +18568,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18554: \$? = $ac_status" >&5
+  echo "$as_me:18574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18560: \$? = $ac_status" >&5
+  echo "$as_me:18580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18568,7 +18588,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18571: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18591: 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
 
@@ -18591,23 +18611,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18594: checking for $ac_header" >&5
+echo "$as_me:18614: 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 18600 "configure"
+#line 18620 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18624: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18610: \$? = $ac_status" >&5
+  echo "$as_me:18630: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18626,7 +18646,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18629: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18649: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18647,13 +18667,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18650: checking for $ac_func" >&5
+echo "$as_me:18670: 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 18656 "configure"
+#line 18676 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18684,16 +18704,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18690: \$? = $ac_status" >&5
+  echo "$as_me:18710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18696: \$? = $ac_status" >&5
+  echo "$as_me:18716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18703,7 +18723,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18706: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18726: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18716,7 +18736,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18719: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18739: 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.
@@ -18726,7 +18746,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18729: result: $with_assertions" >&5
+echo "$as_me:18749: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18742,7 +18762,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18745: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18765: 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.
@@ -18764,7 +18784,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18767: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18787: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18878,23 +18898,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18881: checking for dmalloc.h" >&5
+	echo "$as_me:18901: 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 18887 "configure"
+#line 18907 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18911: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18897: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18913,11 +18933,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18916: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18936: 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:18920: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18940: 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
@@ -18925,7 +18945,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18928 "configure"
+#line 18948 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18944,16 +18964,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18950: \$? = $ac_status" >&5
+  echo "$as_me:18970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18956: \$? = $ac_status" >&5
+  echo "$as_me:18976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18964,7 +18984,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18967: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18987: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18979,7 +18999,7 @@ fi
 
 fi
 
-echo "$as_me:18982: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:19002: 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.
@@ -19001,7 +19021,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:19004: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:19024: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19115,23 +19135,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19118: checking for dbmalloc.h" >&5
+	echo "$as_me:19138: 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 19124 "configure"
+#line 19144 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19148: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19134: \$? = $ac_status" >&5
+  echo "$as_me:19154: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19150,11 +19170,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19153: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19173: 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:19157: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19177: 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
@@ -19162,7 +19182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19165 "configure"
+#line 19185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19181,16 +19201,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19187: \$? = $ac_status" >&5
+  echo "$as_me:19207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19193: \$? = $ac_status" >&5
+  echo "$as_me:19213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19201,7 +19221,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19204: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19224: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19216,7 +19236,7 @@ fi
 
 fi
 
-echo "$as_me:19219: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19239: 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.
@@ -19238,7 +19258,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19241: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19261: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19351,7 +19371,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19354: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19374: 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.
@@ -19362,7 +19382,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19365: result: $with_no_leaks" >&5
+echo "$as_me:19385: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19414,7 +19434,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19417: checking whether to add trace feature to all models" >&5
+echo "$as_me:19437: 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.
@@ -19424,7 +19444,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19427: result: $cf_with_trace" >&5
+echo "$as_me:19447: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19444,7 +19464,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19447: checking if we want to use GNAT projects" >&5
+echo "$as_me:19467: 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.
@@ -19461,7 +19481,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19464: result: $enable_gnat_projects" >&5
+echo "$as_me:19484: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19474,14 +19494,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19477: checking if ssp library is needed" >&5
+echo "$as_me:19497: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19484 "configure"
+#line 19504 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19498,16 +19518,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19504: \$? = $ac_status" >&5
+  echo "$as_me:19524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19510: \$? = $ac_status" >&5
+  echo "$as_me:19530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19517,7 +19537,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19520 "configure"
+#line 19540 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19534,16 +19554,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19540: \$? = $ac_status" >&5
+  echo "$as_me:19560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19546: \$? = $ac_status" >&5
+  echo "$as_me:19566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19557,7 +19577,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19560: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19580: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19586,14 +19606,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19589: checking if -lm needed for math functions" >&5
+echo "$as_me:19609: 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 19596 "configure"
+#line 19616 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19609,16 +19629,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19615: \$? = $ac_status" >&5
+  echo "$as_me:19635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19621: \$? = $ac_status" >&5
+  echo "$as_me:19641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19628,7 +19648,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19631: result: $cf_cv_need_libm" >&5
+echo "$as_me:19651: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19636,14 +19656,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19639: checking if -lm is available for math functions" >&5
+	echo "$as_me:19659: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19646 "configure"
+#line 19666 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19659,16 +19679,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19665: \$? = $ac_status" >&5
+  echo "$as_me:19685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19671: \$? = $ac_status" >&5
+  echo "$as_me:19691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19678,7 +19698,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19681: result: $cf_cv_have_libm" >&5
+echo "$as_me:19701: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19700,13 +19720,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19703: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19723: 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 19709 "configure"
+#line 19729 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19722,16 +19742,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19728: \$? = $ac_status" >&5
+  echo "$as_me:19748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19734: \$? = $ac_status" >&5
+  echo "$as_me:19754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19741,7 +19761,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19744: result: $ac_cv_header_time" >&5
+echo "$as_me:19764: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19756,7 +19776,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19759: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19779: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19764,7 +19784,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19767 "configure"
+#line 19787 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19783,16 +19803,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19789: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19795: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19803,11 +19823,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19806: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19826: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19810: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19830: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19815,7 +19835,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19818 "configure"
+#line 19838 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19834,16 +19854,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19840: \$? = $ac_status" >&5
+  echo "$as_me:19860: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19846: \$? = $ac_status" >&5
+  echo "$as_me:19866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19854,7 +19874,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19857: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19877: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19876,7 +19896,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19879: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19899: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19884,7 +19904,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19887 "configure"
+#line 19907 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19903,16 +19923,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19909: \$? = $ac_status" >&5
+  echo "$as_me:19929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19915: \$? = $ac_status" >&5
+  echo "$as_me:19935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19923,7 +19943,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19926: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19946: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19945,7 +19965,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19948: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19968: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19953,7 +19973,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19956 "configure"
+#line 19976 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19972,16 +19992,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19978: \$? = $ac_status" >&5
+  echo "$as_me:19998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19984: \$? = $ac_status" >&5
+  echo "$as_me:20004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -19992,7 +20012,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19995: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:20015: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20034,7 +20054,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20037: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20057: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20042,7 +20062,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20045 "configure"
+#line 20065 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20061,16 +20081,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20067: \$? = $ac_status" >&5
+  echo "$as_me:20087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20073: \$? = $ac_status" >&5
+  echo "$as_me:20093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20081,7 +20101,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20084: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20104: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20109,13 +20129,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20112: checking for regcomp" >&5
+	echo "$as_me:20132: 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 20118 "configure"
+#line 20138 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20146,16 +20166,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20152: \$? = $ac_status" >&5
+  echo "$as_me:20172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20158: \$? = $ac_status" >&5
+  echo "$as_me:20178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20165,7 +20185,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20168: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20188: 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
@@ -20174,7 +20194,7 @@ else
 		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:20177: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20197: 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
@@ -20182,7 +20202,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20185 "configure"
+#line 20205 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20201,16 +20221,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20207: \$? = $ac_status" >&5
+  echo "$as_me:20227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20213: \$? = $ac_status" >&5
+  echo "$as_me:20233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20221,7 +20241,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20224: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20244: 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
 
@@ -20253,13 +20273,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20256: checking for compile" >&5
+	echo "$as_me:20276: 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 20262 "configure"
+#line 20282 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20290,16 +20310,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20296: \$? = $ac_status" >&5
+  echo "$as_me:20316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20302: \$? = $ac_status" >&5
+  echo "$as_me:20322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20309,13 +20329,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20312: result: $ac_cv_func_compile" >&5
+echo "$as_me:20332: 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:20318: checking for compile in -lgen" >&5
+		echo "$as_me:20338: 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
@@ -20323,7 +20343,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20326 "configure"
+#line 20346 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20342,16 +20362,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20348: \$? = $ac_status" >&5
+  echo "$as_me:20368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20354: \$? = $ac_status" >&5
+  echo "$as_me:20374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20362,7 +20382,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20365: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20385: 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
 
@@ -20390,11 +20410,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20393: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20413: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20397: checking for regular-expression headers" >&5
+echo "$as_me:20417: 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
@@ -20406,7 +20426,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20409 "configure"
+#line 20429 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20423,16 +20443,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20429: \$? = $ac_status" >&5
+  echo "$as_me:20449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20435: \$? = $ac_status" >&5
+  echo "$as_me:20455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20449,7 +20469,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20452 "configure"
+#line 20472 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -20470,16 +20490,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20476: \$? = $ac_status" >&5
+  echo "$as_me:20496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20482: \$? = $ac_status" >&5
+  echo "$as_me:20502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20495,11 +20515,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20498: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20518: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20502: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20522: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20537,23 +20557,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20540: checking for $ac_header" >&5
+echo "$as_me:20560: 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 20546 "configure"
+#line 20566 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20550: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20556: \$? = $ac_status" >&5
+  echo "$as_me:20576: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20572,7 +20592,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20575: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20585,23 +20605,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20588: checking for $ac_header" >&5
+echo "$as_me:20608: 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 20594 "configure"
+#line 20614 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20604: \$? = $ac_status" >&5
+  echo "$as_me:20624: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20620,7 +20640,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20630,7 +20650,7 @@ EOF
 fi
 done
 
-echo "$as_me:20633: checking for header declaring getopt variables" >&5
+echo "$as_me:20653: 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
@@ -20640,7 +20660,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20643 "configure"
+#line 20663 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20653,16 +20673,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20659: \$? = $ac_status" >&5
+  echo "$as_me:20679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20665: \$? = $ac_status" >&5
+  echo "$as_me:20685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20674,7 +20694,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20677: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20697: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20691,14 +20711,14 @@ EOF
 
 fi
 
-echo "$as_me:20694: checking if external environ is declared" >&5
+echo "$as_me:20714: 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 20701 "configure"
+#line 20721 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20711,16 +20731,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20717: \$? = $ac_status" >&5
+  echo "$as_me:20737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20723: \$? = $ac_status" >&5
+  echo "$as_me:20743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20731,7 +20751,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20734: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20754: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20746,14 +20766,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20749: checking if external environ exists" >&5
+echo "$as_me:20769: 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 20756 "configure"
+#line 20776 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20768,16 +20788,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20774: \$? = $ac_status" >&5
+  echo "$as_me:20794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20780: \$? = $ac_status" >&5
+  echo "$as_me:20800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20788,7 +20808,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20791: result: $cf_cv_have_environ" >&5
+echo "$as_me:20811: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20801,13 +20821,13 @@ EOF
 
 fi
 
-echo "$as_me:20804: checking for getenv" >&5
+echo "$as_me:20824: 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 20810 "configure"
+#line 20830 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20838,16 +20858,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20844: \$? = $ac_status" >&5
+  echo "$as_me:20864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20850: \$? = $ac_status" >&5
+  echo "$as_me:20870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20857,19 +20877,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20860: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20880: 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:20866: checking for $ac_func" >&5
+echo "$as_me:20886: 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 20872 "configure"
+#line 20892 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20900,16 +20920,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20906: \$? = $ac_status" >&5
+  echo "$as_me:20926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20912: \$? = $ac_status" >&5
+  echo "$as_me:20932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20919,7 +20939,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20922: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20942: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20929,7 +20949,7 @@ EOF
 fi
 done
 
-echo "$as_me:20932: checking if getenv returns consistent values" >&5
+echo "$as_me:20952: 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
@@ -20939,7 +20959,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20942 "configure"
+#line 20962 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21044,15 +21064,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21050: \$? = $ac_status" >&5
+  echo "$as_me:21070: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21055: \$? = $ac_status" >&5
+  echo "$as_me:21075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21065,7 +21085,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21068: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21088: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21080,18 +21100,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21083: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21103: 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
 
-echo "$as_me:21087: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21107: 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 21094 "configure"
+#line 21114 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21111,16 +21131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21117: \$? = $ac_status" >&5
+  echo "$as_me:21137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21123: \$? = $ac_status" >&5
+  echo "$as_me:21143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21132,7 +21152,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21135: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21155: 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
@@ -21147,13 +21167,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21150: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21170: 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 21156 "configure"
+#line 21176 "configure"
 #include "confdefs.h"
 
 int
@@ -21215,16 +21235,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21221: \$? = $ac_status" >&5
+  echo "$as_me:21241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21227: \$? = $ac_status" >&5
+  echo "$as_me:21247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21234,7 +21254,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21237: result: $ac_cv_c_const" >&5
+echo "$as_me:21257: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21244,7 +21264,7 @@ EOF
 
 fi
 
-echo "$as_me:21247: checking for inline" >&5
+echo "$as_me:21267: 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
@@ -21252,7 +21272,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21255 "configure"
+#line 21275 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21261,16 +21281,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21267: \$? = $ac_status" >&5
+  echo "$as_me:21287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21273: \$? = $ac_status" >&5
+  echo "$as_me:21293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21281,7 +21301,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21284: result: $ac_cv_c_inline" >&5
+echo "$as_me:21304: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21307,7 +21327,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21310: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21330: 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
@@ -21316,7 +21336,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21319 "configure"
+#line 21339 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21328,16 +21348,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21334: \$? = $ac_status" >&5
+  echo "$as_me:21354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21340: \$? = $ac_status" >&5
+  echo "$as_me:21360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21349,7 +21369,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21352: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21372: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21455,7 +21475,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21458: checking for signal global datatype" >&5
+echo "$as_me:21478: 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
@@ -21467,7 +21487,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21470 "configure"
+#line 21490 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21491,16 +21511,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21497: \$? = $ac_status" >&5
+  echo "$as_me:21517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21503: \$? = $ac_status" >&5
+  echo "$as_me:21523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21514,7 +21534,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21517: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21537: 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 <<EOF
@@ -21523,7 +21543,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21526: checking for type of chtype" >&5
+echo "$as_me:21546: 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
@@ -21533,7 +21553,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21536 "configure"
+#line 21556 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21568,15 +21588,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21574: \$? = $ac_status" >&5
+  echo "$as_me:21594: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21579: \$? = $ac_status" >&5
+  echo "$as_me:21599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21591,7 +21611,7 @@ fi
 
 fi
 
-echo "$as_me:21594: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21614: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21603,14 +21623,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21606: checking if unsigned literals are legal" >&5
+echo "$as_me:21626: 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 21613 "configure"
+#line 21633 "configure"
 #include "confdefs.h"
 
 int
@@ -21622,16 +21642,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21628: \$? = $ac_status" >&5
+  echo "$as_me:21648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21634: \$? = $ac_status" >&5
+  echo "$as_me:21654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21643,7 +21663,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21646: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21666: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21659,14 +21679,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21662: checking if external errno is declared" >&5
+echo "$as_me:21682: 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 21669 "configure"
+#line 21689 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21680,16 +21700,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21686: \$? = $ac_status" >&5
+  echo "$as_me:21706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21692: \$? = $ac_status" >&5
+  echo "$as_me:21712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21700,7 +21720,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21703: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21723: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21715,14 +21735,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21718: checking if external errno exists" >&5
+echo "$as_me:21738: 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 21725 "configure"
+#line 21745 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21737,16 +21757,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21743: \$? = $ac_status" >&5
+  echo "$as_me:21763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21749: \$? = $ac_status" >&5
+  echo "$as_me:21769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21757,7 +21777,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21760: result: $cf_cv_have_errno" >&5
+echo "$as_me:21780: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21770,7 +21790,7 @@ EOF
 
 fi
 
-echo "$as_me:21773: checking if data-only library module links" >&5
+echo "$as_me:21793: 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
@@ -21778,20 +21798,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21781 "configure"
+#line 21801 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21784: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21787: \$? = $ac_status" >&5
+  echo "$as_me:21807: \$? = $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 <<EOF
-#line 21794 "configure"
+#line 21814 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21808,10 +21828,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21811: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21814: \$? = $ac_status" >&5
+  echo "$as_me:21834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21824,7 +21844,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21827 "configure"
+#line 21847 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21835,15 +21855,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21841: \$? = $ac_status" >&5
+  echo "$as_me:21861: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21846: \$? = $ac_status" >&5
+  echo "$as_me:21866: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21858,7 +21878,7 @@ fi
 
 fi
 
-echo "$as_me:21861: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21881: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21873,13 +21893,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21876: checking for clock_gettime" >&5
+echo "$as_me:21896: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21882 "configure"
+#line 21902 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21910,16 +21930,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21933: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21916: \$? = $ac_status" >&5
+  echo "$as_me:21936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21922: \$? = $ac_status" >&5
+  echo "$as_me:21942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21929,12 +21949,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21932: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21952: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21937: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21957: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21942,7 +21962,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21945 "configure"
+#line 21965 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21961,16 +21981,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21967: \$? = $ac_status" >&5
+  echo "$as_me:21987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21973: \$? = $ac_status" >&5
+  echo "$as_me:21993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -21981,7 +22001,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21984: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:22004: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -21993,14 +22013,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:21996: checking if clock_gettime links" >&5
+echo "$as_me:22016: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22003 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22018,16 +22038,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22024: \$? = $ac_status" >&5
+  echo "$as_me:22044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22030: \$? = $ac_status" >&5
+  echo "$as_me:22050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22038,7 +22058,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22041: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22061: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22052,13 +22072,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22055: checking for gettimeofday" >&5
+echo "$as_me:22075: 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 22061 "configure"
+#line 22081 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22089,16 +22109,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22095: \$? = $ac_status" >&5
+  echo "$as_me:22115: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22101: \$? = $ac_status" >&5
+  echo "$as_me:22121: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22108,7 +22128,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22111: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22131: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22118,7 +22138,7 @@ EOF
 
 else
 
-echo "$as_me:22121: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22141: 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
@@ -22126,7 +22146,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22129 "configure"
+#line 22149 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22145,16 +22165,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22151: \$? = $ac_status" >&5
+  echo "$as_me:22171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22157: \$? = $ac_status" >&5
+  echo "$as_me:22177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22165,7 +22185,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22168: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22188: 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
 
@@ -22224,13 +22244,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22227: checking for $ac_func" >&5
+echo "$as_me:22247: 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 22233 "configure"
+#line 22253 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22261,16 +22281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22267: \$? = $ac_status" >&5
+  echo "$as_me:22287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22273: \$? = $ac_status" >&5
+  echo "$as_me:22293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22280,7 +22300,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22283: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22303: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22290,14 +22310,14 @@ EOF
 fi
 done
 
-echo "$as_me:22293: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22313: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22300 "configure"
+#line 22320 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22312,16 +22332,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22315: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22318: \$? = $ac_status" >&5
+  echo "$as_me:22338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22324: \$? = $ac_status" >&5
+  echo "$as_me:22344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22331,7 +22351,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22334: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22354: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22353,7 +22373,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22356: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22376: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22363,7 +22383,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22366 "configure"
+#line 22386 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22376,15 +22396,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22382: \$? = $ac_status" >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22387: \$? = $ac_status" >&5
+  echo "$as_me:22407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22396,7 +22416,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22399: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22419: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22408,14 +22428,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22411: checking for getttynam" >&5
+	echo "$as_me:22431: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22418 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22427,16 +22447,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22433: \$? = $ac_status" >&5
+  echo "$as_me:22453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22439: \$? = $ac_status" >&5
+  echo "$as_me:22459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22446,7 +22466,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22449: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22469: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22456,7 +22476,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22459: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22479: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22465,7 +22485,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22468: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22488: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22478,14 +22498,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22481: checking for terminal-capability database functions" >&5
+echo "$as_me:22501: 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 22488 "configure"
+#line 22508 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22505,16 +22525,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22511: \$? = $ac_status" >&5
+  echo "$as_me:22531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22517: \$? = $ac_status" >&5
+  echo "$as_me:22537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22525,7 +22545,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22528: result: $cf_cv_cgetent" >&5
+echo "$as_me:22548: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22535,14 +22555,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22538: checking if cgetent uses const parameter" >&5
+echo "$as_me:22558: 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 22545 "configure"
+#line 22565 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22565,16 +22585,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22571: \$? = $ac_status" >&5
+  echo "$as_me:22591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22577: \$? = $ac_status" >&5
+  echo "$as_me:22597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22585,7 +22605,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22588: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22608: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22599,14 +22619,14 @@ fi
 
 fi
 
-echo "$as_me:22602: checking for isascii" >&5
+echo "$as_me:22622: 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 22609 "configure"
+#line 22629 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22618,16 +22638,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22624: \$? = $ac_status" >&5
+  echo "$as_me:22644: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22630: \$? = $ac_status" >&5
+  echo "$as_me:22650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22638,7 +22658,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22641: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22661: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22646,10 +22666,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22649: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22669: 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 22652 "configure"
+#line 22672 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22663,16 +22683,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22669: \$? = $ac_status" >&5
+  echo "$as_me:22689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22675: \$? = $ac_status" >&5
+  echo "$as_me:22695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22680,7 +22700,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22683 "configure"
+#line 22703 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22695,16 +22715,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22701: \$? = $ac_status" >&5
+  echo "$as_me:22721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22707: \$? = $ac_status" >&5
+  echo "$as_me:22727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22720,11 +22740,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22723: result: $sigact_bad" >&5
+echo "$as_me:22743: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22727: checking if nanosleep really works" >&5
+echo "$as_me:22747: 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
@@ -22734,7 +22754,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22737 "configure"
+#line 22757 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22760,15 +22780,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22766: \$? = $ac_status" >&5
+  echo "$as_me:22786: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22771: \$? = $ac_status" >&5
+  echo "$as_me:22791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22780,7 +22800,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22783: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22803: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22797,23 +22817,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22800: checking for $ac_header" >&5
+echo "$as_me:22820: 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 22806 "configure"
+#line 22826 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22810: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22816: \$? = $ac_status" >&5
+  echo "$as_me:22836: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22832,7 +22852,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22835: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22849,10 +22869,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22852: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22872: 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 22855 "configure"
+#line 22875 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22864,16 +22884,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:22890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22876: \$? = $ac_status" >&5
+  echo "$as_me:22896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22881,7 +22901,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22884 "configure"
+#line 22904 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22895,16 +22915,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22901: \$? = $ac_status" >&5
+  echo "$as_me:22921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22907: \$? = $ac_status" >&5
+  echo "$as_me:22927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22920,19 +22940,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22923: result: $termios_bad" >&5
+	echo "$as_me:22943: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22928: checking for tcgetattr" >&5
+echo "$as_me:22948: 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 22935 "configure"
+#line 22955 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22960,16 +22980,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22966: \$? = $ac_status" >&5
+  echo "$as_me:22986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22972: \$? = $ac_status" >&5
+  echo "$as_me:22992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22979,21 +22999,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22982: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:23002: 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:22989: checking for vsscanf function or workaround" >&5
+echo "$as_me:23009: 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 22996 "configure"
+#line 23016 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23019,16 +23039,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23025: \$? = $ac_status" >&5
+  echo "$as_me:23045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23031: \$? = $ac_status" >&5
+  echo "$as_me:23051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23036,7 +23056,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23039 "configure"
+#line 23059 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23058,16 +23078,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23064: \$? = $ac_status" >&5
+  echo "$as_me:23084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23070: \$? = $ac_status" >&5
+  echo "$as_me:23090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23075,7 +23095,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23078 "configure"
+#line 23098 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23097,16 +23117,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23103: \$? = $ac_status" >&5
+  echo "$as_me:23123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23109: \$? = $ac_status" >&5
+  echo "$as_me:23129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23121,7 +23141,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23124: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23144: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23147,23 +23167,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23150: checking for $ac_header" >&5
+echo "$as_me:23170: 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 23156 "configure"
+#line 23176 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23180: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23166: \$? = $ac_status" >&5
+  echo "$as_me:23186: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23182,7 +23202,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23205: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23192,7 +23212,7 @@ EOF
 fi
 done
 
-echo "$as_me:23195: checking for working mkstemp" >&5
+echo "$as_me:23215: 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
@@ -23203,7 +23223,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23206 "configure"
+#line 23226 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23238,15 +23258,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23244: \$? = $ac_status" >&5
+  echo "$as_me:23264: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23249: \$? = $ac_status" >&5
+  echo "$as_me:23269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23261,16 +23281,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23264: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23284: 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:23267: checking for mkstemp" >&5
+	echo "$as_me:23287: 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 23273 "configure"
+#line 23293 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23301,16 +23321,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23307: \$? = $ac_status" >&5
+  echo "$as_me:23327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23313: \$? = $ac_status" >&5
+  echo "$as_me:23333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23320,7 +23340,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23323: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23343: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23341,21 +23361,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23344: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23364: 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:23347: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23367: 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:23353: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23373: 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 23358 "configure"
+#line 23378 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23372,15 +23392,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23378: \$? = $ac_status" >&5
+  echo "$as_me:23398: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23383: \$? = $ac_status" >&5
+  echo "$as_me:23403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23393,7 +23413,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23396: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23416: 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
 
@@ -23404,13 +23424,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23407: checking for intptr_t" >&5
+echo "$as_me:23427: 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 23413 "configure"
+#line 23433 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23425,16 +23445,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23431: \$? = $ac_status" >&5
+  echo "$as_me:23451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23437: \$? = $ac_status" >&5
+  echo "$as_me:23457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23444,7 +23464,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23447: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23467: 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
   :
@@ -23456,13 +23476,13 @@ EOF
 
 fi
 
-echo "$as_me:23459: checking for ssize_t" >&5
+echo "$as_me:23479: 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 23465 "configure"
+#line 23485 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23477,16 +23497,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23483: \$? = $ac_status" >&5
+  echo "$as_me:23503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23489: \$? = $ac_status" >&5
+  echo "$as_me:23509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23496,7 +23516,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23499: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23519: 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
   :
@@ -23508,14 +23528,14 @@ EOF
 
 fi
 
-echo "$as_me:23511: checking for type sigaction_t" >&5
+echo "$as_me:23531: 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 23518 "configure"
+#line 23538 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23528,16 +23548,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23534: \$? = $ac_status" >&5
+  echo "$as_me:23554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23540: \$? = $ac_status" >&5
+  echo "$as_me:23560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23548,14 +23568,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23551: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23571: 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:23558: checking declaration of size-change" >&5
+echo "$as_me:23578: 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
@@ -23576,7 +23596,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23579 "configure"
+#line 23599 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23626,16 +23646,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23632: \$? = $ac_status" >&5
+  echo "$as_me:23652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23638: \$? = $ac_status" >&5
+  echo "$as_me:23658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23654,7 +23674,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23657: result: $cf_cv_sizechange" >&5
+echo "$as_me:23677: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23672,13 +23692,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23675: checking for memmove" >&5
+echo "$as_me:23695: 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 23681 "configure"
+#line 23701 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23709,16 +23729,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23715: \$? = $ac_status" >&5
+  echo "$as_me:23735: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23721: \$? = $ac_status" >&5
+  echo "$as_me:23741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23728,19 +23748,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23731: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23751: 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:23737: checking for bcopy" >&5
+echo "$as_me:23757: 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 23743 "configure"
+#line 23763 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23771,16 +23791,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23777: \$? = $ac_status" >&5
+  echo "$as_me:23797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23783: \$? = $ac_status" >&5
+  echo "$as_me:23803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23790,11 +23810,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23793: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23813: 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:23797: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23817: 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
@@ -23804,7 +23824,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23807 "configure"
+#line 23827 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23820,15 +23840,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23826: \$? = $ac_status" >&5
+  echo "$as_me:23846: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23831: \$? = $ac_status" >&5
+  echo "$as_me:23851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23841,7 +23861,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23844: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23864: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23868,13 +23888,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23871: checking for $ac_func" >&5
+echo "$as_me:23891: 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 23877 "configure"
+#line 23897 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23905,16 +23925,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23911: \$? = $ac_status" >&5
+  echo "$as_me:23931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23917: \$? = $ac_status" >&5
+  echo "$as_me:23937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23924,7 +23944,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23927: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23947: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23934,7 +23954,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23937: checking if poll really works" >&5
+echo "$as_me:23957: 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
@@ -23944,7 +23964,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23947 "configure"
+#line 23967 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23997,15 +24017,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24003: \$? = $ac_status" >&5
+  echo "$as_me:24023: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24008: \$? = $ac_status" >&5
+  echo "$as_me:24028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24017,21 +24037,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24020: result: $cf_cv_working_poll" >&5
+echo "$as_me:24040: 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:24027: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24047: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24034 "configure"
+#line 24054 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24051,16 +24071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24057: \$? = $ac_status" >&5
+  echo "$as_me:24077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24063: \$? = $ac_status" >&5
+  echo "$as_me:24083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24070,7 +24090,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24073: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24093: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24080,18 +24100,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24083: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24103: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24087: checking for va_copy" >&5
+echo "$as_me:24107: 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 24094 "configure"
+#line 24114 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24108,16 +24128,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24114: \$? = $ac_status" >&5
+  echo "$as_me:24134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24120: \$? = $ac_status" >&5
+  echo "$as_me:24140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24127,7 +24147,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24130: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24150: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24139,14 +24159,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24142: checking for __va_copy" >&5
+echo "$as_me:24162: 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 24149 "configure"
+#line 24169 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24163,16 +24183,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24169: \$? = $ac_status" >&5
+  echo "$as_me:24189: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24175: \$? = $ac_status" >&5
+  echo "$as_me:24195: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24182,7 +24202,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24185: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24205: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24194,14 +24214,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24197: checking for __builtin_va_copy" >&5
+echo "$as_me:24217: 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 24204 "configure"
+#line 24224 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24218,16 +24238,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24224: \$? = $ac_status" >&5
+  echo "$as_me:24244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24230: \$? = $ac_status" >&5
+  echo "$as_me:24250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24237,7 +24257,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24240: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24260: 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 &&
@@ -24255,14 +24275,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24258: checking if we can simply copy va_list" >&5
+	echo "$as_me:24278: 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 24265 "configure"
+#line 24285 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24279,16 +24299,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24285: \$? = $ac_status" >&5
+  echo "$as_me:24305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24291: \$? = $ac_status" >&5
+  echo "$as_me:24311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24298,19 +24318,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24301: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24321: 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:24306: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24326: 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 24313 "configure"
+#line 24333 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24327,16 +24347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24333: \$? = $ac_status" >&5
+  echo "$as_me:24353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24339: \$? = $ac_status" >&5
+  echo "$as_me:24359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24346,7 +24366,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24349: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24369: 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
@@ -24357,13 +24377,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24360: checking for pid_t" >&5
+echo "$as_me:24380: 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 24366 "configure"
+#line 24386 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24378,16 +24398,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24384: \$? = $ac_status" >&5
+  echo "$as_me:24404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24390: \$? = $ac_status" >&5
+  echo "$as_me:24410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24397,7 +24417,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24400: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24420: 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
   :
@@ -24412,23 +24432,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24415: checking for $ac_header" >&5
+echo "$as_me:24435: 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 24421 "configure"
+#line 24441 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24431: \$? = $ac_status" >&5
+  echo "$as_me:24451: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24447,7 +24467,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24450: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24460,13 +24480,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24463: checking for $ac_func" >&5
+echo "$as_me:24483: 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 24469 "configure"
+#line 24489 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24497,16 +24517,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24503: \$? = $ac_status" >&5
+  echo "$as_me:24523: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24509: \$? = $ac_status" >&5
+  echo "$as_me:24529: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24516,7 +24536,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24519: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24539: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24528,7 +24548,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24531: checking for working fork" >&5
+  echo "$as_me:24551: 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
@@ -24551,15 +24571,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24557: \$? = $ac_status" >&5
+  echo "$as_me:24577: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24562: \$? = $ac_status" >&5
+  echo "$as_me:24582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24571,7 +24591,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24574: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24594: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24585,12 +24605,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24588: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24608: 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:24593: checking for working vfork" >&5
+  echo "$as_me:24613: 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
@@ -24599,7 +24619,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24602 "configure"
+#line 24622 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24692,15 +24712,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24698: \$? = $ac_status" >&5
+  echo "$as_me:24718: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24703: \$? = $ac_status" >&5
+  echo "$as_me:24723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24712,13 +24732,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24715: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24735: 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:24721: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24741: 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
 
@@ -24743,7 +24763,7 @@ EOF
 
 fi
 
-echo "$as_me:24746: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24766: 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
@@ -24753,7 +24773,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24756 "configure"
+#line 24776 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24788,15 +24808,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24794: \$? = $ac_status" >&5
+  echo "$as_me:24814: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24799: \$? = $ac_status" >&5
+  echo "$as_me:24819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24809,20 +24829,20 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24812: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24832: 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
 EOF
 
-	echo "$as_me:24819: checking for cc_t" >&5
+	echo "$as_me:24839: checking for cc_t" >&5
 echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
 if test "${ac_cv_type_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24825 "configure"
+#line 24845 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24840,16 +24860,16 @@ if (sizeof (cc_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24846: \$? = $ac_status" >&5
+  echo "$as_me:24866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24852: \$? = $ac_status" >&5
+  echo "$as_me:24872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_cc_t=yes
 else
@@ -24859,7 +24879,7 @@ ac_cv_type_cc_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24862: result: $ac_cv_type_cc_t" >&5
+echo "$as_me:24882: result: $ac_cv_type_cc_t" >&5
 echo "${ECHO_T}$ac_cv_type_cc_t" >&6
 if test "$ac_cv_type_cc_t" = yes; then
 
@@ -24869,13 +24889,13 @@ EOF
 
 fi
 
-	echo "$as_me:24872: checking for speed_t" >&5
+	echo "$as_me:24892: checking for speed_t" >&5
 echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
 if test "${ac_cv_type_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24878 "configure"
+#line 24898 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24893,16 +24913,16 @@ if (sizeof (speed_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24899: \$? = $ac_status" >&5
+  echo "$as_me:24919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24905: \$? = $ac_status" >&5
+  echo "$as_me:24925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_speed_t=yes
 else
@@ -24912,7 +24932,7 @@ ac_cv_type_speed_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24915: result: $ac_cv_type_speed_t" >&5
+echo "$as_me:24935: result: $ac_cv_type_speed_t" >&5
 echo "${ECHO_T}$ac_cv_type_speed_t" >&6
 if test "$ac_cv_type_speed_t" = yes; then
 
@@ -24922,13 +24942,13 @@ EOF
 
 fi
 
-	echo "$as_me:24925: checking for tcflag_t" >&5
+	echo "$as_me:24945: checking for tcflag_t" >&5
 echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
 if test "${ac_cv_type_tcflag_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24931 "configure"
+#line 24951 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24946,16 +24966,16 @@ if (sizeof (tcflag_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24952: \$? = $ac_status" >&5
+  echo "$as_me:24972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24958: \$? = $ac_status" >&5
+  echo "$as_me:24978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_tcflag_t=yes
 else
@@ -24965,7 +24985,7 @@ ac_cv_type_tcflag_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24968: result: $ac_cv_type_tcflag_t" >&5
+echo "$as_me:24988: result: $ac_cv_type_tcflag_t" >&5
 echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
 if test "$ac_cv_type_tcflag_t" = yes; then
 
@@ -24975,13 +24995,13 @@ EOF
 
 fi
 
-	echo "$as_me:24978: checking for sigset_t" >&5
+	echo "$as_me:24998: checking for sigset_t" >&5
 echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
 if test "${ac_cv_type_sigset_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24984 "configure"
+#line 25004 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24999,16 +25019,16 @@ if (sizeof (sigset_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25005: \$? = $ac_status" >&5
+  echo "$as_me:25025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25011: \$? = $ac_status" >&5
+  echo "$as_me:25031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_sigset_t=yes
 else
@@ -25018,7 +25038,7 @@ ac_cv_type_sigset_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25021: result: $ac_cv_type_sigset_t" >&5
+echo "$as_me:25041: result: $ac_cv_type_sigset_t" >&5
 echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
 if test "$ac_cv_type_sigset_t" = yes; then
 
@@ -25030,7 +25050,7 @@ fi
 
 # special check for test/ditto.c
 
-echo "$as_me:25033: checking for openpty in -lutil" >&5
+echo "$as_me:25053: 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
@@ -25038,7 +25058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25041 "configure"
+#line 25061 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25057,16 +25077,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25063: \$? = $ac_status" >&5
+  echo "$as_me:25083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25069: \$? = $ac_status" >&5
+  echo "$as_me:25089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -25077,7 +25097,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25080: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:25100: 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
@@ -25085,7 +25105,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:25088: checking for openpty header" >&5
+echo "$as_me:25108: 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
@@ -25112,7 +25132,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25115 "configure"
+#line 25135 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -25130,16 +25150,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25136: \$? = $ac_status" >&5
+  echo "$as_me:25156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25142: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -25157,7 +25177,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:25160: result: $cf_cv_func_openpty" >&5
+echo "$as_me:25180: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25230,7 +25250,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25233 "configure"
+#line 25253 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25242,16 +25262,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25248: \$? = $ac_status" >&5
+  echo "$as_me:25268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25254: \$? = $ac_status" >&5
+  echo "$as_me:25274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25268,7 +25288,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25271: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25291: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25304,7 +25324,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25307: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25327: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25315,7 +25335,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25318: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25338: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25387,7 +25407,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25390 "configure"
+#line 25410 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25399,16 +25419,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25405: \$? = $ac_status" >&5
+  echo "$as_me:25425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25411: \$? = $ac_status" >&5
+  echo "$as_me:25431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25425,7 +25445,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25448: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25505,7 +25525,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25508: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25528: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25522,23 +25542,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25525: checking for db.h" >&5
+echo "$as_me:25545: 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 25531 "configure"
+#line 25551 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25535: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25555: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25541: \$? = $ac_status" >&5
+  echo "$as_me:25561: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25557,11 +25577,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25560: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25580: 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:25564: checking for version of db" >&5
+echo "$as_me:25584: 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
@@ -25572,10 +25592,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25575: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25595: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25578 "configure"
+#line 25598 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25605,16 +25625,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:25631: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25617: \$? = $ac_status" >&5
+  echo "$as_me:25637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25628,16 +25648,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25631: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25651: 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:25635: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25655: 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:25640: checking for db libraries" >&5
+echo "$as_me:25660: 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
@@ -25667,10 +25687,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25670: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25690: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25673 "configure"
+#line 25693 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25725,16 +25745,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25731: \$? = $ac_status" >&5
+  echo "$as_me:25751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25737: \$? = $ac_status" >&5
+  echo "$as_me:25757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25754,11 +25774,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25757: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25777: 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:25761: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25781: 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
@@ -25784,7 +25804,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25787: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25807: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25799,7 +25819,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25802: checking if we should include stdbool.h" >&5
+echo "$as_me:25822: 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
@@ -25807,7 +25827,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25810 "configure"
+#line 25830 "configure"
 #include "confdefs.h"
 
 int
@@ -25819,23 +25839,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25825: \$? = $ac_status" >&5
+  echo "$as_me:25845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25831: \$? = $ac_status" >&5
+  echo "$as_me:25851: \$? = $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 25838 "configure"
+#line 25858 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25851,16 +25871,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25857: \$? = $ac_status" >&5
+  echo "$as_me:25877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25863: \$? = $ac_status" >&5
+  echo "$as_me:25883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -25874,13 +25894,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25877: result: yes" >&5
+then	echo "$as_me:25897: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25879: result: no" >&5
+else	echo "$as_me:25899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25883: checking for builtin bool type" >&5
+echo "$as_me:25903: 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
@@ -25888,7 +25908,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25891 "configure"
+#line 25911 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25903,16 +25923,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25909: \$? = $ac_status" >&5
+  echo "$as_me:25929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25915: \$? = $ac_status" >&5
+  echo "$as_me:25935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25925,9 +25945,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25928: result: yes" >&5
+then	echo "$as_me:25948: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25930: result: no" >&5
+else	echo "$as_me:25950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25944,10 +25964,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25947: checking if we already have C++ library" >&5
+	echo "$as_me:25967: 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 25950 "configure"
+#line 25970 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25961,16 +25981,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25967: \$? = $ac_status" >&5
+  echo "$as_me:25987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25973: \$? = $ac_status" >&5
+  echo "$as_me:25993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25979,7 +25999,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:25982: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -25998,7 +26018,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:26001: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:26021: 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
@@ -26024,7 +26044,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26027 "configure"
+#line 26047 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26038,16 +26058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26044: \$? = $ac_status" >&5
+  echo "$as_me:26064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26050: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -26059,7 +26079,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:26062: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -26081,7 +26101,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:26084: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26104: 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
@@ -26096,15 +26116,15 @@ CF_EOF
 # 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:26099: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26102: \$? = $ac_status" >&5
+  echo "$as_me:26122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26104: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26107: \$? = $ac_status" >&5
+  echo "$as_me:26127: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -26115,10 +26135,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:26118: result: yes" >&5
+  echo "$as_me:26138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:26121: result: no" >&5
+  echo "$as_me:26141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26138,7 +26158,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:26141: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -26159,7 +26179,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26162 "configure"
+#line 26182 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -26173,16 +26193,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26179: \$? = $ac_status" >&5
+  echo "$as_me:26199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26185: \$? = $ac_status" >&5
+  echo "$as_me:26205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26219,7 +26239,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26222 "configure"
+#line 26242 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26233,16 +26253,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26239: \$? = $ac_status" >&5
+  echo "$as_me:26259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26245: \$? = $ac_status" >&5
+  echo "$as_me:26265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26275,7 +26295,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26278: result: $cf_cxx_library" >&5
+	echo "$as_me:26298: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26291,7 +26311,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26294: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26314: 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
@@ -26308,18 +26328,18 @@ do
   # 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 26311 "configure"
+#line 26331 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26322: \$? = $ac_status" >&5
+  echo "$as_me:26342: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26342,17 +26362,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26345 "configure"
+#line 26365 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26349: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26355: \$? = $ac_status" >&5
+  echo "$as_me:26375: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26389,7 +26409,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26392: result: $CXXCPP" >&5
+echo "$as_me:26412: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26399,18 +26419,18 @@ do
   # 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 26402 "configure"
+#line 26422 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26407: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26413: \$? = $ac_status" >&5
+  echo "$as_me:26433: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26433,17 +26453,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26436 "configure"
+#line 26456 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26440: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26446: \$? = $ac_status" >&5
+  echo "$as_me:26466: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26471,7 +26491,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26474: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26486,23 +26506,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26489: checking for $ac_header" >&5
+echo "$as_me:26509: 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 26495 "configure"
+#line 26515 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26505: \$? = $ac_status" >&5
+  echo "$as_me:26525: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26521,7 +26541,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26534,23 +26554,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26537: checking for $ac_header" >&5
+echo "$as_me:26557: 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 26543 "configure"
+#line 26563 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26553: \$? = $ac_status" >&5
+  echo "$as_me:26573: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26569,7 +26589,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26580,10 +26600,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26583: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26603: 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 26586 "configure"
+#line 26606 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26600,16 +26620,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26606: \$? = $ac_status" >&5
+  echo "$as_me:26626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26612: \$? = $ac_status" >&5
+  echo "$as_me:26632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26618,7 +26638,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26621: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26629,7 +26649,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26632: checking if we should include stdbool.h" >&5
+echo "$as_me:26652: 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
@@ -26637,7 +26657,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26640 "configure"
+#line 26660 "configure"
 #include "confdefs.h"
 
 int
@@ -26649,23 +26669,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26655: \$? = $ac_status" >&5
+  echo "$as_me:26675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26661: \$? = $ac_status" >&5
+  echo "$as_me:26681: \$? = $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 26668 "configure"
+#line 26688 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26681,16 +26701,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26687: \$? = $ac_status" >&5
+  echo "$as_me:26707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26693: \$? = $ac_status" >&5
+  echo "$as_me:26713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
@@ -26704,13 +26724,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26707: result: yes" >&5
+then	echo "$as_me:26727: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26709: result: no" >&5
+else	echo "$as_me:26729: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26713: checking for builtin bool type" >&5
+echo "$as_me:26733: 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
@@ -26718,7 +26738,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26721 "configure"
+#line 26741 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26733,16 +26753,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26739: \$? = $ac_status" >&5
+  echo "$as_me:26759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26745: \$? = $ac_status" >&5
+  echo "$as_me:26765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26755,19 +26775,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26758: result: yes" >&5
+then	echo "$as_me:26778: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26760: result: no" >&5
+else	echo "$as_me:26780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26764: checking for bool" >&5
+echo "$as_me:26784: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26770 "configure"
+#line 26790 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26802,16 +26822,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26825: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26808: \$? = $ac_status" >&5
+  echo "$as_me:26828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26814: \$? = $ac_status" >&5
+  echo "$as_me:26834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26821,10 +26841,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26824: result: $ac_cv_type_bool" >&5
+echo "$as_me:26844: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26827: checking size of bool" >&5
+echo "$as_me:26847: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26833,7 +26853,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26836 "configure"
+#line 26856 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26865,21 +26885,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26871: \$? = $ac_status" >&5
+  echo "$as_me:26891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26877: \$? = $ac_status" >&5
+  echo "$as_me:26897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26882 "configure"
+#line 26902 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26911,16 +26931,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26917: \$? = $ac_status" >&5
+  echo "$as_me:26937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26923: \$? = $ac_status" >&5
+  echo "$as_me:26943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26936,7 +26956,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26939 "configure"
+#line 26959 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26968,16 +26988,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26974: \$? = $ac_status" >&5
+  echo "$as_me:26994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26980: \$? = $ac_status" >&5
+  echo "$as_me:27000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26993,7 +27013,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26996 "configure"
+#line 27016 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27025,16 +27045,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27048: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27031: \$? = $ac_status" >&5
+  echo "$as_me:27051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27037: \$? = $ac_status" >&5
+  echo "$as_me:27057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27047,12 +27067,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27050: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27070: 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 27055 "configure"
+#line 27075 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27088,15 +27108,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27094: \$? = $ac_status" >&5
+  echo "$as_me:27114: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27099: \$? = $ac_status" >&5
+  echo "$as_me:27119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27112,13 +27132,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27115: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27135: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27121: checking for type of bool" >&5
+echo "$as_me:27141: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27137,7 +27157,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27140 "configure"
+#line 27160 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27178,15 +27198,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27184: \$? = $ac_status" >&5
+  echo "$as_me:27204: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27189: \$? = $ac_status" >&5
+  echo "$as_me:27209: \$? = $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
@@ -27203,19 +27223,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27206: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27226: 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:27213: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27233: 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:27218: checking for special defines needed for etip.h" >&5
+echo "$as_me:27238: 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"
@@ -27233,7 +27253,7 @@ do
 	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 27236 "configure"
+#line 27256 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27247,16 +27267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27253: \$? = $ac_status" >&5
+  echo "$as_me:27273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27259: \$? = $ac_status" >&5
+  echo "$as_me:27279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27277,12 +27297,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27280: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27300: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27285: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27305: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27299,7 +27319,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27302 "configure"
+#line 27322 "configure"
 #include "confdefs.h"
 
 class base
@@ -27318,15 +27338,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27324: \$? = $ac_status" >&5
+  echo "$as_me:27344: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27329: \$? = $ac_status" >&5
+  echo "$as_me:27349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27345,7 +27365,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27348: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27368: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27354,7 +27374,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27357: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27377: 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
@@ -27371,7 +27391,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27374 "configure"
+#line 27394 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27390,15 +27410,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27396: \$? = $ac_status" >&5
+  echo "$as_me:27416: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27401: \$? = $ac_status" >&5
+  echo "$as_me:27421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27417,7 +27437,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27420: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27440: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27427,7 +27447,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27430: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27450: 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
@@ -27441,7 +27461,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27444 "configure"
+#line 27464 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27485,16 +27505,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27491: \$? = $ac_status" >&5
+  echo "$as_me:27511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27497: \$? = $ac_status" >&5
+  echo "$as_me:27517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27512,7 +27532,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27515: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27535: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27560,13 +27580,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27563: checking for bool" >&5
+echo "$as_me:27583: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27569 "configure"
+#line 27589 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27601,16 +27621,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27607: \$? = $ac_status" >&5
+  echo "$as_me:27627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27613: \$? = $ac_status" >&5
+  echo "$as_me:27633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27620,10 +27640,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27623: result: $ac_cv_type_bool" >&5
+echo "$as_me:27643: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27626: checking size of bool" >&5
+echo "$as_me:27646: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27632,7 +27652,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27635 "configure"
+#line 27655 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27664,21 +27684,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27670: \$? = $ac_status" >&5
+  echo "$as_me:27690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27676: \$? = $ac_status" >&5
+  echo "$as_me:27696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27681 "configure"
+#line 27701 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27710,16 +27730,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27716: \$? = $ac_status" >&5
+  echo "$as_me:27736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27722: \$? = $ac_status" >&5
+  echo "$as_me:27742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27735,7 +27755,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27738 "configure"
+#line 27758 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27767,16 +27787,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27773: \$? = $ac_status" >&5
+  echo "$as_me:27793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27779: \$? = $ac_status" >&5
+  echo "$as_me:27799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27792,7 +27812,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27795 "configure"
+#line 27815 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27824,16 +27844,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27830: \$? = $ac_status" >&5
+  echo "$as_me:27850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27836: \$? = $ac_status" >&5
+  echo "$as_me:27856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27846,12 +27866,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27849: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27869: 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 27854 "configure"
+#line 27874 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27887,15 +27907,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27893: \$? = $ac_status" >&5
+  echo "$as_me:27913: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27898: \$? = $ac_status" >&5
+  echo "$as_me:27918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27911,13 +27931,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27914: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27934: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27920: checking for type of bool" >&5
+echo "$as_me:27940: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27936,7 +27956,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27939 "configure"
+#line 27959 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27977,15 +27997,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27983: \$? = $ac_status" >&5
+  echo "$as_me:28003: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27988: \$? = $ac_status" >&5
+  echo "$as_me:28008: \$? = $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
@@ -28002,14 +28022,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:28005: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:28025: 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:28012: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:28032: 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
@@ -28040,7 +28060,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:28043: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:28063: 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
@@ -28051,7 +28071,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:28054: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:28074: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -28068,10 +28088,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:28071: result: $ADAFLAGS" >&5
+	echo "$as_me:28091: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:28074: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28094: 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
@@ -28081,11 +28101,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:28084: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28104: 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:28088: checking if GNAT supports generics" >&5
+echo "$as_me:28108: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -28095,7 +28115,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:28098: result: $cf_gnat_generics" >&5
+echo "$as_me:28118: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -28107,7 +28127,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:28110: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28130: 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
@@ -28155,7 +28175,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:28158: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28178: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -28168,7 +28188,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:28171: checking if GNAT supports project files" >&5
+echo "$as_me:28191: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28231,15 +28251,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28234: result: $cf_gnat_projects" >&5
+echo "$as_me:28254: 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:28240: checking if GNAT supports libraries" >&5
+	echo "$as_me:28260: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28242: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28262: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28259,7 +28279,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28262: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28282: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28271,7 +28291,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28274: checking for Ada95 compiler" >&5
+echo "$as_me:28294: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28282,12 +28302,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28285: result: $cf_ada_compiler" >&5
+echo "$as_me:28305: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28290: checking for Ada95 include directory" >&5
+echo "$as_me:28310: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28321,7 +28341,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28324: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28344: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28330,10 +28350,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28333: result: $ADA_INCLUDE" >&5
+echo "$as_me:28353: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28336: checking for Ada95 object directory" >&5
+echo "$as_me:28356: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28367,7 +28387,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28370: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28390: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28376,10 +28396,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28379: result: $ADA_OBJECTS" >&5
+echo "$as_me:28399: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28382: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28402: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28400,11 +28420,11 @@ then
 	fi
 fi
 
-echo "$as_me:28403: result: $with_ada_sharedlib" >&5
+echo "$as_me:28423: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28407: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28427: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28422,7 +28442,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28425: checking for Ada95 curses library name" >&5
+echo "$as_me:28445: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28438,7 +28458,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28441: result: $ADA_LIBNAME" >&5
+echo "$as_me:28461: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28449,13 +28469,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28452: checking for wchar_t" >&5
+	echo "$as_me:28472: 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 28458 "configure"
+#line 28478 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28470,16 +28490,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28493: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28476: \$? = $ac_status" >&5
+  echo "$as_me:28496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28482: \$? = $ac_status" >&5
+  echo "$as_me:28502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28489,10 +28509,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28492: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28512: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28495: checking size of wchar_t" >&5
+echo "$as_me:28515: 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
@@ -28501,7 +28521,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28504 "configure"
+#line 28524 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28513,21 +28533,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28519: \$? = $ac_status" >&5
+  echo "$as_me:28539: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28525: \$? = $ac_status" >&5
+  echo "$as_me:28545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28530 "configure"
+#line 28550 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28539,16 +28559,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28545: \$? = $ac_status" >&5
+  echo "$as_me:28565: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28551: \$? = $ac_status" >&5
+  echo "$as_me:28571: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28564,7 +28584,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28567 "configure"
+#line 28587 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28576,16 +28596,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28582: \$? = $ac_status" >&5
+  echo "$as_me:28602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28588: \$? = $ac_status" >&5
+  echo "$as_me:28608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28601,7 +28621,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28604 "configure"
+#line 28624 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28613,16 +28633,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28619: \$? = $ac_status" >&5
+  echo "$as_me:28639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28625: \$? = $ac_status" >&5
+  echo "$as_me:28645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28635,12 +28655,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28638: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28658: 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 28643 "configure"
+#line 28663 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28656,15 +28676,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28662: \$? = $ac_status" >&5
+  echo "$as_me:28682: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28667: \$? = $ac_status" >&5
+  echo "$as_me:28687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28680,7 +28700,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28683: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28703: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28693,7 +28713,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28696: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28716: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28711,7 +28731,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28714: checking for library subsets" >&5
+echo "$as_me:28734: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28765,7 +28785,7 @@ fi
 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:28768: result: $LIB_SUBSETS" >&5
+echo "$as_me:28788: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28796,7 +28816,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28799: checking default library suffix" >&5
+echo "$as_me:28819: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28807,10 +28827,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28810: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28830: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28813: checking default library-dependency suffix" >&5
+echo "$as_me:28833: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28893,10 +28913,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28896: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28916: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28899: checking default object directory" >&5
+echo "$as_me:28919: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28912,11 +28932,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28915: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28935: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28919: checking c++ library-dependency suffix" >&5
+echo "$as_me:28939: 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++)
@@ -29009,7 +29029,7 @@ else
 	fi
 
 fi
-echo "$as_me:29012: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:29032: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -29185,19 +29205,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:29188: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29208: 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 <<EOF
-#line 29193 "configure"
+#line 29213 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:29197: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29200: \$? = $ac_status" >&5
+  echo "$as_me:29220: \$? = $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
@@ -29208,10 +29228,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29211 "configure"
+#line 29231 "configure"
 #include "confdefs.h"
 
-#line 29214 "configure"
+#line 29234 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29226,16 +29246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29232: \$? = $ac_status" >&5
+  echo "$as_me:29252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29238: \$? = $ac_status" >&5
+  echo "$as_me:29258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29258,7 +29278,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29261: result: $cf_ldflags_static" >&5
+	echo "$as_me:29281: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29274,7 +29294,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29277: checking where we will install curses.h" >&5
+echo "$as_me:29297: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29284,7 +29304,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29287: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29307: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29292,7 +29312,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29295: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29315: 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
@@ -29317,7 +29337,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29320: checking for desired basename for form library" >&5
+echo "$as_me:29340: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29337,10 +29357,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29340: result: $FORM_NAME" >&5
+echo "$as_me:29360: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29343: checking for desired basename for menu library" >&5
+echo "$as_me:29363: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29360,10 +29380,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29363: result: $MENU_NAME" >&5
+echo "$as_me:29383: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29366: checking for desired basename for panel library" >&5
+echo "$as_me:29386: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29383,10 +29403,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29386: result: $PANEL_NAME" >&5
+echo "$as_me:29406: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29389: checking for desired basename for cxx library" >&5
+echo "$as_me:29409: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29406,13 +29426,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29409: result: $CXX_NAME" >&5
+echo "$as_me:29429: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29415: checking for src modules" >&5
+echo "$as_me:29435: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29471,7 +29491,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29474: result: $cf_cv_src_modules" >&5
+echo "$as_me:29494: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29632,7 +29652,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29635: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29655: 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//'`
@@ -29643,7 +29663,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29646: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29666: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29659,7 +29679,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29662: result: $PKG_CFLAGS" >&5
+echo "$as_me:29682: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29731,7 +29751,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29734: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29754: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29758,7 +29778,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29761: checking for linker search path" >&5
+echo "$as_me:29781: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29806,7 +29826,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29809: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29829: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29847,7 +29867,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29850: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29870: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29933,7 +29953,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29936: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29956: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -30114,7 +30134,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:30117: error: ambiguous option: $1
+    { { echo "$as_me:30137: 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;}
@@ -30133,7 +30153,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:30136: error: unrecognized option: $1
+  -*) { { echo "$as_me:30156: 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;}
@@ -30265,7 +30285,7 @@ do
   "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:30268: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30288: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30365,6 +30385,7 @@ s,@VERSION@,$VERSION,;t t
 s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t
 s,@VERSION_MINOR@,$VERSION_MINOR,;t t
 s,@VERSION_PATCH@,$VERSION_PATCH,;t t
+s,@PROGRAM@,$PROGRAM,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
@@ -30486,6 +30507,7 @@ s,@EXPORT_SYMS@,$EXPORT_SYMS,;t t
 s,@RESULTING_SYMS@,$RESULTING_SYMS,;t t
 s,@VERSIONED_SYMS@,$VERSIONED_SYMS,;t t
 s,@WILDCARD_SYMS@,$WILDCARD_SYMS,;t t
+s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
 s,@cf_ldd_prog@,$cf_ldd_prog,;t t
 s,@EXTRA_PKG_LDFLAGS@,$EXTRA_PKG_LDFLAGS,;t t
 s,@EXTRA_SUFFIX@,$EXTRA_SUFFIX,;t t
@@ -30791,7 +30813,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30794: creating $ac_file" >&5
+    { echo "$as_me:30816: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30809,7 +30831,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30812: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30834: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30822,7 +30844,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30825: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30847: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30838,7 +30860,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30841: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30863: 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;}
@@ -30847,7 +30869,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30850: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30872: 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;}
@@ -30892,7 +30914,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30895: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30917: 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;}
@@ -30903,7 +30925,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30906: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30928: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30952,7 +30974,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30955: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30977: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30963,7 +30985,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30966: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30988: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30976,7 +30998,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30979: error: cannot find input file: $f" >&5
+           { { echo "$as_me:31001: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31034,7 +31056,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:31037: $ac_file is unchanged" >&5
+      { echo "$as_me:31059: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31421,7 +31443,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31424: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31446: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index f4fe2d0d1..7f6c347e8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
+dnl Copyright 2018-2024,2025 Thomas E. Dickey                                *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.789 2024/12/29 00:50:56 tom Exp $
+dnl $Id: configure.in,v 1.790 2025/01/18 11:20:02 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.789 $)
+AC_REVISION($Revision: 1.790 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -659,7 +659,7 @@ WHICH_XTERM=$with_xterm_new
 AC_SUBST(WHICH_XTERM)
 
 case $host_os in
-(*linux-gnu|*cygwin|*mingw32|*msys)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl)
 	want_xterm_kbs=DEL
 	;;
 (*)
diff --git a/dist.mk b/dist.mk
index 2c83e9eda..e2eaafb44 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1650 2025/01/11 12:30:15 tom Exp $
+# $Id: dist.mk,v 1.1651 2025/01/18 11:23:10 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250111
+NCURSES_PATCH = 20250118
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 889505ed6..b1ebedcf9 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp @
+  * @Id: captoinfo.1m,v 1.69 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>captoinfo 1m 2024-09-13 ncurses 6.5 User commands</TITLE>
+<TITLE>captoinfo 1m 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">captoinfo 1m 2024-09-13 ncurses 6.5 User commands</H1>
+<H1 class="no-header">captoinfo 1m 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 
@@ -173,7 +173,7 @@ <H1 class="no-header">captoinfo 1m 2024-09-13 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  7  (2009) describes <STRONG>tic</STRONG> briefly, but omits this
+       X/Open  Curses  Issue 7  (2009)  describes  <STRONG>tic</STRONG> briefly, but omits this
        program.
 
        SVr4 systems provide <STRONG>captoinfo</STRONG> as a separate application from <STRONG>tic</STRONG>.  Its
@@ -193,7 +193,7 @@ <H1 class="no-header">captoinfo 1m 2024-09-13 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-13                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index e7da4da4f..afa825072 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.48 2024/03/16 15:35:01 tom Exp @
+  * @Id: clear.1,v 1.51 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>clear 1 2024-03-16 ncurses 6.5 User commands</TITLE>
+<TITLE>clear 1 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">clear 1 2024-03-16 ncurses 6.5 User commands</H1>
+<H1 class="no-header">clear 1 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>                         User commands                        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">clear 1 2024-03-16 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
+       Neither IEEE Std 1003.1/The  Open  Group  Base  Specifications  Issue 7
        (POSIX.1-2008) nor X/Open Curses Issue 7 documents <STRONG>clear</STRONG>.
 
        The  latter documents <STRONG>tput</STRONG>, which could be used to replace this utility
@@ -148,7 +148,7 @@ <H1 class="no-header">clear 1 2024-03-16 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-03-16                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
+ncurses 6.5                       2025-01-18                          <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index ce928a79c..3309a495a 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -67,10 +67,12 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-wadd_wch">wadd_wch</a></H3><PRE>
-       <STRONG>wadd_wch</STRONG> writes the complex character <EM>wch</EM> to the window <EM>win</EM>,  then  may
-       advance  the  cursor  position, analogously to the standard C library's
-       <STRONG>putwchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
+       <STRONG>wadd_wch</STRONG> writes the <EM>curses</EM> complex character <EM>wch</EM>  to  the  window  <EM>win</EM>,
+       then  may  advance  the  cursor position, analogously to the standard C
+       library's <STRONG>putwchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants  of  this
+       function.
 
+       Construct  a <EM>curses</EM> complex character from a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> with <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>.
        Much behavior depends on whether the wide characters in <EM>wch</EM> are spacing
        or non-spacing; see subsection "Complex Characters" below.
 
@@ -121,7 +123,7 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        A <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> can be copied from  place  to  place  using  <STRONG><A HREF="curs_in_wch.3x.html">win_wch(3x)</A></STRONG>  and
        <STRONG>wadd_wch</STRONG>.   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined constants that
-       can be usefully "or"ed with  characters.   A  complex  character  whose
+       can be usefully "or"ed with characters.  A complex character whose only
        character  component  is  a  wide  space,  and  whose only attribute is
        <STRONG>WA_NORMAL</STRONG>, is a  <EM>blank</EM>  <EM>character</EM>,  and  therefore  combines  with  the
        background character; see <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>.
@@ -129,20 +131,20 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-wecho_wchar">wecho_wchar</a></H3><PRE>
        <STRONG>echo_wchar</STRONG>   and  <STRONG>wecho_wchar</STRONG>  are  equivalent  to  calling  (<STRONG>w</STRONG>)<STRONG>add_wch</STRONG>
-       followed by (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM> interprets these functions  as  a  hint
-       that only a single (complex) character is being output; for non-control
-       characters, a considerable performance gain may be enjoyed by employing
-       them.
+       followed by (<STRONG>w</STRONG>)<STRONG>refresh</STRONG> on  <STRONG>stdscr</STRONG>  or  the  specified  window.   <EM>curses</EM>
+       interprets  these  functions  as  a  hint  that only a single (complex)
+       character is being output; for non-control characters,  a  considerable
+       performance gain may be enjoyed by employing them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
        <EM>curses</EM>  defines  macros  starting  with  <STRONG>WACS_</STRONG>  that  can  be used with
-       <STRONG>wadd_wch</STRONG> to write line-drawing and  other  special  characters  to  the
-       screen.  <EM>ncurses</EM> terms these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default
-       listed below is used if the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM>  capability  does
-       not  define  a terminal-specific replacement for it, or if the terminal
-       and locale configuration requires Unicode to  access  these  characters
-       but  the  library  is  unable  to  use Unicode.  The "acsc char" column
+       <STRONG>wadd_wch</STRONG> to  write  line-drawing  and  other  symbols  to  the  screen.
+       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
+       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
+       define  a  terminal-specific replacement for it, or if the terminal and
+       locale configuration requires Unicode to access  these  characters  but
+       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
        corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
        string capability, and the characters in it may appear on the screen if
        the terminal type's database entry incorrectly advertises ACS  support.
@@ -234,89 +236,93 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.   In  <EM>ncurses</EM>,
-       <STRONG>wadd_wch</STRONG> returns <STRONG>ERR</STRONG> if
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       In <EM>ncurses</EM>, <STRONG>wadd_wch</STRONG> and <STRONG>wecho_wchar</STRONG> return <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
        <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
-       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
-           been called on <EM>win</EM> when writing to its  bottom  right  location  is
+       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
+           been  called  on  <EM>win</EM>  when writing to its bottom right location is
            attempted, or
 
-       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
+       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
            position.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>add_wch</STRONG>,  <STRONG>mvadd_wch</STRONG>,  <STRONG>mvwadd_wch</STRONG>,  and <STRONG>echo_wchar</STRONG> may be implemented as
+       <STRONG>add_wch</STRONG>, <STRONG>mvadd_wch</STRONG>, <STRONG>mvwadd_wch</STRONG>, and <STRONG>echo_wchar</STRONG> may  be  implemented  as
        macros.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
 
 </PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       The <STRONG>TABSIZE</STRONG> variable is implemented  in  SVr4  and  other  versions  of
+       The  <STRONG>TABSIZE</STRONG>  variable  is  implemented  in  SVr4 and other versions of
        <EM>curses</EM>, but is not specified by X/Open Curses (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in X/Open Curses, Issue 4.  It specifies
+       These functions are described in X/Open Curses Issue 4.   It  specifies
        no error conditions for them.
 
-       The defaults specified for forms-drawing characters apply in the  POSIX
-       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
-       defined as a pointer to  <STRONG>cchar_t</STRONG>  data,  e.g.,  in  the  discussion  of
+       The  defaults specified for forms-drawing characters apply in the POSIX
+       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+       defined  as  a  pointer  to  <STRONG>cchar_t</STRONG>  data,  e.g., in the discussion of
        <STRONG>border_set</STRONG>.  A few implementations are problematic:
 
        <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
 
-       <STRONG>o</STRONG>   HP-UX  curses  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG> symbols  were  wide  characters.   The
-           misdefined  symbols  are the arrows and other symbols which are not
+       <STRONG>o</STRONG>   HP-UX curses equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
+           <STRONG>WACS_</STRONG>  symbols  as  if  the <STRONG>ACS_</STRONG> symbols were wide characters.  The
+           misdefined symbols are the arrows and other symbols which  are  not
            used for line-drawing.
 
-       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
+       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
        SVr4 curses implementations defined their line-drawing symbols in terms
-       of intermediate symbols.  This implementation  extends  those  symbols,
+       of  intermediate  symbols.   This implementation extends those symbols,
        providing new definitions which are not in the SVr4 implementations.
 
-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
-       alternate character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with  their
-       corresponding  line-drawing  characters.  X/Open Curses did not address
-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
-       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
+       corresponding line-drawing characters.  X/Open Curses did  not  address
+       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
+       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
        the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
        implementations  can  only  use  single-byte  line-drawing  characters.
-       <EM>ncurses</EM> 5.3 (2002) provided a table of Unicode values  to  solve  these
+       <EM>ncurses</EM>  5.3  (2002)  provided a table of Unicode values to solve these
        problems.  NetBSD curses incorporated that table in 2010.
 
-       In  this  implementation,  the  Unicode  values are used instead of the
+       In this implementation, the Unicode values  are  used  instead  of  the
        terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment  variable  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.   In contrast, for the same
+       environment variable <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.  In contrast,  for  the  same
        cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use only
        the ASCII default values.
 
-       Having  Unicode available does not solve all of the problems with line-
+       Having Unicode available does not solve all of the problems with  line-
        drawing for curses:
 
-       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics  <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>
-           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
+       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
+           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
            the terminal used.
 
-       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
-           terminal  in the early 1980s.  There is no accessible documentation
+       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
+           terminal in the early 1980s.  There is no accessible  documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
-           since  they  lie  outside the BMP and as a result are not generally
-           available in terminals.  They are not storm lanterns, in any case.
+           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+           since they lie outside the Basic Multilingual Plane and as a result
+           are unavailable on many terminals.  They are not storm lanterns, in
+           any case.
 
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
@@ -350,12 +356,13 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by  X/Open  Curses,  Issue  4.
-       The   System V   Interface  Definition,  Version  4  (1995),  specified
-       functions named <EM>waddwch</EM> and <EM>wechowchar</EM> (and the usual variants).  These
-       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
-       They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that they
-       each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+       (1995).   The  System V Interface Definition Version 4 of the same year
+       specified  functions  named  <EM>waddwch</EM>  and  <EM>wechowchar</EM>  (and  the  usual
+       variants).   These were later additions to SVr4.<EM>x</EM>, not appearing in the
+       first SVr4 (1989).  They differed  from  X/Open's  later  <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>  and
+       <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM>  in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead
+       of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -363,12 +370,12 @@ <H1 class="no-header">curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>,   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>,  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putwc(3)</STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index b18f70935..2ca3ccccf 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -58,22 +58,26 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</H
        <STRONG>int</STRONG> <STRONG>add_wchstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG>  <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvadd_wchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>add_wchnstr(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG>  <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG>  <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wchstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>wadd_wchstr</STRONG>  copies  the  string  of  complex  characters <EM>wchstr</EM> to the
        window <EM>win</EM>.  A null complex character  terminates  the  string.   If  a
        complex  character  does  not  completely  fit  at the end of the line,
-       <EM>curses</EM> fills the remaining columns  with  the  window  background;  see
-       <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.    <STRONG>wadd_wchnstr</STRONG>  does  the  same,  but  copies  at  most  <EM>n</EM>
-       characters, or as many as possible if <EM>n</EM> is <STRONG>-1</STRONG>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes
-       the variants of these functions.
+       <EM>curses</EM>  fills  its  remaining  cells  with  the   window's   background
+       character;  see  <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>.  <STRONG>wadd_wchnstr</STRONG> does the same, but copies at
+       most <EM>n</EM> characters, or as many as possible  if  <EM>n</EM>  is  <STRONG>-1</STRONG>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+       describes the variants of these functions.
 
        Because  these  functions do not call <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> internally, they are
        faster than <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG> and <STRONG><A HREF="curs_addwstr.3x.html">waddnwstr(3x)</A></STRONG>.  On the other hand, they
@@ -109,17 +113,17 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by  X/Open  Curses,  Issue  4.
-       The   System V   Interface  Definition,  Version  4  (1995),  specified
-       functions named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and  the  usual  variants).
-       These  were  later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4
-       (1989).  They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM> and <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM>
-       in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       These functions were initially specified by X/Open Curses Issue 4.  The
+       System V  Interface  Definition  Version 4  (1995), specified functions
+       named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and the usual variants).  These  were
+       later  additions  to  SVr4.<EM>x</EM>,  not  appearing in the first SVr4 (1989).
+       They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM> and <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM> in  that
+       they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -130,7 +134,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-12-28               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 93059ab86..ba3072c77 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -71,67 +71,73 @@ <H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        the   cursor   position,   analogously  to  the  standard  C  library's
        <STRONG>putchar(3)</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
+       Construct a <EM>curses</EM> character from a  <EM>char</EM>  by  assignment.   Subsection
+       "Video  Attributes"  of  <STRONG><A HREF="curs_attr.3x.html">attron(3x)</A></STRONG>  describes  how  to  manipulate its
+       attributes and color pair.  (A color  pair  selection  is  not  honored
+       unless initialized; see <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>.)
+
        If advancement occurs at the right margin,
 
-       <STRONG>o</STRONG>   the cursor automatically wraps to the beginning of the  next  line,
+       <STRONG>o</STRONG>   the  cursor  automatically wraps to the beginning of the next line,
            then,
 
-       <STRONG>o</STRONG>   if   it  was  at  the  bottom  of  the  scrolling  region,  and  if
-           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is enabled for <EM>win</EM>, the scrolling  region  scrolls  up
+       <STRONG>o</STRONG>   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
+           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  enabled  for <EM>win</EM>, the scrolling region scrolls up
            one line.
 
-       If  <EM>ch</EM>  is  a backspace, carriage return, line feed, or tab, the cursor
+       If <EM>ch</EM> is a backspace, carriage return, line feed, or  tab,  the  cursor
        moves appropriately within the window.
 
-       <STRONG>o</STRONG>   Backspace moves the cursor one character left; at the  left  margin
+       <STRONG>o</STRONG>   Backspace  moves  the cursor one character left; at the left margin
            of a window, it does nothing.
 
-       <STRONG>o</STRONG>   Carriage  return  moves  the  cursor to the left margin on the same
+       <STRONG>o</STRONG>   Carriage return moves the cursor to the left  margin  on  the  same
            line of the window.
 
-       <STRONG>o</STRONG>   Line feed does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from  the  right
+       <STRONG>o</STRONG>   Line  feed  does a <STRONG><A HREF="curs_clear.3x.html">clrtoeol(3x)</A></STRONG>, then advances as if from the right
            margin.
 
-       <STRONG>o</STRONG>   Tab  advances the cursor to the next tab stop (possibly on the next
-           line); these are placed at every eighth column by  default.   Alter
-           the    tab    interval    with    the    <STRONG>TABSIZE</STRONG>   extension;   see
+       <STRONG>o</STRONG>   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    <STRONG>TABSIZE</STRONG>    extension;    see
            <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       If <EM>ch</EM> is any other nonprintable character, it  is  drawn  in  printable
+       If  <EM>ch</EM>  is  any  other nonprintable character, it is drawn in printable
        form using the same convention as <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>.  Calling <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> on the
-       location of a nonprintable character  does  not  return  the  character
+       location  of  a  nonprintable  character  does not return the character
        itself, but its <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG> representation.
 
-       The  object or expression <EM>ch</EM> may contain attributes and/or a color pair
-       identifier.  (A  <EM>chtype</EM>  can  be  copied  from  place  to  place  using
-       <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG>  and  <STRONG>waddch</STRONG>.)   See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for values of predefined
-       constants that can be usefully "or"ed  with  characters.   A  <EM>ch</EM>  whose
-       character  component  is a space, and whose only attribute is <STRONG>A_NORMAL</STRONG>,
-       is a <EM>blank</EM>  <EM>character</EM>,  and  therefore  combines  with  the  background
+       The object or expression <EM>ch</EM> may contain attributes and/or a color  pair
+       identifier.   (A  <EM>chtype</EM>  can  be  copied  from  place  to  place using
+       <STRONG><A HREF="curs_inch.3x.html">winch(3x)</A></STRONG> and <STRONG>waddch</STRONG>.)  See  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>  for  values  of  predefined
+       constants  that  can  be  usefully  "or"ed with characters.  A <EM>ch</EM> whose
+       character component is a space, and whose only attribute  is  <STRONG>A_NORMAL</STRONG>,
+       is  a  <EM>blank</EM>  <EM>character</EM>,  and  therefore  combines  with the background
        character; see <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>.
 
 
 </PRE><H3><a name="h3-wechochar">wechochar</a></H3><PRE>
-       <STRONG>echochar</STRONG>  and  <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG> followed by
-       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>.  <EM>curses</EM>  interprets  these  functions  as  a  hint  to  its
-       optimizer  that  only  a  single  character cell in the window is being
-       altered between refreshes; for non-control characters,  a  considerable
-       performance gain may be enjoyed by employing them.
+       <STRONG>echochar</STRONG> and <STRONG>wechochar</STRONG> are equivalent to calling (<STRONG>w</STRONG>)<STRONG>addch</STRONG>  followed  by
+       (<STRONG>w</STRONG>)<STRONG>refresh</STRONG>  on <STRONG>stdscr</STRONG> or the specified window.  <EM>curses</EM> interprets these
+       functions as a hint to its optimizer that only a single character  cell
+       in  the  window  is  being  altered  between refreshes; for non-control
+       characters, a considerable performance gain may be enjoyed by employing
+       them.
 
 
 </PRE><H3><a name="h3-Forms-Drawing-Characters">Forms-Drawing Characters</a></H3><PRE>
        <EM>curses</EM>  defines  macros starting with <STRONG>ACS_</STRONG> that can be used with <STRONG>waddch</STRONG>
-       to write line-drawing and  other  special  characters  to  the  screen.
-       <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
-       below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
-       define  a  terminal-specific replacement for it, or if the terminal and
-       locale configuration requires Unicode to access  these  characters  but
-       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
-       corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
-       string capability, and the characters in it may appear on the screen if
-       the terminal type's database entry incorrectly advertises ACS  support.
-       The name "ACS" originates in the Alternate Character Set feature of the
-       DEC VT100 terminal.
+       to write line-drawing and other symbols to the screen.   <EM>ncurses</EM>  terms
+       these  <EM>forms-drawing</EM>  <EM>characters.</EM>  The ACS default listed below is used
+       if the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not define a terminal-
+       specific   replacement   for   it,   or  if  the  terminal  and  locale
+       configuration requires Unicode  to  access  these  characters  but  the
+       library  is  unable to use Unicode.  The "acsc char" column corresponds
+       to how the characters are specified  in  the  <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  string
+       capability,  and  the  characters in it may appear on the screen if the
+       terminal type's database entry incorrectly advertises ACS support.  The
+       name "ACS" originates in the Alternate Character Set feature of the DEC
+       VT100 terminal.
 
                       <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
        <STRONG>Symbol</STRONG>         <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
@@ -173,7 +179,9 @@ <H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> and <STRONG>wechochar</STRONG> return <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
        <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
 
@@ -213,11 +221,11 @@ <H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
        The defaults specified for forms-drawing characters apply in the  POSIX
        locale.
@@ -320,7 +328,7 @@ <H1 class="no-header">curs_addch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 5f986e677..a97f9ddeb 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -57,12 +57,14 @@ <H1 class="no-header">curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>addchstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddchstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddchstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addchnstr(const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddchnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddchnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>chtype</STRONG> <STRONG>*</STRONG> <EM>chstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -104,8 +106,11 @@ <H1 class="no-header">curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -120,7 +125,7 @@ <H1 class="no-header">curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index f50a67fba..19ebe5c66 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -62,17 +62,16 @@ <H1 class="no-header">curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>addnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>waddstr</STRONG> writes the characters of the (null-terminated)  string  <EM>str</EM>  to
-       the window <EM>win</EM>, as if by calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> for each <EM>char</EM> in <EM>str</EM>.
-
-       <STRONG>waddnstr</STRONG>  is  similar,  but  writes  at most <EM>n</EM> characters.  If <EM>n</EM> is -1,
-       <STRONG>waddnstr</STRONG> writes the entire string.
-
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
+       the  window  <EM>win</EM>,  as  if  by  calling <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG> for each <EM>char</EM> in <EM>str</EM>.
+       <STRONG>waddnstr</STRONG> is similar, but writes at most <EM>n</EM>  characters.   If  <EM>n</EM>  is  -1,
+       <STRONG>waddnstr</STRONG>  writes the entire string.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants
+       of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -91,16 +90,19 @@ <H1 class="no-header">curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these functions except <STRONG>waddnstr</STRONG> may be macros.
+       All of these functions except <STRONG>waddnstr</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>waddstr</EM>  along  with  its  variants,  the
+       4BSD  (1980)  <EM>curses</EM>  introduced  <EM>waddstr</EM>  along with its variants, the
        latter defined as macros.
 
        SVr3.1 (1987) added <EM>waddnstr</EM> (and its variants) redefining <EM>waddstr</EM> as a
@@ -108,14 +110,14 @@ <H1 class="no-header">curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 59c2cfb02..44e626153 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -58,12 +58,14 @@ <H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>addwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addnwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>waddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -71,11 +73,8 @@ <H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        character string <EM>wstr</EM> to the  window  <EM>win</EM>,  as  if  by  constructing  a
        <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  for  each  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>wstr</EM>, then calling <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> with the
        resulting <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.  <EM>curses</EM> processes spacing and non-spacing characters
-       in <EM>wstr</EM> one at a time.
-
-       <STRONG>waddnwstr</STRONG>  is  similar,  but writes at most <EM>n</EM> wide characters.  If <EM>n</EM> is
-       -1, <STRONG>waddnwstr</STRONG> writes the entire wide string.
-
+       in <EM>wstr</EM> one at a time.  <STRONG>waddnwstr</STRONG> is similar, but writes at most <EM>n</EM> wide
+       characters.  If <EM>n</EM> is -1,  <STRONG>waddnwstr</STRONG>  writes  the  entire  wide  string.
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
@@ -90,7 +89,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -99,13 +98,18 @@ <H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The System V Interface Definition, Version 4 (1995), specified <EM>waddwstr</EM>
-       and <EM>waddnwstr</EM> (and the usual variants).  These were later additions  to
-       SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+       (1995).  The System V Interface Definition Version 4 of the  same  year
+       specified  functions  named  <EM>waddwstr</EM>  and  <EM>waddnwstr</EM>  (and  the  usual
+       variants).  These were later additions to SVr4.<EM>x</EM>, not appearing in  the
+       first SVr4 (1989).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -116,7 +120,7 @@ <H1 class="no-header">curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 7afa149cc..3e7a01cb4 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -121,93 +121,94 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        Use <STRONG>wattr_get</STRONG> to retrieve attributes for the given window.
 
        Use <STRONG>attr_on</STRONG> and <STRONG>wattr_on</STRONG> to turn on  window  attributes,  i.e.,  values
-       OR'd  together  in  <EM>attr</EM>,  without  affecting  other  attributes.   Use
-       <STRONG>attr_off</STRONG> and <STRONG>wattr_off</STRONG> to turn off window attributes, again values OR'd
-       together in <EM>attr</EM>, without affecting other attributes.
+       logically "or"-ed together in <EM>attr</EM>, without affecting other attributes.
+       Use <STRONG>attr_off</STRONG> and <STRONG>wattr_off</STRONG> to turn off window attributes, again  values
+       logically "or"-ed together in <EM>attr</EM>, without affecting other attributes.
 
 
 </PRE><H3><a name="h3-Legacy-Window-Attributes">Legacy Window Attributes</a></H3><PRE>
        The  X/Open  window attribute routines which <EM>set</EM> or <EM>get</EM>, turn <EM>on</EM> or <EM>off</EM>
-       are extensions of older routines which assume that color pairs are OR'd
-       into  the attribute parameter.  These newer routines use similar names,
-       because X/Open simply added an underscore (<STRONG>_</STRONG>) for the newer names.
+       are extensions of older routines which  assume  that  color  pairs  are
+       logically  "or"-ed  into the attribute parameter.  These newer routines
+       use similar names, because X/Open simply added an  underscore  (<STRONG>_</STRONG>)  for
+       the newer names.
 
        The <EM>int</EM> datatype used in the legacy routines is treated as if it is the
-       same  size  as  <EM>chtype</EM>  (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It holds the common video
-       attributes (such as bold, reverse), as well as a few  bits  for  color.
-       Those  bits  correspond  to  the  <STRONG>A_COLOR</STRONG> symbol.  The <STRONG>COLOR_PAIR</STRONG> macro
-       provides a value which can be OR'd into the attribute  parameter.   For
-       example,  as  long as that value fits into the <STRONG>A_COLOR</STRONG> mask, then these
-       calls produce similar results:
+       same size as <EM>chtype</EM> (used by <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>).  It  holds  the  common  video
+       attributes  (such  as  bold, reverse), as well as a few bits for color.
+       Those bits correspond to the  <STRONG>A_COLOR</STRONG>  symbol.   The  <STRONG>COLOR_PAIR</STRONG>  macro
+       provides  a  value  which  can  be logically "or"-ed into the attribute
+       parameter.  For example, as long as that value fits  into  the  <STRONG>A_COLOR</STRONG>
+       mask, then these calls produce similar results:
 
            attrset(A_BOLD | COLOR_PAIR(<EM>pair</EM>));
            attr_set(A_BOLD, <EM>pair</EM>, NULL);
 
        However, if the value does not fit, then the <STRONG>COLOR_PAIR</STRONG> macro uses only
-       the  bits  that fit.  For example, because in <EM>ncurses</EM> <STRONG>A_COLOR</STRONG> has eight
+       the bits that fit.  For example, because in <EM>ncurses</EM> <STRONG>A_COLOR</STRONG>  has  eight
        (8) bits, then <STRONG>COLOR_PAIR(</STRONG><EM>259</EM><STRONG>)</STRONG> is 4 (i.e., 259 is 4 more than the limit
        255).
 
-       The  <STRONG>PAIR_NUMBER</STRONG>  macro extracts a pair number from an <EM>int</EM> (or <EM>chtype</EM>).
-       For example, the <EM>input</EM> and <EM>output</EM> values in these statements  would  be
+       The <STRONG>PAIR_NUMBER</STRONG> macro extracts a pair number from an <EM>int</EM>  (or  <EM>chtype</EM>).
+       For  example,  the <EM>input</EM> and <EM>output</EM> values in these statements would be
        the same:
 
            int value = A_BOLD | COLOR_PAIR(<EM>input</EM>);
            int <EM>output</EM> = PAIR_NUMBER(value);
 
-       The  <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 <EM>curses</EM> but kept
-       in X/Open Curses  for  the  same  reason  that  SVr4  <EM>curses</EM>  kept  it:
+       The <STRONG>attrset</STRONG> routine is a legacy feature predating SVr4 <EM>curses</EM> but  kept
+       in  X/Open  Curses  for  the  same  reason  that  SVr4  <EM>curses</EM> kept it:
        compatibility.
 
-       The  remaining  <STRONG>attr</STRONG>*  functions operate exactly like the corresponding
-       <STRONG>attr_</STRONG>* functions, except that they take arguments of  type  <EM>int</EM>  rather
+       The remaining <STRONG>attr</STRONG>* functions operate exactly  like  the  corresponding
+       <STRONG>attr_</STRONG>*  functions,  except  that they take arguments of type <EM>int</EM> rather
        than <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>.
 
-       There  is  no  corresponding <STRONG>attrget</STRONG> function as such in X/Open Curses,
+       There is no corresponding <STRONG>attrget</STRONG> function as such  in  X/Open  Curses,
        although <EM>ncurses</EM> provides <STRONG>getattrs</STRONG> (see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Change-Character-Rendition">Change Character Rendition</a></H3><PRE>
        The  routine  <STRONG>chgat</STRONG>  changes  the  attributes  of  a  given  number  of
-       characters  starting at the current cursor location of <STRONG>stdscr</STRONG>.  It does
+       characters starting at the current cursor location of <STRONG>stdscr</STRONG>.  It  does
        not update the cursor and does not perform wrapping.  A character count
-       of  -1  or  greater  than  the  remaining  window width means to change
-       attributes all the way to the end of  the  current  line.   The  <STRONG>wchgat</STRONG>
-       function  generalizes  this to any window; the <STRONG>mvwchgat</STRONG> function does a
+       of -1 or greater than  the  remaining  window  width  means  to  change
+       attributes  all  the  way  to  the end of the current line.  The <STRONG>wchgat</STRONG>
+       function generalizes this to any window; the <STRONG>mvwchgat</STRONG> function  does  a
        cursor move before acting.
 
-       In these functions, the color <EM>pair</EM> argument is a color pair  index  (as
+       In  these  functions, the color <EM>pair</EM> argument is a color pair index (as
        in the first argument of <STRONG>init_pair</STRONG>, see <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>).
 
 
 </PRE><H3><a name="h3-Change-Window-Color">Change Window Color</a></H3><PRE>
        The routine <STRONG>color_set</STRONG> sets the current color of the given window to the
-       foreground/background  combination  described   by   the   color   <EM>pair</EM>
+       foreground/background   combination   described   by   the  color  <EM>pair</EM>
        parameter.
 
 
 </PRE><H3><a name="h3-Standout">Standout</a></H3><PRE>
-       The  routine  <STRONG>standout</STRONG>  is the same as <STRONG>attron(A_STANDOUT)</STRONG>.  The routine
-       <STRONG>standend</STRONG> is the same as <STRONG>attrset(A_NORMAL)</STRONG> or <STRONG>attrset(0)</STRONG>,  that  is,  it
+       The routine <STRONG>standout</STRONG> is the same as  <STRONG>attron(A_STANDOUT)</STRONG>.   The  routine
+       <STRONG>standend</STRONG>  is  the  same as <STRONG>attrset(A_NORMAL)</STRONG> or <STRONG>attrset(0)</STRONG>, that is, it
        turns off all attributes.
 
        X/Open Curses does not mark these "restricted", because
 
        <STRONG>o</STRONG>   they have well established legacy use, and
 
-       <STRONG>o</STRONG>   there  is  no  ambiguity  about  the  way  the  attributes might be
+       <STRONG>o</STRONG>   there is no  ambiguity  about  the  way  the  attributes  might  be
            combined with a color pair.
 
 
 </PRE><H3><a name="h3-Video-Attributes">Video Attributes</a></H3><PRE>
-       The following video attributes, defined in <STRONG>&lt;curses.h&gt;</STRONG>, can be passed to
-       the  routines <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, and <STRONG>attrset</STRONG>, or OR'd with the characters
-       passed to <STRONG>addch</STRONG> (see <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>).
+       The  following  video attributes, defined in <EM>curses.h</EM>, can be passed to
+       <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG>, and logically "or"-ed with characters  passed
+       to <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>.
 
               <STRONG>Name</STRONG>           <STRONG>Description</STRONG>
               -----------------------------------------------------------------
               <STRONG>A_NORMAL</STRONG>       Normal display (no highlight)
-              <STRONG>A_STANDOUT</STRONG>     Best highlighting mode of the terminal
+              <STRONG>A_STANDOUT</STRONG>     Best highlighting mode available
               <STRONG>A_UNDERLINE</STRONG>    Underlining
               <STRONG>A_REVERSE</STRONG>      Reverse video
               <STRONG>A_BLINK</STRONG>        Blinking
@@ -217,15 +218,12 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
               <STRONG>A_INVIS</STRONG>        Invisible or blank mode
               <STRONG>A_ALTCHARSET</STRONG>   Alternate character set
               <STRONG>A_ITALIC</STRONG>       Italics (non-X/Open extension)
-              <STRONG>A_CHARTEXT</STRONG>     Bit-mask to extract a character
-              <STRONG>A_COLOR</STRONG>        Bit-mask to extract a color (legacy routines)
+              <STRONG>A_ATTRIBUTES</STRONG>   Mask to extract character code
+              <STRONG>A_CHARTEXT</STRONG>     Mask to extract atributes
+              <STRONG>A_COLOR</STRONG>        Mask to extract color pair identifier
 
-       You can thus use <STRONG>A_CHARTEXT</STRONG> to extract the  character  from  a  <EM>chtype</EM>,
-       <STRONG>A_ATTRIBUTES</STRONG>  to  obtain  its rendering attributes, and <STRONG>A_COLOR</STRONG> to find
-       the color pair it uses.
-
-       These video attributes are supported by <STRONG>attr_on</STRONG> and  related  functions
-       (which also support the attributes recognized by <STRONG>attron</STRONG>, etc.):
+       <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  and  <STRONG>attr_set</STRONG> support the foregoing as well as the
+       following additional attributes.
 
               <STRONG>Name</STRONG>            <STRONG>Description</STRONG>
               -----------------------------------------------------------------
@@ -236,11 +234,6 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
               <STRONG>WA_TOP</STRONG>          Top highlight
               <STRONG>WA_VERTICAL</STRONG>     Vertical highlight
 
-       The  return  values  of many of these routines are not meaningful (they
-       are implemented as macro-expanded assignments and simply  return  their
-       argument).   The  SVr4 manual page claims (falsely) that these routines
-       always return <STRONG>1</STRONG>.
-
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
@@ -256,16 +249,18 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       These functions may be macros:
+       <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>, <STRONG>wattr_set</STRONG>, <STRONG>chgat</STRONG>, <STRONG>mvchgat</STRONG>, <STRONG>mvwchgat</STRONG>, and
+       <STRONG>color_set</STRONG> are  part  of  <EM>ncurses</EM>'s  wide-character  API,  and  are  not
+       available in its non-wide configuration.
 
-              <STRONG>attroff</STRONG>,  <STRONG>wattroff</STRONG>, <STRONG>attron</STRONG>, <STRONG>wattron</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>standend</STRONG>
-              and <STRONG>standout</STRONG>.
+       <STRONG>attron</STRONG>,  <STRONG>wattron</STRONG>,  <STRONG>attroff</STRONG>,  <STRONG>wattroff</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>standout</STRONG>, and
+       <STRONG>standend</STRONG> may be implemented as macros.
 
-       Color pair values can only be OR'd with attributes if the  pair  number
-       is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can pass a
-       color pair value directly.  However, <EM>ncurses</EM> ABI 4 and 5 simply OR this
-       value  within  the  alternate functions.  You must use <EM>ncurses</EM> ABI 6 to
-       support more than 256 color pairs.
+       Color pair values be logically "or"-ed  with  attributes  if  the  pair
+       number is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can
+       pass a color pair value directly.  However, <EM>ncurses</EM> ABI 4 and 5  simply
+       logically "or" this value within the alternate functions.  You must use
+       <EM>ncurses</EM> ABI 6 to support more than 256 color pairs.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
@@ -296,22 +291,25 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions are described in X/Open Curses, Issue 4.  It specifies
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
        no error conditions for them.
 
        The standard defined the dedicated type for highlights,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>,  which
        was  not defined in SVr4 <EM>curses</EM>.  The functions taking <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> arguments
        were not supported under SVr4.
 
+       SVr4 describes the functions not taking <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  or  <EM>pair</EM>  arguments  as
+       always returning <STRONG>1</STRONG>.
+
        Very old versions of this library did not force an update of the screen
-       when  changing  the  attributes.   Use  <STRONG>touchwin</STRONG> to force the screen to
+       when changing the attributes.  Use <STRONG>touchwin</STRONG>  to  force  the  screen  to
        match the updated attributes.
 
-       X/Open  Curses  states   that   whether   the   traditional   functions
-       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG>  can  manipulate  attributes other than <STRONG>A_BLINK</STRONG>,
-       <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is  "unspecified".
-       Under  this  implementation  as  well  as  SVr4 <EM>curses</EM>, these functions
-       correctly manipulate all other highlights (specifically,  <STRONG>A_ALTCHARSET</STRONG>,
+       X/Open   Curses   states   that   whether   the  traditional  functions
+       <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG> can manipulate attributes  other  than  <STRONG>A_BLINK</STRONG>,
+       <STRONG>A_BOLD</STRONG>,  <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is "unspecified".
+       Under this implementation as  well  as  SVr4  <EM>curses</EM>,  these  functions
+       correctly  manipulate all other highlights (specifically, <STRONG>A_ALTCHARSET</STRONG>,
        <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
 
        X/Open Curses added these entry points:
@@ -319,7 +317,7 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
               <STRONG>attr_get</STRONG>,  <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>,  <STRONG>wattr_on</STRONG>,  <STRONG>wattr_off</STRONG>,
               <STRONG>wattr_get</STRONG>, <STRONG>wattr_set</STRONG>
 
-       The new functions are intended to work with a new series  of  highlight
+       The  new  functions are intended to work with a new series of highlight
        macros prefixed with <STRONG>WA_</STRONG>.  The older macros have direct counterparts in
        the newer set of names:
 
@@ -332,94 +330,91 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
               <STRONG>WA_BLINK</STRONG>        Blinking
               <STRONG>WA_DIM</STRONG>          Half bright
               <STRONG>WA_BOLD</STRONG>         Extra bright or bold
-
               <STRONG>WA_ALTCHARSET</STRONG>   Alternate character set
 
-       X/Open Curses does not assign values to  these  symbols,  nor  does  it
-       state  whether or not they are related to the similarly-named A_NORMAL,
+       X/Open  Curses  does  not  assign  values to these symbols, nor does it
+       state whether or not they are related to the similarly-named  A_NORMAL,
        etc.:
 
-       <STRONG>o</STRONG>   X/Open Curses specifies that each  pair  of  corresponding  <STRONG>A_</STRONG>  and
-           <STRONG>WA_</STRONG>-using   functions   operates   on  the  same  current-highlight
+       <STRONG>o</STRONG>   X/Open  Curses  specifies  that  each  pair of corresponding <STRONG>A_</STRONG> and
+           <STRONG>WA_</STRONG>-using  functions  operates  on   the   same   current-highlight
            information.
 
-       <STRONG>o</STRONG>   However, in some  implementations,  those  symbols  have  unrelated
+       <STRONG>o</STRONG>   However,  in  some  implementations,  those  symbols have unrelated
            values.
 
            For example, the Solaris <EM>xpg4</EM> (X/Open) <EM>curses</EM> declares <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> to be
-           an unsigned short integer (16-bits), while  <EM>chtype</EM>  is  a  unsigned
+           an  unsigned  short  integer  (16-bits), while <EM>chtype</EM> is a unsigned
            integer (32-bits).  The <STRONG>WA_</STRONG> symbols in this case are different from
-           the <STRONG>A_</STRONG> symbols because they are used for a smaller  datatype  which
+           the  <STRONG>A_</STRONG>  symbols because they are used for a smaller datatype which
            does not represent <STRONG>A_CHARTEXT</STRONG> or <STRONG>A_COLOR</STRONG>.
 
            In this implementation (as in many others), the values happen to be
-           the same because it simplifies copying information  between  <EM>chtype</EM>
+           the  same  because it simplifies copying information between <EM>chtype</EM>
            and <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> variables.
 
-       <STRONG>o</STRONG>   Because  <EM>ncurses</EM>'s  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  can  hold  a color pair (in the <STRONG>A_COLOR</STRONG>
-           field), a call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may  alter  the
-           window's  color.   If  the  color pair information in the attribute
+       <STRONG>o</STRONG>   Because <EM>ncurses</EM>'s <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> can hold a  color  pair  (in  the  <STRONG>A_COLOR</STRONG>
+           field),  a  call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may alter the
+           window's color.  If the color pair  information  in  the  attribute
            parameter is zero, no change is made to the window's color.
 
            This is consistent with SVr4 <EM>curses</EM>; X/Open Curses does not specify
            this.
 
-       The  X/Open  Curses  extended  conformance  level  adds  new highlights
-       <STRONG>A_HORIZONTAL</STRONG>,  <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>   (and
-       corresponding  <STRONG>WA_</STRONG>  macros  for  each).   As  of  August 2013, no known
+       The X/Open  Curses  extended  conformance  level  adds  new  highlights
+       <STRONG>A_HORIZONTAL</STRONG>,   <STRONG>A_LEFT</STRONG>,   <STRONG>A_LOW</STRONG>,   <STRONG>A_RIGHT</STRONG>,   <STRONG>A_TOP</STRONG>,   <STRONG>A_VERTICAL</STRONG>  (and
+       corresponding <STRONG>WA_</STRONG> macros for  each).   As  of  August  2013,  no  known
        terminal provides these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open Curses is largely based  on  SVr4  <EM>curses</EM>,  adding  support  for
-       "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
-       differences from SVr4 <EM>curses</EM> address the way video  attributes  can  be
-       applied  to wide-characters.  But aside from that, <STRONG>attrset</STRONG> and <STRONG>attr_set</STRONG>
-       are similar.  SVr4 <EM>curses</EM> provided the basic features for  manipulating
-       video  attributes.  However, earlier versions of <EM>curses</EM> provided a part
-       of these features.
-
-       As seen in 2.8BSD, <EM>curses</EM> assumed 7-bit characters,  using  the  eighth
-       bit  of  a byte to represent the <EM>standout</EM> feature (often implemented as
-       bold and/or reverse video).  The BSD <EM>curses</EM> library provided  functions
-       <STRONG>standout</STRONG>  and  <STRONG>standend</STRONG> which were carried along into X/Open Curses due
-       to their pervasive use in legacy applications.
-
-       Some  terminals  in  the  1980s  could  support  a  variety  of   video
-       attributes,  although  the  BSD  <EM>curses</EM>  library  could do nothing with
-       those.  System V  (1983)  provided  an  improved  <EM>curses</EM>  library.   It
-       defined  the <STRONG>A_</STRONG> symbols for use by applications to manipulate the other
-       attributes.  There are few useful references for the chronology.
-
-       Goodheart's book <EM>UNIX</EM> <EM>Curses</EM> <EM>Explained</EM> (1991)  describes  SVr3  (1987),
-       commenting on several functions:
-
-       <STRONG>o</STRONG>   the  <STRONG>attron</STRONG>,  <STRONG>attroff</STRONG>, <STRONG>attrset</STRONG> functions (and most of the functions
-           found in SVr4 but not in BSD <EM>curses</EM>) were introduced by System V,
-
-       <STRONG>o</STRONG>   the alternate character set feature with <STRONG>A_ALTCHARSET</STRONG> was added  in
-           SVr2 and improved in SVr3 (by adding <STRONG>acs_map[]</STRONG>),
-
-       <STRONG>o</STRONG>   <STRONG>start_color</STRONG>  and  related color-functions were introduced by System
-           V.3.2,
-
-       <STRONG>o</STRONG>   pads, soft-keys were added in SVr3, and
-
-       Goodheart did not mention the background character or the <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> type.
-       Those  are respectively SVr3.1 and X/Open features.  He did mention the
-       <STRONG>A_</STRONG> constants, but did not indicate their values.  Those  were  not  the
-       same in different systems, even for those marked as System V.
-
-       Different  Unix  systems  used  different  sizes  for the bit-fields in
-       <EM>chtype</EM> for <EM>characters</EM> and <EM>colors</EM>, and took into account  the  different
-       integer sizes (32-bit versus 64-bit).
-
-       This  table  showing  the number of bits for <STRONG>A_COLOR</STRONG> and <STRONG>A_CHARTEXT</STRONG> was
-       gleaned from the <EM>curses</EM> header files for various operating systems  and
-       architectures.   The inferred architecture and notes reflect the format
-       and size of the  defined  constants  as  well  as  clues  such  as  the
-       alternate  character  set implementation.  A 32-bit library can be used
-       on a 64-bit system, but not necessarily the reverse.
+       4BSD  (1980)  <EM>curses</EM> used a <EM>char</EM> to represent each cell of the terminal
+       screen.  It assumed 7-bit character codes, employing the eighth bit  of
+       a  byte  to  represent  a <EM>standout</EM> attribute (often implemented as bold
+       and/or reverse video).  It introduced  <EM>standout</EM>,  <EM>standend</EM>,  <EM>wstandout</EM>,
+       and   <EM>wstandend</EM>  functions  to  manipulate  this  bit.   Despite  their
+       inflexibility, they carried over into System V  <EM>curses</EM>  and  ultimately
+       X/Open Curses due to their pervasive use in legacy applications.  While
+       some 1980s terminals supported  a  variety  of  video  attributes,  BSD
+       <EM>curses</EM> could do nothing with them.
+
+       SVr2  (1984) provided an improved <EM>curses</EM> library, introducing <EM>chtype</EM> to
+       create the abstract notion of a <EM>curses</EM> character; this was  by  default
+       an  <EM>unsigned</EM>  <EM>short</EM>,  with a provision for compile-time redefinition to
+       other integral types (a freedom not necessarily available to  users  of
+       shared  libraries,  and  in any event a source license was necessary to
+       exercise  it).   It  added  the  functions  <EM>attron</EM>,  <EM>attroff</EM>,  <EM>attrset</EM>,
+       <EM>wattron</EM>, <EM>wattroff</EM>, and <EM>wattrset</EM>, and defined the <EM>A</EM><STRONG>_</STRONG> macros listed above
+       (except for <EM>A</EM><STRONG>_</STRONG><EM>ITALIC</EM> and <EM>A</EM><STRONG>_</STRONG><EM>COLOR</EM>) for use by applications to manipulate
+       other  attributes.  The values of these macros were not necessarily the
+       same in different systems, even among those certified as System V.
+
+       SVr3.2 (1988) added the <EM>A</EM><STRONG>_</STRONG><EM>COLOR</EM> macro along with a  color  system;  see
+       <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
+
+       X/Open  Curses is largely based on SVr4 <EM>curses</EM>, but recognized that the
+       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> type of ISO C95 was intended to house only a  single  character
+       code,  not  a  sequence  of  codes combining with a base character, let
+       alone could it reliably offer room for a color pair  identifier  and  a
+       set  of  attribute bits with a potential for further growth -- thus the
+       standard invented the <EM>curses</EM>  complex  character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  and  a
+       separate  type  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  for  storage  of attribute bits.  The new types
+       brought  along  several  new  functions  to   manipulate   them,   some
+       corresponding  to  existing  <EM>chtype</EM>-based functions (<EM>attr</EM><STRONG>_</STRONG><EM>on</EM>, <EM>attr</EM><STRONG>_</STRONG><EM>off</EM>,
+       <EM>attr</EM><STRONG>_</STRONG><EM>set</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>on</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>off</EM>, and <EM>wattr</EM><STRONG>_</STRONG><EM>set</EM>), and some new (<EM>color</EM><STRONG>_</STRONG><EM>set</EM>,
+       <EM>wcolor</EM><STRONG>_</STRONG><EM>set</EM>, <EM>chgat</EM>, <EM>wchgat</EM>, <EM>mvchgat</EM>, and <EM>mvwchgat</EM>).
+
+       Different  Unix systems used differently sized bit fields in <EM>chtype</EM> for
+       the character code and the color pair identifier, and took into account
+       platforms' different integer sizes (32- versus 64-bit).
+
+       The  following  table  showing  the  number  of  bits  for  <EM>A</EM><STRONG>_</STRONG><EM>COLOR</EM> and
+       <EM>A</EM><STRONG>_</STRONG><EM>CHARTEXT</EM> was  gleaned  from  the  <EM>curses</EM>  header  files  for  various
+       operating  systems  and  architectures.   The inferred architecture and
+       notes reflect the format and size of the defined constants as  well  as
+       clues  such  as  the  alternate character set implementation.  A 32-bit
+       library can be used  on  a  64-bit  system,  but  not  necessarily  the
+       converse.
 
                                      <STRONG>Bits</STRONG>
        <STRONG>Year</STRONG>  <STRONG>System</STRONG>        <STRONG>Arch</STRONG>   <STRONG>Color</STRONG>  <STRONG>Char</STRONG>  <STRONG>Notes</STRONG>
@@ -434,21 +429,21 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        1996  AIX 4.2       32     7      16    X/Open <EM>curses</EM>
        1996  OSF/1 r4      32     6      16    X/Open <EM>curses</EM>
        1997  HP-UX 11.00   32     6      8     X/Open <EM>curses</EM>
-       2000  U/Win         32/64  7/31   16    uses <EM>chtype</EM>
+       2000  UWIN          32/64  7/31   16    uses <EM>chtype</EM>
 
        Notes:
 
           Regarding HP-UX,
 
-          <STRONG>o</STRONG>   HP-UX 10.20 (1996) added support for 64-bit  PA-RISC  processors
+          <STRONG>o</STRONG>   HP-UX  10.20  (1996) added support for 64-bit PA-RISC processors
               in 1996.
 
-          <STRONG>o</STRONG>   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
+          <STRONG>o</STRONG>   HP-UX 10.30 (1997) marked "curses_colr" obsolete.  That  version
               of <EM>curses</EM> was dropped with HP-UX 11.30 in 2006.
 
           Regarding OSF/1 (and Tru64),
 
-          <STRONG>o</STRONG>   These used 64-bit hardware.   Like  <EM>ncurses</EM>,  the  OSF/1  <EM>curses</EM>
+          <STRONG>o</STRONG>   These  used  64-bit  hardware.   Like  <EM>ncurses</EM>, the OSF/1 <EM>curses</EM>
               interface is not customized for 32-bit and 64-bit versions.
 
           <STRONG>o</STRONG>   Unlike  other  systems  which  evolved  from  AT&amp;T  code,  OSF/1
@@ -458,37 +453,38 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
           <STRONG>o</STRONG>   The initial release of Solaris was in 1992.
 
-          <STRONG>o</STRONG>   The <EM>xpg4</EM> (X/Open) Curses was developed by MKS from 1990 to 1995.
-              Sun's copyright began in 1996.
+          <STRONG>o</STRONG>   Its   XPG4   (X/Open   Curses-conforming)  <EM>xcurses</EM>  library  was
+              developed by Mortice Kern Systems  from  1990  to  1995.   Sun's
+              copyright began in 1996.
 
           <STRONG>o</STRONG>   Sun updated the X/Open Curses interface after 64-bit support was
               introduced  in  1997,  but  did  not  modify  the  SVr4   <EM>curses</EM>
               interface.
 
-          Regarding U/Win,
+          Regarding UWIN,
 
           <STRONG>o</STRONG>   Development  of  the  <EM>curses</EM>  library  began in 1991, stopped in
               2000.
 
           <STRONG>o</STRONG>   Color support was added in 1998.
 
-          <STRONG>o</STRONG>   The library uses only <EM>chtype</EM> (no <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>).
+          <STRONG>o</STRONG>   The library uses only <EM>chtype</EM> (not <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>).
 
        Once X/Open Curses was adopted in the mid-1990s, the  constraint  of  a
        32-bit interface with many colors and wide-characters for <EM>chtype</EM> became
        a moot point.  The <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure (whose size and  members  are  not
        specified in X/Open Curses) could be extended as needed.
 
-       Other interfaces are rarely used now:
+       Other interfaces are rarely used now.
 
        <STRONG>o</STRONG>   BSD  <EM>curses</EM> was improved slightly in 1993/1994 using Keith Bostic's
            modification to make the library 8-bit clean for <STRONG>nvi(1)</STRONG>.  He  moved
-           <EM>standout</EM> attribute to a structure member.
+           the <EM>standout</EM> attribute to a structure member.  The resulting 4.4BSD
+           <EM>curses</EM> was replaced by <EM>ncurses</EM> over the next ten years.
 
-           The  resulting  4.4BSD <EM>curses</EM> was replaced by <EM>ncurses</EM> over the next
-           ten years.
+       <STRONG>o</STRONG>   UWIN has been defunct since 2012.
 
-       <STRONG>o</STRONG>   U/Win is rarely used now.
+       <EM>ncurses</EM> 6.0 (2015) added the <EM>A</EM><STRONG>_</STRONG><EM>ITALIC</EM> macro.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -497,7 +493,7 @@ <H1 class="no-header">curs_attr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index a75d5d4bc..18d547ab8 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp @
+  * @Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -82,8 +82,8 @@ <H1 class="no-header">curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        On SVr4 <EM>curses</EM>, they always return <STRONG>OK</STRONG>, and X/Open Curses specifies them
        as doing so.
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_beep 3x 2024-07-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-20                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html
index d3b55ddf1..7bd389f5d 100644
--- a/doc/html/man/curs_bkgd.3x.html
+++ b/doc/html/man/curs_bkgd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_bkgd.3x,v 1.74 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 
@@ -64,28 +64,28 @@ <H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       Every <EM>curses</EM> window has a background property.  In the  library's  non-
-       wide  configuration,  this property is a <EM>chtype</EM> which combines a set of
-       attributes with the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>).   The
-       background character is a spacing character.
+       Every <EM>curses</EM>  window  has  a  <EM>background</EM>  <EM>character</EM>  property:  in  the
+       library's  non-wide  configuration,  it  is a <EM>curses</EM> character (<EM>chtype</EM>)
+       that combines a set of attributes (and, if colors are enabled, a  color
+       pair  identifier)  with  a  character  code.  When erasing (parts of) a
+       window, <EM>curses</EM> replaces the erased cells with the background character.
 
-       When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
-       background character.  <EM>curses</EM> also  uses  the  window  background  when
-       writing characters to the screen.
+       <EM>curses</EM> also uses the background character when writing characters to  a
+       populated window.
 
-       <STRONG>o</STRONG>   The  attribute  part  of the background combines with all non-blank
-           characters written into the window,  as  with  the  <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>  and
-           <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> families of functions.
+       <STRONG>o</STRONG>   The  attribute  part  of the background character combines with all
+           non-blank character cells  in  the  window,  as  populated  by  the
+           <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>  and  <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG>  families  of functions (and those that
+           call them).
 
-       <STRONG>o</STRONG>   Both  the  character  and attribute parts of the background combine
-           with blank characters that are written into the window.
+       <STRONG>o</STRONG>   Both the character code and attributes of the background  character
+           combine with blank character cells in the window.
 
-       The background becomes a property of the character and  moves  with  it
-       through any scrolling and insert/delete line/character operations.
-
-       To  the  extent  possible  on  a  given  terminal,  <EM>curses</EM> displays the
-       attributes of the background as the graphic rendition of the  character
-       put on the screen.
+       The  background character's set of attributes becomes a property of the
+       character cell and move with it through any scrolling and insert/delete
+       line/character  operations.   To  the  extent  possible on the terminal
+       type, <EM>curses</EM> displays the attributes of the background character as the
+       graphic rendition of a character cell on the display.
 
 
 </PRE><H3><a name="h3-bkgd_wbkgd">bkgd, wbkgd</a></H3><PRE>
@@ -108,9 +108,9 @@ <H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            specified  background  character; if they match, <EM>ncurses</EM> writes the
            new background character to the cell.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color; that is, its color pair
-           value  is  nonzero.   If not, it simply replaces the attributes and
-           color  pair  in  the  cell  with  those  from  the  new  background
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks whether the cell uses color; that is, its color
+           pair  value  is nonzero.  If not, it simply replaces the attributes
+           and color pair in the cell  with  those  from  the  new  background
            character.
 
        <STRONG>o</STRONG>   If  the  cell  uses color, and its background color matches that of
@@ -125,65 +125,66 @@ <H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            the current background, and then adding  attributes  from  the  new
            background.
 
-       If  the  new  background's character is nonspacing, <EM>ncurses</EM> retains the
-       existing background character, except for  one  special  case:  <EM>ncurses</EM>
-       treats a background character value of zero (0) as a space.
+       If the new background's character is non-spacing (for example, if it is
+       a  control  character),  <EM>ncurses</EM>  retains   the   existing   background
+       character,  except  for  one  special case: <EM>ncurses</EM> treats a background
+       character code of zero (0) as a space.
 
-       If  the  terminal  does  not  support  color,  or if color has not been
-       initialized with <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>, <EM>ncurses</EM> ignores  the  new  background
-       character's color attribute.
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       character's color pair selection.
 
 
 </PRE><H3><a name="h3-bkgdset_wbkgdset">bkgdset, wbkgdset</a></H3><PRE>
-       <STRONG>bkgdset</STRONG>  and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the applicable
+       <STRONG>bkgdset</STRONG> and  <STRONG>wbkgdset</STRONG>  manipulate  the  background  of  the  applicable
        window, without updating the character cells as <STRONG>bkgd</STRONG> and <STRONG>wbkgd</STRONG> do; only
        future writes reflect the updated background.
 
 
 </PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
-       <STRONG>getbkgd</STRONG>  returns  the  given window's background character, attributes,
+       <STRONG>getbkgd</STRONG> returns the given window's  background  character,  attributes,
        and color pair as a <EM>chtype</EM>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value
+       <STRONG>bkgdset</STRONG> and <STRONG>wbkgdset</STRONG> do not return a value.
 
        Functions returning an <EM>int</EM> return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
        In <EM>ncurses</EM>, failure occurs if
 
-       <STRONG>o</STRONG>   if the library has not been initialized, or
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized, or
 
-       <STRONG>o</STRONG>   if <EM>win</EM> is <EM>NULL</EM>.
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>.
 
        <STRONG>getbkgd</STRONG>'s return value is as described above.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Unusually,  there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one would
+       Unusually, there is no <STRONG>wgetbkgd</STRONG> function; <STRONG>getbkgd</STRONG> behaves as one  would
        expect <STRONG>wgetbkgd</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
 
        <STRONG>bkgd</STRONG> and <STRONG>bkgdset</STRONG> may be implemented as macros.
 
-       X/Open Curses mentions that the character part of the  background  must
-       be  a  single-byte  value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, checks to ensure
-       that, and retains the existing background character if the check fails.
+       X/Open  Curses  mentions that the character part of the background must
+       be a single-byte value.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>,  checks  to  ensure
+       that  it is, and retains the existing background character if the check
+       fails.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.   It  indicates  that
-       <EM>bkgd</EM>,  <EM>wbkgd</EM>,  and  <EM>getbkgd</EM>  return  <STRONG>ERR</STRONG> on failure (in the case of the
+       X/Open Curses Issue 4 describes these  functions.   It  indicates  that
+       <EM>bkgd</EM>,  <EM>wbkgd</EM>,  and  <EM>getbkgd</EM>  return  <EM>ERR</EM> on failure (in the case of the
        last, this value is cast to <EM>chtype</EM>), but specifies no error  conditions
        for them.
 
-       SVr4  documentation  says  that  <EM>bkgd</EM>  and  <EM>wbkgd</EM>  return <STRONG>OK</STRONG> "or a non-
-       negative integer if <STRONG>immedok</STRONG> is set", which refers to the  return  value
-       from  <EM>wrefresh()</EM>,  used  to  implement  the immediate repainting.  SVr4
-       <EM>curses</EM>'s <EM>wrefresh</EM> returns the  number  of  characters  written  to  the
-       screen during the refresh; that of <EM>ncurses</EM> does not.
+       SVr4  documentation  says  that  <EM>bkgd</EM>  and  <EM>wbkgd</EM>  return <EM>OK</EM> "or a non-
+       negative integer if <EM>immedok()</EM> is set", referring to  the  return  value
+       from  <EM>wrefresh</EM>,  which in SVr4 returns a count of characters written to
+       the window if its <EM>immedok</EM> property is set; in <EM>ncurses</EM>, it does not.
 
-       Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
-       rendition of characters on  the  screen  updates  when  <EM>bkgd</EM>  or  <EM>wbkgd</EM>
-       changes  the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does not
+       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
+       rendition  of  characters  in  the  window  updates  when <EM>bkgd</EM> or <EM>wbkgd</EM>
+       changes the background character.  <EM>ncurses</EM>, like SVr4 <EM>curses</EM>, does  not
        (in  its  non-wide  configuration)  store  the  background  and  window
        attribute contributions to each character cell separately.
 
@@ -193,14 +194,14 @@ <H1 class="no-header">curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>  describes  the  corresponding  functions  in  the wide
+       <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG> describes  the  corresponding  functions  in  the  wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index e740754ac..4622fe5e6 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -65,84 +65,85 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       Every <EM>curses</EM> window has a background property.  In the  library's  wide
-       configuration,  this  property  is  a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  which combines a set of
-       attributes with the  <EM>background</EM>  <EM>character</EM>  (see  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>).   The
-       background character is a spacing character.
+       Every <EM>curses</EM>  window  has  a  <EM>background</EM>  <EM>character</EM>  property:  in  the
+       library's   wide  configuration,  it  is  a  <EM>curses</EM>  complex  character
+       (<EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>) that combines  a  set  of  attributes  (and,  if  colors  are
+       enabled,  a color pair identifier) with a character code.  When erasing
+       (parts of)  a  window,  <EM>curses</EM>  replaces  the  erased  cells  with  the
+       background character.
 
-       When  erasing  parts  of  the  screen,  <EM>curses</EM> fills the cells with the
-       background character.  <EM>curses</EM> also  uses  the  window  background  when
-       writing characters to the screen.
+       <EM>curses</EM>  also uses the background character when writing characters to a
+       populated window.
 
-       <STRONG>o</STRONG>   The  attribute  part  of the background combines with all non-blank
-           characters written into the window, as with  the  <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>  and
-           <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions.
+       <STRONG>o</STRONG>   The attribute part of the background character  combines  with  all
+           non-blank  character  cells  in  the  window,  as  populated by the
+           <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG> and <STRONG><A HREF="curs_ins_wch.3x.html">wins_wch(3x)</A></STRONG> families of functions (and those that
+           call them).
 
-       <STRONG>o</STRONG>   Both  the  character  and attribute parts of the background combine
-           with blank characters that are written into the window.
+       <STRONG>o</STRONG>   Both  the character code and attributes of the background character
+           combine with blank character cells in the window.
 
-       The background becomes a property of the character and  moves  with  it
-       through any scrolling and insert/delete line/character operations.
-
-       To  the  extent  possible  on  a  given  terminal,  <EM>curses</EM> displays the
-       attributes of the background as the graphic rendition of the  character
-       put on the screen.
+       The background character's set of attributes becomes a property of  the
+       character cell and move with it through any scrolling and insert/delete
+       line/character operations.  To the  extent  possible  on  the  terminal
+       type, <EM>curses</EM> displays the attributes of the background character as the
+       graphic rendition of a character cell on the display.
 
 
 </PRE><H3><a name="h3-bkgrnd_wbkgrnd">bkgrnd, wbkgrnd</a></H3><PRE>
-       <STRONG>bkgrnd</STRONG>  and  <STRONG>wbkgrnd</STRONG>  set  the  background  property  of  <STRONG>stdscr</STRONG> or the
+       <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG>  set  the  background  property  of  <STRONG>stdscr</STRONG>  or  the
        specified window and then apply this setting to every character cell in
        that window.
 
-       <STRONG>o</STRONG>   The  rendition  of every character in the window changes to the new
+       <STRONG>o</STRONG>   The rendition of every character in the window changes to  the  new
            background rendition.
 
        <STRONG>o</STRONG>   Wherever the former background character appears, it changes to the
            new background character.
 
-       <EM>ncurses</EM>  updates  the rendition of each character cell by comparing the
+       <EM>ncurses</EM> updates the rendition of each character cell by  comparing  the
        character, non-color attributes, and color pair selection.  The library
-       applies  to  following procedure to each cell in the window, whether or
+       applies to following procedure to each cell in the window,  whether  or
        not it is blank.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> first compares  the  cell's  character  to  the  previously
-           specified  background  character; if they match, <EM>ncurses</EM> writes the
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  first  compares  the  cell's  character  to the previously
+           specified background character; if they match, <EM>ncurses</EM>  writes  the
            new background character to the cell.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks if the cell uses color; that is, its color pair
-           value  is  nonzero.   If not, it simply replaces the attributes and
-           color  pair  in  the  cell  with  those  from  the  new  background
+       <STRONG>o</STRONG>   <EM>ncurses</EM> then checks whether the cell uses color; that is, its color
+           pair value is nonzero.  If not, it simply replaces  the  attributes
+           and  color  pair  in  the  cell  with those from the new background
            character.
 
-       <STRONG>o</STRONG>   If  the  cell  uses color, and its background color matches that of
-           the current window background, <EM>ncurses</EM> removes attributes that  may
-           have  come  from the current background and adds those from the new
-           background.  It finishes by setting the cell's  background  to  use
+       <STRONG>o</STRONG>   If the cell uses color, and its background color  matches  that  of
+           the  current window background, <EM>ncurses</EM> removes attributes that may
+           have come from the current background and adds those from  the  new
+           background.   It  finishes  by setting the cell's background to use
            the new window background color.
 
-       <STRONG>o</STRONG>   If  the  cell  uses  color, and its background color does not match
-           that of the current window background,  <EM>ncurses</EM>  updates  only  the
-           non-color  attributes, first removing those that may have come from
-           the current background, and then adding  attributes  from  the  new
+       <STRONG>o</STRONG>   If the cell uses color, and its background  color  does  not  match
+           that  of  the  current  window background, <EM>ncurses</EM> updates only the
+           non-color attributes, first removing those that may have come  from
+           the  current  background,  and  then adding attributes from the new
            background.
 
-       If the new background's character is nonspacing, <EM>ncurses</EM> reuses the old
-       background character, except for one special  case:  <EM>ncurses</EM>  treats  a
-       background character value of zero (0) as a space.
+       If the new background's character is non-spacing,  <EM>ncurses</EM>  reuses  the
+       old background character, except for one special case: <EM>ncurses</EM> treats a
+       background character code of zero (0) as a space.
 
-       If  the  terminal  does  not  support  color,  or if color has not been
-       initialized with <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>, <EM>ncurses</EM> ignores  the  new  background
-       character's color attribute.
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>,  <EM>ncurses</EM> ignores the new background
+       character's color pair selection.
 
 
 </PRE><H3><a name="h3-bkgrndset_wbkgrndset">bkgrndset, wbkgrndset</a></H3><PRE>
-       <STRONG>bkgrndset</STRONG>  and  <STRONG>wbkgrndset</STRONG>  manipulate the background of the applicable
-       window, without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG>  do;
+       <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> manipulate the background  of  the  applicable
+       window,  without updating the character cells as <STRONG>bkgrnd</STRONG> and <STRONG>wbkgrnd</STRONG> do;
        only future writes reflect the updated background.
 
 
 </PRE><H3><a name="h3-getbkgrnd_wgetbkgrnd">getbkgrnd, wgetbkgrnd</a></H3><PRE>
-       <STRONG>getbkgrnd</STRONG>  and  <STRONG>wgetbkgrnd</STRONG>  respectively  obtain  <STRONG>stdscr</STRONG>'s or the given
+       <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> respectively  obtain  <STRONG>stdscr</STRONG>'s  or  the  given
        window's background character, attributes, and color pair, and store it
        in their <EM>wch</EM> argument.
 
@@ -150,8 +151,10 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>bkgrndset</STRONG> and <STRONG>wbkgrndset</STRONG> do not return a value.
 
-       The  other  functions  return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.  In
-       <EM>ncurses</EM>, failure occurs if
+       Functions returning an <EM>int</EM> return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
+       In <EM>ncurses</EM>, failure occurs if
+
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
        <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>, or
 
@@ -161,33 +164,33 @@ <H1 class="no-header">curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>bkgrnd</STRONG>, <STRONG>bkgrndset</STRONG>, and <STRONG>getbkgrnd</STRONG> may be implemented as macros.
 
-       Unlike their counterparts in the  non-wide  configuration  of  <EM>ncurses</EM>,
-       <STRONG>getbkgrnd</STRONG>  and <STRONG>wgetbkgrnd</STRONG> supply the background character and attribute
-       in a modifiable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, not as the return value.
+       Unlike  their  counterparts  in  the non-wide configuration of <EM>ncurses</EM>,
+       <STRONG>getbkgrnd</STRONG> and <STRONG>wgetbkgrnd</STRONG> store the background character in a modifiable
+       <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> parameter, rather than supplying it as the return value.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        X/Open Curses does not provide details of how the rendition is updated.
-       <EM>ncurses</EM> follows the approach used in SVr4 <EM>curses</EM>'s  non-wide  functions
+       <EM>ncurses</EM>  follows  the approach used in SVr4 <EM>curses</EM>'s non-wide functions
        for manipulating the window background.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by X/Open Curses, Issue 4.
+       These functions were initially specified by X/Open Curses Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>  describes  the  corresponding  functions in the non-wide
+       <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG> describes the corresponding  functions  in  the  non-wide
        configuration of <EM>ncurses</EM>.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 53dc4d8e0..c01c729e0 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp @
+  * @Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -115,33 +115,37 @@ <H1 class="no-header">curs_border 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines return the integer <STRONG>OK</STRONG>.  The SVr4.0 manual says "or a non-
-       negative integer if <STRONG>immedok</STRONG> is set", but this appears to be an error.
+       All routines return the integer <STRONG>OK</STRONG>.
 
        This implementation returns <STRONG>ERR</STRONG> if the window pointer is null.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  borders  generated  by these functions are <EM>inside</EM> borders (this is
-       also true of SVr4 curses, though the fact is not documented).
+       <STRONG>border</STRONG> and <STRONG>box</STRONG> may be implemented as macros.
 
-       Note that <STRONG>border</STRONG> and <STRONG>box</STRONG> may be macros.
+       The borders generated by these functions are <EM>inside</EM>  borders  (this  is
+       also true of SVr4 curses, though the fact is not documented).
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  It  specifies
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
        no error conditions for them.
 
+       SVr4 documentation says that these  functions  return  <EM>OK</EM>  "or  a  non-
+       negative  integer  if  <EM>immedok()</EM> is set", referring to the return value
+       from <EM>wrefresh</EM>, which in SVr4 returns a count of characters  written  to
+       the window if its <EM>immedok</EM> property is set; in <EM>ncurses</EM>, it does not.
+
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-07-27                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 9b7fb55df..6347f56b1 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -151,12 +151,12 @@ <H1 class="no-header">curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note   that   <STRONG>border_set</STRONG>,    <STRONG>hline_set</STRONG>,    <STRONG>mvhline_set</STRONG>,    <STRONG>mvvline_set</STRONG>,
-       <STRONG>mvwhline_set</STRONG>, <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be macros.
+       <STRONG>border_set</STRONG>,   <STRONG>hline_set</STRONG>,   <STRONG>mvhline_set</STRONG>,   <STRONG>mvvline_set</STRONG>,    <STRONG>mvwhline_set</STRONG>,
+       <STRONG>mvwvline_set</STRONG>, and <STRONG>vline_set</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       These functions are described in X/Open Curses Issue 4.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -164,7 +164,7 @@ <H1 class="no-header">curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-05-25               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 6b5874e7a..953fdd7ba 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_clear.3x,v 1.58 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_clear 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_clear 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        All routines return the integer <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no error conditions.  In this implementation,
+       In this implementation,
 
        <STRONG>o</STRONG>   functions using a window pointer parameter return <STRONG>ERR</STRONG> if it is null
 
@@ -106,29 +106,30 @@ <H1 class="no-header">curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>erase</STRONG>, <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, and <STRONG>clrtoeol</STRONG>  may  be
-       macros.
+       <STRONG>erase</STRONG>, <STRONG>werase</STRONG>, <STRONG>clear</STRONG>, <STRONG>wclear</STRONG>, <STRONG>clrtobot</STRONG>, and <STRONG>clrtoeol</STRONG> may be implemented
+       as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       The  SVr4.0  manual  says  that these functions could return "or a non-
-       negative integer if <STRONG>immedok</STRONG> is set", referring to the  return-value  of
-       <STRONG>wrefresh</STRONG>.  In that implementation, <STRONG>wrefresh</STRONG> would return a count of the
-       number of characters written to the terminal.
+       SVr4 documentation says that these  functions  return  <EM>OK</EM>  "or  a  non-
+       negative  integer  if  <EM>immedok()</EM> is set", referring to the return value
+       from <EM>wrefresh</EM>, which in SVr4 returns a count of characters  written  to
+       the window if its <EM>immedok</EM> property is set; in <EM>ncurses</EM>, it does not.
 
-       Some historic curses implementations had, as an  undocumented  feature,
+       Some  historic  curses implementations had, as an undocumented feature,
        the  ability  to  do  the  equivalent  of  <STRONG>clearok(...,</STRONG>  <STRONG>1)</STRONG>  by  saying
        <STRONG>touchwin(stdscr)</STRONG> or <STRONG>clear(stdscr)</STRONG>.  This will not work under <EM>ncurses</EM>.
 
-       This implementation, and others  such  as  Solaris,  sets  the  current
-       position  to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is not
-       documented  in  other  implementations,  and  may  not   be   true   of
+       This  implementation,  and  others  such  as  Solaris, sets the current
+       position to 0,0 after erasing via <STRONG>werase</STRONG> and <STRONG>wclear</STRONG>.  That fact is  not
+       documented   in   other   implementations,  and  may  not  be  true  of
        implementations which were not derived from SVr4 source.
 
        Not obvious from the description, most implementations clear the screen
-       after <STRONG>wclear</STRONG> even for a subwindow or derived window.   If  you  do  not
+       after  <STRONG>wclear</STRONG>  even  for  a subwindow or derived window.  If you do not
        want to clear the screen during the next <STRONG>wrefresh</STRONG>, use <STRONG>werase</STRONG> instead.
 
 
@@ -137,7 +138,7 @@ <H1 class="no-header">curs_clear 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 483319f61..a09b76b9d 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp @
+  * @Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_color 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -52,7 +52,7 @@ <H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>extended_color_content</STRONG>,    <STRONG>extended_pair_content</STRONG>,    <STRONG>reset_color_pairs</STRONG>,
        <STRONG>COLOR_PAIR</STRONG>, <STRONG>PAIR_NUMBER</STRONG>, <STRONG>COLORS</STRONG>, <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLOR_BLACK</STRONG>,  <STRONG>COLOR_RED</STRONG>,
        <STRONG>COLOR_GREEN</STRONG>,   <STRONG>COLOR_YELLOW</STRONG>,   <STRONG>COLOR_BLUE</STRONG>,  <STRONG>COLOR_MAGENTA</STRONG>,  <STRONG>COLOR_CYAN</STRONG>,
-       <STRONG>COLOR_WHITE</STRONG> - manipulate terminal colors with <EM>curses</EM>
+       <STRONG>COLOR_WHITE</STRONG>, <STRONG>A_COLOR</STRONG> - manipulate terminal colors with <EM>curses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -82,8 +82,18 @@ <H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs(void);</STRONG>
 
+       <EM>/*</EM> <EM>macros</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>COLOR_PAIR(int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>PAIR_NUMBER(int</STRONG> <EM>attr</EM><STRONG>);</STRONG>
+       <STRONG>COLOR_BLACK</STRONG>
+       <STRONG>COLOR_RED</STRONG>
+       <STRONG>COLOR_GREEN</STRONG>
+       <STRONG>COLOR_YELLOW</STRONG>
+       <STRONG>COLOR_BLUE</STRONG>
+       <STRONG>COLOR_MAGENTA</STRONG>
+       <STRONG>COLOR_CYAN</STRONG>
+       <STRONG>COLOR_WHITE</STRONG>
+       <STRONG>A_COLOR</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -165,372 +175,378 @@ <H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        Some terminals support more than the eight (8)  "ANSI"  colors.   There
        are no standard names for those additional colors.
 
+       <STRONG>A_COLOR</STRONG>  is  a  bit  mask  that extracts a color pair identifier from a
+       <EM>chtype</EM>.
+
 
 </PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
-       is  initialized  by  <STRONG>start_color</STRONG>  to  the  maximum number of colors the
+       is initialized by <STRONG>start_color</STRONG> to  the  maximum  number  of  colors  the
        terminal can support.
 
 
 </PRE><H3><a name="h3-COLOR_PAIRS">COLOR_PAIRS</a></H3><PRE>
-       is initialized by <STRONG>start_color</STRONG> to the maximum number of color pairs  the
+       is  initialized by <STRONG>start_color</STRONG> to the maximum number of color pairs the
        terminal can support.  Often, its value is the product <STRONG>COLORS</STRONG> x <STRONG>COLORS</STRONG>,
        but this is not always true.
 
-       <STRONG>o</STRONG>   A few terminals use the HLS color space  (see  <STRONG>start_color</STRONG>  below),
+       <STRONG>o</STRONG>   A  few  terminals  use the HLS color space (see <STRONG>start_color</STRONG> below),
            ignoring this rule; and
 
-       <STRONG>o</STRONG>   terminals  supporting  a  large number of colors are limited to the
+       <STRONG>o</STRONG>   terminals supporting a large number of colors are  limited  to  the
            number of color pairs that a <EM>signed</EM> <EM>short</EM> value can represent.
 
 
 </PRE><H2><a name="h2-FUNCTIONS">FUNCTIONS</a></H2><PRE>
 
 </PRE><H3><a name="h3-start_color">start_color</a></H3><PRE>
-       The <STRONG>start_color</STRONG> routine requires no arguments.  It must  be  called  if
-       the  programmer  wants  to  use  colors,  and  before  any  other color
-       manipulation routine is called.  It  is  good  practice  to  call  this
+       The  <STRONG>start_color</STRONG>  routine  requires no arguments.  It must be called if
+       the programmer  wants  to  use  colors,  and  before  any  other  color
+       manipulation  routine  is  called.   It  is  good practice to call this
        routine right after <STRONG>initscr</STRONG>.  <STRONG>start_color</STRONG> does this:
 
-       <STRONG>o</STRONG>   It   initializes  two  global  variables,  <STRONG>COLORS</STRONG>  and  <STRONG>COLOR_PAIRS</STRONG>
+       <STRONG>o</STRONG>   It  initializes  two  global  variables,  <STRONG>COLORS</STRONG>  and   <STRONG>COLOR_PAIRS</STRONG>
            (respectively defining the maximum number of colors and color pairs
            the terminal can support).
 
-       <STRONG>o</STRONG>   It  initializes  the special color pair <STRONG>0</STRONG> to the default foreground
+       <STRONG>o</STRONG>   It initializes the special color pair <STRONG>0</STRONG> to the  default  foreground
            and background colors.  No other color pairs are initialized.
 
-       <STRONG>o</STRONG>   It restores the colors on the terminal to the values they had  when
+       <STRONG>o</STRONG>   It  restores the colors on the terminal to the values they had when
            the terminal was just turned on.
 
-       <STRONG>o</STRONG>   If  the  terminal supports the <STRONG>initc</STRONG> (<STRONG>initialize_color</STRONG>) capability,
-           <STRONG>start_color</STRONG> initializes its internal table  representing  the  red,
+       <STRONG>o</STRONG>   If the terminal supports the <STRONG>initc</STRONG>  (<STRONG>initialize_color</STRONG>)  capability,
+           <STRONG>start_color</STRONG>  initializes  its  internal table representing the red,
            green, and blue components of the color palette.
 
            The components depend on whether the terminal uses CGA (aka "ANSI")
-           or HLS (i.e.,  the  <STRONG>hls</STRONG>  (<STRONG>hue_lightness_saturation</STRONG>)  capability  is
-           set).   The  table  is  initialized  first  for  eight basic colors
-           (black, red, green, yellow, blue, magenta, cyan, and white),  using
+           or  HLS  (i.e.,  the  <STRONG>hls</STRONG>  (<STRONG>hue_lightness_saturation</STRONG>) capability is
+           set).  The table  is  initialized  first  for  eight  basic  colors
+           (black,  red, green, yellow, blue, magenta, cyan, and white), using
            weights that depend upon the CGA/HLS choice.  For "ANSI" colors the
-           weights are <STRONG>680</STRONG> or <STRONG>0</STRONG> depending on whether  the  corresponding  red,
-           green,  or  blue component is used or not.  That permits using <STRONG>1000</STRONG>
-           to represent bold/bright colors.  After the  initial  eight  colors
-           (if  the  terminal  supports more than eight colors) the components
-           are initialized using the same pattern, but with weights  of  <STRONG>1000</STRONG>.
+           weights  are  <STRONG>680</STRONG>  or <STRONG>0</STRONG> depending on whether the corresponding red,
+           green, or blue component is used or not.  That permits  using  <STRONG>1000</STRONG>
+           to  represent  bold/bright  colors.  After the initial eight colors
+           (if the terminal supports more than eight  colors)  the  components
+           are  initialized  using the same pattern, but with weights of <STRONG>1000</STRONG>.
            SVr4 uses a similar scheme, but uses <STRONG>1000</STRONG> for the components of the
            initial eight colors.
 
            <STRONG>start_color</STRONG> does not attempt to set the terminal's color palette to
-           match  its  built-in  table.   An application may use <STRONG>init_color</STRONG> to
+           match its built-in table.  An application  may  use  <STRONG>init_color</STRONG>  to
            alter the internal table along with the terminal's color.
 
-       These limits apply to color values and  color  pairs.   Values  outside
+       These  limits  apply  to  color values and color pairs.  Values outside
        these limits are not valid, and may result in a runtime error:
 
-       <STRONG>o</STRONG>   <STRONG>COLORS</STRONG>   corresponds   to   the   terminal   database's  <STRONG>max_colors</STRONG>
+       <STRONG>o</STRONG>   <STRONG>COLORS</STRONG>  corresponds   to   the   terminal   database's   <STRONG>max_colors</STRONG>
            capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
 
-       <STRONG>o</STRONG>   color values are expected  to  be  in  the  range  <STRONG>0</STRONG>  to  <STRONG>COLORS-1</STRONG>,
+       <STRONG>o</STRONG>   color  values  are  expected  to  be  in  the  range <STRONG>0</STRONG> to <STRONG>COLORS-1</STRONG>,
            inclusive (including <STRONG>0</STRONG> and <STRONG>COLORS-1</STRONG>).
 
-       <STRONG>o</STRONG>   a  special  color value <STRONG>-1</STRONG> is used in certain extended functions to
+       <STRONG>o</STRONG>   a special color value <STRONG>-1</STRONG> is used in certain extended  functions  to
            denote the <EM>default</EM> <EM>color</EM> (see <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>).
 
-       <STRONG>o</STRONG>   <STRONG>COLOR_PAIRS</STRONG>  corresponds  to  the  terminal  database's   <STRONG>max_pairs</STRONG>
+       <STRONG>o</STRONG>   <STRONG>COLOR_PAIRS</STRONG>   corresponds  to  the  terminal  database's  <STRONG>max_pairs</STRONG>
            capability, (see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>).
 
-       <STRONG>o</STRONG>   valid  color  pair  values  are  in  the  range <STRONG>1</STRONG> to <STRONG>COLOR_PAIRS-1</STRONG>,
+       <STRONG>o</STRONG>   valid color pair values  are  in  the  range  <STRONG>1</STRONG>  to  <STRONG>COLOR_PAIRS-1</STRONG>,
            inclusive.
 
        <STRONG>o</STRONG>   color pair <STRONG>0</STRONG> is special; it denotes "no color".
 
-           Color pair <STRONG>0</STRONG> is assumed to be  white  on  black,  but  is  actually
-           whatever  the  terminal implements before color is initialized.  It
+           Color  pair  <STRONG>0</STRONG>  is  assumed  to  be white on black, but is actually
+           whatever the terminal implements before color is  initialized.   It
            cannot be modified by the application.
 
 
 </PRE><H3><a name="h3-has_colors">has_colors</a></H3><PRE>
-       The <STRONG>has_colors</STRONG> routine requires no arguments.  It returns <STRONG>TRUE</STRONG>  if  the
-       terminal  can  manipulate  colors;  otherwise,  it returns <STRONG>FALSE</STRONG>.  This
-       routine  facilitates  writing   terminal-independent   programs.    For
+       The  <STRONG>has_colors</STRONG>  routine requires no arguments.  It returns <STRONG>TRUE</STRONG> if the
+       terminal can manipulate colors;  otherwise,  it  returns  <STRONG>FALSE</STRONG>.   This
+       routine   facilitates   writing   terminal-independent  programs.   For
        example, a programmer can use it to decide whether to use color or some
        other video attribute.
 
 
 </PRE><H3><a name="h3-can_change_color">can_change_color</a></H3><PRE>
        The <STRONG>can_change_color</STRONG> routine requires no arguments.  It returns <STRONG>TRUE</STRONG> if
-       the  terminal  supports colors and can change their definitions; other,
-       it  returns  <STRONG>FALSE</STRONG>.   This  routine   facilitates   writing   terminal-
+       the terminal supports colors and can change their  definitions;  other,
+       it   returns   <STRONG>FALSE</STRONG>.    This  routine  facilitates  writing  terminal-
        independent programs.
 
 
 </PRE><H3><a name="h3-init_pair">init_pair</a></H3><PRE>
        The <STRONG>init_pair</STRONG> routine changes the definition of a color pair.  It takes
-       three arguments: the number of  the  color  pair  to  be  changed,  the
+       three  arguments:  the  number  of  the  color  pair to be changed, the
        foreground color number, and the background color number.  For portable
        applications:
 
-       <STRONG>o</STRONG>   The first argument must be a valid color pair  value.   If  default
-           colors  are  used  (see  <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>) the upper limit is
-           adjusted to allow for extra pairs which  use  a  default  color  in
+       <STRONG>o</STRONG>   The  first  argument  must be a valid color pair value.  If default
+           colors are used (see <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>)  the  upper  limit  is
+           adjusted  to  allow  for  extra  pairs which use a default color in
            foreground and/or background.
 
        <STRONG>o</STRONG>   The second and third arguments must be valid color values.
 
-       If  the  color pair was previously initialized, the screen is refreshed
-       and all  occurrences  of  that  color  pair  are  changed  to  the  new
+       If the color pair was previously initialized, the screen  is  refreshed
+       and  all  occurrences  of  that  color  pair  are  changed  to  the new
        definition.
 
-       As  an  extension,  <EM>ncurses</EM>  allows  you  to  set  color pair <STRONG>0</STRONG> via the
-       <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG> routine, or to specify  the  use  of  default
+       As an extension, <EM>ncurses</EM> allows  you  to  set  color  pair  <STRONG>0</STRONG>  via  the
+       <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>  routine,  or  to  specify the use of default
        colors (color number <STRONG>-1</STRONG>) if you first invoke the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG>
        routine.
 
 
 </PRE><H3><a name="h3-init_extended_pair">init_extended_pair</a></H3><PRE>
-       Because <STRONG>init_pair</STRONG> uses signed <STRONG>short</STRONG>s for its  parameters,  that  limits
+       Because  <STRONG>init_pair</STRONG>  uses  signed <STRONG>short</STRONG>s for its parameters, that limits
        color  pairs  and  color-values  to  32767  on  modern  hardware.   The
-       extension <STRONG>init_extended_pair</STRONG> uses <STRONG>int</STRONG>s for the color  pair  and  color-
+       extension  <STRONG>init_extended_pair</STRONG>  uses  <STRONG>int</STRONG>s for the color pair and color-
        value, allowing a larger number of colors to be supported.
 
 
 </PRE><H3><a name="h3-init_color">init_color</a></H3><PRE>
-       The  <STRONG>init_color</STRONG>  routine  changes  the definition of a color.  It takes
+       The <STRONG>init_color</STRONG> routine changes the definition of  a  color.   It  takes
        four arguments: the number of the color to be changed followed by three
        RGB values (for the amounts of red, green, and blue components).
 
-       <STRONG>o</STRONG>   The  first argument must be a valid color value; default colors are
-           not allowed here.  (See the section <STRONG>Colors</STRONG> for  the  default  color
+       <STRONG>o</STRONG>   The first argument must be a valid color value; default colors  are
+           not  allowed  here.   (See the section <STRONG>Colors</STRONG> for the default color
            index.)
 
-       <STRONG>o</STRONG>   Each  of  the  last  three arguments must be a value in the range <STRONG>0</STRONG>
+       <STRONG>o</STRONG>   Each of the last three arguments must be a value  in  the  range  <STRONG>0</STRONG>
            through <STRONG>1000</STRONG>.
 
-       When <STRONG>init_color</STRONG> is used, all occurrences of that color  on  the  screen
+       When  <STRONG>init_color</STRONG>  is  used, all occurrences of that color on the screen
        immediately change to the new definition.
 
 
 </PRE><H3><a name="h3-init_extended_color">init_extended_color</a></H3><PRE>
-       Because  <STRONG>init_color</STRONG>  uses signed <STRONG>short</STRONG>s for its parameters, that limits
-       color-values and their red, green, and  blue  components  to  32767  on
-       modern  hardware.   The extension <STRONG>init_extended_color</STRONG> uses <STRONG>int</STRONG>s for the
-       color value and for  setting  the  red,  green,  and  blue  components,
+       Because <STRONG>init_color</STRONG> uses signed <STRONG>short</STRONG>s for its parameters,  that  limits
+       color-values  and  their  red,  green,  and blue components to 32767 on
+       modern hardware.  The extension <STRONG>init_extended_color</STRONG> uses <STRONG>int</STRONG>s  for  the
+       color  value  and  for  setting  the  red,  green, and blue components,
        allowing a larger number of colors to be supported.
 
 
 </PRE><H3><a name="h3-color_content">color_content</a></H3><PRE>
        The <STRONG>color_content</STRONG> routine gives programmers a way to find the intensity
-       of the red, green, and blue (RGB) components in a color.   It  requires
-       four  arguments:  the  color  number, and three addresses of <STRONG>short</STRONG>s for
-       storing the information about the  amounts  of  red,  green,  and  blue
+       of  the  red, green, and blue (RGB) components in a color.  It requires
+       four arguments: the color number, and three  addresses  of  <STRONG>short</STRONG>s  for
+       storing  the  information  about  the  amounts  of red, green, and blue
        components in the given color.
 
-       <STRONG>o</STRONG>   The  first  argument  must  be a valid color value, i.e., <STRONG>0</STRONG> through
+       <STRONG>o</STRONG>   The first argument must be a valid color  value,  i.e.,  <STRONG>0</STRONG>  through
            <STRONG>COLORS-1</STRONG>, inclusive.
 
-       <STRONG>o</STRONG>   The values that are stored at the addresses pointed to by the  last
-           three  arguments  are  in  the  range <STRONG>0</STRONG> (no component) through <STRONG>1000</STRONG>
+       <STRONG>o</STRONG>   The  values that are stored at the addresses pointed to by the last
+           three arguments are in the range  <STRONG>0</STRONG>  (no  component)  through  <STRONG>1000</STRONG>
            (maximum amount of component), inclusive.
 
 
 </PRE><H3><a name="h3-extended_color_content">extended_color_content</a></H3><PRE>
-       Because <STRONG>color_content</STRONG> uses  signed  <STRONG>short</STRONG>s  for  its  parameters,  that
-       limits  color-values and their red, green, and blue components to 32767
+       Because  <STRONG>color_content</STRONG>  uses  signed  <STRONG>short</STRONG>s  for  its parameters, that
+       limits color-values and their red, green, and blue components to  32767
        on modern hardware.  The extension <STRONG>extended_color_content</STRONG> uses <STRONG>int</STRONG>s for
-       the  color value and for returning the red, green, and blue components,
+       the color value and for returning the red, green, and blue  components,
        allowing a larger number of colors to be supported.
 
 
 </PRE><H3><a name="h3-pair_content">pair_content</a></H3><PRE>
-       The <STRONG>pair_content</STRONG> routine allows programmers to find out what  colors  a
-       given  color  pair consists of.  It requires three arguments: the color
+       The  <STRONG>pair_content</STRONG>  routine allows programmers to find out what colors a
+       given color pair consists of.  It requires three arguments:  the  color
        pair number, and two addresses of <STRONG>short</STRONG>s for storing the foreground and
        the background color numbers.
 
-       <STRONG>o</STRONG>   The  first argument must be a valid color value, i.e., in the range
+       <STRONG>o</STRONG>   The first argument must be a valid color value, i.e., in the  range
            <STRONG>1</STRONG> through <STRONG>COLOR_PAIRS-1</STRONG>, inclusive.
 
-       <STRONG>o</STRONG>   The values that are stored at  the  addresses  pointed  to  by  the
-           second  and  third  arguments  are  in  the range <STRONG>0</STRONG> through <STRONG>COLORS</STRONG>,
+       <STRONG>o</STRONG>   The  values  that  are  stored  at  the addresses pointed to by the
+           second and third arguments are  in  the  range  <STRONG>0</STRONG>  through  <STRONG>COLORS</STRONG>,
            inclusive.
 
 
 </PRE><H3><a name="h3-extended_pair_content">extended_pair_content</a></H3><PRE>
        Because <STRONG>pair_content</STRONG> uses signed <STRONG>short</STRONG>s for its parameters, that limits
        color pair and color-values to 32767 on modern hardware.  The extension
-       <STRONG>extended_pair_content</STRONG> uses <STRONG>int</STRONG>s for the color pair  and  for  returning
-       the  foreground  and  background  colors,  allowing  a larger number of
+       <STRONG>extended_pair_content</STRONG>  uses  <STRONG>int</STRONG>s  for the color pair and for returning
+       the foreground and background  colors,  allowing  a  larger  number  of
        colors to be supported.
 
 
 </PRE><H3><a name="h3-reset_color_pairs">reset_color_pairs</a></H3><PRE>
-       The extension <STRONG>reset_color_pairs</STRONG> tells <EM>ncurses</EM> to  discard  all  of  the
-       color  pair  information which was set with <STRONG>init_pair</STRONG>.  It also touches
-       the current- and standard-screens, allowing an  application  to  switch
+       The  extension  <STRONG>reset_color_pairs</STRONG>  tells  <EM>ncurses</EM> to discard all of the
+       color pair information which was set with <STRONG>init_pair</STRONG>.  It  also  touches
+       the  current-  and  standard-screens, allowing an application to switch
        color palettes rapidly.
 
 
 </PRE><H3><a name="h3-COLOR_PAIR">COLOR_PAIR</a></H3><PRE>
        <STRONG>COLOR_PAIR(</STRONG><EM>n</EM><STRONG>)</STRONG> converts a color pair number to an attribute.  Attributes
-       can hold color pairs in the range 0 to 255.  If you need a  color  pair
-       larger  than  that, you must use functions such as <STRONG>attr_set</STRONG> (which pass
-       the color  pair  as  a  separate  parameter)  rather  than  the  legacy
+       can  hold  color pairs in the range 0 to 255.  If you need a color pair
+       larger than that, you must use functions such as <STRONG>attr_set</STRONG>  (which  pass
+       the  color  pair  as  a  separate  parameter)  rather  than  the legacy
        functions such as <STRONG>attrset</STRONG>.
 
 
 </PRE><H3><a name="h3-PAIR_NUMBER">PAIR_NUMBER</a></H3><PRE>
-       <STRONG>PAIR_NUMBER(</STRONG><EM>attr</EM>)   extracts   the  color  information  from  its  <EM>attr</EM>
-       parameter and returns it as a color pair  number;  it  is  the  inverse
+       <STRONG>PAIR_NUMBER(</STRONG><EM>attr</EM>)  extracts  the  color  information  from   its   <EM>attr</EM>
+       parameter  and  returns  it  as  a color pair number; it is the inverse
        operation of <STRONG>COLOR_PAIR</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The routines <STRONG>can_change_color</STRONG> and <STRONG>has_colors</STRONG> return <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
+       <STRONG>can_change_color</STRONG> and  <STRONG>has_colors</STRONG>  return  <STRONG>TRUE</STRONG>  or  <STRONG>FALSE</STRONG>.   The  other
+       functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       All  other routines return the integer <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       In   <EM>ncurses</EM>,  functions  returning  an  <EM>int</EM>  recognize  several  error
+       conditions.
 
-       X/Open  defines  no  error  conditions.   SVr4 does document some error
-       conditions which apply in general:
+       <STRONG>o</STRONG>   All return  <STRONG>ERR</STRONG>  if  the  screen  has  not  been  initialized;  see
+           <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   This implementation will return <STRONG>ERR</STRONG> on attempts to use color values
-           outside  the  range  <STRONG>0</STRONG>  to  <STRONG>COLORS</STRONG>-1 (except for the default colors
-           extension),  or  use  color  pairs   outside   the   range   <STRONG>0</STRONG>   to
-           <STRONG>COLOR_PAIRS-1</STRONG>.
+       <STRONG>o</STRONG>   All  except  <STRONG>start_color</STRONG>  return  <STRONG>ERR</STRONG>  if  <STRONG>start_color</STRONG> has not been
+           called, or itself returned <STRONG>ERR</STRONG>.
 
-           Color values used in <STRONG>init_color</STRONG> must be in the range <STRONG>0</STRONG> to <STRONG>1000</STRONG>.
+       <STRONG>o</STRONG>   <STRONG>start_color</STRONG> returns <STRONG>ERR</STRONG> if it cannot allocate memory for its  color
+           pair table.
 
-           An  error  is  returned  from all functions if the terminal has not
-           been initialized.
+       <STRONG>o</STRONG>   <STRONG>init_color</STRONG>  returns  <STRONG>ERR</STRONG>  if  the  terminal  type  does not support
+           assignable color values; that is, if the  <STRONG>initialize_color</STRONG>  (<STRONG>initc</STRONG>)
+           capability is absent from its description.
 
-           An error is returned from secondary functions such as <STRONG>init_pair</STRONG>  if
-           <STRONG>start_color</STRONG> was not called.
+       <STRONG>o</STRONG>   <STRONG>init_color</STRONG>  returns  <STRONG>ERR</STRONG> if any of its <EM>r</EM>, <EM>g</EM>, <EM>b</EM> arguments is outside
+           the range 0-1000 inclusive.
 
-       <STRONG>o</STRONG>   SVr4   does  much  the  same,  except  that  it  returns  <STRONG>ERR</STRONG>  from
-           <STRONG>pair_content</STRONG> if the pair was not initialized using  <STRONG>init_pairs</STRONG>  and
-           it  returns <STRONG>ERR</STRONG> from <STRONG>color_content</STRONG> if the terminal does not support
-           changing colors.
+       <STRONG>o</STRONG>   <STRONG>init_pair</STRONG>,  <STRONG>init_color</STRONG>,  <STRONG>init_extended_pair</STRONG>,   <STRONG>init_extended_color</STRONG>,
+           <STRONG>color_content</STRONG>,     <STRONG>pair_content</STRONG>,     <STRONG>extended_color_content</STRONG>,    and
+           <STRONG>extended_pair_content</STRONG> return <STRONG>ERR</STRONG> on attempts to use
 
-           This implementation does not return <STRONG>ERR</STRONG> for either case.
+           <STRONG>o</STRONG>   color identifiers outside the range 0-<STRONG>COLORS</STRONG>-1  inclusive,  the
+               default colors extension notwithstanding, or
 
-       Specific functions make additional checks:
+           <STRONG>o</STRONG>   color  pairs  identifiers  outside  the  range  0-<STRONG>COLOR_PAIRS</STRONG>-1
+               inclusive.
 
-          <STRONG>init_color</STRONG>
-               returns <STRONG>ERR</STRONG> if the terminal  does  not  support  this  feature,
-               e.g.,  if  the  <STRONG>initialize_color</STRONG>  capability is absent from the
-               terminal description.
 
-          <STRONG>start_color</STRONG>
-               returns an error if the color table cannot be allocated.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       In <EM>ncurses</EM>, <STRONG>init_pair</STRONG> accepts negative foreground and background  color
+       arguments  to  support  its  <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but only
+       after the latter function has been called.
 
+       The assumption that <STRONG>COLOR_BLACK</STRONG> is the  terminal's  default  background
+       color  can  be  overridden  using  <EM>ncurses</EM>'s  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
+       extension.
 
-</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       In the <EM>ncurses</EM> implementation, there is  a  separate  color  activation
-       flag,  color  palette,  color  pairs  table,  and associated <STRONG>COLORS</STRONG> and
-       <STRONG>COLOR_PAIRS</STRONG> counts for  each  screen;  the  <STRONG>start_color</STRONG>  function  only
-       affects  the  current  screen.   The  SVr4/XSI  interface is not really
-       designed with this in mind, and historical implementations  may  use  a
-       single shared color palette.
-
-       Setting  an  implicit  background  color  via a color pair affects only
-       character cells that a character write  operation  explicitly  touches.
-       To  change the background color used when parts of a window are blanked
+       In <EM>ncurses</EM>, each pointer passed to <STRONG>color_content</STRONG> and  <STRONG>pair_content</STRONG>  can
+       be  null,  in  which  case  the  library  ignores  it,  permitting  the
+       application to disregard unnecessary information.
+
+       In <EM>ncurses</EM>, each screen has a color  activation  flag,  color  palette,
+       color pair table, and associated <STRONG>COLORS</STRONG> and <STRONG>COLOR_PAIRS</STRONG> values for each
+       screen; <STRONG>start_color</STRONG> affects only the  current  screen.   The  SVr4  and
+       X/Open  Curses  interface  was  not  really designed with this in mind;
+       historical implementations may use a single shared color palette.
+
+       Setting an implicit background color via  a  color  pair  affects  only
+       character  cells  that  a character write operation explicitly touches.
+       To change the background color used when parts of a window are  blanked
        by erasing or scrolling operations, see <STRONG><A HREF="curs_bkgd.3x.html">curs_bkgd(3x)</A></STRONG>.
 
-       Several caveats apply on older x86 machines  (e.g.,  i386,  i486)  with
-       VGA-compatible graphics:
+       Several  caveats  apply  to IBM PC-compatible machines of the 80486 era
+       and earlier with CGA/EGA/VGA video.
 
-       <STRONG>o</STRONG>   COLOR_YELLOW  is  actually  brown.  To get yellow, use COLOR_YELLOW
-           combined with the <STRONG>A_BOLD</STRONG> attribute.
+       <STRONG>o</STRONG>   <STRONG>COLOR_YELLOW</STRONG>  is  actually   brown.    To   get   yellow,   combine
+           <STRONG>COLOR_YELLOW</STRONG> with the <STRONG>A_BOLD</STRONG> attribute.
 
-       <STRONG>o</STRONG>   The A_BLINK attribute should in theory cause the background  to  go
-           bright.  This often fails to work, and even some cards for which it
-           mostly works (such as the Paradise and compatibles)  do  the  wrong
-           thing  when  you try to set a bright "yellow" background (you get a
-           blinking yellow foreground instead).
+       <STRONG>o</STRONG>   The  <STRONG>A_BLINK</STRONG> attribute should in theory make the background bright.
+           This often fails to work, and even VGA  controllers  for  which  it
+           mostly  works,  such as those from Paradise and compatibles, do the
+           wrong thing when you try to set a bright "yellow" background -- you
+           get a blinking yellow foreground instead.
 
-       <STRONG>o</STRONG>   Color RGB values are not settable.
+       <STRONG>o</STRONG>   Color  RGB  values  are  not configurable on these devices (in text
+           mode).
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The functions marked as extensions were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and
-       are  not  found  in  SVr4  <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous
-       curses implementation.
+       The functions marked as extensions originated in <EM>ncurses</EM>, and  are  not
+       found  in  SVr4  <EM>curses</EM>,  4.4BSD  <EM>curses</EM>,  or any other previous <EM>curses</EM>
+       implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       This  implementation  satisfies  X/Open  Curses's  minimum maximums for
-       <STRONG>COLORS</STRONG> and <STRONG>COLOR_PAIRS</STRONG>.
-
-       The  <STRONG>init_pair</STRONG>  routine  accepts  negative  values  of  foreground  and
-       background  color  to support the <STRONG><A HREF="default_colors.3x.html">use_default_colors(3x)</A></STRONG> extension, but
-       only if that routine has been first invoked.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       The assumption that <STRONG>COLOR_BLACK</STRONG> is the default background color for all
-       terminals   can   be   modified   using  the  <STRONG><A HREF="default_colors.3x.html">assume_default_colors(3x)</A></STRONG>
-       extension.
+       <EM>ncurses</EM> satisfies X/Open  Curses's  minimum  maximums  for  <EM>COLORS</EM>  and
+       <EM>COLOR</EM><STRONG>_</STRONG><EM>PAIRS</EM>.
 
-       This implementation checks the pointers, e.g., for the values  returned
-       by  <STRONG>color_content</STRONG>  and  <STRONG>pair_content</STRONG>,  and will treat those as optional
-       parameters when null.
+       X/Open  Curses  does  not  specify a limit for the number of colors and
+       color pairs which a terminal can support.  However, in its use of <EM>short</EM>
+       for  the  parameters,  it carries over SVr4's implementation detail for
+       the compiled <EM>terminfo</EM>  database,  which  uses  signed  16-bit  numbers.
+       <EM>ncurses</EM>  provides  extended  versions  of  the  functions  using  <EM>short</EM>
+       parameters,  allowing  applications  to  use  larger  color  and   pair
+       identifiers.
 
-       X/Open Curses does not specify a limit for the  number  of  colors  and
-       color pairs which a terminal can support.  However, in its use of <STRONG>short</STRONG>
-       for the parameters, it carries over SVr4's  implementation  detail  for
-       the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation provides extended versions of those functions which  use
-       <STRONG>short</STRONG>  parameters, allowing applications to use larger color- and pair-
-       numbers.
-
-       The <STRONG>reset_color_pairs</STRONG> function is an extension of <EM>ncurses</EM>.
+       SVr4  <EM>curses</EM> returns <EM>ERR</EM> from <EM>pair</EM><STRONG>_</STRONG><EM>content</EM> if its <EM>pair</EM> argument was not
+       initialized using <EM>init</EM><STRONG>_</STRONG><EM>pairs</EM>, and from <EM>color</EM><STRONG>_</STRONG><EM>content</EM>  if  the  terminal
+       does not support changing colors.  <EM>ncurses</EM> does neither.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.2 introduced color support to curses in 1987.
-
-       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
-       state  from  <STRONG>SP</STRONG>  (the  <EM>SCREEN</EM>  structure)  to  <STRONG>cur_term</STRONG>  (the  <EM>TERMINAL</EM>
-       structure), but provided the same set of library functions.
+       SVr3.2  (1987)  introduced color support with all of the symbols in the
+       synopsis above except those marked as extensions.   It  reserved  color
+       pair  0  as  the terminal's initial, "uncolored" state, and limited the
+       number of possible color pairs to 64, because the color pair datum  was
+       encoded in six bits of a <EM>chtype</EM>.
 
-       SVr4 curses limits the number of color pairs  to  64,  reserving  color
-       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
-       arises because the color pair information is a bitfield in  the  <STRONG>chtype</STRONG>
-       data type (denoted by <STRONG>A_COLOR</STRONG>).
+       SVr4  made  only  internal changes, such as moving the storage of color
+       state from the <EM>SCREEN</EM> structure (pointed to  by  <EM>SP</EM>)  to  the  <EM>TERMINAL</EM>
+       structure (pointed to by <EM>cur</EM><STRONG>_</STRONG><EM>term</EM>).
 
-       Other implementations of curses had different limits:
+       Other  <EM>curses</EM>  implementations impose different limits on the number of
+       colors and color pairs.
 
-       <STRONG>o</STRONG>   <EM>PCCurses</EM> (1987-1990) provided for only eight (8) colors.
+       <STRONG>o</STRONG>   <EM>PCCurses</EM> (1987-1990) provided for  only  8  colors  (and  therefore
+           required at most 8x8 = 64 color pairs).
 
        <STRONG>o</STRONG>   <EM>PDCurses</EM>  (1992-present)  inherited  the  8-color  limitation  from
-           <EM>PCCurses</EM>, but changed this to 256 in version 2.5 (2001), along with
-           changing <STRONG>chtype</STRONG> from 16-bits to 32-bits.
+           <EM>PCCurses</EM>, but changed this  to  256  in  version  2.5  (2001),  and
+           widened its <EM>chtype</EM> from 16 to 32 bits.
 
-       <STRONG>o</STRONG>   X/Open Curses (1992-present) added a new structure <STRONG>cchar_t</STRONG> to store
-           the character, attributes and color pair values, allowing increased
-           range  of  color  pairs.   Both color pairs and color-values used a
-           signed <STRONG>short</STRONG>, limiting values to 15 bits.
+       <STRONG>o</STRONG>   X/Open  Curses  (1992-present)  specified  a  new  structure  type,
+           <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>, to store the character code, attribute  flags,  and  color
+           pair  identifier,  allowing  an increased range of color pairs.  It
+           specifies a <EM>short</EM> as  storing  identifiers  for  colors  and  color
+           pairs,  limiting  portable  values  to 15 bits; negative values are
+           invalid in System V.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> (1992-present)  uses  eight  bits  for  <STRONG>A_COLOR</STRONG>  in  <STRONG>chtype</STRONG>
-           values.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> (1992-present), in its non-wide configuration, uses 8  bits
+           of <EM>chtype</EM> for the color pair identifier.
 
-           Version  5.3  provided  a wide-character interface (2002), but left
-           color pairs as part of the attributes-field.
+           Version  5.3 (2002) offered a wide-character interface, but encoded
+           the color pair identifier with attributes in the character type.
 
-           Since version 6 (2015), ncurses uses a separate <STRONG>int</STRONG> for color pairs
-           in the <STRONG>cchar_t</STRONG> values.  When those color pair values fit in 8 bits,
-           ncurses allows color pairs to  be  manipulated  via  the  functions
-           using <STRONG>chtype</STRONG> values.
+           Since version 6 (2015), <EM>ncurses</EM> uses a separate <EM>int</EM> for  the  color
+           pair  identifier  in  a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>, introducing extension functions to
+           manage the wider type.  When a color pair value  fits  in  8  bits,
+           <EM>ncurses</EM> permits color pair data to be manipulated via the functions
+           taking <EM>chtype</EM> arguments, even  when  a  <EM>curses</EM>  window  uses  wide-
+           character cells.
 
-       <STRONG>o</STRONG>   NetBSD  curses  used  6  bits  from  2000  (when  colors were first
-           supported) until 2004.  At that point, NetBSD  changed  to  use  10
-           bits.   As  of  2021,  that size is unchanged.  Like <EM>ncurses</EM> before
-           version 6, the NetBSD color  pair  information  is  stored  in  the
-           attributes  field of <STRONG>cchar_t</STRONG>, limiting the number of color pairs by
-           the size of the bitfield.
+       <STRONG>o</STRONG>   NetBSD  <EM>curses</EM>  used 6 bits for the color pair identifier from 2000
+           (when it first added color support) until  2004.   At  that  point,
+           NetBSD  widened  the  color  pair  identifier to use 9 bits.  As of
+           2025, that size is unchanged.  Like <EM>ncurses</EM> before version  6,  the
+           NetBSD  color  pair  datum  is  stored  in  the attributes field of
+           <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>, limiting the number of color pairs.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -539,7 +555,7 @@ <H1 class="no-header">curs_color 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 61a2edf98..a9160a20f 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_delch.3x,v 1.47 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_delch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_delch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 
@@ -87,15 +87,15 @@ <H1 class="no-header">curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 (1984) introduced <EM>delch</EM>.
+       SVr2 (1984) introduced <EM>wdelch</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -103,7 +103,7 @@ <H1 class="no-header">curs_delch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 627d42203..8a1741014 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -97,11 +97,11 @@ <H1 class="no-header">curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index e2a9234f1..a3a660b59 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_extend.3x,v 1.54 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_extend 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_extend 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 
@@ -94,8 +94,8 @@ <H1 class="no-header">curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       These functions are <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> extensions, and are not found  in  SVr4
-       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous curses implementation.
+       These functions are <EM>ncurses</EM> extensions,  and  are  not  found  in  SVr4
+       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_extend 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index d7da68938..c74c7be5f 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -80,13 +80,13 @@ <H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        If  no input is pending, then if the no-delay flag is set in the window
        (see <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>), the function returns <STRONG>ERR</STRONG>;  otherwise,  <EM>curses</EM>  waits
-       until  the  terminal  has  input.   If <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> has been called, this
-       happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG>  has
-       been  called,  it  occurs  when the next newline is read.  (Because the
-       terminal's  canonical  or  "cooked"  mode  is  line-buffered,  multiple
-       <STRONG>wget_wch</STRONG>  calls  may  then  be necessary to empty the input queue.)  If
-       <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
-       the specified delay elapses.
+       until  the  terminal  has  input.   If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  or <STRONG><A HREF="curs_inopts.3x.html">raw(3x)</A></STRONG> has been
+       called, this happens after one character is read.  If  <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG>  or
+       <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG>  has  been  called,  it occurs when the next newline is read.
+       (Because the terminal's canonical or "cooked"  mode  is  line-buffered,
+       multiple  <STRONG>wget_wch</STRONG>  calls  may  then  be  necessary  to empty the input
+       queue.)  If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input  is
+       available or the specified delay elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
        the wide character from the input queue to the window  (at  the  cursor
@@ -105,27 +105,28 @@ <H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG> on it.
 
        If  the wide character is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,
-       <STRONG>wgetch</STRONG> stores the the wide character code for line feed in <EM>wch</EM> instead.
+       <STRONG>wget_wch</STRONG> stores the the wide  character  code  for  line  feed  in  <EM>wch</EM>
+       instead.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>unget_wch</STRONG> places <EM>wc</EM> into the input queue to be retrieved  by  the  next
-       call  to  <STRONG>wget_wch</STRONG>.  A single input queue serves all windows associated
-       with the terminal.
+       <STRONG>unget_wch</STRONG>  places  <EM>wc</EM>  into the input queue to be retrieved by the next
+       call to <STRONG>wget_wch</STRONG>.  A single input queue serves all  windows  associated
+       with the screen.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wget_wch</STRONG> returns <STRONG>OK</STRONG> when it reads a wide character,  <STRONG>KEY_CODE_YES</STRONG>  when
+       <STRONG>wget_wch</STRONG>  returns  <STRONG>OK</STRONG> when it reads a wide character, <STRONG>KEY_CODE_YES</STRONG> when
        it reads a function key code, and <STRONG>ERR</STRONG> on failure.  <STRONG>wget_wch</STRONG> fails if
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
-       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
-           to <STRONG>EINTR</STRONG>.
+       <STRONG>o</STRONG>   execution was interrupted by a signal, in which case <EM>errno</EM>  is  set
+           to <EM>EINTR</EM>.
 
        Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
        <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
@@ -138,13 +139,13 @@ <H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
        as macros.
 
-       Unlike  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,  <STRONG>wget_wch</STRONG>  and  its variants store the value of the
-       input character in an additional <EM>wch</EM> parameter instead  of  the  return
+       Unlike <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>, <STRONG>wget_wch</STRONG> and its variants store  the  value  of  the
+       input  character  in  an additional <EM>wch</EM> parameter instead of the return
        value.
 
-       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot distinguish function key codes from
-       conventional  character  codes.   An  application  can  overcome   this
-       limitation  by pushing function key codes with <STRONG>ungetch</STRONG> and subsequently
+       Unlike <STRONG>ungetch</STRONG>, <STRONG>unget_wch</STRONG> cannot distinguish function  key  codes  from
+       conventional   character  codes.   An  application  can  overcome  this
+       limitation by pushing function key codes with <STRONG>ungetch</STRONG> and  subsequently
        checking the return value of <STRONG>wget_wch</STRONG> for a match with <STRONG>KEY_CODE_YES</STRONG>.
 
 
@@ -156,23 +157,35 @@ <H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
+       See  the  "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding the interaction
        of <STRONG>wget_wch</STRONG> with signal handlers.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+       (1995).   The  System V Interface Definition Version 4 of the same year
+       specified  functions  named  <EM>wgetwch</EM>  (with  the  usual  variants)  and
+       <EM>ungetwch</EM>.   These  were later additions to SVr4.<EM>x</EM>, not appearing in the
+       first SVr4 (1989).   They  differ  from  X/Open's  later  <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM>  and
+       <EM>unget</EM><STRONG>_</STRONG><EM>wch</EM> in that <EM>wgetwch</EM> takes no <EM>wch</EM> argument, but returns the (wide)
+       key code as an <EM>int</EM> (with no provision for  distinguishing  a  character
+       code  from  a  function  key  code); and <EM>ungetwch</EM> takes a non-<EM>const</EM> <EM>int</EM>
+       argument.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -188,6 +201,7 @@ <H1 class="no-header">curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 649755fab..cafefb143 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>get_wstr</STRONG>,  <STRONG>getn_wstr</STRONG>,  <STRONG>wget_wstr</STRONG>,  <STRONG>wgetn_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>,
-       <STRONG>mvwget_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG> - get a wide-character string from  a  <EM>curses</EM>
+       <STRONG>mvwget_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG> - read a wide-character string from a  <EM>curses</EM>
        terminal keyboard
 
 
@@ -63,122 +63,155 @@ <H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>getn_wstr(wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvgetn_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetn_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wint_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  function  <STRONG>wgetn_wstr</STRONG>  is  equivalent  to  a  series  of  calls  to
-       <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> until a newline or carriage return terminates the series:
+       <STRONG>wget_wstr</STRONG>  populates  a user-supplied wide-character string buffer <EM>wstr</EM>
+       by repeatedly calling <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> with the <EM>win</EM> argument until  a  line
+       feed or carriage return character is input.  The function
 
-       <STRONG>o</STRONG>   The terminating character is not included in the returned string.
+       <STRONG>o</STRONG>   does not copy the terminating character to <EM>wstr</EM>;
 
-       <STRONG>o</STRONG>   An end-of-file condition is represented  by  <STRONG>WEOF</STRONG>,  as  defined  in
-           <STRONG>&lt;wchar.h&gt;</STRONG>.
+       <STRONG>o</STRONG>   populates  <EM>wstr</EM> with <EM>WEOF</EM> (as defined in <EM>wchar.h</EM>) if an end-of-file
+           condition occurs on the input;
 
-       <STRONG>o</STRONG>   In  all  instances,  the  end of the string is terminated by a null
-           <STRONG>wchar_t</STRONG>.
+       <STRONG>o</STRONG>   always terminates the string with a null wide character (after  any
+           <EM>WEOF</EM>);
 
-       <STRONG>o</STRONG>   The function stores the result in the area pointed to by  the  <EM>wstr</EM>
-           parameter.
+       <STRONG>o</STRONG>   interprets   the   screen's   erase   and   kill   characters  (see
+           <STRONG><A HREF="curs_termattrs.3x.html">erasechar(3x)</A></STRONG> and <STRONG><A HREF="curs_termattrs.3x.html">killchar(3x)</A></STRONG>);
 
-       <STRONG>o</STRONG>   The function reads at most <EM>n</EM> characters, thus preventing a possible
-           overflow of the input buffer.
+       <STRONG>o</STRONG>   recognizes function keys only if  the  screen's  keypad  option  is
+           enabled (see <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>);
 
-           Any attempt to enter more characters (other  than  the  terminating
-           newline or carriage return) causes a beep.
+       <STRONG>o</STRONG>   treats the function keys <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> the same as the
+           erase character; and
 
-           Function keys also cause a beep and are ignored.
+       <STRONG>o</STRONG>   discards function key inputs other than those treated as the  erase
+           character, calling <STRONG><A HREF="curs_beep.3x.html">beep(3x)</A></STRONG>.
 
-       The user's <EM>erase</EM> and <EM>kill</EM> characters are interpreted:
+       The  erase  character  replaces  the character at the end of the buffer
+       with a null wide character, while the kill character does the same  for
+       the entire buffer.
 
-       <STRONG>o</STRONG>   The  <EM>erase</EM>  character (e.g., <STRONG>^H</STRONG>) erases the character at the end of
-           the buffer, moving the cursor to the left.
+       If  the  screen's  echo  option  is  enabled  (see <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG>), <STRONG>wget_wstr</STRONG>
+       updates <EM>win</EM> with <STRONG><A HREF="curs_add_wch.3x.html">wadd_wch(3x)</A></STRONG>.  Further,
 
-           If <EM>keypad</EM> mode is on for the window, <STRONG>KEY_LEFT</STRONG> and <STRONG>KEY_BACKSPACE</STRONG> are
-           both considered equivalent to the user's <EM>erase</EM> character.
+       <STRONG>o</STRONG>   the erase character and its function key synonyms move  the  cursor
+           to the left, and
 
-       <STRONG>o</STRONG>   The <EM>kill</EM> character (e.g., <STRONG>^U</STRONG>) erases the entire buffer, leaving the
-           cursor at the beginning of the buffer.
+       <STRONG>o</STRONG>   the  kill character returns the cursor to where it was located when
+           <STRONG>wget_wstr</STRONG> was called.
 
-       Characters input are echoed only if <STRONG>echo</STRONG>  is  currently  on.   In  that
-       case,  backspace  is  echoed  as  deletion  of  the  previous character
-       (typically a left motion).
+       <STRONG>wgetn_wstr</STRONG> is similar, but reads at most <EM>n</EM> wide characters, aiding  the
+       application  to  avoid overrunning the buffer to which <EM>wstr</EM> points.  An
+       attempt  to  input  more  than  <EM>n</EM>  wide  characters  (other  than   the
+       terminating line feed or carriage return) is ignored with a beep.  If <EM>n</EM>
+       is negative, <STRONG>wgetn_wstr</STRONG> reads  up  to  <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>  wide  characters  (see
+       <STRONG>sysconf(3)</STRONG>).
 
-       The <STRONG>getn_wstr</STRONG>, <STRONG>mvgetn_wstr</STRONG>, <STRONG>mvwgetn_wstr</STRONG>, and <STRONG>wgetn_wstr</STRONG> functions  are
-       identical  to  the  <STRONG>get_wstr</STRONG>,  <STRONG>mvget_wstr</STRONG>,  <STRONG>mvwget_wstr</STRONG>,  and <STRONG>wget_wstr</STRONG>
-       functions, respectively, except that the <STRONG>*n_*</STRONG> versions read at  most  <EM>n</EM>
-       characters,  letting  the  application  prevent  overflow  of the input
-       buffer.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  of  these  functions  return  the  integer  <STRONG>OK</STRONG>   upon   successful
-       completion.  If unsuccessful, they return <STRONG>ERR</STRONG>.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open defines no error conditions.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       In this implementation, these functions return <STRONG>ERR</STRONG>
+       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>, or
 
-       <STRONG>o</STRONG>   if the window pointer is null,
-
-       <STRONG>o</STRONG>   if its timeout expires without having any data, or
-
-       <STRONG>o</STRONG>   if the associated call to <STRONG>wget_wch</STRONG> failed.
+       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> call fails.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Any of these functions other than <STRONG>wgetn_wstr</STRONG> may be macros.
+       All of these functions except <STRONG>wgetn_wstr</STRONG> may be implemented as macros.
+
+       Reading input that overruns  the  buffer  pointed  to  by  <EM>wstr</EM>  causes
+       undefined   results.    Use   the  <STRONG>n</STRONG>-infixed  functions,  and  allocate
+       sufficient storage for <EM>wstr</EM> -- at least <EM>n</EM>+1 times <STRONG>sizeof(wchar_t)</STRONG>.
+
+       These functions cannot store a <STRONG>KEY_</STRONG> value in <EM>wstr</EM> because there  is  no
+       way to distinguish it from a valid <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> value.
+
+       While  these  functions  conceptually  implement  a  series of calls to
+       <STRONG>wget_wch</STRONG>, they also temporarily change properties of the <EM>curses</EM>  screen
+       to  permit simple editing of the input buffer.  Each function saves the
+       screen's state, calls <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>, and,  if  the  screen  was  in  canonical
+       ("cooked")  mode,  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>.  Before returning, it restores the saved
+       screen state.  Other implementations differ in detail, affecting  which
+       control   characters  they  can  accept  in  the  buffer;  see  section
+       "PORTABILITY" below.
 
-       Using <STRONG>get_wstr</STRONG>, <STRONG>mvget_wstr</STRONG>, <STRONG>mvwget_wstr</STRONG>, or <STRONG>wget_wstr</STRONG> to  read  a  line
-       that  overflows  the array pointed to by <STRONG>wstr</STRONG> causes undefined results.
-       The  use  of  <STRONG>getn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  <STRONG>mvwgetn_wstr</STRONG>,  or   <STRONG>wgetn_wstr</STRONG>,
-       respectively, is recommended.
+       Unlike <STRONG><A HREF="curs_getstr.3x.html">getstr(3x)</A></STRONG> and related  functions  of  <EM>ncurses</EM>'s  non-wide  API,
+       these functions do not return <STRONG>KEY_RESIZE</STRONG> if a <EM>SIGWINCH</EM> event interrupts
+       the function.
 
-       These  functions  cannot  return <STRONG>KEY_</STRONG> values because there is no way to
-       distinguish a <STRONG>KEY_</STRONG> value from a valid <STRONG>wchar_t</STRONG> value.
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>getn_wstr</STRONG>,  <STRONG>wgetn_wstr</STRONG>,  <STRONG>mvgetn_wstr</STRONG>,  and  <STRONG>mvwgetn_wstr</STRONG>'s  handing  of
+       negative <EM>n</EM> values is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       This  implementation  returns  <STRONG>ERR</STRONG> if the window pointer is null, or if
-       the lower-level <STRONG>wget_wch</STRONG> call returns an <STRONG>ERR</STRONG>.  In the latter  case,  an
-       <STRONG>ERR</STRONG>  return  without other data is treated as an end-of-file condition,
-       and the returned array contains a <STRONG>WEOF</STRONG> followed by a null <STRONG>wchar_t</STRONG>.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       X/Open curses documented these functions to pass an array of <STRONG>wchar_t</STRONG> in
-       1997, but that was an error because of this part of the description:
+       Issue 4  documented these functions as passing an array of <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>, but
+       that was an error, conflicting  with  the  following  language  in  the
+       standard.
 
-              The effect of <STRONG>get_wstr</STRONG> is as though a series of calls to <STRONG>get_wch</STRONG>
-              were made, until a newline character, end-of-line character,  or
-              end-of-file character is processed.
+              The  effect  of  <EM>get</EM><STRONG>_</STRONG><EM>wstr</EM>()  is  as  though a series of calls to
+              <EM>get</EM><STRONG>_</STRONG><EM>wch</EM>() were made,  until  a  newline  character,  end-of-line
+              character, or end-of-file character is processed.
 
-       The  latter function <EM>get</EM><STRONG>_</STRONG><EM>wch</EM> can return a negative value, while <STRONG>wchar_t</STRONG>
-       is a unsigned type.  All of the vendors implement  this  using  <STRONG>wint_t</STRONG>,
-       following the standard.
+       <EM>get</EM><STRONG>_</STRONG><EM>wch</EM>  can  return a negative value (<EM>WEOF</EM>), but <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> is a unsigned
+       type.  All of the  vendors  implement  these  functions  using  <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>,
+       following the Issue 7 standard.
 
-       X/Open  Curses,  Issue  7  (2009)  is  unclear  regarding  whether  the
-       terminating <EM>null</EM> <STRONG>wchar_t</STRONG> value is counted in the  length  parameter  <EM>n</EM>.
-       X/Open  Curses,  Issue  7  revised  the  corresponding  description  of
-       <STRONG>wgetnstr</STRONG>  to  address  this  issue.   The  unrevised   description   of
-       <STRONG>wget_nwstr</STRONG>  can  be interpreted either way.  This implementation counts
-       the terminator in the length.
+       X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
+       character counts  toward  the  length  paramter  <EM>n</EM>.   A  similar  issue
+       affected   <EM>wgetnstr</EM>   in   Issue 4,  Version 2;  Issue 7  revised  that
+       function's  description  to  address  the  issue,  but  not   that   of
+       <EM>wget</EM><STRONG>_</STRONG><EM>nwstr</EM>, leaving it ambiguous.  <EM>ncurses</EM> counts the terminator in the
+       length.
 
        X/Open Curses does  not  specify  what  happens  if  the  length  <EM>n</EM>  is
        negative.
 
-       <STRONG>o</STRONG>   For  analogy  with  <STRONG>wgetnstr</STRONG>,  <EM>ncurses</EM>  6.2  uses a limit (based on
-           <STRONG>LINE_MAX</STRONG>).
+       <STRONG>o</STRONG>   For  consistency  with  <EM>wgetnstr</EM>, <EM>ncurses</EM> 6.2 uses a limit based on
+           <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>.
 
        <STRONG>o</STRONG>   Some other implementations (such as Solaris <EM>xcurses</EM>) do  the  same,
-           while others (<EM>PDCurses</EM>) do not allow this.
+           while others (<EM>PDCurses</EM>) do not permit a negative <EM>n</EM>.
+
+       <STRONG>o</STRONG>   NetBSD 7  <EM>curses</EM>  imitates  <EM>ncurses</EM>  6.1  and  earlier,  treating a
+           negative <EM>n</EM> as an unbounded count of wide characters.
+
+       Implementations vary in their handling of input control characters.
+
+       <STRONG>o</STRONG>   While they may enable the screen's echo option, some do not take it
+           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+           deciding whether to handle echoing within <EM>wgetn</EM><STRONG>_</STRONG><EM>wstr</EM> or to rely  on
+           it as a side effect of calling <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM>.
+
+           Since  1995,  <EM>ncurses</EM> has provided handlers for <EM>SIGINTR</EM> and <EM>SIGQUIT</EM>
+           events, which are typically generated at the keyboard with  <STRONG>^C</STRONG>  and
+           <STRONG>^\</STRONG> respectively.  In cbreak mode, those handlers catch a signal and
+           stop  the  program,  whereas  other  implementations  write   those
+           characters into the buffer.
 
-       <STRONG>o</STRONG>   NetBSD  7 curses imitates <EM>ncurses</EM> 6.1 in this regard, treating a <STRONG>-1</STRONG>
-           as an indefinite number of characters.
+       <STRONG>o</STRONG>   Starting  with <EM>ncurses</EM> 6.3 (2021), <EM>wgetn</EM><STRONG>_</STRONG><EM>wstr</EM> preserves raw mode if
+           the screen was already in that state, allowing  one  to  enter  the
+           characters  the  terminal  interprets  as interrupt and quit events
+           into the buffer, for consistency with SVr4 <EM>curses</EM>'s <EM>wgetnstr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -189,7 +222,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -198,6 +231,7 @@ <H1 class="no-header">curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index c1edf2841..1b5bef27a 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.49 2024/04/20 18:55:09 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -54,141 +54,152 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>getcchar(</STRONG>
-               <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
-               <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>,</STRONG>
-               <STRONG>attr_t</STRONG> <STRONG>*</STRONG><EM>attrs</EM><STRONG>,</STRONG>
-               <STRONG>short</STRONG> <STRONG>*</STRONG><EM>color</EM><STRONG>_</STRONG><EM>pair</EM><STRONG>,</STRONG>
-               <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM> <STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>setcchar(</STRONG>
-               <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
-               <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>,</STRONG>
-               <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG>
-               <STRONG>short</STRONG> <EM>color</EM><STRONG>_</STRONG><EM>pair</EM><STRONG>,</STRONG>
-               <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM> <STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>gettchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
+             <STRONG>attr_t</STRONG> <STRONG>*</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>settchar(cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
+       The <EM>curses</EM> complex character data type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is  a  structure  type
+       comprising  a  wide-character  string, a set of attributes, and a color
+       pair identifier.  The <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> structure is opaque; do  not  attempt  to
+       access  its  members  directly.   The  library  provides  functions  to
+       manipulate this type.
 
-</PRE><H3><a name="h3-getcchar">getcchar</a></H3><PRE>
-       The <STRONG>getcchar</STRONG> function gets a wide-character string and rendition from a
-       <STRONG>cchar_t</STRONG> argument.  When <EM>wc</EM> is not a null pointer, the <STRONG>getcchar</STRONG> function
-       does the following:
-
-       <STRONG>o</STRONG>   Extracts information from a <STRONG>cchar_t</STRONG> value <EM>wch</EM>
 
-       <STRONG>o</STRONG>   Stores the character attributes in the location pointed to by <EM>attrs</EM>
+</PRE><H3><a name="h3-getcchar">getcchar</a></H3><PRE>
+       <STRONG>getcchar</STRONG> destructures a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> into its components.
 
-       <STRONG>o</STRONG>   Stores the color pair in the location pointed to by <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
+       If <EM>wc</EM> is not a null pointer, <STRONG>getcchar</STRONG>:
 
-       <STRONG>o</STRONG>   Stores the wide-character string,  characters  referenced  by  <EM>wch</EM>,
-           into the array pointed to by <EM>wc</EM>.
+       <STRONG>o</STRONG>   stores the wide-character string in the  <EM>curses</EM>  complex  character
+           <EM>wch</EM> into <EM>wc</EM>;
 
-       When <EM>wc</EM> is a null pointer, the <STRONG>getcchar</STRONG> function does the following:
+       <STRONG>o</STRONG>   stores the attributes in <EM>attrs</EM>; and
 
-       <STRONG>o</STRONG>   Obtains the number of wide characters pointed to by <EM>wch</EM>
+       <STRONG>o</STRONG>   stores the color pair identifier in <EM>pair</EM>.
 
-       <STRONG>o</STRONG>   Does not change the data referenced by <EM>attrs</EM> or <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
+       If <EM>wc</EM> is a null pointer, <STRONG>getcchar</STRONG> counts the <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> wide characters in
+       <EM>wch</EM>, returns that value, and leaves <EM>attrs</EM> and <EM>pair</EM> unchanged.
 
 
 </PRE><H3><a name="h3-setcchar">setcchar</a></H3><PRE>
-       The  <STRONG>setcchar</STRONG>  function  initializes  the location pointed to by <EM>wch</EM> by
-       using:
+       <STRONG>setcchar</STRONG> constructs a <EM>curses</EM> complex character <EM>wch</EM> from the  components
+       <EM>wc</EM>,  <EM>attrs</EM>, and <EM>pair</EM>.  The wide-character string <EM>wch</EM> must be terminated
+       with a null wide character <STRONG>L'\0'</STRONG> and must contain at most  one  spacing
+       character,  which,  if present, must be the first wide character in the
+       string.
 
-       <STRONG>o</STRONG>   The character attributes in <EM>attrs</EM>
+       Up  to  <STRONG>CCHARW_MAX</STRONG> - 1   non-spacing   characters   may   follow   (see
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).    <EM>ncurses</EM>   ignores  any  additional  non-spacing
+       characters.
 
-       <STRONG>o</STRONG>   The color pair in <EM>color</EM><STRONG>_</STRONG><EM>pair</EM>
+       The string may contain a single control  character  instead.   In  that
+       case, no non-spacing characters are allowed.
 
-       <STRONG>o</STRONG>   The wide-character string pointed to by <EM>wc</EM>.   The  string  must  be
-           L'\0' terminated, contain at most one spacing character, which must
-           be the first.
 
-           Up to <STRONG>CCHARW_MAX</STRONG>-1 non-spacing characters may  follow.   Additional
-           non-spacing characters are ignored.
+</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
+       If <STRONG>getcchar</STRONG> is passed a null pointer as its <EM>wc</EM> argument, it returns the
+       number of wide characters for a given <EM>wch</EM> that it would  store  in  <EM>wc</EM>,
+       counting  a  trailing null wide character.  If <STRONG>getcchar</STRONG> is not passed a
+       null pointer as its <EM>wc</EM> argument, it returns <STRONG>OK</STRONG> on success  and  <STRONG>ERR</STRONG>  on
+       failure.
 
-           The string may contain a single control character instead.  In that
-           case, no non-spacing characters are allowed.
+       In  <EM>ncurses</EM>,  <STRONG>getcchar</STRONG>  returns  <STRONG>ERR</STRONG>  if either <EM>attrs</EM> or <EM>pair</EM> is a null
+       pointer and <EM>wc</EM> is not.
 
+       <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       When <EM>wc</EM> is  a  null  pointer,  <STRONG>getcchar</STRONG>  returns  the  number  of  wide
-       characters referenced by <EM>wch</EM>, including one for a trailing null.
+       In <EM>ncurses</EM>, <STRONG>setcchar</STRONG> returns <STRONG>ERR</STRONG> if
 
-       When  <EM>wc</EM>  is  not  a  null pointer, <STRONG>getcchar</STRONG> returns <STRONG>OK</STRONG> upon successful
-       completion, and <STRONG>ERR</STRONG> otherwise.
+       <STRONG>o</STRONG>   <EM>wch</EM> is a null pointer,
 
-       Upon successful completion, <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, it returns
-       <STRONG>ERR</STRONG>.
+       <STRONG>o</STRONG>   <EM>wc</EM> starts with a (wide) control character and  contains  any  other
+           wide characters, or
+
+       <STRONG>o</STRONG>   <EM>pair</EM> has a negative value.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The <EM>wch</EM> argument may be a value generated by a call to <STRONG>setcchar</STRONG> or by a
-       function that has a <STRONG>cchar_t</STRONG> output argument.  If <EM>wch</EM> is constructed  by
-       any other means, the effect is unspecified.
+       <EM>wch</EM> may be a value stored by <STRONG>setcchar</STRONG> or another <EM>curses</EM> function with a
+       writable <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> argument.  If <EM>wch</EM> is constructed by any  other  means,
+       the library's behavior is unspecified.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
-       saying that it must be null.  This implementation uses  that  parameter
-       in ABI 6 for the functions which have a color pair parameter to support
-       extended color pairs:
+       saying that it must be a null pointer.  The <EM>ncurses</EM> 6 ABI uses it  with
+       functions  that  have  a color pair parameter to support extended color
+       pairs.
 
-       <STRONG>o</STRONG>   For  functions  which modify the color, e.g., <STRONG>setcchar</STRONG>, if <EM>opts</EM>  is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and used to  set  the  color
-           pair instead of the <STRONG>short</STRONG> pair parameter.
+       <STRONG>o</STRONG>   In functions that assign colors, such as <STRONG>setcchar</STRONG>, if <EM>opts</EM> is not a
+           null pointer, <EM>ncurses</EM> treats it as a pointer to <EM>int</EM>, and interprets
+           it instead of the <EM>short</EM> <EM>pair</EM> parameter as a color pair identifier.
 
-       <STRONG>o</STRONG>   For functions which retrieve the color, e.g., <STRONG>getcchar</STRONG>, if <EM>opts</EM>  is
-           set it is treated as a pointer to <STRONG>int</STRONG>, and  used  to  retrieve  the
-           color pair as an <STRONG>int</STRONG> value,  in  addition  retrieving  it  via  the
-           standard pointer to <STRONG>short</STRONG> parameter.
+       <STRONG>o</STRONG>   In functions that retrieve colors, such as <STRONG>getcchar</STRONG>, if <EM>opts</EM> is not
+           a  null  pointer, <EM>ncurses</EM> treats it as a pointer to <EM>int</EM>, and stores
+           the retrieved color pair identifier there as well as in  the  <EM>short</EM>
+           <EM>pair</EM>   parameter   (which   may   therefore   undergo  a  narrowing
+           conversion).
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  <STRONG>CCHARW_MAX</STRONG>  symbol is specific to <EM>ncurses</EM>.  X/Open Curses does not
-       provide details for the layout of the <STRONG>cchar_t</STRONG> structure.  It tells what
-       data are stored in it:
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
+       no error conditions for them.
+
+       X/Open Curses does not detail the  layout  of  the  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  structure,
+       describing only its minimal required contents:
 
-       <STRONG>o</STRONG>   a spacing character (<STRONG>wchar_t</STRONG>, i.e., 32-bits).
+       <STRONG>o</STRONG>   a spacing wide character (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>),
 
-       <STRONG>o</STRONG>   non-spacing characters (again, <STRONG>wchar_t</STRONG>'s).
+       <STRONG>o</STRONG>   at least five non-spacing wide characters (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>; see below),
 
-       <STRONG>o</STRONG>   attributes  (at  least  16 bits, inferred from the various ACS- and
-           WACS-flags).
+       <STRONG>o</STRONG>   attributes  (at  least  15  bits' worth, inferred from the count of
+           specified <STRONG>WA_</STRONG> constants),
 
-       <STRONG>o</STRONG>   color pair (at least 16 bits,  inferred  from  the  <STRONG>unsigned</STRONG>  <STRONG>short</STRONG>
-           type).
+       <STRONG>o</STRONG>   a color pair identifier (at least 16 bits, inferred from the  <EM>short</EM>
+           type used to encode it).
 
-       The non-spacing characters are optional, in the sense that zero or more
-       may be stored in a <STRONG>cchar_t</STRONG>.  XOpen/Curses specifies a limit:
+       Non-spacing characters are optional, in the sense that zero or more may
+       be stored in a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.  XOpen/Curses specifies a limit:
 
            Implementations may limit the number of non-spacing characters that
            can  be  associated with a spacing character, provided any limit is
            at least 5.
 
-       The Unix implementations at the time follow that limit:
+       Then-contemporary Unix implementations adhered to that limit.
+
+       <STRONG>o</STRONG>   AIX 4 and OSF/1 4 used the same declaration with a  single  spacing
+           wide character <EM>c</EM> and an array of 5 non-spacing wide characters <EM>z</EM>.
+
+       <STRONG>o</STRONG>   HP-UX 10  used  an opaque structure of 28 bytes, large enough for 6
+           <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> values.
 
-       <STRONG>o</STRONG>   AIX 4 and OSF1 4 use the same declaration with an array of  5  non-
-           spacing characters <EM>z</EM> and a single spacing character <EM>c</EM>.
+       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> uses a single array of 6 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> values.
 
-       <STRONG>o</STRONG>   HP-UX 10  uses  an  opaque  structure with 28 bytes, which is large
-           enough for the 6 <STRONG>wchar_t</STRONG> values.
+       <EM>ncurses</EM> defined its <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> in 1995 using 5 as the <EM>total</EM> of spacing and
+       non-spacing  characters  (<STRONG>CCHARW_MAX</STRONG>).   That  was  probably  due  to a
+       misreading of  the  AIX 4  header  files,  because  the  X/Open  Curses
+       document  was  not  generally available at that time.  Later (in 2002),
+       this detail was overlooked when work began to implement  the  functions
+       using the structure.
 
-       <STRONG>o</STRONG>   Solaris <EM>xpg4</EM> curses uses a single array of 6 <STRONG>wchar_t</STRONG> values.
+       In  practice,  a  mere  four  non-spacing characters may seem adequate.
+       X/Open  Curses   documents   possible   applications   of   non-spacing
+       characters,  including their use as ligatures (a feature apparently not
+       supported by any <EM>curses</EM> implementation).  Unicode does  not  limit  the
+       (analogous)  number of combining characters in a grapheme cluster; some
+       applications may be affected.  <EM>ncurses</EM> can be compiled with a different
+       <STRONG>CCHARW_MAX</STRONG> value; doing so alters the library's ABI.
 
-       This implementation's <STRONG>cchar_t</STRONG> was defined in 1995 using <STRONG>5</STRONG> for the total
-       of  spacing and non-spacing characters (<STRONG>CCHARW_MAX</STRONG>).  That was probably
-       due to a misreading of the  AIX 4  header  files,  because  the  X/Open
-       Curses  document  was  not generally available at that time.  Later (in
-       2002), this detail was  overlooked  when  beginning  to  implement  the
-       functions using the structure.
 
-       In  practice, even four non-spacing characters may seem enough.  X/Open
-       Curses documents possible uses for  non-spacing  characters,  including
-       using  them  for ligatures between characters (a feature apparently not
-       supported by any curses implementation).  Unicode does  not  limit  the
-       (analogous) number of combining characters, so some applications may be
-       affected.
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+       (1995).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -196,7 +207,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -212,6 +223,7 @@ <H1 class="no-header">curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index a18ae93dc..97b5ad716 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp @
+  * @Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -83,13 +83,13 @@ <H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        If no input is pending, then if the no-delay flag is set in the  window
        (see  <STRONG><A HREF="nodelay.3x.html">nodelay(3x)</A></STRONG>),  the  function returns <STRONG>ERR</STRONG>; otherwise, <EM>curses</EM> waits
-       until the terminal has input.  If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  has  been  called,  this
-       happens  after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG> has
-       been called, it occurs when the next newline  is  read.   (Because  the
-       terminal's canonical or "cooked" mode is line-buffered, multiple <STRONG>wgetch</STRONG>
-       calls  may  then  be  necessary  to  empty  the   input   queue.)    If
-       <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available or
-       the specified delay elapses.
+       until the terminal has  input.   If  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>  or  <STRONG><A HREF="curs_inopts.3x.html">raw(3x)</A></STRONG>  has  been
+       called,  this  happens after one character is read.  If <STRONG><A HREF="curs_inopts.3x.html">nocbreak(3x)</A></STRONG> or
+       <STRONG><A HREF="curs_inopts.3x.html">noraw(3x)</A></STRONG> has been called, it occurs when the  next  newline  is  read.
+       (Because  the  terminal's  canonical or "cooked" mode is line-buffered,
+       multiple <STRONG>wgetch</STRONG> calls may then be necessary to empty the input  queue.)
+       If <STRONG><A HREF="curs_inopts.3x.html">halfdelay(3x)</A></STRONG> has been called, <EM>curses</EM> waits until input is available
+       or the specified delay elapses.
 
        If <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> has been called, and the window is not a pad, <EM>curses</EM> writes
        the returned character <EM>c</EM> to the window (at the cursor position) per the
@@ -155,7 +155,7 @@ <H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
        <STRONG>ungetch</STRONG> places <EM>c</EM> into the input queue to be returned by the  next  call
        to <STRONG>wgetch</STRONG>.  A single input queue serves all windows associated with the
-       terminal.
+       screen.
 
 
 </PRE><H3><a name="h3-Predefined-Key-Codes">Predefined Key Codes</a></H3><PRE>
@@ -307,8 +307,8 @@ <H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
-       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <STRONG>errno</STRONG> is set
-           to <STRONG>EINTR</STRONG>.
+       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <EM>errno</EM> is set
+           to <EM>EINTR</EM>.
 
        <STRONG>ungetch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on  failure.   <STRONG>ungetch</STRONG>  fails  if
        there is no more room in the input queue.
@@ -377,7 +377,7 @@ <H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        function key character sequence from a series of key strokes  beginning
        with ESC typed by the user; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       <STRONG>has_key</STRONG>  was  designed  for  <EM>ncurses</EM>,  and is not found in SVr4 <EM>curses</EM>,
+       <STRONG>has_key</STRONG>  is  an  <EM>ncurses</EM>  extension,  and  is not found in SVr4 <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
@@ -385,50 +385,53 @@ <H1 class="no-header">curs_getch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
+       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
        describes these functions.  It specifies no error conditions for them.
 
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
+
        <STRONG>wgetch</STRONG> reads only single-byte characters.
 
-       The echo behavior of these functions on  input  of  <STRONG>KEY_</STRONG>  or  backspace
+       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
        characters is not documented in SVr4 <EM>curses</EM>.
 
-       The  behavior  of  <STRONG>wgetch</STRONG>  in  the  presence  of signal handlers is not
-       documented in SVr4 <EM>curses</EM> and is  unspecified  by  X/Open  Curses.   In
-       historical  <EM>curses</EM>  implementations, it varied depending on whether the
-       operating system's dispatch of a signal  to  a  handler  interrupted  a
+       The behavior of <STRONG>wgetch</STRONG> in  the  presence  of  signal  handlers  is  not
+       documented  in  SVr4  <EM>curses</EM>  and  is unspecified by X/Open Curses.  In
+       historical <EM>curses</EM> implementations, it varied depending on  whether  the
+       operating  system's  dispatch  of  a  signal to a handler interrupted a
        <STRONG>read(2)</STRONG> call in progress, and also (in some implementations) whether an
-       input timeout or non-blocking mode had been  set.   A  portable  <EM>curses</EM>
-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       input  timeout  or  non-blocking  mode had been set.  A portable <EM>curses</EM>
+       application prepares  for  two  cases:  (a)  signal  receipt  does  not
        interrupt <STRONG>wgetch</STRONG>; or (b) signal receipt interrupts <STRONG>wgetch</STRONG> and causes it
        to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
 
        <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
+       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG>  and  <STRONG>has_key</STRONG>  are extensions first implemented for <EM>ncurses</EM>.
+       <STRONG>KEY_RESIZE</STRONG> and <STRONG>has_key</STRONG> are extensions first  implemented  for  <EM>ncurses</EM>.
        By  2022,  <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  had  added  them  along  with
        <STRONG>KEY_MOUSE</STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       ECMA-6  "7-bit  coded  Character  Set" &lt;https://ecma-international.org/
+       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
        publications-and-standards/standards/ecma-6/&gt;
 
-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   &lt;https://
+       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
        ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
 
-       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 5a93fd40b..ac79a6b11 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp @
+  * @Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -48,7 +48,7 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>getstr</STRONG>,  <STRONG>getnstr</STRONG>,  <STRONG>wgetstr</STRONG>,  <STRONG>wgetnstr</STRONG>,  <STRONG>mvgetstr</STRONG>, <STRONG>mvgetnstr</STRONG>, <STRONG>mvwgetstr</STRONG>,
-       <STRONG>mvwgetnstr</STRONG> - accept character strings from <EM>curses</EM> terminal keyboard
+       <STRONG>mvwgetnstr</STRONG> - read a character string from <EM>curses</EM> terminal keyboard
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -62,7 +62,8 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>getnstr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wgetnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvgetnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwgetnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwgetnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -91,7 +92,7 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        entire buffer.
 
        If the screen's echo option is enabled (see <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG>), <STRONG>wgetstr</STRONG>  updates
-       <EM>win</EM> with <STRONG><A HREF="curs_addch.3x.html">wechochar(3x)</A></STRONG>.  Further,
+       <EM>win</EM> with <STRONG><A HREF="curs_addch.3x.html">waddch(3x)</A></STRONG>.  Further,
 
        <STRONG>o</STRONG>   the  erase  character and its function key synonyms move the cursor
            to the left, and
@@ -102,7 +103,8 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>wgetnstr</STRONG>  is  similar,  but  reads  at  most  <EM>n</EM>  characters, aiding the
        application to avoid overrunning the buffer to which  <EM>str</EM>  points.   An
        attempt  to  input  more  than <EM>n</EM> characters (other than the terminating
-       line feed or carriage return) is ignored with a beep.
+       line feed or carriage  return)  is  ignored  with  a  beep.   If  <EM>n</EM>  is
+       negative, <STRONG>wgetn_wstr</STRONG> reads up to <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM> characters (see <STRONG>sysconf(3)</STRONG>).
 
        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
@@ -114,33 +116,36 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>, or
 
-       <STRONG>o</STRONG>   if an internal <STRONG>wgetch</STRONG> call fails.
+       <STRONG>o</STRONG>   if an internal <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> call fails.
 
-       Further, in <EM>ncurses</EM>, these functions return <STRONG>KEY_RESIZE</STRONG>  if  a  <STRONG>SIGWINCH</STRONG>
+       Further,  in  <EM>ncurses</EM>,  these functions return <STRONG>KEY_RESIZE</STRONG> if a <EM>SIGWINCH</EM>
        event interrupts the function.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>wgetnstr</STRONG> may be implemented as macros.
 
-       Use of <STRONG>getstr</STRONG>, <STRONG>mvgetstr</STRONG>, <STRONG>mvwgetstr</STRONG>,  or  <STRONG>wgetstr</STRONG>  to  read  input  that
-       overruns  the  buffer  pointed to by <EM>str</EM> causes undefined results.  Use
-       their <STRONG>n</STRONG>-infixed counterpart functions instead.
+       Reading  input  that  overruns  the  buffer  pointed  to  by <EM>str</EM> causes
+       undefined  results.   Use  the  <STRONG>n</STRONG>-infixed   functions,   and   allocate
+       sufficient storage for <EM>str</EM> -- at least <EM>n</EM>+1 times <STRONG>sizeof(char)</STRONG>.
 
-       While <STRONG>wgetnstr</STRONG> is conceptually a series of calls  to  <STRONG>wgetch</STRONG>,  it  also
-       temporarily  changes  properties  of the <EM>curses</EM> screen to permit simple
-       editing of the input buffer.  It saves  the  screen's  state  and  then
-       calls  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  and,  if  the  screen  was in canonical ("cooked") mode,
-       <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>.  Before returning, it  restores  the  saved  screen  state.
-       Other   implementations  differ  in  detail,  affecting  which  control
-       characters they can accept in the  buffer;  see  section  "PORTABILITY"
-       below.
+       While  these  functions  conceptually  implement  a  series of calls to
+       <STRONG>wgetch</STRONG>, they also temporarily change properties of the <EM>curses</EM> screen to
+       permit  simple  editing  of  the input buffer.  Each function saves the
+       screen's state, calls <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>, and,  if  the  screen  was  in  canonical
+       ("cooked")  mode,  <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG>.  Before returning, it restores the saved
+       screen state.  Other implementations differ in detail, affecting  which
+       control   characters  they  can  accept  in  the  buffer;  see  section
+       "PORTABILITY" below.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>getnstr</STRONG>, <STRONG>wgetnstr</STRONG>, <STRONG>mvgetnstr</STRONG>, and <STRONG>mvwgetnstr</STRONG>'s handing  of  negative  <EM>n</EM>
+       values is an <EM>ncurses</EM> extension.
+
        The return value <STRONG>KEY_RESIZE</STRONG> is an <EM>ncurses</EM> extension.
 
 
@@ -155,8 +160,8 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        any complete characters".   In  <EM>ncurses</EM>,  however,  <EM>wgetch</EM>  reads  only
        single-byte characters, so this scenario does not arise.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
        SVr3 and early SVr4 <EM>curses</EM>  implementations  did  not  reject  function
        keys; the SVr4 documentation asserted that, like the screen's erase and
@@ -168,14 +173,16 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        without  further  detail.   It  lied.   In  fact, the "character" value
        appended to the string by those implementations was predictable but not
        useful  --  being,  in fact, the low-order eight bits of the key code's
-       <STRONG>KEY_</STRONG> constant value.  (The same language, unchanged except for styling,
-       survived into X/Open Curses Issue 4, but disappeared from Issue 7.)
+       <EM>KEY</EM><STRONG>_</STRONG> constant value.  (The same language, unchanged except for styling,
+       survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
+       Issue 7.)
 
-       X/Open  Curses Issue 5 (2007) stated that these functions "read at most
-       <EM>n</EM> bytes" but did not  state  whether  the  terminating  null  character
-       counted  toward  that limit.  X/Open Curses Issue 7 (2009) changed that
-       to say they "read at most <EM>n</EM>-1 bytes" to allow for the terminating  null
-       character.  As of 2018, some implementations count it, some do not.
+       A draft of X/Open Curses Issue 5 (which never saw final release) stated
+       that  these  functions "read at most <EM>n</EM> bytes" but did not state whether
+       the terminating null  character  counted  toward  that  limit.   X/Open
+       Curses  Issue 7  changed  that  to say they "read at most <EM>n</EM>-1 bytes" to
+       allow  for  the  terminating  null  character.   As   of   2018,   some
+       implementations count it, some do not.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> 6.1 and <EM>PDCurses</EM> do not count the null character toward the
            limit, while Solaris and NetBSD <EM>curses</EM> do.
@@ -185,58 +192,59 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            wide <EM>wgetnstr</EM> does not consistently count a null  character  toward
            the limit.
 
-       In SVr4 <EM>curses</EM>, a negative <EM>n</EM> tells <EM>wgetnstr</EM> to assume that the caller's
-       buffer is large enough to hold the result; that is, the  function  then
-       acts  like  <EM>wgetstr</EM>.   X/Open Curses does not mention this behavior (or
-       anything  related  to  nonpositive  <EM>n</EM>  values),  however  most   <EM>curses</EM>
-       libraries  implement  it.  Most implementations nevertheless enforce an
-       upper limit on the count of bytes they write to the destination  buffer
-       <EM>str</EM>.
+       X/Open  Curses  does  not  specify  what  happens  if  the  length <EM>n</EM> is
+       negative.
+
+       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.2 uses <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>  or  a  larger  (system-dependent)  value
+           provided  by  <STRONG>sysconf(3)</STRONG>.   If  neither  <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>  nor  <EM>sysconf</EM>  is
+           available, <EM>ncurses</EM>  uses  the  POSIX  minimum  value  for  <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>
+           (2048).   In  either  case,  it reserves a byte for the terminating
+           null character.
+
+       <STRONG>o</STRONG>   In SVr4 <EM>curses</EM>, a negative <EM>n</EM> tells  <EM>wgetnstr</EM>  to  assume  that  the
+           caller's  buffer  is  large enough to hold the result; that is, the
+           function then acts like <EM>wgetstr</EM>.  X/Open Curses  does  not  mention
+           this  behavior  (or  anything  related  to  nonpositive  <EM>n</EM> values),
+           however most <EM>curses</EM> libraries implement it.   Most  implementations
+           nevertheless  enforce  an  upper  limit  on the count of bytes they
+           write to the destination buffer <EM>str</EM>.
 
-       <STRONG>o</STRONG>   BSD   <EM>curses</EM>   lacked  <EM>wgetnstr</EM>,  and  its  <EM>wgetstr</EM>  wrote  to  <EM>str</EM>
+       <STRONG>o</STRONG>   BSD  <EM>curses</EM>  lacked  <EM>wgetnstr</EM>,  and  its  <EM>wgetstr</EM>  wrote   to   <EM>str</EM>
            unboundedly, as did that in SVr2.
 
-       <STRONG>o</STRONG>   <EM>PDCurses</EM>, and SVr3.1, SVr4, and Solaris <EM>curses</EM> limit both functions
-           to  writing  256  bytes.  Other System V-based platforms likely use
-           the same limit.
+       <STRONG>o</STRONG>   <EM>PDCurses</EM>,  and  SVr3  and  later,  and  Solaris  <EM>curses</EM>  limit both
+           functions to writing 256  bytes.   Other  System V-based  platforms
+           likely use the same limit.
 
-       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> limits the write to <STRONG>LINE_MAX</STRONG> bytes.
+       <STRONG>o</STRONG>   Solaris   <EM>xcurses</EM>   limits   the   write  to  <EM>LINE</EM><STRONG>_</STRONG><EM>MAX</EM>  bytes  (see
+           <STRONG>sysconf(3)</STRONG>).
 
        <STRONG>o</STRONG>   NetBSD 7 <EM>curses</EM> imposes no particular limit on the  length  of  the
            write,  but does validate <EM>n</EM> to ensure that it is greater than zero.
            A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
            this.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  prior  to 6.2 (2020) imposes no limit on the length of the
-           write, and treats <EM>wgetnstr</EM>'s <EM>n</EM> parameter as SVr4 <EM>curses</EM> does.
-
-       <STRONG>o</STRONG>   <EM>ncurses</EM> 6.2 uses <STRONG>LINE_MAX</STRONG>  or  a  larger  (system-dependent)  value
-           provided  by  <STRONG>sysconf(3)</STRONG>.   If  neither  <STRONG>LINE_MAX</STRONG>  nor  <EM>sysconf</EM>  is
-           available, <EM>ncurses</EM>  uses  the  POSIX  minimum  value  for  <STRONG>LINE_MAX</STRONG>
-           (2048).   In  either  case,  it reserves a byte for the terminating
-           null character.
-
        Implementations vary in their handling of input control characters.
 
        <STRONG>o</STRONG>   While they may enable the screen's echo option, some do not take it
-           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+           out of raw mode,  and  may  take  cbreak  mode  into  account  when
            deciding whether to handle echoing within <EM>wgetnstr</EM> or to rely on it
            as a side effect of calling <EM>wgetch</EM>.
 
-       <STRONG>o</STRONG>   Originally,  <EM>ncurses</EM>, like its progenitor <EM>pcurses</EM>, had its <EM>wgetnstr</EM>
-           call <EM>noraw</EM> and <EM>cbreak</EM> before accepting input.  That may  have  been
-           done  to  make  function keys work; it is not necessary with modern
+       <STRONG>o</STRONG>   Originally, <EM>ncurses</EM>, like its progenitor <EM>pcurses</EM>, had its  <EM>wgetnstr</EM>
+           call  <EM>noraw</EM>  and <EM>cbreak</EM> before accepting input.  That may have been
+           done to make function keys work; it is not  necessary  with  modern
            <EM>ncurses</EM>.
 
-           Since 1995, <EM>ncurses</EM> has provided handlers for <STRONG>SIGINTR</STRONG>  and  <STRONG>SIGQUIT</STRONG>
-           events,  which  are typically generated at the keyboard with <STRONG>^C</STRONG> and
+           Since  1995,  <EM>ncurses</EM> has provided handlers for <EM>SIGINTR</EM> and <EM>SIGQUIT</EM>
+           events, which are typically generated at the keyboard with  <STRONG>^C</STRONG>  and
            <STRONG>^\</STRONG> respectively.  In cbreak mode, those handlers catch a signal and
-           stop   the  program,  whereas  other  implementations  write  those
+           stop  the  program,  whereas  other  implementations  write   those
            characters into the buffer.
 
-       <STRONG>o</STRONG>   Starting with <EM>ncurses</EM> 6.3 (2021), <EM>wgetnstr</EM> preserves  raw  mode  if
-           the  screen  was  already  in that state, allowing one to enter the
-           characters the terminal interprets as  interrupt  and  quit  events
+       <STRONG>o</STRONG>   Starting  with  <EM>ncurses</EM>  6.3 (2021), <EM>wgetnstr</EM> preserves raw mode if
+           the screen was already in that state, allowing  one  to  enter  the
+           characters  the  terminal  interprets  as interrupt and quit events
            into the buffer, for better compatibility with SVr4 <EM>curses</EM>.
 
 
@@ -245,7 +253,7 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        SVr3.1 (1987) added <EM>wgetnstr</EM>, but none of its variants.
 
-       X/Open  Curses  Issue  4  (1995)  specified  <EM>getnstr</EM>,  <EM>mvwgetnstr</EM>,  and
+       X/Open  Curses  Issue 4  (1995)  specified  <EM>getnstr</EM>,  <EM>mvwgetnstr</EM>,   and
        <EM>mvgetnstr</EM>.
 
 
@@ -253,12 +261,12 @@ <H1 class="no-header">curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,
        <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>,
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index f12c587b5..0075a489c 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2020-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp @
+  * @Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -85,11 +85,11 @@ <H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These macros are described in X/Open Curses, Issue 4.
+       These macros are described in X/Open Curses Issue 4.
 
-       <EM>ncurses</EM>  also  provides  functions  <STRONG>getbegx</STRONG>, <STRONG>getbegy</STRONG>, <STRONG>getcurx</STRONG>, <STRONG>getcury</STRONG>,
-       <STRONG>getmaxx</STRONG>, <STRONG>getmaxy</STRONG>, <STRONG>getparx</STRONG>, and <STRONG>getpary</STRONG>  for  compatibility  with  older
-       versions of <EM>curses</EM>; see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>.
+       <EM>ncurses</EM>  also  provides  functions  <EM>getbegy</EM>, <EM>getbegx</EM>, <EM>getcury</EM>, <EM>getcurx</EM>,
+       <EM>getmaxy</EM>, <EM>getmaxx</EM>, <EM>getpary</EM>, and <EM>getparx</EM> for compatibility with  System V
+       <EM>curses</EM> that were not standardized; see <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>.
 
        Although X/Open Curses does not address the issue, many implementations
        expose members of the <EM>WINDOW</EM> structure containing values  corresponding
@@ -98,10 +98,17 @@ <H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
        access to its members).
 
        Besides the problem of opaque structures, the data stored in like-named
-       members  may  not  have  values   of   the   same   meaning   different
-       implementations.    For   example,   the  values  of  <STRONG>WINDOW._maxx</STRONG>  and
-       <STRONG>WINDOW._maxy</STRONG> in <EM>ncurses</EM> have long  differed  by  one  from  some  other
-       implementations.  The <STRONG>getmaxyx</STRONG> macro hides this difference.
+       members may not have  values  of  the  same  meaning  across  different
+       implementations.    For   example,   the  values  of  <EM>WINDOW.</EM><STRONG>_</STRONG><EM>maxx</EM>  and
+       <EM>WINDOW.</EM><STRONG>_</STRONG><EM>maxy</EM> in <EM>ncurses</EM> have long  differed  by  one  from  some  other
+       implementations.  The <EM>getmaxyx</EM> macro hides this difference.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) <EM>curses</EM> introduced <EM>getyx</EM>.
+
+       SVr3  (1987)  added  <EM>getbegyx</EM>  and  <EM>getmaxyx</EM>.   SVr3.1  later that year
+       supplied <EM>getparyx</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -109,7 +116,7 @@ <H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-06-08                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -119,6 +126,7 @@ <H1 class="no-header">curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 43e717a04..9bab611cd 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -85,15 +85,15 @@ <H1 class="no-header">curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
-       The System V  Interface  Definition,  Version  4  (1995),  specified  a
-       function  named  <EM>winwch</EM>  (and  the  usual  variants).  This was a later
-       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
+       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+       (1995).  The System V Interface Definition Version 4 of the  same  year
+       specified a function named <EM>winwch</EM> (and the usual variants).  This was a
+       later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4  (1989).   It
        differed  from  X/Open's  later  <EM>win</EM><STRONG>_</STRONG><EM>wch</EM> in that it returned a value of
        type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 74a3b4bfa..890edd444 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -76,7 +76,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1
        <STRONG>cchar_t</STRONG>.   Transfer  stops  at  the  end of the current line, or when <EM>n</EM>
        characters have been stored at the location referenced by <EM>wchstr</EM>.
 
-       Constants defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the  <STRONG>&amp;</STRONG>  (logical  AND)
+       Constants defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical  "and")
        operator  to  extract  the  character  or  the attribute alone from any
        position in the <EM>wchstr</EM> [see <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG>].
 
@@ -85,29 +85,37 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1
        Upon successful completion, these functions return <STRONG>OK</STRONG>.  Otherwise, they
        return <STRONG>ERR</STRONG>.
 
-       X/Open Curses defines no error conditions.  This implementation returns
-       <STRONG>ERR</STRONG>
+       <EM>ncurses</EM> returns <STRONG>ERR</STRONG>
 
        <STRONG>o</STRONG>   if the <EM>win</EM> parameter is null or
 
        <STRONG>o</STRONG>   if the <EM>wchstr</EM> parameter is null.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All routines except <STRONG>win_wchnstr</STRONG> may be macros.
+       All of these functions except <STRONG>win_wchnstr</STRONG> may be implemented as macros.
 
-       Reading  a  line  that  overflows  the  array pointed to by <EM>wchstr</EM> with
-       <STRONG>in_wchstr</STRONG>, <STRONG>mvin_wchstr</STRONG>, <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG>  causes  undefined
-       results.     Therefore,    the   use   of   <STRONG>in_wchnstr</STRONG>,   <STRONG>mvin_wchnstr</STRONG>,
+       Reading a line that overflows the  array  pointed  to  by  <EM>wchstr</EM>  with
+       <STRONG>in_wchstr</STRONG>,  <STRONG>mvin_wchstr</STRONG>,  <STRONG>mvwin_wchstr</STRONG>  or  <STRONG>win_wchstr</STRONG> causes undefined
+       results.    Therefore,   the   use   of    <STRONG>in_wchnstr</STRONG>,    <STRONG>mvin_wchnstr</STRONG>,
        <STRONG>mvwin_wchnstr</STRONG>, or <STRONG>win_wchnstr</STRONG> is recommended.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses defines no error conditions.  This implementation  checks
-       for null pointers, returning <STRONG>ERR</STRONG> in that case.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+       (1995).   The  System V Interface Definition Version 4 of the same year
+       specified a function named <EM>winwchstr</EM> (and the  usual  variants).   This
+       was a later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       It differed from X/Open's later <EM>win</EM><STRONG>_</STRONG><EM>wchstr</EM> in that it took an  argument
+       of type pointer-to-<EM>chtype</EM> instead of pointer-to<EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -118,7 +126,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-05-25                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -128,6 +136,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls</H1
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index c6f5e3678..921a16fed 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -87,8 +87,8 @@ <H1 class="no-header">curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_inch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 8ad975a59..2d50eb069 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -75,7 +75,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        (chtype)0).  Transfer stops at the end of the current line, or  when  <EM>n</EM>
        characters have been stored at the location referenced by <EM>chstr</EM>.
 
-       Constants  defined  in  <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical AND)
+       Constants  defined in <STRONG>&lt;curses.h&gt;</STRONG> can be used with the <STRONG>&amp;</STRONG> (logical "and")
        operator to extract the character  or  the  attribute  alone  from  any
        position in the <EM>chstr</EM> [see <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>].
 
@@ -97,11 +97,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All routines except <STRONG>winchnstr</STRONG> may be macros.
-
-       SVr4 does not document whether the result string is zero-terminated; it
-       does not document whether a length limit argument includes any trailing
-       0; and it does not document the meaning of the return value.
+       All of these functions except <STRONG>winchnstr</STRONG> may be implemented as macros.
 
        Reading  a  line  that  overflows  the  array  pointed to by <EM>chstr</EM> with
        <STRONG>inchstr</STRONG>, <STRONG>mvinchstr</STRONG>, <STRONG>mvwinchstr</STRONG> or <STRONG>winchstr</STRONG>  causes  undefined  results.
@@ -110,9 +106,18 @@ <H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses, Issue 4.  It is no more
-       specific  than  the  SVr4  documentation  on  the  trailing 0.  It does
-       specify that the successful return of the functions is <STRONG>OK</STRONG>.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions  for  them.   It  characterizes  the strings stored by these
+       functions as containing "at most <EM>n</EM> elements" from a  window,  but  does
+       not  specify  whether  the  string  stored  by these functions is null-
+       terminated.
+
+       SVr4 does not document whether it null-terminates the string it  stores
+       in <EM>chstr</EM>, and does not document whether a trailing null chracter counts
+       toward the length limit <EM>n</EM>.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -120,7 +125,7 @@ <H1 class="no-header">curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index aee4300f0..26f1daaae 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp @
+  * @Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -191,8 +191,8 @@ <H1 class="no-header">curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
 
 </PRE><H3><a name="h3-Differences">Differences</a></H3><PRE>
@@ -247,7 +247,7 @@ <H1 class="no-header">curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
            uses the descriptor in <EM>SCREEN</EM>.
 
-   <STRONG>Unset</STRONG> <STRONG><EM>TERM</EM></STRONG> <STRONG>Variable</STRONG>
+   <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
        If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
        "unknown",  which  normally  corresponds  to  a terminal entry with the
        <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
@@ -319,7 +319,7 @@ <H1 class="no-header">curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index e6c101ea5..2f7e5f6b5 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp @
+  * @Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -137,10 +137,10 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
        <STRONG>halfdelay</STRONG>  configures  <EM>half-delay</EM> <EM>mode</EM>, which is similar to cbreak mode
        in that characters typed by the user are immediately available  to  the
-       program.   However,  after  blocking  for  <EM>tenths</EM> tenths of seconds, an
-       input character reading function returns <STRONG>ERR</STRONG> if no  input  is  pending.
-       The  value  of <EM>tenths</EM> must be between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave
-       half-delay mode.
+       program.   However,  after  blocking for <EM>tenths</EM> tenth-seconds, an input
+       character reading function returns <STRONG>ERR</STRONG> if no  input  is  pending.   The
+       value of <EM>tenths</EM> must be between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-
+       delay mode.
 
 
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
@@ -211,8 +211,8 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        such flushing, but might frustrate impatient users on slow  connections
        if  a <EM>curses</EM> update of the screen is in progress when the event occurs;
        see <STRONG>typeahead</STRONG> below for a mitigation of this problem.  You may want  to
-       call <STRONG>noqiflush</STRONG> in a signal handler if you want output to continue after
-       the handler exits as though the interrupt had not occurred.
+       call  <STRONG>noqiflush</STRONG>  in  a  signal handler if, after the handler exits, you
+       want output to continue as though the interrupt had not occurred.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
@@ -256,14 +256,15 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        In <EM>ncurses</EM>, the functions in the previous paragraph return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   the terminal is not initialized or
+       <STRONG>o</STRONG>   the library's <EM>TERMINAL</EM>  structure  for  the  device  has  not  been
+           initialized with <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, or <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>, or
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> (except  for  <STRONG>intrflush</STRONG>  and  <STRONG>meta</STRONG>,  which  ignore  its
-           value).
+       <STRONG>o</STRONG>   <EM>win</EM> is a null pointer (except with <STRONG>intrflush</STRONG> and <STRONG>meta</STRONG>, which ignore
+           its value).
 
        Further, <STRONG>halfdelay</STRONG> returns <STRONG>ERR</STRONG> if <EM>delay</EM> is outside the range 1..255.
 
-       See  section  "EXTENSIONS"  below  for  the return values of <STRONG>is_cbreak</STRONG>,
+       See section "EXTENSIONS" below for  the  return  values  of  <STRONG>is_cbreak</STRONG>,
        <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, and <STRONG>is_raw</STRONG>.
 
 
@@ -271,15 +272,15 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>notimeout</STRONG>,
        <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
-       <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
-       restore the terminal's canonical ("cooked") line  discipline  from  raw
-       and  cbreak, respectively.  Mixing <STRONG>raw</STRONG>/<STRONG>noraw</STRONG> calls with <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
-       calls leads to terminal driver control states that are hard to  predict
+       <STRONG>noraw</STRONG> and <STRONG>nocbreak</STRONG> follow historical practice in that they  attempt  to
+       restore  the  terminal's  canonical ("cooked") line discipline from raw
+       and cbreak, respectively.  Mixing <STRONG>raw</STRONG>/<STRONG>noraw</STRONG> calls with  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
+       calls  leads to terminal driver control states that are hard to predict
        or understand; doing so is not recommended.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM>  provides  four  "is_" functions corresponding to <STRONG>cbreak</STRONG>, <STRONG>echo</STRONG>,
+       <EM>ncurses</EM> provides four "is_" functions corresponding  to  <STRONG>cbreak</STRONG>,  <STRONG>echo</STRONG>,
        <STRONG>nl</STRONG>, and <STRONG>raw</STRONG>, permitting their states to be queried by the application.
 
                             <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
@@ -293,20 +294,21 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>1</STRONG>    if the option is set,
 
-       <STRONG>0</STRONG>    if the option is reset, or
+       <STRONG>0</STRONG>    if the option is unset, or
 
-       <STRONG>-1</STRONG>   if the library is not initialized.
+       <STRONG>-1</STRONG>   if  the  library's  <EM>TERMINAL</EM> structure for the device has not been
+            initialized.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
+       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
        describes these functions.  It specifies no error conditions for them.
 
-       SVr4 <EM>curses</EM> describes a successful return value  only  as  "an  integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
        <EM>ncurses</EM>  follows  X/Open Curses and the historical practice of System V
        <EM>curses</EM>, clearing the terminal driver's "echo"  flag  when  initializing
@@ -382,7 +384,7 @@ <H1 class="no-header">curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 6ec2f4b60..94199051e 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -85,17 +85,15 @@ <H1 class="no-header">curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
-
-       SVr4 describes successful return values only as "an integer value other
-       than <STRONG>ERR</STRONG>".
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
-       The System V  Interface  Definition,  Version  4  (1995),  specified  a
-       function  named  <EM>winswch</EM>  (and  the  usual variants).  This was a later
-       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
+       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+       (1995).  The System V Interface Definition Version 4 of the  same  year
+       specified  a function named <EM>winswch</EM> (and the usual variants).  This was
+       a later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).  It
        differed  from  X/Open's  later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took an argument of
        type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
@@ -108,7 +106,7 @@ <H1 class="no-header">curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index f3e6fc3ea..e889605fd 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -58,12 +58,14 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>ins_wstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvins_wstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_wstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>ins_nwstr(const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvins_nwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_nwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -75,8 +77,8 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        next line to write the next <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>wstr</EM>.  The cursor position  does
        not change (after moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG>wins_nwstr</STRONG> does the
        same, but inserts at most <EM>n</EM> characters, or as many as possible  (up  to
-       the end of the line) if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of
-       these functions.
+       the  end  of  the  line)  if  <EM>n</EM> is negative.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the
+       variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -100,25 +102,33 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        All of these functions except <STRONG>wins_nwstr</STRONG> may be implemented as macros.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>ins_nwstr</STRONG>,  <STRONG>wins_nwstr</STRONG>,  <STRONG>mvins_nwstr</STRONG>,  and <STRONG>mvwins_nwstr</STRONG>'s acceptance of
+       negative <EM>n</EM> values is an <EM>ncurses</EM> extension.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        X/Open Curses does not specify what happens if a non-spacing  character
        follows a control character.
 
-       Issue  4 states that the entire string is inserted if <EM>n</EM> is less than 1.
+       Issue 4  states that the entire string is inserted if <EM>n</EM> is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions  such  as  <STRONG><A HREF="curs_addwstr.3x.html">waddwstr(3x)</A></STRONG>, and differs from the SVr4 <EM>curses</EM> and
-       Solaris <EM>xcurses</EM> implementations.  Nevertheless,  Issue  7  retains  the
+       functions  such  as  <EM>waddwstr</EM>,  and  differs  from  the SVr4 <EM>curses</EM> and
+       Solaris <EM>xcurses</EM> implementations.   Nevertheless,  Issue 7  retains  the
        language.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
-       The  System V  Interface  Definition,  Version  4   (1995),   specified
-       functions named <EM>winswstr</EM> and <EM>winsnwstr</EM> (and the usual variants).  These
-       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       These functions were initially specified by X/Open Curses Issue 4.  The
+       System V Interface Definition  Version 4  (1995),  specified  functions
+       named  <EM>winswstr</EM>  and  <EM>winsnwstr</EM>  (and  the usual variants).  These were
+       later additions to SVr4.<EM>x</EM>, not appearing  in  the  first  SVr4  (1989).
        They  differ from X/Open's later <EM>wins</EM><STRONG>_</STRONG><EM>wstr</EM> and <EM>wins</EM><STRONG>_</STRONG><EM>nwstr</EM> in that their
        <EM>wstr</EM> parameters are not <EM>const</EM>-qualified.
 
@@ -131,7 +141,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -140,6 +150,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 6ebe0b286..425be8d1a 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -84,10 +84,10 @@ <H1 class="no-header">curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -102,7 +102,7 @@ <H1 class="no-header">curs_insch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 1b054176c..3427bd14e 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -62,7 +62,8 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>insnstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>winsnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvinsnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinsnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinsnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -74,7 +75,8 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        write the next <EM>char</EM> in <EM>str</EM>.  The cursor position does not change (after
        moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG>insnstr</STRONG> does the same, but inserts at
        most  <EM>n</EM>  characters, or as many as possible (up to the end of the line)
-       if <EM>n</EM> is <STRONG>-1</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
+       if  <EM>n</EM>  is  negative.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants  of  these
+       functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -88,7 +90,7 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   an internal <STRONG><A HREF="curs_insch.3x.html">winsch(3x)</A></STRONG> call returns <STRONG>ERR</STRONG>.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -96,11 +98,22 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        All of these functions except <STRONG>winsnstr</STRONG> may be implemented as macros.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       <STRONG>insnstr</STRONG>, <STRONG>winsnstr</STRONG>, <STRONG>mvinsnstr</STRONG>, and <STRONG>mvwinsnstr</STRONG>'s acceptance of negative <EM>n</EM>
+       values is an <EM>ncurses</EM> extension.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
-       Issue 4 distinguished <STRONG>insnstr</STRONG> and <STRONG>winsnstr</STRONG>  from  the  other  functions
+       Issue 4 distinguished <EM>insnstr</EM> and <EM>winsnstr</EM>  from  the  other  functions
        documented  above  by stating they "do not perform wrapping".  This was
        probably an error, since it makes this group of functions inconsistent.
        No  implementation  of <EM>curses</EM> documents this inconsistency, and Issue 7
@@ -108,9 +121,8 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        Issue 4 states that the entire string is inserted if <EM>n</EM> is less than  1.
        This  is  probably  an  error,  because  it  is inconsistent with other
-       functions such as <STRONG><A HREF="curs_addstr.3x.html">waddstr(3x)</A></STRONG>, and differs from  the  SVr4  <EM>curses</EM>  and
-       Solaris  <EM>xcurses</EM>  implementations.   Nevertheless,  Issue 7 retains the
-       language.
+       functions such as <EM>waddstr</EM>, and differs from the SVr4 <EM>curses</EM> and Solaris
+       <EM>xcurses</EM> implementations.  Nevertheless, Issue 7 retains the language.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -125,7 +137,7 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -134,6 +146,7 @@ <H1 class="no-header">curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 5e8cd9485..c155eb796 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -62,7 +62,8 @@ <H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>innstr(char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>winnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvinnstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinnstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -70,9 +71,9 @@ <H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        cursor  and  stopping  at  the  end  of the line, and stores it in <EM>str</EM>,
        terminating it with a null character and omitting  any  attributes  and
        color  pair  identifier  that  <EM>curses</EM>  associates  with each character.
-       <STRONG>winnstr</STRONG> does the same, but copies at most <EM>n</EM> characters from <EM>win</EM>.  An  <EM>n</EM>
-       of  <STRONG>-1</STRONG>  implies  no limit; <STRONG>winnstr</STRONG> then works like <STRONG>winstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
-       describes the variants of these functions.
+       <STRONG>winnstr</STRONG> does the same, but copies at most <EM>n</EM>  characters  from  <EM>win</EM>.   A
+       negative   <EM>n</EM>   implies  no  limit;  <STRONG>winnstr</STRONG>  then  works  like  <STRONG>winstr</STRONG>.
+       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -98,16 +99,16 @@ <H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>innstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG>'s treatment of <STRONG>-1</STRONG> as  a  valid
-       value of <EM>n</EM> is an <EM>ncurses</EM> extension.
+       <STRONG>innstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG>'s  acceptance  of  negative  <EM>n</EM>
+       values is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        X/Open  Curses  Issues  4 and 7 both state that <STRONG>instr</STRONG>, <STRONG>winstr</STRONG>, <STRONG>mvinstr</STRONG>,
        and <STRONG>mvwinstr</STRONG> return <STRONG>OK</STRONG> rather than a character count.  This  is  likely
@@ -121,9 +122,11 @@ <H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> retains compatibility with System V <EM>curses</EM> behavior.
 
-       SVr4  documents no return values apart from <STRONG>OK</STRONG> and <STRONG>ERR</STRONG> for any of these
-       functions.  SVr4 does not document whether <EM>n</EM> counts the null terminator
-       that these functions write to <EM>str</EM>.
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
+
+       SVr4 does not document whether <EM>n</EM> counts the null terminator that  these
+       functions write to <EM>str</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -138,7 +141,7 @@ <H1 class="no-header">curs_instr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index eb6771d54..89ed50100 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -62,7 +62,8 @@ <H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>innwstr(wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>winnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvinnwstr(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwinnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwinnwstr(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wstr</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -71,16 +72,17 @@ <H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        it in <EM>wstr</EM>, terminating it with a wide null character and omitting  any
        attributes  and  color pair identifier that <EM>curses</EM> associates with each
        character.   <STRONG>winnwstr</STRONG>  does  the  same,  but  copies  at  most  <EM>n</EM>  wide
-       characters  from <EM>win</EM>.  An <EM>n</EM> of <STRONG>-1</STRONG> implies no limit; <STRONG>winnwstr</STRONG> then works
-       like <STRONG>winwstr</STRONG>.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
+       characters  from  <EM>win</EM>.   A  negative  <EM>n</EM> implies no limit; <STRONG>winnwstr</STRONG> then
+       works like  <STRONG>winwstr</STRONG>.   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  describes  the  variants  of  these
+       functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       On successful operation, these  functions  return  the  count  of  wide
-       characters  copied  from  <EM>win</EM>  to  <EM>wstr</EM>.  They return <STRONG>ERR</STRONG> upon failure.
-       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>,  and  <STRONG>mvwinnwstr</STRONG>  return  <STRONG>ERR</STRONG>  if  <EM>n</EM>  is
+       On  successful  operation,  these  functions  return  the count of wide
+       characters copied from <EM>win</EM> to <EM>wstr</EM>.   They  return  <STRONG>ERR</STRONG>  upon  failure.
+       <STRONG>innwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>,  and  <STRONG>mvwinnwstr</STRONG>  return  <STRONG>ERR</STRONG>  if  <EM>n</EM> is
        insufficiently  large  to  store  a  complete  wide  character  string.
-       (Recall that a <EM>curses</EM>  complex  character  can  contain  multiple  wide
+       (Recall  that  a  <EM>curses</EM>  complex  character  can contain multiple wide
        characters, some of which may be non-spacing.)
 
        In <EM>ncurses</EM>, these functions return <STRONG>ERR</STRONG> if
@@ -89,44 +91,54 @@ <H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>wstr</EM> is <EM>NULL</EM>.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>winnwstr</STRONG> may be implemented as macros.
 
-       Reading a line that overflows the array pointed to by <EM>str</EM> with  <STRONG>inwstr</STRONG>,
-       <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  or  <STRONG>mvwinwstr</STRONG>  causes  undefined  results.  Use of
+       Reading  a line that overflows the array pointed to by <EM>str</EM> with <STRONG>inwstr</STRONG>,
+       <STRONG>winwstr</STRONG>, <STRONG>mvinwstr</STRONG>, or  <STRONG>mvwinwstr</STRONG>  causes  undefined  results.   Use  of
        <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> is recommended instead.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG>'s treatment  of  <STRONG>-1</STRONG>  as  a
-       valid value of <EM>n</EM> is an <EM>ncurses</EM> extension.
+       <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG>'s acceptance of negative <EM>n</EM>
+       values is an <EM>ncurses</EM> extension.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
-       that <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> "fail  ...  [i]f  the
+       Notwithstanding the foregoing, X/Open Curses Issues 4 and 7 both  state
+       that  <STRONG>innwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> "fail ... [i]f the
        array  is  not  large  enough  to  contain  any  complete  characters".
-       Strictly interpreted, this means  that  a  caller  of  these  functions
+       Strictly  interpreted,  this  means  that  a  caller of these functions
        cannot use their return values to detect truncation of a wide-character
-       string copied from more  than  one  character  cell  in  <EM>win</EM>.   <EM>ncurses</EM>
+       string  copied  from  more  than  one  character  cell in <EM>win</EM>.  <EM>ncurses</EM>
        reports any truncation with <STRONG>ERR</STRONG>.
 
-       X/Open  Curses  specifies  <STRONG>inwstr</STRONG>,  <STRONG>winwstr</STRONG>, <STRONG>mvinwstr</STRONG>, and <STRONG>mvwinwstr</STRONG> as
-       returning <STRONG>OK</STRONG> rather than a (wide) character count,  unlike  their  non-
+       X/Open Curses specifies <STRONG>inwstr</STRONG>, <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  and  <STRONG>mvwinwstr</STRONG>  as
+       returning  <STRONG>OK</STRONG>  rather  than a (wide) character count, unlike their non-
        wide  counterparts  <STRONG>instr</STRONG>,  <STRONG>winstr</STRONG>,  <STRONG>mvinstr</STRONG>,  and  <STRONG>mvwinstr</STRONG>.   <EM>ncurses</EM>
        regards this inconsistency as an error in the standard.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       The  System V Interface Definition, Version 4 (1995), specified <EM>winwstr</EM>
+       and <EM>winnwstr</EM> (and the usual variants).  These were later  additions  to
+       SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   Their synopses
+       described each function as taking an argument of  type  pointer-to-<EM>char</EM>
+       instead  of  pointer-to-<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>,  despite describing them as "returning
+       the string of <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>str</EM>".  Presumably this was  an  error  in  the
+       System V Interface Definition.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
@@ -135,7 +147,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -146,6 +158,7 @@ <H1 class="no-header">curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 0102f43bd..446d1268e 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp @
+  * @Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -232,27 +232,30 @@ <H1 class="no-header">curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</H1>
        error conditions for them, except as described for <EM>curs</EM><STRONG>_</STRONG><EM>set</EM> in  section
        "RETURN VALUE" above.
 
-       Older  SVr4  man  pages  warn  that  the  return  value of <STRONG>curs_set</STRONG> "is
-       currently incorrect".  This implementation gets it right, but  counting
+       The  System V  Interface Definition, Version 4 (1995), specified all of
+       these functions except <EM>curs</EM><STRONG>_</STRONG><EM>set</EM> as returning <EM>OK</EM>.
+
+       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
+       currently  incorrect".  This implementation gets it right, but counting
        on its correctness anywhere else may be unwise.
 
-       X/Open  Curses specifies <EM>ripoffline</EM> as returning <STRONG>OK</STRONG> with no possibility
-       of failure ("[c]alls to <EM>ripoffline</EM> above this limit [five  lines]  have
+       X/Open Curses specifies <EM>ripoffline</EM> as returning <STRONG>OK</STRONG> with no  possibility
+       of  failure  ("[c]alls to <EM>ripoffline</EM> above this limit [five lines] have
        no effect but report success").
 
        X/Open Curses notes:
 
               After use of <EM>mvcur</EM>(), the model Curses maintains of the state of
-              the terminal might not match the actual state of  the  terminal.
-              An  application  should  touch  and  refresh  the  window before
+              the  terminal  might not match the actual state of the terminal.
+              An application  should  touch  and  refresh  the  window  before
               resuming conventional use of Curses.
 
-       Both <EM>ncurses</EM> and SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using  the  <EM>SCREEN</EM>  object
-       allocated  in  either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open Curses states
-       that the old location must be given for <EM>mvcur</EM> to accommodate  terminals
+       Both  <EM>ncurses</EM>  and  SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> object
+       allocated in either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open  Curses  states
+       that  the old location must be given for <EM>mvcur</EM> to accommodate terminals
        that lack absolute cursor positioning.
 
-       If  interrupted  by  a  signal,  <EM>ncurses</EM> restarts <EM>napms</EM>.  That, and the
+       If interrupted by a signal, <EM>ncurses</EM>  restarts  <EM>napms</EM>.   That,  and  the
        limitation to 30 seconds, differ from other implementations.
 
 
@@ -262,7 +265,7 @@ <H1 class="no-header">curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-21                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 3db707b7c..4f17d55b6 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp @
+  * @Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -49,73 +49,87 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <STRONG>has_mouse</STRONG>,  <STRONG>getmouse</STRONG>,  <STRONG>ungetmouse</STRONG>,  <STRONG>mousemask</STRONG>,  <STRONG>wenclose</STRONG>,  <STRONG>mouse_trafo</STRONG>,
-       <STRONG>wmouse_trafo</STRONG>, <STRONG>mouseinterval</STRONG> - get mouse events in <EM>curses</EM>
+       <STRONG>wmouse_trafo</STRONG>, <STRONG>mouseinterval</STRONG>, <STRONG>mmask_t</STRONG>, <STRONG>MEVENT</STRONG>  -  get  mouse  events  in
+       <EM>ncurses</EM>
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
+       <EM>/*</EM> <EM>data</EM> <EM>types</EM> <EM>*/</EM>
        <STRONG>typedef</STRONG> <STRONG>unsigned</STRONG> <STRONG>long</STRONG> <STRONG>mmask_t;</STRONG>
 
        <STRONG>typedef</STRONG> <STRONG>struct</STRONG> <STRONG>{</STRONG>
-           <STRONG>short</STRONG> <STRONG>id;</STRONG>         <EM>/*</EM> <EM>ID</EM> <EM>to</EM> <EM>distinguish</EM> <EM>multiple</EM> <EM>devices</EM> <EM>*/</EM>
-           <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>y,</STRONG> <STRONG>z;</STRONG>      <EM>/*</EM> <EM>event</EM> <EM>coordinates</EM> <EM>*/</EM>
-           <STRONG>mmask_t</STRONG> <STRONG>bstate;</STRONG>   <EM>/*</EM> <EM>button</EM> <EM>state</EM> <EM>bits</EM> <EM>*/</EM>
+           <STRONG>short</STRONG> <STRONG>id;</STRONG>       <EM>/*</EM> <EM>ID</EM> <EM>to</EM> <EM>distinguish</EM> <EM>multiple</EM> <EM>devices</EM> <EM>*/</EM>
+           <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>y,</STRONG> <STRONG>z;</STRONG>    <EM>/*</EM> <EM>event</EM> <EM>coordinates</EM> <EM>*/</EM>
+           <STRONG>mmask_t</STRONG> <STRONG>bstate;</STRONG> <EM>/*</EM> <EM>button</EM> <EM>state</EM> <EM>bits</EM> <EM>*/</EM>
        <STRONG>}</STRONG> <STRONG>MEVENT;</STRONG>
 
+       <EM>/*</EM> <EM>functions</EM> <EM>*/</EM>
        <STRONG>bool</STRONG> <STRONG>has_mouse(void);</STRONG>
 
-       <STRONG>mmask_t</STRONG> <STRONG>mousemask(mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
+       <STRONG>mmask_t</STRONG> <STRONG>mousemask(mmask_t</STRONG> <EM>new-mask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG> <EM>old-mask</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>getmouse(MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ungetmouse(MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getmouse(MEVENT</STRONG> <STRONG>*</STRONG> <EM>event</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetmouse(MEVENT</STRONG> <STRONG>*</STRONG> <EM>event</EM><STRONG>);</STRONG>
 
-       <STRONG>bool</STRONG> <STRONG>wenclose(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>wenclose(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>);</STRONG>
 
-       <STRONG>bool</STRONG> <STRONG>mouse_trafo(int*</STRONG> <EM>pY</EM><STRONG>,</STRONG> <STRONG>int*</STRONG> <EM>pX</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>to</EM><STRONG>_</STRONG><EM>screen</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>wmouse_trafo(const</STRONG> <STRONG>WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG>
-                         <STRONG>int*</STRONG> <EM>pY</EM><STRONG>,</STRONG> <STRONG>int*</STRONG> <EM>pX</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>to</EM><STRONG>_</STRONG><EM>screen</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>mouse_trafo(int</STRONG> <STRONG>*</STRONG> <EM>pY</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>pX</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>to-screen</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>wmouse_trafo(const</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>pY</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>pX</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>to-screen</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>mouseinterval(int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions provide an interface to mouse events from  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
-       Mouse  events  are  represented  by  <STRONG>KEY_MOUSE</STRONG> pseudo-key values in the
-       <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> input stream.
+       <EM>ncurses</EM>  provides  an  interface to the mouse or other pointing device.
+       An application can register its interest in such  events;  the  library
+       then  exposes  the availability of a mouse event via an <EM>input</EM> <EM>character</EM>
+       <EM>reading</EM> <EM>function</EM>: this is <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> in the non-wide  character  <EM>curses</EM>
+       API  and <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> in the wide character API.  A queue distinct from
+       that used for keyboard events accumulates the details of mouse  events.
+       The  input  character  reading  function reports the <STRONG>KEY_MOUSE</STRONG> key code
+       when a mouse event is available for collection.  A single  mouse  event
+       queue serves all windows associated with the screen.
+
+       The  <EM>MEVENT</EM> structure describes a mouse event.  Its <EM>y</EM> and <EM>x</EM> coordinates
+       are screen-, not window-, relative.  The <EM>bstate</EM> member has exactly  one
+       bit set indicating the event type.
+
+       <EM>ncurses</EM>  ignores  mouse  events  when  input is in canonical ("cooked")
+       mode, and produces an error beep when canonical mode is simulated in  a
+       window  by  a  function  such  as <STRONG><A HREF="curs_getstr.3x.html">getstr(3x)</A></STRONG> that expects a linefeed to
+       terminate its input loop.
 
 
 </PRE><H3><a name="h3-has_mouse">has_mouse</a></H3><PRE>
-       The <STRONG>has_mouse</STRONG> function returns  <STRONG>TRUE</STRONG>  if  the  mouse  driver  has  been
-       successfully initialized, and <STRONG>FALSE</STRONG> otherwise.
-
-       Mouse  events  are  ignored when input is in canonical ("cooked") mode,
-       and cause an error beep when canonical mode is  being  simulated  in  a
-       window  by a function such as <STRONG>getstr</STRONG> that expects a linefeed for input-
-       loop termination.
+       The terminal type  or  operating  system  interface  must  support  the
+       encoding  of  mouse  events.  <STRONG>has_mouse</STRONG> returns <STRONG>TRUE</STRONG> if <EM>ncurses</EM>'s mouse
+       driver initialized successfully, and <STRONG>FALSE</STRONG> otherwise.
 
 
 </PRE><H3><a name="h3-mousemask">mousemask</a></H3><PRE>
-       To make mouse events visible, use the <STRONG>mousemask</STRONG>  function.   This  sets
-       the  mouse  events  to  be  reported.   By default, no mouse events are
-       reported.
+       Use <STRONG>mousemask</STRONG> to select the varieties of mouse event  your  application
+       wishes to receive.  By default, <EM>ncurses</EM> reports no mouse events.
 
-       <STRONG>o</STRONG>   The function returns an updated copy of <EM>newmask</EM> to  indicate  which
+       <STRONG>o</STRONG>   The  function  returns an updated copy of <EM>new-mask</EM> indicating which
            of the specified mouse events can be reported.
 
-           If the screen has not been initialized, or if the terminal does not
-           support mouse-events, this function returns 0.
+           If the screen is not initialized, or the  terminal  interface  does
+           report mouse events, <STRONG>mousemask</STRONG> returns 0.
 
-       <STRONG>o</STRONG>   If <EM>oldmask</EM> is non-<EM>NULL</EM>, this function fills the indicated  location
-           with the previous value of the current screen's mouse event mask.
+       <STRONG>o</STRONG>   If  <EM>old-mask</EM>  is  not a null pointer, <STRONG>mousemask</STRONG> stores the previous
+           value of the screen's mouse event mask there.
 
-       As  a  side  effect,  setting  a zero mouse mask may turn off the mouse
-       pointer; setting a nonzero mask may turn it on.  Whether  this  happens
-       is device-dependent.
+       As a side effect, setting a zero mouse mask  may  turn  off  the  mouse
+       cursor; setting a nonzero mask may turn it on.  Whether this happens is
+       device-dependent.
 
 
 </PRE><H3><a name="h3-Mouse-Events">Mouse Events</a></H3><PRE>
-       Here are the mouse event type masks which may be defined:
+       Several mouse  event  types  may  be  selected;  construct  a  mask  by
+       logically "or"-ing their values.
 
        <STRONG>Name</STRONG>                     <STRONG>Description</STRONG>
        ------------------------------------------------------------------------
@@ -149,9 +163,11 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>BUTTON5_DOUBLE_CLICKED</STRONG>   mouse button 5 double clicked
        <STRONG>BUTTON5_TRIPLE_CLICKED</STRONG>   mouse button 5 triple clicked
        ------------------------------------------------------------------------
-       <STRONG>BUTTON_SHIFT</STRONG>             shift was down during button state change
-       <STRONG>BUTTON_CTRL</STRONG>              control was down during button state change
-       <STRONG>BUTTON_ALT</STRONG>               alt was down during button state change
+       <STRONG>BUTTON_SHIFT</STRONG>             a  shift  key  was  down  during  button state
+                                change
+       <STRONG>BUTTON_CTRL</STRONG>              a control key was  down  during  button  state
+                                change
+       <STRONG>BUTTON_ALT</STRONG>               an alt key was down during button state change
        <STRONG>ALL_MOUSE_EVENTS</STRONG>         report all button state changes
        <STRONG>REPORT_MOUSE_POSITION</STRONG>    report mouse movement
        ------------------------------------------------------------------------
@@ -159,87 +175,76 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-getmouse">getmouse</a></H3><PRE>
        Once a class of mouse events has been made visible in a window, calling
-       the <STRONG>wgetch</STRONG> function on that window may return <STRONG>KEY_MOUSE</STRONG> as an indicator
-       that a mouse event has been queued.  To read the event data and pop the
-       event off the queue, call <STRONG>getmouse</STRONG>.  This function will return <STRONG>OK</STRONG> if  a
-       mouse  event  is  actually  visible in the given window, <STRONG>ERR</STRONG> otherwise.
-       When <STRONG>getmouse</STRONG> returns <STRONG>OK</STRONG>, the data deposited as y and x  in  the  event
-       structure    coordinates   will   be   screen-relative   character-cell
-       coordinates.  The returned state mask will have exactly one bit set  to
-       indicate the event type.  The corresponding data in the queue is marked
-       invalid.  A subsequent call to <STRONG>getmouse</STRONG> will retrieve  the  next  older
-       item from the queue.
+       the  input  character  reading  function  on  that  window  may  return
+       <STRONG>KEY_MOUSE</STRONG>  as an indicator that a mouse event is enqueued.  To read the
+       event data and pop the  event  off  the  queue,  call  <STRONG>getmouse</STRONG>,  which
+       returns  <STRONG>OK</STRONG>  if  a  mouse  event is visible in the given window and <STRONG>ERR</STRONG>
+       otherwise.  When <STRONG>getmouse</STRONG> returns <STRONG>OK</STRONG>, it deposits data  describing  the
+       mouse  event  in  the  <EM>event</EM> pointer you supply.  A subsequent <STRONG>getmouse</STRONG>
+       call retrieves the next older event from the queue.
 
 
 </PRE><H3><a name="h3-ungetmouse">ungetmouse</a></H3><PRE>
-       The  <STRONG>ungetmouse</STRONG>  function  behaves analogously to <STRONG>ungetch</STRONG>.  It pushes a
-       <STRONG>KEY_MOUSE</STRONG> event onto the input queue, and associates  with  that  event
-       the given state data and screen-relative character-cell coordinates.
+       <STRONG>ungetmouse</STRONG> behaves analogously to <STRONG><A HREF="curs_util.3x.html">ungetch(3x)</A></STRONG>.  It pushes  a  <STRONG>KEY_MOUSE</STRONG>
+       event  onto  the  screen's  input queue, and <EM>event</EM> onto the mouse event
+       queue.
 
 
 </PRE><H3><a name="h3-wenclose">wenclose</a></H3><PRE>
-       The  <STRONG>wenclose</STRONG>  function  tests  whether a given pair of screen-relative
-       character-cell coordinates is enclosed by  a  given  window,  returning
-       <STRONG>TRUE</STRONG>  if  it is and <STRONG>FALSE</STRONG> otherwise.  It is useful for determining what
-       subset of the screen windows enclose the location of a mouse event.
+       <STRONG>wenclose</STRONG> returns <STRONG>TRUE</STRONG> if the pair of screen-relative coordinates (<EM>y</EM>, <EM>x</EM>)
+       is  enclosed by the given window <EM>win</EM>, and <STRONG>FALSE</STRONG> otherwise.  If <EM>win</EM> is a
+       pad, <STRONG>wenclose</STRONG> uses its most recent screen coordinates as specified in a
+       <STRONG><A HREF="curs_pad.3x.html">prefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_pad.3x.html">pnoutrefresh(3x)</A></STRONG> call.
 
-       If the parameter is  a  pad,  <STRONG>wenclose</STRONG>  uses  the  most  recent  screen
-       coordinates used for this pad in <STRONG><A HREF="curs_pad.3x.html">prefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_pad.3x.html">pnoutrefresh(3x)</A></STRONG>.
+       <STRONG>wenclose</STRONG>  is useful for determining what subset of the screen's windows
+       encloses the location of a mouse event; it is otherwise independent  of
+       the <EM>ncurses</EM> mouse API.
 
 
 </PRE><H3><a name="h3-wmouse_trafo">wmouse_trafo</a></H3><PRE>
-       The  <STRONG>wmouse_trafo</STRONG>  function transforms a given pair of coordinates from
-       <STRONG>stdscr</STRONG>-relative coordinates to coordinates relative to the given window
-       or  vice  versa.   The  resulting  <STRONG>stdscr</STRONG>-relative  coordinates are not
-       always identical to screen coordinates due to the mechanism to  reserve
-       lines  on  top  or  bottom  of  the  screen for other purposes (see the
-       <STRONG><A HREF="curs_kernel.3x.html">ripoffline(3x)</A></STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG> calls, for example).
-
-       <STRONG>o</STRONG>   If the parameter <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>TRUE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must
-           reference  the  coordinates  of  a  location inside the window <EM>win</EM>.
-           They are converted  to  <STRONG>stdscr</STRONG>-relative  coordinates  and  returned
-           through  the  pointers.   If  the  conversion  was  successful, the
-           function returns <STRONG>TRUE</STRONG>.
-
-           If one of the parameters was <EM>NULL</EM> or the location is not inside the
-           window, <STRONG>FALSE</STRONG> is returned.
+       <STRONG>wmouse_trafo</STRONG>  transforms the given pair of coordinate pointers (<EM>pY</EM>, <EM>pX</EM>)
+       from a <EM>win</EM>-relative basis to a screen-relative one or  <EM>vice</EM>  <EM>versa</EM>,  as
+       <EM>to-screen</EM>  is <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>, respectively.  <STRONG>stdscr</STRONG>-relative coordinates
+       are  not  always  identical  to  screen  coordinates:  <EM>curses</EM>  supports
+       reservation  of  screen  lines  at  the  top  and/or  bottom  for other
+       purposes; see <STRONG><A HREF="curs_kernel.3x.html">ripoffline(3x)</A></STRONG> and <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   If   <EM>to</EM><STRONG>_</STRONG><EM>screen</EM>  is  <STRONG>FALSE</STRONG>,  the  pointers  <EM>pY,</EM>  <EM>pX</EM>  must  reference
-           <STRONG>stdscr</STRONG>-relative coordinates.  They are converted to window-relative
-           coordinates  if  the  window <EM>win</EM> encloses this point.  In this case
-           the function returns <STRONG>TRUE</STRONG>.
+       If <EM>to-screen</EM> <EM>is</EM> <STRONG>TRUE</STRONG> and the pointers (<EM>pY</EM>,  <EM>pX</EM>)  reference  coordinates
+       inside <EM>win</EM>, <EM>ncurses</EM> updates their values to <STRONG>stdscr</STRONG>-relative coordinates
+       and returns <STRONG>TRUE</STRONG>.  If either <EM>pY</EM> or <EM>pX</EM> is a null pointer, or (<EM>pY</EM>, <EM>pX</EM>) is
+       not inside <EM>win</EM>, <STRONG>wmouse_trafo</STRONG> returns <STRONG>FALSE</STRONG>.
 
-           If one of the parameters is <EM>NULL</EM> or the point  is  not  inside  the
-           window, <STRONG>FALSE</STRONG> is returned.
-
-       The   referenced   coordinates  are  only  replaced  by  the  converted
-       coordinates if the transformation was successful.
+       If  <EM>to-screen</EM>  <EM>is</EM> <STRONG>FALSE</STRONG> and the pointers (<EM>pY</EM>, <EM>pX</EM>) reference coordinates
+       inside <STRONG>stdscr</STRONG>, <EM>ncurses</EM> updates their values to <EM>win</EM>-relative coordinates
+       and returns <STRONG>TRUE</STRONG>.  If either <EM>pY</EM> or <EM>pX</EM> is a null pointer, or (<EM>pY</EM>, <EM>pX</EM>) is
+       not inside <STRONG>stdscr</STRONG>, <STRONG>wmouse_trafo</STRONG> returns <STRONG>FALSE</STRONG>.
 
 
 </PRE><H3><a name="h3-mouse_trafo">mouse_trafo</a></H3><PRE>
-       The <STRONG>mouse_trafo</STRONG> function performs the same translation as <STRONG>wmouse_trafo</STRONG>,
-       using <STRONG>stdscr</STRONG> for <EM>win</EM>.
+       <STRONG>mouse_trafo</STRONG> applies the <STRONG>wmouse_trafo</STRONG>  translation  to  <STRONG>stdscr</STRONG>.   If  no
+       screen  lines  are  reserved by <STRONG><A HREF="curs_kernel.3x.html">ripoffline(3x)</A></STRONG> or <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>, this is
+       the identity transformation.
 
 
 </PRE><H3><a name="h3-mouseinterval">mouseinterval</a></H3><PRE>
-       The  <STRONG>mouseinterval</STRONG>  function sets the maximum time (in thousandths of a
-       second) that can elapse between press and release events for them to be
-       resolved  as  a <EM>click</EM>.  An application might interpret button press and
-       release events separated by more than the mouse  interval  as  a  "long
-       press", or, with motion, as a "drag".
+       <STRONG>mouseinterval</STRONG> sets the maximum time (in thousandths of a  second)  that
+       can  elapse between press and release events for them to be resolved as
+       a <EM>click</EM>.  An application  might  interpret  button  press  and  release
+       events separated by more than the mouse interval as a "long press", or,
+       with motion, as a "drag".
 
        Calling  <STRONG>mouseinterval(0)</STRONG>  disables  click  resolution.   When  <EM>ncurses</EM>
-       detects a mouse event, it awaits further  input  activity  up  to  this
-       interval,  and  then  checks  for a subsequent mouse event which can be
-       combined with the first event.  If the timeout  expires  without  input
-       activity  (which  would  happen  with  a  zero interval), then no click
-       resolution will occur.
+       detects  a  mouse  event,  it  awaits further input activity up to this
+       interval, and then checks for a subsequent mouse  event  which  can  be
+       combined  with  the  first event.  If the timeout expires without input
+       activity (which would happen with  a  zero  interval),  then  no  click
+       resolution occurs.
 
-       This   function   returns   the   previous   interval    value.     Use
+       This    function    returns   the   previous   interval   value.    Use
        <STRONG>mouseinterval(-1)</STRONG> to obtain the interval without altering it.
 
        The  mouse  interval  is  set  to  one  sixth  of  a  second  when  the
-       corresponding  screen  is  initialized,   e.g.,   in   <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>   or
+       corresponding   screen   is   initialized,   e.g.,  in  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or
        <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
 
 
@@ -255,24 +260,24 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   the mask of reportable events is zero,
 
-       <STRONG>o</STRONG>   a mouse event was detected that does not match the mask,
+       <STRONG>o</STRONG>   a mouse event was detected that does not match the mask, or
 
-       <STRONG>o</STRONG>   or if no more events remain in the queue.
+       <STRONG>o</STRONG>   no more events remain in the queue.
 
        <STRONG>ungetmouse</STRONG> returns <STRONG>ERR</STRONG> if the event queue is full.
 
        <STRONG>mousemask</STRONG> returns the mask of reportable events.
 
-       <STRONG>mouseinterval</STRONG> returns the previous interval value, unless the  terminal
-       was  not  initialized.   In  that case, it returns the maximum interval
+       <STRONG>mouseinterval</STRONG>  returns the previous interval value, unless the terminal
+       was not initialized.  In that case, it  returns  the  maximum  interval
        value (166).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       The  order  of  the  <STRONG>MEVENT</STRONG>  structure  members  is   not   guaranteed.
+       The   order   of  the  <STRONG>MEVENT</STRONG>  structure  members  is  not  guaranteed.
        Additional fields may be added to the structure in the future.
 
-       Under  <EM>ncurses</EM>, these calls are implemented using either <EM>xterm</EM>'s built-
+       Under <EM>ncurses</EM>, these calls are implemented using either <EM>xterm</EM>'s  built-
        in mouse-tracking API or platform-specific drivers including
 
           <STRONG>o</STRONG>   Alessandro Rubini's gpm server
@@ -281,21 +286,26 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
           <STRONG>o</STRONG>   OS/2 EMX
 
-       If you are using an unsupported configuration, mouse events will not be
-       visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function will always return <STRONG>0</STRONG>).
+       If  you  are  using  an unsupported configuration, mouse events are not
+       visible to <EM>ncurses</EM> (and the <STRONG>mousemask</STRONG> function always returns <STRONG>0</STRONG>).
 
-       If  the  <EM>terminfo</EM> entry contains a <STRONG>XM</STRONG> string, this is used in the <EM>xterm</EM>
-       mouse driver to control the way the terminal is initialized  for  mouse
-       operation.   The  default,  if  <STRONG>XM</STRONG> is not found, corresponds to private
-       mode 1000 of <EM>xterm:</EM>
+       If the  terminal  type  possesses  the  (nonstandard)  <EM>terminfo</EM>  string
+       capability  <STRONG>XM</STRONG>,  <EM>ncurses</EM>'s <EM>xterm</EM> mouse driver uses it when initializing
+       the terminal for mouse operation.  The default, if  <STRONG>XM</STRONG>  is  not  found,
+       corresponds to private mode 1000 of <EM>xterm</EM>.
 
           \E[?1000%?%p1%{1}%=%th%el%;
 
-       The mouse driver also recognizes a newer <EM>xterm</EM> private mode 1006, e.g.,
+       <EM>ncurses</EM> also recognizes <EM>xterm</EM>'s newer private mode 1006.
 
           \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-       The <EM>z</EM> member in the event structure  is  not  presently  used.   It  is
+       The  <EM>id</EM>  member  of the mouse event structure is not presently used; no
+       terminal type or operating system interface supports  reporting  events
+       from  distinguishable  pointing  devices.  If you synthesize an <EM>MEVENT</EM>,
+       use an <EM>id</EM> of 0.
+
+       The <EM>z</EM> member of the mouse event structure is not presently used.  It is
        intended  for  use with touch screens (which may be pressure-sensitive)
        or with 3D-mice/trackballs/power gloves.
 
@@ -306,10 +316,10 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       These  functions  were  designed  for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not found in
-       SVr4  <EM>curses</EM>,   4.4BSD   <EM>curses</EM>,   or   any   other   previous   curses
-       implementation.   (SVr4 <EM>curses</EM> did have a <EM>getmouse</EM> function, which took
-       no argument and returned a different type.)
+       These  functions  are  <EM>ncurses</EM>  extensions,  and  are not found in SVr4
+       <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any  other  previous  <EM>curses</EM>  implementation.
+       (SVr4  <EM>curses</EM>  did have a <EM>getmouse</EM> function, which took no argument and
+       returned an <EM>unsigned</EM> <EM>long</EM>.)
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -320,12 +330,14 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        "ALTERNATE CONFIGURATIONS" of <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.  The following values may be
        specified.
 
-          1  has definitions for reserved events.  The mask uses 28 bits.
+          <STRONG>1</STRONG>  has definitions for reserved events.  The mask uses 28 bits.
 
-          2  adds  definitions  for  button  5,  removes  the  definitions for
+          <STRONG>2</STRONG>  adds  definitions  for  button  5,  removes  the  definitions for
              reserved events.  The mask uses 29 bits.
 
-       SVr4 <EM>curses</EM> had support for the mouse in a variant of <STRONG>xterm(1)</STRONG>.  It  is
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr4 (1989) added mouse support to its  variant  of  <STRONG>xterm(1)</STRONG>.   It  is
        mentioned in a few places, with little supporting documentation.
 
        <STRONG>o</STRONG>   Its  "libcurses"  manual  page  lists  functions  for  this feature
@@ -350,11 +362,11 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   The interface made assumptions (as does <EM>ncurses</EM>) about  the  escape
            sequences sent to and received from the terminal.
 
-           For instance, the SVr4 <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> capability
-           to tell the terminal which mouse  button  events  it  should  send,
-           passing  the mouse-button bit mask to the terminal.  Also, it could
-           ask the terminal  where  the  mouse  was  using  the  <STRONG>req_mouse_pos</STRONG>
-           capability.
+           For  instance,  the  SVr4  <EM>curses</EM> library used the <STRONG>get_mouse</STRONG> (<STRONG>getm</STRONG>)
+           capability to tell the terminal which mouse button events it should
+           send,  passing the mouse-button bit mask to the terminal.  Also, it
+           could ask the terminal where the mouse was using the  <STRONG>req_mouse_pos</STRONG>
+           (<STRONG>reqmp</STRONG>) capability.
 
            Those  features  required a terminal program that had been modified
            to work with SVr4 <EM>curses</EM>.  They were not part of the X Consortium's
@@ -375,17 +387,18 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        An <EM>ncurses</EM> window must enable <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  to  correctly  receive  mouse
        event  reports  from  <EM>xterm</EM>  since they are encoded like function keys.
-       Set the terminal's <EM>terminfo</EM> capability <STRONG>kmous</STRONG> to "\E[M"  (the  beginning
-       of  the  response  from <EM>xterm</EM> for mouse clicks).  Other values of <STRONG>kmous</STRONG>
-       are permitted under the same assumption, that  is,  the  report  begins
-       with that sequence.
+       Set the terminal's <EM>terminfo</EM> capability <STRONG>key_mouse</STRONG> (<STRONG>kmous</STRONG>) to "\E[M" (the
+       beginning  of  the response from <EM>xterm</EM> for mouse clicks).  Other values
+       of <STRONG>key_mouse</STRONG> are permitted under the  same  assumption,  that  is,  the
+       report begins with that sequence.
 
        Because there are no standard response sequences that serve to identify
        terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
-       <STRONG>kmous</STRONG> is defined in the terminal description, or if the terminal type's
-       primary name or aliases contain the string "xterm", then  the  terminal
-       may send mouse events.  The <STRONG>kmous</STRONG> capability is checked first, allowing
-       use of newer <EM>xterm</EM> mouse protocols, such as its private mode 1006.
+       <STRONG>key_mouse</STRONG>  (<STRONG>kmous</STRONG>)  is  defined  in the terminal description, or if the
+       terminal type's primary name or aliases  contain  the  string  "xterm",
+       then the terminal may send mouse events.  <EM>ncurses</EM> checks the <STRONG>kmous</STRONG> cap-
+       code first, allowing use of newer <EM>xterm</EM> mouse protocols,  such  as  its
+       private mode 1006.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -394,7 +407,7 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -417,6 +430,7 @@ <H1 class="no-header">curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-BUGS">BUGS</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 38f87724d..e138aebcc 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -78,10 +78,11 @@ <H1 class="no-header">curs_move 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       SVr4  <EM>curses</EM>  describes  a  successful return value only as "an integer
-       value other than <STRONG>ERR</STRONG>".
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
@@ -93,7 +94,7 @@ <H1 class="no-header">curs_move 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index a0086e0f3..2e3ef4817 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2020-2024,2025 Thomas E. Dickey                                *
   * Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -142,20 +142,25 @@ <H1 class="no-header">curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        function documented in this page.
 
 
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       These functions originated with <EM>ncurses</EM>.
+
+
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These routines are specific to <EM>ncurses</EM>.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code   depending   on   <EM>ncurses</EM>   extensions   be   conditioned   using
-       <STRONG>NCURSES_VERSION</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
+       NetBSD   <EM>curses</EM>  since  10.1  (2024)  supports  <EM>wgetscr</EM><STRONG>_</STRONG><EM>reg</EM>.   It  also
+       implements <EM>getscr</EM><STRONG>_</STRONG><EM>reg</EM>, operating on <EM>stdscr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,   <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>,
        <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -164,6 +169,7 @@ <H1 class="no-header">curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 0fd6b4714..c776febd1 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -158,7 +158,7 @@ <H1 class="no-header">curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>,  <STRONG>scrollok</STRONG>,  <STRONG>idcok</STRONG>,  and  <STRONG>setscrreg</STRONG>  may  be
+       <STRONG>clearok</STRONG>, <STRONG>leaveok</STRONG>, <STRONG>scrollok</STRONG>, <STRONG>idcok</STRONG>, and <STRONG>setscrreg</STRONG> may be implemented  as
        macros.
 
        The  <STRONG>immedok</STRONG>  routine  is  useful for windows that are used as terminal
@@ -166,36 +166,41 @@ <H1 class="no-header">curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        Some  historic  <EM>curses</EM> implementations, as an undocumented feature, did
        the  equivalent  of  "<STRONG>clearok(</STRONG>...<STRONG>,</STRONG>   <STRONG>1)</STRONG>"   when   <STRONG>touchwin(stdstr)</STRONG>   or
        <STRONG>clear(stdstr)</STRONG> were used.  This trick does not work with <EM>ncurses</EM>.
 
-       Early  System V  <EM>curses</EM>  implementations  specified  that with <STRONG>scrollok</STRONG>
+       Early  System V  <EM>curses</EM>  implementations  specified  that with <EM>scrollok</EM>
        enabled, any window modification triggering  a  scroll  also  forced  a
        physical  refresh.   X/Open  Curses  does not require this, and <EM>ncurses</EM>
-       avoids  doing  so  to  better  optimize   vertical   motions   upon   a
-       <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>.
+       avoids doing so to better optimize vertical motions upon a <EM>wrefresh</EM>.
 
        X/Open Curses does not mention that the cursor should be made invisible
-       as a side-effect of <STRONG>leaveok</STRONG>.  SVr4 <EM>curses</EM> documentation notes this, but
+       as a side-effect of <EM>leaveok</EM>.  SVr4 <EM>curses</EM> documentation notes this, but
        the code neglects it.  Use <STRONG><A HREF="curs_kernel.3x.html">curs_set(3x)</A></STRONG> to make the cursor invisible.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <EM>ncurses</EM>  formerly  treated <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> and <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG> as both input <EM>and</EM> output
-       options, but no longer; see <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>.
+       4BSD (1980) <EM>curses</EM> introduced <EM>clearok</EM>, <EM>leaveok</EM>, and <EM>scrollok</EM>.
+
+       SVr2 (1984) supplied <EM>idlok</EM>, <EM>setscrreg</EM>, and <EM>wsetscrreg</EM>.
+
+       SVr3.1 (1987) implemented <EM>idcok</EM> and <EM>immedok</EM>.
+
+       <EM>ncurses</EM> formerly treated <EM>nl</EM> and <EM>nonl</EM> as both input <EM>and</EM> output  options,
+       but no longer; see <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,    <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html
index 6c60a7cc5..1d50bfe39 100644
--- a/doc/html/man/curs_overlay.3x.html
+++ b/doc/html/man/curs_overlay.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2020-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp @
+  * @Id: curs_overlay.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 
@@ -81,24 +81,27 @@ <H1 class="no-header">curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These  routines  return  the  integer  <STRONG>ERR</STRONG> upon failure and an <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       X/Open  defines  no error conditions.  In this implementation, <STRONG>copywin</STRONG>,
-       <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> return <STRONG>ERR</STRONG> if either of the window  pointers  are
-       null, or if some part of the window would be placed off-screen.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   either of the window pointers are null, or
+
+       <STRONG>o</STRONG>   any part of the window would be placed off-screen.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> may be macros.
+       <STRONG>overlay</STRONG> and <STRONG>overwrite</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  described  in X/Open Curses, Issue 4, which adds
-       <EM>const</EM> qualifiers to the arguments.  It further specifies their behavior
-       in  the  presence  of  characters  with  multibyte  renditions (not yet
-       supported in this implementation).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.  It adds <EM>const</EM> qualifiers to  the  arguments.   It
+       further  specifies  their  behavior  in the presence of characters with
+       multibyte renditions (not yet supported in this implementation).
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -106,7 +109,7 @@ <H1 class="no-header">curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_overlay.3x.html">curs_overlay(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 8b1f82b4c..02345bdb3 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_pad.3x,v 1.79 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_pad 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_pad 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 
@@ -129,106 +129,118 @@ <H1 class="no-header">curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Functions  that  return an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       Functions  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon
+       successful completion.
 
-       Functions  that  return pointers return <EM>NULL</EM> on error, and set <EM>errno</EM> to
+       Functions that return pointers return <EM>NULL</EM> on error, and set  <EM>errno</EM>  to
        <STRONG>ENOMEM</STRONG>.
 
        In this implementation
 
           <STRONG>prefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>
-               return <STRONG>ERR</STRONG> if the window pointer is null, or if the  window  is
-               not  really  a pad or if the area to refresh extends off-screen
+               return  <STRONG>ERR</STRONG>  if the window pointer is null, or if the window is
+               not really a pad or if the area to refresh  extends  off-screen
                or if the minimum coordinates are greater than the maximum.
 
           <STRONG>pechochar</STRONG>
-               returns <STRONG>ERR</STRONG> if  the  window  is  not  really  a  pad,  and  the
+               returns  <STRONG>ERR</STRONG>  if  the  window  is  not  really  a  pad, and the
                associated call to <STRONG>wechochar</STRONG> returns <STRONG>ERR</STRONG>.
 
           <STRONG>pecho_wchar</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  window  is  not  really  a  pad, and the
+               returns <STRONG>ERR</STRONG> if  the  window  is  not  really  a  pad,  and  the
                associated call to <STRONG>wecho_wchar</STRONG> returns <STRONG>ERR</STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>pechochar</STRONG> may be a macro.
-
-
-</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       BSD <EM>curses</EM> has no <EM>pad</EM> feature.
-
-       SVr2  <EM>curses</EM>  (1986)  provided  the  <STRONG>newpad</STRONG>  and   related   functions,
-       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
-       extensive documentation.
+       <STRONG>pechochar</STRONG> may be implemented as a macro.
 
-       The documentation does not explain the term <EM>pad</EM>.  However,  the  Apollo
-       <EM>Aegis</EM> workstation operating system supported a graphical <EM>pad</EM> feature:
+       <EM>curses</EM>  documentation  is  traditionally  averse to motivating the term
+       "pad".  The Apollo Aegis  workstation  operating  system  (<EM>circa</EM>  1981)
+       supported a graphical pad feature.
 
        <STRONG>o</STRONG>   These  graphical  pads  could  be  much  larger than the computer's
            display.
 
        <STRONG>o</STRONG>   The read-only output from a  command  could  be  scrolled  back  to
-           inspect, and select text from the pad.
+           inspect and select text from the pad.
 
        The two uses may be related.
 
-       X/Open  Curses,  Issue 4 describes these functions, without significant
-       change from the SVr3 documentation.  It specifies no  error  conditions
-       for  them.  The behavior of <STRONG>subpad</STRONG> if the parent window is not a pad is
-       undocumented, and is not checked by the vendor Unix implementations:
 
-       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM>  structure  in  <STRONG>newpad</STRONG>  which
-           tells if the window is a <EM>pad</EM>.
+</PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
+
+       The  behavior  of  <EM>subpad</EM>  if  the  parent  window  is  not  a  pad  is
+       undocumented, and is not checked by the vendor Unix implementations.
+
+       <STRONG>o</STRONG>   SVr4 <EM>curses</EM>'s <EM>newpad</EM> sets a flag in the <EM>WINDOW</EM> structure indicating
+           that the window is a pad.
 
-           However,  it  uses this information only in <STRONG>waddch</STRONG> (to decide if it
-           should call <STRONG>wrefresh</STRONG>) and <STRONG>wscrl</STRONG> (to avoid  scrolling  a  pad),  and
-           does  not  check  in  <STRONG>wrefresh</STRONG>  to ensure that the pad is refreshed
-           properly.
+           However,  it  uses this information only in <EM>waddch</EM> (to decide if it
+           should call <EM>wrefresh</EM>) and <EM>wscrl</EM> (to avoid  scrolling  a  pad);  its
+           <EM>wrefresh</EM>  does  not  check  it  to  ensure  that  a pad is properly
+           updated.
 
-       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> checks whether a window is a pad  in  <STRONG>wnoutrefresh</STRONG>,
-           returning <STRONG>ERR</STRONG> in that case.
+       <STRONG>o</STRONG>   Solaris  <EM>xcurses</EM>  checks  whether  a  window  is  a  pad   in   its
+           <EM>wnoutrefresh</EM>, returning <EM>ERR</EM> in that case.
 
-           However,  it only sets the flag for subwindows if the parent window
-           is a pad.  Its <STRONG>newpad</STRONG>  function  does  not  set  this  information.
-           Consequently, the check will never fail.
+           However,  it  sets the flag on subwindows only if the parent window
+           is a pad.  Its <EM>newpad</EM> does not set this information.  Consequently,
+           the check never fails.
 
-           It  makes no comparable check in <STRONG>pnoutrefresh</STRONG>, though interestingly
-           enough, a comment in the source code states  that  the  lack  of  a
-           check was an MKS extension.
+           It   makes   no   comparable   check   in  <EM>pnoutrefresh</EM>  --  though
+           interestingly enough, a comment in the source code states that  the
+           lack of a check was an MKS extension.
 
-       <STRONG>o</STRONG>   NetBSD  7 <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and
-           <STRONG>subpad</STRONG>,  using  this  to  help   with   the   distinction   between
-           <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG>.
+       <STRONG>o</STRONG>   NetBSD 7  <EM>curses</EM> sets a flag in the <EM>WINDOW</EM> structure for <EM>newpad</EM> and
+           <EM>subpad</EM>, aiding  itself  to  distinguish  between  <EM>wnoutrefresh</EM>  and
+           <EM>pnoutrefresh</EM>.
 
            It  does  not  check for the case where a subwindow is created in a
-           pad using <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG>.
+           pad using <EM>subwin</EM> or <EM>derwin</EM>.
 
-           The <STRONG>dupwin</STRONG> function returns a regular  window  when  duplicating  a
-           pad.   Likewise,  <STRONG>getwin</STRONG> always returns a window, even if the saved
+           Its <EM>dupwin</EM>  returns  a  regular  window  when  duplicating  a  pad.
+           Likewise,  its  <EM>getwin</EM>  always  returns a window, even if the saved
            data was from a pad.
 
-       This implementation
+       <EM>ncurses</EM>:
 
-       <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <STRONG>newpad</STRONG> and <STRONG>subpad</STRONG>,
+       <STRONG>o</STRONG>   sets a flag in the <EM>WINDOW</EM> structure for <EM>newpad</EM> and <EM>subpad</EM>,
 
-       <STRONG>o</STRONG>   allows a <STRONG>subwin</STRONG> or <STRONG>derwin</STRONG> call to succeed having a  pad  parent  by
+       <STRONG>o</STRONG>   allows a <EM>subwin</EM> or <EM>derwin</EM> call to succeed having a  pad  parent  by
            forcing the subwindow to be a pad,
 
-       <STRONG>o</STRONG>   checks  in  both  <STRONG>wnoutrefresh</STRONG> and <STRONG>pnoutrefresh</STRONG> to ensure that pads
+       <STRONG>o</STRONG>   checks  in  both  <EM>wnoutrefresh</EM> and <EM>pnoutrefresh</EM> to ensure that pads
            and windows are handled distinctly, and
 
-       <STRONG>o</STRONG>   ensures  that  <STRONG>dupwin</STRONG>  and  <STRONG>getwin</STRONG>  treat   pads   versus   windows
+       <STRONG>o</STRONG>   ensures  that  <EM>dupwin</EM>  and  <EM>getwin</EM>  treat   pads   versus   windows
            consistently.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr2  (1984) introduced <EM>newpad</EM>, <EM>prefresh</EM>, and <EM>pnoutrefresh</EM>, documenting
+       them in a single line each.
+
+       SVr3 (1987) added <EM>subpad</EM> and <EM>pechochar</EM>,  and  provided  more  extensive
+       documentation.
+
+       The  System V  Interface  Definition,  Version  4  (1995),  specified a
+       function named <EM>pechowchar</EM>.  This was a later addition  to  SVr4.<EM>x</EM>,  not
+       appearing  in  the  first  SVr4 (1989).  It differs from X/Open's later
+       <EM>pecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that its <EM>wstr</EM>  parameter  was  a  <EM>chtype</EM>  instead  of  a
+       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>, and was not <EM>const</EM>-qualified.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                      <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -246,6 +258,7 @@ <H1 class="no-header">curs_pad 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 259b56121..358507bef 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.53 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_printw.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_printw 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_printw 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 
@@ -95,19 +95,19 @@ <H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        <EM>ncurses</EM> defines <STRONG>vw_printw</STRONG> and <STRONG>vwprintw</STRONG> identically  to  support  legacy
        applications.  However, the latter is obsolete.
 
-       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  <STRONG>vwprintw</STRONG> as
+       <STRONG>o</STRONG>   X/Open   Curses   Issue 4  Version 2  (1996),  marked  <STRONG>vwprintw</STRONG>  as
            requiring <EM>varargs.h</EM> and "TO BE WITHDRAWN", and specified  <STRONG>vw_printw</STRONG>
            using the <EM>stdarg.h</EM> interface.
 
-       <STRONG>o</STRONG>   X/Open  Curses,  Issue  5,  Draft 2 (December 2007) marked <STRONG>vwprintw</STRONG>
+       <STRONG>o</STRONG>   X/Open  Curses  Issue 5,  Draft  2  (December 2007) marked <STRONG>vwprintw</STRONG>
            (along with <STRONG>vwscanw</STRONG> and the <EM>termcap</EM> interface) as withdrawn.  After
-           incorporating  review  comments, this became X/Open Curses, Issue 7
+           incorporating  review  comments,  this became X/Open Curses Issue 7
            (2009).
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> provides <STRONG>vwprintw</STRONG>, but marks it as deprecated.
@@ -138,7 +138,7 @@ <H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        SVr4  (1989)  introduced  no new variations of <EM>printw</EM>, but provided for
        using either <EM>varargs.h</EM> or <EM>stdarg.h</EM> to define the <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type.
 
-       X/Open Curses, Issue 4 (1995), defined <STRONG>vw_printw</STRONG> to  replace  <STRONG>vwprintw</STRONG>,
+       X/Open Curses Issue 4 (1995), defined <STRONG>vw_printw</STRONG>  to  replace  <STRONG>vwprintw</STRONG>,
        stating that its <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type is defined in <EM>stdarg.h</EM>.
 
 
@@ -147,7 +147,7 @@ <H1 class="no-header">curs_printw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 629f6821a..fd3ce09c5 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp @
+  * @Id: curs_refresh.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
@@ -123,9 +123,7 @@ <H1 class="no-header">curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       These  routines  return  the  integer  <STRONG>ERR</STRONG>  upon  failure  and <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       These routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG>
 
        In this implementation
 
@@ -138,19 +136,22 @@ <H1 class="no-header">curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>refresh</STRONG> and <STRONG>redrawwin</STRONG> may be macros.
+       <STRONG>refresh</STRONG> and <STRONG>redrawwin</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       Whether  <STRONG>wnoutrefresh</STRONG>  copies to the virtual screen the entire contents
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
+
+       Whether <STRONG>wnoutrefresh</STRONG> 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
+       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 <STRONG>touchwin</STRONG>
-       before the <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an  entire-contents  copy
+       before  the  <STRONG>wnoutrefresh</STRONG>  call  to  guarantee  an entire-contents copy
        anywhere.
 
 
@@ -159,7 +160,7 @@ <H1 class="no-header">curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-14                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index d0b9b7947..0f6ce9d52 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.53 2024/04/20 19:18:18 tom Exp @
+  * @Id: curs_scanw.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 
@@ -100,19 +100,19 @@ <H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        <EM>ncurses</EM>  defines  <STRONG>vw_scanw</STRONG>  and  <STRONG>vwscanw</STRONG>  identically to support legacy
        applications.  However, the latter is obsolete.
 
-       <STRONG>o</STRONG>   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  <STRONG>vwscanw</STRONG>  as
-           requiring  <EM>varargs.h</EM>  and "TO BE WITHDRAWN", and specified <STRONG>vw_scanw</STRONG>
-           using the <EM>stdarg.h</EM> interface.
+       <STRONG>o</STRONG>   X/Open Curses Issue 4 Version 2 (1996), marked <STRONG>vwscanw</STRONG> as requiring
+           <EM>varargs.h</EM>  and  "TO BE WITHDRAWN", and specified <STRONG>vw_scanw</STRONG> using the
+           <EM>stdarg.h</EM> interface.
 
-       <STRONG>o</STRONG>   X/Open Curses, Issue 5, Draft  2  (December  2007)  marked  <STRONG>vwscanw</STRONG>
+       <STRONG>o</STRONG>   X/Open Curses Issue 5,  Draft  2  (December  2007)  marked  <STRONG>vwscanw</STRONG>
            (along with <STRONG>vwscanw</STRONG> and the <EM>termcap</EM> interface) as withdrawn.  After
-           incorporating review comments, this became X/Open Curses,  Issue  7
+           incorporating review comments, this became  X/Open  Curses  Issue 7
            (2009).
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> provides <STRONG>vwscanw</STRONG>, but marks it as deprecated.
@@ -170,7 +170,7 @@ <H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
        SVr4  (1989)  introduced  no  new variations of <EM>scanw</EM>, but provided for
        using either <EM>varargs.h</EM> or <EM>stdarg.h</EM> to define the <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type.
 
-       X/Open Curses, Issue 4 (1995), defined  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  to  replace  <EM>vwscanw</EM>,
+       X/Open Curses Issue 4 (1995),  defined  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  to  replace  <EM>vwscanw</EM>,
        stating that its <EM>va</EM><STRONG>_</STRONG><EM>list</EM> type is defined in <EM>stdarg.h</EM>.
 
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-04-20                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html
index e1908c4b9..c2cfa1839 100644
--- a/doc/html/man/curs_scr_dump.3x.html
+++ b/doc/html/man/curs_scr_dump.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp @
+  * @Id: curs_scr_dump.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 
@@ -130,8 +130,8 @@ <H1 class="no-header">curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
-       error conditions for them.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        SVr4 omitted the <EM>const</EM> qualifiers.
 
@@ -161,7 +161,7 @@ <H1 class="no-header">curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index fd30c47aa..48b3359d6 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp @
+  * @Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -95,11 +95,11 @@ <H1 class="no-header">curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.  It defines no  error
-       conditions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       SVr4  specifies  only "an integer value other than <STRONG>ERR</STRONG>" as a successful
-       return value.
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
        SVr4  indicates  that  the   optimization   of   physically   scrolling
        immediately  if  the scroll region is the entire screen "is" performed,
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-09-22                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 935d377aa..6609fa3be 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_slk.3x,v 1.85 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_slk 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_slk 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 
@@ -163,34 +163,31 @@ <H1 class="no-header">curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
-       specifies only "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       Functions  that  return  integers  return  <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon
+       success.
 
-       X/Open Curses defines no error conditions.
-
-       In this implementation
+       In <EM>ncurses</EM>,
 
           <STRONG>slk_attr</STRONG>
                returns the attribute used for the soft keys.
 
-          <STRONG>slk_attroff</STRONG>,  <STRONG>slk_attron</STRONG>,  <STRONG>slk_clear</STRONG>,  <STRONG>slk_noutrefresh</STRONG>, <STRONG>slk_refresh</STRONG>,
+          <STRONG>slk_attroff</STRONG>, <STRONG>slk_attron</STRONG>,  <STRONG>slk_clear</STRONG>,  <STRONG>slk_noutrefresh</STRONG>,  <STRONG>slk_refresh</STRONG>,
           <STRONG>slk_touch</STRONG>
-               return  <STRONG>ERR</STRONG>  if  the  terminal  or  the   softkeys   were   not
+               return   <STRONG>ERR</STRONG>   if   the  terminal  or  the  softkeys  were  not
                initialized.
 
           <STRONG>slk_attrset</STRONG>
-               returns   <STRONG>ERR</STRONG>   if  the  terminal  or  the  softkeys  were  not
+               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
                initialized.
 
           <STRONG>slk_attr_set</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
-               initialized,   or   the   color   pair  is  outside  the  range
+               returns   <STRONG>ERR</STRONG>   if  the  terminal  or  the  softkeys  were  not
+               initialized,  or  the  color  pair   is   outside   the   range
                0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_color</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
-               initialized,   or   the   color   pair  is  outside  the  range
+               returns   <STRONG>ERR</STRONG>   if  the  terminal  or  the  softkeys  were  not
+               initialized,  or  the  color  pair   is   outside   the   range
                0..<STRONG>COLOR_PAIRS</STRONG>-1.
 
           <STRONG>slk_init</STRONG>
@@ -200,31 +197,34 @@ <H1 class="no-header">curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                returns <EM>NULL</EM> on error.
 
           <STRONG>slk_set</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  terminal  or  the  softkeys   were   not
-               initialized,  or  the  <EM>labnum</EM> parameter is outside the range of
-               label counts, or if the format parameter is outside  the  range
+               returns   <STRONG>ERR</STRONG>   if  the  terminal  or  the  softkeys  were  not
+               initialized, or the <EM>labnum</EM> parameter is outside  the  range  of
+               label  counts,  or if the format parameter is outside the range
                0..2, or if memory for the labels cannot be allocated.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Most  applications  would  use  <STRONG>slk_noutrefresh</STRONG>  because  a <STRONG>wrefresh</STRONG> is
+       Most applications would  use  <STRONG>slk_noutrefresh</STRONG>  because  a  <STRONG>wrefresh</STRONG>  is
        likely to follow soon.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       X/Open Curses documents the <EM>opts</EM> argument as reserved for  future  use,
-       saying  that  it must be null.  This implementation uses that parameter
-       in ABI 6 for the functions which have a color pair parameter to support
-       extended color pairs.
+       X/Open  Curses  documents the <EM>opts</EM> argument as reserved for future use,
+       saying that it must be a null pointer.  The <EM>ncurses</EM> 6 ABI uses  it  for
+       the  functions  that  accept a color pair parameter to support extended
+       color pairs.
 
-       For  functions  which  modify the color, e.g., <STRONG>slk_attr_set</STRONG>, if <EM>opts</EM> is
-       set it is treated as a pointer to <EM>int</EM>, and used to set the  color  pair
+       For functions which modify the color, e.g., <STRONG>slk_attr_set</STRONG>,  if  <EM>opts</EM>  is
+       set  it  is treated as a pointer to <EM>int</EM>, and used to set the color pair
        instead of the <EM>short</EM> pair parameter.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions, with some differences
-       from SVr4 <EM>curses</EM>:
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
 
        <STRONG>o</STRONG>   X/Open  added  functions  like  the   SVr4   attribute-manipulation
            functions  <STRONG>slk_attron</STRONG>,  <STRONG>slk_attroff</STRONG>, and <STRONG>slk_attrset</STRONG>, but which use
@@ -312,7 +312,7 @@ <H1 class="no-header">curs_slk 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                      <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 4b84cd782..c6956619c 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>newpad_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
        <STRONG>SCREEN*</STRONG> <STRONG>new_prescr(void);</STRONG>
-       <STRONG>SCREEN*</STRONG> <STRONG>newterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outfd</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>infd</EM><STRONG>);</STRONG>
+       <STRONG>SCREEN*</STRONG> <STRONG>newterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>infd</EM><STRONG>);</STRONG>
 
        <STRONG>WINDOW*</STRONG> <STRONG>newwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-11                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index 4772bea6a..ad638582c 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -57,91 +57,107 @@ <H1 class="no-header">curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</H1
 
        <STRONG>int</STRONG> <STRONG>baudrate(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>erasechar(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>erasewchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>erasewchar(wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_ic(void);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_il(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar(void);</STRONG>
-       <STRONG>int</STRONG> <STRONG>killwchar(wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*longname(void);</STRONG>
+       <STRONG>int</STRONG> <STRONG>killwchar(wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>longname(void);</STRONG>
        <STRONG>attr_t</STRONG> <STRONG>term_attrs(void);</STRONG>
        <STRONG>chtype</STRONG> <STRONG>termattrs(void);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*termname(void);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>termname(void);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H3><a name="h3-baudrate">baudrate</a></H3><PRE>
-       The  <STRONG>baudrate</STRONG>  routine  returns  the output speed of the terminal.  The
-       number returned is in bits per second, for  example  <STRONG>9600</STRONG>,  and  is  an
-       integer.
+       <STRONG>baudrate</STRONG>  returns  the  line  speed  of  the terminal, an integer value
+       measured in bits per second, for example <STRONG>9600</STRONG>.
 
 
 </PRE><H3><a name="h3-erasechar_erasewchar">erasechar, erasewchar</a></H3><PRE>
-       The <STRONG>erasechar</STRONG> routine returns the user's current erase character.
+       <STRONG>erasechar</STRONG> returns the terminal's erase character.
 
-       The  <STRONG>erasewchar</STRONG>  routine  stores  the  current  erase  character in the
-       location referenced by <EM>wc</EM>.  If no erase character has been defined, the
-       routine fails and the location referenced by <EM>wc</EM> is not changed.
+       <STRONG>erasewchar</STRONG> stores the erase character in the location referenced by <EM>wc</EM>.
+       If  no  erase  character  has  been  defined, it fails and the location
+       referenced by <EM>wc</EM> is not changed.
 
 
 </PRE><H3><a name="h3-has_ic_has_il">has_ic, has_il</a></H3><PRE>
-       The  <STRONG>has_ic</STRONG>  routine  is  true  if the terminal has insert- and delete-
-       character capabilities.
+       <STRONG>has_ic</STRONG> returns <STRONG>TRUE</STRONG> if the terminal has  insert-  and  delete-character
+       capabilities.
 
-       The <STRONG>has_il</STRONG> routine is true if the terminal has insert- and  delete-line
-       capabilities, or can simulate them using scrolling regions.  This might
-       be used to determine if it would be appropriate  to  turn  on  physical
-       scrolling using <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
+       <STRONG>has_il</STRONG>  returns  <STRONG>TRUE</STRONG>  if  the  terminal  has  insert-  and delete-line
+       capabilities, or can simulate them using scrolling regions.   It  might
+       be   used   to  determine  whether  it  would  be  appropriate  to  use
+       <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> to turn on scrolling.
 
 
 </PRE><H3><a name="h3-killchar_killwchar">killchar, killwchar</a></H3><PRE>
-       The <STRONG>killchar</STRONG> routine returns the user's current line kill character.
+       <STRONG>killchar</STRONG> returns the terminal's line kill character.
 
-       The  <STRONG>killwchar</STRONG>  routine  stores  the current line-kill character in the
-       location referenced by <EM>wc</EM>.  If no line-kill character has been defined,
-       the routine fails and the location referenced by <EM>wc</EM> is not changed.
+       <STRONG>killwchar</STRONG> stores the line-kill character in the location referenced  by
+       <EM>wc</EM>.   If  no  line-kill  character  has  been defined, it fails and the
+       location referenced by <EM>wc</EM> is not changed.
 
 
 </PRE><H3><a name="h3-longname">longname</a></H3><PRE>
-       The  <STRONG>longname</STRONG>  routine  returns a pointer to a static area containing a
-       verbose description of the current terminal.  The maximum length  of  a
-       verbose  description  is  128 characters.  It is defined only after the
-       call to <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  The area is overwritten by  each  call  to
-       <STRONG>newterm</STRONG>  and  is not restored by <STRONG>set_term</STRONG>, so the value should be saved
-       between calls to <STRONG>newterm</STRONG> if <STRONG>longname</STRONG> is going to be used with  multiple
-       terminals.
+       <STRONG>longname</STRONG> returns a pointer  to  static  storage  containing  a  verbose
+       description  of  the  terminal  being  managed  by <EM>curses</EM>.  The maximum
+       length of a verbose description is  128  characters.   The  storage  is
+       populated  only  after  <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  is  called.  This
+       storage is overwritten by each call to  <STRONG>newterm</STRONG>  and  not  restored  by
+       <STRONG><A HREF="curs_initscr.3x.html">set_term(3x)</A></STRONG>,  so its contents should be saved between calls to <STRONG>initscr</STRONG>
+       or <STRONG>newterm</STRONG> if <STRONG>longname</STRONG> is to be used with multiple terminals.
 
 
 </PRE><H3><a name="h3-termattrs_term_attrs">termattrs, term_attrs</a></H3><PRE>
-       If  a  given  terminal  does  not  support  a  video  attribute that an
-       application program is trying to use, <STRONG>curses</STRONG> may substitute a different
-       video  attribute for it.  The <STRONG>termattrs</STRONG> and <STRONG>term_attrs</STRONG> functions return
-       a logical <STRONG>OR</STRONG> of all video attributes supported by the terminal using <STRONG>A_</STRONG>
-       and  <STRONG>WA_</STRONG>  constants  respectively.   This  information is useful when a
-       <STRONG>curses</STRONG> program needs  complete  control  over  the  appearance  of  the
-       screen.
+       If a given  terminal  does  not  support  a  video  attribute  that  an
+       application program is trying to use, <EM>curses</EM> may substitute a different
+       video attribute for it.  <STRONG>termattrs</STRONG> and <STRONG>term_attrs</STRONG> return a logical "or"
+       of  all  video  attributes  supported  by the terminal using <STRONG>A_</STRONG> and <STRONG>WA_</STRONG>
+       constants respectively.  This  information  is  useful  when  a  <EM>curses</EM>
+       program needs complete control over the appearance of the screen.
 
 
 </PRE><H3><a name="h3-termname">termname</a></H3><PRE>
-       The <STRONG>termname</STRONG> routine returns the terminal name used by <STRONG>setupterm</STRONG>.
+       <STRONG>termname</STRONG> returns the terminal name used by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>longname</STRONG> and <STRONG>termname</STRONG> return <EM>NULL</EM> on error.
 
-       Routines  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4
-       only specifies "an integer  value  other  than  <STRONG>ERR</STRONG>")  upon  successful
-       completion.
+       Functions  that  return  an integer return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon
+       success.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       Note that <STRONG>termattrs</STRONG> may be a macro.
+       <STRONG>erasewchar</STRONG>, <STRONG>killwchar</STRONG>, and  <STRONG>term_attrs</STRONG>  are  part  of  <EM>ncurses</EM>'s  wide-
+       character API, and are not available in its non-wide configuration.
+
+       <STRONG>termattrs</STRONG> may be implemented as a macro.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue  4  describes  these  functions.  It changes the
-       return type of <STRONG>termattrs</STRONG> to the new  type  <STRONG>attr_t</STRONG>.   Most  versions  of
-       curses truncate the result returned by <STRONG>termname</STRONG> to 14 characters.
+       X/Open Curses Issue 4 describes these functions.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than <EM>ERR</EM>".
+
+       Most versions of <EM>curses</EM> truncate the string returned by <EM>termname</EM> to  14
+       characters.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) introduced <EM>longname</EM>.
+
+       SVr2 (1984) added <EM>baudrate</EM>, <EM>erasechar</EM>, <EM>killchar</EM>, <EM>has</EM><STRONG>_</STRONG><EM>ic</EM>, and <EM>has</EM><STRONG>_</STRONG><EM>il</EM>.
+
+       SVr3  (1987)  furnished  <EM>termname</EM>.   SVr3.1  later  that  year supplied
+       <EM>termattrs</EM>.
+
+       X/Open Curses  Issue 4  (1995)  specified  <EM>erasewchar</EM>,  <EM>killwchar</EM>,  and
+       <EM>term</EM><STRONG>_</STRONG><EM>attrs</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -149,7 +165,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-12-28                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -169,6 +185,7 @@ <H1 class="no-header">curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls</H1
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 2cc0336a5..c99de6914 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp @
+  * @Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>tgetent(char</STRONG> <STRONG>*</STRONG> <EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>name</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tgetflag(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tgetnum(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG> <EM>area</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgetstr(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>id</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG> <EM>sbuf</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgoto(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>cap</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG> <EM>putc</EM><STRONG>)(int));</STRONG>
 
@@ -90,18 +90,18 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        This implementation differs from those of historical <EM>termcap</EM> libraries.
 
-          <STRONG>o</STRONG>   <EM>ncurses</EM>  ignores  the  buffer  pointer  <EM>bp</EM>,  as do other <EM>termcap</EM>
-              implementations conforming to  portions  of  X/Open  Curses  now
-              withdrawn.   The  BSD  <EM>termcap</EM> library would store a copy of the
-              terminal  type  description  in  the  area  referenced  by  this
-              pointer.  <EM>terminfo</EM> stores terminal type descriptions in compiled
-              form, which is not the same thing.
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  ignores  the  buffer  pointer  <EM>bp</EM>,  as  do  other  <EM>termcap</EM>
+           implementations  conforming  to  portions  of  X/Open  Curses   now
+           withdrawn.   The  BSD  <EM>termcap</EM>  library  would  store a copy of the
+           terminal type description in the buffer referenced by this pointer.
+           <EM>terminfo</EM>  stores terminal type descriptions in compiled form, which
+           is not the same thing.
 
-          <STRONG>o</STRONG>   The meanings of the  return  values  differ.   The  BSD  <EM>termcap</EM>
-              library  does  not  check  whether the terminal type description
-              includes the <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability, nor whether  the  terminal
-              type  description  supports  an  addressable  cursor, a property
-              essential for any <EM>curses</EM> implementation to operate.
+       <STRONG>o</STRONG>   The meanings of the return values differ.  The BSD <EM>termcap</EM>  library
+           does  not  check whether the terminal type description includes the
+           <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability, nor whether the terminal type  description
+           supports an addressable cursor, a property essential for any <EM>curses</EM>
+           implementation to operate.
 
 
 </PRE><H3><a name="h3-Retrieving-Capability-Values">Retrieving Capability Values</a></H3><PRE>
@@ -111,22 +111,22 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>tgetnum</STRONG> obtains the numeric entry for <EM>id</EM>, or -1 if it is not available.
 
        <STRONG>tgetstr</STRONG>  returns  the  string  entry  for  <EM>id</EM>,  or  <EM>NULL</EM>  if  it is not
-       available.   Use  <STRONG>tputs</STRONG>  to  output  the  string  returned.   The  <EM>area</EM>
+       available.   Use  <STRONG>tputs</STRONG>  to  output  the  string  returned.   The  <EM>sbuf</EM>
        parameter is used as follows.
 
-          <STRONG>o</STRONG>   It is assumed to be the address of a pointer to a buffer managed
-              by the calling application.
+       <STRONG>o</STRONG>   It is assumed to be the address of a pointer to a buffer managed by
+           the calling application.
 
-          <STRONG>o</STRONG>   However, <EM>ncurses</EM> checks to ensure that <EM>area</EM>  is  not  <EM>NULL</EM>,  and
-              also  that  the resulting buffer pointer is not <EM>NULL</EM>.  If either
-              check fails, <EM>area</EM> is ignored.
+       <STRONG>o</STRONG>   However, <EM>ncurses</EM> checks to ensure that <EM>sbuf</EM> is not <EM>NULL</EM>,  and  that
+           the  pointer  obtained  by dereferencing <EM>sbuf</EM> is also not <EM>NULL</EM>.  If
+           either check fails, <EM>ncurses</EM> ignores <EM>sbuf</EM>.
 
-          <STRONG>o</STRONG>   If the checks succeed, <EM>ncurses</EM> also copies the return  value  to
-              the  buffer  pointed to by <EM>area</EM>, and the library updates <EM>area</EM> to
-              point past the null character terminating this value.
+       <STRONG>o</STRONG>   If the checks succeed, <EM>ncurses</EM> also copies the return value to  the
+           buffer  pointed  to  by <EM>sbuf</EM>, and the library updates <EM>sbuf</EM> to point
+           past the null character terminating this value.
 
-          <STRONG>o</STRONG>   The return value itself is  an  address  in  the  terminal  type
-              description loaded into memory.
+       <STRONG>o</STRONG>   The return  value  itself  is  an  address  in  the  terminal  type
+           description loaded into memory.
 
 
 </PRE><H3><a name="h3-Applying-String-Capabilities">Applying String Capabilities</a></H3><PRE>
@@ -168,34 +168,35 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Global-Variables">Global Variables</a></H3><PRE>
        <STRONG>tgetent</STRONG> sets the variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG>, and <STRONG>BC</STRONG> to the <EM>terminfo</EM> entry's  data
-       for  <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG>, and <STRONG>backspace_if_not_bs</STRONG>, respectively.  <STRONG>UP</STRONG> is
-       not used by <EM>ncurses</EM>.  <STRONG>PC</STRONG> is used by <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>.  <STRONG>BC</STRONG>  is  used  by
-       <STRONG>tgoto</STRONG> emulation.  <EM>ncurses</EM> assigns the variable <STRONG>ospeed</STRONG> a system-specific
-       value to encode the terminal's data rate.
+       for  <STRONG>pad_char</STRONG>  (<STRONG>pad</STRONG>), <STRONG>cursor_up</STRONG> (<STRONG>cuu1</STRONG>), and <STRONG>backspace_if_not_bs</STRONG> (<STRONG>OTbs</STRONG>),
+       respectively.    <EM>ncurses</EM>   does    not    employ    <STRONG>cuu1</STRONG>    internally.
+       <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>  uses  <STRONG>pad</STRONG>,  while  <STRONG>tgoto</STRONG>  emulation uses the obsolete
+       <EM>termcap</EM> capability <STRONG>bs</STRONG>,  represented  in  <EM>ncurses</EM>  <EM>terminfo</EM>  as  "OTbs".
+       <EM>ncurses</EM>  assigns  the variable <STRONG>ospeed</STRONG> a system-specific value to encode
+       the terminal's data rate.
 
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        The <EM>termcap</EM> functions provide  no  means  of  freeing  memory,  because
-       legacy  <EM>termcap</EM>  implementations used only the buffer areas provided by
-       the caller via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused in  <EM>term-</EM>
-       <EM>info</EM>.
+       legacy  <EM>termcap</EM>  implementations  used only the storage provided by the
+       caller via <STRONG>tgetent</STRONG> and <STRONG>tgetstr</STRONG>.  Those buffers are unused in <EM>terminfo</EM>.
 
-       By  contrast,  <EM>terminfo</EM>  allocates  memory.   It  uses <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> to
-       obtain the data  used  by  <STRONG>tgetent</STRONG>  and  the  functions  that  retrieve
+       By contrast, <EM>terminfo</EM>  allocates  memory.   It  uses  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>  to
+       obtain  the  data  used  by  <STRONG>tgetent</STRONG>  and  the  functions that retrieve
        capability values.  One could use
               del_curterm(cur_term);
-       to  free  this  memory,  but  there  is an additional complication with
+       to free this memory, but  there  is  an  additional  complication  with
        <EM>ncurses</EM>.  It uses a fixed-size pool of storage locations, one per value
        of the terminal name parameter given to <STRONG>tgetent</STRONG>.  The <STRONG>screen(1)</STRONG> program
        relies upon this arrangement to improve its performance.
 
-       An application that uses only the <EM>termcap</EM>  functions,  not  the  higher
-       level  <EM>curses</EM>  API,  could  release  the  memory using <STRONG><A HREF="curs_terminfo.3x.html">del_curterm(3x)</A></STRONG>,
+       An  application  that  uses only the <EM>termcap</EM> functions, not the higher-
+       level <EM>curses</EM> API,  could  release  the  memory  using  <STRONG><A HREF="curs_terminfo.3x.html">del_curterm(3x)</A></STRONG>,
        because the pool is freed using other functions; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       The return values of  <STRONG>tgetent</STRONG>,  <STRONG>tgetflag</STRONG>,  <STRONG>tgetname</STRONG>,  and  <STRONG>tgetstr</STRONG>  are
+       The  return  values  of  <STRONG>tgetent</STRONG>,  <STRONG>tgetflag</STRONG>,  <STRONG>tgetname</STRONG>, and <STRONG>tgetstr</STRONG> are
        documented above.
 
        <STRONG>tgoto</STRONG> returns <EM>NULL</EM> on error.  Error conditions include:
@@ -206,7 +207,7 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   <EM>cap</EM> referring to a canceled capability,
 
-       <STRONG>o</STRONG>   <EM>cap</EM>  being  a  capability  with  string-valued  parameters (a <EM>term-</EM>
+       <STRONG>o</STRONG>   <EM>cap</EM> being a  capability  with  string-valued  parameters  (a  <EM>term-</EM>
            <EM>info</EM>-only feature), and
 
        <STRONG>o</STRONG>   <EM>cap</EM> being a capability with more than two parameters.
@@ -215,37 +216,32 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <EM>ncurses</EM> compares only the first two characters of the <EM>id</EM>  parameter  of
+       <EM>ncurses</EM>  compares  only the first two characters of the <EM>id</EM> parameter of
        <STRONG>tgetflag</STRONG>, <STRONG>tgetnum</STRONG>, and <STRONG>tgetstr</STRONG> to the capability names in the database.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These  functions  are  no  longer standardized (and the variables never
-       were); <EM>ncurses</EM> provides them  to  support  legacy  applications.   They
-       should not be used in new programs.
+       These functions are no longer standardized  (and  the  variables  never
+       were);  see  section "HISTORY" below.  <EM>ncurses</EM> provides them to support
+       legacy applications; they should not be used in new programs.
 
-
-</PRE><H3><a name="h3-Standards">Standards</a></H3><PRE>
-       <STRONG>o</STRONG>   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
-           functions, marking them as "TO BE WITHDRAWN".
-
-       <STRONG>o</STRONG>   X/Open Curses, Issue 7 (2009) withdrew the <EM>termcap</EM> interface (along
-           with the <EM>vwprintw</EM> and <EM>vwscanw</EM> functions).
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
 
        Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
        values of <EM>tgetent</EM> correctly, though all three shown here were  in  fact
        returned  ever  since  SVr1.   In particular, an omission in the X/Open
        Curses specification has  been  misinterpreted  to  mean  that  <EM>tgetent</EM>
-       returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>.   Because  the  purpose  of these functions is to
+       returns  <EM>OK</EM>  or  <EM>ERR</EM>.   Because  the  purpose  of these functions is to
        provide compatibility with the <EM>termcap</EM> library, that  is  a  defect  in
-       X/Open Curses, Issue 4, Version 2 rather than in <EM>ncurses</EM>.
+       X/Open Curses Issue 4 Version 2 rather than in <EM>ncurses</EM>.
 
-   <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <STRONG><EM>termcap</EM></STRONG>
+   <STRONG>Compatibility</STRONG> <STRONG>with</STRONG> <STRONG>BSD</STRONG> <EM>termcap</EM>
        <EM>ncurses</EM>  provides  externally  visible  variables  to  support  certain
        <EM>termcap</EM>  applications.   However,  their  correct   usage   is   poorly
        documented; for example, it is unclear when reading and writing them is
        meaningful.  In particular, some applications are reported  to  declare
-       and/or modify <STRONG>ospeed</STRONG>.
+       and/or modify <EM>ospeed</EM>.
 
        The  constraint  that only the first two characters of the <EM>id</EM> parameter
        are looked  up  in  the  terminal  database  escapes  many  application
@@ -328,6 +324,12 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        two  of  the four implementations thus differ, and programs that intend
        to work with all <EM>termcap</EM> library interfaces must account for that fact.
 
+       X/Open Curses Issue 4, Version 2  (1996),  describes  these  functions,
+       marking them as "TO BE WITHDRAWN".
+
+       X/Open Curses Issue 7 (2009) withdrew the <EM>termcap</EM> interface (along with
+       the <EM>vwprintw</EM> and <EM>vwscanw</EM> functions).
+
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
        If  you  call  <STRONG>tgetstr</STRONG>  to  fetch  <STRONG>column_address</STRONG>  (<STRONG>ch</STRONG>)  or  any  other
@@ -371,7 +373,7 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -390,7 +392,6 @@ <H1 class="no-header">curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
-<li><a href="#h3-Standards">Standards</a></li>
 <li><a href="#h3-Header-File">Header File</a></li>
 </ul>
 </li>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 7ccb3f60a..9a81d3b13 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -104,34 +104,35 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These low-level functions must be called by programs that deal directly
-       with the <EM>terminfo</EM> database to  handle  certain  terminal  capabilities,
-       such as programming function keys.  For all other functionality, <EM>curses</EM>
-       functions are more suitable and their use is recommended.
+       These  lower-level  functions  of the <EM>curses</EM> standard must be called by
+       programs that deal  directly  with  the  <EM>terminfo</EM>  database  to  handle
+       certain  terminal capabilities, such as programming function keys.  For
+       all other functionality, <EM>curses</EM> functions are more suitable  and  their
+       use is recommended.
 
-       None of these functions use  (or  are  aware  of)  multibyte  character
+       None  of  these  functions  use  (or  are aware of) multibyte character
        strings such as UTF-8.
 
        <STRONG>o</STRONG>   Capability names and codes use the POSIX portable character set.
 
-       <STRONG>o</STRONG>   Capability  string  values  have  no  associated encoding; they are
+       <STRONG>o</STRONG>   Capability string values have  no  associated  encoding;  they  are
            strings of 8-bit characters.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
-       Call <STRONG>setupterm</STRONG> from  your  application  to  have  <EM>terminfo</EM>  manage  the
-       terminal   device;   this  action  initializes  the  terminal-dependent
-       variables listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  (A <EM>curses</EM> application  calling
+       Call  <STRONG>setupterm</STRONG>  from  your  application  to  have  <EM>terminfo</EM> manage the
+       terminal  device;  this  action  initializes   the   terminal-dependent
+       variables  listed in <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.  (A <EM>curses</EM> application calling
        <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> achieves the same result.)  Applications can
-       use the terminal capabilities either directly,  by  object  definitions
+       use  the  terminal  capabilities either directly, by object definitions
        corresponding to capability names and codes (see <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>) or
-       by calling the functions documented here.   <STRONG>setupterm</STRONG>  initializes  the
+       by  calling  the  functions documented here.  <STRONG>setupterm</STRONG> initializes the
        <EM>terminfo</EM> variables <STRONG>lines</STRONG> and <STRONG>columns</STRONG> as described in <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>.
 
-       Pass   parameterized   string   capability   values  through  <STRONG>tparm</STRONG>  to
+       Pass  parameterized  string  capability   values   through   <STRONG>tparm</STRONG>   to
        instantiate them.  All <EM>terminfo</EM> strings (including the output of <STRONG>tparm</STRONG>)
-       should  be  sent  to  the  terminal  device  with  <STRONG>tputs</STRONG> or <STRONG>putp</STRONG>.  Call
-       <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> to restore the terminal modes before exiting.   (A
+       should be sent to  the  terminal  device  with  <STRONG>tputs</STRONG>  or  <STRONG>putp</STRONG>.   Call
+       <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG>  to restore the terminal modes before exiting.  (A
        <EM>curses</EM> application calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> achieves the same result.)
 
        Programs that use cursor addressing should emit certain capabilities at
@@ -143,53 +144,53 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        Programs that execute shell subprocesses should
 
-       <STRONG>o</STRONG>   call <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> and output <STRONG>exit_ca_mode</STRONG> before the  shell
+       <STRONG>o</STRONG>   call  <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG> and output <STRONG>exit_ca_mode</STRONG> before the shell
            is called, and
 
-       <STRONG>o</STRONG>   output  <STRONG>enter_ca_mode</STRONG>  and call <STRONG><A HREF="curs_kernel.3x.html">reset_prog_mode(3x)</A></STRONG> after returning
+       <STRONG>o</STRONG>   output <STRONG>enter_ca_mode</STRONG> and call <STRONG><A HREF="curs_kernel.3x.html">reset_prog_mode(3x)</A></STRONG>  after  returning
            from the shell.
 
-       <STRONG>setupterm</STRONG> reads in the <EM>terminfo</EM>  database,  initializing  the  <EM>terminfo</EM>
-       structures,  but  does  not set up the output virtualization structures
+       <STRONG>setupterm</STRONG>  reads  in  the  <EM>terminfo</EM> database, initializing the <EM>terminfo</EM>
+       structures, but does not set up the  output  virtualization  structures
        used by <EM>curses</EM>.  Its parameters follow.
 
           <EM>term</EM> is the terminal type, a character string.  If <EM>term</EM> is null, the
                environment variable <EM>TERM</EM> is read.
 
           <EM>filedes</EM>
-               is  the  file  descriptor used for getting and setting terminal
+               is the file descriptor used for getting  and  setting  terminal
                I/O modes.
 
-               Higher-level applications use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to  initialize  the
-               terminal,  passing  an  output <EM>stream</EM> rather than a <EM>descriptor</EM>.
-               In  <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>   calls
-               <STRONG>setupterm</STRONG>,  passing the file descriptor derived from its output
+               Higher-level  applications  use  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  to initialize the
+               terminal, passing an output <EM>stream</EM> rather  than  a  <EM>descriptor</EM>.
+               In   <EM>curses</EM>,  the  two  are  the  same  because  <STRONG>newterm</STRONG>  calls
+               <STRONG>setupterm</STRONG>, passing the file descriptor derived from its  output
                stream parameter.
 
           <EM>errret</EM>
-               points to an optional location where an  error  status  can  be
-               returned  to the caller.  If <EM>errret</EM> is not null, then <STRONG>setupterm</STRONG>
-               returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> and stores a  status  value  in  the  integer
-               pointed  to  by  <EM>errret</EM>.   A  return  value of <STRONG>OK</STRONG> combined with
+               points  to  an  optional  location where an error status can be
+               returned to the caller.  If <EM>errret</EM> is not null, then  <STRONG>setupterm</STRONG>
+               returns  <STRONG>OK</STRONG>  or  <STRONG>ERR</STRONG>  and  stores a status value in the integer
+               pointed to by <EM>errret</EM>.  A  return  value  of  <STRONG>OK</STRONG>  combined  with
                status of <STRONG>1</STRONG> in <EM>errret</EM> is normal.
 
-               If <STRONG>ERR</STRONG> is returned, examine <EM>errret:</EM>
+               If <STRONG>ERR</STRONG> is returned, examine <EM>errret</EM>.
 
                <STRONG>1</STRONG>    means  that  the  terminal  is  a  hard-copy  type  (lacks
-                    destructive  backspace),  and  cannot  be  used for <EM>curses</EM>
-                    applications.   The  library  determines  this   fact   by
+                    destructive backspace), and  cannot  be  used  for  <EM>curses</EM>
+                    applications.    The   library  determines  this  fact  by
                     checking the terminal type's <STRONG>hardcopy</STRONG> (<STRONG>hc</STRONG>) capability.
 
-               <STRONG>0</STRONG>    means  that the terminal could not be found, or that it is
-                    a generic type, having too little information  for  <EM>curses</EM>
+               <STRONG>0</STRONG>    means that the terminal could not be found, or that it  is
+                    a  generic  type, having too little information for <EM>curses</EM>
                     applications to run.
 
-                    <STRONG>setupterm</STRONG>  determines  if  the  entry is a generic type by
+                    <STRONG>setupterm</STRONG> determines if the entry is  a  generic  type  by
                     checking the <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) capability.
 
                <STRONG>-1</STRONG>   means that the <EM>terminfo</EM> database could not be found.
 
-               If <EM>errret</EM> is null, <STRONG>setupterm</STRONG>  reports  an  error  message  upon
+               If  <EM>errret</EM>  is  null,  <STRONG>setupterm</STRONG>  reports an error message upon
                finding an error and exits.  Thus, the simplest call is:
 
                       setupterm((char *) NULL, 1, (int *) NULL);
@@ -198,83 +199,83 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-The-Terminal-State">The Terminal State</a></H3><PRE>
-       <STRONG>setupterm</STRONG>  stores  its  information  about  the  terminal in a <EM>TERMINAL</EM>
+       <STRONG>setupterm</STRONG> stores its information  about  the  terminal  in  a  <EM>TERMINAL</EM>
        structure pointed to by the global variable <STRONG>cur_term</STRONG>.  If it detects an
        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
-       generic), it  discards  this  information,  making  it  unavailable  to
+       generic),  it  discards  this  information,  making  it  unavailable to
        applications.
 
        If <STRONG>setupterm</STRONG> is called repeatedly for the same terminal type, it reuses
-       the information.   It  maintains  only  one  copy  of  a  given  type's
-       capabilities  in  memory.   If  called  for  different types, <STRONG>setupterm</STRONG>
+       the  information.   It  maintains  only  one  copy  of  a  given type's
+       capabilities in memory.   If  called  for  different  types,  <STRONG>setupterm</STRONG>
        allocates new storage for each set of terminal capabilities.
 
        <STRONG>set_curterm</STRONG> sets <STRONG>cur_term</STRONG> to <EM>nterm</EM>, making all of the <EM>terminfo</EM> Boolean,
        numeric, and string capabilities use the values from <EM>nterm</EM>.  It returns
        the old value of <STRONG>cur_term</STRONG>.
 
-       <STRONG>del_curterm</STRONG> frees the memory pointed to by <EM>oterm</EM>, making  it  available
-       for  further  use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references to any
-       of the <EM>terminfo</EM> Boolean, numeric, and  string  capabilities  thereafter
+       <STRONG>del_curterm</STRONG>  frees  the memory pointed to by <EM>oterm</EM>, making it available
+       for further use.  If <EM>oterm</EM> is the same as <STRONG>cur_term</STRONG>, references  to  any
+       of  the  <EM>terminfo</EM>  Boolean, numeric, and string capabilities thereafter
        may refer to invalid memory locations until <STRONG>setupterm</STRONG> is called again.
 
-       <STRONG>restartterm</STRONG>  is  similar  to  <STRONG>setupterm</STRONG>,  but is intended for use after
-       restoring program  memory  to  a  previous  state  (for  example,  when
-       reloading  an  application  that  has  been suspended from one terminal
+       <STRONG>restartterm</STRONG> is similar to <STRONG>setupterm</STRONG>, but  is  intended  for  use  after
+       restoring  program  memory  to  a  previous  state  (for  example, when
+       reloading an application that has  been  suspended  from  one  terminal
        session and restored in another).  <STRONG>restartterm</STRONG> assumes that the display
        dimensions and the input and output options are the same as when memory
-       was  saved,  but  the  terminal  type  and  line  speed   may   differ.
-       Accordingly,   <STRONG>restartterm</STRONG>   saves   relevant   terminal  state,  calls
+       was   saved,   but  the  terminal  type  and  line  speed  may  differ.
+       Accordingly,  <STRONG>restartterm</STRONG>  saves   relevant   terminal   state,   calls
        <STRONG>setupterm</STRONG>, then restores that state.
 
 
 </PRE><H3><a name="h3-Formatting-Output">Formatting Output</a></H3><PRE>
-       <STRONG>tparm</STRONG> instantiates the string <EM>str</EM> with parameters  <EM>pi</EM>.   A  pointer  is
+       <STRONG>tparm</STRONG>  instantiates  the  string  <EM>str</EM> with parameters <EM>pi</EM>.  A pointer is
        returned to the result of <EM>str</EM> with the parameters applied.  Application
        developers should keep in mind these quirks of the interface:
 
-       <STRONG>o</STRONG>   Although <STRONG>tparm</STRONG>'s actual parameters may be integers or strings,  the
+       <STRONG>o</STRONG>   Although  <STRONG>tparm</STRONG>'s actual parameters may be integers or strings, the
            prototype expects <EM>long</EM> (integer) values.
 
-       <STRONG>o</STRONG>   Aside  from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most terminal
+       <STRONG>o</STRONG>   Aside from  the  <STRONG>set_attributes</STRONG>  (<STRONG>sgr</STRONG>)  capability,  most  terminal
            capabilities require no more than one or two parameters.
 
-       <STRONG>o</STRONG>   Padding information is ignored  by  <STRONG>tparm</STRONG>;  it  is  interpreted  by
+       <STRONG>o</STRONG>   Padding  information  is  ignored  by  <STRONG>tparm</STRONG>;  it is interpreted by
            <STRONG>tputs</STRONG>.
 
-       <STRONG>o</STRONG>   The  capability  string  is  null-terminated.   Use "\200" where an
+       <STRONG>o</STRONG>   The capability string is  null-terminated.   Use  "\200"  where  an
            ASCII NUL is needed in the output.
 
-       <STRONG>tiparm</STRONG> is a newer form of <STRONG>tparm</STRONG>  which  uses  <EM>stdarg.h</EM>  rather  than  a
-       fixed-parameter  list.   Its  numeric  parameters  are <EM>int</EM>s rather than
+       <STRONG>tiparm</STRONG>  is  a  newer  form  of  <STRONG>tparm</STRONG> which uses <EM>stdarg.h</EM> rather than a
+       fixed-parameter list.  Its numeric  parameters  are  <EM>int</EM>s  rather  than
        <EM>long</EM>s.
 
-       Both <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> assume that  the  application  passes  parameters
-       consistent  with the terminal description.  Two extensions are provided
+       Both  <STRONG>tparm</STRONG>  and  <STRONG>tiparm</STRONG>  assume that the application passes parameters
+       consistent with the terminal description.  Two extensions are  provided
        as alternatives to deal with untrusted data.
 
-       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG> is an extension which is a safer formatting function  than
+       <STRONG>o</STRONG>   <STRONG>tiparm_s</STRONG>  is an extension which is a safer formatting function than
            <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>, because it allows the developer to tell the <EM>curses</EM>
-           library how many parameters to expect in the  parameter  list,  and
+           library  how  many  parameters to expect in the parameter list, and
            which may be string parameters.
 
-           The  <EM>mask</EM>  parameter has one bit set for each of the parameters (up
+           The <EM>mask</EM> parameter has one bit set for each of the  parameters  (up
            to 9) passed as <EM>char</EM> pointers rather than numbers.
 
-       <STRONG>o</STRONG>   The  extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect   a
+       <STRONG>o</STRONG>   The   extension  <STRONG>tiscan_s</STRONG>  allows  the  application  to  inspect  a
            formatting capability to see what the <EM>curses</EM> library would assume.
 
 
 </PRE><H3><a name="h3-Output-Functions">Output Functions</a></H3><PRE>
-       String  capabilities  can  contain <EM>padding</EM>, a time delay (accommodating
+       String capabilities can contain <EM>padding</EM>, a  time  delay  (accommodating
        performance limitations of hardware terminals) expressed as <STRONG>$&lt;</STRONG><EM>n</EM><STRONG>&gt;</STRONG>, where
        <EM>n</EM> is a nonnegative integral count of milliseconds.  If <EM>n</EM> exceeds 30,000
        (thirty seconds), it is capped at that value.
 
-       <STRONG>tputs</STRONG> interprets time-delay information in the string <EM>str</EM>  and  outputs
+       <STRONG>tputs</STRONG>  interprets  time-delay information in the string <EM>str</EM> and outputs
        it, executing the delays:
 
-       <STRONG>o</STRONG>   The  <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the return
+       <STRONG>o</STRONG>   The <EM>str</EM> parameter must be a <EM>terminfo</EM> string variable or the  return
            value of <STRONG>tparm</STRONG> or <STRONG>tiparm</STRONG>.
 
        <STRONG>o</STRONG>   <EM>affcnt</EM> is the number of lines affected, or <STRONG>1</STRONG> if not applicable.
@@ -282,8 +283,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   <EM>putc</EM> is a <EM>putchar</EM>-like function to which the characters are passed,
            one at a time.
 
-           If  <STRONG>tputs</STRONG>  processes  a  time-delay,  it  uses the <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
-           function, routing any resulting  padding  characters  through  this
+           If <STRONG>tputs</STRONG> processes  a  time-delay,  it  uses  the  <STRONG><A HREF="curs_util.3x.html">delay_output(3x)</A></STRONG>
+           function,  routing  any  resulting  padding characters through this
            function.
 
        <STRONG>putp</STRONG> calls "<STRONG>tputs(</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>putchar)</STRONG>".  The output of <STRONG>putp</STRONG> always goes to
@@ -295,30 +296,30 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>vidattr</STRONG> is like <STRONG>vidputs</STRONG>, except that it outputs through <STRONG>putchar(3)</STRONG>.
 
-       <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>,  respectively.
-       They  use multiple parameters to represent the character attributes and
+       <STRONG>vid_attr</STRONG>  and <STRONG>vid_puts</STRONG> correspond to <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG>, respectively.
+       They use multiple parameters to represent the character attributes  and
        color; namely,
 
        <STRONG>o</STRONG>   <EM>attrs</EM>, of type <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, for the attributes and
 
        <STRONG>o</STRONG>   <EM>pair</EM>, of type <EM>short</EM>, for the color pair number.
 
-       Use the attribute constants  prefixed  with  "<STRONG>WA_</STRONG>"  with  <STRONG>vid_attr</STRONG>  and
+       Use  the  attribute  constants  prefixed  with  "<STRONG>WA_</STRONG>" with <STRONG>vid_attr</STRONG> and
        <STRONG>vid_puts</STRONG>.
 
-       X/Open  Curses  reserves  the <EM>opts</EM> argument for future use, saying that
-       applications must provide a null pointer for  that  argument;  but  see
+       X/Open Curses reserves the <EM>opts</EM> argument for future  use,  saying  that
+       applications  must  provide  a  null pointer for that argument; but see
        section "EXTENSIONS" below.
 
-       While  <STRONG>putp</STRONG> is a low-level function that does not use high-level <EM>curses</EM>
-       state, <EM>ncurses</EM> declares it in <EM>curses.h</EM> because System V did  this  (see
-       section "HISTORY" below).
+       While <STRONG>putp</STRONG> is a lower-level function that  does  not  use  higher-level
+       <EM>curses</EM>  state,  <EM>ncurses</EM> declares it in <EM>curses.h</EM> because System V did so
+       (see section "HISTORY" below).
 
 
 </PRE><H3><a name="h3-Terminal-Capability-Functions">Terminal Capability Functions</a></H3><PRE>
-       <STRONG>tigetflag</STRONG>,  <STRONG>tigetnum</STRONG>,  and  <STRONG>tigetstr</STRONG> return the value of the capability
-       corresponding to the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed  to  them.
-       The  <EM>cap-code</EM>  for each capability is given in the table column of that
+       <STRONG>tigetflag</STRONG>, <STRONG>tigetnum</STRONG>, and <STRONG>tigetstr</STRONG> return the value  of  the  capability
+       corresponding  to  the <EM>terminfo</EM> <EM>cap-code</EM>, such as <STRONG>xenl</STRONG>, passed to them.
+       The <EM>cap-code</EM> for each capability is given in the table column  of  that
        name in the "Predefined Capabilities" section of <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        These functions return special values to denote errors.
@@ -361,29 +362,32 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Releasing-Memory">Releasing Memory</a></H3><PRE>
        Each successful call to <STRONG>setupterm</STRONG> allocates memory to hold the terminal
-       description.   As  a  side  effect,  it  sets <STRONG>cur_term</STRONG> to point to this
+       description.  As a side effect, it  sets  <STRONG>cur_term</STRONG>  to  point  to  this
        memory.  If an application calls
               del_curterm(cur_term);
        the memory will be freed.
 
-       The formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage  allocated
+       The  formatting functions <STRONG>tparm</STRONG> and <STRONG>tiparm</STRONG> extend the storage allocated
        by <STRONG>setupterm</STRONG> as follows.
 
-       <STRONG>o</STRONG>   They  add  the  "static"  <EM>terminfo</EM> variables [a-z].  Before <EM>ncurses</EM>
+       <STRONG>o</STRONG>   They add the "static" <EM>terminfo</EM>  variables  [a-z].   Before  <EM>ncurses</EM>
            6.3, those were shared by all screens.  With <EM>ncurses</EM> 6.3, those are
            allocated per screen.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
-       <STRONG>o</STRONG>   To  improve performance, <EM>ncurses</EM> 6.3 caches the result of analyzing
-           <EM>terminfo</EM> strings for their parameter types.  That is  stored  as  a
+       <STRONG>o</STRONG>   To improve performance, <EM>ncurses</EM> 6.3 caches the result of  analyzing
+           <EM>terminfo</EM>  strings  for  their parameter types.  That is stored as a
            binary tree referenced from the <EM>TERMINAL</EM> structure.
 
        The higher-level <STRONG>initscr</STRONG> and <STRONG>newterm</STRONG> functions use <STRONG>setupterm</STRONG>.  Normally
-       they do not free this memory, but it is possible to do that  using  the
+       they  do  not free this memory, but it is possible to do that using the
        <STRONG><A HREF="curs_initscr.3x.html">delscreen(3x)</A></STRONG> function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       X/Open Curses defines no failure conditions.  In <EM>ncurses</EM>,
+       Functions that return integers return <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>  upon
+       success.
+
+       In <EM>ncurses</EM>,
 
        <STRONG>del_curtem</STRONG>
             fails if its terminal parameter is null.
@@ -418,8 +422,8 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  functions  marked as extensions were designed for <EM>ncurses</EM>, and are
-       not found in SVr4 <EM>curses</EM>, 4.4BSD <EM>curses</EM>, or any other  previous  <EM>curses</EM>
+       The  functions  marked as extensions originated in <EM>ncurses</EM>, and are not
+       found in SVr4 <EM>curses</EM>, 4.4BSD  <EM>curses</EM>,  or  any  other  previous  <EM>curses</EM>
        implementation.
 
        <EM>ncurses</EM>  allows  <EM>opts</EM>  to be a pointer to <EM>int</EM>, which overrides the <EM>pair</EM>
@@ -427,35 +431,38 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       <EM>setterm</EM> is not described by X/Open and must be considered non-portable.
-       All other functions are as described by X/Open.
+       Except for <EM>setterm</EM>, X/Open Curses Issue 4  describes  these  functions.
+       It specifies no error conditions for them.
+
+       SVr4 describes a successful return value except where "otherwise noted"
+       as "an integer value other than <EM>ERR</EM>".
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       On  legacy <EM>curses</EM> systems, include <EM>curses.h</EM> and <EM>term.h</EM> in that order to
-       get the definitions for these strings, numbers, and flags.
+       On legacy <EM>curses</EM> systems, include <EM>curses.h</EM> and <EM>term.h</EM> in that order  to
+       make   visible  the  definitions  of  the  string  arrays  storing  the
+       capability names and codes.
 
 
 </PRE><H3><a name="h3-Compatibility-Macros">Compatibility Macros</a></H3><PRE>
-       This implementation  provides  a  few  macros  for  compatibility  with
-       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
-       <EM>Bcrmode</EM>, <EM>Bfixterm</EM>, <EM>Bgettmode</EM>, <EM>Bnocrmode</EM>,  <EM>Bresetterm</EM>,  <EM>Bsaveterm</EM>,  and"
-       <EM>Bsetterm</EM>.   <EM>ncurses</EM>  implements each of these symbols as macros for BSD
-       <EM>curses</EM> compatibility.
+       <EM>ncurses</EM> implements a few macros for early System V <EM>curses</EM> compatibility
+       (see section "HISTORY" below).  They include <EM>crmode</EM>, <EM>fixterm</EM>, <EM>gettmode</EM>,
+       <EM>nocrmode</EM>, <EM>resetterm</EM>, <EM>saveterm</EM>, and <EM>setterm</EM>.
 
        In SVr4, these are found in  <EM>curses.h</EM>,  but  except  for  <EM>setterm</EM>,  are
        likewise macros.  The one function, <EM>setterm</EM>, is mentioned in the manual
        page.  It further notes that <EM>setterm</EM> was replaced by <EM>setupterm</EM>, stating
        that the call
-              <STRONG>setupterm(</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>1,</STRONG> <STRONG>(int</STRONG> <STRONG>*)0)</STRONG>
+              setupterm(<EM>term</EM>, 1, (int *)0)
+
        provides the same functionality as
-              <STRONG>setterm(</STRONG><EM>term</EM><STRONG>)</STRONG>
+              setterm(<EM>term</EM>)
        and discouraging the latter for new programs.
 
 
 </PRE><H3><a name="h3-Legacy-Data">Legacy Data</a></H3><PRE>
-       <EM>setupterm</EM>  copies  the terminal name to the array <EM>ttytype</EM>.  This is not
-       part of X/Open Curses, but is assumed by some applications.
+       <EM>setupterm</EM> copies the terminal name to the array <EM>ttytype</EM>.  This behavior
+       is not specified by X/Open Curses, but is assumed by some applications.
 
        Other implementions may not declare the capability name  arrays.   Some
        provide  them  without  declaring them.  X/Open Curses does not specify
@@ -467,17 +474,17 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Output-Buffering">Output Buffering</a></H3><PRE>
        Older  versions  of  <EM>ncurses</EM> assumed that the file descriptor passed to
-       <EM>setupterm</EM> from <EM>initscr</EM> or <EM>newterm</EM> uses buffered I/O, and would write to
-       the  corresponding  stream.   In  addition  to  the limitation that the
+       <EM>setupterm</EM> from <EM>initscr</EM> or <EM>newterm</EM> used buffered I/O, and wrote  to  the
+       corresponding  <EM>stdio</EM>  stream.   In  addition to the limitation that the
        terminal was  left  in  block-buffered  mode  on  exit  (like  System V
        <EM>curses</EM>),  it  was  problematic because <EM>ncurses</EM> did not allow a reliable
-       way to clean up on receiving <STRONG>SIGTSTP</STRONG>.
+       way to clean up on receiving <EM>SIGTSTP</EM>.
 
-       <EM>ncurses</EM> 6.<EM>x</EM> uses output buffers managed directly by <EM>ncurses</EM>.   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  <EM>ncurses</EM> employ alternate versions of these functions using the more
-       reliable buffering scheme.
+       <EM>ncurses</EM> 6.<EM>x</EM> uses output  buffers  managed  directly  by  <EM>ncurses</EM>.   The
+       lower-level  functions described here that write to the terminal device
+       do so via the standard output stream; they thus  are  not  signal-safe.
+       The  higher-level  functions  in  <EM>ncurses</EM>  employ alternate versions of
+       these functions using a more reliable buffering scheme.
 
 
 </PRE><H3><a name="h3-Function-Prototypes">Function Prototypes</a></H3><PRE>
@@ -493,81 +500,80 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            from  compiling.   On  the  other  hand,  "writable strings" are an
            obsolescent C language feature.
 
-           As an extension, this implementation can be  configured  to  change
-           the  function prototypes to use the <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI
-           6 enables this feature by default.
+           As an extension, <EM>ncurses</EM> can be configured to change  the  function
+           prototypes  to  use  the  <EM>const</EM> keyword.  The <EM>ncurses</EM> ABI 6 enables
+           this feature by default.
 
        <STRONG>o</STRONG>   X/Open Curses prototypes <EM>tparm</EM> with a fixed number  of  parameters,
            rather than a variable argument list.
 
-           This  implementation  uses  a  variable  argument  list, but can be
-           configured to use the fixed-parameter list.  Portable  applications
-           should  provide  nine  parameters after the format; zeroes are fine
-           for this purpose.
+           <EM>ncurses</EM> uses a variable argument list, but can be configured to use
+           the fixed-parameter list.   Portable  applications  should  provide
+           nine parameters after the format; zeroes are fine for this purpose.
 
-           In response to review comments by Thomas E. Dickey,  X/Open  Curses
+           In  response  to review comments by Thomas E. Dickey, X/Open Curses
            Issue 7 proposed the <EM>tiparm</EM> function in mid-2009.
 
-           While  <EM>tiparm</EM>  is  always  provided  in  <EM>ncurses</EM>, the older form is
-           available only  as  a  build-time  configuration  option.   If  not
+           While <EM>tiparm</EM> is always provided  in  <EM>ncurses</EM>,  the  older  form  is
+           available  only  as  a  build-time  configuration  option.   If not
            specially configured, <EM>tparm</EM> is the same as <EM>tiparm</EM>.
 
        Both forms of <EM>tparm</EM> have drawbacks.
 
-       <STRONG>o</STRONG>   Most  calls  to  <EM>tparm</EM> require only one or two parameters.  Passing
+       <STRONG>o</STRONG>   Most calls to <EM>tparm</EM> require only one or  two  parameters.   Passing
            nine on each call is awkward.
 
-           Using <EM>long</EM> for the numeric parameter type is a workaround  to  make
-           the  parameter  use  the  same amount of stack memory as a pointer.
-           That approach dates to the mid-1980s, before  C  was  standardized.
-           Since  ANSI C (1989), C language standards do not require a pointer
+           Using  <EM>long</EM>  for the numeric parameter type is a workaround to make
+           the parameter use the same amount of stack  memory  as  a  pointer.
+           That  approach  dates  to the mid-1980s, before C was standardized.
+           Since ANSI C (1989), C language standards do not require a  pointer
            to fit in a <EM>long</EM>).
 
-       <STRONG>o</STRONG>   Providing the right number of parameters for  a  variadic  function
+       <STRONG>o</STRONG>   Providing  the  right  number of parameters for a variadic function
            such  as  <EM>tiparm</EM>  can  be  a  problem,  in  particular  for  string
-           parameters.  However, only a few <EM>terminfo</EM> capabilities  use  string
-           parameters  (for  instance, the ones used for programmable function
+           parameters.   However,  only a few <EM>terminfo</EM> capabilities use string
+           parameters (for instance, the ones used for  programmable  function
            keys).
 
            The <EM>ncurses</EM> library checks usage of these capabilities, and returns
-           <STRONG>ERR</STRONG>  if the capability mishandles string parameters.  But it cannot
+           <EM>ERR</EM> if the capability mishandles string parameters.  But it  cannot
            check if a calling program provides strings in the right places for
            the <EM>tparm</EM> calls.
 
-           <EM>ncurses</EM>'s  <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>  checks  its  use  of  these capabilities with a
+           <EM>ncurses</EM>'s <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG> checks its  use  of  these  capabilities  with  a
            table, so that it calls <EM>tparm</EM> correctly.
 
    <STRONG>Special</STRONG> <EM>TERM</EM> <STRONG>treatment</STRONG>
-       If <EM>ncurses</EM> is configured to use the terminal driver, as with the  MinGW
+       If  <EM>ncurses</EM> is configured to use the terminal driver, as with the MinGW
        port,
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG>  interprets  a missing/empty <EM>TERM</EM> variable as the special
+       <STRONG>o</STRONG>   <EM>setupterm</EM> interprets a missing/empty <EM>TERM</EM> variable as  the  special
            value "unknown".
 
            SVr4 <EM>curses</EM> uses the special value "dumb".
 
-           The difference  between  the  two  is  that  the  former  uses  the
-           <STRONG>generic_type</STRONG>  (<STRONG>gn</STRONG>)  <EM>terminfo</EM> capability, while the latter does not.
+           The  difference  between  the  two  is  that  the  former  uses the
+           <STRONG>generic_type</STRONG> (<STRONG>gn</STRONG>) <EM>terminfo</EM> capability, while the latter  does  not.
            A generic terminal is unsuitable for full-screen applications.
 
-       <STRONG>o</STRONG>   <STRONG>setupterm</STRONG> allows explicit use  of  the  Microsoft  Windows  console
-           driver  by  checking  whether the <EM>TERM</EM> environment variable has the
+       <STRONG>o</STRONG>   <EM>setupterm</EM>  allows  explicit  use  of  the Microsoft Windows console
+           driver by checking whether the <EM>TERM</EM> environment  variable  has  the
            value "#win32con" or an abbreviation of that string.
 
 
 </PRE><H3><a name="h3-Other-Portability-Issues">Other Portability Issues</a></H3><PRE>
-       In SVr4, <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM> returns an <EM>int</EM>, <STRONG>OK</STRONG> or  <STRONG>ERR</STRONG>.   We  have  chosen  to
+       In  SVr4,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>  returns  an  <EM>int</EM>, <EM>OK</EM> or <EM>ERR</EM>.  We have chosen to
        implement the X/Open Curses semantics.
 
        In SVr4, the third argument of <EM>tputs</EM> has the type "<STRONG>int</STRONG> <STRONG>(*)(char)</STRONG>".
 
-       At  least one implementation of X/Open Curses (Solaris <EM>xcurses</EM>) returns
-       a value other than <STRONG>OK</STRONG> or <STRONG>ERR</STRONG> from <EM>tputs</EM>.  It instead returns the length
+       At least one implementation of X/Open Curses (Solaris <EM>xcurses</EM>)  returns
+       a value other than <EM>OK</EM> or <EM>ERR</EM> from <EM>tputs</EM>.  It instead returns the length
        of the string, and does no error checking.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2  (1984)  introduced  the <EM>terminfo</EM> feature.  Its programming manual
+       SVr2 (1984) introduced the <EM>terminfo</EM> feature.   Its  programming  manual
        mentioned the following low-level functions.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -587,7 +593,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <EM>vidattr</EM>     like <EM>vidputs</EM>, but output through <EM>putchar</EM>
        <EM>vidputs</EM>     write string to terminal, applying specified attributes
 
-       The programming manual also mentioned functions  provided  for  <EM>termcap</EM>
+       The  programming  manual  also mentioned functions provided for <EM>termcap</EM>
        compatibility (commenting that they "may go away at a later date").
 
        <STRONG>Function</STRONG>   <STRONG>Description</STRONG>
@@ -599,11 +605,11 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <EM>tgoto</EM>      apply parameters to given capability
        <EM>tputs</EM>      write characters via a function parameter, applying padding
 
-       Early  <EM>terminfo</EM>  programs  obtained capability values from the <EM>TERMINAL</EM>
+       Early <EM>terminfo</EM> programs obtained capability values  from  the  <EM>TERMINAL</EM>
        structure initialized by <EM>setupterm</EM>.
 
-       SVr3  (1987)  extended  <EM>terminfo</EM>  by  adding  functions   to   retrieve
-       capability  values  (like the <EM>termcap</EM> interface), and reusing <EM>tgoto</EM> and
+       SVr3   (1987)   extended  <EM>terminfo</EM>  by  adding  functions  to  retrieve
+       capability values (like the <EM>termcap</EM> interface), and reusing  <EM>tgoto</EM>  and
        <EM>tputs</EM>.
 
        <STRONG>Function</STRONG>    <STRONG>Description</STRONG>
@@ -612,7 +618,7 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <EM>tigetnum</EM>    get numeric entry for given <EM>id</EM>
        <EM>tigetstr</EM>    get string entry for given <EM>id</EM>
 
-       SVr3 also replaced several of the SVr2 <EM>terminfo</EM> functions that  had  no
+       SVr3  also  replaced several of the SVr2 <EM>terminfo</EM> functions that had no
        counterpart in the <EM>termcap</EM> interface, documenting them as obsolete.
 
        <STRONG>Function</STRONG>    <STRONG>Replaced</STRONG> <STRONG>by</STRONG>
@@ -625,37 +631,37 @@ <H1 class="no-header">curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <EM>saveterm</EM>    <EM>def</EM><STRONG>_</STRONG><EM>prog</EM><STRONG>_</STRONG><EM>mode</EM>
        <EM>setterm</EM>     <EM>setupterm</EM>
 
-       SVr3  kept  the <EM>mvcur</EM>, <EM>vidattr</EM>, and <EM>vidputs</EM> functions, along with <EM>putp</EM>,
-       <EM>tparm</EM>, and <EM>tputs</EM>.  The latter were needed to support  padding,  and  to
-       handle  capabilities  accessed by functions such as <EM>vidattr</EM> (which used
+       SVr3 kept the <EM>mvcur</EM>, <EM>vidattr</EM>, and <EM>vidputs</EM> functions, along  with  <EM>putp</EM>,
+       <EM>tparm</EM>,  and  <EM>tputs</EM>.   The latter were needed to support padding, and to
+       handle capabilities accessed by functions such as <EM>vidattr</EM>  (which  used
        more than the two parameters supported by <EM>tgoto</EM>).
 
-       SVr3  introduced  the  functions   for   switching   between   terminal
-       descriptions;   for   example,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>.   Some  changes  reflected
+       SVr3   introduced   the   functions   for  switching  between  terminal
+       descriptions;  for  example,  <EM>set</EM><STRONG>_</STRONG><EM>curterm</EM>.   Some   changes   reflected
        incremental improvements to the SVr2 library.
 
-       <STRONG>o</STRONG>   The <EM>TERMINAL</EM> type definition was introduced  in  SVr3.01,  for  the
+       <STRONG>o</STRONG>   The  <EM>TERMINAL</EM>  type  definition  was introduced in SVr3.01, for the
            <EM>term</EM> structure provided in SVr2.
 
-       <STRONG>o</STRONG>   Various  global  variables  such as <EM>boolnames</EM> were mentioned in the
-           programming manual at this point, though  the  variables  had  been
+       <STRONG>o</STRONG>   Various global variables such as <EM>boolnames</EM> were  mentioned  in  the
+           programming  manual  at  this  point, though the variables had been
            provided in SVr2.
 
        SVr4 (1989) added the <EM>vid</EM><STRONG>_</STRONG><EM>attr</EM> and <EM>vid</EM><STRONG>_</STRONG><EM>puts</EM> functions.
 
-       Other  low-level  functions  are declared in the <EM>curses</EM> header files of
-       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+       Other low-level functions are declared in the <EM>curses</EM>  header  files  of
+       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
        SVr3 remained in use by System V's <STRONG>vi(1)</STRONG> editor.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,   <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,   <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>,   <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,   <STRONG>putc(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-12-28                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index efb6149ca..1a0fc4c9f 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp @
+  * @Id: curs_touch.3x,v 1.63 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_touch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_touch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 
@@ -89,43 +89,48 @@ <H1 class="no-header">curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All  routines  return the integer <STRONG>ERR</STRONG> upon failure and an integer value
-       other than <STRONG>ERR</STRONG> upon successful completion, unless  otherwise  noted  in
-       the preceding routine descriptions.
+       Functions  returning  integers  return  <STRONG>ERR</STRONG>  upon  failure  and <STRONG>OK</STRONG> upon
+       success.
 
-       In this implementation
+       In <EM>ncurses</EM>,
 
           <STRONG>is_linetouched</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  window  pointer  is null, or if the line
+               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
                number is outside the window boundaries.
 
                The constant <STRONG>ERR</STRONG> is distinct from <STRONG>TRUE</STRONG> and <STRONG>FALSE</STRONG>, which are the
-               normal  return  values  of this function.  Because the function
+               normal return values of this function.   Because  the  function
                returns a <STRONG>bool</STRONG>, returning <STRONG>ERR</STRONG> (which is neither <STRONG>TRUE</STRONG> nor <STRONG>FALSE</STRONG>)
                may not be supported by the compiler.
 
-               To  provide  error-checking  and also match the X/Open function
+               To provide error-checking and also match  the  X/Open  function
                prototype, the <STRONG>ERR</STRONG> is provided by a macro named <STRONG>is_linetouched</STRONG>.
                The actual function returns <STRONG>FALSE</STRONG> when it detects an error.
 
           <STRONG>wtouchln</STRONG>
-               returns  <STRONG>ERR</STRONG>  if  the  window  pointer  is null, or if the line
+               returns <STRONG>ERR</STRONG> if the window pointer  is  null,  or  if  the  line
                number is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       All of these routines except <STRONG>wtouchln</STRONG> may be macros.
+       All of these functions except <STRONG>wtouchln</STRONG> may be implemented as macros.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions were introduced by SVr4.   The  Solaris  <EM>curses</EM>  header
-       file, for instance, defines both an actual function and macro for each.
-       The macros give the same result as the actual functions.   SVr4  <EM>curses</EM>
-       does  not check the window parameter <EM>win</EM> to ensure that it is not <EM>NULL</EM>;
-       otherwise this implementation behaves the same as SVr4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       SVr4 describes a successful return value except where "otherwise noted"
+       as "an integer value other than <EM>ERR</EM>".
+
+       SVr4 does not check <EM>win</EM> to ensure that it is not a null pointer.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       SVr2 (1984) introduced <EM>touchwin</EM>,
+
+       SVr3   (1987)   added  <EM>touchline</EM>.   SVr3.1  later  that  year  supplied
+       <EM>is</EM><STRONG>_</STRONG><EM>linetouched</EM>, <EM>is</EM><STRONG>_</STRONG><EM>wintouched</EM>, <EM>untouchwin</EM>, and <EM>wtouchln</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -133,7 +138,7 @@ <H1 class="no-header">curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_touch.3x.html">curs_touch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -143,6 +148,7 @@ <H1 class="no-header">curs_touch 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 6d6abbe16..77bc6aa0d 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp @
+  * @Id: curs_trace.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_trace 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_trace 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 
@@ -121,8 +121,8 @@ <H1 class="no-header">curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Trace-Parameter">Trace Parameter</a></H3><PRE>
-       The trace parameter is  formed  by  OR'ing  values  from  the  list  of
-       <STRONG>TRACE_</STRONG><EM>xxx</EM> definitions in <STRONG>&lt;curses.h&gt;</STRONG>.  These include:
+       The trace parameter is formed by logically  "or"-ing  values  from  the
+       list of <STRONG>TRACE_</STRONG><EM>xxx</EM> definitions in <STRONG>&lt;curses.h&gt;</STRONG>.  These include:
 
        <STRONG>TRACE_DISABLE</STRONG>
             turn off tracing by passing a zero parameter.
@@ -261,7 +261,7 @@ <H1 class="no-header">curs_trace 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index c20721e25..382b1c447 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp @
+  * @Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -56,72 +56,82 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*unctrl(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>wchar_t</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>unctrl(chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <STRONG>wunctrl(cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*keyname(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keyname(int</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>key_name(wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
+       <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
 
        <STRONG>void</STRONG> <STRONG>use_env(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
+       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>putwin(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW</STRONG> <STRONG>*getwin(FILE</STRONG> <STRONG>*</STRONG><EM>filep</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>putwin(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>getwin(FILE</STRONG> <STRONG>*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>delay_output(int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>flushinp(void);</STRONG>
 
-       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
-       <STRONG>void</STRONG> <STRONG>nofilter(void);</STRONG>
-       <STRONG>void</STRONG> <STRONG>use_tioctl(bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>flushinp(void);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
-</PRE><H3><a name="h3-unctrl">unctrl</a></H3><PRE>
-       The   <STRONG>unctrl</STRONG>   routine  returns  a  character  string  as  a  printable
-       representation of the character <EM>ch</EM>:
+</PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
+       <STRONG>unctrl</STRONG>   returns   a   null-terminated   character   string   printably
+       representing the <EM>curses</EM> character <EM>ch</EM>,  often  one  that  originated  in
+       keyboard input; see <STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>.
+
+       <STRONG>o</STRONG>   Printable   characters  represent  themselves  as  a  one-character
+           string.
+
+       <STRONG>o</STRONG>   Control characters are expressed in <STRONG>^</STRONG><EM>X</EM> notation,  where  <EM>X</EM>  is  the
+           printable  symbol  of  the  control  code's  value  plus  32 in the
+           ISO 646/"ASCII" character set.
 
-       <STRONG>o</STRONG>   Printable characters are displayed  as  themselves,  e.g.,  a  one-
-           character string containing the key.
+       <STRONG>o</STRONG>   DEL (character code 127) is represented as <STRONG>^?</STRONG>.
 
-       <STRONG>o</STRONG>   Control characters are displayed in the <STRONG>^</STRONG><EM>X</EM> notation.
+       <STRONG>o</STRONG>   A character code greater than 127 is  represented  in  one  of  two
+           ways.
 
-       <STRONG>o</STRONG>   Printing characters are displayed as is.
+           If  the  screen  has  not  been initialized or is in meta mode (see
+           <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>), it  is  expressed  in  <STRONG>M-</STRONG><EM>X</EM>  notation,  where  X  is  the
+           representation of the code's value minus 128, as described above.
 
-       <STRONG>o</STRONG>   DEL (character 127) is displayed as <STRONG>^?</STRONG>.
+           If the screen is not in meta mode, the character code is assumed to
+           represent itself.  It nevertheless may not be  printable;  this  is
+           the case for character codes 128-159 in ISO 8859 encodings.
 
-       <STRONG>o</STRONG>   Values  above 128 are either meta characters (if the screen has not
-           been initialized, or if  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  has  been  called  with  a  <STRONG>TRUE</STRONG>
-           parameter),  shown  in  the  <STRONG>M-</STRONG><EM>X</EM>  notation,  or  are  displayed  as
-           themselves.  In the latter case, the values may not  be  printable;
-           this follows the X/Open specification.
+           <EM>ncurses</EM>'s   <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   function   configures  <STRONG>unctrl</STRONG>'s
+           handling of these character codes.
 
-       The  corresponding  <STRONG>wunctrl</STRONG>  returns  a  printable  representation of a
-       complex character <EM>wch</EM>.
+       <STRONG>wunctrl</STRONG>  returns  a  null-terminated  wide-character  string  printably
+       representing the <EM>curses</EM> complex character <EM>wch</EM>.
 
-       In both <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> the attributes and color associated with the
-       character parameter are ignored.
+       Both  functions  ignore the atributes and color pair selection of their
+       argument.
 
 
 </PRE><H3><a name="h3-keyname_key_name">keyname, key_name</a></H3><PRE>
        The <STRONG>keyname</STRONG> routine returns a character string corresponding to the key
        <EM>c</EM>.  Key codes are different from character codes.
 
-       <STRONG>o</STRONG>   Key codes below 256  are  characters.   They  are  displayed  using
+       <STRONG>o</STRONG>   Key  codes  below  256  are  characters.   They are displayed using
            <STRONG>unctrl</STRONG>.
 
-       <STRONG>o</STRONG>   Values  above 256 may be the codes for function keys.  The function
+       <STRONG>o</STRONG>   Values above 256 may be the codes for function keys.  The  function
            key name is displayed.
 
-       <STRONG>o</STRONG>   Otherwise (if there is no corresponding name and the key is  not  a
-           character)  the  function returns null, to denote an error.  X/Open
-           also  lists   an   "UNKNOWN   KEY"   return   value,   which   some
+       <STRONG>o</STRONG>   Otherwise  (if  there is no corresponding name and the key is not a
+           character) the function returns null, to denote an  error.   X/Open
+           also   lists   an   "UNKNOWN   KEY"   return   value,   which  some
            implementations return rather than null.
 
-       The   corresponding  <STRONG>key_name</STRONG>  returns  a  multibyte  character  string
-       corresponding to  the  wide-character  value  <EM>wc</EM>.   The  two  functions
+       The  corresponding  <STRONG>key_name</STRONG>  returns  a  multibyte  character   string
+       corresponding  to  the  wide-character  value  <EM>wc</EM>.   The  two functions
        (<STRONG>keyname</STRONG> and <STRONG>key_name</STRONG>) do not return the same set of strings:
 
        <STRONG>o</STRONG>   <STRONG>keyname</STRONG> returns null where <STRONG>key_name</STRONG> would display a meta character.
@@ -130,7 +140,7 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-filter_nofilter">filter, nofilter</a></H3><PRE>
-       The  <STRONG>filter</STRONG>  routine, if used, must be called before <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>
+       The <STRONG>filter</STRONG> routine, if used, must be called before <STRONG>initscr</STRONG>  or  <STRONG>newterm</STRONG>
        are called.  Calling <STRONG>filter</STRONG> causes these changes in initialization:
 
        <STRONG>o</STRONG>   <STRONG>LINES</STRONG> is set to 1;
@@ -142,30 +152,30 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   and the <STRONG>home</STRONG> string is set to the value of <STRONG>cr</STRONG>.
 
-       The  <STRONG>nofilter</STRONG>  routine  cancels  the effect of a preceding <STRONG>filter</STRONG> call.
-       That allows the caller to initialize a screen on  a  different  device,
-       using  a  different  value of <STRONG>$TERM</STRONG>.  The limitation arises because the
+       The <STRONG>nofilter</STRONG> routine cancels the effect of  a  preceding  <STRONG>filter</STRONG>  call.
+       That  allows  the  caller to initialize a screen on a different device,
+       using a different value of <STRONG>$TERM</STRONG>.  The limitation  arises  because  the
        <STRONG>filter</STRONG> routine modifies the in-memory copy of the terminal information.
 
 
 </PRE><H3><a name="h3-use_env">use_env</a></H3><PRE>
-       The <STRONG>use_env</STRONG> routine, if  used,  should  be  called  before  <STRONG>initscr</STRONG>  or
-       <STRONG>newterm</STRONG>  are  called  (because  those  compute  the  screen  size).  It
-       modifies the way <EM>ncurses</EM> treats environment variables when  determining
+       The  <STRONG>use_env</STRONG>  routine,  if  used,  should  be  called before <STRONG>initscr</STRONG> or
+       <STRONG>newterm</STRONG> are  called  (because  those  compute  the  screen  size).   It
+       modifies  the way <EM>ncurses</EM> treats environment variables when determining
        the screen size.
 
-       <STRONG>o</STRONG>   Normally  <EM>ncurses</EM>  looks  first  at  the  terminal database for the
+       <STRONG>o</STRONG>   Normally <EM>ncurses</EM> looks first  at  the  terminal  database  for  the
            screen size.
 
-           If <STRONG>use_env</STRONG> was called with  <STRONG>FALSE</STRONG>  for  parameter,  it  stops  here
+           If  <STRONG>use_env</STRONG>  was  called  with  <STRONG>FALSE</STRONG>  for parameter, it stops here
            unless <STRONG>use_tioctl</STRONG> was also called with <STRONG>TRUE</STRONG> for parameter.
 
-       <STRONG>o</STRONG>   Then  it  asks  for the screen size via operating system calls.  If
+       <STRONG>o</STRONG>   Then it asks for the screen size via operating  system  calls.   If
            successful, it overrides the values from the terminal database.
 
-       <STRONG>o</STRONG>   Finally (unless <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG>  parameter),  <EM>ncurses</EM>
-           examines  the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables, using a value
-           in those to override the  results  from  the  operating  system  or
+       <STRONG>o</STRONG>   Finally  (unless  <STRONG>use_env</STRONG> was called with <STRONG>FALSE</STRONG> parameter), <EM>ncurses</EM>
+           examines the <EM>LINES</EM> or <EM>COLUMNS</EM> environment variables, using a  value
+           in  those  to  override  the  results  from the operating system or
            terminal database.
 
            <EM>curses</EM> also updates the screen size in response to <STRONG>SIGWINCH</STRONG>, unless
@@ -173,176 +183,184 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-use_tioctl">use_tioctl</a></H3><PRE>
-       The <STRONG>use_tioctl</STRONG> routine, if used, should be  called  before  <STRONG>initscr</STRONG>  or
-       <STRONG>newterm</STRONG>  are  called  (because  those  compute the screen size).  After
-       <STRONG>use_tioctl</STRONG> is called with <STRONG>TRUE</STRONG> as an  argument,  <EM>ncurses</EM>  modifies  the
+       The  <STRONG>use_tioctl</STRONG>  routine,  if  used, should be called before <STRONG>initscr</STRONG> or
+       <STRONG>newterm</STRONG> are called (because those  compute  the  screen  size).   After
+       <STRONG>use_tioctl</STRONG>  is  called  with  <STRONG>TRUE</STRONG> as an argument, <EM>ncurses</EM> modifies the
        last step in its computation of screen size as follows:
 
-       <STRONG>o</STRONG>   checks  if the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables are set to a
-           number greater than zero.
+       <STRONG>o</STRONG>   checks whether the <EM>LINES</EM> and <EM>COLUMNS</EM> environment variables are  set
+           to a number greater than zero.
 
-       <STRONG>o</STRONG>   for each, <EM>ncurses</EM> updates the  corresponding  environment  variable
-           with  the  value  that it has obtained via operating system call or
+       <STRONG>o</STRONG>   for  each,  <EM>ncurses</EM>  updates the corresponding environment variable
+           with the value that it has obtained via operating  system  call  or
            from the terminal database.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM> re-fetches the value of the environment variables  so  that
+       <STRONG>o</STRONG>   <EM>ncurses</EM>  re-fetches  the value of the environment variables so that
            it is still the environment variables that set the screen size.
 
        The <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> routines combine as follows.
 
               <STRONG>use_env</STRONG>   <STRONG>use_tioctl</STRONG>   <STRONG>Summary</STRONG>
               -----------------------------------------------------------------
-              <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        <EM>ncurses</EM>   uses   operating  system  calls
-                                     unless overridden  by  <EM>LINES</EM>  or  <EM>COLUMNS</EM>
+              <STRONG>TRUE</STRONG>      <STRONG>FALSE</STRONG>        <EM>ncurses</EM>  uses  operating   system   calls
+                                     unless  overridden  by  <EM>LINES</EM>  or <EM>COLUMNS</EM>
                                      environment variables; default.
-              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  updates  <EM>LINES</EM> and <EM>COLUMNS</EM> based
+              <STRONG>TRUE</STRONG>      <STRONG>TRUE</STRONG>         <EM>ncurses</EM> updates <EM>LINES</EM> and  <EM>COLUMNS</EM>  based
                                      on operating system calls.
-              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM> ignores <EM>LINES</EM> and <EM>COLUMNS</EM>,  using
+              <STRONG>FALSE</STRONG>     <STRONG>TRUE</STRONG>         <EM>ncurses</EM>  ignores <EM>LINES</EM> and <EM>COLUMNS</EM>, using
                                      operating system calls to obtain size.
 
 
 </PRE><H3><a name="h3-putwin_getwin">putwin, getwin</a></H3><PRE>
-       The  <STRONG>putwin</STRONG> routine writes all data associated with window (or pad) <EM>win</EM>
-       into the file to which <EM>filep</EM> points.  This  information  can  be  later
+       The <STRONG>putwin</STRONG> routine writes all data associated with window (or pad)  <EM>win</EM>
+       into  the  file  to  which <EM>filep</EM> points.  This information can be later
        retrieved using the <STRONG>getwin</STRONG> function.
 
-       The  <STRONG>getwin</STRONG>  routine  reads  window  related data stored in the file by
-       <STRONG>putwin</STRONG>.  The routine then creates and initializes a  new  window  using
-       that  data.   It  returns a pointer to the new window.  There are a few
+       The <STRONG>getwin</STRONG> routine reads window related data  stored  in  the  file  by
+       <STRONG>putwin</STRONG>.   The  routine  then creates and initializes a new window using
+       that data.  It returns a pointer to the new window.  There  are  a  few
        caveats:
 
-       <STRONG>o</STRONG>   the data written is  a  copy  of  the  <EM>WINDOW</EM>  structure,  and  its
-           associated  character  cells.  The format differs between the wide-
-           character (<EM>ncursesw</EM>) and non-wide  (<EM>ncurses</EM>)  libraries.   You  can
+       <STRONG>o</STRONG>   the  data  written  is  a  copy  of  the  <EM>WINDOW</EM> structure, and its
+           associated character cells.  The format differs between  the  wide-
+           character  (<EM>ncursesw</EM>)  and  non-wide  (<EM>ncurses</EM>) libraries.  You can
            transfer data between the two, however.
 
-       <STRONG>o</STRONG>   the  retrieved  window  is always created as a top-level window (or
+       <STRONG>o</STRONG>   the retrieved window is always created as a  top-level  window  (or
            pad), rather than a subwindow.
 
-       <STRONG>o</STRONG>   the window's character cells contain the color pair <EM>value</EM>, but  not
-           the  actual  color  <EM>numbers</EM>.   If cells in the retrieved window use
-           color pairs that have not been created  in  the  application  using
+       <STRONG>o</STRONG>   the  window's character cells contain the color pair <EM>value</EM>, but not
+           the actual color <EM>numbers</EM>.  If cells in  the  retrieved  window  use
+           color  pairs  that  have  not been created in the application using
            <STRONG>init_pair</STRONG>, they will not be colored when the window is refreshed.
 
 
 </PRE><H3><a name="h3-delay_output">delay_output</a></H3><PRE>
-       The  <STRONG>delay_output</STRONG>  routine  inserts  an <EM>ms</EM> millisecond pause in output.
-       Employ this function judiciously when  terminal  output  uses  padding,
-       because  <EM>ncurses</EM>  transmits  null  characters  (consuming  CPU  and I/O
-       resources) instead of  sleeping  and  requesting  resumption  from  the
+       The <STRONG>delay_output</STRONG> routine inserts an <EM>ms</EM>  millisecond  pause  in  output.
+       Employ  this  function  judiciously  when terminal output uses padding,
+       because <EM>ncurses</EM>  transmits  null  characters  (consuming  CPU  and  I/O
+       resources)  instead  of  sleeping  and  requesting  resumption from the
        operating system.  Padding is used unless:
 
        <STRONG>o</STRONG>   the terminal description has <STRONG>npc</STRONG> (<STRONG>no_pad_char</STRONG>) capability, or
 
        <STRONG>o</STRONG>   the environment variable <STRONG>NCURSES_NO_PADDING</STRONG> is set.
 
-       If  padding is not in use, <EM>ncurses</EM> uses <STRONG>napms</STRONG> to perform the delay.  If
-       the value of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped  at  that
+       If padding is not in use, <EM>ncurses</EM> uses <STRONG>napms</STRONG> to perform the delay.   If
+       the  value  of <EM>ms</EM> exceeds 30,000 (thirty seconds), it is capped at that
        value.
 
 
 </PRE><H3><a name="h3-flushinp">flushinp</a></H3><PRE>
-       The  <STRONG>flushinp</STRONG>  routine throws away any typeahead that has been typed by
+       The <STRONG>flushinp</STRONG> routine throws away any typeahead that has been  typed  by
        the user and has not yet been read by the program.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Except for <STRONG>flushinp</STRONG>, routines that return an integer  return  <STRONG>ERR</STRONG>  upon
-       failure  and <STRONG>OK</STRONG> (SVr4 specifies only "an integer value other than <STRONG>ERR</STRONG>")
-       upon successful completion.
+       Except  for  <STRONG>flushinp</STRONG>,  functions  that return integers return <STRONG>ERR</STRONG> upon
+       failure and <STRONG>OK</STRONG> upon success.
+
+       Functions that return pointers return <EM>NULL</EM> on error.
+
+       In <EM>ncurses</EM>,
 
-       Routines that return pointers return <EM>NULL</EM> on error.
+       <STRONG>o</STRONG>   <STRONG>flushinp</STRONG> returns <STRONG>ERR</STRONG> if the terminal was not initialized, and
 
-       In this implementation
+       <STRONG>o</STRONG>   <STRONG>putwin</STRONG> returns <STRONG>ERR</STRONG> if its associated <STRONG>write(2)</STRONG> calls return <STRONG>ERR</STRONG>.
 
-          <STRONG>flushinp</STRONG>
-               returns <STRONG>ERR</STRONG> if the terminal was not initialized.
 
-          <STRONG>putwin</STRONG>
-               returns <STRONG>ERR</STRONG> if the associated <STRONG>write(2)</STRONG> calls return <STRONG>ERR</STRONG>.
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <STRONG>wunctrl</STRONG> is part of <EM>ncurses</EM>'s wide-character API, and is  not  available
+       in its non-wide configuration.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than <EM>ERR</EM>".
+
 
 </PRE><H3><a name="h3-filter">filter</a></H3><PRE>
-       The SVr4 documentation describes the  action  of  <STRONG>filter</STRONG>  only  in  the
-       vaguest  terms.   The  description  here  is adapted from X/Open Curses
+       The  SVr4  documentation  describes  the  action  of <STRONG>filter</STRONG> only in the
+       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
        (which erroneously fails to describe the disabling of <STRONG>cuu</STRONG>).
 
 
 </PRE><H3><a name="h3-delay_output-padding">delay_output padding</a></H3><PRE>
-       The limitation to 30 seconds and the use of  <STRONG>napms</STRONG>  differ  from  other
+       The  limitation  to  30  seconds and the use of <STRONG>napms</STRONG> differ from other
        implementations.
 
        <STRONG>o</STRONG>   SVr4 curses does not delay if no padding character is available.
 
-       <STRONG>o</STRONG>   NetBSD  curses  uses  <STRONG>napms</STRONG> when no padding character is available,
-           but does not take  timing  into  account  when  using  the  padding
+       <STRONG>o</STRONG>   NetBSD curses uses <STRONG>napms</STRONG> when no padding  character  is  available,
+           but  does  not  take  timing  into  account  when using the padding
            character.
 
        Neither limits the delay.
 
 
 </PRE><H3><a name="h3-keyname">keyname</a></H3><PRE>
-       The  <STRONG>keyname</STRONG>  function  may  return  the  names  of user-defined string
-       capabilities that are defined in the terminfo entry via the  <STRONG>-x</STRONG>  option
-       of  <STRONG>tic</STRONG>.   This  implementation  automatically  assigns at run-time key
+       The <STRONG>keyname</STRONG> function  may  return  the  names  of  user-defined  string
+       capabilities  that  are defined in the terminfo entry via the <STRONG>-x</STRONG> option
+       of <STRONG>tic</STRONG>.  This implementation  automatically  assigns  at  run-time  key
        codes to user-defined strings that begin with "k".  The key codes 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   that   have  been  loaded.   The  <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
-       function controls  whether  this  data  is  loaded  when  the  terminal
+       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  that  have  been  loaded.    The   <STRONG><A HREF="curs_extend.3x.html">use_extended_names(3x)</A></STRONG>
+       function  controls  whether  this  data  is  loaded  when  the terminal
        description is read by the library.
 
 
 </PRE><H3><a name="h3-nofilter_use_tioctl">nofilter, use_tioctl</a></H3><PRE>
-       The  <STRONG>nofilter</STRONG>  and  <STRONG>use_tioctl</STRONG>  routines are specific to <EM>ncurses</EM>.  They
-       were not supported on Version 7, BSD or System V  implementations.   It
-       is  recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions be
+       The <STRONG>nofilter</STRONG> and <STRONG>use_tioctl</STRONG> routines are  specific  to  <EM>ncurses</EM>.   They
+       were  not  supported on Version 7, BSD or System V implementations.  It
+       is recommended  that  any  code  depending  on  <EM>ncurses</EM>  extensions  be
        conditioned using <STRONG>NCURSES_VERSION</STRONG>.
 
 
 </PRE><H3><a name="h3-putwin_getwin-file-format">putwin/getwin file-format</a></H3><PRE>
        The <STRONG>putwin</STRONG> and <STRONG>getwin</STRONG> functions have several issues with portability:
 
-       <STRONG>o</STRONG>   The  files  written  and   read   by   these   functions   use   an
-           implementation-specific  format.  Although the format is an obvious
+       <STRONG>o</STRONG>   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 <STRONG>scr_init</STRONG>, etc.) originated with
+           Interestingly  enough,  according to the copyright dates in Solaris
+           source, the functions (along with <STRONG>scr_init</STRONG>, etc.)  originated  with
            the University of California, Berkeley (in 1982) and were later (in
-           1988)  incorporated  into SVr4.  Oddly, there are no such functions
+           1988) incorporated into SVr4.  Oddly, there are no  such  functions
            in the 4.3BSD curses sources.
 
        <STRONG>o</STRONG>   Most implementations simply dump the binary <EM>WINDOW</EM> structure to the
-           file.   These  include SVr4 <EM>curses</EM>, NetBSD <EM>curses</EM>, and <EM>PDCurses</EM>, as
-           well as older <EM>ncurses</EM> versions.  This implementation  (as  well  as
-           the  X/Open  variant  of  Solaris  curses, dated 1995) uses textual
+           file.  These include SVr4 <EM>curses</EM>, NetBSD <EM>curses</EM>, and  <EM>PDCurses</EM>,  as
+           well  as  older  <EM>ncurses</EM> versions.  This implementation (as well as
+           the X/Open variant of Solaris  curses,  dated  1995)  uses  textual
            dumps.
 
-           The implementations that use binary dumps use  block-I/O  (<STRONG>write(2)</STRONG>
+           The  implementations  that use binary dumps use block-I/O (<STRONG>write(2)</STRONG>
            and <STRONG>read(2)</STRONG> 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.  However, reading from a 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.  However,  reading  from  a  file
            written using mixed schemes may not be successful.
 
 
 </PRE><H3><a name="h3-unctrl_wunctrl">unctrl, wunctrl</a></H3><PRE>
-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error  conditions  for  them.   It  states that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will
-       return a null pointer if unsuccessful.  This implementation checks  for
-       three cases:
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.  It states that <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> will  return  a
+       null  pointer  if  unsuccessful.   This implementation checks for three
+       cases:
 
-       <STRONG>o</STRONG>   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+       <STRONG>o</STRONG>   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
            X/Open Curses documented.
 
        <STRONG>o</STRONG>   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  has  been  called with a <STRONG>2</STRONG> parameter, <STRONG>unctrl</STRONG>
-           returns the  parameter,  i.e.,  a  one-character  string  with  the
-           parameter  as  the  first  character.   Otherwise, it returns "~@",
+           <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> has been called with a  <STRONG>2</STRONG>  parameter,  <STRONG>unctrl</STRONG>
+           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 <STRONG>unctrl</STRONG> can be called before
@@ -353,33 +371,33 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
            pointer.
 
        The strings returned by <STRONG>unctrl</STRONG> 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  printable.
-       This  implementation  uses  8  bits  but  does not modify the string to
-       reflect locale.  The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows  the  caller
+       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 printable.
+       This implementation uses 8 bits but  does  not  modify  the  string  to
+       reflect  locale.   The <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG> function allows the caller
        to change the output of <STRONG>unctrl</STRONG>.
 
-       Likewise,  the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the output
-       of <STRONG>keyname</STRONG>, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
-       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>  and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  succeed  only  after  curses   is
-       initialized.   X/Open  Curses  does not document the treatment of codes
+       Likewise, the <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG> function allows the caller to change the  output
+       of  <STRONG>keyname</STRONG>,  i.e.,  it  determines  whether to use the "M-" prefix for
+       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+       <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>   and  <STRONG><A HREF="curs_inopts.3x.html">meta(3x)</A></STRONG>  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 <STRONG>keyname</STRONG> is called
-       before   initializing  curses),  this  implementation  returns  strings
+       before  initializing  curses),  this  implementation  returns   strings
        "M-^@", "M-^A", etc.
 
        X/Open Curses documents <STRONG>unctrl</STRONG> as declared in <STRONG>&lt;unctrl.h&gt;</STRONG>, which <EM>ncurses</EM>
-       does.   However,  <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>, matching the
+       does.  However, <EM>ncurses</EM>' <STRONG>&lt;curses.h&gt;</STRONG> includes <STRONG>&lt;unctrl.h&gt;</STRONG>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
 </PRE><H3><a name="h3-use_env_use_tioctl">use_env, use_tioctl</a></H3><PRE>
-       If <EM>ncurses</EM> is configured to provide  the  sp-functions  extension,  the
-       state  of  <STRONG>use_env</STRONG>  and  <STRONG>use_tioctl</STRONG> may be updated before creating each
-       <EM>screen</EM> rather than once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).   This  feature  of
+       If  <EM>ncurses</EM>  is  configured  to provide the sp-functions extension, the
+       state of <STRONG>use_env</STRONG> and <STRONG>use_tioctl</STRONG> may be  updated  before  creating  each
+       <EM>screen</EM>  rather  than  once  only  (<STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>).  This feature of
        <STRONG>use_env</STRONG> is not provided by other implementations of curses.
 
 
@@ -388,8 +406,8 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
        SVr2 (1984) introduced <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
 
-       SVr3  (1987)  added <EM>filter</EM>.  Later that year, SVr3.1 brought <EM>getwin</EM> and
-       <EM>putwin</EM>, reading and writing window dumps with <STRONG>fread(3)</STRONG>  and  <STRONG>fwrite(3)</STRONG>,
+       SVr3 (1987) added <EM>filter</EM>.  Later that year, SVr3.1 brought  <EM>getwin</EM>  and
+       <EM>putwin</EM>,  reading  and writing window dumps with <STRONG>fread(3)</STRONG> and <STRONG>fwrite(3)</STRONG>,
        respectively.
 
        SVr4 (1989) supplied <EM>use</EM><STRONG>_</STRONG><EM>env</EM>.
@@ -406,7 +424,7 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -414,7 +432,7 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
 <ul>
-<li><a href="#h3-unctrl">unctrl</a></li>
+<li><a href="#h3-unctrl_wunctrl">unctrl, wunctrl</a></li>
 <li><a href="#h3-keyname_key_name">keyname, key_name</a></li>
 <li><a href="#h3-filter_nofilter">filter, nofilter</a></li>
 <li><a href="#h3-use_env">use_env</a></li>
@@ -425,6 +443,7 @@ <H1 class="no-header">curs_util 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-filter">filter</a></li>
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
index 8728ded74..4a7f8f4d7 100644
--- a/doc/html/man/curs_variables.3x.html
+++ b/doc/html/man/curs_variables.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp @
+  * @Id: curs_variables.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_variables 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_variables 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
@@ -48,8 +48,8 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
        <EM>bool</EM>,  <EM>chtype</EM>,  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>,  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>, <EM>SCREEN</EM>, <EM>WINDOW</EM>, <STRONG>TRUE</STRONG>, <STRONG>FALSE</STRONG>, <STRONG>ERR</STRONG>, <STRONG>OK</STRONG>,
-       <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, <STRONG>stdscr</STRONG>, <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLS</STRONG>,  <STRONG>LINES</STRONG>,  <STRONG>ESCDELAY</STRONG>,
-       <STRONG>TABSIZE</STRONG> - <EM>curses</EM> data types, constants, and global variables
+       <STRONG>CCHARW_MAX</STRONG>, <STRONG>curscr</STRONG>, <STRONG>newscr</STRONG>, <STRONG>stdscr</STRONG>, <STRONG>COLORS</STRONG>, <STRONG>COLOR_PAIRS</STRONG>,  <STRONG>COLS</STRONG>,  <STRONG>LINES</STRONG>,
+       <STRONG>ESCDELAY</STRONG>, <STRONG>TABSIZE</STRONG> - <EM>curses</EM> data types, constants, and global variables
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
@@ -70,6 +70,9 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
        <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>ERR;</STRONG>
        <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>OK;</STRONG>
 
+       <EM>/*</EM> <EM>extension</EM> <EM>*/</EM>
+       <STRONG>const</STRONG> <EM>/*</EM> <STRONG>...</STRONG> <EM>*/</EM> <STRONG>CCHARW_MAX;</STRONG>
+
        <EM>/*</EM> <EM>variables</EM> <EM>*/</EM>
        <STRONG>int</STRONG> <STRONG>COLORS;</STRONG>
        <STRONG>int</STRONG> <STRONG>COLOR_PAIRS;</STRONG>
@@ -107,6 +110,12 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
        values indicating failure and success, respectively.
 
 
+</PRE><H3><a name="h3-CCHARW_MAX">CCHARW_MAX</a></H3><PRE>
+       This integral value, an <EM>ncurses</EM> extension, contains the maximum  number
+       of  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  wide  characters  that  can  be stored in a <EM>curses</EM> complex
+       character <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+
+
 </PRE><H2><a name="h2-PREDEFINED-TYPES">PREDEFINED TYPES</a></H2><PRE>
 
 </PRE><H3><a name="h3-bool"><EM>bool</EM></a></H3><PRE>
@@ -147,22 +156,24 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 
 </PRE><H2><a name="h2-VARIABLES">VARIABLES</a></H2><PRE>
 
-</PRE><H3><a name="h3-curscr_stdscr_newscr">curscr, stdscr, newscr</a></H3><PRE>
-       The library records updates to the terminal screen in  a  window  named
-       <STRONG>curscr</STRONG>.   This  object  is  referred  to  as  the  "physical screen" in
+</PRE><H3><a name="h3-curscr_newscr_stdscr">curscr, newscr, stdscr</a></H3><PRE>
+       When a <EM>curses</EM> application calls <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, the library
+       creates  a  window  named  <STRONG>stdscr</STRONG> that is the same size as the terminal
+       screen and is the implicit window used by functions that interact  with
+       a  window  but  do  not  take  a parameter identifying one; many <EM>curses</EM>
+       functions use it.  An application need not use <STRONG>stdscr</STRONG>; it might  prefer
+       to tile the display into multiple windows instead.
+
+       The  library  records  updates to the terminal screen in a window named
+       <STRONG>curscr</STRONG>.  This object  is  referred  to  as  the  "physical  screen"  in
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG> and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> collects pending updates to the terminal  screen  in  a  window
-       named  <STRONG>newscr</STRONG>.   This  object is referred to as the "virtual screen" in
-       the <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.  When  the
-       screen  is  refreshed, <EM>curses</EM> determines a minimal set of updates using
+       <EM>ncurses</EM>  collects  pending  updates  to the terminal screen in a window
+       named <STRONG>newscr</STRONG>.  This object is referred to as the  "virtual  screen"  in
+       the  <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, and <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>.  When the
+       screen is refreshed, <EM>curses</EM> determines a minimal set of  updates  using
        the terminal's capabilities to make <STRONG>curscr</STRONG> look like <STRONG>newscr</STRONG>.
 
-       Once <EM>curses</EM> is initialized, it creates a window named  <STRONG>stdscr</STRONG>.   It  is
-       the  same size as the terminal screen and is the default window used by
-       routines that do not take a parameter  identifying  one.   Many  <EM>curses</EM>
-       functions use this window.
-
 
 </PRE><H3><a name="h3-COLORS">COLORS</a></H3><PRE>
        Once  <EM>curses</EM>  is  initialized,  <STRONG>COLORS</STRONG>  contains  the  number of colors
@@ -201,45 +212,54 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
        Either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> initializes <EM>curses</EM>.
 
        If  <EM>ncurses</EM>  is  configured  to  provide  separate  <EM>curses</EM>  and   <EM>tinfo</EM>
-       libraries, most of these variables reside in the former.
+       libraries,  most  of these symbols reside in the former.  The <STRONG>bool</STRONG> data
+       type is used by both.
+
+
+</PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
+       The <STRONG>CCHARW_MAX</STRONG> constant, and <STRONG>ESCDELAY</STRONG>, <STRONG>TABSIZE</STRONG>, and  <STRONG>newscr</STRONG>  variables,
+       are extensions, the first of these originating in <EM>ncurses</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       The  X/Open  Curses  standard  documents all of the foregoing types and
-       symbols except for <STRONG>newscr</STRONG>, <STRONG>TABSIZE</STRONG>, and <STRONG>ESCDELAY</STRONG>.
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       X/Open Curses describes <STRONG>curscr</STRONG> only as "an  internal  data  structure";
-       SVr4   gave  more  details,  noting  its  use  "for  certain  low-level
-       operations like clearing and redrawing a  screen  containing  garbage".
+       The X/Open Curses standard documents all of  the  foregoing  types  and
+       symbols except for <STRONG>CCHARW_MAX</STRONG>, <STRONG>newscr</STRONG>, <STRONG>TABSIZE</STRONG>, and <STRONG>ESCDELAY</STRONG>.
+
+       X/Open  Curses  describes  <STRONG>curscr</STRONG> only as "an internal data structure";
+       SVr4  gave  more  details,  noting  its  use  "for  certain   low-level
+       operations  like  clearing  and redrawing a screen containing garbage".
        Neither specified its interaction with the rest of the interface beyond
        use as an argument to <STRONG><A HREF="curs_outopts.3x.html">clearok(3x)</A></STRONG> and <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>.
 
-       <STRONG>newscr</STRONG> is a feature of SVr4 <EM>curses</EM>.  When refreshing the screen, it  is
-       used  as  a  working area for combining the standard window <STRONG>stdscr</STRONG> with
-       any others the application may have created with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.  When  the
+       <STRONG>newscr</STRONG>  is a feature of SVr4 <EM>curses</EM>.  When refreshing the screen, it is
+       used as a working area for combining the standard  window  <STRONG>stdscr</STRONG>  with
+       any  others the application may have created with <STRONG><A HREF="curs_window.3x.html">newwin(3x)</A></STRONG>.  When the
        update of <STRONG>newscr</STRONG> is complete, <EM>curses</EM> modifies <STRONG>curscr</STRONG> to match <STRONG>newscr</STRONG>.
 
        <STRONG>TABSIZE</STRONG> is a feature of SVr4 <EM>curses</EM>.
 
-       <STRONG>o</STRONG>   SVr4   initially  sets  <STRONG>TABSIZE</STRONG>  from  the  terminal  description's
-           <STRONG>init_tabs</STRONG>  capability.   After  that,  it   can   be   altered   by
+       <STRONG>o</STRONG>   SVr4  initially  sets  <STRONG>TABSIZE</STRONG>  from  the  terminal   description's
+           <STRONG>init_tabs</STRONG>   capability.    After   that,   it  can  be  altered  by
            applications using SVr4 <EM>curses</EM>.
 
-       <STRONG>o</STRONG>   SVr4  <EM>curses</EM>  uses  the value of <STRONG>TABSIZE</STRONG> to compute the position of
-           tab stops when updating both the virtual screen with <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>  and
+       <STRONG>o</STRONG>   SVr4 <EM>curses</EM> uses the value of <STRONG>TABSIZE</STRONG> to compute  the  position  of
+           tab  stops when updating both the virtual screen with <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> and
            the physical screen with <STRONG><A HREF="curs_terminfo.3x.html">mvcur(3x)</A></STRONG>.
 
-       <STRONG>o</STRONG>   <EM>ncurses</EM>  uses  the  value  of  <STRONG>TABSIZE</STRONG>  only  to update the virtual
+       <STRONG>o</STRONG>   <EM>ncurses</EM> uses the value  of  <STRONG>TABSIZE</STRONG>  only  to  update  the  virtual
            screen.   It  uses  the  terminal  description's  "<STRONG>it</STRONG>"  (<STRONG>init_tabs</STRONG>)
-           capability  for  computing hardware tabs (that is, tab stops on the
+           capability for computing hardware tabs (that is, tab stops  on  the
            physical screen).
 
-       <STRONG>o</STRONG>   Other implementations differ.  For instance, NetBSD  <EM>curses</EM>  allows
-           <STRONG>TABSIZE</STRONG>  to  be  set through an environment variable.  <EM>ncurses</EM> does
+       <STRONG>o</STRONG>   Other  implementations  differ.  For instance, NetBSD <EM>curses</EM> allows
+           <STRONG>TABSIZE</STRONG> to be set through an environment  variable.   <EM>ncurses</EM>  does
            not.
 
            NetBSD <EM>curses</EM> does not support hardware tabs; it uses the <STRONG>init_tabs</STRONG>
-           capability  and  the <STRONG>TABSIZE</STRONG> variable only for updating the virtual
+           capability and the <STRONG>TABSIZE</STRONG> variable only for updating  the  virtual
            screen.
 
        <STRONG>ESCDELAY</STRONG> is a feature of AIX <EM>curses</EM>.
@@ -248,25 +268,27 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 
        <STRONG>o</STRONG>   The default value for AIX's <STRONG>ESCDELAY</STRONG> equals 0.1 seconds.
 
-       <STRONG>o</STRONG>   AIX also enforces a limit of 10,000 seconds for  <STRONG>ESCDELAY</STRONG>;  <EM>ncurses</EM>
+       <STRONG>o</STRONG>   AIX  also  enforces a limit of 10,000 seconds for <STRONG>ESCDELAY</STRONG>; <EM>ncurses</EM>
            does not enforce any upper limit.
 
-       <EM>ncurses</EM>  has  long  used <STRONG>ESCDELAY</STRONG> with units of milliseconds, making it
-       impossible to be completely compatible with  AIX.   Consequently,  most
-       users  have  decided  either to override the value, or to rely upon its
+       <EM>ncurses</EM> has long used <STRONG>ESCDELAY</STRONG> with units of  milliseconds,  making  it
+       impossible  to  be  completely compatible with AIX.  Consequently, most
+       users have decided either to override the value, or to  rely  upon  its
        default.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       [UAX #29] "Unicode  Standard  Annex  #29:  Unicode  Text  Segmentation"
+       [UAX  #29]  "Unicode  Standard  Annex  #29:  Unicode Text Segmentation"
        &lt;https://unicode.org/reports/tr29/&gt;
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG> further discusses <STRONG>CCHARW_MAX</STRONG>.
+
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,    <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,    <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
        <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2024-09-21                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -277,6 +299,7 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 <ul>
 <li><a href="#h3-TRUE_FALSE">TRUE, FALSE</a></li>
 <li><a href="#h3-ERR_OK">ERR, OK</a></li>
+<li><a href="#h3-CCHARW_MAX">CCHARW_MAX</a></li>
 </ul>
 </li>
 <li><a href="#h2-PREDEFINED-TYPES">PREDEFINED TYPES</a>
@@ -290,7 +313,7 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 </li>
 <li><a href="#h2-VARIABLES">VARIABLES</a>
 <ul>
-<li><a href="#h3-curscr_stdscr_newscr">curscr, stdscr, newscr</a></li>
+<li><a href="#h3-curscr_newscr_stdscr">curscr, newscr, stdscr</a></li>
 <li><a href="#h3-COLORS">COLORS</a></li>
 <li><a href="#h3-COLOR_PAIRS">COLOR_PAIRS</a></li>
 <li><a href="#h3-COLS_LINES">COLS, LINES</a></li>
@@ -299,6 +322,7 @@ <H1 class="no-header">curs_variables 3x 2024-09-21 ncurses 6.5 Library calls</H1
 </ul>
 </li>
 <li><a href="#h2-NOTES">NOTES</a></li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 1c89eb1a6..89ba90821 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2020-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp @
+  * @Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -158,66 +158,60 @@ <H1 class="no-header">curs_window 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Routines that return an integer return the integer <STRONG>ERR</STRONG> upon failure and
-       <STRONG>OK</STRONG>  (SVr4  only  specifies  "an  integer  value  other  than <STRONG>ERR</STRONG>") upon
-       successful completion.
+       Functions that return integers return <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>  upon
+       success.
 
-       Routines that return pointers return <EM>NULL</EM> on error.
+       Functions that return pointers return <EM>NULL</EM> on error.
 
-       X/Open defines no error conditions.  In this implementation
+       <EM>ncurses</EM> defines several error conditions.
 
-       <STRONG>delwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the window pointer is null, or if the window is the
-            parent of another window.
+       <STRONG>o</STRONG>   <STRONG>delwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer, or if it is the parent
+           of another window.
 
-       <STRONG>derwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the parent window pointer is null, or if any of its
-            ordinates or dimensions is negative, or if  the  resulting  window
-            does not fit inside the parent window.
+           <EM>ncurses</EM> maintains a list of windows, and checks  that  the  pointer
+           passed  to  <STRONG>delwin</STRONG>  is one that it created, returning <STRONG>ERR</STRONG> if it was
+           not.
 
-       <STRONG>dupwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the window pointer is null.
+       <STRONG>o</STRONG>   <STRONG>derwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>orig</EM> is a null pointer,  or  if  any  of  the
+           ordinate  or  dimension  arguments is negative, or if the resulting
+           window does not fit inside the parent window.
 
-            This  implementation  also maintains a list of windows, and checks
-            that the  pointer  passed  to  <STRONG>delwin</STRONG>  is  one  that  it  created,
-            returning an error if it was not..
+       <STRONG>o</STRONG>   <STRONG>dupwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer.
 
-       <STRONG>mvderwin</STRONG>
-            returns  <STRONG>ERR</STRONG> if the window pointer is null, or if some part of the
-            window would be placed off-screen.
+       <STRONG>o</STRONG>   <STRONG>mvderwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer, or if  any  part  of
+           the window would be placed off-screen.
 
-       <STRONG>mvwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the window pointer is null, or  if  the  window  is
-            really  a  pad, or if some part of the window would be placed off-
-            screen.
+       <STRONG>o</STRONG>   <STRONG>mvwin</STRONG>  returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer, if <EM>win</EM> is a pad, or if
+           any part of the window would be placed off-screen.
 
-       <STRONG>newwin</STRONG>
-            will fail if either of its beginning ordinates is negative, or  if
-            either the number of lines or columns is negative.
+       <STRONG>o</STRONG>   <STRONG>newwin</STRONG> returns <STRONG>ERR</STRONG> if any of its arguments is negative.
 
-       <STRONG>syncok</STRONG>
-            returns <STRONG>ERR</STRONG> if the window pointer is null.
+       <STRONG>o</STRONG>   <STRONG>subwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>orig</EM> is a null pointer,  or  if  any  of  the
+           ordinate  or  dimension  arguments is negative, or if the resulting
+           window does not fit inside the parent window.
 
-       <STRONG>subwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the parent window pointer is null, or if any of its
-            ordinates or dimensions is negative, or if  the  resulting  window
-            does not fit inside the parent window.
+       <STRONG>o</STRONG>   <STRONG>syncok</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer.
 
-       The  functions  which return a window pointer may also fail if there is
-       insufficient memory for its data structures.  Any  of  these  functions
-       will fail if the screen has not been initialized, i.e., with <STRONG>initscr</STRONG> or
-       <STRONG>newterm</STRONG>.
+       Functions that return a window pointer fail if  memory  allocation  for
+       their data structures fails.
+
+       All of these functions fail if the screen has not been initialized; see
+       <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       If many small changes are made to the window, the <STRONG>wsyncup</STRONG> option  could
-       degrade performance.
+       <STRONG>syncok</STRONG> may be implemented as a macro.
 
-       Note that <STRONG>syncok</STRONG> may be a macro.
+       Calling <STRONG>syncup</STRONG> on a window and making many small changes  to  it  could
+       degrade performance.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for <EM>delwin</EM>, <EM>derwin</EM>, <EM>dupwin</EM>, <EM>newwin</EM>, <EM>mvderwin</EM>, or <EM>syncok</EM>.
+
+       For functions returning integers  (except  <EM>delwin</EM>),  SVr4  describes  a
+       successful return value only as "an integer value other than <EM>ERR</EM>".
 
        Regarding <EM>delwin</EM>, X/Open Curses states that
 
@@ -248,7 +242,7 @@ <H1 class="no-header">curs_window 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 52fca0a5a..e5123acec 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_opts.3x,v 1.44 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_field_opts.3x,v 1.47 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>              Library calls             <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</H
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_field_opts</STRONG> sets all  the  given  field's  option  bits
-       (field option bits may be logically-OR'ed together).
+       (field option bits may be logically "or"-ed together).
 
        The  function  <STRONG>field_opts_on</STRONG> turns on the given option bits, and leaves
        others alone.
@@ -164,7 +164,7 @@ <H1 class="no-header">form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2024-03-16               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18               <STRONG><A HREF="form_field_opts.3x.html">form_field_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 9dcc76645..967156ff5 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp @
+  * @Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2024-12-28 ncurses 6.5 Library ca
 
 
 
-ncurses 6.5                       2024-12-28         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index cb962dfb1..e590f1d7b 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+  * @Id: form_fieldtype.3x,v 1.51 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>               Library calls              <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 
@@ -136,7 +136,7 @@ <H1 class="no-header">form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</H1
 
 </PRE><H3><a name="h3-link_fieldtype">link_fieldtype</a></H3><PRE>
        The function <STRONG>link_fieldtype</STRONG> creates a new field type from the two given
-       types.  They are connected by an logical 'OR'.
+       types.  They are connected by a logical "or".
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -183,7 +183,7 @@ <H1 class="no-header">form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2024-12-28                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                <STRONG><A HREF="form_fieldtype.3x.html">form_fieldtype(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html
index 63a9437fc..8cc6524a6 100644
--- a/doc/html/man/form_opts.3x.html
+++ b/doc/html/man/form_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_opts.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
+  * @Id: form_opts.3x,v 1.37 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_opts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_opts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_form_opts</STRONG> sets all the given form's option bits  (form
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  <STRONG>form_opts_on</STRONG>  turns on the given option bits, and leaves
        others alone.
@@ -108,7 +108,7 @@ <H1 class="no-header">form_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="form_opts.3x.html">form_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 8c1ef3883..7c464cf3f 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp @
+  * @Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2024-12-28 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2024-12-28 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -218,7 +218,7 @@ <H1 class="no-header">infocmp 1m 2024-12-28 ncurses 6.5 User commands</H1>
        are superfluous.  <STRONG>infocmp</STRONG> will flag any other <EM>terminal-type</EM> <EM>use=</EM> fields
        that were not needed.
 
-   <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <STRONG><EM>directory</EM></STRONG><STRONG>]</STRONG> <STRONG>[-B</STRONG> <STRONG><EM>directory</EM></STRONG><STRONG>]</STRONG>
+   <STRONG>Changing</STRONG> <STRONG>Databases</STRONG> <STRONG>[-A</STRONG> <EM>directory</EM><STRONG>]</STRONG> <STRONG>[-B</STRONG> <EM>directory</EM><STRONG>]</STRONG>
        Like  other  <EM>ncurses</EM>  utilities,  <STRONG>infocmp</STRONG>  looks   for   the   terminal
        descriptions   in  several  places.   You  can  use  the  <EM>TERMINFO</EM>  and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> environment variables to override the compiled-in default
@@ -475,7 +475,7 @@ <H1 class="no-header">infocmp 1m 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses,  Issue 7 (2009) specifies <EM>infocmp</EM>.  It does not mention
+       X/Open  Curses  Issue 7  (2009) specifies <EM>infocmp</EM>.  It does not mention
        options for producing descriptions in <EM>termcap</EM> format.
 
        SVr4  <EM>infocmp</EM>  does  not  distinguish  between  absent   and   canceled
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-12-28                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2025-01-18                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 8831caf53..6ddc58e2e 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp @
+  * @Id: infotocap.1m,v 1.48 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infotocap 1m 2024-07-27 ncurses 6.5 User commands</TITLE>
+<TITLE>infotocap 1m 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infotocap 1m 2024-07-27 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infotocap 1m 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>                    User commands                   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 
@@ -76,7 +76,7 @@ <H1 class="no-header">infotocap 1m 2024-07-27 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       None  of  X/Open  Curses, Issue 7 (2009), SVr4, or NetBSD document this
+       None  of  X/Open  Curses  Issue 7 (2009), SVr4, or NetBSD document this
        application.
 
 
@@ -90,7 +90,7 @@ <H1 class="no-header">infotocap 1m 2024-07-27 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-07-27                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 453526ab2..ffe3a8bf8 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_opts.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
+  * @Id: menu_opts.3x,v 1.38 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>menu_opts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">menu_opts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_menu_opts</STRONG> sets all the given menu's option bits  (menu
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  <STRONG>menu_opts_on</STRONG>  turns on the given option bits, and leaves
        others alone.
@@ -128,7 +128,7 @@ <H1 class="no-header">menu_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                     <STRONG><A HREF="menu_opts.3x.html">menu_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html
index 537a91301..69dfd54ad 100644
--- a/doc/html/man/mitem_opts.3x.html
+++ b/doc/html/man/mitem_opts.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: mitem_opts.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
+  * @Id: mitem_opts.3x,v 1.36 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 
@@ -63,7 +63,7 @@ <H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        The function <STRONG>set_item_opts</STRONG> sets all the given item's option bits  (menu
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  <STRONG>item_opts_on</STRONG>  turns on the given option bits, and leaves
        others alone.
@@ -102,7 +102,7 @@ <H1 class="no-header">mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                    <STRONG><A HREF="mitem_opts.3x.html">mitem_opts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 7bebb469f..b02741a00 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp @
+  * @Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20241228).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20250118).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -214,128 +214,130 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        If  the  environment  variables  <EM>LINES</EM>  and  <EM>COLUMNS</EM> are set, or if the
        <EM>curses</EM> program is executing in a graphical windowing  environment,  the
        information  obtained  thence  overrides that obtained by <EM>terminfo</EM>.  An
-       <EM>ncurses</EM> extension supports resizable terminals; see <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
+       <EM>ncurses</EM>   extension   supports   resizable   terminal   displays;   see
+       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
-       If the environment variable  <EM>TERMINFO</EM>  is  defined,  a  <EM>curses</EM>  program
-       checks  first  for  a  terminal  type  description  in  the location it
-       identifies.  <EM>TERMINFO</EM> is useful for  developing  type  descriptions  or
+       If  the  environment  variable  <EM>TERMINFO</EM>  is  defined, a <EM>curses</EM> program
+       checks first for  a  terminal  type  description  in  the  location  it
+       identifies.   <EM>TERMINFO</EM>  is  useful  for developing type descriptions or
        when write permission to <EM>/usr/share/terminfo</EM> is not available.
 
        See section "ENVIRONMENT" below.
 
 
 </PRE><H3><a name="h3-Naming-Conventions">Naming Conventions</a></H3><PRE>
-       <EM>curses</EM>  offers  many  functions in variant forms using a regular set of
-       alternatives to the name of an elemental one.  Those prefixed with  "w"
-       require  a  <EM>WINDOW</EM>  pointer  argument;  those  with a "mv" prefix first
+       <EM>curses</EM> offers many functions in variant forms using a  regular  set  of
+       alternatives  to the name of an elemental one.  Those prefixed with "w"
+       require a <EM>WINDOW</EM> pointer argument;  those  with  a  "mv"  prefix  first
        perform cursor movement using <STRONG><A HREF="curs_move.3x.html">wmove(3x)</A></STRONG>; a "mvw" prefix indicates both.
-       The  "w"  function  is typically the elemental one; the removal of this
+       The "w" function is typically the elemental one; the  removal  of  this
        prefix usually indicates operation on <STRONG>stdscr</STRONG>.
 
        Four functions prefixed with "p" require a <EM>pad</EM> argument; see below.
 
-       In function synopses, <EM>ncurses</EM> man pages apply the  following  names  to
+       In  function  synopses,  <EM>ncurses</EM> man pages apply the following names to
        parameters.  We introduce the character types in the next subsection.
 
-                       <EM>bf</EM>    a <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
-                       <EM>c</EM>     a <EM>char</EM> or <EM>int</EM>
-                       <EM>ch</EM>    a <EM>chtype</EM>
-                       <EM>wc</EM>    a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> or <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>
-                       <EM>wch</EM>   a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
-                       <EM>win</EM>   pointer to a <EM>WINDOW</EM>
-                       <EM>pad</EM>   pointer to a <EM>WINDOW</EM> that is a pad
+                <EM>bf</EM>     a <EM>bool</EM> (<STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>)
+                <EM>c</EM>      a <EM>char</EM> or <EM>int</EM>
+                <EM>ch</EM>     a <EM>chtype</EM>
+                <EM>wc</EM>     a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> or <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>
+                <EM>wch</EM>    a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>
+                <EM>win</EM>    pointer to a <EM>WINDOW</EM>
+                <EM>pad</EM>    pointer to a <EM>WINDOW</EM> that is a pad
+                <EM>pair</EM>   a foreground/background color pair identifier
 
 
 </PRE><H3><a name="h3-Wide-and-Non-wide-Character-Configurations">Wide and Non-wide Character Configurations</a></H3><PRE>
-       This   man   page  primarily  surveys  functions  that  appear  in  any
+       This  man  page  primarily  surveys  functions  that  appear   in   any
        configuration of the library.  There are two common configurations; see
        section "ALTERNATE CONFIGURATIONS" below.
 
        <EM>ncurses</EM>   is the library in its "non-wide" configuration, handling only
-                 eight-bit characters.  It stores a  character  combined  with
-                 attributes  and  a  color  pair identifier in a <EM>chtype</EM> datum,
+                 eight-bit  characters.   It  stores a character combined with
+                 attributes and a color pair identifier  in  a  <EM>chtype</EM>  datum,
                  which  is  often  an  alias  of  <EM>int</EM>.   A  string  of  <EM>curses</EM>
-                 characters  is  similar  to  a C <EM>char</EM> string; a <EM>chtype</EM> string
+                 characters is similar to a C <EM>char</EM>  string;  a  <EM>chtype</EM>  string
                  ends with an integral <STRONG>0</STRONG>, the null <EM>curses</EM> character.
 
                  Attributes and a color pair identifier (with no corresponding
-                 character)  can  be  stored  in variables of <EM>chtype</EM> or <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
-                 type.  In either case, they are accessed via an integral  bit
+                 character) can be stored in variables  of  <EM>chtype</EM>  or  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>
+                 type.   In either case, they are accessed via an integral bit
                  mask.
 
-                 Each  cell  of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.  X/Open Curses
-                 does not specify the sizes of the  character  code  or  color
-                 pair  identifier,  nor  the  quantity  of  attribute bits, in
-                 <EM>chtype</EM>; these  are  implementation-dependent.   <EM>ncurses</EM>  uses
-                 eight  bits for the character code.  An application requiring
-                 a wider character type, for instance  to  represent  Unicode,
+                 Each cell of a <EM>WINDOW</EM> is stored as a <EM>chtype</EM>.   X/Open  Curses
+                 does  not  specify  the  sizes of the character code or color
+                 pair identifier, nor  the  quantity  of  attribute  bits,  in
+                 <EM>chtype</EM>;  these  are  implementation-dependent.   <EM>ncurses</EM> uses
+                 eight bits for the character code.  An application  requiring
+                 a  wider  character  type, for instance to represent Unicode,
                  should use the wide-character API.
 
-       <EM>ncursesw</EM>  is  the  library  in  its "wide" configuration, which handles
+       <EM>ncursesw</EM>  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than <EM>char</EM> (a
                  byte-sized  type)  can  represent.   It  provides  additional
                  functions that complement those in the non-wide library where
-                 the  size of the underlying character type is significant.  A
-                 somewhat regular naming convention relates many of  the  wide
-                 variants  to  their  non-wide  counterparts; where a non-wide
-                 function name contains "ch" or "str", prefix it with "_w"  to
-                 obtain  the  wide  counterpart.   For example, <STRONG>waddch</STRONG> becomes
+                 the size of the underlying character type is significant.   A
+                 somewhat  regular  naming convention relates many of the wide
+                 variants to their non-wide  counterparts;  where  a  non-wide
+                 function  name contains "ch" or "str", prefix it with "_w" to
+                 obtain the wide counterpart.   For  example,  <STRONG>waddch</STRONG>  becomes
                  <STRONG>wadd_wch</STRONG>.  Another exception is <STRONG>ins_nwstr</STRONG> (and its variants),
-                 spelled  thus  instead  of "insn_wstr".  (Exceptions that add
+                 spelled thus instead of "insn_wstr".   (Exceptions  that  add
                  only "w" comprise <STRONG>addwstr</STRONG>, <STRONG>inwstr</STRONG>, and their variants.)
 
-                 This convention is inapplicable  to  some  non-wide  function
+                 This  convention  is  inapplicable  to some non-wide function
                  names,  so  other  transformations  are  used  for  the  wide
                  configuration:  the  window  background  management  function
-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
-                 -clearing functions are suffixed with "_set";  and  character
-                 attribute   manipulation   functions   like  "attron"  become
+                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+                 -clearing  functions  are suffixed with "_set"; and character
+                 attribute  manipulation  functions   like   "attron"   become
                  "attr_on".
 
                  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  is a <EM>curses</EM> <EM>complex</EM> <EM>character</EM> and corresponds to the
-                          non-wide  configuration's <EM>chtype</EM>.  It is a structure
-                          type  because  it  requires  more  storage  than   a
-                          standard  scalar  type offers.  A character code may
-                          not be representable as a <EM>char</EM>,  and  moreover  more
+                          non-wide configuration's <EM>chtype</EM>.  It is a  structure
+                          type   because  it  requires  more  storage  than  a
+                          standard scalar type offers.  A character  code  may
+                          not  be  representable  as a <EM>char</EM>, and moreover more
                           than one character may occupy a cell (as with accent
-                          marks and other diacritics).  Each character  is  of
+                          marks  and  other diacritics).  Each character is of
                           type  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>;  a  complex  character  contains  one
                           spacing  character  and  zero  or  more  non-spacing
-                          characters   (see   below).   A  string  of  complex
-                          characters ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  member
-                          is  the null wide character.  Attributes and a color
+                          characters  (see  below).   A  string   of   complex
+                          characters  ends with a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> whose <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> member
+                          is the null wide character.  Attributes and a  color
                           pair identifier are stored in separate fields of the
                           structure,  not  combined  into  an  integer  as  in
                           <EM>chtype</EM>.
 
-                 Each cell of a <EM>WINDOW</EM> is stored as a  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.   <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>
+                 Each  cell  of a <EM>WINDOW</EM> is stored as a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.  <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>
                  and <STRONG><A HREF="curs_getcchar.3x.html">getcchar(3x)</A></STRONG> store and retrieve <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM> data.
 
-                 The  wide  library  API  of <EM>ncurses</EM> depends on two data types
+                 The wide library API of <EM>ncurses</EM> depends  on  two  data  types
                  standardized by ISO C95.
 
-                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores a wide character.  Like <EM>chtype</EM>, it may be  an
-                          alias  of <EM>int</EM>.  Depending on the character encoding,
-                          a wide character may be  <EM>spacing</EM>,  meaning  that  it
-                          occupies  a  character  cell by itself and typically
-                          accompanies  cursor  advancement,  or   <EM>non-spacing</EM>,
-                          meaning  that it occupies the same cell as a spacing
-                          character, is often regarded as a "modifier" of  the
-                          base  glyph  with  which  it combines, and typically
+                 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  stores  a wide character.  Like <EM>chtype</EM>, it may be an
+                          alias of <EM>int</EM>.  Depending on the character  encoding,
+                          a  wide  character  may  be <EM>spacing</EM>, meaning that it
+                          occupies a character cell by  itself  and  typically
+                          accompanies   cursor  advancement,  or  <EM>non-spacing</EM>,
+                          meaning that it occupies the same cell as a  spacing
+                          character,  is often regarded as a "modifier" of the
+                          base glyph with which  it  combines,  and  typically
                           does not advance the cursor.
 
-                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can  store  a  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or   the   constant   <EM>WEOF</EM>,
-                          analogously  to the <EM>int</EM>-sized character manipulation
+                 <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>   can   store   a   <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>   or  the  constant  <EM>WEOF</EM>,
+                          analogously to the <EM>int</EM>-sized character  manipulation
                           functions of ISO C and its constant <EM>EOF</EM>.
 
 
 </PRE><H3><a name="h3-Function-Name-Index">Function Name Index</a></H3><PRE>
        The following table lists the <EM>curses</EM> functions provided in the non-wide
-       and  wide  APIs  and  the  corresponding  man pages that describe them.
-       Those flagged with  "*"  are  <EM>ncurses</EM>-specific,  neither  described  by
+       and wide APIs and the  corresponding  man  pages  that  describe  them.
+       Those  flagged  with  "*"  are  <EM>ncurses</EM>-specific,  neither described by
        X/Open Curses nor present in SVr4.
 
-                    <STRONG><EM>curses</EM></STRONG> Function Name     Man Page
+                    <EM>curses</EM> Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
                     PAIR_NUMBER              <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -383,9 +385,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     curses_version           <STRONG><A HREF="curs_extend.3x.html">curs_extend(3x)</A></STRONG>*
                     def_prog_mode            <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     def_shell_mode           <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+
                     define_key               <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>*
                     del_curterm              <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
-
                     delay_output             <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
                     delch                    <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
                     deleteln                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
@@ -450,9 +452,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     immedok                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     in_wch                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
                     in_wchnstr               <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+
                     in_wchstr                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
                     inch                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
-
                     inchnstr                 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     inchstr                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
                     init_color               <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
@@ -517,9 +519,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     mvaddchstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     mvaddnstr                <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddnwstr               <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+
                     mvaddstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     mvaddwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
-
                     mvchgat                  <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
                     mvcur                    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     mvdelch                  <STRONG><A HREF="curs_delch.3x.html">curs_delch(3x)</A></STRONG>
@@ -584,9 +586,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     mvwins_nwstr             <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     mvwins_wch               <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     mvwins_wstr              <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+
                     mvwinsch                 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     mvwinsnstr               <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
-
                     mvwinsstr                <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
                     mvwinstr                 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     mvwinwstr                <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
@@ -651,9 +653,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     slk_attr_on              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attr_set             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attroff              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
+
                     slk_attron               <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_attrset              <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
-
                     slk_clear                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_color                <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     slk_init                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
@@ -718,9 +720,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     wadd_wchnstr             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     wadd_wchstr              <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
                     waddch                   <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+
                     waddchnstr               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
                     waddchstr                <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
-
                     waddnstr                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
                     waddnwstr                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
                     waddstr                  <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
@@ -785,9 +787,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     wnoutrefresh             <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wprintw                  <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>
                     wredrawln                <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
+
                     wrefresh                 <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
                     wresize                  <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>*
-
                     wscanw                   <STRONG><A HREF="curs_scanw.3x.html">curs_scanw(3x)</A></STRONG>
                     wscrl                    <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
                     wsetscrreg               <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
@@ -801,43 +803,43 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                     wvline                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     wvline_set               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
-       <EM>ncurses</EM>'s    <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional   functions
-       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
+       <EM>ncurses</EM>'s   <EM>screen-pointer</EM>   <EM>extension</EM>   adds   additional    functions
+       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
        <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       The  availability  of  some  extensions is configurable when <EM>ncurses</EM> is
-       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
+       The availability of some extensions is  configurable  when  <EM>ncurses</EM>  is
+       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
        below.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       Unless  otherwise  noted,  functions  that  return  integers return the
-       constants <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG>  on  failure;  see  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
-       Functions  that  return  pointers  return  <EM>NULL</EM> on failure.  Typically,
-       <EM>ncurses</EM> treats a null pointer passed  as  a  function  parameter  as  a
-       failure.   Functions  prefixed  with "mv" first perform cursor movement
+       Unless otherwise noted,  functions  that  return  integers  return  the
+       constants  <STRONG>OK</STRONG>  on  success  and <STRONG>ERR</STRONG> on failure; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       Functions that return pointers  return  <EM>NULL</EM>  on  failure.   Typically,
+       <EM>ncurses</EM>  treats  a  null  pointer  passed  as a function parameter as a
+       failure.  Functions prefixed with "mv" first  perform  cursor  movement
        and fail if the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       The following  symbols  from  the  process  environment  customize  the
-       runtime   behavior   of  <EM>ncurses</EM>  applications.   The  library  may  be
-       configured  to  disregard  the   variables   <EM>TERMINFO</EM>,   <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
-       <EM>TERMPATH</EM>,  and  <EM>HOME</EM>,  if  the  user  is  the  superuser (root), or the
+       The  following  symbols  from  the  process  environment  customize the
+       runtime  behavior  of  <EM>ncurses</EM>  applications.   The  library   may   be
+       configured   to   disregard   the  variables  <EM>TERMINFO</EM>,  <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM>,
+       <EM>TERMPATH</EM>, and <EM>HOME</EM>, if  the  user  is  the  superuser  (root),  or  the
        application uses <STRONG>setuid(2)</STRONG> or <STRONG>setgid(2)</STRONG>.
 
 
 </PRE><H3><a name="h3-BAUDRATE"><EM>BAUDRATE</EM></a></H3><PRE>
-       The debugging library checks this variable  when  the  application  has
-       redirected  output to a file.  <EM>ncurses</EM> interprets its integral value as
-       the terminal's line speed in bits per second.  If that value is  absent
-       or  invalid,  <EM>ncurses</EM>  uses  9600.   This  feature allows developers to
-       construct repeatable test cases that  take  into  account  optimization
+       The  debugging  library  checks  this variable when the application has
+       redirected output to a file.  <EM>ncurses</EM> interprets its integral value  as
+       the  terminal's line speed in bits per second.  If that value is absent
+       or invalid, <EM>ncurses</EM> uses  9600.   This  feature  allows  developers  to
+       construct  repeatable  test  cases  that take into account optimization
        decisions that depend on the terminal's line speed.
 
 
 </PRE><H3><a name="h3-CC-_command-character_"><EM>CC</EM> (command character)</a></H3><PRE>
-       When  set,  the  <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability value of loaded
+       When set, the <STRONG>command_character</STRONG>  (<STRONG>cmdch</STRONG>)  capability  value  of  loaded
        <EM>terminfo</EM> entries changes to the value of this variable.  Very few <EM>term-</EM>
        <EM>info</EM> entries provide this feature.
 
@@ -848,192 +850,192 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-COLUMNS"><EM>COLUMNS</EM></a></H3><PRE>
        This  variable  specifies  the  width  of  the  screen  in  characters.
-       Applications running in a windowing environment  usually  are  able  to
-       obtain  the  width  of the window in which they are executing.  <EM>ncurses</EM>
-       enforces an upper limit of 512 when reading the value.  If  <EM>COLUMNS</EM>  is
-       not  defined  and  the terminal's screen size is not available from the
-       terminal driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG>  (<STRONG>cols</STRONG>)
-       capability  of  the  terminal type's entry in the <EM>terminfo</EM> database, if
+       Applications  running  in  a  windowing environment usually are able to
+       obtain the width of the window in which they  are  executing.   <EM>ncurses</EM>
+       enforces  an  upper limit of 512 when reading the value.  If <EM>COLUMNS</EM> is
+       not defined and the terminal's screen size is not  available  from  the
+       terminal  driver, <EM>ncurses</EM> uses the size specified by the <STRONG>columns</STRONG> (<STRONG>cols</STRONG>)
+       capability of the terminal type's entry in the  <EM>terminfo</EM>  database,  if
        any.
 
-       It is important that your application  use  the  correct  screen  size.
-       Automatic   detection   thereof  is  not  always  possible  because  an
-       application may  be  running  on  a  host  that  does  not  honor  NAWS
-       (Negotiations  About  Window  Size)  or as a different user ID than the
-       owner of the  terminal  device  file.   Setting  <EM>COLUMNS</EM>  and/or  <EM>LINES</EM>
-       overrides  the  library's  use  of  the  screen  size obtained from the
+       It  is  important  that  your  application use the correct screen size.
+       Automatic  detection  thereof  is  not  always  possible   because   an
+       application  may  be  running  on  a  host  that  does  not  honor NAWS
+       (Negotiations About Window Size) or as a different  user  ID  than  the
+       owner  of  the  terminal  device  file.   Setting  <EM>COLUMNS</EM> and/or <EM>LINES</EM>
+       overrides the library's use  of  the  screen  size  obtained  from  the
        operating system.
 
-       The <EM>COLUMNS</EM> and <EM>LINES</EM> variables may be specified  independently.   This
-       property  is  useful  to circumvent misfeatures of legacy terminal type
-       descriptions; <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were  once
-       notorious.    For   best  results,  avoid  specifying  <STRONG>cols</STRONG>  and  <STRONG>lines</STRONG>
+       The  <EM>COLUMNS</EM>  and <EM>LINES</EM> variables may be specified independently.  This
+       property is useful to circumvent misfeatures of  legacy  terminal  type
+       descriptions;  <STRONG>xterm(1)</STRONG>  descriptions  specifying  65  lines  were once
+       notorious.   For  best  results,  avoid  specifying  <STRONG>cols</STRONG>   and   <STRONG>lines</STRONG>
        capability codes in <EM>terminfo</EM> descriptions of terminal emulators.
 
-       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG> can disable use of the process environment  in  determining
-       the  screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to match
+       <STRONG><A HREF="curs_util.3x.html">use_env(3x)</A></STRONG>  can  disable use of the process environment in determining
+       the screen size.  <STRONG><A HREF="curs_util.3x.html">use_tioctl(3x)</A></STRONG> can update <EM>COLUMNS</EM> and <EM>LINES</EM> to  match
        the screen size obtained from system calls or the terminal database.
 
 
 </PRE><H3><a name="h3-ESCDELAY"><EM>ESCDELAY</EM></a></H3><PRE>
-       For <EM>curses</EM> to distinguish the ESC character  resulting  from  a  user's
-       press  of  the  "Escape"  key on the input device from one beginning an
+       For  <EM>curses</EM>  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
        <EM>escape</EM> <EM>sequence</EM> (as commonly produced by function keys), it waits after
-       receiving  the  escape  character  to  see  if  further  characters are
-       available on the input  stream  within  a  short  interval.   A  global
-       variable  <STRONG>ESCDELAY</STRONG>  stores  this interval in milliseconds.  The default
+       receiving the  escape  character  to  see  if  further  characters  are
+       available  on  the  input  stream  within  a  short interval.  A global
+       variable <STRONG>ESCDELAY</STRONG> stores this interval in  milliseconds.   The  default
        value of 1000 (one second) is adequate for most uses.  This environment
-       variable  overrides  it;  <EM>ncurses</EM> enforces an upper limit of 30,000 (30
+       variable overrides it; <EM>ncurses</EM> enforces an upper limit  of  30,000  (30
        seconds) when reading the value.
 
-       The most common instance where you may wish to change this value is  to
+       The  most common instance where you may wish to change this value is to
        work with a remote host over a slow communication channel.  If the host
-       running a <EM>curses</EM> application does not  receive  the  characters  of  an
-       escape  sequence  in a timely manner, the library can interpret them as
+       running  a  <EM>curses</EM>  application  does  not receive the characters of an
+       escape sequence in a timely manner, the library can interpret  them  as
        multiple key stroke events.
 
        <STRONG>xterm(1)</STRONG> mouse events are a form of escape sequence; therefore, if your
-       application  makes  heavy  use  of  multiple-clicking,  you may wish to
-       lengthen the default value because the delay applies to  the  composite
+       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+       lengthen  the  default value because the delay applies to the composite
        multi-click event as well as the individual clicks.
 
-       Portable  applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG> in
-       either form, but setting  the  environment  variable  rather  than  the
+       Portable applications should not rely upon the presence of <STRONG>ESCDELAY</STRONG>  in
+       either  form,  but  setting  the  environment  variable rather than the
        global variable does not create problems when compiling an application.
 
-       If  <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  is  disabled  for  the <EM>curses</EM> window receiving input, a
+       If <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG> is disabled for the  <EM>curses</EM>  window  receiving  input,  a
        program must disambiguate escape sequences itself.
 
 
 </PRE><H3><a name="h3-HOME"><EM>HOME</EM></a></H3><PRE>
-       <EM>ncurses</EM> may read and write auxiliary terminal descriptions in  <EM>.termcap</EM>
+       <EM>ncurses</EM>  may read and write auxiliary terminal descriptions in <EM>.termcap</EM>
        and <EM>.terminfo</EM> files in the user's home directory.
 
 
 </PRE><H3><a name="h3-LINES"><EM>LINES</EM></a></H3><PRE>
-       This  counterpart  to  <EM>COLUMNS</EM>  specifies  the  height of the screen in
-       characters.  The corresponding <EM>terminfo</EM> capability and code  is  <STRONG>lines</STRONG>.
+       This counterpart to <EM>COLUMNS</EM> specifies  the  height  of  the  screen  in
+       characters.   The  corresponding <EM>terminfo</EM> capability and code is <STRONG>lines</STRONG>.
        See the description of the <EM>COLUMNS</EM> variable above.
 
 
 </PRE><H3><a name="h3-MOUSE_BUTTONS_123"><EM>MOUSE_BUTTONS_123</EM></a></H3><PRE>
-       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
-       with other platforms, such that 1 is the left button, 2 the right,  and
-       3  the  middle.   This  variable customizes the mouse button numbering.
-       Its value must be three digits 1-3 in any order.  By  default,  <EM>ncurses</EM>
+       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+       with  other platforms, such that 1 is the left button, 2 the right, and
+       3 the middle.  This variable customizes  the  mouse  button  numbering.
+       Its  value  must be three digits 1-3 in any order.  By default, <EM>ncurses</EM>
        assumes a numbering of "132".
 
 
 </PRE><H3><a name="h3-NCURSES_ASSUMED_COLORS"><EM>NCURSES_ASSUMED_COLORS</EM></a></H3><PRE>
-       If  set,  this  variable  overrides  the  <EM>ncurses</EM> library's compiled-in
-       assumption that the terminal's default colors are white on  black;  see
-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.   Set  the  foreground  and background color values
-       with this environment variable  by  assigning  it  two  integer  values
+       If set, this  variable  overrides  the  <EM>ncurses</EM>  library's  compiled-in
+       assumption  that  the terminal's default colors are white on black; see
+       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.  Set the foreground  and  background  color  values
+       with  this  environment  variable  by  assigning  it two integer values
        separated  by  a  comma,  indicating  foregound  and  background  color
        numbers, respectively.
 
-       For example, to tell <EM>ncurses</EM> not to assume anything about  the  colors,
-       use  a  value  of  "-1,-1".   To make the default color scheme green on
-       black, use "2,0".  <EM>ncurses</EM> accepts integral values from -1  up  to  the
+       For  example,  to tell <EM>ncurses</EM> not to assume anything about the colors,
+       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+       black,  use  "2,0".   <EM>ncurses</EM> accepts integral values from -1 up to the
        value of the <EM>terminfo</EM> <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>) capability.
 
 
 </PRE><H3><a name="h3-NCURSES_CONSOLE2"><EM>NCURSES_CONSOLE2</EM></a></H3><PRE>
-       (MinGW   port  only)  The  <EM>Console2</EM>  program  defectively  handles  the
-       Microsoft Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.   Applications
-       that  use it will hang.  However, it is possible to simulate the action
-       of this call by mapping coordinates, explicitly  saving  and  restoring
-       the  original  screen contents.  Setting the environment variable <EM>NCGDB</EM>
+       (MinGW  port  only)  The  <EM>Console2</EM>  program  defectively  handles   the
+       Microsoft  Console  API  call  <EM>CreateConsoleScreenBuffer</EM>.  Applications
+       that use it will hang.  However, it is possible to simulate the  action
+       of  this  call  by mapping coordinates, explicitly saving and restoring
+       the original screen contents.  Setting the environment  variable  <EM>NCGDB</EM>
        has the same effect.
 
 
 </PRE><H3><a name="h3-NCURSES_GPM_TERMS"><EM>NCURSES_GPM_TERMS</EM></a></H3><PRE>
-       (Linux only) When <EM>ncurses</EM> is configured to use the GPM interface,  this
-       variable  may  list  one  or  more  terminal  type  names, delimited by
-       vertical bars (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM>  variable  (see
-       below)  is  matched.   An empty value disables the GPM interface, using
-       <EM>ncurses</EM>'s built-in support for <STRONG>xterm(1)</STRONG> mouse  protocols  instead.   If
-       the  variable  is absent, <EM>ncurses</EM> attempts to open GPM if <EM>TERM</EM> contains
+       (Linux  only) When <EM>ncurses</EM> is configured to use the GPM interface, this
+       variable may list  one  or  more  terminal  type  names,  delimited  by
+       vertical  bars  (<STRONG>|</STRONG>) or colons (<STRONG>:</STRONG>), against which the <EM>TERM</EM> variable (see
+       below) is matched.  An empty value disables the  GPM  interface,  using
+       <EM>ncurses</EM>'s  built-in  support  for <STRONG>xterm(1)</STRONG> mouse protocols instead.  If
+       the variable is absent, <EM>ncurses</EM> attempts to open GPM if  <EM>TERM</EM>  contains
        "linux".
 
 
 </PRE><H3><a name="h3-NCURSES_NO_HARD_TABS"><EM>NCURSES_NO_HARD_TABS</EM></a></H3><PRE>
-       <EM>ncurses</EM> may use tab characters in  cursor  movement  optimization.   In
-       some  cases,  your  terminal  driver may not handle them properly.  Set
+       <EM>ncurses</EM>  may  use  tab  characters in cursor movement optimization.  In
+       some cases, your terminal driver may not  handle  them  properly.   Set
        this environment variable to any value to disable the feature.  You can
        also adjust your <STRONG>stty(1)</STRONG> settings to avoid the problem.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_MAGIC_COOKIE"><EM>NCURSES_NO_MAGIC_COOKIE</EM></a></H3><PRE>
-       Many  terminals  store  video  attributes  as a property of a character
-       cell, as <EM>curses</EM> does.  Historically, some  recorded  changes  in  video
-       attributes  as  data  that  logically  <EM>occupies</EM>  character cells on the
-       display, switching attributes on or off, similarly to tags in a  markup
-       language;  these  are  termed "magic cookies", and must be subsequently
-       overprinted.  If the <EM>terminfo</EM> entry for your  terminal  type  does  not
+       Many terminals store video attributes as  a  property  of  a  character
+       cell,  as  <EM>curses</EM>  does.   Historically, some recorded changes in video
+       attributes as data that  logically  <EM>occupies</EM>  character  cells  on  the
+       display,  switching attributes on or off, similarly to tags in a markup
+       language; these are termed "magic cookies", and  must  be  subsequently
+       overprinted.   If  the  <EM>terminfo</EM>  entry for your terminal type does not
        adequately describe its handling of magic cookies, set this variable to
        any value to instruct <EM>ncurses</EM> to disable attributes entirely.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_PADDING"><EM>NCURSES_NO_PADDING</EM></a></H3><PRE>
        Most  terminal  type  descriptions  in  the  <EM>terminfo</EM>  database  detail
-       hardware   devices.   Many  people  use  <EM>curses</EM>-based  applications  in
-       terminal emulator programs that run in a windowing environment.   These
-       programs  can  duplicate  all  of  the important features of a hardware
-       terminal, but often lack their limitations.  Chief among  these  absent
+       hardware  devices.   Many  people  use  <EM>curses</EM>-based  applications   in
+       terminal  emulator programs that run in a windowing environment.  These
+       programs can duplicate all of the  important  features  of  a  hardware
+       terminal,  but  often lack their limitations.  Chief among these absent
        drawbacks is the problem of data flow management; that is, limiting the
-       speed of communication to what the hardware  could  handle.   Unless  a
-       hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), an application must manage flow itself  to  prevent
+       speed  of  communication  to  what the hardware could handle.  Unless a
+       hardware terminal is interfaced into  a  terminal  concentrator  (which
+       does  flow  control), an application must manage flow itself to prevent
        overruns and data loss.
 
-       A  solution  that  comes  at  no hardware cost is for an application to
-       pause after directing a  terminal  to  execute  an  operation  that  it
-       performs  slowly,  such  as  clearing  the display.  Many terminal type
-       descriptions, including that for the VT100, embed delay  specifications
-       in  capabilities.   You  may  wish  to  use these terminal descriptions
-       without paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to  any
-       value  to disable all but mandatory padding.  Mandatory padding is used
+       A solution that comes at no hardware cost  is  for  an  application  to
+       pause  after  directing  a  terminal  to  execute  an operation that it
+       performs slowly, such as clearing  the  display.   Many  terminal  type
+       descriptions,  including that for the VT100, embed delay specifications
+       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+       without  paying the performance penalty.  Set <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>PADDING</EM> to any
+       value to disable all but mandatory padding.  Mandatory padding is  used
        by such terminal capabilities as <STRONG>flash_screen</STRONG> (<STRONG>flash</STRONG>).
 
 
 </PRE><H3><a name="h3-NCURSES_NO_SETBUF"><EM>NCURSES_NO_SETBUF</EM></a></H3><PRE>
-       (Obsolete) Prior to internal changes developed in <EM>ncurses</EM> 5.9  (patches
-       20120825  through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable fully
-       buffered output when initializing the terminal.  This was done,  as  in
-       SVr4  <EM>curses</EM>,  to  increase performance.  For testing purposes, both of
-       <EM>ncurses</EM> and of certain applications, this feature  was  made  optional.
-       Setting  this  variable  disabled  output buffering, leaving the output
+       (Obsolete)  Prior to internal changes developed in <EM>ncurses</EM> 5.9 (patches
+       20120825 through 20130126), the library used <STRONG>setbuf(3)</STRONG> to enable  fully
+       buffered  output  when initializing the terminal.  This was done, as in
+       SVr4 <EM>curses</EM>, to increase performance.  For testing  purposes,  both  of
+       <EM>ncurses</EM>  and  of  certain applications, this feature was made optional.
+       Setting this variable disabled output  buffering,  leaving  the  output
        stream in the original (usually line-buffered) mode.
 
-       Nowadays, <EM>ncurses</EM> performs its own buffering and does not require  this
-       workaround;  it  does  not  modify the buffering of the standard output
-       stream.  This approach makes signal handling, as for  interrupts,  more
-       robust.   A  drawback  is  that  certain  unconventional programs mixed
-       <STRONG>stdio(3)</STRONG> calls with <EM>ncurses</EM> calls and (usually) got the  behavior  they
-       expected.   This  is  no longer the case; <EM>ncurses</EM> does not write to the
+       Nowadays,  <EM>ncurses</EM> performs its own buffering and does not require this
+       workaround; it does not modify the buffering  of  the  standard  output
+       stream.   This  approach makes signal handling, as for interrupts, more
+       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+       <STRONG>stdio(3)</STRONG>  calls  with <EM>ncurses</EM> calls and (usually) got the behavior they
+       expected.  This is no longer the case; <EM>ncurses</EM> does not  write  to  the
        standard output file descriptor through a <EM>stdio</EM>-buffered stream.
 
-       As a special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still  use  the
-       standard  output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG> do
+       As  a  special case, low-level API calls such as <STRONG><A HREF="curs_terminfo.3x.html">putp(3x)</A></STRONG> still use the
+       standard output stream.  High-level <EM>curses</EM> calls such as <STRONG><A HREF="curs_printw.3x.html">printw(3x)</A></STRONG>  do
        not.
 
 
 </PRE><H3><a name="h3-NCURSES_NO_UTF8_ACS"><EM>NCURSES_NO_UTF8_ACS</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> inspects the <EM>TERM</EM> environment  variable  for
-       special   cases   where   VT100   forms-drawing   characters  (and  the
-       corresponding alternate character set <EM>terminfo</EM> capabilities) are  known
+       At  initialization,  <EM>ncurses</EM> inspects the <EM>TERM</EM> environment variable for
+       special  cases  where   VT100   forms-drawing   characters   (and   the
+       corresponding  alternate character set <EM>terminfo</EM> capabilities) are known
        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
-       virtual  console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.  Set
+       virtual console device and the GNU <STRONG>screen(1)</STRONG> program ignore them.   Set
        this  variable  to  a  nonzero  value  to  instruct  <EM>ncurses</EM>  that  the
        terminal's ACS support is broken; the library then outputs Unicode code
        points that correspond to the forms-drawing characters.  Set it to zero
        (or a non-integer) to disable the special check for terminal type names
-       matching "linux" or "screen", directing <EM>ncurses</EM> to assume that the  ACS
+       matching  "linux" or "screen", directing <EM>ncurses</EM> to assume that the ACS
        feature works if the terminal type description advertises it.
 
-       As  an  alternative  to  use  of  this  variable, <EM>ncurses</EM> checks for an
+       As an alternative to use  of  this  variable,  <EM>ncurses</EM>  checks  for  an
        extended <EM>terminfo</EM> numeric capability <STRONG>U8</STRONG> that can be compiled using "<STRONG>tic</STRONG>
        <STRONG>-x</STRONG>".  Examples follow.
 
@@ -1046,62 +1048,62 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  two-character name "U8" was chosen to permit its use via <EM>ncurses</EM>'s
+       The two-character name "U8" was chosen to permit its use via  <EM>ncurses</EM>'s
        <EM>termcap</EM> interface.
 
 
 </PRE><H3><a name="h3-NCURSES_TRACE"><EM>NCURSES_TRACE</EM></a></H3><PRE>
-       At initialization, <EM>ncurses</EM> (in its debugging configuration) checks  for
-       this  variable's  presence.   If  defined  with  an integral value, the
+       At  initialization, <EM>ncurses</EM> (in its debugging configuration) checks for
+       this variable's presence.  If  defined  with  an  integral  value,  the
        library calls <STRONG><A HREF="curs_trace.3x.html">curses_trace(3x)</A></STRONG> with that value as the argument.
 
 
 </PRE><H3><a name="h3-TERM"><EM>TERM</EM></a></H3><PRE>
-       The <EM>TERM</EM> variable denotes the terminal type.  Each is distinct,  though
-       many  are  similar.   It  is commonly set by terminal emulators to help
-       applications find a  workable  terminal  description.   Some  choose  a
-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
-       an exact fit to their capabilities.  Not infrequently,  an  application
-       will  have  problems  with that approach; for example, a key stroke may
-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+       The  <EM>TERM</EM> variable denotes the terminal type.  Each is distinct, though
+       many are similar.  It is commonly set by  terminal  emulators  to  help
+       applications  find  a  workable  terminal  description.   Some choose a
+       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+       an  exact  fit to their capabilities.  Not infrequently, an application
+       will have problems with that approach; for example, a  key  stroke  may
+       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
        characters on the screen.
 
-       Setting  <EM>TERM</EM>  has  no effect on hardware operation; it affects the way
-       applications communicate with the terminal.   Likewise,  as  a  general
-       rule  (<STRONG>xterm(1)</STRONG>  being a rare exception), terminal emulators that allow
+       Setting <EM>TERM</EM> has no effect on hardware operation; it  affects  the  way
+       applications  communicate  with  the  terminal.  Likewise, as a general
+       rule (<STRONG>xterm(1)</STRONG> being a rare exception), terminal emulators  that  allow
        you to specify <EM>TERM</EM> as a parameter or configuration value do not change
        their behavior to match that setting.
 
 
 </PRE><H3><a name="h3-TERMCAP"><EM>TERMCAP</EM></a></H3><PRE>
        If <EM>ncurses</EM> is configured with <EM>termcap</EM> support, it checks for a terminal
-       type description in <EM>termcap</EM> format if one in  <EM>terminfo</EM>  format  is  not
-       available.   Setting  this variable directs <EM>ncurses</EM> to ignore the usual
-       <EM>termcap</EM> database location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM>  below.   <EM>TERMCAP</EM>
-       should  contain  either  a terminal description (with newlines stripped
-       out), or a file name indicating where the information required  by  the
+       type  description  in  <EM>termcap</EM>  format if one in <EM>terminfo</EM> format is not
+       available.  Setting this variable directs <EM>ncurses</EM> to ignore  the  usual
+       <EM>termcap</EM>  database  location, <EM>/etc/termcap</EM>; see <EM>TERMPATH</EM> below.  <EM>TERMCAP</EM>
+       should contain either a terminal description  (with  newlines  stripped
+       out),  or  a file name indicating where the information required by the
        <EM>TERM</EM> environment variable is stored.
 
 
 </PRE><H3><a name="h3-TERMINFO"><EM>TERMINFO</EM></a></H3><PRE>
-       <EM>ncurses</EM>  can  be configured to read terminal type description databases
-       in various locations using different formats.  This variable  overrides
+       <EM>ncurses</EM> can be configured to read terminal type  description  databases
+       in  various locations using different formats.  This variable overrides
        the default location.
 
-       <STRONG>o</STRONG>   Descriptions  in <EM>terminfo</EM> format are normally stored in a directory
+       <STRONG>o</STRONG>   Descriptions in <EM>terminfo</EM> format are normally stored in a  directory
            tree using subdirectories named for the common first letters of the
            terminal types named therein.  This is the scheme used in System V.
 
        <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured to use hashed databases, then <EM>TERMINFO</EM> may
-           name its location,  such  as  <EM>/usr/share/terminfo.db</EM>,  rather  than
+           name  its  location,  such  as  <EM>/usr/share/terminfo.db</EM>, rather than
            <EM>/usr/share/terminfo/</EM>.
 
-       The  hashed  database  uses less disk space and is a little faster than
+       The hashed database uses less disk space and is a  little  faster  than
        the directory tree.  However, some applications assume the existence of
        the directory tree, and read it directly rather than using the <EM>terminfo</EM>
        API.
 
-       <STRONG>o</STRONG>   If <EM>ncurses</EM> is configured with <EM>termcap</EM> support,  this  variable  may
+       <STRONG>o</STRONG>   If  <EM>ncurses</EM>  is  configured with <EM>termcap</EM> support, this variable may
            contain the location of a <EM>termcap</EM> file.
 
        <STRONG>o</STRONG>   If the value of <EM>TERMINFO</EM> begins with "hex:" or "b64:", <EM>ncurses</EM> uses
@@ -1111,10 +1113,10 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
                   TERMINFO=$(infocmp -0 -Q2 -q)
                   export TERMINFO
 
-           The  compiled  description  is  used  only if it corresponds to the
+           The compiled description is used only  if  it  corresponds  to  the
            terminal type identified by <EM>TERM</EM>.
 
-       Setting <EM>TERMINFO</EM> is the simplest, but  not  the  only,  way  to  direct
+       Setting  <EM>TERMINFO</EM>  is  the  simplest,  but  not the only, way to direct
        <EM>ncurses</EM> to a terminal database.  The search path is as follows.
 
        <STRONG>o</STRONG>   the last terminal database to which the running <EM>ncurses</EM> application
@@ -1132,16 +1134,16 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-TERMINFO_DIRS"><EM>TERMINFO_DIRS</EM></a></H3><PRE>
-       This variable specifies a list of locations, akin  to  <EM>PATH</EM>,  in  which
-       <EM>ncurses</EM>  searches  for  the  terminal  type  descriptions  described by
-       <EM>TERMINFO</EM> above.  The list items are separated by  colons  on  Unix  and
-       semicolons  on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a corresponding
+       This  variable  specifies  a  list of locations, akin to <EM>PATH</EM>, in which
+       <EM>ncurses</EM> searches  for  the  terminal  type  descriptions  described  by
+       <EM>TERMINFO</EM>  above.   The  list  items are separated by colons on Unix and
+       semicolons on  OS/2  EMX.   System V  <EM>terminfo</EM>  lacks  a  corresponding
        feature; <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is an <EM>ncurses</EM> extension.
 
 
 </PRE><H3><a name="h3-TERMPATH"><EM>TERMPATH</EM></a></H3><PRE>
        If <EM>TERMCAP</EM> does not hold a terminal type description or file name, then
-       <EM>ncurses</EM>  checks  the contents of <EM>TERMPATH</EM>, a list of locations, akin to
+       <EM>ncurses</EM> checks the contents of <EM>TERMPATH</EM>, a list of locations,  akin  to
        <EM>PATH</EM>, in which it searches for <EM>termcap</EM> terminal type descriptions.  The
        list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
@@ -1151,9 +1153,9 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-ALTERNATE-CONFIGURATIONS">ALTERNATE CONFIGURATIONS</a></H2><PRE>
-       Many  different  <EM>ncurses</EM> configurations are possible, determined by the
-       options given to the <EM>configure</EM> script when building the  library.   Run
-       the  script  with  the  <STRONG>--help</STRONG> option to peruse them all.  A few are of
+       Many different <EM>ncurses</EM> configurations are possible, determined  by  the
+       options  given  to the <EM>configure</EM> script when building the library.  Run
+       the script with the <STRONG>--help</STRONG> option to peruse them all.   A  few  are  of
        particular significance to the application developer employing <EM>ncurses</EM>.
 
        <STRONG>--disable-overwrite</STRONG>
@@ -1162,24 +1164,24 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
                 <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-            This  option  is used to avoid file name conflicts between <EM>ncurses</EM>
-            and an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM>  is
-            installed  disabling  overwrite,  it  puts  its  header files in a
+            This option is used to avoid file name conflicts  between  <EM>ncurses</EM>
+            and  an existing <EM>curses</EM> installation on the system.  If <EM>ncurses</EM> is
+            installed disabling overwrite, it  puts  its  header  files  in  a
             subdirectory.  Here is an example.
 
                 <STRONG>#include</STRONG> <STRONG>&lt;ncurses/curses.h&gt;</STRONG>
 
-            Installation also omits a  symbolic  link  that  would  cause  the
-            compiler's  <STRONG>-lcurses</STRONG>  option  to  link  object  files with <EM>ncurses</EM>
+            Installation  also  omits  a  symbolic  link  that would cause the
+            compiler's <STRONG>-lcurses</STRONG> option  to  link  object  files  with  <EM>ncurses</EM>
             instead of the system <EM>curses</EM> library.
 
-            The directory used by this configuration of <EM>ncurses</EM>  is  shown  in
+            The  directory  used  by this configuration of <EM>ncurses</EM> is shown in
             section "SYNOPSIS" above.
 
        <STRONG>--enable-widec</STRONG>
-            The   configure   script   renames   the   library   and  (if  the
-            <STRONG>--disable-overwrite</STRONG> option is used) puts the  header  files  in  a
-            different  subdirectory.   All  of  the  library  names have a "w"
+            The  configure  script   renames   the   library   and   (if   the
+            <STRONG>--disable-overwrite</STRONG>  option  is  used)  puts the header files in a
+            different subdirectory.  All of  the  library  names  have  a  "w"
             appended to them, i.e., instead of
 
                 <STRONG>-lncurses</STRONG>
@@ -1188,62 +1190,62 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
                 <STRONG>-lncursesw</STRONG>
 
-            You must also enable the wide-character  features  in  the  header
-            file  when  compiling  for  the  wide-character library to use the
-            extended (wide-character) functions.   The  symbol  which  enables
-            these features has changed since X/Open Curses, Issue 4:
+            You  must  also  enable  the wide-character features in the header
+            file when compiling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The  symbol which enables
+            these features has changed since X/Open Curses Issue 4:
 
-            <STRONG>o</STRONG>   Originally,  the  wide-character  feature  required the symbol
+            <STRONG>o</STRONG>   Originally, the wide-character  feature  required  the  symbol
                 <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG>  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            <STRONG>o</STRONG>   Later,  that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG> defined
+            <STRONG>o</STRONG>   Later, that was deemed conflicting with <STRONG>_XOPEN_SOURCE</STRONG>  defined
                 to 500.
 
-            <STRONG>o</STRONG>   As of mid-2018, none of the features  in  this  implementation
-                require  a  <STRONG>_XOPEN_SOURCE</STRONG>  feature greater than 600.  However,
-                X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+            <STRONG>o</STRONG>   As  of  mid-2018,  none of the features in this implementation
+                require a <STRONG>_XOPEN_SOURCE</STRONG> feature greater  than  600.   However,
+                X/Open Curses Issue 7 (2009) recommends defining it to 700.
 
-            <STRONG>o</STRONG>   Alternatively,  you  can  enable  the  feature   by   defining
-                <STRONG>NCURSES_WIDECHAR</STRONG>  with  the caveat that some other header file
-                than <STRONG>curses.h</STRONG> may require a specific value  for  <STRONG>_XOPEN_SOURCE</STRONG>
+            <STRONG>o</STRONG>   Alternatively,   you   can  enable  the  feature  by  defining
+                <STRONG>NCURSES_WIDECHAR</STRONG> with the caveat that some other  header  file
+                than  <STRONG>curses.h</STRONG>  may require a specific value for <STRONG>_XOPEN_SOURCE</STRONG>
                 (or a system-specific symbol).
 
-            The  <EM>curses.h</EM> header file installed for the wide-character library
-            is designed to be compatible with the non-wide  library's  header.
-            Only  the  size  of the <EM>WINDOW</EM> structure differs; few applications
+            The <EM>curses.h</EM> header file installed for the wide-character  library
+            is  designed  to be compatible with the non-wide library's header.
+            Only the size of the <EM>WINDOW</EM> structure  differs;  few  applications
             require more than pointers to <EM>WINDOW</EM>s.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character  library's  headers  should  be installed last, to allow
+            character library's headers should be  installed  last,  to  allow
             applications to be built using either library from the same set of
             headers.
 
        <STRONG>--with-pthread</STRONG>
-            The  configure  script  renames  the  library.  All of the library
-            names have a "t"  appended  to  them  (before  any  "w"  added  by
+            The configure script renames the  library.   All  of  the  library
+            names  have  a  "t"  appended  to  them  (before  any "w" added by
             <STRONG>--enable-widec</STRONG>).
 
             The global variables such as <STRONG>LINES</STRONG> are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to  set  these  values.   Some applications (very few) may require
+            to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
        <STRONG>--with-shared</STRONG>
        <STRONG>--with-normal</STRONG>
        <STRONG>--with-debug</STRONG>
        <STRONG>--with-profile</STRONG>
-            The shared and normal  (static)  library  names  differ  by  their
-            suffixes,  e.g.,  <STRONG>libncurses.so</STRONG>  and  <STRONG>libncurses.a</STRONG>.  The debug and
-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+            The  shared  and  normal  (static)  library  names differ by their
+            suffixes, e.g., <STRONG>libncurses.so</STRONG> and  <STRONG>libncurses.a</STRONG>.   The  debug  and
+            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>.
 
        <STRONG>--with-termlib</STRONG>
-            Low-level  functions  which do not depend upon whether the library
+            Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
-            By doing this, it is possible to share the tinfo  library  between
-            wide/normal  configurations  as  well  as  reduce  the size of the
+            By  doing  this, it is possible to share the tinfo library between
+            wide/normal configurations as well  as  reduce  the  size  of  the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
@@ -1263,8 +1265,8 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
             <STRONG>o</STRONG>   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG> - miscellaneous <EM>curses</EM> utility routines
 
        <STRONG>--with-trace</STRONG>
-            The <STRONG>trace</STRONG> function normally resides in the debug library,  but  it
-            is  sometimes  useful  to  configure  this  in the shared library.
+            The  <STRONG>trace</STRONG>  function normally resides in the debug library, but it
+            is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.
 
@@ -1278,213 +1280,213 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       X/Open  Curses permits most functions it specifies to be made available
+       X/Open Curses permits most functions it specifies to be made  available
        as macros as well.  <EM>ncurses</EM> does so
 
        <STRONG>o</STRONG>   for functions that return values via their parameters,
 
        <STRONG>o</STRONG>   to support obsolete features,
 
-       <STRONG>o</STRONG>   to reuse functions (for example, those that move the cursor  before
+       <STRONG>o</STRONG>   to  reuse functions (for example, those that move the cursor before
            another operation), and
 
        <STRONG>o</STRONG>   in a few special cases.
 
-       If  the  standard  output  file  descriptor  of  an  <EM>ncurses</EM> program is
-       redirected to something that is not  a  terminal  device,  the  library
-       writes  screen updates to the standard error file descriptor.  This was
+       If the standard  output  file  descriptor  of  an  <EM>ncurses</EM>  program  is
+       redirected  to  something  that  is  not a terminal device, the library
+       writes screen updates to the standard error file descriptor.  This  was
        an undocumented feature of SVr3 <EM>curses</EM>.
 
-       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
+       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
        inclusion of <EM>curses.h</EM>.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM>  enables  an  application  to  capture  mouse events on certain
+       <EM>ncurses</EM> enables an application  to  capture  mouse  events  on  certain
        terminals, including <STRONG>xterm(1)</STRONG>; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> provides a means of responding to window  resizing  events,  as
-       when  running in a GUI terminal emulator application such as <EM>xterm</EM>; see
+       <EM>ncurses</EM>  provides  a  means of responding to window resizing events, as
+       when running in a GUI terminal emulator application such as <EM>xterm</EM>;  see
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
 
        <EM>ncurses</EM> allows an application to query the terminal for the presence of
        a wide variety of special keys; see <STRONG><A HREF="curs_getch.3x.html">has_key(3x)</A></STRONG>.
 
        <EM>ncurses</EM> extends the fixed set of function key capabilities specified by
-       X/Open  Curses  by  allowing  the  application  programmer  to   define
-       additional  key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
+       X/Open   Curses  by  allowing  the  application  programmer  to  define
+       additional key events at runtime; see <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>,
        <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  can  exploit  the  capabilities  of   terminals   implementing
-       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
-       application to reset  the  terminal  to  its  original  foreground  and
-       background  colors.  From a user's perspective, the application is able
-       to draw colored text on a background whose color is set  independently,
+       <EM>ncurses</EM>   can   exploit  the  capabilities  of  terminals  implementing
+       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From a user's perspective, the application is  able
+       to  draw colored text on a background whose color is set independently,
        providing better control over color contrasts.  See <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>.
 
-       An  <EM>ncurses</EM>  application  can  eschew  knowledge  of  <EM>SCREEN</EM> and <EM>WINDOW</EM>
-       structure  internals,  instead  using  accessor   functions   such   as
+       An <EM>ncurses</EM> application  can  eschew  knowledge  of  <EM>SCREEN</EM>  and  <EM>WINDOW</EM>
+       structure   internals,   instead   using  accessor  functions  such  as
        <STRONG><A HREF="curs_inopts.3x.html">is_cbreak(3x)</A></STRONG> and <STRONG><A HREF="curs_opaque.3x.html">is_scrollok(3x)</A></STRONG>.
 
-       <EM>ncurses</EM>  enables  an  application  to  direct  its  output to a printer
+       <EM>ncurses</EM> enables an application  to  direct  its  output  to  a  printer
        attached to the terminal device; see <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>.
 
-       <EM>ncurses</EM> offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for  soft-
-       label  key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
-       that can gather color  information  from  them  when  many  colors  are
+       <EM>ncurses</EM>  offers <STRONG><A HREF="curs_slk.3x.html">slk_attr(3x)</A></STRONG> as a counterpart of <STRONG><A HREF="curs_attr.3x.html">attr_get(3x)</A></STRONG> for soft-
+       label key lines, and <STRONG><A HREF="curs_slk.3x.html">extended_slk_color(3x)</A></STRONG> as a form of  <STRONG><A HREF="curs_slk.3x.html">slk_color(3x)</A></STRONG>
+       that  can  gather  color  information  from  them  when many colors are
        supported.
 
-       <EM>ncurses</EM>    permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;   see
+       <EM>ncurses</EM>   permits   modification   of   <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>'s   behavior;    see
        <STRONG><A HREF="legacy_coding.3x.html">use_legacy_coding(3x)</A></STRONG>.
 
-       Rudimentary support for multi-threaded applications may  be  available;
+       Rudimentary  support  for multi-threaded applications may be available;
        see <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>.
 
-       Functions  that ease the management of multiple screens can be exposed;
+       Functions that ease the management of multiple screens can be  exposed;
        see <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>.
 
-       To aid applications to debug their  memory  usage,  <EM>ncurses</EM>  optionally
-       offers  functions  to  more  aggressively  free  memory  it dynamically
+       To  aid  applications  to  debug their memory usage, <EM>ncurses</EM> optionally
+       offers functions  to  more  aggressively  free  memory  it  dynamically
        allocates itself; see <STRONG><A HREF="curs_memleaks.3x.html">curs_memleaks(3x)</A></STRONG>.
 
-       The library facilitates auditing and troubleshooting of  its  behavior;
+       The  library  facilitates auditing and troubleshooting of its behavior;
        see <STRONG><A HREF="curs_trace.3x.html">curs_trace(3x)</A></STRONG>.
 
-       Compiling  <EM>ncurses</EM>  with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to fall back
-       to reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a  <EM>term-</EM>
+       Compiling <EM>ncurses</EM> with the option <STRONG>-DUSE_GETCAP</STRONG> causes it to  fall  back
+       to  reading <EM>/etc/termcap</EM> if the terminal setup code cannot find a <EM>term-</EM>
        <EM>info</EM>  entry  corresponding  to  <EM>TERM</EM>.   Use  of  this  feature  is  not
-       recommended, as it essentially includes an entire <EM>termcap</EM>  compiler  in
-       the  <EM>ncurses</EM>  startup  code,  at a cost in memory usage and application
+       recommended,  as  it essentially includes an entire <EM>termcap</EM> compiler in
+       the <EM>ncurses</EM> startup code, at a cost in  memory  usage  and  application
        launch latency.
 
-       <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>   extensions.
+       <EM>PDCurses</EM>   and  NetBSD  <EM>curses</EM>  incorporate  some  <EM>ncurses</EM>  extensions.
        Individual man pages indicate where this is the case.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and  color support.  <EM>ncurses</EM> intends base-level conformance with X/Open
-       Curses, and supports all features of  its  enhanced  level  except  the
+       and color support.  <EM>ncurses</EM> intends base-level conformance with  X/Open
+       Curses,  and  supports  all  features  of its enhanced level except the
        <EM>untic</EM> utility.
 
-       Differences  between  X/Open  Curses  and <EM>ncurses</EM> are documented in the
+       Differences between X/Open Curses and <EM>ncurses</EM>  are  documented  in  the
        "PORTABILITY" sections of applicable man pages.
 
 
 </PRE><H3><a name="h3-Error-Checking">Error Checking</a></H3><PRE>
-       In many cases, X/Open Curses is vague about error conditions,  omitting
+       In  many cases, X/Open Curses is vague about error conditions, omitting
        some of the SVr4 documentation.
 
-       Unlike  other  implementations, <EM>ncurses</EM> checks pointer parameters, such
-       as those to <EM>WINDOW</EM> structures, to ensure that they are not null.   This
-       is  done  primarily  to  guard  against programmer error.  The standard
+       Unlike other implementations, <EM>ncurses</EM> checks pointer  parameters,  such
+       as  those to <EM>WINDOW</EM> structures, to ensure that they are not null.  This
+       is done primarily to guard  against  programmer  error.   The  standard
        interface does not provide a way for the library to tell an application
-       which  of several possible errors occurred.  An application that relies
-       on <EM>ncurses</EM> to check its function parameters  for  validity  limits  its
+       which of several possible errors occurred.  An application that  relies
+       on  <EM>ncurses</EM>  to  check  its function parameters for validity limits its
        portability and robustness.
 
 
 </PRE><H3><a name="h3-Padding-Differences">Padding Differences</a></H3><PRE>
-       In  historical  <EM>curses</EM> implementations, delays embedded in the <EM>terminfo</EM>
-       capabilities <STRONG>carriage_return</STRONG> (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG>  (<STRONG>ind</STRONG>),  <STRONG>cursor_left</STRONG>
+       In historical <EM>curses</EM> implementations, delays embedded in  the  <EM>terminfo</EM>
+       capabilities  <STRONG>carriage_return</STRONG>  (<STRONG>cr</STRONG>),  <STRONG>scroll_forward</STRONG> (<STRONG>ind</STRONG>), <STRONG>cursor_left</STRONG>
        (<STRONG>cub1</STRONG>), <STRONG>form_feed</STRONG> (<STRONG>ff</STRONG>), and <STRONG>tab</STRONG> (<STRONG>ht</STRONG>) activated corresponding delay bits
-       in the Unix terminal driver.  <EM>ncurses</EM> performs all padding  by  sending
-       NUL  bytes  to the device.  This method is slightly more expensive, but
-       narrows  the  interface  to   the   Unix   kernel   significantly   and
+       in  the  Unix terminal driver.  <EM>ncurses</EM> performs all padding by sending
+       NUL bytes to the device.  This method is slightly more  expensive,  but
+       narrows   the   interface   to   the   Unix  kernel  significantly  and
        correspondingly increases the package's portability.
 
 
 </PRE><H3><a name="h3-Header-Files">Header Files</a></H3><PRE>
-       The  header  file <EM>curses.h</EM> itself includes the header files <EM>stdio.h</EM> and
+       The header file <EM>curses.h</EM> itself includes the header files  <EM>stdio.h</EM>  and
        <EM>unctrl.h</EM>.
 
        X/Open Curses has more to say,
 
-           The inclusion of <EM>curses.h</EM> may make visible  all  symbols  from  the
+           The  inclusion  of  <EM>curses.h</EM>  may make visible all symbols from the
            headers <EM>stdio.h</EM>, <EM>term.h</EM>, <EM>termios.h</EM>, and <EM>wchar.h</EM>.
 
        but does not finish the story.  A more complete account follows.
 
        <STRONG>o</STRONG>   The first <EM>curses</EM>, in 4BSD, provided a <EM>curses.h</EM> file.
 
-           BSD  <EM>curses</EM>  code  included  <EM>curses.h</EM> and <EM>unctrl.h</EM> from an internal
+           BSD <EM>curses</EM> code included <EM>curses.h</EM> and  <EM>unctrl.h</EM>  from  an  internal
            header file <EM>curses.ext</EM>, where "ext" abbreviated "externs".
 
-           The implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented  internal
-           functions  of  the  standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM> and <STRONG>_</STRONG><EM>doscan</EM>), but
+           The  implementations of <EM>printw</EM> and <EM>scanw</EM> used undocumented internal
+           functions of the standard I/O library (<STRONG>_</STRONG><EM>doprnt</EM>  and  <STRONG>_</STRONG><EM>doscan</EM>),  but
            nothing in <EM>curses.h</EM> itself relied upon <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   SVr2 <EM>curses</EM> added <EM>newterm</EM>, which relies upon  <EM>stdio.h</EM>  because  its
+       <STRONG>o</STRONG>   SVr2  <EM>curses</EM>  added  <EM>newterm</EM>, which relies upon <EM>stdio.h</EM> because its
            function prototype employs the <EM>FILE</EM> type.
 
            SVr4 <EM>curses</EM> added <EM>putwin</EM> and <EM>getwin</EM>, which also use <EM>stdio.h</EM>.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4  <EM>curses</EM>  and  X/Open  Curses  do  not require the developer to
-           include <EM>stdio.h</EM> before <EM>curses.h</EM>.  Both document use  of  <EM>curses</EM>  as
+           SVr4 <EM>curses</EM> and X/Open Curses  do  not  require  the  developer  to
+           include  <EM>stdio.h</EM>  before  <EM>curses.h</EM>.  Both document use of <EM>curses</EM> as
            requiring only <EM>curses.h</EM>.
 
            As a result, standard <EM>curses.h</EM> always includes <EM>stdio.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  and  SVr4  <EM>curses</EM>  are inconsistent with respect to
+       <STRONG>o</STRONG>   X/Open Curses and SVr4 <EM>curses</EM>  are  inconsistent  with  respect  to
            <EM>unctrl.h</EM>.
 
-           As noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from  <EM>curses.h</EM>
+           As  noted in <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <EM>ncurses</EM> includes <EM>unctrl.h</EM> from <EM>curses.h</EM>
            (as SVr4 does).
 
-       <STRONG>o</STRONG>   X/Open  Curses's  comments  about <EM>term.h</EM> and <EM>termios.h</EM> may refer to
+       <STRONG>o</STRONG>   X/Open Curses's comments about <EM>term.h</EM> and <EM>termios.h</EM>  may  refer  to
            HP-UX and AIX.
 
-           HP-UX <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM>  in
+           HP-UX  <EM>curses</EM> includes <EM>term.h</EM> from <EM>curses.h</EM> to declare <EM>setupterm</EM> in
            <EM>curses.h</EM>, but <EM>ncurses</EM> and Solaris <EM>curses</EM> do not.
 
-           AIX  <EM>curses</EM>  includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again, <EM>ncurses</EM> and
+           AIX <EM>curses</EM> includes  <EM>term.h</EM>  and  <EM>termios.h</EM>.   Again,  <EM>ncurses</EM>  and
            Solaris <EM>curses</EM> do not.
 
-       <STRONG>o</STRONG>   X/Open Curses says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but  does  not
+       <STRONG>o</STRONG>   X/Open  Curses  says that <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>term.h</EM>, but does not
            require it to do so.
 
-           Some  programs  use functions declared in both <EM>curses.h</EM> and <EM>term.h</EM>,
-           and must include both header files in the same  module.   Very  old
-           versions  of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM> before
+           Some programs use functions declared in both <EM>curses.h</EM>  and  <EM>term.h</EM>,
+           and  must  include  both header files in the same module.  Very old
+           versions of  AIX  <EM>curses</EM>  required  inclusion  of  <EM>curses.h</EM>  before
            <EM>term.h</EM>.
 
-           The header files supplied by <EM>ncurses</EM> include the  standard  library
-           headers  required  for  its  declarations,  so <EM>ncurses</EM>'s own header
-           files can be included in any order.  For portability  even  to  old
+           The  header  files supplied by <EM>ncurses</EM> include the standard library
+           headers required for its  declarations,  so  <EM>ncurses</EM>'s  own  header
+           files  can  be  included in any order.  For portability even to old
            AIX systems, include <EM>curses.h</EM> before <EM>term.h</EM>.
 
-       <STRONG>o</STRONG>   X/Open  Curses  says  "may make visible" because including a header
-           file does not necessarily make visible all of  the  symbols  in  it
+       <STRONG>o</STRONG>   X/Open Curses says "may make visible" because  including  a  header
+           file  does  not  necessarily  make visible all of the symbols in it
            (consider <STRONG>#ifdef</STRONG> and similar).
 
-           For  instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the proper
-           symbol is defined, and if <EM>ncurses</EM> is configured for  wide-character
-           support.   If  <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be made visible
+           For instance, <EM>ncurses</EM>'s <EM>curses.h</EM> <STRONG>may</STRONG> include <EM>wchar.h</EM> if the  proper
+           symbol  is defined, and if <EM>ncurses</EM> is configured for wide-character
+           support.  If <EM>wchar.h</EM> is included, its symbols <STRONG>may</STRONG> be  made  visible
            depending on the value of the <STRONG>_XOPEN_SOURCE</STRONG> feature test macro.
 
        <STRONG>o</STRONG>   X/Open Curses mandates an application's inclusion of one standard C
-           library  header  in  a  special  case:  <EM>stdarg.h</EM> before <EM>curses.h</EM> to
-           prototype the functions <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM> and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM>  (as  well  as  the
-           obsolete  <EM>vwprintw</EM>  and  <EM>vwscanw</EM>).   Each of these takes a variadic
+           library header in a  special  case:  <EM>stdarg.h</EM>  before  <EM>curses.h</EM>  to
+           prototype  the  functions  <EM>vw</EM><STRONG>_</STRONG><EM>printw</EM>  and  <EM>vw</EM><STRONG>_</STRONG><EM>scanw</EM> (as well as the
+           obsolete <EM>vwprintw</EM> and <EM>vwscanw</EM>).  Each of  these  takes  a  variadic
            argument list, a <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter, like that of <STRONG>printf(3)</STRONG>.
 
-           SVr3 <EM>curses</EM> introduced  the  two  obsolete  functions,  and  X/Open
-           Curses  the  others.   In  between,  SVr4  <EM>curses</EM>  provided for the
-           possibility that an application might include either  <EM>varargs.h</EM>  or
-           <EM>stdarg.h</EM>.   These  represented  contrasting  approaches to handling
-           variadic argument lists.  The older interface,  <EM>varargs.h</EM>,  used  a
-           pointer  to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.  Later,
-           the list acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>,  defined  in
-           <EM>stdarg.h</EM>,  empowering the compiler to check the types of a function
-           call's actual parameters against the formal ones  declared  in  its
+           SVr3  <EM>curses</EM>  introduced  the  two  obsolete  functions, and X/Open
+           Curses the others.   In  between,  SVr4  <EM>curses</EM>  provided  for  the
+           possibility  that  an application might include either <EM>varargs.h</EM> or
+           <EM>stdarg.h</EM>.  These represented  contrasting  approaches  to  handling
+           variadic  argument  lists.   The older interface, <EM>varargs.h</EM>, used a
+           pointer to <EM>char</EM> for variadic functions' <EM>va</EM><STRONG>_</STRONG><EM>list</EM> parameter.   Later,
+           the  list  acquired its own standard data type, <EM>va</EM><STRONG>_</STRONG><EM>list</EM>, defined in
+           <EM>stdarg.h</EM>, empowering the compiler to check the types of a  function
+           call's  actual  parameters  against the formal ones declared in its
            prototype.
 
-           No   conforming   implementations   of  X/Open  Curses  require  an
+           No  conforming  implementations  of  X/Open   Curses   require   an
            application to include <EM>stdarg.h</EM> before <EM>curses.h</EM> because they either
-           have  allowed  for  a  special type, or, like <EM>ncurses</EM>, they include
+           have allowed for a special type, or,  like  <EM>ncurses</EM>,  they  include
            <EM>stdarg.h</EM> themselves to provide a portable interface.
 
 
@@ -1498,7 +1500,7 @@ <H1 class="no-header">ncurses 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 3cc73d6f3..f11e439d1 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
+  * @Id: new_pair.3x,v 1.49 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>new_pair 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>new_pair 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">new_pair 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>                     Library calls                    <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 
@@ -107,7 +107,7 @@ <H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-alloc_pair">alloc_pair</a></H3><PRE>
        The   <STRONG>alloc_pair</STRONG>   function   accepts  parameters  for  foreground  and
-       background color, and checks  if  that  color  combination  is  already
+       background color, and checks whether that color combination is  already
        associated with a color pair.
 
        <STRONG>o</STRONG>   If  the combination already exists, <STRONG>alloc_pair</STRONG> returns the existing
@@ -128,8 +128,8 @@ <H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-find_pair">find_pair</a></H3><PRE>
        The <STRONG>find_pair</STRONG> function accepts parameters for foreground and background
-       color,  and checks if that color combination is already associated with
-       a color pair, returning the pair  number  if  it  has  been  allocated.
+       color,  and checks whether that color combination is already associated
+       with a color pair, returning the pair number if it has been  allocated.
        Otherwise it returns -1.
 
 
@@ -165,7 +165,7 @@ <H1 class="no-header">new_pair 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                      <STRONG><A HREF="new_pair.3x.html">new_pair(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index a96342558..1da7e511c 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2017 Free Software Foundation, Inc.                            *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.46 2024/03/23 20:42:29 tom Exp @
+  * @Id: scr_dump.5,v 1.50 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>scr_dump 5 2024-03-23 ncurses 6.5 File formats</TITLE>
+<TITLE>scr_dump 5 2025-01-18 ncurses 6.5 File formats</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.5 File formats</H1>
+<H1 class="no-header">scr_dump 5 2025-01-18 ncurses 6.5 File formats</H1>
 <PRE>
 <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>                      File formats                      <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 
@@ -130,7 +130,7 @@ <H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.5 File formats</H1>
 
 
 </PRE><H3><a name="h3-X_Open-Curses">X/Open Curses</a></H3><PRE>
-       X/Open Curses, Issue 7 specifies little.  It  says  (boldface  emphasis
+       X/Open Curses Issue 7 specifies little.   It  says  (boldface  emphasis
        added)
 
           "[t]he  <EM>getwin()</EM>  function  reads  window-related data stored in the
@@ -390,7 +390,7 @@ <H1 class="no-header">scr_dump 5 2024-03-23 ncurses 6.5 File formats</H1>
 
 
 
-ncurses 6.5                       2024-03-23                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
+ncurses 6.5                       2025-01-18                       <STRONG><A HREF="scr_dump.5.html">scr_dump(5)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 7d6b42c6f..f467a18a8 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp @
+  * @Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2024-09-21 ncurses 6.5 User commands</TITLE>
+<TITLE>tabs 1 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2024-09-21 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tabs 1 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -257,7 +257,7 @@ <H1 class="no-header">tabs 1 2024-09-21 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-21                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index d618f7353..4c93cb7fc 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20241228).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20250118).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -1055,8 +1055,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        X/Open Curses does not say what "appropriate <EM>x</EM>" 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
-       31.
+       logically "and"-ed with 0x1f, mapping to ASCII  control  codes  in  the
+       range 0 through 31.
 
        Other escapes include
 
@@ -1332,13 +1332,14 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
             arithmetic (%m is <EM>mod</EM>): <EM>push(pop()</EM> <EM>op</EM> <EM>pop())</EM>
 
        <STRONG>%&amp;</STRONG>, <STRONG>%|</STRONG>, <STRONG>%^</STRONG>
-            bit operations (AND, OR and exclusive-OR): <EM>push(pop()</EM> <EM>op</EM> <EM>pop())</EM>
+            bit  operations  ("and",  "or"  and exclusive "or"): <EM>push(pop()</EM> <EM>op</EM>
+            <EM>pop())</EM>
 
        <STRONG>%=</STRONG>, <STRONG>%&gt;</STRONG>, <STRONG>%&lt;</STRONG>
             logical operations: <EM>push(pop()</EM> <EM>op</EM> <EM>pop())</EM>
 
        <STRONG>%A</STRONG>, <STRONG>%O</STRONG>
-            logical AND and OR operations (for conditionals)
+            logical "and" and "or" operations (for conditionals)
 
        <STRONG>%!</STRONG>, <STRONG>%~</STRONG>
             unary operations (logical and bit complement): <EM>push(op</EM> <EM>pop())</EM>
@@ -1347,8 +1348,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        <STRONG>%?</STRONG> <EM>expr</EM> <STRONG>%t</STRONG> <EM>thenpart</EM> <STRONG>%e</STRONG> <EM>elsepart</EM> <STRONG>%;</STRONG>
             This forms an if-then-else.  The <STRONG>%e</STRONG> <EM>elsepart</EM> is optional.  Usually
-            the <STRONG>%?</STRONG> <EM>expr</EM> part pushes a value onto the stack,  and  <STRONG>%t</STRONG>  pops  it
-            from  the  stack,  testing if it is nonzero (true).  If it is zero
+            the  <STRONG>%?</STRONG>  <EM>expr</EM>  part  pushes a value onto the stack, and <STRONG>%t</STRONG> pops it
+            from the stack, testing if it is nonzero (true).  If  it  is  zero
             (false), control passes to the <STRONG>%e</STRONG> (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1356,18 +1357,18 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
             where ci are conditions, bi are bodies.
 
-            Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the  structure  of  if-
+            Use  the  <STRONG>-f</STRONG>  option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the structure of if-
             then-else's.  Some strings, e.g., <STRONG>sgr</STRONG> can be very complicated when
-            written on one line.  The <STRONG>-f</STRONG> option splits the string  into  lines
+            written  on  one line.  The <STRONG>-f</STRONG> 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}%-".   <STRONG>%P</STRONG>  and  <STRONG>%g</STRONG>
+       Binary operations are in postfix form with the operands  in  the  usual
+       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  <STRONG>%P</STRONG> and <STRONG>%g</STRONG>
        variables are persistent across escape-string evaluations.
 
        Consider the HP2645, which, to get to line 3 and column 12, needs to be
-       sent \E&amp;a12c03Y padded for 6 milliseconds.  The order of the lines  and
-       columns  is  inverted here, and the lines and column are printed as two
+       sent  \E&amp;a12c03Y padded for 6 milliseconds.  The order of the lines and
+       columns is inverted here, and the lines and column are printed  as  two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&amp;a%p2%dc%p1%dY$&lt;6&gt;,
 
@@ -1375,65 +1376,65 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        a <STRONG>^T</STRONG>, with the line and column simply encoded in binary,
               cup=^T%p1%c%p2%c
 
-       Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
-       (<STRONG>cub1</STRONG>), and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).   This
+       Terminals which use "%c" need  to  be  able  to  backspace  the  cursor
+       (<STRONG>cub1</STRONG>),  and to move the cursor up one line on the screen (<STRONG>cuu1</STRONG>).  This
        is necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> and <STRONG>\r</STRONG>, 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
+       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 line and column offset by
        a space, 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
-       character.  Then the same is  done  for  the  second  parameter.   More
+       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
+       character.   Then  the  same  is  done  for the second parameter.  More
        complex arithmetic is possible using the stack.
 
 
 </PRE><H3><a name="h3-Cursor-Motions">Cursor Motions</a></H3><PRE>
-       If  the  terminal has a fast way to home the cursor (to very upper left
-       corner of screen) then this can be given as <STRONG>home</STRONG>; similarly a fast  way
-       of  getting  to the lower left-hand corner can be given as <STRONG>ll</STRONG>; 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 <STRONG>home</STRONG>; similarly a fast way
+       of getting to the lower left-hand corner can be given as <STRONG>ll</STRONG>;  this  may
        involve going up with <STRONG>cuu1</STRONG> from the home position, but a program should
        never do this itself (unless <STRONG>ll</STRONG> 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
+       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 cannot be used for <STRONG>home</STRONG>.)
 
-       If  the  terminal  has line or column absolute cursor addressing, these
-       can be given as single parameter capabilities <STRONG>hpa</STRONG> (horizontal  position
-       absolute)  and  <STRONG>vpa</STRONG>  (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  <STRONG>cup</STRONG>.   If  there  are
-       parameterized local motions (e.g., move <EM>n</EM> spaces to  the  right)  these
-       can  be  given  as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with a single parameter
-       indicating how many spaces to move.  These are primarily useful if  the
+       If the terminal has line or column absolute  cursor  addressing,  these
+       can  be given as single parameter capabilities <STRONG>hpa</STRONG> (horizontal position
+       absolute) and <STRONG>vpa</STRONG> (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  <STRONG>cup</STRONG>.   If  there   are
+       parameterized  local  motions  (e.g., move <EM>n</EM> spaces to the right) these
+       can be given as  <STRONG>cud</STRONG>,  <STRONG>cub</STRONG>,  <STRONG>cuf</STRONG>,  and  <STRONG>cuu</STRONG>  with  a  single  parameter
+       indicating  how many spaces to move.  These are primarily useful if the
        terminal does not have <STRONG>cup</STRONG>, 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 <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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
+       be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>.  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.  This is also used for
-       the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets the command character  to  be  the
-       one  used  by  terminfo.   If  the  <STRONG>smcup</STRONG> sequence will not restore the
-       screen after an <STRONG>rmcup</STRONG>  sequence  is  output  (to  the  state  prior  to
+       the  TEKTRONIX  4025,  where <STRONG>smcup</STRONG> sets the command character to be the
+       one used by terminfo.  If the  <STRONG>smcup</STRONG>  sequence  will  not  restore  the
+       screen  after  an  <STRONG>rmcup</STRONG>  sequence  is  output  (to  the state prior to
        outputting <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>.
 
 
 </PRE><H3><a name="h3-Margins">Margins</a></H3><PRE>
-       SVr4  (and  X/Open Curses) list several string capabilities for setting
-       margins.  Two were intended for use with  terminals,  and  another  six
+       SVr4 (and X/Open Curses) list several string capabilities  for  setting
+       margins.   Two  were  intended  for use with terminals, and another six
        were intended for use with printers.
 
        <STRONG>o</STRONG>   The two terminal capabilities assume that the terminal may have the
-           capability of setting the left and/or right margin at  the  current
+           capability  of  setting the left and/or right margin at the current
            cursor column position.
 
        <STRONG>o</STRONG>   The printer capabilities assume that the printer may have two types
@@ -1442,31 +1443,31 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
            <STRONG>o</STRONG>   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           <STRONG>o</STRONG>   parameterized  capabilities  for setting the top, bottom, left,
+           <STRONG>o</STRONG>   parameterized capabilities for setting the top,  bottom,  left,
                right margins given the number of lines or columns.
 
-       In practice, the categorization into "terminal" and  "printer"  is  not
+       In  practice,  the  categorization into "terminal" and "printer" is not
        suitable:
 
-       <STRONG>o</STRONG>   The  AT&amp;T  SVr4  terminal  database  uses <STRONG>smgl</STRONG> four times, for AT&amp;T
+       <STRONG>o</STRONG>   The AT&amp;T SVr4 terminal database uses  <STRONG>smgl</STRONG>  four  times,  for  AT&amp;T
            hardware.
 
-           Three of the four are printers.   They  lack  the  ability  to  set
+           Three  of  the  four  are  printers.   They lack the ability to set
            left/right margins by specifying the column.
 
-       <STRONG>o</STRONG>   Other  (non-AT&amp;T) terminals may support margins but using different
+       <STRONG>o</STRONG>   Other (non-AT&amp;T) terminals may support margins but using  different
            assumptions from AT&amp;T.
 
-           For instance, the DEC VT420 supports left/right margins,  but  only
+           For  instance,  the DEC VT420 supports left/right margins, but only
            using a column parameter.  As an added complication, the VT420 uses
-           two settings to fully enable left/right margins (left/right  margin
-           mode,  and  origin  mode).   The  former enables the margins, which
-           causes printed text to wrap  within  margins,  but  the  latter  is
+           two  settings to fully enable left/right margins (left/right margin
+           mode, and origin mode).  The  former  enables  the  margins,  which
+           causes  printed  text  to  wrap  within  margins, but the latter is
            needed to prevent cursor-addressing outside those margins.
 
-       <STRONG>o</STRONG>   Both  DEC  VT420  left/right  margins are set with a single control
+       <STRONG>o</STRONG>   Both DEC VT420 left/right margins are set  with  a  single  control
            sequence.  If either is omitted, the corresponding margin is set to
-           the  left  or  right  edge  of the display (rather than leaving the
+           the left or right edge of the  display  (rather  than  leaving  the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1484,231 +1485,231 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
                  <STRONG>smglr</STRONG>   Set both left and right margins to <EM>L</EM> and <EM>R</EM>
                  <STRONG>smgtb</STRONG>   Set both top and bottom margins to <EM>T</EM> and <EM>B</EM>
 
-       When writing an application that uses these  string  capabilities,  the
-       pairs  should be first checked to see if each capability in the pair is
+       When  writing  an  application that uses these string capabilities, the
+       pairs should be first checked to see if each capability in the pair  is
        set or only one is set:
 
-       <STRONG>o</STRONG>   If both <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG>  are  set,  each  is  used  with  a  single
-           argument,  <EM>N</EM>,  that  gives  the column number of the left and right
+       <STRONG>o</STRONG>   If  both  <STRONG>smglp</STRONG>  and  <STRONG>smgrp</STRONG>  are  set,  each  is used with a single
+           argument, <EM>N</EM>, that gives the column number of  the  left  and  right
            margin, respectively.
 
-       <STRONG>o</STRONG>   If both <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> are set, each is used to set  the  top  and
+       <STRONG>o</STRONG>   If  both  <STRONG>smgtp</STRONG>  and <STRONG>smgbp</STRONG> are set, each is used to set the top and
            bottom margin, respectively:
 
            <STRONG>o</STRONG>   <STRONG>smgtp</STRONG> is used with a single argument, <EM>N</EM>, the line number of the
                top margin.
 
-           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG> is used with two arguments, <EM>N</EM> and <EM>M</EM>, that give  the  line
+           <STRONG>o</STRONG>   <STRONG>smgbp</STRONG>  is  used with two arguments, <EM>N</EM> and <EM>M</EM>, that give the line
                number of the bottom margin, the first counting from the top of
-               the page  and  the  second  counting  from  the  bottom.   This
-               accommodates  the two styles of specifying the bottom margin in
+               the  page  and  the  second  counting  from  the  bottom.  This
+               accommodates the two styles of specifying the bottom margin  in
                different manufacturers' printers.
 
-           When designing a terminfo entry for a printer that has  a  settable
-           bottom  margin,  only  the first or second argument should be used,
+           When  designing  a terminfo entry for a printer that has a settable
+           bottom margin, only the first or second argument  should  be  used,
            depending on the printer.  When developing an application that uses
            <STRONG>smgbp</STRONG> to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       <STRONG>o</STRONG>   If  only  one  of  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it is used with two
+       <STRONG>o</STRONG>   If only one of <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> is set, then it  is  used  with  two
            arguments, the column number of the left and right margins, in that
            order.
 
-       <STRONG>o</STRONG>   Likewise,  if  only  one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then it is used
-           with two arguments that give the top and bottom  margins,  in  that
+       <STRONG>o</STRONG>   Likewise, if only one of <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG> is set, then  it  is  used
+           with  two  arguments  that give the top and bottom margins, in that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both left and right or top and bottom margins simultaneously,  only
-           one  capability  in  the  pairs  <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or <STRONG>smgtp</STRONG> and <STRONG>smgbp</STRONG>
+           both  left and right or top and bottom margins simultaneously, only
+           one capability in the pairs <STRONG>smglp</STRONG> and  <STRONG>smgrp</STRONG>  or  <STRONG>smgtp</STRONG>  and  <STRONG>smgbp</STRONG>
            should be defined, leaving the other unset.
 
-       Except for very old terminal descriptions, e.g.,  those  developed  for
-       SVr4,  the  scheme  just  described  should be considered obsolete.  An
+       Except  for  very  old terminal descriptions, e.g., those developed for
+       SVr4, the scheme just described  should  be  considered  obsolete.   An
        improved set of capabilities was added late in the SVr4 releases (<STRONG>smglr</STRONG>
-       and  <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting the
+       and <STRONG>smgtb</STRONG>),  which  explicitly  use  two  parameters  for  setting  the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The <STRONG>mgc</STRONG> string capability should  be  defined.   Applications  such  as
+       The  <STRONG>mgc</STRONG>  string  capability  should  be defined.  Applications such as
        <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG> rely upon this to reset all margins.
 
 
 </PRE><H3><a name="h3-Area-Clears">Area Clears</a></H3><PRE>
-       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  <STRONG>el</STRONG>.   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  <STRONG>el1</STRONG>.  If the terminal can clear from the current position to
-       the end of the display, then this should be given as <STRONG>ed</STRONG>.   <STRONG>Ed</STRONG>  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 <STRONG>el</STRONG>.  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 <STRONG>el1</STRONG>.  If the terminal can clear from the current  position  to
+       the  end  of  the display, then this should be given as <STRONG>ed</STRONG>.  <STRONG>Ed</STRONG> 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  <STRONG>ed</STRONG>  is  not
+       a  request  to  delete  a  large  number  of lines, if a true <STRONG>ed</STRONG> is not
        available.)
 
 
 </PRE><H3><a name="h3-Insert_Delete-Line-and-Vertical-Motions">Insert/Delete Line and Vertical Motions</a></H3><PRE>
-       If  the  terminal  can  open a new blank line before the line where the
-       cursor is, this should be given as <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; 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 <STRONG>il1</STRONG>; 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 <STRONG>dl1</STRONG>; this is done only from the  first
        position on the line to be deleted.  Versions of <STRONG>il1</STRONG> and <STRONG>dl1</STRONG> which take
        a single parameter and insert or delete that many lines can be given as
        <STRONG>il</STRONG> and <STRONG>dl</STRONG>.
 
-       If the terminal has a settable scrolling region (like  the  vt100)  the
-       command  to  set  this  can be described with the <STRONG>csr</STRONG> capability, which
+       If  the  terminal  has a settable scrolling region (like the vt100) the
+       command to set this can be described with  the  <STRONG>csr</STRONG>  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 <STRONG>csr</STRONG> on
-       a properly chosen region; the <STRONG>sc</STRONG>  and  <STRONG>rc</STRONG>  (save  and  restore  cursor)
+       It is possible to get the effect of insert or delete line using <STRONG>csr</STRONG>  on
+       a  properly  chosen  region;  the  <STRONG>sc</STRONG>  and <STRONG>rc</STRONG> (save and restore cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string does not move the cursor.  (Note that  the  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>  library
-       does   this   synthesis   automatically,   so   you  need  not  compose
+       string  does  not  move the cursor.  (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library
+       does  this  synthesis  automatically,   so   you   need   not   compose
        insert/delete strings for an entry with <STRONG>csr</STRONG>).
 
-       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   however   also   has
+       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  however  also  has
        insert/delete).
 
-       Inserting  lines  at  the  top or bottom of the screen can also be done
-       using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a  true  insert/delete  line,
+       Inserting lines at the top or bottom of the screen  can  also  be  done
+       using  <STRONG>ri</STRONG>  or  <STRONG>ind</STRONG> on many terminals without a true insert/delete line,
        and is often faster even on terminals with those features.
 
-       The  Boolean  <STRONG>non_dest_scroll_region</STRONG>  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 something to the bottom line, move the cursor to the  top
-       of  the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data scrolled
-       off the bottom of the region by the <STRONG>ri</STRONG> re-appears,  then  scrolling  is
+       The Boolean <STRONG>non_dest_scroll_region</STRONG> 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 something to the bottom line, move the cursor to the top
+       of the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>.  If the data  scrolled
+       off  the  bottom  of the region by the <STRONG>ri</STRONG> re-appears, then scrolling is
        non-destructive.  System V and X/Open Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>,
        and  <STRONG>rin</STRONG>  will  simulate  destructive  scrolling;  their  documentation
-       cautions  you  not  to  define  <STRONG>csr</STRONG>  unless  this is true.  This <STRONG>curses</STRONG>
-       implementation is more  liberal  and  will  do  explicit  erases  after
+       cautions you not to define  <STRONG>csr</STRONG>  unless  this  is  true.   This  <STRONG>curses</STRONG>
+       implementation  is  more  liberal  and  will  do  explicit erases after
        scrolling if <STRONG>ndsrc</STRONG> 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  <STRONG>wind</STRONG>.  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 <STRONG>wind</STRONG>.  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 <STRONG>da</STRONG> capability
-       should  be  given;  if  display  memory  can be retained below, then <STRONG>db</STRONG>
-       should be given.  These indicate that deleting a line or scrolling  may
-       bring  non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG> may
+       should be given; if display memory  can  be  retained  below,  then  <STRONG>db</STRONG>
+       should  be given.  These indicate that deleting a line or scrolling may
+       bring non-blank lines up from below or that scrolling back with <STRONG>ri</STRONG>  may
        bring down non-blank lines.
 
 
 </PRE><H3><a name="h3-Insert_Delete-Character">Insert/Delete Character</a></H3><PRE>
-       There are two basic kinds of  intelligent  terminals  with  respect  to
-       insert/delete  character  which  can  be described using <EM>terminfo</EM>.  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
+       There  are  two  basic  kinds  of intelligent terminals with respect to
+       insert/delete character which can be  described  using  <EM>terminfo</EM>.   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 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
-       second  type  of  terminal,  and  should  give the capability <STRONG>in</STRONG>, which
+       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
+       second type of terminal, and  should  give  the  capability  <STRONG>in</STRONG>,  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 <STRONG>smir</STRONG> the sequence to get into insert mode.  Give
-       as <STRONG>rmir</STRONG> the sequence to leave  insert  mode.   Now  give  as  <STRONG>ich1</STRONG>  any
-       sequence  needed  to  be  sent  just before sending the character to be
-       inserted.  Most terminals with a true insert mode will not  give  <STRONG>ich1</STRONG>;
-       terminals  which  send a sequence to open a screen position should give
+       as  <STRONG>rmir</STRONG>  the  sequence  to  leave  insert  mode.  Now give as <STRONG>ich1</STRONG> any
+       sequence needed to be sent just before  sending  the  character  to  be
+       inserted.   Most  terminals with a true insert mode will not give <STRONG>ich1</STRONG>;
+       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  <STRONG>ich1</STRONG>.
-       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  <STRONG>ich</STRONG>  sequences do not require previous smir, and most smir insert
-       modes do not require <STRONG>ich1</STRONG> before each character.   Therefore,  the  new
-       <STRONG>curses</STRONG>  actually  assumes this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or
-       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> 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 <STRONG>ich1</STRONG>.
+       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 <STRONG>ich</STRONG> sequences do not require previous smir, and most  smir  insert
+       modes  do  not  require <STRONG>ich1</STRONG> before each character.  Therefore, the new
+       <STRONG>curses</STRONG> actually assumes this is the case and uses either  <STRONG>rmir</STRONG>/<STRONG>smir</STRONG>  or
+       <STRONG>ich</STRONG>/<STRONG>ich1</STRONG>  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 <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in  <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be sent
+       in <STRONG>ip</STRONG> (a string option).  Any other sequence which may need to be  sent
        after an insert of a single character may also be given in <STRONG>ip</STRONG>.  If your
-       terminal  needs  both  to be placed into an "insert mode" and a special
-       code to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG>  and  <STRONG>ich1</STRONG>
-       can  be  given,  and  both  will be used.  The <STRONG>ich</STRONG> capability, with one
+       terminal needs both to be placed into an "insert mode"  and  a  special
+       code  to  precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> and <STRONG>ich1</STRONG>
+       can be given, and both will be used.   The  <STRONG>ich</STRONG>  capability,  with  one
        parameter, <EM>n</EM>, will repeat the effects of <STRONG>ich1</STRONG> <EM>n</EM> 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 <STRONG>rmp</STRONG>.
 
-       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 <STRONG>mir</STRONG> to  speed  up  inserting  in  this
-       case.   Omitting  <STRONG>mir</STRONG>  will affect only speed.  Some terminals (notably
-       Datamedia's) must not have <STRONG>mir</STRONG> 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 <STRONG>mir</STRONG> to speed up inserting in this
+       case.  Omitting <STRONG>mir</STRONG> will affect only speed.   Some  terminals  (notably
+       Datamedia's)  must  not  have  <STRONG>mir</STRONG> because of the way their insert mode
        works.
 
-       Finally,  you  can  specify <STRONG>dch1</STRONG> to delete a single character, <STRONG>dch</STRONG> with
+       Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
        one parameter, <EM>n</EM>, to delete <EM>n</EM>characters, and delete mode by giving <STRONG>smdc</STRONG>
-       and  <STRONG>rmdc</STRONG> to enter and exit delete mode (any mode the terminal needs to
+       and <STRONG>rmdc</STRONG> to enter and exit delete mode (any mode the terminal needs  to
        be placed in for <STRONG>dch1</STRONG> to work).
 
-       A command to erase <EM>n</EM> characters  (equivalent  to  outputting  <EM>n</EM>  blanks
+       A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
 
 
 </PRE><H3><a name="h3-Highlighting_Underlining_and-Visible-Bells">Highlighting, Underlining, and Visible Bells</a></H3><PRE>
        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  <EM>standout</EM>  <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, 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 <EM>standout</EM> <EM>mode</EM>,  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 <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>,  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
        <STRONG>xmc</STRONG> should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as <STRONG>smul</STRONG> and
        <STRONG>rmul</STRONG> 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 <STRONG>uc</STRONG>.
 
-       Other  capabilities  to  enter various highlighting modes include <STRONG>blink</STRONG>
-       (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> (dim or  half-bright)  <STRONG>invis</STRONG>
-       (blanking  or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG>
-       (turn off <EM>all</EM> attribute modes) <STRONG>smacs</STRONG>  (enter  alternate  character  set
+       Other capabilities to enter various highlighting  modes  include  <STRONG>blink</STRONG>
+       (blinking)  <STRONG>bold</STRONG>  (bold or extra bright) <STRONG>dim</STRONG> (dim or half-bright) <STRONG>invis</STRONG>
+       (blanking or invisible text) <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video)  <STRONG>sgr0</STRONG>
+       (turn  off  <EM>all</EM>  attribute  modes) <STRONG>smacs</STRONG> (enter alternate character set
        mode) and <STRONG>rmacs</STRONG> (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  <STRONG>sgr</STRONG> (set attributes), taking 9 parameters.  Each
+       If  there  is  a  sequence to set arbitrary combinations of modes, this
+       should be given as <STRONG>sgr</STRONG> (set attributes),  taking  9  parameters.   Each
        parameter is either zero (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.
+       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  <STRONG>sgr</STRONG>,  only  those  for  which
        corresponding separate attribute commands exist.
 
@@ -1727,17 +1728,17 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
                    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
-       terminal  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
+       terminal 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
-       output when either p1 or p3 is true, that is,  if  either  standout  or
+       Some sequences are common to  different  modes.   For  example,  ;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 dependencies yields
@@ -1758,54 +1759,54 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
            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
+       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
+       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  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> capability, asserting that it  is
+       Terminals   with  the  "magic  cookie"  glitch  (<STRONG>xmc</STRONG>)  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 <STRONG>msgr</STRONG> 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 <STRONG>flash</STRONG>;  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 <STRONG>flash</STRONG>; 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
        <STRONG>cvvis</STRONG>.  If there is a way to make the cursor completely invisible, give
-       that  as  <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> should be given which undoes the
+       that as <STRONG>civis</STRONG>.  The capability <STRONG>cnorm</STRONG> 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 <STRONG>ul</STRONG>.  If  a  character  overstriking  another
-       leaves  both  characters  on the screen, specify the capability <STRONG>os</STRONG>.  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  <STRONG>ul</STRONG>.  If a character overstriking another
+       leaves both characters on the screen, specify the  capability  <STRONG>os</STRONG>.   If
        overstrikes are erasable with a blank, then this should be indicated by
        giving <STRONG>eo</STRONG>.
 
 
 </PRE><H3><a name="h3-Keypad-and-Function-Keys">Keypad and Function Keys</a></H3><PRE>
-       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
-       to  transmit  or  not  transmit,  give  these  codes  as <STRONG>smkx</STRONG> and <STRONG>rmkx</STRONG>.
+       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
+       to transmit or not  transmit,  give  these  codes  as  <STRONG>smkx</STRONG>  and  <STRONG>rmkx</STRONG>.
        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 <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG>
+       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
+       and home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG>  <STRONG>kcuu1,</STRONG>  <STRONG>kcud1,</STRONG>  and  <STRONG>khome</STRONG>
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes  they  send  can  be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>.  If these keys
-       have labels other than the default f0 through f10, the  labels  can  be
+       codes they send can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG>  <STRONG>kf10</STRONG>.   If  these  keys
+       have  labels  other  than the default f0 through f10, the labels can be
        given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>.
 
        The codes transmitted by certain other special keys can be given:
@@ -1844,64 +1845,64 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        <STRONG>o</STRONG>   <STRONG>khts</STRONG> (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  <STRONG>ka1</STRONG>,  <STRONG>ka3</STRONG>,  <STRONG>kb2</STRONG>,
-       <STRONG>kc1</STRONG>,  and  <STRONG>kc3</STRONG>.   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 <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>,
+       <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>.  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 <STRONG>pfkey</STRONG>, <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>.
-       A  string to program screen labels should be specified as <STRONG>pln</STRONG>.  Each of
-       these strings takes two parameters: the function key number to  program
+       A string to program screen labels should be specified as <STRONG>pln</STRONG>.  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 <STRONG>pfkey</STRONG> causes
-       pressing the given key to be the same as  the  user  typing  the  given
-       string;  <STRONG>pfloc</STRONG>  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  <STRONG>pfkey</STRONG>  causes
+       pressing  the  given  key  to  be the same as the user typing the given
+       string; <STRONG>pfloc</STRONG> causes the string to  be  executed  by  the  terminal  in
        local; and <STRONG>pfx</STRONG> causes the string to be transmitted to the computer.
 
-       The capabilities <STRONG>nlab</STRONG>, <STRONG>lw</STRONG> and <STRONG>lh</STRONG>  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  <STRONG>smln</STRONG>  and  <STRONG>rmln</STRONG>.   <STRONG>smln</STRONG>  is
-       normally  output  after one or more pln sequences to make sure that the
+       The  capabilities  <STRONG>nlab</STRONG>,  <STRONG>lw</STRONG>  and  <STRONG>lh</STRONG> 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 <STRONG>smln</STRONG> and <STRONG>rmln</STRONG>.  <STRONG>smln</STRONG> is
+       normally output after one or more pln sequences to make sure  that  the
        change becomes visible.
 
 
 </PRE><H3><a name="h3-Tabs-and-Initialization">Tabs and Initialization</a></H3><PRE>
        A few capabilities are used only for tabs:
 
-       <STRONG>o</STRONG>   If the terminal has hardware tabs, the command to  advance  to  the
+       <STRONG>o</STRONG>   If  the  terminal  has hardware tabs, the command to advance to the
            next tab stop can be given as <STRONG>ht</STRONG> (usually control/I).
 
        <STRONG>o</STRONG>   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as <STRONG>cbt</STRONG>.
 
-           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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> 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 <STRONG>ht</STRONG> or <STRONG>cbt</STRONG> even if they are present, since
            the user may not have the tab stops properly set.
 
-       <STRONG>o</STRONG>   If  the  terminal has hardware tabs which are initially set every <EM>n</EM>
+       <STRONG>o</STRONG>   If the terminal has hardware tabs which are initially set  every  <EM>n</EM>
            spaces when the terminal is powered up, the numeric parameter <STRONG>it</STRONG> is
            given, showing the number of spaces the tabs are set to.
 
            The <STRONG>it</STRONG> capability is normally used by the <STRONG>tset</STRONG> 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
 
        <STRONG>o</STRONG>   <STRONG>is1</STRONG>, <STRONG>is2</STRONG>, and <STRONG>is3</STRONG>, initialization strings for the terminal,
 
-       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>,  the  path  name  of  a  program to be run to initialize the
+       <STRONG>o</STRONG>   <STRONG>iprog</STRONG>, the path name of a program  to  be  run  to  initialize  the
            terminal,
 
        <STRONG>o</STRONG>   and <STRONG>if</STRONG>, 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 <EM>init</EM> option of the <STRONG>tput</STRONG>  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  <EM>init</EM> option of the <STRONG>tput</STRONG> program, each time the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -1925,34 +1926,34 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
               and finally output
                      <STRONG>is3</STRONG>.
 
-       Most  initialization  is  done with <STRONG>is2</STRONG>.  Special terminal modes can be
-       set up without duplicating strings by putting the common  sequences  in
+       Most initialization is done with <STRONG>is2</STRONG>.  Special terminal  modes  can  be
+       set  up  without duplicating strings by putting the common sequences in
        <STRONG>is2</STRONG> and special cases in <STRONG>is1</STRONG> and <STRONG>is3</STRONG>.
 
-       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 <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
-       and  <STRONG>is3</STRONG>  respectively.   These  strings  are output by <EM>reset</EM> option of
-       <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which  is  used  when
+       and <STRONG>is3</STRONG> respectively.  These strings are  output  by  <EM>reset</EM>  option  of
+       <STRONG>tput</STRONG>,  or  by  the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
        the terminal gets into a wedged state.  Commands are normally placed in
        <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> 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  <STRONG>is2</STRONG>,  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 <STRONG>is2</STRONG>, 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 <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>,  etc.,  in  the  same
-       order  as  the  <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc.  If
-       any of <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are  missing,  the
-       <STRONG>reset</STRONG>   program   falls  back  upon  the  corresponding  initialization
+       The  <STRONG>reset</STRONG>  program  writes  strings including <STRONG>iprog</STRONG>, etc., in the same
+       order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of  <STRONG>is1</STRONG>,  etc.   If
+       any  of  <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rs3</STRONG>, or <STRONG>rf</STRONG> reset capability strings are missing, the
+       <STRONG>reset</STRONG>  program  falls  back  upon  the   corresponding   initialization
        capability 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
        <STRONG>tbc</STRONG> (clear all tab stops) and <STRONG>hts</STRONG> (set a tab stop in the current column
-       of every line).  If a more complex sequence is needed to set  the  tabs
+       of  every  line).  If a more complex sequence is needed to set the tabs
        than can be described by this, the sequence can be placed in <STRONG>is2</STRONG> or <STRONG>if</STRONG>.
 
-       The  <STRONG>tput</STRONG>  <STRONG>reset</STRONG>  command uses the same capability strings as the <STRONG>reset</STRONG>
-       command, although the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>)  provide  different
+       The <STRONG>tput</STRONG> <STRONG>reset</STRONG> command uses the same capability strings  as  the  <STRONG>reset</STRONG>
+       command,  although  the two programs (<STRONG>tput</STRONG> and <STRONG>reset</STRONG>) provide different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -1961,78 +1962,78 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        <STRONG>o</STRONG>   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every <EM>eight</EM> columns:
 
-           The  only  exception  was  the  AT&amp;T 2300 series, which set tabs to
+           The only exception was the AT&amp;T 2300  series,  which  set  tabs  to
            every <EM>five</EM> columns.
 
-       <STRONG>o</STRONG>   In particular, developers  of  the  hardware  terminals  which  are
-           commonly  used  as  models  for  modern terminal emulators provided
+       <STRONG>o</STRONG>   In  particular,  developers  of  the  hardware  terminals which are
+           commonly used as models  for  modern  terminal  emulators  provided
            documentation demonstrating that <EM>eight</EM> columns were the standard.
 
        <STRONG>o</STRONG>   Because of this, the terminal initialization programs <STRONG>tput</STRONG> and <STRONG>tset</STRONG>
-           use   the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)  capabilities
-           directly only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a  value
+           use  the  <STRONG>tbc</STRONG>  (<STRONG>clear_all_tabs</STRONG>)  and  <STRONG>hts</STRONG>  (<STRONG>set_tab</STRONG>)   capabilities
+           directly  only when the <STRONG>it</STRONG> (<STRONG>init_tabs</STRONG>) capability is set to a value
            other than <EM>eight</EM>.
 
 
 </PRE><H3><a name="h3-Delays-and-Padding">Delays and Padding</a></H3><PRE>
-       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
+       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 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 <STRONG>xon</STRONG>.  This capability suppresses  the  emission  of
-       padding.   You  can  also  set  it  for  memory-mapped  console devices
+       automatically emits ^S back to the host  when  its  input  buffers  are
+       close  to  full),  set <STRONG>xon</STRONG>.  This capability 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 decisions about
+       still be included so that routines  can  make  better  decisions  about
        relative costs, but actual pad characters will not be transmitted.
 
        If <STRONG>pb</STRONG> (padding baud rate) is given, padding is suppressed at baud rates
-       below  the  value  of  <STRONG>pb</STRONG>.  If the entry has no padding baud rate, then
+       below the value of <STRONG>pb</STRONG>.  If the entry has no  padding  baud  rate,  then
        whether padding is emitted or not is completely controlled by <STRONG>xon</STRONG>.
 
-       If the terminal requires other than a null (zero) character as  a  pad,
-       then  this  can  be  given as <STRONG>pad</STRONG>.  Only the first character of the <STRONG>pad</STRONG>
+       If  the  terminal requires other than a null (zero) character as a pad,
+       then this can be given as <STRONG>pad</STRONG>.  Only the first  character  of  the  <STRONG>pad</STRONG>
        string is used.
 
 
 </PRE><H3><a name="h3-Status-Lines">Status Lines</a></H3><PRE>
-       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 <STRONG>lines</STRONG> 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 <STRONG>hs</STRONG> capability.
 
-       Some  terminals  with status lines need special sequences to access the
-       status line.  These may be expressed as a string with single  parameter
-       <STRONG>tsl</STRONG>  which takes the cursor to a given zero-origin column on the status
-       line.  The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen  cursor
+       Some terminals with status lines need special sequences to  access  the
+       status  line.  These may be expressed as a string with single parameter
+       <STRONG>tsl</STRONG> which takes the cursor to a given zero-origin column on the  status
+       line.   The  capability  <STRONG>fsl</STRONG>  must  return  to  the  main-screen cursor
        positions before the last <STRONG>tsl</STRONG>.  You may need to embed the string values
-       of <STRONG>sc</STRONG> (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and  <STRONG>fsl</STRONG>  to
+       of  <STRONG>sc</STRONG>  (save  cursor)  and  <STRONG>rc</STRONG>  (restore  cursor)  in  <STRONG>tsl</STRONG>  and <STRONG>fsl</STRONG> 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 <STRONG>wsl</STRONG>.
 
        A command to erase or blank the status line may be specified as <STRONG>dsl</STRONG>.
 
-       The  Boolean  capability  <STRONG>eslok</STRONG>  specifies that escape sequences, tabs,
+       The Boolean capability <STRONG>eslok</STRONG> specifies  that  escape  sequences,  tabs,
        etc., work ordinarily in the status line.
 
-       The <EM>ncurses</EM> implementation does not yet use any of these  capabilities.
+       The  <EM>ncurses</EM> implementation does not yet use any of these capabilities.
        They are documented here in case they ever become important.
 
 
 </PRE><H3><a name="h3-Line-Graphics">Line Graphics</a></H3><PRE>
-       Many  terminals have alternate character sets useful for forms-drawing.
-       Terminfo and <STRONG>curses</STRONG> have built-in  support  for  most  of  the  drawing
-       characters  supported  by the VT100, with some characters from the AT&amp;T
-       4410v1 added.  This alternate character set may  be  specified  by  the
+       Many terminals have alternate character sets useful for  forms-drawing.
+       Terminfo  and  <STRONG>curses</STRONG>  have  built-in  support  for most of the drawing
+       characters supported by the VT100, with some characters from  the  AT&amp;T
+       4410v1  added.   This  alternate  character set may be specified by the
        <STRONG>acsc</STRONG> capability.
 
                           <STRONG>acsc</STRONG>
@@ -2049,8 +2050,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        <STRONG>ACS_PLMINUS</STRONG>   0x67      g      <STRONG>#</STRONG>  plus/minus
        <STRONG>ACS_BOARD</STRONG>     0x68      h      <STRONG>#</STRONG>  board of squares
        <STRONG>ACS_LANTERN</STRONG>   0x69      i      <STRONG>#</STRONG>  lantern symbol
-       <STRONG>ACS_LRCORNER</STRONG>  0x6a      j      <STRONG>+</STRONG>  lower right corner
 
+       <STRONG>ACS_LRCORNER</STRONG>  0x6a      j      <STRONG>+</STRONG>  lower right corner
        <STRONG>ACS_URCORNER</STRONG>  0x6b      k      <STRONG>+</STRONG>  upper right corner
        <STRONG>ACS_ULCORNER</STRONG>  0x6c      l      <STRONG>+</STRONG>  upper left corner
        <STRONG>ACS_LLCORNER</STRONG>  0x6d      m      <STRONG>+</STRONG>  lower left corner
@@ -2074,34 +2075,34 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        A few notes apply to the table itself:
 
-       <STRONG>o</STRONG>   X/Open  Curses  incorrectly  states that the mapping for <EM>lantern</EM> is
-           uppercase "I" although Unix implementations use the  lowercase  "i"
+       <STRONG>o</STRONG>   X/Open Curses incorrectly states that the mapping  for  <EM>lantern</EM>  is
+           uppercase  "I"  although Unix implementations use the lowercase "i"
            mapping.
 
-       <STRONG>o</STRONG>   The  DEC  VT100  implemented graphics using the alternate character
-           set feature, temporarily switching <EM>modes</EM> and sending characters  in
-           the  range  0x60  (96)  to 0x7e (126) (the <STRONG>acsc</STRONG> <STRONG>Value</STRONG> column in the
+       <STRONG>o</STRONG>   The DEC VT100 implemented graphics using  the  alternate  character
+           set  feature, temporarily switching <EM>modes</EM> and sending characters in
+           the range 0x60 (96) to 0x7e (126) (the <STRONG>acsc</STRONG>  <STRONG>Value</STRONG>  column  in  the
            table).
 
        <STRONG>o</STRONG>   The AT&amp;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&amp;T terminal: <EM>board</EM> <EM>of</EM> <EM>squares</EM>
-           replaces the VT100 <EM>newline</EM> symbol, while  <EM>lantern</EM>  <EM>symbol</EM>  replaces
+           Some  of  the  characters  within the range do not match the VT100;
+           presumably they were used in the AT&amp;T terminal:  <EM>board</EM>  <EM>of</EM>  <EM>squares</EM>
+           replaces  the  VT100  <EM>newline</EM> symbol, while <EM>lantern</EM> <EM>symbol</EM> replaces
            the VT100 <EM>vertical</EM> <EM>tab</EM> symbol.  The other VT100 symbols for control
-           characters (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) are  not
+           characters  (<EM>horizontal</EM> <EM>tab</EM>, <EM>carriage</EM> <EM>return</EM> and <EM>line-feed</EM>) 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  <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG>  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 <STRONG>smacs</STRONG>/<STRONG>rmacs</STRONG> 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.
 
 
 </PRE><H3><a name="h3-Color-Handling">Color Handling</a></H3><PRE>
-       The  curses  library  functions <STRONG>init_pair</STRONG> and <STRONG>init_color</STRONG> manipulate the
-       <EM>color</EM>  <EM>pairs</EM>  and  <EM>color</EM>  <EM>values</EM>  discussed  in   this   section   (see
+       The curses library functions <STRONG>init_pair</STRONG> and  <STRONG>init_color</STRONG>  manipulate  the
+       <EM>color</EM>   <EM>pairs</EM>   and   <EM>color</EM>  <EM>values</EM>  discussed  in  this  section  (see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2110,45 +2111,45 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
            is usually 8), and can set character-cell foreground and background
            colors independently, mixing them into <EM>N</EM> * <EM>N</EM> color pairs.
 
-       <STRONG>o</STRONG>   On  HP-like  terminals,  the  user  must  set  each  color  pair up
-           separately  (foreground  and  background  are   not   independently
-           settable).   Up  to  <EM>M</EM> color pairs may be set up from 2*<EM>M</EM> different
+       <STRONG>o</STRONG>   On HP-like  terminals,  the  user  must  set  each  color  pair  up
+           separately   (foreground   and  background  are  not  independently
+           settable).  Up to <EM>M</EM> color pairs may be set up  from  2*<EM>M</EM>  different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric  capabilities  <STRONG>colors</STRONG>  and <STRONG>pairs</STRONG> specify the maximum numbers of
-       colors and color pairs that can be displayed  simultaneously.   The  <STRONG>op</STRONG>
+       numeric capabilities <STRONG>colors</STRONG> and <STRONG>pairs</STRONG> specify the  maximum  numbers  of
+       colors  and  color  pairs that can be displayed simultaneously.  The <STRONG>op</STRONG>
        (original pair) string resets foreground and background colors to their
-       default values for the terminal.  The <STRONG>oc</STRONG> 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;
+       default  values  for  the terminal.  The <STRONG>oc</STRONG> 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 <STRONG>bce</STRONG>.
 
-       While the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting  the
-       inability  of  some  devices  to  set  foreground and background colors
-       independently), there  are  separate  capabilities  for  setting  these
+       While  the  curses  library  works  with  <EM>color</EM>  <EM>pairs</EM>  (reflecting the
+       inability of some devices  to  set  foreground  and  background  colors
+       independently),  there  are  separate  capabilities  for  setting these
        features:
 
-       <STRONG>o</STRONG>   To   change  the  current  foreground  or  background  color  on  a
-           Tektronix-type terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and  <STRONG>setab</STRONG>
-           (set  ANSI  background)  or  <STRONG>setf</STRONG>  (set  foreground)  and <STRONG>setb</STRONG> (set
+       <STRONG>o</STRONG>   To  change  the  current  foreground  or  background  color  on   a
+           Tektronix-type  terminal, use <STRONG>setaf</STRONG> (set ANSI foreground) and <STRONG>setab</STRONG>
+           (set ANSI background)  or  <STRONG>setf</STRONG>  (set  foreground)  and  <STRONG>setb</STRONG>  (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation  describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says that
-           "If the terminal supports ANSI escape sequences to  set  background
-           and   foreground,   they  should  be  coded  as  <STRONG>setaf</STRONG>  and  <STRONG>setab</STRONG>,
+           documentation describes only <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>; the XPG4 draft says  that
+           "If  the  terminal supports ANSI escape sequences to set background
+           and  foreground,  they  should  be  coded  as  <STRONG>setaf</STRONG>   and   <STRONG>setab</STRONG>,
            respectively.
 
-       <STRONG>o</STRONG>   If the terminal supports other escape sequences to  set  background
-           and   foreground,   they   should   be  coded  as  <STRONG>setf</STRONG>  and  <STRONG>setb</STRONG>,
-           respectively.  The <STRONG>vidputs</STRONG> and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  functions  use  the
+       <STRONG>o</STRONG>   If  the  terminal supports other escape sequences to set background
+           and  foreground,  they  should  be  coded   as   <STRONG>setf</STRONG>   and   <STRONG>setb</STRONG>,
+           respectively.   The  <STRONG>vidputs</STRONG>  and the <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> functions use the
            <STRONG>setaf</STRONG> and <STRONG>setab</STRONG> capabilities if they are defined.
 
-       The  <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single numeric
+       The <STRONG>setaf</STRONG>/<STRONG>setab</STRONG>  and  <STRONG>setf</STRONG>/<STRONG>setb</STRONG>  capabilities  take  a  single  numeric
        argument each.  Argument values 0-7 of <STRONG>setaf</STRONG>/<STRONG>setab</STRONG> are portably defined
-       as  follows (the middle column is the symbolic #define available in the
-       header for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware  is
-       free  to  map  these  as  it  likes, but the RGB values indicate normal
+       as follows (the middle column is the symbolic #define available in  the
+       header  for the <STRONG>curses</STRONG> or <EM>ncurses</EM> libraries).  The terminal hardware is
+       free to map these as it likes,  but  the  RGB  values  indicate  normal
        locations in color space.
 
                     <STRONG>Color</STRONG>      <STRONG>#define</STRONG>       <STRONG>Value</STRONG>        <STRONG>RGB</STRONG>
@@ -2176,32 +2177,32 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
                    yellow    <STRONG>COLOR_YELLOW</STRONG>      6     max, max, 0
                    white     <STRONG>COLOR_WHITE</STRONG>       7     max, max, max
 
-       It  is  important  to  not  confuse the two sets of color capabilities;
+       It is important to not confuse the  two  sets  of  color  capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On an HP-like terminal, use <STRONG>scp</STRONG> with a color pair number  parameter  to
+       On  an  HP-like terminal, use <STRONG>scp</STRONG> with a color pair number parameter to
        set which color pair is current.
 
        Some terminals allow the <EM>color</EM> <EM>values</EM> to be modified:
 
-       <STRONG>o</STRONG>   On  a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present to
-           indicate that colors can be modified.  If so, the <STRONG>initc</STRONG>  capability
+       <STRONG>o</STRONG>   On a Tektronix-like terminal, the capability <STRONG>ccc</STRONG> may be present  to
+           indicate  that colors can be modified.  If so, the <STRONG>initc</STRONG> capability
            will take a color number (0 to <STRONG>colors</STRONG> - 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
+           which  describe the color.  These three parameters default to being
+           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  Boolean
            capability <STRONG>hls</STRONG> is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       <STRONG>o</STRONG>   On  an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing a
-           color pair value.  It will take  seven  parameters;  a  color  pair
-           number  (0  to  <STRONG>max_pairs</STRONG>  -  1),  and two triples describing first
-           background and then foreground colors.  These  parameters  must  be
-           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
+       <STRONG>o</STRONG>   On an HP-like terminal, <STRONG>initp</STRONG> may give a capability for changing  a
+           color  pair  value.   It  will  take seven parameters; a color pair
+           number (0 to <STRONG>max_pairs</STRONG> -  1),  and  two  triples  describing  first
+           background  and  then  foreground colors.  These parameters must be
+           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
            <STRONG>hls</STRONG>.
 
-       On some color terminals,  colors  collide  with  highlights.   You  can
-       register  these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit mask
-       of  attributes  not  to  be  used  when  colors   are   enabled.    The
+       On  some  color  terminals,  colors  collide  with highlights.  You can
+       register these collisions with the <STRONG>ncv</STRONG> capability.  This is a bit  mask
+       of   attributes   not   to  be  used  when  colors  are  enabled.   The
        correspondence with the attributes understood by <STRONG>curses</STRONG> is as follows:
 
                          <STRONG>Attribute</STRONG>     <STRONG>Bit</STRONG>   <STRONG>Decimal</STRONG>   <STRONG>Set</STRONG> <STRONG>by</STRONG>
@@ -2223,118 +2224,118 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
                         <STRONG>A_VERTICAL</STRONG>     14     16384    <STRONG>sgr1</STRONG>
                         <STRONG>A_ITALIC</STRONG>       15     32768    <STRONG>sitm</STRONG>
 
-       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 <STRONG>ncv</STRONG> capability of 2.
 
-       SVr4  curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and optimizes
+       SVr4 curses does nothing with <STRONG>ncv</STRONG>, <EM>ncurses</EM> recognizes it and  optimizes
        the output in favor of colors.
 
 
 </PRE><H3><a name="h3-Miscellaneous">Miscellaneous</a></H3><PRE>
-       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 <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG> variable;
-       though the application may set this value to  something  other  than  a
-       null,  <EM>ncurses</EM> will test <STRONG>npc</STRONG> first and use napms if the terminal has no
+       npc.  Note that <EM>ncurses</EM> implements the termcap-compatible <STRONG>PC</STRONG>  variable;
+       though  the  application  may  set this value to something other than a
+       null, <EM>ncurses</EM> will test <STRONG>npc</STRONG> 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  <STRONG>hu</STRONG>  (half-line  up)  and  <STRONG>hd</STRONG> (half-line down).  This is primarily
-       useful for superscripts and subscripts on hard-copy  terminals.   If  a
+       If  the terminal can move up or down half a line, this can be indicated
+       with <STRONG>hu</STRONG> (half-line up) and <STRONG>hd</STRONG>  (half-line  down).   This  is  primarily
+       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
        hard-copy terminal can eject to the next page (form feed), give this as
        <STRONG>ff</STRONG> (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  <STRONG>rep</STRONG>.
-       The  first  parameter is the character to be repeated and the second 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 <STRONG>rep</STRONG>.
+       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 <STRONG>cmdch</STRONG>.  A prototype command  character
-       is  chosen  which is used in all capabilities.  This character is given
-       in the <STRONG>cmdch</STRONG> capability to identify it.  The  following  convention  is
+       4025,  this can be indicated with <STRONG>cmdch</STRONG>.  A prototype command character
+       is chosen which is used in all capabilities.  This character  is  given
+       in  the  <STRONG>cmdch</STRONG>  capability to identify it.  The following convention is
        supported on some Unix systems: The environment is to be searched for a
-       <STRONG>CC</STRONG> variable, and if found, all occurrences of the  prototype  character
+       <STRONG>CC</STRONG>  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 <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and  <EM>network</EM>,  should  include
-       the  <STRONG>gn</STRONG> (generic) capability so that programs can complain that they do
-       not know how to talk to the terminal.  (This capability does not  apply
-       to  <EM>virtual</EM>  terminal  descriptions  for which the escape sequences are
+       Terminal descriptions that do not represent a specific  kind  of  known
+       terminal,  such  as  <EM>switch</EM>, <EM>dialup</EM>, <EM>patch</EM>, and <EM>network</EM>, should include
+       the <STRONG>gn</STRONG> (generic) capability so that programs can complain that they  do
+       not  know how to talk to the terminal.  (This capability does not apply
+       to <EM>virtual</EM> 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
-       <STRONG>km</STRONG>.  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
+       <STRONG>km</STRONG>.   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 <STRONG>smm</STRONG> and <STRONG>rmm</STRONG>.
 
        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 <STRONG>lm</STRONG>.  A value
+       once, the number of lines of memory can be indicated with <STRONG>lm</STRONG>.  A  value
        of <STRONG>lm</STRONG>#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 <STRONG>vt</STRONG>.
 
-       Media copy strings which control an auxiliary printer connected to  the
-       terminal  can  be  given as <STRONG>mc0</STRONG>: print the contents of the screen, <STRONG>mc4</STRONG>:
-       turn off the printer, and <STRONG>mc5</STRONG>: 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 <STRONG>mc5p</STRONG> takes one parameter, and
-       leaves the printer on for as  many  characters  as  the  value  of  the
+       Media  copy strings which control an auxiliary printer connected to the
+       terminal can be given as <STRONG>mc0</STRONG>: print the contents of  the  screen,  <STRONG>mc4</STRONG>:
+       turn  off  the printer, and <STRONG>mc5</STRONG>: 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  <STRONG>mc5p</STRONG>  takes  one  parameter,  and
+       leaves  the  printer  on  for  as  many  characters as the value of the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.  All text, including <STRONG>mc4</STRONG>, is transparently passed to  the  printer
+       255.   All  text, including <STRONG>mc4</STRONG>, is transparently passed to the printer
        while an <STRONG>mc5p</STRONG> is in effect.
 
 
 </PRE><H3><a name="h3-Glitches-and-Brain-Damage">Glitches and Brain Damage</a></H3><PRE>
-       Hazeltine  terminals, which do not allow "~" characters to be displayed
+       Hazeltine terminals, which do not allow "~" characters to be  displayed
        should indicate <STRONG>hz</STRONG>.
 
-       Terminals which ignore a line-feed immediately after an <STRONG>am</STRONG>  wrap,  such
+       Terminals  which  ignore a line-feed immediately after an <STRONG>am</STRONG> wrap, such
        as the Concept and vt100, should indicate <STRONG>xenl</STRONG>.
 
-       If  <STRONG>el</STRONG>  is  required  to get rid of standout (instead of merely writing
+       If <STRONG>el</STRONG> is required to get rid of standout  (instead  of  merely  writing
        normal text on top of it), <STRONG>xhp</STRONG> should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should  indicate  <STRONG>xt</STRONG> (destructive tabs).  Note: the variable indicating
-       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
-       teleray_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 necessary to use delete and insert
+       should indicate <STRONG>xt</STRONG> (destructive tabs).  Note: the  variable  indicating
+       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
+       teleray_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 necessary to use  delete  and  insert
        line.  The <EM>ncurses</EM> implementation ignores this glitch.
 
-       The Beehive Superbee, which is unable to correctly transmit the  escape
-       or  control/C  characters,  has <STRONG>xsb</STRONG>, 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 <STRONG>xsb</STRONG>, 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
+       Other  specific  terminal  problems  may  be  corrected  by adding more
        capabilities of the form <STRONG>x</STRONG><EM>x</EM>.
 
 
 </PRE><H3><a name="h3-Pitfalls-of-Long-Entries">Pitfalls of Long Entries</a></H3><PRE>
-       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 translations are much more strictly limited
+       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 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 <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> is  searching  for  is,
+       The man pages for 4.3BSD and older versions  of  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> is searching for is,
        several bad things can happen:
 
        <STRONG>o</STRONG>   some termcap libraries print a warning message,
@@ -2348,15 +2349,15 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        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 <STRONG>tgetent</STRONG> strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2365,39 +2366,39 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
        <STRONG>o</STRONG>   and the application has only allocated a 1k buffer,
 
-       <STRONG>o</STRONG>   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
+       <STRONG>o</STRONG>   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,
 
-       <STRONG>o</STRONG>   and  <STRONG>tgetent</STRONG>  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 <STRONG>tgetent</STRONG> has to search
+       <STRONG>o</STRONG>   and <STRONG>tgetent</STRONG> 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 <STRONG>tgetent</STRONG> has  to  search
            the whole termcap file).
 
-       Then <STRONG>tgetent</STRONG> 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
+       Then  <STRONG>tgetent</STRONG>  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.
 
-       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 <EM>TERM</EM> to that terminal type,
-       since  <STRONG>tgetent</STRONG>  only  does "tc" expansion once it is found the terminal
+       since <STRONG>tgetent</STRONG> 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 <EM>TERM</EM> 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 <EM>TERM</EM> variable does not have a termcap
        entry.
 
-       When  in  -C (translate to termcap) mode, the <EM>ncurses</EM> implementation of
-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> 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 <EM>ncurses</EM>  implementation  of
+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>  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.
 
 
@@ -2407,70 +2408,70 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       Searching   for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>    and
+       Searching    for   terminal   descriptions   in   <EM>$HOME/.terminfo</EM>   and
        <EM>TERMINFO</EM><STRONG>_</STRONG><EM>DIRS</EM> is not supported by older implementations.
 
-       Some  SVr4  <STRONG>curses</STRONG>  implementations,  and  all previous to SVr4, do not
+       Some SVr4 <STRONG>curses</STRONG> implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4 do not specify whether <STRONG>msgr</STRONG> 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
-       <EM>ncurses</EM>  implementation  ignores  <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG> mode.  This raises
+       SVr4/XPG4  do  not  specify  whether <STRONG>msgr</STRONG> 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
+       <EM>ncurses</EM> implementation ignores <STRONG>msgr</STRONG> in <STRONG>ALTCHARSET</STRONG>  mode.   This  raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for <EM>ncurses</EM> to have <STRONG>msgr</STRONG>
+       interpretation may need terminfo entries made for <EM>ncurses</EM> to have  <STRONG>msgr</STRONG>
        turned off.
 
        The <EM>ncurses</EM> 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 <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> subsection above.
 
-       The parameter substitutions for <STRONG>set_clock</STRONG>  and  <STRONG>display_clock</STRONG>  are  not
-       documented  in  SVr4  or  X/Open  Curses.   They  are  deduced from the
+       The  parameter  substitutions  for  <STRONG>set_clock</STRONG> and <STRONG>display_clock</STRONG> are not
+       documented in SVr4  or  X/Open  Curses.   They  are  deduced  from  the
        documentation for the AT&amp;T 505 terminal.
 
-       Be careful assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM>  library  wants
-       to  interpret  it as <STRONG>KEY_MOUSE</STRONG>, for use by terminals and emulators like
-       xterm that can return mouse-tracking information in the  keyboard-input
+       Be  careful  assigning the <STRONG>kmous</STRONG> capability.  The <EM>ncurses</EM> library wants
+       to interpret it as <STRONG>KEY_MOUSE</STRONG>, 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  <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM>  (<STRONG>ncv</STRONG>)  capability.  The 32768 mask value
-       used for italics with <STRONG>ncv</STRONG> can be confused with an  absent  or  canceled
-       <STRONG>ncv</STRONG>.   If  italics  should work with colors, then the <STRONG>ncv</STRONG> 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 <EM>no</EM><STRONG>_</STRONG><EM>color</EM><STRONG>_</STRONG><EM>video</EM> (<STRONG>ncv</STRONG>) capability.   The  32768  mask  value
+       used  for  italics  with <STRONG>ncv</STRONG> can be confused with an absent or canceled
+       <STRONG>ncv</STRONG>.  If italics should work with colors, then the <STRONG>ncv</STRONG>  value  must  be
        specified, even if it is zero.
 
-       Different commercial ports of <EM>terminfo</EM>  and  <EM>curses</EM>  support  different
-       subsets  of  X/Open  Curses  and  (in some cases) different extensions.
-       Here is a summary,  accurate  as  of  October  1995,  after  which  the
+       Different  commercial  ports  of  <EM>terminfo</EM> and <EM>curses</EM> support different
+       subsets of X/Open Curses and  (in  some  cases)  different  extensions.
+       Here  is  a  summary,  accurate  as  of  October  1995, after which the
        commercial Unix market contracted and lost diversity.
 
        <STRONG>o</STRONG>   SVr4, Solaris, and <EM>ncurses</EM> support all SVr4 capabilities.
 
-       <STRONG>o</STRONG>   IRIX  supports  the  SVr4  set  and  adds one undocumented extended
+       <STRONG>o</STRONG>   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
            string capability (<STRONG>set_pglen</STRONG>).
 
-       <STRONG>o</STRONG>   SVr1  and  Ultrix  support  a   restricted   subset   of   <EM>terminfo</EM>
-           capabilities.   The  Booleans  end with <STRONG>xon_xoff</STRONG>; the numerics with
+       <STRONG>o</STRONG>   SVr1   and   Ultrix   support   a  restricted  subset  of  <EM>terminfo</EM>
+           capabilities.  The Booleans end with <STRONG>xon_xoff</STRONG>;  the  numerics  with
            <STRONG>width_status_line</STRONG>; and the strings with <STRONG>prtr_non</STRONG>.
 
-       <STRONG>o</STRONG>   HP/UX  supports  the  SVr1  subset,  plus  the  SVr[234]   numerics
-           <STRONG>num_labels</STRONG>,   <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys  11
-           through 63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a  number
+       <STRONG>o</STRONG>   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
+           <STRONG>num_labels</STRONG>,  <STRONG>label_height</STRONG>,  <STRONG>label_width</STRONG>,  plus  function  keys   11
+           through  63, plus <STRONG>plab_norm</STRONG>, <STRONG>label_on</STRONG>, and <STRONG>label_off</STRONG>, plus a number
            of incompatible string table extensions.
 
-       <STRONG>o</STRONG>   AIX  supports  the  SVr1  subset, plus function keys 11 through 63,
+       <STRONG>o</STRONG>   AIX supports the SVr1 subset, plus function  keys  11  through  63,
            plus a number of incompatible string table extensions.
 
        <STRONG>o</STRONG>   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Do not count on  compiled  (binary)  <EM>terminfo</EM>  entries  being  portable
-       between  commercial  Unix  systems.   At  least  two implementations of
+       Do  not  count  on  compiled  (binary)  <EM>terminfo</EM> entries being portable
+       between commercial Unix  systems.   At  least  two  implementations  of
        <EM>terminfo</EM> (those of HP-UX and AIX) diverged from those of other System V
-       Unices  after  SVr1,  adding extension capabilities to the string table
+       Unices after SVr1, adding extension capabilities to  the  string  table
        that (in the binary format) collide with subsequent System V and X/Open
        Curses extensions.
 
@@ -2481,8 +2482,8 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,     <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>,    <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,  <STRONG>printf(3)</STRONG>,  <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 3af79916a..5f2a4cfdd 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp @
+  * @Id: tic.1m,v 1.117 2025/01/19 00:51:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tic 1m 2024-09-14 ncurses 6.5 User commands</TITLE>
+<TITLE>tic 1m 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tic 1m 2024-09-14 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tic 1m 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 
@@ -397,7 +397,7 @@ <H1 class="no-header">tic 1m 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open  Curses, Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.  It
+       X/Open  Curses  Issue 7 (2009) provides a brief description of <STRONG>tic</STRONG>.  It
        lists one option: <STRONG>-c</STRONG>.  The omission of <STRONG>-v</STRONG> is  unexpected.   The  change
        history  states  that the description is derived from Tru64.  According
        to its manual pages, that system also supported the <STRONG>-v</STRONG> option.
@@ -482,7 +482,7 @@ <H1 class="no-header">tic 1m 2024-09-14 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-09-14                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
+ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 922286dbb..f9d3b1778 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp @
+  * @Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2024-12-28 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -91,7 +91,7 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
                 defined, without a trailing newline.
 
        Before  using  a value returned on the standard output, the application
-       should test <STRONG>tput</STRONG>'s exit status to be sure it is 0;  see  section  "EXIT
+       should test <STRONG>tput</STRONG> <STRONG>'s</STRONG> exit status to be sure it is 0; see  section  "EXIT
        STATUS" below.
 
 
@@ -172,7 +172,7 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
 
                        <STRONG>o</STRONG>   enabling newline translation, and
 
-                       <STRONG>o</STRONG>   setting  any  unset  special  characters  to  their
+                       <STRONG>o</STRONG>   setting  any  special  input  characters  to  their
                            default values.
 
                   (2)  If any reset capabilities are defined for the  terminal
@@ -209,7 +209,7 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
        operand.  For example, executing a link named <STRONG>reset</STRONG> that points to <STRONG>tput</STRONG>
        has the same effect as "<STRONG>tput</STRONG> <STRONG>reset</STRONG>".
 
-       This feature was introduced by <EM>ncurses</EM> 5.2 in 2000.  It is rarely used:
+       This feature was introduced by <EM>ncurses</EM> 5.2 in 2000.  It is rarely used.
 
        <STRONG>clear</STRONG>  is a separate program, which is both smaller and more frequently
               executed.
@@ -290,10 +290,15 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-ENVIRONMENT">ENVIRONMENT</a></H2><PRE>
-       <STRONG>tput</STRONG> reads one environment variable.
+       <STRONG>tput</STRONG> reads up to three environment variables if the <STRONG>-T</STRONG>  option  is  not
+       specified.
 
-       <EM>TERM</EM>    denotes the terminal type.  Each  terminal  type  is  distinct,
-               though many are similar.  The <STRONG>-T</STRONG> option overrides its value.
+       <EM>COLUMNS</EM>  specifies the width of the screen in characters.
+
+       <EM>LINES</EM>    specifies the height of the screen in characters.
+
+       <EM>TERM</EM>     denotes  the  terminal  type.  Each terminal type is distinct,
+                though many are similar.
 
 
 </PRE><H2><a name="h2-FILES">FILES</a></H2><PRE>
@@ -305,192 +310,192 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       Over  time  <EM>ncurses</EM>  <STRONG>tput</STRONG>  has  differed  from  that of System V in two
+       Over time <EM>ncurses</EM> <STRONG>tput</STRONG> has  differed  from  that  of  System V  in  two
        important respects, one now mostly historical.
 
-       <STRONG>o</STRONG>   "<STRONG>tput</STRONG> <EM>cap-code</EM>" writes to the standard output, which need not be  a
-           terminal  device.   However,  the operands that manipulate terminal
+       <STRONG>o</STRONG>   "<STRONG>tput</STRONG>  <EM>cap-code</EM>" writes to the standard output, which need not be a
+           terminal device.  However, the operands  that  manipulate  terminal
            modes might not use the standard output.
 
-           System V <STRONG>tput</STRONG>'s <STRONG>init</STRONG> and <STRONG>reset</STRONG>  operands  use  logic  from  4.1cBSD
-           <STRONG>tset</STRONG>,  manipulating  terminal  modes.   It  checks  the  same  file
-           descriptors (and <EM>/dev/tty</EM>) for association with a  terminal  device
-           as  <EM>ncurses</EM>  now does, and if none are, finally assumes a 1200 baud
+           System V  <EM>tput</EM>'s  <STRONG>init</STRONG>  and  <STRONG>reset</STRONG>  operands use logic from 4.1cBSD
+           <EM>tset</EM>,  manipulating  terminal  modes.   It  checks  the  same  file
+           descriptors  (and  <EM>/dev/tty</EM>) for association with a terminal device
+           as <EM>ncurses</EM> now does, and if none are, finally assumes a  1200  baud
            terminal.  When updating terminal modes, it ignores errors.
 
-           Until <EM>ncurses</EM> 6.1 (see  section  "HISTORY"  below),  <STRONG>tput</STRONG>  did  not
+           Until  <EM>ncurses</EM>  6.1  (see  section  "HISTORY"  below), <STRONG>tput</STRONG> did not
            modify  terminal  modes.   It  now  employs  a  scheme  similar  to
            System V, using functions shared with <STRONG>tset</STRONG> (and ultimately based on
-           4.4BSD  <STRONG>tset</STRONG>).  If it is not able to open a terminal (for instance,
+           4.4BSD <EM>tset</EM>).  If it is not able to open a terminal (for  instance,
            when run by <STRONG>cron(1)</STRONG>), <STRONG>tput</STRONG> exits with an error status.
 
-       <STRONG>o</STRONG>   System V <STRONG>tput</STRONG> assumes that  the  type  of  a  <EM>cap-code</EM>  operand  is
-           numeric  if all the characters of its value are decimal numbers; if
+       <STRONG>o</STRONG>   System V  <EM>tput</EM>  assumes  that  the  type  of  a <EM>cap-code</EM> operand is
+           numeric if all the characters of its value are decimal numbers;  if
            they are not, it treats <EM>cap-code</EM> as a string capability.
 
            Most implementations that provide support for <EM>cap-code</EM> operands use
-           the  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  function  to  expand its parameters.  That function
-           expects a mixture of numeric and string parameters, requiring  <STRONG>tput</STRONG>
+           the <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG> function to expand  its  parameters.   That  function
+           expects  a mixture of numeric and string parameters, requiring <STRONG>tput</STRONG>
            to know which type to use.
 
-           <EM>ncurses</EM>  <STRONG>tput</STRONG> uses a table to determine the parameter types for the
-           standard <EM>cap-code</EM> operands, and an  internal  function  to  analyze
+           <EM>ncurses</EM> <STRONG>tput</STRONG> uses a table to determine the parameter types for  the
+           standard  <EM>cap-code</EM>  operands,  and  an internal function to analyze
            nonstandard <EM>cap-code</EM> operands.
 
-           While  more reliable than System V's utility, a portability problem
-           is introduced by this analysis.  An OpenBSD developer  adapted  the
-           internal  library  function  from <EM>ncurses</EM> to port NetBSD's <EM>termcap</EM>-
-           based <STRONG>tput</STRONG> to <EM>terminfo</EM>, and modified it to interpret multiple  <EM>cap-</EM>
-           <EM>codes</EM>  (and parameters) on the command line.  Portable applications
-           should not rely upon this feature; <EM>ncurses</EM>  offers  it  to  support
+           While more reliable than System V's utility, a portability  problem
+           is  introduced  by this analysis.  An OpenBSD developer adapted the
+           internal library function from <EM>ncurses</EM> to  port  NetBSD's  <EM>termcap</EM>-
+           based  <EM>tput</EM> to <EM>terminfo</EM>, and modified it to interpret multiple <EM>cap-</EM>
+           <EM>codes</EM> (and parameters) on the command line.  Portable  applications
+           should  not  rely  upon  this feature; <EM>ncurses</EM> offers it to support
            applications written specifically for OpenBSD.
 
-       This  implementation,  unlike others, accepts both <EM>termcap</EM> and <EM>terminfo</EM>
-       <EM>cap-codes</EM> if <EM>termcap</EM> support is compiled in.  In  that  case,  however,
+       This implementation, unlike others, accepts both <EM>termcap</EM>  and  <EM>terminfo</EM>
+       <EM>cap-codes</EM>  if  <EM>termcap</EM>  support is compiled in.  In that case, however,
        the predefined <EM>termcap</EM> and <EM>terminfo</EM> codes have two ambiguities; <EM>ncurses</EM>
        assumes the <EM>terminfo</EM> code.
 
-       <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM>  but  <STRONG>parm_delete_line</STRONG>
+       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>dl</STRONG> means <STRONG>delete_line</STRONG> to <EM>termcap</EM> but <STRONG>parm_delete_line</STRONG>
            to <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>DL</STRONG> for <STRONG>parm_delete_line</STRONG>.  <EM>term-</EM>
            <EM>info</EM> uses the code <STRONG>dl1</STRONG> for <STRONG>delete_line</STRONG>.
 
-       <STRONG>o</STRONG>   The <EM>cap-code</EM> <STRONG>ed</STRONG> means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM>  but  <STRONG>clr_eos</STRONG>  to
+       <STRONG>o</STRONG>   The  <EM>cap-code</EM>  <STRONG>ed</STRONG>  means <STRONG>exit_delete_mode</STRONG> to <EM>termcap</EM> but <STRONG>clr_eos</STRONG> to
            <EM>terminfo</EM>.  <EM>termcap</EM> uses the code <STRONG>cd</STRONG> for <STRONG>clr_eos</STRONG>.  <EM>terminfo</EM> uses the
            code <STRONG>rmdc</STRONG> for <STRONG>exit_delete_mode</STRONG>.
 
-       The  <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the   parameter-substitution
-       features  used in the <STRONG>cup</STRONG> example below, were not supported in AT&amp;T/USL
+       The   <STRONG>longname</STRONG>  operand,  <STRONG>-S</STRONG>  option,  and  the  parameter-substitution
+       features used in the <STRONG>cup</STRONG> example below, were not supported in  AT&amp;T/USL
        <EM>curses</EM> before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
        <STRONG>longname</STRONG>,  and  in  1994,  NetBSD  added  support  for  the  parameter-
        substitution features.
 
-       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
-       (POSIX.1-2008)  documents  only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG> operands.  A
+       IEEE   Std   1003.1/The   Open   Group   Base   Specifications  Issue 7
+       (POSIX.1-2008) documents only the <STRONG>clear</STRONG>, <STRONG>init</STRONG>, and <STRONG>reset</STRONG>  operands.   A
        few observations of interest arise from that selection.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> supports <STRONG>clear</STRONG> as it does any other standard <EM>cap-code</EM>.  The
-           others   (<STRONG>init</STRONG>   and   <STRONG>longname</STRONG>)  do  not  correspond  to  terminal
+           others  (<STRONG>init</STRONG>  and  <STRONG>longname</STRONG>)  do  not   correspond   to   terminal
            capabilities.
 
-       <STRONG>o</STRONG>   The <STRONG>tput</STRONG> on SVr4-based systems such as Solaris, IRIX64, and  HP-UX,
+       <STRONG>o</STRONG>   The  <EM>tput</EM> on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
            as well as others such as AIX and Tru64, also support standard <EM>cap-</EM>
            <EM>code</EM> operands.
 
        <STRONG>o</STRONG>   A few platforms such as FreeBSD recognize <EM>termcap</EM> codes rather than
-           <EM>terminfo</EM> capability codes in their respective <STRONG>tput</STRONG> commands.  Since
-           2010, NetBSD's <STRONG>tput</STRONG> uses <EM>terminfo</EM> codes.   Before  that,  it  (like
+           <EM>terminfo</EM> capability codes in their respective <EM>tput</EM> commands.  Since
+           2010,  NetBSD's  <EM>tput</EM>  uses  <EM>terminfo</EM> codes.  Before that, it (like
            FreeBSD) recognized <EM>termcap</EM> codes.
 
-           Beginning  in  2021, FreeBSD uses <EM>ncurses</EM> <STRONG>tput</STRONG>, configured for both
+           Beginning in 2021, FreeBSD uses <EM>ncurses</EM> <STRONG>tput</STRONG>, configured  for  both
            <EM>terminfo</EM> (tested first) and <EM>termcap</EM> (as a fallback).
 
        Because (apparently) all <EM>certified</EM> Unix systems support the full set of
-       capability  codes,  the  reason  for  documenting only a few may not be
+       capability codes, the reason for documenting only  a  few  may  not  be
        apparent.
 
        <STRONG>o</STRONG>   X/Open Curses Issue 7 documents <STRONG>tput</STRONG> differently, with <EM>cap-code</EM> and
            the other features used in this implementation.
 
-       <STRONG>o</STRONG>   That  is,  there  are  two standards for <STRONG>tput</STRONG>: 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
+       <STRONG>o</STRONG>   That is, there are two standards for <EM>tput</EM>:  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 capability database.
 
-       <STRONG>o</STRONG>   While it is certainly possible to  write  a  <STRONG>tput</STRONG>  program  without
-           using  <EM>curses</EM>,  no  system  with a <EM>curses</EM> implementation provides a
-           <STRONG>tput</STRONG> utility that does not also support standard <EM>cap-codes</EM>.
+       <STRONG>o</STRONG>   While  it  is  certainly  possible  to write a <EM>tput</EM> program without
+           using <EM>curses</EM>, no system with a  <EM>curses</EM>  implementation  provides  a
+           <EM>tput</EM> utility that does not also support standard <EM>cap-codes</EM>.
 
-       X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
+       X/Open   Curses  Issue 7  (2009)  is  the  first  version  to  document
        utilities.  However that part of X/Open Curses does not follow existing
        practice (that is, System V <EM>curses</EM> behavior).
 
-       <STRONG>o</STRONG>   It assigns exit status 4 to "invalid operand", which may  have  the
-           same  meaning  as  "unknown  capability".  For instance, the source
+       <STRONG>o</STRONG>   It  assigns  exit status 4 to "invalid operand", which may have the
+           same meaning as "unknown capability".   For  instance,  the  source
            code for Solaris <EM>xcurses</EM> uses the term "invalid" in this case.
 
-       <STRONG>o</STRONG>   It assigns exit status 255  to  a  numeric  variable  that  is  not
+       <STRONG>o</STRONG>   It  assigns  exit  status  255  to  a  numeric variable that is not
            specified in the <EM>terminfo</EM> database.  That likely is a documentation
-           error, mistaking  the  "-1"  written  to  the  standard  output  to
+           error,  mistaking  the  "-1"  written  to  the  standard  output to
            indicate an absent or canceled numeric capability for an (unsigned)
            exit status.
 
        The various System V implementations (AIX, HP-UX, Solaris) use the same
        exit statuses as <EM>ncurses</EM>.
 
-       NetBSD  <EM>curses</EM>  documents  exit  statuses  that  correspond  to neither
+       NetBSD <EM>curses</EM>  documents  exit  statuses  that  correspond  to  neither
        <EM>ncurses</EM> nor X/Open Curses.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       Bill Joy wrote a <STRONG>tput</STRONG> command during development  of  4BSD  in  October
-       1980.   This  initial version only cleared the screen, and did not ship
+       Bill  Joy  wrote  a  <EM>tput</EM> command during development of 4BSD in October
+       1980.  This initial version only cleared the screen, and did  not  ship
        with official distributions.
 
-       System V developed a different <STRONG>tput</STRONG> command.
+       System V developed a different <EM>tput</EM> command.
 
-       <STRONG>o</STRONG>   SVr2 (1984) provided a rudimentary <STRONG>tput</STRONG> that checked the  parameter
-           against  each  predefined capability and returned the corresponding
-           value.   This  version  of  <STRONG>tput</STRONG>  did   not   use   <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>   for
+       <STRONG>o</STRONG>   SVr2  (1984) provided a rudimentary <EM>tput</EM> that checked the parameter
+           against each predefined capability and returned  the  corresponding
+           value.    This   version   of   <EM>tput</EM>  did  not  use  <STRONG><A HREF="curs_terminfo.3x.html">tparm(3x)</A></STRONG>  for
            parameterized capabilities.
 
-       <STRONG>o</STRONG>   SVr3  (1987)  replaced  that  with  a  more extensive program whose
-           support for <STRONG>init</STRONG> and <STRONG>reset</STRONG> operands (more than  half  the  program)
-           incorporated the <STRONG>reset</STRONG> feature of BSD <STRONG>tset</STRONG> written by Eric Allman.
+       <STRONG>o</STRONG>   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
+           support  for  <STRONG>init</STRONG>  and <STRONG>reset</STRONG> operands (more than half the program)
+           incorporated the <STRONG>reset</STRONG> feature of BSD <EM>tset</EM> written by Eric Allman.
 
-       <STRONG>o</STRONG>   SVr4  (1989)  added  color  initialization by using the <STRONG>orig_colors</STRONG>
+       <STRONG>o</STRONG>   SVr4 (1989) added color initialization  by  using  the  <STRONG>orig_colors</STRONG>
            (<STRONG>oc</STRONG>) and <STRONG>orig_pair</STRONG> (<STRONG>op</STRONG>) capabilities in its <STRONG>init</STRONG> logic.
 
-       Keith Bostic refactored BSD <STRONG>tput</STRONG> for shipment in  4.3BSD-Tahoe  (1988),
-       then  replaced  it  the  next  year  with a new implementation based on
-       System V <STRONG>tput</STRONG>.  Bostic's version  similarly  accepted  some  parameters
-       named  for  <EM>terminfo</EM>  (pseudo-)capabilities: <STRONG>clear</STRONG>, <STRONG>init</STRONG>, <STRONG>longname</STRONG>, and
-       <STRONG>reset</STRONG>.  However, because he had only  <EM>termcap</EM>  available,  it  accepted
-       <EM>termcap</EM>  codes for other capabilities.  Also, Bostic's BSD <STRONG>tput</STRONG> did not
-       modify the terminal modes as the earlier BSD <STRONG>tset</STRONG> had done.
-
-       At the same time, Bostic added a shell script named "clear"  that  used
-       <STRONG>tput</STRONG>  to  clear the screen.  Both of these appeared in 4.4BSD, becoming
-       the "modern" BSD implementation of <STRONG>tput</STRONG>.
-
-       The origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in  Ross
-       Ridge's  <EM>mytinfo</EM>  package,  published  on <EM>comp.sources.unix</EM> in December
-       1992.  Ridge's program made more  sophisticated  use  of  the  terminal
-       capabilities than the BSD program.  Eric Raymond used that <STRONG>tput</STRONG> program
-       (and other parts of <EM>mytinfo</EM>) in <EM>ncurses</EM> in  June  1995.   Incorporating
-       the  portions dealing with terminal capabilities almost without change,
-       Raymond made improvements  to  the  way  command-line  parameters  were
+       Keith  Bostic  refactored BSD <EM>tput</EM> for shipment in 4.3BSD-Tahoe (1988),
+       then replaced it the next year  with  a  new  implementation  based  on
+       System V  <EM>tput</EM>.   Bostic's  version  similarly accepted some parameters
+       named for <EM>terminfo</EM> (pseudo-)capabilities: <STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG>,  and
+       <STRONG>reset</STRONG>.   However,  because  he  had only <EM>termcap</EM> available, it accepted
+       <EM>termcap</EM> codes for other capabilities.  Also, Bostic's BSD <EM>tput</EM> did  not
+       modify the terminal modes as the earlier BSD <EM>tset</EM> had done.
+
+       At  the  same time, Bostic added a shell script named "clear" that used
+       <EM>tput</EM> to clear the screen.  Both of these appeared in  4.4BSD,  becoming
+       the "modern" BSD implementation of <EM>tput</EM>.
+
+       The  origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in Ross
+       Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in  December
+       1992.   Ridge's  program  made  more  sophisticated use of the terminal
+       capabilities than the BSD program.  Eric Raymond used that <EM>tput</EM> program
+       (and  other  parts  of <EM>mytinfo</EM>) in <EM>ncurses</EM> in June 1995.  Incorporating
+       the portions dealing with terminal capabilities almost without  change,
+       Raymond  made  improvements  to  the  way  command-line parameters were
        handled.
 
        Before <EM>ncurses</EM> 6.1 (2018), its <STRONG>tset</STRONG> and <STRONG>tput</STRONG> utilities differed.
 
-       <STRONG>o</STRONG>   <STRONG>tset</STRONG>  was  more effective, resetting the terminal modes and special
-           characters.
+       <STRONG>o</STRONG>   <STRONG>tset</STRONG> was more effective, resetting the terminal's modes and special
+           input characters.
 
-       <STRONG>o</STRONG>   On the other hand, <STRONG>tset</STRONG>'s repertoire of terminal  capabilities  for
+       <STRONG>o</STRONG>   On  the  other hand, <STRONG>tset</STRONG>'s repertoire of terminal capabilities for
            resetting the terminal was more limited; it had only equivalents of
-           <STRONG>reset_1string</STRONG> (<STRONG>rs1</STRONG>), <STRONG>reset_2string</STRONG> (<STRONG>rs2</STRONG>), and <STRONG>reset_file</STRONG> (<STRONG>rf</STRONG>),  and
+           <STRONG>reset_1string</STRONG>  (<STRONG>rs1</STRONG>), <STRONG>reset_2string</STRONG> (<STRONG>rs2</STRONG>), and <STRONG>reset_file</STRONG> (<STRONG>rf</STRONG>), and
            not the tab stop and margin update features of <STRONG>tput</STRONG>.
 
-       The <STRONG>reset</STRONG> program is traditionally an alias for <STRONG>tset</STRONG> due to its ability
-       to reset terminal modes and special characters.
+       The <EM>reset</EM> program is traditionally an alias for <STRONG>tset</STRONG> due to its ability
+       to reset the terminal's modes and special input characters.
 
-       As of <EM>ncurses</EM> 6.1,  the  "reset"  features  of  the  two  programs  are
+       As  of  <EM>ncurses</EM>  6.1,  the  "reset"  features  of  the two programs are
        (mostly) the same.  Two minor differences remain.
 
-       <STRONG>o</STRONG>   When  issuing  a  reset, the <STRONG>tset</STRONG> program checks whether the device
-           appears to be a pseudoterminal (as might  be  used  by  a  terminal
+       <STRONG>o</STRONG>   When issuing a reset, the <STRONG>tset</STRONG> program checks  whether  the  device
+           appears  to  be  a  pseudoterminal  (as might be used by a terminal
            emulator program), and, if it does not, waits one second in case it
            is communicating with a hardware terminal.
 
-       <STRONG>o</STRONG>   The two programs  write  the  terminal  initialization  strings  to
-           different  streams;  that  is, standard error for <STRONG>tset</STRONG> and standard
+       <STRONG>o</STRONG>   The  two  programs  write  the  terminal  initialization strings to
+           different streams; that is, standard error for  <STRONG>tset</STRONG>  and  standard
            output for <STRONG>tput</STRONG>.
 
 
 </PRE><H2><a name="h2-EXAMPLES">EXAMPLES</a></H2><PRE>
        <STRONG>tput</STRONG> <STRONG>init</STRONG>
               Initialize the terminal according to the type of terminal in the
-              <EM>TERM</EM>  environment  variable.   If  the  system does not reliably
+              <EM>TERM</EM> environment variable.  If  the  system  does  not  reliably
               initialize the terminal upon login, this command can be included
               in <EM>$HOME/.profile</EM> after exporting the <EM>TERM</EM> environment variable.
 
@@ -502,11 +507,11 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
               Set cursor to normal visibility.
 
        <STRONG>tput</STRONG> <STRONG>home</STRONG>
-              Move the cursor to line 0, column 0: the upper  left  corner  of
+              Move  the  cursor  to line 0, column 0: the upper left corner of
               the screen, usually known as the "home" cursor position.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG>
-              Clear  the  screen: write the <STRONG>clear_screen</STRONG> capability's value to
+              Clear the screen: write the <STRONG>clear_screen</STRONG> capability's  value  to
               the standard output stream.
 
        <STRONG>tput</STRONG> <STRONG>cols</STRONG>
@@ -516,29 +521,29 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
               Report the number of columns used by an ADM-3A terminal.
 
        <STRONG>strong=`tput</STRONG> <STRONG>smso`</STRONG> <STRONG>normal=`tput</STRONG> <STRONG>rmso`</STRONG>
-              Set shell variables to capability values: <STRONG>strong</STRONG> and <STRONG>normal</STRONG>,  to
-              begin  and  end,  respectively, stand-out mode for the terminal.
+              Set  shell variables to capability values: <STRONG>strong</STRONG> and <STRONG>normal</STRONG>, to
+              begin and end, respectively, stand-out mode  for  the  terminal.
               One might use these to present a prompt.
 
                      printf "${strong}Username:${normal} "
 
        <STRONG>tput</STRONG> <STRONG>hc</STRONG>
-              Indicate via exit status whether the terminal  is  a  hard  copy
+              Indicate  via  exit  status  whether the terminal is a hard copy
               device.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG> <STRONG>23</STRONG> <STRONG>4</STRONG>
               Move the cursor to line 23, column 4.
 
        <STRONG>tput</STRONG> <STRONG>cup</STRONG>
-              Report  the  value  of the <STRONG>cursor_address</STRONG> (<STRONG>cup</STRONG>) capability (used
+              Report the value of the <STRONG>cursor_address</STRONG>  (<STRONG>cup</STRONG>)  capability  (used
               for cursor movement), with no parameters substituted.
 
        <STRONG>tput</STRONG> <STRONG>longname</STRONG>
-              Report the <EM>terminfo</EM> database's description of the terminal  type
+              Report  the <EM>terminfo</EM> database's description of the terminal type
               specified in the <EM>TERM</EM> environment variable.
 
        <STRONG>tput</STRONG> <STRONG>-S</STRONG>
-              Process  multiple capabilities.  The <STRONG>-S</STRONG> option can be profitably
+              Process multiple capabilities.  The <STRONG>-S</STRONG> option can be  profitably
               used with a shell "here document".
 
               $ <STRONG>tput</STRONG> <STRONG>-S</STRONG> <STRONG>&lt;&lt;!</STRONG>
@@ -547,7 +552,7 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
               &gt; <STRONG>bold</STRONG>
               &gt; <STRONG>!</STRONG>
 
-              The foregoing clears the screen, moves the  cursor  to  position
+              The  foregoing  clears  the screen, moves the cursor to position
               (10, 10) and turns on bold (extra bright) mode.
 
        <STRONG>tput</STRONG> <STRONG>clear</STRONG> <STRONG>cup</STRONG> <STRONG>10</STRONG> <STRONG>10</STRONG> <STRONG>bold</STRONG>
@@ -559,7 +564,7 @@ <H1 class="no-header">tput 1 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-12-28                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 3c3c3a0f8..56b0e449f 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp @
+  * @Id: tset.1,v 1.94 2025/01/19 00:51:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tset 1 2024-12-28 ncurses 6.5 User commands</TITLE>
+<TITLE>tset 1 2025-01-18 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tset 1 2024-12-28 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tset 1 2025-01-18 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 
@@ -134,7 +134,7 @@ <H1 class="no-header">tset 1 2024-12-28 ncurses 6.5 User commands</H1>
 
        <STRONG>o</STRONG>   turns on newline translation and
 
-       <STRONG>o</STRONG>   resets any unset special characters to their default values
+       <STRONG>o</STRONG>   resets special input characters to their default values
 
        before doing the terminal initialization described above.  Also, rather
        than using the terminal <EM>initialization</EM> strings, it  uses  the  terminal
@@ -395,7 +395,7 @@ <H1 class="no-header">tset 1 2024-12-28 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-12-28                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
+ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 5f8c6816f..868daa6fd 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp @
+  * @Id: wresize.3x,v 1.47 2025/01/19 00:51:54 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>wresize 3x 2024-12-28 ncurses 6.5 Library calls</TITLE>
+<TITLE>wresize 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">wresize 3x 2024-12-28 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">wresize 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">wresize 3x 2024-12-28 ncurses 6.5 Library calls</H1>
        <STRONG>wresize</STRONG>,  an  <EM>ncurses</EM>  extension  to  the  <EM>curses</EM>  library, reallocates
        storage for <EM>win</EM>, adjusting its dimensions to  <EM>lines</EM>  and  <EM>columns</EM>.   If
        either  dimension  is  larger than its current value, <EM>ncurses</EM> fills the
-       expanded part of the window with the background character and rendition
+       expanded part of the window with the window's background  character  as
        configured by <STRONG><A HREF="curs_bkgd.3x.html">wbkgdset(3x)</A></STRONG> (wide-character API: <STRONG><A HREF="curs_bkgrnd.3x.html">wbkgrndset(3x)</A></STRONG>).
 
 
@@ -108,7 +108,7 @@ <H1 class="no-header">wresize 3x 2024-12-28 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-12-28                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
+ncurses 6.5                       2025-01-18                       <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/curses.wide b/include/curses.wide
index 5efff15e4..1e0f197ec 100644
--- a/include/curses.wide
+++ b/include/curses.wide
@@ -1,4 +1,4 @@
-/* $Id: curses.wide,v 1.52 2025/01/12 00:39:32 tom Exp $ */
+/* $Id: curses.wide,v 1.53 2025/01/18 21:08:32 Branden.Robinson Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
@@ -213,7 +213,7 @@ extern NCURSES_EXPORT(int) winnwstr (WINDOW *, wchar_t *, int);		/* implemented
 extern NCURSES_EXPORT(int) wins_nwstr (WINDOW *, const wchar_t *, int);	/* implemented */
 extern NCURSES_EXPORT(int) wins_wch (WINDOW *, const cchar_t *);	/* implemented */
 extern NCURSES_EXPORT(int) wins_wstr (WINDOW *, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* implemented */
+extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* generated:WIDEC */
 extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);			/* implemented */
 extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);	/* implemented */
 
@@ -261,6 +261,7 @@ extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *);	/
 #define wget_wstr(w,t)			wgetn_wstr((w),(t),-1)
 #define win_wchstr(w,c)			win_wchnstr((w),(c),-1)
 #define wins_wstr(w,t)			wins_nwstr((w),(t),-1)
+#define winwstr(w,c)			winnwstr((w),(c),-1)
 
 #if !NCURSES_OPAQUE
 #define wgetbkgrnd(win,wch)		(NCURSES_OK_ADDR(wch) ? ((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK) : ERR)
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index 467260823..ce7b93274 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp $
-.TH @CAPTOINFO@ 1M 2024-09-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: captoinfo.1m,v 1.69 2025/01/19 00:49:39 tom Exp $
+.TH @CAPTOINFO@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -206,8 +206,7 @@ The HP-UX \fI\%\%term\%info\fP library supports two nonstandard
 .I /etc/termcap
 default \fI\%termcap\fP terminal capability database
 .SH PORTABILITY
-X/Open Curses,
-Issue 7 (2009) describes \fBtic\fP briefly,
+X/Open Curses Issue\ 7 (2009) describes \fBtic\fP briefly,
 but omits this program.
 .PP
 SVr4 systems provide \fB\%captoinfo\fP as a separate application from
diff --git a/man/clear.1 b/man/clear.1
index a1034db7c..2e172234e 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.48 2024/03/16 15:35:01 tom Exp $
-.TH @CLEAR@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: clear.1,v 1.51 2025/01/19 00:49:39 tom Exp $
+.TH @CLEAR@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -91,8 +91,8 @@ exits with a successful status.
 .B \-x
 prevents \fB\%@CLEAR@\fP from attempting to clear the scrollback buffer.
 .SH PORTABILITY
-Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
-(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@CLEAR@\fP.
+Neither IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
+(POSIX.1-2008) nor X/Open Curses Issue\ 7 documents \fB\%@CLEAR@\fP.
 .PP
 The latter documents \fBtput\fP,
 which could be used to replace this utility either via a shell script or
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 8c538be17..9e0f6b65a 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp $
-.TH curs_add_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp $
+.TH curs_add_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -68,7 +68,9 @@ add a \fIcurses\fR complex character to a window, possibly advancing the cursor
 .SH DESCRIPTION
 .SS wadd_wch
 .B \%wadd_wch
-writes the complex character
+writes the
+.I curses
+complex character
 .I wch
 to the window
 .IR win ","
@@ -76,6 +78,12 @@ then may advance the cursor position,
 analogously to the standard C library's \fI\%putwchar\fP(3).
 \fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
+Construct a
+.I curses
+complex character
+from a
+.I wchar_t
+with \fB\%setcchar\fP(3X).
 Much behavior depends on whether the wide characters in
 .I wch
 are spacing or non-spacing;
@@ -162,7 +170,7 @@ can be copied from place to place using \fB\%win_wch\fP(3X) and
 .BR \%wadd_wch "."
 See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
 usefully \*(``or\*(''ed with characters.
-A complex character whose character component is a wide space,
+A complex character whose only character component is a wide space,
 and whose only attribute is
 .BR \%WA_NORMAL ,
 is a
@@ -176,7 +184,10 @@ and
 are equivalent to calling
 .RB \%( w ) add_wch
 followed by
-.RB \%( w ) refresh .
+.RB \%( w ) refresh
+on
+.B \%stdscr
+or the specified window.
 .I curses
 interprets these functions as a hint that only a single (complex)
 character is being output;
@@ -190,7 +201,7 @@ defines macros starting with
 .B \%WACS_
 that can be used with
 .B \%wadd_wch
-to write line-drawing and other special characters to the screen.
+to write line-drawing and other symbols to the screen.
 .I \%ncurses
 terms these
 .I "forms-drawing characters."
@@ -385,13 +396,20 @@ These functions return
 on success and
 .B ERR
 on failure.
+.PP
 In
 .IR \%ncurses ,
 .B \%wadd_wch
-returns
+and
+.B \%wecho_wchar
+return
 .B ERR
 if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
 .I win
 is
 .IR NULL ","
@@ -425,7 +443,7 @@ variable is implemented in SVr4 and other versions of
 but is not specified by X/Open Curses
 (see \fBcurs_variables\fP(3X)).
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+These functions are described in X/Open Curses Issue\ 4.
 It specifies no error conditions for them.
 .PP
 The defaults specified for forms-drawing characters apply in the POSIX
@@ -486,9 +504,9 @@ was intended.
 But there are several possibilities, all with problems.
 .IP
 Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and U+1F3EE.
-Those were not available in 2002, and are irrelevant since
-they lie outside the BMP and as a result are not generally available
-in terminals.
+Those were not available in 2002,
+and are irrelevant since they lie outside the Basic Multilingual Plane
+and as a result are unavailable on many terminals.
 They are not storm lanterns, in any case.
 .IP
 Most \fIstorm lanterns\fP have a tapering glass chimney
@@ -535,10 +553,10 @@ In the latter case,
 .I \%ncurses
 adds the non-spacing character to the active complex character.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
-The System\ V Interface Definition,
-Version 4 (1995),
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
 specified functions named
 .I \%waddwch
 and
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index b3a3548f4..9abc519df 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp $
-.TH curs_add_wchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp $
+.TH curs_add_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,12 +61,16 @@ add a \fIcurses\fR complex character string to a window
 \fBint add_wchstr(const cchar_t * \fIwchstr\fP);
 \fBint wadd_wchstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP);
 \fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
-\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
+\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const cchar_t * \fIwchstr\fP);
 .PP
 \fBint add_wchnstr(const cchar_t * \fIwchstr\fP, int \fIn\fP);
-\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
-\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
-\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP,
+      int \fIn\fP);
+\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP,
+      int \fIn\fP);
+\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const cchar_t * \fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%wadd_wchstr
@@ -77,7 +81,7 @@ to the window
 A null complex character terminates the string.
 If a complex character does not completely fit at the end of the line,
 .I curses
-fills the remaining columns with the window background;
+fills its remaining cells with the window's background character;
 see \fB\%bkgrnd\fP(3X).
 .B \%wadd_wchnstr
 does the same,
@@ -137,14 +141,11 @@ All of these functions except
 .B \%wadd_wchnstr
 may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
-The System\ V Interface Definition,
-Version 4 (1995),
+These functions were initially specified by X/Open Curses Issue\ 4.
+The System\ V Interface Definition Version\ 4 (1995),
 specified functions named
 .I \%waddwchstr
 and
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index b8056ee28..962f62459 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp $
-.TH curs_addch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
+.TH curs_addch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -84,6 +84,17 @@ then advances the cursor position,
 analogously to the standard C library's \fI\%putchar\fP(3).
 \fB\%ncurses\fP(3X) describes the variants of this function.
 .PP
+Construct a
+.I curses
+character
+from a
+.I char
+by assignment.
+Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) describes
+how to manipulate its attributes and color pair.
+(A color pair selection is not honored unless initialized;
+see \fB\%start_color\fP(3X).)
+.PP
 If advancement occurs at the right margin,
 .bP
 the cursor automatically wraps to the beginning of the next line,
@@ -156,7 +167,10 @@ and
 are equivalent to calling
 .RB \%( w ) addch
 followed by
-.RB \%( w ) refresh .
+.RB \%( w ) refresh
+on
+.B \%stdscr
+or the specified window.
 .I curses
 interprets these functions as a hint to its optimizer
 that only a single character cell in the window
@@ -171,7 +185,7 @@ defines macros starting with
 .B \%ACS_
 that can be used with
 .B \%waddch
-to write line-drawing and other special characters to the screen.
+to write line-drawing and other symbols to the screen.
 .I \%ncurses
 terms these
 .I "forms-drawing characters."
@@ -244,10 +258,16 @@ on failure.
 In
 .IR \%ncurses ,
 .B \%waddch
-returns
+and
+.B \%wechochar
+return
 .B ERR
 if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
 .I win
 is
 .IR NULL ","
@@ -300,15 +320,12 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 472
 .PP
 The defaults specified for forms-drawing characters apply in the POSIX
 locale.
@@ -351,7 +368,7 @@ The misdefined symbols are the arrows and others that are not used for
 line drawing.
 .bP
 X/Open Curses
-(Issues 2 through 7)
+(Issues\ 2 through 7)
 has a typographical error
 for the
 .B \%ACS_LANTERN
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 78c5fba93..1ec36df44 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
-.TH curs_addchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
+.TH curs_addchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,12 +61,14 @@ add a \fIcurses\fR character string to a window
 \fBint addchstr(const chtype * \fIchstr\fP);
 \fBint waddchstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP);
 \fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
-\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
+\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const chtype * \fIchstr\fP);
 .PP
 \fBint addchnstr(const chtype * \fIchstr\fP, int \fIn\fP);
 \fBint waddchnstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP, int \fIn\fP);
 \fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
-\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const chtype * \fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%waddchstr
@@ -137,9 +139,12 @@ All of these functions except
 .B \%waddchnstr
 may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 473
 .SH HISTORY
 SVr3.1 (1987)
 introduced
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 0f9a7316d..83d4f7236 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp $
-.TH curs_addstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp $
+.TH curs_addstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,10 +66,11 @@ add a string to a \fIcurses\fR window and advance the cursor
 \fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
 \fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
 \fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
-\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
-.B waddstr
+.B \%waddstr
 writes the characters of the (null-terminated) string
 .I str
 to the window
@@ -78,8 +79,7 @@ as if by calling \fB\%waddch\fP(3X) for each
 .I char
 in
 .IR str .
-.PP
-.B waddnstr
+.B \%waddnstr
 is similar,
 but writes at most
 .I n
@@ -87,10 +87,8 @@ characters.
 If
 .I n
 is \-1,
-.B
-.B waddnstr
+.B \%waddnstr
 writes the entire string.
-.PP
 \fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
 These functions return
@@ -123,11 +121,16 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All of these functions except \fBwaddnstr\fP may be macros.
+All of these functions except
+.B \%waddnstr
+may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 474
 .SH HISTORY
 4BSD (1980)
 .I curses
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 0b3174c00..9a473bd3e 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
-.TH curs_addwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
+.TH curs_addwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,15 +61,17 @@ add a wide-character string to a \fIcurses\fR window and advance the cursor
 \fBint addwstr(const wchar_t * \fIwstr\fP);
 \fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
 \fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
-\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const wchar_t * \fIwstr\fP);
 .PP
 \fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
-\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-.B waddwstr
+.B \%waddwstr
 writes the characters of the (wide-null-terminated) wide-character
 string
 .I wstr
@@ -88,8 +90,7 @@ then calling \fB\%wadd_wch\fP(3X) with the resulting
 processes spacing and non-spacing characters in
 .I wstr
 one at a time.
-.PP
-.B waddnwstr
+.B \%waddnwstr
 is similar,
 but writes at most
 .I n
@@ -97,10 +98,8 @@ wide characters.
 If
 .I n
 is \-1,
-.B
-.B waddnwstr
+.B \%waddnwstr
 writes the entire wide string.
-.PP
 \fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
 These functions return
@@ -134,15 +133,20 @@ fail if the position
 is outside the window boundaries.
 .SH NOTES
 All of these functions except
-.B waddnwstr
+.B \%waddnwstr
 may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 478
 .SH HISTORY
-The System\ V Interface Definition,
-Version 4 (1995),
-specified
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
+specified functions named
 .I \%waddwstr
 and
 .I \%waddnwstr
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index f89a64ed3..2c025ae68 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp $
-.TH curs_attr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp $
+.TH curs_attr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,17 +142,18 @@ of the given window to \fIattrs\fP, with color specified by \fIpair\fP.
 Use \fBwattr_get\fP to retrieve attributes for the given window.
 .PP
 Use \fBattr_on\fP and \fBwattr_on\fP to turn on window attributes, i.e.,
-values OR'd together in \fIattr\fP,
+values logically \*(``or\*(''-ed together in \fIattr\fP,
 without affecting other attributes.
 Use \fBattr_off\fP and \fBwattr_off\fP to turn off window attributes,
-again values OR'd together in \fIattr\fP,
+again values logically \*(``or\*(''-ed together in \fIattr\fP,
 without affecting other attributes.
 .\" ---------------------------------------------------------------------------
 .SS "Legacy Window Attributes"
 The X/Open window attribute routines which \fIset\fP or \fIget\fP,
 turn \fIon\fP or \fIoff\fP
 are extensions of older routines
-which assume that color pairs are OR'd into the attribute parameter.
+which assume that color pairs are logically \*(``or\*(''-ed
+into the attribute parameter.
 These newer routines use similar names, because
 X/Open simply added an underscore (\fB_\fP) for the newer names.
 .PP
@@ -165,8 +166,8 @@ it is the same size as
 It holds the common video attributes (such as bold, reverse),
 as well as a few bits for color.
 Those bits correspond to the \fBA_COLOR\fP symbol.
-The \fBCOLOR_PAIR\fP macro provides a value which can be OR'd into
-the attribute parameter.
+The \fBCOLOR_PAIR\fP macro provides a value which can be
+logically \*(``or\*(''-ed into the attribute parameter.
 For example,
 as long as that value fits into the \fBA_COLOR\fP mask,
 then these calls produce similar results:
@@ -255,11 +256,18 @@ there is no ambiguity about the way the attributes
 might be combined with a color pair.
 .\" ---------------------------------------------------------------------------
 .SS "Video Attributes"
-The following video attributes, defined in \fB<curses.h>\fP, can be passed to
-the routines \fBattron\fP, \fBattroff\fP, and \fBattrset\fP, or OR'd with the
-characters passed to \fBaddch\fP (see \fBcurs_addch\fP(3X)).
+The following video attributes,
+defined in
+.IR \%curses.h ","
+can be passed to
+.BR \%attron ","
+.BR \%attroff ","
+.BR \%attrset ","
+and
+logically \*(``or\*(''-ed with characters passed to \fBaddch\fP(3X).
 .PP
-.ne 15
+.if t .ne 15
+.if n .ne 16
 .RS
 .TS
 Lb Lb
@@ -267,9 +275,7 @@ Lb Lx.
 Name	Description
 _
 A_NORMAL	Normal display (no highlight)
-A_STANDOUT	T{
-Best highlighting mode of the terminal
-T}
+A_STANDOUT	Best highlighting mode available
 A_UNDERLINE	Underlining
 A_REVERSE	Reverse video
 A_BLINK	Blinking
@@ -279,26 +285,20 @@ A_PROTECT	Protected mode
 A_INVIS	Invisible or blank mode
 A_ALTCHARSET	Alternate character set
 A_ITALIC	Italics (non-X/Open extension)
-A_CHARTEXT	Bit-mask to extract a character
-A_COLOR	T{
-Bit-mask to extract a color (legacy routines)
-T}
+A_ATTRIBUTES	Mask to extract character code
+A_CHARTEXT	Mask to extract atributes
+A_COLOR	Mask to extract color pair identifier
 .TE
 .RE
 .PP
-You can thus use
-.B \%A_CHARTEXT
-to extract the character from a
-.IR chtype ","
-.B \%A_ATTRIBUTES
-to obtain its rendering attributes,
+.BR \%attr_on ","
+.BR \%attr_off ","
 and
-.B \%A_COLOR
-to find the color pair it uses.
-.PP
-These video attributes are supported by \fBattr_on\fP and related functions
-(which also support the attributes recognized by \fBattron\fP, etc.):
+.B \%attr_set
+support the foregoing as well as the following additional attributes.
 .PP
+.if t .ne 7
+.if n .ne 8
 .RS
 .TS
 Lb Lb
@@ -313,10 +313,6 @@ WA_TOP	Top highlight
 WA_VERTICAL	Vertical highlight
 .TE
 .RE
-.PP
-The return values of many of these routines are not meaningful (they are
-implemented as macro-expanded assignments and simply return their argument).
-The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
 .\" ---------------------------------------------------------------------------
 .SH RETURN VALUE
 These functions return
@@ -359,20 +355,38 @@ fail if the position
 is outside the window boundaries.
 .\" ---------------------------------------------------------------------------
 .SH NOTES
-These functions may be macros:
-.sp
-.RS
-\fBattroff\fP, \fBwattroff\fP, \fBattron\fP, \fBwattron\fP,
-\fBattrset\fP, \fBwattrset\fP, \fBstandend\fP and \fBstandout\fP.
-.RE
+.BR \%attr_on ","
+.BR \%attr_off ","
+.BR \%attr_set ","
+.BR \%wattr_set ","
+.BR \%chgat ","
+.BR \%mvchgat ","
+.BR \%mvwchgat ","
+and
+.B \%color_set
+are part of
+.IR \%ncurses "'s"
+wide-character API,
+and are not available in its non-wide configuration.
+.PP
+.BR \%attron ","
+.BR \%wattron ","
+.BR \%attroff ","
+.BR \%wattroff ","
+.BR \%attrset ","
+.BR \%wattrset ","
+.BR \%standout ","
+and
+.B \%standend
+may be implemented as macros.
 .PP
-Color pair values can only be OR'd with attributes if the pair
-number is less than 256.
+Color pair values be logically \*(``or\*(''-ed with attributes
+if the pair number is less than 256.
 The alternate functions such as \fBcolor_set\fP can pass a color pair
 value directly.
 However,
 .I \%ncurses
-ABI 4 and 5 simply OR this value
+ABI 4 and 5 simply logically \*(``or\*('' this value
 within the alternate functions.
 You must use
 .I \%ncurses
@@ -423,7 +437,7 @@ except to check that it is
 .IR NULL "."
 .\" ---------------------------------------------------------------------------
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+These functions are described in X/Open Curses Issue\ 4.
 It specifies no error conditions for them.
 .PP
 The standard defined the dedicated type for highlights,
@@ -434,6 +448,13 @@ The functions taking
 .I \%attr_t
 arguments were not supported under SVr4.
 .PP
+SVr4 describes the functions not taking
+.I \%attr_t
+or
+.I pair
+arguments as always returning
+.BR 1 "." \" Courier roman in source; SVID 4, vol. 3, p. 480
+.PP
 Very old versions of this library did not force an update of the screen
 when changing the attributes.
 Use \fBtouchwin\fP to force the screen to match the updated attributes.
@@ -534,84 +555,125 @@ no known terminal provides these highlights
 (i.e., via the \fBsgr1\fP capability).
 .\" ---------------------------------------------------------------------------
 .SH HISTORY
-X/Open Curses is largely based on SVr4
-.IR curses ","
-adding support for \*(``wide-characters\*('' (not specific to Unicode).
-Some of the X/Open differences from SVr4
+4BSD (1980)
 .I curses
-address the way
-video attributes can be applied to wide-characters.
-But aside from that, \fBattrset\fP and \fBattr_set\fP are similar.
-SVr4
+used a
+.I char
+to represent each cell of the terminal screen.
+It assumed 7-bit character codes,
+employing the eighth bit of a byte to represent a
+.I \%standout
+attribute
+(often implemented as bold and/or reverse video).
+It introduced
+.IR \%standout ","
+.IR \%standend ","
+.IR \%wstandout ","
+and
+.I \%wstandend
+functions to manipulate this bit.
+Despite their inflexibility,
+they carried over into System\ V
 .I curses
-provided the basic features for manipulating video attributes.
-However, earlier versions of
+and ultimately X/Open Curses
+due to their pervasive use in legacy applications.
+While some 1980s terminals supported a variety of video attributes,
+BSD
 .I curses
-provided a part of these features.
+could do nothing with them.
 .PP
-As seen in 2.8BSD,
+SVr2 (1984) provided an improved
 .I curses
-assumed 7-bit characters,
-using the eighth bit of a byte to represent the \fIstandout\fP
-feature (often implemented as bold and/or reverse video).
-The BSD
+library,
+introducing
+.I \%chtype
+to create the abstract notion of a
 .I curses
-library provided functions \fBstandout\fP and \fBstandend\fP
-which were carried along into X/Open Curses due to their pervasive use
-in legacy applications.
+character;
+this was by default an
+.IR "unsigned short" ","
+with a provision for compile-time redefinition to other integral types
+(a freedom not necessarily available to users of shared libraries,
+and in any event a source license was necessary to exercise it).
+It added the functions
+.IR \%attron ","
+.IR \%attroff ","
+.IR \%attrset ","
+.IR \%wattron ","
+.IR \%wattroff ","
+and
+.IR \%wattrset ","
+and defined the
+.I A_
+macros listed above
+(except for
+.I \%A_ITALIC
+and
+.IR \%A_COLOR ")"
+for use by applications to manipulate other attributes.
+The values of these macros
+were not necessarily the same in different systems,
+even among those certified as System\ V.
+.PP
+SVr3.2 (1988)
+added the
+.I \%A_COLOR
+macro along with a color system;
+see \fBcurs_color\fP(3X).
 .PP
-Some terminals in the 1980s could support a variety of video attributes,
-although the BSD
-.I curses
-library could do nothing with those.
-System V (1983) provided an improved
+X/Open Curses is largely based on SVr4
+.IR curses ","
+but recognized that the
+.I \%wchar_t
+type of ISO C95 was intended to house only a single character code,
+not a sequence of codes combining with a base character,
+let alone could it reliably offer room for a color pair identifier
+and a set of attribute bits with a potential for further growth \(em
+thus the standard invented the
 .I curses
-library.
-It defined the \fBA_\fP symbols for use by applications to manipulate the
-other attributes.
-There are few useful references for the chronology.
-.PP
-Goodheart's book
-\fIUNIX Curses Explained\fP (1991) describes SVr3 (1987),
-commenting on several functions:
-.bP
-the \fBattron\fP, \fBattroff\fP, \fBattrset\fP functions
-(and most of the functions found in SVr4 but not in BSD
-.IR curses ")"
-were
-introduced by System V,
-.bP
-the alternate character set feature with \fBA_ALTCHARSET\fP was
-added in SVr2 and improved in SVr3 (by adding \fBacs_map[]\fP),
-.bP
-\fBstart_color\fP and related color-functions were introduced by System V.3.2,
-.bP
-pads, soft-keys were added in SVr3, and
-.PP
-Goodheart did not mention the background character or the
+complex character type
 .I \%cchar_t
-type.
-Those are respectively SVr3.1 and X/Open features.
-He did mention the \fBA_\fP constants, but did not indicate their values.
-Those were not the same in different systems,
-even for those marked as System V.
+and a separate type
+.I \%attr_t
+for storage of attribute bits.
+The new types brought along several new functions to manipulate them,
+some corresponding to existing
+.IR chtype -based
+functions
+.RI \%( attr_on ,
+.IR \%attr_off ","
+.IR \%attr_set ","
+.IR \%wattr_on ","
+.IR \%wattr_off ","
+and
+.IR \%wattr_set "),"
+and some new
+.RI \%( color_set ,
+.IR \%wcolor_set ","
+.IR \%chgat ","
+.IR \%wchgat ","
+.IR \%mvchgat ","
+and
+.IR \%mvwchgat ")."
 .PP
-Different Unix systems used different sizes for the bit-fields in
+Different Unix systems used differently sized bit fields in
 .I \%chtype
-for \fIcharacters\fP and \fIcolors\fP, and took into account the different
-integer sizes (32-bit versus 64-bit).
+for the character code and the color pair identifier,
+and took into account platforms' different integer sizes
+(32- versus 64-bit).
 .PP
-This table showing the number of bits for \fBA_COLOR\fP
-and \fBA_CHARTEXT\fP
+The following table showing the number of bits for
+.I \%A_COLOR
+and
+.I \%A_CHARTEXT
 was gleaned from the
 .I curses
-header files for
-various operating systems and architectures.
-The inferred architecture and notes reflect
-the format and size of the defined constants
+header files for various operating systems and architectures.
+The inferred architecture and notes
+reflect the format and size of the defined constants
 as well as clues such as the alternate character set implementation.
 A 32-bit library can be used on a 64-bit system,
-but not necessarily the reverse.
+but not necessarily the converse.
 .PP
 .TS
 Lb  Lb Lb  Cb  S   Lb
@@ -630,7 +692,7 @@ _
 1996	AIX 4.2	32	7	16	X/Open \fIcurses\fP
 1996	OSF/1 r4	32	6	16	X/Open \fIcurses\fP
 1997	HP-UX 11.00	32	6	8	X/Open \fIcurses\fP
-2000	U/Win	32/64	7/31	16	uses \fIchtype\fP
+2000	UWIN	32/64	7/31	16	uses \fIchtype\fP
 .TE
 .PP
 Notes:
@@ -662,7 +724,10 @@ Regarding Solaris,
 .bP
 The initial release of Solaris was in 1992.
 .bP
-The \fIxpg4\fP (X/Open) Curses was developed by MKS from 1990 to 1995.
+Its XPG4
+(X/Open Curses-conforming)
+.I xcurses
+library was developed by Mortice Kern Systems from 1990 to 1995.
 Sun's copyright began in 1996.
 .bP
 Sun updated the X/Open Curses interface
@@ -671,7 +736,7 @@ but did not modify the SVr4
 .I curses
 interface.
 .PP
-Regarding U/Win,
+Regarding UWIN,
 .bP
 Development of the
 .I curses
@@ -681,7 +746,7 @@ Color support was added in 1998.
 .bP
 The library uses only
 .I \%chtype
-(no
+(not
 .IR \%cchar_t ")."
 .RE
 .PP
@@ -691,23 +756,32 @@ a 32-bit interface with many colors and wide-characters for
 became a moot point.
 The
 .I \%cchar_t
-structure (whose size and
-members are not specified in X/Open Curses) could be extended as needed.
+structure
+(whose size and members are not specified in X/Open Curses)
+could be extended as needed.
 .PP
-Other interfaces are rarely used now:
+Other interfaces are rarely used now.
 .bP
 BSD
 .I curses
 was improved slightly in 1993/1994 using Keith Bostic's
-modification to make the library 8-bit clean for \fBnvi\fP(1).
-He moved \fIstandout\fP attribute to a structure member.
-.IP
+modification to make the library 8-bit clean for \fInvi\fP(1).
+He moved the
+.I \%standout
+attribute to a structure member.
 The resulting 4.4BSD
 .I curses
-was replaced by \fI\%ncurses\fP over the
-next ten years.
+was replaced by
+.I \%ncurses
+over the next ten years.
 .bP
-U/Win is rarely used now.
+UWIN has been defunct since 2012.
+.PP
+.I \%ncurses
+6.0 (2015)
+added the
+.I A_ITALIC
+macro.
 .\" ---------------------------------------------------------------------------
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index bc90da919..99db98db6 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp $
-.TH curs_beep 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp $
+.TH curs_beep 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -91,8 +91,7 @@ In
 these functions can return
 .BR ERR "."
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 On SVr4
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 6b5c8e38b..91e9c725c 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp $
-.TH curs_bkgd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgd.3x,v 1.74 2025/01/19 00:49:39 tom Exp $
+.TH curs_bkgd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,36 +66,46 @@ manipulate background of a \fIcurses\fR window of characters
 .SH DESCRIPTION
 Every
 .I curses
-window has a background property.
-In the library's non-wide configuration,
-this property is a
-.I \%chtype
-which combines a set of attributes with the
+window has a
 .I "background character"
-(see \fB\%curs_attr\fP(3X)).
-The background character is a spacing character.
-.PP
-When erasing parts of the screen,
+property:
+in the library's non-wide configuration,
+it is a
+.I curses
+character
+.RI \%( chtype )
+that combines a set of attributes
+(and,
+if colors are enabled,
+a color pair identifier)
+with a character code.
+When erasing
+(parts of)
+a window,
 .I curses
-fills the cells with the background character.
+replaces the erased cells with the background character.
+.PP
 .I curses
-also uses the window background when writing characters to the screen.
+also uses the background character when writing characters to a
+populated window.
 .bP
-The attribute part of the background combines with all
-non-blank characters written into the window,
-as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
-functions.
+The attribute part of the background character combines with all
+non-blank character cells in the window,
+as populated by the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X)
+families of functions
+(and those that call them).
 .bP
-Both the character and attribute parts of the background combine with
-blank characters that are written into the window.
+Both the character code and attributes of the background character
+combine with blank character cells in the window.
 .PP
-The background becomes a property of the character and moves with it
-through any scrolling and insert/delete line/character operations.
-.PP
-To the extent possible on a given terminal,
+The background character's set of attributes becomes a property
+of the character cell
+and move with it through any scrolling
+and insert/delete line/character operations.
+To the extent possible on the terminal type,
 .I curses
-displays the attributes of the background
-as the graphic rendition of the character put on the screen.
+displays the attributes of the background character
+as the graphic rendition of a character cell on the display.
 .SS "bkgd, wbkgd"
 .B \%bkgd
 and
@@ -126,7 +136,7 @@ if they match,
 writes the new background character to the cell.
 .bP
 .I \%ncurses
-then checks if the cell uses color;
+then checks whether the cell uses color;
 that is,
 its color pair value is nonzero.
 If not,
@@ -149,17 +159,19 @@ updates only the non-color attributes,
 first removing those that may have come from the current background,
 and then adding attributes from the new background.
 .PP
-If the new background's character is nonspacing,
+If the new background's character is non-spacing
+(for example,
+if it is a control character),
 .I \%ncurses
 retains the existing background character,
 except for one special case:
 .I \%ncurses
-treats a background character value of zero (0) as a space.
+treats a background character code of zero (0) as a space.
 .PP
 If the terminal does not support color,
 or if color has not been initialized with \fB\%start_color\fP(3X),
 .I \%ncurses
-ignores the new background character's color attribute.
+ignores the new background character's color pair selection.
 .SS "bkgdset, wbkgdset"
 .B \%bkgdset
 and
@@ -181,7 +193,7 @@ and color pair as a
 .B \%bkgdset
 and
 .B \%wbkgdset
-do not return a value
+do not return a value.
 .PP
 Functions returning an
 .I int
@@ -194,10 +206,11 @@ In
 .IR \%ncurses ","
 failure occurs if
 .bP
-if the library has not been initialized,
+the
+.I curses
+screen has not been initialized,
 or
 .bP
-if
 .I win
 is
 .IR NULL "."
@@ -227,18 +240,17 @@ be a single-byte value.
 .IR \%ncurses ","
 like SVr4
 .IR curses ","
-checks to ensure that,
+checks to ensure that it is,
 and retains the existing background character if the check fails.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It indicates that
 .IR bkgd ","
 .IR wbkgd ","
 and
 .I getbkgd
 return
-.B ERR
+.I ERR
 on failure
 (in the case of the last,
 this value is cast to
@@ -252,24 +264,23 @@ says that
 and
 .I \%wbkgd
 return
-.B OK
+.I OK
 \*(``or a non-negative integer if
-.B \%immedok
+.I \%immedok() \" Courier roman in source
 is set\*('',
-which refers to the return value from
-.IR \%wrefresh() ","
-used to implement the immediate repainting.
-SVr4
-.IR curses 's
-.I \%wrefresh
-returns the number of characters
-written to the screen during the refresh;
-that of
-.I \%ncurses
-does not.
+referring to the return value from
+.IR \%wrefresh ","
+which in SVr4 returns a count of characters
+written to the window if its
+.I \%immedok
+property is set;
+.\" ...though its wrefresh() man page says nothing about immedok()...
+in
+.IR \%ncurses ","
+it does not.
 .PP
 Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
-of characters on the screen updates when
+of characters in the window updates when
 .I \%bkgd
 or
 .I \%wbkgd
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 38f428f82..8664cf922 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
-.TH curs_bkgrnd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp $
+.TH curs_bkgrnd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -68,36 +68,46 @@ manipulate background of a \fIcurses\fP window of wide characters
 .SH DESCRIPTION
 Every
 .I curses
-window has a background property.
-In the library's wide configuration,
-this property is a
-.I \%cchar_t
-which combines a set of attributes with the
+window has a
 .I "background character"
-(see \fB\%curs_attr\fP(3X)).
-The background character is a spacing character.
-.PP
-When erasing parts of the screen,
+property:
+in the library's wide configuration,
+it is a
 .I curses
-fills the cells with the background character.
+complex character
+.RI \%( cchar_t )
+that combines a set of attributes
+(and,
+if colors are enabled,
+a color pair identifier)
+with a character code.
+When erasing
+(parts of)
+a window,
+.I curses
+replaces the erased cells with the background character.
+.PP
 .I curses
-also uses the window background when writing characters to the screen.
+also uses the background character when writing characters to a
+populated window.
 .bP
-The attribute part of the background combines with all
-non-blank characters written into the window,
-as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
-functions.
+The attribute part of the background character combines with all
+non-blank character cells in the window,
+as populated by the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X)
+families of functions
+(and those that call them).
 .bP
-Both the character and attribute parts of the background combine with
-blank characters that are written into the window.
+Both the character code and attributes of the background character
+combine with blank character cells in the window.
 .PP
-The background becomes a property of the character and moves with it
-through any scrolling and insert/delete line/character operations.
-.PP
-To the extent possible on a given terminal,
+The background character's set of attributes becomes a property
+of the character cell
+and move with it through any scrolling
+and insert/delete line/character operations.
+To the extent possible on the terminal type,
 .I curses
-displays the attributes of the background
-as the graphic rendition of the character put on the screen.
+displays the attributes of the background character
+as the graphic rendition of a character cell on the display.
 .SS "bkgrnd, wbkgrnd"
 .B \%bkgrnd
 and
@@ -128,7 +138,7 @@ if they match,
 writes the new background character to the cell.
 .bP
 .I \%ncurses
-then checks if the cell uses color;
+then checks whether the cell uses color;
 that is,
 its color pair value is nonzero.
 If not,
@@ -151,17 +161,17 @@ updates only the non-color attributes,
 first removing those that may have come from the current background,
 and then adding attributes from the new background.
 .PP
-If the new background's character is nonspacing,
+If the new background's character is non-spacing,
 .I \%ncurses
 reuses the old background character,
 except for one special case:
 .I \%ncurses
-treats a background character value of zero (0) as a space.
+treats a background character code of zero (0) as a space.
 .PP
 If the terminal does not support color,
 or if color has not been initialized with \fB\%start_color\fP(3X),
 .I \%ncurses
-ignores the new background character's color attribute.
+ignores the new background character's color pair selection.
 .SS "bkgrndset, wbkgrndset"
 .B \%bkgrndset
 and
@@ -191,7 +201,9 @@ and
 .B \%wbkgrndset
 do not return a value.
 .PP
-The other functions return
+Functions returning an
+.I int
+return
 .B ERR
 upon failure and
 .B OK
@@ -200,6 +212,10 @@ In
 .IR \%ncurses ","
 failure occurs if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
 .I win
 is
 .IR NULL ","
@@ -220,14 +236,12 @@ Unlike their counterparts in the non-wide configuration of
 .B \%getbkgrnd
 and
 .B \%wgetbkgrnd
-supply the background character
-and attribute in a modifiable
+store the background character in a modifiable
 .I \%cchar_t
 parameter,
-not as the return value.
+rather than supplying it as the return value.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses does not provide details of how the rendition is updated.
@@ -236,8 +250,7 @@ follows the approach used in SVr4
 .IR curses 's
 non-wide functions for manipulating the window background.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
+These functions were initially specified by X/Open Curses Issue\ 4.
 .SH SEE ALSO
 \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
 non-wide configuration of
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 4d159f6f3..172168027 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp $
-.TH curs_border 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp $
+.TH curs_border 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -137,9 +137,6 @@ The line is at most \fIn\fP characters
 long, or as many as fit into the window.
 .SH RETURN VALUE
 All routines return the integer \fBOK\fP.
-The SVr4.0 manual says
-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
-but this appears to be an error.
 .PP
 This implementation returns
 .B ERR
@@ -151,13 +148,34 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
+.B \%border
+and
+.B \%box
+may be implemented as macros.
+.PP
 The borders generated by these functions are \fIinside\fP borders (this
 is also true of SVr4 curses, though the fact is not documented).
-.PP
-Note that \fBborder\fP and \fBbox\fP may be macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+These functions are described in X/Open Curses Issue\ 4.
 It specifies no error conditions for them.
+.PP
+SVr4 documentation
+.\" SVID 4, vol. 3, p. 483
+says that these functions return
+.I OK
+\*(``or a non-negative integer if
+.I \%immedok() \" Courier roman in source
+is set\*('',
+referring to the return value from
+.IR \%wrefresh ","
+which in SVr4 returns a count of characters
+written to the window if its
+.I \%immedok
+property is set;
+.\" ...though its wrefresh() man page says nothing about immedok()...
+in
+.IR \%ncurses ","
+it does not.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 6e1acdf53..08db07021 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp $
-.TH curs_border_set 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
+.TH curs_border_set 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -187,17 +187,17 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Note that
-\fBborder_set\fP,
-\fBhline_set\fP,
-\fBmvhline_set\fP,
-\fBmvvline_set\fP,
-\fBmvwhline_set\fP,
-\fBmvwvline_set\fP, and
-\fBvline_set\fP
-may be macros.
+.BR \%border_set ","
+.BR \%hline_set ","
+.BR \%mvhline_set ","
+.BR \%mvvline_set ","
+.BR \%mvwhline_set ","
+.BR \%mvwvline_set ","
+and
+.B \%vline_set
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+These functions are described in X/Open Curses Issue\ 4.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 66d84582d..8a25bd45f 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
-.TH curs_clear 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_clear.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
+.TH curs_clear 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -93,7 +93,6 @@ to the right of the cursor, inclusive, to the end of the current line.
 .SH RETURN VALUE
 All routines return the integer \fBOK\fP on success and \fBERR\fP on failure.
 .PP
-X/Open defines no error conditions.
 In this implementation,
 .bP
 functions using a window pointer parameter return
@@ -103,16 +102,35 @@ if it is null
 \fBwclrtoeol\fP returns an error
 if the cursor position is about to wrap.
 .SH NOTES
-Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
-\fBclrtobot\fP, and \fBclrtoeol\fP may be macros.
+.BR \%erase ","
+.BR \%werase ","
+.BR \%clear ","
+.BR \%wclear ","
+.BR \%clrtobot ","
+and
+.B \%clrtoeol
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-The SVr4.0 manual says that these functions could return
-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
-referring to the return-value of \fBwrefresh\fP.
-In that implementation, \fBwrefresh\fP would return a count of
-the number of characters written to the terminal.
+SVr4 documentation
+.\" SVID 4, vol. 3, p. 485
+says that these functions return
+.I OK
+\*(``or a non-negative integer if
+.I \%immedok() \" Courier roman in source
+is set\*('',
+referring to the return value from
+.IR \%wrefresh ","
+which in SVr4 returns a count of characters
+written to the window if its
+.I \%immedok
+property is set;
+.\" ...though its wrefresh() man page says nothing about immedok()...
+in
+.IR \%ncurses ","
+it does not.
 .PP
 Some historic curses implementations had, as an undocumented feature, the
 ability to do the equivalent of \fBclearok(..., 1)\fP by saying
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 71df2838e..8367e4551 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp $
-.TH curs_color 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
+.TH curs_color 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -69,7 +69,8 @@
 \fB\%COLOR_BLUE\fP,
 \fB\%COLOR_MAGENTA\fP,
 \fB\%COLOR_CYAN\fP,
-\fB\%COLOR_WHITE\fP \-
+\fB\%COLOR_WHITE\fP,
+\fB\%A_COLOR\fP \-
 manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
 .nf
@@ -99,8 +100,18 @@ manipulate terminal colors with \fIcurses\fR
 \fI/* extension */
 \fBvoid reset_color_pairs(void);
 .PP
+\fI/* macros */
 \fBint COLOR_PAIR(int \fIn\fP);
 \fBPAIR_NUMBER(int \fIattr\fP);
+\fBCOLOR_BLACK
+\fBCOLOR_RED
+\fBCOLOR_GREEN
+\fBCOLOR_YELLOW
+\fBCOLOR_BLUE
+\fBCOLOR_MAGENTA
+\fBCOLOR_CYAN
+\fBCOLOR_WHITE
+\fBA_COLOR
 .fi
 .SH DESCRIPTION
 .SS Overview
@@ -200,6 +211,10 @@ background color for all terminals.
 .PP
 Some terminals support more than the eight (8) \*(``ANSI\*('' colors.
 There are no standard names for those additional colors.
+.PP
+.B \%A_COLOR
+is a bit mask that extracts a color pair identifier from a
+.IR \%chtype "."
 .SH VARIABLES
 .SS COLORS
 is initialized by \fB\%start_color\fP to the maximum number of colors
@@ -418,89 +433,170 @@ rather than the legacy functions such as \fB\%attrset\fP.
 \fIattr\fP parameter and returns it as a color pair number;
 it is the inverse operation of \fB\%COLOR_PAIR\fP.
 .SH RETURN VALUE
-The routines \fB\%can_change_color\fP and \fB\%has_colors\fP return \fBTRUE\fP
-or \fBFALSE\fP.
-.PP
-All other routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only \*(``an integer value
-other than \fBERR\fP\*('') upon successful completion.
+.B \%can_change_color
+and
+.B \%has_colors
+return
+.B TRUE
+or
+.BR FALSE "."
+The other functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open defines no error conditions.
-SVr4 does document some error conditions which apply in general:
+In
+.IR \%ncurses ","
+functions returning an
+.I int
+recognize several error conditions.
 .bP
-This implementation will return \fBERR\fP on attempts to
-use color values outside the range \fB0\fP to \fB\%COLORS\fP\-1
-(except for the default colors extension),
-or use color pairs outside the range \fB0\fP to \fB\%COLOR_PAIRS\-1\fP.
-.IP
-Color values used in \fB\%init_color\fP must be
-in the range \fB0\fP to \fB1000\fP.
-.IP
-An error is returned from all functions
-if the terminal has not been initialized.
-.IP
-An error is returned from secondary functions such as \fB\%init_pair\fP
-if \fB\%start_color\fP was not called.
+All return
+.B ERR
+if the screen has not been initialized;
+see \fBinitscr\fP(3X) or \fBnewterm\fP(3X).
 .bP
-SVr4 does much the same, except that
-it returns \fBERR\fP from \fB\%pair_content\fP if the pair was not initialized
-using \fB\%init_pairs\fP
-and
-it returns \fBERR\fP from \fB\%color_content\fP
-if the terminal does not support changing colors.
-.IP
-This implementation does not return \fBERR\fP for either case.
-.PP
-Specific functions make additional checks:
-.RS 3
-.TP 5
-\fB\%init_color\fP
+All except
+.B \%start_color
+return
+.B ERR
+if
+.B \%start_color
+has not been called,
+or itself returned
+.BR ERR "."
+.bP
+.B \%start_color
 returns
 .B ERR
-if the terminal does not support
-this feature, e.g., if the \fB\%initialize_color\fP capability is absent
-from the terminal description.
-.TP 5
-\fB\%start_color\fP
-returns an error if the color table cannot be allocated.
+if it cannot allocate memory for its color pair table.
+.bP
+.B \%init_color
+returns
+.B ERR
+if the terminal type does not support assignable color values;
+that is,
+if the
+.B \%initialize_color
+.RB ( initc )
+capability is absent from its description.
+.bP
+.B \%init_color
+returns
+.B ERR
+if any of its
+.IR r ","
+.IR g ","
+.I b
+arguments is outside the range 0-1000 inclusive.
+.bP
+.BR \%init_pair ","
+.BR \%init_color ","
+.BR \%init_extended_pair ","
+.BR \%init_extended_color ","
+.BR \%color_content ","
+.BR \%pair_content ","
+.BR \%extended_color_content ","
+and
+.B \%extended_pair_content
+return
+.B ERR
+on attempts to use
+.RS
+.bP
+color identifiers outside the range
+.RB \%0- COLORS \-1
+inclusive,
+the default colors extension notwithstanding,
+or
+.bP
+color pairs identifiers outside the range
+.RB \%0- COLOR_PAIRS \-1
+inclusive.
 .RE
 .SH NOTES
-In the \fI\%ncurses\fP implementation,
-there is a separate color activation flag,
-color palette, color pairs table,
-and associated \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP counts
-for each screen; the \fB\%start_color\fP function only affects the current
-screen.
-The SVr4/XSI interface is not really designed with this in mind, and
+In
+.IR \%ncurses ","
+.B \%init_pair
+accepts negative foreground and background color arguments
+to support its \fB\%use_default_colors\fP(3X) extension,
+but only after the latter function has been called.
+.PP
+The assumption that
+.B \%COLOR_BLACK
+is the terminal's default background color can be overridden using
+.IR \%ncurses 's
+\fB\%assume_default_colors\fP(3X) extension.
+.PP
+In
+.IR \%ncurses ","
+each pointer passed to
+.B \%color_content
+and
+.B \%pair_content
+can be null,
+in which case the library ignores it,
+permitting the application to disregard unnecessary information.
+.PP
+In
+.IR \%ncurses ","
+each screen has a
+color activation flag,
+color palette,
+color pair table,
+and associated
+.B \%COLORS
+and
+.B \%COLOR_PAIRS
+values for each screen;
+.B \%start_color
+affects only the current screen.
+The SVr4 and X/Open Curses interface was not really designed
+with this in mind;
 historical implementations may use a single shared color palette.
 .PP
 Setting an implicit background color via a color pair affects only
 character cells that a character write operation explicitly touches.
-To change
-the background color used when parts of a window are blanked by erasing or
-scrolling operations, see \fB\%curs_bkgd\fP(3X).
-.PP
-Several caveats apply on older x86 machines
-(e.g., i386, i486) with VGA-compatible graphics:
-.bP
-COLOR_YELLOW is actually brown.
-To get yellow, use COLOR_YELLOW combined with the \fBA_BOLD\fP attribute.
-.bP
-The A_BLINK attribute should in theory cause the background to go bright.
-This often fails to work, and even some cards for which it mostly works
-(such as the
-Paradise and compatibles) do the wrong thing when you try to set a bright
-\*(``yellow\*('' background (you get a blinking yellow foreground instead).
+To change the background color used
+when parts of a window are blanked by erasing or scrolling operations,
+see \fB\%curs_bkgd\fP(3X).
+.PP
+Several caveats apply to IBM PC-compatible machines
+of the 80486 era and earlier
+with CGA/EGA/VGA video.
+.bP
+.B \%COLOR_YELLOW
+is actually brown.
+To get yellow,
+combine
+.B \%COLOR_YELLOW
+with the
+.B \%A_BOLD
+attribute.
 .bP
-Color RGB values are not settable.
+The
+.B \%A_BLINK
+attribute should in theory make the background bright.
+This often fails to work,
+and even VGA controllers for which it mostly works,
+such as those from Paradise and compatibles,
+do the wrong thing
+when you try to set a bright \*(``yellow\*('' background \(em
+you get a blinking yellow foreground instead.
+.bP
+Color RGB values are not configurable on these devices
+(in text mode).
 .SH EXTENSIONS
-The functions marked as extensions were designed for
-\fB\%ncurses\fP(3X),
+The functions marked as extensions originated in
+.IR \%ncurses ","
 and are not found in SVr4
 .IR curses ,
 4.4BSD
 .IR curses ,
-or any other previous curses implementation.
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
@@ -508,84 +604,147 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-This implementation satisfies X/Open Curses's minimum maximums
-for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-The \fB\%init_pair\fP routine accepts negative values of foreground
-and background color to support the \fB\%use_default_colors\fP(3X) extension,
-but only if that routine has been first invoked.
-.PP
-The assumption that \fB\%COLOR_BLACK\fP is the default
-background color for all terminals can be modified using the
-\fB\%assume_default_colors\fP(3X) extension.
-.PP
-This implementation checks the pointers,
-e.g., for the values returned by
-\fB\%color_content\fP and \fB\%pair_content\fP,
-and will treat those as optional parameters when null.
+.I \%ncurses
+satisfies X/Open Curses's minimum maximums for
+.I \%COLORS
+and
+.IR \%COLOR_PAIRS "."
 .PP
 X/Open Curses does not specify a limit for the number of colors and
 color pairs which a terminal can support.
-However, in its use of \fBshort\fP for the parameters,
+However,
+in its use of
+.I short
+for the parameters,
 it carries over SVr4's implementation detail for the compiled
-terminfo database, which uses signed 16-bit numbers.
-This implementation provides extended versions of those functions
-which use \fBshort\fP parameters,
-allowing applications to use larger color- and pair-numbers.
+.I \%term\%info
+database,
+which uses signed 16-bit numbers.
+.I \%ncurses
+provides extended versions of the functions using
+.I short
+parameters,
+allowing applications to use larger color and pair identifiers.
 .PP
-The \fB\%reset_color_pairs\fP function is an extension of
-\fI\%ncurses\fP.
+SVr4
+.I curses
+returns
+.I ERR
+from
+.I \%pair_content
+if its
+.I pair
+argument
+was not initialized using
+.IR \%init_pairs ,
+and from
+.I \%color_content
+if the terminal does not support changing colors.
+.I \%ncurses
+does neither.
 .SH HISTORY
-SVr3.2 introduced color support to curses in 1987.
-.PP
-SVr4 made internal changes,
-e.g., moving the storage for the color state
-from \fBSP\fP (the \fISCREEN\fP structure)
-to \fB\%cur_term\fP (the \fI\%TERMINAL\fP structure),
-but provided the same set of library functions.
-.PP
-SVr4 curses limits the number of color pairs to 64,
-reserving color pair zero (0) as the terminal's initial uncolored state.
-This limit arises because the color pair information is a bitfield
-in the \fB\%chtype\fP data type (denoted by \fB\%A_COLOR\fP).
-.PP
-Other implementations of curses had different limits:
+SVr3.2 (1987) introduced color support with all of the symbols in the
+synopsis above except those marked as extensions.
+It reserved color pair 0 as the terminal's initial,
+\*(``uncolored\*('' state,
+.\" "we assume that color 0 is always a default background.", SVr3.2
+.\" usr/src/lib/libcurses/screen/start_col.c
+and limited the number of possible color pairs to 64,
+because the color pair datum was encoded in six bits of a
+.IR \%chtype "."
+.PP
+SVr4 made only internal changes,
+such as moving the storage of color state
+from the
+.I SCREEN
+structure
+(pointed to by
+.IR SP )
+to the
+.I \%TERMINAL
+structure
+(pointed to by
+.IR \%cur_term ")."
+.PP
+Other
+.I curses
+implementations impose different limits on the number of colors and
+color pairs.
 .bP
 .I \%PCCurses
-(1987-1990) provided for only eight (8) colors.
+(1987-1990) provided for only 8 colors
+(and therefore required at most 8\(mu8 = 64 color pairs).
 .bP
 .I \%PDCurses
 (1992-present) inherited the 8-color limitation from
 .IR \%PCCurses ,
 but changed this to 256 in version 2.5 (2001),
-along with changing \fB\%chtype\fP from 16-bits to 32-bits.
+and widened its
+.I \%chtype
+from 16 to 32 bits.
 .bP
 X/Open Curses (1992-present)
-added a new structure \fB\%cchar_t\fP to store the character,
-attributes and color pair values, allowing increased range of color pairs.
-Both color pairs and color-values used a signed \fBshort\fP,
-limiting values to 15 bits.
+specified a new structure type,
+.IR \%cchar_t ","
+to store the character code,
+attribute flags,
+and color pair identifier,
+allowing an increased range of color pairs.
+It specifies a
+.I short
+as storing identifiers for colors and color pairs,
+limiting portable values to 15 bits;
+negative values are invalid in System\ V.
 .bP
-\fI\%ncurses\fP (1992-present) uses eight bits
-for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
+.I \%ncurses
+(1992-present),
+in its non-wide configuration,
+uses 8 bits of
+.I \%chtype
+for the color pair identifier.
 .IP
-Version 5.3 provided a wide-character interface (2002),
-but left color pairs as part of the attributes-field.
+Version 5.3 (2002) offered a wide-character interface,
+but encoded the color pair identifier with attributes
+in the character type.
 .IP
 Since version 6 (2015),
-ncurses uses a separate \fBint\fP for color pairs in the \fB\%cchar_t\fP values.
-When those color pair values fit in 8 bits,
-ncurses allows color pairs to be manipulated
-via the functions using \fB\%chtype\fP values.
-.bP
-NetBSD curses used 6 bits from
-2000 (when colors were first supported) until 2004.
-At that point, NetBSD changed to use 10 bits.
-As of 2021, that size is unchanged.
-Like \fI\%ncurses\fP before version 6,
-the NetBSD color pair information is stored in
-the attributes field of \fB\%cchar_t\fP, limiting the number of color pairs
-by the size of the bitfield.
+.I \%ncurses
+uses a separate
+.I int
+for the color pair identifier in a
+.IR \%cchar_t ","
+introducing extension functions to manage the wider type.
+When a color pair value fits in 8 bits,
+.I \%ncurses
+permits color pair data to be manipulated
+via the functions taking
+.I \%chtype
+arguments,
+even when a
+.I curses
+window uses wide-character cells.
+.bP
+NetBSD
+.I curses
+used 6 bits for the color pair identifier from 2000
+(when it first added color support)
+until 2004.
+At that point,
+NetBSD widened the color pair identifier to use 9 bits.
+As of 2025,
+that size is unchanged.
+.\" http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libcurses/curses.h?rev=1.133
+.\" indicates a mask of 0x03fe0000.
+Like
+.I \%ncurses
+before version 6,
+the NetBSD color pair datum is stored in
+the attributes field of
+.IR \%cchar_t ","
+limiting the number of color pairs.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 010140f84..9781aa8c3 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp $
-.TH curs_delch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_delch.3x,v 1.47 2025/01/19 00:49:39 tom Exp $
+.TH curs_delch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,17 +103,14 @@ A terminal's
 capability
 is not necessarily employed.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 489
 .SH HISTORY
 SVr2 (1984) introduced
-.IR \%delch "."
+.IR \%wdelch "."
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index f24987340..4be36ce59 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
-.TH curs_deleteln 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp $
+.TH curs_deleteln 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -124,15 +124,12 @@ by default
 does not use them;
 see \fB\%idlok\fP(3X).
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 490
 .SH HISTORY
 4BSD (1980)
 .I curses
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 740ec14f1..490d7de61 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
-.TH curs_extend 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_extend.3x,v 1.54 2025/01/19 00:49:39 tom Exp $
+.TH curs_extend 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -96,12 +96,16 @@ The pointer returned by
 corresponds to statically allocated memory;
 do not attempt to \fIfree\fP(3) it.
 .SH EXTENSIONS
-These functions are \fB\%ncurses\fP(3X) extensions,
+These functions are
+.I \%ncurses
+extensions,
 and are not found in SVr4
 .IR curses ,
 4.4BSD
 .IR curses ,
-or any other previous curses implementation.
+or any other previous
+.I curses
+implementation.
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index a9ef525bc..f2f6a5a27 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp $
-.TH curs_get_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp $
+.TH curs_get_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,7 +103,7 @@ the function returns
 otherwise,
 .I curses
 waits until the terminal has input.
-If \fB\%cbreak\fP(3X)
+If \fB\%cbreak\fP(3X) or \fB\%raw\fP(3X)
 has been called,
 this happens after one character is read.
 If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
@@ -158,7 +158,7 @@ on it.
 .PP
 If the wide character
 is a carriage return and \fBnl\fP(3X) has been called,
-.B \%wgetch
+.B \%wget_wch
 stores the the wide character code for line feed in
 .I wch
 instead.
@@ -168,7 +168,7 @@ places
 .I wc
 into the input queue to be retrieved by the next call to
 .BR \%wget_wch "."
-A single input queue serves all windows associated with the terminal.
+A single input queue serves all windows associated with the screen.
 .SH RETURN VALUE
 .B \%wget_wch
 returns
@@ -187,9 +187,9 @@ or
 .bP
 execution was interrupted by a signal,
 in which case
-.B \%errno
+.I \%errno
 is set to
-.BR \%EINTR "."
+.IR \%EINTR "."
 .PP
 Functions taking a
 .I \%WINDOW
@@ -243,14 +243,46 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
 the interaction of
 .B \%wget_wch
 with signal handlers.
+.SH HISTORY
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
+specified functions named
+.I \%wgetwch
+(with the usual variants)
+and
+.IR \%ungetwch "."
+.\" SVID 4, vol 3., pp. 496-499
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+They differ from X/Open's later
+.I \%wget_wch
+and
+.I \%unget_wch
+in that
+.I \%wgetwch
+takes no
+.I wch
+argument,
+but returns the (wide) key code as an
+.I int
+(with no provision for distinguishing a character code
+from a function key code);
+and
+.I \%ungetwch
+takes a
+.RI non- const
+.I int
+argument.
 .SH SEE ALSO
 \fB\%curs_getch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 72dcc57ed..c5b9f9eca 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,17 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp $
-.TH curs_get_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp $
+.TH curs_get_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds ^  \(ha
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       ^  ^
 .\}
 .
 .de bP
@@ -53,7 +55,7 @@
 \fB\%mvgetn_wstr\fP,
 \fB\%mvwget_wstr\fP,
 \fB\%mvwgetn_wstr\fP \-
-get a wide-character string from a \fIcurses\fR terminal keyboard
+read a wide-character string from a \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -66,87 +68,116 @@ get a wide-character string from a \fIcurses\fR terminal keyboard
 \fBint getn_wstr(wint_t * \fIwstr\fP, int \fIn\fP);
 \fBint wgetn_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
-\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
+.B \%wget_wstr
+populates a user-supplied wide-character string buffer
+.I wstr
+by repeatedly calling \fBwget_wch\fP(3X)
+with the
+.I win
+argument
+until a line feed or carriage return character is input.
 The function
-\fBwgetn_wstr\fP
-is equivalent to a series of calls to
-\fBwget_wch\fP(3X)
-until a newline or carriage return terminates the series:
 .bP
-The terminating character is not included in the returned string.
+does not copy the terminating character to
+.IR wstr ";"
 .bP
-An end-of-file condition is represented by \fBWEOF\fP,
-as defined in \fB<wchar.h>\fP.
+populates
+.I wstr
+with
+.I WEOF
+(as defined in
+.IR \%wchar.h )
+if an end-of-file condition occurs on the input;
 .bP
-In all instances, the end of the string is terminated
-by a null \fBwchar_t\fP.
+always terminates the string with a null wide character
+(after any
+.IR WEOF );
 .bP
-The function stores the result in the area pointed to
-by the \fIwstr\fP parameter.
+interprets the screen's erase and kill characters
+(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
 .bP
-The function reads at most \fIn\fP characters,
-thus preventing a possible overflow of the input buffer.
-.IP
-Any attempt to enter more characters
-(other than the terminating newline or carriage return)
-causes a beep.
-.IP
-Function keys also cause a beep and are ignored.
+recognizes function keys only if the screen's keypad option is enabled
+(see \fB\%keypad\fP(3X));
+.bP
+treats the function keys
+.B \%KEY_LEFT
+and
+.B \%KEY_BACKSPACE
+the same as the erase character;
+and
+.bP
+discards function key inputs other than those treated as the erase
+character,
+calling \fBbeep\fP(3X).
 .PP
-The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+The erase character replaces the character at the end of the buffer with
+a null wide character,
+while the kill character does the same for the entire buffer.
+.PP
+If the screen's echo option is enabled
+(see \fBecho\fP(3X)),
+.B \%wget_wstr
+updates
+.I win
+with \fB\%wadd_wch\fP(3X).
+Further,
 .bP
-The \fIerase\fP character (e.g., \fB^H\fP) erases the character
-at the end of the buffer, moving the cursor to the left.
-.IP
-If \fIkeypad\fP mode is on for the window,
-\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
-are both considered equivalent to the user's \fIerase\fP character.
-.bP
-The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
-leaving the cursor at the beginning of the buffer.
-.PP
-Characters input are echoed only if \fBecho\fP is currently on.
-In that case,
-backspace is echoed as deletion of the previous character
-(typically a left motion).
-.PP
-The
-\fBgetn_wstr\fP,
-\fBmvgetn_wstr\fP,
-\fBmvwgetn_wstr\fP, and
-\fBwgetn_wstr\fP
-functions are identical
-to the
-\fBget_wstr\fP,
-\fBmvget_wstr\fP,
-\fBmvwget_wstr\fP, and
-\fBwget_wstr\fP
-functions, respectively,
-except that the
-\fB*n_*\fP
-versions read at most
-\fIn\fP
-characters, letting the application prevent overflow of the
-input buffer.
-.SH RETURN VALUE
-All of these functions return the integer \fBOK\fP upon successful completion.
-If unsuccessful, they return \fBERR\fP.
+the erase character
+and its function key synonyms
+move the cursor to the left,
+and
+.bP
+the kill character returns the cursor to where it was located when
+.B \%wget_wstr
+was called.
 .PP
-X/Open defines no error conditions.
+.B \%wgetn_wstr
+is similar,
+but reads at most
+.I n
+wide characters,
+aiding the application to avoid overrunning the buffer to which
+.I wstr
+points.
+An attempt to input more than
+.I n
+wide characters
+(other than the terminating line feed or carriage return)
+is ignored with a beep.
+If
+.I n
+is negative,
+.B \%wgetn_wstr
+reads up to
+.I LINE_MAX
+wide characters
+(see
+.IR sysconf (3)).
 .PP
-In this implementation,
-these functions return
+\fB\%ncurses\fP(3X) describes the variants of these functions.
+.SH RETURN VALUE
+These functions return
+.B OK
+on success and
 .B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ","
+they return
+.B ERR
+if
 .bP
-if the window pointer is null,
-.bP
-if its timeout expires without having any data, or
+.I win
+is
+.IR NULL ","
+or
 .bP
-if the associated call to
-\fBwget_wch\fP
-failed.
+if an internal \fB\%wget_wch\fP(3X) call fails.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -154,75 +185,184 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Any of these functions other than
-\fBwgetn_wstr\fP
-may be macros.
-.PP
-Using
-\fBget_wstr\fP,
-\fBmvget_wstr\fP,
-\fBmvwget_wstr\fP, or
-\fBwget_wstr\fP
-to read a line that
-overflows the array pointed to by
-\fBwstr\fP
-causes undefined
-results.
-The use of
-\fBgetn_wstr\fP,
-\fBmvgetn_wstr\fP,
-\fBmvwgetn_wstr\fP, or
-\fBwgetn_wstr\fP,
-respectively, is recommended.
-.PP
-These functions cannot return \fBKEY_\fP values because there
-is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
+All of these functions except
+.B \%wgetn_wstr
+may be implemented as macros.
+.PP
+Reading input that overruns the buffer pointed to by
+.I wstr
+causes undefined results.
+Use the
+.BR n -infixed
+functions,
+and allocate sufficient storage for
+.I wstr
+\(em at least
+.IR n +1
+times
+.BR sizeof(wchar_t) "."
+.PP
+These functions cannot store a
+.B KEY_
+value in
+.I wstr
+because there is no way to distinguish it
+from a valid
+.I \%wchar_t
+value.
+.PP
+While these functions conceptually implement
+a series of calls to
+.BR \%wget_wch ","
+they also temporarily change properties of the
+.I curses
+screen to permit simple editing of the input buffer.
+Each function saves the screen's state,
+calls \fBnl\fP(3X),
+and,
+if the screen was in canonical (\*(``cooked\*('') mode,
+\fB\%cbreak\fP(3X).
+Before returning,
+it restores the saved screen state.
+Other implementations differ in detail,
+affecting which control characters they can accept in the buffer;
+see section \*(``PORTABILITY\*('' below.
+.PP
+Unlike \fBgetstr\fP(3X) and related functions of
+.IR \%ncurses 's
+non-wide API,
+these functions do not return
+.B \%KEY_RESIZE
+if a
+.I \%SIGWINCH
+event interrupts the function.
+.SH EXTENSIONS
+.BR \%getn_wstr ","
+.BR \%wgetn_wstr ","
+.BR \%mvgetn_wstr ","
+and
+.BR \%mvwgetn_wstr "'s"
+handing of negative
+.I n
+values is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
-It specifies no error conditions for them.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-This implementation returns \fBERR\fP if the window pointer is null,
-or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
-In the latter case,
-an \fBERR\fP return without other data is treated as an end-of-file condition,
-and the returned array contains a \fBWEOF\fP followed by a null \fBwchar_t\fP.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-X/Open curses documented these functions to pass an array of \fBwchar_t\fP
-in 1997, but that was an error because of this part of the description:
+Issue\ 4 documented these functions as passing an array of
+.IR wchar_t ","
+but that was an error,
+conflicting with the following language in the standard.
 .RS
 .PP
-The effect of \fBget_wstr\fP is as though a series of calls to
-\fBget_wch\fP were made, until a newline character, end-of-line character, or
-end-of-file character is processed.
+The effect of
+.IR \%get_wstr "()"
+is as though a series of calls to
+.IR \%get_wch "()"
+were made,
+until a newline character,
+end-of-line character,
+or end-of-file character is processed.
+.\" X/Open Curses Issue 4, Version 2, p. 96.
 .RE
 .PP
-The latter function \fIget_wch\fP can return a negative value,
-while \fBwchar_t\fP is a unsigned type.
-All of the vendors implement this using \fBwint_t\fP, following the standard.
+.I \%get_wch
+can return a negative value
+.RI ( WEOF ),
+but
+.I \%wchar_t
+is a unsigned type.
+All of the vendors implement these functions using
+.IR \%wint_t ","
+following the Issue\ 7 standard.
 .PP
-X/Open Curses, Issue 7 (2009) is unclear regarding whether
-the terminating \fInull \fBwchar_t\fR
-value is counted in the length parameter \fIn\fP.
-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.
+X/Open Curses Issue\ 7 is unclear whether the terminating null wide character
+counts toward the length paramter
+.IR n "."
+A similar issue affected
+.I \%wgetnstr
+in Issue\ 4,
+Version\ 2;
+Issue\ 7 revised that function's description to address the issue,
+but not that of
+.IR \%wget_nwstr ","
+leaving it ambiguous.
+.I \%ncurses
+counts the terminator in the length.
 .PP
-X/Open Curses does not specify what happens if the length \fIn\fP is negative.
+X/Open Curses does not specify what happens if the length
+.I n
+is negative.
 .bP
-For analogy with \fBwgetnstr\fP,
-\fI\%ncurses\fP 6.2 uses a limit (based on \fBLINE_MAX\fP).
+For consistency with
+.IR \%wgetnstr ","
+.I \%ncurses
+6.2 uses a limit based on
+.IR LINE_MAX "."
 .bP
-Some other implementations (such as Solaris
+Some other implementations
+(such as Solaris
 .IR xcurses )
 do the same,
 while others
 .RI \%( PDCurses )
-do not allow this.
+do not permit a negative
+.IR n "."
 .bP
-NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
-treating a \fB\-1\fP as an indefinite number of characters.
+NetBSD\ 7
+.I curses
+imitates
+.I \%ncurses
+6.1 and earlier,
+treating a negative
+.I n
+as an unbounded count of wide characters.
+.PP
+Implementations vary in their handling of input control characters.
+.bP
+While they may enable the screen's echo option,
+some do not take it out of raw mode,
+and may take cbreak mode into account
+when deciding whether to handle echoing within
+.I \%wgetn_wstr
+or to rely on it as a side effect of calling
+.IR \%wget_wch "."
+.IP
+Since 1995,
+.I \%ncurses
+has provided handlers for
+.I SIGINTR
+and
+.I SIGQUIT
+events,
+which are typically generated at the keyboard with
+.B \*^C
+and
+.B \*^\e
+respectively.
+In cbreak mode,
+those handlers catch a signal and stop the program,
+whereas other implementations write those characters into the buffer.
+.bP
+Starting with
+.I \%ncurses
+6.3 (2021),
+.I \%wgetn_wstr
+preserves raw mode if the screen was already in that state,
+allowing one to enter the characters the terminal interprets
+as interrupt and quit events
+into the buffer,
+for consistency with SVr4
+.IR curses 's
+.IR \%wgetnstr .
 .SH SEE ALSO
 \fB\%curs_getstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 523cc99df..f8bbcdbdc 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.49 2024/04/20 18:55:09 tom Exp $
-.TH curs_getcchar 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
+.TH curs_getcchar 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds ' \(aq
+.\}
+.el \{\
+.ie t .ds ' \(aq
+.el   .ds ' '
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -41,146 +49,303 @@ convert between a wide-character string and a \fIcurses\fR complex character
 .nf
 \fB#include <curses.h>
 .PP
-\fBint getcchar(
-.B "        const cchar_t *\fIwch\fP,"
-.B "        wchar_t *\fIwc\fP,"
-.B "        attr_t *\fIattrs\fP,"
-.B "        short *\fIcolor_pair\fP,"
-.B "        void *\fIopts\fP );"
-.PP
-.B "int setcchar("
-.B "        cchar_t *\fIwch\fP,"
-.B "        const wchar_t *\fIwc\fP,"
-.B "        const attr_t \fIattrs\fP,"
-.B "        short \fIcolor_pair\fP,"
-.B "        const void *\fIopts\fP );"
+\fBint gettchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
+      attr_t * \fIattrs\fP, short * \fIpair\fP, void * \fIopts\fP);
+\fBint settchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
+      const attr_t \fIattrs\fP, short \fIpair\fP, const void * \fIopts\fP);
 .fi
 .SH DESCRIPTION
+The
+.I curses
+complex character data type
+.I \%cchar_t
+is a structure type comprising
+a wide-character string,
+a set of attributes,
+and
+a color pair identifier.
+The
+.I \%cchar_t
+structure is opaque;
+do not attempt to access its members directly.
+The library provides functions to manipulate this type.
 .SS getcchar
-The \fBgetcchar\fP function gets a wide-character string
-and rendition from a \fBcchar_t\fP argument.
-When \fIwc\fP is not a null pointer,
-the \fBgetcchar\fP function does the following:
-.bP
-Extracts information from a \fBcchar_t\fP value \fIwch\fP
+.B \%getcchar
+destructures a
+.I \%cchar_t
+into its components.
+.PP
+If
+.I wc
+is not a null pointer,
+.BR \%getcchar :
 .bP
-Stores the character attributes in the location pointed to by \fIattrs\fP
+stores the wide-character string in the
+.I curses
+complex character
+.I wch
+into
+.IR wc ;
 .bP
-Stores the color pair in the location pointed to by \fIcolor_pair\fP
+stores the attributes in
+.IR attrs ;
+and
 .bP
-Stores the wide-character string,
-characters referenced by \fIwch\fP, into the array pointed to by \fIwc\fP.
+stores the color pair identifier in
+.IR pair .
 .PP
-When
-\fIwc\fP
-is a null pointer, the
-\fBgetcchar\fP
-function does the following:
-.bP
-Obtains the number of wide characters pointed to by \fIwch\fP
-.bP
-Does not change the data referenced by
-\fIattrs\fP
-or
-\fIcolor_pair\fP
+If
+.I wc
+is a null pointer,
+.B \%getcchar
+counts the
+.I \%wchar_t
+wide characters in
+.IR wch ,
+returns that value,
+and leaves
+.I attrs
+and
+.I pair
+unchanged.
 .SS setcchar
-The \fBsetcchar\fP function initializes the location pointed to by \fIwch\fP
-by using:
-.bP
-The character attributes in
-\fIattrs\fP
-.bP
-The color pair in
-\fIcolor_pair\fP
-.bP
-The wide-character string pointed to by \fIwc\fP.
-The string must be L'\e0' terminated,
-contain at most one spacing character,
-which must be the first.
-.IP
-Up to \fBCCHARW_MAX\fP\-1 non-spacing characters may follow.
-Additional non-spacing characters are ignored.
-.IP
+.B \%setcchar
+constructs a
+.I curses
+complex character
+.I wch
+from the components
+.IR wc ,
+.IR attrs ,
+and
+.IR pair .
+The wide-character string
+.I wch
+must be terminated with a null wide character
+.B L\*'\e0\*'
+and must contain at most one spacing character,
+which,
+if present,
+must be the first wide character in the string.
+.PP
+Up to
+.BR \%CCHARW_MAX\  \-\ 1
+non-spacing characters may follow
+(see \fB\%curs_variables\fP(3X)).
+.I \%ncurses
+ignores any additional non-spacing characters.
+.PP
 The string may contain a single control character instead.
-In that case, no non-spacing characters are allowed.
+In that case,
+no non-spacing characters are allowed.
 .SH RETURN VALUE
-When \fIwc\fP is a null pointer,
-\fBgetcchar\fP returns the number of wide characters referenced by
-\fIwch\fP,
-including one for a trailing null.
+If
+.B \%getcchar
+is passed a null pointer as its
+.I wc
+argument,
+it returns the number of wide characters for a given
+.I wch
+that it would store in
+.IR wc ","
+counting a trailing null wide character.
+If
+.B \%getcchar
+is not passed a null pointer as its
+.I wc
+argument,
+it returns
+.B OK
+on success and
+.B ERR
+on failure.
+.PP
+In
+.IR \%ncurses ,
+.B \%getcchar
+returns
+.B ERR
+if either
+.I attrs
+or
+.I pair
+is a null pointer and
+.I wc
+is not.
 .PP
-When \fIwc\fP is not a null pointer,
-\fBgetcchar\fP returns \fBOK\fP upon successful completion,
-and \fBERR\fP otherwise.
+.B \%setcchar
+returns
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
-Otherwise, it returns \fBERR\fP.
+In
+.IR \%ncurses ,
+.B \%setcchar
+returns
+.B ERR
+if
+.bP
+.I wch
+is a null pointer,
+.bP
+.I wc
+starts with a (wide) control character
+and contains any other wide characters,
+or
+.bP
+.I pair
+has a negative value.
 .SH NOTES
-The \fIwch\fP argument may be a value generated by a call to
-\fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
-If \fIwch\fP is constructed by any other means, the effect is unspecified.
+.I wch
+may be a value stored by
+.B \%setcchar
+or another
+.I curses
+function with a writable
+.I \%cchar_t
+argument.
+If
+.I wch
+is constructed by any other means,
+the library's behavior is unspecified.
 .SH EXTENSIONS
-X/Open Curses documents the \fIopts\fP argument as reserved for future use,
-saying that it must be null.
-This implementation
-uses that parameter in ABI 6 for the functions which have a color pair
-parameter to support extended color pairs:
+X/Open Curses documents the
+.I opts
+argument as reserved for future use,
+saying that it must be a null pointer.
+The
+.IR \%ncurses \ 6
+ABI uses it with functions that have a color pair parameter
+to support extended color pairs.
 .bP
-For  functions  which modify the color, e.g., \fBsetcchar\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
+In functions that assign colors,
+such as
+.BR \%setcchar ","
+if
+.I opts
+is not a null pointer,
+.I \%ncurses
+treats it as a pointer to
+.IR int ","
+and interprets it instead of the
+.I short
+.I pair
+parameter as a color pair identifier.
 .bP
-For functions which retrieve the color, e.g., \fBgetcchar\fP,
-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
-and  used  to  retrieve  the color pair as an \fBint\fP value,
-in addition retrieving it via the standard pointer to \fBshort\fP parameter.
+In functions that retrieve colors,
+such as
+.BR \%getcchar ","
+if
+.I opts
+is not a null pointer,
+.I \%ncurses
+treats it as a pointer to
+.IR int ","
+and stores the retrieved color pair identifier there
+as well as in the
+.I short
+.I pair
+parameter
+(which may therefore undergo a narrowing conversion).
 .SH PORTABILITY
-The \fBCCHARW_MAX\fP symbol is specific to \fI\%ncurses\fP.
-X/Open Curses does not provide details for the layout of the \fBcchar_t\fP
-structure.
-It tells what data are stored in it:
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+These functions are described in X/Open Curses Issue\ 4.
+It specifies no error conditions for them.
+.PP
+X/Open Curses does not detail the layout of the
+.I \%cchar_t
+structure,
+describing only its minimal required contents:
 .bP
-a spacing character (\fBwchar_t\fP, i.e., 32-bits).
+a spacing wide character
+.RI \%( wchar_t ),
 .bP
-non-spacing characters (again, \fBwchar_t\fP's).
+at least five non-spacing wide characters
+.RI \%( wchar_t ;
+see below),
 .bP
-attributes (at least 16 bits, inferred from the various ACS- and WACS-flags).
+attributes
+(at least 15 bits' worth,
+inferred from the count of specified
+.B WA_
+constants),
+.\" See X/Open Curses Issue 7, p. 307.
 .bP
-color pair (at least 16 bits, inferred from the \fBunsigned short\fP type).
+a color pair identifier
+(at least 16 bits,
+inferred from the
+.I short
+type used to encode it).
 .PP
-The non-spacing characters are optional,
-in the sense that zero or more may be stored in a \fBcchar_t\fP.
+Non-spacing characters are optional,
+in the sense that zero or more may be stored in a
+.IR \%cchar_t "."
 XOpen/Curses specifies a limit:
 .RS 4
 .PP
-Implementations may limit the number of non-spacing characters that can be
-associated with a spacing character, provided any limit is at least 5.
+Implementations may limit the number of non-spacing characters that can
+be associated with a spacing character,
+provided any limit is at least 5.
 .RE
 .PP
-The Unix implementations at the time follow that limit:
+Then-contemporary Unix implementations adhered to that limit.
 .bP
-AIX\ 4 and OSF1\ 4 use the same declaration with an array of 5 non-spacing
-characters \fIz\fP and a single spacing character \fIc\fP.
+AIX\ 4 and OSF/1\ 4 used the same declaration with
+a single spacing wide character
+.I c
+and an array of 5 non-spacing wide characters
+.IR z "."
 .bP
-HP-UX\ 10 uses an opaque structure with 28 bytes,
-which is large enough for the 6 \fBwchar_t\fP values.
+HP-UX\ 10 used an opaque structure of 28 bytes,
+large enough for 6
+.I \%wchar_t
+values.
 .bP
-Solaris \fIxpg4\fP curses uses a single array of 6 \fBwchar_t\fP values.
+Solaris
+.I xcurses
+uses a single array of 6
+.I \%wchar_t
+values.
 .PP
-This implementation's \fBcchar_t\fP was defined in 1995
-using \fB5\fP for the total of spacing and non-spacing characters
-(\fBCCHARW_MAX\fP).
+.I \%ncurses
+defined its
+.I \%cchar_t
+in 1995 using 5 as the
+.I total
+of spacing and non-spacing characters
+.RB \%( CCHARW_MAX ).
 That was probably due to a misreading of the AIX\ 4 header files,
-because the X/Open Curses document was not generally available at that time.
-Later (in 2002), this detail was overlooked when beginning to implement
-the functions using the structure.
+because the X/Open Curses document
+was not generally available at that time.
+Later (in 2002),
+this detail was overlooked when work began to implement the functions
+using the structure.
 .PP
-In practice, even four non-spacing characters may seem enough.
-X/Open Curses documents possible uses for non-spacing characters,
-including using them for ligatures between characters
-(a feature apparently not supported by any curses implementation).
-Unicode does not limit the (analogous) number of combining characters,
-so some applications may be affected.
+In practice,
+a mere four non-spacing characters may seem adequate.
+X/Open Curses documents possible applications of non-spacing characters,
+including their use as ligatures
+(a feature apparently not supported by any
+.I curses
+implementation).
+Unicode does not limit the (analogous) number of combining characters
+in a grapheme cluster;
+some applications may be affected.
+.I \%ncurses
+can be compiled with a different
+.B CCHARW_MAX
+value;
+doing so alters the library's ABI.
+.SH HISTORY
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 853d7ad47..2bc54c12e 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp $
-.TH curs_getch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp $
+.TH curs_getch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -103,7 +103,7 @@ the function returns
 otherwise,
 .I curses
 waits until the terminal has input.
-If \fB\%cbreak\fP(3X)
+If \fB\%cbreak\fP(3X) or \fB\%raw\fP(3X)
 has been called,
 this happens after one character is read.
 If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
@@ -258,7 +258,7 @@ places
 .I c
 into the input queue to be returned by the next call to
 .BR \%wgetch "."
-A single input queue serves all windows associated with the terminal.
+A single input queue serves all windows associated with the screen.
 .SS "Predefined Key Codes"
 The header file
 .I \%curses.h
@@ -456,9 +456,9 @@ or
 .bP
 execution was interrupted by a signal,
 in which case
-.B \%errno
+.I \%errno
 is set to
-.BR \%EINTR "."
+.IR \%EINTR "."
 .PP
 .B \%ungetch
 returns
@@ -604,6 +604,10 @@ and
 for 1 \(<=
 .I n
 \(<= 12.
+.\" Other numeric keypad keys from the DEC VT220 (specifically, the
+.\" LK201 commonly used with it) and IBM PC/AT keyboards -- the comma
+.\" (DEC); plus, star, and slash (PC); and zero, dot, and minus (both)
+.\" have no standard key capability codes.
 .SH EXTENSIONS
 In
 .IR \%ncurses ","
@@ -619,8 +623,9 @@ see
 \fB\%curs_variables\fP(3X).
 .PP
 .B \%has_key
-was designed for
-.IR \%ncurses ","
+is an
+.I \%ncurses
+extension,
 and is not found in SVr4
 .IR curses ","
 4.4BSD
@@ -636,10 +641,13 @@ extensions should condition their use on the visibility of the
 preprocessor macro.
 .PP
 Except as noted in section \*(``EXTENSIONS\*('' above,
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 494
+.PP
 .B \%wgetch
 reads only single-byte characters.
 .PP
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 34d606f44..c518cf8da 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp $
-.TH curs_getstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp $
+.TH curs_getstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -55,7 +55,7 @@
 \fB\%mvgetnstr\fP,
 \fB\%mvwgetstr\fP,
 \fB\%mvwgetnstr\fP \-
-accept character strings from \fIcurses\fR terminal keyboard
+read a character string from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
@@ -68,7 +68,8 @@ accept character strings from \fIcurses\fR terminal keyboard
 \fBint getnstr(char * \fIstr\fP, int \fIn\fP);
 \fBint wgetnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
 \fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
-\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%wgetstr
@@ -116,7 +117,7 @@ If the screen's echo option is enabled
 .B \%wgetstr
 updates
 .I win
-with \fB\%wechochar\fP(3X).
+with \fB\%waddch\fP(3X).
 Further,
 .bP
 the erase character
@@ -141,6 +142,15 @@ An attempt to input more than
 characters
 (other than the terminating line feed or carriage return)
 is ignored with a beep.
+If
+.I n
+is negative,
+.B \%wgetn_wstr
+reads up to
+.I LINE_MAX
+characters
+(see
+.IR sysconf (3)).
 .PP
 \fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
@@ -161,9 +171,7 @@ is
 .IR NULL ","
 or
 .bP
-if an internal
-.B \%wgetch
-call fails.
+if an internal \fB\%wgetch\fP(3X) call fails.
 .PP
 Further,
 in
@@ -171,7 +179,7 @@ in
 these functions return
 .B \%KEY_RESIZE
 if a
-.B \%SIGWINCH
+.I \%SIGWINCH
 event interrupts the function.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
@@ -184,28 +192,28 @@ All of these functions except
 .B \%wgetnstr
 may be implemented as macros.
 .PP
-Use of
-.BR \%getstr ","
-.BR \%mvgetstr ","
-.BR \%mvwgetstr ","
-or
-.B \%wgetstr
-to read input that
-overruns the buffer pointed to by
+Reading input that overruns the buffer pointed to by
 .I str
 causes undefined results.
-Use their
+Use the
 .BR n -infixed
-counterpart functions instead.
+functions,
+and allocate sufficient storage for
+.I str
+\(em at least
+.IR n +1
+times
+.BR sizeof(char) "."
 .PP
-While
-.B \%wgetnstr
-is conceptually a series of calls to
+While these functions conceptually implement
+a series of calls to
 .BR \%wgetch ","
-it also temporarily changes properties of the
+they also temporarily change properties of the
 .I curses
 screen to permit simple editing of the input buffer.
-It saves the screen's state and then calls \fBnl\fP(3X) and,
+Each function saves the screen's state,
+calls \fBnl\fP(3X),
+and,
 if the screen was in canonical (\*(``cooked\*('') mode,
 \fB\%cbreak\fP(3X).
 Before returning,
@@ -214,6 +222,17 @@ Other implementations differ in detail,
 affecting which control characters they can accept in the buffer;
 see section \*(``PORTABILITY\*('' below.
 .SH EXTENSIONS
+.BR \%getnstr ","
+.BR \%wgetnstr ","
+.BR \%mvgetnstr ","
+and
+.BR \%mvwgetnstr "'s"
+handing of negative
+.I n
+values is an
+.I \%ncurses
+extension.
+.PP
 The return value
 .B \%KEY_RESIZE
 is an
@@ -226,7 +245,7 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them,
 but indicates that
 .I \%wgetnstr
@@ -247,11 +266,9 @@ so this scenario does not arise.
 .\" You can pass ncurses wgetnstr n=0 and it will beep at you with each
 .\" key stroke.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 495
 .PP
 SVr3 and early SVr4
 .I curses
@@ -267,7 +284,7 @@ as well as any special keys
 \*(``home\*('' key,
 \*(``clear\*('' key,
 .IR etc. )
-.\" SVID 4, Volume 3, p. 495
+.\" SVID 4, vol. 3, p. 495
 .RE
 .PP
 without further detail.
@@ -280,20 +297,23 @@ was predictable but not useful \(em
 being,
 in fact,
 the low-order eight bits of the key code's
-.B KEY_
+.I KEY_
 constant value.
 (The same language,
 unchanged except for styling,
-survived into X/Open Curses Issue 4, \" p. 94 (PDF 114)
-but disappeared from Issue 7.) \" p. 105 (PDF 119)
+survived into X/Open Curses Issue\ 4,
+Version\ 2 \" p. 94 (PDF 114)
+but disappeared from Issue\ 7.) \" p. 105 (PDF 119)
 .PP
-X/Open Curses Issue 5 (2007) stated that these functions
+A draft of X/Open Curses Issue\ 5
+(which never saw final release)
+stated that these functions
 \*(``read at most
 .I n
 bytes\*(''
 but did not state whether the terminating null character
 counted toward that limit.
-X/Open Curses Issue 7 (2009) changed that to say they
+X/Open Curses Issue\ 7 changed that to say they
 \*(``read at most
 .IR n \-1
 bytes\*(''
@@ -320,6 +340,27 @@ but its non-wide
 .I \%wgetnstr
 does not consistently count a null character toward the limit.
 .PP
+X/Open Curses does not specify what happens if the length
+.I n
+is negative.
+.bP
+.I \%ncurses
+6.2 uses
+.I LINE_MAX
+or a larger (system-dependent) value
+provided by \fI\%sysconf\fP(3).
+If neither
+.I LINE_MAX
+nor
+.I \%sysconf
+is available,
+.I \%ncurses
+uses the POSIX minimum value for
+.I LINE_MAX
+(2048). \" _POSIX2_LINE_MAX
+In either case,
+it reserves a byte for the terminating null character.
+.bP
 In SVr4
 .IR curses ","
 a negative
@@ -361,22 +402,24 @@ as did that in SVr2.
 .bP
 .IR PDCurses ","
 and
-SVr3.1,
-SVr4,
+SVr3 and later,
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+.\"   sysvr3/301/usr/src/lib/libcurses/screen/getstr.c#L21
+.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
+.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
 and
 Solaris
 .I curses
 limit both functions to writing 256 bytes.
 Other System\ V-based platforms likely use the same limit.
-.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
-.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
-.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
 .bP
 Solaris
 .I xcurses
 limits the write to
-.B LINE_MAX
-bytes.
+.I LINE_MAX
+bytes
+(see
+.IR sysconf (3)).
 .bP
 NetBSD 7
 .I curses
@@ -385,33 +428,6 @@ but does validate
 .I n
 to ensure that it is greater than zero.
 A comment in NetBSD's source code asserts that SUSv2 specifies this.
-.bP
-.I \%ncurses
-prior to 6.2 (2020)
-imposes no limit on the length of the write,
-and treats
-.IR wgetnstr 's
-.I n
-parameter as SVr4
-.I curses
-does.
-.bP
-.I \%ncurses
-6.2 uses
-.B LINE_MAX
-or a larger (system-dependent) value
-provided by \fI\%sysconf\fP(3).
-If neither
-.B LINE_MAX
-nor
-.I \%sysconf
-is available,
-.I \%ncurses
-uses the POSIX minimum value for
-.B LINE_MAX
-(2048). \" _POSIX2_LINE_MAX
-In either case,
-it reserves a byte for the terminating null character.
 .PP
 Implementations vary in their handling of input control characters.
 .bP
@@ -441,9 +457,9 @@ it is not necessary with modern
 Since 1995,
 .I \%ncurses
 has provided handlers for
-.B SIGINTR
+.I SIGINTR
 and
-.B SIGQUIT
+.I SIGQUIT
 events,
 which are typically generated at the keyboard with
 .B \*^C
@@ -476,7 +492,7 @@ added
 .IR \%wgetnstr ","
 but none of its variants.
 .PP
-X/Open Curses Issue 4 (1995) specified
+X/Open Curses Issue\ 4 (1995) specified
 .IR \%getnstr ","
 .IR \%mvwgetnstr ","
 and
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 4d7ec469d..e7f0e433b 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp $
-.TH curs_getyx 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
+.TH curs_getyx 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -109,22 +109,23 @@ An \*(``&\*('' operator is not necessary before the variables
 and
 .IR x "."
 .SH PORTABILITY
-These macros are described in X/Open Curses,
-Issue 4.
+These macros are described in X/Open Curses Issue\ 4.
 .PP
 .I \%ncurses
 also provides functions
-.BR \%getbegx ","
-.BR \%getbegy ","
-.BR \%getcurx ","
-.BR \%getcury ","
-.BR \%getmaxx ","
-.BR \%getmaxy ","
-.BR \%getparx ","
+.IR \%getbegy ","
+.IR \%getbegx ","
+.IR \%getcury ","
+.IR \%getcurx ","
+.IR \%getmaxy ","
+.IR \%getmaxx ","
+.IR \%getpary ","
 and
-.B \%getpary
-for compatibility with older versions of
-.IR curses ";"
+.I \%getparx
+for compatibility with System\ V
+.I curses
+that were not standardized;
+.\" even by SVID 4
 see \fB\%curs_legacy\fP(3X).
 .PP
 Although X/Open Curses does not address the issue,
@@ -140,20 +141,33 @@ they do not allow direct access to its members).
 .PP
 Besides the problem of opaque structures,
 the data stored in like-named members may not have values of the same
-meaning different implementations.
+meaning across different implementations.
 For example,
 the values of
-.B \%WINDOW._maxx
+.I \%WINDOW._maxx
 and
-.B \%WINDOW._maxy
+.I \%WINDOW._maxy
 in
 .I \%ncurses
 have long
 .\" (at least since its initial release, 1.8.1)
 differed by one from some other implementations.
 The
-.B \%getmaxyx
+.I \%getmaxyx
 macro hides this difference.
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.IR \%getyx "."
+.PP
+SVr3 (1987)
+added
+.I \%getbegyx
+and
+.IR \%getmaxyx "."
+SVr3.1 later that year supplied
+.IR \%getparyx "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_legacy\fP(3X),
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index bf95b5d5f..38a461ef7 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
-.TH curs_in_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp $
+.TH curs_in_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,14 +101,13 @@ additional
 .I wch
 parameter instead of the return value.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
-The System\ V Interface Definition,
-Version 4 (1995),
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
 specified a function named
 .I \%winwch
 (and the usual variants).
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 0b821c94a..f97bbf824 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp $
-.TH curs_in_wchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp $
+.TH curs_in_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -79,8 +79,9 @@ a leading substring at most \fIn\fP characters long
 Transfer stops at the end of the current line, or when \fIn\fP characters have
 been stored at the location referenced by \fIwchstr\fP.
 .PP
-Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP (logical
-AND) operator to extract the character or the attribute alone from any position
+Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP
+(logical \*(``and\*('')
+operator to extract the character or the attribute alone from any position
 in the \fIwchstr\fP [see \fBgetcchar\fP(3X)].
 .SH RETURN VALUE
 Upon successful completion, these functions return
@@ -88,8 +89,8 @@ Upon successful completion, these functions return
 Otherwise, they return
 \fBERR\fP.
 .PP
-X/Open Curses defines no error conditions.
-This implementation returns
+.I \%ncurses
+returns
 .B ERR
 .bP
 if the \fIwin\fP parameter is null or
@@ -102,7 +103,9 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except \fBwin_wchnstr\fP may be macros.
+All of these functions except
+.B \%win_wchnstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
 \fIwchstr\fP
@@ -120,9 +123,26 @@ Therefore, the use of
 \fBwin_wchnstr\fP
 is recommended.
 .SH PORTABILITY
-X/Open Curses defines no error conditions.
-This implementation checks for null pointers,
-returning \fBERR\fP in that case.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+.SH HISTORY
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
+specified a function named
+.I \%winwchstr
+(and the usual variants).
+.\" SVID 4, vol 3., p. 515
+This was a later addition to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+It differed from X/Open's later
+.I \%win_wchstr
+in that it took an argument of type
+.RI pointer-to- chtype
+instead of
+.RI pointer-to cchar_t .
 .SH SEE ALSO
 \fB\%curs_inchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 74ef7d147..2e8a03707 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp $
-.TH curs_inch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
+.TH curs_inch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,8 +110,7 @@ if they contain characters with codes wider than eight bits
 They instead extract only the low-order eight bits of the character code
 from the cell.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
 The original
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 57eef1329..233820a1d 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
-.TH curs_inchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
+.TH curs_inchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -81,8 +81,9 @@ a leading substring at most \fIn\fP characters long
 Transfer stops at the end of the current line, or when \fIn\fP characters have
 been stored at the location referenced by \fIchstr\fP.
 .PP
-Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP (logical
-AND) operator to extract the character or the attribute alone from any position
+Constants defined in \fB<curses.h>\fP can be used with the \fB&\fP
+(logical \*(``and\*('')
+operator to extract the character or the attribute alone from any position
 in the \fIchstr\fP [see \fBcurs_inch\fP(3X)].
 .SH RETURN VALUE
 All routines return the integer \fBERR\fP upon failure and an integer value
@@ -103,12 +104,9 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except \fBwinchnstr\fP may be macros.
-.PP
-SVr4 does not
-document whether the result string is zero-terminated; it does not document
-whether a length limit argument includes any trailing 0; and it does not
-document the meaning of the return value.
+All of these functions except
+.B \%winchnstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
 \fIchstr\fP
@@ -126,11 +124,27 @@ Therefore, the use of
 \fBwinchnstr\fP
 is recommended.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
-It is no
-more specific than the SVr4 documentation on the trailing 0.
-It does specify
-that the successful return of the functions is \fBOK\fP.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+It characterizes the strings stored by these functions as containing
+\*(``at most
+.I n
+elements\*('' from a window,
+.\" X/Open Issue 4, Version 2, p. 113, PDF p. 133
+.\" Issue 7 doesn't change this wording at all.
+but does not specify whether the string stored by these functions is
+null-terminated.
+.PP
+SVr4 does not document whether it null-terminates the string it stores
+in
+.IR chstr ","
+and does not document whether a trailing null chracter counts toward the
+length limit
+.IR n "."
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index b1f1a6ad4..468f7acd7 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp $
-.TH curs_initscr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp $
+.TH curs_initscr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -321,8 +321,7 @@ In
 .B \%set_term
 does not fail.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SS Differences
 X/Open Curses specifies that portable applications must not
@@ -393,7 +392,7 @@ e.g.,
 \fB\%def_shell_mode\fP(3X),
 \fB\%def_prog_mode\fP(3X).
 SVr4 curses uses the descriptor in \fISCREEN\fP.
-.SS "Unset \f(BITERM\fP Variable"
+.SS "Unset \fITERM\fP Variable"
 If the \fITERM\fP variable is missing or empty, \fB\%initscr\fP uses the
 value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the
@@ -405,7 +404,7 @@ and cannot be used for full-screen operation.
 Other implementations may handle
 a missing/empty \fITERM\fP variable differently.
 .SS "Signal Handlers"
-Quoting from X/Open Curses Issue 7, section 3.1.1:
+Quoting from X/Open Curses Issue\ 7, section 3.1.1:
 .RS 5
 .PP
 Curses implementations may provide for special handling of the
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 9bd8cbfc0..49a8a504d 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp $
-.TH curs_inopts 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp $
+.TH curs_inopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -213,7 +213,7 @@ are immediately available to the program.
 However,
 after blocking for
 .I tenths
-tenths of seconds,
+tenth-seconds,
 an input character reading function returns
 .B ERR
 if no input is pending.
@@ -386,9 +386,9 @@ see
 below for a mitigation of this problem.
 You may want to call
 .B \%noqiflush
-in a signal handler
-if you want output to continue
-after the handler exits
+in a signal handler if,
+after the handler exits,
+you want output to continue
 as though the interrupt had not occurred.
 .\"
 .SS "raw, noraw"
@@ -511,12 +511,18 @@ the functions in the previous paragraph return
 .B ERR
 if
 .bP
-the terminal is not initialized or
+the library's
+.I \%TERMINAL
+structure for the device has not been initialized with
+\fB\%initscr\fP(3X),
+\fB\%newterm\fP(3X),
+or
+\fB\%setupterm\fP(3X),
+or
 .bP
 .I win
-is
-.I NULL
-(except for
+is a null pointer
+(except with
 .B \%intrflush
 and
 .BR meta ","
@@ -597,11 +603,13 @@ the function returns
 if the option is set,
 .TP
 .B 0
-if the option is reset,
+if the option is unset,
 or
 .TP
 .B \-1
-if the library is not initialized.
+if the library's
+.I \%TERMINAL
+structure for the device has not been initialized.
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
@@ -610,15 +618,16 @@ extensions should condition their use on the visibility of the
 preprocessor macro.
 .PP
 Except as noted in section \*(``EXTENSIONS\*('' above,
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 508
+.\" It continues "unless otherwise noted in the preceding routine
+.\" descriptions", but no notes otherwise are present; the man page
+.\" discusses getch()'s return value repeatedly, but never those of the
+.\" functions the page ostensibly documents.
 .PP
 .I \%ncurses
 follows X/Open Curses
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index 8735c85db..f15ca5332 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
-.TH curs_ins_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
+.TH curs_ins_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -93,16 +93,13 @@ A terminal's
 capability
 is not necessarily employed.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
-.PP
-SVr4 describes successful return values only as
-\*(``an integer value other than \fBERR\fP\*(''.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
-The System\ V Interface Definition,
-Version 4 (1995),
+These functions were initially specified by X/Open Curses Issue\ 4
+(1995).
+The System\ V Interface Definition Version\ 4
+of the same year
 specified a function named
 .I \%winswch
 (and the usual variants).
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index e453f1497..f9022645c 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
-.TH curs_ins_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
+.TH curs_ins_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,12 +61,14 @@ insert a wide-character string in a \fIcurses\fR window
 \fBint ins_wstr(const wchar_t * \fIwstr\fP);
 \fBint wins_wstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
 \fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
-\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const wchar_t * \fIwstr\fP);
 .PP
 \fBint ins_nwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint wins_nwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
-\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const wchar_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%wins_wstr
@@ -89,7 +91,7 @@ in
 .IR wstr "."
 The cursor position does not change
 (after moving to
-.RI ( y ","
+.RI ( y ,
 .IR x "),"
 if specified).
 .B \%wins_nwstr
@@ -101,8 +103,7 @@ or as many as possible
 (up to the end of the line)
 if
 .I n
-is
-.BR \-1 "."
+is negative.
 \fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
 These functions return
@@ -142,33 +143,48 @@ is outside the window boundaries.
 All of these functions except
 .B \%wins_nwstr
 may be implemented as macros.
+.SH EXTENSIONS
+.BR \%ins_nwstr ","
+.BR \%wins_nwstr ","
+.BR \%mvins_nwstr ","
+and
+.BR \%mvwins_nwstr "'s"
+acceptance of negative
+.I n
+values is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses does not specify what happens
 if a non-spacing character follows a control character.
 .PP
-Issue 4 states that the entire string is inserted if
+Issue\ 4 states that the entire string is inserted if
 .I n
 is less than 1.
 This is probably an error,
 .\" ...copied from SVID 4, which made the same error; see p. 513.
 because it is inconsistent with other functions
-such as \fB\%waddwstr\fP(3X),
+such as
+.IR \%waddwstr ","
 and differs from the SVr4
 .I curses
 and Solaris
 .I xcurses
 implementations.
 Nevertheless,
-Issue 7 retains the language.
+Issue\ 7 retains the language.
 .SH HISTORY
-These functions were initially specified by X/Open Curses,
-Issue 4.
-The System\ V Interface Definition,
-Version 4 (1995),
+These functions were initially specified by X/Open Curses Issue 4.
+The System\ V Interface Definition Version\ 4 (1995),
 specified functions named
 .I \%winswstr
 and
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index d073fcf97..f655a1814 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
-.TH curs_insch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp $
+.TH curs_insch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -97,14 +97,11 @@ A terminal's
 capability
 is not necessarily employed.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 509
 .SH HISTORY
 SVr2 (1984) introduced
 .IR \%winsch "."
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index ede20deda..dcb91a74a 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp $
-.TH curs_insstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
+.TH curs_insstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,7 +66,8 @@ insert a string in a \fIcurses\fR window
 \fBint insnstr(const char * \fIstr\fP, int \fIn\fP);
 \fBint winsnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
 \fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
-\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%winsstr
@@ -89,7 +90,7 @@ in
 .IR str "."
 The cursor position does not change
 (after moving to
-.RI ( y ","
+.RI ( y ,
 .IR x "),"
 if specified).
 .B \%insnstr
@@ -101,8 +102,7 @@ or as many as possible
 (up to the end of the line)
 if
 .I n
-is
-.BR \-1 "."
+is negative.
 \fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
 These functions return
@@ -138,15 +138,35 @@ is outside the window boundaries.
 All of these functions except
 .B \%winsnstr
 may be implemented as macros.
+.SH EXTENSIONS
+.BR \%insnstr ","
+.BR \%winsnstr ","
+.BR \%mvinsnstr ","
+and
+.BR \%mvwinsnstr "'s"
+acceptance of negative
+.I n
+values is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
-Issue 4 distinguished
-.B \%insnstr
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 510
+.PP
+Issue\ 4 distinguished
+.I \%insnstr
 and
-.B \%winsnstr
+.I \%winsnstr
 from the other functions documented above
 by stating they \*(``do not perform wrapping\*(''.
 This was probably an error,
@@ -154,22 +174,23 @@ since it makes this group of functions inconsistent.
 No implementation of
 .I curses
 documents this inconsistency,
-and Issue 7 removed it.
+and Issue\ 7 removed it.
 .PP
-Issue 4 states that the entire string is inserted if
+Issue\ 4 states that the entire string is inserted if
 .I n
 is less than 1.
 This is probably an error,
 .\" ...copied from SVID 4, which made the same error; see p. 510.
 because it is inconsistent with other functions
-such as \fB\%waddstr\fP(3X),
+such as
+.IR \%waddstr ","
 and differs from the SVr4
 .I curses
 and Solaris
 .I xcurses
 implementations.
 Nevertheless,
-Issue 7 retains the language.
+Issue\ 7 retains the language.
 .SH HISTORY
 SVr3.1 (1987)
 introduced
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 7795a8877..2656fef2a 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp $
-.TH curs_instr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
+.TH curs_instr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,7 +66,8 @@ get a string from a \fIcurses\fR window
 \fBint innstr(char * \fIstr\fP, int \fIn\fP);
 \fBint winnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
 \fBint mvinnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
-\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%winstr
@@ -89,10 +90,8 @@ but copies at most
 .I n
 characters from
 .IR win "."
-An
+A negative
 .I n
-of
-.B \-1
 implies no limit;
 .B \%winnstr
 then works like
@@ -154,11 +153,9 @@ is recommended instead.
 .BR \%mvinnstr ","
 and
 .BR \%mvwinnstr "'s"
-treatment of
-.B \-1
-as a valid value of
+acceptance of negative
 .I n
-is an
+values is an
 .I \%ncurses
 extension.
 .SH PORTABILITY
@@ -168,8 +165,7 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses Issues 4 and 7 both state that
@@ -199,11 +195,10 @@ retains compatibility with System\ V
 .I curses
 behavior.
 .PP
-SVr4 documents no return values apart from
-.B OK
-and
-.B ERR
-for any of these functions.
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
+.PP
 SVr4 does not
 document whether
 .I n
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 33fd46c23..70b04e1ea 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
-.TH curs_inwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp $
+.TH curs_inwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -65,7 +65,8 @@ get a wide-character string from a \fIcurses\fR window
 \fBint innwstr(wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint winnwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
 \fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
-\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP,
+      int \fIn\fP);
 .fi
 .SH DESCRIPTION
 .B \%winwstr
@@ -88,10 +89,8 @@ but copies at most
 .I n
 wide characters from
 .IR win "."
-An
+A negative
 .I n
-of
-.B \-1
 implies no limit;
 .B \%winnwstr
 then works like
@@ -168,11 +167,9 @@ is recommended instead.
 .BR \%mvinnwstr ","
 and
 .BR \%mvwinnwstr "'s"
-treatment of
-.B \-1
-as a valid value of
+acceptance of negative
 .I n
-is an
+values is an
 .I \%ncurses
 extension.
 .SH PORTABILITY
@@ -182,8 +179,7 @@ extensions should condition their use on the visibility of the
 .B \%NCURSES_VERSION
 preprocessor macro.
 .PP
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 Notwithstanding the foregoing,
@@ -221,6 +217,28 @@ and
 .BR \%mvwinstr "."
 .I \%ncurses
 regards this inconsistency as an error in the standard.
+.SH HISTORY
+The System\ V Interface Definition,
+Version 4 (1995),
+specified
+.I \%winwstr
+and
+.I \%winnwstr
+(and the usual variants).
+.\" SVID 4, vol 3., p. 516
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+Their synopses described each function as taking
+an argument of type
+.RI pointer-to- char
+instead of
+.RI pointer-to- wchar_t ,
+despite describing them as \*(``returning the string of
+.I \%wchar_t
+in
+.IR str "\*(''."
+Presumably this was an error in the System\ V Interface Definition.
 .SH SEE ALSO
 \fB\%curs_instr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index c7b1a54d4..292828e19 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp $
-.TH curs_kernel 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp $
+.TH curs_kernel 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -365,6 +365,14 @@ except as described for
 .I \%curs_set
 in section \*(``RETURN VALUE\*('' above.
 .PP
+The System\ V Interface Definition,
+Version 4 (1995),
+specified all of these functions except
+.I \%curs_set
+as returning
+.IR OK "."
+.\" SVID 4, vol 3., p. 518
+.PP
 Older SVr4 man pages warn that the return value of
 .B \%curs_set
 \*(``is currently incorrect\*(''.
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index e5ea3782b..45abf36dc 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp $
-.TH curs_mouse 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp $
+.TH curs_mouse 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -53,72 +53,120 @@
 \fB\%wenclose\fP,
 \fB\%mouse_trafo\fP,
 \fB\%wmouse_trafo\fP,
-\fB\%mouseinterval\fP \-
-get mouse events in \fIcurses\fR
+\fB\%mouseinterval\fP,
+\fB\%mmask_t\fP,
+\fB\%MEVENT\fP \-
+get mouse events in \fIncurses\fR
 .SH SYNOPSIS
 .nf
 \fB#include <curses.h>
 .PP
+\fI/* data types */
 \fBtypedef unsigned long mmask_t;
 .PP
 \fBtypedef struct {
-\fB    short id;         \fI/* ID to distinguish multiple devices */
-\fB    int x, y, z;      \fI/* event coordinates */
-\fB    mmask_t bstate;   \fI/* button state bits */
+\fB    short id;       \fI/* ID to distinguish multiple devices */
+\fB    int x, y, z;    \fI/* event coordinates */
+\fB    mmask_t bstate; \fI/* button state bits */
 \fB} MEVENT;
 .PP
+\fI/* functions */
 \fBbool has_mouse(void);
 .PP
-\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
+\fBmmask_t mousemask(mmask_t \fInew-mask\fP, mmask_t * \fIold-mask\fP);
 .PP
-\fBint getmouse(MEVENT *\fIevent\fP);
-\fBint ungetmouse(MEVENT *\fIevent\fP);
+\fBint getmouse(MEVENT * \fIevent\fP);
+\fBint ungetmouse(MEVENT * \fIevent\fP);
 .PP
-\fBbool wenclose(const WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBbool wenclose(const WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
-\fBbool mouse_trafo(int* \fIpY\fP, int* \fIpX\fP, bool \fIto_screen\fP);
-\fBbool wmouse_trafo(const WINDOW* \fIwin\fP,
-.ti +18n \" "bool wmouse_trafo("
-\fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);
+\fBbool mouse_trafo(int * \fIpY\fP, int * \fIpX\fP, bool \fIto-screen\fP);
+\fBbool wmouse_trafo(const WINDOW * \fIwin\fP,
+      \fBint * \fIpY\fB, int * \fIpX\fB, bool \fIto-screen\fB);
 .PP
 \fBint mouseinterval(int \fIerval\fB);\fR
 .fi
 .SH DESCRIPTION
-These functions provide an interface to mouse events from
-\fB\%ncurses\fP(3X).
-Mouse events are represented by \fB\%KEY_MOUSE\fP
-pseudo-key values in the \fB\%wgetch\fP(3X) input stream.
+.I \%ncurses
+provides an interface to the mouse or other pointing device.
+An application can register its interest in such events;
+the library then exposes the availability of a mouse event via an
+.IR "input character reading function" ":"
+this is \fB\%wgetch\fP(3X) in the non-wide character
+.I curses
+API and \fB\%wget_wch\fP(3X) in the wide character API.
+A queue distinct from that used for keyboard events
+accumulates the details of mouse events.
+The input character reading function
+reports the
+.B \%KEY_MOUSE
+key code when a mouse event is available for collection.
+A single mouse event queue serves all windows
+associated with the screen.
+.PP
+The
+.I \%MEVENT
+structure describes a mouse event.
+Its
+.I y
+and
+.I x
+coordinates are screen-,
+not window-,
+relative.
+The
+.I \%bstate
+member has exactly one bit set indicating the event type.
+.PP
+.I \%ncurses
+ignores mouse events when input is in canonical (\*(``cooked\*('') mode,
+and produces an error beep when canonical mode is simulated in a window
+by a function such as \fB\%getstr\fP(3X) that expects a linefeed to
+terminate its input loop.
 .SS has_mouse
-The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
-has been successfully initialized,
-and \fBFALSE\fP otherwise.
-.PP
-Mouse events are ignored when input is in canonical (\*(``cooked\*('')
-mode, and cause an error beep when canonical mode is being simulated in
-a window by a function such as \fB\%getstr\fP that expects a linefeed
-for input-loop termination.
+The terminal type or operating system interface
+must support the encoding of mouse events.
+.B \%has_mouse
+returns
+.B TRUE
+if
+.IR \%ncurses 's
+mouse driver initialized successfully,
+and
+.B FALSE
+otherwise.
 .SS mousemask
-To make mouse events visible, use the \fB\%mousemask\fP function.
-This sets the mouse events to be reported.
-By default, no mouse events are reported.
+Use
+.B \%mousemask
+to select the varieties of mouse event your application wishes to
+receive.
+By default,
+.I \%ncurses
+reports no mouse events.
 .bP
-The function returns an updated copy of \fInewmask\fP
-to indicate which of the specified mouse events can be reported.
+The function returns an updated copy of
+.I new-mask
+indicating which of the specified mouse events can be reported.
 .IP
-If the screen has not been initialized,
-or if the terminal does not support mouse-events,
-this function returns 0.
+If the screen is not initialized,
+or the terminal interface does report mouse events,
+.B \%mousemask
+returns 0.
 .bP
-If \fIoldmask\fP is
-.RI non- NULL ","
-this function fills the indicated location with the previous value of the
-current screen's mouse event mask.
-.PP
-As a side effect, setting a zero mouse mask may turn off the mouse pointer;
+If
+.I old-mask
+is not a null pointer,
+.B \%mousemask
+stores the previous value
+of the screen's mouse event mask there.
+.PP
+As a side effect,
+setting a zero mouse mask may turn off the mouse cursor;
 setting a nonzero mask may turn it on.
 Whether this happens is device-dependent.
 .SS "Mouse Events"
-Here are the mouse event type masks which may be defined:
+Several mouse event types may be selected;
+construct a mask by logically \*(``or\*(''-ing their values.
 .PP
 .TS
 Lb Lb
@@ -156,13 +204,13 @@ BUTTON5_DOUBLE_CLICKED	mouse button 5 double clicked
 BUTTON5_TRIPLE_CLICKED	mouse button 5 triple clicked
 _
 BUTTON_SHIFT	T{
-shift was down during button state change
+a shift key was down during button state change
 T}
 BUTTON_CTRL	T{
-control was down during button state change
+a control key was down during button state change
 T}
 BUTTON_ALT	T{
-alt was down during button state change
+an alt key was down during button state change
 T}
 ALL_MOUSE_EVENTS	report all button state changes
 REPORT_MOUSE_POSITION	report mouse movement
@@ -170,79 +218,150 @@ _
 .TE
 .SS getmouse
 Once a class of mouse events has been made visible in a window,
-calling the \fB\%wgetch\fP function on that window may return
-\fB\%KEY_MOUSE\fP as an indicator that a mouse event has been queued.
-To read the event data and pop the event off the queue, call
-\fB\%getmouse\fP.
-This function will return \fBOK\fP if a mouse event
-is actually visible in the given window, \fBERR\fP otherwise.
-When \fB\%getmouse\fP returns \fBOK\fP, the data deposited as y and
-x in the event structure coordinates will be screen-relative character-cell
-coordinates.
-The returned state mask will have exactly one bit set to
-indicate the event type.
-The corresponding data in the queue is marked invalid.
-A subsequent call to \fB\%getmouse\fP will retrieve the next older
-item from the queue.
+calling the input character reading function on that window may return
+.B \%KEY_MOUSE
+as an indicator that a mouse event is enqueued.
+To read the event data and pop the event off the queue,
+call
+.BR \%getmouse ","
+which returns
+.B OK
+if a mouse event is visible in the given window
+and
+.B ERR
+otherwise.
+When
+.B \%getmouse
+returns
+.BR OK ","
+it deposits data describing the mouse event in the
+.I event
+pointer you supply.
+A subsequent
+.B \%getmouse
+call retrieves the next older event from the queue.
 .SS ungetmouse
-The \fB\%ungetmouse\fP function behaves analogously to \fB\%ungetch\fP.
-It pushes
-a \fB\%KEY_MOUSE\fP event onto the input queue, and associates with that event
-the given state data and screen-relative character-cell coordinates.
+.B \%ungetmouse
+behaves analogously to \fB\%ungetch\fP(3X).
+It pushes a
+.B \%KEY_MOUSE
+event onto the screen's input queue,
+and
+.I event
+onto the mouse event queue.
 .SS wenclose
-The \fB\%wenclose\fP function tests whether a given pair of screen-relative
-character-cell coordinates is enclosed by a given window, returning \fBTRUE\fP
-if it is and \fBFALSE\fP otherwise.
-It is useful for determining what subset of
-the screen windows enclose the location of a mouse event.
-.PP
-If the parameter is a pad,
-\fB\%wenclose\fP uses the most recent screen coordinates used for
-this pad in
-\fB\%prefresh\fP(3X) or
-\fB\%pnoutrefresh\fP(3X).
+.B \%wenclose
+returns
+.B TRUE
+if the pair of screen-relative coordinates
+.RI ( y ,
+.IR x ")"
+is enclosed by the given window
+.IR win ","
+and
+.B FALSE
+otherwise.
+If
+.I win
+is a pad,
+.B \%wenclose
+uses its most recent screen coordinates as specified in
+a \fB\%prefresh\fP(3X) or \fB\%pnoutrefresh\fP(3X) call.
+.PP
+.B \%wenclose
+is useful for determining what subset of the screen's windows
+encloses the location of a mouse event;
+it is otherwise independent of the
+.I \%ncurses
+mouse API.
 .SS wmouse_trafo
-The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
-from \fB\%stdscr\fP-relative coordinates
-to coordinates relative to the given window or vice versa.
-The resulting \fB\%stdscr\fP-relative coordinates are not always
-identical to screen coordinates due to the mechanism to reserve
-lines on top or bottom of the screen for other purposes
-(see the \fB\%ripoffline\fP(3X) and \fB\%slk_init\fP(3X) calls, for example).
-.bP
-If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
-\fIpY, pX\fP must reference the coordinates of a location
-inside the window \fIwin\fP.
-They are converted to \fB\%stdscr\fP-relative coordinates and returned
-through the pointers.
-If the conversion was successful, the function returns \fBTRUE\fP.
-.IP
-If one of the parameters was
-.I NULL
-or the location is
-not inside the window, \fBFALSE\fP is returned.
-.bP
-If \fIto_screen\fP is
-\fBFALSE\fP, the pointers \fIpY, pX\fP must reference
-\fB\%stdscr\fP-relative coordinates.
-They are converted to window-relative coordinates if the
-window \fIwin\fP encloses this point.
-In this case the function returns \fBTRUE\fP.
-.IP
-If one of the parameters is
-.I NULL
-or the point is not inside the
-window, \fBFALSE\fP is returned.
-.PP
-The referenced coordinates
-are only replaced by the converted coordinates if the transformation was
-successful.
+.B \%wmouse_trafo
+transforms the given pair of coordinate pointers
+.RI ( pY ,
+.IR pX ")"
+from a
+.IR win -relative
+basis to a screen-relative one or
+.IR "vice versa" ","
+as
+.I to-screen
+is
+.B TRUE
+or
+.BR FALSE ","
+respectively.
+.BR \%stdscr -relative
+coordinates are not always identical to screen coordinates:
+.I curses
+supports reservation of screen lines at the top and/or bottom
+for other purposes;
+see \fB\%ripoffline\fP(3X) and \fB\%slk_init\fP(3X).
+.PP
+If
+.I to-screen is
+.B TRUE
+and the pointers
+.RI ( pY ,
+.IR pX ")"
+reference coordinates inside
+.IR win ","
+.I \%ncurses
+updates their values to
+.BR \%stdscr -relative
+coordinates and returns
+.BR TRUE "."
+If either
+.I pY
+or
+.I pX
+is a null pointer,
+or
+.RI ( pY ,
+.IR pX ")"
+is not inside
+.IR win ","
+.B \%wmouse_trafo
+returns
+.BR FALSE "."
+.PP
+If
+.I to-screen is
+.B FALSE
+and the pointers
+.RI ( pY ,
+.IR pX ")"
+reference coordinates inside
+.BR stdscr ","
+.I \%ncurses
+updates their values to
+.IR win -relative
+coordinates and returns
+.BR TRUE "."
+If either
+.I pY
+or
+.I pX
+is a null pointer,
+or
+.RI ( pY ,
+.IR pX ")"
+is not inside
+.BR stdscr ","
+.B \%wmouse_trafo
+returns
+.BR FALSE "."
 .SS mouse_trafo
-The \fB\%mouse_trafo\fP function performs the same translation
-as \fB\%wmouse_trafo\fP,
-using \fB\%stdscr\fP for \fIwin\fP.
+.B \%mouse_trafo
+applies the
+.B \%wmouse_trafo
+translation to
+.BR \%stdscr "."
+If no screen lines are reserved by \fB\%ripoffline\fP(3X) or
+\fB\%slk_init\fP(3X),
+this is the identity transformation.
 .SS mouseinterval
-The \fB\%mouseinterval\fP function sets the maximum time
+.B \%mouseinterval
+sets the maximum time
 (in thousandths of a second)
 that can elapse between press and release events for them to
 be resolved as a
@@ -253,7 +372,9 @@ or,
 with motion,
 as a \*(``drag\*(''.
 .PP
-Calling \fB\%mouseinterval(0)\fP disables click resolution.
+Calling
+.B \%mouseinterval(0)
+disables click resolution.
 When
 .I \%ncurses
 detects a mouse event,
@@ -262,48 +383,65 @@ and then checks for a subsequent mouse event which can be combined
 with the first event.
 If the timeout expires without input activity
 (which would happen with a zero interval),
-then no click resolution will occur.
+then no click resolution occurs.
 .PP
 This function returns the previous interval value.
-Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
+Use
+.B \%mouseinterval(\-1)
+to obtain the interval without altering it.
 .PP
 The mouse interval is set to one sixth of a second
 when the corresponding screen is initialized,
 e.g., in \fBinitscr\fP(3X) or \fBsetupterm\fP(3X).
 .SH RETURN VALUE
-\fB\%has_mouse\fP,
-\fB\%wenclose\fP,
-\fB\%mouse_trafo\fP,
+.BR \%has_mouse ","
+.BR \%wenclose ","
+.BR \%mouse_trafo ","
 and
-\fB\%wmouse_trafo\fP
-return \fBTRUE\fP or \fBFALSE\fP as noted above.
-.PP
-\fB\%getmouse\fP and \fB\%ungetmouse\fP
-return \fBERR\fP upon failure and \fBOK\fP upon success.
+.B \%wmouse_trafo
+return
+.B TRUE
+or
+.B FALSE
+as noted above.
+.PP
+.B \%getmouse
+and
+.B \%ungetmouse
+return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-\fB\%getmouse\fP fails if:
+.B \%getmouse
+fails if:
 .bP
 no mouse driver was initialized,
 .bP
 the mask of reportable events is zero,
 .bP
 a mouse event was detected that does not match the mask,
+or
 .bP
-or if no more events remain in the queue.
+no more events remain in the queue.
 .PP
-\fB\%ungetmouse\fP returns
+.B \%ungetmouse
+returns
 .B ERR
 if the event queue is full.
 .PP
-\fB\%mousemask\fP
+.B \%mousemask
 returns the mask of reportable events.
 .PP
-\fB\%mouseinterval\fP
+.B \%mouseinterval
 returns the previous interval value, unless
 the terminal was not initialized.
 In that case, it returns the maximum interval value (166).
 .SH NOTES
-The order of the \fB\%MEVENT\fP structure members is not guaranteed.
+The order of the
+.B \%MEVENT
+structure members is not guaranteed.
 Additional fields may be added to the structure in the future.
 .PP
 Under
@@ -322,41 +460,66 @@ OS/2 EMX
 .RE
 .PP
 If you are using an unsupported configuration,
-mouse events will not be visible to
-\fI\%ncurses\fP (and the \fB\%mousemask\fP function will always
-return \fB0\fP).
+mouse events are not visible to
+.I \%ncurses
+(and the
+.B \%mousemask
+function always returns
+.BR 0 ")."
 .PP
-If the
+If the terminal type possesses the (nonstandard)
 .I \%term\%info
-entry contains a \fBXM\fP string,
-this is used in the
+string capability
+.BR XM ","
+.IR \%ncurses "'s"
 .I \%xterm
-mouse driver to control the
-way the terminal is initialized for mouse operation.
-The default, if \fBXM\fP is not found,
+mouse driver uses it when initializing the terminal for mouse operation.
+The default,
+if
+.B XM
+is not found,
 corresponds to private mode 1000 of
-.I \%xterm:
+.IR \%xterm "."
 .PP
 .RS 3
+.EX
 \eE[?1000%?%p1%{1}%=%th%el%;
+.EE
 .RE
 .PP
-The mouse driver also recognizes a newer
-.I \%xterm
-private mode 1006,
-e.g.,
+.I \%ncurses
+also recognizes
+.IR \%xterm 's
+newer private mode 1006.
 .PP
 .RS 3
+.EX
 \eE[?1006;1000%?%p1%{1}%=%th%el%;
+.EE
 .RE
 .PP
-The \fIz\fP member in the event structure is not presently used.
+The
+.I id
+member of the mouse event structure is not presently used;
+no terminal type or operating system interface supports reporting events
+from distinguishable pointing devices.
+If you synthesize an
+.IR \%MEVENT ","
+use an
+.I id
+of 0.
+.PP
+The
+.I z
+member of the mouse event structure is not presently used.
 It is intended
 for use with touch screens (which may be pressure-sensitive) or with
 3D-mice/trackballs/power gloves.
 .PP
-The \fB\%ALL_MOUSE_EVENTS\fP class does not
-include \fB\%REPORT_MOUSE_POSITION\fP.
+The
+.B \%ALL_MOUSE_EVENTS
+class does not include
+.BR \%REPORT_MOUSE_POSITION "."
 They are distinct.
 For example,
 in
@@ -364,19 +527,23 @@ in
 wheel/scrolling mice send position reports as a sequence of
 presses of buttons 4 or 5 without matching button-releases.
 .SH EXTENSIONS
-These functions were designed for
-\fB\%ncurses\fP(3X),
+These functions are
+.I \%ncurses
+extensions,
 and are not found in SVr4
 .IR curses ,
 4.4BSD
 .IR curses ,
-or any other previous curses implementation.
+or any other previous
+.I curses
+implementation.
 (SVr4
 .I curses
 did have a
 .I \%getmouse
 function,
-which took no argument and returned a different type.)
+which took no argument and returned an
+.IR "unsigned long" ".)"
 .SH PORTABILITY
 Applications employing the
 .I \%ncurses
@@ -392,24 +559,23 @@ see section \*(``ALTERNATE CONFIGURATIONS\*('' of \fB\%ncurses\fP(3X).
 The following values may be specified.
 .RS 3
 .TP 3
-1
+.B 1
 has definitions for reserved events.
 The mask uses 28 bits.
 .TP 3
-2
+.B 2
 adds definitions for button 5,
 removes the definitions for reserved events.
 The mask uses 29 bits.
 .RE
-.PP
-SVr4
-.I curses
-had support for the mouse in a variant of \fI\%xterm\fP(1).
+.SH HISTORY
+SVr4 (1989) added mouse support to its variant of \fI\%xterm\fP(1).
 It is mentioned in a few places,
 with little supporting documentation.
 .bP
 Its \*(``libcurses\*('' manual page lists functions for this feature
-prototyped in \fI\%curses.h\fP.
+prototyped in
+.IR \%curses.h "."
 .PP
 .RS 8
 .EX
@@ -424,6 +590,7 @@ extern unsigned long getmouse(void), getbmap(void);
 .RE
 .bP
 Its \*(``terminfo\*('' manual page lists capabilities for the feature.
+.PP
 .\" These don't appear in in the SVID 4th edition, Volume 3,
 .\" terminfo(TI_ENV) man page.  They can be found in, e.g., the "z/OS
 .\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
@@ -456,11 +623,17 @@ about the escape sequences sent to and received from the terminal.
 For instance,
 the SVr4
 .I curses
-library used the \fB\%get_mouse\fP capability to tell the terminal which
+library used the
+.B \%get_mouse
+.RB ( getm )
+capability to tell the terminal which
 mouse button events it should send,
 passing the mouse-button bit mask to the terminal.
 Also, it could ask the terminal
-where the mouse was using the \fB\%req_mouse_pos\fP capability.
+where the mouse was using the
+.B \%req_mouse_pos
+.RB ( reqmp )
+capability.
 .IP
 Those features required a terminal program that had been modified
 to work with SVr4
@@ -489,7 +662,7 @@ Mouse events from
 are
 .I not
 ignored in canonical mode if they have been enabled by
-\fB\%mousemask\fP.
+.BR \%mousemask "."
 Instead,
 the
 .I \%xterm
@@ -503,11 +676,16 @@ reports from
 since they are encoded like function keys.
 Set the terminal's
 .I \%term\%info
-capability \fB\%kmous\fP to \*(``\eE[M\*(''
+capability
+.B \%key_mouse
+.RB ( \%kmous )
+to \*(``\eE[M\*(''
 (the beginning of the response from
 .I \%xterm
 for mouse clicks).
-Other values of \fB\%kmous\fP are permitted under the same assumption,
+Other values of
+.B \%key_mouse
+are permitted under the same assumption,
 that is,
 the report begins with that sequence.
 .PP
@@ -516,11 +694,17 @@ terminals supporting the
 .I \%xterm
 mouse protocol,
 .I \%ncurses
-assumes that if \fB\%kmous\fP is defined in the terminal description,
+assumes that if
+.B \%key_mouse
+.RB ( \%kmous )
+is defined in the terminal description,
 or if the terminal type's primary name or aliases contain the string
 \%\*(``xterm\*('',
 then the terminal may send mouse events.
-The \fB\%kmous\fP capability is checked first,
+.I \%ncurses
+checks the
+.B \%kmous
+cap-code first,
 allowing use of newer
 .I \%xterm
 mouse protocols,
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 065c39c55..39e7b0544 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
-.TH curs_move 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
+.TH curs_move 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -93,14 +93,12 @@ is
 .B \%move
 may be implemented as a macro.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-SVr4
-.I curses
-describes a successful return value only as
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
 .SH HISTORY
 4BSD (1980)
 .I curses
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 8454d20c8..02b2e28cf 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp $
-.TH curs_opaque 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp $
+.TH curs_opaque 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -150,11 +150,24 @@ These functions return \fBTRUE\fP or \fBFALSE\fP except as noted.
 .SH NOTES
 \fI\%ncurses\fP provides both a C function and a preprocessor macro for
 each function documented in this page.
+.SH EXTENSIONS
+These functions originated with
+.IR \%ncurses "."
 .SH PORTABILITY
-These routines are specific to \fI\%ncurses\fP.
-They were not supported on Version 7, BSD or System V implementations.
-It is recommended that any code depending on \fI\%ncurses\fP extensions
-be conditioned using \fB\%NCURSES_VERSION\fP.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
+NetBSD
+.I curses
+since 10.1 (2024) supports
+.IR \%wgetscr_reg "."
+It also implements
+.IR \%getscr_reg ","
+operating on
+.IR \%stdscr "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_inopts\fP(3X),
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 920cd1e7d..d77d6d9a9 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp $
-.TH curs_outopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp $
+.TH curs_outopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -167,18 +167,18 @@ returns
 if the scrolling region limits extend outside the
 window boundaries.
 .SH NOTES
-Note that
-\fBclearok\fP,
-\fBleaveok\fP,
-\fBscrollok\fP,
-\fBidcok\fP, and
-\fBsetscrreg\fP may be macros.
+.BR \%clearok ","
+.BR \%leaveok ","
+.BR \%scrollok ","
+.BR \%idcok ","
+and
+.B \%setscrreg
+may be implemented as macros.
 .PP
 The \fBimmedok\fP routine is useful for windows that are used as terminal
 emulators.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 Some historic
@@ -198,7 +198,7 @@ This trick does not work with
 Early System\ V
 .I curses
 implementations specified that with
-.B \%scrollok
+.I \%scrollok
 enabled,
 any window modification triggering a scroll
 also forced a physical refresh.
@@ -206,19 +206,42 @@ X/Open Curses does not require this,
 and
 .I \%ncurses
 avoids doing so to better optimize vertical motions upon a
-\fB\%wrefresh\fP(3X).
+.IR \%wrefresh "."
 .PP
 X/Open Curses does not mention that the cursor should be
 made invisible as a side-effect of
-.BR \%leaveok .
+.IR \%leaveok "."
 SVr4
 .I curses
 documentation notes this,
 but the code neglects it.
 Use \fB\%curs_set\fP(3X) to make the cursor invisible.
 .SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.IR \%clearok ","
+.IR \%leaveok ","
+and
+.IR \%scrollok "."
+.PP
+SVr2 (1984) supplied
+.IR \%idlok ","
+.IR \%setscrreg ","
+and
+.IR \%wsetscrreg "."
+.PP
+SVr3.1 (1987) implemented
+.I \%idcok
+and
+.IR \%immedok "."
+.PP
 .I \%ncurses
-formerly treated \fBnl\fP(3X) and \fBnonl\fP(3X) as both input
+formerly treated
+.I nl
+and
+.I nonl
+as both input
 .I and
 output options,
 but no longer;
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index c4400637f..ae40f80b4 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp $
-.TH curs_overlay 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_overlay.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
+.TH curs_overlay 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -40,6 +40,10 @@
 .el   .ds '' ""
 .\}
 .
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%overlay\fP,
 \fB\%overwrite\fP,
@@ -74,25 +78,41 @@ If the argument \fIoverlay\fP is \fBtrue\fP,
 then copying is non-destructive,
 as in \fBoverlay\fP.
 .SH RETURN VALUE
-These routines return the integer \fBERR\fP upon failure and an \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-X/Open defines no error conditions.
-In this implementation,
-\fBcopywin\fP,
-\fBoverlay\fP and \fBoverwrite\fP return
+In
+.IR \%ncurses ,
+they return
 .B ERR
-if either of the window pointers are null, or
-if some part of the window would be placed off-screen.
+if
+.bP
+either of the window pointers are null,
+or
+.bP
+any part of the window would be placed off-screen.
 .SH NOTES
-Note that \fBoverlay\fP and \fBoverwrite\fP may be macros.
+.B \%overlay
+and
+.B \%overwrite
+may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+It adds
+.I \%const
+qualifiers to the arguments.
+. \" TODO: migrate to HISTORY section
 It further specifies their behavior in the presence of characters
 with multibyte renditions (not yet supported in this implementation).
+.\" XXX: stale?  ncurses is fine with multibyte characters now, no?
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 522
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_pad\fP(3X),
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 689438182..5dac55fe6 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp $
-.TH curs_pad 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.79 2025/01/19 00:51:10 tom Exp $
+.TH curs_pad 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -173,9 +173,6 @@ Functions that return an integer return
 .B ERR
 upon failure and
 .B OK
-(SVr4 specifies only
-\*(``an integer value other than
-.BR ERR \*('')
 upon successful completion.
 .PP
 Functions that return pointers return
@@ -217,84 +214,163 @@ returns
 .RE
 .SH NOTES
 .B \%pechochar
-may be a macro.
-.SH PORTABILITY
-BSD
-.I curses
-has no
-.I pad
-feature.
+may be implemented as a macro.
 .PP
-SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
-documenting them in a single line each.
-SVr3 (1987) provided more extensive documentation.
-.PP
-The documentation does not explain the term \fIpad\fP.
-However, the Apollo \fIAegis\fP workstation operating system
-supported a graphical \fIpad\fP feature:
+.I curses
+documentation is traditionally averse to motivating the term
+\*(``pad\*(''.
+The Apollo Aegis workstation operating system
+.RI ( circa
+1981)
+supported a graphical pad feature.
 .bP
 These graphical pads could be much larger than the computer's display.
 .bP
-The read-only output from a command could be scrolled back to inspect,
+The read-only output from a command could be scrolled back to inspect
 and select text from the pad.
 .PP
 The two uses may be related.
-.PP
-X/Open Curses, Issue 4 describes these functions,
-without significant change from the SVr3 documentation.
+.SH PORTABILITY
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
-The behavior of \fB\%subpad\fP if the parent window is not
-a pad is undocumented,
-and is not checked by the vendor Unix implementations:
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 524
+.PP
+The behavior of
+.I \%subpad
+if the parent window is not a pad is undocumented,
+and is not checked by the vendor Unix implementations.
 .bP
-SVr4 \fIcurses\fP sets a flag in the \fI\%WINDOW\fP structure in
-\fB\%newpad\fP which tells if the window is a \fIpad\fP.
+SVr4
+.IR curses 's
+.I \%newpad
+sets a flag in the
+.I \%WINDOW
+structure indicating that the window is a pad.
 .IP
-However, it uses this information only in
-\fB\%waddch\fP (to decide if it should call \fB\%wrefresh\fP) and
-\fB\%wscrl\fP (to avoid scrolling a pad),
-and does not check in \fB\%wrefresh\fP to ensure that the pad
-is refreshed properly.
+However,
+it uses this information only in
+.I \%waddch
+(to decide if it should call
+.IR \%wrefresh ")"
+and
+.I \%wscrl
+(to avoid scrolling a pad);
+its
+.I \%wrefresh
+does not check it to ensure that a pad is properly updated.
 .bP
-Solaris \fI\%xcurses\fP checks whether a window is a pad in
-\fB\%wnoutrefresh\fP,
-returning \fBERR\fP in that case.
+Solaris
+.I \%xcurses
+checks whether a window is a pad in its
+.IR \%wnoutrefresh ","
+returning
+.I ERR
+in that case.
 .IP
 However,
-it only sets the flag for subwindows if the parent window is a pad.
-Its \fB\%newpad\fP function does not set this information.
-Consequently, the check will never fail.
+it sets the flag on subwindows only if the parent window is a pad.
+Its
+.I \%newpad
+does not set this information.
+Consequently,
+the check never fails.
 .IP
-It makes no comparable check in \fB\%pnoutrefresh\fP,
-though interestingly enough, a comment in the source code
-states that the lack of a check was an MKS extension.
+It makes no comparable check in
+.I \%pnoutrefresh
+\(em though interestingly enough,
+a comment in the source code states that the lack of a check
+was an MKS extension.
 .bP
-NetBSD 7 \fIcurses\fP
-sets a flag in the \fI\%WINDOW\fP structure
-for \fB\%newpad\fP and \fB\%subpad\fP,
-using this to help with the distinction between \fB\%wnoutrefresh\fP
-and \fB\%pnoutrefresh\fP.
+NetBSD\ 7
+.I curses
+sets a flag in the
+.I \%WINDOW
+structure for
+.I \%newpad
+and
+.IR \%subpad ","
+aiding itself to distinguish between
+.I \%wnoutrefresh
+and
+.IR \%pnoutrefresh "."
 .IP
 It does not check for the case where a subwindow is created in
-a pad using \fB\%subwin\fP or \fB\%derwin\fP.
+a pad using
+.I \%subwin
+or
+.IR \%derwin "."
 .IP
-The \fB\%dupwin\fP function returns a regular window when duplicating a pad.
-Likewise, \fB\%getwin\fP always returns a window, even if the saved
-data was from a pad.
+Its
+.I \%dupwin
+returns a regular window when duplicating a pad.
+Likewise,
+its
+.I \%getwin
+always returns a window,
+even if the saved data was from a pad.
 .PP
-This implementation
+.IR \%ncurses ":"
 .bP
-sets a flag in the \fI\%WINDOW\fP structure
-for \fB\%newpad\fP and \fB\%subpad\fP,
+sets a flag in the
+.I \%WINDOW
+structure for
+.I \%newpad
+and
+.IR \%subpad ","
 .bP
-allows a \fB\%subwin\fP or \fB\%derwin\fP call to succeed having a pad parent by
-forcing the subwindow to be a pad,
+allows a
+.I \%subwin
+or
+.I \%derwin
+call to succeed having a pad parent
+by forcing the subwindow to be a pad,
 .bP
-checks in both \fB\%wnoutrefresh\fP and \fB\%pnoutrefresh\fP to ensure
-that pads and windows are handled distinctly, and
+checks in both
+.I \%wnoutrefresh
+and
+.I \%pnoutrefresh
+to ensure that pads and windows are handled distinctly,
+and
 .bP
-ensures that \fB\%dupwin\fP and \fB\%getwin\fP treat
-pads versus windows consistently.
+ensures that
+.I \%dupwin
+and
+.I \%getwin
+treat pads versus windows consistently.
+.SH HISTORY
+SVr2 (1984) introduced
+.IR \%newpad ","
+.IR \%prefresh ","
+and
+.IR \%pnoutrefresh ","
+documenting them in a single line each.
+.PP
+SVr3 (1987) added
+.I \%subpad
+and
+.IR \%pechochar ","
+and provided more extensive documentation.
+.PP
+The System\ V Interface Definition,
+Version 4 (1995),
+specified a function named
+.IR \%pechowchar "."
+This was a later addition to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+It differs from X/Open's later
+.I \%pecho_wchar
+in that its
+.I wstr
+parameter was a
+.I \%chtype
+instead of a
+.IR \%wchar_t ","
+and was not
+.IR const "-qualified."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_addch\fP(3X),
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 282536b36..166bcad84 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_printw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
-.TH curs_printw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_printw.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
+.TH curs_printw 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,8 +118,7 @@ To format and write a wide-character string to a
 window,
 consider using \fI\%swprintf\fP(3) and \fB\%waddwstr\fP(3X) or similar.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 .I \%ncurses
@@ -128,18 +127,17 @@ legacy applications.
 However,
 the latter is obsolete.
 .bP
-X/Open Curses,
-Issue 4 Version 2 (1996),
+X/Open Curses Issue\ 4 Version\ 2 (1996),
 marked \fB\%vwprintw\fP as requiring \fI\%varargs.h\fP and
 \*(``TO BE WITHDRAWN\*('',
 and specified \fB\%vw_printw\fP using the \fI\%stdarg.h\fP interface.
 .bP
-X/Open Curses, Issue 5, Draft 2
+X/Open Curses Issue\ 5, Draft 2
 (December 2007) marked \fBvwprintw\fP (along with
 \fBvwscanw\fP and the \fItermcap\fP interface) as withdrawn.
 After incorporating review comments,
 this became
-X/Open Curses, Issue 7 (2009).
+X/Open Curses Issue\ 7 (2009).
 .bP
 .I \%ncurses
 provides \fB\%vwprintw\fP,
@@ -194,7 +192,7 @@ but provided for using either \fI\%varargs.h\fP or \fI\%stdarg.h\fP to
 define the \fI\%va_list\fP type.
 .\" either header declares "va_list", but only one can be used
 .PP
-X/Open Curses, Issue 4 (1995),
+X/Open Curses Issue\ 4 (1995),
 defined \fB\%vw_printw\fP to replace \fB\%vwprintw\fP,
 stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
 .SH SEE ALSO
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index cd50712bf..37fd5f19f 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp $
-.TH curs_refresh 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_refresh.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
+.TH curs_refresh 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -129,9 +129,6 @@ It touches the indicated lines (marking them changed).
 The routine \fBredrawwin\fP touches the entire window.
 .SH RETURN VALUE
 These routines return the integer \fBERR\fP upon failure and \fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
 .PP
 In this implementation
 .RS 3
@@ -149,11 +146,18 @@ if the associated call to \fBtouchln\fP returns
 .BR ERR "."
 .RE
 .SH NOTES
-Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
+.B \%refresh
+and
+.B \%redrawwin
+may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses, Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 527
+.PP
 Whether \fBwnoutrefresh\fP 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).
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index 409c297fb..1bc76535d 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scanw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
-.TH curs_scanw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scanw.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
+.TH curs_scanw 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -126,8 +126,7 @@ respectively.
 implements \fI\%vsscanf\fP(3) internally if it is unavailable when the
 library is configured.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 .I \%ncurses
@@ -136,19 +135,17 @@ legacy applications.
 However,
 the latter is obsolete.
 .bP
-X/Open Curses,
-Issue 4 Version 2 (1996),
+X/Open Curses Issue\ 4 Version\ 2 (1996),
 marked \fB\%vwscanw\fP as requiring \fI\%varargs.h\fP and
 \*(``TO BE WITHDRAWN\*('',
 and specified \fB\%vw_scanw\fP using the \fI\%stdarg.h\fP interface.
 .bP
-X/Open Curses,
-Issue 5,
+X/Open Curses Issue\ 5,
 Draft 2 (December 2007) marked \fB\%vwscanw\fP (along with
 \fB\%vwscanw\fP and the \fItermcap\fP interface) as withdrawn.
 After incorporating review comments,
 this became
-X/Open Curses, Issue 7 (2009).
+X/Open Curses Issue\ 7 (2009).
 .bP
 .I \%ncurses
 provides \fB\%vwscanw\fP,
@@ -244,7 +241,7 @@ but provided for using either \fI\%varargs.h\fP or \fI\%stdarg.h\fP to
 define the \fI\%va_list\fP type.
 .\" either header declares "va_list", but only one can be used
 .PP
-X/Open Curses, Issue 4 (1995),
+X/Open Curses Issue\ 4 (1995),
 defined \fI\%vw_scanw\fP to replace \fI\%vwscanw\fP,
 stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
 .SH SEE ALSO
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 96aef6a2d..0cb7215d7 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp $
-.TH curs_scr_dump 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
+.TH curs_scr_dump 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -186,8 +186,7 @@ and
 .B \%scr_set
 may be implemented as macros.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .\" Unusually, SVID 4 explicitly indicated "OK" as a possible return
 .\" value, rather than the "integer other than ERR" refrain (p. 529).
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 1db9532ac..0c7bd05f2 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp $
-.TH curs_scroll 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
+.TH curs_scroll 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -138,14 +138,12 @@ accepting a
 .I \%WINDOW
 pointer argument.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
-It defines no error conditions.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-SVr4 specifies only
+SVr4 describes a successful return value only as
 \*(``an integer value other than
-.BR ERR \*(''
-as a successful return value.
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 531
 .PP
 SVr4 indicates that the optimization of physically scrolling immediately
 if the scroll region is the entire screen \*(``is\*('' performed,
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index c723bf445..f22f48aeb 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp $
-.TH curs_slk 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.85 2025/01/19 00:51:10 tom Exp $
+.TH curs_slk 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -213,15 +213,14 @@ this implementation provides
 \fB\%extended_slk_color\fP,
 which accepts an \fIint\fP value of at least 32 bits.
 .SH RETURN VALUE
-Routines that return an integer return \fBERR\fP upon failure and
-\fBOK\fP
-(SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
-upon successful completion.
-.PP
-X/Open Curses defines no error conditions.
+Functions that return integers return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-In this implementation
+In
+.IR \%ncurses ","
 .RS 3
 .TP 5
 \fBslk_attr\fP
@@ -271,12 +270,15 @@ memory for the labels cannot be allocated.
 Most applications would use \fB\%slk_noutrefresh\fP because a
 \fB\%wrefresh\fP is likely to follow soon.
 .SH EXTENSIONS
-X/Open Curses documents the \fIopts\fP argument
-as reserved for future use,
-saying that it must be null.
-This implementation
-uses that parameter in ABI 6 for the functions which have a color pair
-parameter to support extended color pairs.
+X/Open Curses documents the
+.I opts
+argument as reserved for future use,
+saying that it must be a null pointer.
+The
+.IR \%ncurses\  6
+ABI uses it
+for the functions that accept a color pair parameter
+to support extended color pairs.
 .PP
 For functions which modify the color,
 e.g.,
@@ -285,9 +287,12 @@ if \fIopts\fP is set it is treated as a pointer to \fIint\fP,
 and used to set the color pair instead of the \fIshort\fP pair
 parameter.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions,
-with some differences from SVr4 \fIcurses\fP:
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 533
 .bP
 X/Open added functions like the SVr4 attribute-manipulation functions
 \fB\%slk_attron\fP,
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 3a1e5fc06..df3f5dcb5 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp $
-.TH curs_sp_funcs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
+.TH curs_sp_funcs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -110,7 +110,7 @@
 \fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
 \fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
 \fBSCREEN* new_prescr(void);
-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutfd\fP, FILE *\fIinfd\fP);
+\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinfd\fP);
 .PP
 \fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
 \fBint nl_sp(SCREEN* \fIsp\fP);
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index f0c232e64..0d8c5360c 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
-.TH curs_termattrs 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
+.TH curs_termattrs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%baudrate\fP,
 \fB\%erasechar\fP,
@@ -48,83 +58,158 @@ get and set terminal attributes with \fIcurses\fP
 .PP
 \fBint baudrate(void);
 \fBchar erasechar(void);
-\fBint erasewchar(wchar_t *\fIwc\fP);
+\fBint erasewchar(wchar_t * \fIwc\fP);
 \fBbool has_ic(void);
 \fBbool has_il(void);
 \fBchar killchar(void);
-\fBint killwchar(wchar_t *\fIwc\fP);
-\fBchar *longname(void);
+\fBint killwchar(wchar_t * \fIwc\fP);
+\fBchar * longname(void);
 \fBattr_t term_attrs(void);
 \fBchtype termattrs(void);
-\fBchar *termname(void);
+\fBchar * termname(void);
 .fi
 .SH DESCRIPTION
 .SS baudrate
-The \fBbaudrate\fP routine returns the output speed of the terminal.
-The
-number returned is in bits per second, for example \fB9600\fP, and is an
-integer.
+.B \%baudrate
+returns the line speed of the terminal,
+an integer value measured in bits per second,
+for example
+.BR 9600 "."
 .SS "erasechar, erasewchar"
-The \fBerasechar\fP routine returns the user's current erase character.
+.B \%erasechar
+returns the terminal's erase character.
 .PP
-The \fBerasewchar\fP routine stores the current erase character
-in the location referenced by \fIwc\fP.
-If no erase character has been defined, the routine fails
-and the location referenced by \fIwc\fP is not changed.
+.B \%erasewchar
+stores the erase character in the location referenced by
+.IR wc "."
+If no erase character has been defined,
+it fails and the location referenced by
+.I wc
+is not changed.
 .SS "has_ic, has_il"
-The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
-character capabilities.
+.B \%has_ic
+returns
+.B TRUE
+if the terminal has insert- and delete-character capabilities.
 .PP
-The \fBhas_il\fP routine is true if the terminal has insert- and delete-line
-capabilities, or can simulate them using scrolling regions.
-This might
-be used to determine if it would be appropriate to turn on physical
-scrolling using \fBscrollok\fP(3X).
+.B \%has_il
+returns
+.B TRUE
+if the terminal has insert- and delete-line capabilities,
+or can simulate them using scrolling regions.
+It might be used to determine whether it would be appropriate
+to use \fBscrollok\fP(3X) to turn on scrolling.
 .SS "killchar, killwchar"
-The \fBkillchar\fP routine returns the user's current line kill character.
+.B \%killchar
+returns the terminal's line kill character.
 .PP
-The \fBkillwchar\fP routine stores the current line-kill character
-in the location referenced by \fIwc\fP.
+.B \%killwchar
+stores the line-kill character in the location referenced by
+.IR wc "."
 If no line-kill character has been defined,
-the routine fails and the location referenced by \fIwc\fP is not changed.
+it fails and the location referenced by
+.I wc
+is not changed.
 .SS longname
-The \fBlongname\fP routine returns a pointer to a static area
-containing a verbose description of the current terminal.
-The maximum
-length of a verbose description is 128 characters.
-It is defined only
-after the call to \fBinitscr\fP or \fBnewterm\fP.  The area is
-overwritten by each call to \fBnewterm\fP and is not restored by
-\fBset_term\fP, so the value should be saved between calls to
-\fBnewterm\fP if \fBlongname\fP is going to be used with multiple
-terminals.
+.B \%longname
+returns a pointer to static storage
+containing a verbose description of the terminal being managed by
+.IR curses "."
+The maximum length of a verbose description is 128 characters.
+The storage is populated only after \fBinitscr\fP(3X) or
+\fBnewterm\fP(3X) is called.
+This storage is overwritten by each call to
+.B \%newterm
+and not restored by \fBset_term\fP(3X),
+so its contents should be saved between calls to
+.B \%initscr
+or
+.B \%newterm
+if
+.B \%longname
+is to be used with multiple terminals.
 .SS "termattrs, term_attrs"
 If a given terminal does not support a video attribute that an
-application program is trying to use, \fBcurses\fP may substitute a
+application program is trying to use,
+.I curses
+may substitute a
 different video attribute for it.
-The \fBtermattrs\fP and \fBterm_attrs\fP functions
-return a logical \fBOR\fP of all video attributes supported by the
-terminal using \fBA_\fP and \fBWA_\fP constants respectively.
-This information is useful when a \fBcurses\fP program
+.B \%termattrs
+and
+.B \%term_attrs
+return a logical \*(``or\*('' of all video attributes supported by the
+terminal using
+.B A_
+and
+.B WA_
+constants respectively.
+This information is useful when a
+.I curses
+program
 needs complete control over the appearance of the screen.
 .SS termname
-The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
+.B \%termname
+returns the terminal name used by \fBsetupterm\fP(3X).
 .SH RETURN VALUE
-\fBlongname\fP and \fBtermname\fP return
+.B \%longname
+and
+.B \%termname
+return
 .I NULL
 on error.
 .PP
-Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
-completion.
+Functions that return an integer return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .SH NOTES
-Note that \fBtermattrs\fP may be a macro.
+.BR \%erasewchar ","
+.BR \%killwchar ","
+and
+.B \%term_attrs
+are part of
+.IR \%ncurses "'s"
+wide-character API,
+and are not available in its non-wide configuration.
+.PP
+.B \%termattrs
+may be implemented as a macro.
 .SH PORTABILITY
-X/Open Curses, Issue 4 describes these functions.
-It changes the
-return type of \fBtermattrs\fP to the new type \fBattr_t\fP.
-Most versions of curses truncate the result returned by \fBtermname\fP to
-14 characters.
+X/Open Curses Issue\ 4 describes these functions.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 535
+.PP
+Most versions of
+.I curses
+truncate the string returned by
+.I \%termname
+to 14 characters.
+.SH HISTORY
+4BSD (1980) introduced
+.IR \%longname "."
+.PP
+SVr2 (1984) added
+.IR \%baudrate ","
+.IR \%erasechar ","
+.IR \%killchar ","
+.IR \%has_ic ","
+and
+.IR \%has_il "."
+.PP
+SVr3 (1987) furnished
+.IR \%termname "."
+SVr3.1 later that year supplied
+.IR \%termattrs "."
+.PP
+X/Open Curses Issue\ 4 (1995)
+specified
+.IR \%erasewchar ","
+.IR \%killwchar ","
+and
+.IR \%term_attrs "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_initscr\fP(3X),
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 71acd3aa8..74766a3f5 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp $
-.TH curs_termcap 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp $
+.TH curs_termcap 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -118,7 +118,7 @@
 \fBint tgetent(char * \fIbp\fP, const char * \fIname\fP);
 \fBint tgetflag(const char * \fIid\fP);
 \fBint tgetnum(const char * \fIid\fP);
-\fBchar * tgetstr(const char * \fIid\fP, char ** \fIarea\fP);
+\fBchar * tgetstr(const char * \fIid\fP, char ** \fIsbuf\fP);
 \fBchar * tgoto(const char * \fIcap\fP, int \fIcol\fP, int \fIrow\fP);
 \fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
 .fi
@@ -157,14 +157,13 @@ database could not be found.
 .PP
 This implementation differs from those of historical \fItermcap\fP
 libraries.
-.RS 3
 .bP
 .I \%ncurses
 ignores the buffer pointer \fIbp\fP,
 as do other \fItermcap\fP implementations conforming to portions of
 X/Open Curses now withdrawn.
 The BSD \fItermcap\fP library would store a copy of the terminal type
-description in the area referenced by this pointer.
+description in the buffer referenced by this pointer.
 \fI\%term\%info\fP stores terminal type descriptions in compiled form,
 which is not the same thing.
 .bP
@@ -177,7 +176,6 @@ capability,
 nor whether the terminal type description supports an addressable
 cursor,
 a property essential for any \fIcurses\fP implementation to operate.
-.RE
 .SS "Retrieving Capability Values"
 \fB\%tgetflag\fP reports the Boolean entry for \fIid\fP,
 or zero if it is not available.
@@ -191,34 +189,36 @@ or
 if it is not available.
 Use \fB\%tputs\fP to output the string returned.
 The
-.I area
+.I sbuf
 parameter is used as follows.
-.RS 3
 .bP
 It is assumed to be the address of a pointer to a buffer managed by the
 calling application.
 .bP
 However,
-\fI\%ncurses\fP checks to ensure that
-.I area
+.I \%ncurses
+checks to ensure that
+.I sbuf
 is not
 .IR NULL ","
-and also that the resulting buffer pointer is not
+and that the pointer obtained by dereferencing
+.I sbuf
+is also not
 .IR NULL "."
 If either check fails,
-.I area
-is ignored.
+.I \%ncurses
+ignores
+.IR sbuf .
 .bP
 If the checks succeed,
 \fI\%ncurses\fP also copies the return value to the buffer pointed to by
-\fIarea\fP,
+\fIsbuf\fP,
 and the library updates
-.I area
+.I sbuf
 to point past the null character terminating this value.
 .bP
 The return value itself is an address in the terminal type description
 loaded into memory.
-.RE
 .SS "Applying String Capabilities"
 String capabilities can be parameterized;
 see subsection \*(``Parameterized Strings\*('' in  \fB\%terminfo\fP(5).
@@ -275,27 +275,39 @@ and
 to the
 .I \%term\%info
 entry's data for
-.BR \%pad_char ","
-.BR \%cursor_up ","
+.B \%pad_char
+.RB ( pad ),
+.B \%cursor_up
+.RB ( cuu1 ),
 and
-.BR \%backspace_if_not_bs ","
+.B \%backspace_if_not_bs
+.RB ( OTbs ),
 respectively.
-\fBUP\fP is not used by
-.IR \%ncurses "."
-.B PC
-is used by \fB\%delay_output\fP(3X).
-.B BC
-is used by
+.I \%ncurses
+does not employ
+.B cuu1
+internally.
+\fB\%delay_output\fP(3X)
+uses
+.BR pad ","
+while
 .B \%tgoto
-emulation.
+emulation uses the obsolete
+.I termcap
+capability
+.BR bs ","
+represented in
+.I \%ncurses
+.I \%term\%info
+as \*(``OTbs\*(''.
 .I \%ncurses
 assigns the variable
 .B \%ospeed
 a system-specific value to encode the terminal's data rate.
 .SS "Releasing Memory"
 The \fItermcap\fP functions provide no means of freeing memory,
-because legacy \fItermcap\fP implementations used only the buffer
-areas provided by the caller via \fB\%tgetent\fP and \fB\%tgetstr\fP.
+because legacy \fItermcap\fP implementations used only the storage
+provided by the caller via \fB\%tgetent\fP and \fB\%tgetstr\fP.
 Those buffers are unused in \fI\%term\%info\fP.
 .PP
 By contrast,
@@ -316,7 +328,7 @@ The \fIscreen\fP(1) program relies upon this arrangement to improve its
 performance.
 .PP
 An application that uses only the \fItermcap\fP functions,
-not the higher level
+not the higher-level
 .I \%curses
 API,
 could release the memory using \fB\%del_curterm\fP(3X),
@@ -364,27 +376,14 @@ and
 .SH PORTABILITY
 These functions are no longer standardized
 (and the variables never were);
+see section \*(``HISTORY\*('' below.
 .I \%ncurses
-provides them to support legacy applications.
-They should not be used in new programs.
-.SS Standards
-.bP
-X/Open Curses,
-Issue 4,
-Version 2 (1996),
-describes these functions,
-marking them as
-\*(``TO BE WITHDRAWN\*(''.
-.bP
-X/Open Curses,
-Issue 7 (2009) withdrew the
-.I termcap
-interface
-(along with the
-.I \%vwprintw
-and
-.I \%vwscanw
-functions).
+provides them to support legacy applications;
+they should not be used in new programs.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 536
 .PP
 Neither X/Open Curses nor the SVr4 man pages documented the return
 values of
@@ -396,19 +395,17 @@ an omission in the X/Open Curses specification has been misinterpreted
 to mean that
 .I \%tgetent
 returns
-.B OK
+.I OK
 or
-.BR ERR "."
+.IR ERR "."
 Because the purpose of these functions is to provide compatibility with
 the
 .I termcap
 library,
-that is a defect in X/Open Curses,
-Issue 4,
-Version 2
+that is a defect in X/Open Curses Issue\ 4 Version\ 2
 rather than in
 .IR \%ncurses "."
-.SS "Compatibility with BSD \f(BItermcap\fP"
+.SS "Compatibility with BSD \fItermcap\fP"
 .I \%ncurses
 provides externally visible variables to support certain
 .I termcap
@@ -419,7 +416,7 @@ for example,
 it is unclear when reading and writing them is meaningful.
 In particular,
 some applications are reported to declare and/or modify
-.BR \%ospeed "."
+.IR \%ospeed "."
 .PP
 The constraint that only the first two characters of the
 .I id
@@ -640,6 +637,21 @@ Any two of the four implementations thus differ,
 and programs that intend to work with all
 .I termcap
 library interfaces must account for that fact.
+.PP
+X/Open Curses Issue\ 4,
+Version\ 2 (1996),
+describes these functions,
+marking them as
+\*(``TO BE WITHDRAWN\*(''.
+.PP
+X/Open Curses Issue\ 7 (2009) withdrew the
+.I termcap
+interface
+(along with the
+.I \%vwprintw
+and
+.I \%vwscanw
+functions).
 .SH BUGS
 If you call \fB\%tgetstr\fP to fetch
 .B \%column_address
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 9ca87c71b..0fcca8f32 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp $
-.TH curs_terminfo 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp $
+.TH curs_terminfo 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -116,7 +116,9 @@
 \fBint setterm(const char * \fIterm\fP);
 .fi
 .SH DESCRIPTION
-These low-level functions must be called by programs that deal directly
+These lower-level functions of the
+.I curses
+standard must be called by programs that deal directly
 with the
 .I \%term\%info
 database to handle certain terminal capabilities,
@@ -211,7 +213,7 @@ initializing the
 .I \%term\%info
 structures,
 but does not set up the output virtualization structures used by
-.IR curses .
+.IR curses "."
 Its parameters follow.
 .RS 3
 .TP 5
@@ -233,9 +235,9 @@ terminal,
 passing an output
 .I stream
 rather than a
-.IR descriptor .
+.IR descriptor "."
 In
-.IR curses ,
+.IR curses ","
 the two are the same because \fB\%newterm\fP calls \fB\%setupterm\fP,
 passing the file descriptor derived from its output stream parameter.
 .TP 5
@@ -252,7 +254,7 @@ returns
 or
 .B ERR
 and stores a status value in the integer pointed to by
-.IR errret .
+.IR errret "."
 A return value of
 .B OK
 combined with status of
@@ -265,7 +267,7 @@ If
 .B ERR
 is returned,
 examine
-.I errret:
+.IR errret "."
 .RS
 .TP 5
 .B 1
@@ -313,7 +315,7 @@ setupterm((char *) NULL, 1, (int *) NULL);
 .RE
 .IP
 which uses all the defaults and sends the output to
-.IR stdout .
+.IR stdout "."
 .RE
 .\" ********************************************************************
 .SS "The Terminal State"
@@ -392,7 +394,7 @@ then restores that state.
 \fB\%tparm\fP instantiates the string
 .I str
 with parameters
-.IR pi .
+.IR pi "."
 A pointer is returned to the result of
 .I str
 with the parameters applied.
@@ -448,7 +450,7 @@ library would assume.
 .\" ********************************************************************
 .SS "Output Functions"
 String capabilities can contain
-.IR padding ,
+.IR padding ","
 a time delay
 (accommodating performance limitations of hardware terminals)
 expressed as \fB$<\fIn\fB>\fR,
@@ -492,19 +494,19 @@ routing any resulting padding characters through this function.
 .IB str ", 1, putchar)\c"
 \*(''.
 The output of \fB\%putp\fP always goes to
-.IR stdout ,
+.IR stdout ","
 rather than the
 .I \%file\%des
 specified in \fB\%setupterm\fP.
 .PP
 \fB\%vidputs\fP displays the string on the terminal in the video
 attribute mode
-.IR attrs ,
+.IR attrs ","
 which is any combination of the attributes listed in \fB\%curses\fP(3X).
 The characters are passed to the
 .IR \%putchar -like
 function
-.IR putc .
+.IR putc "."
 .PP
 \fB\%vidattr\fP is like \fB\%vidputs\fP,
 except that it outputs through \fI\%putchar\fP(3).
@@ -515,20 +517,20 @@ and
 correspond to
 .B \%vidattr
 and
-.BR \%vidputs ,
+.BR \%vidputs ","
 respectively.
 They use multiple parameters to represent the character attributes and
 color;
 namely,
 .bP
-.IR \%attrs ,
+.IR \%attrs ","
 of type
-.IR \%attr_t ,
+.IR \%attr_t ","
 for the attributes and
 .bP
-.IR pair ,
+.IR pair ","
 of type
-.IR short ,
+.IR short ","
 for the color pair number.
 .PP
 Use the attribute constants prefixed with
@@ -536,7 +538,7 @@ Use the attribute constants prefixed with
 with
 .B \%vid_attr
 and
-.BR \%vid_puts .
+.BR \%vid_puts "."
 .PP
 X/Open Curses reserves the
 .I opts
@@ -544,24 +546,29 @@ argument for future use,
 saying that applications must provide a null pointer for that argument;
 but see section \*(``EXTENSIONS\*('' below.
 .PP
-While \fB\%putp\fP is a low-level function that does not use high-level
+While
+.B \%putp
+is a lower-level function
+that does not use higher-level
 .I curses
 state,
 .I \%ncurses
 declares it in
 .I \%curses.h
-because System\ V did this
+because System\ V did so
 (see section \*(``HISTORY\*('' below).
 .\" ********************************************************************
 .SS "Terminal Capability Functions"
-\fB\%tigetflag\fP,
-\fB\%tigetnum\fP,
-and \fB\%tigetstr\fP return the value of the capability corresponding to
+.BR \%tigetflag ","
+.BR \%tigetnum ","
+and
+.B \%tigetstr
+return the value of the capability corresponding to
 the
 .I \%term\%info
-.IR cap-code ,
+.IR cap-code ","
 such as
-.BR xenl ,
+.BR xenl ","
 passed to them.
 The
 .I cap-code
@@ -570,7 +577,8 @@ in the \*(``Predefined Capabilities\*('' section of \fB\%terminfo\fP(5).
 .PP
 These functions return special values to denote errors.
 .PP
-\fB\%tigetflag\fP returns
+.B \%tigetflag
+returns
 .TP
 .B \-1
 if
@@ -581,7 +589,8 @@ or
 .B 0
 if it is canceled or absent from the terminal description.
 .PP
-\fB\%tigetnum\fP returns
+.B \%tigetnum
+returns
 .TP
 .B \-2
 if
@@ -592,7 +601,8 @@ or
 .B \-1
 if it is canceled or absent from the terminal description.
 .PP
-\fB\%tigetstr\fP returns
+.B \%tigetstr
+returns
 .TP
 .B "(char *)\-1"
 if
@@ -669,9 +679,14 @@ Normally they do not free this memory,
 but it is possible to do that using the \fB\%delscreen\fP(3X) function.
 .\" ********************************************************************
 .SH RETURN VALUE
-X/Open Curses defines no failure conditions.
+Functions that return integers return
+.B ERR
+upon failure and
+.B OK
+upon success.
+.PP
 In
-.IR \%ncurses ,
+.IR \%ncurses ","
 .TP 5
 .B del_curtem
 fails if its terminal parameter is null.
@@ -688,9 +703,9 @@ fails if the associated call to \fB\%setupterm\fP returns
 fails if it cannot allocate enough memory,
 or create the initial windows
 .RB \%( stdscr ,
-.BR \%curscr ,
+.BR \%curscr ","
 and
-.BR \%newscr ).
+.BR \%newscr ")."
 Other error conditions are documented above.
 .TP 5
 .B tparm
@@ -724,12 +739,12 @@ and unlike the other wide-character functions,
 is also provided in the non-wide-character configuration.
 .\" ********************************************************************
 .SH EXTENSIONS
-The functions marked as extensions were designed for
-.IR \%ncurses ,
+The functions marked as extensions originated in
+.IR \%ncurses ","
 and are not found in SVr4
-.IR curses ,
+.IR curses ","
 4.4BSD
-.IR curses ,
+.IR curses ","
 or any other previous
 .I curses
 implementation.
@@ -738,16 +753,23 @@ implementation.
 allows
 .I opts
 to be a pointer to
-.IR int ,
+.IR int ","
 which overrides the
 .I pair
 .RI ( short )
 argument.
 .\" ********************************************************************
 .SH PORTABILITY
-.I \%setterm
-is not described by X/Open and must be considered non-portable.
-All other functions are as described by X/Open.
+Except for
+.IR \%setterm ","
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value
+except where \*(``otherwise noted\*(''
+as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 539
 .SS "Header Files"
 On legacy
 .I curses
@@ -757,30 +779,27 @@ include
 and
 .I \%term.h
 in that order
-to get the definitions for these strings,
-numbers,
-and flags.
+to make visible the definitions of the string arrays
+storing the capability names and codes.
 .SS "Compatibility Macros"
-This implementation provides a few macros for compatibility with systems
-before SVr4
-(see section \*(``HISTORY\*('' below).
-They include
-.IR \%Bcrmode ","
-.IR \%Bfixterm ","
-.IR \%Bgettmode ","
-.IR \%Bnocrmode ","
-.IR \%Bresetterm ","
-.IR \%Bsaveterm ","
-and"
-.IR \%Bsetterm "."
 .I \%ncurses
-implements each of these symbols as macros for BSD
+implements a few macros for early System\ V
 .I curses
-compatibility.
+compatibility
+(see section \*(``HISTORY\*('' below).
+They include
+.IR \%crmode ","
+.IR \%fixterm ","
+.IR \%gettmode ","
+.IR \%nocrmode ","
+.IR \%resetterm ","
+.IR \%saveterm ","
+and
+.IR \%setterm "."
 .PP
 In SVr4,
 these are found in
-.IR \%curses.h ,
+.IR \%curses.h ","
 but except for
 .IR \%setterm ","
 are likewise macros.
@@ -794,13 +813,13 @@ was replaced by
 stating that the call
 .RS
 .EX
-.BI setupterm( term ", 1, (int *)0)"
+.RI setupterm( term ", 1, (int *)0)"
 .EE
 .RE
 provides the same functionality as
 .RS
 .EX
-.BI setterm( term )
+.RI setterm( term )
 .EE
 .RE
 and discouraging the latter for new programs.
@@ -808,7 +827,7 @@ and discouraging the latter for new programs.
 .I \%setupterm
 copies the terminal name to the array
 .IR \%ttytype "."
-This is not part of X/Open Curses,
+This behavior is not specified by X/Open Curses,
 but is assumed by some applications.
 .PP
 Other implementions may not declare the capability name arrays.
@@ -828,28 +847,31 @@ from
 .I \%initscr
 or
 .I \%newterm
-uses buffered I/O,
-and would write to the corresponding stream.
+used buffered I/O,
+and wrote to the corresponding
+.I stdio
+stream.
 In addition to the limitation that the terminal was left in
 block-buffered mode on exit
 (like System\ V
-.IR curses ),
+.IR curses "),"
 it was problematic because
 .I \%ncurses
 did not allow a reliable way to clean up on receiving
-.BR SIGTSTP .
+.IR SIGTSTP "."
 .PP
 .I \%ncurses
 .RI 6. x
 uses output buffers managed directly by
-.IR \%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
+.IR \%ncurses "."
+The lower-level functions described here
+that write to the terminal device
+do so via the standard output stream;
+they thus are not signal-safe.
+The higher-level functions in
 .I \%ncurses
-employ alternate versions of these functions using the more reliable
-buffering scheme.
+employ alternate versions of these functions
+using a more reliable buffering scheme.
 .SS "Function Prototypes"
 The X/Open Curses prototypes are based on the SVr4
 .I curses
@@ -863,7 +885,7 @@ less effectively than a later design might,
 sometimes applying it needlessly to values that are already constant,
 and in most cases overlooking parameters that normally would benefit
 from
-.IR \%const .
+.IR \%const "."
 Passing
 .IR \%const -qualified
 parameters to functions that do not declare them
@@ -873,7 +895,8 @@ On the other hand,
 \*(``writable strings\*('' are an obsolescent C language feature.
 .IP
 As an extension,
-this implementation can be configured to change the function prototypes
+.I \%ncurses
+can be configured to change the function prototypes
 to use the
 .I \%const
 keyword.
@@ -886,13 +909,14 @@ X/Open Curses prototypes
 with a fixed number of parameters,
 rather than a variable argument list.
 .IP
-This implementation uses a variable argument list,
+.I \%ncurses
+uses a variable argument list,
 but can be configured to use the fixed-parameter list.
 Portable applications should provide nine parameters after the format;
 zeroes are fine for this purpose.
 .IP
 In response to review comments by Thomas E. Dickey,
-X/Open Curses Issue 7 proposed the
+X/Open Curses Issue\ 7 proposed the
 .I \%tiparm
 function in mid-2009.
 .IP
@@ -923,7 +947,7 @@ That approach dates to the mid-1980s,
 before C was standardized.
 Since ANSI\ C (1989),
 C language standards do not require a pointer to fit in a
-.IR long ).
+.IR long ")."
 .bP
 Providing the right number of parameters for a variadic function
 such as
@@ -941,7 +965,7 @@ The
 .I \%ncurses
 library checks usage of these capabilities,
 and returns
-.B ERR
+.I ERR
 if the capability mishandles string parameters.
 But it cannot check if a calling program provides strings in the right
 places for the
@@ -960,7 +984,7 @@ is configured to use the terminal driver,
 .\" XXX: as opposed to the Unix terminal driver, termio(s)?
 as with the MinGW port,
 .bP
-.B \%setupterm
+.I \%setupterm
 interprets a missing/empty
 .I TERM
 variable as the special value \*(``unknown\*(''.
@@ -977,7 +1001,7 @@ capability,
 while the latter does not.
 A generic terminal is unsuitable for full-screen applications.
 .bP
-.B \%setupterm
+.I \%setupterm
 allows explicit use of the Microsoft Windows console driver by checking
 whether the
 .I TERM
@@ -988,9 +1012,9 @@ In SVr4,
 .I \%set_curterm
 returns an
 .IR int ","
-.B OK
+.I OK
 or
-.BR ERR "."
+.IR ERR "."
 We have chosen to implement the X/Open Curses semantics.
 .PP
 In SVr4,
@@ -1003,9 +1027,9 @@ At least one implementation of X/Open Curses
 (Solaris
 .IR \%xcurses ")"
 returns a value other than
-.B OK
+.I OK
 or
-.B ERR
+.I ERR
 from
 .IR \%tputs "."
 It instead returns the length of the string,
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 4d49d279b..29a3a3ace 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp $
-.TH curs_touch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_touch.3x,v 1.63 2025/01/19 00:51:10 tom Exp $
+.TH curs_touch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fB\%touchwin\fP,
 \fB\%touchline\fP,
@@ -77,11 +87,14 @@ call to \fB\%wrefresh\fP; otherwise they return \fBFALSE\fP.  In
 addition, \fB\%is_linetouched\fP returns \fBERR\fP if \fIline\fP is not
 valid for the given window.
 .SH RETURN VALUE
-All routines return the integer \fBERR\fP upon failure and an integer value
-other than \fBERR\fP upon successful completion, unless otherwise noted in the
-preceding routine descriptions.
+Functions returning integers return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-In this implementation
+In
+.IR \%ncurses ","
 .RS 3
 .TP 5
 \fBis_linetouched\fP
@@ -107,19 +120,34 @@ if the window pointer is null, or
 if the line number is outside the window boundaries.
 .RE
 .SH NOTES
-All of these routines except \fB\%wtouchln\fP may be macros.
+All of these functions except
+.B \%wtouchln
+may be implemented as macros.
 .SH PORTABILITY
-These functions were introduced by SVr4.
-The Solaris \fIcurses\fP header file,
-for instance, defines both an actual function and macro for each.
-The macros give the same result as the actual functions.
-SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
-that it is not
-.IR NULL ";"
-otherwise this implementation behaves the same as SVr4.
-.PP
-X/Open Curses, Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value
+except where \*(``otherwise noted\*(''
+as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 540
+.PP
+SVr4 does not check
+.I win
+to ensure that it is not a null pointer.
+.SH HISTORY
+SVr2 (1984) introduced
+.IR \%touchwin ","
+.PP
+SVr3 (1987) added
+.IR \%touchline "."
+SVr3.1 later that year supplied
+.IR \%is_linetouched ","
+.IR \%is_wintouched ","
+.IR \%untouchwin ","
+and
+.IR \%wtouchln "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X),
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 19e5d49bf..7f9d115e1 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp $
-.TH curs_trace 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_trace.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
+.TH curs_trace 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -139,7 +139,7 @@ If the file already exists, no tracing is done.
 .bP
 If tracing is not available, \fBcurses_trace\fP returns zero (0).
 .SS "Trace Parameter"
-The trace parameter is formed by OR'ing
+The trace parameter is formed by logically \*(``or\*(''-ing
 values from the list of \fBTRACE_\fIxxx\fR definitions in \fB<curses.h>\fR.
 These include:
 .TP 5
diff --git a/man/curs_util.3x b/man/curs_util.3x
index e34b76350..759607445 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,17 +28,21 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp $
-.TH curs_util 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp $
+.TH curs_util 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds ^  \(ha
+.ds ~  \(ti
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       ^  ^
+.ds       ~  ~
 .\}
 .
 .de bP
@@ -63,58 +67,83 @@ miscellaneous \fIcurses\fR utility routines
 .nf
 \fB#include <curses.h>
 .PP
-\fBconst char *unctrl(chtype \fIch\fP);
-\fBwchar_t *wunctrl(cchar_t *\fIwch\fP);
+\fBconst char * unctrl(chtype \fIch\fP);
+\fBwchar_t * wunctrl(cchar_t * \fIwch\fP);
 .PP
-\fBconst char *keyname(int \fIc\fP);
-\fBconst char *key_name(wchar_t \fIwc\fP);
+\fBconst char * keyname(int \fIc\fP);
+\fBconst char * key_name(wchar_t \fIwc\fP);
 .PP
 \fBvoid filter(void);
+\fI/* extension */
+\fBvoid nofilter(void);
 .PP
 \fBvoid use_env(bool \fIbf\fP);
+\fI/* extension */
+\fBvoid use_tioctl(bool \fIbf\fP);
 .PP
-\fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP);
-\fBWINDOW *getwin(FILE *\fIfilep\fP);
+\fBint putwin(WINDOW * \fIwin\fP, FILE * \fIfilep\fP);
+\fBWINDOW * getwin(FILE * \fIfilep\fP);
 .PP
 \fBint delay_output(int \fIms\fP);
-\fBint flushinp(void);
 .PP
-\fI/* extensions */
-\fBvoid nofilter(void);
-\fBvoid use_tioctl(bool \fIbf\fP);
+\fBint flushinp(void);
 .fi
 .SH DESCRIPTION
-.SS unctrl
-The \fBunctrl\fP routine returns a character string as a printable
-representation of the character \fIch\fP:
-.bP
-Printable characters are displayed as themselves,
-e.g.,
-a one-character string containing the key.
-.bP
-Control characters are displayed in the \fB^\fIX\fR notation.
-.bP
-Printing characters are displayed as is.
+.SS "unctrl, wunctrl"
+.B unctrl
+returns a null-terminated character string printably representing the
+.I curses
+character
+.IR ch ,
+often one that originated in keyboard input;
+see \fBgetch\fP(3X).
+.bP
+Printable characters represent themselves as a one-character string.
+.bP
+Control characters are expressed in
+.BI \*^ X
+notation,
+where
+.I X
+is the printable symbol of the control code's value plus 32
+in the ISO\ 646/\*(``ASCII\*('' character set.
 .bP
 DEL
-(character 127)
-is displayed as \fB^?\fP.
-.bP
-Values above 128 are either meta characters
-(if the screen has not been initialized,
-or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
-shown in the \fBM\-\fIX\fR notation,
-or are displayed as themselves.
-In the latter case,
-the values may not be printable;
-this follows the X/Open specification.
+(character code 127)
+is represented as
+.BR \*^? .
+.bP
+A character code greater than 127 is represented in one of two ways.
+.IP
+If the screen has not been initialized or is in meta mode
+(see \fBmeta\fP(3X)),
+it is expressed in
+.BI M- X
+notation,
+where X
+is the representation of the code's value minus 128,
+as described above.
+.IP
+If the screen is not in meta mode,
+the character code is assumed to represent itself.
+It nevertheless may not be printable;
+this is the case for character codes 128-159 in ISO\ 8859 encodings.
+.IP
+.IR \%ncurses 's
+\fB\%use_legacy_coding\fP(3X)
+function configures
+.BR \%unctrl 's
+handling of these character codes.
 .PP
-The corresponding \fBwunctrl\fP returns a printable representation of
-a complex character \fIwch\fP.
+.B \%wunctrl
+returns a null-terminated wide-character string printably representing
+the
+.I curses
+complex character
+.IR wch .
 .PP
-In both \fBunctrl\fP and \fBwunctrl\fP the attributes
-and color associated
-with the character parameter are ignored.
+Both functions ignore the atributes and color pair selection
+of their argument.
 .SS "keyname, key_name"
 The \fBkeyname\fP routine returns a character string
 corresponding to the key \fIc\fP.
@@ -213,7 +242,7 @@ After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
 \fI\%ncurses\fP modifies the last step in its computation
 of screen size as follows:
 .bP
-checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
+checks whether the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 are set to a number greater than zero.
 .bP
 for each,
@@ -302,31 +331,45 @@ The \fBflushinp\fP routine throws away any typeahead
 that has been typed by the user
 and has not yet been read by the program.
 .SH RETURN VALUE
-Except for \fBflushinp\fP,
-routines that return an integer
-return \fBERR\fP upon failure and \fBOK\fP
-(SVr4 specifies only "an integer value other than \fBERR\fP")
-upon successful completion.
+Except for
+.BR \%flushinp ","
+functions that return integers return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-Routines that return pointers return
+Functions that return pointers return
 .I NULL
 on error.
 .PP
-In this implementation
-.RS 3
-.TP 5
-\fBflushinp\fP
+In
+.IR \%ncurses ","
+.bP
+.B \%flushinp
 returns
 .B ERR
-if the terminal was not initialized.
-.TP 5
-\fBputwin\fP
+if the terminal was not initialized,
+and
+.bP
+.B \%putwin
 returns
 .B ERR
-if the associated \fIwrite\fP(2) calls return
+if its associated \fIwrite\fP(2) calls return
 .BR ERR "."
-.RE
+.SH NOTES
+.B \%wunctrl
+is part of
+.IR \%ncurses "'s"
+wide-character API,
+and is not available in its non-wide configuration.
 .SH PORTABILITY
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 542
 .SS filter
 The SVr4 documentation describes the action of \fBfilter\fP
 only in the vaguest terms.
@@ -411,8 +454,7 @@ output.
 However,
 reading from a file written using mixed schemes may not be successful.
 .SS "unctrl, wunctrl"
-X/Open Curses,
-Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
 if unsuccessful.
@@ -518,7 +560,7 @@ respectively.
 SVr4 (1989) supplied
 .IR \%use_env "."
 .PP
-X/Open Curses Issue 4 (1995) specified
+X/Open Curses Issue\ 4 (1995) specified
 .I \%key_name
 and
 .IR \%wunctrl "."
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 2c27977d2..81f97d16e 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp $
-.TH curs_variables 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
+.TH curs_variables 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,6 +104,7 @@
 \fB\%FALSE\fP,
 \fB\%ERR\fP,
 \fB\%OK\fP,
+\fB\%CCHARW_MAX\fP,
 \fB\%curscr\fP,
 \fB\%newscr\fP,
 \fB\%stdscr\fP,
@@ -133,6 +134,9 @@
 \fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;
 \fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;
 .PP
+\fI/* extension */
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP CCHARW_MAX;
+.PP
 \fI/* variables */
 \fBint COLORS;
 \fBint COLOR_PAIRS;
@@ -159,7 +163,7 @@ that provide read-only access to the library's state.
 In either case,
 applications should treat them as read-only to avoid
 confusing the library.
-.SH "CONSTANTS"
+.SH CONSTANTS
 .SS "TRUE, FALSE"
 The \fIcurses\fP library defines \fBTRUE\fP and \fBFALSE\fP
 to represent the values of the Boolean data type.
@@ -167,9 +171,20 @@ to represent the values of the Boolean data type.
 \fIcurses\fP and \fIterminfo\fP routines frequently return these
 constant integral values indicating failure and success,
 respectively.
+.SS CCHARW_MAX
+This integral value,
+an
+.I \%ncurses
+extension,
+contains the maximum number of
+.I \%wchar_t
+wide characters that can be stored in a
+.I curses
+complex character
+.IR \%cchar_t "."
 .SH "PREDEFINED TYPES"
 .SS "\fIbool\fP"
-X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
+X/Open Issue\ 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
 standards,
 each of which also defined a Boolean data type.
 The \fIcurses\fP library requires an integral type \fIbool\fP.
@@ -218,7 +233,24 @@ represents rectangular portions of the terminal screen with the
 structure type;
 see subsection \*(``Overview\*('' of \fB\%ncurses\fP(3X).
 .SH "VARIABLES"
-.SS "curscr, stdscr, newscr"
+.SS "curscr, newscr, stdscr"
+When a
+.I curses
+application calls
+\fB\%initscr\fP(3X) or \fB\%newterm\fP(3X),
+the library creates a window named
+.B \%stdscr
+that is the same size as the terminal screen
+and is the implicit window used by functions
+that interact with a window
+but do not take a parameter identifying one;
+many
+.I curses
+functions use it.
+An application need not use
+.BR \%stdscr ";"
+it might prefer to tile the display into multiple windows instead.
+.PP
 The library records updates to the terminal screen in a window named
 \fB\%curscr\fP.
 This object is referred to as the \*(``physical screen\*('' in
@@ -235,12 +267,6 @@ and
 When the screen is refreshed,
 \fIcurses\fP determines a minimal set of updates using the terminal's
 capabilities to make \fB\%curscr\fP look like \fB\%newscr\fP.
-.PP
-Once \fIcurses\fP is initialized,
-it creates a window named \fB\%stdscr\fP.
-It is the same size as the terminal screen and is the default window
-used by routines that do not take a parameter identifying one.
-Many \fIcurses\fP functions use this window.
 .SS COLORS
 Once \fIcurses\fP is initialized,
 \fB\%COLORS\fP
@@ -291,12 +317,40 @@ is configured to provide separate
 and
 .I \%tinfo
 libraries,
-most of these variables reside in the former.
+most of these symbols reside in the former.
+The
+.B bool
+data type
+is used by both.
+.SH EXTENSIONS
+The
+.B \%CCHARW_MAX
+constant,
+and
+.BR \%ESCDELAY ","
+.BR \%TABSIZE ","
+and
+.B \%newscr
+variables,
+are
+extensions,
+the first of these originating in
+.\" Solaris xcurses calls it M_CCHAR_MAX.
+.IR \%ncurses "."
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 The X/Open Curses standard documents all of the foregoing types and
-symbols except for \fB\%newscr\fP,
-\fB\%TABSIZE\fP,
-and \fB\%ESCDELAY\fP.
+symbols except for
+.BR \%CCHARW_MAX ","
+.BR \%newscr ","
+.BR \%TABSIZE ","
+and
+.BR \%ESCDELAY "."
 .PP
 X/Open Curses describes \fB\%curscr\fP only as \*(``an internal data
 structure\*('';
@@ -366,6 +420,10 @@ or to rely upon its default.
 Segmentation\*(''
 .UE
 .PP
+\fB\%getcchar\fP(3X)
+further discusses
+.BR \%CCHARW_MAX "."
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_color\fP(3X),
 \fB\%curs_opaque\fP(3X),
diff --git a/man/curs_window.3x b/man/curs_window.3x
index f8d7ba356..90d7da9db 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp $
-.TH curs_window 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp $
+.TH curs_window 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%newwin\fP,
 \fB\%delwin\fP,
@@ -159,79 +174,122 @@ The routine \fBwcursyncup\fP updates the current cursor position of all the
 ancestors of the window to reflect the current cursor position of the
 window.
 .SH RETURN VALUE
-Routines that return an integer return the integer \fBERR\fP upon failure and
-\fBOK\fP (SVr4 only specifies "an integer value other than \fBERR\fP") upon
-successful completion.
+Functions that return integers return
+.B ERR
+upon failure and
+.B OK
+upon success.
 .PP
-Routines that return pointers return
+Functions that return pointers return
 .I NULL
 on error.
 .PP
-X/Open defines no error conditions.
-In this implementation
-.TP 5
-\fBdelwin\fP
+.I \%ncurses
+defines several error conditions.
+.bP
+.B \%delwin
 returns
 .B ERR
-if the window pointer is null, or
-if the window is the parent of another window.
-.TP 5
-\fBderwin\fP
+if
+.I win
+is a null pointer,
+or if it is the parent of another window.
+.IP
+.I \%ncurses
+maintains a list of windows,
+and checks that the pointer passed to
+.B \%delwin
+is one that it created,
+returning
+.B ERR
+if it was not.
+.bP
+.B \%derwin
 returns
 .B ERR
-if the parent window pointer is null, or
-if any of its ordinates or dimensions is negative, or
-if the resulting window does not fit inside the parent window.
-.TP 5
-\fBdupwin\fP
+if
+.I orig
+is a null pointer,
+or if any of the ordinate or dimension arguments is negative,
+or if the resulting window does not fit inside the parent window.
+.bP
+.B \%dupwin
 returns
 .B ERR
-if the window pointer is null.
-.IP
-This implementation also maintains a list of windows,
-and checks that the pointer passed to \fBdelwin\fP is one that
-it created, returning an error if it was not..
-.TP 5
-\fBmvderwin\fP
+if
+.I win
+is a null pointer.
+.bP
+.B \%mvderwin
 returns
 .B ERR
-if the window pointer is null, or
-if some part of the window would be placed off-screen.
-.TP 5
-\fBmvwin\fP
+if
+.I win
+is a null pointer,
+or if any part of the window would be placed off-screen.
+.bP
+.B \%mvwin
 returns
 .B ERR
-if the window pointer is null, or
-if the window is really a pad, or
-if some part of the window would be placed off-screen.
-.TP 5
-\fBnewwin\fP
-will fail if either of its beginning ordinates is negative, or
-if either the number of lines or columns is negative.
-.TP 5
-\fBsyncok\fP
+if
+.I win
+is a null pointer,
+if
+.I win
+is a pad,
+or if any part of the window would be placed off-screen.
+.bP
+.B \%newwin
 returns
 .B ERR
-if the window pointer is null.
-.TP 5
-\fBsubwin\fP
+if any of its arguments is negative.
+.bP
+.B \%subwin
 returns
 .B ERR
-if the parent window pointer is null, or
-if any of its ordinates or dimensions is negative, or
-if the resulting window does not fit inside the parent window.
+if
+.I orig
+is a null pointer,
+or if any of the ordinate or dimension arguments is negative,
+or if the resulting window does not fit inside the parent window.
+.bP
+.B \%syncok
+returns
+.B ERR
+if
+.I win
+is a null pointer.
+.PP
+Functions that return a window pointer fail if memory allocation
+for their data structures fails.
 .PP
-The functions which return a window pointer
-may also fail if there is insufficient memory for its data structures.
-Any of these functions will fail if the screen has not been initialized,
-i.e., with \fBinitscr\fP or \fBnewterm\fP.
+All of these functions fail if the screen has not been initialized;
+see \fBinitscr\fP(3X) or \fBnewterm\fP(3X).
 .SH NOTES
-If many small changes are made to the window, the \fBwsyncup\fP option could
-degrade performance.
+.B \%syncok
+may be implemented as a macro.
 .PP
-Note that \fBsyncok\fP may be a macro.
+Calling
+.B \%syncup
+on a window and making many small changes to it
+could degrade performance.
 .SH PORTABILITY
-X/Open Curses, Issue 4 describes these functions.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for
+.IR \%delwin ","
+.IR \%derwin ","
+.IR \%dupwin ","
+.IR \%newwin ","
+.IR \%mvderwin ","
+or
+.IR \%syncok "."
+.PP
+For functions returning integers
+(except
+.IR \%delwin "),"
+SVr4 describes a successful return value only as
+\*(``an integer value other than
+.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 544
 .PP
 Regarding
 .IR \%delwin ","
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 9ab3ad0cb..8972a7ffa 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.44 2024/03/16 15:35:01 tom Exp $
-.TH form_field_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_opts.3x,v 1.47 2025/01/19 00:51:10 tom Exp $
+.TH form_field_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_field_opts\fP,
 \fBfield_opts_on\fP,
@@ -46,8 +56,8 @@ set and get field options
 \fBint field_opts_off(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
 .fi
 .SH DESCRIPTION
-The function \fBset_field_opts\fP sets all the given field's option bits (field
-option bits may be logically-OR'ed together).
+The function \fBset_field_opts\fP sets all the given field's option bits
+(field option bits may be logically \*(``or\*(''-ed together).
 .PP
 The function \fBfield_opts_on\fP turns on the given option bits, and leaves
 others alone.
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index f85c4cadf..bd5293bd0 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp $
-.TH form_field_validation 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
+.TH form_field_validation 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -174,7 +174,7 @@ trailing spaces (up to an empty field),
 or "^ *[0\-9]* *$" which is good for
 leading and trailing spaces around the digits.
 .SS TYPE_IPV4
-An Internet Protocol Version 4 address.
+An Internet Protocol Version\ 4 address.
 Required parameter:
 .bP
 none
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 35b9dd42c..0422a17fe 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
-.TH form_fieldtype 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_fieldtype.3x,v 1.51 2025/01/19 00:51:10 tom Exp $
+.TH form_fieldtype 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -121,7 +132,7 @@ argument-block structure as arguments.
 .SS link_fieldtype
 The function \fBlink_fieldtype\fP creates
 a new field type from the two given types.
-They are connected by an logical 'OR'.
+They are connected by a logical \*(``or\*(''.
 .SH RETURN VALUE
 The pointer-valued routines return NULL on error.
 They set \fBerrno\fP according to their success:
diff --git a/man/form_opts.3x b/man/form_opts.3x
index 74a36d2b3..3c92ecc6f 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
-.TH form_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_opts.3x,v 1.37 2025/01/19 00:51:10 tom Exp $
+.TH form_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_form_opts\fP,
 \fBform_opts_on\fP,
@@ -46,8 +56,8 @@ set and get form options
 \fBint form_opts_off(FORM *\fIform\fP, Field_Options \fIopts\fP);
 .fi
 .SH DESCRIPTION
-The function \fBset_form_opts\fP sets all the given form's option bits (form
-option bits may be logically-OR'ed together).
+The function \fBset_form_opts\fP sets all the given form's option bits
+(form option bits may be logically \*(``or\*(''-ed together).
 .PP
 The function \fBform_opts_on\fP turns on the given option bits, and leaves
 others alone.
diff --git a/man/infocmp.1m b/man/infocmp.1m
index f77b7a082..d1f53565b 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp $
-.TH @INFOCMP@ 1M 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp $
+.TH @INFOCMP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -352,7 +352,7 @@ the compilation time, is specifying extra \fBuse=\fP fields that are
 superfluous.
 \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
 were not needed.
-.SS "Changing Databases [\-A \f(BIdirectory\fP] [\-B \f(BIdirectory\fP]"
+.SS "Changing Databases [\-A \fIdirectory\fP] [\-B \fIdirectory\fP]"
 Like other \fI\%ncurses\fP utilities,
 \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
 You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
@@ -686,7 +686,7 @@ options are
 .I \%ncurses
 extensions.
 .SH PORTABILITY
-X/Open Curses, Issue 7 (2009) specifies
+X/Open Curses Issue\ 7 (2009) specifies
 .IR \%infocmp "."
 It does not mention options for producing descriptions in
 .I \%term\%cap
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 4be98f9e6..419f6b160 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp $
-.TH @INFOTOCAP@ 1M 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infotocap.1m,v 1.48 2025/01/19 00:51:10 tom Exp $
+.TH @INFOTOCAP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -80,8 +80,7 @@ with this program and exits with a successful status.
 .I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
-None of X/Open Curses,
-Issue 7 (2009),
+None of X/Open Curses Issue\ 7 (2009),
 SVr4,
 or NetBSD document this application.
 .SH AUTHORS
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 5966ff7e4..373302b19 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
+# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.79 2024/12/28 21:30:24 Branden.Robinson Exp $
+# $Id: man_db.renames.in,v 1.83 2025/01/19 01:00:28 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -205,6 +205,7 @@ get_wch.3x			get_wch.3ncurses
 getattr.3x			getattr.3ncurses
 getcchar.3x			getcchar.3ncurses
 getch.3x			getch.3ncurses
+getstr.3x			getstr.3ncurses
 getwin.3x			getwin.3ncurses
 getyx.3x			getyx.3ncurses
 halfdelay.3x			halfdelay.3ncurses
@@ -238,7 +239,7 @@ notimeout.3x			notimeout.3ncurses
 pnoutrefresh.3x			pnoutrefresh.3ncurses
 prefresh.3x			prefresh.3ncurses
 printw.3x			printw.3ncurses
-putp.3x			putp.3ncurses
+putp.3x				putp.3ncurses
 putwin.3x			putwin.3ncurses
 raw.3x				raw.3ncurses
 refresh.3x			refresh.3ncurses
@@ -267,6 +268,7 @@ tparm.3x			tparm.3ncurses
 tputs.3x			tputs.3ncurses
 trace.3x			trace.3ncurses
 unctrl.3x			unctrl.3ncurses
+ungetch.3x			ungetch.3ncurses
 use_default_colors.3x		use_default_colors.3ncurses
 use_env.3x			use_env.3ncurses
 use_extended_names.3x		use_extended_names.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 9c493173e..e7c4ec717 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,6 +1,6 @@
-# $Id: manhtml.aliases,v 1.42 2024/12/28 21:50:30 tom Exp $
+# $Id: manhtml.aliases,v 1.46 2025/01/19 01:13:04 tom Exp $
 #***************************************************************************
-# Copyright 2019-2023,2024 Thomas E. Dickey                                *
+# Copyright 2019-2024,2025 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -60,6 +60,7 @@ flushinp(3X)		curs_util(3X)
 get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
+getstr(3X)		curs_getstr(3X)
 getwin(3X)		curs_util(3X)
 getyx(3X)		curs_getyx(3X)
 halfdelay(3X)		curs_inopts(3X)
@@ -113,6 +114,7 @@ touchline(3X)		curs_touch(3X)
 touchwin(3X)		curs_touch(3X)
 tparm(3X)		curs_terminfo(3X)
 tputs(3X)		curs_terminfo(3X)
+ungetch(3X)		curs_util(3X)
 use_default_colors(3X)	default_colors(3X)
 use_env(3X)		curs_util(3X)
 use_extended_names(3X)	curs_extend(3X)
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index ad7fe97f3..fcb9df410 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
-.TH menu_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: menu_opts.3x,v 1.38 2025/01/19 00:51:10 tom Exp $
+.TH menu_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_menu_opts\fP,
 \fBmenu_opts_on\fP,
@@ -46,8 +56,8 @@ set and get menu options
 \fBint menu_opts_off(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
 .fi
 .SH DESCRIPTION
-The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
-option bits may be logically-OR'ed together).
+The function \fBset_menu_opts\fP sets all the given menu's option bits
+(menu option bits may be logically \*(``or\*(''-ed together).
 .PP
 The function \fBmenu_opts_on\fP turns on the given option bits, and leaves
 others alone.
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 5a86516f5..430ab6bff 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
-.TH mitem_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: mitem_opts.3x,v 1.36 2025/01/19 00:51:10 tom Exp $
+.TH mitem_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.\}
 .SH NAME
 \fBset_item_opts\fP,
 \fBitem_opts_on\fP,
@@ -46,8 +56,8 @@ set and get menu item options
 \fBint item_opts_off(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
 .fi
 .SH DESCRIPTION
-The function \fBset_item_opts\fP sets all the given item's option bits (menu
-option bits may be logically-OR'ed together).
+The function \fBset_item_opts\fP sets all the given item's option bits
+(menu option bits may be logically \*(``or\*(''-ed together).
 .PP
 The function \fBitem_opts_on\fP turns on the given option bits, and leaves
 others alone.
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 75a9fc8db..f401588a5 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp $
-.TH ncurses 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp $
+.TH ncurses 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -392,7 +392,7 @@ the information obtained thence overrides that obtained by
 .IR \%term\%info .
 An
 .I \%ncurses
-extension supports resizable terminals;
+extension supports resizable terminal displays;
 see \fB\%wresize\fP(3X).
 .PP
 If the environment variable
@@ -442,6 +442,7 @@ wc	a \fIwchar_t\fP or \fIwint_t\fP
 wch	a \fIcchar_t\fP
 win	pointer to a \fIWINDOW\fP
 pad	pointer to a \fIWINDOW\fP that is a pad
+pair	a foreground/background color pair identifier
 .TE
 .SS "Wide and Non-wide Character Configurations"
 This man page primarily surveys functions that appear in any
@@ -619,7 +620,7 @@ neither described by X/Open Curses nor present in SVr4.
 .TS
 center tab(/);
 l l .
-\f(BIcurses\fP Function Name/Man Page
+\fIcurses\fP Function Name/Man Page
 _
 COLOR_PAIR/\fBcurs_color\fP(3X)
 PAIR_NUMBER/\fBcurs_color\fP(3X)
@@ -1807,7 +1808,7 @@ You must also enable the wide-character features in the header file
 when compiling for the wide-character library
 to use the extended (wide-character) functions.
 The symbol which enables these features has changed
-since X/Open Curses, Issue 4:
+since X/Open Curses Issue\ 4:
 .bP
 Originally, the wide-character feature required the symbol
 \fB_XOPEN_SOURCE_EXTENDED\fP
@@ -1818,7 +1819,7 @@ Later, that was deemed conflicting with \fB_XOPEN_SOURCE\fP defined to 500.
 As of mid-2018,
 none of the features in this implementation require a \fB_XOPEN_SOURCE\fP
 feature greater than 600.
-However, X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+However, X/Open Curses Issue\ 7 (2009) recommends defining it to 700.
 .bP
 Alternatively, you can enable the feature by defining \fBNCURSES_WIDECHAR\fP
 with the caveat that some other header file than \fBcurses.h\fP
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 5e844bf8f..853f2846a 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
-.TH new_pair 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: new_pair.3x,v 1.49 2025/01/19 00:51:10 tom Exp $
+.TH new_pair 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -115,7 +115,8 @@ manage color pairs.
 .SS alloc_pair
 The \fBalloc_pair\fP function accepts parameters for
 foreground and background color, and
-checks if that color combination is already associated with a color pair.
+checks whether that color combination
+is already associated with a color pair.
 .bP
 If the combination already exists,
 \fBalloc_pair\fP returns the existing pair.
@@ -135,7 +136,8 @@ to the colors versus color pairs.
 .SS find_pair
 The \fBfind_pair\fP function accepts parameters for
 foreground and background color, and
-checks if that color combination is already associated with a color pair,
+checks whether that color combination
+is already associated with a color pair,
 returning the pair number if it has been allocated.
 Otherwise it returns \-1.
 .SS free_pair
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 95b2142ee..6133d1fa1 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.46 2024/03/23 20:42:29 tom Exp $
-.TH scr_dump 5 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: scr_dump.5,v 1.50 2025/01/19 00:51:10 tom Exp $
+.TH scr_dump 5 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,7 +135,7 @@ There is no standard format for
 screen dumps.
 A brief survey of the existing implementations follows.
 .SS "X/Open Curses"
-X/Open Curses, Issue 7 specifies little.
+X/Open Curses Issue\ 7 specifies little.
 It says
 (boldface emphasis added)
 .RS 3
diff --git a/man/tabs.1 b/man/tabs.1
index 30df4dd6b..8305381af 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp $
-.TH @TABS@ 1 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp $
+.TH @TABS@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -301,9 +301,9 @@ database to do so.
 .PP
 The
 .B +m
-option was documented in the POSIX Base Specifications Issue 5
+option was documented in the POSIX Base Specifications Issue\ 5
 (Unix98, 1997),
-then omitted in Issue 6
+then omitted in Issue\ 6
 (Unix03, 2004)
 without express motivation,
 though an introductory comment
@@ -331,7 +331,7 @@ While some terminals may not accept an arbitrary number of tab stops,
 attempts to set tab stops up to the right margin
 if the list thereof is sufficiently long.
 .PP
-The \*(``Rationale\*('' section of the Issue 6
+The \*(``Rationale\*('' section of the Issue\ 6
 .I tabs
 reference page
 .\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 65bf78dae..64364b823 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.154 2024/12/28 21:21:36 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.156 2025/01/19 00:51:10 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -186,7 +186,8 @@ respectively.
 X/Open Curses does not say what \*(``appropriate \fIx\fP\*('' 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,
+In all other cases,
+the character value is logically \*(``and\*(''-ed with 0x1f,
 mapping to ASCII control codes in the range 0 through 31.
 .PP
 Other escapes include
@@ -569,13 +570,15 @@ push strlen(pop)
 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
+bit operations
+(\*(``and\*('', \*(``or\*('' and exclusive \*(``or\*(''):
+\fIpush(pop() op pop())\fP
 .TP
 \fB%=\fP, \fB%>\fP, \fB%<\fP
 logical operations: \fIpush(pop() op pop())\fP
 .TP
 \fB%A\fP, \fB%O\fP
-logical AND and OR operations (for conditionals)
+logical \*(``and\*('' and \*(``or\*('' operations (for conditionals)
 .TP
 \fB%!\fP, \fB%\*~\fP
 unary operations (logical and bit complement): \fIpush(op pop())\fP
diff --git a/man/tic.1m b/man/tic.1m
index d58dfa7c1..1c60598f4 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp $
-.TH @TIC@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tic.1m,v 1.117 2025/01/19 00:51:54 tom Exp $
+.TH @TIC@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -520,13 +520,13 @@ System V does not compile entries to or read entries from your
 \fI$HOME/.terminfo\fP database unless \fI\%TERMINFO\fP is explicitly set
 to it.
 .SH PORTABILITY
-X/Open Curses, Issue 7 (2009) provides a brief description of \fBtic\fP.
+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 Tru64.
 According to its manual pages, that system also supported the \fB\-v\fP option.
 .PP
-Shortly after Issue 7 was released, Tru64 was discontinued.
+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),
 \fI\%ncurses\fP
diff --git a/man/tput.1 b/man/tput.1
index 1f0e2282f..cd89cdddf 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp $
-.TH @TPUT@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp $
+.TH @TPUT@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,7 +64,8 @@ initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP da
 .PP
 \fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP
 .SH DESCRIPTION
-\fB\%@TPUT@\fP uses the
+.B \%@TPUT@
+uses the
 .I \%term\%info
 library and database to make terminal-specific capabilities and
 information available to the shell,
@@ -84,7 +85,8 @@ When retrieving capability values,
 the result depends upon the capability's type.
 .TP 9 \" "Boolean" + 2n
 Boolean
-\fB\%@TPUT@\fP sets its exit status to
+.B \%@TPUT@
+sets its exit status to
 .B 0
 if the terminal possesses
 .IR cap-code ,
@@ -93,7 +95,8 @@ and
 if it does not.
 .TP
 numeric
-\fB\%@TPUT@\fP writes
+.B \%@TPUT@
+writes
 .IR cap-code 's
 decimal value to the standard output stream if defined
 .RB ( \-1
@@ -101,13 +104,16 @@ if it is not)
 followed by a newline.
 .TP
 string
-\fB\%@TPUT@\fP writes
+.B \%@TPUT@
+writes
 .IR cap-code 's
 value to the standard output stream if defined,
 without a trailing newline.
 .PP
 Before using a value returned on the standard output,
-the application should test \fB\%@TPUT@\fP's exit status
+the application should test
+.B \%@TPUT@ "'s"
+exit status
 to be sure it is 0;
 see section \*(``EXIT STATUS\*('' below.
 .SS Operands
@@ -116,7 +122,8 @@ an operand is a
 .IR cap-code ,
 a capability code from the terminal database,
 or a parameter thereto.
-Three others are specially recognized by \fB\%@TPUT@\fP:
+Three others are specially recognized by
+.BR \%@TPUT@ ":"
 .BR init ,
 .BR \%reset ,
 and
@@ -131,18 +138,23 @@ indicates a capability from the terminal database.
 If
 .I cap-code
 is of string type and takes parameters,
-\fB\%@TPUT@\fP interprets arguments following
+.B \%@TPUT@
+interprets arguments following
 .I cap-code
 as the parameters,
 up to the (fixed) quantity the capability requires.
 .IP
 Most parameters are numeric.
 Only a few terminal capabilities require string parameters;
-\fB\%@TPUT@\fP uses a table to decide which to pass as strings.
-Normally \fB\%@TPUT@\fP uses \fB\%tparm\fP(3X) to perform the
+.B \%@TPUT@
+uses a table to decide which to pass as strings.
+Normally
+.B \%@TPUT@
+uses \fB\%tparm\fP(3X) to perform the
 substitution.
 If no parameters are given for the capability,
-\fB\%@TPUT@\fP writes the string without performing the substitution.
+.B \%@TPUT@
+writes the string without performing the substitution.
 .TP
 .B init
 initializes the terminal.
@@ -152,7 +164,8 @@ the following occur.
 .RS
 .TP 5
 (1)
-\fB\%@TPUT@\fP retrieves the terminal's mode settings.
+.B \%@TPUT@
+retrieves the terminal's mode settings.
 It successively tests the file descriptors corresponding to
 .RS
 .bP
@@ -168,15 +181,18 @@ and
 .IP
 to obtain terminal settings.
 Having retrieved them,
-\fB\%@TPUT@\fP remembers which descriptor to use for further updates.
+.B \%@TPUT@
+remembers which descriptor to use for further updates.
 .TP
 (2)
 If the terminal dimensions cannot be obtained from the operating system,
 but the environment or terminal type database entry describes them,
-\fB\%@TPUT@\fP updates the operating system's notion of them.
+.B \%@TPUT@
+updates the operating system's notion of them.
 .TP
 (3)
-\fB\%@TPUT@\fP updates the terminal modes.
+.B \%@TPUT@
+updates the terminal modes.
 .RS
 .bP
 Any delays specified in the entry
@@ -198,10 +214,12 @@ If initialization capabilities,
 detailed in subsection \*(``Tabs and Initialization\*('' of
 \fB\%terminfo\fP(5),
 are present,
-\fB\%@TPUT@\fP writes them to the standard output stream.
+.B \%@TPUT@
+writes them to the standard output stream.
 .TP
 (5)
-\fB\%@TPUT@\fP flushes the standard output stream.
+.B \%@TPUT@
+flushes the standard output stream.
 .RE
 .IP
 If an entry lacks the information needed for an activity above,
@@ -213,7 +231,8 @@ A reset differs from initialization in two ways.
 .RS
 .TP 5
 (1)
-\fB\%@TPUT@\fP sets the the terminal modes to a \*(``sane\*('' state,
+.B \%@TPUT@
+sets the the terminal modes to a \*(``sane\*('' state,
 .RS
 .bP
 enabling canonical (\*(``cooked\*('') and echo modes,
@@ -223,14 +242,16 @@ disabling cbreak and raw modes,
 enabling newline translation,
 and
 .bP
-setting any unset special characters to their default values.
+setting any special input characters to their default values.
 .RE
 .TP 5
 (2)
 If any reset capabilities are defined for the terminal type,
-\fB\%@TPUT@\fP writes them to the output stream.
+.B \%@TPUT@
+writes them to the output stream.
 Otherwise,
-\fB\%@TPUT@\fP uses any defined initialization capabilities.
+.B \%@TPUT@
+uses any defined initialization capabilities.
 Reset capabilities are detailed in subsection
 \*(``Tabs and Initialization\*('' of \fB\%terminfo\fP(5).
 .RE
@@ -253,7 +274,8 @@ The long name is often referred to as the description field.
 .IP
 If the terminal database is present and an entry for the user's terminal
 type exists,
-\fB\%@TPUT@\fP reports its description to the standard output stream,
+.B \%@TPUT@
+reports its description to the standard output stream,
 without a trailing newline.
 See \fB\%terminfo\fP(5).
 .PP
@@ -265,9 +287,11 @@ or
 to a file will capture only part of their actions.
 Changes to the terminal modes are not affected by file descriptor
 redirection,
-since the terminal modes are altered via \fB\%ioctl\fP(2).
+since the terminal modes are altered via \fI\%ioctl\fP(2).
 .SS Aliases
-If \fB\%@TPUT@\fP is invoked via link with any of the names
+If
+.B \%@TPUT@
+is invoked via link with any of the names
 .BR clear ,
 .BR init ,
 or
@@ -277,13 +301,15 @@ operand.
 For example,
 executing a link named
 .B \%reset
-that points to \fB\%@TPUT@\fP has the same effect as
+that points to
+.B \%@TPUT@
+has the same effect as
 .RB \%\*(`` "@TPUT@ \%reset" \*(''.
 .PP
 This feature was introduced by
 .I \%ncurses
 5.2 in 2000.
-It is rarely used:
+It is rarely used.
 .TP
 .B \%clear
 is a separate program,
@@ -300,7 +326,8 @@ by the \fB\%@TSET@\fP(1) utility (also via a link named
 Besides the pseudo-capabilities
 (such as
 .BR init ),
-\fB\%@TPUT@\fP treats the
+.B \%@TPUT@
+treats the
 .B lines
 and
 .B cols
@@ -309,7 +336,8 @@ specially:
 it may call \fB\%setupterm\fP(3X) to obtain the terminal size.
 .bP
 First,
-\fB\%@TPUT@\fP attempts to obtain these capabilities from the terminal
+.B \%@TPUT@
+attempts to obtain these capabilities from the terminal
 database.
 This generally fails for terminal emulators,
 which lack a fixed window size and thus omit the capabilities.
@@ -329,7 +357,8 @@ which may override the terminal size.
 If the
 .B \-T
 option is given,
-\fB\%@TPUT@\fP ignores the environment variables by calling
+.B \%@TPUT@
+ignores the environment variables by calling
 .BR \%use_tioctl(TRUE) ,
 relying upon the operating system
 (or,
@@ -338,8 +367,11 @@ the terminal database).
 .SH OPTIONS
 .TP 9n \" "-T type" + 2n
 .B \-S
-retrieves more than one capability per invocation of \fB\%@TPUT@\fP.
-The capabilities must be passed to \fB\%@TPUT@\fP from the standard
+retrieves more than one capability per invocation of
+.BR \%@TPUT@ "."
+The capabilities must be passed to
+.B \%@TPUT@
+from the standard
 input stream instead of from the command line
 (see section \*(``EXAMPLES\*('' below).
 Only one
@@ -355,7 +387,8 @@ exit statuses
 (see section \*(``EXIT STATUS\*('' below).
 .IP
 Some capabilities use string parameters rather than numeric ones.
-\fB\%@TPUT@\fP employs a built-in table and the presence of parameters
+.B \%@TPUT@
+employs a built-in table and the presence of parameters
 in its input to decide how to interpret them,
 and whether to use \fB\%tparm\fP(3X).
 .TP
@@ -374,13 +407,16 @@ and
 are also ignored.
 .TP
 .B \-v
-causes \fB\%@TPUT@\fP to operate verbosely,
+causes
+.B \%@TPUT@
+to operate verbosely,
 reporting warnings.
 .TP
 .B \-V
 reports the version of
 .I \%ncurses
-associated with \fB\%@TPUT@\fP,
+associated with
+.BR \%@TPUT@ ","
 and exits with a successful status.
 .TP
 .B \-x
@@ -389,7 +425,9 @@ prevents
 from attempting to clear the scrollback buffer.
 .SH EXIT STATUS
 Normally,
-one should interpret \fB\%@TPUT@\fP's exit statuses as follows.
+one should interpret
+.BR \%@TPUT@ "'s"
+exit statuses as follows.
 .PP
 .if n .ne 3
 .if t .ne 2
@@ -423,15 +461,22 @@ _
 4	some operands not interpreted
 .TE
 .SH ENVIRONMENT
-\fB@TPUT@\fP reads one environment variable.
-.TP 8n \" "TERM" + 2n + adjustment for PDF
+.B \%@TPUT@
+reads up to three environment variables
+if the
+.B \-T
+option is not specified.
+.TP 9n \" "COLUMNS" + 2n
+.I COLUMNS
+specifies the width of the screen in characters.
+.TP
+.I LINES
+specifies the height of the screen in characters.
+.TP
 .I TERM
 denotes the terminal type.
 Each terminal type is distinct,
 though many are similar.
-The
-.B \-T
-option overrides its value.
 .SH FILES
 .TP
 .I @DATADIR@/tabset
@@ -442,11 +487,11 @@ compiled terminal description database
 .SH PORTABILITY
 Over time
 .I \%ncurses
-\fB\%@TPUT@\fP
+.B \%@TPUT@
 has differed from that of System\ V in two important respects,
 one now mostly historical.
 .bP
-\%\*(``\fB@TPUT@\fP
+.RB \%\*(`` @TPUT@
 .IR cap-code \*(''
 writes to the standard output,
 which need not be a terminal device.
@@ -455,12 +500,12 @@ the operands that manipulate terminal modes might not use the standard
 output.
 .IP
 System\ V
-.BR tput 's
+.IR tput 's
 .B init
 and
 .B \%reset
 operands use logic from 4.1cBSD
-.BR tset ,
+.IR tset ,
 manipulating terminal modes.
 It checks the same file descriptors
 (and
@@ -477,18 +522,21 @@ Until
 .I \%ncurses
 6.1
 (see section \*(``HISTORY\*('' below),
-\fB\%@TPUT@\fP did not modify terminal modes.
+.B \%@TPUT@
+did not modify terminal modes.
 It now employs a scheme similar to System\ V,
-using functions shared with \fB\%@TSET@\fP
+using functions shared with
+.B \%@TSET@
 (and ultimately based on 4.4BSD
-.BR tset ).
+.IR tset ).
 If it is not able to open a terminal
 (for instance,
 when run by \fIcron\fP(1)),
-\fB\%@TPUT@\fP exits with an error status.
+.B \%@TPUT@
+exits with an error status.
 .bP
 System\ V
-.B tput
+.I tput
 assumes that the type of a
 .I cap-code
 operand is numeric if all the characters of its value are decimal
@@ -502,10 +550,12 @@ Most implementations that provide support for
 .I cap-code
 operands use the \fB\%tparm\fP(3X) function to expand its parameters.
 That function expects a mixture of numeric and string parameters,
-requiring \fB\%@TPUT@\fP to know which type to use.
+requiring
+.B \%@TPUT@
+to know which type to use.
 .IP
 .I \%ncurses
-\fB\%@TPUT@\fP
+.B \%@TPUT@
 uses a table to determine the parameter types for
 the standard
 .I cap-code
@@ -520,7 +570,7 @@ An OpenBSD developer adapted the internal library function from
 .I \%ncurses
 to port NetBSD's
 .IR termcap -based
-.B tput
+.I tput
 to
 .IR \%term\%info ,
 and modified it to interpret multiple
@@ -617,7 +667,7 @@ Later,
 and in 1994,
 NetBSD added support for the parameter-substitution features.
 .PP
-IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
 (POSIX.1-2008)
 documents only the
 .BR clear ,
@@ -639,7 +689,7 @@ and
 do not correspond to terminal capabilities.
 .bP
 The
-.B tput
+.I tput
 on SVr4-based systems such as Solaris,
 IRIX64,
 and HP-UX,
@@ -653,11 +703,11 @@ A few platforms such as FreeBSD recognize
 codes rather than
 .I \%term\%info
 capability codes in their respective
-.B tput
+.I tput
 commands.
 Since 2010,
 NetBSD's
-.B tput
+.I tput
 uses
 .I \%term\%info
 codes.
@@ -684,7 +734,7 @@ Because (apparently) all
 Unix systems support the full set of capability codes,
 the reason for documenting only a few may not be apparent.
 .bP
-X/Open Curses Issue 7 documents
+X/Open Curses Issue\ 7 documents
 .B tput
 differently,
 with
@@ -693,23 +743,23 @@ and the other features used in this implementation.
 .bP
 That is,
 there are two standards for
-.BR tput :
+.IR 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 capability database.
 .bP
 While it is certainly possible to write a
-.B tput
+.I tput
 program without using
 .IR curses ,
 no system with a
 .I curses
 implementation provides a
-.B tput
+.I tput
 utility that does not also support standard
 .IR cap-codes .
 .PP
-X/Open Curses Issue 7 (2009) is the first version to document utilities.
+X/Open Curses Issue\ 7 (2009) is the first version to document utilities.
 However that part of X/Open Curses does not follow existing practice
 (that is,
 System\ V
@@ -746,7 +796,7 @@ documents exit statuses that correspond to neither
 nor X/Open Curses.
 .SH HISTORY
 Bill Joy wrote a
-.B tput
+.I tput
 command during development of 4BSD in October 1980.
 This initial version only cleared the screen,
 and did not ship with official distributions.
@@ -756,15 +806,15 @@ and did not ship with official distributions.
 .\" See Spinellis's "unix-history-repo" on GitHub.
 .PP
 System\ V developed a different
-.B tput
+.I tput
 command.
 .bP
 SVr2 (1984) provided a rudimentary
-.B tput
+.I tput
 that checked the parameter against each
 predefined capability and returned the corresponding value.
 This version of
-.B tput
+.I tput
 did not use \fB\%tparm\fP(3X) for parameterized capabilities.
 .bP
 SVr3 (1987) replaced that
@@ -780,7 +830,7 @@ operands
 incorporated the
 .B \%reset
 feature of BSD
-.B tset
+.I tset
 written by Eric Allman.
 .bP
 SVr4 (1989) added color initialization by using the
@@ -794,11 +844,11 @@ capabilities in its
 logic.
 .PP
 Keith Bostic refactored BSD
-.B tput
+.I tput
 for shipment in 4.3BSD-Tahoe (1988),
 then replaced it the next year with a new implementation based on
 System\ V
-.BR tput .
+.IR tput .
 Bostic's version similarly accepted some parameters named for
 .I \%term\%info
 (pseudo-)capabilities:
@@ -816,22 +866,23 @@ it accepted
 codes for other capabilities.
 Also,
 Bostic's BSD
-.B tput
+.I tput
 did not modify the terminal modes as the earlier BSD
-.B tset
+.I tset
 had done.
 .PP
 At the same time,
 Bostic added a shell script named \*(``clear\*('' that used
-.B tput
+.I tput
 to clear the screen.
 Both of these appeared in 4.4BSD,
 becoming the \*(``modern\*('' BSD implementation of
-.BR tput .
+.IR tput .
 .PP
 The origin of
 .I \%ncurses
-\fB\%@TPUT@\fP lies outside both System\ V and BSD,
+.B \%@TPUT@
+lies outside both System\ V and BSD,
 in Ross Ridge's
 .I \%mytinfo
 package,
@@ -841,7 +892,7 @@ in December 1992.
 Ridge's program made more sophisticated use of the terminal capabilities
 than the BSD program.
 Eric Raymond used that
-.B tput
+.I tput
 program
 (and other parts of
 .IR \%mytinfo )
@@ -856,13 +907,19 @@ were handled.
 Before
 .I \%ncurses
 6.1 (2018),
-its \fB\%@TSET@\fP and \fB\%@TPUT@\fP utilities differed.
+its
+.B \%@TSET@
+and
+.B \%@TPUT@
+utilities differed.
 .bP
-\fB\%@TSET@\fP was more effective,
-resetting the terminal modes and special characters.
+.B \%@TSET@
+was more effective,
+resetting the terminal's modes and special input characters.
 .bP
 On the other hand,
-\fB\%@TSET@\fP's repertoire of terminal capabilities for resetting the
+.BR \%@TSET@ "'s"
+repertoire of terminal capabilities for resetting the
 terminal was more limited;
 it had only equivalents of
 .B \%reset_1string
@@ -872,12 +929,15 @@ it had only equivalents of
 and
 .B \%reset_file
 .RB ( rf ),
-and not the tab stop and margin update features of \fB\%@TPUT@\fP.
+and not the tab stop and margin update features of
+.BR \%@TPUT@ "."
 .PP
 The
-.B \%reset
-program is traditionally an alias for \fB\%@TSET@\fP due to its ability
-to reset terminal modes and special characters.
+.I \%reset
+program is traditionally an alias for
+.B \%@TSET@
+due to its ability
+to reset the terminal's modes and special input characters.
 .PP
 As of
 .I \%ncurses
@@ -886,7 +946,9 @@ the \*(``reset\*('' features of the two programs are (mostly) the same.
 Two minor differences remain.
 .bP
 When issuing a reset,
-the \fB\%@TSET@\fP program
+the
+.B \%@TSET@
+program
 checks whether the device appears to be a pseudoterminal
 (as might be used by a terminal emulator program),
 and,
@@ -896,8 +958,11 @@ waits one second in case it is communicating with a hardware terminal.
 The two programs write the terminal initialization strings
 to different streams;
 that is,
-standard error for \fB\%@TSET@\fP and
-standard output for \fB\%@TPUT@\fP.
+standard error for
+.B \%@TSET@
+and
+standard output for
+.BR \%@TPUT@ "."
 .SH EXAMPLES
 .TP
 .B "@TPUT@ init"
diff --git a/man/tset.1 b/man/tset.1
index a30456b7e..3e7b0fc10 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp $
-.TH @TSET@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.94 2025/01/19 00:51:54 tom Exp $
+.TH @TSET@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -141,7 +141,7 @@ turns off cbreak and raw modes,
 .bP
 turns on newline translation and
 .bP
-resets any unset special characters to their default values
+resets special input characters to their default values
 .PP
 before
 doing the terminal initialization described above.
@@ -319,9 +319,9 @@ system port name to terminal type mapping database (BSD versions only).
 .I @TERMINFO@
 compiled terminal description database directory
 .SH PORTABILITY
-Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+Neither IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
 (POSIX.1-2008) nor
-X/Open Curses Issue 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
+X/Open Curses Issue\ 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
 .PP
 The AT&T \fBtput\fP utility (AIX, HP-UX, Solaris)
 incorporated the terminal-mode manipulation as well as termcap-based features
diff --git a/man/wresize.3x b/man/wresize.3x
index 4e50589b7..2e22d2fb4 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1996
 .\"
-.\" $Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp $
-.TH wresize 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: wresize.3x,v 1.47 2025/01/19 00:51:54 tom Exp $
+.TH wresize 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
@@ -56,7 +56,7 @@ and
 If either dimension is larger than its current value,
 .I \%ncurses
 fills the expanded part of the window
-with the background character and rendition configured by
+with the window's background character as configured by
 \fB\%wbkgdset\fP(3X)
 (wide-character API: \fB\%wbkgrndset\fP(3X)).
 .SH RETURN VALUE
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index 342d6ed8e..c4198d135 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.154 2024/12/14 23:49:54 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.155 2025/01/18 14:47:35 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -248,7 +248,7 @@ init_color_table(NCURSES_SP_DCL0)
 static bool
 init_direct_colors(NCURSES_SP_DCL0)
 {
-    static NCURSES_CONST char name[] = "RGB";
+    static NCURSES_CONST char name[] = UserCap(RGB);
 
     rgb_bits_t *result = &(SP_PARM->_direct_color);
 
diff --git a/ncurses/base/lib_dft_fgbg.c b/ncurses/base/lib_dft_fgbg.c
index 99b70b0b1..d6cf303af 100644
--- a/ncurses/base/lib_dft_fgbg.c
+++ b/ncurses/base/lib_dft_fgbg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.32 2024/12/07 20:00:48 tom Exp $")
+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.33 2025/01/18 14:47:35 tom Exp $")
 
 /*
  * Modify the behavior of color-pair 0 so that the library doesn't assume that
@@ -76,7 +76,7 @@ NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg)
 	if ((orig_pair || orig_colors) && !initialize_pair) {
 
 	    SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
-	    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
+	    SP_PARM->_has_sgr_39_49 = (tigetflag(UserCap(AX)) == TRUE);
 	    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
 	    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
 	    if (SP_PARM->_color_pairs != NULL) {
diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index 6730c55d9..8e7d6dc05 100644
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -42,7 +42,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getstr.c,v 1.40 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.42 2025/01/19 00:51:54 tom Exp $")
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
@@ -85,7 +85,7 @@ wgetnstr_events(WINDOW *win,
     int ch;
     int y, x;
 
-    T((T_CALLED("wgetnstr(%p,%p,%d)"), (void *) win, (void *) str, maxlen));
+    T((T_CALLED("wgetnstr_events(%p,%p,%d)"), (void *) win, (void *) str, maxlen));
 
     if (!win || !str)
 	returnCode(ERR);
@@ -195,7 +195,7 @@ wgetnstr_events(WINDOW *win,
     if (ch == ERR)
 	returnCode(ch);
 
-    T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
+    T(("wgetnstr_events returns %s", _nc_visbuf(oldstr)));
 
 #ifdef KEY_EVENT
     if (ch == KEY_EVENT)
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index f9b3b67d3..f56154ab5 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.203 2024/12/07 17:40:33 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.205 2025/01/18 15:01:47 tom Exp $")
 
 #include <tic.h>
 
@@ -388,7 +388,7 @@ init_xterm_mouse(SCREEN *sp)
 {
     sp->_mouse_type = M_XTERM;
     sp->_mouse_format = MF_X10;
-    sp->_mouse_xtermcap = tigetstr("XM");
+    sp->_mouse_xtermcap = tigetstr(UserCap(XM));
     if (VALID_STRING(sp->_mouse_xtermcap)) {
 	char *code = strstr(sp->_mouse_xtermcap, "[?");
 	if (code != NULL) {
@@ -417,7 +417,7 @@ init_xterm_mouse(SCREEN *sp)
 	    }
 	}
     } else {
-	int code = tigetnum("XM");
+	int code = tigetnum(UserCap(XM));
 	switch (code) {
 #ifdef EXP_XTERM_1005
 	case 1005:
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index ad1b709f0..fcc54cb02 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.699 2025/01/12 00:41:56 tom Exp $
+ * $Id: curses.priv.h,v 1.700 2025/01/18 14:41:58 tom Exp $
  *
  *	curses.priv.h
  *
@@ -367,6 +367,12 @@ typedef TRIES {
 
 #define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~"
 
+/*
+ * To make them easier to find, user-defined capabilities used within ncurses
+ * should be tagged with this macro:
+ */
+#define UserCap(name) #name
+
 /*
  * Structure for palette tables
  */
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index f9f7d4c49..efbd41e18 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.105 2024/12/07 21:12:53 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.106 2025/01/12 10:51:43 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -1028,7 +1028,7 @@ main(int argc, char *argv[])
 	char buf[BUFSIZ];
 
 	++curr_line;
-	if (fgets(buf, sizeof(buf), stdin) == 0)
+	if (fgets(buf, sizeof(buf), stdin) == NULL)
 	    break;
 	buf[strlen(buf) - 1] = '\0';
 	_nc_set_source(buf);
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 3782e091d..8fad8ee09 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.248 2024/12/15 00:12:19 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.249 2025/01/18 14:47:35 tom Exp $")
 
 /****************************************************************************
  *
@@ -797,7 +797,7 @@ _nc_locale_breaks_acs(TERMINAL *termp)
     T((T_CALLED("_nc_locale_breaks_acs:%d"), result));
     if (getenv(env_name) != NULL) {
 	result = _nc_getenv_num(env_name);
-    } else if ((value = tigetnum("U8")) >= 0) {
+    } else if ((value = tigetnum(UserCap(U8))) >= 0) {
 	result = value;		/* use extension feature */
     } else if ((env = getenv("TERM")) != NULL) {
 	if (strstr(env, "linux")) {
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 2e175cb50..83ac9e8d6 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.155 2024/12/07 18:26:59 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
 
 /*
  *	char *
@@ -1128,11 +1128,11 @@ check_string_caps(const TPARM_DATA *data, const char *string)
 	else {
 	    const char *check;
 
-	    check = tigetstr("Cs");
+	    check = tigetstr(UserCap(Cs));
 	    if (CHECK_CAP(check))
 		want_type = 1;	/* style #1 */
 
-	    check = tigetstr("Ms");
+	    check = tigetstr(UserCap(Ms));
 	    if (CHECK_CAP(check))
 		want_type = 3;	/* storage unit #1, content #2 */
 	}
@@ -1356,11 +1356,11 @@ _nc_tiparm(int expected, const char *string, ...)
 	    else {
 		const char *check;
 
-		check = tigetstr("xm");
+		check = tigetstr(UserCap(xm));
 		if (CHECK_CAP(check)) {
 		    needed = 3;
 		}
-		check = tigetstr("S0");
+		check = tigetstr(UserCap(S0));
 		if (CHECK_CAP(check)) {
 		    needed = 0;	/* used in screen-base */
 		}
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index e0e0dd533..8281d5050 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.77 2024/12/15 00:23:20 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.78 2025/01/18 14:47:35 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -327,7 +327,7 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg)
 #if NCURSES_EXT_FUNCS
 	sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
 	sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx
-							  "AX")
+							  UserCap(AX))
 			      == TRUE);
 	sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
 	sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
@@ -907,7 +907,7 @@ static void
 init_xterm_mouse(SCREEN *sp)
 {
     sp->_mouse_type = M_XTERM;
-    sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx "XM");
+    sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx UserCap(XM));
     if (!VALID_STRING(sp->_mouse_xtermcap))
 	sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;";
 }
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 2f50761cb..9a0432126 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.59 2024/12/07 20:06:49 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.60 2025/01/12 10:51:43 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -371,7 +371,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	do {
 	    oldnums[n++] = atoi(st);
 	} while
-	    ((st = strtok((char *) NULL, " ")) != 0);
+	    ((st = strtok((char *) NULL, " ")) != NULL);
 
 	/* display it */
 	(void) fputs("Initial input:\n", stderr);
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 76d590433..0ee47de51 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -74,7 +74,7 @@ AUTHOR
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: hashmap.c,v 1.73 2024/12/07 17:18:07 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.74 2025/01/12 10:51:43 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -532,7 +532,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	    do {
 		oldnums[n++] = atoi(st);
 	    } while
-		((st = strtok((char *) NULL, " ")) != 0);
+		((st = strtok((char *) NULL, " ")) != NULL);
 	    break;
 
 	case 'n':		/* use following letters as text of new lines */
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index d026290b5..df6090bbc 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.163 2024/12/15 00:04:06 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.164 2025/01/12 10:51:43 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -948,8 +948,8 @@ onscreen_mvcur(NCURSES_SP_DCLx
   nonlocal:
 #if defined(MAIN) || defined(NCURSES_TEST)
     gettimeofday(&after, NULL);
-    diff = after.tv_usec - before.tv_usec
-	+ (after.tv_sec - before.tv_sec) * 1000000;
+    diff = (float) (after.tv_usec - before.tv_usec
+		    + (after.tv_sec - before.tv_sec) * 1000000);
     if (!profiling)
 	(void) fprintf(stderr,
 		       "onscreen: %d microsec, %f 28.8Kbps char-equivalents\n",
@@ -1227,7 +1227,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 	if (fputs("> ", stdout) == EOF)
 	    break;
-	if (fgets(buf, sizeof(buf), stdin) == 0)
+	if (fgets(buf, sizeof(buf), stdin) == NULL)
 	    break;
 
 #define PUTS(s)   (void) puts(s)
@@ -1307,7 +1307,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	} else if (buf[0] == 'i') {
 	    dump_init(NULL, F_TERMINFO, S_TERMINFO,
 		      FALSE, 70, 0, 0, FALSE, FALSE, 0);
-	    dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, 0);
+	    dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, NULL);
 	    putchar('\n');
 	} else if (buf[0] == 'o') {
 	    if (_nc_optimize_enable & OPTIMIZE_MVCUR) {
diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c
index a2a12be3a..b72c2c8ba 100644
--- a/ncurses/widechar/lib_add_wch.c
+++ b/ncurses/widechar/lib_add_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2004-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <wctype.h>
 #endif
 
-MODULE_ID("$Id: lib_add_wch.c,v 1.20 2024/12/07 18:00:11 tom Exp $")
+MODULE_ID("$Id: lib_add_wch.c,v 1.22 2025/01/19 00:51:54 tom Exp $")
 
 /* clone/adapt lib_addch.c */
 static const cchar_t blankchar = NewChar(BLANK_TEXT);
@@ -434,7 +434,7 @@ wecho_wchar(WINDOW *win, const cchar_t *wch)
 {
     int code = ERR;
 
-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"),
+    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wecho_wchar(%p, %s)"),
 				      (void *) win,
 				      _tracecchar_t(wch)));
 
diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index d081e02c8..5f82c2eff 100644
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2024 Thomas E. Dickey                                     *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,13 +34,13 @@
 /*
 **	lib_inwstr.c
 **
-**	The routines winnwstr() and winwstr().
+**	The routine winnwstr().
 **
 */
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.12 2024/12/07 18:03:14 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.14 2025/01/19 00:51:54 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
@@ -57,6 +57,9 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
 
 	    getyx(win, row, col);
 
+	    if (n < 0)
+		n = CCHARW_MAX * (win->_maxx - win->_curx + 1);
+
 	    text = win->_line[row].text;
 	    while (count < n && !done && count != ERR) {
 
@@ -92,16 +95,3 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
     }
     returnCode(count);
 }
-
-NCURSES_EXPORT(int)
-winwstr(WINDOW *win, wchar_t *wstr)
-{
-    int result = ERR;
-
-    T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
-    if (win != NULL) {
-	result = winnwstr(win, wstr,
-			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
-    }
-    returnCode(result);
-}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 73cbed3da..cadc7a9ed 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250111) unstable; urgency=low
+ncurses6td (6.5+20250118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 73cbed3da..cadc7a9ed 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250111) unstable; urgency=low
+ncurses6td (6.5+20250118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 8059f1d07..bb2eb4761 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250111) unstable; urgency=low
+ncurses6td (6.5+20250118) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2025 07:30:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 817c1c859..7d181ba6e 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.684 2025/01/11 12:30:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.685 2025/01/12 11:23:10 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0111"
+!define VERSION_MMDD  "0118"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1af6f7873..b248647d7 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250111
+Release: 20250118
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 6bee8514d..9ebaba7e9 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250111
+Release: 20250118
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 47e4051bd..40ace6f3a 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250111
+Release: 20250118
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/clear_cmd.c b/progs/clear_cmd.c
index 3d80515c2..b174d96e6 100644
--- a/progs/clear_cmd.c
+++ b/progs/clear_cmd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018,2020,2025 Thomas E. Dickey                                *
  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 #define USE_LIBTINFO
 #include <clear_cmd.h>
 
-MODULE_ID("$Id: clear_cmd.c,v 1.5 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: clear_cmd.c,v 1.6 2025/01/18 14:51:58 tom Exp $")
 
 static int
 putch(int c)
@@ -52,7 +52,7 @@ clear_cmd(bool legacy)
     int retval = tputs(clear_screen, lines > 0 ? lines : 1, putch);
     if (!legacy) {
 	/* Clear the scrollback buffer if possible. */
-	char *E3 = tigetstr("E3");
+	char *E3 = tigetstr(UserCap(E3));
 	if (E3)
 	    (void) tputs(E3, lines > 0 ? lines : 1, putch);
     }
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index c5415799c..0eb429649 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
+dnl Copyright 2018-2024,2025 Thomas E. Dickey                                *
 dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.231 2024/12/21 15:24:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.232 2025/01/12 18:41:15 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -2788,7 +2788,7 @@ printf("old\\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37
+dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
@@ -2849,6 +2849,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
 			;;
 		esac
 
+		CF_REQUIRE_PKG($cf_ncuconfig_root)
 		CF_APPEND_CFLAGS($cf_pkg_cflags)
 		CF_ADD_LIBS($cf_pkg_libs)
 
@@ -3648,6 +3649,30 @@ $1=`echo "$2" | \
 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
+dnl --------------
+dnl Update $REQUIRE_PKG, which lists the known required packages for this
+dnl program.
+dnl
+dnl $1 = package(s) to require, e.g., in the generated ".pc" file
+define([CF_REQUIRE_PKG],
+[
+for cf_required in $1
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+AC_SUBST(REQUIRE_PKG)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
 dnl ---------------------
 dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
@@ -4060,7 +4085,7 @@ AC_DEFUN([CF_TRIM_X_LIBS],[
 	done
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15
+dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54
 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
@@ -4077,6 +4102,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"
 	CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
 	CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
+	CF_REQUIRE_PKG($1)
 	CF_ADD_CFLAGS($cf_pkgconfig_incs)
 	CF_ADD_LIBS($cf_pkgconfig_libs)
 	ifelse([$2],,:,[$2])
@@ -4293,7 +4319,7 @@ AC_MSG_RESULT([$]$1)
 AC_SUBST($1)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06
+dnl CF_WITH_NCURSES_ETC version: 7 updated: 2025/01/12 13:41:15
 dnl -------------------
 dnl Use this macro for programs which use any variant of "curses", e.g.,
 dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
@@ -4344,7 +4370,7 @@ case $cf_cv_screen in
 (ncurses*)
 	CF_NCURSES_CONFIG($cf_cv_screen)
 	;;
-(pdcurses)
+(pdcurses*)
 	CF_PDCURSES_X11
 	;;
 (*)
diff --git a/test/configure b/test/configure
index b8d3f4390..194fe2316 100755
--- a/test/configure
+++ b/test/configure
@@ -8816,6 +8816,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			;;
 		esac
 
+for cf_required in $cf_ncuconfig_root
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+
 for cf_add_cflags in $cf_pkg_cflags
 do
 	case "x$cf_add_cflags" in
@@ -8959,7 +8973,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8962 "configure"
+#line 8976 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -8971,37 +8985,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8977: \$? = $ac_status" >&5
+  echo "$as_me:8991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8983: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8989 "configure"
+#line 9003 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8999: \$? = $ac_status" >&5
+  echo "$as_me:9013: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9004: \$? = $ac_status" >&5
+  echo "$as_me:9018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -9018,7 +9032,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:9021: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:9035: 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"
@@ -9034,7 +9048,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:9037: checking for terminfo header" >&5
+echo "$as_me:9051: 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
@@ -9052,7 +9066,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9055 "configure"
+#line 9069 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -9067,16 +9081,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9073: \$? = $ac_status" >&5
+  echo "$as_me:9087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9079: \$? = $ac_status" >&5
+  echo "$as_me:9093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9092,7 +9106,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9095: result: $cf_cv_term_header" >&5
+echo "$as_me:9109: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9127,7 +9141,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:9130: result: no" >&5
+		echo "$as_me:9144: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -9143,7 +9157,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:9146: checking for $ac_word" >&5
+echo "$as_me:9160: 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
@@ -9158,7 +9172,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:9161: found $ac_dir/$ac_word" >&5
+echo "$as_me:9175: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9166,10 +9180,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9169: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9183: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9172: result: no" >&5
+  echo "$as_me:9186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9182,7 +9196,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:9185: checking for $ac_word" >&5
+echo "$as_me:9199: 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
@@ -9197,7 +9211,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:9200: found $ac_dir/$ac_word" >&5
+echo "$as_me:9214: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9205,10 +9219,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:9208: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9222: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9211: result: no" >&5
+  echo "$as_me:9225: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9365,7 +9379,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:9368: checking if we have identified curses headers" >&5
+echo "$as_me:9382: 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
@@ -9377,7 +9391,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9380 "configure"
+#line 9394 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9389,16 +9403,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9395: \$? = $ac_status" >&5
+  echo "$as_me:9409: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9401: \$? = $ac_status" >&5
+  echo "$as_me:9415: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9409,11 +9423,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:9412: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9426: 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:9416: error: No curses header-files found" >&5
+	{ { echo "$as_me:9430: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9423,23 +9437,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9426: checking for $ac_header" >&5
+echo "$as_me:9440: 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 9432 "configure"
+#line 9446 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9436: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9450: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9442: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9458,7 +9472,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9475: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -9514,7 +9528,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9517 "configure"
+#line 9531 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9526,16 +9540,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9532: \$? = $ac_status" >&5
+  echo "$as_me:9546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9538: \$? = $ac_status" >&5
+  echo "$as_me:9552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9552,7 +9566,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9555: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9569: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9571,7 +9585,7 @@ fi
 
 }
 
-echo "$as_me:9574: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9588: 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
@@ -9583,7 +9597,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9586 "configure"
+#line 9600 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9607,16 +9621,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9613: \$? = $ac_status" >&5
+  echo "$as_me:9627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9619: \$? = $ac_status" >&5
+  echo "$as_me:9633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9631,14 +9645,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:9634: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9648: 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:9641: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9655: 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
@@ -9759,7 +9773,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9762 "configure"
+#line 9776 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9771,16 +9785,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9777: \$? = $ac_status" >&5
+  echo "$as_me:9791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9783: \$? = $ac_status" >&5
+  echo "$as_me:9797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9797,7 +9811,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9800: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9814: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9820,7 +9834,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9823 "configure"
+#line 9837 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9844,16 +9858,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9850: \$? = $ac_status" >&5
+  echo "$as_me:9864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9856: \$? = $ac_status" >&5
+  echo "$as_me:9870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9874,12 +9888,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9877: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9891: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9882: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9896: 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%/[^/]*$%%'`
@@ -9915,7 +9929,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9918 "configure"
+#line 9932 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9927,16 +9941,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  echo "$as_me:9947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9939: \$? = $ac_status" >&5
+  echo "$as_me:9953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9953,7 +9967,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9956: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9970: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10001,7 +10015,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10004: checking for terminfo header" >&5
+echo "$as_me:10018: 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
@@ -10019,7 +10033,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10022 "configure"
+#line 10036 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -10034,16 +10048,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10040: \$? = $ac_status" >&5
+  echo "$as_me:10054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10046: \$? = $ac_status" >&5
+  echo "$as_me:10060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10059,7 +10073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:10062: result: $cf_cv_term_header" >&5
+echo "$as_me:10076: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10097,7 +10111,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:10100: checking for ncurses version" >&5
+echo "$as_me:10114: 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
@@ -10123,10 +10137,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10126: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10140: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10129: \$? = $ac_status" >&5
+  echo "$as_me:10143: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -10136,7 +10150,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10139 "configure"
+#line 10153 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10163,15 +10177,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10169: \$? = $ac_status" >&5
+  echo "$as_me:10183: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10174: \$? = $ac_status" >&5
+  echo "$as_me:10188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10185,7 +10199,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:10188: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10202: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -10198,7 +10212,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10201: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10215: 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
@@ -10206,7 +10220,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10209 "configure"
+#line 10223 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10225,16 +10239,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10231: \$? = $ac_status" >&5
+  echo "$as_me:10245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10237: \$? = $ac_status" >&5
+  echo "$as_me:10251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10245,10 +10259,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10248: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10262: 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:10251: checking for initscr in -lgpm" >&5
+  echo "$as_me:10265: 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
@@ -10256,7 +10270,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10259 "configure"
+#line 10273 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10275,16 +10289,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10278: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10281: \$? = $ac_status" >&5
+  echo "$as_me:10295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10287: \$? = $ac_status" >&5
+  echo "$as_me:10301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10295,7 +10309,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10298: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10312: 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"
@@ -10310,7 +10324,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10313: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10327: 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
@@ -10318,7 +10332,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10321 "configure"
+#line 10335 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10337,16 +10351,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10343: \$? = $ac_status" >&5
+  echo "$as_me:10357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10349: \$? = $ac_status" >&5
+  echo "$as_me:10363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10357,7 +10371,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10360: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10374: 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"
@@ -10406,13 +10420,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:10409: checking for initscr" >&5
+	echo "$as_me:10423: 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 10415 "configure"
+#line 10429 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10443,16 +10457,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10449: \$? = $ac_status" >&5
+  echo "$as_me:10463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10455: \$? = $ac_status" >&5
+  echo "$as_me:10469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10462,18 +10476,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10465: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10479: 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:10472: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10486: 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 10476 "configure"
+#line 10490 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10485,25 +10499,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10491: \$? = $ac_status" >&5
+  echo "$as_me:10505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10497: \$? = $ac_status" >&5
+  echo "$as_me:10511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10499: result: yes" >&5
+  echo "$as_me:10513: 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:10506: result: no" >&5
+echo "$as_me:10520: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10571,11 +10585,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10574: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10588: 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 10578 "configure"
+#line 10592 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10587,25 +10601,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10593: \$? = $ac_status" >&5
+  echo "$as_me:10607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10599: \$? = $ac_status" >&5
+  echo "$as_me:10613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10601: result: yes" >&5
+  echo "$as_me:10615: 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:10608: result: no" >&5
+echo "$as_me:10622: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10620,7 +10634,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:10623: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10637: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10628,7 +10642,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10631: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10645: 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
@@ -10638,7 +10652,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10641 "configure"
+#line 10655 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10650,23 +10664,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10662: \$? = $ac_status" >&5
+  echo "$as_me:10676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:10664: result: yes" >&5
+  echo "$as_me:10678: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:10669: result: no" >&5
+echo "$as_me:10683: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10691,13 +10705,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:10694: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:10708: 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:10697: result: yes" >&5
+		echo "$as_me:10711: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:10700: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:10714: 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
 
@@ -10830,7 +10844,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10833 "configure"
+#line 10847 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -10842,37 +10856,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10848: \$? = $ac_status" >&5
+  echo "$as_me:10862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10854: \$? = $ac_status" >&5
+  echo "$as_me:10868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10860 "configure"
+#line 10874 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10870: \$? = $ac_status" >&5
+  echo "$as_me:10884: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10875: \$? = $ac_status" >&5
+  echo "$as_me:10889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -10903,6 +10917,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			;;
 		esac
 
+for cf_required in $cf_ncuconfig_root
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
+
 for cf_add_cflags in $cf_pkg_cflags
 do
 	case "x$cf_add_cflags" in
@@ -11046,7 +11074,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11049 "configure"
+#line 11077 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -11058,37 +11086,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11070: \$? = $ac_status" >&5
+  echo "$as_me:11098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11076 "configure"
+#line 11104 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:11083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11086: \$? = $ac_status" >&5
+  echo "$as_me:11114: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:11088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11091: \$? = $ac_status" >&5
+  echo "$as_me:11119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -11105,7 +11133,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:11108: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:11136: 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"
@@ -11121,7 +11149,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:11124: checking for terminfo header" >&5
+echo "$as_me:11152: 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
@@ -11139,7 +11167,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11142 "configure"
+#line 11170 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -11154,16 +11182,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11160: \$? = $ac_status" >&5
+  echo "$as_me:11188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11166: \$? = $ac_status" >&5
+  echo "$as_me:11194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11179,7 +11207,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11182: result: $cf_cv_term_header" >&5
+echo "$as_me:11210: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11214,7 +11242,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:11217: result: no" >&5
+		echo "$as_me:11245: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -11230,7 +11258,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:11233: checking for $ac_word" >&5
+echo "$as_me:11261: 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
@@ -11245,7 +11273,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:11248: found $ac_dir/$ac_word" >&5
+echo "$as_me:11276: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11253,10 +11281,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:11256: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:11284: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11259: result: no" >&5
+  echo "$as_me:11287: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11269,7 +11297,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:11272: checking for $ac_word" >&5
+echo "$as_me:11300: 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
@@ -11284,7 +11312,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:11287: found $ac_dir/$ac_word" >&5
+echo "$as_me:11315: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11292,10 +11320,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:11295: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:11323: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:11298: result: no" >&5
+  echo "$as_me:11326: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11452,7 +11480,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:11455: checking if we have identified curses headers" >&5
+echo "$as_me:11483: 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
@@ -11464,7 +11492,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11467 "configure"
+#line 11495 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -11476,16 +11504,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11482: \$? = $ac_status" >&5
+  echo "$as_me:11510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11488: \$? = $ac_status" >&5
+  echo "$as_me:11516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -11496,11 +11524,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:11499: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:11527: 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:11503: error: No curses header-files found" >&5
+	{ { echo "$as_me:11531: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11510,23 +11538,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11513: checking for $ac_header" >&5
+echo "$as_me:11541: 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 11519 "configure"
+#line 11547 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11551: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$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:11557: \$? = $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 +11573,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11576: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -11601,7 +11629,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11604 "configure"
+#line 11632 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11613,16 +11641,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11619: \$? = $ac_status" >&5
+  echo "$as_me:11647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11625: \$? = $ac_status" >&5
+  echo "$as_me:11653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11639,7 +11667,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11642: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11670: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11658,7 +11686,7 @@ fi
 
 }
 
-echo "$as_me:11661: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11689: 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
@@ -11670,7 +11698,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11673 "configure"
+#line 11701 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11694,16 +11722,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11697: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11700: \$? = $ac_status" >&5
+  echo "$as_me:11728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11706: \$? = $ac_status" >&5
+  echo "$as_me:11734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11718,14 +11746,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:11721: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11749: 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:11728: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11756: 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
@@ -11846,7 +11874,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11849 "configure"
+#line 11877 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11858,16 +11886,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11864: \$? = $ac_status" >&5
+  echo "$as_me:11892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11870: \$? = $ac_status" >&5
+  echo "$as_me:11898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11884,7 +11912,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11887: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11915: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11907,7 +11935,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11910 "configure"
+#line 11938 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11931,16 +11959,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11937: \$? = $ac_status" >&5
+  echo "$as_me:11965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11943: \$? = $ac_status" >&5
+  echo "$as_me:11971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11961,12 +11989,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11964: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11992: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11969: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11997: 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%/[^/]*$%%'`
@@ -12002,7 +12030,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 12005 "configure"
+#line 12033 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12014,16 +12042,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12020: \$? = $ac_status" >&5
+  echo "$as_me:12048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12026: \$? = $ac_status" >&5
+  echo "$as_me:12054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12040,7 +12068,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12071: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12088,7 +12116,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:12091: checking for terminfo header" >&5
+echo "$as_me:12119: 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
@@ -12106,7 +12134,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12109 "configure"
+#line 12137 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -12121,16 +12149,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12127: \$? = $ac_status" >&5
+  echo "$as_me:12155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12133: \$? = $ac_status" >&5
+  echo "$as_me:12161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12146,7 +12174,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:12149: result: $cf_cv_term_header" >&5
+echo "$as_me:12177: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12184,7 +12212,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:12187: checking for ncurses version" >&5
+echo "$as_me:12215: 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
@@ -12210,10 +12238,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12213: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12241: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12216: \$? = $ac_status" >&5
+  echo "$as_me:12244: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -12223,7 +12251,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12226 "configure"
+#line 12254 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12250,15 +12278,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12256: \$? = $ac_status" >&5
+  echo "$as_me:12284: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12261: \$? = $ac_status" >&5
+  echo "$as_me:12289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12272,7 +12300,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:12275: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12303: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -12285,7 +12313,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12288: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12316: 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
@@ -12293,7 +12321,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12296 "configure"
+#line 12324 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12312,16 +12340,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12346: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12324: \$? = $ac_status" >&5
+  echo "$as_me:12352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12332,10 +12360,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12335: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12363: 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:12338: checking for initscr in -lgpm" >&5
+  echo "$as_me:12366: 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
@@ -12343,7 +12371,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12346 "configure"
+#line 12374 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12362,16 +12390,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12368: \$? = $ac_status" >&5
+  echo "$as_me:12396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12374: \$? = $ac_status" >&5
+  echo "$as_me:12402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12382,7 +12410,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12385: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12413: 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"
@@ -12397,7 +12425,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12400: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12428: 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
@@ -12405,7 +12433,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12408 "configure"
+#line 12436 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12424,16 +12452,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12430: \$? = $ac_status" >&5
+  echo "$as_me:12458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12436: \$? = $ac_status" >&5
+  echo "$as_me:12464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12444,7 +12472,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12447: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12475: 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"
@@ -12493,13 +12521,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:12496: checking for initscr" >&5
+	echo "$as_me:12524: 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 12502 "configure"
+#line 12530 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12530,16 +12558,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:12564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12542: \$? = $ac_status" >&5
+  echo "$as_me:12570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12549,18 +12577,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12552: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12580: 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:12559: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12587: 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 12563 "configure"
+#line 12591 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12572,25 +12600,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12584: \$? = $ac_status" >&5
+  echo "$as_me:12612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12586: result: yes" >&5
+  echo "$as_me:12614: 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:12593: result: no" >&5
+echo "$as_me:12621: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -12658,11 +12686,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12661: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12689: 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 12665 "configure"
+#line 12693 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12674,25 +12702,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12680: \$? = $ac_status" >&5
+  echo "$as_me:12708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12686: \$? = $ac_status" >&5
+  echo "$as_me:12714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12688: result: yes" >&5
+  echo "$as_me:12716: 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:12695: result: no" >&5
+echo "$as_me:12723: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12707,7 +12735,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:12710: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12738: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12715,7 +12743,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12718: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12746: 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
@@ -12725,7 +12753,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12728 "configure"
+#line 12756 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -12737,23 +12765,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12743: \$? = $ac_status" >&5
+  echo "$as_me:12771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12749: \$? = $ac_status" >&5
+  echo "$as_me:12777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:12751: result: yes" >&5
+  echo "$as_me:12779: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:12756: result: no" >&5
+echo "$as_me:12784: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12772,8 +12800,8 @@ else
 fi
 
 	;;
-(pdcurses)
-	echo "$as_me:12776: checking for X" >&5
+(pdcurses*)
+	echo "$as_me:12804: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -12877,17 +12905,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12880 "configure"
+#line 12908 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:12884: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12912: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12890: \$? = $ac_status" >&5
+  echo "$as_me:12918: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12920,7 +12948,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12923 "configure"
+#line 12951 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -12932,16 +12960,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12938: \$? = $ac_status" >&5
+  echo "$as_me:12966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12944: \$? = $ac_status" >&5
+  echo "$as_me:12972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -12979,7 +13007,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:12982: result: $have_x" >&5
+  echo "$as_me:13010: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -12989,7 +13017,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:12992: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:13020: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -13016,11 +13044,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:13019: checking whether -R must be followed by a space" >&5
+      echo "$as_me:13047: 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 13023 "configure"
+#line 13051 "configure"
 #include "confdefs.h"
 
 int
@@ -13032,16 +13060,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13038: \$? = $ac_status" >&5
+  echo "$as_me:13066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13044: \$? = $ac_status" >&5
+  echo "$as_me:13072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -13051,13 +13079,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:13054: result: no" >&5
+	echo "$as_me:13082: 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 13060 "configure"
+#line 13088 "configure"
 #include "confdefs.h"
 
 int
@@ -13069,16 +13097,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13075: \$? = $ac_status" >&5
+  echo "$as_me:13103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13081: \$? = $ac_status" >&5
+  echo "$as_me:13109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -13088,11 +13116,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:13091: result: yes" >&5
+	  echo "$as_me:13119: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:13095: result: neither works" >&5
+	  echo "$as_me:13123: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -13112,7 +13140,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 13115 "configure"
+#line 13143 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13131,22 +13159,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13137: \$? = $ac_status" >&5
+  echo "$as_me:13165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13143: \$? = $ac_status" >&5
+  echo "$as_me:13171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:13149: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:13177: 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
@@ -13154,7 +13182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13157 "configure"
+#line 13185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13173,16 +13201,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13179: \$? = $ac_status" >&5
+  echo "$as_me:13207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13185: \$? = $ac_status" >&5
+  echo "$as_me:13213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -13193,14 +13221,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:13224: 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:13203: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:13231: 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
@@ -13208,7 +13236,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13211 "configure"
+#line 13239 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13227,16 +13255,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13233: \$? = $ac_status" >&5
+  echo "$as_me:13261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13239: \$? = $ac_status" >&5
+  echo "$as_me:13267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -13247,7 +13275,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:13278: 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"
@@ -13266,13 +13294,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:13269: checking for gethostbyname" >&5
+    echo "$as_me:13297: 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 13275 "configure"
+#line 13303 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13303,16 +13331,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13309: \$? = $ac_status" >&5
+  echo "$as_me:13337: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13315: \$? = $ac_status" >&5
+  echo "$as_me:13343: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -13322,11 +13350,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13325: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:13353: 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:13329: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:13357: 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
@@ -13334,7 +13362,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13337 "configure"
+#line 13365 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13353,16 +13381,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13359: \$? = $ac_status" >&5
+  echo "$as_me:13387: \$? = $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:13390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13365: \$? = $ac_status" >&5
+  echo "$as_me:13393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -13373,14 +13401,14 @@ fi
 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_nsl_gethostbyname" >&5
+echo "$as_me:13404: 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:13383: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:13411: 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
@@ -13388,7 +13416,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13391 "configure"
+#line 13419 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13407,16 +13435,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13413: \$? = $ac_status" >&5
+  echo "$as_me:13441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13419: \$? = $ac_status" >&5
+  echo "$as_me:13447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -13427,7 +13455,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13430: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:13458: 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"
@@ -13443,13 +13471,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:13446: checking for connect" >&5
+    echo "$as_me:13474: 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 13452 "configure"
+#line 13480 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13480,16 +13508,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13486: \$? = $ac_status" >&5
+  echo "$as_me:13514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13492: \$? = $ac_status" >&5
+  echo "$as_me:13520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -13499,11 +13527,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13502: result: $ac_cv_func_connect" >&5
+echo "$as_me:13530: 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:13506: checking for connect in -lsocket" >&5
+      echo "$as_me:13534: 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
@@ -13511,7 +13539,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13514 "configure"
+#line 13542 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13530,16 +13558,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13536: \$? = $ac_status" >&5
+  echo "$as_me:13564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13542: \$? = $ac_status" >&5
+  echo "$as_me:13570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -13550,7 +13578,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13553: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:13581: 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"
@@ -13559,13 +13587,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:13562: checking for remove" >&5
+    echo "$as_me:13590: 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 13568 "configure"
+#line 13596 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13596,16 +13624,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13602: \$? = $ac_status" >&5
+  echo "$as_me:13630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13608: \$? = $ac_status" >&5
+  echo "$as_me:13636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -13615,11 +13643,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13618: result: $ac_cv_func_remove" >&5
+echo "$as_me:13646: 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:13622: checking for remove in -lposix" >&5
+      echo "$as_me:13650: 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
@@ -13627,7 +13655,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13630 "configure"
+#line 13658 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13646,16 +13674,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13652: \$? = $ac_status" >&5
+  echo "$as_me:13680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13658: \$? = $ac_status" >&5
+  echo "$as_me:13686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -13666,7 +13694,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13669: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:13697: 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"
@@ -13675,13 +13703,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:13678: checking for shmat" >&5
+    echo "$as_me:13706: 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 13684 "configure"
+#line 13712 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13712,16 +13740,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13718: \$? = $ac_status" >&5
+  echo "$as_me:13746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13724: \$? = $ac_status" >&5
+  echo "$as_me:13752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -13731,11 +13759,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13734: result: $ac_cv_func_shmat" >&5
+echo "$as_me:13762: 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:13738: checking for shmat in -lipc" >&5
+      echo "$as_me:13766: 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
@@ -13743,7 +13771,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13746 "configure"
+#line 13774 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13762,16 +13790,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13768: \$? = $ac_status" >&5
+  echo "$as_me:13796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13774: \$? = $ac_status" >&5
+  echo "$as_me:13802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -13782,7 +13810,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13785: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:13813: 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"
@@ -13800,7 +13828,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:13803: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13831: 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
@@ -13808,7 +13836,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13811 "configure"
+#line 13839 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13827,16 +13855,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13833: \$? = $ac_status" >&5
+  echo "$as_me:13861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13839: \$? = $ac_status" >&5
+  echo "$as_me:13867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -13847,7 +13875,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13878: 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"
@@ -13859,7 +13887,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13862: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13890: 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=
 
@@ -13870,14 +13898,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13873: result: yes" >&5
+	echo "$as_me:13901: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13876: result: no" >&5
+	echo "$as_me:13904: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13880: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13908: 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=
 
@@ -13888,14 +13916,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13891: result: yes" >&5
+	echo "$as_me:13919: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13894: result: no" >&5
+	echo "$as_me:13922: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13898: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13926: 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=
 
@@ -13906,14 +13934,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13909: result: yes" >&5
+	echo "$as_me:13937: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13912: result: no" >&5
+	echo "$as_me:13940: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13916: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13944: 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=
 
@@ -13924,10 +13952,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13927: result: yes" >&5
+	echo "$as_me:13955: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13930: result: no" >&5
+	echo "$as_me:13958: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13947,17 +13975,31 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:13950: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13978: 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}:13956: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13984: 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}:13960: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13988: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in $cf_athena_pkg
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14088,20 +14130,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14091: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14133: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:14097: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:14139: 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 14104 "configure"
+#line 14146 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14119,16 +14161,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14131: \$? = $ac_status" >&5
+  echo "$as_me:14173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -14138,7 +14180,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14141: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:14183: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -14150,7 +14192,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:14195: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -14158,17 +14200,31 @@ echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:14161: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:14203: 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}:14167: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14209: 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}:14171: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14213: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in xmu
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14288,12 +14344,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14291: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14347: 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}:14296: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14352: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -14301,12 +14357,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14304: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14360: 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}:14309: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14365: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14317,7 +14373,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:14320: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:14376: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -14342,17 +14398,31 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14345: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14401: 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}:14351: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14407: 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}:14355: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14411: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in Xext
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14473,7 +14543,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14476: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14546: 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
@@ -14481,7 +14551,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14484 "configure"
+#line 14554 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14500,16 +14570,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14506: \$? = $ac_status" >&5
+  echo "$as_me:14576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14512: \$? = $ac_status" >&5
+  echo "$as_me:14582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14520,7 +14590,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14523: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14593: 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
 
@@ -14556,17 +14626,31 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14559: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14629: 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}:14565: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14635: 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}:14569: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in x11
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14686,24 +14770,38 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14689: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14773: 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}:14696: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14780: 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}:14702: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14786: 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}:14706: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14790: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in ice
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14823,24 +14921,38 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14826: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14924: 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}:14833: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14931: 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}:14839: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14937: 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}:14843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14941: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in sm
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14960,24 +15072,38 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14963: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:15075: 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}:14970: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15082: 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}:14976: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15088: 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}:14980: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15092: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in xt
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15097,7 +15223,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:15100: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:15226: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -15110,17 +15236,31 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:15113: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15239: 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}:15119: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15245: 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}:15123: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15249: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in xt
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15241,14 +15381,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15244: checking for usable X dependency" >&5
+echo "$as_me:15384: 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 15251 "configure"
+#line 15391 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15268,16 +15408,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15274: \$? = $ac_status" >&5
+  echo "$as_me:15414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15280: \$? = $ac_status" >&5
+  echo "$as_me:15420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15287,30 +15427,44 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15290: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15430: 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}:15296: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15436: 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}:15303: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15443: 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}:15309: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15449: 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}:15313: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15453: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in x11
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15433,12 +15587,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15436: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15590: 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}:15441: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15595: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15446,14 +15600,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:15449: checking for usable X Toolkit package" >&5
+echo "$as_me:15603: 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 15456 "configure"
+#line 15610 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15469,16 +15623,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15475: \$? = $ac_status" >&5
+  echo "$as_me:15629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15481: \$? = $ac_status" >&5
+  echo "$as_me:15635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15488,7 +15642,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15491: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15645: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15502,22 +15656,36 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15505: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15659: 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}:15510: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15664: 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}:15516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15670: 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}:15520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15674: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in ice
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15636,17 +15804,31 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15639: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15807: 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}:15645: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15813: 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}:15649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15817: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+for cf_required in sm
+do
+	# check for duplicates
+	for cf_require_pkg in $REQUIRE_PKG
+	do
+		if test "$cf_required" = "$cf_require_pkg"
+		then
+			cf_required=
+			break
+		fi
+	done
+	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
+done
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15775,12 +15957,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15778: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15960: 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}:15783: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15965: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15800,7 +15982,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15803: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15985: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15885,7 +16067,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15888: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15895,7 +16077,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15898: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15905,7 +16087,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:15908: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16090: 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"
@@ -15914,7 +16096,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15917 "configure"
+#line 16099 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15926,16 +16108,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15932: \$? = $ac_status" >&5
+  echo "$as_me:16114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15938: \$? = $ac_status" >&5
+  echo "$as_me:16120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15943,12 +16125,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15946: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16128: 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}:15951: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16133: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15956,13 +16138,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15959: checking for XOpenDisplay" >&5
+	echo "$as_me:16141: 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 15965 "configure"
+#line 16147 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15993,16 +16175,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15999: \$? = $ac_status" >&5
+  echo "$as_me:16181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16005: \$? = $ac_status" >&5
+  echo "$as_me:16187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -16012,13 +16194,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16015: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:16197: 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:16021: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:16203: 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
@@ -16026,7 +16208,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16029 "configure"
+#line 16211 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16045,16 +16227,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16051: \$? = $ac_status" >&5
+  echo "$as_me:16233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16057: \$? = $ac_status" >&5
+  echo "$as_me:16239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16065,7 +16247,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16068: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16250: 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
 
@@ -16089,13 +16271,13 @@ fi
 
 fi
 
-	echo "$as_me:16092: checking for XtAppInitialize" >&5
+	echo "$as_me:16274: 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 16098 "configure"
+#line 16280 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16126,16 +16308,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16132: \$? = $ac_status" >&5
+  echo "$as_me:16314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16138: \$? = $ac_status" >&5
+  echo "$as_me:16320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -16145,13 +16327,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16148: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16330: 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:16154: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16336: 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
@@ -16159,7 +16341,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16162 "configure"
+#line 16344 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16178,16 +16360,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16184: \$? = $ac_status" >&5
+  echo "$as_me:16366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16190: \$? = $ac_status" >&5
+  echo "$as_me:16372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16198,7 +16380,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16201: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16383: 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
 
@@ -16215,7 +16397,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16218: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16400: 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
@@ -16256,14 +16438,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16259: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16441: 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:16262: checking for $cf_test" >&5
+			echo "$as_me:16444: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16266 "configure"
+#line 16448 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16277,16 +16459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16283: \$? = $ac_status" >&5
+  echo "$as_me:16465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16289: \$? = $ac_status" >&5
+  echo "$as_me:16471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16295,7 +16477,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16298: result: $cf_result" >&5
+		echo "$as_me:16480: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16311,7 +16493,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16314: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16496: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -16376,10 +16558,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16379: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16561: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16382 "configure"
+#line 16564 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16396,16 +16578,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16402: \$? = $ac_status" >&5
+  echo "$as_me:16584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16408: \$? = $ac_status" >&5
+  echo "$as_me:16590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16414,7 +16596,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16417: result: $cf_result" >&5
+		echo "$as_me:16599: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16431,7 +16613,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16434: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16616: 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
@@ -16465,7 +16647,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:16468: checking for $ac_word" >&5
+echo "$as_me:16650: 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
@@ -16480,7 +16662,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:16483: found $ac_dir/$ac_word" >&5
+echo "$as_me:16665: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16488,10 +16670,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:16491: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:16673: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16494: result: no" >&5
+  echo "$as_me:16676: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16504,7 +16686,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16507: checking for $ac_word" >&5
+echo "$as_me:16689: 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
@@ -16519,7 +16701,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:16522: found $ac_dir/$ac_word" >&5
+echo "$as_me:16704: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -16527,10 +16709,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:16530: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:16712: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:16533: result: no" >&5
+  echo "$as_me:16715: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16665,7 +16847,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16668: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16850: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -16750,7 +16932,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:16753: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:16935: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -16760,7 +16942,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:16763: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:16945: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -16770,7 +16952,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:16773: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:16955: 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"
@@ -16779,7 +16961,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16782 "configure"
+#line 16964 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16791,16 +16973,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16797: \$? = $ac_status" >&5
+  echo "$as_me:16979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16803: \$? = $ac_status" >&5
+  echo "$as_me:16985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16808,12 +16990,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16811: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16993: 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}:16816: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16998: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -16821,7 +17003,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:16824: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:17006: 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
@@ -16829,7 +17011,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16832 "configure"
+#line 17014 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16848,16 +17030,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16854: \$? = $ac_status" >&5
+  echo "$as_me:17036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16860: \$? = $ac_status" >&5
+  echo "$as_me:17042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -16868,7 +17050,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16871: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:17053: 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
 
@@ -16890,7 +17072,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:16893: checking for XCurses library" >&5
+echo "$as_me:17075: 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
@@ -16913,7 +17095,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16916 "configure"
+#line 17098 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16928,16 +17110,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16934: \$? = $ac_status" >&5
+  echo "$as_me:17116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16940: \$? = $ac_status" >&5
+  echo "$as_me:17122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -16948,7 +17130,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16951: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:17133: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -16963,23 +17145,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:16966: checking for xcurses.h" >&5
+	echo "$as_me:17148: 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 16972 "configure"
+#line 17154 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:16976: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16982: \$? = $ac_status" >&5
+  echo "$as_me:17164: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16998,7 +17180,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17001: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:17183: 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
 
@@ -17009,26 +17191,26 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:17012: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:17194: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 	;;
 (*)
-	{ { echo "$as_me:17019: error: unexpected screen-value: $cf_cv_screen" >&5
+	{ { echo "$as_me:17201: error: unexpected screen-value: $cf_cv_screen" >&5
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:17025: checking for _nc_init_pthreads" >&5
+echo "$as_me:17207: checking for _nc_init_pthreads" >&5
 echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
 if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17031 "configure"
+#line 17213 "configure"
 #include "confdefs.h"
 #define _nc_init_pthreads autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17059,16 +17241,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17065: \$? = $ac_status" >&5
+  echo "$as_me:17247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17071: \$? = $ac_status" >&5
+  echo "$as_me:17253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_init_pthreads=yes
 else
@@ -17078,7 +17260,7 @@ ac_cv_func__nc_init_pthreads=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17081: result: $ac_cv_func__nc_init_pthreads" >&5
+echo "$as_me:17263: result: $ac_cv_func__nc_init_pthreads" >&5
 echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
 if test "$ac_cv_func__nc_init_pthreads" = yes; then
   cf_cv_ncurses_pthreads=yes
@@ -17113,7 +17295,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17116: checking for X11 rgb file" >&5
+echo "$as_me:17298: 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.
@@ -17175,7 +17357,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17178: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:17360: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17183,7 +17365,7 @@ esac
 
 fi
 
-echo "$as_me:17186: result: $RGB_PATH" >&5
+echo "$as_me:17368: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -17224,7 +17406,7 @@ case $cf_cv_screen in
 	;;
 esac
 
-echo "$as_me:17227: checking for desired basename for form library" >&5
+echo "$as_me:17409: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -17244,10 +17426,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:17247: result: $FORM_NAME" >&5
+echo "$as_me:17429: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:17250: checking for desired basename for menu library" >&5
+echo "$as_me:17432: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -17267,10 +17449,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:17270: result: $MENU_NAME" >&5
+echo "$as_me:17452: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:17273: checking for desired basename for panel library" >&5
+echo "$as_me:17455: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -17290,10 +17472,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:17293: result: $PANEL_NAME" >&5
+echo "$as_me:17475: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:17296: checking if you want to check for panel functions" >&5
+echo "$as_me:17478: checking if you want to check for panel functions" >&5
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
@@ -17310,7 +17492,7 @@ else
 	cf_enable_panel=$cf_default_panel
 
 fi;
-echo "$as_me:17313: result: $cf_enable_panel" >&5
+echo "$as_me:17495: result: $cf_enable_panel" >&5
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
@@ -17321,13 +17503,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17324: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17506: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17327: result: yes" >&5
+		echo "$as_me:17509: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17330: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17512: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17477,7 +17659,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17480 "configure"
+#line 17662 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
@@ -17489,37 +17671,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17495: \$? = $ac_status" >&5
+  echo "$as_me:17677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17501: \$? = $ac_status" >&5
+  echo "$as_me:17683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17507 "configure"
+#line 17689 "configure"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 				int main(void)
 				{ (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17517: \$? = $ac_status" >&5
+  echo "$as_me:17699: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17522: \$? = $ac_status" >&5
+  echo "$as_me:17704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17536,7 +17718,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17539: result: $cf_have_curses_lib" >&5
+		echo "$as_me:17721: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17557,7 +17739,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:17560: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:17742: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17565,7 +17747,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17568 "configure"
+#line 17750 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17584,16 +17766,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17590: \$? = $ac_status" >&5
+  echo "$as_me:17772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17596: \$? = $ac_status" >&5
+  echo "$as_me:17778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17604,7 +17786,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17607: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17789: 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
 
@@ -17637,7 +17819,7 @@ fi
 	cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
-echo "$as_me:17640: checking if you want to check for menu functions" >&5
+echo "$as_me:17822: checking if you want to check for menu functions" >&5
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
@@ -17654,7 +17836,7 @@ else
 	cf_enable_menu=$cf_default_menu
 
 fi;
-echo "$as_me:17657: result: $cf_enable_menu" >&5
+echo "$as_me:17839: result: $cf_enable_menu" >&5
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
@@ -17663,14 +17845,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:17666: checking for NetBSD menu.h" >&5
+echo "$as_me:17848: 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 17673 "configure"
+#line 17855 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17688,16 +17870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17694: \$? = $ac_status" >&5
+  echo "$as_me:17876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17700: \$? = $ac_status" >&5
+  echo "$as_me:17882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
@@ -17709,7 +17891,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17712: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:17894: result: $cf_cv_netbsd_menu_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
@@ -17726,13 +17908,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:17729: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+	echo "$as_me:17911: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
-		echo "$as_me:17732: result: yes" >&5
+		echo "$as_me:17914: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:17735: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:17917: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -17882,7 +18064,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17885 "configure"
+#line 18067 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
@@ -17894,37 +18076,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17900: \$? = $ac_status" >&5
+  echo "$as_me:18082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17906: \$? = $ac_status" >&5
+  echo "$as_me:18088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17912 "configure"
+#line 18094 "configure"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 				int main(void)
 				{ (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17922: \$? = $ac_status" >&5
+  echo "$as_me:18104: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17927: \$? = $ac_status" >&5
+  echo "$as_me:18109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -17941,7 +18123,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:17944: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18126: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -17962,7 +18144,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:17965: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:18147: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17970,7 +18152,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17973 "configure"
+#line 18155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17989,16 +18171,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17995: \$? = $ac_status" >&5
+  echo "$as_me:18177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18001: \$? = $ac_status" >&5
+  echo "$as_me:18183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18009,7 +18191,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18012: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18194: 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
 
@@ -18042,7 +18224,7 @@ fi
 	cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
-echo "$as_me:18045: checking if you want to check for form functions" >&5
+echo "$as_me:18227: checking if you want to check for form functions" >&5
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -18059,7 +18241,7 @@ else
 	cf_enable_form=$cf_default_form
 
 fi;
-echo "$as_me:18062: result: $cf_enable_form" >&5
+echo "$as_me:18244: result: $cf_enable_form" >&5
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
@@ -18068,14 +18250,14 @@ then
 		;;
 	(curses*)
 
-echo "$as_me:18071: checking for NetBSD form.h" >&5
+echo "$as_me:18253: 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 18078 "configure"
+#line 18260 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18094,16 +18276,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18100: \$? = $ac_status" >&5
+  echo "$as_me:18282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18106: \$? = $ac_status" >&5
+  echo "$as_me:18288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
@@ -18115,7 +18297,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18118: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:18300: result: $cf_cv_netbsd_form_h" >&5
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
@@ -18132,13 +18314,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
 	:
 elif test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:18135: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+	echo "$as_me:18317: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
-		echo "$as_me:18138: result: yes" >&5
+		echo "$as_me:18320: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:18141: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+		echo "$as_me:18323: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
 		cf_save_CFLAGS="$CFLAGS"
@@ -18288,7 +18470,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18291 "configure"
+#line 18473 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
@@ -18300,37 +18482,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18306: \$? = $ac_status" >&5
+  echo "$as_me:18488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18312: \$? = $ac_status" >&5
+  echo "$as_me:18494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18318 "configure"
+#line 18500 "configure"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 				int main(void)
 				{ (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:18325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18328: \$? = $ac_status" >&5
+  echo "$as_me:18510: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:18330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18333: \$? = $ac_status" >&5
+  echo "$as_me:18515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
@@ -18347,7 +18529,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18350: result: $cf_have_curses_lib" >&5
+		echo "$as_me:18532: result: $cf_have_curses_lib" >&5
 echo "${ECHO_T}$cf_have_curses_lib" >&6
 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
 		if test "$cf_have_curses_lib" = "yes"
@@ -18368,7 +18550,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:18371: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:18553: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18376,7 +18558,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18379 "configure"
+#line 18561 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18395,16 +18577,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18401: \$? = $ac_status" >&5
+  echo "$as_me:18583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18407: \$? = $ac_status" >&5
+  echo "$as_me:18589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18415,7 +18597,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18418: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:18600: 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
 
@@ -18453,23 +18635,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18456: checking for $ac_header" >&5
+echo "$as_me:18638: 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 18462 "configure"
+#line 18644 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18466: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18648: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18472: \$? = $ac_status" >&5
+  echo "$as_me:18654: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18488,7 +18670,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18491: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18673: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18498,13 +18680,13 @@ EOF
 fi
 done
 
-echo "$as_me:18501: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18683: 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 18507 "configure"
+#line 18689 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18520,16 +18702,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18526: \$? = $ac_status" >&5
+  echo "$as_me:18708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18532: \$? = $ac_status" >&5
+  echo "$as_me:18714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -18539,7 +18721,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:18542: result: $ac_cv_header_time" >&5
+echo "$as_me:18724: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -18560,23 +18742,23 @@ termios.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18563: checking for $ac_header" >&5
+echo "$as_me:18745: 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 18569 "configure"
+#line 18751 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18755: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18579: \$? = $ac_status" >&5
+  echo "$as_me:18761: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18595,7 +18777,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18598: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18780: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18608,23 +18790,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18611: checking for $ac_header" >&5
+echo "$as_me:18793: 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 18617 "configure"
+#line 18799 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18627: \$? = $ac_status" >&5
+  echo "$as_me:18809: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18643,7 +18825,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18646: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18653,7 +18835,7 @@ EOF
 fi
 done
 
-echo "$as_me:18656: checking for header declaring getopt variables" >&5
+echo "$as_me:18838: 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
@@ -18663,7 +18845,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18666 "configure"
+#line 18848 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18676,16 +18858,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18682: \$? = $ac_status" >&5
+  echo "$as_me:18864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18688: \$? = $ac_status" >&5
+  echo "$as_me:18870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -18697,7 +18879,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:18700: result: $cf_cv_getopt_header" >&5
+echo "$as_me:18882: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -18715,13 +18897,13 @@ EOF
 fi
 
 cf_save_libs="$LIBS"
-echo "$as_me:18718: checking for clock_gettime" >&5
+echo "$as_me:18900: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18724 "configure"
+#line 18906 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18752,16 +18934,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18758: \$? = $ac_status" >&5
+  echo "$as_me:18940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18764: \$? = $ac_status" >&5
+  echo "$as_me:18946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -18771,12 +18953,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18774: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:18956: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:18779: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:18961: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18784,7 +18966,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18787 "configure"
+#line 18969 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18803,16 +18985,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18809: \$? = $ac_status" >&5
+  echo "$as_me:18991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18815: \$? = $ac_status" >&5
+  echo "$as_me:18997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -18823,7 +19005,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18826: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:19008: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -18835,14 +19017,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:18838: checking if clock_gettime links" >&5
+echo "$as_me:19020: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18845 "configure"
+#line 19027 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -18860,16 +19042,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18866: \$? = $ac_status" >&5
+  echo "$as_me:19048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18872: \$? = $ac_status" >&5
+  echo "$as_me:19054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -18880,7 +19062,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:18883: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:19065: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -18894,13 +19076,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:18897: checking for gettimeofday" >&5
+echo "$as_me:19079: 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 18903 "configure"
+#line 19085 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18931,16 +19113,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18937: \$? = $ac_status" >&5
+  echo "$as_me:19119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18943: \$? = $ac_status" >&5
+  echo "$as_me:19125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -18950,7 +19132,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18953: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:19135: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -18960,7 +19142,7 @@ EOF
 
 else
 
-echo "$as_me:18963: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:19145: 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
@@ -18968,7 +19150,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18971 "configure"
+#line 19153 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18987,16 +19169,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18993: \$? = $ac_status" >&5
+  echo "$as_me:19175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18999: \$? = $ac_status" >&5
+  echo "$as_me:19181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -19007,7 +19189,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19010: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:19192: 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
 
@@ -19045,13 +19227,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19048: checking for $ac_func" >&5
+echo "$as_me:19230: 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 19054 "configure"
+#line 19236 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19082,16 +19264,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19088: \$? = $ac_status" >&5
+  echo "$as_me:19270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19094: \$? = $ac_status" >&5
+  echo "$as_me:19276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19101,7 +19283,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19104: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19286: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19112,14 +19294,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
-echo "$as_me:19115: checking if we can use termcap.h" >&5
+echo "$as_me:19297: checking if we can use termcap.h" >&5
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19122 "configure"
+#line 19304 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -19140,16 +19322,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19146: \$? = $ac_status" >&5
+  echo "$as_me:19328: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19152: \$? = $ac_status" >&5
+  echo "$as_me:19334: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
@@ -19159,7 +19341,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19162: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:19344: result: $cf_cv_have_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
@@ -19169,14 +19351,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:19172: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:19354: checking if we can use ncurses/termcap.h" >&5
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19179 "configure"
+#line 19361 "configure"
 #include "confdefs.h"
 
 #include <ncurses/curses.h>
@@ -19197,16 +19379,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19203: \$? = $ac_status" >&5
+  echo "$as_me:19385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19209: \$? = $ac_status" >&5
+  echo "$as_me:19391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
@@ -19216,7 +19398,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19219: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:19401: result: $cf_cv_have_ncurses_termcap_h" >&5
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -19226,7 +19408,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
-	{ { echo "$as_me:19229: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:19411: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19245,13 +19427,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19248: checking for $ac_func" >&5
+echo "$as_me:19430: 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 19254 "configure"
+#line 19436 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19282,16 +19464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19288: \$? = $ac_status" >&5
+  echo "$as_me:19470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19294: \$? = $ac_status" >&5
+  echo "$as_me:19476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19301,7 +19483,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19304: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19486: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19313,7 +19495,7 @@ done
 
 fi
 
-echo "$as_me:19316: checking definition to turn on extended curses functions" >&5
+echo "$as_me:19498: 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
@@ -19321,7 +19503,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19324 "configure"
+#line 19506 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -19354,16 +19536,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19360: \$? = $ac_status" >&5
+  echo "$as_me:19542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19366: \$? = $ac_status" >&5
+  echo "$as_me:19548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19373,7 +19555,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19376 "configure"
+#line 19558 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19399,16 +19581,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19405: \$? = $ac_status" >&5
+  echo "$as_me:19587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19411: \$? = $ac_status" >&5
+  echo "$as_me:19593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19422,7 +19604,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19425: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19607: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19434,7 +19616,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19437: checking for term.h" >&5
+echo "$as_me:19619: 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
@@ -19455,7 +19637,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19458 "configure"
+#line 19640 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19469,16 +19651,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19472: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19475: \$? = $ac_status" >&5
+  echo "$as_me:19657: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19481: \$? = $ac_status" >&5
+  echo "$as_me:19663: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19497,7 +19679,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19500 "configure"
+#line 19682 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19515,16 +19697,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19521: \$? = $ac_status" >&5
+  echo "$as_me:19703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19527: \$? = $ac_status" >&5
+  echo "$as_me:19709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19539,7 +19721,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19542: result: $cf_cv_term_header" >&5
+echo "$as_me:19724: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19566,7 +19748,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19569: checking for unctrl.h" >&5
+echo "$as_me:19751: 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
@@ -19587,7 +19769,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19590 "configure"
+#line 19772 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19601,16 +19783,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19607: \$? = $ac_status" >&5
+  echo "$as_me:19789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19613: \$? = $ac_status" >&5
+  echo "$as_me:19795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19623,12 +19805,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19626: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19808: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19631: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19813: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19726,10 +19908,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19729: checking for ${cf_func}" >&5
+	echo "$as_me:19911: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19914: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19738,7 +19920,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19741 "configure"
+#line 19923 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19771,16 +19953,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19796,7 +19978,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19799: result: $cf_result" >&5
+	echo "$as_me:19981: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19811,10 +19993,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19814: checking for ${cf_func}" >&5
+	echo "$as_me:19996: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19817: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19999: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19823,7 +20005,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19826 "configure"
+#line 20008 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19856,16 +20038,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19862: \$? = $ac_status" >&5
+  echo "$as_me:20044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19868: \$? = $ac_status" >&5
+  echo "$as_me:20050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19881,7 +20063,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19884: result: $cf_result" >&5
+	echo "$as_me:20066: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -19905,7 +20087,7 @@ then
 				cf_return="return value"
 			fi
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19908 "configure"
+#line 20090 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19925,21 +20107,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19931: \$? = $ac_status" >&5
+  echo "$as_me:20113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19937: \$? = $ac_status" >&5
+  echo "$as_me:20119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19942: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:20124: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
@@ -19959,14 +20141,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 fi
 
-echo "$as_me:19962: checking for ncurses extended functions" >&5
+echo "$as_me:20144: 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 19969 "configure"
+#line 20151 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19981,16 +20163,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19987: \$? = $ac_status" >&5
+  echo "$as_me:20169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19993: \$? = $ac_status" >&5
+  echo "$as_me:20175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19998,7 +20180,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20001 "configure"
+#line 20183 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20023,16 +20205,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20029: \$? = $ac_status" >&5
+  echo "$as_me:20211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20035: \$? = $ac_status" >&5
+  echo "$as_me:20217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -20046,7 +20228,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20049: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:20231: 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
@@ -20060,11 +20242,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:20063: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:20245: 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 20067 "configure"
+#line 20249 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20077,16 +20259,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20083: \$? = $ac_status" >&5
+  echo "$as_me:20265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20089: \$? = $ac_status" >&5
+  echo "$as_me:20271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20095,7 +20277,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20098 "configure"
+#line 20280 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20108,16 +20290,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20114: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20120: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -20128,7 +20310,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:20131: result: $cf_define_xpg5" >&5
+		echo "$as_me:20313: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -20137,14 +20319,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:20140: checking for wide-character functions" >&5
+	echo "$as_me:20322: 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 20147 "configure"
+#line 20329 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20161,16 +20343,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20167: \$? = $ac_status" >&5
+  echo "$as_me:20349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20173: \$? = $ac_status" >&5
+  echo "$as_me:20355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -20181,7 +20363,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20184: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:20366: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -20202,14 +20384,14 @@ EOF
 
 fi
 
-echo "$as_me:20205: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:20387: 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 20212 "configure"
+#line 20394 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20227,16 +20409,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20233: \$? = $ac_status" >&5
+  echo "$as_me:20415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20239: \$? = $ac_status" >&5
+  echo "$as_me:20421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20247,21 +20429,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20250: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20432: 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:20257: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20439: 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 20264 "configure"
+#line 20446 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20281,16 +20463,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20287: \$? = $ac_status" >&5
+  echo "$as_me:20469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20293: \$? = $ac_status" >&5
+  echo "$as_me:20475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20302,7 +20484,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20305: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20487: 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
@@ -20311,7 +20493,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20314: checking for openpty in -lutil" >&5
+echo "$as_me:20496: 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
@@ -20319,7 +20501,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20322 "configure"
+#line 20504 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20338,16 +20520,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20344: \$? = $ac_status" >&5
+  echo "$as_me:20526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20350: \$? = $ac_status" >&5
+  echo "$as_me:20532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20358,7 +20540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20361: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20543: 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
@@ -20366,7 +20548,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20369: checking for openpty header" >&5
+echo "$as_me:20551: 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
@@ -20393,7 +20575,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20396 "configure"
+#line 20578 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20411,16 +20593,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20417: \$? = $ac_status" >&5
+  echo "$as_me:20599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20423: \$? = $ac_status" >&5
+  echo "$as_me:20605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20438,7 +20620,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20441: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20623: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20472,7 +20654,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20475: checking for function curses_version" >&5
+echo "$as_me:20657: 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
@@ -20482,7 +20664,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20485 "configure"
+#line 20667 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20498,15 +20680,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20504: \$? = $ac_status" >&5
+  echo "$as_me:20686: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20509: \$? = $ac_status" >&5
+  echo "$as_me:20691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20521,14 +20703,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20524: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20706: 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:20531: checking for alternate character set array" >&5
+echo "$as_me:20713: 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
@@ -20538,7 +20720,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20541 "configure"
+#line 20723 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20554,16 +20736,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20560: \$? = $ac_status" >&5
+  echo "$as_me:20742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20566: \$? = $ac_status" >&5
+  echo "$as_me:20748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20574,7 +20756,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20577: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20759: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20584,7 +20766,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20587: checking for wide alternate character set array" >&5
+echo "$as_me:20769: 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
@@ -20594,7 +20776,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20597 "configure"
+#line 20779 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20610,16 +20792,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20616: \$? = $ac_status" >&5
+  echo "$as_me:20798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20622: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20630,7 +20812,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20633: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20815: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20638,7 +20820,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
-echo "$as_me:20641: checking for wide alternate character constants" >&5
+echo "$as_me:20823: 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
@@ -20648,7 +20830,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20651 "configure"
+#line 20833 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20665,16 +20847,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20671: \$? = $ac_status" >&5
+  echo "$as_me:20853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20677: \$? = $ac_status" >&5
+  echo "$as_me:20859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20684,7 +20866,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20687 "configure"
+#line 20869 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20700,16 +20882,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20706: \$? = $ac_status" >&5
+  echo "$as_me:20888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20712: \$? = $ac_status" >&5
+  echo "$as_me:20894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20720,7 +20902,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20723: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20905: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20730,10 +20912,10 @@ EOF
 
 fi
 
-echo "$as_me:20733: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20915: 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 20736 "configure"
+#line 20918 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20751,16 +20933,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20757: \$? = $ac_status" >&5
+  echo "$as_me:20939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20763: \$? = $ac_status" >&5
+  echo "$as_me:20945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20769,7 +20951,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20772: result: $cf_result" >&5
+echo "$as_me:20954: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20790,14 +20972,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20793: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20975: 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 20800 "configure"
+#line 20982 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20815,23 +20997,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20821: \$? = $ac_status" >&5
+  echo "$as_me:21003: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20827: \$? = $ac_status" >&5
+  echo "$as_me:21009: \$? = $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 20834 "configure"
+#line 21016 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20850,16 +21032,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20856: \$? = $ac_status" >&5
+  echo "$as_me:21038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20862: \$? = $ac_status" >&5
+  echo "$as_me:21044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20871,7 +21053,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20874: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:21056: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20894,14 +21076,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20897: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:21079: 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 20904 "configure"
+#line 21086 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20919,23 +21101,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20925: \$? = $ac_status" >&5
+  echo "$as_me:21107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20931: \$? = $ac_status" >&5
+  echo "$as_me:21113: \$? = $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 20938 "configure"
+#line 21120 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20954,16 +21136,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20960: \$? = $ac_status" >&5
+  echo "$as_me:21142: \$? = $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:21145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20966: \$? = $ac_status" >&5
+  echo "$as_me:21148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20975,7 +21157,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20978: result: $cf_cv_wchar_t" >&5
+echo "$as_me:21160: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20998,14 +21180,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:21001: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:21183: 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 21008 "configure"
+#line 21190 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21023,23 +21205,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21029: \$? = $ac_status" >&5
+  echo "$as_me:21211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21035: \$? = $ac_status" >&5
+  echo "$as_me:21217: \$? = $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 21042 "configure"
+#line 21224 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -21058,16 +21240,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21064: \$? = $ac_status" >&5
+  echo "$as_me:21246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21070: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -21079,7 +21261,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21082: result: $cf_cv_wint_t" >&5
+echo "$as_me:21264: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -21103,10 +21285,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:21106: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21288: 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 21109 "configure"
+#line 21291 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21124,16 +21306,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:21312: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21136: \$? = $ac_status" >&5
+  echo "$as_me:21318: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21142,7 +21324,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21145: result: $cf_result" >&5
+echo "$as_me:21327: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21164,10 +21346,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:21167: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21349: 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 21170 "configure"
+#line 21352 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21185,16 +21367,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21191: \$? = $ac_status" >&5
+  echo "$as_me:21373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21197: \$? = $ac_status" >&5
+  echo "$as_me:21379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21203,7 +21385,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21206: result: $cf_result" >&5
+echo "$as_me:21388: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21225,10 +21407,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21228: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21410: 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 21231 "configure"
+#line 21413 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21246,16 +21428,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21252: \$? = $ac_status" >&5
+  echo "$as_me:21434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21258: \$? = $ac_status" >&5
+  echo "$as_me:21440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21264,7 +21446,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21267: result: $cf_result" >&5
+echo "$as_me:21449: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21293,11 +21475,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21296: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21478: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21300 "configure"
+#line 21482 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21330,16 +21512,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21336: \$? = $ac_status" >&5
+  echo "$as_me:21518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21342: \$? = $ac_status" >&5
+  echo "$as_me:21524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21349,7 +21531,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21352: result: $cf_result" >&5
+echo "$as_me:21534: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21361,14 +21543,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21364: checking for data $cf_data in library" >&5
+	echo "$as_me:21546: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data 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 21371 "configure"
+#line 21553 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21407,16 +21589,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21413: \$? = $ac_status" >&5
+  echo "$as_me:21595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21419: \$? = $ac_status" >&5
+  echo "$as_me:21601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21428,7 +21610,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21431 "configure"
+#line 21613 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21460,15 +21642,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21466: \$? = $ac_status" >&5
+  echo "$as_me:21648: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21471: \$? = $ac_status" >&5
+  echo "$as_me:21653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21480,7 +21662,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21483: result: $cf_result" >&5
+	echo "$as_me:21665: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21497,7 +21679,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21500: checking for X" >&5
+	echo "$as_me:21682: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21601,17 +21783,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21604 "configure"
+#line 21786 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21608: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21790: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21614: \$? = $ac_status" >&5
+  echo "$as_me:21796: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21644,7 +21826,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21647 "configure"
+#line 21829 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21656,16 +21838,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21662: \$? = $ac_status" >&5
+  echo "$as_me:21844: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21668: \$? = $ac_status" >&5
+  echo "$as_me:21850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21703,7 +21885,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21706: result: $have_x" >&5
+  echo "$as_me:21888: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21713,7 +21895,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21716: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21898: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21740,11 +21922,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21743: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21925: 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 21747 "configure"
+#line 21929 "configure"
 #include "confdefs.h"
 
 int
@@ -21756,16 +21938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21762: \$? = $ac_status" >&5
+  echo "$as_me:21944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21768: \$? = $ac_status" >&5
+  echo "$as_me:21950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21775,13 +21957,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21778: result: no" >&5
+	echo "$as_me:21960: 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 21784 "configure"
+#line 21966 "configure"
 #include "confdefs.h"
 
 int
@@ -21793,16 +21975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21799: \$? = $ac_status" >&5
+  echo "$as_me:21981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21805: \$? = $ac_status" >&5
+  echo "$as_me:21987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21812,11 +21994,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21815: result: yes" >&5
+	  echo "$as_me:21997: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21819: result: neither works" >&5
+	  echo "$as_me:22001: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21836,7 +22018,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21839 "configure"
+#line 22021 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21855,22 +22037,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21861: \$? = $ac_status" >&5
+  echo "$as_me:22043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21867: \$? = $ac_status" >&5
+  echo "$as_me:22049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21873: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:22055: 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
@@ -21878,7 +22060,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21881 "configure"
+#line 22063 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21897,16 +22079,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21903: \$? = $ac_status" >&5
+  echo "$as_me:22085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21909: \$? = $ac_status" >&5
+  echo "$as_me:22091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21917,14 +22099,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21920: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:22102: 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:21927: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:22109: 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
@@ -21932,7 +22114,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21935 "configure"
+#line 22117 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21951,16 +22133,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21957: \$? = $ac_status" >&5
+  echo "$as_me:22139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21963: \$? = $ac_status" >&5
+  echo "$as_me:22145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21971,7 +22153,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21974: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:22156: 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"
@@ -21990,13 +22172,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21993: checking for gethostbyname" >&5
+    echo "$as_me:22175: 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 21999 "configure"
+#line 22181 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22027,16 +22209,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:22215: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:22221: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -22046,11 +22228,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22049: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:22231: 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:22053: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22235: 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
@@ -22058,7 +22240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22061 "configure"
+#line 22243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22077,16 +22259,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22083: \$? = $ac_status" >&5
+  echo "$as_me:22265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22089: \$? = $ac_status" >&5
+  echo "$as_me:22271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22097,14 +22279,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22100: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22282: 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:22107: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22289: 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
@@ -22112,7 +22294,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22115 "configure"
+#line 22297 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22131,16 +22313,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22137: \$? = $ac_status" >&5
+  echo "$as_me:22319: \$? = $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:22322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22143: \$? = $ac_status" >&5
+  echo "$as_me:22325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22151,7 +22333,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22154: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22336: 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"
@@ -22167,13 +22349,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22170: checking for connect" >&5
+    echo "$as_me:22352: 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 22176 "configure"
+#line 22358 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22204,16 +22386,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22210: \$? = $ac_status" >&5
+  echo "$as_me:22392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22216: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22223,11 +22405,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22226: result: $ac_cv_func_connect" >&5
+echo "$as_me:22408: 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:22230: checking for connect in -lsocket" >&5
+      echo "$as_me:22412: 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
@@ -22235,7 +22417,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22238 "configure"
+#line 22420 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22254,16 +22436,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22266: \$? = $ac_status" >&5
+  echo "$as_me:22448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22274,7 +22456,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22277: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22459: 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"
@@ -22283,13 +22465,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22286: checking for remove" >&5
+    echo "$as_me:22468: 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 22292 "configure"
+#line 22474 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22320,16 +22502,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22326: \$? = $ac_status" >&5
+  echo "$as_me:22508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22332: \$? = $ac_status" >&5
+  echo "$as_me:22514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22339,11 +22521,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22342: result: $ac_cv_func_remove" >&5
+echo "$as_me:22524: 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:22346: checking for remove in -lposix" >&5
+      echo "$as_me:22528: 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
@@ -22351,7 +22533,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22354 "configure"
+#line 22536 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22370,16 +22552,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22376: \$? = $ac_status" >&5
+  echo "$as_me:22558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22382: \$? = $ac_status" >&5
+  echo "$as_me:22564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22390,7 +22572,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22393: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22575: 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"
@@ -22399,13 +22581,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22402: checking for shmat" >&5
+    echo "$as_me:22584: 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 22408 "configure"
+#line 22590 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22436,16 +22618,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22448: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22455,11 +22637,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22458: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22640: 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:22462: checking for shmat in -lipc" >&5
+      echo "$as_me:22644: 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
@@ -22467,7 +22649,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22470 "configure"
+#line 22652 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22486,16 +22668,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22492: \$? = $ac_status" >&5
+  echo "$as_me:22674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22498: \$? = $ac_status" >&5
+  echo "$as_me:22680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22506,7 +22688,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22509: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22691: 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"
@@ -22524,7 +22706,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22527: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22709: 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
@@ -22532,7 +22714,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22535 "configure"
+#line 22717 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22551,16 +22733,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22557: \$? = $ac_status" >&5
+  echo "$as_me:22739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22563: \$? = $ac_status" >&5
+  echo "$as_me:22745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22571,7 +22753,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22574: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22756: 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"
@@ -22618,16 +22800,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22621: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22803: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22626: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22808: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22630: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22812: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22666,16 +22848,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22669: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22851: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22674: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22856: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22678: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22860: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22714,23 +22896,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22717: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22899: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22722: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22904: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22726: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22908: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22733: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22915: 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.
@@ -22747,7 +22929,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22750: result: $enable_warnings" >&5
+echo "$as_me:22932: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22770,10 +22952,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:22773: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:22955: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 22776 "${as_me:-configure}"
+#line 22958 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -22823,12 +23005,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22829: \$? = $ac_status" >&5
+  echo "$as_me:23011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22831: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:23013: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22906,7 +23088,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22909 "configure"
+#line 23091 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22921,26 +23103,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22927: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22933: \$? = $ac_status" >&5
+  echo "$as_me:23115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22936: checking for X11/Xt const-feature" >&5
+echo "$as_me:23118: 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 22943 "configure"
+#line 23125 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22958,16 +23140,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:23146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22970: \$? = $ac_status" >&5
+  echo "$as_me:23152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22982,7 +23164,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22985: result: $cf_cv_const_x_string" >&5
+echo "$as_me:23167: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -23011,7 +23193,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 23014 "${as_me:-configure}"
+#line 23196 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -23027,7 +23209,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:23030: checking for $CC warning options..." >&5
+	{ echo "$as_me:23212: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -23043,12 +23225,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23049: \$? = $ac_status" >&5
+  echo "$as_me:23231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23051: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23233: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -23056,7 +23238,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:23059: checking for $CC warning options..." >&5
+	{ echo "$as_me:23241: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23079,12 +23261,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23082: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23085: \$? = $ac_status" >&5
+  echo "$as_me:23267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23087: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23269: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23092,7 +23274,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23277: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23102,7 +23284,7 @@ echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23105: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23287: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23119,7 +23301,7 @@ fi
 
 fi
 
-echo "$as_me:23122: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23304: 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.
@@ -23141,7 +23323,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:23144: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23326: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23255,23 +23437,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23258: checking for dmalloc.h" >&5
+	echo "$as_me:23440: 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 23264 "configure"
+#line 23446 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23450: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23274: \$? = $ac_status" >&5
+  echo "$as_me:23456: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23290,11 +23472,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23293: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23475: 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:23297: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23479: 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
@@ -23302,7 +23484,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23305 "configure"
+#line 23487 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23321,16 +23503,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23327: \$? = $ac_status" >&5
+  echo "$as_me:23509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23333: \$? = $ac_status" >&5
+  echo "$as_me:23515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23341,7 +23523,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23344: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23526: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -23356,7 +23538,7 @@ fi
 
 fi
 
-echo "$as_me:23359: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23541: 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.
@@ -23378,7 +23560,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23381: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23563: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23492,23 +23674,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23495: checking for dbmalloc.h" >&5
+	echo "$as_me:23677: 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 23501 "configure"
+#line 23683 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23505: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23511: \$? = $ac_status" >&5
+  echo "$as_me:23693: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23527,11 +23709,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23530: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23712: 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:23534: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23716: 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
@@ -23539,7 +23721,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23542 "configure"
+#line 23724 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23558,16 +23740,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23564: \$? = $ac_status" >&5
+  echo "$as_me:23746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23570: \$? = $ac_status" >&5
+  echo "$as_me:23752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23578,7 +23760,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23581: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23763: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23593,7 +23775,7 @@ fi
 
 fi
 
-echo "$as_me:23596: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23778: 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.
@@ -23615,7 +23797,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23618: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23800: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23728,7 +23910,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23731: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23913: 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.
@@ -23739,7 +23921,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23742: result: $with_no_leaks" >&5
+echo "$as_me:23924: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23757,7 +23939,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23760: checking for an rpath option" >&5
+	echo "$as_me:23942: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23788,12 +23970,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23791: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23973: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23796: checking if we need a space after rpath option" >&5
+		echo "$as_me:23978: 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"
 
@@ -23814,7 +23996,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23817 "configure"
+#line 23999 "configure"
 #include "confdefs.h"
 
 int
@@ -23826,16 +24008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23832: \$? = $ac_status" >&5
+  echo "$as_me:24014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23838: \$? = $ac_status" >&5
+  echo "$as_me:24020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23845,14 +24027,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23848: result: $cf_rpath_space" >&5
+		echo "$as_me:24030: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23855: checking if rpath-hack should be disabled" >&5
+echo "$as_me:24037: 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.
@@ -23870,22 +24052,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23873: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:24055: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23878: checking for updated LDFLAGS" >&5
+echo "$as_me:24060: 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:23881: result: maybe" >&5
+	echo "$as_me:24063: 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:23888: checking for $ac_word" >&5
+echo "$as_me:24070: 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
@@ -23900,7 +24082,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23903: found $ac_dir/$ac_word" >&5
+echo "$as_me:24085: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23908,10 +24090,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23911: result: $cf_ldd_prog" >&5
+  echo "$as_me:24093: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23914: result: no" >&5
+  echo "$as_me:24096: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23925,7 +24107,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23928 "configure"
+#line 24110 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23937,16 +24119,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23943: \$? = $ac_status" >&5
+  echo "$as_me:24125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23949: \$? = $ac_status" >&5
+  echo "$as_me:24131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23974,7 +24156,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:24159: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23986,11 +24168,11 @@ echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24171: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24175: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -24027,7 +24209,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24212: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24040,11 +24222,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24225: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24047: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24229: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24081,7 +24263,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24266: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24094,14 +24276,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24097: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24279: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24283: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24104: result: no" >&5
+	echo "$as_me:24286: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24191,7 +24373,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24194: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24376: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24372,7 +24554,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24375: error: ambiguous option: $1
+    { { echo "$as_me:24557: 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;}
@@ -24391,7 +24573,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24394: error: unrecognized option: $1
+  -*) { { echo "$as_me:24576: 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;}
@@ -24441,7 +24623,7 @@ do
   "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:24444: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24626: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24608,6 +24790,7 @@ s,@ECHO_CC@,$ECHO_CC,;t t
 s,@DESTDIR@,$DESTDIR,;t t
 s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
 s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
+s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
 s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
@@ -24757,7 +24940,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24760: creating $ac_file" >&5
+    { echo "$as_me:24943: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24775,7 +24958,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24778: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24961: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24788,7 +24971,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24791: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24974: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24804,7 +24987,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24807: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24990: 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;}
@@ -24813,7 +24996,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24816: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24999: 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;}
@@ -24858,7 +25041,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:24861: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:25044: 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;}
@@ -24869,7 +25052,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24872: WARNING: Some variables may not be substituted:
+      { echo "$as_me:25055: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24918,7 +25101,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24921: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:25104: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24929,7 +25112,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24932: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25115: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24942,7 +25125,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24945: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25128: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25000,7 +25183,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:25003: $ac_file is unchanged" >&5
+      { echo "$as_me:25186: $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/test/parse_rgb.h b/test/parse_rgb.h
index b931ed00a..1efd972e4 100644
--- a/test/parse_rgb.h
+++ b/test/parse_rgb.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  *                                                                          *
  * 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: parse_rgb.h,v 1.6 2024/10/05 19:26:24 tom Exp $
+ * $Id: parse_rgb.h,v 1.7 2025/01/18 15:03:33 tom Exp $
  *
  * Sample implementation of ncurses RGB extension from user_caps(5).
  */
@@ -58,13 +58,13 @@ parse_rgb(int *r_max, int *g_max, int *b_max)
 	    ;
 	}
 
-	if (tigetflag("RGB") > 0) {
+	if (tigetflag(UserCap(RGB)) > 0) {
 	    result = OK;
 	    r = g = b = (max_bits + 2) / 3;
-	} else if ((bits = tigetnum("RGB")) > 0) {
+	} else if ((bits = tigetnum(UserCap(RGB))) > 0) {
 	    result = OK;
 	    r = g = b = bits;
-	} else if ((data = tigetstr("RGB")) != ABSENT_STRING
+	} else if ((data = tigetstr(UserCap(RGB))) != ABSENT_STRING
 		   && data != CANCELLED_STRING
 		   && sscanf(data, "%d/%d/%d%c", &r, &g, &b, &ch) == 3) {
 	    result = OK;
diff --git a/test/test.priv.h b/test/test.priv.h
index f495a6987..33778b73d 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.220 2024/10/05 19:01:00 tom Exp $ */
+/* $Id: test.priv.h,v 1.221 2025/01/18 15:07:25 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -852,6 +852,12 @@ extern "C" {
 #define _nc_SLIMIT(n)		/* nothing */
 #endif
 
+/*
+ * To make them easier to find, user-defined capabilities used within ncurses
+ * should be tagged with this macro:
+ */
+#define UserCap(name) #name
+
 /*
  * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4
  * curses did, and some implementations provide them anyway, but undeclared.
diff --git a/test/test_mouse.c b/test/test_mouse.c
index fcbe52674..7c2ec27ec 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2022-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2022-2024,2025 Thomas E. Dickey                                *
  * Copyright 2022 Leonid S. Usov <leonid.s.usov at gmail.com>               *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.35 2024/11/30 18:46:48 tom Exp $
+ * $Id: test_mouse.c,v 1.36 2025/01/18 15:03:25 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -44,7 +44,7 @@ raw_loop(void)
 
     newterm(NULL, stdout, stdin);
     raw();
-    xtermcap = tigetstr("XM");
+    xtermcap = tigetstr(UserCap(XM));
     if (!VALID_STRING(xtermcap)) {
 	fprintf(stderr, "couldn't get XM terminfo");
 	return;

From cf23880ba6d0dbfcc8459832ab3c2f4d058473d1 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 26 Jan 2025 01:34:44 +0100
Subject: [PATCH 100/106] ncurses-6.5-20250125.patch.gz

---
 Ada95/gen/gen.c                               |   6 +-
 Ada95/samples/sample-explanation.adb_p        |   8 +-
 Ada95/src/terminal_interface-curses-forms.adb |   8 +-
 Ada95/src/terminal_interface-curses-menus.adb |   8 +-
 ...inal_interface-curses-panels-user_data.adb |   4 +-
 NEWS                                          |   6 +-
 VERSION                                       |   2 +-
 c++/cursesapp.cc                              |  22 +--
 c++/cursesf.cc                                | 135 ++++++++++--------
 c++/cursesf.h                                 |  42 +++---
 c++/cursesm.cc                                | 118 ++++++++-------
 c++/cursesm.h                                 |  42 +++---
 c++/cursesp.cc                                |   8 +-
 c++/cursesp.h                                 |  16 +--
 c++/cursespad.cc                              |  22 +--
 c++/cursesw.cc                                |  42 +++---
 c++/cursesw.h                                 |   6 +-
 c++/demo.cc                                   |  20 +--
 c++/etip.h.in                                 |  20 +--
 dist.mk                                       |   4 +-
 ncurses/base/lib_mouse.c                      |  24 ++--
 ncurses/base/lib_set_term.c                   |   6 +-
 ncurses/tty/lib_twait.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 +-
 30 files changed, 313 insertions(+), 284 deletions(-)

diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index b37de1b02..fae38f97d 100644
--- a/Ada95/gen/gen.c
+++ b/Ada95/gen/gen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 /*
     Version Control
-    $Id: gen.c,v 1.79 2024/01/19 13:41:45 tom Exp $
+    $Id: gen.c,v 1.80 2025/01/24 20:39:23 tom Exp $
   --------------------------------------------------------------------------*/
 /*
   This program prints on its standard output the source for the
@@ -189,7 +189,7 @@ find_pos(const UCHAR * const data,
 int
 main(int argc, const char *argv[])
 {
-  FILE *fp = 0;
+  FILE *fp = NULL;
   const int x = 0x12345678;
 
   little_endian = (*((const char *)&x) == 0x78);
diff --git a/Ada95/samples/sample-explanation.adb_p b/Ada95/samples/sample-explanation.adb_p
index f99ceb6f7..79348e97d 100644
--- a/Ada95/samples/sample-explanation.adb_p
+++ b/Ada95/samples/sample-explanation.adb_p
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2019,2020 Thomas E. Dickey                                     --
+-- Copyright 2019-2020,2025 Thomas E. Dickey                                --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +35,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.5 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.6 $
+--  $Date: 2025/01/24 20:39:23 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Poor mans help system. This scans a sequential file for key lines and
@@ -136,7 +136,7 @@ package body Sample.Explanation is
          H : Help_Line_Access := Top_Line;
       begin
          if Top_Line /= null then
-            for L in 0 .. (Height - 1) loop
+            for L in 0 .. Height - 1 loop
                Add (W, L, 0, H.all.Line.all);
                exit when H.all.Next = null;
                H := H.all.Next;
diff --git a/Ada95/src/terminal_interface-curses-forms.adb b/Ada95/src/terminal_interface-curses-forms.adb
index f50420e6f..2e6fd16c2 100644
--- a/Ada95/src/terminal_interface-curses-forms.adb
+++ b/Ada95/src/terminal_interface-curses-forms.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2020,2025 Thomas E. Dickey                                     --
 -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.33 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.34 $
+--  $Date: 2025/01/24 20:39:23 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Deallocation;
@@ -1006,7 +1006,7 @@ package body Terminal_Interface.Curses.Forms is
         (Field_Array, Field_Array_Access);
    begin
       if FA /= null and then Free_Fields then
-         for I in FA'First .. (FA'Last - 1) loop
+         for I in FA'First .. FA'Last - 1 loop
             if FA.all (I) /= Null_Field then
                Delete (FA.all (I));
             end if;
diff --git a/Ada95/src/terminal_interface-curses-menus.adb b/Ada95/src/terminal_interface-curses-menus.adb
index 76f3e36ea..9febcf9de 100644
--- a/Ada95/src/terminal_interface-curses-menus.adb
+++ b/Ada95/src/terminal_interface-curses-menus.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2018-2020,2025 Thomas E. Dickey                                --
 -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.34 $
---  $Date: 2020/02/02 23:34:34 $
+--  $Revision: 1.35 $
+--  $Date: 2025/01/24 20:39:23 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Deallocation;
@@ -878,7 +878,7 @@ package body Terminal_Interface.Curses.Menus is
         (Item_Array, Item_Array_Access);
    begin
       if IA /= null and then Free_Items then
-         for I in IA'First .. (IA'Last - 1) loop
+         for I in IA'First .. IA'Last - 1 loop
             if IA.all (I) /= Null_Item then
                Delete (IA.all (I));
             end if;
diff --git a/Ada95/src/terminal_interface-curses-panels-user_data.adb b/Ada95/src/terminal_interface-curses-panels-user_data.adb
index 504b07d4f..4a951a4d8 100644
--- a/Ada95/src/terminal_interface-curses-panels-user_data.adb
+++ b/Ada95/src/terminal_interface-curses-panels-user_data.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2020,2025 Thomas E. Dickey                                     --
 -- Copyright 1999-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
@@ -36,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.13 $
+--  $Revision: 1.14 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Interfaces.C;
diff --git a/NEWS b/NEWS
index 2e8ab22c7..b6c2796ee 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4233 2025/01/19 01:24:13 tom Exp $
+-- $Id: NEWS,v 1.4236 2025/01/25 21:30:09 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250125
+	+ improve error-handling in c++ binding (report by Mingjie Shen).
+	+ strict compiler-warning fixes for upcoming gcc15
+
 20250118
 	+ improve pattern used for configure --with-xterm-kbs option (report by
 	  Mingyu Wang)
diff --git a/VERSION b/VERSION
index d2b8914cf..979a3b330 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250118
+5:0:10	6.5	20250125
diff --git a/c++/cursesapp.cc b/c++/cursesapp.cc
index 81f60983a..5cfc105ae 100644
--- a/c++/cursesapp.cc
+++ b/c++/cursesapp.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2025 Thomas E. Dickey                                *
  * Copyright 1998-2007,2008 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include "internal.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursesapp.cc,v 1.18 2020/07/18 19:57:11 anonymous.maarten Exp $")
+MODULE_ID("$Id: cursesapp.cc,v 1.19 2025/01/25 21:20:17 tom Exp $")
 
 void
 NCursesApplication::init(bool bColors)
@@ -65,9 +65,9 @@ NCursesApplication::init(bool bColors)
   Root_Window->bkgd(' '|window_backgrounds());
 }
 
-NCursesApplication* NCursesApplication::theApp = 0;
-NCursesWindow* NCursesApplication::titleWindow = 0;
-NCursesApplication::SLK_Link* NCursesApplication::slk_stack = 0;
+NCursesApplication* NCursesApplication::theApp = NULL;
+NCursesWindow* NCursesApplication::titleWindow = NULL;
+NCursesApplication::SLK_Link* NCursesApplication::slk_stack = NULL;
 
 
 NCursesWindow *&NCursesApplication::getTitleWindow() {
@@ -79,7 +79,7 @@ NCursesApplication::~NCursesApplication() THROWS(NCursesException)
   Soft_Label_Key_Set* S;
 
   delete titleWindow;
-  titleWindow = 0;
+  titleWindow = NULL;
 
   while( (S=top()) ) {
     pop();
@@ -87,7 +87,7 @@ NCursesApplication::~NCursesApplication() THROWS(NCursesException)
   }
 
   delete Root_Window;
-  Root_Window = 0;
+  Root_Window = NULL;
 
   ::endwin();
 }
@@ -105,7 +105,7 @@ int NCursesApplication::rinit(NCursesWindow& w)
 void NCursesApplication::push(Soft_Label_Key_Set& S)
 {
   SLK_Link* L = new SLK_Link;
-  assert(L != 0);
+  assert(L != NULL);
   L->prev = slk_stack;
   L->SLKs = &S;
   slk_stack = L;
@@ -121,7 +121,7 @@ bool NCursesApplication::pop()
     delete L;
     if (Root_Window) {
       Soft_Label_Key_Set* xx = top();
-      if (xx != 0)
+      if (xx != NULL)
         xx->show();
     }
   }
@@ -139,7 +139,7 @@ Soft_Label_Key_Set* NCursesApplication::top() const
 int NCursesApplication::operator()(void)
 {
   bool bColors = b_Colors;
-  Soft_Label_Key_Set* S = 0;
+  Soft_Label_Key_Set* S = NULL;
 
   int ts = titlesize();
   if (ts>0)
@@ -147,7 +147,7 @@ int NCursesApplication::operator()(void)
   Soft_Label_Key_Set::Label_Layout fmt = useSLKs();
   if (fmt!=Soft_Label_Key_Set::None) {
     S = new Soft_Label_Key_Set(fmt);
-    assert(S != 0);
+    assert(S != NULL);
     init_labels(*S);
   }
 
diff --git a/c++/cursesf.cc b/c++/cursesf.cc
index bf89ecafc..747564daa 100644
--- a/c++/cursesf.cc
+++ b/c++/cursesf.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2005,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include "cursesf.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursesf.cc,v 1.27 2024/10/05 22:47:12 tom Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.28 2025/01/25 21:20:17 tom Exp $")
 
 NCursesFormField::~NCursesFormField () THROWS(NCursesException)
 {
@@ -50,28 +50,34 @@ NCursesFormField::~NCursesFormField () THROWS(NCursesException)
 FIELD**
 NCursesForm::mapFields(NCursesFormField* nfields[])
 {
-  int fieldCount = 0,lcv;
+  int fieldCount = 0, lcv;
   FIELD** old_fields;
 
-  assert(nfields != 0);
+  assert(nfields != NULL);
 
   for (lcv=0; nfields[lcv]->field; ++lcv)
     ++fieldCount;
 
-  FIELD** fields = new FIELD*[fieldCount + 1];
+  try {
+    FIELD** fields = new FIELD*[fieldCount + 1];
 
-  for (lcv=0;nfields[lcv]->field;++lcv) {
-    fields[lcv] = nfields[lcv]->field;
-  }
-  fields[lcv] = NULL;
+    for (lcv=0;nfields[lcv]->field;++lcv) {
+      fields[lcv] = nfields[lcv]->field;
+    }
+    fields[lcv] = NULL;
 
-  my_fields = nfields;
+    my_fields = nfields;
 
-  if (form && (old_fields = ::form_fields(form))) {
-    ::set_form_fields(form, static_cast<FIELD**>(0));
-    delete[] old_fields;
+    if (form && (old_fields = ::form_fields(form))) {
+      ::set_form_fields(form, static_cast<FIELD**>(0));
+      delete[] old_fields;
+    }
+    return fields;
   }
-  return fields;
+  catch (std::bad_alloc const&) {
+    OnError (E_SYSTEM_ERROR);
+  }
+  return NULL;
 }
 
 void NCursesForm::setDefaultAttributes()
@@ -108,46 +114,51 @@ NCursesForm::InitForm(NCursesFormField* nfields[],
 		      bool with_frame,
 		      bool autoDelete_Fields)
 {
-  int mrows, mcols;
-
-  keypad(TRUE);
-  meta(TRUE);
-
-  b_framed = with_frame;
-  b_autoDelete = autoDelete_Fields;
-
-  form = static_cast<FORM*>(0);
-  form = ::new_form(mapFields(nfields));
-  if (!form)
-    OnError (E_SYSTEM_ERROR);
-
-  UserHook* hook = new UserHook;
-  hook->m_user   = NULL;
-  hook->m_back   = this;
-  hook->m_owner  = form;
-  ::set_form_userptr(form, reinterpret_cast<void*>(hook));
-
-  ::set_form_init  (form, _nc_xx_frm_init);
-  ::set_form_term  (form, _nc_xx_frm_term);
-  ::set_field_init (form, _nc_xx_fld_init);
-  ::set_field_term (form, _nc_xx_fld_term);
-
-  scale(mrows, mcols);
-  ::set_form_win(form, w);
-
-  if (with_frame) {
-    if ((mrows > height()-2) || (mcols > width()-2))
-      OnError(E_NO_ROOM);
-    sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
-    ::set_form_sub(form, sub->w);
-    b_sub_owner = TRUE;
+  try {
+    int mrows, mcols;
+
+    keypad(TRUE);
+    meta(TRUE);
+
+    b_framed = with_frame;
+    b_autoDelete = autoDelete_Fields;
+
+    form = static_cast<FORM*>(0);
+    form = ::new_form(mapFields(nfields));
+    if (!form)
+      OnError (E_SYSTEM_ERROR);
+
+    UserHook* hook = new UserHook;
+    hook->m_user   = NULL;
+    hook->m_back   = this;
+    hook->m_owner  = form;
+    ::set_form_userptr(form, reinterpret_cast<void*>(hook));
+
+    ::set_form_init  (form, _nc_xx_frm_init);
+    ::set_form_term  (form, _nc_xx_frm_term);
+    ::set_field_init (form, _nc_xx_fld_init);
+    ::set_field_term (form, _nc_xx_fld_term);
+
+    scale(mrows, mcols);
+    ::set_form_win(form, w);
+
+    if (with_frame) {
+      if ((mrows > height()-2) || (mcols > width()-2))
+        OnError(E_NO_ROOM);
+      sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
+      ::set_form_sub(form, sub->w);
+      b_sub_owner = TRUE;
+    }
+    else {
+      sub = static_cast<NCursesWindow*>(NULL);
+      b_sub_owner = FALSE;
+    }
+    options_on(O_NL_OVERLOAD);
+    setDefaultAttributes();
   }
-  else {
-    sub = static_cast<NCursesWindow*>(0);
-    b_sub_owner = FALSE;
+  catch (std::bad_alloc const&) {
+    OnError (E_SYSTEM_ERROR);
   }
-  options_on(O_NL_OVERLOAD);
-  setDefaultAttributes();
 }
 
 NCursesForm::~NCursesForm() THROWS(NCursesException)
@@ -156,13 +167,13 @@ NCursesForm::~NCursesForm() THROWS(NCursesException)
   delete hook;
   if (b_sub_owner) {
     delete sub;
-    ::set_form_sub(form, static_cast<WINDOW *>(0));
+    ::set_form_sub(form, static_cast<WINDOW *>(NULL));
   }
   if (form) {
     FIELD** fields = ::form_fields(form);
     int cnt = count();
 
-    OnError(::set_form_fields(form, static_cast<FIELD**>(0)));
+    OnError(::set_form_fields(form, static_cast<FIELD**>(NULL)));
 
     if (b_autoDelete) {
       if (cnt>0) {
@@ -381,19 +392,19 @@ bool _nc_xx_fld_fcheck(FIELD *f, const void *u)
 {
   (void) f;
   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-  assert(F != 0);
+  assert(F != NULL);
   UserDefinedFieldType* udf = reinterpret_cast<UserDefinedFieldType*>(F->fieldtype());
-  assert(udf != 0);
+  assert(udf != NULL);
   return udf->field_check(*F);
 }
 
 bool _nc_xx_fld_ccheck(int c, const void *u)
 {
   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-  assert(F != 0);
+  assert(F != NULL);
   UserDefinedFieldType* udf =
     reinterpret_cast<UserDefinedFieldType*>(F->fieldtype());
-  assert(udf != 0);
+  assert(udf != NULL);
   return udf->char_check(c);
 }
 
@@ -423,10 +434,10 @@ bool _nc_xx_next_choice(FIELD *f, const void *u)
 {
   (void) f;
   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-  assert(F != 0);
+  assert(F != NULL);
   UserDefinedFieldType_With_Choice* udf =
     reinterpret_cast<UserDefinedFieldType_With_Choice*>(F->fieldtype());
-  assert(udf != 0);
+  assert(udf != NULL);
   return udf->next(*F);
 }
 
@@ -434,10 +445,10 @@ bool _nc_xx_prev_choice(FIELD *f, const void *u)
 {
   (void) f;
   NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u));
-  assert(F != 0);
+  assert(F != NULL);
   UserDefinedFieldType_With_Choice* udf =
     reinterpret_cast<UserDefinedFieldType_With_Choice*>(F->fieldtype());
-  assert(udf != 0);
+  assert(udf != NULL);
   return udf->previous(*F);
 }
 
diff --git a/c++/cursesf.h b/c++/cursesf.h
index f242fc745..7d6c2b717 100644
--- a/c++/cursesf.h
+++ b/c++/cursesf.h
@@ -1,7 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -33,7 +33,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: cursesf.h,v 1.40 2024/10/05 22:47:12 tom Exp $
+// $Id: cursesf.h,v 1.41 2025/01/25 21:20:17 tom Exp $
 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1
@@ -78,7 +78,7 @@ class NCURSES_CXX_IMPEXP NCursesFieldType
 
 public:
   NCursesFieldType()
-    : fieldtype(STATIC_CAST(FIELDTYPE*)(0))
+    : fieldtype(STATIC_CAST(FIELDTYPE*)(NULL))
   {
   }
 
@@ -119,8 +119,8 @@ class NCURSES_CXX_IMPEXP NCursesFormField
 public:
   // Create a 'Null' field. Can be used to delimit a field list
   NCursesFormField()
-    : field(STATIC_CAST(FIELD*)(0)),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
+    : field(STATIC_CAST(FIELD*)(NULL)),
+      ftype(STATIC_CAST(NCursesFieldType*)(NULL))
   {
   }
 
@@ -131,8 +131,8 @@ class NCURSES_CXX_IMPEXP NCursesFormField
 		    int first_col = 0,
 		    int offscreen_rows = 0,
 		    int additional_buffers = 0)
-    : field(0),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
+    : field(NULL),
+      ftype(STATIC_CAST(NCursesFieldType*)(NULL))
   {
       field = ::new_field(rows, ncols, first_row, first_col,
 			  offscreen_rows, additional_buffers);
@@ -363,7 +363,7 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
   // Get the backward pointer to the C++ object from a FORM
   static inline NCursesForm* getHook(const FORM *f) {
     UserHook* hook = reinterpret_cast<UserHook*>(::form_userptr(f));
-    assert(hook != 0 && hook->m_owner==f);
+    assert(hook != NULL && hook->m_owner==f);
     return const_cast<NCursesForm*>(hook->m_back);
   }
 
@@ -379,13 +379,13 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
   // internal routines
   inline void set_user(void *user) {
     UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
+    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form);
     uptr->m_user = user;
   }
 
   inline void *get_user() {
     const UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
+    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form);
     return uptr->m_user;
   }
 
@@ -408,12 +408,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
 	       int  begin_y = 0,
 	       int  begin_x = 0)
     : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form (STATIC_CAST(FORM*)(0)),
-      sub(0),
+      form (STATIC_CAST(FORM*)(NULL)),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_fields(0)
+      my_fields(NULL)
   {
   }
 
@@ -423,12 +423,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
 	       bool with_frame=FALSE,	      // reserve space for a frame?
 	       bool autoDelete_Fields=FALSE)  // do automatic cleanup?
     : NCursesPanel(),
-      form(0),
-      sub(0),
+      form(NULL),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_fields(0)
+      my_fields(NULL)
   {
     InitForm(Fields, with_frame, autoDelete_Fields);
   }
@@ -442,12 +442,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel
 	       bool with_frame=FALSE,	     // reserve space for a frame?
 	       bool autoDelete_Fields=FALSE) // do automatic cleanup?
     : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form(0),
-      sub(0),
+      form(NULL),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_fields(0)
+      my_fields(NULL)
   {
       InitForm(Fields, with_frame, autoDelete_Fields);
   }
@@ -681,7 +681,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserForm : public NCursesForm
 
 public:
   NCursesUserForm (NCursesFormField* Fields[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
+		   const T* p_UserData = STATIC_CAST(T*)(NULL),
 		   bool with_frame=FALSE,
 		   bool autoDelete_Fields=FALSE)
     : NCursesForm (Fields, with_frame, autoDelete_Fields) {
@@ -694,7 +694,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserForm : public NCursesForm
 		   int ncols,
 		   int begin_y = 0,
 		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
+		   const T* p_UserData = STATIC_CAST(T*)(NULL),
 		   bool with_frame=FALSE,
 		   bool autoDelete_Fields=FALSE)
     : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
diff --git a/c++/cursesm.cc b/c++/cursesm.cc
index 3d3ed76f4..e75539173 100644
--- a/c++/cursesm.cc
+++ b/c++/cursesm.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #include "cursesm.h"
 #include "cursesapp.h"
 
-MODULE_ID("$Id: cursesm.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
+MODULE_ID("$Id: cursesm.cc,v 1.29 2025/01/25 21:20:17 tom Exp $")
 
 NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException)
 {
@@ -100,23 +100,28 @@ _nc_xx_itm_term(MENU *m)
 ITEM**
 NCursesMenu::mapItems(NCursesMenuItem* nitems[])
 {
-  int itemCount = 0,lcv;
+  try {
+    int itemCount = 0,lcv;
 
-  for (lcv=0; nitems[lcv]->item; ++lcv)
-    ++itemCount;
+    for (lcv=0; nitems[lcv]->item; ++lcv)
+      ++itemCount;
 
-  ITEM** itemArray = new ITEM*[itemCount + 1];
+    ITEM** itemArray = new ITEM*[itemCount + 1];
 
-  for (lcv=0;nitems[lcv]->item;++lcv) {
-    itemArray[lcv] = nitems[lcv]->item;
-  }
-  itemArray[lcv] = NULL;
+    for (lcv=0;nitems[lcv]->item;++lcv) {
+      itemArray[lcv] = nitems[lcv]->item;
+    }
+    itemArray[lcv] = NULL;
 
-  my_items = nitems;
+    my_items = nitems;
 
-  if (menu)
-    delete[] ::menu_items(menu);
-  return itemArray;
+    if (menu)
+      delete[] ::menu_items(menu);
+    return itemArray;
+  }
+  catch (std::bad_alloc const&) {
+  }
+  return NULL;
 }
 
 void
@@ -124,45 +129,50 @@ NCursesMenu::InitMenu(NCursesMenuItem* nitems[],
 		      bool with_frame,
 		      bool autoDelete_Items)
 {
-  int mrows, mcols;
-
-  keypad(TRUE);
-  meta(TRUE);
-
-  b_framed = with_frame;
-  b_autoDelete = autoDelete_Items;
-
-  menu = static_cast<MENU*>(0);
-  menu = ::new_menu(mapItems(nitems));
-  if (!menu)
-    OnError (E_SYSTEM_ERROR);
-
-  UserHook* hook = new UserHook;
-  hook->m_user   = NULL;
-  hook->m_back   = this;
-  hook->m_owner  = menu;
-  ::set_menu_userptr(menu, static_cast<void*>(hook));
-
-  ::set_menu_init (menu, _nc_xx_mnu_init);
-  ::set_menu_term (menu, _nc_xx_mnu_term);
-  ::set_item_init (menu, _nc_xx_itm_init);
-  ::set_item_term (menu, _nc_xx_itm_term);
-
-  scale(mrows, mcols);
-  ::set_menu_win(menu, w);
-
-  if (with_frame) {
-    if ((mrows > height()-2) || (mcols > width()-2))
-      OnError(E_NO_ROOM);
-    sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
-    ::set_menu_sub(menu, sub->w);
-    b_sub_owner = TRUE;
+  try {
+    int mrows, mcols;
+
+    keypad(TRUE);
+    meta(TRUE);
+
+    b_framed = with_frame;
+    b_autoDelete = autoDelete_Items;
+
+    menu = static_cast<MENU*>(NULL);
+    menu = ::new_menu(mapItems(nitems));
+    if (!menu)
+      OnError (E_SYSTEM_ERROR);
+
+    UserHook* hook = new UserHook;
+    hook->m_user   = NULL;
+    hook->m_back   = this;
+    hook->m_owner  = menu;
+    ::set_menu_userptr(menu, static_cast<void*>(hook));
+
+    ::set_menu_init (menu, _nc_xx_mnu_init);
+    ::set_menu_term (menu, _nc_xx_mnu_term);
+    ::set_item_init (menu, _nc_xx_itm_init);
+    ::set_item_term (menu, _nc_xx_itm_term);
+
+    scale(mrows, mcols);
+    ::set_menu_win(menu, w);
+
+    if (with_frame) {
+      if ((mrows > height()-2) || (mcols > width()-2))
+        OnError(E_NO_ROOM);
+      sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
+      ::set_menu_sub(menu, sub->w);
+      b_sub_owner = TRUE;
+    }
+    else {
+      sub = static_cast<NCursesWindow*>(NULL);
+      b_sub_owner = FALSE;
+    }
+    setDefaultAttributes();
   }
-  else {
-    sub = static_cast<NCursesWindow*>(0);
-    b_sub_owner = FALSE;
+  catch (std::bad_alloc const&) {
+    OnError (E_SYSTEM_ERROR);
   }
-  setDefaultAttributes();
 }
 
 void
@@ -181,14 +191,14 @@ NCursesMenu::~NCursesMenu() THROWS(NCursesException)
   UserHook* hook = reinterpret_cast<UserHook*>(::menu_userptr(menu));
   delete hook;
   if (b_sub_owner) {
-    ::set_menu_sub(menu, static_cast<WINDOW *>(0));
+    ::set_menu_sub(menu, static_cast<WINDOW *>(NULL));
     delete sub;
   }
   if (menu) {
     ITEM** itms = ::menu_items(menu);
     int cnt = count();
 
-    OnError(::set_menu_items(menu, static_cast<ITEM**>(0)));
+    OnError(::set_menu_items(menu, static_cast<ITEM**>(NULL)));
 
     if (b_autoDelete) {
       if (cnt>0) {
@@ -322,7 +332,7 @@ NCursesMenu::operator()(void)
       if (drvCmnd == CMD_ACTION) {
 	if (options() & O_ONEVALUE) {
 	  NCursesMenuItem* itm = current_item();
-	  assert(itm != 0);
+	  assert(itm != NULL);
 	  if (itm->options() & O_SELECTABLE)
 	    {
 	      b_action = itm->action();
diff --git a/c++/cursesm.h b/c++/cursesm.h
index 27ccec44d..6e4a184ce 100644
--- a/c++/cursesm.h
+++ b/c++/cursesm.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: cursesm.h,v 1.36 2024/10/05 22:47:12 tom Exp $
+// $Id: cursesm.h,v 1.37 2025/01/25 21:20:17 tom Exp $
 
 #ifndef NCURSES_CURSESM_H_incl
 #define NCURSES_CURSESM_H_incl 1
@@ -62,9 +62,9 @@ class NCURSES_CXX_IMPEXP NCursesMenuItem
 public:
   NCursesMenuItem (const char* p_name     = NULL,
 		   const char* p_descript = NULL)
-    : item(0)
+    : item(NULL)
   {
-    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(0);
+    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(NULL);
     if (p_name && !item)
       OnError (E_SYSTEM_ERROR);
   }
@@ -81,7 +81,7 @@ class NCURSES_CXX_IMPEXP NCursesMenuItem
   }
 
   NCursesMenuItem(const NCursesMenuItem& rhs)
-    : item(0)
+    : item(NULL)
   {
     (void) rhs;
   }
@@ -176,7 +176,7 @@ class NCURSES_CXX_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem
 
   NCursesMenuCallbackItem(const NCursesMenuCallbackItem& rhs)
     : NCursesMenuItem(rhs),
-      p_fct(0)
+      p_fct(NULL)
   {
   }
 
@@ -224,7 +224,7 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
   // Get the backward pointer to the C++ object from a MENU
   static inline NCursesMenu* getHook(const MENU *m) {
     UserHook* hook = STATIC_CAST(UserHook*)(::menu_userptr(m));
-    assert(hook != 0 && hook->m_owner==m);
+    assert(hook != NULL && hook->m_owner==m);
     return const_cast<NCursesMenu*>(hook->m_back);
   }
 
@@ -240,13 +240,13 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
   // internal routines
   inline void set_user(void *user) {
     UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
+    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu);
     uptr->m_user = user;
   }
 
   inline void *get_user() {
     const UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
+    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu);
     return uptr->m_user;
   }
 
@@ -270,11 +270,11 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
 	       int  begin_x = 0)
     : NCursesPanel(nlines,ncols,begin_y,begin_x),
       menu (STATIC_CAST(MENU*)(0)),
-      sub(0),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_items(0)
+      my_items(NULL)
   {
   }
 
@@ -284,12 +284,12 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
 	       bool with_frame=FALSE,        // Reserve space for a frame?
 	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
     : NCursesPanel(),
-      menu(0),
-      sub(0),
+      menu(NULL),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_items(0)
+      my_items(NULL)
   {
       InitMenu(Items, with_frame, autoDelete_Items);
   }
@@ -303,12 +303,12 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel
 	       bool with_frame=FALSE,        // Reserve space for a frame?
 	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
     : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      menu(0),
-      sub(0),
+      menu(NULL),
+      sub(NULL),
       b_sub_owner(0),
       b_framed(0),
       b_autoDelete(0),
-      my_items(0)
+      my_items(NULL)
   {
       InitMenu(Items, with_frame, autoDelete_Items);
   }
@@ -601,7 +601,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserItem : public NCursesMenuI
 public:
   NCursesUserItem (const char* p_name,
 		   const char* p_descript = NULL,
-		   const T* p_UserData    = STATIC_CAST(T*)(0))
+		   const T* p_UserData    = STATIC_CAST(T*)(NULL))
     : NCursesMenuItem (p_name, p_descript) {
       if (item)
 	OnError (::set_item_userptr (item, const_cast<void *>(reinterpret_cast<const void*>(p_UserData))));
@@ -630,7 +630,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu
 		   int  ncols,
 		   int  begin_y = 0,
 		   int  begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0))
+		   const T* p_UserData = STATIC_CAST(T*)(NULL))
     : NCursesMenu(nlines,ncols,begin_y,begin_x) {
       if (menu)
 	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
@@ -638,7 +638,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu
 
 public:
   NCursesUserMenu (NCursesMenuItem* Items[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
+		   const T* p_UserData = STATIC_CAST(T*)(NULL),
 		   bool with_frame=FALSE,
 		   bool autoDelete_Items=FALSE)
     : NCursesMenu (Items, with_frame, autoDelete_Items) {
@@ -651,7 +651,7 @@ template<class T> class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu
 		   int ncols,
 		   int begin_y = 0,
 		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
+		   const T* p_UserData = STATIC_CAST(T*)(NULL),
 		   bool with_frame=FALSE)
     : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
       if (menu)
diff --git a/c++/cursesp.cc b/c++/cursesp.cc
index 96f9e3541..65497030d 100644
--- a/c++/cursesp.cc
+++ b/c++/cursesp.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,9 +35,9 @@
 #include "internal.h"
 #include "cursesp.h"
 
-MODULE_ID("$Id: cursesp.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
+MODULE_ID("$Id: cursesp.cc,v 1.29 2025/01/25 21:20:17 tom Exp $")
 
-NCursesPanel* NCursesPanel::dummy = static_cast<NCursesPanel*>(0);
+NCursesPanel* NCursesPanel::dummy = static_cast<NCursesPanel*>(NULL);
 
 void NCursesPanel::init()
 {
@@ -55,7 +55,7 @@ void NCursesPanel::init()
 NCursesPanel::~NCursesPanel() THROWS(NCursesException)
 {
   UserHook* hook = UserPointer();
-  assert(hook != 0 && hook->m_back==this && hook->m_owner==p);
+  assert(hook != NULL && hook->m_back==this && hook->m_owner==p);
   delete hook;
   ::del_panel(p);
   ::update_panels();
diff --git a/c++/cursesp.h b/c++/cursesp.h
index f0bd5c9cd..e0bc550ac 100644
--- a/c++/cursesp.h
+++ b/c++/cursesp.h
@@ -1,7 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
 #ifndef NCURSES_CURSESP_H_incl
 #define NCURSES_CURSESP_H_incl 1
 
-// $Id: cursesp.h,v 1.36 2022/08/20 20:52:15 tom Exp $
+// $Id: cursesp.h,v 1.37 2025/01/25 21:20:17 tom Exp $
 
 #include <cursesw.h>
 
@@ -73,7 +73,7 @@ class NCURSES_CXX_IMPEXP NCursesPanel
   void set_user(void *user)
   {
     UserHook* uptr = UserPointer();
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) {
+    if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p) {
       uptr->m_user = user;
     }
   }
@@ -82,8 +82,8 @@ class NCURSES_CXX_IMPEXP NCursesPanel
   void *get_user()
   {
     UserHook* uptr = UserPointer();
-    void *result = 0;
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p)
+    void *result = NULL;
+    if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p)
       result = uptr->m_user;
     return result;
   }
@@ -104,14 +104,14 @@ class NCURSES_CXX_IMPEXP NCursesPanel
 	       int ncols,
 	       int begin_y = 0,
 	       int begin_x = 0)
-    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(0)
+    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(NULL)
   {
     init();
   }
   // Create a panel with this size starting at the requested position.
 
   NCursesPanel()
-    : NCursesWindow(::stdscr), p(0)
+    : NCursesWindow(::stdscr), p(NULL)
   {
     init();
   }
@@ -244,7 +244,7 @@ template<class T> class NCursesUserPanel : public NCursesPanel
   // This creates an user panel of the requested size with associated
   // user data pointed to by p_UserData.
 
-  explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel()
+  explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(NULL)) : NCursesPanel()
   {
     if (p)
       set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
diff --git a/c++/cursespad.cc b/c++/cursespad.cc
index 4d30a5c7e..010e51a16 100644
--- a/c++/cursespad.cc
+++ b/c++/cursespad.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2020,2024 Thomas E. Dickey                                     *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1999-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,17 +36,17 @@
 
 #include <cursesw.h>
 
-MODULE_ID("$Id: cursespad.cc,v 1.19 2024/10/05 22:47:12 tom Exp $")
+MODULE_ID("$Id: cursespad.cc,v 1.20 2025/01/25 21:21:05 tom Exp $")
 
 NCursesPad::NCursesPad(int nlines, int ncols)
   : NCursesWindow(),
-    viewWin(static_cast<NCursesWindow*>(0)),
-    viewSub(static_cast<NCursesWindow*>(0)),
+    viewWin(static_cast<NCursesWindow*>(NULL)),
+    viewSub(static_cast<NCursesWindow*>(NULL)),
     h_gridsize(0), v_gridsize(0),
     min_row(0), min_col(0)
 {
   w = ::newpad(nlines, ncols);
-  if (static_cast<WINDOW*>(0) == w) {
+  if (static_cast<WINDOW*>(NULL) == w) {
     count--;
     err_handler("Cannot construct window");
   }
@@ -85,7 +85,7 @@ void NCursesPad::operator()(void)
 {
   NCursesWindow* W = Win();
 
-  if (static_cast<NCursesWindow*>(0) != W) {
+  if (static_cast<NCursesWindow*>(NULL) != W) {
     int Width  = W->width();
     int Height = W->height();
 
@@ -170,7 +170,7 @@ void NCursesPad::operator()(void)
 int NCursesPad::refresh()
 {
   int res = noutrefresh();
-  if (res==OK && (static_cast<NCursesWindow*>(0) != viewWin)) {
+  if (res==OK && (static_cast<NCursesWindow*>(NULL) != viewWin)) {
     res = (viewWin->refresh());
   }
   return(res);
@@ -180,7 +180,7 @@ int NCursesPad::noutrefresh()
 {
   int res = OK;
   NCursesWindow* W = Win();
-  if (static_cast<NCursesWindow*>(0) != W) {
+  if (static_cast<NCursesWindow*>(NULL) != W) {
     int high = W->maxy();
     int wide = W->maxx();
     res = copywin(*W, min_row, min_col,
@@ -210,9 +210,9 @@ void NCursesPad::setWindow(NCursesWindow& view,
 
 void NCursesPad::setSubWindow(NCursesWindow& sub)
 {
-  if (static_cast<NCursesWindow*>(0) == viewWin)
+  if (static_cast<NCursesWindow*>(NULL) == viewWin)
     err_handler("Pad has no viewport");
-  assert(viewWin != 0);
+  assert(viewWin != NULL);
   if (!viewWin->isDescendant(sub))
     THROW(new NCursesException("NCursesFramePad", E_SYSTEM_ERROR));
   viewSub = &sub;
@@ -224,7 +224,7 @@ void NCursesFramedPad::OnOperation(int pad_req)
   const NCursesWindow* W = Win();
   NCursesWindow* W2 = getWindow();
 
-  if ((static_cast<NCursesWindow*>(0) != W) && (static_cast<NCursesWindow*>(0) != W2)) {
+  if ((static_cast<NCursesWindow*>(NULL) != W) && (static_cast<NCursesWindow*>(NULL) != W2)) {
     int Width  = W->width();
     int Height = W->height();
     int i, row, col, h_len, v_len;
diff --git a/c++/cursesw.cc b/c++/cursesw.cc
index 8ea265cb3..835e90957 100644
--- a/c++/cursesw.cc
+++ b/c++/cursesw.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 #include "internal.h"
 #include "cursesw.h"
 
-MODULE_ID("$Id: cursesw.cc,v 1.56 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursesw.cc,v 1.57 2025/01/25 21:21:05 tom Exp $")
 
 #define COLORS_NEED_INITIALIZATION  -1
 #define COLORS_NOT_INITIALIZED       0
@@ -188,27 +188,27 @@ NCursesWindow::constructing()
 }
 
 NCursesWindow::NCursesWindow()
-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
 {
     constructing();
 
-    w = static_cast<WINDOW *>(0);
+    w = static_cast<WINDOW *>(NULL);
 }
 
 NCursesWindow::NCursesWindow(int nlines, int ncols, int begin_y, int begin_x)
-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
 {
     constructing();
 
     w = ::newwin(nlines, ncols, begin_y, begin_x);
-    if (w == 0) {
+    if (w == NULL) {
 	err_handler("Cannot construct window");
     }
     set_keyboard();
 }
 
 NCursesWindow::NCursesWindow(WINDOW* window)
-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
 {
     constructing();
 
@@ -223,7 +223,7 @@ NCursesWindow::NCursesWindow(WINDOW* window)
 
 NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
 			     int begin_y, int begin_x, char absrel)
-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
 {
     constructing();
     if (absrel == 'a') {	// absolute origin
@@ -234,7 +234,7 @@ NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
     // Link this window into its parent's list of subwindows.
     // We use derwin(), since this also works for pads.
     w = ::derwin(win.w, ny, nx, begin_y, begin_x);
-    if (w == 0) {
+    if (w == NULL) {
 	err_handler("Cannot construct subwindow");
     }
 
@@ -245,20 +245,20 @@ NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
 
 NCursesWindow::NCursesWindow(NCursesWindow& win,
 				bool do_box NCURSES_PARAM_INIT(TRUE))
-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
 {
     constructing();
     int myHeight = win.height();
     int myWidth  = win.width();
     w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
-    if (w == 0) {
+    if (w == NULL) {
 	err_handler("Cannot construct subwindow");
     }
 
     par = &win;
     sib = win.subwins;
     win.subwins = this;
-    subwins = 0;
+    subwins = NULL;
 
     if (do_box) {
 	win.box();
@@ -283,7 +283,7 @@ static int r_init_idx   = 0;
 static RIPOFFINIT* prip = R_INIT;
 
 NCursesWindow::NCursesWindow(WINDOW *win, int ncols)
-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
+  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
 {
     (void) ncols;
     initialize();
@@ -331,12 +331,12 @@ NCursesWindow::kill_subwindows()
 {
     NCursesWindow* p = subwins;
 
-    subwins = 0;
-    while (p != 0) {
+    subwins = NULL;
+    while (p != NULL) {
 	NCursesWindow* q = p->sib;
 	p->kill_subwindows();
 	if (p->alloced) {
-	    if (p->w != 0)
+	    if (p->w != NULL)
 		::delwin(p->w);
 	}
 	delete p;
@@ -349,13 +349,13 @@ NCursesWindow::~NCursesWindow() THROWS(NCursesException)
 {
     kill_subwindows();
 
-    if (par != 0) {
+    if (par != NULL) {
 	// Remove this window from the parent's list of subwindows.
 	NCursesWindow * next = par->subwins;
-	NCursesWindow * prev = 0;
-	while (next != 0) {
+	NCursesWindow * prev = NULL;
+	while (next != NULL) {
 	    if (next == this) {
-		if (prev != 0) {
+		if (prev != NULL) {
 		    prev->sib = next->sib;
 		} else {
 		    par->subwins = next->sib;
@@ -367,7 +367,7 @@ NCursesWindow::~NCursesWindow() THROWS(NCursesException)
 	}
     }
 
-    if (alloced && w != 0)
+    if (alloced && w != NULL)
 	::delwin(w);
 
     if (alloced) {
diff --git a/c++/cursesw.h b/c++/cursesw.h
index 8ef0868cd..10481a222 100644
--- a/c++/cursesw.h
+++ b/c++/cursesw.h
@@ -1,7 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 // vile:cppmode
 /****************************************************************************
- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
 #ifndef NCURSES_CURSESW_H_incl
 #define NCURSES_CURSESW_H_incl 1
 
-// $Id: cursesw.h,v 1.61 2024/12/15 16:06:49 tom Exp $
+// $Id: cursesw.h,v 1.62 2025/01/25 21:21:05 tom Exp $
 
 #include <curses.h>
 
@@ -1439,7 +1439,7 @@ class NCURSES_CXX_IMPEXP NCursesPad : public NCursesWindow
 
   NCursesWindow* Win(void) const {
     // Get the window into which the pad should be copied (if any)
-    return (viewSub?viewSub:(viewWin?viewWin:0));
+    return (viewSub?viewSub:(viewWin?viewWin:NULL));
   }
 
   NCursesWindow* getWindow(void) const {
diff --git a/c++/demo.cc b/c++/demo.cc
index 7d300ff38..182784513 100644
--- a/c++/demo.cc
+++ b/c++/demo.cc
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36,7 +36,7 @@
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *
- * $Id: demo.cc,v 1.52 2023/08/26 19:14:14 tom Exp $
+ * $Id: demo.cc,v 1.53 2025/01/25 21:21:05 tom Exp $
  */
 
 #include "internal.h"
@@ -174,7 +174,7 @@ template<class T> class NCURSES_CXX_IMPEXP MyAction : public NCursesUserItem<Use
 public:
   MyAction (const char* p_name,
             const T* p_UserData)
-    : NCursesUserItem<T>(p_name, static_cast<const char*>(0), p_UserData)
+    : NCursesUserItem<T>(p_name, static_cast<const char*>(NULL), p_UserData)
   {}
 
   virtual ~MyAction() THROWS(NCursesException) {}
@@ -244,10 +244,10 @@ class TestForm : public NCursesForm
 public:
   TestForm()
     : NCursesForm(13, 51, (lines() - 15)/2, (cols() - 53)/2),
-      F(0),
-      mft(0),
-      ift(0),
-      eft(0)
+      F(NULL),
+      mft(NULL),
+      ift(NULL),
+      eft(NULL)
   {
 
     F     = new NCursesFormField*[10];
@@ -289,7 +289,7 @@ class TestForm : public NCursesForm
   }
 
   TestForm(const TestForm& rhs)
-    : NCursesForm(rhs), F(0), mft(0), ift(0), eft(0)
+    : NCursesForm(rhs), F(NULL), mft(NULL), ift(NULL), eft(NULL)
   {
   }
 
@@ -438,7 +438,7 @@ class MyMenu : public NCursesMenu
 public:
   MyMenu ()
     : NCursesMenu (n_items+2, 8, (lines()-10)/2, (cols()-10)/2),
-      P(0), I(0), u(0)
+      P(NULL), I(NULL), u(NULL)
   {
     u = new UserData(1);
     I = new NCursesMenuItem*[1+n_items];
@@ -467,7 +467,7 @@ class MyMenu : public NCursesMenu
   }
 
   MyMenu(const MyMenu& rhs)
-    : NCursesMenu(rhs), P(0), I(0), u(0)
+    : NCursesMenu(rhs), P(NULL), I(NULL), u(NULL)
   {
   }
 
diff --git a/c++/etip.h.in b/c++/etip.h.in
index b9f8702f6..2a9936765 100644
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: etip.h.in,v 1.51 2024/12/14 19:08:16 tom Exp $
+// $Id: etip.h.in,v 1.53 2025/01/25 22:19:42 tom Exp $
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
@@ -94,6 +94,8 @@
 #  endif
 #endif
 
+#include <exception>
+
 #if defined(__GNUG__)
 #  if HAVE_BUILTIN_H || HAVE_GXX_BUILTIN_H || HAVE_GPP_BUILTIN_H
 #    if ETIP_NEEDS_MATH_H
@@ -114,6 +116,8 @@
 #    endif
 #    undef exception
 #  endif
+#elif defined __CLANG
+#  include <exception>
 #elif defined (__SUNPRO_CC)
 #  include <generic.h>
 #endif
@@ -206,7 +210,7 @@ public:
 
   NCursesPanelException (const char *msg, int err) :
     NCursesException (msg, err),
-    p (0)
+    p (NULL)
     {};
 
   NCursesPanelException (const NCursesPanel* panel,
@@ -218,7 +222,7 @@ public:
 
   explicit NCursesPanelException (int err) :
     NCursesException ("panel library error", err),
-    p (0)
+    p (NULL)
     {};
 
   NCursesPanelException (const NCursesPanel* panel,
@@ -257,7 +261,7 @@ public:
 
   NCursesMenuException (const char *msg, int err) :
     NCursesException (msg, err),
-    m (0)
+    m (NULL)
     {};
 
   NCursesMenuException (const NCursesMenu* menu,
@@ -269,7 +273,7 @@ public:
 
   explicit NCursesMenuException (int err) :
     NCursesException ("menu library error", err),
-    m (0)
+    m (NULL)
     {};
 
   NCursesMenuException (const NCursesMenu* menu,
@@ -308,7 +312,7 @@ public:
 
   NCursesFormException (const char *msg, int err) :
     NCursesException (msg, err),
-    f (0)
+    f (NULL)
     {};
 
   NCursesFormException (const NCursesForm* form,
@@ -320,7 +324,7 @@ public:
 
   explicit NCursesFormException (int err) :
     NCursesException ("form library error", err),
-    f (0)
+    f (NULL)
     {};
 
   NCursesFormException (const NCursesForm* form,
diff --git a/dist.mk b/dist.mk
index e2eaafb44..2afd4fa32 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1651 2025/01/18 11:23:10 tom Exp $
+# $Id: dist.mk,v 1.1652 2025/01/25 10:34:16 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250118
+NCURSES_PATCH = 20250125
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index f56154ab5..9f25ceb7e 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.205 2025/01/18 15:01:47 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.206 2025/01/22 23:13:51 tom Exp $")
 
 #include <tic.h>
 
@@ -483,8 +483,8 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED)
     if (NC_ISATTY(fileno(stdout))) {
 	const char *list = getenv("NCURSES_GPM_TERMS");
 	const char *env = getenv("TERM");
-	if (list != 0) {
-	    if (env != 0) {
+	if (list != NULL) {
+	    if (env != NULL) {
 		result = _nc_name_match(list, env, "|:") ? TRUE : FALSE;
 	    }
 	} else {
@@ -495,7 +495,7 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED)
 	     * capability.  Perhaps that works for someone.  If so, they can
 	     * set the environment variable (above).
 	     */
-	    if (env != 0 && strstr(env, "linux") != 0) {
+	    if (env != NULL && strstr(env, "linux") != NULL) {
 		result = TRUE;
 	    }
 	}
@@ -507,7 +507,7 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED)
 static void
 unload_gpm_library(SCREEN *sp)
 {
-    if (sp->_dlopen_gpm != 0) {
+    if (sp->_dlopen_gpm != NULL) {
 	T(("unload GPM library"));
 	sp->_mouse_gpm_loaded = FALSE;
 	sp->_mouse_fd = -1;
@@ -522,25 +522,25 @@ load_gpm_library(SCREEN *sp)
     /*
      * If we already had a successful dlopen, reuse it.
      */
-    if (sp->_dlopen_gpm != 0) {
+    if (sp->_dlopen_gpm != NULL) {
 	sp->_mouse_gpm_found = TRUE;
 	sp->_mouse_gpm_loaded = TRUE;
-    } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != 0) {
+    } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != NULL) {
 #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif
-	if (GET_DLSYM(gpm_fd) == 0 ||
-	    GET_DLSYM(Gpm_Open) == 0 ||
-	    GET_DLSYM(Gpm_Close) == 0 ||
-	    GET_DLSYM(Gpm_GetEvent) == 0) {
+	if (GET_DLSYM(gpm_fd) == NULL ||
+	    GET_DLSYM(Gpm_Open) == NULL ||
+	    GET_DLSYM(Gpm_Close) == NULL ||
+	    GET_DLSYM(Gpm_GetEvent) == NULL) {
 #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 	    T(("GPM initialization failed: %s", dlerror()));
 	    unload_gpm_library(sp);
 	    dlclose(sp->_dlopen_gpm);
-	    sp->_dlopen_gpm = 0;
+	    sp->_dlopen_gpm = NULL;
 	} else {
 	    sp->_mouse_gpm_found = TRUE;
 	    sp->_mouse_gpm_loaded = TRUE;
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 780e27ea2..9eccdec5a 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.192 2025/01/12 00:41:56 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.193 2025/01/22 23:13:27 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -217,9 +217,9 @@ delscreen(SCREEN *sp)
 	}
 #if USE_GPM_SUPPORT
 #ifdef HAVE_LIBDL
-	if (sp->_dlopen_gpm != 0) {
+	if (sp->_dlopen_gpm != NULL) {
 	    dlclose(sp->_dlopen_gpm);
-	    sp->_dlopen_gpm = 0;
+	    sp->_dlopen_gpm = NULL;
 	}
 #endif
 #endif /* USE_GPM_SUPPORT */
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index ebb2e22da..1bf71e955 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.83 2024/12/07 21:02:00 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.84 2025/01/24 20:39:23 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -242,7 +242,7 @@ _nc_timed_wait(const SCREEN *sp MAYBE_UNUSED,
     if ((mode & TW_EVENT) && evl) {
 	if (fds == fd_list)
 	    fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
-	if (fds == 0)
+	if (fds == NULL)
 	    return TW_NONE;
     }
 #endif
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index cadc7a9ed..8cb963fb9 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250118) unstable; urgency=low
+ncurses6td (6.5+20250125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index cadc7a9ed..8cb963fb9 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250118) unstable; urgency=low
+ncurses6td (6.5+20250125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bb2eb4761..5314f7d24 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250118) unstable; urgency=low
+ncurses6td (6.5+20250125) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 12 Jan 2025 06:23:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7d181ba6e..384a665c3 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.685 2025/01/12 11:23:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.686 2025/01/24 20:34:16 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0118"
+!define VERSION_MMDD  "0125"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b248647d7..d3e23e751 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250118
+Release: 20250125
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 9ebaba7e9..16f99b125 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250118
+Release: 20250125
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 40ace6f3a..3e77a41a8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250118
+Release: 20250125
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 58e2d37742393f1ca11a42e0453a3ae621a37e9d Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 2 Feb 2025 02:33:22 +0100
Subject: [PATCH 101/106] ncurses-6.5-20250201.patch.gz

---
 NEWS                                          |  11 +-
 VERSION                                       |   2 +-
 aclocal.m4                                    |  14 +-
 c++/edit_cfg.sh                               |   6 +-
 c++/etip.h.in                                 |  14 +-
 configure                                     | 702 +++++++++---------
 configure.in                                  |   6 +-
 dist.mk                                       |   4 +-
 doc/html/ada/funcs/T.htm                      |   2 +-
 .../terminal_interface-curses-forms__adb.htm  |   8 +-
 .../terminal_interface-curses-menus__adb.htm  |   8 +-
 ...interface-curses-panels-user_data__adb.htm |   4 +-
 doc/html/man/curs_add_wch.3x.html             | 322 ++++----
 doc/html/man/curs_add_wchstr.3x.html          |  20 +-
 doc/html/man/curs_addch.3x.html               | 122 +--
 doc/html/man/curs_addchstr.3x.html            |  10 +-
 doc/html/man/curs_addstr.3x.html              |  12 +-
 doc/html/man/curs_addwstr.3x.html             |  19 +-
 doc/html/man/curs_attr.3x.html                |  46 +-
 doc/html/man/curs_beep.3x.html                |  12 +-
 doc/html/man/curs_bkgrnd.3x.html              |  10 +-
 doc/html/man/curs_border.3x.html              |  84 ++-
 doc/html/man/curs_border_set.3x.html          |  81 +-
 doc/html/man/curs_deleteln.3x.html            |  12 +-
 doc/html/man/curs_get_wch.3x.html             |  44 +-
 doc/html/man/curs_get_wstr.3x.html            |  21 +-
 doc/html/man/curs_getcchar.3x.html            |  13 +-
 doc/html/man/curs_getch.3x.html               | 103 +--
 doc/html/man/curs_getstr.3x.html              |  22 +-
 doc/html/man/curs_getyx.3x.html               |  10 +-
 doc/html/man/curs_in_wch.3x.html              |  16 +-
 doc/html/man/curs_in_wchstr.3x.html           |  20 +-
 doc/html/man/curs_initscr.3x.html             | 184 ++---
 doc/html/man/curs_inopts.3x.html              | 140 ++--
 doc/html/man/curs_ins_wch.3x.html             |  25 +-
 doc/html/man/curs_ins_wstr.3x.html            |  10 +-
 doc/html/man/curs_insch.3x.html               |  19 +-
 doc/html/man/curs_insstr.3x.html              |  14 +-
 doc/html/man/curs_instr.3x.html               |  13 +-
 doc/html/man/curs_move.3x.html                |  10 +-
 doc/html/man/curs_outopts.3x.html             |  10 +-
 doc/html/man/curs_scroll.3x.html              |  50 +-
 doc/html/man/curs_sp_funcs.3x.html            | 296 ++++----
 doc/html/man/curs_termattrs.3x.html           |  10 +-
 doc/html/man/curs_termcap.3x.html             |   8 +-
 doc/html/man/curs_util.3x.html                |  18 +-
 doc/html/man/curs_window.3x.html              |   8 +-
 doc/html/man/ncurses.3x.html                  |   2 +-
 doc/html/man/terminfo.5.html                  |   2 +-
 man/curs_add_wch.3x                           | 358 ++++++---
 man/curs_add_wchstr.3x                        |   9 +-
 man/curs_addch.3x                             | 180 +++--
 man/curs_addchstr.3x                          |   9 +-
 man/curs_addstr.3x                            |   5 +-
 man/curs_addwstr.3x                           |   7 +-
 man/curs_attr.3x                              |  23 +-
 man/curs_beep.3x                              |  11 +-
 man/curs_bkgrnd.3x                            |   6 +-
 man/curs_border.3x                            | 210 ++++--
 man/curs_border_set.3x                        |  74 +-
 man/curs_deleteln.3x                          |  11 +-
 man/curs_get_wch.3x                           |  17 +-
 man/curs_get_wstr.3x                          |  28 +-
 man/curs_getcchar.3x                          |   9 +-
 man/curs_getch.3x                             |  33 +-
 man/curs_getstr.3x                            |  15 +-
 man/curs_getyx.3x                             |   5 +-
 man/curs_in_wch.3x                            |   7 +-
 man/curs_in_wchstr.3x                         |   7 +-
 man/curs_initscr.3x                           | 312 +++++---
 man/curs_inopts.3x                            |  51 +-
 man/curs_ins_wch.3x                           |  12 +-
 man/curs_ins_wstr.3x                          |   6 +-
 man/curs_insch.3x                             |   9 +-
 man/curs_insstr.3x                            |  11 +-
 man/curs_instr.3x                             |   7 +-
 man/curs_move.3x                              |   8 +-
 man/curs_outopts.3x                           |  11 +-
 man/curs_scroll.3x                            |  76 +-
 man/curs_sp_funcs.3x                          | 270 +++----
 man/curs_termattrs.3x                         |  16 +-
 man/curs_termcap.3x                           |   7 +-
 man/curs_util.3x                              |  17 +-
 man/curs_window.3x                            |  18 +-
 man/man_db.renames.in                         |   3 +-
 man/manhtml.aliases                           |   3 +-
 ncurses/base/MKlib_gen.sh                     |  24 +-
 ncurses/tty/lib_mvcur.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 +-
 package/ncursest.spec                         |   2 +-
 95 files changed, 2588 insertions(+), 1926 deletions(-)

diff --git a/NEWS b/NEWS
index b6c2796ee..313069459 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4236 2025/01/25 21:30:09 tom Exp $
+-- $Id: NEWS,v 1.4239 2025/02/02 00:30:12 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250201
+	+ add <new> to the possible headers declaring the C++ std::bad_alloc
+	  (report by Carl Hansen).
+	+ modify check for stdbool.h to be more conservative in case the
+	  headers are used with a compiler other than that which was used to
+	  configure (Redhat #2342514).
+	+ improve MKlib_gen.sh handling of "bool" type, for building link_test
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+
 20250125
 	+ improve error-handling in c++ binding (report by Mingjie Shen).
 	+ strict compiler-warning fixes for upcoming gcc15
diff --git a/VERSION b/VERSION
index 979a3b330..dc3fc80ac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250125
+5:0:10	6.5	20250201
diff --git a/aclocal.m4 b/aclocal.m4
index 319d1814d..881791f2f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1100 2025/01/15 22:07:11 tom Exp $
+dnl $Id: aclocal.m4,v 1.1101 2025/02/02 00:10:44 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -600,7 +600,7 @@ AC_DEFUN([CF_AWK_BIG_PRINTF],
 dnl ---------------------------------------------------------------------------
 dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
 dnl ------------
-dnl Test if 'bool' is a builtin type in the configured C++ compiler.  Some
+dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
 dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
 dnl 2.6.3 does, in anticipation of the ANSI C++ standard.
 dnl
@@ -613,14 +613,13 @@ AC_DEFUN([CF_BOOL_DECL],
 AC_MSG_CHECKING(if we should include stdbool.h)
 
 AC_CACHE_VAL(cf_cv_header_stdbool_h,[
-	AC_TRY_COMPILE([],[bool foo = false; (void)foo],
-		[cf_cv_header_stdbool_h=0],
-		[AC_TRY_COMPILE([
+	AC_TRY_COMPILE([
 #ifndef __BEOS__
 #include <stdbool.h>
 #endif
 ],[bool foo = false; (void)foo],
-			[cf_cv_header_stdbool_h=1],
+		[cf_cv_header_stdbool_h=1],
+		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
 			[cf_cv_header_stdbool_h=0])])])
 
 if test "$cf_cv_header_stdbool_h" = 1
@@ -636,8 +635,7 @@ AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[
 #include <sys/types.h>
 ],[bool x = false; (void)x],
 		[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
-		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])
-	])
+		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])])
 
 if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1
 then	AC_MSG_RESULT(yes)
diff --git a/c++/edit_cfg.sh b/c++/edit_cfg.sh
index 928f7fdfb..0a3b710dd 100755
--- a/c++/edit_cfg.sh
+++ b/c++/edit_cfg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: edit_cfg.sh,v 1.19 2022/07/16 18:00:59 tom Exp $
+# $Id: edit_cfg.sh,v 1.20 2025/02/02 00:38:39 tom Exp $
 ##############################################################################
-# Copyright 2020,2022 Thomas E. Dickey                                       #
+# Copyright 2020-2022,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2007,2008 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -46,7 +46,9 @@ for name in \
 	HAVE_BUILTIN_H \
 	HAVE_GPP_BUILTIN_H \
 	HAVE_GXX_BUILTIN_H \
+	HAVE_EXCEPTION \
 	HAVE_IOSTREAM \
+	HAVE_NEW \
 	HAVE_TYPEINFO \
 	HAVE_VALUES_H \
 	IOSTREAM_NAMESPACE
diff --git a/c++/etip.h.in b/c++/etip.h.in
index 2a9936765..139b45ea1 100644
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: etip.h.in,v 1.53 2025/01/25 22:19:42 tom Exp $
+// $Id: etip.h.in,v 1.54 2025/02/02 00:20:44 tom Exp $
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
@@ -42,6 +42,10 @@
 #define HAVE_BUILTIN_H 0
 #endif
 
+#ifndef HAVE_EXCEPTION
+#define HAVE_EXCEPTION 0
+#endif
+
 #ifndef HAVE_GXX_BUILTIN_H
 #define HAVE_GXX_BUILTIN_H 0
 #endif
@@ -54,6 +58,10 @@
 #define HAVE_IOSTREAM 0
 #endif
 
+#ifndef HAVE_NEW
+#define HAVE_NEW 0
+#endif
+
 #ifndef HAVE_TYPEINFO
 #define HAVE_TYPEINFO 0
 #endif
@@ -116,8 +124,10 @@
 #    endif
 #    undef exception
 #  endif
-#elif defined __CLANG
+#elif HAVE_EXCEPTION
 #  include <exception>
+#elif HAVE_NEW
+#  include <new>
 #elif defined (__SUNPRO_CC)
 #  include <generic.h>
 #endif
diff --git a/configure b/configure
index 37e80e6e4..1e1ba3be5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.790 .
+# From configure.in Revision: 1.791 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20240618.
 #
@@ -25830,6 +25830,10 @@ else
 #line 25830 "configure"
 #include "confdefs.h"
 
+#ifndef __BEOS__
+#include <stdbool.h>
+#endif
+
 int
 main (void)
 {
@@ -25839,29 +25843,25 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25845: \$? = $ac_status" >&5
+  echo "$as_me:25849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25851: \$? = $ac_status" >&5
+  echo "$as_me:25855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=0
+  cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25858 "configure"
+#line 25862 "configure"
 #include "confdefs.h"
 
-#ifndef __BEOS__
-#include <stdbool.h>
-#endif
-
 int
 main (void)
 {
@@ -25882,11 +25882,10 @@ if { (eval echo "$as_me:25874: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:25883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=1
+  cf_cv_header_stdbool_h=0
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-cf_cv_header_stdbool_h=0
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
@@ -25894,13 +25893,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25897: result: yes" >&5
+then	echo "$as_me:25896: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25899: result: no" >&5
+else	echo "$as_me:25898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25903: checking for builtin bool type" >&5
+echo "$as_me:25902: 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
@@ -25908,7 +25907,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25911 "configure"
+#line 25910 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25923,16 +25922,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25929: \$? = $ac_status" >&5
+  echo "$as_me:25928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25935: \$? = $ac_status" >&5
+  echo "$as_me:25934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25941,13 +25940,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_cc_bool_type=0
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25948: result: yes" >&5
+then	echo "$as_me:25946: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25950: result: no" >&5
+else	echo "$as_me:25948: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25964,10 +25962,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25967: checking if we already have C++ library" >&5
+	echo "$as_me:25965: 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 25970 "configure"
+#line 25968 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25981,16 +25979,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:25985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25993: \$? = $ac_status" >&5
+  echo "$as_me:25991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25999,7 +25997,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:26000: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -26018,7 +26016,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:26021: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:26019: 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
@@ -26044,7 +26042,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26047 "configure"
+#line 26045 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26058,16 +26056,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26064: \$? = $ac_status" >&5
+  echo "$as_me:26062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26070: \$? = $ac_status" >&5
+  echo "$as_me:26068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -26079,7 +26077,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26080: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -26101,7 +26099,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:26104: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26102: 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
@@ -26116,15 +26114,15 @@ CF_EOF
 # 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:26119: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26122: \$? = $ac_status" >&5
+  echo "$as_me:26120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26127: \$? = $ac_status" >&5
+  echo "$as_me:26125: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -26135,10 +26133,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:26138: result: yes" >&5
+  echo "$as_me:26136: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:26141: result: no" >&5
+  echo "$as_me:26139: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26158,7 +26156,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26159: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -26179,7 +26177,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26182 "configure"
+#line 26180 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -26193,16 +26191,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26199: \$? = $ac_status" >&5
+  echo "$as_me:26197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26205: \$? = $ac_status" >&5
+  echo "$as_me:26203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26239,7 +26237,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26242 "configure"
+#line 26240 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26253,16 +26251,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26259: \$? = $ac_status" >&5
+  echo "$as_me:26257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26265: \$? = $ac_status" >&5
+  echo "$as_me:26263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26295,7 +26293,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26298: result: $cf_cxx_library" >&5
+	echo "$as_me:26296: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26311,7 +26309,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26314: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26312: 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
@@ -26328,18 +26326,18 @@ do
   # 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 26331 "configure"
+#line 26329 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26334: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26342: \$? = $ac_status" >&5
+  echo "$as_me:26340: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26362,17 +26360,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26365 "configure"
+#line 26363 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26375: \$? = $ac_status" >&5
+  echo "$as_me:26373: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26409,7 +26407,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26412: result: $CXXCPP" >&5
+echo "$as_me:26410: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26419,18 +26417,18 @@ do
   # 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 26422 "configure"
+#line 26420 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26433: \$? = $ac_status" >&5
+  echo "$as_me:26431: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26453,17 +26451,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26456 "configure"
+#line 26454 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26458: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26466: \$? = $ac_status" >&5
+  echo "$as_me:26464: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26491,7 +26489,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26492: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26503,26 +26501,26 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-for ac_header in typeinfo
+for ac_header in new exception typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26509: checking for $ac_header" >&5
+echo "$as_me:26507: 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 26515 "configure"
+#line 26513 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26525: \$? = $ac_status" >&5
+  echo "$as_me:26523: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26541,7 +26539,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26554,23 +26552,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26557: checking for $ac_header" >&5
+echo "$as_me:26555: 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 26563 "configure"
+#line 26561 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26573: \$? = $ac_status" >&5
+  echo "$as_me:26571: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26589,7 +26587,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26600,10 +26598,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26603: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26601: 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 26606 "configure"
+#line 26604 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26620,16 +26618,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26626: \$? = $ac_status" >&5
+  echo "$as_me:26624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26632: \$? = $ac_status" >&5
+  echo "$as_me:26630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26638,7 +26636,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26639: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26649,7 +26647,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26652: checking if we should include stdbool.h" >&5
+echo "$as_me:26650: 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
@@ -26657,9 +26655,13 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26660 "configure"
+#line 26658 "configure"
 #include "confdefs.h"
 
+#ifndef __BEOS__
+#include <stdbool.h>
+#endif
+
 int
 main (void)
 {
@@ -26669,29 +26671,25 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26675: \$? = $ac_status" >&5
+  echo "$as_me:26677: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26681: \$? = $ac_status" >&5
+  echo "$as_me:26683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=0
+  cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26688 "configure"
+#line 26690 "configure"
 #include "confdefs.h"
 
-#ifndef __BEOS__
-#include <stdbool.h>
-#endif
-
 int
 main (void)
 {
@@ -26701,22 +26699,21 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26707: \$? = $ac_status" >&5
+  echo "$as_me:26705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26713: \$? = $ac_status" >&5
+  echo "$as_me:26711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=1
+  cf_cv_header_stdbool_h=0
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-cf_cv_header_stdbool_h=0
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
@@ -26724,13 +26721,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26727: result: yes" >&5
+then	echo "$as_me:26724: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26729: result: no" >&5
+else	echo "$as_me:26726: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26733: checking for builtin bool type" >&5
+echo "$as_me:26730: 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
@@ -26738,7 +26735,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26741 "configure"
+#line 26738 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26753,16 +26750,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26759: \$? = $ac_status" >&5
+  echo "$as_me:26756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26765: \$? = $ac_status" >&5
+  echo "$as_me:26762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26771,23 +26768,22 @@ cat "conftest.$ac_ext" >&5
 cf_cv_builtin_bool=0
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26778: result: yes" >&5
+then	echo "$as_me:26774: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26780: result: no" >&5
+else	echo "$as_me:26776: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26784: checking for bool" >&5
+echo "$as_me:26780: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26790 "configure"
+#line 26786 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26822,16 +26818,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26828: \$? = $ac_status" >&5
+  echo "$as_me:26824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26834: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26841,10 +26837,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26844: result: $ac_cv_type_bool" >&5
+echo "$as_me:26840: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26847: checking size of bool" >&5
+echo "$as_me:26843: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26853,7 +26849,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26856 "configure"
+#line 26852 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26885,21 +26881,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26891: \$? = $ac_status" >&5
+  echo "$as_me:26887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26897: \$? = $ac_status" >&5
+  echo "$as_me:26893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26902 "configure"
+#line 26898 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26931,16 +26927,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26937: \$? = $ac_status" >&5
+  echo "$as_me:26933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26943: \$? = $ac_status" >&5
+  echo "$as_me:26939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26956,7 +26952,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26959 "configure"
+#line 26955 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26988,16 +26984,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26994: \$? = $ac_status" >&5
+  echo "$as_me:26990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27000: \$? = $ac_status" >&5
+  echo "$as_me:26996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27013,7 +27009,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27016 "configure"
+#line 27012 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27045,16 +27041,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27051: \$? = $ac_status" >&5
+  echo "$as_me:27047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27057: \$? = $ac_status" >&5
+  echo "$as_me:27053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27067,12 +27063,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27070: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27066: 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 27075 "configure"
+#line 27071 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27108,15 +27104,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27114: \$? = $ac_status" >&5
+  echo "$as_me:27110: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27119: \$? = $ac_status" >&5
+  echo "$as_me:27115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27132,13 +27128,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27135: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27131: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27141: checking for type of bool" >&5
+echo "$as_me:27137: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27157,7 +27153,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27160 "configure"
+#line 27156 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27198,15 +27194,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27204: \$? = $ac_status" >&5
+  echo "$as_me:27200: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27209: \$? = $ac_status" >&5
+  echo "$as_me:27205: \$? = $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
@@ -27223,19 +27219,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27226: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27222: 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:27233: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27229: 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:27238: checking for special defines needed for etip.h" >&5
+echo "$as_me:27234: 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"
@@ -27253,7 +27249,7 @@ do
 	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 27256 "configure"
+#line 27252 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27267,16 +27263,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27273: \$? = $ac_status" >&5
+  echo "$as_me:27269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27279: \$? = $ac_status" >&5
+  echo "$as_me:27275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27297,12 +27293,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27300: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27296: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27305: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27301: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27319,7 +27315,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27322 "configure"
+#line 27318 "configure"
 #include "confdefs.h"
 
 class base
@@ -27338,15 +27334,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27344: \$? = $ac_status" >&5
+  echo "$as_me:27340: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27349: \$? = $ac_status" >&5
+  echo "$as_me:27345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27365,7 +27361,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27368: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27364: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27374,7 +27370,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27377: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27373: 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
@@ -27391,7 +27387,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27394 "configure"
+#line 27390 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27410,15 +27406,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27416: \$? = $ac_status" >&5
+  echo "$as_me:27412: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27421: \$? = $ac_status" >&5
+  echo "$as_me:27417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27437,7 +27433,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27440: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27436: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27447,7 +27443,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27450: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27446: 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
@@ -27461,7 +27457,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27464 "configure"
+#line 27460 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27505,16 +27501,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27511: \$? = $ac_status" >&5
+  echo "$as_me:27507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27517: \$? = $ac_status" >&5
+  echo "$as_me:27513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27532,7 +27528,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27535: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27531: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27580,13 +27576,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27583: checking for bool" >&5
+echo "$as_me:27579: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27589 "configure"
+#line 27585 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27621,16 +27617,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27627: \$? = $ac_status" >&5
+  echo "$as_me:27623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27633: \$? = $ac_status" >&5
+  echo "$as_me:27629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27640,10 +27636,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27643: result: $ac_cv_type_bool" >&5
+echo "$as_me:27639: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27646: checking size of bool" >&5
+echo "$as_me:27642: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27652,7 +27648,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27655 "configure"
+#line 27651 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27684,21 +27680,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27690: \$? = $ac_status" >&5
+  echo "$as_me:27686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27696: \$? = $ac_status" >&5
+  echo "$as_me:27692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27701 "configure"
+#line 27697 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27730,16 +27726,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27736: \$? = $ac_status" >&5
+  echo "$as_me:27732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27742: \$? = $ac_status" >&5
+  echo "$as_me:27738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27755,7 +27751,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27758 "configure"
+#line 27754 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27787,16 +27783,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27793: \$? = $ac_status" >&5
+  echo "$as_me:27789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27799: \$? = $ac_status" >&5
+  echo "$as_me:27795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27812,7 +27808,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27815 "configure"
+#line 27811 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27844,16 +27840,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27850: \$? = $ac_status" >&5
+  echo "$as_me:27846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27856: \$? = $ac_status" >&5
+  echo "$as_me:27852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27866,12 +27862,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27869: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27865: 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 27874 "configure"
+#line 27870 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27907,15 +27903,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27913: \$? = $ac_status" >&5
+  echo "$as_me:27909: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27918: \$? = $ac_status" >&5
+  echo "$as_me:27914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27931,13 +27927,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27934: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27930: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27940: checking for type of bool" >&5
+echo "$as_me:27936: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27956,7 +27952,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27959 "configure"
+#line 27955 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27997,15 +27993,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28003: \$? = $ac_status" >&5
+  echo "$as_me:27999: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28008: \$? = $ac_status" >&5
+  echo "$as_me:28004: \$? = $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
@@ -28022,14 +28018,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:28025: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:28021: 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:28032: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:28028: 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
@@ -28060,7 +28056,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:28063: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:28059: 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
@@ -28071,7 +28067,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:28074: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:28070: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -28088,10 +28084,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:28091: result: $ADAFLAGS" >&5
+	echo "$as_me:28087: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:28094: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28090: 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
@@ -28101,11 +28097,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:28104: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28100: 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:28108: checking if GNAT supports generics" >&5
+echo "$as_me:28104: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -28115,7 +28111,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:28118: result: $cf_gnat_generics" >&5
+echo "$as_me:28114: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -28127,7 +28123,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:28130: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28126: 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
@@ -28175,7 +28171,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:28178: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28174: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -28188,7 +28184,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:28191: checking if GNAT supports project files" >&5
+echo "$as_me:28187: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28251,15 +28247,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28254: result: $cf_gnat_projects" >&5
+echo "$as_me:28250: 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:28260: checking if GNAT supports libraries" >&5
+	echo "$as_me:28256: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28262: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28258: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28279,7 +28275,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28282: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28278: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28291,7 +28287,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28294: checking for Ada95 compiler" >&5
+echo "$as_me:28290: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28302,12 +28298,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28305: result: $cf_ada_compiler" >&5
+echo "$as_me:28301: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28310: checking for Ada95 include directory" >&5
+echo "$as_me:28306: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28341,7 +28337,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28344: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28340: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28350,10 +28346,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28353: result: $ADA_INCLUDE" >&5
+echo "$as_me:28349: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28356: checking for Ada95 object directory" >&5
+echo "$as_me:28352: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28387,7 +28383,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28390: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28386: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28396,10 +28392,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28399: result: $ADA_OBJECTS" >&5
+echo "$as_me:28395: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28402: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28398: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28420,11 +28416,11 @@ then
 	fi
 fi
 
-echo "$as_me:28423: result: $with_ada_sharedlib" >&5
+echo "$as_me:28419: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28427: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28423: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28442,7 +28438,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28445: checking for Ada95 curses library name" >&5
+echo "$as_me:28441: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28458,7 +28454,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28461: result: $ADA_LIBNAME" >&5
+echo "$as_me:28457: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28469,13 +28465,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28472: checking for wchar_t" >&5
+	echo "$as_me:28468: 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 28478 "configure"
+#line 28474 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28490,16 +28486,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28496: \$? = $ac_status" >&5
+  echo "$as_me:28492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28502: \$? = $ac_status" >&5
+  echo "$as_me:28498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28509,10 +28505,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28512: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28508: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28515: checking size of wchar_t" >&5
+echo "$as_me:28511: 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
@@ -28521,7 +28517,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28524 "configure"
+#line 28520 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28533,21 +28529,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28539: \$? = $ac_status" >&5
+  echo "$as_me:28535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28545: \$? = $ac_status" >&5
+  echo "$as_me:28541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28550 "configure"
+#line 28546 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28559,16 +28555,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28565: \$? = $ac_status" >&5
+  echo "$as_me:28561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28571: \$? = $ac_status" >&5
+  echo "$as_me:28567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28584,7 +28580,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28587 "configure"
+#line 28583 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28596,16 +28592,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28602: \$? = $ac_status" >&5
+  echo "$as_me:28598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28608: \$? = $ac_status" >&5
+  echo "$as_me:28604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28621,7 +28617,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28624 "configure"
+#line 28620 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28633,16 +28629,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28639: \$? = $ac_status" >&5
+  echo "$as_me:28635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28645: \$? = $ac_status" >&5
+  echo "$as_me:28641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28655,12 +28651,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28658: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28654: 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 28663 "configure"
+#line 28659 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28676,15 +28672,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28682: \$? = $ac_status" >&5
+  echo "$as_me:28678: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28687: \$? = $ac_status" >&5
+  echo "$as_me:28683: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28700,7 +28696,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28703: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28699: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28713,7 +28709,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28716: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28712: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28731,7 +28727,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28734: checking for library subsets" >&5
+echo "$as_me:28730: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28785,7 +28781,7 @@ fi
 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:28788: result: $LIB_SUBSETS" >&5
+echo "$as_me:28784: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28816,7 +28812,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28819: checking default library suffix" >&5
+echo "$as_me:28815: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28827,10 +28823,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28830: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28826: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28833: checking default library-dependency suffix" >&5
+echo "$as_me:28829: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28913,10 +28909,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28916: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28912: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28919: checking default object directory" >&5
+echo "$as_me:28915: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28932,11 +28928,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28935: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28931: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28939: checking c++ library-dependency suffix" >&5
+echo "$as_me:28935: 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++)
@@ -29029,7 +29025,7 @@ else
 	fi
 
 fi
-echo "$as_me:29032: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:29028: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -29205,19 +29201,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:29208: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29204: 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 <<EOF
-#line 29213 "configure"
+#line 29209 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:29217: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29220: \$? = $ac_status" >&5
+  echo "$as_me:29216: \$? = $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
@@ -29228,10 +29224,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29231 "configure"
+#line 29227 "configure"
 #include "confdefs.h"
 
-#line 29234 "configure"
+#line 29230 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29246,16 +29242,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29252: \$? = $ac_status" >&5
+  echo "$as_me:29248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29258: \$? = $ac_status" >&5
+  echo "$as_me:29254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29278,7 +29274,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29281: result: $cf_ldflags_static" >&5
+	echo "$as_me:29277: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29294,7 +29290,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29297: checking where we will install curses.h" >&5
+echo "$as_me:29293: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29304,7 +29300,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29307: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29303: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29312,7 +29308,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29315: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29311: 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
@@ -29337,7 +29333,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29340: checking for desired basename for form library" >&5
+echo "$as_me:29336: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29357,10 +29353,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29360: result: $FORM_NAME" >&5
+echo "$as_me:29356: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29363: checking for desired basename for menu library" >&5
+echo "$as_me:29359: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29380,10 +29376,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29383: result: $MENU_NAME" >&5
+echo "$as_me:29379: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29386: checking for desired basename for panel library" >&5
+echo "$as_me:29382: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29403,10 +29399,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29406: result: $PANEL_NAME" >&5
+echo "$as_me:29402: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29409: checking for desired basename for cxx library" >&5
+echo "$as_me:29405: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29426,13 +29422,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29429: result: $CXX_NAME" >&5
+echo "$as_me:29425: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29435: checking for src modules" >&5
+echo "$as_me:29431: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29491,7 +29487,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29494: result: $cf_cv_src_modules" >&5
+echo "$as_me:29490: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29652,7 +29648,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29655: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29651: 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//'`
@@ -29663,7 +29659,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29666: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29662: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29679,7 +29675,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29682: result: $PKG_CFLAGS" >&5
+echo "$as_me:29678: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29751,7 +29747,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29754: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29750: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29778,7 +29774,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29781: checking for linker search path" >&5
+echo "$as_me:29777: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29826,7 +29822,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29829: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29825: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29867,7 +29863,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29870: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29866: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29953,7 +29949,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29956: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29952: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -30134,7 +30130,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:30137: error: ambiguous option: $1
+    { { echo "$as_me:30133: 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;}
@@ -30153,7 +30149,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:30156: error: unrecognized option: $1
+  -*) { { echo "$as_me:30152: 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;}
@@ -30285,7 +30281,7 @@ do
   "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:30288: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30284: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30813,7 +30809,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30816: creating $ac_file" >&5
+    { echo "$as_me:30812: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30831,7 +30827,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30834: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30830: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30844,7 +30840,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30847: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30843: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30860,7 +30856,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30863: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30859: 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;}
@@ -30869,7 +30865,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30872: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30868: 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;}
@@ -30914,7 +30910,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30917: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30913: 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;}
@@ -30925,7 +30921,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30928: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30924: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30974,7 +30970,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30977: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30973: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30985,7 +30981,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30988: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30984: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30998,7 +30994,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:31001: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30997: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31056,7 +31052,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:31059: $ac_file is unchanged" >&5
+      { echo "$as_me:31055: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31443,7 +31439,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31446: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31442: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index 7f6c347e8..cd3a45627 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.790 2025/01/18 11:20:02 tom Exp $
+dnl $Id: configure.in,v 1.791 2025/02/02 00:16:32 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.790 $)
+AC_REVISION($Revision: 1.791 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1921,7 +1921,7 @@ if test -n "$CXX" ; then
 		;;
 	esac
 
-	AC_CHECK_HEADERS(typeinfo)
+	AC_CHECK_HEADERS(new exception typeinfo)
 	CF_CXX_IOSTREAM_NAMESPACE
 	CF_BOOL_DECL
 	CF_BOOL_SIZE
diff --git a/dist.mk b/dist.mk
index 2afd4fa32..47e86fe2d 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1652 2025/01/25 10:34:16 tom Exp $
+# $Id: dist.mk,v 1.1653 2025/02/01 10:35:49 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250125
+NCURSES_PATCH = 20250201
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/ada/funcs/T.htm b/doc/html/ada/funcs/T.htm
index 2534502a5..acedebee2 100644
--- a/doc/html/ada/funcs/T.htm
+++ b/doc/html/ada/funcs/T.htm
@@ -20,8 +20,8 @@ <h2>Functions - T</h2>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_90_16" target="main">tgetnum</a>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_109_16" target="main">tgetstr -  terminal_interface-curses-termcap.adb:109</a>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_130_16" target="main">tgetstr -  terminal_interface-curses-termcap.adb:130</a>
-<li><a href="../terminal_interface-curses-termcap__ads.htm#ref_54_13" target="main">TGoto</a>
 <li><a href="../terminal_interface-curses-termcap__adb.htm#ref_152_16" target="main">tgoto</a>
+<li><a href="../terminal_interface-curses-termcap__ads.htm#ref_54_13" target="main">TGoto</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_70_16" target="main">tigetflag</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_88_16" target="main">tigetstr -  terminal_interface-curses-terminfo.adb:88</a>
 <li><a href="../terminal_interface-curses-terminfo__adb.htm#ref_109_16" target="main">tigetstr -  terminal_interface-curses-terminfo.adb:109</a>
diff --git a/doc/html/ada/terminal_interface-curses-forms__adb.htm b/doc/html/ada/terminal_interface-curses-forms__adb.htm
index 3f22b40da..f4fb87c9d 100644
--- a/doc/html/ada/terminal_interface-curses-forms__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-forms__adb.htm
@@ -24,7 +24,7 @@
 <span class="comment"><em>--                                 B O D Y                                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
-<span class="comment"><em>-- Copyright 2020 Thomas E. Dickey                                          --</em></span>
+<span class="comment"><em>-- Copyright 2020,2025 Thomas E. Dickey                                     --</em></span>
 <span class="comment"><em>-- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>-- Permission is hereby granted, free of charge, to any person obtaining a  --</em></span>
@@ -53,8 +53,8 @@
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <span class="comment"><em>--  Author:  Juergen Pfeifer, 1996</em></span>
 <span class="comment"><em>--  Version Control:</em></span>
-<span class="comment"><em>--  @Revision: 1.33 @</em></span>
-<span class="comment"><em>--  @Date: 2020/02/02 23:34:34 @</em></span>
+<span class="comment"><em>--  @Revision: 1.34 @</em></span>
+<span class="comment"><em>--  @Date: 2025/01/24 20:39:23 @</em></span>
 <span class="comment"><em>--  Binding Version 01.00</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <b>with</b> Ada.Unchecked_Deallocation;
@@ -1023,7 +1023,7 @@
         (Field_Array, <a href="terminal_interface-curses-forms__ads.htm#ref_136_9">Field_Array_Access</a>);
    <b>begin</b>
       <b>if</b> <a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a> /= <b>null</b> <b>and</b> <b>then</b> <a href="terminal_interface-curses-forms__ads.htm#ref_139_20">Free_Fields</a> <b>then</b>
-         <b>for</b> <span class="symbol"><a name="ref_1009_14">I</a></span> <b>in</b> <a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>'First .. (<a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>'Last - 1) <b>loop</b>
+         <b>for</b> <span class="symbol"><a name="ref_1009_14">I</a></span> <b>in</b> <a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>'First .. <a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>'Last - 1 <b>loop</b>
             <b>if</b> <a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>.<b>all</b> (<a href="terminal_interface-curses-forms__adb.htm#ref_1009_14">I</a>) /= <a href="terminal_interface-curses-forms__ads.htm#ref_55_4">Null_Field</a> <b>then</b>
                <a href="terminal_interface-curses-forms__ads.htm#ref_317_14">Delete</a> (<a href="terminal_interface-curses-forms__ads.htm#ref_138_20">FA</a>.<b>all</b> (<a href="terminal_interface-curses-forms__adb.htm#ref_1009_14">I</a>));
             <b>end</b> <b>if</b>;
diff --git a/doc/html/ada/terminal_interface-curses-menus__adb.htm b/doc/html/ada/terminal_interface-curses-menus__adb.htm
index 560273380..e1d9bdf10 100644
--- a/doc/html/ada/terminal_interface-curses-menus__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-menus__adb.htm
@@ -24,7 +24,7 @@
 <span class="comment"><em>--                                 B O D Y                                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
-<span class="comment"><em>-- Copyright 2018,2020 Thomas E. Dickey                                     --</em></span>
+<span class="comment"><em>-- Copyright 2018-2020,2025 Thomas E. Dickey                                --</em></span>
 <span class="comment"><em>-- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>-- Permission is hereby granted, free of charge, to any person obtaining a  --</em></span>
@@ -53,8 +53,8 @@
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <span class="comment"><em>--  Author:  Juergen Pfeifer, 1996</em></span>
 <span class="comment"><em>--  Version Control:</em></span>
-<span class="comment"><em>--  @Revision: 1.34 @</em></span>
-<span class="comment"><em>--  @Date: 2020/02/02 23:34:34 @</em></span>
+<span class="comment"><em>--  @Revision: 1.35 @</em></span>
+<span class="comment"><em>--  @Date: 2025/01/24 20:39:23 @</em></span>
 <span class="comment"><em>--  Binding Version 01.00</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <b>with</b> Ada.Unchecked_Deallocation;
@@ -895,7 +895,7 @@
         (Item_Array, <a href="terminal_interface-curses-menus__ads.htm#ref_177_9">Item_Array_Access</a>);
    <b>begin</b>
       <b>if</b> <a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a> /= <b>null</b> <b>and</b> <b>then</b> <a href="terminal_interface-curses-menus__ads.htm#ref_180_20">Free_Items</a> <b>then</b>
-         <b>for</b> <span class="symbol"><a name="ref_881_14">I</a></span> <b>in</b> <a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>'First .. (<a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>'Last - 1) <b>loop</b>
+         <b>for</b> <span class="symbol"><a name="ref_881_14">I</a></span> <b>in</b> <a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>'First .. <a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>'Last - 1 <b>loop</b>
             <b>if</b> <a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>.<b>all</b> (<a href="terminal_interface-curses-menus__adb.htm#ref_881_14">I</a>) /= <a href="terminal_interface-curses-menus__ads.htm#ref_58_4">Null_Item</a> <b>then</b>
                <a href="terminal_interface-curses-menus__ads.htm#ref_202_14">Delete</a> (<a href="terminal_interface-curses-menus__ads.htm#ref_179_20">IA</a>.<b>all</b> (<a href="terminal_interface-curses-menus__adb.htm#ref_881_14">I</a>));
             <b>end</b> <b>if</b>;
diff --git a/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm b/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm
index 7270d2c89..8fd12a31b 100644
--- a/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm
@@ -24,7 +24,7 @@
 <span class="comment"><em>--                                 B O D Y                                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
-<span class="comment"><em>-- Copyright 2020 Thomas E. Dickey                                          --</em></span>
+<span class="comment"><em>-- Copyright 2020,2025 Thomas E. Dickey                                     --</em></span>
 <span class="comment"><em>-- Copyright 1999-2003,2009 Free Software Foundation, Inc.                  --</em></span>
 <span class="comment"><em>--                                                                          --</em></span>
 <span class="comment"><em>-- Permission is hereby granted, free of charge, to any person obtaining a  --</em></span>
@@ -53,7 +53,7 @@
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <span class="comment"><em>--  Author:  Juergen Pfeifer, 1996</em></span>
 <span class="comment"><em>--  Version Control:</em></span>
-<span class="comment"><em>--  @Revision: 1.13 @</em></span>
+<span class="comment"><em>--  @Revision: 1.14 @</em></span>
 <span class="comment"><em>--  Binding Version 01.00</em></span>
 <span class="comment"><em>------------------------------------------------------------------------------</em></span>
 <b>with</b> <a href="interfac__ads.htm#ref_38_9">Interfaces</a>.C;
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 3309a495a..8ddd87465 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -58,11 +58,71 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>add_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvadd_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>echo_wchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wecho_wchar(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
+       <EM>/*</EM> <EM>(integer)</EM> <EM>constants</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_BLOCK;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_BOARD;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_BTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_BULLET;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_CKBOARD;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_DARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_DEGREE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_DIAMOND;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_HLINE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LANTERN;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LLCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LRCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_PLMINUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_PLUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_RARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_RTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_S1;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_S9;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_TTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_UARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_ULCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_URCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_VLINE;</STRONG>
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_GEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_LEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_NEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_PI;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_S3;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_S7;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_STERLING;</STRONG>
+       <EM>/*</EM> <EM>extensions</EM> <EM>for</EM> <EM>thick</EM> <EM>lines</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_BTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_HLINE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_LLCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_LRCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_LTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_PLUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_RTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_TTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_ULCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_URCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_T_VLINE;</STRONG>
+       <EM>/*</EM> <EM>extensions</EM> <EM>for</EM> <EM>double</EM> <EM>lines</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_BTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_HLINE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_LLCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_LRCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_LTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_PLUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_RTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_TTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_ULCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_URCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_D_VLINE;</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
@@ -154,74 +214,74 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
                        <STRONG>Unicode</STRONG>   <STRONG>ACS</STRONG>       <STRONG>acsc</STRONG>
        <STRONG>Symbol</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>WACS_BLOCK</STRONG>      0x25ae    #         0      solid square block
-       <STRONG>WACS_BOARD</STRONG>      0x2592    #         h      board of squares
-       <STRONG>WACS_BTEE</STRONG>       0x2534    +         v      bottom tee
-       <STRONG>WACS_BULLET</STRONG>     0x00b7    o         ~      bullet
-       <STRONG>WACS_CKBOARD</STRONG>    0x2592    :         a      checker board (stipple)
-       <STRONG>WACS_DARROW</STRONG>     0x2193    v         .      arrow pointing down
-       <STRONG>WACS_DEGREE</STRONG>     0x00b0    '         f      degree symbol
-       <STRONG>WACS_DIAMOND</STRONG>    0x25c6    +         `      diamond
-       <STRONG>WACS_GEQUAL</STRONG>     0x2265    &gt;         &gt;      greater-than-or-equal-to
-       <STRONG>WACS_HLINE</STRONG>      0x2500    -         q      horizontal line
-       <STRONG>WACS_LANTERN</STRONG>    0x2603    #         i      lantern symbol
-       <STRONG>WACS_LARROW</STRONG>     0x2190    &lt;         ,      arrow pointing left
-       <STRONG>WACS_LEQUAL</STRONG>     0x2264    &lt;         y      less-than-or-equal-to
-       <STRONG>WACS_LLCORNER</STRONG>   0x2514    +         m      lower left-hand corner
-       <STRONG>WACS_LRCORNER</STRONG>   0x2518    +         j      lower right-hand corner
-       <STRONG>WACS_LTEE</STRONG>       0x2524    +         t      left tee
-       <STRONG>WACS_NEQUAL</STRONG>     0x2260    !         |      not-equal
-       <STRONG>WACS_PI</STRONG>         0x03c0    *         {      greek pi
-       <STRONG>WACS_PLMINUS</STRONG>    0x00b1    #         g      plus/minus
-       <STRONG>WACS_PLUS</STRONG>       0x253c    +         n      plus
-       <STRONG>WACS_RARROW</STRONG>     0x2192    &gt;         +      arrow pointing right
-       <STRONG>WACS_RTEE</STRONG>       0x251c    +         u      right tee
-       <STRONG>WACS_S1</STRONG>         0x23ba    -         o      scan line 1
-       <STRONG>WACS_S3</STRONG>         0x23bb    -         p      scan line 3
-       <STRONG>WACS_S7</STRONG>         0x23bc    -         r      scan line 7
-       <STRONG>WACS_S9</STRONG>         0x23bd    _         s      scan line 9
-       <STRONG>WACS_STERLING</STRONG>   0x00a3    f         }      pound-sterling symbol
-
-       <STRONG>WACS_TTEE</STRONG>       0x252c    +         w      top tee
-       <STRONG>WACS_UARROW</STRONG>     0x2191    ^         -      arrow pointing up
-       <STRONG>WACS_ULCORNER</STRONG>   0x250c    +         l      upper left-hand corner
-       <STRONG>WACS_URCORNER</STRONG>   0x2510    +         k      upper right-hand corner
-       <STRONG>WACS_VLINE</STRONG>      0x2502    |         x      vertical line
-
-       The wide-character configuration of <EM>ncurses</EM> also  defines  symbols  for
-       thick lines (<STRONG>acsc</STRONG> "J" to "V"):
+       <STRONG>WACS_BLOCK</STRONG>      U+25ae    #         0      solid square block
+       <STRONG>WACS_BOARD</STRONG>      U+2592    #         h      board of squares
+       <STRONG>WACS_BTEE</STRONG>       U+2534    +         v      bottom tee
+       <STRONG>WACS_BULLET</STRONG>     U+00b7    o         ~      bullet
+       <STRONG>WACS_CKBOARD</STRONG>    U+2592    :         a      checker board (stipple)
+       <STRONG>WACS_DARROW</STRONG>     U+2193    v         .      arrow pointing down
+       <STRONG>WACS_DEGREE</STRONG>     U+00b0    '         f      degree symbol
+       <STRONG>WACS_DIAMOND</STRONG>    U+25c6    +         `      diamond
+       <STRONG>WACS_GEQUAL</STRONG>     U+2265    &gt;         &gt;      greater-than-or-equal-to
+       <STRONG>WACS_HLINE</STRONG>      U+2500    -         q      horizontal line
+       <STRONG>WACS_LANTERN</STRONG>    U+2603    #         i      lantern symbol
+       <STRONG>WACS_LARROW</STRONG>     U+2190    &lt;         ,      arrow pointing left
+       <STRONG>WACS_LEQUAL</STRONG>     U+2264    &lt;         y      less-than-or-equal-to
+       <STRONG>WACS_LLCORNER</STRONG>   U+2514    +         m      lower left-hand corner
+       <STRONG>WACS_LRCORNER</STRONG>   U+2518    +         j      lower right-hand corner
+       <STRONG>WACS_LTEE</STRONG>       U+2524    +         t      left tee
+       <STRONG>WACS_NEQUAL</STRONG>     U+2260    !         |      not-equal
+       <STRONG>WACS_PI</STRONG>         U+03c0    *         {      greek pi
+       <STRONG>WACS_PLMINUS</STRONG>    U+00b1    #         g      plus/minus
+       <STRONG>WACS_PLUS</STRONG>       U+253c    +         n      plus
+       <STRONG>WACS_RARROW</STRONG>     U+2192    &gt;         +      arrow pointing right
+       <STRONG>WACS_RTEE</STRONG>       U+251c    +         u      right tee
+       <STRONG>WACS_S1</STRONG>         U+23ba    -         o      scan line 1
+       <STRONG>WACS_S3</STRONG>         U+23bb    -         p      scan line 3
+       <STRONG>WACS_S7</STRONG>         U+23bc    -         r      scan line 7
+       <STRONG>WACS_S9</STRONG>         U+23bd    _         s      scan line 9
+       <STRONG>WACS_STERLING</STRONG>   U+00a3    f         }      pound-sterling symbol
+       <STRONG>WACS_TTEE</STRONG>       U+252c    +         w      top tee
+       <STRONG>WACS_UARROW</STRONG>     U+2191    ^         -      arrow pointing up
+       <STRONG>WACS_ULCORNER</STRONG>   U+250c    +         l      upper left-hand corner
+       <STRONG>WACS_URCORNER</STRONG>   U+2510    +         k      upper right-hand corner
+
+       <STRONG>WACS_VLINE</STRONG>      U+2502    |         x      vertical line
+
+       The <EM>ncurses</EM> wide API also defines symbols for  thick  lines  (<STRONG>acsc</STRONG>  "J"
+       through "N", "T" through "X", and "Q"):
 
                          <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
        <STRONG>ACS</STRONG> <STRONG>Name</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>WACS_T_BTEE</STRONG>       0x253b    +         V      thick tee pointing up
-       <STRONG>WACS_T_HLINE</STRONG>      0x2501    -         Q      thick horizontal line
-       <STRONG>WACS_T_LLCORNER</STRONG>   0x2517    +         M      thick lower left corner
-       <STRONG>WACS_T_LRCORNER</STRONG>   0x251b    +         J      thick lower right corner
-       <STRONG>WACS_T_LTEE</STRONG>       0x252b    +         T      thick tee pointing right
-       <STRONG>WACS_T_PLUS</STRONG>       0x254b    +         N      thick large plus
-       <STRONG>WACS_T_RTEE</STRONG>       0x2523    +         U      thick tee pointing left
-       <STRONG>WACS_T_TTEE</STRONG>       0x2533    +         W      thick tee pointing down
-       <STRONG>WACS_T_ULCORNER</STRONG>   0x250f    +         L      thick upper left corner
-       <STRONG>WACS_T_URCORNER</STRONG>   0x2513    +         K      thick upper right corner
-       <STRONG>WACS_T_VLINE</STRONG>      0x2503    |         X      thick vertical line
-
-       and for double-lines (<STRONG>acsc</STRONG> "A" to "I"):
+       <STRONG>WACS_T_BTEE</STRONG>       U+253b    +         V      thick tee pointing up
+       <STRONG>WACS_T_HLINE</STRONG>      U+2501    -         Q      thick horizontal line
+       <STRONG>WACS_T_LLCORNER</STRONG>   U+2517    +         M      thick lower left corner
+       <STRONG>WACS_T_LRCORNER</STRONG>   U+251b    +         J      thick lower right corner
+       <STRONG>WACS_T_LTEE</STRONG>       U+252b    +         T      thick tee pointing right
+       <STRONG>WACS_T_PLUS</STRONG>       U+254b    +         N      thick large plus
+       <STRONG>WACS_T_RTEE</STRONG>       U+2523    +         U      thick tee pointing left
+       <STRONG>WACS_T_TTEE</STRONG>       U+2533    +         W      thick tee pointing down
+       <STRONG>WACS_T_ULCORNER</STRONG>   U+250f    +         L      thick upper left corner
+       <STRONG>WACS_T_URCORNER</STRONG>   U+2513    +         K      thick upper right corner
+       <STRONG>WACS_T_VLINE</STRONG>      U+2503    |         X      thick vertical line
+
+       and for double lines (<STRONG>acsc</STRONG> "A" through "I", plus "R" and "Y"):
 
                          <STRONG>Unicode</STRONG>   <STRONG>ASCII</STRONG>     <STRONG>acsc</STRONG>
        <STRONG>ACS</STRONG> <STRONG>Name</STRONG>          <STRONG>Default</STRONG>   <STRONG>Default</STRONG>   <STRONG>Char</STRONG>   <STRONG>Glyph</STRONG> <STRONG>Name</STRONG>
        ------------------------------------------------------------------------
-       <STRONG>WACS_D_BTEE</STRONG>       0x2569    +         H      double tee pointing up
-       <STRONG>WACS_D_HLINE</STRONG>      0x2550    -         R      double horizontal line
-       <STRONG>WACS_D_LLCORNER</STRONG>   0x255a    +         D      double lower left corner
-       <STRONG>WACS_D_LRCORNER</STRONG>   0x255d    +         A      double lower right corner
-       <STRONG>WACS_D_LTEE</STRONG>       0x2560    +         F      double tee pointing right
-       <STRONG>WACS_D_PLUS</STRONG>       0x256c    +         E      double large plus
-       <STRONG>WACS_D_RTEE</STRONG>       0x2563    +         G      double tee pointing left
-       <STRONG>WACS_D_TTEE</STRONG>       0x2566    +         I      double tee pointing down
-       <STRONG>WACS_D_ULCORNER</STRONG>   0x2554    +         C      double upper left corner
-       <STRONG>WACS_D_URCORNER</STRONG>   0x2557    +         B      double upper right corner
-       <STRONG>WACS_D_VLINE</STRONG>      0x2551    |         Y      double vertical line
+       <STRONG>WACS_D_BTEE</STRONG>       U+2569    +         H      double tee pointing up
+       <STRONG>WACS_D_HLINE</STRONG>      U+2550    -         R      double horizontal line
+       <STRONG>WACS_D_LLCORNER</STRONG>   U+255a    +         D      double lower left corner
+       <STRONG>WACS_D_LRCORNER</STRONG>   U+255d    +         A      double lower right corner
+       <STRONG>WACS_D_LTEE</STRONG>       U+2560    +         F      double tee pointing right
+       <STRONG>WACS_D_PLUS</STRONG>       U+256c    +         E      double large plus
+       <STRONG>WACS_D_RTEE</STRONG>       U+2563    +         G      double tee pointing left
+       <STRONG>WACS_D_TTEE</STRONG>       U+2566    +         I      double tee pointing down
+       <STRONG>WACS_D_ULCORNER</STRONG>   U+2554    +         C      double upper left corner
+       <STRONG>WACS_D_URCORNER</STRONG>   U+2557    +         B      double upper right corner
+       <STRONG>WACS_D_VLINE</STRONG>      U+2551    |         Y      double vertical line
 
        Unicode's  descriptions  for  these  characters  differs  slightly from
        <EM>ncurses</EM>, by introducing the term "light"  (along  with  less  important
@@ -242,84 +302,91 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
+       <STRONG>o</STRONG>   (for functions taking a <EM>WINDOW</EM> pointer  argument)  <EM>win</EM>  is  a  null
+           pointer,
 
-       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
-           been  called  on  <EM>win</EM>  when writing to its bottom right location is
-           attempted, or
+       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
+           been called on <EM>win</EM> (or <STRONG>stdscr</STRONG>, as applicable) when writing  to  its
+           bottom right location is attempted, or
 
-       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
+       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
            position.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>add_wch</STRONG>, <STRONG>mvadd_wch</STRONG>, <STRONG>mvwadd_wch</STRONG>, and <STRONG>echo_wchar</STRONG> may  be  implemented  as
+       <STRONG>add_wch</STRONG>,  <STRONG>mvadd_wch</STRONG>,  <STRONG>mvwadd_wch</STRONG>,  and <STRONG>echo_wchar</STRONG> may be implemented as
        macros.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-
-</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       The  <STRONG>TABSIZE</STRONG>  variable  is  implemented  in  SVr4 and other versions of
-       <EM>curses</EM>, but is not specified by X/Open Curses (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>).
+       The  symbols  (<EM>WACS</EM><STRONG>_</STRONG><EM>S3</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>S7</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>PI</EM>,
+       <EM>WACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>,  and  <EM>WACS</EM><STRONG>_</STRONG><EM>STERLING</EM>)  are  not  standard.   However,  many
+       publicly  available   <EM>terminfo</EM>   entries   include   <EM>acs</EM><STRONG>_</STRONG><EM>chars</EM>   (<STRONG>acsc</STRONG>)
+       capabilities  in which their key characters (<STRONG>pryz{|}</STRONG>) are embedded, and
+       a second-hand list of their character descriptions has come  to  light.
+       The <EM>ncurses</EM> developers invented WACS-prefixed names for them.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+       Applications employing <EM>ncurses</EM> extensions should condition their use on
+       the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
+
        These functions are described in X/Open Curses Issue 4.   It  specifies
        no error conditions for them.
 
        The  defaults specified for forms-drawing characters apply in the POSIX
        locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
-       defined  as  a  pointer  to  <STRONG>cchar_t</STRONG>  data,  e.g., in the discussion of
-       <STRONG>border_set</STRONG>.  A few implementations are problematic:
+       defined  as  a  pointer  to  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  data,  e.g., in the discussion of
+       <EM>border</EM><STRONG>_</STRONG><EM>set</EM>.  A few implementations are problematic:
 
-       <STRONG>o</STRONG>   NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>.
+       <STRONG>o</STRONG>   NetBSD <EM>curses</EM> defines the symbols as a <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> within a <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
-       <STRONG>o</STRONG>   HP-UX curses equates some of the  <STRONG>ACS_</STRONG>  symbols  to  the  analogous
-           <STRONG>WACS_</STRONG>  symbols  as  if  the <STRONG>ACS_</STRONG> symbols were wide characters.  The
+       <STRONG>o</STRONG>   HP-UX <EM>curses</EM> equates some of the  <EM>ACS</EM><STRONG>_</STRONG>  symbols  to  the  analogous
+           <EM>WACS</EM><STRONG>_</STRONG>  symbols  as  if  the <EM>ACS</EM><STRONG>_</STRONG> symbols were wide characters.  The
            misdefined symbols are the arrows and other symbols which  are  not
            used for line-drawing.
 
        X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
-       SVr4 curses implementations defined their line-drawing symbols in terms
-       of  intermediate  symbols.   This implementation extends those symbols,
-       providing new definitions which are not in the SVr4 implementations.
+       SVr4 <EM>curses</EM> implementations defined their line-drawing symbols in terms
+       of  intermediate symbols.  <EM>ncurses</EM> extends those symbols, providing new
+       definitions not found in SVr4 implementations.
 
        Not all  Unicode-capable  terminals  provide  support  for  VT100-style
-       alternate  character  sets  (i.e.,  the  <STRONG>acsc</STRONG>  capability),  with their
-       corresponding line-drawing characters.  X/Open Curses did  not  address
-       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
-       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
-       the <STRONG>acsc</STRONG> character-mapping to provide this feature.  As a result, those
-       implementations  can  only  use  single-byte  line-drawing  characters.
-       <EM>ncurses</EM>  5.3  (2002)  provided a table of Unicode values to solve these
-       problems.  NetBSD curses incorporated that table in 2010.
-
-       In this implementation, the Unicode values  are  used  instead  of  the
-       terminal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the
-       environment variable <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.  In contrast,  for  the  same
-       cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use only
-       the ASCII default values.
-
-       Having Unicode available does not solve all of the problems with  line-
-       drawing for curses:
-
-       <STRONG>o</STRONG>   The  closest  Unicode  equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM>
-           and <EM>S9</EM> frequently are not displayed at the regular intervals  which
+       alternate character sets (i.e., the <EM>acsc</EM><STRONG>_</STRONG><EM>chars</EM> (<STRONG>acsc</STRONG>) capability), with
+       their corresponding line-drawing characters.   X/Open  Curses  did  not
+       address the aspect of integrating Unicode with line-drawing characters.
+       Existing implementations of System V <EM>curses</EM> (AIX, HP-UX,  Solaris)  use
+       only  the  <EM>acsc</EM><STRONG>_</STRONG><EM>chars</EM> (<STRONG>acsc</STRONG>) character-mapping to provide this feature.
+       As a result, those  implementations  can  use  only  single-byte  line-
+       drawing  characters.   <EM>ncurses</EM>  5.3  (2002) provided a table of Unicode
+       values to solve these problems.  NetBSD <EM>curses</EM> incorporated that  table
+       in 2010.
+
+       <EM>ncurses</EM>   uses   the  Unicode  values  instead  of  the  terminal  type
+       description's <EM>acsc</EM><STRONG>_</STRONG><EM>chars</EM> (<STRONG>acsc</STRONG>) mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for
+       the  environment  variable  <EM>NCURSES</EM><STRONG>_</STRONG><EM>NO</EM><STRONG>_</STRONG><EM>UTF8</EM><STRONG>_</STRONG><EM>ACS</EM>.   In contrast, for the
+       same cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG> will use
+       only the ASCII default values.
+
+       Having  Unicode available does not solve all of the problems with line-
+       drawing for <EM>curses</EM>:
+
+       <STRONG>o</STRONG>   The closest Unicode equivalents to the VT100 graphics <EM>S1</EM>,  <EM>S3</EM>,  <EM>S7</EM>,
+           and  <EM>S9</EM> frequently are not displayed at the regular intervals which
            the terminal used.
 
-       <STRONG>o</STRONG>   The  <EM>lantern</EM>  is  a special case.  It originated with the AT&amp;T 4410
-           terminal in the early 1980s.  There is no accessible  documentation
+       <STRONG>o</STRONG>   The <EM>lantern</EM> is a special case.  It originated with  the  AT&amp;T  4410
+           terminal  in the early 1980s.  There is no accessible documentation
            depicting the lantern symbol on the AT&amp;T terminal.
 
            Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
            since they lie outside the Basic Multilingual Plane and as a result
            are unavailable on many terminals.  They are not storm lanterns, in
            any case.
@@ -327,20 +394,20 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: &lt;section&gt; U+00A7 (section
-           mark), &lt;Theta&gt; U+0398 (theta), &lt;Phi&gt; U+03A6 (phi),  &lt;delta&gt;  U+03B4
+           mark),  &lt;Theta&gt;  U+0398 (theta), &lt;Phi&gt; U+03A6 (phi), &lt;delta&gt; U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
 </PRE><H3><a name="h3-Complex-Characters">Complex Characters</a></H3><PRE>
-       The complex character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  can  store  more  than  one  wide
-       character  (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>).  X/Open Curses does not mention this possibility,
-       specifying behavior only  where  <EM>wch</EM>  is  a  single  character,  either
+       The  complex  character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  can  store  more  than one wide
+       character (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>).  X/Open Curses does not mention this  possibility,
+       specifying  behavior  only  where  <EM>wch</EM>  is  a  single character, either
        spacing or non-spacing.
 
        <EM>ncurses</EM> assumes that <EM>wch</EM> is constructed using <STRONG><A HREF="curs_getcchar.3x.html">setcchar(3x)</A></STRONG>, and in turn
@@ -351,18 +418,25 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   holds one non-spacing character.
 
-       In  the  latter  case,  <EM>ncurses</EM>  adds  the non-spacing character to the
+       In the latter case, <EM>ncurses</EM>  adds  the  non-spacing  character  to  the
        active complex character.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
-       (1995).   The  System V Interface Definition Version 4 of the same year
-       specified  functions  named  <EM>waddwch</EM>  and  <EM>wechowchar</EM>  (and  the  usual
-       variants).   These were later additions to SVr4.<EM>x</EM>, not appearing in the
-       first SVr4 (1989).  They differed  from  X/Open's  later  <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM>  and
-       <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM>  in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead
-       of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V  Interface  Definition  (SVID)  Version 4  of  the  same  year
+       specified  functions named <EM>waddwch</EM> (and the usual variants), <EM>echowchar</EM>,
+       and <EM>wechowchar</EM>.  These were later additions to SVr4.<EM>x</EM>, not appearing in
+       the  first SVr4 (1989).  They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wch</EM> and
+       <EM>wecho</EM><STRONG>_</STRONG><EM>wchar</EM> in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  instead
+       of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.  SVID defined no  <EM>WACS</EM><STRONG>_</STRONG> symbols.
+
+       X/Open  Curses  Issue 4  also  defined  many  of  the  <EM>WACS</EM><STRONG>_</STRONG> constants,
+       excepting  <EM>WACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>PI</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>S3</EM>,
+       <EM>WACS</EM><STRONG>_</STRONG><EM>S7</EM>,  and  <EM>WACS</EM><STRONG>_</STRONG><EM>STERLING</EM>;  and  those  for drawing thick and double
+       lines.
+
+       <EM>ncurses</EM> 5.3 (2002) furnished the remaining <EM>WACS</EM><STRONG>_</STRONG> constants.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -375,7 +449,7 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -390,11 +464,7 @@ <H1 class="no-header">curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
-<li><a href="#h2-EXTENSIONS">EXTENSIONS</a>
-<ul>
-<li><a href="#h3-TABSIZE">TABSIZE</a></li>
-</ul>
-</li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Complex-Characters">Complex Characters</a></li>
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index 2ca3ccccf..85c59f449 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
@@ -118,12 +118,12 @@ <H1 class="no-header">curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by X/Open Curses Issue 4.  The
-       System V  Interface  Definition  Version 4  (1995), specified functions
-       named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and the usual variants).  These  were
-       later  additions  to  SVr4.<EM>x</EM>,  not  appearing in the first SVr4 (1989).
-       They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM> and <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM> in  that
-       they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
+       functions named <EM>waddwchstr</EM> and <EM>waddwchnstr</EM> (and  the  usual  variants).
+       These  were  later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4
+       (1989).  They differed from X/Open's later <EM>wadd</EM><STRONG>_</STRONG><EM>wchstr</EM> and <EM>wadd</EM><STRONG>_</STRONG><EM>wchnstr</EM>
+       in that they each took an argument of type <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -134,7 +134,7 @@ <H1 class="no-header">curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2025-01-18               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01               <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index ba3072c77..986066d6d 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -63,6 +63,41 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>echochar(const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wechochar(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
+       <EM>/*</EM> <EM>(integer)</EM> <EM>constants</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_BLOCK;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_BOARD;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_BTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_BULLET;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_CKBOARD;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_DARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_DEGREE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_DIAMOND;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_HLINE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LANTERN;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LLCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LRCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_PLMINUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_PLUS;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_RARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_RTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_S1;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_S9;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_TTEE;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_UARROW;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_ULCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_URCORNER;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_VLINE;</STRONG>
+       <EM>/*</EM> <EM>extensions</EM> <EM>*/</EM>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_GEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_LEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_NEQUAL;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_PI;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_S3;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_S7;</STRONG>
+       /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_STERLING;</STRONG>
+
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
@@ -144,6 +179,7 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        ------------------------------------------------------------------------
        <STRONG>ACS_BLOCK</STRONG>      #         0      solid square block
        <STRONG>ACS_BOARD</STRONG>      #         h      board of squares
+
        <STRONG>ACS_BTEE</STRONG>       +         v      bottom tee
        <STRONG>ACS_BULLET</STRONG>     o         ~      bullet
        <STRONG>ACS_CKBOARD</STRONG>    :         a      checker board (stipple)
@@ -183,26 +219,27 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM>,
+       <STRONG>o</STRONG>   (for functions taking a <EM>WINDOW</EM> pointer  argument)  <EM>win</EM>  is  a  null
+           pointer,
 
-       <STRONG>o</STRONG>   wrapping to a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  has  not
-           been  called  on  <EM>win</EM>  when a write to its bottom right location is
-           attempted, or
+       <STRONG>o</STRONG>   wrapping  to  a new line is impossible because <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> has not
+           been called on <EM>win</EM> (or <STRONG>stdscr</STRONG>, as applicable) when a write  to  its
+           bottom right location is attempted, or
 
-       <STRONG>o</STRONG>   it is not possible to  add  a  complete  character  at  the  cursor
+       <STRONG>o</STRONG>   it  is  not  possible  to  add  a  complete character at the cursor
            position.
 
        The last may be due to different causes:
 
-       <STRONG>o</STRONG>   conversion  of  a  wide character to a multibyte character sequence
+       <STRONG>o</STRONG>   conversion of a wide character to a  multibyte  character  sequence
            can fail, or
 
-       <STRONG>o</STRONG>   at least one of the bytes resulting from wide character  conversion
-           to  a  multibyte  character sequence cannot be added to the window.
-           See section "PORTABILITY" below regarding the use  of  <STRONG>waddch</STRONG>  with
+       <STRONG>o</STRONG>   at  least one of the bytes resulting from wide character conversion
+           to a multibyte character sequence cannot be added  to  the  window.
+           See  section  "PORTABILITY"  below regarding the use of <STRONG>waddch</STRONG> with
            wide characters.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
@@ -211,10 +248,13 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-
-</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
-       SVr4 and other versions of <EM>curses</EM> implement the <STRONG>TABSIZE</STRONG>  variable,  but
-       X/Open Curses does not specify it; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+       The   symbols   (<EM>ACS</EM><STRONG>_</STRONG><EM>S3</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>S7</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,  <EM>ACS</EM><STRONG>_</STRONG><EM>PI</EM>,
+       <EM>ACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>, and <EM>ACS</EM><STRONG>_</STRONG><EM>STERLING</EM>)  were  not  documented  in  any  publicly
+       released  System V  and  are  not  standard.   However,  many  publicly
+       available <EM>terminfo</EM> entries include  <EM>acs</EM><STRONG>_</STRONG><EM>chars</EM>  (<STRONG>acsc</STRONG>)  capabilities  in
+       which  their  key  characters (<STRONG>pryz{|}</STRONG>) are embedded, and a second-hand
+       list of their character descriptions has come to  light.   The  <EM>ncurses</EM>
+       developers invented ACS-prefixed names for them.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -232,23 +272,23 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
-       X/Open  Curses  states  that  the  <STRONG>ACS_</STRONG> definitions are <EM>char</EM> constants.
+       X/Open  Curses  states  that  the  <EM>ACS</EM><STRONG>_</STRONG> definitions are <EM>char</EM> constants.
        Some implementations are problematic.
 
        <STRONG>o</STRONG>   Solaris <EM>curses</EM>, for example, defines the ACS symbols as  constants;
            others define them as elements of an array.
 
-           This  implementation  uses  an  array, <STRONG>acs_map</STRONG>, as did SVr4 <EM>curses</EM>.
-           NetBSD also uses an array, actually named <STRONG>_acs_char</STRONG>, with a <STRONG>#define</STRONG>
-           for compatibility.
+           SVr4  used  an array, <EM>acs</EM><STRONG>_</STRONG><EM>map</EM>, as does <EM>ncurses</EM>.  NetBSD <EM>curses</EM> also
+           uses an array, actually  named  <STRONG>_</STRONG><EM>acs</EM><STRONG>_</STRONG><EM>char</EM>,  with  a  "#define"  for
+           compatibility.
 
-       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <STRONG>ACS_</STRONG> symbols to the analogous
-           <STRONG>WACS_</STRONG> symbols as if the <STRONG>ACS_</STRONG>  symbols  were  wide  characters  (see
+       <STRONG>o</STRONG>   HP-UX  <EM>curses</EM>  equates  some  of  the <EM>ACS</EM><STRONG>_</STRONG> symbols to the analogous
+           <EM>WACS</EM><STRONG>_</STRONG> symbols as if the <EM>ACS</EM><STRONG>_</STRONG>  symbols  were  wide  characters  (see
            <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>).   The  misdefined  symbols  are  the  arrows and
            others that are not used for line drawing.
 
        <STRONG>o</STRONG>   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
-           the  <STRONG>ACS_LANTERN</STRONG>  symbol,  equating  its  "VT100+ Character" to "I"
+           the  <EM>ACS</EM><STRONG>_</STRONG><EM>LANTERN</EM>  symbol,  equating  its  "VT100+ Character" to "I"
            (capital I), while the header  files  for  SVr4  <EM>curses</EM>  and  other
            implementations use "i" (small i).
 
@@ -258,15 +298,7 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            other hand, its <STRONG>gs6300</STRONG> (AT&amp;T PC6300 with EMOTS  Terminal  Emulator)
            description uses lowercase i.
 
-       Some  ACS  symbols  (<STRONG>ACS_S3</STRONG>,  <STRONG>ACS_S7</STRONG>,  <STRONG>ACS_LEQUAL</STRONG>,  <STRONG>ACS_GEQUAL</STRONG>, <STRONG>ACS_PI</STRONG>,
-       <STRONG>ACS_NEQUAL</STRONG>, and <STRONG>ACS_STERLING</STRONG>)  were  not  documented  in  any  publicly
-       released  System V.   However, many publicly available <EM>terminfo</EM> entries
-       include <STRONG>acsc</STRONG> capabilities in which their key characters  (<STRONG>pryz{|}</STRONG>)  are
-       embedded,  and  a  second-hand list of their character descriptions has
-       come to light.  The <EM>ncurses</EM> developers invented ACS-prefixed names  for
-       them.
-
-       The <EM>displayed</EM> values of <STRONG>ACS_</STRONG> constants depend on
+       The <EM>displayed</EM> values of <EM>ACS</EM><STRONG>_</STRONG> constants depend on
 
        <STRONG>o</STRONG>   the  <EM>ncurses</EM>  ABI--for  example,  wide-character  versus  non-wide-
            character configurations  (the  former  is  capable  of  displaying
@@ -280,23 +312,23 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
-       X/Open  Curses  assumes  that the parameter passed to <STRONG>waddch</STRONG> contains a
+       X/Open  Curses  assumes  that the parameter passed to <EM>waddch</EM> contains a
        single character.  That character may have been more  than  eight  bits
        wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
        width of a non-wide character code unspecified.  The  standard  further
        does  not specify the internal structure of a <EM>chtype</EM>, though the use of
        bit operations to combine the character  code  with  attributes  and  a
-       color pair identifier into a <EM>chtype</EM> for passage to <STRONG>waddch</STRONG> is common.  A
+       color pair identifier into a <EM>chtype</EM> for passage to <EM>waddch</EM> is common.  A
        portable application uses only the macros discussed in <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG> to
        manipulate a <EM>chtype</EM>.
 
        In <EM>ncurses</EM>, <EM>chtype</EM> holds an eight-bit character, but the library allows
        a multibyte character sequence to be passed via a succession  of  calls
-       to  <STRONG>waddch</STRONG>.   Other  implementations  do  not;  a <STRONG>waddch</STRONG> call transmits
+       to  <EM>waddch</EM>.   Other  implementations  do  not;  a <EM>waddch</EM> call transmits
        exactly one character, which may be rendered  in  one  or  more  screen
        locations  depending  on  whether  it  is  printable  (see <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>).
        Depending on the locale, <EM>ncurses</EM>  inspects  the  byte  passed  in  each
-       <STRONG>waddch</STRONG>  call  and  checks whether the latest call continues a multibyte
+       <EM>waddch</EM>  call  and  checks whether the latest call continues a multibyte
        character.   When  a  character  is  <EM>complete</EM>,  <EM>ncurses</EM>  displays   the
        character   and  advances  the  cursor.   If  the  calling  application
        interrupts the succession of bytes in a multibyte character sequence by
@@ -313,9 +345,13 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>waddch</EM>.
+       4BSD (1980) introduced <EM>waddch</EM> and its variants.
 
-       SVr3 (1987) added <EM>wechochar</EM>.
+       SVr3 (1987) added the <EM>echochar</EM> and <EM>wechochar</EM> functions and most of  the
+       <EM>ACS</EM><STRONG>_</STRONG>  constants, except for <EM>ACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>PI</EM>,
+       <EM>ACS</EM><STRONG>_</STRONG><EM>S3</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>S7</EM>, and <EM>ACS</EM><STRONG>_</STRONG><EM>STERLING</EM>.
+
+       <EM>ncurses</EM> 1.9.6 (1995) furnished the remaining <EM>ACS</EM><STRONG>_</STRONG> constants.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -328,7 +364,7 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -343,11 +379,7 @@ <H1 class="no-header">curs_addch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
-<li><a href="#h2-EXTENSIONS">EXTENSIONS</a>
-<ul>
-<li><a href="#h3-TABSIZE">TABSIZE</a></li>
-</ul>
-</li>
+<li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-ACS-Symbols">ACS Symbols</a></li>
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index a97f9ddeb..ccff8452a 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 
@@ -114,7 +114,7 @@ <H1 class="no-header">curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.1 (1987) introduced <EM>waddchstr</EM> and <EM>waddchnstr</EM>.
+       SVr3.1 (1987) introduced these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_addchstr.3x.html">curs_addchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 19ebe5c66..c8bbc76f5 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 
@@ -102,8 +102,8 @@ <H1 class="no-header">curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD  (1980)  <EM>curses</EM>  introduced  <EM>waddstr</EM>  along with its variants, the
-       latter defined as macros.
+       4BSD  (1980)  introduced  <EM>waddstr</EM>  along  with its variants, the latter
+       defined as macros.
 
        SVr3.1 (1987) added <EM>waddnstr</EM> (and its variants) redefining <EM>waddstr</EM> as a
        macro wrapping it.
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 44e626153..8257601d9 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 
@@ -105,22 +105,21 @@ <H1 class="no-header">curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
-       (1995).  The System V Interface Definition Version 4 of the  same  year
-       specified  functions  named  <EM>waddwstr</EM>  and  <EM>waddnwstr</EM>  (and  the  usual
-       variants).  These were later additions to SVr4.<EM>x</EM>, not appearing in  the
-       first SVr4 (1989).
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4  of  the  same  year  specified
+       functions named <EM>waddwstr</EM> and <EM>waddnwstr</EM> (and the usual variants).  These
+       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_addstr.3x.html">curs_addstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>, <STRONG><A HREF="curs_add_wchstr.3x.html">curs_add_wchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_addwstr.3x.html">curs_addwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 3e7a01cb4..e08766743 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -249,14 +249,14 @@ <H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>, <STRONG>wattr_set</STRONG>, <STRONG>chgat</STRONG>, <STRONG>mvchgat</STRONG>, <STRONG>mvwchgat</STRONG>, and
-       <STRONG>color_set</STRONG> are  part  of  <EM>ncurses</EM>'s  wide-character  API,  and  are  not
-       available in its non-wide configuration.
+       <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  <STRONG>attr_set</STRONG>,  <STRONG>wattr_set</STRONG>,  <STRONG>chgat</STRONG>,  <STRONG>mvchgat</STRONG>,  <STRONG>mvwchgat</STRONG>,
+       <STRONG>wchgat</STRONG>, and <STRONG>color_set</STRONG> are part of <EM>ncurses</EM>'s wide-character API, and are
+       not available in its non-wide configuration.
 
        <STRONG>attron</STRONG>,  <STRONG>wattron</STRONG>,  <STRONG>attroff</STRONG>,  <STRONG>wattroff</STRONG>, <STRONG>attrset</STRONG>, <STRONG>wattrset</STRONG>, <STRONG>standout</STRONG>, and
        <STRONG>standend</STRONG> may be implemented as macros.
 
-       Color pair values be logically "or"-ed  with  attributes  if  the  pair
+       Color pair values may be logically "or"-ed with attributes if the  pair
        number is less than 256.  The alternate functions such as <STRONG>color_set</STRONG> can
        pass a color pair value directly.  However, <EM>ncurses</EM> ABI 4 and 5  simply
        logically "or" this value within the alternate functions.  You must use
@@ -368,11 +368,11 @@ <H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD  (1980)  <EM>curses</EM> used a <EM>char</EM> to represent each cell of the terminal
-       screen.  It assumed 7-bit character codes, employing the eighth bit  of
-       a  byte  to  represent  a <EM>standout</EM> attribute (often implemented as bold
-       and/or reverse video).  It introduced  <EM>standout</EM>,  <EM>standend</EM>,  <EM>wstandout</EM>,
-       and   <EM>wstandend</EM>  functions  to  manipulate  this  bit.   Despite  their
+       4BSD  (1980) used a <EM>char</EM> to represent each cell of the terminal screen.
+       It assumed 7-bit character codes, employing the eighth bit of a byte to
+       represent  a  <EM>standout</EM>  attribute  (often  implemented  as  bold and/or
+       reverse video).   It  introduced  <EM>standout</EM>,  <EM>standend</EM>,  <EM>wstandout</EM>,  and
+       <EM>wstandend</EM>   functions   to   manipulate   this   bit.    Despite  their
        inflexibility, they carried over into System V  <EM>curses</EM>  and  ultimately
        X/Open Curses due to their pervasive use in legacy applications.  While
        some 1980s terminals supported  a  variety  of  video  attributes,  BSD
@@ -392,17 +392,17 @@ <H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        SVr3.2 (1988) added the <EM>A</EM><STRONG>_</STRONG><EM>COLOR</EM> macro along with a  color  system;  see
        <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>.
 
-       X/Open  Curses is largely based on SVr4 <EM>curses</EM>, but recognized that the
-       <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> type of ISO C95 was intended to house only a  single  character
-       code,  not  a  sequence  of  codes combining with a base character, let
-       alone could it reliably offer room for a color pair  identifier  and  a
-       set  of  attribute bits with a potential for further growth -- thus the
-       standard invented the <EM>curses</EM>  complex  character  type  <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  and  a
-       separate  type  <EM>attr</EM><STRONG>_</STRONG><EM>t</EM>  for  storage  of attribute bits.  The new types
-       brought  along  several  new  functions  to   manipulate   them,   some
+       X/Open  Curses  Issue 4  (1995)  is  largely  based on SVr4 <EM>curses</EM>, but
+       recognized that the <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> type of ISO C95 was intended to house  only
+       a  single character code, not a sequence of codes combining with a base
+       character, let alone could it reliably offer  room  for  a  color  pair
+       identifier  and  a  set  of attribute bits with a potential for further
+       growth -- thus the standard invented the <EM>curses</EM> complex character  type
+       <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>  and a separate type <EM>attr</EM><STRONG>_</STRONG><EM>t</EM> for storage of attribute bits.  The
+       new types brought along several new functions to manipulate them,  some
        corresponding  to  existing  <EM>chtype</EM>-based functions (<EM>attr</EM><STRONG>_</STRONG><EM>on</EM>, <EM>attr</EM><STRONG>_</STRONG><EM>off</EM>,
-       <EM>attr</EM><STRONG>_</STRONG><EM>set</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>on</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>off</EM>, and <EM>wattr</EM><STRONG>_</STRONG><EM>set</EM>), and some new (<EM>color</EM><STRONG>_</STRONG><EM>set</EM>,
-       <EM>wcolor</EM><STRONG>_</STRONG><EM>set</EM>, <EM>chgat</EM>, <EM>wchgat</EM>, <EM>mvchgat</EM>, and <EM>mvwchgat</EM>).
+       <EM>attr</EM><STRONG>_</STRONG><EM>set</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>on</EM>, <EM>wattr</EM><STRONG>_</STRONG><EM>off</EM>, and <EM>wattr</EM><STRONG>_</STRONG><EM>set</EM>), and some new (<EM>chgat</EM>  and
+       its variants, <EM>color</EM><STRONG>_</STRONG><EM>set</EM>, and <EM>wcolor</EM><STRONG>_</STRONG><EM>set</EM>).
 
        Different  Unix systems used differently sized bit fields in <EM>chtype</EM> for
        the character code and the color pair identifier, and took into account
@@ -493,7 +493,7 @@ <H1 class="no-header">curs_attr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html
index 18d547ab8..51ab36409 100644
--- a/doc/html/man/curs_beep.3x.html
+++ b/doc/html/man/curs_beep.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_beep.3x,v 1.42 2025/02/01 23:46:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_beep 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_beep 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 
@@ -85,12 +85,12 @@ <H1 class="no-header">curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        X/Open Curses Issue 4 describes these functions.  It specifies no error
        conditions for them.
 
-       On SVr4 <EM>curses</EM>, they always return <STRONG>OK</STRONG>, and X/Open Curses specifies them
+       On SVr4 <EM>curses</EM>, they always return <EM>OK</EM>, and X/Open Curses specifies them
        as doing so.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       <EM>beep</EM> and <EM>flash</EM> appeared in SVr2 (1984).
+       SVr2 (1984) introduced <EM>beep</EM> and <EM>flash</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -98,7 +98,7 @@ <H1 class="no-header">curs_beep 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_beep.3x.html">curs_beep(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 4622fe5e6..9d3030485 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -179,7 +179,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by X/Open Curses Issue 4.
+       X/Open Curses Issue 4 (1995) initially specified these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -190,7 +190,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index c01c729e0..28684f559 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_border.3x,v 1.63 2025/02/02 00:00:33 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 
@@ -56,29 +56,28 @@ <H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>border(chtype</STRONG> <EM>ls</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>rs</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ts</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>bs</EM><STRONG>,</STRONG>
-                  <STRONG>chtype</STRONG> <EM>tl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tr</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>bl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>br</EM><STRONG>);</STRONG>
+             <STRONG>chtype</STRONG> <EM>tl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tr</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>bl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>br</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wborder(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ls</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>rs</EM><STRONG>,</STRONG>
-                   <STRONG>chtype</STRONG> <EM>ts</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>bs</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tr</EM><STRONG>,</STRONG>
-                   <STRONG>chtype</STRONG> <EM>bl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>br</EM><STRONG>);</STRONG>
+             <STRONG>chtype</STRONG> <EM>ts</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>bs</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>tr</EM><STRONG>,</STRONG>
+             <STRONG>chtype</STRONG> <EM>bl</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>br</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>box(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>verch</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>horch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>hline(chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>whline(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vline(chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wvline(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-
        <STRONG>int</STRONG> <STRONG>mvhline(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwhline(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>vline(chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wvline(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvvline(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvwvline(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       The  <STRONG>border</STRONG>,  <STRONG>wborder</STRONG> and <STRONG>box</STRONG> routines draw a box around the edges of a
-       window.  Other than the window,  each  argument  is  a  character  with
-       attributes:
-
+       <STRONG>wborder</STRONG>  and  <STRONG>border</STRONG> draw a box at the edges of the specified window or
+       <STRONG>stdscr</STRONG>, respectively.  Each <EM>chtype</EM> argument corresponds to a  geometric
+       component of the border as follows:
               <EM>ls</EM> - left side,
               <EM>rs</EM> - right side,
               <EM>ts</EM> - top side,
@@ -88,46 +87,49 @@ <H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
               <EM>bl</EM> - bottom left-hand corner, and
               <EM>br</EM> - bottom right-hand corner.
 
-       If  any  of  these  arguments  is  zero, then the corresponding default
-       values (defined in <STRONG>curses.h</STRONG>) are used instead:
-
+       If  any <EM>chtype</EM> argument is <STRONG>0</STRONG>, then <EM>curses</EM> uses forms-drawing characters
+       (see <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>) in the following correspondence:
               <STRONG>ACS_VLINE</STRONG>,
               <STRONG>ACS_VLINE</STRONG>,
               <STRONG>ACS_HLINE</STRONG>,
               <STRONG>ACS_HLINE</STRONG>,
               <STRONG>ACS_ULCORNER</STRONG>,
               <STRONG>ACS_URCORNER</STRONG>,
-              <STRONG>ACS_LLCORNER</STRONG>,
+              <STRONG>ACS_LLCORNER</STRONG>, and
               <STRONG>ACS_LRCORNER</STRONG>.
 
-       <STRONG>box(</STRONG><EM>win</EM><STRONG>,</STRONG>  <EM>verch</EM><STRONG>,</STRONG>  <EM>horch</EM><STRONG>)</STRONG>  is  a  shorthand  for  the  following   call:
-       <STRONG>wborder(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0)</STRONG>.
+       <STRONG>box(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>)</STRONG> is shorthand for "<STRONG>wborder(</STRONG><EM>win</EM><STRONG>,</STRONG> <EM>verch</EM><STRONG>,</STRONG> <EM>horch</EM><STRONG>,</STRONG>  <STRONG>0,</STRONG>
+       <STRONG>0,</STRONG> <STRONG>0,</STRONG> <STRONG>0)</STRONG>".
 
-       The  <STRONG>hline</STRONG>  and <STRONG>whline</STRONG> functions draw a horizontal (left to right) line
-       using <EM>ch</EM> starting at the current cursor position in  the  window.   The
-       current  cursor  position  is  not  changed.   The  line  is  at most <EM>n</EM>
-       characters long, or as many as fit into the window.
-
-       The <STRONG>vline</STRONG> and <STRONG>wvline</STRONG> functions draw a vertical  (top  to  bottom)  line
-       using  <EM>ch</EM>  starting  at the current cursor position in the window.  The
-       current cursor position  is  not  changed.   The  line  is  at  most  <EM>n</EM>
-       characters long, or as many as fit into the window.
+       <STRONG>whline</STRONG>  draws  a horizontal line of <EM>ch</EM> from left to right, and <STRONG>wvline</STRONG> a
+       vertical one from top to bottom, stopping once <EM>n</EM> characters  have  been
+       drawn  or  upon  reaching  the boundary of <EM>win</EM>.  These functions do not
+       update the cursor position (beyond any motion directed  by  their  "mv"
+       variants).  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of these functions.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       All routines return the integer <STRONG>OK</STRONG>.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       In <EM>ncurses</EM>,
 
-       This implementation returns <STRONG>ERR</STRONG> if the window pointer is null.
+       <STRONG>o</STRONG>   these functions fail if the screen is not initialized; and
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       <STRONG>o</STRONG>   functions  taking  a  <EM>WINDOW</EM> pointer argument fail if <EM>win</EM> is a null
+           pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>border</STRONG> and <STRONG>box</STRONG> may be implemented as macros.
+       Unusually,  there  is no <STRONG>wbox</STRONG> function; <STRONG>box</STRONG> behaves as one would expect
+       <STRONG>wbox</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
+
+       <STRONG>border</STRONG>, <STRONG>box</STRONG>, <STRONG>hline</STRONG>, <STRONG>mvhline</STRONG>, <STRONG>mvwhline</STRONG>, <STRONG>vline</STRONG>, <STRONG>mvvline</STRONG>, and <STRONG>mvwvline</STRONG> may
+       be implemented as macros.
 
-       The borders generated by these functions are <EM>inside</EM>  borders  (this  is
-       also true of SVr4 curses, though the fact is not documented).
+       Borders drawn by these functions are <EM>interior</EM> borders.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -139,13 +141,24 @@ <H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        from <EM>wrefresh</EM>, which in SVr4 returns a count of characters  written  to
        the window if its <EM>immedok</EM> property is set; in <EM>ncurses</EM>, it does not.
 
+       BSD <EM>curses</EM> drew boxes with <EM>horch</EM> in <EM>every</EM> character cell of the top and
+       bottom lines of the window, whereas SVr3.1 and  later  <EM>curses</EM>,  because
+       its <EM>box</EM> wrapped <EM>wborder</EM>, used the default corner characters.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) introduced <EM>box</EM>, defining it as a function.
+
+       SVr3.1  (1987)  added  <EM>whline</EM> and <EM>wvline</EM> and their variants, as well as
+       <EM>border</EM> and <EM>wborder</EM>, redefining <EM>box</EM> as a macro wrapping the latter.
+
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -155,6 +168,7 @@ <H1 class="no-header">curs_border 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 6347f56b1..393817ce4 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_border_set.3x,v 1.48 2025/02/02 00:04:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>              Library calls             <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 
@@ -55,45 +55,32 @@ <H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>border_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wborder_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>box_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>verch</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>horch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>hline_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>whline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvhline_set(</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwhline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vline_set(</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wvline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvvline_set(</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwvline_set(</STRONG>
-          <STRONG>WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
-          <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
-          <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>border_set(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wborder_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ls</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>rs</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>ts</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bs</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>tr</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>bl</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>br</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>box_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>verch</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>horch</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>hline_set(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>whline_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvhline_set(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwhline_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>vline_set(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wvline_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvvline_set(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG>
+             <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwvline_set(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>n</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -156,7 +143,12 @@ <H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       These functions are described in X/Open Curses Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       X/Open Curses Issue 4 (1995) initially specified these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -164,7 +156,7 @@ <H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H
 
 
 
-ncurses 6.5                       2025-01-18               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01               <STRONG><A HREF="curs_border_set.3x.html">curs_border_set(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -174,6 +166,7 @@ <H1 class="no-header">curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls</H
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html
index 8a1741014..b19fcbf7f 100644
--- a/doc/html/man/curs_deleteln.3x.html
+++ b/doc/html/man/curs_deleteln.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 
@@ -105,9 +105,9 @@ <H1 class="no-header">curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>wdeleteln</EM> and <EM>winsertln</EM>.
+       4BSD (1980) introduced <EM>deleteln</EM>, <EM>wdeleteln</EM>, <EM>insertln</EM>, and <EM>winsertln</EM>.
 
-       SVr3.1 (1987) added <EM>winsdelln</EM>.
+       SVr3.1 (1987) added <EM>insdelln</EM> and <EM>winsdelln</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -115,7 +115,7 @@ <H1 class="no-header">curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index c74c7be5f..b5136a5f4 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -124,9 +124,10 @@ <H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   execution was interrupted by a signal, in which case <EM>errno</EM>  is  set
            to <EM>EINTR</EM>.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
+       Functions  taking  a  <EM>WINDOW</EM>  pointer  argument  fail  if <EM>win</EM> is a null
+       pointer.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
        <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
@@ -139,13 +140,13 @@ <H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
        as macros.
 
-       Unlike <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>, <STRONG>wget_wch</STRONG> and its variants store  the  value  of  the
-       input  character  in  an additional <EM>wch</EM> parameter instead of the return
+       Unlike  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,  <STRONG>wget_wch</STRONG>  and  its variants store the value of the
+       input character in an additional <EM>wch</EM> parameter instead  of  the  return
        value.
 
-       Unlike <STRONG>ungetch</STRONG>, <STRONG>unget_wch</STRONG> cannot distinguish function  key  codes  from
-       conventional   character  codes.   An  application  can  overcome  this
-       limitation by pushing function key codes with <STRONG>ungetch</STRONG> and  subsequently
+       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot distinguish function key codes from
+       conventional  character  codes.   An  application  can  overcome   this
+       limitation  by pushing function key codes with <STRONG>ungetch</STRONG> and subsequently
        checking the return value of <STRONG>wget_wch</STRONG> for a match with <STRONG>KEY_CODE_YES</STRONG>.
 
 
@@ -160,20 +161,19 @@ <H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        X/Open Curses Issue 4 describes these functions.  It specifies no error
        conditions for them.
 
-       See  the  "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding the interaction
-       of <STRONG>wget_wch</STRONG> with signal handlers.
+       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
+       of <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM> with signal handlers.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
-       (1995).   The  System V Interface Definition Version 4 of the same year
-       specified  functions  named  <EM>wgetwch</EM>  (with  the  usual  variants)  and
-       <EM>ungetwch</EM>.   These  were later additions to SVr4.<EM>x</EM>, not appearing in the
-       first SVr4 (1989).   They  differ  from  X/Open's  later  <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM>  and
-       <EM>unget</EM><STRONG>_</STRONG><EM>wch</EM> in that <EM>wgetwch</EM> takes no <EM>wch</EM> argument, but returns the (wide)
-       key code as an <EM>int</EM> (with no provision for  distinguishing  a  character
-       code  from  a  function  key  code); and <EM>ungetwch</EM> takes a non-<EM>const</EM> <EM>int</EM>
-       argument.
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4  of  the  same  year  specified
+       functions named <EM>wgetwch</EM> (with its variants) <EM>ungetwch</EM>.  These were later
+       additions to SVr4.<EM>x</EM>, not appearing in  the  first  SVr4  (1989).   They
+       differ from X/Open's later <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>unget</EM><STRONG>_</STRONG><EM>wch</EM> in that <EM>wgetwch</EM> takes
+       no <EM>wch</EM> argument, but returns the (wide) key code as  an  <EM>int</EM>  (with  no
+       provision  for  distinguishing  a  character  code  from a function key
+       code); and <EM>ungetwch</EM> takes a non-<EM>const</EM> <EM>int</EM> argument.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -185,7 +185,7 @@ <H1 class="no-header">curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index cafefb143..2e8743fe2 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -81,7 +81,7 @@ <H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            <EM>WEOF</EM>);
 
        <STRONG>o</STRONG>   interprets   the   screen's   erase   and   kill   characters  (see
-           <STRONG><A HREF="curs_termattrs.3x.html">erasechar(3x)</A></STRONG> and <STRONG><A HREF="curs_termattrs.3x.html">killchar(3x)</A></STRONG>);
+           <STRONG><A HREF="curs_termattrs.3x.html">erasewchar(3x)</A></STRONG> and <STRONG><A HREF="curs_termattrs.3x.html">killwchar(3x)</A></STRONG>);
 
        <STRONG>o</STRONG>   recognizes function keys only if  the  screen's  keypad  option  is
            enabled (see <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>);
@@ -214,6 +214,16 @@ <H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            into the buffer, for consistency with SVr4 <EM>curses</EM>'s <EM>wgetnstr</EM>.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
+       functions named <EM>wgetwstr</EM> and <EM>wgetnwstr</EM> (and the usual variants).  These
+       were later additions to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
+       Except in name, their declarations did not differ from  X/Open's  later
+       <EM>wget</EM><STRONG>_</STRONG><EM>wstr</EM>  and <EM>wgetn</EM><STRONG>_</STRONG><EM>wstr</EM> until X/Open Curses Issue 7 (2009) eventually
+       changed the type of the buffer argument to a pointer to <EM>wint</EM><STRONG>_</STRONG><EM>t</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its non-wide-character configuration.
@@ -222,7 +232,7 @@ <H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -233,6 +243,7 @@ <H1 class="no-header">curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 1b5bef27a..cca5a4850 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -159,7 +159,7 @@ <H1 class="no-header">curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   at least five non-spacing wide characters (<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>; see below),
 
        <STRONG>o</STRONG>   attributes  (at  least  15  bits' worth, inferred from the count of
-           specified <STRONG>WA_</STRONG> constants),
+           specified <EM>WA</EM><STRONG>_</STRONG> constants),
 
        <STRONG>o</STRONG>   a color pair identifier (at least 16 bits, inferred from the  <EM>short</EM>
            type used to encode it).
@@ -198,8 +198,7 @@ <H1 class="no-header">curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
-       (1995).
+       X/Open Curses Issue 4 (1995) initially specified these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -207,7 +206,7 @@ <H1 class="no-header">curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 97b5ad716..da35bb756 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -315,69 +315,70 @@ <H1 class="no-header">curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>has_key</STRONG> returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG>.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
+       Functions  taking  a  <EM>WINDOW</EM>  pointer  argument  fail  if <EM>win</EM> is a null
+       pointer.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be implemented as macros.
 
-       <EM>curses</EM> discourages assignment of the ESC key to a discrete function  by
+       <EM>curses</EM>  discourages assignment of the ESC key to a discrete function by
        the programmer because the library requires a delay while it awaits the
        potential remainder of a terminal escape sequence.
 
-       Some key strokes are indistinguishable  from  control  characters;  for
-       example,  <STRONG>KEY_ENTER</STRONG> may be the same as <STRONG>^M</STRONG>, and <STRONG>KEY_BACKSPACE</STRONG> may be the
-       same as <STRONG>^H</STRONG> or <STRONG>^?</STRONG>.  Consult the <EM>terminfo</EM> entry for the terminal type  to
-       determine  whether  this  is  the  case;  see  <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG>.  Some <EM>curses</EM>
+       Some  key  strokes  are  indistinguishable from control characters; for
+       example, <STRONG>KEY_ENTER</STRONG> may be the same as <STRONG>^M</STRONG>, and <STRONG>KEY_BACKSPACE</STRONG> may be  the
+       same  as <STRONG>^H</STRONG> or <STRONG>^?</STRONG>.  Consult the <EM>terminfo</EM> entry for the terminal type to
+       determine whether this  is  the  case;  see  <STRONG><A HREF="infocmp.1m.html">infocmp(1)</A></STRONG>.   Some  <EM>curses</EM>
        implementations, including <EM>ncurses</EM>, honor the <EM>terminfo</EM> key definitions;
        others treat such control characters specially.
 
-       <EM>curses</EM>  distinguishes  the  Enter  keys  in  the alphabetic and numeric
-       keypad sections of a keyboard because (most) terminals  do.   <STRONG>KEY_ENTER</STRONG>
-       refers  to the key on the numeric keypad and, like other function keys,
+       <EM>curses</EM> distinguishes the Enter  keys  in  the  alphabetic  and  numeric
+       keypad  sections  of a keyboard because (most) terminals do.  <STRONG>KEY_ENTER</STRONG>
+       refers to the key on the numeric keypad and, like other function  keys,
        is reliably recognized only if the window's keypad mode is enabled.
 
-       <STRONG>o</STRONG>   The <EM>terminfo</EM> <STRONG>key_enter</STRONG> (<STRONG>kent</STRONG>) capability  describes  the  character
-           (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
+       <STRONG>o</STRONG>   The  <EM>terminfo</EM>  <STRONG>key_enter</STRONG>  (<STRONG>kent</STRONG>) capability describes the character
+           (sequence) sent by the  Enter  key  of  a  terminal's  numeric  (or
            similar) keypad.
 
        <STRONG>o</STRONG>   "Enter or send" is X/Open Curses's description of this key.
 
-       <EM>curses</EM> treats the Enter or Return key in the <EM>alphabetic</EM> section of  the
+       <EM>curses</EM>  treats the Enter or Return key in the <EM>alphabetic</EM> section of the
        keyboard differently.
 
        <STRONG>o</STRONG>   It usually produces a control code for carriage return (<STRONG>^M</STRONG>) or line
            feed (<STRONG>^J</STRONG>).
 
-       <STRONG>o</STRONG>   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
-           whether  <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG>  or  <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG>  has  been  called, <STRONG>wgetch</STRONG> may return
-           either a carriage return or line feed upon an Enter or  Return  key
+       <STRONG>o</STRONG>   Depending  on  the  terminal  mode (raw, cbreak, or canonical), and
+           whether <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> or <STRONG><A HREF="curs_inopts.3x.html">nonl(3x)</A></STRONG>  has  been  called,  <STRONG>wgetch</STRONG>  may  return
+           either  a  carriage return or line feed upon an Enter or Return key
            stroke.
 
-       Use  of  <STRONG>wgetch</STRONG> with <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> and neither <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> nor <STRONG><A HREF="curs_inopts.3x.html">raw(3x)</A></STRONG> is not
+       Use of <STRONG>wgetch</STRONG> with <STRONG><A HREF="curs_inopts.3x.html">echo(3x)</A></STRONG> and neither <STRONG><A HREF="curs_inopts.3x.html">cbreak(3x)</A></STRONG> nor <STRONG><A HREF="curs_inopts.3x.html">raw(3x)</A></STRONG>  is  not
        well-defined.
 
-       Historically, the list of key code macros above was influenced  by  the
-       keyboard  of  the AT&amp;T 7300 (also known variously as the "3B1", "Safari
-       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
-       computer  keyboards are based on that of the IBM PC/AT and tend to have
+       Historically,  the  list of key code macros above was influenced by the
+       keyboard of the AT&amp;T 7300 (also known variously as the  "3B1",  "Safari
+       4",  and  "UNIX  PC"),  a  1985 machine rich in function keys.  Today's
+       computer keyboards are based on that of the IBM PC/AT and tend to  have
        fewer.  A <EM>curses</EM> application can expect such a keyboard to transmit key
-       codes   <STRONG>KEY_UP</STRONG>,   <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,  <STRONG>KEY_HOME</STRONG>,  <STRONG>KEY_END</STRONG>,
-       <STRONG>KEY_PPAGE</STRONG> (Page Up), <STRONG>KEY_NPAGE</STRONG> (Page  Down),  <STRONG>KEY_IC</STRONG>  (Insert),  <STRONG>KEY_DC</STRONG>
+       codes  <STRONG>KEY_UP</STRONG>,  <STRONG>KEY_DOWN</STRONG>,  <STRONG>KEY_LEFT</STRONG>,  <STRONG>KEY_RIGHT</STRONG>,   <STRONG>KEY_HOME</STRONG>,   <STRONG>KEY_END</STRONG>,
+       <STRONG>KEY_PPAGE</STRONG>  (Page  Up),  <STRONG>KEY_NPAGE</STRONG>  (Page Down), <STRONG>KEY_IC</STRONG> (Insert), <STRONG>KEY_DC</STRONG>
        (Delete), <STRONG>KEY_A1</STRONG>, <STRONG>KEY_A3</STRONG>, <STRONG>KEY_B2</STRONG>, <STRONG>KEY_C1</STRONG>, <STRONG>KEY_C3</STRONG>, and <STRONG>KEY_F(</STRONG><EM>n</EM><STRONG>)</STRONG> for 1 &lt;=
        <EM>n</EM> &lt;= 12.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
        In <EM>ncurses</EM>, when a window's "no time-out" mode is <EM>not</EM> set, the <STRONG>ESCDELAY</STRONG>
-       variable  configures  the  duration of the timer used to disambiguate a
-       function key character sequence from a series of key strokes  beginning
+       variable configures the duration of the timer used  to  disambiguate  a
+       function  key character sequence from a series of key strokes beginning
        with ESC typed by the user; see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
 
-       <STRONG>has_key</STRONG>  is  an  <EM>ncurses</EM>  extension,  and  is not found in SVr4 <EM>curses</EM>,
+       <STRONG>has_key</STRONG> is an <EM>ncurses</EM> extension, and  is  not  found  in  SVr4  <EM>curses</EM>,
        4.4BSD <EM>curses</EM>, or any other previous <EM>curses</EM> implementation.
 
 
@@ -385,53 +386,53 @@ <H1 class="no-header">curs_getch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
        describes these functions.  It specifies no error conditions for them.
 
-       SVr4 describes a successful return value  only  as  "an  integer  value
+       SVr4  describes  a  successful  return  value only as "an integer value
        other than <EM>ERR</EM>".
 
-       <STRONG>wgetch</STRONG> reads only single-byte characters.
+       <EM>wgetch</EM> reads only single-byte characters.
 
-       The  echo  behavior  of  these  functions on input of <STRONG>KEY_</STRONG> or backspace
+       The echo behavior of these functions on  input  of  <EM>KEY</EM><STRONG>_</STRONG>  or  backspace
        characters is not documented in SVr4 <EM>curses</EM>.
 
-       The behavior of <STRONG>wgetch</STRONG> in  the  presence  of  signal  handlers  is  not
-       documented  in  SVr4  <EM>curses</EM>  and  is unspecified by X/Open Curses.  In
-       historical <EM>curses</EM> implementations, it varied depending on  whether  the
-       operating  system's  dispatch  of  a  signal to a handler interrupted a
+       The  behavior  of  <EM>wgetch</EM>  in  the  presence  of signal handlers is not
+       documented in SVr4 <EM>curses</EM> and is  unspecified  by  X/Open  Curses.   In
+       historical  <EM>curses</EM>  implementations, it varied depending on whether the
+       operating system's dispatch of a signal  to  a  handler  interrupted  a
        <STRONG>read(2)</STRONG> call in progress, and also (in some implementations) whether an
-       input  timeout  or  non-blocking  mode had been set.  A portable <EM>curses</EM>
-       application prepares  for  two  cases:  (a)  signal  receipt  does  not
-       interrupt <STRONG>wgetch</STRONG>; or (b) signal receipt interrupts <STRONG>wgetch</STRONG> and causes it
-       to return <STRONG>ERR</STRONG> with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.
+       input timeout or non-blocking mode had been  set.   A  portable  <EM>curses</EM>
+       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       interrupt <EM>wgetch</EM>; or (b) signal receipt interrupts <EM>wgetch</EM> and causes it
+       to return <EM>ERR</EM> with <EM>errno</EM> set to <EM>EINTR</EM>.
 
-       <STRONG>KEY_MOUSE</STRONG> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
-       <EM>info</EM>  capabilities, but no higher-level functions use the feature.  The
+       <EM>KEY</EM><STRONG>_</STRONG><EM>MOUSE</EM> is mentioned in X/Open Curses, along with a few related <EM>term-</EM>
+       <EM>info</EM> capabilities, but no higher-level functions use the feature.   The
        implementation in <EM>ncurses</EM> is an extension.
 
-       <STRONG>KEY_RESIZE</STRONG> and <STRONG>has_key</STRONG> are extensions first  implemented  for  <EM>ncurses</EM>.
+       <EM>KEY</EM><STRONG>_</STRONG><EM>RESIZE</EM>  and  <EM>has</EM><STRONG>_</STRONG><EM>key</EM>  are extensions first implemented for <EM>ncurses</EM>.
        By  2022,  <EM>PDCurses</EM>  and  NetBSD  <EM>curses</EM>  had  added  them  along  with
-       <STRONG>KEY_MOUSE</STRONG>.
+       <EM>KEY</EM><STRONG>_</STRONG><EM>MOUSE</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       ECMA-6 "7-bit  coded  Character  Set"  &lt;https://ecma-international.org/
+       ECMA-6  "7-bit  coded  Character  Set" &lt;https://ecma-international.org/
        publications-and-standards/standards/ecma-6/&gt;
 
-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  &lt;https://
+       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   &lt;https://
        ecma-international.org/publications-and-standards/standards/ecma-48/&gt;
 
-       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM>  library
+       <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>  describes comparable functions of the <EM>ncurses</EM> library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
-       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,  <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,     <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,
+       <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG>ascii(7)</STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index ac79a6b11..b484da0c6 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_getstr.3x,v 1.85 2025/02/01 22:49:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 
@@ -170,10 +170,10 @@ <H1 class="no-header">curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
               interpreted, as well as any special keys (such as function keys,
               "home" key, "clear" key, <EM>etc.</EM>)
 
-       without  further  detail.   It  lied.   In  fact, the "character" value
-       appended to the string by those implementations was predictable but not
-       useful  --  being,  in fact, the low-order eight bits of the key code's
-       <EM>KEY</EM><STRONG>_</STRONG> constant value.  (The same language, unchanged except for styling,
+       without  further  detail.   It lied.  The "character" value appended to
+       the string by those implementations was predictable but not  useful  --
+       being,  in  fact,  the  low-order  eight  bits  of  the key code's <EM>KEY</EM><STRONG>_</STRONG>
+       constant value.  (The same  language,  unchanged  except  for  styling,
        survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
        Issue 7.)
 
@@ -249,12 +249,12 @@ <H1 class="no-header">curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>wgetstr</EM> along with its variants.
+       4BSD (1980) introduced <EM>wgetstr</EM> along with its variants.
 
        SVr3.1 (1987) added <EM>wgetnstr</EM>, but none of its variants.
 
-       X/Open  Curses  Issue 4  (1995)  specified  <EM>getnstr</EM>,  <EM>mvwgetnstr</EM>,   and
-       <EM>mvgetnstr</EM>.
+       X/Open  Curses  Issue 4  (1995)  specified  <EM>getnstr</EM>,   <EM>mvgetnstr</EM>,   and
+       <EM>mvwgetnstr</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -266,7 +266,7 @@ <H1 class="no-header">curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html
index 0075a489c..3558cb592 100644
--- a/doc/html/man/curs_getyx.3x.html
+++ b/doc/html/man/curs_getyx.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_getyx.3x,v 1.55 2025/02/01 22:48:11 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 
@@ -105,7 +105,7 @@ <H1 class="no-header">curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>getyx</EM>.
+       4BSD (1980) introduced <EM>getyx</EM>.
 
        SVr3  (1987)  added  <EM>getbegyx</EM>  and  <EM>getmaxyx</EM>.   SVr3.1  later that year
        supplied <EM>getparyx</EM>.
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_getyx.3x.html">curs_getyx(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 9bab611cd..2fdada43f 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.44 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 
@@ -90,10 +90,10 @@ <H1 class="no-header">curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
-       (1995).  The System V Interface Definition Version 4 of the  same  year
-       specified a function named <EM>winwch</EM> (and the usual variants).  This was a
-       later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4  (1989).   It
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4 of the same  year  specified  a
+       function  named  <EM>winwch</EM>  (and  the  usual  variants).  This was a later
+       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
        differed  from  X/Open's  later  <EM>win</EM><STRONG>_</STRONG><EM>wch</EM> in that it returned a value of
        type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
@@ -106,7 +106,7 @@ <H1 class="no-header">curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_in_wch.3x.html">curs_in_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index 890edd444..d0a2296fc 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_in_wchstr.3x,v 1.48 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 
@@ -110,12 +110,12 @@ <H1 class="no-header">curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
-       (1995).   The  System V Interface Definition Version 4 of the same year
-       specified a function named <EM>winwchstr</EM> (and the  usual  variants).   This
-       was a later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).
-       It differed from X/Open's later <EM>win</EM><STRONG>_</STRONG><EM>wchstr</EM> in that it took an  argument
-       of type pointer-to-<EM>chtype</EM> instead of pointer-to<EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
+       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4 of the same year specified a
+       function named <EM>winwchstr</EM> (and the usual variants).  This  was  a  later
+       addition  to  SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4 (1989).  It
+       differed from X/Open's later <EM>win</EM><STRONG>_</STRONG><EM>wchstr</EM> in that it took an argument  of
+       type pointer-to-<EM>chtype</EM> instead of pointer-to<EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2025-01-18                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                <STRONG><A HREF="curs_in_wchstr.3x.html">curs_in_wchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 26f1daaae..33fcf8812 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -143,7 +143,7 @@ <H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
        <STRONG>o</STRONG>   restores terminal modes (see <STRONG><A HREF="curs_kernel.3x.html">reset_shell_mode(3x)</A></STRONG>).
 
-       Calling <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> after  a  temporary  escape  causes
+       Calling <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> after a temporary suspension causes
        <EM>curses</EM> to resume managing the terminal.
 
 
@@ -187,7 +187,56 @@ <H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            and <STRONG>stdscr</STRONG>.
 
        Functions  that  return  pointers  return  <EM>NULL</EM>  on error.  In <EM>ncurses</EM>,
-       <STRONG>set_term</STRONG> does not fail.
+       <STRONG>set_term</STRONG> does not fail, and <STRONG>initscr</STRONG> exits the application  if  it  does
+       not operate successfully.
+
+
+</PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
+       <EM>ncurses</EM>  establishes signal handlers when a function that initializes a
+       <EM>SCREEN</EM>, either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>, is first called.  Applications  that
+       wish  to  handle  the  following signals themselves should set up their
+       corresponding handlers <EM>after</EM> initializing the screen.
+
+       <EM>SIGINT</EM> <EM>ncurses</EM>'s handler <EM>attempts</EM> to  clean  up  the  screen  on  exit.
+              Although it <EM>usually</EM> works as expected, there are limitations.
+
+              <STRONG>o</STRONG>   Walking the <EM>SCREEN</EM> list is unsafe, since all list management
+                  is done without any signal blocking.
+
+              <STRONG>o</STRONG>   When an application has been built with the <STRONG>_</STRONG><EM>REENTRANT</EM> macro
+                  defined  (and  corresponding  system support), <STRONG>set_term</STRONG> uses
+                  functions that could deadlock or misbehave in other ways.
+
+              <STRONG>o</STRONG>   <STRONG>endwin</STRONG> calls other functions, many of which use <STRONG>stdio(3)</STRONG>  or
+                  other library functions that are clearly unsafe.
+
+       <EM>SIGTERM</EM>
+              <EM>ncurses</EM>  uses  the  same  handler  as  for <EM>SIGINT</EM>, with the same
+              limitations.  It is not mentioned in X/Open Curses, but is  more
+              suitable  for  this  purpose  than  <EM>SIGQUIT</EM>  (which  is  used in
+              debugging).
+
+       <EM>SIGTSTP</EM>
+              <EM>ncurses</EM>'s handler manages the  terminal-generated  stop  signal,
+              used  in  job  control.   When  resuming  the  process,  <EM>ncurses</EM>
+              discards  pending  input  with  <STRONG><A HREF="curs_util.3x.html">flushinp(3x)</A></STRONG>  and  repaints  the
+              screen,  assuming  that it has been completely altered.  It also
+              updates the saved terminal modes with <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>.
+
+       <EM>SIGWINCH</EM>
+              <EM>ncurses</EM>  handles  changes  to  the  terminal's  window  size,  a
+              phenomenon  ignored  in  standardization  efforts.   It  sets  a
+              (signal-safe) variable that is later tested  by  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>  and
+              <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>.
+
+              <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns the key code <STRONG>KEY_RESIZE</STRONG>.
+
+              <STRONG>o</STRONG>   <STRONG>wget_wch</STRONG>  returns <STRONG>KEY_CODE_YES</STRONG> and sets its <EM>wch</EM> parameter to
+                  <STRONG>KEY_RESIZE</STRONG>.
+
+              At the same time, <EM>ncurses</EM> calls  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>  to  adjust  the
+              standard  screen  <STRONG>stdscr</STRONG>,  and  update  global variables such as
+              <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -197,120 +246,80 @@ <H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-Differences">Differences</a></H3><PRE>
        X/Open  Curses  specifies  that  portable  applications  must  not call
-       <STRONG>initscr</STRONG> more than once:
+       <EM>initscr</EM> more than once.
 
-       <STRONG>o</STRONG>   The portable way to use <STRONG>initscr</STRONG> is once only, using <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  to
-           restore the screen after <STRONG>endwin</STRONG>.
+       <STRONG>o</STRONG>   The portable way to use <EM>initscr</EM> is  once  only,  using  <EM>refresh</EM>  to
+           restore the screen after <EM>endwin</EM>.
 
-       <STRONG>o</STRONG>   This implementation allows using <STRONG>initscr</STRONG> after <STRONG>endwin</STRONG>.
+       <STRONG>o</STRONG>   <EM>ncurses</EM> permits use of <EM>initscr</EM> after <EM>endwin</EM>.
 
-       Old versions of curses, e.g., BSD 4.4, would return a null pointer from
-       <STRONG>initscr</STRONG> when an error is detected, rather than exiting.  It is safe but
-       redundant to check the return value of <STRONG>initscr</STRONG> in X/Open Curses.
+       <EM>initscr</EM>  in  BSD,  from  its inception (1980) through the Net/2 release
+       (1991) returned <EM>ERR</EM> cast to a <EM>WINDOW</EM> pointer when detecting  an  error.
+       4.4BSD  (1995)  instead  returned  a  null pointer.  Neither exited the
+       application.  It is safe but redundant to check  the  return  value  of
+       <EM>initscr</EM> in X/Open Curses.
 
-       Calling  <STRONG>endwin</STRONG>  does not dispose of the memory allocated in <STRONG>initscr</STRONG> or
-       <STRONG>newterm</STRONG>.  Deleting a <EM>SCREEN</EM> provides a way to do this:
+       Calling  <EM>endwin</EM>  does not dispose of the memory allocated by <EM>initscr</EM> or
+       <EM>newterm</EM>.  Deleting a <EM>SCREEN</EM> provides a way to do this.
 
-       <STRONG>o</STRONG>   X/Open Curses does not say what happens to <EM>WINDOW</EM>s  when  <STRONG>delscreen</STRONG>
+       <STRONG>o</STRONG>   X/Open Curses does not say what happens to <EM>WINDOW</EM>s  when  <EM>delscreen</EM>
            "frees  storage  associated  with  the  <EM>SCREEN</EM>"  nor  does the SVr4
-           documentation help, adding that it should be called after <STRONG>endwin</STRONG> if
+           documentation help, adding that it should be called after <EM>endwin</EM> if
            a <EM>SCREEN</EM> is no longer needed.
 
-       <STRONG>o</STRONG>   However,  <EM>WINDOW</EM>s are implicitly associated with a <EM>SCREEN</EM>.  so that
-           it is reasonable to expect <STRONG>delscreen</STRONG> to deal with these.
+       <STRONG>o</STRONG>   However,  <EM>WINDOW</EM>s are implicitly associated with a <EM>SCREEN</EM>, so it is
+           reasonable to expect <EM>delscreen</EM> to dispose of them.
 
-       <STRONG>o</STRONG>   SVr4 curses deletes  the  standard  <EM>WINDOW</EM>  structures  <STRONG>stdscr</STRONG>  and
-           <STRONG>curscr</STRONG>  as  well  as a work area <STRONG>newscr</STRONG>.  SVr4 curses ignores other
-           windows.
+       <STRONG>o</STRONG>   SVr4 deletes the standard <EM>WINDOW</EM> structures <EM>stdscr</EM>  and  <EM>curscr</EM>  as
+           well as a work area <EM>newscr</EM>.  It ignores other windows.
 
-       <STRONG>o</STRONG>   Since version 4.0 (1996), <EM>ncurses</EM> has  maintained  a  list  of  all
-           windows  for  each  screen,  using that information to delete those
-           windows when <STRONG>delscreen</STRONG> is called.
+       <STRONG>o</STRONG>   Since  version  4.0  (1996),  <EM>ncurses</EM>  has maintained a list of all
+           windows for each screen, using that  information  to  delete  those
+           windows when <EM>delscreen</EM> is called.
 
-       <STRONG>o</STRONG>   NetBSD copied this feature of <EM>ncurses</EM> in  2001.   <EM>PDCurses</EM>  follows
+       <STRONG>o</STRONG>   NetBSD  copied  this  feature of <EM>ncurses</EM> in 2001.  <EM>PDCurses</EM> follows
            the SVr4 model, deleting only the standard <EM>WINDOW</EM> structures.
 
 
 </PRE><H3><a name="h3-High-level-versus-Low-level">High-level versus Low-level</a></H3><PRE>
-       Different  implementations  may  disagree  regarding  the level of some
-       functions.  For example, <EM>SCREEN</EM>  (returned  by  <STRONG>newterm</STRONG>)  and  <EM>TERMINAL</EM>
-       (returned  by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>)  hold  file  descriptors  for  the output
-       stream.  If an application switches screens using <STRONG>set_term</STRONG>, or switches
+       Different implementations may disagree  regarding  the  level  of  some
+       functions.   For  example,  <EM>SCREEN</EM>  (returned  by <EM>newterm</EM>) and <EM>TERMINAL</EM>
+       (returned by  <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>)  hold  file  descriptors  for  the  output
+       stream.  If an application switches screens using <EM>set</EM><STRONG>_</STRONG><EM>term</EM>, or switches
        terminals using <STRONG><A HREF="curs_terminfo.3x.html">set_curterm(3x)</A></STRONG>, applications which use the output file
-       descriptor can have different behavior  depending  on  which  structure
+       descriptor  can  have  different  behavior depending on which structure
        holds the corresponding descriptor.
 
-       <STRONG>o</STRONG>   NetBSD's   <EM>baudrate</EM>  function  uses  the  descriptor  in  <EM>TERMINAL</EM>.
-           <EM>ncurses</EM> and SVr4 <EM>curses</EM> use the descriptor in <EM>SCREEN</EM>.
+       <STRONG>o</STRONG>   NetBSD's  <EM>baudrate</EM>  function  uses  the  descriptor  in   <EM>TERMINAL</EM>.
+           <EM>ncurses</EM> and SVr4 use the descriptor in <EM>SCREEN</EM>.
 
-       <STRONG>o</STRONG>   NetBSD and <EM>ncurses</EM> use the descriptor in <EM>TERMINAL</EM> for terminal  I/O
-           modes,  e.g.,  <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>,  <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 curses
-           uses the descriptor in <EM>SCREEN</EM>.
+       <STRONG>o</STRONG>   NetBSD  and <EM>ncurses</EM> use the descriptor in <EM>TERMINAL</EM> for terminal I/O
+           modes, e.g., <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 uses  the
+           descriptor in <EM>SCREEN</EM>.
 
    <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
-       If the <EM>TERM</EM> variable is  missing  or  empty,  <STRONG>initscr</STRONG>  uses  the  value
-       "unknown",  which  normally  corresponds  to  a terminal entry with the
+       If  the  <EM>TERM</EM>  variable  is  missing  or  empty, <EM>initscr</EM> uses the value
+       "unknown", which normally corresponds to  a  terminal  entry  with  the
        <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
-       and  cannot  be  used for full-screen operation.  Other implementations
+       and cannot be used for full-screen  operation.   Other  implementations
        may handle a missing/empty <EM>TERM</EM> variable differently.
 
 
 </PRE><H3><a name="h3-Signal-Handlers">Signal Handlers</a></H3><PRE>
-       Quoting from X/Open Curses Issue 7, section 3.1.1:
+       Quoting X/Open Curses Issue 7, section 3.1.1:
 
-            Curses implementations may provide for  special  handling  of  the
-            SIGINT,  SIGQUIT,  and  SIGTSTP  signals  if  their disposition is
-            SIG_DFL at the time <EM>initscr</EM> is called...
+            Curses  implementations  may  provide  for special handling of the
+            SIGINT, SIGQUIT, and  SIGTSTP  signals  if  their  disposition  is
+            SIG_DFL at the time <EM>initscr</EM>() is called...
 
-            Any special handling for these signals may remain  in  effect  for
+            Any  special  handling  for these signals may remain in effect for
             the  life  of  the  process  or  until  the  process  changes  the
             disposition of the signal.
 
-            None of the Curses functions are required to be safe with  respect
+            None  of the Curses functions are required to be safe with respect
             to signals...
 
-       This  implementation establishes signal handlers during initialization,
-       e.g., <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.  Applications which must handle these signals
-       should  set  up  the  corresponding  handlers  <EM>after</EM>  initializing  the
-       library:
-
-       <STRONG>SIGINT</STRONG>
-            The handler <EM>attempts</EM> to clean up the screen on exit.  Although  it
-            <EM>usually</EM> works as expected, there are limitations:
-
-            <STRONG>o</STRONG>   Walking  the  <EM>SCREEN</EM> list is unsafe, since all list management
-                is done without any signal blocking.
-
-            <STRONG>o</STRONG>   On systems which  have  <STRONG>REENTRANT</STRONG>  turned  on,  <STRONG>set_term</STRONG>  uses
-                functions which could deadlock or misbehave in other ways.
-
-            <STRONG>o</STRONG>   <STRONG>endwin</STRONG>  calls  other  functions, many of which use <STRONG>stdio(3)</STRONG> or
-                other library functions which are clearly unsafe.
-
-       <STRONG>SIGTERM</STRONG>
-            This uses the same handler as <STRONG>SIGINT</STRONG>, with the  same  limitations.
-            It  is  not  mentioned  in X/Open Curses, but is more suitable for
-            this purpose than <STRONG>SIGQUIT</STRONG> (which is used in debugging).
-
-       <STRONG>SIGTSTP</STRONG>
-            This handles the <EM>stop</EM> signal, used in job control.  When  resuming
-            the  process,  this  implementation  discards  pending  input with
-            <STRONG><A HREF="curs_util.3x.html">flushinp(3x)</A></STRONG>, and repaints the screen assuming that  it  has  been
-            completely altered.  It also updates the saved terminal modes with
-            <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>.
-
-       <STRONG>SIGWINCH</STRONG>
-            This handles the window-size changes which  were  ignored  in  the
-            standardization   efforts.    The  handler  sets  a  (signal-safe)
-            variable that is later tested by <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> and <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>.
-
-            <STRONG>o</STRONG>   <STRONG>wgetch</STRONG> returns the key code <STRONG>KEY_RESIZE</STRONG>.
-
-            <STRONG>o</STRONG>   <STRONG>wget_wch</STRONG> returns <STRONG>KEY_CODE_YES</STRONG> and sets its  <EM>wch</EM>  parameter  to
-                <STRONG>KEY_RESIZE</STRONG>.
-
-            At  the same time, <EM>ncurses</EM> calls <STRONG>resizeterm</STRONG> to adjust the standard
-            screen <STRONG>stdscr</STRONG>, and update other data such as <STRONG>LINES</STRONG> and <STRONG>COLS</STRONG>.
+       Section "NOTES" above discusses <EM>ncurses</EM>'s signal handlers.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -319,7 +328,7 @@ <H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -336,6 +345,7 @@ <H1 class="no-header">curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </ul>
 </li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
+<li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a>
 <ul>
 <li><a href="#h3-Differences">Differences</a></li>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 2f7e5f6b5..9a04aa344 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -93,11 +93,11 @@ <H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <EM>curses</EM> offers configurable  parameters  permitting  an  application  to
-       control  the  handling  of  input  from the terminal.  Some are global,
-       applying to all windows; others apply only to a specific  window.   The
-       library  does not automatically apply such parameters to new or derived
-       windows; an application must configure  each  window  for  the  desired
-       behavior.
+       control  the  handling of input from the terminal.  Some, such as those
+       affecting the terminal's <EM>mode</EM> or line discipline, are global,  applying
+       to  all  windows;  others apply only to a specific window.  The library
+       does not automatically apply such parameters to new or derived windows;
+       an application must configure each window for the desired behavior.
 
        Some  descriptions  below  make reference to an <EM>input</EM> <EM>character</EM> <EM>reading</EM>
        <EM>function</EM>: this is <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> in the non-wide character <EM>curses</EM>  API  and
@@ -110,109 +110,113 @@ <H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-cbreak_nocbreak">cbreak, nocbreak</a></H3><PRE>
        Normally, the terminal driver buffers typed characters, not  delivering
        them  to  an application until a line feed or carriage return is typed.
-       <STRONG>cbreak</STRONG> configures the terminal in  <EM>cbreak</EM>  <EM>mode</EM>,  which  disables  line
-       buffering and erase and kill character processing (the interrupt, quit,
-       suspend,  and  flow  control  characters  are  unaffected)  and   makes
-       characters  typed  by  the  user  immediately available to the program.
-       <STRONG>nocbreak</STRONG> restores the terminal's canonical ("cooked") line discipline.
-
-       The state of the terminal is unknown to a <EM>curses</EM>  application  when  it
+       This canonical ("cooked") line discipline also supports  software  flow
+       control,  simple  line editing functions (character and word erase, and
+       whole-line erasure or "kill"), and job control.  <STRONG>cbreak</STRONG> configures  the
+       terminal  in  <EM>cbreak</EM>  <EM>mode</EM>, which disables line buffering and erase and
+       kill character processing -- the interrupt,  quit,  suspend,  and  flow
+       control  characters are unaffected -- and makes characters typed by the
+       user immediately available to the program.  <STRONG>nocbreak</STRONG> restores canonical
+       ("cooked") mode.
+
+       The  state  of  the terminal is unknown to a <EM>curses</EM> application when it
        starts; therefore, a program should call <STRONG>cbreak</STRONG> or <STRONG>nocbreak</STRONG> explicitly.
        Most interactive programs using <EM>curses</EM> set cbreak mode.  Calling <STRONG>cbreak</STRONG>
-       overrides  <STRONG>raw</STRONG>.   The man page for the input character reading function
+       overrides <STRONG>raw</STRONG>.  The man page for the input character  reading  function
        discusses how <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG> interact with <STRONG>echo</STRONG> and <STRONG>noecho</STRONG>.
 
 
 </PRE><H3><a name="h3-echo_noecho">echo, noecho</a></H3><PRE>
-       <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> determine whether characters  typed  by  the  user  are
+       <STRONG>echo</STRONG>  and  <STRONG>noecho</STRONG>  determine  whether  characters typed by the user are
        written to the <EM>curses</EM> window by the input character reading function as
-       they are typed.  <EM>curses</EM>  always  disables  the  terminal  driver's  own
+       they  are  typed.   <EM>curses</EM>  always  disables  the terminal driver's own
        echoing.  By default, a <EM>curses</EM> screen's echo option is set.  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 call
+       controlled area of the screen, or not to echo  at  all,  so  they  call
        <STRONG>noecho</STRONG>.   The  man  page  for  the  input  character  reading  function
        discusses how <STRONG>echo</STRONG> and <STRONG>noecho</STRONG> interact with <STRONG>cbreak</STRONG> and <STRONG>nocbreak</STRONG>.
 
 
 </PRE><H3><a name="h3-halfdelay">halfdelay</a></H3><PRE>
-       <STRONG>halfdelay</STRONG>  configures  <EM>half-delay</EM> <EM>mode</EM>, which is similar to cbreak mode
-       in that characters typed by the user are immediately available  to  the
-       program.   However,  after  blocking for <EM>tenths</EM> tenth-seconds, an input
-       character reading function returns <STRONG>ERR</STRONG> if no  input  is  pending.   The
+       <STRONG>halfdelay</STRONG> configures <EM>half-delay</EM> <EM>mode</EM>, which is similar to  cbreak  mode
+       in  that  characters typed by the user are immediately available to the
+       program.  However, after blocking for <EM>tenths</EM>  tenth-seconds,  an  input
+       character  reading  function  returns  <STRONG>ERR</STRONG> if no input is pending.  The
        value of <EM>tenths</EM> must be between 1 and 255.  Use <STRONG>nocbreak</STRONG> to leave half-
        delay mode.
 
 
 </PRE><H3><a name="h3-intrflush">intrflush</a></H3><PRE>
-       <STRONG>intrflush</STRONG> calls <STRONG>qiflush</STRONG> (see below) if <EM>bf</EM> is <STRONG>TRUE</STRONG>, and <STRONG>noqiflush</STRONG> if  <EM>bf</EM>
+       <STRONG>intrflush</STRONG>  calls <STRONG>qiflush</STRONG> (see below) if <EM>bf</EM> is <STRONG>TRUE</STRONG>, and <STRONG>noqiflush</STRONG> if <EM>bf</EM>
        is <STRONG>FALSE</STRONG>.  It ignores its <EM>win</EM> argument.
 
 
 </PRE><H3><a name="h3-keypad">keypad</a></H3><PRE>
-       <STRONG>keypad</STRONG>  enables  recognition of a terminal's function keys.  If enabled
-       (<EM>bf</EM> is <STRONG>TRUE</STRONG>), the input character  reading  function  returns  a  value
-       representing  the  function key, such as <STRONG>KEY_LEFT</STRONG>.  (Wide-character API
-       users: <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG> returns <STRONG>KEY_CODE_YES</STRONG> to indicate  the  availability
-       of  a  function  key  code  in  its <EM>wch</EM> parameter.)  If disabled (<EM>bf</EM> is
-       <STRONG>FALSE</STRONG>), <EM>curses</EM> does not treat function keys specially and  the  program
+       <STRONG>keypad</STRONG> enables recognition of a terminal's function keys.   If  enabled
+       (<EM>bf</EM>  is  <STRONG>TRUE</STRONG>),  the  input  character reading function returns a value
+       representing the function key, such as <STRONG>KEY_LEFT</STRONG>.   (Wide-character  API
+       users:  <STRONG><A HREF="curs_get_wch.3x.html">wget_wch(3x)</A></STRONG>  returns <STRONG>KEY_CODE_YES</STRONG> to indicate the availability
+       of a function key code in its  <EM>wch</EM>  parameter.)   If  disabled  (<EM>bf</EM>  is
+       <STRONG>FALSE</STRONG>),  <EM>curses</EM>  does not treat function keys specially and the program
        has to interpret escape sequences itself.  If the terminal's keypad can
-       be turned on (made to transmit) and off (made to work locally),  <STRONG>keypad</STRONG>
-       configures  it  consistently  with  the  <EM>bf</EM>  parameter.   By default, a
+       be  turned on (made to transmit) and off (made to work locally), <STRONG>keypad</STRONG>
+       configures it consistently  with  the  <EM>bf</EM>  parameter.   By  default,  a
        window's keypad mode is off.
 
 
 </PRE><H3><a name="h3-meta">meta</a></H3><PRE>
-       Initially, whether the terminal returns 7- or 8-bit character codes  on
-       input  depends  on  the  configuration of the terminal driver; on POSIX
-       systems, see  <STRONG>termios(3)</STRONG>.   To  force  8  bits  to  be  returned,  call
-       <STRONG>meta(</STRONG>...<STRONG>,</STRONG>  <STRONG>TRUE)</STRONG>;  this is equivalent, on POSIX systems, to setting the
-       CS8 flag on the terminal.   To  force  7  bits  to  be  returned,  call
-       <STRONG>meta(</STRONG>...<STRONG>,</STRONG>  <STRONG>FALSE)</STRONG>; this is equivalent, on POSIX systems, to setting the
-       CS7 flag on the terminal.  The window argument, <EM>win</EM>, is always ignored.
-       If  the  <EM>terminfo</EM>  string capabilities <STRONG>meta_on</STRONG> (<STRONG>smm</STRONG>) and <STRONG>meta_off</STRONG> (<STRONG>rmm</STRONG>)
-       are defined for the terminal type, enabling meta mode sends <STRONG>smm</STRONG> to  the
+       Initially,  whether the terminal returns 7- or 8-bit character codes on
+       input depends on the configuration of the  terminal  driver;  on  POSIX
+       systems,  see  <STRONG>termios(3)</STRONG>.   To  force  8  bits  to  be  returned, call
+       <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>TRUE)</STRONG>; this is equivalent, on POSIX systems, to  setting  the
+       CS8  flag  on  the  terminal.   To  force  7  bits to be returned, call
+       <STRONG>meta(</STRONG>...<STRONG>,</STRONG> <STRONG>FALSE)</STRONG>; this is equivalent, on POSIX systems, to setting  the
+       CS7  flag on the terminal.  <EM>curses</EM> ignores the window argument <EM>win</EM>.  If
+       the <EM>terminfo</EM> string capabilities <STRONG>meta_on</STRONG> (<STRONG>smm</STRONG>) and <STRONG>meta_off</STRONG>  (<STRONG>rmm</STRONG>)  are
+       defined  for  the  terminal  type,  enabling meta mode sends <STRONG>smm</STRONG> to the
        terminal and disabling it sends <STRONG>rmm</STRONG> to the terminal.
 
 
 </PRE><H3><a name="h3-nl_nonl">nl, nonl</a></H3><PRE>
-       Initially,  whether  the  terminal  reports a carriage return using the
-       character code for a line feed in cbreak or raw modes  depends  on  the
-       configuration  of  the  terminal driver; see <STRONG>termios(3)</STRONG>.  <STRONG>nl</STRONG> configures
+       Initially, whether the terminal reports a  carriage  return  using  the
+       character  code  for  a line feed in cbreak or raw modes depends on the
+       configuration of the terminal driver; see  <STRONG>termios(3)</STRONG>.   <STRONG>nl</STRONG>  configures
        the terminal to perform this translation.  <STRONG>nonl</STRONG> disables it.  Under its
        canonical  ("cooked")  line  discipline,  the  terminal  driver  always
        translates carriage returns to line feeds.
 
 
 </PRE><H3><a name="h3-nodelay">nodelay</a></H3><PRE>
-       <STRONG>nodelay</STRONG> configures the input character  reading  function  to  be  non-
-       blocking  for  window  <EM>win</EM>.  If no input is ready, the reading function
-       returns <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the reading function does  not
+       <STRONG>nodelay</STRONG>  configures  the  input  character  reading function to be non-
+       blocking for window <EM>win</EM>.  If no input is ready,  the  reading  function
+       returns  <STRONG>ERR</STRONG>.  If disabled (<EM>bf</EM> is <STRONG>FALSE</STRONG>), the reading function does not
        return until it has input.
 
 
 </PRE><H3><a name="h3-notimeout">notimeout</a></H3><PRE>
-       When  the  input  character reading function reads an ESC character, it
-       sets a timer while waiting  for  the  next  character.   <STRONG>notimeout(</STRONG><EM>win</EM><STRONG>,</STRONG>
-       <STRONG>TRUE)</STRONG>   disables  this  timer.   The  purpose  of  the  timeout  is  to
-       distinguish sequences produced by a function key from those typed by  a
-       user.   To configure the timeout rather than disabling it, see <STRONG>wtimeout</STRONG>
+       When the input character reading function reads an  ESC  character,  it
+       sets  a  timer  while  waiting  for the next character.  <STRONG>notimeout(</STRONG><EM>win</EM><STRONG>,</STRONG>
+       <STRONG>TRUE)</STRONG>  disables  this  timer.   The  purpose  of  the  timeout  is   to
+       distinguish  sequences produced by a function key from those typed by a
+       user.  To configure the timeout rather than disabling it, see  <STRONG>wtimeout</STRONG>
        below.
 
 
 </PRE><H3><a name="h3-qiflush_noqiflush">qiflush, noqiflush</a></H3><PRE>
-       <STRONG>qiflush</STRONG> and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of  its
+       <STRONG>qiflush</STRONG>  and <STRONG>noqiflush</STRONG> configure the terminal driver's treatment of its
        input and output queues when it handles the interrupt, suspend, or quit
        characters under the canonical ("cooked") or cbreak line disciplines on
-       POSIX  systems; see <STRONG>termios(3)</STRONG>.  The default behavior is inherited from
-       the terminal driver settings.  Calling <STRONG>qiflush</STRONG> configures the  terminal
-       to  flush  the  queues  when  any  of  these  events occurs, giving the
-       impression of faster response to user input, but making  the  library's
-       model  of  the  screen  contents incorrect.  Calling <STRONG>noqiflush</STRONG> prevents
-       such flushing, but might frustrate impatient users on slow  connections
-       if  a <EM>curses</EM> update of the screen is in progress when the event occurs;
-       see <STRONG>typeahead</STRONG> below for a mitigation of this problem.  You may want  to
-       call  <STRONG>noqiflush</STRONG>  in  a  signal handler if, after the handler exits, you
-       want output to continue as though the interrupt had not occurred.
+       POSIX systems; see <STRONG>termios(3)</STRONG>.  The default behavior is inherited  from
+       the  terminal driver settings.  Calling <STRONG>qiflush</STRONG> configures the terminal
+       to <EM>flush</EM> the queues (discarding  their  contents)  when  any  of  these
+       events  occurs, giving the impression of faster response to user input,
+       but making the  library's  model  of  the  screen  contents  incorrect.
+       Calling <STRONG>noqiflush</STRONG> prevents such flushing, but might frustrate impatient
+       users on slow connections if a  <EM>curses</EM>  update  of  the  screen  is  in
+       progress when the event occurs; see <STRONG>typeahead</STRONG> below for a mitigation of
+       this problem.  You may want to call <STRONG>noqiflush</STRONG> in a signal  handler  if,
+       after  the  handler  exits,  you  want output to continue as though the
+       interrupt had not occurred.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
@@ -229,8 +233,8 @@ <H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H3><a name="h3-timeout_wtimeout">timeout, wtimeout</a></H3><PRE>
        <STRONG>wtimeout</STRONG>  configures  whether a <EM>curses</EM> input character reading function
        called on window <EM>win</EM> uses blocking or non-blocking reads.  If <EM>delay</EM>  is
-       negative,  a blocking read is used, waiting indefinitely for input.  If
-       <EM>delay</EM> is zero, a non-blocking read is used; an input character  reading
+       negative,  <EM>curses</EM> uses a blocking read, waiting indefinitely for input.
+       If <EM>delay</EM> is zero, the read is non-blocking; an input character  reading
        function  returns <STRONG>ERR</STRONG> if no input is pending.  If <EM>delay</EM> is positive, an
        input character reading function blocks  for  <EM>delay</EM>  milliseconds,  and
        returns  <STRONG>ERR</STRONG>  if the delay elapses and there is still no input pending.
@@ -350,11 +354,11 @@ <H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        key code to be reported.  In  <EM>ncurses</EM>,  extended  capabilities  can  be
        interpreted  as key definitions.  These are loaded after the predefined
        keys, and if a capability's value is the same as  a  previously  loaded
-       key definition, the later definition is the one used.
+       key definition, the library uses the later definition.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD <EM>curses</EM> (1980) introduced <EM>echo</EM>, <EM>noecho</EM>, <EM>nl</EM>, <EM>nonl</EM>, <EM>raw</EM>, and <EM>noraw</EM>.
+       4BSD (1980) introduced <EM>echo</EM>, <EM>noecho</EM>, <EM>nl</EM>, <EM>nonl</EM>, <EM>raw</EM>, and <EM>noraw</EM>.
 
        SVr2 (1984) featured a new terminal driver, extending the <EM>curses</EM> API to
        support it with <EM>cbreak</EM>, <EM>nocbreak</EM>, <EM>intrflush</EM>, <EM>keypad</EM>, <EM>meta</EM>, <EM>nodelay</EM>, and
@@ -384,7 +388,7 @@ <H1 class="no-header">curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 94199051e..eb75037f0 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -71,16 +71,17 @@ <H1 class="no-header">curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
+       Functions taking a <EM>WINDOW</EM> pointer  argument  fail  if  <EM>win</EM>  is  a  null
+       pointer.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>ins_wch</STRONG>, <STRONG>mvins_wch</STRONG>, and <STRONG>mvwins_wch</STRONG> may be implemented as macros.
 
-       A  terminal's  <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is not necessarily
+       A terminal's <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is  not  necessarily
        employed.
 
 
@@ -90,11 +91,11 @@ <H1 class="no-header">curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
-       (1995).  The System V Interface Definition Version 4 of the  same  year
-       specified  a function named <EM>winswch</EM> (and the usual variants).  This was
-       a later addition to SVr4.<EM>x</EM>, not appearing in the first SVr4 (1989).  It
-       differed  from  X/Open's  later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took an argument of
+       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4 of the same year specified a
+       function named <EM>winswch</EM> (and the usual  variants).   This  was  a  later
+       addition  to  SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4 (1989).  It
+       differed from X/Open's later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took  an  argument  of
        type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
@@ -106,7 +107,7 @@ <H1 class="no-header">curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index e889605fd..6eac050c3 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       These functions were initially specified by X/Open Curses Issue 4.  The
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
        System V Interface Definition  Version 4  (1995),  specified  functions
        named  <EM>winswstr</EM>  and  <EM>winsnwstr</EM>  (and  the usual variants).  These were
        later additions to SVr4.<EM>x</EM>, not appearing  in  the  first  SVr4  (1989).
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 425be8d1a..fb3fc72c5 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -70,23 +70,24 @@ <H1 class="no-header">curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer argument fail if the pointer is <EM>NULL</EM>.
+       Functions  taking  a  <EM>WINDOW</EM>  pointer  argument  fail  if <EM>win</EM> is a null
+       pointer.
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be implemented as macros.
 
-       A terminal's <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is  not  necessarily
+       A  terminal's  <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is not necessarily
        employed.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        X/Open Curses Issue 4 describes these functions.
 
-       SVr4  describes  a  successful  return  value only as "an integer value
+       SVr4 describes a successful return value  only  as  "an  integer  value
        other than <EM>ERR</EM>".
 
 
@@ -95,14 +96,14 @@ <H1 class="no-header">curs_insch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG> describes comparable functions in  the  wide-character
+       <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>  describes  comparable functions in the wide-character
        <EM>curses</EM> configuration.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 3427bd14e..f307f5ffb 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_insstr.3x,v 1.70 2025/02/01 22:53:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 
@@ -116,8 +116,8 @@ <H1 class="no-header">curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        Issue 4 distinguished <EM>insnstr</EM> and <EM>winsnstr</EM>  from  the  other  functions
        documented  above  by stating they "do not perform wrapping".  This was
        probably an error, since it makes this group of functions inconsistent.
-       No  implementation  of <EM>curses</EM> documents this inconsistency, and Issue 7
-       removed it.
+       No  implementation  of <EM>curses</EM> manifests this inconsistency, and Issue 7
+       removed the claim.
 
        Issue 4 states that the entire string is inserted if <EM>n</EM> is less than  1.
        This  is  probably  an  error,  because  it  is inconsistent with other
@@ -126,7 +126,7 @@ <H1 class="no-header">curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.1 (1987) introduced <EM>winsstr</EM> and <EM>winsnstr</EM>.
+       SVr3.1 (1987) introduced <EM>winsstr</EM> and <EM>winsnstr</EM> and their variants.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -137,7 +137,7 @@ <H1 class="no-header">curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_insstr.3x.html">curs_insstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index c155eb796..40fa0d5fe 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -130,18 +130,19 @@ <H1 class="no-header">curs_instr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.1 (1987) introduced these functions.
+       SVr3.1  (1987)  introduced these functions.  <EM>winstr</EM>, <EM>winnstr</EM>, and their
+       variants.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>  describes  comparable functions of the <EM>ncurses</EM> library
+       <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG> describes comparable functions of the  <EM>ncurses</EM>  library
        in its wide-character configuration (<EM>ncursesw</EM>).
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index e138aebcc..1eccdaa52 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>wmove</EM>.
+       4BSD (1980) introduced these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_move 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index c776febd1..1d82af7fd 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -184,7 +184,7 @@ <H1 class="no-header">curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) <EM>curses</EM> introduced <EM>clearok</EM>, <EM>leaveok</EM>, and <EM>scrollok</EM>.
+       4BSD (1980) introduced <EM>clearok</EM>, <EM>leaveok</EM>, and <EM>scrollok</EM>.
 
        SVr2 (1984) supplied <EM>idlok</EM>, <EM>setscrreg</EM>, and <EM>wsetscrreg</EM>.
 
@@ -200,7 +200,7 @@ <H1 class="no-header">curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html
index 48b3359d6..a2d0527cb 100644
--- a/doc/html/man/curs_scroll.3x.html
+++ b/doc/html/man/curs_scroll.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_scroll.3x,v 1.57 2025/02/02 00:02:49 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 
@@ -61,34 +61,38 @@ <H1 class="no-header">curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        <STRONG>scroll</STRONG>  scrolls  the  given window up one line.  That is, every visible
-       line we might number <EM>i</EM> becomes line <EM>i</EM>-1.  The text of the top  line  in
-       the  window  disappears  and  the  bottom  line  is  populated with the
-       background  character;  see   <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG>   (wide-character   API   users:
-       <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  As an optimization, if the scrolling region of the window
-       is the entire screen, the physical screen may be scrolled at  the  same
-       time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
-
-       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> scrolls the specified window <EM>win</EM> up or down per the sign
-       of <EM>n</EM>.
+       line we might number <EM>i</EM> becomes line <EM>i</EM>-1.  <STRONG>wscrl</STRONG>  and  <STRONG>scrl</STRONG>  scroll  the
+       specified window or <STRONG>stdscr</STRONG>, respectively, up or down per the sign of <EM>n</EM>.
 
        <STRONG>o</STRONG>   For positive <EM>n</EM>, line <EM>i</EM>+<EM>n</EM> becomes <EM>i</EM> (scrolling up);
 
-       <STRONG>o</STRONG>   for negative <EM>n</EM>, line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling  down).   <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
-           describes the <STRONG>scrl</STRONG> variant of this function.
+       <STRONG>o</STRONG>   for negative <EM>n</EM>, line <EM>i</EM>-<EM>n</EM> becomes <EM>i</EM> (scrolling down).
+
+       A  line  that  scrolls  beyond the window boundaries disappears; <EM>curses</EM>
+       populates a  new  one  emerging  at  the  opposite  boundary  with  the
+       background   character;   see   <STRONG><A HREF="curs_bkgd.3x.html">bkgd(3x)</A></STRONG>   (wide-character  API  users:
+       <STRONG><A HREF="curs_bkgrnd.3x.html">bkgrnd(3x)</A></STRONG>).  As an optimization, if the scrolling region of the window
+       is  the  entire screen, the physical screen may be scrolled at the same
+       time; see <STRONG><A HREF="curs_variables.3x.html">curscr(3x)</A></STRONG>.
 
-       The  cursor does not move.  These functions perform no operation unless
+       The cursor does not move.  These functions perform no operation  unless
        scrolling is enabled for the window via <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> upon success.
 
-       <EM>ncurses</EM> returns <STRONG>ERR</STRONG> if scrolling is not  enabled  in  the  window,  for
-       example with <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>, or if the <EM>WINDOW</EM> pointer is null.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
+
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
+
+       <STRONG>o</STRONG>   <EM>win</EM> is a null pointer, or
+
+       <STRONG>o</STRONG>   scrolling is not enabled in the window (as by <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>).
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-       <STRONG>scrl</STRONG> and <STRONG>wscrl</STRONG> may be implemented as macros.
+       <STRONG>scroll</STRONG> and <STRONG>scrl</STRONG> may be implemented as macros.
 
        Unusually,  there  is  no <STRONG>wscroll</STRONG> function; <STRONG>scroll</STRONG> behaves as one would
        expect <STRONG>wscroll</STRONG> to, accepting a <EM>WINDOW</EM> pointer argument.
@@ -112,12 +116,19 @@ <H1 class="no-header">curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        character.  In <EM>ncurses</EM>, they do not.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) introduced <EM>scroll</EM>, defining it as a function.
+
+       SVr3.1 (1987) added <EM>scrl</EM>  and  <EM>wscrl</EM>,  redefining  <EM>scroll</EM>  as  a  macro
+       wrapping the latter.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_scroll.3x.html">curs_scroll(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -127,6 +138,7 @@ <H1 class="no-header">curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index c6956619c..2902cc6d5 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.57 2025/02/01 22:47:44 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 
@@ -53,169 +53,169 @@ <H1 class="no-header">curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>alloc_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>assume_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>baudrate_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>beep_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>can_change_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>cbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>color_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>curs_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>visibility</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>def_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>def_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>define_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>definition</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>delay_output_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>doupdate_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>endwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>erasechar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>erasewchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>alloc_pair_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>assume_default_colors_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>baudrate_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>beep_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>can_change_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>cbreak_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>color_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>b</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>curs_set_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>visibility</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>def_prog_mode_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>def_shell_mode_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>define_key_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>definition</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>delay_output_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>doupdate_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>echo_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>endwin_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>erasechar_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>erasewchar_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_color_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>extended_pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>extended_slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
-
-       <STRONG>void</STRONG> <STRONG>filter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>find_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>flash_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>flushinp_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>free_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>get_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>getmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <EM>event</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW*</STRONG> <STRONG>getwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FILE*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>halfdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>has_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>bool</STRONG> <STRONG>has_ic_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>has_il_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>has_mouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>init_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>init_extended_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>b</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>init_extended_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>init_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>intrflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>is_cbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>is_echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>is_nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>is_raw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
-       <STRONG>bool</STRONG> <STRONG>isendwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>key_defined_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>keybound_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
-       <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG> <STRONG>keyname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
-       <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>longname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
-       <STRONG>mmask_t</STRONG> <STRONG>mousemask_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvcur_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
-       <STRONG>WINDOW*</STRONG> <STRONG>newpad_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
-       <STRONG>SCREEN*</STRONG> <STRONG>new_prescr(void);</STRONG>
-       <STRONG>SCREEN*</STRONG> <STRONG>newterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>infd</EM><STRONG>);</STRONG>
-
-       <STRONG>WINDOW*</STRONG> <STRONG>newwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>nocbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>noecho_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>nofilter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>nonl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>noqiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>noraw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>qiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>raw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>reset_color_pairs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>reset_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>resetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>resize_term_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>resizeterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ripoffline_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>));</STRONG>
-       <STRONG>int</STRONG> <STRONG>savetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scr_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>scr_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>set_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>set_tabsize_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>cols</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attrset_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attroff_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_attron_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
-       <STRONG>attr_t</STRONG> <STRONG>slk_attr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_clear_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>slk_label_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_noutrefresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_refresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>slk_touch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>start_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>attr_t</STRONG> <STRONG>term_attrs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-
-       <STRONG>chtype</STRONG> <STRONG>termattrs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>termname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT*</STRONG> <EM>event</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>use_legacy_coding_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>level</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>extended_pair_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>extended_slk_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
+
+       <STRONG>void</STRONG> <STRONG>filter_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>find_pair_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>flash_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>flushinp_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>free_pair_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>get_escdelay_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>getmouse_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG> <EM>event</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>getwin_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>halfdelay_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>has_colors_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>bool</STRONG> <STRONG>has_ic_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>has_il_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>has_mouse_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>init_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>b</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>init_extended_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>b</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>init_extended_pair_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>init_pair_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>intrflush_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_cbreak_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>is_echo_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_nl_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>is_raw_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
+       <STRONG>bool</STRONG> <STRONG>isendwin_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>key_defined_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keybound_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
+       <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keyname_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>longname_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
+       <STRONG>mmask_t</STRONG> <STRONG>mousemask_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvcur_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>newpad_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
+       <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> <STRONG>new_prescr(void);</STRONG>
+       <STRONG>SCREEN</STRONG> <STRONG>*</STRONG> <STRONG>newterm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>type</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>outf</EM><STRONG>,</STRONG> <STRONG>FILE</STRONG> <STRONG>*</STRONG><EM>inf</EM><STRONG>);</STRONG>
+
+       <STRONG>WINDOW</STRONG> <STRONG>*</STRONG> <STRONG>newwin_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nlines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>begin</EM><STRONG>_</STRONG><EM>x</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>nocbreak_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>noecho_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>nofilter_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>nonl_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>noqiflush_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>noraw_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>pair_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>qiflush_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>raw_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>reset_color_pairs_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>reset_shell_mode_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>resetty_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>resize_term_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>resizeterm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ripoffline_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>));</STRONG>
+       <STRONG>int</STRONG> <STRONG>savetty_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_init_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>scr_restore_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scr_set_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>set_escdelay_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>set_tabsize_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>cols</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attrset_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG><EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attroff_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_attron_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
+       <STRONG>attr_t</STRONG> <STRONG>slk_attr_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_clear_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>slk_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_init_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>slk_label_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_noutrefresh_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_refresh_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_restore_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_set_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>slk_touch_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>start_color_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>attr_t</STRONG> <STRONG>term_attrs_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+
+       <STRONG>chtype</STRONG> <STRONG>termattrs_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>termname_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wc</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG> <EM>event</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>use_legacy_coding_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>level</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_tioctl_sp(SCREEN</STRONG> <STRONG>*</STRONG><EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>vid_attr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vid_puts_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vidattr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>vidputs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
-       <STRONG>wchar_t*</STRONG> <STRONG>wunctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>vid_attr_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>vid_puts_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>vidattr_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>vidputs_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
+       <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <STRONG>wunctrl_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
 
-       <STRONG>FORM*</STRONG> <STRONG>new_form_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FIELD</STRONG> <STRONG>**</STRONG><EM>fields</EM><STRONG>);</STRONG>
+       <STRONG>FORM</STRONG> <STRONG>*</STRONG> <STRONG>new_form_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FIELD</STRONG> <STRONG>**</STRONG><EM>fields</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
 
-       <STRONG>MENU*</STRONG> <STRONG>new_menu_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>ITEM</STRONG> <STRONG>**</STRONG><EM>items</EM><STRONG>);</STRONG>
+       <STRONG>MENU</STRONG> <STRONG>*</STRONG> <STRONG>new_menu_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>ITEM</STRONG> <STRONG>**</STRONG><EM>items</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;panel.h&gt;</STRONG>
 
-       <STRONG>PANEL*</STRONG> <STRONG>ceiling_panel(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>PANEL*</STRONG> <STRONG>ground_panel(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>update_panels_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>PANEL</STRONG> <STRONG>*</STRONG> <STRONG>ceiling_panel(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>PANEL</STRONG> <STRONG>*</STRONG> <STRONG>ground_panel(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>update_panels_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;term.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>del_curterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>putp_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>restartterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-       <STRONG>TERMINAL*</STRONG> <STRONG>set_curterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>TERMINAL*</STRONG><EM>nterm</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tgetent_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>name</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tgetflag_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tgetnum_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>tgetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG><EM>area</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>tgoto_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tigetflag_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-
-       <STRONG>int</STRONG> <STRONG>tigetnum_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
-       <STRONG>char*</STRONG> <STRONG>tigetstr_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>del_curterm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>putp_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>restartterm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>filedes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
+       <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG> <STRONG>set_curterm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>TERMINAL</STRONG> <STRONG>*</STRONG><EM>nterm</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetent_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>bp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>name</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetflag_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tgetnum_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgetstr_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>**</STRONG><EM>area</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tgoto_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>col</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>row</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tigetflag_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+
+       <STRONG>int</STRONG> <STRONG>tigetnum_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tigetstr_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>capname</EM><STRONG>);</STRONG>
        <EM>/*</EM> <EM>tparm</EM><STRONG>_</STRONG><EM>sp</EM> <EM>may</EM> <EM>use</EM> <EM>9</EM> <EM>long</EM> <EM>parameters</EM> <EM>rather</EM> <EM>than</EM> <EM>being</EM> <EM>variadic</EM> <EM>*/</EM>
-       <STRONG>char*</STRONG> <STRONG>tparm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
-       <STRONG>int</STRONG> <STRONG>tputs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
+       <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>tparm_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
+       <STRONG>int</STRONG> <STRONG>tputs_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>NCURSES_SP_OUTC</STRONG> <EM>putc</EM><STRONG>);</STRONG>
 
        <STRONG>#include</STRONG> <STRONG>&lt;unctrl.h&gt;</STRONG>
 
-       <STRONG>NCURSES_CONST</STRONG> <STRONG>char*</STRONG> <STRONG>unctrl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>unctrl_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
@@ -294,7 +294,7 @@ <H1 class="no-header">curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_sp_funcs.3x.html">curs_sp_funcs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index ad638582c..f6401770e 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_termattrs.3x,v 1.59 2025/02/01 22:49:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>               Library calls              <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 
@@ -153,7 +153,7 @@ <H1 class="no-header">curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</H1
 
        SVr2 (1984) added <EM>baudrate</EM>, <EM>erasechar</EM>, <EM>killchar</EM>, <EM>has</EM><STRONG>_</STRONG><EM>ic</EM>, and <EM>has</EM><STRONG>_</STRONG><EM>il</EM>.
 
-       SVr3  (1987)  furnished  <EM>termname</EM>.   SVr3.1  later  that  year supplied
+       SVr3  (1987)  supplied  <EM>termname</EM>.   Later  that  year,  SVr3.1  brought
        <EM>termattrs</EM>.
 
        X/Open Curses  Issue 4  (1995)  specified  <EM>erasewchar</EM>,  <EM>killwchar</EM>,  and
@@ -165,7 +165,7 @@ <H1 class="no-header">curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls</H1
 
 
 
-ncurses 6.5                       2025-01-18                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                <STRONG><A HREF="curs_termattrs.3x.html">curs_termattrs(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index c99de6914..08336855b 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_termcap.3x,v 1.105 2025/02/01 22:49:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 
@@ -373,7 +373,7 @@ <H1 class="no-header">curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 382b1c447..60b960bc6 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -402,13 +402,13 @@ <H1 class="no-header">curs_util 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) defined <EM>unctrl</EM> (as a macro, in <EM>unctrl.h</EM>).
+       4BSD (1980) introduced <EM>unctrl</EM>, defining it as a macro in <EM>unctrl.h</EM>.
 
-       SVr2 (1984) introduced <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
+       SVr2 (1984) added <EM>delay</EM><STRONG>_</STRONG><EM>output</EM>, <EM>flushinp</EM>, and <EM>keyname</EM>.
 
-       SVr3 (1987) added <EM>filter</EM>.  Later that year, SVr3.1 brought  <EM>getwin</EM>  and
-       <EM>putwin</EM>,  reading  and writing window dumps with <STRONG>fread(3)</STRONG> and <STRONG>fwrite(3)</STRONG>,
-       respectively.
+       SVr3 (1987) supplied <EM>filter</EM>.  Later that year,  SVr3.1  brought  <EM>getwin</EM>
+       and  <EM>putwin</EM>,  reading  and  writing  window  dumps  with  <STRONG>fread(3)</STRONG>  and
+       <STRONG>fwrite(3)</STRONG>, respectively.
 
        SVr4 (1989) supplied <EM>use</EM><STRONG>_</STRONG><EM>env</EM>.
 
@@ -424,7 +424,7 @@ <H1 class="no-header">curs_util 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 89ba90821..bb039d460 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_window.3x,v 1.66 2025/02/02 00:04:58 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_window 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_window 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_window 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_window 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 
@@ -242,7 +242,7 @@ <H1 class="no-header">curs_window 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
+ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index b02741a00..419c9010e 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20250118).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20250201).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 4c93cb7fc..d71fa6895 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20250118).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20250201).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 9e0f6b65a..0460693e8 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp $
-.TH curs_add_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp $
+.TH curs_add_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -60,10 +60,70 @@ add a \fIcurses\fR complex character to a window, possibly advancing the cursor
 \fBint add_wch(const cchar_t *\fIwch\fP);
 \fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
 \fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
-\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const cchar_t *\fIwch\fP);
 .PP
 \fBint echo_wchar(const cchar_t *\fIwch\fP);
 \fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fI/* (integer) constants */\fP
+/*\fI .\|.\|. */ \fBWACS_BLOCK;\fR
+/*\fI .\|.\|. */ \fBWACS_BOARD;\fR
+/*\fI .\|.\|. */ \fBWACS_BTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_BULLET;\fR
+/*\fI .\|.\|. */ \fBWACS_CKBOARD;\fR
+/*\fI .\|.\|. */ \fBWACS_DARROW;\fR
+/*\fI .\|.\|. */ \fBWACS_DEGREE;\fR
+/*\fI .\|.\|. */ \fBWACS_DIAMOND;\fR
+/*\fI .\|.\|. */ \fBWACS_HLINE;\fR
+/*\fI .\|.\|. */ \fBWACS_LANTERN;\fR
+/*\fI .\|.\|. */ \fBWACS_LARROW;\fR
+/*\fI .\|.\|. */ \fBWACS_LLCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_LRCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_LTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_PLMINUS;\fR
+/*\fI .\|.\|. */ \fBWACS_PLUS;\fR
+/*\fI .\|.\|. */ \fBWACS_RARROW;\fR
+/*\fI .\|.\|. */ \fBWACS_RTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_S1;\fR
+/*\fI .\|.\|. */ \fBWACS_S9;\fR
+/*\fI .\|.\|. */ \fBWACS_TTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_UARROW;\fR
+/*\fI .\|.\|. */ \fBWACS_ULCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_URCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_VLINE;\fR
+\fI/* extensions */\fP
+/*\fI .\|.\|. */ \fBWACS_GEQUAL;\fR
+/*\fI .\|.\|. */ \fBWACS_LEQUAL;\fR
+/*\fI .\|.\|. */ \fBWACS_NEQUAL;\fR
+/*\fI .\|.\|. */ \fBWACS_PI;\fR
+/*\fI .\|.\|. */ \fBWACS_S3;\fR
+/*\fI .\|.\|. */ \fBWACS_S7;\fR
+/*\fI .\|.\|. */ \fBWACS_STERLING;\fR
+\fI/* extensions for thick lines */\fP
+/*\fI .\|.\|. */ \fBWACS_T_BTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_T_HLINE;\fR
+/*\fI .\|.\|. */ \fBWACS_T_LLCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_T_LRCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_T_LTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_T_PLUS;\fR
+/*\fI .\|.\|. */ \fBWACS_T_RTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_T_TTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_T_ULCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_T_URCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_T_VLINE;\fR
+\fI/* extensions for double lines */\fP
+/*\fI .\|.\|. */ \fBWACS_D_BTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_D_HLINE;\fR
+/*\fI .\|.\|. */ \fBWACS_D_LLCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_D_LRCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_D_LTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_D_PLUS;\fR
+/*\fI .\|.\|. */ \fBWACS_D_RTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_D_TTEE;\fR
+/*\fI .\|.\|. */ \fBWACS_D_ULCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_D_URCORNER;\fR
+/*\fI .\|.\|. */ \fBWACS_D_VLINE;\fR
 .fi
 .SH DESCRIPTION
 .SS wadd_wch
@@ -231,68 +291,76 @@ Lb L  L  L  Lx.
 \&	Unicode	ACS	acsc	\&
 Symbol	Default	Default	char	Glyph Name
 _
-WACS_BLOCK	0x25ae	#	0	T{
+WACS_BLOCK	U+25ae	#	0	T{
 solid square block
 T}
-WACS_BOARD	0x2592	#	h	board of squares
-WACS_BTEE	0x2534	+	v	bottom tee
-WACS_BULLET	0x00b7	o	~	bullet
-WACS_CKBOARD	0x2592	:	a	T{
+WACS_BOARD	U+2592	#	h	board of squares
+WACS_BTEE	U+2534	+	v	bottom tee
+WACS_BULLET	U+00b7	o	~	bullet
+WACS_CKBOARD	U+2592	:	a	T{
 checker board (stipple)
 T}
-WACS_DARROW	0x2193	v	.	T{
+WACS_DARROW	U+2193	v	.	T{
 arrow pointing down
 T}
-WACS_DEGREE	0x00b0	'	f	degree symbol
-WACS_DIAMOND	0x25c6	+	\(ga	diamond
-WACS_GEQUAL	0x2265	>	>	T{
+WACS_DEGREE	U+00b0	'	f	degree symbol
+WACS_DIAMOND	U+25c6	+	\(ga	diamond
+WACS_GEQUAL	U+2265	>	>	T{
+.if n .na \" avoid adjustment warning from groff
 greater-than-or-equal-to
 T}
-WACS_HLINE	0x2500	\-	q	horizontal line
-WACS_LANTERN	0x2603	#	i	lantern symbol
-WACS_LARROW	0x2190	<	,	T{
+WACS_HLINE	U+2500	\-	q	horizontal line
+WACS_LANTERN	U+2603	#	i	lantern symbol
+WACS_LARROW	U+2190	<	,	T{
 arrow pointing left
 T}
-WACS_LEQUAL	0x2264	<	y	T{
+WACS_LEQUAL	U+2264	<	y	T{
+.if n .na \" avoid adjustment warning from groff
 less-than-or-equal-to
 T}
-WACS_LLCORNER	0x2514	+	m	T{
+WACS_LLCORNER	U+2514	+	m	T{
 lower left-hand corner
 T}
-WACS_LRCORNER	0x2518	+	j	T{
+WACS_LRCORNER	U+2518	+	j	T{
 lower right-hand corner
 T}
-WACS_LTEE	0x2524	+	t	left tee
-WACS_NEQUAL	0x2260	!	|	not-equal
-WACS_PI	0x03c0	*	{	greek pi
-WACS_PLMINUS	0x00b1	#	g	plus/minus
-WACS_PLUS	0x253c	+	n	plus
-WACS_RARROW	0x2192	>	+	T{
+WACS_LTEE	U+2524	+	t	left tee
+WACS_NEQUAL	U+2260	!	|	not-equal
+WACS_PI	U+03c0	*	{	greek pi
+WACS_PLMINUS	U+00b1	#	g	plus/minus
+WACS_PLUS	U+253c	+	n	plus
+WACS_RARROW	U+2192	>	+	T{
 arrow pointing right
 T}
-WACS_RTEE	0x251c	+	u	right tee
-WACS_S1	0x23ba	\-	o	scan line 1
-WACS_S3	0x23bb	\-	p	scan line 3
-WACS_S7	0x23bc	\-	r	scan line 7
-WACS_S9	0x23bd	\&_	s	scan line 9
-WACS_STERLING	0x00a3	f	}	T{
+WACS_RTEE	U+251c	+	u	right tee
+WACS_S1	U+23ba	\-	o	scan line 1
+WACS_S3	U+23bb	\-	p	scan line 3
+WACS_S7	U+23bc	\-	r	scan line 7
+WACS_S9	U+23bd	\&_	s	scan line 9
+WACS_STERLING	U+00a3	f	}	T{
+.if n .na \" avoid adjustment warning from groff
 pound-sterling symbol
 T}
-WACS_TTEE	0x252c	+	w	top tee
-WACS_UARROW	0x2191 	^	\-	T{
+WACS_TTEE	U+252c	+	w	top tee
+WACS_UARROW	U+2191 	^	\-	T{
 arrow pointing up
 T}
-WACS_ULCORNER	0x250c	+	l	T{
+WACS_ULCORNER	U+250c	+	l	T{
 upper left-hand corner
 T}
-WACS_URCORNER	0x2510	+	k	T{
+WACS_URCORNER	U+2510	+	k	T{
 upper right-hand corner
 T}
-WACS_VLINE	0x2502	|	x	vertical line
+WACS_VLINE	U+2502	|	x	vertical line
 .TE
 .PP
-The wide-character configuration of \fI\%ncurses\fP also defines symbols
-for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
+The
+.I \%ncurses
+wide API also defines symbols for thick lines
+.RB \%( acsc
+\*(``J\*('' through \*(``N\*('',
+\*(``T\*('' through \*(``X\*('',
+and \*(``Q\*(''):
 .PP
 .TS
 Lb Lb Lb Lb Lb
@@ -301,42 +369,45 @@ Lb L  L  L  Lx.
 \&	Unicode	ASCII	acsc	\&
 ACS Name	Default	Default	Char	Glyph Name
 _
-WACS_T_BTEE	0x253b	+	V	T{
+WACS_T_BTEE	U+253b	+	V	T{
 thick tee pointing up
 T}
-WACS_T_HLINE	0x2501	-	Q	T{
+WACS_T_HLINE	U+2501	-	Q	T{
 thick horizontal line
 T}
-WACS_T_LLCORNER	0x2517	+	M	T{
+WACS_T_LLCORNER	U+2517	+	M	T{
 thick lower left corner
 T}
-WACS_T_LRCORNER	0x251b	+	J	T{
+WACS_T_LRCORNER	U+251b	+	J	T{
 thick lower right corner
 T}
-WACS_T_LTEE	0x252b	+	T	T{
+WACS_T_LTEE	U+252b	+	T	T{
 thick tee pointing right
 T}
-WACS_T_PLUS	0x254b	+	N	T{
+WACS_T_PLUS	U+254b	+	N	T{
 thick large plus
 T}
-WACS_T_RTEE	0x2523	+	U	T{
+WACS_T_RTEE	U+2523	+	U	T{
 thick tee pointing left
 T}
-WACS_T_TTEE	0x2533	+	W	T{
+WACS_T_TTEE	U+2533	+	W	T{
 thick tee pointing down
 T}
-WACS_T_ULCORNER	0x250f	+	L	T{
+WACS_T_ULCORNER	U+250f	+	L	T{
 thick upper left corner
 T}
-WACS_T_URCORNER	0x2513	+	K	T{
+WACS_T_URCORNER	U+2513	+	K	T{
 thick upper right corner
 T}
-WACS_T_VLINE	0x2503	|	X	T{
+WACS_T_VLINE	U+2503	|	X	T{
 thick vertical line
 T}
 .TE
 .PP
-and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
+and for double lines
+.RB \%( acsc
+\*(``A\*('' through \*(``I\*('',
+plus \*(``R\*('' and \*(``Y\*(''):
 .PP
 .TS
 Lb Lb Lb Lb Lb
@@ -345,37 +416,37 @@ Lb L  L  L  Lx.
 \&	Unicode	ASCII	acsc	\&
 ACS Name	Default	Default	Char	Glyph Name
 _
-WACS_D_BTEE	0x2569	+	H	T{
+WACS_D_BTEE	U+2569	+	H	T{
 double tee pointing up
 T}
-WACS_D_HLINE	0x2550	-	R	T{
+WACS_D_HLINE	U+2550	-	R	T{
 double horizontal line
 T}
-WACS_D_LLCORNER	0x255a	+	D	T{
+WACS_D_LLCORNER	U+255a	+	D	T{
 double lower left corner
 T}
-WACS_D_LRCORNER	0x255d	+	A	T{
+WACS_D_LRCORNER	U+255d	+	A	T{
 double lower right corner
 T}
-WACS_D_LTEE	0x2560	+	F	T{
+WACS_D_LTEE	U+2560	+	F	T{
 double tee pointing right
 T}
-WACS_D_PLUS	0x256c	+	E	T{
+WACS_D_PLUS	U+256c	+	E	T{
 double large plus
 T}
-WACS_D_RTEE	0x2563	+	G	T{
+WACS_D_RTEE	U+2563	+	G	T{
 double tee pointing left
 T}
-WACS_D_TTEE	0x2566	+	I	T{
+WACS_D_TTEE	U+2566	+	I	T{
 double tee pointing down
 T}
-WACS_D_ULCORNER	0x2554	+	C	T{
+WACS_D_ULCORNER	U+2554	+	C	T{
 double upper left corner
 T}
-WACS_D_URCORNER	0x2557	+	B	T{
+WACS_D_URCORNER	U+2557	+	B	T{
 double upper right corner
 T}
-WACS_D_VLINE	0x2551	|	Y	T{
+WACS_D_VLINE	U+2551	|	Y	T{
 double vertical line
 T}
 .TE
@@ -410,13 +481,18 @@ the
 .I curses
 screen has not been initialized,
 .bP
+(for functions taking a
+.I \%WINDOW
+pointer argument)
 .I win
-is
-.IR NULL ","
+is a null pointer,
 .bP
 wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
 .I win
+(or
+.BR stdscr ","
+as applicable)
 when writing to its bottom right location is attempted,
 or
 .bP
@@ -435,71 +511,136 @@ and
 .B echo_wchar
 may be implemented as macros.
 .SH EXTENSIONS
-.SS TABSIZE
+The symbols
+.RI \%( WACS_S3 ","
+.IR \%WACS_S7 ","
+.IR \%WACS_LEQUAL ","
+.IR \%WACS_GEQUAL ","
+.IR \%WACS_PI ","
+.IR \%WACS_NEQUAL ","
+and
+.IR \%WACS_STERLING ")"
+are not standard.
+However,
+many publicly available
+.I \%term\%info
+entries include
+.I \%acs_chars
+.RB \%( acsc )
+capabilities in which their key characters
+.RB ( pryz{|} )
+are embedded,
+and a second-hand list of their character descriptions has come to
+light.
 The
-.B TABSIZE
-variable is implemented in SVr4 and other versions of
-.IR curses ,
-but is not specified by X/Open Curses
-(see \fBcurs_variables\fP(3X)).
+.I \%ncurses
+developers invented WACS-prefixed names for them.
+.\" in v5_2_20020209
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 These functions are described in X/Open Curses Issue\ 4.
 It specifies no error conditions for them.
 .PP
 The defaults specified for forms-drawing characters apply in the POSIX
 locale.
 X/Open Curses makes it clear that the WACS_ symbols should be defined as
-a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fP.
+a pointer to
+.I \%cchar_t
+data, e.g., in the discussion of
+.IR \%border_set "."
 A few implementations are problematic:
 .bP
-NetBSD curses defines the symbols as a \fBwchar_t\fP within a \fBcchar_t\fP.
+NetBSD
+.I curses
+defines the symbols as a
+.I \%wchar_t
+within a
+.IR \%cchar_t "."
 .bP
-HP-UX curses equates some of the \fBACS_\fP symbols
-to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
+HP-UX
+.I curses
+equates some of the
+.I \%ACS_
+symbols to the analogous
+.I \%WACS_
+symbols as if the
+.I \%ACS_
+symbols were
 wide characters.
 The misdefined symbols are the arrows
 and other symbols which are not used for line-drawing.
 .PP
 X/Open Curses does not specify symbols for thick- or double-lines.
-SVr4 curses implementations defined their line-drawing symbols in
-terms of intermediate symbols.
-This implementation extends those symbols, providing new definitions
-which are not in the SVr4 implementations.
+SVr4
+.I curses
+implementations defined their line-drawing symbols
+in terms of intermediate symbols.
+.I \%ncurses
+extends those symbols,
+providing new definitions not found in SVr4 implementations.
 .PP
 Not all Unicode-capable terminals provide support for VT100-style
-alternate character sets (i.e., the \fBacsc\fP capability),
+alternate character sets (i.e., the
+.I \%acsc_chars
+.RB ( acsc )
+capability),
 with their corresponding line-drawing characters.
 X/Open Curses did not address the aspect of integrating Unicode with
 line-drawing characters.
-Existing implementations of Unix curses (AIX, HP-UX, Solaris)
-use only the \fBacsc\fP character-mapping to provide this feature.
-As a result, those implementations can only use single-byte line-drawing
-characters.
-\fI\%ncurses\fP 5.3 (2002) provided a table of Unicode values to solve
+Existing implementations of System\ V
+.I curses
+(AIX, HP-UX, Solaris)
+use only the
+.I \%acsc_chars
+.RB ( acsc )
+character-mapping to provide this feature.
+As a result,
+those implementations can use only single-byte line-drawing characters.
+.I \%ncurses
+5.3 (2002) provided a table of Unicode values to solve
 these problems.
-NetBSD curses incorporated that table in 2010.
+NetBSD
+.I curses
+incorporated that table in 2010.
 .PP
-In this implementation, the Unicode values are used instead of the
-terminal description's \fBacsc\fP mapping as discussed in
+.I \%ncurses
+uses the Unicode values instead of the terminal type description's
+.I \%acsc_chars
+.RB ( acsc )
+mapping as discussed in
 \fB\%ncurses\fP(3X) for the environment variable
-\fINCURSES_NO_UTF8_ACS\fP.
+.IR \%NCURSES_NO_UTF8_ACS "."
 In contrast, for the same cases, the line-drawing characters
 described in \fB\%addch\fP(3X) will use only the ASCII default values.
 .PP
 Having Unicode available does not solve all of the problems with
-line-drawing for curses:
+line-drawing for
+.IR curses ":"
 .bP
 The closest Unicode equivalents to the
-VT100 graphics \fIS1\fP, \fIS3\fP, \fIS7\fP and \fIS9\fP
+VT100 graphics
+.IR S1 ","
+.IR S3 ","
+.IR S7 ","
+and
+.I S9
 frequently are not displayed at
 the regular intervals which the terminal used.
 .bP
-The \fIlantern\fP is a special case.
+The
+.I lantern
+is a special case.
 It originated with the AT&T 4410 terminal in the early 1980s.
 There is no accessible documentation depicting the lantern symbol
 on the AT&T terminal.
 .IP
-Lacking documentation, most readers assume that a \fIstorm lantern\fP
+Lacking documentation, most readers assume that a
+.I "storm lantern"
 was intended.
 But there are several possibilities, all with problems.
 .IP
@@ -509,7 +650,9 @@ and are irrelevant since they lie outside the Basic Multilingual Plane
 and as a result are unavailable on many terminals.
 They are not storm lanterns, in any case.
 .IP
-Most \fIstorm lanterns\fP have a tapering glass chimney
+Most
+.I "storm lanterns"
+have a tapering glass chimney
 (to guard against tipping);
 some have a wire grid protecting the chimney.
 .IP
@@ -553,15 +696,15 @@ In the latter case,
 .I \%ncurses
 adds the non-spacing character to the active complex character.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
-The System\ V Interface Definition Version\ 4
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
+The System\ V Interface Definition (SVID) Version\ 4
 of the same year
 specified functions named
 .I \%waddwch
+(and the usual variants),
+.IR \%echowchar ","
 and
-.I \%wechowchar
-(and the usual variants).
+.IR \%wechowchar "."
 .\" SVID 4, vol 3., p. 475
 These were later additions to
 .RI SVr4. x ,
@@ -574,6 +717,29 @@ in that they each took an argument of type
 .I \%wchar_t
 instead of
 .IR \%cchar_t "."
+SVID defined no
+.I \% WACS_
+symbols.
+.PP
+X/Open Curses Issue\ 4 also defined many of the
+.I WACS_
+constants,
+excepting
+.IR \%WACS_GEQUAL ","
+.IR \%WACS_LEQUAL ","
+.IR \%WACS_NEQUAL ","
+.IR \%WACS_PI ","
+.IR \%WACS_S3 ","
+.IR \%WACS_S7 ","
+and
+.IR \%WACS_STERLING ";"
+and those for drawing thick and double lines.
+.PP
+.I \%ncurses
+5.3 (2002)
+furnished the remaining
+.I WACS_
+constants.
 .SH SEE ALSO
 \fB\%curs_addch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 9abc519df..e9d0fae8b 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp $
-.TH curs_add_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp $
+.TH curs_add_wchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -144,8 +144,9 @@ may be implemented as macros.
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4.
-The System\ V Interface Definition Version\ 4 (1995),
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
+The System\ V Interface Definition Version\ 4
+of the same year
 specified functions named
 .I \%waddwchstr
 and
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 962f62459..ac62c648b 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
-.TH curs_addch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp $
+.TH curs_addch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -70,6 +70,41 @@ add a \fIcurses\fP character to a window and advance the cursor
 .PP
 \fBint echochar(const chtype \fIch\fP);
 \fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+.PP
+\fI/* (integer) constants */\fP
+/*\fI .\|.\|. */ \fBACS_BLOCK;\fR
+/*\fI .\|.\|. */ \fBACS_BOARD;\fR
+/*\fI .\|.\|. */ \fBACS_BTEE;\fR
+/*\fI .\|.\|. */ \fBACS_BULLET;\fR
+/*\fI .\|.\|. */ \fBACS_CKBOARD;\fR
+/*\fI .\|.\|. */ \fBACS_DARROW;\fR
+/*\fI .\|.\|. */ \fBACS_DEGREE;\fR
+/*\fI .\|.\|. */ \fBACS_DIAMOND;\fR
+/*\fI .\|.\|. */ \fBACS_HLINE;\fR
+/*\fI .\|.\|. */ \fBACS_LANTERN;\fR
+/*\fI .\|.\|. */ \fBACS_LARROW;\fR
+/*\fI .\|.\|. */ \fBACS_LLCORNER;\fR
+/*\fI .\|.\|. */ \fBACS_LRCORNER;\fR
+/*\fI .\|.\|. */ \fBACS_LTEE;\fR
+/*\fI .\|.\|. */ \fBACS_PLMINUS;\fR
+/*\fI .\|.\|. */ \fBACS_PLUS;\fR
+/*\fI .\|.\|. */ \fBACS_RARROW;\fR
+/*\fI .\|.\|. */ \fBACS_RTEE;\fR
+/*\fI .\|.\|. */ \fBACS_S1;\fR
+/*\fI .\|.\|. */ \fBACS_S9;\fR
+/*\fI .\|.\|. */ \fBACS_TTEE;\fR
+/*\fI .\|.\|. */ \fBACS_UARROW;\fR
+/*\fI .\|.\|. */ \fBACS_ULCORNER;\fR
+/*\fI .\|.\|. */ \fBACS_URCORNER;\fR
+/*\fI .\|.\|. */ \fBACS_VLINE;\fR
+\fI/* extensions */\fP
+/*\fI .\|.\|. */ \fBACS_GEQUAL;\fR
+/*\fI .\|.\|. */ \fBACS_LEQUAL;\fR
+/*\fI .\|.\|. */ \fBACS_NEQUAL;\fR
+/*\fI .\|.\|. */ \fBACS_PI;\fR
+/*\fI .\|.\|. */ \fBACS_S3;\fR
+/*\fI .\|.\|. */ \fBACS_S7;\fR
+/*\fI .\|.\|. */ \fBACS_STERLING;\fR
 .fi
 .SH DESCRIPTION
 .SS waddch
@@ -268,13 +303,18 @@ the
 .I curses
 screen has not been initialized,
 .bP
+(for functions taking a
+.I \%WINDOW
+pointer argument)
 .I win
-is
-.IR NULL ","
+is a null pointer,
 .bP
 wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
 .I win
+(or
+.BR stdscr ","
+as applicable)
 when a write to its bottom right location is attempted,
 or
 .bP
@@ -305,14 +345,35 @@ and
 .B \%echochar
 may be implemented as macros.
 .SH EXTENSIONS
-.SS TABSIZE
-SVr4 and other versions of
-.I curses
-implement the
-.B \%TABSIZE
-variable,
-but X/Open Curses does not specify it;
-see \fB\%curs_variables\fP(3X).
+The symbols
+.RI \%( ACS_S3 ","
+.IR \%ACS_S7 ","
+.IR \%ACS_LEQUAL ","
+.IR \%ACS_GEQUAL ","
+.IR \%ACS_PI ","
+.IR \%ACS_NEQUAL ","
+and
+.IR \%ACS_STERLING ")"
+were not documented in any publicly released System\ V
+.\" And did not exist yet as late as SVr4.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
+and are not standard.
+However,
+many publicly available
+.I \%term\%info
+entries include
+.I \%acs_chars
+.RB \%( acsc )
+capabilities in which their key characters
+.RB ( pryz{|} )
+are embedded,
+and a second-hand list of their character descriptions has come to
+light.
+The
+.I \%ncurses
+developers invented ACS-prefixed names for them.
+.\" in v1_9_5_950928_e227
 .SH PORTABILITY
 Applications employing
 .I \%ncurses
@@ -331,7 +392,7 @@ The defaults specified for forms-drawing characters apply in the POSIX
 locale.
 .SS "ACS Symbols"
 X/Open Curses states that the
-.B \%ACS_
+.I \%ACS_
 definitions are
 .I char
 constants.
@@ -343,25 +404,25 @@ for example,
 defines the ACS symbols as constants;
 others define them as elements of an array.
 .IP
-This implementation uses an array,
-.BR \%acs_map ,
-as did SVr4
-.IR curses .
-NetBSD also uses an array,
+SVr4 used an array,
+.IR \%acs_map ,
+as does
+.IR \%ncurses "."
+NetBSD
+.I curses
+also uses an array,
 actually named
-.BR \%_acs_char ,
-with a
-.B \%#define
-for compatibility.
+.IR \%_acs_char ,
+with a \%\*(``#define\*('' for compatibility.
 .bP
 HP-UX
 .I curses
 equates some of the
-.B \%ACS_
+.I \%ACS_
 symbols to the analogous
-.B \%WACS_
+.I \%WACS_
 symbols as if the
-.B \%ACS_
+.I \%ACS_
 symbols were wide characters
 (see \fB\%curs_add_wch\fP(3X)).
 The misdefined symbols are the arrows and others that are not used for
@@ -371,7 +432,7 @@ X/Open Curses
 (Issues\ 2 through 7)
 has a typographical error
 for the
-.B \%ACS_LANTERN
+.I \%ACS_LANTERN
 symbol, equating its \*(``VT100+ Character\*('' to \*(``I\*(''
 (capital I),
 while the header files for SVr4
@@ -391,37 +452,10 @@ its
 (AT&T PC6300 with EMOTS Terminal Emulator)
 description uses lowercase i.
 .PP
-Some ACS symbols
-.RB \%( ACS_S3 ,
-.BR \%ACS_S7 ,
-.BR \%ACS_LEQUAL ,
-.BR \%ACS_GEQUAL ,
-.BR \%ACS_PI ,
-.BR \%ACS_NEQUAL ,
-and
-.BR \%ACS_STERLING )
-were not documented in any publicly released System\ V.
-.\" And did not exist yet as late as SVr4.
-.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
-.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
-However,
-many publicly available
-.I \%term\%info
-entries include
-.B \%acsc
-capabilities in which their key characters
-.RB ( pryz{|} )
-are embedded,
-and a second-hand list of their character descriptions has come to
-light.
-The
-.I \%ncurses
-developers invented ACS-prefixed names for them.
-.PP
 The
 .I displayed
 values of
-.B \%ACS_
+.I \%ACS_
 constants depend on
 .bP
 the
@@ -442,7 +476,7 @@ see the discussion of the
 environment variable in \fB\%ncurses\fP(3X).
 .SS "Character Set"
 X/Open Curses assumes that the parameter passed to
-.B \%waddch
+.I \%waddch
 contains a single character.
 That character may have been more than eight bits wide in an SVr3 or
 SVr4 implementation,
@@ -454,7 +488,7 @@ though the use of bit operations to combine the character code with
 attributes and a color pair identifier into a
 .I \%chtype
 for passage to
-.B \%waddch
+.I \%waddch
 is common.
 A portable application uses only the macros discussed in
 \fB\%curs_attr\fP(3X) to manipulate a
@@ -466,10 +500,10 @@ In
 holds an eight-bit character,
 but the library allows a multibyte character sequence to be passed via a
 succession of calls to
-.BR \%waddch "."
+.IR \%waddch "."
 Other implementations do not;
 a
-.B \%waddch
+.I \%waddch
 call transmits exactly one character,
 which may be rendered in one or more screen locations depending on
 whether it is printable
@@ -477,7 +511,7 @@ whether it is printable
 Depending on the locale,
 .I \%ncurses
 inspects the byte passed in each
-.B \%waddch
+.I \%waddch
 call and checks whether the latest call continues a multibyte character.
 When a character is
 .IR complete ","
@@ -506,13 +540,33 @@ use only
 .IR \%wadd_wch "."
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
-.IR \%waddch "."
+.I \%waddch
+and its variants.
 .PP
 SVr3 (1987)
-added
-.IR \%wechochar "."
+added the
+.I \%echochar
+and
+.I \%wechochar
+functions and most of the
+.I ACS_
+constants,
+except for
+.IR \%ACS_GEQUAL ","
+.IR \%ACS_LEQUAL ","
+.IR \%ACS_NEQUAL ","
+.IR \%ACS_PI ","
+.IR \%ACS_S3 ","
+.IR \%ACS_S7 ","
+and
+.IR \%ACS_STERLING "."
+.PP
+.I \%ncurses
+1.9.6 (1995)
+furnished the remaining
+.I ACS_
+constants.
 .SH SEE ALSO
 \fB\%curs_add_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 1ec36df44..db0254ace 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
-.TH curs_addchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp $
+.TH curs_addchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -147,10 +147,7 @@ SVr4 describes a successful return value only as
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 473
 .SH HISTORY
 SVr3.1 (1987)
-introduced
-.I \%waddchstr
-and
-.IR \%waddchnstr "."
+introduced these functions.
 .SH SEE ALSO
 \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 83d4f7236..8b7f3890b 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp $
-.TH curs_addstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp $
+.TH curs_addstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -133,7 +133,6 @@ SVr4 describes a successful return value only as
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 474
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
 .I \%waddstr
 along with its variants,
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index 9a473bd3e..fef308fda 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
-.TH curs_addwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
+.TH curs_addwstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,8 +142,7 @@ SVr4 describes a successful return value only as
 \*(``an integer value other than
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 478
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4
 of the same year
 specified functions named
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 2c025ae68..a2ef768a3 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp $
-.TH curs_attr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp $
+.TH curs_attr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -362,6 +362,7 @@ is outside the window boundaries.
 .BR \%chgat ","
 .BR \%mvchgat ","
 .BR \%mvwchgat ","
+.BR \%wchgat ","
 and
 .B \%color_set
 are part of
@@ -380,7 +381,7 @@ and
 .B \%standend
 may be implemented as macros.
 .PP
-Color pair values be logically \*(``or\*(''-ed with attributes
+Color pair values may be logically \*(``or\*(''-ed with attributes
 if the pair number is less than 256.
 The alternate functions such as \fBcolor_set\fP can pass a color pair
 value directly.
@@ -556,7 +557,6 @@ no known terminal provides these highlights
 .\" ---------------------------------------------------------------------------
 .SH HISTORY
 4BSD (1980)
-.I curses
 used a
 .I char
 to represent each cell of the terminal screen.
@@ -582,7 +582,8 @@ BSD
 .I curses
 could do nothing with them.
 .PP
-SVr2 (1984) provided an improved
+SVr2 (1984)
+provided an improved
 .I curses
 library,
 introducing
@@ -621,7 +622,7 @@ added the
 macro along with a color system;
 see \fBcurs_color\fP(3X).
 .PP
-X/Open Curses is largely based on SVr4
+X/Open Curses Issue\ 4 (1995) is largely based on SVr4
 .IR curses ","
 but recognized that the
 .I \%wchar_t
@@ -648,13 +649,11 @@ functions
 and
 .IR \%wattr_set "),"
 and some new
-.RI \%( color_set ,
-.IR \%wcolor_set ","
-.IR \%chgat ","
-.IR \%wchgat ","
-.IR \%mvchgat ","
+.RI \%( chgat
+and its variants,
+.IR \%color_set ","
 and
-.IR \%mvwchgat ")."
+.IR \%wcolor_set ")."
 .PP
 Different Unix systems used differently sized bit fields in
 .I \%chtype
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 99db98db6..3221dfd49 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp $
-.TH curs_beep 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.42 2025/02/01 23:46:11 tom Exp $
+.TH curs_beep 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -97,13 +97,14 @@ It specifies no error conditions for them.
 On SVr4
 .IR curses ","
 they always return
-.BR OK ","
+.IR OK ","
 and X/Open Curses specifies them as doing so.
 .SH HISTORY
+SVr2 (1984)
+introduced
 .I beep
 and
-.I flash
-appeared in SVr2 (1984).
+.IR flash "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 8664cf922..1482171d5 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp $
-.TH curs_bkgrnd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp $
+.TH curs_bkgrnd 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -250,7 +250,7 @@ follows the approach used in SVr4
 .IR curses 's
 non-wide functions for manipulating the window background.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4.
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 .SH SEE ALSO
 \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
 non-wide configuration of
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 172168027..f56642516 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp $
-.TH curs_border 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border.3x,v 1.63 2025/02/02 00:00:33 tom Exp $
+.TH curs_border 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%border\fP,
 \fB\%wborder\fP,
@@ -57,90 +62,129 @@ draw borders and lines in a \fIcurses\fR window of characters
 \fB#include <curses.h>
 .PP
 \fBint border(chtype \fIls\fP, chtype \fIrs\fP, chtype \fIts\fP, chtype \fIbs\fP,
-           \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
+      \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
 \fBint wborder(WINDOW *\fIwin\fB, chtype \fIls\fB, chtype \fIrs\fB,\fR
-            \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype \fItr\fB,\fR
-            \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
+      \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype \fItr\fB,\fR
+      \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
 .PP
 \fBint box(WINDOW *\fIwin\fB, chtype \fIverch\fB, chtype \fIhorch\fB);\fR
 .PP
 \fBint hline(chtype \fIch\fB, int \fIn\fB);\fR
 \fBint whline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-\fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
-\fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.PP
 \fBint mvhline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
 \fBint mvwhline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+.PP
+\fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
+\fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
 \fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
 \fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
 .fi
 .SH DESCRIPTION
-The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
-draw a box around the edges of a window.
-Other than the window, each argument is a character with attributes:
-.sp
+.B \%wborder
+and
+.B \%border
+draw a box at the edges of the specified window or
+.BR \%stdscr ","
+respectively.
+Each
+.I \%chtype
+argument corresponds to a geometric component of the border as follows:
 .RS
-\fIls\fP \- left side,
+.I ls
+\- left side,
 .br
-\fIrs\fP \- right side,
+.I rs
+\- right side,
 .br
-\fIts\fP \- top side,
+.I ts
+\- top side,
 .br
-\fIbs\fP \- bottom side,
+.I bs
+\- bottom side,
 .br
-\fItl\fP \- top left-hand corner,
+.I tl
+\- top left-hand corner,
 .br
-\fItr\fP \- top right-hand corner,
+.I tr
+\- top right-hand corner,
 .br
-\fIbl\fP \- bottom left-hand corner, and
+.I bl
+\- bottom left-hand corner, and
 .br
-\fIbr\fP \- bottom right-hand corner.
+.I br
+\- bottom right-hand corner.
 .RE
 .PP
-If any of these arguments is zero, then the corresponding
-default values (defined in \fBcurses.h\fP) are used instead:
-.sp
+If any
+.I \%chtype
+argument is
+.BR 0 ","
+then
+.I curses
+uses forms-drawing characters
+(see \fBaddch\fP(3X))
+in the following correspondence:
 .RS
-\fBACS_VLINE\fP,
+.BR \%ACS_VLINE ","
 .br
-\fBACS_VLINE\fP,
+.BR \%ACS_VLINE ","
 .br
-\fBACS_HLINE\fP,
+.BR \%ACS_HLINE ","
 .br
-\fBACS_HLINE\fP,
+.BR \%ACS_HLINE ","
 .br
-\fBACS_ULCORNER\fP,
+.BR \%ACS_ULCORNER ","
 .br
-\fBACS_URCORNER\fP,
+.BR \%ACS_URCORNER ","
 .br
-\fBACS_LLCORNER\fP,
+.BR \%ACS_LLCORNER ","
+and
 .br
-\fBACS_LRCORNER\fP.
+.BR \%ACS_LRCORNER "."
 .RE
 .PP
-\fBbox(\fIwin\fB, \fIverch\fB, \fIhorch\fB)\fR is a shorthand
-for the following call: \fBwborder(\fIwin\fB,\fR \fIverch\fB,\fR
-\fIverch\fB,\fR \fIhorch\fB,\fR \fIhorch\fB, 0, 0, 0, 0)\fR.
+.BI \%box( win ","
+.IB verch ,
+.IB horch )
+is shorthand for
+.RB \%\*(`` wborder(\c
+.IB win ,
+.IB verch ,
+.IB horch ,
+.BR "0, 0, 0, 0)" "\*(''."
 .PP
-The \fBhline\fP and \fBwhline\fP functions draw a horizontal (left to right)
-line using \fIch\fP starting at the current cursor position in the window.
-The
-current cursor position is not changed.
-The line is at most \fIn\fP characters
-long, or as many as fit into the window.
-.PP
-The \fBvline\fP and \fBwvline\fP functions draw a vertical (top to bottom) line
-using \fIch\fP starting at the current cursor position in the window.
-The
-current cursor position is not changed.
-The line is at most \fIn\fP characters
-long, or as many as fit into the window.
+.B \%whline
+draws a horizontal line of
+.I ch
+from left to right,
+and
+.B \%wvline
+a vertical one from top to bottom,
+stopping once
+.I n
+characters have been drawn or upon reaching the boundary of
+.IR win "."
+These functions do not update the cursor position
+(beyond any motion directed by their \*(``mv\*('' variants).
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All routines return the integer \fBOK\fP.
-.PP
-This implementation returns
+These functions return
+.B OK
+on success and
 .B ERR
-if the window pointer is null.
+on failure.
+.PP
+In
+.IR \%ncurses ","
+.bP
+these functions fail if the screen is not initialized;
+and
+.bP
+functions taking a
+.I \%WINDOW
+pointer argument fail if
+.I win
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -148,13 +192,33 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-.B \%border
-and
+Unusually,
+there is no
+.B \%wbox
+function;
 .B \%box
+behaves as one would expect
+.B \%wbox
+to,
+accepting a
+.I \%WINDOW
+pointer argument.
+.PP
+.BR \%border ","
+.BR \%box ","
+.BR \%hline ","
+.BR \%mvhline ","
+.BR \%mvwhline ","
+.BR \%vline ","
+.BR \%mvvline ","
+and
+.B \%mvwvline
 may be implemented as macros.
 .PP
-The borders generated by these functions are \fIinside\fP borders (this
-is also true of SVr4 curses, though the fact is not documented).
+Borders drawn by these functions are
+.I interior
+borders.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/libcurses/box.c
 .SH PORTABILITY
 These functions are described in X/Open Curses Issue\ 4.
 It specifies no error conditions for them.
@@ -176,6 +240,42 @@ property is set;
 in
 .IR \%ncurses ","
 it does not.
+.PP
+BSD
+.I curses
+drew boxes with
+.I horch
+in
+.I every
+character cell of the top and bottom lines of the window,
+whereas SVr3.1 and later
+.IR curses ","
+because its
+.I box
+wrapped
+.IR wborder ","
+used the default corner characters.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysvr3/31/\
+.\"   usr/src/lib/libcurses/screen/curses.ed#L454
+.SH HISTORY
+4BSD (1980)
+introduced
+.IR box ","
+defining it as a function.
+.PP
+SVr3.1 (1987)
+added
+.I \%whline
+and
+.I \%wvline
+and their variants,
+as well as
+.I \%border
+and
+.IR \%wborder ","
+redefining
+.I \%box
+as a macro wrapping the latter.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 08db07021..28899fb45 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
-.TH curs_border_set 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_border_set.3x,v 1.48 2025/02/02 00:04:21 tom Exp $
+.TH curs_border_set 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -56,46 +56,33 @@ draw borders and lines in a \fIcurses\fR window of wide characters
 .nf
 \fB#include <curses.h>
 .PP
-\fBint border_set(
-   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
-   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
-   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
-   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
+\fBint border_set(const cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+      \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+      \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+      \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
 .br
-\fBint wborder_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
-   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
-   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
-   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
-\fBint box_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBconst cchar_t *\fIverch\fP,
-   \fBconst cchar_t *\fIhorch\fB);\fR
-\fBint hline_set(\fP
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint whline_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint mvhline_set(\fP
-   \fBint \fIy\fB, int \fIx\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint mvwhline_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBint \fIy\fB, int \fIx\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint vline_set(\fP
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint wvline_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint mvvline_set(\fP
-   \fBint \fIy\fB, int \fIx\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
-\fBint mvwvline_set(\fP
-   \fBWINDOW *\fIwin\fP,
-   \fBint \fIy\fB, int \fIx\fP,
-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+\fBint wborder_set(\fBWINDOW *\fIwin\fP,
+      \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+      \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+      \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+      \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
+.PP
+\fBint box_set(\fBWINDOW *\fIwin\fP, \fBconst cchar_t *\fIverch\fP,
+      \fBconst cchar_t *\fIhorch\fB);\fR
+.PP
+\fBint hline_set(const cchar_t *\fIwch\fB, int \fIn\fB);\fR
+\fBint whline_set(WINDOW *\fIwin\fP, \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+\fBint mvhline_set(int \fIy\fB, int \fIx\fP, \fBconst cchar_t *\fIwch\fB,\fR
+      \fBint \fIn\fB);\fR
+\fBint mvwhline_set(WINDOW *\fIwin\fP, \fBint \fIy\fB, int \fIx\fP,
+      \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+.PP
+\fBint vline_set(const cchar_t *\fIwch\fB, int \fIn\fB);\fR
+\fBint wvline_set(WINDOW *\fIwin\fP, \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+\fBint mvvline_set(int \fIy\fB, int \fIx\fP, \fBconst cchar_t *\fIwch\fB,\fR
+      \fBint \fIn\fB);\fR
+\fBint mvwvline_set(WINDOW *\fIwin\fP, \fBint \fIy\fB, int \fIx\fP,
+      \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
 .fi
 .SH DESCRIPTION
 The
@@ -197,7 +184,10 @@ and
 .B \%vline_set
 may be implemented as macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses Issue\ 4.
+X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
+.SH HISTORY
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_add_wch\fP(3X),
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 4be36ce59..2c5093be5 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp $
-.TH curs_deleteln 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp $
+.TH curs_deleteln 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -132,14 +132,17 @@ SVr4 describes a successful return value only as
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 490
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
-.I \%wdeleteln
+.IR \%deleteln ","
+.IR \%wdeleteln ","
+.IR \%insertln ","
 and
 .IR \%winsertln "."
 .PP
 SVr3.1 (1987)
 added
+.I \%insdelln
+and
 .IR \%winsdelln "."
 .SH SEE ALSO
 \fB\%curses\fP(3X)
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index f2f6a5a27..139d39a72 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp $
-.TH curs_get_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp $
+.TH curs_get_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -193,8 +193,9 @@ is set to
 .PP
 Functions taking a
 .I \%WINDOW
-pointer argument fail if the pointer is
-.IR NULL "."
+pointer argument fail if
+.I win
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -248,17 +249,15 @@ It specifies no error conditions for them.
 .PP
 See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
 the interaction of
-.B \%wget_wch
+.I \%wget_wch
 with signal handlers.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4
 of the same year
 specified functions named
 .I \%wgetwch
-(with the usual variants)
-and
+(with its variants)
 .IR \%ungetwch "."
 .\" SVID 4, vol 3., pp. 496-499
 These were later additions to
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index c5b9f9eca..edb70c74d 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp $
-.TH curs_get_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp $
+.TH curs_get_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -98,7 +98,7 @@ always terminates the string with a null wide character
 .IR WEOF );
 .bP
 interprets the screen's erase and kill characters
-(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
+(see \fB\%erasewchar\fP(3X) and \fB\%killwchar\fP(3X));
 .bP
 recognizes function keys only if the screen's keypad option is enabled
 (see \fB\%keypad\fP(3X));
@@ -363,6 +363,28 @@ into the buffer,
 for consistency with SVr4
 .IR curses 's
 .IR \%wgetnstr .
+.SH HISTORY
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
+The System\ V Interface Definition Version\ 4
+of the same year
+specified functions named
+.I \%wgetwstr
+and
+.I \%wgetnwstr
+(and the usual variants).
+.\" SVID 4, vol 3., p. 500
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+Except in name,
+their declarations did not differ from X/Open's later
+.I \%wget_wstr
+and
+.I \%wgetn_wstr
+until
+X/Open Curses Issue 7 (2009)
+eventually changed the type of the buffer argument to a pointer to
+.IR \%wint_t "."
 .SH SEE ALSO
 \fB\%curs_getstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index f8bbcdbdc..062a6b072 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
-.TH curs_getcchar 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp $
+.TH curs_getcchar 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds ' \(aq
 .\}
@@ -274,7 +274,7 @@ see below),
 attributes
 (at least 15 bits' worth,
 inferred from the count of specified
-.B WA_
+.I WA_
 constants),
 .\" See X/Open Curses Issue 7, p. 307.
 .bP
@@ -344,8 +344,7 @@ can be compiled with a different
 value;
 doing so alters the library's ABI.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_attr\fP(3X),
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 2bc54c12e..7241c221c 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp $
-.TH curs_getch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp $
+.TH curs_getch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -477,8 +477,9 @@ or
 .PP
 Functions taking a
 .I \%WINDOW
-pointer argument fail if the pointer is
-.IR NULL "."
+pointer argument fail if
+.I win
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -648,16 +649,16 @@ SVr4 describes a successful return value only as
 \*(``an integer value other than
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 494
 .PP
-.B \%wgetch
+.I \%wgetch
 reads only single-byte characters.
 .PP
 The echo behavior of these functions on input of
-.B KEY_
+.I KEY_
 or backspace characters is not documented in SVr4
 .IR curses "."
 .PP
 The behavior of
-.B \%wgetch
+.I \%wgetch
 in the presence of signal handlers is not documented in SVr4
 .I curses
 and is unspecified by X/Open Curses.
@@ -673,18 +674,18 @@ A portable
 .I curses
 application prepares for two cases:
 (a) signal receipt does not interrupt
-.BR \%wgetch ";"
+.IR \%wgetch ";"
 or
 (b) signal receipt interrupts
-.B \%wgetch
+.I \%wgetch
 and causes it to return
-.B ERR
+.I ERR
 with
-.B \%errno
+.I \%errno
 set to
-.BR \%EINTR "."
+.IR \%EINTR "."
 .PP
-.B \%KEY_MOUSE
+.I \%KEY_MOUSE
 is mentioned in X/Open Curses,
 along with a few related
 .I \%term\%info
@@ -694,9 +695,9 @@ The implementation in
 .I \%ncurses
 is an extension.
 .PP
-.B \%KEY_RESIZE
+.I \%KEY_RESIZE
 and
-.B \%has_key
+.I \%has_key
 are extensions first implemented for
 .IR \%ncurses "."
 By 2022,
@@ -707,7 +708,7 @@ NetBSD
 .I curses
 .\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3
 had added them along with
-.BR \%KEY_MOUSE "."
+.IR \%KEY_MOUSE "."
 .SH SEE ALSO
 ECMA-6 \*(``7-bit coded Character Set\*(''
 \%<https://\*:ecma\-international\*:.org/\
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index c518cf8da..2bcfc882d 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp $
-.TH curs_getstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.85 2025/02/01 22:49:13 tom Exp $
+.TH curs_getstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -289,8 +289,7 @@ as well as any special keys
 .PP
 without further detail.
 It lied.
-In fact,
-the \*(``character\*('' value
+The \*(``character\*('' value
 appended to the string
 by those implementations
 was predictable but not useful \(em
@@ -482,7 +481,6 @@ for better compatibility with SVr4
 .IR curses "."
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
 .I \%wgetstr
 along with its variants.
@@ -492,11 +490,12 @@ added
 .IR \%wgetnstr ","
 but none of its variants.
 .PP
-X/Open Curses Issue\ 4 (1995) specified
+X/Open Curses Issue\ 4 (1995)
+specified
 .IR \%getnstr ","
-.IR \%mvwgetnstr ","
+.IR \%mvgetnstr ","
 and
-.IR \%mvgetnstr "."
+.IR \%mvwgetnstr "."
 .SH SEE ALSO
 \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index e7f0e433b..18bb0c5b7 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
-.TH curs_getyx 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.55 2025/02/01 22:48:11 tom Exp $
+.TH curs_getyx 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -157,7 +157,6 @@ The
 macro hides this difference.
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
 .IR \%getyx "."
 .PP
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index 38a461ef7..1c93952a4 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp $
-.TH curs_in_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wch.3x,v 1.44 2025/02/01 22:54:32 tom Exp $
+.TH curs_in_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -104,8 +104,7 @@ parameter instead of the return value.
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4
 of the same year
 specified a function named
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index f97bbf824..b5bec27db 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp $
-.TH curs_in_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_in_wchstr.3x,v 1.48 2025/02/01 22:54:32 tom Exp $
+.TH curs_in_wchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -126,8 +126,7 @@ is recommended.
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4
 of the same year
 specified a function named
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 468f7acd7..941db2d86 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp $
-.TH curs_initscr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp $
+.TH curs_initscr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -219,7 +219,7 @@ and
 restores terminal modes (see \fB\%reset_shell_mode\fP(3X)).
 .PP
 Calling \fB\%refresh\fP(3X) or \fB\%doupdate\fP(3X) after a
-temporary escape causes
+temporary suspension causes
 .I curses
 to resume managing the terminal.
 .SS isendwin
@@ -319,58 +319,214 @@ on error.
 In
 .IR \%ncurses ","
 .B \%set_term
-does not fail.
+does not fail,
+and
+.B \%initscr
+exits the application if it does not operate successfully.
+.SH NOTES
+.I \%ncurses
+establishes signal handlers when a function that initializes a
+.IR SCREEN ","
+either
+.B \%initscr
+or
+.BR \%newterm ","
+is first called.
+Applications that wish to handle the following signals themselves
+should set up their corresponding handlers
+.I after
+initializing the screen.
+.TP
+.I SIGINT
+.IR \%ncurses 's
+handler
+.I attempts
+to clean up the screen on exit.
+Although it
+.I usually
+works as expected,
+there are limitations.
+.RS
+.bP
+Walking the
+.I SCREEN
+list is unsafe, since all list management
+is done without any signal blocking.
+.bP
+When an application has been built with the
+.I \%_REENTRANT
+macro defined
+(and corresponding system support),
+.B \%set_term
+uses functions that could deadlock or misbehave in other ways.
+.bP
+.B \%endwin
+calls other functions,
+many of which use \fI\%stdio\fP(3) or other library functions that are
+clearly unsafe.
+.RE
+.TP
+.I SIGTERM
+.I \%ncurses
+uses the same handler as for
+.IR \%SIGINT ","
+with the same limitations.
+It is not mentioned in X/Open Curses,
+but is more suitable for this purpose than
+.I \%SIGQUIT
+(which is used in debugging).
+.TP
+.I SIGTSTP
+.IR \%ncurses 's
+handler manages the terminal-generated stop signal,
+used in job control.
+When resuming the process,
+.I \%ncurses
+discards pending input with \fB\%flushinp\fP(3X)
+and repaints the screen,
+assuming that it has been completely altered.
+It also updates the saved terminal modes with
+\fB\%def_shell_mode\fP(3X).
+.TP
+.I SIGWINCH
+.I \%ncurses
+handles changes to the terminal's window size,
+a phenomenon ignored in standardization efforts.
+It sets a (signal-safe) variable
+that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X).
+.RS
+.bP
+.B \%wgetch
+returns the key code
+.BR \%KEY_RESIZE "."
+.bP
+.B \%wget_wch
+returns
+.B \%KEY_CODE_YES
+and sets its
+.I wch
+parameter to
+.BR \%KEY_RESIZE "."
+.RE
+.IP
+At the same time,
+.I \%ncurses
+calls \fB\%resizeterm\fP(3X)
+to adjust the standard screen
+.BR \%stdscr ","
+and update global variables such as
+.B LINES
+and
+.BR COLS "."
 .SH PORTABILITY
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SS Differences
 X/Open Curses specifies that portable applications must not
-call \fB\%initscr\fP more than once:
+call
+.I \%initscr
+more than once.
 .bP
-The portable way to use \fB\%initscr\fP is once only,
-using \fB\%refresh\fP(3X)
-to restore the screen after \fB\%endwin\fP.
+The portable way to use
+.I \%initscr
+is once only,
+using
+.I \%refresh
+to restore the screen after
+.IR \%endwin "."
 .bP
-This implementation allows using \fB\%initscr\fP after \fB\%endwin\fP.
+.I \%ncurses
+permits use of
+.I \%initscr
+after
+.IR \%endwin "."
 .PP
-Old versions of curses, e.g., BSD 4.4, would return a null pointer
-from \fB\%initscr\fP when an error is detected, rather than exiting.
-It is safe but redundant to check the return value of \fB\%initscr\fP
+.I \%initscr
+in BSD,
+from its inception (1980) through the Net/2 release (1991) returned
+.I ERR
+cast to a
+.I \%WINDOW
+pointer when detecting an error.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/libcurses/initscr.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/lib/libcurses/initscr.c
+4.4BSD (1995)
+instead returned a null pointer.
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/lib/libcurses/initscr.c
+Neither exited the application.
+It is safe but redundant to check the return value of
+.I \%initscr
 in X/Open Curses.
 .PP
-Calling \fB\%endwin\fP does not dispose of the memory allocated in
-\fB\%initscr\fP or \fB\%newterm\fP.
-Deleting a \fISCREEN\fP provides a way to do this:
-.bP
-X/Open Curses does not say what happens to \fI\%WINDOW\fPs when
-\fB\%delscreen\fP
-\*(``frees storage associated with the \fISCREEN\fP\*(''
+Calling
+.I \%endwin
+does not dispose of the memory allocated by
+.I \%initscr
+or
+.IR \%newterm "."
+Deleting a
+.I SCREEN
+provides a way to do this.
+.bP
+X/Open Curses does not say what happens to
+.IR \%WINDOW s
+when
+.I \%delscreen
+\*(``frees storage associated with the
+.IR SCREEN "\*(''"
 nor does the SVr4 documentation help,
-adding that it should be called after \fB\%endwin\fP if a \fISCREEN\fP
+adding that it should be called after
+.I \%endwin
+if a
+.I SCREEN
 is no longer needed.
 .bP
-However, \fI\%WINDOW\fPs are implicitly associated with a \fISCREEN\fP.
-so that it is reasonable to expect \fB\%delscreen\fP to deal with these.
-.bP
-SVr4 curses deletes the standard \fI\%WINDOW\fP structures
-\fB\%stdscr\fP and \fB\%curscr\fP as well as a work area \fB\%newscr\fP.
-SVr4 curses ignores other windows.
+However,
+.IR \%WINDOW s
+are implicitly associated with a
+.IR SCREEN ","
+so it is reasonable to expect
+.I \%delscreen
+to dispose of them.
+.bP
+SVr4 deletes the standard
+.I \%WINDOW
+structures
+.I \%stdscr
+and
+.I \%curscr
+as well as a work area
+.IR \%newscr "."
+It ignores other windows.
 .bP
 Since version 4.0 (1996),
-\fI\%ncurses\fP has maintained a list of all windows for each screen,
-using that information to delete those windows when \fB\%delscreen\fP is
+.I \%ncurses
+has maintained a list of all windows for each screen,
+using that information to delete those windows when
+.I \%delscreen
+is
 called.
 .bP
-NetBSD copied this feature of \fI\%ncurses\fP in 2001.
+NetBSD copied this feature of
+.I \%ncurses
+in 2001.
 .I \%PDCurses
 follows the SVr4 model,
-deleting only the standard \fI\%WINDOW\fP structures.
+deleting only the standard
+.I \%WINDOW
+structures.
 .SS "High-level versus Low-level"
 Different implementations may disagree regarding the level of some functions.
-For example, \fISCREEN\fP (returned by \fB\%newterm\fP) and
-\fI\%TERMINAL\fP (returned by \fB\%setupterm\fP(3X)) hold file
+For example,
+.I SCREEN
+(returned by
+.IR \%newterm ")"
+and
+.I \%TERMINAL
+(returned by \fB\%setupterm\fP(3X)) hold file
 descriptors for the output stream.
-If an application switches screens using \fB\%set_term\fR,
+If an application switches screens using
+.IR \%set_term ","
 or switches terminals using \fB\%set_curterm\fP(3X),
 applications which use the output file descriptor can have different
 behavior depending on which structure holds the corresponding descriptor.
@@ -380,21 +536,26 @@ NetBSD's
 function uses the descriptor in
 .IR \%TERMINAL "."
 .I \%ncurses
-and SVr4
-.I curses
-use the descriptor in
+and SVr4 use the descriptor in
 .IR SCREEN "."
 .bP
-NetBSD and \fI\%ncurses\fP use the descriptor
-in \fI\%TERMINAL\fP
+NetBSD and
+.I \%ncurses
+use the descriptor
+in
+.I \%TERMINAL
 for terminal I/O modes,
 e.g.,
 \fB\%def_shell_mode\fP(3X),
 \fB\%def_prog_mode\fP(3X).
-SVr4 curses uses the descriptor in \fISCREEN\fP.
+SVr4 uses the descriptor in
+.IR SCREEN "."
 .SS "Unset \fITERM\fP Variable"
-If the \fITERM\fP variable is missing or empty, \fB\%initscr\fP uses the
-value \*(``unknown\*('',
+If the
+.I TERM
+variable is missing or empty,
+.I \%initscr
+uses the value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the
 .B \%generic
 .RB ( gn )
@@ -402,16 +563,19 @@ capability.
 Generic entries are detected by \fB\%setupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle
-a missing/empty \fITERM\fP variable differently.
+a missing/empty
+.I TERM
+variable differently.
 .SS "Signal Handlers"
-Quoting from X/Open Curses Issue\ 7, section 3.1.1:
+Quoting X/Open Curses Issue\ 7,
+section 3.1.1:
 .RS 5
 .PP
 Curses implementations may provide for special handling of the
 \%SIGINT,
 \%SIGQUIT,
 and \%SIGTSTP signals if their disposition is \%SIG_DFL at the time
-.I \%initscr
+.IR \%initscr ()
 is called.\|.\|.
 .PP
 Any special handling for these signals may remain in effect for the
@@ -422,63 +586,9 @@ None of the Curses functions are required to be safe
 with respect to signals.\|.\|.
 .RE
 .PP
-This implementation establishes signal handlers during initialization,
-e.g., \fB\%initscr\fP or \fB\%newterm\fP.
-Applications which must handle these signals should set up the corresponding
-handlers \fIafter\fP initializing the library:
-.TP 5
-.B SIGINT
-The handler \fIattempts\fP to clean up the screen on exit.
-Although it \fIusually\fP works as expected, there are limitations:
-.RS 5
-.bP
-Walking the \fISCREEN\fP list is unsafe, since all list management
-is done without any signal blocking.
-.bP
-On systems which have \fB\%REENTRANT\fP turned on, \fB\%set_term\fP uses
-functions which could deadlock or misbehave in other ways.
-.bP
-\fB\%endwin\fP calls other functions,
-many of which use \fI\%stdio\fP(3) or other library functions which are
-clearly unsafe.
-.RE
-.TP 5
-.B SIGTERM
-This uses the same handler as \fB\%SIGINT\fP, with the same limitations.
-It is not mentioned in X/Open Curses, but is more suitable for this
-purpose than \fB\%SIGQUIT\fP (which is used in debugging).
-.TP 5
-.B SIGTSTP
-This handles the \fIstop\fP signal, used in job control.
-When resuming the process, this implementation discards pending
-input with \fB\%flushinp\fP(3X), and repaints the screen
-assuming that it has been completely altered.
-It also updates the saved terminal modes with
-\fB\%def_shell_mode\fP(3X).
-.TP 5
-.B SIGWINCH
-This handles the window-size changes which were ignored in
-the standardization efforts.
-The handler sets a (signal-safe) variable
-that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X).
-.RS
-.bP
-.B \%wgetch
-returns the key code
-.BR \%KEY_RESIZE "."
-.bP
-.B \%wget_wch
-returns
-.B \%KEY_CODE_YES
-and sets its
-.I wch
-parameter to
-.BR \%KEY_RESIZE "."
-.RE
-.IP
-At the same time, \fI\%ncurses\fP calls \fB\%resizeterm\fP to adjust the
-standard screen \fB\%stdscr\fP,
-and update other data such as \fBLINES\fP and \fBCOLS\fP.
+Section \*(``NOTES\*('' above discusses
+.IR \%ncurses 's
+signal handlers.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_kernel\fP(3X),
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 49a8a504d..a98fbdb7d 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp $
-.TH curs_inopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp $
+.TH curs_inopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,7 +111,11 @@ get and set \fIcurses\fR terminal input options
 .I curses
 offers configurable parameters permitting an application to control the
 handling of input from the terminal.
-Some are global,
+Some,
+such as those affecting the terminal's
+.I mode
+or line discipline,
+are global,
 applying to all windows;
 others apply only to a specific window.
 The library does not automatically apply such parameters to new or
@@ -135,19 +139,25 @@ Normally,
 the terminal driver buffers typed characters,
 not delivering them to an application
 until a line feed or carriage return is typed.
+This canonical (\*(``cooked\*('') line discipline also supports
+software flow control,
+simple line editing functions
+(character and word erase,
+and whole-line erasure or \*(``kill\*(''),
+and job control.
 .B \%cbreak
 configures the terminal in
 .IR "cbreak mode" ","
 which disables line buffering
-and erase and kill character processing
-(the interrupt,
+and erase and kill character processing \(em
+the interrupt,
 quit,
 suspend,
-and flow control characters are unaffected)
+and flow control characters are unaffected \(em
 and makes characters typed by the user immediately available to the
 program.
 .B \%nocbreak
-restores the terminal's canonical (\*(``cooked\*('') line discipline.
+restores canonical (\*(``cooked\*('') mode.
 .PP
 The state of the terminal is unknown to a
 .I curses
@@ -299,9 +309,9 @@ call
 this is equivalent,
 on POSIX systems,
 to setting the CS7 flag on the terminal.
-The window argument,
-.IR win ,
-is always ignored.
+.I curses
+ignores the window argument
+.IR win "."
 If the
 .I \%term\%info
 string capabilities
@@ -371,8 +381,11 @@ see \fI\%termios\fP(3).
 The default behavior is inherited from the terminal driver settings.
 Calling
 .B \%qiflush
-configures the terminal to flush the queues when any of these events
-occurs,
+configures the terminal to
+.I flush
+the queues
+(discarding their contents)
+when any of these events occurs,
 giving the impression of faster response to user input,
 but making the library's model of the screen contents incorrect.
 Calling
@@ -424,12 +437,13 @@ uses blocking or non-blocking reads.
 If
 .I delay
 is negative,
-a blocking read is used,
+.I curses
+uses a blocking read,
 waiting indefinitely for input.
 If
 .I delay
 is zero,
-a non-blocking read is used;
+the read is non-blocking;
 an input character reading function returns
 .B ERR
 if no input is pending.
@@ -732,11 +746,9 @@ extended capabilities can be interpreted as key definitions.
 These are loaded after the predefined keys,
 and if a capability's value is the same as a previously loaded
 key definition,
-the later definition is the one used.
+the library uses the later definition.
 .SH HISTORY
-4BSD
-.I curses
-(1980)
+4BSD (1980)
 introduced
 .IR echo ","
 .IR \%noecho ","
@@ -746,7 +758,8 @@ introduced
 and
 .IR \%noraw "." \" also crmod and nocrmod, never standardized
 .PP
-SVr2 (1984) featured a new terminal driver,
+SVr2 (1984)
+featured a new terminal driver,
 extending the
 .I curses
 API to support it with
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index f15ca5332..e9be586f6 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
-.TH curs_ins_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp $
+.TH curs_ins_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -72,8 +72,9 @@ These functions return \fBOK\fP on success and \fBERR\fP on failure.
 .PP
 Functions taking a
 .I \%WINDOW
-pointer argument fail if the pointer is
-.IR NULL .
+pointer argument fail if
+.I win
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -96,8 +97,7 @@ is not necessarily employed.
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue\ 4
-(1995).
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4
 of the same year
 specified a function named
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index f9022645c..299b0f4f2 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
-.TH curs_ins_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
+.TH curs_ins_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -183,7 +183,7 @@ implementations.
 Nevertheless,
 Issue\ 7 retains the language.
 .SH HISTORY
-These functions were initially specified by X/Open Curses Issue 4.
+X/Open Curses Issue\ 4 (1995) initially specified these functions.
 The System\ V Interface Definition Version\ 4 (1995),
 specified functions named
 .I \%winswstr
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index f655a1814..a44052859 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp $
-.TH curs_insch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp $
+.TH curs_insch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -76,8 +76,9 @@ on failure.
 .PP
 Functions taking a
 .I \%WINDOW
-pointer argument fail if the pointer is
-.IR NULL .
+pointer argument fail if
+.I win
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index dcb91a74a..5d47ca44f 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
-.TH curs_insstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.70 2025/02/01 22:53:03 tom Exp $
+.TH curs_insstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -173,8 +173,8 @@ This was probably an error,
 since it makes this group of functions inconsistent.
 No implementation of
 .I curses
-documents this inconsistency,
-and Issue\ 7 removed it.
+manifests this inconsistency,
+and Issue\ 7 removed the claim.
 .PP
 Issue\ 4 states that the entire string is inserted if
 .I n
@@ -196,7 +196,8 @@ SVr3.1 (1987)
 introduced
 .I \%winsstr
 and
-.IR \%winsnstr "."
+.I \%winsnstr
+and their variants.
 .SH SEE ALSO
 \fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 2656fef2a..864f38f9a 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
-.TH curs_instr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp $
+.TH curs_instr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -207,6 +207,9 @@ counts the null terminator that these functions write to
 .SH HISTORY
 SVr3.1 (1987)
 introduced these functions.
+.IR winstr ","
+.IR winnstr ","
+and their variants.
 .SH SEE ALSO
 \fB\%curs_inwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 39e7b0544..28b4cd5b8 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
-.TH curs_move 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp $
+.TH curs_move 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,9 +101,7 @@ SVr4 describes a successful return value only as
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
 .SH HISTORY
 4BSD (1980)
-.I curses
-introduced
-.IR \%wmove "."
+introduced these functions.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X)
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index d77d6d9a9..92e4fa29e 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp $
-.TH curs_outopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp $
+.TH curs_outopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -218,20 +218,21 @@ but the code neglects it.
 Use \fB\%curs_set\fP(3X) to make the cursor invisible.
 .SH HISTORY
 4BSD (1980)
-.I curses
 introduced
 .IR \%clearok ","
 .IR \%leaveok ","
 and
 .IR \%scrollok "."
 .PP
-SVr2 (1984) supplied
+SVr2 (1984)
+supplied
 .IR \%idlok ","
 .IR \%setscrreg ","
 and
 .IR \%wsetscrreg "."
 .PP
-SVr3.1 (1987) implemented
+SVr3.1 (1987)
+implemented
 .I \%idcok
 and
 .IR \%immedok "."
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index 0c7bd05f2..7083dc310 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
-.TH curs_scroll 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scroll.3x,v 1.57 2025/02/02 00:02:49 tom Exp $
+.TH curs_scroll 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,20 +66,12 @@ every visible line we might number
 .I i
 becomes line
 .IR i "\-1."
-The text of the top line in the window disappears and the bottom line
-is populated with the background character;
-see \fB\%bkgd\fP(3X)
-(wide-character API users: \fB\%bkgrnd\fP(3X)).
-As an optimization,
-if the scrolling region of the window is the entire screen,
-the physical screen may be scrolled at the same time;
-see \fB\%curscr\fP(3X).
-.PP
-.B \%scrl
-and
 .B \%wscrl
-scrolls the specified window
-.I win
+and
+.B \%scrl
+scroll the specified window or
+.BR \%stdscr ","
+respectively,
 up or down per the sign of
 .IR n "."
 .bP
@@ -98,9 +90,17 @@ line
 becomes
 .I i
 (scrolling down).
-\fB\%ncurses\fP(3X) describes the
-.B \%scrl
-variant of this function.
+.PP
+A line that scrolls beyond the window boundaries disappears;
+.I curses
+populates a new one emerging at the opposite boundary
+with the background character;
+see \fB\%bkgd\fP(3X)
+(wide-character API users: \fB\%bkgrnd\fP(3X)).
+As an optimization,
+if the scrolling region of the window is the entire screen,
+the physical screen may be scrolled at the same time;
+see \fB\%curscr\fP(3X).
 .PP
 The cursor does not move.
 These functions perform no operation unless scrolling is enabled for the
@@ -112,18 +112,26 @@ upon failure and
 .B OK
 upon success.
 .PP
-.I \%ncurses
-returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
-if scrolling is not enabled in the window,
-for example with \fB\%scrollok\fP(3X),
-or if the
-.I \%WINDOW
-pointer is null.
+if
+.bP
+the
+.I curses
+screen has not been initialized,
+.bP
+.I win
+is a null pointer,
+or
+.bP
+scrolling is not enabled in the window
+(as by \fB\%scrollok\fP(3X)).
 .SH NOTES
-.B \%scrl
+.B \%scroll
 and
-.B \%wscrl
+.B \%scrl
 may be implemented as macros.
 .PP
 Unusually,
@@ -160,6 +168,20 @@ color pair identifier of the background character.
 In
 .IR \%ncurses ","
 they do not.
+.SH HISTORY
+4BSD (1980)
+introduced
+.IR scroll ","
+defining it as a function.
+.PP
+SVr3.1 (1987)
+added
+.I \%scrl
+and
+.IR \%wscrl ","
+redefining
+.I \%scroll
+as a macro wrapping the latter.
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_outopts\fP(3X)
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index df3f5dcb5..1e0f22408 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
-.TH curs_sp_funcs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_sp_funcs.3x,v 1.57 2025/02/01 22:47:44 tom Exp $
+.TH curs_sp_funcs 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -46,169 +46,169 @@
 .nf
 \fB#include <curses.h>
 .PP
-\fBint alloc_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
-\fBint assume_default_colors_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
-\fBint baudrate_sp(SCREEN* \fIsp\fP);
-\fBint beep_sp(SCREEN* \fIsp\fP);
-\fBbool can_change_color_sp(SCREEN* \fIsp\fP);
-\fBint cbreak_sp(SCREEN* \fIsp\fP);
-\fBint color_content_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short* \fIr\fP, short* \fIg\fP, short* \fIb\fP);
-\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fP);
-\fBint def_prog_mode_sp(SCREEN* \fIsp\fP);
-\fBint def_shell_mode_sp(SCREEN* \fIsp\fP);
+\fBint alloc_pair_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint assume_default_colors_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint baudrate_sp(SCREEN * \fIsp\fP);
+\fBint beep_sp(SCREEN * \fIsp\fP);
+\fBbool can_change_color_sp(SCREEN * \fIsp\fP);
+\fBint cbreak_sp(SCREEN * \fIsp\fP);
+\fBint color_content_sp(SCREEN * \fIsp\fP, short \fIcolor\fP, short * \fIr\fP, short * \fIg\fP, short * \fIb\fP);
+\fBint curs_set_sp(SCREEN * \fIsp\fP, int \fIvisibility\fP);
+\fBint def_prog_mode_sp(SCREEN * \fIsp\fP);
+\fBint def_shell_mode_sp(SCREEN * \fIsp\fP);
 .PP
-\fBint define_key_sp(SCREEN* \fIsp\fP, const char * \fIdefinition\fP, int \fIkeycode\fP);
-\fBint delay_output_sp(SCREEN* \fIsp\fP, int \fIms\fP);
-\fBint doupdate_sp(SCREEN* \fIsp\fP);
-\fBint echo_sp(SCREEN* \fIsp\fP);
-\fBint endwin_sp(SCREEN* \fIsp\fP);
-\fBchar erasechar_sp(SCREEN* \fIsp\fP);
-\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
+\fBint define_key_sp(SCREEN * \fIsp\fP, const char * \fIdefinition\fP, int \fIkeycode\fP);
+\fBint delay_output_sp(SCREEN * \fIsp\fP, int \fIms\fP);
+\fBint doupdate_sp(SCREEN * \fIsp\fP);
+\fBint echo_sp(SCREEN * \fIsp\fP);
+\fBint endwin_sp(SCREEN * \fIsp\fP);
+\fBchar erasechar_sp(SCREEN * \fIsp\fP);
+\fBint erasewchar_sp(SCREEN * \fIsp\fP, wchar_t *\fIwc\fP);
 \fBint extended_color_content_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int * \fIr\fP, int * \fIg\fP, int * \fIb\fP);
-\fBint extended_pair_content_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
-\fBint extended_slk_color_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
+\fBint extended_pair_content_sp(SCREEN * \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
+\fBint extended_slk_color_sp(SCREEN * \fIsp\fP, int \fIpair\fP);
 .PP
-\fBvoid filter_sp(SCREEN* \fIsp\fP);
-\fBint find_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
-\fBint flash_sp(SCREEN* \fIsp\fP);
-\fBint flushinp_sp(SCREEN* \fIsp\fP);
-\fBint free_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
-\fBint get_escdelay_sp(SCREEN* \fIsp\fP);
-\fBint getmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
-\fBWINDOW* getwin_sp(SCREEN* \fIsp\fP, FILE* \fIfilep\fP);
-\fBint halfdelay_sp(SCREEN* \fIsp\fP, int \fItenths\fP);
-\fBbool has_colors_sp(SCREEN* \fIsp\fP);
+\fBvoid filter_sp(SCREEN * \fIsp\fP);
+\fBint find_pair_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint flash_sp(SCREEN * \fIsp\fP);
+\fBint flushinp_sp(SCREEN * \fIsp\fP);
+\fBint free_pair_sp(SCREEN * \fIsp\fP, int \fIpair\fP);
+\fBint get_escdelay_sp(SCREEN * \fIsp\fP);
+\fBint getmouse_sp(SCREEN * \fIsp\fP, MEVENT * \fIevent\fP);
+\fBWINDOW * getwin_sp(SCREEN * \fIsp\fP, FILE * \fIfilep\fP);
+\fBint halfdelay_sp(SCREEN * \fIsp\fP, int \fItenths\fP);
+\fBbool has_colors_sp(SCREEN * \fIsp\fP);
 .PP
-\fBbool has_ic_sp(SCREEN* \fIsp\fP);
-\fBbool has_il_sp(SCREEN* \fIsp\fP);
-\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIc\fP);
-\fBbool has_mouse_sp(SCREEN* \fIsp\fP);
-\fBint init_color_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
-\fBint init_extended_color_sp(SCREEN* \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
-\fBint init_extended_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int \fIfg\fP, int \fIbg\fP);
-\fBint init_pair_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short \fIbg\fP);
-\fBint intrflush_sp(SCREEN* \fIsp\fP, WINDOW* \fIwin\fP, bool \fIbf\fP);
-\fBint is_cbreak_sp(SCREEN* \fIsp\fP);
+\fBbool has_ic_sp(SCREEN * \fIsp\fP);
+\fBbool has_il_sp(SCREEN * \fIsp\fP);
+\fBint has_key_sp(SCREEN * \fIsp\fP, int \fIc\fP);
+\fBbool has_mouse_sp(SCREEN * \fIsp\fP);
+\fBint init_color_sp(SCREEN * \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
+\fBint init_extended_color_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
+\fBint init_extended_pair_sp(SCREEN * \fIsp\fP, int \fIpair\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint init_pair_sp(SCREEN * \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short \fIbg\fP);
+\fBint intrflush_sp(SCREEN * \fIsp\fP, WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint is_cbreak_sp(SCREEN * \fIsp\fP);
 .PP
-\fBint is_echo_sp(SCREEN* \fIsp\fP);
-\fBint is_nl_sp(SCREEN* \fIsp\fP);
-\fBint is_raw_sp(SCREEN* \fIsp\fP);
-\fBbool is_term_resized_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
-\fBbool isendwin_sp(SCREEN* \fIsp\fP);
-\fBint key_defined_sp(SCREEN* \fIsp\fP, const char *\fIdefinition\fP);
-\fBchar* keybound_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
-\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fP, int \fIc\fP);
-\fBint keyok_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
-\fBchar killchar_sp(SCREEN* \fIsp\fP);
+\fBint is_echo_sp(SCREEN * \fIsp\fP);
+\fBint is_nl_sp(SCREEN * \fIsp\fP);
+\fBint is_raw_sp(SCREEN * \fIsp\fP);
+\fBbool is_term_resized_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBbool isendwin_sp(SCREEN * \fIsp\fP);
+\fBint key_defined_sp(SCREEN * \fIsp\fP, const char *\fIdefinition\fP);
+\fBchar * keybound_sp(SCREEN * \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
+\fBNCURSES_CONST char * keyname_sp(SCREEN * \fIsp\fP, int \fIc\fP);
+\fBint keyok_sp(SCREEN * \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
+\fBchar killchar_sp(SCREEN * \fIsp\fP);
 .PP
-\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
-\fBchar* longname_sp(SCREEN* \fIsp\fP);
-\fBint mcprint_sp(SCREEN* \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
-\fBint mouseinterval_sp(SCREEN* \fIsp\fP, int \fIerval\fP);
-\fBmmask_t mousemask_sp(SCREEN* \fIsp\fP, mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
-\fBint mvcur_sp(SCREEN* \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
-\fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
-\fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
-\fBSCREEN* new_prescr(void);
-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinfd\fP);
+\fBint killwchar_sp(SCREEN * \fIsp\fP, wchar_t *\fIwc\fP);
+\fBchar * longname_sp(SCREEN * \fIsp\fP);
+\fBint mcprint_sp(SCREEN * \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
+\fBint mouseinterval_sp(SCREEN * \fIsp\fP, int \fIerval\fP);
+\fBmmask_t mousemask_sp(SCREEN * \fIsp\fP, mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
+\fBint mvcur_sp(SCREEN * \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
+\fBint napms_sp(SCREEN * \fIsp\fP, int \fIms\fP);
+\fBWINDOW * newpad_sp(SCREEN * \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
+\fBSCREEN * new_prescr(void);
+\fBSCREEN * newterm_sp(SCREEN * \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
 .PP
-\fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
-\fBint nl_sp(SCREEN* \fIsp\fP);
-\fBint nocbreak_sp(SCREEN* \fIsp\fP);
-\fBint noecho_sp(SCREEN* \fIsp\fP);
-\fBvoid nofilter_sp(SCREEN* \fIsp\fP);
-\fBint nonl_sp(SCREEN* \fIsp\fP);
-\fBvoid noqiflush_sp(SCREEN* \fIsp\fP);
-\fBint noraw_sp(SCREEN* \fIsp\fP);
-\fBint pair_content_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short* \fIfg\fP, short* \fIbg\fP);
-\fBvoid qiflush_sp(SCREEN* \fIsp\fP);
+\fBWINDOW * newwin_sp(SCREEN * \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBint nl_sp(SCREEN * \fIsp\fP);
+\fBint nocbreak_sp(SCREEN * \fIsp\fP);
+\fBint noecho_sp(SCREEN * \fIsp\fP);
+\fBvoid nofilter_sp(SCREEN * \fIsp\fP);
+\fBint nonl_sp(SCREEN * \fIsp\fP);
+\fBvoid noqiflush_sp(SCREEN * \fIsp\fP);
+\fBint noraw_sp(SCREEN * \fIsp\fP);
+\fBint pair_content_sp(SCREEN * \fIsp\fP, short \fIpair\fP, short * \fIfg\fP, short * \fIbg\fP);
+\fBvoid qiflush_sp(SCREEN * \fIsp\fP);
 .PP
-\fBint raw_sp(SCREEN* \fIsp\fP);
-\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fP);
-\fBint reset_prog_mode_sp(SCREEN* \fIsp\fP);
-\fBint reset_shell_mode_sp(SCREEN* \fIsp\fP);
-\fBint resetty_sp(SCREEN* \fIsp\fP);
-\fBint resize_term_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
-\fBint resizeterm_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
-\fBint ripoffline_sp(SCREEN* \fIsp\fP, int \fIline\fP, int (*\fIinit\fP)(WINDOW* \fIwin\fP, int \fIfmt\fP));
-\fBint savetty_sp(SCREEN* \fIsp\fP);
-\fBint scr_init_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+\fBint raw_sp(SCREEN * \fIsp\fP);
+\fBvoid reset_color_pairs_sp(SCREEN * \fIsp\fP);
+\fBint reset_prog_mode_sp(SCREEN * \fIsp\fP);
+\fBint reset_shell_mode_sp(SCREEN * \fIsp\fP);
+\fBint resetty_sp(SCREEN * \fIsp\fP);
+\fBint resize_term_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint resizeterm_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint ripoffline_sp(SCREEN * \fIsp\fP, int \fIline\fP, int (*\fIinit\fP)(WINDOW * \fIwin\fP, int \fIfmt\fP));
+\fBint savetty_sp(SCREEN * \fIsp\fP);
+\fBint scr_init_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
 .PP
-\fBint scr_restore_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
-\fBint scr_set_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
-\fBint set_escdelay_sp(SCREEN* \fIsp\fP, int \fIms\fP);
-\fBint set_tabsize_sp(SCREEN* \fIsp\fP, int \fIcols\fP);
-\fBint slk_attrset_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
-\fBint slk_attr_set_sp(SCREEN* \fIsp\fP, const attr_t \fIattrs\fP, short \fIpair\fP, void*\fIopts\fP);
-\fBint slk_attroff_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
-\fBint slk_attron_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
-\fBattr_t slk_attr_sp(SCREEN* \fIsp\fP);
-\fBint slk_clear_sp(SCREEN* \fIsp\fP);
+\fBint scr_restore_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
+\fBint scr_set_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
+\fBint set_escdelay_sp(SCREEN * \fIsp\fP, int \fIms\fP);
+\fBint set_tabsize_sp(SCREEN * \fIsp\fP, int \fIcols\fP);
+\fBint slk_attrset_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attr_set_sp(SCREEN * \fIsp\fP, const attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
+\fBint slk_attroff_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attron_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
+\fBattr_t slk_attr_sp(SCREEN * \fIsp\fP);
+\fBint slk_clear_sp(SCREEN * \fIsp\fP);
 .PP
-\fBint slk_color_sp(SCREEN* \fIsp\fP, short \fIpair\fP);
-\fBint slk_init_sp(SCREEN* \fIsp\fP, int \fIfmt\fP);
-\fBchar* slk_label_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP);
-\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fP);
-\fBint slk_refresh_sp(SCREEN* \fIsp\fP);
-\fBint slk_restore_sp(SCREEN* \fIsp\fP);
-\fBint slk_set_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP, const char * \fIlabel\fP, int \fIfmt\fP);
-\fBint slk_touch_sp(SCREEN* \fIsp\fP);
-\fBint start_color_sp(SCREEN* \fIsp\fP);
-\fBattr_t term_attrs_sp(SCREEN* \fIsp\fP);
+\fBint slk_color_sp(SCREEN * \fIsp\fP, short \fIpair\fP);
+\fBint slk_init_sp(SCREEN * \fIsp\fP, int \fIfmt\fP);
+\fBchar * slk_label_sp(SCREEN * \fIsp\fP, int \fIlabnum\fP);
+\fBint slk_noutrefresh_sp(SCREEN * \fIsp\fP);
+\fBint slk_refresh_sp(SCREEN * \fIsp\fP);
+\fBint slk_restore_sp(SCREEN * \fIsp\fP);
+\fBint slk_set_sp(SCREEN * \fIsp\fP, int \fIlabnum\fP, const char * \fIlabel\fP, int \fIfmt\fP);
+\fBint slk_touch_sp(SCREEN * \fIsp\fP);
+\fBint start_color_sp(SCREEN * \fIsp\fP);
+\fBattr_t term_attrs_sp(SCREEN * \fIsp\fP);
 .PP
-\fBchtype termattrs_sp(SCREEN* \fIsp\fP);
-\fBchar* termname_sp(SCREEN* \fIsp\fP);
-\fBint typeahead_sp(SCREEN* \fIsp\fP, int \fIfd\fP);
-\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwc\fP);
-\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIc\fP);
-\fBint ungetmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
-\fBint use_default_colors_sp(SCREEN* \fIsp\fP);
-\fBvoid use_env_sp(SCREEN* \fIsp\fP, bool \fIbf\fP);
-\fBint use_legacy_coding_sp(SCREEN* \fIsp\fP, int \fIlevel\fP);
+\fBchtype termattrs_sp(SCREEN * \fIsp\fP);
+\fBchar * termname_sp(SCREEN * \fIsp\fP);
+\fBint typeahead_sp(SCREEN * \fIsp\fP, int \fIfd\fP);
+\fBint unget_wch_sp(SCREEN * \fIsp\fP, const wchar_t \fIwc\fP);
+\fBint ungetch_sp(SCREEN * \fIsp\fP, int \fIc\fP);
+\fBint ungetmouse_sp(SCREEN * \fIsp\fP, MEVENT * \fIevent\fP);
+\fBint use_default_colors_sp(SCREEN * \fIsp\fP);
+\fBvoid use_env_sp(SCREEN * \fIsp\fP, bool \fIbf\fP);
+\fBint use_legacy_coding_sp(SCREEN * \fIsp\fP, int \fIlevel\fP);
 \fBvoid use_tioctl_sp(SCREEN *\fIsp\fP, bool \fIbf\fP);
 .PP
-\fBint vid_attr_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
-\fBint vid_puts_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
-\fBint vidattr_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP);
-\fBint vidputs_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
-\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIwch\fP);
+\fBint vid_attr_sp(SCREEN * \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
+\fBint vid_puts_sp(SCREEN * \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBint vidattr_sp(SCREEN * \fIsp\fP, chtype \fIattrs\fP);
+\fBint vidputs_sp(SCREEN * \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBwchar_t * wunctrl_sp(SCREEN * \fIsp\fP, cchar_t *\fIwch\fP);
 .PP
 \fB#include <form.h>
 .PP
-\fBFORM* new_form_sp(SCREEN* \fIsp\fP, FIELD **\fIfields\fP);
+\fBFORM * new_form_sp(SCREEN * \fIsp\fP, FIELD **\fIfields\fP);
 .PP
 \fB#include <menu.h>
 .PP
-\fBMENU* new_menu_sp(SCREEN* \fIsp\fP, ITEM **\fIitems\fP);
+\fBMENU * new_menu_sp(SCREEN * \fIsp\fP, ITEM **\fIitems\fP);
 .PP
 \fB#include <panel.h>
 .PP
-\fBPANEL* ceiling_panel(SCREEN* \fIsp\fP);
-\fBPANEL* ground_panel(SCREEN* \fIsp\fP);
-\fBvoid update_panels_sp(SCREEN* \fIsp\fP);
+\fBPANEL * ceiling_panel(SCREEN * \fIsp\fP);
+\fBPANEL * ground_panel(SCREEN * \fIsp\fP);
+\fBvoid update_panels_sp(SCREEN * \fIsp\fP);
 .PP
 \fB#include <term.h>
 .PP
-\fBint del_curterm_sp(SCREEN* \fIsp\fP, TERMINAL *\fIoterm\fP);
-\fBint putp_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP);
-\fBint restartterm_sp(SCREEN* \fIsp\fP, NCURSES_CONST char*\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
-\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fP, TERMINAL*\fInterm\fP);
-\fBint tgetent_sp(SCREEN* \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
-\fBint tgetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
-\fBint tgetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
-\fBchar* tgetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, char **\fIarea\fP);
-\fBchar* tgoto_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, int \fIrow\fP);
-\fBint tigetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBint del_curterm_sp(SCREEN * \fIsp\fP, TERMINAL *\fIoterm\fP);
+\fBint putp_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP);
+\fBint restartterm_sp(SCREEN * \fIsp\fP, NCURSES_CONST char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+\fBTERMINAL * set_curterm_sp(SCREEN * \fIsp\fP, TERMINAL *\fInterm\fP);
+\fBint tgetent_sp(SCREEN * \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
+\fBint tgetflag_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
+\fBint tgetnum_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
+\fBchar * tgetstr_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP, char **\fIarea\fP);
+\fBchar * tgoto_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, int \fIrow\fP);
+\fBint tigetflag_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
 .PP
-\fBint tigetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
-\fBchar* tigetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBint tigetnum_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
+\fBchar * tigetstr_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
 \fI/* tparm_sp may use 9 long parameters rather than being variadic */
-\fBchar* tparm_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, ...);
-\fBint tputs_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBchar * tparm_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP, ...);
+\fBint tputs_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
 .PP
 \fB#include <unctrl.h>
 .PP
-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIch\fP);
+\fBNCURSES_CONST char * unctrl_sp(SCREEN * \fIsp\fP, chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index 0d8c5360c..06e45560c 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
-.TH curs_termattrs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termattrs.3x,v 1.59 2025/02/01 22:49:13 tom Exp $
+.TH curs_termattrs 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -188,10 +188,12 @@ truncate the string returned by
 .I \%termname
 to 14 characters.
 .SH HISTORY
-4BSD (1980) introduced
+4BSD (1980)
+introduced
 .IR \%longname "."
 .PP
-SVr2 (1984) added
+SVr2 (1984)
+added
 .IR \%baudrate ","
 .IR \%erasechar ","
 .IR \%killchar ","
@@ -199,9 +201,11 @@ SVr2 (1984) added
 and
 .IR \%has_il "."
 .PP
-SVr3 (1987) furnished
+SVr3 (1987)
+supplied
 .IR \%termname "."
-SVr3.1 later that year supplied
+Later that year,
+SVr3.1 brought
 .IR \%termattrs "."
 .PP
 X/Open Curses Issue\ 4 (1995)
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 74766a3f5..bc844ed85 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp $
-.TH curs_termcap 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.105 2025/02/01 22:49:13 tom Exp $
+.TH curs_termcap 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -509,8 +509,7 @@ which documented the API shown in section \*(``SYNOPSIS\*('' above.
 .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/man/man3/\
 .\"   termlib.3
 .PP
-4BSD
-(November 1980)
+4BSD (November 1980)
 renamed
 .I termlib
 to
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 759607445..579448b90 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp $
-.TH curs_util 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp $
+.TH curs_util 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -534,19 +534,20 @@ This feature of \fBuse_env\fP
 is not provided by other implementations of curses.
 .SH HISTORY
 4BSD (1980)
-defined
-.I \%unctrl
-(as a macro,
+introduced
+.IR \%unctrl ","
+defining it as a macro
 in
-.IR \%unctrl.h ")."
+.IR \%unctrl.h "."
 .PP
-SVr2 (1984) introduced
+SVr2 (1984)
+added
 .IR \%delay_output ","
 .IR \%flushinp ","
 and
 .IR \%keyname "."
 .PP
-SVr3 (1987) added
+SVr3 (1987) supplied
 .IR \%filter "."
 Later that year,
 SVr3.1 brought
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 90d7da9db..99841d9ca 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp $
-.TH curs_window 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_window.3x,v 1.66 2025/02/02 00:04:58 tom Exp $
+.TH curs_window 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -61,17 +61,17 @@ create and manipulate \fIcurses\fR windows
 .nf
 \fB#include <curses.h>
 .PP
-\fBWINDOW * newwin(
-	int \fInlines\fP, int \fIncols\fP,
-	int \fIbegin_y\fP, int \fIbegin_x\fP);
+\fBWINDOW * newwin(\fR
+	\fBint \fInlines\fP, int \fIncols\fP,
+	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
 \fBint delwin(WINDOW * \fIwin\fP);
 \fBint mvwin(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
 \fBWINDOW * subwin(WINDOW * \fIorig\fP,
-	int \fInlines\fP, int \fIncols\fP,
-	int \fIbegin_y\fP, int \fIbegin_x\fP);
+	\fBint \fInlines\fP, int \fIncols\fP,
+	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
 \fBWINDOW * derwin(WINDOW * \fIorig\fP,
-	int \fInlines\fP, int \fIncols\fP,
-	int \fIbegin_y\fP, int \fIbegin_x\fP);
+	\fBint \fInlines\fP, int \fIncols\fP,
+	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
 \fBint mvderwin(WINDOW * \fIwin\fP, int \fIpar_y\fP, int \fIpar_x\fP);
 \fBWINDOW * dupwin(WINDOW * \fIwin\fP);
 \fBvoid wsyncup(WINDOW * \fIwin\fP);
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 373302b19..c59bbaa67 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.83 2025/01/19 01:00:28 tom Exp $
+# $Id: man_db.renames.in,v 1.84 2025/02/01 22:46:00 Branden.Robinson Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -221,6 +221,7 @@ is_scrollok.3x			is_scrollok.3ncurses
 keyname.3x			keyname.3ncurses
 keypad.3x			keypad.3ncurses
 killchar.3x			killchar.3ncurses
+killwchar.3x			killwchar.3ncurses
 leaveok.3x			leaveok.3ncurses
 longname.3x			longname.3ncurses
 meta.3x				meta.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index e7c4ec717..f73e4c73c 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.46 2025/01/19 01:13:04 tom Exp $
+# $Id: manhtml.aliases,v 1.47 2025/02/02 00:58:13 tom Exp $
 #***************************************************************************
 # Copyright 2019-2024,2025 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -73,6 +73,7 @@ initscr(3X)		curs_initscr(3X)
 is_cbreak(3X)		curs_inopts(3X)
 is_scrollok(3X)		curs_opaque(3X)
 killchar(3X)		curs_termattrs(3X)
+killwchar(3X)		curs_termattrs(3X)
 keyname(3X)		curs_util(3X)
 keypad(3X)		curs_inopts(3X)
 longname(3X)		curs_termattrs(3X)
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 2e0265efd..dceefcd47 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.77 2024/12/29 10:49:59 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.78 2025/02/01 22:09:10 tom Exp $)
 #
 ##############################################################################
-# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -203,6 +203,8 @@ cat >$ED4 <<EOF
 	s/^\(.*\) \(.*\) (\(.*\))\$/\1 call_\2 (\3)/
 	}
 s/\([^_]\)NCURSES_SP_NAME___\([a-zA-Z][a-zA-Z_]*\)/\1NCURSES_SP_NAME(\2)/g
+/call_NCURSES_SP_NAME/s,(0,(NULL,
+/call\(_NCURSES_SP_NAME\)\?_*\(delscreen\|ripoffline\|set_term\|vidputs\|vid_puts\)/s,0),NULL),
 EOF
 fi
 
@@ -443,6 +445,7 @@ BEGIN		{
 		print " */"
 		print "#define NCURSES_ATTR_T int"
 		print "#include <ncurses_cfg.h>"
+		print "#include <stdbool.h>"
 		print ""
 		print "#undef NCURSES_NOMACROS	/* _this_ file uses macros */"
 		print "#define NCURSES_NOMACROS 1"
@@ -480,15 +483,30 @@ END		{
 					sub(/^[0-9a-zA-Z_]+ /,"",value);
 					sub(/^[*][ \t]*/,"",value);
 					gsub("struct[ \t]*[0-9a-zA-Z_]+[ \t]*[*]","",value);
+					arg_l = index(value, "(");
+					arg_r = index(value, ")");
+					if ( arg_l > 0 && arg_r > arg_l + 1 ) {
+						args = substr(value, arg_l + 1, arg_r - arg_l - 1);
+						gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*[0-9a-zA-Z_]+/,"NULL",args);
+						gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",args);
+						value = substr(value,0,arg_l) args substr(value,arg_r);
+					}
 					gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*/,"",value);
 					gsub(/ (const) /," ",value);
-					gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
+					gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
 					gsub(/ void /,"",value);
 					sub(/^/,"call_",value);
 					gsub(/ (a[0-9]|z) /, " 0 ", value);
 					gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
+					if ( index(value, "call_NCURSES_SP_NAME") > 0 ) {
+						sub("0","NULL", value);
+					}
 					printf "    case %d: %s; break;\n", casenum++, value;
 				} else {
+					if ( index(value, "call_NCURSES_SP_NAME") > 0 ) {
+						printf "/* FIXME %s */\n", value;
+						sub("0","NULL", value);
+					}
 					print value;
 				}
 			}
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index df6090bbc..0bde81d14 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -160,7 +160,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.164 2025/01/12 10:51:43 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.165 2025/02/01 21:53:19 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
 
@@ -1338,7 +1338,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	 * is winning.
 	 */
 	else if (sscanf(buf, "t %d", &n) == 1) {
-	    float cumtime = 0.0, perchar;
+	    double cumtime = 0.0, perchar;
 	    int speeds[] =
 	    {2400, 9600, 14400, 19200, 28800, 38400, 0};
 
@@ -1384,14 +1384,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 		 * transmission both. Transmission time is an estimate
 		 * assuming 9 bits/char, 8 bits + 1 stop bit.
 		 */
-		float totalest = cumtime + xmits * 9 * 1e6 / speeds[i];
+		double totalest = cumtime + (double) xmits * 9 * 1e6 / speeds[i];
 
 		/*
 		 * Per-character optimization overhead in character transmits
 		 * at the current speed.  Round this to the nearest integer
 		 * to figure COMPUTE_OVERHEAD for the speed.
 		 */
-		float overhead = speeds[i] * perchar / 1e6;
+		double overhead = speeds[i] * perchar / 1e6;
 
 		(void)
 		    printf("%6d bps: %3.2f char-xmits overhead; total estimated time %15.2f\n",
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8cb963fb9..8fddd8955 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250125) unstable; urgency=low
+ncurses6td (6.5+20250201) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8cb963fb9..8fddd8955 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250125) unstable; urgency=low
+ncurses6td (6.5+20250201) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 5314f7d24..a89633801 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250125) unstable; urgency=low
+ncurses6td (6.5+20250201) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Jan 2025 15:34:16 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 384a665c3..8064d810b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.686 2025/01/24 20:34:16 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.687 2025/01/31 21:35:49 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0125"
+!define VERSION_MMDD  "0201"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index d3e23e751..e8289253a 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250125
+Release: 20250201
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 16f99b125..79caffbae 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250125
+Release: 20250201
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 3e77a41a8..6697c0297 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250125
+Release: 20250201
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 63db5c15485cc701d69b04c72d4399a070e2a544 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 9 Feb 2025 01:55:56 +0100
Subject: [PATCH 102/106] ncurses-6.5-20250208.patch.gz

---
 NEWS                             |   9 ++-
 VERSION                          |   2 +-
 c++/etip.h.in                    |  13 ++--
 dist.mk                          |   4 +-
 misc/terminfo.src                | 108 ++++++++++++++++++++++++-------
 ncurses/base/lib_mouse.c         |   8 +--
 ncurses/base/lib_set_term.c      |   9 ++-
 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/dump_entry.c               |  10 +--
 test/ditto.c                     |   8 +--
 test/filter.c                    |   6 +-
 test/redraw.c                    |   6 +-
 test/test_opaque.c               |  34 +++++++---
 19 files changed, 167 insertions(+), 72 deletions(-)

diff --git a/NEWS b/NEWS
index 313069459..d8c1280b7 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4239 2025/02/02 00:30:12 tom Exp $
+-- $Id: NEWS,v 1.4242 2025/02/08 23:54:37 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250208
+	+ change etip.h.in to include either/both of <new> and <exception>,
+	  needed for another old BSD.
+	+ update st (report by Alexander Kashpir) -TD
+	+ add note for ghostty 1.1.0 -TD
+	+ fix a few issues found with coverity.
+
 20250201
 	+ add <new> to the possible headers declaring the C++ std::bad_alloc
 	  (report by Carl Hansen).
diff --git a/VERSION b/VERSION
index dc3fc80ac..ed1d45143 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250201
+5:0:10	6.5	20250208
diff --git a/c++/etip.h.in b/c++/etip.h.in
index 139b45ea1..193c29875 100644
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: etip.h.in,v 1.54 2025/02/02 00:20:44 tom Exp $
+// $Id: etip.h.in,v 1.55 2025/02/08 23:39:52 tom Exp $
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
@@ -124,14 +124,17 @@
 #    endif
 #    undef exception
 #  endif
-#elif HAVE_EXCEPTION
-#  include <exception>
-#elif HAVE_NEW
-#  include <new>
 #elif defined (__SUNPRO_CC)
 #  include <generic.h>
 #endif
 
+#if HAVE_EXCEPTION
+# include <exception>
+#endif
+#if HAVE_NEW
+# include <new>
+#endif
+
 // This used to include <curses.h>, but Apple's configuration as of 2024
 // provides only a broken version of ncurses's header, which interferes
 // with the configure script.
diff --git a/dist.mk b/dist.mk
index 47e86fe2d..47e52dd09 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1653 2025/02/01 10:35:49 tom Exp $
+# $Id: dist.mk,v 1.1654 2025/02/08 11:01:51 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250201
+NCURSES_PATCH = 20250208
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index cffd49024..45b3c9c1d 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1163 $
-#	$Date: 2025/01/04 21:02:11 $
+#	$Revision: 1.1170 $
+#	$Date: 2025/02/08 21:27: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
@@ -635,7 +635,7 @@ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
 #	Parameter default value: Ps = 0
 #	With a parameter value not equal to 0, DA is used to identify the
 #	device which sends the DA.  The parameter value is a device type
-#	identification code according to a register which is to be established. 
+#	identification code according to a register which is to be established.
 #	If the parameter value is 0, DA is used to request an identifying DA
 #	from a device.
 #
@@ -3209,7 +3209,7 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 #   my faulty memory, and the following online sources and references:
 #
 # [1] "Three Scotts and a Duane" by Simson L. Garfinkel
-# http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
+# https://web.archive.org/web/20121019083801/http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
 #
 # [2] NeXTSTEP entry from Wikipedia, the free encyclopedia
 # https://secure.wikimedia.org/wikipedia/en/wiki/Nextstep
@@ -3642,7 +3642,7 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
 # NOTES:
 # with esctest:
 #	365 tests passed, 196 known bugs, 2 tests fail intermittently
-#	the known bugs include several of the cursor-movement tests 
+#	the known bugs include several of the cursor-movement tests
 #	the ED, EL tests include those failing intermittently
 #	DECCOLM, DECERA, DECSED, DECSERA and SPA do not work
 #	most of the DECRPM, DECRQSS reports fail
@@ -4023,7 +4023,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
 #	TN3270, TVI910, TVI925, Wyse 50/60, and ANSI.
 # Changes:
 #	Added ANSI sc/rc and REP in 2019/12/17
-#	Added TVI910/ TVI925 in 2019/11/20	
+#	Added TVI910/ TVI925 in 2019/11/20
 #
 # Default:
 #	Emulate "Xterm", using "ANSI with 256color"
@@ -4088,8 +4088,8 @@ scrt|securecrt|SecureCRT emulating xterm-256color,
 #	TERM=xterm
 #
 # vttest:
-#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS) 
-#	DA2: \E[>1;10;0c 
+#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS)
+#	DA2: \E[>1;10;0c
 #	However:
 #	+ NRCS tests do not work
 #	+ DECUDK test fails
@@ -5706,7 +5706,7 @@ xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode,
 # c) fsl ends the escape sequence begun by tsl.  Printable characters between
 #    those (probably) will appear in the window title.  Nonprintable characters
 #    may cause the escape sequence to end with an error.
-# d) the BEL (^G or \007) used in the original title-as-statusline came from 
+# d) the BEL (^G or \007) used in the original title-as-statusline came from
 #    David J. MacKenzie's "pseudo-color" entry in 20 Apr 1995.  At that time
 #    xterm used BEL as the string-terminator rather than ST (\E\\).  Either
 #    BEL or ST has worked since xterm patch #28 in 1996, but most uses of
@@ -6029,7 +6029,7 @@ xterm-pcolor|xterm with color used for highlights and status line,
 #	http://nion.modprobe.de/blog/archives/569-colored-manpages.html
 #	(blog posting by Nico Golde, June 24 2007)
 # archive:
-#	https://web-beta.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
+#	https://web.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
 # The comment hints where it started, but there are differences:
 #	Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor
 mostlike|manpages with color looking like most,
@@ -6858,7 +6858,6 @@ rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 	use=vt220+vtedit, use=xterm+nopcfkeys,
 
 # rxvt was originally "xvt", first announced in April 1993:
-#	http://www.krsaborio.net/linux-desktops/research/1993/0416.html
 #------------------------------------------------------------------------------
 # Article: 567 of comp.os.linux.announce
 # Path: pavo.csi.cam.ac.uk!warwick!uknet!pipex!uunet!zaphod.mps.ohio-state.edu!
@@ -7060,7 +7059,7 @@ hpterm-color|HP X11 terminal emulator with color,
 # This article does not cover the HP 46020A keyboard that is used by the Model
 # 217 and 237 computers.  For information on this keyboard read the article,
 # "The Series 300 ITE as System Console" found in the manual, HP-UX Concepts
-# and Tutorials, Vol.  7. 
+# and Tutorials, Vol.  7.
 #
 # Possibly:
 # http://bitsavers.trailing-edge.com/pdf/hp/9000_hpux/1986/97089-90042_198608_HP-UX_Concepts_and_Tutorials.pdf
@@ -7304,7 +7303,27 @@ mgr-linux|Mgr window with Linux keyboard,
 # st.suckless.org
 
 st|stterm|aka simpleterm,
-	use=st-0.8,
+	use=st-0.8.5,
+
+# Reviewed 0.9.2 (Debian testing package "stterm"):
+# Inspected source, saw nothing to change in terminfo.
+#
+# Reviewed 0.8.5 (Debian stable package "stterm"):
+# In tack,
+#	sends nothing for control- and alt-modifiers to function-keys
+#	does not support application-mode for numeric keypad
+# In vttest,
+#	identifies as a VT102
+#	SRM, DECTCEM and ECH work, but not DECSCA
+#	incomplete DECSCUSR, shapes work but no blinking cursor
+#	SD and SL work, but not SL or SR
+#	supports normal, button-event and any-event mouse
+#	focus events are unreliable
+# Other:
+#	supports xterm OSC 12, but not 112, so Cs applies but not Cr
+#	OSC allows ST \E\\ in addition to \007
+st-0.8.5|simpleterm 0.8.5,
+	Cs=\E]12;%p1%s\007, use=ansi+rep, use=st-0.8,
 
 # Reviewed 0.8.2:
 # In tack,
@@ -7922,7 +7941,7 @@ kitty+setal|set underline colors (nonstandard),
 #	otherwise few reports, except cursor-position and mouse and some dtterm
 #	VT520 cursor-movement works, except for left/right margins
 #	supports xterm/DECSCUSR, though default case in vttest does not blink
-#		Send: <27> [ 0 <32> q 
+#		Send: <27> [ 0 <32> q
 #		Text: The cursor should be a blinking rectangle
 #	partial support for xterm mouse any-event mode and button-event mode:
 #	+ does not report focus-in/focus-out
@@ -8235,7 +8254,7 @@ contour-direct|Contour terminal with direct colors,
 # However, it uses xterm as a standard:
 #
 #	We believe Ghostty is one of the most compliant terminal emulators
-#	available.  Terminal behavior is partially a de jure standard (i.e. 
+#	available.  Terminal behavior is partially a de jure standard (i.e.
 #	[ECMA-48](https://ecma-international.org/publications-and-standards/stand>
 #	but mostly a de facto standard as defined by popular terminal emulators
 #	worldwide.  Ghostty takes the approach that our behavior is defined by
@@ -8252,6 +8271,45 @@ contour-direct|Contour terminal with direct colors,
 # study xterm's source code closer than xterm's documentation.  The quote above
 # is the only mention of ECMA-48.
 #
+# ghostty 1.1.0 tested with Arch Linux:
+# -------------
+# The issue with vttest is repaired.  Other issues remain.  The reader may not
+# have noticed, but the ghostty developers disallow direct bug reports.
+# Quoting the developers:
+#
+#	https://github.com/ghostty-org/ghostty/issues/3558
+#	Users are not allowed to create Issues directly in this repository - we
+#	ask that you create a Discussion first.
+#	...
+#	Any Discussion which clearly identifies a problem in Ghostty and can be
+#	confirmed or reproduced will be converted to an Issue by a maintainer,
+#	so as a user finding a valid problem you don't do any extra work
+#	anyway.  Thank you.
+#
+# As a direct consequence, details and attribution in those "Discussion" notes
+# may be omitted, as in this instance.
+#
+# https://web.archive.org/web/20250124124041/https://github.com/ghostty-org/ghostty/issues/2542
+# ghostty #2542 Publish ghostty terminfo to ncurses terminal database
+# Opened October 30, 2024, this terminal description is mentioned December 31.
+#
+# https://web.archive.org/web/20250115170223/https://github.com/ghostty-org/ghostty/issues/4523
+# ghostty #4523 Renderers (Metal and OpenGL) should clip terminal if terminal
+#		grid size mismatches physical window
+# Opened January 3, 2025, with a note
+#	The only known way to trigger this is DECCOLM, so it's low priority
+#	since almost nothing uses this.  But notably vtetest uses this and it
+#	makes it appear like we perform much worse than we do.
+#
+# Issue #4523 does not mention the bug report (nor, as in some other instances
+# refer obliquely to a discussion on "Discord").  vttest sends a DECCOLM to
+# ensure that the screen is not in 132-column mode.  That is the case for the
+# testing reported.  If ghostty were implementing DECCOLM correctly, it would
+# not have decided that the screensize changed.  The fix in #4523 is a
+# workaround masking other potential issues.
+#
+# By the way, that should be "vttest" (there is no such program as "vtetest").
+#
 # ghostty 1.0.0 tested with Arch Linux:
 # -------------
 # tack:
@@ -8269,11 +8327,11 @@ contour-direct|Contour terminal with direct colors,
 # vttest:
 # - ghostty hangs in more than one menu, making it impossible to test more than
 #   a small part of the program.  In particular, these are untestable:
-#	1. Test of cursor movements 
+#	1. Test of cursor movements
 #	2. Test of screen features
 #	4. Test of double-sized characters
 # - ghostty has tabs (imitating gnome-terminal); when closing a tab with a
-#   running process (e.g., a hung vttest), ghostty does not prompt about the 
+#   running process (e.g., a hung vttest), ghostty does not prompt about the
 #   process to be killed.
 # - identifies as a "VT220 with color":
 #	<27> [ ? 6 2 ; 2 2 c
@@ -9083,8 +9141,8 @@ sun-cgsix|sun-ss5|Sun SparcStation 5 console,
 # incomplete manual page.  Presumably the intent was to document features of
 # shelltool not in wscons:
 #
-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
+#    https://web.archive.org/web/20230608051050/manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
+#    https://web.archive.org/web/20220520165933/manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
 #
 # The wscons manual page and the XView source show that it had no feature that
 # could be used in ncurses u6/u7/u8/u9 extensions.  Interesting, the XView
@@ -17946,7 +18004,7 @@ ha8686|Harris 8686,
 #
 # They're now (1998) a subsidiary of General Electric, operating under the
 # marque "GEC-Marconi Hazeltine" and doing military avionics.  Web page
-# at <http://www.gec.com/cpd/1ncpd.htm#1.55>.
+# at <https://web.archive.org/web/19990223214534/http://www.gec.com/cpd/1ncpd.htm#1.55>.
 #
 
 # Since <cuf1> is blank, when you want to erase something you
@@ -23465,8 +23523,8 @@ synertek|ktm|synertek380|Synertek KTM 3/80 tubeless terminal,
 # https://ub.fnwi.uva.nl/computermuseum/tab13215g.html
 #	This monochrome graphics terminal of TAB Products, California, is a DEC
 #	VT52/VT100/VT132 compatible alphanumeric terminal (TAB 132/15),
-#	factory-fitted with additional hardware for Tektronix 4010 emulation. 
-#	Also the terminal understands a selection of Tektronix 4027 commands. 
+#	factory-fitted with additional hardware for Tektronix 4010 emulation.
+#	Also the terminal understands a selection of Tektronix 4027 commands.
 tab132|tab|tab132-15|tab 132/15,
 	da, db,
 	OTdN@, lm#96,
@@ -27730,4 +27788,10 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
 #	+ add vt220+ufkeys, vt220+sfkeys
 #
+# 2025-02-03
+#	+ add note for ghostty 1.1.0 -TD
+#
+# 2025-02-08
+#	+ update st (report by Alexander Kashpir) -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 9f25ceb7e..92d3d5d63 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.206 2025/01/22 23:13:51 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.207 2025/02/08 12:16:37 tom Exp $")
 
 #include <tic.h>
 
@@ -1114,7 +1114,7 @@ decode_xterm_X10(SCREEN *sp, MEVENT * eventp)
 			    sp->_ifd,
 #endif
 			    kbuf + grabbed, (size_t) (MAX_KBUF - (int) grabbed));
-	if (res == -1)
+	if (res < 0)
 	    break;
     }
     _nc_set_read_thread(FALSE);
@@ -1162,7 +1162,7 @@ decode_xterm_1005(SCREEN *sp, MEVENT * eventp)
 			    sp->_ifd,
 #endif
 			    (kbuf + grabbed), (size_t) 1);
-	if (res == -1)
+	if (res < 0)
 	    break;
 	grabbed += (size_t) res;
 	if (grabbed > 1) {
@@ -1240,7 +1240,7 @@ read_SGR(const SCREEN *sp, SGR_DATA * result)
 			    sp->_ifd,
 #endif
 			    (kbuf + grabbed), (size_t) 1);
-	if (res == -1)
+	if (res < 0)
 	    break;
 	if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) {
 	    result->nerror++;
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 9eccdec5a..50c3425e1 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.193 2025/01/22 23:13:27 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.195 2025/02/08 15:54:53 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -331,10 +331,13 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
        slines, scolumns, (void *) output, filtered, slk_format));
 
-    assert(CURRENT_SCREEN == 0);	/* has been reset in newterm() ! */
+    /* CURRENT_SCREE is reset in newterm() */
+    if (CURRENT_SCREEN != NULL || slines <= 0 || scolumns <= 0)
+	returnCode(ERR);
 
 #if NCURSES_SP_FUNCS
-    assert(spp != 0);
+    if (spp == NULL)
+	returnCode(ERR);
     sp = *spp;
 
     if (!sp) {
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 8fddd8955..396f47b21 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250201) unstable; urgency=low
+ncurses6td (6.5+20250208) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 8fddd8955..396f47b21 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250201) unstable; urgency=low
+ncurses6td (6.5+20250208) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index a89633801..d7e513d1a 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250201) unstable; urgency=low
+ncurses6td (6.5+20250208) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 Jan 2025 16:35:49 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 8064d810b..0b56b2182 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.687 2025/01/31 21:35:49 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.688 2025/02/08 11:01:51 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0201"
+!define VERSION_MMDD  "0208"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e8289253a..9770d501c 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250201
+Release: 20250208
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 79caffbae..f4ef4658d 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250201
+Release: 20250208
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6697c0297..5e5374e5c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250201
+Release: 20250208
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 3618f8b33..e2206e812 100644
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 #include <termsort.h>		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.198 2024/12/07 22:06:39 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.199 2025/02/08 21:53:40 tom Exp $")
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
@@ -1209,10 +1209,10 @@ fmt_entry(TERMTYPE2 *tterm,
     } else if (tversion == V_AIX) {
 	if (VALID_STRING(acs_chars)) {
 	    bool box_ok = TRUE;
-	    const char *acstrans = "lqkxjmwuvtn";
+	    static const char acstrans[] = "lqkxjmwuvtn";
 	    const char *cp;
 	    const char *sp;
-	    char *tp, boxchars[11];
+	    char *tp, boxchars[sizeof(acstrans)];
 
 	    tp = boxchars;
 	    for (cp = acstrans; *cp; cp++) {
@@ -1224,7 +1224,7 @@ fmt_entry(TERMTYPE2 *tterm,
 		    break;
 		}
 	    }
-	    tp[0] = '\0';
+	    *tp = '\0';
 
 	    if (box_ok) {
 		char *tmp = _nc_tic_expand(boxchars,
diff --git a/test/ditto.c b/test/ditto.c
index bf2b930ab..874c43813 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.60 2024/12/07 23:02:27 tom Exp $
+ * $Id: ditto.c,v 1.61 2025/02/09 00:18:00 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -192,7 +192,7 @@ open_tty(char *path)
 	failed(path);
     printf("opened %s\n", path);
 #endif
-    assert(fp != 0);
+    assert(fp != NULL);
     return fp;
 }
 
@@ -432,7 +432,7 @@ main(int argc, char *argv[])
     if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL)
 	failed("calloc data");
 
-    assert(data != 0);
+    assert(data != NULL);
 
     for (j = 0; j < argc; j++) {
 	open_screen(&data[j], argv, argc, j);
diff --git a/test/filter.c b/test/filter.c
index 66c511025..a6bdd5305 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.41 2024/12/07 22:40:19 tom Exp $
+ * $Id: filter.c,v 1.42 2025/02/08 13:06:10 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -123,7 +123,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 	    if (first) {
 		getyx(stdscr, y, x);
 		first = FALSE;
-	    } else {
+	    } else if (limit > 0) {
 		int left = 0;
 
 		/*
diff --git a/test/redraw.c b/test/redraw.c
index 9605ac64c..446fa6e98 100644
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.19 2024/12/07 22:46:42 tom Exp $
+ * $Id: redraw.c,v 1.20 2025/02/09 00:18:18 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
@@ -85,7 +85,7 @@ test_redraw(WINDOW *win)
     int max_y, max_x;
     int beg_y, beg_x;
 
-    assert(win != 0);
+    assert(win != NULL);
 
     scrollok(win, TRUE);
     keypad(win, TRUE);
diff --git a/test/test_opaque.c b/test/test_opaque.c
index 65bd0bbc5..60e1c9757 100644
--- a/test/test_opaque.c
+++ b/test/test_opaque.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 2007-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_opaque.c,v 1.18 2024/12/07 22:46:42 tom Exp $
+ * $Id: test_opaque.c,v 1.19 2025/02/08 13:03:06 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -156,16 +156,34 @@ test_opaque_syncok(WINDOW *win, int mode)
     return is_syncok(win);
 }
 
+static int
+height_of(const WINDOW *win)
+{
+    int result = getmaxy(win);
+    if (result <= 0)
+	result = 1;
+    return result;
+}
+
+static int
+width_of(const WINDOW *win)
+{
+    int result = getmaxx(win);
+    if (result <= 0)
+	result = 1;
+    return result;
+}
+
 static int
 status_y(const WINDOW *stswin, int cell)
 {
-    return (cell % getmaxy(stswin));
+    return (cell % height_of(stswin));
 }
 
 static int
 status_x(const WINDOW *stswin, int cell)
 {
-    return (15 * (cell / getmaxy(stswin)));
+    return (15 * (cell / height_of(stswin)));
 }
 
 static void
@@ -289,8 +307,8 @@ test_opaque(int level, char **argv, WINDOW *stswin)
 	wnoutrefresh(txtbox);
 
 	txtwin = derwin(txtbox,
-			getmaxy(txtbox) - 2,
-			getmaxx(txtbox) - 2,
+			height_of(txtbox) - 2,
+			width_of(txtbox) - 2,
 			1, 1);
 	base_y = 0;
     } else {
@@ -365,7 +383,7 @@ test_opaque(int level, char **argv, WINDOW *stswin)
 		break;
 	    case KEY_DOWN:
 	    case 'j':
-		if (txt_y < getmaxy(txtwin) - 1)
+		if (txt_y < height_of(txtwin) - 1)
 		    txt_y++;
 		else
 		    beep();
@@ -386,7 +404,7 @@ test_opaque(int level, char **argv, WINDOW *stswin)
 		break;
 	    case KEY_RIGHT:
 	    case 'l':
-		if (txt_x < getmaxx(txtwin) - 1)
+		if (txt_x < width_of(txtwin) - 1)
 		    txt_x++;
 		else
 		    beep();

From 7b9fd6c43380e439ca5bfd924cc8dcfd1058b400 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 16 Feb 2025 02:13:59 +0100
Subject: [PATCH 103/106] ncurses-6.5-20250215.patch.gz

---
 NEWS                                       |   12 +-
 VERSION                                    |    2 +-
 aclocal.m4                                 |   12 +-
 configure                                  | 3904 ++++++++++----------
 dist.mk                                    |    4 +-
 doc/html/man/curs_attr.3x.html             |   12 +-
 doc/html/man/curs_bkgrnd.3x.html           |    8 +-
 doc/html/man/curs_get_wch.3x.html          |   47 +-
 doc/html/man/curs_get_wstr.3x.html         |   10 +-
 doc/html/man/curs_getch.3x.html            |   12 +-
 doc/html/man/curs_inch.3x.html             |   10 +-
 doc/html/man/curs_inchstr.3x.html          |   12 +-
 doc/html/man/curs_kernel.3x.html           |   12 +-
 doc/html/man/curs_legacy.3x.html           |   10 +-
 doc/html/man/curs_mouse.3x.html            |    8 +-
 doc/html/man/curs_opaque.3x.html           |   12 +-
 doc/html/man/curs_print.3x.html            |   10 +-
 doc/html/man/curs_terminfo.3x.html         |   10 +-
 doc/html/man/curs_threads.3x.html          |   12 +-
 doc/html/man/curs_util.3x.html             |   10 +-
 doc/html/man/form_field_validation.3x.html |   10 +-
 doc/html/man/infocmp.1m.html               |   10 +-
 doc/html/man/ncurses.3x.html               |    2 +-
 doc/html/man/tabs.1.html                   |   10 +-
 doc/html/man/terminfo.5.html               |    2 +-
 doc/html/man/toe.1m.html                   |   12 +-
 doc/html/man/tput.1.html                   |   10 +-
 include/Caps.uwin                          |    6 +-
 man/curs_attr.3x                           |    9 +-
 man/curs_bkgrnd.3x                         |   15 +-
 man/curs_get_wch.3x                        |    6 +-
 man/curs_get_wstr.3x                       |    6 +-
 man/curs_getch.3x                          |    6 +-
 man/curs_inch.3x                           |    5 +-
 man/curs_inchstr.3x                        |    6 +-
 man/curs_kernel.3x                         |    6 +-
 man/curs_legacy.3x                         |   17 +-
 man/curs_mouse.3x                          |    6 +-
 man/curs_opaque.3x                         |    6 +-
 man/curs_print.3x                          |   16 +-
 man/curs_terminfo.3x                       |    6 +-
 man/curs_threads.3x                        |    8 +-
 man/curs_util.3x                           |   24 +-
 man/form_field_validation.3x               |    6 +-
 man/infocmp.1m                             |    6 +-
 man/tabs.1                                 |    6 +-
 man/toe.1m                                 |    8 +-
 man/tput.1                                 |    6 +-
 misc/magic                                 |    9 +-
 misc/terminfo.src                          |   19 +-
 ncurses/base/lib_chgat.c                   |    7 +-
 ncurses/base/lib_mouse.c                   |    4 +-
 ncurses/base/lib_set_term.c                |   10 +-
 ncurses/tinfo/captoinfo.c                  |   54 +-
 ncurses/tinfo/lib_tparm.c                  |    6 +-
 ncurses/tinfo/lib_win32con.c               |    6 +-
 ncurses/trace/varargs.c                    |   30 +-
 ncurses/tty/hardscroll.c                   |    4 +-
 ncurses/tty/lib_tstp.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 +-
 package/ncursest.spec                      |    2 +-
 test/newdemo.c                             |    4 +-
 test/tclock.c                              |    4 +-
 test/test_tparm.c                          |    6 +-
 69 files changed, 2271 insertions(+), 2287 deletions(-)

diff --git a/NEWS b/NEWS
index d8c1280b7..e312d1772 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4242 2025/02/08 23:54:37 tom Exp $
+-- $Id: NEWS,v 1.4245 2025/02/16 00:19:24 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250215
+	+ add gzip option for suppressing filename/timestamp information to an
+	  overlooked case (cf: 20240330).
+	+ correct spelling errors found with codespell.
+	+ fix some typos in manpages (report by Sven Joachim)
+	+ amend change to lib_set_term.c to work with thread configuration
+	  (report by Rajeev Pillai, cf: 20250208).
+
 20250208
 	+ change etip.h.in to include either/both of <new> and <exception>,
 	  needed for another old BSD.
@@ -106,7 +114,7 @@ it is not possible to add this information.
 20241221
 	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
 	  lacks BSD-style \< and \>
-	+ trim padding from sgr expresion used in trim_sgr0, to avoid copying
+	+ trim padding from sgr expression used in trim_sgr0, to avoid copying
 	  the padding into the resulting sgr0 (report by Rajeev Pillai).
 	+ strict compiler-warning fixes for upcoming gcc15
 
diff --git a/VERSION b/VERSION
index ed1d45143..b3f4d132b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250208
+5:0:10	6.5	20250215
diff --git a/aclocal.m4 b/aclocal.m4
index 881791f2f..57f3d9823 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1101 2025/02/02 00:10:44 tom Exp $
+dnl $Id: aclocal.m4,v 1.1102 2025/02/16 00:15:17 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -598,7 +598,7 @@ AC_DEFUN([CF_AWK_BIG_PRINTF],
 	esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
+dnl CF_BOOL_DECL version: 10 updated: 2025/02/01 19:31:51
 dnl ------------
 dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
 dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
@@ -6034,7 +6034,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 60 updated: 2024/12/28 16:38:35
+dnl CF_MAN_PAGES version: 61 updated: 2025/02/15 19:13:25
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -6236,7 +6236,7 @@ CF_EOF
 if test -n "$cf_manpage_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 	if test "\$verb" = installing ; then
-	if ( "$cf_manpage_compress" -f \$TMP )
+	if ( "$cf_manpage_compress" $cf_manpage_coptions -f \$TMP )
 	then
 		mv \$TMP.$cf_manpage_so_strip \$TMP
 	fi
@@ -10041,7 +10041,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 15 updated: 2025/01/15 17:07:11
+dnl CF_WITH_VERSIONED_SYMS version: 16 updated: 2025/01/19 15:27:13
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
@@ -10090,11 +10090,13 @@ then
 		VERSIONED_SYMS="-Wl,--version-script,\${RESULTING_SYMS}"
 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\[$]{VERSIONED_SYMS} -Wl,%"`
 		CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
+		LIB_CREATE="[$]MK_SHARED_LIB"
 		;;
 	(*-dy\ *)
 		VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}"
 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\[$]{VERSIONED_SYMS} -dy%"`
 		CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
+		LIB_CREATE="[$]MK_SHARED_LIB"
 		;;
 	(*)
 		AC_MSG_WARN(this system does not support versioned-symbols)
diff --git a/configure b/configure
index 1e1ba3be5..bb7dcf9c8 100755
--- a/configure
+++ b/configure
@@ -7697,17 +7697,19 @@ then
 
 echo "${as_me:-configure}:7698: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
+		LIB_CREATE="$MK_SHARED_LIB"
 		;;
 	(*-dy\ *)
 		VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}"
 		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}:7706: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:7707: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
 
+		LIB_CREATE="$MK_SHARED_LIB"
 		;;
 	(*)
-		{ echo "$as_me:7710: WARNING: this system does not support versioned-symbols" >&5
+		{ echo "$as_me:7712: WARNING: this system does not support versioned-symbols" >&5
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 		;;
 	esac
@@ -7719,7 +7721,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
 	# symbols.
 	if test "x$VERSIONED_SYMS" != "x"
 	then
-		echo "$as_me:7722: checking if wildcards can be used to selectively omit symbols" >&5
+		echo "$as_me:7724: 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
 
@@ -7756,7 +7758,7 @@ local:
 } submodule_1.0;
 EOF
 		cat >conftest.$ac_ext <<EOF
-#line 7759 "configure"
+#line 7761 "configure"
 extern int _ismissing(void);    int _ismissing(void)  { return 1; }
 extern int _localf1(void);      int _localf1(void)    { return 1; }
 extern int _localf2(void);      int _localf2(void)    { return 2; }
@@ -7787,7 +7789,7 @@ EOF
 			cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ 	][DT][ 	]'`"
 			test -n "$cf_missing" && WILDCARD_SYMS=yes
 		fi
-		echo "$as_me:7790: result: $WILDCARD_SYMS" >&5
+		echo "$as_me:7792: result: $WILDCARD_SYMS" >&5
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
 		rm -f conftest.*
 	fi
@@ -7802,7 +7804,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
-echo "$as_me:7805: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:7807: 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.
@@ -7812,27 +7814,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
-echo "$as_me:7815: result: $with_gpm" >&5
+echo "$as_me:7817: result: $with_gpm" >&5
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7819: checking for gpm.h" >&5
+	echo "$as_me:7821: 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 7825 "configure"
+#line 7827 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
-if { (eval echo "$as_me:7829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7831: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7835: \$? = $ac_status" >&5
+  echo "$as_me:7837: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7851,7 +7853,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7854: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:7856: 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
 
@@ -7862,7 +7864,7 @@ EOF
 		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}:7865: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7867: testing assuming we really have GPM library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
@@ -7870,7 +7872,7 @@ EOF
 
 			with_gpm=yes
 		else
-			echo "$as_me:7873: checking for Gpm_Open in -lgpm" >&5
+			echo "$as_me:7875: 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
@@ -7878,7 +7880,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7881 "configure"
+#line 7883 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7897,16 +7899,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7903: \$? = $ac_status" >&5
+  echo "$as_me:7905: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7909: \$? = $ac_status" >&5
+  echo "$as_me:7911: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -7917,18 +7919,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7920: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7922: 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:7927: WARNING: Cannot link with GPM library" >&5
+					{ echo "$as_me:7929: WARNING: Cannot link with GPM library" >&5
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
 					with_gpm=no
 				else
-					{ { echo "$as_me:7931: error: Cannot link with GPM library" >&5
+					{ { echo "$as_me:7933: error: Cannot link with GPM library" >&5
 echo "$as_me: error: Cannot link with GPM library" >&2;}
    { (exit 1); exit 1; }; }
 				fi
@@ -7939,7 +7941,7 @@ fi
 
 else
 
-		test "$with_gpm" != maybe && { echo "$as_me:7942: WARNING: Cannot find GPM header" >&5
+		test "$with_gpm" != maybe && { echo "$as_me:7944: WARNING: Cannot find GPM header" >&5
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
 		with_gpm=no
 
@@ -7948,7 +7950,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
-	echo "$as_me:7951: checking if you want to load GPM dynamically" >&5
+	echo "$as_me:7953: 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.
@@ -7958,18 +7960,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
-	echo "$as_me:7961: result: $with_dlsym" >&5
+	echo "$as_me:7963: result: $with_dlsym" >&5
 echo "${ECHO_T}$with_dlsym" >&6
 	if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
-echo "$as_me:7966: checking for dlsym" >&5
+echo "$as_me:7968: 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 7972 "configure"
+#line 7974 "configure"
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8000,16 +8002,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8006: \$? = $ac_status" >&5
+  echo "$as_me:8008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8012: \$? = $ac_status" >&5
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -8019,14 +8021,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8022: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:8024: 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:8029: checking for dlsym in -ldl" >&5
+echo "$as_me:8031: 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
@@ -8034,7 +8036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8037 "configure"
+#line 8039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8053,16 +8055,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8059: \$? = $ac_status" >&5
+  echo "$as_me:8061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8065: \$? = $ac_status" >&5
+  echo "$as_me:8067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -8073,7 +8075,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8076: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:8078: 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
 
@@ -8102,10 +8104,10 @@ done
 LIBS="$cf_add_libs"
  }
 
-	echo "$as_me:8105: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:8107: 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 8108 "configure"
+#line 8110 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -8126,16 +8128,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8132: \$? = $ac_status" >&5
+  echo "$as_me:8134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8138: \$? = $ac_status" >&5
+  echo "$as_me:8140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -8146,15 +8148,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ { echo "$as_me:8149: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:8151: 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:8154: result: ok" >&5
+	echo "$as_me:8156: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:8157: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:8159: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8162,12 +8164,12 @@ fi
 		if test "x$with_gpm" != xyes ; then
 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
 
-echo "${as_me:-configure}:8165: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:8167: testing assuming soname for gpm is $with_gpm ..." 1>&5
 
 			cf_cv_gpm_soname="$with_gpm"
 		else
 
-echo "$as_me:8170: checking for soname of gpm library" >&5
+echo "$as_me:8172: 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
@@ -8201,15 +8203,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-	if { (eval echo "$as_me:8204: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8207: \$? = $ac_status" >&5
+  echo "$as_me:8209: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8212: \$? = $ac_status" >&5
+  echo "$as_me:8214: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -8220,7 +8222,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
-echo "$as_me:8223: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:8225: result: $cf_cv_gpm_soname" >&5
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
 		fi
@@ -8288,7 +8290,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
-echo "$as_me:8291: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:8293: 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
@@ -8296,7 +8298,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8299 "configure"
+#line 8301 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8315,16 +8317,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8321: \$? = $ac_status" >&5
+  echo "$as_me:8323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8327: \$? = $ac_status" >&5
+  echo "$as_me:8329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
@@ -8335,11 +8337,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8338: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:8340: 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:8342: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:8344: 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
@@ -8363,15 +8365,15 @@ CF_EOF
 	# to rely on the static library, noting that some packagers may not
 	# include it.
 	LIBS="-static -lgpm -dynamic $LIBS"
-	if { (eval echo "$as_me:8366: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:8368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8369: \$? = $ac_status" >&5
+  echo "$as_me:8371: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
-		if { (eval echo "$as_me:8371: \"$ac_link\"") >&5
+		if { (eval echo "$as_me:8373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8374: \$? = $ac_status" >&5
+  echo "$as_me:8376: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
@@ -8383,11 +8385,11 @@ CF_EOF
 fi
 
 fi
-echo "$as_me:8386: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:8388: 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:8390: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+	{ echo "$as_me:8392: 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
 
@@ -8395,7 +8397,7 @@ fi
 
 fi
 
-echo "$as_me:8398: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:8400: 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.
@@ -8404,7 +8406,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:8407: result: $with_pcre2" >&5
+echo "$as_me:8409: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -8415,17 +8417,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:8418: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:8420: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:8424: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:8426: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:8428: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:8430: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in $cf_with_pcre2
 do
@@ -8563,7 +8565,7 @@ else
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:8566: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:8568: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -8576,7 +8578,7 @@ EOF
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:8579: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:8581: 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
@@ -8584,7 +8586,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8587 "configure"
+#line 8589 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8603,16 +8605,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8609: \$? = $ac_status" >&5
+  echo "$as_me:8611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8615: \$? = $ac_status" >&5
+  echo "$as_me:8617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -8623,7 +8625,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8626: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:8628: 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
 
@@ -8644,7 +8646,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:8647: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:8649: 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
@@ -8652,7 +8654,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8655 "configure"
+#line 8657 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8671,16 +8673,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8677: \$? = $ac_status" >&5
+  echo "$as_me:8679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8683: \$? = $ac_status" >&5
+  echo "$as_me:8685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -8691,7 +8693,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8694: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:8696: 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
 
@@ -8712,7 +8714,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:8715: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:8717: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8727,23 +8729,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8730: checking for $ac_header" >&5
+echo "$as_me:8732: 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 8736 "configure"
+#line 8738 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8742: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8746: \$? = $ac_status" >&5
+  echo "$as_me:8748: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8762,7 +8764,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8765: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8767: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8775,13 +8777,13 @@ done
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8778: checking for $ac_func" >&5
+echo "$as_me:8780: 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 8784 "configure"
+#line 8786 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8812,16 +8814,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8818: \$? = $ac_status" >&5
+  echo "$as_me:8820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8824: \$? = $ac_status" >&5
+  echo "$as_me:8826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8831,7 +8833,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8834: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8836: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -8845,7 +8847,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:8848: checking if you want to use sysmouse" >&5
+echo "$as_me:8850: 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.
@@ -8857,7 +8859,7 @@ else
 fi;
 	if test "$cf_with_sysmouse" != no ; then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8860 "configure"
+#line 8862 "configure"
 #include "confdefs.h"
 
 #include <osreldate.h>
@@ -8880,16 +8882,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8886: \$? = $ac_status" >&5
+  echo "$as_me:8888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8892: \$? = $ac_status" >&5
+  echo "$as_me:8894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_with_sysmouse=yes
 else
@@ -8899,7 +8901,7 @@ cf_with_sysmouse=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	fi
-echo "$as_me:8902: result: $cf_with_sysmouse" >&5
+echo "$as_me:8904: result: $cf_with_sysmouse" >&5
 echo "${ECHO_T}$cf_with_sysmouse" >&6
 test "$cf_with_sysmouse" = yes &&
 cat >>confdefs.h <<\EOF
@@ -8909,7 +8911,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
-echo "$as_me:8912: checking if you want to disable library suffixes" >&5
+echo "$as_me:8914: 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.
@@ -8926,13 +8928,13 @@ else
 	disable_lib_suffixes=no
 
 fi;
-echo "$as_me:8929: result: $disable_lib_suffixes" >&5
+echo "$as_me:8931: 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:8935: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8937: 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.
@@ -8950,22 +8952,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:8953: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8955: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:8958: checking for updated LDFLAGS" >&5
+echo "$as_me:8960: 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:8961: result: maybe" >&5
+	echo "$as_me:8963: 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:8968: checking for $ac_word" >&5
+echo "$as_me:8970: 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
@@ -8980,7 +8982,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:8983: found $ac_dir/$ac_word" >&5
+echo "$as_me:8985: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8988,10 +8990,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:8991: result: $cf_ldd_prog" >&5
+  echo "$as_me:8993: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:8994: result: no" >&5
+  echo "$as_me:8996: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9005,7 +9007,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9008 "configure"
+#line 9010 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9017,16 +9019,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9023: \$? = $ac_status" >&5
+  echo "$as_me:9025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9029: \$? = $ac_status" >&5
+  echo "$as_me:9031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -9054,7 +9056,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:9057: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:9059: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -9066,11 +9068,11 @@ echo "${as_me:-configure}:9057: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9069: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9071: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9073: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9075: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -9107,7 +9109,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9110: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9112: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9120,11 +9122,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9123: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9125: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9127: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9129: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -9161,7 +9163,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:9164: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:9166: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -9174,14 +9176,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:9177: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:9179: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:9181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:9183: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:9184: result: no" >&5
+	echo "$as_me:9186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9195,7 +9197,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
-	echo "$as_me:9198: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+	echo "$as_me:9200: checking if you want to disable extra LDFLAGS for package-scripts" >&5
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
@@ -9212,7 +9214,7 @@ else
 	disable_pkg_ldflags=no
 
 fi;
-	echo "$as_me:9215: result: $disable_pkg_ldflags" >&5
+	echo "$as_me:9217: result: $disable_pkg_ldflags" >&5
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
@@ -9220,7 +9222,7 @@ fi
 ###############################################################################
 
 ###	use option --with-extra-suffix to append suffix to headers and libraries
-echo "$as_me:9223: checking for extra suffix to append to header/library paths" >&5
+echo "$as_me:9225: checking for extra suffix to append to header/library paths" >&5
 echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
@@ -9239,11 +9241,11 @@ if test "${with_extra_suffix+set}" = set; then
 	esac
 
 fi;
-echo "$as_me:9242: result: ${EXTRA_SUFFIX:-(none)}" >&5
+echo "$as_me:9244: result: ${EXTRA_SUFFIX:-(none)}" >&5
 echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
 
 ###	use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:9246: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:9248: 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.
@@ -9253,10 +9255,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
-echo "$as_me:9256: result: $with_overwrite" >&5
+echo "$as_me:9258: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 
-echo "$as_me:9259: checking if external terminfo-database is used" >&5
+echo "$as_me:9261: 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.
@@ -9266,7 +9268,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
-echo "$as_me:9269: result: $use_database" >&5
+echo "$as_me:9271: result: $use_database" >&5
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
@@ -9282,7 +9284,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
 	NCURSES_USE_DATABASE=1
 
-	echo "$as_me:9285: checking which terminfo source-file will be installed" >&5
+	echo "$as_me:9287: 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.
@@ -9290,10 +9292,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
-	echo "$as_me:9293: result: $TERMINFO_SRC" >&5
+	echo "$as_me:9295: result: $TERMINFO_SRC" >&5
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
-	echo "$as_me:9296: checking whether to use hashed database instead of directory/tree" >&5
+	echo "$as_me:9298: 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.
@@ -9303,13 +9305,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
-	echo "$as_me:9306: result: $with_hashed_db" >&5
+	echo "$as_me:9308: result: $with_hashed_db" >&5
 echo "${ECHO_T}$with_hashed_db" >&6
 else
 	with_hashed_db=no
 fi
 
-echo "$as_me:9312: checking for list of fallback terminal descriptions" >&5
+echo "$as_me:9314: checking for list of fallback terminal descriptions" >&5
 echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
@@ -9319,7 +9321,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
-echo "$as_me:9322: result: ${with_fallback:-(none)}" >&5
+echo "$as_me:9324: result: ${with_fallback:-(none)}" >&5
 echo "${ECHO_T}${with_fallback:-(none)}" >&6
 
 case ".$with_fallback" in
@@ -9327,7 +9329,7 @@ case ".$with_fallback" in
 	FALLBACK_LIST=
 	;;
 (.yes)
-	{ echo "$as_me:9330: WARNING: expected a list of terminal descriptions" >&5
+	{ echo "$as_me:9332: WARNING: expected a list of terminal descriptions" >&5
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
 	;;
 (*)
@@ -9343,7 +9345,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
-echo "$as_me:9346: checking for $ac_word" >&5
+echo "$as_me:9348: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9358,7 +9360,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
-echo "$as_me:9361: found $ac_dir/$ac_word" >&5
+echo "$as_me:9363: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9366,10 +9368,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
-  echo "$as_me:9369: result: $TIC" >&5
+  echo "$as_me:9371: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9372: result: no" >&5
+  echo "$as_me:9374: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9378,7 +9380,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:9381: checking for $ac_word" >&5
+echo "$as_me:9383: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9393,7 +9395,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
-echo "$as_me:9396: found $ac_dir/$ac_word" >&5
+echo "$as_me:9398: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9401,10 +9403,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
-  echo "$as_me:9404: result: $ac_ct_TIC" >&5
+  echo "$as_me:9406: result: $ac_ct_TIC" >&5
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
-  echo "$as_me:9407: result: no" >&5
+  echo "$as_me:9409: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9416,7 +9418,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
-echo "$as_me:9419: checking for $ac_word" >&5
+echo "$as_me:9421: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9431,7 +9433,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
-echo "$as_me:9434: found $ac_dir/$ac_word" >&5
+echo "$as_me:9436: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9439,10 +9441,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
-  echo "$as_me:9442: result: $INFOCMP" >&5
+  echo "$as_me:9444: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9445: result: no" >&5
+  echo "$as_me:9447: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9451,7 +9453,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
-echo "$as_me:9454: checking for $ac_word" >&5
+echo "$as_me:9456: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9466,7 +9468,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
-echo "$as_me:9469: found $ac_dir/$ac_word" >&5
+echo "$as_me:9471: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -9474,10 +9476,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
-  echo "$as_me:9477: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:9479: result: $ac_ct_INFOCMP" >&5
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
-  echo "$as_me:9480: result: no" >&5
+  echo "$as_me:9482: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9492,10 +9494,10 @@ 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:9495: checking for tic program for fallbacks" >&5
+  echo "$as_me:9497: checking for tic program for fallbacks" >&5
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
 		TIC=$withval
-		echo "$as_me:9498: result: $TIC" >&5
+		echo "$as_me:9500: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9521,7 +9523,7 @@ case "x$TIC" in
 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9524: error: expected a pathname, not \"$TIC\"" >&5
+	{ { echo "$as_me:9526: error: expected a pathname, not \"$TIC\"" >&5
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9534,7 +9536,7 @@ 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:9537: checking for $ac_word" >&5
+echo "$as_me:9539: 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
@@ -9551,7 +9553,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
-   echo "$as_me:9554: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9556: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9562,10 +9564,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
-  echo "$as_me:9565: result: $TIC" >&5
+  echo "$as_me:9567: result: $TIC" >&5
 echo "${ECHO_T}$TIC" >&6
 else
-  echo "$as_me:9568: result: no" >&5
+  echo "$as_me:9570: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9622,7 +9624,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9625: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9627: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
@@ -9637,7 +9639,7 @@ fi
 
 		if test -z "$TIC"
 		then
-			{ echo "$as_me:9640: WARNING: no tic program found for fallbacks" >&5
+			{ echo "$as_me:9642: WARNING: no tic program found for fallbacks" >&5
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
 		fi
 
@@ -9646,10 +9648,10 @@ 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:9649: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:9651: checking for infocmp program for fallbacks" >&5
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
 		INFOCMP=$withval
-		echo "$as_me:9652: result: $INFOCMP" >&5
+		echo "$as_me:9654: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
@@ -9675,7 +9677,7 @@ case "x$INFOCMP" in
 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9678: error: expected a pathname, not \"$INFOCMP\"" >&5
+	{ { echo "$as_me:9680: error: expected a pathname, not \"$INFOCMP\"" >&5
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9688,7 +9690,7 @@ 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:9691: checking for $ac_word" >&5
+echo "$as_me:9693: 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
@@ -9705,7 +9707,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
-   echo "$as_me:9708: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9710: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9716,10 +9718,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
-  echo "$as_me:9719: result: $INFOCMP" >&5
+  echo "$as_me:9721: result: $INFOCMP" >&5
 echo "${ECHO_T}$INFOCMP" >&6
 else
-  echo "$as_me:9722: result: no" >&5
+  echo "$as_me:9724: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9776,7 +9778,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:9779: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:9781: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
@@ -9791,7 +9793,7 @@ fi
 
 		if test -z "$INFOCMP"
 		then
-			{ echo "$as_me:9794: WARNING: no infocmp program found for fallbacks" >&5
+			{ echo "$as_me:9796: WARNING: no infocmp program found for fallbacks" >&5
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
 		fi
 
@@ -9801,7 +9803,7 @@ fi;
 	test -z "$INFOCMP" && FALLBACK_LIST=
 	if test -z "$FALLBACK_LIST"
 	then
-		{ echo "$as_me:9804: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+		{ echo "$as_me:9806: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
 	fi
 fi
@@ -9809,7 +9811,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
-echo "$as_me:9812: checking if you want modern xterm or antique" >&5
+echo "$as_me:9814: 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.
@@ -9823,7 +9825,7 @@ case "$with_xterm_new" in
 (no) with_xterm_new=xterm-old;;
 (*)	 with_xterm_new=xterm-new;;
 esac
-echo "$as_me:9826: result: $with_xterm_new" >&5
+echo "$as_me:9828: result: $with_xterm_new" >&5
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
@@ -9836,7 +9838,7 @@ case $host_os in
 	;;
 esac
 
-echo "$as_me:9839: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:9841: 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.
@@ -9860,13 +9862,13 @@ case x$with_xterm_kbs in
 	with_xterm_kbs=$withval
 	;;
 esac
-echo "$as_me:9863: result: $with_xterm_kbs" >&5
+echo "$as_me:9865: result: $with_xterm_kbs" >&5
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-	{ echo "$as_me:9869: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+	{ echo "$as_me:9871: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
 echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
 fi
 
@@ -9876,7 +9878,7 @@ if test "$use_database" = no ; then
 	MAKE_TERMINFO="#"
 else
 
-echo "$as_me:9879: checking for list of terminfo directories" >&5
+echo "$as_me:9881: 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.
@@ -9914,7 +9916,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9917: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:9919: 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; }; }
 	;;
@@ -9937,7 +9939,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-echo "$as_me:9940: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9942: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
@@ -9946,13 +9948,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
-	{ echo "$as_me:9949: WARNING: ignoring non-directory/file TERMINFO value" >&5
+	{ echo "$as_me:9951: 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:9955: checking for default terminfo directory" >&5
+echo "$as_me:9957: 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.
@@ -9986,7 +9988,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9989: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9991: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9995,7 +9997,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
-echo "$as_me:9998: result: $TERMINFO" >&5
+echo "$as_me:10000: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
@@ -10006,7 +10008,7 @@ fi
 
 ###	use option --disable-big-core to make tic run on small machines
 ###	We need 4Mb, check if we can allocate 50% more than that.
-echo "$as_me:10009: checking if big-core option selected" >&5
+echo "$as_me:10011: 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.
@@ -10018,7 +10020,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10021 "configure"
+#line 10023 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10032,15 +10034,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10038: \$? = $ac_status" >&5
+  echo "$as_me:10040: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10043: \$? = $ac_status" >&5
+  echo "$as_me:10045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_big_core=yes
 else
@@ -10052,7 +10054,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi;
-echo "$as_me:10055: result: $with_big_core" >&5
+echo "$as_me:10057: result: $with_big_core" >&5
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10062,7 +10064,7 @@ EOF
 ### 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:10065: checking if big-strings option selected" >&5
+echo "$as_me:10067: 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.
@@ -10086,14 +10088,14 @@ else
 	esac
 
 fi;
-echo "$as_me:10089: result: $with_big_strings" >&5
+echo "$as_me:10091: 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:10096: checking if you want termcap-fallback support" >&5
+echo "$as_me:10098: 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.
@@ -10103,14 +10105,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
-echo "$as_me:10106: result: $with_termcap" >&5
+echo "$as_me:10108: 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:10113: error: You have disabled the database w/o specifying fallbacks" >&5
+			{ { echo "$as_me:10115: 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
@@ -10123,13 +10125,13 @@ EOF
 else
 
 	if test "$with_ticlib" != no ; then
-		{ { echo "$as_me:10126: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+		{ { echo "$as_me:10128: 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:10132: checking for list of termcap files" >&5
+	echo "$as_me:10134: 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.
@@ -10167,7 +10169,7 @@ case "x$cf_src_path" in
 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10170: error: expected a pathname, not \"$cf_src_path\"" >&5
+	{ { echo "$as_me:10172: 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; }; }
 	;;
@@ -10190,7 +10192,7 @@ case "x$cf_dst_eval" in
 	;;
 esac
 
-	echo "$as_me:10193: result: $TERMPATH" >&5
+	echo "$as_me:10195: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
 	test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
@@ -10198,7 +10200,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
-	echo "$as_me:10201: checking if fast termcap-loader is needed" >&5
+	echo "$as_me:10203: 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.
@@ -10208,14 +10210,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
-	echo "$as_me:10211: result: $with_getcap" >&5
+	echo "$as_me:10213: 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:10218: checking if translated termcaps will be cached in ~/.terminfo" >&5
+	echo "$as_me:10220: 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.
@@ -10225,7 +10227,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
-	echo "$as_me:10228: result: $with_getcap_cache" >&5
+	echo "$as_me:10230: result: $with_getcap_cache" >&5
 echo "${ECHO_T}$with_getcap_cache" >&6
 	test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
@@ -10235,7 +10237,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:10238: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:10240: 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.
@@ -10245,14 +10247,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
-echo "$as_me:10248: result: $with_home_terminfo" >&5
+echo "$as_me:10250: 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:10255: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:10257: checking if you want to permit root to use ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
@@ -10262,14 +10264,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
-echo "$as_me:10265: result: $with_root_environ" >&5
+echo "$as_me:10267: result: $with_root_environ" >&5
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
-echo "$as_me:10272: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:10274: checking if you want to permit setuid programs to access all files" >&5
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-access or --disable-root-access was given.
@@ -10279,14 +10281,14 @@ if test "${enable_root_access+set}" = set; then
 else
   with_root_access=yes
 fi;
-echo "$as_me:10282: result: $with_root_access" >&5
+echo "$as_me:10284: result: $with_root_access" >&5
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ACCESS 1
 EOF
 
-echo "$as_me:10289: checking if you want to permit setuid use of ncurses environment variables" >&5
+echo "$as_me:10291: checking if you want to permit setuid use of ncurses environment variables" >&5
 echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
@@ -10296,7 +10298,7 @@ if test "${enable_setuid_environ+set}" = set; then
 else
   with_setuid_environ=$with_root_environ
 fi;
-echo "$as_me:10299: result: $with_setuid_environ" >&5
+echo "$as_me:10301: result: $with_setuid_environ" >&5
 echo "${ECHO_T}$with_setuid_environ" >&6
 test "x$with_setuid_environ" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10311,23 +10313,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10314: checking for $ac_header" >&5
+echo "$as_me:10316: 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 10320 "configure"
+#line 10322 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10324: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10326: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10330: \$? = $ac_status" >&5
+  echo "$as_me:10332: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10346,7 +10348,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10351: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10361,13 +10363,13 @@ for ac_func in \
 	unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10364: checking for $ac_func" >&5
+echo "$as_me:10366: 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 10370 "configure"
+#line 10372 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10398,16 +10400,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10404: \$? = $ac_status" >&5
+  echo "$as_me:10406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10410: \$? = $ac_status" >&5
+  echo "$as_me:10412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10417,7 +10419,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10420: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10422: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10434,13 +10436,13 @@ for ac_func in \
 		symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10437: checking for $ac_func" >&5
+echo "$as_me:10439: 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 10443 "configure"
+#line 10445 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10471,16 +10473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10477: \$? = $ac_status" >&5
+  echo "$as_me:10479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10483: \$? = $ac_status" >&5
+  echo "$as_me:10485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10490,7 +10492,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10493: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10495: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10501,7 +10503,7 @@ fi
 done
 
 else
-	echo "$as_me:10504: checking if link/symlink functions work" >&5
+	echo "$as_me:10506: 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
@@ -10514,7 +10516,7 @@ else
 			eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10517 "configure"
+#line 10519 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10548,15 +10550,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10554: \$? = $ac_status" >&5
+  echo "$as_me:10556: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10559: \$? = $ac_status" >&5
+  echo "$as_me:10561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -10574,7 +10576,7 @@ fi
 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
-echo "$as_me:10577: result: $cf_cv_link_funcs" >&5
+echo "$as_me:10579: result: $cf_cv_link_funcs" >&5
 echo "${ECHO_T}$cf_cv_link_funcs" >&6
 	test "$ac_cv_func_link"    = yes &&
 cat >>confdefs.h <<\EOF
@@ -10594,7 +10596,7 @@ with_symlinks=no
 # 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:10597: checking if tic should use symbolic links" >&5
+	echo "$as_me:10599: 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.
@@ -10604,21 +10606,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
-	echo "$as_me:10607: result: $with_symlinks" >&5
+	echo "$as_me:10609: 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:10614: checking if tic should use hard links" >&5
+	echo "$as_me:10616: 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:10621: result: $with_links" >&5
+	echo "$as_me:10623: result: $with_links" >&5
 echo "${ECHO_T}$with_links" >&6
 fi
 
@@ -10634,7 +10636,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
-echo "$as_me:10637: checking if you want broken-linker support code" >&5
+echo "$as_me:10639: 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.
@@ -10644,7 +10646,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
-echo "$as_me:10647: result: $with_broken_linker" >&5
+echo "$as_me:10649: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
@@ -10658,7 +10660,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:10661: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:10663: 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.
@@ -10668,7 +10670,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
-echo "$as_me:10671: result: $with_bsdpad" >&5
+echo "$as_me:10673: result: $with_bsdpad" >&5
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -10687,14 +10689,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
-echo "$as_me:10690: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:10692: 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 10697 "configure"
+#line 10699 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10713,16 +10715,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10719: \$? = $ac_status" >&5
+  echo "$as_me:10721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10725: \$? = $ac_status" >&5
+  echo "$as_me:10727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -10733,7 +10735,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10736: result: $cf_cv_posix_visible" >&5
+echo "$as_me:10738: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -10775,14 +10777,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:10778: checking if this is the GNU C library" >&5
+echo "$as_me:10780: 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 10785 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10801,16 +10803,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10807: \$? = $ac_status" >&5
+  echo "$as_me:10809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10813: \$? = $ac_status" >&5
+  echo "$as_me:10815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -10821,7 +10823,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10824: result: $cf_cv_gnu_library" >&5
+echo "$as_me:10826: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -10829,7 +10831,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# 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:10832: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:10834: 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
@@ -10841,7 +10843,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 10844 "configure"
+#line 10846 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10860,16 +10862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10866: \$? = $ac_status" >&5
+  echo "$as_me:10868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10872: \$? = $ac_status" >&5
+  echo "$as_me:10874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -10881,12 +10883,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:10884: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:10886: 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:10889: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:10891: 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
@@ -10991,7 +10993,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10994 "configure"
+#line 10996 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11011,16 +11013,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11017: \$? = $ac_status" >&5
+  echo "$as_me:11019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11023: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11031,7 +11033,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11034: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11036: 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
@@ -11040,14 +11042,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11043: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11045: 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 11050 "configure"
+#line 11052 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11062,16 +11064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11068: \$? = $ac_status" >&5
+  echo "$as_me:11070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11074: \$? = $ac_status" >&5
+  echo "$as_me:11076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11178,7 +11180,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11181 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11193,16 +11195,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11199: \$? = $ac_status" >&5
+  echo "$as_me:11201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11205: \$? = $ac_status" >&5
+  echo "$as_me:11207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11217,12 +11219,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11220: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11222: 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:11225: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11227: 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
@@ -11232,7 +11234,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11235 "configure"
+#line 11237 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11247,16 +11249,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11253: \$? = $ac_status" >&5
+  echo "$as_me:11255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11259: \$? = $ac_status" >&5
+  echo "$as_me:11261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11267,7 +11269,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11270: result: $cf_cv_default_source" >&5
+echo "$as_me:11272: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11307,16 +11309,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11310: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11312: 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}:11316: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11318: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11319 "configure"
+#line 11321 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11331,16 +11333,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11337: \$? = $ac_status" >&5
+  echo "$as_me:11339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11343: \$? = $ac_status" >&5
+  echo "$as_me:11345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11361,7 +11363,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11364 "configure"
+#line 11366 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11376,16 +11378,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11382: \$? = $ac_status" >&5
+  echo "$as_me:11384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11388: \$? = $ac_status" >&5
+  echo "$as_me:11390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11396,7 +11398,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11399: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11401: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11404,10 +11406,10 @@ echo "${as_me:-configure}:11399: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11407: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11409: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11410 "configure"
+#line 11412 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11422,16 +11424,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11428: \$? = $ac_status" >&5
+  echo "$as_me:11430: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11434: \$? = $ac_status" >&5
+  echo "$as_me:11436: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11447,7 +11449,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11450: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11452: 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
@@ -11564,7 +11566,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:11567: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:11569: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -11596,14 +11598,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:11599: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11601: 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 11606 "configure"
+#line 11608 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11621,16 +11623,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11627: \$? = $ac_status" >&5
+  echo "$as_me:11629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11633: \$? = $ac_status" >&5
+  echo "$as_me:11635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11642,7 +11644,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11645 "configure"
+#line 11647 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11660,16 +11662,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11666: \$? = $ac_status" >&5
+  echo "$as_me:11668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11672: \$? = $ac_status" >&5
+  echo "$as_me:11674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11684,7 +11686,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11687: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11689: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -11844,16 +11846,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11847: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11849: 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}:11853: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11855: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11856 "configure"
+#line 11858 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11868,16 +11870,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11874: \$? = $ac_status" >&5
+  echo "$as_me:11876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11880: \$? = $ac_status" >&5
+  echo "$as_me:11882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11898,7 +11900,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11901 "configure"
+#line 11903 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11913,16 +11915,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11919: \$? = $ac_status" >&5
+  echo "$as_me:11921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11925: \$? = $ac_status" >&5
+  echo "$as_me:11927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11933,7 +11935,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:11936: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11938: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11941,10 +11943,10 @@ echo "${as_me:-configure}:11936: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11944: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11946: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11947 "configure"
+#line 11949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11959,16 +11961,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11965: \$? = $ac_status" >&5
+  echo "$as_me:11967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11971: \$? = $ac_status" >&5
+  echo "$as_me:11973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11984,7 +11986,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11987: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11989: 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
@@ -12097,10 +12099,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12100: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12102: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12103 "configure"
+#line 12105 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12118,23 +12120,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12124: \$? = $ac_status" >&5
+  echo "$as_me:12126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12130: \$? = $ac_status" >&5
+  echo "$as_me:12132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12137: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12139: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12157,7 +12159,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12160: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12162: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12169,7 +12171,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12172: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12174: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12257,7 +12259,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12260: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12262: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12267,7 +12269,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12270: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12272: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12277,7 +12279,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12280: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12282: 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"
@@ -12289,10 +12291,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12292: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12294: 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 12295 "configure"
+#line 12297 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12307,16 +12309,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12313: \$? = $ac_status" >&5
+  echo "$as_me:12315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12319: \$? = $ac_status" >&5
+  echo "$as_me:12321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12325,12 +12327,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12328: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12330: 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 12333 "configure"
+#line 12335 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12345,16 +12347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12351: \$? = $ac_status" >&5
+  echo "$as_me:12353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12357: \$? = $ac_status" >&5
+  echo "$as_me:12359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12365,19 +12367,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12368: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12370: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12373: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12375: 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 12380 "configure"
+#line 12382 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12395,16 +12397,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12401: \$? = $ac_status" >&5
+  echo "$as_me:12403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12407: \$? = $ac_status" >&5
+  echo "$as_me:12409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12416,7 +12418,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12419 "configure"
+#line 12421 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12434,16 +12436,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12440: \$? = $ac_status" >&5
+  echo "$as_me:12442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12446: \$? = $ac_status" >&5
+  echo "$as_me:12448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12458,7 +12460,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12461: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12463: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12609,14 +12611,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
-echo "$as_me:12612: checking if SIGWINCH is defined" >&5
+echo "$as_me:12614: 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 12619 "configure"
+#line 12621 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12631,23 +12633,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12637: \$? = $ac_status" >&5
+  echo "$as_me:12639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12643: \$? = $ac_status" >&5
+  echo "$as_me:12645: \$? = $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 12650 "configure"
+#line 12652 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12665,16 +12667,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12677: \$? = $ac_status" >&5
+  echo "$as_me:12679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12688,11 +12690,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12691: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12693: 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:12695: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12697: 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
@@ -12703,7 +12705,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12706 "configure"
+#line 12708 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12725,16 +12727,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12728: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12731: \$? = $ac_status" >&5
+  echo "$as_me:12733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12737: \$? = $ac_status" >&5
+  echo "$as_me:12739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12748,7 +12750,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12751: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12753: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12758,13 +12760,13 @@ fi
 
 # Checks for CODESET support.
 
-echo "$as_me:12761: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:12763: 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 12767 "configure"
+#line 12769 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12778,16 +12780,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12784: \$? = $ac_status" >&5
+  echo "$as_me:12786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12790: \$? = $ac_status" >&5
+  echo "$as_me:12792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -12798,7 +12800,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12801: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:12803: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -12812,7 +12814,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
-echo "$as_me:12815: checking if you want wide-character code" >&5
+echo "$as_me:12817: 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.
@@ -12822,7 +12824,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=$cf_dft_widec
 fi;
-echo "$as_me:12825: result: $with_widec" >&5
+echo "$as_me:12827: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
@@ -12844,7 +12846,7 @@ EOF
 	(*_XOPEN_SOURCE=*)
 		;;
 	(*)
-		{ echo "$as_me:12847: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+		{ echo "$as_me:12849: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
@@ -12857,23 +12859,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12860: checking for $ac_header" >&5
+echo "$as_me:12862: 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 12866 "configure"
+#line 12868 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12870: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12872: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12876: \$? = $ac_status" >&5
+  echo "$as_me:12878: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12892,7 +12894,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12895: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12897: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12902,14 +12904,14 @@ EOF
 fi
 done
 
-echo "$as_me:12905: checking if wchar.h can be used as is" >&5
+echo "$as_me:12907: 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 12912 "configure"
+#line 12914 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12931,16 +12933,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12937: \$? = $ac_status" >&5
+  echo "$as_me:12939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12943: \$? = $ac_status" >&5
+  echo "$as_me:12945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_h_okay=yes
 else
@@ -12950,16 +12952,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:12953: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12955: 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:12959: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12961: 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 12962 "configure"
+#line 12964 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -12975,16 +12977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12981: \$? = $ac_status" >&5
+  echo "$as_me:12983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12987: \$? = $ac_status" >&5
+  echo "$as_me:12989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -12993,16 +12995,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:12996: result: $cf_result" >&5
+echo "$as_me:12998: 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:13002: checking checking for compatible value versus " >&5
+	echo "$as_me:13004: 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 13005 "configure"
+#line 13007 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -13018,16 +13020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13024: \$? = $ac_status" >&5
+  echo "$as_me:13026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13030: \$? = $ac_status" >&5
+  echo "$as_me:13032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -13036,7 +13038,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13039: result: $cf_result" >&5
+	echo "$as_me:13041: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = no ; then
 		# perhaps we can override it - try...
@@ -13046,7 +13048,7 @@ fi
 
 fi
 
-echo "$as_me:13049: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:13051: 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
@@ -13117,7 +13119,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 13120 "configure"
+#line 13122 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13162,15 +13164,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:13165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13168: \$? = $ac_status" >&5
+  echo "$as_me:13170: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:13170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13173: \$? = $ac_status" >&5
+  echo "$as_me:13175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
@@ -13183,7 +13185,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:13186: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:13188: result: $cf_cv_wcwidth_graphics" >&5
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
@@ -13194,13 +13196,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob wmemchr 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:13197: checking for $ac_func" >&5
+echo "$as_me:13199: 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 13203 "configure"
+#line 13205 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13231,16 +13233,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13237: \$? = $ac_status" >&5
+  echo "$as_me:13239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13243: \$? = $ac_status" >&5
+  echo "$as_me:13245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13250,7 +13252,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13253: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:13255: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13265,23 +13267,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13268: checking for $ac_header" >&5
+echo "$as_me:13270: 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 13274 "configure"
+#line 13276 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13278: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13280: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13284: \$? = $ac_status" >&5
+  echo "$as_me:13286: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13300,7 +13302,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13303: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -13310,7 +13312,7 @@ EOF
 fi
 done
 
-echo "$as_me:13313: checking for multibyte character support" >&5
+echo "$as_me:13315: 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
@@ -13318,7 +13320,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13321 "configure"
+#line 13323 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13335,16 +13337,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13341: \$? = $ac_status" >&5
+  echo "$as_me:13343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13347: \$? = $ac_status" >&5
+  echo "$as_me:13349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -13356,12 +13358,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:13359: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13361: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13364 "configure"
+#line 13366 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13374,16 +13376,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13380: \$? = $ac_status" >&5
+  echo "$as_me:13382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13386: \$? = $ac_status" >&5
+  echo "$as_me:13388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13397,7 +13399,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13400 "configure"
+#line 13402 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13410,16 +13412,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13416: \$? = $ac_status" >&5
+  echo "$as_me:13418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13422: \$? = $ac_status" >&5
+  echo "$as_me:13424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -13436,9 +13438,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:13439: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:13441: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:13441: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13443: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13529,7 +13531,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13532: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13534: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13537,7 +13539,7 @@ echo "${as_me:-configure}:13532: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13540 "configure"
+#line 13542 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13550,21 +13552,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13556: \$? = $ac_status" >&5
+  echo "$as_me:13558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13562: \$? = $ac_status" >&5
+  echo "$as_me:13564: \$? = $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}:13567: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13569: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13582,7 +13584,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:13585: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:13587: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13657,13 +13659,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:13660: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13662: 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 13666 "configure"
+#line 13668 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -13676,21 +13678,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13682: \$? = $ac_status" >&5
+  echo "$as_me:13684: \$? = $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:13687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13688: \$? = $ac_status" >&5
+  echo "$as_me:13690: \$? = $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}:13693: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:13695: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -13732,7 +13734,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13735: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:13737: 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
@@ -13770,7 +13772,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13773 "configure"
+#line 13775 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13782,16 +13784,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13788: \$? = $ac_status" >&5
+  echo "$as_me:13790: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13794: \$? = $ac_status" >&5
+  echo "$as_me:13796: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13808,7 +13810,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13811: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13813: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13844,7 +13846,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13847: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13849: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13876,14 +13878,14 @@ fi
 	fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:13879: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13881: 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 13886 "configure"
+#line 13888 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13901,23 +13903,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13907: \$? = $ac_status" >&5
+  echo "$as_me:13909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13913: \$? = $ac_status" >&5
+  echo "$as_me:13915: \$? = $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 13920 "configure"
+#line 13922 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13936,16 +13938,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13942: \$? = $ac_status" >&5
+  echo "$as_me:13944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13948: \$? = $ac_status" >&5
+  echo "$as_me:13950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13957,7 +13959,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:13960: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13962: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13975,14 +13977,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:13978: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13980: 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 13985 "configure"
+#line 13987 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14000,23 +14002,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14006: \$? = $ac_status" >&5
+  echo "$as_me:14008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14012: \$? = $ac_status" >&5
+  echo "$as_me:14014: \$? = $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 14019 "configure"
+#line 14021 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14035,16 +14037,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14041: \$? = $ac_status" >&5
+  echo "$as_me:14043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14047: \$? = $ac_status" >&5
+  echo "$as_me:14049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -14056,7 +14058,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14059: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14061: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -14079,14 +14081,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:14082: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14084: 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 14089 "configure"
+#line 14091 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14104,23 +14106,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14110: \$? = $ac_status" >&5
+  echo "$as_me:14112: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14116: \$? = $ac_status" >&5
+  echo "$as_me:14118: \$? = $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 14123 "configure"
+#line 14125 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14139,16 +14141,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14145: \$? = $ac_status" >&5
+  echo "$as_me:14147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14151: \$? = $ac_status" >&5
+  echo "$as_me:14153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -14160,7 +14162,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:14163: result: $cf_cv_wint_t" >&5
+echo "$as_me:14165: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -14192,7 +14194,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
-echo "$as_me:14195: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:14197: 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.
@@ -14202,7 +14204,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
-echo "$as_me:14205: result: $with_lp64" >&5
+echo "$as_me:14207: result: $with_lp64" >&5
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
@@ -14218,7 +14220,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:14221: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:14223: 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
@@ -14230,7 +14232,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 14233 "configure"
+#line 14235 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14250,16 +14252,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14256: \$? = $ac_status" >&5
+  echo "$as_me:14258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14262: \$? = $ac_status" >&5
+  echo "$as_me:14264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14269,16 +14271,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14275: \$? = $ac_status" >&5
+  echo "$as_me:14277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14281: \$? = $ac_status" >&5
+  echo "$as_me:14283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -14292,13 +14294,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:14295: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:14297: 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:14301: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:14303: 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
@@ -14306,7 +14308,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14309 "configure"
+#line 14311 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14326,16 +14328,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14332: \$? = $ac_status" >&5
+  echo "$as_me:14334: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14338: \$? = $ac_status" >&5
+  echo "$as_me:14340: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14344,7 +14346,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14347 "configure"
+#line 14349 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -14365,16 +14367,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14371: \$? = $ac_status" >&5
+  echo "$as_me:14373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14377: \$? = $ac_status" >&5
+  echo "$as_me:14379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -14385,7 +14387,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14388: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14390: 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
 
@@ -14395,7 +14397,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:14398: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14400: 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
@@ -14403,7 +14405,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14406 "configure"
+#line 14408 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -14423,16 +14425,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14429: \$? = $ac_status" >&5
+  echo "$as_me:14431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14435: \$? = $ac_status" >&5
+  echo "$as_me:14437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14441,7 +14443,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14444 "configure"
+#line 14446 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -14462,16 +14464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14468: \$? = $ac_status" >&5
+  echo "$as_me:14470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14474: \$? = $ac_status" >&5
+  echo "$as_me:14476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -14482,7 +14484,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14485: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14487: 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
 
@@ -14495,7 +14497,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:14498: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:14500: 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
@@ -14503,7 +14505,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14506 "configure"
+#line 14508 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -14518,16 +14520,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14524: \$? = $ac_status" >&5
+  echo "$as_me:14526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14530: \$? = $ac_status" >&5
+  echo "$as_me:14532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -14536,7 +14538,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14539 "configure"
+#line 14541 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -14552,16 +14554,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14558: \$? = $ac_status" >&5
+  echo "$as_me:14560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14564: \$? = $ac_status" >&5
+  echo "$as_me:14566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -14572,7 +14574,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:14575: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14577: 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
 
@@ -14586,13 +14588,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:14589: checking for fseeko" >&5
+echo "$as_me:14591: 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 14595 "configure"
+#line 14597 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -14606,16 +14608,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14612: \$? = $ac_status" >&5
+  echo "$as_me:14614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14618: \$? = $ac_status" >&5
+  echo "$as_me:14620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -14625,7 +14627,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14628: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14630: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -14664,14 +14666,14 @@ fi
 
 	fi
 
-	echo "$as_me:14667: checking whether to use struct dirent64" >&5
+	echo "$as_me:14669: 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 14674 "configure"
+#line 14676 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -14698,16 +14700,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14704: \$? = $ac_status" >&5
+  echo "$as_me:14706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14710: \$? = $ac_status" >&5
+  echo "$as_me:14712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -14718,7 +14720,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:14721: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14723: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -14728,7 +14730,7 @@ EOF
 	fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:14731: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:14733: 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.
@@ -14738,14 +14740,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
-echo "$as_me:14741: result: $with_tparm_varargs" >&5
+echo "$as_me:14743: 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:14748: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:14750: 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.
@@ -14755,14 +14757,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
-echo "$as_me:14758: result: $with_tic_depends" >&5
+echo "$as_me:14760: result: $with_tic_depends" >&5
 echo "${ECHO_T}$with_tic_depends" >&6
 else
 	with_tic_depends=no
 fi
 
 ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
-echo "$as_me:14765: checking if you want to enable wattr* macros" >&5
+echo "$as_me:14767: checking if you want to enable wattr* macros" >&5
 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
@@ -14774,15 +14776,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
 	NCURSES_WATTR_MACROS=0
-	echo "$as_me:14777: result: no" >&5
+	echo "$as_me:14779: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
 	NCURSES_WATTR_MACROS=1
-	echo "$as_me:14781: result: yes" >&5
+	echo "$as_me:14783: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:14785: checking for X11 rgb file" >&5
+echo "$as_me:14787: 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.
@@ -14844,7 +14846,7 @@ case "x$cf_path" in
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:14847: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:14849: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14852,7 +14854,7 @@ esac
 
 fi
 
-echo "$as_me:14855: result: $RGB_PATH" >&5
+echo "$as_me:14857: result: $RGB_PATH" >&5
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
@@ -14867,7 +14869,7 @@ fi
 
 ###   use option --with-bool to override bool's type
 
-echo "$as_me:14870: checking for type of bool" >&5
+echo "$as_me:14872: 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.
@@ -14877,17 +14879,17 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
-echo "$as_me:14880: result: $NCURSES_BOOL" >&5
+echo "$as_me:14882: result: $NCURSES_BOOL" >&5
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 case x$NCURSES_BOOL in
 (x|xyes|xno)
-	{ { echo "$as_me:14884: error: expected a type name for bool" >&5
+	{ { echo "$as_me:14886: error: expected a type name for bool" >&5
 echo "$as_me: error: expected a type name for bool" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
-echo "$as_me:14890: checking for alternate terminal capabilities file" >&5
+echo "$as_me:14892: 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.
@@ -14899,16 +14901,16 @@ else
 fi;
 if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
 then
-	{ echo "$as_me:14902: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+	{ echo "$as_me:14904: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
 	TERMINFO_CAPS=Caps
 fi
-echo "$as_me:14906: result: $TERMINFO_CAPS" >&5
+echo "$as_me:14908: result: $TERMINFO_CAPS" >&5
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 
-echo "$as_me:14911: checking for type of chtype" >&5
+echo "$as_me:14913: 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.
@@ -14918,11 +14920,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
-echo "$as_me:14921: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:14923: result: $NCURSES_CHTYPE" >&5
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 case x$NCURSES_CHTYPE in
 (x|xyes|xno)
-	{ { echo "$as_me:14925: error: expected a type name for chtype" >&5
+	{ { echo "$as_me:14927: error: expected a type name for chtype" >&5
 echo "$as_me: error: expected a type name for chtype" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14930,7 +14932,7 @@ esac
 
 ###   use option --with-ospeed to override ospeed's type
 
-echo "$as_me:14933: checking for type of ospeed" >&5
+echo "$as_me:14935: 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.
@@ -14940,11 +14942,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
-echo "$as_me:14943: result: $NCURSES_OSPEED" >&5
+echo "$as_me:14945: result: $NCURSES_OSPEED" >&5
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 case x$NCURSES_OSPEED in
 (x|xyes|xno)
-	{ { echo "$as_me:14947: error: expected a type name for ospeed" >&5
+	{ { echo "$as_me:14949: error: expected a type name for ospeed" >&5
 echo "$as_me: error: expected a type name for ospeed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14952,7 +14954,7 @@ esac
 
 ###   use option --with-mmask-t to override mmask_t's type
 
-echo "$as_me:14955: checking for type of mmask-t" >&5
+echo "$as_me:14957: 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.
@@ -14962,18 +14964,18 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
-echo "$as_me:14965: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:14967: result: $NCURSES_MMASK_T" >&5
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 case x$NCURSES_MMASK_T in
 (x|xyes|xno)
-	{ { echo "$as_me:14969: error: expected a type name for mmask-t" >&5
+	{ { echo "$as_me:14971: error: expected a type name for mmask-t" >&5
 echo "$as_me: error: expected a type name for mmask-t" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
-echo "$as_me:14976: checking for size CCHARW_MAX" >&5
+echo "$as_me:14978: 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.
@@ -14983,16 +14985,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
 fi;
-echo "$as_me:14986: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:14988: result: $NCURSES_CCHARW_MAX" >&5
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
-echo "$as_me:14989: checking for signed char" >&5
+echo "$as_me:14991: 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 14995 "configure"
+#line 14997 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15007,16 +15009,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15013: \$? = $ac_status" >&5
+  echo "$as_me:15015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15019: \$? = $ac_status" >&5
+  echo "$as_me:15021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -15026,10 +15028,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15029: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15031: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:15032: checking size of signed char" >&5
+echo "$as_me:15034: 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
@@ -15038,7 +15040,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15041 "configure"
+#line 15043 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15050,21 +15052,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15062: \$? = $ac_status" >&5
+  echo "$as_me:15064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15067 "configure"
+#line 15069 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15076,16 +15078,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15082: \$? = $ac_status" >&5
+  echo "$as_me:15084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15088: \$? = $ac_status" >&5
+  echo "$as_me:15090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -15101,7 +15103,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 15104 "configure"
+#line 15106 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15113,16 +15115,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15119: \$? = $ac_status" >&5
+  echo "$as_me:15121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15125: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -15138,7 +15140,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15141 "configure"
+#line 15143 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15150,16 +15152,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15156: \$? = $ac_status" >&5
+  echo "$as_me:15158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15162: \$? = $ac_status" >&5
+  echo "$as_me:15164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -15172,12 +15174,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15175: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15177: 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 15180 "configure"
+#line 15182 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15193,15 +15195,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15199: \$? = $ac_status" >&5
+  echo "$as_me:15201: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15204: \$? = $ac_status" >&5
+  echo "$as_me:15206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -15217,7 +15219,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:15220: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:15222: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -15228,7 +15230,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
 	NCURSES_SBOOL="char"
 fi
-echo "$as_me:15231: checking whether to use signed chars for Boolean array in term.h" >&5
+echo "$as_me:15233: checking whether to use signed chars for Boolean array in term.h" >&5
 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
@@ -15238,13 +15240,13 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=$cf_dft_signed_char
 fi;
-echo "$as_me:15241: result: $with_signed_char" >&5
+echo "$as_me:15243: 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:15247: checking for type of tparm-arg" >&5
+echo "$as_me:15249: checking for type of tparm-arg" >&5
 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
@@ -15254,18 +15256,18 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
-echo "$as_me:15257: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:15259: result: $NCURSES_TPARM_ARG" >&5
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 case x$NCURSES_TPARM_ARG in
 (x|xyes|xno)
-	{ { echo "$as_me:15261: error: expected a type name for tparm-arg" >&5
+	{ { echo "$as_me:15263: error: expected a type name for tparm-arg" >&5
 echo "$as_me: error: expected a type name for tparm-arg" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 ### Enable compiling-in rcs id's
-echo "$as_me:15268: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:15270: 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.
@@ -15275,7 +15277,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:15278: result: $with_rcs_ids" >&5
+echo "$as_me:15280: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -15284,7 +15286,7 @@ EOF
 
 ###############################################################################
 
-echo "$as_me:15287: checking format of man-pages" >&5
+echo "$as_me:15289: 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.
@@ -15375,10 +15377,10 @@ case "$MANPAGE_FORMAT" in
 	;;
 esac
 
-echo "$as_me:15378: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:15380: result: $MANPAGE_FORMAT" >&5
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
-	{ echo "$as_me:15381: WARNING: Unexpected manpage-format $cf_unknown" >&5
+	{ echo "$as_me:15383: WARNING: Unexpected manpage-format $cf_unknown" >&5
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
@@ -15419,7 +15421,7 @@ case "$cf_item" in
 esac
 done
 
-echo "$as_me:15422: checking for manpage renaming" >&5
+echo "$as_me:15424: 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.
@@ -15448,15 +15450,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then
 elif test "$MANPAGE_RENAMES" = no ; then
 	:
 elif test ! -f "$MANPAGE_RENAMES" ; then
-	{ { echo "$as_me:15451: error: not a filename: $MANPAGE_RENAMES" >&5
+	{ { echo "$as_me:15453: error: not a filename: $MANPAGE_RENAMES" >&5
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:15456: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:15458: result: $MANPAGE_RENAMES" >&5
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
-echo "$as_me:15459: checking if manpage aliases will be installed" >&5
+echo "$as_me:15461: 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.
@@ -15467,7 +15469,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
-echo "$as_me:15470: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:15472: result: $MANPAGE_ALIASES" >&5
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
@@ -15481,7 +15483,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:15484: checking if manpage symlinks should be used" >&5
+echo "$as_me:15486: 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.
@@ -15494,17 +15496,17 @@ fi;
 
 if test "$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
-	{ echo "$as_me:15497: WARNING: cannot make symlinks" >&5
+	{ echo "$as_me:15499: WARNING: cannot make symlinks" >&5
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
 	MANPAGE_SYMLINKS=no
 fi
 fi
 
-echo "$as_me:15503: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:15505: result: $MANPAGE_SYMLINKS" >&5
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
-echo "$as_me:15507: checking for manpage tbl" >&5
+echo "$as_me:15509: 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.
@@ -15515,7 +15517,7 @@ else
   MANPAGE_TBL=no
 fi;
 
-echo "$as_me:15518: result: $MANPAGE_TBL" >&5
+echo "$as_me:15520: result: $MANPAGE_TBL" >&5
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
@@ -15707,7 +15709,7 @@ CF_EOF
 if test -n "$cf_manpage_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 	if test "\$verb" = installing ; then
-	if ( "$cf_manpage_compress" -f \$TMP )
+	if ( "$cf_manpage_compress" $cf_manpage_coptions -f \$TMP )
 	then
 		mv \$TMP.$cf_manpage_so_strip \$TMP
 	fi
@@ -15836,7 +15838,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:15839: checking if you want to build with function extensions" >&5
+echo "$as_me:15841: 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.
@@ -15846,7 +15848,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:15849: result: $with_ext_funcs" >&5
+echo "$as_me:15851: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
 	NCURSES_EXT_FUNCS=1
@@ -15903,7 +15905,7 @@ else
 	GENERATED_EXT_FUNCS=
 fi
 
-echo "$as_me:15906: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15908: 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.
@@ -15913,7 +15915,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
-echo "$as_me:15916: result: $with_sp_funcs" >&5
+echo "$as_me:15918: result: $with_sp_funcs" >&5
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
 	NCURSES_SP_FUNCS=1
@@ -15932,7 +15934,7 @@ else
 	GENERATED_SP_FUNCS=
 fi
 
-echo "$as_me:15935: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15937: 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.
@@ -15942,7 +15944,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
-echo "$as_me:15945: result: $with_term_driver" >&5
+echo "$as_me:15947: result: $with_term_driver" >&5
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
@@ -15951,19 +15953,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	if test "x$with_termlib" != xno ; then
-		{ { echo "$as_me:15954: error: The term-driver option conflicts with the termlib option" >&5
+		{ { echo "$as_me:15956: 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:15959: error: The term-driver option relies upon sp-funcs" >&5
+		{ { echo "$as_me:15961: 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:15966: checking for extended use of const keyword" >&5
+echo "$as_me:15968: 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.
@@ -15973,7 +15975,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
-echo "$as_me:15976: result: $with_ext_const" >&5
+echo "$as_me:15978: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
@@ -15981,7 +15983,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:15984: checking if you want to use extended colors" >&5
+echo "$as_me:15986: 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.
@@ -15991,12 +15993,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
-echo "$as_me:15994: result: $with_ext_colors" >&5
+echo "$as_me:15996: 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:15999: WARNING: This option applies only to wide-character library" >&5
+		{ echo "$as_me:16001: 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)
@@ -16007,7 +16009,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16010: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16012: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16035,7 +16037,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:16038: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:16040: 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.
@@ -16045,7 +16047,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
-echo "$as_me:16048: result: $with_ext_mouse" >&5
+echo "$as_me:16050: result: $with_ext_mouse" >&5
 echo "${ECHO_T}$with_ext_mouse" >&6
 if test "x$with_ext_mouse" = xyes ; then
 
@@ -16055,7 +16057,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16058: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16060: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16072,7 +16074,7 @@ else
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
-echo "$as_me:16075: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:16077: 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.
@@ -16082,7 +16084,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
-echo "$as_me:16085: result: $with_ext_putwin" >&5
+echo "$as_me:16087: result: $with_ext_putwin" >&5
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
@@ -16092,7 +16094,7 @@ EOF
 
 fi
 
-echo "$as_me:16095: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:16097: 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.
@@ -16102,7 +16104,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
-echo "$as_me:16105: result: $with_no_padding" >&5
+echo "$as_me:16107: result: $with_no_padding" >&5
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16110,7 +16112,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:16113: checking if you want SIGWINCH handler" >&5
+echo "$as_me:16115: 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.
@@ -16120,7 +16122,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
-echo "$as_me:16123: result: $with_sigwinch" >&5
+echo "$as_me:16125: result: $with_sigwinch" >&5
 echo "${ECHO_T}$with_sigwinch" >&6
 if test "x$with_sigwinch" = xyes
 then
@@ -16135,7 +16137,7 @@ else
 fi
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:16138: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:16140: 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.
@@ -16145,7 +16147,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
-echo "$as_me:16148: result: $with_tcap_names" >&5
+echo "$as_me:16150: result: $with_tcap_names" >&5
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 if test "x$with_tcap_names" = xyes; then
@@ -16159,7 +16161,7 @@ fi
 
 ##############################################################################
 
-echo "$as_me:16162: checking if you want to link with the pthread library" >&5
+echo "$as_me:16164: 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.
@@ -16169,27 +16171,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:16172: result: $with_pthread" >&5
+echo "$as_me:16174: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:16176: checking for pthread.h" >&5
+	echo "$as_me:16178: 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 16182 "configure"
+#line 16184 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:16186: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16192: \$? = $ac_status" >&5
+  echo "$as_me:16194: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16208,7 +16210,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16211: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:16213: 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
 
@@ -16218,7 +16220,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:16221: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:16223: 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"
 
@@ -16239,7 +16241,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >"conftest.$ac_ext" <<_ACEOF
-#line 16242 "configure"
+#line 16244 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -16256,16 +16258,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16262: \$? = $ac_status" >&5
+  echo "$as_me:16264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16268: \$? = $ac_status" >&5
+  echo "$as_me:16270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
@@ -16275,7 +16277,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:16278: result: $with_pthread" >&5
+	    echo "$as_me:16280: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -16303,7 +16305,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:16306: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:16308: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16313,13 +16315,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
-	echo "$as_me:16316: checking for pthread_kill" >&5
+	echo "$as_me:16318: 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 16322 "configure"
+#line 16324 "configure"
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16350,16 +16352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16356: \$? = $ac_status" >&5
+  echo "$as_me:16358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16362: \$? = $ac_status" >&5
+  echo "$as_me:16364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
@@ -16369,11 +16371,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16372: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:16374: 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:16376: checking if you want to allow EINTR in wgetch with pthreads" >&5
+		echo "$as_me:16378: 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.
@@ -16383,7 +16385,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
-		echo "$as_me:16386: result: $use_pthreads_eintr" >&5
+		echo "$as_me:16388: result: $use_pthreads_eintr" >&5
 echo "${ECHO_T}$use_pthreads_eintr" >&6
 		if test "x$use_pthreads_eintr" = xyes ; then
 
@@ -16394,7 +16396,7 @@ EOF
 		fi
 fi
 
-	echo "$as_me:16397: checking if you want to use weak-symbols for pthreads" >&5
+	echo "$as_me:16399: 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.
@@ -16404,18 +16406,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-	echo "$as_me:16407: result: $use_weak_symbols" >&5
+	echo "$as_me:16409: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 	if test "x$use_weak_symbols" = xyes ; then
 
-echo "$as_me:16411: checking if $CC supports weak symbols" >&5
+echo "$as_me:16413: 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 16418 "configure"
+#line 16420 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16441,16 +16443,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16447: \$? = $ac_status" >&5
+  echo "$as_me:16449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16453: \$? = $ac_status" >&5
+  echo "$as_me:16455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -16461,7 +16463,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16464: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:16466: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 	else
@@ -16511,7 +16513,7 @@ fi
 # 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:16514: checking if you want reentrant code" >&5
+echo "$as_me:16516: 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.
@@ -16521,7 +16523,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
-echo "$as_me:16524: result: $with_reentrant" >&5
+echo "$as_me:16526: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
 	cf_cv_enable_reentrant=1
@@ -16610,7 +16612,7 @@ if test "${with_abi_version+set}" != set; then
 		cf_cv_rel_version=6.0
 		cf_cv_abi_version=6
 		cf_cv_abi_default=6
-		{ echo "$as_me:16613: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+		{ echo "$as_me:16615: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
 		;;
 	esac
@@ -16622,7 +16624,7 @@ else
 	NCURSES_SIZE_T=$cf_dft_ordinate_type
 fi
 
-echo "$as_me:16625: checking whether curses library structures should be opaque" >&5
+echo "$as_me:16627: checking whether curses library structures should be opaque" >&5
 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
@@ -16644,16 +16646,16 @@ else
 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16647: result: $enable_opaque_curses" >&5
+echo "$as_me:16649: 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:16652: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:16654: error: reentrant configuration requires opaque library" >&5
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:16656: checking whether form library structures should be opaque" >&5
+echo "$as_me:16658: checking whether form library structures should be opaque" >&5
 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
@@ -16670,10 +16672,10 @@ else
 	enable_opaque_form=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16673: result: $enable_opaque_form" >&5
+echo "$as_me:16675: result: $enable_opaque_form" >&5
 echo "${ECHO_T}$enable_opaque_form" >&6
 
-echo "$as_me:16676: checking whether menu library structures should be opaque" >&5
+echo "$as_me:16678: checking whether menu library structures should be opaque" >&5
 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
@@ -16690,10 +16692,10 @@ else
 	enable_opaque_menu=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16693: result: $enable_opaque_menu" >&5
+echo "$as_me:16695: result: $enable_opaque_menu" >&5
 echo "${ECHO_T}$enable_opaque_menu" >&6
 
-echo "$as_me:16696: checking whether panel library structures should be opaque" >&5
+echo "$as_me:16698: checking whether panel library structures should be opaque" >&5
 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
@@ -16710,7 +16712,7 @@ else
 	enable_opaque_panel=$cf_dft_opaque_curses
 
 fi;
-echo "$as_me:16713: result: $enable_opaque_panel" >&5
+echo "$as_me:16715: result: $enable_opaque_panel" >&5
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
@@ -16720,7 +16722,7 @@ NCURSES_OPAQUE_PANEL=0;	test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:16723: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:16725: 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.
@@ -16730,7 +16732,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:16733: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:16735: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -16743,7 +16745,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:16746: checking if you want all development code" >&5
+echo "$as_me:16748: 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.
@@ -16753,11 +16755,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:16756: result: $with_develop" >&5
+echo "$as_me:16758: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-check-size to detect screensize with CPR
-echo "$as_me:16760: checking if you want to check screensize of serial terminals" >&5
+echo "$as_me:16762: checking if you want to check screensize of serial terminals" >&5
 echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
 
 # Check whether --enable-check-size or --disable-check-size was given.
@@ -16767,7 +16769,7 @@ if test "${enable_check_size+set}" = set; then
 else
   enable_check_size=$with_develop
 fi;
-echo "$as_me:16770: result: $enable_check_size" >&5
+echo "$as_me:16772: result: $enable_check_size" >&5
 echo "${ECHO_T}$enable_check_size" >&6
 test "x$enable_check_size" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16775,7 +16777,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:16778: checking if you want hard-tabs code" >&5
+echo "$as_me:16780: 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.
@@ -16785,7 +16787,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
-echo "$as_me:16788: result: $enable_hard_tabs" >&5
+echo "$as_me:16790: result: $enable_hard_tabs" >&5
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16793,7 +16795,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:16796: checking if you want limited support for xmc" >&5
+echo "$as_me:16798: 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.
@@ -16803,7 +16805,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
-echo "$as_me:16806: result: $enable_xmc_glitch" >&5
+echo "$as_me:16808: result: $enable_xmc_glitch" >&5
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16813,7 +16815,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
-echo "$as_me:16816: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:16818: 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.
@@ -16823,7 +16825,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
-echo "$as_me:16826: result: $with_assumed_color" >&5
+echo "$as_me:16828: result: $with_assumed_color" >&5
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16831,7 +16833,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:16834: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:16836: 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.
@@ -16841,7 +16843,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
-echo "$as_me:16844: result: $with_hashmap" >&5
+echo "$as_me:16846: result: $with_hashmap" >&5
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16849,7 +16851,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:16852: checking if you want colorfgbg code" >&5
+echo "$as_me:16854: 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.
@@ -16859,7 +16861,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
-echo "$as_me:16862: result: $with_colorfgbg" >&5
+echo "$as_me:16864: result: $with_colorfgbg" >&5
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -16867,7 +16869,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
-echo "$as_me:16870: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:16872: checking if you want to use gcc -fvisibility option" >&5
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
@@ -16877,14 +16879,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
-echo "$as_me:16880: result: $cf_with_fvisibility" >&5
+echo "$as_me:16882: result: $cf_with_fvisibility" >&5
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
-echo "$as_me:16887: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:16889: checking if $CC -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16893,7 +16895,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 16896 "configure"
+#line 16898 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -16909,16 +16911,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16915: \$? = $ac_status" >&5
+  echo "$as_me:16917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16921: \$? = $ac_status" >&5
+  echo "$as_me:16923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
@@ -16930,7 +16932,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:16933: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16935: result: $cf_cv_fvisibility_hidden" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
 	if test "x$cf_cv_fvisibility_hidden" = xyes
@@ -17045,7 +17047,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:17048: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:17050: checking if $CXX -fvisibility=hidden option works" >&5
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17054,7 +17056,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 17057 "configure"
+#line 17059 "configure"
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
@@ -17070,16 +17072,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17075: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17076: \$? = $ac_status" >&5
+  echo "$as_me:17078: \$? = $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:17081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17082: \$? = $ac_status" >&5
+  echo "$as_me:17084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
@@ -17091,7 +17093,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
-echo "$as_me:17094: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:17096: result: $cf_cv_fvisibility_hidden2" >&5
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
 		if test "x$cf_cv_fvisibility_hidden2" = xyes
@@ -17214,7 +17216,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
-echo "$as_me:17217: checking if you want interop bindings" >&5
+echo "$as_me:17219: 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.
@@ -17224,13 +17226,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
-echo "$as_me:17227: result: $with_exp_interop" >&5
+echo "$as_me:17229: 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:17233: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:17235: 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.
@@ -17240,13 +17242,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
-echo "$as_me:17243: result: $with_safe_sprintf" >&5
+echo "$as_me:17245: 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:17249: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:17251: 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.
@@ -17256,7 +17258,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
-echo "$as_me:17259: result: $with_scroll_hints" >&5
+echo "$as_me:17261: result: $with_scroll_hints" >&5
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
@@ -17265,7 +17267,7 @@ EOF
 
 fi
 
-echo "$as_me:17268: checking if you want wgetch-events code" >&5
+echo "$as_me:17270: 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.
@@ -17275,7 +17277,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
-echo "$as_me:17278: result: $with_wgetch_events" >&5
+echo "$as_me:17280: result: $with_wgetch_events" >&5
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
@@ -17290,7 +17292,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
-	echo "$as_me:17293: checking if you want experimental-Windows driver" >&5
+	echo "$as_me:17295: checking if you want experimental-Windows driver" >&5
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
@@ -17300,7 +17302,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
-	echo "$as_me:17303: result: $with_exp_win32" >&5
+	echo "$as_me:17305: result: $with_exp_win32" >&5
 echo "${ECHO_T}$with_exp_win32" >&6
 	if test "x$with_exp_win32" = xyes
 	then
@@ -17326,7 +17328,7 @@ esac
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:17329: checking if you want to see long compiling messages" >&5
+echo "$as_me:17331: 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.
@@ -17360,7 +17362,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:17363: result: $enableval" >&5
+echo "$as_me:17365: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
@@ -17373,7 +17375,7 @@ fi
 
 # --disable-stripping is used for debugging
 
-echo "$as_me:17376: checking if you want to install stripped executables" >&5
+echo "$as_me:17378: 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.
@@ -17390,7 +17392,7 @@ else
 	enable_stripping=yes
 
 fi;
-echo "$as_me:17393: result: $enable_stripping" >&5
+echo "$as_me:17395: result: $enable_stripping" >&5
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
@@ -17401,7 +17403,7 @@ else
 fi
 
 : "${INSTALL:=install}"
-echo "$as_me:17404: checking if install accepts -p option" >&5
+echo "$as_me:17406: 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
@@ -17432,10 +17434,10 @@ else
 	rm -rf ./conftest*
 
 fi
-echo "$as_me:17435: result: $cf_cv_install_p" >&5
+echo "$as_me:17437: result: $cf_cv_install_p" >&5
 echo "${ECHO_T}$cf_cv_install_p" >&6
 
-echo "$as_me:17438: checking if install needs to be told about ownership" >&5
+echo "$as_me:17440: 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)
@@ -17446,7 +17448,7 @@ case `$ac_config_guess` in
 	;;
 esac
 
-echo "$as_me:17449: result: $with_install_o" >&5
+echo "$as_me:17451: result: $with_install_o" >&5
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
@@ -17457,7 +17459,7 @@ fi
 
 if test -n "$INSTALL_OPT_S"
 then
-	echo "$as_me:17460: checking if you want to specify strip-program" >&5
+	echo "$as_me:17462: checking if you want to specify strip-program" >&5
 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
 
 # Check whether --with-strip-program or --without-strip-program was given.
@@ -17467,11 +17469,11 @@ if test "${with_strip_program+set}" = set; then
 else
   with_strip_program=no
 fi;
-	echo "$as_me:17470: result: $with_strip_program" >&5
+	echo "$as_me:17472: result: $with_strip_program" >&5
 echo "${ECHO_T}$with_strip_program" >&6
 	if test "$with_strip_program" != no
 	then
-		echo "$as_me:17474: checking if strip-program is supported with this installer" >&5
+		echo "$as_me:17476: checking if strip-program is supported with this installer" >&5
 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
 		check_install_strip=no
@@ -17492,11 +17494,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH
 				done
 			fi
 		fi
-		echo "$as_me:17495: result: $check_install_strip" >&5
+		echo "$as_me:17497: result: $check_install_strip" >&5
 echo "${ECHO_T}$check_install_strip" >&6
 		case "$check_install_strip" in
 		(no)
-			{ echo "$as_me:17499: WARNING: $cf_install_program does not support strip program option" >&5
+			{ echo "$as_me:17501: WARNING: $cf_install_program does not support strip program option" >&5
 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
 			with_strip_program=no
 			;;
@@ -17511,7 +17513,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option
 			chmod +x "$INSTALL"
 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
 
-echo "${as_me:-configure}:17514: testing created $INSTALL ..." 1>&5
+echo "${as_me:-configure}:17516: testing created $INSTALL ..." 1>&5
 
 			;;
 		(option)
@@ -17537,7 +17539,7 @@ fi
 
 ###	use option --enable-warnings to turn on all gcc warnings
 
-echo "$as_me:17540: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:17542: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -17554,17 +17556,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:17557: result: $enable_stdnoreturn" >&5
+echo "$as_me:17559: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:17561: checking for C11 _Noreturn feature" >&5
+echo "$as_me:17563: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 17567 "configure"
+#line 17569 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17580,16 +17582,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17586: \$? = $ac_status" >&5
+  echo "$as_me:17588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17592: \$? = $ac_status" >&5
+  echo "$as_me:17594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -17600,7 +17602,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17603: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:17605: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -17656,16 +17658,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17659: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17661: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17664: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17666: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17668: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17670: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17704,16 +17706,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17709: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17712: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17714: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17716: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17718: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -17752,23 +17754,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17757: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:17760: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:17762: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17766: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:17771: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17773: 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.
@@ -17785,7 +17787,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:17788: result: $enable_warnings" >&5
+echo "$as_me:17790: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -17809,7 +17811,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17812 "configure"
+#line 17814 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17824,26 +17826,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17830: \$? = $ac_status" >&5
+  echo "$as_me:17832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17836: \$? = $ac_status" >&5
+  echo "$as_me:17838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:17839: checking for X11/Xt const-feature" >&5
+echo "$as_me:17841: 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 17846 "configure"
+#line 17848 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -17861,16 +17863,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17867: \$? = $ac_status" >&5
+  echo "$as_me:17869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17873: \$? = $ac_status" >&5
+  echo "$as_me:17875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -17885,7 +17887,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17888: result: $cf_cv_const_x_string" >&5
+echo "$as_me:17890: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -17914,7 +17916,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 17917 "${as_me:-configure}"
+#line 17919 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -17930,7 +17932,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:17933: checking for $CC warning options..." >&5
+	{ echo "$as_me:17935: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -17946,12 +17948,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17949: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17952: \$? = $ac_status" >&5
+  echo "$as_me:17954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17954: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17956: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17959,7 +17961,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:17962: checking for $CC warning options..." >&5
+	{ echo "$as_me:17964: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -17982,12 +17984,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $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:17985: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17988: \$? = $ac_status" >&5
+  echo "$as_me:17990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -17995,7 +17997,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:17998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:18000: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18005,7 +18007,7 @@ echo "${as_me:-configure}:17998: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:18008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:18010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -18038,10 +18040,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:18041: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:18043: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 18044 "${as_me:-configure}"
+#line 18046 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -18091,12 +18093,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18097: \$? = $ac_status" >&5
+  echo "$as_me:18099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18099: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:18101: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -18168,12 +18170,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:18171: checking if this is really Intel C++ compiler" >&5
+		echo "$as_me:18173: 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 18176 "configure"
+#line 18178 "configure"
 #include "confdefs.h"
 
 int
@@ -18190,16 +18192,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18196: \$? = $ac_status" >&5
+  echo "$as_me:18198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18202: \$? = $ac_status" >&5
+  echo "$as_me:18204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -18210,7 +18212,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CXXFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:18213: result: $INTEL_CPLUSPLUS" >&5
+		echo "$as_me:18215: result: $INTEL_CPLUSPLUS" >&5
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
 		;;
 	esac
@@ -18219,11 +18221,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:18222: checking if this is really Clang C++ compiler" >&5
+	echo "$as_me:18224: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 18226 "configure"
+#line 18228 "configure"
 #include "confdefs.h"
 
 int
@@ -18240,16 +18242,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18246: \$? = $ac_status" >&5
+  echo "$as_me:18248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
@@ -18259,7 +18261,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CXXFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:18262: result: $CLANG_CPLUSPLUS" >&5
+	echo "$as_me:18264: result: $CLANG_CPLUSPLUS" >&5
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
@@ -18268,30 +18270,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:18271: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:18273: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:18278: checking version of $CC" >&5
+	echo "$as_me:18280: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:18282: result: $CLANG_VERSION" >&5
+	echo "$as_me:18284: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:18289: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:18291: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 18294 "configure"
+#line 18296 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -18305,16 +18307,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18311: \$? = $ac_status" >&5
+  echo "$as_me:18313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18317: \$? = $ac_status" >&5
+  echo "$as_me:18319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -18325,13 +18327,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:18328: result: $cf_clang_optok" >&5
+		echo "$as_me:18330: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:18334: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:18336: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -18348,7 +18350,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
-#line 18351 "configure"
+#line 18353 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -18366,7 +18368,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:18369: checking for $CC warning options..." >&5
+	{ echo "$as_me:18371: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-Wall"
@@ -18383,12 +18385,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-		if { (eval echo "$as_me:18386: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18389: \$? = $ac_status" >&5
+  echo "$as_me:18391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18391: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18393: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		fi
@@ -18397,7 +18399,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
-	{ echo "$as_me:18400: checking for $CXX warning options..." >&5
+	{ echo "$as_me:18402: checking for $CXX warning options..." >&5
 echo "$as_me: checking for $CXX warning options..." >&6;}
 	cf_save_CXXFLAGS="$CXXFLAGS"
 	EXTRA_CXXFLAGS="-W -Wall"
@@ -18427,16 +18429,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
 		Wundef $cf_gxx_extra_warnings Wno-unused
 	do
 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-		if { (eval echo "$as_me:18430: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:18432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18433: \$? = $ac_status" >&5
+  echo "$as_me:18435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:18435: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18437: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
 		else
-			test -n "$verbose" && echo "$as_me:18439: result: ... no -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:18441: result: ... no -$cf_opt" >&5
 echo "${ECHO_T}... no -$cf_opt" >&6
 		fi
 	done
@@ -18454,7 +18456,7 @@ ac_main_return="return"
 	fi
 fi
 
-echo "$as_me:18457: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:18459: 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.
@@ -18464,7 +18466,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
-echo "$as_me:18467: result: $enable_string_hacks" >&5
+echo "$as_me:18469: result: $enable_string_hacks" >&5
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
@@ -18473,15 +18475,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
-	{ echo "$as_me:18476: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+	{ echo "$as_me:18478: 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:18478: checking for strlcat" >&5
+	echo "$as_me:18480: 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 18484 "configure"
+#line 18486 "configure"
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18512,16 +18514,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18518: \$? = $ac_status" >&5
+  echo "$as_me:18520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18524: \$? = $ac_status" >&5
+  echo "$as_me:18526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
@@ -18531,7 +18533,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18534: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:18536: result: $ac_cv_func_strlcat" >&5
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
@@ -18541,7 +18543,7 @@ EOF
 
 else
 
-		echo "$as_me:18544: checking for strlcat in -lbsd" >&5
+		echo "$as_me:18546: 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
@@ -18549,7 +18551,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18552 "configure"
+#line 18554 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18568,16 +18570,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18574: \$? = $ac_status" >&5
+  echo "$as_me:18576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18580: \$? = $ac_status" >&5
+  echo "$as_me:18582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
@@ -18588,7 +18590,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18591: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:18593: 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
 
@@ -18611,23 +18613,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18614: checking for $ac_header" >&5
+echo "$as_me:18616: 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 18620 "configure"
+#line 18622 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18624: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18626: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18630: \$? = $ac_status" >&5
+  echo "$as_me:18632: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18646,7 +18648,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18649: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18651: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18667,13 +18669,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18670: checking for $ac_func" >&5
+echo "$as_me:18672: 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 18676 "configure"
+#line 18678 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18704,16 +18706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18710: \$? = $ac_status" >&5
+  echo "$as_me:18712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18716: \$? = $ac_status" >&5
+  echo "$as_me:18718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18723,7 +18725,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18726: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18728: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -18736,7 +18738,7 @@ done
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:18739: checking if you want to enable runtime assertions" >&5
+echo "$as_me:18741: 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.
@@ -18746,7 +18748,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:18749: result: $with_assertions" >&5
+echo "$as_me:18751: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -18762,7 +18764,7 @@ fi
 
 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
 
-echo "$as_me:18765: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:18767: 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.
@@ -18784,7 +18786,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:18787: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:18789: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -18898,23 +18900,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18901: checking for dmalloc.h" >&5
+	echo "$as_me:18903: 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 18907 "configure"
+#line 18909 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:18911: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18917: \$? = $ac_status" >&5
+  echo "$as_me:18919: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18933,11 +18935,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18936: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18938: 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:18940: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18942: 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
@@ -18945,7 +18947,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18948 "configure"
+#line 18950 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18964,16 +18966,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18970: \$? = $ac_status" >&5
+  echo "$as_me:18972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18976: \$? = $ac_status" >&5
+  echo "$as_me:18978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18984,7 +18986,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18987: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18989: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -18999,7 +19001,7 @@ fi
 
 fi
 
-echo "$as_me:19002: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:19004: 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.
@@ -19021,7 +19023,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:19024: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:19026: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -19135,23 +19137,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:19138: checking for dbmalloc.h" >&5
+	echo "$as_me:19140: 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 19144 "configure"
+#line 19146 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19148: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19154: \$? = $ac_status" >&5
+  echo "$as_me:19156: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19170,11 +19172,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19173: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:19175: 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:19177: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:19179: 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
@@ -19182,7 +19184,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19185 "configure"
+#line 19187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19201,16 +19203,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19207: \$? = $ac_status" >&5
+  echo "$as_me:19209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19213: \$? = $ac_status" >&5
+  echo "$as_me:19215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -19221,7 +19223,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19224: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:19226: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -19236,7 +19238,7 @@ fi
 
 fi
 
-echo "$as_me:19239: checking if you want to use valgrind for testing" >&5
+echo "$as_me:19241: 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.
@@ -19258,7 +19260,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:19261: result: ${with_valgrind:-no}" >&5
+echo "$as_me:19263: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -19371,7 +19373,7 @@ fi
 	;;
 esac
 
-echo "$as_me:19374: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:19376: 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.
@@ -19382,7 +19384,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:19385: result: $with_no_leaks" >&5
+echo "$as_me:19387: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -19434,7 +19436,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:19437: checking whether to add trace feature to all models" >&5
+echo "$as_me:19439: 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.
@@ -19444,7 +19446,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:19447: result: $cf_with_trace" >&5
+echo "$as_me:19449: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
@@ -19464,7 +19466,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:19467: checking if we want to use GNAT projects" >&5
+echo "$as_me:19469: 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.
@@ -19481,7 +19483,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:19484: result: $enable_gnat_projects" >&5
+echo "$as_me:19486: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -19494,14 +19496,14 @@ case "$cf_cv_system_name" in
 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
 	fi
 
-echo "$as_me:19497: checking if ssp library is needed" >&5
+echo "$as_me:19499: checking if ssp library is needed" >&5
 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
 if test "${cf_cv_need_libssp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19504 "configure"
+#line 19506 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19518,16 +19520,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19524: \$? = $ac_status" >&5
+  echo "$as_me:19526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19530: \$? = $ac_status" >&5
+  echo "$as_me:19532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=no
 else
@@ -19537,7 +19539,7 @@ cat "conftest.$ac_ext" >&5
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lssp"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19540 "configure"
+#line 19542 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19554,16 +19556,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19560: \$? = $ac_status" >&5
+  echo "$as_me:19562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19566: \$? = $ac_status" >&5
+  echo "$as_me:19568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libssp=yes
 else
@@ -19577,7 +19579,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19580: result: $cf_cv_need_libssp" >&5
+echo "$as_me:19582: result: $cf_cv_need_libssp" >&5
 echo "${ECHO_T}$cf_cv_need_libssp" >&6
 
 if test "x$cf_cv_need_libssp" = xyes
@@ -19606,14 +19608,14 @@ fi
 	;;
 esac
 
-echo "$as_me:19609: checking if -lm needed for math functions" >&5
+echo "$as_me:19611: 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 19616 "configure"
+#line 19618 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19629,16 +19631,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19635: \$? = $ac_status" >&5
+  echo "$as_me:19637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19641: \$? = $ac_status" >&5
+  echo "$as_me:19643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -19648,7 +19650,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19651: result: $cf_cv_need_libm" >&5
+echo "$as_me:19653: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -19656,14 +19658,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:19659: checking if -lm is available for math functions" >&5
+	echo "$as_me:19661: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19666 "configure"
+#line 19668 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -19679,16 +19681,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19685: \$? = $ac_status" >&5
+  echo "$as_me:19687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19691: \$? = $ac_status" >&5
+  echo "$as_me:19693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -19698,7 +19700,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19701: result: $cf_cv_have_libm" >&5
+echo "$as_me:19703: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -19720,13 +19722,13 @@ EOF
 fi
 
 ###	Checks for header files.
-echo "$as_me:19723: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19725: 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 19729 "configure"
+#line 19731 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19742,16 +19744,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19748: \$? = $ac_status" >&5
+  echo "$as_me:19750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19754: \$? = $ac_status" >&5
+  echo "$as_me:19756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -19761,7 +19763,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:19764: result: $ac_cv_header_time" >&5
+echo "$as_me:19766: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19776,7 +19778,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:19779: checking for regcomp in -lsystre" >&5
+	echo "$as_me:19781: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19784,7 +19786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19787 "configure"
+#line 19789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19803,16 +19805,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19809: \$? = $ac_status" >&5
+  echo "$as_me:19811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19815: \$? = $ac_status" >&5
+  echo "$as_me:19817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -19823,11 +19825,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19826: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19828: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:19830: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:19832: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19835,7 +19837,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19838 "configure"
+#line 19840 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19854,16 +19856,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19860: \$? = $ac_status" >&5
+  echo "$as_me:19862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19866: \$? = $ac_status" >&5
+  echo "$as_me:19868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -19874,7 +19876,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19877: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19879: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -19896,7 +19898,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19899: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:19901: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19904,7 +19906,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19907 "configure"
+#line 19909 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19923,16 +19925,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19929: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19935: \$? = $ac_status" >&5
+  echo "$as_me:19937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -19943,7 +19945,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19946: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19948: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -19965,7 +19967,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-		echo "$as_me:19968: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:19970: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19973,7 +19975,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19976 "configure"
+#line 19978 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19992,16 +19994,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19998: \$? = $ac_status" >&5
+  echo "$as_me:20000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20004: \$? = $ac_status" >&5
+  echo "$as_me:20006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -20012,7 +20014,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20015: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:20017: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -20054,7 +20056,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:20057: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:20059: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20062,7 +20064,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20065 "configure"
+#line 20067 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20081,16 +20083,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20087: \$? = $ac_status" >&5
+  echo "$as_me:20089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20093: \$? = $ac_status" >&5
+  echo "$as_me:20095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -20101,7 +20103,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20104: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:20106: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -20129,13 +20131,13 @@ fi
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:20132: checking for regcomp" >&5
+	echo "$as_me:20134: 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 20138 "configure"
+#line 20140 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20166,16 +20168,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20172: \$? = $ac_status" >&5
+  echo "$as_me:20174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20178: \$? = $ac_status" >&5
+  echo "$as_me:20180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -20185,7 +20187,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20188: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:20190: 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
@@ -20194,7 +20196,7 @@ else
 		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:20197: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:20199: 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
@@ -20202,7 +20204,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20205 "configure"
+#line 20207 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20221,16 +20223,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20227: \$? = $ac_status" >&5
+  echo "$as_me:20229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20233: \$? = $ac_status" >&5
+  echo "$as_me:20235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -20241,7 +20243,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20244: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:20246: 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
 
@@ -20273,13 +20275,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:20276: checking for compile" >&5
+	echo "$as_me:20278: 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 20282 "configure"
+#line 20284 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20310,16 +20312,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20316: \$? = $ac_status" >&5
+  echo "$as_me:20318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20322: \$? = $ac_status" >&5
+  echo "$as_me:20324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -20329,13 +20331,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20332: result: $ac_cv_func_compile" >&5
+echo "$as_me:20334: 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:20338: checking for compile in -lgen" >&5
+		echo "$as_me:20340: 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
@@ -20343,7 +20345,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20346 "configure"
+#line 20348 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20362,16 +20364,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20368: \$? = $ac_status" >&5
+  echo "$as_me:20370: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20374: \$? = $ac_status" >&5
+  echo "$as_me:20376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -20382,7 +20384,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20385: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:20387: 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
 
@@ -20410,11 +20412,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:20413: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:20415: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:20417: checking for regular-expression headers" >&5
+echo "$as_me:20419: 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
@@ -20426,7 +20428,7 @@ case "$cf_regex_func" in
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20429 "configure"
+#line 20431 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -20443,16 +20445,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20449: \$? = $ac_status" >&5
+  echo "$as_me:20451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20455: \$? = $ac_status" >&5
+  echo "$as_me:20457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20469,7 +20471,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20472 "configure"
+#line 20474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -20490,16 +20492,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20496: \$? = $ac_status" >&5
+  echo "$as_me:20498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20502: \$? = $ac_status" >&5
+  echo "$as_me:20504: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -20515,11 +20517,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:20518: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20520: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:20522: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:20524: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -20557,23 +20559,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20560: checking for $ac_header" >&5
+echo "$as_me:20562: 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 20566 "configure"
+#line 20568 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20576: \$? = $ac_status" >&5
+  echo "$as_me:20578: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20592,7 +20594,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20597: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20605,23 +20607,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20608: checking for $ac_header" >&5
+echo "$as_me:20610: 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 20614 "configure"
+#line 20616 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20624: \$? = $ac_status" >&5
+  echo "$as_me:20626: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20640,7 +20642,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20645: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20650,7 +20652,7 @@ EOF
 fi
 done
 
-echo "$as_me:20653: checking for header declaring getopt variables" >&5
+echo "$as_me:20655: 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
@@ -20660,7 +20662,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20663 "configure"
+#line 20665 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20673,16 +20675,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20679: \$? = $ac_status" >&5
+  echo "$as_me:20681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20685: \$? = $ac_status" >&5
+  echo "$as_me:20687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20694,7 +20696,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20697: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20699: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20711,14 +20713,14 @@ EOF
 
 fi
 
-echo "$as_me:20714: checking if external environ is declared" >&5
+echo "$as_me:20716: 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 20721 "configure"
+#line 20723 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20731,16 +20733,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20737: \$? = $ac_status" >&5
+  echo "$as_me:20739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20743: \$? = $ac_status" >&5
+  echo "$as_me:20745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20751,7 +20753,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20754: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20756: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20766,14 +20768,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20769: checking if external environ exists" >&5
+echo "$as_me:20771: 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 20776 "configure"
+#line 20778 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20788,16 +20790,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20794: \$? = $ac_status" >&5
+  echo "$as_me:20796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20800: \$? = $ac_status" >&5
+  echo "$as_me:20802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20808,7 +20810,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20811: result: $cf_cv_have_environ" >&5
+echo "$as_me:20813: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20821,13 +20823,13 @@ EOF
 
 fi
 
-echo "$as_me:20824: checking for getenv" >&5
+echo "$as_me:20826: 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 20830 "configure"
+#line 20832 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20858,16 +20860,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20864: \$? = $ac_status" >&5
+  echo "$as_me:20866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20870: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20877,19 +20879,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20880: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20882: 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:20886: checking for $ac_func" >&5
+echo "$as_me:20888: 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 20892 "configure"
+#line 20894 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20920,16 +20922,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20926: \$? = $ac_status" >&5
+  echo "$as_me:20928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20932: \$? = $ac_status" >&5
+  echo "$as_me:20934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20939,7 +20941,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20942: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20944: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20949,7 +20951,7 @@ EOF
 fi
 done
 
-echo "$as_me:20952: checking if getenv returns consistent values" >&5
+echo "$as_me:20954: 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
@@ -20959,7 +20961,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20962 "configure"
+#line 20964 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21064,15 +21066,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21070: \$? = $ac_status" >&5
+  echo "$as_me:21072: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21075: \$? = $ac_status" >&5
+  echo "$as_me:21077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21085,7 +21087,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21088: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21090: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21100,18 +21102,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21103: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21105: 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
 
-echo "$as_me:21107: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21109: 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 21114 "configure"
+#line 21116 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21131,16 +21133,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21137: \$? = $ac_status" >&5
+  echo "$as_me:21139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21143: \$? = $ac_status" >&5
+  echo "$as_me:21145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21152,7 +21154,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21155: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21157: 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
@@ -21167,13 +21169,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21170: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21172: 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 21176 "configure"
+#line 21178 "configure"
 #include "confdefs.h"
 
 int
@@ -21235,16 +21237,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21241: \$? = $ac_status" >&5
+  echo "$as_me:21243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21247: \$? = $ac_status" >&5
+  echo "$as_me:21249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21254,7 +21256,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21257: result: $ac_cv_c_const" >&5
+echo "$as_me:21259: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21264,7 +21266,7 @@ EOF
 
 fi
 
-echo "$as_me:21267: checking for inline" >&5
+echo "$as_me:21269: 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
@@ -21272,7 +21274,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21275 "configure"
+#line 21277 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21281,16 +21283,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21287: \$? = $ac_status" >&5
+  echo "$as_me:21289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21293: \$? = $ac_status" >&5
+  echo "$as_me:21295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21301,7 +21303,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21304: result: $ac_cv_c_inline" >&5
+echo "$as_me:21306: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21327,7 +21329,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21330: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21332: 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
@@ -21336,7 +21338,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21339 "configure"
+#line 21341 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21348,16 +21350,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21354: \$? = $ac_status" >&5
+  echo "$as_me:21356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21360: \$? = $ac_status" >&5
+  echo "$as_me:21362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21369,7 +21371,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21372: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21374: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21475,7 +21477,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21478: checking for signal global datatype" >&5
+echo "$as_me:21480: 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
@@ -21487,7 +21489,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21490 "configure"
+#line 21492 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21511,16 +21513,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21517: \$? = $ac_status" >&5
+  echo "$as_me:21519: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21523: \$? = $ac_status" >&5
+  echo "$as_me:21525: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21534,7 +21536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21537: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21539: 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 <<EOF
@@ -21543,7 +21545,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21546: checking for type of chtype" >&5
+echo "$as_me:21548: 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
@@ -21553,7 +21555,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21556 "configure"
+#line 21558 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21588,15 +21590,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:21596: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21599: \$? = $ac_status" >&5
+  echo "$as_me:21601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21611,7 +21613,7 @@ fi
 
 fi
 
-echo "$as_me:21614: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21616: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21623,14 +21625,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21626: checking if unsigned literals are legal" >&5
+echo "$as_me:21628: 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 21633 "configure"
+#line 21635 "configure"
 #include "confdefs.h"
 
 int
@@ -21642,16 +21644,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21648: \$? = $ac_status" >&5
+  echo "$as_me:21650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21654: \$? = $ac_status" >&5
+  echo "$as_me:21656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21663,7 +21665,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21666: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21668: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21679,14 +21681,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21682: checking if external errno is declared" >&5
+echo "$as_me:21684: 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 21689 "configure"
+#line 21691 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21700,16 +21702,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21706: \$? = $ac_status" >&5
+  echo "$as_me:21708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21712: \$? = $ac_status" >&5
+  echo "$as_me:21714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21720,7 +21722,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21723: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21725: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21735,14 +21737,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21738: checking if external errno exists" >&5
+echo "$as_me:21740: 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 21745 "configure"
+#line 21747 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21757,16 +21759,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21763: \$? = $ac_status" >&5
+  echo "$as_me:21765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21769: \$? = $ac_status" >&5
+  echo "$as_me:21771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21777,7 +21779,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21780: result: $cf_cv_have_errno" >&5
+echo "$as_me:21782: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21790,7 +21792,7 @@ EOF
 
 fi
 
-echo "$as_me:21793: checking if data-only library module links" >&5
+echo "$as_me:21795: 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
@@ -21798,20 +21800,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21801 "configure"
+#line 21803 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21807: \$? = $ac_status" >&5
+  echo "$as_me:21809: \$? = $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 <<EOF
-#line 21814 "configure"
+#line 21816 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21828,10 +21830,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21831: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21834: \$? = $ac_status" >&5
+  echo "$as_me:21836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21844,7 +21846,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21847 "configure"
+#line 21849 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21855,15 +21857,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21861: \$? = $ac_status" >&5
+  echo "$as_me:21863: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21866: \$? = $ac_status" >&5
+  echo "$as_me:21868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21878,7 +21880,7 @@ fi
 
 fi
 
-echo "$as_me:21881: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21883: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21893,13 +21895,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21896: checking for clock_gettime" >&5
+echo "$as_me:21898: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21902 "configure"
+#line 21904 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21930,16 +21932,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21936: \$? = $ac_status" >&5
+  echo "$as_me:21938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21942: \$? = $ac_status" >&5
+  echo "$as_me:21944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21949,12 +21951,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21952: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21954: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21957: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21959: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21962,7 +21964,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21965 "configure"
+#line 21967 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21981,16 +21983,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21987: \$? = $ac_status" >&5
+  echo "$as_me:21989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21993: \$? = $ac_status" >&5
+  echo "$as_me:21995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -22001,7 +22003,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22004: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:22006: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -22013,14 +22015,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:22016: checking if clock_gettime links" >&5
+echo "$as_me:22018: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22023 "configure"
+#line 22025 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22038,16 +22040,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22044: \$? = $ac_status" >&5
+  echo "$as_me:22046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22050: \$? = $ac_status" >&5
+  echo "$as_me:22052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22058,7 +22060,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22061: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22063: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22072,13 +22074,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22075: checking for gettimeofday" >&5
+echo "$as_me:22077: 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 22081 "configure"
+#line 22083 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22109,16 +22111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22115: \$? = $ac_status" >&5
+  echo "$as_me:22117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22121: \$? = $ac_status" >&5
+  echo "$as_me:22123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22128,7 +22130,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22131: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22133: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22138,7 +22140,7 @@ EOF
 
 else
 
-echo "$as_me:22141: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22143: 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
@@ -22146,7 +22148,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22149 "configure"
+#line 22151 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22165,16 +22167,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22171: \$? = $ac_status" >&5
+  echo "$as_me:22173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22177: \$? = $ac_status" >&5
+  echo "$as_me:22179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22185,7 +22187,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22188: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22190: 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
 
@@ -22244,13 +22246,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22247: checking for $ac_func" >&5
+echo "$as_me:22249: 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 22253 "configure"
+#line 22255 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22281,16 +22283,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22287: \$? = $ac_status" >&5
+  echo "$as_me:22289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22293: \$? = $ac_status" >&5
+  echo "$as_me:22295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22300,7 +22302,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22303: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22305: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22310,14 +22312,14 @@ EOF
 fi
 done
 
-echo "$as_me:22313: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22315: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22320 "configure"
+#line 22322 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22332,16 +22334,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22338: \$? = $ac_status" >&5
+  echo "$as_me:22340: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22344: \$? = $ac_status" >&5
+  echo "$as_me:22346: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22351,7 +22353,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22354: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22356: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22373,7 +22375,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22376: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22378: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22383,7 +22385,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22386 "configure"
+#line 22388 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22396,15 +22398,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22402: \$? = $ac_status" >&5
+  echo "$as_me:22404: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22407: \$? = $ac_status" >&5
+  echo "$as_me:22409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22416,7 +22418,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22419: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22421: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22428,14 +22430,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22431: checking for getttynam" >&5
+	echo "$as_me:22433: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22438 "configure"
+#line 22440 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22447,16 +22449,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22453: \$? = $ac_status" >&5
+  echo "$as_me:22455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22459: \$? = $ac_status" >&5
+  echo "$as_me:22461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22466,7 +22468,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22469: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22471: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22476,7 +22478,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22479: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22481: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22485,7 +22487,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22488: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22490: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22498,14 +22500,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22501: checking for terminal-capability database functions" >&5
+echo "$as_me:22503: 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 22508 "configure"
+#line 22510 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22525,16 +22527,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22531: \$? = $ac_status" >&5
+  echo "$as_me:22533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22537: \$? = $ac_status" >&5
+  echo "$as_me:22539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22545,7 +22547,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22548: result: $cf_cv_cgetent" >&5
+echo "$as_me:22550: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22555,14 +22557,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22558: checking if cgetent uses const parameter" >&5
+echo "$as_me:22560: 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 22565 "configure"
+#line 22567 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22585,16 +22587,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22591: \$? = $ac_status" >&5
+  echo "$as_me:22593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22597: \$? = $ac_status" >&5
+  echo "$as_me:22599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22605,7 +22607,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22608: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22610: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22619,14 +22621,14 @@ fi
 
 fi
 
-echo "$as_me:22622: checking for isascii" >&5
+echo "$as_me:22624: 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 22629 "configure"
+#line 22631 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22638,16 +22640,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22644: \$? = $ac_status" >&5
+  echo "$as_me:22646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22650: \$? = $ac_status" >&5
+  echo "$as_me:22652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22658,7 +22660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22661: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22663: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22666,10 +22668,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22669: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22671: 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 22672 "configure"
+#line 22674 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22683,16 +22685,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22689: \$? = $ac_status" >&5
+  echo "$as_me:22691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22695: \$? = $ac_status" >&5
+  echo "$as_me:22697: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22700,7 +22702,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22703 "configure"
+#line 22705 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22715,16 +22717,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22721: \$? = $ac_status" >&5
+  echo "$as_me:22723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22727: \$? = $ac_status" >&5
+  echo "$as_me:22729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22740,11 +22742,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22743: result: $sigact_bad" >&5
+echo "$as_me:22745: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22747: checking if nanosleep really works" >&5
+echo "$as_me:22749: 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
@@ -22754,7 +22756,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22757 "configure"
+#line 22759 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22780,15 +22782,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22786: \$? = $ac_status" >&5
+  echo "$as_me:22788: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22791: \$? = $ac_status" >&5
+  echo "$as_me:22793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22800,7 +22802,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22803: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22805: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22817,23 +22819,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22820: checking for $ac_header" >&5
+echo "$as_me:22822: 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 22826 "configure"
+#line 22828 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22832: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:22838: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22852,7 +22854,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22869,10 +22871,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22872: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22874: 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 22875 "configure"
+#line 22877 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22884,16 +22886,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22890: \$? = $ac_status" >&5
+  echo "$as_me:22892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22896: \$? = $ac_status" >&5
+  echo "$as_me:22898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22901,7 +22903,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22904 "configure"
+#line 22906 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22915,16 +22917,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22921: \$? = $ac_status" >&5
+  echo "$as_me:22923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22927: \$? = $ac_status" >&5
+  echo "$as_me:22929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22940,19 +22942,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22943: result: $termios_bad" >&5
+	echo "$as_me:22945: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22948: checking for tcgetattr" >&5
+echo "$as_me:22950: 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 22955 "configure"
+#line 22957 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22980,16 +22982,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22992: \$? = $ac_status" >&5
+  echo "$as_me:22994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -22999,21 +23001,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23002: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:23004: 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:23009: checking for vsscanf function or workaround" >&5
+echo "$as_me:23011: 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 23016 "configure"
+#line 23018 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23039,16 +23041,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23045: \$? = $ac_status" >&5
+  echo "$as_me:23047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23051: \$? = $ac_status" >&5
+  echo "$as_me:23053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23056,7 +23058,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23059 "configure"
+#line 23061 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23078,16 +23080,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23084: \$? = $ac_status" >&5
+  echo "$as_me:23086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23090: \$? = $ac_status" >&5
+  echo "$as_me:23092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23095,7 +23097,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23098 "configure"
+#line 23100 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23117,16 +23119,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23123: \$? = $ac_status" >&5
+  echo "$as_me:23125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23129: \$? = $ac_status" >&5
+  echo "$as_me:23131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23141,7 +23143,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23144: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23146: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23167,23 +23169,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23170: checking for $ac_header" >&5
+echo "$as_me:23172: 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 23176 "configure"
+#line 23178 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23180: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23186: \$? = $ac_status" >&5
+  echo "$as_me:23188: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23202,7 +23204,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23205: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23212,7 +23214,7 @@ EOF
 fi
 done
 
-echo "$as_me:23215: checking for working mkstemp" >&5
+echo "$as_me:23217: 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
@@ -23223,7 +23225,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23226 "configure"
+#line 23228 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23258,15 +23260,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23264: \$? = $ac_status" >&5
+  echo "$as_me:23266: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23269: \$? = $ac_status" >&5
+  echo "$as_me:23271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23281,16 +23283,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23284: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23286: 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:23287: checking for mkstemp" >&5
+	echo "$as_me:23289: 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 23293 "configure"
+#line 23295 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23321,16 +23323,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23327: \$? = $ac_status" >&5
+  echo "$as_me:23329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23333: \$? = $ac_status" >&5
+  echo "$as_me:23335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23340,7 +23342,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23343: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23345: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23361,21 +23363,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23364: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23366: 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:23367: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23369: 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:23373: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23375: 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 23378 "configure"
+#line 23380 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23392,15 +23394,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23398: \$? = $ac_status" >&5
+  echo "$as_me:23400: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23403: \$? = $ac_status" >&5
+  echo "$as_me:23405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23413,7 +23415,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23416: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23418: 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
 
@@ -23424,13 +23426,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23427: checking for intptr_t" >&5
+echo "$as_me:23429: 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 23433 "configure"
+#line 23435 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23445,16 +23447,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23451: \$? = $ac_status" >&5
+  echo "$as_me:23453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23457: \$? = $ac_status" >&5
+  echo "$as_me:23459: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23464,7 +23466,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23467: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23469: 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
   :
@@ -23476,13 +23478,13 @@ EOF
 
 fi
 
-echo "$as_me:23479: checking for ssize_t" >&5
+echo "$as_me:23481: 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 23485 "configure"
+#line 23487 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23497,16 +23499,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23503: \$? = $ac_status" >&5
+  echo "$as_me:23505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23509: \$? = $ac_status" >&5
+  echo "$as_me:23511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23516,7 +23518,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23519: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23521: 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
   :
@@ -23528,14 +23530,14 @@ EOF
 
 fi
 
-echo "$as_me:23531: checking for type sigaction_t" >&5
+echo "$as_me:23533: 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 23538 "configure"
+#line 23540 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23548,16 +23550,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23554: \$? = $ac_status" >&5
+  echo "$as_me:23556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23560: \$? = $ac_status" >&5
+  echo "$as_me:23562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23568,14 +23570,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23571: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23573: 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:23578: checking declaration of size-change" >&5
+echo "$as_me:23580: 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
@@ -23596,7 +23598,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23599 "configure"
+#line 23601 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23646,16 +23648,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23652: \$? = $ac_status" >&5
+  echo "$as_me:23654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23658: \$? = $ac_status" >&5
+  echo "$as_me:23660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23674,7 +23676,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23677: result: $cf_cv_sizechange" >&5
+echo "$as_me:23679: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23692,13 +23694,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23695: checking for memmove" >&5
+echo "$as_me:23697: 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 23701 "configure"
+#line 23703 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23729,16 +23731,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23735: \$? = $ac_status" >&5
+  echo "$as_me:23737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23741: \$? = $ac_status" >&5
+  echo "$as_me:23743: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23748,19 +23750,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23751: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23753: 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:23757: checking for bcopy" >&5
+echo "$as_me:23759: 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 23763 "configure"
+#line 23765 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23791,16 +23793,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23797: \$? = $ac_status" >&5
+  echo "$as_me:23799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23803: \$? = $ac_status" >&5
+  echo "$as_me:23805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23810,11 +23812,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23813: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23815: 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:23817: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23819: 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
@@ -23824,7 +23826,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23827 "configure"
+#line 23829 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23840,15 +23842,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23846: \$? = $ac_status" >&5
+  echo "$as_me:23848: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23851: \$? = $ac_status" >&5
+  echo "$as_me:23853: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23861,7 +23863,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23864: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23866: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23888,13 +23890,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23891: checking for $ac_func" >&5
+echo "$as_me:23893: 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 23897 "configure"
+#line 23899 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23925,16 +23927,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23931: \$? = $ac_status" >&5
+  echo "$as_me:23933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23937: \$? = $ac_status" >&5
+  echo "$as_me:23939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23944,7 +23946,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23947: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23949: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23954,7 +23956,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23957: checking if poll really works" >&5
+echo "$as_me:23959: 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
@@ -23964,7 +23966,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23967 "configure"
+#line 23969 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24017,15 +24019,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24023: \$? = $ac_status" >&5
+  echo "$as_me:24025: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24028: \$? = $ac_status" >&5
+  echo "$as_me:24030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24037,21 +24039,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24040: result: $cf_cv_working_poll" >&5
+echo "$as_me:24042: 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:24047: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24049: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24054 "configure"
+#line 24056 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24071,16 +24073,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24076: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24077: \$? = $ac_status" >&5
+  echo "$as_me:24079: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24083: \$? = $ac_status" >&5
+  echo "$as_me:24085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24090,7 +24092,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24093: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24095: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24100,18 +24102,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24103: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24105: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24107: checking for va_copy" >&5
+echo "$as_me:24109: 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 24114 "configure"
+#line 24116 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24128,16 +24130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24134: \$? = $ac_status" >&5
+  echo "$as_me:24136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24140: \$? = $ac_status" >&5
+  echo "$as_me:24142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24147,7 +24149,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24150: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24152: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24159,14 +24161,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24162: checking for __va_copy" >&5
+echo "$as_me:24164: 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 24169 "configure"
+#line 24171 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24183,16 +24185,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24189: \$? = $ac_status" >&5
+  echo "$as_me:24191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24195: \$? = $ac_status" >&5
+  echo "$as_me:24197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24202,7 +24204,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24205: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24207: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24214,14 +24216,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24217: checking for __builtin_va_copy" >&5
+echo "$as_me:24219: 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 24224 "configure"
+#line 24226 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24238,16 +24240,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24244: \$? = $ac_status" >&5
+  echo "$as_me:24246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24250: \$? = $ac_status" >&5
+  echo "$as_me:24252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24257,7 +24259,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24260: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24262: 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 &&
@@ -24275,14 +24277,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24278: checking if we can simply copy va_list" >&5
+	echo "$as_me:24280: 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 24285 "configure"
+#line 24287 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24299,16 +24301,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24305: \$? = $ac_status" >&5
+  echo "$as_me:24307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24311: \$? = $ac_status" >&5
+  echo "$as_me:24313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24318,19 +24320,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24321: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24323: 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:24326: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24328: 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 24333 "configure"
+#line 24335 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24347,16 +24349,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24353: \$? = $ac_status" >&5
+  echo "$as_me:24355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24359: \$? = $ac_status" >&5
+  echo "$as_me:24361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24366,7 +24368,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24369: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24371: 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
@@ -24377,13 +24379,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24380: checking for pid_t" >&5
+echo "$as_me:24382: 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 24386 "configure"
+#line 24388 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24398,16 +24400,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24404: \$? = $ac_status" >&5
+  echo "$as_me:24406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24410: \$? = $ac_status" >&5
+  echo "$as_me:24412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24417,7 +24419,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24420: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24422: 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
   :
@@ -24432,23 +24434,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24435: checking for $ac_header" >&5
+echo "$as_me:24437: 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 24441 "configure"
+#line 24443 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24447: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24451: \$? = $ac_status" >&5
+  echo "$as_me:24453: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24467,7 +24469,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24472: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24480,13 +24482,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24483: checking for $ac_func" >&5
+echo "$as_me:24485: 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 24489 "configure"
+#line 24491 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24517,16 +24519,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24523: \$? = $ac_status" >&5
+  echo "$as_me:24525: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24529: \$? = $ac_status" >&5
+  echo "$as_me:24531: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24536,7 +24538,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24539: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24541: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24548,7 +24550,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24551: checking for working fork" >&5
+  echo "$as_me:24553: 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
@@ -24571,15 +24573,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24577: \$? = $ac_status" >&5
+  echo "$as_me:24579: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24582: \$? = $ac_status" >&5
+  echo "$as_me:24584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24591,7 +24593,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24594: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24596: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24605,12 +24607,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24608: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24610: 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:24613: checking for working vfork" >&5
+  echo "$as_me:24615: 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
@@ -24619,7 +24621,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24622 "configure"
+#line 24624 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24712,15 +24714,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24718: \$? = $ac_status" >&5
+  echo "$as_me:24720: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24723: \$? = $ac_status" >&5
+  echo "$as_me:24725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24732,13 +24734,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24735: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24737: 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:24741: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24743: 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
 
@@ -24763,7 +24765,7 @@ EOF
 
 fi
 
-echo "$as_me:24766: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24768: 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
@@ -24773,7 +24775,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24776 "configure"
+#line 24778 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24808,15 +24810,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24814: \$? = $ac_status" >&5
+  echo "$as_me:24816: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24819: \$? = $ac_status" >&5
+  echo "$as_me:24821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24829,20 +24831,20 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24832: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24834: 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
 EOF
 
-	echo "$as_me:24839: checking for cc_t" >&5
+	echo "$as_me:24841: checking for cc_t" >&5
 echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
 if test "${ac_cv_type_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24845 "configure"
+#line 24847 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24860,16 +24862,16 @@ if (sizeof (cc_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24866: \$? = $ac_status" >&5
+  echo "$as_me:24868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24872: \$? = $ac_status" >&5
+  echo "$as_me:24874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_cc_t=yes
 else
@@ -24879,7 +24881,7 @@ ac_cv_type_cc_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24882: result: $ac_cv_type_cc_t" >&5
+echo "$as_me:24884: result: $ac_cv_type_cc_t" >&5
 echo "${ECHO_T}$ac_cv_type_cc_t" >&6
 if test "$ac_cv_type_cc_t" = yes; then
 
@@ -24889,13 +24891,13 @@ EOF
 
 fi
 
-	echo "$as_me:24892: checking for speed_t" >&5
+	echo "$as_me:24894: checking for speed_t" >&5
 echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
 if test "${ac_cv_type_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24898 "configure"
+#line 24900 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24913,16 +24915,16 @@ if (sizeof (speed_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24919: \$? = $ac_status" >&5
+  echo "$as_me:24921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24925: \$? = $ac_status" >&5
+  echo "$as_me:24927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_speed_t=yes
 else
@@ -24932,7 +24934,7 @@ ac_cv_type_speed_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24935: result: $ac_cv_type_speed_t" >&5
+echo "$as_me:24937: result: $ac_cv_type_speed_t" >&5
 echo "${ECHO_T}$ac_cv_type_speed_t" >&6
 if test "$ac_cv_type_speed_t" = yes; then
 
@@ -24942,13 +24944,13 @@ EOF
 
 fi
 
-	echo "$as_me:24945: checking for tcflag_t" >&5
+	echo "$as_me:24947: checking for tcflag_t" >&5
 echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
 if test "${ac_cv_type_tcflag_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24951 "configure"
+#line 24953 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24966,16 +24968,16 @@ if (sizeof (tcflag_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24972: \$? = $ac_status" >&5
+  echo "$as_me:24974: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24978: \$? = $ac_status" >&5
+  echo "$as_me:24980: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_tcflag_t=yes
 else
@@ -24985,7 +24987,7 @@ ac_cv_type_tcflag_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24988: result: $ac_cv_type_tcflag_t" >&5
+echo "$as_me:24990: result: $ac_cv_type_tcflag_t" >&5
 echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
 if test "$ac_cv_type_tcflag_t" = yes; then
 
@@ -24995,13 +24997,13 @@ EOF
 
 fi
 
-	echo "$as_me:24998: checking for sigset_t" >&5
+	echo "$as_me:25000: checking for sigset_t" >&5
 echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
 if test "${ac_cv_type_sigset_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25004 "configure"
+#line 25006 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25019,16 +25021,16 @@ if (sizeof (sigset_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25025: \$? = $ac_status" >&5
+  echo "$as_me:25027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25031: \$? = $ac_status" >&5
+  echo "$as_me:25033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_sigset_t=yes
 else
@@ -25038,7 +25040,7 @@ ac_cv_type_sigset_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25041: result: $ac_cv_type_sigset_t" >&5
+echo "$as_me:25043: result: $ac_cv_type_sigset_t" >&5
 echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
 if test "$ac_cv_type_sigset_t" = yes; then
 
@@ -25050,7 +25052,7 @@ fi
 
 # special check for test/ditto.c
 
-echo "$as_me:25053: checking for openpty in -lutil" >&5
+echo "$as_me:25055: 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
@@ -25058,7 +25060,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25061 "configure"
+#line 25063 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25077,16 +25079,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25083: \$? = $ac_status" >&5
+  echo "$as_me:25085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25089: \$? = $ac_status" >&5
+  echo "$as_me:25091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -25097,7 +25099,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25100: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:25102: 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
@@ -25105,7 +25107,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:25108: checking for openpty header" >&5
+echo "$as_me:25110: 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
@@ -25132,7 +25134,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25135 "configure"
+#line 25137 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -25150,16 +25152,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25156: \$? = $ac_status" >&5
+  echo "$as_me:25158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25162: \$? = $ac_status" >&5
+  echo "$as_me:25164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -25177,7 +25179,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:25180: result: $cf_cv_func_openpty" >&5
+echo "$as_me:25182: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25250,7 +25252,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25253 "configure"
+#line 25255 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25262,16 +25264,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25268: \$? = $ac_status" >&5
+  echo "$as_me:25270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25274: \$? = $ac_status" >&5
+  echo "$as_me:25276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25288,7 +25290,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25291: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25293: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25324,7 +25326,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25327: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25329: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25335,7 +25337,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25338: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25340: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25407,7 +25409,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25410 "configure"
+#line 25412 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25419,16 +25421,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25425: \$? = $ac_status" >&5
+  echo "$as_me:25427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25431: \$? = $ac_status" >&5
+  echo "$as_me:25433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25445,7 +25447,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25448: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25450: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25525,7 +25527,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25528: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25530: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25542,23 +25544,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25545: checking for db.h" >&5
+echo "$as_me:25547: 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 25551 "configure"
+#line 25553 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25555: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25561: \$? = $ac_status" >&5
+  echo "$as_me:25563: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25577,11 +25579,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25580: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25582: 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:25584: checking for version of db" >&5
+echo "$as_me:25586: 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
@@ -25592,10 +25594,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25595: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25597: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25598 "configure"
+#line 25600 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25625,16 +25627,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25631: \$? = $ac_status" >&5
+  echo "$as_me:25633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25637: \$? = $ac_status" >&5
+  echo "$as_me:25639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25648,16 +25650,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25651: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25653: 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:25655: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25657: 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:25660: checking for db libraries" >&5
+echo "$as_me:25662: 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
@@ -25687,10 +25689,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25690: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25692: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25693 "configure"
+#line 25695 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25745,16 +25747,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25751: \$? = $ac_status" >&5
+  echo "$as_me:25753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25757: \$? = $ac_status" >&5
+  echo "$as_me:25759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25774,11 +25776,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25777: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25779: 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:25781: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25783: 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
@@ -25804,7 +25806,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25807: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25809: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25819,7 +25821,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25822: checking if we should include stdbool.h" >&5
+echo "$as_me:25824: 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
@@ -25827,7 +25829,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25830 "configure"
+#line 25832 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -25843,23 +25845,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25849: \$? = $ac_status" >&5
+  echo "$as_me:25851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25855: \$? = $ac_status" >&5
+  echo "$as_me:25857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25862 "configure"
+#line 25864 "configure"
 #include "confdefs.h"
 
 int
@@ -25871,16 +25873,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25876: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25877: \$? = $ac_status" >&5
+  echo "$as_me:25879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25883: \$? = $ac_status" >&5
+  echo "$as_me:25885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=0
 else
@@ -25893,13 +25895,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25896: result: yes" >&5
+then	echo "$as_me:25898: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25898: result: no" >&5
+else	echo "$as_me:25900: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25902: checking for builtin bool type" >&5
+echo "$as_me:25904: 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
@@ -25907,7 +25909,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25910 "configure"
+#line 25912 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25922,16 +25924,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25928: \$? = $ac_status" >&5
+  echo "$as_me:25930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25934: \$? = $ac_status" >&5
+  echo "$as_me:25936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
@@ -25943,9 +25945,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25946: result: yes" >&5
+then	echo "$as_me:25948: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25948: result: no" >&5
+else	echo "$as_me:25950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25962,10 +25964,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25965: checking if we already have C++ library" >&5
+	echo "$as_me:25967: 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 25968 "configure"
+#line 25970 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25979,16 +25981,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25985: \$? = $ac_status" >&5
+  echo "$as_me:25987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25991: \$? = $ac_status" >&5
+  echo "$as_me:25993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25997,7 +25999,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:26000: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -26016,7 +26018,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:26019: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:26021: 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
@@ -26042,7 +26044,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26045 "configure"
+#line 26047 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26056,16 +26058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26062: \$? = $ac_status" >&5
+  echo "$as_me:26064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26068: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -26077,7 +26079,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:26080: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -26099,7 +26101,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:26102: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26104: 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
@@ -26114,15 +26116,15 @@ CF_EOF
 # 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:26117: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26120: \$? = $ac_status" >&5
+  echo "$as_me:26122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26122: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26125: \$? = $ac_status" >&5
+  echo "$as_me:26127: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -26133,10 +26135,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:26136: result: yes" >&5
+  echo "$as_me:26138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:26139: result: no" >&5
+  echo "$as_me:26141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26156,7 +26158,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:26159: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -26177,7 +26179,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26180 "configure"
+#line 26182 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -26191,16 +26193,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26197: \$? = $ac_status" >&5
+  echo "$as_me:26199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26203: \$? = $ac_status" >&5
+  echo "$as_me:26205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26237,7 +26239,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26240 "configure"
+#line 26242 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26251,16 +26253,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26257: \$? = $ac_status" >&5
+  echo "$as_me:26259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26263: \$? = $ac_status" >&5
+  echo "$as_me:26265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26293,7 +26295,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26296: result: $cf_cxx_library" >&5
+	echo "$as_me:26298: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26309,7 +26311,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26312: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26314: 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
@@ -26326,18 +26328,18 @@ do
   # 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 26329 "configure"
+#line 26331 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26334: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26340: \$? = $ac_status" >&5
+  echo "$as_me:26342: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26360,17 +26362,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26363 "configure"
+#line 26365 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26373: \$? = $ac_status" >&5
+  echo "$as_me:26375: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26407,7 +26409,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26410: result: $CXXCPP" >&5
+echo "$as_me:26412: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26417,18 +26419,18 @@ do
   # 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 26420 "configure"
+#line 26422 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26431: \$? = $ac_status" >&5
+  echo "$as_me:26433: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26451,17 +26453,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26454 "configure"
+#line 26456 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26458: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26464: \$? = $ac_status" >&5
+  echo "$as_me:26466: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26489,7 +26491,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26492: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26504,23 +26506,23 @@ ac_main_return="return"
 for ac_header in new exception typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26507: checking for $ac_header" >&5
+echo "$as_me:26509: 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 26513 "configure"
+#line 26515 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26523: \$? = $ac_status" >&5
+  echo "$as_me:26525: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26539,7 +26541,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26552,23 +26554,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26555: checking for $ac_header" >&5
+echo "$as_me:26557: 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 26561 "configure"
+#line 26563 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26571: \$? = $ac_status" >&5
+  echo "$as_me:26573: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26587,7 +26589,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26598,10 +26600,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26601: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26603: 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 26604 "configure"
+#line 26606 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26618,16 +26620,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26624: \$? = $ac_status" >&5
+  echo "$as_me:26626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26630: \$? = $ac_status" >&5
+  echo "$as_me:26632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26636,7 +26638,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26639: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26647,7 +26649,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26650: checking if we should include stdbool.h" >&5
+echo "$as_me:26652: 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
@@ -26655,7 +26657,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26658 "configure"
+#line 26660 "configure"
 #include "confdefs.h"
 
 #ifndef __BEOS__
@@ -26671,23 +26673,23 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26677: \$? = $ac_status" >&5
+  echo "$as_me:26679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26683: \$? = $ac_status" >&5
+  echo "$as_me:26685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26690 "configure"
+#line 26692 "configure"
 #include "confdefs.h"
 
 int
@@ -26699,16 +26701,16 @@ bool foo = false; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26705: \$? = $ac_status" >&5
+  echo "$as_me:26707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26711: \$? = $ac_status" >&5
+  echo "$as_me:26713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=0
 else
@@ -26721,13 +26723,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26724: result: yes" >&5
+then	echo "$as_me:26726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26726: result: no" >&5
+else	echo "$as_me:26728: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26730: checking for builtin bool type" >&5
+echo "$as_me:26732: 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
@@ -26735,7 +26737,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26738 "configure"
+#line 26740 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26750,16 +26752,16 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26756: \$? = $ac_status" >&5
+  echo "$as_me:26758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26762: \$? = $ac_status" >&5
+  echo "$as_me:26764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
@@ -26771,19 +26773,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26774: result: yes" >&5
+then	echo "$as_me:26776: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26776: result: no" >&5
+else	echo "$as_me:26778: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26780: checking for bool" >&5
+echo "$as_me:26782: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26786 "configure"
+#line 26788 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26818,16 +26820,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26824: \$? = $ac_status" >&5
+  echo "$as_me:26826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26830: \$? = $ac_status" >&5
+  echo "$as_me:26832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26837,10 +26839,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26840: result: $ac_cv_type_bool" >&5
+echo "$as_me:26842: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26843: checking size of bool" >&5
+echo "$as_me:26845: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26849,7 +26851,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26852 "configure"
+#line 26854 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26881,21 +26883,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26887: \$? = $ac_status" >&5
+  echo "$as_me:26889: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26893: \$? = $ac_status" >&5
+  echo "$as_me:26895: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26898 "configure"
+#line 26900 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26927,16 +26929,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26933: \$? = $ac_status" >&5
+  echo "$as_me:26935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26939: \$? = $ac_status" >&5
+  echo "$as_me:26941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26952,7 +26954,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26955 "configure"
+#line 26957 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26984,16 +26986,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26990: \$? = $ac_status" >&5
+  echo "$as_me:26992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26996: \$? = $ac_status" >&5
+  echo "$as_me:26998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27009,7 +27011,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27012 "configure"
+#line 27014 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27041,16 +27043,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27047: \$? = $ac_status" >&5
+  echo "$as_me:27049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27053: \$? = $ac_status" >&5
+  echo "$as_me:27055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27063,12 +27065,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27066: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27068: 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 27071 "configure"
+#line 27073 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27104,15 +27106,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27110: \$? = $ac_status" >&5
+  echo "$as_me:27112: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27115: \$? = $ac_status" >&5
+  echo "$as_me:27117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27128,13 +27130,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27131: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27133: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27137: checking for type of bool" >&5
+echo "$as_me:27139: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27153,7 +27155,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27156 "configure"
+#line 27158 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27194,15 +27196,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27200: \$? = $ac_status" >&5
+  echo "$as_me:27202: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27205: \$? = $ac_status" >&5
+  echo "$as_me:27207: \$? = $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
@@ -27219,19 +27221,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27222: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27224: 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:27229: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27231: 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:27234: checking for special defines needed for etip.h" >&5
+echo "$as_me:27236: 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"
@@ -27249,7 +27251,7 @@ do
 	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 27252 "configure"
+#line 27254 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27263,16 +27265,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27269: \$? = $ac_status" >&5
+  echo "$as_me:27271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27275: \$? = $ac_status" >&5
+  echo "$as_me:27277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27293,12 +27295,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27296: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27298: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27301: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27303: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27315,7 +27317,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27318 "configure"
+#line 27320 "configure"
 #include "confdefs.h"
 
 class base
@@ -27334,15 +27336,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27340: \$? = $ac_status" >&5
+  echo "$as_me:27342: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27345: \$? = $ac_status" >&5
+  echo "$as_me:27347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27361,7 +27363,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27364: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27366: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27370,7 +27372,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27373: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27375: 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
@@ -27387,7 +27389,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27390 "configure"
+#line 27392 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27406,15 +27408,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27412: \$? = $ac_status" >&5
+  echo "$as_me:27414: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27417: \$? = $ac_status" >&5
+  echo "$as_me:27419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27433,7 +27435,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27436: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27438: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27443,7 +27445,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27446: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27448: 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
@@ -27457,7 +27459,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27460 "configure"
+#line 27462 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27501,16 +27503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27507: \$? = $ac_status" >&5
+  echo "$as_me:27509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27513: \$? = $ac_status" >&5
+  echo "$as_me:27515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27528,7 +27530,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27531: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27533: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27576,13 +27578,13 @@ else
 		cf_cv_header_stdbool_h=0
 	else
 
-echo "$as_me:27579: checking for bool" >&5
+echo "$as_me:27581: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27585 "configure"
+#line 27587 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27617,16 +27619,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27623: \$? = $ac_status" >&5
+  echo "$as_me:27625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27629: \$? = $ac_status" >&5
+  echo "$as_me:27631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27636,10 +27638,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27639: result: $ac_cv_type_bool" >&5
+echo "$as_me:27641: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27642: checking size of bool" >&5
+echo "$as_me:27644: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27648,7 +27650,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27651 "configure"
+#line 27653 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27680,21 +27682,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27686: \$? = $ac_status" >&5
+  echo "$as_me:27688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27692: \$? = $ac_status" >&5
+  echo "$as_me:27694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27697 "configure"
+#line 27699 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27726,16 +27728,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27732: \$? = $ac_status" >&5
+  echo "$as_me:27734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27738: \$? = $ac_status" >&5
+  echo "$as_me:27740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27751,7 +27753,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27754 "configure"
+#line 27756 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27783,16 +27785,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27789: \$? = $ac_status" >&5
+  echo "$as_me:27791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27795: \$? = $ac_status" >&5
+  echo "$as_me:27797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27808,7 +27810,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27811 "configure"
+#line 27813 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27840,16 +27842,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27846: \$? = $ac_status" >&5
+  echo "$as_me:27848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27852: \$? = $ac_status" >&5
+  echo "$as_me:27854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27862,12 +27864,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27865: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27867: 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 27870 "configure"
+#line 27872 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27903,15 +27905,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27909: \$? = $ac_status" >&5
+  echo "$as_me:27911: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27914: \$? = $ac_status" >&5
+  echo "$as_me:27916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27927,13 +27929,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27930: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27932: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27936: checking for type of bool" >&5
+echo "$as_me:27938: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27952,7 +27954,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27955 "configure"
+#line 27957 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27993,15 +27995,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27999: \$? = $ac_status" >&5
+  echo "$as_me:28001: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28004: \$? = $ac_status" >&5
+  echo "$as_me:28006: \$? = $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
@@ -28018,14 +28020,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:28021: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:28023: 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:28028: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:28030: 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
@@ -28056,7 +28058,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:28059: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:28061: 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
@@ -28067,7 +28069,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:28070: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:28072: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -28084,10 +28086,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:28087: result: $ADAFLAGS" >&5
+	echo "$as_me:28089: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:28090: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28092: 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
@@ -28097,11 +28099,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:28100: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28102: 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:28104: checking if GNAT supports generics" >&5
+echo "$as_me:28106: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -28111,7 +28113,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:28114: result: $cf_gnat_generics" >&5
+echo "$as_me:28116: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -28123,7 +28125,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:28126: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28128: 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
@@ -28171,7 +28173,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:28174: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28176: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -28184,7 +28186,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:28187: checking if GNAT supports project files" >&5
+echo "$as_me:28189: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28247,15 +28249,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28250: result: $cf_gnat_projects" >&5
+echo "$as_me:28252: 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:28256: checking if GNAT supports libraries" >&5
+	echo "$as_me:28258: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28258: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28260: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28275,7 +28277,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28278: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28280: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28287,7 +28289,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28290: checking for Ada95 compiler" >&5
+echo "$as_me:28292: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28298,12 +28300,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28301: result: $cf_ada_compiler" >&5
+echo "$as_me:28303: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28306: checking for Ada95 include directory" >&5
+echo "$as_me:28308: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28337,7 +28339,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28340: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28346,10 +28348,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28349: result: $ADA_INCLUDE" >&5
+echo "$as_me:28351: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28352: checking for Ada95 object directory" >&5
+echo "$as_me:28354: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28383,7 +28385,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28386: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28388: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28392,10 +28394,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28395: result: $ADA_OBJECTS" >&5
+echo "$as_me:28397: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28398: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28400: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28416,11 +28418,11 @@ then
 	fi
 fi
 
-echo "$as_me:28419: result: $with_ada_sharedlib" >&5
+echo "$as_me:28421: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28423: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28425: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28438,7 +28440,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28441: checking for Ada95 curses library name" >&5
+echo "$as_me:28443: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28454,7 +28456,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28457: result: $ADA_LIBNAME" >&5
+echo "$as_me:28459: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28465,13 +28467,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28468: checking for wchar_t" >&5
+	echo "$as_me:28470: 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 28474 "configure"
+#line 28476 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28486,16 +28488,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28492: \$? = $ac_status" >&5
+  echo "$as_me:28494: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28498: \$? = $ac_status" >&5
+  echo "$as_me:28500: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28505,10 +28507,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28508: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28510: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28511: checking size of wchar_t" >&5
+echo "$as_me:28513: 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
@@ -28517,7 +28519,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28520 "configure"
+#line 28522 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28529,21 +28531,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28534: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28535: \$? = $ac_status" >&5
+  echo "$as_me:28537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28541: \$? = $ac_status" >&5
+  echo "$as_me:28543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28546 "configure"
+#line 28548 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28555,16 +28557,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28561: \$? = $ac_status" >&5
+  echo "$as_me:28563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28567: \$? = $ac_status" >&5
+  echo "$as_me:28569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28580,7 +28582,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28583 "configure"
+#line 28585 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28592,16 +28594,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28598: \$? = $ac_status" >&5
+  echo "$as_me:28600: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28604: \$? = $ac_status" >&5
+  echo "$as_me:28606: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28617,7 +28619,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28620 "configure"
+#line 28622 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28629,16 +28631,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28635: \$? = $ac_status" >&5
+  echo "$as_me:28637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28641: \$? = $ac_status" >&5
+  echo "$as_me:28643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28651,12 +28653,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28654: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28656: 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 28659 "configure"
+#line 28661 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28672,15 +28674,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28678: \$? = $ac_status" >&5
+  echo "$as_me:28680: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28683: \$? = $ac_status" >&5
+  echo "$as_me:28685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28696,7 +28698,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28699: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28701: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28709,7 +28711,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28712: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28714: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28727,7 +28729,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28730: checking for library subsets" >&5
+echo "$as_me:28732: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28781,7 +28783,7 @@ fi
 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:28784: result: $LIB_SUBSETS" >&5
+echo "$as_me:28786: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28812,7 +28814,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28815: checking default library suffix" >&5
+echo "$as_me:28817: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28823,10 +28825,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28826: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28828: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28829: checking default library-dependency suffix" >&5
+echo "$as_me:28831: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28909,10 +28911,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28912: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28914: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28915: checking default object directory" >&5
+echo "$as_me:28917: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28928,11 +28930,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28931: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28933: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28935: checking c++ library-dependency suffix" >&5
+echo "$as_me:28937: 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++)
@@ -29025,7 +29027,7 @@ else
 	fi
 
 fi
-echo "$as_me:29028: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:29030: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -29201,19 +29203,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:29204: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29206: 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 <<EOF
-#line 29209 "configure"
+#line 29211 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:29213: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29216: \$? = $ac_status" >&5
+  echo "$as_me:29218: \$? = $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
@@ -29224,10 +29226,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29227 "configure"
+#line 29229 "configure"
 #include "confdefs.h"
 
-#line 29230 "configure"
+#line 29232 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29242,16 +29244,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29248: \$? = $ac_status" >&5
+  echo "$as_me:29250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29254: \$? = $ac_status" >&5
+  echo "$as_me:29256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29274,7 +29276,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29277: result: $cf_ldflags_static" >&5
+	echo "$as_me:29279: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29290,7 +29292,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29293: checking where we will install curses.h" >&5
+echo "$as_me:29295: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29300,7 +29302,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29303: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29305: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29308,7 +29310,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29311: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29313: 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
@@ -29333,7 +29335,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29336: checking for desired basename for form library" >&5
+echo "$as_me:29338: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29353,10 +29355,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29356: result: $FORM_NAME" >&5
+echo "$as_me:29358: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29359: checking for desired basename for menu library" >&5
+echo "$as_me:29361: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29376,10 +29378,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29379: result: $MENU_NAME" >&5
+echo "$as_me:29381: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29382: checking for desired basename for panel library" >&5
+echo "$as_me:29384: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29399,10 +29401,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29402: result: $PANEL_NAME" >&5
+echo "$as_me:29404: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29405: checking for desired basename for cxx library" >&5
+echo "$as_me:29407: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29422,13 +29424,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29425: result: $CXX_NAME" >&5
+echo "$as_me:29427: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29431: checking for src modules" >&5
+echo "$as_me:29433: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29487,7 +29489,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29490: result: $cf_cv_src_modules" >&5
+echo "$as_me:29492: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29648,7 +29650,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29651: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29653: 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//'`
@@ -29659,7 +29661,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29662: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29664: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29675,7 +29677,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29678: result: $PKG_CFLAGS" >&5
+echo "$as_me:29680: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29747,7 +29749,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29750: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29752: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29774,7 +29776,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29777: checking for linker search path" >&5
+echo "$as_me:29779: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29822,7 +29824,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29825: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29827: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29863,7 +29865,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29866: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29868: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29949,7 +29951,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29952: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29954: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -30130,7 +30132,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:30133: error: ambiguous option: $1
+    { { echo "$as_me:30135: 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;}
@@ -30149,7 +30151,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:30152: error: unrecognized option: $1
+  -*) { { echo "$as_me:30154: 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;}
@@ -30281,7 +30283,7 @@ do
   "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:30284: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30286: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30809,7 +30811,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30812: creating $ac_file" >&5
+    { echo "$as_me:30814: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30827,7 +30829,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30830: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30832: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30840,7 +30842,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30843: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30845: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30856,7 +30858,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30859: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30861: 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;}
@@ -30865,7 +30867,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30868: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30870: 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;}
@@ -30910,7 +30912,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30913: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30915: 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;}
@@ -30921,7 +30923,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30924: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30926: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30970,7 +30972,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30973: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30975: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30981,7 +30983,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30984: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30986: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30994,7 +30996,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30997: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30999: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31052,7 +31054,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:31055: $ac_file is unchanged" >&5
+      { echo "$as_me:31057: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31439,7 +31441,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31442: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31444: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/dist.mk b/dist.mk
index 47e52dd09..f56f4cc0e 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1654 2025/02/08 11:01:51 tom Exp $
+# $Id: dist.mk,v 1.1655 2025/02/15 12:35:22 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250208
+NCURSES_PATCH = 20250215
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index e08766743..7beefe79c 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp @
+  * @Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_attr 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_attr 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 
@@ -219,7 +219,7 @@ <H1 class="no-header">curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
               <STRONG>A_ALTCHARSET</STRONG>   Alternate character set
               <STRONG>A_ITALIC</STRONG>       Italics (non-X/Open extension)
               <STRONG>A_ATTRIBUTES</STRONG>   Mask to extract character code
-              <STRONG>A_CHARTEXT</STRONG>     Mask to extract atributes
+              <STRONG>A_CHARTEXT</STRONG>     Mask to extract attributes
               <STRONG>A_COLOR</STRONG>        Mask to extract color pair identifier
 
        <STRONG>attr_on</STRONG>,  <STRONG>attr_off</STRONG>,  and  <STRONG>attr_set</STRONG> support the foregoing as well as the
@@ -287,7 +287,7 @@ <H1 class="no-header">curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
            standard pointer to <EM>short</EM> parameter.
 
        <STRONG>o</STRONG>   For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the  <EM>opts</EM>
-           parameter is ignored except except to check that it is <EM>NULL</EM>.
+           parameter is ignored except to check that it is <EM>NULL</EM>.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -493,7 +493,7 @@ <H1 class="no-header">curs_attr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                     <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 9d3030485..7a1496ba5 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp @
+  * @Id: curs_bkgrnd.3x,v 1.58 2025/02/15 18:40:23 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 
@@ -190,7 +190,7 @@ <H1 class="no-header">curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                   <STRONG><A HREF="curs_bkgrnd.3x.html">curs_bkgrnd(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index b5136a5f4..086b68419 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 
@@ -105,29 +105,28 @@ <H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
            <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>, <EM>curses</EM> calls <STRONG>wrefresh</STRONG> on it.
 
        If  the wide character is a carriage return and <STRONG><A HREF="curs_inopts.3x.html">nl(3x)</A></STRONG> has been called,
-       <STRONG>wget_wch</STRONG> stores the the wide  character  code  for  line  feed  in  <EM>wch</EM>
-       instead.
+       <STRONG>wget_wch</STRONG> stores the wide character code for line feed in <EM>wch</EM> instead.
 
 
 </PRE><H3><a name="h3-Ungetting-Characters">Ungetting Characters</a></H3><PRE>
-       <STRONG>unget_wch</STRONG>  places  <EM>wc</EM>  into the input queue to be retrieved by the next
-       call to <STRONG>wget_wch</STRONG>.  A single input queue serves all  windows  associated
+       <STRONG>unget_wch</STRONG> places <EM>wc</EM> into the input queue to be retrieved  by  the  next
+       call  to  <STRONG>wget_wch</STRONG>.  A single input queue serves all windows associated
        with the screen.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-       <STRONG>wget_wch</STRONG>  returns  <STRONG>OK</STRONG> when it reads a wide character, <STRONG>KEY_CODE_YES</STRONG> when
+       <STRONG>wget_wch</STRONG> returns <STRONG>OK</STRONG> when it reads a wide character,  <STRONG>KEY_CODE_YES</STRONG>  when
        it reads a function key code, and <STRONG>ERR</STRONG> on failure.  <STRONG>wget_wch</STRONG> fails if
 
        <STRONG>o</STRONG>   its timeout expires without any data arriving, or
 
-       <STRONG>o</STRONG>   execution was interrupted by a signal, in which case <EM>errno</EM>  is  set
+       <STRONG>o</STRONG>   execution  was  interrupted by a signal, in which case <EM>errno</EM> is set
            to <EM>EINTR</EM>.
 
-       Functions  taking  a  <EM>WINDOW</EM>  pointer  argument  fail  if <EM>win</EM> is a null
+       Functions taking a <EM>WINDOW</EM> pointer  argument  fail  if  <EM>win</EM>  is  a  null
        pointer.
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
        <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> if there is no more room in the
@@ -140,13 +139,13 @@ <H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        All of these functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be implemented
        as macros.
 
-       Unlike  <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>,  <STRONG>wget_wch</STRONG>  and  its variants store the value of the
-       input character in an additional <EM>wch</EM> parameter instead  of  the  return
+       Unlike <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG>, <STRONG>wget_wch</STRONG> and its variants store  the  value  of  the
+       input  character  in  an additional <EM>wch</EM> parameter instead of the return
        value.
 
-       Unlike  <STRONG>ungetch</STRONG>,  <STRONG>unget_wch</STRONG>  cannot distinguish function key codes from
-       conventional  character  codes.   An  application  can  overcome   this
-       limitation  by pushing function key codes with <STRONG>ungetch</STRONG> and subsequently
+       Unlike <STRONG>ungetch</STRONG>, <STRONG>unget_wch</STRONG> cannot distinguish function  key  codes  from
+       conventional   character  codes.   An  application  can  overcome  this
+       limitation by pushing function key codes with <STRONG>ungetch</STRONG> and  subsequently
        checking the return value of <STRONG>wget_wch</STRONG> for a match with <STRONG>KEY_CODE_YES</STRONG>.
 
 
@@ -161,18 +160,18 @@ <H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        X/Open Curses Issue 4 describes these functions.  It specifies no error
        conditions for them.
 
-       See the "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding  the  interaction
+       See  the  "PORTABILITY" section of <STRONG><A HREF="curs_getch.3x.html">wgetch(3x)</A></STRONG> regarding the interaction
        of <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM> with signal handlers.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
-       System V Interface Definition Version 4  of  the  same  year  specified
+       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
        functions named <EM>wgetwch</EM> (with its variants) <EM>ungetwch</EM>.  These were later
-       additions to SVr4.<EM>x</EM>, not appearing in  the  first  SVr4  (1989).   They
+       additions  to  SVr4.<EM>x</EM>,  not  appearing  in the first SVr4 (1989).  They
        differ from X/Open's later <EM>wget</EM><STRONG>_</STRONG><EM>wch</EM> and <EM>unget</EM><STRONG>_</STRONG><EM>wch</EM> in that <EM>wgetwch</EM> takes
-       no <EM>wch</EM> argument, but returns the (wide) key code as  an  <EM>int</EM>  (with  no
-       provision  for  distinguishing  a  character  code  from a function key
+       no  <EM>wch</EM>  argument,  but  returns the (wide) key code as an <EM>int</EM> (with no
+       provision for distinguishing a  character  code  from  a  function  key
        code); and <EM>ungetwch</EM> takes a non-<EM>const</EM> <EM>int</EM> argument.
 
 
@@ -180,12 +179,12 @@ <H1 class="no-header">curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG> describes comparable functions of the <EM>ncurses</EM> library in
        its non-wide-character configuration.
 
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,    <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>,    <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,
        <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                  <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 2e8743fe2..00b9299f8 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 
@@ -177,7 +177,7 @@ <H1 class="no-header">curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        following the Issue 7 standard.
 
        X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
-       character counts  toward  the  length  paramter  <EM>n</EM>.   A  similar  issue
+       character counts toward  the  length  parameter  <EM>n</EM>.   A  similar  issue
        affected   <EM>wgetnstr</EM>   in   Issue 4,  Version 2;  Issue 7  revised  that
        function's  description  to  address  the  issue,  but  not   that   of
        <EM>wget</EM><STRONG>_</STRONG><EM>nwstr</EM>, leaving it ambiguous.  <EM>ncurses</EM> counts the terminator in the
@@ -232,7 +232,7 @@ <H1 class="no-header">curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                 <STRONG><A HREF="curs_get_wstr.3x.html">curs_get_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index da35bb756..3f751c7b0 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp @
+  * @Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getch 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getch 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 
@@ -290,8 +290,8 @@ <H1 class="no-header">curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>o</STRONG>   <STRONG>wgetch</STRONG>  returns <STRONG>KEY_MOUSE</STRONG> to indicate that a mouse event is pending
            collection; see <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>.  Receipt of this  code  requires  a
            window's  keypad  mode  to  be  enabled, because to interpret mouse
-           input (as with with <STRONG>xterm(1)</STRONG>'s mouse protocol), <EM>ncurses</EM>  must  read
-           an escape sequence, as with a function key.
+           input (as with <STRONG>xterm(1)</STRONG>'s mouse protocol),  <EM>ncurses</EM>  must  read  an
+           escape sequence, as with a function key.
 
 
 </PRE><H3><a name="h3-Testing-Key-Codes">Testing Key Codes</a></H3><PRE>
@@ -432,7 +432,7 @@ <H1 class="no-header">curs_getch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 921a16fed..0d33144da 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_inch.3x,v 1.70 2025/02/15 19:36:03 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inch 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inch 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 
@@ -70,7 +70,7 @@ <H1 class="no-header">curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, they return return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if <EM>win</EM> is <EM>NULL</EM>.
 
        Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
@@ -118,7 +118,7 @@ <H1 class="no-header">curs_inch 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                     <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index 2d50eb069..16ee35074 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.58 2025/02/15 14:55:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 
@@ -113,8 +113,8 @@ <H1 class="no-header">curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        terminated.
 
        SVr4 does not document whether it null-terminates the string it  stores
-       in <EM>chstr</EM>, and does not document whether a trailing null chracter counts
-       toward the length limit <EM>n</EM>.
+       in  <EM>chstr</EM>,  and  does  not  document  whether a trailing null character
+       counts toward the length limit <EM>n</EM>.
 
        SVr4 describes a successful return value  only  as  "an  integer  value
        other than <EM>ERR</EM>".
@@ -125,7 +125,7 @@ <H1 class="no-header">curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                  <STRONG><A HREF="curs_inchstr.3x.html">curs_inchstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 446d1268e..cedae137e 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -205,8 +205,8 @@ <H1 class="no-header">curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        unnecessary.
 
        The  <STRONG>endwin</STRONG>  function of both <EM>ncurses</EM> and SVr4 <EM>curses</EM> calls <STRONG>curs_set</STRONG> if
-       the latter has previously been called to set the cursor visiblility  to
-       a  value  other than normal; that is, either invisible or very visible.
+       the latter has previously been called to set the cursor visibility to a
+       value  other  than  normal;  that is, either invisible or very visible.
        There is no way for <EM>ncurses</EM> to determine the initial cursor  visibility
        to restore it.
 
@@ -265,7 +265,7 @@ <H1 class="no-header">curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 9d8d8d9cc..7f7265331 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp @
+  * @Id: curs_legacy.3x,v 1.36 2025/02/15 18:43:02 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 
@@ -116,7 +116,7 @@ <H1 class="no-header">curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-05-25                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                   <STRONG><A HREF="curs_legacy.3x.html">curs_legacy(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 4f17d55b6..0ab17f551 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -407,7 +407,7 @@ <H1 class="no-header">curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 2e3ef4817..e5cc1d7af 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_opaque.3x,v 1.50 2025/02/15 19:36:24 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 
@@ -128,8 +128,8 @@ <H1 class="no-header">curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</H1>
               windows having no parent.
 
        <STRONG>wgetscrreg</STRONG>
-              stores  the the top and bottom rows for the scrolling margin set
-              by <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG> in the corresponding arguments, returning  <STRONG>ERR</STRONG>
+              stores  the  top and bottom rows for the scrolling margin set by
+              <STRONG><A HREF="curs_outopts.3x.html">wsetscrreg(3x)</A></STRONG> in the  corresponding  arguments,  returning  <STRONG>ERR</STRONG>
               upon failure and <STRONG>OK</STRONG> upon successful completion.
 
 
@@ -160,7 +160,7 @@ <H1 class="no-header">curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                   <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 133e8f790..a36e636b5 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -1,6 +1,6 @@
 <!--
   ****************************************************************************
-  * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2018-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp @
+  * @Id: curs_print.3x,v 1.41 2025/02/15 18:42:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_print 3x 2024-07-27 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_print 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_print 3x 2024-07-27 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_print 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">curs_print 3x 2024-07-27 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-07-27                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                    <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 9a81d3b13..80c44a03b 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 
@@ -464,7 +464,7 @@ <H1 class="no-header">curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        <EM>setupterm</EM> copies the terminal name to the array <EM>ttytype</EM>.  This behavior
        is not specified by X/Open Curses, but is assumed by some applications.
 
-       Other implementions may not declare the capability name  arrays.   Some
+       Other implementations may not declare the capability name arrays.  Some
        provide  them  without  declaring them.  X/Open Curses does not specify
        them.
 
@@ -661,7 +661,7 @@ <H1 class="no-header">curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 8681a8fe8..9122d1116 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2021-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2021-2024,2025 Thomas E. Dickey                                *
   * Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
+  * @Id: curs_threads.3x,v 1.59 2025/02/15 19:41:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_threads 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_threads 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 
@@ -84,7 +84,7 @@ <H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</H1>
        members  of  the  <EM>WINDOW</EM>  structure  (see <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>).  It further
        makes functions of the common  global  variables  <STRONG>COLORS</STRONG>,  <STRONG>COLOR_PAIRS</STRONG>,
        <STRONG>COLS</STRONG>,   <STRONG>ESCDELAY</STRONG>,   <STRONG>LINES</STRONG>,   <STRONG>TABSIZE</STRONG>,   <STRONG>curscr</STRONG>,  <STRONG>newscr</STRONG>,  and  <STRONG>ttytype</STRONG>,
-       maintaining them as as read-only values in the <EM>SCREEN</EM> structure.
+       maintaining them as read-only values in the <EM>SCREEN</EM> structure.
 
        Even this is not enough to make an  application  using  <EM>curses</EM>  thread-
        safe.   We  would  expect  a multi-threaded application to have threads
@@ -617,7 +617,7 @@ <H1 class="no-header">curs_threads 3x 2024-03-16 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2024-03-16                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                  <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 60b960bc6..033697e12 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp @
+  * @Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_util 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_util 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_util 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_util 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 
@@ -111,7 +111,7 @@ <H1 class="no-header">curs_util 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>wunctrl</STRONG>  returns  a  null-terminated  wide-character  string  printably
        representing the <EM>curses</EM> complex character <EM>wch</EM>.
 
-       Both  functions  ignore the atributes and color pair selection of their
+       Both  functions ignore the attributes and color pair selection of their
        argument.
 
 
@@ -424,7 +424,7 @@ <H1 class="no-header">curs_util 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15                     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 967156ff5..d37e50d81 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
+  * @Id: form_field_validation.3x,v 1.60 2025/02/15 19:37:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>        Library calls       <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 
@@ -69,7 +69,7 @@ <H1 class="no-header">form_field_validation 3x 2025-01-18 ncurses 6.5 Library ca
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        By  default, no validation is done on form fields.  You can associate a
-       form with with a <EM>field</EM> <EM>type</EM>, making the form library validate input.
+       form with a <EM>field</EM> <EM>type</EM>, making the form library validate input.
 
 
 </PRE><H3><a name="h3-field_arg">field_arg</a></H3><PRE>
@@ -221,7 +221,7 @@ <H1 class="no-header">form_field_validation 3x 2025-01-18 ncurses 6.5 Library ca
 
 
 
-ncurses 6.5                       2025-01-18         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
+ncurses 6.5                       2025-02-15         <STRONG><A HREF="form_field_validation.3x.html">form_field_validation(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 7c464cf3f..1d27cf0e3 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp @
+  * @Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2025-01-18 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2025-02-15 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2025-01-18 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2025-02-15 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -483,7 +483,7 @@ <H1 class="no-header">infocmp 1m 2025-01-18 ncurses 6.5 User commands</H1>
        <STRONG>-1</STRONG> (its internal representation).  <EM>ncurses</EM> shows these  as  "NULL"  for
        consistency with missing string capabilities.
 
-       The  <STRONG>-r</STRONG>  option  of  <EM>ncurses</EM> <EM>infocmp</EM> uses SVr4's notion of of "termcap"
+       The  <STRONG>-r</STRONG>  option  of  <EM>ncurses</EM>  <EM>infocmp</EM>  uses  SVr4's notion of "termcap"
        capabilities.  BSD <EM>curses</EM> had a more restricted set.  To see only those
        present in 4.4BSD, use "<STRONG>-r</STRONG> <STRONG>-RBSD</STRONG>".
 
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2025-01-18 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2025-01-18                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2025-02-15                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 419c9010e..2be5f42cb 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20250201).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20250215).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index f467a18a8..ce56612a2 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp @
+  * @Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tabs 1 2025-01-18 ncurses 6.5 User commands</TITLE>
+<TITLE>tabs 1 2025-02-15 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tabs 1 2025-01-18 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tabs 1 2025-02-15 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 
@@ -248,7 +248,7 @@ <H1 class="no-header">tabs 1 2025-01-18 ncurses 6.5 User commands</H1>
            setting arbitrary tab stops.
 
        The  feature  described  in  subsection  "Explicit  Lists"  above   was
-       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
+       implemented  in  PWB/Unix,  and  permitted the setting of arbitrary tab
        stops nevertheless.
 
 
@@ -257,7 +257,7 @@ <H1 class="no-header">tabs 1 2025-01-18 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
+ncurses 6.5                       2025-02-15                           <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index d71fa6895..53e4fdbe2 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20250201).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20250215).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 85daf55cd..2413ecec7 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -1,7 +1,7 @@
 <!--
   * t
   ****************************************************************************
-  * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2019-2024,2025 Thomas E. Dickey                                *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp @
+  * @Id: toe.1m,v 1.72 2025/02/15 19:41:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>toe 1m 2024-05-11 ncurses 6.5 User commands</TITLE>
+<TITLE>toe 1m 2025-02-15 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">toe 1m 2024-05-11 ncurses 6.5 User commands</H1>
+<H1 class="no-header">toe 1m 2025-02-15 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>                          User commands                         <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 
@@ -83,7 +83,7 @@ <H1 class="no-header">toe 1m 2024-05-11 ncurses 6.5 User commands</H1>
                 Without   the  <STRONG>-s</STRONG>  option,  <STRONG>toe</STRONG>  does  not  attempt  to  merge
                 duplicates in its report.
 
-       <STRONG>-h</STRONG>       writes a heading naming each each directory as it is accessed.
+       <STRONG>-h</STRONG>       writes a heading naming each directory as it is accessed.
 
        <STRONG>-s</STRONG>       sorts the output by the entry names.
 
@@ -185,7 +185,7 @@ <H1 class="no-header">toe 1m 2024-05-11 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2024-05-11                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
+ncurses 6.5                       2025-02-15                           <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index f9d3b1778..f4491b840 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp @
+  * @Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2025-01-18 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2025-02-15 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2025-01-18 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2025-02-15 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -164,7 +164,7 @@ <H1 class="no-header">tput 1 2025-01-18 ncurses 6.5 User commands</H1>
        <STRONG>reset</STRONG>      re-initializes  the  terminal.    A   reset   differs   from
                   initialization in two ways.
 
-                  (1)  <STRONG>tput</STRONG> sets the the terminal modes to a "sane" state,
+                  (1)  <STRONG>tput</STRONG> sets the terminal modes to a "sane" state,
 
                        <STRONG>o</STRONG>   enabling canonical ("cooked") and echo modes,
 
@@ -564,7 +564,7 @@ <H1 class="no-header">tput 1 2025-01-18 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2025-01-18                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2025-02-15                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/Caps.uwin b/include/Caps.uwin
index a41e9eca7..afaaa7f47 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
+# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
 # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.23 2024/04/20 21:05:02 tom Exp $
+# $Id: Caps.uwin,v 1.24 2025/02/15 15:42:46 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -304,7 +304,7 @@ label_height			lh	num	lh	-	-	-----	rows in each label
 label_width			lw	num	lw	-	-	-----	columns in each label
 buttons				btns	num	BT	-	-	-----	number of buttons on mouse
 #max_attributes			ma	num	ma	-	-	YBC--	maximum combined attributes terminal can handle
-#maximum_windows		wnum	num	MW	-	-	-----	maximum number of defineable windows
+#maximum_windows		wnum	num	MW	-	-	-----	maximum number of definable windows
 # These came in with SVr4's color support
 max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
 max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index a2ef768a3..99b5d0594 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp $
-.TH curs_attr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp $
+.TH curs_attr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -286,7 +286,7 @@ A_INVIS	Invisible or blank mode
 A_ALTCHARSET	Alternate character set
 A_ITALIC	Italics (non-X/Open extension)
 A_ATTRIBUTES	Mask to extract character code
-A_CHARTEXT	Mask to extract atributes
+A_CHARTEXT	Mask to extract attributes
 A_COLOR	Mask to extract color pair identifier
 .TE
 .RE
@@ -433,8 +433,7 @@ parameter.
 .bP
 For functions which turn attributes off, e.g.,
 \fBwattr_off\fP,
-the \fIopts\fP parameter is ignored except
-except to check that it is
+the \fIopts\fP parameter is ignored except to check that it is
 .IR NULL "."
 .\" ---------------------------------------------------------------------------
 .SH PORTABILITY
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 1482171d5..d4acf0de4 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -27,19 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp $
-.TH curs_bkgrnd 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
-.ie \n(.g \{\
-.ds `` \(lq
-.ds '' \(rq
-.\}
-.el \{\
-.ie t .ds `` ``
-.el   .ds `` ""
-.ie t .ds '' ''
-.el   .ds '' ""
-.\}
-.
+.\" $Id: curs_bkgrnd.3x,v 1.58 2025/02/15 18:40:23 tom Exp $
+.TH curs_bkgrnd 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index 139d39a72..9f00df64a 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp $
-.TH curs_get_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp $
+.TH curs_get_wch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -159,7 +159,7 @@ on it.
 If the wide character
 is a carriage return and \fBnl\fP(3X) has been called,
 .B \%wget_wch
-stores the the wide character code for line feed in
+stores the wide character code for line feed in
 .I wch
 instead.
 .SS "Ungetting Characters"
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index edb70c74d..fdaa84ff6 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp $
-.TH curs_get_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp $
+.TH curs_get_wstr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -285,7 +285,7 @@ All of the vendors implement these functions using
 following the Issue\ 7 standard.
 .PP
 X/Open Curses Issue\ 7 is unclear whether the terminating null wide character
-counts toward the length paramter
+counts toward the length parameter
 .IR n "."
 A similar issue affected
 .I \%wgetnstr
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 7241c221c..956d1f0ef 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp $
-.TH curs_getch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp $
+.TH curs_getch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -425,7 +425,7 @@ to indicate that a mouse event is pending collection;
 see \fB\%curs_mouse\fP(3X).
 Receipt of this code requires a window's keypad mode to be enabled,
 because to interpret mouse input
-(as with with \fI\%xterm\fP(1)'s mouse protocol),
+(as with \fI\%xterm\fP(1)'s mouse protocol),
 .I \%ncurses
 must read an escape sequence,
 as with a function key.
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 2e8a03707..72100af27 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
-.TH curs_inch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.70 2025/02/15 19:36:03 tom Exp $
+.TH curs_inch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -82,7 +82,6 @@ on failure.
 In
 .IR \%ncurses ","
 they return
-return
 .B ERR
 if
 .I win
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index 233820a1d..fb45fcb16 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
-.TH curs_inchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inchstr.3x,v 1.58 2025/02/15 14:55:35 tom Exp $
+.TH curs_inchstr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -138,7 +138,7 @@ null-terminated.
 SVr4 does not document whether it null-terminates the string it stores
 in
 .IR chstr ","
-and does not document whether a trailing null chracter counts toward the
+and does not document whether a trailing null character counts toward the
 length limit
 .IR n "."
 .PP
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 292828e19..fe30482dd 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp $
-.TH curs_kernel 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp $
+.TH curs_kernel 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -314,7 +314,7 @@ and SVr4
 .I curses
 calls
 .B \%curs_set
-if the latter has previously been called to set the cursor visiblility
+if the latter has previously been called to set the cursor visibility
 to a value other than normal;
 that is,
 either
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 91831a63c..ddc2c19b7 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,19 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp $
-.TH curs_legacy 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
-.ie \n(.g \{\
-.ds `` \(lq
-.ds '' \(rq
-.\}
-.el \{\
-.ie t .ds `` ``
-.el   .ds `` ""
-.ie t .ds '' ''
-.el   .ds '' ""
-.\}
-.
+.\" $Id: curs_legacy.3x,v 1.36 2025/02/15 18:43:02 tom Exp $
+.TH curs_legacy 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 45abf36dc..591ff2496 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp $
-.TH curs_mouse 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp $
+.TH curs_mouse 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -591,7 +591,7 @@ extern unsigned long getmouse(void), getbmap(void);
 .bP
 Its \*(``terminfo\*('' manual page lists capabilities for the feature.
 .PP
-.\" These don't appear in in the SVID 4th edition, Volume 3,
+.\" These don't appear in the SVID 4th edition, Volume 3,
 .\" terminfo(TI_ENV) man page.  They can be found in, e.g., the "z/OS
 .\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
 .RS 8
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 02b2e28cf..7269598fa 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp $
-.TH curs_opaque 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_opaque.3x,v 1.50 2025/02/15 19:36:24 tom Exp $
+.TH curs_opaque 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -141,7 +141,7 @@ or
 for windows having no parent.
 .TP
 \fBwgetscrreg\fP
-stores the the top and bottom rows for the scrolling margin set by
+stores the top and bottom rows for the scrolling margin set by
 \fB\%wsetscrreg\fP(3X) in the corresponding arguments,
 returning \fBERR\fP upon failure and \fBOK\fP upon successful
 completion.
diff --git a/man/curs_print.3x b/man/curs_print.3x
index 21f4f8416..a87c40720 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,18 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp $
-.TH curs_print 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
-.ie \n(.g \{\
-.ds `` \(lq
-.ds '' \(rq
-.\}
-.el \{\
-.ie t .ds `` ``
-.el   .ds `` ""
-.ie t .ds '' ''
-.el   .ds '' ""
-.\}
+.\" $Id: curs_print.3x,v 1.41 2025/02/15 18:42:34 tom Exp $
+.TH curs_print 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 0fcca8f32..053a359d5 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp $
-.TH curs_terminfo 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp $
+.TH curs_terminfo 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -830,7 +830,7 @@ copies the terminal name to the array
 This behavior is not specified by X/Open Curses,
 but is assumed by some applications.
 .PP
-Other implementions may not declare the capability name arrays.
+Other implementations may not declare the capability name arrays.
 Some provide them without declaring them.
 X/Open Curses does not specify them.
 .PP
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index d49c16e71..a387c874b 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2021-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2021-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
-.TH curs_threads 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_threads.3x,v 1.59 2025/02/15 19:41:22 tom Exp $
+.TH curs_threads 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -102,7 +102,7 @@ It further makes functions of the common global variables
 \fB\%newscr\fP,
 and
 \fB\%ttytype\fP,
-maintaining them as as read-only values in the \fISCREEN\fP structure.
+maintaining them as read-only values in the \fISCREEN\fP structure.
 .PP
 Even this is not enough to make an application using \fIcurses\fP
 thread-safe.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 579448b90..13d53f095 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp $
-.TH curs_util 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp $
+.TH curs_util 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -142,7 +142,7 @@ the
 complex character
 .IR wch .
 .PP
-Both functions ignore the atributes and color pair selection
+Both functions ignore the attributes and color pair selection
 of their argument.
 .SS "keyname, key_name"
 The \fBkeyname\fP routine returns a character string
@@ -472,17 +472,17 @@ i.e.,
 a one-character string with
 the parameter as the first character.
 Otherwise,
-it returns \*(``~@\*('',
-\*(``~A\*('',
+it returns \*(``\*~@\*('',
+\*(``\*~A\*('',
 etc.,
-analogous to \*(``^@\*('',
-\*(``^A\*('',
+analogous to \*(``\*^@\*('',
+\*(``\*^A\*('',
 C0 controls.
 .IP
 X/Open Curses does not document whether \fBunctrl\fP can be called
 before initializing curses.
 This implementation permits that,
-and returns the \*(``~@\*('',
+and returns the \*(``\*~@\*('',
 etc.,
 values in that case.
 .bP
@@ -492,10 +492,10 @@ parameter values outside the 0 to 255 range.
 The strings returned by \fBunctrl\fP in this implementation
 are determined at compile time,
 showing C1 controls from the upper-128 codes
-with a \*(``~\*('' prefix rather than \*(``^\*(''.
+with a \*(``\*~\*('' prefix rather than \*(``\*^\*(''.
 Other implementations have different conventions.
 For example,
-they may show both sets of control characters with \*(``^\*('',
+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
 printable.
@@ -515,8 +515,8 @@ curses is initialized.
 X/Open Curses does not document the treatment of codes 128 to 159.
 When treating them as \*(``meta\*('' keys
 (or if \fBkeyname\fP is called before initializing curses),
-this implementation returns strings \*(``M\-^@\*('',
-\*(``M\-^A\*('',
+this implementation returns strings \*(``M\-\*^@\*('',
+\*(``M\-\*^A\*('',
 etc.
 .PP
 X/Open Curses documents \fBunctrl\fP as declared in \fB<unctrl.h>\fP,
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index bd5293bd0..948fa4d92 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
-.TH form_field_validation 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: form_field_validation.3x,v 1.60 2025/02/15 19:37:22 tom Exp $
+.TH form_field_validation 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -66,7 +66,7 @@ data type validation for fields
 .fi
 .SH DESCRIPTION
 By default, no validation is done on form fields.
-You can associate a form with with a \fIfield type\fP,
+You can associate a form with a \fIfield type\fP,
 making the form library validate input.
 .SS field_arg
 Returns a pointer to the field's argument block.
diff --git a/man/infocmp.1m b/man/infocmp.1m
index d1f53565b..e9aa52703 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp $
-.TH @INFOCMP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp $
+.TH @INFOCMP@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -708,7 +708,7 @@ option
 of
 .I \%ncurses
 .I \%infocmp
-uses SVr4's notion of of \*(``termcap\*('' capabilities.
+uses SVr4's notion of \*(``termcap\*('' capabilities.
 BSD
 .I curses
 had a more restricted set.
diff --git a/man/tabs.1 b/man/tabs.1
index 8305381af..59da05994 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp $
-.TH @TABS@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp $
+.TH @TABS@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -352,7 +352,7 @@ supports the capability of setting arbitrary tab stops.
 The feature described in subsection \*(``Explicit Lists\*('' above was
 implemented in PWB/Unix,
 .\" see URL above
-and permitted the setting of abitrary tab stops nevertheless.
+and permitted the setting of arbitrary tab stops nevertheless.
 .SH SEE ALSO
 \fB\%@INFOCMP@\fP(1M),
 \fB\%@TSET@\fP(1),
diff --git a/man/toe.1m b/man/toe.1m
index 891570e4a..fabef5719 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
+.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp $
-.TH @TOE@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: toe.1m,v 1.72 2025/02/15 19:41:22 tom Exp $
+.TH @TOE@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -98,7 +98,7 @@ Without the \fB\-s\fP option,
 \fB\%@TOE@\fP does not attempt to merge duplicates in its report.
 .TP
 .B \-h
-writes a heading naming each each directory as it is accessed.
+writes a heading naming each directory as it is accessed.
 .TP
 .B \-s
 sorts the output by the entry names.
diff --git a/man/tput.1 b/man/tput.1
index cd89cdddf..f7af8826e 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp $
-.TH @TPUT@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp $
+.TH @TPUT@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -232,7 +232,7 @@ A reset differs from initialization in two ways.
 .TP 5
 (1)
 .B \%@TPUT@
-sets the the terminal modes to a \*(``sane\*('' state,
+sets the terminal modes to a \*(``sane\*('' state,
 .RS
 .bP
 enabling canonical (\*(``cooked\*('') and echo modes,
diff --git a/misc/magic b/misc/magic
index ee1a1c4d4..314cb6d20 100644
--- a/misc/magic
+++ b/misc/magic
@@ -1,6 +1,6 @@
-# $Id: magic,v 1.5 2023/09/23 23:37:26 tom Exp $
+# $Id: magic,v 1.6 2025/02/15 15:23:23 tom Exp $
 ##############################################################################
-# Copyright 2020,2023 Thomas E. Dickey                                       #
+# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
 # Copyright 2015,2018 Free Software Foundation, Inc.                         #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -59,9 +59,8 @@
 >>12	regex		\^[a-zA-Z0-9][a-zA-Z0-9.][^|]*	Compiled 32-bit terminfo entry "%-s"
 !:mime	application/x-terminfo2
 #
-# While the compiled terminfo uses little-endian format irregardless of
-# platform, System V screen dumps do not.  They came later, and that detail was
-# overlooked.
+# While the compiled terminfo uses little-endian format regardless of platform,
+# System V screen dumps do not.  They came later; that detail was overlooked.
 #
 # AIX and HPUX use the SVr4 big-endian format
 # Solaris uses the SVr3 formats (sparc and x86 differ endian-ness)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 45b3c9c1d..a21f7f4f6 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1170 $
-#	$Date: 2025/02/08 21:27:07 $
+#	$Revision: 1.1171 $
+#	$Date: 2025/02/15 20:03:55 $
 #
 # 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
@@ -1143,7 +1143,7 @@ linux-vt|Linux console using VT codes for graphics,
 # of the functionality), but does not recognize as many control sequences.
 # The program comes bundled with an old (circa 1998) copy of the Linux
 # console terminfo.  It recognizes some non-ANSI/VT100 sequences such as
-#	\E*	move cursor to home, as as \E[H
+#	\E*	move cursor to home, as \E[H
 #	\E,X	same as \E(X
 #	\EE	move cursor to beginning of row
 #	\E[y,xf	same as \E[y,xH
@@ -7669,7 +7669,7 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0),
 #	italics and crossed-out text work
 #	no meta mode
 # vttest -
-#	DA1 says this is a VT420 with with 132 columns, NRCS, horizontal scrolling
+#	DA1 says this is a VT420 with 132 columns, NRCS, horizontal scrolling
 #	DA2 says this is a VT510, version 33.7
 #	NRCS does not work, program hangs in the locking shift test.
 #	some of the VT420 rectangle operations work
@@ -10130,7 +10130,7 @@ hp262x|HP 262x terminals,
 # Due to severe 2621 braindamage, the only way to get the arrow keys to
 # transmit anything at all is to turn on the function key labels
 # with <smkx>, and even then the user has to hold down shift!
-# The default 2621 turns off the labels except when it has to to
+# The default 2621 turns off the labels except when it has to, to
 # enable the function keys. If your installation prefers labels
 # on all the time, or off all the time (at the "expense" of the
 # function keys), use 2621-nl or 2621-wl.
@@ -16090,7 +16090,7 @@ cdc756|CDC 756,
 # of the tab key to send an ESC.  The real ESC key is positioned way out
 # in right field.
 #
-# The termcap won't work in 132 column mode due to the way it it moves the
+# The termcap won't work in 132 column mode due to the way it moves the
 # cursor.  Termcap doesn't have the capability (as far as I could tell) to
 # handle the 721 in 132 column mode.
 #
@@ -17699,7 +17699,7 @@ f100-rv|freedom-rv|Liberty Freedom 100 in reverse video,
 # code for the down cursor key. When kcud1 is defined in terminfo
 # as ^V, the Control Character Quoting capability (^V in insert mode)
 # is lost! It cannot be remapped in vi because it is necessary to enter
-# a ^V to to quote the ^V that is being remapped!!!
+# a ^V to, to quote the ^V that is being remapped!!!
 #
 # f110/f200 users will have to decide whether
 # to lose the down cursor key or the quoting capability. We will opt
@@ -23585,7 +23585,7 @@ t1061f|Teleray 1061 with fast PROMs,
 # "Teleray Arpa Special", officially designated as
 # "Teleray Arpa network model 10" with "Special feature 720".
 # This is the new (1981) fast microcode updating the older "arpa" proms
-# (which gave meta-key and programmable-fxn keys).  720 is much much faster,
+# (which gave meta-key and programmable-fxn keys).  720 is much, much faster,
 # converts the keypad to programmable function keys, and has other goodies.
 # Standout mode is still broken (magic cookie, etc) so is suppressed as no
 # programs handle such lossage properly.
@@ -27794,4 +27794,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2025-02-08
 #	+ update st (report by Alexander Kashpir) -TD
 #
+# 2025-02-15
+#	+ minor fixes to comments (report by Sven Joachim) -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index 74c4f75b4..c88830219 100644
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2015 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_chgat.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.14 2025/02/15 20:53:36 tom Exp $")
 
 NCURSES_EXPORT(int)
 wchgat(WINDOW *win,
@@ -62,7 +62,8 @@ wchgat(WINDOW *win,
        color_pair));
 
     set_extended_pair(opts, color_pair);
-    if (win) {
+    if (win != NULL
+	&& color_pair >= 0) {
 	struct ldat *line = &(win->_line[win->_cury]);
 	int i;
 
diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 92d3d5d63..a995b4259 100644
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -44,7 +44,7 @@
  *	sysmouse (FreeBSD)
  *	special-purpose mouse interface for OS/2 EMX.
  *
- * Notes for implementors of new mouse-interface methods:
+ * Notes for implementers of new mouse-interface methods:
  *
  * The code is logically split into a lower level that accepts event reports
  * in a device-dependent format and an upper level that parses mouse gestures
@@ -85,7 +85,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.207 2025/02/08 12:16:37 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.208 2025/02/15 15:12:21 tom Exp $")
 
 #include <tic.h>
 
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 50c3425e1..39346b32c 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -57,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.195 2025/02/08 15:54:53 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.196 2025/02/15 12:55:53 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -331,8 +331,8 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
        slines, scolumns, (void *) output, filtered, slk_format));
 
-    /* CURRENT_SCREE is reset in newterm() */
-    if (CURRENT_SCREEN != NULL || slines <= 0 || scolumns <= 0)
+    /* CURRENT_SCREEN is reset in newterm() */
+    if (CURRENT_SCREEN)
 	returnCode(ERR);
 
 #if NCURSES_SP_FUNCS
@@ -392,6 +392,10 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #else
     _nc_get_screensize(sp, &slines, &scolumns);
 #endif
+    if (scolumns < 0)
+	scolumns = 0;
+    if (slines < 0)
+	slines = 0;
     SET_LINES(slines);
     SET_COLS(scolumns);
 
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index efbd41e18..706820e7a 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.106 2025/01/12 10:51:43 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.107 2025/02/15 15:31:16 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -247,24 +247,24 @@ cvtchar(register const char *sp)
 }
 
 static void
-getparm(int parm, int n)
-/* push n copies of param on the terminfo stack if not already there */
+getparam(int parameter, int n)
+/* push n copies of parameter on the terminfo stack if not already there */
 {
     int nn;
 
     if (seenr) {
-	if (parm == 1)
-	    parm = 2;
-	else if (parm == 2)
-	    parm = 1;
+	if (parameter == 1)
+	    parameter = 2;
+	else if (parameter == 2)
+	    parameter = 1;
     }
 
     for (nn = 0; nn < n; ++nn) {
 	dp = save_string(dp, "%p");
-	dp = save_char(dp, '0' + parm);
+	dp = save_char(dp, '0' + parameter);
     }
 
-    if (onstack == parm) {
+    if (onstack == parameter) {
 	if (n > 1) {
 	    _nc_warning("string may not be optimal");
 	    dp = save_string(dp, "%Pa");
@@ -277,13 +277,13 @@ getparm(int parm, int n)
     if (onstack != 0)
 	push();
 
-    onstack = parm;
+    onstack = parameter;
 
-    if (seenn && parm < 3) {
+    if (seenn && parameter < 3) {
 	dp = save_string(dp, "%{96}%^");
     }
 
-    if (seenm && parm < 3) {
+    if (seenm && parameter < 3) {
 	dp = save_string(dp, "%{127}%^");
     }
 }
@@ -353,20 +353,20 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 		break;
 	    case '6':
 	    case 'B':
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%{10}%/%{16}%*");
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%{10}%m%+");
 		break;
 	    case '8':
 	    case 'D':
-		getparm(param, 2);
+		getparam(param, 2);
 		dp = save_string(dp, "%{2}%*%-");
 		break;
 	    case '>':
 		/* %?%{x}%>%t%{y}%+%; */
 		if (s[0] && s[1]) {
-		    getparm(param, 2);
+		    getparam(param, 2);
 		    dp = save_string(dp, "%?");
 		    s += cvtchar(s);
 		    dp = save_string(dp, "%>%t");
@@ -385,9 +385,9 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 		    int l;
 		    l = 2;
 		    if (*s != '=')
-			getparm(param, 1);
+			getparam(param, 1);
 		    if (s[1] == 'p') {
-			getparm(param + s[2] - '@', 1);
+			getparam(param + s[2] - '@', 1);
 			if (param != onstack) {
 			    pop();
 			    param--;
@@ -423,12 +423,12 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 		    s += l;
 		    break;
 		}
-		getparm(param, 1);
+		getparam(param, 1);
 		s += cvtchar(s);
 		dp = save_string(dp, "%+");
 		break;
 	    case '+':
-		getparm(param, 1);
+		getparam(param, 1);
 		s += cvtchar(s);
 		dp = save_string(dp, "%+%c");
 		pop();
@@ -436,22 +436,22 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 	    case 's':
 #ifdef WATERLOO
 		s += cvtchar(s);
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%-");
 #else
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%s");
 		pop();
 #endif /* WATERLOO */
 		break;
 	    case '-':
 		s += cvtchar(s);
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%-%c");
 		pop();
 		break;
 	    case '.':
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%c");
 		pop();
 		break;
@@ -467,18 +467,18 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 		goto invalid;
 	    case '2':
 	      see02:
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%2d");
 		pop();
 		break;
 	    case '3':
 	      see03:
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%3d");
 		pop();
 		break;
 	    case 'd':
-		getparm(param, 1);
+		getparam(param, 1);
 		dp = save_string(dp, "%d");
 		pop();
 		break;
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 83ac9e8d6..22eb7f397 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.157 2025/02/15 15:20:16 tom Exp $")
 
 /*
  *	char *
@@ -87,7 +87,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
  *                     The ':' is used to avoid making %+ or %-
  *                     patterns (see below).
  *
- *	     %p[1-9]   push ith parm
+ *	     %p[1-9]   push ith param
  *	     %P[a-z]   set dynamic variable [a-z] to pop()
  *	     %g[a-z]   get dynamic variable [a-z] and push it
  *	     %P[A-Z]   set static variable [A-Z] to pop()
@@ -102,7 +102,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
  *	     %= %> %<  logical operations: push(pop() op pop())
  *	     %A %O     logical and & or operations for conditionals
  *	     %! %~     unary operations push(op pop())
- *	     %i        add 1 to first two parms (for ANSI terminals)
+ *	     %i        add 1 to first two params (for ANSI terminals)
  *
  *	     %? expr %t thenpart %e elsepart %;
  *	               if-then-else, %e elsepart is optional.
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index ece50f0d4..120ce1ec7 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -38,7 +38,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32con.c,v 1.16 2024/10/19 21:06:11 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.17 2025/02/15 15:43:26 tom Exp $")
 
 #if defined(_NC_WINDOWS)
 
@@ -964,7 +964,7 @@ _nc_console_twait(
 			    continue;
 			    /* e.g., FOCUS_EVENT */
 			default:
-			    T(("twait:event Tyoe %d", inp_rec.EventType));
+			    T(("twait:event Type %d", inp_rec.EventType));
 			    CONSUME();
 			    _nc_console_selectActiveHandle();
 			    continue;
diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c
index 9b157a4bf..4fa38da89 100644
--- a/ncurses/trace/varargs.c
+++ b/ncurses/trace/varargs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 2001-2008,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: varargs.c,v 1.15 2024/12/07 18:00:11 tom Exp $")
+MODULE_ID("$Id: varargs.c,v 1.16 2025/02/15 15:22:14 tom Exp $")
 
 #ifdef TRACE
 
@@ -60,7 +60,7 @@ NCURSES_EXPORT(char *)
 _nc_varargs(const char *fmt, va_list ap)
 {
     char buffer[BUFSIZ];
-    const char *param;
+    const char *value;
     int n;
 
     if (fmt == NULL || *fmt == '\0')
@@ -79,16 +79,16 @@ _nc_varargs(const char *fmt, va_list ap)
 	    int done = FALSE;
 	    int ival = 0;
 	    int type = 0;
-	    ARGTYPE parm[MAX_PARMS];
-	    int parms = 0;
+	    ARGTYPE param[MAX_PARMS];
+	    int params = 0;
 	    ARGTYPE used = atUnknown;
 
 	    while (*++fmt != '\0' && !done) {
 
 		if (*fmt == '*') {
 		    VA_INT(int);
-		    if (parms < MAX_PARMS)
-			parm[parms++] = atInteger;
+		    if (params < MAX_PARMS)
+			param[params++] = atInteger;
 		} else if (isalpha(UChar(*fmt))) {
 		    done = TRUE;
 		    switch (*fmt) {
@@ -141,11 +141,11 @@ _nc_varargs(const char *fmt, va_list ap)
 		} else if (*fmt == '%') {
 		    done = TRUE;
 		}
-		if (used != atUnknown && parms < MAX_PARMS) {
-		    parm[parms++] = used;
-		    for (n = 0; n < parms; ++n) {
-			used = parm[n];
-			param = buffer;
+		if (used != atUnknown && params < MAX_PARMS) {
+		    param[params++] = used;
+		    for (n = 0; n < params; ++n) {
+			used = param[n];
+			value = buffer;
 			switch (used) {
 			case atInteger:
 			    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
@@ -160,19 +160,19 @@ _nc_varargs(const char *fmt, va_list ap)
 					"%p", pval);
 			    break;
 			case atString:
-			    param = _nc_visbuf2(1, sval);
+			    value = _nc_visbuf2(1, sval);
 			    break;
 			case atUnknown:
 			default:
 			    _nc_STRCPY(buffer, "?", sizeof(buffer));
 			    break;
 			}
-			MyLength += strlen(param) + 2;
+			MyLength += strlen(value) + 2;
 			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
 			if (MyBuffer != NULL) {
 			    _nc_SPRINTF(MyBuffer + strlen(MyBuffer),
 					_nc_SLIMIT(MyLength - strlen(MyBuffer))
-					", %s", param);
+					", %s", value);
 			}
 		    }
 		}
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 9a0432126..767b97097 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -107,7 +107,7 @@ be moved out of order.
 			THE ALGORITHM
 
 The scrolling is done in two passes. The first pass is from top to bottom
-scroling hunks UP. The second one is from bottom to top scrolling hunks DOWN.
+scrolling hunks UP. The second one is from bottom to top scrolling hunks DOWN.
 Obviously enough, no lines to be scrolled will be destroyed. (lav)
 
 HOW TO TEST THIS:
@@ -148,7 +148,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.60 2025/01/12 10:51:43 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.61 2025/02/15 15:12:54 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index daca203a0..3bd872c1d 100644
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <SigAction.h>
 
-MODULE_ID("$Id: lib_tstp.c,v 1.58 2024/12/21 18:43:50 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.59 2025/02/15 14:52:13 tom Exp $")
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
@@ -367,8 +367,8 @@ CatchIfDefault(int sig, void (*handler) (int))
 	result = FALSE;
     }
 #endif
-    T(("CatchIfDefault - will %scatch %s",
-       result ? "" : "not ", signal_name(sig)));
+    T(("CatchIfDefault - will%s catch %s",
+       result ? "" : " not", signal_name(sig)));
     return result;
 }
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 396f47b21..0b2e65aaf 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250208) unstable; urgency=low
+ncurses6td (6.5+20250215) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 396f47b21..0b2e65aaf 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250208) unstable; urgency=low
+ncurses6td (6.5+20250215) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index d7e513d1a..c67c796f8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250208) unstable; urgency=low
+ncurses6td (6.5+20250215) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 08 Feb 2025 06:01:51 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 0b56b2182..0f0d84630 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.688 2025/02/08 11:01:51 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.689 2025/02/15 12:35:22 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0208"
+!define VERSION_MMDD  "0215"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 9770d501c..3293d1e6e 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250208
+Release: 20250215
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f4ef4658d..4153c25d7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250208
+Release: 20250215
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 5e5374e5c..c22f68046 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250208
+Release: 20250215
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/newdemo.c b/test/newdemo.c
index 78761534d..c51a278f7 100644
--- a/test/newdemo.c
+++ b/test/newdemo.c
@@ -2,7 +2,7 @@
  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
  *  	 		the use of colours for text output.
  *
- * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $
+ * $Id: newdemo.c,v 1.49 2025/02/15 15:15:25 tom Exp $
  */
 
 #include <test.priv.h>
@@ -288,7 +288,7 @@ main(int argc, char *argv[])
 	set_colors(win, 2, COLOR_RED, COLOR_RED);
 	box(win, ACS_VLINE, ACS_HLINE);
 	wrefresh(win);
-	/* Do ramdom output of a character */
+	/* Do random output of a character */
 	use_colors(win, 1, A_NORMAL);
 	c = 'a';
 	for (i = 0; i < 5000; ++i) {
diff --git a/test/tclock.c b/test/tclock.c
index da56918eb..629bdbb44 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.50 2024/12/07 22:46:42 tom Exp $ */
+/* $Id: tclock.c,v 1.51 2025/02/15 15:15:36 tom Exp $ */
 
 #define NEED_TIME_H
 #include <test.priv.h>
@@ -293,7 +293,7 @@ main(int argc, char *argv[])
 int
 main(void)
 {
-    printf("This program requires the header math.h and trignometric functions\n");
+    printf("This program requires the header math.h and trigonometric functions\n");
     ExitProgram(EXIT_FAILURE);
 }
 #endif
diff --git a/test/test_tparm.c b/test/test_tparm.c
index 7dabe6b11..1d87b0d93 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  *                                                                          *
  * 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_tparm.c,v 1.43 2024/12/07 23:13:34 tom Exp $
+ * $Id: test_tparm.c,v 1.44 2025/02/15 15:42:37 tom Exp $
  *
  * Exercise tparm/tiparm, either for all possible capabilities with fixed
  * parameters, or one capability with specific combinations of parameters.
@@ -634,7 +634,7 @@ main(int argc, char *argv[])
 	    }
 
 	    if (v_opt) {
-		printf("[%d:%d] %d paramerized cap%s * %ld test-case%s \"%s\"\n",
+		printf("[%d:%d] %d parameterized cap%s * %ld test-case%s \"%s\"\n",
 		       r_run + 1, r_opt,
 		       PLURAL(use_caps),
 		       PLURAL(use_parms),

From ea29a61e8696a3f80b1f49f5d7be8326519c5557 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Mon, 17 Feb 2025 02:05:58 +0100
Subject: [PATCH 104/106] ncurses-6.5-20250216.patch.gz

---
 NEWS                             |  8 +++++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 ++--
 ncurses/base/lib_chgat.c         |  4 ++--
 ncurses/tinfo/alloc_entry.c      |  8 +++++++-
 ncurses/tinfo/alloc_ttype.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 +-
 package/ncursest.spec            |  2 +-
 13 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/NEWS b/NEWS
index e312d1772..be197e400 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4245 2025/02/16 00:19:24 tom Exp $
+-- $Id: NEWS,v 1.4248 2025/02/16 23:54:33 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250216
+	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
+	  errors when using infocmp to compare all capabilities when processing
+	  a malformed terminfo binary which has a valid header (testcase by
+	  "Ekkosun").
+
 20250215
 	+ add gzip option for suppressing filename/timestamp information to an
 	  overlooked case (cf: 20240330).
diff --git a/VERSION b/VERSION
index b3f4d132b..ac103fd8a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250215
+5:0:10	6.5	20250216
diff --git a/dist.mk b/dist.mk
index f56f4cc0e..718f37d9f 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1655 2025/02/15 12:35:22 tom Exp $
+# $Id: dist.mk,v 1.1656 2025/02/16 22:35:29 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250215
+NCURSES_PATCH = 20250216
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index c88830219..e78c76a69 100644
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2015 Thomas E. Dickey                                     *
+ * Copyright 2020-2015,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_chgat.c,v 1.14 2025/02/15 20:53:36 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.15 2025/02/15 20:53:36 tom Exp $")
 
 NCURSES_EXPORT(int)
 wchgat(WINDOW *win,
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 68d87d54b..596ec9df5 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.82 2025/01/11 20:37:19 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.83 2025/02/16 17:57:12 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -360,6 +360,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     }
 #endif
     for_each_boolean(i, from) {
+	if (i >= NUM_BOOLEANS(to))
+	    break;
 	if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {
 	    int mergebool = from->Booleans[i];
 
@@ -371,6 +373,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     }
 
     for_each_number(i, from) {
+	if (i >= NUM_NUMBERS(to))
+	    break;
 	if (to->Numbers[i] != CANCELLED_NUMERIC) {
 	    int mergenum = from->Numbers[i];
 
@@ -387,6 +391,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
      * we ever want to deallocate entries.
      */
     for_each_string(i, from) {
+	if (i >= NUM_STRINGS(to))
+	    break;
 	if (to->Strings[i] != CANCELLED_STRING) {
 	    char *mergestring = from->Strings[i];
 
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 6266263b7..cb711f484 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.53 2024/12/07 18:08:56 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.55 2025/02/16 18:31:37 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -231,13 +231,15 @@ _nc_last_ext_name(const TERMTYPE2 *tp, int token_type)
 static int
 _nc_find_ext_name(const TERMTYPE2 *tp, const char *name, int token_type)
 {
-    unsigned j;
-    unsigned first = _nc_first_ext_name(tp, token_type);
-    unsigned last = _nc_last_ext_name(tp, token_type);
+    if (name != NULL) {
+	unsigned j;
+	unsigned first = _nc_first_ext_name(tp, token_type);
+	unsigned last = _nc_last_ext_name(tp, token_type);
 
-    for (j = first; j < last; j++) {
-	if (!strcmp(name, tp->ext_Names[j])) {
-	    return (int) j;
+	for (j = first; j < last; j++) {
+	    if (!strcmp(name, tp->ext_Names[j])) {
+		return (int) j;
+	    }
 	}
     }
     return -1;
@@ -381,9 +383,12 @@ adjust_cancels(TERMTYPE2 *to, TERMTYPE2 *from)
 	      NonNull(to->term_names),
 	      NonNull(from->term_names)));
     for (j = first; j < last;) {
-	char *name = to->ext_Names[j];
+	char *name;
 	int j_str = to->num_Strings - first - to->ext_Strings;
 
+	if ((j + j_str) > NUM_STRINGS(to))
+	    break;
+	name = to->ext_Names[j];
 	if (to->Strings[j + j_str] == CANCELLED_STRING) {
 	    if (_nc_find_ext_name(from, to->ext_Names[j], BOOLEAN) >= 0) {
 		if (_nc_del_ext_name(to, name, STRING)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0b2e65aaf..de76ca4bf 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250215) unstable; urgency=low
+ncurses6td (6.5+20250216) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0b2e65aaf..de76ca4bf 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250215) unstable; urgency=low
+ncurses6td (6.5+20250216) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index c67c796f8..79ef3299c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250215) unstable; urgency=low
+ncurses6td (6.5+20250216) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Feb 2025 07:35:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 0f0d84630..71a5b41f0 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.689 2025/02/15 12:35:22 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.690 2025/02/16 22:35:29 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0215"
+!define VERSION_MMDD  "0216"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 3293d1e6e..212230593 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250215
+Release: 20250216
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4153c25d7..577e8ee3f 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250215
+Release: 20250216
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c22f68046..c7ed04dc8 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250215
+Release: 20250216
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 400595c4207e0541c24f191326381e8ee643fea3 Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 23 Feb 2025 00:47:29 +0100
Subject: [PATCH 105/106] ncurses-6.5-20250222.patch.gz

---
 NEWS                             |  8 +++++-
 VERSION                          |  2 +-
 dist.mk                          |  4 +--
 man/MKterminfo.sh                | 10 +++++---
 man/infocmp.1m                   |  6 ++---
 man/terminfo.tail                |  4 +--
 ncurses/base/lib_addstr.c        | 12 ++++-----
 ncurses/base/lib_driver.c        |  6 ++---
 ncurses/base/lib_newterm.c       | 10 ++++----
 ncurses/base/safe_sprintf.c      | 14 +++++------
 ncurses/base/vsscanf.c           |  8 +++---
 ncurses/report_hashing.c         |  6 ++---
 ncurses/tinfo/access.c           | 10 ++++----
 ncurses/tinfo/captoinfo.c        |  4 +--
 ncurses/tinfo/getenv_num.c       |  6 ++---
 ncurses/tinfo/lib_data.c         |  6 ++---
 ncurses/tinfo/lib_setup.c        | 12 ++++-----
 ncurses/tinfo/obsolete.c         | 10 ++++----
 ncurses/tinfo/parse_entry.c      | 14 +++++------
 ncurses/tinfo/read_termcap.c     | 42 ++++++++++++++++----------------
 ncurses/tinfo/tinfo_driver.c     | 18 +++++++-------
 ncurses/trace/lib_tracebits.c    |  8 +++---
 ncurses/widechar/lib_ins_wch.c   |  7 +++---
 ncurses/widechar/widechars.c     |  8 +++---
 ncurses/win32con/win32_driver.c  | 18 +++++++-------
 ncurses/win32con/win_driver.c    | 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 +-
 33 files changed, 156 insertions(+), 149 deletions(-)

diff --git a/NEWS b/NEWS
index be197e400..1baa4d2b7 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4248 2025/02/16 23:54:33 tom Exp $
+-- $Id: NEWS,v 1.4251 2025/02/20 09:09:47 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250222
+	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
+	  wins_nwstr to return OK when "n" is zero, for consistency with other
+	  implementations (report by Benjamin Barenblat, cf: 20231118).
+	+ formatting improvements for terminfo.5 (Debian #1096164).
+	
 20250216
 	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
 	  errors when using infocmp to compare all capabilities when processing
diff --git a/VERSION b/VERSION
index ac103fd8a..d50cb3df9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250216
+5:0:10	6.5	20250222
diff --git a/dist.mk b/dist.mk
index 718f37d9f..145495b32 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1656 2025/02/16 22:35:29 tom Exp $
+# $Id: dist.mk,v 1.1657 2025/02/22 09:14:10 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250216
+NCURSES_PATCH = 20250222
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 882ef2ad0..6ea455d54 100755
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-# $Id: MKterminfo.sh,v 1.20 2024/01/13 20:37:40 tom Exp $
+# $Id: MKterminfo.sh,v 1.21 2025/02/20 00:14:25 tom Exp $
 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
 #***************************************************************************
-# Copyright 2018-2020,2022 Thomas E. Dickey                                *
+# Copyright 2018-2024,2025 Thomas E. Dickey                                *
 # Copyright 1998-2003,2017 Free Software Foundation, Inc.                  *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -76,6 +76,9 @@ trap 'code=$?; rm -f $sorted $temp $unsorted; exit $code' EXIT HUP INT QUIT TERM
 rm -f $sorted $temp $unsorted
 
 cat $caps | sed -n "\
+/^#%.TS/i.na
+/^#%.TE/a\
+.ad
 /%%-STOP-HERE-%%/q
 /^#%center/s, expand,,
 /^#%lw25/s, lw6 , lw7 ,
@@ -84,7 +87,6 @@ cat $caps | sed -n "\
 s/[	][	]*/	/g
 s/$/T}/
 s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{\\
-.ad l\
 /
 s/	bool	/	/p
 s/	num	/	/p
@@ -116,7 +118,7 @@ do
 done <$unsorted
 test $saved = yes && sort $temp >>$sorted
 
-sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134"
+sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134" | sed -e '/^$/d'
 
 sed	-e '/^center expand;/s, expand,,' \
 	-e '/^\.TS/,/^\\/s, lw[1-9][0-9]*\., l.,' \
diff --git a/man/infocmp.1m b/man/infocmp.1m
index e9aa52703..9c55b63ab 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp $
-.TH @INFOCMP@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: infocmp.1m,v 1.126 2025/02/18 00:05:00 tom Exp $
+.TH @INFOCMP@ 1M 2025-02-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -111,7 +111,7 @@ and rewrites an entry to replace
 expressions with the content of other entries by reference.
 A
 .I "\%term\%info entry"
-entry comprises
+comprises
 a list of one or more terminal type identifiers,
 a human-readable description of the terminal type,
 and a list of terminal
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 64364b823..c7742652e 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.156 2025/01/19 00:51:10 tom Exp $
+.\" $Id: terminfo.tail,v 1.157 2025/02/17 23:55:31 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -1014,7 +1014,7 @@ to delete a single character,
 with one parameter,
 .IR n ,
 to delete
-.IR n "characters,"
+.IR n " characters,"
 and delete mode by giving \fBsmdc\fP and \fBrmdc\fP
 to enter and exit delete mode (any mode the terminal needs to be placed
 in for
diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index 7c0fc6b1c..5bea4187f 100644
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.63 2024/12/07 20:00:48 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.65 2025/02/20 08:53:36 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -55,8 +55,8 @@ waddnstr(WINDOW *win, const char *astr, int n)
 
     T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
 
-    if (win && (str != NULL) && (n != 0)) {
-	bool explicit = (n > 0);
+    if (win != NULL && str != NULL) {
+	bool explicit = (n >= 0);
 
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
@@ -230,8 +230,8 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 
     T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
 
-    if (win && (str != NULL) && (n != 0)) {
-	bool explicit = (n > 0);
+    if (win != NULL && str != NULL) {
+	bool explicit = (n >= 0);
 
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
diff --git a/ncurses/base/lib_driver.c b/ncurses/base/lib_driver.c
index 3d3fec258..171ad615a 100644
--- a/ncurses/base/lib_driver.c
+++ b/ncurses/base/lib_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2009-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_driver.c,v 1.10 2024/12/14 22:31:35 tom Exp $")
+MODULE_ID("$Id: lib_driver.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
 
 #ifndef EXP_WIN32_DRIVER
 typedef struct DriverEntry {
@@ -61,7 +61,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret)
     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
        (void *) TCB, NonNull(name), (void *) errret));
 
-    assert(TCB != 0);
+    assert(TCB != NULL);
 
     for (i = 0; i < SIZEOF(DriverTable); i++) {
 	res = DriverTable[i].driver;
diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 15dd50daa..a7cd9aeea 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.107 2024/12/07 17:41:36 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.108 2025/02/20 01:02:09 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -190,7 +190,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
        (void *) ifp));
 
 #if NCURSES_SP_FUNCS
-    assert(SP_PARM != 0);
+    assert(SP_PARM != NULL);
     if (SP_PARM == NULL)
 	returnSP(SP_PARM);
 #endif
@@ -216,7 +216,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
 	_nc_set_screen(NULL);
 #ifdef USE_TERM_DRIVER
-	assert(new_term != 0);
+	assert(new_term != NULL);
 #endif
 
 #if NCURSES_SP_FUNCS
@@ -251,7 +251,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 #elif !NCURSES_SP_FUNCS
 	    _nc_set_screen(CURRENT_SCREEN);
 #endif
-	    assert(SP_PARM != 0);
+	    assert(SP_PARM != NULL);
 	    cols = *(ptrCols(SP_PARM));
 #ifdef USE_TERM_DRIVER
 	    _nc_set_screen(SP_PARM);
diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index a1ac64728..219b60691 100644
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.38 2024/07/27 19:22:23 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.39 2025/02/20 01:07:05 tom Exp $")
 
 #if USE_SAFE_SPRINTF
 
@@ -60,12 +60,12 @@ _nc_printf_length(const char *fmt, va_list ap)
     size_t fmt_len;
     char fmt_arg[BUFSIZ];
 
-    if (fmt == 0 || *fmt == '\0')
+    if (fmt == NULL || *fmt == '\0')
 	return 0;
     fmt_len = strlen(fmt) + 1;
-    if ((format = typeMalloc(char, fmt_len)) == 0)
+    if ((format = typeMalloc(char, fmt_len)) == NULL)
 	  return -1;
-    if ((buffer = typeMalloc(char, length)) == 0) {
+    if ((buffer = typeMalloc(char, length)) == NULL) {
 	free(format);
 	return -1;
     }
@@ -114,7 +114,7 @@ _nc_printf_length(const char *fmt, va_list ap)
 				_nc_SLIMIT(sizeof(fmt_arg))
 				"%d", ival);
 		    fmt_len += strlen(fmt_arg);
-		    if ((format = _nc_doalloc(format, fmt_len)) == 0) {
+		    if ((format = _nc_doalloc(format, fmt_len)) == NULL) {
 			free(buffer);
 			return -1;
 		    }
@@ -162,7 +162,7 @@ _nc_printf_length(const char *fmt, va_list ap)
 			if (prec > (int) length) {
 			    length = length + (size_t) prec;
 			    buffer = typeRealloc(char, length, buffer);
-			    if (buffer == 0) {
+			    if (buffer == NULL) {
 				free(format);
 				return -1;
 			    }
diff --git a/ncurses/base/vsscanf.c b/ncurses/base/vsscanf.c
index 40ee8bb1d..022365f07 100644
--- a/ncurses/base/vsscanf.c
+++ b/ncurses/base/vsscanf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2020-2023,2025 Thomas E. Dickey                                *
  * Copyright 1998-2004,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -39,7 +39,7 @@
 
 #if !HAVE_VSSCANF
 
-MODULE_ID("$Id: vsscanf.c,v 1.22 2023/09/23 18:48:57 tom Exp $")
+MODULE_ID("$Id: vsscanf.c,v 1.23 2025/02/20 01:08:11 tom Exp $")
 
 #if !(HAVE_VFSCANF || HAVE__DOSCAN)
 
@@ -215,7 +215,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 	int eaten;
 	void *pointer;
 
-	if (my_fmt != 0) {
+	if (my_fmt != NULL) {
 	    /*
 	     * Split the original format into chunks, adding a "%n" to the end
 	     * of each (except of course if it used %n), and use that
@@ -229,7 +229,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 		state = sUnknown;
 		chunk = cUnknown;
 		other = oUnknown;
-		pointer = 0;
+		pointer = NULL;
 		for (n = 0; format[n] != 0 && state != sFinal; ++n) {
 		    my_fmt[n] = format[n];
 		    switch (state) {
diff --git a/ncurses/report_hashing.c b/ncurses/report_hashing.c
index bed96efbe..5a091eb07 100644
--- a/ncurses/report_hashing.c
+++ b/ncurses/report_hashing.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2025 Thomas E. Dickey                                     *
  *                                                                          *
  * 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 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: report_hashing.c,v 1.3 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: report_hashing.c,v 1.4 2025/02/20 01:02:09 tom Exp $")
 
 static void
 check_names(const char *name, NCURSES_CONST char *const *table, int termcap)
@@ -46,7 +46,7 @@ check_names(const char *name, NCURSES_CONST char *const *table, int termcap)
     printf("%s:\n", name);
     for (n = 0; table[n] != NULL; ++n) {
 	entry_ptr = _nc_find_entry(table[n], hash_table);
-	if (entry_ptr == 0) {
+	if (entry_ptr == NULL) {
 	    printf("  %s\n", table[n]);
 	    errs++;
 	}
diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 9bd0fa5b1..5ea30aff7 100644
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,7 +52,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.41 2024/12/07 18:05:04 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.42 2025/02/20 01:02:09 tom Exp $")
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -78,7 +78,7 @@ _nc_rootname(char *path)
     }
 #endif
 #if defined(PROG_EXT)
-    if ((s = strrchr(result, '.')) != 0) {
+    if ((s = strrchr(result, '.')) != NULL) {
 	if (!strcmp(s, PROG_EXT))
 	    *s = '\0';
     }
@@ -94,7 +94,7 @@ NCURSES_EXPORT(bool)
 _nc_is_abs_path(const char *path)
 {
 #if defined(__EMX__) || defined(__DJGPP__)
-#define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
+#define is_pathname(s) ((((s) != NULL) && ((s)[0] == '/')) \
 		  || (((s)[0] != 0) && ((s)[1] == ':')))
 #else
 #define is_pathname(s) ((s) != NULL && (s)[0] == '/')
@@ -110,7 +110,7 @@ _nc_pathlast(const char *path)
 {
     const char *test = strrchr(path, '/');
 #ifdef __EMX__
-    if (test == 0)
+    if (test == NULL)
 	test = strrchr(path, '\\');
 #endif
     if (test == NULL)
diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index 706820e7a..835b112d3 100644
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -98,7 +98,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.107 2025/02/15 15:31:16 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.108 2025/02/20 00:48:11 tom Exp $")
 
 #if 0
 #define DEBUG_THIS(p) DEBUG(9, p)
@@ -980,7 +980,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
 	 * 'str' always points to the end of what was scanned in this step,
 	 * but that may not be the end of the string.
 	 */
-	assert(str != 0);
+	assert(str != NULL);
 	if (str == NULL || *str == '\0')
 	    break;
 
diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c
index 0d584e394..21a250870 100644
--- a/ncurses/tinfo/getenv_num.c
+++ b/ncurses/tinfo/getenv_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: getenv_num.c,v 1.10 2024/12/07 18:14:49 tom Exp $")
+MODULE_ID("$Id: getenv_num.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
 
 NCURSES_EXPORT(int)
 _nc_getenv_num(const char *name)
@@ -67,7 +67,7 @@ _nc_setenv_num(const char *name, int value)
 #elif HAVE_PUTENV
 	char *s;
 	_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=%d", name, value);
-	if ((s = strdup(buffer)) != 0)
+	if ((s = strdup(buffer)) != NULL)
 	    putenv(s);
 #else
 #error expected setenv/putenv functions
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index cf7115bbf..bad270ce3 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -43,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.93 2024/12/21 20:27:36 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.94 2025/02/20 01:02:09 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -97,7 +97,7 @@ _nc_alloc_screen(void)
 {
     my_screen = _nc_alloc_screen_sp();
     T(("_nc_alloc_screen_sp %p", my_screen));
-    return (my_screen != 0);
+    return (my_screen != NULL);
 }
 
 NCURSES_EXPORT(void)
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 8fad8ee09..f2a557db3 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.249 2025/01/18 14:47:35 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.250 2025/02/20 01:31:35 tom Exp $")
 
 /****************************************************************************
  *
@@ -120,7 +120,7 @@ NCURSES_PUBLIC_VAR(ttytype) (void)
 	}
     }
 #else
-    if (cur_term != 0) {
+    if (cur_term != NULL) {
 	result = TerminalType(cur_term).term_names;
     }
 #endif
@@ -468,7 +468,7 @@ _nc_get_screensize(SCREEN *sp,
     TERMINAL_CONTROL_BLOCK *TCB;
     int my_tabsize;
 
-    assert(termp != 0 && linep != 0 && colp != 0);
+    assert(termp != NULL && linep != NULL && colp != NULL);
     TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 
     my_tabsize = TCB->info.tabsize;
@@ -627,7 +627,7 @@ _nc_update_screensize(SCREEN *sp)
     int old_lines;
     int old_cols;
 
-    assert(sp != 0);
+    assert(sp != NULL);
 
     CallDriver_2(sp, td_getsize, &old_lines, &old_cols);
 
@@ -767,8 +767,8 @@ _nc_unicode_locale(void)
 	T(("_nc_unicode_locale(%s) ->%d", env, result));
 #else
 	char *env = _nc_get_locale();
-	if (env != 0) {
-	    if (strstr(env, ".UTF-8") != 0) {
+	if (env != NULL) {
+	    if (strstr(env, ".UTF-8") != NULL) {
 		result = TRUE;
 		T(("_nc_unicode_locale(%s) ->%d", env, result));
 	    }
diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c
index 25d1dbb6a..79660b0ea 100644
--- a/ncurses/tinfo/obsolete.c
+++ b/ncurses/tinfo/obsolete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
  * Copyright 2013-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: obsolete.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
+MODULE_ID("$Id: obsolete.c,v 1.13 2025/02/20 01:12:11 tom Exp $")
 
 /*
  * Obsolete entrypoint retained for binary compatibility.
@@ -64,11 +64,11 @@ _nc_set_buffer(FILE *ofp, int buffered)
 NCURSES_EXPORT(char *)
 _nc_strdup(const char *s)
 {
-    char *result = 0;
-    if (s != 0) {
+    char *result = NULL;
+    if (s != NULL) {
 	size_t need = strlen(s);
 	result = malloc(need + 1);
-	if (result != 0) {
+	if (result != NULL) {
 	    _nc_STRCPY(result, s, need);
 	}
     }
diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 2824645e3..a2278c07f 100644
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -48,7 +48,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.113 2025/01/11 20:19:34 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.115 2025/02/20 09:11:49 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] =
@@ -492,8 +492,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 		 */
 		if (!strcmp("ma", _nc_curr_token.tk_name)) {
 		    entry_ptr = _nc_find_type_entry("ma", NUMBER,
-						    _nc_syntax != 0);
-		    assert(entry_ptr != 0);
+						    _nc_syntax != SYN_TERMINFO);
+		    assert(entry_ptr != NULL);
 		}
 	    } else if (entry_ptr->nte_type != token_type) {
 		/*
@@ -510,15 +510,15 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
 		    && !strcmp("ma", _nc_curr_token.tk_name)) {
 		    /* tell max_attributes from arrow_key_map */
 		    entry_ptr = _nc_find_type_entry("ma", NUMBER,
-						    _nc_syntax != 0);
-		    assert(entry_ptr != 0);
+						    _nc_syntax != SYN_TERMINFO);
+		    assert(entry_ptr != NULL);
 
 		} else if (token_type == STRING
 			   && !strcmp("MT", _nc_curr_token.tk_name)) {
 		    /* map terminfo's string MT to MT */
 		    entry_ptr = _nc_find_type_entry("MT", STRING,
-						    _nc_syntax != 0);
-		    assert(entry_ptr != 0);
+						    _nc_syntax != SYN_TERMINFO);
+		    assert(entry_ptr != NULL);
 
 		} else if (token_type == BOOLEAN
 			   && entry_ptr->nte_type == STRING) {
diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index 9c78614db..03b96a845 100644
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.105 2025/01/12 00:42:58 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.106 2025/02/20 01:27:42 tom Exp $")
 
 #if !PURE_TERMINFO
 
@@ -275,7 +275,7 @@ _nc_getent(
 {
     register char *r_end, *rp;
     int myfd = FALSE;
-    char *record = 0;
+    char *record = NULL;
     int tc_not_resolved;
     int current;
     int lineno;
@@ -291,7 +291,7 @@ _nc_getent(
      * Check if we have a top record from cgetset().
      */
     if (depth == 0 && toprec != 0 && _nc_cgetmatch(toprec, name) == 0) {
-	if ((record = DOALLOC(topreclen + BFRAG)) == 0) {
+	if ((record = DOALLOC(topreclen + BFRAG)) == NULL) {
 	    errno = ENOMEM;
 	    return (TC_SYS_ERR);
 	}
@@ -305,7 +305,7 @@ _nc_getent(
 	/*
 	 * Allocate first chunk of memory.
 	 */
-	if ((record = DOALLOC(BFRAG)) == 0) {
+	if ((record = DOALLOC(BFRAG)) == NULL) {
 	    errno = ENOMEM;
 	    return (TC_SYS_ERR);
 	}
@@ -315,7 +315,7 @@ _nc_getent(
 	/*
 	 * Loop through database array until finding the record.
 	 */
-	for (current = in_array; db_array[current] != 0; current++) {
+	for (current = in_array; db_array[current] != NULL; current++) {
 	    int eof = FALSE;
 
 	    /*
@@ -408,7 +408,7 @@ _nc_getent(
 			    pos = (unsigned) (rp - record);
 			    newsize = (size_t) (r_end - record + BFRAG);
 			    record = DOALLOC(newsize);
-			    if (record == 0) {
+			    if (record == NULL) {
 				if (myfd)
 				    (void) close(fd);
 				errno = ENOMEM;
@@ -464,7 +464,7 @@ _nc_getent(
 	register int newilen;
 	unsigned ilen;
 	int diff, iret, tclen, oline;
-	char *icap = 0, *scan, *tc, *tcstart, *tcend;
+	char *icap = NULL, *scan, *tc, *tcstart, *tcend;
 
 	/*
 	 * Loop invariants:
@@ -477,7 +477,7 @@ _nc_getent(
 	scan = record;
 	tc_not_resolved = FALSE;
 	for (;;) {
-	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) {
+	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == NULL) {
 		break;
 	    }
 
@@ -548,7 +548,7 @@ _nc_getent(
 		tcpos = (unsigned) (tcstart - record);
 		tcposend = (unsigned) (tcend - record);
 		record = DOALLOC(newsize);
-		if (record == 0) {
+		if (record == NULL) {
 		    if (myfd)
 			(void) close(fd);
 		    free(icap);
@@ -586,7 +586,7 @@ _nc_getent(
 	(void) close(fd);
     *len = (unsigned) (rp - record - 1);	/* don't count NUL */
     if (r_end > rp) {
-	if ((record = DOALLOC((size_t) (rp - record))) == 0) {
+	if ((record = DOALLOC((size_t) (rp - record))) == NULL) {
 	    errno = ENOMEM;
 	    return (TC_SYS_ERR);
 	}
@@ -920,7 +920,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
 	if ((the_source = strdup(temp)) != NULL)
 	    *sourcename = the_source;
 #else
-	if ((the_source = strdup(pathvec[i])) != 0)
+        if ((the_source = strdup(pathvec[i])) != NULL)
 	    *sourcename = the_source;
 #endif
     }
@@ -941,7 +941,7 @@ static int
 add_tc(char *termpaths[], char *path, int count)
 {
     char *save = strchr(path, NCURSES_PATHSEP);
-    if (save != 0)
+    if (save != NULL)
 	*save = '\0';
     if (count < MAXPATHS
 	&& _nc_access(path, R_OK) == 0) {
@@ -949,7 +949,7 @@ add_tc(char *termpaths[], char *path, int count)
 	TR(TRACE_DATABASE, ("Adding termpath %s", path));
     }
     termpaths[count] = 0;
-    if (save != 0)
+    if (save != NULL)
 	*save = NCURSES_PATHSEP;
     return count;
 }
@@ -1034,20 +1034,20 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
     int j, k;
     bool use_buffer = FALSE;
     bool normal = TRUE;
-    char *tc_buf = 0;
+    char *tc_buf = NULL;
     char pathbuf[PATH_MAX];
-    char *copied = 0;
+    char *copied = NULL;
     char *cp;
     struct stat test_stat[MAXPATHS];
 
-    termpaths[filecount] = 0;
-    if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != 0) {
+    termpaths[filecount] = NULL;
+    if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != NULL) {
 	if (_nc_is_abs_path(tc)) {	/* interpret as a filename */
 	    ADD_TC(tc, 0);
 	    normal = FALSE;
 	} else if (_nc_name_match(tc, tn, "|:")) {	/* treat as a capability file */
 	    tc_buf = strdup(tc);
-	    use_buffer = (tc_buf != 0);
+	    use_buffer = (tc_buf != NULL);
 	    normal = FALSE;
 	}
     }
@@ -1055,7 +1055,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
     if (normal) {		/* normal case */
 	char envhome[PATH_MAX], *h;
 
-	if ((copied = strdup(get_termpath())) != 0) {
+	if ((copied = strdup(get_termpath())) != NULL) {
 	    for (cp = copied; *cp; cp++) {
 		if (*cp == NCURSES_PATHSEP)
 		    *cp = '\0';
@@ -1140,7 +1140,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 	    }
 	}
     }
-    if (copied != 0)
+    if (copied != NULL)
 	free(copied);
 #endif /* USE_GETCAP */
 
@@ -1153,7 +1153,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 
     /* find a terminal matching tn, if we can */
 #if USE_GETCAP_CACHE
-    if (getcwd(cwd_buf, sizeof(cwd_buf)) != 0) {
+    if (getcwd(cwd_buf, sizeof(cwd_buf)) != NULL) {
 	_nc_set_writedir((char *) 0);	/* note: this does a chdir */
 #endif
 	for_entry_list(ep) {
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index 8281d5050..3bdd81242 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -52,7 +52,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.78 2025/01/18 14:47:35 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.79 2025/02/20 01:30:20 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -94,8 +94,8 @@ NCURSES_EXPORT_VAR(int) COLORS = 0;
 #endif
 
 #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO)
-#define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC)
-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp
+#define AssertTCB() assert(TCB != NULL && TCB->magic == TCBMAGIC)
+#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
 
 /*
  * This routine needs to do all the work to make curscr look
@@ -163,7 +163,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
     START_TRACE();
     T((T_CALLED("tinfo::drv_CanHandle(%p)"), (void *) TCB));
 
-    assert(TCB != 0 && tname != 0);
+    assert(TCB != NULL && tname != NULL);
     termp = (TERMINAL *) TCB;
     sp = TCB->csp;
     TCB->magic = TCBMAGIC;
@@ -545,7 +545,7 @@ static int
 drv_getsize(TERMINAL_CONTROL_BLOCK * TCB, int *l, int *c)
 {
     AssertTCB();
-    assert(l != 0 && c != 0);
+    assert(l != NULL && c != NULL);
     *l = lines;
     *c = columns;
     return OK;
@@ -1076,7 +1076,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map)
     SCREEN *sp = TCB->csp;
 
     AssertTCB();
-    assert(sp != 0);
+    assert(sp != NULL);
     if (ena_acs != NULL) {
 	NCURSES_PUTP2("ena_acs", ena_acs);
     }
@@ -1516,12 +1516,12 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret)
     int code = ERR;
     size_t i;
     TERM_DRIVER *res = (TERM_DRIVER *) 0;
-    TERM_DRIVER *use = 0;
+    TERM_DRIVER *use = NULL;
 
     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
        (void *) TCB, NonNull(name), (void *) errret));
 
-    assert(TCB != 0);
+    assert(TCB != NULL);
 
     for (i = 0; i < SIZEOF(DriverTable); i++) {
 	res = DriverTable[i].driver;
@@ -1532,7 +1532,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret)
 	       If on Windows td_CanHandle returned FALSE although the terminal
 	       name is empty, we default to ms-terminal as tinfo TERM type.
 	     */
-	    if (name == 0 || *name == 0 || (strcmp(name, "unknown") == 0)) {
+	    if (name == NULL || *name == 0 || (strcmp(name, "unknown") == 0)) {
 		name = MS_TERMINAL;
 		T(("Set TERM=%s", name));
 	    }
diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c
index d953fb6e6..d2fd7227b 100644
--- a/ncurses/trace/lib_tracebits.c
+++ b/ncurses/trace/lib_tracebits.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_tracebits.c,v 1.33 2024/12/21 16:39:29 tom Exp $")
+MODULE_ID("$Id: lib_tracebits.c,v 1.34 2025/02/20 01:02:09 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>		/* needed for ISC */
@@ -244,7 +244,7 @@ _nc_trace_ttymode(const TTY * tty)
     buf = _nc_trace_buf(0,
 			8 + sizeof(dwFlagsOut) +
 			8 + sizeof(dwFlagsIn));
-    if (buf != 0) {
+    if (buf != NULL) {
 	lookup_bits(buf, dwFlagsIn, "dwIn", tty->dwFlagIn);
 	lookup_bits(buf, dwFlagsOut, "dwOut", tty->dwFlagOut);
     }
@@ -284,7 +284,7 @@ _nc_trace_ttymode(const TTY * tty)
 
     buf = _nc_trace_buf(0,
 			8 + sizeof(cflags));
-    if (buf != 0) {
+    if (buf != NULL) {
 	if (tty->sg_flags & ALLCTRL) {
 	    lookup_bits(buf, cflags, "cflags", tty->sg_flags);
 	}
diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index 5550c8255..4c3cb3805 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.31 2024/12/07 18:03:14 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.32 2025/02/20 01:02:09 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -109,8 +109,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
        (void *) win, _nc_viswbufn(wstr, n), n));
 
     if (win != NULL
-	&& wstr != NULL
-	&& n != 0) {
+	&& wstr != NULL) {
 
 	if (n < 0) {
 	    n = INT_MAX;
diff --git a/ncurses/widechar/widechars.c b/ncurses/widechar/widechars.c
index 0c676b1a0..6ea008dda 100644
--- a/ncurses/widechar/widechars.c
+++ b/ncurses/widechar/widechars.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2012,2013 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
 
 #if USE_WIDEC_SUPPORT
 
-MODULE_ID("$Id: widechars.c,v 1.10 2024/08/31 15:55:27 tom Exp $")
+MODULE_ID("$Id: widechars.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
 
 #if defined(_NC_MINGW)
 /*
@@ -45,7 +45,7 @@ _nc_mbtowc(wchar_t *pwc, const char *s, size_t n)
     int count;
     int try;
 
-    if (s != 0 && n != 0) {
+    if (s != NULL && n != 0) {
 	/*
 	 * MultiByteToWideChar() can decide to return more than one
 	 * wide-character.  We want only one.  Ignore any trailing null, both
@@ -96,7 +96,7 @@ _nc_mblen(const char *s, size_t n)
     int count;
     wchar_t temp;
 
-    if (s != 0 && n != 0) {
+    if (s != NULL && n != 0) {
 	count = _nc_mbtowc(&temp, s, n);
 	if (count == 1) {
 	    int check = WideCharToMultiByte(CP_UTF8,
diff --git a/ncurses/win32con/win32_driver.c b/ncurses/win32con/win32_driver.c
index 0a43588b1..0a7f4ba95 100644
--- a/ncurses/win32con/win32_driver.c
+++ b/ncurses/win32con/win32_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,18 +48,18 @@
 
 #define CUR TerminalType(my_term).
 
-MODULE_ID("$Id: win32_driver.c,v 1.4 2023/09/16 16:29:24 tom Exp $")
+MODULE_ID("$Id: win32_driver.c,v 1.5 2025/02/20 01:15:57 tom Exp $")
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 #define EXP_OPTIMIZE 0
 
 static bool console_initialized = FALSE;
 
-#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC))
+#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC))
 #define validateConsoleHandle() (AssertTCB() , console_initialized ||\
                                  (console_initialized=\
                                   _nc_console_checkinit(TRUE,FALSE)))
-#define SetSP() assert(TCB->csp != 0); sp = TCB->csp; (void) sp
+#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
 #define AdjustY() (WINCONSOLE.buffered ?\
                    0 : (int) WINCONSOLE.SBI.srWindow.Top)
 #define RevAttr(attr) (WORD) (((attr) & 0xff00) |   \
@@ -422,7 +422,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	    };
 
 	    for (x = 0; x < Width; x++)
-		setcchar(&empty[x], blank, 0, 0, 0);
+		setcchar(&empty[x], blank, 0, 0, NULL);
 #else
 	    chtype *empty = TypeAlloca(chtype, Width);
 
@@ -530,11 +530,11 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 
     T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
 
-    assert((TCB != 0) && (tname != 0));
+    assert((TCB != NULL) && (tname != NULL));
 
     TCB->magic = WINMAGIC;
 
-    if (tname == 0 || *tname == 0) {
+    if (tname == NULL || *tname == 0) {
 	if (!_nc_console_vt_supported())
 	    code = TRUE;
     } else if (tname != 0 && *tname == '#') {
@@ -551,7 +551,7 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 		|| (strncmp(tname + 1, "win32con", n) == 0))) {
 	    code = TRUE;
 	}
-    } else if (tname != 0 && stricmp(tname, "unknown") == 0) {
+    } else if (tname != NULL && stricmp(tname, "unknown") == 0) {
 	code = TRUE;
     }
 
@@ -1059,7 +1059,7 @@ wcon_initacs(TERMINAL_CONTROL_BLOCK * TCB,
 	for (n = 0; n < SIZEOF(table); ++n) {
 	    real_map[table[n].acs_code] =
 		(chtype) table[n].use_code | A_ALTCHARSET;
-	    if (sp != 0)
+	    if (sp != NULL)
 		sp->_screen_acs_map[table[n].acs_code] = TRUE;
 	}
     }
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index df735a728..4b59a158c 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.77 2025/02/20 01:19:43 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -70,8 +70,8 @@ MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
 static bool InitConsole(void);
 static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *);
 
-#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC))
-#define SetSP()     assert(TCB->csp != 0); sp = TCB->csp; (void) sp
+#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC))
+#define SetSP()     assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
 
 #define GenMap(vKey,key) MAKELONG(key, vKey)
 
@@ -519,7 +519,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	    };
 
 	    for (x = 0; x < Width; x++)
-		setcchar(&empty[x], blank, 0, 0, 0);
+		setcchar(&empty[x], blank, 0, 0, NULL);
 #else
 	    chtype *empty = TypeAlloca(chtype, Width);
 
@@ -629,13 +629,13 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 
     T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
 
-    assert((TCB != 0) && (tname != 0));
+    assert((TCB != NULL) && (tname != NULL));
 
     TCB->magic = WINMAGIC;
 
-    if (tname == 0 || *tname == 0)
+    if (tname == NULL || *tname == 0)
 	code = TRUE;
-    else if (tname != 0 && *tname == '#') {
+    else if (tname != NULL && *tname == '#') {
 	/*
 	 * Use "#" (a character which cannot begin a terminal's name) to
 	 * select specific driver from the table.
@@ -649,7 +649,7 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 		|| (strncmp(tname + 1, "win32con", n) == 0))) {
 	    code = TRUE;
 	}
-    } else if (tname != 0 && stricmp(tname, "unknown") == 0) {
+    } else if (tname != NULL && stricmp(tname, "unknown") == 0) {
 	code = TRUE;
     } else if (SysISATTY(TCB->term.Filedes)) {
 	code = TRUE;
@@ -1173,7 +1173,7 @@ read_screen_data(void)
 
     want = (size_t) (CON.save_size.X * CON.save_size.Y);
 
-    if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != 0) {
+    if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != NULL) {
 	bufferCoord.X = (SHORT) (CON.window_only ? CON.SBI.srWindow.Left : 0);
 	bufferCoord.Y = (SHORT) (CON.window_only ? CON.SBI.srWindow.Top : 0);
 
@@ -1449,7 +1449,7 @@ wcon_initacs(TERMINAL_CONTROL_BLOCK * TCB,
 
 	for (n = 0; n < SIZEOF(table); ++n) {
 	    real_map[table[n].acs_code] = (chtype) table[n].use_code | A_ALTCHARSET;
-	    if (sp != 0)
+	    if (sp != NULL)
 		sp->_screen_acs_map[table[n].acs_code] = TRUE;
 	}
     }
@@ -2000,9 +2000,9 @@ _nc_mingw_isconsole(int fd)
 
 #define TC_PROLOGUE(fd) \
     SCREEN *sp;                                               \
-    TERMINAL *term = 0;                                       \
+    TERMINAL *term = NULL;                                    \
     int code = ERR;                                           \
-    if (_nc_screen_chain == 0)                                \
+    if (_nc_screen_chain == NULL)                             \
         return 0;                                             \
     for (each_screen(sp)) {                                   \
         if (sp->_term && (sp->_term->Filedes == fd)) {        \
@@ -2010,7 +2010,7 @@ _nc_mingw_isconsole(int fd)
             break;                                            \
         }                                                     \
     }                                                         \
-    assert(term != 0)
+    assert(term != NULL)
 
 int
 _nc_mingw_tcsetattr(
@@ -2269,7 +2269,7 @@ InitConsole(void)
 static bool
 okConsoleHandle(TERMINAL_CONTROL_BLOCK * TCB)
 {
-    return ((TCB != 0) &&
+    return ((TCB != NULL) &&
 	    (TCB->magic == WINMAGIC) &&
 	    InitConsole());
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index de76ca4bf..31e4a4322 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250216) unstable; urgency=low
+ncurses6td (6.5+20250222) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index de76ca4bf..31e4a4322 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250216) unstable; urgency=low
+ncurses6td (6.5+20250222) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 79ef3299c..3c34fe7bb 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250216) unstable; urgency=low
+ncurses6td (6.5+20250222) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Feb 2025 17:35:29 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 71a5b41f0..7cf365f41 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.690 2025/02/16 22:35:29 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.691 2025/02/20 09:14:10 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0216"
+!define VERSION_MMDD  "0222"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 212230593..b4fde2630 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250216
+Release: 20250222
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 577e8ee3f..d7fee2936 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250216
+Release: 20250222
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c7ed04dc8..d3543f31b 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250216
+Release: 20250222
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

From 38c899f0733d4e2379dc86bd7a7d767cf330fcac Mon Sep 17 00:00:00 2001
From: Yann Dirson <yann.dirson@vates.tech>
Date: Sun, 2 Mar 2025 00:17:59 +0100
Subject: [PATCH 106/106] ncurses-6.5-20250301.patch.gz

---
 Ada95/aclocal.m4                   |    7 +-
 NEWS                               |   15 +-
 VERSION                            |    2 +-
 aclocal.m4                         |   69 +-
 configure                          | 1884 +++++++++++++---------------
 configure.in                       |   23 +-
 dist.mk                            |    4 +-
 doc/html/man/curs_add_wch.3x.html  |   46 +-
 doc/html/man/curs_addch.3x.html    |   48 +-
 doc/html/man/curs_color.3x.html    |   38 +-
 doc/html/man/curs_getcchar.3x.html |   12 +-
 doc/html/man/curs_initscr.3x.html  |   40 +-
 doc/html/man/curs_inopts.3x.html   |  137 +-
 doc/html/man/curs_ins_wch.3x.html  |   46 +-
 doc/html/man/curs_ins_wstr.3x.html |   12 +-
 doc/html/man/curs_insch.3x.html    |   36 +-
 doc/html/man/curs_instr.3x.html    |   42 +-
 doc/html/man/curs_inwstr.3x.html   |   59 +-
 doc/html/man/curs_kernel.3x.html   |   42 +-
 doc/html/man/curs_mouse.3x.html    |   29 +-
 doc/html/man/curs_move.3x.html     |   14 +-
 doc/html/man/curs_outopts.3x.html  |   70 +-
 doc/html/man/infocmp.1m.html       |   20 +-
 doc/html/man/ncurses.3x.html       |   12 +-
 doc/html/man/terminfo.5.html       |    8 +-
 doc/html/man/tput.1.html           |   30 +-
 include/curses.h.in                |    6 +-
 include/nc_alloc.h                 |   25 +-
 include/nc_win32.h                 |    6 +-
 include/ncurses_defs               |    7 +-
 man/MKterminfo.sh                  |    6 +-
 man/curs_add_wch.3x                |   56 +-
 man/curs_addch.3x                  |   48 +-
 man/curs_color.3x                  |   56 +-
 man/curs_getcchar.3x               |    8 +-
 man/curs_initscr.3x                |   28 +-
 man/curs_inopts.3x                 |   55 +-
 man/curs_ins_wch.3x                |   61 +-
 man/curs_ins_wstr.3x               |    6 +-
 man/curs_insch.3x                  |   54 +-
 man/curs_instr.3x                  |   36 +-
 man/curs_inwstr.3x                 |   51 +-
 man/curs_kernel.3x                 |   72 +-
 man/curs_mouse.3x                  |   16 +-
 man/curs_move.3x                   |   16 +-
 man/curs_outopts.3x                |  198 ++-
 man/make_sed.sh                    |    6 +-
 man/manhtml.externs                |    6 +-
 man/ncurses.3x                     |    6 +-
 man/tput.1                         |   23 +-
 misc/terminfo.src                  |   17 +-
 ncurses/base/MKlib_gen.sh          |    5 +-
 ncurses/curses.priv.h              |   18 +-
 ncurses/tinfo/lib_win32con.c       |    5 +-
 ncurses/tty/lib_twait.c            |    4 +-
 ncurses/win32con/win32_driver.c    |   14 +-
 ncurses/win32con/win_driver.c      |   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 +-
 64 files changed, 1991 insertions(+), 1721 deletions(-)

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 38744d31d..390c3944f 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.226 2025/01/11 00:55:54 tom Exp $
+dnl $Id: aclocal.m4,v 1.227 2025/02/23 01:57:36 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3201,11 +3201,6 @@ dnl We need these values in the generated makefiles
 AC_SUBST(cf_cv_rel_version)
 AC_SUBST(cf_cv_abi_version)
 
-dnl FIXME - not needed for Ada95
-AC_SUBST(cf_cv_builtin_bool)
-AC_SUBST(cf_cv_header_stdbool_h)
-AC_SUBST(cf_cv_type_of_bool)dnl
-
 AC_CACHE_CHECK(if KEY_RESIZE is supported,cf_cv_curses_resizes,[
 	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 		[int key = KEY_RESIZE; (void)key],
diff --git a/NEWS b/NEWS
index 1baa4d2b7..0b8280cd5 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.4251 2025/02/20 09:09:47 tom Exp $
+-- $Id: NEWS,v 1.4257 2025/03/01 21:57:13 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,12 +46,21 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20250301
+	+ add color to vt525 (Branden Robinson)
+	+ add vt520-w and vt525-w (Branden Robinson)
+	+ improve formatting/style of manpages (patches by Branden Robinson).
+	+ improve configurability of alloca() as used in Windows ports.
+	+ fix some typos in manpages.
+	+ modify configure script checks for stdbool.h to fix build with older
+	  gcc version.
+
 20250222
 	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
 	  wins_nwstr to return OK when "n" is zero, for consistency with other
 	  implementations (report by Benjamin Barenblat, cf: 20231118).
 	+ formatting improvements for terminfo.5 (Debian #1096164).
-	
+
 20250216
 	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
 	  errors when using infocmp to compare all capabilities when processing
@@ -185,7 +194,7 @@ it is not possible to add this information.
 	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
 	  misc/ncurses-config.in
 	+ add check in wresize() for out-of-range dimensions (report by Peter
-	  Bierma). 
+	  Bierma).
 
 20240922
 	+ add a few null-pointer checks in ncurses
diff --git a/VERSION b/VERSION
index d50cb3df9..32d413ba2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10	6.5	20250222
+5:0:10	6.5	20250301
diff --git a/aclocal.m4 b/aclocal.m4
index 57f3d9823..9c185a3aa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1102 2025/02/16 00:15:17 tom Exp $
+dnl $Id: aclocal.m4,v 1.1104 2025/02/23 01:49:45 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -598,52 +598,25 @@ AC_DEFUN([CF_AWK_BIG_PRINTF],
 	esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DECL version: 10 updated: 2025/02/01 19:31:51
+dnl CF_BOOL_DECL version: 11 updated: 2025/02/22 20:49:45
 dnl ------------
 dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
 dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
 dnl 2.6.3 does, in anticipation of the ANSI C++ standard.
 dnl
-dnl Treat the configuration-variable specially here, since we're directly
-dnl substituting its value (i.e., 1/0).
-dnl
 dnl $1 is the shell variable to store the result in, if not $cv_cv_builtin_bool
 AC_DEFUN([CF_BOOL_DECL],
 [
-AC_MSG_CHECKING(if we should include stdbool.h)
-
-AC_CACHE_VAL(cf_cv_header_stdbool_h,[
-	AC_TRY_COMPILE([
-#ifndef __BEOS__
-#include <stdbool.h>
-#endif
-],[bool foo = false; (void)foo],
-		[cf_cv_header_stdbool_h=1],
-		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
-			[cf_cv_header_stdbool_h=0])])])
-
-if test "$cf_cv_header_stdbool_h" = 1
-then	AC_MSG_RESULT(yes)
-else	AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING([for builtin bool type])
-
-AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[
+AC_REQUIRE([CF_C99_STDBOOL_H])
+AC_CACHE_CHECK(for builtin bool type, ifelse($1,,cf_cv_builtin_bool,[$1]),[
 	AC_TRY_COMPILE([
-#include <stdio.h>
-#include <sys/types.h>
+$ac_includes_default
 ],[bool x = false; (void)x],
-		[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
-		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])])
-
-if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1
-then	AC_MSG_RESULT(yes)
-else	AC_MSG_RESULT(no)
-fi
+		[ifelse($1,,cf_cv_builtin_bool,[$1])=yes],
+		[ifelse($1,,cf_cv_builtin_bool,[$1])=no])])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_SIZE version: 21 updated: 2024/12/14 16:09:34
+dnl CF_BOOL_SIZE version: 22 updated: 2025/02/22 20:49:45
 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 has been deprecated.
@@ -652,6 +625,7 @@ dnl If the current compiler is C rather than C++, we get the bool definition
 dnl from <stdbool.h>.
 AC_DEFUN([CF_BOOL_SIZE],
 [
+AC_REQUIRE([CF_C99_STDBOOL_H])
 AC_CHECK_SIZEOF(bool,,[
 $ac_includes_default
 
@@ -667,7 +641,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -691,7 +665,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -894,6 +868,27 @@ AC_SUBST(HAVE_STDNORETURN_H)
 AC_SUBST(STDC_NORETURN)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_C99_STDBOOL_H version: 1 updated: 2025/02/22 20:49:45
+dnl ----------------
+dnl Check if we can compile using <stdbool.h> and get a valid "bool" type.
+AC_DEFUN([CF_C99_STDBOOL_H],
+[
+AC_CACHE_CHECK(if we can include stdbool.h,cf_cv_header_stdbool_h,[
+	AC_TRY_COMPILE([
+$ac_includes_default
+#include <stdbool.h>
+],[bool foo = false; (void)foo],
+		[cf_cv_header_stdbool_h=yes],
+		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
+			[cf_cv_header_stdbool_h=no])])])
+
+if test "$cf_cv_header_stdbool_h" = yes
+then	USE_STDBOOL_H=1
+else	USE_STDBOOL_H=0
+fi
+AC_SUBST(USE_STDBOOL_H)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
diff --git a/configure b/configure
index bb7dcf9c8..dad6c3eaa 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.791 .
+# From configure.in Revision: 1.794 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20240618.
+# Generated by Autoconf 2.52.20250126.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -954,7 +954,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20240618.  Invocation command line was
+generated by GNU Autoconf 2.52.20250126.  Invocation command line was
 
   $ $0 $@
 
@@ -20541,10 +20541,12 @@ EOF
 esac
 
 for ac_header in \
+alloca.h \
 fcntl.h \
 getopt.h \
 limits.h \
 locale.h \
+malloc.h \
 math.h \
 poll.h \
 sys/auxv.h \
@@ -20559,23 +20561,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20562: checking for $ac_header" >&5
+echo "$as_me:20564: 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 20568 "configure"
+#line 20570 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20574: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20578: \$? = $ac_status" >&5
+  echo "$as_me:20580: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20594,7 +20596,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20597: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20599: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20607,23 +20609,23 @@ done
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20610: checking for $ac_header" >&5
+echo "$as_me:20612: 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 20616 "configure"
+#line 20618 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20622: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20626: \$? = $ac_status" >&5
+  echo "$as_me:20628: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20642,7 +20644,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20645: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20647: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20652,7 +20654,7 @@ EOF
 fi
 done
 
-echo "$as_me:20655: checking for header declaring getopt variables" >&5
+echo "$as_me:20657: 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
@@ -20662,7 +20664,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20665 "configure"
+#line 20667 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20675,16 +20677,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20681: \$? = $ac_status" >&5
+  echo "$as_me:20683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20687: \$? = $ac_status" >&5
+  echo "$as_me:20689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -20696,7 +20698,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20699: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20701: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -20713,14 +20715,14 @@ EOF
 
 fi
 
-echo "$as_me:20716: checking if external environ is declared" >&5
+echo "$as_me:20718: 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 20723 "configure"
+#line 20725 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20733,16 +20735,16 @@ void* x = (void*) environ; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20739: \$? = $ac_status" >&5
+  echo "$as_me:20741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20745: \$? = $ac_status" >&5
+  echo "$as_me:20747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
@@ -20753,7 +20755,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20756: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20758: result: $cf_cv_dcl_environ" >&5
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
@@ -20768,14 +20770,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:20771: checking if external environ exists" >&5
+echo "$as_me:20773: 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 20778 "configure"
+#line 20780 "configure"
 #include "confdefs.h"
 
 #undef environ
@@ -20790,16 +20792,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20796: \$? = $ac_status" >&5
+  echo "$as_me:20798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20802: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
@@ -20810,7 +20812,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20813: result: $cf_cv_have_environ" >&5
+echo "$as_me:20815: result: $cf_cv_have_environ" >&5
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
@@ -20823,13 +20825,13 @@ EOF
 
 fi
 
-echo "$as_me:20826: checking for getenv" >&5
+echo "$as_me:20828: 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 20832 "configure"
+#line 20834 "configure"
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20860,16 +20862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20866: \$? = $ac_status" >&5
+  echo "$as_me:20868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20872: \$? = $ac_status" >&5
+  echo "$as_me:20874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
@@ -20879,19 +20881,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20882: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20884: 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:20888: checking for $ac_func" >&5
+echo "$as_me:20890: 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 20894 "configure"
+#line 20896 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20922,16 +20924,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20928: \$? = $ac_status" >&5
+  echo "$as_me:20930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20934: \$? = $ac_status" >&5
+  echo "$as_me:20936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20941,7 +20943,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20944: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20946: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20951,7 +20953,7 @@ EOF
 fi
 done
 
-echo "$as_me:20954: checking if getenv returns consistent values" >&5
+echo "$as_me:20956: 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
@@ -20961,7 +20963,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20964 "configure"
+#line 20966 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21066,15 +21068,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21072: \$? = $ac_status" >&5
+  echo "$as_me:21074: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21077: \$? = $ac_status" >&5
+  echo "$as_me:21079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
@@ -21087,7 +21089,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21090: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:21092: result: $cf_cv_consistent_getenv" >&5
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
@@ -21102,18 +21104,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
 	test "x$cf_with_trace" = xyes
 then
-	{ echo "$as_me:21105: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+	{ echo "$as_me:21107: 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
 
-echo "$as_me:21109: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:21111: 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 21116 "configure"
+#line 21118 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21133,16 +21135,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21139: \$? = $ac_status" >&5
+  echo "$as_me:21141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21145: \$? = $ac_status" >&5
+  echo "$as_me:21147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -21154,7 +21156,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21157: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:21159: 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
@@ -21169,13 +21171,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:21172: checking for an ANSI C-conforming const" >&5
+echo "$as_me:21174: 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 21178 "configure"
+#line 21180 "configure"
 #include "confdefs.h"
 
 int
@@ -21185,13 +21187,13 @@ main (void)
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x; (void)x;
+  const charset x;
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *ccp;
   char **p;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
-  static struct point const zero = {0,0}; (void)zero;
+  static struct point const zero = {0,0};
   /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
@@ -21207,7 +21209,7 @@ main (void)
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
-	(void)s;
+	(void)s; (void)x; (void)zero;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
@@ -21237,16 +21239,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21243: \$? = $ac_status" >&5
+  echo "$as_me:21245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21249: \$? = $ac_status" >&5
+  echo "$as_me:21251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -21256,7 +21258,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:21259: result: $ac_cv_c_const" >&5
+echo "$as_me:21261: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -21266,7 +21268,7 @@ EOF
 
 fi
 
-echo "$as_me:21269: checking for inline" >&5
+echo "$as_me:21271: 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
@@ -21274,7 +21276,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21277 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -21283,16 +21285,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21288: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21289: \$? = $ac_status" >&5
+  echo "$as_me:21291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21295: \$? = $ac_status" >&5
+  echo "$as_me:21297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -21303,7 +21305,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21306: result: $ac_cv_c_inline" >&5
+echo "$as_me:21308: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21329,7 +21331,7 @@ if test "$ac_cv_c_inline" != no ; then
 		:
 	elif test "$GCC" = yes
 	then
-		echo "$as_me:21332: checking if $CC supports options to tune inlining" >&5
+		echo "$as_me:21334: 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
@@ -21338,7 +21340,7 @@ else
 		cf_save_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21341 "configure"
+#line 21343 "configure"
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
@@ -21350,16 +21352,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21356: \$? = $ac_status" >&5
+  echo "$as_me:21358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:21364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
@@ -21371,7 +21373,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS=$cf_save_CFLAGS
 
 fi
-echo "$as_me:21374: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:21376: result: $cf_cv_gcc_inline" >&5
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
 		if test "$cf_cv_gcc_inline" = yes ; then
 
@@ -21477,7 +21479,7 @@ fi
 	fi
 fi
 
-echo "$as_me:21480: checking for signal global datatype" >&5
+echo "$as_me:21482: 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
@@ -21489,7 +21491,7 @@ else
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21492 "configure"
+#line 21494 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21513,16 +21515,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21519: \$? = $ac_status" >&5
+  echo "$as_me:21521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21525: \$? = $ac_status" >&5
+  echo "$as_me:21527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -21536,7 +21538,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21539: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21541: 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 <<EOF
@@ -21545,7 +21547,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
-echo "$as_me:21548: checking for type of chtype" >&5
+echo "$as_me:21550: 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
@@ -21555,7 +21557,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21558 "configure"
+#line 21560 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21590,15 +21592,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21596: \$? = $ac_status" >&5
+  echo "$as_me:21598: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21601: \$? = $ac_status" >&5
+  echo "$as_me:21603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
@@ -21613,7 +21615,7 @@ fi
 
 fi
 
-echo "$as_me:21616: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21618: result: $cf_cv_typeof_chtype" >&5
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
@@ -21625,14 +21627,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
-echo "$as_me:21628: checking if unsigned literals are legal" >&5
+echo "$as_me:21630: 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 21635 "configure"
+#line 21637 "configure"
 #include "confdefs.h"
 
 int
@@ -21644,16 +21646,16 @@ long x = 1L + 1UL + 1U + 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21650: \$? = $ac_status" >&5
+  echo "$as_me:21652: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21656: \$? = $ac_status" >&5
+  echo "$as_me:21658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
@@ -21665,7 +21667,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:21668: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21670: result: $cf_cv_unsigned_literals" >&5
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
@@ -21681,14 +21683,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###	Checks for external-data
 
-echo "$as_me:21684: checking if external errno is declared" >&5
+echo "$as_me:21686: 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 21691 "configure"
+#line 21693 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21702,16 +21704,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21708: \$? = $ac_status" >&5
+  echo "$as_me:21710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21714: \$? = $ac_status" >&5
+  echo "$as_me:21716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -21722,7 +21724,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21725: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21727: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -21737,14 +21739,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:21740: checking if external errno exists" >&5
+echo "$as_me:21742: 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 21747 "configure"
+#line 21749 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -21759,16 +21761,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21765: \$? = $ac_status" >&5
+  echo "$as_me:21767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21771: \$? = $ac_status" >&5
+  echo "$as_me:21773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -21779,7 +21781,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21782: result: $cf_cv_have_errno" >&5
+echo "$as_me:21784: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -21792,7 +21794,7 @@ EOF
 
 fi
 
-echo "$as_me:21795: checking if data-only library module links" >&5
+echo "$as_me:21797: 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
@@ -21800,20 +21802,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 21803 "configure"
+#line 21805 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:21806: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21809: \$? = $ac_status" >&5
+  echo "$as_me:21811: \$? = $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 <<EOF
-#line 21816 "configure"
+#line 21818 "configure"
 extern int testfunc(void);
 #if defined(NeXT)
 int	testfunc(void)
@@ -21830,10 +21832,10 @@ int	testfunc(void)
 }
 #endif
 EOF
-	if { (eval echo "$as_me:21833: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:21835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21836: \$? = $ac_status" >&5
+  echo "$as_me:21838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -21846,7 +21848,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21849 "configure"
+#line 21851 "configure"
 #include "confdefs.h"
 
 	extern int testfunc(void);
@@ -21857,15 +21859,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21863: \$? = $ac_status" >&5
+  echo "$as_me:21865: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21868: \$? = $ac_status" >&5
+  echo "$as_me:21870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -21880,7 +21882,7 @@ fi
 
 fi
 
-echo "$as_me:21883: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21885: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -21895,13 +21897,13 @@ fi
 ###	Checks for library functions.
 
 cf_save_libs="$LIBS"
-echo "$as_me:21898: checking for clock_gettime" >&5
+echo "$as_me:21900: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21904 "configure"
+#line 21906 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21932,16 +21934,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21938: \$? = $ac_status" >&5
+  echo "$as_me:21940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21944: \$? = $ac_status" >&5
+  echo "$as_me:21946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -21951,12 +21953,12 @@ ac_cv_func_clock_gettime=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21954: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:21956: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:21959: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:21961: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21964,7 +21966,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21967 "configure"
+#line 21969 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21983,16 +21985,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21989: \$? = $ac_status" >&5
+  echo "$as_me:21991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21995: \$? = $ac_status" >&5
+  echo "$as_me:21997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -22003,7 +22005,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22006: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:22008: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -22015,14 +22017,14 @@ fi
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:22018: checking if clock_gettime links" >&5
+echo "$as_me:22020: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22025 "configure"
+#line 22027 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22040,16 +22042,16 @@ struct timespec ts;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22046: \$? = $ac_status" >&5
+  echo "$as_me:22048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22052: \$? = $ac_status" >&5
+  echo "$as_me:22054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -22060,7 +22062,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22063: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:22065: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -22074,13 +22076,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-echo "$as_me:22077: checking for gettimeofday" >&5
+echo "$as_me:22079: 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 22083 "configure"
+#line 22085 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22111,16 +22113,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22117: \$? = $ac_status" >&5
+  echo "$as_me:22119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22123: \$? = $ac_status" >&5
+  echo "$as_me:22125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -22130,7 +22132,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22133: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:22135: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -22140,7 +22142,7 @@ EOF
 
 else
 
-echo "$as_me:22143: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:22145: 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
@@ -22148,7 +22150,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22151 "configure"
+#line 22153 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22167,16 +22169,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22173: \$? = $ac_status" >&5
+  echo "$as_me:22175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22179: \$? = $ac_status" >&5
+  echo "$as_me:22181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -22187,7 +22189,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22190: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:22192: 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
 
@@ -22246,13 +22248,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22249: checking for $ac_func" >&5
+echo "$as_me:22251: 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 22255 "configure"
+#line 22257 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22283,16 +22285,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22289: \$? = $ac_status" >&5
+  echo "$as_me:22291: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22295: \$? = $ac_status" >&5
+  echo "$as_me:22297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22302,7 +22304,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22305: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22307: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22312,14 +22314,14 @@ EOF
 fi
 done
 
-echo "$as_me:22315: checking if _PATH_TTYS is defined in ttyent.h" >&5
+echo "$as_me:22317: checking if _PATH_TTYS is defined in ttyent.h" >&5
 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
 if test "${cf_cv_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22322 "configure"
+#line 22324 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22334,16 +22336,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22340: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22346: \$? = $ac_status" >&5
+  echo "$as_me:22348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_PATH_TTYS=yes
 else
@@ -22353,7 +22355,7 @@ cf_cv_PATH_TTYS=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:22356: result: $cf_cv_PATH_TTYS" >&5
+echo "$as_me:22358: result: $cf_cv_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
 
 if test $cf_cv_PATH_TTYS = no
@@ -22375,7 +22377,7 @@ fi
 
 if test $cf_cv_PATH_TTYS != no
 then
-	echo "$as_me:22378: checking if _PATH_TTYS file exists" >&5
+	echo "$as_me:22380: checking if _PATH_TTYS file exists" >&5
 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
 if test "${cf_cv_have_PATH_TTYS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22385,7 +22387,7 @@ else
   cf_cv_have_PATH_TTYS=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22388 "configure"
+#line 22390 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22398,15 +22400,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22404: \$? = $ac_status" >&5
+  echo "$as_me:22406: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22409: \$? = $ac_status" >&5
+  echo "$as_me:22411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_PATH_TTYS=yes
 else
@@ -22418,7 +22420,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22421: result: $cf_cv_have_PATH_TTYS" >&5
+echo "$as_me:22423: result: $cf_cv_have_PATH_TTYS" >&5
 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
 fi
@@ -22430,14 +22432,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_PATH_TTYS 1
 EOF
 
-	echo "$as_me:22433: checking for getttynam" >&5
+	echo "$as_me:22435: checking for getttynam" >&5
 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
 if test "${cf_cv_func_getttynam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22440 "configure"
+#line 22442 "configure"
 #include "confdefs.h"
 #include <ttyent.h>
 int
@@ -22449,16 +22451,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22455: \$? = $ac_status" >&5
+  echo "$as_me:22457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22461: \$? = $ac_status" >&5
+  echo "$as_me:22463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_getttynam=yes
 else
@@ -22468,7 +22470,7 @@ cf_cv_func_getttynam=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22471: result: $cf_cv_func_getttynam" >&5
+echo "$as_me:22473: result: $cf_cv_func_getttynam" >&5
 echo "${ECHO_T}$cf_cv_func_getttynam" >&6
 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_GETTTYNAM 1
@@ -22478,7 +22480,7 @@ fi
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
-	{ { echo "$as_me:22481: error: getopt is required for building programs" >&5
+	{ { echo "$as_me:22483: error: getopt is required for building programs" >&5
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22487,7 +22489,7 @@ if test "x$with_safe_sprintf" = xyes
 then
 	if test "x$ac_cv_func_vsnprintf" = xyes
 	then
-		{ echo "$as_me:22490: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+		{ echo "$as_me:22492: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
 	else
 
@@ -22500,14 +22502,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
-echo "$as_me:22503: checking for terminal-capability database functions" >&5
+echo "$as_me:22505: 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 22510 "configure"
+#line 22512 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22527,16 +22529,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22532: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22533: \$? = $ac_status" >&5
+  echo "$as_me:22535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22539: \$? = $ac_status" >&5
+  echo "$as_me:22541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
@@ -22547,7 +22549,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22550: result: $cf_cv_cgetent" >&5
+echo "$as_me:22552: result: $cf_cv_cgetent" >&5
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
@@ -22557,14 +22559,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
-echo "$as_me:22560: checking if cgetent uses const parameter" >&5
+echo "$as_me:22562: 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 22567 "configure"
+#line 22569 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
@@ -22587,16 +22589,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22593: \$? = $ac_status" >&5
+  echo "$as_me:22595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22599: \$? = $ac_status" >&5
+  echo "$as_me:22601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
@@ -22607,7 +22609,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22610: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:22612: result: $cf_cv_cgetent_const" >&5
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 	if test "$cf_cv_cgetent_const" = yes
 	then
@@ -22621,14 +22623,14 @@ fi
 
 fi
 
-echo "$as_me:22624: checking for isascii" >&5
+echo "$as_me:22626: 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 22631 "configure"
+#line 22633 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int
@@ -22640,16 +22642,16 @@ int x = isascii(' '); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22646: \$? = $ac_status" >&5
+  echo "$as_me:22648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22652: \$? = $ac_status" >&5
+  echo "$as_me:22654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
@@ -22660,7 +22662,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22663: result: $cf_cv_have_isascii" >&5
+echo "$as_me:22665: result: $cf_cv_have_isascii" >&5
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
@@ -22668,10 +22670,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:22671: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:22673: 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 22674 "configure"
+#line 22676 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22685,16 +22687,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22691: \$? = $ac_status" >&5
+  echo "$as_me:22693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22697: \$? = $ac_status" >&5
+  echo "$as_me:22699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
@@ -22702,7 +22704,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22705 "configure"
+#line 22707 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22717,16 +22719,16 @@ struct sigaction act; (void)act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22723: \$? = $ac_status" >&5
+  echo "$as_me:22725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:22731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
@@ -22742,11 +22744,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:22745: result: $sigact_bad" >&5
+echo "$as_me:22747: result: $sigact_bad" >&5
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
-echo "$as_me:22749: checking if nanosleep really works" >&5
+echo "$as_me:22751: 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
@@ -22756,7 +22758,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22759 "configure"
+#line 22761 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22782,15 +22784,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22788: \$? = $ac_status" >&5
+  echo "$as_me:22790: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22793: \$? = $ac_status" >&5
+  echo "$as_me:22795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
@@ -22802,7 +22804,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:22805: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:22807: result: $cf_cv_func_nanosleep" >&5
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
@@ -22819,23 +22821,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22822: checking for $ac_header" >&5
+echo "$as_me:22824: 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 22828 "configure"
+#line 22830 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22832: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22838: \$? = $ac_status" >&5
+  echo "$as_me:22840: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22854,7 +22856,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22859: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -22871,10 +22873,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:22874: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:22876: 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 22877 "configure"
+#line 22879 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -22886,16 +22888,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22892: \$? = $ac_status" >&5
+  echo "$as_me:22894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22898: \$? = $ac_status" >&5
+  echo "$as_me:22900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -22903,7 +22905,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22906 "configure"
+#line 22908 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -22917,16 +22919,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22923: \$? = $ac_status" >&5
+  echo "$as_me:22925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22929: \$? = $ac_status" >&5
+  echo "$as_me:22931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -22942,19 +22944,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:22945: result: $termios_bad" >&5
+	echo "$as_me:22947: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:22950: checking for tcgetattr" >&5
+echo "$as_me:22952: 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 22957 "configure"
+#line 22959 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22982,16 +22984,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22988: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22994: \$? = $ac_status" >&5
+  echo "$as_me:22996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
@@ -23001,21 +23003,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23004: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:23006: 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:23011: checking for vsscanf function or workaround" >&5
+echo "$as_me:23013: 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 23018 "configure"
+#line 23020 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23041,16 +23043,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23047: \$? = $ac_status" >&5
+  echo "$as_me:23049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23053: \$? = $ac_status" >&5
+  echo "$as_me:23055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
@@ -23058,7 +23060,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23061 "configure"
+#line 23063 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23080,16 +23082,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23086: \$? = $ac_status" >&5
+  echo "$as_me:23088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23092: \$? = $ac_status" >&5
+  echo "$as_me:23094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
@@ -23097,7 +23099,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23100 "configure"
+#line 23102 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -23119,16 +23121,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23125: \$? = $ac_status" >&5
+  echo "$as_me:23127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23131: \$? = $ac_status" >&5
+  echo "$as_me:23133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
@@ -23143,7 +23145,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23146: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:23148: result: $cf_cv_func_vsscanf" >&5
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
@@ -23169,23 +23171,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23172: checking for $ac_header" >&5
+echo "$as_me:23174: 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 23178 "configure"
+#line 23180 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23184: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23188: \$? = $ac_status" >&5
+  echo "$as_me:23190: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23204,7 +23206,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23209: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23214,7 +23216,7 @@ EOF
 fi
 done
 
-echo "$as_me:23217: checking for working mkstemp" >&5
+echo "$as_me:23219: 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
@@ -23225,7 +23227,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23228 "configure"
+#line 23230 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23260,15 +23262,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23266: \$? = $ac_status" >&5
+  echo "$as_me:23268: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23271: \$? = $ac_status" >&5
+  echo "$as_me:23273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -23283,16 +23285,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23286: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:23288: 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:23289: checking for mkstemp" >&5
+	echo "$as_me:23291: 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 23295 "configure"
+#line 23297 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23323,16 +23325,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23329: \$? = $ac_status" >&5
+  echo "$as_me:23331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23335: \$? = $ac_status" >&5
+  echo "$as_me:23337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -23342,7 +23344,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23345: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:23347: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -23363,21 +23365,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
-	{ echo "$as_me:23366: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+	{ echo "$as_me:23368: 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:23369: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:23371: 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:23375: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23377: 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 23380 "configure"
+#line 23382 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -23394,15 +23396,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23400: \$? = $ac_status" >&5
+  echo "$as_me:23402: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23405: \$? = $ac_status" >&5
+  echo "$as_me:23407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -23415,7 +23417,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
-echo "$as_me:23418: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:23420: 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
 
@@ -23426,13 +23428,13 @@ EOF
 fi
 
 fi
-echo "$as_me:23429: checking for intptr_t" >&5
+echo "$as_me:23431: 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 23435 "configure"
+#line 23437 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23447,16 +23449,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23453: \$? = $ac_status" >&5
+  echo "$as_me:23455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23459: \$? = $ac_status" >&5
+  echo "$as_me:23461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -23466,7 +23468,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23469: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:23471: 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
   :
@@ -23478,13 +23480,13 @@ EOF
 
 fi
 
-echo "$as_me:23481: checking for ssize_t" >&5
+echo "$as_me:23483: 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 23487 "configure"
+#line 23489 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23499,16 +23501,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23505: \$? = $ac_status" >&5
+  echo "$as_me:23507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23511: \$? = $ac_status" >&5
+  echo "$as_me:23513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -23518,7 +23520,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:23521: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:23523: 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
   :
@@ -23530,14 +23532,14 @@ EOF
 
 fi
 
-echo "$as_me:23533: checking for type sigaction_t" >&5
+echo "$as_me:23535: 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 23540 "configure"
+#line 23542 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -23550,16 +23552,16 @@ sigaction_t x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23556: \$? = $ac_status" >&5
+  echo "$as_me:23558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23562: \$? = $ac_status" >&5
+  echo "$as_me:23564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
@@ -23570,14 +23572,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:23573: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:23575: 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:23580: checking declaration of size-change" >&5
+echo "$as_me:23582: 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
@@ -23598,7 +23600,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23601 "configure"
+#line 23603 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23648,16 +23650,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23654: \$? = $ac_status" >&5
+  echo "$as_me:23656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23660: \$? = $ac_status" >&5
+  echo "$as_me:23662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23676,7 +23678,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23679: result: $cf_cv_sizechange" >&5
+echo "$as_me:23681: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -23694,13 +23696,13 @@ EOF
 	esac
 fi
 
-echo "$as_me:23697: checking for memmove" >&5
+echo "$as_me:23699: 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 23703 "configure"
+#line 23705 "configure"
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23731,16 +23733,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23737: \$? = $ac_status" >&5
+  echo "$as_me:23739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23743: \$? = $ac_status" >&5
+  echo "$as_me:23745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -23750,19 +23752,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23753: result: $ac_cv_func_memmove" >&5
+echo "$as_me:23755: 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:23759: checking for bcopy" >&5
+echo "$as_me:23761: 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 23765 "configure"
+#line 23767 "configure"
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23793,16 +23795,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23799: \$? = $ac_status" >&5
+  echo "$as_me:23801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23805: \$? = $ac_status" >&5
+  echo "$as_me:23807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -23812,11 +23814,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23815: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:23817: 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:23819: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:23821: 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
@@ -23826,7 +23828,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23829 "configure"
+#line 23831 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23842,15 +23844,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23848: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23853: \$? = $ac_status" >&5
+  echo "$as_me:23855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -23863,7 +23865,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:23866: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:23868: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -23890,13 +23892,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23893: checking for $ac_func" >&5
+echo "$as_me:23895: 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 23899 "configure"
+#line 23901 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23927,16 +23929,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23933: \$? = $ac_status" >&5
+  echo "$as_me:23935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23939: \$? = $ac_status" >&5
+  echo "$as_me:23941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23946,7 +23948,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23949: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23951: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23956,7 +23958,7 @@ EOF
 fi
 done
  }
-echo "$as_me:23959: checking if poll really works" >&5
+echo "$as_me:23961: 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
@@ -23966,7 +23968,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23969 "configure"
+#line 23971 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24019,15 +24021,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24022: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24025: \$? = $ac_status" >&5
+  echo "$as_me:24027: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24030: \$? = $ac_status" >&5
+  echo "$as_me:24032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
@@ -24039,21 +24041,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24042: result: $cf_cv_working_poll" >&5
+echo "$as_me:24044: 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:24049: checking if MB_LEN_MAX is usable" >&5
+echo "$as_me:24051: checking if MB_LEN_MAX is usable" >&5
 echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
 if test "${cf_cv_mb_len_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24056 "configure"
+#line 24058 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24073,16 +24075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24079: \$? = $ac_status" >&5
+  echo "$as_me:24081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24085: \$? = $ac_status" >&5
+  echo "$as_me:24087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mb_len_max=yes
 else
@@ -24092,7 +24094,7 @@ cf_cv_mb_len_max=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24095: result: $cf_cv_mb_len_max" >&5
+echo "$as_me:24097: result: $cf_cv_mb_len_max" >&5
 echo "${ECHO_T}$cf_cv_mb_len_max" >&6
 if test "$cf_cv_mb_len_max" = yes
 then
@@ -24102,18 +24104,18 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ echo "$as_me:24105: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+	{ echo "$as_me:24107: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
 echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
 fi
 
-echo "$as_me:24109: checking for va_copy" >&5
+echo "$as_me:24111: 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 24116 "configure"
+#line 24118 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24130,16 +24132,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24136: \$? = $ac_status" >&5
+  echo "$as_me:24138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24142: \$? = $ac_status" >&5
+  echo "$as_me:24144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
@@ -24149,7 +24151,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24152: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:24154: result: $cf_cv_have_va_copy" >&5
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
@@ -24161,14 +24163,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
-echo "$as_me:24164: checking for __va_copy" >&5
+echo "$as_me:24166: 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 24171 "configure"
+#line 24173 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24185,16 +24187,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24191: \$? = $ac_status" >&5
+  echo "$as_me:24193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24197: \$? = $ac_status" >&5
+  echo "$as_me:24199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
@@ -24204,7 +24206,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24207: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:24209: result: $cf_cv_have___va_copy" >&5
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
@@ -24216,14 +24218,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
-echo "$as_me:24219: checking for __builtin_va_copy" >&5
+echo "$as_me:24221: 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 24226 "configure"
+#line 24228 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24240,16 +24242,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24246: \$? = $ac_status" >&5
+  echo "$as_me:24248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24252: \$? = $ac_status" >&5
+  echo "$as_me:24254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
@@ -24259,7 +24261,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24262: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:24264: 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 &&
@@ -24277,14 +24279,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
 	;;
 
 (*)
-	echo "$as_me:24280: checking if we can simply copy va_list" >&5
+	echo "$as_me:24282: 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 24287 "configure"
+#line 24289 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24301,16 +24303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24307: \$? = $ac_status" >&5
+  echo "$as_me:24309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24313: \$? = $ac_status" >&5
+  echo "$as_me:24315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
@@ -24320,19 +24322,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24323: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:24325: 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:24328: checking if we can copy va_list indirectly" >&5
+		echo "$as_me:24330: 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 24335 "configure"
+#line 24337 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -24349,16 +24351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24355: \$? = $ac_status" >&5
+  echo "$as_me:24357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24361: \$? = $ac_status" >&5
+  echo "$as_me:24363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
@@ -24368,7 +24370,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24371: result: $cf_cv_array_va_list" >&5
+echo "$as_me:24373: 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
@@ -24379,13 +24381,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:24382: checking for pid_t" >&5
+echo "$as_me:24384: 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 24388 "configure"
+#line 24390 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -24400,16 +24402,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24406: \$? = $ac_status" >&5
+  echo "$as_me:24408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24412: \$? = $ac_status" >&5
+  echo "$as_me:24414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -24419,7 +24421,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24422: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:24424: 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
   :
@@ -24434,23 +24436,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24437: checking for $ac_header" >&5
+echo "$as_me:24439: 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 24443 "configure"
+#line 24445 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24447: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24449: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:24453: \$? = $ac_status" >&5
+  echo "$as_me:24455: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24469,7 +24471,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24472: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24482,13 +24484,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24485: checking for $ac_func" >&5
+echo "$as_me:24487: 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 24491 "configure"
+#line 24493 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24519,16 +24521,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24525: \$? = $ac_status" >&5
+  echo "$as_me:24527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24531: \$? = $ac_status" >&5
+  echo "$as_me:24533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24538,7 +24540,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24541: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24543: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -24550,7 +24552,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24553: checking for working fork" >&5
+  echo "$as_me:24555: 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
@@ -24573,15 +24575,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24578: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24579: \$? = $ac_status" >&5
+  echo "$as_me:24581: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24584: \$? = $ac_status" >&5
+  echo "$as_me:24586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24593,7 +24595,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24596: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24598: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24607,12 +24609,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24610: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24612: 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:24615: checking for working vfork" >&5
+  echo "$as_me:24617: 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
@@ -24621,7 +24623,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24624 "configure"
+#line 24626 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24714,15 +24716,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24720: \$? = $ac_status" >&5
+  echo "$as_me:24722: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24725: \$? = $ac_status" >&5
+  echo "$as_me:24727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24734,13 +24736,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:24737: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24739: 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:24743: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24745: 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
 
@@ -24765,7 +24767,7 @@ EOF
 
 fi
 
-echo "$as_me:24768: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:24770: 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
@@ -24775,7 +24777,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24778 "configure"
+#line 24780 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24810,15 +24812,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24816: \$? = $ac_status" >&5
+  echo "$as_me:24818: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24821: \$? = $ac_status" >&5
+  echo "$as_me:24823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
@@ -24831,20 +24833,20 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:24834: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:24836: 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
 EOF
 
-	echo "$as_me:24841: checking for cc_t" >&5
+	echo "$as_me:24843: checking for cc_t" >&5
 echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
 if test "${ac_cv_type_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24847 "configure"
+#line 24849 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24862,16 +24864,16 @@ if (sizeof (cc_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24868: \$? = $ac_status" >&5
+  echo "$as_me:24870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24874: \$? = $ac_status" >&5
+  echo "$as_me:24876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_cc_t=yes
 else
@@ -24881,7 +24883,7 @@ ac_cv_type_cc_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24884: result: $ac_cv_type_cc_t" >&5
+echo "$as_me:24886: result: $ac_cv_type_cc_t" >&5
 echo "${ECHO_T}$ac_cv_type_cc_t" >&6
 if test "$ac_cv_type_cc_t" = yes; then
 
@@ -24891,13 +24893,13 @@ EOF
 
 fi
 
-	echo "$as_me:24894: checking for speed_t" >&5
+	echo "$as_me:24896: checking for speed_t" >&5
 echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
 if test "${ac_cv_type_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24900 "configure"
+#line 24902 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24915,16 +24917,16 @@ if (sizeof (speed_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24921: \$? = $ac_status" >&5
+  echo "$as_me:24923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24927: \$? = $ac_status" >&5
+  echo "$as_me:24929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_speed_t=yes
 else
@@ -24934,7 +24936,7 @@ ac_cv_type_speed_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24937: result: $ac_cv_type_speed_t" >&5
+echo "$as_me:24939: result: $ac_cv_type_speed_t" >&5
 echo "${ECHO_T}$ac_cv_type_speed_t" >&6
 if test "$ac_cv_type_speed_t" = yes; then
 
@@ -24944,13 +24946,13 @@ EOF
 
 fi
 
-	echo "$as_me:24947: checking for tcflag_t" >&5
+	echo "$as_me:24949: checking for tcflag_t" >&5
 echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
 if test "${ac_cv_type_tcflag_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24953 "configure"
+#line 24955 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24968,16 +24970,16 @@ if (sizeof (tcflag_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24974: \$? = $ac_status" >&5
+  echo "$as_me:24976: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24980: \$? = $ac_status" >&5
+  echo "$as_me:24982: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_tcflag_t=yes
 else
@@ -24987,7 +24989,7 @@ ac_cv_type_tcflag_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:24990: result: $ac_cv_type_tcflag_t" >&5
+echo "$as_me:24992: result: $ac_cv_type_tcflag_t" >&5
 echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
 if test "$ac_cv_type_tcflag_t" = yes; then
 
@@ -24997,13 +24999,13 @@ EOF
 
 fi
 
-	echo "$as_me:25000: checking for sigset_t" >&5
+	echo "$as_me:25002: checking for sigset_t" >&5
 echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
 if test "${ac_cv_type_sigset_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25006 "configure"
+#line 25008 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25021,16 +25023,16 @@ if (sizeof (sigset_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25027: \$? = $ac_status" >&5
+  echo "$as_me:25029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25033: \$? = $ac_status" >&5
+  echo "$as_me:25035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_sigset_t=yes
 else
@@ -25040,7 +25042,7 @@ ac_cv_type_sigset_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:25043: result: $ac_cv_type_sigset_t" >&5
+echo "$as_me:25045: result: $ac_cv_type_sigset_t" >&5
 echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
 if test "$ac_cv_type_sigset_t" = yes; then
 
@@ -25052,7 +25054,7 @@ fi
 
 # special check for test/ditto.c
 
-echo "$as_me:25055: checking for openpty in -lutil" >&5
+echo "$as_me:25057: 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
@@ -25060,7 +25062,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25063 "configure"
+#line 25065 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25079,16 +25081,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25085: \$? = $ac_status" >&5
+  echo "$as_me:25087: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25091: \$? = $ac_status" >&5
+  echo "$as_me:25093: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -25099,7 +25101,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25102: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:25104: 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
@@ -25107,7 +25109,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:25110: checking for openpty header" >&5
+echo "$as_me:25112: 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
@@ -25134,7 +25136,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25137 "configure"
+#line 25139 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -25152,16 +25154,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25155: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25158: \$? = $ac_status" >&5
+  echo "$as_me:25160: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25164: \$? = $ac_status" >&5
+  echo "$as_me:25166: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -25179,7 +25181,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:25182: result: $cf_cv_func_openpty" >&5
+echo "$as_me:25184: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -25252,7 +25254,7 @@ if test -n "$with_hashed_db/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25255 "configure"
+#line 25257 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25264,16 +25266,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25270: \$? = $ac_status" >&5
+  echo "$as_me:25272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25276: \$? = $ac_status" >&5
+  echo "$as_me:25278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25290,7 +25292,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25293: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25295: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25326,7 +25328,7 @@ if test -n "$with_hashed_db/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25329: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25331: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25337,7 +25339,7 @@ fi
 	else
 		case "$with_hashed_db" in
 		(./*|../*|/*)
-			{ echo "$as_me:25340: WARNING: no such directory $with_hashed_db" >&5
+			{ echo "$as_me:25342: WARNING: no such directory $with_hashed_db" >&5
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
 			;;
 		(*)
@@ -25409,7 +25411,7 @@ if test -n "$cf_item" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 25412 "configure"
+#line 25414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25421,16 +25423,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25427: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25433: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25447,7 +25449,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25450: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25452: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25527,7 +25529,7 @@ if test -n "$cf_item" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:25530: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:25532: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -25544,23 +25546,23 @@ fi
 	fi
 esac
 
-echo "$as_me:25547: checking for db.h" >&5
+echo "$as_me:25549: 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 25553 "configure"
+#line 25555 "configure"
 #include "confdefs.h"
 #include <db.h>
 _ACEOF
-if { (eval echo "$as_me:25557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25559: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:25563: \$? = $ac_status" >&5
+  echo "$as_me:25565: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25579,11 +25581,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25582: result: $ac_cv_header_db_h" >&5
+echo "$as_me:25584: 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:25586: checking for version of db" >&5
+echo "$as_me:25588: 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
@@ -25594,10 +25596,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
-echo "${as_me:-configure}:25597: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:25599: testing checking for db version $cf_db_version ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25600 "configure"
+#line 25602 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25627,16 +25629,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25633: \$? = $ac_status" >&5
+  echo "$as_me:25635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25639: \$? = $ac_status" >&5
+  echo "$as_me:25641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_hashed_db_version=$cf_db_version
@@ -25650,16 +25652,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25653: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:25655: 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:25657: error: Cannot determine version of db" >&5
+	{ { echo "$as_me:25659: 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:25662: checking for db libraries" >&5
+echo "$as_me:25664: 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
@@ -25689,10 +25691,10 @@ LIBS="$cf_add_libs"
 
 	fi
 
-echo "${as_me:-configure}:25692: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:25694: testing checking for library $cf_db_libs ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25695 "configure"
+#line 25697 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25747,16 +25749,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25753: \$? = $ac_status" >&5
+  echo "$as_me:25755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25759: \$? = $ac_status" >&5
+  echo "$as_me:25761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test -n "$cf_db_libs" ; then
@@ -25776,11 +25778,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25779: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:25781: 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:25783: error: Cannot determine library for db" >&5
+		{ { echo "$as_me:25785: 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
@@ -25806,7 +25808,7 @@ fi
 
 else
 
-	{ { echo "$as_me:25809: error: Cannot find db.h" >&5
+	{ { echo "$as_me:25811: error: Cannot find db.h" >&5
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -25821,20 +25823,18 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
-echo "$as_me:25824: checking if we should include stdbool.h" >&5
-echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
-
+echo "$as_me:25826: checking if we can include stdbool.h" >&5
+echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6
 if test "${cf_cv_header_stdbool_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25832 "configure"
+#line 25833 "configure"
 #include "confdefs.h"
 
-#ifndef __BEOS__
+$ac_includes_default
 #include <stdbool.h>
-#endif
 
 int
 main (void)
@@ -25856,7 +25856,7 @@ if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:25857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=1
+  cf_cv_header_stdbool_h=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
@@ -25884,7 +25884,7 @@ if { (eval echo "$as_me:25876: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:25885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=0
+  cf_cv_header_stdbool_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
@@ -25893,27 +25893,25 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
+echo "$as_me:25896: result: $cf_cv_header_stdbool_h" >&5
+echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6
 
-if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:25898: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25900: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "$cf_cv_header_stdbool_h" = yes
+then	USE_STDBOOL_H=1
+else	USE_STDBOOL_H=0
 fi
 
 echo "$as_me:25904: 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
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25912 "configure"
+#line 25911 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
@@ -25924,33 +25922,39 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25930: \$? = $ac_status" >&5
+  echo "$as_me:25928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25936: \$? = $ac_status" >&5
+  echo "$as_me:25934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_cc_bool_type=1
+  cf_cv_cc_bool_type=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-cf_cv_cc_bool_type=0
+cf_cv_cc_bool_type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
+echo "$as_me:25944: result: $cf_cv_cc_bool_type" >&5
+echo "${ECHO_T}$cf_cv_cc_bool_type" >&6
 
-if test "$cf_cv_cc_bool_type" = 1
-then	echo "$as_me:25948: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else	echo "$as_me:25950: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "$cf_cv_cc_bool_type" = yes; then
+	USE_BUILTIN_BOOL=1
+else
+	USE_BUILTIN_BOOL=0
 fi
 
+test "$cf_cv_header_stdbool_h" = yes &&
+cat >>confdefs.h <<\EOF
+#define USE_STDBOOL_H 1
+EOF
+
 # Check for C++ compiler characteristics (and ensure that it's there!)
 if test -n "$CXX" ; then
 	ac_ext=cc
@@ -25964,10 +25968,10 @@ if test -n "$GXX" ; then
 
 	cf_save="$LIBS"
 	LIBS="$LIBS $CXXLIBS"
-	echo "$as_me:25967: checking if we already have C++ library" >&5
+	echo "$as_me:25971: 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 25970 "configure"
+#line 25974 "configure"
 #include "confdefs.h"
 
 			#include <iostream>
@@ -25981,16 +25985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:25991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25993: \$? = $ac_status" >&5
+  echo "$as_me:25997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
@@ -25999,7 +26003,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
+	echo "$as_me:26006: result: $cf_have_libstdcpp" >&5
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
 	LIBS="$cf_save"
 
@@ -26018,7 +26022,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
 			;;
 		esac
 
-		echo "$as_me:26021: checking for library $cf_stdcpp_libname" >&5
+		echo "$as_me:26025: 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
@@ -26044,7 +26048,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26047 "configure"
+#line 26051 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26058,16 +26062,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26064: \$? = $ac_status" >&5
+  echo "$as_me:26068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26070: \$? = $ac_status" >&5
+  echo "$as_me:26074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
@@ -26079,7 +26083,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 			LIBS="$cf_save"
 
 fi
-echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:26086: result: $cf_cv_libstdcpp" >&5
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 		test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
@@ -26101,7 +26105,7 @@ CXXLIBS="$cf_add_libs"
 	fi
 fi
 
-	echo "$as_me:26104: checking whether $CXX understands -c and -o together" >&5
+	echo "$as_me:26108: 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
@@ -26116,15 +26120,15 @@ CF_EOF
 # 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:26119: \"$ac_try\"") >&5
+if { (eval echo "$as_me:26123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26122: \$? = $ac_status" >&5
+  echo "$as_me:26126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:26128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26127: \$? = $ac_status" >&5
+  echo "$as_me:26131: \$? = $ac_status" >&5
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
@@ -26135,10 +26139,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
-  echo "$as_me:26138: result: yes" >&5
+  echo "$as_me:26142: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:26141: result: no" >&5
+  echo "$as_me:26145: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26158,7 +26162,7 @@ case "$cf_cv_system_name" in
 	;;
 esac
 if test "$GXX" = yes; then
-	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
+	echo "$as_me:26165: checking for lib$cf_gpp_libname" >&5
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
 	cf_save="$LIBS"
 
@@ -26179,7 +26183,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26182 "configure"
+#line 26186 "configure"
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
@@ -26193,16 +26197,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26199: \$? = $ac_status" >&5
+  echo "$as_me:26203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26205: \$? = $ac_status" >&5
+  echo "$as_me:26209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26239,7 +26243,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26242 "configure"
+#line 26246 "configure"
 #include "confdefs.h"
 
 #include <builtin.h>
@@ -26253,16 +26257,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26259: \$? = $ac_status" >&5
+  echo "$as_me:26263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26265: \$? = $ac_status" >&5
+  echo "$as_me:26269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
@@ -26295,7 +26299,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save"
-	echo "$as_me:26298: result: $cf_cxx_library" >&5
+	echo "$as_me:26302: result: $cf_cxx_library" >&5
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
@@ -26311,7 +26315,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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:26314: checking how to run the C++ preprocessor" >&5
+echo "$as_me:26318: 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
@@ -26328,18 +26332,18 @@ do
   # 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 26331 "configure"
+#line 26335 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26340: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26342: \$? = $ac_status" >&5
+  echo "$as_me:26346: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26362,17 +26366,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26365 "configure"
+#line 26369 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26375: \$? = $ac_status" >&5
+  echo "$as_me:26379: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26409,7 +26413,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:26412: result: $CXXCPP" >&5
+echo "$as_me:26416: result: $CXXCPP" >&5
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -26419,18 +26423,18 @@ do
   # 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 26422 "configure"
+#line 26426 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26433: \$? = $ac_status" >&5
+  echo "$as_me:26437: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26453,17 +26457,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26456 "configure"
+#line 26460 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26464: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26466: \$? = $ac_status" >&5
+  echo "$as_me:26470: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26491,7 +26495,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:26498: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26506,23 +26510,23 @@ ac_main_return="return"
 for ac_header in new exception typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26509: checking for $ac_header" >&5
+echo "$as_me:26513: 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 26515 "configure"
+#line 26519 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26525: \$? = $ac_status" >&5
+  echo "$as_me:26529: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26541,7 +26545,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26554,23 +26558,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26557: checking for $ac_header" >&5
+echo "$as_me:26561: 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 26563 "configure"
+#line 26567 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26573: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -26589,7 +26593,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -26600,10 +26604,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
-	echo "$as_me:26603: checking if iostream uses std-namespace" >&5
+	echo "$as_me:26607: 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 26606 "configure"
+#line 26610 "configure"
 #include "confdefs.h"
 
 #include <iostream>
@@ -26620,16 +26624,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26626: \$? = $ac_status" >&5
+  echo "$as_me:26630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26632: \$? = $ac_status" >&5
+  echo "$as_me:26636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
@@ -26638,7 +26642,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
+	echo "$as_me:26645: result: $cf_iostream_namespace" >&5
 echo "${ECHO_T}$cf_iostream_namespace" >&6
 	if test "$cf_iostream_namespace" = yes ; then
 
@@ -26649,99 +26653,17 @@ EOF
 	fi
 fi
 
-echo "$as_me:26652: 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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26660 "configure"
-#include "confdefs.h"
-
-#ifndef __BEOS__
-#include <stdbool.h>
-#endif
-
-int
-main (void)
-{
-bool foo = false; (void)foo
-  ;
-  return 0;
-}
-_ACEOF
-rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26676: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:26679: \$? = $ac_status" >&5
-  (exit "$ac_status"); } &&
-         { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26682: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:26685: \$? = $ac_status" >&5
-  (exit "$ac_status"); }; }; then
-  cf_cv_header_stdbool_h=1
-else
-  echo "$as_me: failed program was:" >&5
-cat "conftest.$ac_ext" >&5
-cat >"conftest.$ac_ext" <<_ACEOF
-#line 26692 "configure"
-#include "confdefs.h"
-
-int
-main (void)
-{
-bool foo = false; (void)foo
-  ;
-  return 0;
-}
-_ACEOF
-rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:26707: \$? = $ac_status" >&5
-  (exit "$ac_status"); } &&
-         { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:26713: \$? = $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
-fi
-rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-fi
-rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-fi
-
-if test "$cf_cv_header_stdbool_h" = 1
-then	echo "$as_me:26726: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26728: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-echo "$as_me:26732: checking for builtin bool type" >&5
+echo "$as_me:26656: 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
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26740 "configure"
+#line 26663 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
@@ -26752,40 +26674,35 @@ bool x = false; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26758: \$? = $ac_status" >&5
+  echo "$as_me:26680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26764: \$? = $ac_status" >&5
+  echo "$as_me:26686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  cf_cv_builtin_bool=1
+  cf_cv_builtin_bool=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-cf_cv_builtin_bool=0
+cf_cv_builtin_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
+echo "$as_me:26696: result: $cf_cv_builtin_bool" >&5
+echo "${ECHO_T}$cf_cv_builtin_bool" >&6
 
-if test "$cf_cv_builtin_bool" = 1
-then	echo "$as_me:26776: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else	echo "$as_me:26778: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-echo "$as_me:26782: checking for bool" >&5
+echo "$as_me:26699: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26788 "configure"
+#line 26705 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26802,7 +26719,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -26820,16 +26737,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26826: \$? = $ac_status" >&5
+  echo "$as_me:26743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26832: \$? = $ac_status" >&5
+  echo "$as_me:26749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -26839,10 +26756,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:26842: result: $ac_cv_type_bool" >&5
+echo "$as_me:26759: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:26845: checking size of bool" >&5
+echo "$as_me:26762: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26851,7 +26768,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26854 "configure"
+#line 26771 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26868,7 +26785,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -26883,21 +26800,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26889: \$? = $ac_status" >&5
+  echo "$as_me:26806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26895: \$? = $ac_status" >&5
+  echo "$as_me:26812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26900 "configure"
+#line 26817 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26914,7 +26831,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -26929,16 +26846,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26941: \$? = $ac_status" >&5
+  echo "$as_me:26858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26954,7 +26871,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 26957 "configure"
+#line 26874 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26971,7 +26888,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -26986,16 +26903,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26992: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26998: \$? = $ac_status" >&5
+  echo "$as_me:26915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27011,7 +26928,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27014 "configure"
+#line 26931 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27028,7 +26945,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27043,16 +26960,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27049: \$? = $ac_status" >&5
+  echo "$as_me:26966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27055: \$? = $ac_status" >&5
+  echo "$as_me:26972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27065,12 +26982,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27068: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26985: 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 27073 "configure"
+#line 26990 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27087,7 +27004,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27106,15 +27023,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27112: \$? = $ac_status" >&5
+  echo "$as_me:27029: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27117: \$? = $ac_status" >&5
+  echo "$as_me:27034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27130,13 +27047,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27133: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27050: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27139: checking for type of bool" >&5
+echo "$as_me:27056: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27155,7 +27072,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27158 "configure"
+#line 27075 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27172,7 +27089,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27196,15 +27113,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27202: \$? = $ac_status" >&5
+  echo "$as_me:27119: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27207: \$? = $ac_status" >&5
+  echo "$as_me:27124: \$? = $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
@@ -27221,19 +27138,19 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:27224: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27141: 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:27231: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27148: 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:27236: checking for special defines needed for etip.h" >&5
+echo "$as_me:27153: 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"
@@ -27251,7 +27168,7 @@ do
 	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 27254 "configure"
+#line 27171 "configure"
 #include "confdefs.h"
 
 #include <etip.h.in>
@@ -27265,16 +27182,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27271: \$? = $ac_status" >&5
+  echo "$as_me:27188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27277: \$? = $ac_status" >&5
+  echo "$as_me:27194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -27295,12 +27212,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
-echo "$as_me:27298: result: ${cf_result:-(none)}" >&5
+echo "$as_me:27215: result: ${cf_result:-(none)}" >&5
 echo "${ECHO_T}${cf_result:-(none)}" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
-echo "$as_me:27303: checking if $CXX accepts override keyword" >&5
+echo "$as_me:27220: checking if $CXX accepts override keyword" >&5
 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
 if test "${cf_cv_cpp_override+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27317,7 +27234,7 @@ ac_main_return="return"
   cf_cv_cpp_override=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27320 "configure"
+#line 27237 "configure"
 #include "confdefs.h"
 
 class base
@@ -27336,15 +27253,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27342: \$? = $ac_status" >&5
+  echo "$as_me:27259: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27347: \$? = $ac_status" >&5
+  echo "$as_me:27264: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_override=yes
 else
@@ -27363,7 +27280,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27366: result: $cf_cv_cpp_override" >&5
+echo "$as_me:27283: result: $cf_cv_cpp_override" >&5
 echo "${ECHO_T}$cf_cv_cpp_override" >&6
 fi
 test "$cf_cv_cpp_override" = yes &&
@@ -27372,7 +27289,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test -n "$CXX"; then
-echo "$as_me:27375: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:27292: 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
@@ -27389,7 +27306,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27392 "configure"
+#line 27309 "configure"
 #include "confdefs.h"
 
 class TEST {
@@ -27408,15 +27325,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27414: \$? = $ac_status" >&5
+  echo "$as_me:27331: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27419: \$? = $ac_status" >&5
+  echo "$as_me:27336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
@@ -27435,7 +27352,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27438: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:27355: result: $cf_cv_cpp_param_init" >&5
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
@@ -27445,7 +27362,7 @@ EOF
 
 if test -n "$CXX"; then
 
-echo "$as_me:27448: checking if $CXX accepts static_cast" >&5
+echo "$as_me:27365: 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
@@ -27459,7 +27376,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27462 "configure"
+#line 27379 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27503,16 +27420,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27509: \$? = $ac_status" >&5
+  echo "$as_me:27426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27515: \$? = $ac_status" >&5
+  echo "$as_me:27432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
@@ -27530,7 +27447,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
-echo "$as_me:27533: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:27450: result: $cf_cv_cpp_static_cast" >&5
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
@@ -27562,7 +27479,7 @@ EOF
 
 else
 	cf_cxx_library=no
-	cf_cv_builtin_bool=1
+	cf_cv_builtin_bool=yes
 
 	# Just because we are not configuring against C++ right now does not
 	# mean that a user will not want to use C++.  Some distributors disable
@@ -27575,16 +27492,16 @@ else
 
 	if test "$NCURSES_BOOL" != auto ; then
 		cf_cv_type_of_bool=$NCURSES_BOOL
-		cf_cv_header_stdbool_h=0
+		USE_STDBOOL_H=0
 	else
 
-echo "$as_me:27581: checking for bool" >&5
+echo "$as_me:27498: checking for bool" >&5
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27587 "configure"
+#line 27504 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27601,7 +27518,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27619,16 +27536,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27625: \$? = $ac_status" >&5
+  echo "$as_me:27542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27631: \$? = $ac_status" >&5
+  echo "$as_me:27548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
@@ -27638,10 +27555,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27641: result: $ac_cv_type_bool" >&5
+echo "$as_me:27558: result: $ac_cv_type_bool" >&5
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
-echo "$as_me:27644: checking size of bool" >&5
+echo "$as_me:27561: checking size of bool" >&5
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27650,7 +27567,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27653 "configure"
+#line 27570 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27667,7 +27584,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27682,21 +27599,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27688: \$? = $ac_status" >&5
+  echo "$as_me:27605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27694: \$? = $ac_status" >&5
+  echo "$as_me:27611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27699 "configure"
+#line 27616 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27713,7 +27630,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27728,16 +27645,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27731: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27734: \$? = $ac_status" >&5
+  echo "$as_me:27651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27740: \$? = $ac_status" >&5
+  echo "$as_me:27657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27753,7 +27670,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 27756 "configure"
+#line 27673 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27770,7 +27687,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27785,16 +27702,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27791: \$? = $ac_status" >&5
+  echo "$as_me:27708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27797: \$? = $ac_status" >&5
+  echo "$as_me:27714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27810,7 +27727,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27813 "configure"
+#line 27730 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27827,7 +27744,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27842,16 +27759,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27848: \$? = $ac_status" >&5
+  echo "$as_me:27765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27854: \$? = $ac_status" >&5
+  echo "$as_me:27771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -27864,12 +27781,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27867: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27784: 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 27872 "configure"
+#line 27789 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27886,7 +27803,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27905,15 +27822,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27911: \$? = $ac_status" >&5
+  echo "$as_me:27828: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27916: \$? = $ac_status" >&5
+  echo "$as_me:27833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
@@ -27929,13 +27846,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
-echo "$as_me:27932: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:27849: result: $ac_cv_sizeof_bool" >&5
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
-echo "$as_me:27938: checking for type of bool" >&5
+echo "$as_me:27855: checking for type of bool" >&5
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27954,7 +27871,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27957 "configure"
+#line 27874 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27971,7 +27888,7 @@ $ac_includes_default
 
 #else
 
-#if $cf_cv_header_stdbool_h
+#if $USE_STDBOOL_H
 #include <stdbool.h>
 #endif
 
@@ -27995,15 +27912,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28001: \$? = $ac_status" >&5
+  echo "$as_me:27918: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28006: \$? = $ac_status" >&5
+  echo "$as_me:27923: \$? = $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
@@ -28020,14 +27937,14 @@ fi
 	rm -f cf_test.out
 
 fi
-echo "$as_me:28023: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:27940: 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:28030: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+	{ echo "$as_me:27947: 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
@@ -28041,11 +27958,11 @@ fi
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1
-if test "$cf_cv_cc_bool_type" = 1
+if test "$USE_BUILTIN_BOOL" = 1
 then
 	# oops: C has a bool.  Unlikely, but C++ could differ.
 	USE_CXX_BOOL=0
-elif test "$cf_cv_builtin_bool" = 0
+elif test "$cf_cv_builtin_bool" = no
 then
 	# C++ has no bool
 	USE_CXX_BOOL=0
@@ -28058,7 +27975,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
 	if test "$cf_with_ada" != "no" ; then
 		if test "$with_libtool" != "no"; then
-			{ echo "$as_me:28061: WARNING: libtool does not support Ada - disabling feature" >&5
+			{ echo "$as_me:27978: 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
@@ -28069,7 +27986,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 
  	ADAFLAGS="$ADAFLAGS -gnatpn"
 
-	echo "$as_me:28072: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:27989: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -28086,10 +28003,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:28089: result: $ADAFLAGS" >&5
+	echo "$as_me:28006: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:28092: checking if GNATPREP supports -T option" >&5
+echo "$as_me:28009: 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
@@ -28099,11 +28016,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:28102: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:28019: 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:28106: checking if GNAT supports generics" >&5
+echo "$as_me:28023: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
@@ -28113,7 +28030,7 @@ case "$cf_cv_gnat_version" in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:28116: result: $cf_gnat_generics" >&5
+echo "$as_me:28033: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -28125,7 +28042,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:28128: checking if GNAT supports SIGINT" >&5
+echo "$as_me:28045: 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
@@ -28173,7 +28090,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
-echo "$as_me:28176: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:28093: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
@@ -28186,7 +28103,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:28189: checking if GNAT supports project files" >&5
+echo "$as_me:28106: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
@@ -28249,15 +28166,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:28252: result: $cf_gnat_projects" >&5
+echo "$as_me:28169: 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:28258: checking if GNAT supports libraries" >&5
+	echo "$as_me:28175: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:28260: result: $cf_gnat_libraries" >&5
+	echo "$as_me:28177: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -28277,7 +28194,7 @@ then
 	then
 		USE_GNAT_MAKE_GPR=""
 	else
-		{ echo "$as_me:28280: WARNING: use old makefile rules since tools are missing" >&5
+		{ echo "$as_me:28197: WARNING: use old makefile rules since tools are missing" >&5
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
 	fi
 fi
@@ -28289,7 +28206,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:28292: checking for Ada95 compiler" >&5
+echo "$as_me:28209: checking for Ada95 compiler" >&5
 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -28300,12 +28217,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:28303: result: $cf_ada_compiler" >&5
+echo "$as_me:28220: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 			cf_ada_package=terminal_interface
 
-echo "$as_me:28308: checking for Ada95 include directory" >&5
+echo "$as_me:28225: checking for Ada95 include directory" >&5
 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -28339,7 +28256,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28259: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28348,10 +28265,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:28351: result: $ADA_INCLUDE" >&5
+echo "$as_me:28268: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:28354: checking for Ada95 object directory" >&5
+echo "$as_me:28271: checking for Ada95 object directory" >&5
 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -28385,7 +28302,7 @@ case "x$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:28388: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28305: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28394,10 +28311,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:28397: result: $ADA_OBJECTS" >&5
+echo "$as_me:28314: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:28400: checking whether to build an Ada95 shared library" >&5
+echo "$as_me:28317: checking whether to build an Ada95 shared library" >&5
 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -28418,11 +28335,11 @@ then
 	fi
 fi
 
-echo "$as_me:28421: result: $with_ada_sharedlib" >&5
+echo "$as_me:28338: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 if test "x$cf_ada_sharedlib_warn" != xno
 then
-	{ echo "$as_me:28425: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+	{ echo "$as_me:28342: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
 fi
 
@@ -28440,7 +28357,7 @@ fi
 
 			# allow the Ada binding to be renamed
 
-echo "$as_me:28443: checking for Ada95 curses library name" >&5
+echo "$as_me:28360: checking for Ada95 curses library name" >&5
 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -28456,7 +28373,7 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:28459: result: $ADA_LIBNAME" >&5
+echo "$as_me:28376: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 		fi
@@ -28467,13 +28384,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
-	echo "$as_me:28470: checking for wchar_t" >&5
+	echo "$as_me:28387: 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 28476 "configure"
+#line 28393 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28488,16 +28405,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28494: \$? = $ac_status" >&5
+  echo "$as_me:28411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28500: \$? = $ac_status" >&5
+  echo "$as_me:28417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
@@ -28507,10 +28424,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28510: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:28427: result: $ac_cv_type_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
-echo "$as_me:28513: checking size of wchar_t" >&5
+echo "$as_me:28430: 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
@@ -28519,7 +28436,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28522 "configure"
+#line 28439 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28531,21 +28448,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28534: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28537: \$? = $ac_status" >&5
+  echo "$as_me:28454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28543: \$? = $ac_status" >&5
+  echo "$as_me:28460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28548 "configure"
+#line 28465 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28557,16 +28474,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28563: \$? = $ac_status" >&5
+  echo "$as_me:28480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28569: \$? = $ac_status" >&5
+  echo "$as_me:28486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28582,7 +28499,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 28585 "configure"
+#line 28502 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28594,16 +28511,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28600: \$? = $ac_status" >&5
+  echo "$as_me:28517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28606: \$? = $ac_status" >&5
+  echo "$as_me:28523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28619,7 +28536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28622 "configure"
+#line 28539 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28631,16 +28548,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28637: \$? = $ac_status" >&5
+  echo "$as_me:28554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28643: \$? = $ac_status" >&5
+  echo "$as_me:28560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -28653,12 +28570,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28656: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28573: 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 28661 "configure"
+#line 28578 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28674,15 +28591,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:28677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28680: \$? = $ac_status" >&5
+  echo "$as_me:28597: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:28682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28685: \$? = $ac_status" >&5
+  echo "$as_me:28602: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
@@ -28698,7 +28615,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
-echo "$as_me:28701: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:28618: result: $ac_cv_sizeof_wchar_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
@@ -28711,7 +28628,7 @@ EOF
 	then
 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
 
-echo "${as_me:-configure}:28714: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:28631: testing test failed (assume 2) ..." 1>&5
 
 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
 		mv confdefs.tmp confdefs.h
@@ -28729,7 +28646,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
-echo "$as_me:28732: checking for library subsets" >&5
+echo "$as_me:28649: checking for library subsets" >&5
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
@@ -28783,7 +28700,7 @@ fi
 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:28786: result: $LIB_SUBSETS" >&5
+echo "$as_me:28703: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -28814,7 +28731,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:28817: checking default library suffix" >&5
+echo "$as_me:28734: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28825,10 +28742,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:28828: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:28745: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:28831: checking default library-dependency suffix" >&5
+echo "$as_me:28748: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -28911,10 +28828,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:28914: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:28831: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:28917: checking default object directory" >&5
+echo "$as_me:28834: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -28930,11 +28847,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:28933: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:28850: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
-echo "$as_me:28937: checking c++ library-dependency suffix" >&5
+echo "$as_me:28854: 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++)
@@ -29027,7 +28944,7 @@ else
 	fi
 
 fi
-echo "$as_me:29030: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:28947: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -29203,19 +29120,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
-	echo "$as_me:29206: checking if linker supports switching between static/dynamic" >&5
+	echo "$as_me:29123: 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 <<EOF
-#line 29211 "configure"
+#line 29128 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
-	if { (eval echo "$as_me:29215: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:29132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29218: \$? = $ac_status" >&5
+  echo "$as_me:29135: \$? = $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
@@ -29226,10 +29143,10 @@ EOF
 
 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29229 "configure"
+#line 29146 "configure"
 #include "confdefs.h"
 
-#line 29232 "configure"
+#line 29149 "configure"
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
@@ -29244,16 +29161,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29250: \$? = $ac_status" >&5
+  echo "$as_me:29167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29256: \$? = $ac_status" >&5
+  echo "$as_me:29173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	# some linkers simply ignore the -dynamic
@@ -29276,7 +29193,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	rm -f libconftest.*
 	LIBS="$cf_save_LIBS"
 
-	echo "$as_me:29279: result: $cf_ldflags_static" >&5
+	echo "$as_me:29196: result: $cf_ldflags_static" >&5
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 	if test "$cf_ldflags_static" != yes
@@ -29292,7 +29209,7 @@ fi
 	;;
 esac
 
-echo "$as_me:29295: checking where we will install curses.h" >&5
+echo "$as_me:29212: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
@@ -29302,7 +29219,7 @@ if test "$with_overwrite" = no && \
 then
 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
-echo "$as_me:29305: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:29222: result: ${includedir}${includesubdir}" >&5
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -29310,7 +29227,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-	{ echo "$as_me:29313: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+	{ echo "$as_me:29230: 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
@@ -29335,7 +29252,7 @@ EOF
 
 # pkgsrc uses these
 
-echo "$as_me:29338: checking for desired basename for form library" >&5
+echo "$as_me:29255: checking for desired basename for form library" >&5
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
@@ -29355,10 +29272,10 @@ case "x$FORM_NAME" in
 	;;
 esac
 
-echo "$as_me:29358: result: $FORM_NAME" >&5
+echo "$as_me:29275: result: $FORM_NAME" >&5
 echo "${ECHO_T}$FORM_NAME" >&6
 
-echo "$as_me:29361: checking for desired basename for menu library" >&5
+echo "$as_me:29278: checking for desired basename for menu library" >&5
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
@@ -29378,10 +29295,10 @@ case "x$MENU_NAME" in
 	;;
 esac
 
-echo "$as_me:29381: result: $MENU_NAME" >&5
+echo "$as_me:29298: result: $MENU_NAME" >&5
 echo "${ECHO_T}$MENU_NAME" >&6
 
-echo "$as_me:29384: checking for desired basename for panel library" >&5
+echo "$as_me:29301: checking for desired basename for panel library" >&5
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
@@ -29401,10 +29318,10 @@ case "x$PANEL_NAME" in
 	;;
 esac
 
-echo "$as_me:29404: result: $PANEL_NAME" >&5
+echo "$as_me:29321: result: $PANEL_NAME" >&5
 echo "${ECHO_T}$PANEL_NAME" >&6
 
-echo "$as_me:29407: checking for desired basename for cxx library" >&5
+echo "$as_me:29324: checking for desired basename for cxx library" >&5
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
@@ -29424,13 +29341,13 @@ case "x$CXX_NAME" in
 	;;
 esac
 
-echo "$as_me:29427: result: $CXX_NAME" >&5
+echo "$as_me:29344: result: $CXX_NAME" >&5
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:29433: checking for src modules" >&5
+echo "$as_me:29350: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -29489,7 +29406,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
 		fi
 	fi
 done
-echo "$as_me:29492: result: $cf_cv_src_modules" >&5
+echo "$as_me:29409: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -29650,7 +29567,7 @@ case "$cf_cv_system_name" in
 	(*-D_XOPEN_SOURCE_EXTENDED*)
 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
-echo "${as_me:-configure}:29653: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:29570: 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//'`
@@ -29661,7 +29578,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-echo "$as_me:29664: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+echo "$as_me:29581: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
@@ -29677,7 +29594,7 @@ do
 	done
 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
-echo "$as_me:29680: result: $PKG_CFLAGS" >&5
+echo "$as_me:29597: result: $PKG_CFLAGS" >&5
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 case "$cf_cv_system_name" in
@@ -29749,7 +29666,7 @@ then
 	cf_filter_syms=$cf_dft_filter_syms
 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
 
-echo "${as_me:-configure}:29752: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+echo "${as_me:-configure}:29669: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
 
 fi
 
@@ -29776,7 +29693,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
-echo "$as_me:29779: checking for linker search path" >&5
+echo "$as_me:29696: checking for linker search path" >&5
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29824,7 +29741,7 @@ then
 			cf_pathlist="$cf_pathlist /lib /usr/lib"
 			;;
 		(*)
-			{ echo "$as_me:29827: WARNING: problem with Solaris architecture" >&5
+			{ echo "$as_me:29744: WARNING: problem with Solaris architecture" >&5
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
 			;;
 		esac
@@ -29865,7 +29782,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
-echo "$as_me:29868: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:29785: result: $cf_cv_ld_searchpath" >&5
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@@ -29951,7 +29868,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:29954: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:29871: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -30087,7 +30004,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20240618,
+configured by $0, generated by GNU Autoconf 2.52.20250126,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -30132,7 +30049,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:30135: error: ambiguous option: $1
+    { { echo "$as_me:30052: 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;}
@@ -30151,7 +30068,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:30154: error: unrecognized option: $1
+  -*) { { echo "$as_me:30071: 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;}
@@ -30170,7 +30087,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20240618, executed with
+This file was extended by $as_me 2.52.20250126, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -30283,7 +30200,7 @@ do
   "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:30286: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:30203: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30601,7 +30518,8 @@ s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t
 s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t
 s,@TEST_LIBS@,$TEST_LIBS,;t t
 s,@TEST_LIBS2@,$TEST_LIBS2,;t t
-s,@cf_cv_cc_bool_type@,$cf_cv_cc_bool_type,;t t
+s,@USE_STDBOOL_H@,$USE_STDBOOL_H,;t t
+s,@USE_BUILTIN_BOOL@,$USE_BUILTIN_BOOL,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
 s,@CXX_AR@,$CXX_AR,;t t
@@ -30811,7 +30729,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30814: creating $ac_file" >&5
+    { echo "$as_me:30732: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30829,7 +30747,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30832: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30750: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -30842,7 +30760,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30845: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30763: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30858,7 +30776,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30861: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30779: 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;}
@@ -30867,7 +30785,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30870: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30788: 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;}
@@ -30912,7 +30830,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             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:30915: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30833: 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;}
@@ -30923,7 +30841,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:30926: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30844: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30972,7 +30890,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30975: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30893: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30983,7 +30901,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30986: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30904: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30996,7 +30914,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30999: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30917: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -31054,7 +30972,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:31057: $ac_file is unchanged" >&5
+      { echo "$as_me:30975: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -31441,7 +31359,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 				(cygdll|msysdll|mingw|msvcdll)
 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:31444: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:31362: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
 					with_shared_cxx=yes
 					;;
diff --git a/configure.in b/configure.in
index cd3a45627..538984dc8 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.791 2025/02/02 00:16:32 tom Exp $
+dnl $Id: configure.in,v 1.794 2025/03/01 15:05:13 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.791 $)
+AC_REVISION($Revision: 1.794 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1732,10 +1732,12 @@ CF_REGEX
 
 dnl These are some other potentially nonportable headers.
 AC_CHECK_HEADERS( \
+alloca.h \
 fcntl.h \
 getopt.h \
 limits.h \
 locale.h \
+malloc.h \
 math.h \
 poll.h \
 sys/auxv.h \
@@ -1901,7 +1903,14 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 CF_BOOL_DECL(cf_cv_cc_bool_type)
-AC_SUBST(cf_cv_cc_bool_type)
+if test "$cf_cv_cc_bool_type" = yes; then
+	USE_BUILTIN_BOOL=1
+else
+	USE_BUILTIN_BOOL=0
+fi
+AC_SUBST(USE_BUILTIN_BOOL)
+
+test "$cf_cv_header_stdbool_h" = yes && AC_DEFINE(USE_STDBOOL_H,1,[Define to 1 if we can include stdbool.h])
 
 # Check for C++ compiler characteristics (and ensure that it's there!)
 if test -n "$CXX" ; then
@@ -1932,7 +1941,7 @@ if test -n "$CXX" ; then
 	CF_CXX_AR_FLAGS
 else
 	cf_cxx_library=no
-	cf_cv_builtin_bool=1
+	cf_cv_builtin_bool=yes
 
 	# Just because we are not configuring against C++ right now does not
 	# mean that a user will not want to use C++.  Some distributors disable
@@ -1945,7 +1954,7 @@ else
 
 	if test "$NCURSES_BOOL" != auto ; then
 		cf_cv_type_of_bool=$NCURSES_BOOL
-		cf_cv_header_stdbool_h=0
+		USE_STDBOOL_H=0
 	else
 		CF_BOOL_SIZE
 	fi
@@ -1958,11 +1967,11 @@ AC_SUBST(CXXLIBS)
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1
-if test "$cf_cv_cc_bool_type" = 1
+if test "$USE_BUILTIN_BOOL" = 1
 then
 	# oops: C has a bool.  Unlikely, but C++ could differ.
 	USE_CXX_BOOL=0
-elif test "$cf_cv_builtin_bool" = 0
+elif test "$cf_cv_builtin_bool" = no
 then
 	# C++ has no bool
 	USE_CXX_BOOL=0
diff --git a/dist.mk b/dist.mk
index 145495b32..95a8358cd 100644
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1657 2025/02/22 09:14:10 tom Exp $
+# $Id: dist.mk,v 1.1658 2025/03/01 10:08:08 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 5
-NCURSES_PATCH = 20250222
+NCURSES_PATCH = 20250301
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 8ddd87465..62383c476 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 
@@ -55,14 +55,14 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>add_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvadd_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwadd_wch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
-             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>add_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wadd_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvadd_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwadd_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>echo_wchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wecho_wchar(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>echo_wchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wecho_wchar(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG><EM>wch</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>(integer)</EM> <EM>constants</EM> <EM>*/</EM>
        /* <EM>...</EM> <EM>*/</EM> <STRONG>WACS_BLOCK;</STRONG>
@@ -150,14 +150,14 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        until another spacing character is written to the window or the  cursor
        is moved.
 
-       If advancement occurs at the right margin,
+       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+       advancement occurs at the right margin, the cursor automatically  wraps
+       to the beginning of the next line.
 
-       <STRONG>o</STRONG>   the  cursor  automatically wraps to the beginning of the next line,
-           then,
-
-       <STRONG>o</STRONG>   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
-           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  enabled  for <EM>win</EM>, the scrolling region scrolls up
-           one line.
+       If the cursor is at the bottom of the scrolling region when advancement
+       occurs at the right margin, and <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is enabled  for  <EM>win</EM>,  the
+       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+       scrolling do not occur, and <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG>.
 
        If <EM>wch</EM> is a backspace, carriage return, line feed, or tab,  the  cursor
        moves appropriately within the window.
@@ -202,8 +202,8 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>wadd_wch</STRONG> to  write  line-drawing  and  other  symbols  to  the  screen.
        <EM>ncurses</EM>  terms  these <EM>forms-drawing</EM> <EM>characters.</EM>  The ACS default listed
        below is used if the <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  <EM>terminfo</EM>  capability  does  not
-       define  a  terminal-specific replacement for it, or if the terminal and
-       locale configuration requires Unicode to access  these  characters  but
+       define  a terminal-specific replacement for it, or if the terminal type
+       and locale configuration require Unicode to access these characters but
        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
        corresponds to how the characters are specified in the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>)
        string capability, and the characters in it may appear on the screen if
@@ -298,7 +298,7 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>wadd_wch</STRONG> and <STRONG>wecho_wchar</STRONG> return <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
        <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
@@ -322,8 +322,8 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The  symbols  (<EM>WACS</EM><STRONG>_</STRONG><EM>S3</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>S7</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>PI</EM>,
-       <EM>WACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>,  and  <EM>WACS</EM><STRONG>_</STRONG><EM>STERLING</EM>)  are  not  standard.   However,  many
+       The  symbols  <EM>WACS</EM><STRONG>_</STRONG><EM>S3</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>S7</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,  <EM>WACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,   <EM>WACS</EM><STRONG>_</STRONG><EM>PI</EM>,
+       <EM>WACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>,   and  <EM>WACS</EM><STRONG>_</STRONG><EM>STERLING</EM>  are  not  standard.   However,  many
        publicly  available   <EM>terminfo</EM>   entries   include   <EM>acs</EM><STRONG>_</STRONG><EM>chars</EM>   (<STRONG>acsc</STRONG>)
        capabilities  in which their key characters (<STRONG>pryz{|}</STRONG>) are embedded, and
        a second-hand list of their character descriptions has come  to  light.
@@ -449,7 +449,7 @@ <H1 class="no-header">curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                  <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 986066d6d..77b991bcc 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp @
+  * @Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_addch 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_addch 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 
@@ -56,12 +56,12 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
        <STRONG>int</STRONG> <STRONG>addch(const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>waddch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>waddch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvaddch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwaddch(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwaddch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>echochar(const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wechochar(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wechochar(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>ch</EM><STRONG>);</STRONG>
 
        <EM>/*</EM> <EM>(integer)</EM> <EM>constants</EM> <EM>*/</EM>
        /* <EM>...</EM> <EM>*/</EM> <STRONG>ACS_BLOCK;</STRONG>
@@ -111,14 +111,14 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        attributes and color pair.  (A color  pair  selection  is  not  honored
        unless initialized; see <STRONG><A HREF="curs_color.3x.html">start_color(3x)</A></STRONG>.)
 
-       If advancement occurs at the right margin,
+       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+       advancement occurs at the right margin, the cursor automatically  wraps
+       to the beginning of the next line.
 
-       <STRONG>o</STRONG>   the  cursor  automatically wraps to the beginning of the next line,
-           then,
-
-       <STRONG>o</STRONG>   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
-           <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG>  is  enabled  for <EM>win</EM>, the scrolling region scrolls up
-           one line.
+       If the cursor is at the bottom of the scrolling region when advancement
+       occurs at the right margin, and <STRONG><A HREF="scrollok.3x.html">scrollok(3x)</A></STRONG> is enabled  for  <EM>win</EM>,  the
+       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+       scrolling do not occur, and <STRONG>waddch</STRONG> returns <STRONG>ERR</STRONG>.
 
        If <EM>ch</EM> is a backspace, carriage return, line feed, or  tab,  the  cursor
        moves appropriately within the window.
@@ -165,8 +165,8 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        to write line-drawing and other symbols to the screen.   <EM>ncurses</EM>  terms
        these  <EM>forms-drawing</EM>  <EM>characters.</EM>  The ACS default listed below is used
        if the <STRONG>acs_chars</STRONG> (<STRONG>acsc</STRONG>) <EM>terminfo</EM> capability does not define a terminal-
-       specific   replacement   for   it,   or  if  the  terminal  and  locale
-       configuration requires Unicode  to  access  these  characters  but  the
+       specific  replacement  for  it,  or  if  the  terminal  type and locale
+       configuration require  Unicode  to  access  these  characters  but  the
        library  is  unable to use Unicode.  The "acsc char" column corresponds
        to how the characters are specified  in  the  <STRONG>acs_chars</STRONG>  (<STRONG>acsc</STRONG>)  string
        capability,  and  the  characters in it may appear on the screen if the
@@ -215,7 +215,7 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       In <EM>ncurses</EM>, <STRONG>waddch</STRONG> and <STRONG>wechochar</STRONG> return <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
        <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
@@ -248,13 +248,13 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       The   symbols   (<EM>ACS</EM><STRONG>_</STRONG><EM>S3</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>S7</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>,   <EM>ACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>,  <EM>ACS</EM><STRONG>_</STRONG><EM>PI</EM>,
-       <EM>ACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>, and <EM>ACS</EM><STRONG>_</STRONG><EM>STERLING</EM>)  were  not  documented  in  any  publicly
-       released  System V  and  are  not  standard.   However,  many  publicly
-       available <EM>terminfo</EM> entries include  <EM>acs</EM><STRONG>_</STRONG><EM>chars</EM>  (<STRONG>acsc</STRONG>)  capabilities  in
-       which  their  key  characters (<STRONG>pryz{|}</STRONG>) are embedded, and a second-hand
-       list of their character descriptions has come to  light.   The  <EM>ncurses</EM>
-       developers invented ACS-prefixed names for them.
+       The symbols <EM>ACS</EM><STRONG>_</STRONG><EM>S3</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>S7</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>LEQUAL</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>GEQUAL</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>PI</EM>, <EM>ACS</EM><STRONG>_</STRONG><EM>NEQUAL</EM>,
+       and <EM>ACS</EM><STRONG>_</STRONG><EM>STERLING</EM> were not documented in any publicly released  System V
+       and  are  not  standard.   However,  many  publicly  available <EM>terminfo</EM>
+       entries include  <EM>acs</EM><STRONG>_</STRONG><EM>chars</EM>  (<STRONG>acsc</STRONG>)  capabilities  in  which  their  key
+       characters  (<STRONG>pryz{|}</STRONG>)  are  embedded,  and  a second-hand list of their
+       character descriptions has  come  to  light.   The  <EM>ncurses</EM>  developers
+       invented ACS-prefixed names for them.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -364,7 +364,7 @@ <H1 class="no-header">curs_addch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                    <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index a09b76b9d..d2c150eb6 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
+  * @Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_color 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_color 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_color 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 
@@ -263,11 +263,21 @@ <H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-has_colors">has_colors</a></H3><PRE>
-       The  <STRONG>has_colors</STRONG>  routine requires no arguments.  It returns <STRONG>TRUE</STRONG> if the
-       terminal can manipulate colors;  otherwise,  it  returns  <STRONG>FALSE</STRONG>.   This
-       routine   facilitates   writing   terminal-independent  programs.   For
-       example, a programmer can use it to decide whether to use color or some
-       other video attribute.
+       <STRONG>has_colors</STRONG> returns <STRONG>TRUE</STRONG> if the terminal supports colors and <STRONG>FALSE</STRONG> if it
+       does not.   <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  or  <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  must  be  called  first,  but
+       <STRONG>start_color</STRONG>  need  not  be.   An  application  might call <STRONG>has_colors</STRONG> to
+       decide whether to use color or a video attribute like <STRONG>A_BOLD</STRONG> to  render
+       text.
+
+       Color  support  in  <EM>curses</EM>  requires that the terminal type description
+       support the capabilities <STRONG>max_colors</STRONG> (<STRONG>colors</STRONG>),  <STRONG>max_pairs</STRONG>  (<STRONG>pairs</STRONG>),  and
+       any of
+
+       <STRONG>o</STRONG>   <STRONG>set_foreground</STRONG> (<STRONG>setf</STRONG>) and <STRONG>set_background</STRONG> (<STRONG>setb</STRONG>);
+
+       <STRONG>o</STRONG>   <STRONG>set_a_foreground</STRONG> (<STRONG>setaf</STRONG>) and <STRONG>set_a_background</STRONG> (<STRONG>setab</STRONG>); or
+
+       <STRONG>o</STRONG>   <STRONG>set_color_pair</STRONG> (<STRONG>scp</STRONG>).
 
 
 </PRE><H3><a name="h3-can_change_color">can_change_color</a></H3><PRE>
@@ -427,7 +437,7 @@ <H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
            <STRONG>o</STRONG>   color identifiers outside the range 0-<STRONG>COLORS</STRONG>-1  inclusive,  the
                default colors extension notwithstanding, or
 
-           <STRONG>o</STRONG>   color  pairs  identifiers  outside  the  range  0-<STRONG>COLOR_PAIRS</STRONG>-1
+           <STRONG>o</STRONG>   color   pair  identifiers  outside  the  range  0-<STRONG>COLOR_PAIRS</STRONG>-1
                inclusive.
 
 
@@ -445,10 +455,10 @@ <H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        application to disregard unnecessary information.
 
        In <EM>ncurses</EM>, each screen has a color  activation  flag,  color  palette,
-       color pair table, and associated <STRONG>COLORS</STRONG> and <STRONG>COLOR_PAIRS</STRONG> values for each
-       screen; <STRONG>start_color</STRONG> affects only the  current  screen.   The  SVr4  and
-       X/Open  Curses  interface  was  not  really designed with this in mind;
-       historical implementations may use a single shared color palette.
+       color  pair  table,  and  associated  <STRONG>COLORS</STRONG>  and  <STRONG>COLOR_PAIRS</STRONG>  values;
+       <STRONG>start_color</STRONG> affects only the  current  screen.   The  SVr4  and  X/Open
+       Curses  interface was not really designed with this in mind; historical
+       implementations may use a single shared color palette.
 
        Setting an implicit background color via  a  color  pair  affects  only
        character  cells  that  a character write operation explicitly touches.
@@ -555,7 +565,7 @@ <H1 class="no-header">curs_color 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                    <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index cca5a4850..e2ba839ff 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.57 2025/02/23 13:48:31 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 
@@ -54,9 +54,9 @@ <H1 class="no-header">curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>gettchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
+       <STRONG>int</STRONG> <STRONG>getcchar(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
              <STRONG>attr_t</STRONG> <STRONG>*</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <STRONG>*</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>settchar(cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
+       <STRONG>int</STRONG> <STRONG>setcchar(cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG> <EM>wc</EM><STRONG>,</STRONG>
              <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>void</STRONG> <STRONG>*</STRONG> <EM>opts</EM><STRONG>);</STRONG>
 
 
@@ -206,7 +206,7 @@ <H1 class="no-header">curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
+ncurses 6.5                       2025-02-23                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 33fcf8812..8ba7185e4 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp @
+  * @Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 
@@ -297,38 +297,47 @@ <H1 class="no-header">curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
            modes, e.g., <STRONG><A HREF="curs_kernel.3x.html">def_shell_mode(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">def_prog_mode(3x)</A></STRONG>.  SVr4 uses  the
            descriptor in <EM>SCREEN</EM>.
 
-   <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Variable</STRONG>
-       If  the  <EM>TERM</EM>  variable  is  missing  or  empty, <EM>initscr</EM> uses the value
-       "unknown", which normally corresponds to  a  terminal  entry  with  the
-       <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability.  Generic entries are detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>
-       and cannot be used for full-screen  operation.   Other  implementations
-       may handle a missing/empty <EM>TERM</EM> variable differently.
+   <STRONG>Unset</STRONG> <EM>TERM</EM> <STRONG>Environment</STRONG> <STRONG>Variable</STRONG>
+       If  the  <EM>TERM</EM>  variable  is  not set in the environment or has an empty
+       value, <EM>initscr</EM> uses the value "unknown", which normally corresponds  to
+       a terminal entry with the <STRONG>generic</STRONG> (<STRONG>gn</STRONG>) capability.  Generic entries are
+       detected by <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG> and cannot be used for full-screen operation.
+       Other  implementations  may  handle  a  missing  or empty <EM>TERM</EM> variable
+       differently.
 
 
 </PRE><H3><a name="h3-Signal-Handlers">Signal Handlers</a></H3><PRE>
        Quoting X/Open Curses Issue 7, section 3.1.1:
 
-            Curses  implementations  may  provide  for special handling of the
-            SIGINT, SIGQUIT, and  SIGTSTP  signals  if  their  disposition  is
+            Curses implementations may provide for  special  handling  of  the
+            SIGINT,  SIGQUIT,  and  SIGTSTP  signals  if  their disposition is
             SIG_DFL at the time <EM>initscr</EM>() is called...
 
-            Any  special  handling  for these signals may remain in effect for
+            Any special handling for these signals may remain  in  effect  for
             the  life  of  the  process  or  until  the  process  changes  the
             disposition of the signal.
 
-            None  of the Curses functions are required to be safe with respect
+            None of the Curses functions are required to be safe with  respect
             to signals...
 
        Section "NOTES" above discusses <EM>ncurses</EM>'s signal handlers.
 
 
+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
+       4BSD (1980) introduced <EM>initscr</EM> and <EM>endwin</EM>.
+
+       SVr2 (1984) added <EM>newterm</EM> and <EM>set</EM><STRONG>_</STRONG><EM>term</EM>.
+
+       SVr3.1 (1987) supplied <EM>delscreen</EM> and <EM>isendwin</EM>.
+
+
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,     <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,    <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>,
        <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
@@ -353,6 +362,7 @@ <H1 class="no-header">curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 <li><a href="#h3-Signal-Handlers">Signal Handlers</a></li>
 </ul>
 </li>
+<li><a href="#h2-HISTORY">HISTORY</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 </ul>
 </div>
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 9a04aa344..2957ce324 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp @
+  * @Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 
@@ -216,7 +216,7 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        progress when the event occurs; see <STRONG>typeahead</STRONG> below for a mitigation of
        this problem.  You may want to call <STRONG>noqiflush</STRONG> in a signal  handler  if,
        after  the  handler  exits,  you  want output to continue as though the
-       interrupt had not occurred.
+       signal had not occurred.
 
 
 </PRE><H3><a name="h3-raw_noraw">raw, noraw</a></H3><PRE>
@@ -242,25 +242,26 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H3><a name="h3-typeahead">typeahead</a></H3><PRE>
-       Normally, a <EM>curses</EM> library checks the terminal for input while updating
-       the  screen.   If  any is found, the update is postponed until the next
-       <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG> call, allowing faster response to user key
-       strokes.   The  library  tests the file descriptor corresponding to the
-       <EM>FILE</EM> stream pointer passed to <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> (or <EM>stdin</EM> if <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>  was
-       called),  for  pending  input.  <STRONG>typeahead</STRONG> instructs <EM>curses</EM> to test file
-       descriptor <EM>fd</EM> instead.  An <EM>fd</EM> of <STRONG>-1</STRONG> disables the check.
+       Normally, a <EM>curses</EM> library checks the terminal's input file  descriptor
+       for  pending input with <STRONG>poll(2)</STRONG> or <STRONG>select(2)</STRONG> while updating the screen;
+       if it finds any, it postpones output until  the  next  <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG>  or
+       <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG>  call,  allowing faster response to user key strokes.  The
+       library tests the file descriptor  corresponding  to  the  <EM>FILE</EM>  stream
+       pointer passed to <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG> (or <EM>stdin</EM> if <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> was called), for
+       pending input.  <STRONG>typeahead</STRONG> instructs <EM>curses</EM> to test file  descriptor  <EM>fd</EM>
+       instead.  An <EM>fd</EM> of <STRONG>-1</STRONG> disables the check.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        <STRONG>timeout</STRONG> and <STRONG>wtimeout</STRONG> return no value.
 
-       <STRONG>cbreak</STRONG>, <STRONG>nocbreak</STRONG>, <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>,  <STRONG>halfdelay</STRONG>,  <STRONG>intrflush</STRONG>,  <STRONG>keypad</STRONG>,  <STRONG>meta</STRONG>,
-       <STRONG>nodelay</STRONG>,  <STRONG>notimeout</STRONG>,  <STRONG>nl</STRONG>,  <STRONG>nonl</STRONG>, <STRONG>raw</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>typeahead</STRONG> return <STRONG>OK</STRONG> on
+       <STRONG>cbreak</STRONG>,  <STRONG>nocbreak</STRONG>,  <STRONG>echo</STRONG>,  <STRONG>noecho</STRONG>,  <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>keypad</STRONG>, <STRONG>meta</STRONG>,
+       <STRONG>nodelay</STRONG>, <STRONG>notimeout</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>raw</STRONG>, <STRONG>noraw</STRONG>, and <STRONG>typeahead</STRONG>  return  <STRONG>OK</STRONG>  on
        success and <STRONG>ERR</STRONG> on failure.
 
        In <EM>ncurses</EM>, the functions in the previous paragraph return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   the library's <EM>TERMINAL</EM>  structure  for  the  device  has  not  been
+       <STRONG>o</STRONG>   the  library's  <EM>TERMINAL</EM>  structure  for  the  device  has not been
            initialized with <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>, or <STRONG><A HREF="curs_terminfo.3x.html">setupterm(3x)</A></STRONG>, or
 
        <STRONG>o</STRONG>   <EM>win</EM> is a null pointer (except with <STRONG>intrflush</STRONG> and <STRONG>meta</STRONG>, which ignore
@@ -268,7 +269,7 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
        Further, <STRONG>halfdelay</STRONG> returns <STRONG>ERR</STRONG> if <EM>delay</EM> is outside the range 1..255.
 
-       See section "EXTENSIONS" below for  the  return  values  of  <STRONG>is_cbreak</STRONG>,
+       See  section  "EXTENSIONS"  below  for  the return values of <STRONG>is_cbreak</STRONG>,
        <STRONG>is_echo</STRONG>, <STRONG>is_nl</STRONG>, and <STRONG>is_raw</STRONG>.
 
 
@@ -276,15 +277,27 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>echo</STRONG>, <STRONG>noecho</STRONG>, <STRONG>halfdelay</STRONG>, <STRONG>intrflush</STRONG>, <STRONG>meta</STRONG>, <STRONG>nl</STRONG>, <STRONG>nonl</STRONG>, <STRONG>nodelay</STRONG>, <STRONG>notimeout</STRONG>,
        <STRONG>noqiflush</STRONG>, <STRONG>qiflush</STRONG>, <STRONG>timeout</STRONG>, and <STRONG>wtimeout</STRONG> may be implemented as macros.
 
-       <STRONG>noraw</STRONG> and <STRONG>nocbreak</STRONG> follow historical practice in that they  attempt  to
-       restore  the  terminal's  canonical ("cooked") line discipline from raw
-       and cbreak, respectively.  Mixing <STRONG>raw</STRONG>/<STRONG>noraw</STRONG> calls with  <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
-       calls  leads to terminal driver control states that are hard to predict
+       <STRONG>noraw</STRONG>  and  <STRONG>nocbreak</STRONG> follow historical practice in that they attempt to
+       restore the terminal's canonical ("cooked") line  discipline  from  raw
+       and  cbreak, respectively.  Mixing <STRONG>raw</STRONG>/<STRONG>noraw</STRONG> calls with <STRONG>cbreak</STRONG>/<STRONG>nocbreak</STRONG>
+       calls leads to terminal driver control states that are hard to  predict
        or understand; doing so is not recommended.
 
+       <EM>curses</EM>  documentation  uses  the  terms "delay" and "timeout" freely to
+       describe two related but distinct aspects of  input  handling,  at  the
+       risk   of  confusing  the  user.   The  functions  <STRONG>halfdelay</STRONG>,  <STRONG>nodelay</STRONG>,
+       <STRONG>notimeout</STRONG>, <STRONG>timeout</STRONG>,  and  <STRONG>wtimeout</STRONG>  all  configure  whether  the  input
+       character   reading  function  (<STRONG><A HREF="curs_getch.3x.html">getch(3x)</A></STRONG>  or  <STRONG><A HREF="curs_get_wch.3x.html">get_wch(3x)</A></STRONG>)  waits  for
+       keyboard input, and for how long.  Only <STRONG>keypad</STRONG> configures whether  that
+       function  waits  for  further  input if the first character it reads is
+       ESC.  X/Open Curses affords no means of configuring the length of  this
+       second  delay, but an AIX and <EM>ncurses</EM> extension, <STRONG>ESCDELAY</STRONG>, is available
+       both as an environment variable and  a  global  symbol  permitting  the
+       application to do so; see <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> and <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>.
+
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <EM>ncurses</EM> provides four "is_" functions corresponding  to  <STRONG>cbreak</STRONG>,  <STRONG>echo</STRONG>,
+       <EM>ncurses</EM>  provides  four  "is_" functions corresponding to <STRONG>cbreak</STRONG>, <STRONG>echo</STRONG>,
        <STRONG>nl</STRONG>, and <STRONG>raw</STRONG>, permitting their states to be queried by the application.
 
                             <STRONG>Query</STRONG>       <STRONG>Set</STRONG>      <STRONG>Reset</STRONG>
@@ -300,7 +313,7 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
        <STRONG>0</STRONG>    if the option is unset, or
 
-       <STRONG>-1</STRONG>   if  the  library's  <EM>TERMINAL</EM> structure for the device has not been
+       <STRONG>-1</STRONG>   if the library's <EM>TERMINAL</EM> structure for the device  has  not  been
             initialized.
 
 
@@ -308,52 +321,52 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        Applications employing <EM>ncurses</EM> extensions should condition their use on
        the visibility of the <STRONG>NCURSES_VERSION</STRONG> preprocessor macro.
 
-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
        describes these functions.  It specifies no error conditions for them.
 
-       SVr4 describes a successful return value  only  as  "an  integer  value
+       SVr4  describes  a  successful  return  value only as "an integer value
        other than <EM>ERR</EM>".
 
-       <EM>ncurses</EM>  follows  X/Open Curses and the historical practice of System V
-       <EM>curses</EM>, clearing the terminal driver's "echo"  flag  when  initializing
-       the  screen.  BSD <EM>curses</EM> did not, but its <EM>raw</EM> function turned it off as
-       a side effect.  For best portability, call <STRONG>echo</STRONG>  or  <STRONG>noecho</STRONG>  explicitly
-       just  after initialization, even if your program retains the terminal's
+       <EM>ncurses</EM> follows X/Open Curses and the historical practice  of  System V
+       <EM>curses</EM>,  clearing  the  terminal driver's "echo" flag when initializing
+       the screen.  BSD <EM>curses</EM> did not, but its <EM>raw</EM> function turned it off  as
+       a  side  effect.   For best portability, call <EM>echo</EM> or <EM>noecho</EM> explicitly
+       just after initialization, even if your program retains the  terminal's
        canonical ("cooked") line discipline.
 
-       X/Open Curses is ambiguous regarding whether  <EM>raw</EM>  should  disable  the
-       carriage  return and line feed translation feature controlled by <EM>nl</EM> and
-       <EM>nonl</EM>.  BSD <EM>curses</EM> did turn off these translations; System V <EM>curses</EM>  did
-       not.   <EM>ncurses</EM>  does so, on the assumption that a programmer requesting
-       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
+       X/Open  Curses  is  ambiguous  regarding whether <EM>raw</EM> should disable the
+       carriage return and line feed translation feature controlled by <EM>nl</EM>  and
+       <EM>nonl</EM>.   BSD  <EM>curses</EM>  turned off these translations; System V <EM>curses</EM> did
+       not.  <EM>ncurses</EM> does so, on the assumption that a  programmer  requesting
+       raw  input  wants  a  clean  (ideally, 8-bit clean) connection that the
        operating system will not alter.
 
        When <STRONG>keypad</STRONG> is first enabled, <EM>ncurses</EM> loads the key definitions for the
-       current terminal description.  If  the  terminal  description  includes
-       extended  string  capabilities,  for example, by using the <STRONG>-x</STRONG> option of
+       current  terminal  type  description.   If  that  description  includes
+       extended string capabilities, for example, by using the  <STRONG>-x</STRONG>  option  of
        <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>, then <EM>ncurses</EM> also defines keys for the capabilities whose names
-       begin  with  "k".  Corresponding key codes are generated and (depending
-       on previous  loads  of  terminal  descriptions)  may  differ  from  one
-       execution  of  a  program  to  the  next.   The generated key codes are
+       begin with "k".  Corresponding key codes are generated  and  (depending
+       on  previous  loads  of  terminal  descriptions)  may  differ  from one
+       execution of a program to  the  next.   The  generated  key  codes  are
        recognized by <STRONG><A HREF="curs_util.3x.html">keyname(3x)</A></STRONG>, which then returns a name beginning with "k"
-       denoting  the <EM>terminfo</EM> capability name rather than "K", used for <EM>curses</EM>
+       denoting the <EM>terminfo</EM> capability name rather than "K", used for  <EM>curses</EM>
        key names.  On the other hand, an application can use <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> to
-       bind  a  specific  key  to  a  string of the programmer's choice.  This
-       feature  enables  an  application  to  check  for  its  presence   with
+       bind a specific key to a  string  of  the  programmer's  choice.   This
+       feature   enables  an  application  to  check  for  its  presence  with
        <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG>, and reassign the key code to match its own needs.
 
        Low-level applications can use <STRONG><A HREF="curs_terminfo.3x.html">tigetstr(3x)</A></STRONG> to obtain the definition of
-       any string capability.  <EM>curses</EM> applications  use  the  input  character
+       any  string  capability.   <EM>curses</EM>  applications use the input character
        reading function to obtain key codes from input and rely upon the order
-       in which the string capabilities are loaded.  Multiple  key  capability
-       strings  can  have  the  same  value,  but  the input character reading
-       function can report only one key  code.   Most  <EM>curses</EM>  implementations
-       (including  <EM>ncurses</EM>)  load  key definitions in the order they appear in
+       in  which  the string capabilities are loaded.  Multiple key capability
+       strings can have the  same  value,  but  the  input  character  reading
+       function  can  report  only  one key code.  Most <EM>curses</EM> implementations
+       (including <EM>ncurses</EM>) load key definitions in the order  they  appear  in
        the <STRONG>strfnames</STRONG> array of string capability names; see <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>.
-       The  last  capability read using a particular definition determines the
-       key code to be reported.  In  <EM>ncurses</EM>,  extended  capabilities  can  be
-       interpreted  as key definitions.  These are loaded after the predefined
-       keys, and if a capability's value is the same as  a  previously  loaded
+       The last capability read using a particular definition  determines  the
+       key  code  to  be  reported.   In <EM>ncurses</EM>, extended capabilities can be
+       interpreted as key definitions.  These are loaded after the  predefined
+       keys,  and  if  a capability's value is the same as a previously loaded
        key definition, the library uses the later definition.
 
 
@@ -364,31 +377,31 @@ <H1 class="no-header">curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        support it with <EM>cbreak</EM>, <EM>nocbreak</EM>, <EM>intrflush</EM>, <EM>keypad</EM>, <EM>meta</EM>, <EM>nodelay</EM>, and
        <EM>typeahead</EM>.
 
-       SVr3  (1987)  added  <EM>halfdelay</EM>,  <EM>notimeout</EM>,  and <EM>wtimeout</EM>.  <EM>qiflush</EM> and
-       <EM>noqiflush</EM> appeared in SVr3.1 (1987), at which point <EM>intrflush</EM> became  a
-       wrapper  for  either  of these functions, depending on the value of its
+       SVr3 (1987) added <EM>halfdelay</EM>,  <EM>notimeout</EM>,  and  <EM>wtimeout</EM>.   <EM>qiflush</EM>  and
+       <EM>noqiflush</EM>  appeared in SVr3.1 (1987), at which point <EM>intrflush</EM> became a
+       wrapper for either of these functions, depending on the  value  of  its
        Boolean argument.  SVr3.1 also added <EM>timeout</EM>.
 
        <EM>ncurses</EM> 6.5 (2024) introduced <EM>is</EM><STRONG>_</STRONG><EM>cbreak</EM>, <EM>is</EM><STRONG>_</STRONG><EM>echo</EM>, <EM>is</EM><STRONG>_</STRONG><EM>nl</EM>, and <EM>is</EM><STRONG>_</STRONG><EM>raw</EM>.
 
-       Formerly, <EM>ncurses</EM> used  <EM>nl</EM>  and  <EM>nonl</EM>  to  control  the  conversion  of
-       newlines  to  carriage  return/line  feed  on  output as well as input.
-       X/Open Curses documents the use of  these  functions  only  for  input.
-       This  difference arose from converting the <EM>pcurses</EM> source (1986), which
-       used <STRONG>ioctl(2)</STRONG> calls and the <EM>sgttyb</EM> structure,  to  <EM>termios</EM>  (the  POSIX
-       terminal  API).   In  the former, both input and output were controlled
+       Formerly,  <EM>ncurses</EM>  used  <EM>nl</EM>  and  <EM>nonl</EM>  to  control  the conversion of
+       newlines to carriage return/line feed  on  output  as  well  as  input.
+       X/Open  Curses  documents  the  use  of these functions only for input.
+       This difference arose from converting the <EM>pcurses</EM> source (1986),  which
+       used  <STRONG>ioctl(2)</STRONG>  calls  and  the <EM>sgttyb</EM> structure, to <EM>termios</EM> (the POSIX
+       terminal API).  In the former, both input and  output  were  controlled
        via a single option "CRMOD", while the latter separates these features.
-       Because  that  conversion  interferes with output optimization, <EM>ncurses</EM>
+       Because that conversion interferes with  output  optimization,  <EM>ncurses</EM>
        6.2 (2020) amended <EM>nl</EM> and <EM>nonl</EM> to eliminate their effect on output.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,    <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,     <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,    <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,
        <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>, <STRONG>termios(3)</STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>
 
 
 
-ncurses 6.5                       2025-02-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index eb75037f0..d18443882 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp @
+  * @Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 
@@ -57,32 +57,38 @@ <H1 class="no-header">curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>int</STRONG> <STRONG>ins_wch(const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>wins_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvins_wch(int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>mvwins_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>mvwins_wch(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>y</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>x</EM><STRONG>,</STRONG>
+             <STRONG>const</STRONG> <STRONG>cchar_t</STRONG> <STRONG>*</STRONG> <EM>wch</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions insert the <EM>curses</EM> complex character <EM>wch</EM> at  the  cursor
-       in  the  specified window <EM>win</EM> (or <STRONG>stdscr</STRONG>).  The character previously at
-       the cursor and any to its  right  move  one  cell  to  the  right;  the
-       rightmost  character  on  the  line  is discarded.  The cursor does not
-       advance.
+       <STRONG>wins_wch</STRONG> inserts  the  <EM>curses</EM>  complex  character  <EM>wch</EM>  at  the  cursor
+       position in the window <EM>win</EM>.  The character previously at the cursor and
+       any to its right move one cell to the  right;  the  formerly  rightmost
+       character  on the line is discarded.  Unlike <STRONG><A HREF="curs_add_wch.3x.html">add_wch(3x)</A></STRONG>, <STRONG>wins_wch</STRONG> does
+       not advance the cursor.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes  the  variants  of  this
+       function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions taking a <EM>WINDOW</EM> pointer  argument  fail  if  <EM>win</EM>  is  a  null
-       pointer.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized, and
+
+       <STRONG>o</STRONG>   (for  functions  taking  a  <EM>WINDOW</EM>  pointer argument) <EM>win</EM> is a null
+           pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>ins_wch</STRONG>, <STRONG>mvins_wch</STRONG>, and <STRONG>mvwins_wch</STRONG> may be implemented as macros.
 
-       A terminal's <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is  not  necessarily
-       employed.
+       <EM>curses</EM>  does  not  necessarily  employ  the terminal's <STRONG>insert_character</STRONG>
+       (<STRONG>ich1</STRONG>) capability to achieve insertion.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
@@ -91,11 +97,11 @@ <H1 class="no-header">curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
-       System V  Interface  Definition  Version 4 of the same year specified a
-       function named <EM>winswch</EM> (and the usual  variants).   This  was  a  later
-       addition  to  SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4 (1989).  It
-       differed from X/Open's later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took  an  argument  of
+       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4 of the same  year  specified  a
+       function  named  <EM>winswch</EM>  (and  the  usual variants).  This was a later
+       addition to SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   It
+       differed  from  X/Open's  later <EM>wins</EM><STRONG>_</STRONG><EM>wch</EM> in that it took an argument of
        type <EM>chtype</EM> instead of <EM>cchar</EM><STRONG>_</STRONG><EM>t</EM>.
 
 
@@ -107,7 +113,7 @@ <H1 class="no-header">curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                  <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 6eac050c3..b8a8ae466 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
+  * @Id: curs_ins_wstr.3x,v 1.60 2025/03/01 21:30:14 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>                Library calls               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 
@@ -76,8 +76,8 @@ <H1 class="no-header">curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        be  lost.   <STRONG>wins_wstr</STRONG>  stops  inserting if it would have to wrap to the
        next line to write the next <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>wstr</EM>.  The cursor position  does
        not change (after moving to (<EM>y</EM>, <EM>x</EM>), if specified).  <STRONG>wins_nwstr</STRONG> does the
-       same, but inserts at most <EM>n</EM> characters, or as many as possible  (up  to
-       the  end  of  the  line)  if  <EM>n</EM> is negative.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the
+       same, but inserts at most <EM>n</EM> wide characters, or as many as possible (up
+       to  the  end  of the line) if <EM>n</EM> is negative.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the
        variants of these functions.
 
 
@@ -141,7 +141,7 @@ <H1 class="no-header">curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                 <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index fb3fc72c5..52fe70642 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp @
+  * @Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_insch 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_insch 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 
@@ -61,38 +61,44 @@ <H1 class="no-header">curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These functions insert the <EM>curses</EM> character <EM>ch</EM> at  the  cursor  in  the
-       specified  window  <EM>win</EM>  (or  <STRONG>stdscr</STRONG>).   The character previously at the
-       cursor and any to its right move one cell to the right;  the  rightmost
-       character on the line is discarded.  The cursor does not advance.
+       <STRONG>winsch</STRONG> inserts the <EM>curses</EM> character <EM>ch</EM> at the cursor  position  in  the
+       window  <EM>win</EM>.   The  character  previously  at the cursor and any to its
+       right move one cell to the right; the formerly rightmost  character  on
+       the  line  is discarded.  Unlike <STRONG><A HREF="curs_addch.3x.html">addch(3x)</A></STRONG>, <STRONG>winsch</STRONG> does not advance the
+       cursor.  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the variants of this function.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
-       Functions  taking  a  <EM>WINDOW</EM>  pointer  argument  fail  if <EM>win</EM> is a null
-       pointer.
+       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized, and
+
+       <STRONG>o</STRONG>   (for functions taking a <EM>WINDOW</EM> pointer  argument)  <EM>win</EM>  is  a  null
+           pointer.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        <STRONG>insch</STRONG>, <STRONG>mvinsch</STRONG>, and <STRONG>mvwinsch</STRONG> may be implemented as macros.
 
-       A  terminal's  <STRONG>insert_character</STRONG>  (<STRONG>ich1</STRONG>)  capability  is not necessarily
-       employed.
+       <EM>curses</EM> does not  necessarily  employ  the  terminal's  <STRONG>insert_character</STRONG>
+       (<STRONG>ich1</STRONG>) capability to achieve insertion.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-       X/Open Curses Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
        SVr4 describes a successful return value  only  as  "an  integer  value
        other than <EM>ERR</EM>".
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr2 (1984) introduced <EM>winsch</EM>.
+       SVr2 (1984) introduced these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -103,7 +109,7 @@ <H1 class="no-header">curs_insch 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                    <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index 40fa0d5fe..42b8ee58a 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp @
+  * @Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_instr 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_instr 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 
@@ -80,26 +80,29 @@ <H1 class="no-header">curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        These functions return the count of characters copied from <EM>win</EM> to  <EM>str</EM>,
        or <STRONG>ERR</STRONG> upon failure.
 
-       In <EM>ncurses</EM>, they return <STRONG>ERR</STRONG> if
+       In <EM>ncurses</EM>, these functions return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
-       <STRONG>o</STRONG>   <EM>str</EM> is <EM>NULL</EM>.
+       <STRONG>o</STRONG>   (for  functions  taking  a  <EM>WINDOW</EM>  pointer argument) <EM>win</EM> is a null
+           pointer, or
 
-       Functions  prefixed with "mv" first perform cursor movement and fail if
+       <STRONG>o</STRONG>   <EM>str</EM> is a null pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>winnstr</STRONG> may be implemented as macros.
 
-       Reading a line that overflows the array pointed to by <EM>str</EM>  with  <STRONG>instr</STRONG>,
-       <STRONG>winstr</STRONG>,  <STRONG>mvinstr</STRONG>, or <STRONG>mvwinstr</STRONG> causes undefined results.  Use of <STRONG>innstr</STRONG>,
+       Reading  a  line that overflows the array pointed to by <EM>str</EM> with <STRONG>instr</STRONG>,
+       <STRONG>winstr</STRONG>, <STRONG>mvinstr</STRONG>, or <STRONG>mvwinstr</STRONG> causes undefined results.  Use of  <STRONG>innstr</STRONG>,
        <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG> is recommended instead.
 
 
 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-       <STRONG>innstr</STRONG>, <STRONG>winnstr</STRONG>, <STRONG>mvinnstr</STRONG>, and <STRONG>mvwinnstr</STRONG>'s  acceptance  of  negative  <EM>n</EM>
+       <STRONG>innstr</STRONG>,  <STRONG>winnstr</STRONG>,  <STRONG>mvinnstr</STRONG>,  and  <STRONG>mvwinnstr</STRONG>'s acceptance of negative <EM>n</EM>
        values is an <EM>ncurses</EM> extension.
 
 
@@ -110,28 +113,27 @@ <H1 class="no-header">curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        X/Open Curses Issue 4 describes these functions.  It specifies no error
        conditions for them.
 
-       X/Open  Curses  Issues  4 and 7 both state that <STRONG>instr</STRONG>, <STRONG>winstr</STRONG>, <STRONG>mvinstr</STRONG>,
-       and <STRONG>mvwinstr</STRONG> return <STRONG>OK</STRONG> rather than a character count.  This  is  likely
+       X/Open Curses Issues 4 and 7 both state that  <EM>instr</EM>,  <EM>winstr</EM>,  <EM>mvinstr</EM>,
+       and  <EM>mvwinstr</EM>  return <EM>OK</EM> rather than a character count.  This is likely
        an erratum.
 
-       <STRONG>o</STRONG>   SVr3.1  and  SVr4  implemented  <STRONG>winstr</STRONG> as a wrapper around <STRONG>winnstr</STRONG>,
+       <STRONG>o</STRONG>   SVr3.1 and SVr4 implemented <EM>winstr</EM> as  a  wrapper  around  <EM>winnstr</EM>,
            returning the latter's return value.  X/Open Curses's specification
-           thus  may  have  been  an editorial solecism copied from System V's
-           documentation (see below) by X/Open,  rather  than  an  intentional
+           thus may have been an editorial  solecism  copied  from  System V's
+           documentation  (see  below)  by  X/Open, rather than an intentional
            change.
 
        <STRONG>o</STRONG>   <EM>ncurses</EM> retains compatibility with System V <EM>curses</EM> behavior.
 
-       SVr4  describes  a  successful  return  value only as "an integer value
+       SVr4 describes a successful return value  only  as  "an  integer  value
        other than <EM>ERR</EM>".
 
-       SVr4 does not document whether <EM>n</EM> counts the null terminator that  these
+       SVr4  does not document whether <EM>n</EM> counts the null terminator that these
        functions write to <EM>str</EM>.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       SVr3.1  (1987)  introduced these functions.  <EM>winstr</EM>, <EM>winnstr</EM>, and their
-       variants.
+       SVr3.1 (1987) introduced these functions.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -142,7 +144,7 @@ <H1 class="no-header">curs_instr 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                    <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 89ed50100..c83bc0c9b 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp @
+  * @Id: curs_inwstr.3x,v 1.60 2025/03/01 21:29:42 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 
@@ -79,27 +79,30 @@ <H1 class="no-header">curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        On  successful  operation,  these  functions  return  the count of wide
-       characters copied from <EM>win</EM> to <EM>wstr</EM>.   They  return  <STRONG>ERR</STRONG>  upon  failure.
-       <STRONG>innwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>,  and  <STRONG>mvwinnwstr</STRONG>  return  <STRONG>ERR</STRONG>  if  <EM>n</EM> is
-       insufficiently  large  to  store  a  complete  wide  character  string.
-       (Recall  that  a  <EM>curses</EM>  complex  character  can contain multiple wide
-       characters, some of which may be non-spacing.)
+       characters copied from <EM>win</EM> to <EM>wstr</EM>,  or  <STRONG>ERR</STRONG>  upon  failure.   <STRONG>innwstr</STRONG>,
+       <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>,  and <STRONG>mvwinnwstr</STRONG> return <STRONG>ERR</STRONG> if <EM>n</EM> is insufficiently
+       large to store a complete wide character string.  (Recall that a <EM>curses</EM>
+       complex  character  can contain multiple wide characters, some of which
+       may be non-spacing.)
 
        In <EM>ncurses</EM>, these functions return <STRONG>ERR</STRONG> if
 
-       <STRONG>o</STRONG>   <EM>win</EM> is <EM>NULL</EM> or
+       <STRONG>o</STRONG>   the <EM>curses</EM> screen has not been initialized,
 
-       <STRONG>o</STRONG>   <EM>wstr</EM> is <EM>NULL</EM>.
+       <STRONG>o</STRONG>   (for functions taking a <EM>WINDOW</EM> pointer  argument)  <EM>win</EM>  is  a  null
+           pointer, or
 
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       <STRONG>o</STRONG>   <EM>wstr</EM> is a null pointer.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (<EM>y</EM>, <EM>x</EM>) is outside the window boundaries.
 
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
        All of these functions except <STRONG>winnwstr</STRONG> may be implemented as macros.
 
-       Reading  a line that overflows the array pointed to by <EM>str</EM> with <STRONG>inwstr</STRONG>,
-       <STRONG>winwstr</STRONG>, <STRONG>mvinwstr</STRONG>, or  <STRONG>mvwinwstr</STRONG>  causes  undefined  results.   Use  of
+       Reading a line that overflows the array pointed to by <EM>wstr</EM> with <STRONG>inwstr</STRONG>,
+       <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  or  <STRONG>mvwinwstr</STRONG>  causes  undefined  results.  Use of
        <STRONG>innwstr</STRONG>, <STRONG>winnwstr</STRONG>, <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> is recommended instead.
 
 
@@ -115,27 +118,27 @@ <H1 class="no-header">curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        X/Open Curses Issue 4 describes these functions.  It specifies no error
        conditions for them.
 
-       Notwithstanding the foregoing, X/Open Curses Issues 4 and 7 both  state
-       that  <STRONG>innwstr</STRONG>,  <STRONG>winnwstr</STRONG>,  <STRONG>mvinnwstr</STRONG>, and <STRONG>mvwinnwstr</STRONG> "fail ... [i]f the
+       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
+       that <EM>innwstr</EM>, <EM>winnwstr</EM>, <EM>mvinnwstr</EM>, and <EM>mvwinnwstr</EM> "fail  ...  [i]f  the
        array  is  not  large  enough  to  contain  any  complete  characters".
-       Strictly  interpreted,  this  means  that  a  caller of these functions
+       Strictly interpreted, this means  that  a  caller  of  these  functions
        cannot use their return values to detect truncation of a wide-character
-       string  copied  from  more  than  one  character  cell in <EM>win</EM>.  <EM>ncurses</EM>
-       reports any truncation with <STRONG>ERR</STRONG>.
+       string copied from more  than  one  character  cell  in  <EM>win</EM>.   <EM>ncurses</EM>
+       reports any truncation with <EM>ERR</EM>.
 
-       X/Open Curses specifies <STRONG>inwstr</STRONG>, <STRONG>winwstr</STRONG>,  <STRONG>mvinwstr</STRONG>,  and  <STRONG>mvwinwstr</STRONG>  as
-       returning  <STRONG>OK</STRONG>  rather  than a (wide) character count, unlike their non-
-       wide  counterparts  <STRONG>instr</STRONG>,  <STRONG>winstr</STRONG>,  <STRONG>mvinstr</STRONG>,  and  <STRONG>mvwinstr</STRONG>.   <EM>ncurses</EM>
+       X/Open  Curses  specifies  <EM>inwstr</EM>,  <EM>winwstr</EM>, <EM>mvinwstr</EM>, and <EM>mvwinwstr</EM> as
+       returning <EM>OK</EM> rather than a (wide) character count,  unlike  their  non-
+       wide  counterparts  <EM>instr</EM>,  <EM>winstr</EM>,  <EM>mvinstr</EM>,  and  <EM>mvwinstr</EM>.   <EM>ncurses</EM>
        regards this inconsistency as an error in the standard.
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       The  System V Interface Definition, Version 4 (1995), specified <EM>winwstr</EM>
-       and <EM>winnwstr</EM> (and the usual variants).  These were later  additions  to
-       SVr4.<EM>x</EM>,  not  appearing  in  the  first  SVr4  (1989).   Their synopses
-       described each function as taking an argument of  type  pointer-to-<EM>char</EM>
-       instead  of  pointer-to-<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>,  despite describing them as "returning
-       the string of <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> in <EM>str</EM>".  Presumably this was  an  error  in  the
+       The System V Interface Definition, Version 4 (1995), specified  <EM>winwstr</EM>
+       and  <EM>winnwstr</EM>  (and the usual variants).  These were later additions to
+       SVr4.<EM>x</EM>, not  appearing  in  the  first  SVr4  (1989).   Their  synopses
+       described  each  function as taking an argument of type pointer-to-<EM>char</EM>
+       instead of pointer-to-<EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>, despite describing  them  as  "returning
+       the  string  of  <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM>  in <EM>str</EM>".  Presumably this was an error in the
        System V Interface Definition.
 
 
@@ -147,7 +150,7 @@ <H1 class="no-header">curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                   <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index cedae137e..2a56d7ff5 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp @
+  * @Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>                  Library calls                 <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 
@@ -154,27 +154,29 @@ <H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 
 </PRE><H3><a name="h3-ripoffline">ripoffline</a></H3><PRE>
        <STRONG>ripoffline</STRONG> provides access to the same facility that <STRONG><A HREF="curs_slk.3x.html">slk_init(3x)</A></STRONG>  uses
-       to  reduce  the  size  of the screen.  <STRONG>ripoffline</STRONG> must be called before
-       <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> is called, to prepare these initial actions:
+       to reduce the size of the screen.  The application must call <STRONG>ripoffline</STRONG>
+       before <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>  so  that  the  functions  prepare  a
+       <STRONG>stdscr</STRONG> of the correct size.
 
-       <STRONG>o</STRONG>   If <EM>line</EM> is positive, a line is removed from the top of <STRONG>stdscr</STRONG>.
+       <STRONG>o</STRONG>   If  <EM>line</EM>  is  positive,  <STRONG>ripoffline</STRONG>  removes a line from the top of
+           <STRONG>stdscr</STRONG>.
 
-       <STRONG>o</STRONG>   if <EM>line</EM> is negative, a line is removed from the bottom.
+       <STRONG>o</STRONG>   If <EM>line</EM> is negative, <STRONG>ripoffline</STRONG> removes a line from the  bottom  of
+           <STRONG>stdscr</STRONG>.
 
-       When the resulting initialization is done inside <STRONG>initscr</STRONG>,  the  routine
-       <STRONG>init</STRONG> (supplied by the user) is called with two arguments:
+       When <STRONG>initscr</STRONG> initializes <EM>curses</EM>, it calls the <EM>init</EM> function supplied to
+       <STRONG>ripoffline</STRONG> by the application with two arguments:
 
-       <STRONG>o</STRONG>   a window pointer to the one-line window that has been allocated and
+       <STRONG>o</STRONG>   a pointer to the one-line <EM>WINDOW</EM> that it allocates, and
 
        <STRONG>o</STRONG>   an integer with the number of columns in the window.
 
-       Inside  this  initialization  routine,  the integer variables <STRONG>LINES</STRONG> and
-       <STRONG>COLS</STRONG> (defined in <STRONG>&lt;curses.h&gt;</STRONG>) are not  guaranteed  to  be  accurate  and
-       <STRONG>wrefresh</STRONG>  or  <STRONG>doupdate</STRONG>  must  not  be  called.  It is allowable to call
-       <STRONG>wnoutrefresh</STRONG> during the initialization routine.
+       Inside this <EM>init</EM> function, the values of the  integer  variables  <STRONG>LINES</STRONG>
+       and <STRONG>COLS</STRONG> (see <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>) are not guaranteed to be reliable; it
+       must not call <STRONG><A HREF="curs_refresh.3x.html">wrefresh(3x)</A></STRONG> or <STRONG><A HREF="curs_refresh.3x.html">doupdate(3x)</A></STRONG>.  A <STRONG><A HREF="curs_refresh.3x.html">wnoutrefresh(3x)</A></STRONG> call is
+       permissible.
 
-       <STRONG>ripoffline</STRONG> can be called up to five times  before  calling  <STRONG>initscr</STRONG>  or
-       <STRONG>newterm</STRONG>.
+       <STRONG>ripoffline</STRONG> can be called up to five times before <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -235,11 +237,11 @@ <H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
        The  System V  Interface Definition, Version 4 (1995), specified all of
        these functions except <EM>curs</EM><STRONG>_</STRONG><EM>set</EM> as returning <EM>OK</EM>.
 
-       Older SVr4 man pages  warn  that  the  return  value  of  <STRONG>curs_set</STRONG>  "is
+       Older SVr4 man pages  warn  that  the  return  value  of  <EM>curs</EM><STRONG>_</STRONG><EM>set</EM>  "is
        currently  incorrect".  This implementation gets it right, but counting
        on its correctness anywhere else may be unwise.
 
-       X/Open Curses specifies <EM>ripoffline</EM> as returning <STRONG>OK</STRONG> with no  possibility
+       X/Open Curses specifies <EM>ripoffline</EM> as returning <EM>OK</EM> with no  possibility
        of  failure  ("[c]alls to <EM>ripoffline</EM> above this limit [five lines] have
        no effect but report success").
 
@@ -250,7 +252,7 @@ <H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
               An application  should  touch  and  refresh  the  window  before
               resuming conventional use of Curses.
 
-       Both  <EM>ncurses</EM>  and  SVr4 <EM>curses</EM> implement <STRONG>mvcur</STRONG> using the <EM>SCREEN</EM> object
+       Both  <EM>ncurses</EM>  and  SVr4 <EM>curses</EM> implement <EM>mvcur</EM> using the <EM>SCREEN</EM> object
        allocated in either <STRONG><A HREF="curs_initscr.3x.html">initscr(3x)</A></STRONG> or <STRONG><A HREF="curs_initscr.3x.html">newterm(3x)</A></STRONG>.  X/Open  Curses  states
        that  the old location must be given for <EM>mvcur</EM> to accommodate terminals
        that lack absolute cursor positioning.
@@ -265,7 +267,7 @@ <H1 class="no-header">curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-15                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 0ab17f551..09d1bac53 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp @
+  * @Id: curs_mouse.3x,v 1.123 2025/03/01 21:33:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>                   Library calls                  <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 
@@ -117,7 +117,7 @@ <H1 class="no-header">curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</H1>
            of the specified mouse events can be reported.
 
            If the screen is not initialized, or the  terminal  interface  does
-           report mouse events, <STRONG>mousemask</STRONG> returns 0.
+           not report mouse events, <STRONG>mousemask</STRONG> returns 0.
 
        <STRONG>o</STRONG>   If  <EM>old-mask</EM>  is  not a null pointer, <STRONG>mousemask</STRONG> stores the previous
            value of the screen's mouse event mask there.
@@ -381,23 +381,24 @@ <H1 class="no-header">curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-BUGS">BUGS</a></H2><PRE>
-       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in canonical mode if they  have
-       been  enabled  by  <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report sequence
-       appears in the string read.
+       Mouse events from <EM>xterm</EM> are <EM>not</EM> ignored in canonical ("cooked") mode if
+       they  have  been enabled by <STRONG>mousemask</STRONG>.  Instead, the <EM>xterm</EM> mouse report
+       sequence appears in the string read.
 
        An <EM>ncurses</EM> window must enable <STRONG><A HREF="curs_inopts.3x.html">keypad(3x)</A></STRONG>  to  correctly  receive  mouse
        event  reports  from  <EM>xterm</EM>  since they are encoded like function keys.
        Set the terminal's <EM>terminfo</EM> capability <STRONG>key_mouse</STRONG> (<STRONG>kmous</STRONG>) to "\E[M" (the
        beginning  of  the response from <EM>xterm</EM> for mouse clicks).  Other values
-       of <STRONG>key_mouse</STRONG> are permitted under the  same  assumption,  that  is,  the
-       report begins with that sequence.
+       of <STRONG>key_mouse</STRONG> are permitted under the same  assumption  --  that  is,  a
+       mouse  report  begins  with  the  value of the <STRONG>key_mouse</STRONG> (<STRONG>kmous</STRONG>) string
+       capability.
 
        Because there are no standard response sequences that serve to identify
-       terminals supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that  if
-       <STRONG>key_mouse</STRONG>  (<STRONG>kmous</STRONG>)  is  defined  in the terminal description, or if the
-       terminal type's primary name or aliases  contain  the  string  "xterm",
+       terminals  supporting the <EM>xterm</EM> mouse protocol, <EM>ncurses</EM> assumes that if
+       <STRONG>key_mouse</STRONG> (<STRONG>kmous</STRONG>) is defined in the terminal  description,  or  if  the
+       terminal  type's  primary  name  or aliases contain the string "xterm",
        then the terminal may send mouse events.  <EM>ncurses</EM> checks the <STRONG>kmous</STRONG> cap-
-       code first, allowing use of newer <EM>xterm</EM> mouse protocols,  such  as  its
+       code  first,  allowing  use of newer <EM>xterm</EM> mouse protocols, such as its
        private mode 1006.
 
 
@@ -407,7 +408,7 @@ <H1 class="no-header">curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-15                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                    <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index 1eccdaa52..40cbe9b56 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp @
+  * @Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_move 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_move 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_move 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_move 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>                    Library calls                   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 
@@ -61,8 +61,8 @@ <H1 class="no-header">curs_move 3x 2025-02-01 ncurses 6.5 Library calls</H1>
        <STRONG>wmove</STRONG>  relocates  the  cursor  associated with the <EM>curses</EM> window <EM>win</EM> to
        line <EM>y</EM> and column  <EM>x</EM>.   The  terminal's  cursor  does  not  move  until
        <STRONG><A HREF="curs_refresh.3x.html">refresh(3x)</A></STRONG>  is  called.   The position (<EM>y</EM>, <EM>x</EM>) is relative to the upper
-       left-hand  corner  of  the  window,  which  has   coordinates   (0, 0).
-       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> describes the <STRONG>move</STRONG> variant of this function.
+       left-hand corner of the window, which  has  coordinates  (0, 0).   <STRONG>move</STRONG>
+       similarly moves the cursor in the <STRONG>stdscr</STRONG> window.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
@@ -86,7 +86,7 @@ <H1 class="no-header">curs_move 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 </PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
-       4BSD (1980) introduced these functions.
+       4BSD (1980) introduced <EM>move</EM> and <EM>wmove</EM>.
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
@@ -94,7 +94,7 @@ <H1 class="no-header">curs_move 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                     <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 1d82af7fd..2024e988f 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp @
+  * @Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</TITLE>
+<TITLE>curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>                 Library calls                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 
@@ -54,56 +54,54 @@ <H1 class="no-header">curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
-       <STRONG>int</STRONG> <STRONG>clearok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>idcok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>idlok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>void</STRONG> <STRONG>immedok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>leaveok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>scrollok(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>clearok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>idcok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>idlok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>void</STRONG> <STRONG>immedok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>leaveok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>scrollok(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
 
        <STRONG>int</STRONG> <STRONG>setscrreg(int</STRONG> <EM>top</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bot</EM><STRONG>);</STRONG>
-       <STRONG>int</STRONG> <STRONG>wsetscrreg(WINDOW</STRONG> <STRONG>*</STRONG><EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>top</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bot</EM><STRONG>);</STRONG>
+       <STRONG>int</STRONG> <STRONG>wsetscrreg(WINDOW</STRONG> <STRONG>*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>top</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bot</EM><STRONG>);</STRONG>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
-       These routines set options that  change  the  style  of  output  within
-       <STRONG>curses</STRONG>.   All options are initially <STRONG>FALSE</STRONG>, unless otherwise stated.  It
-       is not necessary to turn these options off before calling <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG>.
+       These functions configure properties  of  <EM>curses</EM>  windows  that  affect
+       their  manner of output.  Boolean-valued properties are initially <STRONG>FALSE</STRONG>
+       except where noted.  <STRONG><A HREF="curs_initscr.3x.html">endwin(3x)</A></STRONG> resets any terminal modes corresponding
+       to  these  properties;  an  application  need not restore their initial
+       values.
 
 
 </PRE><H3><a name="h3-clearok">clearok</a></H3><PRE>
-       If <STRONG>clearok</STRONG> is called with <STRONG>TRUE</STRONG> as argument, the next call  to  <STRONG>wrefresh</STRONG>
-       with this window will clear the screen completely and redraw the entire
-       screen from scratch.  This is useful when the contents  of  the  screen
-       are  uncertain, or in some cases for a more pleasing visual effect.  If
-       the <EM>win</EM> argument to <STRONG>clearok</STRONG> is the global  variable  <STRONG>curscr</STRONG>,  the  next
-       call  to  <STRONG>wrefresh</STRONG>  with any window causes the screen to be cleared and
-       repainted from scratch.
+       Setting <EM>win</EM>'s <STRONG>clearok</STRONG> property to <STRONG>TRUE</STRONG> causes the next <STRONG>wrefresh</STRONG> call on
+       it  to clear the terminal screen and redraw it entirely.  This property
+       is useful to restore  the  contents  of  the  screen  (perhaps  because
+       another  process  has  written  to  the  terminal), or in some cases to
+       achieve  a  more  pleasing  visual  effect.   If  <EM>win</EM>  is  <STRONG>curscr</STRONG>  (see
+       <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>),  the  next  <STRONG>wrefresh</STRONG> call on <EM>any</EM> window causes the
+       terminal screen to clear and redraw as  above.   <STRONG>wrefresh</STRONG>  resets  this
+       property to <STRONG>FALSE</STRONG>.
 
 
 </PRE><H3><a name="h3-idcok">idcok</a></H3><PRE>
-       If <STRONG>idcok</STRONG> is called with <STRONG>FALSE</STRONG> as  second  argument,  <STRONG>curses</STRONG>  no  longer
-       considers   using  the  hardware  insert/delete  character  feature  of
-       terminals so equipped.  Use of character insert/delete  is  enabled  by
-       default.   Calling <STRONG>idcok</STRONG> with <STRONG>TRUE</STRONG> as second argument re-enables use of
-       character insertion and deletion.
+       (This  property  defaults <STRONG>TRUE</STRONG>.)  Setting <EM>win</EM>'s <STRONG>idcok</STRONG> property to <STRONG>FALSE</STRONG>
+       prevents <EM>curses</EM> from using the insert/delete character capabilities  of
+       terminal types possessing them according to the <EM>terminfo</EM> database.
 
 
 </PRE><H3><a name="h3-idlok">idlok</a></H3><PRE>
-       If <STRONG>idlok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, <STRONG>curses</STRONG> considers using
-       the  hardware  insert/delete  line  feature  of  terminals so equipped.
-       Calling <STRONG>idlok</STRONG> with <STRONG>FALSE</STRONG>  as  second  argument  disables  use  of  line
-       insertion  and  deletion.   This  option  should be enabled only if the
-       application needs insert/delete line, for example, for a screen editor.
-       It  is  disabled  by  default  because  insert/delete  line tends to be
-       visually annoying when used in applications  where  it  is  not  really
-       needed.   If  insert/delete  line  cannot  be  used, <STRONG>curses</STRONG> redraws the
-       changed portions of all lines.
+       Setting  <EM>win</EM>'s  <STRONG>idlok</STRONG>  property to <STRONG>TRUE</STRONG> causes <EM>curses</EM> to consider using
+       the insert/delete line capabilities of terminal types  possessing  them
+       according  to  the  <EM>terminfo</EM>  database.   Enable  this  option  if  the
+       application explicitly requires these operations, as a full-screen text
+       editor  might;  otherwise  the  results may be visually annoying to the
+       user.
 
 
 </PRE><H3><a name="h3-immedok">immedok</a></H3><PRE>
        If <STRONG>immedok</STRONG> is called with <STRONG>TRUE</STRONG> as second argument, any  change  in  the
-       window  image,  such  as  the  ones caused by <STRONG>waddch,</STRONG> <STRONG>wclrtobot,</STRONG> <STRONG>wscrl</STRONG>,
+       window  image,  such  as  the  ones caused by <STRONG>waddch</STRONG>, <STRONG>wclrtobot</STRONG>, <STRONG>wscrl</STRONG>,
        etc., automatically causes a call to <STRONG>wrefresh</STRONG>.  However, it may degrade
        performance  considerably,  due to repeated calls to <STRONG>wrefresh</STRONG>.  Calling
        <STRONG>immedok</STRONG> with <STRONG>FALSE</STRONG> as second argument restores  the  default  behavior,
@@ -200,7 +198,7 @@ <H1 class="no-header">curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-02-01                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                  <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 1d27cf0e3..580a372e6 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp @
+  * @Id: infocmp.1m,v 1.126 2025/02/18 00:05:00 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>infocmp 1m 2025-02-15 ncurses 6.5 User commands</TITLE>
+<TITLE>infocmp 1m 2025-02-17 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">infocmp 1m 2025-02-15 ncurses 6.5 User commands</H1>
+<H1 class="no-header">infocmp 1m 2025-02-17 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>                      User commands                     <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 
@@ -62,12 +62,12 @@ <H1 class="no-header">infocmp 1m 2025-02-15 ncurses 6.5 User commands</H1>
        compiled entry in the <EM>terminfo</EM> database  in  a  variety  of  selectable
        formats,  compares such entries to each other, and rewrites an entry to
        replace  "<STRONG>use</STRONG>"  expressions  with  the  content  of  other  entries  by
-       reference.   A  <EM>terminfo</EM>  <EM>entry</EM>  entry  comprises a list of one or more
-       terminal type identifiers, a human-readable description of the terminal
-       type,  and  a  list  of  terminal  <EM>capabilities</EM>  that  characterize its
-       programming interface.  In all  cases,  the  program  reports  Boolean-
-       valued  capabilities  first, followed by numeric ones, and then string-
-       valued capabilities.
+       reference.   A  <EM>terminfo</EM> <EM>entry</EM> comprises a list of one or more terminal
+       type identifiers, a human-readable description of  the  terminal  type,
+       and  a  list of terminal <EM>capabilities</EM> that characterize its programming
+       interface.   In  all  cases,   the   program   reports   Boolean-valued
+       capabilities  first,  followed  by numeric ones, and then string-valued
+       capabilities.
 
 
 </PRE><H3><a name="h3-Default-Options">Default Options</a></H3><PRE>
@@ -531,7 +531,7 @@ <H1 class="no-header">infocmp 1m 2025-02-15 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2025-02-15                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
+ncurses 6.5                       2025-02-17                       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 2be5f42cb..7092be3ce 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp @
+  * @Id: ncurses.3x,v 1.245 2025/03/01 21:43:30 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>ncurses 3x 2025-01-18 ncurses 6.5 Library calls</TITLE>
+<TITLE>ncurses 3x 2025-03-01 ncurses 6.5 Library calls</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
+<H1 class="no-header">ncurses 3x 2025-03-01 ncurses 6.5 Library calls</H1>
 <PRE>
 <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>                      Library calls                     <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 
@@ -61,7 +61,7 @@ <H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        displays  with  output  optimized  to minimize screen updates.  <EM>ncurses</EM>
        replaces the <EM>curses</EM> libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes <EM>ncurses</EM> version 6.5 (patch 20250215).
+       document describes <EM>ncurses</EM> version 6.5 (patch 20250301).
 
        <EM>ncurses</EM> permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with <EM>windows</EM> and <EM>pads</EM>; acquisition of keyboard
@@ -181,7 +181,7 @@ <H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
        Many terminals support configuration of character cell  foreground  and
        background  colors  as  well  as  <EM>attributes</EM>, which cause characters to
        render in such modes as boldfaced, underlined,  or  in  reverse  video.
-       See <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
+       See <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG> and <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>.
 
        <EM>curses</EM>  predefines  constants for a small set of forms-drawing graphics
        corresponding to the DEC Alternate Character Set (ACS),  a  feature  of
@@ -1500,7 +1500,7 @@ <H1 class="no-header">ncurses 3x 2025-01-18 ncurses 6.5 Library calls</H1>
 
 
 
-ncurses 6.5                       2025-01-18                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
+ncurses 6.5                       2025-03-01                       <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 53e4fdbe2..cc97140e5 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -71,7 +71,7 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This document describes <EM>ncurses</EM> version 6.5 (patch 20250215).
+       This document describes <EM>ncurses</EM> version 6.5 (patch 20250301).
 
 
 </PRE><H3><a name="h3-terminfo-Entry-Syntax"><EM>terminfo</EM> Entry Syntax</a></H3><PRE>
@@ -1673,9 +1673,9 @@ <H1 class="no-header">terminfo 5 2024-05-11 ncurses 6.5 File formats</H1>
        works.
 
        Finally, you can specify <STRONG>dch1</STRONG> to delete a single  character,  <STRONG>dch</STRONG>  with
-       one parameter, <EM>n</EM>, to delete <EM>n</EM>characters, and delete mode by giving <STRONG>smdc</STRONG>
-       and <STRONG>rmdc</STRONG> to enter and exit delete mode (any mode the terminal needs  to
-       be placed in for <STRONG>dch1</STRONG> to work).
+       one  parameter,  <EM>n</EM>,  to  delete <EM>n</EM> characters, and delete mode by giving
+       <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit delete  mode  (any  mode  the  terminal
+       needs to be placed in for <STRONG>dch1</STRONG> to work).
 
        A  command  to  erase  <EM>n</EM>  characters (equivalent to outputting <EM>n</EM> blanks
        without moving the cursor) can be given as <STRONG>ech</STRONG> with one parameter.
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index f4491b840..83fad03cf 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp @
+  * @Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp @
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <meta name="generator" content="Manpage converted by man2html - see https://invisible-island.net/scripts/readme.html#others_scripts">
-<TITLE>tput 1 2025-02-15 ncurses 6.5 User commands</TITLE>
+<TITLE>tput 1 2025-03-01 ncurses 6.5 User commands</TITLE>
 <link rel="author" href="mailto:bug-ncurses@gnu.org">
 
 </HEAD>
 <BODY>
-<H1 class="no-header">tput 1 2025-02-15 ncurses 6.5 User commands</H1>
+<H1 class="no-header">tput 1 2025-03-01 ncurses 6.5 User commands</H1>
 <PRE>
 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>                          User commands                         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 
@@ -76,7 +76,7 @@ <H1 class="no-header">tput 1 2025-02-15 ncurses 6.5 User commands</H1>
        <EM>code</EM>.
 
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> discusses terminal capabilities at length  and  presents  a
-       complete list of <EM>cap-codes</EM>.
+       complete list of standard <EM>cap-codes</EM>.
 
        When   retrieving  capability  values,  the  result  depends  upon  the
        capability's type.
@@ -445,17 +445,15 @@ <H1 class="no-header">tput 1 2025-02-15 ncurses 6.5 User commands</H1>
        <STRONG>o</STRONG>   SVr4 (1989) added color initialization  by  using  the  <STRONG>orig_colors</STRONG>
            (<STRONG>oc</STRONG>) and <STRONG>orig_pair</STRONG> (<STRONG>op</STRONG>) capabilities in its <STRONG>init</STRONG> logic.
 
-       Keith  Bostic  refactored BSD <EM>tput</EM> for shipment in 4.3BSD-Tahoe (1988),
-       then replaced it the next year  with  a  new  implementation  based  on
-       System V  <EM>tput</EM>.   Bostic's  version  similarly accepted some parameters
-       named for <EM>terminfo</EM> (pseudo-)capabilities: <STRONG>clear</STRONG>,  <STRONG>init</STRONG>,  <STRONG>longname</STRONG>,  and
-       <STRONG>reset</STRONG>.   However,  because  he  had only <EM>termcap</EM> available, it accepted
-       <EM>termcap</EM> codes for other capabilities.  Also, Bostic's BSD <EM>tput</EM> did  not
-       modify the terminal modes as the earlier BSD <EM>tset</EM> had done.
-
-       At  the  same time, Bostic added a shell script named "clear" that used
-       <EM>tput</EM> to clear the screen.  Both of these appeared in  4.4BSD,  becoming
-       the "modern" BSD implementation of <EM>tput</EM>.
+       Keith  Bostic  refactored  BSD <EM>tput</EM> for shipment in 4.3BSD-Reno (1990),
+       making it follow the interface  of  System V  <EM>tput</EM>  by  accepting  some
+       parameters  named  for  <EM>terminfo</EM>  (pseudo-)capabilities:  <STRONG>clear</STRONG>,  <STRONG>init</STRONG>,
+       <STRONG>longname</STRONG>, and <STRONG>reset</STRONG>.  However, because he had only  <EM>termcap</EM>  available,
+       it  accepted  <EM>termcap</EM> codes for other capabilities.  Also, Bostic's BSD
+       <EM>tput</EM> did not modify the terminal modes as  the  earlier  BSD  <EM>tset</EM>  had
+       done.  At the same time, Bostic added a shell script named "clear" that
+       used  <EM>tput</EM>  to  clear  the  screen.   These  became  the  "modern"  BSD
+       implementation of <EM>tput</EM>.
 
        The  origin of <EM>ncurses</EM> <STRONG>tput</STRONG> lies outside both System V and BSD, in Ross
        Ridge's <EM>mytinfo</EM> package, published  on  <EM>comp.sources.unix</EM>  in  December
@@ -564,7 +562,7 @@ <H1 class="no-header">tput 1 2025-02-15 ncurses 6.5 User commands</H1>
 
 
 
-ncurses 6.5                       2025-02-15                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
+ncurses 6.5                       2025-03-01                           <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>
 </PRE>
 <div class="nav">
 <ul>
diff --git a/include/curses.h.in b/include/curses.h.in
index 8547ec3aa..e07153a80 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -33,7 +33,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.288 2024/12/29 00:53:27 tom Exp $ */
+/* $Id: curses.h.in,v 1.290 2025/02/23 01:33:32 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -109,7 +109,7 @@
  * User-definable tweak to disable the include of <stdbool.h>.
  */
 #ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
+#define NCURSES_ENABLE_STDBOOL_H @USE_STDBOOL_H@
 #endif
 
 /*
@@ -296,7 +296,7 @@ typedef @cf_cv_type_of_bool@ NCURSES_BOOL;
 #include <stdbool.h>
 /* use whatever the C compiler decides bool really is */
 #define NCURSES_BOOL bool
-#elif !defined(__cplusplus) && !@cf_cv_cc_bool_type@
+#elif !defined(__cplusplus) && !@USE_BUILTIN_BOOL@
 /* there is no predefined bool - use our own */
 #undef bool
 #define bool NCURSES_BOOL
diff --git a/include/nc_alloc.h b/include/nc_alloc.h
index cfea2beb6..1fd54095e 100644
--- a/include/nc_alloc.h
+++ b/include/nc_alloc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2025 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: nc_alloc.h,v 1.30 2021/11/20 23:33:38 tom Exp $ */
+/* $Id: nc_alloc.h,v 1.36 2025/03/01 15:02:06 tom Exp $ */
 
 #ifndef NC_ALLOC_included
 #define NC_ALLOC_included 1
@@ -118,6 +118,27 @@ extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void);
 #define typeCalloc(type,elts) (type *)calloc((size_t)(elts),sizeof(type))
 #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (size_t)(elts)*sizeof(type))
 
+/* provide for using VLAs if supported, otherwise assume alloca() */
+
+#ifndef __STDC_VERSION__
+#define __STDC_VERSION__ 0
+#endif
+
+#ifndef __STDC_NO_VLA__
+#define __STDC_NO_VLA__ 1
+#endif
+
+#if __STDC_VERSION__ >= 19901L && (__STDC_VERSION__ < 201000L || !__STDC_NO_VLA__)
+#define MakeArray(name,type,count) type name[count]
+#else
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#elif HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#define MakeArray(name,type,count) type *name = (type*) alloca(sizeof(type) * (size_t) (count))
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/nc_win32.h b/include/nc_win32.h
index d2668c355..4ae8b58af 100644
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.14 2024/10/19 21:06:23 tom Exp $ */
+/* $Id: nc_win32.h,v 1.15 2025/03/01 13:13:33 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
@@ -176,8 +176,6 @@ typedef struct {
 extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE;
 #define WINCONSOLE _nc_CONSOLE
 
-#define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count))
-
 #endif /* EVENTLIST_2nd */
 
 #ifdef __cplusplus
diff --git a/include/ncurses_defs b/include/ncurses_defs
index 804cc93fa..64565c8f4 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,6 +1,6 @@
-# $Id: ncurses_defs,v 1.113 2024/12/14 21:20:43 tom Exp $
+# $Id: ncurses_defs,v 1.116 2025/03/01 15:06:22 tom Exp $
 ##############################################################################
-# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
 # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -42,6 +42,7 @@ DECL_ERRNO
 ETIP_NEEDS_MATH_H
 GCC_NORETURN	/* nothing */
 GCC_UNUSED	/* nothing */
+HAVE_ALLOCA_H
 HAVE_ALLOC_PAIR
 HAVE_ASSUME_DEFAULT_COLORS
 HAVE_BIG_CORE
@@ -112,6 +113,7 @@ HAVE_LINK
 HAVE_LOCALECONV
 HAVE_LOCALE_H
 HAVE_LONG_FILE_NAMES
+HAVE_MALLOC_H
 HAVE_MATH_FUNCS
 HAVE_MATH_H
 HAVE_MBLEN
@@ -275,6 +277,7 @@ USE_REENTRANT
 USE_SAFE_SPRINTF
 USE_SCROLL_HINTS
 USE_SIGWINCH
+USE_STDBOOL_H
 USE_STRING_HACKS
 USE_SYMLINKS
 USE_SYSMOUSE
diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 6ea455d54..a7335dfdb 100755
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: MKterminfo.sh,v 1.21 2025/02/20 00:14:25 tom Exp $
+# $Id: MKterminfo.sh,v 1.22 2025/03/01 21:10:01 Branden.Robinson Exp $
 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
@@ -76,9 +76,6 @@ trap 'code=$?; rm -f $sorted $temp $unsorted; exit $code' EXIT HUP INT QUIT TERM
 rm -f $sorted $temp $unsorted
 
 cat $caps | sed -n "\
-/^#%.TS/i.na
-/^#%.TE/a\
-.ad
 /%%-STOP-HERE-%%/q
 /^#%center/s, expand,,
 /^#%lw25/s, lw6 , lw7 ,
@@ -87,6 +84,7 @@ cat $caps | sed -n "\
 s/[	][	]*/	/g
 s/$/T}/
 s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{\\
+.ad l\
 /
 s/	bool	/	/p
 s/	num	/	/p
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 0460693e8..2d59d7f61 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp $
-.TH curs_add_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp $
+.TH curs_add_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,14 +57,14 @@ add a \fIcurses\fR complex character to a window, possibly advancing the cursor
 .nf
 \fB#include <curses.h>
 .PP
-\fBint add_wch(const cchar_t *\fIwch\fP);
-\fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
-\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
-\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP,
-      const cchar_t *\fIwch\fP);
+\fBint add_wch(const cchar_t * \fIwch\fP);
+\fBint wadd_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
+\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
+\fBint mvwadd_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const cchar_t * \fIwch\fP);
 .PP
-\fBint echo_wchar(const cchar_t *\fIwch\fP);
-\fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+\fBint echo_wchar(const cchar_t * \fIwch\fP);
+\fBint wecho_wchar(WINDOW * \fIwin\fP, const cchar_t *\fIwch\fP);
 .PP
 \fI/* (integer) constants */\fP
 /*\fI .\|.\|. */ \fBWACS_BLOCK;\fR
@@ -177,15 +177,23 @@ are not written at the new cursor position but combine with the active
 complex character until another spacing character is written to the
 window or the cursor is moved.
 .PP
-If advancement occurs at the right margin,
-.bP
-the cursor automatically wraps to the beginning of the next line,
-then,
-.bP
-if it was at the bottom of the scrolling region,
-and if \fB\%scrollok\fP(3X) is enabled for
+If the cursor is not at the bottom of the scrolling region
+and advancement occurs at the right margin,
+the cursor automatically wraps to the beginning of the next line.
+.PP
+If the cursor is at the bottom of the scrolling region
+when advancement occurs at the right margin,
+and \fB\%scrollok\fP(3X) is enabled for
 .IR win ,
 the scrolling region scrolls up one line.
+Otherwise,
+advancement and scrolling do not occur,
+and
+.B \%waddch
+returns
+.BR ERR "."
+.\" Do we need to say something here about buggy terminals that might
+.\" scroll anyway?  xterm works fine...
 .PP
 If
 .I wch
@@ -270,8 +278,9 @@ The ACS default listed below is used if the
 .RB \%( acsc )
 .I \%term\%info
 capability does not define a terminal-specific replacement for it,
-or if the terminal and locale configuration requires Unicode to access
-these characters but the library is unable to use Unicode.
+or if the terminal type and locale configuration
+require Unicode to access these characters
+but the library is unable to use Unicode.
 The \*(``acsc char\*('' column corresponds to how the characters are
 specified in the
 .B \%acs_chars
@@ -470,10 +479,7 @@ on failure.
 .PP
 In
 .IR \%ncurses ,
-.B \%wadd_wch
-and
-.B \%wecho_wchar
-return
+they return
 .B ERR
 if
 .bP
@@ -491,7 +497,7 @@ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
 .I win
 (or
-.BR stdscr ","
+.BR \%stdscr ","
 as applicable)
 when writing to its bottom right location is attempted,
 or
@@ -512,14 +518,14 @@ and
 may be implemented as macros.
 .SH EXTENSIONS
 The symbols
-.RI \%( WACS_S3 ","
+.IR \%WACS_S3 ","
 .IR \%WACS_S7 ","
 .IR \%WACS_LEQUAL ","
 .IR \%WACS_GEQUAL ","
 .IR \%WACS_PI ","
 .IR \%WACS_NEQUAL ","
 and
-.IR \%WACS_STERLING ")"
+.I \%WACS_STERLING
 are not standard.
 However,
 many publicly available
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index ac62c648b..b0b305a07 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp $
-.TH curs_addch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp $
+.TH curs_addch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -64,12 +64,12 @@ add a \fIcurses\fP character to a window and advance the cursor
 \fB#include <curses.h>
 .PP
 \fBint addch(const chtype \fIch\fP);
-\fBint waddch(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+\fBint waddch(WINDOW * \fIwin\fP, const chtype \fIch\fP);
 \fBint mvaddch(int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
-\fBint mvwaddch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+\fBint mvwaddch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
 .PP
 \fBint echochar(const chtype \fIch\fP);
-\fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+\fBint wechochar(WINDOW * \fIwin\fP, const chtype \fIch\fP);
 .PP
 \fI/* (integer) constants */\fP
 /*\fI .\|.\|. */ \fBACS_BLOCK;\fR
@@ -130,15 +130,23 @@ how to manipulate its attributes and color pair.
 (A color pair selection is not honored unless initialized;
 see \fB\%start_color\fP(3X).)
 .PP
-If advancement occurs at the right margin,
-.bP
-the cursor automatically wraps to the beginning of the next line,
-then,
-.bP
-if it was at the bottom of the scrolling region,
-and if \fB\%scrollok\fP(3X) is enabled for
+If the cursor is not at the bottom of the scrolling region
+and advancement occurs at the right margin,
+the cursor automatically wraps to the beginning of the next line.
+.PP
+If the cursor is at the bottom of the scrolling region
+when advancement occurs at the right margin,
+and \fB\%scrollok\fP(3X) is enabled for
 .IR win ,
 the scrolling region scrolls up one line.
+Otherwise,
+advancement and scrolling do not occur,
+and
+.B \%waddch
+returns
+.BR ERR "."
+.\" Do we need to say something here about buggy terminals that might
+.\" scroll anyway?  xterm works fine...
 .PP
 If
 .I ch
@@ -229,8 +237,9 @@ The ACS default listed below is used if the
 .RB \%( acsc )
 .I \%term\%info
 capability does not define a terminal-specific replacement for it,
-or if the terminal and locale configuration requires Unicode to access
-these characters but the library is unable to use Unicode.
+or if the terminal type and locale configuration
+require Unicode to access these characters
+but the library is unable to use Unicode.
 The \*(``acsc char\*('' column corresponds to how the characters are
 specified in the
 .B \%acs_chars
@@ -292,10 +301,7 @@ on failure.
 .PP
 In
 .IR \%ncurses ,
-.B \%waddch
-and
-.B \%wechochar
-return
+they return
 .B ERR
 if
 .bP
@@ -313,7 +319,7 @@ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
 not been called on
 .I win
 (or
-.BR stdscr ","
+.BR \%stdscr ","
 as applicable)
 when a write to its bottom right location is attempted,
 or
@@ -346,14 +352,14 @@ and
 may be implemented as macros.
 .SH EXTENSIONS
 The symbols
-.RI \%( ACS_S3 ","
+.IR \%ACS_S3 ","
 .IR \%ACS_S7 ","
 .IR \%ACS_LEQUAL ","
 .IR \%ACS_GEQUAL ","
 .IR \%ACS_PI ","
 .IR \%ACS_NEQUAL ","
 and
-.IR \%ACS_STERLING ")"
+.I \%ACS_STERLING
 were not documented in any publicly released System\ V
 .\" And did not exist yet as late as SVr4.
 .\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 8367e4551..389c53464 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
-.TH curs_color 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp $
+.TH curs_color 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -306,12 +306,48 @@ Color pair \fB0\fP is assumed to be white on black,
 but is actually whatever the terminal implements before color is initialized.
 It cannot be modified by the application.
 .SS has_colors
-The \fB\%has_colors\fP routine requires no arguments.
-It returns \fBTRUE\fP if
-the terminal can manipulate colors; otherwise, it returns \fBFALSE\fP.
-This routine facilitates writing terminal-independent programs.
-For example, a programmer can use it to decide
-whether to use color or some other video attribute.
+.B \%has_colors
+returns
+.B TRUE
+if the terminal supports colors and
+.B FALSE
+if it does not.
+\fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) must be called first,
+but
+.B \%start_color
+need not be.
+An application might call
+.B \%has_colors
+to decide whether to use color
+or a video attribute like
+.B \%A_BOLD
+to render text.
+.PP
+Color support in
+.I curses
+requires that the terminal type description
+support the capabilities
+.B \%max_colors
+.RB \%( colors ),
+.B \%max_pairs
+.RB \%( pairs ),
+and any of
+.bP
+.B \%set_foreground
+.RB ( setf )
+and
+.B \%set_background
+.RB ( setb );
+.bP
+.B \%set_a_foreground
+.RB ( setaf )
+and
+.B \%set_a_background
+.RB ( setab );
+or
+.bP
+.B \%set_color_pair
+.RB ( scp ).
 .SS can_change_color
 The \fB\%can_change_color\fP routine requires no arguments.
 It returns \fBTRUE\fP if the terminal supports colors
@@ -511,7 +547,7 @@ inclusive,
 the default colors extension notwithstanding,
 or
 .bP
-color pairs identifiers outside the range
+color pair identifiers outside the range
 .RB \%0- COLOR_PAIRS \-1
 inclusive.
 .RE
@@ -549,7 +585,7 @@ and associated
 .B \%COLORS
 and
 .B \%COLOR_PAIRS
-values for each screen;
+values;
 .B \%start_color
 affects only the current screen.
 The SVr4 and X/Open Curses interface was not really designed
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 062a6b072..3318c4f7f 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp $
-.TH curs_getcchar 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getcchar.3x,v 1.57 2025/02/23 13:48:31 tom Exp $
+.TH curs_getcchar 3X 2025-02-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds ' \(aq
 .\}
@@ -49,9 +49,9 @@ convert between a wide-character string and a \fIcurses\fR complex character
 .nf
 \fB#include <curses.h>
 .PP
-\fBint gettchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
+\fBint getcchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
       attr_t * \fIattrs\fP, short * \fIpair\fP, void * \fIopts\fP);
-\fBint settchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
+\fBint setcchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
       const attr_t \fIattrs\fP, short \fIpair\fP, const void * \fIopts\fP);
 .fi
 .SH DESCRIPTION
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 941db2d86..c87440d9a 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp $
-.TH curs_initscr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp $
+.TH curs_initscr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -550,10 +550,10 @@ e.g.,
 \fB\%def_prog_mode\fP(3X).
 SVr4 uses the descriptor in
 .IR SCREEN "."
-.SS "Unset \fITERM\fP Variable"
+.SS "Unset \fITERM\fP Environment Variable"
 If the
 .I TERM
-variable is missing or empty,
+variable is not set in the environment or has an empty value,
 .I \%initscr
 uses the value \*(``unknown\*('',
 which normally corresponds to a terminal entry with the
@@ -563,7 +563,7 @@ capability.
 Generic entries are detected by \fB\%setupterm\fP(3X)
 and cannot be used for full-screen operation.
 Other implementations may handle
-a missing/empty
+a missing or empty
 .I TERM
 variable differently.
 .SS "Signal Handlers"
@@ -589,6 +589,24 @@ with respect to signals.\|.\|.
 Section \*(``NOTES\*('' above discusses
 .IR \%ncurses 's
 signal handlers.
+.SH HISTORY
+4BSD (1980)
+introduced
+.I \%initscr
+and
+.IR \%endwin "."
+.PP
+SVr2 (1984)
+added
+.I \%newterm
+and
+.IR \%set_term "."
+.PP
+SVr3.1 (1987)
+supplied
+.I \%delscreen
+and
+.IR \%isendwin "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_kernel\fP(3X),
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index a98fbdb7d..3006d8379 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp $
-.TH curs_inopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp $
+.TH curs_inopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -402,7 +402,7 @@ You may want to call
 in a signal handler if,
 after the handler exits,
 you want output to continue
-as though the interrupt had not occurred.
+as though the signal had not occurred.
 .\"
 .SS "raw, noraw"
 .B raw
@@ -467,10 +467,12 @@ on
 Normally,
 a
 .I curses
-library checks the terminal for input while updating the screen.
-If any is found,
-the update is postponed until the next \fB\%wrefresh\fP(3X) or
-\fB\%doupdate\fP(3X) call,
+library checks the terminal's input file descriptor for pending input
+with \fIpoll\fP(2) or \fI\%select\fP(2)
+while updating the screen;
+if it finds any,
+it postpones output
+until the next \fB\%wrefresh\fP(3X) or \fB\%doupdate\fP(3X) call,
 allowing faster response to user key strokes.
 The library tests the file descriptor corresponding to the
 .I FILE
@@ -588,6 +590,35 @@ calls with
 calls leads to terminal driver control states that are hard to predict
 or understand;
 doing so is not recommended.
+.PP
+.I curses
+documentation uses the terms \*(``delay\*('' and \*(``timeout\*(''
+freely to describe two related but distinct aspects of input handling,
+at the risk of confusing the user.
+The functions
+.BR \%halfdelay ","
+.BR \%nodelay ","
+.BR \%notimeout ","
+.BR \%timeout ","
+and
+.B \%wtimeout
+all configure whether the input character reading function
+\%(\fBgetch\fP(3X) or \fB\%get_wch\fP(3X))
+waits for keyboard input,
+and for how long.
+Only
+.B \%keypad
+configures whether that function waits for further input
+if the first character it reads is ESC.
+X/Open Curses affords no means of configuring
+the length of this second delay,
+but an AIX and
+.I \%ncurses
+extension,
+.BR \%ESCDELAY ,
+is available both as an environment variable and a global symbol
+permitting the application to do so;
+see \fB\%ncurses\fP(3X) and \fBcurs_variables\fP(3X).
 .SH EXTENSIONS
 .I \%ncurses
 provides four \*(``is_\*('' functions corresponding to
@@ -661,9 +692,9 @@ function turned it off as a side effect.
 .\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysv-pdp11_man/a_man/man7/termio.7
 For best portability,
 call
-.B echo
+.I echo
 or
-.B \%noecho
+.I \%noecho
 explicitly just after initialization,
 even if your program retains the terminal's canonical (\*(``cooked\*('')
 line discipline.
@@ -677,7 +708,7 @@ and
 .IR \%nonl "."
 BSD
 .I curses
-did turn off these translations;
+turned off these translations;
 System\ V
 .I curses
 did not.
@@ -692,8 +723,8 @@ When
 .B \%keypad
 is first enabled,
 .I \%ncurses
-loads the key definitions for the current terminal description.
-If the terminal description includes extended string capabilities,
+loads the key definitions for the current terminal type description.
+If that description includes extended string capabilities,
 for example,
 by using the
 .B \-x
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index e9be586f6..34f36bb49 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp $
-.TH curs_ins_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp $
+.TH curs_ins_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%ins_wch\fP,
 \fB\%wins_wch\fP,
@@ -52,27 +57,45 @@ insert a \fIcurses\fR complex character in a window
 \fBint ins_wch(const cchar_t * \fIwch\fP);
 \fBint wins_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
 \fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
-\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
+\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
+      const cchar_t * \fIwch\fP);
 .fi
 .SH DESCRIPTION
-These functions insert the
+.B \%wins_wch
+inserts the
 .I curses
 complex character
 .I wch
-at the cursor in the specified window
-.I win
-(or
-.BR \%stdscr ).
+at the cursor position in the window
+.IR win "."
 The character previously at the cursor and any to its right move one
 cell to the right;
-the rightmost character on the line is discarded.
-The cursor does not advance.
+the formerly rightmost character on the line is discarded.
+Unlike \fB\%add_wch\fP(3X),
+.B \%wins_wch
+does not advance the cursor.
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .SH "RETURN VALUE"
-These functions return \fBOK\fP on success and \fBERR\fP on failure.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-Functions taking a
+In
+.IR \%ncurses ,
+they return
+.B ERR
+if
+.bP
+the
+.I curses
+screen has not been initialized,
+and
+.bP
+(for functions taking a
 .I \%WINDOW
-pointer argument fail if
+pointer argument)
 .I win
 is a null pointer.
 .PP
@@ -82,17 +105,17 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-\fB\%ins_wch\fP,
-\fB\%mvins_wch\fP,
+.BR \%ins_wch ","
+.BR \%mvins_wch ","
 and
-\fB\%mvwins_wch\fP
+.B \%mvwins_wch
 may be implemented as macros.
 .PP
-A terminal's
+.I curses
+does not necessarily employ the terminal's
 .B \%insert_character
 .RB ( ich1 )
-capability
-is not necessarily employed.
+capability to achieve insertion.
 .SH PORTABILITY
 X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 299b0f4f2..14654cce3 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
-.TH curs_ins_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.60 2025/03/01 21:30:14 tom Exp $
+.TH curs_ins_wstr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -98,7 +98,7 @@ if specified).
 does the same,
 but inserts at most
 .I n
-characters,
+wide characters,
 or as many as possible
 (up to the end of the line)
 if
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index a44052859..025cd7b79 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp $
-.TH curs_insch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp $
+.TH curs_insch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -39,6 +39,11 @@
 .ie t .ds '' ''
 .el   .ds '' ""
 .\}
+.
+.de bP
+.ie n  .IP \(bu 4
+.el    .IP \(bu 2
+..
 .SH NAME
 \fB\%insch\fP,
 \fB\%winsch\fP,
@@ -55,18 +60,20 @@ insert a \fIcurses\fP character in a window
 \fBint mvwinsch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
 .fi
 .SH DESCRIPTION
-These functions insert the
+.B \%winsch
+inserts the
 .I curses
 character
 .I ch
-at the cursor in the specified window
-.I win
-(or
-.BR \%stdscr ).
+at the cursor position in the window
+.IR win "."
 The character previously at the cursor and any to its right move one
 cell to the right;
-the rightmost character on the line is discarded.
-The cursor does not advance.
+the formerly rightmost character on the line is discarded.
+Unlike \fB\%addch\fP(3X),
+.B \%winsch
+does not advance the cursor.
+\fB\%ncurses\fP(3X) describes the variants of this function.
 .SH "RETURN VALUE"
 These functions return
 .B OK
@@ -74,9 +81,20 @@ on success and
 .B ERR
 on failure.
 .PP
-Functions taking a
+In
+.IR \%ncurses ,
+they return
+.B ERR
+if
+.bP
+the
+.I curses
+screen has not been initialized,
+and
+.bP
+(for functions taking a
 .I \%WINDOW
-pointer argument fail if
+pointer argument)
 .I win
 is a null pointer.
 .PP
@@ -86,26 +104,26 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-.BR \%insch ,
-.BR \%mvinsch ,
+.BR \%insch ","
+.BR \%mvinsch ","
 and
 .B \%mvwinsch
 may be implemented as macros.
 .PP
-A terminal's
+.I curses
+does not necessarily employ the terminal's
 .B \%insert_character
 .RB ( ich1 )
-capability
-is not necessarily employed.
+capability to achieve insertion.
 .SH PORTABILITY
 X/Open Curses Issue\ 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 SVr4 describes a successful return value only as
 \*(``an integer value other than
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 509
 .SH HISTORY
-SVr2 (1984) introduced
-.IR \%winsch "."
+SVr2 (1984) introduced these functions.
 .SH "SEE ALSO"
 \fB\%curs_ins_wch\fP(3X) describes comparable functions in the
 wide-character
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 864f38f9a..d7dc67115 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp $
-.TH curs_instr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp $
+.TH curs_instr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -108,18 +108,23 @@ upon failure.
 .PP
 In
 .IR \%ncurses ","
-they return
+these functions return
 .B ERR
 if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
+(for functions taking a
+.I \%WINDOW
+pointer argument)
 .I win
-is
-.I NULL
+is a null pointer,
 or
 .bP
 .I str
-is
-.IR NULL "."
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -169,20 +174,20 @@ X/Open Curses Issue\ 4 describes these functions.
 It specifies no error conditions for them.
 .PP
 X/Open Curses Issues 4 and 7 both state that
-.BR \%instr ","
-.BR \%winstr ","
-.BR \%mvinstr ","
+.IR \%instr ","
+.IR \%winstr ","
+.IR \%mvinstr ","
 and
-.B \%mvwinstr
+.I \%mvwinstr
 return
-.B OK
+.I OK
 rather than a character count.
 This is likely an erratum.
 .bP
 SVr3.1 and SVr4 implemented
-.B \%winstr
+.I \%winstr
 as a wrapper around
-.BR \%winnstr ","
+.IR \%winnstr ","
 returning the latter's return value.
 X/Open Curses's specification thus may have been an editorial solecism
 copied from System\ V's documentation
@@ -207,9 +212,6 @@ counts the null terminator that these functions write to
 .SH HISTORY
 SVr3.1 (1987)
 introduced these functions.
-.IR winstr ","
-.IR winnstr ","
-and their variants.
 .SH SEE ALSO
 \fB\%curs_inwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 70b04e1ea..3a27f8b53 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp $
-.TH curs_inwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.60 2025/03/01 21:29:42 tom Exp $
+.TH curs_inwstr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -101,8 +101,8 @@ On successful operation,
 these functions return the count of wide characters copied from
 .I win
 to
-.IR wstr "."
-They return
+.IR wstr ","
+or
 .B ERR
 upon failure.
 .BR \%innwstr ","
@@ -126,14 +126,19 @@ these functions return
 .B ERR
 if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
+(for functions taking a
+.I \%WINDOW
+pointer argument)
 .I win
-is
-.I NULL
+is a null pointer,
 or
 .bP
 .I wstr
-is
-.IR NULL "."
+is a null pointer.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -146,7 +151,7 @@ All of these functions except
 may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
-.I str
+.I wstr
 with
 .BR \%inwstr ","
 .BR \%winwstr ","
@@ -184,11 +189,11 @@ It specifies no error conditions for them.
 .PP
 Notwithstanding the foregoing,
 X/Open Curses Issues 4 and 7 both state that
-.BR \%innwstr ","
-.BR \%winnwstr ","
-.BR \%mvinnwstr ","
+.IR \%innwstr ","
+.IR \%winnwstr ","
+.IR \%mvinnwstr ","
 and
-.B \%mvwinnwstr
+.I \%mvwinnwstr
 \*(``fail .\|.\|. [i]f the array is not large enough to contain any
 complete characters\*(''.
 Strictly interpreted,
@@ -198,23 +203,23 @@ than one character cell in
 .IR win "."
 .I \%ncurses
 reports any truncation with
-.BR ERR "."
+.IR ERR "."
 .PP
 X/Open Curses specifies
-.BR \%inwstr ","
-.BR \%winwstr ","
-.BR \%mvinwstr ","
+.IR \%inwstr ","
+.IR \%winwstr ","
+.IR \%mvinwstr ","
 and
-.B \%mvwinwstr
+.I \%mvwinwstr
 as returning
-.B OK
+.I OK
 rather than a (wide) character count,
 unlike their non-wide counterparts
-.BR \%instr ","
-.BR \%winstr ","
-.BR \%mvinstr ","
+.IR \%instr ","
+.IR \%winstr ","
+.IR \%mvinstr ","
 and
-.BR \%mvwinstr "."
+.IR \%mvwinstr "."
 .I \%ncurses
 regards this inconsistency as an error in the standard.
 .SH HISTORY
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index fe30482dd..0986ef3d6 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp $
-.TH curs_kernel 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp $
+.TH curs_kernel 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -232,29 +232,61 @@ it is capped at that value.
 .B \%ripoffline
 provides access to the same facility that \fB\%slk_init\fP(3X) uses to
 reduce the size of the screen.
-\fB\%ripoffline\fP must be called before \fBinitscr\fP or
-\fBnewterm\fP is called, to prepare these initial actions:
+The application must call
+.B \%ripoffline
+before \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
+so that the functions prepare a
+.B \%stdscr
+of the correct size.
 .bP
-If \fIline\fP is positive, a line is removed from the top of \fBstdscr\fP.
+If
+.I line
+is positive,
+.B \%ripoffline
+removes a line from the top of
+.BR \%stdscr "."
 .bP
-if \fIline\fP is negative, a line is removed from the bottom.
+If
+.I line
+is negative,
+.B \%ripoffline
+removes a line from the bottom of
+.BR \%stdscr "."
 .PP
-When the resulting initialization is done inside \fBinitscr\fP, the
-routine \fBinit\fP (supplied by the user) is called with two
-arguments:
+When
+.B \%initscr
+initializes
+.IR curses ","
+it calls the
+.I init
+function supplied to
+.B \%ripoffline
+by the application with two arguments:
 .bP
-a window pointer to the one-line window that has been
-allocated and
+a pointer to the one-line
+.I \%WINDOW
+that it allocates,
+and
 .bP
 an integer with the number of columns in the window.
 .PP
-Inside this initialization routine, the integer variables \fBLINES\fP
-and \fBCOLS\fP (defined in \fB<curses.h>\fP) are not guaranteed to be
-accurate and \fBwrefresh\fP or \fBdoupdate\fP must not be called.
-It is allowable to call \fBwnoutrefresh\fP during the initialization routine.
+Inside this
+.I init
+function,
+the values of the integer variables
+.B LINES
+and
+.B COLS
+(see \fB\%curs_variables\fP(3X))
+are not guaranteed to be reliable;
+it must not call \fB\%wrefresh\fP(3X) or \fB\%doupdate\fP(3X).
+A \fB\%wnoutrefresh\fP(3X) call is permissible.
 .PP
-\fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
-\fBnewterm\fP.
+.B \%ripoffline
+can be called up to five times before
+.B \%initscr
+or
+.BR \%newterm "."
 .SH RETURN VALUE
 Except for
 .BR \%curs_set ","
@@ -374,7 +406,7 @@ as returning
 .\" SVID 4, vol 3., p. 518
 .PP
 Older SVr4 man pages warn that the return value of
-.B \%curs_set
+.I \%curs_set
 \*(``is currently incorrect\*(''.
 This implementation gets it right,
 but counting on its correctness anywhere else may be unwise.
@@ -382,7 +414,7 @@ but counting on its correctness anywhere else may be unwise.
 X/Open Curses specifies
 .I \%ripoffline
 as returning
-.B OK
+.I OK
 with no possibility of failure
 (\*(``[c]alls to
 .I \%ripoffline
@@ -406,7 +438,7 @@ Both
 and SVr4
 .I curses
 implement
-.B \%mvcur
+.I \%mvcur
 using the
 .I SCREEN
 object allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 591ff2496..865db16a9 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp $
-.TH curs_mouse 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_mouse.3x,v 1.123 2025/03/01 21:33:30 tom Exp $
+.TH curs_mouse 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -149,7 +149,7 @@ The function returns an updated copy of
 indicating which of the specified mouse events can be reported.
 .IP
 If the screen is not initialized,
-or the terminal interface does report mouse events,
+or the terminal interface does not report mouse events,
 .B \%mousemask
 returns 0.
 .bP
@@ -661,7 +661,8 @@ Mouse events from
 .I \%xterm
 are
 .I not
-ignored in canonical mode if they have been enabled by
+ignored in canonical (\*(``cooked\*('') mode
+if they have been enabled by
 .BR \%mousemask "."
 Instead,
 the
@@ -685,9 +686,12 @@ to \*(``\eE[M\*(''
 for mouse clicks).
 Other values of
 .B \%key_mouse
-are permitted under the same assumption,
+are permitted under the same assumption \(em
 that is,
-the report begins with that sequence.
+a mouse report begins with the value of the
+.B \%key_mouse
+.RB ( \%kmous )
+string capability.
 .PP
 Because there are no standard response sequences that serve to identify
 terminals supporting the
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 28b4cd5b8..f21cae73e 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp $
-.TH curs_move 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp $
+.TH curs_move 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -67,9 +67,10 @@ The position
 is relative to the upper left-hand corner of the window,
 which has coordinates
 (0,\ 0).
-\fB\%ncurses\fP(3X) describes the
-.B \%move
-variant of this function.
+.B move
+similarly moves the cursor in the
+.B \%stdscr
+window.
 .SH RETURN VALUE
 These functions return
 .B OK
@@ -101,7 +102,10 @@ SVr4 describes a successful return value only as
 .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
 .SH HISTORY
 4BSD (1980)
-introduced these functions.
+introduced
+.I move
+and
+.IR \%wmove "."
 .SH SEE ALSO
 \fB\%curses\fP(3X),
 \fB\%curs_refresh\fP(3X)
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 92e4fa29e..f164d9017 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp $
-.TH curs_outopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp $
+.TH curs_outopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,101 +58,179 @@ set \fIcurses\fR output options
 .nf
 \fB#include <curses.h>
 .PP
-\fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP);
-\fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint clearok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBvoid idcok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint idlok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBvoid immedok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint leaveok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+\fBint scrollok(WINDOW * \fIwin\fP, bool \fIbf\fP);
 .PP
 \fBint setscrreg(int \fItop\fP, int \fIbot\fP);
-\fBint wsetscrreg(WINDOW *\fIwin\fP, int \fItop\fP, int \fIbot\fP);
+\fBint wsetscrreg(WINDOW * \fIwin\fP, int \fItop\fP, int \fIbot\fP);
 .fi
 .SH DESCRIPTION
-These routines set options that change the style of output within
-\fBcurses\fP.
-All options are initially \fBFALSE\fP, unless otherwise stated.
-It is not necessary to turn these options off before calling \fBendwin\fP(3X).
+These functions configure properties of
+.I curses
+windows that affect their manner of output.
+Boolean-valued properties are initially
+.B FALSE
+except where noted.
+\fBendwin\fP(3X) resets any terminal modes corresponding to these
+properties;
+an application need not restore their initial values.
 .SS clearok
-If \fBclearok\fP is called with \fBTRUE\fP as argument, the next
-call to \fBwrefresh\fP with this window will clear the screen completely and
-redraw the entire screen from scratch.
-This is useful when the contents of the
-screen are uncertain, or in some cases for a more pleasing visual effect.
+Setting
+.IR win 's
+.B \%clearok
+property to
+.B TRUE
+causes the next
+.B \%wrefresh
+call on it to clear the terminal screen and redraw it entirely.
+This property is useful to restore the contents of the screen
+(perhaps because another process has written to the terminal),
+or in some cases to achieve a more pleasing visual effect.
 If
-the \fIwin\fP argument to \fBclearok\fP is the global variable \fBcurscr\fP,
-the next call to \fBwrefresh\fP with any window causes the screen to be cleared
-and repainted from scratch.
+.I \%win
+is
+.B \%curscr
+(see \fBcurs_variables\fP(3X)),
+the next
+.B \%wrefresh
+call on
+.I any
+window causes the terminal screen to clear and redraw as above.
+.B \%wrefresh
+resets this property to
+.BR FALSE "."
 .SS idcok
-If \fBidcok\fP is called with \fBFALSE\fP as second argument, \fBcurses\fP
-no longer considers using the hardware insert/delete character feature of
-terminals so equipped.
-Use of character insert/delete is enabled by default.
-Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
-of character insertion and deletion.
+(This property defaults
+.BR TRUE ".)"
+Setting
+.IR win 's
+.B \%idcok
+property to
+.B FALSE
+prevents
+.I curses
+from using the insert/delete character capabilities of terminal types
+possessing them according to the
+.I \%term\%info
+database.
+.\" TODO: What's the historical rationale for the `idcok()` feature?
 .SS idlok
-If \fBidlok\fP is called with \fBTRUE\fP as second argument, \fBcurses\fP
-considers using the hardware insert/delete line feature of terminals so
-equipped.
-Calling \fBidlok\fP with \fBFALSE\fP as second argument disables use
-of line insertion and deletion.
-This option should be enabled only if the
-application needs insert/delete line, for example, for a screen editor.
-It is
-disabled by default because insert/delete line tends to be visually annoying
-when used in applications where it is not really needed.
-If insert/delete line
-cannot be used, \fBcurses\fP redraws the changed portions of all lines.
+Setting
+.IR win 's
+.B \%idlok
+property to
+.B TRUE
+causes
+.I curses
+to consider
+using the insert/delete line capabilities of terminal types
+possessing them according to the
+.I \%term\%info
+database.
+Enable this option
+if the application explicitly requires these operations,
+as a full-screen text editor might;
+otherwise the results may be visually annoying to the user.
+.\" TODO: Substantiate that claim.
 .SS immedok
-If \fBimmedok\fP is called with \fBTRUE\fP as second argument,
+If
+.B \%immedok
+is called with
+.B TRUE
+as second argument,
 any change in the window image,
-such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
-etc., automatically causes a call to \fBwrefresh\fP.
+such as the ones caused by
+.BR \%waddch ","
+.BR \%wclrtobot ","
+.BR \%wscrl ","
+etc., automatically causes a call to
+.BR wrefresh "."
 However, it may degrade performance considerably,
-due to repeated calls to \fBwrefresh\fP.
-Calling \fBimmedok\fP with \fBFALSE\fP as second argument
+due to repeated calls to
+.BR wrefresh "."
+Calling
+.B \%immedok
+with
+.B FALSE
+as second argument
 restores the default behavior,
 i.e., deferring screen updates until a refresh is needed.
 .SS leaveok
 Normally, the hardware cursor is left at the location of the window cursor
 being refreshed.
-The \fBleaveok\fP option allows the cursor to be left
+The
+.B \%leaveok
+option allows the cursor to be left
 wherever the update happens to leave it.
 It is useful for applications where
 the cursor is not used, since it reduces the need for cursor motions.
 .SS scrollok
-The \fBscrollok\fP option controls what happens when the cursor of a window is
+The
+.B \%scrollok
+option controls what happens when the cursor of a window is
 moved off the edge of the window or scrolling region, either as a result of a
 newline action on the bottom line, or typing the last character of the last
 line.
-If disabled, (\fIbf\fP is \fBFALSE\fP), the cursor is left on the bottom
+If disabled,
+.RI ( bf
+is
+.BR FALSE "),"
+the cursor is left on the bottom
 line.
-If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
+If enabled,
+.RI ( bf
+is
+.BR TRUE "),"
+the window is scrolled up one line
 (Note that to get the physical scrolling effect on the terminal, it is
-also necessary to call \fBidlok\fP).
+also necessary to call
+.BR idlok ")."
 .SS "setscrreg, wsetscrreg"
-The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
+The
+.B \%setscrreg
+and
+.B \%wsetscrreg
+routines allow the application
 programmer to set a software scrolling region in a window.
-The \fItop\fP and
-\fIbot\fP parameters
+The
+.I top
+and
+.I bot
+parameters
 are the line numbers of the top and bottom margin of the scrolling
 region.
 (Line 0 is the top line of the window.)  If this option and
-\fBscrollok\fP are enabled, an attempt to move off the bottom margin line
+.B scrollok
+are enabled, an attempt to move off the bottom margin line
 causes all lines in the scrolling region to scroll one line in the direction
 of the first line.
 Only the text of the window is scrolled.
 (Note that this
 has nothing to do with the use of a physical scrolling region capability in the
 terminal, like that in the VT100.
-If \fBidlok\fP is enabled and the terminal
+If
+.B \%idlok
+is enabled and the terminal
 has either a scrolling region or insert/delete line capability, they will
 probably be used by the output routines.)
 .SH RETURN VALUE
-The functions \fBsetscrreg\fP and \fBwsetscrreg\fP return \fBOK\fP upon success
-and \fBERR\fP upon failure.
+The functions
+.B \%setscrreg
+and
+.B \%wsetscrreg
+return
+.B OK
+upon success
+and
+.B ERR
+upon failure.
 All other routines that return an integer always
-return \fBOK\fP.
+return
+.BR OK "."
 .PP
 In this implementation,
 .bP
@@ -161,7 +239,7 @@ will return
 .B ERR
 if the window pointer is null
 .bP
-\fBwsetscrreg\fP
+.B \%wsetscrreg
 returns
 .B ERR
 if the scrolling region limits extend outside the
@@ -175,7 +253,9 @@ and
 .B \%setscrreg
 may be implemented as macros.
 .PP
-The \fBimmedok\fP routine is useful for windows that are used as terminal
+The
+.B \%immedok
+routine is useful for windows that are used as terminal
 emulators.
 .SH PORTABILITY
 X/Open Curses Issue\ 4 describes these functions.
diff --git a/man/make_sed.sh b/man/make_sed.sh
index ee7df4177..62823c12e 100755
--- a/man/make_sed.sh
+++ b/man/make_sed.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: make_sed.sh,v 1.19 2023/12/07 01:16:43 tom Exp $
+# $Id: make_sed.sh,v 1.21 2025/03/01 22:00:48 tom Exp $
 ##############################################################################
-# Copyright 2020-2022,2023 Thomas E. Dickey                                  #
+# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
 # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -79,7 +79,7 @@ echo "# Do the embedded references"
 sed	-e 's/</<fB\\(\\\\%\\)\\?/' \
 	-e 's/\\%</\\%/' \
 	-e 's/	/\\\\fP(/' \
-	-e 's/	/)\/fB\\\\%/' \
+	-e 's/	/)\/fB\\1/' \
 	-e 's/	/\\\\fP(/' \
 	-e 's/\/$/)\//' \
 	$UPPER
diff --git a/man/manhtml.externs b/man/manhtml.externs
index cc4e8210b..7090ef011 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,7 +1,7 @@
-# $Id: manhtml.externs,v 1.29 2024/07/27 20:15:00 tom Exp $
+# $Id: manhtml.externs,v 1.30 2025/03/01 22:00:03 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
-# Copyright 2019-2023,2024 Thomas E. Dickey                                *
+# Copyright 2019-2024,2025 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -52,6 +52,7 @@ lynx(1)
 mutt(1)
 nvi(1)
 od(1)
+poll(2)
 printf(3)
 profile(5)
 putc(3)
@@ -64,6 +65,7 @@ resize(1)
 scanf(3)
 scanf(3S)
 screen(1)
+select(2)
 setbuf(3)
 setgid(2)
 setlocale(3)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index f401588a5..d066706a8 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp $
-.TH ncurses 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.245 2025/03/01 21:43:30 tom Exp $
+.TH ncurses 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -322,7 +322,7 @@ which cause characters to render in such modes as
 boldfaced,
 underlined,
 or in reverse video.
-See \fB\%curs_attr\fP(3X).
+See \fB\%curs_color\fP(3X) and \fB\%curs_attr\fP(3X).
 .PP
 .I curses
 predefines constants for a small set of forms-drawing graphics
diff --git a/man/tput.1 b/man/tput.1
index f7af8826e..0e5a85bf3 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp $
-.TH @TPUT@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp $
+.TH @TPUT@ 1 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -78,7 +78,7 @@ Terminal capabilities are accessed by
 .IR cap-code .
 .PP
 \fB\%terminfo\fP(5) discusses terminal capabilities at length
-and presents a complete list of
+and presents a complete list of standard
 .IR cap-codes .
 .PP
 When retrieving capability values,
@@ -845,11 +845,13 @@ logic.
 .PP
 Keith Bostic refactored BSD
 .I tput
-for shipment in 4.3BSD-Tahoe (1988),
-then replaced it the next year with a new implementation based on
-System\ V
-.IR tput .
-Bostic's version similarly accepted some parameters named for
+for shipment in 4.3BSD-Reno (1990),
+making it follow the interface of System\ V
+.I tput
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD-Reno/src/usr.bin/tput/tput.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/tput/tput.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/usr.bin/tput/tput.c
+by accepting some parameters named for
 .I \%term\%info
 (pseudo-)capabilities:
 .BR clear ,
@@ -870,13 +872,12 @@ Bostic's BSD
 did not modify the terminal modes as the earlier BSD
 .I tset
 had done.
-.PP
 At the same time,
 Bostic added a shell script named \*(``clear\*('' that used
 .I tput
 to clear the screen.
-Both of these appeared in 4.4BSD,
-becoming the \*(``modern\*('' BSD implementation of
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD-Reno/src/usr.bin/tput/clear.sh
+These became the \*(``modern\*('' BSD implementation of
 .IR tput .
 .PP
 The origin of
diff --git a/misc/terminfo.src b/misc/terminfo.src
index a21f7f4f6..039837eeb 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1171 $
-#	$Date: 2025/02/15 20:03:55 $
+#	$Revision: 1.1175 $
+#	$Date: 2025/03/01 21:54:30 $
 #
 # 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
@@ -3057,8 +3057,15 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge,
 vt520|DEC VT520,
 	use=ansi+rca, use=vt420, use=ansi+tabs,
 
+vt520-w|DEC VT520 in wide mode,
+	cols#132, use=vt520,
+
 vt525|DEC VT525,
-	use=vt520,
+	colors#8, pairs#64,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt520,
+
+vt525-w|DEC VT525 in wide mode,
+	cols#132, use=vt525,
 
 # I just got a brand new Boundless VT520 with that company's "ANSI 2011"
 # Keyboard, which replaces the old LK41R-AA keyboard.
@@ -27797,4 +27804,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2025-02-15
 #	+ minor fixes to comments (report by Sven Joachim) -TD
 #
+# 2025-03-01
+#	+ add color to vt525 (Branden Robinson)
+#	+ add vt520-w and vt525-w (Branden Robinson)
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index dceefcd47..fbaf3f2d6 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.78 2025/02/01 22:09:10 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.79 2025/02/23 01:55:06 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2024,2025 Thomas E. Dickey                                  #
@@ -445,7 +445,10 @@ BEGIN		{
 		print " */"
 		print "#define NCURSES_ATTR_T int"
 		print "#include <ncurses_cfg.h>"
+		print ""
+		print "#if USE_STDBOOL_H"
 		print "#include <stdbool.h>"
+		print "#endif"
 		print ""
 		print "#undef NCURSES_NOMACROS	/* _this_ file uses macros */"
 		print "#define NCURSES_NOMACROS 1"
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index fcc54cb02..6f588d1c4 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.700 2025/01/18 14:41:58 tom Exp $
+ * $Id: curses.priv.h,v 1.701 2025/03/01 17:17:12 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2541,16 +2541,12 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
 #if defined(USE_WIN32CON_DRIVER)
 #include <nc_mingw.h>
 extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER;
-extern NCURSES_EXPORT(int)  _nc_mingw_isatty(int fd);
-extern NCURSES_EXPORT(int)  _nc_mingw_isconsole(int fd);
-extern NCURSES_EXPORT(int) _nc_mingw_console_read(
-    SCREEN *sp,
-    HANDLE  fd,
-    int *buf);
-extern NCURSES_EXPORT(int) _nc_mingw_testmouse(
-    SCREEN * sp,
-    HANDLE fd,
-    int delay EVENTLIST_2nd(_nc_eventlist*));
+extern NCURSES_EXPORT(int) _nc_mingw_console_read(SCREEN *sp, HANDLE fd, int *buf);
+extern NCURSES_EXPORT(int) _nc_mingw_isatty(int fd);
+extern NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd);
+extern NCURSES_EXPORT(int) _nc_mingw_tcflush(int fd, int queue);
+extern NCURSES_EXPORT(int) _nc_mingw_tcgetattr(int fd, struct termios *arg);
+extern NCURSES_EXPORT(int) _nc_mingw_testmouse(SCREEN *sp, HANDLE fd, int delay EVENTLIST_2nd(_nc_eventlist*));
 #else
 #endif
 extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index 120ce1ec7..69abf67d6 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -38,7 +38,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_win32con.c,v 1.17 2025/02/15 15:43:26 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.18 2025/03/01 14:26:14 tom Exp $")
 
 #if defined(_NC_WINDOWS)
 
@@ -887,8 +887,7 @@ _nc_console_twait(
 			goto end;
 		    } else {
 			DWORD n = 0;
-			INPUT_RECORD *pInpRec =
-			TypeAlloca(INPUT_RECORD, nRead);
+			MakeArray(pInpRec, INPUT_RECORD, nRead);
 			if (pInpRec != NULL) {
 			    DWORD i;
 			    BOOL f;
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 1bf71e955..8bb7d1299 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.84 2025/01/24 20:39:23 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.85 2025/03/01 17:07:19 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -273,7 +273,7 @@ _nc_timed_wait(const SCREEN *sp MAYBE_UNUSED,
     }
 #endif
 
-    result = poll(fds, (size_t) count, milliseconds);
+    result = (int) poll(fds, (size_t) count, milliseconds);
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl) {
diff --git a/ncurses/win32con/win32_driver.c b/ncurses/win32con/win32_driver.c
index 0a7f4ba95..9a62856ea 100644
--- a/ncurses/win32con/win32_driver.c
+++ b/ncurses/win32con/win32_driver.c
@@ -48,7 +48,7 @@
 
 #define CUR TerminalType(my_term).
 
-MODULE_ID("$Id: win32_driver.c,v 1.5 2025/02/20 01:15:57 tom Exp $")
+MODULE_ID("$Id: win32_driver.c,v 1.7 2025/03/01 14:26:14 tom Exp $")
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 #define EXP_OPTIMIZE 0
@@ -171,7 +171,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB,
 	    int y, int x, cchar_t *str, int limit)
 {
     int actual = 0;
-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
+    MakeArray(ci, CHAR_INFO, limit);
     COORD loc, siz;
     SMALL_RECT rec;
     int i;
@@ -220,7 +220,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB,
 static BOOL
 con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
 {
-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
+    MakeArray(ci, CHAR_INFO, n);
     COORD loc, siz;
     SMALL_RECT rec;
     int i;
@@ -415,7 +415,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
 	    int x;
 #if USE_WIDEC_SUPPORT
-	    cchar_t *empty = TypeAlloca(cchar_t, Width);
+	    MakeArray(empty, cchar_t, Width);
 	    wchar_t blank[2] =
 	    {
 		L' ', L'\0'
@@ -424,7 +424,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	    for (x = 0; x < Width; x++)
 		setcchar(&empty[x], blank, 0, 0, NULL);
 #else
-	    chtype *empty = TypeAlloca(chtype, Width);
+	    MakeArray(empty, chtype, Width);
 
 	    for (x = 0; x < Width; x++)
 		empty[x] = ' ';
@@ -589,8 +589,8 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
     int max_cells = (high * wide);
     int i;
 
-    CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
-    CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
+    MakeArray(this_screen, CHAR_INFO, max_cells);
+    MakeArray(that_screen, CHAR_INFO, max_cells);
     COORD this_size;
     SMALL_RECT this_region;
     COORD bufferCoord;
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 4b59a158c..98714ef15 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,9 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.77 2025/02/20 01:19:43 tom Exp $")
-
-#define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+MODULE_ID("$Id: win_driver.c,v 1.81 2025/03/01 17:17:46 tom Exp $")
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 
@@ -264,7 +262,7 @@ static BOOL
 con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
 {
     int actual = 0;
-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
+    MakeArray(ci, CHAR_INFO, limit);
     COORD loc, siz;
     SMALL_RECT rec;
     int i;
@@ -313,7 +311,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
 static BOOL
 con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
 {
-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
+    MakeArray(ci, CHAR_INFO, n);
     COORD loc, siz;
     SMALL_RECT rec;
     int i;
@@ -512,7 +510,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
 	    int x;
 #if USE_WIDEC_SUPPORT
-	    cchar_t *empty = TypeAlloca(cchar_t, Width);
+	    MakeArray(empty, cchar_t, Width);
 	    wchar_t blank[2] =
 	    {
 		L' ', L'\0'
@@ -521,7 +519,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 	    for (x = 0; x < Width; x++)
 		setcchar(&empty[x], blank, 0, 0, NULL);
 #else
-	    chtype *empty = TypeAlloca(chtype, Width);
+	    MakeArray(empty, chtype, Width);
 
 	    for (x = 0; x < Width; x++)
 		empty[x] = ' ';
@@ -685,8 +683,8 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
     int max_cells = (high * wide);
     int i;
 
-    CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
-    CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
+    MakeArray(this_screen, CHAR_INFO, max_cells);
+    MakeArray(that_screen, CHAR_INFO, max_cells);
     COORD this_size;
     SMALL_RECT this_region;
     COORD bufferCoord;
@@ -1964,7 +1962,7 @@ IsConsoleHandle(HANDLE hdl)
      a test for mintty. This is called from the NC_ISATTY macro
      defined in curses.priv.h
  */
-int
+NCURSES_EXPORT(int)
 _nc_mingw_isatty(int fd)
 {
     int result = 0;
@@ -1985,7 +1983,7 @@ _nc_mingw_isatty(int fd)
      with the terminal escape sequences that are sent by
      terminfo.
  */
-int
+NCURSES_EXPORT(int)
 _nc_mingw_isconsole(int fd)
 {
     HANDLE hdl = get_handle(fd);
@@ -2012,7 +2010,7 @@ _nc_mingw_isconsole(int fd)
     }                                                         \
     assert(term != NULL)
 
-int
+NCURSES_EXPORT(int)
 _nc_mingw_tcsetattr(
 		       int fd,
 		       int optional_action GCC_UNUSED,
@@ -2051,7 +2049,7 @@ _nc_mingw_tcsetattr(
     return code;
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_mingw_tcgetattr(int fd, struct termios *arg)
 {
     TC_PROLOGUE(fd);
@@ -2063,7 +2061,7 @@ _nc_mingw_tcgetattr(int fd, struct termios *arg)
     return code;
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_mingw_tcflush(int fd, int queue)
 {
     int code = ERR;
@@ -2078,7 +2076,7 @@ _nc_mingw_tcflush(int fd, int queue)
     return code;
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_mingw_testmouse(
 		       SCREEN *sp,
 		       HANDLE fd,
@@ -2102,7 +2100,7 @@ _nc_mingw_testmouse(
     return rc;
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_mingw_console_read(
 			  SCREEN *sp,
 			  HANDLE fd,
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 31e4a4322..b77f699b3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250222) unstable; urgency=low
+ncurses6td (6.5+20250301) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Feb 2025 20:08:08 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 31e4a4322..b77f699b3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250222) unstable; urgency=low
+ncurses6td (6.5+20250301) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Feb 2025 20:08:08 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 3c34fe7bb..cea3300c0 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20250222) unstable; urgency=low
+ncurses6td (6.5+20250301) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2025 04:14:10 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Feb 2025 20:08:08 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7cf365f41..e22e351d6 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.691 2025/02/20 09:14:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.692 2025/02/23 01:08:08 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2025"
-!define VERSION_MMDD  "0222"
+!define VERSION_MMDD  "0301"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b4fde2630..59e256956 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20250222
+Release: 20250301
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index d7fee2936..53bad22e3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20250222
+Release: 20250301
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index d3543f31b..492d4612c 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20250222
+Release: 20250301
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz